diff options
45 files changed, 2293 insertions, 2138 deletions
@@ -2,28 +2,30 @@ |Name|Version|License|Source| |----|-------|-------|------| + |blueimp/jquery-file-upload|10.31.0.0|MIT|https://github.com/vkhramtsov/jQuery-File-Upload.git| +|brick/math|0.9.1.0|MIT|https://github.com/brick/math.git| |bshaffer/oauth2-server-php|1.11.1.0|MIT|https://github.com/bshaffer/oauth2-server-php.git| -|commerceguys/intl|1.0.5.0|MIT|https://github.com/commerceguys/intl.git| +|commerceguys/intl|1.0.7.0|MIT|https://github.com/commerceguys/intl.git| |desandro/imagesloaded|4.1.4.0|MIT|https://github.com/desandro/imagesloaded.git| |ezyang/htmlpurifier|4.13.0.0|LGPL-2.1-or-later|https://github.com/ezyang/htmlpurifier.git| |league/html-to-markdown|4.10.0.0|MIT|https://github.com/thephpleague/html-to-markdown.git| |lukasreschke/id3parser|0.0.3.0|GPL|https://github.com/LukasReschke/ID3Parser.git| |michelf/php-markdown|1.9.0.0|BSD-3-Clause|https://github.com/michelf/php-markdown.git| -|paragonie/random_compat|9.99.99.0|MIT|https://github.com/paragonie/random_compat.git| -|pear/text_languagedetect|1.0.0.0|BSD-2-Clause|https://github.com/pear/Text_LanguageDetect.git| +|pear/text_languagedetect|1.0.1.0|BSD-2-Clause|https://github.com/pear/Text_LanguageDetect.git| |psr/log|1.1.3.0|MIT|https://github.com/php-fig/log.git| -|ramsey/uuid|3.9.3.0|MIT|https://github.com/ramsey/uuid.git| -|sabre/dav|4.1.1.0|BSD-3-Clause|https://github.com/sabre-io/dav.git| -|sabre/event|5.1.0.0|BSD-3-Clause|https://github.com/sabre-io/event.git| -|sabre/http|5.1.0.0|BSD-3-Clause|https://github.com/sabre-io/http.git| -|sabre/uri|2.2.0.0|BSD-3-Clause|https://github.com/sabre-io/uri.git| -|sabre/vobject|4.3.1.0|BSD-3-Clause|https://github.com/sabre-io/vobject.git| -|sabre/xml|2.2.1.0|BSD-3-Clause|https://github.com/sabre-io/xml.git| -|simplepie/simplepie|1.5.5.0|BSD-3-Clause|https://github.com/simplepie/simplepie.git| +|ramsey/collection|1.1.1.0|MIT|https://github.com/ramsey/collection.git| +|ramsey/uuid|4.1.1.0|MIT|https://github.com/ramsey/uuid.git| +|sabre/dav|4.1.3.0|BSD-3-Clause|https://github.com/sabre-io/dav.git| +|sabre/event|5.1.2.0|BSD-3-Clause|https://github.com/sabre-io/event.git| +|sabre/http|5.1.1.0|BSD-3-Clause|https://github.com/sabre-io/http.git| +|sabre/uri|2.2.1.0|BSD-3-Clause|https://github.com/sabre-io/uri.git| +|sabre/vobject|4.3.3.0|BSD-3-Clause|https://github.com/sabre-io/vobject.git| +|sabre/xml|2.2.3.0|BSD-3-Clause|https://github.com/sabre-io/xml.git| +|simplepie/simplepie|1.5.6.0|BSD-3-Clause|https://github.com/simplepie/simplepie.git| |smarty/smarty|3.1.36.0|LGPL-3.0|https://github.com/smarty-php/smarty.git| -|symfony/polyfill-ctype|1.13.1.0|MIT|https://github.com/symfony/polyfill-ctype.git| -|twbs/bootstrap|4.5.2.0|MIT|https://github.com/twbs/bootstrap.git| +|symfony/polyfill-ctype|1.20.0.0|MIT|https://github.com/symfony/polyfill-ctype.git| +|twbs/bootstrap|4.5.3.0|MIT|https://github.com/twbs/bootstrap.git| |fullcalendar/fullcalendar|4.4.2.0|MIT|https://github.com/fullcalendar/fullcalendar.git| |miromannino/Justified-Gallery|3.8.1.0|MIT|https://github.com/miromannino/Justified-Gallery.git| |fengyuanchen/cropperjs|1.5.7.0|MIT|https://github.com/fengyuanchen/cropperjs.git| diff --git a/Zotlabs/Daemon/Notifier.php b/Zotlabs/Daemon/Notifier.php index 18fc57118..626299661 100644 --- a/Zotlabs/Daemon/Notifier.php +++ b/Zotlabs/Daemon/Notifier.php @@ -466,13 +466,6 @@ class Notifier { // FIXME add any additional recipients such as mentions, etc. - // don't send deletions onward for other people's stuff - // TODO verify this is needed - copied logic from same place in old code - - if(intval($target_item['item_deleted']) && (! intval($target_item['item_wall']))) { - logger('notifier: ignoring delete notification for non-wall item', LOGGER_NORMAL, LOG_NOTICE); - return; - } } } diff --git a/Zotlabs/Lib/JSalmon.php b/Zotlabs/Lib/JSalmon.php index 48a4e649b..7f63cf914 100644 --- a/Zotlabs/Lib/JSalmon.php +++ b/Zotlabs/Lib/JSalmon.php @@ -40,15 +40,15 @@ class JSalmon { $ret = [ 'results' => [] ]; if(! is_array($x)) { - return $false; + return false; } if(! ( array_key_exists('signed',$x) && $x['signed'])) { - return $false; + return false; } - $signed_data = preg_replace('/\s+/','',$x['data']) . '.' - . base64url_encode($x['data_type'],true) . '.' - . base64url_encode($x['encoding'],true) . '.' + $signed_data = preg_replace('/\s+/','',$x['data']) . '.' + . base64url_encode($x['data_type'],true) . '.' + . base64url_encode($x['encoding'],true) . '.' . base64url_encode($x['alg'],true); $key = HTTPSig::get_key(EMPTY_STR,'zot6',base64url_decode($x['sigs']['key_id'])); diff --git a/Zotlabs/Lib/Libzot.php b/Zotlabs/Lib/Libzot.php index 972ebe0e9..4291ce518 100644 --- a/Zotlabs/Lib/Libzot.php +++ b/Zotlabs/Lib/Libzot.php @@ -421,7 +421,7 @@ class Libzot { if($new_connection) { if(! Permissions::PermsCompare($new_perms,$previous_perms)) - Master::Summon([ 'Notifier', 'permissions_create', $new_connection[0]['abook_id'] ]); + Master::Summon([ 'Notifier', 'permission_create', $new_connection[0]['abook_id'] ]); Enotify::submit( [ 'type' => NOTIFY_INTRO, diff --git a/Zotlabs/Lib/NativeWiki.php b/Zotlabs/Lib/NativeWiki.php index 3ec032075..c3032d02c 100644 --- a/Zotlabs/Lib/NativeWiki.php +++ b/Zotlabs/Lib/NativeWiki.php @@ -9,7 +9,7 @@ define ( 'NWIKI_ITEM_RESOURCE_TYPE', 'nwiki' ); class NativeWiki { - static public function listwikis($channel, $observer_hash) { + public static function listwikis($channel, $observer_hash) { $sql_extra = item_permissions_sql($channel['channel_id'], $observer_hash); $wikis = q("SELECT * FROM item @@ -40,7 +40,7 @@ class NativeWiki { } - function create_wiki($channel, $observer_hash, $wiki, $acl) { + public static function create_wiki($channel, $observer_hash, $wiki, $acl) { $resource_id = new_uuid(); $uuid = new_uuid(); @@ -101,7 +101,7 @@ class NativeWiki { } } - function update_wiki($channel_id, $observer_hash, $arr, $acl) { + public static function update_wiki($channel_id, $observer_hash, $arr, $acl) { $w = self::get_wiki($channel_id, $observer_hash, $arr['resource_id']); $item = $w['wiki']; @@ -156,7 +156,7 @@ class NativeWiki { } } - static public function sync_a_wiki_item($uid,$id,$resource_id) { + public static function sync_a_wiki_item($uid,$id,$resource_id) { $r = q("SELECT * from item WHERE uid = %d AND ( id = %d OR ( resource_type = '%s' and resource_id = '%s' )) ", @@ -185,7 +185,7 @@ class NativeWiki { } } - function delete_wiki($channel_id,$observer_hash,$resource_id) { + public static function delete_wiki($channel_id,$observer_hash,$resource_id) { $w = self::get_wiki($channel_id,$observer_hash,$resource_id); $item = $w['wiki']; @@ -202,7 +202,7 @@ class NativeWiki { } - static public function get_wiki($channel_id, $observer_hash, $resource_id) { + public static function get_wiki($channel_id, $observer_hash, $resource_id) { $sql_extra = item_permissions_sql($channel_id,$observer_hash); @@ -236,7 +236,7 @@ class NativeWiki { } - static public function exists_by_name($uid, $urlName) { + public static function exists_by_name($uid, $urlName) { $sql_extra = item_permissions_sql($uid); @@ -258,7 +258,7 @@ class NativeWiki { } - static public function get_permissions($resource_id, $owner_id, $observer_hash) { + public static function get_permissions($resource_id, $owner_id, $observer_hash) { // TODO: For now, only the owner can edit $sql_extra = item_permissions_sql($owner_id, $observer_hash); diff --git a/Zotlabs/Module/Cdav.php b/Zotlabs/Module/Cdav.php index f7e43e436..f5c5f4384 100644 --- a/Zotlabs/Module/Cdav.php +++ b/Zotlabs/Module/Cdav.php @@ -50,7 +50,7 @@ class Cdav extends Controller { if($sigblock) { $keyId = str_replace('acct:','',$sigblock['keyId']); if($keyId) { - $r = q("select * from hubloc where hubloc_addr = '%s'", + $r = q("select * from hubloc where hubloc_id_url = '%s'", dbesc($keyId) ); if($r) { diff --git a/Zotlabs/Module/Dav.php b/Zotlabs/Module/Dav.php index 949b89950..82d773139 100644 --- a/Zotlabs/Module/Dav.php +++ b/Zotlabs/Module/Dav.php @@ -51,7 +51,7 @@ class Dav extends \Zotlabs\Web\Controller { if($sigblock) { $keyId = str_replace('acct:','',$sigblock['keyId']); if($keyId) { - $r = q("select * from hubloc where hubloc_addr = '%s'", + $r = q("select * from hubloc where hubloc_id_url = '%s'", dbesc($keyId) ); if($r) { diff --git a/Zotlabs/Module/File_upload.php b/Zotlabs/Module/File_upload.php index 6794dceee..e18067e20 100644 --- a/Zotlabs/Module/File_upload.php +++ b/Zotlabs/Module/File_upload.php @@ -64,7 +64,7 @@ class File_upload extends \Zotlabs\Web\Controller { if($x['partial']) { header('Range: bytes=0-' . (($x['length']) ? $x['length'] - 1 : 0)); - json_return_and_die($result); + json_return_and_die($x); } else { header('Range: bytes=0-' . (($x['size']) ? $x['size'] - 1 : 0)); diff --git a/Zotlabs/Module/Getfile.php b/Zotlabs/Module/Getfile.php index 17d1c84b8..a867f5ff7 100644 --- a/Zotlabs/Module/Getfile.php +++ b/Zotlabs/Module/Getfile.php @@ -6,20 +6,20 @@ use Zotlabs\Lib\Libzot; /** * module: getfile - * + * * used for synchronising files and photos across clones - * + * * The site initiating the file operation will send a sync packet to known clones. * They will respond by building the DB structures they require, then will provide a * post request to this site to grab the file data. This is sent as a stream direct to * disk at the other end, avoiding memory issues. * * Since magic-auth cannot easily be used by the CURL process at the other end, - * we will require a signed request which includes a timestamp. This should not be - * used without SSL and is potentially vulnerable to replay if an attacker decrypts + * we will require a signed request which includes a timestamp. This should not be + * used without SSL and is potentially vulnerable to replay if an attacker decrypts * the SSL traffic fast enough. The amount of time slop is configurable but defaults * to 3 minutes. - * + * */ @@ -54,13 +54,14 @@ class Getfile extends \Zotlabs\Web\Controller { $keyId = $sigblock['keyId']; if($keyId) { - $r = q("select * from hubloc left join xchan on hubloc_hash = xchan_hash - where hubloc_addr = '%s'", - dbesc(str_replace('acct:','',$keyId)) + $r = q("SELECT * FROM hubloc LEFT JOIN xchan ON hubloc_hash = xchan_hash + WHERE hubloc_addr = '%s' OR hubloc_id_url = '%s'", + dbesc(str_replace('acct:','',$keyId)), + dbesc($keyId) ); if($r) { $hubloc = Libzot::zot_record_preferred($r); - $verified = HTTPSig::verify('',$hubloc['xchan_pubkey']); + $verified = HTTPSig::verify('',$hubloc['xchan_pubkey']); if($verified && $verified['header_signed'] && $verified['header_valid'] && $hash == $hubloc['hubloc_hash']) { $header_verified = true; } @@ -74,15 +75,15 @@ class Getfile extends \Zotlabs\Web\Controller { logger('post: ' . print_r($_POST,true),LOGGER_DEBUG,LOG_INFO); if($header_verified) { logger('HTTPSig verified'); - } - + } + $channel = channelx_by_hash($hash); if((! $channel) || (! $time) || (! $sig)) { logger('error: missing info'); killme(); } - + if(isset($_POST['resolution'])) $resolution = intval($_POST['resolution']); elseif(substr($resource,-2,1) == '-') { @@ -91,21 +92,21 @@ class Getfile extends \Zotlabs\Web\Controller { } else { $resolution = (-1); - } + } $slop = intval(get_pconfig($channel['channel_id'],'system','getfile_time_slop')); if($slop < 1) $slop = 3; - + $d1 = datetime_convert('UTC','UTC',"now + $slop minutes"); - $d2 = datetime_convert('UTC','UTC',"now - $slop minutes"); - + $d2 = datetime_convert('UTC','UTC',"now - $slop minutes"); + if(! $header_verified) { if(($time > $d1) || ($time < $d2)) { logger('time outside allowable range'); killme(); } - + if(! rsa_verify($hash . '.' . $time,base64url_decode($sig),$channel['channel_pubkey'])) { logger('verify failed.'); killme(); @@ -137,20 +138,20 @@ class Getfile extends \Zotlabs\Web\Controller { else { echo dbunescbin($r[0]['content']); } - } + } killme(); } $r = attach_by_hash($resource,$channel['channel_hash'],$revision); - + if(! $r['success']) { logger('attach_by_hash failed: ' . $r['message']); notice( $r['message'] . EOL); return; } - + $unsafe_types = array('text/html','text/css','application/javascript'); - + if(in_array($r['data']['filetype'],$unsafe_types) && (! channel_codeallowed($channel['channel_id']))) { header('Content-type: text/plain'); } diff --git a/Zotlabs/Module/Item.php b/Zotlabs/Module/Item.php index f74b1e321..83424a50d 100644 --- a/Zotlabs/Module/Item.php +++ b/Zotlabs/Module/Item.php @@ -976,7 +976,7 @@ class Item extends Controller { $item_unseen = ((local_channel() != $profile_uid) ? 1 : 0); - $item_wall = (($post_type === 'wall' || $post_type === 'wall-comment') ? 1 : 0); + $item_wall = (($_REQUEST['type'] === 'wall' || $_REQUEST['type'] === 'wall-comment') ? 1 : 0); $item_origin = (($origin) ? 1 : 0); $item_consensus = (($consensus) ? 1 : 0); $item_nocomment = (($nocomment) ? 1 : 0); diff --git a/Zotlabs/Module/Like.php b/Zotlabs/Module/Like.php index bb5c6db7a..358611b1b 100644 --- a/Zotlabs/Module/Like.php +++ b/Zotlabs/Module/Like.php @@ -21,7 +21,7 @@ class Like extends \Zotlabs\Web\Controller { 'abstain' => ACTIVITY_ABSTAIN , 'attendyes' => ACTIVITY_ATTEND , 'attendno' => ACTIVITY_ATTENDNO , - 'attendmaybe' => ACTIVITY_ATTENDMAYBE + 'attendmaybe' => ACTIVITY_ATTENDMAYBE ]; // unlike (etc.) reactions are an undo of positive reactions, rather than a negative action. @@ -81,7 +81,7 @@ class Like extends \Zotlabs\Web\Controller { } public function get() { - + $o = EMPTY_STR; $sys_channel = get_sys_channel(); @@ -92,7 +92,7 @@ class Like extends \Zotlabs\Web\Controller { if((! $observer) || ($interactive)) { $o .= '<h1>' . t('Like/Dislike') . '</h1>'; $o .= EOL . EOL; - + if(! $observer) { $_SESSION['return_url'] = \App::$query_string; $o .= t('This action is restricted to members.') . EOL; @@ -100,17 +100,17 @@ class Like extends \Zotlabs\Web\Controller { return $o; } } - + $verb = notags(trim($_GET['verb'])); $mode = (($_GET['conv_mode'] === 'channel') ? 'channel' : 'network'); if(! $verb) $verb = 'like'; - + $activity = $this->reaction_to_activity($verb); if(! $activity) { - return EMPTY_STR; + return EMPTY_STR; } $is_rsvp = false; @@ -123,23 +123,23 @@ class Like extends \Zotlabs\Web\Controller { $object = $target = null; $post_type = EMPTY_STR; $objtype = EMPTY_STR; - + if(argc() == 3) { - + if(! $observer) killme(); - + $extended_like = true; $obj_type = argv(1); $obj_id = argv(2); $public = true; - + if($obj_type == 'profile') { $r = q("select * from profile where profile_guid = '%s' limit 1", dbesc(argv(2)) ); if(! $r) - killme(); + killme(); $owner_uid = $r[0]['uid']; if($r[0]['is_default']) $public = true; @@ -165,54 +165,54 @@ class Like extends \Zotlabs\Web\Controller { } $post_type = t('channel'); $objtype = ACTIVITY_OBJ_PROFILE; - + $profile = $r[0]; } elseif($obj_type == 'thing') { - + $r = q("select * from obj where obj_type = %d and obj_obj = '%s' limit 1", intval(TERM_OBJ_THING), dbesc(argv(2)) ); - + if(! $r) { if($interactive) { notice( t('Invalid request.') . EOL); return $o; } - killme(); + killme(); } - + $owner_uid = $r[0]['obj_channel']; - + $allow_cid = $r[0]['allow_cid']; $allow_gid = $r[0]['allow_gid']; $deny_cid = $r[0]['deny_cid']; $deny_gid = $r[0]['deny_gid']; - if($allow_cid || $allow_gid || $deny_cid || $deny_gid) + if($allow_cid || $allow_gid || $deny_cid || $deny_gid) $public = false; - + $post_type = t('thing'); $objtype = ACTIVITY_OBJ_PROFILE; $tgttype = ACTIVITY_OBJ_THING; - + $links = array(); $links[] = array('rel' => 'alternate', 'type' => 'text/html', 'href' => z_root() . '/thing/' . $r[0]['obj_obj']); - if($r[0]['imgurl']) + if($r[0]['imgurl']) $links[] = array('rel' => 'photo', 'href' => $r[0]['obj_imgurl']); - + $target = json_encode(array( 'type' => $tgttype, 'title' => $r[0]['obj_term'], 'id' => z_root() . '/thing/' . $r[0]['obj_obj'], 'link' => $links )); - + $plink = '[zrl=' . z_root() . '/thing/' . $r[0]['obj_obj'] . ']' . $r[0]['obj_term'] . '[/zrl]'; - + } - + if(! ($owner_uid && $r)) { if($interactive) { notice( t('Invalid request.') . EOL); @@ -220,11 +220,11 @@ class Like extends \Zotlabs\Web\Controller { } killme(); } - + // The resultant activity is going to be a wall-to-wall post, so make sure this is allowed - + $perms = get_all_perms($owner_uid,$observer['xchan_hash']); - + if(! ($perms['post_like'] && $perms['view_profile'])) { if($interactive) { notice( t('Permission denied.') . EOL); @@ -232,7 +232,7 @@ class Like extends \Zotlabs\Web\Controller { } killme(); } - + $ch = q("select * from channel left join xchan on channel_hash = xchan_hash where channel_id = %d limit 1", intval($owner_uid) ); @@ -243,14 +243,14 @@ class Like extends \Zotlabs\Web\Controller { } killme(); } - + if(! $plink) $plink = '[zrl=' . z_root() . '/profile/' . $ch[0]['channel_address'] . ']' . $post_type . '[/zrl]'; - + $object = json_encode(Activity::fetch_profile([ 'id' => channel_url($ch[0]) ])); // second like of the same thing is "undo" for the first like - + $z = q("select * from likes where channel_id = %d and liker = '%s' and verb = '%s' and target_type = '%s' and target_id = '%s' limit 1", intval($ch[0]['channel_id']), dbesc($observer['xchan_hash']), @@ -258,11 +258,11 @@ class Like extends \Zotlabs\Web\Controller { dbesc(($tgttype)?$tgttype:$objtype), dbesc($obj_id) ); - + if($z) { $z[0]['deleted'] = 1; Libsync::build_sync_packet($ch[0]['channel_id'],array('likes' => $z)); - + q("delete from likes where id = %d", intval($z[0]['id']) ); @@ -285,17 +285,17 @@ class Like extends \Zotlabs\Web\Controller { if(! $observer) killme(); - + // this is used to like an item or comment - + $item_id = ((argc() == 2) ? notags(trim(argv(1))) : 0); - + logger('like: verb ' . $verb . ' item ' . $item_id, LOGGER_DEBUG); - + // get the item. Allow linked photos (which are normally hidden) to be liked - $r = q("SELECT * FROM item WHERE id = %d - and item_type in (0,6,7) and item_deleted = 0 and item_unpublished = 0 + $r = q("SELECT * FROM item WHERE id = %d + and item_type in (0,6,7) and item_deleted = 0 and item_unpublished = 0 and item_delayed = 0 and item_pending_remove = 0 and item_blocked = 0 LIMIT 1", intval($item_id) ); @@ -351,12 +351,12 @@ class Like extends \Zotlabs\Web\Controller { killme(); $verbs = " '".dbesc($activity)."' "; - - $multi_undo = false; - + + $multi_undo = false; + // event participation and consensus items are essentially radio toggles. If you make a subsequent choice, - // we need to eradicate your first choice. - + // we need to eradicate your first choice. + if($activity === ACTIVITY_ATTEND || $activity === ACTIVITY_ATTENDNO || $activity === ACTIVITY_ATTENDMAYBE) { $verbs = " '" . dbesc(ACTIVITY_ATTEND) . "','" . dbesc(ACTIVITY_ATTENDNO) . "','" . dbesc(ACTIVITY_ATTENDMAYBE) . "' "; $multi_undo = 1; @@ -365,16 +365,16 @@ class Like extends \Zotlabs\Web\Controller { $verbs = " '" . dbesc(ACTIVITY_AGREE) . "','" . dbesc(ACTIVITY_DISAGREE) . "','" . dbesc(ACTIVITY_ABSTAIN) . "' "; $multi_undo = true; } - + $item_normal = item_normal(); - + $r = q("SELECT id, parent, uid, verb FROM item WHERE verb in ( $verbs ) $item_normal AND author_xchan = '%s' AND thr_parent = '%s' and uid = %d ", dbesc($observer['xchan_hash']), dbesc($item['mid']), intval($owner_uid) ); - + if($r) { // already liked it. Drop that item. require_once('include/items.php'); @@ -386,27 +386,27 @@ class Like extends \Zotlabs\Web\Controller { intval($rr['parent']), intval($rr['uid']) ); - // Prior activity was a duplicate of the one we're submitting, just undo it; + // Prior activity was a duplicate of the one we're submitting, just undo it; // don't fall through and create another if(activity_match($rr['verb'],$activity)) $multi_undo = false; - + // drop_item was not done interactively, so we need to invoke the notifier // in order to push the changes to connections \Zotlabs\Daemon\Master::Summon(array('Notifier','drop',$rr['id'])); - + } - + if($interactive) return; - + if(! $multi_undo) { $ret = self::like_response([ 'item' => $item, - 'orig_item_id' => $item_id, + 'orig_item_id' => $item_id, 'owner_xchan' => $thread_owner, 'conv_mode' => $mode ]); @@ -416,11 +416,11 @@ class Like extends \Zotlabs\Web\Controller { } } - + $uuid = item_message_id(); - + $arr = array(); - + $arr['uuid'] = $uuid; $arr['mid'] = z_root() . (($is_rsvp) ? '/activity/' : '/item/') . $uuid; @@ -433,38 +433,38 @@ class Like extends \Zotlabs\Web\Controller { $post_type = (($item['resource_type'] === 'photo') ? t('photo') : t('status')); if($item['obj_type'] === ACTIVITY_OBJ_EVENT) $post_type = t('event'); - + $links = array(array('rel' => 'alternate','type' => 'text/html', 'href' => $item['plink'])); - $objtype = (($item['resource_type'] === 'photo') ? ACTIVITY_OBJ_PHOTO : ACTIVITY_OBJ_NOTE ); + $objtype = (($item['resource_type'] === 'photo') ? ACTIVITY_OBJ_PHOTO : ACTIVITY_OBJ_NOTE ); if($objtype === ACTIVITY_OBJ_NOTE && (! intval($item['item_thread_top']))) $objtype = ACTIVITY_OBJ_COMMENT; - + $body = $item['body']; - + $object = json_encode(Activity::fetch_item( [ 'id' => $item['mid'] ])); if(! intval($item['item_thread_top'])) - $post_type = 'comment'; - + $post_type = 'comment'; + $arr['item_origin'] = 1; $arr['item_notshown'] = 1; $arr['item_type'] = $item['item_type']; - + if(intval($item['item_wall'])) $arr['item_wall'] = 1; - + // if this was a linked photo and was hidden, unhide it. - + if(intval($item['item_hidden'])) { $r = q("update item set item_hidden = 0 where id = %d", intval($item['id']) ); - } - + } + } - + if($verb === 'like') $bodyverb = t('%1$s likes %2$s\'s %3$s'); if($verb === 'dislike') @@ -481,12 +481,12 @@ class Like extends \Zotlabs\Web\Controller { $bodyverb = t('%1$s is not attending %2$s\'s %3$s'); if($verb === 'attendmaybe') $bodyverb = t('%1$s may attend %2$s\'s %3$s'); - + if(! isset($bodyverb)) - killme(); - - - + killme(); + + + if($extended_like) { $ulink = '[zrl=' . $ch[0]['xchan_url'] . '][bdi]' . $ch[0]['xchan_name'] . '[/bdi][/zrl]'; $alink = '[zrl=' . $observer['xchan_url'] . '][bdi]' . $observer['xchan_name'] . '[/bdi][/zrl]'; @@ -503,64 +503,64 @@ class Like extends \Zotlabs\Web\Controller { $deny_cid = $item['deny_cid']; $deny_gid = $item['deny_gid']; $private = $item['private']; - + } - - + + $arr['aid'] = (($extended_like) ? $ch[0]['channel_account_id'] : $owner_aid); $arr['uid'] = $owner_uid; - $arr['item_flags'] = $item_flags; - $arr['item_wall'] = $item_wall; + $arr['item_flags'] = $item['item_flags']; + $arr['item_wall'] = $item['item_wall']; $arr['parent_mid'] = (($extended_like) ? $arr['mid'] : $item['mid']); $arr['owner_xchan'] = (($extended_like) ? $ch[0]['xchan_hash'] : $thread_owner['xchan_hash']); $arr['author_xchan'] = $observer['xchan_hash']; - - + + $arr['body'] = sprintf( $bodyverb, $alink, $ulink, $plink ); if($obj_type === 'thing' && $r[0]['imgurl']) { $arr['body'] .= "\n\n[zmg=80x80]" . $r[0]['imgurl'] . '[/zmg]'; - } + } if($obj_type === 'profile') { if($public) { - $arr['body'] .= "\n\n" . '[embed]' . z_root() . '/profile/' . $ch[0]['channel_address'] . '[/embed]'; + $arr['body'] .= "\n\n" . '[embed]' . z_root() . '/profile/' . $ch[0]['channel_address'] . '[/embed]'; } else $arr['body'] .= "\n\n[zmg=80x80]" . $profile['thumb'] . '[/zmg]'; - } - - + } + + $arr['verb'] = $activity; $arr['obj_type'] = $objtype; $arr['obj'] = $object; - + if($target) { $arr['tgt_type'] = $tgttype; $arr['target'] = $target; } - + $arr['allow_cid'] = $allow_cid; $arr['allow_gid'] = $allow_gid; $arr['deny_cid'] = $deny_cid; $arr['deny_gid'] = $deny_gid; $arr['item_private'] = $private; - + call_hooks('post_local',$arr); - $post = item_store($arr); + $post = item_store($arr); $post_id = $post['item_id']; // save the conversation from expiration if(local_channel() && array_key_exists('item',$post) && (intval($post['item']['id']) != intval($post['item']['parent']))) - retain_item($post['item']['parent']); - + retain_item($post['item']['parent']); + $arr['id'] = $post_id; - + call_hooks('post_local_end', $arr); - - + + if($extended_like) { $r = q("insert into likes (channel_id,liker,likee,iid,i_mid,verb,target_type,target_id,target) values (%d,'%s','%s',%d,'%s','%s','%s','%s','%s')", intval($ch[0]['channel_id']), @@ -582,12 +582,12 @@ class Like extends \Zotlabs\Web\Controller { dbesc($obj_id) ); if($r) - Libsync::build_sync_packet($ch[0]['channel_id'],array('likes' => $r)); - + Libsync::build_sync_packet($ch[0]['channel_id'],array('likes' => $r)); + } - + \Zotlabs\Daemon\Master::Summon(array('Notifier','like',$post_id)); - + if($interactive) { notice( t('Action completed.') . EOL); $o .= t('Thank you.'); @@ -596,12 +596,12 @@ class Like extends \Zotlabs\Web\Controller { $ret = self::like_response([ 'item' => $item, - 'orig_item_id' => $item_id, + 'orig_item_id' => $item_id, 'owner_xchan' => $thread_owner, 'conv_mode' => $mode ]); json_return_and_die($ret); } - + } diff --git a/Zotlabs/Module/Owa.php b/Zotlabs/Module/Owa.php index d6aeb8af5..9a3513f34 100644 --- a/Zotlabs/Module/Owa.php +++ b/Zotlabs/Module/Owa.php @@ -39,7 +39,7 @@ class Owa extends Controller { $found = discover_by_webbie(str_replace('acct:','',$keyId)); if ($found) { $r = q("SELECT * FROM hubloc LEFT JOIN xchan ON hubloc_hash = xchan_hash - WHERE OR hubloc_id_url = '%s'", + WHERE hubloc_id_url = '%s'", dbesc($keyId) ); } diff --git a/Zotlabs/Module/Photos.php b/Zotlabs/Module/Photos.php index fa9216c97..099289c03 100644 --- a/Zotlabs/Module/Photos.php +++ b/Zotlabs/Module/Photos.php @@ -16,66 +16,66 @@ require_once('include/text.php'); class Photos extends \Zotlabs\Web\Controller { function init() { - + if(observer_prohibited()) { return; } - + if(argc() > 1) { $nick = argv(1); - + profile_load($nick); - + $channelx = channelx_by_nick($nick); - + if(! $channelx) return; - + \App::$data['channel'] = $channelx; - + $observer = \App::get_observer(); \App::$data['observer'] = $observer; - + $observer_xchan = (($observer) ? $observer['xchan_hash'] : ''); - + head_set_icon(\App::$data['channel']['xchan_photo_s']); - + \App::$page['htmlhead'] .= "<script> var profile_uid = " . ((\App::$data['channel']) ? \App::$data['channel']['channel_id'] : 0) . "; </script>" ; - + } - + return; } - - - + + + function post() { - + logger('mod-photos: photos_post: begin' , LOGGER_DEBUG); - + logger('mod_photos: REQUEST ' . print_r($_REQUEST,true), LOGGER_DATA); logger('mod_photos: FILES ' . print_r($_FILES,true), LOGGER_DATA); - + $ph = photo_factory(''); - + $phototypes = $ph->supportedTypes(); - + $can_post = false; - + $page_owner_uid = \App::$data['channel']['channel_id']; - + if(perm_is_allowed($page_owner_uid,get_observer_hash(),'write_storage')) $can_post = true; - + if(! $can_post) { notice( t('Permission denied.') . EOL ); if(is_ajax()) killme(); return; } - + $s = abook_self($page_owner_uid); - + if(! $s) { notice( t('Page owner information could not be retrieved.') . EOL); logger('mod_photos: post: unable to locate contact record for page owner. uid=' . $page_owner_uid); @@ -83,30 +83,30 @@ class Photos extends \Zotlabs\Web\Controller { killme(); return; } - - $owner_record = $s[0]; - + + $owner_record = $s[0]; + $acl = new \Zotlabs\Access\AccessList(\App::$data['channel']); - + if((argc() > 3) && (argv(2) === 'album')) { - + $album = argv(3); if(! photos_album_exists($page_owner_uid, get_observer_hash(), $album)) { notice( t('Album not found.') . EOL); goaway(z_root() . '/' . $_SESSION['photo_return']); } - - + + /* * DELETE photo album and all its photos */ - + if($_REQUEST['dropalbum'] == t('Delete Album')) { - - + + $folder_hash = ''; - + $r = q("select * from attach where is_dir = 1 and uid = %d and hash = '%s'", intval($page_owner_uid), dbesc($album) @@ -116,13 +116,13 @@ class Photos extends \Zotlabs\Web\Controller { return; } $folder_hash = $r[0]['hash']; - - + + $res = array(); $admin_delete = false; // get the list of photos we are about to delete - + if(remote_channel() && (! local_channel())) { $str = photos_album_get_db_idstr($page_owner_uid,$album,remote_channel()); } @@ -139,7 +139,7 @@ class Photos extends \Zotlabs\Web\Controller { if(! $str) { goaway(z_root() . '/' . $_SESSION['photo_return']); } - + $r = q("select id from item where resource_id in ( $str ) and resource_type = 'photo' and uid = %d " . item_normal(), intval($page_owner_uid) ); @@ -148,34 +148,34 @@ class Photos extends \Zotlabs\Web\Controller { attach_delete($page_owner_uid, $i['resource_id'], true ); } } - + // remove the associated photos in case they weren't attached to an item - + q("delete from photo where resource_id in ( $str ) and uid = %d", intval($page_owner_uid) ); - + // @FIXME do the same for the linked attach - + if($folder_hash) { attach_delete($page_owner_uid, $folder_hash, true ); - if(! $admin_delete) { + if(! $admin_delete) { $sync = attach_export_data(\App::$data['channel'],$folder_hash, true); - - if($sync) + + if($sync) Libsync::build_sync_packet($page_owner_uid,array('file' => array($sync))); } } - + } - + goaway(z_root() . '/photos/' . \App::$data['channel']['channel_address']); } - + if((argc() > 2) && (x($_REQUEST,'delete')) && ($_REQUEST['delete'] === t('Delete Photo'))) { // same as above but remove single photo - + $ob_hash = get_observer_hash(); if(! $ob_hash) goaway(z_root() . '/' . $_SESSION['photo_return']); @@ -185,18 +185,18 @@ class Photos extends \Zotlabs\Web\Controller { intval(local_channel()), dbesc(argv(2)) ); - + if($r) { attach_delete($page_owner_uid, $r[0]['resource_id'], true ); $sync = attach_export_data(\App::$data['channel'],$r[0]['resource_id'], true); - - if($sync) + + if($sync) Libsync::build_sync_packet($page_owner_uid,array('file' => array($sync))); } elseif(is_site_admin()) { // If the admin deletes a photo, don't sync attach_delete($page_owner_uid, argv(2), true); - } + } goaway(z_root() . '/photos/' . \App::$data['channel']['channel_address'] . '/album/' . $_SESSION['album_return']); @@ -208,10 +208,10 @@ class Photos extends \Zotlabs\Web\Controller { intval($page_owner_uid) ); if(($m) && ($m[0]['folder'] != $_POST['move_to_album'])) { - attach_move($page_owner_uid,argv(2),$_POST['move_to_album']); + attach_move($page_owner_uid,argv(2),$_POST['move_to_album']); $sync = attach_export_data(\App::$data['channel'], argv(2), false); - if($sync) + if($sync) Libsync::build_sync_packet($page_owner_uid,array('file' => array($sync))); if(! ($_POST['desc'] && $_POST['newtag'])) @@ -220,28 +220,28 @@ class Photos extends \Zotlabs\Web\Controller { } if((argc() > 2) && ((x($_POST,'desc') !== false) || (x($_POST,'newtag') !== false))) { - + $desc = ((x($_POST,'desc')) ? notags(trim($_POST['desc'])) : ''); $rawtags = ((x($_POST,'newtag')) ? notags(trim($_POST['newtag'])) : ''); $item_id = ((x($_POST,'item_id')) ? intval($_POST['item_id']) : 0); $is_nsfw = ((x($_POST,'adult')) ? intval($_POST['adult']) : 0); - + $acl->set_from_array($_POST); $perm = $acl->get(); - + $resource_id = argv(2); - - if((x($_POST,'rotate') !== false) && + + if((x($_POST,'rotate') !== false) && ( (intval($_POST['rotate']) == 1) || (intval($_POST['rotate']) == 2) )) { logger('rotate'); - + $r = q("select * from photo where resource_id = '%s' and uid = %d and imgscale = 0 limit 1", dbesc($resource_id), intval($page_owner_uid) ); if(count($r)) { - + $ph = photo_factory(@file_get_contents(dbunescbin($r[0]['content'])), $r[0]['mimetype']); if($ph->is_valid()) { $rotate_deg = ( (intval($_POST['rotate']) == 1) ? 270 : 90 ); @@ -255,12 +255,12 @@ class Photos extends \Zotlabs\Web\Controller { dbesc($resource_id), intval($page_owner_uid) ); - + $ph->saveImage(dbunescbin($r[0]['content'])); - - $arr = [ + + $arr = [ 'aid' => get_account_id(), - 'uid' => intval($page_owner_uid), + 'uid' => intval($page_owner_uid), 'resource_id' => dbesc($resource_id), 'filename' => $r[0]['filename'], 'imgscale' => 0, @@ -277,28 +277,31 @@ class Photos extends \Zotlabs\Web\Controller { unset($arr['os_syspath']); - if($width > 1024 || $height > 1024) + $width = $r[0]['width']; + $height = $r[0]['height']; + + if($width > 1024 || $height > 1024) $ph->scaleImage(1024); $ph->storeThumbnail($arr, PHOTO_RES_1024); - if($width > 640 || $height > 640) + if($width > 640 || $height > 640) $ph->scaleImage(640); $ph->storeThumbnail($arr, PHOTO_RES_640); - if($width > 320 || $height > 320) + if($width > 320 || $height > 320) $ph->scaleImage(320); $ph->storeThumbnail($arr, PHOTO_RES_320); } } } - + $p = q("SELECT mimetype, is_nsfw, description, resource_id, imgscale, allow_cid, allow_gid, deny_cid, deny_gid FROM photo WHERE resource_id = '%s' AND uid = %d ORDER BY imgscale DESC", dbesc($resource_id), intval($page_owner_uid) ); if($p) { $ext = $phototypes[$p[0]['mimetype']]; - + $r = q("UPDATE photo SET description = '%s', allow_cid = '%s', allow_gid = '%s', deny_cid = '%s', deny_gid = '%s' WHERE resource_id = '%s' AND uid = %d", dbesc($desc), dbesc($perm['allow_cid']), @@ -309,9 +312,7 @@ class Photos extends \Zotlabs\Web\Controller { intval($page_owner_uid) ); } - - $item_private = (($str_contact_allow || $str_group_allow || $str_contact_deny || $str_group_deny) ? true : false); - + $old_is_nsfw = $p[0]['is_nsfw']; if($old_is_nsfw != $is_nsfw) { $r = q("update photo set is_nsfw = %d where resource_id = '%s' and uid = %d", @@ -320,31 +321,31 @@ class Photos extends \Zotlabs\Web\Controller { intval($page_owner_uid) ); } - + /* Don't make the item visible if the only change was the album name */ - + $visibility = 0; if($p[0]['description'] !== $desc || strlen($rawtags)) $visibility = 1; - + if(! $item_id) { $item_id = photos_create_item(\App::$data['channel'],get_observer_hash(),$p[0],$visibility); - + } - + if($item_id) { $r = q("SELECT * FROM item WHERE id = %d AND uid = %d LIMIT 1", intval($item_id), intval($page_owner_uid) ); - + if($r) { $old_tag = $r[0]['tag']; $old_inform = $r[0]['inform']; } } - - + + // make sure the linked item has the same permissions as the photo regardless of any other changes $x = q("update item set allow_cid = '%s', allow_gid = '%s', deny_cid = '%s', deny_gid = '%s', item_private = %d where id = %d", @@ -355,7 +356,7 @@ class Photos extends \Zotlabs\Web\Controller { intval($acl->is_private()), intval($item_id) ); - + // make sure the attach has the same permissions as the photo regardless of any other changes $x = q("update attach set allow_cid = '%s', allow_gid = '%s', deny_cid = '%s', deny_gid = '%s' where hash = '%s' and uid = %d and is_photo = 1", dbesc($perm['allow_cid']), @@ -365,46 +366,46 @@ class Photos extends \Zotlabs\Web\Controller { dbesc($resource_id), intval($page_owner_uid) ); - - - + + + if(strlen($rawtags)) { - + $str_tags = ''; $inform = ''; - + // if the new tag doesn't have a namespace specifier (@foo or #foo) give it a mention - + $x = substr($rawtags,0,1); if($x !== '@' && $x !== '#') $rawtags = '@' . $rawtags; - + require_once('include/text.php'); $profile_uid = \App::$profile['profile_uid']; - + $results = linkify_tags($rawtags, (local_channel()) ? local_channel() : $profile_uid); - + $success = $results['success']; $post_tags = array(); - + foreach($results as $result) { $success = $result['success']; if($success['replaced']) { $post_tags[] = array( - 'uid' => $profile_uid, + 'uid' => $profile_uid, 'ttype' => $success['termtype'], 'otype' => TERM_OBJ_POST, 'term' => $success['term'], 'url' => $success['url'] - ); + ); } } - + $r = q("select * from item where id = %d and uid = %d limit 1", intval($item_id), intval($page_owner_uid) ); - + if($r) { $r = fetch_post_tags($r,true); $datarray = $r[0]; @@ -412,42 +413,42 @@ class Photos extends \Zotlabs\Web\Controller { if((! array_key_exists('term',$datarray)) || (! is_array($datarray['term']))) $datarray['term'] = $post_tags; else - $datarray['term'] = array_merge($datarray['term'],$post_tags); + $datarray['term'] = array_merge($datarray['term'],$post_tags); } item_store_update($datarray,$execflag); } - + } $sync = attach_export_data(\App::$data['channel'],$resource_id); - - if($sync) + + if($sync) Libsync::build_sync_packet($page_owner_uid,array('file' => array($sync))); - + goaway(z_root() . '/' . $_SESSION['photo_return']); return; // NOTREACHED - - + + } - - + + /** * default post action - upload a photo */ - + $channel = \App::$data['channel']; $observer = \App::$data['observer']; - + $_REQUEST['source'] = 'photos'; require_once('include/attach.php'); - + if(! local_channel()) { $_REQUEST['contact_allow'] = expand_acl($channel['channel_allow_cid']); $_REQUEST['group_allow'] = expand_acl($channel['channel_allow_gid']); $_REQUEST['contact_deny'] = expand_acl($channel['channel_deny_cid']); $_REQUEST['group_deny'] = expand_acl($channel['channel_deny_gid']); } - + $matches = []; $partial = false; @@ -467,7 +468,7 @@ class Photos extends \Zotlabs\Web\Controller { if($x['partial']) { header('Range: bytes=0-' . (($x['length']) ? $x['length'] - 1 : 0)); - json_return_and_die($result); + json_return_and_die($x); } else { header('Range: bytes=0-' . (($x['size']) ? $x['size'] - 1 : 0)); @@ -481,7 +482,7 @@ class Photos extends \Zotlabs\Web\Controller { ]; } } - else { + else { if(! array_key_exists('userfile',$_FILES)) { $_FILES['userfile'] = [ 'name' => $_FILES['files']['name'], @@ -494,53 +495,53 @@ class Photos extends \Zotlabs\Web\Controller { } $r = attach_store($channel,get_observer_hash(), '', $_REQUEST); - + if(! $r['success']) { notice($r['message'] . EOL); goaway(z_root() . '/photos/' . \App::$data['channel']['channel_address']); - } + } goaway(z_root() . '/photos/' . \App::$data['channel']['channel_address'] . '/album/' . $r['data']['folder']); - + } - - - + + + function get() { - + // URLs: // photos/name // photos/name/album/xxxxx (xxxxx is album name) // photos/name/image/xxxxx - - + + if(observer_prohibited()) { notice( t('Public access denied.') . EOL); return; } - + $unsafe = ((array_key_exists('unsafe',$_REQUEST) && $_REQUEST['unsafe']) ? 1 : 0); - + require_once('include/bbcode.php'); require_once('include/security.php'); require_once('include/conversation.php'); - + if(! x(\App::$data,'channel')) { notice( t('No photos selected') . EOL ); return; } - + $ph = photo_factory(''); $phototypes = $ph->supportedTypes(); - + $_SESSION['photo_return'] = \App::$cmd; - + // - // Parse arguments + // Parse arguments // - + $can_comment = perm_is_allowed(\App::$profile['profile_uid'],get_observer_hash(),'post_comments'); - + if(argc() > 3) { $datatype = argv(2); $datum = argv(3); @@ -552,70 +553,70 @@ class Photos extends \Zotlabs\Web\Controller { else $datatype = 'summary'; } - + if(argc() > 4) $cmd = argv(4); else $cmd = 'view'; - + // // Setup permissions structures // - + $can_post = false; $visitor = 0; - - + + $owner_uid = \App::$data['channel']['channel_id']; $owner_aid = \App::$data['channel']['channel_account_id']; - + $observer = \App::get_observer(); - + $can_post = perm_is_allowed($owner_uid,$observer['xchan_hash'],'write_storage'); $can_view = perm_is_allowed($owner_uid,$observer['xchan_hash'],'view_storage'); - + if(! $can_view) { notice( t('Access to this item is restricted.') . EOL); return; } - + $sql_item = item_permissions_sql($owner_uid,get_observer_hash()); $sql_extra = permissions_sql($owner_uid,get_observer_hash(),'photo'); $sql_attach = permissions_sql($owner_uid,get_observer_hash(),'attach'); nav_set_selected('Photos'); - + $o = '<script src="vendor/blueimp/jquery-file-upload/js/vendor/jquery.ui.widget.js"></script> <script src="vendor/blueimp/jquery-file-upload/js/jquery.iframe-transport.js"></script> <script src="vendor/blueimp/jquery-file-upload/js/jquery.fileupload.js"></script>'; - $o .= "<script> var profile_uid = " . \App::$profile['profile_uid'] + $o .= "<script> var profile_uid = " . \App::$profile['profile_uid'] . "; var netargs = '?f='; var profile_page = " . \App::$pager['page'] . "; </script>\r\n"; - + $_is_owner = (local_channel() && (local_channel() == $owner_uid)); - + /** * Display upload form */ - + if( $can_post) { - + $uploader = ''; - + $ret = array('post_url' => z_root() . '/photos/' . \App::$data['channel']['channel_address'], 'addon_text' => $uploader, 'default_upload' => true); - + call_hooks('photo_upload_form',$ret); - + /* Show space usage */ - + $r = q("select sum(filesize) as total from photo where aid = %d and imgscale = 0 ", intval(\App::$data['channel']['channel_account_id']) ); - - + + $limit = engr_units_to_bytes(service_class_fetch(\App::$data['channel']['channel_id'],'photo_upload_limit')); if($limit !== false) { $usage_message = sprintf( t("%1$.2f MB of %2$.2f MB photo storage used."), $r[0]['total'] / 1024000, $limit / 1024000 ); @@ -623,22 +624,22 @@ class Photos extends \Zotlabs\Web\Controller { else { $usage_message = sprintf( t('%1$.2f MB photo storage used.'), $r[0]['total'] / 1024000 ); } - + if($_is_owner) { $channel = \App::get_channel(); - + $acl = new \Zotlabs\Access\AccessList($channel); $channel_acl = $acl->get(); - + $lockstate = (($acl->is_private()) ? 'lock' : 'unlock'); } - + $aclselect = (($_is_owner) ? populate_acl($channel_acl,false, \Zotlabs\Lib\PermissionDescription::fromGlobalPermission('view_storage')) : ''); - + // this is wrong but is to work around an issue with js_upload wherein it chokes if these variables - // don't exist. They really should be set to a parseable representation of the channel's default permissions - // which can be processed by getSelected() - + // don't exist. They really should be set to a parseable representation of the channel's default permissions + // which can be processed by getSelected() + if(! $aclselect) { $aclselect = '<input id="group_allow" type="hidden" name="allow_gid[]" value="" /><input id="contact_allow" type="hidden" name="allow_cid[]" value="" /><input id="group_deny" type="hidden" name="deny_gid[]" value="" /><input id="contact_deny" type="hidden" name="deny_cid[]" value="" />'; } @@ -648,11 +649,11 @@ class Photos extends \Zotlabs\Web\Controller { if($datum) { $h = attach_by_hash_nodata($datum,get_observer_hash()); $selname = $h['data']['display_path']; - } + } + - $albums = ((array_key_exists('albums', \App::$data)) ? \App::$data['albums'] : photos_albums_list(\App::$data['channel'],\App::$data['observer'])); - + if(! $selname) { $def_album = get_pconfig(\App::$data['channel']['channel_id'],'system','photo_path'); if($def_album) { @@ -660,7 +661,7 @@ class Photos extends \Zotlabs\Web\Controller { $albums['album'][] = array('text' => $selname); } } - + $tpl = get_markup_template('photos_upload.tpl'); $upload_form = replace_macros($tpl,array( '$pagename' => t('Upload Photos'), @@ -685,22 +686,22 @@ class Photos extends \Zotlabs\Web\Controller { '$default' => (($ret['default_upload']) ? true : false), '$uploadurl' => $ret['post_url'], '$submit' => t('Upload') - + )); - + } - + // // dispatch request // - + /* * Display a single photo album */ - + if($datatype === 'album') { - head_add_link([ + head_add_link([ 'rel' => 'alternate', 'type' => 'application/json+oembed', 'href' => z_root() . '/oep?f=&url=' . urlencode(z_root() . '/' . \App::$query_string), @@ -710,7 +711,7 @@ class Photos extends \Zotlabs\Web\Controller { if($x = photos_album_exists($owner_uid, get_observer_hash(), $datum)) { \App::set_pager_itemspage(30); $album = $x['display_path']; - } + } else { goaway(z_root() . '/photos/' . \App::$data['channel']['channel_address']); } @@ -721,7 +722,7 @@ class Photos extends \Zotlabs\Web\Controller { $order = 'DESC'; $r = q("SELECT p.resource_id, p.id, p.filename, p.mimetype, p.imgscale, p.description, p.created FROM photo p INNER JOIN - (SELECT resource_id, max(imgscale) imgscale FROM photo left join attach on folder = '%s' and photo.resource_id = attach.hash WHERE attach.uid = %d AND imgscale <= 4 AND photo_usage IN ( %d, %d ) and is_nsfw = %d $sql_extra GROUP BY resource_id) ph + (SELECT resource_id, max(imgscale) imgscale FROM photo left join attach on folder = '%s' and photo.resource_id = attach.hash WHERE attach.uid = %d AND imgscale <= 4 AND photo_usage IN ( %d, %d ) and is_nsfw = %d $sql_extra GROUP BY resource_id) ph ON (p.resource_id = ph.resource_id AND p.imgscale = ph.imgscale) ORDER BY created $order LIMIT %d OFFSET %d", dbesc($x['hash']), @@ -739,9 +740,9 @@ class Photos extends \Zotlabs\Web\Controller { if($can_post) { $album_e = $album; $albums = ((array_key_exists('albums', \App::$data)) ? \App::$data['albums'] : photos_albums_list(\App::$data['channel'],\App::$data['observer'])); - + // @fixme - syncronise actions with DAV - + // $edit_tpl = get_markup_template('album_edit.tpl'); // $album_edit = replace_macros($edit_tpl,array( // '$nametext' => t('Enter a new album name'), @@ -753,32 +754,32 @@ class Photos extends \Zotlabs\Web\Controller { // '$submit' => t('Submit'), // '$dropsubmit' => t('Delete Album') // )); - + } - + if($_GET['order'] === 'posted') $order = array(t('Show Newest First'), z_root() . '/photos/' . \App::$data['channel']['channel_address'] . '/album/' . $datum); else $order = array(t('Show Oldest First'), z_root() . '/photos/' . \App::$data['channel']['channel_address'] . '/album/' . $datum . '?f=&order=posted'); - + $photos = array(); if(count($r)) { $twist = 'rotright'; foreach($r as $rr) { - + if($twist == 'rotright') $twist = 'rotleft'; else $twist = 'rotright'; - + $ext = $phototypes[$rr['mimetype']]; - + $imgalt_e = $rr['filename']; $desc_e = $rr['description']; - + $imagelink = (z_root() . '/photos/' . \App::$data['channel']['channel_address'] . '/image/' . $rr['resource_id'] . (($_GET['order'] === 'posted') ? '?f=&order=posted' : '')); - + $photos[] = array( 'id' => $rr['id'], 'twist' => ' ' . $twist . rand(2,4), @@ -793,7 +794,7 @@ class Photos extends \Zotlabs\Web\Controller { ); } } - + if($_REQUEST['aj']) { if($photos) { $o = replace_macros(get_markup_template('photosajax.tpl'),array( @@ -821,71 +822,71 @@ class Photos extends \Zotlabs\Web\Controller { '$upload_form' => $upload_form, '$usage' => $usage_message )); - + } - + if((! $photos) && ($_REQUEST['aj'])) { $o .= '<div id="content-complete"></div>'; echo $o; killme(); } - + return $o; - - } - - /** + + } + + /** * Display one photo */ - + if($datatype === 'image') { - + \App::$page['htmlhead'] .= "\r\n" . '<link rel="alternate" type="application/json+oembed" href="' . z_root() . '/oep?f=&url=' . urlencode(z_root() . '/' . \App::$cmd) . '" title="oembed" />' . "\r\n"; - + $x = q("select folder from attach where hash = '%s' and uid = %d $sql_attach limit 1", dbesc($datum), intval($owner_uid) ); // fetch image, item containing image, then comments - - $ph = q("SELECT id,aid,uid,xchan,resource_id,created,edited,title,description,album,filename,mimetype,height,width,filesize,imgscale,photo_usage,is_nsfw,allow_cid,allow_gid,deny_cid,deny_gid FROM photo WHERE uid = %d AND resource_id = '%s' + + $ph = q("SELECT id,aid,uid,xchan,resource_id,created,edited,title,description,album,filename,mimetype,height,width,filesize,imgscale,photo_usage,is_nsfw,allow_cid,allow_gid,deny_cid,deny_gid FROM photo WHERE uid = %d AND resource_id = '%s' $sql_extra ORDER BY imgscale ASC ", intval($owner_uid), dbesc($datum) ); - + if(! ($ph && $x)) { - + /* Check again - this time without specifying permissions */ - + $ph = q("SELECT id FROM photo WHERE uid = %d AND resource_id = '%s' LIMIT 1", intval($owner_uid), dbesc($datum) ); - if($ph) + if($ph) notice( t('Permission denied. Access to this item may be restricted.') . EOL); else notice( t('Photo not available') . EOL ); return; } - - - + + + $prevlink = ''; $nextlink = ''; - + if($_GET['order'] === 'posted') $order = 'ASC'; else $order = 'DESC'; - + $prvnxt = q("SELECT hash FROM attach WHERE folder = '%s' AND uid = %d AND is_photo = 1 $sql_attach ORDER BY created $order ", dbesc($x[0]['folder']), intval($owner_uid) - ); + ); if(count($prvnxt)) { for($z = 0; $z < count($prvnxt); $z++) { @@ -899,12 +900,12 @@ class Photos extends \Zotlabs\Web\Controller { break; } } - + $prevlink = z_root() . '/photos/' . \App::$data['channel']['channel_address'] . '/image/' . $prvnxt[$prv]['hash'] . (($_GET['order'] === 'posted') ? '?f=&order=posted' : ''); $nextlink = z_root() . '/photos/' . \App::$data['channel']['channel_address'] . '/image/' . $prvnxt[$nxt]['hash'] . (($_GET['order'] === 'posted') ? '?f=&order=posted' : ''); } - - + + if(count($ph) == 1) $hires = $lores = $ph[0]; if(count($ph) > 1) { @@ -917,74 +918,74 @@ class Photos extends \Zotlabs\Web\Controller { $lores = $ph[1]; } } - + $album_link = z_root() . '/photos/' . \App::$data['channel']['channel_address'] . '/album/' . $x[0]['folder']; $tools = Null; $lock = Null; - + if($can_post && ($ph[0]['uid'] == $owner_uid)) { $tools = array( 'profile'=>array(z_root() . '/profile_photo/use/'.$ph[0]['resource_id'], t('Use as profile photo')), 'cover'=>array(z_root() . '/cover_photo/use/'.$ph[0]['resource_id'], t('Use as cover photo')), ); } - + // lockstate $lockstate = ( ( (strlen($ph[0]['allow_cid']) || strlen($ph[0]['allow_gid']) || strlen($ph[0]['deny_cid']) || strlen($ph[0]['deny_gid'])) ) ? array('lock', t('Private Photo')) : array('unlock', Null)); - + \App::$page['htmlhead'] .= '<script>$(document).keydown(function(event) {' . "\n"; if($prevlink) \App::$page['htmlhead'] .= 'if(event.ctrlKey && event.keyCode == 37) { event.preventDefault(); window.location.href = \'' . $prevlink . '\'; }' . "\n"; if($nextlink) \App::$page['htmlhead'] .= 'if(event.ctrlKey && event.keyCode == 39) { event.preventDefault(); window.location.href = \'' . $nextlink . '\'; }' . "\n"; \App::$page['htmlhead'] .= '});</script>'; - + if($prevlink) $prevlink = array($prevlink, t('Previous')); - + $photo = array( 'href' => z_root() . '/photo/' . $hires['resource_id'] . '-' . $hires['imgscale'] . '.' . $phototypes[$hires['mimetype']], 'title'=> t('View Full Size'), 'src' => z_root() . '/photo/' . $lores['resource_id'] . '-' . $lores['imgscale'] . '.' . $phototypes[$lores['mimetype']] ); - + if($nextlink) $nextlink = array($nextlink, t('Next')); - - + + // Do we have an item for this photo? - - $linked_items = q("SELECT * FROM item WHERE resource_id = '%s' and resource_type = 'photo' + + $linked_items = q("SELECT * FROM item WHERE resource_id = '%s' and resource_type = 'photo' $sql_item LIMIT 1", dbesc($datum) ); - + $map = null; - + if($linked_items) { - + xchan_query($linked_items); $linked_items = fetch_post_tags($linked_items,true); - + $link_item = $linked_items[0]; $item_normal = item_normal(); - - $r = q("select * from item where parent_mid = '%s' + + $r = q("select * from item where parent_mid = '%s' $item_normal and uid = %d $sql_item ", dbesc($link_item['mid']), intval($link_item['uid']) - + ); - + if($r) { xchan_query($r); $r = fetch_post_tags($r,true); $r = conv_sort($r,'commented'); } - + $tags = array(); if($link_item['term']) { $cnt = 0; @@ -997,23 +998,23 @@ class Photos extends \Zotlabs\Web\Controller { $cnt ++; } } - + if((local_channel()) && (local_channel() == $link_item['uid'])) { q("UPDATE item SET item_unseen = 0 WHERE parent = %d and uid = %d and item_unseen = 1", intval($link_item['parent']), intval(local_channel()) ); } - + if($link_item['coord']) { $map = generate_map($link_item['coord']); } } - + // logger('mod_photo: link_item' . print_r($link_item,true)); - - // FIXME - remove this when we move to conversation module - + + // FIXME - remove this when we move to conversation module + $r = $r[0]['children']; $edit = null; @@ -1023,11 +1024,11 @@ class Photos extends \Zotlabs\Web\Controller { $caption_e = $ph[0]['description']; $aclselect_e = (($_is_owner) ? populate_acl($ph[0], true, \Zotlabs\Lib\PermissionDescription::fromGlobalPermission('view_storage')) : ''); $albums = ((array_key_exists('albums', \App::$data)) ? \App::$data['albums'] : photos_albums_list(\App::$data['channel'],\App::$data['observer'])); - + $_SESSION['album_return'] = bin2hex($ph[0]['album']); $folder_list = attach_folder_select_list($ph[0]['uid']); - + $edit = [ 'edit' => t('Edit photo'), 'id' => $link_item['id'], @@ -1058,17 +1059,17 @@ class Photos extends \Zotlabs\Web\Controller { 'delete' => t('Delete Photo') ]; } - + if(count($linked_items)) { - + $cmnt_tpl = get_markup_template('comment_item.tpl'); $tpl = get_markup_template('photo_item.tpl'); $return_url = \App::$cmd; - + $like_tpl = get_markup_template('like_noshare.tpl'); - + $likebuttons = ''; - + if($observer && ($can_post || $can_comment)) { $likebuttons = [ 'id' => $link_item['id'], @@ -1078,12 +1079,12 @@ class Photos extends \Zotlabs\Web\Controller { 'wait' => t('Please wait') ]; } - + $comments = ''; if(! $r) { if($observer && ($can_post || $can_comment)) { $commentbox = replace_macros($cmnt_tpl,array( - '$return_path' => '', + '$return_path' => '', '$mode' => 'photos', '$jsreload' => $return_url, '$type' => 'wall-comment', @@ -1101,28 +1102,28 @@ class Photos extends \Zotlabs\Web\Controller { )); } } - + $alike = array(); $dlike = array(); - + $like = ''; $dislike = ''; - + $conv_responses = array( 'like' => array('title' => t('Likes','title')),'dislike' => array('title' => t('Dislikes','title')), - 'agree' => array('title' => t('Agree','title')),'disagree' => array('title' => t('Disagree','title')), 'abstain' => array('title' => t('Abstain','title')), + 'agree' => array('title' => t('Agree','title')),'disagree' => array('title' => t('Disagree','title')), 'abstain' => array('title' => t('Abstain','title')), 'attendyes' => array('title' => t('Attending','title')), 'attendno' => array('title' => t('Not attending','title')), 'attendmaybe' => array('title' => t('Might attend','title')) ); - - - - + + + + if($r) { - + foreach($r as $item) { builtin_activity_puller($item, $conv_responses); } - + $like_count = ((x($alike,$link_item['mid'])) ? $alike[$link_item['mid']] : ''); $like_list = ((x($alike,$link_item['mid'])) ? $alike[$link_item['mid'] . '-l'] : ''); @@ -1133,7 +1134,7 @@ class Photos extends \Zotlabs\Web\Controller { $like_list_part = ''; } $like_button_label = tt('Like','Likes',$like_count,'noun'); - + //if (feature_enabled($conv->get_profile_owner(),'dislike')) { $dislike_count = ((x($dlike,$link_item['mid'])) ? $dlike[$link_item['mid']] : ''); $dislike_list = ((x($dlike,$link_item['mid'])) ? $dlike[$link_item['mid'] . '-l'] : ''); @@ -1145,44 +1146,44 @@ class Photos extends \Zotlabs\Web\Controller { $dislike_list_part = ''; } //} - - + + $like = ((isset($alike[$link_item['mid']])) ? format_like($alike[$link_item['mid']],$alike[$link_item['mid'] . '-l'],'like',$link_item['mid']) : ''); $dislike = ((isset($dlike[$link_item['mid']])) ? format_like($dlike[$link_item['mid']],$dlike[$link_item['mid'] . '-l'],'dislike',$link_item['mid']) : ''); - + // display comments - + foreach($r as $item) { $comment = ''; $template = $tpl; $sparkle = ''; - + if(((activity_match($item['verb'],ACTIVITY_LIKE)) || (activity_match($item['verb'],ACTIVITY_DISLIKE))) && ($item['id'] != $item['parent'])) continue; - + $redirect_url = z_root() . '/redir/' . $item['cid'] ; - - + + $profile_url = zid($item['author']['xchan_url']); $sparkle = ''; - - + + $profile_name = $item['author']['xchan_name']; $profile_avatar = $item['author']['xchan_photo_m']; - + $profile_link = $profile_url; - + $drop = ''; - + if($observer['xchan_hash'] === $item['author_xchan'] || $observer['xchan_hash'] === $item['owner_xchan']) $drop = replace_macros(get_markup_template('photo_drop.tpl'), array('$id' => $item['id'], '$delete' => t('Delete'))); - - + + $name_e = $profile_name; $title_e = $item['title']; unobscure($item); $body_e = prepare_text($item['body'],$item['mimetype']); - + $comments .= replace_macros($template,array( '$id' => $item['id'], '$mode' => 'photos', @@ -1197,9 +1198,9 @@ class Photos extends \Zotlabs\Web\Controller { '$drop' => $drop, '$comment' => $comment )); - + } - + if($observer && ($can_post || $can_comment)) { $commentbox = replace_macros($cmnt_tpl,array( '$return_path' => '', @@ -1216,20 +1217,20 @@ class Photos extends \Zotlabs\Web\Controller { '$ww' => '' )); } - + } $paginate = paginate($a); } - + $album_e = array($album_link,$ph[0]['album']); $like_e = $like; $dislike_e = $dislike; - - + + $response_verbs = array('like'); if(feature_enabled($owner_uid,'dislike')) $response_verbs[] = 'dislike'; - + $responses = get_responses($conv_responses,$response_verbs,'',$link_item); $hookdata = [ @@ -1238,7 +1239,7 @@ class Photos extends \Zotlabs\Web\Controller { 'nickname' => \App::$data['channel']['channel_address'] ]; call_hooks('photo_view_filter', $hookdata); - + $photo_tpl = get_markup_template('photo_view.tpl'); $o .= replace_macros($photo_tpl, array( '$id' => $ph[0]['id'], @@ -1255,7 +1256,7 @@ class Photos extends \Zotlabs\Web\Controller { '$tag_hdr' => t('In This Photo:'), '$tags' => $tags, 'responses' => $responses, - '$edit' => $edit, + '$edit' => $edit, '$map' => $map, '$map_text' => t('Map'), '$likebuttons' => $likebuttons, @@ -1277,26 +1278,26 @@ class Photos extends \Zotlabs\Web\Controller { '$paginate' => $paginate, '$onclick' => $hookdata['onclick'] )); - + \App::$data['photo_html'] = $o; - + return $o; } - + // Default - show recent photos with upload link (if applicable) //$o = ''; - + \App::$page['htmlhead'] .= "\r\n" . '<link rel="alternate" type="application/json+oembed" href="' . z_root() . '/oep?f=&url=' . urlencode(z_root() . '/' . \App::$cmd) . '" title="oembed" />' . "\r\n"; - + \App::set_pager_itemspage(30); - - $r = q("SELECT p.resource_id, p.id, p.filename, p.mimetype, p.album, p.imgscale, p.created, p.display_path - FROM photo p - INNER JOIN ( SELECT resource_id, max(imgscale) imgscale FROM photo - WHERE photo.uid = %d AND photo_usage IN ( %d, %d ) - AND is_nsfw = %d $sql_extra group by resource_id ) ph - ON (p.resource_id = ph.resource_id and p.imgscale = ph.imgscale) + + $r = q("SELECT p.resource_id, p.id, p.filename, p.mimetype, p.album, p.imgscale, p.created, p.display_path + FROM photo p + INNER JOIN ( SELECT resource_id, max(imgscale) imgscale FROM photo + WHERE photo.uid = %d AND photo_usage IN ( %d, %d ) + AND is_nsfw = %d $sql_extra group by resource_id ) ph + ON (p.resource_id = ph.resource_id and p.imgscale = ph.imgscale) ORDER by p.created DESC LIMIT %d OFFSET %d", intval(\App::$data['channel']['channel_id']), intval(PHOTO_NORMAL), @@ -1305,9 +1306,9 @@ class Photos extends \Zotlabs\Web\Controller { intval(\App::$pager['itemspage']), intval(\App::$pager['start']) ); - - - + + + $photos = array(); if($r) { $twist = 'rotright'; @@ -1321,7 +1322,7 @@ class Photos extends \Zotlabs\Web\Controller { else $twist = 'rotright'; $ext = $phototypes[$rr['mimetype']]; - + $alt_e = $rr['filename']; $name_e = dirname($rr['display_path']); @@ -1335,11 +1336,11 @@ class Photos extends \Zotlabs\Web\Controller { 'album' => array( 'name' => $name_e, ), - + ); } } - + if($_REQUEST['aj']) { if($photos) { $o = replace_macros(get_markup_template('photosajax.tpl'),array( @@ -1355,7 +1356,7 @@ class Photos extends \Zotlabs\Web\Controller { } else { $o .= "<script> var page_query = '" . escape_tags(urlencode($_GET['q'])) . "'; var extra_args = '" . extra_query_args() . "' ; </script>"; - $tpl = get_markup_template('photos_recent.tpl'); + $tpl = get_markup_template('photos_recent.tpl'); $o .= replace_macros($tpl, array( '$title' => t('Recent Photos'), '$album_id' => bin2hex(t('Recent Photos')), @@ -1365,18 +1366,18 @@ class Photos extends \Zotlabs\Web\Controller { '$upload_form' => $upload_form, '$usage' => $usage_message )); - + } - + if((! $photos) && ($_REQUEST['aj'])) { $o .= '<div id="content-complete"></div>'; echo $o; killme(); } - + // paginate($a); return $o; } - - + + } diff --git a/Zotlabs/Module/Sse_bs.php b/Zotlabs/Module/Sse_bs.php index 534c63d46..396e07001 100644 --- a/Zotlabs/Module/Sse_bs.php +++ b/Zotlabs/Module/Sse_bs.php @@ -123,7 +123,7 @@ class Sse_bs extends Controller { $mids[] = '\'' . dbesc(@base64url_decode(substr($a,4))) . '\''; } - $str = implode($mids, ','); + $str = implode(',', $mids); $x = [ 'channel_id' => self::$uid, 'update' => 'unset' ]; call_hooks('update_unseen',$x); diff --git a/Zotlabs/Module/Zfinger.php b/Zotlabs/Module/Zfinger.php index 533f0a5db..ce7117ad8 100644 --- a/Zotlabs/Module/Zfinger.php +++ b/Zotlabs/Module/Zfinger.php @@ -7,7 +7,7 @@ use Zotlabs\Lib\Libzot; class Zfinger extends \Zotlabs\Web\Controller { function init() { - + require_once('include/zot.php'); require_once('include/crypto.php'); @@ -26,7 +26,7 @@ class Zfinger extends \Zotlabs\Web\Controller { if($chan) { $headers['Digest'] = HTTPSig::generate_digest_header($ret); - $h = HTTPSig::create_sig($headers,$chan['channel_prvkey'],'acct:' . channel_reddress($chan)); + $h = HTTPSig::create_sig($headers,$chan['channel_prvkey'], channel_url($chan)); HTTPSig::set_headers($h); } else { @@ -37,7 +37,7 @@ class Zfinger extends \Zotlabs\Web\Controller { echo $ret; killme(); - + } - + } diff --git a/Zotlabs/Storage/Browser.php b/Zotlabs/Storage/Browser.php index 7b20e9ddb..fdef35210 100644 --- a/Zotlabs/Storage/Browser.php +++ b/Zotlabs/Storage/Browser.php @@ -264,7 +264,6 @@ class Browser extends DAV\Browser\Plugin { $ft['attach_id'] = $id; $ft['icon'] = $icon; $ft['photo_icon'] = $photo_icon; - $ft['is_owner'] = $is_owner; $ft['is_creator'] = $is_creator; $ft['rel_path'] = (($data) ? '/cloud/' . $nick .'/' . $data['display_path'] : $href); $ft['full_path'] = z_root() . (($data) ? '/cloud/' . $nick .'/' . $data['display_path'] : $href); @@ -295,9 +294,16 @@ class Browser extends DAV\Browser\Plugin { // create a copy of the list which we can alter for the current resource $folders = $folder_list; + if($data['is_dir']) { - // can not copy a folder into itself - unset($folders[$folder_hash]); + + $rm_path = $folders[$folder_hash]; + // can not copy a folder into itself or own child folders + foreach($folders as $k => $v) { + if(strpos($v, $rm_path) === 0) + unset($folders[$k]); + } + } $ft['newfolder'] = ['newfolder_' . $id, t('Select a target location'), $data['folder'], '', $folders]; @@ -325,7 +331,7 @@ class Browser extends DAV\Browser\Plugin { } $ft['attach_bbcode'] = $attach_bbcode; - $link_bbcode = '[zrl]' . $ft['full_path'] . '[/zrl]'; + $link_bbcode = '[zrl=' . $ft['full_path'] . ']' . $ft['name'] . '[/zrl]'; $ft['link_bbcode'] = $link_bbcode; $f[] = $ft; @@ -360,7 +366,7 @@ class Browser extends DAV\Browser\Plugin { '$upload' => t('Add Files'), '$is_owner' => $is_owner, '$is_admin' => is_site_admin(), - '$admin_delete' => t('Admin Delete'), + '$admin_delete_label' => t('Admin Delete'), '$parentpath' => $parent_path, '$folder_parent' => $folder_parent, '$folder' => $parent->folder_hash, @@ -373,26 +379,36 @@ class Browser extends DAV\Browser\Plugin { '$size' => t('Size'), '$lastmod' => t('Last Modified'), '$parent' => t('parent'), - '$edit' => t('Submit'), - '$delete' => t('Delete'), + '$submit_label' => t('Submit'), + '$cancel_label' => t('Cancel'), + '$delete_label' => t('Delete'), '$channel_id' => $channel_id, '$cpdesc' => t('Copy/paste this code to attach file to a post'), '$cpldesc' => t('Copy/paste this URL to link file from a web page'), - '$categories' => ['categories', t('Categories')], '$recurse' => ['recurse', t('Set permissions for all files and sub folders'), 0, '', [t('No'), t('Yes')]], - '$newfolder' => ['newfolder', t('Select a target location'), $parent->folder_hash, '', $folder_list], '$copy' => ['copy', t('Copy to target location'), 0, '', [t('No'), t('Yes')]], '$return_path' => $path, - '$lockstate' => $lockstate, '$allow_cid' => acl2json($channel_acl['allow_cid']), '$allow_gid' => acl2json($channel_acl['allow_gid']), '$deny_cid' => acl2json($channel_acl['deny_cid']), - '$deny_gid' => acl2json($channel_acl['deny_gid']) - - + '$deny_gid' => acl2json($channel_acl['deny_gid']), + '$is_owner' => $is_owner, + '$select_all_label' => t('Select All'), + '$bulk_actions_label' => t('Bulk Actions'), + '$adjust_permissions_label' => t('Adjust Permissions'), + '$move_copy_label' => t('Move or Copy'), + '$categories_label' => t('Categories'), + '$download_label' => t('Download'), + '$info_label' => t('Info'), + '$rename_label' => t('Rename'), + '$post_label' => t('Post'), + '$attach_bbcode_label' => t('Attachment BBcode'), + '$embed_bbcode_label' => t('Embed BBcode'), + '$link_bbcode_label' => t('Link BBcode'), + '$close_label' => t('Close') )); $a = false; @@ -491,7 +507,7 @@ class Browser extends DAV\Browser\Plugin { $breadcrumbs_html = ''; - if($display_path && ! $_REQUEST['cat']){ + if($display_path && ! $_REQUEST['cat'] && ! $_SESSION['cloud_tiles']){ $breadcrumbs = []; $folders = explode('/', $display_path); $folder_hashes = explode('/', $node->os_path); @@ -534,7 +550,8 @@ class Browser extends DAV\Browser\Plugin { '$folder' => $node->folder_hash, '$dragdroptext' => t('Drop files here to immediately upload'), '$notify' => ['notify', t('Show in your contacts shared folder'), 0, '', [t('No'), t('Yes')]], - '$breadcrumbs_html' => $breadcrumbs_html + '$breadcrumbs_html' => $breadcrumbs_html, + '$drop_area_label' => t('You can select files via the upload button or drop them right here or into an existing folder.') )); } diff --git a/Zotlabs/Zot6/Finger.php b/Zotlabs/Zot6/Finger.php index 22ce4685d..cec3f98ab 100644 --- a/Zotlabs/Zot6/Finger.php +++ b/Zotlabs/Zot6/Finger.php @@ -88,7 +88,7 @@ class Finger { $headers = []; $headers['X-Zot-Channel'] = $channel['channel_address'] . '@' . \App::get_hostname(); $headers['X-Zot-Nonce'] = random_string(); - $xhead = HTTPSig::create_sig($headers,$channel['channel_prvkey'],'acct:' . channel_reddress($channel)); + $xhead = HTTPSig::create_sig($headers,$channel['channel_prvkey'], channel_url($channel)); $retries = 0; @@ -100,7 +100,7 @@ class Finger { $result = z_post_url('http://' . $host . $rhs,$postvars, $retries, [ 'headers' => $xhead ]); } } - } + } else { $rhs .= '?f=&address=' . urlencode($address) . '&token=' . self::$token; diff --git a/Zotlabs/Zot6/Zot6Handler.php b/Zotlabs/Zot6/Zot6Handler.php index d717b147b..bd321c4b1 100644 --- a/Zotlabs/Zot6/Zot6Handler.php +++ b/Zotlabs/Zot6/Zot6Handler.php @@ -226,18 +226,18 @@ class Zot6Handler implements IHandler { if ($recipients) { // basically this means "unfriend" foreach ($recipients as $recip) { - $r = q("select channel.*,xchan.* from channel + $channel = q("select channel.*,xchan.* from channel left join xchan on channel_hash = xchan_hash where channel_hash = '%s' limit 1", dbesc($recip) ); - if ($r) { - $r = q("select abook_id from abook where uid = %d and abook_xchan = '%s' limit 1", - intval($r[0]['channel_id']), + if ($channel) { + $abook = q("select abook_id from abook where abook_channel = %d and abook_xchan = '%s' limit 1", + intval($channel[0]['channel_id']), dbesc($sender) ); - if ($r) { - contact_remove($r[0]['channel_id'],$r[0]['abook_id']); + if ($abook) { + contact_remove($channel[0]['channel_id'],$abook[0]['abook_id']); } } } diff --git a/app/mail.apd b/app/mail.apd deleted file mode 100644 index f94a2b3c7..000000000 --- a/app/mail.apd +++ /dev/null @@ -1,6 +0,0 @@ -version: 2 -url: $baseurl/mail/combined -requires: local_channel -name: Mail -photo: icon:envelope -categories: nav_featured_app, Personal diff --git a/app/mail.png b/app/mail.png Binary files differdeleted file mode 100644 index bbd9f8449..000000000 --- a/app/mail.png +++ /dev/null @@ -50,7 +50,7 @@ require_once('include/attach.php'); require_once('include/bbcode.php'); define ( 'PLATFORM_NAME', 'hubzilla' ); -define ( 'STD_VERSION', '5.1.11' ); +define ( 'STD_VERSION', '5.3.1' ); define ( 'ZOT_REVISION', '6.0' ); define ( 'DB_UPDATE_VERSION', 1240 ); @@ -82,11 +82,11 @@ define ( 'DIRECTORY_MODE_STANDALONE', 0x0100); // A detached (off the grid) hub define ( 'DIRECTORY_REALM', 'RED_GLOBAL'); define ( 'DIRECTORY_FALLBACK_MASTER', 'https://hub.netzgemeinde.eu'); -$DIRECTORY_FALLBACK_SERVERS = array( +$DIRECTORY_FALLBACK_SERVERS = [ 'https://hub.netzgemeinde.eu', 'https://zotsite.net', 'https://hub.libranet.de' -); +]; /** @@ -2017,7 +2017,7 @@ function proc_run(){ } $args = array_map('escapeshellarg',$args); - $cmdline = implode($args," "); + $cmdline = implode(' ', $args); if(is_windows()) { $cwd = getcwd(); diff --git a/include/attach.php b/include/attach.php index b4f697f81..f65f41477 100644 --- a/include/attach.php +++ b/include/attach.php @@ -2987,10 +2987,7 @@ function attach_folder_select_list($channel_id) { if($r) { foreach($r as $rv) { - $x = attach_folder_rpaths($r,$rv); - if($x) { - $out[$x[0]] = $x[1]; - } + $out[$rv['hash']] = $rv['display_path']; } } @@ -3020,7 +3017,7 @@ function attach_folder_rpaths($all_folders,$that_folder) { if(! $found) $error = true; } - while((! $found) && (! $error) && ($parent_hash != '')); + while((! $error) && ($parent_hash != '')); } return (($error) ? false : [ $current_hash , $path ]); diff --git a/include/cdav.php b/include/cdav.php index ef248a9fe..fcce0ec4a 100644 --- a/include/cdav.php +++ b/include/cdav.php @@ -111,7 +111,7 @@ function process_cdav_card($f, &$vcard, $edit = false) { function import_cdav_card($id, $ext, $table, $column, $objects, $profile, $backend, &$ids, $notice = false) { $i = 0; - $newid = (count($ids) ? false : true); + $newid = (count($ids) ? false : true); while ($object = $objects->getNext()) { @@ -161,7 +161,7 @@ function import_cdav_card($id, $ext, $table, $column, $objects, $profile, $backe ); } - if($notice && $exp == 'vcf') { + if($notice && $ext == 'vcf') { notice( '<strong>' . t('INVALID CARD DISMISSED!') . '</strong>' . EOL . '<strong>' . t('Name: ') . '</strong>' . (($object->FN) ? $object->FN : t('Unknown')) . EOL . diff --git a/include/channel.php b/include/channel.php index d610a0b9a..2d79cd074 100644 --- a/include/channel.php +++ b/include/channel.php @@ -651,7 +651,7 @@ function change_channel_keys($channel) { foreach($h as $hv) { $hv['hubloc_guid_sig'] = $sig; $hv['hubloc_hash'] = $hash; - $hv['hubloc_url_sig'] = base64url_encode(rsa_sign(z_root(),$modifed['channel_prvkey'])); + $hv['hubloc_url_sig'] = base64url_encode(rsa_sign(z_root(),$modified['channel_prvkey'])); hubloc_store_lowlevel($hv); } } diff --git a/include/connections.php b/include/connections.php index bd41e112e..99a4cc71e 100644 --- a/include/connections.php +++ b/include/connections.php @@ -357,7 +357,7 @@ function contact_remove($channel_id, $abook_id) { call_hooks('connection_remove',$x); - $archive = get_pconfig($channel_id, 'system','archive_removed_contacts'); + $archive = get_pconfig($channel_id, 'system', 'archive_removed_contacts'); if($archive) { q("update abook set abook_archived = 1 where abook_id = %d and abook_channel = %d", intval($abook_id), diff --git a/include/dir_fns.php b/include/dir_fns.php index f477b35dd..b0609ce8b 100644 --- a/include/dir_fns.php +++ b/include/dir_fns.php @@ -28,7 +28,7 @@ function find_upstream_directory($dirmode) { ); if(($r) && ($r[0]['site_flags'] & DIRECTORY_MODE_STANDALONE)) { $preferred = ''; - } + } } @@ -39,7 +39,7 @@ function find_upstream_directory($dirmode) { * from our list of directory servers. However, if we're a directory * server ourself, point at the local instance * We will then set this value so this should only ever happen once. - * Ideally there will be an admin setting to change to a different + * Ideally there will be an admin setting to change to a different * directory server if you don't like our choice or if circumstances change. */ @@ -94,7 +94,7 @@ function get_directory_setting($observer, $setting) { $ret = get_config('directory', $setting); - // 'safemode' is the default if there is no observer or no established preference. + // 'safemode' is the default if there is no observer or no established preference. if($setting == 'safemode' && $ret === false) $ret = 1; @@ -152,8 +152,8 @@ function dir_sort_links() { * * Checks the directory mode of this hub to see if it is some form of directory server. If it is, * get the directory realm of this hub. Fetch a list of all other directory servers in this realm and request - * a directory sync packet. This will contain both directory updates and new ratings. Store these all in the DB. - * In the case of updates, we will query each of them asynchronously from a poller task. Ratings are stored + * a directory sync packet. This will contain both directory updates and new ratings. Store these all in the DB. + * In the case of updates, we will query each of them asynchronously from a poller task. Ratings are stored * directly if the rater's signature matches. * * @param int $dirmode; @@ -189,7 +189,7 @@ function sync_directories($dirmode) { [ 'site_url' => DIRECTORY_FALLBACK_MASTER, 'site_flags' => DIRECTORY_MODE_PRIMARY, - 'site_update' => NULL_DATE, + 'site_update' => NULL_DATE, 'site_directory' => DIRECTORY_FALLBACK_MASTER . '/dirsearch', 'site_realm' => DIRECTORY_REALM, 'site_valid' => 1, @@ -335,11 +335,11 @@ function update_directory_entry($ud) { // modify the directory search to only return zot6 entries, and also modify this function // to *only* fetch the zot6 entries. // Otherwise we'll be showing duplicates or have a mostly empty directory for a good chunk of - // the transition period. Directory server load will likely increase "moderately" during this transition. - // The one month counter begins when the primary directory has upgraded to a release which uses this code. + // the transition period. Directory server load will likely increase "moderately" during this transition. + // The one month counter begins when the primary directory has upgraded to a release which uses this code. // Hubzilla channels running traditional zot which have not upgraded can or will be dropped from the directory or // "not found" at the end of the transition period as the directory will only serve zot6 entries at that time. - + $uri = Webfinger::zot_url($ud['ud_addr']); if($uri) { $record = Zotfinger::exec($uri); @@ -347,8 +347,8 @@ function update_directory_entry($ud) { // Check the HTTP signature $hsig = $record['signature']; - if($hsig && $hsig['signer'] === $url && $hsig['header_valid'] === true && $hsig['content_valid'] === true) { - $x = \Zotlabs\Lib\Libzot::import_xchan($record['data'], 0, $ud); + if($hsig && $hsig['signer'] === $uri && $hsig['header_valid'] === true && $hsig['content_valid'] === true) { + $x = Libzot::import_xchan($record['data'], 0, $ud); if($x['success']) { $success = true; } @@ -394,7 +394,7 @@ function local_dir_update($uid, $force) { $profile['description'] = $p[0]['pdesc']; $profile['birthday'] = $p[0]['dob']; - if ($age = age($p[0]['dob'],$p[0]['channel_timezone'],'')) + if ($age = age($p[0]['dob'],$p[0]['channel_timezone'],'')) $profile['age'] = $age; $profile['gender'] = $p[0]['gender']; diff --git a/include/help.php b/include/help.php index affe64495..ebf1ccc08 100644 --- a/include/help.php +++ b/include/help.php @@ -299,7 +299,7 @@ function load_context_help() { break; array_pop($args); - $path = implode($args,'/'); + $path = implode('/', $args); } return $context_help; diff --git a/include/html2plain.php b/include/html2plain.php index 979354079..fde70bd01 100644 --- a/include/html2plain.php +++ b/include/html2plain.php @@ -40,7 +40,7 @@ function breaklines($line, $level, $wraplength = 75) $newlines[] = $line; - return(implode($newlines, "\n")); + return(implode("\n", $newlines)); } function quotelevel($message, $wraplength = 75) @@ -73,7 +73,7 @@ function quotelevel($message, $wraplength = 75) if (!$startquote or ($line != '')) $newlines[] = breaklines($line, $currlevel, $wraplength); } - return(implode($newlines, "\n")); + return(implode("\n", $newlines)); } function collecturls($message) { diff --git a/include/import.php b/include/import.php index d02cc1e1f..82d6cfe07 100644 --- a/include/import.php +++ b/include/import.php @@ -1358,7 +1358,7 @@ function sync_files($channel, $files) { $headers = []; $headers['Accept'] = 'application/x-zot+json' ; $headers['Sigtoken'] = random_string(); - $headers = HTTPSig::create_sig($headers,$channel['channel_prvkey'], 'acct:' . channel_reddress($channel),true,'sha512'); + $headers = HTTPSig::create_sig($headers, $channel['channel_prvkey'], channel_reddress($channel), true, 'sha512'); $x = z_post_url($fetch_url,$parr,$redirects,[ 'filep' => $fp, 'headers' => $headers]); fclose($fp); @@ -1463,7 +1463,7 @@ function sync_files($channel, $files) { $headers = []; $headers['Accept'] = 'application/x-zot+json' ; $headers['Sigtoken'] = random_string(); - $headers = HTTPSig::create_sig($headers,$channel['channel_prvkey'],'acct:' . channel_reddress($channel),true,'sha512'); + $headers = HTTPSig::create_sig($headers, $channel['channel_prvkey'], channel_url($channel), true, 'sha512'); $x = z_post_url($fetch_url,$parr,$redirects,[ 'filep' => $fp, 'headers' => $headers]); fclose($fp); diff --git a/include/items.php b/include/items.php index 2426c189f..85465192d 100755 --- a/include/items.php +++ b/include/items.php @@ -2206,6 +2206,7 @@ function item_store_update($arr, $allow_exec = false, $deliver = true) { return $ret; } + // override the unseen flag with the original $arr['item_unseen'] = $orig[0]['item_unseen']; @@ -2682,6 +2683,12 @@ function tag_deliver($uid, $item_id) { if ($is_group && intval($item['item_thread_top']) && intval($item['item_wall']) && $item['author_xchan'] !== $item['owner_xchan']) { + + if($item['resource_type'] === 'group_item') { + logger('resource_type group_item: already shared'); + return; + } + if (strpos($item['body'],'[/share]')) { logger('W2W post already shared'); return; @@ -3113,11 +3120,12 @@ function tgroup_check($uid, $item) { } } } -*/ + if(! $found) { logger('tgroup_check: mention was in a reshare or exceeded max_tagged_forums - ignoring'); continue; } +*/ return true; } @@ -3203,16 +3211,18 @@ function start_delivery_chain($channel, $item, $item_id, $parent, $group = false $arr = []; if ($edit) { + // process edit or delete action - $r = q("select * from item where source_xchan = '%s' and body like '%s' and uid = %d limit 1", - dbesc($item['owner_xchan']), - dbesc("%message_id='" . $item['mid'] . "'%"), - intval($channel['channel_id']) + $r = q("select * from item where uid = %d and resource_id = '%s' and source_xchan = '%s' and resource_type = 'group_item' limit 1", + intval($channel['channel_id']), + dbesc($item['mid']), + dbesc($item['author_xchan']) ); + if ($r) { if (intval($item['item_deleted'])) { - drop_item($r[0]['id'],false,DROPITEM_PHASE1); - Master::Summon([ 'Notifier','drop',$r[0]['id'] ]); + drop_item($r[0]['id'], false, DROPITEM_PHASE1); + Master::Summon([ 'Notifier', 'drop', $r[0]['id'] ]); return; } $arr['id'] = intval($r[0]['id']); @@ -3242,6 +3252,9 @@ function start_delivery_chain($channel, $item, $item_id, $parent, $group = false $arr['item_uplink'] = 0; $arr['source_xchan'] = $item['owner_xchan']; + $arr['resource_id'] = $item['mid']; + $arr['resource_type'] = 'group_item'; + $arr['item_private'] = (($channel['channel_allow_cid'] || $channel['channel_allow_gid'] || $channel['channel_deny_cid'] || $channel['channel_deny_gid']) ? 1 : 0); @@ -3263,12 +3276,13 @@ function start_delivery_chain($channel, $item, $item_id, $parent, $group = false "' message_id='" . $item['mid'] . "']"; if($item['title']) - $bb .= '[b]'.$item['title'].'[/b]'."\r\n"; + $bb .= '[h3][b]'.$item['title'].'[/b][/h3]'."\r\n"; $bb .= $item['body']; $bb .= "[/share]"; } $arr['body'] = $bb; + $arr['term'] = $item['term']; $arr['author_xchan'] = $channel['channel_hash']; $arr['owner_xchan'] = $channel['channel_hash']; diff --git a/include/js_strings.php b/include/js_strings.php index 6f559f4c4..e06e105fd 100644 --- a/include/js_strings.php +++ b/include/js_strings.php @@ -47,10 +47,10 @@ function js_strings() { 'days' => tt('%d days', '%d days', '%d'), 'months' => tt('%d months', '%d months', '%d'), 'years' => tt('%d years', '%d years', '%d'), - + // get plural function code 'plural_func' => tf(), - + '$t01' => ((t('timeago.prefixAgo') == 'timeago.prefixAgo') ? '' : ((t('timeago.prefixAgo') == 'NONE') ? '' : t('timeago.prefixAgo'))), '$t02' => ((t('timeago.prefixFromNow') == 'timeago.prefixFromNow') ? '' : ((t('timeago.prefixFromNow') == 'NONE') ? '' : t('timeago.prefixFromNow'))), '$t03' => ((t('timeago.suffixAgo') == 'timeago.suffixAgo') ? 'ago' : ((t('timeago.suffixAgo') == 'NONE') ? '' : t('timeago.suffixAgo'))), @@ -113,6 +113,9 @@ function js_strings() { '$month' => t('month','calendar'), '$week' => t('week','calendar'), '$day' => t('day','calendar'), - '$allday' => t('All day','calendar') + '$allday' => t('All day','calendar'), + + // mod cloud + '$download_info' => t('Please stand by while your download is being prepared.') )); } diff --git a/include/network.php b/include/network.php index bcd66cf85..324a99eba 100644 --- a/include/network.php +++ b/include/network.php @@ -714,7 +714,7 @@ function sxml2array ( $xmlObject, $out = array () ) * @brief xml2array() will convert the given XML text to an array in the XML structure. * * Link: http://www.bin-co.com/php/scripts/xml2array/ - * Portions significantly re-written by mike@macgirvin.com + * Portions significantly re-written by mike@macgirvin.com * (namespaces, lowercase tags, get_attribute default changed, more...) * * Examples: $array = xml2array(file_get_contents('feed.xml')); @@ -1113,8 +1113,8 @@ function discover_by_webbie($webbie, $protocol = '') { // Check the HTTP signature $hsig = $record['signature']; - if($hsig && ($hsig['signer'] === $url || $hsig['signer'] === $link['href']) && $hsig['header_valid'] === true && $hsig['content_valid'] === true) - $hsig_valid = true; + if($hsig && $hsig['signer'] === $link['href'] && $hsig['header_valid'] === true && $hsig['content_valid'] === true) + $hsig_valid = true; if(! $hsig_valid) { logger('http signature not valid: ' . print_r($hsig,true)); @@ -1431,7 +1431,7 @@ function scrape_feed($url) { function do_delivery($deliveries, $force = false) { // $force is set if a site that wasn't responding suddenly returns to life. - // Try and shove through everything going to that site while it's responding. + // Try and shove through everything going to that site while it's responding. if(! (is_array($deliveries) && count($deliveries))) return; @@ -2069,7 +2069,7 @@ function get_request_string($url) { * Takes the output of parse_url and builds a URL from it * */ - + function unparse_url($parsed_url) { $scheme = isset($parsed_url['scheme']) ? $parsed_url['scheme'] . '://' : ''; $host = isset($parsed_url['host']) ? $parsed_url['host'] : ''; @@ -2081,4 +2081,4 @@ function unparse_url($parsed_url) { $query = isset($parsed_url['query']) ? '?' . $parsed_url['query'] : ''; $fragment = isset($parsed_url['fragment']) ? '#' . $parsed_url['fragment'] : ''; return "$scheme$user$pass$host$port$path$query$fragment"; -} +} diff --git a/include/text.php b/include/text.php index 76df9e17b..d6b196f1e 100644 --- a/include/text.php +++ b/include/text.php @@ -1801,7 +1801,7 @@ function prepare_body(&$item,$attach = false,$opts = false) { $tags = format_hashtags($item); - if($item['resource_type']) + if($item['resource_type'] == 'photo') $mentions = format_mentions($item); $categories = format_categories($item,$writeable); diff --git a/library/ASNValue.class.php b/library/ASNValue.class.php index 7a3c5d20e..7c17d10b4 100644 --- a/library/ASNValue.class.php +++ b/library/ASNValue.class.php @@ -110,7 +110,7 @@ class ASNValue function SetIntBuffer($Value) { if (strlen($Value) > 1) { - $firstByte = ord($Value{0}); + $firstByte = ord($Value[0]); if ($firstByte & 0x80) { //first bit set $Value = chr(0x00) . $Value; } @@ -122,7 +122,7 @@ class ASNValue function GetIntBuffer() { $result = $this->Value; - if (ord($result{0}) == 0x00) { + if (ord($result[0]) == 0x00) { $result = substr($result, 1); } diff --git a/util/hmessages.po b/util/hmessages.po index 5600f9fda..2679119a1 100644 --- a/util/hmessages.po +++ b/util/hmessages.po @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: 5.1.2\n" +"Project-Id-Version: 5.2RC\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-10-25 07:30+0000\n" +"POT-Creation-Date: 2021-01-05 08:42+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -21,8 +21,8 @@ msgstr "" #: ../../addon/cart/submodules/orderoptions.php:335 #: ../../addon/cart/submodules/orderoptions.php:359 #: ../../addon/cart/submodules/orderoptions.php:435 -#: ../../addon/cart/submodules/orderoptions.php:459 ../../include/text.php:3379 -#: ../../Zotlabs/Module/Admin/Site.php:185 +#: ../../addon/cart/submodules/orderoptions.php:459 ../../include/text.php:3381 +#: ../../Zotlabs/Module/Admin/Site.php:191 msgid "Default" msgstr "" @@ -79,18 +79,18 @@ msgstr "" #: ../../Zotlabs/Widget/Wiki_pages.php:99 #: ../../Zotlabs/Widget/Eventstools.php:16 ../../Zotlabs/Module/Tokens.php:188 #: ../../Zotlabs/Module/Import_items.php:129 -#: ../../Zotlabs/Module/Import.php:649 ../../Zotlabs/Module/Setup.php:304 +#: ../../Zotlabs/Module/Import.php:645 ../../Zotlabs/Module/Setup.php:304 #: ../../Zotlabs/Module/Setup.php:344 ../../Zotlabs/Module/Group.php:151 #: ../../Zotlabs/Module/Group.php:167 ../../Zotlabs/Module/Oauth.php:111 #: ../../Zotlabs/Module/Chat.php:209 ../../Zotlabs/Module/Chat.php:248 #: ../../Zotlabs/Module/Poke.php:217 ../../Zotlabs/Module/Mitem.php:259 -#: ../../Zotlabs/Module/Filestorage.php:203 +#: ../../Zotlabs/Module/Filestorage.php:208 #: ../../Zotlabs/Module/Connect.php:107 ../../Zotlabs/Module/Editpost.php:86 #: ../../Zotlabs/Module/Admin/Themes.php:158 #: ../../Zotlabs/Module/Admin/Features.php:66 #: ../../Zotlabs/Module/Admin/Security.php:120 #: ../../Zotlabs/Module/Admin/Accounts.php:168 -#: ../../Zotlabs/Module/Admin/Site.php:287 +#: ../../Zotlabs/Module/Admin/Site.php:293 #: ../../Zotlabs/Module/Admin/Logs.php:84 #: ../../Zotlabs/Module/Admin/Channels.php:147 #: ../../Zotlabs/Module/Admin/Account_edit.php:73 @@ -99,8 +99,8 @@ msgstr "" #: ../../Zotlabs/Module/Events.php:501 ../../Zotlabs/Module/Permcats.php:129 #: ../../Zotlabs/Module/Mood.php:158 ../../Zotlabs/Module/Appman.php:155 #: ../../Zotlabs/Module/Email_validation.php:40 -#: ../../Zotlabs/Module/Photos.php:1057 ../../Zotlabs/Module/Photos.php:1097 -#: ../../Zotlabs/Module/Photos.php:1215 ../../Zotlabs/Module/Profiles.php:725 +#: ../../Zotlabs/Module/Photos.php:1058 ../../Zotlabs/Module/Photos.php:1098 +#: ../../Zotlabs/Module/Photos.php:1216 ../../Zotlabs/Module/Profiles.php:725 #: ../../Zotlabs/Module/Invite.php:168 ../../Zotlabs/Module/Xchan.php:15 #: ../../Zotlabs/Module/Affinity.php:87 ../../Zotlabs/Module/Rate.php:166 #: ../../Zotlabs/Module/Settings/Network.php:62 @@ -111,7 +111,7 @@ msgstr "" #: ../../Zotlabs/Module/Settings/Manage.php:43 #: ../../Zotlabs/Module/Settings/Channel_home.php:91 #: ../../Zotlabs/Module/Settings/Calendar.php:42 -#: ../../Zotlabs/Module/Settings/Display.php:190 +#: ../../Zotlabs/Module/Settings/Display.php:188 #: ../../Zotlabs/Module/Settings/Directory.php:42 #: ../../Zotlabs/Module/Settings/Editor.php:42 #: ../../Zotlabs/Module/Settings/Connections.php:42 @@ -121,9 +121,10 @@ msgstr "" #: ../../Zotlabs/Module/Defperms.php:266 ../../Zotlabs/Module/Pconfig.php:116 #: ../../Zotlabs/Module/Oauth2.php:116 ../../Zotlabs/Module/Thing.php:328 #: ../../Zotlabs/Module/Thing.php:381 ../../Zotlabs/Module/Pdledit.php:108 -#: ../../Zotlabs/Module/Wiki.php:215 ../../Zotlabs/Module/Connedit.php:907 -#: ../../Zotlabs/Module/Locs.php:125 ../../Zotlabs/Module/Sources.php:125 +#: ../../Zotlabs/Module/Wiki.php:215 ../../Zotlabs/Module/Connedit.php:896 +#: ../../Zotlabs/Module/Locs.php:132 ../../Zotlabs/Module/Sources.php:125 #: ../../Zotlabs/Module/Sources.php:162 ../../Zotlabs/Lib/ThreadItem.php:825 +#: ../../Zotlabs/Storage/Browser.php:375 msgid "Submit" msgstr "" @@ -175,26 +176,29 @@ msgstr "" #: ../../addon/libertree/Mod_Libertree.php:59 #: ../../addon/socialauth/Mod_SocialAuth.php:214 #: ../../addon/ljpost/Mod_Ljpost.php:63 ../../addon/ljpost/Mod_Ljpost.php:67 -#: ../../addon/ljpost/Mod_Ljpost.php:71 ../../include/conversation.php:1463 +#: ../../addon/ljpost/Mod_Ljpost.php:71 ../../include/conversation.php:1466 #: ../../include/dir_fns.php:142 ../../include/dir_fns.php:143 -#: ../../include/dir_fns.php:144 ../../Zotlabs/Module/Import.php:638 -#: ../../Zotlabs/Module/Import.php:642 ../../Zotlabs/Module/Import.php:643 +#: ../../include/dir_fns.php:144 ../../Zotlabs/Module/Import.php:634 +#: ../../Zotlabs/Module/Import.php:638 ../../Zotlabs/Module/Import.php:639 #: ../../Zotlabs/Module/Mitem.php:176 ../../Zotlabs/Module/Mitem.php:177 #: ../../Zotlabs/Module/Mitem.php:256 ../../Zotlabs/Module/Mitem.php:257 -#: ../../Zotlabs/Module/Filestorage.php:198 -#: ../../Zotlabs/Module/Filestorage.php:206 -#: ../../Zotlabs/Module/Admin/Site.php:253 ../../Zotlabs/Module/Events.php:478 +#: ../../Zotlabs/Module/Filestorage.php:203 +#: ../../Zotlabs/Module/Filestorage.php:211 +#: ../../Zotlabs/Module/Admin/Site.php:259 ../../Zotlabs/Module/Events.php:478 #: ../../Zotlabs/Module/Events.php:479 ../../Zotlabs/Module/Api.php:99 -#: ../../Zotlabs/Module/Photos.php:672 ../../Zotlabs/Module/Profiles.php:683 +#: ../../Zotlabs/Module/Photos.php:673 ../../Zotlabs/Module/Profiles.php:683 #: ../../Zotlabs/Module/Settings/Channel.php:311 -#: ../../Zotlabs/Module/Settings/Display.php:90 +#: ../../Zotlabs/Module/Settings/Display.php:88 #: ../../Zotlabs/Module/Menu.php:163 ../../Zotlabs/Module/Menu.php:222 #: ../../Zotlabs/Module/Defperms.php:198 ../../Zotlabs/Module/Wiki.php:227 -#: ../../Zotlabs/Module/Wiki.php:228 ../../Zotlabs/Module/Connedit.php:414 -#: ../../Zotlabs/Module/Connedit.php:799 ../../Zotlabs/Module/Sources.php:124 -#: ../../Zotlabs/Module/Sources.php:159 ../../Zotlabs/Lib/Libzotdir.php:162 -#: ../../Zotlabs/Lib/Libzotdir.php:163 ../../Zotlabs/Lib/Libzotdir.php:165 -#: ../../Zotlabs/Storage/Browser.php:411 ../../boot.php:1703 +#: ../../Zotlabs/Module/Wiki.php:228 ../../Zotlabs/Module/Connedit.php:403 +#: ../../Zotlabs/Module/Connedit.php:788 ../../Zotlabs/Module/Sources.php:124 +#: ../../Zotlabs/Module/Sources.php:159 ../../Zotlabs/Lib/Libzotdir.php:164 +#: ../../Zotlabs/Lib/Libzotdir.php:165 ../../Zotlabs/Lib/Libzotdir.php:167 +#: ../../Zotlabs/Storage/Browser.php:303 ../../Zotlabs/Storage/Browser.php:304 +#: ../../Zotlabs/Storage/Browser.php:305 ../../Zotlabs/Storage/Browser.php:382 +#: ../../Zotlabs/Storage/Browser.php:384 ../../Zotlabs/Storage/Browser.php:545 +#: ../../boot.php:1704 msgid "No" msgstr "" @@ -238,26 +242,28 @@ msgstr "" #: ../../addon/libertree/Mod_Libertree.php:59 #: ../../addon/socialauth/Mod_SocialAuth.php:214 #: ../../addon/ljpost/Mod_Ljpost.php:63 ../../addon/ljpost/Mod_Ljpost.php:67 -#: ../../addon/ljpost/Mod_Ljpost.php:71 ../../include/conversation.php:1463 +#: ../../addon/ljpost/Mod_Ljpost.php:71 ../../include/conversation.php:1466 #: ../../include/dir_fns.php:142 ../../include/dir_fns.php:143 -#: ../../include/dir_fns.php:144 ../../Zotlabs/Module/Import.php:638 -#: ../../Zotlabs/Module/Import.php:642 ../../Zotlabs/Module/Import.php:643 +#: ../../include/dir_fns.php:144 ../../Zotlabs/Module/Import.php:634 +#: ../../Zotlabs/Module/Import.php:638 ../../Zotlabs/Module/Import.php:639 #: ../../Zotlabs/Module/Mitem.php:176 ../../Zotlabs/Module/Mitem.php:177 #: ../../Zotlabs/Module/Mitem.php:256 ../../Zotlabs/Module/Mitem.php:257 -#: ../../Zotlabs/Module/Filestorage.php:198 -#: ../../Zotlabs/Module/Filestorage.php:206 -#: ../../Zotlabs/Module/Admin/Site.php:255 ../../Zotlabs/Module/Events.php:478 +#: ../../Zotlabs/Module/Filestorage.php:203 +#: ../../Zotlabs/Module/Filestorage.php:211 +#: ../../Zotlabs/Module/Admin/Site.php:261 ../../Zotlabs/Module/Events.php:478 #: ../../Zotlabs/Module/Events.php:479 ../../Zotlabs/Module/Api.php:98 -#: ../../Zotlabs/Module/Photos.php:672 ../../Zotlabs/Module/Profiles.php:683 +#: ../../Zotlabs/Module/Photos.php:673 ../../Zotlabs/Module/Profiles.php:683 #: ../../Zotlabs/Module/Settings/Channel.php:311 -#: ../../Zotlabs/Module/Settings/Display.php:90 +#: ../../Zotlabs/Module/Settings/Display.php:88 #: ../../Zotlabs/Module/Menu.php:163 ../../Zotlabs/Module/Menu.php:222 #: ../../Zotlabs/Module/Defperms.php:198 ../../Zotlabs/Module/Wiki.php:227 -#: ../../Zotlabs/Module/Wiki.php:228 ../../Zotlabs/Module/Connedit.php:414 +#: ../../Zotlabs/Module/Wiki.php:228 ../../Zotlabs/Module/Connedit.php:403 #: ../../Zotlabs/Module/Sources.php:124 ../../Zotlabs/Module/Sources.php:159 -#: ../../Zotlabs/Lib/Libzotdir.php:162 ../../Zotlabs/Lib/Libzotdir.php:163 -#: ../../Zotlabs/Lib/Libzotdir.php:165 ../../Zotlabs/Storage/Browser.php:411 -#: ../../boot.php:1703 +#: ../../Zotlabs/Lib/Libzotdir.php:164 ../../Zotlabs/Lib/Libzotdir.php:165 +#: ../../Zotlabs/Lib/Libzotdir.php:167 ../../Zotlabs/Storage/Browser.php:303 +#: ../../Zotlabs/Storage/Browser.php:304 ../../Zotlabs/Storage/Browser.php:305 +#: ../../Zotlabs/Storage/Browser.php:382 ../../Zotlabs/Storage/Browser.php:384 +#: ../../Zotlabs/Storage/Browser.php:545 ../../boot.php:1704 msgid "Yes" msgstr "" @@ -412,8 +418,9 @@ msgid "Channel Reputation" msgstr "" #: ../../addon/channelreputation/channelreputation.php:233 -#: ../../include/acl_selectors.php:146 ../../Zotlabs/Widget/Pinned.php:160 -#: ../../Zotlabs/Module/Photos.php:1274 ../../Zotlabs/Lib/ThreadItem.php:495 +#: ../../include/acl_selectors.php:155 ../../Zotlabs/Widget/Pinned.php:160 +#: ../../Zotlabs/Module/Photos.php:1275 ../../Zotlabs/Lib/ThreadItem.php:495 +#: ../../Zotlabs/Storage/Browser.php:404 msgid "Close" msgstr "" @@ -467,7 +474,7 @@ msgstr "" #: ../../addon/xmpp/Mod_Xmpp.php:35 ../../Zotlabs/Module/Tokens.php:99 #: ../../Zotlabs/Module/Group.php:107 ../../Zotlabs/Module/Oauth.php:100 #: ../../Zotlabs/Module/Chat.php:100 ../../Zotlabs/Module/Poke.php:165 -#: ../../Zotlabs/Module/Cdav.php:872 ../../Zotlabs/Module/Webpages.php:48 +#: ../../Zotlabs/Module/Cdav.php:876 ../../Zotlabs/Module/Webpages.php:48 #: ../../Zotlabs/Module/Pubstream.php:20 ../../Zotlabs/Module/Permcats.php:63 #: ../../Zotlabs/Module/Lang.php:17 ../../Zotlabs/Module/Uexport.php:61 #: ../../Zotlabs/Module/Mood.php:134 ../../Zotlabs/Module/Cards.php:51 @@ -500,7 +507,7 @@ msgstr "" #: ../../addon/superblock/Mod_Superblock.php:91 #: ../../Zotlabs/Module/Tagrm.php:137 ../../Zotlabs/Module/Admin/Addons.php:459 #: ../../Zotlabs/Module/Profile_photo.php:501 -#: ../../Zotlabs/Module/Cover_photo.php:424 ../../Zotlabs/Module/Photos.php:995 +#: ../../Zotlabs/Module/Cover_photo.php:424 ../../Zotlabs/Module/Photos.php:996 msgid "Remove" msgstr "" @@ -563,13 +570,13 @@ msgid "Page to load after image selection." msgstr "" #: ../../addon/openclipatar/openclipatar.php:57 ../../include/nav.php:112 -#: ../../include/conversation.php:1077 ../../Zotlabs/Module/Connedit.php:611 +#: ../../include/conversation.php:1080 ../../Zotlabs/Module/Connedit.php:600 #: ../../Zotlabs/Lib/Apps.php:344 msgid "View Profile" msgstr "" #: ../../addon/openclipatar/openclipatar.php:58 ../../include/nav.php:117 -#: ../../include/channel.php:1528 +#: ../../include/channel.php:1542 msgid "Edit Profile" msgstr "" @@ -679,7 +686,7 @@ msgstr "" #: ../../addon/queueworker/Mod_Queueworker.php:119 ../../include/text.php:1151 #: ../../include/text.php:1163 ../../Zotlabs/Widget/Notes.php:23 #: ../../Zotlabs/Module/Admin/Profs.php:94 -#: ../../Zotlabs/Module/Admin/Profs.php:114 ../../Zotlabs/Module/Filer.php:53 +#: ../../Zotlabs/Module/Admin/Profs.php:114 ../../Zotlabs/Module/Filer.php:54 #: ../../Zotlabs/Module/Rbmark.php:32 ../../Zotlabs/Module/Rbmark.php:104 msgid "Save" msgstr "" @@ -731,10 +738,10 @@ msgstr "" msgid "Photo Gallery" msgstr "" -#: ../../addon/gallery/Mod_Gallery.php:49 ../../include/channel.php:1425 +#: ../../addon/gallery/Mod_Gallery.php:49 ../../include/channel.php:1439 #: ../../Zotlabs/Module/Hcard.php:12 ../../Zotlabs/Module/Editwebpage.php:32 #: ../../Zotlabs/Module/Profile.php:20 ../../Zotlabs/Module/Webpages.php:39 -#: ../../Zotlabs/Module/Filestorage.php:53 ../../Zotlabs/Module/Connect.php:17 +#: ../../Zotlabs/Module/Filestorage.php:59 ../../Zotlabs/Module/Connect.php:17 #: ../../Zotlabs/Module/Achievements.php:15 ../../Zotlabs/Module/Cards.php:42 #: ../../Zotlabs/Module/Blocks.php:33 ../../Zotlabs/Module/Editblock.php:31 #: ../../Zotlabs/Module/Editlayout.php:31 ../../Zotlabs/Module/Articles.php:43 @@ -762,18 +769,21 @@ msgstr "" #: ../../addon/openid/Mod_Id.php:53 ../../addon/mail/Mod_Mail.php:25 #: ../../addon/pumpio/pumpio.php:44 ../../addon/keepout/keepout.php:36 -#: ../../include/photos.php:27 ../../include/items.php:3966 +#: ../../include/photos.php:27 ../../include/items.php:3979 #: ../../include/attach.php:156 ../../include/attach.php:205 -#: ../../include/attach.php:278 ../../include/attach.php:386 -#: ../../include/attach.php:400 ../../include/attach.php:407 -#: ../../include/attach.php:489 ../../include/attach.php:1055 -#: ../../include/attach.php:1129 ../../include/attach.php:1292 -#: ../../Zotlabs/Module/Article_edit.php:51 ../../Zotlabs/Module/Network.php:19 +#: ../../include/attach.php:278 ../../include/attach.php:329 +#: ../../include/attach.php:424 ../../include/attach.php:438 +#: ../../include/attach.php:445 ../../include/attach.php:527 +#: ../../include/attach.php:1091 ../../include/attach.php:1164 +#: ../../include/attach.php:1327 ../../Zotlabs/Module/Article_edit.php:51 +#: ../../Zotlabs/Module/Attach_edit.php:90 +#: ../../Zotlabs/Module/Attach_edit.php:99 +#: ../../Zotlabs/Module/Attach_edit.php:106 ../../Zotlabs/Module/Network.php:19 #: ../../Zotlabs/Module/Register.php:80 ../../Zotlabs/Module/Setup.php:206 #: ../../Zotlabs/Module/Viewconnections.php:28 #: ../../Zotlabs/Module/Viewconnections.php:33 -#: ../../Zotlabs/Module/Channel.php:181 ../../Zotlabs/Module/Channel.php:348 -#: ../../Zotlabs/Module/Channel.php:387 ../../Zotlabs/Module/Group.php:15 +#: ../../Zotlabs/Module/Channel.php:177 ../../Zotlabs/Module/Channel.php:332 +#: ../../Zotlabs/Module/Channel.php:371 ../../Zotlabs/Module/Group.php:15 #: ../../Zotlabs/Module/Group.php:31 ../../Zotlabs/Module/Card_edit.php:51 #: ../../Zotlabs/Module/Editwebpage.php:68 #: ../../Zotlabs/Module/Editwebpage.php:89 @@ -781,23 +791,23 @@ msgstr "" #: ../../Zotlabs/Module/Editwebpage.php:121 ../../Zotlabs/Module/Chat.php:113 #: ../../Zotlabs/Module/Chat.php:118 #: ../../Zotlabs/Module/Channel_calendar.php:230 -#: ../../Zotlabs/Module/Like.php:193 ../../Zotlabs/Module/Poke.php:157 -#: ../../Zotlabs/Module/Item.php:483 ../../Zotlabs/Module/Item.php:502 -#: ../../Zotlabs/Module/Item.php:512 ../../Zotlabs/Module/Item.php:1428 +#: ../../Zotlabs/Module/Like.php:230 ../../Zotlabs/Module/Poke.php:157 +#: ../../Zotlabs/Module/Item.php:485 ../../Zotlabs/Module/Item.php:504 +#: ../../Zotlabs/Module/Item.php:514 ../../Zotlabs/Module/Item.php:1442 #: ../../Zotlabs/Module/Mitem.php:129 ../../Zotlabs/Module/Profile.php:85 #: ../../Zotlabs/Module/Profile.php:101 #: ../../Zotlabs/Module/Sharedwithme.php:19 #: ../../Zotlabs/Module/Webpages.php:133 -#: ../../Zotlabs/Module/Filestorage.php:17 -#: ../../Zotlabs/Module/Filestorage.php:72 -#: ../../Zotlabs/Module/Filestorage.php:90 -#: ../../Zotlabs/Module/Filestorage.php:113 -#: ../../Zotlabs/Module/Filestorage.php:160 +#: ../../Zotlabs/Module/Filestorage.php:20 +#: ../../Zotlabs/Module/Filestorage.php:78 +#: ../../Zotlabs/Module/Filestorage.php:96 +#: ../../Zotlabs/Module/Filestorage.php:119 +#: ../../Zotlabs/Module/Filestorage.php:165 #: ../../Zotlabs/Module/Editpost.php:17 #: ../../Zotlabs/Module/Achievements.php:34 ../../Zotlabs/Module/Events.php:277 #: ../../Zotlabs/Module/Manage.php:10 ../../Zotlabs/Module/Authtest.php:16 #: ../../Zotlabs/Module/Viewsrc.php:19 ../../Zotlabs/Module/Moderate.php:15 -#: ../../Zotlabs/Module/Display.php:442 ../../Zotlabs/Module/Common.php:38 +#: ../../Zotlabs/Module/Display.php:425 ../../Zotlabs/Module/Common.php:38 #: ../../Zotlabs/Module/New_channel.php:105 #: ../../Zotlabs/Module/New_channel.php:130 #: ../../Zotlabs/Module/Service_limits.php:11 ../../Zotlabs/Module/Mood.php:126 @@ -824,22 +834,22 @@ msgstr "" #: ../../Zotlabs/Module/Thing.php:343 ../../Zotlabs/Module/Pdledit.php:35 #: ../../Zotlabs/Module/Wiki.php:59 ../../Zotlabs/Module/Wiki.php:285 #: ../../Zotlabs/Module/Wiki.php:428 ../../Zotlabs/Module/Suggest.php:32 -#: ../../Zotlabs/Module/Connedit.php:407 +#: ../../Zotlabs/Module/Connedit.php:396 #: ../../Zotlabs/Module/Notifications.php:11 #: ../../Zotlabs/Module/Layouts.php:71 ../../Zotlabs/Module/Layouts.php:78 -#: ../../Zotlabs/Module/Layouts.php:89 ../../Zotlabs/Module/Locs.php:91 +#: ../../Zotlabs/Module/Layouts.php:89 ../../Zotlabs/Module/Locs.php:100 #: ../../Zotlabs/Module/Sources.php:80 ../../Zotlabs/Lib/Chatroom.php:135 #: ../../Zotlabs/Web/WebServer.php:116 msgid "Permission denied." msgstr "" #: ../../addon/openid/Mod_Id.php:85 ../../include/selectors.php:60 -#: ../../include/selectors.php:77 ../../include/channel.php:1708 +#: ../../include/selectors.php:77 ../../include/channel.php:1722 msgid "Male" msgstr "" #: ../../addon/openid/Mod_Id.php:87 ../../include/selectors.php:60 -#: ../../include/selectors.php:77 ../../include/channel.php:1706 +#: ../../include/selectors.php:77 ../../include/channel.php:1720 msgid "Female" msgstr "" @@ -885,11 +895,11 @@ msgstr "" #: ../../addon/openid/MysqlProvider.php:56 #: ../../addon/openid/MysqlProvider.php:57 ../../addon/redred/Mod_Redred.php:71 -#: ../../addon/rtof/Mod_Rtof.php:57 ../../include/network.php:1736 -#: ../../Zotlabs/Module/Cdav.php:1372 +#: ../../addon/rtof/Mod_Rtof.php:57 ../../include/network.php:1737 +#: ../../Zotlabs/Module/Cdav.php:1376 #: ../../Zotlabs/Module/Admin/Accounts.php:171 #: ../../Zotlabs/Module/Admin/Accounts.php:183 -#: ../../Zotlabs/Module/Profiles.php:789 ../../Zotlabs/Module/Connedit.php:930 +#: ../../Zotlabs/Module/Profiles.php:789 ../../Zotlabs/Module/Connedit.php:919 msgid "Email" msgstr "" @@ -1108,7 +1118,7 @@ msgstr "" msgid "Channel is required." msgstr "" -#: ../../addon/redred/Mod_Redred.php:29 ../../Zotlabs/Module/Network.php:329 +#: ../../addon/redred/Mod_Redred.php:29 ../../Zotlabs/Module/Network.php:322 msgid "Invalid channel." msgstr "" @@ -1165,7 +1175,7 @@ msgstr "" #: ../../addon/redfiles/redfiles.php:109 ../../addon/hzfiles/hzfiles.php:75 #: ../../include/items.php:439 ../../Zotlabs/Module/Import_items.php:120 #: ../../Zotlabs/Module/Profperm.php:28 ../../Zotlabs/Module/Group.php:99 -#: ../../Zotlabs/Module/Like.php:295 ../../Zotlabs/Module/Cloud.php:119 +#: ../../Zotlabs/Module/Like.php:332 ../../Zotlabs/Module/Cloud.php:123 #: ../../Zotlabs/Module/Share.php:72 ../../Zotlabs/Module/Subthread.php:86 #: ../../Zotlabs/Module/Dreport.php:10 ../../Zotlabs/Module/Dreport.php:82 #: ../../Zotlabs/Web/WebServer.php:115 @@ -1211,11 +1221,11 @@ msgstr "" msgid "0 or blank to import all available" msgstr "" -#: ../../addon/redphotos/redphotohelper.php:71 ../../addon/pubcrawl/as.php:1841 +#: ../../addon/redphotos/redphotohelper.php:71 ../../addon/pubcrawl/as.php:2057 #: ../../addon/diaspora/Receiver.php:1597 ../../include/text.php:2252 -#: ../../include/conversation.php:128 ../../Zotlabs/Module/Like.php:386 +#: ../../include/conversation.php:128 ../../Zotlabs/Module/Like.php:433 #: ../../Zotlabs/Module/Tagger.php:71 ../../Zotlabs/Module/Subthread.php:112 -#: ../../Zotlabs/Lib/Activity.php:2953 +#: ../../Zotlabs/Lib/Activity.php:2971 msgid "photo" msgstr "" @@ -1347,7 +1357,7 @@ msgid "Post to GNU social" msgstr "" #: ../../addon/statusnet/statusnet.php:593 -#: ../../Zotlabs/Module/Admin/Site.php:295 +#: ../../Zotlabs/Module/Admin/Site.php:301 msgid "Site name" msgstr "" @@ -1535,16 +1545,16 @@ msgstr "" msgid "Until modified date yyyy-mm-dd" msgstr "" -#: ../../addon/hsse/hsse.php:82 ../../include/conversation.php:1325 +#: ../../addon/hsse/hsse.php:82 ../../include/conversation.php:1328 msgid "Set your location" msgstr "" -#: ../../addon/hsse/hsse.php:83 ../../include/conversation.php:1326 +#: ../../addon/hsse/hsse.php:83 ../../include/conversation.php:1329 msgid "Clear browser location" msgstr "" #: ../../addon/hsse/hsse.php:95 ../../addon/mail/Mod_Mail.php:166 -#: ../../addon/mail/Mod_Mail.php:309 ../../include/conversation.php:1338 +#: ../../addon/mail/Mod_Mail.php:309 ../../include/conversation.php:1341 #: ../../Zotlabs/Module/Article_edit.php:100 #: ../../Zotlabs/Module/Card_edit.php:101 #: ../../Zotlabs/Module/Editwebpage.php:143 ../../Zotlabs/Module/Chat.php:220 @@ -1552,193 +1562,194 @@ msgstr "" msgid "Insert web link" msgstr "" -#: ../../addon/hsse/hsse.php:99 ../../include/conversation.php:1342 +#: ../../addon/hsse/hsse.php:99 ../../include/conversation.php:1345 msgid "Embed (existing) photo from your photo albums" msgstr "" #: ../../addon/hsse/hsse.php:134 ../../addon/mail/Mod_Mail.php:119 -#: ../../addon/mail/Mod_Mail.php:240 ../../include/conversation.php:1377 +#: ../../addon/mail/Mod_Mail.php:240 ../../include/conversation.php:1380 #: ../../Zotlabs/Module/Chat.php:218 msgid "Please enter a link URL:" msgstr "" -#: ../../addon/hsse/hsse.php:135 ../../include/conversation.php:1378 +#: ../../addon/hsse/hsse.php:135 ../../include/conversation.php:1381 msgid "Tag term:" msgstr "" -#: ../../addon/hsse/hsse.php:136 ../../include/conversation.php:1379 +#: ../../addon/hsse/hsse.php:136 ../../include/conversation.php:1382 msgid "Where are you right now?" msgstr "" -#: ../../addon/hsse/hsse.php:139 ../../include/conversation.php:1382 +#: ../../addon/hsse/hsse.php:139 ../../include/conversation.php:1385 #: ../../Zotlabs/Module/Profile_photo.php:509 #: ../../Zotlabs/Module/Cover_photo.php:430 ../../Zotlabs/Module/Wiki.php:403 msgid "Choose images to embed" msgstr "" -#: ../../addon/hsse/hsse.php:140 ../../include/conversation.php:1383 +#: ../../addon/hsse/hsse.php:140 ../../include/conversation.php:1386 #: ../../Zotlabs/Module/Profile_photo.php:510 #: ../../Zotlabs/Module/Cover_photo.php:431 ../../Zotlabs/Module/Wiki.php:404 msgid "Choose an album" msgstr "" -#: ../../addon/hsse/hsse.php:141 ../../include/conversation.php:1384 +#: ../../addon/hsse/hsse.php:141 ../../include/conversation.php:1387 msgid "Choose a different album..." msgstr "" -#: ../../addon/hsse/hsse.php:142 ../../include/conversation.php:1385 +#: ../../addon/hsse/hsse.php:142 ../../include/conversation.php:1388 #: ../../Zotlabs/Module/Profile_photo.php:512 #: ../../Zotlabs/Module/Cover_photo.php:433 ../../Zotlabs/Module/Wiki.php:406 msgid "Error getting album list" msgstr "" -#: ../../addon/hsse/hsse.php:143 ../../include/conversation.php:1386 +#: ../../addon/hsse/hsse.php:143 ../../include/conversation.php:1389 #: ../../Zotlabs/Module/Profile_photo.php:513 #: ../../Zotlabs/Module/Cover_photo.php:434 ../../Zotlabs/Module/Wiki.php:407 msgid "Error getting photo link" msgstr "" -#: ../../addon/hsse/hsse.php:144 ../../include/conversation.php:1387 +#: ../../addon/hsse/hsse.php:144 ../../include/conversation.php:1390 #: ../../Zotlabs/Module/Profile_photo.php:514 #: ../../Zotlabs/Module/Cover_photo.php:435 ../../Zotlabs/Module/Wiki.php:408 msgid "Error getting album" msgstr "" -#: ../../addon/hsse/hsse.php:145 ../../include/conversation.php:1388 +#: ../../addon/hsse/hsse.php:145 ../../include/conversation.php:1391 msgid "Comments enabled" msgstr "" -#: ../../addon/hsse/hsse.php:146 ../../include/conversation.php:1389 +#: ../../addon/hsse/hsse.php:146 ../../include/conversation.php:1392 msgid "Comments disabled" msgstr "" -#: ../../addon/hsse/hsse.php:153 ../../include/conversation.php:1399 +#: ../../addon/hsse/hsse.php:153 ../../include/conversation.php:1402 #: ../../Zotlabs/Module/Webpages.php:262 ../../Zotlabs/Module/Events.php:486 -#: ../../Zotlabs/Module/Photos.php:1098 ../../Zotlabs/Lib/ThreadItem.php:835 +#: ../../Zotlabs/Module/Photos.php:1099 ../../Zotlabs/Lib/ThreadItem.php:835 msgid "Preview" msgstr "" -#: ../../addon/hsse/hsse.php:186 ../../include/conversation.php:1432 +#: ../../addon/hsse/hsse.php:186 ../../include/conversation.php:1435 #: ../../Zotlabs/Widget/Cdav.php:136 ../../Zotlabs/Module/Webpages.php:256 -#: ../../Zotlabs/Module/Blocks.php:161 ../../Zotlabs/Module/Photos.php:1077 +#: ../../Zotlabs/Module/Blocks.php:161 ../../Zotlabs/Module/Photos.php:1078 #: ../../Zotlabs/Module/Wiki.php:301 ../../Zotlabs/Module/Layouts.php:194 msgid "Share" msgstr "" -#: ../../addon/hsse/hsse.php:195 ../../include/conversation.php:1441 +#: ../../addon/hsse/hsse.php:195 ../../include/conversation.php:1444 msgid "Page link name" msgstr "" -#: ../../addon/hsse/hsse.php:198 ../../include/conversation.php:1444 +#: ../../addon/hsse/hsse.php:198 ../../include/conversation.php:1447 msgid "Post as" msgstr "" -#: ../../addon/hsse/hsse.php:200 ../../include/conversation.php:1446 +#: ../../addon/hsse/hsse.php:200 ../../include/conversation.php:1449 #: ../../Zotlabs/Lib/ThreadItem.php:826 msgid "Bold" msgstr "" -#: ../../addon/hsse/hsse.php:201 ../../include/conversation.php:1447 +#: ../../addon/hsse/hsse.php:201 ../../include/conversation.php:1450 #: ../../Zotlabs/Lib/ThreadItem.php:827 msgid "Italic" msgstr "" -#: ../../addon/hsse/hsse.php:202 ../../include/conversation.php:1448 +#: ../../addon/hsse/hsse.php:202 ../../include/conversation.php:1451 #: ../../Zotlabs/Lib/ThreadItem.php:828 msgid "Underline" msgstr "" -#: ../../addon/hsse/hsse.php:203 ../../include/conversation.php:1449 +#: ../../addon/hsse/hsse.php:203 ../../include/conversation.php:1452 #: ../../Zotlabs/Lib/ThreadItem.php:829 msgid "Quote" msgstr "" -#: ../../addon/hsse/hsse.php:204 ../../include/conversation.php:1450 +#: ../../addon/hsse/hsse.php:204 ../../include/conversation.php:1453 #: ../../Zotlabs/Lib/ThreadItem.php:830 msgid "Code" msgstr "" -#: ../../addon/hsse/hsse.php:205 ../../include/conversation.php:1451 +#: ../../addon/hsse/hsse.php:205 ../../include/conversation.php:1454 #: ../../Zotlabs/Lib/ThreadItem.php:832 msgid "Attach/Upload file" msgstr "" -#: ../../addon/hsse/hsse.php:208 ../../include/conversation.php:1454 +#: ../../addon/hsse/hsse.php:208 ../../include/conversation.php:1457 #: ../../Zotlabs/Module/Wiki.php:400 msgid "Embed an image from your albums" msgstr "" #: ../../addon/hsse/hsse.php:209 ../../addon/hsse/hsse.php:258 -#: ../../include/conversation.php:1455 ../../include/conversation.php:1508 +#: ../../include/conversation.php:1458 ../../include/conversation.php:1511 #: ../../Zotlabs/Module/Article_edit.php:130 #: ../../Zotlabs/Module/Fbrowser.php:66 ../../Zotlabs/Module/Fbrowser.php:88 #: ../../Zotlabs/Module/Card_edit.php:131 ../../Zotlabs/Module/Oauth.php:112 #: ../../Zotlabs/Module/Oauth.php:138 ../../Zotlabs/Module/Editwebpage.php:169 -#: ../../Zotlabs/Module/Cdav.php:1054 ../../Zotlabs/Module/Cdav.php:1386 +#: ../../Zotlabs/Module/Cdav.php:1058 ../../Zotlabs/Module/Cdav.php:1390 #: ../../Zotlabs/Module/Tagrm.php:15 ../../Zotlabs/Module/Tagrm.php:138 #: ../../Zotlabs/Module/Editpost.php:110 #: ../../Zotlabs/Module/Admin/Addons.php:427 #: ../../Zotlabs/Module/Profile_photo.php:507 -#: ../../Zotlabs/Module/Editblock.php:141 ../../Zotlabs/Module/Filer.php:55 +#: ../../Zotlabs/Module/Editblock.php:141 ../../Zotlabs/Module/Filer.php:56 #: ../../Zotlabs/Module/Editlayout.php:140 #: ../../Zotlabs/Module/Cover_photo.php:428 #: ../../Zotlabs/Module/Profiles.php:803 ../../Zotlabs/Module/Oauth2.php:117 #: ../../Zotlabs/Module/Oauth2.php:145 ../../Zotlabs/Module/Wiki.php:368 -#: ../../Zotlabs/Module/Wiki.php:401 ../../Zotlabs/Module/Connedit.php:944 +#: ../../Zotlabs/Module/Wiki.php:401 ../../Zotlabs/Module/Connedit.php:933 +#: ../../Zotlabs/Storage/Browser.php:376 msgid "Cancel" msgstr "" #: ../../addon/hsse/hsse.php:210 ../../addon/hsse/hsse.php:257 -#: ../../include/conversation.php:1456 ../../include/conversation.php:1507 +#: ../../include/conversation.php:1459 ../../include/conversation.php:1510 #: ../../Zotlabs/Module/Profile_photo.php:508 #: ../../Zotlabs/Module/Cover_photo.php:429 ../../Zotlabs/Module/Wiki.php:402 msgid "OK" msgstr "" -#: ../../addon/hsse/hsse.php:212 ../../include/conversation.php:1458 +#: ../../addon/hsse/hsse.php:212 ../../include/conversation.php:1461 msgid "Toggle voting" msgstr "" -#: ../../addon/hsse/hsse.php:215 ../../include/conversation.php:1465 +#: ../../addon/hsse/hsse.php:215 ../../include/conversation.php:1468 msgid "Disable comments" msgstr "" -#: ../../addon/hsse/hsse.php:216 ../../include/conversation.php:1466 +#: ../../addon/hsse/hsse.php:216 ../../include/conversation.php:1469 msgid "Toggle comments" msgstr "" -#: ../../addon/hsse/hsse.php:221 ../../include/conversation.php:1471 +#: ../../addon/hsse/hsse.php:221 ../../include/conversation.php:1474 #: ../../Zotlabs/Module/Article_edit.php:116 #: ../../Zotlabs/Module/Card_edit.php:117 -#: ../../Zotlabs/Module/Editblock.php:129 ../../Zotlabs/Module/Photos.php:673 -#: ../../Zotlabs/Module/Photos.php:1043 +#: ../../Zotlabs/Module/Editblock.php:129 ../../Zotlabs/Module/Photos.php:674 +#: ../../Zotlabs/Module/Photos.php:1044 msgid "Title (optional)" msgstr "" -#: ../../addon/hsse/hsse.php:224 ../../include/conversation.php:1474 +#: ../../addon/hsse/hsse.php:224 ../../include/conversation.php:1477 msgid "Categories (optional, comma-separated list)" msgstr "" -#: ../../addon/hsse/hsse.php:225 ../../include/conversation.php:1475 +#: ../../addon/hsse/hsse.php:225 ../../include/conversation.php:1478 #: ../../Zotlabs/Module/Events.php:487 msgid "Permission settings" msgstr "" -#: ../../addon/hsse/hsse.php:247 ../../include/conversation.php:1497 +#: ../../addon/hsse/hsse.php:247 ../../include/conversation.php:1500 msgid "Other networks and post services" msgstr "" #: ../../addon/hsse/hsse.php:250 ../../addon/mail/Mod_Mail.php:170 -#: ../../addon/mail/Mod_Mail.php:313 ../../include/conversation.php:1500 +#: ../../addon/mail/Mod_Mail.php:313 ../../include/conversation.php:1503 msgid "Set expiration date" msgstr "" -#: ../../addon/hsse/hsse.php:253 ../../include/conversation.php:1503 +#: ../../addon/hsse/hsse.php:253 ../../include/conversation.php:1506 msgid "Set publish date" msgstr "" #: ../../addon/hsse/hsse.php:255 ../../addon/mail/Mod_Mail.php:172 -#: ../../addon/mail/Mod_Mail.php:315 ../../include/conversation.php:1505 +#: ../../addon/mail/Mod_Mail.php:315 ../../include/conversation.php:1508 #: ../../Zotlabs/Module/Chat.php:219 ../../Zotlabs/Lib/ThreadItem.php:839 msgid "Encrypt text" msgstr "" @@ -1853,37 +1864,36 @@ msgstr "" msgid "Enter some text" msgstr "" -#: ../../addon/pubcrawl/as.php:1135 ../../include/cdav.php:158 +#: ../../addon/pubcrawl/as.php:1187 ../../include/cdav.php:158 #: ../../include/cdav.php:159 ../../include/cdav.php:167 -#: ../../include/conversation.php:1208 ../../Zotlabs/Widget/Album.php:84 +#: ../../include/conversation.php:1211 ../../Zotlabs/Widget/Album.php:84 #: ../../Zotlabs/Widget/Pinned.php:270 ../../Zotlabs/Widget/Portfolio.php:95 -#: ../../Zotlabs/Module/Embedphotos.php:176 ../../Zotlabs/Module/Photos.php:792 -#: ../../Zotlabs/Module/Photos.php:1254 ../../Zotlabs/Lib/Activity.php:1492 +#: ../../Zotlabs/Module/Embedphotos.php:176 ../../Zotlabs/Module/Photos.php:793 +#: ../../Zotlabs/Module/Photos.php:1255 ../../Zotlabs/Lib/Activity.php:1508 #: ../../Zotlabs/Lib/Apps.php:1112 ../../Zotlabs/Lib/Apps.php:1196 -#: ../../Zotlabs/Storage/Browser.php:164 msgid "Unknown" msgstr "" -#: ../../addon/pubcrawl/as.php:1429 ../../addon/pubcrawl/as.php:1679 -#: ../../addon/pubcrawl/as.php:1887 ../../include/network.php:1735 -#: ../../Zotlabs/Lib/Activity.php:2803 ../../Zotlabs/Lib/Activity.php:2997 +#: ../../addon/pubcrawl/as.php:1483 ../../addon/pubcrawl/as.php:1895 +#: ../../addon/pubcrawl/as.php:2103 ../../include/network.php:1736 +#: ../../Zotlabs/Lib/Activity.php:2821 ../../Zotlabs/Lib/Activity.php:3015 msgid "ActivityPub" msgstr "" -#: ../../addon/pubcrawl/as.php:1841 ../../addon/diaspora/Receiver.php:1597 -#: ../../Zotlabs/Module/Like.php:386 ../../Zotlabs/Module/Subthread.php:112 +#: ../../addon/pubcrawl/as.php:2057 ../../addon/diaspora/Receiver.php:1597 +#: ../../Zotlabs/Module/Like.php:433 ../../Zotlabs/Module/Subthread.php:112 msgid "status" msgstr "" -#: ../../addon/pubcrawl/as.php:1878 ../../addon/diaspora/Receiver.php:1537 -#: ../../include/conversation.php:174 ../../Zotlabs/Module/Like.php:422 -#: ../../Zotlabs/Lib/Activity.php:2988 +#: ../../addon/pubcrawl/as.php:2094 ../../addon/diaspora/Receiver.php:1537 +#: ../../include/conversation.php:174 ../../Zotlabs/Module/Like.php:469 +#: ../../Zotlabs/Lib/Activity.php:3006 #, php-format msgid "%1$s likes %2$s's %3$s" msgstr "" -#: ../../addon/pubcrawl/as.php:1880 ../../include/conversation.php:177 -#: ../../Zotlabs/Module/Like.php:424 ../../Zotlabs/Lib/Activity.php:2990 +#: ../../addon/pubcrawl/as.php:2096 ../../include/conversation.php:177 +#: ../../Zotlabs/Module/Like.php:471 ../../Zotlabs/Lib/Activity.php:3008 #, php-format msgid "%1$s doesn't like %2$s's %3$s" msgstr "" @@ -2175,19 +2185,19 @@ msgstr "" #: ../../Zotlabs/Widget/Wiki_page_history.php:22 #: ../../Zotlabs/Module/Group.php:155 ../../Zotlabs/Module/Oauth.php:113 #: ../../Zotlabs/Module/Oauth.php:139 ../../Zotlabs/Module/Chat.php:257 -#: ../../Zotlabs/Module/Cdav.php:1368 ../../Zotlabs/Module/Sharedwithme.php:106 +#: ../../Zotlabs/Module/Cdav.php:1372 ../../Zotlabs/Module/Sharedwithme.php:106 #: ../../Zotlabs/Module/Admin/Channels.php:159 #: ../../Zotlabs/Module/Oauth2.php:118 ../../Zotlabs/Module/Oauth2.php:146 -#: ../../Zotlabs/Module/Wiki.php:218 ../../Zotlabs/Module/Connedit.php:926 +#: ../../Zotlabs/Module/Wiki.php:218 ../../Zotlabs/Module/Connedit.php:915 #: ../../Zotlabs/Lib/NativeWikiPage.php:564 -#: ../../Zotlabs/Storage/Browser.php:291 +#: ../../Zotlabs/Storage/Browser.php:370 msgid "Name" msgstr "" #: ../../addon/rendezvous/rendezvous.php:173 #: ../../addon/cart/submodules/hzservices.php:655 #: ../../addon/cart/submodules/manualcat.php:260 -#: ../../Zotlabs/Module/Cdav.php:1010 ../../Zotlabs/Module/Events.php:481 +#: ../../Zotlabs/Module/Cdav.php:1014 ../../Zotlabs/Module/Events.php:481 #: ../../Zotlabs/Module/Appman.php:145 ../../Zotlabs/Module/Rbmark.php:101 msgid "Description" msgstr "" @@ -2997,7 +3007,7 @@ msgstr "" msgid "Smileybutton Settings" msgstr "" -#: ../../addon/redfiles/redfilehelper.php:64 ../../include/attach.php:2035 +#: ../../addon/redfiles/redfilehelper.php:64 ../../include/attach.php:2099 msgid "file" msgstr "" @@ -3040,7 +3050,7 @@ msgid "Unable to create a unique channel address. Import failed." msgstr "" #: ../../addon/diaspora/import_diaspora.php:142 -#: ../../Zotlabs/Module/Import.php:597 +#: ../../Zotlabs/Module/Import.php:593 msgid "Import completed." msgstr "" @@ -3084,17 +3094,17 @@ msgstr "" msgid "%1$s dislikes %2$s's %3$s" msgstr "" -#: ../../addon/diaspora/Receiver.php:2184 ../../Zotlabs/Module/Like.php:432 +#: ../../addon/diaspora/Receiver.php:2184 ../../Zotlabs/Module/Like.php:479 #, php-format msgid "%1$s is attending %2$s's %3$s" msgstr "" -#: ../../addon/diaspora/Receiver.php:2186 ../../Zotlabs/Module/Like.php:434 +#: ../../addon/diaspora/Receiver.php:2186 ../../Zotlabs/Module/Like.php:481 #, php-format msgid "%1$s is not attending %2$s's %3$s" msgstr "" -#: ../../addon/diaspora/Receiver.php:2188 ../../Zotlabs/Module/Like.php:436 +#: ../../addon/diaspora/Receiver.php:2188 ../../Zotlabs/Module/Like.php:483 #, php-format msgid "%1$s may attend %2$s's %3$s" msgstr "" @@ -3151,7 +3161,7 @@ msgstr "" msgid "This channel" msgstr "" -#: ../../addon/workflow/workflow.php:285 ../../Zotlabs/Module/Locs.php:123 +#: ../../addon/workflow/workflow.php:285 ../../Zotlabs/Module/Locs.php:130 msgid "Primary" msgstr "" @@ -3182,8 +3192,8 @@ msgid "Web link." msgstr "" #: ../../addon/workflow/workflow.php:2617 -#: ../../addon/workflow/workflow.php:2678 ../../Zotlabs/Module/Cdav.php:1370 -#: ../../Zotlabs/Module/Connedit.php:928 +#: ../../addon/workflow/workflow.php:2678 ../../Zotlabs/Module/Cdav.php:1374 +#: ../../Zotlabs/Module/Connedit.php:917 msgid "Title" msgstr "" @@ -3402,25 +3412,25 @@ msgid "Not allowed." msgstr "" #: ../../addon/flashcards/Mod_Flashcards.php:254 -#: ../../include/acl_selectors.php:144 ../../Zotlabs/Module/Chat.php:241 -#: ../../Zotlabs/Module/Filestorage.php:190 ../../Zotlabs/Module/Photos.php:677 -#: ../../Zotlabs/Module/Photos.php:1046 ../../Zotlabs/Module/Thing.php:321 -#: ../../Zotlabs/Module/Thing.php:374 ../../Zotlabs/Module/Connedit.php:693 +#: ../../include/acl_selectors.php:153 ../../Zotlabs/Module/Chat.php:241 +#: ../../Zotlabs/Module/Filestorage.php:195 ../../Zotlabs/Module/Photos.php:678 +#: ../../Zotlabs/Module/Photos.php:1047 ../../Zotlabs/Module/Thing.php:321 +#: ../../Zotlabs/Module/Thing.php:374 ../../Zotlabs/Module/Connedit.php:682 msgid "Permissions" msgstr "" #: ../../addon/flashcards/Mod_Flashcards.php:261 -#: ../../Zotlabs/Module/Filestorage.php:197 +#: ../../Zotlabs/Module/Filestorage.php:202 msgid "Set/edit permissions" msgstr "" #: ../../addon/flashcards/Mod_Flashcards.php:284 -#: ../../addon/flashcards/Mod_Flashcards.php:285 ../../include/items.php:3889 -#: ../../Zotlabs/Module/Filestorage.php:26 +#: ../../addon/flashcards/Mod_Flashcards.php:285 ../../include/items.php:3902 +#: ../../Zotlabs/Module/Filestorage.php:29 #: ../../Zotlabs/Module/Admin/Themes.php:72 #: ../../Zotlabs/Module/Admin/Addons.php:260 -#: ../../Zotlabs/Module/Viewsrc.php:25 ../../Zotlabs/Module/Display.php:45 -#: ../../Zotlabs/Module/Display.php:446 ../../Zotlabs/Module/Admin.php:62 +#: ../../Zotlabs/Module/Viewsrc.php:25 ../../Zotlabs/Module/Display.php:42 +#: ../../Zotlabs/Module/Display.php:429 ../../Zotlabs/Module/Admin.php:62 #: ../../Zotlabs/Module/Thing.php:96 msgid "Item not found." msgstr "" @@ -4090,10 +4100,10 @@ msgid "Network: %s" msgstr "" #: ../../include/text.php:1150 ../../include/text.php:1162 -#: ../../include/nav.php:188 ../../include/acl_selectors.php:139 +#: ../../include/nav.php:188 ../../include/acl_selectors.php:148 #: ../../Zotlabs/Widget/Sitesearch.php:31 #: ../../Zotlabs/Widget/Activity_filter.php:193 -#: ../../Zotlabs/Module/Search.php:44 ../../Zotlabs/Module/Connections.php:378 +#: ../../Zotlabs/Module/Search.php:41 ../../Zotlabs/Module/Connections.php:378 #: ../../Zotlabs/Lib/Apps.php:353 msgid "Search" msgstr "" @@ -4312,11 +4322,11 @@ msgid "Unknown Attachment" msgstr "" #: ../../include/text.php:1562 ../../Zotlabs/Module/Sharedwithme.php:108 -#: ../../Zotlabs/Storage/Browser.php:293 +#: ../../Zotlabs/Storage/Browser.php:372 msgid "Size" msgstr "" -#: ../../include/text.php:1562 ../../include/feedutils.php:871 +#: ../../include/text.php:1562 ../../include/feedutils.php:873 msgid "unknown" msgstr "" @@ -4391,14 +4401,14 @@ msgstr "" #: ../../include/text.php:2255 ../../include/event.php:1259 #: ../../include/conversation.php:132 #: ../../Zotlabs/Module/Channel_calendar.php:219 -#: ../../Zotlabs/Module/Like.php:388 ../../Zotlabs/Module/Tagger.php:75 +#: ../../Zotlabs/Module/Like.php:435 ../../Zotlabs/Module/Tagger.php:75 #: ../../Zotlabs/Module/Events.php:266 msgid "event" msgstr "" #: ../../include/text.php:2258 ../../include/conversation.php:158 #: ../../include/bbcode.php:523 ../../include/markdown.php:204 -#: ../../Zotlabs/Module/Tagger.php:79 ../../Zotlabs/Lib/Activity.php:2953 +#: ../../Zotlabs/Module/Tagger.php:79 ../../Zotlabs/Lib/Activity.php:2971 msgid "post" msgstr "" @@ -4503,10 +4513,6 @@ msgstr "" msgid "Specify folder" msgstr "" -#: ../../include/text.php:3101 ../../Zotlabs/Storage/Browser.php:131 -msgid "Collection" -msgstr "" - #: ../../include/opengraph.php:56 #, php-format msgid "This is the home page of %s." @@ -4525,7 +4531,7 @@ msgid "Finishes:" msgstr "" #: ../../include/event.php:63 ../../include/event.php:134 -#: ../../include/channel.php:1619 ../../Zotlabs/Module/Directory.php:352 +#: ../../include/channel.php:1633 ../../Zotlabs/Module/Directory.php:352 msgid "Location:" msgstr "" @@ -4565,46 +4571,46 @@ msgstr "" msgid "Cancelled" msgstr "" -#: ../../include/event.php:1422 ../../include/connections.php:733 -#: ../../Zotlabs/Module/Cdav.php:1377 ../../Zotlabs/Module/Profiles.php:794 -#: ../../Zotlabs/Module/Connedit.php:935 +#: ../../include/event.php:1422 ../../include/connections.php:734 +#: ../../Zotlabs/Module/Cdav.php:1381 ../../Zotlabs/Module/Profiles.php:794 +#: ../../Zotlabs/Module/Connedit.php:924 msgid "Mobile" msgstr "" -#: ../../include/event.php:1423 ../../include/connections.php:734 -#: ../../Zotlabs/Module/Cdav.php:1378 ../../Zotlabs/Module/Profiles.php:795 -#: ../../Zotlabs/Module/Connedit.php:936 +#: ../../include/event.php:1423 ../../include/connections.php:735 +#: ../../Zotlabs/Module/Cdav.php:1382 ../../Zotlabs/Module/Profiles.php:795 +#: ../../Zotlabs/Module/Connedit.php:925 msgid "Home" msgstr "" -#: ../../include/event.php:1424 ../../include/connections.php:735 +#: ../../include/event.php:1424 ../../include/connections.php:736 msgid "Home, Voice" msgstr "" -#: ../../include/event.php:1425 ../../include/connections.php:736 +#: ../../include/event.php:1425 ../../include/connections.php:737 msgid "Home, Fax" msgstr "" -#: ../../include/event.php:1426 ../../include/connections.php:737 -#: ../../Zotlabs/Module/Cdav.php:1379 ../../Zotlabs/Module/Profiles.php:796 -#: ../../Zotlabs/Module/Connedit.php:937 +#: ../../include/event.php:1426 ../../include/connections.php:738 +#: ../../Zotlabs/Module/Cdav.php:1383 ../../Zotlabs/Module/Profiles.php:796 +#: ../../Zotlabs/Module/Connedit.php:926 msgid "Work" msgstr "" -#: ../../include/event.php:1427 ../../include/connections.php:738 +#: ../../include/event.php:1427 ../../include/connections.php:739 msgid "Work, Voice" msgstr "" -#: ../../include/event.php:1428 ../../include/connections.php:739 +#: ../../include/event.php:1428 ../../include/connections.php:740 msgid "Work, Fax" msgstr "" #: ../../include/event.php:1429 ../../include/event.php:1436 #: ../../include/selectors.php:60 ../../include/selectors.php:77 #: ../../include/selectors.php:115 ../../include/selectors.php:151 -#: ../../include/connections.php:740 ../../include/connections.php:747 -#: ../../Zotlabs/Module/Cdav.php:1380 ../../Zotlabs/Module/Profiles.php:797 -#: ../../Zotlabs/Module/Connedit.php:938 +#: ../../include/connections.php:741 ../../include/connections.php:748 +#: ../../Zotlabs/Module/Cdav.php:1384 ../../Zotlabs/Module/Profiles.php:797 +#: ../../Zotlabs/Module/Connedit.php:927 #: ../../Zotlabs/Access/PermissionRoles.php:310 msgid "Other" msgstr "" @@ -4623,7 +4629,6 @@ msgstr "" #: ../../include/features.php:82 ../../include/nav.php:463 #: ../../include/nav.php:466 ../../Zotlabs/Lib/Apps.php:346 -#: ../../Zotlabs/Storage/Browser.php:140 msgid "Calendar" msgstr "" @@ -4937,8 +4942,8 @@ msgstr "" msgid "Delete this item?" msgstr "" -#: ../../include/js_strings.php:6 ../../Zotlabs/Module/Photos.php:1096 -#: ../../Zotlabs/Module/Photos.php:1214 ../../Zotlabs/Lib/ThreadItem.php:824 +#: ../../include/js_strings.php:6 ../../Zotlabs/Module/Photos.php:1097 +#: ../../Zotlabs/Module/Photos.php:1215 ../../Zotlabs/Lib/ThreadItem.php:824 msgid "Comment" msgstr "" @@ -4999,7 +5004,7 @@ msgid "Rate This Channel (this is public)" msgstr "" #: ../../include/js_strings.php:20 ../../Zotlabs/Module/Rate.php:155 -#: ../../Zotlabs/Module/Connedit.php:890 +#: ../../Zotlabs/Module/Connedit.php:879 msgid "Rating" msgstr "" @@ -5016,9 +5021,9 @@ msgid "Unsaved changes. Are you sure you wish to leave this page?" msgstr "" #: ../../include/js_strings.php:25 ../../Zotlabs/Module/Pubsites.php:52 -#: ../../Zotlabs/Module/Cdav.php:1011 ../../Zotlabs/Module/Events.php:483 +#: ../../Zotlabs/Module/Cdav.php:1015 ../../Zotlabs/Module/Events.php:483 #: ../../Zotlabs/Module/Profiles.php:511 ../../Zotlabs/Module/Profiles.php:736 -#: ../../Zotlabs/Module/Locs.php:121 +#: ../../Zotlabs/Module/Locs.php:128 msgid "Location" msgstr "" @@ -5271,6 +5276,10 @@ msgctxt "calendar" msgid "All day" msgstr "" +#: ../../include/js_strings.php:119 +msgid "Please stand by while your download is being prepared." +msgstr "" + #: ../../include/help.php:80 msgid "Help:" msgstr "" @@ -5285,9 +5294,9 @@ msgstr "" msgid "Not Found" msgstr "" -#: ../../include/help.php:132 ../../Zotlabs/Module/Display.php:139 -#: ../../Zotlabs/Module/Display.php:156 ../../Zotlabs/Module/Display.php:176 -#: ../../Zotlabs/Module/Display.php:182 ../../Zotlabs/Module/Page.php:136 +#: ../../include/help.php:132 ../../Zotlabs/Module/Display.php:136 +#: ../../Zotlabs/Module/Display.php:153 ../../Zotlabs/Module/Display.php:173 +#: ../../Zotlabs/Module/Display.php:179 ../../Zotlabs/Module/Page.php:136 #: ../../Zotlabs/Module/Block.php:77 ../../Zotlabs/Lib/NativeWikiPage.php:521 #: ../../Zotlabs/Web/Router.php:185 msgid "Page not found." @@ -5325,8 +5334,8 @@ msgstr "" msgid "Photo Albums" msgstr "" -#: ../../include/photos.php:667 ../../Zotlabs/Module/Photos.php:1347 -#: ../../Zotlabs/Module/Photos.php:1360 ../../Zotlabs/Module/Photos.php:1361 +#: ../../include/photos.php:667 ../../Zotlabs/Module/Photos.php:1348 +#: ../../Zotlabs/Module/Photos.php:1361 ../../Zotlabs/Module/Photos.php:1362 msgid "Recent Photos" msgstr "" @@ -5334,43 +5343,43 @@ msgstr "" msgid "Upload New Photos" msgstr "" -#: ../../include/network.php:1730 ../../include/network.php:1731 +#: ../../include/network.php:1731 ../../include/network.php:1732 msgid "Friendica" msgstr "" -#: ../../include/network.php:1732 +#: ../../include/network.php:1733 msgid "OStatus" msgstr "" -#: ../../include/network.php:1733 +#: ../../include/network.php:1734 msgid "GNU-Social" msgstr "" -#: ../../include/network.php:1734 +#: ../../include/network.php:1735 msgid "RSS/Atom" msgstr "" -#: ../../include/network.php:1737 +#: ../../include/network.php:1738 msgid "Diaspora" msgstr "" -#: ../../include/network.php:1738 +#: ../../include/network.php:1739 msgid "Facebook" msgstr "" -#: ../../include/network.php:1739 +#: ../../include/network.php:1740 msgid "Zot" msgstr "" -#: ../../include/network.php:1740 +#: ../../include/network.php:1741 msgid "LinkedIn" msgstr "" -#: ../../include/network.php:1741 +#: ../../include/network.php:1742 msgid "XMPP/IM" msgstr "" -#: ../../include/network.php:1742 +#: ../../include/network.php:1743 msgid "MySpace" msgstr "" @@ -5404,8 +5413,8 @@ msgid_plural "%d invitations available" msgstr[0] "" msgstr[1] "" -#: ../../include/contact_widgets.php:16 ../../include/acl_selectors.php:135 -#: ../../Zotlabs/Module/Admin/Site.php:291 +#: ../../include/contact_widgets.php:16 ../../include/acl_selectors.php:144 +#: ../../Zotlabs/Module/Admin/Site.php:297 msgid "Advanced" msgstr "" @@ -5448,25 +5457,28 @@ msgstr "" msgid "Advanced example: name=fred and country=iceland" msgstr "" -#: ../../include/contact_widgets.php:56 ../../include/contact_widgets.php:99 -#: ../../include/contact_widgets.php:142 ../../include/contact_widgets.php:187 +#: ../../include/contact_widgets.php:56 ../../include/contact_widgets.php:111 +#: ../../include/contact_widgets.php:155 ../../include/contact_widgets.php:200 +#: ../../include/contact_widgets.php:235 #: ../../Zotlabs/Widget/Appcategories.php:46 ../../Zotlabs/Widget/Filer.php:31 msgid "Everything" msgstr "" -#: ../../include/contact_widgets.php:96 ../../include/contact_widgets.php:139 -#: ../../include/contact_widgets.php:184 ../../include/taxonomy.php:409 -#: ../../include/taxonomy.php:491 ../../include/taxonomy.php:511 -#: ../../include/taxonomy.php:532 ../../Zotlabs/Widget/Appcategories.php:43 -#: ../../Zotlabs/Module/Cdav.php:1066 +#: ../../include/contact_widgets.php:108 ../../include/contact_widgets.php:152 +#: ../../include/contact_widgets.php:197 ../../include/contact_widgets.php:232 +#: ../../include/taxonomy.php:418 ../../include/taxonomy.php:500 +#: ../../include/taxonomy.php:520 ../../include/taxonomy.php:541 +#: ../../Zotlabs/Widget/Appcategories.php:43 ../../Zotlabs/Module/Cdav.php:1070 +#: ../../Zotlabs/Storage/Browser.php:293 ../../Zotlabs/Storage/Browser.php:381 +#: ../../Zotlabs/Storage/Browser.php:396 msgid "Categories" msgstr "" -#: ../../include/contact_widgets.php:218 +#: ../../include/contact_widgets.php:265 msgid "Common Connections" msgstr "" -#: ../../include/contact_widgets.php:222 +#: ../../include/contact_widgets.php:269 #, php-format msgid "View all %d common connections" msgstr "" @@ -5506,7 +5518,7 @@ msgid "Manage your channels" msgstr "" #: ../../include/nav.php:101 ../../include/group.php:321 -#: ../../include/acl_selectors.php:87 +#: ../../include/acl_selectors.php:86 #: ../../Zotlabs/Widget/Activity_filter.php:82 #: ../../Zotlabs/Module/Group.php:142 ../../Zotlabs/Module/Group.php:154 #: ../../Zotlabs/Lib/Group.php:324 ../../Zotlabs/Lib/Apps.php:364 @@ -5529,7 +5541,7 @@ msgid "Account/Channel Settings" msgstr "" #: ../../include/nav.php:109 ../../include/nav.php:138 -#: ../../include/nav.php:157 ../../boot.php:1697 +#: ../../include/nav.php:157 ../../boot.php:1698 msgid "Logout" msgstr "" @@ -5541,7 +5553,7 @@ msgstr "" msgid "Your profile page" msgstr "" -#: ../../include/nav.php:115 ../../include/channel.php:1524 +#: ../../include/nav.php:115 ../../include/channel.php:1538 #: ../../Zotlabs/Module/Profiles.php:832 msgid "Edit Profiles" msgstr "" @@ -5555,7 +5567,7 @@ msgid "Edit your profile" msgstr "" #: ../../include/nav.php:124 ../../include/nav.php:128 -#: ../../Zotlabs/Lib/Apps.php:336 ../../boot.php:1698 +#: ../../Zotlabs/Lib/Apps.php:336 ../../boot.php:1699 msgid "Login" msgstr "" @@ -5572,7 +5584,7 @@ msgid "Log me out of this site" msgstr "" #: ../../include/nav.php:162 ../../Zotlabs/Module/Register.php:293 -#: ../../boot.php:1678 +#: ../../boot.php:1679 msgid "Register" msgstr "" @@ -5599,7 +5611,7 @@ msgstr "" #: ../../include/nav.php:324 ../../Zotlabs/Widget/Notifications.php:182 #: ../../Zotlabs/Module/New_channel.php:157 #: ../../Zotlabs/Module/New_channel.php:164 -#: ../../Zotlabs/Module/Defperms.php:257 ../../Zotlabs/Module/Connedit.php:872 +#: ../../Zotlabs/Module/Defperms.php:257 ../../Zotlabs/Module/Connedit.php:861 msgid "Loading" msgstr "" @@ -5640,7 +5652,7 @@ msgid "Profile Details" msgstr "" #: ../../include/nav.php:452 ../../Zotlabs/Module/Fbrowser.php:85 -#: ../../Zotlabs/Lib/Apps.php:340 ../../Zotlabs/Storage/Browser.php:278 +#: ../../Zotlabs/Lib/Apps.php:340 ../../Zotlabs/Storage/Browser.php:344 msgid "Files" msgstr "" @@ -5730,7 +5742,7 @@ msgstr "" msgid "YYYY-MM-DD or MM-DD" msgstr "" -#: ../../include/datetime.php:238 ../../boot.php:2702 +#: ../../include/datetime.php:238 ../../boot.php:2703 msgid "never" msgstr "" @@ -5864,7 +5876,7 @@ msgstr "" msgid "Cannot connect to yourself." msgstr "" -#: ../../include/conversation.php:135 ../../Zotlabs/Module/Like.php:129 +#: ../../include/conversation.php:135 ../../Zotlabs/Module/Like.php:166 msgid "channel" msgstr "" @@ -5894,275 +5906,275 @@ msgctxt "mood" msgid "%1$s is %2$s" msgstr "" -#: ../../include/conversation.php:515 ../../Zotlabs/Lib/ThreadItem.php:500 +#: ../../include/conversation.php:516 ../../Zotlabs/Lib/ThreadItem.php:500 msgid "This is an unsaved preview" msgstr "" -#: ../../include/conversation.php:651 ../../Zotlabs/Module/Photos.php:1112 +#: ../../include/conversation.php:652 ../../Zotlabs/Module/Photos.php:1113 msgctxt "title" msgid "Likes" msgstr "" -#: ../../include/conversation.php:652 ../../Zotlabs/Module/Photos.php:1112 +#: ../../include/conversation.php:653 ../../Zotlabs/Module/Photos.php:1113 msgctxt "title" msgid "Dislikes" msgstr "" -#: ../../include/conversation.php:653 ../../Zotlabs/Widget/Pinned.php:77 -#: ../../Zotlabs/Module/Photos.php:1113 +#: ../../include/conversation.php:654 ../../Zotlabs/Widget/Pinned.php:77 +#: ../../Zotlabs/Module/Photos.php:1114 msgctxt "title" msgid "Agree" msgstr "" -#: ../../include/conversation.php:654 ../../Zotlabs/Widget/Pinned.php:78 -#: ../../Zotlabs/Module/Photos.php:1113 +#: ../../include/conversation.php:655 ../../Zotlabs/Widget/Pinned.php:78 +#: ../../Zotlabs/Module/Photos.php:1114 msgctxt "title" msgid "Disagree" msgstr "" -#: ../../include/conversation.php:655 ../../Zotlabs/Widget/Pinned.php:79 -#: ../../Zotlabs/Module/Photos.php:1113 +#: ../../include/conversation.php:656 ../../Zotlabs/Widget/Pinned.php:79 +#: ../../Zotlabs/Module/Photos.php:1114 msgctxt "title" msgid "Abstain" msgstr "" -#: ../../include/conversation.php:656 ../../Zotlabs/Widget/Pinned.php:66 -#: ../../Zotlabs/Module/Photos.php:1114 +#: ../../include/conversation.php:657 ../../Zotlabs/Widget/Pinned.php:66 +#: ../../Zotlabs/Module/Photos.php:1115 msgctxt "title" msgid "Attending" msgstr "" -#: ../../include/conversation.php:657 ../../Zotlabs/Widget/Pinned.php:67 -#: ../../Zotlabs/Module/Photos.php:1114 +#: ../../include/conversation.php:658 ../../Zotlabs/Widget/Pinned.php:67 +#: ../../Zotlabs/Module/Photos.php:1115 msgctxt "title" msgid "Not attending" msgstr "" -#: ../../include/conversation.php:658 ../../Zotlabs/Widget/Pinned.php:68 -#: ../../Zotlabs/Module/Photos.php:1114 +#: ../../include/conversation.php:659 ../../Zotlabs/Widget/Pinned.php:68 +#: ../../Zotlabs/Module/Photos.php:1115 msgctxt "title" msgid "Might attend" msgstr "" -#: ../../include/conversation.php:728 ../../Zotlabs/Lib/ThreadItem.php:180 +#: ../../include/conversation.php:729 ../../Zotlabs/Lib/ThreadItem.php:180 msgid "Select" msgstr "" -#: ../../include/conversation.php:729 ../../include/conversation.php:774 +#: ../../include/conversation.php:730 ../../include/conversation.php:775 #: ../../Zotlabs/Module/Article_edit.php:128 #: ../../Zotlabs/Module/Card_edit.php:129 ../../Zotlabs/Module/Oauth.php:174 -#: ../../Zotlabs/Module/Editwebpage.php:167 ../../Zotlabs/Module/Cdav.php:1052 -#: ../../Zotlabs/Module/Cdav.php:1385 ../../Zotlabs/Module/Webpages.php:257 +#: ../../Zotlabs/Module/Editwebpage.php:167 ../../Zotlabs/Module/Cdav.php:1056 +#: ../../Zotlabs/Module/Cdav.php:1389 ../../Zotlabs/Module/Webpages.php:257 #: ../../Zotlabs/Module/Admin/Accounts.php:175 #: ../../Zotlabs/Module/Admin/Channels.php:149 #: ../../Zotlabs/Module/Admin/Profs.php:176 ../../Zotlabs/Module/Blocks.php:162 #: ../../Zotlabs/Module/Editblock.php:139 #: ../../Zotlabs/Module/Editlayout.php:138 #: ../../Zotlabs/Module/Connections.php:328 -#: ../../Zotlabs/Module/Photos.php:1178 ../../Zotlabs/Module/Profiles.php:802 +#: ../../Zotlabs/Module/Photos.php:1179 ../../Zotlabs/Module/Profiles.php:802 #: ../../Zotlabs/Module/Oauth2.php:195 ../../Zotlabs/Module/Thing.php:269 -#: ../../Zotlabs/Module/Connedit.php:671 ../../Zotlabs/Module/Connedit.php:943 +#: ../../Zotlabs/Module/Connedit.php:660 ../../Zotlabs/Module/Connedit.php:932 #: ../../Zotlabs/Lib/Apps.php:558 ../../Zotlabs/Lib/ThreadItem.php:170 -#: ../../Zotlabs/Storage/Browser.php:297 +#: ../../Zotlabs/Storage/Browser.php:377 msgid "Delete" msgstr "" -#: ../../include/conversation.php:733 ../../Zotlabs/Lib/ThreadItem.php:273 +#: ../../include/conversation.php:734 ../../Zotlabs/Lib/ThreadItem.php:273 msgid "Toggle Star Status" msgstr "" -#: ../../include/conversation.php:738 ../../Zotlabs/Lib/ThreadItem.php:103 +#: ../../include/conversation.php:739 ../../Zotlabs/Lib/ThreadItem.php:103 msgid "Private Message" msgstr "" -#: ../../include/conversation.php:745 ../../Zotlabs/Widget/Pinned.php:88 +#: ../../include/conversation.php:746 ../../Zotlabs/Widget/Pinned.php:88 #: ../../Zotlabs/Lib/ThreadItem.php:284 msgid "Message signature validated" msgstr "" -#: ../../include/conversation.php:746 ../../Zotlabs/Widget/Pinned.php:89 +#: ../../include/conversation.php:747 ../../Zotlabs/Widget/Pinned.php:89 #: ../../Zotlabs/Lib/ThreadItem.php:285 msgid "Message signature incorrect" msgstr "" -#: ../../include/conversation.php:773 +#: ../../include/conversation.php:774 #: ../../Zotlabs/Module/Admin/Accounts.php:173 #: ../../Zotlabs/Module/Connections.php:342 msgid "Approve" msgstr "" -#: ../../include/conversation.php:778 +#: ../../include/conversation.php:779 #, php-format msgid "View %s's profile @ %s" msgstr "" -#: ../../include/conversation.php:798 +#: ../../include/conversation.php:799 msgid "Categories:" msgstr "" -#: ../../include/conversation.php:799 +#: ../../include/conversation.php:800 msgid "Filed under:" msgstr "" -#: ../../include/conversation.php:805 ../../Zotlabs/Widget/Pinned.php:133 +#: ../../include/conversation.php:806 ../../Zotlabs/Widget/Pinned.php:133 #: ../../Zotlabs/Lib/ThreadItem.php:429 #, php-format msgid "from %s" msgstr "" -#: ../../include/conversation.php:808 ../../Zotlabs/Widget/Pinned.php:136 +#: ../../include/conversation.php:809 ../../Zotlabs/Widget/Pinned.php:136 #: ../../Zotlabs/Lib/ThreadItem.php:432 #, php-format msgid "last edited: %s" msgstr "" -#: ../../include/conversation.php:809 ../../Zotlabs/Widget/Pinned.php:137 +#: ../../include/conversation.php:810 ../../Zotlabs/Widget/Pinned.php:137 #: ../../Zotlabs/Lib/ThreadItem.php:433 #, php-format msgid "Expires: %s" msgstr "" -#: ../../include/conversation.php:824 +#: ../../include/conversation.php:825 msgid "View in context" msgstr "" -#: ../../include/conversation.php:826 ../../Zotlabs/Module/Photos.php:1078 +#: ../../include/conversation.php:827 ../../Zotlabs/Module/Photos.php:1079 #: ../../Zotlabs/Lib/ThreadItem.php:501 msgid "Please wait" msgstr "" -#: ../../include/conversation.php:925 +#: ../../include/conversation.php:928 msgid "remove" msgstr "" -#: ../../include/conversation.php:929 +#: ../../include/conversation.php:932 msgid "Loading..." msgstr "" -#: ../../include/conversation.php:930 ../../Zotlabs/Lib/ThreadItem.php:301 +#: ../../include/conversation.php:933 ../../Zotlabs/Lib/ThreadItem.php:301 msgid "Conversation Tools" msgstr "" -#: ../../include/conversation.php:931 +#: ../../include/conversation.php:934 msgid "Delete Selected Items" msgstr "" -#: ../../include/conversation.php:974 +#: ../../include/conversation.php:977 msgid "View Source" msgstr "" -#: ../../include/conversation.php:984 +#: ../../include/conversation.php:987 msgid "Follow Thread" msgstr "" -#: ../../include/conversation.php:993 +#: ../../include/conversation.php:996 msgid "Unfollow Thread" msgstr "" -#: ../../include/conversation.php:1087 ../../Zotlabs/Module/Connedit.php:632 +#: ../../include/conversation.php:1090 ../../Zotlabs/Module/Connedit.php:621 msgid "Recent Activity" msgstr "" -#: ../../include/conversation.php:1097 ../../include/connections.php:110 -#: ../../include/channel.php:1604 ../../Zotlabs/Widget/Suggestions.php:46 +#: ../../include/conversation.php:1100 ../../include/connections.php:110 +#: ../../include/channel.php:1618 ../../Zotlabs/Widget/Suggestions.php:46 #: ../../Zotlabs/Widget/Follow.php:32 ../../Zotlabs/Module/Directory.php:368 #: ../../Zotlabs/Module/Connections.php:349 ../../Zotlabs/Module/Suggest.php:71 msgid "Connect" msgstr "" -#: ../../include/conversation.php:1107 +#: ../../include/conversation.php:1110 msgid "Edit Connection" msgstr "" -#: ../../include/conversation.php:1117 +#: ../../include/conversation.php:1120 msgid "Message" msgstr "" -#: ../../include/conversation.php:1127 ../../Zotlabs/Module/Pubsites.php:35 +#: ../../include/conversation.php:1130 ../../Zotlabs/Module/Pubsites.php:35 #: ../../Zotlabs/Module/Ratings.php:97 msgid "Ratings" msgstr "" -#: ../../include/conversation.php:1137 ../../Zotlabs/Module/Poke.php:199 +#: ../../include/conversation.php:1140 ../../Zotlabs/Module/Poke.php:199 #: ../../Zotlabs/Lib/Apps.php:351 msgid "Poke" msgstr "" -#: ../../include/conversation.php:1259 +#: ../../include/conversation.php:1262 #, php-format msgid "%s likes this." msgstr "" -#: ../../include/conversation.php:1259 +#: ../../include/conversation.php:1262 #, php-format msgid "%s doesn't like this." msgstr "" -#: ../../include/conversation.php:1263 +#: ../../include/conversation.php:1266 #, php-format msgid "<span %1$s>%2$d people</span> like this." msgid_plural "<span %1$s>%2$d people</span> like this." msgstr[0] "" msgstr[1] "" -#: ../../include/conversation.php:1265 +#: ../../include/conversation.php:1268 #, php-format msgid "<span %1$s>%2$d people</span> don't like this." msgid_plural "<span %1$s>%2$d people</span> don't like this." msgstr[0] "" msgstr[1] "" -#: ../../include/conversation.php:1271 +#: ../../include/conversation.php:1274 msgid "and" msgstr "" -#: ../../include/conversation.php:1274 +#: ../../include/conversation.php:1277 #, php-format msgid ", and %d other people" msgid_plural ", and %d other people" msgstr[0] "" msgstr[1] "" -#: ../../include/conversation.php:1275 +#: ../../include/conversation.php:1278 #, php-format msgid "%s like this." msgstr "" -#: ../../include/conversation.php:1275 +#: ../../include/conversation.php:1278 #, php-format msgid "%s don't like this." msgstr "" -#: ../../include/conversation.php:1459 +#: ../../include/conversation.php:1462 msgid "Toggle poll" msgstr "" -#: ../../include/conversation.php:1460 +#: ../../include/conversation.php:1463 msgid "Option" msgstr "" -#: ../../include/conversation.php:1461 +#: ../../include/conversation.php:1464 msgid "Add option" msgstr "" -#: ../../include/conversation.php:1462 +#: ../../include/conversation.php:1465 msgid "Minutes" msgstr "" -#: ../../include/conversation.php:1462 +#: ../../include/conversation.php:1465 msgid "Hours" msgstr "" -#: ../../include/conversation.php:1462 +#: ../../include/conversation.php:1465 msgid "Days" msgstr "" -#: ../../include/conversation.php:1463 +#: ../../include/conversation.php:1466 msgid "Allow multiple answers" msgstr "" -#: ../../include/conversation.php:1746 ../../include/taxonomy.php:659 -#: ../../include/channel.php:1767 ../../Zotlabs/Module/Photos.php:1135 +#: ../../include/conversation.php:1749 ../../include/taxonomy.php:668 +#: ../../include/channel.php:1781 ../../Zotlabs/Module/Photos.php:1136 #: ../../Zotlabs/Lib/ThreadItem.php:242 msgctxt "noun" msgid "Like" @@ -6170,7 +6182,7 @@ msgid_plural "Likes" msgstr[0] "" msgstr[1] "" -#: ../../include/conversation.php:1749 ../../Zotlabs/Module/Photos.php:1140 +#: ../../include/conversation.php:1752 ../../Zotlabs/Module/Photos.php:1141 #: ../../Zotlabs/Lib/ThreadItem.php:247 msgctxt "noun" msgid "Dislike" @@ -6178,42 +6190,42 @@ msgid_plural "Dislikes" msgstr[0] "" msgstr[1] "" -#: ../../include/conversation.php:1752 +#: ../../include/conversation.php:1755 msgctxt "noun" msgid "Attending" msgid_plural "Attending" msgstr[0] "" msgstr[1] "" -#: ../../include/conversation.php:1755 +#: ../../include/conversation.php:1758 msgctxt "noun" msgid "Not Attending" msgid_plural "Not Attending" msgstr[0] "" msgstr[1] "" -#: ../../include/conversation.php:1758 +#: ../../include/conversation.php:1761 msgctxt "noun" msgid "Undecided" msgid_plural "Undecided" msgstr[0] "" msgstr[1] "" -#: ../../include/conversation.php:1761 +#: ../../include/conversation.php:1764 msgctxt "noun" msgid "Agree" msgid_plural "Agrees" msgstr[0] "" msgstr[1] "" -#: ../../include/conversation.php:1764 +#: ../../include/conversation.php:1767 msgctxt "noun" msgid "Disagree" msgid_plural "Disagrees" msgstr[0] "" msgstr[1] "" -#: ../../include/conversation.php:1767 +#: ../../include/conversation.php:1770 msgctxt "noun" msgid "Abstain" msgid_plural "Abstains" @@ -6280,11 +6292,11 @@ msgstr "" msgid "Hermaphrodite" msgstr "" -#: ../../include/selectors.php:60 ../../include/channel.php:1712 +#: ../../include/selectors.php:60 ../../include/channel.php:1726 msgid "Neuter" msgstr "" -#: ../../include/selectors.php:60 ../../include/channel.php:1714 +#: ../../include/selectors.php:60 ../../include/channel.php:1728 msgid "Non-specific" msgstr "" @@ -6388,7 +6400,7 @@ msgstr "" #: ../../Zotlabs/Module/Settings/Channel.php:76 #: ../../Zotlabs/Module/Settings/Channel.php:79 #: ../../Zotlabs/Module/Settings/Channel.php:90 -#: ../../Zotlabs/Module/Connedit.php:728 +#: ../../Zotlabs/Module/Connedit.php:717 msgid "Friends" msgstr "" @@ -6476,11 +6488,11 @@ msgstr "" msgid "Ask me" msgstr "" -#: ../../include/connections.php:133 +#: ../../include/connections.php:134 msgid "New window" msgstr "" -#: ../../include/connections.php:134 +#: ../../include/connections.php:135 msgid "Open the selected location in a different window or browser tab" msgstr "" @@ -6517,48 +6529,48 @@ msgstr "" msgid "add" msgstr "" -#: ../../include/taxonomy.php:320 +#: ../../include/taxonomy.php:323 msgid "Trending" msgstr "" -#: ../../include/taxonomy.php:320 ../../include/taxonomy.php:449 -#: ../../include/taxonomy.php:470 ../../Zotlabs/Widget/Tagcloud.php:22 +#: ../../include/taxonomy.php:323 ../../include/taxonomy.php:458 +#: ../../include/taxonomy.php:479 ../../Zotlabs/Widget/Tagcloud.php:22 msgid "Tags" msgstr "" -#: ../../include/taxonomy.php:550 +#: ../../include/taxonomy.php:559 msgid "Keywords" msgstr "" -#: ../../include/taxonomy.php:571 +#: ../../include/taxonomy.php:580 msgid "have" msgstr "" -#: ../../include/taxonomy.php:571 +#: ../../include/taxonomy.php:580 msgid "has" msgstr "" -#: ../../include/taxonomy.php:572 +#: ../../include/taxonomy.php:581 msgid "want" msgstr "" -#: ../../include/taxonomy.php:572 +#: ../../include/taxonomy.php:581 msgid "wants" msgstr "" -#: ../../include/taxonomy.php:573 ../../Zotlabs/Lib/ThreadItem.php:317 +#: ../../include/taxonomy.php:582 ../../Zotlabs/Lib/ThreadItem.php:317 msgid "like" msgstr "" -#: ../../include/taxonomy.php:573 +#: ../../include/taxonomy.php:582 msgid "likes" msgstr "" -#: ../../include/taxonomy.php:574 ../../Zotlabs/Lib/ThreadItem.php:318 +#: ../../include/taxonomy.php:583 ../../Zotlabs/Lib/ThreadItem.php:318 msgid "dislike" msgstr "" -#: ../../include/taxonomy.php:574 +#: ../../include/taxonomy.php:583 msgid "dislikes" msgstr "" @@ -6599,67 +6611,67 @@ msgstr "" msgid "Visible to specific connections." msgstr "" -#: ../../include/items.php:4466 ../../Zotlabs/Module/Group.php:62 +#: ../../include/items.php:4474 ../../Zotlabs/Module/Group.php:62 #: ../../Zotlabs/Module/Group.php:214 msgid "Privacy group not found." msgstr "" -#: ../../include/items.php:4482 +#: ../../include/items.php:4490 msgid "Privacy group is empty." msgstr "" -#: ../../include/items.php:4489 +#: ../../include/items.php:4497 #, php-format msgid "Privacy group: %s" msgstr "" -#: ../../include/items.php:4499 ../../Zotlabs/Module/Connedit.php:870 +#: ../../include/items.php:4507 ../../Zotlabs/Module/Connedit.php:859 #, php-format msgid "Connection: %s" msgstr "" -#: ../../include/items.php:4501 +#: ../../include/items.php:4509 msgid "Connection not found." msgstr "" -#: ../../include/items.php:4835 ../../Zotlabs/Module/Cover_photo.php:297 +#: ../../include/items.php:4843 ../../Zotlabs/Module/Cover_photo.php:297 msgid "female" msgstr "" -#: ../../include/items.php:4836 ../../Zotlabs/Module/Cover_photo.php:298 +#: ../../include/items.php:4844 ../../Zotlabs/Module/Cover_photo.php:298 #, php-format msgid "%1$s updated her %2$s" msgstr "" -#: ../../include/items.php:4837 ../../Zotlabs/Module/Cover_photo.php:299 +#: ../../include/items.php:4845 ../../Zotlabs/Module/Cover_photo.php:299 msgid "male" msgstr "" -#: ../../include/items.php:4838 ../../Zotlabs/Module/Cover_photo.php:300 +#: ../../include/items.php:4846 ../../Zotlabs/Module/Cover_photo.php:300 #, php-format msgid "%1$s updated his %2$s" msgstr "" -#: ../../include/items.php:4840 ../../Zotlabs/Module/Cover_photo.php:302 +#: ../../include/items.php:4848 ../../Zotlabs/Module/Cover_photo.php:302 #, php-format msgid "%1$s updated their %2$s" msgstr "" -#: ../../include/items.php:4842 +#: ../../include/items.php:4850 msgid "profile photo" msgstr "" -#: ../../include/items.php:5034 +#: ../../include/items.php:5042 #, php-format msgid "[Edited %s]" msgstr "" -#: ../../include/items.php:5034 +#: ../../include/items.php:5042 msgctxt "edit_activity" msgid "Post" msgstr "" -#: ../../include/items.php:5034 +#: ../../include/items.php:5042 msgctxt "edit_activity" msgid "Comment" msgstr "" @@ -6732,13 +6744,14 @@ msgstr "" msgid "This action is not available under your subscription plan." msgstr "" -#: ../../include/photo/photo_driver.php:413 +#: ../../include/photo/photo_driver.php:417 #: ../../Zotlabs/Module/Profile_photo.php:147 #: ../../Zotlabs/Module/Profile_photo.php:284 msgid "Profile Photos" msgstr "" -#: ../../include/attach.php:273 ../../include/attach.php:381 +#: ../../include/attach.php:273 ../../include/attach.php:324 +#: ../../include/attach.php:419 msgid "Item was not found." msgstr "" @@ -6746,65 +6759,65 @@ msgstr "" msgid "Unknown error." msgstr "" -#: ../../include/attach.php:574 +#: ../../include/attach.php:612 msgid "No source file." msgstr "" -#: ../../include/attach.php:596 +#: ../../include/attach.php:634 msgid "Cannot locate file to replace" msgstr "" -#: ../../include/attach.php:615 +#: ../../include/attach.php:653 msgid "Cannot locate file to revise/update" msgstr "" -#: ../../include/attach.php:759 +#: ../../include/attach.php:795 #, php-format msgid "File exceeds size limit of %d" msgstr "" -#: ../../include/attach.php:780 +#: ../../include/attach.php:816 #, php-format msgid "You have reached your limit of %1$.0f Mbytes attachment storage." msgstr "" -#: ../../include/attach.php:968 +#: ../../include/attach.php:1004 msgid "File upload failed. Possible system limit or action terminated." msgstr "" -#: ../../include/attach.php:997 +#: ../../include/attach.php:1033 msgid "Stored file could not be verified. Upload failed." msgstr "" -#: ../../include/attach.php:1069 ../../include/attach.php:1085 +#: ../../include/attach.php:1105 ../../include/attach.php:1121 msgid "Path not available." msgstr "" -#: ../../include/attach.php:1134 ../../include/attach.php:1297 +#: ../../include/attach.php:1169 ../../include/attach.php:1332 msgid "Empty pathname" msgstr "" -#: ../../include/attach.php:1160 +#: ../../include/attach.php:1195 msgid "duplicate filename or path" msgstr "" -#: ../../include/attach.php:1185 +#: ../../include/attach.php:1220 msgid "Path not found." msgstr "" -#: ../../include/attach.php:1253 +#: ../../include/attach.php:1288 msgid "mkdir failed." msgstr "" -#: ../../include/attach.php:1257 +#: ../../include/attach.php:1292 msgid "database storage failed." msgstr "" -#: ../../include/attach.php:1303 +#: ../../include/attach.php:1338 msgid "Empty path" msgstr "" -#: ../../include/attach.php:2035 +#: ../../include/attach.php:2099 #, php-format msgid "%s shared a %s with you" msgstr "" @@ -6814,8 +6827,8 @@ msgstr "" msgid "%1$s's bookmarks" msgstr "" -#: ../../include/menu.php:120 ../../include/channel.php:1524 -#: ../../include/channel.php:1528 ../../Zotlabs/Widget/Cdav.php:138 +#: ../../include/menu.php:120 ../../include/channel.php:1538 +#: ../../include/channel.php:1542 ../../Zotlabs/Widget/Cdav.php:138 #: ../../Zotlabs/Widget/Cdav.php:175 ../../Zotlabs/Module/Article_edit.php:98 #: ../../Zotlabs/Module/Group.php:253 ../../Zotlabs/Module/Card_edit.php:99 #: ../../Zotlabs/Module/Oauth.php:173 ../../Zotlabs/Module/Editwebpage.php:142 @@ -6829,7 +6842,7 @@ msgstr "" #: ../../Zotlabs/Module/Oauth2.php:194 ../../Zotlabs/Module/Thing.php:268 #: ../../Zotlabs/Module/Wiki.php:211 ../../Zotlabs/Module/Wiki.php:384 #: ../../Zotlabs/Module/Layouts.php:193 ../../Zotlabs/Lib/Apps.php:557 -#: ../../Zotlabs/Lib/ThreadItem.php:148 ../../Zotlabs/Storage/Browser.php:296 +#: ../../Zotlabs/Lib/ThreadItem.php:148 msgid "Edit" msgstr "" @@ -6951,187 +6964,187 @@ msgstr "" msgid "Unable to retrieve modified identity" msgstr "" -#: ../../include/channel.php:1371 +#: ../../include/channel.php:1385 msgid "Requested channel is not available." msgstr "" -#: ../../include/channel.php:1517 ../../Zotlabs/Module/Profiles.php:730 +#: ../../include/channel.php:1531 ../../Zotlabs/Module/Profiles.php:730 msgid "Change profile photo" msgstr "" -#: ../../include/channel.php:1525 +#: ../../include/channel.php:1539 msgid "Create New Profile" msgstr "" -#: ../../include/channel.php:1543 ../../Zotlabs/Module/Profiles.php:822 +#: ../../include/channel.php:1557 ../../Zotlabs/Module/Profiles.php:822 msgid "Profile Image" msgstr "" -#: ../../include/channel.php:1546 +#: ../../include/channel.php:1560 msgid "Visible to everybody" msgstr "" -#: ../../include/channel.php:1547 ../../Zotlabs/Module/Profiles.php:727 +#: ../../include/channel.php:1561 ../../Zotlabs/Module/Profiles.php:727 #: ../../Zotlabs/Module/Profiles.php:826 msgid "Edit visibility" msgstr "" -#: ../../include/channel.php:1623 ../../include/channel.php:1751 +#: ../../include/channel.php:1637 ../../include/channel.php:1765 msgid "Gender:" msgstr "" -#: ../../include/channel.php:1624 ../../include/channel.php:1795 +#: ../../include/channel.php:1638 ../../include/channel.php:1809 msgid "Status:" msgstr "" -#: ../../include/channel.php:1625 ../../include/channel.php:1819 +#: ../../include/channel.php:1639 ../../include/channel.php:1833 msgid "Homepage:" msgstr "" -#: ../../include/channel.php:1626 +#: ../../include/channel.php:1640 msgid "Online Now" msgstr "" -#: ../../include/channel.php:1679 +#: ../../include/channel.php:1693 msgid "Change your profile photo" msgstr "" -#: ../../include/channel.php:1710 +#: ../../include/channel.php:1724 msgid "Trans" msgstr "" -#: ../../include/channel.php:1749 ../../Zotlabs/Module/Settings/Channel.php:501 +#: ../../include/channel.php:1763 ../../Zotlabs/Module/Settings/Channel.php:501 msgid "Full Name:" msgstr "" -#: ../../include/channel.php:1756 +#: ../../include/channel.php:1770 msgid "Like this channel" msgstr "" -#: ../../include/channel.php:1780 +#: ../../include/channel.php:1794 msgid "j F, Y" msgstr "" -#: ../../include/channel.php:1781 +#: ../../include/channel.php:1795 msgid "j F" msgstr "" -#: ../../include/channel.php:1788 +#: ../../include/channel.php:1802 msgid "Birthday:" msgstr "" -#: ../../include/channel.php:1792 ../../Zotlabs/Module/Directory.php:347 +#: ../../include/channel.php:1806 ../../Zotlabs/Module/Directory.php:347 msgid "Age:" msgstr "" -#: ../../include/channel.php:1801 +#: ../../include/channel.php:1815 #, php-format msgid "for %1$d %2$s" msgstr "" -#: ../../include/channel.php:1813 +#: ../../include/channel.php:1827 msgid "Tags:" msgstr "" -#: ../../include/channel.php:1817 +#: ../../include/channel.php:1831 msgid "Sexual Preference:" msgstr "" -#: ../../include/channel.php:1821 ../../Zotlabs/Module/Directory.php:365 +#: ../../include/channel.php:1835 ../../Zotlabs/Module/Directory.php:365 msgid "Hometown:" msgstr "" -#: ../../include/channel.php:1823 +#: ../../include/channel.php:1837 msgid "Political Views:" msgstr "" -#: ../../include/channel.php:1825 +#: ../../include/channel.php:1839 msgid "Religion:" msgstr "" -#: ../../include/channel.php:1827 ../../Zotlabs/Module/Directory.php:367 +#: ../../include/channel.php:1841 ../../Zotlabs/Module/Directory.php:367 msgid "About:" msgstr "" -#: ../../include/channel.php:1829 +#: ../../include/channel.php:1843 msgid "Hobbies/Interests:" msgstr "" -#: ../../include/channel.php:1831 +#: ../../include/channel.php:1845 msgid "Likes:" msgstr "" -#: ../../include/channel.php:1833 +#: ../../include/channel.php:1847 msgid "Dislikes:" msgstr "" -#: ../../include/channel.php:1835 +#: ../../include/channel.php:1849 msgid "Contact information and Social Networks:" msgstr "" -#: ../../include/channel.php:1837 +#: ../../include/channel.php:1851 msgid "My other channels:" msgstr "" -#: ../../include/channel.php:1839 +#: ../../include/channel.php:1853 msgid "Musical interests:" msgstr "" -#: ../../include/channel.php:1841 +#: ../../include/channel.php:1855 msgid "Books, literature:" msgstr "" -#: ../../include/channel.php:1843 +#: ../../include/channel.php:1857 msgid "Television:" msgstr "" -#: ../../include/channel.php:1845 +#: ../../include/channel.php:1859 msgid "Film/dance/culture/entertainment:" msgstr "" -#: ../../include/channel.php:1847 +#: ../../include/channel.php:1861 msgid "Love/Romance:" msgstr "" -#: ../../include/channel.php:1849 +#: ../../include/channel.php:1863 msgid "Work/employment:" msgstr "" -#: ../../include/channel.php:1851 +#: ../../include/channel.php:1865 msgid "School/education:" msgstr "" -#: ../../include/channel.php:1872 ../../Zotlabs/Module/Profperm.php:113 +#: ../../include/channel.php:1886 ../../Zotlabs/Module/Profperm.php:113 #: ../../Zotlabs/Lib/Apps.php:362 msgid "Profile" msgstr "" -#: ../../include/channel.php:1874 +#: ../../include/channel.php:1888 msgid "Like this thing" msgstr "" -#: ../../include/channel.php:1875 ../../Zotlabs/Module/Events.php:699 +#: ../../include/channel.php:1889 ../../Zotlabs/Module/Events.php:699 msgid "Export" msgstr "" -#: ../../include/channel.php:2314 ../../Zotlabs/Module/Cover_photo.php:304 +#: ../../include/channel.php:2328 ../../Zotlabs/Module/Cover_photo.php:304 msgid "cover photo" msgstr "" -#: ../../include/channel.php:2603 ../../Zotlabs/Module/Rmagic.php:96 -#: ../../boot.php:1699 +#: ../../include/channel.php:2597 ../../Zotlabs/Module/Rmagic.php:96 +#: ../../boot.php:1700 msgid "Remote Authentication" msgstr "" -#: ../../include/channel.php:2604 ../../Zotlabs/Module/Rmagic.php:97 +#: ../../include/channel.php:2598 ../../Zotlabs/Module/Rmagic.php:97 msgid "Enter your channel address (e.g. channel@example.com)" msgstr "" -#: ../../include/channel.php:2605 ../../Zotlabs/Module/Rmagic.php:98 +#: ../../include/channel.php:2599 ../../Zotlabs/Module/Rmagic.php:98 msgid "Authenticate" msgstr "" -#: ../../include/channel.php:2763 ../../Zotlabs/Module/Admin/Accounts.php:91 +#: ../../include/channel.php:2757 ../../Zotlabs/Module/Admin/Accounts.php:91 #, php-format msgid "Account '%s' deleted" msgstr "" @@ -7141,49 +7154,49 @@ msgstr "" msgid "Visible to your default audience" msgstr "" -#: ../../include/acl_selectors.php:100 +#: ../../include/acl_selectors.php:99 msgid "Profile-Based Privacy Groups" msgstr "" -#: ../../include/acl_selectors.php:113 ../../Zotlabs/Widget/Forums.php:100 +#: ../../include/acl_selectors.php:118 +msgid "Private Forum" +msgstr "" + +#: ../../include/acl_selectors.php:124 ../../Zotlabs/Widget/Forums.php:100 #: ../../Zotlabs/Widget/Activity_filter.php:115 #: ../../Zotlabs/Widget/Notifications.php:139 #: ../../Zotlabs/Widget/Notifications.php:140 msgid "Forums" msgstr "" -#: ../../include/acl_selectors.php:115 -msgid "Private Forum" -msgstr "" - -#: ../../include/acl_selectors.php:126 +#: ../../include/acl_selectors.php:135 #: ../../Zotlabs/Lib/PermissionDescription.php:107 msgid "Only me" msgstr "" -#: ../../include/acl_selectors.php:133 +#: ../../include/acl_selectors.php:142 msgid "Share with" msgstr "" -#: ../../include/acl_selectors.php:134 +#: ../../include/acl_selectors.php:143 msgid "Custom selection" msgstr "" -#: ../../include/acl_selectors.php:136 +#: ../../include/acl_selectors.php:145 msgid "" "Select \"Allow\" to allow viewing. \"Don't allow\" lets you override and " "limit the scope of \"Allow\"." msgstr "" -#: ../../include/acl_selectors.php:137 ../../Zotlabs/Module/Authorize.php:32 +#: ../../include/acl_selectors.php:146 ../../Zotlabs/Module/Authorize.php:32 msgid "Allow" msgstr "" -#: ../../include/acl_selectors.php:138 +#: ../../include/acl_selectors.php:147 msgid "Don't allow" msgstr "" -#: ../../include/acl_selectors.php:171 +#: ../../include/acl_selectors.php:180 #, php-format msgid "" "Post permissions %s cannot be changed %s after a post is shared.</br />These " @@ -7210,23 +7223,23 @@ msgstr "" msgid "Embedding disabled" msgstr "" -#: ../../include/dir_fns.php:140 ../../Zotlabs/Lib/Libzotdir.php:160 +#: ../../include/dir_fns.php:140 ../../Zotlabs/Lib/Libzotdir.php:162 msgid "Directory Options" msgstr "" -#: ../../include/dir_fns.php:142 ../../Zotlabs/Lib/Libzotdir.php:162 +#: ../../include/dir_fns.php:142 ../../Zotlabs/Lib/Libzotdir.php:164 msgid "Safe Mode" msgstr "" -#: ../../include/dir_fns.php:143 ../../Zotlabs/Lib/Libzotdir.php:163 +#: ../../include/dir_fns.php:143 ../../Zotlabs/Lib/Libzotdir.php:165 msgid "Public Forums Only" msgstr "" -#: ../../include/dir_fns.php:144 ../../Zotlabs/Lib/Libzotdir.php:165 +#: ../../include/dir_fns.php:144 ../../Zotlabs/Lib/Libzotdir.php:167 msgid "This Website Only" msgstr "" -#: ../../include/zid.php:364 +#: ../../include/zid.php:360 #, php-format msgid "OpenWebAuth: %1$s welcomes %2$s" msgstr "" @@ -7298,13 +7311,13 @@ msgid "Page name" msgstr "" #: ../../Zotlabs/Widget/Album.php:78 ../../Zotlabs/Widget/Portfolio.php:87 -#: ../../Zotlabs/Module/Embedphotos.php:170 ../../Zotlabs/Module/Photos.php:786 -#: ../../Zotlabs/Module/Photos.php:1332 +#: ../../Zotlabs/Module/Embedphotos.php:170 ../../Zotlabs/Module/Photos.php:787 +#: ../../Zotlabs/Module/Photos.php:1333 msgid "View Photo" msgstr "" #: ../../Zotlabs/Widget/Album.php:95 ../../Zotlabs/Widget/Portfolio.php:108 -#: ../../Zotlabs/Module/Embedphotos.php:186 ../../Zotlabs/Module/Photos.php:817 +#: ../../Zotlabs/Module/Embedphotos.php:186 ../../Zotlabs/Module/Photos.php:818 msgid "Edit Album" msgstr "" @@ -7312,8 +7325,8 @@ msgstr "" #: ../../Zotlabs/Widget/Cdav.php:182 ../../Zotlabs/Widget/Portfolio.php:110 #: ../../Zotlabs/Module/Embedphotos.php:188 #: ../../Zotlabs/Module/Profile_photo.php:500 -#: ../../Zotlabs/Module/Cover_photo.php:423 ../../Zotlabs/Module/Photos.php:687 -#: ../../Zotlabs/Storage/Browser.php:398 +#: ../../Zotlabs/Module/Cover_photo.php:423 ../../Zotlabs/Module/Photos.php:688 +#: ../../Zotlabs/Storage/Browser.php:533 msgid "Upload" msgstr "" @@ -7428,7 +7441,7 @@ msgid "Channel Calendar" msgstr "" #: ../../Zotlabs/Widget/Cdav.php:129 ../../Zotlabs/Widget/Cdav.php:143 -#: ../../Zotlabs/Module/Cdav.php:1051 +#: ../../Zotlabs/Module/Cdav.php:1055 msgid "CalDAV Calendars" msgstr "" @@ -7449,13 +7462,13 @@ msgid "Create new CalDAV calendar" msgstr "" #: ../../Zotlabs/Widget/Cdav.php:140 ../../Zotlabs/Widget/Cdav.php:178 -#: ../../Zotlabs/Module/Cdav.php:1055 ../../Zotlabs/Module/Cdav.php:1383 +#: ../../Zotlabs/Module/Cdav.php:1059 ../../Zotlabs/Module/Cdav.php:1387 #: ../../Zotlabs/Module/Webpages.php:254 #: ../../Zotlabs/Module/New_channel.php:189 ../../Zotlabs/Module/Cards.php:113 #: ../../Zotlabs/Module/Blocks.php:159 ../../Zotlabs/Module/Profiles.php:800 #: ../../Zotlabs/Module/Articles.php:117 ../../Zotlabs/Module/Menu.php:182 -#: ../../Zotlabs/Module/Connedit.php:941 ../../Zotlabs/Module/Layouts.php:185 -#: ../../Zotlabs/Storage/Browser.php:282 ../../Zotlabs/Storage/Browser.php:396 +#: ../../Zotlabs/Module/Connedit.php:930 ../../Zotlabs/Module/Layouts.php:185 +#: ../../Zotlabs/Storage/Browser.php:358 ../../Zotlabs/Storage/Browser.php:531 msgid "Create" msgstr "" @@ -7467,7 +7480,7 @@ msgstr "" msgid "Calendar Tools" msgstr "" -#: ../../Zotlabs/Widget/Cdav.php:143 ../../Zotlabs/Module/Cdav.php:1051 +#: ../../Zotlabs/Widget/Cdav.php:143 ../../Zotlabs/Module/Cdav.php:1055 msgid "Channel Calendars" msgstr "" @@ -7604,7 +7617,7 @@ msgstr "" msgid "photo/image" msgstr "" -#: ../../Zotlabs/Widget/Admin.php:22 ../../Zotlabs/Module/Admin/Site.php:286 +#: ../../Zotlabs/Widget/Admin.php:22 ../../Zotlabs/Module/Admin/Site.php:292 msgid "Site" msgstr "" @@ -7864,25 +7877,25 @@ msgid "View public stream" msgstr "" #: ../../Zotlabs/Widget/Newmember.php:75 -#: ../../Zotlabs/Module/Settings/Display.php:206 +#: ../../Zotlabs/Module/Settings/Display.php:203 msgid "New Member Links" msgstr "" -#: ../../Zotlabs/Widget/Affinity.php:30 ../../Zotlabs/Module/Connedit.php:726 +#: ../../Zotlabs/Widget/Affinity.php:30 ../../Zotlabs/Module/Connedit.php:715 msgid "Me" msgstr "" -#: ../../Zotlabs/Widget/Affinity.php:31 ../../Zotlabs/Module/Connedit.php:727 +#: ../../Zotlabs/Widget/Affinity.php:31 ../../Zotlabs/Module/Connedit.php:716 msgid "Family" msgstr "" -#: ../../Zotlabs/Widget/Affinity.php:33 ../../Zotlabs/Module/Connedit.php:729 +#: ../../Zotlabs/Widget/Affinity.php:33 ../../Zotlabs/Module/Connedit.php:718 msgid "Acquaintances" msgstr "" #: ../../Zotlabs/Widget/Affinity.php:34 ../../Zotlabs/Module/Connections.php:97 #: ../../Zotlabs/Module/Connections.php:111 -#: ../../Zotlabs/Module/Connedit.php:730 +#: ../../Zotlabs/Module/Connedit.php:719 msgid "All" msgstr "" @@ -8026,7 +8039,7 @@ msgid "New Registrations Notifications" msgstr "" #: ../../Zotlabs/Widget/Notifications.php:162 -#: ../../Zotlabs/Module/Pubstream.php:114 ../../Zotlabs/Lib/Apps.php:375 +#: ../../Zotlabs/Module/Pubstream.php:105 ../../Zotlabs/Lib/Apps.php:375 msgid "Public Stream" msgstr "" @@ -8093,27 +8106,27 @@ msgstr "" msgid "Expires (yyyy-mm-dd)" msgstr "" -#: ../../Zotlabs/Module/Tokens.php:180 ../../Zotlabs/Module/Connedit.php:910 +#: ../../Zotlabs/Module/Tokens.php:180 ../../Zotlabs/Module/Connedit.php:899 msgid "Their Settings" msgstr "" #: ../../Zotlabs/Module/Tokens.php:181 ../../Zotlabs/Module/Permcats.php:122 -#: ../../Zotlabs/Module/Defperms.php:267 ../../Zotlabs/Module/Connedit.php:911 +#: ../../Zotlabs/Module/Defperms.php:267 ../../Zotlabs/Module/Connedit.php:900 msgid "My Settings" msgstr "" #: ../../Zotlabs/Module/Tokens.php:183 ../../Zotlabs/Module/Permcats.php:124 -#: ../../Zotlabs/Module/Defperms.php:265 ../../Zotlabs/Module/Connedit.php:906 +#: ../../Zotlabs/Module/Defperms.php:265 ../../Zotlabs/Module/Connedit.php:895 msgid "inherited" msgstr "" #: ../../Zotlabs/Module/Tokens.php:186 ../../Zotlabs/Module/Permcats.php:127 -#: ../../Zotlabs/Module/Defperms.php:270 ../../Zotlabs/Module/Connedit.php:913 +#: ../../Zotlabs/Module/Defperms.php:270 ../../Zotlabs/Module/Connedit.php:902 msgid "Individual Permissions" msgstr "" #: ../../Zotlabs/Module/Tokens.php:187 ../../Zotlabs/Module/Permcats.php:128 -#: ../../Zotlabs/Module/Connedit.php:914 +#: ../../Zotlabs/Module/Connedit.php:903 msgid "" "Some permissions may be inherited from your channel's <a href=\"settings" "\"><strong>privacy settings</strong></a>, which have higher priority than " @@ -8130,10 +8143,11 @@ msgid "Item not found" msgstr "" #: ../../Zotlabs/Module/Article_edit.php:44 +#: ../../Zotlabs/Module/Attach_edit.php:52 #: ../../Zotlabs/Module/Wall_upload.php:31 #: ../../Zotlabs/Module/Card_edit.php:44 ../../Zotlabs/Module/Chanview.php:95 -#: ../../Zotlabs/Module/Cal.php:31 ../../Zotlabs/Module/Page.php:75 -#: ../../Zotlabs/Module/Block.php:41 +#: ../../Zotlabs/Module/Cal.php:31 ../../Zotlabs/Module/Attach.php:21 +#: ../../Zotlabs/Module/Page.php:75 ../../Zotlabs/Module/Block.php:41 msgid "Channel not found." msgstr "" @@ -8141,29 +8155,43 @@ msgstr "" msgid "Edit Article" msgstr "" -#: ../../Zotlabs/Module/Network.php:110 +#: ../../Zotlabs/Module/Attach_edit.php:69 +#: ../../Zotlabs/Module/Filestorage.php:109 +msgid "File not found." +msgstr "" + +#: ../../Zotlabs/Module/Attach_edit.php:118 +msgid "Can not copy folder into itself." +msgstr "" + +#: ../../Zotlabs/Module/Attach_edit.php:131 +#, php-format +msgid "Can not move folder \"%s\" into itself." +msgstr "" + +#: ../../Zotlabs/Module/Network.php:105 msgid "No such group" msgstr "" -#: ../../Zotlabs/Module/Network.php:157 +#: ../../Zotlabs/Module/Network.php:152 msgid "No such channel" msgstr "" -#: ../../Zotlabs/Module/Network.php:169 ../../Zotlabs/Module/Channel.php:195 +#: ../../Zotlabs/Module/Network.php:164 ../../Zotlabs/Module/Channel.php:189 msgid "Search Results For:" msgstr "" -#: ../../Zotlabs/Module/Network.php:210 ../../Zotlabs/Module/Channel.php:230 -#: ../../Zotlabs/Module/Hq.php:134 ../../Zotlabs/Module/Pubstream.php:99 -#: ../../Zotlabs/Module/Display.php:79 +#: ../../Zotlabs/Module/Network.php:205 ../../Zotlabs/Module/Channel.php:224 +#: ../../Zotlabs/Module/Hq.php:125 ../../Zotlabs/Module/Pubstream.php:95 +#: ../../Zotlabs/Module/Display.php:76 msgid "Reset form" msgstr "" -#: ../../Zotlabs/Module/Network.php:246 +#: ../../Zotlabs/Module/Network.php:239 msgid "Privacy group is empty" msgstr "" -#: ../../Zotlabs/Module/Network.php:256 +#: ../../Zotlabs/Module/Network.php:249 msgid "Privacy group: " msgstr "" @@ -8198,7 +8226,7 @@ msgid "Use this form to import existing posts and content from an export file." msgstr "" #: ../../Zotlabs/Module/Import_items.php:127 -#: ../../Zotlabs/Module/Import.php:632 +#: ../../Zotlabs/Module/Import.php:628 msgid "File to Upload" msgstr "" @@ -8211,42 +8239,42 @@ msgstr "" msgid "No channel. Import failed." msgstr "" -#: ../../Zotlabs/Module/Import.php:625 +#: ../../Zotlabs/Module/Import.php:621 msgid "You must be logged in to use this feature." msgstr "" -#: ../../Zotlabs/Module/Import.php:630 +#: ../../Zotlabs/Module/Import.php:626 msgid "Import Channel" msgstr "" -#: ../../Zotlabs/Module/Import.php:631 +#: ../../Zotlabs/Module/Import.php:627 msgid "" "Use this form to import an existing channel from a different server/hub. You " "may retrieve the channel identity from the old server/hub via the network or " "provide an export file." msgstr "" -#: ../../Zotlabs/Module/Import.php:633 +#: ../../Zotlabs/Module/Import.php:629 msgid "Or provide the old server/hub details" msgstr "" -#: ../../Zotlabs/Module/Import.php:635 +#: ../../Zotlabs/Module/Import.php:631 msgid "Your old identity address (xyz@example.com)" msgstr "" -#: ../../Zotlabs/Module/Import.php:636 +#: ../../Zotlabs/Module/Import.php:632 msgid "Your old login email address" msgstr "" -#: ../../Zotlabs/Module/Import.php:637 +#: ../../Zotlabs/Module/Import.php:633 msgid "Your old login password" msgstr "" -#: ../../Zotlabs/Module/Import.php:638 +#: ../../Zotlabs/Module/Import.php:634 msgid "Import a few months of posts if possible (limited by available memory" msgstr "" -#: ../../Zotlabs/Module/Import.php:640 +#: ../../Zotlabs/Module/Import.php:636 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 " @@ -8254,25 +8282,25 @@ msgid "" "location for files, photos, and media." msgstr "" -#: ../../Zotlabs/Module/Import.php:642 +#: ../../Zotlabs/Module/Import.php:638 msgid "Make this hub my primary location" msgstr "" -#: ../../Zotlabs/Module/Import.php:643 +#: ../../Zotlabs/Module/Import.php:639 msgid "Move this channel (disable all previous locations)" msgstr "" -#: ../../Zotlabs/Module/Import.php:644 +#: ../../Zotlabs/Module/Import.php:640 msgid "Use this channel nickname instead of the one provided" msgstr "" -#: ../../Zotlabs/Module/Import.php:644 +#: ../../Zotlabs/Module/Import.php:640 msgid "" "Leave blank to keep your existing channel nickname. You will be randomly " "assigned a similar nickname if either name is already allocated on this site." msgstr "" -#: ../../Zotlabs/Module/Import.php:646 +#: ../../Zotlabs/Module/Import.php:642 msgid "" "This process may take several minutes to complete. Please submit the form " "only once and leave this page open until finished." @@ -8427,7 +8455,7 @@ msgid "yes" msgstr "" #: ../../Zotlabs/Module/Register.php:277 -#: ../../Zotlabs/Module/Admin/Site.php:288 +#: ../../Zotlabs/Module/Admin/Site.php:294 msgid "Registration" msgstr "" @@ -8439,18 +8467,18 @@ msgstr "" #: ../../Zotlabs/Module/Search.php:17 #: ../../Zotlabs/Module/Viewconnections.php:23 -#: ../../Zotlabs/Module/Ratings.php:83 ../../Zotlabs/Module/Display.php:29 +#: ../../Zotlabs/Module/Ratings.php:83 ../../Zotlabs/Module/Display.php:26 #: ../../Zotlabs/Module/Directory.php:71 ../../Zotlabs/Module/Directory.php:76 -#: ../../Zotlabs/Module/Photos.php:518 +#: ../../Zotlabs/Module/Photos.php:519 msgid "Public access denied." msgstr "" -#: ../../Zotlabs/Module/Search.php:231 +#: ../../Zotlabs/Module/Search.php:222 #, php-format msgid "Items tagged with: %s" msgstr "" -#: ../../Zotlabs/Module/Search.php:233 +#: ../../Zotlabs/Module/Search.php:224 #, php-format msgid "Search results for: %s" msgstr "" @@ -8492,9 +8520,9 @@ msgstr "" msgid "System check" msgstr "" -#: ../../Zotlabs/Module/Setup.php:260 ../../Zotlabs/Module/Cdav.php:1032 +#: ../../Zotlabs/Module/Setup.php:260 ../../Zotlabs/Module/Cdav.php:1036 #: ../../Zotlabs/Module/Events.php:698 ../../Zotlabs/Module/Events.php:707 -#: ../../Zotlabs/Module/Cal.php:206 ../../Zotlabs/Module/Photos.php:955 +#: ../../Zotlabs/Module/Cal.php:206 ../../Zotlabs/Module/Photos.php:956 msgid "Next" msgstr "" @@ -8963,11 +8991,11 @@ msgstr "" msgid "Only posts" msgstr "" -#: ../../Zotlabs/Module/Channel.php:178 +#: ../../Zotlabs/Module/Channel.php:174 msgid "Insufficient permissions. Request redirected to profile page." msgstr "" -#: ../../Zotlabs/Module/Channel.php:465 ../../Zotlabs/Module/Display.php:376 +#: ../../Zotlabs/Module/Channel.php:449 ../../Zotlabs/Module/Display.php:359 msgid "" "You must enable javascript for your browser to be able to view this content." msgstr "" @@ -9134,10 +9162,10 @@ msgid "Key and Secret are required" msgstr "" #: ../../Zotlabs/Module/Oauth.php:53 ../../Zotlabs/Module/Oauth.php:137 -#: ../../Zotlabs/Module/Cdav.php:1049 ../../Zotlabs/Module/Cdav.php:1384 +#: ../../Zotlabs/Module/Cdav.php:1053 ../../Zotlabs/Module/Cdav.php:1388 #: ../../Zotlabs/Module/Admin/Addons.php:457 #: ../../Zotlabs/Module/Profiles.php:801 ../../Zotlabs/Module/Oauth2.php:58 -#: ../../Zotlabs/Module/Oauth2.php:144 ../../Zotlabs/Module/Connedit.php:942 +#: ../../Zotlabs/Module/Oauth2.php:144 ../../Zotlabs/Module/Connedit.php:931 #: ../../Zotlabs/Lib/Apps.php:536 msgid "Update" msgstr "" @@ -9222,15 +9250,15 @@ msgstr "" msgid "This directory server requires an access token" msgstr "" -#: ../../Zotlabs/Module/Hq.php:140 +#: ../../Zotlabs/Module/Hq.php:131 msgid "Welcome to Hubzilla!" msgstr "" -#: ../../Zotlabs/Module/Hq.php:140 +#: ../../Zotlabs/Module/Hq.php:131 msgid "You have got no unseen posts..." msgstr "" -#: ../../Zotlabs/Module/Pin.php:35 ../../Zotlabs/Module/Item.php:448 +#: ../../Zotlabs/Module/Pin.php:35 ../../Zotlabs/Module/Item.php:450 msgid "Unable to locate original post." msgstr "" @@ -9335,7 +9363,7 @@ msgid "Delete event" msgstr "" #: ../../Zotlabs/Module/Channel_calendar.php:393 -#: ../../Zotlabs/Module/Cdav.php:939 ../../Zotlabs/Module/Cal.php:167 +#: ../../Zotlabs/Module/Cdav.php:943 ../../Zotlabs/Module/Cal.php:167 msgid "Link to source" msgstr "" @@ -9349,57 +9377,57 @@ msgstr "" msgid "Failed to remove event" msgstr "" -#: ../../Zotlabs/Module/Like.php:57 +#: ../../Zotlabs/Module/Like.php:93 msgid "Like/Dislike" msgstr "" -#: ../../Zotlabs/Module/Like.php:62 +#: ../../Zotlabs/Module/Like.php:98 msgid "This action is restricted to members." msgstr "" -#: ../../Zotlabs/Module/Like.php:63 +#: ../../Zotlabs/Module/Like.php:99 msgid "" "Please <a href=\"rmagic\">login with your $Projectname ID</a> or <a href=" "\"register\">register as a new $Projectname member</a> to continue." msgstr "" -#: ../../Zotlabs/Module/Like.php:117 ../../Zotlabs/Module/Like.php:143 -#: ../../Zotlabs/Module/Like.php:181 +#: ../../Zotlabs/Module/Like.php:154 ../../Zotlabs/Module/Like.php:180 +#: ../../Zotlabs/Module/Like.php:218 msgid "Invalid request." msgstr "" -#: ../../Zotlabs/Module/Like.php:158 +#: ../../Zotlabs/Module/Like.php:195 msgid "thing" msgstr "" -#: ../../Zotlabs/Module/Like.php:204 +#: ../../Zotlabs/Module/Like.php:241 msgid "Channel unavailable." msgstr "" -#: ../../Zotlabs/Module/Like.php:240 +#: ../../Zotlabs/Module/Like.php:277 msgid "Previous action reversed." msgstr "" -#: ../../Zotlabs/Module/Like.php:426 +#: ../../Zotlabs/Module/Like.php:473 #, php-format msgid "%1$s agrees with %2$s's %3$s" msgstr "" -#: ../../Zotlabs/Module/Like.php:428 +#: ../../Zotlabs/Module/Like.php:475 #, php-format msgid "%1$s doesn't agree with %2$s's %3$s" msgstr "" -#: ../../Zotlabs/Module/Like.php:430 +#: ../../Zotlabs/Module/Like.php:477 #, php-format msgid "%1$s abstains from a decision on %2$s's %3$s" msgstr "" -#: ../../Zotlabs/Module/Like.php:547 +#: ../../Zotlabs/Module/Like.php:592 msgid "Action completed." msgstr "" -#: ../../Zotlabs/Module/Like.php:548 +#: ../../Zotlabs/Module/Like.php:593 msgid "Thank you." msgstr "" @@ -9435,168 +9463,168 @@ msgstr "" msgid "Make this post private" msgstr "" -#: ../../Zotlabs/Module/Cdav.php:814 ../../Zotlabs/Module/Events.php:28 +#: ../../Zotlabs/Module/Cdav.php:818 ../../Zotlabs/Module/Events.php:28 msgid "Calendar entries imported." msgstr "" -#: ../../Zotlabs/Module/Cdav.php:816 ../../Zotlabs/Module/Events.php:30 +#: ../../Zotlabs/Module/Cdav.php:820 ../../Zotlabs/Module/Events.php:30 msgid "No calendar entries found." msgstr "" -#: ../../Zotlabs/Module/Cdav.php:872 +#: ../../Zotlabs/Module/Cdav.php:876 msgid "CardDAV App" msgstr "" -#: ../../Zotlabs/Module/Cdav.php:873 +#: ../../Zotlabs/Module/Cdav.php:877 msgid "CalDAV capable addressbook" msgstr "" -#: ../../Zotlabs/Module/Cdav.php:1005 ../../Zotlabs/Module/Events.php:468 +#: ../../Zotlabs/Module/Cdav.php:1009 ../../Zotlabs/Module/Events.php:468 msgid "Event title" msgstr "" -#: ../../Zotlabs/Module/Cdav.php:1006 ../../Zotlabs/Module/Events.php:474 +#: ../../Zotlabs/Module/Cdav.php:1010 ../../Zotlabs/Module/Events.php:474 msgid "Start date and time" msgstr "" -#: ../../Zotlabs/Module/Cdav.php:1007 +#: ../../Zotlabs/Module/Cdav.php:1011 msgid "End date and time" msgstr "" -#: ../../Zotlabs/Module/Cdav.php:1008 ../../Zotlabs/Module/Events.php:497 +#: ../../Zotlabs/Module/Cdav.php:1012 ../../Zotlabs/Module/Events.php:497 msgid "Timezone:" msgstr "" -#: ../../Zotlabs/Module/Cdav.php:1031 ../../Zotlabs/Module/Events.php:697 +#: ../../Zotlabs/Module/Cdav.php:1035 ../../Zotlabs/Module/Events.php:697 #: ../../Zotlabs/Module/Events.php:706 ../../Zotlabs/Module/Cal.php:205 -#: ../../Zotlabs/Module/Photos.php:946 +#: ../../Zotlabs/Module/Photos.php:947 msgid "Previous" msgstr "" -#: ../../Zotlabs/Module/Cdav.php:1033 ../../Zotlabs/Module/Events.php:708 +#: ../../Zotlabs/Module/Cdav.php:1037 ../../Zotlabs/Module/Events.php:708 #: ../../Zotlabs/Module/Cal.php:207 msgid "Today" msgstr "" -#: ../../Zotlabs/Module/Cdav.php:1034 ../../Zotlabs/Module/Events.php:703 +#: ../../Zotlabs/Module/Cdav.php:1038 ../../Zotlabs/Module/Events.php:703 msgid "Month" msgstr "" -#: ../../Zotlabs/Module/Cdav.php:1035 ../../Zotlabs/Module/Events.php:704 +#: ../../Zotlabs/Module/Cdav.php:1039 ../../Zotlabs/Module/Events.php:704 msgid "Week" msgstr "" -#: ../../Zotlabs/Module/Cdav.php:1036 ../../Zotlabs/Module/Events.php:705 +#: ../../Zotlabs/Module/Cdav.php:1040 ../../Zotlabs/Module/Events.php:705 msgid "Day" msgstr "" -#: ../../Zotlabs/Module/Cdav.php:1037 +#: ../../Zotlabs/Module/Cdav.php:1041 msgid "List month" msgstr "" -#: ../../Zotlabs/Module/Cdav.php:1038 +#: ../../Zotlabs/Module/Cdav.php:1042 msgid "List week" msgstr "" -#: ../../Zotlabs/Module/Cdav.php:1039 +#: ../../Zotlabs/Module/Cdav.php:1043 msgid "List day" msgstr "" -#: ../../Zotlabs/Module/Cdav.php:1047 +#: ../../Zotlabs/Module/Cdav.php:1051 msgid "More" msgstr "" -#: ../../Zotlabs/Module/Cdav.php:1048 +#: ../../Zotlabs/Module/Cdav.php:1052 msgid "Less" msgstr "" -#: ../../Zotlabs/Module/Cdav.php:1050 +#: ../../Zotlabs/Module/Cdav.php:1054 msgid "Select calendar" msgstr "" -#: ../../Zotlabs/Module/Cdav.php:1053 +#: ../../Zotlabs/Module/Cdav.php:1057 msgid "Delete all" msgstr "" -#: ../../Zotlabs/Module/Cdav.php:1056 +#: ../../Zotlabs/Module/Cdav.php:1060 msgid "Sorry! Editing of recurrent events is not yet implemented." msgstr "" -#: ../../Zotlabs/Module/Cdav.php:1369 ../../Zotlabs/Module/Connedit.php:927 +#: ../../Zotlabs/Module/Cdav.php:1373 ../../Zotlabs/Module/Connedit.php:916 msgid "Organisation" msgstr "" -#: ../../Zotlabs/Module/Cdav.php:1371 ../../Zotlabs/Module/Profiles.php:788 -#: ../../Zotlabs/Module/Connedit.php:929 +#: ../../Zotlabs/Module/Cdav.php:1375 ../../Zotlabs/Module/Profiles.php:788 +#: ../../Zotlabs/Module/Connedit.php:918 msgid "Phone" msgstr "" -#: ../../Zotlabs/Module/Cdav.php:1373 ../../Zotlabs/Module/Profiles.php:790 -#: ../../Zotlabs/Module/Connedit.php:931 +#: ../../Zotlabs/Module/Cdav.php:1377 ../../Zotlabs/Module/Profiles.php:790 +#: ../../Zotlabs/Module/Connedit.php:920 msgid "Instant messenger" msgstr "" -#: ../../Zotlabs/Module/Cdav.php:1374 ../../Zotlabs/Module/Profiles.php:791 -#: ../../Zotlabs/Module/Connedit.php:932 +#: ../../Zotlabs/Module/Cdav.php:1378 ../../Zotlabs/Module/Profiles.php:791 +#: ../../Zotlabs/Module/Connedit.php:921 msgid "Website" msgstr "" -#: ../../Zotlabs/Module/Cdav.php:1375 +#: ../../Zotlabs/Module/Cdav.php:1379 #: ../../Zotlabs/Module/Admin/Channels.php:160 #: ../../Zotlabs/Module/Profiles.php:504 ../../Zotlabs/Module/Profiles.php:792 -#: ../../Zotlabs/Module/Connedit.php:933 ../../Zotlabs/Module/Locs.php:122 +#: ../../Zotlabs/Module/Connedit.php:922 ../../Zotlabs/Module/Locs.php:129 msgid "Address" msgstr "" -#: ../../Zotlabs/Module/Cdav.php:1376 ../../Zotlabs/Module/Profiles.php:793 -#: ../../Zotlabs/Module/Connedit.php:934 +#: ../../Zotlabs/Module/Cdav.php:1380 ../../Zotlabs/Module/Profiles.php:793 +#: ../../Zotlabs/Module/Connedit.php:923 msgid "Note" msgstr "" -#: ../../Zotlabs/Module/Cdav.php:1381 ../../Zotlabs/Module/Profiles.php:798 -#: ../../Zotlabs/Module/Connedit.php:939 +#: ../../Zotlabs/Module/Cdav.php:1385 ../../Zotlabs/Module/Profiles.php:798 +#: ../../Zotlabs/Module/Connedit.php:928 msgid "Add Contact" msgstr "" -#: ../../Zotlabs/Module/Cdav.php:1382 ../../Zotlabs/Module/Profiles.php:799 -#: ../../Zotlabs/Module/Connedit.php:940 +#: ../../Zotlabs/Module/Cdav.php:1386 ../../Zotlabs/Module/Profiles.php:799 +#: ../../Zotlabs/Module/Connedit.php:929 msgid "Add Field" msgstr "" -#: ../../Zotlabs/Module/Cdav.php:1387 ../../Zotlabs/Module/Connedit.php:945 +#: ../../Zotlabs/Module/Cdav.php:1391 ../../Zotlabs/Module/Connedit.php:934 msgid "P.O. Box" msgstr "" -#: ../../Zotlabs/Module/Cdav.php:1388 ../../Zotlabs/Module/Connedit.php:946 +#: ../../Zotlabs/Module/Cdav.php:1392 ../../Zotlabs/Module/Connedit.php:935 msgid "Additional" msgstr "" -#: ../../Zotlabs/Module/Cdav.php:1389 ../../Zotlabs/Module/Connedit.php:947 +#: ../../Zotlabs/Module/Cdav.php:1393 ../../Zotlabs/Module/Connedit.php:936 msgid "Street" msgstr "" -#: ../../Zotlabs/Module/Cdav.php:1390 ../../Zotlabs/Module/Connedit.php:948 +#: ../../Zotlabs/Module/Cdav.php:1394 ../../Zotlabs/Module/Connedit.php:937 msgid "Locality" msgstr "" -#: ../../Zotlabs/Module/Cdav.php:1391 ../../Zotlabs/Module/Connedit.php:949 +#: ../../Zotlabs/Module/Cdav.php:1395 ../../Zotlabs/Module/Connedit.php:938 msgid "Region" msgstr "" -#: ../../Zotlabs/Module/Cdav.php:1392 ../../Zotlabs/Module/Connedit.php:950 +#: ../../Zotlabs/Module/Cdav.php:1396 ../../Zotlabs/Module/Connedit.php:939 msgid "ZIP Code" msgstr "" -#: ../../Zotlabs/Module/Cdav.php:1393 ../../Zotlabs/Module/Profiles.php:759 -#: ../../Zotlabs/Module/Connedit.php:951 +#: ../../Zotlabs/Module/Cdav.php:1397 ../../Zotlabs/Module/Profiles.php:759 +#: ../../Zotlabs/Module/Connedit.php:940 msgid "Country" msgstr "" -#: ../../Zotlabs/Module/Cdav.php:1452 +#: ../../Zotlabs/Module/Cdav.php:1456 msgid "Default Calendar" msgstr "" -#: ../../Zotlabs/Module/Cdav.php:1463 +#: ../../Zotlabs/Module/Cdav.php:1467 msgid "Default Addressbook" msgstr "" @@ -9614,32 +9642,32 @@ msgctxt "acl" msgid "Profile" msgstr "" -#: ../../Zotlabs/Module/Item.php:734 +#: ../../Zotlabs/Module/Item.php:736 msgid "Empty post discarded." msgstr "" -#: ../../Zotlabs/Module/Item.php:1186 +#: ../../Zotlabs/Module/Item.php:1187 msgid "Duplicate post suppressed." msgstr "" -#: ../../Zotlabs/Module/Item.php:1331 +#: ../../Zotlabs/Module/Item.php:1332 msgid "System error. Post not saved." msgstr "" -#: ../../Zotlabs/Module/Item.php:1365 +#: ../../Zotlabs/Module/Item.php:1366 msgid "Your comment is awaiting approval." msgstr "" -#: ../../Zotlabs/Module/Item.php:1482 +#: ../../Zotlabs/Module/Item.php:1496 msgid "Unable to obtain post information from database." msgstr "" -#: ../../Zotlabs/Module/Item.php:1489 +#: ../../Zotlabs/Module/Item.php:1503 #, php-format msgid "You have reached your limit of %1$.0f top level posts." msgstr "" -#: ../../Zotlabs/Module/Item.php:1496 +#: ../../Zotlabs/Module/Item.php:1510 #, php-format msgid "You have reached your limit of %1$.0f webpages." msgstr "" @@ -9783,7 +9811,7 @@ msgid "NEW" msgstr "" #: ../../Zotlabs/Module/Sharedwithme.php:109 -#: ../../Zotlabs/Storage/Browser.php:294 +#: ../../Zotlabs/Storage/Browser.php:373 msgid "Last Modified" msgstr "" @@ -9885,44 +9913,47 @@ msgstr "" msgid "Import complete." msgstr "" -#: ../../Zotlabs/Module/Filestorage.php:103 -msgid "File not found." +#: ../../Zotlabs/Module/Filestorage.php:14 +#: ../../Zotlabs/Module/Filestorage.php:53 +msgid "Deprecated!" msgstr "" -#: ../../Zotlabs/Module/Filestorage.php:152 +#: ../../Zotlabs/Module/Filestorage.php:157 msgid "Permission Denied." msgstr "" -#: ../../Zotlabs/Module/Filestorage.php:185 +#: ../../Zotlabs/Module/Filestorage.php:190 msgid "Edit file permissions" msgstr "" -#: ../../Zotlabs/Module/Filestorage.php:198 +#: ../../Zotlabs/Module/Filestorage.php:203 msgid "Include all files and sub folders" msgstr "" -#: ../../Zotlabs/Module/Filestorage.php:199 +#: ../../Zotlabs/Module/Filestorage.php:204 msgid "Return to file list" msgstr "" -#: ../../Zotlabs/Module/Filestorage.php:201 +#: ../../Zotlabs/Module/Filestorage.php:206 +#: ../../Zotlabs/Storage/Browser.php:379 msgid "Copy/paste this code to attach file to a post" msgstr "" -#: ../../Zotlabs/Module/Filestorage.php:202 +#: ../../Zotlabs/Module/Filestorage.php:207 +#: ../../Zotlabs/Storage/Browser.php:380 msgid "Copy/paste this URL to link file from a web page" msgstr "" -#: ../../Zotlabs/Module/Filestorage.php:204 +#: ../../Zotlabs/Module/Filestorage.php:209 msgid "Share this file" msgstr "" -#: ../../Zotlabs/Module/Filestorage.php:205 +#: ../../Zotlabs/Module/Filestorage.php:210 msgid "Show URL to this file" msgstr "" -#: ../../Zotlabs/Module/Filestorage.php:206 -#: ../../Zotlabs/Storage/Browser.php:411 +#: ../../Zotlabs/Module/Filestorage.php:211 +#: ../../Zotlabs/Storage/Browser.php:545 msgid "Show in your contacts shared folder" msgstr "" @@ -9981,19 +10012,19 @@ msgstr "" msgid "Restricted or Premium Channel" msgstr "" -#: ../../Zotlabs/Module/Cloud.php:116 +#: ../../Zotlabs/Module/Cloud.php:120 msgid "Not found" msgstr "" -#: ../../Zotlabs/Module/Cloud.php:122 +#: ../../Zotlabs/Module/Cloud.php:126 msgid "Please refresh page" msgstr "" -#: ../../Zotlabs/Module/Cloud.php:125 +#: ../../Zotlabs/Module/Cloud.php:129 msgid "Unknown error" msgstr "" -#: ../../Zotlabs/Module/Share.php:104 ../../Zotlabs/Lib/Activity.php:2119 +#: ../../Zotlabs/Module/Share.php:104 ../../Zotlabs/Lib/Activity.php:2133 #, php-format msgid "🔁 Repeated %1$s's %2$s" msgstr "" @@ -10002,7 +10033,7 @@ msgstr "" msgid "Post repeated" msgstr "" -#: ../../Zotlabs/Module/Acl.php:361 +#: ../../Zotlabs/Module/Acl.php:368 msgid "network" msgstr "" @@ -10010,7 +10041,7 @@ msgstr "" msgid "Item is not editable" msgstr "" -#: ../../Zotlabs/Module/Editpost.php:109 ../../Zotlabs/Module/Rpost.php:144 +#: ../../Zotlabs/Module/Editpost.php:109 ../../Zotlabs/Module/Rpost.php:150 msgid "Edit post" msgstr "" @@ -10095,7 +10126,7 @@ msgstr "" #: ../../Zotlabs/Module/Admin/Themes.php:156 #: ../../Zotlabs/Module/Admin/Security.php:98 #: ../../Zotlabs/Module/Admin/Accounts.php:166 -#: ../../Zotlabs/Module/Admin/Site.php:285 +#: ../../Zotlabs/Module/Admin/Site.php:291 #: ../../Zotlabs/Module/Admin/Logs.php:82 #: ../../Zotlabs/Module/Admin/Channels.php:145 #: ../../Zotlabs/Module/Admin/Addons.php:342 @@ -10313,12 +10344,12 @@ msgid "No registrations." msgstr "" #: ../../Zotlabs/Module/Admin/Accounts.php:176 -#: ../../Zotlabs/Module/Connedit.php:639 +#: ../../Zotlabs/Module/Connedit.php:628 msgid "Block" msgstr "" #: ../../Zotlabs/Module/Admin/Accounts.php:177 -#: ../../Zotlabs/Module/Connedit.php:639 +#: ../../Zotlabs/Module/Connedit.php:628 msgid "Unblock" msgstr "" @@ -10358,420 +10389,430 @@ msgid "" "this site will be permanently deleted!\\n\\nAre you sure?" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:159 +#: ../../Zotlabs/Module/Admin/Site.php:165 msgid "Site settings updated." msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:196 -#: ../../Zotlabs/Module/Settings/Display.php:120 +#: ../../Zotlabs/Module/Admin/Site.php:202 +#: ../../Zotlabs/Module/Settings/Display.php:118 #, php-format msgid "%s - (Incompatible)" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:203 +#: ../../Zotlabs/Module/Admin/Site.php:209 msgid "mobile" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:205 +#: ../../Zotlabs/Module/Admin/Site.php:211 msgid "experimental" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:207 +#: ../../Zotlabs/Module/Admin/Site.php:213 msgid "unsupported" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:254 +#: ../../Zotlabs/Module/Admin/Site.php:260 msgid "Yes - with approval" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:260 +#: ../../Zotlabs/Module/Admin/Site.php:266 msgid "My site is not a public server" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:261 +#: ../../Zotlabs/Module/Admin/Site.php:267 msgid "My site has paid access only" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:262 +#: ../../Zotlabs/Module/Admin/Site.php:268 msgid "My site has free access only" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:263 +#: ../../Zotlabs/Module/Admin/Site.php:269 msgid "My site offers free accounts with optional paid upgrades" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:277 +#: ../../Zotlabs/Module/Admin/Site.php:283 msgid "Default permission role for new accounts" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:277 +#: ../../Zotlabs/Module/Admin/Site.php:283 msgid "" "This role will be used for the first channel created after registration." msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:289 +#: ../../Zotlabs/Module/Admin/Site.php:295 msgid "File upload" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:290 +#: ../../Zotlabs/Module/Admin/Site.php:296 msgid "Policies" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:297 +#: ../../Zotlabs/Module/Admin/Site.php:303 msgid "Banner/Logo" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:297 +#: ../../Zotlabs/Module/Admin/Site.php:303 msgid "Unfiltered HTML/CSS/JS is allowed" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:298 +#: ../../Zotlabs/Module/Admin/Site.php:304 msgid "Administrator Information" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:298 +#: ../../Zotlabs/Module/Admin/Site.php:304 msgid "" "Contact information for site administrators. Displayed on siteinfo page. " "BBCode can be used here" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:299 ../../Zotlabs/Module/Siteinfo.php:24 +#: ../../Zotlabs/Module/Admin/Site.php:305 ../../Zotlabs/Module/Siteinfo.php:24 msgid "Site Information" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:299 +#: ../../Zotlabs/Module/Admin/Site.php:305 msgid "" "Publicly visible description of this site. Displayed on siteinfo page. " "BBCode can be used here" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:300 +#: ../../Zotlabs/Module/Admin/Site.php:306 msgid "System language" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:301 +#: ../../Zotlabs/Module/Admin/Site.php:307 msgid "System theme" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:301 +#: ../../Zotlabs/Module/Admin/Site.php:307 msgid "" "Default system theme - may be over-ridden by user profiles - <a href='#' " "id='cnftheme'>change theme settings</a>" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:304 +#: ../../Zotlabs/Module/Admin/Site.php:310 msgid "Allow Feeds as Connections" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:304 +#: ../../Zotlabs/Module/Admin/Site.php:310 msgid "(Heavy system resource usage)" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:305 +#: ../../Zotlabs/Module/Admin/Site.php:311 msgid "Maximum image size" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:305 +#: ../../Zotlabs/Module/Admin/Site.php:311 msgid "" "Maximum size in bytes of uploaded images. Default is 0, which means no " "limits." msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:306 +#: ../../Zotlabs/Module/Admin/Site.php:312 msgid "Does this site allow new member registration?" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:307 +#: ../../Zotlabs/Module/Admin/Site.php:313 msgid "Invitation only" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:307 +#: ../../Zotlabs/Module/Admin/Site.php:313 msgid "" "Only allow new member registrations with an invitation code. Above register " "policy must be set to Yes." msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:308 +#: ../../Zotlabs/Module/Admin/Site.php:314 msgid "Minimum age" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:308 +#: ../../Zotlabs/Module/Admin/Site.php:314 msgid "Minimum age (in years) for who may register on this site." msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:309 +#: ../../Zotlabs/Module/Admin/Site.php:315 msgid "Which best describes the types of account offered by this hub?" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:309 +#: ../../Zotlabs/Module/Admin/Site.php:315 msgid "This is displayed on the public server site list." msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:310 +#: ../../Zotlabs/Module/Admin/Site.php:316 msgid "Register text" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:310 +#: ../../Zotlabs/Module/Admin/Site.php:316 msgid "Will be displayed prominently on the registration page." msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:312 +#: ../../Zotlabs/Module/Admin/Site.php:318 msgid "Site homepage to show visitors (default: login box)" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:312 +#: ../../Zotlabs/Module/Admin/Site.php:318 msgid "" "example: 'pubstream' to show public stream, 'page/sys/home' to show a system " "webpage called 'home' or 'include:home.html' to include a file." msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:313 +#: ../../Zotlabs/Module/Admin/Site.php:319 msgid "Preserve site homepage URL" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:313 +#: ../../Zotlabs/Module/Admin/Site.php:319 msgid "" "Present the site homepage in a frame at the original location instead of " "redirecting" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:314 +#: ../../Zotlabs/Module/Admin/Site.php:320 msgid "Accounts abandoned after x days" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:314 +#: ../../Zotlabs/Module/Admin/Site.php:320 msgid "" "Will not waste system resources polling external sites for abandonded " "accounts. Enter 0 for no time limit." msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:315 +#: ../../Zotlabs/Module/Admin/Site.php:321 msgid "Allowed friend domains" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:315 +#: ../../Zotlabs/Module/Admin/Site.php:321 msgid "" "Comma separated list of domains which are allowed to establish friendships " "with this site. Wildcards are accepted. Empty to allow any domains" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:316 +#: ../../Zotlabs/Module/Admin/Site.php:322 msgid "Verify Email Addresses" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:316 +#: ../../Zotlabs/Module/Admin/Site.php:322 msgid "" "Check to verify email addresses used in account registration (recommended)." msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:317 +#: ../../Zotlabs/Module/Admin/Site.php:323 msgid "Force publish" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:317 +#: ../../Zotlabs/Module/Admin/Site.php:323 msgid "" "Check to force all profiles on this site to be listed in the site directory." msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:318 +#: ../../Zotlabs/Module/Admin/Site.php:324 msgid "Import Public Streams" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:318 +#: ../../Zotlabs/Module/Admin/Site.php:324 msgid "" "Import and allow access to public content pulled from other sites. Warning: " "this content is unmoderated." msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:319 +#: ../../Zotlabs/Module/Admin/Site.php:325 msgid "Site only Public Streams" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:319 +#: ../../Zotlabs/Module/Admin/Site.php:325 msgid "" "Allow access to public content originating only from this site if Imported " "Public Streams are disabled." msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:320 +#: ../../Zotlabs/Module/Admin/Site.php:326 msgid "Allow anybody on the internet to access the Public streams" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:320 +#: ../../Zotlabs/Module/Admin/Site.php:326 msgid "" "Disable to require authentication before viewing. Warning: this content is " "unmoderated." msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:321 +#: ../../Zotlabs/Module/Admin/Site.php:327 msgid "Only import Public stream posts with this text" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:321 -#: ../../Zotlabs/Module/Admin/Site.php:322 -#: ../../Zotlabs/Module/Connedit.php:895 ../../Zotlabs/Module/Connedit.php:896 +#: ../../Zotlabs/Module/Admin/Site.php:327 +#: ../../Zotlabs/Module/Admin/Site.php:328 +#: ../../Zotlabs/Module/Connedit.php:884 ../../Zotlabs/Module/Connedit.php:885 msgid "" "words one per line or #tags or /patterns/ or lang=xx, leave blank to import " "all posts" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:322 +#: ../../Zotlabs/Module/Admin/Site.php:328 msgid "Do not import Public stream posts with this text" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:325 +#: ../../Zotlabs/Module/Admin/Site.php:331 msgid "Login on Homepage" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:325 +#: ../../Zotlabs/Module/Admin/Site.php:331 msgid "" "Present a login box to visitors on the home page if no other content has " "been configured." msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:326 +#: ../../Zotlabs/Module/Admin/Site.php:332 msgid "Enable context help" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:326 +#: ../../Zotlabs/Module/Admin/Site.php:332 msgid "" "Display contextual help for the current page when the help button is pressed." msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:328 +#: ../../Zotlabs/Module/Admin/Site.php:334 msgid "Reply-to email address for system generated email." msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:329 +#: ../../Zotlabs/Module/Admin/Site.php:335 msgid "Sender (From) email address for system generated email." msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:330 +#: ../../Zotlabs/Module/Admin/Site.php:336 msgid "Name of email sender for system generated email." msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:332 +#: ../../Zotlabs/Module/Admin/Site.php:338 msgid "Directory Server URL" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:332 +#: ../../Zotlabs/Module/Admin/Site.php:338 msgid "Default directory server" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:334 +#: ../../Zotlabs/Module/Admin/Site.php:340 +msgid "Enable SSE Notifications" +msgstr "" + +#: ../../Zotlabs/Module/Admin/Site.php:340 +msgid "" +"If disabled, traditional polling will be used. Warning: this setting might " +"not be suited for shared hosting" +msgstr "" + +#: ../../Zotlabs/Module/Admin/Site.php:342 msgid "Proxy user" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:335 +#: ../../Zotlabs/Module/Admin/Site.php:343 msgid "Proxy URL" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:336 +#: ../../Zotlabs/Module/Admin/Site.php:344 msgid "Network timeout" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:336 +#: ../../Zotlabs/Module/Admin/Site.php:344 msgid "Value is in seconds. Set to 0 for unlimited (not recommended)." msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:337 +#: ../../Zotlabs/Module/Admin/Site.php:345 msgid "Delivery interval" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:337 +#: ../../Zotlabs/Module/Admin/Site.php:345 msgid "" "Delay background delivery processes by this many seconds to reduce system " "load. Recommend: 4-5 for shared hosts, 2-3 for virtual private servers. 0-1 " "for large dedicated servers." msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:338 +#: ../../Zotlabs/Module/Admin/Site.php:346 msgid "Deliveries per process" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:338 +#: ../../Zotlabs/Module/Admin/Site.php:346 msgid "" "Number of deliveries to attempt in a single operating system process. Adjust " "if necessary to tune system performance. Recommend: 1-5." msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:339 +#: ../../Zotlabs/Module/Admin/Site.php:347 msgid "Queue Threshold" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:339 +#: ../../Zotlabs/Module/Admin/Site.php:347 msgid "" "Always defer immediate delivery if queue contains more than this number of " "entries." msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:340 +#: ../../Zotlabs/Module/Admin/Site.php:348 msgid "Poll interval" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:340 +#: ../../Zotlabs/Module/Admin/Site.php:348 msgid "" "Delay background polling processes by this many seconds to reduce system " "load. If 0, use delivery interval." msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:341 +#: ../../Zotlabs/Module/Admin/Site.php:349 msgid "Path to ImageMagick convert program" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:341 +#: ../../Zotlabs/Module/Admin/Site.php:349 msgid "" "If set, use this program to generate photo thumbnails for huge images ( > " "4000 pixels in either dimension), otherwise memory exhaustion may occur. " "Example: /usr/bin/convert" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:342 +#: ../../Zotlabs/Module/Admin/Site.php:350 msgid "Maximum Load Average" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:342 +#: ../../Zotlabs/Module/Admin/Site.php:350 msgid "" "Maximum system load before delivery and poll processes are deferred - " "default 50." msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:343 +#: ../../Zotlabs/Module/Admin/Site.php:351 msgid "Expiration period in days for imported (grid/network) content" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:343 +#: ../../Zotlabs/Module/Admin/Site.php:351 msgid "0 for no expiration of imported content" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:344 +#: ../../Zotlabs/Module/Admin/Site.php:352 msgid "" "Do not expire any posts which have comments less than this many days ago" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:346 +#: ../../Zotlabs/Module/Admin/Site.php:354 msgid "" "Public servers: Optional landing (marketing) webpage for new registrants" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:346 +#: ../../Zotlabs/Module/Admin/Site.php:354 #, php-format msgid "Create this page first. Default is %s/register" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:347 +#: ../../Zotlabs/Module/Admin/Site.php:355 msgid "Page to display after creating a new channel" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:347 +#: ../../Zotlabs/Module/Admin/Site.php:355 msgid "Default: profiles" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:349 +#: ../../Zotlabs/Module/Admin/Site.php:357 msgid "Optional: site location" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:349 +#: ../../Zotlabs/Module/Admin/Site.php:357 msgid "Region or country" msgstr "" @@ -11509,11 +11550,11 @@ msgid "" "or restore these in date order (oldest first)." msgstr "" -#: ../../Zotlabs/Module/Display.php:394 +#: ../../Zotlabs/Module/Display.php:377 msgid "Article" msgstr "" -#: ../../Zotlabs/Module/Display.php:439 +#: ../../Zotlabs/Module/Display.php:422 msgid "Item has been removed." msgstr "" @@ -11617,11 +11658,11 @@ msgstr "" msgid "shared a file with you" msgstr "" -#: ../../Zotlabs/Module/Ping.php:672 ../../Zotlabs/Module/Sse_bs.php:539 +#: ../../Zotlabs/Module/Ping.php:672 ../../Zotlabs/Module/Sse_bs.php:540 msgid "Private forum" msgstr "" -#: ../../Zotlabs/Module/Ping.php:672 ../../Zotlabs/Module/Sse_bs.php:539 +#: ../../Zotlabs/Module/Ping.php:672 ../../Zotlabs/Module/Sse_bs.php:540 msgid "Public forum" msgstr "" @@ -11945,7 +11986,7 @@ msgstr "" msgid "Validation token" msgstr "" -#: ../../Zotlabs/Module/Attach.php:13 +#: ../../Zotlabs/Module/Attach.php:67 msgid "Item not available." msgstr "" @@ -12058,15 +12099,15 @@ msgstr "" msgid "Edit Block" msgstr "" -#: ../../Zotlabs/Module/Filer.php:52 +#: ../../Zotlabs/Module/Filer.php:53 msgid "Enter a folder name" msgstr "" -#: ../../Zotlabs/Module/Filer.php:52 +#: ../../Zotlabs/Module/Filer.php:53 msgid "or select an existing folder (doubleclick)" msgstr "" -#: ../../Zotlabs/Module/Filer.php:54 ../../Zotlabs/Lib/ThreadItem.php:184 +#: ../../Zotlabs/Module/Filer.php:55 ../../Zotlabs/Lib/ThreadItem.php:184 msgid "Save to Folder" msgstr "" @@ -12200,7 +12241,7 @@ msgid "Ignore connection" msgstr "" #: ../../Zotlabs/Module/Connections.php:344 -#: ../../Zotlabs/Module/Connedit.php:647 +#: ../../Zotlabs/Module/Connedit.php:636 msgid "Ignore" msgstr "" @@ -12245,156 +12286,156 @@ msgstr "" msgid "Delete Album" msgstr "" -#: ../../Zotlabs/Module/Photos.php:176 ../../Zotlabs/Module/Photos.php:1058 +#: ../../Zotlabs/Module/Photos.php:176 ../../Zotlabs/Module/Photos.php:1059 msgid "Delete Photo" msgstr "" -#: ../../Zotlabs/Module/Photos.php:529 +#: ../../Zotlabs/Module/Photos.php:530 msgid "No photos selected" msgstr "" -#: ../../Zotlabs/Module/Photos.php:578 +#: ../../Zotlabs/Module/Photos.php:579 msgid "Access to this item is restricted." msgstr "" -#: ../../Zotlabs/Module/Photos.php:621 +#: ../../Zotlabs/Module/Photos.php:622 #, php-format msgid "%1$.2f MB of %2$.2f MB photo storage used." msgstr "" -#: ../../Zotlabs/Module/Photos.php:624 +#: ../../Zotlabs/Module/Photos.php:625 #, php-format msgid "%1$.2f MB photo storage used." msgstr "" -#: ../../Zotlabs/Module/Photos.php:666 +#: ../../Zotlabs/Module/Photos.php:667 msgid "Upload Photos" msgstr "" -#: ../../Zotlabs/Module/Photos.php:670 +#: ../../Zotlabs/Module/Photos.php:671 msgid "Enter an album name" msgstr "" -#: ../../Zotlabs/Module/Photos.php:671 +#: ../../Zotlabs/Module/Photos.php:672 msgid "or select an existing album (doubleclick)" msgstr "" -#: ../../Zotlabs/Module/Photos.php:672 +#: ../../Zotlabs/Module/Photos.php:673 msgid "Create a status post for this upload" msgstr "" -#: ../../Zotlabs/Module/Photos.php:674 +#: ../../Zotlabs/Module/Photos.php:675 msgid "Description (optional)" msgstr "" -#: ../../Zotlabs/Module/Photos.php:760 +#: ../../Zotlabs/Module/Photos.php:761 msgid "Show Newest First" msgstr "" -#: ../../Zotlabs/Module/Photos.php:762 +#: ../../Zotlabs/Module/Photos.php:763 msgid "Show Oldest First" msgstr "" -#: ../../Zotlabs/Module/Photos.php:819 ../../Zotlabs/Module/Photos.php:1363 +#: ../../Zotlabs/Module/Photos.php:820 ../../Zotlabs/Module/Photos.php:1364 msgid "Add Photos" msgstr "" -#: ../../Zotlabs/Module/Photos.php:867 +#: ../../Zotlabs/Module/Photos.php:868 msgid "Permission denied. Access to this item may be restricted." msgstr "" -#: ../../Zotlabs/Module/Photos.php:869 +#: ../../Zotlabs/Module/Photos.php:870 msgid "Photo not available" msgstr "" -#: ../../Zotlabs/Module/Photos.php:927 +#: ../../Zotlabs/Module/Photos.php:928 msgid "Use as profile photo" msgstr "" -#: ../../Zotlabs/Module/Photos.php:928 +#: ../../Zotlabs/Module/Photos.php:929 msgid "Use as cover photo" msgstr "" -#: ../../Zotlabs/Module/Photos.php:935 +#: ../../Zotlabs/Module/Photos.php:936 msgid "Private Photo" msgstr "" -#: ../../Zotlabs/Module/Photos.php:950 +#: ../../Zotlabs/Module/Photos.php:951 msgid "View Full Size" msgstr "" -#: ../../Zotlabs/Module/Photos.php:1032 +#: ../../Zotlabs/Module/Photos.php:1033 msgid "Edit photo" msgstr "" -#: ../../Zotlabs/Module/Photos.php:1034 +#: ../../Zotlabs/Module/Photos.php:1035 msgid "Rotate CW (right)" msgstr "" -#: ../../Zotlabs/Module/Photos.php:1035 +#: ../../Zotlabs/Module/Photos.php:1036 msgid "Rotate CCW (left)" msgstr "" -#: ../../Zotlabs/Module/Photos.php:1038 +#: ../../Zotlabs/Module/Photos.php:1039 msgid "Move photo to album" msgstr "" -#: ../../Zotlabs/Module/Photos.php:1039 +#: ../../Zotlabs/Module/Photos.php:1040 msgid "Enter a new album name" msgstr "" -#: ../../Zotlabs/Module/Photos.php:1040 +#: ../../Zotlabs/Module/Photos.php:1041 msgid "or select an existing one (doubleclick)" msgstr "" -#: ../../Zotlabs/Module/Photos.php:1045 +#: ../../Zotlabs/Module/Photos.php:1046 msgid "Add a Tag" msgstr "" -#: ../../Zotlabs/Module/Photos.php:1053 +#: ../../Zotlabs/Module/Photos.php:1054 msgid "Example: @bob, @Barbara_Jensen, @jim@example.com" msgstr "" -#: ../../Zotlabs/Module/Photos.php:1056 +#: ../../Zotlabs/Module/Photos.php:1057 msgid "Flag as adult in album view" msgstr "" -#: ../../Zotlabs/Module/Photos.php:1075 ../../Zotlabs/Lib/ThreadItem.php:317 +#: ../../Zotlabs/Module/Photos.php:1076 ../../Zotlabs/Lib/ThreadItem.php:317 msgid "I like this (toggle)" msgstr "" -#: ../../Zotlabs/Module/Photos.php:1076 ../../Zotlabs/Lib/ThreadItem.php:318 +#: ../../Zotlabs/Module/Photos.php:1077 ../../Zotlabs/Lib/ThreadItem.php:318 msgid "I don't like this (toggle)" msgstr "" -#: ../../Zotlabs/Module/Photos.php:1094 ../../Zotlabs/Module/Photos.php:1212 +#: ../../Zotlabs/Module/Photos.php:1095 ../../Zotlabs/Module/Photos.php:1213 #: ../../Zotlabs/Lib/ThreadItem.php:822 msgid "This is you" msgstr "" -#: ../../Zotlabs/Module/Photos.php:1131 ../../Zotlabs/Module/Photos.php:1143 +#: ../../Zotlabs/Module/Photos.php:1132 ../../Zotlabs/Module/Photos.php:1144 #: ../../Zotlabs/Lib/ThreadItem.php:238 ../../Zotlabs/Lib/ThreadItem.php:250 msgid "View all" msgstr "" -#: ../../Zotlabs/Module/Photos.php:1246 +#: ../../Zotlabs/Module/Photos.php:1247 msgid "Photo Tools" msgstr "" -#: ../../Zotlabs/Module/Photos.php:1255 +#: ../../Zotlabs/Module/Photos.php:1256 msgid "In This Photo:" msgstr "" -#: ../../Zotlabs/Module/Photos.php:1260 +#: ../../Zotlabs/Module/Photos.php:1261 msgid "Map" msgstr "" -#: ../../Zotlabs/Module/Photos.php:1268 ../../Zotlabs/Lib/ThreadItem.php:489 +#: ../../Zotlabs/Module/Photos.php:1269 ../../Zotlabs/Lib/ThreadItem.php:489 msgctxt "noun" msgid "Likes" msgstr "" -#: ../../Zotlabs/Module/Photos.php:1269 ../../Zotlabs/Lib/ThreadItem.php:490 +#: ../../Zotlabs/Module/Photos.php:1270 ../../Zotlabs/Lib/ThreadItem.php:490 msgctxt "noun" msgid "Dislikes" msgstr "" @@ -12423,7 +12464,7 @@ msgid "" "Password reset failed." msgstr "" -#: ../../Zotlabs/Module/Lostpass.php:91 ../../boot.php:1707 +#: ../../Zotlabs/Module/Lostpass.php:91 ../../boot.php:1708 msgid "Password Reset" msgstr "" @@ -13455,90 +13496,82 @@ msgstr "" msgid "Calendar Settings" msgstr "" -#: ../../Zotlabs/Module/Settings/Display.php:129 +#: ../../Zotlabs/Module/Settings/Display.php:127 #, php-format msgid "%s - (Experimental)" msgstr "" -#: ../../Zotlabs/Module/Settings/Display.php:185 +#: ../../Zotlabs/Module/Settings/Display.php:183 msgid "Display Settings" msgstr "" -#: ../../Zotlabs/Module/Settings/Display.php:186 +#: ../../Zotlabs/Module/Settings/Display.php:184 msgid "Theme Settings" msgstr "" -#: ../../Zotlabs/Module/Settings/Display.php:187 +#: ../../Zotlabs/Module/Settings/Display.php:185 msgid "Custom Theme Settings" msgstr "" -#: ../../Zotlabs/Module/Settings/Display.php:188 +#: ../../Zotlabs/Module/Settings/Display.php:186 msgid "Content Settings" msgstr "" -#: ../../Zotlabs/Module/Settings/Display.php:194 +#: ../../Zotlabs/Module/Settings/Display.php:192 msgid "Display Theme:" msgstr "" -#: ../../Zotlabs/Module/Settings/Display.php:195 +#: ../../Zotlabs/Module/Settings/Display.php:193 msgid "Select scheme" msgstr "" -#: ../../Zotlabs/Module/Settings/Display.php:197 +#: ../../Zotlabs/Module/Settings/Display.php:195 msgid "Preload images before rendering the page" msgstr "" -#: ../../Zotlabs/Module/Settings/Display.php:197 +#: ../../Zotlabs/Module/Settings/Display.php:195 msgid "" "The subjective page load time will be longer but the page will be ready when " "displayed" msgstr "" -#: ../../Zotlabs/Module/Settings/Display.php:198 +#: ../../Zotlabs/Module/Settings/Display.php:196 msgid "Enable user zoom on mobile devices" msgstr "" -#: ../../Zotlabs/Module/Settings/Display.php:199 +#: ../../Zotlabs/Module/Settings/Display.php:197 msgid "Update browser every xx seconds" msgstr "" -#: ../../Zotlabs/Module/Settings/Display.php:199 +#: ../../Zotlabs/Module/Settings/Display.php:197 msgid "Minimum of 10 seconds, no maximum" msgstr "" -#: ../../Zotlabs/Module/Settings/Display.php:200 +#: ../../Zotlabs/Module/Settings/Display.php:198 msgid "Maximum number of conversations to load at any time:" msgstr "" -#: ../../Zotlabs/Module/Settings/Display.php:200 +#: ../../Zotlabs/Module/Settings/Display.php:198 msgid "Maximum of 30 items" msgstr "" -#: ../../Zotlabs/Module/Settings/Display.php:201 +#: ../../Zotlabs/Module/Settings/Display.php:199 msgid "Show emoticons (smilies) as images" msgstr "" -#: ../../Zotlabs/Module/Settings/Display.php:202 +#: ../../Zotlabs/Module/Settings/Display.php:200 msgid "Provide channel menu in navigation bar" msgstr "" -#: ../../Zotlabs/Module/Settings/Display.php:202 +#: ../../Zotlabs/Module/Settings/Display.php:200 msgid "Default: channel menu located in app menu" msgstr "" -#: ../../Zotlabs/Module/Settings/Display.php:203 -msgid "Manual conversation updates" -msgstr "" - -#: ../../Zotlabs/Module/Settings/Display.php:203 -msgid "Default is on, turning this off may increase screen jumping" -msgstr "" - -#: ../../Zotlabs/Module/Settings/Display.php:204 +#: ../../Zotlabs/Module/Settings/Display.php:201 msgid "Link post titles to source" msgstr "" -#: ../../Zotlabs/Module/Settings/Display.php:206 +#: ../../Zotlabs/Module/Settings/Display.php:203 msgid "Display new member quick links menu" msgstr "" @@ -13610,7 +13643,7 @@ msgstr "" msgid "Submit and proceed" msgstr "" -#: ../../Zotlabs/Module/Menu.php:177 ../../Zotlabs/Module/Locs.php:124 +#: ../../Zotlabs/Module/Menu.php:177 ../../Zotlabs/Module/Locs.php:131 msgid "Drop" msgstr "" @@ -13674,23 +13707,23 @@ msgstr "" msgid "Set custom default permissions for new connections" msgstr "" -#: ../../Zotlabs/Module/Defperms.php:255 ../../Zotlabs/Module/Connedit.php:870 +#: ../../Zotlabs/Module/Defperms.php:255 ../../Zotlabs/Module/Connedit.php:859 msgid "Connection Default Permissions" msgstr "" -#: ../../Zotlabs/Module/Defperms.php:256 ../../Zotlabs/Module/Connedit.php:871 +#: ../../Zotlabs/Module/Defperms.php:256 ../../Zotlabs/Module/Connedit.php:860 msgid "Apply these permissions automatically" msgstr "" -#: ../../Zotlabs/Module/Defperms.php:257 ../../Zotlabs/Module/Connedit.php:872 +#: ../../Zotlabs/Module/Defperms.php:257 ../../Zotlabs/Module/Connedit.php:861 msgid "Permission role" msgstr "" -#: ../../Zotlabs/Module/Defperms.php:258 ../../Zotlabs/Module/Connedit.php:873 +#: ../../Zotlabs/Module/Defperms.php:258 ../../Zotlabs/Module/Connedit.php:862 msgid "Add permission role" msgstr "" -#: ../../Zotlabs/Module/Defperms.php:262 ../../Zotlabs/Module/Connedit.php:886 +#: ../../Zotlabs/Module/Defperms.php:262 ../../Zotlabs/Module/Connedit.php:875 msgid "" "The permissions indicated on this page will be applied to all new " "connections." @@ -13951,7 +13984,7 @@ msgstr "" msgid "Error downloading wiki: " msgstr "" -#: ../../Zotlabs/Module/Wiki.php:212 +#: ../../Zotlabs/Module/Wiki.php:212 ../../Zotlabs/Storage/Browser.php:397 msgid "Download" msgstr "" @@ -13963,7 +13996,7 @@ msgstr "" msgid "Content type" msgstr "" -#: ../../Zotlabs/Module/Wiki.php:219 ../../Zotlabs/Storage/Browser.php:292 +#: ../../Zotlabs/Module/Wiki.php:219 ../../Zotlabs/Storage/Browser.php:371 msgid "Type" msgstr "" @@ -14104,232 +14137,232 @@ msgstr "" msgid "Failed to update connection record." msgstr "" -#: ../../Zotlabs/Module/Connedit.php:320 +#: ../../Zotlabs/Module/Connedit.php:309 msgid "is now connected to" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:445 +#: ../../Zotlabs/Module/Connedit.php:434 msgid "Could not access address book record." msgstr "" -#: ../../Zotlabs/Module/Connedit.php:493 ../../Zotlabs/Module/Connedit.php:497 +#: ../../Zotlabs/Module/Connedit.php:482 ../../Zotlabs/Module/Connedit.php:486 msgid "Refresh failed - channel is currently unavailable." msgstr "" -#: ../../Zotlabs/Module/Connedit.php:512 ../../Zotlabs/Module/Connedit.php:521 -#: ../../Zotlabs/Module/Connedit.php:530 ../../Zotlabs/Module/Connedit.php:539 -#: ../../Zotlabs/Module/Connedit.php:552 +#: ../../Zotlabs/Module/Connedit.php:501 ../../Zotlabs/Module/Connedit.php:510 +#: ../../Zotlabs/Module/Connedit.php:519 ../../Zotlabs/Module/Connedit.php:528 +#: ../../Zotlabs/Module/Connedit.php:541 msgid "Unable to set address book parameters." msgstr "" -#: ../../Zotlabs/Module/Connedit.php:571 +#: ../../Zotlabs/Module/Connedit.php:560 msgid "Connection has been removed." msgstr "" -#: ../../Zotlabs/Module/Connedit.php:614 +#: ../../Zotlabs/Module/Connedit.php:603 #, php-format msgid "View %s's profile" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:618 +#: ../../Zotlabs/Module/Connedit.php:607 msgid "Refresh Permissions" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:621 +#: ../../Zotlabs/Module/Connedit.php:610 msgid "Fetch updated permissions" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:625 +#: ../../Zotlabs/Module/Connedit.php:614 msgid "Refresh Photo" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:628 +#: ../../Zotlabs/Module/Connedit.php:617 msgid "Fetch updated photo" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:635 +#: ../../Zotlabs/Module/Connedit.php:624 msgid "View recent posts and comments" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:642 +#: ../../Zotlabs/Module/Connedit.php:631 msgid "Block (or Unblock) all communications with this connection" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:643 +#: ../../Zotlabs/Module/Connedit.php:632 msgid "This connection is blocked!" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:647 +#: ../../Zotlabs/Module/Connedit.php:636 msgid "Unignore" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:650 +#: ../../Zotlabs/Module/Connedit.php:639 msgid "Ignore (or Unignore) all inbound communications from this connection" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:651 +#: ../../Zotlabs/Module/Connedit.php:640 msgid "This connection is ignored!" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:655 +#: ../../Zotlabs/Module/Connedit.php:644 msgid "Unarchive" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:655 +#: ../../Zotlabs/Module/Connedit.php:644 msgid "Archive" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:658 +#: ../../Zotlabs/Module/Connedit.php:647 msgid "" "Archive (or Unarchive) this connection - mark channel dead but keep content" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:659 +#: ../../Zotlabs/Module/Connedit.php:648 msgid "This connection is archived!" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:663 +#: ../../Zotlabs/Module/Connedit.php:652 msgid "Unhide" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:663 +#: ../../Zotlabs/Module/Connedit.php:652 msgid "Hide" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:666 +#: ../../Zotlabs/Module/Connedit.php:655 msgid "Hide or Unhide this connection from your other connections" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:667 +#: ../../Zotlabs/Module/Connedit.php:656 msgid "This connection is hidden!" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:674 +#: ../../Zotlabs/Module/Connedit.php:663 msgid "Delete this connection" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:682 +#: ../../Zotlabs/Module/Connedit.php:671 msgid "Fetch Vcard" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:685 +#: ../../Zotlabs/Module/Connedit.php:674 msgid "Fetch electronic calling card for this connection" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:696 +#: ../../Zotlabs/Module/Connedit.php:685 msgid "Open Individual Permissions section by default" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:719 +#: ../../Zotlabs/Module/Connedit.php:708 msgid "Affinity" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:722 +#: ../../Zotlabs/Module/Connedit.php:711 msgid "Open Set Affinity section by default" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:759 +#: ../../Zotlabs/Module/Connedit.php:748 msgid "Filter" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:762 +#: ../../Zotlabs/Module/Connedit.php:751 msgid "Open Custom Filter section by default" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:799 +#: ../../Zotlabs/Module/Connedit.php:788 msgid "Approve this connection" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:799 +#: ../../Zotlabs/Module/Connedit.php:788 msgid "Accept connection to allow communication" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:804 +#: ../../Zotlabs/Module/Connedit.php:793 msgid "Set Affinity" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:807 +#: ../../Zotlabs/Module/Connedit.php:796 msgid "Set Profile" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:810 +#: ../../Zotlabs/Module/Connedit.php:799 msgid "Set Affinity & Profile" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:858 +#: ../../Zotlabs/Module/Connedit.php:847 msgid "This connection is unreachable from this location." msgstr "" -#: ../../Zotlabs/Module/Connedit.php:859 +#: ../../Zotlabs/Module/Connedit.php:848 msgid "This connection may be unreachable from other channel locations." msgstr "" -#: ../../Zotlabs/Module/Connedit.php:861 +#: ../../Zotlabs/Module/Connedit.php:850 msgid "Location independence is not supported by their network." msgstr "" -#: ../../Zotlabs/Module/Connedit.php:867 +#: ../../Zotlabs/Module/Connedit.php:856 msgid "" "This connection is unreachable from this location. Location independence is " "not supported by their network." msgstr "" -#: ../../Zotlabs/Module/Connedit.php:871 +#: ../../Zotlabs/Module/Connedit.php:860 msgid "Connection requests will be approved without your interaction" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:880 +#: ../../Zotlabs/Module/Connedit.php:869 msgid "This connection's primary address is" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:881 +#: ../../Zotlabs/Module/Connedit.php:870 msgid "Available locations:" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:887 +#: ../../Zotlabs/Module/Connedit.php:876 msgid "Connection Tools" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:889 +#: ../../Zotlabs/Module/Connedit.php:878 msgid "Slide to adjust your degree of friendship" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:891 +#: ../../Zotlabs/Module/Connedit.php:880 msgid "Slide to adjust your rating" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:892 ../../Zotlabs/Module/Connedit.php:897 +#: ../../Zotlabs/Module/Connedit.php:881 ../../Zotlabs/Module/Connedit.php:886 msgid "Optionally explain your rating" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:894 +#: ../../Zotlabs/Module/Connedit.php:883 msgid "Custom Filter" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:895 +#: ../../Zotlabs/Module/Connedit.php:884 msgid "Only import posts with this text" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:896 +#: ../../Zotlabs/Module/Connedit.php:885 msgid "Do not import posts with this text" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:898 +#: ../../Zotlabs/Module/Connedit.php:887 msgid "This information is public!" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:903 +#: ../../Zotlabs/Module/Connedit.php:892 msgid "Connection Pending Approval" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:908 +#: ../../Zotlabs/Module/Connedit.php:897 #, php-format msgid "" "Please choose the profile you would like to display to %s when viewing your " "profile securely." msgstr "" -#: ../../Zotlabs/Module/Connedit.php:915 +#: ../../Zotlabs/Module/Connedit.php:904 msgid "" "Some permissions may be inherited from your channel's <a href=\"settings" "\"><strong>privacy settings</strong></a>, which have higher priority than " @@ -14337,11 +14370,11 @@ msgid "" "any impact unless the inherited setting changes." msgstr "" -#: ../../Zotlabs/Module/Connedit.php:916 +#: ../../Zotlabs/Module/Connedit.php:905 msgid "Last update:" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:924 +#: ../../Zotlabs/Module/Connedit.php:913 msgid "Details" msgstr "" @@ -14370,47 +14403,47 @@ msgstr "" msgid "Download PDL file" msgstr "" -#: ../../Zotlabs/Module/Locs.php:27 ../../Zotlabs/Module/Locs.php:57 +#: ../../Zotlabs/Module/Locs.php:27 ../../Zotlabs/Module/Locs.php:66 msgid "Location not found." msgstr "" -#: ../../Zotlabs/Module/Locs.php:65 +#: ../../Zotlabs/Module/Locs.php:75 msgid "Location lookup failed." msgstr "" -#: ../../Zotlabs/Module/Locs.php:69 +#: ../../Zotlabs/Module/Locs.php:79 msgid "" "Please select another location to become primary before removing the primary " "location." msgstr "" -#: ../../Zotlabs/Module/Locs.php:99 +#: ../../Zotlabs/Module/Locs.php:108 msgid "Syncing locations" msgstr "" -#: ../../Zotlabs/Module/Locs.php:109 +#: ../../Zotlabs/Module/Locs.php:117 msgid "No locations found." msgstr "" -#: ../../Zotlabs/Module/Locs.php:120 +#: ../../Zotlabs/Module/Locs.php:127 msgid "Manage Channel Locations" msgstr "" -#: ../../Zotlabs/Module/Locs.php:126 +#: ../../Zotlabs/Module/Locs.php:133 msgid "Sync Now" msgstr "" -#: ../../Zotlabs/Module/Locs.php:127 +#: ../../Zotlabs/Module/Locs.php:134 msgid "Please wait several minutes between consecutive operations." msgstr "" -#: ../../Zotlabs/Module/Locs.php:128 +#: ../../Zotlabs/Module/Locs.php:135 msgid "" "When possible, drop a location by logging into that website/hub and removing " "your channel." msgstr "" -#: ../../Zotlabs/Module/Locs.php:129 +#: ../../Zotlabs/Module/Locs.php:136 msgid "Use this form to drop the location if the hub is no longer operating." msgstr "" @@ -14571,32 +14604,32 @@ msgctxt "permcat" msgid "publisher" msgstr "" -#: ../../Zotlabs/Lib/Activity.php:2096 +#: ../../Zotlabs/Lib/Activity.php:2110 #, php-format msgid "Likes %1$s's %2$s" msgstr "" -#: ../../Zotlabs/Lib/Activity.php:2099 +#: ../../Zotlabs/Lib/Activity.php:2113 #, php-format msgid "Doesn't like %1$s's %2$s" msgstr "" -#: ../../Zotlabs/Lib/Activity.php:2105 +#: ../../Zotlabs/Lib/Activity.php:2119 #, php-format msgid "Will attend %s's event" msgstr "" -#: ../../Zotlabs/Lib/Activity.php:2108 +#: ../../Zotlabs/Lib/Activity.php:2122 #, php-format msgid "Will not attend %s's event" msgstr "" -#: ../../Zotlabs/Lib/Activity.php:2111 +#: ../../Zotlabs/Lib/Activity.php:2125 #, php-format msgid "May attend %s's event" msgstr "" -#: ../../Zotlabs/Lib/Activity.php:2114 +#: ../../Zotlabs/Lib/Activity.php:2128 #, php-format msgid "May not attend %s's event" msgstr "" @@ -14964,7 +14997,7 @@ msgstr "" msgid "Invite" msgstr "" -#: ../../Zotlabs/Lib/Apps.php:360 +#: ../../Zotlabs/Lib/Apps.php:360 ../../Zotlabs/Storage/Browser.php:400 msgid "Post" msgstr "" @@ -15113,7 +15146,7 @@ msgstr "" msgid "Privacy conflict. Discretion advised." msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:174 ../../Zotlabs/Storage/Browser.php:286 +#: ../../Zotlabs/Lib/ThreadItem.php:174 ../../Zotlabs/Storage/Browser.php:362 msgid "Admin Delete" msgstr "" @@ -15396,98 +15429,148 @@ msgstr "" msgid "Can administer my channel" msgstr "" -#: ../../Zotlabs/Storage/Browser.php:107 ../../Zotlabs/Storage/Browser.php:295 -msgid "parent" +#: ../../Zotlabs/Storage/Browser.php:292 +msgid "Change filename to" +msgstr "" + +#: ../../Zotlabs/Storage/Browser.php:302 ../../Zotlabs/Storage/Browser.php:383 +msgid "Select a target location" msgstr "" -#: ../../Zotlabs/Storage/Browser.php:134 -msgid "Principal" +#: ../../Zotlabs/Storage/Browser.php:303 ../../Zotlabs/Storage/Browser.php:384 +msgid "Copy to target location" msgstr "" -#: ../../Zotlabs/Storage/Browser.php:137 -msgid "Addressbook" +#: ../../Zotlabs/Storage/Browser.php:304 ../../Zotlabs/Storage/Browser.php:382 +msgid "Set permissions for all files and sub folders" msgstr "" -#: ../../Zotlabs/Storage/Browser.php:143 -msgid "Schedule Inbox" +#: ../../Zotlabs/Storage/Browser.php:305 +msgid "Notify your contacts about this file" msgstr "" -#: ../../Zotlabs/Storage/Browser.php:146 -msgid "Schedule Outbox" +#: ../../Zotlabs/Storage/Browser.php:344 +msgid "File category" msgstr "" -#: ../../Zotlabs/Storage/Browser.php:279 +#: ../../Zotlabs/Storage/Browser.php:355 msgid "Total" msgstr "" -#: ../../Zotlabs/Storage/Browser.php:281 +#: ../../Zotlabs/Storage/Browser.php:357 msgid "Shared" msgstr "" -#: ../../Zotlabs/Storage/Browser.php:283 +#: ../../Zotlabs/Storage/Browser.php:359 msgid "Add Files" msgstr "" -#: ../../Zotlabs/Storage/Browser.php:367 +#: ../../Zotlabs/Storage/Browser.php:374 +msgid "parent" +msgstr "" + +#: ../../Zotlabs/Storage/Browser.php:392 +msgid "Select All" +msgstr "" + +#: ../../Zotlabs/Storage/Browser.php:393 +msgid "Bulk Actions" +msgstr "" + +#: ../../Zotlabs/Storage/Browser.php:394 +msgid "Adjust Permissions" +msgstr "" + +#: ../../Zotlabs/Storage/Browser.php:395 +msgid "Move or Copy" +msgstr "" + +#: ../../Zotlabs/Storage/Browser.php:398 +msgid "Info" +msgstr "" + +#: ../../Zotlabs/Storage/Browser.php:399 +msgid "Rename" +msgstr "" + +#: ../../Zotlabs/Storage/Browser.php:401 +msgid "Attachment BBcode" +msgstr "" + +#: ../../Zotlabs/Storage/Browser.php:402 +msgid "Embed BBcode" +msgstr "" + +#: ../../Zotlabs/Storage/Browser.php:403 +msgid "Link BBcode" +msgstr "" + +#: ../../Zotlabs/Storage/Browser.php:473 #, php-format msgid "You are using %1$s of your available file storage." msgstr "" -#: ../../Zotlabs/Storage/Browser.php:372 +#: ../../Zotlabs/Storage/Browser.php:478 #, php-format msgid "You are using %1$s of %2$s available file storage. (%3$s%)" msgstr "" -#: ../../Zotlabs/Storage/Browser.php:383 +#: ../../Zotlabs/Storage/Browser.php:489 msgid "WARNING:" msgstr "" -#: ../../Zotlabs/Storage/Browser.php:395 +#: ../../Zotlabs/Storage/Browser.php:530 msgid "Create new folder" msgstr "" -#: ../../Zotlabs/Storage/Browser.php:397 +#: ../../Zotlabs/Storage/Browser.php:532 msgid "Upload file" msgstr "" -#: ../../Zotlabs/Storage/Browser.php:410 +#: ../../Zotlabs/Storage/Browser.php:544 msgid "Drop files here to immediately upload" msgstr "" -#: ../../boot.php:1677 +#: ../../Zotlabs/Storage/Browser.php:547 +msgid "" +"You can select files via the upload button or drop them right here or into " +"an existing folder." +msgstr "" + +#: ../../boot.php:1678 msgid "Create an account to access services and applications" msgstr "" -#: ../../boot.php:1701 +#: ../../boot.php:1702 msgid "Login/Email" msgstr "" -#: ../../boot.php:1702 +#: ../../boot.php:1703 msgid "Password" msgstr "" -#: ../../boot.php:1703 +#: ../../boot.php:1704 msgid "Remember me" msgstr "" -#: ../../boot.php:1706 +#: ../../boot.php:1707 msgid "Forgot your password?" msgstr "" -#: ../../boot.php:2575 +#: ../../boot.php:2576 #, php-format msgid "[$Projectname] Website SSL error for %s" msgstr "" -#: ../../boot.php:2580 +#: ../../boot.php:2581 msgid "Website SSL certificate is not valid. Please correct." msgstr "" -#: ../../boot.php:2696 +#: ../../boot.php:2697 #, php-format msgid "[$Projectname] Cron tasks not running on %s" msgstr "" -#: ../../boot.php:2701 +#: ../../boot.php:2702 msgid "Cron/Scheduled tasks not running." msgstr "" diff --git a/vendor/composer/autoload_classmap.php b/vendor/composer/autoload_classmap.php index 62282b235..cbd71a369 100644 --- a/vendor/composer/autoload_classmap.php +++ b/vendor/composer/autoload_classmap.php @@ -1398,19 +1398,6 @@ return array( 'Zotlabs\\Storage\\File' => $baseDir . '/Zotlabs/Storage/File.php', 'Zotlabs\\Storage\\GitRepo' => $baseDir . '/Zotlabs/Storage/GitRepo.php', 'Zotlabs\\Storage\\ZotOauth2Pdo' => $baseDir . '/Zotlabs/Storage/ZotOauth2Pdo.php', - 'Zotlabs\\Tests\\Unit\\Access\\AccessListTest' => $baseDir . '/tests/unit/Access/AccessListTest.php', - 'Zotlabs\\Tests\\Unit\\Access\\PermissionLimitsTest' => $baseDir . '/tests/unit/Access/PermissionLimitsTest.php', - 'Zotlabs\\Tests\\Unit\\Access\\PermissionRolesTest' => $baseDir . '/tests/unit/Access/PermissionRolesTest.php', - 'Zotlabs\\Tests\\Unit\\Access\\PermissionsTest' => $baseDir . '/tests/unit/Access/PermissionsTest.php', - 'Zotlabs\\Tests\\Unit\\Lib\\PermissionDescriptionTest' => $baseDir . '/tests/unit/Lib/PermissionDescriptionTest.php', - 'Zotlabs\\Tests\\Unit\\Photo\\PhotoGdTest' => $baseDir . '/tests/unit/Photo/PhotoGdTest.php', - 'Zotlabs\\Tests\\Unit\\UnitTestCase' => $baseDir . '/tests/unit/UnitTestCase.php', - 'Zotlabs\\Tests\\Unit\\Web\\HttpSigTest' => $baseDir . '/tests/unit/Web/HttpSigTest.php', - 'Zotlabs\\Tests\\Unit\\includes\\FeedutilsTest' => $baseDir . '/tests/unit/includes/FeedutilsTest.php', - 'Zotlabs\\Tests\\Unit\\includes\\LanguageTest' => $baseDir . '/tests/unit/includes/LanguageTest.php', - 'Zotlabs\\Tests\\Unit\\includes\\MarkdownTest' => $baseDir . '/tests/unit/includes/MarkdownTest.php', - 'Zotlabs\\Tests\\Unit\\includes\\PhotodriverTest' => $baseDir . '/tests/unit/includes/PhotodriverTest.php', - 'Zotlabs\\Tests\\Unit\\includes\\TextTest' => $baseDir . '/tests/unit/includes/TextTest.php', 'Zotlabs\\Text\\Tagadelic' => $baseDir . '/Zotlabs/Text/Tagadelic.php', 'Zotlabs\\Thumbs\\Epubthumb' => $baseDir . '/Zotlabs/Thumbs/Epubthumb.php', 'Zotlabs\\Thumbs\\Mp3audio' => $baseDir . '/Zotlabs/Thumbs/Mp3audio.php', @@ -1657,6 +1644,7 @@ return array( 'Zotlabs\\Update\\_1237' => $baseDir . '/Zotlabs/Update/_1237.php', 'Zotlabs\\Update\\_1238' => $baseDir . '/Zotlabs/Update/_1238.php', 'Zotlabs\\Update\\_1239' => $baseDir . '/Zotlabs/Update/_1239.php', + 'Zotlabs\\Update\\_1240' => $baseDir . '/Zotlabs/Update/_1240.php', 'Zotlabs\\Web\\Controller' => $baseDir . '/Zotlabs/Web/Controller.php', 'Zotlabs\\Web\\HTTPHeaders' => $baseDir . '/Zotlabs/Web/HTTPHeaders.php', 'Zotlabs\\Web\\HTTPSig' => $baseDir . '/Zotlabs/Web/HTTPSig.php', diff --git a/vendor/composer/autoload_psr4.php b/vendor/composer/autoload_psr4.php index ed5a7935c..59c2faa28 100644 --- a/vendor/composer/autoload_psr4.php +++ b/vendor/composer/autoload_psr4.php @@ -6,7 +6,6 @@ $vendorDir = dirname(dirname(__FILE__)); $baseDir = dirname($vendorDir); return array( - 'Zotlabs\\Tests\\Unit\\' => array($baseDir . '/tests/unit'), 'Zotlabs\\' => array($baseDir . '/Zotlabs'), 'Symfony\\Polyfill\\Ctype\\' => array($vendorDir . '/symfony/polyfill-ctype'), 'Sabre\\Xml\\' => array($vendorDir . '/sabre/xml/lib'), diff --git a/vendor/composer/autoload_static.php b/vendor/composer/autoload_static.php index d88fe41d9..1b81ac06b 100644 --- a/vendor/composer/autoload_static.php +++ b/vendor/composer/autoload_static.php @@ -22,7 +22,6 @@ class ComposerStaticInit7b34d7e50a62201ec5d5e526a5b8b35d public static $prefixLengthsPsr4 = array ( 'Z' => array ( - 'Zotlabs\\Tests\\Unit\\' => 19, 'Zotlabs\\' => 8, ), 'S' => @@ -74,10 +73,6 @@ class ComposerStaticInit7b34d7e50a62201ec5d5e526a5b8b35d ); public static $prefixDirsPsr4 = array ( - 'Zotlabs\\Tests\\Unit\\' => - array ( - 0 => __DIR__ . '/../..' . '/tests/unit', - ), 'Zotlabs\\' => array ( 0 => __DIR__ . '/../..' . '/Zotlabs', @@ -1584,19 +1579,6 @@ class ComposerStaticInit7b34d7e50a62201ec5d5e526a5b8b35d 'Zotlabs\\Storage\\File' => __DIR__ . '/../..' . '/Zotlabs/Storage/File.php', 'Zotlabs\\Storage\\GitRepo' => __DIR__ . '/../..' . '/Zotlabs/Storage/GitRepo.php', 'Zotlabs\\Storage\\ZotOauth2Pdo' => __DIR__ . '/../..' . '/Zotlabs/Storage/ZotOauth2Pdo.php', - 'Zotlabs\\Tests\\Unit\\Access\\AccessListTest' => __DIR__ . '/../..' . '/tests/unit/Access/AccessListTest.php', - 'Zotlabs\\Tests\\Unit\\Access\\PermissionLimitsTest' => __DIR__ . '/../..' . '/tests/unit/Access/PermissionLimitsTest.php', - 'Zotlabs\\Tests\\Unit\\Access\\PermissionRolesTest' => __DIR__ . '/../..' . '/tests/unit/Access/PermissionRolesTest.php', - 'Zotlabs\\Tests\\Unit\\Access\\PermissionsTest' => __DIR__ . '/../..' . '/tests/unit/Access/PermissionsTest.php', - 'Zotlabs\\Tests\\Unit\\Lib\\PermissionDescriptionTest' => __DIR__ . '/../..' . '/tests/unit/Lib/PermissionDescriptionTest.php', - 'Zotlabs\\Tests\\Unit\\Photo\\PhotoGdTest' => __DIR__ . '/../..' . '/tests/unit/Photo/PhotoGdTest.php', - 'Zotlabs\\Tests\\Unit\\UnitTestCase' => __DIR__ . '/../..' . '/tests/unit/UnitTestCase.php', - 'Zotlabs\\Tests\\Unit\\Web\\HttpSigTest' => __DIR__ . '/../..' . '/tests/unit/Web/HttpSigTest.php', - 'Zotlabs\\Tests\\Unit\\includes\\FeedutilsTest' => __DIR__ . '/../..' . '/tests/unit/includes/FeedutilsTest.php', - 'Zotlabs\\Tests\\Unit\\includes\\LanguageTest' => __DIR__ . '/../..' . '/tests/unit/includes/LanguageTest.php', - 'Zotlabs\\Tests\\Unit\\includes\\MarkdownTest' => __DIR__ . '/../..' . '/tests/unit/includes/MarkdownTest.php', - 'Zotlabs\\Tests\\Unit\\includes\\PhotodriverTest' => __DIR__ . '/../..' . '/tests/unit/includes/PhotodriverTest.php', - 'Zotlabs\\Tests\\Unit\\includes\\TextTest' => __DIR__ . '/../..' . '/tests/unit/includes/TextTest.php', 'Zotlabs\\Text\\Tagadelic' => __DIR__ . '/../..' . '/Zotlabs/Text/Tagadelic.php', 'Zotlabs\\Thumbs\\Epubthumb' => __DIR__ . '/../..' . '/Zotlabs/Thumbs/Epubthumb.php', 'Zotlabs\\Thumbs\\Mp3audio' => __DIR__ . '/../..' . '/Zotlabs/Thumbs/Mp3audio.php', @@ -1843,6 +1825,7 @@ class ComposerStaticInit7b34d7e50a62201ec5d5e526a5b8b35d 'Zotlabs\\Update\\_1237' => __DIR__ . '/../..' . '/Zotlabs/Update/_1237.php', 'Zotlabs\\Update\\_1238' => __DIR__ . '/../..' . '/Zotlabs/Update/_1238.php', 'Zotlabs\\Update\\_1239' => __DIR__ . '/../..' . '/Zotlabs/Update/_1239.php', + 'Zotlabs\\Update\\_1240' => __DIR__ . '/../..' . '/Zotlabs/Update/_1240.php', 'Zotlabs\\Web\\Controller' => __DIR__ . '/../..' . '/Zotlabs/Web/Controller.php', 'Zotlabs\\Web\\HTTPHeaders' => __DIR__ . '/../..' . '/Zotlabs/Web/HTTPHeaders.php', 'Zotlabs\\Web\\HTTPSig' => __DIR__ . '/../..' . '/Zotlabs/Web/HTTPSig.php', diff --git a/view/js/mod_cloud.js b/view/js/mod_cloud.js index 8fb66c5aa..5ca1f52a9 100644 --- a/view/js/mod_cloud.js +++ b/view/js/mod_cloud.js @@ -68,7 +68,7 @@ $(document).ready(function () { close_and_deactivate_all_panels(); $('body').css('cursor', 'wait'); - $.jGrowl('Please stand by while your download is being prepared...', { sticky: false, theme: 'info', life: 10000 }); + $.jGrowl(aStr.download_info, { sticky: false, theme: 'info', life: 10000 }); let data = [ {name: 'attach_path', value: window.location.pathname}, @@ -296,7 +296,7 @@ $(document).ready(function () { close_and_deactivate_all_panels(); $('body').css('cursor', 'wait'); - $.jGrowl('Please stand by while your download is being prepared...', { sticky: false, theme: 'info', life: 10000 }); + $.jGrowl(aStr.download_info, { sticky: false, theme: 'info', life: 10000 }); post_data.push( {name: 'attach_path', value: window.location.pathname}, diff --git a/view/ru/hmessages.po b/view/ru/hmessages.po index 72d254c95..0cdc38ff3 100644 --- a/view/ru/hmessages.po +++ b/view/ru/hmessages.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: hubzilla\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-11-15 11:39+0200\n" -"PO-Revision-Date: 2020-11-15 11:46+0200\n" +"POT-Creation-Date: 2021-01-03 17:35+0200\n" +"PO-Revision-Date: 2021-01-03 17:42+0200\n" "Last-Translator: Max Kostikov <max@kostikov.co>\n" "Language-Team: Russian (http://www.transifex.com/Friendica/hubzilla/language/ru/)\n" "MIME-Version: 1.0\n" @@ -22,7 +22,7 @@ msgstr "" msgid "Source channel not found." msgstr "Канал-источник не найден." -#: ../../view/theme/redbasic/php/config.php:15 ../../include/text.php:3379 +#: ../../view/theme/redbasic/php/config.php:15 ../../include/text.php:3381 #: ../../Zotlabs/Module/Admin/Site.php:191 #: ../../extend/addon/hzaddons/cart/submodules/orderoptions.php:335 #: ../../extend/addon/hzaddons/cart/submodules/orderoptions.php:359 @@ -37,14 +37,15 @@ msgid "Focus (Hubzilla default)" msgstr "Фокус (по умолчанию Hubzilla)" #: ../../view/theme/redbasic/php/config.php:94 ../../include/js_strings.php:22 -#: ../../Zotlabs/Module/Pconfig.php:116 ../../Zotlabs/Module/Defperms.php:266 -#: ../../Zotlabs/Module/Permcats.php:129 ../../Zotlabs/Module/Xchan.php:15 +#: ../../Zotlabs/Storage/Browser.php:375 ../../Zotlabs/Module/Pconfig.php:116 +#: ../../Zotlabs/Module/Defperms.php:266 ../../Zotlabs/Module/Permcats.php:129 +#: ../../Zotlabs/Module/Xchan.php:15 #: ../../Zotlabs/Module/Email_validation.php:40 #: ../../Zotlabs/Module/Poke.php:217 ../../Zotlabs/Module/Appman.php:155 -#: ../../Zotlabs/Module/Profiles.php:725 ../../Zotlabs/Module/Photos.php:1057 -#: ../../Zotlabs/Module/Photos.php:1097 ../../Zotlabs/Module/Photos.php:1215 +#: ../../Zotlabs/Module/Profiles.php:725 ../../Zotlabs/Module/Photos.php:1058 +#: ../../Zotlabs/Module/Photos.php:1098 ../../Zotlabs/Module/Photos.php:1216 #: ../../Zotlabs/Module/Oauth.php:111 ../../Zotlabs/Module/Events.php:501 -#: ../../Zotlabs/Module/Rate.php:166 ../../Zotlabs/Module/Locs.php:125 +#: ../../Zotlabs/Module/Rate.php:166 ../../Zotlabs/Module/Locs.php:132 #: ../../Zotlabs/Module/Sources.php:125 ../../Zotlabs/Module/Sources.php:162 #: ../../Zotlabs/Module/Chat.php:209 ../../Zotlabs/Module/Chat.php:248 #: ../../Zotlabs/Module/Oauth2.php:116 @@ -53,7 +54,7 @@ msgstr "Фокус (по умолчанию Hubzilla)" #: ../../Zotlabs/Module/Settings/Account.php:103 #: ../../Zotlabs/Module/Settings/Conversation.php:49 #: ../../Zotlabs/Module/Settings/Editor.php:42 -#: ../../Zotlabs/Module/Settings/Display.php:190 +#: ../../Zotlabs/Module/Settings/Display.php:188 #: ../../Zotlabs/Module/Settings/Features.php:48 #: ../../Zotlabs/Module/Settings/Network.php:62 #: ../../Zotlabs/Module/Settings/Events.php:42 @@ -63,7 +64,7 @@ msgstr "Фокус (по умолчанию Hubzilla)" #: ../../Zotlabs/Module/Settings/Profiles.php:52 #: ../../Zotlabs/Module/Settings/Connections.php:42 #: ../../Zotlabs/Module/Settings/Channel.php:495 -#: ../../Zotlabs/Module/Filestorage.php:203 ../../Zotlabs/Module/Setup.php:304 +#: ../../Zotlabs/Module/Filestorage.php:208 ../../Zotlabs/Module/Setup.php:304 #: ../../Zotlabs/Module/Setup.php:344 ../../Zotlabs/Module/Mitem.php:259 #: ../../Zotlabs/Module/Admin/Features.php:66 #: ../../Zotlabs/Module/Admin/Logs.php:84 @@ -81,7 +82,7 @@ msgstr "Фокус (по умолчанию Hubzilla)" #: ../../Zotlabs/Module/Group.php:167 ../../Zotlabs/Module/Mood.php:158 #: ../../Zotlabs/Module/Invite.php:168 ../../Zotlabs/Module/Connect.php:107 #: ../../Zotlabs/Module/Pdledit.php:108 ../../Zotlabs/Module/Affinity.php:87 -#: ../../Zotlabs/Module/Wiki.php:215 ../../Zotlabs/Module/Import.php:649 +#: ../../Zotlabs/Module/Wiki.php:215 ../../Zotlabs/Module/Import.php:645 #: ../../Zotlabs/Module/Import_items.php:129 #: ../../Zotlabs/Widget/Wiki_pages.php:42 #: ../../Zotlabs/Widget/Wiki_pages.php:99 @@ -153,24 +154,27 @@ msgstr "Узкая панель навигации" #: ../../view/theme/redbasic/php/config.php:99 #: ../../view/theme/redbasic/php/config.php:116 -#: ../../include/conversation.php:1463 ../../include/dir_fns.php:142 +#: ../../include/conversation.php:1466 ../../include/dir_fns.php:142 #: ../../include/dir_fns.php:143 ../../include/dir_fns.php:144 -#: ../../boot.php:1704 ../../Zotlabs/Storage/Browser.php:411 -#: ../../Zotlabs/Module/Defperms.php:198 ../../Zotlabs/Module/Profiles.php:683 -#: ../../Zotlabs/Module/Photos.php:672 ../../Zotlabs/Module/Api.php:99 -#: ../../Zotlabs/Module/Events.php:478 ../../Zotlabs/Module/Events.php:479 -#: ../../Zotlabs/Module/Sources.php:124 ../../Zotlabs/Module/Sources.php:159 -#: ../../Zotlabs/Module/Settings/Display.php:90 +#: ../../boot.php:1704 ../../Zotlabs/Storage/Browser.php:303 +#: ../../Zotlabs/Storage/Browser.php:304 ../../Zotlabs/Storage/Browser.php:305 +#: ../../Zotlabs/Storage/Browser.php:382 ../../Zotlabs/Storage/Browser.php:384 +#: ../../Zotlabs/Storage/Browser.php:545 ../../Zotlabs/Module/Defperms.php:198 +#: ../../Zotlabs/Module/Profiles.php:683 ../../Zotlabs/Module/Photos.php:673 +#: ../../Zotlabs/Module/Api.php:99 ../../Zotlabs/Module/Events.php:478 +#: ../../Zotlabs/Module/Events.php:479 ../../Zotlabs/Module/Sources.php:124 +#: ../../Zotlabs/Module/Sources.php:159 +#: ../../Zotlabs/Module/Settings/Display.php:88 #: ../../Zotlabs/Module/Settings/Channel.php:311 -#: ../../Zotlabs/Module/Filestorage.php:198 -#: ../../Zotlabs/Module/Filestorage.php:206 ../../Zotlabs/Module/Menu.php:163 +#: ../../Zotlabs/Module/Filestorage.php:203 +#: ../../Zotlabs/Module/Filestorage.php:211 ../../Zotlabs/Module/Menu.php:163 #: ../../Zotlabs/Module/Menu.php:222 ../../Zotlabs/Module/Mitem.php:176 #: ../../Zotlabs/Module/Mitem.php:177 ../../Zotlabs/Module/Mitem.php:256 #: ../../Zotlabs/Module/Mitem.php:257 ../../Zotlabs/Module/Admin/Site.php:259 #: ../../Zotlabs/Module/Connedit.php:403 ../../Zotlabs/Module/Connedit.php:788 #: ../../Zotlabs/Module/Wiki.php:227 ../../Zotlabs/Module/Wiki.php:228 -#: ../../Zotlabs/Module/Import.php:638 ../../Zotlabs/Module/Import.php:642 -#: ../../Zotlabs/Module/Import.php:643 ../../Zotlabs/Lib/Libzotdir.php:164 +#: ../../Zotlabs/Module/Import.php:634 ../../Zotlabs/Module/Import.php:638 +#: ../../Zotlabs/Module/Import.php:639 ../../Zotlabs/Lib/Libzotdir.php:164 #: ../../Zotlabs/Lib/Libzotdir.php:165 ../../Zotlabs/Lib/Libzotdir.php:167 #: ../../extend/addon/hzaddons/pumpio/Mod_Pumpio.php:94 #: ../../extend/addon/hzaddons/pumpio/Mod_Pumpio.php:98 @@ -224,23 +228,26 @@ msgstr "Нет" #: ../../view/theme/redbasic/php/config.php:99 #: ../../view/theme/redbasic/php/config.php:116 -#: ../../include/conversation.php:1463 ../../include/dir_fns.php:142 +#: ../../include/conversation.php:1466 ../../include/dir_fns.php:142 #: ../../include/dir_fns.php:143 ../../include/dir_fns.php:144 -#: ../../boot.php:1704 ../../Zotlabs/Storage/Browser.php:411 -#: ../../Zotlabs/Module/Defperms.php:198 ../../Zotlabs/Module/Profiles.php:683 -#: ../../Zotlabs/Module/Photos.php:672 ../../Zotlabs/Module/Api.php:98 -#: ../../Zotlabs/Module/Events.php:478 ../../Zotlabs/Module/Events.php:479 -#: ../../Zotlabs/Module/Sources.php:124 ../../Zotlabs/Module/Sources.php:159 -#: ../../Zotlabs/Module/Settings/Display.php:90 +#: ../../boot.php:1704 ../../Zotlabs/Storage/Browser.php:303 +#: ../../Zotlabs/Storage/Browser.php:304 ../../Zotlabs/Storage/Browser.php:305 +#: ../../Zotlabs/Storage/Browser.php:382 ../../Zotlabs/Storage/Browser.php:384 +#: ../../Zotlabs/Storage/Browser.php:545 ../../Zotlabs/Module/Defperms.php:198 +#: ../../Zotlabs/Module/Profiles.php:683 ../../Zotlabs/Module/Photos.php:673 +#: ../../Zotlabs/Module/Api.php:98 ../../Zotlabs/Module/Events.php:478 +#: ../../Zotlabs/Module/Events.php:479 ../../Zotlabs/Module/Sources.php:124 +#: ../../Zotlabs/Module/Sources.php:159 +#: ../../Zotlabs/Module/Settings/Display.php:88 #: ../../Zotlabs/Module/Settings/Channel.php:311 -#: ../../Zotlabs/Module/Filestorage.php:198 -#: ../../Zotlabs/Module/Filestorage.php:206 ../../Zotlabs/Module/Menu.php:163 +#: ../../Zotlabs/Module/Filestorage.php:203 +#: ../../Zotlabs/Module/Filestorage.php:211 ../../Zotlabs/Module/Menu.php:163 #: ../../Zotlabs/Module/Menu.php:222 ../../Zotlabs/Module/Mitem.php:176 #: ../../Zotlabs/Module/Mitem.php:177 ../../Zotlabs/Module/Mitem.php:256 #: ../../Zotlabs/Module/Mitem.php:257 ../../Zotlabs/Module/Admin/Site.php:261 #: ../../Zotlabs/Module/Connedit.php:403 ../../Zotlabs/Module/Wiki.php:227 -#: ../../Zotlabs/Module/Wiki.php:228 ../../Zotlabs/Module/Import.php:638 -#: ../../Zotlabs/Module/Import.php:642 ../../Zotlabs/Module/Import.php:643 +#: ../../Zotlabs/Module/Wiki.php:228 ../../Zotlabs/Module/Import.php:634 +#: ../../Zotlabs/Module/Import.php:638 ../../Zotlabs/Module/Import.php:639 #: ../../Zotlabs/Lib/Libzotdir.php:164 ../../Zotlabs/Lib/Libzotdir.php:165 #: ../../Zotlabs/Lib/Libzotdir.php:167 #: ../../extend/addon/hzaddons/pumpio/Mod_Pumpio.php:94 @@ -402,13 +409,13 @@ msgid "Monthly" msgstr "Ежемесячно" #: ../../include/selectors.php:60 ../../include/selectors.php:77 -#: ../../include/channel.php:1708 +#: ../../include/channel.php:1722 #: ../../extend/addon/hzaddons/openid/Mod_Id.php:85 msgid "Male" msgstr "Мужчина" #: ../../include/selectors.php:60 ../../include/selectors.php:77 -#: ../../include/channel.php:1706 +#: ../../include/channel.php:1720 #: ../../extend/addon/hzaddons/openid/Mod_Id.php:87 msgid "Female" msgstr "Женщина" @@ -445,19 +452,19 @@ msgstr "Транссексуал" msgid "Hermaphrodite" msgstr "Гермафродит" -#: ../../include/selectors.php:60 ../../include/channel.php:1712 +#: ../../include/selectors.php:60 ../../include/channel.php:1726 msgid "Neuter" msgstr "Среднего рода" -#: ../../include/selectors.php:60 ../../include/channel.php:1714 +#: ../../include/selectors.php:60 ../../include/channel.php:1728 msgid "Non-specific" msgstr "Неспецифический" #: ../../include/selectors.php:60 ../../include/selectors.php:77 #: ../../include/selectors.php:115 ../../include/selectors.php:151 -#: ../../include/connections.php:740 ../../include/connections.php:747 +#: ../../include/connections.php:741 ../../include/connections.php:748 #: ../../include/event.php:1429 ../../include/event.php:1436 -#: ../../Zotlabs/Module/Cdav.php:1380 ../../Zotlabs/Module/Profiles.php:797 +#: ../../Zotlabs/Module/Cdav.php:1384 ../../Zotlabs/Module/Profiles.php:797 #: ../../Zotlabs/Module/Connedit.php:927 #: ../../Zotlabs/Access/PermissionRoles.php:310 msgid "Other" @@ -650,17 +657,21 @@ msgstr "Всё равно" msgid "Ask me" msgstr "Спроси меня" -#: ../../include/photos.php:27 ../../include/items.php:3966 +#: ../../include/photos.php:27 ../../include/items.php:3977 #: ../../include/attach.php:156 ../../include/attach.php:205 -#: ../../include/attach.php:278 ../../include/attach.php:386 -#: ../../include/attach.php:400 ../../include/attach.php:407 -#: ../../include/attach.php:489 ../../include/attach.php:1055 -#: ../../include/attach.php:1129 ../../include/attach.php:1292 -#: ../../Zotlabs/Module/Defperms.php:182 ../../Zotlabs/Module/Network.php:19 -#: ../../Zotlabs/Module/Common.php:38 ../../Zotlabs/Module/Item.php:483 -#: ../../Zotlabs/Module/Item.php:502 ../../Zotlabs/Module/Item.php:512 -#: ../../Zotlabs/Module/Item.php:1428 ../../Zotlabs/Module/Achievements.php:34 -#: ../../Zotlabs/Module/Display.php:442 ../../Zotlabs/Module/Poke.php:157 +#: ../../include/attach.php:278 ../../include/attach.php:329 +#: ../../include/attach.php:424 ../../include/attach.php:438 +#: ../../include/attach.php:445 ../../include/attach.php:527 +#: ../../include/attach.php:1091 ../../include/attach.php:1164 +#: ../../include/attach.php:1327 ../../Zotlabs/Module/Defperms.php:182 +#: ../../Zotlabs/Module/Network.php:19 ../../Zotlabs/Module/Common.php:38 +#: ../../Zotlabs/Module/Item.php:485 ../../Zotlabs/Module/Item.php:504 +#: ../../Zotlabs/Module/Item.php:514 ../../Zotlabs/Module/Item.php:1442 +#: ../../Zotlabs/Module/Achievements.php:34 +#: ../../Zotlabs/Module/Attach_edit.php:90 +#: ../../Zotlabs/Module/Attach_edit.php:99 +#: ../../Zotlabs/Module/Attach_edit.php:106 +#: ../../Zotlabs/Module/Display.php:425 ../../Zotlabs/Module/Poke.php:157 #: ../../Zotlabs/Module/Profile.php:85 ../../Zotlabs/Module/Profile.php:101 #: ../../Zotlabs/Module/Appman.php:87 ../../Zotlabs/Module/Profiles.php:200 #: ../../Zotlabs/Module/Profiles.php:637 ../../Zotlabs/Module/Photos.php:71 @@ -676,21 +687,21 @@ msgstr "Спроси меня" #: ../../Zotlabs/Module/Viewconnections.php:28 #: ../../Zotlabs/Module/Viewconnections.php:33 #: ../../Zotlabs/Module/Rate.php:113 ../../Zotlabs/Module/Regmod.php:20 -#: ../../Zotlabs/Module/Settings.php:59 ../../Zotlabs/Module/Locs.php:91 +#: ../../Zotlabs/Module/Settings.php:59 ../../Zotlabs/Module/Locs.php:100 #: ../../Zotlabs/Module/Sources.php:80 ../../Zotlabs/Module/Chat.php:113 #: ../../Zotlabs/Module/Chat.php:118 ../../Zotlabs/Module/Vote.php:19 #: ../../Zotlabs/Module/Editlayout.php:67 #: ../../Zotlabs/Module/Editlayout.php:90 -#: ../../Zotlabs/Module/Filestorage.php:17 -#: ../../Zotlabs/Module/Filestorage.php:72 -#: ../../Zotlabs/Module/Filestorage.php:90 -#: ../../Zotlabs/Module/Filestorage.php:113 -#: ../../Zotlabs/Module/Filestorage.php:160 +#: ../../Zotlabs/Module/Filestorage.php:20 +#: ../../Zotlabs/Module/Filestorage.php:78 +#: ../../Zotlabs/Module/Filestorage.php:96 +#: ../../Zotlabs/Module/Filestorage.php:119 +#: ../../Zotlabs/Module/Filestorage.php:165 #: ../../Zotlabs/Module/Editblock.php:67 #: ../../Zotlabs/Module/Service_limits.php:11 -#: ../../Zotlabs/Module/Message.php:18 ../../Zotlabs/Module/Channel.php:181 -#: ../../Zotlabs/Module/Channel.php:348 ../../Zotlabs/Module/Channel.php:387 -#: ../../Zotlabs/Module/Like.php:193 ../../Zotlabs/Module/Bookmarks.php:70 +#: ../../Zotlabs/Module/Message.php:18 ../../Zotlabs/Module/Channel.php:177 +#: ../../Zotlabs/Module/Channel.php:332 ../../Zotlabs/Module/Channel.php:371 +#: ../../Zotlabs/Module/Like.php:230 ../../Zotlabs/Module/Bookmarks.php:70 #: ../../Zotlabs/Module/Viewsrc.php:19 ../../Zotlabs/Module/Menu.php:130 #: ../../Zotlabs/Module/Menu.php:141 ../../Zotlabs/Module/Setup.php:206 #: ../../Zotlabs/Module/Mitem.php:129 ../../Zotlabs/Module/Notifications.php:11 @@ -755,8 +766,8 @@ msgstr "%1$s опубликовал %2$s в %3$s" msgid "Photo Albums" msgstr "Фотоальбомы" -#: ../../include/photos.php:667 ../../Zotlabs/Module/Photos.php:1347 -#: ../../Zotlabs/Module/Photos.php:1360 ../../Zotlabs/Module/Photos.php:1361 +#: ../../include/photos.php:667 ../../Zotlabs/Module/Photos.php:1348 +#: ../../Zotlabs/Module/Photos.php:1361 ../../Zotlabs/Module/Photos.php:1362 msgid "Recent Photos" msgstr "Последние фотографии" @@ -798,7 +809,7 @@ msgstr[0] "доступно %d приглашение" msgstr[1] "доступны %d приглашения" msgstr[2] "доступны %d приглашений" -#: ../../include/contact_widgets.php:16 ../../include/acl_selectors.php:135 +#: ../../include/contact_widgets.php:16 ../../include/acl_selectors.php:144 #: ../../Zotlabs/Module/Admin/Site.php:297 msgid "Advanced" msgstr "Дополнительно" @@ -850,31 +861,33 @@ msgstr "Сохранённые каталоги" #: ../../include/contact_widgets.php:56 ../../include/contact_widgets.php:111 #: ../../include/contact_widgets.php:155 ../../include/contact_widgets.php:200 -#: ../../Zotlabs/Widget/Filer.php:31 ../../Zotlabs/Widget/Appcategories.php:46 +#: ../../include/contact_widgets.php:235 ../../Zotlabs/Widget/Filer.php:31 +#: ../../Zotlabs/Widget/Appcategories.php:46 msgid "Everything" msgstr "Всё" #: ../../include/contact_widgets.php:108 ../../include/contact_widgets.php:152 -#: ../../include/contact_widgets.php:197 ../../include/taxonomy.php:418 -#: ../../include/taxonomy.php:500 ../../include/taxonomy.php:520 -#: ../../include/taxonomy.php:541 ../../Zotlabs/Module/Cdav.php:1066 +#: ../../include/contact_widgets.php:197 ../../include/contact_widgets.php:232 +#: ../../include/taxonomy.php:435 ../../include/taxonomy.php:517 +#: ../../include/taxonomy.php:537 ../../include/taxonomy.php:558 +#: ../../Zotlabs/Storage/Browser.php:293 ../../Zotlabs/Storage/Browser.php:381 +#: ../../Zotlabs/Storage/Browser.php:396 ../../Zotlabs/Module/Cdav.php:1070 #: ../../Zotlabs/Widget/Appcategories.php:43 msgid "Categories" msgstr "Категории" -#: ../../include/contact_widgets.php:231 +#: ../../include/contact_widgets.php:265 msgid "Common Connections" msgstr "Общие контакты" -#: ../../include/contact_widgets.php:235 +#: ../../include/contact_widgets.php:269 #, php-format msgid "View all %d common connections" msgstr "Просмотреть все %d общих контактов" -#: ../../include/menu.php:120 ../../include/channel.php:1524 -#: ../../include/channel.php:1528 ../../Zotlabs/Storage/Browser.php:296 -#: ../../Zotlabs/Module/Oauth.php:173 ../../Zotlabs/Module/Oauth2.php:194 -#: ../../Zotlabs/Module/Editlayout.php:114 +#: ../../include/menu.php:120 ../../include/channel.php:1538 +#: ../../include/channel.php:1542 ../../Zotlabs/Module/Oauth.php:173 +#: ../../Zotlabs/Module/Oauth2.php:194 ../../Zotlabs/Module/Editlayout.php:114 #: ../../Zotlabs/Module/Editblock.php:114 ../../Zotlabs/Module/Menu.php:176 #: ../../Zotlabs/Module/Admin/Profs.php:175 #: ../../Zotlabs/Module/Editwebpage.php:142 ../../Zotlabs/Module/Thing.php:268 @@ -934,13 +947,13 @@ msgstr "Профиль по умолчанию" msgid "Unable to retrieve modified identity" msgstr "Не удается найти изменённый идентификатор" -#: ../../include/channel.php:1371 +#: ../../include/channel.php:1385 msgid "Requested channel is not available." msgstr "Запрошенный канал не доступен." -#: ../../include/channel.php:1425 ../../Zotlabs/Module/Achievements.php:15 +#: ../../include/channel.php:1439 ../../Zotlabs/Module/Achievements.php:15 #: ../../Zotlabs/Module/Profile.php:20 ../../Zotlabs/Module/Editlayout.php:31 -#: ../../Zotlabs/Module/Filestorage.php:53 +#: ../../Zotlabs/Module/Filestorage.php:59 #: ../../Zotlabs/Module/Editblock.php:31 ../../Zotlabs/Module/Menu.php:92 #: ../../Zotlabs/Module/Hcard.php:12 ../../Zotlabs/Module/Editwebpage.php:32 #: ../../Zotlabs/Module/Webpages.php:39 ../../Zotlabs/Module/Blocks.php:33 @@ -950,83 +963,83 @@ msgstr "Запрошенный канал не доступен." msgid "Requested profile is not available." msgstr "Запрашиваемый профиль не доступен." -#: ../../include/channel.php:1517 ../../Zotlabs/Module/Profiles.php:730 +#: ../../include/channel.php:1531 ../../Zotlabs/Module/Profiles.php:730 msgid "Change profile photo" msgstr "Изменить фотографию профиля" -#: ../../include/channel.php:1524 ../../include/nav.php:115 +#: ../../include/channel.php:1538 ../../include/nav.php:115 #: ../../Zotlabs/Module/Profiles.php:832 msgid "Edit Profiles" msgstr "Редактирование профилей" -#: ../../include/channel.php:1525 +#: ../../include/channel.php:1539 msgid "Create New Profile" msgstr "Создать новый профиль" -#: ../../include/channel.php:1528 ../../include/nav.php:117 +#: ../../include/channel.php:1542 ../../include/nav.php:117 #: ../../extend/addon/hzaddons/openclipatar/openclipatar.php:58 msgid "Edit Profile" msgstr "Редактировать профиль" -#: ../../include/channel.php:1543 ../../Zotlabs/Module/Profiles.php:822 +#: ../../include/channel.php:1557 ../../Zotlabs/Module/Profiles.php:822 msgid "Profile Image" msgstr "Изображение профиля" -#: ../../include/channel.php:1546 +#: ../../include/channel.php:1560 msgid "Visible to everybody" msgstr "Видно всем" -#: ../../include/channel.php:1547 ../../Zotlabs/Module/Profiles.php:727 +#: ../../include/channel.php:1561 ../../Zotlabs/Module/Profiles.php:727 #: ../../Zotlabs/Module/Profiles.php:826 msgid "Edit visibility" msgstr "Редактировать видимость" -#: ../../include/channel.php:1604 ../../include/conversation.php:1097 +#: ../../include/channel.php:1618 ../../include/conversation.php:1100 #: ../../include/connections.php:110 ../../Zotlabs/Module/Directory.php:368 #: ../../Zotlabs/Module/Connections.php:349 ../../Zotlabs/Module/Suggest.php:71 #: ../../Zotlabs/Widget/Suggestions.php:46 ../../Zotlabs/Widget/Follow.php:32 msgid "Connect" msgstr "Подключить" -#: ../../include/channel.php:1619 ../../include/event.php:63 +#: ../../include/channel.php:1633 ../../include/event.php:63 #: ../../include/event.php:134 ../../Zotlabs/Module/Directory.php:352 msgid "Location:" msgstr "Местоположение:" -#: ../../include/channel.php:1623 ../../include/channel.php:1751 +#: ../../include/channel.php:1637 ../../include/channel.php:1765 msgid "Gender:" msgstr "Пол:" -#: ../../include/channel.php:1624 ../../include/channel.php:1795 +#: ../../include/channel.php:1638 ../../include/channel.php:1809 msgid "Status:" msgstr "Статус:" -#: ../../include/channel.php:1625 ../../include/channel.php:1819 +#: ../../include/channel.php:1639 ../../include/channel.php:1833 msgid "Homepage:" msgstr "Домашняя страница:" -#: ../../include/channel.php:1626 +#: ../../include/channel.php:1640 msgid "Online Now" msgstr "Сейчас в сети" -#: ../../include/channel.php:1679 +#: ../../include/channel.php:1693 msgid "Change your profile photo" msgstr "Изменить фотографию вашего профиля" -#: ../../include/channel.php:1710 +#: ../../include/channel.php:1724 msgid "Trans" msgstr "Трансексуал" -#: ../../include/channel.php:1749 ../../Zotlabs/Module/Settings/Channel.php:501 +#: ../../include/channel.php:1763 ../../Zotlabs/Module/Settings/Channel.php:501 msgid "Full Name:" msgstr "Полное имя:" -#: ../../include/channel.php:1756 +#: ../../include/channel.php:1770 msgid "Like this channel" msgstr "нравится этот канал" -#: ../../include/channel.php:1767 ../../include/conversation.php:1746 -#: ../../include/taxonomy.php:668 ../../Zotlabs/Module/Photos.php:1135 +#: ../../include/channel.php:1781 ../../include/conversation.php:1749 +#: ../../include/taxonomy.php:685 ../../Zotlabs/Module/Photos.php:1136 #: ../../Zotlabs/Lib/ThreadItem.php:242 msgctxt "noun" msgid "Like" @@ -1035,130 +1048,130 @@ msgstr[0] "Нравится" msgstr[1] "Нравится" msgstr[2] "Нравится" -#: ../../include/channel.php:1780 +#: ../../include/channel.php:1794 msgid "j F, Y" msgstr "" -#: ../../include/channel.php:1781 +#: ../../include/channel.php:1795 msgid "j F" msgstr "" -#: ../../include/channel.php:1788 +#: ../../include/channel.php:1802 msgid "Birthday:" msgstr "День рождения:" -#: ../../include/channel.php:1792 ../../Zotlabs/Module/Directory.php:347 +#: ../../include/channel.php:1806 ../../Zotlabs/Module/Directory.php:347 msgid "Age:" msgstr "Возраст:" -#: ../../include/channel.php:1801 +#: ../../include/channel.php:1815 #, php-format msgid "for %1$d %2$s" msgstr "для %1$d %2$s" -#: ../../include/channel.php:1813 +#: ../../include/channel.php:1827 msgid "Tags:" msgstr "Теги:" -#: ../../include/channel.php:1817 +#: ../../include/channel.php:1831 msgid "Sexual Preference:" msgstr "Сексуальные предпочтения:" -#: ../../include/channel.php:1821 ../../Zotlabs/Module/Directory.php:365 +#: ../../include/channel.php:1835 ../../Zotlabs/Module/Directory.php:365 msgid "Hometown:" msgstr "Родной город:" -#: ../../include/channel.php:1823 +#: ../../include/channel.php:1837 msgid "Political Views:" msgstr "Политические взгляды:" -#: ../../include/channel.php:1825 +#: ../../include/channel.php:1839 msgid "Religion:" msgstr "Религия:" -#: ../../include/channel.php:1827 ../../Zotlabs/Module/Directory.php:367 +#: ../../include/channel.php:1841 ../../Zotlabs/Module/Directory.php:367 msgid "About:" msgstr "О себе:" -#: ../../include/channel.php:1829 +#: ../../include/channel.php:1843 msgid "Hobbies/Interests:" msgstr "Хобби / интересы:" -#: ../../include/channel.php:1831 +#: ../../include/channel.php:1845 msgid "Likes:" msgstr "Что вам нравится:" -#: ../../include/channel.php:1833 +#: ../../include/channel.php:1847 msgid "Dislikes:" msgstr "Что вам не нравится:" -#: ../../include/channel.php:1835 +#: ../../include/channel.php:1849 msgid "Contact information and Social Networks:" msgstr "Контактная информация и социальные сети:" -#: ../../include/channel.php:1837 +#: ../../include/channel.php:1851 msgid "My other channels:" msgstr "Мои другие каналы:" -#: ../../include/channel.php:1839 +#: ../../include/channel.php:1853 msgid "Musical interests:" msgstr "Музыкальные интересы:" -#: ../../include/channel.php:1841 +#: ../../include/channel.php:1855 msgid "Books, literature:" msgstr "Книги, литература:" -#: ../../include/channel.php:1843 +#: ../../include/channel.php:1857 msgid "Television:" msgstr "Телевидение:" -#: ../../include/channel.php:1845 +#: ../../include/channel.php:1859 msgid "Film/dance/culture/entertainment:" msgstr "Кино / танцы / культура / развлечения:" -#: ../../include/channel.php:1847 +#: ../../include/channel.php:1861 msgid "Love/Romance:" msgstr "Любовь / романтика:" -#: ../../include/channel.php:1849 +#: ../../include/channel.php:1863 msgid "Work/employment:" msgstr "Работа / занятость:" -#: ../../include/channel.php:1851 +#: ../../include/channel.php:1865 msgid "School/education:" msgstr "Школа / образование:" -#: ../../include/channel.php:1872 ../../Zotlabs/Module/Profperm.php:113 +#: ../../include/channel.php:1886 ../../Zotlabs/Module/Profperm.php:113 #: ../../Zotlabs/Lib/Apps.php:362 msgid "Profile" msgstr "Профиль" -#: ../../include/channel.php:1874 +#: ../../include/channel.php:1888 msgid "Like this thing" msgstr "нравится этo" -#: ../../include/channel.php:1875 ../../Zotlabs/Module/Events.php:699 +#: ../../include/channel.php:1889 ../../Zotlabs/Module/Events.php:699 msgid "Export" msgstr "Экспорт" -#: ../../include/channel.php:2314 ../../Zotlabs/Module/Cover_photo.php:304 +#: ../../include/channel.php:2328 ../../Zotlabs/Module/Cover_photo.php:304 msgid "cover photo" msgstr "фотография обложки" -#: ../../include/channel.php:2603 ../../boot.php:1700 +#: ../../include/channel.php:2597 ../../boot.php:1700 #: ../../Zotlabs/Module/Rmagic.php:96 msgid "Remote Authentication" msgstr "Удаленная аутентификация" -#: ../../include/channel.php:2604 ../../Zotlabs/Module/Rmagic.php:97 +#: ../../include/channel.php:2598 ../../Zotlabs/Module/Rmagic.php:97 msgid "Enter your channel address (e.g. channel@example.com)" msgstr "Введите адрес вашего канала (например: channel@example.com)" -#: ../../include/channel.php:2605 ../../Zotlabs/Module/Rmagic.php:98 +#: ../../include/channel.php:2599 ../../Zotlabs/Module/Rmagic.php:98 msgid "Authenticate" msgstr "Проверка подлинности" -#: ../../include/channel.php:2763 ../../Zotlabs/Module/Admin/Accounts.php:91 +#: ../../include/channel.php:2757 ../../Zotlabs/Module/Admin/Accounts.php:91 #, php-format msgid "Account '%s' deleted" msgstr "Аккаунт '%s' удален" @@ -1190,7 +1203,7 @@ msgstr "%1$s была создана %2$s %3$s" #: ../../include/markdown.php:204 ../../include/text.php:2258 #: ../../include/bbcode.php:523 ../../include/conversation.php:158 -#: ../../Zotlabs/Module/Tagger.php:79 ../../Zotlabs/Lib/Activity.php:2967 +#: ../../Zotlabs/Module/Tagger.php:79 ../../Zotlabs/Lib/Activity.php:2971 msgid "post" msgstr "публикация" @@ -1200,9 +1213,9 @@ msgstr "спойлер" #: ../../include/items.php:439 ../../Zotlabs/Module/Dreport.php:10 #: ../../Zotlabs/Module/Dreport.php:82 ../../Zotlabs/Module/Share.php:72 -#: ../../Zotlabs/Module/Profperm.php:28 ../../Zotlabs/Module/Like.php:295 +#: ../../Zotlabs/Module/Profperm.php:28 ../../Zotlabs/Module/Like.php:332 #: ../../Zotlabs/Module/Subthread.php:86 ../../Zotlabs/Module/Group.php:99 -#: ../../Zotlabs/Module/Cloud.php:119 ../../Zotlabs/Module/Import_items.php:120 +#: ../../Zotlabs/Module/Cloud.php:123 ../../Zotlabs/Module/Import_items.php:120 #: ../../Zotlabs/Web/WebServer.php:115 #: ../../extend/addon/hzaddons/redphotos/redphotos.php:119 #: ../../extend/addon/hzaddons/redfiles/redfiles.php:109 @@ -1247,9 +1260,9 @@ msgstr "Видно только одобренным контактам." msgid "Visible to specific connections." msgstr "Видно указанным контактам." -#: ../../include/items.php:3889 ../../Zotlabs/Module/Display.php:45 -#: ../../Zotlabs/Module/Display.php:446 ../../Zotlabs/Module/Admin.php:62 -#: ../../Zotlabs/Module/Filestorage.php:26 ../../Zotlabs/Module/Viewsrc.php:25 +#: ../../include/items.php:3900 ../../Zotlabs/Module/Display.php:42 +#: ../../Zotlabs/Module/Display.php:429 ../../Zotlabs/Module/Admin.php:62 +#: ../../Zotlabs/Module/Filestorage.php:29 ../../Zotlabs/Module/Viewsrc.php:25 #: ../../Zotlabs/Module/Admin/Addons.php:260 #: ../../Zotlabs/Module/Admin/Themes.php:72 ../../Zotlabs/Module/Thing.php:96 #: ../../extend/addon/hzaddons/flashcards/Mod_Flashcards.php:284 @@ -1257,67 +1270,67 @@ msgstr "Видно указанным контактам." msgid "Item not found." msgstr "Элемент не найден." -#: ../../include/items.php:4466 ../../Zotlabs/Module/Group.php:62 +#: ../../include/items.php:4472 ../../Zotlabs/Module/Group.php:62 #: ../../Zotlabs/Module/Group.php:214 msgid "Privacy group not found." msgstr "Группа конфиденциальности не найдена." -#: ../../include/items.php:4482 +#: ../../include/items.php:4488 msgid "Privacy group is empty." msgstr "Группа конфиденциальности пуста" -#: ../../include/items.php:4489 +#: ../../include/items.php:4495 #, php-format msgid "Privacy group: %s" msgstr "Группа конфиденциальности: %s" -#: ../../include/items.php:4499 ../../Zotlabs/Module/Connedit.php:859 +#: ../../include/items.php:4505 ../../Zotlabs/Module/Connedit.php:859 #, php-format msgid "Connection: %s" msgstr "Контакт: %s" -#: ../../include/items.php:4501 +#: ../../include/items.php:4507 msgid "Connection not found." msgstr "Контакт не найден." -#: ../../include/items.php:4835 ../../Zotlabs/Module/Cover_photo.php:297 +#: ../../include/items.php:4841 ../../Zotlabs/Module/Cover_photo.php:297 msgid "female" msgstr "женщина" -#: ../../include/items.php:4836 ../../Zotlabs/Module/Cover_photo.php:298 +#: ../../include/items.php:4842 ../../Zotlabs/Module/Cover_photo.php:298 #, php-format msgid "%1$s updated her %2$s" msgstr "%1$s обновила её %2$s" -#: ../../include/items.php:4837 ../../Zotlabs/Module/Cover_photo.php:299 +#: ../../include/items.php:4843 ../../Zotlabs/Module/Cover_photo.php:299 msgid "male" msgstr "мужчина" -#: ../../include/items.php:4838 ../../Zotlabs/Module/Cover_photo.php:300 +#: ../../include/items.php:4844 ../../Zotlabs/Module/Cover_photo.php:300 #, php-format msgid "%1$s updated his %2$s" msgstr "%1$s обновил его %2$s" -#: ../../include/items.php:4840 ../../Zotlabs/Module/Cover_photo.php:302 +#: ../../include/items.php:4846 ../../Zotlabs/Module/Cover_photo.php:302 #, php-format msgid "%1$s updated their %2$s" msgstr "%2$s %1$s обновлена" -#: ../../include/items.php:4842 +#: ../../include/items.php:4848 msgid "profile photo" msgstr "Фотография профиля" -#: ../../include/items.php:5034 +#: ../../include/items.php:5040 #, php-format msgid "[Edited %s]" msgstr "[Отредактировано %s]" -#: ../../include/items.php:5034 +#: ../../include/items.php:5040 msgctxt "edit_activity" msgid "Post" msgstr "Публикация" -#: ../../include/items.php:5034 +#: ../../include/items.php:5040 msgctxt "edit_activity" msgid "Comment" msgstr "Комментарий" @@ -1358,8 +1371,7 @@ msgid "On" msgstr "Вкл." #: ../../include/features.php:82 ../../include/nav.php:463 -#: ../../include/nav.php:466 ../../Zotlabs/Storage/Browser.php:140 -#: ../../Zotlabs/Lib/Apps.php:346 +#: ../../include/nav.php:466 ../../Zotlabs/Lib/Apps.php:346 msgid "Calendar" msgstr "Календарь" @@ -1726,8 +1738,8 @@ msgid "Network: %s" msgstr "Сеть: %s" #: ../../include/text.php:1150 ../../include/text.php:1162 -#: ../../include/acl_selectors.php:139 ../../include/nav.php:188 -#: ../../Zotlabs/Module/Search.php:44 ../../Zotlabs/Module/Connections.php:378 +#: ../../include/acl_selectors.php:148 ../../include/nav.php:188 +#: ../../Zotlabs/Module/Search.php:41 ../../Zotlabs/Module/Connections.php:378 #: ../../Zotlabs/Widget/Sitesearch.php:31 #: ../../Zotlabs/Widget/Activity_filter.php:193 ../../Zotlabs/Lib/Apps.php:353 msgid "Search" @@ -1736,7 +1748,7 @@ msgstr "Поиск" #: ../../include/text.php:1151 ../../include/text.php:1163 #: ../../Zotlabs/Module/Admin/Profs.php:94 #: ../../Zotlabs/Module/Admin/Profs.php:114 ../../Zotlabs/Module/Rbmark.php:32 -#: ../../Zotlabs/Module/Rbmark.php:104 ../../Zotlabs/Module/Filer.php:53 +#: ../../Zotlabs/Module/Rbmark.php:104 ../../Zotlabs/Module/Filer.php:54 #: ../../Zotlabs/Widget/Notes.php:23 #: ../../extend/addon/hzaddons/queueworker/Mod_Queueworker.php:119 msgid "Save" @@ -1955,12 +1967,12 @@ msgstr "Декабрь" msgid "Unknown Attachment" msgstr "Неизвестное вложение" -#: ../../include/text.php:1562 ../../Zotlabs/Storage/Browser.php:293 +#: ../../include/text.php:1562 ../../Zotlabs/Storage/Browser.php:372 #: ../../Zotlabs/Module/Sharedwithme.php:108 msgid "Size" msgstr "Размер" -#: ../../include/text.php:1562 ../../include/feedutils.php:871 +#: ../../include/text.php:1562 ../../include/feedutils.php:873 msgid "unknown" msgstr "неизвестный" @@ -2037,10 +2049,10 @@ msgid "Page content type" msgstr "Тип содержимого страницы" #: ../../include/text.php:2252 ../../include/conversation.php:128 -#: ../../Zotlabs/Module/Tagger.php:71 ../../Zotlabs/Module/Like.php:386 -#: ../../Zotlabs/Module/Subthread.php:112 ../../Zotlabs/Lib/Activity.php:2967 +#: ../../Zotlabs/Module/Tagger.php:71 ../../Zotlabs/Module/Like.php:433 +#: ../../Zotlabs/Module/Subthread.php:112 ../../Zotlabs/Lib/Activity.php:2971 #: ../../extend/addon/hzaddons/redphotos/redphotohelper.php:71 -#: ../../extend/addon/hzaddons/pubcrawl/as.php:1881 +#: ../../extend/addon/hzaddons/pubcrawl/as.php:2057 #: ../../extend/addon/hzaddons/diaspora/Receiver.php:1601 msgid "photo" msgstr "фото" @@ -2049,7 +2061,7 @@ msgstr "фото" #: ../../include/event.php:1259 ../../Zotlabs/Module/Tagger.php:75 #: ../../Zotlabs/Module/Events.php:266 #: ../../Zotlabs/Module/Channel_calendar.php:219 -#: ../../Zotlabs/Module/Like.php:388 +#: ../../Zotlabs/Module/Like.php:435 msgid "event" msgstr "событие" @@ -2154,10 +2166,6 @@ msgstr "Введите путь к расположению сетевых фа msgid "Specify folder" msgstr "Указать каталог" -#: ../../include/text.php:3101 ../../Zotlabs/Storage/Browser.php:131 -msgid "Collection" -msgstr "Коллекция" - #: ../../include/import.php:29 msgid "Unable to import a removed channel." msgstr "Невозможно импортировать удалённый канал." @@ -2192,7 +2200,7 @@ msgstr "Добавить новые контакты в группу конфи msgid "edit" msgstr "редактировать" -#: ../../include/group.php:321 ../../include/acl_selectors.php:87 +#: ../../include/group.php:321 ../../include/acl_selectors.php:86 #: ../../include/nav.php:101 ../../Zotlabs/Module/Group.php:142 #: ../../Zotlabs/Module/Group.php:154 #: ../../Zotlabs/Widget/Activity_filter.php:82 ../../Zotlabs/Lib/Group.php:324 @@ -2353,9 +2361,9 @@ msgstr "Помощь" msgid "Not Found" msgstr "Не найдено" -#: ../../include/help.php:132 ../../Zotlabs/Module/Display.php:139 -#: ../../Zotlabs/Module/Display.php:156 ../../Zotlabs/Module/Display.php:176 -#: ../../Zotlabs/Module/Display.php:182 ../../Zotlabs/Module/Page.php:136 +#: ../../include/help.php:132 ../../Zotlabs/Module/Display.php:136 +#: ../../Zotlabs/Module/Display.php:153 ../../Zotlabs/Module/Display.php:173 +#: ../../Zotlabs/Module/Display.php:179 ../../Zotlabs/Module/Page.php:136 #: ../../Zotlabs/Module/Block.php:77 ../../Zotlabs/Web/Router.php:185 #: ../../Zotlabs/Lib/NativeWikiPage.php:521 msgid "Page not found." @@ -2432,21 +2440,21 @@ msgstr "Различные зрители увидят этот текст по- msgid "$1 wrote:" msgstr "$1 писал:" -#: ../../include/conversation.php:135 ../../Zotlabs/Module/Like.php:129 +#: ../../include/conversation.php:135 ../../Zotlabs/Module/Like.php:166 msgid "channel" msgstr "канал" -#: ../../include/conversation.php:174 ../../Zotlabs/Module/Like.php:422 -#: ../../Zotlabs/Lib/Activity.php:3002 -#: ../../extend/addon/hzaddons/pubcrawl/as.php:1918 +#: ../../include/conversation.php:174 ../../Zotlabs/Module/Like.php:469 +#: ../../Zotlabs/Lib/Activity.php:3006 +#: ../../extend/addon/hzaddons/pubcrawl/as.php:2094 #: ../../extend/addon/hzaddons/diaspora/Receiver.php:1541 #, php-format msgid "%1$s likes %2$s's %3$s" msgstr "%1$s нравится %3$s %2$s" -#: ../../include/conversation.php:177 ../../Zotlabs/Module/Like.php:424 -#: ../../Zotlabs/Lib/Activity.php:3004 -#: ../../extend/addon/hzaddons/pubcrawl/as.php:1920 +#: ../../include/conversation.php:177 ../../Zotlabs/Module/Like.php:471 +#: ../../Zotlabs/Lib/Activity.php:3008 +#: ../../extend/addon/hzaddons/pubcrawl/as.php:2096 #, php-format msgid "%1$s doesn't like %2$s's %3$s" msgstr "%1$s не нравится %2$s %3$s" @@ -2477,64 +2485,64 @@ msgctxt "mood" msgid "%1$s is %2$s" msgstr "%1$s %2$s" -#: ../../include/conversation.php:515 ../../Zotlabs/Lib/ThreadItem.php:500 +#: ../../include/conversation.php:516 ../../Zotlabs/Lib/ThreadItem.php:500 msgid "This is an unsaved preview" msgstr "Это несохранённый просмотр" -#: ../../include/conversation.php:651 ../../Zotlabs/Module/Photos.php:1112 +#: ../../include/conversation.php:652 ../../Zotlabs/Module/Photos.php:1113 msgctxt "title" msgid "Likes" msgstr "Нравится" -#: ../../include/conversation.php:652 ../../Zotlabs/Module/Photos.php:1112 +#: ../../include/conversation.php:653 ../../Zotlabs/Module/Photos.php:1113 msgctxt "title" msgid "Dislikes" msgstr "Не нравится" -#: ../../include/conversation.php:653 ../../Zotlabs/Module/Photos.php:1113 +#: ../../include/conversation.php:654 ../../Zotlabs/Module/Photos.php:1114 #: ../../Zotlabs/Widget/Pinned.php:77 msgctxt "title" msgid "Agree" msgstr "Согласен" -#: ../../include/conversation.php:654 ../../Zotlabs/Module/Photos.php:1113 +#: ../../include/conversation.php:655 ../../Zotlabs/Module/Photos.php:1114 #: ../../Zotlabs/Widget/Pinned.php:78 msgctxt "title" msgid "Disagree" msgstr "Не согласен" -#: ../../include/conversation.php:655 ../../Zotlabs/Module/Photos.php:1113 +#: ../../include/conversation.php:656 ../../Zotlabs/Module/Photos.php:1114 #: ../../Zotlabs/Widget/Pinned.php:79 msgctxt "title" msgid "Abstain" msgstr "Воздержался" -#: ../../include/conversation.php:656 ../../Zotlabs/Module/Photos.php:1114 +#: ../../include/conversation.php:657 ../../Zotlabs/Module/Photos.php:1115 #: ../../Zotlabs/Widget/Pinned.php:66 msgctxt "title" msgid "Attending" msgstr "Посещаю" -#: ../../include/conversation.php:657 ../../Zotlabs/Module/Photos.php:1114 +#: ../../include/conversation.php:658 ../../Zotlabs/Module/Photos.php:1115 #: ../../Zotlabs/Widget/Pinned.php:67 msgctxt "title" msgid "Not attending" msgstr "Не посещаю" -#: ../../include/conversation.php:658 ../../Zotlabs/Module/Photos.php:1114 +#: ../../include/conversation.php:659 ../../Zotlabs/Module/Photos.php:1115 #: ../../Zotlabs/Widget/Pinned.php:68 msgctxt "title" msgid "Might attend" msgstr "Возможно посещу" -#: ../../include/conversation.php:728 ../../Zotlabs/Lib/ThreadItem.php:180 +#: ../../include/conversation.php:729 ../../Zotlabs/Lib/ThreadItem.php:180 msgid "Select" msgstr "Выбрать" -#: ../../include/conversation.php:729 ../../include/conversation.php:774 -#: ../../Zotlabs/Storage/Browser.php:297 ../../Zotlabs/Module/Cdav.php:1052 -#: ../../Zotlabs/Module/Cdav.php:1385 ../../Zotlabs/Module/Profiles.php:802 -#: ../../Zotlabs/Module/Photos.php:1178 ../../Zotlabs/Module/Oauth.php:174 +#: ../../include/conversation.php:730 ../../include/conversation.php:775 +#: ../../Zotlabs/Storage/Browser.php:377 ../../Zotlabs/Module/Cdav.php:1056 +#: ../../Zotlabs/Module/Cdav.php:1389 ../../Zotlabs/Module/Profiles.php:802 +#: ../../Zotlabs/Module/Photos.php:1179 ../../Zotlabs/Module/Oauth.php:174 #: ../../Zotlabs/Module/Oauth2.php:195 ../../Zotlabs/Module/Editlayout.php:138 #: ../../Zotlabs/Module/Editblock.php:139 #: ../../Zotlabs/Module/Admin/Channels.php:149 @@ -2551,149 +2559,148 @@ msgstr "Выбрать" msgid "Delete" msgstr "Удалить" -#: ../../include/conversation.php:733 ../../Zotlabs/Lib/ThreadItem.php:273 +#: ../../include/conversation.php:734 ../../Zotlabs/Lib/ThreadItem.php:273 msgid "Toggle Star Status" msgstr "Переключить статус пометки" -#: ../../include/conversation.php:738 ../../Zotlabs/Lib/ThreadItem.php:103 +#: ../../include/conversation.php:739 ../../Zotlabs/Lib/ThreadItem.php:103 msgid "Private Message" msgstr "Личное сообщение" -#: ../../include/conversation.php:745 ../../Zotlabs/Widget/Pinned.php:88 +#: ../../include/conversation.php:746 ../../Zotlabs/Widget/Pinned.php:88 #: ../../Zotlabs/Lib/ThreadItem.php:284 msgid "Message signature validated" msgstr "Подпись сообщения проверена" -#: ../../include/conversation.php:746 ../../Zotlabs/Widget/Pinned.php:89 +#: ../../include/conversation.php:747 ../../Zotlabs/Widget/Pinned.php:89 #: ../../Zotlabs/Lib/ThreadItem.php:285 msgid "Message signature incorrect" msgstr "Подпись сообщения неверная" -#: ../../include/conversation.php:773 +#: ../../include/conversation.php:774 #: ../../Zotlabs/Module/Admin/Accounts.php:173 #: ../../Zotlabs/Module/Connections.php:342 msgid "Approve" msgstr "Утвердить" -#: ../../include/conversation.php:778 +#: ../../include/conversation.php:779 #, php-format msgid "View %s's profile @ %s" msgstr "Просмотреть профиль %s @ %s" -#: ../../include/conversation.php:798 +#: ../../include/conversation.php:799 msgid "Categories:" msgstr "Категории:" -#: ../../include/conversation.php:799 +#: ../../include/conversation.php:800 msgid "Filed under:" msgstr "Хранить под:" -#: ../../include/conversation.php:805 ../../Zotlabs/Widget/Pinned.php:133 +#: ../../include/conversation.php:806 ../../Zotlabs/Widget/Pinned.php:133 #: ../../Zotlabs/Lib/ThreadItem.php:429 #, php-format msgid "from %s" msgstr "от %s" -#: ../../include/conversation.php:808 ../../Zotlabs/Widget/Pinned.php:136 +#: ../../include/conversation.php:809 ../../Zotlabs/Widget/Pinned.php:136 #: ../../Zotlabs/Lib/ThreadItem.php:432 #, php-format msgid "last edited: %s" msgstr "последнее редактирование: %s" -#: ../../include/conversation.php:809 ../../Zotlabs/Widget/Pinned.php:137 +#: ../../include/conversation.php:810 ../../Zotlabs/Widget/Pinned.php:137 #: ../../Zotlabs/Lib/ThreadItem.php:433 #, php-format msgid "Expires: %s" msgstr "Срок действия: %s" -#: ../../include/conversation.php:824 +#: ../../include/conversation.php:825 msgid "View in context" msgstr "Показать в контексте" -#: ../../include/conversation.php:826 ../../Zotlabs/Module/Photos.php:1078 +#: ../../include/conversation.php:827 ../../Zotlabs/Module/Photos.php:1079 #: ../../Zotlabs/Lib/ThreadItem.php:501 msgid "Please wait" msgstr "Подождите пожалуйста" -#: ../../include/conversation.php:925 +#: ../../include/conversation.php:928 msgid "remove" msgstr "удалить" -#: ../../include/conversation.php:929 +#: ../../include/conversation.php:932 msgid "Loading..." msgstr "Загрузка..." -#: ../../include/conversation.php:930 ../../Zotlabs/Lib/ThreadItem.php:301 +#: ../../include/conversation.php:933 ../../Zotlabs/Lib/ThreadItem.php:301 msgid "Conversation Tools" msgstr "Инструменты общения" -#: ../../include/conversation.php:931 +#: ../../include/conversation.php:934 msgid "Delete Selected Items" msgstr "Удалить выбранные элементы" -#: ../../include/conversation.php:974 +#: ../../include/conversation.php:977 msgid "View Source" msgstr "Просмотреть источник" -#: ../../include/conversation.php:984 +#: ../../include/conversation.php:987 msgid "Follow Thread" msgstr "Следить за темой" -#: ../../include/conversation.php:993 +#: ../../include/conversation.php:996 msgid "Unfollow Thread" msgstr "Прекратить отслеживать тему" -#: ../../include/conversation.php:1077 ../../include/nav.php:112 +#: ../../include/conversation.php:1080 ../../include/nav.php:112 #: ../../Zotlabs/Module/Connedit.php:600 ../../Zotlabs/Lib/Apps.php:344 #: ../../extend/addon/hzaddons/openclipatar/openclipatar.php:57 msgid "View Profile" msgstr "Просмотреть профиль" -#: ../../include/conversation.php:1087 ../../Zotlabs/Module/Connedit.php:621 +#: ../../include/conversation.php:1090 ../../Zotlabs/Module/Connedit.php:621 msgid "Recent Activity" msgstr "Последние действия" -#: ../../include/conversation.php:1107 +#: ../../include/conversation.php:1110 msgid "Edit Connection" msgstr "Редактировать контакт" -#: ../../include/conversation.php:1117 +#: ../../include/conversation.php:1120 msgid "Message" msgstr "Сообщение" -#: ../../include/conversation.php:1127 ../../Zotlabs/Module/Ratings.php:97 +#: ../../include/conversation.php:1130 ../../Zotlabs/Module/Ratings.php:97 #: ../../Zotlabs/Module/Pubsites.php:35 msgid "Ratings" msgstr "Оценки" -#: ../../include/conversation.php:1137 ../../Zotlabs/Module/Poke.php:199 +#: ../../include/conversation.php:1140 ../../Zotlabs/Module/Poke.php:199 #: ../../Zotlabs/Lib/Apps.php:351 msgid "Poke" msgstr "Ткнуть" -#: ../../include/conversation.php:1208 ../../include/cdav.php:158 +#: ../../include/conversation.php:1211 ../../include/cdav.php:158 #: ../../include/cdav.php:159 ../../include/cdav.php:167 -#: ../../Zotlabs/Storage/Browser.php:164 ../../Zotlabs/Module/Photos.php:792 -#: ../../Zotlabs/Module/Photos.php:1254 +#: ../../Zotlabs/Module/Photos.php:793 ../../Zotlabs/Module/Photos.php:1255 #: ../../Zotlabs/Module/Embedphotos.php:176 #: ../../Zotlabs/Widget/Portfolio.php:95 ../../Zotlabs/Widget/Pinned.php:270 #: ../../Zotlabs/Widget/Album.php:84 ../../Zotlabs/Lib/Apps.php:1112 #: ../../Zotlabs/Lib/Apps.php:1196 ../../Zotlabs/Lib/Activity.php:1508 -#: ../../extend/addon/hzaddons/pubcrawl/as.php:1173 +#: ../../extend/addon/hzaddons/pubcrawl/as.php:1187 msgid "Unknown" msgstr "Неизвестный" -#: ../../include/conversation.php:1259 +#: ../../include/conversation.php:1262 #, php-format msgid "%s likes this." msgstr "%s нравится это." -#: ../../include/conversation.php:1259 +#: ../../include/conversation.php:1262 #, php-format msgid "%s doesn't like this." msgstr "%s не нравится это." -#: ../../include/conversation.php:1263 +#: ../../include/conversation.php:1266 #, php-format msgid "<span %1$s>%2$d people</span> like this." msgid_plural "<span %1$s>%2$d people</span> like this." @@ -2701,7 +2708,7 @@ msgstr[0] "<span %1$s>%2$d человеку</span> это нравится." msgstr[1] "<span %1$s>%2$d человекам</span> это нравится." msgstr[2] "<span %1$s>%2$d человекам</span> это нравится." -#: ../../include/conversation.php:1265 +#: ../../include/conversation.php:1268 #, php-format msgid "<span %1$s>%2$d people</span> don't like this." msgid_plural "<span %1$s>%2$d people</span> don't like this." @@ -2709,11 +2716,11 @@ msgstr[0] "<span %1$s>%2$d человеку</span> это не нравится msgstr[1] "<span %1$s>%2$d человекам</span> это не нравится." msgstr[2] "<span %1$s>%2$d человекам</span> это не нравится." -#: ../../include/conversation.php:1271 +#: ../../include/conversation.php:1274 msgid "and" msgstr "и" -#: ../../include/conversation.php:1274 +#: ../../include/conversation.php:1277 #, php-format msgid ", and %d other people" msgid_plural ", and %d other people" @@ -2721,27 +2728,27 @@ msgstr[0] ", и ещё %d человеку" msgstr[1] ", и ещё %d человекам" msgstr[2] ", и ещё %d человекам" -#: ../../include/conversation.php:1275 +#: ../../include/conversation.php:1278 #, php-format msgid "%s like this." msgstr "%s нравится это." -#: ../../include/conversation.php:1275 +#: ../../include/conversation.php:1278 #, php-format msgid "%s don't like this." msgstr "%s не нравится это." -#: ../../include/conversation.php:1325 +#: ../../include/conversation.php:1328 #: ../../extend/addon/hzaddons/hsse/hsse.php:82 msgid "Set your location" msgstr "Задать своё местоположение" -#: ../../include/conversation.php:1326 +#: ../../include/conversation.php:1329 #: ../../extend/addon/hzaddons/hsse/hsse.php:83 msgid "Clear browser location" msgstr "Очистить местоположение из браузера" -#: ../../include/conversation.php:1338 ../../Zotlabs/Module/Chat.php:220 +#: ../../include/conversation.php:1341 ../../Zotlabs/Module/Chat.php:220 #: ../../Zotlabs/Module/Editblock.php:116 #: ../../Zotlabs/Module/Editwebpage.php:143 #: ../../Zotlabs/Module/Card_edit.php:101 @@ -2752,81 +2759,81 @@ msgstr "Очистить местоположение из браузера" msgid "Insert web link" msgstr "Вставить веб-ссылку" -#: ../../include/conversation.php:1342 +#: ../../include/conversation.php:1345 #: ../../extend/addon/hzaddons/hsse/hsse.php:99 msgid "Embed (existing) photo from your photo albums" msgstr "Встроить (существующее) фото из вашего фотоальбома" -#: ../../include/conversation.php:1377 ../../Zotlabs/Module/Chat.php:218 +#: ../../include/conversation.php:1380 ../../Zotlabs/Module/Chat.php:218 #: ../../extend/addon/hzaddons/mail/Mod_Mail.php:119 #: ../../extend/addon/hzaddons/mail/Mod_Mail.php:240 #: ../../extend/addon/hzaddons/hsse/hsse.php:134 msgid "Please enter a link URL:" msgstr "Пожалуйста введите URL ссылки:" -#: ../../include/conversation.php:1378 +#: ../../include/conversation.php:1381 #: ../../extend/addon/hzaddons/hsse/hsse.php:135 msgid "Tag term:" msgstr "Теги:" -#: ../../include/conversation.php:1379 +#: ../../include/conversation.php:1382 #: ../../extend/addon/hzaddons/hsse/hsse.php:136 msgid "Where are you right now?" msgstr "Где вы сейчас?" -#: ../../include/conversation.php:1382 ../../Zotlabs/Module/Cover_photo.php:430 +#: ../../include/conversation.php:1385 ../../Zotlabs/Module/Cover_photo.php:430 #: ../../Zotlabs/Module/Profile_photo.php:509 ../../Zotlabs/Module/Wiki.php:403 #: ../../extend/addon/hzaddons/hsse/hsse.php:139 msgid "Choose images to embed" msgstr "Выбрать изображения для встраивания" -#: ../../include/conversation.php:1383 ../../Zotlabs/Module/Cover_photo.php:431 +#: ../../include/conversation.php:1386 ../../Zotlabs/Module/Cover_photo.php:431 #: ../../Zotlabs/Module/Profile_photo.php:510 ../../Zotlabs/Module/Wiki.php:404 #: ../../extend/addon/hzaddons/hsse/hsse.php:140 msgid "Choose an album" msgstr "Выбрать альбом" -#: ../../include/conversation.php:1384 +#: ../../include/conversation.php:1387 #: ../../extend/addon/hzaddons/hsse/hsse.php:141 msgid "Choose a different album..." msgstr "Выбрать другой альбом..." -#: ../../include/conversation.php:1385 ../../Zotlabs/Module/Cover_photo.php:433 +#: ../../include/conversation.php:1388 ../../Zotlabs/Module/Cover_photo.php:433 #: ../../Zotlabs/Module/Profile_photo.php:512 ../../Zotlabs/Module/Wiki.php:406 #: ../../extend/addon/hzaddons/hsse/hsse.php:142 msgid "Error getting album list" msgstr "Ошибка получения списка альбомов" -#: ../../include/conversation.php:1386 ../../Zotlabs/Module/Cover_photo.php:434 +#: ../../include/conversation.php:1389 ../../Zotlabs/Module/Cover_photo.php:434 #: ../../Zotlabs/Module/Profile_photo.php:513 ../../Zotlabs/Module/Wiki.php:407 #: ../../extend/addon/hzaddons/hsse/hsse.php:143 msgid "Error getting photo link" msgstr "Ошибка получения ссылки на фотографию" -#: ../../include/conversation.php:1387 ../../Zotlabs/Module/Cover_photo.php:435 +#: ../../include/conversation.php:1390 ../../Zotlabs/Module/Cover_photo.php:435 #: ../../Zotlabs/Module/Profile_photo.php:514 ../../Zotlabs/Module/Wiki.php:408 #: ../../extend/addon/hzaddons/hsse/hsse.php:144 msgid "Error getting album" msgstr "Ошибка получения альбома" -#: ../../include/conversation.php:1388 +#: ../../include/conversation.php:1391 #: ../../extend/addon/hzaddons/hsse/hsse.php:145 msgid "Comments enabled" msgstr "Комментарии включены" -#: ../../include/conversation.php:1389 +#: ../../include/conversation.php:1392 #: ../../extend/addon/hzaddons/hsse/hsse.php:146 msgid "Comments disabled" msgstr "Комментарии отключены" -#: ../../include/conversation.php:1399 ../../Zotlabs/Module/Photos.php:1098 +#: ../../include/conversation.php:1402 ../../Zotlabs/Module/Photos.php:1099 #: ../../Zotlabs/Module/Events.php:486 ../../Zotlabs/Module/Webpages.php:262 #: ../../Zotlabs/Lib/ThreadItem.php:835 #: ../../extend/addon/hzaddons/hsse/hsse.php:153 msgid "Preview" msgstr "Предварительный просмотр" -#: ../../include/conversation.php:1432 ../../Zotlabs/Module/Photos.php:1077 +#: ../../include/conversation.php:1435 ../../Zotlabs/Module/Photos.php:1078 #: ../../Zotlabs/Module/Webpages.php:256 ../../Zotlabs/Module/Blocks.php:161 #: ../../Zotlabs/Module/Wiki.php:301 ../../Zotlabs/Module/Layouts.php:194 #: ../../Zotlabs/Widget/Cdav.php:136 @@ -2834,58 +2841,58 @@ msgstr "Предварительный просмотр" msgid "Share" msgstr "Поделиться" -#: ../../include/conversation.php:1441 +#: ../../include/conversation.php:1444 #: ../../extend/addon/hzaddons/hsse/hsse.php:195 msgid "Page link name" msgstr "Название ссылки на страницу " -#: ../../include/conversation.php:1444 +#: ../../include/conversation.php:1447 #: ../../extend/addon/hzaddons/hsse/hsse.php:198 msgid "Post as" msgstr "Опубликовать как" -#: ../../include/conversation.php:1446 ../../Zotlabs/Lib/ThreadItem.php:826 +#: ../../include/conversation.php:1449 ../../Zotlabs/Lib/ThreadItem.php:826 #: ../../extend/addon/hzaddons/hsse/hsse.php:200 msgid "Bold" msgstr "Жирный" -#: ../../include/conversation.php:1447 ../../Zotlabs/Lib/ThreadItem.php:827 +#: ../../include/conversation.php:1450 ../../Zotlabs/Lib/ThreadItem.php:827 #: ../../extend/addon/hzaddons/hsse/hsse.php:201 msgid "Italic" msgstr "Курсив" -#: ../../include/conversation.php:1448 ../../Zotlabs/Lib/ThreadItem.php:828 +#: ../../include/conversation.php:1451 ../../Zotlabs/Lib/ThreadItem.php:828 #: ../../extend/addon/hzaddons/hsse/hsse.php:202 msgid "Underline" msgstr "Подчеркнутый" -#: ../../include/conversation.php:1449 ../../Zotlabs/Lib/ThreadItem.php:829 +#: ../../include/conversation.php:1452 ../../Zotlabs/Lib/ThreadItem.php:829 #: ../../extend/addon/hzaddons/hsse/hsse.php:203 msgid "Quote" msgstr "Цитата" -#: ../../include/conversation.php:1450 ../../Zotlabs/Lib/ThreadItem.php:830 +#: ../../include/conversation.php:1453 ../../Zotlabs/Lib/ThreadItem.php:830 #: ../../extend/addon/hzaddons/hsse/hsse.php:204 msgid "Code" msgstr "Код" -#: ../../include/conversation.php:1451 ../../Zotlabs/Lib/ThreadItem.php:832 +#: ../../include/conversation.php:1454 ../../Zotlabs/Lib/ThreadItem.php:832 #: ../../extend/addon/hzaddons/hsse/hsse.php:205 msgid "Attach/Upload file" msgstr "Прикрепить/загрузить файл" -#: ../../include/conversation.php:1454 ../../Zotlabs/Module/Wiki.php:400 +#: ../../include/conversation.php:1457 ../../Zotlabs/Module/Wiki.php:400 #: ../../extend/addon/hzaddons/hsse/hsse.php:208 msgid "Embed an image from your albums" msgstr "Встроить изображение из ваших альбомов" -#: ../../include/conversation.php:1455 ../../include/conversation.php:1508 -#: ../../Zotlabs/Module/Cdav.php:1054 ../../Zotlabs/Module/Cdav.php:1386 -#: ../../Zotlabs/Module/Profiles.php:803 ../../Zotlabs/Module/Tagrm.php:15 -#: ../../Zotlabs/Module/Tagrm.php:138 ../../Zotlabs/Module/Oauth.php:112 -#: ../../Zotlabs/Module/Oauth.php:138 ../../Zotlabs/Module/Cover_photo.php:428 -#: ../../Zotlabs/Module/Oauth2.php:117 ../../Zotlabs/Module/Oauth2.php:145 -#: ../../Zotlabs/Module/Editlayout.php:140 +#: ../../include/conversation.php:1458 ../../include/conversation.php:1511 +#: ../../Zotlabs/Storage/Browser.php:376 ../../Zotlabs/Module/Cdav.php:1058 +#: ../../Zotlabs/Module/Cdav.php:1390 ../../Zotlabs/Module/Profiles.php:803 +#: ../../Zotlabs/Module/Tagrm.php:15 ../../Zotlabs/Module/Tagrm.php:138 +#: ../../Zotlabs/Module/Oauth.php:112 ../../Zotlabs/Module/Oauth.php:138 +#: ../../Zotlabs/Module/Cover_photo.php:428 ../../Zotlabs/Module/Oauth2.php:117 +#: ../../Zotlabs/Module/Oauth2.php:145 ../../Zotlabs/Module/Editlayout.php:140 #: ../../Zotlabs/Module/Editblock.php:141 ../../Zotlabs/Module/Fbrowser.php:66 #: ../../Zotlabs/Module/Fbrowser.php:88 #: ../../Zotlabs/Module/Admin/Addons.php:427 @@ -2894,13 +2901,13 @@ msgstr "Встроить изображение из ваших альбомов #: ../../Zotlabs/Module/Editpost.php:110 ../../Zotlabs/Module/Connedit.php:933 #: ../../Zotlabs/Module/Card_edit.php:131 #: ../../Zotlabs/Module/Article_edit.php:130 ../../Zotlabs/Module/Wiki.php:368 -#: ../../Zotlabs/Module/Wiki.php:401 ../../Zotlabs/Module/Filer.php:55 +#: ../../Zotlabs/Module/Wiki.php:401 ../../Zotlabs/Module/Filer.php:56 #: ../../extend/addon/hzaddons/hsse/hsse.php:209 #: ../../extend/addon/hzaddons/hsse/hsse.php:258 msgid "Cancel" msgstr "Отменить" -#: ../../include/conversation.php:1456 ../../include/conversation.php:1507 +#: ../../include/conversation.php:1459 ../../include/conversation.php:1510 #: ../../Zotlabs/Module/Cover_photo.php:429 #: ../../Zotlabs/Module/Profile_photo.php:508 ../../Zotlabs/Module/Wiki.php:402 #: ../../extend/addon/hzaddons/hsse/hsse.php:210 @@ -2908,85 +2915,85 @@ msgstr "Отменить" msgid "OK" msgstr "" -#: ../../include/conversation.php:1458 +#: ../../include/conversation.php:1461 #: ../../extend/addon/hzaddons/hsse/hsse.php:212 msgid "Toggle voting" msgstr "Переключить голосование" -#: ../../include/conversation.php:1459 +#: ../../include/conversation.php:1462 msgid "Toggle poll" msgstr "Переключить опрос" -#: ../../include/conversation.php:1460 +#: ../../include/conversation.php:1463 msgid "Option" msgstr "Вариант" -#: ../../include/conversation.php:1461 +#: ../../include/conversation.php:1464 msgid "Add option" msgstr "Добавить вариант" -#: ../../include/conversation.php:1462 +#: ../../include/conversation.php:1465 msgid "Minutes" msgstr "Минут" -#: ../../include/conversation.php:1462 +#: ../../include/conversation.php:1465 msgid "Hours" msgstr "Часов" -#: ../../include/conversation.php:1462 +#: ../../include/conversation.php:1465 msgid "Days" msgstr "Дней" -#: ../../include/conversation.php:1463 +#: ../../include/conversation.php:1466 msgid "Allow multiple answers" msgstr "Разрешить несколько ответов" -#: ../../include/conversation.php:1465 +#: ../../include/conversation.php:1468 #: ../../extend/addon/hzaddons/hsse/hsse.php:215 msgid "Disable comments" msgstr "Отключить комментарии" -#: ../../include/conversation.php:1466 +#: ../../include/conversation.php:1469 #: ../../extend/addon/hzaddons/hsse/hsse.php:216 msgid "Toggle comments" msgstr "Переключить комментарии" -#: ../../include/conversation.php:1471 ../../Zotlabs/Module/Photos.php:673 -#: ../../Zotlabs/Module/Photos.php:1043 ../../Zotlabs/Module/Editblock.php:129 +#: ../../include/conversation.php:1474 ../../Zotlabs/Module/Photos.php:674 +#: ../../Zotlabs/Module/Photos.php:1044 ../../Zotlabs/Module/Editblock.php:129 #: ../../Zotlabs/Module/Card_edit.php:117 #: ../../Zotlabs/Module/Article_edit.php:116 #: ../../extend/addon/hzaddons/hsse/hsse.php:221 msgid "Title (optional)" msgstr "Заголовок (необязательно)" -#: ../../include/conversation.php:1474 +#: ../../include/conversation.php:1477 #: ../../extend/addon/hzaddons/hsse/hsse.php:224 msgid "Categories (optional, comma-separated list)" msgstr "Категории (необязательно, список через запятую)" -#: ../../include/conversation.php:1475 ../../Zotlabs/Module/Events.php:487 +#: ../../include/conversation.php:1478 ../../Zotlabs/Module/Events.php:487 #: ../../extend/addon/hzaddons/hsse/hsse.php:225 msgid "Permission settings" msgstr "Настройки разрешений" -#: ../../include/conversation.php:1497 +#: ../../include/conversation.php:1500 #: ../../extend/addon/hzaddons/hsse/hsse.php:247 msgid "Other networks and post services" msgstr "Другие сети и службы публикаций" -#: ../../include/conversation.php:1500 +#: ../../include/conversation.php:1503 #: ../../extend/addon/hzaddons/mail/Mod_Mail.php:170 #: ../../extend/addon/hzaddons/mail/Mod_Mail.php:313 #: ../../extend/addon/hzaddons/hsse/hsse.php:250 msgid "Set expiration date" msgstr "Установить срок действия" -#: ../../include/conversation.php:1503 +#: ../../include/conversation.php:1506 #: ../../extend/addon/hzaddons/hsse/hsse.php:253 msgid "Set publish date" msgstr "Установить дату публикации" -#: ../../include/conversation.php:1505 ../../Zotlabs/Module/Chat.php:219 +#: ../../include/conversation.php:1508 ../../Zotlabs/Module/Chat.php:219 #: ../../Zotlabs/Lib/ThreadItem.php:839 #: ../../extend/addon/hzaddons/mail/Mod_Mail.php:172 #: ../../extend/addon/hzaddons/mail/Mod_Mail.php:315 @@ -2994,7 +3001,7 @@ msgstr "Установить дату публикации" msgid "Encrypt text" msgstr "Зашифровать текст" -#: ../../include/conversation.php:1749 ../../Zotlabs/Module/Photos.php:1140 +#: ../../include/conversation.php:1752 ../../Zotlabs/Module/Photos.php:1141 #: ../../Zotlabs/Lib/ThreadItem.php:247 msgctxt "noun" msgid "Dislike" @@ -3003,7 +3010,7 @@ msgstr[0] "Не нравится" msgstr[1] "Не нравится" msgstr[2] "Не нравится" -#: ../../include/conversation.php:1752 +#: ../../include/conversation.php:1755 msgctxt "noun" msgid "Attending" msgid_plural "Attending" @@ -3011,7 +3018,7 @@ msgstr[0] "Посетит" msgstr[1] "Посетят" msgstr[2] "Посетят" -#: ../../include/conversation.php:1755 +#: ../../include/conversation.php:1758 msgctxt "noun" msgid "Not Attending" msgid_plural "Not Attending" @@ -3019,13 +3026,13 @@ msgstr[0] "Не посетит" msgstr[1] "Не посетят" msgstr[2] "Не посетят" -#: ../../include/conversation.php:1758 +#: ../../include/conversation.php:1761 msgctxt "noun" msgid "Undecided" msgid_plural "Undecided" msgstr "Не решил" -#: ../../include/conversation.php:1761 +#: ../../include/conversation.php:1764 msgctxt "noun" msgid "Agree" msgid_plural "Agrees" @@ -3033,7 +3040,7 @@ msgstr[0] "Согласен" msgstr[1] "Согласны" msgstr[2] "Согласны" -#: ../../include/conversation.php:1764 +#: ../../include/conversation.php:1767 msgctxt "noun" msgid "Disagree" msgid_plural "Disagrees" @@ -3041,7 +3048,7 @@ msgstr[0] "Не согласен" msgstr[1] "Не согласны" msgstr[2] "Не согласны" -#: ../../include/conversation.php:1767 +#: ../../include/conversation.php:1770 msgctxt "noun" msgid "Abstain" msgid_plural "Abstains" @@ -3053,44 +3060,44 @@ msgstr[2] "Воздержались" msgid "Trending" msgstr "В тренде" -#: ../../include/taxonomy.php:323 ../../include/taxonomy.php:458 -#: ../../include/taxonomy.php:479 ../../Zotlabs/Widget/Tagcloud.php:22 +#: ../../include/taxonomy.php:323 ../../include/taxonomy.php:475 +#: ../../include/taxonomy.php:496 ../../Zotlabs/Widget/Tagcloud.php:22 msgid "Tags" msgstr "Теги" -#: ../../include/taxonomy.php:559 +#: ../../include/taxonomy.php:576 msgid "Keywords" msgstr "Ключевые слова" -#: ../../include/taxonomy.php:580 +#: ../../include/taxonomy.php:597 msgid "have" msgstr "иметь" -#: ../../include/taxonomy.php:580 +#: ../../include/taxonomy.php:597 msgid "has" msgstr "есть" -#: ../../include/taxonomy.php:581 +#: ../../include/taxonomy.php:598 msgid "want" msgstr "хотеть" -#: ../../include/taxonomy.php:581 +#: ../../include/taxonomy.php:598 msgid "wants" msgstr "хотеть" -#: ../../include/taxonomy.php:582 ../../Zotlabs/Lib/ThreadItem.php:317 +#: ../../include/taxonomy.php:599 ../../Zotlabs/Lib/ThreadItem.php:317 msgid "like" msgstr "нравится" -#: ../../include/taxonomy.php:582 +#: ../../include/taxonomy.php:599 msgid "likes" msgstr "нравится" -#: ../../include/taxonomy.php:583 ../../Zotlabs/Lib/ThreadItem.php:318 +#: ../../include/taxonomy.php:600 ../../Zotlabs/Lib/ThreadItem.php:318 msgid "dislike" msgstr "не нравится" -#: ../../include/taxonomy.php:583 +#: ../../include/taxonomy.php:600 msgid "dislikes" msgstr "не нравится" @@ -3102,8 +3109,8 @@ msgstr "Выбор дополнительного языка" msgid "Delete this item?" msgstr "Удалить этот элемент?" -#: ../../include/js_strings.php:6 ../../Zotlabs/Module/Photos.php:1096 -#: ../../Zotlabs/Module/Photos.php:1214 ../../Zotlabs/Lib/ThreadItem.php:824 +#: ../../include/js_strings.php:6 ../../Zotlabs/Module/Photos.php:1097 +#: ../../Zotlabs/Module/Photos.php:1215 ../../Zotlabs/Lib/ThreadItem.php:824 msgid "Comment" msgstr "Комментарий" @@ -3180,9 +3187,9 @@ msgstr "Пожалуйста, введите URL ссылки" msgid "Unsaved changes. Are you sure you wish to leave this page?" msgstr "Есть несохраненные изменения. Вы уверены, что хотите покинуть эту страницу?" -#: ../../include/js_strings.php:25 ../../Zotlabs/Module/Cdav.php:1011 +#: ../../include/js_strings.php:25 ../../Zotlabs/Module/Cdav.php:1015 #: ../../Zotlabs/Module/Profiles.php:511 ../../Zotlabs/Module/Profiles.php:736 -#: ../../Zotlabs/Module/Events.php:483 ../../Zotlabs/Module/Locs.php:121 +#: ../../Zotlabs/Module/Events.php:483 ../../Zotlabs/Module/Locs.php:128 #: ../../Zotlabs/Module/Pubsites.php:52 msgid "Location" msgstr "Место" @@ -3441,6 +3448,10 @@ msgctxt "calendar" msgid "All day" msgstr "Весь день" +#: ../../include/js_strings.php:119 +msgid "Please stand by while your download is being prepared." +msgstr "Пожалуйста, подождите, пока готовится загрузка." + #: ../../include/dir_fns.php:140 ../../Zotlabs/Lib/Libzotdir.php:162 msgid "Directory Options" msgstr "Параметры каталога" @@ -3473,15 +3484,15 @@ msgstr "" msgid "RSS/Atom" msgstr "" -#: ../../include/network.php:1736 ../../Zotlabs/Lib/Activity.php:2817 -#: ../../Zotlabs/Lib/Activity.php:3011 -#: ../../extend/addon/hzaddons/pubcrawl/as.php:1465 -#: ../../extend/addon/hzaddons/pubcrawl/as.php:1719 -#: ../../extend/addon/hzaddons/pubcrawl/as.php:1927 +#: ../../include/network.php:1736 ../../Zotlabs/Lib/Activity.php:2821 +#: ../../Zotlabs/Lib/Activity.php:3015 +#: ../../extend/addon/hzaddons/pubcrawl/as.php:1483 +#: ../../extend/addon/hzaddons/pubcrawl/as.php:1895 +#: ../../extend/addon/hzaddons/pubcrawl/as.php:2103 msgid "ActivityPub" msgstr "" -#: ../../include/network.php:1737 ../../Zotlabs/Module/Cdav.php:1372 +#: ../../include/network.php:1737 ../../Zotlabs/Module/Cdav.php:1376 #: ../../Zotlabs/Module/Profiles.php:789 #: ../../Zotlabs/Module/Admin/Accounts.php:171 #: ../../Zotlabs/Module/Admin/Accounts.php:183 @@ -3630,113 +3641,114 @@ msgstr "С Днем рождения %1$s !" msgid "Visible to your default audience" msgstr "Видно вашей аудитории по умолчанию." -#: ../../include/acl_selectors.php:100 +#: ../../include/acl_selectors.php:99 msgid "Profile-Based Privacy Groups" msgstr "Группы конфиденциальности основанные на профиле" -#: ../../include/acl_selectors.php:113 ../../Zotlabs/Widget/Forums.php:100 +#: ../../include/acl_selectors.php:118 +msgid "Private Forum" +msgstr "Частный форум" + +#: ../../include/acl_selectors.php:124 ../../Zotlabs/Widget/Forums.php:100 #: ../../Zotlabs/Widget/Notifications.php:139 #: ../../Zotlabs/Widget/Notifications.php:140 #: ../../Zotlabs/Widget/Activity_filter.php:115 msgid "Forums" msgstr "Форумы" -#: ../../include/acl_selectors.php:115 -msgid "Private Forum" -msgstr "Частный форум" - -#: ../../include/acl_selectors.php:126 +#: ../../include/acl_selectors.php:135 #: ../../Zotlabs/Lib/PermissionDescription.php:107 msgid "Only me" msgstr "Только мне" -#: ../../include/acl_selectors.php:133 +#: ../../include/acl_selectors.php:142 msgid "Share with" msgstr "Поделиться с" -#: ../../include/acl_selectors.php:134 +#: ../../include/acl_selectors.php:143 msgid "Custom selection" msgstr "Настраиваемый выбор" -#: ../../include/acl_selectors.php:136 +#: ../../include/acl_selectors.php:145 msgid "" "Select \"Allow\" to allow viewing. \"Don't allow\" lets you override and " "limit the scope of \"Allow\"." msgstr "Выберите \"Разрешить\" для разрешения просмотра. \"Не разрешать\" позволяет вам переопределить и ограничить разрешения." -#: ../../include/acl_selectors.php:137 ../../Zotlabs/Module/Authorize.php:32 +#: ../../include/acl_selectors.php:146 ../../Zotlabs/Module/Authorize.php:32 msgid "Allow" msgstr "Разрешить" -#: ../../include/acl_selectors.php:138 +#: ../../include/acl_selectors.php:147 msgid "Don't allow" msgstr "Не разрешать" -#: ../../include/acl_selectors.php:144 ../../Zotlabs/Module/Photos.php:677 -#: ../../Zotlabs/Module/Photos.php:1046 ../../Zotlabs/Module/Chat.php:241 -#: ../../Zotlabs/Module/Filestorage.php:190 ../../Zotlabs/Module/Thing.php:321 +#: ../../include/acl_selectors.php:153 ../../Zotlabs/Module/Photos.php:678 +#: ../../Zotlabs/Module/Photos.php:1047 ../../Zotlabs/Module/Chat.php:241 +#: ../../Zotlabs/Module/Filestorage.php:195 ../../Zotlabs/Module/Thing.php:321 #: ../../Zotlabs/Module/Thing.php:374 ../../Zotlabs/Module/Connedit.php:682 #: ../../extend/addon/hzaddons/flashcards/Mod_Flashcards.php:254 msgid "Permissions" msgstr "Разрешения" -#: ../../include/acl_selectors.php:146 ../../Zotlabs/Module/Photos.php:1274 -#: ../../Zotlabs/Widget/Pinned.php:160 ../../Zotlabs/Lib/ThreadItem.php:495 +#: ../../include/acl_selectors.php:155 ../../Zotlabs/Storage/Browser.php:404 +#: ../../Zotlabs/Module/Photos.php:1275 ../../Zotlabs/Widget/Pinned.php:160 +#: ../../Zotlabs/Lib/ThreadItem.php:495 #: ../../extend/addon/hzaddons/channelreputation/channelreputation.php:233 msgid "Close" msgstr "Закрыть" -#: ../../include/acl_selectors.php:171 +#: ../../include/acl_selectors.php:180 #, php-format msgid "" "Post permissions %s cannot be changed %s after a post is shared.</br />These " "permissions set who is allowed to view the post." msgstr "Разрешения публикации %s не могут быть изменены %s после того, как ею поделились. Эти разрешения устанавливают кому разрешено просматривать эту публикацию." -#: ../../include/zid.php:364 +#: ../../include/zid.php:360 #, php-format msgid "OpenWebAuth: %1$s welcomes %2$s" msgstr "OpenWebAuth: %1$s приветствует %2$s" -#: ../../include/connections.php:133 +#: ../../include/connections.php:134 msgid "New window" msgstr "Новое окно" -#: ../../include/connections.php:134 +#: ../../include/connections.php:135 msgid "Open the selected location in a different window or browser tab" msgstr "Открыть выбранное местоположение в другом окне или вкладке браузера" -#: ../../include/connections.php:733 ../../include/event.php:1422 -#: ../../Zotlabs/Module/Cdav.php:1377 ../../Zotlabs/Module/Profiles.php:794 +#: ../../include/connections.php:734 ../../include/event.php:1422 +#: ../../Zotlabs/Module/Cdav.php:1381 ../../Zotlabs/Module/Profiles.php:794 #: ../../Zotlabs/Module/Connedit.php:924 msgid "Mobile" msgstr "Мобильный" -#: ../../include/connections.php:734 ../../include/event.php:1423 -#: ../../Zotlabs/Module/Cdav.php:1378 ../../Zotlabs/Module/Profiles.php:795 +#: ../../include/connections.php:735 ../../include/event.php:1423 +#: ../../Zotlabs/Module/Cdav.php:1382 ../../Zotlabs/Module/Profiles.php:795 #: ../../Zotlabs/Module/Connedit.php:925 msgid "Home" msgstr "Домашний" -#: ../../include/connections.php:735 ../../include/event.php:1424 +#: ../../include/connections.php:736 ../../include/event.php:1424 msgid "Home, Voice" msgstr "Дом, голос" -#: ../../include/connections.php:736 ../../include/event.php:1425 +#: ../../include/connections.php:737 ../../include/event.php:1425 msgid "Home, Fax" msgstr "Дом, факс" -#: ../../include/connections.php:737 ../../include/event.php:1426 -#: ../../Zotlabs/Module/Cdav.php:1379 ../../Zotlabs/Module/Profiles.php:796 +#: ../../include/connections.php:738 ../../include/event.php:1426 +#: ../../Zotlabs/Module/Cdav.php:1383 ../../Zotlabs/Module/Profiles.php:796 #: ../../Zotlabs/Module/Connedit.php:926 msgid "Work" msgstr "Рабочий" -#: ../../include/connections.php:738 ../../include/event.php:1427 +#: ../../include/connections.php:739 ../../include/event.php:1427 msgid "Work, Voice" msgstr "Работа, голос" -#: ../../include/connections.php:739 ../../include/event.php:1428 +#: ../../include/connections.php:740 ../../include/event.php:1428 msgid "Work, Fax" msgstr "Работа, факс" @@ -3977,7 +3989,7 @@ msgstr "О себе" msgid "Profile Details" msgstr "Информация о профиле" -#: ../../include/nav.php:452 ../../Zotlabs/Storage/Browser.php:278 +#: ../../include/nav.php:452 ../../Zotlabs/Storage/Browser.php:344 #: ../../Zotlabs/Module/Fbrowser.php:85 ../../Zotlabs/Lib/Apps.php:340 msgid "Files" msgstr "Файлы" @@ -4040,7 +4052,8 @@ msgstr "" msgid "%1$s's bookmarks" msgstr "Закладки пользователя %1$s" -#: ../../include/attach.php:273 ../../include/attach.php:381 +#: ../../include/attach.php:273 ../../include/attach.php:324 +#: ../../include/attach.php:419 msgid "Item was not found." msgstr "Элемент не найден." @@ -4048,75 +4061,75 @@ msgstr "Элемент не найден." msgid "Unknown error." msgstr "Неизвестная ошибка." -#: ../../include/attach.php:574 +#: ../../include/attach.php:612 msgid "No source file." msgstr "Нет исходного файла." -#: ../../include/attach.php:596 +#: ../../include/attach.php:634 msgid "Cannot locate file to replace" msgstr "Не удается найти файл для замены" -#: ../../include/attach.php:615 +#: ../../include/attach.php:653 msgid "Cannot locate file to revise/update" msgstr "Не удается найти файл для пересмотра / обновления" -#: ../../include/attach.php:759 +#: ../../include/attach.php:795 #, php-format msgid "File exceeds size limit of %d" msgstr "Файл превышает предельный размер %d" -#: ../../include/attach.php:780 +#: ../../include/attach.php:816 #, php-format msgid "You have reached your limit of %1$.0f Mbytes attachment storage." msgstr "Вы достигли предела %1$.0f Мбайт для хранения вложений." -#: ../../include/attach.php:968 +#: ../../include/attach.php:1004 msgid "File upload failed. Possible system limit or action terminated." msgstr "Загрузка файла не удалась. Возможно система перегружена или попытка прекращена." -#: ../../include/attach.php:997 +#: ../../include/attach.php:1033 msgid "Stored file could not be verified. Upload failed." msgstr "Файл для сохранения не может быть проверен. Загрузка не удалась." -#: ../../include/attach.php:1069 ../../include/attach.php:1085 +#: ../../include/attach.php:1105 ../../include/attach.php:1121 msgid "Path not available." msgstr "Путь недоступен." -#: ../../include/attach.php:1134 ../../include/attach.php:1297 +#: ../../include/attach.php:1169 ../../include/attach.php:1332 msgid "Empty pathname" msgstr "Пустое имя пути" -#: ../../include/attach.php:1160 +#: ../../include/attach.php:1195 msgid "duplicate filename or path" msgstr "дублирующееся имя файла или пути" -#: ../../include/attach.php:1185 +#: ../../include/attach.php:1220 msgid "Path not found." msgstr "Путь не найден." -#: ../../include/attach.php:1253 +#: ../../include/attach.php:1288 msgid "mkdir failed." msgstr "mkdir не удался" -#: ../../include/attach.php:1257 +#: ../../include/attach.php:1292 msgid "database storage failed." msgstr "ошибка при записи базы данных." -#: ../../include/attach.php:1303 +#: ../../include/attach.php:1338 msgid "Empty path" msgstr "Пустое имя пути" -#: ../../include/attach.php:2035 +#: ../../include/attach.php:2099 #, php-format msgid "%s shared a %s with you" msgstr "%s поделился с вами %s" -#: ../../include/attach.php:2035 +#: ../../include/attach.php:2099 #: ../../extend/addon/hzaddons/redfiles/redfilehelper.php:64 msgid "file" msgstr "файл" -#: ../../include/photo/photo_driver.php:413 +#: ../../include/photo/photo_driver.php:417 #: ../../Zotlabs/Module/Profile_photo.php:147 #: ../../Zotlabs/Module/Profile_photo.php:284 msgid "Profile Photos" @@ -4164,36 +4177,40 @@ msgstr "[$Projectname] Задания Cron не запущены на %s" msgid "Cron/Scheduled tasks not running." msgstr "Задания Cron / планировщика не запущены." -#: ../../Zotlabs/Storage/Browser.php:107 ../../Zotlabs/Storage/Browser.php:295 -msgid "parent" -msgstr "источник" +#: ../../Zotlabs/Storage/Browser.php:292 +msgid "Change filename to" +msgstr "Переименовать файл в" + +#: ../../Zotlabs/Storage/Browser.php:302 ../../Zotlabs/Storage/Browser.php:383 +msgid "Select a target location" +msgstr "Выбрать место назначения" -#: ../../Zotlabs/Storage/Browser.php:134 -msgid "Principal" -msgstr "Субъект" +#: ../../Zotlabs/Storage/Browser.php:303 ../../Zotlabs/Storage/Browser.php:384 +msgid "Copy to target location" +msgstr "Скопировать в место назнаения" -#: ../../Zotlabs/Storage/Browser.php:137 -msgid "Addressbook" -msgstr "Адресная книга" +#: ../../Zotlabs/Storage/Browser.php:304 ../../Zotlabs/Storage/Browser.php:382 +msgid "Set permissions for all files and sub folders" +msgstr "Установить разрешения для всех файлов и подкаталогов" -#: ../../Zotlabs/Storage/Browser.php:143 -msgid "Schedule Inbox" -msgstr "План занятий входящий" +#: ../../Zotlabs/Storage/Browser.php:305 +msgid "Notify your contacts about this file" +msgstr "Сообщить своим контактам об этом файле" -#: ../../Zotlabs/Storage/Browser.php:146 -msgid "Schedule Outbox" -msgstr "План занятий исходящий" +#: ../../Zotlabs/Storage/Browser.php:344 +msgid "File category" +msgstr "Категория файла" -#: ../../Zotlabs/Storage/Browser.php:279 +#: ../../Zotlabs/Storage/Browser.php:355 msgid "Total" msgstr "Всего" -#: ../../Zotlabs/Storage/Browser.php:281 +#: ../../Zotlabs/Storage/Browser.php:357 msgid "Shared" msgstr "Общие" -#: ../../Zotlabs/Storage/Browser.php:282 ../../Zotlabs/Storage/Browser.php:396 -#: ../../Zotlabs/Module/Cdav.php:1055 ../../Zotlabs/Module/Cdav.php:1383 +#: ../../Zotlabs/Storage/Browser.php:358 ../../Zotlabs/Storage/Browser.php:531 +#: ../../Zotlabs/Module/Cdav.php:1059 ../../Zotlabs/Module/Cdav.php:1387 #: ../../Zotlabs/Module/Profiles.php:800 #: ../../Zotlabs/Module/New_channel.php:189 ../../Zotlabs/Module/Menu.php:182 #: ../../Zotlabs/Module/Webpages.php:254 ../../Zotlabs/Module/Connedit.php:930 @@ -4203,15 +4220,15 @@ msgstr "Общие" msgid "Create" msgstr "Создать" -#: ../../Zotlabs/Storage/Browser.php:283 +#: ../../Zotlabs/Storage/Browser.php:359 msgid "Add Files" msgstr "Добавить файлы" -#: ../../Zotlabs/Storage/Browser.php:286 ../../Zotlabs/Lib/ThreadItem.php:174 +#: ../../Zotlabs/Storage/Browser.php:362 ../../Zotlabs/Lib/ThreadItem.php:174 msgid "Admin Delete" msgstr "Удалено администратором" -#: ../../Zotlabs/Storage/Browser.php:291 ../../Zotlabs/Module/Cdav.php:1368 +#: ../../Zotlabs/Storage/Browser.php:370 ../../Zotlabs/Module/Cdav.php:1372 #: ../../Zotlabs/Module/Oauth.php:113 ../../Zotlabs/Module/Oauth.php:139 #: ../../Zotlabs/Module/Sharedwithme.php:106 ../../Zotlabs/Module/Chat.php:257 #: ../../Zotlabs/Module/Oauth2.php:118 ../../Zotlabs/Module/Oauth2.php:146 @@ -4224,38 +4241,96 @@ msgstr "Удалено администратором" msgid "Name" msgstr "Имя" -#: ../../Zotlabs/Storage/Browser.php:292 ../../Zotlabs/Module/Wiki.php:219 +#: ../../Zotlabs/Storage/Browser.php:371 ../../Zotlabs/Module/Wiki.php:219 msgid "Type" msgstr "Тип" -#: ../../Zotlabs/Storage/Browser.php:294 +#: ../../Zotlabs/Storage/Browser.php:373 #: ../../Zotlabs/Module/Sharedwithme.php:109 msgid "Last Modified" msgstr "Последнее изменение" -#: ../../Zotlabs/Storage/Browser.php:367 +#: ../../Zotlabs/Storage/Browser.php:374 +msgid "parent" +msgstr "источник" + +#: ../../Zotlabs/Storage/Browser.php:379 +#: ../../Zotlabs/Module/Filestorage.php:206 +msgid "Copy/paste this code to attach file to a post" +msgstr "Копировать / вставить этот код для прикрепления файла к публикации" + +#: ../../Zotlabs/Storage/Browser.php:380 +#: ../../Zotlabs/Module/Filestorage.php:207 +msgid "Copy/paste this URL to link file from a web page" +msgstr "Копировать / вставить эту URL для ссылки на файл со страницы" + +#: ../../Zotlabs/Storage/Browser.php:392 +msgid "Select All" +msgstr "Выбрать всё" + +#: ../../Zotlabs/Storage/Browser.php:393 +msgid "Bulk Actions" +msgstr "Групповая обработка" + +#: ../../Zotlabs/Storage/Browser.php:394 +msgid "Adjust Permissions" +msgstr "Настроить разрешения" + +#: ../../Zotlabs/Storage/Browser.php:395 +msgid "Move or Copy" +msgstr "Переместить или копировать" + +#: ../../Zotlabs/Storage/Browser.php:397 ../../Zotlabs/Module/Wiki.php:212 +msgid "Download" +msgstr "Загрузить" + +#: ../../Zotlabs/Storage/Browser.php:398 +msgid "Info" +msgstr "Информация" + +#: ../../Zotlabs/Storage/Browser.php:399 +msgid "Rename" +msgstr "Переименовать" + +#: ../../Zotlabs/Storage/Browser.php:400 ../../Zotlabs/Lib/Apps.php:360 +msgid "Post" +msgstr "Публикация" + +#: ../../Zotlabs/Storage/Browser.php:401 +msgid "Attachment BBcode" +msgstr "Вложение BBcode" + +#: ../../Zotlabs/Storage/Browser.php:402 +msgid "Embed BBcode" +msgstr "Встраивание BBcode" + +#: ../../Zotlabs/Storage/Browser.php:403 +msgid "Link BBcode" +msgstr "Ссылка BBcode" + +#: ../../Zotlabs/Storage/Browser.php:473 #, php-format msgid "You are using %1$s of your available file storage." msgstr "Вы используете %1$s из доступного вам хранилища файлов." -#: ../../Zotlabs/Storage/Browser.php:372 +#: ../../Zotlabs/Storage/Browser.php:478 #, php-format msgid "You are using %1$s of %2$s available file storage. (%3$s%)" msgstr "Вы используете %1$s из %2$s доступного хранилища файлов (%3$s%)." -#: ../../Zotlabs/Storage/Browser.php:383 +#: ../../Zotlabs/Storage/Browser.php:489 msgid "WARNING:" msgstr "Предупреждение:" -#: ../../Zotlabs/Storage/Browser.php:395 +#: ../../Zotlabs/Storage/Browser.php:530 msgid "Create new folder" msgstr "Создать новую папку" -#: ../../Zotlabs/Storage/Browser.php:397 +#: ../../Zotlabs/Storage/Browser.php:532 msgid "Upload file" msgstr "Загрузить файл" -#: ../../Zotlabs/Storage/Browser.php:398 ../../Zotlabs/Module/Photos.php:687 +#: ../../Zotlabs/Storage/Browser.php:533 ../../Zotlabs/Module/Photos.php:688 #: ../../Zotlabs/Module/Cover_photo.php:423 #: ../../Zotlabs/Module/Embedphotos.php:188 #: ../../Zotlabs/Module/Profile_photo.php:500 @@ -4264,12 +4339,12 @@ msgstr "Загрузить файл" msgid "Upload" msgstr "Загрузка" -#: ../../Zotlabs/Storage/Browser.php:410 +#: ../../Zotlabs/Storage/Browser.php:544 msgid "Drop files here to immediately upload" msgstr "Поместите файлы сюда для немедленной загрузки" -#: ../../Zotlabs/Storage/Browser.php:411 -#: ../../Zotlabs/Module/Filestorage.php:206 +#: ../../Zotlabs/Storage/Browser.php:545 +#: ../../Zotlabs/Module/Filestorage.php:211 msgid "Show in your contacts shared folder" msgstr "Показать общий каталог в ваших контактах" @@ -4327,7 +4402,7 @@ msgid "Default Permissions App" msgstr "Приложение \"Разрешения по умолчанию\"" #: ../../Zotlabs/Module/Defperms.php:190 ../../Zotlabs/Module/Permcats.php:63 -#: ../../Zotlabs/Module/Poke.php:165 ../../Zotlabs/Module/Cdav.php:872 +#: ../../Zotlabs/Module/Poke.php:165 ../../Zotlabs/Module/Cdav.php:876 #: ../../Zotlabs/Module/Oauth.php:100 ../../Zotlabs/Module/Pubstream.php:20 #: ../../Zotlabs/Module/Sources.php:88 ../../Zotlabs/Module/Chat.php:100 #: ../../Zotlabs/Module/Oauth2.php:106 ../../Zotlabs/Module/Uexport.php:61 @@ -4547,33 +4622,33 @@ msgstr "Параметры" msgid "Redeliver" msgstr "Доставить повторно" -#: ../../Zotlabs/Module/Network.php:110 +#: ../../Zotlabs/Module/Network.php:105 msgid "No such group" msgstr "Нет такой группы" -#: ../../Zotlabs/Module/Network.php:157 +#: ../../Zotlabs/Module/Network.php:152 msgid "No such channel" msgstr "Нет такого канала" -#: ../../Zotlabs/Module/Network.php:169 ../../Zotlabs/Module/Channel.php:195 +#: ../../Zotlabs/Module/Network.php:164 ../../Zotlabs/Module/Channel.php:189 msgid "Search Results For:" msgstr "Результаты поиска для:" -#: ../../Zotlabs/Module/Network.php:210 ../../Zotlabs/Module/Display.php:79 -#: ../../Zotlabs/Module/Pubstream.php:99 ../../Zotlabs/Module/Channel.php:230 -#: ../../Zotlabs/Module/Hq.php:134 +#: ../../Zotlabs/Module/Network.php:205 ../../Zotlabs/Module/Display.php:76 +#: ../../Zotlabs/Module/Pubstream.php:95 ../../Zotlabs/Module/Channel.php:224 +#: ../../Zotlabs/Module/Hq.php:125 msgid "Reset form" msgstr "Очистить форму" -#: ../../Zotlabs/Module/Network.php:246 +#: ../../Zotlabs/Module/Network.php:239 msgid "Privacy group is empty" msgstr "Группа конфиденциальности пуста" -#: ../../Zotlabs/Module/Network.php:256 +#: ../../Zotlabs/Module/Network.php:249 msgid "Privacy group: " msgstr "Группа конфиденциальности: " -#: ../../Zotlabs/Module/Network.php:329 +#: ../../Zotlabs/Module/Network.php:322 #: ../../extend/addon/hzaddons/redred/Mod_Redred.php:29 msgid "Invalid channel." msgstr "Недействительный канал." @@ -4621,40 +4696,40 @@ msgctxt "acl" msgid "Profile" msgstr "Профиль" -#: ../../Zotlabs/Module/Acl.php:361 +#: ../../Zotlabs/Module/Acl.php:368 msgid "network" msgstr "сеть" -#: ../../Zotlabs/Module/Item.php:448 ../../Zotlabs/Module/Pin.php:35 +#: ../../Zotlabs/Module/Item.php:450 ../../Zotlabs/Module/Pin.php:35 msgid "Unable to locate original post." msgstr "Не удалось найти оригинальную публикацию." -#: ../../Zotlabs/Module/Item.php:734 +#: ../../Zotlabs/Module/Item.php:736 msgid "Empty post discarded." msgstr "Пустая публикация отклонена." -#: ../../Zotlabs/Module/Item.php:1186 +#: ../../Zotlabs/Module/Item.php:1187 msgid "Duplicate post suppressed." msgstr "Подавлена дублирующаяся публикация." -#: ../../Zotlabs/Module/Item.php:1331 +#: ../../Zotlabs/Module/Item.php:1332 msgid "System error. Post not saved." msgstr "Системная ошибка. Публикация не сохранена." -#: ../../Zotlabs/Module/Item.php:1365 +#: ../../Zotlabs/Module/Item.php:1366 msgid "Your comment is awaiting approval." msgstr "Ваш комментарий ожидает одобрения." -#: ../../Zotlabs/Module/Item.php:1482 +#: ../../Zotlabs/Module/Item.php:1496 msgid "Unable to obtain post information from database." msgstr "Невозможно получить информацию о публикации из базы данных" -#: ../../Zotlabs/Module/Item.php:1489 +#: ../../Zotlabs/Module/Item.php:1503 #, php-format msgid "You have reached your limit of %1$.0f top level posts." msgstr "Вы достигли вашего ограничения в %1$.0f публикаций высокого уровня." -#: ../../Zotlabs/Module/Item.php:1496 +#: ../../Zotlabs/Module/Item.php:1510 #, php-format msgid "You have reached your limit of %1$.0f webpages." msgstr "Вы достигли вашего ограничения в %1$.0f страниц." @@ -4663,23 +4738,45 @@ msgstr "Вы достигли вашего ограничения в %1$.0f с msgid "Some blurb about what to do when you're new here" msgstr "Некоторые предложения о том, что делать, если вы здесь новичок " -#: ../../Zotlabs/Module/Display.php:29 ../../Zotlabs/Module/Directory.php:71 -#: ../../Zotlabs/Module/Directory.php:76 ../../Zotlabs/Module/Photos.php:518 +#: ../../Zotlabs/Module/Attach_edit.php:52 ../../Zotlabs/Module/Chanview.php:95 +#: ../../Zotlabs/Module/Page.php:75 ../../Zotlabs/Module/Wall_upload.php:31 +#: ../../Zotlabs/Module/Block.php:41 ../../Zotlabs/Module/Attach.php:21 +#: ../../Zotlabs/Module/Cal.php:31 ../../Zotlabs/Module/Card_edit.php:44 +#: ../../Zotlabs/Module/Article_edit.php:44 +msgid "Channel not found." +msgstr "Канал не найден." + +#: ../../Zotlabs/Module/Attach_edit.php:69 +#: ../../Zotlabs/Module/Filestorage.php:109 +msgid "File not found." +msgstr "Файл не найден." + +#: ../../Zotlabs/Module/Attach_edit.php:118 +msgid "Can not copy folder into itself." +msgstr "Невозможно скопировать каталог в самого себя." + +#: ../../Zotlabs/Module/Attach_edit.php:131 +#, php-format +msgid "Can not move folder \"%s\" into itself." +msgstr "Невозможно скопировать каталог \"%s\" в самого себя." + +#: ../../Zotlabs/Module/Display.php:26 ../../Zotlabs/Module/Directory.php:71 +#: ../../Zotlabs/Module/Directory.php:76 ../../Zotlabs/Module/Photos.php:519 #: ../../Zotlabs/Module/Viewconnections.php:23 #: ../../Zotlabs/Module/Ratings.php:83 ../../Zotlabs/Module/Search.php:17 msgid "Public access denied." msgstr "Публичный доступ запрещен." -#: ../../Zotlabs/Module/Display.php:376 ../../Zotlabs/Module/Channel.php:465 +#: ../../Zotlabs/Module/Display.php:359 ../../Zotlabs/Module/Channel.php:449 msgid "" "You must enable javascript for your browser to be able to view this content." msgstr "Для просмотра этого содержимого в вашем браузере должен быть включён JavaScript" -#: ../../Zotlabs/Module/Display.php:394 +#: ../../Zotlabs/Module/Display.php:377 msgid "Article" msgstr "Статья" -#: ../../Zotlabs/Module/Display.php:439 +#: ../../Zotlabs/Module/Display.php:422 msgid "Item has been removed." msgstr "Элемент был удалён." @@ -4867,45 +4964,45 @@ msgstr "От старых к новым" msgid "No entries (some entries may be hidden)." msgstr "Нет записей (некоторые записи могут быть скрыты)." -#: ../../Zotlabs/Module/Cdav.php:814 ../../Zotlabs/Module/Events.php:28 +#: ../../Zotlabs/Module/Cdav.php:818 ../../Zotlabs/Module/Events.php:28 msgid "Calendar entries imported." msgstr "События календаря импортированы." -#: ../../Zotlabs/Module/Cdav.php:816 ../../Zotlabs/Module/Events.php:30 +#: ../../Zotlabs/Module/Cdav.php:820 ../../Zotlabs/Module/Events.php:30 msgid "No calendar entries found." msgstr "Не найдено событий в календаре." -#: ../../Zotlabs/Module/Cdav.php:872 +#: ../../Zotlabs/Module/Cdav.php:876 msgid "CardDAV App" msgstr "Приложение CardDAV" -#: ../../Zotlabs/Module/Cdav.php:873 +#: ../../Zotlabs/Module/Cdav.php:877 msgid "CalDAV capable addressbook" msgstr "Адресная книга с поддержкой CalDAV" -#: ../../Zotlabs/Module/Cdav.php:939 +#: ../../Zotlabs/Module/Cdav.php:943 #: ../../Zotlabs/Module/Channel_calendar.php:393 #: ../../Zotlabs/Module/Cal.php:167 msgid "Link to source" msgstr "Ссылка на источник" -#: ../../Zotlabs/Module/Cdav.php:1005 ../../Zotlabs/Module/Events.php:468 +#: ../../Zotlabs/Module/Cdav.php:1009 ../../Zotlabs/Module/Events.php:468 msgid "Event title" msgstr "Наименование события" -#: ../../Zotlabs/Module/Cdav.php:1006 ../../Zotlabs/Module/Events.php:474 +#: ../../Zotlabs/Module/Cdav.php:1010 ../../Zotlabs/Module/Events.php:474 msgid "Start date and time" msgstr "Дата и время начала" -#: ../../Zotlabs/Module/Cdav.php:1007 +#: ../../Zotlabs/Module/Cdav.php:1011 msgid "End date and time" msgstr "Дата и время окончания" -#: ../../Zotlabs/Module/Cdav.php:1008 ../../Zotlabs/Module/Events.php:497 +#: ../../Zotlabs/Module/Cdav.php:1012 ../../Zotlabs/Module/Events.php:497 msgid "Timezone:" msgstr "Часовой пояс:" -#: ../../Zotlabs/Module/Cdav.php:1010 ../../Zotlabs/Module/Appman.php:145 +#: ../../Zotlabs/Module/Cdav.php:1014 ../../Zotlabs/Module/Appman.php:145 #: ../../Zotlabs/Module/Events.php:481 ../../Zotlabs/Module/Rbmark.php:101 #: ../../extend/addon/hzaddons/rendezvous/rendezvous.php:173 #: ../../extend/addon/hzaddons/cart/submodules/manualcat.php:260 @@ -4913,56 +5010,56 @@ msgstr "Часовой пояс:" msgid "Description" msgstr "Описание" -#: ../../Zotlabs/Module/Cdav.php:1031 ../../Zotlabs/Module/Photos.php:946 +#: ../../Zotlabs/Module/Cdav.php:1035 ../../Zotlabs/Module/Photos.php:947 #: ../../Zotlabs/Module/Events.php:697 ../../Zotlabs/Module/Events.php:706 #: ../../Zotlabs/Module/Cal.php:205 msgid "Previous" msgstr "Предыдущая" -#: ../../Zotlabs/Module/Cdav.php:1032 ../../Zotlabs/Module/Photos.php:955 +#: ../../Zotlabs/Module/Cdav.php:1036 ../../Zotlabs/Module/Photos.php:956 #: ../../Zotlabs/Module/Events.php:698 ../../Zotlabs/Module/Events.php:707 #: ../../Zotlabs/Module/Cal.php:206 ../../Zotlabs/Module/Setup.php:260 msgid "Next" msgstr "Следующая" -#: ../../Zotlabs/Module/Cdav.php:1033 ../../Zotlabs/Module/Events.php:708 +#: ../../Zotlabs/Module/Cdav.php:1037 ../../Zotlabs/Module/Events.php:708 #: ../../Zotlabs/Module/Cal.php:207 msgid "Today" msgstr "Сегодня" -#: ../../Zotlabs/Module/Cdav.php:1034 ../../Zotlabs/Module/Events.php:703 +#: ../../Zotlabs/Module/Cdav.php:1038 ../../Zotlabs/Module/Events.php:703 msgid "Month" msgstr "Месяц" -#: ../../Zotlabs/Module/Cdav.php:1035 ../../Zotlabs/Module/Events.php:704 +#: ../../Zotlabs/Module/Cdav.php:1039 ../../Zotlabs/Module/Events.php:704 msgid "Week" msgstr "Неделя" -#: ../../Zotlabs/Module/Cdav.php:1036 ../../Zotlabs/Module/Events.php:705 +#: ../../Zotlabs/Module/Cdav.php:1040 ../../Zotlabs/Module/Events.php:705 msgid "Day" msgstr "День" -#: ../../Zotlabs/Module/Cdav.php:1037 +#: ../../Zotlabs/Module/Cdav.php:1041 msgid "List month" msgstr "Просмотреть месяц" -#: ../../Zotlabs/Module/Cdav.php:1038 +#: ../../Zotlabs/Module/Cdav.php:1042 msgid "List week" msgstr "Просмотреть неделю" -#: ../../Zotlabs/Module/Cdav.php:1039 +#: ../../Zotlabs/Module/Cdav.php:1043 msgid "List day" msgstr "Просмотреть день" -#: ../../Zotlabs/Module/Cdav.php:1047 +#: ../../Zotlabs/Module/Cdav.php:1051 msgid "More" msgstr "Больше" -#: ../../Zotlabs/Module/Cdav.php:1048 +#: ../../Zotlabs/Module/Cdav.php:1052 msgid "Less" msgstr "Меньше" -#: ../../Zotlabs/Module/Cdav.php:1049 ../../Zotlabs/Module/Cdav.php:1384 +#: ../../Zotlabs/Module/Cdav.php:1053 ../../Zotlabs/Module/Cdav.php:1388 #: ../../Zotlabs/Module/Profiles.php:801 ../../Zotlabs/Module/Oauth.php:53 #: ../../Zotlabs/Module/Oauth.php:137 ../../Zotlabs/Module/Oauth2.php:58 #: ../../Zotlabs/Module/Oauth2.php:144 @@ -4971,108 +5068,108 @@ msgstr "Меньше" msgid "Update" msgstr "Обновить" -#: ../../Zotlabs/Module/Cdav.php:1050 +#: ../../Zotlabs/Module/Cdav.php:1054 msgid "Select calendar" msgstr "Выбрать календарь" -#: ../../Zotlabs/Module/Cdav.php:1051 ../../Zotlabs/Widget/Cdav.php:143 +#: ../../Zotlabs/Module/Cdav.php:1055 ../../Zotlabs/Widget/Cdav.php:143 msgid "Channel Calendars" msgstr "Календари канала" -#: ../../Zotlabs/Module/Cdav.php:1051 ../../Zotlabs/Widget/Cdav.php:129 +#: ../../Zotlabs/Module/Cdav.php:1055 ../../Zotlabs/Widget/Cdav.php:129 #: ../../Zotlabs/Widget/Cdav.php:143 msgid "CalDAV Calendars" msgstr "Календари CalDAV" -#: ../../Zotlabs/Module/Cdav.php:1053 +#: ../../Zotlabs/Module/Cdav.php:1057 msgid "Delete all" msgstr "Удалить всё" -#: ../../Zotlabs/Module/Cdav.php:1056 +#: ../../Zotlabs/Module/Cdav.php:1060 msgid "Sorry! Editing of recurrent events is not yet implemented." msgstr "Простите, но редактирование повторяющихся событий пока не реализовано." -#: ../../Zotlabs/Module/Cdav.php:1369 ../../Zotlabs/Module/Connedit.php:916 +#: ../../Zotlabs/Module/Cdav.php:1373 ../../Zotlabs/Module/Connedit.php:916 msgid "Organisation" msgstr "Организация" -#: ../../Zotlabs/Module/Cdav.php:1370 ../../Zotlabs/Module/Connedit.php:917 +#: ../../Zotlabs/Module/Cdav.php:1374 ../../Zotlabs/Module/Connedit.php:917 #: ../../extend/addon/hzaddons/workflow/workflow.php:2617 #: ../../extend/addon/hzaddons/workflow/workflow.php:2678 msgid "Title" msgstr "Наименование" -#: ../../Zotlabs/Module/Cdav.php:1371 ../../Zotlabs/Module/Profiles.php:788 +#: ../../Zotlabs/Module/Cdav.php:1375 ../../Zotlabs/Module/Profiles.php:788 #: ../../Zotlabs/Module/Connedit.php:918 msgid "Phone" msgstr "Телефон" -#: ../../Zotlabs/Module/Cdav.php:1373 ../../Zotlabs/Module/Profiles.php:790 +#: ../../Zotlabs/Module/Cdav.php:1377 ../../Zotlabs/Module/Profiles.php:790 #: ../../Zotlabs/Module/Connedit.php:920 msgid "Instant messenger" msgstr "Мессенджер" -#: ../../Zotlabs/Module/Cdav.php:1374 ../../Zotlabs/Module/Profiles.php:791 +#: ../../Zotlabs/Module/Cdav.php:1378 ../../Zotlabs/Module/Profiles.php:791 #: ../../Zotlabs/Module/Connedit.php:921 msgid "Website" msgstr "Веб-сайт" -#: ../../Zotlabs/Module/Cdav.php:1375 ../../Zotlabs/Module/Profiles.php:504 -#: ../../Zotlabs/Module/Profiles.php:792 ../../Zotlabs/Module/Locs.php:122 +#: ../../Zotlabs/Module/Cdav.php:1379 ../../Zotlabs/Module/Profiles.php:504 +#: ../../Zotlabs/Module/Profiles.php:792 ../../Zotlabs/Module/Locs.php:129 #: ../../Zotlabs/Module/Admin/Channels.php:160 #: ../../Zotlabs/Module/Connedit.php:922 msgid "Address" msgstr "Адрес" -#: ../../Zotlabs/Module/Cdav.php:1376 ../../Zotlabs/Module/Profiles.php:793 +#: ../../Zotlabs/Module/Cdav.php:1380 ../../Zotlabs/Module/Profiles.php:793 #: ../../Zotlabs/Module/Connedit.php:923 msgid "Note" msgstr "Заметка" -#: ../../Zotlabs/Module/Cdav.php:1381 ../../Zotlabs/Module/Profiles.php:798 +#: ../../Zotlabs/Module/Cdav.php:1385 ../../Zotlabs/Module/Profiles.php:798 #: ../../Zotlabs/Module/Connedit.php:928 msgid "Add Contact" msgstr "Добавить контакт" -#: ../../Zotlabs/Module/Cdav.php:1382 ../../Zotlabs/Module/Profiles.php:799 +#: ../../Zotlabs/Module/Cdav.php:1386 ../../Zotlabs/Module/Profiles.php:799 #: ../../Zotlabs/Module/Connedit.php:929 msgid "Add Field" msgstr "Добавить поле" -#: ../../Zotlabs/Module/Cdav.php:1387 ../../Zotlabs/Module/Connedit.php:934 +#: ../../Zotlabs/Module/Cdav.php:1391 ../../Zotlabs/Module/Connedit.php:934 msgid "P.O. Box" msgstr "абонентский ящик" -#: ../../Zotlabs/Module/Cdav.php:1388 ../../Zotlabs/Module/Connedit.php:935 +#: ../../Zotlabs/Module/Cdav.php:1392 ../../Zotlabs/Module/Connedit.php:935 msgid "Additional" msgstr "Дополнительно" -#: ../../Zotlabs/Module/Cdav.php:1389 ../../Zotlabs/Module/Connedit.php:936 +#: ../../Zotlabs/Module/Cdav.php:1393 ../../Zotlabs/Module/Connedit.php:936 msgid "Street" msgstr "Улица" -#: ../../Zotlabs/Module/Cdav.php:1390 ../../Zotlabs/Module/Connedit.php:937 +#: ../../Zotlabs/Module/Cdav.php:1394 ../../Zotlabs/Module/Connedit.php:937 msgid "Locality" msgstr "Населённый пункт" -#: ../../Zotlabs/Module/Cdav.php:1391 ../../Zotlabs/Module/Connedit.php:938 +#: ../../Zotlabs/Module/Cdav.php:1395 ../../Zotlabs/Module/Connedit.php:938 msgid "Region" msgstr "Регион" -#: ../../Zotlabs/Module/Cdav.php:1392 ../../Zotlabs/Module/Connedit.php:939 +#: ../../Zotlabs/Module/Cdav.php:1396 ../../Zotlabs/Module/Connedit.php:939 msgid "ZIP Code" msgstr "Индекс" -#: ../../Zotlabs/Module/Cdav.php:1393 ../../Zotlabs/Module/Profiles.php:759 +#: ../../Zotlabs/Module/Cdav.php:1397 ../../Zotlabs/Module/Profiles.php:759 #: ../../Zotlabs/Module/Connedit.php:940 msgid "Country" msgstr "Страна" -#: ../../Zotlabs/Module/Cdav.php:1452 +#: ../../Zotlabs/Module/Cdav.php:1456 msgid "Default Calendar" msgstr "Календарь по умолчанию" -#: ../../Zotlabs/Module/Cdav.php:1463 +#: ../../Zotlabs/Module/Cdav.php:1467 msgid "Default Addressbook" msgstr "Адресная книга по умолчанию" @@ -5576,96 +5673,96 @@ msgstr "Альбом не найден." msgid "Delete Album" msgstr "Удалить альбом" -#: ../../Zotlabs/Module/Photos.php:176 ../../Zotlabs/Module/Photos.php:1058 +#: ../../Zotlabs/Module/Photos.php:176 ../../Zotlabs/Module/Photos.php:1059 msgid "Delete Photo" msgstr "Удалить фотографию" -#: ../../Zotlabs/Module/Photos.php:529 +#: ../../Zotlabs/Module/Photos.php:530 msgid "No photos selected" msgstr "Никакие фотографии не выбраны" -#: ../../Zotlabs/Module/Photos.php:578 +#: ../../Zotlabs/Module/Photos.php:579 msgid "Access to this item is restricted." msgstr "Доступ к этому элементу ограничен." -#: ../../Zotlabs/Module/Photos.php:621 +#: ../../Zotlabs/Module/Photos.php:622 #, php-format msgid "%1$.2f MB of %2$.2f MB photo storage used." msgstr "Вы использовали %1$.2f мегабайт из %2$.2f для хранения фото." -#: ../../Zotlabs/Module/Photos.php:624 +#: ../../Zotlabs/Module/Photos.php:625 #, php-format msgid "%1$.2f MB photo storage used." msgstr "Вы использовали %1$.2f мегабайт для хранения фото." -#: ../../Zotlabs/Module/Photos.php:666 +#: ../../Zotlabs/Module/Photos.php:667 msgid "Upload Photos" msgstr "Загрузить фотографии" -#: ../../Zotlabs/Module/Photos.php:670 +#: ../../Zotlabs/Module/Photos.php:671 msgid "Enter an album name" msgstr "Введите название альбома" -#: ../../Zotlabs/Module/Photos.php:671 +#: ../../Zotlabs/Module/Photos.php:672 msgid "or select an existing album (doubleclick)" msgstr "или выберите существующий альбом (двойной щелчок)" -#: ../../Zotlabs/Module/Photos.php:672 +#: ../../Zotlabs/Module/Photos.php:673 msgid "Create a status post for this upload" msgstr "Сделать публикацию о статусе для этой загрузки" -#: ../../Zotlabs/Module/Photos.php:674 +#: ../../Zotlabs/Module/Photos.php:675 msgid "Description (optional)" msgstr "Описание (необязательно)" -#: ../../Zotlabs/Module/Photos.php:760 +#: ../../Zotlabs/Module/Photos.php:761 msgid "Show Newest First" msgstr "Показать новые первыми" -#: ../../Zotlabs/Module/Photos.php:762 +#: ../../Zotlabs/Module/Photos.php:763 msgid "Show Oldest First" msgstr "Показать старые первыми" -#: ../../Zotlabs/Module/Photos.php:786 ../../Zotlabs/Module/Photos.php:1332 +#: ../../Zotlabs/Module/Photos.php:787 ../../Zotlabs/Module/Photos.php:1333 #: ../../Zotlabs/Module/Embedphotos.php:170 #: ../../Zotlabs/Widget/Portfolio.php:87 ../../Zotlabs/Widget/Album.php:78 msgid "View Photo" msgstr "Посмотреть фотографию" -#: ../../Zotlabs/Module/Photos.php:817 ../../Zotlabs/Module/Embedphotos.php:186 +#: ../../Zotlabs/Module/Photos.php:818 ../../Zotlabs/Module/Embedphotos.php:186 #: ../../Zotlabs/Widget/Portfolio.php:108 ../../Zotlabs/Widget/Album.php:95 msgid "Edit Album" msgstr "Редактировать Фотоальбом" -#: ../../Zotlabs/Module/Photos.php:819 ../../Zotlabs/Module/Photos.php:1363 +#: ../../Zotlabs/Module/Photos.php:820 ../../Zotlabs/Module/Photos.php:1364 msgid "Add Photos" msgstr "Добавить фотографии" -#: ../../Zotlabs/Module/Photos.php:867 +#: ../../Zotlabs/Module/Photos.php:868 msgid "Permission denied. Access to this item may be restricted." msgstr "Доступ запрещен. Доступ к этому элементу может быть ограничен." -#: ../../Zotlabs/Module/Photos.php:869 +#: ../../Zotlabs/Module/Photos.php:870 msgid "Photo not available" msgstr "Фотография не доступна" -#: ../../Zotlabs/Module/Photos.php:927 +#: ../../Zotlabs/Module/Photos.php:928 msgid "Use as profile photo" msgstr "Использовать в качестве фотографии профиля" -#: ../../Zotlabs/Module/Photos.php:928 +#: ../../Zotlabs/Module/Photos.php:929 msgid "Use as cover photo" msgstr "Использовать в качестве фотографии обложки" -#: ../../Zotlabs/Module/Photos.php:935 +#: ../../Zotlabs/Module/Photos.php:936 msgid "Private Photo" msgstr "Личная фотография" -#: ../../Zotlabs/Module/Photos.php:950 +#: ../../Zotlabs/Module/Photos.php:951 msgid "View Full Size" msgstr "Посмотреть в полный размер" -#: ../../Zotlabs/Module/Photos.php:995 ../../Zotlabs/Module/Tagrm.php:137 +#: ../../Zotlabs/Module/Photos.php:996 ../../Zotlabs/Module/Tagrm.php:137 #: ../../Zotlabs/Module/Cover_photo.php:424 #: ../../Zotlabs/Module/Admin/Addons.php:459 #: ../../Zotlabs/Module/Profile_photo.php:501 @@ -5673,78 +5770,78 @@ msgstr "Посмотреть в полный размер" msgid "Remove" msgstr "Удалить" -#: ../../Zotlabs/Module/Photos.php:1032 +#: ../../Zotlabs/Module/Photos.php:1033 msgid "Edit photo" msgstr "Редактировать фотографию" -#: ../../Zotlabs/Module/Photos.php:1034 +#: ../../Zotlabs/Module/Photos.php:1035 msgid "Rotate CW (right)" msgstr "Повернуть CW (направо)" -#: ../../Zotlabs/Module/Photos.php:1035 +#: ../../Zotlabs/Module/Photos.php:1036 msgid "Rotate CCW (left)" msgstr "Повернуть CCW (налево)" -#: ../../Zotlabs/Module/Photos.php:1038 +#: ../../Zotlabs/Module/Photos.php:1039 msgid "Move photo to album" msgstr "Переместить фотографию в альбом" -#: ../../Zotlabs/Module/Photos.php:1039 +#: ../../Zotlabs/Module/Photos.php:1040 msgid "Enter a new album name" msgstr "Введите новое название альбома" -#: ../../Zotlabs/Module/Photos.php:1040 +#: ../../Zotlabs/Module/Photos.php:1041 msgid "or select an existing one (doubleclick)" msgstr "или выбрать существующую (двойной щелчок)" -#: ../../Zotlabs/Module/Photos.php:1045 +#: ../../Zotlabs/Module/Photos.php:1046 msgid "Add a Tag" msgstr "Добавить тег" -#: ../../Zotlabs/Module/Photos.php:1053 +#: ../../Zotlabs/Module/Photos.php:1054 msgid "Example: @bob, @Barbara_Jensen, @jim@example.com" msgstr "Пример: @bob, @Barbara_Jensen, @jim@example.com" -#: ../../Zotlabs/Module/Photos.php:1056 +#: ../../Zotlabs/Module/Photos.php:1057 msgid "Flag as adult in album view" msgstr "Пометить как альбом \"для взрослых\"" -#: ../../Zotlabs/Module/Photos.php:1075 ../../Zotlabs/Lib/ThreadItem.php:317 +#: ../../Zotlabs/Module/Photos.php:1076 ../../Zotlabs/Lib/ThreadItem.php:317 msgid "I like this (toggle)" msgstr "мне это нравится (переключение)" -#: ../../Zotlabs/Module/Photos.php:1076 ../../Zotlabs/Lib/ThreadItem.php:318 +#: ../../Zotlabs/Module/Photos.php:1077 ../../Zotlabs/Lib/ThreadItem.php:318 msgid "I don't like this (toggle)" msgstr "мне это не нравится (переключение)" -#: ../../Zotlabs/Module/Photos.php:1094 ../../Zotlabs/Module/Photos.php:1212 +#: ../../Zotlabs/Module/Photos.php:1095 ../../Zotlabs/Module/Photos.php:1213 #: ../../Zotlabs/Lib/ThreadItem.php:822 msgid "This is you" msgstr "Это вы" -#: ../../Zotlabs/Module/Photos.php:1131 ../../Zotlabs/Module/Photos.php:1143 +#: ../../Zotlabs/Module/Photos.php:1132 ../../Zotlabs/Module/Photos.php:1144 #: ../../Zotlabs/Lib/ThreadItem.php:238 ../../Zotlabs/Lib/ThreadItem.php:250 msgid "View all" msgstr "Просмотреть все" -#: ../../Zotlabs/Module/Photos.php:1246 +#: ../../Zotlabs/Module/Photos.php:1247 msgid "Photo Tools" msgstr "Фото-Инструменты" -#: ../../Zotlabs/Module/Photos.php:1255 +#: ../../Zotlabs/Module/Photos.php:1256 msgid "In This Photo:" msgstr "На этой фотографии:" -#: ../../Zotlabs/Module/Photos.php:1260 +#: ../../Zotlabs/Module/Photos.php:1261 msgid "Map" msgstr "Карта" -#: ../../Zotlabs/Module/Photos.php:1268 ../../Zotlabs/Lib/ThreadItem.php:489 +#: ../../Zotlabs/Module/Photos.php:1269 ../../Zotlabs/Lib/ThreadItem.php:489 msgctxt "noun" msgid "Likes" msgstr "Нравится" -#: ../../Zotlabs/Module/Photos.php:1269 ../../Zotlabs/Lib/ThreadItem.php:490 +#: ../../Zotlabs/Module/Photos.php:1270 ../../Zotlabs/Lib/ThreadItem.php:490 msgctxt "noun" msgid "Dislikes" msgstr "Не нравится" @@ -5761,13 +5858,6 @@ msgstr "Удалить тег элемента" msgid "Select a tag to remove: " msgstr "Выбрать тег для удаления:" -#: ../../Zotlabs/Module/Chanview.php:95 ../../Zotlabs/Module/Page.php:75 -#: ../../Zotlabs/Module/Wall_upload.php:31 ../../Zotlabs/Module/Block.php:41 -#: ../../Zotlabs/Module/Cal.php:31 ../../Zotlabs/Module/Card_edit.php:44 -#: ../../Zotlabs/Module/Article_edit.php:44 -msgid "Channel not found." -msgstr "Канал не найден." - #: ../../Zotlabs/Module/Chanview.php:132 msgid "toggle full screen mode" msgstr "переключение полноэкранного режима" @@ -6105,7 +6195,7 @@ msgstr "Приложение \"Публичный поток\"" msgid "The unmoderated public stream of this hub" msgstr "Немодерируемый публичный поток с этого хаба" -#: ../../Zotlabs/Module/Pubstream.php:114 +#: ../../Zotlabs/Module/Pubstream.php:105 #: ../../Zotlabs/Widget/Notifications.php:162 ../../Zotlabs/Lib/Apps.php:375 msgid "Public Stream" msgstr "Публичный поток" @@ -6480,56 +6570,56 @@ msgstr "Объясните свою оценку (необязательно; э msgid "Please login." msgstr "Пожалуйста, войдите." -#: ../../Zotlabs/Module/Locs.php:27 ../../Zotlabs/Module/Locs.php:57 +#: ../../Zotlabs/Module/Locs.php:27 ../../Zotlabs/Module/Locs.php:66 msgid "Location not found." msgstr "Местоположение не найдено" -#: ../../Zotlabs/Module/Locs.php:65 +#: ../../Zotlabs/Module/Locs.php:75 msgid "Location lookup failed." msgstr "Поиск местоположения не удался" -#: ../../Zotlabs/Module/Locs.php:69 +#: ../../Zotlabs/Module/Locs.php:79 msgid "" "Please select another location to become primary before removing the primary " "location." msgstr "Пожалуйста, выберите другое местоположение в качестве основного прежде чем удалить предыдущее" -#: ../../Zotlabs/Module/Locs.php:99 +#: ../../Zotlabs/Module/Locs.php:108 msgid "Syncing locations" msgstr "Синхронизировать местоположение" -#: ../../Zotlabs/Module/Locs.php:109 +#: ../../Zotlabs/Module/Locs.php:117 msgid "No locations found." msgstr "Местоположений не найдено" -#: ../../Zotlabs/Module/Locs.php:120 +#: ../../Zotlabs/Module/Locs.php:127 msgid "Manage Channel Locations" msgstr "Управление местоположением канала" -#: ../../Zotlabs/Module/Locs.php:123 +#: ../../Zotlabs/Module/Locs.php:130 #: ../../extend/addon/hzaddons/workflow/workflow.php:285 msgid "Primary" msgstr "Основной" -#: ../../Zotlabs/Module/Locs.php:124 ../../Zotlabs/Module/Menu.php:177 +#: ../../Zotlabs/Module/Locs.php:131 ../../Zotlabs/Module/Menu.php:177 msgid "Drop" msgstr "Удалить" -#: ../../Zotlabs/Module/Locs.php:126 +#: ../../Zotlabs/Module/Locs.php:133 msgid "Sync Now" msgstr "Синхронизировать" -#: ../../Zotlabs/Module/Locs.php:127 +#: ../../Zotlabs/Module/Locs.php:134 msgid "Please wait several minutes between consecutive operations." msgstr "Пожалуйста, подождите несколько минут между последовательными операциями." -#: ../../Zotlabs/Module/Locs.php:128 +#: ../../Zotlabs/Module/Locs.php:135 msgid "" "When possible, drop a location by logging into that website/hub and removing " "your channel." msgstr "По возможности, очистите местоположение, войдя на этот веб-сайт / хаб и удалив свой канал." -#: ../../Zotlabs/Module/Locs.php:129 +#: ../../Zotlabs/Module/Locs.php:136 msgid "Use this form to drop the location if the hub is no longer operating." msgstr "Используйте эту форму, чтобы удалить местоположение, если хаб больше не функционирует." @@ -6824,101 +6914,93 @@ msgstr "Настройки бесед" msgid "Editor Settings" msgstr "Настройки редактора" -#: ../../Zotlabs/Module/Settings/Display.php:120 +#: ../../Zotlabs/Module/Settings/Display.php:118 #: ../../Zotlabs/Module/Admin/Site.php:202 #, php-format msgid "%s - (Incompatible)" msgstr "%s - (несовместимо)" -#: ../../Zotlabs/Module/Settings/Display.php:129 +#: ../../Zotlabs/Module/Settings/Display.php:127 #, php-format msgid "%s - (Experimental)" msgstr "%s - (экспериментальный)" -#: ../../Zotlabs/Module/Settings/Display.php:185 +#: ../../Zotlabs/Module/Settings/Display.php:183 msgid "Display Settings" msgstr "Настройки отображения" -#: ../../Zotlabs/Module/Settings/Display.php:186 +#: ../../Zotlabs/Module/Settings/Display.php:184 msgid "Theme Settings" msgstr "Настройки темы" -#: ../../Zotlabs/Module/Settings/Display.php:187 +#: ../../Zotlabs/Module/Settings/Display.php:185 msgid "Custom Theme Settings" msgstr "Дополнительные настройки темы" -#: ../../Zotlabs/Module/Settings/Display.php:188 +#: ../../Zotlabs/Module/Settings/Display.php:186 msgid "Content Settings" msgstr "Настройки содержимого" -#: ../../Zotlabs/Module/Settings/Display.php:194 +#: ../../Zotlabs/Module/Settings/Display.php:192 msgid "Display Theme:" msgstr "Тема отображения:" -#: ../../Zotlabs/Module/Settings/Display.php:195 +#: ../../Zotlabs/Module/Settings/Display.php:193 msgid "Select scheme" msgstr "Выбрать схему" -#: ../../Zotlabs/Module/Settings/Display.php:197 +#: ../../Zotlabs/Module/Settings/Display.php:195 msgid "Preload images before rendering the page" msgstr "Предзагрузка изображений перед обработкой страницы" -#: ../../Zotlabs/Module/Settings/Display.php:197 +#: ../../Zotlabs/Module/Settings/Display.php:195 msgid "" "The subjective page load time will be longer but the page will be ready when " "displayed" msgstr "Субъективное время загрузки страницы будет длиннее, но страница будет готова при отображении" -#: ../../Zotlabs/Module/Settings/Display.php:198 +#: ../../Zotlabs/Module/Settings/Display.php:196 msgid "Enable user zoom on mobile devices" msgstr "Включить масштабирование на мобильных устройствах" -#: ../../Zotlabs/Module/Settings/Display.php:199 +#: ../../Zotlabs/Module/Settings/Display.php:197 msgid "Update browser every xx seconds" msgstr "Обновление браузера каждые N секунд" -#: ../../Zotlabs/Module/Settings/Display.php:199 +#: ../../Zotlabs/Module/Settings/Display.php:197 msgid "Minimum of 10 seconds, no maximum" msgstr "Минимум 10 секунд, без максимума" -#: ../../Zotlabs/Module/Settings/Display.php:200 +#: ../../Zotlabs/Module/Settings/Display.php:198 msgid "Maximum number of conversations to load at any time:" msgstr "Максимальное количество бесед для загрузки одновременно:" -#: ../../Zotlabs/Module/Settings/Display.php:200 +#: ../../Zotlabs/Module/Settings/Display.php:198 msgid "Maximum of 30 items" msgstr "Не более 30 элементов" -#: ../../Zotlabs/Module/Settings/Display.php:201 +#: ../../Zotlabs/Module/Settings/Display.php:199 msgid "Show emoticons (smilies) as images" msgstr "Показывать эмотиконы (смайлики) как изображения" -#: ../../Zotlabs/Module/Settings/Display.php:202 +#: ../../Zotlabs/Module/Settings/Display.php:200 msgid "Provide channel menu in navigation bar" msgstr "Показывать меню канала в панели навигации" -#: ../../Zotlabs/Module/Settings/Display.php:202 +#: ../../Zotlabs/Module/Settings/Display.php:200 msgid "Default: channel menu located in app menu" msgstr "По умолчанию каналы расположены в меню приложения" -#: ../../Zotlabs/Module/Settings/Display.php:203 -msgid "Manual conversation updates" -msgstr "Обновление бесед вручную" - -#: ../../Zotlabs/Module/Settings/Display.php:203 -msgid "Default is on, turning this off may increase screen jumping" -msgstr "Включено по умолчанию, выключение может привести к рывкам в отображении" - -#: ../../Zotlabs/Module/Settings/Display.php:204 +#: ../../Zotlabs/Module/Settings/Display.php:201 msgid "Link post titles to source" msgstr "Ссылки на источник заголовков публикаций" -#: ../../Zotlabs/Module/Settings/Display.php:206 +#: ../../Zotlabs/Module/Settings/Display.php:203 #: ../../Zotlabs/Widget/Newmember.php:75 msgid "New Member Links" msgstr "Ссылки для новичков" -#: ../../Zotlabs/Module/Settings/Display.php:206 +#: ../../Zotlabs/Module/Settings/Display.php:203 msgid "Display new member quick links menu" msgstr "Показать меню быстрых ссылок для новых участников" @@ -7411,44 +7493,37 @@ msgstr "Управление приложениями" msgid "Create Custom App" msgstr "Создать пользовательское приложение" -#: ../../Zotlabs/Module/Filestorage.php:103 -msgid "File not found." -msgstr "Файл не найден." +#: ../../Zotlabs/Module/Filestorage.php:14 +#: ../../Zotlabs/Module/Filestorage.php:53 +msgid "Deprecated!" +msgstr "Не рекомендовано!" -#: ../../Zotlabs/Module/Filestorage.php:152 +#: ../../Zotlabs/Module/Filestorage.php:157 msgid "Permission Denied." msgstr "Доступ запрещен." -#: ../../Zotlabs/Module/Filestorage.php:185 +#: ../../Zotlabs/Module/Filestorage.php:190 msgid "Edit file permissions" msgstr "Редактировать разрешения файла" -#: ../../Zotlabs/Module/Filestorage.php:197 +#: ../../Zotlabs/Module/Filestorage.php:202 #: ../../extend/addon/hzaddons/flashcards/Mod_Flashcards.php:261 msgid "Set/edit permissions" msgstr "Редактировать разрешения" -#: ../../Zotlabs/Module/Filestorage.php:198 +#: ../../Zotlabs/Module/Filestorage.php:203 msgid "Include all files and sub folders" msgstr "Включить все файлы и подкаталоги" -#: ../../Zotlabs/Module/Filestorage.php:199 +#: ../../Zotlabs/Module/Filestorage.php:204 msgid "Return to file list" msgstr "Вернутся к списку файлов" -#: ../../Zotlabs/Module/Filestorage.php:201 -msgid "Copy/paste this code to attach file to a post" -msgstr "Копировать / вставить этот код для прикрепления файла к публикации" - -#: ../../Zotlabs/Module/Filestorage.php:202 -msgid "Copy/paste this URL to link file from a web page" -msgstr "Копировать / вставить эту URL для ссылки на файл со страницы" - -#: ../../Zotlabs/Module/Filestorage.php:204 +#: ../../Zotlabs/Module/Filestorage.php:209 msgid "Share this file" msgstr "Поделиться этим файлом" -#: ../../Zotlabs/Module/Filestorage.php:205 +#: ../../Zotlabs/Module/Filestorage.php:210 msgid "Show URL to this file" msgstr "Показать URL этого файла" @@ -7465,7 +7540,7 @@ msgstr "Редактировать блок" msgid "No service class restrictions found." msgstr "Ограничений класса обслуживание не найдено." -#: ../../Zotlabs/Module/Channel.php:178 +#: ../../Zotlabs/Module/Channel.php:174 msgid "Insufficient permissions. Request redirected to profile page." msgstr "Недостаточно прав. Запрос перенаправлен на страницу профиля." @@ -7543,81 +7618,81 @@ msgstr "Нет на месте" msgid "Online" msgstr "В сети" -#: ../../Zotlabs/Module/Like.php:57 +#: ../../Zotlabs/Module/Like.php:93 msgid "Like/Dislike" msgstr "Нравится / не нравится" -#: ../../Zotlabs/Module/Like.php:62 +#: ../../Zotlabs/Module/Like.php:98 msgid "This action is restricted to members." msgstr "Это действие доступно только участникам." -#: ../../Zotlabs/Module/Like.php:63 +#: ../../Zotlabs/Module/Like.php:99 msgid "" "Please <a href=\"rmagic\">login with your $Projectname ID</a> or <a href=" "\"register\">register as a new $Projectname member</a> to continue." msgstr "Пожалуйста, для продолжения <a href=\"rmagic\"> войдите с вашим $Projectname ID</a> или <a href=\"register\">зарегистрируйтесь как новый участник $Projectname</a>." -#: ../../Zotlabs/Module/Like.php:117 ../../Zotlabs/Module/Like.php:143 -#: ../../Zotlabs/Module/Like.php:181 +#: ../../Zotlabs/Module/Like.php:154 ../../Zotlabs/Module/Like.php:180 +#: ../../Zotlabs/Module/Like.php:218 msgid "Invalid request." msgstr "Неверный запрос." -#: ../../Zotlabs/Module/Like.php:158 +#: ../../Zotlabs/Module/Like.php:195 msgid "thing" msgstr "предмет" -#: ../../Zotlabs/Module/Like.php:204 +#: ../../Zotlabs/Module/Like.php:241 msgid "Channel unavailable." msgstr "Канал недоступен." -#: ../../Zotlabs/Module/Like.php:240 +#: ../../Zotlabs/Module/Like.php:277 msgid "Previous action reversed." msgstr "Предыдущее действие отменено." -#: ../../Zotlabs/Module/Like.php:386 ../../Zotlabs/Module/Subthread.php:112 -#: ../../extend/addon/hzaddons/pubcrawl/as.php:1881 +#: ../../Zotlabs/Module/Like.php:433 ../../Zotlabs/Module/Subthread.php:112 +#: ../../extend/addon/hzaddons/pubcrawl/as.php:2057 #: ../../extend/addon/hzaddons/diaspora/Receiver.php:1601 msgid "status" msgstr "статус" -#: ../../Zotlabs/Module/Like.php:426 +#: ../../Zotlabs/Module/Like.php:473 #, php-format msgid "%1$s agrees with %2$s's %3$s" msgstr "%1$s согласен с %2$s %3$s" -#: ../../Zotlabs/Module/Like.php:428 +#: ../../Zotlabs/Module/Like.php:475 #, php-format msgid "%1$s doesn't agree with %2$s's %3$s" msgstr "%1$s не согласен с %2$s %3$s" -#: ../../Zotlabs/Module/Like.php:430 +#: ../../Zotlabs/Module/Like.php:477 #, php-format msgid "%1$s abstains from a decision on %2$s's %3$s" msgstr "%1$s воздерживается от решения по %2$s%3$s" -#: ../../Zotlabs/Module/Like.php:432 +#: ../../Zotlabs/Module/Like.php:479 #: ../../extend/addon/hzaddons/diaspora/Receiver.php:2188 #, php-format msgid "%1$s is attending %2$s's %3$s" msgstr "%1$s посещает %2$s%3$s" -#: ../../Zotlabs/Module/Like.php:434 +#: ../../Zotlabs/Module/Like.php:481 #: ../../extend/addon/hzaddons/diaspora/Receiver.php:2190 #, php-format msgid "%1$s is not attending %2$s's %3$s" msgstr "%1$s не посещает %2$s%3$s" -#: ../../Zotlabs/Module/Like.php:436 +#: ../../Zotlabs/Module/Like.php:483 #: ../../extend/addon/hzaddons/diaspora/Receiver.php:2192 #, php-format msgid "%1$s may attend %2$s's %3$s" msgstr "%1$s может посетить %2$s%3$s" -#: ../../Zotlabs/Module/Like.php:547 +#: ../../Zotlabs/Module/Like.php:592 msgid "Action completed." msgstr "Действие завершено." -#: ../../Zotlabs/Module/Like.php:548 +#: ../../Zotlabs/Module/Like.php:593 msgid "Thank you." msgstr "Спасибо." @@ -7657,7 +7732,7 @@ msgstr "" msgid "from the terminal." msgstr "из терминала." -#: ../../Zotlabs/Module/Attach.php:13 +#: ../../Zotlabs/Module/Attach.php:67 msgid "Item not available." msgstr "Элемент недоступен." @@ -9597,7 +9672,7 @@ msgstr "%1$s отслеживает %2$s's %3$s" msgid "%1$s stopped following %2$s's %3$s" msgstr "%1$s прекратил отслеживать %2$s's %3$s" -#: ../../Zotlabs/Module/Rpost.php:144 ../../Zotlabs/Module/Editpost.php:109 +#: ../../Zotlabs/Module/Rpost.php:150 ../../Zotlabs/Module/Editpost.php:109 msgid "Edit post" msgstr "Редактировать сообщение" @@ -9666,20 +9741,20 @@ msgstr "URL для фотографии (необязательно)" msgid "Add Thing to your Profile" msgstr "Добавить к вашему профилю" -#: ../../Zotlabs/Module/Hq.php:140 +#: ../../Zotlabs/Module/Hq.php:131 msgid "Welcome to Hubzilla!" msgstr "Добро пожаловать в Hubzilla!" -#: ../../Zotlabs/Module/Hq.php:140 +#: ../../Zotlabs/Module/Hq.php:131 msgid "You have got no unseen posts..." msgstr "У вас нет непросмотренных публикаций..." -#: ../../Zotlabs/Module/Search.php:231 +#: ../../Zotlabs/Module/Search.php:222 #, php-format msgid "Items tagged with: %s" msgstr "Объекты помечены как: %s" -#: ../../Zotlabs/Module/Search.php:233 +#: ../../Zotlabs/Module/Search.php:224 #, php-format msgid "Search results for: %s" msgstr "Результаты поиска для: %s" @@ -10470,15 +10545,15 @@ msgstr "(Владельцем канала не было представлен msgid "Restricted or Premium Channel" msgstr "Ограниченный или премиальный канал" -#: ../../Zotlabs/Module/Cloud.php:116 +#: ../../Zotlabs/Module/Cloud.php:120 msgid "Not found" msgstr "Не найдено." -#: ../../Zotlabs/Module/Cloud.php:122 +#: ../../Zotlabs/Module/Cloud.php:126 msgid "Please refresh page" msgstr "Пожалуйста обновите страницу" -#: ../../Zotlabs/Module/Cloud.php:125 +#: ../../Zotlabs/Module/Cloud.php:129 msgid "Unknown error" msgstr "Неизвестная ошибка" @@ -10608,10 +10683,6 @@ msgstr "Ошибка при создании zip-файла при экспор msgid "Error downloading wiki: " msgstr "Ошибка загрузки Wiki:" -#: ../../Zotlabs/Module/Wiki.php:212 -msgid "Download" -msgstr "Загрузить" - #: ../../Zotlabs/Module/Wiki.php:216 msgid "Wiki name" msgstr "Название Wiki" @@ -10747,15 +10818,15 @@ msgstr "Сообщение для проверки email отправлено п msgid "Unable to resend email verification message." msgstr "Невозможно повторно отправить сообщение для проверки email" -#: ../../Zotlabs/Module/Filer.php:52 +#: ../../Zotlabs/Module/Filer.php:53 msgid "Enter a folder name" msgstr "Введите название каталога" -#: ../../Zotlabs/Module/Filer.php:52 +#: ../../Zotlabs/Module/Filer.php:53 msgid "or select an existing folder (doubleclick)" msgstr "или выберите существующий каталог (двойной щелчок)" -#: ../../Zotlabs/Module/Filer.php:54 ../../Zotlabs/Lib/ThreadItem.php:184 +#: ../../Zotlabs/Module/Filer.php:55 ../../Zotlabs/Lib/ThreadItem.php:184 msgid "Save to Folder" msgstr "Сохранить в каталог" @@ -10835,52 +10906,52 @@ msgstr "Ваш класс обслуживания разрешает тольк msgid "No channel. Import failed." msgstr "Канала нет. Импорт невозможен." -#: ../../Zotlabs/Module/Import.php:597 +#: ../../Zotlabs/Module/Import.php:593 #: ../../extend/addon/hzaddons/diaspora/import_diaspora.php:142 msgid "Import completed." msgstr "Импорт завершен." -#: ../../Zotlabs/Module/Import.php:625 +#: ../../Zotlabs/Module/Import.php:621 msgid "You must be logged in to use this feature." msgstr "Вы должны войти в систему, чтобы использовать эту функцию." -#: ../../Zotlabs/Module/Import.php:630 +#: ../../Zotlabs/Module/Import.php:626 msgid "Import Channel" msgstr "Импортировать канал" -#: ../../Zotlabs/Module/Import.php:631 +#: ../../Zotlabs/Module/Import.php:627 msgid "" "Use this form to import an existing channel from a different server/hub. You " "may retrieve the channel identity from the old server/hub via the network or " "provide an export file." msgstr "Используйте эту форм для импорта существующего канала с другого сервера / хаба. Вы можете получить идентификационные данные канала со старого сервера / хаба через сеть или предоставить файл экспорта." -#: ../../Zotlabs/Module/Import.php:632 +#: ../../Zotlabs/Module/Import.php:628 #: ../../Zotlabs/Module/Import_items.php:127 msgid "File to Upload" msgstr "Файл для загрузки" -#: ../../Zotlabs/Module/Import.php:633 +#: ../../Zotlabs/Module/Import.php:629 msgid "Or provide the old server/hub details" msgstr "или предоставьте данные старого сервера" -#: ../../Zotlabs/Module/Import.php:635 +#: ../../Zotlabs/Module/Import.php:631 msgid "Your old identity address (xyz@example.com)" msgstr "Ваш старый адрес канала (xyz@example.com)" -#: ../../Zotlabs/Module/Import.php:636 +#: ../../Zotlabs/Module/Import.php:632 msgid "Your old login email address" msgstr "Ваш старый адрес электронной почты" -#: ../../Zotlabs/Module/Import.php:637 +#: ../../Zotlabs/Module/Import.php:633 msgid "Your old login password" msgstr "Ваш старый пароль" -#: ../../Zotlabs/Module/Import.php:638 +#: ../../Zotlabs/Module/Import.php:634 msgid "Import a few months of posts if possible (limited by available memory" msgstr "Импортировать несколько месяцев публикаций если возможно (ограничено доступной памятью)" -#: ../../Zotlabs/Module/Import.php:640 +#: ../../Zotlabs/Module/Import.php:636 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 " @@ -10888,25 +10959,25 @@ msgid "" "location for files, photos, and media." msgstr "Для любого варианта, пожалуйста, выберите, следует ли сделать этот хаб вашим новым основным адресом, или ваше прежнее местоположение должно продолжить выполнять эту роль. Вы сможете отправлять сообщения из любого местоположения, но только одно может быть помечено как основное место для файлов, фотографий и мультимедиа." -#: ../../Zotlabs/Module/Import.php:642 +#: ../../Zotlabs/Module/Import.php:638 msgid "Make this hub my primary location" msgstr "Сделать этот хаб главным" -#: ../../Zotlabs/Module/Import.php:643 +#: ../../Zotlabs/Module/Import.php:639 msgid "Move this channel (disable all previous locations)" msgstr "Переместить это канал (отключить все предыдущие месторасположения)" -#: ../../Zotlabs/Module/Import.php:644 +#: ../../Zotlabs/Module/Import.php:640 msgid "Use this channel nickname instead of the one provided" msgstr "Использовать псевдоним этого канала вместо предоставленного" -#: ../../Zotlabs/Module/Import.php:644 +#: ../../Zotlabs/Module/Import.php:640 msgid "" "Leave blank to keep your existing channel nickname. You will be randomly " "assigned a similar nickname if either name is already allocated on this site." msgstr "Оставьте пустым для сохранения существующего псевдонима канала. Вам будет случайным образом назначен похожий псевдоним если такое имя уже выделено на этом сайте." -#: ../../Zotlabs/Module/Import.php:646 +#: ../../Zotlabs/Module/Import.php:642 msgid "" "This process may take several minutes to complete. Please submit the form " "only once and leave this page open until finished." @@ -12333,10 +12404,6 @@ msgstr "Пригласить" msgid "Language" msgstr "Язык" -#: ../../Zotlabs/Lib/Apps.php:360 -msgid "Post" -msgstr "Публикация" - #: ../../Zotlabs/Lib/Apps.php:361 #: ../../extend/addon/hzaddons/openid/MysqlProvider.php:58 #: ../../extend/addon/hzaddons/openid/MysqlProvider.php:59 @@ -15171,7 +15238,7 @@ msgstr "журнал изменений" #: ../../extend/addon/hzaddons/upgrade_info/upgrade_info.php:54 msgid "change log" -msgstr "в истории git" +msgstr "историю git" #: ../../extend/addon/hzaddons/upgrade_info/upgrade_info.php:55 msgid "for further info." diff --git a/view/ru/hstrings.php b/view/ru/hstrings.php index 9c312a89d..2251db42a 100644 --- a/view/ru/hstrings.php +++ b/view/ru/hstrings.php @@ -428,7 +428,6 @@ App::$strings["Export to cloud files"] = "Эскпортировать в сет App::$strings["/path/to/export/folder"] = ""; App::$strings["Enter a path to a cloud files destination."] = "Введите путь к расположению сетевых файлов."; App::$strings["Specify folder"] = "Указать каталог"; -App::$strings["Collection"] = "Коллекция"; App::$strings["Unable to import a removed channel."] = "Невозможно импортировать удалённый канал."; App::$strings["Cannot create a duplicate channel identifier on this system. Import failed."] = "Не удалось создать дублирующийся идентификатор канала. Импорт невозможен."; App::$strings["Unable to create a unique channel address. Import failed."] = "Не удалось создать уникальный адрес канала. Импорт не завершен."; @@ -740,6 +739,7 @@ App::$strings["__ctx:calendar__ month"] = "месяц"; App::$strings["__ctx:calendar__ week"] = "неделя"; App::$strings["__ctx:calendar__ day"] = "день"; App::$strings["__ctx:calendar__ All day"] = "Весь день"; +App::$strings["Please stand by while your download is being prepared."] = "Пожалуйста, подождите, пока готовится загрузка."; App::$strings["Directory Options"] = "Параметры каталога"; App::$strings["Safe Mode"] = "Безопасный режим"; App::$strings["Public Forums Only"] = "Только публичные форумы"; @@ -803,8 +803,8 @@ App::$strings["%1\$s's birthday"] = "День рождения %1\$s"; App::$strings["Happy Birthday %1\$s"] = "С Днем рождения %1\$s !"; App::$strings["Visible to your default audience"] = "Видно вашей аудитории по умолчанию."; App::$strings["Profile-Based Privacy Groups"] = "Группы конфиденциальности основанные на профиле"; -App::$strings["Forums"] = "Форумы"; App::$strings["Private Forum"] = "Частный форум"; +App::$strings["Forums"] = "Форумы"; App::$strings["Only me"] = "Только мне"; App::$strings["Share with"] = "Поделиться с"; App::$strings["Custom selection"] = "Настраиваемый выбор"; @@ -923,11 +923,12 @@ App::$strings["[\$Projectname] Website SSL error for %s"] = "[\$Projectname] О App::$strings["Website SSL certificate is not valid. Please correct."] = "SSL/TLS сертификат веб-сайт недействителен. Исправьте это."; App::$strings["[\$Projectname] Cron tasks not running on %s"] = "[\$Projectname] Задания Cron не запущены на %s"; App::$strings["Cron/Scheduled tasks not running."] = "Задания Cron / планировщика не запущены."; -App::$strings["parent"] = "источник"; -App::$strings["Principal"] = "Субъект"; -App::$strings["Addressbook"] = "Адресная книга"; -App::$strings["Schedule Inbox"] = "План занятий входящий"; -App::$strings["Schedule Outbox"] = "План занятий исходящий"; +App::$strings["Change filename to"] = "Переименовать файл в"; +App::$strings["Select a target location"] = "Выбрать место назначения"; +App::$strings["Copy to target location"] = "Скопировать в место назнаения"; +App::$strings["Set permissions for all files and sub folders"] = "Установить разрешения для всех файлов и подкаталогов"; +App::$strings["Notify your contacts about this file"] = "Сообщить своим контактам об этом файле"; +App::$strings["File category"] = "Категория файла"; App::$strings["Total"] = "Всего"; App::$strings["Shared"] = "Общие"; App::$strings["Create"] = "Создать"; @@ -936,6 +937,20 @@ App::$strings["Admin Delete"] = "Удалено администратором"; App::$strings["Name"] = "Имя"; App::$strings["Type"] = "Тип"; App::$strings["Last Modified"] = "Последнее изменение"; +App::$strings["parent"] = "источник"; +App::$strings["Copy/paste this code to attach file to a post"] = "Копировать / вставить этот код для прикрепления файла к публикации"; +App::$strings["Copy/paste this URL to link file from a web page"] = "Копировать / вставить эту URL для ссылки на файл со страницы"; +App::$strings["Select All"] = "Выбрать всё"; +App::$strings["Bulk Actions"] = "Групповая обработка"; +App::$strings["Adjust Permissions"] = "Настроить разрешения"; +App::$strings["Move or Copy"] = "Переместить или копировать"; +App::$strings["Download"] = "Загрузить"; +App::$strings["Info"] = "Информация"; +App::$strings["Rename"] = "Переименовать"; +App::$strings["Post"] = "Публикация"; +App::$strings["Attachment BBcode"] = "Вложение BBcode"; +App::$strings["Embed BBcode"] = "Встраивание BBcode"; +App::$strings["Link BBcode"] = "Ссылка BBcode"; App::$strings["You are using %1\$s of your available file storage."] = "Вы используете %1\$s из доступного вам хранилища файлов."; App::$strings["You are using %1\$s of %2\$s available file storage. (%3\$s%)"] = "Вы используете %1\$s из %2\$s доступного хранилища файлов (%3\$s%)."; App::$strings["WARNING:"] = "Предупреждение:"; @@ -1019,6 +1034,10 @@ App::$strings["Unable to obtain post information from database."] = "Невоз App::$strings["You have reached your limit of %1$.0f top level posts."] = "Вы достигли вашего ограничения в %1$.0f публикаций высокого уровня."; App::$strings["You have reached your limit of %1$.0f webpages."] = "Вы достигли вашего ограничения в %1$.0f страниц."; App::$strings["Some blurb about what to do when you're new here"] = "Некоторые предложения о том, что делать, если вы здесь новичок "; +App::$strings["Channel not found."] = "Канал не найден."; +App::$strings["File not found."] = "Файл не найден."; +App::$strings["Can not copy folder into itself."] = "Невозможно скопировать каталог в самого себя."; +App::$strings["Can not move folder \"%s\" into itself."] = "Невозможно скопировать каталог \"%s\" в самого себя."; App::$strings["Public access denied."] = "Публичный доступ запрещен."; App::$strings["You must enable javascript for your browser to be able to view this content."] = "Для просмотра этого содержимого в вашем браузере должен быть включён JavaScript"; App::$strings["Article"] = "Статья"; @@ -1277,7 +1296,6 @@ App::$strings["__ctx:noun__ Dislikes"] = "Не нравится"; App::$strings["Tag removed"] = "Тег удалён"; App::$strings["Remove Item Tag"] = "Удалить тег элемента"; App::$strings["Select a tag to remove: "] = "Выбрать тег для удаления:"; -App::$strings["Channel not found."] = "Канал не найден."; App::$strings["toggle full screen mode"] = "переключение полноэкранного режима"; App::$strings["Invalid item."] = "Недействительный элемент."; App::$strings["Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum."] = ""; @@ -1532,8 +1550,6 @@ App::$strings["Maximum of 30 items"] = "Не более 30 элементов"; App::$strings["Show emoticons (smilies) as images"] = "Показывать эмотиконы (смайлики) как изображения"; App::$strings["Provide channel menu in navigation bar"] = "Показывать меню канала в панели навигации"; App::$strings["Default: channel menu located in app menu"] = "По умолчанию каналы расположены в меню приложения"; -App::$strings["Manual conversation updates"] = "Обновление бесед вручную"; -App::$strings["Default is on, turning this off may increase screen jumping"] = "Включено по умолчанию, выключение может привести к рывкам в отображении"; App::$strings["Link post titles to source"] = "Ссылки на источник заголовков публикаций"; App::$strings["New Member Links"] = "Ссылки для новичков"; App::$strings["Display new member quick links menu"] = "Показать меню быстрых ссылок для новых участников"; @@ -1653,14 +1669,12 @@ App::$strings["Available Apps"] = "Доступные приложения"; App::$strings["Installed Apps"] = "Установленные приложения"; App::$strings["Manage Apps"] = "Управление приложениями"; App::$strings["Create Custom App"] = "Создать пользовательское приложение"; -App::$strings["File not found."] = "Файл не найден."; +App::$strings["Deprecated!"] = "Не рекомендовано!"; App::$strings["Permission Denied."] = "Доступ запрещен."; App::$strings["Edit file permissions"] = "Редактировать разрешения файла"; App::$strings["Set/edit permissions"] = "Редактировать разрешения"; App::$strings["Include all files and sub folders"] = "Включить все файлы и подкаталоги"; App::$strings["Return to file list"] = "Вернутся к списку файлов"; -App::$strings["Copy/paste this code to attach file to a post"] = "Копировать / вставить этот код для прикрепления файла к публикации"; -App::$strings["Copy/paste this URL to link file from a web page"] = "Копировать / вставить эту URL для ссылки на файл со страницы"; App::$strings["Share this file"] = "Поделиться этим файлом"; App::$strings["Show URL to this file"] = "Показать URL этого файла"; App::$strings["Block Name"] = "Название блока"; @@ -2387,7 +2401,6 @@ App::$strings["Invalid channel"] = "Недействительный канал" App::$strings["Error retrieving wiki"] = "Ошибка при получении Wiki"; App::$strings["Error creating zip file export folder"] = "Ошибка при создании zip-файла при экспорте каталога"; App::$strings["Error downloading wiki: "] = "Ошибка загрузки Wiki:"; -App::$strings["Download"] = "Загрузить"; App::$strings["Wiki name"] = "Название Wiki"; App::$strings["Content type"] = "Тип содержимого"; App::$strings["Any type"] = "Любой тип"; @@ -2787,7 +2800,6 @@ App::$strings["Suggest"] = "Предложить"; App::$strings["Random Channel"] = "Случайный канал"; App::$strings["Invite"] = "Пригласить"; App::$strings["Language"] = "Язык"; -App::$strings["Post"] = "Публикация"; App::$strings["Profile Photo"] = "Фотография профиля"; App::$strings["Notifications"] = "Оповещения"; App::$strings["Order Apps"] = "Порядок приложений"; @@ -3436,7 +3448,7 @@ App::$strings["Rainbow Tag"] = "Радуга тегов"; App::$strings["Your channel has been upgraded to \$Projectname version"] = "Ваш канал был обновлён до версии \$Projectname"; App::$strings["Please have a look at the"] = "Пожалуйста, взгляните на"; App::$strings["git history"] = "журнал изменений"; -App::$strings["change log"] = "в истории git"; +App::$strings["change log"] = "историю git"; App::$strings["for further info."] = "для дополнительных сведений."; App::$strings["Upgrade Info"] = "Сведения об обновлении"; App::$strings["Do not show this again"] = "Больше не показывать"; diff --git a/view/tpl/cloud_actionspanel.tpl b/view/tpl/cloud_actionspanel.tpl index 039d19fac..8cab175ff 100644 --- a/view/tpl/cloud_actionspanel.tpl +++ b/view/tpl/cloud_actionspanel.tpl @@ -31,7 +31,7 @@ <input type="hidden" name="return_url" value="{{$return_url}}" /> {{include file="field_checkbox.tpl" field=$notify}} <div class="cloud-index attach-drop attach-drop-zone text-center p-4 mb-3" data-folder="{{$folder}}"> - <span class="text-muted">You can select files via the upload button or drop them right here or into an existing folder.</span> + <span class="text-muted">{{$drop_area_label}}</span> </div> <div class="pull-right btn-group"> <div class="btn-group"> diff --git a/view/tpl/cloud_directory.tpl b/view/tpl/cloud_directory.tpl index 5886391bb..ac8304b96 100644 --- a/view/tpl/cloud_directory.tpl +++ b/view/tpl/cloud_directory.tpl @@ -1,46 +1,42 @@ -<div class="section-content-wrapper-np"> +<div class="{{if $tiles}}section-content-wrapper{{else}}section-content-wrapper-np{{/if}}"> {{if $tiles}} <table id="cloud-index"> <tr id="new-upload-progress-bar-1"></tr> {{* this is needed to append the upload files in the right order *}} </table> - - {{if $parentpath}} - <div class="cloud-container" > - <div class="cloud-icon tiles"> - <a href="{{$parentpath}}"> - <div class="cloud-icon-container"> - <i class="fa fa-fw fa-level-up" ></i> - </div> - </a> - </div> - <div class="cloud-title"> - <a href="{{$parentpath}}">..</a> - </div> - </div> - {{/if}} - - {{foreach $entries as $item}} - <div class="cloud-container"> - <div class="cloud-icon tiles"><a href="{{$item.rel_path}}"> - {{if $item.photo_icon}} - <img src="{{$item.photo_icon}}" title="{{$item.type}}" > - {{else}} - <div class="cloud-icon-container"> - <i class="fa fa-fw {{$item.icon_from_type}}" title="{{$item.type}}"></i> + <div class="row row-cols-2 row-cols-md-4"> + {{if $parentpath}} + <div class="col mb-4"> + <div class="card h-100"> + <a href="{{$parentpath}}" class="text-decoration-none"> + <div class="d-flex align-items-center justify-content-center m-1" style="height: 4.5rem;"> + <i class="fa fa-fw fa-level-up fa-5x" style="font-size: 4rem"></i> + </div> + <div class="card-footer text-center"> + <small class="text-muted text-truncate">..</small> + </div> + </a> + </div> </div> {{/if}} + {{foreach $entries as $item}} + <div class="col mb-4"> + <div class="card h-100"> + <a href="{{$item.rel_path}}" title="{{$item.name}}" class="text-decoration-none"> + <div class="d-flex align-items-center justify-content-center m-1" style="height: 4.5rem;"> + {{if $item.photo_icon}} + <img src="{{$item.photo_icon}}" class="rounded" alt="{{$item.photo_icon}}" title="{{$item.size_formatted}}" style="max-height: 4rem; width: auto; max-width: 100%;"> + {{else}} + <i class="fa fa-fw {{$item.icon_from_type}}" title="{{$item.size_formatted}}" style="font-size: 4rem"></i> + {{/if}} + </div> + <div class="card-footer text-truncate text-center"> + <small class="text-muted">{{$item.name}}</small> + </div> + </a> + </div> </div> - <div class="cloud-title"> - <a href="{{$item.rel_path}}"> - {{$item.name}} - </a> - </div> - {{if $item.is_owner}} - {{* add file tools here*}} - {{/if}} + {{/foreach}} </div> - {{/foreach}} - <div class="clear"></div> {{else}} <table id="cloud-index"> <tr> @@ -67,37 +63,37 @@ <tr id="cloud-multi-actions"> <td colspan="2"> <div class="form-check form-check-inline"> - <input class="form-check-input" type="checkbox" id="cloud-multi-tool-select-all" value="" title="Select all"> + <input class="form-check-input" type="checkbox" id="cloud-multi-tool-select-all" value="" title="{{$select_all_label}}"> </div> </td> <td colspan="3"> <div class="form-check form-check-inline"> - <label class="form-check-label" for="cloud-multi-tool-select-all">Select all</label> + <label class="form-check-label" for="cloud-multi-tool-select-all">{{$select_all_label}}</label> </div> </td> <td colspan="3"> {{if $is_owner}} <div class="dropdown"> <button class="btn btn-warning btn-sm" id="multi-dropdown-button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"> - <i class="fa fa-fw fa-ellipsis-v d-table-cell"></i><span class="d-none d-md-table-cell">Bulk Actions</span> + <i class="fa fa-fw fa-ellipsis-v d-table-cell"></i><span class="d-none d-md-table-cell">{{$bulk_actions_label}}</span> </button> <div class="dropdown-menu dropdown-menu-right" aria-labelledby="dropdown-button"> {{if $is_owner}} - <a id="cloud-multi-tool-perms-btn" class="dropdown-item" href="#"><i class="fa fa-fw fa-lock"></i> Adjust permissions</a> + <a id="cloud-multi-tool-perms-btn" class="dropdown-item" href="#"><i class="fa fa-fw fa-lock"></i> {{$adjust_permissions_label}}</a> {{/if}} - <a id="cloud-multi-tool-move-btn" class="dropdown-item" href="#"><i class="fa fa-fw fa-copy"></i> Move or copy</a> - <a id="cloud-multi-tool-categories-btn" class="dropdown-item" href="#"><i class="fa fa-fw fa-asterisk"></i> Categories</a> - <a id="cloud-multi-tool-download-btn" class="dropdown-item" href="#"><i class="fa fa-fw fa-cloud-download"></i> Download</a> - <a id="cloud-multi-tool-delete-btn" class="dropdown-item" href="#"><i class="fa fa-fw fa-trash-o"></i> {{$delete}}</a> + <a id="cloud-multi-tool-move-btn" class="dropdown-item" href="#"><i class="fa fa-fw fa-copy"></i> {{$move_copy_label}}</a> + <a id="cloud-multi-tool-categories-btn" class="dropdown-item" href="#"><i class="fa fa-fw fa-asterisk"></i> {{$categories_label}}</a> + <a id="cloud-multi-tool-download-btn" class="dropdown-item" href="#"><i class="fa fa-fw fa-cloud-download"></i> {{$download_label}}</a> + <a id="cloud-multi-tool-delete-btn" class="dropdown-item" href="#"><i class="fa fa-fw fa-trash-o"></i> {{$delete_label}}</a> </div> </div> {{else if $is_admin}} <div class="dropdown"> <button class="btn btn-warning btn-sm" id="multi-dropdown-button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"> - <i class="fa fa-fw fa-ellipsis-v d-table-cell"></i><span class="d-none d-md-table-cell">Bulk Actions</span> + <i class="fa fa-fw fa-ellipsis-v d-table-cell"></i><span class="d-none d-md-table-cell">{{$bulk_actions_label}}</span> </button> <div class="dropdown-menu dropdown-menu-right" aria-labelledby="dropdown-button"> - <a id="cloud-multi-tool-delete-btn" class="dropdown-item" href="#"><i class="fa fa-fw fa-trash-o"></i> {{$admin_delete}}</a> + <a id="cloud-multi-tool-delete-btn" class="dropdown-item" href="#"><i class="fa fa-fw fa-trash-o"></i> {{$admin_delete_label}}</a> </div> </div> {{/if}} @@ -122,7 +118,7 @@ {{/if}} <div id="attach-multi-submit" class="form-group"> <button id="cloud-multi-tool-cancel-btn" class="btn btn-outline-secondary btn-sm cloud-multi-tool-cancel-btn" type="button"> - Cancel + {{$cancel_label}} </button> <div id="attach-multi-edit-perms" class="btn-group float-right"> {{if $is_owner}} @@ -131,7 +127,7 @@ </button> {{/if}} <button id="multi-dbtn-submit" class="btn btn-primary btn-sm" type="submit" name="submit"> - {{$edit}} + {{$submit_label}} </button> </div> </div> @@ -160,28 +156,28 @@ {{/if}} </td> <td class="cloud-index-tool"> - {{if ($item.is_owner || $item.is_creator) && $item.attach_id}} + {{if ($is_owner || $item.is_creator) && $item.attach_id}} <div class="dropdown"> <button class="btn btn-link btn-sm" id="dropdown-button-{{$item.attach_id}}" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"> <i class="fa fa-fw fa-ellipsis-v"></i> </button> <div class="dropdown-menu dropdown-menu-right" aria-labelledby="dropdown-button-{{$item.attach_id}}"> - <a id="cloud-tool-info-btn-{{$item.attach_id}}" class="dropdown-item cloud-tool-info-btn" href="#" data-id="{{$item.attach_id}}"><i class="fa fa-fw fa-info"></i> Info</a> - {{if $item.is_owner}} - <a id="cloud-tool-perms-btn-{{$item.attach_id}}" class="dropdown-item cloud-tool-perms-btn" href="#" data-id="{{$item.attach_id}}"><i class="fa fa-fw fa-{{$item.lockstate}}"></i> Adjust permissions</a> - {{/if}} - <a id="cloud-tool-rename-btn-{{$item.attach_id}}" class="dropdown-item cloud-tool-rename-btn" href="#" data-id="{{$item.attach_id}}"><i class="fa fa-fw fa-pencil"></i> Rename</a> - <a id="cloud-tool-move-btn-{{$item.attach_id}}" class="dropdown-item cloud-tool-move-btn" href="#" data-id="{{$item.attach_id}}"><i class="fa fa-fw fa-copy"></i> Move or copy</a> - <a id="cloud-tool-categories-btn-{{$item.attach_id}}" class="dropdown-item cloud-tool-categories-btn" href="#" data-id="{{$item.attach_id}}"><i class="fa fa-fw fa-asterisk"></i> Categories</a> - {{if $item.is_owner}} - <a id="cloud-tool-share-btn-{{$item.attach_id}}" class="dropdown-item cloud-tool-share-btn" href="/rpost?attachment=[attachment]{{$item.resource}},{{$item.revision}}[/attachment]&acl[allow_cid]={{$item.raw_allow_cid}}&acl[allow_gid]={{$item.raw_allow_gid}}&acl[deny_cid]={{$item.raw_deny_cid}}&acl[deny_gid]={{$item.raw_deny_gid}}" data-id="{{$item.attach_id}}"><i class="fa fa-fw fa-share-square-o"></i> Post</a> + <a id="cloud-tool-info-btn-{{$item.attach_id}}" class="dropdown-item cloud-tool-info-btn" href="#" data-id="{{$item.attach_id}}"><i class="fa fa-fw fa-info"></i> {{$info_label}}</a> + {{if $is_owner}} + <a id="cloud-tool-perms-btn-{{$item.attach_id}}" class="dropdown-item cloud-tool-perms-btn" href="#" data-id="{{$item.attach_id}}"><i class="fa fa-fw fa-{{$item.lockstate}}"></i> {{$adjust_permissions_label}}</a> {{/if}} + <a id="cloud-tool-rename-btn-{{$item.attach_id}}" class="dropdown-item cloud-tool-rename-btn" href="#" data-id="{{$item.attach_id}}"><i class="fa fa-fw fa-pencil"></i> {{$rename_label}}</a> + <a id="cloud-tool-move-btn-{{$item.attach_id}}" class="dropdown-item cloud-tool-move-btn" href="#" data-id="{{$item.attach_id}}"><i class="fa fa-fw fa-copy"></i> {{$move_copy_label}}</a> + <a id="cloud-tool-categories-btn-{{$item.attach_id}}" class="dropdown-item cloud-tool-categories-btn" href="#" data-id="{{$item.attach_id}}"><i class="fa fa-fw fa-asterisk"></i> {{$categories_label}}</a> {{if $item.collection}} - <a id="cloud-tool-dir-download-btn-{{$item.attach_id}}" class="dropdown-item cloud-tool-dir-download-btn" href="#" data-id="{{$item.attach_id}}"><i class="fa fa-fw fa-cloud-download"></i> Download</a> + <a id="cloud-tool-dir-download-btn-{{$item.attach_id}}" class="dropdown-item cloud-tool-dir-download-btn" href="#" data-id="{{$item.attach_id}}"><i class="fa fa-fw fa-cloud-download"></i> {{$download_label}}</a> {{else}} - <a id="cloud-tool-download-btn-{{$item.attach_id}}" class="dropdown-item cloud-tool-download-btn" href="/attach/{{$item.resource}}" data-id="{{$item.attach_id}}"><i class="fa fa-fw fa-cloud-download"></i> Download</a> + {{if $is_owner}} + <a id="cloud-tool-share-btn-{{$item.attach_id}}" class="dropdown-item cloud-tool-share-btn" href="/rpost?attachment=[attachment]{{$item.resource}},{{$item.revision}}[/attachment]&acl[allow_cid]={{$item.raw_allow_cid}}&acl[allow_gid]={{$item.raw_allow_gid}}&acl[deny_cid]={{$item.raw_deny_cid}}&acl[deny_gid]={{$item.raw_deny_gid}}" data-id="{{$item.attach_id}}"><i class="fa fa-fw fa-share-square-o"></i> {{$post_label}}</a> + {{/if}} + <a id="cloud-tool-download-btn-{{$item.attach_id}}" class="dropdown-item cloud-tool-download-btn" href="/attach/{{$item.resource}}" data-id="{{$item.attach_id}}"><i class="fa fa-fw fa-cloud-download"></i> {{$download_label}}</a> {{/if}} - <a id="cloud-tool-delete-btn-{{$item.attach_id}}" class="dropdown-item cloud-tool-delete-btn" href="#" data-id="{{$item.attach_id}}"><i class="fa fa-fw fa-trash-o"></i> {{$delete}}</a> + <a id="cloud-tool-delete-btn-{{$item.attach_id}}" class="dropdown-item cloud-tool-delete-btn" href="#" data-id="{{$item.attach_id}}"><i class="fa fa-fw fa-trash-o"></i> {{$delete_label}}</a> </div> </div> {{else}} @@ -192,12 +188,12 @@ </button> <div class="dropdown-menu dropdown-menu-right" aria-labelledby="dropdown-button-{{$item.attach_id}}"> {{if $item.collection}} - <a id="cloud-tool-dir-download-btn-{{$item.attach_id}}" class="dropdown-item cloud-tool-dir-download-btn" href="#" data-id="{{$item.attach_id}}"><i class="fa fa-fw fa-cloud-download"></i> Download</a> + <a id="cloud-tool-dir-download-btn-{{$item.attach_id}}" class="dropdown-item cloud-tool-dir-download-btn" href="#" data-id="{{$item.attach_id}}"><i class="fa fa-fw fa-cloud-download"></i> {{$download_label}}</a> {{else}} - <a id="cloud-tool-download-btn-{{$item.attach_id}}" class="dropdown-item cloud-tool-download-btn" href="/attach/{{$item.resource}}" data-id="{{$item.attach_id}}"><i class="fa fa-fw fa-cloud-download"></i> Download</a> + <a id="cloud-tool-download-btn-{{$item.attach_id}}" class="dropdown-item cloud-tool-download-btn" href="/attach/{{$item.resource}}" data-id="{{$item.attach_id}}"><i class="fa fa-fw fa-cloud-download"></i> {{$download_label}}</a> {{/if}} {{if $is_admin}} - <a id="cloud-tool-delete-btn-{{$item.attach_id}}" class="dropdown-item cloud-tool-delete-btn" href="#" data-id="{{$item.attach_id}}"><i class="fa fa-fw fa-trash-o"></i> {{$admin_delete}}</a> + <a id="cloud-tool-delete-btn-{{$item.attach_id}}" class="dropdown-item cloud-tool-delete-btn" href="#" data-id="{{$item.attach_id}}"><i class="fa fa-fw fa-trash-o"></i> {{$admin_delete_label}}</a> {{/if}} </div> </div> @@ -219,23 +215,23 @@ <div id="cloud-tool-info-{{$item.attach_id}}" class="cloud-tool"> {{if ! $item.collection}} <div class="form-group"> - <label for="attach-code-input-{{$item.attach_id}}">Attachment BBcode</label> + <label for="attach-code-input-{{$item.attach_id}}">{{$attach_bbcode_label}}</label> <input type="text" class="form-control" id="attach-code-input-{{$item.attach_id}}" name="attach-code-input-{{$item.attach_id}}" value="{{$item.attach_bbcode}}" onclick="this.select();" /> </div> {{if $item.embed_bbcode}} <div class="form-group"> - <label for="embed-code-input-{{$item.attach_id}}">Embed BBcode</label> + <label for="embed-code-input-{{$item.attach_id}}">{{$embed_bbcode_label}}</label> <input type="text" class="form-control" id="embed-code-input-{{$item.attach_id}}" name="embed-code-input-{{$item.attach_id}}" value="{{$item.embed_bbcode}}" onclick="this.select();" /> </div> {{/if}} {{/if}} <div class="form-group"> - <label for="link-code-input-{{$item.attach_id}}">Link BBcode</label> + <label for="link-code-input-{{$item.attach_id}}">{{$link_bbcode_label}}</label> <input type="text" class="form-control" id="link-code-input-{{$item.attach_id}}" name="link-code-input-{{$item.attach_id}}" value="{{$item.link_bbcode}}" onclick="this.select();" /> </div> <div class="form-group"> <button id="cloud-tool-close-btn-{{$item.attach_id}}" class="btn btn-outline-secondary btn-sm cloud-tool-cancel-btn" type="button" data-id="{{$item.attach_id}}"> - Close + {{$close_label}} </button> </div> </div> @@ -247,22 +243,22 @@ {{include file="field_input.tpl" field=$item.categories}} </div> <div id="cloud-tool-submit-{{$item.attach_id}}" class="cloud-tool"> - {{if $item.is_owner}} + {{if $is_owner}} {{if !$item.collection}}{{include file="field_checkbox.tpl" field=$item.notify}}{{/if}} {{if $item.collection}}{{include file="field_checkbox.tpl" field=$item.recurse}}{{/if}} {{/if}} <div id="attach-submit-{{$item.attach_id}}" class="form-group"> <button id="cloud-tool-cancel-btn-{{$item.attach_id}}" class="btn btn-outline-secondary btn-sm cloud-tool-cancel-btn" type="button" data-id="{{$item.attach_id}}"> - Cancel + {{$cancel_label}} </button> <div id="attach-edit-perms-{{$item.attach_id}}" class="btn-group float-right"> - {{if $item.is_owner}} + {{if $is_owner}} <button id="dbtn-acl-{{$item.attach_id}}" class="btn btn-outline-secondary btn-sm" data-toggle="modal" data-target="#aclModal" title="{{$permset}}" type="button"> <i id="jot-perms-icon-{{$item.attach_id}}" class="fa fa-{{$item.lockstate}} jot-icons jot-perms-icon"></i> </button> {{/if}} <button id="dbtn-submit-{{$item.attach_id}}" class="btn btn-primary btn-sm" type="submit" name="submit"> - {{$edit}} + {{$submit_label}} </button> </div> </div> diff --git a/view/tpl/cloud_header.tpl b/view/tpl/cloud_header.tpl index 642fb1866..285363a12 100644 --- a/view/tpl/cloud_header.tpl +++ b/view/tpl/cloud_header.tpl @@ -1,6 +1,6 @@ <div class="section-title-wrapper"> <div class="pull-right"> - <a href="cloud_tiles/{{$cpath}}" class="btn btn-sm btn-outline-secondary"><i class="fa fa-fw {{if $tiles}}fa-list-ul{{else}}fa-table{{/if}}"></i></a> + <a href="cloud_tiles/{{$cpath}}" class="btn btn-sm btn-outline-secondary"><i class="fa fa-fw {{if $tiles}}fa-th-list{{else}}fa-th-large{{/if}}"></i></a> {{if $actionspanel}} {{if $is_owner}} <a href="/sharedwithme" class="btn btn-sm btn-outline-secondary"><i class="fa fa-cloud-download"></i> {{$shared}}</a> diff --git a/view/tpl/js_strings.tpl b/view/tpl/js_strings.tpl index 58426e20c..291d78fb2 100755 --- a/view/tpl/js_strings.tpl +++ b/view/tpl/js_strings.tpl @@ -66,8 +66,13 @@ 'month' : "{{$month}}", 'week' : "{{$week}}", 'day' : "{{$day}}", - 'allday' : "{{$allday}}" + 'allday' : "{{$allday}}", + + // mod cloud + + 'download_info' : "{{$download_info}}" + }; </script> - + |
