diff options
| -rw-r--r-- | doc/Developers.md | 6 | ||||
| -rw-r--r-- | include/ItemObject.php | 4 | ||||
| -rw-r--r-- | include/api.php | 33 | ||||
| -rw-r--r-- | include/conversation.php | 21 | ||||
| -rw-r--r-- | include/menu.php | 11 | ||||
| -rw-r--r-- | include/oauth.php | 67 | ||||
| -rwxr-xr-x | include/text.php | 19 | ||||
| -rw-r--r-- | include/zot.php | 83 | ||||
| -rw-r--r-- | library/OAuth1.php | 13 | ||||
| -rw-r--r-- | mod/admin.php | 16 | ||||
| -rw-r--r-- | mod/channel.php | 23 | ||||
| -rw-r--r-- | mod/directory.php | 2 | ||||
| -rw-r--r-- | mod/dirfind.php | 68 | ||||
| -rw-r--r-- | mod/dirsearch.php | 19 | ||||
| -rw-r--r-- | mod/editblock.php | 1 | ||||
| -rw-r--r-- | mod/editlayout.php | 1 | ||||
| -rw-r--r-- | mod/editwebpage.php | 1 | ||||
| -rw-r--r-- | mod/fbrowser.php | 3 | ||||
| -rw-r--r-- | mod/photos.php | 5 | ||||
| -rw-r--r-- | mod/zfinger.php | 11 | ||||
| -rwxr-xr-x | util/shred/FriendicaOAuth.sh | 173 | ||||
| -rwxr-xr-x | util/shred/JSON.sh | 129 | ||||
| -rwxr-xr-x | util/shred/OAuth.sh | 214 | ||||
| -rwxr-xr-x | util/shred/shred | 214 | ||||
| -rw-r--r-- | version.inc | 2 | ||||
| -rw-r--r-- | view/ru/messages.po | 2914 | ||||
| -rwxr-xr-x | view/tpl/admin_aside.tpl | 1 | ||||
| -rwxr-xr-x | view/tpl/peoplefind.tpl | 2 | ||||
| -rwxr-xr-x | view/tpl/posted_date_widget.tpl | 2 | ||||
| -rwxr-xr-x | view/tpl/settings_features.tpl | 3 |
30 files changed, 2561 insertions, 1500 deletions
diff --git a/doc/Developers.md b/doc/Developers.md index 1d9c2aaa1..e4905ccd1 100644 --- a/doc/Developers.md +++ b/doc/Developers.md @@ -16,10 +16,14 @@ to create and use your own tracking fork on github Then go to your github page and create a "Pull request" when you are ready to notify us to merge your work. +**Translations** + +Our translations are managed through Transifex. If you wish to help out translating the Red Matrix to another language, sign up on transifex.com, visit [https://www.transifex.com/projects/p/red-matrix/](https://www.transifex.com/projects/p/red-matrix/) and request to join one of the existing language teams or create a new one. Notify one of the core developers when you have a translation update which requires merging, or ask about merging it yourself if you're comfortable with git and PHP. We have a string file called 'messages.po' which is gettext compliant and a handful of email templates, and from there we automatically generate the application's language files. + **Important** Please pull in any changes from the project repository and merge them with your work **before** issuing a pull request. We reserve the right to reject any patch which results in a large number of merge conflicts. This is especially true in the case of language translations - where we may not be able to understand the subtle differences between conflicting versions. Also - **test your changes**. Don't assume that a simple fix won't break something else. If possible get an experienced Red developer to review the code. -Further documentation can be found at the Github wiki pages at: https://github.com/friendica/red/wiki
\ No newline at end of file +Further documentation can be found at the Github wiki pages at: [https://github.com/friendica/red/wiki](https://github.com/friendica/red/wiki). diff --git a/include/ItemObject.php b/include/ItemObject.php index 22b191e79..0256160e9 100644 --- a/include/ItemObject.php +++ b/include/ItemObject.php @@ -88,6 +88,8 @@ class Item extends BaseObject { : false); $shareable = ((($conv->get_profile_owner() == local_user()) && ($item['item_private'] != 1)) ? true : false); + $mode = $conv->get_mode(); + if(local_user() && $observer['xchan_hash'] === $item['author_xchan']) $edpost = array($a->get_baseurl($ssl_state)."/editpost/".$item['id'], t("Edit")); else @@ -183,7 +185,7 @@ class Item extends BaseObject { $tmp_item = array( 'template' => $this->get_template(), - + 'mode' => $mode, 'type' => implode("",array_slice(explode("/",$item['verb']),-1)), 'tags' => array(), 'body' => $body, diff --git a/include/api.php b/include/api.php index a49258d18..2760914e9 100644 --- a/include/api.php +++ b/include/api.php @@ -730,9 +730,10 @@ require_once('include/photos.php'); $in_reply_to_user_id = $user_info['id']; $in_reply_to_screen_name = $user_info['screen_name']; } - } + } + unobscure($lastwall); $status_info = array( - 'text' => html2plain(bbcode($lastwall['body']), 0), + 'text' => html2plain(prepare_text($lastwall['body'],$lastwall['mimetype']), 0), 'truncated' => false, 'created_at' => api_date($lastwall['created']), 'in_reply_to_status_id' => $in_reply_to_status_id, @@ -803,8 +804,9 @@ require_once('include/photos.php'); $in_reply_to_screen_name = $user_info['screen_name']; } } + unobscure($lastwall); $user_info['status'] = array( - 'text' => html2plain(bbcode($lastwall['body']), 0), + 'text' => html2plain(prepare_text($lastwall['body'],$lastwall['mimetype']), 0), 'truncated' => false, 'created_at' => api_date($lastwall['created']), 'in_reply_to_status_id' => $in_reply_to_status_id, @@ -1369,19 +1371,19 @@ require_once('include/photos.php'); 'recipient_screen_name' => $recipient['screen_name'], 'recipient' => $recipient, ); - + unobscure($item); //don't send title to regular StatusNET requests to avoid confusing these apps if (x($_GET, 'getText')) { $ret['title'] = $item['title'] ; if ($_GET["getText"] == "html") { - $ret['text'] = bbcode($item['body']); + $ret['text'] = prepare_text($item['body'],$item['mimetype']); } elseif ($_GET["getText"] == "plain") { - $ret['text'] = html2plain(bbcode($item['body']), 0); + $ret['text'] = html2plain(prepare_text($item['body'],$item['mimetype']), 0); } } else { - $ret['text'] = $item['title']."\n".html2plain(bbcode($item['body']), 0); + $ret['text'] = $item['title']."\n".html2plain(prepare_text($item['body'],$item['mimetype']), 0); } if (isset($_GET["getUserObjects"]) && $_GET["getUserObjects"] == "false") { unset($ret['sender']); @@ -1425,9 +1427,9 @@ require_once('include/photos.php'); $in_reply_to_user_id = 0; $in_reply_to_status_id = 0; } - + unobscure($item); // Workaround for ostatus messages where the title is identically to the body - $statusbody = trim(html2plain(bbcode($item['body']), 0)); + $statusbody = trim(html2plain(prepare_text($item['body'],$item['mimetype']), 0)); $statustitle = trim($item['title']); if (($statustitle != '') and (strpos($statusbody, $statustitle) !== false)) @@ -1448,7 +1450,7 @@ require_once('include/photos.php'); 'geo' => '', 'favorited' => (($item['item_flags'] & ITEM_STARRED) ? true : false), 'user' => $status_user , - 'statusnet_html' => trim(bbcode($item['body'])), + 'statusnet_html' => trim(prepare_text($item['body']),$item['mimetype']), 'statusnet_conversation_id' => $item['parent'], ); @@ -1823,9 +1825,13 @@ require_once('include/photos.php'); function api_oauth_request_token(&$a, $type){ try{ $oauth = new FKOAuth1(); - $r = $oauth->fetch_request_token(OAuthRequest::from_request()); + $req = OAuthRequest::from_request(); +logger('Req: ' . var_export($req,true)); + $r = $oauth->fetch_request_token($req); }catch(Exception $e){ - echo "error=". OAuthUtil::urlencode_rfc3986($e->getMessage()); killme(); + logger('oauth_exception: ' . print_r($e->getMessage(),true)); + echo "error=". OAuthUtil::urlencode_rfc3986($e->getMessage()); + killme(); } echo $r; killme(); @@ -1833,7 +1839,8 @@ require_once('include/photos.php'); function api_oauth_access_token(&$a, $type){ try{ $oauth = new FKOAuth1(); - $r = $oauth->fetch_access_token(OAuthRequest::from_request()); + $req = OAuthRequest::from_request(); + $r = $oauth->fetch_access_token($req); }catch(Exception $e){ echo "error=". OAuthUtil::urlencode_rfc3986($e->getMessage()); killme(); } diff --git a/include/conversation.php b/include/conversation.php index 0c1479356..c3f29295e 100644 --- a/include/conversation.php +++ b/include/conversation.php @@ -651,6 +651,7 @@ function conversation(&$a, $items, $mode, $update, $page_mode = 'traditional') { $tmp_item = array( 'template' => $tpl, 'toplevel' => 'toplevel_item', + 'mode' => $mode, 'id' => (($preview) ? 'P0' : $item['item_id']), 'linktitle' => sprintf( t('View %s\'s profile @ %s'), $profile_name, $profile_url), 'profile_url' => $profile_link, @@ -876,6 +877,12 @@ function item_photo_menu($item){ $ssl_state = false; + $sub_link=""; + $poke_link=""; + $contact_url=""; + $pm_url=""; + $vsrc_link = ""; + if(local_user()) { $ssl_state = true; if(! count($a->contacts)) @@ -884,14 +891,11 @@ function item_photo_menu($item){ $channel_hash = (($channel) ? $channel['channel_hash'] : ''); } - $sub_link=""; - $poke_link=""; - $contact_url=""; - $pm_url=""; - - if((local_user()) && local_user() == $item['uid'] && $item['parent'] == $item['id'] - && $channel && ($channel_hash != $item['author_xchan'])) { - $sub_link = 'javascript:dosubthread(' . $item['id'] . '); return false;'; + if((local_user()) && local_user() == $item['uid']) { + $vsrc_link = $a->get_baseurl() . '/viewsrc/' . $item['id']; + if($item['parent'] == $item['id'] && $channel && ($channel_hash != $item['author_xchan'])) { + $sub_link = 'javascript:dosubthread(' . $item['id'] . '); return false;'; + } } $profile_link = z_root() . "/chanview/?f=&hash=" . $item['author_xchan']; @@ -910,6 +914,7 @@ function item_photo_menu($item){ } $menu = Array( + t("View Source") => $vsrc_link, t("Follow Thread") => $sub_link, t("View Status") => $status_link, t("View Profile") => $profile_link, diff --git a/include/menu.php b/include/menu.php index 6d614055a..900b48e65 100644 --- a/include/menu.php +++ b/include/menu.php @@ -118,6 +118,8 @@ function menu_edit($arr) { return false; + $menu_channel_id = intval($arr['menu_channel_id']); + $r = q("select menu_id from menu where menu_name = '%s' and menu_channel_id = %d limit 1", dbesc($menu_name), intval($menu_channel_id) @@ -128,9 +130,6 @@ function menu_edit($arr) { } - - $menu_channel_id = intval($arr['menu_channel_id']); - $r = q("select * from menu where menu_id = %d and menu_channel_id = %d limit 1", intval($menu_id), intval($menu_channel_id) @@ -141,14 +140,16 @@ function menu_edit($arr) { } - $r = q("select * from menu where menu_name = '%s' and menu_channel_id = %d limit 1", + $r = q("select * from menu where menu_name = '%s' and menu_channel_id = %d and menu_desc = '%s' limit 1", dbesc($menu_name), - intval($menu_channel_id) + intval($menu_channel_id), + dbesc($menu_desc) ); if($r) return false; + return q("update menu set menu_name = '%s', menu_desc = '%s' where menu_id = %d and menu_channel_id = %d limit 1", dbesc($menu_name), diff --git a/include/oauth.php b/include/oauth.php index 6ec5285e4..b10802ecd 100644 --- a/include/oauth.php +++ b/include/oauth.php @@ -18,11 +18,12 @@ class FKOAuthDataStore extends OAuthDataStore { function lookup_consumer($consumer_key) { logger(__function__.":".$consumer_key); - //echo "<pre>"; var_dump($consumer_key); killme(); - +// echo "<pre>"; var_dump($consumer_key); killme(); + $r = q("SELECT client_id, pw, redirect_uri FROM clients WHERE client_id='%s'", dbesc($consumer_key) ); + if (count($r)) return new OAuthConsumer($r[0]['client_id'],$r[0]['pw'],$r[0]['redirect_uri']); return null; @@ -30,11 +31,13 @@ class FKOAuthDataStore extends OAuthDataStore { function lookup_token($consumer, $token_type, $token) { logger(__function__.":".$consumer.", ". $token_type.", ".$token); + $r = q("SELECT id, secret,scope, expires, uid FROM tokens WHERE client_id='%s' AND scope='%s' AND id='%s'", dbesc($consumer->key), dbesc($token_type), dbesc($token) ); + if (count($r)){ $ot=new OAuthToken($r[0]['id'],$r[0]['secret']); $ot->scope=$r[0]['scope']; @@ -46,12 +49,14 @@ class FKOAuthDataStore extends OAuthDataStore { } function lookup_nonce($consumer, $token, $nonce, $timestamp) { - //echo __file__.":".__line__."<pre>"; var_dump($consumer,$key); killme(); +// echo __file__.":".__line__."<pre>"; var_dump($consumer,$key); killme(); + $r = q("SELECT id, secret FROM tokens WHERE client_id='%s' AND id='%s' AND expires=%d", dbesc($consumer->key), dbesc($nonce), intval($timestamp) ); + if (count($r)) return new OAuthToken($r[0]['id'],$r[0]['secret']); return null; @@ -67,13 +72,14 @@ class FKOAuthDataStore extends OAuthDataStore { } else { $k = $consumer; } - + $r = q("INSERT INTO tokens (id, secret, client_id, scope, expires) VALUES ('%s','%s','%s','%s', UNIX_TIMESTAMP()+%d)", dbesc($key), dbesc($sec), dbesc($k), 'request', intval(REQUEST_TOKEN_DURATION)); + if (!$r) return null; return new OAuthToken($key,$sec); } @@ -95,6 +101,7 @@ class FKOAuthDataStore extends OAuthDataStore { $key = $this->gen_token(); $sec = $this->gen_token(); + $r = q("INSERT INTO tokens (id, secret, client_id, scope, expires, uid) VALUES ('%s','%s','%s','%s', UNIX_TIMESTAMP()+%d, %d)", dbesc($key), dbesc($sec), @@ -102,6 +109,7 @@ class FKOAuthDataStore extends OAuthDataStore { 'access', intval(ACCESS_TOKEN_DURATION), intval($uverifier)); + if ($r) $ret = new OAuthToken($key,$sec); } @@ -131,9 +139,9 @@ class FKOAuth1 extends OAuthServer { } function loginUser($uid){ - logger("FKOAuth1::loginUser $uid"); + logger("RedOAuth1::loginUser $uid"); $a = get_app(); - $r = q("SELECT * FROM `user` WHERE uid=%d AND `blocked` = 0 AND `account_expired` = 0 AND `verified` = 1 LIMIT 1", + $r = q("SELECT * FROM channel WHERE channel_id = %d LIMIT 1", intval($uid) ); if(count($r)){ @@ -143,35 +151,36 @@ class FKOAuth1 extends OAuthServer { header('HTTP/1.0 401 Unauthorized'); die('This api requires login'); } - $_SESSION['uid'] = $record['uid']; - $_SESSION['theme'] = $record['theme']; - $_SESSION['mobile_theme'] = get_pconfig($record['uid'], 'system', 'mobile_theme'); + $_SESSION['uid'] = $record['channel_id']; + $_SESSION['theme'] = $record['channel_theme']; + $_SESSION['account_id'] = $record['channel_account_id']; + $_SESSION['mobile_theme'] = get_pconfig($record['channel_id'], 'system', 'mobile_theme'); $_SESSION['authenticated'] = 1; - $_SESSION['page_flags'] = $record['page-flags']; - $_SESSION['my_url'] = $a->get_baseurl() . '/channel/' . $record['nickname']; +// $_SESSION['page_flags'] = $record['page-flags']; + $_SESSION['my_url'] = $a->get_baseurl() . '/channel/' . $record['channel_address']; $_SESSION['addr'] = $_SERVER['REMOTE_ADDR']; + $_SESSION['allow_api'] = true; - //notice( t("Welcome back ") . $record['username'] . EOL); - $a->user = $record; + $a->channel = $record; - if(strlen($a->user['timezone'])) { - date_default_timezone_set($a->user['timezone']); - $a->timezone = $a->user['timezone']; + if(strlen($a->channel['channel_timezone'])) { + date_default_timezone_set($a->channel['channel_timezone']); +// $a->timezone = $a->user['timezone']; } - $r = q("SELECT * FROM `contact` WHERE `uid` = %s AND `self` = 1 LIMIT 1", - intval($_SESSION['uid'])); - if(count($r)) { - $a->contact = $r[0]; - $a->cid = $r[0]['id']; - $_SESSION['cid'] = $a->cid; - } - q("UPDATE `user` SET `login_date` = '%s' WHERE `uid` = %d LIMIT 1", - dbesc(datetime_convert()), - intval($_SESSION['uid']) - ); - - call_hooks('logged_in', $a->user); +// $r = q("SELECT * FROM `contact` WHERE `uid` = %s AND `self` = 1 LIMIT 1", +// intval($_SESSION['uid'])); +// if(count($r)) { +// $a->contact = $r[0]; +// $a->cid = $r[0]['id']; +// $_SESSION['cid'] = $a->cid; +// } +// q("UPDATE `user` SET `login_date` = '%s' WHERE `uid` = %d LIMIT 1", +// dbesc(datetime_convert()), +// intval($_SESSION['uid']) +// ); +// +// call_hooks('logged_in', $a->user); } } diff --git a/include/text.php b/include/text.php index ac82e4429..e1f0a4e00 100755 --- a/include/text.php +++ b/include/text.php @@ -1004,6 +1004,17 @@ function link_compare($a,$b) { // If attach is true, also add icons for item attachments +function unobscure(&$item) { + if(array_key_exists('item_flags',$item) && ($item['item_flags'] & ITEM_OBSCURED)) { + $key = get_config('system','prvkey'); + if($item['title']) + $item['title'] = aes_unencapsulate(json_decode_plus($item['title']),$key); + if($item['body']) + $item['body'] = aes_unencapsulate(json_decode_plus($item['body']),$key); + } + +} + function prepare_body(&$item,$attach = false) { @@ -1013,13 +1024,7 @@ function prepare_body(&$item,$attach = false) { call_hooks('prepare_body_init', $item); - if(array_key_exists('item_flags',$item) && ($item['item_flags'] & ITEM_OBSCURED)) { - $key = get_config('system','prvkey'); - if($item['title']) - $item['title'] = aes_unencapsulate(json_decode_plus($item['title']),$key); - if($item['body']) - $item['body'] = aes_unencapsulate(json_decode_plus($item['body']),$key); - } + unobscure($item); $s = prepare_text($item['body'],$item['mimetype']); diff --git a/include/zot.php b/include/zot.php index f34344739..0f42ddc7f 100644 --- a/include/zot.php +++ b/include/zot.php @@ -417,6 +417,7 @@ function import_xchan($arr) { $dirmode = intval(get_config('system','directory_mode')); $changed = false; + $what = ''; if(! (is_array($arr) && array_key_exists('success',$arr) && $arr['success'])) { logger('import_xchan: invalid data packet: ' . print_r($arr,true)); @@ -492,7 +493,7 @@ function import_xchan($arr) { logger('import_xchan: existing: ' . print_r($r[0],true), LOGGER_DATA); logger('import_xchan: new: ' . print_r($arr,true), LOGGER_DATA); - + $what .= 'xchan '; $changed = true; } } @@ -532,6 +533,7 @@ function import_xchan($arr) { intval($new_flags) ); + $what .= 'new_xchan'; $changed = true; } @@ -552,7 +554,7 @@ function import_xchan($arr) { dbesc($xchan_hash) ); - + $what .= 'photo '; $changed = true; } @@ -578,13 +580,18 @@ function import_xchan($arr) { } } - $r = q("select * from hubloc where hubloc_hash = '%s' and hubloc_guid = '%s' and hubloc_guid_sig = '%s' - and hubloc_url = '%s' and hubloc_url_sig = '%s' limit 1", + // match as many fields as possible in case anything at all changed. + + $r = q("select * from hubloc where hubloc_hash = '%s' and hubloc_guid = '%s' and hubloc_guid_sig = '%s' and hubloc_url = '%s' and hubloc_url_sig = '%s' and hubloc_host = '%s' and hubloc_addr = '%s' and hubloc_callback = '%s' and hubloc_sitekey = '%s' limit 1", dbesc($xchan_hash), dbesc($arr['guid']), dbesc($arr['guid_sig']), dbesc($location['url']), - dbesc($location['url_sig']) + dbesc($location['url_sig']), + dbesc($location['host']), + dbesc($location['address']), + dbesc($location['callback']), + dbesc($location['sitekey']) ); if($r) { logger('import_xchan: hub exists: ' . $location['url']); @@ -600,7 +607,7 @@ function import_xchan($arr) { dbesc(datetime_convert()), intval($r[0]['hubloc_id']) ); - + $what = 'primary_hub '; $changed = true; } continue; @@ -640,7 +647,7 @@ function import_xchan($arr) { dbesc(datetime_convert()), dbesc(datetime_convert()) ); - + $what .= 'newhub '; $changed = true; } @@ -652,7 +659,7 @@ function import_xchan($arr) { $r = q("delete from hubloc where hubloc_id = %d limit 1", intval($x['hubloc_id']) ); - + $what .= 'removed_hub'; $changed = true; } } @@ -666,7 +673,7 @@ function import_xchan($arr) { if(array_key_exists('profile',$arr) && is_array($arr['profile'])) { $profile_changed = import_directory_profile($xchan_hash,$arr['profile']); if($profile_changed) { - + $what .= 'profile '; $changed = true; } } @@ -685,6 +692,7 @@ function import_xchan($arr) { if(array_key_exists('site',$arr) && is_array($arr['site'])) { $profile_changed = import_site($arr['site'],$arr['key']); if($profile_changed) { + $what .= 'site '; $changed = true; } } @@ -694,6 +702,7 @@ function import_xchan($arr) { if($changed) { $guid = random_string() . '@' . get_app()->get_hostname(); update_modtime($xchan_hash,$guid); + logger('import_xchan: changed: ' . $what,LOGGER_DEBUG); } if(! x($ret,'message')) { @@ -1379,8 +1388,8 @@ function import_directory_profile($hash,$profile) { foreach($profile['keywords'] as $kw) { $kw = trim(htmlentities($kw,ENT_COMPAT,'UTF-8',false)); $kw = trim($kw,','); + $clean[] = $kw; } - $clean[] = $kw; } $arr['xprof_keywords'] = implode(' ',$clean); @@ -1392,6 +1401,7 @@ function import_directory_profile($hash,$profile) { $update = false; foreach($r[0] as $k => $v) { if((array_key_exists($k,$arr)) && ($arr[$k] != $v)) { + logger('import_directory_profile: update' . $k . ' => ' . $arr[$k]); $update = true; break; } @@ -1427,6 +1437,7 @@ function import_directory_profile($hash,$profile) { } else { $update = true; + logger('import_directory_profile: new profile'); $x = q("insert into xprof (xprof_hash, xprof_desc, xprof_dob, xprof_age, xprof_gender, xprof_marital, xprof_sexual, xprof_locale, xprof_region, xprof_postcode, xprof_country, xprof_keywords) values ('%s', '%s', '%s', %d, '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s') ", dbesc($arr['xprof_hash']), dbesc($arr['xprof_desc']), @@ -1505,12 +1516,15 @@ function import_site($arr,$pubkey) { } $update = false; + $exists = false; $r = q("select * from site where site_url = '%s' limit 1", dbesc($arr['url']) ); - if($r) - $update = true; + if($r) { + $exists = true; + $siterecord = $r[0]; + } $site_directory = 0; if($arr['directory_mode'] == 'normal') @@ -1541,29 +1555,42 @@ function import_site($arr,$pubkey) { $access_policy = ACCESS_FREE; } - - if($update) { - $r = q("update site set site_flags = %d, site_access = %d, site_directory = '%s', site_register = %d, site_update = '%s' - where site_url = '%s' limit 1", - intval($site_directory), - intval($access_policy), - dbesc(htmlentities($arr['directory_url'],ENT_COMPAT,'UTF-8',false)), - intval($register_policy), - dbesc(datetime_convert()), - dbesc(htmlentities($arr['url'],ENT_COMPAT,'UTF-8',false)) - ); - if(! $r) { - logger('import_site: update failed. ' . print_r($arr,true)); + $directory_url = htmlentities($arr['directory_url'],ENT_COMPAT,'UTF-8',false); + $url = htmlentities($arr['url'],ENT_COMPAT,'UTF-8',false); + + if($exists) { + if(($siterecord['site_flags'] != $site_directory) + || ($siterecord['site_access'] != $access_policy) + || ($siterecord['site_directory'] != $directory_url) + || ($siterecord['site_register'] != $register_policy)) { + $update = true; + +// logger('import_site: input: ' . print_r($arr,true)); +// logger('import_site: stored: ' . print_r($siterecord,true)); + + $r = q("update site set site_flags = %d, site_access = %d, site_directory = '%s', site_register = %d, site_update = '%s' + where site_url = '%s' limit 1", + intval($site_directory), + intval($access_policy), + dbesc($directory_url), + intval($register_policy), + dbesc(datetime_convert()), + dbesc($url) + ); + if(! $r) { + logger('import_site: update failed. ' . print_r($arr,true)); + } } } else { + $update = true; $r = q("insert into site ( site_url, site_access, site_flags, site_update, site_directory, site_register ) values ( '%s', %d, %d, '%s', '%s', %d )", - dbesc(htmlentities($arr['url'],ENT_COMPAT,'UTF-8',false)), + dbesc($url), intval($site_directory), intval($access_policy), dbesc(datetime_convert()), - dbesc(htmlentities($arr['directory_url'],ENT_COMPAT,'UTF-8',false)), + dbesc($directory_url), intval($register_policy) ); if(! $r) { @@ -1571,7 +1598,7 @@ function import_site($arr,$pubkey) { } } - return $r; + return $update; } diff --git a/library/OAuth1.php b/library/OAuth1.php index 0db6fabcb..b790655af 100644 --- a/library/OAuth1.php +++ b/library/OAuth1.php @@ -273,6 +273,7 @@ class OAuthRequest { && @strstr($request_headers["Content-Type"], "application/x-www-form-urlencoded") ) { + $post_data = OAuthUtil::parse_parameters( file_get_contents(self::$POST_INPUT) ); @@ -286,15 +287,15 @@ class OAuthRequest { $request_headers['Authorization'] ); $parameters = array_merge($parameters, $header_parameters); + } } // fix for friendica redirect system - + // FIXME or don't, but figure out if this is absolutely necessary and act accordingly $http_url = substr($http_url, 0, strpos($http_url,$parameters['q'])+strlen($parameters['q'])); unset( $parameters['q'] ); - //echo "<pre>".__function__."\n"; var_dump($http_method, $http_url, $parameters, $_SERVER['REQUEST_URI']); killme(); return new OAuthRequest($http_method, $http_url, $parameters); } @@ -514,9 +515,7 @@ class OAuthServer { */ public function fetch_request_token(&$request) { $this->get_version($request); - $consumer = $this->get_consumer($request); - // no token required for the initial token request $token = NULL; @@ -525,7 +524,6 @@ class OAuthServer { // Rev A change $callback = $request->get_parameter('oauth_callback'); $new_token = $this->data_store->new_request_token($consumer, $callback); - return $new_token; } @@ -796,7 +794,8 @@ class OAuthUtil { ); $out[$key] = $value; } - } else { + } + if((! isset($out)) || (! array_key_exists('Authorization',$out))) { // otherwise we don't have apache and are just going to have to hope // that $_SERVER actually contains what we need $out = array(); @@ -806,6 +805,8 @@ class OAuthUtil { $out['Content-Type'] = $_ENV['CONTENT_TYPE']; foreach ($_SERVER as $key => $value) { + if($key === 'REDIRECT_REMOTE_USER') + $out['Authorization'] = $value; if (substr($key, 0, 5) == "HTTP_") { // this is chaos, basically it is just there to capitalize the first // letter of every word that is not an initial HTTP and strip HTTP diff --git a/mod/admin.php b/mod/admin.php index fb1a9ab53..455897f6f 100644 --- a/mod/admin.php +++ b/mod/admin.php @@ -54,6 +54,9 @@ function admin_post(&$a){ case 'logs': admin_page_logs_post($a); break; + case 'hubloc': + admin_page_hubloc_post($a); + break; case 'dbsync': admin_page_dbsync_post($a); break; @@ -84,6 +87,7 @@ function admin_content(&$a) { 'users' => Array($a->get_baseurl(true)."/admin/users/", t("Users") , "users"), 'plugins'=> Array($a->get_baseurl(true)."/admin/plugins/", t("Plugins") , "plugins"), 'themes' => Array($a->get_baseurl(true)."/admin/themes/", t("Themes") , "themes"), + 'hubloc' => Array($a->get_baseurl(true)."/admin/hubloc/", t("Server") , "server"), 'dbsync' => Array($a->get_baseurl(true)."/admin/dbsync/", t('DB updates'), "dbsync") ); @@ -132,6 +136,9 @@ function admin_content(&$a) { case 'themes': $o = admin_page_themes($a); break; + case 'hubloc': + $o = admin_page_hubloc($a); + break; case 'logs': $o = admin_page_logs($a); break; @@ -443,6 +450,15 @@ function admin_page_site(&$a) { )); } +function admin_page_hubloc_post(&$a){ + check_form_security_token_redirectOnErr('/admin/hubloc', 'hubloc'); + return; +} + +function admin_page_hubloc(&$a) { + $o = ''; + return $o; +} function admin_page_dbsync(&$a) { diff --git a/mod/channel.php b/mod/channel.php index 652084cf0..5a66f5e07 100644 --- a/mod/channel.php +++ b/mod/channel.php @@ -64,17 +64,18 @@ function channel_content(&$a, $update = 0, $load = false) { $category = $datequery = $datequery2 = ''; - if(argc() > 2) { - for($x = 2; $x < argc(); $x ++) { - if(is_a_date_arg(argv($x))) { - if($datequery) - $datequery2 = escape_tags(argv($x)); - else - $datequery = escape_tags(argv($x)); - } - } - } - + // if(argc() > 2) { + // for($x = 2; $x < argc(); $x ++) { + // if(is_a_date_arg(argv($x))) { + // if($datequery) + // $datequery2 = escape_tags(argv($x)); + // else + // $datequery = escape_tags(argv($x)); + // } + // } + // } + $datequery = ((x($_GET,'dend') && is_a_date_arg($_GET['dend'])) ? notags($_GET['dend']) : ''); + $datequery2 = ((x($_GET,'dbegin') && is_a_date_arg($_GET['dbegin'])) ? notags($_GET['dbegin']) : ''); if(get_config('system','block_public') && (! get_account_id()) && (! remote_user())) { return login(); diff --git a/mod/directory.php b/mod/directory.php index b7cdaffe7..823c33cf7 100644 --- a/mod/directory.php +++ b/mod/directory.php @@ -70,7 +70,7 @@ function directory_content(&$a) { if($url) { $query = $url . '?f=' ; if($search) - $query .= '&name=' . urlencode($search); + $query .= '&name=' . urlencode($search) . '&keywords=' . urlencode($search); if(strpos($search,'@')) $query .= '&address=' . urlencode($search); diff --git a/mod/dirfind.php b/mod/dirfind.php deleted file mode 100644 index 54bbf31af..000000000 --- a/mod/dirfind.php +++ /dev/null @@ -1,68 +0,0 @@ -<?php - -function dirfind_init(&$a) { - - require_once('include/contact_widgets.php'); - - if(! x($a->page,'aside')) - $a->page['aside'] = ''; - - $a->page['aside'] .= follow_widget(); - - $a->page['aside'] .= findpeople_widget(); -} - - - -function dirfind_content(&$a) { - - $search = notags(trim($_REQUEST['search'])); - - if(strpos($search,'@') === 0) - $search = substr($search,1); - - $o = ''; - - $o .= '<h2>' . t('People Search') . ' - ' . $search . '</h2>'; - - if($search) { - - $p = (($a->pager['page'] != 1) ? '&p=' . $a->pager['page'] : ''); - - if(strlen(get_config('system','directory_submit_url'))) - $x = fetch_url('http://dir.friendica.com/lsearch?f=' . $p . '&search=' . urlencode($search)); - -//TODO fallback local search if global dir not available. -// else -// $x = post_url($a->get_baseurl() . '/lsearch', $params); - - $j = json_decode($x); - - if($j->total) { - $a->set_pager_total($j->total); - $a->set_pager_itemspage($j->items_page); - } - - if(count($j->results)) { - - $tpl = get_markup_template('match.tpl'); - foreach($j->results as $jj) { - - $o .= replace_macros($tpl,array( - '$url' => zid($jj->url), - '$name' => $jj->name, - '$photo' => $jj->photo, - '$tags' => $jj->tags - )); - } - } - else { - info( t('No matches') . EOL); - } - - } - - $o .= '<div class="clear"></div>'; - $o .= paginate($a); - return $o; -} diff --git a/mod/dirsearch.php b/mod/dirsearch.php index 6034fdc12..04d77a298 100644 --- a/mod/dirsearch.php +++ b/mod/dirsearch.php @@ -41,6 +41,7 @@ function dirsearch_content(&$a) { $agege = ((x($_REQUEST,'agege')) ? intval($_REQUEST['agege']) : 0 ); $agele = ((x($_REQUEST,'agele')) ? intval($_REQUEST['agele']) : 0 ); + $sync = ((x($_REQUEST,'sync')) ? datetime_convert('UTC','UTC',$_REQUEST['sync']) : ''); $sort_order = ((x($_REQUEST,'order')) ? $_REQUEST['order'] : ''); // TODO - a meta search which joins all of these things to one search string @@ -82,6 +83,7 @@ function dirsearch_content(&$a) { $limit = (($_REQUEST['limit']) ? intval($_REQUEST['limit']) : 0); $return_total = ((x($_REQUEST,'return_total')) ? intval($_REQUEST['return_total']) : 0); + // mtime is not currently working $mtime = ((x($_REQUEST,'mtime')) ? datetime_convert('UTC','UTC',$_REQUEST['mtime']) : ''); @@ -124,11 +126,19 @@ function dirsearch_content(&$a) { $order = " order by xchan_name asc "; + if($sync) { - $r = q("SELECT xchan.*, xprof.* from xchan left join xprof on xchan_hash = xprof_hash where $logic $sql_extra and not ( xchan_flags & %d ) and not ( xchan_flags & %d ) $order $qlimit ", - intval(XCHAN_FLAGS_HIDDEN), - intval(XCHAN_FLAGS_ORPHAN) - ); + $r = q("select xchan.*, updates.* from xchan left join updates on ud_hash = xchan_hash where ud_date >= '%s' and ud_guid != '' order by ud_date desc", + dbesc($sync) + ); + + } + else { + $r = q("SELECT xchan.*, xprof.* from xchan left join xprof on xchan_hash = xprof_hash where $logic $sql_extra and not ( xchan_flags & %d ) and not ( xchan_flags & %d ) $order $qlimit ", + intval(XCHAN_FLAGS_HIDDEN), + intval(XCHAN_FLAGS_ORPHAN) + ); + } $ret['page'] = $page + 1; $ret['records'] = count($r); @@ -145,6 +155,7 @@ function dirsearch_content(&$a) { $entry['hash'] = $rr['xchan_hash']; $entry['updated'] = (($rr['ud_date']) ? $rr['ud_date'] : '0000-00-00 00:00:00'); + $entry['update_guid'] = (($rr['ud_guid']) ? $rr['ud_guid'] : ''); $entry['url'] = $rr['xchan_url']; $entry['photo'] = $rr['xchan_photo_m']; $entry['address'] = $rr['xchan_addr']; diff --git a/mod/editblock.php b/mod/editblock.php index 48136b126..a111f6666 100644 --- a/mod/editblock.php +++ b/mod/editblock.php @@ -1,4 +1,3 @@ - <?php // What is this here for? I think it's cruft, but comment out for now in case it's here for a reason diff --git a/mod/editlayout.php b/mod/editlayout.php index 474244653..7bcd02512 100644 --- a/mod/editlayout.php +++ b/mod/editlayout.php @@ -1,4 +1,3 @@ - <?php // What is this here for? I think it's cruft, but comment out for now in case it's here for a reason diff --git a/mod/editwebpage.php b/mod/editwebpage.php index ea07a3758..44ac0bc85 100644 --- a/mod/editwebpage.php +++ b/mod/editwebpage.php @@ -1,4 +1,3 @@ - <?php // Required for setting permissions. (FIXME) diff --git a/mod/fbrowser.php b/mod/fbrowser.php index 31004c0d8..baacfe56b 100644 --- a/mod/fbrowser.php +++ b/mod/fbrowser.php @@ -53,7 +53,8 @@ function fbrowser_content($a){ function files1($rr){ global $a; - $types = Photo::supportedTypes(); + $ph = photo_factory(''); + $types = $ph->supportedTypes(); $ext = $types[$rr['type']]; if($a->get_template_engine() === 'internal') { diff --git a/mod/photos.php b/mod/photos.php index d60029688..217f9785f 100644 --- a/mod/photos.php +++ b/mod/photos.php @@ -1064,6 +1064,7 @@ function photos_content(&$a) { if($can_post || $a->data['perms']['post_comments']) { $comments .= replace_macros($cmnt_tpl,array( '$return_path' => '', + '$mode' => 'photos', '$jsreload' => $return_url, '$type' => 'wall-comment', '$id' => $link_item['id'], @@ -1127,10 +1128,12 @@ function photos_content(&$a) { $name_e = $profile_name; $title_e = $item['title']; - $body_e = bbcode($item['body']); + unobscure($item); + $body_e = prepare_text($item['body'],$item['mimetype']); $comments .= replace_macros($template,array( '$id' => $item['item_id'], + '$mode' => 'photos', '$profile_url' => $profile_link, '$name' => $name_e, '$thumb' => $profile_avatar, diff --git a/mod/zfinger.php b/mod/zfinger.php index 36c1cc493..70e3bdca6 100644 --- a/mod/zfinger.php +++ b/mod/zfinger.php @@ -106,10 +106,13 @@ function zfinger_init(&$a) { if($p[0]['keywords']) { $tags = array(); $k = explode(' ',$p[0]['keywords']); - if($k) - foreach($k as $kk) - if(trim($kk)) - $tags[] = trim($kk); + if($k) { + foreach($k as $kk) { + if(trim($kk)) { + $tags[] = trim($kk," \t\n\r\0\x0B,"); + } + } + } if($tags) $profile['keywords'] = $tags; } diff --git a/util/shred/FriendicaOAuth.sh b/util/shred/FriendicaOAuth.sh new file mode 100755 index 000000000..a20da7879 --- /dev/null +++ b/util/shred/FriendicaOAuth.sh @@ -0,0 +1,173 @@ +#!/bin/bash +# Copyright (c) 2012 Fabio Comuni +# Copyright (c) 2012 Michael Nowack +# Copyright (c) 2010, 2012 Yu-Jie Lin +# +# Permission is hereby granted, free of charge, to any person obtaining a copy of +# this software and associated documentation files (the "Software"), to deal in +# the Software without restriction, including without limitation the rights to +# use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies +# of the Software, and to permit persons to whom the Software is furnished to do +# so, subject to the following conditions: +# +# The above copyright notice and this permission notice shall be included in all +# copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +# SOFTWARE. + +FRIENDICAOAUTH_VERSION=0.1.1 + +F_API_VERSION="1" + +# Friendica API endpoints + +F_ACCOUNF_UPDATE_PROFILE_IMAGE="${redmatrix_url}/api/account/update_profile_image" +F_STATUSES_UPDATE="${redmatrix_url}/api/statuses/update" +F_STATUSES_HOME_TIMELINE="${redmatrix_url}/api/statuses/home_timeline" + +F_REQUESF_TOKEN=${redmatrix_url}'/api/oauth/request_token' +F_ACCESS_TOKEN=${redmatrix_url}'/api/oauth/access_token' +F_AUTHORIZE_TOKEN=${redmatrix_url}'/api/oauth/authorize' + +# Source OAuth.sh + +OAuth_sh=$(which OAuth.sh) +(( $? != 0 )) && echo 'Unable to locate OAuth.sh! Make sure it is in searching PATH.' && exit 1 +source "$OAuth_sh" + +FO_debug () { + # Print out all parameters, each in own line + [[ "$FO_DEBUG" == "" ]] && return + local t=$(date +%FT%T.%N) + while (( $# > 0 )); do + echo "[FO][DEBUG][$t] $1" + shift 1 + done + } + +FO_extract_value () { + # $1 key name + # $2 string to find + egrep -o "$1=[a-zA-Z0-9-]*" <<< "$2" | cut -d\= -f 2 + } + + +FO_init() { + # Initialize FriendicaOAuth + oauth_version='1.0' + oauth_signature_method='HMAC-SHA1' + oauth_basic_params=( + $(OAuth_param 'oauth_consumer_key' "$oauth_consumer_key") + $(OAuth_param 'oauth_signature_method' "$oauth_signature_method") + $(OAuth_param 'oauth_version' "$oauth_version") + ) + } + +FO_access_token_helper () { + # Help guide user to get access token + + local resp PIN + + # Request Token + + local auth_header="$(_OAuth_authorization_header 'Authorization' "$redmatrix_url/" "$oauth_consumer_key" "$oauth_consumer_secret" '' '' "$oauth_signature_method" "$oauth_version" "$(OAuth_nonce)" "$(OAuth_timestamp)" 'POST' "$F_REQUESF_TOKEN" "$(OAuth_param 'oauth_callback' 'oob')"), $(OAuth_param_quote 'oauth_callback' 'oob')" + +# echo $auth_header +# echo $F_REQUESF_TOKEN + + resp=$(curl -s -d '' -H "$auth_header" "$F_REQUESF_TOKEN") + FO_rval=$? + (( $? != 0 )) && return $FO_rval + + local _oauth_token=$(FO_extract_value 'oauth_token' "$resp") + local _oauth_token_secret=$(FO_extract_value 'oauth_token_secret' "$resp") + + echo 'Please go to the following link to get the PIN:' + echo " ${F_AUTHORIZE_TOKEN}?oauth_token=$_oauth_token" + + read -p 'PIN: ' PIN + + # Access Token + + local auth_header="$(_OAuth_authorization_header 'Authorization' "$redmatrix_url/" "$oauth_consumer_key" "$oauth_consumer_secret" "$_oauth_token" "$_oauth_token_secret" "$oauth_signature_method" "$oauth_version" "$(OAuth_nonce)" "$(OAuth_timestamp)" 'POST' "$F_ACCESS_TOKEN" "$(OAuth_param 'oauth_verifier' "$PIN")"), $(OAuth_param_quote 'oauth_verifier' "$PIN")" + + resp=$(curl -s -d "" -H "$auth_header" "$F_ACCESS_TOKEN") + FO_rval=$? + (( $? != 0 )) && return $FO_rval + + FO_ret=( + $(FO_extract_value 'oauth_token' "$resp") + $(FO_extract_value 'oauth_token_secret' "$resp") + $(FO_extract_value 'user_id' "$resp") + $(FO_extract_value 'screen_name' "$resp") + ) + } + +# APIs +###### + +FO_statuses_update () { + # $1 format + # $2 status + # $3 in_reply_to_status_id + # The followins are not implemented yet: + # $4 lat + # $5 long + # $6 place_id + # $7 display_coordinates + local format="$1" + [[ "$format" == "" ]] && format="xml" + + local params=( + $(OAuth_param 'status' "$2") + ) + + params[${#params[@]}]=$(OAuth_param 'source' "fcli") + + [[ "$3" != "" ]] && params[${#params[@]}]=$(OAuth_param 'in_reply_to_status_id' "$3") && local in_reply_to_status_id=( '--data-urlencode' "in_reply_to_status_id=$3" ) + + + local auth_header=$(OAuth_authorization_header 'Authorization' "$redmatrix_url" '' '' 'POST' "$F_STATUSES_UPDATE.$format" ${params[@]}) + + + FO_ret=$(curl -s -H "$auth_header" --data-urlencode "status=$2" --data-urlencode "source=fcli" ${in_reply_to_status_id[@]} "$F_STATUSES_UPDATE.$format") + + FO_rval=$? + return $FO_rval + } + + +# gets the user home_timeline. +# +# @sets FO_ret API response +# @returns status +# @public +FO_statuses_home_timeline () { + # $1 format + # $2 screen_name + # $3 count + local format="$1" + local screen_name="$2" + local count="$3" + [[ "$format" == "" ]] && format="xml" + [[ "$count" == "" ]] && count=1 + + local params=( + $(OAuth_param 'screen_name' $screen_name) + $(OAuth_param 'count' $count) + ) +g + local auth_header=$(OAuth_authorization_header 'Authorization' "$redmatrix_url" '' '' 'GET' "$F_STATUSES_HOME_TIMELINE.$format" ${params[@]}) + + convscreen=$(OAuth_PE "$screen_name"); + FO_ret=$(curl -s --get "${F_STATUSES_HOME_TIMELINE}.${format}" --data "screen_name=${convscreen}&count=${count}" --header "${auth_header}") + FO_rval=$? + + return $FO_rval + } diff --git a/util/shred/JSON.sh b/util/shred/JSON.sh new file mode 100755 index 000000000..65f5f1f66 --- /dev/null +++ b/util/shred/JSON.sh @@ -0,0 +1,129 @@ +# The MIT License +# +# Copyright (c) 2011 Dominic Tarr +# +# Permission is hereby granted, free of charge, +# to any person obtaining a copy of this software and +# associated documentation files (the "Software"), to +# deal in the Software without restriction, including +# without limitation the rights to use, copy, modify, +# merge, publish, distribute, sublicense, and/or sell +# copies of the Software, and to permit persons to whom +# the Software is furnished to do so, +# subject to the following conditions: +# +# The above copyright notice and this permission notice +# shall be included in all copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES +# OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. +# IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR +# ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, +# TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE +# SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +# +# +# https://github.com/dominictarr/JSON.sh +# +throw () { + echo "$*" >&2 + exit 1 +} + +tokenize () { + local ESCAPE='(\\[^u[:cntrl:]]|\\u[0-9a-fA-F]{4})' + local CHAR='[^[:cntrl:]"\\]' + local STRING="\"$CHAR*($ESCAPE$CHAR*)*\"" + local NUMBER='-?(0|[1-9][0-9]*)([.][0-9]*)?([eE][+-]?[0-9]*)?' + local KEYWORD='null|false|true' + local SPACE='[[:space:]]+' + egrep -ao "$STRING|$NUMBER|$KEYWORD|$SPACE|." --color=never | + egrep -v "^$SPACE$" # eat whitespace +} + +parse_array () { + local index=0 + local ary='' + read -r token + case "$token" in + ']') ;; + *) + while : + do + parse_value "$1" "$index" + let index=$index+1 + ary="$ary""$value" + read -r token + case "$token" in + ']') break ;; + ',') ary="$ary," ;; + *) throw "EXPECTED , or ] GOT ${token:-EOF}" ;; + esac + read -r token + done + ;; + esac + value=`printf '[%s]' "$ary"` +} + +parse_object () { + local key + local obj='' + read -r token + case "$token" in + '}') ;; + *) + while : + do + case "$token" in + '"'*'"') key=$token ;; + *) throw "EXPECTED string GOT ${token:-EOF}" ;; + esac + read -r token + case "$token" in + ':') ;; + *) throw "EXPECTED : GOT ${token:-EOF}" ;; + esac + read -r token + parse_value "$1" "$key" + obj="$obj$key:$value" + read -r token + case "$token" in + '}') break ;; + ',') obj="$obj," ;; + *) throw "EXPECTED , or } GOT ${token:-EOF}" ;; + esac + read -r token + done + ;; + esac + value=`printf '{%s}' "$obj"` +} + +parse_value () { + local jpath="${1:+$1,}$2" + case "$token" in + '{') parse_object "$jpath" ;; + '[') parse_array "$jpath" ;; + # At this point, the only valid single-character tokens are digits. + ''|[^0-9]) throw "EXPECTED value GOT ${token:-EOF}" ;; + *) value=$token ;; + esac + printf "[%s]\t%s\n" "$jpath" "$value" +} + +parse () { + read -r token + parse_value + read -r token + case "$token" in + '') ;; + *) throw "EXPECTED EOF GOT $token" ;; + esac +} + +if [ $0 = $BASH_SOURCE ]; +then + tokenize | parse +fi diff --git a/util/shred/OAuth.sh b/util/shred/OAuth.sh new file mode 100755 index 000000000..4be4ed35b --- /dev/null +++ b/util/shred/OAuth.sh @@ -0,0 +1,214 @@ +#!/bin/bash +# Copyright (c) 2010, 2012 Yu-Jie Lin +# +# Permission is hereby granted, free of charge, to any person obtaining a copy of +# this software and associated documentation files (the "Software"), to deal in +# the Software without restriction, including without limitation the rights to +# use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies +# of the Software, and to permit persons to whom the Software is furnished to do +# so, subject to the following conditions: +# +# The above copyright notice and this permission notice shall be included in all +# copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +# SOFTWARE. + +BASHOAUTH_VERSION=0.1.2 + +OAuth_debug () { + # Print out all parameters, each in own line + [[ "$OAUTH_DEBUG" == "" ]] && return + local t=$(date +%FT%T.%N) + while (( $# > 0 )); do + echo "[OAuth][DEBUG][$t] $1" + shift 1 + done + } + +OAuth_nonce () { + # Return a nonce + md5sum <<< "$RANDOM-$(date +%s.%N)" | cut -d' ' -f 1 + } + +OAuth_timestamp () { + # Return timestamp + echo "$(date +%s)" + } + +OAuth_PE () { + # Encode $1 using Percent-encoding as defined in + # http://tools.ietf.org/html/rfc5849#section-3.6 + # Any character other than [a-zA-Z0-9-._~] is converted into format %XX + [ -n "$1" ] \ + && echo -n "$1" | perl -p -e 's/([^A-Za-z0-9-._~])/sprintf("%%%02X", ord($1))/seg' +} + +OAuth_PE_file () { + # Encode a file $1 using Percent-encoding as defined in + # http://tools.ietf.org/html/rfc5849#section-3.6 + # $1 a filename, not the content of file + perl -p -e 's/([^A-Za-z0-9-._~])/sprintf("%%%02X", ord($1))/seg' < "$1" +} + +OAuth_params_string () { + # Sort the paramters and join them into one-line string + while (( $# > 0 )); do + echo $1 + shift 1 + done | sort | tr '\n' '&' | sed 's/&$//' + } + +OAuth_base_string () { + # $1 method: "GET", "POST", etc + # $2 url + # $3-$N params + local method=$1 + local url=$2 + shift 2 + + local params_string=$(OAuth_params_string $@) + + echo "$method&$(OAuth_PE "$url")&$(OAuth_PE "$params_string")" + } + +OAuth_param () { + # Return a percent encoded key-value pair + # $1 key + # $2 value + echo "$(OAuth_PE "$1")=$(OAuth_PE "$2")" + } + +OAuth_param_quote () { + # Return a percent encoded key-value pair, value is quoted + # $1 key + # $2 value + echo "$(OAuth_PE "$1")=\"$(OAuth_PE "$2")\"" + } + +OAuth_param_file () { + # Return a percent encoded key-value pair, the value is an encoded file content + # $1 key + # $2 filename + echo "$(OAuth_PE "$1")=$(OAuth_PE_file "$2")" + } + +OAuth_param_raw_value () { + # Return a percent encoded key-value pair, only key will be encoded by this function + # $1 key + # $2 value + echo "$(OAuth_PE "$1")=$2" + } + +OAuth_HMAC_SHA1 () { + # Hash the text $1 with key $2 + local text="$1" + local key="$2" + echo -n "$text" | openssl dgst -sha1 -binary -hmac "$key" | base64 + } + +_OAuth_signature () { + # Return the signature, note it's necessary to pass to OAuth_PE before add to header + # $1 signature_method + # $2 base_string + # $3 consumer_secret + # $4 token_secret + local signature_method="OAuth_${1//-/_}" + local base_string=$2 + local c_secret=$3 + local t_secret=$4 + $signature_method "$base_string" "$c_secret&$t_secret" + } + +OAuth_signature () { + # Return the signature, note it's necessary to pass to OAuth_PE before add to header + # $1 base_string + _OAuth_signature "$oauth_signature_method" "$1" "$oauth_consumer_secret" "$oauth_token_secret" + } + +_OAuth_authorization_header_params_string () { + while (( $# > 0 )); do + echo -n "$(cut -d\= -f 1 <<< "$1")=\"$(cut -d\= -f 2 <<< "$1")\"" + shift 1 + # Use break to prevent error code being returned + (( $# > 0 )) && echo -n ', ' || break + done + } + +_OAuth_authorization_header () { + # Return header string + # $1 header key + # $2 OAuth realm, can be empty string + # $3 OAuth consumer key + # $4 OAuth consumer secret + # $5 OAuth token + # $6 OAuth token secret + # $7 OAuth signature method + # $8 OAuth version + # $9 nonce + # $10 timestamp + # $11 method + # $12 url + # $13-$N params + echo -n "$1: OAuth " + [[ "$2" != "" ]] && echo -n "realm=\"$2\", " + local oauth_consumer_key="$3" + local oauth_consumer_secret="$4" + local oauth_token="$5" + local oauth_token_secret="$6" + local oauth_signature_method="$7" + local oauth_version="$8" + local oauth_nonce="$9" + [[ "$oauth_nonce" == "" ]] && oauth_nonce="$(OAuth_nonce)" + local oauth_timestamp="${10}" + [[ "$oauth_timestamp" == "" ]] && oauth_timestamp="$(OAuth_timestamp)" + local method="${11}" + local url="${12}" + shift 12 + local params=( + $(OAuth_param 'oauth_consumer_key' "$oauth_consumer_key") + $(OAuth_param 'oauth_signature_method' "$oauth_signature_method") + $(OAuth_param 'oauth_version' "$oauth_version") + $(OAuth_param 'oauth_nonce' "$oauth_nonce") + $(OAuth_param 'oauth_timestamp' "$oauth_timestamp") + ) + [[ "$oauth_token" != "" ]] && params[${#params[@]}]=$(OAuth_param 'oauth_token' "$oauth_token") + local sign_params=${params[@]} + while (( $# > 0 )); do + sign_params[${#sign_params[@]}]="$1" + shift 1 + done + local base_string=$(OAuth_base_string "$method" "$url" ${sign_params[@]}) + local signature=$(_OAuth_signature "$oauth_signature_method" "$base_string" "$oauth_consumer_secret" "$oauth_token_secret") + params[${#params[@]}]=$(OAuth_param 'oauth_signature' "$signature") + _OAuth_authorization_header_params_string ${params[@]} + } + +OAuth_authorization_header () { + # Return header string + # $1 header key + # $2 OAuth realm, can be empty string + # $3 OAuth nonce + # $4 OAuth timestamp + # $5 method + # $6 url + # $7-$N params + local header_key="$1" + local realm="$2" + local oauth_nonce="$3" + local oauth_timestamp="$4" + local method="$5" + local url="$6" + shift 6 + local params=() + while (( $# > 0 )); do + params[${#params[@]}]="$1" + shift 1 + done + _OAuth_authorization_header "$header_key" "$realm" "$oauth_consumer_key" "$oauth_consumer_secret" "$oauth_token" "$oauth_token_secret" "$oauth_signature_method" "$oauth_version" "$oauth_nonce" "$oauth_timestamp" "$method" "$url" ${params[@]} + } diff --git a/util/shred/shred b/util/shred/shred new file mode 100755 index 000000000..2e463ac6d --- /dev/null +++ b/util/shred/shred @@ -0,0 +1,214 @@ +#!/bin/bash +# Copyright (c) 2012 Fabio Comuni +# Copyright (c) 2010, 2012 Yu-Jie Lin +# +# Permission is hereby granted, free of charge, to any person obtaining a copy of +# this software and associated documentation files (the "Software"), to deal in +# the Software without restriction, including without limitation the rights to +# use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies +# of the Software, and to permit persons to whom the Software is furnished to do +# so, subject to the following conditions: +# +# The above copyright notice and this permission notice shall be included in all +# copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +# SOFTWARE. + +FCLI_RC="$HOME/.shred.rc" + +# Source Config +[[ -f "$FCLI_RC" ]] && . "$FCLI_RC" || show_config_help 1 + +# Source FriendicaOAuth.sh +OAuth_sh=$(which FriendicaOAuth.sh) +(( $? != 0 )) && echo 'Unable to locate FriendicaOAuth.sh! Make sure it is in searching PATH.' && exit 1 +source "$OAuth_sh" + +# Source JSON.sh +JSON_sh=$(which JSON.sh) +(( $? != 0 )) && echo 'Unable to locate JSON.sh! Make sure it is in searching PATH.' && exit 1 +source "$JSON_sh" + + +usage () { + echo "usage: $0 options + +OPTIONS: + -h Show this message + + -c Command + + -C Config-Filename + + Valid Commands: + statuses_update + home_timeline + +Use -h -c command to get options for the command. +" + exit $1 + } + +show_config_help () { + echo "Please create $FCLI_RC with: +redmatrix_url=YOR_SERVER_URL (no trailing /) +oauth_consumer_key=YOUR_CONSUMER_KEY +oauth_consumer_secret=YOUR_CONSUMER_SECRET + +You can register new app consumer key and secret at + http://yourserver.com/settings/oauth +" + exit $1 + } + + +show_statuses_update () { + echo "Command statuses_update + +Requires: + -s status + +Optional: + -r in_reply_to_status_id +" + exit $1 + } + +show_home_timeline () { + echo "Command home_timeline" + + exit $1 + } + +#json helper +# +# usage: +# echo "$parsed_json" | js key1 [key2 [key3 ...]][,] +# +# echoes the value of json[key1][key2][key3], without surronding quotes +# with "," as last argument, no newline is printed +# +js () { + local arg + local rg='^\[' + local ret + for arg in $@ + do + [[ "$arg" == "," ]] && break; + if [[ $arg == ${arg//[0-9]/} ]] + then + rg="${rg}\"$arg\"," + else + rg="${rg}$arg," + fi + done + rg="${rg%?}\]" + ret=$(grep $rg | cut -f 2 | sed 's/^"\(.*\)"$/\1/' | sed "s/\\\\\//\//g" ) + if [[ "$arg" == "," ]] + then + echo -e "$ret" | tr -d '\012\015' + else + echo -e "$ret" + fi +} + + +load_config () { + + [[ "$oauth_consumer_key" == "" ]] && show_config_help 1 + [[ "$oauth_consumer_secret" == "" ]] && show_config_help 1 + + + FO_init + + if [[ "$oauth_token" == "" ]] || [[ "$oauth_token_secret" == "" ]]; then + FO_access_token_helper + if (( $? == 0 )); then + oauth_token=${FO_ret[0]} + oauth_token_secret=${FO_ret[1]} + echo "oauth_token='${FO_ret[0]}'" >> "$FCLI_RC" + echo "oauth_token_secret='${FO_ret[1]}'" >> "$FCLI_RC" + echo "Token saved." + else + echo 'Unable to get access token' + exit 1 + fi + fi + } + +main () { + + fcli_command= + fcli_status= + fcli_in_reply_to_status_id= + fcli_file= + fcli_help_flag= + while getopts "c:s:r:f:h" name + do + case $name in + c) fcli_command="$OPTARG";; + C) FCLI_RC="$OPTARG";; + s) fcli_status="$OPTARG";; + r) fcli_in_reply_to_status_id="$OPTARG";; + f) fcli_file="$OPTARG";; + h) fcli_help_flag="1";; + ?) usage + exit 2;; + esac + done + load_config + + if [[ "$fcli_help_flag" == "1" ]]; then case $fcli_command in + statuses_update) + show_statuses_update 0 + ;; + home_timeline) + show_home_timeline 0 + ;; + *) + [[ "$fcli_command" == "" ]] && usage 0 + usage 1 + esac ; fi + + case $fcli_command in + home_timeline) + FO_statuses_home_timeline 'json' '' 5 + JS_Parsed=$(echo "$FO_ret" | tokenize | parse) + for id in 0 1 2 3 4 + do + echo "$JS_Parsed" | js $id "user" "name" , + echo -n " - " + echo "$JS_Parsed" | js $id "created_at" + echo "$JS_Parsed" | js $id "text" + echo "" + echo "------------------------------------------------------------------------------" + done + + return $FO_rval + ;; + statuses_update) + [[ "$fcli_status" == "" ]] && show_statuses_update 1 + FO_statuses_update 'json' "$fcli_status" "$fcli_in_reply_to_status_id" + JS_Parsed=$(echo "$FO_ret" | tokenize | parse) + echo "$JS_Parsed" | js "user" "name" , + echo -n " - " + echo "$JS_Parsed" | js "created_at" + echo "$JS_Parsed" | js "text" + echo "" + echo "------------------------------------------------------------------------------" + return $FO_rval + ;; + *) + usage 1 + ;; + esac + return 0 + } + +main "$@" diff --git a/version.inc b/version.inc index 4c592bf06..44ebbfe27 100644 --- a/version.inc +++ b/version.inc @@ -1 +1 @@ -2013-09-13.435 +2013-09-17.439 diff --git a/view/ru/messages.po b/view/ru/messages.po index 267b799f4..375af7439 100644 --- a/view/ru/messages.po +++ b/view/ru/messages.po @@ -1,5 +1,5 @@ # Red Communications Project -# Copyright (C) 2013 the Friendica Project +# Copyright (C) 2013 the Red Matrix Project # This file is distributed under the same license as the Red package. # # Translators: @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: Red Matrix\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-08-09 03:55-0700\n" -"PO-Revision-Date: 2013-08-12 13:40+0000\n" +"POT-Creation-Date: 2013-09-06 00:01-0700\n" +"PO-Revision-Date: 2013-09-13 09:56+0000\n" "Last-Translator: alexej <info@pixelbits.de>\n" "Language-Team: Russian (http://www.transifex.com/projects/p/red-matrix/language/ru/)\n" "MIME-Version: 1.0\n" @@ -38,17 +38,17 @@ msgstr "и" msgid "public profile" msgstr "Публичный профиль" -#: ../../include/activities.php:48 +#: ../../include/activities.php:50 #, php-format msgid "%1$s changed %2$s to “%3$s”" msgstr "%1$s изменил %2$s на “%3$s”" -#: ../../include/activities.php:49 +#: ../../include/activities.php:51 #, php-format msgid "Visit %1$s's %2$s" msgstr "Посетить %1$s's %2$s" -#: ../../include/activities.php:52 +#: ../../include/activities.php:54 #, php-format msgid "%1$s has an updated %2$s, changing %3$s." msgstr "" @@ -134,17 +134,17 @@ msgstr "Пожалуйста, посетите %s для просмотра и/ #: ../../include/enotify.php:165 #, php-format msgid "[Red:Notify] %s posted to your profile wall" -msgstr "" +msgstr "[Red:Уведомление] %s добавил сообщениe на стену вашего профиля" #: ../../include/enotify.php:167 #, php-format msgid "%1$s posted to your profile wall at %2$s" -msgstr "" +msgstr "%1$s добавил сообщениe на стену вашего профиля в %2$s" #: ../../include/enotify.php:169 #, php-format msgid "%1$s posted to [zrl=%2$s]your wall[/zrl]" -msgstr "" +msgstr "%1$s добавил сообщениe на [zrl=%2$s]стену вашего профиля[/zrl]" #: ../../include/enotify.php:195 #, php-format @@ -243,47 +243,51 @@ msgstr "Фото:" msgid "Please visit %s to approve or reject the suggestion." msgstr "" -#: ../../include/Contact.php:55 ../../include/contact_widgets.php:9 +#: ../../include/comanche.php:33 +msgid "Default" +msgstr "" + +#: ../../include/Contact.php:87 ../../include/contact_widgets.php:9 #: ../../mod/directory.php:163 ../../mod/match.php:58 ../../mod/suggest.php:56 -#: ../../boot.php:1622 +#: ../../boot.php:1687 msgid "Connect" -msgstr "Добавить" +msgstr "Подключить" -#: ../../include/Contact.php:71 +#: ../../include/Contact.php:103 msgid "New window" msgstr "Новое окно" -#: ../../include/Contact.php:72 +#: ../../include/Contact.php:104 msgid "Open the selected location in a different window or browser tab" msgstr "" -#: ../../include/Contact.php:430 ../../include/conversation.php:887 +#: ../../include/Contact.php:462 ../../include/conversation.php:920 msgid "Poke" msgstr "Подпихнуть" -#: ../../include/Contact.php:431 ../../include/conversation.php:881 +#: ../../include/Contact.php:463 ../../include/conversation.php:914 msgid "View Status" msgstr "Просмотр состояния" -#: ../../include/Contact.php:432 ../../include/nav.php:75 -#: ../../include/conversation.php:882 ../../mod/connections.php:294 -#: ../../mod/connections.php:401 +#: ../../include/Contact.php:464 ../../include/nav.php:75 +#: ../../include/conversation.php:915 ../../mod/connections.php:304 +#: ../../mod/connections.php:411 msgid "View Profile" msgstr "Просмотр профиля" -#: ../../include/Contact.php:433 ../../include/conversation.php:883 +#: ../../include/Contact.php:465 ../../include/conversation.php:916 msgid "View Photos" msgstr "Просмотр фотографий" -#: ../../include/Contact.php:434 ../../include/conversation.php:884 +#: ../../include/Contact.php:466 ../../include/conversation.php:917 msgid "Network Posts" msgstr "Сообщения сети" -#: ../../include/Contact.php:435 ../../include/conversation.php:885 +#: ../../include/Contact.php:467 ../../include/conversation.php:918 msgid "Edit Contact" msgstr "Редактировать канал" -#: ../../include/Contact.php:436 ../../include/conversation.php:886 +#: ../../include/Contact.php:468 ../../include/conversation.php:919 msgid "Send PM" msgstr "Отправить личное сообщение" @@ -348,7 +352,7 @@ msgid "RSS/Atom" msgstr "RSS/Atom" #: ../../include/contact_selectors.php:77 ../../mod/admin.php:636 -#: ../../mod/admin.php:645 ../../boot.php:1364 +#: ../../mod/admin.php:645 ../../boot.php:1422 msgid "Email" msgstr "E-mail" @@ -378,7 +382,7 @@ msgstr "MySpace" #: ../../include/contact_widgets.php:6 msgid "Add New Connection" -msgstr "Добавить новый канал" +msgstr "Добавить новый контакт" #: ../../include/contact_widgets.php:7 msgid "Enter the channel address" @@ -392,9 +396,9 @@ msgstr "Пример: bob@example.com, http://example.com/barbara" #, php-format msgid "%d invitation available" msgid_plural "%d invitations available" -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" +msgstr[0] "имеется %d приглашение" +msgstr[1] "имеются %d приглашения" +msgstr[2] "имеется %d приглашений" #: ../../include/contact_widgets.php:29 msgid "Find Channels" @@ -406,20 +410,20 @@ msgstr "Впишите имя или интерес" #: ../../include/contact_widgets.php:31 msgid "Connect/Follow" -msgstr "Добавить/следовать" +msgstr "Подключить/следовать" #: ../../include/contact_widgets.php:32 msgid "Examples: Robert Morgenstein, Fishing" msgstr "Примеры: Владимир Ильич, Революционер" #: ../../include/contact_widgets.php:33 ../../mod/directory.php:182 -#: ../../mod/directory.php:187 ../../mod/connections.php:656 +#: ../../mod/directory.php:187 ../../mod/connections.php:666 msgid "Find" msgstr "Поиск" #: ../../include/contact_widgets.php:34 ../../mod/suggest.php:64 msgid "Channel Suggestions" -msgstr "Рекомендации каналов" +msgstr "Рекомендации контактов" #: ../../include/contact_widgets.php:35 msgid "Similar Interests" @@ -549,7 +553,7 @@ msgid "Finishes:" msgstr "\t\nКонец:" #: ../../include/event.php:40 ../../include/bb2diaspora.php:455 -#: ../../mod/events.php:450 ../../mod/directory.php:138 ../../boot.php:1676 +#: ../../mod/events.php:450 ../../mod/directory.php:138 ../../boot.php:1737 msgid "Location:" msgstr "Откуда:" @@ -557,54 +561,56 @@ msgstr "Откуда:" msgid "General Features" msgstr "Главные функции" -#: ../../include/features.php:22 -msgid "Content Expiration" -msgstr "" - -#: ../../include/features.php:22 -msgid "Remove old posts/comments after a period of time" -msgstr "" - -#: ../../include/features.php:23 +#: ../../include/features.php:24 msgid "Multiple Profiles" msgstr "Несколько профилей" -#: ../../include/features.php:23 +#: ../../include/features.php:24 msgid "Ability to create multiple profiles" -msgstr "" +msgstr "Возможность создания нескольких профилей" -#: ../../include/features.php:24 +#: ../../include/features.php:25 msgid "Web Pages" msgstr "Веб-страницы" -#: ../../include/features.php:24 +#: ../../include/features.php:25 msgid "Provide managed web pages on your channel" msgstr "" -#: ../../include/features.php:25 +#: ../../include/features.php:26 msgid "Enhanced Photo Albums" msgstr "Расширенные фотоальбомы" -#: ../../include/features.php:25 +#: ../../include/features.php:26 msgid "Enable photo album with enhanced features" -msgstr "" +msgstr "Включить фотоальбом с расширенными функциями" -#: ../../include/features.php:27 +#: ../../include/features.php:28 msgid "Extended Identity Sharing" -msgstr "" +msgstr "Расширенный обмен идентичности" -#: ../../include/features.php:27 ../../include/js_strings.php:28 +#: ../../include/features.php:28 ../../include/js_strings.php:28 msgid " " msgstr " " -#: ../../include/features.php:28 +#: ../../include/features.php:29 msgid "Expert Mode" msgstr "Экспертный режим" -#: ../../include/features.php:28 +#: ../../include/features.php:29 msgid "Enable Expert Mode to provide advanced configuration options" msgstr "" +#: ../../include/features.php:30 +msgid "Premium Channel" +msgstr "" + +#: ../../include/features.php:30 +msgid "" +"Allows you to set restrictions and terms on those that connect with your " +"channel" +msgstr "" + #: ../../include/features.php:35 msgid "Post Composition Features" msgstr "" @@ -623,7 +629,7 @@ msgstr "Предварительный просмотр сообщения" #: ../../include/features.php:37 msgid "Allow previewing posts and comments before publishing them" -msgstr "" +msgstr "Разрешить предварительный просмотр сообщений и комментариев перед их публикацией" #: ../../include/features.php:42 msgid "Network and Stream Filtering" @@ -635,7 +641,7 @@ msgstr "Поиск по дате" #: ../../include/features.php:43 msgid "Ability to select posts by date ranges" -msgstr "" +msgstr "Возможность выбора сообщений по датам" #: ../../include/features.php:44 msgid "Collections Filter" @@ -645,14 +651,14 @@ msgstr "Фильтр коллекций" msgid "Enable widget to display Network posts only from selected collections" msgstr "" -#: ../../include/features.php:45 ../../mod/network.php:167 +#: ../../include/features.php:45 ../../mod/network.php:150 #: ../../mod/search.php:17 msgid "Saved Searches" msgstr "Запомненные поиски" #: ../../include/features.php:45 msgid "Save search terms for re-use" -msgstr "" +msgstr "Сохранять результаты поиска для повторного использования" #: ../../include/features.php:46 msgid "Network Personal Tab" @@ -680,7 +686,7 @@ msgstr "" #: ../../include/features.php:53 msgid "Post/Comment Tools" -msgstr "" +msgstr "Инструменты сообщений/комментарий " #: ../../include/features.php:54 msgid "Multiple Deletion" @@ -688,7 +694,7 @@ msgstr "Множественное удаление" #: ../../include/features.php:54 msgid "Select and delete multiple posts/comments at once" -msgstr "" +msgstr "Выбор и удаление нескольких сообщений/комментариев сразу" #: ../../include/features.php:55 msgid "Edit Sent Posts" @@ -696,7 +702,7 @@ msgstr "Редактировать отправленные сообщения" #: ../../include/features.php:55 msgid "Edit and correct posts and comments after sending" -msgstr "" +msgstr "Редактировать и исправлять сообщения и комментарии после отправки" #: ../../include/features.php:56 msgid "Tagging" @@ -712,7 +718,7 @@ msgstr "Категории сообщения" #: ../../include/features.php:57 msgid "Add categories to your posts" -msgstr "" +msgstr "Добавить категории для ваших сообщений" #: ../../include/features.php:58 msgid "Ability to file posts under folders" @@ -755,9 +761,9 @@ msgstr "" #: ../../include/group.php:242 msgid "All Channels" -msgstr "Все каналы" +msgstr "Все контакты" -#: ../../include/group.php:264 +#: ../../include/group.php:264 ../../include/page_widgets.php:8 msgid "edit" msgstr "редактировать" @@ -775,9 +781,9 @@ msgstr "Создать новую коллекцию" #: ../../include/group.php:288 msgid "Channels not in any collection" -msgstr "Каналы не в какой коллекции" +msgstr "Контакты не в какой коллекции" -#: ../../include/group.php:290 ../../mod/network.php:168 +#: ../../include/group.php:290 ../../mod/network.php:151 msgid "add" msgstr "добавить" @@ -786,8 +792,7 @@ msgid "Delete this item?" msgstr "Удалить этот элемент?" #: ../../include/js_strings.php:6 ../../include/ItemObject.php:504 -#: ../../mod/photos.php:1069 ../../mod/photos.php:1107 -#: ../../mod/photos.php:1134 +#: ../../mod/photos.php:1073 ../../mod/photos.php:1157 msgid "Comment" msgstr "Комментарий" @@ -821,7 +826,7 @@ msgstr "тому назад" #: ../../include/js_strings.php:16 msgid "from now" -msgstr "" +msgstr "с этого времени" #: ../../include/js_strings.php:17 msgid "less than a minute" @@ -876,19 +881,19 @@ msgstr "%d лет" msgid "timeago.numbers" msgstr "timeago.numbers" -#: ../../include/message.php:17 +#: ../../include/message.php:18 msgid "No recipient provided." msgstr "" -#: ../../include/message.php:22 +#: ../../include/message.php:23 msgid "[no subject]" msgstr "[без темы]" -#: ../../include/message.php:37 +#: ../../include/message.php:38 msgid "Unable to determine sender." -msgstr "" +msgstr "Невозможно определить отправителя." -#: ../../include/message.php:106 +#: ../../include/message.php:138 msgid "Stored post could not be verified." msgstr "" @@ -897,7 +902,7 @@ msgid "view full size" msgstr "посмотреть в полный размер" #: ../../include/photo/photo_driver.php:609 ../../include/photos.php:51 -#: ../../mod/photos.php:97 ../../mod/photos.php:754 ../../mod/photos.php:776 +#: ../../mod/photos.php:97 ../../mod/photos.php:755 ../../mod/photos.php:777 #: ../../mod/profile_photo.php:88 ../../mod/profile_photo.php:235 #: ../../mod/profile_photo.php:346 msgid "Profile Photos" @@ -908,12 +913,12 @@ msgstr "Фотографии профиля" msgid "Profile" msgstr "Профиль" -#: ../../include/profile_advanced.php:15 ../../mod/settings.php:1018 +#: ../../include/profile_advanced.php:15 ../../mod/settings.php:1031 msgid "Full Name:" msgstr "Полное имя:" #: ../../include/profile_advanced.php:17 ../../mod/directory.php:140 -#: ../../boot.php:1678 +#: ../../boot.php:1739 msgid "Gender:" msgstr "Пол:" @@ -934,7 +939,7 @@ msgid "Age:" msgstr "Возраст:" #: ../../include/profile_advanced.php:37 ../../mod/directory.php:142 -#: ../../boot.php:1679 +#: ../../boot.php:1740 msgid "Status:" msgstr "Статус:" @@ -948,7 +953,7 @@ msgid "Sexual Preference:" msgstr "Сексуальная ориентация:" #: ../../include/profile_advanced.php:48 ../../mod/directory.php:144 -#: ../../boot.php:1680 +#: ../../boot.php:1741 msgid "Homepage:" msgstr "Домашняя страница:" @@ -1016,25 +1021,7 @@ msgstr "Работа / Занятость:" msgid "School/education:" msgstr "Школа / образование:" -#: ../../include/security.php:48 -msgid "Welcome " -msgstr "Добро пожаловать" - -#: ../../include/security.php:49 -msgid "Please upload a profile photo." -msgstr "Загрузите пожалуйста фотографию профиля." - -#: ../../include/security.php:52 -msgid "Welcome back " -msgstr "Добро пожаловать" - -#: ../../include/security.php:355 -msgid "" -"The form security token was not correct. This probably happened because the " -"form has been opened for too long (>3 hours) before submitting it." -msgstr "" - -#: ../../include/nav.php:71 ../../include/nav.php:86 ../../boot.php:1361 +#: ../../include/nav.php:71 ../../include/nav.php:86 ../../boot.php:1419 msgid "Logout" msgstr "Выход" @@ -1063,7 +1050,7 @@ msgstr "Редактирование профилей" msgid "Manage/Edit Profiles" msgstr "Управление / Редактирование профилей" -#: ../../include/nav.php:78 ../../mod/fbrowser.php:25 ../../boot.php:2097 +#: ../../include/nav.php:78 ../../mod/fbrowser.php:25 ../../boot.php:2180 msgid "Photos" msgstr "Фотографии" @@ -1071,7 +1058,7 @@ msgstr "Фотографии" msgid "Your photos" msgstr "Ваши фотографии" -#: ../../include/nav.php:84 ../../boot.php:1362 +#: ../../include/nav.php:84 ../../boot.php:1420 msgid "Login" msgstr "Войти" @@ -1092,7 +1079,7 @@ msgstr "" msgid "Home Page" msgstr "Моя страница" -#: ../../include/nav.php:120 ../../mod/register.php:181 ../../boot.php:1337 +#: ../../include/nav.php:120 ../../mod/register.php:187 ../../boot.php:1395 msgid "Register" msgstr "Регистрация" @@ -1116,8 +1103,8 @@ msgstr "Приложения" msgid "Addon applications, utilities, games" msgstr "" -#: ../../include/nav.php:130 ../../include/text.php:701 -#: ../../include/text.php:702 ../../mod/search.php:96 +#: ../../include/nav.php:130 ../../include/text.php:729 +#: ../../include/text.php:730 ../../mod/search.php:96 msgid "Search" msgstr "Поиск" @@ -1159,11 +1146,11 @@ msgstr "Пометить все оповещения канала как про #: ../../include/nav.php:153 msgid "Intros" -msgstr "Каналы" +msgstr "Контакты" -#: ../../include/nav.php:153 ../../mod/connections.php:544 +#: ../../include/nav.php:153 ../../mod/connections.php:554 msgid "New Connections" -msgstr "Новые каналы" +msgstr "Новые контакты" #: ../../include/nav.php:154 msgid "See all channel introductions" @@ -1211,9 +1198,9 @@ msgstr "Исходящие" #: ../../include/nav.php:166 ../../mod/message.php:21 msgid "New Message" -msgstr "Новое сообщение" +msgstr "Новое личное сообщение" -#: ../../include/nav.php:169 ../../mod/events.php:348 ../../boot.php:2108 +#: ../../include/nav.php:169 ../../mod/events.php:348 ../../boot.php:2191 msgid "Events" msgstr "Мероприятия" @@ -1237,7 +1224,7 @@ msgstr "Выбор канала" msgid "Manage Your Channels" msgstr "Управление каналов" -#: ../../include/nav.php:175 ../../mod/settings.php:107 +#: ../../include/nav.php:175 ../../mod/settings.php:120 #: ../../mod/admin.php:728 ../../mod/admin.php:933 msgid "Settings" msgstr "Настройки" @@ -1246,13 +1233,13 @@ msgstr "Настройки" msgid "Account/Channel Settings" msgstr "Настройки аккаунта/канала" -#: ../../include/nav.php:177 ../../mod/connections.php:650 +#: ../../include/nav.php:177 ../../mod/connections.php:660 msgid "Connections" -msgstr "Связи" +msgstr "Контакты" #: ../../include/nav.php:177 msgid "Manage/Edit Friends and Connections" -msgstr "" +msgstr "Управление/Редактирование друзей и связей" #: ../../include/nav.php:184 ../../mod/admin.php:106 msgid "Admin" @@ -1277,7 +1264,7 @@ msgstr "создал новое сообщение" #: ../../include/notify.php:24 #, php-format msgid "commented on %s's post" -msgstr "" +msgstr "прокомментировал %s's сообщение" #: ../../include/oembed.php:148 msgid "Embedded content" @@ -1291,23 +1278,27 @@ msgstr "" #: ../../include/attach.php:133 ../../include/attach.php:189 #: ../../include/attach.php:204 ../../include/attach.php:237 #: ../../include/attach.php:251 ../../include/attach.php:272 -#: ../../include/attach.php:464 ../../include/items.php:3274 +#: ../../include/attach.php:464 ../../include/items.php:3336 #: ../../mod/common.php:43 ../../mod/events.php:134 ../../mod/invite.php:13 -#: ../../mod/invite.php:102 ../../mod/allfriends.php:10 ../../mod/api.php:26 -#: ../../mod/api.php:31 ../../mod/lastpost.php:93 ../../mod/page.php:31 -#: ../../mod/setup.php:181 ../../mod/settings.php:585 -#: ../../mod/viewconnections.php:33 ../../mod/viewconnections.php:38 -#: ../../mod/delegate.php:6 ../../mod/group.php:15 ../../mod/photos.php:74 -#: ../../mod/photos.php:644 ../../mod/viewsrc.php:12 ../../mod/message.php:204 -#: ../../mod/item.php:151 ../../mod/network.php:7 ../../mod/intro.php:50 -#: ../../mod/connections.php:165 ../../mod/profiles.php:163 +#: ../../mod/invite.php:102 ../../mod/allfriends.php:10 +#: ../../mod/webpages.php:40 ../../mod/api.php:26 ../../mod/api.php:31 +#: ../../mod/lastpost.php:93 ../../mod/page.php:30 ../../mod/setup.php:181 +#: ../../mod/settings.php:598 ../../mod/viewconnections.php:33 +#: ../../mod/viewconnections.php:38 ../../mod/delegate.php:6 +#: ../../mod/mitem.php:92 ../../mod/group.php:15 ../../mod/photos.php:74 +#: ../../mod/photos.php:645 ../../mod/viewsrc.php:12 ../../mod/menu.php:40 +#: ../../mod/message.php:204 ../../mod/layouts.php:27 ../../mod/layouts.php:42 +#: ../../mod/item.php:152 ../../mod/network.php:7 ../../mod/intro.php:50 +#: ../../mod/connections.php:174 ../../mod/profiles.php:163 #: ../../mod/profiles.php:476 ../../mod/new_channel.php:66 #: ../../mod/new_channel.php:97 ../../mod/manage.php:6 -#: ../../mod/crepair.php:115 ../../mod/nogroup.php:25 -#: ../../mod/profile_photo.php:197 ../../mod/profile_photo.php:210 -#: ../../mod/editwebpage.php:48 ../../mod/notifications.php:66 -#: ../../mod/editpost.php:11 ../../mod/poke.php:128 ../../mod/channel.php:115 -#: ../../mod/fsuggest.php:78 ../../mod/suggest.php:32 +#: ../../mod/crepair.php:115 ../../mod/editlayout.php:49 +#: ../../mod/nogroup.php:25 ../../mod/profile_photo.php:197 +#: ../../mod/profile_photo.php:210 ../../mod/editwebpage.php:43 +#: ../../mod/editwebpage.php:65 ../../mod/notifications.php:66 +#: ../../mod/blocks.php:29 ../../mod/blocks.php:44 ../../mod/editpost.php:13 +#: ../../mod/poke.php:128 ../../mod/channel.php:115 ../../mod/fsuggest.php:78 +#: ../../mod/editblock.php:49 ../../mod/suggest.php:32 #: ../../mod/register.php:60 ../../mod/regmod.php:18 ../../mod/mood.php:112 #: ../../index.php:178 ../../index.php:340 msgid "Permission denied." @@ -1330,12 +1321,12 @@ msgstr "" msgid "Photo storage failed." msgstr "" -#: ../../include/photos.php:287 ../../boot.php:2100 +#: ../../include/photos.php:287 ../../boot.php:2183 msgid "Photo Albums" msgstr "Фотоальбомы" -#: ../../include/photos.php:291 ../../mod/photos.php:792 -#: ../../mod/photos.php:1287 +#: ../../include/photos.php:291 ../../mod/photos.php:793 +#: ../../mod/photos.php:1267 msgid "Upload New Photos" msgstr "Загрузить новые фотографии" @@ -1483,8 +1474,8 @@ msgstr "Неверный" msgid "Sex Addict" msgstr "Секс наркоман" -#: ../../include/profile_selectors.php:42 ../../include/identity.php:224 -#: ../../mod/network.php:381 ../../mod/connections.php:367 +#: ../../include/profile_selectors.php:42 ../../include/identity.php:236 +#: ../../mod/network.php:364 ../../mod/connections.php:377 msgid "Friends" msgstr "Друзья" @@ -1526,7 +1517,7 @@ msgstr "Счастливый" #: ../../include/profile_selectors.php:42 msgid "Not looking" -msgstr "" +msgstr "Не нуждаюсь" #: ../../include/profile_selectors.php:42 msgid "Swinger" @@ -1572,62 +1563,6 @@ msgstr "Не заботьтесь" msgid "Ask me" msgstr "Спроси меня" -#: ../../include/account.php:22 -msgid "Not a valid email address" -msgstr "Не действительный адрес электронной почты" - -#: ../../include/account.php:24 -msgid "Your email domain is not among those allowed on this site" -msgstr "Домен электронной почты не входит в число тех, которые разрешены на этом сайте" - -#: ../../include/account.php:30 -msgid "Your email address is already registered at this site." -msgstr "Ваш адрес электронной почты уже зарегистрирован на этом сайте." - -#: ../../include/account.php:63 -msgid "An invitation is required." -msgstr "Требуется приглашение." - -#: ../../include/account.php:67 -msgid "Invitation could not be verified." -msgstr "Не удалось проверить приглашение." - -#: ../../include/account.php:117 -msgid "Please enter the required information." -msgstr "Пожалуйста, введите необходимую информацию." - -#: ../../include/account.php:185 -msgid "Failed to store account information." -msgstr "Не удалось сохранить информацию аккаунта." - -#: ../../include/account.php:271 -#, php-format -msgid "Registration request at %s" -msgstr "Требуется регистрация на %s" - -#: ../../include/account.php:273 ../../include/account.php:300 -#: ../../include/account.php:357 ../../boot.php:1202 -msgid "Administrator" -msgstr "Администратор" - -#: ../../include/account.php:295 -msgid "your registration password" -msgstr "Ваш пароль регистрации" - -#: ../../include/account.php:298 ../../include/account.php:355 -#, php-format -msgid "Registration details for %s" -msgstr "Регистрационные данные для %s" - -#: ../../include/account.php:364 -msgid "Account approved." -msgstr "Аккаунт утвержден." - -#: ../../include/account.php:398 -#, php-format -msgid "Registration revoked for %s" -msgstr "Регистрация отозвана для %s" - #: ../../include/identity.php:14 msgid "Unable to obtain identity information from database" msgstr "Невозможно получить идентификационную информацию из базы данных" @@ -1649,11 +1584,11 @@ msgid "" "Nickname has unsupported characters or is already being used on this site." msgstr "Псевдоним имеет недопустимые символы или уже используется на этом сайте." -#: ../../include/identity.php:143 +#: ../../include/identity.php:154 msgid "Unable to retrieve created identity" msgstr "" -#: ../../include/identity.php:199 +#: ../../include/identity.php:211 msgid "Default Profile" msgstr "Профиль по умолчанию" @@ -1677,40 +1612,118 @@ msgstr "" msgid "Unable to verify channel signature" msgstr "Невозможно проверить сигнатуру канала" -#: ../../include/zot.php:560 +#: ../../include/zot.php:572 #, php-format msgid "Unable to verify site signature for %s" msgstr "" -#: ../../include/text.php:281 +#: ../../include/account.php:23 +msgid "Not a valid email address" +msgstr "Не действительный адрес электронной почты" + +#: ../../include/account.php:25 +msgid "Your email domain is not among those allowed on this site" +msgstr "Домен электронной почты не входит в число тех, которые разрешены на этом сайте" + +#: ../../include/account.php:31 +msgid "Your email address is already registered at this site." +msgstr "Ваш адрес электронной почты уже зарегистрирован на этом сайте." + +#: ../../include/account.php:64 +msgid "An invitation is required." +msgstr "Требуется приглашение." + +#: ../../include/account.php:68 +msgid "Invitation could not be verified." +msgstr "Не удалось проверить приглашение." + +#: ../../include/account.php:118 +msgid "Please enter the required information." +msgstr "Пожалуйста, введите необходимую информацию." + +#: ../../include/account.php:186 +msgid "Failed to store account information." +msgstr "Не удалось сохранить информацию аккаунта." + +#: ../../include/account.php:272 +#, php-format +msgid "Registration request at %s" +msgstr "Требуется регистрация на %s" + +#: ../../include/account.php:274 ../../include/account.php:301 +#: ../../include/account.php:358 ../../boot.php:1240 +msgid "Administrator" +msgstr "Администратор" + +#: ../../include/account.php:296 +msgid "your registration password" +msgstr "Ваш пароль регистрации" + +#: ../../include/account.php:299 ../../include/account.php:356 +#, php-format +msgid "Registration details for %s" +msgstr "Регистрационные данные для %s" + +#: ../../include/account.php:365 +msgid "Account approved." +msgstr "Аккаунт утвержден." + +#: ../../include/account.php:399 +#, php-format +msgid "Registration revoked for %s" +msgstr "Регистрация отозвана для %s" + +#: ../../include/bbcode.php:94 ../../include/bbcode.php:443 +#: ../../include/bbcode.php:446 +msgid "Image/photo" +msgstr "Изображение / фото" + +#: ../../include/bbcode.php:161 +#, php-format +msgid "%1$s wrote the following %2$s %3$s" +msgstr "%1$s написал следующее %2$s %3$s" + +#: ../../include/bbcode.php:163 +msgid "post" +msgstr "сообщение" + +#: ../../include/bbcode.php:403 ../../include/bbcode.php:423 +msgid "$1 wrote:" +msgstr "$1 писал:" + +#: ../../include/bbcode.php:450 ../../include/bbcode.php:451 +msgid "Encrypted content" +msgstr "Зашифрованное содержание" + +#: ../../include/text.php:309 msgid "prev" msgstr "предыдущий" -#: ../../include/text.php:283 +#: ../../include/text.php:311 msgid "first" msgstr "первый" -#: ../../include/text.php:312 +#: ../../include/text.php:340 msgid "last" msgstr "последний" -#: ../../include/text.php:315 +#: ../../include/text.php:343 msgid "next" msgstr "следующий" -#: ../../include/text.php:327 +#: ../../include/text.php:355 msgid "older" msgstr "старший" -#: ../../include/text.php:329 +#: ../../include/text.php:357 msgid "newer" msgstr "новее" -#: ../../include/text.php:620 +#: ../../include/text.php:648 msgid "No connections" msgstr "Нет каналов" -#: ../../include/text.php:631 +#: ../../include/text.php:659 #, php-format msgid "%d Connection" msgid_plural "%d Connections" @@ -1718,292 +1731,324 @@ msgstr[0] "%d канал" msgstr[1] "%d канала" msgstr[2] "%d каналов" -#: ../../include/text.php:643 +#: ../../include/text.php:671 msgid "View Connections" -msgstr "Просмотр открытых каналов" +msgstr "Просмотр контактов" -#: ../../include/text.php:704 ../../mod/filer.php:36 +#: ../../include/text.php:732 ../../mod/filer.php:36 msgid "Save" msgstr "Запомнить" -#: ../../include/text.php:742 +#: ../../include/text.php:770 msgid "poke" msgstr "подпихнуть" -#: ../../include/text.php:742 ../../include/conversation.php:227 +#: ../../include/text.php:770 ../../include/conversation.php:236 msgid "poked" msgstr "подпихнул" -#: ../../include/text.php:743 +#: ../../include/text.php:771 msgid "ping" msgstr "" -#: ../../include/text.php:743 +#: ../../include/text.php:771 msgid "pinged" msgstr "" -#: ../../include/text.php:744 +#: ../../include/text.php:772 msgid "prod" msgstr "" -#: ../../include/text.php:744 +#: ../../include/text.php:772 msgid "prodded" msgstr "" -#: ../../include/text.php:745 +#: ../../include/text.php:773 msgid "slap" msgstr "" -#: ../../include/text.php:745 +#: ../../include/text.php:773 msgid "slapped" msgstr "" -#: ../../include/text.php:746 +#: ../../include/text.php:774 msgid "finger" msgstr "" -#: ../../include/text.php:746 +#: ../../include/text.php:774 msgid "fingered" msgstr "" -#: ../../include/text.php:747 +#: ../../include/text.php:775 msgid "rebuff" msgstr "" -#: ../../include/text.php:747 +#: ../../include/text.php:775 msgid "rebuffed" msgstr "" -#: ../../include/text.php:759 +#: ../../include/text.php:787 msgid "happy" -msgstr "" +msgstr "счастливый" -#: ../../include/text.php:760 +#: ../../include/text.php:788 msgid "sad" msgstr "" -#: ../../include/text.php:761 +#: ../../include/text.php:789 msgid "mellow" msgstr "" -#: ../../include/text.php:762 +#: ../../include/text.php:790 msgid "tired" msgstr "" -#: ../../include/text.php:763 +#: ../../include/text.php:791 msgid "perky" msgstr "" -#: ../../include/text.php:764 +#: ../../include/text.php:792 msgid "angry" -msgstr "" +msgstr "сердитый" -#: ../../include/text.php:765 +#: ../../include/text.php:793 msgid "stupified" msgstr "" -#: ../../include/text.php:766 +#: ../../include/text.php:794 msgid "puzzled" msgstr "" -#: ../../include/text.php:767 +#: ../../include/text.php:795 msgid "interested" msgstr "" -#: ../../include/text.php:768 +#: ../../include/text.php:796 msgid "bitter" -msgstr "" +msgstr "озлобленный" -#: ../../include/text.php:769 +#: ../../include/text.php:797 msgid "cheerful" msgstr "" -#: ../../include/text.php:770 +#: ../../include/text.php:798 msgid "alive" msgstr "" -#: ../../include/text.php:771 +#: ../../include/text.php:799 msgid "annoyed" msgstr "" -#: ../../include/text.php:772 +#: ../../include/text.php:800 msgid "anxious" msgstr "" -#: ../../include/text.php:773 +#: ../../include/text.php:801 msgid "cranky" -msgstr "" +msgstr "капризный" -#: ../../include/text.php:774 +#: ../../include/text.php:802 msgid "disturbed" -msgstr "" +msgstr "встревоженный" -#: ../../include/text.php:775 +#: ../../include/text.php:803 msgid "frustrated" -msgstr "" +msgstr "разочарованный" -#: ../../include/text.php:776 +#: ../../include/text.php:804 msgid "motivated" -msgstr "" +msgstr "мотивированный" -#: ../../include/text.php:777 +#: ../../include/text.php:805 msgid "relaxed" -msgstr "" +msgstr "расслабленный" -#: ../../include/text.php:778 +#: ../../include/text.php:806 msgid "surprised" -msgstr "" +msgstr "удивленный" -#: ../../include/text.php:940 +#: ../../include/text.php:968 msgid "Monday" msgstr "Понедельник" -#: ../../include/text.php:940 +#: ../../include/text.php:968 msgid "Tuesday" msgstr "Вторник" -#: ../../include/text.php:940 +#: ../../include/text.php:968 msgid "Wednesday" msgstr "Среда" -#: ../../include/text.php:940 +#: ../../include/text.php:968 msgid "Thursday" msgstr "Четверг" -#: ../../include/text.php:940 +#: ../../include/text.php:968 msgid "Friday" msgstr "Пятница" -#: ../../include/text.php:940 +#: ../../include/text.php:968 msgid "Saturday" msgstr "Суббота" -#: ../../include/text.php:940 +#: ../../include/text.php:968 msgid "Sunday" msgstr "Воскресенье" -#: ../../include/text.php:944 +#: ../../include/text.php:972 msgid "January" msgstr "Январь" -#: ../../include/text.php:944 +#: ../../include/text.php:972 msgid "February" msgstr "Февраль" -#: ../../include/text.php:944 +#: ../../include/text.php:972 msgid "March" msgstr "Март" -#: ../../include/text.php:944 +#: ../../include/text.php:972 msgid "April" msgstr "Апрель" -#: ../../include/text.php:944 +#: ../../include/text.php:972 msgid "May" msgstr "Май" -#: ../../include/text.php:944 +#: ../../include/text.php:972 msgid "June" msgstr "Июнь" -#: ../../include/text.php:944 +#: ../../include/text.php:972 msgid "July" msgstr "Июль" -#: ../../include/text.php:944 +#: ../../include/text.php:972 msgid "August" msgstr "Август" -#: ../../include/text.php:944 +#: ../../include/text.php:972 msgid "September" msgstr "Сентябрь" -#: ../../include/text.php:944 +#: ../../include/text.php:972 msgid "October" msgstr "Октябрь" -#: ../../include/text.php:944 +#: ../../include/text.php:972 msgid "November" msgstr "Ноябрь" -#: ../../include/text.php:944 +#: ../../include/text.php:972 msgid "December" msgstr "Декабрь" -#: ../../include/text.php:1029 +#: ../../include/text.php:1057 ../../mod/message.php:400 msgid "unknown.???" msgstr "неизвестный.???" -#: ../../include/text.php:1030 +#: ../../include/text.php:1058 ../../mod/message.php:401 msgid "bytes" msgstr "байт" -#: ../../include/text.php:1066 ../../include/text.php:1081 -#: ../../include/conversation.php:787 +#: ../../include/text.php:1094 ../../include/text.php:1109 +#: ../../include/conversation.php:820 msgid "remove" msgstr "удалить" -#: ../../include/text.php:1066 ../../include/text.php:1081 +#: ../../include/text.php:1094 ../../include/text.php:1109 msgid "[remove]" msgstr "[удалить]" -#: ../../include/text.php:1069 ../../include/conversation.php:649 +#: ../../include/text.php:1097 ../../include/conversation.php:667 msgid "Categories:" msgstr "Категории:" -#: ../../include/text.php:1084 ../../include/conversation.php:650 +#: ../../include/text.php:1112 ../../include/conversation.php:668 msgid "Filed under:" msgstr "Хранить под:" -#: ../../include/text.php:1100 ../../include/text.php:1112 +#: ../../include/text.php:1128 ../../include/text.php:1140 msgid "Click to open/close" msgstr "Нажмите, чтобы открыть/закрыть" -#: ../../include/text.php:1264 ../../mod/events.php:326 +#: ../../include/text.php:1311 ../../mod/events.php:326 msgid "link to source" msgstr "ссылка на источник" -#: ../../include/text.php:1296 +#: ../../include/text.php:1330 +msgid "Select a page layout: " +msgstr "" + +#: ../../include/text.php:1333 ../../include/text.php:1398 msgid "default" msgstr "по умолчанию" -#: ../../include/text.php:1308 +#: ../../include/text.php:1369 +msgid "Page content type: " +msgstr "" + +#: ../../include/text.php:1410 msgid "Select an alternate language" msgstr "Выбор альтернативного языка" -#: ../../include/text.php:1460 ../../include/conversation.php:111 +#: ../../include/text.php:1562 ../../include/conversation.php:117 #: ../../mod/like.php:103 ../../mod/subthread.php:89 ../../mod/tagger.php:45 msgid "photo" msgstr "фото" -#: ../../include/text.php:1463 ../../include/conversation.php:114 +#: ../../include/text.php:1565 ../../include/conversation.php:120 #: ../../mod/tagger.php:49 msgid "event" msgstr "мероприятие" -#: ../../include/text.php:1466 ../../include/conversation.php:139 +#: ../../include/text.php:1568 ../../include/conversation.php:145 #: ../../mod/like.php:103 ../../mod/subthread.php:89 ../../mod/tagger.php:53 msgid "status" msgstr "статус" -#: ../../include/text.php:1468 ../../include/conversation.php:141 +#: ../../include/text.php:1570 ../../include/conversation.php:147 #: ../../mod/tagger.php:55 msgid "comment" msgstr "комментарий" -#: ../../include/text.php:1473 +#: ../../include/text.php:1575 msgid "activity" msgstr "активность" -#: ../../include/auth.php:65 +#: ../../include/text.php:1836 +msgid "Design" +msgstr "" + +#: ../../include/text.php:1837 +msgid "Blocks" +msgstr "" + +#: ../../include/text.php:1838 +msgid "Menus" +msgstr "" + +#: ../../include/text.php:1839 +msgid "Layouts" +msgstr "" + +#: ../../include/text.php:1840 +msgid "Pages" +msgstr "" + +#: ../../include/page_widgets.php:6 +msgid "New Page" +msgstr "" + +#: ../../include/auth.php:66 msgid "Logged out." msgstr "Вышел из системы." -#: ../../include/auth.php:177 +#: ../../include/auth.php:178 msgid "Failed authentication" msgstr "Ошибка аутентификации" -#: ../../include/auth.php:186 +#: ../../include/auth.php:187 msgid "Login failed." msgstr "Не удалось войти." @@ -2027,11 +2072,11 @@ msgstr "" msgid "Response from remote channel was incomplete." msgstr "" -#: ../../include/follow.php:124 +#: ../../include/follow.php:129 msgid "local account not found." msgstr "локальный аккаунт не найден." -#: ../../include/follow.php:133 +#: ../../include/follow.php:138 msgid "Cannot connect to yourself." msgstr "Нельзя подключиться к самому себе." @@ -2089,11 +2134,11 @@ msgstr "" #: ../../include/permissions.php:27 msgid "Can chat with me (when available)" -msgstr "" +msgstr "Можете общаться со мной в чате (при наличии)" #: ../../include/permissions.php:27 msgid "Requires compatible chat plugin" -msgstr "" +msgstr "Требуется совместимый чат-плагин" #: ../../include/permissions.php:28 msgid "Can write to my \"public\" file storage" @@ -2181,24 +2226,26 @@ msgstr "" msgid "Path not available." msgstr "Путь недоступен." -#: ../../include/ItemObject.php:87 ../../mod/photos.php:942 +#: ../../include/ItemObject.php:87 ../../mod/photos.php:943 msgid "Private Message" msgstr "Личное сообщение" -#: ../../include/ItemObject.php:92 ../../mod/webpages.php:68 -#: ../../mod/settings.php:670 ../../mod/editwebpage.php:103 -#: ../../mod/editpost.php:76 +#: ../../include/ItemObject.php:92 ../../mod/webpages.php:98 +#: ../../mod/settings.php:683 ../../mod/menu.php:55 ../../mod/layouts.php:89 +#: ../../mod/editlayout.php:101 ../../mod/editwebpage.php:117 +#: ../../mod/blocks.php:92 ../../mod/editpost.php:94 +#: ../../mod/editblock.php:101 msgid "Edit" msgstr "Редактировать" -#: ../../include/ItemObject.php:104 ../../include/conversation.php:613 -#: ../../mod/settings.php:671 ../../mod/group.php:182 -#: ../../mod/photos.php:1162 ../../mod/admin.php:640 -#: ../../mod/connections.php:334 +#: ../../include/ItemObject.php:104 ../../include/conversation.php:631 +#: ../../mod/settings.php:684 ../../mod/group.php:182 +#: ../../mod/photos.php:1123 ../../mod/connections.php:344 +#: ../../mod/admin.php:640 msgid "Delete" msgstr "Удалить" -#: ../../include/ItemObject.php:110 ../../include/conversation.php:612 +#: ../../include/ItemObject.php:110 ../../include/conversation.php:630 msgid "Select" msgstr "Выбрать" @@ -2226,11 +2273,11 @@ msgstr "помеченные" msgid "add tag" msgstr "добавить тег" -#: ../../include/ItemObject.php:165 ../../mod/photos.php:1049 +#: ../../include/ItemObject.php:165 ../../mod/photos.php:1053 msgid "I like this (toggle)" msgstr "мне это нравится (переключение)" -#: ../../include/ItemObject.php:166 ../../mod/photos.php:1050 +#: ../../include/ItemObject.php:166 ../../mod/photos.php:1054 msgid "I don't like this (toggle)" msgstr "мне это не нравится (переключение)" @@ -2245,7 +2292,7 @@ msgstr "поделиться" #: ../../include/ItemObject.php:192 ../../include/ItemObject.php:193 #, php-format msgid "View %s's profile - %s" -msgstr "" +msgstr "Просмотр %s's профиля - %s" #: ../../include/ItemObject.php:194 msgid "to" @@ -2259,15 +2306,16 @@ msgstr "Стена-к-Стене" msgid "via Wall-To-Wall:" msgstr "через Стена-к-Стене:" -#: ../../include/ItemObject.php:206 ../../include/conversation.php:659 +#: ../../include/ItemObject.php:206 ../../include/conversation.php:677 #, php-format msgid " from %s" msgstr " от %s" -#: ../../include/ItemObject.php:233 ../../include/conversation.php:678 -#: ../../include/conversation.php:1034 ../../mod/photos.php:1052 -#: ../../mod/message.php:297 ../../mod/message.php:430 -#: ../../mod/editwebpage.php:112 ../../mod/editpost.php:85 +#: ../../include/ItemObject.php:233 ../../include/conversation.php:696 +#: ../../include/conversation.php:1092 ../../mod/photos.php:1056 +#: ../../mod/message.php:298 ../../mod/message.php:461 +#: ../../mod/editlayout.php:110 ../../mod/editwebpage.php:126 +#: ../../mod/editpost.php:103 ../../mod/editblock.php:110 msgid "Please wait" msgstr "Подождите пожалуйста" @@ -2279,26 +2327,25 @@ msgstr[0] "%d комментарий" msgstr[1] "%d комментария" msgstr[2] "%d комментариев" -#: ../../include/ItemObject.php:502 ../../mod/photos.php:1067 -#: ../../mod/photos.php:1105 ../../mod/photos.php:1132 +#: ../../include/ItemObject.php:502 ../../mod/photos.php:1071 +#: ../../mod/photos.php:1155 msgid "This is you" msgstr "Это вы" #: ../../include/ItemObject.php:505 ../../mod/events.php:458 #: ../../mod/thing.php:190 ../../mod/invite.php:153 ../../mod/setup.php:283 -#: ../../mod/setup.php:326 ../../mod/settings.php:608 -#: ../../mod/settings.php:720 ../../mod/settings.php:748 -#: ../../mod/settings.php:772 ../../mod/settings.php:843 -#: ../../mod/settings.php:1010 ../../mod/group.php:87 ../../mod/photos.php:675 -#: ../../mod/photos.php:769 ../../mod/photos.php:1031 -#: ../../mod/photos.php:1070 ../../mod/photos.php:1108 -#: ../../mod/photos.php:1135 ../../mod/message.php:298 -#: ../../mod/message.php:429 ../../mod/admin.php:409 ../../mod/admin.php:633 -#: ../../mod/admin.php:769 ../../mod/admin.php:968 ../../mod/admin.php:1055 -#: ../../mod/connections.php:411 ../../mod/profiles.php:529 -#: ../../mod/import.php:356 ../../mod/crepair.php:166 ../../mod/poke.php:166 -#: ../../mod/fsuggest.php:108 ../../mod/mood.php:135 -#: ../../view/theme/redbasic/php/config.php:136 +#: ../../mod/setup.php:326 ../../mod/settings.php:621 +#: ../../mod/settings.php:733 ../../mod/settings.php:761 +#: ../../mod/settings.php:785 ../../mod/settings.php:856 +#: ../../mod/settings.php:1023 ../../mod/connect.php:96 ../../mod/group.php:87 +#: ../../mod/photos.php:676 ../../mod/photos.php:770 ../../mod/photos.php:1035 +#: ../../mod/photos.php:1074 ../../mod/photos.php:1158 +#: ../../mod/message.php:299 ../../mod/message.php:460 +#: ../../mod/connections.php:421 ../../mod/profiles.php:529 +#: ../../mod/admin.php:409 ../../mod/admin.php:633 ../../mod/admin.php:769 +#: ../../mod/admin.php:968 ../../mod/admin.php:1055 ../../mod/import.php:381 +#: ../../mod/crepair.php:166 ../../mod/poke.php:166 ../../mod/fsuggest.php:108 +#: ../../mod/mood.php:135 ../../view/theme/redbasic/php/config.php:136 #: ../../view/theme/redbasic/php/config.php:154 #: ../../view/theme/redstrap/php/config.php:131 msgid "Submit" @@ -2336,278 +2383,286 @@ msgstr "Ссылка" msgid "Video" msgstr "Видео" -#: ../../include/ItemObject.php:514 ../../include/conversation.php:1052 -#: ../../mod/photos.php:1071 ../../mod/editwebpage.php:132 -#: ../../mod/editpost.php:105 +#: ../../include/ItemObject.php:514 ../../include/conversation.php:1112 +#: ../../mod/photos.php:1075 ../../mod/editlayout.php:130 +#: ../../mod/editwebpage.php:148 ../../mod/editpost.php:123 +#: ../../mod/editblock.php:130 msgid "Preview" msgstr "Предварительный просмотр" -#: ../../include/conversation.php:117 +#: ../../include/conversation.php:123 msgid "channel" msgstr "канал" -#: ../../include/conversation.php:155 ../../mod/like.php:133 +#: ../../include/conversation.php:161 ../../mod/like.php:134 #, php-format msgid "%1$s likes %2$s's %3$s" msgstr "%1$s нравится %2$s's %3$s" -#: ../../include/conversation.php:158 ../../mod/like.php:135 +#: ../../include/conversation.php:164 ../../mod/like.php:136 #, php-format msgid "%1$s doesn't like %2$s's %3$s" msgstr "%1$s не нравится %2$s's %3$s" -#: ../../include/conversation.php:192 +#: ../../include/conversation.php:201 #, php-format msgid "%1$s is now connected with %2$s" msgstr "%1$s теперь соединен с %2$s" -#: ../../include/conversation.php:223 +#: ../../include/conversation.php:232 #, php-format msgid "%1$s poked %2$s" msgstr "%1$s подпихнул %2$s" -#: ../../include/conversation.php:245 ../../mod/mood.php:63 +#: ../../include/conversation.php:254 ../../mod/mood.php:63 #, php-format msgid "%1$s is currently %2$s" msgstr "%1$s в настоящее время %2$s" -#: ../../include/conversation.php:637 +#: ../../include/conversation.php:655 #, php-format msgid "View %s's profile @ %s" msgstr "Просмотр %s's профиля @ %s" -#: ../../include/conversation.php:676 +#: ../../include/conversation.php:694 msgid "View in context" msgstr "Показать в контексте" -#: ../../include/conversation.php:791 +#: ../../include/conversation.php:824 msgid "Loading..." msgstr "Загрузка..." -#: ../../include/conversation.php:792 +#: ../../include/conversation.php:825 msgid "Delete Selected Items" msgstr "Удалить выбранные элементы" -#: ../../include/conversation.php:880 +#: ../../include/conversation.php:913 msgid "Follow Thread" msgstr "Следобать теме" -#: ../../include/conversation.php:949 +#: ../../include/conversation.php:982 #, php-format msgid "%s likes this." msgstr "%s нравится это." -#: ../../include/conversation.php:949 +#: ../../include/conversation.php:982 #, php-format msgid "%s doesn't like this." msgstr "%s не нравится это." -#: ../../include/conversation.php:953 +#: ../../include/conversation.php:986 #, php-format msgid "<span %1$s>%2$d people</span> like this." msgstr "<span %1$s>%2$d чел.</span> нравится это." -#: ../../include/conversation.php:955 +#: ../../include/conversation.php:988 #, php-format msgid "<span %1$s>%2$d people</span> don't like this." msgstr "<span %1$s>%2$d чел.</span> не нравится это." -#: ../../include/conversation.php:961 +#: ../../include/conversation.php:994 msgid "and" msgstr "и" -#: ../../include/conversation.php:964 +#: ../../include/conversation.php:997 #, php-format msgid ", and %d other people" msgstr ", и %d другие люди" -#: ../../include/conversation.php:965 +#: ../../include/conversation.php:998 #, php-format msgid "%s like this." msgstr "%s нравится это." -#: ../../include/conversation.php:965 +#: ../../include/conversation.php:998 #, php-format msgid "%s don't like this." msgstr "%s не нравится это." -#: ../../include/conversation.php:990 +#: ../../include/conversation.php:1048 msgid "Visible to <strong>everybody</strong>" msgstr "Видно для <strong>всех</strong>" -#: ../../include/conversation.php:991 ../../mod/message.php:253 -#: ../../mod/message.php:364 +#: ../../include/conversation.php:1049 ../../mod/message.php:253 +#: ../../mod/message.php:365 msgid "Please enter a link URL:" msgstr "Пожалуйста, введите URL ссылки:" -#: ../../include/conversation.php:992 +#: ../../include/conversation.php:1050 msgid "Please enter a video link/URL:" msgstr "Пожалуйста, введите URL видео-ссылки:" -#: ../../include/conversation.php:993 +#: ../../include/conversation.php:1051 msgid "Please enter an audio link/URL:" msgstr "Пожалуйста, введите URL аудио-ссылки:" -#: ../../include/conversation.php:994 +#: ../../include/conversation.php:1052 msgid "Tag term:" msgstr "Теги:" -#: ../../include/conversation.php:995 ../../mod/filer.php:35 +#: ../../include/conversation.php:1053 ../../mod/filer.php:35 msgid "Save to Folder:" msgstr "Сохранить в папку:" -#: ../../include/conversation.php:996 +#: ../../include/conversation.php:1054 msgid "Where are you right now?" msgstr "Где вы сейчас?" -#: ../../include/conversation.php:1011 ../../mod/photos.php:1051 +#: ../../include/conversation.php:1069 ../../mod/photos.php:1055 msgid "Share" msgstr "Поделиться" -#: ../../include/conversation.php:1013 +#: ../../include/conversation.php:1071 msgid "Page link title" msgstr "Ссылка заголовока страницы" -#: ../../include/conversation.php:1015 ../../mod/message.php:295 -#: ../../mod/message.php:427 ../../mod/editwebpage.php:104 -#: ../../mod/editpost.php:77 +#: ../../include/conversation.php:1073 ../../mod/message.php:295 +#: ../../mod/message.php:457 ../../mod/editlayout.php:102 +#: ../../mod/editwebpage.php:118 ../../mod/editpost.php:95 +#: ../../mod/editblock.php:102 msgid "Upload photo" msgstr "Загрузить фотографию" -#: ../../include/conversation.php:1016 +#: ../../include/conversation.php:1074 msgid "upload photo" msgstr "загрузить фотографию" -#: ../../include/conversation.php:1017 ../../mod/editwebpage.php:105 -#: ../../mod/editpost.php:78 +#: ../../include/conversation.php:1075 ../../mod/message.php:296 +#: ../../mod/message.php:458 ../../mod/editlayout.php:103 +#: ../../mod/editwebpage.php:119 ../../mod/editpost.php:96 +#: ../../mod/editblock.php:103 msgid "Attach file" msgstr "Прикрепить файл" -#: ../../include/conversation.php:1018 +#: ../../include/conversation.php:1076 msgid "attach file" msgstr "прикрепить файл" -#: ../../include/conversation.php:1019 ../../mod/message.php:296 -#: ../../mod/message.php:428 ../../mod/editwebpage.php:106 -#: ../../mod/editpost.php:79 +#: ../../include/conversation.php:1077 ../../mod/message.php:297 +#: ../../mod/message.php:459 ../../mod/editlayout.php:104 +#: ../../mod/editwebpage.php:120 ../../mod/editpost.php:97 +#: ../../mod/editblock.php:104 msgid "Insert web link" msgstr "Вставить веб-ссылку" -#: ../../include/conversation.php:1020 +#: ../../include/conversation.php:1078 msgid "web link" msgstr "веб-ссылка" -#: ../../include/conversation.php:1021 +#: ../../include/conversation.php:1079 msgid "Insert video link" msgstr "Вставить видео-ссылку" -#: ../../include/conversation.php:1022 +#: ../../include/conversation.php:1080 msgid "video link" msgstr "видео-ссылка" -#: ../../include/conversation.php:1023 +#: ../../include/conversation.php:1081 msgid "Insert audio link" msgstr "Вставить аудио-ссылку" -#: ../../include/conversation.php:1024 +#: ../../include/conversation.php:1082 msgid "audio link" msgstr "аудио-ссылка" -#: ../../include/conversation.php:1025 ../../mod/editwebpage.php:110 -#: ../../mod/editpost.php:83 +#: ../../include/conversation.php:1083 ../../mod/editlayout.php:108 +#: ../../mod/editwebpage.php:124 ../../mod/editpost.php:101 +#: ../../mod/editblock.php:108 msgid "Set your location" msgstr "Указание своего расположения" -#: ../../include/conversation.php:1026 +#: ../../include/conversation.php:1084 msgid "set location" msgstr "указание расположения" -#: ../../include/conversation.php:1027 ../../mod/editwebpage.php:111 -#: ../../mod/editpost.php:84 +#: ../../include/conversation.php:1085 ../../mod/editlayout.php:109 +#: ../../mod/editwebpage.php:125 ../../mod/editpost.php:102 +#: ../../mod/editblock.php:109 msgid "Clear browser location" msgstr "Стереть указание расположения" -#: ../../include/conversation.php:1028 +#: ../../include/conversation.php:1086 msgid "clear location" msgstr "стереть указание расположения" -#: ../../include/conversation.php:1030 ../../mod/editwebpage.php:124 -#: ../../mod/editpost.php:97 +#: ../../include/conversation.php:1088 ../../mod/editlayout.php:122 +#: ../../mod/editwebpage.php:140 ../../mod/editpost.php:115 +#: ../../mod/editblock.php:122 msgid "Set title" msgstr "Заголовок" -#: ../../include/conversation.php:1033 ../../mod/editwebpage.php:126 -#: ../../mod/editpost.php:99 +#: ../../include/conversation.php:1091 ../../mod/editlayout.php:124 +#: ../../mod/editwebpage.php:142 ../../mod/editpost.php:117 +#: ../../mod/editblock.php:124 msgid "Categories (comma-separated list)" msgstr "Категории (список через запятую)" -#: ../../include/conversation.php:1035 ../../mod/editwebpage.php:113 -#: ../../mod/editpost.php:86 +#: ../../include/conversation.php:1093 ../../mod/editlayout.php:111 +#: ../../mod/editwebpage.php:127 ../../mod/editpost.php:104 +#: ../../mod/editblock.php:111 msgid "Permission settings" msgstr "Настройки разрешений" -#: ../../include/conversation.php:1036 +#: ../../include/conversation.php:1094 msgid "permissions" msgstr "разрешения" -#: ../../include/conversation.php:1044 ../../mod/editwebpage.php:121 -#: ../../mod/editpost.php:94 +#: ../../include/conversation.php:1102 ../../mod/editlayout.php:119 +#: ../../mod/editwebpage.php:135 ../../mod/editpost.php:112 +#: ../../mod/editblock.php:119 msgid "Public post" msgstr "Публичное сообщение" -#: ../../include/conversation.php:1046 ../../mod/editwebpage.php:127 -#: ../../mod/editpost.php:100 +#: ../../include/conversation.php:1104 ../../mod/editlayout.php:125 +#: ../../mod/editwebpage.php:143 ../../mod/editpost.php:118 +#: ../../mod/editblock.php:125 msgid "Example: bob@example.com, mary@example.com" msgstr "Пример: bob@example.com, mary@example.com" -#: ../../include/items.php:156 ../../mod/like.php:55 ../../mod/group.php:74 +#: ../../include/items.php:157 ../../mod/like.php:55 ../../mod/group.php:74 #: ../../mod/profperm.php:28 ../../index.php:339 msgid "Permission denied" msgstr "Доступ запрещен" -#: ../../include/items.php:3223 ../../mod/page.php:62 ../../mod/viewsrc.php:18 +#: ../../include/items.php:3285 ../../mod/page.php:60 ../../mod/viewsrc.php:18 #: ../../mod/home.php:64 ../../mod/admin.php:142 ../../mod/admin.php:677 #: ../../mod/admin.php:876 ../../mod/display.php:33 msgid "Item not found." msgstr "Элемент не найден." -#: ../../include/items.php:3395 +#: ../../include/items.php:3457 msgid "Archives" msgstr "Архивы" -#: ../../include/items.php:3556 ../../mod/group.php:44 ../../mod/group.php:146 +#: ../../include/items.php:3618 ../../mod/group.php:44 ../../mod/group.php:146 msgid "Collection not found." msgstr "Коллекция не найдена." -#: ../../include/items.php:3566 +#: ../../include/items.php:3628 msgid "Collection has no members." msgstr "В коллекции нет ни одного пользователя." -#: ../../include/items.php:3582 +#: ../../include/items.php:3644 msgid "Connection not found." msgstr "Канал не найден." -#: ../../include/bbcode.php:94 ../../include/bbcode.php:442 -#: ../../include/bbcode.php:445 -msgid "Image/photo" -msgstr "Изображение / фото" - -#: ../../include/bbcode.php:161 -#, php-format -msgid "%1$s wrote the following %2$s %3$s" -msgstr "" +#: ../../include/security.php:49 +msgid "Welcome " +msgstr "Добро пожаловать" -#: ../../include/bbcode.php:163 -msgid "post" -msgstr "сообщение" +#: ../../include/security.php:50 +msgid "Please upload a profile photo." +msgstr "Загрузите пожалуйста фотографию профиля." -#: ../../include/bbcode.php:402 ../../include/bbcode.php:422 -msgid "$1 wrote:" -msgstr "$1 писал:" +#: ../../include/security.php:53 +msgid "Welcome back " +msgstr "Добро пожаловать" -#: ../../include/bbcode.php:449 ../../include/bbcode.php:450 -msgid "Encrypted content" -msgstr "Зашифрованное содержание" +#: ../../include/security.php:357 +msgid "" +"The form security token was not correct. This probably happened because the " +"form has been opened for too long (>3 hours) before submitting it." +msgstr "" #: ../../mod/common.php:10 msgid "No channel." @@ -2615,7 +2670,7 @@ msgstr "Не канал." #: ../../mod/common.php:47 msgid "Common connections" -msgstr "Общие каналы" +msgstr "Общие контакты" #: ../../mod/common.php:52 msgid "No connections in common." @@ -2774,7 +2829,7 @@ msgid "Enter email addresses, one per line:" msgstr "Введите адреса электронной почты, по одному на строку:" #: ../../mod/invite.php:141 ../../mod/message.php:292 -#: ../../mod/message.php:423 +#: ../../mod/message.php:453 msgid "Your message:" msgstr "Ваше сообщение:" @@ -2813,11 +2868,12 @@ msgstr "Друзья %s" msgid "No friends to display." msgstr "Нет друзей для показа." -#: ../../mod/webpages.php:8 ../../mod/profile.php:8 ../../boot.php:1535 +#: ../../mod/webpages.php:8 ../../mod/connect.php:13 ../../mod/layouts.php:8 +#: ../../mod/blocks.php:10 ../../mod/profile.php:8 ../../boot.php:1593 msgid "Requested profile is not available." msgstr "Запрашиваемый профиль не доступен." -#: ../../mod/webpages.php:71 +#: ../../mod/webpages.php:101 ../../mod/layouts.php:92 ../../mod/blocks.php:95 msgid "View" msgstr "Просмотр" @@ -2839,16 +2895,16 @@ msgid "" " and/or create new posts for you?" msgstr "" -#: ../../mod/api.php:105 ../../mod/settings.php:965 ../../mod/settings.php:970 -#: ../../mod/settings.php:993 ../../mod/settings.php:995 -#: ../../mod/settings.php:996 ../../mod/settings.php:997 +#: ../../mod/api.php:105 ../../mod/settings.php:978 ../../mod/settings.php:983 +#: ../../mod/settings.php:1006 ../../mod/settings.php:1008 +#: ../../mod/settings.php:1009 ../../mod/settings.php:1010 #: ../../mod/profiles.php:506 msgid "Yes" msgstr "Да" -#: ../../mod/api.php:106 ../../mod/settings.php:965 ../../mod/settings.php:970 -#: ../../mod/settings.php:993 ../../mod/settings.php:995 -#: ../../mod/settings.php:996 ../../mod/settings.php:997 +#: ../../mod/api.php:106 ../../mod/settings.php:978 ../../mod/settings.php:983 +#: ../../mod/settings.php:1006 ../../mod/settings.php:1008 +#: ../../mod/settings.php:1009 ../../mod/settings.php:1010 #: ../../mod/profiles.php:507 msgid "No" msgstr "Нет" @@ -2865,11 +2921,11 @@ msgstr "Нет установленных приложений." msgid "Applications" msgstr "Приложения" -#: ../../mod/page.php:37 +#: ../../mod/page.php:35 msgid "Invalid item." msgstr "Недействительный элемент." -#: ../../mod/page.php:49 ../../mod/chanview.php:78 ../../mod/home.php:51 +#: ../../mod/page.php:47 ../../mod/chanview.php:78 ../../mod/home.php:51 #: ../../mod/magic.php:63 ../../mod/wall_upload.php:35 msgid "Channel not found." msgstr "Канал не найден." @@ -3216,7 +3272,7 @@ msgstr "" #: ../../mod/subthread.php:105 #, php-format msgid "%1$s is following %2$s's %3$s" -msgstr "" +msgstr "%1$s следит %2$s's %3$s" #: ../../mod/update_network.php:23 ../../mod/update_channel.php:43 #: ../../mod/update_search.php:46 ../../mod/update_display.php:25 @@ -3233,428 +3289,432 @@ msgstr "переключение полноэкранного режима" msgid "%1$s tagged %2$s's %3$s with %4$s" msgstr "" -#: ../../mod/settings.php:49 +#: ../../mod/settings.php:51 msgid "Account settings" msgstr "Настройки аккаунта" -#: ../../mod/settings.php:55 +#: ../../mod/settings.php:57 msgid "Channel settings" msgstr "Настройки канала" -#: ../../mod/settings.php:61 +#: ../../mod/settings.php:63 msgid "Additional features" msgstr "Дополнительные функции" -#: ../../mod/settings.php:67 +#: ../../mod/settings.php:69 msgid "Feature settings" msgstr "Настройки компонентов" -#: ../../mod/settings.php:73 +#: ../../mod/settings.php:75 msgid "Display settings" msgstr "Настройки отображения" -#: ../../mod/settings.php:79 +#: ../../mod/settings.php:81 msgid "Connected apps" msgstr "Подключенные приложения" -#: ../../mod/settings.php:85 +#: ../../mod/settings.php:87 msgid "Export channel" msgstr "Экспорт канала" -#: ../../mod/settings.php:97 +#: ../../mod/settings.php:99 msgid "Automatic Permissions (Advanced)" msgstr "Автоматические разрешения (дополнительно)" -#: ../../mod/settings.php:145 +#: ../../mod/settings.php:109 +msgid "Premium Channel Settings" +msgstr "" + +#: ../../mod/settings.php:158 msgid "Missing some important data!" msgstr "Отсутствуют некоторые важные данные!" -#: ../../mod/settings.php:148 ../../mod/settings.php:634 +#: ../../mod/settings.php:161 ../../mod/settings.php:647 msgid "Update" msgstr "Обновление" -#: ../../mod/settings.php:261 +#: ../../mod/settings.php:274 msgid "Passwords do not match. Password unchanged." msgstr "Пароли не совпадают. Пароль не изменён." -#: ../../mod/settings.php:265 +#: ../../mod/settings.php:278 msgid "Empty passwords are not allowed. Password unchanged." msgstr "Пустые пароли не допускаются. Пароль не изменён." -#: ../../mod/settings.php:278 +#: ../../mod/settings.php:291 msgid "Password changed." msgstr "Пароль изменен." -#: ../../mod/settings.php:280 +#: ../../mod/settings.php:293 msgid "Password update failed. Please try again." msgstr "Изменение пароля закончилось неуспешно. Пожалуйста, попробуйте еще раз." -#: ../../mod/settings.php:294 +#: ../../mod/settings.php:307 msgid "Not valid email." msgstr "Не действительный адрес электронной почты." -#: ../../mod/settings.php:297 +#: ../../mod/settings.php:310 msgid "Protected email address. Cannot change to that email." msgstr "" -#: ../../mod/settings.php:306 +#: ../../mod/settings.php:319 msgid "System failure storing new email. Please try again." msgstr "" -#: ../../mod/settings.php:536 +#: ../../mod/settings.php:549 msgid "Settings updated." msgstr "Настройки обновленны." -#: ../../mod/settings.php:607 ../../mod/settings.php:633 -#: ../../mod/settings.php:669 +#: ../../mod/settings.php:620 ../../mod/settings.php:646 +#: ../../mod/settings.php:682 msgid "Add application" msgstr "Добавить приложения" -#: ../../mod/settings.php:609 ../../mod/settings.php:635 +#: ../../mod/settings.php:622 ../../mod/settings.php:648 #: ../../mod/tagrm.php:11 ../../mod/tagrm.php:94 ../../mod/fbrowser.php:81 #: ../../mod/fbrowser.php:116 msgid "Cancel" msgstr "Отменить" -#: ../../mod/settings.php:610 ../../mod/settings.php:636 +#: ../../mod/settings.php:623 ../../mod/settings.php:649 #: ../../mod/admin.php:636 ../../mod/crepair.php:148 msgid "Name" msgstr "Имя" -#: ../../mod/settings.php:611 ../../mod/settings.php:637 +#: ../../mod/settings.php:624 ../../mod/settings.php:650 msgid "Consumer Key" msgstr "Ключ клиента" -#: ../../mod/settings.php:612 ../../mod/settings.php:638 +#: ../../mod/settings.php:625 ../../mod/settings.php:651 msgid "Consumer Secret" msgstr "Секрет клиента" -#: ../../mod/settings.php:613 ../../mod/settings.php:639 +#: ../../mod/settings.php:626 ../../mod/settings.php:652 msgid "Redirect" msgstr "Перенаправление" -#: ../../mod/settings.php:614 ../../mod/settings.php:640 +#: ../../mod/settings.php:627 ../../mod/settings.php:653 msgid "Icon url" msgstr "URL-адрес значка" -#: ../../mod/settings.php:625 +#: ../../mod/settings.php:638 msgid "You can't edit this application." msgstr "Вы не можете редактировать это приложение." -#: ../../mod/settings.php:668 +#: ../../mod/settings.php:681 msgid "Connected Apps" msgstr "Подключенные приложения" -#: ../../mod/settings.php:672 +#: ../../mod/settings.php:685 msgid "Client key starts with" msgstr "" -#: ../../mod/settings.php:673 +#: ../../mod/settings.php:686 msgid "No name" msgstr "Без названия" -#: ../../mod/settings.php:674 +#: ../../mod/settings.php:687 msgid "Remove authorization" msgstr "Удалить разрешение" -#: ../../mod/settings.php:685 +#: ../../mod/settings.php:698 msgid "No feature settings configured" msgstr "Параметры функций не настроены" -#: ../../mod/settings.php:693 +#: ../../mod/settings.php:706 msgid "Feature Settings" msgstr "Настройки функции" -#: ../../mod/settings.php:716 +#: ../../mod/settings.php:729 msgid "Account Settings" msgstr "Настройки аккаунта" -#: ../../mod/settings.php:717 +#: ../../mod/settings.php:730 msgid "Password Settings" msgstr "Настройки пароля" -#: ../../mod/settings.php:718 +#: ../../mod/settings.php:731 msgid "New Password:" msgstr "Новый пароль:" -#: ../../mod/settings.php:719 +#: ../../mod/settings.php:732 msgid "Confirm:" msgstr "Подтверждение:" -#: ../../mod/settings.php:719 +#: ../../mod/settings.php:732 msgid "Leave password fields blank unless changing" msgstr "Оставьте поля пустыми, если не меняется" -#: ../../mod/settings.php:721 ../../mod/settings.php:1019 +#: ../../mod/settings.php:734 ../../mod/settings.php:1032 msgid "Email Address:" msgstr "Адрес электронной почты:" -#: ../../mod/settings.php:722 +#: ../../mod/settings.php:735 msgid "Remove Account" msgstr "Удалить аккаунт" -#: ../../mod/settings.php:723 +#: ../../mod/settings.php:736 msgid "Warning: This action is permanent and cannot be reversed." msgstr "" -#: ../../mod/settings.php:739 +#: ../../mod/settings.php:752 msgid "Off" msgstr "Выкл." -#: ../../mod/settings.php:739 +#: ../../mod/settings.php:752 msgid "On" msgstr "Вкл." -#: ../../mod/settings.php:746 +#: ../../mod/settings.php:759 msgid "Additional Features" msgstr "Дополнительные функции" -#: ../../mod/settings.php:771 +#: ../../mod/settings.php:784 msgid "Connector Settings" msgstr "Настройки соединителя" -#: ../../mod/settings.php:801 ../../mod/admin.php:361 +#: ../../mod/settings.php:814 ../../mod/admin.php:361 msgid "No special theme for mobile devices" msgstr "Нет специальной темы для мобильных устройств" -#: ../../mod/settings.php:841 +#: ../../mod/settings.php:854 msgid "Display Settings" msgstr "Настройки отображения" -#: ../../mod/settings.php:847 +#: ../../mod/settings.php:860 msgid "Display Theme:" msgstr "Тема отображения:" -#: ../../mod/settings.php:848 +#: ../../mod/settings.php:861 msgid "Mobile Theme:" msgstr "Мобильная тема отображения:" -#: ../../mod/settings.php:849 +#: ../../mod/settings.php:862 msgid "Update browser every xx seconds" msgstr "Обновление браузера каждые ХХ секунд" -#: ../../mod/settings.php:849 +#: ../../mod/settings.php:862 msgid "Minimum of 10 seconds, no maximum" msgstr "Минимум 10 секунд, без максимума" -#: ../../mod/settings.php:850 +#: ../../mod/settings.php:863 msgid "Maximum number of conversations to load at any time:" msgstr "" -#: ../../mod/settings.php:850 +#: ../../mod/settings.php:863 msgid "Maximum of 100 items" msgstr "Максимум 100 элементов" -#: ../../mod/settings.php:851 +#: ../../mod/settings.php:864 msgid "Don't show emoticons" msgstr "Не показывать emoticons" -#: ../../mod/settings.php:887 +#: ../../mod/settings.php:900 msgid "Nobody except yourself" msgstr "Никто, кроме вас" -#: ../../mod/settings.php:888 +#: ../../mod/settings.php:901 msgid "Only those you specifically allow" msgstr "Только комы вы разрешили" -#: ../../mod/settings.php:889 +#: ../../mod/settings.php:902 msgid "Anybody in your address book" msgstr "Любой в вашей адресной книге" -#: ../../mod/settings.php:890 +#: ../../mod/settings.php:903 msgid "Anybody on this website" msgstr "Любой на этом веб-сайте" -#: ../../mod/settings.php:891 +#: ../../mod/settings.php:904 msgid "Anybody in this network" msgstr "Любой в этой сети" -#: ../../mod/settings.php:892 +#: ../../mod/settings.php:905 msgid "Anybody on the internet" msgstr "Любой в интернете" -#: ../../mod/settings.php:965 +#: ../../mod/settings.php:978 msgid "Publish your default profile in the network directory" msgstr "Публикация вашего профиля по умолчанию в каталоге сети" -#: ../../mod/settings.php:970 +#: ../../mod/settings.php:983 msgid "Allow us to suggest you as a potential friend to new members?" msgstr "" -#: ../../mod/settings.php:974 ../../mod/profile_photo.php:298 +#: ../../mod/settings.php:987 ../../mod/profile_photo.php:298 msgid "or" msgstr "или" -#: ../../mod/settings.php:979 +#: ../../mod/settings.php:992 msgid "Your channel address is" msgstr "Адрес вашего канала:" -#: ../../mod/settings.php:990 +#: ../../mod/settings.php:1003 msgid "Automatically expire posts after this many days:" msgstr "" -#: ../../mod/settings.php:990 +#: ../../mod/settings.php:1003 msgid "If empty, posts will not expire. Expired posts will be deleted" msgstr "" -#: ../../mod/settings.php:991 +#: ../../mod/settings.php:1004 msgid "Advanced expiration settings" msgstr "" -#: ../../mod/settings.php:992 +#: ../../mod/settings.php:1005 msgid "Advanced Expiration" -msgstr "" +msgstr "Дополнительное истечение срока давности" -#: ../../mod/settings.php:993 +#: ../../mod/settings.php:1006 msgid "Expire posts:" msgstr "" -#: ../../mod/settings.php:995 +#: ../../mod/settings.php:1008 msgid "Expire starred posts:" msgstr "" -#: ../../mod/settings.php:996 +#: ../../mod/settings.php:1009 msgid "Expire photos:" msgstr "" -#: ../../mod/settings.php:997 +#: ../../mod/settings.php:1010 msgid "Only expire posts by others:" msgstr "" -#: ../../mod/settings.php:1008 +#: ../../mod/settings.php:1021 msgid "Channel Settings" msgstr "Настройки канала" -#: ../../mod/settings.php:1017 +#: ../../mod/settings.php:1030 msgid "Basic Settings" msgstr "Основные настройки" -#: ../../mod/settings.php:1020 +#: ../../mod/settings.php:1033 msgid "Your Timezone:" msgstr "Ваш часовой пояс:" -#: ../../mod/settings.php:1021 +#: ../../mod/settings.php:1034 msgid "Default Post Location:" msgstr "Откуда по умолчанию:" -#: ../../mod/settings.php:1022 +#: ../../mod/settings.php:1035 msgid "Use Browser Location:" msgstr "Используйте указание браузерa:" -#: ../../mod/settings.php:1025 +#: ../../mod/settings.php:1038 msgid "Security and Privacy Settings" msgstr "Параметры безопасности и конфиденциальности" -#: ../../mod/settings.php:1027 +#: ../../mod/settings.php:1040 msgid "Quick Privacy Settings:" msgstr "Быстрые параметры безопасности и конфиденциальности:" -#: ../../mod/settings.php:1028 +#: ../../mod/settings.php:1041 msgid "Very Public - extremely permissive" msgstr "Очень публично - чрезвычайно разрешающе" -#: ../../mod/settings.php:1029 +#: ../../mod/settings.php:1042 msgid "Typical - default public, privacy when desired" msgstr "Типично - по умолчанию публично, конфиденциальность, только если настроена" -#: ../../mod/settings.php:1030 +#: ../../mod/settings.php:1043 msgid "Private - default private, rarely open or public" msgstr "Частно - по умолчанию частно, редко открыто или публично" -#: ../../mod/settings.php:1031 +#: ../../mod/settings.php:1044 msgid "Blocked - default blocked to/from everybody" msgstr "Заблокированно - по умолчанию заблокировано для/от всех" -#: ../../mod/settings.php:1034 +#: ../../mod/settings.php:1047 msgid "Maximum Friend Requests/Day:" msgstr "" -#: ../../mod/settings.php:1034 +#: ../../mod/settings.php:1047 msgid "May reduce spam activity" msgstr "" -#: ../../mod/settings.php:1035 +#: ../../mod/settings.php:1048 msgid "Default Post Permissions" msgstr "" -#: ../../mod/settings.php:1036 +#: ../../mod/settings.php:1049 msgid "(click to open/close)" msgstr "(нажмите, чтобы открыть / закрыть)" -#: ../../mod/settings.php:1049 +#: ../../mod/settings.php:1062 msgid "Maximum private messages per day from unknown people:" msgstr "" -#: ../../mod/settings.php:1049 +#: ../../mod/settings.php:1062 msgid "Useful to reduce spamming" msgstr "" -#: ../../mod/settings.php:1052 +#: ../../mod/settings.php:1065 msgid "Notification Settings" msgstr "Настройки уведомлений" -#: ../../mod/settings.php:1053 +#: ../../mod/settings.php:1066 msgid "By default post a status message when:" msgstr "" -#: ../../mod/settings.php:1054 +#: ../../mod/settings.php:1067 msgid "accepting a friend request" msgstr "" -#: ../../mod/settings.php:1055 +#: ../../mod/settings.php:1068 msgid "joining a forum/community" msgstr "" -#: ../../mod/settings.php:1056 +#: ../../mod/settings.php:1069 msgid "making an <em>interesting</em> profile change" msgstr "" -#: ../../mod/settings.php:1057 +#: ../../mod/settings.php:1070 msgid "Send a notification email when:" msgstr "Отправить уведомление по электронной почте, если:" -#: ../../mod/settings.php:1058 +#: ../../mod/settings.php:1071 msgid "You receive an introduction" msgstr "Вы получили введение" -#: ../../mod/settings.php:1059 +#: ../../mod/settings.php:1072 msgid "Your introductions are confirmed" msgstr "" -#: ../../mod/settings.php:1060 +#: ../../mod/settings.php:1073 msgid "Someone writes on your profile wall" msgstr "" -#: ../../mod/settings.php:1061 +#: ../../mod/settings.php:1074 msgid "Someone writes a followup comment" msgstr "" -#: ../../mod/settings.php:1062 +#: ../../mod/settings.php:1075 msgid "You receive a private message" msgstr "" -#: ../../mod/settings.php:1063 +#: ../../mod/settings.php:1076 msgid "You receive a friend suggestion" msgstr "" -#: ../../mod/settings.php:1064 +#: ../../mod/settings.php:1077 msgid "You are tagged in a post" msgstr "" -#: ../../mod/settings.php:1065 +#: ../../mod/settings.php:1078 msgid "You are poked/prodded/etc. in a post" msgstr "" -#: ../../mod/settings.php:1068 +#: ../../mod/settings.php:1081 msgid "Advanced Account/Page Type Settings" msgstr "" -#: ../../mod/settings.php:1069 +#: ../../mod/settings.php:1082 msgid "Change the behaviour of this account for special situations" msgstr "" #: ../../mod/viewconnections.php:28 ../../mod/directory.php:23 -#: ../../mod/photos.php:558 ../../mod/display.php:9 ../../mod/search.php:80 +#: ../../mod/photos.php:559 ../../mod/display.php:9 ../../mod/search.php:80 #: ../../mod/community.php:18 msgid "Public access denied." msgstr "Общественный доступ запрещен." @@ -3666,7 +3726,7 @@ msgstr "Никаких каналов." #: ../../mod/viewconnections.php:69 ../../mod/nogroup.php:40 #, php-format msgid "Visit %s's profile [%s]" -msgstr "" +msgstr "Посетить %s's профиль [%s]" #: ../../mod/viewconnections.php:84 msgid "View Connnections" @@ -3688,6 +3748,49 @@ msgstr "Выбрать тег для удаления: " msgid "Remove" msgstr "Удалить" +#: ../../mod/connect.php:59 ../../mod/connect.php:107 +msgid "Continue" +msgstr "" + +#: ../../mod/connect.php:88 +msgid "Premium Channel Setup" +msgstr "" + +#: ../../mod/connect.php:90 +msgid "Enable premium channel connection restrictions" +msgstr "" + +#: ../../mod/connect.php:91 +msgid "" +"Please enter your restrictions or conditions, such as paypal receipt, usage " +"guidelines, etc." +msgstr "" + +#: ../../mod/connect.php:93 ../../mod/connect.php:113 +msgid "" +"This channel may require additional steps or acknowledgement of the " +"following conditions prior to connecting:" +msgstr "" + +#: ../../mod/connect.php:94 +msgid "" +"Potential connections will then see the following text before proceeding:" +msgstr "" + +#: ../../mod/connect.php:95 ../../mod/connect.php:116 +msgid "" +"By continuing, I certify that I have complied with any instructions provided" +" on this page." +msgstr "" + +#: ../../mod/connect.php:104 +msgid "(No specific instructions have been provided by the channel owner.)" +msgstr "" + +#: ../../mod/connect.php:112 +msgid "Restricted or Premium Channel" +msgstr "" + #: ../../mod/delegate.php:95 msgid "No potential page delegates located." msgstr "" @@ -3755,6 +3858,118 @@ msgstr "Поиск людей" msgid "No matches" msgstr "Нет соответствий" +#: ../../mod/mitem.php:13 ../../mod/menu.php:87 +msgid "Menu not found." +msgstr "" + +#: ../../mod/mitem.php:66 +msgid "Menu element updated." +msgstr "" + +#: ../../mod/mitem.php:70 +msgid "Unable to update menu element." +msgstr "" + +#: ../../mod/mitem.php:76 +msgid "Menu element added." +msgstr "" + +#: ../../mod/mitem.php:80 +msgid "Unable to add menu element." +msgstr "" + +#: ../../mod/mitem.php:97 ../../mod/xchan.php:25 ../../mod/menu.php:113 +msgid "Not found." +msgstr "Не найдено." + +#: ../../mod/mitem.php:116 +msgid "Manage Menu Elements" +msgstr "" + +#: ../../mod/mitem.php:119 +msgid "Edit menu" +msgstr "" + +#: ../../mod/mitem.php:122 +msgid "Edit element" +msgstr "" + +#: ../../mod/mitem.php:123 +msgid "Drop element" +msgstr "" + +#: ../../mod/mitem.php:124 +msgid "New element" +msgstr "" + +#: ../../mod/mitem.php:125 +msgid "Edit this menu container" +msgstr "" + +#: ../../mod/mitem.php:126 +msgid "Add menu element" +msgstr "" + +#: ../../mod/mitem.php:127 +msgid "Delete this menu item" +msgstr "" + +#: ../../mod/mitem.php:128 +msgid "Edit this menu item" +msgstr "" + +#: ../../mod/mitem.php:142 +msgid "New Menu Element" +msgstr "" + +#: ../../mod/mitem.php:144 ../../mod/mitem.php:185 +msgid "Link text" +msgstr "" + +#: ../../mod/mitem.php:145 ../../mod/mitem.php:186 +msgid "URL of link" +msgstr "" + +#: ../../mod/mitem.php:146 ../../mod/mitem.php:187 +msgid "Use Red magic-auth if available" +msgstr "" + +#: ../../mod/mitem.php:147 ../../mod/mitem.php:188 +msgid "Open link in new window" +msgstr "" + +#: ../../mod/mitem.php:149 ../../mod/mitem.php:190 +msgid "Order in list" +msgstr "" + +#: ../../mod/mitem.php:149 ../../mod/mitem.php:190 +msgid "Higher numbers will sink to bottom of listing" +msgstr "" + +#: ../../mod/mitem.php:150 ../../mod/menu.php:79 ../../mod/new_channel.php:117 +msgid "Create" +msgstr "Создать" + +#: ../../mod/mitem.php:162 +msgid "Menu item not found." +msgstr "" + +#: ../../mod/mitem.php:171 +msgid "Menu item deleted." +msgstr "" + +#: ../../mod/mitem.php:173 +msgid "Menu item could not be deleted." +msgstr "" + +#: ../../mod/mitem.php:182 +msgid "Edit Menu Element" +msgstr "" + +#: ../../mod/mitem.php:191 ../../mod/menu.php:107 +msgid "Modify" +msgstr "" + #: ../../mod/group.php:26 msgid "Collection created." msgstr "Коллекция создана." @@ -3769,7 +3984,7 @@ msgstr "Имя коллекции изменено." #: ../../mod/group.php:92 msgid "Create a collection of channels." -msgstr "" +msgstr "Создать коллекцию каналов" #: ../../mod/group.php:93 ../../mod/group.php:189 msgid "Collection Name: " @@ -3797,7 +4012,7 @@ msgstr "Участники" #: ../../mod/group.php:204 msgid "All Connected Channels" -msgstr "Все подключенные каналы" +msgstr "Все подключенные контакы" #: ../../mod/group.php:237 msgid "Click on a channel to add or remove." @@ -3811,132 +4026,132 @@ msgstr "" msgid "Album not found." msgstr "Альбом не найден." -#: ../../mod/photos.php:125 ../../mod/photos.php:770 +#: ../../mod/photos.php:125 ../../mod/photos.php:771 msgid "Delete Album" msgstr "Удалить альбом" -#: ../../mod/photos.php:165 ../../mod/photos.php:1032 +#: ../../mod/photos.php:165 ../../mod/photos.php:1036 msgid "Delete Photo" msgstr "Удалить фотографию" -#: ../../mod/photos.php:494 +#: ../../mod/photos.php:495 #, php-format msgid "%1$s was tagged in %2$s by %3$s" -msgstr "" +msgstr "%1$s добавил тег в %2$s на %3$s" -#: ../../mod/photos.php:494 +#: ../../mod/photos.php:495 msgid "a photo" msgstr "фотография" -#: ../../mod/photos.php:568 +#: ../../mod/photos.php:569 msgid "No photos selected" msgstr "Никакие фотографии не выбраны" -#: ../../mod/photos.php:622 +#: ../../mod/photos.php:623 msgid "Access to this item is restricted." msgstr "Доступ к этому элементу ограничен." -#: ../../mod/photos.php:686 +#: ../../mod/photos.php:687 #, php-format msgid "You have used %1$.2f Mbytes of %2$.2f Mbytes photo storage." msgstr "" -#: ../../mod/photos.php:689 +#: ../../mod/photos.php:690 #, php-format msgid "You have used %1$.2f Mbytes of photo storage." msgstr "" -#: ../../mod/photos.php:697 +#: ../../mod/photos.php:698 msgid "Upload Photos" msgstr "Загрузить фотографии" -#: ../../mod/photos.php:701 ../../mod/photos.php:765 +#: ../../mod/photos.php:702 ../../mod/photos.php:766 msgid "New album name: " msgstr "Название нового альбома:" -#: ../../mod/photos.php:702 +#: ../../mod/photos.php:703 msgid "or existing album name: " msgstr "или существующий альбом:" -#: ../../mod/photos.php:703 +#: ../../mod/photos.php:704 msgid "Do not show a status post for this upload" msgstr "" -#: ../../mod/photos.php:705 ../../mod/photos.php:1027 +#: ../../mod/photos.php:706 ../../mod/photos.php:1031 msgid "Permissions" msgstr "Разрешения" -#: ../../mod/photos.php:754 ../../mod/photos.php:776 ../../mod/photos.php:1223 -#: ../../mod/photos.php:1238 +#: ../../mod/photos.php:755 ../../mod/photos.php:777 ../../mod/photos.php:1203 +#: ../../mod/photos.php:1218 msgid "Contact Photos" msgstr "Фотографии канала" -#: ../../mod/photos.php:780 +#: ../../mod/photos.php:781 msgid "Edit Album" msgstr "Редактировать Фотоальбом" -#: ../../mod/photos.php:786 +#: ../../mod/photos.php:787 msgid "Show Newest First" msgstr "Показать новые первыми" -#: ../../mod/photos.php:788 +#: ../../mod/photos.php:789 msgid "Show Oldest First" msgstr "Показать старые первыми" -#: ../../mod/photos.php:832 ../../mod/photos.php:1270 +#: ../../mod/photos.php:833 ../../mod/photos.php:1250 msgid "View Photo" msgstr "Посмотреть фотографию" -#: ../../mod/photos.php:876 +#: ../../mod/photos.php:877 msgid "Permission denied. Access to this item may be restricted." msgstr "" -#: ../../mod/photos.php:878 +#: ../../mod/photos.php:879 msgid "Photo not available" msgstr "Фотография не доступна" -#: ../../mod/photos.php:936 +#: ../../mod/photos.php:937 msgid "Use as profile photo" msgstr "Использовать в качестве фотографии профиля" -#: ../../mod/photos.php:964 +#: ../../mod/photos.php:965 msgid "View Full Size" msgstr "Посмотреть в полный размер" -#: ../../mod/photos.php:1015 +#: ../../mod/photos.php:1019 msgid "Edit photo" msgstr "Редактировать фотографию" -#: ../../mod/photos.php:1017 +#: ../../mod/photos.php:1021 msgid "Rotate CW (right)" msgstr "Повернуть CW (направо)" -#: ../../mod/photos.php:1018 +#: ../../mod/photos.php:1022 msgid "Rotate CCW (left)" msgstr "Повернуть CCW (налево)" -#: ../../mod/photos.php:1020 +#: ../../mod/photos.php:1024 msgid "New album name" msgstr "Новое название альбома:" -#: ../../mod/photos.php:1023 +#: ../../mod/photos.php:1027 msgid "Caption" msgstr "Подпись" -#: ../../mod/photos.php:1025 +#: ../../mod/photos.php:1029 msgid "Add a Tag" msgstr "Добавить тег" -#: ../../mod/photos.php:1029 +#: ../../mod/photos.php:1033 msgid "" "Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping" msgstr "Например: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping" -#: ../../mod/photos.php:1276 +#: ../../mod/photos.php:1256 msgid "View Album" msgstr "Посмотреть фотоальбом" -#: ../../mod/photos.php:1285 +#: ../../mod/photos.php:1265 msgid "Recent Photos" msgstr "Последние фотографии" @@ -3948,11 +4163,11 @@ msgstr "отправил вам личное сообщение" msgid "added your channel" msgstr "добавил ваш канал" -#: ../../mod/ping.php:230 ../../boot.php:1727 ../../boot.php:1807 +#: ../../mod/ping.php:230 ../../boot.php:1799 ../../boot.php:1879 msgid "g A l F d" msgstr "g A l F d" -#: ../../mod/ping.php:252 ../../boot.php:1773 ../../boot.php:1848 +#: ../../mod/ping.php:252 ../../boot.php:1845 ../../boot.php:1920 msgid "[today]" msgstr "[сегодня]" @@ -3960,14 +4175,91 @@ msgstr "[сегодня]" msgid "posted an event" msgstr "" -#: ../../mod/xchan.php:25 -msgid "Not found." -msgstr "Не найдено." - #: ../../mod/filer.php:35 msgid "- select -" msgstr "- выбрать -" +#: ../../mod/menu.php:17 +msgid "Menu updated." +msgstr "" + +#: ../../mod/menu.php:21 +msgid "Unable to update menu." +msgstr "" + +#: ../../mod/menu.php:26 +msgid "Menu created." +msgstr "" + +#: ../../mod/menu.php:30 +msgid "Unable to create menu." +msgstr "" + +#: ../../mod/menu.php:53 +msgid "Manage Menus" +msgstr "" + +#: ../../mod/menu.php:56 +msgid "Drop" +msgstr "" + +#: ../../mod/menu.php:57 ../../mod/network.php:298 +#: ../../mod/connections.php:521 +msgid "New" +msgstr "Новые" + +#: ../../mod/menu.php:58 +msgid "Create a new menu" +msgstr "" + +#: ../../mod/menu.php:59 +msgid "Delete this menu" +msgstr "" + +#: ../../mod/menu.php:60 ../../mod/menu.php:104 +msgid "Edit menu contents" +msgstr "" + +#: ../../mod/menu.php:61 +msgid "Edit this menu" +msgstr "" + +#: ../../mod/menu.php:76 +msgid "New Menu" +msgstr "" + +#: ../../mod/menu.php:77 ../../mod/menu.php:105 +msgid "Menu name" +msgstr "" + +#: ../../mod/menu.php:77 ../../mod/menu.php:105 +msgid "Must be unique, only seen by you" +msgstr "" + +#: ../../mod/menu.php:78 ../../mod/menu.php:106 +msgid "Menu title" +msgstr "" + +#: ../../mod/menu.php:78 ../../mod/menu.php:106 +msgid "Menu title as seen by others" +msgstr "" + +#: ../../mod/menu.php:93 +msgid "Menu deleted." +msgstr "" + +#: ../../mod/menu.php:95 +msgid "Menu could not be deleted." +msgstr "" + +#: ../../mod/menu.php:101 +msgid "Edit Menu" +msgstr "" + +#: ../../mod/menu.php:103 +msgid "Add or remove entries to this menu" +msgstr "" + #: ../../mod/home.php:76 #, php-format msgid "Welcome to %s" @@ -3995,7 +4287,7 @@ msgstr "" #: ../../mod/message.php:213 ../../mod/notifications.php:101 msgid "Messages" -msgstr "Сообщения" +msgstr "Переписка" #: ../../mod/message.php:224 msgid "Message deleted." @@ -4009,41 +4301,41 @@ msgstr "Разговор удален." msgid "Send Private Message" msgstr "Отправить личное сообщение" -#: ../../mod/message.php:283 ../../mod/message.php:418 +#: ../../mod/message.php:283 ../../mod/message.php:448 msgid "To:" msgstr "Кому:" -#: ../../mod/message.php:288 ../../mod/message.php:420 +#: ../../mod/message.php:288 ../../mod/message.php:450 msgid "Subject:" msgstr "Тема:" -#: ../../mod/message.php:316 +#: ../../mod/message.php:317 msgid "No messages." msgstr "Нет сообщений." -#: ../../mod/message.php:332 ../../mod/message.php:389 +#: ../../mod/message.php:333 ../../mod/message.php:419 msgid "Delete message" msgstr "Удалить сообщение" -#: ../../mod/message.php:334 +#: ../../mod/message.php:335 msgid "D, d M Y - g:i A" msgstr "D, d M Y - g:i A" -#: ../../mod/message.php:353 +#: ../../mod/message.php:354 msgid "Message not found." msgstr "Сообщение не найдено." -#: ../../mod/message.php:411 +#: ../../mod/message.php:441 msgid "Delete conversation" msgstr "Удалить разговор" -#: ../../mod/message.php:413 +#: ../../mod/message.php:443 msgid "" "No secure communications available. You <strong>may</strong> be able to " "respond from the sender's profile page." msgstr "" -#: ../../mod/message.php:417 +#: ../../mod/message.php:447 msgid "Send Reply" msgstr "Отправить снова" @@ -4075,650 +4367,140 @@ msgstr "Введите адрес вашего канала (например: c msgid "Authenticate" msgstr "Проверка подлинности" -#: ../../mod/item.php:121 +#: ../../mod/item.php:122 msgid "Unable to locate original post." msgstr "Не удалось найти оригинал." -#: ../../mod/item.php:289 +#: ../../mod/item.php:290 msgid "Empty post discarded." msgstr "Отказаться от пустой почты." -#: ../../mod/item.php:751 +#: ../../mod/item.php:334 +msgid "Executable content type not permitted to this channel." +msgstr "" + +#: ../../mod/item.php:779 msgid "System error. Post not saved." msgstr "Системная ошибка. Сообщение не сохранено." -#: ../../mod/item.php:1028 ../../mod/wall_upload.php:41 +#: ../../mod/item.php:1064 ../../mod/wall_upload.php:41 msgid "Wall Photos" msgstr "Стена фотографий" -#: ../../mod/network.php:158 ../../mod/search.php:20 +#: ../../mod/network.php:141 ../../mod/search.php:20 msgid "Remove term" msgstr "Удалить термин" -#: ../../mod/network.php:296 +#: ../../mod/network.php:279 msgid "Commented Order" msgstr "По комментириям" -#: ../../mod/network.php:299 +#: ../../mod/network.php:282 msgid "Sort by Comment Date" msgstr "Сортировка по дате создания комментариев" -#: ../../mod/network.php:302 +#: ../../mod/network.php:285 msgid "Posted Order" msgstr "По добавлениям" -#: ../../mod/network.php:305 +#: ../../mod/network.php:288 msgid "Sort by Post Date" msgstr "Сортировка по дате создания сообщения" -#: ../../mod/network.php:309 ../../mod/notifications.php:86 +#: ../../mod/network.php:292 ../../mod/notifications.php:86 msgid "Personal" msgstr "Личные" -#: ../../mod/network.php:312 +#: ../../mod/network.php:295 msgid "Posts that mention or involve you" msgstr "Сообщения, в которых упоминули или вовлекли вас" -#: ../../mod/network.php:315 ../../mod/connections.php:511 -msgid "New" -msgstr "Новые" - -#: ../../mod/network.php:318 +#: ../../mod/network.php:301 msgid "Activity Stream - by date" msgstr "Лента активности - по дате" -#: ../../mod/network.php:325 +#: ../../mod/network.php:308 msgid "Starred" msgstr "Помеченные" -#: ../../mod/network.php:328 +#: ../../mod/network.php:311 msgid "Favourite Posts" msgstr "Фаворит-сообщения" -#: ../../mod/network.php:335 +#: ../../mod/network.php:318 msgid "Spam" msgstr "Спам" -#: ../../mod/network.php:338 +#: ../../mod/network.php:321 msgid "Posts flagged as SPAM" msgstr "Как СПАМ помеченные сообщения" -#: ../../mod/network.php:378 +#: ../../mod/network.php:361 msgid "Refresh" msgstr "Обновить" -#: ../../mod/network.php:379 ../../mod/connections.php:364 +#: ../../mod/network.php:362 ../../mod/connections.php:374 msgid "Me" msgstr "Я" -#: ../../mod/network.php:380 ../../mod/connections.php:366 +#: ../../mod/network.php:363 ../../mod/connections.php:376 msgid "Best Friends" msgstr "Лучшие друзья" -#: ../../mod/network.php:382 +#: ../../mod/network.php:365 msgid "Co-workers" msgstr "Сотрудники" -#: ../../mod/network.php:383 ../../mod/connections.php:368 +#: ../../mod/network.php:366 ../../mod/connections.php:378 msgid "Former Friends" msgstr "Приятели" -#: ../../mod/network.php:384 ../../mod/connections.php:369 +#: ../../mod/network.php:367 ../../mod/connections.php:379 msgid "Acquaintances" msgstr "Знакомые" -#: ../../mod/network.php:385 +#: ../../mod/network.php:368 msgid "Everybody" msgstr "Все" -#: ../../mod/network.php:402 +#: ../../mod/network.php:385 msgid "Search Results For:" msgstr "Результаты поиска для:" -#: ../../mod/network.php:447 +#: ../../mod/network.php:430 msgid "No such group" msgstr "Нет такой группы" -#: ../../mod/network.php:458 +#: ../../mod/network.php:441 msgid "Group is empty" msgstr "Группа пуста" -#: ../../mod/network.php:473 +#: ../../mod/network.php:456 msgid "Contact: " msgstr "Канал: " -#: ../../mod/network.php:476 +#: ../../mod/network.php:459 msgid "Invalid contact." msgstr "Недействительный канал." -#: ../../mod/admin.php:48 -msgid "Theme settings updated." -msgstr "Настройки темы обновленны." - -#: ../../mod/admin.php:83 ../../mod/admin.php:408 -msgid "Site" -msgstr "Сайт" - -#: ../../mod/admin.php:84 ../../mod/admin.php:632 ../../mod/admin.php:644 -msgid "Users" -msgstr "Пользователи" - -#: ../../mod/admin.php:85 ../../mod/admin.php:726 ../../mod/admin.php:768 -msgid "Plugins" -msgstr "Плагины" - -#: ../../mod/admin.php:86 ../../mod/admin.php:931 ../../mod/admin.php:967 -msgid "Themes" -msgstr "Темы" - -#: ../../mod/admin.php:87 -msgid "DB updates" -msgstr "Обновления базы данных" - -#: ../../mod/admin.php:101 ../../mod/admin.php:108 ../../mod/admin.php:1054 -msgid "Logs" -msgstr "Журналы" - -#: ../../mod/admin.php:107 -msgid "Plugin Features" -msgstr "Функции плагинов" - -#: ../../mod/admin.php:109 -msgid "User registrations waiting for confirmation" -msgstr "Регистрации пользователей, которые ждут подтверждения" - -#: ../../mod/admin.php:180 -msgid "Message queues" -msgstr "Непрочитанный сообщений" - -#: ../../mod/admin.php:185 ../../mod/admin.php:407 ../../mod/admin.php:631 -#: ../../mod/admin.php:725 ../../mod/admin.php:767 ../../mod/admin.php:930 -#: ../../mod/admin.php:966 ../../mod/admin.php:1053 -msgid "Administration" -msgstr "Администрация" - -#: ../../mod/admin.php:186 -msgid "Summary" -msgstr "Резюме" - -#: ../../mod/admin.php:188 -msgid "Registered users" -msgstr "Всего пользователeй" - -#: ../../mod/admin.php:190 -msgid "Pending registrations" -msgstr "Ждут утверждения" - -#: ../../mod/admin.php:191 -msgid "Version" -msgstr "Версия системы" - -#: ../../mod/admin.php:193 -msgid "Active plugins" -msgstr "Активные плагины" - -#: ../../mod/admin.php:332 -msgid "Site settings updated." -msgstr "Настройки сайта обновлены." - -#: ../../mod/admin.php:363 -msgid "No special theme for accessibility" -msgstr "" - -#: ../../mod/admin.php:388 -msgid "Closed" -msgstr "Регистрация закрыта" - -#: ../../mod/admin.php:389 -msgid "Requires approval" -msgstr "Регистрация требует подтверждения" - -#: ../../mod/admin.php:390 -msgid "Open" -msgstr "Регистрация открыта" - -#: ../../mod/admin.php:395 -msgid "Private" -msgstr "Личный доступ" - -#: ../../mod/admin.php:396 -msgid "Paid Access" -msgstr "Платный доступ" - -#: ../../mod/admin.php:397 -msgid "Free Access" -msgstr "Свободный доступ" - -#: ../../mod/admin.php:401 -msgid "No SSL policy, links will track page SSL state" -msgstr "" - -#: ../../mod/admin.php:402 -msgid "Force all links to use SSL" -msgstr "Заставить все ссылки использовать SSL" - -#: ../../mod/admin.php:410 ../../mod/register.php:166 -msgid "Registration" -msgstr "Регистрация" - -#: ../../mod/admin.php:411 -msgid "File upload" -msgstr "Загрузка файла" - -#: ../../mod/admin.php:412 -msgid "Policies" -msgstr "Правила" - -#: ../../mod/admin.php:413 -msgid "Advanced" -msgstr "Дополнительно" - -#: ../../mod/admin.php:417 -msgid "Site name" -msgstr "Название сайта" - -#: ../../mod/admin.php:418 -msgid "Banner/Logo" -msgstr "Баннер / логотип" - -#: ../../mod/admin.php:419 -msgid "System language" -msgstr "Язык системы" - -#: ../../mod/admin.php:420 -msgid "System theme" -msgstr "Тема системы" - -#: ../../mod/admin.php:420 -msgid "" -"Default system theme - may be over-ridden by user profiles - <a href='#' " -"id='cnftheme'>change theme settings</a>" -msgstr "" - -#: ../../mod/admin.php:421 -msgid "Mobile system theme" -msgstr "Мобильная тема системы" - -#: ../../mod/admin.php:421 -msgid "Theme for mobile devices" -msgstr "Тема для мобильных устройств" - -#: ../../mod/admin.php:422 -msgid "Accessibility system theme" -msgstr "" - -#: ../../mod/admin.php:422 -msgid "Accessibility theme" -msgstr "" - -#: ../../mod/admin.php:423 -msgid "Channel to use for this website's static pages" -msgstr "" - -#: ../../mod/admin.php:423 -msgid "Site Channel" -msgstr "Канал сайта" - -#: ../../mod/admin.php:424 -msgid "SSL link policy" -msgstr "Правила SSL-ссылки" - -#: ../../mod/admin.php:424 -msgid "Determines whether generated links should be forced to use SSL" -msgstr "" - -#: ../../mod/admin.php:425 -msgid "Maximum image size" -msgstr "Максимальный размер" - -#: ../../mod/admin.php:425 -msgid "" -"Maximum size in bytes of uploaded images. Default is 0, which means no " -"limits." -msgstr "" - -#: ../../mod/admin.php:426 -msgid "Register policy" -msgstr "Статус регистрации" - -#: ../../mod/admin.php:427 -msgid "Access policy" -msgstr "Правила доступа" - -#: ../../mod/admin.php:428 -msgid "Register text" -msgstr "Текст регистрации" - -#: ../../mod/admin.php:428 -msgid "Will be displayed prominently on the registration page." -msgstr "" - -#: ../../mod/admin.php:429 -msgid "Accounts abandoned after x days" -msgstr "" - -#: ../../mod/admin.php:429 -msgid "" -"Will not waste system resources polling external sites for abandonded " -"accounts. Enter 0 for no time limit." -msgstr "" - -#: ../../mod/admin.php:430 -msgid "Allowed friend domains" -msgstr "" - -#: ../../mod/admin.php:430 -msgid "" -"Comma separated list of domains which are allowed to establish friendships " -"with this site. Wildcards are accepted. Empty to allow any domains" -msgstr "" - -#: ../../mod/admin.php:431 -msgid "Allowed email domains" -msgstr "" - -#: ../../mod/admin.php:431 -msgid "" -"Comma separated list of domains which are allowed in email addresses for " -"registrations to this site. Wildcards are accepted. Empty to allow any " -"domains" -msgstr "" - -#: ../../mod/admin.php:432 -msgid "Block public" -msgstr "Блокировать публичный доступ" - -#: ../../mod/admin.php:432 -msgid "" -"Check to block public access to all otherwise public personal pages on this " -"site unless you are currently logged in." -msgstr "" - -#: ../../mod/admin.php:433 -msgid "Force publish" -msgstr "Заставить публиковать" - -#: ../../mod/admin.php:433 -msgid "" -"Check to force all profiles on this site to be listed in the site directory." -msgstr "" - -#: ../../mod/admin.php:435 -msgid "Proxy user" -msgstr "Proxy пользователь" - -#: ../../mod/admin.php:436 -msgid "Proxy URL" -msgstr "Proxy URL" - -#: ../../mod/admin.php:437 -msgid "Network timeout" -msgstr "Время ожидания сети" - -#: ../../mod/admin.php:437 -msgid "Value is in seconds. Set to 0 for unlimited (not recommended)." -msgstr "" - -#: ../../mod/admin.php:438 -msgid "Delivery interval" -msgstr "Интервал доставки" - -#: ../../mod/admin.php:438 -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 "" - -#: ../../mod/admin.php:439 -msgid "Poll interval" -msgstr "Интервал опроса" - -#: ../../mod/admin.php:439 -msgid "" -"Delay background polling processes by this many seconds to reduce system " -"load. If 0, use delivery interval." -msgstr "" - -#: ../../mod/admin.php:440 -msgid "Maximum Load Average" -msgstr "" - -#: ../../mod/admin.php:440 -msgid "" -"Maximum system load before delivery and poll processes are deferred - " -"default 50." -msgstr "" - -#: ../../mod/admin.php:456 -msgid "Update has been marked successful" -msgstr "" - -#: ../../mod/admin.php:466 -#, php-format -msgid "Executing %s failed. Check system logs." -msgstr "" - -#: ../../mod/admin.php:469 -#, php-format -msgid "Update %s was successfully applied." -msgstr "" - -#: ../../mod/admin.php:473 -#, php-format -msgid "Update %s did not return a status. Unknown if it succeeded." -msgstr "" - -#: ../../mod/admin.php:476 -#, php-format -msgid "Update function %s could not be found." -msgstr "" - -#: ../../mod/admin.php:491 -msgid "No failed updates." -msgstr "Ошибок обновлений нет." - -#: ../../mod/admin.php:495 -msgid "Failed Updates" -msgstr "Обновления с ошибками" - -#: ../../mod/admin.php:497 -msgid "Mark success (if update was manually applied)" -msgstr "" - -#: ../../mod/admin.php:498 -msgid "Attempt to execute this update step automatically" -msgstr "" - -#: ../../mod/admin.php:524 -#, php-format -msgid "%s user blocked/unblocked" -msgid_plural "%s users blocked/unblocked" -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" - -#: ../../mod/admin.php:531 -#, php-format -msgid "%s user deleted" -msgid_plural "%s users deleted" -msgstr[0] "%s канал удален" -msgstr[1] "%s канала удалены" -msgstr[2] "%s каналов удалено" - -#: ../../mod/admin.php:562 -msgid "Account not found" -msgstr "Аккаунт не найден" - -#: ../../mod/admin.php:573 -#, php-format -msgid "User '%s' deleted" -msgstr "Пользователь '%s' удален" - -#: ../../mod/admin.php:582 -#, php-format -msgid "User '%s' unblocked" -msgstr "Пользователь '%s' разрешен" - -#: ../../mod/admin.php:582 -#, php-format -msgid "User '%s' blocked" -msgstr "Пользователь '%s' заблокирован" - -#: ../../mod/admin.php:613 -msgid "Normal Account" -msgstr "Нормальный аккаунт" - -#: ../../mod/admin.php:614 -msgid "Soapbox Account" -msgstr "Soapbox аккаунт" - -#: ../../mod/admin.php:615 -msgid "Community/Celebrity Account" -msgstr "Community/Celebrity аккаунт" - -#: ../../mod/admin.php:616 -msgid "Automatic Friend Account" -msgstr "Аккаунт \"автоматически друзья\"" - -#: ../../mod/admin.php:634 -msgid "select all" -msgstr "выбрать все" - -#: ../../mod/admin.php:635 -msgid "User registrations waiting for confirm" -msgstr "Регистрации пользователей ждут подтверждения" - -#: ../../mod/admin.php:636 -msgid "Request date" -msgstr "Дата запроса" - -#: ../../mod/admin.php:637 -msgid "No registrations." -msgstr "Новых регистраций пока нет." - -#: ../../mod/admin.php:638 ../../mod/intro.php:11 ../../mod/intro.php:98 +#: ../../mod/intro.php:11 ../../mod/intro.php:98 ../../mod/admin.php:638 #: ../../mod/notifications.php:159 ../../mod/notifications.php:206 msgid "Approve" msgstr "Утвердить" -#: ../../mod/admin.php:639 -msgid "Deny" -msgstr "Запретить" - -#: ../../mod/admin.php:641 ../../mod/intro.php:14 ../../mod/intro.php:99 -#: ../../mod/connections.php:308 ../../mod/connections.php:449 +#: ../../mod/intro.php:14 ../../mod/intro.php:99 ../../mod/connections.php:318 +#: ../../mod/connections.php:459 ../../mod/admin.php:641 msgid "Block" msgstr "Заблокировать" -#: ../../mod/admin.php:642 ../../mod/connections.php:308 -#: ../../mod/connections.php:449 -msgid "Unblock" -msgstr "Разрешить" - -#: ../../mod/admin.php:645 -msgid "Register date" -msgstr "Дата регистрации" - -#: ../../mod/admin.php:645 -msgid "Last login" -msgstr "Последний вход" - -#: ../../mod/admin.php:645 -msgid "Service Class" -msgstr "Класс службы" - -#: ../../mod/admin.php:647 -msgid "" -"Selected users will be deleted!\\n\\nEverything these users had posted on " -"this site will be permanently deleted!\\n\\nAre you sure?" -msgstr "" - -#: ../../mod/admin.php:648 -msgid "" -"The user {0} will be deleted!\\n\\nEverything this user has posted on this " -"site will be permanently deleted!\\n\\nAre you sure?" -msgstr "" - -#: ../../mod/admin.php:689 -#, php-format -msgid "Plugin %s disabled." -msgstr "Плагин %s отключен." - -#: ../../mod/admin.php:693 -#, php-format -msgid "Plugin %s enabled." -msgstr "Плагин %s включен." - -#: ../../mod/admin.php:703 ../../mod/admin.php:901 -msgid "Disable" -msgstr "Запретить" - -#: ../../mod/admin.php:705 ../../mod/admin.php:903 -msgid "Enable" -msgstr "Разрешить" - -#: ../../mod/admin.php:727 ../../mod/admin.php:932 -msgid "Toggle" -msgstr "Переключить" - -#: ../../mod/admin.php:735 ../../mod/admin.php:942 -msgid "Author: " -msgstr "Автор: " - -#: ../../mod/admin.php:736 ../../mod/admin.php:943 -msgid "Maintainer: " -msgstr "Обслуживающий: " - -#: ../../mod/admin.php:865 -msgid "No themes found." -msgstr "Темы не найдены." - -#: ../../mod/admin.php:924 -msgid "Screenshot" -msgstr "Скриншот" - -#: ../../mod/admin.php:972 -msgid "[Experimental]" -msgstr "[экспериментальный]" - -#: ../../mod/admin.php:973 -msgid "[Unsupported]" -msgstr "[неподдерживаемый]" - -#: ../../mod/admin.php:1000 -msgid "Log settings updated." -msgstr "Настройки журнала обновленны." - -#: ../../mod/admin.php:1056 -msgid "Clear" -msgstr "Очистить" - -#: ../../mod/admin.php:1062 -msgid "Debugging" -msgstr "Включить/Выключить" - -#: ../../mod/admin.php:1063 -msgid "Log file" -msgstr "Файл журнала" - -#: ../../mod/admin.php:1063 -msgid "" -"Must be writable by web server. Relative to your Red top-level directory." -msgstr "Должна быть доступна для записи веб-сервером. Относительно верхнего уровня веб-сайта." - -#: ../../mod/admin.php:1064 -msgid "Log level" -msgstr "Уровень журнала" - #: ../../mod/intro.php:17 ../../mod/intro.php:100 -#: ../../mod/connections.php:315 ../../mod/connections.php:450 +#: ../../mod/connections.php:325 ../../mod/connections.php:460 #: ../../mod/notifications.php:51 ../../mod/notifications.php:162 #: ../../mod/notifications.php:208 msgid "Ignore" msgstr "Игнорировать" -#: ../../mod/intro.php:29 ../../mod/connections.php:117 +#: ../../mod/intro.php:29 ../../mod/connections.php:119 msgid "Connection updated." msgstr "Канал обновлен." @@ -4738,7 +4520,7 @@ msgstr "Введений в ожидании нет." msgid "System error. Please try again later." msgstr "Системная ошибка. Пожалуйста, повторите попытку позже." -#: ../../mod/intro.php:95 ../../mod/connections.php:455 +#: ../../mod/intro.php:95 ../../mod/connections.php:465 #: ../../mod/notifications.php:155 ../../mod/notifications.php:202 msgid "Hide this contact from others" msgstr "Скрыть этот канал от других" @@ -4766,365 +4548,370 @@ msgstr "" msgid "Could not locate selected profile." msgstr "" -#: ../../mod/connections.php:119 +#: ../../mod/connections.php:121 msgid "Failed to update connection record." msgstr "" -#: ../../mod/connections.php:186 +#: ../../mod/connections.php:196 msgid "Could not access address book record." msgstr "" -#: ../../mod/connections.php:200 +#: ../../mod/connections.php:210 msgid "Refresh failed - channel is currently unavailable." msgstr "" -#: ../../mod/connections.php:207 +#: ../../mod/connections.php:217 msgid "Channel has been unblocked" msgstr "Канал разблокирован" -#: ../../mod/connections.php:208 +#: ../../mod/connections.php:218 msgid "Channel has been blocked" msgstr "Канал заблокирован" -#: ../../mod/connections.php:212 ../../mod/connections.php:224 -#: ../../mod/connections.php:236 ../../mod/connections.php:248 -#: ../../mod/connections.php:263 +#: ../../mod/connections.php:222 ../../mod/connections.php:234 +#: ../../mod/connections.php:246 ../../mod/connections.php:258 +#: ../../mod/connections.php:273 msgid "Unable to set address book parameters." msgstr "" -#: ../../mod/connections.php:219 +#: ../../mod/connections.php:229 msgid "Channel has been unignored" msgstr "Канал не проигнорирован" -#: ../../mod/connections.php:220 +#: ../../mod/connections.php:230 msgid "Channel has been ignored" msgstr "Канал проигнорирован" -#: ../../mod/connections.php:231 +#: ../../mod/connections.php:241 msgid "Channel has been unarchived" msgstr "Канал разархивирован" -#: ../../mod/connections.php:232 +#: ../../mod/connections.php:242 msgid "Channel has been archived" msgstr "Канал заархивирован" -#: ../../mod/connections.php:243 +#: ../../mod/connections.php:253 msgid "Channel has been unhidden" msgstr "Канал открыт" -#: ../../mod/connections.php:244 +#: ../../mod/connections.php:254 msgid "Channel has been hidden" msgstr "Канал скрыт" -#: ../../mod/connections.php:258 +#: ../../mod/connections.php:268 msgid "Channel has been approved" msgstr "Канал одобрен" -#: ../../mod/connections.php:259 +#: ../../mod/connections.php:269 msgid "Channel has been unapproved" msgstr "Канал не одобрен" -#: ../../mod/connections.php:277 +#: ../../mod/connections.php:287 msgid "Contact has been removed." msgstr "Канал удален." -#: ../../mod/connections.php:297 +#: ../../mod/connections.php:307 #, php-format msgid "View %s's profile" msgstr "Просмотр %s's профиля" -#: ../../mod/connections.php:301 +#: ../../mod/connections.php:311 msgid "Refresh Permissions" msgstr "Обновить разрешения" -#: ../../mod/connections.php:304 +#: ../../mod/connections.php:314 msgid "Fetch updated permissions" msgstr "" -#: ../../mod/connections.php:311 +#: ../../mod/connections.php:318 ../../mod/connections.php:459 +#: ../../mod/admin.php:642 +msgid "Unblock" +msgstr "Разрешить" + +#: ../../mod/connections.php:321 msgid "Block or Unblock this connection" msgstr "Запретить или разрешить этот канал" -#: ../../mod/connections.php:315 ../../mod/connections.php:450 +#: ../../mod/connections.php:325 ../../mod/connections.php:460 msgid "Unignore" msgstr "Не игнорировать" -#: ../../mod/connections.php:318 +#: ../../mod/connections.php:328 msgid "Ignore or Unignore this connection" msgstr "Игнорировать или не игнорировать этот канал" -#: ../../mod/connections.php:321 +#: ../../mod/connections.php:331 msgid "Unarchive" msgstr "Разархивировать" -#: ../../mod/connections.php:321 +#: ../../mod/connections.php:331 msgid "Archive" msgstr "Заархивировать" -#: ../../mod/connections.php:324 +#: ../../mod/connections.php:334 msgid "Archive or Unarchive this connection" msgstr " Заархивировать или разархивировать этот канал" -#: ../../mod/connections.php:327 +#: ../../mod/connections.php:337 msgid "Unhide" msgstr "Показать" -#: ../../mod/connections.php:327 +#: ../../mod/connections.php:337 msgid "Hide" msgstr "Скрыть" -#: ../../mod/connections.php:330 +#: ../../mod/connections.php:340 msgid "Hide or Unhide this connection" msgstr "Скрыть или показывать этот канал" -#: ../../mod/connections.php:337 +#: ../../mod/connections.php:347 msgid "Delete this connection" msgstr "Удалить этот канал" -#: ../../mod/connections.php:370 +#: ../../mod/connections.php:380 msgid "Unknown" msgstr "Неизвестный" -#: ../../mod/connections.php:380 ../../mod/connections.php:408 +#: ../../mod/connections.php:390 ../../mod/connections.php:418 msgid "Approve this connection" msgstr "Утвердить этот канал" -#: ../../mod/connections.php:380 +#: ../../mod/connections.php:390 msgid "Accept connection to allow communication" msgstr "" -#: ../../mod/connections.php:396 +#: ../../mod/connections.php:406 msgid "Automatic Permissions Settings" msgstr "Настройки автоматических разрешений" -#: ../../mod/connections.php:396 +#: ../../mod/connections.php:406 #, php-format msgid "Connections: settings for %s" msgstr "" -#: ../../mod/connections.php:400 +#: ../../mod/connections.php:410 msgid "" "When receiving a channel introduction, any permissions provided here will be" " applied to the new connection automatically and the introduction approved. " "Leave this page if you do not wish to use this feature." msgstr "" -#: ../../mod/connections.php:402 +#: ../../mod/connections.php:412 msgid "Slide to adjust your degree of friendship" msgstr "" -#: ../../mod/connections.php:409 +#: ../../mod/connections.php:419 msgid "Connection has no individual permissions!" msgstr "" -#: ../../mod/connections.php:410 +#: ../../mod/connections.php:420 msgid "" "This may be appropriate based on your <a href=\"settings\">privacy " "settings</a>, though you may wish to review the \"Advanced Permissions\"." msgstr "" -#: ../../mod/connections.php:412 +#: ../../mod/connections.php:422 msgid "Profile Visibility" msgstr "Видимость профиля" -#: ../../mod/connections.php:413 +#: ../../mod/connections.php:423 #, php-format msgid "" "Please choose the profile you would like to display to %s when viewing your " "profile securely." msgstr "" -#: ../../mod/connections.php:414 +#: ../../mod/connections.php:424 msgid "Contact Information / Notes" msgstr "Информация / Примечания о канале" -#: ../../mod/connections.php:415 +#: ../../mod/connections.php:425 msgid "Edit contact notes" msgstr "Редактировать примечания канала" -#: ../../mod/connections.php:417 +#: ../../mod/connections.php:427 msgid "Their Settings" msgstr "Их настройки" -#: ../../mod/connections.php:418 +#: ../../mod/connections.php:428 msgid "My Settings" msgstr "Мои настройки" -#: ../../mod/connections.php:420 +#: ../../mod/connections.php:430 msgid "Forum Members" msgstr "Участники форума" -#: ../../mod/connections.php:421 +#: ../../mod/connections.php:431 msgid "Soapbox" msgstr "Soapbox" -#: ../../mod/connections.php:422 +#: ../../mod/connections.php:432 msgid "Full Sharing" msgstr "Полный обмен" -#: ../../mod/connections.php:423 +#: ../../mod/connections.php:433 msgid "Cautious Sharing" msgstr "" -#: ../../mod/connections.php:424 +#: ../../mod/connections.php:434 msgid "Follow Only" msgstr "Только следовать" -#: ../../mod/connections.php:425 +#: ../../mod/connections.php:435 msgid "Individual Permissions" msgstr "Индивидуальные разрешения" -#: ../../mod/connections.php:426 +#: ../../mod/connections.php:436 msgid "" "Individual permissions are only enabled for <a href=\"settings\">privacy " "settings</a> which are set to \"Only those you specifically allow\". " "Otherwise they are controlled by your privacy settings." msgstr "" -#: ../../mod/connections.php:427 +#: ../../mod/connections.php:437 msgid "Advanced Permissions" msgstr "Дополнительные разрешения" -#: ../../mod/connections.php:428 +#: ../../mod/connections.php:438 msgid "Quick Links" msgstr "Быстрые ссылки" -#: ../../mod/connections.php:432 +#: ../../mod/connections.php:442 #, php-format msgid "Visit %s's profile - %s" msgstr "Посетить %s's профиль - %s" -#: ../../mod/connections.php:433 +#: ../../mod/connections.php:443 msgid "Block/Unblock contact" msgstr "Запретить/разрешить канал" -#: ../../mod/connections.php:434 +#: ../../mod/connections.php:444 msgid "Ignore contact" msgstr "Игнорировать канал" -#: ../../mod/connections.php:435 +#: ../../mod/connections.php:445 msgid "Repair URL settings" msgstr "Ремонт настройки URL" -#: ../../mod/connections.php:436 +#: ../../mod/connections.php:446 msgid "View conversations" msgstr "Просмотр разговоров" -#: ../../mod/connections.php:438 +#: ../../mod/connections.php:448 msgid "Delete contact" msgstr "Удалить канал" -#: ../../mod/connections.php:441 +#: ../../mod/connections.php:451 msgid "Last update:" msgstr "Последнее обновление:" -#: ../../mod/connections.php:443 +#: ../../mod/connections.php:453 msgid "Update public posts" msgstr "Обновить публичные сообщения" -#: ../../mod/connections.php:445 +#: ../../mod/connections.php:455 msgid "Update now" msgstr "Обновить сейчас" -#: ../../mod/connections.php:451 +#: ../../mod/connections.php:461 msgid "Currently blocked" msgstr "В настоящее время заблокирован" -#: ../../mod/connections.php:452 +#: ../../mod/connections.php:462 msgid "Currently ignored" msgstr "В настоящее время игнорируются" -#: ../../mod/connections.php:453 +#: ../../mod/connections.php:463 msgid "Currently archived" msgstr "В настоящее время зархивированны" -#: ../../mod/connections.php:454 +#: ../../mod/connections.php:464 msgid "Currently pending" msgstr "В настоящее время в ожидании" -#: ../../mod/connections.php:455 +#: ../../mod/connections.php:465 msgid "" "Replies/likes to your public posts <strong>may</strong> still be visible" msgstr "" -#: ../../mod/connections.php:491 ../../mod/connections.php:563 +#: ../../mod/connections.php:501 ../../mod/connections.php:573 msgid "Blocked" msgstr "Заблокированные" -#: ../../mod/connections.php:496 ../../mod/connections.php:570 +#: ../../mod/connections.php:506 ../../mod/connections.php:580 msgid "Ignored" msgstr "Игнорируемые" -#: ../../mod/connections.php:501 ../../mod/connections.php:584 +#: ../../mod/connections.php:511 ../../mod/connections.php:594 msgid "Hidden" msgstr "Скрытые" -#: ../../mod/connections.php:506 ../../mod/connections.php:577 +#: ../../mod/connections.php:516 ../../mod/connections.php:587 msgid "Archived" msgstr "Зархивированные" -#: ../../mod/connections.php:517 +#: ../../mod/connections.php:527 msgid "All" msgstr "Все" -#: ../../mod/connections.php:538 +#: ../../mod/connections.php:548 msgid "Suggestions" msgstr "Рекомендации" -#: ../../mod/connections.php:541 +#: ../../mod/connections.php:551 msgid "Suggest new connections" -msgstr "Предлагать новые каналы" +msgstr "Предлагать новые контакты" -#: ../../mod/connections.php:547 +#: ../../mod/connections.php:557 msgid "Show pending (new) connections" msgstr "Просмотр (новых) ждущих каналов" -#: ../../mod/connections.php:550 +#: ../../mod/connections.php:560 msgid "All Connections" -msgstr "Все каналы" +msgstr "Все контакты" -#: ../../mod/connections.php:553 +#: ../../mod/connections.php:563 msgid "Show all connections" msgstr "Просмотр всех каналов" -#: ../../mod/connections.php:556 +#: ../../mod/connections.php:566 msgid "Unblocked" msgstr "Разрешенные" -#: ../../mod/connections.php:559 +#: ../../mod/connections.php:569 msgid "Only show unblocked connections" -msgstr "Показать только разрешенные каналы" +msgstr "Показать только разрешенные контакты" -#: ../../mod/connections.php:566 +#: ../../mod/connections.php:576 msgid "Only show blocked connections" -msgstr "Показать только заблокированные каналы" +msgstr "Показать только заблокированные контакты" -#: ../../mod/connections.php:573 +#: ../../mod/connections.php:583 msgid "Only show ignored connections" -msgstr "Показать только проигнорированные каналы" +msgstr "Показать только проигнорированные контакты" -#: ../../mod/connections.php:580 +#: ../../mod/connections.php:590 msgid "Only show archived connections" -msgstr "Показать только архивированные каналы" +msgstr "Показать только архивированные контакты" -#: ../../mod/connections.php:587 +#: ../../mod/connections.php:597 msgid "Only show hidden connections" -msgstr "Показать только скрытые каналы" +msgstr "Показать только скрытые контакты" -#: ../../mod/connections.php:629 +#: ../../mod/connections.php:639 #, php-format msgid "%1$s [%2$s]" msgstr "%1$s [%2$s]" -#: ../../mod/connections.php:630 ../../mod/nogroup.php:41 +#: ../../mod/connections.php:640 ../../mod/nogroup.php:41 msgid "Edit contact" msgstr "Редактировать канал" -#: ../../mod/connections.php:654 +#: ../../mod/connections.php:664 msgid "Search your connections" msgstr "Поиск каналов" -#: ../../mod/connections.php:655 +#: ../../mod/connections.php:665 msgid "Finding: " msgstr "Поиск:" @@ -5250,7 +5037,7 @@ msgstr "Изменить фотографию профиля" #: ../../mod/profiles.php:532 msgid "Create a new profile using these settings" -msgstr "" +msgstr "Создайте новый профиль со следующими настройками" #: ../../mod/profiles.php:533 msgid "Clone this profile" @@ -5351,7 +5138,7 @@ msgstr "Информация и социальные сети канала" #: ../../mod/profiles.php:562 msgid "My other channels" -msgstr "Мои другие каналы" +msgstr "Мои другие контакты" #: ../../mod/profiles.php:563 msgid "Musical interests" @@ -5391,23 +5178,23 @@ msgstr "" msgid "Edit/Manage Profiles" msgstr "Редактирование / Управление профилей" -#: ../../mod/profiles.php:624 ../../boot.php:1640 +#: ../../mod/profiles.php:624 ../../boot.php:1701 msgid "Change profile photo" msgstr "Изменить фотографию профиля" -#: ../../mod/profiles.php:625 ../../boot.php:1647 +#: ../../mod/profiles.php:625 ../../boot.php:1708 msgid "Create New Profile" msgstr "Создать новый профиль" -#: ../../mod/profiles.php:636 ../../boot.php:1661 +#: ../../mod/profiles.php:636 ../../boot.php:1722 msgid "Profile Image" msgstr "Изображение профиля" -#: ../../mod/profiles.php:639 ../../boot.php:1664 +#: ../../mod/profiles.php:639 ../../boot.php:1725 msgid "visible to everybody" msgstr "видно всем" -#: ../../mod/profiles.php:640 ../../boot.php:1665 +#: ../../mod/profiles.php:640 ../../boot.php:1726 msgid "Edit visibility" msgstr "Редактировать видимость" @@ -5445,9 +5232,494 @@ msgstr "" msgid "Or <a href=\"import\">import an existing channel</a> from another location" msgstr "" -#: ../../mod/new_channel.php:117 -msgid "Create" -msgstr "Создать" +#: ../../mod/admin.php:48 +msgid "Theme settings updated." +msgstr "Настройки темы обновленны." + +#: ../../mod/admin.php:83 ../../mod/admin.php:408 +msgid "Site" +msgstr "Сайт" + +#: ../../mod/admin.php:84 ../../mod/admin.php:632 ../../mod/admin.php:644 +msgid "Users" +msgstr "Пользователи" + +#: ../../mod/admin.php:85 ../../mod/admin.php:726 ../../mod/admin.php:768 +msgid "Plugins" +msgstr "Плагины" + +#: ../../mod/admin.php:86 ../../mod/admin.php:931 ../../mod/admin.php:967 +msgid "Themes" +msgstr "Темы" + +#: ../../mod/admin.php:87 +msgid "DB updates" +msgstr "Обновления базы данных" + +#: ../../mod/admin.php:101 ../../mod/admin.php:108 ../../mod/admin.php:1054 +msgid "Logs" +msgstr "Журналы" + +#: ../../mod/admin.php:107 +msgid "Plugin Features" +msgstr "Функции плагинов" + +#: ../../mod/admin.php:109 +msgid "User registrations waiting for confirmation" +msgstr "Регистрации пользователей, которые ждут подтверждения" + +#: ../../mod/admin.php:180 +msgid "Message queues" +msgstr "Непрочитанный сообщений" + +#: ../../mod/admin.php:185 ../../mod/admin.php:407 ../../mod/admin.php:631 +#: ../../mod/admin.php:725 ../../mod/admin.php:767 ../../mod/admin.php:930 +#: ../../mod/admin.php:966 ../../mod/admin.php:1053 +msgid "Administration" +msgstr "Администрация" + +#: ../../mod/admin.php:186 +msgid "Summary" +msgstr "Резюме" + +#: ../../mod/admin.php:188 +msgid "Registered users" +msgstr "Всего пользователeй" + +#: ../../mod/admin.php:190 +msgid "Pending registrations" +msgstr "Ждут утверждения" + +#: ../../mod/admin.php:191 +msgid "Version" +msgstr "Версия системы" + +#: ../../mod/admin.php:193 +msgid "Active plugins" +msgstr "Активные плагины" + +#: ../../mod/admin.php:332 +msgid "Site settings updated." +msgstr "Настройки сайта обновлены." + +#: ../../mod/admin.php:363 +msgid "No special theme for accessibility" +msgstr "" + +#: ../../mod/admin.php:388 +msgid "Closed" +msgstr "Регистрация закрыта" + +#: ../../mod/admin.php:389 +msgid "Requires approval" +msgstr "Регистрация требует подтверждения" + +#: ../../mod/admin.php:390 +msgid "Open" +msgstr "Регистрация открыта" + +#: ../../mod/admin.php:395 +msgid "Private" +msgstr "Личный доступ" + +#: ../../mod/admin.php:396 +msgid "Paid Access" +msgstr "Платный доступ" + +#: ../../mod/admin.php:397 +msgid "Free Access" +msgstr "Свободный доступ" + +#: ../../mod/admin.php:410 ../../mod/register.php:172 +msgid "Registration" +msgstr "Регистрация" + +#: ../../mod/admin.php:411 +msgid "File upload" +msgstr "Загрузка файла" + +#: ../../mod/admin.php:412 +msgid "Policies" +msgstr "Правила" + +#: ../../mod/admin.php:413 +msgid "Advanced" +msgstr "Дополнительно" + +#: ../../mod/admin.php:417 +msgid "Site name" +msgstr "Название сайта" + +#: ../../mod/admin.php:418 +msgid "Banner/Logo" +msgstr "Баннер / логотип" + +#: ../../mod/admin.php:419 +msgid "System language" +msgstr "Язык системы" + +#: ../../mod/admin.php:420 +msgid "System theme" +msgstr "Тема системы" + +#: ../../mod/admin.php:420 +msgid "" +"Default system theme - may be over-ridden by user profiles - <a href='#' " +"id='cnftheme'>change theme settings</a>" +msgstr "" + +#: ../../mod/admin.php:421 +msgid "Mobile system theme" +msgstr "Мобильная тема системы" + +#: ../../mod/admin.php:421 +msgid "Theme for mobile devices" +msgstr "Тема для мобильных устройств" + +#: ../../mod/admin.php:422 +msgid "Accessibility system theme" +msgstr "" + +#: ../../mod/admin.php:422 +msgid "Accessibility theme" +msgstr "" + +#: ../../mod/admin.php:423 +msgid "Channel to use for this website's static pages" +msgstr "" + +#: ../../mod/admin.php:423 +msgid "Site Channel" +msgstr "Канал сайта" + +#: ../../mod/admin.php:425 +msgid "Maximum image size" +msgstr "Максимальный размер" + +#: ../../mod/admin.php:425 +msgid "" +"Maximum size in bytes of uploaded images. Default is 0, which means no " +"limits." +msgstr "" + +#: ../../mod/admin.php:426 +msgid "Register policy" +msgstr "Статус регистрации" + +#: ../../mod/admin.php:427 +msgid "Access policy" +msgstr "Правила доступа" + +#: ../../mod/admin.php:428 +msgid "Register text" +msgstr "Текст регистрации" + +#: ../../mod/admin.php:428 +msgid "Will be displayed prominently on the registration page." +msgstr "" + +#: ../../mod/admin.php:429 +msgid "Accounts abandoned after x days" +msgstr "" + +#: ../../mod/admin.php:429 +msgid "" +"Will not waste system resources polling external sites for abandonded " +"accounts. Enter 0 for no time limit." +msgstr "" + +#: ../../mod/admin.php:430 +msgid "Allowed friend domains" +msgstr "" + +#: ../../mod/admin.php:430 +msgid "" +"Comma separated list of domains which are allowed to establish friendships " +"with this site. Wildcards are accepted. Empty to allow any domains" +msgstr "" + +#: ../../mod/admin.php:431 +msgid "Allowed email domains" +msgstr "" + +#: ../../mod/admin.php:431 +msgid "" +"Comma separated list of domains which are allowed in email addresses for " +"registrations to this site. Wildcards are accepted. Empty to allow any " +"domains" +msgstr "" + +#: ../../mod/admin.php:432 +msgid "Block public" +msgstr "Блокировать публичный доступ" + +#: ../../mod/admin.php:432 +msgid "" +"Check to block public access to all otherwise public personal pages on this " +"site unless you are currently logged in." +msgstr "" + +#: ../../mod/admin.php:433 +msgid "Force publish" +msgstr "Заставить публиковать" + +#: ../../mod/admin.php:433 +msgid "" +"Check to force all profiles on this site to be listed in the site directory." +msgstr "" + +#: ../../mod/admin.php:435 +msgid "Proxy user" +msgstr "Proxy пользователь" + +#: ../../mod/admin.php:436 +msgid "Proxy URL" +msgstr "Proxy URL" + +#: ../../mod/admin.php:437 +msgid "Network timeout" +msgstr "Время ожидания сети" + +#: ../../mod/admin.php:437 +msgid "Value is in seconds. Set to 0 for unlimited (not recommended)." +msgstr "" + +#: ../../mod/admin.php:438 +msgid "Delivery interval" +msgstr "Интервал доставки" + +#: ../../mod/admin.php:438 +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 "" + +#: ../../mod/admin.php:439 +msgid "Poll interval" +msgstr "Интервал опроса" + +#: ../../mod/admin.php:439 +msgid "" +"Delay background polling processes by this many seconds to reduce system " +"load. If 0, use delivery interval." +msgstr "" + +#: ../../mod/admin.php:440 +msgid "Maximum Load Average" +msgstr "" + +#: ../../mod/admin.php:440 +msgid "" +"Maximum system load before delivery and poll processes are deferred - " +"default 50." +msgstr "" + +#: ../../mod/admin.php:456 +msgid "Update has been marked successful" +msgstr "" + +#: ../../mod/admin.php:466 +#, php-format +msgid "Executing %s failed. Check system logs." +msgstr "" + +#: ../../mod/admin.php:469 +#, php-format +msgid "Update %s was successfully applied." +msgstr "" + +#: ../../mod/admin.php:473 +#, php-format +msgid "Update %s did not return a status. Unknown if it succeeded." +msgstr "" + +#: ../../mod/admin.php:476 +#, php-format +msgid "Update function %s could not be found." +msgstr "" + +#: ../../mod/admin.php:491 +msgid "No failed updates." +msgstr "Ошибок обновлений нет." + +#: ../../mod/admin.php:495 +msgid "Failed Updates" +msgstr "Обновления с ошибками" + +#: ../../mod/admin.php:497 +msgid "Mark success (if update was manually applied)" +msgstr "" + +#: ../../mod/admin.php:498 +msgid "Attempt to execute this update step automatically" +msgstr "" + +#: ../../mod/admin.php:524 +#, php-format +msgid "%s user blocked/unblocked" +msgid_plural "%s users blocked/unblocked" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +#: ../../mod/admin.php:531 +#, php-format +msgid "%s user deleted" +msgid_plural "%s users deleted" +msgstr[0] "%s канал удален" +msgstr[1] "%s канала удалены" +msgstr[2] "%s каналов удалено" + +#: ../../mod/admin.php:562 +msgid "Account not found" +msgstr "Аккаунт не найден" + +#: ../../mod/admin.php:573 +#, php-format +msgid "User '%s' deleted" +msgstr "Пользователь '%s' удален" + +#: ../../mod/admin.php:582 +#, php-format +msgid "User '%s' unblocked" +msgstr "Пользователь '%s' разрешен" + +#: ../../mod/admin.php:582 +#, php-format +msgid "User '%s' blocked" +msgstr "Пользователь '%s' заблокирован" + +#: ../../mod/admin.php:613 +msgid "Normal Account" +msgstr "Нормальный аккаунт" + +#: ../../mod/admin.php:614 +msgid "Soapbox Account" +msgstr "Soapbox аккаунт" + +#: ../../mod/admin.php:615 +msgid "Community/Celebrity Account" +msgstr "Community/Celebrity аккаунт" + +#: ../../mod/admin.php:616 +msgid "Automatic Friend Account" +msgstr "Аккаунт \"автоматически друзья\"" + +#: ../../mod/admin.php:634 +msgid "select all" +msgstr "выбрать все" + +#: ../../mod/admin.php:635 +msgid "User registrations waiting for confirm" +msgstr "Регистрации пользователей ждут подтверждения" + +#: ../../mod/admin.php:636 +msgid "Request date" +msgstr "Дата запроса" + +#: ../../mod/admin.php:637 +msgid "No registrations." +msgstr "Новых регистраций пока нет." + +#: ../../mod/admin.php:639 +msgid "Deny" +msgstr "Запретить" + +#: ../../mod/admin.php:645 +msgid "Register date" +msgstr "Дата регистрации" + +#: ../../mod/admin.php:645 +msgid "Last login" +msgstr "Последний вход" + +#: ../../mod/admin.php:645 +msgid "Service Class" +msgstr "Класс службы" + +#: ../../mod/admin.php:647 +msgid "" +"Selected users will be deleted!\\n\\nEverything these users had posted on " +"this site will be permanently deleted!\\n\\nAre you sure?" +msgstr "" + +#: ../../mod/admin.php:648 +msgid "" +"The user {0} will be deleted!\\n\\nEverything this user has posted on this " +"site will be permanently deleted!\\n\\nAre you sure?" +msgstr "" + +#: ../../mod/admin.php:689 +#, php-format +msgid "Plugin %s disabled." +msgstr "Плагин %s отключен." + +#: ../../mod/admin.php:693 +#, php-format +msgid "Plugin %s enabled." +msgstr "Плагин %s включен." + +#: ../../mod/admin.php:703 ../../mod/admin.php:901 +msgid "Disable" +msgstr "Запретить" + +#: ../../mod/admin.php:705 ../../mod/admin.php:903 +msgid "Enable" +msgstr "Разрешить" + +#: ../../mod/admin.php:727 ../../mod/admin.php:932 +msgid "Toggle" +msgstr "Переключить" + +#: ../../mod/admin.php:735 ../../mod/admin.php:942 +msgid "Author: " +msgstr "Автор: " + +#: ../../mod/admin.php:736 ../../mod/admin.php:943 +msgid "Maintainer: " +msgstr "Обслуживающий: " + +#: ../../mod/admin.php:865 +msgid "No themes found." +msgstr "Темы не найдены." + +#: ../../mod/admin.php:924 +msgid "Screenshot" +msgstr "Скриншот" + +#: ../../mod/admin.php:972 +msgid "[Experimental]" +msgstr "[экспериментальный]" + +#: ../../mod/admin.php:973 +msgid "[Unsupported]" +msgstr "[неподдерживаемый]" + +#: ../../mod/admin.php:1000 +msgid "Log settings updated." +msgstr "Настройки журнала обновленны." + +#: ../../mod/admin.php:1056 +msgid "Clear" +msgstr "Очистить" + +#: ../../mod/admin.php:1062 +msgid "Debugging" +msgstr "Включить/Выключить" + +#: ../../mod/admin.php:1063 +msgid "Log file" +msgstr "Файл журнала" + +#: ../../mod/admin.php:1063 +msgid "" +"Must be writable by web server. Relative to your Red top-level directory." +msgstr "Должна быть доступна для записи веб-сервером. Относительно верхнего уровня веб-сайта." + +#: ../../mod/admin.php:1064 +msgid "Log level" +msgstr "Уровень журнала" #: ../../mod/lostpass.php:15 msgid "No valid account found." @@ -5473,7 +5745,7 @@ msgid "" "Password reset failed." msgstr "" -#: ../../mod/lostpass.php:85 ../../boot.php:1372 +#: ../../mod/lostpass.php:85 ../../boot.php:1430 msgid "Password Reset" msgstr "Сбросить пароль" @@ -5547,19 +5819,19 @@ msgstr "" msgid "Cloned channel not found. Import failed." msgstr "" -#: ../../mod/import.php:327 +#: ../../mod/import.php:352 msgid "Import completed." msgstr "Импорт завершен." -#: ../../mod/import.php:340 +#: ../../mod/import.php:365 msgid "You must be logged in to use this feature." msgstr "Вы должны войти в систему, чтобы использовать эту функцию." -#: ../../mod/import.php:345 +#: ../../mod/import.php:370 msgid "Import Channel" msgstr "Импорт канала" -#: ../../mod/import.php:346 +#: ../../mod/import.php:371 msgid "" "Use this form to import an existing channel from a different server/hub. You" " may retrieve the channel identity from the old server/hub via the network " @@ -5567,27 +5839,27 @@ msgid "" "be imported. Importation of content is not yet available." msgstr "" -#: ../../mod/import.php:347 +#: ../../mod/import.php:372 msgid "File to Upload" msgstr "Файл для загрузки" -#: ../../mod/import.php:348 +#: ../../mod/import.php:373 msgid "Or provide the old server/hub details" msgstr "" -#: ../../mod/import.php:349 +#: ../../mod/import.php:374 msgid "Your old identity address (xyz@example.com)" msgstr "" -#: ../../mod/import.php:350 +#: ../../mod/import.php:375 msgid "Your old login email address" -msgstr "" +msgstr "Ваш старый адрес электронной почты" -#: ../../mod/import.php:351 +#: ../../mod/import.php:376 msgid "Your old login password" -msgstr "" +msgstr "Ваш старый пароль" -#: ../../mod/import.php:352 +#: ../../mod/import.php:377 msgid "" "For either option, please choose whether to make this hub your new primary " "address, or whether your old location should continue this role. You will be" @@ -5595,7 +5867,7 @@ msgid "" "primary location for files, photos, and media." msgstr "" -#: ../../mod/import.php:353 +#: ../../mod/import.php:378 msgid "Make this hub my primary location" msgstr "" @@ -5623,6 +5895,14 @@ msgstr "Канал по умолчанию" msgid "Make Default" msgstr "Сделать стандартным" +#: ../../mod/vote.php:97 +msgid "Total votes" +msgstr "" + +#: ../../mod/vote.php:98 +msgid "Average Rating" +msgstr "" + #: ../../mod/match.php:12 msgid "Profile Match" msgstr "" @@ -5704,10 +5984,34 @@ msgstr "Новое фото из этого URL" msgid "invalid target signature" msgstr "" -#: ../../mod/follow.php:24 +#: ../../mod/follow.php:25 msgid "Channel added." msgstr "Канал добавлен." +#: ../../mod/editlayout.php:37 ../../mod/editwebpage.php:31 +#: ../../mod/editpost.php:20 ../../mod/editblock.php:37 +msgid "Item not found" +msgstr "Элемент не найден" + +#: ../../mod/editlayout.php:69 ../../mod/editblock.php:69 +msgid "Edit block" +msgstr "" + +#: ../../mod/editlayout.php:105 ../../mod/editwebpage.php:121 +#: ../../mod/editpost.php:98 ../../mod/editblock.php:105 +msgid "Insert YouTube video" +msgstr "Вставить YouTube видео" + +#: ../../mod/editlayout.php:106 ../../mod/editwebpage.php:122 +#: ../../mod/editpost.php:99 ../../mod/editblock.php:106 +msgid "Insert Vorbis [.ogg] video" +msgstr "Вставить Vorbis [.ogg] видео" + +#: ../../mod/editlayout.php:107 ../../mod/editwebpage.php:123 +#: ../../mod/editpost.php:100 ../../mod/editblock.php:107 +msgid "Insert Vorbis [.ogg] audio" +msgstr "Вставить Vorbis [.ogg] музыку" + #: ../../mod/nogroup.php:58 msgid "Contacts who are not members of a group" msgstr "" @@ -5788,26 +6092,10 @@ msgstr "Загрузка изображениея прошла безуспеш msgid "Image size reduction [%s] failed." msgstr "" -#: ../../mod/editwebpage.php:36 ../../mod/editpost.php:18 -msgid "Item not found" -msgstr "Элемент не найден" - -#: ../../mod/editwebpage.php:69 ../../mod/editpost.php:38 +#: ../../mod/editwebpage.php:85 ../../mod/editpost.php:40 msgid "Edit post" msgstr "Редактировать сообщение" -#: ../../mod/editwebpage.php:107 ../../mod/editpost.php:80 -msgid "Insert YouTube video" -msgstr "Вставить YouTube видео" - -#: ../../mod/editwebpage.php:108 ../../mod/editpost.php:81 -msgid "Insert Vorbis [.ogg] video" -msgstr "Вставить Vorbis [.ogg] видео" - -#: ../../mod/editwebpage.php:109 ../../mod/editpost.php:82 -msgid "Insert Vorbis [.ogg] audio" -msgstr "Вставить Vorbis [.ogg] музыку" - #: ../../mod/notifications.php:26 msgid "Invalid request identifier." msgstr "" @@ -5946,7 +6234,7 @@ msgstr "Домашние оповещения" msgid "Post successful." msgstr "Публикация прошла успешно." -#: ../../mod/editpost.php:29 +#: ../../mod/editpost.php:31 msgid "Item is not editable" msgstr "Элемент нельзя редактировать" @@ -6021,7 +6309,7 @@ msgstr "Видно" #: ../../mod/profperm.php:139 msgid "All Contacts (with secure profile access)" -msgstr "Все каналы (с доступом защищенному профилю)" +msgstr "Все контакты (с доступом защищенному профилю)" #: ../../mod/siteinfo.php:51 #, php-format @@ -6076,6 +6364,22 @@ msgstr "" msgid "Ignore/Hide" msgstr "Игнорировать / Скрыть" +#: ../../mod/pubsites.php:22 +msgid "Public Sites" +msgstr "" + +#: ../../mod/pubsites.php:28 +msgid "Site URL" +msgstr "" + +#: ../../mod/pubsites.php:28 +msgid "Access Type" +msgstr "" + +#: ../../mod/pubsites.php:28 +msgid "Registration Policy" +msgstr "" + #: ../../mod/register.php:35 msgid "Maximum daily site registrations exceeded. Please try again tomorrow." msgstr "" @@ -6085,57 +6389,61 @@ msgid "" "Please indicate acceptance of the Terms of Service. Registration failed." msgstr "" -#: ../../mod/register.php:91 +#: ../../mod/register.php:69 +msgid "Passwords do not match." +msgstr "" + +#: ../../mod/register.php:97 msgid "" "Registration successful. Please check your email for validation " "instructions." msgstr "" -#: ../../mod/register.php:97 +#: ../../mod/register.php:103 msgid "Your registration is pending approval by the site owner." msgstr "" -#: ../../mod/register.php:100 +#: ../../mod/register.php:106 msgid "Your registration can not be processed." msgstr "" -#: ../../mod/register.php:135 +#: ../../mod/register.php:141 msgid "" "This site has exceeded the number of allowed daily account registrations. " "Please try again tomorrow." msgstr "" -#: ../../mod/register.php:146 +#: ../../mod/register.php:152 msgid "Terms of Service" msgstr "" -#: ../../mod/register.php:152 +#: ../../mod/register.php:158 #, php-format msgid "I accept the %s for this website" msgstr "" -#: ../../mod/register.php:154 +#: ../../mod/register.php:160 #, php-format msgid "I am over 13 years of age and accept the %s for this website" msgstr "" -#: ../../mod/register.php:169 +#: ../../mod/register.php:175 msgid "Membership on this site is by invitation only." msgstr "" -#: ../../mod/register.php:170 +#: ../../mod/register.php:176 msgid "Please enter your invitation code" msgstr "" -#: ../../mod/register.php:173 +#: ../../mod/register.php:179 msgid "Your email address" msgstr "Ваш адрес электронной почты" -#: ../../mod/register.php:174 +#: ../../mod/register.php:180 msgid "Choose a password" msgstr "Выберите пароль" -#: ../../mod/register.php:175 +#: ../../mod/register.php:181 msgid "Please re-enter your password" msgstr "" @@ -6175,7 +6483,7 @@ msgstr "Настройки темы" #: ../../view/theme/redbasic/php/config.php:157 #: ../../view/theme/redstrap/php/config.php:134 msgid "Set font-size for posts and comments" -msgstr "" +msgstr "Установить размер шрифта для сообщений и комментариев" #: ../../view/theme/redbasic/php/config.php:140 #: ../../view/theme/redbasic/php/config.php:158 @@ -6227,104 +6535,104 @@ msgstr "Угловой радиус" msgid "0-99 default: 5" msgstr "0-99 по умолчанию: 5" -#: ../../boot.php:1196 +#: ../../boot.php:1234 #, php-format msgid "Update %s failed. See error logs." msgstr "" -#: ../../boot.php:1199 +#: ../../boot.php:1237 #, php-format msgid "Update Error at %s" msgstr "Ошибка обновления на %s" -#: ../../boot.php:1336 +#: ../../boot.php:1394 msgid "Create a New Account" msgstr "Создать новый аккаунт" -#: ../../boot.php:1365 +#: ../../boot.php:1423 msgid "Password" msgstr "Пароль" -#: ../../boot.php:1366 +#: ../../boot.php:1424 msgid "Remember me" msgstr "Запомнить" -#: ../../boot.php:1371 +#: ../../boot.php:1429 msgid "Forgot your password?" msgstr "Забыли пароль или логин?" -#: ../../boot.php:1490 +#: ../../boot.php:1548 msgid "Requested channel is not available." msgstr "Запрашиваемый канал не доступен." -#: ../../boot.php:1502 +#: ../../boot.php:1560 msgid " Sorry, you don't have the permission to view this profile. " msgstr "" -#: ../../boot.php:1646 +#: ../../boot.php:1707 msgid "Profiles" msgstr "Профили" -#: ../../boot.php:1646 +#: ../../boot.php:1707 msgid "Manage/edit profiles" msgstr "Управление / Редактирование профилей" -#: ../../boot.php:1650 +#: ../../boot.php:1711 msgid "Edit Profile" msgstr "Редактировать профиль" -#: ../../boot.php:1728 ../../boot.php:1808 +#: ../../boot.php:1800 ../../boot.php:1880 msgid "F d" msgstr "F d" -#: ../../boot.php:1785 +#: ../../boot.php:1857 msgid "Birthday Reminders" msgstr "Напоминания о Днях Рождения" -#: ../../boot.php:1786 +#: ../../boot.php:1858 msgid "Birthdays this week:" msgstr "Дни Рождения на этой неделе:" -#: ../../boot.php:1841 +#: ../../boot.php:1913 msgid "[No description]" msgstr "[без описания]" -#: ../../boot.php:1859 +#: ../../boot.php:1931 msgid "Event Reminders" msgstr "Напоминания мероприятий" -#: ../../boot.php:1860 +#: ../../boot.php:1932 msgid "Events this week:" msgstr "Мероприятия на этой неделе:" -#: ../../boot.php:2083 +#: ../../boot.php:2166 msgid "Channel" msgstr "Канал" -#: ../../boot.php:2086 +#: ../../boot.php:2169 msgid "Status Messages and Posts" msgstr "" -#: ../../boot.php:2090 +#: ../../boot.php:2173 msgid "About" msgstr "О себе" -#: ../../boot.php:2093 +#: ../../boot.php:2176 msgid "Profile Details" msgstr "Сведения о профиле" -#: ../../boot.php:2111 +#: ../../boot.php:2194 msgid "Events and Calendar" msgstr "Мероприятия и календарь" -#: ../../boot.php:2116 +#: ../../boot.php:2199 msgid "Webpages" msgstr "Веб-страницы" -#: ../../boot.php:2119 +#: ../../boot.php:2202 msgid "Manage Webpages" -msgstr "" +msgstr "Управление веб-страниц" -#: ../../boot.php:2346 +#: ../../boot.php:2484 msgid "toggle mobile" msgstr "мобильное подключение" diff --git a/view/tpl/admin_aside.tpl b/view/tpl/admin_aside.tpl index acf58668d..fdf070aa2 100755 --- a/view/tpl/admin_aside.tpl +++ b/view/tpl/admin_aside.tpl @@ -16,6 +16,7 @@ <li class='admin link button {{$admin.users.2}}'><a href='{{$admin.users.0}}'>{{$admin.users.1}}</a><span id='pending-update' title='{{$h_pending}}'></span></li> <li class='admin link button {{$admin.plugins.2}}'><a href='{{$admin.plugins.0}}'>{{$admin.plugins.1}}</a></li> <li class='admin link button {{$admin.themes.2}}'><a href='{{$admin.themes.0}}'>{{$admin.themes.1}}</a></li> + <li class='admin link button {{$admin.hubloc.2}}'><a href='{{$admin.hubloc.0}}'>{{$admin.hubloc.1}}</a></li> <li class='admin link button {{$admin.dbsync.2}}'><a href='{{$admin.dbsync.0}}'>{{$admin.dbsync.1}}</a></li> </ul> diff --git a/view/tpl/peoplefind.tpl b/view/tpl/peoplefind.tpl index 72c0830cf..831cd9614 100755 --- a/view/tpl/peoplefind.tpl +++ b/view/tpl/peoplefind.tpl @@ -1,7 +1,7 @@ <div id="peoplefind-sidebar" class="widget"> <h3>{{$findpeople}}</h3> <div id="peoplefind-desc">{{$desc}}</div> - <form action="dirfind" method="post" /> + <form action="directory" method="post" /> <input id="side-peoplefind-url" type="text" name="search" size="24" title="{{$hint}}" /><input id="side-peoplefind-submit" type="submit" name="submit" value="{{$findthem}}" /> </form> <div class="side-link" id="side-match-link"><a href="match" >{{$similar}}</a></div> diff --git a/view/tpl/posted_date_widget.tpl b/view/tpl/posted_date_widget.tpl index 009fa60a6..6720d3628 100755 --- a/view/tpl/posted_date_widget.tpl +++ b/view/tpl/posted_date_widget.tpl @@ -3,7 +3,7 @@ <script>function dateSubmit(dateurl) { window.location.href = dateurl; } </script> <select id="posted-date-selector" name="posted-date-select" onchange="dateSubmit($(this).val());" size="{{$size}}"> {{foreach $dates as $d}} -<option value="{{$url}}/{{$d.1}}/{{$d.2}}" >{{$d.0}}</option> +<option value="{{$url}}?dend={{$d.1}}&dbegin={{$d.2}}" >{{$d.0}}</option> {{/foreach}} </select> </div> diff --git a/view/tpl/settings_features.tpl b/view/tpl/settings_features.tpl index 31371e0af..02e4f6159 100755 --- a/view/tpl/settings_features.tpl +++ b/view/tpl/settings_features.tpl @@ -1,4 +1,3 @@ -<div class="generic-content-wrapper"> <h1>{{$title}}</h1> @@ -18,5 +17,3 @@ </div> </form> - -</div> |