diff options
| -rw-r--r-- | CHANGELOG | 14 | ||||
| -rw-r--r-- | Zotlabs/Daemon/Checksites.php | 3 | ||||
| -rw-r--r-- | Zotlabs/Daemon/Deliver.php | 70 | ||||
| -rw-r--r-- | Zotlabs/Daemon/Directory.php | 3 | ||||
| -rw-r--r-- | Zotlabs/Daemon/Notifier.php | 23 | ||||
| -rw-r--r-- | Zotlabs/Daemon/Ratenotif.php | 5 | ||||
| -rw-r--r-- | Zotlabs/Lib/Activity.php | 10 | ||||
| -rw-r--r-- | Zotlabs/Module/Admin/Site.php | 8 | ||||
| -rw-r--r-- | Zotlabs/Module/Sse.php | 107 | ||||
| -rw-r--r-- | Zotlabs/Update/_1239.php | 27 | ||||
| -rwxr-xr-x | boot.php | 5 | ||||
| -rw-r--r-- | include/hubloc.php | 28 | ||||
| -rw-r--r-- | include/import.php | 45 | ||||
| -rw-r--r-- | include/network.php | 5 | ||||
| -rw-r--r-- | include/zot.php | 4 | ||||
| -rw-r--r-- | view/js/main.js | 82 | ||||
| -rw-r--r-- | view/ru/hmessages.po | 1799 | ||||
| -rw-r--r-- | view/ru/hstrings.php | 33 | ||||
| -rwxr-xr-x | view/tpl/admin_site.tpl | 1 | ||||
| -rwxr-xr-x | view/tpl/head.tpl | 1 |
20 files changed, 1179 insertions, 1094 deletions
@@ -1,3 +1,17 @@ +Hubzilla 5.0.2 (2020-11-16) + - Fix ping_site() + - Fix directory post url + - Update russian translation + - Implement polling for notifications (default) - SSE can be enabled in /admin/site if desired + - DB update to remove hublocs with no hubloc_hash or no hubloc_callback + - Do not save actors without an inbox + - Fix import_hublocs() + + Addons + - Pubcrawl: do not save actors without an inbox + - Diaspora: fix issue with diaspora where hublocs without hubloc_hash were stored + + Hubzilla 5.0.1 (2020-11-12) - Fix share title size - Fix issue where hublocs could get mixed up between different protocols diff --git a/Zotlabs/Daemon/Checksites.php b/Zotlabs/Daemon/Checksites.php index a2081967a..3bcfdd7cf 100644 --- a/Zotlabs/Daemon/Checksites.php +++ b/Zotlabs/Daemon/Checksites.php @@ -2,8 +2,7 @@ namespace Zotlabs\Daemon; -require_once('include/zot.php'); - +require_once('include/hubloc.php'); class Checksites { diff --git a/Zotlabs/Daemon/Deliver.php b/Zotlabs/Daemon/Deliver.php index 43f426eb7..c853af6a8 100644 --- a/Zotlabs/Daemon/Deliver.php +++ b/Zotlabs/Daemon/Deliver.php @@ -2,12 +2,8 @@ namespace Zotlabs\Daemon; -use Zotlabs\Lib\DReport; - -require_once('include/zot.php'); require_once('include/queue_fn.php'); - class Deliver { static public function run($argc,$argv) { @@ -22,72 +18,16 @@ class Deliver { if(! $argv[$x]) continue; - $dresult = null; - $r = q("select * from outq where outq_hash = '%s' limit 1", + $r = q("select * from outq where outq_hash = '%s'", dbesc($argv[$x]) ); - if($r) { - - $notify = json_decode($r[0]['outq_notify'],true); - - // Messages without an outq_msg will need to go via the web, even if it's a - // local delivery. This includes conversation requests and refresh packets. - - if(($r[0]['outq_posturl'] === z_root() . '/post') && ($r[0]['outq_msg'])) { - logger('deliver: local delivery', LOGGER_DEBUG); - - // local delivery - // we should probably batch these and save a few delivery processes - - if($r[0]['outq_msg']) { - $m = json_decode($r[0]['outq_msg'],true); - if(array_key_exists('message_list',$m)) { - foreach($m['message_list'] as $mm) { - $msg = array('body' => json_encode(array('success' => true, 'pickup' => array(array('notify' => $notify,'message' => $mm))))); - zot_import($msg,z_root()); - } - } - else { - $msg = array('body' => json_encode(array('success' => true, 'pickup' => array(array('notify' => $notify,'message' => $m))))); - $dresult = zot_import($msg,z_root()); - } - - remove_queue_item($r[0]['outq_hash']); - - if($dresult && is_array($dresult)) { - - // delivery reports for local deliveries do not require encryption - - foreach($dresult as $xx) { - if(is_array($xx) && array_key_exists('message_id',$xx)) { - if(DReport::is_storable($xx)) { - q("insert into dreport ( dreport_mid, dreport_site, dreport_recip, dreport_name, dreport_result, dreport_time, dreport_xchan ) values ( '%s', '%s', '%s', '%s', '%s', '%s', '%s' ) ", - dbesc($xx['message_id']), - dbesc($xx['location']), - dbesc($xx['recipient']), - dbesc(($xx['name']) ? $xx['name'] : EMPTY_STR), - dbesc($xx['status']), - dbesc(datetime_convert($xx['date'])), - dbesc($xx['sender']) - ); - } - } - } - } - - q("delete from dreport where dreport_queue = '%s'", - dbesc($argv[$x]) - ); - - continue; - } - } - - // otherwise it's a remote delivery - call queue_deliver() with the $immediate flag + if($r) { queue_deliver($r[0],true); - } + } + } + } diff --git a/Zotlabs/Daemon/Directory.php b/Zotlabs/Daemon/Directory.php index c698995c2..ab58432de 100644 --- a/Zotlabs/Daemon/Directory.php +++ b/Zotlabs/Daemon/Directory.php @@ -58,7 +58,8 @@ class Directory { // otherwise send the changes upstream $directory = Libzotdir::find_upstream_directory($dirmode); - $url = $directory['url'] . '/post'; + + $url = $directory['url'] . '/zot'; // ensure the upstream directory is updated diff --git a/Zotlabs/Daemon/Notifier.php b/Zotlabs/Daemon/Notifier.php index 8ea75af61..f24eab773 100644 --- a/Zotlabs/Daemon/Notifier.php +++ b/Zotlabs/Daemon/Notifier.php @@ -4,6 +4,7 @@ namespace Zotlabs\Daemon; use Zotlabs\Lib\Libzot; use Zotlabs\Lib\Activity; +use Zotlabs\Lib\Queue; require_once('include/queue_fn.php'); require_once('include/html2plain.php'); @@ -734,15 +735,17 @@ class Notifier { } if($packet) { - queue_insert(array( - 'hash' => $hash, - 'account_id' => $channel['channel_account_id'], - 'channel_id' => $channel['channel_id'], - 'posturl' => $hub['hubloc_callback'], - 'driver' => $hub['hubloc_network'], - 'notify' => $packet, - 'msg' => (($pmsg) ? json_encode($pmsg) : '') - )); + Queue::insert( + [ + 'hash' => $hash, + 'account_id' => $channel['channel_account_id'], + 'channel_id' => $channel['channel_id'], + 'posturl' => $hub['hubloc_callback'], + 'driver' => $hub['hubloc_network'], + 'notify' => $packet, + 'msg' => (($pmsg) ? json_encode($pmsg) : '') + ] + ); } else { $env = (($hub_env && $hub_env[$hub['hubloc_host'] . $hub['hubloc_sitekey']]) ? $hub_env[$hub['hubloc_host'] . $hub['hubloc_sitekey']] : ''); @@ -803,7 +806,7 @@ class Notifier { } } - queue_insert( + Queue::insert( [ 'hash' => $hash, 'account_id' => $target_item['aid'], diff --git a/Zotlabs/Daemon/Ratenotif.php b/Zotlabs/Daemon/Ratenotif.php index c7bf79854..8afde2c4c 100644 --- a/Zotlabs/Daemon/Ratenotif.php +++ b/Zotlabs/Daemon/Ratenotif.php @@ -10,6 +10,11 @@ class Ratenotif { static public function run($argc,$argv) { + + // Deprecated + return; + + require_once("datetime.php"); require_once('include/items.php'); diff --git a/Zotlabs/Lib/Activity.php b/Zotlabs/Lib/Activity.php index 48714a48d..5f222754b 100644 --- a/Zotlabs/Lib/Activity.php +++ b/Zotlabs/Lib/Activity.php @@ -1493,6 +1493,14 @@ class Activity { if(! is_array($person_obj)) return; + $inbox = $person_obj['inbox']; + + // invalid identity + + if (! $inbox || strpos($inbox,z_root()) !== false) { + return; + } + $name = $person_obj['name']; if(! $name) $name = $person_obj['preferredUsername']; @@ -1540,8 +1548,6 @@ class Activity { $profile = $url; } - $inbox = $person_obj['inbox']; - $collections = []; if($inbox) { diff --git a/Zotlabs/Module/Admin/Site.php b/Zotlabs/Module/Admin/Site.php index 4bb34b7b7..011bf3ce4 100644 --- a/Zotlabs/Module/Admin/Site.php +++ b/Zotlabs/Module/Admin/Site.php @@ -62,6 +62,9 @@ class Site { $from_email = ((array_key_exists('from_email',$_POST) && trim($_POST['from_email'])) ? trim($_POST['from_email']) : 'Administrator@' . \App::get_hostname()); $from_email_name = ((array_key_exists('from_email_name',$_POST) && trim($_POST['from_email_name'])) ? trim($_POST['from_email_name']) : \Zotlabs\Lib\System::get_site_name()); + + $sse_enabled = ((x($_POST,'sse_enabled')) ? true : false); + $verifyssl = ((x($_POST,'verifyssl')) ? True : False); $proxyuser = ((x($_POST,'proxyuser')) ? notags(trim($_POST['proxyuser'])) : ''); $proxy = ((x($_POST,'proxy')) ? notags(trim($_POST['proxy'])) : ''); @@ -151,6 +154,9 @@ class Site { set_config('system','no_community_page', $no_community_page); set_config('system','no_utf', $no_utf); + + set_config('system','sse_enabled', $sse_enabled); + set_config('system','verifyssl', $verifyssl); set_config('system','proxyuser', $proxyuser); set_config('system','proxy', $proxy); @@ -331,6 +337,8 @@ class Site { '$directory_server' => (($dir_choices) ? array('directory_server', t("Directory Server URL"), get_config('system','directory_server'), t("Default directory server"), $dir_choices) : null), + '$sse_enabled' => array('sse_enabled', t('Enable SSE Notifications'), get_config('system', 'sse_enabled', 0), t('If disabled, traditional polling will be used. Warning: this setting might not be suited for shared hosting')), + '$proxyuser' => array('proxyuser', t("Proxy user"), get_config('system','proxyuser'), ""), '$proxy' => array('proxy', t("Proxy URL"), get_config('system','proxy'), ""), '$timeout' => array('timeout', t("Network timeout"), (x(get_config('system','curl_timeout'))?get_config('system','curl_timeout'):60), t("Value is in seconds. Set to 0 for unlimited (not recommended).")), diff --git a/Zotlabs/Module/Sse.php b/Zotlabs/Module/Sse.php index b68fe6705..46b4a8d87 100644 --- a/Zotlabs/Module/Sse.php +++ b/Zotlabs/Module/Sse.php @@ -14,6 +14,7 @@ class Sse extends Controller { public static $ob_hash; public static $sse_id; public static $vnotify; + public static $sse_enabled; function init() { @@ -49,18 +50,86 @@ class Sse extends Controller { $sys = get_sys_channel(); $sleep_seconds = 3; - header("Content-Type: text/event-stream"); - header("Cache-Control: no-cache"); - header("Connection: keep-alive"); - header("X-Accel-Buffering: no"); + self::$sse_enabled = get_config('system', 'sse_enabled', 0); - while(true) { + if(self::$sse_enabled) { - /** - * Update chat presence indication (if applicable) - */ + // Server Sent Events + + header("Content-Type: text/event-stream"); + header("Cache-Control: no-cache"); + header("Connection: keep-alive"); + header("X-Accel-Buffering: no"); + + while(true) { + + if(! self::$sse_id) { + + // Update chat presence indication + + $r = q("select cp_id, cp_room from chatpresence where cp_xchan = '%s' and cp_client = '%s' and cp_room = 0 limit 1", + dbesc(self::$ob_hash), + dbesc($_SERVER['REMOTE_ADDR']) + ); + $basic_presence = false; + if($r) { + $basic_presence = true; + q("update chatpresence set cp_last = '%s' where cp_id = %d", + dbesc(datetime_convert()), + intval($r[0]['cp_id']) + ); + } + if(! $basic_presence) { + q("insert into chatpresence ( cp_xchan, cp_last, cp_status, cp_client) + values( '%s', '%s', '%s', '%s' ) ", + dbesc(self::$ob_hash), + dbesc(datetime_convert()), + dbesc('online'), + dbesc($_SERVER['REMOTE_ADDR']) + ); + } + } + + XConfig::Load(self::$ob_hash); + + $result = XConfig::Get(self::$ob_hash, 'sse', 'notifications', []); + $lock = XConfig::Get(self::$ob_hash, 'sse', 'lock'); + + if($result && !$lock) { + echo "event: notifications\n"; + echo 'data: ' . json_encode($result); + echo "\n\n"; + + XConfig::Set(self::$ob_hash, 'sse', 'notifications', []); + unset($result); + } + + // always send heartbeat to detect disconnected clients + echo "event: heartbeat\n"; + echo 'data: {}'; + echo "\n\n"; + + ob_end_flush(); + flush(); + + if(connection_status() != CONNECTION_NORMAL || connection_aborted()) { + //TODO: this does not seem to be triggered + XConfig::Set(self::$ob_hash, 'sse', 'timestamp', NULL_DATE); + break; + } + + sleep($sleep_seconds); + + } + + } + else { + // Fallback to traditional polling if(! self::$sse_id) { + + // Update chat presence indication + $r = q("select cp_id, cp_room from chatpresence where cp_xchan = '%s' and cp_client = '%s' and cp_room = 0 limit 1", dbesc(self::$ob_hash), dbesc($_SERVER['REMOTE_ADDR']) @@ -90,29 +159,11 @@ class Sse extends Controller { $lock = XConfig::Get(self::$ob_hash, 'sse', 'lock'); if($result && !$lock) { - echo "event: notifications\n"; - echo 'data: ' . json_encode($result); - echo "\n\n"; - XConfig::Set(self::$ob_hash, 'sse', 'notifications', []); - unset($result); - } - - // always send heartbeat to detect disconnected clients - echo "event: heartbeat\n"; - echo 'data: {}'; - echo "\n\n"; - - ob_end_flush(); - flush(); - - if(connection_status() != CONNECTION_NORMAL || connection_aborted()) { - //TODO: this does not seem to be triggered - XConfig::Set(self::$ob_hash, 'sse', 'timestamp', NULL_DATE); - break; + json_return_and_die($result); } - sleep($sleep_seconds); + killme(); } diff --git a/Zotlabs/Update/_1239.php b/Zotlabs/Update/_1239.php new file mode 100644 index 000000000..ed8de30bb --- /dev/null +++ b/Zotlabs/Update/_1239.php @@ -0,0 +1,27 @@ +<?php + +namespace Zotlabs\Update; + +class _1239 { + + function run() { + + dbq("START TRANSACTION"); + + // remove broken activitypub hubloc entries + $r = dbq("DELETE FROM hubloc WHERE hubloc_network = 'activitypub' and hubloc_callback = ''"); + + // remove broken hubloc entries from friendica + $r1 = dbq("DELETE FROM hubloc WHERE hubloc_hash = ''"); + + if($r && $r1) { + dbq("COMMIT"); + return UPDATE_SUCCESS; + } + + dbq("ROLLBACK"); + return UPDATE_FAILED; + + } + +} @@ -50,10 +50,10 @@ require_once('include/attach.php'); require_once('include/bbcode.php'); define ( 'PLATFORM_NAME', 'hubzilla' ); -define ( 'STD_VERSION', '5.0.1' ); +define ( 'STD_VERSION', '5.0.2' ); define ( 'ZOT_REVISION', '6.0' ); -define ( 'DB_UPDATE_VERSION', 1238 ); +define ( 'DB_UPDATE_VERSION', 1239 ); define ( 'PROJECT_BASE', __DIR__ ); @@ -1207,6 +1207,7 @@ class App { '$metas' => self::$meta->get(), '$plugins' => $x['header'], '$update_interval' => $interval, + '$sse_enabled' => get_config('system', 'sse_enabled', 0), '$head_css' => head_get_css(), '$head_js' => head_get_js(), '$linkrel' => head_get_links(), diff --git a/include/hubloc.php b/include/hubloc.php index 6b896c627..6ab426a10 100644 --- a/include/hubloc.php +++ b/include/hubloc.php @@ -288,30 +288,18 @@ function locations_by_netid($netid) { function ping_site($url) { - $ret = array('success' => false); + $ret = array('success' => false); - $sys = get_sys_channel(); + $r = Zotlabs\Lib\Zotfinger::exec($url); - $m = zot_build_packet($sys, 'ping'); - $r = zot_zot($url . '/post', $m); - if(! $r['success']) { - $ret['message'] = 'no answer from ' . $url; - return $ret; - } - $packet_result = json_decode($r['body'], true); - if(! $packet_result['success']) { - $ret['message'] = 'packet failure from ' . $url; - return $ret; - } + if(! $r['data']) { + $ret['message'] = 'no answer from ' . $url; + return $ret; + } - if($packet_result['success']) { - $ret['success'] = true; - } - else { - $ret['message'] = 'unknown error from ' . $url; - } + $ret['success'] = true; + return $ret; - return $ret; } diff --git a/include/import.php b/include/import.php index 910cb8be7..82c23e116 100644 --- a/include/import.php +++ b/include/import.php @@ -210,17 +210,24 @@ function import_hublocs($channel, $hublocs, $seize, $moving = false) { if($channel && $hublocs) { foreach($hublocs as $hubloc) { - $hash = make_xchan_hash($hubloc['hubloc_guid'],$hubloc['hubloc_guid_sig']); - if($hubloc['hubloc_network'] === 'zot' && $hash !== $hubloc['hubloc_hash']) { - logger('forged hubloc: ' . print_r($hubloc,true)); - continue; - } + // verify the hash. We can only do this if we already stored the xchan corresponding to this hubloc + // as we need the public key from there - if(! array_key_exists('hubloc_primary',$hubloc)) { - $hubloc['hubloc_primary'] = (($hubloc['hubloc_flags'] & 0x0001) ? 1 : 0); - $hubloc['hubloc_orphancheck'] = (($hubloc['hubloc_flags'] & 0x0004) ? 1 : 0); - $hubloc['hubloc_error'] = (($hubloc['hubloc_status'] & 0x0003) ? 1 : 0); - $hubloc['hubloc_deleted'] = (($hubloc['hubloc_flags'] & 0x1000) ? 1 : 0); + if ($hubloc['hubloc_network'] === 'zot6') { + $x = q("select xchan_pubkey from xchan where xchan_guid = '%s' and xchan_hash = '%s'", + dbesc($hubloc['hubloc_guid']), + dbesc($hubloc['hubloc_hash']) + ); + + if (! $x) { + logger('hubloc could not be verified. ' . print_r($hubloc,true)); + continue; + } + $hash = Libzot::make_xchan_hash($hubloc['hubloc_guid'],$x[0]['xchan_pubkey']); + if ($hash !== $hubloc['hubloc_hash']) { + logger('forged hubloc: ' . print_r($hubloc,true)); + continue; + } } if($moving && $hubloc['hubloc_hash'] === $channel['channel_hash'] && $hubloc['hubloc_url'] !== z_root()) { @@ -228,17 +235,17 @@ function import_hublocs($channel, $hublocs, $seize, $moving = false) { } $arr = [ - 'guid' => $hubloc['hubloc_guid'], - 'guid_sig' => $hubloc['hubloc_guid_sig'], - 'url' => $hubloc['hubloc_url'], - 'url_sig' => $hubloc['hubloc_url_sig'], - 'sitekey' => ((array_key_exists('hubloc_sitekey',$hubloc)) ? $hubloc['hubloc_sitekey'] : '') + 'id' => $hubloc['hubloc_guid'], + 'id_sig' => $hubloc['hubloc_guid_sig'], + 'location' => $hubloc['hubloc_url'], + 'location_sig' => $hubloc['hubloc_url_sig'] ]; - if(($hubloc['hubloc_hash'] === $channel['channel_hash']) && intval($hubloc['hubloc_primary']) && ($seize)) + if (($hubloc['hubloc_hash'] === $channel['channel_hash']) && intval($hubloc['hubloc_primary']) && ($seize)) { $hubloc['hubloc_primary'] = 0; + } - if(($x = zot_gethub($arr,false)) === false) { + if (($x = Libzot::gethub($arr,false)) === false) { unset($hubloc['hubloc_id']); hubloc_store_lowlevel($hubloc); } @@ -1333,7 +1340,7 @@ function sync_files($channel, $files) { 'time' => $time, 'resource' => $att['hash'], 'revision' => 0, - 'signature' => base64url_encode(rsa_sign($channel['channel_hash'] . '.' . $time, $channel['channel_prvkey'])) + 'signature' => Libzot::sign($channel['channel_hash'] . '.' . $time, $channel['channel_prvkey']) ); $store_path = $newfname; @@ -1419,7 +1426,7 @@ function sync_files($channel, $files) { 'time' => $time, 'resource' => $p['resource_id'], 'revision' => 0, - 'signature' => base64url_encode(rsa_sign($channel['channel_hash'] . '.' . $time, $channel['channel_prvkey'])), + 'signature' => Libzot::sign($channel['channel_hash'] . '.' . $time, $channel['channel_prvkey']), 'resolution' => intval($p['imgscale']) ); diff --git a/include/network.php b/include/network.php index 9d4c00ee8..bcd66cf85 100644 --- a/include/network.php +++ b/include/network.php @@ -2,6 +2,7 @@ use Zotlabs\Lib\Zotfinger; use Zotlabs\Lib\Libzot; +use Zotlabs\Lib\Queue; /** * @file include/network.php @@ -1437,10 +1438,10 @@ function do_delivery($deliveries, $force = false) { $x = q("select count(outq_hash) as total from outq where outq_delivered = 0"); - if(intval($x[0]['total']) > intval(get_config('system','force_queue_threshold',300)) && (! $force)) { + if(intval($x[0]['total']) > intval(get_config('system','force_queue_threshold',3000)) && (! $force)) { logger('immediate delivery deferred.', LOGGER_DEBUG, LOG_INFO); foreach($deliveries as $d) { - update_queue_item($d); + Queue::update($d); } return; } diff --git a/include/zot.php b/include/zot.php index 8a2177de7..d61873ba2 100644 --- a/include/zot.php +++ b/include/zot.php @@ -3452,7 +3452,7 @@ function build_sync_packet($uid = 0, $packet = null, $groups_changed = false) { $x = q("select count(outq_hash) as total from outq where outq_delivered = 0"); - if(intval($x[0]['total']) > intval(get_config('system','force_queue_threshold',300))) { + if(intval($x[0]['total']) > intval(get_config('system','force_queue_threshold',3000))) { logger('immediate delivery deferred.', LOGGER_DEBUG, LOG_INFO); update_queue_item($hash); continue; @@ -4286,7 +4286,7 @@ function zot_reply_message_request($data) { $x = q("select count(outq_hash) as total from outq where outq_delivered = 0"); - if(intval($x[0]['total']) > intval(get_config('system','force_queue_threshold',300))) { + if(intval($x[0]['total']) > intval(get_config('system','force_queue_threshold',3000))) { logger('immediate delivery deferred.', LOGGER_DEBUG, LOG_INFO); update_queue_item($hash); continue; diff --git a/view/js/main.js b/view/js/main.js index 8ceb0b143..560868046 100644 --- a/view/js/main.js +++ b/view/js/main.js @@ -31,6 +31,7 @@ var sse_offset = 0; var sse_type; var sse_partial_result = false; var sse_rmids = []; +var sse_fallback_interval; var page_cache = {}; @@ -94,37 +95,56 @@ $(document).ready(function() { jQuery.timeago.settings.allowFuture = true; - if(typeof(window.SharedWorker) === 'undefined') { - // notifications with multiple tabs open will not work very well in this scenario - var evtSource = new EventSource('/sse'); - evtSource.addEventListener('notifications', function(e) { - var obj = JSON.parse(e.data); - sse_handleNotifications(obj, false, false); - }, false); + if(sse_enabled) { + if(typeof(window.SharedWorker) === 'undefined') { + // notifications with multiple tabs open will not work very well in this scenario + var evtSource = new EventSource('/sse'); - document.addEventListener('visibilitychange', function() { - if (!document.hidden) { - sse_offset = 0; - sse_bs_init(); - } - }, false); + evtSource.addEventListener('notifications', function(e) { + var obj = JSON.parse(e.data); + sse_handleNotifications(obj, false, false); + }, false); - } - else { - var myWorker = new SharedWorker('/view/js/sse_worker.js', localUser); + document.addEventListener('visibilitychange', function() { + if (!document.hidden) { + sse_offset = 0; + sse_bs_init(); + } + }, false); - myWorker.port.onmessage = function(e) { - obj = e.data; - console.log(obj); - sse_handleNotifications(obj, false, false); } + else { + var myWorker = new SharedWorker('/view/js/sse_worker.js', localUser); - myWorker.onerror = function(e) { - myWorker.port.close(); + myWorker.port.onmessage = function(e) { + obj = e.data; + console.log(obj); + sse_handleNotifications(obj, false, false); + } + + myWorker.onerror = function(e) { + myWorker.port.close(); + } + + myWorker.port.start(); } + } + else { + if (!document.hidden) + sse_fallback_interval = setInterval(sse_fallback, updateInterval); - myWorker.port.start(); + document.addEventListener('visibilitychange', function() { + if (document.hidden) { + clearInterval(sse_fallback_interval); + } + else { + sse_offset = 0; + sse_bs_init(); + sse_fallback_interval = setInterval(sse_fallback, updateInterval); + } + + }, false); } $('.notification-link').on('click', { replace: true, followup: false }, sse_bs_notifications); @@ -224,6 +244,8 @@ $(document).ready(function() { cache_next_page(); }); + + }); function getConversationSettings() { @@ -1763,8 +1785,6 @@ function sse_bs_init() { } function sse_bs_counts() { - - if(sse_bs_active) return; @@ -2022,3 +2042,15 @@ function sse_setNotificationsStatus() { } } + +function sse_fallback() { + $.get('/sse', function(obj) { + if(! obj) + return; + + console.log('sse fallback'); + console.log(obj); + + sse_handleNotifications(obj, false, false); + }); +} diff --git a/view/ru/hmessages.po b/view/ru/hmessages.po index 2c5e8b3b2..72d254c95 100644 --- a/view/ru/hmessages.po +++ b/view/ru/hmessages.po @@ -1,4 +1,4 @@ -A# SOME DESCRIPTIVE TITLE. +# SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: hubzilla\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-09-18 19:00+0200\n" -"PO-Revision-Date: 2020-09-18 19:03+0200\n" +"POT-Creation-Date: 2020-11-15 11:39+0200\n" +"PO-Revision-Date: 2020-11-15 11:46+0200\n" "Last-Translator: Max Kostikov <max@kostikov.co>\n" "Language-Team: Russian (http://www.transifex.com/Friendica/hubzilla/language/ru/)\n" "MIME-Version: 1.0\n" @@ -22,8 +22,8 @@ msgstr "" msgid "Source channel not found." msgstr "Канал-источник не найден." -#: ../../view/theme/redbasic/php/config.php:15 ../../include/text.php:3360 -#: ../../Zotlabs/Module/Admin/Site.php:185 +#: ../../view/theme/redbasic/php/config.php:15 ../../include/text.php:3379 +#: ../../Zotlabs/Module/Admin/Site.php:191 #: ../../extend/addon/hzaddons/cart/submodules/orderoptions.php:335 #: ../../extend/addon/hzaddons/cart/submodules/orderoptions.php:359 #: ../../extend/addon/hzaddons/cart/submodules/orderoptions.php:435 @@ -44,7 +44,7 @@ msgstr "Фокус (по умолчанию Hubzilla)" #: ../../Zotlabs/Module/Profiles.php:725 ../../Zotlabs/Module/Photos.php:1057 #: ../../Zotlabs/Module/Photos.php:1097 ../../Zotlabs/Module/Photos.php:1215 #: ../../Zotlabs/Module/Oauth.php:111 ../../Zotlabs/Module/Events.php:501 -#: ../../Zotlabs/Module/Rate.php:166 ../../Zotlabs/Module/Locs.php:121 +#: ../../Zotlabs/Module/Rate.php:166 ../../Zotlabs/Module/Locs.php:125 #: ../../Zotlabs/Module/Sources.php:125 ../../Zotlabs/Module/Sources.php:162 #: ../../Zotlabs/Module/Chat.php:209 ../../Zotlabs/Module/Chat.php:248 #: ../../Zotlabs/Module/Oauth2.php:116 @@ -62,7 +62,7 @@ msgstr "Фокус (по умолчанию Hubzilla)" #: ../../Zotlabs/Module/Settings/Photos.php:42 #: ../../Zotlabs/Module/Settings/Profiles.php:52 #: ../../Zotlabs/Module/Settings/Connections.php:42 -#: ../../Zotlabs/Module/Settings/Channel.php:494 +#: ../../Zotlabs/Module/Settings/Channel.php:495 #: ../../Zotlabs/Module/Filestorage.php:203 ../../Zotlabs/Module/Setup.php:304 #: ../../Zotlabs/Module/Setup.php:344 ../../Zotlabs/Module/Mitem.php:259 #: ../../Zotlabs/Module/Admin/Features.php:66 @@ -70,14 +70,14 @@ msgstr "Фокус (по умолчанию Hubzilla)" #: ../../Zotlabs/Module/Admin/Channels.php:147 #: ../../Zotlabs/Module/Admin/Security.php:120 #: ../../Zotlabs/Module/Admin/Addons.php:442 -#: ../../Zotlabs/Module/Admin/Site.php:287 +#: ../../Zotlabs/Module/Admin/Site.php:293 #: ../../Zotlabs/Module/Admin/Profs.php:178 #: ../../Zotlabs/Module/Admin/Themes.php:158 #: ../../Zotlabs/Module/Admin/Accounts.php:168 #: ../../Zotlabs/Module/Admin/Account_edit.php:73 #: ../../Zotlabs/Module/Tokens.php:188 ../../Zotlabs/Module/Thing.php:328 #: ../../Zotlabs/Module/Thing.php:381 ../../Zotlabs/Module/Editpost.php:86 -#: ../../Zotlabs/Module/Connedit.php:905 ../../Zotlabs/Module/Group.php:151 +#: ../../Zotlabs/Module/Connedit.php:896 ../../Zotlabs/Module/Group.php:151 #: ../../Zotlabs/Module/Group.php:167 ../../Zotlabs/Module/Mood.php:158 #: ../../Zotlabs/Module/Invite.php:168 ../../Zotlabs/Module/Connect.php:107 #: ../../Zotlabs/Module/Pdledit.php:108 ../../Zotlabs/Module/Affinity.php:87 @@ -87,10 +87,10 @@ msgstr "Фокус (по умолчанию Hubzilla)" #: ../../Zotlabs/Widget/Wiki_pages.php:99 #: ../../Zotlabs/Widget/Eventstools.php:16 ../../Zotlabs/Lib/ThreadItem.php:825 #: ../../extend/addon/hzaddons/pumpio/Mod_Pumpio.php:115 -#: ../../extend/addon/hzaddons/cart/cart.php:1261 +#: ../../extend/addon/hzaddons/cart/cart.php:1376 #: ../../extend/addon/hzaddons/cart/Settings/Cart.php:132 #: ../../extend/addon/hzaddons/cart/Settings/Cart.php:142 -#: ../../extend/addon/hzaddons/cart/submodules/manualcat.php:252 +#: ../../extend/addon/hzaddons/cart/submodules/manualcat.php:248 #: ../../extend/addon/hzaddons/cart/submodules/subscriptions.php:410 #: ../../extend/addon/hzaddons/cart/submodules/hzservices.php:643 #: ../../extend/addon/hzaddons/cart/submodules/orderoptions.php:312 @@ -153,35 +153,34 @@ msgstr "Узкая панель навигации" #: ../../view/theme/redbasic/php/config.php:99 #: ../../view/theme/redbasic/php/config.php:116 -#: ../../include/conversation.php:1451 ../../include/dir_fns.php:143 -#: ../../include/dir_fns.php:144 ../../include/dir_fns.php:145 -#: ../../boot.php:1703 ../../Zotlabs/Storage/Browser.php:411 +#: ../../include/conversation.php:1463 ../../include/dir_fns.php:142 +#: ../../include/dir_fns.php:143 ../../include/dir_fns.php:144 +#: ../../boot.php:1704 ../../Zotlabs/Storage/Browser.php:411 #: ../../Zotlabs/Module/Defperms.php:198 ../../Zotlabs/Module/Profiles.php:683 #: ../../Zotlabs/Module/Photos.php:672 ../../Zotlabs/Module/Api.php:99 #: ../../Zotlabs/Module/Events.php:478 ../../Zotlabs/Module/Events.php:479 #: ../../Zotlabs/Module/Sources.php:124 ../../Zotlabs/Module/Sources.php:159 #: ../../Zotlabs/Module/Settings/Display.php:90 -#: ../../Zotlabs/Module/Settings/Channel.php:310 +#: ../../Zotlabs/Module/Settings/Channel.php:311 #: ../../Zotlabs/Module/Filestorage.php:198 -#: ../../Zotlabs/Module/Filestorage.php:206 -#: ../../Zotlabs/Module/Removeme.php:63 ../../Zotlabs/Module/Menu.php:163 +#: ../../Zotlabs/Module/Filestorage.php:206 ../../Zotlabs/Module/Menu.php:163 #: ../../Zotlabs/Module/Menu.php:222 ../../Zotlabs/Module/Mitem.php:176 #: ../../Zotlabs/Module/Mitem.php:177 ../../Zotlabs/Module/Mitem.php:256 -#: ../../Zotlabs/Module/Mitem.php:257 ../../Zotlabs/Module/Admin/Site.php:253 -#: ../../Zotlabs/Module/Connedit.php:407 ../../Zotlabs/Module/Connedit.php:797 +#: ../../Zotlabs/Module/Mitem.php:257 ../../Zotlabs/Module/Admin/Site.php:259 +#: ../../Zotlabs/Module/Connedit.php:403 ../../Zotlabs/Module/Connedit.php:788 #: ../../Zotlabs/Module/Wiki.php:227 ../../Zotlabs/Module/Wiki.php:228 #: ../../Zotlabs/Module/Import.php:638 ../../Zotlabs/Module/Import.php:642 -#: ../../Zotlabs/Module/Import.php:643 ../../Zotlabs/Lib/Libzotdir.php:162 -#: ../../Zotlabs/Lib/Libzotdir.php:163 ../../Zotlabs/Lib/Libzotdir.php:165 +#: ../../Zotlabs/Module/Import.php:643 ../../Zotlabs/Lib/Libzotdir.php:164 +#: ../../Zotlabs/Lib/Libzotdir.php:165 ../../Zotlabs/Lib/Libzotdir.php:167 #: ../../extend/addon/hzaddons/pumpio/Mod_Pumpio.php:94 #: ../../extend/addon/hzaddons/pumpio/Mod_Pumpio.php:98 #: ../../extend/addon/hzaddons/pumpio/Mod_Pumpio.php:102 -#: ../../extend/addon/hzaddons/cart/cart.php:1255 +#: ../../extend/addon/hzaddons/cart/cart.php:1370 #: ../../extend/addon/hzaddons/cart/Settings/Cart.php:61 #: ../../extend/addon/hzaddons/cart/Settings/Cart.php:73 #: ../../extend/addon/hzaddons/cart/submodules/manualcat.php:63 +#: ../../extend/addon/hzaddons/cart/submodules/manualcat.php:254 #: ../../extend/addon/hzaddons/cart/submodules/manualcat.php:258 -#: ../../extend/addon/hzaddons/cart/submodules/manualcat.php:262 #: ../../extend/addon/hzaddons/cart/submodules/subscriptions.php:153 #: ../../extend/addon/hzaddons/cart/submodules/subscriptions.php:425 #: ../../extend/addon/hzaddons/cart/submodules/paypalbuttonV2.php:88 @@ -225,35 +224,34 @@ msgstr "Нет" #: ../../view/theme/redbasic/php/config.php:99 #: ../../view/theme/redbasic/php/config.php:116 -#: ../../include/conversation.php:1451 ../../include/dir_fns.php:143 -#: ../../include/dir_fns.php:144 ../../include/dir_fns.php:145 -#: ../../boot.php:1703 ../../Zotlabs/Storage/Browser.php:411 +#: ../../include/conversation.php:1463 ../../include/dir_fns.php:142 +#: ../../include/dir_fns.php:143 ../../include/dir_fns.php:144 +#: ../../boot.php:1704 ../../Zotlabs/Storage/Browser.php:411 #: ../../Zotlabs/Module/Defperms.php:198 ../../Zotlabs/Module/Profiles.php:683 #: ../../Zotlabs/Module/Photos.php:672 ../../Zotlabs/Module/Api.php:98 #: ../../Zotlabs/Module/Events.php:478 ../../Zotlabs/Module/Events.php:479 #: ../../Zotlabs/Module/Sources.php:124 ../../Zotlabs/Module/Sources.php:159 #: ../../Zotlabs/Module/Settings/Display.php:90 -#: ../../Zotlabs/Module/Settings/Channel.php:310 +#: ../../Zotlabs/Module/Settings/Channel.php:311 #: ../../Zotlabs/Module/Filestorage.php:198 -#: ../../Zotlabs/Module/Filestorage.php:206 -#: ../../Zotlabs/Module/Removeme.php:63 ../../Zotlabs/Module/Menu.php:163 +#: ../../Zotlabs/Module/Filestorage.php:206 ../../Zotlabs/Module/Menu.php:163 #: ../../Zotlabs/Module/Menu.php:222 ../../Zotlabs/Module/Mitem.php:176 #: ../../Zotlabs/Module/Mitem.php:177 ../../Zotlabs/Module/Mitem.php:256 -#: ../../Zotlabs/Module/Mitem.php:257 ../../Zotlabs/Module/Admin/Site.php:255 -#: ../../Zotlabs/Module/Connedit.php:407 ../../Zotlabs/Module/Wiki.php:227 +#: ../../Zotlabs/Module/Mitem.php:257 ../../Zotlabs/Module/Admin/Site.php:261 +#: ../../Zotlabs/Module/Connedit.php:403 ../../Zotlabs/Module/Wiki.php:227 #: ../../Zotlabs/Module/Wiki.php:228 ../../Zotlabs/Module/Import.php:638 #: ../../Zotlabs/Module/Import.php:642 ../../Zotlabs/Module/Import.php:643 -#: ../../Zotlabs/Lib/Libzotdir.php:162 ../../Zotlabs/Lib/Libzotdir.php:163 -#: ../../Zotlabs/Lib/Libzotdir.php:165 +#: ../../Zotlabs/Lib/Libzotdir.php:164 ../../Zotlabs/Lib/Libzotdir.php:165 +#: ../../Zotlabs/Lib/Libzotdir.php:167 #: ../../extend/addon/hzaddons/pumpio/Mod_Pumpio.php:94 #: ../../extend/addon/hzaddons/pumpio/Mod_Pumpio.php:98 #: ../../extend/addon/hzaddons/pumpio/Mod_Pumpio.php:102 -#: ../../extend/addon/hzaddons/cart/cart.php:1255 +#: ../../extend/addon/hzaddons/cart/cart.php:1370 #: ../../extend/addon/hzaddons/cart/Settings/Cart.php:61 #: ../../extend/addon/hzaddons/cart/Settings/Cart.php:73 #: ../../extend/addon/hzaddons/cart/submodules/manualcat.php:63 +#: ../../extend/addon/hzaddons/cart/submodules/manualcat.php:254 #: ../../extend/addon/hzaddons/cart/submodules/manualcat.php:258 -#: ../../extend/addon/hzaddons/cart/submodules/manualcat.php:262 #: ../../extend/addon/hzaddons/cart/submodules/subscriptions.php:153 #: ../../extend/addon/hzaddons/cart/submodules/subscriptions.php:425 #: ../../extend/addon/hzaddons/cart/submodules/paypalbuttonV2.php:88 @@ -404,13 +402,13 @@ msgid "Monthly" msgstr "Ежемесячно" #: ../../include/selectors.php:60 ../../include/selectors.php:77 -#: ../../include/channel.php:1707 +#: ../../include/channel.php:1708 #: ../../extend/addon/hzaddons/openid/Mod_Id.php:85 msgid "Male" msgstr "Мужчина" #: ../../include/selectors.php:60 ../../include/selectors.php:77 -#: ../../include/channel.php:1705 +#: ../../include/channel.php:1706 #: ../../extend/addon/hzaddons/openid/Mod_Id.php:87 msgid "Female" msgstr "Женщина" @@ -447,20 +445,20 @@ msgstr "Транссексуал" msgid "Hermaphrodite" msgstr "Гермафродит" -#: ../../include/selectors.php:60 ../../include/channel.php:1711 +#: ../../include/selectors.php:60 ../../include/channel.php:1712 msgid "Neuter" msgstr "Среднего рода" -#: ../../include/selectors.php:60 ../../include/channel.php:1713 +#: ../../include/selectors.php:60 ../../include/channel.php:1714 msgid "Non-specific" msgstr "Неспецифический" #: ../../include/selectors.php:60 ../../include/selectors.php:77 #: ../../include/selectors.php:115 ../../include/selectors.php:151 -#: ../../include/connections.php:735 ../../include/connections.php:742 +#: ../../include/connections.php:740 ../../include/connections.php:747 #: ../../include/event.php:1429 ../../include/event.php:1436 #: ../../Zotlabs/Module/Cdav.php:1380 ../../Zotlabs/Module/Profiles.php:797 -#: ../../Zotlabs/Module/Connedit.php:936 +#: ../../Zotlabs/Module/Connedit.php:927 #: ../../Zotlabs/Access/PermissionRoles.php:310 msgid "Other" msgstr "Другой" @@ -557,14 +555,14 @@ msgstr "Неверный" msgid "Sex Addict" msgstr "Эротоман" -#: ../../include/selectors.php:134 ../../include/channel.php:504 -#: ../../include/channel.php:505 ../../include/channel.php:512 +#: ../../include/selectors.php:134 ../../include/channel.php:505 +#: ../../include/channel.php:506 ../../include/channel.php:513 #: ../../Zotlabs/Module/Settings/Channel.php:71 #: ../../Zotlabs/Module/Settings/Channel.php:75 #: ../../Zotlabs/Module/Settings/Channel.php:76 #: ../../Zotlabs/Module/Settings/Channel.php:79 #: ../../Zotlabs/Module/Settings/Channel.php:90 -#: ../../Zotlabs/Module/Connedit.php:726 ../../Zotlabs/Widget/Affinity.php:32 +#: ../../Zotlabs/Module/Connedit.php:717 ../../Zotlabs/Widget/Affinity.php:32 msgid "Friends" msgstr "Друзья" @@ -652,17 +650,17 @@ msgstr "Всё равно" msgid "Ask me" msgstr "Спроси меня" -#: ../../include/photos.php:27 ../../include/items.php:3965 +#: ../../include/photos.php:27 ../../include/items.php:3966 #: ../../include/attach.php:156 ../../include/attach.php:205 #: ../../include/attach.php:278 ../../include/attach.php:386 #: ../../include/attach.php:400 ../../include/attach.php:407 #: ../../include/attach.php:489 ../../include/attach.php:1055 #: ../../include/attach.php:1129 ../../include/attach.php:1292 #: ../../Zotlabs/Module/Defperms.php:182 ../../Zotlabs/Module/Network.php:19 -#: ../../Zotlabs/Module/Common.php:38 ../../Zotlabs/Module/Item.php:383 -#: ../../Zotlabs/Module/Item.php:402 ../../Zotlabs/Module/Item.php:412 -#: ../../Zotlabs/Module/Item.php:1328 ../../Zotlabs/Module/Achievements.php:34 -#: ../../Zotlabs/Module/Display.php:456 ../../Zotlabs/Module/Poke.php:157 +#: ../../Zotlabs/Module/Common.php:38 ../../Zotlabs/Module/Item.php:483 +#: ../../Zotlabs/Module/Item.php:502 ../../Zotlabs/Module/Item.php:512 +#: ../../Zotlabs/Module/Item.php:1428 ../../Zotlabs/Module/Achievements.php:34 +#: ../../Zotlabs/Module/Display.php:442 ../../Zotlabs/Module/Poke.php:157 #: ../../Zotlabs/Module/Profile.php:85 ../../Zotlabs/Module/Profile.php:101 #: ../../Zotlabs/Module/Appman.php:87 ../../Zotlabs/Module/Profiles.php:200 #: ../../Zotlabs/Module/Profiles.php:637 ../../Zotlabs/Module/Photos.php:71 @@ -678,7 +676,7 @@ msgstr "Спроси меня" #: ../../Zotlabs/Module/Viewconnections.php:28 #: ../../Zotlabs/Module/Viewconnections.php:33 #: ../../Zotlabs/Module/Rate.php:113 ../../Zotlabs/Module/Regmod.php:20 -#: ../../Zotlabs/Module/Settings.php:59 ../../Zotlabs/Module/Locs.php:87 +#: ../../Zotlabs/Module/Settings.php:59 ../../Zotlabs/Module/Locs.php:91 #: ../../Zotlabs/Module/Sources.php:80 ../../Zotlabs/Module/Chat.php:113 #: ../../Zotlabs/Module/Chat.php:118 ../../Zotlabs/Module/Vote.php:19 #: ../../Zotlabs/Module/Editlayout.php:67 @@ -705,7 +703,7 @@ msgstr "Спроси меня" #: ../../Zotlabs/Module/Moderate.php:15 ../../Zotlabs/Module/Webpages.php:133 #: ../../Zotlabs/Module/Profile_photo.php:338 #: ../../Zotlabs/Module/Profile_photo.php:351 -#: ../../Zotlabs/Module/Editpost.php:17 ../../Zotlabs/Module/Connedit.php:400 +#: ../../Zotlabs/Module/Editpost.php:17 ../../Zotlabs/Module/Connedit.php:396 #: ../../Zotlabs/Module/Group.php:15 ../../Zotlabs/Module/Group.php:31 #: ../../Zotlabs/Module/Connections.php:32 ../../Zotlabs/Module/Mood.php:126 #: ../../Zotlabs/Module/Card_edit.php:51 @@ -717,7 +715,7 @@ msgstr "Спроси меня" #: ../../Zotlabs/Module/Manage.php:10 ../../Zotlabs/Module/Suggest.php:32 #: ../../Zotlabs/Module/Cards.php:86 ../../Zotlabs/Module/Layouts.php:71 #: ../../Zotlabs/Module/Layouts.php:78 ../../Zotlabs/Module/Layouts.php:89 -#: ../../Zotlabs/Web/WebServer.php:115 ../../Zotlabs/Lib/Chatroom.php:135 +#: ../../Zotlabs/Web/WebServer.php:116 ../../Zotlabs/Lib/Chatroom.php:135 #: ../../extend/addon/hzaddons/pumpio/pumpio.php:44 #: ../../extend/addon/hzaddons/openid/Mod_Id.php:53 #: ../../extend/addon/hzaddons/keepout/keepout.php:36 @@ -800,7 +798,8 @@ msgstr[0] "доступно %d приглашение" msgstr[1] "доступны %d приглашения" msgstr[2] "доступны %d приглашений" -#: ../../include/contact_widgets.php:16 ../../Zotlabs/Module/Admin/Site.php:291 +#: ../../include/contact_widgets.php:16 ../../include/acl_selectors.php:135 +#: ../../Zotlabs/Module/Admin/Site.php:297 msgid "Advanced" msgstr "Дополнительно" @@ -849,31 +848,31 @@ msgstr "Расширенный пример: name=ivan and country=russia" msgid "Saved Folders" msgstr "Сохранённые каталоги" -#: ../../include/contact_widgets.php:56 ../../include/contact_widgets.php:99 -#: ../../include/contact_widgets.php:142 ../../include/contact_widgets.php:187 +#: ../../include/contact_widgets.php:56 ../../include/contact_widgets.php:111 +#: ../../include/contact_widgets.php:155 ../../include/contact_widgets.php:200 #: ../../Zotlabs/Widget/Filer.php:31 ../../Zotlabs/Widget/Appcategories.php:46 msgid "Everything" msgstr "Всё" -#: ../../include/contact_widgets.php:96 ../../include/contact_widgets.php:139 -#: ../../include/contact_widgets.php:184 ../../include/taxonomy.php:409 -#: ../../include/taxonomy.php:491 ../../include/taxonomy.php:511 -#: ../../include/taxonomy.php:532 ../../Zotlabs/Module/Cdav.php:1066 +#: ../../include/contact_widgets.php:108 ../../include/contact_widgets.php:152 +#: ../../include/contact_widgets.php:197 ../../include/taxonomy.php:418 +#: ../../include/taxonomy.php:500 ../../include/taxonomy.php:520 +#: ../../include/taxonomy.php:541 ../../Zotlabs/Module/Cdav.php:1066 #: ../../Zotlabs/Widget/Appcategories.php:43 msgid "Categories" msgstr "Категории" -#: ../../include/contact_widgets.php:218 +#: ../../include/contact_widgets.php:231 msgid "Common Connections" msgstr "Общие контакты" -#: ../../include/contact_widgets.php:222 +#: ../../include/contact_widgets.php:235 #, php-format msgid "View all %d common connections" msgstr "Просмотреть все %d общих контактов" -#: ../../include/menu.php:120 ../../include/channel.php:1523 -#: ../../include/channel.php:1527 ../../Zotlabs/Storage/Browser.php:296 +#: ../../include/menu.php:120 ../../include/channel.php:1524 +#: ../../include/channel.php:1528 ../../Zotlabs/Storage/Browser.php:296 #: ../../Zotlabs/Module/Oauth.php:173 ../../Zotlabs/Module/Oauth2.php:194 #: ../../Zotlabs/Module/Editlayout.php:114 #: ../../Zotlabs/Module/Editblock.php:114 ../../Zotlabs/Module/Menu.php:176 @@ -912,12 +911,12 @@ msgstr "Идентификатор аккаунта отсутствует" msgid "Nickname is required." msgstr "Требуется псевдоним." -#: ../../include/channel.php:225 ../../include/channel.php:705 +#: ../../include/channel.php:225 ../../include/channel.php:706 #: ../../Zotlabs/Module/Changeaddr.php:46 msgid "Reserved nickname. Please choose another." msgstr "Зарезервированый псевдоним. Пожалуйста, выберите другой." -#: ../../include/channel.php:230 ../../include/channel.php:710 +#: ../../include/channel.php:230 ../../include/channel.php:711 #: ../../Zotlabs/Module/Changeaddr.php:51 msgid "" "Nickname has unsupported characters or is already being used on this site." @@ -927,19 +926,19 @@ msgstr "Псевдоним имеет недопустимые символы и msgid "Unable to retrieve created identity" msgstr "Не удается получить созданный идентификатор" -#: ../../include/channel.php:440 +#: ../../include/channel.php:441 msgid "Default Profile" msgstr "Профиль по умолчанию" -#: ../../include/channel.php:638 ../../include/channel.php:727 +#: ../../include/channel.php:639 ../../include/channel.php:728 msgid "Unable to retrieve modified identity" msgstr "Не удается найти изменённый идентификатор" -#: ../../include/channel.php:1370 +#: ../../include/channel.php:1371 msgid "Requested channel is not available." msgstr "Запрошенный канал не доступен." -#: ../../include/channel.php:1424 ../../Zotlabs/Module/Achievements.php:15 +#: ../../include/channel.php:1425 ../../Zotlabs/Module/Achievements.php:15 #: ../../Zotlabs/Module/Profile.php:20 ../../Zotlabs/Module/Editlayout.php:31 #: ../../Zotlabs/Module/Filestorage.php:53 #: ../../Zotlabs/Module/Editblock.php:31 ../../Zotlabs/Module/Menu.php:92 @@ -951,83 +950,83 @@ msgstr "Запрошенный канал не доступен." msgid "Requested profile is not available." msgstr "Запрашиваемый профиль не доступен." -#: ../../include/channel.php:1516 ../../Zotlabs/Module/Profiles.php:730 +#: ../../include/channel.php:1517 ../../Zotlabs/Module/Profiles.php:730 msgid "Change profile photo" msgstr "Изменить фотографию профиля" -#: ../../include/channel.php:1523 ../../include/nav.php:115 +#: ../../include/channel.php:1524 ../../include/nav.php:115 #: ../../Zotlabs/Module/Profiles.php:832 msgid "Edit Profiles" msgstr "Редактирование профилей" -#: ../../include/channel.php:1524 +#: ../../include/channel.php:1525 msgid "Create New Profile" msgstr "Создать новый профиль" -#: ../../include/channel.php:1527 ../../include/nav.php:117 +#: ../../include/channel.php:1528 ../../include/nav.php:117 #: ../../extend/addon/hzaddons/openclipatar/openclipatar.php:58 msgid "Edit Profile" msgstr "Редактировать профиль" -#: ../../include/channel.php:1542 ../../Zotlabs/Module/Profiles.php:822 +#: ../../include/channel.php:1543 ../../Zotlabs/Module/Profiles.php:822 msgid "Profile Image" msgstr "Изображение профиля" -#: ../../include/channel.php:1545 +#: ../../include/channel.php:1546 msgid "Visible to everybody" msgstr "Видно всем" -#: ../../include/channel.php:1546 ../../Zotlabs/Module/Profiles.php:727 +#: ../../include/channel.php:1547 ../../Zotlabs/Module/Profiles.php:727 #: ../../Zotlabs/Module/Profiles.php:826 msgid "Edit visibility" msgstr "Редактировать видимость" -#: ../../include/channel.php:1603 ../../include/conversation.php:1085 +#: ../../include/channel.php:1604 ../../include/conversation.php:1097 #: ../../include/connections.php:110 ../../Zotlabs/Module/Directory.php:368 #: ../../Zotlabs/Module/Connections.php:349 ../../Zotlabs/Module/Suggest.php:71 #: ../../Zotlabs/Widget/Suggestions.php:46 ../../Zotlabs/Widget/Follow.php:32 msgid "Connect" msgstr "Подключить" -#: ../../include/channel.php:1618 ../../include/event.php:63 +#: ../../include/channel.php:1619 ../../include/event.php:63 #: ../../include/event.php:134 ../../Zotlabs/Module/Directory.php:352 msgid "Location:" msgstr "Местоположение:" -#: ../../include/channel.php:1622 ../../include/channel.php:1750 +#: ../../include/channel.php:1623 ../../include/channel.php:1751 msgid "Gender:" msgstr "Пол:" -#: ../../include/channel.php:1623 ../../include/channel.php:1794 +#: ../../include/channel.php:1624 ../../include/channel.php:1795 msgid "Status:" msgstr "Статус:" -#: ../../include/channel.php:1624 ../../include/channel.php:1818 +#: ../../include/channel.php:1625 ../../include/channel.php:1819 msgid "Homepage:" msgstr "Домашняя страница:" -#: ../../include/channel.php:1625 +#: ../../include/channel.php:1626 msgid "Online Now" msgstr "Сейчас в сети" -#: ../../include/channel.php:1678 +#: ../../include/channel.php:1679 msgid "Change your profile photo" msgstr "Изменить фотографию вашего профиля" -#: ../../include/channel.php:1709 +#: ../../include/channel.php:1710 msgid "Trans" msgstr "Трансексуал" -#: ../../include/channel.php:1748 ../../Zotlabs/Module/Settings/Channel.php:500 +#: ../../include/channel.php:1749 ../../Zotlabs/Module/Settings/Channel.php:501 msgid "Full Name:" msgstr "Полное имя:" -#: ../../include/channel.php:1755 +#: ../../include/channel.php:1756 msgid "Like this channel" msgstr "нравится этот канал" -#: ../../include/channel.php:1766 ../../include/conversation.php:1734 -#: ../../include/taxonomy.php:659 ../../Zotlabs/Module/Photos.php:1135 +#: ../../include/channel.php:1767 ../../include/conversation.php:1746 +#: ../../include/taxonomy.php:668 ../../Zotlabs/Module/Photos.php:1135 #: ../../Zotlabs/Lib/ThreadItem.php:242 msgctxt "noun" msgid "Like" @@ -1036,135 +1035,135 @@ msgstr[0] "Нравится" msgstr[1] "Нравится" msgstr[2] "Нравится" -#: ../../include/channel.php:1779 +#: ../../include/channel.php:1780 msgid "j F, Y" msgstr "" -#: ../../include/channel.php:1780 +#: ../../include/channel.php:1781 msgid "j F" msgstr "" -#: ../../include/channel.php:1787 +#: ../../include/channel.php:1788 msgid "Birthday:" msgstr "День рождения:" -#: ../../include/channel.php:1791 ../../Zotlabs/Module/Directory.php:347 +#: ../../include/channel.php:1792 ../../Zotlabs/Module/Directory.php:347 msgid "Age:" msgstr "Возраст:" -#: ../../include/channel.php:1800 +#: ../../include/channel.php:1801 #, php-format msgid "for %1$d %2$s" msgstr "для %1$d %2$s" -#: ../../include/channel.php:1812 +#: ../../include/channel.php:1813 msgid "Tags:" msgstr "Теги:" -#: ../../include/channel.php:1816 +#: ../../include/channel.php:1817 msgid "Sexual Preference:" msgstr "Сексуальные предпочтения:" -#: ../../include/channel.php:1820 ../../Zotlabs/Module/Directory.php:365 +#: ../../include/channel.php:1821 ../../Zotlabs/Module/Directory.php:365 msgid "Hometown:" msgstr "Родной город:" -#: ../../include/channel.php:1822 +#: ../../include/channel.php:1823 msgid "Political Views:" msgstr "Политические взгляды:" -#: ../../include/channel.php:1824 +#: ../../include/channel.php:1825 msgid "Religion:" msgstr "Религия:" -#: ../../include/channel.php:1826 ../../Zotlabs/Module/Directory.php:367 +#: ../../include/channel.php:1827 ../../Zotlabs/Module/Directory.php:367 msgid "About:" msgstr "О себе:" -#: ../../include/channel.php:1828 +#: ../../include/channel.php:1829 msgid "Hobbies/Interests:" msgstr "Хобби / интересы:" -#: ../../include/channel.php:1830 +#: ../../include/channel.php:1831 msgid "Likes:" msgstr "Что вам нравится:" -#: ../../include/channel.php:1832 +#: ../../include/channel.php:1833 msgid "Dislikes:" msgstr "Что вам не нравится:" -#: ../../include/channel.php:1834 +#: ../../include/channel.php:1835 msgid "Contact information and Social Networks:" msgstr "Контактная информация и социальные сети:" -#: ../../include/channel.php:1836 +#: ../../include/channel.php:1837 msgid "My other channels:" msgstr "Мои другие каналы:" -#: ../../include/channel.php:1838 +#: ../../include/channel.php:1839 msgid "Musical interests:" msgstr "Музыкальные интересы:" -#: ../../include/channel.php:1840 +#: ../../include/channel.php:1841 msgid "Books, literature:" msgstr "Книги, литература:" -#: ../../include/channel.php:1842 +#: ../../include/channel.php:1843 msgid "Television:" msgstr "Телевидение:" -#: ../../include/channel.php:1844 +#: ../../include/channel.php:1845 msgid "Film/dance/culture/entertainment:" msgstr "Кино / танцы / культура / развлечения:" -#: ../../include/channel.php:1846 +#: ../../include/channel.php:1847 msgid "Love/Romance:" msgstr "Любовь / романтика:" -#: ../../include/channel.php:1848 +#: ../../include/channel.php:1849 msgid "Work/employment:" msgstr "Работа / занятость:" -#: ../../include/channel.php:1850 +#: ../../include/channel.php:1851 msgid "School/education:" msgstr "Школа / образование:" -#: ../../include/channel.php:1871 ../../Zotlabs/Module/Profperm.php:113 +#: ../../include/channel.php:1872 ../../Zotlabs/Module/Profperm.php:113 #: ../../Zotlabs/Lib/Apps.php:362 msgid "Profile" msgstr "Профиль" -#: ../../include/channel.php:1873 +#: ../../include/channel.php:1874 msgid "Like this thing" msgstr "нравится этo" -#: ../../include/channel.php:1874 ../../Zotlabs/Module/Events.php:699 +#: ../../include/channel.php:1875 ../../Zotlabs/Module/Events.php:699 msgid "Export" msgstr "Экспорт" -#: ../../include/channel.php:2312 ../../Zotlabs/Module/Cover_photo.php:304 +#: ../../include/channel.php:2314 ../../Zotlabs/Module/Cover_photo.php:304 msgid "cover photo" msgstr "фотография обложки" -#: ../../include/channel.php:2601 ../../boot.php:1699 -#: ../../Zotlabs/Module/Rmagic.php:93 +#: ../../include/channel.php:2603 ../../boot.php:1700 +#: ../../Zotlabs/Module/Rmagic.php:96 msgid "Remote Authentication" msgstr "Удаленная аутентификация" -#: ../../include/channel.php:2602 ../../Zotlabs/Module/Rmagic.php:94 +#: ../../include/channel.php:2604 ../../Zotlabs/Module/Rmagic.php:97 msgid "Enter your channel address (e.g. channel@example.com)" msgstr "Введите адрес вашего канала (например: channel@example.com)" -#: ../../include/channel.php:2603 ../../Zotlabs/Module/Rmagic.php:95 +#: ../../include/channel.php:2605 ../../Zotlabs/Module/Rmagic.php:98 msgid "Authenticate" msgstr "Проверка подлинности" -#: ../../include/channel.php:2758 ../../Zotlabs/Module/Admin/Accounts.php:91 +#: ../../include/channel.php:2763 ../../Zotlabs/Module/Admin/Accounts.php:91 #, php-format msgid "Account '%s' deleted" msgstr "Аккаунт '%s' удален" -#: ../../include/message.php:13 ../../include/text.php:1824 +#: ../../include/message.php:13 ../../include/text.php:1843 msgid "Download binary/encrypted content" msgstr "Загрузить двоичное / зашифрованное содержимое" @@ -1189,8 +1188,9 @@ msgstr "Сохранённая публикация не может быть п msgid "%1$s wrote the following %2$s %3$s" msgstr "%1$s была создана %2$s %3$s" -#: ../../include/markdown.php:204 ../../include/bbcode.php:523 -#: ../../Zotlabs/Module/Tagger.php:79 +#: ../../include/markdown.php:204 ../../include/text.php:2258 +#: ../../include/bbcode.php:523 ../../include/conversation.php:158 +#: ../../Zotlabs/Module/Tagger.php:79 ../../Zotlabs/Lib/Activity.php:2967 msgid "post" msgstr "публикация" @@ -1203,7 +1203,7 @@ msgstr "спойлер" #: ../../Zotlabs/Module/Profperm.php:28 ../../Zotlabs/Module/Like.php:295 #: ../../Zotlabs/Module/Subthread.php:86 ../../Zotlabs/Module/Group.php:99 #: ../../Zotlabs/Module/Cloud.php:119 ../../Zotlabs/Module/Import_items.php:120 -#: ../../Zotlabs/Web/WebServer.php:114 +#: ../../Zotlabs/Web/WebServer.php:115 #: ../../extend/addon/hzaddons/redphotos/redphotos.php:119 #: ../../extend/addon/hzaddons/redfiles/redfiles.php:109 #: ../../extend/addon/hzaddons/hzfiles/hzfiles.php:75 @@ -1247,8 +1247,8 @@ msgstr "Видно только одобренным контактам." msgid "Visible to specific connections." msgstr "Видно указанным контактам." -#: ../../include/items.php:3888 ../../Zotlabs/Module/Display.php:45 -#: ../../Zotlabs/Module/Display.php:460 ../../Zotlabs/Module/Admin.php:62 +#: ../../include/items.php:3889 ../../Zotlabs/Module/Display.php:45 +#: ../../Zotlabs/Module/Display.php:446 ../../Zotlabs/Module/Admin.php:62 #: ../../Zotlabs/Module/Filestorage.php:26 ../../Zotlabs/Module/Viewsrc.php:25 #: ../../Zotlabs/Module/Admin/Addons.php:260 #: ../../Zotlabs/Module/Admin/Themes.php:72 ../../Zotlabs/Module/Thing.php:96 @@ -1257,67 +1257,67 @@ msgstr "Видно указанным контактам." msgid "Item not found." msgstr "Элемент не найден." -#: ../../include/items.php:4465 ../../Zotlabs/Module/Group.php:62 +#: ../../include/items.php:4466 ../../Zotlabs/Module/Group.php:62 #: ../../Zotlabs/Module/Group.php:214 msgid "Privacy group not found." msgstr "Группа конфиденциальности не найдена." -#: ../../include/items.php:4481 +#: ../../include/items.php:4482 msgid "Privacy group is empty." msgstr "Группа конфиденциальности пуста" -#: ../../include/items.php:4488 +#: ../../include/items.php:4489 #, php-format msgid "Privacy group: %s" msgstr "Группа конфиденциальности: %s" -#: ../../include/items.php:4498 ../../Zotlabs/Module/Connedit.php:868 +#: ../../include/items.php:4499 ../../Zotlabs/Module/Connedit.php:859 #, php-format msgid "Connection: %s" msgstr "Контакт: %s" -#: ../../include/items.php:4500 +#: ../../include/items.php:4501 msgid "Connection not found." msgstr "Контакт не найден." -#: ../../include/items.php:4834 ../../Zotlabs/Module/Cover_photo.php:297 +#: ../../include/items.php:4835 ../../Zotlabs/Module/Cover_photo.php:297 msgid "female" msgstr "женщина" -#: ../../include/items.php:4835 ../../Zotlabs/Module/Cover_photo.php:298 +#: ../../include/items.php:4836 ../../Zotlabs/Module/Cover_photo.php:298 #, php-format msgid "%1$s updated her %2$s" msgstr "%1$s обновила её %2$s" -#: ../../include/items.php:4836 ../../Zotlabs/Module/Cover_photo.php:299 +#: ../../include/items.php:4837 ../../Zotlabs/Module/Cover_photo.php:299 msgid "male" msgstr "мужчина" -#: ../../include/items.php:4837 ../../Zotlabs/Module/Cover_photo.php:300 +#: ../../include/items.php:4838 ../../Zotlabs/Module/Cover_photo.php:300 #, php-format msgid "%1$s updated his %2$s" msgstr "%1$s обновил его %2$s" -#: ../../include/items.php:4839 ../../Zotlabs/Module/Cover_photo.php:302 +#: ../../include/items.php:4840 ../../Zotlabs/Module/Cover_photo.php:302 #, php-format msgid "%1$s updated their %2$s" msgstr "%2$s %1$s обновлена" -#: ../../include/items.php:4841 +#: ../../include/items.php:4842 msgid "profile photo" msgstr "Фотография профиля" -#: ../../include/items.php:5033 +#: ../../include/items.php:5034 #, php-format msgid "[Edited %s]" msgstr "[Отредактировано %s]" -#: ../../include/items.php:5033 +#: ../../include/items.php:5034 msgctxt "edit_activity" msgid "Post" msgstr "Публикация" -#: ../../include/items.php:5033 +#: ../../include/items.php:5034 msgctxt "edit_activity" msgid "Comment" msgstr "Комментарий" @@ -1407,7 +1407,7 @@ msgstr "Использовать режим блога / списка" msgid "Comments will be displayed separately" msgstr "Комментарии будут отображаться отдельно" -#: ../../include/features.php:133 ../../include/text.php:1017 +#: ../../include/features.php:133 ../../include/text.php:1036 #: ../../Zotlabs/Module/Connections.php:374 ../../Zotlabs/Lib/Apps.php:333 msgid "Connections" msgstr "Контакты" @@ -1686,54 +1686,54 @@ msgstr "старше" msgid "newer" msgstr "новее" -#: ../../include/text.php:1005 +#: ../../include/text.php:1024 msgid "No connections" msgstr "Нет контактов" -#: ../../include/text.php:1025 ../../Zotlabs/Module/Viewconnections.php:80 +#: ../../include/text.php:1044 ../../Zotlabs/Module/Viewconnections.php:80 #: ../../Zotlabs/Module/Connections.php:288 msgid "Accepts" msgstr "Принимает" -#: ../../include/text.php:1028 ../../Zotlabs/Module/Viewconnections.php:83 +#: ../../include/text.php:1047 ../../Zotlabs/Module/Viewconnections.php:83 #: ../../Zotlabs/Module/Connections.php:291 msgid "Comments" msgstr "комментарии" -#: ../../include/text.php:1033 ../../Zotlabs/Module/Viewconnections.php:88 +#: ../../include/text.php:1052 ../../Zotlabs/Module/Viewconnections.php:88 #: ../../Zotlabs/Module/Connections.php:296 msgid "Stream items" msgstr "публикации в потоке" -#: ../../include/text.php:1038 ../../Zotlabs/Module/Viewconnections.php:93 +#: ../../include/text.php:1057 ../../Zotlabs/Module/Viewconnections.php:93 #: ../../Zotlabs/Module/Connections.php:301 msgid "Wall posts" msgstr "публикации на стене" -#: ../../include/text.php:1042 ../../Zotlabs/Module/Viewconnections.php:97 +#: ../../include/text.php:1061 ../../Zotlabs/Module/Viewconnections.php:97 #: ../../Zotlabs/Module/Connections.php:305 msgid "Nothing" msgstr "ничего" -#: ../../include/text.php:1057 +#: ../../include/text.php:1076 #, php-format msgid "View all %s connections" msgstr "Просмотреть все %s контактов" -#: ../../include/text.php:1120 +#: ../../include/text.php:1139 #, php-format msgid "Network: %s" msgstr "Сеть: %s" -#: ../../include/text.php:1131 ../../include/text.php:1143 -#: ../../include/acl_selectors.php:118 ../../include/nav.php:188 +#: ../../include/text.php:1150 ../../include/text.php:1162 +#: ../../include/acl_selectors.php:139 ../../include/nav.php:188 #: ../../Zotlabs/Module/Search.php:44 ../../Zotlabs/Module/Connections.php:378 #: ../../Zotlabs/Widget/Sitesearch.php:31 #: ../../Zotlabs/Widget/Activity_filter.php:193 ../../Zotlabs/Lib/Apps.php:353 msgid "Search" msgstr "Поиск" -#: ../../include/text.php:1132 ../../include/text.php:1144 +#: ../../include/text.php:1151 ../../include/text.php:1163 #: ../../Zotlabs/Module/Admin/Profs.php:94 #: ../../Zotlabs/Module/Admin/Profs.php:114 ../../Zotlabs/Module/Rbmark.php:32 #: ../../Zotlabs/Module/Rbmark.php:104 ../../Zotlabs/Module/Filer.php:53 @@ -1742,310 +1742,310 @@ msgstr "Поиск" msgid "Save" msgstr "Запомнить" -#: ../../include/text.php:1223 ../../include/text.php:1227 +#: ../../include/text.php:1242 ../../include/text.php:1246 msgid "poke" msgstr "Ткнуть" -#: ../../include/text.php:1223 ../../include/text.php:1227 -#: ../../include/conversation.php:255 +#: ../../include/text.php:1242 ../../include/text.php:1246 +#: ../../include/conversation.php:267 msgid "poked" msgstr "ткнут" -#: ../../include/text.php:1228 +#: ../../include/text.php:1247 msgid "ping" msgstr "Пингануть" -#: ../../include/text.php:1228 +#: ../../include/text.php:1247 msgid "pinged" msgstr "Отпингован" -#: ../../include/text.php:1229 +#: ../../include/text.php:1248 msgid "prod" msgstr "Подтолкнуть" -#: ../../include/text.php:1229 +#: ../../include/text.php:1248 msgid "prodded" msgstr "Подтолкнут" -#: ../../include/text.php:1230 +#: ../../include/text.php:1249 msgid "slap" msgstr "Шлёпнуть" -#: ../../include/text.php:1230 +#: ../../include/text.php:1249 msgid "slapped" msgstr "Шлёпнут" -#: ../../include/text.php:1231 +#: ../../include/text.php:1250 msgid "finger" msgstr "Указать" -#: ../../include/text.php:1231 +#: ../../include/text.php:1250 msgid "fingered" msgstr "Указан" -#: ../../include/text.php:1232 +#: ../../include/text.php:1251 msgid "rebuff" msgstr "Дать отпор" -#: ../../include/text.php:1232 +#: ../../include/text.php:1251 msgid "rebuffed" msgstr "Дан отпор" -#: ../../include/text.php:1255 +#: ../../include/text.php:1274 msgid "happy" msgstr "счастливый" -#: ../../include/text.php:1256 +#: ../../include/text.php:1275 msgid "sad" msgstr "грустный" -#: ../../include/text.php:1257 +#: ../../include/text.php:1276 msgid "mellow" msgstr "спокойный" -#: ../../include/text.php:1258 +#: ../../include/text.php:1277 msgid "tired" msgstr "усталый" -#: ../../include/text.php:1259 +#: ../../include/text.php:1278 msgid "perky" msgstr "весёлый" -#: ../../include/text.php:1260 +#: ../../include/text.php:1279 msgid "angry" msgstr "сердитый" -#: ../../include/text.php:1261 +#: ../../include/text.php:1280 msgid "stupefied" msgstr "отупевший" -#: ../../include/text.php:1262 +#: ../../include/text.php:1281 msgid "puzzled" msgstr "недоумевающий" -#: ../../include/text.php:1263 +#: ../../include/text.php:1282 msgid "interested" msgstr "заинтересованный" -#: ../../include/text.php:1264 +#: ../../include/text.php:1283 msgid "bitter" msgstr "едкий" -#: ../../include/text.php:1265 +#: ../../include/text.php:1284 msgid "cheerful" msgstr "бодрый" -#: ../../include/text.php:1266 +#: ../../include/text.php:1285 msgid "alive" msgstr "энергичный" -#: ../../include/text.php:1267 +#: ../../include/text.php:1286 msgid "annoyed" msgstr "раздражённый" -#: ../../include/text.php:1268 +#: ../../include/text.php:1287 msgid "anxious" msgstr "обеспокоенный" -#: ../../include/text.php:1269 +#: ../../include/text.php:1288 msgid "cranky" msgstr "капризный" -#: ../../include/text.php:1270 +#: ../../include/text.php:1289 msgid "disturbed" msgstr "встревоженный" -#: ../../include/text.php:1271 +#: ../../include/text.php:1290 msgid "frustrated" msgstr "разочарованный" -#: ../../include/text.php:1272 +#: ../../include/text.php:1291 msgid "depressed" msgstr "подавленный" -#: ../../include/text.php:1273 +#: ../../include/text.php:1292 msgid "motivated" msgstr "мотивированный" -#: ../../include/text.php:1274 +#: ../../include/text.php:1293 msgid "relaxed" msgstr "расслабленный" -#: ../../include/text.php:1275 +#: ../../include/text.php:1294 msgid "surprised" msgstr "удивленный" -#: ../../include/text.php:1463 ../../include/js_strings.php:99 +#: ../../include/text.php:1482 ../../include/js_strings.php:99 msgid "Monday" msgstr "Понедельник" -#: ../../include/text.php:1463 ../../include/js_strings.php:100 +#: ../../include/text.php:1482 ../../include/js_strings.php:100 msgid "Tuesday" msgstr "Вторник" -#: ../../include/text.php:1463 ../../include/js_strings.php:101 +#: ../../include/text.php:1482 ../../include/js_strings.php:101 msgid "Wednesday" msgstr "Среда" -#: ../../include/text.php:1463 ../../include/js_strings.php:102 +#: ../../include/text.php:1482 ../../include/js_strings.php:102 msgid "Thursday" msgstr "Четверг" -#: ../../include/text.php:1463 ../../include/js_strings.php:103 +#: ../../include/text.php:1482 ../../include/js_strings.php:103 msgid "Friday" msgstr "Пятница" -#: ../../include/text.php:1463 ../../include/js_strings.php:104 +#: ../../include/text.php:1482 ../../include/js_strings.php:104 msgid "Saturday" msgstr "Суббота" -#: ../../include/text.php:1463 ../../include/js_strings.php:98 +#: ../../include/text.php:1482 ../../include/js_strings.php:98 msgid "Sunday" msgstr "Воскресенье" -#: ../../include/text.php:1467 ../../include/js_strings.php:74 +#: ../../include/text.php:1486 ../../include/js_strings.php:74 msgid "January" msgstr "Январь" -#: ../../include/text.php:1467 ../../include/js_strings.php:75 +#: ../../include/text.php:1486 ../../include/js_strings.php:75 msgid "February" msgstr "Февраль" -#: ../../include/text.php:1467 ../../include/js_strings.php:76 +#: ../../include/text.php:1486 ../../include/js_strings.php:76 msgid "March" msgstr "Март" -#: ../../include/text.php:1467 ../../include/js_strings.php:77 +#: ../../include/text.php:1486 ../../include/js_strings.php:77 msgid "April" msgstr "Апрель" -#: ../../include/text.php:1467 +#: ../../include/text.php:1486 msgid "May" msgstr "Май" -#: ../../include/text.php:1467 ../../include/js_strings.php:79 +#: ../../include/text.php:1486 ../../include/js_strings.php:79 msgid "June" msgstr "Июнь" -#: ../../include/text.php:1467 ../../include/js_strings.php:80 +#: ../../include/text.php:1486 ../../include/js_strings.php:80 msgid "July" msgstr "Июль" -#: ../../include/text.php:1467 ../../include/js_strings.php:81 +#: ../../include/text.php:1486 ../../include/js_strings.php:81 msgid "August" msgstr "Август" -#: ../../include/text.php:1467 ../../include/js_strings.php:82 +#: ../../include/text.php:1486 ../../include/js_strings.php:82 msgid "September" msgstr "Сентябрь" -#: ../../include/text.php:1467 ../../include/js_strings.php:83 +#: ../../include/text.php:1486 ../../include/js_strings.php:83 msgid "October" msgstr "Октябрь" -#: ../../include/text.php:1467 ../../include/js_strings.php:84 +#: ../../include/text.php:1486 ../../include/js_strings.php:84 msgid "November" msgstr "Ноябрь" -#: ../../include/text.php:1467 ../../include/js_strings.php:85 +#: ../../include/text.php:1486 ../../include/js_strings.php:85 msgid "December" msgstr "Декабрь" -#: ../../include/text.php:1541 +#: ../../include/text.php:1560 msgid "Unknown Attachment" msgstr "Неизвестное вложение" -#: ../../include/text.php:1543 ../../Zotlabs/Storage/Browser.php:293 +#: ../../include/text.php:1562 ../../Zotlabs/Storage/Browser.php:293 #: ../../Zotlabs/Module/Sharedwithme.php:108 msgid "Size" msgstr "Размер" -#: ../../include/text.php:1543 ../../include/feedutils.php:871 +#: ../../include/text.php:1562 ../../include/feedutils.php:871 msgid "unknown" msgstr "неизвестный" -#: ../../include/text.php:1579 +#: ../../include/text.php:1598 msgid "remove category" msgstr "удалить категорию" -#: ../../include/text.php:1655 +#: ../../include/text.php:1674 msgid "remove from file" msgstr "удалить из файла" -#: ../../include/text.php:1895 +#: ../../include/text.php:1914 msgid "Poll has ended." msgstr "Опрос окончен." -#: ../../include/text.php:1898 +#: ../../include/text.php:1917 #, php-format msgid "Poll ends: %s" msgstr "Опрос заканчивается %s" -#: ../../include/text.php:1903 ../../Zotlabs/Lib/ThreadItem.php:444 +#: ../../include/text.php:1922 ../../Zotlabs/Lib/ThreadItem.php:444 msgid "Vote" msgstr "Голосовать" -#: ../../include/text.php:2055 ../../Zotlabs/Module/Events.php:669 +#: ../../include/text.php:2074 ../../Zotlabs/Module/Events.php:669 msgid "Link to Source" msgstr "Ссылка на источник" -#: ../../include/text.php:2077 ../../include/language.php:424 +#: ../../include/text.php:2096 ../../include/language.php:424 msgid "default" msgstr "по умолчанию" -#: ../../include/text.php:2085 +#: ../../include/text.php:2104 msgid "Page layout" msgstr "Шаблон страницы" -#: ../../include/text.php:2085 +#: ../../include/text.php:2104 msgid "You can create your own with the layouts tool" msgstr "Вы можете создать свой собственный с помощью инструмента шаблонов" -#: ../../include/text.php:2095 ../../Zotlabs/Module/Wiki.php:217 +#: ../../include/text.php:2114 ../../Zotlabs/Module/Wiki.php:217 #: ../../Zotlabs/Module/Wiki.php:371 ../../Zotlabs/Widget/Wiki_pages.php:38 #: ../../Zotlabs/Widget/Wiki_pages.php:95 msgid "BBcode" msgstr "" -#: ../../include/text.php:2096 +#: ../../include/text.php:2115 msgid "HTML" msgstr "" -#: ../../include/text.php:2097 ../../Zotlabs/Module/Wiki.php:217 +#: ../../include/text.php:2116 ../../Zotlabs/Module/Wiki.php:217 #: ../../Zotlabs/Module/Wiki.php:371 ../../Zotlabs/Widget/Wiki_pages.php:38 #: ../../Zotlabs/Widget/Wiki_pages.php:95 #: ../../extend/addon/hzaddons/mdpost/mdpost.php:41 msgid "Markdown" msgstr "Разметка Markdown" -#: ../../include/text.php:2098 ../../Zotlabs/Module/Wiki.php:217 +#: ../../include/text.php:2117 ../../Zotlabs/Module/Wiki.php:217 #: ../../Zotlabs/Widget/Wiki_pages.php:38 #: ../../Zotlabs/Widget/Wiki_pages.php:95 msgid "Text" msgstr "Текст" -#: ../../include/text.php:2099 +#: ../../include/text.php:2118 msgid "Comanche Layout" msgstr "Шаблон Comanche" -#: ../../include/text.php:2104 +#: ../../include/text.php:2123 msgid "PHP" msgstr "" -#: ../../include/text.php:2113 +#: ../../include/text.php:2132 msgid "Page content type" msgstr "Тип содержимого страницы" -#: ../../include/text.php:2233 ../../include/conversation.php:118 +#: ../../include/text.php:2252 ../../include/conversation.php:128 #: ../../Zotlabs/Module/Tagger.php:71 ../../Zotlabs/Module/Like.php:386 -#: ../../Zotlabs/Module/Subthread.php:112 ../../Zotlabs/Lib/Activity.php:2892 +#: ../../Zotlabs/Module/Subthread.php:112 ../../Zotlabs/Lib/Activity.php:2967 #: ../../extend/addon/hzaddons/redphotos/redphotohelper.php:71 -#: ../../extend/addon/hzaddons/pubcrawl/as.php:1810 -#: ../../extend/addon/hzaddons/diaspora/Receiver.php:1597 +#: ../../extend/addon/hzaddons/pubcrawl/as.php:1881 +#: ../../extend/addon/hzaddons/diaspora/Receiver.php:1601 msgid "photo" msgstr "фото" -#: ../../include/text.php:2236 ../../include/conversation.php:121 +#: ../../include/text.php:2255 ../../include/conversation.php:132 #: ../../include/event.php:1259 ../../Zotlabs/Module/Tagger.php:75 #: ../../Zotlabs/Module/Events.php:266 #: ../../Zotlabs/Module/Channel_calendar.php:219 @@ -2053,116 +2053,108 @@ msgstr "фото" msgid "event" msgstr "событие" -#: ../../include/text.php:2239 ../../include/conversation.php:146 -#: ../../Zotlabs/Module/Like.php:386 ../../Zotlabs/Module/Subthread.php:112 -#: ../../Zotlabs/Lib/Activity.php:2892 -#: ../../extend/addon/hzaddons/pubcrawl/as.php:1810 -#: ../../extend/addon/hzaddons/diaspora/Receiver.php:1597 -msgid "status" -msgstr "статус" - -#: ../../include/text.php:2241 ../../include/conversation.php:148 +#: ../../include/text.php:2260 ../../include/conversation.php:160 #: ../../Zotlabs/Module/Tagger.php:81 msgid "comment" msgstr "комментарий" -#: ../../include/text.php:2246 +#: ../../include/text.php:2265 msgid "activity" msgstr "активность" -#: ../../include/text.php:2249 +#: ../../include/text.php:2268 msgid "poll" msgstr "голосование" -#: ../../include/text.php:2350 +#: ../../include/text.php:2369 msgid "a-z, 0-9, -, and _ only" msgstr "Только a-z, 0-9, -, и _" -#: ../../include/text.php:2676 +#: ../../include/text.php:2695 msgid "Design Tools" msgstr "Инструменты дизайна" -#: ../../include/text.php:2679 ../../Zotlabs/Module/Blocks.php:154 +#: ../../include/text.php:2698 ../../Zotlabs/Module/Blocks.php:154 msgid "Blocks" msgstr "Блокировки" -#: ../../include/text.php:2680 ../../Zotlabs/Module/Menu.php:171 +#: ../../include/text.php:2699 ../../Zotlabs/Module/Menu.php:171 msgid "Menus" msgstr "Меню" -#: ../../include/text.php:2681 ../../Zotlabs/Module/Layouts.php:184 +#: ../../include/text.php:2700 ../../Zotlabs/Module/Layouts.php:184 msgid "Layouts" msgstr "Шаблоны" -#: ../../include/text.php:2682 +#: ../../include/text.php:2701 msgid "Pages" msgstr "Страницы" -#: ../../include/text.php:2694 +#: ../../include/text.php:2713 msgid "Import" msgstr "Импортировать" -#: ../../include/text.php:2695 +#: ../../include/text.php:2714 msgid "Import website..." msgstr "Импорт веб-сайта..." -#: ../../include/text.php:2696 +#: ../../include/text.php:2715 msgid "Select folder to import" msgstr "Выбрать каталог для импорта" -#: ../../include/text.php:2697 +#: ../../include/text.php:2716 msgid "Import from a zipped folder:" msgstr "Импортировать из каталога в zip-архиве:" -#: ../../include/text.php:2698 +#: ../../include/text.php:2717 msgid "Import from cloud files:" msgstr "Импортировать из сетевых файлов:" -#: ../../include/text.php:2699 +#: ../../include/text.php:2718 msgid "/cloud/channel/path/to/folder" msgstr "" -#: ../../include/text.php:2700 +#: ../../include/text.php:2719 msgid "Enter path to website files" msgstr "Введите путь к файлам веб-сайта" -#: ../../include/text.php:2701 +#: ../../include/text.php:2720 msgid "Select folder" msgstr "Выбрать каталог" -#: ../../include/text.php:2702 +#: ../../include/text.php:2721 msgid "Export website..." msgstr "Экспорт веб-сайта..." -#: ../../include/text.php:2703 +#: ../../include/text.php:2722 msgid "Export to a zip file" msgstr "Экспортировать в ZIP файл." -#: ../../include/text.php:2704 +#: ../../include/text.php:2723 msgid "website.zip" msgstr "" -#: ../../include/text.php:2705 +#: ../../include/text.php:2724 msgid "Enter a name for the zip file." msgstr "Введите имя для ZIP файла." -#: ../../include/text.php:2706 +#: ../../include/text.php:2725 msgid "Export to cloud files" msgstr "Эскпортировать в сетевые файлы:" -#: ../../include/text.php:2707 +#: ../../include/text.php:2726 msgid "/path/to/export/folder" msgstr "" -#: ../../include/text.php:2708 +#: ../../include/text.php:2727 msgid "Enter a path to a cloud files destination." msgstr "Введите путь к расположению сетевых файлов." -#: ../../include/text.php:2709 +#: ../../include/text.php:2728 msgid "Specify folder" msgstr "Указать каталог" -#: ../../include/text.php:3082 ../../Zotlabs/Storage/Browser.php:131 +#: ../../include/text.php:3101 ../../Zotlabs/Storage/Browser.php:131 msgid "Collection" msgstr "Коллекция" @@ -2200,8 +2192,9 @@ msgstr "Добавить новые контакты в группу конфи msgid "edit" msgstr "редактировать" -#: ../../include/group.php:321 ../../include/nav.php:101 -#: ../../Zotlabs/Module/Group.php:142 ../../Zotlabs/Module/Group.php:154 +#: ../../include/group.php:321 ../../include/acl_selectors.php:87 +#: ../../include/nav.php:101 ../../Zotlabs/Module/Group.php:142 +#: ../../Zotlabs/Module/Group.php:154 #: ../../Zotlabs/Widget/Activity_filter.php:82 ../../Zotlabs/Lib/Group.php:324 #: ../../Zotlabs/Lib/Apps.php:364 msgid "Privacy Groups" @@ -2292,20 +2285,20 @@ msgstr "Это действие превышает ограничения, ус msgid "This action is not available under your subscription plan." msgstr "Это действие невозможно из-за ограничений в вашем плане." -#: ../../include/zot.php:773 +#: ../../include/zot.php:775 msgid "Invalid data packet" msgstr "Неверный пакет данных" -#: ../../include/zot.php:800 ../../Zotlabs/Lib/Libzot.php:652 +#: ../../include/zot.php:802 ../../Zotlabs/Lib/Libzot.php:656 msgid "Unable to verify channel signature" msgstr "Невозможно проверить подпись канала" -#: ../../include/zot.php:2627 ../../Zotlabs/Lib/Libsync.php:740 +#: ../../include/zot.php:2657 ../../Zotlabs/Lib/Libsync.php:740 #, php-format msgid "Unable to verify site signature for %s" msgstr "Невозможно проверить подпись сайта %s" -#: ../../include/zot.php:4342 +#: ../../include/zot.php:4372 msgid "invalid target signature" msgstr "недопустимая целевая подпись" @@ -2360,9 +2353,9 @@ msgstr "Помощь" msgid "Not Found" msgstr "Не найдено" -#: ../../include/help.php:132 ../../Zotlabs/Module/Display.php:140 -#: ../../Zotlabs/Module/Display.php:157 ../../Zotlabs/Module/Display.php:177 -#: ../../Zotlabs/Module/Display.php:183 ../../Zotlabs/Module/Page.php:136 +#: ../../include/help.php:132 ../../Zotlabs/Module/Display.php:139 +#: ../../Zotlabs/Module/Display.php:156 ../../Zotlabs/Module/Display.php:176 +#: ../../Zotlabs/Module/Display.php:182 ../../Zotlabs/Module/Page.php:136 #: ../../Zotlabs/Module/Block.php:77 ../../Zotlabs/Web/Router.php:185 #: ../../Zotlabs/Lib/NativeWikiPage.php:521 msgid "Page not found." @@ -2439,106 +2432,106 @@ msgstr "Различные зрители увидят этот текст по- msgid "$1 wrote:" msgstr "$1 писал:" -#: ../../include/conversation.php:124 ../../Zotlabs/Module/Like.php:129 +#: ../../include/conversation.php:135 ../../Zotlabs/Module/Like.php:129 msgid "channel" msgstr "канал" -#: ../../include/conversation.php:162 ../../Zotlabs/Module/Like.php:422 -#: ../../Zotlabs/Lib/Activity.php:2927 -#: ../../extend/addon/hzaddons/pubcrawl/as.php:1847 -#: ../../extend/addon/hzaddons/diaspora/Receiver.php:1537 +#: ../../include/conversation.php:174 ../../Zotlabs/Module/Like.php:422 +#: ../../Zotlabs/Lib/Activity.php:3002 +#: ../../extend/addon/hzaddons/pubcrawl/as.php:1918 +#: ../../extend/addon/hzaddons/diaspora/Receiver.php:1541 #, php-format msgid "%1$s likes %2$s's %3$s" msgstr "%1$s нравится %3$s %2$s" -#: ../../include/conversation.php:165 ../../Zotlabs/Module/Like.php:424 -#: ../../Zotlabs/Lib/Activity.php:2929 -#: ../../extend/addon/hzaddons/pubcrawl/as.php:1849 +#: ../../include/conversation.php:177 ../../Zotlabs/Module/Like.php:424 +#: ../../Zotlabs/Lib/Activity.php:3004 +#: ../../extend/addon/hzaddons/pubcrawl/as.php:1920 #, php-format msgid "%1$s doesn't like %2$s's %3$s" msgstr "%1$s не нравится %2$s %3$s" -#: ../../include/conversation.php:171 +#: ../../include/conversation.php:183 #, php-format msgid "likes %1$s's %2$s" msgstr "Нравится %1$s %2$s" -#: ../../include/conversation.php:174 +#: ../../include/conversation.php:186 #, php-format msgid "doesn't like %1$s's %2$s" msgstr "Не нравится %1$s %2$s" -#: ../../include/conversation.php:214 ../../include/conversation.php:216 +#: ../../include/conversation.php:226 ../../include/conversation.php:228 #, php-format msgid "%1$s is now connected with %2$s" msgstr "%1$s теперь в контакте с %2$s" -#: ../../include/conversation.php:251 +#: ../../include/conversation.php:263 #, php-format msgid "%1$s poked %2$s" msgstr "%1$s ткнул %2$s" -#: ../../include/conversation.php:274 ../../Zotlabs/Module/Mood.php:76 +#: ../../include/conversation.php:286 ../../Zotlabs/Module/Mood.php:76 #, php-format msgctxt "mood" msgid "%1$s is %2$s" msgstr "%1$s %2$s" -#: ../../include/conversation.php:503 ../../Zotlabs/Lib/ThreadItem.php:500 +#: ../../include/conversation.php:515 ../../Zotlabs/Lib/ThreadItem.php:500 msgid "This is an unsaved preview" msgstr "Это несохранённый просмотр" -#: ../../include/conversation.php:639 ../../Zotlabs/Module/Photos.php:1112 +#: ../../include/conversation.php:651 ../../Zotlabs/Module/Photos.php:1112 msgctxt "title" msgid "Likes" msgstr "Нравится" -#: ../../include/conversation.php:640 ../../Zotlabs/Module/Photos.php:1112 +#: ../../include/conversation.php:652 ../../Zotlabs/Module/Photos.php:1112 msgctxt "title" msgid "Dislikes" msgstr "Не нравится" -#: ../../include/conversation.php:641 ../../Zotlabs/Module/Photos.php:1113 +#: ../../include/conversation.php:653 ../../Zotlabs/Module/Photos.php:1113 #: ../../Zotlabs/Widget/Pinned.php:77 msgctxt "title" msgid "Agree" msgstr "Согласен" -#: ../../include/conversation.php:642 ../../Zotlabs/Module/Photos.php:1113 +#: ../../include/conversation.php:654 ../../Zotlabs/Module/Photos.php:1113 #: ../../Zotlabs/Widget/Pinned.php:78 msgctxt "title" msgid "Disagree" msgstr "Не согласен" -#: ../../include/conversation.php:643 ../../Zotlabs/Module/Photos.php:1113 +#: ../../include/conversation.php:655 ../../Zotlabs/Module/Photos.php:1113 #: ../../Zotlabs/Widget/Pinned.php:79 msgctxt "title" msgid "Abstain" msgstr "Воздержался" -#: ../../include/conversation.php:644 ../../Zotlabs/Module/Photos.php:1114 +#: ../../include/conversation.php:656 ../../Zotlabs/Module/Photos.php:1114 #: ../../Zotlabs/Widget/Pinned.php:66 msgctxt "title" msgid "Attending" msgstr "Посещаю" -#: ../../include/conversation.php:645 ../../Zotlabs/Module/Photos.php:1114 +#: ../../include/conversation.php:657 ../../Zotlabs/Module/Photos.php:1114 #: ../../Zotlabs/Widget/Pinned.php:67 msgctxt "title" msgid "Not attending" msgstr "Не посещаю" -#: ../../include/conversation.php:646 ../../Zotlabs/Module/Photos.php:1114 +#: ../../include/conversation.php:658 ../../Zotlabs/Module/Photos.php:1114 #: ../../Zotlabs/Widget/Pinned.php:68 msgctxt "title" msgid "Might attend" msgstr "Возможно посещу" -#: ../../include/conversation.php:716 ../../Zotlabs/Lib/ThreadItem.php:180 +#: ../../include/conversation.php:728 ../../Zotlabs/Lib/ThreadItem.php:180 msgid "Select" msgstr "Выбрать" -#: ../../include/conversation.php:717 ../../include/conversation.php:762 +#: ../../include/conversation.php:729 ../../include/conversation.php:774 #: ../../Zotlabs/Storage/Browser.php:297 ../../Zotlabs/Module/Cdav.php:1052 #: ../../Zotlabs/Module/Cdav.php:1385 ../../Zotlabs/Module/Profiles.php:802 #: ../../Zotlabs/Module/Photos.php:1178 ../../Zotlabs/Module/Oauth.php:174 @@ -2548,8 +2541,8 @@ msgstr "Выбрать" #: ../../Zotlabs/Module/Admin/Profs.php:176 #: ../../Zotlabs/Module/Admin/Accounts.php:175 #: ../../Zotlabs/Module/Editwebpage.php:167 ../../Zotlabs/Module/Thing.php:269 -#: ../../Zotlabs/Module/Webpages.php:257 ../../Zotlabs/Module/Connedit.php:669 -#: ../../Zotlabs/Module/Connedit.php:941 +#: ../../Zotlabs/Module/Webpages.php:257 ../../Zotlabs/Module/Connedit.php:660 +#: ../../Zotlabs/Module/Connedit.php:932 #: ../../Zotlabs/Module/Connections.php:328 #: ../../Zotlabs/Module/Card_edit.php:129 #: ../../Zotlabs/Module/Article_edit.php:128 @@ -2558,149 +2551,149 @@ msgstr "Выбрать" msgid "Delete" msgstr "Удалить" -#: ../../include/conversation.php:721 ../../Zotlabs/Lib/ThreadItem.php:273 +#: ../../include/conversation.php:733 ../../Zotlabs/Lib/ThreadItem.php:273 msgid "Toggle Star Status" msgstr "Переключить статус пометки" -#: ../../include/conversation.php:726 ../../Zotlabs/Lib/ThreadItem.php:103 +#: ../../include/conversation.php:738 ../../Zotlabs/Lib/ThreadItem.php:103 msgid "Private Message" msgstr "Личное сообщение" -#: ../../include/conversation.php:733 ../../Zotlabs/Widget/Pinned.php:88 +#: ../../include/conversation.php:745 ../../Zotlabs/Widget/Pinned.php:88 #: ../../Zotlabs/Lib/ThreadItem.php:284 msgid "Message signature validated" msgstr "Подпись сообщения проверена" -#: ../../include/conversation.php:734 ../../Zotlabs/Widget/Pinned.php:89 +#: ../../include/conversation.php:746 ../../Zotlabs/Widget/Pinned.php:89 #: ../../Zotlabs/Lib/ThreadItem.php:285 msgid "Message signature incorrect" msgstr "Подпись сообщения неверная" -#: ../../include/conversation.php:761 +#: ../../include/conversation.php:773 #: ../../Zotlabs/Module/Admin/Accounts.php:173 #: ../../Zotlabs/Module/Connections.php:342 msgid "Approve" msgstr "Утвердить" -#: ../../include/conversation.php:766 +#: ../../include/conversation.php:778 #, php-format msgid "View %s's profile @ %s" msgstr "Просмотреть профиль %s @ %s" -#: ../../include/conversation.php:786 +#: ../../include/conversation.php:798 msgid "Categories:" msgstr "Категории:" -#: ../../include/conversation.php:787 +#: ../../include/conversation.php:799 msgid "Filed under:" msgstr "Хранить под:" -#: ../../include/conversation.php:793 ../../Zotlabs/Widget/Pinned.php:133 +#: ../../include/conversation.php:805 ../../Zotlabs/Widget/Pinned.php:133 #: ../../Zotlabs/Lib/ThreadItem.php:429 #, php-format msgid "from %s" msgstr "от %s" -#: ../../include/conversation.php:796 ../../Zotlabs/Widget/Pinned.php:136 +#: ../../include/conversation.php:808 ../../Zotlabs/Widget/Pinned.php:136 #: ../../Zotlabs/Lib/ThreadItem.php:432 #, php-format msgid "last edited: %s" msgstr "последнее редактирование: %s" -#: ../../include/conversation.php:797 ../../Zotlabs/Widget/Pinned.php:137 +#: ../../include/conversation.php:809 ../../Zotlabs/Widget/Pinned.php:137 #: ../../Zotlabs/Lib/ThreadItem.php:433 #, php-format msgid "Expires: %s" msgstr "Срок действия: %s" -#: ../../include/conversation.php:812 +#: ../../include/conversation.php:824 msgid "View in context" msgstr "Показать в контексте" -#: ../../include/conversation.php:814 ../../Zotlabs/Module/Photos.php:1078 +#: ../../include/conversation.php:826 ../../Zotlabs/Module/Photos.php:1078 #: ../../Zotlabs/Lib/ThreadItem.php:501 msgid "Please wait" msgstr "Подождите пожалуйста" -#: ../../include/conversation.php:913 +#: ../../include/conversation.php:925 msgid "remove" msgstr "удалить" -#: ../../include/conversation.php:917 +#: ../../include/conversation.php:929 msgid "Loading..." msgstr "Загрузка..." -#: ../../include/conversation.php:918 ../../Zotlabs/Lib/ThreadItem.php:301 +#: ../../include/conversation.php:930 ../../Zotlabs/Lib/ThreadItem.php:301 msgid "Conversation Tools" msgstr "Инструменты общения" -#: ../../include/conversation.php:919 +#: ../../include/conversation.php:931 msgid "Delete Selected Items" msgstr "Удалить выбранные элементы" -#: ../../include/conversation.php:962 +#: ../../include/conversation.php:974 msgid "View Source" msgstr "Просмотреть источник" -#: ../../include/conversation.php:972 +#: ../../include/conversation.php:984 msgid "Follow Thread" msgstr "Следить за темой" -#: ../../include/conversation.php:981 +#: ../../include/conversation.php:993 msgid "Unfollow Thread" msgstr "Прекратить отслеживать тему" -#: ../../include/conversation.php:1065 ../../include/nav.php:112 -#: ../../Zotlabs/Module/Connedit.php:609 ../../Zotlabs/Lib/Apps.php:344 +#: ../../include/conversation.php:1077 ../../include/nav.php:112 +#: ../../Zotlabs/Module/Connedit.php:600 ../../Zotlabs/Lib/Apps.php:344 #: ../../extend/addon/hzaddons/openclipatar/openclipatar.php:57 msgid "View Profile" msgstr "Просмотреть профиль" -#: ../../include/conversation.php:1075 ../../Zotlabs/Module/Connedit.php:630 +#: ../../include/conversation.php:1087 ../../Zotlabs/Module/Connedit.php:621 msgid "Recent Activity" msgstr "Последние действия" -#: ../../include/conversation.php:1095 +#: ../../include/conversation.php:1107 msgid "Edit Connection" msgstr "Редактировать контакт" -#: ../../include/conversation.php:1105 +#: ../../include/conversation.php:1117 msgid "Message" msgstr "Сообщение" -#: ../../include/conversation.php:1115 ../../Zotlabs/Module/Ratings.php:97 +#: ../../include/conversation.php:1127 ../../Zotlabs/Module/Ratings.php:97 #: ../../Zotlabs/Module/Pubsites.php:35 msgid "Ratings" msgstr "Оценки" -#: ../../include/conversation.php:1125 ../../Zotlabs/Module/Poke.php:199 +#: ../../include/conversation.php:1137 ../../Zotlabs/Module/Poke.php:199 #: ../../Zotlabs/Lib/Apps.php:351 msgid "Poke" msgstr "Ткнуть" -#: ../../include/conversation.php:1196 ../../include/cdav.php:158 +#: ../../include/conversation.php:1208 ../../include/cdav.php:158 #: ../../include/cdav.php:159 ../../include/cdav.php:167 #: ../../Zotlabs/Storage/Browser.php:164 ../../Zotlabs/Module/Photos.php:792 #: ../../Zotlabs/Module/Photos.php:1254 #: ../../Zotlabs/Module/Embedphotos.php:176 #: ../../Zotlabs/Widget/Portfolio.php:95 ../../Zotlabs/Widget/Pinned.php:270 #: ../../Zotlabs/Widget/Album.php:84 ../../Zotlabs/Lib/Apps.php:1112 -#: ../../Zotlabs/Lib/Apps.php:1196 ../../Zotlabs/Lib/Activity.php:1458 -#: ../../extend/addon/hzaddons/pubcrawl/as.php:1134 +#: ../../Zotlabs/Lib/Apps.php:1196 ../../Zotlabs/Lib/Activity.php:1508 +#: ../../extend/addon/hzaddons/pubcrawl/as.php:1173 msgid "Unknown" msgstr "Неизвестный" -#: ../../include/conversation.php:1247 +#: ../../include/conversation.php:1259 #, php-format msgid "%s likes this." msgstr "%s нравится это." -#: ../../include/conversation.php:1247 +#: ../../include/conversation.php:1259 #, php-format msgid "%s doesn't like this." msgstr "%s не нравится это." -#: ../../include/conversation.php:1251 +#: ../../include/conversation.php:1263 #, php-format msgid "<span %1$s>%2$d people</span> like this." msgid_plural "<span %1$s>%2$d people</span> like this." @@ -2708,7 +2701,7 @@ msgstr[0] "<span %1$s>%2$d человеку</span> это нравится." msgstr[1] "<span %1$s>%2$d человекам</span> это нравится." msgstr[2] "<span %1$s>%2$d человекам</span> это нравится." -#: ../../include/conversation.php:1253 +#: ../../include/conversation.php:1265 #, php-format msgid "<span %1$s>%2$d people</span> don't like this." msgid_plural "<span %1$s>%2$d people</span> don't like this." @@ -2716,11 +2709,11 @@ msgstr[0] "<span %1$s>%2$d человеку</span> это не нравится msgstr[1] "<span %1$s>%2$d человекам</span> это не нравится." msgstr[2] "<span %1$s>%2$d человекам</span> это не нравится." -#: ../../include/conversation.php:1259 +#: ../../include/conversation.php:1271 msgid "and" msgstr "и" -#: ../../include/conversation.php:1262 +#: ../../include/conversation.php:1274 #, php-format msgid ", and %d other people" msgid_plural ", and %d other people" @@ -2728,27 +2721,27 @@ msgstr[0] ", и ещё %d человеку" msgstr[1] ", и ещё %d человекам" msgstr[2] ", и ещё %d человекам" -#: ../../include/conversation.php:1263 +#: ../../include/conversation.php:1275 #, php-format msgid "%s like this." msgstr "%s нравится это." -#: ../../include/conversation.php:1263 +#: ../../include/conversation.php:1275 #, php-format msgid "%s don't like this." msgstr "%s не нравится это." -#: ../../include/conversation.php:1313 +#: ../../include/conversation.php:1325 #: ../../extend/addon/hzaddons/hsse/hsse.php:82 msgid "Set your location" msgstr "Задать своё местоположение" -#: ../../include/conversation.php:1314 +#: ../../include/conversation.php:1326 #: ../../extend/addon/hzaddons/hsse/hsse.php:83 msgid "Clear browser location" msgstr "Очистить местоположение из браузера" -#: ../../include/conversation.php:1326 ../../Zotlabs/Module/Chat.php:220 +#: ../../include/conversation.php:1338 ../../Zotlabs/Module/Chat.php:220 #: ../../Zotlabs/Module/Editblock.php:116 #: ../../Zotlabs/Module/Editwebpage.php:143 #: ../../Zotlabs/Module/Card_edit.php:101 @@ -2759,81 +2752,81 @@ msgstr "Очистить местоположение из браузера" msgid "Insert web link" msgstr "Вставить веб-ссылку" -#: ../../include/conversation.php:1330 +#: ../../include/conversation.php:1342 #: ../../extend/addon/hzaddons/hsse/hsse.php:99 msgid "Embed (existing) photo from your photo albums" msgstr "Встроить (существующее) фото из вашего фотоальбома" -#: ../../include/conversation.php:1365 ../../Zotlabs/Module/Chat.php:218 +#: ../../include/conversation.php:1377 ../../Zotlabs/Module/Chat.php:218 #: ../../extend/addon/hzaddons/mail/Mod_Mail.php:119 #: ../../extend/addon/hzaddons/mail/Mod_Mail.php:240 #: ../../extend/addon/hzaddons/hsse/hsse.php:134 msgid "Please enter a link URL:" msgstr "Пожалуйста введите URL ссылки:" -#: ../../include/conversation.php:1366 +#: ../../include/conversation.php:1378 #: ../../extend/addon/hzaddons/hsse/hsse.php:135 msgid "Tag term:" msgstr "Теги:" -#: ../../include/conversation.php:1367 +#: ../../include/conversation.php:1379 #: ../../extend/addon/hzaddons/hsse/hsse.php:136 msgid "Where are you right now?" msgstr "Где вы сейчас?" -#: ../../include/conversation.php:1370 ../../Zotlabs/Module/Cover_photo.php:430 +#: ../../include/conversation.php:1382 ../../Zotlabs/Module/Cover_photo.php:430 #: ../../Zotlabs/Module/Profile_photo.php:509 ../../Zotlabs/Module/Wiki.php:403 #: ../../extend/addon/hzaddons/hsse/hsse.php:139 msgid "Choose images to embed" msgstr "Выбрать изображения для встраивания" -#: ../../include/conversation.php:1371 ../../Zotlabs/Module/Cover_photo.php:431 +#: ../../include/conversation.php:1383 ../../Zotlabs/Module/Cover_photo.php:431 #: ../../Zotlabs/Module/Profile_photo.php:510 ../../Zotlabs/Module/Wiki.php:404 #: ../../extend/addon/hzaddons/hsse/hsse.php:140 msgid "Choose an album" msgstr "Выбрать альбом" -#: ../../include/conversation.php:1372 +#: ../../include/conversation.php:1384 #: ../../extend/addon/hzaddons/hsse/hsse.php:141 msgid "Choose a different album..." msgstr "Выбрать другой альбом..." -#: ../../include/conversation.php:1373 ../../Zotlabs/Module/Cover_photo.php:433 +#: ../../include/conversation.php:1385 ../../Zotlabs/Module/Cover_photo.php:433 #: ../../Zotlabs/Module/Profile_photo.php:512 ../../Zotlabs/Module/Wiki.php:406 #: ../../extend/addon/hzaddons/hsse/hsse.php:142 msgid "Error getting album list" msgstr "Ошибка получения списка альбомов" -#: ../../include/conversation.php:1374 ../../Zotlabs/Module/Cover_photo.php:434 +#: ../../include/conversation.php:1386 ../../Zotlabs/Module/Cover_photo.php:434 #: ../../Zotlabs/Module/Profile_photo.php:513 ../../Zotlabs/Module/Wiki.php:407 #: ../../extend/addon/hzaddons/hsse/hsse.php:143 msgid "Error getting photo link" msgstr "Ошибка получения ссылки на фотографию" -#: ../../include/conversation.php:1375 ../../Zotlabs/Module/Cover_photo.php:435 +#: ../../include/conversation.php:1387 ../../Zotlabs/Module/Cover_photo.php:435 #: ../../Zotlabs/Module/Profile_photo.php:514 ../../Zotlabs/Module/Wiki.php:408 #: ../../extend/addon/hzaddons/hsse/hsse.php:144 msgid "Error getting album" msgstr "Ошибка получения альбома" -#: ../../include/conversation.php:1376 +#: ../../include/conversation.php:1388 #: ../../extend/addon/hzaddons/hsse/hsse.php:145 msgid "Comments enabled" msgstr "Комментарии включены" -#: ../../include/conversation.php:1377 +#: ../../include/conversation.php:1389 #: ../../extend/addon/hzaddons/hsse/hsse.php:146 msgid "Comments disabled" msgstr "Комментарии отключены" -#: ../../include/conversation.php:1387 ../../Zotlabs/Module/Photos.php:1098 +#: ../../include/conversation.php:1399 ../../Zotlabs/Module/Photos.php:1098 #: ../../Zotlabs/Module/Events.php:486 ../../Zotlabs/Module/Webpages.php:262 #: ../../Zotlabs/Lib/ThreadItem.php:835 #: ../../extend/addon/hzaddons/hsse/hsse.php:153 msgid "Preview" msgstr "Предварительный просмотр" -#: ../../include/conversation.php:1420 ../../Zotlabs/Module/Photos.php:1077 +#: ../../include/conversation.php:1432 ../../Zotlabs/Module/Photos.php:1077 #: ../../Zotlabs/Module/Webpages.php:256 ../../Zotlabs/Module/Blocks.php:161 #: ../../Zotlabs/Module/Wiki.php:301 ../../Zotlabs/Module/Layouts.php:194 #: ../../Zotlabs/Widget/Cdav.php:136 @@ -2841,52 +2834,52 @@ msgstr "Предварительный просмотр" msgid "Share" msgstr "Поделиться" -#: ../../include/conversation.php:1429 +#: ../../include/conversation.php:1441 #: ../../extend/addon/hzaddons/hsse/hsse.php:195 msgid "Page link name" msgstr "Название ссылки на страницу " -#: ../../include/conversation.php:1432 +#: ../../include/conversation.php:1444 #: ../../extend/addon/hzaddons/hsse/hsse.php:198 msgid "Post as" msgstr "Опубликовать как" -#: ../../include/conversation.php:1434 ../../Zotlabs/Lib/ThreadItem.php:826 +#: ../../include/conversation.php:1446 ../../Zotlabs/Lib/ThreadItem.php:826 #: ../../extend/addon/hzaddons/hsse/hsse.php:200 msgid "Bold" msgstr "Жирный" -#: ../../include/conversation.php:1435 ../../Zotlabs/Lib/ThreadItem.php:827 +#: ../../include/conversation.php:1447 ../../Zotlabs/Lib/ThreadItem.php:827 #: ../../extend/addon/hzaddons/hsse/hsse.php:201 msgid "Italic" msgstr "Курсив" -#: ../../include/conversation.php:1436 ../../Zotlabs/Lib/ThreadItem.php:828 +#: ../../include/conversation.php:1448 ../../Zotlabs/Lib/ThreadItem.php:828 #: ../../extend/addon/hzaddons/hsse/hsse.php:202 msgid "Underline" msgstr "Подчеркнутый" -#: ../../include/conversation.php:1437 ../../Zotlabs/Lib/ThreadItem.php:829 +#: ../../include/conversation.php:1449 ../../Zotlabs/Lib/ThreadItem.php:829 #: ../../extend/addon/hzaddons/hsse/hsse.php:203 msgid "Quote" msgstr "Цитата" -#: ../../include/conversation.php:1438 ../../Zotlabs/Lib/ThreadItem.php:830 +#: ../../include/conversation.php:1450 ../../Zotlabs/Lib/ThreadItem.php:830 #: ../../extend/addon/hzaddons/hsse/hsse.php:204 msgid "Code" msgstr "Код" -#: ../../include/conversation.php:1439 ../../Zotlabs/Lib/ThreadItem.php:832 +#: ../../include/conversation.php:1451 ../../Zotlabs/Lib/ThreadItem.php:832 #: ../../extend/addon/hzaddons/hsse/hsse.php:205 msgid "Attach/Upload file" msgstr "Прикрепить/загрузить файл" -#: ../../include/conversation.php:1442 ../../Zotlabs/Module/Wiki.php:400 +#: ../../include/conversation.php:1454 ../../Zotlabs/Module/Wiki.php:400 #: ../../extend/addon/hzaddons/hsse/hsse.php:208 msgid "Embed an image from your albums" msgstr "Встроить изображение из ваших альбомов" -#: ../../include/conversation.php:1443 ../../include/conversation.php:1496 +#: ../../include/conversation.php:1455 ../../include/conversation.php:1508 #: ../../Zotlabs/Module/Cdav.php:1054 ../../Zotlabs/Module/Cdav.php:1386 #: ../../Zotlabs/Module/Profiles.php:803 ../../Zotlabs/Module/Tagrm.php:15 #: ../../Zotlabs/Module/Tagrm.php:138 ../../Zotlabs/Module/Oauth.php:112 @@ -2898,7 +2891,7 @@ msgstr "Встроить изображение из ваших альбомов #: ../../Zotlabs/Module/Admin/Addons.php:427 #: ../../Zotlabs/Module/Editwebpage.php:169 #: ../../Zotlabs/Module/Profile_photo.php:507 -#: ../../Zotlabs/Module/Editpost.php:110 ../../Zotlabs/Module/Connedit.php:942 +#: ../../Zotlabs/Module/Editpost.php:110 ../../Zotlabs/Module/Connedit.php:933 #: ../../Zotlabs/Module/Card_edit.php:131 #: ../../Zotlabs/Module/Article_edit.php:130 ../../Zotlabs/Module/Wiki.php:368 #: ../../Zotlabs/Module/Wiki.php:401 ../../Zotlabs/Module/Filer.php:55 @@ -2907,7 +2900,7 @@ msgstr "Встроить изображение из ваших альбомов msgid "Cancel" msgstr "Отменить" -#: ../../include/conversation.php:1444 ../../include/conversation.php:1495 +#: ../../include/conversation.php:1456 ../../include/conversation.php:1507 #: ../../Zotlabs/Module/Cover_photo.php:429 #: ../../Zotlabs/Module/Profile_photo.php:508 ../../Zotlabs/Module/Wiki.php:402 #: ../../extend/addon/hzaddons/hsse/hsse.php:210 @@ -2915,50 +2908,50 @@ msgstr "Отменить" msgid "OK" msgstr "" -#: ../../include/conversation.php:1446 +#: ../../include/conversation.php:1458 #: ../../extend/addon/hzaddons/hsse/hsse.php:212 msgid "Toggle voting" msgstr "Переключить голосование" -#: ../../include/conversation.php:1447 +#: ../../include/conversation.php:1459 msgid "Toggle poll" msgstr "Переключить опрос" -#: ../../include/conversation.php:1448 +#: ../../include/conversation.php:1460 msgid "Option" msgstr "Вариант" -#: ../../include/conversation.php:1449 +#: ../../include/conversation.php:1461 msgid "Add option" msgstr "Добавить вариант" -#: ../../include/conversation.php:1450 +#: ../../include/conversation.php:1462 msgid "Minutes" msgstr "Минут" -#: ../../include/conversation.php:1450 +#: ../../include/conversation.php:1462 msgid "Hours" msgstr "Часов" -#: ../../include/conversation.php:1450 +#: ../../include/conversation.php:1462 msgid "Days" msgstr "Дней" -#: ../../include/conversation.php:1451 +#: ../../include/conversation.php:1463 msgid "Allow multiple answers" msgstr "Разрешить несколько ответов" -#: ../../include/conversation.php:1453 +#: ../../include/conversation.php:1465 #: ../../extend/addon/hzaddons/hsse/hsse.php:215 msgid "Disable comments" msgstr "Отключить комментарии" -#: ../../include/conversation.php:1454 +#: ../../include/conversation.php:1466 #: ../../extend/addon/hzaddons/hsse/hsse.php:216 msgid "Toggle comments" msgstr "Переключить комментарии" -#: ../../include/conversation.php:1459 ../../Zotlabs/Module/Photos.php:673 +#: ../../include/conversation.php:1471 ../../Zotlabs/Module/Photos.php:673 #: ../../Zotlabs/Module/Photos.php:1043 ../../Zotlabs/Module/Editblock.php:129 #: ../../Zotlabs/Module/Card_edit.php:117 #: ../../Zotlabs/Module/Article_edit.php:116 @@ -2966,34 +2959,34 @@ msgstr "Переключить комментарии" msgid "Title (optional)" msgstr "Заголовок (необязательно)" -#: ../../include/conversation.php:1462 +#: ../../include/conversation.php:1474 #: ../../extend/addon/hzaddons/hsse/hsse.php:224 msgid "Categories (optional, comma-separated list)" msgstr "Категории (необязательно, список через запятую)" -#: ../../include/conversation.php:1463 ../../Zotlabs/Module/Events.php:487 +#: ../../include/conversation.php:1475 ../../Zotlabs/Module/Events.php:487 #: ../../extend/addon/hzaddons/hsse/hsse.php:225 msgid "Permission settings" msgstr "Настройки разрешений" -#: ../../include/conversation.php:1485 +#: ../../include/conversation.php:1497 #: ../../extend/addon/hzaddons/hsse/hsse.php:247 msgid "Other networks and post services" msgstr "Другие сети и службы публикаций" -#: ../../include/conversation.php:1488 +#: ../../include/conversation.php:1500 #: ../../extend/addon/hzaddons/mail/Mod_Mail.php:170 #: ../../extend/addon/hzaddons/mail/Mod_Mail.php:313 #: ../../extend/addon/hzaddons/hsse/hsse.php:250 msgid "Set expiration date" msgstr "Установить срок действия" -#: ../../include/conversation.php:1491 +#: ../../include/conversation.php:1503 #: ../../extend/addon/hzaddons/hsse/hsse.php:253 msgid "Set publish date" msgstr "Установить дату публикации" -#: ../../include/conversation.php:1493 ../../Zotlabs/Module/Chat.php:219 +#: ../../include/conversation.php:1505 ../../Zotlabs/Module/Chat.php:219 #: ../../Zotlabs/Lib/ThreadItem.php:839 #: ../../extend/addon/hzaddons/mail/Mod_Mail.php:172 #: ../../extend/addon/hzaddons/mail/Mod_Mail.php:315 @@ -3001,7 +2994,7 @@ msgstr "Установить дату публикации" msgid "Encrypt text" msgstr "Зашифровать текст" -#: ../../include/conversation.php:1737 ../../Zotlabs/Module/Photos.php:1140 +#: ../../include/conversation.php:1749 ../../Zotlabs/Module/Photos.php:1140 #: ../../Zotlabs/Lib/ThreadItem.php:247 msgctxt "noun" msgid "Dislike" @@ -3010,7 +3003,7 @@ msgstr[0] "Не нравится" msgstr[1] "Не нравится" msgstr[2] "Не нравится" -#: ../../include/conversation.php:1740 +#: ../../include/conversation.php:1752 msgctxt "noun" msgid "Attending" msgid_plural "Attending" @@ -3018,7 +3011,7 @@ msgstr[0] "Посетит" msgstr[1] "Посетят" msgstr[2] "Посетят" -#: ../../include/conversation.php:1743 +#: ../../include/conversation.php:1755 msgctxt "noun" msgid "Not Attending" msgid_plural "Not Attending" @@ -3026,13 +3019,13 @@ msgstr[0] "Не посетит" msgstr[1] "Не посетят" msgstr[2] "Не посетят" -#: ../../include/conversation.php:1746 +#: ../../include/conversation.php:1758 msgctxt "noun" msgid "Undecided" msgid_plural "Undecided" msgstr "Не решил" -#: ../../include/conversation.php:1749 +#: ../../include/conversation.php:1761 msgctxt "noun" msgid "Agree" msgid_plural "Agrees" @@ -3040,7 +3033,7 @@ msgstr[0] "Согласен" msgstr[1] "Согласны" msgstr[2] "Согласны" -#: ../../include/conversation.php:1752 +#: ../../include/conversation.php:1764 msgctxt "noun" msgid "Disagree" msgid_plural "Disagrees" @@ -3048,7 +3041,7 @@ msgstr[0] "Не согласен" msgstr[1] "Не согласны" msgstr[2] "Не согласны" -#: ../../include/conversation.php:1755 +#: ../../include/conversation.php:1767 msgctxt "noun" msgid "Abstain" msgid_plural "Abstains" @@ -3056,48 +3049,48 @@ msgstr[0] "Воздержался" msgstr[1] "Воздержались" msgstr[2] "Воздержались" -#: ../../include/taxonomy.php:320 +#: ../../include/taxonomy.php:323 msgid "Trending" msgstr "В тренде" -#: ../../include/taxonomy.php:320 ../../include/taxonomy.php:449 -#: ../../include/taxonomy.php:470 ../../Zotlabs/Widget/Tagcloud.php:22 +#: ../../include/taxonomy.php:323 ../../include/taxonomy.php:458 +#: ../../include/taxonomy.php:479 ../../Zotlabs/Widget/Tagcloud.php:22 msgid "Tags" msgstr "Теги" -#: ../../include/taxonomy.php:550 +#: ../../include/taxonomy.php:559 msgid "Keywords" msgstr "Ключевые слова" -#: ../../include/taxonomy.php:571 +#: ../../include/taxonomy.php:580 msgid "have" msgstr "иметь" -#: ../../include/taxonomy.php:571 +#: ../../include/taxonomy.php:580 msgid "has" msgstr "есть" -#: ../../include/taxonomy.php:572 +#: ../../include/taxonomy.php:581 msgid "want" msgstr "хотеть" -#: ../../include/taxonomy.php:572 +#: ../../include/taxonomy.php:581 msgid "wants" msgstr "хотеть" -#: ../../include/taxonomy.php:573 ../../Zotlabs/Lib/ThreadItem.php:317 +#: ../../include/taxonomy.php:582 ../../Zotlabs/Lib/ThreadItem.php:317 msgid "like" msgstr "нравится" -#: ../../include/taxonomy.php:573 +#: ../../include/taxonomy.php:582 msgid "likes" msgstr "нравится" -#: ../../include/taxonomy.php:574 ../../Zotlabs/Lib/ThreadItem.php:318 +#: ../../include/taxonomy.php:583 ../../Zotlabs/Lib/ThreadItem.php:318 msgid "dislike" msgstr "не нравится" -#: ../../include/taxonomy.php:574 +#: ../../include/taxonomy.php:583 msgid "dislikes" msgstr "не нравится" @@ -3171,7 +3164,7 @@ msgid "Rate This Channel (this is public)" msgstr "Оценкa этoго канала (общедоступно)" #: ../../include/js_strings.php:20 ../../Zotlabs/Module/Rate.php:155 -#: ../../Zotlabs/Module/Connedit.php:888 +#: ../../Zotlabs/Module/Connedit.php:879 msgid "Rating" msgstr "Оценка" @@ -3189,7 +3182,7 @@ msgstr "Есть несохраненные изменения. Вы увере #: ../../include/js_strings.php:25 ../../Zotlabs/Module/Cdav.php:1011 #: ../../Zotlabs/Module/Profiles.php:511 ../../Zotlabs/Module/Profiles.php:736 -#: ../../Zotlabs/Module/Events.php:483 ../../Zotlabs/Module/Locs.php:117 +#: ../../Zotlabs/Module/Events.php:483 ../../Zotlabs/Module/Locs.php:121 #: ../../Zotlabs/Module/Pubsites.php:52 msgid "Location" msgstr "Место" @@ -3307,7 +3300,7 @@ msgstr "назад" #: ../../include/js_strings.php:57 msgid "timeago.suffixFromNow" -msgstr "" +msgstr "NONE" #: ../../include/js_strings.php:60 msgid "less than a minute" @@ -3448,51 +3441,51 @@ msgctxt "calendar" msgid "All day" msgstr "Весь день" -#: ../../include/dir_fns.php:141 ../../Zotlabs/Lib/Libzotdir.php:160 +#: ../../include/dir_fns.php:140 ../../Zotlabs/Lib/Libzotdir.php:162 msgid "Directory Options" msgstr "Параметры каталога" -#: ../../include/dir_fns.php:143 ../../Zotlabs/Lib/Libzotdir.php:162 +#: ../../include/dir_fns.php:142 ../../Zotlabs/Lib/Libzotdir.php:164 msgid "Safe Mode" msgstr "Безопасный режим" -#: ../../include/dir_fns.php:144 ../../Zotlabs/Lib/Libzotdir.php:163 +#: ../../include/dir_fns.php:143 ../../Zotlabs/Lib/Libzotdir.php:165 msgid "Public Forums Only" msgstr "Только публичные форумы" -#: ../../include/dir_fns.php:145 ../../Zotlabs/Lib/Libzotdir.php:165 +#: ../../include/dir_fns.php:144 ../../Zotlabs/Lib/Libzotdir.php:167 msgid "This Website Only" msgstr "Только этот веб-сайт" -#: ../../include/network.php:1730 ../../include/network.php:1731 +#: ../../include/network.php:1731 ../../include/network.php:1732 msgid "Friendica" msgstr "" -#: ../../include/network.php:1732 +#: ../../include/network.php:1733 msgid "OStatus" msgstr "" -#: ../../include/network.php:1733 +#: ../../include/network.php:1734 msgid "GNU-Social" msgstr "" -#: ../../include/network.php:1734 +#: ../../include/network.php:1735 msgid "RSS/Atom" msgstr "" -#: ../../include/network.php:1735 ../../Zotlabs/Lib/Activity.php:2742 -#: ../../Zotlabs/Lib/Activity.php:2936 -#: ../../extend/addon/hzaddons/pubcrawl/as.php:1428 -#: ../../extend/addon/hzaddons/pubcrawl/as.php:1662 -#: ../../extend/addon/hzaddons/pubcrawl/as.php:1856 +#: ../../include/network.php:1736 ../../Zotlabs/Lib/Activity.php:2817 +#: ../../Zotlabs/Lib/Activity.php:3011 +#: ../../extend/addon/hzaddons/pubcrawl/as.php:1465 +#: ../../extend/addon/hzaddons/pubcrawl/as.php:1719 +#: ../../extend/addon/hzaddons/pubcrawl/as.php:1927 msgid "ActivityPub" msgstr "" -#: ../../include/network.php:1736 ../../Zotlabs/Module/Cdav.php:1372 +#: ../../include/network.php:1737 ../../Zotlabs/Module/Cdav.php:1372 #: ../../Zotlabs/Module/Profiles.php:789 #: ../../Zotlabs/Module/Admin/Accounts.php:171 #: ../../Zotlabs/Module/Admin/Accounts.php:183 -#: ../../Zotlabs/Module/Connedit.php:928 +#: ../../Zotlabs/Module/Connedit.php:919 #: ../../extend/addon/hzaddons/openid/MysqlProvider.php:56 #: ../../extend/addon/hzaddons/openid/MysqlProvider.php:57 #: ../../extend/addon/hzaddons/rtof/Mod_Rtof.php:57 @@ -3500,27 +3493,27 @@ msgstr "" msgid "Email" msgstr "Электронная почта" -#: ../../include/network.php:1737 +#: ../../include/network.php:1738 msgid "Diaspora" msgstr "" -#: ../../include/network.php:1738 +#: ../../include/network.php:1739 msgid "Facebook" msgstr "" -#: ../../include/network.php:1739 +#: ../../include/network.php:1740 msgid "Zot" msgstr "" -#: ../../include/network.php:1740 +#: ../../include/network.php:1741 msgid "LinkedIn" msgstr "" -#: ../../include/network.php:1741 +#: ../../include/network.php:1742 msgid "XMPP/IM" msgstr "" -#: ../../include/network.php:1742 +#: ../../include/network.php:1743 msgid "MySpace" msgstr "" @@ -3552,7 +3545,7 @@ msgstr "YYYY-MM-DD или MM-DD" msgid "Required" msgstr "Требуется" -#: ../../include/datetime.php:238 ../../boot.php:2702 +#: ../../include/datetime.php:238 ../../boot.php:2703 msgid "never" msgstr "никогда" @@ -3637,61 +3630,70 @@ msgstr "С Днем рождения %1$s !" msgid "Visible to your default audience" msgstr "Видно вашей аудитории по умолчанию." -#: ../../include/acl_selectors.php:88 ../../Zotlabs/Module/Acl.php:121 -#: ../../Zotlabs/Module/Lockview.php:117 ../../Zotlabs/Module/Lockview.php:153 -msgctxt "acl" -msgid "Profile" -msgstr "Профиль" +#: ../../include/acl_selectors.php:100 +msgid "Profile-Based Privacy Groups" +msgstr "Группы конфиденциальности основанные на профиле" -#: ../../include/acl_selectors.php:106 +#: ../../include/acl_selectors.php:113 ../../Zotlabs/Widget/Forums.php:100 +#: ../../Zotlabs/Widget/Notifications.php:139 +#: ../../Zotlabs/Widget/Notifications.php:140 +#: ../../Zotlabs/Widget/Activity_filter.php:115 +msgid "Forums" +msgstr "Форумы" + +#: ../../include/acl_selectors.php:115 +msgid "Private Forum" +msgstr "Частный форум" + +#: ../../include/acl_selectors.php:126 #: ../../Zotlabs/Lib/PermissionDescription.php:107 msgid "Only me" msgstr "Только мне" -#: ../../include/acl_selectors.php:113 -msgid "Who can see this?" -msgstr "Кто может это видеть?" +#: ../../include/acl_selectors.php:133 +msgid "Share with" +msgstr "Поделиться с" -#: ../../include/acl_selectors.php:114 +#: ../../include/acl_selectors.php:134 msgid "Custom selection" msgstr "Настраиваемый выбор" -#: ../../include/acl_selectors.php:115 +#: ../../include/acl_selectors.php:136 msgid "" -"Select \"Show\" to allow viewing. \"Don't show\" lets you override and limit " -"the scope of \"Show\"." -msgstr "Нажмите \"Показать\" чтобы разрешить просмотр. \"Не показывать\" позволит вам переопределить и ограничить область показа." +"Select \"Allow\" to allow viewing. \"Don't allow\" lets you override and " +"limit the scope of \"Allow\"." +msgstr "Выберите \"Разрешить\" для разрешения просмотра. \"Не разрешать\" позволяет вам переопределить и ограничить разрешения." -#: ../../include/acl_selectors.php:116 -msgid "Show" -msgstr "Показать" +#: ../../include/acl_selectors.php:137 ../../Zotlabs/Module/Authorize.php:32 +msgid "Allow" +msgstr "Разрешить" -#: ../../include/acl_selectors.php:117 ../../Zotlabs/Widget/Pinned.php:158 -msgid "Don't show" -msgstr "Не показывать" +#: ../../include/acl_selectors.php:138 +msgid "Don't allow" +msgstr "Не разрешать" -#: ../../include/acl_selectors.php:123 ../../Zotlabs/Module/Photos.php:677 +#: ../../include/acl_selectors.php:144 ../../Zotlabs/Module/Photos.php:677 #: ../../Zotlabs/Module/Photos.php:1046 ../../Zotlabs/Module/Chat.php:241 #: ../../Zotlabs/Module/Filestorage.php:190 ../../Zotlabs/Module/Thing.php:321 -#: ../../Zotlabs/Module/Thing.php:374 ../../Zotlabs/Module/Connedit.php:691 +#: ../../Zotlabs/Module/Thing.php:374 ../../Zotlabs/Module/Connedit.php:682 #: ../../extend/addon/hzaddons/flashcards/Mod_Flashcards.php:254 msgid "Permissions" msgstr "Разрешения" -#: ../../include/acl_selectors.php:125 ../../Zotlabs/Module/Photos.php:1274 +#: ../../include/acl_selectors.php:146 ../../Zotlabs/Module/Photos.php:1274 #: ../../Zotlabs/Widget/Pinned.php:160 ../../Zotlabs/Lib/ThreadItem.php:495 #: ../../extend/addon/hzaddons/channelreputation/channelreputation.php:233 msgid "Close" msgstr "Закрыть" -#: ../../include/acl_selectors.php:150 +#: ../../include/acl_selectors.php:171 #, php-format msgid "" "Post permissions %s cannot be changed %s after a post is shared.</br />These " "permissions set who is allowed to view the post." msgstr "Разрешения публикации %s не могут быть изменены %s после того, как ею поделились. Эти разрешения устанавливают кому разрешено просматривать эту публикацию." -#: ../../include/zid.php:370 +#: ../../include/zid.php:364 #, php-format msgid "OpenWebAuth: %1$s welcomes %2$s" msgstr "OpenWebAuth: %1$s приветствует %2$s" @@ -3704,37 +3706,37 @@ msgstr "Новое окно" msgid "Open the selected location in a different window or browser tab" msgstr "Открыть выбранное местоположение в другом окне или вкладке браузера" -#: ../../include/connections.php:728 ../../include/event.php:1422 +#: ../../include/connections.php:733 ../../include/event.php:1422 #: ../../Zotlabs/Module/Cdav.php:1377 ../../Zotlabs/Module/Profiles.php:794 -#: ../../Zotlabs/Module/Connedit.php:933 +#: ../../Zotlabs/Module/Connedit.php:924 msgid "Mobile" msgstr "Мобильный" -#: ../../include/connections.php:729 ../../include/event.php:1423 +#: ../../include/connections.php:734 ../../include/event.php:1423 #: ../../Zotlabs/Module/Cdav.php:1378 ../../Zotlabs/Module/Profiles.php:795 -#: ../../Zotlabs/Module/Connedit.php:934 +#: ../../Zotlabs/Module/Connedit.php:925 msgid "Home" msgstr "Домашний" -#: ../../include/connections.php:730 ../../include/event.php:1424 +#: ../../include/connections.php:735 ../../include/event.php:1424 msgid "Home, Voice" msgstr "Дом, голос" -#: ../../include/connections.php:731 ../../include/event.php:1425 +#: ../../include/connections.php:736 ../../include/event.php:1425 msgid "Home, Fax" msgstr "Дом, факс" -#: ../../include/connections.php:732 ../../include/event.php:1426 +#: ../../include/connections.php:737 ../../include/event.php:1426 #: ../../Zotlabs/Module/Cdav.php:1379 ../../Zotlabs/Module/Profiles.php:796 -#: ../../Zotlabs/Module/Connedit.php:935 +#: ../../Zotlabs/Module/Connedit.php:926 msgid "Work" msgstr "Рабочий" -#: ../../include/connections.php:733 ../../include/event.php:1427 +#: ../../include/connections.php:738 ../../include/event.php:1427 msgid "Work, Voice" msgstr "Работа, голос" -#: ../../include/connections.php:734 ../../include/event.php:1428 +#: ../../include/connections.php:739 ../../include/event.php:1428 msgid "Work, Fax" msgstr "Работа, факс" @@ -3869,7 +3871,7 @@ msgid "Account/Channel Settings" msgstr "Настройки аккаунта / канала" #: ../../include/nav.php:109 ../../include/nav.php:138 -#: ../../include/nav.php:157 ../../boot.php:1697 +#: ../../include/nav.php:157 ../../boot.php:1698 msgid "Logout" msgstr "Выход" @@ -3889,7 +3891,7 @@ msgstr "Управление / редактирование профилей" msgid "Edit your profile" msgstr "Редактировать профиль" -#: ../../include/nav.php:124 ../../include/nav.php:128 ../../boot.php:1698 +#: ../../include/nav.php:124 ../../include/nav.php:128 ../../boot.php:1699 #: ../../Zotlabs/Lib/Apps.php:336 msgid "Login" msgstr "Войти" @@ -3906,7 +3908,7 @@ msgstr "Домой" msgid "Log me out of this site" msgstr "Выйти с этого сайта" -#: ../../include/nav.php:162 ../../boot.php:1678 +#: ../../include/nav.php:162 ../../boot.php:1679 #: ../../Zotlabs/Module/Register.php:293 msgid "Register" msgstr "Регистрация" @@ -3934,7 +3936,7 @@ msgstr "Установка и конфигурация сайта" #: ../../include/nav.php:324 ../../Zotlabs/Module/Defperms.php:257 #: ../../Zotlabs/Module/New_channel.php:157 #: ../../Zotlabs/Module/New_channel.php:164 -#: ../../Zotlabs/Module/Connedit.php:870 +#: ../../Zotlabs/Module/Connedit.php:861 #: ../../Zotlabs/Widget/Notifications.php:182 msgid "Loading" msgstr "Загрузка" @@ -4120,45 +4122,45 @@ msgstr "файл" msgid "Profile Photos" msgstr "Фотографии профиля" -#: ../../boot.php:1677 +#: ../../boot.php:1678 msgid "Create an account to access services and applications" msgstr "Создайте аккаунт для доступа к службам и приложениям" -#: ../../boot.php:1701 +#: ../../boot.php:1702 msgid "Login/Email" msgstr "Пользователь / email" -#: ../../boot.php:1702 +#: ../../boot.php:1703 msgid "Password" msgstr "Пароль" -#: ../../boot.php:1703 +#: ../../boot.php:1704 msgid "Remember me" msgstr "Запомнить меня" -#: ../../boot.php:1706 +#: ../../boot.php:1707 msgid "Forgot your password?" msgstr "Забыли пароль или логин?" -#: ../../boot.php:1707 ../../Zotlabs/Module/Lostpass.php:91 +#: ../../boot.php:1708 ../../Zotlabs/Module/Lostpass.php:91 msgid "Password Reset" msgstr "Сбросить пароль" -#: ../../boot.php:2575 +#: ../../boot.php:2576 #, php-format msgid "[$Projectname] Website SSL error for %s" msgstr "[$Projectname] Ошибка SSL/TLS веб-сайта для %s" -#: ../../boot.php:2580 +#: ../../boot.php:2581 msgid "Website SSL certificate is not valid. Please correct." msgstr "SSL/TLS сертификат веб-сайт недействителен. Исправьте это." -#: ../../boot.php:2696 +#: ../../boot.php:2697 #, php-format msgid "[$Projectname] Cron tasks not running on %s" msgstr "[$Projectname] Задания Cron не запущены на %s" -#: ../../boot.php:2701 +#: ../../boot.php:2702 msgid "Cron/Scheduled tasks not running." msgstr "Задания Cron / планировщика не запущены." @@ -4194,7 +4196,7 @@ msgstr "Общие" #: ../../Zotlabs/Module/Cdav.php:1055 ../../Zotlabs/Module/Cdav.php:1383 #: ../../Zotlabs/Module/Profiles.php:800 #: ../../Zotlabs/Module/New_channel.php:189 ../../Zotlabs/Module/Menu.php:182 -#: ../../Zotlabs/Module/Webpages.php:254 ../../Zotlabs/Module/Connedit.php:939 +#: ../../Zotlabs/Module/Webpages.php:254 ../../Zotlabs/Module/Connedit.php:930 #: ../../Zotlabs/Module/Blocks.php:159 ../../Zotlabs/Module/Articles.php:117 #: ../../Zotlabs/Module/Cards.php:113 ../../Zotlabs/Module/Layouts.php:185 #: ../../Zotlabs/Widget/Cdav.php:140 ../../Zotlabs/Widget/Cdav.php:178 @@ -4214,7 +4216,7 @@ msgstr "Удалено администратором" #: ../../Zotlabs/Module/Sharedwithme.php:106 ../../Zotlabs/Module/Chat.php:257 #: ../../Zotlabs/Module/Oauth2.php:118 ../../Zotlabs/Module/Oauth2.php:146 #: ../../Zotlabs/Module/Admin/Channels.php:159 -#: ../../Zotlabs/Module/Connedit.php:924 ../../Zotlabs/Module/Group.php:155 +#: ../../Zotlabs/Module/Connedit.php:915 ../../Zotlabs/Module/Group.php:155 #: ../../Zotlabs/Module/Wiki.php:218 #: ../../Zotlabs/Widget/Wiki_page_history.php:22 #: ../../Zotlabs/Lib/NativeWikiPage.php:564 @@ -4284,7 +4286,7 @@ msgstr "Удалённая аутентификация заблокирован msgid "Welcome %s. Remote authentication successful." msgstr "Добро пожаловать %s. Удаленная аутентификация успешно завершена." -#: ../../Zotlabs/Module/Regdir.php:49 ../../Zotlabs/Module/Dirsearch.php:28 +#: ../../Zotlabs/Module/Regdir.php:52 ../../Zotlabs/Module/Dirsearch.php:28 msgid "This site is not a directory server" msgstr "Этот сайт не является сервером каталога" @@ -4303,7 +4305,7 @@ msgid "" "to correctly use this feature." msgstr "Предупреждение. Изменение некоторых настроек может привести к неработоспособности вашего канала. Пожалуйста, покиньте эту страницу, если вы точно не знаете, как правильно использовать эту функцию." -#: ../../Zotlabs/Module/Defperms.php:68 ../../Zotlabs/Module/Connedit.php:82 +#: ../../Zotlabs/Module/Defperms.php:68 ../../Zotlabs/Module/Connedit.php:89 msgid "Could not access contact record." msgstr "Не удалось получить доступ к записи контакта." @@ -4375,29 +4377,29 @@ msgstr "не установлено" msgid "Set custom default permissions for new connections" msgstr "Настройка пользовательских разрешений по умолчанию для новых подключений " -#: ../../Zotlabs/Module/Defperms.php:255 ../../Zotlabs/Module/Connedit.php:868 +#: ../../Zotlabs/Module/Defperms.php:255 ../../Zotlabs/Module/Connedit.php:859 msgid "Connection Default Permissions" msgstr "Разрешения по умолчанию для контакта" -#: ../../Zotlabs/Module/Defperms.php:256 ../../Zotlabs/Module/Connedit.php:869 +#: ../../Zotlabs/Module/Defperms.php:256 ../../Zotlabs/Module/Connedit.php:860 msgid "Apply these permissions automatically" msgstr "Применить эти разрешения автоматически" #: ../../Zotlabs/Module/Defperms.php:256 -#: ../../Zotlabs/Module/Settings/Channel.php:471 +#: ../../Zotlabs/Module/Settings/Channel.php:472 msgid "" "If enabled, connection requests will be approved without your interaction" msgstr "Если включено, запросы контактов будут одобрены без вашего участия" -#: ../../Zotlabs/Module/Defperms.php:257 ../../Zotlabs/Module/Connedit.php:870 +#: ../../Zotlabs/Module/Defperms.php:257 ../../Zotlabs/Module/Connedit.php:861 msgid "Permission role" msgstr "Роль разрешения" -#: ../../Zotlabs/Module/Defperms.php:258 ../../Zotlabs/Module/Connedit.php:871 +#: ../../Zotlabs/Module/Defperms.php:258 ../../Zotlabs/Module/Connedit.php:862 msgid "Add permission role" msgstr "Добавить роль разрешения" -#: ../../Zotlabs/Module/Defperms.php:262 ../../Zotlabs/Module/Connedit.php:884 +#: ../../Zotlabs/Module/Defperms.php:262 ../../Zotlabs/Module/Connedit.php:875 msgid "" "The permissions indicated on this page will be applied to all new " "connections." @@ -4408,17 +4410,17 @@ msgid "Automatic approval settings" msgstr "Настройки автоматического одобрения" #: ../../Zotlabs/Module/Defperms.php:265 ../../Zotlabs/Module/Permcats.php:124 -#: ../../Zotlabs/Module/Tokens.php:183 ../../Zotlabs/Module/Connedit.php:904 +#: ../../Zotlabs/Module/Tokens.php:183 ../../Zotlabs/Module/Connedit.php:895 msgid "inherited" msgstr "наследуется" #: ../../Zotlabs/Module/Defperms.php:267 ../../Zotlabs/Module/Permcats.php:122 -#: ../../Zotlabs/Module/Tokens.php:181 ../../Zotlabs/Module/Connedit.php:909 +#: ../../Zotlabs/Module/Tokens.php:181 ../../Zotlabs/Module/Connedit.php:900 msgid "My Settings" msgstr "Мои настройки" #: ../../Zotlabs/Module/Defperms.php:270 ../../Zotlabs/Module/Permcats.php:127 -#: ../../Zotlabs/Module/Tokens.php:186 ../../Zotlabs/Module/Connedit.php:911 +#: ../../Zotlabs/Module/Tokens.php:186 ../../Zotlabs/Module/Connedit.php:902 msgid "Individual Permissions" msgstr "Индивидуальные разрешения" @@ -4459,7 +4461,7 @@ msgid "Permission category name" msgstr "Наименование категории разрешений" #: ../../Zotlabs/Module/Permcats.php:128 ../../Zotlabs/Module/Tokens.php:187 -#: ../../Zotlabs/Module/Connedit.php:912 +#: ../../Zotlabs/Module/Connedit.php:903 msgid "" "Some permissions may be inherited from your channel's <a href=\"settings" "\"><strong>privacy settings</strong></a>, which have higher priority than " @@ -4549,29 +4551,29 @@ msgstr "Доставить повторно" msgid "No such group" msgstr "Нет такой группы" -#: ../../Zotlabs/Module/Network.php:159 +#: ../../Zotlabs/Module/Network.php:157 msgid "No such channel" msgstr "Нет такого канала" -#: ../../Zotlabs/Module/Network.php:174 ../../Zotlabs/Module/Channel.php:195 +#: ../../Zotlabs/Module/Network.php:169 ../../Zotlabs/Module/Channel.php:195 msgid "Search Results For:" msgstr "Результаты поиска для:" -#: ../../Zotlabs/Module/Network.php:204 ../../Zotlabs/Module/Display.php:80 +#: ../../Zotlabs/Module/Network.php:210 ../../Zotlabs/Module/Display.php:79 #: ../../Zotlabs/Module/Pubstream.php:99 ../../Zotlabs/Module/Channel.php:230 #: ../../Zotlabs/Module/Hq.php:134 msgid "Reset form" msgstr "Очистить форму" -#: ../../Zotlabs/Module/Network.php:243 +#: ../../Zotlabs/Module/Network.php:246 msgid "Privacy group is empty" msgstr "Группа конфиденциальности пуста" -#: ../../Zotlabs/Module/Network.php:253 +#: ../../Zotlabs/Module/Network.php:256 msgid "Privacy group: " msgstr "Группа конфиденциальности: " -#: ../../Zotlabs/Module/Network.php:326 +#: ../../Zotlabs/Module/Network.php:329 #: ../../extend/addon/hzaddons/redred/Mod_Redred.php:29 msgid "Invalid channel." msgstr "Недействительный канал." @@ -4613,40 +4615,46 @@ msgstr "Общих контактов нет." msgid "View Common Connections" msgstr "Просмотр общий контактов" +#: ../../Zotlabs/Module/Acl.php:121 ../../Zotlabs/Module/Lockview.php:117 +#: ../../Zotlabs/Module/Lockview.php:153 +msgctxt "acl" +msgid "Profile" +msgstr "Профиль" + #: ../../Zotlabs/Module/Acl.php:361 msgid "network" msgstr "сеть" -#: ../../Zotlabs/Module/Item.php:348 ../../Zotlabs/Module/Pin.php:35 +#: ../../Zotlabs/Module/Item.php:448 ../../Zotlabs/Module/Pin.php:35 msgid "Unable to locate original post." msgstr "Не удалось найти оригинальную публикацию." -#: ../../Zotlabs/Module/Item.php:634 +#: ../../Zotlabs/Module/Item.php:734 msgid "Empty post discarded." msgstr "Пустая публикация отклонена." -#: ../../Zotlabs/Module/Item.php:1086 +#: ../../Zotlabs/Module/Item.php:1186 msgid "Duplicate post suppressed." msgstr "Подавлена дублирующаяся публикация." -#: ../../Zotlabs/Module/Item.php:1231 +#: ../../Zotlabs/Module/Item.php:1331 msgid "System error. Post not saved." msgstr "Системная ошибка. Публикация не сохранена." -#: ../../Zotlabs/Module/Item.php:1265 +#: ../../Zotlabs/Module/Item.php:1365 msgid "Your comment is awaiting approval." msgstr "Ваш комментарий ожидает одобрения." -#: ../../Zotlabs/Module/Item.php:1382 +#: ../../Zotlabs/Module/Item.php:1482 msgid "Unable to obtain post information from database." msgstr "Невозможно получить информацию о публикации из базы данных" -#: ../../Zotlabs/Module/Item.php:1389 +#: ../../Zotlabs/Module/Item.php:1489 #, php-format msgid "You have reached your limit of %1$.0f top level posts." msgstr "Вы достигли вашего ограничения в %1$.0f публикаций высокого уровня." -#: ../../Zotlabs/Module/Item.php:1396 +#: ../../Zotlabs/Module/Item.php:1496 #, php-format msgid "You have reached your limit of %1$.0f webpages." msgstr "Вы достигли вашего ограничения в %1$.0f страниц." @@ -4662,16 +4670,16 @@ msgstr "Некоторые предложения о том, что делать msgid "Public access denied." msgstr "Публичный доступ запрещен." -#: ../../Zotlabs/Module/Display.php:383 ../../Zotlabs/Module/Channel.php:497 +#: ../../Zotlabs/Module/Display.php:376 ../../Zotlabs/Module/Channel.php:465 msgid "" "You must enable javascript for your browser to be able to view this content." msgstr "Для просмотра этого содержимого в вашем браузере должен быть включён JavaScript" -#: ../../Zotlabs/Module/Display.php:401 +#: ../../Zotlabs/Module/Display.php:394 msgid "Article" msgstr "Статья" -#: ../../Zotlabs/Module/Display.php:453 +#: ../../Zotlabs/Module/Display.php:439 msgid "Item has been removed." msgstr "Элемент был удалён." @@ -4695,7 +4703,7 @@ msgstr "g A l F d" msgid "[today]" msgstr "[сегодня]" -#: ../../Zotlabs/Module/Ping.php:456 ../../Zotlabs/Lib/Enotify.php:970 +#: ../../Zotlabs/Module/Ping.php:456 msgid "posted an event" msgstr "событие опубликовано" @@ -4704,11 +4712,11 @@ msgstr "событие опубликовано" msgid "shared a file with you" msgstr "с вами поделились файлом" -#: ../../Zotlabs/Module/Ping.php:672 ../../Zotlabs/Module/Sse_bs.php:510 +#: ../../Zotlabs/Module/Ping.php:672 ../../Zotlabs/Module/Sse_bs.php:540 msgid "Private forum" msgstr "Частный форум" -#: ../../Zotlabs/Module/Ping.php:672 ../../Zotlabs/Module/Sse_bs.php:510 +#: ../../Zotlabs/Module/Ping.php:672 ../../Zotlabs/Module/Sse_bs.php:540 msgid "Public forum" msgstr "Публичный форум" @@ -4900,7 +4908,7 @@ msgstr "Часовой пояс:" #: ../../Zotlabs/Module/Cdav.php:1010 ../../Zotlabs/Module/Appman.php:145 #: ../../Zotlabs/Module/Events.php:481 ../../Zotlabs/Module/Rbmark.php:101 #: ../../extend/addon/hzaddons/rendezvous/rendezvous.php:173 -#: ../../extend/addon/hzaddons/cart/submodules/manualcat.php:264 +#: ../../extend/addon/hzaddons/cart/submodules/manualcat.php:260 #: ../../extend/addon/hzaddons/cart/submodules/hzservices.php:655 msgid "Description" msgstr "Описание" @@ -4959,7 +4967,7 @@ msgstr "Меньше" #: ../../Zotlabs/Module/Oauth.php:137 ../../Zotlabs/Module/Oauth2.php:58 #: ../../Zotlabs/Module/Oauth2.php:144 #: ../../Zotlabs/Module/Admin/Addons.php:457 -#: ../../Zotlabs/Module/Connedit.php:940 ../../Zotlabs/Lib/Apps.php:536 +#: ../../Zotlabs/Module/Connedit.php:931 ../../Zotlabs/Lib/Apps.php:536 msgid "Update" msgstr "Обновить" @@ -4984,79 +4992,79 @@ msgstr "Удалить всё" msgid "Sorry! Editing of recurrent events is not yet implemented." msgstr "Простите, но редактирование повторяющихся событий пока не реализовано." -#: ../../Zotlabs/Module/Cdav.php:1369 ../../Zotlabs/Module/Connedit.php:925 +#: ../../Zotlabs/Module/Cdav.php:1369 ../../Zotlabs/Module/Connedit.php:916 msgid "Organisation" msgstr "Организация" -#: ../../Zotlabs/Module/Cdav.php:1370 ../../Zotlabs/Module/Connedit.php:926 +#: ../../Zotlabs/Module/Cdav.php:1370 ../../Zotlabs/Module/Connedit.php:917 #: ../../extend/addon/hzaddons/workflow/workflow.php:2617 #: ../../extend/addon/hzaddons/workflow/workflow.php:2678 msgid "Title" msgstr "Наименование" #: ../../Zotlabs/Module/Cdav.php:1371 ../../Zotlabs/Module/Profiles.php:788 -#: ../../Zotlabs/Module/Connedit.php:927 +#: ../../Zotlabs/Module/Connedit.php:918 msgid "Phone" msgstr "Телефон" #: ../../Zotlabs/Module/Cdav.php:1373 ../../Zotlabs/Module/Profiles.php:790 -#: ../../Zotlabs/Module/Connedit.php:929 +#: ../../Zotlabs/Module/Connedit.php:920 msgid "Instant messenger" msgstr "Мессенджер" #: ../../Zotlabs/Module/Cdav.php:1374 ../../Zotlabs/Module/Profiles.php:791 -#: ../../Zotlabs/Module/Connedit.php:930 +#: ../../Zotlabs/Module/Connedit.php:921 msgid "Website" msgstr "Веб-сайт" #: ../../Zotlabs/Module/Cdav.php:1375 ../../Zotlabs/Module/Profiles.php:504 -#: ../../Zotlabs/Module/Profiles.php:792 ../../Zotlabs/Module/Locs.php:118 +#: ../../Zotlabs/Module/Profiles.php:792 ../../Zotlabs/Module/Locs.php:122 #: ../../Zotlabs/Module/Admin/Channels.php:160 -#: ../../Zotlabs/Module/Connedit.php:931 +#: ../../Zotlabs/Module/Connedit.php:922 msgid "Address" msgstr "Адрес" #: ../../Zotlabs/Module/Cdav.php:1376 ../../Zotlabs/Module/Profiles.php:793 -#: ../../Zotlabs/Module/Connedit.php:932 +#: ../../Zotlabs/Module/Connedit.php:923 msgid "Note" msgstr "Заметка" #: ../../Zotlabs/Module/Cdav.php:1381 ../../Zotlabs/Module/Profiles.php:798 -#: ../../Zotlabs/Module/Connedit.php:937 +#: ../../Zotlabs/Module/Connedit.php:928 msgid "Add Contact" msgstr "Добавить контакт" #: ../../Zotlabs/Module/Cdav.php:1382 ../../Zotlabs/Module/Profiles.php:799 -#: ../../Zotlabs/Module/Connedit.php:938 +#: ../../Zotlabs/Module/Connedit.php:929 msgid "Add Field" msgstr "Добавить поле" -#: ../../Zotlabs/Module/Cdav.php:1387 ../../Zotlabs/Module/Connedit.php:943 +#: ../../Zotlabs/Module/Cdav.php:1387 ../../Zotlabs/Module/Connedit.php:934 msgid "P.O. Box" msgstr "абонентский ящик" -#: ../../Zotlabs/Module/Cdav.php:1388 ../../Zotlabs/Module/Connedit.php:944 +#: ../../Zotlabs/Module/Cdav.php:1388 ../../Zotlabs/Module/Connedit.php:935 msgid "Additional" msgstr "Дополнительно" -#: ../../Zotlabs/Module/Cdav.php:1389 ../../Zotlabs/Module/Connedit.php:945 +#: ../../Zotlabs/Module/Cdav.php:1389 ../../Zotlabs/Module/Connedit.php:936 msgid "Street" msgstr "Улица" -#: ../../Zotlabs/Module/Cdav.php:1390 ../../Zotlabs/Module/Connedit.php:946 +#: ../../Zotlabs/Module/Cdav.php:1390 ../../Zotlabs/Module/Connedit.php:937 msgid "Locality" msgstr "Населённый пункт" -#: ../../Zotlabs/Module/Cdav.php:1391 ../../Zotlabs/Module/Connedit.php:947 +#: ../../Zotlabs/Module/Cdav.php:1391 ../../Zotlabs/Module/Connedit.php:938 msgid "Region" msgstr "Регион" -#: ../../Zotlabs/Module/Cdav.php:1392 ../../Zotlabs/Module/Connedit.php:948 +#: ../../Zotlabs/Module/Cdav.php:1392 ../../Zotlabs/Module/Connedit.php:939 msgid "ZIP Code" msgstr "Индекс" #: ../../Zotlabs/Module/Cdav.php:1393 ../../Zotlabs/Module/Profiles.php:759 -#: ../../Zotlabs/Module/Connedit.php:949 +#: ../../Zotlabs/Module/Connedit.php:940 msgid "Country" msgstr "Страна" @@ -5087,7 +5095,7 @@ msgstr "vCard" msgid "You must be logged in to see this page." msgstr "Вы должны авторизоваться, чтобы увидеть эту страницу." -#: ../../Zotlabs/Module/Share.php:104 ../../Zotlabs/Lib/Activity.php:2068 +#: ../../Zotlabs/Module/Share.php:104 ../../Zotlabs/Lib/Activity.php:2133 #, php-format msgid "🔁 Repeated %1$s's %2$s" msgstr "🔁 Повторил %1$s %2$s" @@ -5257,7 +5265,7 @@ msgstr "Ваше программное обеспечение должно бы #: ../../Zotlabs/Module/Admin/Security.php:98 #: ../../Zotlabs/Module/Admin/Addons.php:342 #: ../../Zotlabs/Module/Admin/Addons.php:440 -#: ../../Zotlabs/Module/Admin/Site.php:285 +#: ../../Zotlabs/Module/Admin/Site.php:291 #: ../../Zotlabs/Module/Admin/Themes.php:122 #: ../../Zotlabs/Module/Admin/Themes.php:156 #: ../../Zotlabs/Module/Admin/Accounts.php:166 @@ -5753,14 +5761,14 @@ msgstr "Удалить тег элемента" msgid "Select a tag to remove: " msgstr "Выбрать тег для удаления:" -#: ../../Zotlabs/Module/Chanview.php:89 ../../Zotlabs/Module/Page.php:75 +#: ../../Zotlabs/Module/Chanview.php:95 ../../Zotlabs/Module/Page.php:75 #: ../../Zotlabs/Module/Wall_upload.php:31 ../../Zotlabs/Module/Block.php:41 #: ../../Zotlabs/Module/Cal.php:31 ../../Zotlabs/Module/Card_edit.php:44 #: ../../Zotlabs/Module/Article_edit.php:44 msgid "Channel not found." msgstr "Канал не найден." -#: ../../Zotlabs/Module/Chanview.php:128 +#: ../../Zotlabs/Module/Chanview.php:132 msgid "toggle full screen mode" msgstr "переключение полноэкранного режима" @@ -6084,10 +6092,6 @@ msgstr "Авторизовать" msgid "Do you authorize the app %s to access your channel data?" msgstr "Авторизуете ли вы приложение %s для доступа к данным вашего канала?" -#: ../../Zotlabs/Module/Authorize.php:32 -msgid "Allow" -msgstr "Разрешить" - #: ../../Zotlabs/Module/Authorize.php:33 #: ../../Zotlabs/Module/Admin/Accounts.php:174 msgid "Deny" @@ -6141,7 +6145,7 @@ msgstr "Выберите короткий псевдоним" #: ../../Zotlabs/Module/New_channel.php:178 #: ../../Zotlabs/Module/Register.php:264 -#: ../../Zotlabs/Module/Settings/Channel.php:536 +#: ../../Zotlabs/Module/Settings/Channel.php:537 msgid "Channel role and privacy" msgstr "Роль и конфиденциальность канала" @@ -6386,7 +6390,7 @@ msgid "yes" msgstr "да" #: ../../Zotlabs/Module/Register.php:277 -#: ../../Zotlabs/Module/Admin/Site.php:288 +#: ../../Zotlabs/Module/Admin/Site.php:294 msgid "Registration" msgstr "Регистрация" @@ -6476,56 +6480,56 @@ msgstr "Объясните свою оценку (необязательно; э msgid "Please login." msgstr "Пожалуйста, войдите." -#: ../../Zotlabs/Module/Locs.php:25 ../../Zotlabs/Module/Locs.php:54 +#: ../../Zotlabs/Module/Locs.php:27 ../../Zotlabs/Module/Locs.php:57 msgid "Location not found." msgstr "Местоположение не найдено" -#: ../../Zotlabs/Module/Locs.php:62 +#: ../../Zotlabs/Module/Locs.php:65 msgid "Location lookup failed." msgstr "Поиск местоположения не удался" -#: ../../Zotlabs/Module/Locs.php:66 +#: ../../Zotlabs/Module/Locs.php:69 msgid "" "Please select another location to become primary before removing the primary " "location." msgstr "Пожалуйста, выберите другое местоположение в качестве основного прежде чем удалить предыдущее" -#: ../../Zotlabs/Module/Locs.php:95 +#: ../../Zotlabs/Module/Locs.php:99 msgid "Syncing locations" msgstr "Синхронизировать местоположение" -#: ../../Zotlabs/Module/Locs.php:105 +#: ../../Zotlabs/Module/Locs.php:109 msgid "No locations found." msgstr "Местоположений не найдено" -#: ../../Zotlabs/Module/Locs.php:116 +#: ../../Zotlabs/Module/Locs.php:120 msgid "Manage Channel Locations" msgstr "Управление местоположением канала" -#: ../../Zotlabs/Module/Locs.php:119 +#: ../../Zotlabs/Module/Locs.php:123 #: ../../extend/addon/hzaddons/workflow/workflow.php:285 msgid "Primary" msgstr "Основной" -#: ../../Zotlabs/Module/Locs.php:120 ../../Zotlabs/Module/Menu.php:177 +#: ../../Zotlabs/Module/Locs.php:124 ../../Zotlabs/Module/Menu.php:177 msgid "Drop" msgstr "Удалить" -#: ../../Zotlabs/Module/Locs.php:122 +#: ../../Zotlabs/Module/Locs.php:126 msgid "Sync Now" msgstr "Синхронизировать" -#: ../../Zotlabs/Module/Locs.php:123 +#: ../../Zotlabs/Module/Locs.php:127 msgid "Please wait several minutes between consecutive operations." msgstr "Пожалуйста, подождите несколько минут между последовательными операциями." -#: ../../Zotlabs/Module/Locs.php:124 +#: ../../Zotlabs/Module/Locs.php:128 msgid "" "When possible, drop a location by logging into that website/hub and removing " "your channel." msgstr "По возможности, очистите местоположение, войдя на этот веб-сайт / хаб и удалив свой канал." -#: ../../Zotlabs/Module/Locs.php:125 +#: ../../Zotlabs/Module/Locs.php:129 msgid "Use this form to drop the location if the hub is no longer operating." msgstr "Используйте эту форму, чтобы удалить местоположение, если хаб больше не функционирует." @@ -6791,7 +6795,7 @@ msgid "Leave password fields blank unless changing" msgstr "Оставьте поля пустыми до измнения" #: ../../Zotlabs/Module/Settings/Account.php:104 -#: ../../Zotlabs/Module/Settings/Channel.php:501 +#: ../../Zotlabs/Module/Settings/Channel.php:502 msgid "Email Address:" msgstr "Адрес email:" @@ -6821,7 +6825,7 @@ msgid "Editor Settings" msgstr "Настройки редактора" #: ../../Zotlabs/Module/Settings/Display.php:120 -#: ../../Zotlabs/Module/Admin/Site.php:196 +#: ../../Zotlabs/Module/Admin/Site.php:202 #, php-format msgid "%s - (Incompatible)" msgstr "%s - (несовместимо)" @@ -6976,392 +6980,392 @@ msgstr "Пожалуйста сохраните / отправьте измен msgid "Connections Settings" msgstr "Настройки контактов" -#: ../../Zotlabs/Module/Settings/Channel.php:328 +#: ../../Zotlabs/Module/Settings/Channel.php:329 msgid "Nobody except yourself" msgstr "Никто кроме вас" -#: ../../Zotlabs/Module/Settings/Channel.php:329 +#: ../../Zotlabs/Module/Settings/Channel.php:330 msgid "Only those you specifically allow" msgstr "Только персонально разрешённые" -#: ../../Zotlabs/Module/Settings/Channel.php:330 +#: ../../Zotlabs/Module/Settings/Channel.php:331 msgid "Approved connections" msgstr "Одобренные контакты" -#: ../../Zotlabs/Module/Settings/Channel.php:331 +#: ../../Zotlabs/Module/Settings/Channel.php:332 msgid "Any connections" msgstr "Любые контакты" -#: ../../Zotlabs/Module/Settings/Channel.php:332 +#: ../../Zotlabs/Module/Settings/Channel.php:333 msgid "Anybody on this website" msgstr "Любой на этом сайте" -#: ../../Zotlabs/Module/Settings/Channel.php:333 +#: ../../Zotlabs/Module/Settings/Channel.php:334 msgid "Anybody in this network" msgstr "Любой в этой сети" -#: ../../Zotlabs/Module/Settings/Channel.php:334 +#: ../../Zotlabs/Module/Settings/Channel.php:335 msgid "Anybody authenticated" msgstr "Любой аутентифицированный" -#: ../../Zotlabs/Module/Settings/Channel.php:335 +#: ../../Zotlabs/Module/Settings/Channel.php:336 msgid "Anybody on the internet" msgstr "Любой в интернете" -#: ../../Zotlabs/Module/Settings/Channel.php:410 +#: ../../Zotlabs/Module/Settings/Channel.php:411 msgid "Publish your default profile in the network directory" msgstr "Публиковать ваш профиль по умолчанию в сетевом каталоге" -#: ../../Zotlabs/Module/Settings/Channel.php:415 +#: ../../Zotlabs/Module/Settings/Channel.php:416 msgid "Allow us to suggest you as a potential friend to new members?" msgstr "Разрешить предлагать вас как потенциального друга для новых пользователей?" -#: ../../Zotlabs/Module/Settings/Channel.php:419 +#: ../../Zotlabs/Module/Settings/Channel.php:420 msgid "or" msgstr "или" -#: ../../Zotlabs/Module/Settings/Channel.php:428 +#: ../../Zotlabs/Module/Settings/Channel.php:429 msgid "Your channel address is" msgstr "Адрес вашего канала" -#: ../../Zotlabs/Module/Settings/Channel.php:431 +#: ../../Zotlabs/Module/Settings/Channel.php:432 msgid "Your files/photos are accessible via WebDAV at" msgstr "Ваши файлы / фотографии доступны через WebDAV по" -#: ../../Zotlabs/Module/Settings/Channel.php:471 +#: ../../Zotlabs/Module/Settings/Channel.php:472 msgid "Automatic membership approval" msgstr "Членство одобрено автоматически" -#: ../../Zotlabs/Module/Settings/Channel.php:492 +#: ../../Zotlabs/Module/Settings/Channel.php:493 msgid "Channel Settings" msgstr "Настройки канала" -#: ../../Zotlabs/Module/Settings/Channel.php:499 +#: ../../Zotlabs/Module/Settings/Channel.php:500 msgid "Basic Settings" msgstr "Основные настройки" -#: ../../Zotlabs/Module/Settings/Channel.php:502 +#: ../../Zotlabs/Module/Settings/Channel.php:503 msgid "Your Timezone:" msgstr "Часовой пояс:" -#: ../../Zotlabs/Module/Settings/Channel.php:503 +#: ../../Zotlabs/Module/Settings/Channel.php:504 msgid "Default Post Location:" msgstr "Расположение по умолчанию:" -#: ../../Zotlabs/Module/Settings/Channel.php:503 +#: ../../Zotlabs/Module/Settings/Channel.php:504 msgid "Geographical location to display on your posts" msgstr "Показывать географическое положение в ваших публикациях" -#: ../../Zotlabs/Module/Settings/Channel.php:504 +#: ../../Zotlabs/Module/Settings/Channel.php:505 msgid "Use Browser Location:" msgstr "Определять расположение из браузера" -#: ../../Zotlabs/Module/Settings/Channel.php:506 +#: ../../Zotlabs/Module/Settings/Channel.php:507 msgid "Adult Content" msgstr "Содержимое для взрослых" -#: ../../Zotlabs/Module/Settings/Channel.php:506 +#: ../../Zotlabs/Module/Settings/Channel.php:507 msgid "" "This channel frequently or regularly publishes adult content. (Please tag " "any adult material and/or nudity with #NSFW)" msgstr "Этот канал часто или регулярно публикует содержимое для взрослых. Пожалуйста, помечайте любой такой материал тегом #NSFW" -#: ../../Zotlabs/Module/Settings/Channel.php:508 +#: ../../Zotlabs/Module/Settings/Channel.php:509 msgid "Security and Privacy Settings" msgstr "Безопасность и настройки приватности" -#: ../../Zotlabs/Module/Settings/Channel.php:510 +#: ../../Zotlabs/Module/Settings/Channel.php:511 msgid "Your permissions are already configured. Click to view/adjust" msgstr "Ваши разрешения уже настроены. Нажмите чтобы просмотреть или изменить" -#: ../../Zotlabs/Module/Settings/Channel.php:512 +#: ../../Zotlabs/Module/Settings/Channel.php:513 msgid "Hide my online presence" msgstr "Скрывать моё присутствие онлайн" -#: ../../Zotlabs/Module/Settings/Channel.php:512 +#: ../../Zotlabs/Module/Settings/Channel.php:513 msgid "Prevents displaying in your profile that you are online" msgstr "Предотвращает отображения статуса \"в сети\" в вашем профиле" -#: ../../Zotlabs/Module/Settings/Channel.php:514 +#: ../../Zotlabs/Module/Settings/Channel.php:515 msgid "Simple Privacy Settings:" msgstr "Простые настройки безопасности:" -#: ../../Zotlabs/Module/Settings/Channel.php:515 +#: ../../Zotlabs/Module/Settings/Channel.php:516 msgid "" "Very Public - <em>extremely permissive (should be used with caution)</em>" msgstr "Полностью открытый - <em>сверхлиберальный (должен использоваться с осторожностью)</em>" -#: ../../Zotlabs/Module/Settings/Channel.php:516 +#: ../../Zotlabs/Module/Settings/Channel.php:517 msgid "" "Typical - <em>default public, privacy when desired (similar to social " "network permissions but with improved privacy)</em>" msgstr "Обычный - <em>открытый по умолчанию, приватность по желанию (как в социальных сетях, но с улучшенными настройками)</em>" -#: ../../Zotlabs/Module/Settings/Channel.php:517 +#: ../../Zotlabs/Module/Settings/Channel.php:518 msgid "Private - <em>default private, never open or public</em>" msgstr "Частный - <em>частный по умочанию, не открытый и не публичный</em>" -#: ../../Zotlabs/Module/Settings/Channel.php:518 +#: ../../Zotlabs/Module/Settings/Channel.php:519 msgid "Blocked - <em>default blocked to/from everybody</em>" msgstr "Закрытый - <em>заблокированный по умолчанию от / для всех</em>" -#: ../../Zotlabs/Module/Settings/Channel.php:520 +#: ../../Zotlabs/Module/Settings/Channel.php:521 msgid "Allow others to tag your posts" msgstr "Разрешить другим отмечать ваши публикации" -#: ../../Zotlabs/Module/Settings/Channel.php:520 +#: ../../Zotlabs/Module/Settings/Channel.php:521 msgid "" "Often used by the community to retro-actively flag inappropriate content" msgstr "Часто используется сообществом для маркировки неподобающего содержания" -#: ../../Zotlabs/Module/Settings/Channel.php:522 +#: ../../Zotlabs/Module/Settings/Channel.php:523 msgid "Channel Permission Limits" msgstr "Ограничения разрешений канала" -#: ../../Zotlabs/Module/Settings/Channel.php:524 +#: ../../Zotlabs/Module/Settings/Channel.php:525 msgid "Expire other channel content after this many days" msgstr "Храненить содержимое других каналов, дней" -#: ../../Zotlabs/Module/Settings/Channel.php:524 +#: ../../Zotlabs/Module/Settings/Channel.php:525 msgid "0 or blank to use the website limit." msgstr "0 или пусто - использовать настройки сайта." -#: ../../Zotlabs/Module/Settings/Channel.php:524 +#: ../../Zotlabs/Module/Settings/Channel.php:525 #, php-format msgid "This website expires after %d days." msgstr "Срок хранения содержимого этого сайта истекает через %d дней" -#: ../../Zotlabs/Module/Settings/Channel.php:524 +#: ../../Zotlabs/Module/Settings/Channel.php:525 msgid "This website does not expire imported content." msgstr "Срок хранения импортированного содержимого этого сайта не ограничен." -#: ../../Zotlabs/Module/Settings/Channel.php:524 +#: ../../Zotlabs/Module/Settings/Channel.php:525 msgid "The website limit takes precedence if lower than your limit." msgstr "Ограничение сайта имеет приоритет если ниже вашего значения." -#: ../../Zotlabs/Module/Settings/Channel.php:525 +#: ../../Zotlabs/Module/Settings/Channel.php:526 msgid "Maximum Friend Requests/Day:" msgstr "Запросов в друзья в день:" -#: ../../Zotlabs/Module/Settings/Channel.php:525 +#: ../../Zotlabs/Module/Settings/Channel.php:526 msgid "May reduce spam activity" msgstr "Может ограничить спам активность" -#: ../../Zotlabs/Module/Settings/Channel.php:526 +#: ../../Zotlabs/Module/Settings/Channel.php:527 msgid "Default Privacy Group" msgstr "Группа конфиденциальности по умолчанию" -#: ../../Zotlabs/Module/Settings/Channel.php:527 +#: ../../Zotlabs/Module/Settings/Channel.php:528 #: ../../Zotlabs/Module/Mitem.php:168 ../../Zotlabs/Module/Mitem.php:247 msgid "(click to open/close)" msgstr "(нажмите чтобы открыть/закрыть)" -#: ../../Zotlabs/Module/Settings/Channel.php:528 +#: ../../Zotlabs/Module/Settings/Channel.php:529 msgid "Use my default audience setting for the type of object published" msgstr "Использовать настройки аудитории по умолчанию для типа опубликованного объекта" -#: ../../Zotlabs/Module/Settings/Channel.php:537 +#: ../../Zotlabs/Module/Settings/Channel.php:538 msgid "Default permissions category" msgstr "Категория разрешений по умолчанию" -#: ../../Zotlabs/Module/Settings/Channel.php:543 +#: ../../Zotlabs/Module/Settings/Channel.php:544 msgid "Maximum private messages per day from unknown people:" msgstr "Максимально количество сообщений от незнакомых людей, в день:" -#: ../../Zotlabs/Module/Settings/Channel.php:543 +#: ../../Zotlabs/Module/Settings/Channel.php:544 msgid "Useful to reduce spamming" msgstr "Полезно для сокращения количества спама" -#: ../../Zotlabs/Module/Settings/Channel.php:546 +#: ../../Zotlabs/Module/Settings/Channel.php:547 #: ../../Zotlabs/Lib/Enotify.php:68 msgid "Notification Settings" msgstr "Настройки уведомлений" -#: ../../Zotlabs/Module/Settings/Channel.php:547 +#: ../../Zotlabs/Module/Settings/Channel.php:548 msgid "By default post a status message when:" msgstr "По умолчанию публиковать новый статус при:" -#: ../../Zotlabs/Module/Settings/Channel.php:548 +#: ../../Zotlabs/Module/Settings/Channel.php:549 msgid "accepting a friend request" msgstr "одобрении запроса в друзья" -#: ../../Zotlabs/Module/Settings/Channel.php:549 +#: ../../Zotlabs/Module/Settings/Channel.php:550 msgid "joining a forum/community" msgstr "вступлении в сообщество / форум" -#: ../../Zotlabs/Module/Settings/Channel.php:550 +#: ../../Zotlabs/Module/Settings/Channel.php:551 msgid "making an <em>interesting</em> profile change" msgstr "<em>интересном</em> изменении профиля" -#: ../../Zotlabs/Module/Settings/Channel.php:551 +#: ../../Zotlabs/Module/Settings/Channel.php:552 msgid "Send a notification email when:" msgstr "Отправить уведомление по email когда:" -#: ../../Zotlabs/Module/Settings/Channel.php:552 +#: ../../Zotlabs/Module/Settings/Channel.php:553 msgid "You receive a connection request" msgstr "вы получили новый запрос контакта" -#: ../../Zotlabs/Module/Settings/Channel.php:553 +#: ../../Zotlabs/Module/Settings/Channel.php:554 msgid "Your connections are confirmed" msgstr "Ваш запрос контакта был одобрен" -#: ../../Zotlabs/Module/Settings/Channel.php:554 +#: ../../Zotlabs/Module/Settings/Channel.php:555 msgid "Someone writes on your profile wall" msgstr "Кто-то написал на стене вашего профиля" -#: ../../Zotlabs/Module/Settings/Channel.php:555 +#: ../../Zotlabs/Module/Settings/Channel.php:556 msgid "Someone writes a followup comment" msgstr "Кто-то пишет комментарий" -#: ../../Zotlabs/Module/Settings/Channel.php:556 +#: ../../Zotlabs/Module/Settings/Channel.php:557 msgid "You receive a private message" msgstr "Вы получили личное сообщение" -#: ../../Zotlabs/Module/Settings/Channel.php:557 +#: ../../Zotlabs/Module/Settings/Channel.php:558 msgid "You receive a friend suggestion" msgstr "Вы получили предложение друзей" -#: ../../Zotlabs/Module/Settings/Channel.php:558 +#: ../../Zotlabs/Module/Settings/Channel.php:559 msgid "You are tagged in a post" msgstr "Вы были отмечены в публикации" -#: ../../Zotlabs/Module/Settings/Channel.php:559 +#: ../../Zotlabs/Module/Settings/Channel.php:560 msgid "You are poked/prodded/etc. in a post" msgstr "Вас толкнули, подтолкнули и т.п. в публикации" -#: ../../Zotlabs/Module/Settings/Channel.php:561 +#: ../../Zotlabs/Module/Settings/Channel.php:562 msgid "Someone likes your post/comment" msgstr "Кому-то нравится ваша публикация / комментарий" -#: ../../Zotlabs/Module/Settings/Channel.php:564 +#: ../../Zotlabs/Module/Settings/Channel.php:565 msgid "Show visual notifications including:" msgstr "Показывать визуальные оповещения включая:" -#: ../../Zotlabs/Module/Settings/Channel.php:566 +#: ../../Zotlabs/Module/Settings/Channel.php:567 msgid "Unseen stream activity" msgstr "Новая активность в потоке" -#: ../../Zotlabs/Module/Settings/Channel.php:567 +#: ../../Zotlabs/Module/Settings/Channel.php:568 msgid "Unseen channel activity" msgstr "Новая активность в канале" -#: ../../Zotlabs/Module/Settings/Channel.php:568 +#: ../../Zotlabs/Module/Settings/Channel.php:569 msgid "Unseen private messages" msgstr "Новые личные сообщения" -#: ../../Zotlabs/Module/Settings/Channel.php:568 -#: ../../Zotlabs/Module/Settings/Channel.php:573 +#: ../../Zotlabs/Module/Settings/Channel.php:569 #: ../../Zotlabs/Module/Settings/Channel.php:574 #: ../../Zotlabs/Module/Settings/Channel.php:575 +#: ../../Zotlabs/Module/Settings/Channel.php:576 msgid "Recommended" msgstr "Рекомендовано" -#: ../../Zotlabs/Module/Settings/Channel.php:569 +#: ../../Zotlabs/Module/Settings/Channel.php:570 msgid "Upcoming events" msgstr "Грядущие события" -#: ../../Zotlabs/Module/Settings/Channel.php:570 +#: ../../Zotlabs/Module/Settings/Channel.php:571 msgid "Events today" msgstr "События сегодня" -#: ../../Zotlabs/Module/Settings/Channel.php:571 +#: ../../Zotlabs/Module/Settings/Channel.php:572 msgid "Upcoming birthdays" msgstr "Грядущие дни рождения" -#: ../../Zotlabs/Module/Settings/Channel.php:571 +#: ../../Zotlabs/Module/Settings/Channel.php:572 msgid "Not available in all themes" msgstr "Не доступно во всех темах" -#: ../../Zotlabs/Module/Settings/Channel.php:572 +#: ../../Zotlabs/Module/Settings/Channel.php:573 msgid "System (personal) notifications" msgstr "Системные (личные) уведомления" -#: ../../Zotlabs/Module/Settings/Channel.php:573 +#: ../../Zotlabs/Module/Settings/Channel.php:574 msgid "System info messages" msgstr "Сообщения с системной информацией" -#: ../../Zotlabs/Module/Settings/Channel.php:574 +#: ../../Zotlabs/Module/Settings/Channel.php:575 msgid "System critical alerts" msgstr "Критические уведомления системы" -#: ../../Zotlabs/Module/Settings/Channel.php:575 +#: ../../Zotlabs/Module/Settings/Channel.php:576 msgid "New connections" msgstr "Новые контакты" -#: ../../Zotlabs/Module/Settings/Channel.php:576 +#: ../../Zotlabs/Module/Settings/Channel.php:577 msgid "System Registrations" msgstr "Системные регистрации" -#: ../../Zotlabs/Module/Settings/Channel.php:577 +#: ../../Zotlabs/Module/Settings/Channel.php:578 msgid "Unseen shared files" msgstr "Новые общие файлы" -#: ../../Zotlabs/Module/Settings/Channel.php:578 +#: ../../Zotlabs/Module/Settings/Channel.php:579 msgid "Unseen public stream activity" msgstr "Новая активность в публичном потоке" -#: ../../Zotlabs/Module/Settings/Channel.php:579 +#: ../../Zotlabs/Module/Settings/Channel.php:580 msgid "Unseen likes and dislikes" msgstr "Новые лайки и дислайки" -#: ../../Zotlabs/Module/Settings/Channel.php:580 +#: ../../Zotlabs/Module/Settings/Channel.php:581 msgid "Unseen forum posts" msgstr "Новые публикации на форуме" -#: ../../Zotlabs/Module/Settings/Channel.php:581 +#: ../../Zotlabs/Module/Settings/Channel.php:582 msgid "Email notification hub (hostname)" msgstr "Центр уведомлений по email (имя хоста)" -#: ../../Zotlabs/Module/Settings/Channel.php:581 +#: ../../Zotlabs/Module/Settings/Channel.php:582 #, php-format msgid "" "If your channel is mirrored to multiple hubs, set this to your preferred " "location. This will prevent duplicate email notifications. Example: %s" msgstr "Если ваш канал зеркалируется в нескольких местах, это ваше предпочтительное местоположение. Это должно предотвратить дублировать уведомлений по email. Например: %s" -#: ../../Zotlabs/Module/Settings/Channel.php:582 +#: ../../Zotlabs/Module/Settings/Channel.php:583 msgid "Show new wall posts, private messages and connections under Notices" msgstr "Показать новые сообщения на стене, личные сообщения и контакты в \"Уведомлениях\"" -#: ../../Zotlabs/Module/Settings/Channel.php:584 +#: ../../Zotlabs/Module/Settings/Channel.php:585 msgid "Notify me of events this many days in advance" msgstr "Уведомлять меня о событиях заранее, дней" -#: ../../Zotlabs/Module/Settings/Channel.php:584 +#: ../../Zotlabs/Module/Settings/Channel.php:585 msgid "Must be greater than 0" msgstr "Должно быть больше 0" -#: ../../Zotlabs/Module/Settings/Channel.php:589 +#: ../../Zotlabs/Module/Settings/Channel.php:590 msgid "Advanced Account/Page Type Settings" msgstr "Дополнительные настройки учётной записи / страницы" -#: ../../Zotlabs/Module/Settings/Channel.php:590 +#: ../../Zotlabs/Module/Settings/Channel.php:591 msgid "Change the behaviour of this account for special situations" msgstr "Изменить поведение этого аккаунта в особых ситуациях" -#: ../../Zotlabs/Module/Settings/Channel.php:592 +#: ../../Zotlabs/Module/Settings/Channel.php:593 msgid "Miscellaneous Settings" msgstr "Дополнительные настройки" -#: ../../Zotlabs/Module/Settings/Channel.php:593 +#: ../../Zotlabs/Module/Settings/Channel.php:594 msgid "Default photo upload folder" msgstr "Каталог загрузки фотографий по умолчанию" -#: ../../Zotlabs/Module/Settings/Channel.php:593 #: ../../Zotlabs/Module/Settings/Channel.php:594 +#: ../../Zotlabs/Module/Settings/Channel.php:595 msgid "%Y - current year, %m - current month" msgstr "%Y - текущий год, %y - текущий месяц" -#: ../../Zotlabs/Module/Settings/Channel.php:594 +#: ../../Zotlabs/Module/Settings/Channel.php:595 msgid "Default file upload folder" msgstr "Каталог загрузки файлов по умолчанию" -#: ../../Zotlabs/Module/Settings/Channel.php:595 +#: ../../Zotlabs/Module/Settings/Channel.php:596 #: ../../Zotlabs/Module/Removeme.php:64 msgid "Remove Channel" msgstr "Удаление канала" -#: ../../Zotlabs/Module/Settings/Channel.php:596 +#: ../../Zotlabs/Module/Settings/Channel.php:597 msgid "Remove this channel." msgstr "Удалить этот канал." @@ -7570,6 +7574,12 @@ msgstr "Канал недоступен." msgid "Previous action reversed." msgstr "Предыдущее действие отменено." +#: ../../Zotlabs/Module/Like.php:386 ../../Zotlabs/Module/Subthread.php:112 +#: ../../extend/addon/hzaddons/pubcrawl/as.php:1881 +#: ../../extend/addon/hzaddons/diaspora/Receiver.php:1601 +msgid "status" +msgstr "статус" + #: ../../Zotlabs/Module/Like.php:426 #, php-format msgid "%1$s agrees with %2$s's %3$s" @@ -7586,19 +7596,19 @@ msgid "%1$s abstains from a decision on %2$s's %3$s" msgstr "%1$s воздерживается от решения по %2$s%3$s" #: ../../Zotlabs/Module/Like.php:432 -#: ../../extend/addon/hzaddons/diaspora/Receiver.php:2184 +#: ../../extend/addon/hzaddons/diaspora/Receiver.php:2188 #, php-format msgid "%1$s is attending %2$s's %3$s" msgstr "%1$s посещает %2$s%3$s" #: ../../Zotlabs/Module/Like.php:434 -#: ../../extend/addon/hzaddons/diaspora/Receiver.php:2186 +#: ../../extend/addon/hzaddons/diaspora/Receiver.php:2190 #, php-format msgid "%1$s is not attending %2$s's %3$s" msgstr "%1$s не посещает %2$s%3$s" #: ../../Zotlabs/Module/Like.php:436 -#: ../../extend/addon/hzaddons/diaspora/Receiver.php:2188 +#: ../../extend/addon/hzaddons/diaspora/Receiver.php:2192 #, php-format msgid "%1$s may attend %2$s's %3$s" msgstr "%1$s может посетить %2$s%3$s" @@ -7631,17 +7641,21 @@ msgstr "Мои закладки" msgid "My Connections Bookmarks" msgstr "Закладки моих контактов" -#: ../../Zotlabs/Module/Z6trans.php:98 +#: ../../Zotlabs/Module/Z6trans.php:19 msgid "Update to Hubzilla 5.0 step 2" msgstr "Обновление Hubzilla 5.0, этап 2" -#: ../../Zotlabs/Module/Z6trans.php:100 +#: ../../Zotlabs/Module/Z6trans.php:21 msgid "To complete the update please run" msgstr "Для завершения обновления пожалуйста выполните" -#: ../../Zotlabs/Module/Z6trans.php:106 -msgid "INFO: this command can take a very long time depending on your DB size." -msgstr "К сведению: эта команда может выполняться очень долго в зависимости от размеры базы данных." +#: ../../Zotlabs/Module/Z6trans.php:23 +msgid "php util/z6convert.php" +msgstr "" + +#: ../../Zotlabs/Module/Z6trans.php:25 +msgid "from the terminal." +msgstr "из терминала." #: ../../Zotlabs/Module/Attach.php:13 msgid "Item not available." @@ -7682,16 +7696,6 @@ msgstr "Этот канал будет полностью удалён из се msgid "This action is permanent and can not be undone!" 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/Menu.php:68 msgid "Unable to update menu." msgstr "Невозможно обновить меню." @@ -8780,423 +8784,433 @@ msgstr "Установить новый репозиторий расширен msgid "Switch branch" msgstr "Переключить ветку" -#: ../../Zotlabs/Module/Admin/Site.php:159 +#: ../../Zotlabs/Module/Admin/Site.php:165 msgid "Site settings updated." msgstr "Настройки сайта обновлены." -#: ../../Zotlabs/Module/Admin/Site.php:203 +#: ../../Zotlabs/Module/Admin/Site.php:209 msgid "mobile" msgstr "мобильный" -#: ../../Zotlabs/Module/Admin/Site.php:205 +#: ../../Zotlabs/Module/Admin/Site.php:211 msgid "experimental" msgstr "экспериментальный" -#: ../../Zotlabs/Module/Admin/Site.php:207 +#: ../../Zotlabs/Module/Admin/Site.php:213 msgid "unsupported" msgstr "неподдерживаемый" -#: ../../Zotlabs/Module/Admin/Site.php:254 +#: ../../Zotlabs/Module/Admin/Site.php:260 msgid "Yes - with approval" msgstr "Да - требует подтверждения" -#: ../../Zotlabs/Module/Admin/Site.php:260 +#: ../../Zotlabs/Module/Admin/Site.php:266 msgid "My site is not a public server" msgstr "Мой сайт не является публичным сервером" -#: ../../Zotlabs/Module/Admin/Site.php:261 +#: ../../Zotlabs/Module/Admin/Site.php:267 msgid "My site has paid access only" msgstr "Мой сайт доступен только с оплатой " -#: ../../Zotlabs/Module/Admin/Site.php:262 +#: ../../Zotlabs/Module/Admin/Site.php:268 msgid "My site has free access only" msgstr "На моём сайте разрешён свободный доступ" -#: ../../Zotlabs/Module/Admin/Site.php:263 +#: ../../Zotlabs/Module/Admin/Site.php:269 msgid "My site offers free accounts with optional paid upgrades" msgstr "На моём сайте разрешены бесплатные аккаунты с дополнительными платными услугами" -#: ../../Zotlabs/Module/Admin/Site.php:277 +#: ../../Zotlabs/Module/Admin/Site.php:283 msgid "Default permission role for new accounts" msgstr "Разрешения по умолчанию для новых аккаунтов" -#: ../../Zotlabs/Module/Admin/Site.php:277 +#: ../../Zotlabs/Module/Admin/Site.php:283 msgid "" "This role will be used for the first channel created after registration." msgstr "Эта роль будет использоваться для первого канала, созданного после регистрации." -#: ../../Zotlabs/Module/Admin/Site.php:286 ../../Zotlabs/Widget/Admin.php:22 +#: ../../Zotlabs/Module/Admin/Site.php:292 ../../Zotlabs/Widget/Admin.php:22 msgid "Site" msgstr "Сайт" -#: ../../Zotlabs/Module/Admin/Site.php:289 +#: ../../Zotlabs/Module/Admin/Site.php:295 msgid "File upload" msgstr "Загрузка файла" -#: ../../Zotlabs/Module/Admin/Site.php:290 +#: ../../Zotlabs/Module/Admin/Site.php:296 msgid "Policies" msgstr "Правила" -#: ../../Zotlabs/Module/Admin/Site.php:295 +#: ../../Zotlabs/Module/Admin/Site.php:301 #: ../../extend/addon/hzaddons/statusnet/statusnet.php:593 msgid "Site name" msgstr "Название сайта" -#: ../../Zotlabs/Module/Admin/Site.php:297 +#: ../../Zotlabs/Module/Admin/Site.php:303 msgid "Banner/Logo" msgstr "Баннер / логотип" -#: ../../Zotlabs/Module/Admin/Site.php:297 +#: ../../Zotlabs/Module/Admin/Site.php:303 msgid "Unfiltered HTML/CSS/JS is allowed" msgstr "Разрешён нефильтруемый HTML/CSS/JS" -#: ../../Zotlabs/Module/Admin/Site.php:298 +#: ../../Zotlabs/Module/Admin/Site.php:304 msgid "Administrator Information" msgstr "Информация об администраторе" -#: ../../Zotlabs/Module/Admin/Site.php:298 +#: ../../Zotlabs/Module/Admin/Site.php:304 msgid "" "Contact information for site administrators. Displayed on siteinfo page. " "BBCode can be used here" msgstr "Контактная информация для администраторов сайта. Показывается на информационной странице сайта. Можно использовать BBCode." -#: ../../Zotlabs/Module/Admin/Site.php:299 ../../Zotlabs/Module/Siteinfo.php:24 +#: ../../Zotlabs/Module/Admin/Site.php:305 ../../Zotlabs/Module/Siteinfo.php:24 msgid "Site Information" msgstr "Информация о сайте" -#: ../../Zotlabs/Module/Admin/Site.php:299 +#: ../../Zotlabs/Module/Admin/Site.php:305 msgid "" "Publicly visible description of this site. Displayed on siteinfo page. " "BBCode can be used here" msgstr "Публичное видимое описание сайта. Показывается на информационной странице сайта. Можно использовать BBCode." -#: ../../Zotlabs/Module/Admin/Site.php:300 +#: ../../Zotlabs/Module/Admin/Site.php:306 msgid "System language" msgstr "Язык системы" -#: ../../Zotlabs/Module/Admin/Site.php:301 +#: ../../Zotlabs/Module/Admin/Site.php:307 msgid "System theme" msgstr "Системная тема" -#: ../../Zotlabs/Module/Admin/Site.php:301 +#: ../../Zotlabs/Module/Admin/Site.php:307 msgid "" "Default system theme - may be over-ridden by user profiles - <a href='#' " "id='cnftheme'>change theme settings</a>" msgstr "Системная тема по умолчанию - может быть изменена в профиле пользователя - <a href='#' id='cnftheme'>изменить параметры темы</a>." -#: ../../Zotlabs/Module/Admin/Site.php:304 +#: ../../Zotlabs/Module/Admin/Site.php:310 msgid "Allow Feeds as Connections" msgstr "Разрешить ленты новостей как контакты" -#: ../../Zotlabs/Module/Admin/Site.php:304 +#: ../../Zotlabs/Module/Admin/Site.php:310 msgid "(Heavy system resource usage)" msgstr "(Высокое использование системных ресурсов)" -#: ../../Zotlabs/Module/Admin/Site.php:305 +#: ../../Zotlabs/Module/Admin/Site.php:311 msgid "Maximum image size" msgstr "Максимальный размер изображения" -#: ../../Zotlabs/Module/Admin/Site.php:305 +#: ../../Zotlabs/Module/Admin/Site.php:311 msgid "" "Maximum size in bytes of uploaded images. Default is 0, which means no " "limits." msgstr "Максимальный размер загруженных изображений в байтах. По умолчанию 0 или без ограничений." -#: ../../Zotlabs/Module/Admin/Site.php:306 +#: ../../Zotlabs/Module/Admin/Site.php:312 msgid "Does this site allow new member registration?" msgstr "Разрешается ли регистрация новых пользователей на этом сайте?" -#: ../../Zotlabs/Module/Admin/Site.php:307 +#: ../../Zotlabs/Module/Admin/Site.php:313 msgid "Invitation only" msgstr "Только по приглашениям" -#: ../../Zotlabs/Module/Admin/Site.php:307 +#: ../../Zotlabs/Module/Admin/Site.php:313 msgid "" "Only allow new member registrations with an invitation code. Above register " "policy must be set to Yes." msgstr "Регистрация пользователей разрешается только по приглашениям. Вышеуказанная политика регистрация должны быть установлена в \"Да\"." -#: ../../Zotlabs/Module/Admin/Site.php:308 +#: ../../Zotlabs/Module/Admin/Site.php:314 msgid "Minimum age" msgstr "Минимальный возраст" -#: ../../Zotlabs/Module/Admin/Site.php:308 +#: ../../Zotlabs/Module/Admin/Site.php:314 msgid "Minimum age (in years) for who may register on this site." msgstr "Минимальный возраст (в годах) для регистрации на этом сайте." -#: ../../Zotlabs/Module/Admin/Site.php:309 +#: ../../Zotlabs/Module/Admin/Site.php:315 msgid "Which best describes the types of account offered by this hub?" msgstr "Как лучше описать тип учётных записей предлагаемых на этом хабе?" -#: ../../Zotlabs/Module/Admin/Site.php:309 +#: ../../Zotlabs/Module/Admin/Site.php:315 msgid "This is displayed on the public server site list." msgstr "Это отображается в списке общедоступных серверов." -#: ../../Zotlabs/Module/Admin/Site.php:310 +#: ../../Zotlabs/Module/Admin/Site.php:316 msgid "Register text" msgstr "Текст регистрации" -#: ../../Zotlabs/Module/Admin/Site.php:310 +#: ../../Zotlabs/Module/Admin/Site.php:316 msgid "Will be displayed prominently on the registration page." msgstr "Будет отображаться на странице регистрации на видном месте." -#: ../../Zotlabs/Module/Admin/Site.php:312 +#: ../../Zotlabs/Module/Admin/Site.php:318 msgid "Site homepage to show visitors (default: login box)" msgstr "Домашняя страница, которая будет показываться посетителям сайт (по умочанию - форма входа)." -#: ../../Zotlabs/Module/Admin/Site.php:312 +#: ../../Zotlabs/Module/Admin/Site.php:318 msgid "" "example: 'pubstream' to show public stream, 'page/sys/home' to show a system " "webpage called 'home' or 'include:home.html' to include a file." msgstr "например: 'pubstream' для показа публичного потока, 'page/sys/home' для показа системной домашней веб-страницы или 'include:home.html' для включения файла." -#: ../../Zotlabs/Module/Admin/Site.php:313 +#: ../../Zotlabs/Module/Admin/Site.php:319 msgid "Preserve site homepage URL" msgstr "Сохранить URL главной страницы сайта" -#: ../../Zotlabs/Module/Admin/Site.php:313 +#: ../../Zotlabs/Module/Admin/Site.php:319 msgid "" "Present the site homepage in a frame at the original location instead of " "redirecting" msgstr "Показывать домашнюю страницу сайта во фрейме вместо стандартной переадресации" -#: ../../Zotlabs/Module/Admin/Site.php:314 +#: ../../Zotlabs/Module/Admin/Site.php:320 msgid "Accounts abandoned after x days" msgstr "Аккаунты считаются заброшенными после N дней" -#: ../../Zotlabs/Module/Admin/Site.php:314 +#: ../../Zotlabs/Module/Admin/Site.php:320 msgid "" "Will not waste system resources polling external sites for abandonded " "accounts. Enter 0 for no time limit." msgstr "Системные ресурсы не будут расходоваться для опроса внешних сайтов для заброшенных аккаунтов. Введите 0 для отсутствия ограничений." -#: ../../Zotlabs/Module/Admin/Site.php:315 +#: ../../Zotlabs/Module/Admin/Site.php:321 msgid "Allowed friend domains" msgstr "Разрешенные домены друзей" -#: ../../Zotlabs/Module/Admin/Site.php:315 +#: ../../Zotlabs/Module/Admin/Site.php:321 msgid "" "Comma separated list of domains which are allowed to establish friendships " "with this site. Wildcards are accepted. Empty to allow any domains" msgstr "Список разделённых запятыми доменов с которыми разрешено устанавливать дружеские отношения на этом сайте. Wildcards разрешены. Пусто означает разрешены любые домены." -#: ../../Zotlabs/Module/Admin/Site.php:316 +#: ../../Zotlabs/Module/Admin/Site.php:322 msgid "Verify Email Addresses" msgstr "Проверка адреса электронной почты" -#: ../../Zotlabs/Module/Admin/Site.php:316 +#: ../../Zotlabs/Module/Admin/Site.php:322 msgid "" "Check to verify email addresses used in account registration (recommended)." msgstr "Включите для проверки адреса электронной почты использованного при регистрации (рекомендуется)." -#: ../../Zotlabs/Module/Admin/Site.php:317 +#: ../../Zotlabs/Module/Admin/Site.php:323 msgid "Force publish" msgstr "Принудительно публиковать" -#: ../../Zotlabs/Module/Admin/Site.php:317 +#: ../../Zotlabs/Module/Admin/Site.php:323 msgid "" "Check to force all profiles on this site to be listed in the site directory." msgstr "Включите для принудительного включения всех учётных записей на данном сайте в каталог." -#: ../../Zotlabs/Module/Admin/Site.php:318 +#: ../../Zotlabs/Module/Admin/Site.php:324 msgid "Import Public Streams" msgstr "Импортированные публичные потоки" -#: ../../Zotlabs/Module/Admin/Site.php:318 +#: ../../Zotlabs/Module/Admin/Site.php:324 msgid "" "Import and allow access to public content pulled from other sites. Warning: " "this content is unmoderated." msgstr "Импортировать и разрешить публичный доступ к загружаемым с других сайтов потоков. Внимание - этот контент не может модерироваться." -#: ../../Zotlabs/Module/Admin/Site.php:319 +#: ../../Zotlabs/Module/Admin/Site.php:325 msgid "Site only Public Streams" msgstr "Публичные потоки только с сайта" -#: ../../Zotlabs/Module/Admin/Site.php:319 +#: ../../Zotlabs/Module/Admin/Site.php:325 msgid "" "Allow access to public content originating only from this site if Imported " "Public Streams are disabled." msgstr "Разрешить доступ к общедоступному контенту, исходящему только с этого сайта, если импортированные публичные потоки отключены." -#: ../../Zotlabs/Module/Admin/Site.php:320 +#: ../../Zotlabs/Module/Admin/Site.php:326 msgid "Allow anybody on the internet to access the Public streams" msgstr "Разрешить всем доступ к публичным потокам" -#: ../../Zotlabs/Module/Admin/Site.php:320 +#: ../../Zotlabs/Module/Admin/Site.php:326 msgid "" "Disable to require authentication before viewing. Warning: this content is " "unmoderated." msgstr "Отключите если для просмотра требуется аутентификация. Внимание - этот контент не может модерироваться." -#: ../../Zotlabs/Module/Admin/Site.php:321 +#: ../../Zotlabs/Module/Admin/Site.php:327 msgid "Only import Public stream posts with this text" msgstr "Импортировать только публичные потоки с этим текстом" -#: ../../Zotlabs/Module/Admin/Site.php:321 -#: ../../Zotlabs/Module/Admin/Site.php:322 -#: ../../Zotlabs/Module/Connedit.php:893 ../../Zotlabs/Module/Connedit.php:894 +#: ../../Zotlabs/Module/Admin/Site.php:327 +#: ../../Zotlabs/Module/Admin/Site.php:328 +#: ../../Zotlabs/Module/Connedit.php:884 ../../Zotlabs/Module/Connedit.php:885 msgid "" "words one per line or #tags or /patterns/ or lang=xx, leave blank to import " "all posts" msgstr "слова по одному в строку, #тег, /шаблон/ или lang=xxl; оставьте пустым для импорта всех публикаций" -#: ../../Zotlabs/Module/Admin/Site.php:322 +#: ../../Zotlabs/Module/Admin/Site.php:328 msgid "Do not import Public stream posts with this text" msgstr "Не импортировать публичные потоки с этим текстом" -#: ../../Zotlabs/Module/Admin/Site.php:325 +#: ../../Zotlabs/Module/Admin/Site.php:331 msgid "Login on Homepage" msgstr "Вход на домашней странице" -#: ../../Zotlabs/Module/Admin/Site.php:325 +#: ../../Zotlabs/Module/Admin/Site.php:331 msgid "" "Present a login box to visitors on the home page if no other content has " "been configured." msgstr "Предоставлять форму входа для посетителей на домашней странице если другого содержимого не настроено." -#: ../../Zotlabs/Module/Admin/Site.php:326 +#: ../../Zotlabs/Module/Admin/Site.php:332 msgid "Enable context help" msgstr "Включить контекстную помощь" -#: ../../Zotlabs/Module/Admin/Site.php:326 +#: ../../Zotlabs/Module/Admin/Site.php:332 msgid "" "Display contextual help for the current page when the help button is pressed." msgstr "Показывать контекстную помощь для текущей странице при нажатии на кнопку \"Помощь\"." -#: ../../Zotlabs/Module/Admin/Site.php:328 +#: ../../Zotlabs/Module/Admin/Site.php:334 msgid "Reply-to email address for system generated email." msgstr "Адрес email Reply-to для генерируемых системой сообщений." -#: ../../Zotlabs/Module/Admin/Site.php:329 +#: ../../Zotlabs/Module/Admin/Site.php:335 msgid "Sender (From) email address for system generated email." msgstr "Адрес email отправителя (From) для генерируемых системой сообщений." -#: ../../Zotlabs/Module/Admin/Site.php:330 +#: ../../Zotlabs/Module/Admin/Site.php:336 msgid "Name of email sender for system generated email." msgstr "Имя отправителя для генерируемых системой сообщений." -#: ../../Zotlabs/Module/Admin/Site.php:332 +#: ../../Zotlabs/Module/Admin/Site.php:338 msgid "Directory Server URL" msgstr "URL сервера каталогов" -#: ../../Zotlabs/Module/Admin/Site.php:332 +#: ../../Zotlabs/Module/Admin/Site.php:338 msgid "Default directory server" msgstr "Сервер каталогов по умолчанию" -#: ../../Zotlabs/Module/Admin/Site.php:334 +#: ../../Zotlabs/Module/Admin/Site.php:340 +msgid "Enable SSE Notifications" +msgstr "Включить уведомления SSE" + +#: ../../Zotlabs/Module/Admin/Site.php:340 +msgid "" +"If disabled, traditional polling will be used. Warning: this setting might " +"not be suited for shared hosting" +msgstr "Если выключено будет использоваться традиционный периодический опрос. Предупреждение: этот режим не подходит для виртуального (shared) хостинга" + +#: ../../Zotlabs/Module/Admin/Site.php:342 msgid "Proxy user" msgstr "Имя пользователя proxy-сервера" -#: ../../Zotlabs/Module/Admin/Site.php:335 +#: ../../Zotlabs/Module/Admin/Site.php:343 msgid "Proxy URL" msgstr "URL proxy-сервера" -#: ../../Zotlabs/Module/Admin/Site.php:336 +#: ../../Zotlabs/Module/Admin/Site.php:344 msgid "Network timeout" msgstr "Время ожидания сети" -#: ../../Zotlabs/Module/Admin/Site.php:336 +#: ../../Zotlabs/Module/Admin/Site.php:344 msgid "Value is in seconds. Set to 0 for unlimited (not recommended)." msgstr "Значение в секундах. Если установлен в 0 - без ограничений (не рекомендуется)." -#: ../../Zotlabs/Module/Admin/Site.php:337 +#: ../../Zotlabs/Module/Admin/Site.php:345 msgid "Delivery interval" msgstr "Интервал доставки" -#: ../../Zotlabs/Module/Admin/Site.php:337 +#: ../../Zotlabs/Module/Admin/Site.php:345 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 "Значение задержки фоновых процессов доставки в секундах для снижения нагрузки на систему. Рекомендуется 4-5 для серверов совместного использования, 2-3 для частных виртуальных и 0-1 для выделенных серверов." -#: ../../Zotlabs/Module/Admin/Site.php:338 +#: ../../Zotlabs/Module/Admin/Site.php:346 msgid "Deliveries per process" msgstr "Доставок на процесс" -#: ../../Zotlabs/Module/Admin/Site.php:338 +#: ../../Zotlabs/Module/Admin/Site.php:346 msgid "" "Number of deliveries to attempt in a single operating system process. Adjust " "if necessary to tune system performance. Recommend: 1-5." msgstr "Количество доставок для одного процесса. Настройте в соответствии с производительностью системы. Рекомендуется 1-5." -#: ../../Zotlabs/Module/Admin/Site.php:339 +#: ../../Zotlabs/Module/Admin/Site.php:347 msgid "Queue Threshold" msgstr "Порог очереди" -#: ../../Zotlabs/Module/Admin/Site.php:339 +#: ../../Zotlabs/Module/Admin/Site.php:347 msgid "" "Always defer immediate delivery if queue contains more than this number of " "entries." msgstr "Всегда откладывать немедленную доставку, если в очереди содержится большее количество записей, чем это." -#: ../../Zotlabs/Module/Admin/Site.php:340 +#: ../../Zotlabs/Module/Admin/Site.php:348 msgid "Poll interval" msgstr "Интервал опроса" -#: ../../Zotlabs/Module/Admin/Site.php:340 +#: ../../Zotlabs/Module/Admin/Site.php:348 msgid "" "Delay background polling processes by this many seconds to reduce system " "load. If 0, use delivery interval." msgstr "Задержка фоновых процессов опроса на указанное количество секунд для снижения нагрузки на систему. Если 0 - использовать интервал доставки." -#: ../../Zotlabs/Module/Admin/Site.php:341 +#: ../../Zotlabs/Module/Admin/Site.php:349 msgid "Path to ImageMagick convert program" msgstr "Путь к ImageMagick" -#: ../../Zotlabs/Module/Admin/Site.php:341 +#: ../../Zotlabs/Module/Admin/Site.php:349 msgid "" "If set, use this program to generate photo thumbnails for huge images ( > " "4000 pixels in either dimension), otherwise memory exhaustion may occur. " "Example: /usr/bin/convert" msgstr "При установке эта программа генерирует миниатюры изображений для больших файлов (свыше 4000 в любом измерении) для предотвращения утечки памяти. Пример: /usr/bin/convert" -#: ../../Zotlabs/Module/Admin/Site.php:342 +#: ../../Zotlabs/Module/Admin/Site.php:350 msgid "Maximum Load Average" msgstr "Максимальная средняя нагрузка" -#: ../../Zotlabs/Module/Admin/Site.php:342 +#: ../../Zotlabs/Module/Admin/Site.php:350 msgid "" "Maximum system load before delivery and poll processes are deferred - " "default 50." msgstr "Максимальная нагрузка системы для откладывания процессов опроса и доставки - по умолчанию 50." -#: ../../Zotlabs/Module/Admin/Site.php:343 +#: ../../Zotlabs/Module/Admin/Site.php:351 msgid "Expiration period in days for imported (grid/network) content" msgstr "Срок хранения в днях для импортированного содержимого (из матрицы / сети)." -#: ../../Zotlabs/Module/Admin/Site.php:343 +#: ../../Zotlabs/Module/Admin/Site.php:351 msgid "0 for no expiration of imported content" msgstr "0 для постоянного хранения импортированного содержимого" -#: ../../Zotlabs/Module/Admin/Site.php:344 +#: ../../Zotlabs/Module/Admin/Site.php:352 msgid "" "Do not expire any posts which have comments less than this many days ago" msgstr "Продлевать строк хранения для любых публикаций, которые имеют комментарии возрастом менее этого значения" -#: ../../Zotlabs/Module/Admin/Site.php:346 +#: ../../Zotlabs/Module/Admin/Site.php:354 msgid "" "Public servers: Optional landing (marketing) webpage for new registrants" msgstr "Публичные серверы: необязательная маркетинговая лэндинг-страница для новых пользователей" -#: ../../Zotlabs/Module/Admin/Site.php:346 +#: ../../Zotlabs/Module/Admin/Site.php:354 #, php-format msgid "Create this page first. Default is %s/register" msgstr "Создать эту страницу первой. По умолчанию %s/register" -#: ../../Zotlabs/Module/Admin/Site.php:347 +#: ../../Zotlabs/Module/Admin/Site.php:355 msgid "Page to display after creating a new channel" msgstr "Страница для показа после создания нового канала" -#: ../../Zotlabs/Module/Admin/Site.php:347 +#: ../../Zotlabs/Module/Admin/Site.php:355 msgid "Default: profiles" msgstr "По умолчанию: profiles" -#: ../../Zotlabs/Module/Admin/Site.php:349 +#: ../../Zotlabs/Module/Admin/Site.php:357 msgid "Optional: site location" msgstr "Необязательно: место размещения сайта" -#: ../../Zotlabs/Module/Admin/Site.php:349 +#: ../../Zotlabs/Module/Admin/Site.php:357 msgid "Region or country" msgstr "Регион или страна" @@ -9371,12 +9385,12 @@ msgid "No registrations." msgstr "Нет новых регистраций." #: ../../Zotlabs/Module/Admin/Accounts.php:176 -#: ../../Zotlabs/Module/Connedit.php:637 +#: ../../Zotlabs/Module/Connedit.php:628 msgid "Block" msgstr "Блокировать" #: ../../Zotlabs/Module/Admin/Accounts.php:177 -#: ../../Zotlabs/Module/Connedit.php:637 +#: ../../Zotlabs/Module/Connedit.php:628 msgid "Unblock" msgstr "Разблокировать" @@ -9564,7 +9578,7 @@ msgstr "Пароль" msgid "Expires (yyyy-mm-dd)" msgstr "Срок действия (yyyy-mm-dd)" -#: ../../Zotlabs/Module/Tokens.php:180 ../../Zotlabs/Module/Connedit.php:908 +#: ../../Zotlabs/Module/Tokens.php:180 ../../Zotlabs/Module/Connedit.php:899 msgid "Their Settings" msgstr "Их настройки" @@ -9808,268 +9822,268 @@ msgstr "Контакт добавлен." msgid "Item is not editable" msgstr "Элемент нельзя редактировать" -#: ../../Zotlabs/Module/Connedit.php:113 +#: ../../Zotlabs/Module/Connedit.php:120 msgid "Could not locate selected profile." msgstr "Не удалось обнаружить выбранный профиль." -#: ../../Zotlabs/Module/Connedit.php:257 +#: ../../Zotlabs/Module/Connedit.php:264 msgid "Connection updated." msgstr "Контакты обновлены." -#: ../../Zotlabs/Module/Connedit.php:259 +#: ../../Zotlabs/Module/Connedit.php:266 msgid "Failed to update connection record." msgstr "Не удалось обновить запись контакта." -#: ../../Zotlabs/Module/Connedit.php:313 +#: ../../Zotlabs/Module/Connedit.php:309 msgid "is now connected to" msgstr "теперь подключён к" -#: ../../Zotlabs/Module/Connedit.php:438 +#: ../../Zotlabs/Module/Connedit.php:434 msgid "Could not access address book record." msgstr "Не удалось получить доступ к записи адресной книги." -#: ../../Zotlabs/Module/Connedit.php:486 ../../Zotlabs/Module/Connedit.php:490 +#: ../../Zotlabs/Module/Connedit.php:482 ../../Zotlabs/Module/Connedit.php:486 msgid "Refresh failed - channel is currently unavailable." msgstr "Обновление невозможно - в настоящее время канал недоступен." -#: ../../Zotlabs/Module/Connedit.php:505 ../../Zotlabs/Module/Connedit.php:514 -#: ../../Zotlabs/Module/Connedit.php:523 ../../Zotlabs/Module/Connedit.php:532 -#: ../../Zotlabs/Module/Connedit.php:545 +#: ../../Zotlabs/Module/Connedit.php:501 ../../Zotlabs/Module/Connedit.php:510 +#: ../../Zotlabs/Module/Connedit.php:519 ../../Zotlabs/Module/Connedit.php:528 +#: ../../Zotlabs/Module/Connedit.php:541 msgid "Unable to set address book parameters." msgstr "Не удалось получить доступ к параметрам адресной книги." -#: ../../Zotlabs/Module/Connedit.php:569 +#: ../../Zotlabs/Module/Connedit.php:560 msgid "Connection has been removed." msgstr "Контакт был удалён." -#: ../../Zotlabs/Module/Connedit.php:612 +#: ../../Zotlabs/Module/Connedit.php:603 #, php-format msgid "View %s's profile" msgstr "Просмотр %s профиля" -#: ../../Zotlabs/Module/Connedit.php:616 +#: ../../Zotlabs/Module/Connedit.php:607 msgid "Refresh Permissions" msgstr "Обновить разрешения" -#: ../../Zotlabs/Module/Connedit.php:619 +#: ../../Zotlabs/Module/Connedit.php:610 msgid "Fetch updated permissions" msgstr "Получить обновлённые разрешения" -#: ../../Zotlabs/Module/Connedit.php:623 +#: ../../Zotlabs/Module/Connedit.php:614 msgid "Refresh Photo" msgstr "Обновить фотографию" -#: ../../Zotlabs/Module/Connedit.php:626 +#: ../../Zotlabs/Module/Connedit.php:617 msgid "Fetch updated photo" msgstr "Получить обновлённую фотографию" -#: ../../Zotlabs/Module/Connedit.php:633 +#: ../../Zotlabs/Module/Connedit.php:624 msgid "View recent posts and comments" msgstr "Просмотреть последние публикации и комментарии" -#: ../../Zotlabs/Module/Connedit.php:640 +#: ../../Zotlabs/Module/Connedit.php:631 msgid "Block (or Unblock) all communications with this connection" msgstr "Блокировать (или разблокировать) связи с этим контактом" -#: ../../Zotlabs/Module/Connedit.php:641 +#: ../../Zotlabs/Module/Connedit.php:632 msgid "This connection is blocked!" msgstr "Этот контакт заблокирован!" -#: ../../Zotlabs/Module/Connedit.php:645 +#: ../../Zotlabs/Module/Connedit.php:636 msgid "Unignore" msgstr "Не игнорировать" -#: ../../Zotlabs/Module/Connedit.php:645 +#: ../../Zotlabs/Module/Connedit.php:636 #: ../../Zotlabs/Module/Connections.php:344 msgid "Ignore" msgstr "Игнорировать" -#: ../../Zotlabs/Module/Connedit.php:648 +#: ../../Zotlabs/Module/Connedit.php:639 msgid "Ignore (or Unignore) all inbound communications from this connection" msgstr "Игнорировать (или не игнорировать) все связи для этого контакта" -#: ../../Zotlabs/Module/Connedit.php:649 +#: ../../Zotlabs/Module/Connedit.php:640 msgid "This connection is ignored!" msgstr "Этот контакт игнорируется!" -#: ../../Zotlabs/Module/Connedit.php:653 +#: ../../Zotlabs/Module/Connedit.php:644 msgid "Unarchive" msgstr "Разархивировать" -#: ../../Zotlabs/Module/Connedit.php:653 +#: ../../Zotlabs/Module/Connedit.php:644 msgid "Archive" msgstr "Заархивировать" -#: ../../Zotlabs/Module/Connedit.php:656 +#: ../../Zotlabs/Module/Connedit.php:647 msgid "" "Archive (or Unarchive) this connection - mark channel dead but keep content" msgstr "Заархивировать (или разархивировать) этот контакт - пометить канал отключённым но сохранить содержимое" -#: ../../Zotlabs/Module/Connedit.php:657 +#: ../../Zotlabs/Module/Connedit.php:648 msgid "This connection is archived!" msgstr "Этот контакт заархивирован!" -#: ../../Zotlabs/Module/Connedit.php:661 +#: ../../Zotlabs/Module/Connedit.php:652 msgid "Unhide" msgstr "Показать" -#: ../../Zotlabs/Module/Connedit.php:661 +#: ../../Zotlabs/Module/Connedit.php:652 msgid "Hide" msgstr "Скрыть" -#: ../../Zotlabs/Module/Connedit.php:664 +#: ../../Zotlabs/Module/Connedit.php:655 msgid "Hide or Unhide this connection from your other connections" msgstr "Скрыть или показать этот контакт от / для остальных" -#: ../../Zotlabs/Module/Connedit.php:665 +#: ../../Zotlabs/Module/Connedit.php:656 msgid "This connection is hidden!" msgstr "Этот контакт скрыт!" -#: ../../Zotlabs/Module/Connedit.php:672 +#: ../../Zotlabs/Module/Connedit.php:663 msgid "Delete this connection" msgstr "Удалить этот контакт" -#: ../../Zotlabs/Module/Connedit.php:680 +#: ../../Zotlabs/Module/Connedit.php:671 msgid "Fetch Vcard" msgstr "Получить vCard" -#: ../../Zotlabs/Module/Connedit.php:683 +#: ../../Zotlabs/Module/Connedit.php:674 msgid "Fetch electronic calling card for this connection" msgstr "Получить электронную телефонную карточку для этого контакта" -#: ../../Zotlabs/Module/Connedit.php:694 +#: ../../Zotlabs/Module/Connedit.php:685 msgid "Open Individual Permissions section by default" msgstr "Открывать раздел \"Индивидуальные разрешения\" по умолчанию" -#: ../../Zotlabs/Module/Connedit.php:717 +#: ../../Zotlabs/Module/Connedit.php:708 msgid "Affinity" msgstr "Сходство" -#: ../../Zotlabs/Module/Connedit.php:720 +#: ../../Zotlabs/Module/Connedit.php:711 msgid "Open Set Affinity section by default" msgstr "Открыть секцию установления сходства по умолчанию" -#: ../../Zotlabs/Module/Connedit.php:724 ../../Zotlabs/Widget/Affinity.php:30 +#: ../../Zotlabs/Module/Connedit.php:715 ../../Zotlabs/Widget/Affinity.php:30 msgid "Me" msgstr "Я" -#: ../../Zotlabs/Module/Connedit.php:725 ../../Zotlabs/Widget/Affinity.php:31 +#: ../../Zotlabs/Module/Connedit.php:716 ../../Zotlabs/Widget/Affinity.php:31 msgid "Family" msgstr "Семья" -#: ../../Zotlabs/Module/Connedit.php:727 ../../Zotlabs/Widget/Affinity.php:33 +#: ../../Zotlabs/Module/Connedit.php:718 ../../Zotlabs/Widget/Affinity.php:33 msgid "Acquaintances" msgstr "Знакомые" -#: ../../Zotlabs/Module/Connedit.php:728 +#: ../../Zotlabs/Module/Connedit.php:719 #: ../../Zotlabs/Module/Connections.php:97 #: ../../Zotlabs/Module/Connections.php:111 #: ../../Zotlabs/Widget/Affinity.php:34 msgid "All" msgstr "Все" -#: ../../Zotlabs/Module/Connedit.php:757 +#: ../../Zotlabs/Module/Connedit.php:748 msgid "Filter" msgstr "Фильтр" -#: ../../Zotlabs/Module/Connedit.php:760 +#: ../../Zotlabs/Module/Connedit.php:751 msgid "Open Custom Filter section by default" msgstr "Открывать секцию \"Настраиваемый фильтр\" по умолчанию" -#: ../../Zotlabs/Module/Connedit.php:797 +#: ../../Zotlabs/Module/Connedit.php:788 msgid "Approve this connection" msgstr "Утвердить этот контакт" -#: ../../Zotlabs/Module/Connedit.php:797 +#: ../../Zotlabs/Module/Connedit.php:788 msgid "Accept connection to allow communication" msgstr "Принять контакт чтобы разрешить связь" -#: ../../Zotlabs/Module/Connedit.php:802 +#: ../../Zotlabs/Module/Connedit.php:793 msgid "Set Affinity" msgstr "Установить сходство" -#: ../../Zotlabs/Module/Connedit.php:805 +#: ../../Zotlabs/Module/Connedit.php:796 msgid "Set Profile" msgstr "Установить профиль" -#: ../../Zotlabs/Module/Connedit.php:808 +#: ../../Zotlabs/Module/Connedit.php:799 msgid "Set Affinity & Profile" msgstr "Установить сходство и профиль" -#: ../../Zotlabs/Module/Connedit.php:856 +#: ../../Zotlabs/Module/Connedit.php:847 msgid "This connection is unreachable from this location." msgstr "Этот контакт недоступен для данного местоположения" -#: ../../Zotlabs/Module/Connedit.php:857 +#: ../../Zotlabs/Module/Connedit.php:848 msgid "This connection may be unreachable from other channel locations." msgstr "Этот контакт может быть недоступен из других мест размещения канала" -#: ../../Zotlabs/Module/Connedit.php:859 +#: ../../Zotlabs/Module/Connedit.php:850 msgid "Location independence is not supported by their network." msgstr "Независимое местоположение не поддерживается их сетью." -#: ../../Zotlabs/Module/Connedit.php:865 +#: ../../Zotlabs/Module/Connedit.php:856 msgid "" "This connection is unreachable from this location. Location independence is " "not supported by their network." msgstr "Этот контакт недоступен из данного местоположения. Независимое местоположение не поддерживается их сетью." -#: ../../Zotlabs/Module/Connedit.php:869 +#: ../../Zotlabs/Module/Connedit.php:860 msgid "Connection requests will be approved without your interaction" msgstr "Запросы контактов будут одобрены без вашего участия" -#: ../../Zotlabs/Module/Connedit.php:878 +#: ../../Zotlabs/Module/Connedit.php:869 msgid "This connection's primary address is" msgstr "Главный адрес это контакта" -#: ../../Zotlabs/Module/Connedit.php:879 +#: ../../Zotlabs/Module/Connedit.php:870 msgid "Available locations:" msgstr "Доступные расположения:" -#: ../../Zotlabs/Module/Connedit.php:885 +#: ../../Zotlabs/Module/Connedit.php:876 msgid "Connection Tools" msgstr "Инструменты контактов" -#: ../../Zotlabs/Module/Connedit.php:887 +#: ../../Zotlabs/Module/Connedit.php:878 msgid "Slide to adjust your degree of friendship" msgstr "Прокрутить для настройки степени дружбы" -#: ../../Zotlabs/Module/Connedit.php:889 +#: ../../Zotlabs/Module/Connedit.php:880 msgid "Slide to adjust your rating" msgstr "Прокрутить для настройки оценки" -#: ../../Zotlabs/Module/Connedit.php:890 ../../Zotlabs/Module/Connedit.php:895 +#: ../../Zotlabs/Module/Connedit.php:881 ../../Zotlabs/Module/Connedit.php:886 msgid "Optionally explain your rating" msgstr "Объясните свою оценку (не обязательно)" -#: ../../Zotlabs/Module/Connedit.php:892 +#: ../../Zotlabs/Module/Connedit.php:883 msgid "Custom Filter" msgstr "Настраиваемый фильтр" -#: ../../Zotlabs/Module/Connedit.php:893 +#: ../../Zotlabs/Module/Connedit.php:884 msgid "Only import posts with this text" msgstr "Импортировать публикации только с этим текстом" -#: ../../Zotlabs/Module/Connedit.php:894 +#: ../../Zotlabs/Module/Connedit.php:885 msgid "Do not import posts with this text" msgstr "Не импортировать публикации с этим текстом" -#: ../../Zotlabs/Module/Connedit.php:896 +#: ../../Zotlabs/Module/Connedit.php:887 msgid "This information is public!" msgstr "Эта информация общедоступна!" -#: ../../Zotlabs/Module/Connedit.php:901 +#: ../../Zotlabs/Module/Connedit.php:892 msgid "Connection Pending Approval" msgstr "Ожидающие подтверждения контактов" -#: ../../Zotlabs/Module/Connedit.php:906 +#: ../../Zotlabs/Module/Connedit.php:897 #, php-format msgid "" "Please choose the profile you would like to display to %s when viewing your " "profile securely." msgstr "Пожалуйста, выберите профиль который вы хотит показывать в %s при безопасном просмотре." -#: ../../Zotlabs/Module/Connedit.php:913 +#: ../../Zotlabs/Module/Connedit.php:904 msgid "" "Some permissions may be inherited from your channel's <a href=\"settings" "\"><strong>privacy settings</strong></a>, which have higher priority than " @@ -10077,11 +10091,11 @@ msgid "" "any impact unless the inherited setting changes." msgstr "Некоторые разрешения могут быть унаследованы из <a href=\"settings\"><strong>настроек приватности</strong></a> вашего канала, которые могут иметь более высокий приоритет чем индивидуальные. Вы можете изменить эти настройки, однако они не будут применены до изменения переданных по наследству настроек." -#: ../../Zotlabs/Module/Connedit.php:914 +#: ../../Zotlabs/Module/Connedit.php:905 msgid "Last update:" msgstr "Последнее обновление:" -#: ../../Zotlabs/Module/Connedit.php:922 +#: ../../Zotlabs/Module/Connedit.php:913 msgid "Details" msgstr "Сведения" @@ -10560,7 +10574,7 @@ msgid "Affinity Tool Settings" msgstr "Настройки степени сходства" #: ../../Zotlabs/Module/Wiki.php:35 -#: ../../extend/addon/hzaddons/cart/cart.php:1295 +#: ../../extend/addon/hzaddons/cart/cart.php:1410 #: ../../extend/addon/hzaddons/flashcards/Mod_Flashcards.php:51 msgid "Profile Unavailable." msgstr "Профиль недоступен." @@ -10574,7 +10588,7 @@ msgid "Provide a wiki for your channel" msgstr "Предоставьте Wiki для вашего канала" #: ../../Zotlabs/Module/Wiki.php:77 -#: ../../extend/addon/hzaddons/cart/cart.php:1441 +#: ../../extend/addon/hzaddons/cart/cart.php:1556 #: ../../extend/addon/hzaddons/cart/manual_payments.php:93 #: ../../extend/addon/hzaddons/cart/submodules/paypalbuttonV2.php:478 #: ../../extend/addon/hzaddons/cart/submodules/paypalbutton.php:456 @@ -10898,10 +10912,6 @@ msgid "" "only once and leave this page open until finished." msgstr "Процесс может занять несколько минут. Пожалуйста, отправьте форму только один раз и оставьте эту страницу открытой до завершения." -#: ../../Zotlabs/Module/Magic.php:78 -msgid "Hub not found." -msgstr "Узел не найден." - #: ../../Zotlabs/Module/Import_items.php:93 #, php-format msgid "Warning: Database versions differ by %1$d updates." @@ -10989,18 +10999,6 @@ msgid "" "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/Oexchange.php:27 msgid "Unable to find your hub." msgstr "Невозможно найти ваш сервер" @@ -11009,7 +11007,7 @@ msgstr "Невозможно найти ваш сервер" msgid "Post successful." msgstr "Успешно опубликовано." -#: ../../Zotlabs/Module/Rmagic.php:44 +#: ../../Zotlabs/Module/Rmagic.php:46 msgid "Authentication failed." msgstr "Ошибка аутентификации." @@ -11088,13 +11086,6 @@ msgstr "Ваш персональный поток (может быть пуст msgid "View the public stream. Warning: this content is not moderated" msgstr "Просмотр публичного потока. Предупреждение: этот контент не модерируется" -#: ../../Zotlabs/Widget/Forums.php:100 -#: ../../Zotlabs/Widget/Notifications.php:139 -#: ../../Zotlabs/Widget/Notifications.php:140 -#: ../../Zotlabs/Widget/Activity_filter.php:115 -msgid "Forums" -msgstr "Форумы" - #: ../../Zotlabs/Widget/Notes.php:21 ../../Zotlabs/Lib/Apps.php:370 #: ../../extend/addon/hzaddons/workflow/workflow.php:2625 msgid "Notes" @@ -11526,6 +11517,10 @@ msgstr "Параметры голосования" msgid "Pinned post" msgstr "Прикреплённая заметка" +#: ../../Zotlabs/Widget/Pinned.php:158 +msgid "Don't show" +msgstr "Не показывать" + #: ../../Zotlabs/Widget/Eventstools.php:13 msgid "Events Tools" msgstr "Инструменты для событий" @@ -11641,7 +11636,7 @@ msgstr "Показывать публикации которые я отмети #: ../../Zotlabs/Widget/Activity_filter.php:148 msgid "Personal Posts" -msgstr "Личные публикации" +msgstr "Свои публикации" #: ../../Zotlabs/Widget/Activity_filter.php:152 msgid "Show posts that mention or involve me" @@ -12190,6 +12185,10 @@ msgstr "отредактировал публикацию датированну msgid "edited a comment dated %s" msgstr "отредактировал комментарий датированный %s" +#: ../../Zotlabs/Lib/Enotify.php:970 +msgid "created an event" +msgstr "создано событие" + #: ../../Zotlabs/Lib/NativeWikiPage.php:42 #: ../../Zotlabs/Lib/NativeWikiPage.php:94 msgid "(No Title)" @@ -12591,36 +12590,36 @@ msgstr "Это настройка по умолчанию для тех, кто msgid "This is your default setting for the audience of your webpages" msgstr "Это настройка по умолчанию для аудитории ваших веб-страниц" -#: ../../Zotlabs/Lib/Connect.php:275 +#: ../../Zotlabs/Lib/Connect.php:271 msgid "error saving data" msgstr "ошибка сохранения данных" -#: ../../Zotlabs/Lib/Activity.php:2045 +#: ../../Zotlabs/Lib/Activity.php:2110 #, php-format msgid "Likes %1$s's %2$s" msgstr "Нравится %1$s %2$s" -#: ../../Zotlabs/Lib/Activity.php:2048 +#: ../../Zotlabs/Lib/Activity.php:2113 #, php-format msgid "Doesn't like %1$s's %2$s" msgstr "Не нравится %1$s %2$s" -#: ../../Zotlabs/Lib/Activity.php:2054 +#: ../../Zotlabs/Lib/Activity.php:2119 #, php-format msgid "Will attend %s's event" msgstr "Присоединится к мероприятию %s" -#: ../../Zotlabs/Lib/Activity.php:2057 +#: ../../Zotlabs/Lib/Activity.php:2122 #, php-format msgid "Will not attend %s's event" msgstr "Не присоединится к мероприятию %s" -#: ../../Zotlabs/Lib/Activity.php:2060 +#: ../../Zotlabs/Lib/Activity.php:2125 #, php-format msgid "May attend %s's event" msgstr "Возможно присоединится к мероприятию %s" -#: ../../Zotlabs/Lib/Activity.php:2063 +#: ../../Zotlabs/Lib/Activity.php:2128 #, php-format msgid "May not attend %s's event" msgstr "Возможно не присоединится к мероприятию %s" @@ -12851,83 +12850,83 @@ msgstr "Отображать все общедоступные публикац msgid "Pump.io Crosspost Connector" msgstr "Публикация в Pump.io" -#: ../../extend/addon/hzaddons/cart/cart.php:153 +#: ../../extend/addon/hzaddons/cart/cart.php:252 msgid "DB Cleanup Failure" msgstr "Сбой очистки базы данных" -#: ../../extend/addon/hzaddons/cart/cart.php:559 +#: ../../extend/addon/hzaddons/cart/cart.php:674 msgid "[cart] Item Added" msgstr "[cart] Элемент добавлен" -#: ../../extend/addon/hzaddons/cart/cart.php:948 +#: ../../extend/addon/hzaddons/cart/cart.php:1063 msgid "Order already checked out." msgstr "Заказ уже проверен." -#: ../../extend/addon/hzaddons/cart/cart.php:1253 +#: ../../extend/addon/hzaddons/cart/cart.php:1368 msgid "Drop database tables when uninstalling." msgstr "Сбросить таблицы базы данных при деинсталляции" -#: ../../extend/addon/hzaddons/cart/cart.php:1260 +#: ../../extend/addon/hzaddons/cart/cart.php:1375 #: ../../extend/addon/hzaddons/cart/Settings/Cart.php:129 msgid "Cart Settings" msgstr "Настройки карточек" -#: ../../extend/addon/hzaddons/cart/cart.php:1272 -#: ../../extend/addon/hzaddons/cart/cart.php:1275 +#: ../../extend/addon/hzaddons/cart/cart.php:1387 +#: ../../extend/addon/hzaddons/cart/cart.php:1390 msgid "Shop" msgstr "Магазин" -#: ../../extend/addon/hzaddons/cart/cart.php:1331 -#: ../../extend/addon/hzaddons/cart/myshop.php:111 +#: ../../extend/addon/hzaddons/cart/cart.php:1446 +#: ../../extend/addon/hzaddons/cart/myshop.php:112 msgid "Order Not Found" msgstr "Заказ не найден" -#: ../../extend/addon/hzaddons/cart/cart.php:1392 +#: ../../extend/addon/hzaddons/cart/cart.php:1507 msgid "Cart utilities for orders and payments" msgstr "Утилиты карточек для заказов и платежей" -#: ../../extend/addon/hzaddons/cart/cart.php:1430 +#: ../../extend/addon/hzaddons/cart/cart.php:1545 msgid "You must be logged into the Grid to shop." msgstr "Вы должны быть в сети для доступа к магазину" -#: ../../extend/addon/hzaddons/cart/cart.php:1463 +#: ../../extend/addon/hzaddons/cart/cart.php:1578 #: ../../extend/addon/hzaddons/cart/manual_payments.php:68 #: ../../extend/addon/hzaddons/cart/submodules/paypalbuttonV2.php:409 #: ../../extend/addon/hzaddons/cart/submodules/paypalbutton.php:392 msgid "Order not found." msgstr "Заказ не найден." -#: ../../extend/addon/hzaddons/cart/cart.php:1471 +#: ../../extend/addon/hzaddons/cart/cart.php:1592 msgid "Access denied." msgstr "Доступ запрещён." -#: ../../extend/addon/hzaddons/cart/cart.php:1523 -#: ../../extend/addon/hzaddons/cart/cart.php:1666 +#: ../../extend/addon/hzaddons/cart/cart.php:1644 +#: ../../extend/addon/hzaddons/cart/cart.php:1787 msgid "No Order Found" msgstr "Нет найденных заказов" -#: ../../extend/addon/hzaddons/cart/cart.php:1532 +#: ../../extend/addon/hzaddons/cart/cart.php:1653 msgid "An unknown error has occurred Please start again." msgstr "Произошла неизвестная ошибка. Пожалуйста, начните снова." -#: ../../extend/addon/hzaddons/cart/cart.php:1675 +#: ../../extend/addon/hzaddons/cart/cart.php:1796 msgid "Requirements not met." msgstr "Требования не соблюдены." -#: ../../extend/addon/hzaddons/cart/cart.php:1675 +#: ../../extend/addon/hzaddons/cart/cart.php:1796 msgid "Review your order and complete any needed requirements." -msgstr Просмотрите свой заказ и выполните все необходимые требования. +msgstr "росмотрите свой заказ и выполните все необходимые требования" -#: ../../extend/addon/hzaddons/cart/cart.php:1701 +#: ../../extend/addon/hzaddons/cart/cart.php:1822 msgid "Invalid Payment Type. Please start again." msgstr "Недействительный тип платежа. Пожалуйста, начните снова." -#: ../../extend/addon/hzaddons/cart/cart.php:1708 +#: ../../extend/addon/hzaddons/cart/cart.php:1829 msgid "Order not found" msgstr "Заказ не найден" #: ../../extend/addon/hzaddons/cart/widgets/catalogitem.php:57 -#: ../../extend/addon/hzaddons/cart/submodules/manualcat.php:267 +#: ../../extend/addon/hzaddons/cart/submodules/manualcat.php:263 #: ../../extend/addon/hzaddons/cart/submodules/hzservices.php:658 msgid "Price" msgstr "Цена" @@ -12960,27 +12959,27 @@ msgstr "Завершено" msgid "Enable Manual Cart Module" msgstr "Включить модуль ручного управления карточками" -#: ../../extend/addon/hzaddons/cart/submodules/manualcat.php:176 +#: ../../extend/addon/hzaddons/cart/submodules/manualcat.php:172 #: ../../extend/addon/hzaddons/cart/submodules/hzservices.php:162 msgid "New Sku" msgstr "Новый код" -#: ../../extend/addon/hzaddons/cart/submodules/manualcat.php:212 +#: ../../extend/addon/hzaddons/cart/submodules/manualcat.php:208 #: ../../extend/addon/hzaddons/cart/submodules/hzservices.php:197 msgid "Cannot save edits to locked item." msgstr "Невозможно сохранить изменения заблокированной позиции." -#: ../../extend/addon/hzaddons/cart/submodules/manualcat.php:256 +#: ../../extend/addon/hzaddons/cart/submodules/manualcat.php:252 #: ../../extend/addon/hzaddons/cart/submodules/hzservices.php:647 msgid "Changes Locked" msgstr "Изменения заблокированы" -#: ../../extend/addon/hzaddons/cart/submodules/manualcat.php:260 +#: ../../extend/addon/hzaddons/cart/submodules/manualcat.php:256 #: ../../extend/addon/hzaddons/cart/submodules/hzservices.php:651 msgid "Item available for purchase." msgstr "Позиция доступна для приобретения." -#: ../../extend/addon/hzaddons/cart/submodules/manualcat.php:270 +#: ../../extend/addon/hzaddons/cart/submodules/manualcat.php:266 #: ../../extend/addon/hzaddons/cart/submodules/hzservices.php:661 msgid "Photo URL" msgstr "URL изображения" @@ -13141,21 +13140,21 @@ msgstr "Инструкции" msgid "Access Denied." msgstr "Доступ запрещён." -#: ../../extend/addon/hzaddons/cart/myshop.php:141 -#: ../../extend/addon/hzaddons/cart/myshop.php:177 -#: ../../extend/addon/hzaddons/cart/myshop.php:211 -#: ../../extend/addon/hzaddons/cart/myshop.php:259 -#: ../../extend/addon/hzaddons/cart/myshop.php:294 -#: ../../extend/addon/hzaddons/cart/myshop.php:317 +#: ../../extend/addon/hzaddons/cart/myshop.php:144 +#: ../../extend/addon/hzaddons/cart/myshop.php:180 +#: ../../extend/addon/hzaddons/cart/myshop.php:214 +#: ../../extend/addon/hzaddons/cart/myshop.php:261 +#: ../../extend/addon/hzaddons/cart/myshop.php:296 +#: ../../extend/addon/hzaddons/cart/myshop.php:319 #: ../../extend/addon/hzaddons/channelreputation/channelreputation.php:101 #: ../../extend/addon/hzaddons/channelreputation/channelreputation.php:102 msgid "Access Denied" msgstr "Доступ запрещён" -#: ../../extend/addon/hzaddons/cart/myshop.php:186 -#: ../../extend/addon/hzaddons/cart/myshop.php:220 -#: ../../extend/addon/hzaddons/cart/myshop.php:269 -#: ../../extend/addon/hzaddons/cart/myshop.php:327 +#: ../../extend/addon/hzaddons/cart/myshop.php:189 +#: ../../extend/addon/hzaddons/cart/myshop.php:223 +#: ../../extend/addon/hzaddons/cart/myshop.php:271 +#: ../../extend/addon/hzaddons/cart/myshop.php:329 msgid "Invalid Item" msgstr "Недействительный элемент" @@ -14258,7 +14257,7 @@ msgstr "Отслеживаемые теги (через запятую, искл msgid "Diaspora Protocol" msgstr "Протокол Diaspora" -#: ../../extend/addon/hzaddons/diaspora/Receiver.php:1541 +#: ../../extend/addon/hzaddons/diaspora/Receiver.php:1545 #, php-format msgid "%1$s dislikes %2$s's %3$s" msgstr "%1$s не нравится %2$s's %3$s" diff --git a/view/ru/hstrings.php b/view/ru/hstrings.php index bd25017a1..9c312a89d 100644 --- a/view/ru/hstrings.php +++ b/view/ru/hstrings.php @@ -403,7 +403,6 @@ App::$strings["PHP"] = ""; App::$strings["Page content type"] = "Тип содержимого страницы"; App::$strings["photo"] = "фото"; App::$strings["event"] = "событие"; -App::$strings["status"] = "статус"; App::$strings["comment"] = "комментарий"; App::$strings["activity"] = "активность"; App::$strings["poll"] = "голосование"; @@ -707,7 +706,7 @@ App::$strings["%d years"] = array( App::$strings["timeago.prefixAgo"] = ""; App::$strings["timeago.prefixFromNow"] = "через"; App::$strings["timeago.suffixAgo"] = "назад"; -App::$strings["timeago.suffixFromNow"] = ""; +App::$strings["timeago.suffixFromNow"] = "NONE"; App::$strings["less than a minute"] = "менее чем одну минуту"; App::$strings["about a minute"] = "около минуты"; App::$strings["about an hour"] = "около часа"; @@ -803,13 +802,15 @@ App::$strings["__ctx:relative_date__ second"] = array( App::$strings["%1\$s's birthday"] = "День рождения %1\$s"; App::$strings["Happy Birthday %1\$s"] = "С Днем рождения %1\$s !"; App::$strings["Visible to your default audience"] = "Видно вашей аудитории по умолчанию."; -App::$strings["__ctx:acl__ Profile"] = "Профиль"; +App::$strings["Profile-Based Privacy Groups"] = "Группы конфиденциальности основанные на профиле"; +App::$strings["Forums"] = "Форумы"; +App::$strings["Private Forum"] = "Частный форум"; App::$strings["Only me"] = "Только мне"; -App::$strings["Who can see this?"] = "Кто может это видеть?"; +App::$strings["Share with"] = "Поделиться с"; App::$strings["Custom selection"] = "Настраиваемый выбор"; -App::$strings["Select \"Show\" to allow viewing. \"Don't show\" lets you override and limit the scope of \"Show\"."] = "Нажмите \"Показать\" чтобы разрешить просмотр. \"Не показывать\" позволит вам переопределить и ограничить область показа."; -App::$strings["Show"] = "Показать"; -App::$strings["Don't show"] = "Не показывать"; +App::$strings["Select \"Allow\" to allow viewing. \"Don't allow\" lets you override and limit the scope of \"Allow\"."] = "Выберите \"Разрешить\" для разрешения просмотра. \"Не разрешать\" позволяет вам переопределить и ограничить разрешения."; +App::$strings["Allow"] = "Разрешить"; +App::$strings["Don't allow"] = "Не разрешать"; App::$strings["Permissions"] = "Разрешения"; App::$strings["Close"] = "Закрыть"; App::$strings["Post permissions %s cannot be changed %s after a post is shared.</br />These permissions set who is allowed to view the post."] = "Разрешения публикации %s не могут быть изменены %s после того, как ею поделились. Эти разрешения устанавливают кому разрешено просматривать эту публикацию."; @@ -1007,6 +1008,7 @@ App::$strings["Validation token"] = "Проверочный токен"; App::$strings["No channel."] = "Канала нет."; App::$strings["No connections in common."] = "Общих контактов нет."; App::$strings["View Common Connections"] = "Просмотр общий контактов"; +App::$strings["__ctx:acl__ Profile"] = "Профиль"; App::$strings["network"] = "сеть"; App::$strings["Unable to locate original post."] = "Не удалось найти оригинальную публикацию."; App::$strings["Empty post discarded."] = "Пустая публикация отклонена."; @@ -1345,7 +1347,6 @@ App::$strings["Failed to remove event"] = "Не удалось удалить с App::$strings["Unknown App"] = "Неизвестное приложение"; App::$strings["Authorize"] = "Авторизовать"; App::$strings["Do you authorize the app %s to access your channel data?"] = "Авторизуете ли вы приложение %s для доступа к данным вашего канала?"; -App::$strings["Allow"] = "Разрешить"; App::$strings["Deny"] = "Запретить"; App::$strings["Public Stream App"] = "Приложение \"Публичный поток\""; App::$strings["The unmoderated public stream of this hub"] = "Немодерируемый публичный поток с этого хаба"; @@ -1686,6 +1687,7 @@ App::$strings["Invalid request."] = "Неверный запрос."; App::$strings["thing"] = "предмет"; App::$strings["Channel unavailable."] = "Канал недоступен."; App::$strings["Previous action reversed."] = "Предыдущее действие отменено."; +App::$strings["status"] = "статус"; App::$strings["%1\$s agrees with %2\$s's %3\$s"] = "%1\$s согласен с %2\$s %3\$s"; App::$strings["%1\$s doesn't agree with %2\$s's %3\$s"] = "%1\$s не согласен с %2\$s %3\$s"; App::$strings["%1\$s abstains from a decision on %2\$s's %3\$s"] = "%1\$s воздерживается от решения по %2\$s%3\$s"; @@ -1701,7 +1703,8 @@ App::$strings["My Bookmarks"] = "Мои закладки"; App::$strings["My Connections Bookmarks"] = "Закладки моих контактов"; App::$strings["Update to Hubzilla 5.0 step 2"] = "Обновление Hubzilla 5.0, этап 2"; App::$strings["To complete the update please run"] = "Для завершения обновления пожалуйста выполните"; -App::$strings["INFO: this command can take a very long time depending on your DB size."] = "К сведению: эта команда может выполняться очень долго в зависимости от размеры базы данных."; +App::$strings["php util/z6convert.php"] = ""; +App::$strings["from the terminal."] = "из терминала."; App::$strings["Item not available."] = "Элемент недоступен."; App::$strings["Remote Diagnostics App"] = "Приложение \"Удалённая диагностика\""; App::$strings["Perform diagnostics on remote channels"] = "Производит диагностику удалённых каналов"; @@ -1711,8 +1714,6 @@ App::$strings["Channel removals are not allowed within 48 hours of changing the App::$strings["Remove This Channel"] = "Удалить этот канал"; App::$strings["This channel will be completely removed from the network. "] = "Этот канал будет полностью удалён из сети. "; App::$strings["This action is permanent and can not be undone!"] = "Это действие необратимо и не может быть отменено!"; -App::$strings["Remove this channel and all its clones from the network"] = "Удалить этот канал и все его клоны из сети"; -App::$strings["By default only the instance of the channel located on this hub will be removed from the network"] = "По умолчанию только представление канала расположенное на данном хабе будет удалено из сети"; App::$strings["Unable to update menu."] = "Невозможно обновить меню."; App::$strings["Unable to create menu."] = "Невозможно создать меню."; App::$strings["Menu Name"] = "Название меню"; @@ -2028,6 +2029,8 @@ App::$strings["Sender (From) email address for system generated email."] = "Ад App::$strings["Name of email sender for system generated email."] = "Имя отправителя для генерируемых системой сообщений."; App::$strings["Directory Server URL"] = "URL сервера каталогов"; App::$strings["Default directory server"] = "Сервер каталогов по умолчанию"; +App::$strings["Enable SSE Notifications"] = "Включить уведомления SSE"; +App::$strings["If disabled, traditional polling will be used. Warning: this setting might not be suited for shared hosting"] = "Если выключено будет использоваться традиционный периодический опрос. Предупреждение: этот режим не подходит для виртуального (shared) хостинга"; App::$strings["Proxy user"] = "Имя пользователя proxy-сервера"; App::$strings["Proxy URL"] = "URL proxy-сервера"; App::$strings["Network timeout"] = "Время ожидания сети"; @@ -2453,7 +2456,6 @@ App::$strings["Move this channel (disable all previous locations)"] = "Пере App::$strings["Use this channel nickname instead of the one provided"] = "Использовать псевдоним этого канала вместо предоставленного"; App::$strings["Leave blank to keep your existing channel nickname. You will be randomly assigned a similar nickname if either name is already allocated on this site."] = "Оставьте пустым для сохранения существующего псевдонима канала. Вам будет случайным образом назначен похожий псевдоним если такое имя уже выделено на этом сайте."; App::$strings["This process may take several minutes to complete. Please submit the form only once and leave this page open until finished."] = "Процесс может занять несколько минут. Пожалуйста, отправьте форму только один раз и оставьте эту страницу открытой до завершения."; -App::$strings["Hub not found."] = "Узел не найден."; App::$strings["Warning: Database versions differ by %1\$d updates."] = "Предупреждение: Версия базы данных отличается от %1\$d обновления."; App::$strings["Import completed"] = "Импорт завершён."; App::$strings["Import Items"] = "Импортировать объекты"; @@ -2474,8 +2476,6 @@ App::$strings["Add Card"] = "Добавить карточку"; App::$strings["Account removals are not allowed within 48 hours of changing the account password."] = "Удаление канала не разрешается в течении 48 часов после смены пароля у аккаунта."; App::$strings["Remove This Account"] = "Удалить этот аккаунт"; App::$strings["This account and all its channels will be completely removed from the network. "] = "Этот аккаунт и все его каналы будут полностью удалены из сети."; -App::$strings["Remove this account, all its channels and all its channel clones from the network"] = "Удалить этот аккаунт, все его каналы и их клоны из сети."; -App::$strings["By default only the instances of the channels located on this hub will be removed from the network"] = "По умолчанию только представление канала расположенное на данном хабе будет удалено из сети"; App::$strings["Unable to find your hub."] = "Невозможно найти ваш сервер"; App::$strings["Post successful."] = "Успешно опубликовано."; App::$strings["Authentication failed."] = "Ошибка аутентификации."; @@ -2497,7 +2497,6 @@ App::$strings["Visit your channel homepage"] = "Посетить страниц App::$strings["View your connections and/or add somebody whose address you already know"] = "Просмотреть ваши контакты и / или добавить кого-то чей адрес в уже знаете"; App::$strings["View your personal stream (this may be empty until you add some connections)"] = "Ваш персональный поток (может быть пуст пока вы не добавите контакты)"; App::$strings["View the public stream. Warning: this content is not moderated"] = "Просмотр публичного потока. Предупреждение: этот контент не модерируется"; -App::$strings["Forums"] = "Форумы"; App::$strings["Notes"] = "Записки"; App::$strings["Suggestions"] = "Рекомендации"; App::$strings["See more..."] = "Просмотреть больше..."; @@ -2602,6 +2601,7 @@ App::$strings["via"] = "через"; App::$strings["Attendance Options"] = "Параметры посещаемости"; App::$strings["Voting Options"] = "Параметры голосования"; App::$strings["Pinned post"] = "Прикреплённая заметка"; +App::$strings["Don't show"] = "Не показывать"; App::$strings["Events Tools"] = "Инструменты для событий"; App::$strings["Export Calendar"] = "Экспортировать календарь"; App::$strings["Import Calendar"] = "Импортировать календарь"; @@ -2630,7 +2630,7 @@ App::$strings["Show posts to this forum"] = "Показывать публика App::$strings["Show forums"] = "Показывать форумы"; App::$strings["Starred Posts"] = "Отмеченные публикации"; App::$strings["Show posts that I have starred"] = "Показывать публикации которые я отметил"; -App::$strings["Personal Posts"] = "Личные публикации"; +App::$strings["Personal Posts"] = "Свои публикации"; App::$strings["Show posts that mention or involve me"] = "Показывать публикации где вы были упомянуты или привлечены"; App::$strings["Show posts that I have filed to %s"] = "Показывать публикации которые я добавил в %s"; App::$strings["Show filed post categories"] = "Показывать категории добавленных публикаций"; @@ -2753,6 +2753,7 @@ App::$strings["commented on %s's post"] = "прокомментировал пу App::$strings["repeated %s's post"] = "разместил публикацию %s"; App::$strings["edited a post dated %s"] = "отредактировал публикацию датированную %s"; App::$strings["edited a comment dated %s"] = "отредактировал комментарий датированный %s"; +App::$strings["created an event"] = "создано событие"; App::$strings["(No Title)"] = "(нет заголовка)"; App::$strings["Wiki page create failed."] = "Не удалось создать страницу Wiki."; App::$strings["Wiki not found."] = "Wiki не найдена."; diff --git a/view/tpl/admin_site.tpl b/view/tpl/admin_site.tpl index 5e10e6eea..8d32ba9a4 100755 --- a/view/tpl/admin_site.tpl +++ b/view/tpl/admin_site.tpl @@ -95,6 +95,7 @@ </div> <h3>{{$advanced}}</h3> + {{include file="field_checkbox.tpl" field=$sse_enabled}} {{include file="field_input.tpl" field=$imagick_path}} {{include file="field_input.tpl" field=$proxy}} {{include file="field_input.tpl" field=$proxyuser}} diff --git a/view/tpl/head.tpl b/view/tpl/head.tpl index bd4cf3747..0d212e029 100755 --- a/view/tpl/head.tpl +++ b/view/tpl/head.tpl @@ -9,6 +9,7 @@ {{$plugins}} <script> var updateInterval = {{$update_interval}}; + var sse_enabled = {{$sse_enabled}}; var localUser = {{if $local_channel}}{{$local_channel}}{{else}}false{{/if}}; var zid = {{if $zid}}'{{$zid}}'{{else}}null{{/if}}; var justifiedGalleryActive = false; |