diff options
| -rw-r--r-- | Zotlabs/Lib/AbConfig.php | 32 | ||||
| -rw-r--r-- | Zotlabs/Lib/Cache.php | 46 | ||||
| -rw-r--r-- | Zotlabs/Lib/SuperCurl.php | 112 | ||||
| -rw-r--r-- | Zotlabs/Module/Connedit.php | 4 | ||||
| -rw-r--r-- | Zotlabs/Module/Cover_photo.php | 4 | ||||
| -rw-r--r-- | Zotlabs/Module/Follow.php | 2 | ||||
| -rw-r--r-- | Zotlabs/Module/Import.php | 3 | ||||
| -rw-r--r-- | Zotlabs/Module/Pdledit.php | 10 | ||||
| -rw-r--r-- | Zotlabs/Module/Profile_photo.php | 101 | ||||
| -rw-r--r-- | Zotlabs/Module/Profperm.php | 2 | ||||
| -rw-r--r-- | Zotlabs/Storage/CalDAVClient.php | 1 | ||||
| -rwxr-xr-x | boot.php | 3 | ||||
| -rw-r--r-- | include/cache.php | 44 | ||||
| -rw-r--r-- | include/channel.php | 2 | ||||
| -rw-r--r-- | include/config.php | 16 | ||||
| -rwxr-xr-x | include/oembed.php | 6 | ||||
| -rw-r--r-- | include/photos.php | 65 | ||||
| -rw-r--r-- | include/text.php | 28 | ||||
| -rw-r--r-- | include/zot.php | 5 | ||||
| -rw-r--r-- | install/schema_mysql.sql | 2 | ||||
| -rw-r--r-- | install/schema_postgres.sql | 2 | ||||
| -rw-r--r-- | install/update.php | 38 | ||||
| -rw-r--r-- | util/hmessages.po | 7027 | ||||
| -rwxr-xr-x | view/tpl/conv_item.tpl | 4 | ||||
| -rwxr-xr-x | view/tpl/cropcover.tpl | 2 | ||||
| -rwxr-xr-x | view/tpl/nav.tpl | 2 |
26 files changed, 3867 insertions, 3696 deletions
diff --git a/Zotlabs/Lib/AbConfig.php b/Zotlabs/Lib/AbConfig.php index f2d6522b9..138d0dfea 100644 --- a/Zotlabs/Lib/AbConfig.php +++ b/Zotlabs/Lib/AbConfig.php @@ -5,18 +5,18 @@ namespace Zotlabs\Lib; class AbConfig { - static public function Load($chash,$xhash) { - $r = q("select * from abconfig where chan = '%s' and xchan = '%s'", - dbesc($chash), + static public function Load($chan,$xhash) { + $r = q("select * from abconfig where chan = %d and xchan = '%s'", + intval($chan), dbesc($xhash) ); return $r; } - static public function Get($chash,$xhash,$family,$key) { - $r = q("select * from abconfig where chan = '%s' and xchan = '%s' and cat = '%s' and k = '%s' limit 1", - dbesc($chash), + static public function Get($chan,$xhash,$family,$key) { + $r = q("select * from abconfig where chan = %d and xchan = '%s' and cat = '%s' and k = '%s' limit 1", + intval($chan), dbesc($xhash), dbesc($family), dbesc($key) @@ -28,14 +28,14 @@ class AbConfig { } - static public function Set($chash,$xhash,$family,$key,$value) { + static public function Set($chan,$xhash,$family,$key,$value) { $dbvalue = ((is_array($value)) ? serialize($value) : $value); $dbvalue = ((is_bool($dbvalue)) ? intval($dbvalue) : $dbvalue); - if(self::Get($chash,$xhash,$family,$key) === false) { - $r = q("insert into abconfig ( chan, xchan, cat, k, v ) values ( '%s', '%s', '%s', '%s', '%s' ) ", - dbesc($chash), + if(self::Get($chan,$xhash,$family,$key) === false) { + $r = q("insert into abconfig ( chan, xchan, cat, k, v ) values ( %d, '%s', '%s', '%s', '%s' ) ", + intval($chan), dbesc($xhash), dbesc($family), dbesc($key), @@ -43,9 +43,9 @@ class AbConfig { ); } else { - $r = q("update abconfig set v = '%s' where chan = '%s' and xchan = '%s' and cat = '%s' and k = '%s' ", + $r = q("update abconfig set v = '%s' where chan = %d and xchan = '%s' and cat = '%s' and k = '%s' ", dbesc($dbvalue), - dbesc($chash), + dbesc($chan), dbesc($xhash), dbesc($family), dbesc($key) @@ -58,10 +58,10 @@ class AbConfig { } - static public function Delete($chash,$xhash,$family,$key) { + static public function Delete($chan,$xhash,$family,$key) { - $r = q("delete from abconfig where chan = '%s' and xchan = '%s' and cat = '%s' and k = '%s' ", - dbesc($chash), + $r = q("delete from abconfig where chan = %d and xchan = '%s' and cat = '%s' and k = '%s' ", + intval($chan), dbesc($xhash), dbesc($family), dbesc($key) @@ -70,4 +70,4 @@ class AbConfig { return $r; } -}
\ No newline at end of file +} diff --git a/Zotlabs/Lib/Cache.php b/Zotlabs/Lib/Cache.php new file mode 100644 index 000000000..35c8f56ad --- /dev/null +++ b/Zotlabs/Lib/Cache.php @@ -0,0 +1,46 @@ +<?php /** @file */ + +namespace Zotlabs\Lib; + + /** + * cache api + */ + +class Cache { + public static function get($key) { + $r = q("SELECT v FROM cache WHERE k = '%s' limit 1", + dbesc($key) + ); + + if ($r) + return $r[0]['v']; + return null; + } + + public static function set($key,$value) { + + $r = q("SELECT * FROM cache WHERE k = '%s' limit 1", + dbesc($key) + ); + if($r) { + q("UPDATE cache SET v = '%s', updated = '%s' WHERE k = '%s'", + dbesc($value), + dbesc(datetime_convert()), + dbesc($key)); + } + else { + q("INSERT INTO cache ( k, v, updated) VALUES ('%s','%s','%s')", + dbesc($key), + dbesc($value), + dbesc(datetime_convert())); + } + } + + + public static function clear() { + q("DELETE FROM cache WHERE updated < '%s'", + dbesc(datetime_convert('UTC','UTC',"now - 30 days"))); + } + +} + diff --git a/Zotlabs/Lib/SuperCurl.php b/Zotlabs/Lib/SuperCurl.php new file mode 100644 index 000000000..40ca1addb --- /dev/null +++ b/Zotlabs/Lib/SuperCurl.php @@ -0,0 +1,112 @@ +<?php + +namespace Zotlabs\Lib; + +/** + * @brief wrapper for z_fetch_url() which can be instantiated with several built-in parameters and + * these can be modified and re-used. Useful for CalDAV and other processes which need to authenticate + * and set lots of CURL options (many of which stay the same from one call to the next). + */ + + + + +class SuperCurl { + + + private $auth; + private $url; + + private $curlopt = array(); + + private $headers = null; + public $filepos = 0; + public $filehandle = 0; + public $request_data = ''; + + private $request_method = 'GET'; + private $upload = false; + + + private function set_data($s) { + $this->request_data = $s; + $this->filepos = 0; + } + + public function curl_read($ch,$fh,$size) { + + if($this->filepos < 0) { + unset($fh); + return ''; + } + + $s = substr($this->request_data,$this->filepos,$size); + + if(strlen($s) < $size) + $this->filepos = (-1); + else + $this->filepos = $this->filepos + $size; + + return $s; + } + + + public function __construct($opts = array()) { + $this->set($opts); + } + + private function set($opts = array()) { + if($opts) { + foreach($opts as $k => $v) { + switch($k) { + case 'http_auth': + $this->auth = $v; + break; + case 'custom': + $this->request_method = $v; + break; + case 'url': + $this->url = $v; + break; + case 'data': + $this->set_data($v); + if($v) { + $this->upload = true; + } + else { + $this->upload = false; + } + break; + case 'headers': + $this->headers = $v; + break; + default: + $this->curlopts[$k] = $v; + break; + } + } + } + } + + function exec() { + $opts = $this->curlopts; + if($this->auth) + $opts['http_auth'] = $this->auth; + if($this->custom) + $opts['custom'] = $this->custom; + if($this->headers) + $opts['headers'] = $this->headers; + if($this->upload) { + $opts['upload'] = true; + $opts['infile'] = $this->filehandle; + $opts['infilesize'] = strlen($this->request_data); + $opts['readfunc'] = [ $this, 'curl_read' ] ; + } + + $recurse = 0; + return z_fetch_url($this->url,true,$recurse,(($opts) ? $opts : null)); + + } + + +} diff --git a/Zotlabs/Module/Connedit.php b/Zotlabs/Module/Connedit.php index 3feba5370..feed9cb1a 100644 --- a/Zotlabs/Module/Connedit.php +++ b/Zotlabs/Module/Connedit.php @@ -219,7 +219,7 @@ class Connedit extends \Zotlabs\Web\Controller { //Update profile photo permissions logger('A new profile was assigned - updating profile photos'); - profile_photo_set_profile_perms($profile_id); + profile_photo_set_profile_perms(local_channel(),$profile_id); } @@ -345,7 +345,7 @@ class Connedit extends \Zotlabs\Web\Controller { unset($clone['abook_account']); unset($clone['abook_channel']); - $abconfig = load_abconfig($channel['channel_hash'],$clone['abook_xchan']); + $abconfig = load_abconfig($channel['channel_id'],$clone['abook_xchan']); if($abconfig) $clone['abconfig'] = $abconfig; diff --git a/Zotlabs/Module/Cover_photo.php b/Zotlabs/Module/Cover_photo.php index a72c3389f..5633976c8 100644 --- a/Zotlabs/Module/Cover_photo.php +++ b/Zotlabs/Module/Cover_photo.php @@ -40,7 +40,7 @@ class Cover_photo extends \Zotlabs\Web\Controller { * */ - function post() { + function post() { if(! local_channel()) { return; @@ -271,7 +271,7 @@ class Cover_photo extends \Zotlabs\Web\Controller { */ - function get() { + function get() { if(! local_channel()) { notice( t('Permission denied.') . EOL ); diff --git a/Zotlabs/Module/Follow.php b/Zotlabs/Module/Follow.php index 1df382a89..3641330c9 100644 --- a/Zotlabs/Module/Follow.php +++ b/Zotlabs/Module/Follow.php @@ -43,7 +43,7 @@ class Follow extends \Zotlabs\Web\Controller { unset($clone['abook_account']); unset($clone['abook_channel']); - $abconfig = load_abconfig($channel['channel_hash'],$clone['abook_xchan']); + $abconfig = load_abconfig($channel['channel_id'],$clone['abook_xchan']); if($abconfig) $clone['abconfig'] = $abconfig; diff --git a/Zotlabs/Module/Import.php b/Zotlabs/Module/Import.php index 4a559fe95..e34f5e49e 100644 --- a/Zotlabs/Module/Import.php +++ b/Zotlabs/Module/Import.php @@ -389,8 +389,7 @@ class Import extends \Zotlabs\Web\Controller { if($abconfig) { // @fixme does not handle sync of del_abconfig foreach($abconfig as $abc) { - if($abc['chan'] === $channel['channel_hash']) - set_abconfig($abc['chan'],$abc['xchan'],$abc['cat'],$abc['k'],$abc['v']); + set_abconfig($channel['channel_id'],$abc['xchan'],$abc['cat'],$abc['k'],$abc['v']); } } diff --git a/Zotlabs/Module/Pdledit.php b/Zotlabs/Module/Pdledit.php index accfb6fa1..5cb00f165 100644 --- a/Zotlabs/Module/Pdledit.php +++ b/Zotlabs/Module/Pdledit.php @@ -20,7 +20,7 @@ class Pdledit extends \Zotlabs\Web\Controller { } - function get() { + function get() { if(! local_channel()) { notice( t('Permission denied.') . EOL); @@ -32,18 +32,18 @@ class Pdledit extends \Zotlabs\Web\Controller { else { $o .= '<div class="generic-content-wrapper-styled">'; $o .= '<h1>' . t('Edit System Page Description') . '</h1>'; - $files = glob('mod/*'); + $files = glob('Zotlabs/Module/*.php'); if($files) { foreach($files as $f) { - $name = basename($f,'.php'); + $name = lcfirst(basename($f,'.php')); $x = theme_include('mod_' . $name . '.pdl'); if($x) { $o .= '<a href="pdledit/' . $name . '" >' . $name . '</a><br />'; } } } - - $o .= '</div>'; + + $o .= '</div>'; // list module pdl files return $o; diff --git a/Zotlabs/Module/Profile_photo.php b/Zotlabs/Module/Profile_photo.php index c02821a3c..72c92e721 100644 --- a/Zotlabs/Module/Profile_photo.php +++ b/Zotlabs/Module/Profile_photo.php @@ -53,8 +53,23 @@ class Profile_photo extends \Zotlabs\Web\Controller { check_form_security_token_redirectOnErr('/profile_photo', 'profile_photo'); - if((x($_POST,'cropfinal')) && ($_POST['cropfinal'] == 1)) { + if((array_key_exists('postfinal',$_POST)) && (intval($_POST['cropfinal']) == 1)) { + // phase 2 - we have finished cropping + + if(argc() != 2) { + notice( t('Image uploaded but image cropping failed.') . EOL ); + return; + } + + $image_id = argv(1); + + if(substr($image_id,-2,1) == '-') { + $scale = substr($image_id,-1,1); + $image_id = substr($image_id,0,-2); + } + + // unless proven otherwise $is_default_profile = 1; @@ -69,25 +84,7 @@ class Profile_photo extends \Zotlabs\Web\Controller { $is_default_profile = 0; } } - -logger('profile: ' . $_REQUEST['profile']); - - - // phase 2 - we have finished cropping - - if(argc() != 2) { - notice( t('Image uploaded but image cropping failed.') . EOL ); - return; - } - - $image_id = argv(1); - - if(substr($image_id,-2,1) == '-') { - $scale = substr($image_id,-1,1); - $image_id = substr($image_id,0,-2); - } - $srcX = $_POST['xstart']; $srcY = $_POST['ystart']; @@ -111,30 +108,38 @@ logger('profile: ' . $_REQUEST['profile']); $aid = get_account_id(); - $p = array('aid' => $aid, 'uid' => local_channel(), 'resource_id' => $base_image['resource_id'], - 'filename' => $base_image['filename'], 'album' => t('Profile Photos')); + $p = [ + 'aid' => $aid, + 'uid' => local_channel(), + 'resource_id' => $base_image['resource_id'], + 'filename' => $base_image['filename'], + 'album' => t('Profile Photos') + ]; - $p['imgscale'] = 4; + $p['imgscale'] = PHOTO_RES_PROFILE_300; $p['photo_usage'] = (($is_default_profile) ? PHOTO_PROFILE : PHOTO_NORMAL); $r1 = $im->save($p); $im->scaleImage(80); - $p['imgscale'] = 5; + $p['imgscale'] = PHOTO_RES_PROFILE_80; $r2 = $im->save($p); $im->scaleImage(48); - $p['imgscale'] = 6; + $p['imgscale'] = PHOTO_RES_PROFILE_48; $r3 = $im->save($p); if($r1 === false || $r2 === false || $r3 === false) { // if one failed, delete them all so we can start over. notice( t('Image resize failed.') . EOL ); - $x = q("delete from photo where resource_id = '%s' and uid = %d and imgscale >= 4 ", + $x = q("delete from photo where resource_id = '%s' and uid = %d and imgscale in ( %d, %d, %d ) ", dbesc($base_image['resource_id']), - local_channel() + local_channel(), + intval(PHOTO_RES_PROFILE_300), + intval(PHOTO_RES_PROFILE_80), + intval(PHOTO_RES_PROFILE_48) ); return; } @@ -184,10 +189,7 @@ logger('profile: ' . $_REQUEST['profile']); // Now copy profile-permissions to pictures, to prevent privacyleaks by automatically created folder 'Profile Pictures' - profile_photo_set_profile_perms($_REQUEST['profile']); - - - + profile_photo_set_profile_perms(local_channel(),$_REQUEST['profile']); } else notice( t('Unable to process image') . EOL); @@ -197,7 +199,9 @@ logger('profile: ' . $_REQUEST['profile']); return; // NOTREACHED } - + // A new photo was uploaded. Store it and save some important details + // in App::$data for use in the cropping function + $hash = photo_new_resource(); $smallest = 0; @@ -221,7 +225,7 @@ logger('profile: ' . $_REQUEST['profile']); $os_storage = false; foreach($i as $ii) { - if(intval($ii['imgscale']) < 2) { + if(intval($ii['imgscale']) < PHOTO_RES_640) { $smallest = intval($ii['imgscale']); $os_storage = intval($ii['os_storage']); $imagedata = $ii['content']; @@ -239,7 +243,10 @@ logger('profile: ' . $_REQUEST['profile']); } return $this->profile_photo_crop_ui_head($a, $ph, $hash, $smallest); - + + // This will "fall through" to the get() method, and since + // App::$data['imagecrop'] is set, it will proceed to cropping + // rather than present the upload form } @@ -294,11 +301,11 @@ logger('profile: ' . $_REQUEST['profile']); } $havescale = false; foreach($r as $rr) { - if($rr['imgscale'] == 5) + if($rr['imgscale'] == PHOTO_RES_PROFILE_80) $havescale = true; } - // set an already loaded photo as profile photo + // set an already loaded and cropped photo as profile photo if(($r[0]['album'] == t('Profile Photos')) && ($havescale)) { // unset any existing profile photos @@ -319,7 +326,7 @@ logger('profile: ' . $_REQUEST['profile']); dbesc($channel['xchan_hash']) ); - profile_photo_set_profile_perms(); // Reset default photo permissions to public + profile_photo_set_profile_perms(local_channel()); // Reset default photo permissions to public \Zotlabs\Daemon\Master::Summon(array('Directory',local_channel())); goaway(z_root() . '/profiles'); } @@ -351,7 +358,7 @@ logger('profile: ' . $_REQUEST['profile']); if($i) { $hash = $i[0]['resource_id']; foreach($i as $ii) { - if(intval($ii['imgscale']) < 2) { + if(intval($ii['imgscale']) < PHOTO_RES_640) { $smallest = intval($ii['imgscale']); } } @@ -359,9 +366,14 @@ logger('profile: ' . $_REQUEST['profile']); } $this->profile_photo_crop_ui_head($a, $ph, $hash, $smallest); + + // falls through with App::$data['imagecrop'] set so we go straight to the cropping section } - $profiles = q("select id, profile_name as name, is_default from profile where uid = %d", + + // present an upload form + + $profiles = q("select id, profile_name as name, is_default from profile where uid = %d order by id asc", intval(local_channel()) ); @@ -388,6 +400,9 @@ logger('profile: ' . $_REQUEST['profile']); return $o; } else { + + // present a cropping form + $filename = \App::$data['imagecrop'] . '-' . \App::$data['imagecrop_resolution']; $resolution = \App::$data['imagecrop_resolution']; $tpl = get_markup_template("cropbody.tpl"); @@ -425,13 +440,13 @@ logger('profile: ' . $_REQUEST['profile']); if($max_length > 0) $ph->scaleImage($max_length); - $width = $ph->getWidth(); - $height = $ph->getHeight(); + \App::$data['width'] = $ph->getWidth(); + \App::$data['height'] = $ph->getHeight(); - if($width < 500 || $height < 500) { + if(\App::$data['width'] < 500 || \App::$data['height'] < 500) { $ph->scaleImageUp(400); - $width = $ph->getWidth(); - $height = $ph->getHeight(); + \App::$data['width'] = $ph->getWidth(); + \App::$data['height'] = $ph->getHeight(); } diff --git a/Zotlabs/Module/Profperm.php b/Zotlabs/Module/Profperm.php index 33e9d1ece..79ce7a7ed 100644 --- a/Zotlabs/Module/Profperm.php +++ b/Zotlabs/Module/Profperm.php @@ -97,7 +97,7 @@ class Profperm extends \Zotlabs\Web\Controller { //Time to update the permissions on the profile-pictures as well - profile_photo_set_profile_perms($profile['id']); + profile_photo_set_profile_perms(local_channel(),$profile['id']); $r = q("SELECT * FROM abook left join xchan on abook_xchan = xchan_hash WHERE abook_channel = %d AND abook_profile = '%s'", intval(local_channel()), diff --git a/Zotlabs/Storage/CalDAVClient.php b/Zotlabs/Storage/CalDAVClient.php index 76c59c569..c1a8db932 100644 --- a/Zotlabs/Storage/CalDAVClient.php +++ b/Zotlabs/Storage/CalDAVClient.php @@ -45,7 +45,6 @@ class CalDAVClient { } private function set_data($s) { - logger('set data called'); $this->request_data = $s; $this->filepos = 0; } @@ -34,7 +34,6 @@ require_once('include/text.php'); require_once('include/datetime.php'); require_once('include/language.php'); require_once('include/nav.php'); -require_once('include/cache.php'); require_once('include/permissions.php'); require_once('library/Mobile_Detect/Mobile_Detect.php'); require_once('include/features.php'); @@ -48,7 +47,7 @@ define ( 'PLATFORM_NAME', 'hubzilla' ); define ( 'STD_VERSION', '1.9' ); define ( 'ZOT_REVISION', '1.1' ); -define ( 'DB_UPDATE_VERSION', 1178 ); +define ( 'DB_UPDATE_VERSION', 1179 ); /** diff --git a/include/cache.php b/include/cache.php deleted file mode 100644 index 4a3f453e1..000000000 --- a/include/cache.php +++ /dev/null @@ -1,44 +0,0 @@ -<?php /** @file */ - - /** - * cache api - */ - - class Cache { - public static function get($key){ - $r = q("SELECT v FROM cache WHERE k = '%s' limit 1", - dbesc($key) - ); - - if ($r) - return $r[0]['v']; - return null; - } - - public static function set($key,$value) { - - $r = q("SELECT * FROM cache WHERE k = '%s' limit 1", - dbesc($key) - ); - if($r) { - q("UPDATE cache SET v = '%s', updated = '%s' WHERE k = '%s'", - dbesc($value), - dbesc(datetime_convert()), - dbesc($key)); - } - else { - q("INSERT INTO cache ( k, v, updated) VALUES ('%s','%s','%s')", - dbesc($key), - dbesc($value), - dbesc(datetime_convert())); - } - } - - - public static function clear(){ - q("DELETE FROM cache WHERE updated < '%s'", - dbesc(datetime_convert('UTC','UTC',"now - 30 days"))); - } - - } - diff --git a/include/channel.php b/include/channel.php index a0424ee39..a7624f060 100644 --- a/include/channel.php +++ b/include/channel.php @@ -516,7 +516,7 @@ function identity_basic_export($channel_id, $items = false) { for($x = 0; $x < count($ret['abook']); $x ++) { $xchans[] = $ret['abook'][$x]['abook_chan']; - $abconfig = load_abconfig($ret['channel']['channel_hash'],$ret['abook'][$x]['abook_xchan']); + $abconfig = load_abconfig($channel_id,$ret['abook'][$x]['abook_xchan']); if($abconfig) $ret['abook'][$x]['abconfig'] = $abconfig; } diff --git a/include/config.php b/include/config.php index 65199283d..ece22793f 100644 --- a/include/config.php +++ b/include/config.php @@ -98,20 +98,20 @@ function del_aconfig($account_id, $family, $key) { } -function load_abconfig($chash,$xhash) { - Zlib\AbConfig::Load($chash,$xhash); +function load_abconfig($chan,$xhash) { + Zlib\AbConfig::Load($chan,$xhash); } -function get_abconfig($chash,$xhash,$family,$key) { - return Zlib\AbConfig::Get($chash,$xhash,$family,$key); +function get_abconfig($chan,$xhash,$family,$key) { + return Zlib\AbConfig::Get($chan,$xhash,$family,$key); } -function set_abconfig($chash,$xhash,$family,$key,$value) { - return Zlib\AbConfig::Set($chash,$xhash,$family,$key,$value); +function set_abconfig($chan,$xhash,$family,$key,$value) { + return Zlib\AbConfig::Set($chan,$xhash,$family,$key,$value); } -function del_abconfig($chash,$xhash,$family,$key) { - return Zlib\AbConfig::Delete($chash,$xhash,$family,$key); +function del_abconfig($chan,$xhash,$family,$key) { + return Zlib\AbConfig::Delete($chan,$xhash,$family,$key); } function load_iconfig(&$item) { diff --git a/include/oembed.php b/include/oembed.php index 08363e488..f1d9bd7d2 100755 --- a/include/oembed.php +++ b/include/oembed.php @@ -1,6 +1,8 @@ <?php /** @file */ +use Zotlabs\Lib as Zlib; + function oembed_replacecb($matches){ $embedurl=$matches[1]; @@ -130,7 +132,7 @@ function oembed_fetch_url($embedurl){ $txt = null; if($action !== 'block') { - $txt = Cache::get(App::$videowidth . $embedurl); + $txt = Zlib\Cache::get('[' . App::$videowidth . '] ' . $embedurl); if(strstr($txt,'youtu') && strstr(z_root(),'https:')) { $txt = str_replace('http:','https:',$txt); @@ -199,7 +201,7 @@ function oembed_fetch_url($embedurl){ //save in cache if(! get_config('system','oembed_cache_disable')) - Cache::set(App::$videowidth . $embedurl,$txt); + Zlib\Cache::set('[' . App::$videowidth . '] ' . $embedurl,$txt); } diff --git a/include/photos.php b/include/photos.php index da6118b38..c70478146 100644 --- a/include/photos.php +++ b/include/photos.php @@ -707,40 +707,65 @@ function gps2Num($coordPart) { return floatval($parts[0]) / floatval($parts[1]); } -function profile_photo_set_profile_perms($profileid = '') { +function profile_photo_set_profile_perms($uid, $profileid = 0) { $allowcid = ''; - if (x($profileid)) { - - $r = q("SELECT photo, profile_guid, id, is_default, uid FROM profile WHERE profile.id = %d OR profile.profile_guid = '%s' LIMIT 1", intval($profileid), dbesc($profileid)); - - } else { - + if($profileid) { + $r = q("SELECT photo, profile_guid, id, is_default, uid + FROM profile WHERE uid = %d and ( profile.id = %d OR profile.profile_guid = '%s') LIMIT 1", + intval($profileid), + dbesc($profileid) + ); + } + else { logger('Resetting permissions on default-profile-photo for user'.local_channel()); - $r = q("SELECT photo, profile_guid, id, is_default, uid FROM profile WHERE profile.uid = %d AND is_default = 1 LIMIT 1", intval(local_channel()) ); //If no profile is given, we update the default profile + + $r = q("SELECT photo, profile_guid, id, is_default, uid FROM profile + WHERE profile.uid = %d AND is_default = 1 LIMIT 1", + intval($uid) + ); //If no profile is given, we update the default profile } + if(! $r) + return; $profile = $r[0]; - if(x($profile['id']) && x($profile['photo'])) { - preg_match("@\w*(?=-\d*$)@i", $profile['photo'], $resource_id); - $resource_id = $resource_id[0]; + + if($profile['id'] && $profile['photo']) { + preg_match("@\w*(?=-\d*$)@i", $profile['photo'], $resource_id); + $resource_id = $resource_id[0]; - if (intval($profile['is_default']) != 1) { - $r0 = q("SELECT channel_hash FROM channel WHERE channel_id = %d LIMIT 1", intval(local_channel()) ); - $r1 = q("SELECT abook.abook_xchan FROM abook WHERE abook_profile = '%d' ", intval($profile['id'])); //Should not be needed in future. Catches old int-profile-ids. - $r2 = q("SELECT abook.abook_xchan FROM abook WHERE abook_profile = '%s'", dbesc($profile['profile_guid'])); + if (! intval($profile['is_default'])) { + $r0 = q("SELECT channel_hash FROM channel WHERE channel_id = %d LIMIT 1", + intval($uid) + ); + //Should not be needed in future. Catches old int-profile-ids. + $r1 = q("SELECT abook.abook_xchan FROM abook WHERE abook_profile = '%d' ", + intval($profile['id']) + ); + $r2 = q("SELECT abook.abook_xchan FROM abook WHERE abook_profile = '%s'", + dbesc($profile['profile_guid']) + ); $allowcid = "<" . $r0[0]['channel_hash'] . ">"; foreach ($r1 as $entry) { $allowcid .= "<" . $entry['abook_xchan'] . ">"; } foreach ($r2 as $entry) { - $allowcid .= "<" . $entry['abook_xchan'] . ">"; - } + $allowcid .= "<" . $entry['abook_xchan'] . ">"; + } - q("UPDATE `photo` SET allow_cid = '%s' WHERE resource_id = '%s' AND uid = %d",dbesc($allowcid),dbesc($resource_id),intval($profile['uid'])); + q("UPDATE photo SET allow_cid = '%s' WHERE resource_id = '%s' AND uid = %d", + dbesc($allowcid), + dbesc($resource_id), + intval($uid) + ); - } else { - q("UPDATE `photo` SET allow_cid = '' WHERE profile = 1 AND uid = %d",intval($profile['uid'])); //Reset permissions on default profile picture to public + } + else { + //Reset permissions on default profile picture to public + q("UPDATE photo SET allow_cid = '' WHERE photo_usage = %d AND uid = %d", + intval(PHOTO_PROFILE), + intval($uid) + ); } } diff --git a/include/text.php b/include/text.php index 12b6b1137..89c3a0539 100644 --- a/include/text.php +++ b/include/text.php @@ -376,30 +376,6 @@ function unxmlify($s) { return $ret; } -/** - * Convenience wrapper, reverse the operation "bin2hex" - * This is a built-in function in php >= 5.4 - * - * @FIXME We already have php >= 5.4 requirements, so can we remove this? - */ -if(! function_exists('hex2bin')) { -function hex2bin($s) { - if(! (is_string($s) && strlen($s))) - return ''; - - if(strlen($s) & 1) { - logger('hex2bin: illegal hex string: ' . $s); - return $s; - } - - if(! ctype_xdigit($s)) { - return($s); - } - - return(pack("H*",$s)); -}} - - // Automatic pagination. // To use, get the count of total items. // Then call App::set_pager_total($number_items); @@ -1283,7 +1259,7 @@ function normalise_link($url) { * is https and the other isn't, or if one is www.something and the other * isn't - and also ignore case differences. * - * @see normalis_link() + * @see normalise_link() * * @param string $a * @param string $b @@ -1635,7 +1611,7 @@ function prepare_text($text, $content_type = 'text/bbcode', $cache = false) { function create_export_photo_body(&$item) { if(($item['verb'] === ACTIVITY_POST) && ($item['obj_type'] === ACTIVITY_OBJ_PHOTO)) { - $j = json_decode($item['object'],true); + $j = json_decode($item['obj'],true); if($j) { $item['body'] .= "\n\n" . (($j['body']) ? $j['body'] : $j['bbcode']); $item['sig'] = ''; diff --git a/include/zot.php b/include/zot.php index 2530e55bb..6dd789181 100644 --- a/include/zot.php +++ b/include/zot.php @@ -552,7 +552,7 @@ function zot_refresh($them, $channel = null, $force = false) { unset($new_connection[0]['abook_account']); unset($new_connection[0]['abook_channel']); - $abconfig = load_abconfig($channel['channel_hash'],$new_connection['abook_xchan']); + $abconfig = load_abconfig($channel['channel_id'],$new_connection['abook_xchan']); if($abconfig) $new_connection['abconfig'] = $abconfig; @@ -3335,8 +3335,7 @@ function process_channel_sync_delivery($sender, $arr, $deliveries) { if($abconfig) { // @fixme does not handle sync of del_abconfig foreach($abconfig as $abc) { - if($abc['chan'] === $channel['channel_hash']) - set_abconfig($abc['chan'],$abc['xchan'],$abc['cat'],$abc['k'],$abc['v']); + set_abconfig($channel['channel_id'],$abc['xchan'],$abc['cat'],$abc['k'],$abc['v']); } } } diff --git a/install/schema_mysql.sql b/install/schema_mysql.sql index 13fc54aba..d2a5ac85e 100644 --- a/install/schema_mysql.sql +++ b/install/schema_mysql.sql @@ -1,7 +1,7 @@ CREATE TABLE IF NOT EXISTS `abconfig` ( `id` int(10) unsigned NOT NULL AUTO_INCREMENT, - `chan` char(255) NOT NULL DEFAULT '', + `chan` int(10) unsigned NOT NULL DEFAULT '', `xchan` char(255) NOT NULL DEFAULT '', `cat` char(255) NOT NULL DEFAULT '', `k` char(255) NOT NULL DEFAULT '', diff --git a/install/schema_postgres.sql b/install/schema_postgres.sql index 9473252e6..64cf37f7e 100644 --- a/install/schema_postgres.sql +++ b/install/schema_postgres.sql @@ -1,6 +1,6 @@ CREATE TABLE "abconfig" ( "id" serial NOT NULL, - "chan" text NOT NULL, + "chan" bigint NOT NULL, "xchan" text NOT NULL, "cat" text NOT NULL, "k" text NOT NULL, diff --git a/install/update.php b/install/update.php index 241de78e1..3cb5010eb 100644 --- a/install/update.php +++ b/install/update.php @@ -1,6 +1,6 @@ <?php -define( 'UPDATE_VERSION' , 1178 ); +define( 'UPDATE_VERSION' , 1179 ); /** * @@ -2325,3 +2325,39 @@ function update_r1177() { return UPDATE_SUCCESS; return UPDATE_FAILED; } + + +function update_r1178() { + + $c2 = null; + + $c1 = q("SELECT channel_id, channel_hash from channel where true"); + if($c1) { + $c2 = q("SELECT id, chan from abconfig where true"); + if($c2) { + for($x = 0; $x < count($c2); $x ++) { + foreach($c1 as $c) { + if($c['channel_hash'] == $c2[$x]['chan']) { + $c2[$x]['chan'] = $c['channel_id']; + break; + } + } + } + } + } + + $r1 = q("ALTER TABLE abconfig CHANGE chan chan int(10) unsigned NOT NULL DEFAULT '0' "); + + if($c2) { + foreach($c2 as $c) { + q("UPDATE abconfig SET chan = %d where id = %d", + intval($c['chan']), + intval($c['id']) + ); + } + } + + if($r1) + return UPDATE_SUCCESS; + return UPDATE_FAILED; +}
\ No newline at end of file diff --git a/util/hmessages.po b/util/hmessages.po index 42cf092bb..8fcc4a545 100644 --- a/util/hmessages.po +++ b/util/hmessages.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-06-17 00:02-0700\n" +"POT-Creation-Date: 2016-06-24 00:02-0700\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -21,7 +21,7 @@ msgstr "" msgid "parent" msgstr "" -#: ../../Zotlabs/Storage/Browser.php:131 ../../include/text.php:2621 +#: ../../Zotlabs/Storage/Browser.php:131 ../../include/text.php:2597 msgid "Collection" msgstr "" @@ -54,8 +54,8 @@ msgid "Unknown" msgstr "" #: ../../Zotlabs/Storage/Browser.php:226 ../../Zotlabs/Module/Fbrowser.php:85 -#: ../../Zotlabs/Lib/Apps.php:216 ../../include/conversation.php:1654 -#: ../../include/nav.php:93 +#: ../../Zotlabs/Lib/Apps.php:216 ../../include/nav.php:93 +#: ../../include/conversation.php:1654 msgid "Files" msgstr "" @@ -69,15 +69,15 @@ msgstr "" #: ../../Zotlabs/Storage/Browser.php:230 ../../Zotlabs/Storage/Browser.php:306 #: ../../Zotlabs/Module/Blocks.php:159 ../../Zotlabs/Module/Layouts.php:184 -#: ../../Zotlabs/Module/Menu.php:118 ../../Zotlabs/Module/New_channel.php:142 -#: ../../Zotlabs/Module/Webpages.php:194 +#: ../../Zotlabs/Module/Webpages.php:194 ../../Zotlabs/Module/Menu.php:118 +#: ../../Zotlabs/Module/New_channel.php:142 msgid "Create" msgstr "" #: ../../Zotlabs/Storage/Browser.php:231 ../../Zotlabs/Storage/Browser.php:308 #: ../../Zotlabs/Module/Cover_photo.php:357 #: ../../Zotlabs/Module/Photos.php:825 ../../Zotlabs/Module/Photos.php:1364 -#: ../../Zotlabs/Module/Profile_photo.php:368 +#: ../../Zotlabs/Module/Profile_photo.php:389 #: ../../Zotlabs/Module/Embedphotos.php:159 ../../include/widgets.php:1591 msgid "Upload" msgstr "" @@ -94,7 +94,7 @@ msgid "Type" msgstr "" #: ../../Zotlabs/Storage/Browser.php:237 -#: ../../Zotlabs/Module/Sharedwithme.php:101 ../../include/text.php:1344 +#: ../../Zotlabs/Module/Sharedwithme.php:101 ../../include/text.php:1320 msgid "Size" msgstr "" @@ -103,34 +103,33 @@ msgstr "" msgid "Last Modified" msgstr "" -#: ../../Zotlabs/Storage/Browser.php:240 ../../Zotlabs/Module/Blocks.php:160 -#: ../../Zotlabs/Module/Editblock.php:109 +#: ../../Zotlabs/Storage/Browser.php:240 +#: ../../Zotlabs/Module/Editblock.php:109 ../../Zotlabs/Module/Editpost.php:84 #: ../../Zotlabs/Module/Connections.php:290 #: ../../Zotlabs/Module/Connections.php:310 -#: ../../Zotlabs/Module/Editpost.php:84 +#: ../../Zotlabs/Module/Admin.php:2113 ../../Zotlabs/Module/Blocks.php:160 #: ../../Zotlabs/Module/Editlayout.php:114 #: ../../Zotlabs/Module/Editwebpage.php:146 -#: ../../Zotlabs/Module/Layouts.php:192 ../../Zotlabs/Module/Menu.php:112 -#: ../../Zotlabs/Module/Admin.php:2113 ../../Zotlabs/Module/Settings.php:652 -#: ../../Zotlabs/Module/Thing.php:260 ../../Zotlabs/Module/Webpages.php:195 -#: ../../Zotlabs/Lib/ThreadItem.php:106 ../../Zotlabs/Lib/Apps.php:340 -#: ../../include/channel.php:918 ../../include/channel.php:922 -#: ../../include/menu.php:108 ../../include/page_widgets.php:9 -#: ../../include/page_widgets.php:39 +#: ../../Zotlabs/Module/Layouts.php:192 ../../Zotlabs/Module/Webpages.php:195 +#: ../../Zotlabs/Module/Menu.php:112 ../../Zotlabs/Module/Settings.php:652 +#: ../../Zotlabs/Module/Thing.php:260 ../../Zotlabs/Lib/Apps.php:340 +#: ../../Zotlabs/Lib/ThreadItem.php:106 ../../include/page_widgets.php:9 +#: ../../include/page_widgets.php:39 ../../include/menu.php:108 +#: ../../include/channel.php:924 ../../include/channel.php:928 msgid "Edit" msgstr "" -#: ../../Zotlabs/Storage/Browser.php:241 ../../Zotlabs/Module/Blocks.php:162 -#: ../../Zotlabs/Module/Connedit.php:578 +#: ../../Zotlabs/Storage/Browser.php:241 #: ../../Zotlabs/Module/Editblock.php:134 #: ../../Zotlabs/Module/Connections.php:263 +#: ../../Zotlabs/Module/Admin.php:1039 ../../Zotlabs/Module/Admin.php:1213 +#: ../../Zotlabs/Module/Admin.php:2114 ../../Zotlabs/Module/Blocks.php:162 #: ../../Zotlabs/Module/Editlayout.php:137 #: ../../Zotlabs/Module/Editwebpage.php:170 ../../Zotlabs/Module/Group.php:177 -#: ../../Zotlabs/Module/Photos.php:1173 ../../Zotlabs/Module/Admin.php:1039 -#: ../../Zotlabs/Module/Admin.php:1213 ../../Zotlabs/Module/Admin.php:2114 -#: ../../Zotlabs/Module/Settings.php:653 ../../Zotlabs/Module/Thing.php:261 -#: ../../Zotlabs/Module/Webpages.php:197 ../../Zotlabs/Lib/ThreadItem.php:126 -#: ../../Zotlabs/Lib/Apps.php:341 ../../include/conversation.php:660 +#: ../../Zotlabs/Module/Webpages.php:197 ../../Zotlabs/Module/Photos.php:1173 +#: ../../Zotlabs/Module/Connedit.php:578 ../../Zotlabs/Module/Settings.php:653 +#: ../../Zotlabs/Module/Thing.php:261 ../../Zotlabs/Lib/Apps.php:341 +#: ../../Zotlabs/Lib/ThreadItem.php:126 ../../include/conversation.php:660 msgid "Delete" msgstr "" @@ -165,48 +164,47 @@ msgid "Permission denied" msgstr "" #: ../../Zotlabs/Web/WebServer.php:121 ../../Zotlabs/Web/Router.php:65 -#: ../../Zotlabs/Module/Achievements.php:34 ../../Zotlabs/Module/Blocks.php:73 -#: ../../Zotlabs/Module/Blocks.php:80 ../../Zotlabs/Module/Channel.php:105 -#: ../../Zotlabs/Module/Channel.php:226 ../../Zotlabs/Module/Channel.php:267 +#: ../../Zotlabs/Module/Achievements.php:34 +#: ../../Zotlabs/Module/Editblock.php:67 ../../Zotlabs/Module/Authtest.php:16 #: ../../Zotlabs/Module/Chat.php:100 ../../Zotlabs/Module/Chat.php:105 -#: ../../Zotlabs/Module/Authtest.php:16 ../../Zotlabs/Module/Block.php:26 -#: ../../Zotlabs/Module/Block.php:76 ../../Zotlabs/Module/Bookmarks.php:61 -#: ../../Zotlabs/Module/Connedit.php:366 ../../Zotlabs/Module/Editblock.php:67 +#: ../../Zotlabs/Module/Events.php:265 ../../Zotlabs/Module/Bookmarks.php:61 +#: ../../Zotlabs/Module/Item.php:211 ../../Zotlabs/Module/Item.php:219 +#: ../../Zotlabs/Module/Item.php:1070 ../../Zotlabs/Module/Editpost.php:17 #: ../../Zotlabs/Module/Common.php:39 ../../Zotlabs/Module/Connections.php:33 #: ../../Zotlabs/Module/Cover_photo.php:277 -#: ../../Zotlabs/Module/Cover_photo.php:290 -#: ../../Zotlabs/Module/Editpost.php:17 ../../Zotlabs/Module/Events.php:265 -#: ../../Zotlabs/Module/Editlayout.php:67 +#: ../../Zotlabs/Module/Cover_photo.php:290 ../../Zotlabs/Module/Blocks.php:73 +#: ../../Zotlabs/Module/Blocks.php:80 ../../Zotlabs/Module/Editlayout.php:67 #: ../../Zotlabs/Module/Editlayout.php:90 #: ../../Zotlabs/Module/Editwebpage.php:69 #: ../../Zotlabs/Module/Editwebpage.php:90 #: ../../Zotlabs/Module/Editwebpage.php:105 #: ../../Zotlabs/Module/Editwebpage.php:127 ../../Zotlabs/Module/Group.php:13 -#: ../../Zotlabs/Module/Api.php:13 ../../Zotlabs/Module/Api.php:18 +#: ../../Zotlabs/Module/Appman.php:75 ../../Zotlabs/Module/Layouts.php:71 +#: ../../Zotlabs/Module/Layouts.php:78 ../../Zotlabs/Module/Layouts.php:89 +#: ../../Zotlabs/Module/Webpages.php:74 #: ../../Zotlabs/Module/Filestorage.php:24 #: ../../Zotlabs/Module/Filestorage.php:79 #: ../../Zotlabs/Module/Filestorage.php:94 -#: ../../Zotlabs/Module/Filestorage.php:121 ../../Zotlabs/Module/Item.php:211 -#: ../../Zotlabs/Module/Item.php:219 ../../Zotlabs/Module/Item.php:1070 -#: ../../Zotlabs/Module/Layouts.php:71 ../../Zotlabs/Module/Layouts.php:78 -#: ../../Zotlabs/Module/Layouts.php:89 ../../Zotlabs/Module/Id.php:76 -#: ../../Zotlabs/Module/Like.php:181 ../../Zotlabs/Module/Invite.php:17 +#: ../../Zotlabs/Module/Filestorage.php:121 ../../Zotlabs/Module/Like.php:181 +#: ../../Zotlabs/Module/Id.php:76 ../../Zotlabs/Module/Page.php:35 +#: ../../Zotlabs/Module/Page.php:91 ../../Zotlabs/Module/Invite.php:17 #: ../../Zotlabs/Module/Invite.php:91 ../../Zotlabs/Module/Locs.php:87 #: ../../Zotlabs/Module/Mail.php:129 ../../Zotlabs/Module/Manage.php:10 #: ../../Zotlabs/Module/Menu.php:78 ../../Zotlabs/Module/Message.php:18 #: ../../Zotlabs/Module/Mood.php:116 ../../Zotlabs/Module/Network.php:17 +#: ../../Zotlabs/Module/Block.php:26 ../../Zotlabs/Module/Block.php:76 #: ../../Zotlabs/Module/Mitem.php:115 ../../Zotlabs/Module/New_channel.php:77 #: ../../Zotlabs/Module/New_channel.php:104 -#: ../../Zotlabs/Module/Notifications.php:70 -#: ../../Zotlabs/Module/Photos.php:75 ../../Zotlabs/Module/Page.php:35 -#: ../../Zotlabs/Module/Page.php:91 ../../Zotlabs/Module/Pdledit.php:26 -#: ../../Zotlabs/Module/Poke.php:137 ../../Zotlabs/Module/Profile.php:68 -#: ../../Zotlabs/Module/Profile.php:76 ../../Zotlabs/Module/Profiles.php:203 -#: ../../Zotlabs/Module/Profiles.php:601 -#: ../../Zotlabs/Module/Profile_photo.php:256 -#: ../../Zotlabs/Module/Profile_photo.php:269 -#: ../../Zotlabs/Module/Rate.php:113 ../../Zotlabs/Module/Appman.php:75 -#: ../../Zotlabs/Module/Register.php:77 ../../Zotlabs/Module/Regmod.php:21 +#: ../../Zotlabs/Module/Notifications.php:70 ../../Zotlabs/Module/Poke.php:137 +#: ../../Zotlabs/Module/Photos.php:75 ../../Zotlabs/Module/Pdledit.php:26 +#: ../../Zotlabs/Module/Profile.php:68 ../../Zotlabs/Module/Profile.php:76 +#: ../../Zotlabs/Module/Profiles.php:203 ../../Zotlabs/Module/Profiles.php:601 +#: ../../Zotlabs/Module/Profile_photo.php:264 +#: ../../Zotlabs/Module/Profile_photo.php:277 +#: ../../Zotlabs/Module/Rate.php:113 ../../Zotlabs/Module/Connedit.php:366 +#: ../../Zotlabs/Module/Channel.php:105 ../../Zotlabs/Module/Channel.php:226 +#: ../../Zotlabs/Module/Channel.php:267 ../../Zotlabs/Module/Register.php:77 +#: ../../Zotlabs/Module/Regmod.php:21 #: ../../Zotlabs/Module/Service_limits.php:11 #: ../../Zotlabs/Module/Settings.php:572 ../../Zotlabs/Module/Setup.php:215 #: ../../Zotlabs/Module/Sharedwithme.php:11 @@ -215,15 +213,15 @@ msgstr "" #: ../../Zotlabs/Module/Thing.php:331 #: ../../Zotlabs/Module/Viewconnections.php:25 #: ../../Zotlabs/Module/Viewconnections.php:30 -#: ../../Zotlabs/Module/Viewsrc.php:18 ../../Zotlabs/Module/Webpages.php:74 -#: ../../Zotlabs/Lib/Chatroom.php:137 ../../include/photos.php:27 -#: ../../include/attach.php:141 ../../include/attach.php:189 -#: ../../include/attach.php:252 ../../include/attach.php:266 -#: ../../include/attach.php:273 ../../include/attach.php:338 -#: ../../include/attach.php:352 ../../include/attach.php:359 -#: ../../include/attach.php:439 ../../include/attach.php:901 -#: ../../include/attach.php:972 ../../include/attach.php:1124 -#: ../../include/items.php:3450 +#: ../../Zotlabs/Module/Viewsrc.php:18 ../../Zotlabs/Module/Api.php:13 +#: ../../Zotlabs/Module/Api.php:18 ../../Zotlabs/Lib/Chatroom.php:137 +#: ../../include/items.php:3462 ../../include/attach.php:141 +#: ../../include/attach.php:189 ../../include/attach.php:252 +#: ../../include/attach.php:266 ../../include/attach.php:273 +#: ../../include/attach.php:338 ../../include/attach.php:352 +#: ../../include/attach.php:359 ../../include/attach.php:439 +#: ../../include/attach.php:901 ../../include/attach.php:972 +#: ../../include/attach.php:1124 ../../include/photos.php:27 msgid "Permission denied." msgstr "" @@ -231,9 +229,9 @@ msgstr "" msgid "Not Found" msgstr "" -#: ../../Zotlabs/Web/Router.php:149 ../../Zotlabs/Module/Block.php:79 -#: ../../Zotlabs/Module/Display.php:118 ../../Zotlabs/Module/Help.php:97 -#: ../../Zotlabs/Module/Page.php:94 +#: ../../Zotlabs/Web/Router.php:149 ../../Zotlabs/Module/Help.php:97 +#: ../../Zotlabs/Module/Display.php:118 ../../Zotlabs/Module/Page.php:94 +#: ../../Zotlabs/Module/Block.php:79 msgid "Page not found." msgstr "" @@ -249,13 +247,13 @@ msgstr "" msgid "Welcome %s. Remote authentication successful." msgstr "" -#: ../../Zotlabs/Module/Achievements.php:15 ../../Zotlabs/Module/Blocks.php:33 +#: ../../Zotlabs/Module/Achievements.php:15 #: ../../Zotlabs/Module/Connect.php:17 ../../Zotlabs/Module/Editblock.php:31 -#: ../../Zotlabs/Module/Editlayout.php:31 -#: ../../Zotlabs/Module/Editwebpage.php:33 +#: ../../Zotlabs/Module/Blocks.php:33 ../../Zotlabs/Module/Editlayout.php:31 +#: ../../Zotlabs/Module/Editwebpage.php:33 ../../Zotlabs/Module/Layouts.php:31 +#: ../../Zotlabs/Module/Webpages.php:34 #: ../../Zotlabs/Module/Filestorage.php:60 ../../Zotlabs/Module/Hcard.php:12 -#: ../../Zotlabs/Module/Layouts.php:31 ../../Zotlabs/Module/Profile.php:20 -#: ../../Zotlabs/Module/Webpages.php:34 ../../include/channel.php:818 +#: ../../Zotlabs/Module/Profile.php:20 ../../include/channel.php:824 msgid "Requested profile is not available." msgstr "" @@ -263,142 +261,244 @@ msgstr "" msgid "Some blurb about what to do when you're new here" msgstr "" -#: ../../Zotlabs/Module/Blocks.php:97 ../../Zotlabs/Module/Blocks.php:155 -#: ../../Zotlabs/Module/Editblock.php:108 +#: ../../Zotlabs/Module/Chatsvc.php:117 +msgid "Away" +msgstr "" + +#: ../../Zotlabs/Module/Chatsvc.php:122 +msgid "Online" +msgstr "" + +#: ../../Zotlabs/Module/Connect.php:61 ../../Zotlabs/Module/Connect.php:109 +msgid "Continue" +msgstr "" + +#: ../../Zotlabs/Module/Connect.php:90 +msgid "Premium Channel Setup" +msgstr "" + +#: ../../Zotlabs/Module/Connect.php:92 +msgid "Enable premium channel connection restrictions" +msgstr "" + +#: ../../Zotlabs/Module/Connect.php:93 +msgid "" +"Please enter your restrictions or conditions, such as paypal receipt, usage " +"guidelines, etc." +msgstr "" + +#: ../../Zotlabs/Module/Connect.php:95 ../../Zotlabs/Module/Connect.php:115 +msgid "" +"This channel may require additional steps or acknowledgement of the " +"following conditions prior to connecting:" +msgstr "" + +#: ../../Zotlabs/Module/Connect.php:96 +msgid "" +"Potential connections will then see the following text before proceeding:" +msgstr "" + +#: ../../Zotlabs/Module/Connect.php:97 ../../Zotlabs/Module/Connect.php:118 +msgid "" +"By continuing, I certify that I have complied with any instructions provided " +"on this page." +msgstr "" + +#: ../../Zotlabs/Module/Connect.php:98 ../../Zotlabs/Module/Chat.php:196 +#: ../../Zotlabs/Module/Chat.php:238 ../../Zotlabs/Module/Events.php:475 +#: ../../Zotlabs/Module/Events.php:672 ../../Zotlabs/Module/Import.php:551 +#: ../../Zotlabs/Module/Admin.php:492 ../../Zotlabs/Module/Admin.php:688 +#: ../../Zotlabs/Module/Admin.php:771 ../../Zotlabs/Module/Admin.php:1032 +#: ../../Zotlabs/Module/Admin.php:1211 ../../Zotlabs/Module/Admin.php:1421 +#: ../../Zotlabs/Module/Admin.php:1648 ../../Zotlabs/Module/Admin.php:1733 +#: ../../Zotlabs/Module/Admin.php:2116 ../../Zotlabs/Module/Group.php:85 +#: ../../Zotlabs/Module/Appman.php:126 +#: ../../Zotlabs/Module/Filestorage.php:162 +#: ../../Zotlabs/Module/Import_items.php:120 +#: ../../Zotlabs/Module/Invite.php:146 ../../Zotlabs/Module/Locs.php:121 +#: ../../Zotlabs/Module/Mail.php:378 ../../Zotlabs/Module/Mood.php:139 +#: ../../Zotlabs/Module/Mitem.php:235 ../../Zotlabs/Module/Poke.php:186 +#: ../../Zotlabs/Module/Photos.php:677 ../../Zotlabs/Module/Photos.php:1052 +#: ../../Zotlabs/Module/Photos.php:1092 ../../Zotlabs/Module/Photos.php:1210 +#: ../../Zotlabs/Module/Pconfig.php:107 ../../Zotlabs/Module/Pdledit.php:66 +#: ../../Zotlabs/Module/Profiles.php:687 ../../Zotlabs/Module/Cal.php:338 +#: ../../Zotlabs/Module/Rate.php:170 ../../Zotlabs/Module/Connedit.php:737 +#: ../../Zotlabs/Module/Settings.php:590 ../../Zotlabs/Module/Settings.php:703 +#: ../../Zotlabs/Module/Settings.php:731 ../../Zotlabs/Module/Settings.php:754 +#: ../../Zotlabs/Module/Settings.php:842 +#: ../../Zotlabs/Module/Settings.php:1034 ../../Zotlabs/Module/Setup.php:312 +#: ../../Zotlabs/Module/Setup.php:353 ../../Zotlabs/Module/Sources.php:114 +#: ../../Zotlabs/Module/Sources.php:149 ../../Zotlabs/Module/Thing.php:316 +#: ../../Zotlabs/Module/Thing.php:362 ../../Zotlabs/Module/Xchan.php:15 +#: ../../Zotlabs/Lib/ThreadItem.php:710 ../../include/js_strings.php:22 +#: ../../include/widgets.php:757 ../../include/widgets.php:769 +#: ../../view/theme/redbasic/php/config.php:99 +msgid "Submit" +msgstr "" + +#: ../../Zotlabs/Module/Connect.php:106 +msgid "(No specific instructions have been provided by the channel owner.)" +msgstr "" + +#: ../../Zotlabs/Module/Connect.php:114 +msgid "Restricted or Premium Channel" +msgstr "" + +#: ../../Zotlabs/Module/Editblock.php:79 ../../Zotlabs/Module/Editblock.php:95 +#: ../../Zotlabs/Module/Editpost.php:24 ../../Zotlabs/Module/Editlayout.php:79 +#: ../../Zotlabs/Module/Editwebpage.php:81 +msgid "Item not found" +msgstr "" + +#: ../../Zotlabs/Module/Editblock.php:108 ../../Zotlabs/Module/Blocks.php:97 +#: ../../Zotlabs/Module/Blocks.php:155 msgid "Block Name" msgstr "" -#: ../../Zotlabs/Module/Blocks.php:154 ../../include/text.php:2266 -msgid "Blocks" +#: ../../Zotlabs/Module/Editblock.php:111 ../../Zotlabs/Module/Chat.php:207 +#: ../../Zotlabs/Module/Editwebpage.php:147 ../../Zotlabs/Module/Mail.php:252 +#: ../../Zotlabs/Module/Mail.php:377 ../../include/conversation.php:1146 +msgid "Insert web link" msgstr "" -#: ../../Zotlabs/Module/Blocks.php:156 -msgid "Block Title" +#: ../../Zotlabs/Module/Editblock.php:124 ../../include/conversation.php:1243 +msgid "Title (optional)" msgstr "" -#: ../../Zotlabs/Module/Blocks.php:157 ../../Zotlabs/Module/Layouts.php:190 -#: ../../Zotlabs/Module/Menu.php:114 ../../Zotlabs/Module/Webpages.php:206 -#: ../../include/page_widgets.php:47 -msgid "Created" +#: ../../Zotlabs/Module/Editblock.php:133 +msgid "Edit Block" msgstr "" -#: ../../Zotlabs/Module/Blocks.php:158 ../../Zotlabs/Module/Layouts.php:191 -#: ../../Zotlabs/Module/Menu.php:115 ../../Zotlabs/Module/Webpages.php:207 -#: ../../include/page_widgets.php:48 -msgid "Edited" +#: ../../Zotlabs/Module/Directory.php:63 ../../Zotlabs/Module/Display.php:17 +#: ../../Zotlabs/Module/Photos.php:522 ../../Zotlabs/Module/Ratings.php:86 +#: ../../Zotlabs/Module/Search.php:17 +#: ../../Zotlabs/Module/Viewconnections.php:20 +msgid "Public access denied." msgstr "" -#: ../../Zotlabs/Module/Blocks.php:161 ../../Zotlabs/Module/Layouts.php:193 -#: ../../Zotlabs/Module/Photos.php:1072 ../../Zotlabs/Module/Webpages.php:196 -#: ../../include/conversation.php:1219 -msgid "Share" +#: ../../Zotlabs/Module/Directory.php:243 +#, php-format +msgid "%d rating" +msgid_plural "%d ratings" +msgstr[0] "" +msgstr[1] "" + +#: ../../Zotlabs/Module/Directory.php:254 +msgid "Gender: " msgstr "" -#: ../../Zotlabs/Module/Blocks.php:166 ../../Zotlabs/Module/Layouts.php:197 -#: ../../Zotlabs/Module/Pubsites.php:47 ../../Zotlabs/Module/Webpages.php:201 -#: ../../include/page_widgets.php:42 -msgid "View" +#: ../../Zotlabs/Module/Directory.php:256 +msgid "Status: " msgstr "" -#: ../../Zotlabs/Module/Cal.php:62 ../../Zotlabs/Module/Block.php:43 -#: ../../Zotlabs/Module/Page.php:56 ../../Zotlabs/Module/Wall_upload.php:33 -msgid "Channel not found." +#: ../../Zotlabs/Module/Directory.php:258 +msgid "Homepage: " msgstr "" -#: ../../Zotlabs/Module/Cal.php:69 -msgid "Permissions denied." +#: ../../Zotlabs/Module/Directory.php:306 ../../include/channel.php:1171 +msgid "Age:" msgstr "" -#: ../../Zotlabs/Module/Cal.php:259 ../../Zotlabs/Module/Events.php:588 -msgid "l, F j" +#: ../../Zotlabs/Module/Directory.php:311 ../../include/bb2diaspora.php:507 +#: ../../include/event.php:52 ../../include/event.php:84 +#: ../../include/channel.php:1014 +msgid "Location:" msgstr "" -#: ../../Zotlabs/Module/Cal.php:308 ../../Zotlabs/Module/Events.php:637 -#: ../../include/text.php:1732 -msgid "Link to Source" +#: ../../Zotlabs/Module/Directory.php:317 +msgid "Description:" msgstr "" -#: ../../Zotlabs/Module/Cal.php:331 ../../Zotlabs/Module/Events.php:665 -msgid "Edit Event" +#: ../../Zotlabs/Module/Directory.php:322 ../../include/channel.php:1187 +msgid "Hometown:" msgstr "" -#: ../../Zotlabs/Module/Cal.php:331 ../../Zotlabs/Module/Events.php:665 -msgid "Create Event" +#: ../../Zotlabs/Module/Directory.php:324 ../../include/channel.php:1195 +msgid "About:" msgstr "" -#: ../../Zotlabs/Module/Cal.php:332 ../../Zotlabs/Module/Cal.php:339 -#: ../../Zotlabs/Module/Events.php:666 ../../Zotlabs/Module/Events.php:673 -#: ../../Zotlabs/Module/Photos.php:949 -msgid "Previous" +#: ../../Zotlabs/Module/Directory.php:325 ../../Zotlabs/Module/Match.php:68 +#: ../../Zotlabs/Module/Suggest.php:56 ../../include/connections.php:78 +#: ../../include/conversation.php:959 ../../include/channel.php:999 +#: ../../include/widgets.php:147 ../../include/widgets.php:184 +msgid "Connect" msgstr "" -#: ../../Zotlabs/Module/Cal.php:333 ../../Zotlabs/Module/Cal.php:340 -#: ../../Zotlabs/Module/Events.php:667 ../../Zotlabs/Module/Events.php:674 -#: ../../Zotlabs/Module/Photos.php:958 ../../Zotlabs/Module/Setup.php:267 -msgid "Next" +#: ../../Zotlabs/Module/Directory.php:326 +msgid "Public Forum:" msgstr "" -#: ../../Zotlabs/Module/Cal.php:334 ../../Zotlabs/Module/Events.php:668 -#: ../../include/widgets.php:755 -msgid "Export" +#: ../../Zotlabs/Module/Directory.php:329 +msgid "Keywords: " msgstr "" -#: ../../Zotlabs/Module/Cal.php:337 ../../Zotlabs/Module/Events.php:671 -#: ../../include/widgets.php:756 -msgid "Import" +#: ../../Zotlabs/Module/Directory.php:332 +msgid "Don't suggest" msgstr "" -#: ../../Zotlabs/Module/Cal.php:338 ../../Zotlabs/Module/Chat.php:196 -#: ../../Zotlabs/Module/Chat.php:238 ../../Zotlabs/Module/Connect.php:98 -#: ../../Zotlabs/Module/Connedit.php:737 ../../Zotlabs/Module/Events.php:475 -#: ../../Zotlabs/Module/Events.php:672 ../../Zotlabs/Module/Group.php:85 -#: ../../Zotlabs/Module/Filestorage.php:162 -#: ../../Zotlabs/Module/Import.php:550 -#: ../../Zotlabs/Module/Import_items.php:120 -#: ../../Zotlabs/Module/Invite.php:146 ../../Zotlabs/Module/Locs.php:121 -#: ../../Zotlabs/Module/Mail.php:378 ../../Zotlabs/Module/Mood.php:139 -#: ../../Zotlabs/Module/Mitem.php:235 ../../Zotlabs/Module/Photos.php:677 -#: ../../Zotlabs/Module/Photos.php:1052 ../../Zotlabs/Module/Photos.php:1092 -#: ../../Zotlabs/Module/Photos.php:1210 ../../Zotlabs/Module/Pconfig.php:107 -#: ../../Zotlabs/Module/Pdledit.php:66 ../../Zotlabs/Module/Poke.php:186 -#: ../../Zotlabs/Module/Profiles.php:687 ../../Zotlabs/Module/Rate.php:170 -#: ../../Zotlabs/Module/Admin.php:492 ../../Zotlabs/Module/Admin.php:688 -#: ../../Zotlabs/Module/Admin.php:771 ../../Zotlabs/Module/Admin.php:1032 -#: ../../Zotlabs/Module/Admin.php:1211 ../../Zotlabs/Module/Admin.php:1421 -#: ../../Zotlabs/Module/Admin.php:1648 ../../Zotlabs/Module/Admin.php:1733 -#: ../../Zotlabs/Module/Admin.php:2116 ../../Zotlabs/Module/Appman.php:126 -#: ../../Zotlabs/Module/Settings.php:590 ../../Zotlabs/Module/Settings.php:703 -#: ../../Zotlabs/Module/Settings.php:731 ../../Zotlabs/Module/Settings.php:754 -#: ../../Zotlabs/Module/Settings.php:842 -#: ../../Zotlabs/Module/Settings.php:1034 ../../Zotlabs/Module/Setup.php:312 -#: ../../Zotlabs/Module/Setup.php:353 ../../Zotlabs/Module/Sources.php:114 -#: ../../Zotlabs/Module/Sources.php:149 ../../Zotlabs/Module/Thing.php:316 -#: ../../Zotlabs/Module/Thing.php:362 ../../Zotlabs/Module/Xchan.php:15 -#: ../../Zotlabs/Lib/ThreadItem.php:710 ../../include/js_strings.php:22 -#: ../../include/widgets.php:757 ../../include/widgets.php:769 -#: ../../view/theme/redbasic/php/config.php:99 -msgid "Submit" +#: ../../Zotlabs/Module/Directory.php:334 +msgid "Common connections:" msgstr "" -#: ../../Zotlabs/Module/Cal.php:341 ../../Zotlabs/Module/Events.php:675 -msgid "Today" +#: ../../Zotlabs/Module/Directory.php:383 +msgid "Global Directory" msgstr "" -#: ../../Zotlabs/Module/Channel.php:29 ../../Zotlabs/Module/Chat.php:25 -#: ../../Zotlabs/Module/Wiki.php:20 -msgid "You must be logged in to see this page." +#: ../../Zotlabs/Module/Directory.php:383 +msgid "Local Directory" msgstr "" -#: ../../Zotlabs/Module/Channel.php:41 -msgid "Posts and comments" +#: ../../Zotlabs/Module/Directory.php:388 +#: ../../Zotlabs/Module/Directory.php:393 +#: ../../Zotlabs/Module/Connections.php:309 +#: ../../include/contact_widgets.php:23 +msgid "Find" msgstr "" -#: ../../Zotlabs/Module/Channel.php:42 -msgid "Only posts" +#: ../../Zotlabs/Module/Directory.php:389 +msgid "Finding:" msgstr "" -#: ../../Zotlabs/Module/Channel.php:102 -msgid "Insufficient permissions. Request redirected to profile page." +#: ../../Zotlabs/Module/Directory.php:392 ../../Zotlabs/Module/Suggest.php:64 +#: ../../include/contact_widgets.php:24 +msgid "Channel Suggestions" +msgstr "" + +#: ../../Zotlabs/Module/Directory.php:394 +msgid "next page" +msgstr "" + +#: ../../Zotlabs/Module/Directory.php:394 +msgid "previous page" +msgstr "" + +#: ../../Zotlabs/Module/Directory.php:395 +msgid "Sort options" +msgstr "" + +#: ../../Zotlabs/Module/Directory.php:396 +msgid "Alphabetic" +msgstr "" + +#: ../../Zotlabs/Module/Directory.php:397 +msgid "Reverse Alphabetic" +msgstr "" + +#: ../../Zotlabs/Module/Directory.php:398 +msgid "Newest to Oldest" +msgstr "" + +#: ../../Zotlabs/Module/Directory.php:399 +msgid "Oldest to Newest" +msgstr "" + +#: ../../Zotlabs/Module/Directory.php:416 +msgid "No entries (some entries may be hidden)." +msgstr "" + +#: ../../Zotlabs/Module/Chat.php:25 ../../Zotlabs/Module/Wiki.php:20 +#: ../../Zotlabs/Module/Channel.php:29 +msgid "You must be logged in to see this page." msgstr "" #: ../../Zotlabs/Module/Chat.php:181 @@ -436,12 +536,6 @@ msgstr "" msgid "Encrypt text" msgstr "" -#: ../../Zotlabs/Module/Chat.php:207 ../../Zotlabs/Module/Editblock.php:111 -#: ../../Zotlabs/Module/Editwebpage.php:147 ../../Zotlabs/Module/Mail.php:252 -#: ../../Zotlabs/Module/Mail.php:377 ../../include/conversation.php:1146 -msgid "Insert web link" -msgstr "" - #: ../../Zotlabs/Module/Chat.php:218 msgid "Feature disabled." msgstr "" @@ -487,556 +581,402 @@ msgstr "" msgid "min" msgstr "" -#: ../../Zotlabs/Module/Chatsvc.php:117 -msgid "Away" -msgstr "" - -#: ../../Zotlabs/Module/Chatsvc.php:122 -msgid "Online" -msgstr "" - -#: ../../Zotlabs/Module/Block.php:31 ../../Zotlabs/Module/Page.php:40 -msgid "Invalid item." +#: ../../Zotlabs/Module/Events.php:26 +msgid "Calendar entries imported." msgstr "" -#: ../../Zotlabs/Module/Bookmarks.php:53 -msgid "Bookmark added" +#: ../../Zotlabs/Module/Events.php:28 +msgid "No calendar entries found." msgstr "" -#: ../../Zotlabs/Module/Bookmarks.php:75 -msgid "My Bookmarks" +#: ../../Zotlabs/Module/Events.php:105 +msgid "Event can not end before it has started." msgstr "" -#: ../../Zotlabs/Module/Bookmarks.php:86 -msgid "My Connections Bookmarks" +#: ../../Zotlabs/Module/Events.php:107 ../../Zotlabs/Module/Events.php:116 +#: ../../Zotlabs/Module/Events.php:136 +msgid "Unable to generate preview." msgstr "" -#: ../../Zotlabs/Module/Connect.php:61 ../../Zotlabs/Module/Connect.php:109 -msgid "Continue" +#: ../../Zotlabs/Module/Events.php:114 +msgid "Event title and start time are required." msgstr "" -#: ../../Zotlabs/Module/Connect.php:90 -msgid "Premium Channel Setup" +#: ../../Zotlabs/Module/Events.php:134 ../../Zotlabs/Module/Events.php:259 +msgid "Event not found." msgstr "" -#: ../../Zotlabs/Module/Connect.php:92 -msgid "Enable premium channel connection restrictions" +#: ../../Zotlabs/Module/Events.php:254 ../../Zotlabs/Module/Like.php:373 +#: ../../Zotlabs/Module/Tagger.php:51 ../../include/event.php:949 +#: ../../include/text.php:1920 ../../include/conversation.php:123 +msgid "event" msgstr "" -#: ../../Zotlabs/Module/Connect.php:93 -msgid "" -"Please enter your restrictions or conditions, such as paypal receipt, usage " -"guidelines, etc." +#: ../../Zotlabs/Module/Events.php:449 +msgid "Edit event title" msgstr "" -#: ../../Zotlabs/Module/Connect.php:95 ../../Zotlabs/Module/Connect.php:115 -msgid "" -"This channel may require additional steps or acknowledgement of the " -"following conditions prior to connecting:" +#: ../../Zotlabs/Module/Events.php:449 +msgid "Event title" msgstr "" -#: ../../Zotlabs/Module/Connect.php:96 -msgid "" -"Potential connections will then see the following text before proceeding:" +#: ../../Zotlabs/Module/Events.php:449 ../../Zotlabs/Module/Events.php:454 +#: ../../Zotlabs/Module/Appman.php:115 ../../Zotlabs/Module/Appman.php:116 +#: ../../Zotlabs/Module/Profiles.php:709 ../../Zotlabs/Module/Profiles.php:713 +#: ../../include/datetime.php:245 +msgid "Required" msgstr "" -#: ../../Zotlabs/Module/Connect.php:97 ../../Zotlabs/Module/Connect.php:118 -msgid "" -"By continuing, I certify that I have complied with any instructions provided " -"on this page." +#: ../../Zotlabs/Module/Events.php:451 +msgid "Categories (comma-separated list)" msgstr "" -#: ../../Zotlabs/Module/Connect.php:106 -msgid "(No specific instructions have been provided by the channel owner.)" +#: ../../Zotlabs/Module/Events.php:452 +msgid "Edit Category" msgstr "" -#: ../../Zotlabs/Module/Connect.php:114 -msgid "Restricted or Premium Channel" +#: ../../Zotlabs/Module/Events.php:452 +msgid "Category" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:80 -msgid "Could not access contact record." +#: ../../Zotlabs/Module/Events.php:455 +msgid "Edit start date and time" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:104 -msgid "Could not locate selected profile." +#: ../../Zotlabs/Module/Events.php:455 +msgid "Start date and time" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:227 -msgid "Connection updated." +#: ../../Zotlabs/Module/Events.php:456 ../../Zotlabs/Module/Events.php:459 +msgid "Finish date and time are not known or not relevant" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:229 -msgid "Failed to update connection record." +#: ../../Zotlabs/Module/Events.php:458 +msgid "Edit finish date and time" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:276 -msgid "is now connected to" +#: ../../Zotlabs/Module/Events.php:458 +msgid "Finish date and time" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:379 ../../Zotlabs/Module/Connedit.php:660 #: ../../Zotlabs/Module/Events.php:459 ../../Zotlabs/Module/Events.php:460 -#: ../../Zotlabs/Module/Events.php:469 ../../Zotlabs/Module/Api.php:89 +#: ../../Zotlabs/Module/Events.php:469 ../../Zotlabs/Module/Admin.php:459 #: ../../Zotlabs/Module/Filestorage.php:157 #: ../../Zotlabs/Module/Filestorage.php:165 ../../Zotlabs/Module/Menu.php:100 #: ../../Zotlabs/Module/Menu.php:157 ../../Zotlabs/Module/Mitem.php:158 #: ../../Zotlabs/Module/Mitem.php:159 ../../Zotlabs/Module/Mitem.php:232 #: ../../Zotlabs/Module/Mitem.php:233 ../../Zotlabs/Module/Photos.php:666 -#: ../../Zotlabs/Module/Profiles.php:647 ../../Zotlabs/Module/Admin.php:459 -#: ../../Zotlabs/Module/Removeme.php:61 ../../Zotlabs/Module/Settings.php:581 +#: ../../Zotlabs/Module/Profiles.php:647 ../../Zotlabs/Module/Connedit.php:379 +#: ../../Zotlabs/Module/Connedit.php:660 ../../Zotlabs/Module/Removeme.php:61 +#: ../../Zotlabs/Module/Settings.php:581 ../../Zotlabs/Module/Api.php:89 #: ../../include/dir_fns.php:143 ../../include/dir_fns.php:144 #: ../../include/dir_fns.php:145 ../../view/theme/redbasic/php/config.php:105 #: ../../view/theme/redbasic/php/config.php:130 ../../boot.php:1708 msgid "No" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:379 ../../Zotlabs/Module/Events.php:459 -#: ../../Zotlabs/Module/Events.php:460 ../../Zotlabs/Module/Events.php:469 -#: ../../Zotlabs/Module/Api.php:88 ../../Zotlabs/Module/Filestorage.php:157 +#: ../../Zotlabs/Module/Events.php:459 ../../Zotlabs/Module/Events.php:460 +#: ../../Zotlabs/Module/Events.php:469 ../../Zotlabs/Module/Admin.php:461 +#: ../../Zotlabs/Module/Filestorage.php:157 #: ../../Zotlabs/Module/Filestorage.php:165 ../../Zotlabs/Module/Menu.php:100 #: ../../Zotlabs/Module/Menu.php:157 ../../Zotlabs/Module/Mitem.php:158 #: ../../Zotlabs/Module/Mitem.php:159 ../../Zotlabs/Module/Mitem.php:232 #: ../../Zotlabs/Module/Mitem.php:233 ../../Zotlabs/Module/Photos.php:666 -#: ../../Zotlabs/Module/Profiles.php:647 ../../Zotlabs/Module/Admin.php:461 +#: ../../Zotlabs/Module/Profiles.php:647 ../../Zotlabs/Module/Connedit.php:379 #: ../../Zotlabs/Module/Removeme.php:61 ../../Zotlabs/Module/Settings.php:581 -#: ../../include/dir_fns.php:143 ../../include/dir_fns.php:144 -#: ../../include/dir_fns.php:145 ../../view/theme/redbasic/php/config.php:105 +#: ../../Zotlabs/Module/Api.php:88 ../../include/dir_fns.php:143 +#: ../../include/dir_fns.php:144 ../../include/dir_fns.php:145 +#: ../../view/theme/redbasic/php/config.php:105 #: ../../view/theme/redbasic/php/config.php:130 ../../boot.php:1708 msgid "Yes" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:411 -msgid "Could not access address book record." +#: ../../Zotlabs/Module/Events.php:460 ../../Zotlabs/Module/Events.php:461 +msgid "Adjust for viewer timezone" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:431 -msgid "Refresh failed - channel is currently unavailable." +#: ../../Zotlabs/Module/Events.php:460 +msgid "" +"Important for events that happen in a particular place. Not practical for " +"global holidays." msgstr "" -#: ../../Zotlabs/Module/Connedit.php:446 ../../Zotlabs/Module/Connedit.php:455 -#: ../../Zotlabs/Module/Connedit.php:464 ../../Zotlabs/Module/Connedit.php:473 -#: ../../Zotlabs/Module/Connedit.php:486 -msgid "Unable to set address book parameters." +#: ../../Zotlabs/Module/Events.php:462 +msgid "Edit Description" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:509 -msgid "Connection has been removed." +#: ../../Zotlabs/Module/Events.php:462 ../../Zotlabs/Module/Appman.php:117 +#: ../../Zotlabs/Module/Rbmark.php:101 +msgid "Description" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:525 ../../Zotlabs/Lib/Apps.php:220 -#: ../../include/conversation.php:957 ../../include/nav.php:86 -msgid "View Profile" +#: ../../Zotlabs/Module/Events.php:464 +msgid "Edit Location" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:528 -#, php-format -msgid "View %s's profile" +#: ../../Zotlabs/Module/Events.php:464 ../../Zotlabs/Module/Locs.php:117 +#: ../../Zotlabs/Module/Profiles.php:477 ../../Zotlabs/Module/Profiles.php:698 +#: ../../Zotlabs/Module/Pubsites.php:41 ../../include/js_strings.php:25 +msgid "Location" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:532 -msgid "Refresh Permissions" +#: ../../Zotlabs/Module/Events.php:467 ../../Zotlabs/Module/Events.php:469 +msgid "Share this event" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:535 -msgid "Fetch updated permissions" +#: ../../Zotlabs/Module/Events.php:470 ../../Zotlabs/Module/Webpages.php:202 +#: ../../Zotlabs/Module/Photos.php:1093 ../../Zotlabs/Lib/ThreadItem.php:719 +#: ../../include/page_widgets.php:43 ../../include/conversation.php:1198 +msgid "Preview" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:539 -msgid "Recent Activity" +#: ../../Zotlabs/Module/Events.php:471 ../../include/conversation.php:1247 +msgid "Permission settings" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:542 -msgid "View recent posts and comments" +#: ../../Zotlabs/Module/Events.php:476 +msgid "Advanced Options" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:546 ../../Zotlabs/Module/Admin.php:1041 -msgid "Unblock" +#: ../../Zotlabs/Module/Events.php:588 ../../Zotlabs/Module/Cal.php:259 +msgid "l, F j" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:546 ../../Zotlabs/Module/Admin.php:1040 -msgid "Block" +#: ../../Zotlabs/Module/Events.php:610 +msgid "Edit event" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:549 -msgid "Block (or Unblock) all communications with this connection" +#: ../../Zotlabs/Module/Events.php:612 +msgid "Delete event" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:550 -msgid "This connection is blocked!" +#: ../../Zotlabs/Module/Events.php:637 ../../Zotlabs/Module/Cal.php:308 +#: ../../include/text.php:1708 +msgid "Link to Source" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:554 -msgid "Unignore" +#: ../../Zotlabs/Module/Events.php:646 +msgid "calendar" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:554 -#: ../../Zotlabs/Module/Connections.php:277 -#: ../../Zotlabs/Module/Notifications.php:55 -msgid "Ignore" +#: ../../Zotlabs/Module/Events.php:665 ../../Zotlabs/Module/Cal.php:331 +msgid "Edit Event" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:557 -msgid "Ignore (or Unignore) all inbound communications from this connection" +#: ../../Zotlabs/Module/Events.php:665 ../../Zotlabs/Module/Cal.php:331 +msgid "Create Event" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:558 -msgid "This connection is ignored!" +#: ../../Zotlabs/Module/Events.php:666 ../../Zotlabs/Module/Events.php:673 +#: ../../Zotlabs/Module/Photos.php:949 ../../Zotlabs/Module/Cal.php:332 +#: ../../Zotlabs/Module/Cal.php:339 +msgid "Previous" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:562 -msgid "Unarchive" +#: ../../Zotlabs/Module/Events.php:667 ../../Zotlabs/Module/Events.php:674 +#: ../../Zotlabs/Module/Photos.php:958 ../../Zotlabs/Module/Cal.php:333 +#: ../../Zotlabs/Module/Cal.php:340 ../../Zotlabs/Module/Setup.php:267 +msgid "Next" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:562 -msgid "Archive" +#: ../../Zotlabs/Module/Events.php:668 ../../Zotlabs/Module/Cal.php:334 +#: ../../include/widgets.php:755 +msgid "Export" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:565 -msgid "" -"Archive (or Unarchive) this connection - mark channel dead but keep content" +#: ../../Zotlabs/Module/Events.php:671 ../../Zotlabs/Module/Cal.php:337 +#: ../../include/widgets.php:756 +msgid "Import" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:566 -msgid "This connection is archived!" +#: ../../Zotlabs/Module/Events.php:675 ../../Zotlabs/Module/Cal.php:341 +msgid "Today" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:570 -msgid "Unhide" +#: ../../Zotlabs/Module/Events.php:706 +msgid "Event removed" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:570 -msgid "Hide" +#: ../../Zotlabs/Module/Events.php:709 +msgid "Failed to remove event" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:573 -msgid "Hide or Unhide this connection from your other connections" +#: ../../Zotlabs/Module/Bookmarks.php:53 +msgid "Bookmark added" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:574 -msgid "This connection is hidden!" +#: ../../Zotlabs/Module/Bookmarks.php:75 +msgid "My Bookmarks" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:581 -msgid "Delete this connection" +#: ../../Zotlabs/Module/Bookmarks.php:86 +msgid "My Connections Bookmarks" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:596 ../../include/widgets.php:493 -msgid "Me" +#: ../../Zotlabs/Module/Item.php:179 +msgid "Unable to locate original post." msgstr "" -#: ../../Zotlabs/Module/Connedit.php:597 ../../include/widgets.php:494 -msgid "Family" +#: ../../Zotlabs/Module/Item.php:428 +msgid "Empty post discarded." msgstr "" -#: ../../Zotlabs/Module/Connedit.php:598 ../../Zotlabs/Module/Settings.php:342 -#: ../../Zotlabs/Module/Settings.php:346 ../../Zotlabs/Module/Settings.php:347 -#: ../../Zotlabs/Module/Settings.php:350 ../../Zotlabs/Module/Settings.php:361 -#: ../../include/selectors.php:123 ../../include/channel.php:389 -#: ../../include/channel.php:390 ../../include/channel.php:397 -#: ../../include/widgets.php:495 -msgid "Friends" +#: ../../Zotlabs/Module/Item.php:468 +msgid "Executable content type not permitted to this channel." msgstr "" -#: ../../Zotlabs/Module/Connedit.php:599 ../../include/widgets.php:496 -msgid "Acquaintances" +#: ../../Zotlabs/Module/Item.php:848 +msgid "Duplicate post suppressed." msgstr "" -#: ../../Zotlabs/Module/Connedit.php:600 -#: ../../Zotlabs/Module/Connections.php:92 -#: ../../Zotlabs/Module/Connections.php:107 ../../include/widgets.php:497 -msgid "All" +#: ../../Zotlabs/Module/Item.php:983 +msgid "System error. Post not saved." msgstr "" -#: ../../Zotlabs/Module/Connedit.php:660 -msgid "Approve this connection" +#: ../../Zotlabs/Module/Item.php:1241 +msgid "Unable to obtain post information from database." msgstr "" -#: ../../Zotlabs/Module/Connedit.php:660 -msgid "Accept connection to allow communication" +#: ../../Zotlabs/Module/Item.php:1248 +#, php-format +msgid "You have reached your limit of %1$.0f top level posts." msgstr "" -#: ../../Zotlabs/Module/Connedit.php:665 -msgid "Set Affinity" +#: ../../Zotlabs/Module/Item.php:1255 +#, php-format +msgid "You have reached your limit of %1$.0f webpages." msgstr "" -#: ../../Zotlabs/Module/Connedit.php:668 -msgid "Set Profile" +#: ../../Zotlabs/Module/Editpost.php:35 +msgid "Item is not editable" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:671 -msgid "Set Affinity & Profile" +#: ../../Zotlabs/Module/Editpost.php:106 ../../Zotlabs/Module/Rpost.php:135 +msgid "Edit post" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:704 -msgid "none" +#: ../../Zotlabs/Module/Fbrowser.php:29 ../../Zotlabs/Lib/Apps.php:221 +#: ../../include/nav.php:92 ../../include/conversation.php:1647 +msgid "Photos" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:708 ../../include/widgets.php:614 -msgid "Connection Default Permissions" +#: ../../Zotlabs/Module/Fbrowser.php:66 ../../Zotlabs/Module/Fbrowser.php:88 +#: ../../Zotlabs/Module/Admin.php:1406 ../../Zotlabs/Module/Wiki.php:145 +#: ../../Zotlabs/Module/Settings.php:591 ../../Zotlabs/Module/Settings.php:617 +#: ../../Zotlabs/Module/Tagrm.php:15 ../../Zotlabs/Module/Tagrm.php:138 +#: ../../include/conversation.php:1235 ../../include/conversation.php:1274 +msgid "Cancel" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:708 ../../include/items.php:3937 +#: ../../Zotlabs/Module/Import.php:32 #, php-format -msgid "Connection: %s" -msgstr "" - -#: ../../Zotlabs/Module/Connedit.php:709 -msgid "Apply these permissions automatically" -msgstr "" - -#: ../../Zotlabs/Module/Connedit.php:709 -msgid "Connection requests will be approved without your interaction" -msgstr "" - -#: ../../Zotlabs/Module/Connedit.php:711 -msgid "This connection's primary address is" +msgid "Your service plan only allows %d channels." msgstr "" -#: ../../Zotlabs/Module/Connedit.php:712 -msgid "Available locations:" +#: ../../Zotlabs/Module/Import.php:70 ../../Zotlabs/Module/Import_items.php:42 +msgid "Nothing to import." msgstr "" -#: ../../Zotlabs/Module/Connedit.php:716 -msgid "" -"The permissions indicated on this page will be applied to all new " -"connections." +#: ../../Zotlabs/Module/Import.php:94 ../../Zotlabs/Module/Import_items.php:66 +msgid "Unable to download data from old server" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:717 -msgid "Connection Tools" +#: ../../Zotlabs/Module/Import.php:100 +#: ../../Zotlabs/Module/Import_items.php:72 +msgid "Imported file is empty." msgstr "" -#: ../../Zotlabs/Module/Connedit.php:719 -msgid "Slide to adjust your degree of friendship" +#: ../../Zotlabs/Module/Import.php:122 +#: ../../Zotlabs/Module/Import_items.php:86 +#, php-format +msgid "Warning: Database versions differ by %1$d updates." msgstr "" -#: ../../Zotlabs/Module/Connedit.php:720 ../../Zotlabs/Module/Rate.php:159 -#: ../../include/js_strings.php:20 -msgid "Rating" +#: ../../Zotlabs/Module/Import.php:152 ../../include/import.php:86 +msgid "Cloned channel not found. Import failed." msgstr "" -#: ../../Zotlabs/Module/Connedit.php:721 -msgid "Slide to adjust your rating" +#: ../../Zotlabs/Module/Import.php:162 +msgid "No channel. Import failed." msgstr "" -#: ../../Zotlabs/Module/Connedit.php:722 ../../Zotlabs/Module/Connedit.php:727 -msgid "Optionally explain your rating" +#: ../../Zotlabs/Module/Import.php:511 +#: ../../include/Import/import_diaspora.php:142 +msgid "Import completed." msgstr "" -#: ../../Zotlabs/Module/Connedit.php:724 -msgid "Custom Filter" +#: ../../Zotlabs/Module/Import.php:533 +msgid "You must be logged in to use this feature." msgstr "" -#: ../../Zotlabs/Module/Connedit.php:725 -msgid "Only import posts with this text" +#: ../../Zotlabs/Module/Import.php:538 +msgid "Import Channel" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:725 ../../Zotlabs/Module/Connedit.php:726 +#: ../../Zotlabs/Module/Import.php:539 msgid "" -"words one per line or #tags or /patterns/ or lang=xx, leave blank to import " -"all posts" -msgstr "" - -#: ../../Zotlabs/Module/Connedit.php:726 -msgid "Do not import posts with this text" +"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/Connedit.php:728 -msgid "This information is public!" +#: ../../Zotlabs/Module/Import.php:540 +#: ../../Zotlabs/Module/Import_items.php:119 +msgid "File to Upload" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:733 -msgid "Connection Pending Approval" +#: ../../Zotlabs/Module/Import.php:541 +msgid "Or provide the old server/hub details" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:736 -msgid "inherited" +#: ../../Zotlabs/Module/Import.php:542 +msgid "Your old identity address (xyz@example.com)" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:738 -#, php-format -msgid "" -"Please choose the profile you would like to display to %s when viewing your " -"profile securely." +#: ../../Zotlabs/Module/Import.php:543 +msgid "Your old login email address" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:740 -msgid "Their Settings" +#: ../../Zotlabs/Module/Import.php:544 +msgid "Your old login password" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:741 -msgid "My Settings" +#: ../../Zotlabs/Module/Import.php:545 +msgid "" +"For either option, please choose whether to make this hub your new primary " +"address, or whether your old location should continue this role. You will be " +"able to post from either location, but only one can be marked as the primary " +"location for files, photos, and media." msgstr "" -#: ../../Zotlabs/Module/Connedit.php:743 -msgid "Individual Permissions" +#: ../../Zotlabs/Module/Import.php:546 +msgid "Make this hub my primary location" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:744 +#: ../../Zotlabs/Module/Import.php:547 msgid "" -"Some permissions may be inherited from your channel's <a href=\"settings" -"\"><strong>privacy settings</strong></a>, which have higher priority than " -"individual settings. You can <strong>not</strong> change those settings here." +"Import existing posts if possible (experimental - limited by available memory" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:745 +#: ../../Zotlabs/Module/Import.php:548 msgid "" -"Some permissions may be inherited from your channel's <a href=\"settings" -"\"><strong>privacy settings</strong></a>, which have higher priority than " -"individual settings. You can change those settings here but they wont have " -"any impact unless the inherited setting changes." -msgstr "" - -#: ../../Zotlabs/Module/Connedit.php:746 -msgid "Last update:" -msgstr "" - -#: ../../Zotlabs/Module/Directory.php:63 ../../Zotlabs/Module/Display.php:17 -#: ../../Zotlabs/Module/Photos.php:522 ../../Zotlabs/Module/Ratings.php:86 -#: ../../Zotlabs/Module/Search.php:17 -#: ../../Zotlabs/Module/Viewconnections.php:20 -msgid "Public access denied." -msgstr "" - -#: ../../Zotlabs/Module/Directory.php:243 -#, php-format -msgid "%d rating" -msgid_plural "%d ratings" -msgstr[0] "" -msgstr[1] "" - -#: ../../Zotlabs/Module/Directory.php:254 -msgid "Gender: " -msgstr "" - -#: ../../Zotlabs/Module/Directory.php:256 -msgid "Status: " -msgstr "" - -#: ../../Zotlabs/Module/Directory.php:258 -msgid "Homepage: " -msgstr "" - -#: ../../Zotlabs/Module/Directory.php:306 ../../include/channel.php:1164 -msgid "Age:" -msgstr "" - -#: ../../Zotlabs/Module/Directory.php:311 ../../include/event.php:52 -#: ../../include/event.php:84 ../../include/channel.php:1008 -#: ../../include/bb2diaspora.php:507 -msgid "Location:" -msgstr "" - -#: ../../Zotlabs/Module/Directory.php:317 -msgid "Description:" -msgstr "" - -#: ../../Zotlabs/Module/Directory.php:322 ../../include/channel.php:1180 -msgid "Hometown:" -msgstr "" - -#: ../../Zotlabs/Module/Directory.php:324 ../../include/channel.php:1188 -msgid "About:" -msgstr "" - -#: ../../Zotlabs/Module/Directory.php:325 ../../Zotlabs/Module/Match.php:68 -#: ../../Zotlabs/Module/Suggest.php:56 ../../include/conversation.php:959 -#: ../../include/channel.php:993 ../../include/connections.php:78 -#: ../../include/widgets.php:147 ../../include/widgets.php:184 -msgid "Connect" -msgstr "" - -#: ../../Zotlabs/Module/Directory.php:326 -msgid "Public Forum:" -msgstr "" - -#: ../../Zotlabs/Module/Directory.php:329 -msgid "Keywords: " -msgstr "" - -#: ../../Zotlabs/Module/Directory.php:332 -msgid "Don't suggest" -msgstr "" - -#: ../../Zotlabs/Module/Directory.php:334 -msgid "Common connections:" -msgstr "" - -#: ../../Zotlabs/Module/Directory.php:383 -msgid "Global Directory" -msgstr "" - -#: ../../Zotlabs/Module/Directory.php:383 -msgid "Local Directory" -msgstr "" - -#: ../../Zotlabs/Module/Directory.php:388 -#: ../../Zotlabs/Module/Directory.php:393 -#: ../../Zotlabs/Module/Connections.php:309 -#: ../../include/contact_widgets.php:23 -msgid "Find" -msgstr "" - -#: ../../Zotlabs/Module/Directory.php:389 -msgid "Finding:" -msgstr "" - -#: ../../Zotlabs/Module/Directory.php:392 ../../Zotlabs/Module/Suggest.php:64 -#: ../../include/contact_widgets.php:24 -msgid "Channel Suggestions" -msgstr "" - -#: ../../Zotlabs/Module/Directory.php:394 -msgid "next page" -msgstr "" - -#: ../../Zotlabs/Module/Directory.php:394 -msgid "previous page" -msgstr "" - -#: ../../Zotlabs/Module/Directory.php:395 -msgid "Sort options" -msgstr "" - -#: ../../Zotlabs/Module/Directory.php:396 -msgid "Alphabetic" -msgstr "" - -#: ../../Zotlabs/Module/Directory.php:397 -msgid "Reverse Alphabetic" -msgstr "" - -#: ../../Zotlabs/Module/Directory.php:398 -msgid "Newest to Oldest" -msgstr "" - -#: ../../Zotlabs/Module/Directory.php:399 -msgid "Oldest to Newest" -msgstr "" - -#: ../../Zotlabs/Module/Directory.php:416 -msgid "No entries (some entries may be hidden)." -msgstr "" - -#: ../../Zotlabs/Module/Display.php:40 ../../Zotlabs/Module/Filestorage.php:33 -#: ../../Zotlabs/Module/Admin.php:164 ../../Zotlabs/Module/Admin.php:1255 -#: ../../Zotlabs/Module/Admin.php:1561 ../../Zotlabs/Module/Thing.php:89 -#: ../../Zotlabs/Module/Viewsrc.php:24 ../../include/items.php:3371 -msgid "Item not found." +"This process may take several minutes to complete. Please submit the form " +"only once and leave this page open until finished." msgstr "" -#: ../../Zotlabs/Module/Editblock.php:79 ../../Zotlabs/Module/Editblock.php:95 -#: ../../Zotlabs/Module/Editpost.php:24 ../../Zotlabs/Module/Editlayout.php:79 -#: ../../Zotlabs/Module/Editwebpage.php:81 -msgid "Item not found" +#: ../../Zotlabs/Module/Filer.php:52 +msgid "Save to Folder:" msgstr "" -#: ../../Zotlabs/Module/Editblock.php:124 ../../include/conversation.php:1243 -msgid "Title (optional)" +#: ../../Zotlabs/Module/Filer.php:52 +msgid "- select -" msgstr "" -#: ../../Zotlabs/Module/Editblock.php:133 -msgid "Edit Block" +#: ../../Zotlabs/Module/Filer.php:53 ../../Zotlabs/Module/Admin.php:2033 +#: ../../Zotlabs/Module/Admin.php:2053 ../../Zotlabs/Module/Rbmark.php:32 +#: ../../Zotlabs/Module/Rbmark.php:104 ../../include/text.php:922 +#: ../../include/text.php:934 ../../include/widgets.php:201 +msgid "Save" msgstr "" #: ../../Zotlabs/Module/Common.php:14 @@ -1081,6 +1021,12 @@ msgstr "" msgid "New" msgstr "" +#: ../../Zotlabs/Module/Connections.php:92 +#: ../../Zotlabs/Module/Connections.php:107 +#: ../../Zotlabs/Module/Connedit.php:600 ../../include/widgets.php:497 +msgid "All" +msgstr "" + #: ../../Zotlabs/Module/Connections.php:138 msgid "New Connections" msgstr "" @@ -1160,19 +1106,25 @@ msgstr "" msgid "Ignore connection" msgstr "" +#: ../../Zotlabs/Module/Connections.php:277 +#: ../../Zotlabs/Module/Notifications.php:55 +#: ../../Zotlabs/Module/Connedit.php:554 +msgid "Ignore" +msgstr "" + #: ../../Zotlabs/Module/Connections.php:278 msgid "Recent activity" msgstr "" #: ../../Zotlabs/Module/Connections.php:302 ../../Zotlabs/Lib/Apps.php:208 -#: ../../include/text.php:875 ../../include/nav.php:186 +#: ../../include/nav.php:186 ../../include/text.php:851 msgid "Connections" msgstr "" #: ../../Zotlabs/Module/Connections.php:306 ../../Zotlabs/Module/Search.php:44 -#: ../../Zotlabs/Lib/Apps.php:229 ../../include/text.php:945 -#: ../../include/text.php:957 ../../include/nav.php:165 -#: ../../include/acl_selectors.php:276 +#: ../../Zotlabs/Lib/Apps.php:229 ../../include/acl_selectors.php:276 +#: ../../include/nav.php:165 ../../include/text.php:921 +#: ../../include/text.php:933 msgid "Search" msgstr "" @@ -1185,7 +1137,7 @@ msgid "Connections search" msgstr "" #: ../../Zotlabs/Module/Cover_photo.php:58 -#: ../../Zotlabs/Module/Profile_photo.php:79 +#: ../../Zotlabs/Module/Profile_photo.php:61 msgid "Image uploaded but image cropping failed." msgstr "" @@ -1195,66 +1147,66 @@ msgid "Cover Photos" msgstr "" #: ../../Zotlabs/Module/Cover_photo.php:154 -#: ../../Zotlabs/Module/Profile_photo.php:133 +#: ../../Zotlabs/Module/Profile_photo.php:136 msgid "Image resize failed." msgstr "" #: ../../Zotlabs/Module/Cover_photo.php:168 -#: ../../Zotlabs/Module/Profile_photo.php:192 ../../include/photos.php:148 +#: ../../Zotlabs/Module/Profile_photo.php:195 ../../include/photos.php:148 msgid "Unable to process image" msgstr "" #: ../../Zotlabs/Module/Cover_photo.php:192 -#: ../../Zotlabs/Module/Profile_photo.php:217 +#: ../../Zotlabs/Module/Profile_photo.php:222 msgid "Image upload failed." msgstr "" #: ../../Zotlabs/Module/Cover_photo.php:210 -#: ../../Zotlabs/Module/Profile_photo.php:236 +#: ../../Zotlabs/Module/Profile_photo.php:241 msgid "Unable to process image." msgstr "" -#: ../../Zotlabs/Module/Cover_photo.php:233 ../../include/items.php:4298 +#: ../../Zotlabs/Module/Cover_photo.php:233 ../../include/items.php:4310 msgid "female" msgstr "" -#: ../../Zotlabs/Module/Cover_photo.php:234 ../../include/items.php:4299 +#: ../../Zotlabs/Module/Cover_photo.php:234 ../../include/items.php:4311 #, php-format msgid "%1$s updated her %2$s" msgstr "" -#: ../../Zotlabs/Module/Cover_photo.php:235 ../../include/items.php:4300 +#: ../../Zotlabs/Module/Cover_photo.php:235 ../../include/items.php:4312 msgid "male" msgstr "" -#: ../../Zotlabs/Module/Cover_photo.php:236 ../../include/items.php:4301 +#: ../../Zotlabs/Module/Cover_photo.php:236 ../../include/items.php:4313 #, php-format msgid "%1$s updated his %2$s" msgstr "" -#: ../../Zotlabs/Module/Cover_photo.php:238 ../../include/items.php:4303 +#: ../../Zotlabs/Module/Cover_photo.php:238 ../../include/items.php:4315 #, php-format msgid "%1$s updated their %2$s" msgstr "" -#: ../../Zotlabs/Module/Cover_photo.php:240 ../../include/channel.php:1642 +#: ../../Zotlabs/Module/Cover_photo.php:240 ../../include/channel.php:1650 msgid "cover photo" msgstr "" #: ../../Zotlabs/Module/Cover_photo.php:303 #: ../../Zotlabs/Module/Cover_photo.php:318 -#: ../../Zotlabs/Module/Profile_photo.php:283 -#: ../../Zotlabs/Module/Profile_photo.php:324 +#: ../../Zotlabs/Module/Profile_photo.php:299 +#: ../../Zotlabs/Module/Profile_photo.php:340 msgid "Photo not available." msgstr "" #: ../../Zotlabs/Module/Cover_photo.php:354 -#: ../../Zotlabs/Module/Profile_photo.php:365 +#: ../../Zotlabs/Module/Profile_photo.php:386 msgid "Upload File:" msgstr "" #: ../../Zotlabs/Module/Cover_photo.php:355 -#: ../../Zotlabs/Module/Profile_photo.php:366 +#: ../../Zotlabs/Module/Profile_photo.php:387 msgid "Select a profile:" msgstr "" @@ -1263,200 +1215,1082 @@ msgid "Upload Cover Photo" msgstr "" #: ../../Zotlabs/Module/Cover_photo.php:361 -#: ../../Zotlabs/Module/Profile_photo.php:374 +#: ../../Zotlabs/Module/Profile_photo.php:395 #: ../../Zotlabs/Module/Settings.php:985 msgid "or" msgstr "" #: ../../Zotlabs/Module/Cover_photo.php:361 -#: ../../Zotlabs/Module/Profile_photo.php:374 +#: ../../Zotlabs/Module/Profile_photo.php:395 msgid "skip this step" msgstr "" #: ../../Zotlabs/Module/Cover_photo.php:361 -#: ../../Zotlabs/Module/Profile_photo.php:374 +#: ../../Zotlabs/Module/Profile_photo.php:395 msgid "select a photo from your photo albums" msgstr "" #: ../../Zotlabs/Module/Cover_photo.php:377 -#: ../../Zotlabs/Module/Profile_photo.php:390 +#: ../../Zotlabs/Module/Profile_photo.php:414 msgid "Crop Image" msgstr "" #: ../../Zotlabs/Module/Cover_photo.php:378 -#: ../../Zotlabs/Module/Profile_photo.php:391 +#: ../../Zotlabs/Module/Profile_photo.php:415 msgid "Please adjust the image cropping for optimum viewing." msgstr "" #: ../../Zotlabs/Module/Cover_photo.php:380 -#: ../../Zotlabs/Module/Profile_photo.php:393 +#: ../../Zotlabs/Module/Profile_photo.php:417 msgid "Done Editing" msgstr "" -#: ../../Zotlabs/Module/Editpost.php:35 -msgid "Item is not editable" +#: ../../Zotlabs/Module/Follow.php:34 +msgid "Channel added." msgstr "" -#: ../../Zotlabs/Module/Editpost.php:106 ../../Zotlabs/Module/Rpost.php:135 -msgid "Edit post" +#: ../../Zotlabs/Module/Admin.php:77 +msgid "Theme settings updated." msgstr "" -#: ../../Zotlabs/Module/Events.php:26 -msgid "Calendar entries imported." +#: ../../Zotlabs/Module/Admin.php:164 ../../Zotlabs/Module/Admin.php:1255 +#: ../../Zotlabs/Module/Admin.php:1561 ../../Zotlabs/Module/Display.php:40 +#: ../../Zotlabs/Module/Filestorage.php:33 ../../Zotlabs/Module/Thing.php:89 +#: ../../Zotlabs/Module/Viewsrc.php:24 ../../include/items.php:3383 +msgid "Item not found." msgstr "" -#: ../../Zotlabs/Module/Events.php:28 -msgid "No calendar entries found." +#: ../../Zotlabs/Module/Admin.php:197 +msgid "# Accounts" msgstr "" -#: ../../Zotlabs/Module/Events.php:105 -msgid "Event can not end before it has started." +#: ../../Zotlabs/Module/Admin.php:198 +msgid "# blocked accounts" msgstr "" -#: ../../Zotlabs/Module/Events.php:107 ../../Zotlabs/Module/Events.php:116 -#: ../../Zotlabs/Module/Events.php:136 -msgid "Unable to generate preview." +#: ../../Zotlabs/Module/Admin.php:199 +msgid "# expired accounts" msgstr "" -#: ../../Zotlabs/Module/Events.php:114 -msgid "Event title and start time are required." +#: ../../Zotlabs/Module/Admin.php:200 +msgid "# expiring accounts" msgstr "" -#: ../../Zotlabs/Module/Events.php:134 ../../Zotlabs/Module/Events.php:259 -msgid "Event not found." +#: ../../Zotlabs/Module/Admin.php:211 +msgid "# Channels" msgstr "" -#: ../../Zotlabs/Module/Events.php:254 ../../Zotlabs/Module/Like.php:373 -#: ../../Zotlabs/Module/Tagger.php:51 ../../include/text.php:1944 -#: ../../include/event.php:949 ../../include/conversation.php:123 -msgid "event" +#: ../../Zotlabs/Module/Admin.php:212 +msgid "# primary" msgstr "" -#: ../../Zotlabs/Module/Events.php:449 -msgid "Edit event title" +#: ../../Zotlabs/Module/Admin.php:213 +msgid "# clones" msgstr "" -#: ../../Zotlabs/Module/Events.php:449 -msgid "Event title" +#: ../../Zotlabs/Module/Admin.php:219 +msgid "Message queues" msgstr "" -#: ../../Zotlabs/Module/Events.php:449 ../../Zotlabs/Module/Events.php:454 -#: ../../Zotlabs/Module/Profiles.php:709 ../../Zotlabs/Module/Profiles.php:713 -#: ../../Zotlabs/Module/Appman.php:115 ../../Zotlabs/Module/Appman.php:116 -#: ../../include/datetime.php:245 -msgid "Required" +#: ../../Zotlabs/Module/Admin.php:236 +msgid "Your software should be updated" msgstr "" -#: ../../Zotlabs/Module/Events.php:451 -msgid "Categories (comma-separated list)" +#: ../../Zotlabs/Module/Admin.php:241 ../../Zotlabs/Module/Admin.php:490 +#: ../../Zotlabs/Module/Admin.php:711 ../../Zotlabs/Module/Admin.php:755 +#: ../../Zotlabs/Module/Admin.php:1030 ../../Zotlabs/Module/Admin.php:1209 +#: ../../Zotlabs/Module/Admin.php:1329 ../../Zotlabs/Module/Admin.php:1419 +#: ../../Zotlabs/Module/Admin.php:1612 ../../Zotlabs/Module/Admin.php:1646 +#: ../../Zotlabs/Module/Admin.php:1731 +msgid "Administration" msgstr "" -#: ../../Zotlabs/Module/Events.php:452 -msgid "Edit Category" +#: ../../Zotlabs/Module/Admin.php:242 +msgid "Summary" msgstr "" -#: ../../Zotlabs/Module/Events.php:452 -msgid "Category" +#: ../../Zotlabs/Module/Admin.php:245 +msgid "Registered accounts" msgstr "" -#: ../../Zotlabs/Module/Events.php:455 -msgid "Edit start date and time" +#: ../../Zotlabs/Module/Admin.php:246 ../../Zotlabs/Module/Admin.php:715 +msgid "Pending registrations" msgstr "" -#: ../../Zotlabs/Module/Events.php:455 -msgid "Start date and time" +#: ../../Zotlabs/Module/Admin.php:247 +msgid "Registered channels" msgstr "" -#: ../../Zotlabs/Module/Events.php:456 ../../Zotlabs/Module/Events.php:459 -msgid "Finish date and time are not known or not relevant" +#: ../../Zotlabs/Module/Admin.php:248 ../../Zotlabs/Module/Admin.php:716 +msgid "Active plugins" msgstr "" -#: ../../Zotlabs/Module/Events.php:458 -msgid "Edit finish date and time" +#: ../../Zotlabs/Module/Admin.php:249 +msgid "Version" msgstr "" -#: ../../Zotlabs/Module/Events.php:458 -msgid "Finish date and time" +#: ../../Zotlabs/Module/Admin.php:250 +msgid "Repository version (master)" msgstr "" -#: ../../Zotlabs/Module/Events.php:460 ../../Zotlabs/Module/Events.php:461 -msgid "Adjust for viewer timezone" +#: ../../Zotlabs/Module/Admin.php:251 +msgid "Repository version (dev)" msgstr "" -#: ../../Zotlabs/Module/Events.php:460 +#: ../../Zotlabs/Module/Admin.php:373 +msgid "Site settings updated." +msgstr "" + +#: ../../Zotlabs/Module/Admin.php:400 ../../include/text.php:2821 +msgid "Default" +msgstr "" + +#: ../../Zotlabs/Module/Admin.php:410 ../../Zotlabs/Module/Settings.php:798 +msgid "mobile" +msgstr "" + +#: ../../Zotlabs/Module/Admin.php:412 +msgid "experimental" +msgstr "" + +#: ../../Zotlabs/Module/Admin.php:414 +msgid "unsupported" +msgstr "" + +#: ../../Zotlabs/Module/Admin.php:460 +msgid "Yes - with approval" +msgstr "" + +#: ../../Zotlabs/Module/Admin.php:466 +msgid "My site is not a public server" +msgstr "" + +#: ../../Zotlabs/Module/Admin.php:467 +msgid "My site has paid access only" +msgstr "" + +#: ../../Zotlabs/Module/Admin.php:468 +msgid "My site has free access only" +msgstr "" + +#: ../../Zotlabs/Module/Admin.php:469 +msgid "My site offers free accounts with optional paid upgrades" +msgstr "" + +#: ../../Zotlabs/Module/Admin.php:491 ../../include/widgets.php:1455 +msgid "Site" +msgstr "" + +#: ../../Zotlabs/Module/Admin.php:493 ../../Zotlabs/Module/Register.php:245 +msgid "Registration" +msgstr "" + +#: ../../Zotlabs/Module/Admin.php:494 +msgid "File upload" +msgstr "" + +#: ../../Zotlabs/Module/Admin.php:495 +msgid "Policies" +msgstr "" + +#: ../../Zotlabs/Module/Admin.php:496 ../../include/contact_widgets.php:16 +msgid "Advanced" +msgstr "" + +#: ../../Zotlabs/Module/Admin.php:500 +msgid "Site name" +msgstr "" + +#: ../../Zotlabs/Module/Admin.php:501 +msgid "Banner/Logo" +msgstr "" + +#: ../../Zotlabs/Module/Admin.php:502 +msgid "Administrator Information" +msgstr "" + +#: ../../Zotlabs/Module/Admin.php:502 msgid "" -"Important for events that happen in a particular place. Not practical for " -"global holidays." +"Contact information for site administrators. Displayed on siteinfo page. " +"BBCode can be used here" msgstr "" -#: ../../Zotlabs/Module/Events.php:462 -msgid "Edit Description" +#: ../../Zotlabs/Module/Admin.php:503 +msgid "System language" msgstr "" -#: ../../Zotlabs/Module/Events.php:462 ../../Zotlabs/Module/Appman.php:117 -#: ../../Zotlabs/Module/Rbmark.php:101 -msgid "Description" +#: ../../Zotlabs/Module/Admin.php:504 +msgid "System theme" msgstr "" -#: ../../Zotlabs/Module/Events.php:464 -msgid "Edit Location" +#: ../../Zotlabs/Module/Admin.php:504 +msgid "" +"Default system theme - may be over-ridden by user profiles - <a href='#' " +"id='cnftheme'>change theme settings</a>" msgstr "" -#: ../../Zotlabs/Module/Events.php:464 ../../Zotlabs/Module/Locs.php:117 -#: ../../Zotlabs/Module/Profiles.php:477 ../../Zotlabs/Module/Profiles.php:698 -#: ../../Zotlabs/Module/Pubsites.php:41 ../../include/js_strings.php:25 -msgid "Location" +#: ../../Zotlabs/Module/Admin.php:505 +msgid "Mobile system theme" msgstr "" -#: ../../Zotlabs/Module/Events.php:467 ../../Zotlabs/Module/Events.php:469 -msgid "Share this event" +#: ../../Zotlabs/Module/Admin.php:505 +msgid "Theme for mobile devices" msgstr "" -#: ../../Zotlabs/Module/Events.php:470 ../../Zotlabs/Module/Photos.php:1093 -#: ../../Zotlabs/Module/Webpages.php:202 ../../Zotlabs/Lib/ThreadItem.php:719 -#: ../../include/conversation.php:1198 ../../include/page_widgets.php:43 -msgid "Preview" +#: ../../Zotlabs/Module/Admin.php:507 +msgid "Allow Feeds as Connections" msgstr "" -#: ../../Zotlabs/Module/Events.php:471 ../../include/conversation.php:1247 -msgid "Permission settings" +#: ../../Zotlabs/Module/Admin.php:507 +msgid "(Heavy system resource usage)" msgstr "" -#: ../../Zotlabs/Module/Events.php:476 -msgid "Advanced Options" +#: ../../Zotlabs/Module/Admin.php:508 +msgid "Maximum image size" msgstr "" -#: ../../Zotlabs/Module/Events.php:610 -msgid "Edit event" +#: ../../Zotlabs/Module/Admin.php:508 +msgid "" +"Maximum size in bytes of uploaded images. Default is 0, which means no " +"limits." msgstr "" -#: ../../Zotlabs/Module/Events.php:612 -msgid "Delete event" +#: ../../Zotlabs/Module/Admin.php:509 +msgid "Does this site allow new member registration?" msgstr "" -#: ../../Zotlabs/Module/Events.php:646 -msgid "calendar" +#: ../../Zotlabs/Module/Admin.php:510 +msgid "Invitation only" msgstr "" -#: ../../Zotlabs/Module/Events.php:706 -msgid "Event removed" +#: ../../Zotlabs/Module/Admin.php:510 +msgid "" +"Only allow new member registrations with an invitation code. Above register " +"policy must be set to Yes." msgstr "" -#: ../../Zotlabs/Module/Events.php:709 -msgid "Failed to remove event" +#: ../../Zotlabs/Module/Admin.php:511 +msgid "Which best describes the types of account offered by this hub?" msgstr "" -#: ../../Zotlabs/Module/Fbrowser.php:29 ../../Zotlabs/Lib/Apps.php:221 -#: ../../include/conversation.php:1647 ../../include/nav.php:92 -msgid "Photos" +#: ../../Zotlabs/Module/Admin.php:512 +msgid "Register text" msgstr "" -#: ../../Zotlabs/Module/Fbrowser.php:66 ../../Zotlabs/Module/Fbrowser.php:88 -#: ../../Zotlabs/Module/Admin.php:1406 ../../Zotlabs/Module/Settings.php:591 -#: ../../Zotlabs/Module/Settings.php:617 ../../Zotlabs/Module/Tagrm.php:15 -#: ../../Zotlabs/Module/Tagrm.php:138 ../../include/conversation.php:1235 -#: ../../include/conversation.php:1274 -msgid "Cancel" +#: ../../Zotlabs/Module/Admin.php:512 +msgid "Will be displayed prominently on the registration page." +msgstr "" + +#: ../../Zotlabs/Module/Admin.php:513 +msgid "Site homepage to show visitors (default: login box)" +msgstr "" + +#: ../../Zotlabs/Module/Admin.php:513 +msgid "" +"example: 'public' to show public stream, 'page/sys/home' to show a system " +"webpage called 'home' or 'include:home.html' to include a file." +msgstr "" + +#: ../../Zotlabs/Module/Admin.php:514 +msgid "Preserve site homepage URL" +msgstr "" + +#: ../../Zotlabs/Module/Admin.php:514 +msgid "" +"Present the site homepage in a frame at the original location instead of " +"redirecting" +msgstr "" + +#: ../../Zotlabs/Module/Admin.php:515 +msgid "Accounts abandoned after x days" +msgstr "" + +#: ../../Zotlabs/Module/Admin.php:515 +msgid "" +"Will not waste system resources polling external sites for abandonded " +"accounts. Enter 0 for no time limit." +msgstr "" + +#: ../../Zotlabs/Module/Admin.php:516 +msgid "Allowed friend domains" +msgstr "" + +#: ../../Zotlabs/Module/Admin.php:516 +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.php:517 +msgid "Allowed email domains" +msgstr "" + +#: ../../Zotlabs/Module/Admin.php:517 +msgid "" +"Comma separated list of domains which are allowed in email addresses for " +"registrations to this site. Wildcards are accepted. Empty to allow any " +"domains" +msgstr "" + +#: ../../Zotlabs/Module/Admin.php:518 +msgid "Not allowed email domains" +msgstr "" + +#: ../../Zotlabs/Module/Admin.php:518 +msgid "" +"Comma separated list of domains which are not allowed in email addresses for " +"registrations to this site. Wildcards are accepted. Empty to allow any " +"domains, unless allowed domains have been defined." +msgstr "" + +#: ../../Zotlabs/Module/Admin.php:519 +msgid "Verify Email Addresses" +msgstr "" + +#: ../../Zotlabs/Module/Admin.php:519 +msgid "" +"Check to verify email addresses used in account registration (recommended)." +msgstr "" + +#: ../../Zotlabs/Module/Admin.php:520 +msgid "Force publish" +msgstr "" + +#: ../../Zotlabs/Module/Admin.php:520 +msgid "" +"Check to force all profiles on this site to be listed in the site directory." +msgstr "" + +#: ../../Zotlabs/Module/Admin.php:521 +msgid "Import Public Streams" +msgstr "" + +#: ../../Zotlabs/Module/Admin.php:521 +msgid "" +"Import and allow access to public content pulled from other sites. Warning: " +"this content is unmoderated." +msgstr "" + +#: ../../Zotlabs/Module/Admin.php:522 +msgid "Login on Homepage" +msgstr "" + +#: ../../Zotlabs/Module/Admin.php:522 +msgid "" +"Present a login box to visitors on the home page if no other content has " +"been configured." +msgstr "" + +#: ../../Zotlabs/Module/Admin.php:523 +msgid "Enable context help" +msgstr "" + +#: ../../Zotlabs/Module/Admin.php:523 +msgid "" +"Display contextual help for the current page when the help button is pressed." +msgstr "" + +#: ../../Zotlabs/Module/Admin.php:525 +msgid "Directory Server URL" +msgstr "" + +#: ../../Zotlabs/Module/Admin.php:525 +msgid "Default directory server" +msgstr "" + +#: ../../Zotlabs/Module/Admin.php:527 +msgid "Proxy user" +msgstr "" + +#: ../../Zotlabs/Module/Admin.php:528 +msgid "Proxy URL" +msgstr "" + +#: ../../Zotlabs/Module/Admin.php:529 +msgid "Network timeout" +msgstr "" + +#: ../../Zotlabs/Module/Admin.php:529 +msgid "Value is in seconds. Set to 0 for unlimited (not recommended)." +msgstr "" + +#: ../../Zotlabs/Module/Admin.php:530 +msgid "Delivery interval" +msgstr "" + +#: ../../Zotlabs/Module/Admin.php:530 +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.php:531 +msgid "Deliveries per process" +msgstr "" + +#: ../../Zotlabs/Module/Admin.php:531 +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.php:532 +msgid "Poll interval" +msgstr "" + +#: ../../Zotlabs/Module/Admin.php:532 +msgid "" +"Delay background polling processes by this many seconds to reduce system " +"load. If 0, use delivery interval." +msgstr "" + +#: ../../Zotlabs/Module/Admin.php:533 +msgid "Maximum Load Average" +msgstr "" + +#: ../../Zotlabs/Module/Admin.php:533 +msgid "" +"Maximum system load before delivery and poll processes are deferred - " +"default 50." +msgstr "" + +#: ../../Zotlabs/Module/Admin.php:534 +msgid "Expiration period in days for imported (grid/network) content" +msgstr "" + +#: ../../Zotlabs/Module/Admin.php:534 +msgid "0 for no expiration of imported content" +msgstr "" + +#: ../../Zotlabs/Module/Admin.php:677 ../../Zotlabs/Module/Admin.php:678 +#: ../../Zotlabs/Module/Settings.php:722 +msgid "Off" +msgstr "" + +#: ../../Zotlabs/Module/Admin.php:677 ../../Zotlabs/Module/Admin.php:678 +#: ../../Zotlabs/Module/Settings.php:722 +msgid "On" +msgstr "" + +#: ../../Zotlabs/Module/Admin.php:678 +#, php-format +msgid "Lock feature %s" +msgstr "" + +#: ../../Zotlabs/Module/Admin.php:686 +msgid "Manage Additional Features" +msgstr "" + +#: ../../Zotlabs/Module/Admin.php:703 +msgid "No server found" +msgstr "" + +#: ../../Zotlabs/Module/Admin.php:710 ../../Zotlabs/Module/Admin.php:1046 +msgid "ID" +msgstr "" + +#: ../../Zotlabs/Module/Admin.php:710 +msgid "for channel" +msgstr "" + +#: ../../Zotlabs/Module/Admin.php:710 +msgid "on server" +msgstr "" + +#: ../../Zotlabs/Module/Admin.php:712 +msgid "Server" +msgstr "" + +#: ../../Zotlabs/Module/Admin.php:746 +msgid "" +"By default, unfiltered HTML is allowed in embedded media. This is inherently " +"insecure." +msgstr "" + +#: ../../Zotlabs/Module/Admin.php:749 +msgid "" +"The recommended setting is to only allow unfiltered HTML from the following " +"sites:" +msgstr "" + +#: ../../Zotlabs/Module/Admin.php:750 +msgid "" +"https://youtube.com/<br />https://www.youtube.com/<br />https://youtu.be/" +"<br />https://vimeo.com/<br />https://soundcloud.com/<br />" +msgstr "" + +#: ../../Zotlabs/Module/Admin.php:751 +msgid "" +"All other embedded content will be filtered, <strong>unless</strong> " +"embedded content from that site is explicitly blocked." +msgstr "" + +#: ../../Zotlabs/Module/Admin.php:756 ../../include/widgets.php:1458 +msgid "Security" +msgstr "" + +#: ../../Zotlabs/Module/Admin.php:758 +msgid "Block public" +msgstr "" + +#: ../../Zotlabs/Module/Admin.php:758 +msgid "" +"Check to block public access to all otherwise public personal pages on this " +"site unless you are currently authenticated." +msgstr "" + +#: ../../Zotlabs/Module/Admin.php:759 +msgid "Set \"Transport Security\" HTTP header" +msgstr "" + +#: ../../Zotlabs/Module/Admin.php:760 +msgid "Set \"Content Security Policy\" HTTP header" +msgstr "" + +#: ../../Zotlabs/Module/Admin.php:761 +msgid "Allow communications only from these sites" +msgstr "" + +#: ../../Zotlabs/Module/Admin.php:761 +msgid "" +"One site per line. Leave empty to allow communication from anywhere by " +"default" +msgstr "" + +#: ../../Zotlabs/Module/Admin.php:762 +msgid "Block communications from these sites" +msgstr "" + +#: ../../Zotlabs/Module/Admin.php:763 +msgid "Allow communications only from these channels" +msgstr "" + +#: ../../Zotlabs/Module/Admin.php:763 +msgid "" +"One channel (hash) per line. Leave empty to allow from any channel by default" +msgstr "" + +#: ../../Zotlabs/Module/Admin.php:764 +msgid "Block communications from these channels" +msgstr "" + +#: ../../Zotlabs/Module/Admin.php:765 +msgid "Only allow embeds from secure (SSL) websites and links." +msgstr "" + +#: ../../Zotlabs/Module/Admin.php:766 +msgid "Allow unfiltered embedded HTML content only from these domains" +msgstr "" + +#: ../../Zotlabs/Module/Admin.php:766 +msgid "One site per line. By default embedded content is filtered." +msgstr "" + +#: ../../Zotlabs/Module/Admin.php:767 +msgid "Block embedded HTML from these domains" +msgstr "" + +#: ../../Zotlabs/Module/Admin.php:785 +msgid "Update has been marked successful" +msgstr "" + +#: ../../Zotlabs/Module/Admin.php:795 +#, php-format +msgid "Executing %s failed. Check system logs." +msgstr "" + +#: ../../Zotlabs/Module/Admin.php:798 +#, php-format +msgid "Update %s was successfully applied." +msgstr "" + +#: ../../Zotlabs/Module/Admin.php:802 +#, php-format +msgid "Update %s did not return a status. Unknown if it succeeded." +msgstr "" + +#: ../../Zotlabs/Module/Admin.php:805 +#, php-format +msgid "Update function %s could not be found." +msgstr "" + +#: ../../Zotlabs/Module/Admin.php:821 +msgid "No failed updates." +msgstr "" + +#: ../../Zotlabs/Module/Admin.php:825 +msgid "Failed Updates" +msgstr "" + +#: ../../Zotlabs/Module/Admin.php:827 +msgid "Mark success (if update was manually applied)" +msgstr "" + +#: ../../Zotlabs/Module/Admin.php:828 +msgid "Attempt to execute this update step automatically" +msgstr "" + +#: ../../Zotlabs/Module/Admin.php:859 +msgid "Queue Statistics" +msgstr "" + +#: ../../Zotlabs/Module/Admin.php:860 +msgid "Total Entries" +msgstr "" + +#: ../../Zotlabs/Module/Admin.php:861 +msgid "Priority" +msgstr "" + +#: ../../Zotlabs/Module/Admin.php:862 +msgid "Destination URL" +msgstr "" + +#: ../../Zotlabs/Module/Admin.php:863 +msgid "Mark hub permanently offline" +msgstr "" + +#: ../../Zotlabs/Module/Admin.php:864 +msgid "Empty queue for this hub" +msgstr "" + +#: ../../Zotlabs/Module/Admin.php:865 +msgid "Last known contact" +msgstr "" + +#: ../../Zotlabs/Module/Admin.php:901 +#, php-format +msgid "%s account blocked/unblocked" +msgid_plural "%s account blocked/unblocked" +msgstr[0] "" +msgstr[1] "" + +#: ../../Zotlabs/Module/Admin.php:908 +#, php-format +msgid "%s account deleted" +msgid_plural "%s accounts deleted" +msgstr[0] "" +msgstr[1] "" + +#: ../../Zotlabs/Module/Admin.php:944 +msgid "Account not found" +msgstr "" + +#: ../../Zotlabs/Module/Admin.php:955 +#, php-format +msgid "Account '%s' deleted" +msgstr "" + +#: ../../Zotlabs/Module/Admin.php:963 +#, php-format +msgid "Account '%s' blocked" +msgstr "" + +#: ../../Zotlabs/Module/Admin.php:971 +#, php-format +msgid "Account '%s' unblocked" +msgstr "" + +#: ../../Zotlabs/Module/Admin.php:1031 ../../Zotlabs/Module/Admin.php:1044 +#: ../../include/widgets.php:1456 +msgid "Accounts" +msgstr "" + +#: ../../Zotlabs/Module/Admin.php:1033 ../../Zotlabs/Module/Admin.php:1212 +msgid "select all" +msgstr "" + +#: ../../Zotlabs/Module/Admin.php:1034 +msgid "Registrations waiting for confirm" +msgstr "" + +#: ../../Zotlabs/Module/Admin.php:1035 +msgid "Request date" +msgstr "" + +#: ../../Zotlabs/Module/Admin.php:1035 ../../Zotlabs/Module/Admin.php:1047 +#: ../../Zotlabs/Module/Id.php:17 ../../Zotlabs/Module/Id.php:18 +#: ../../include/network.php:2184 ../../boot.php:1706 +msgid "Email" +msgstr "" + +#: ../../Zotlabs/Module/Admin.php:1036 +msgid "No registrations." +msgstr "" + +#: ../../Zotlabs/Module/Admin.php:1038 +msgid "Deny" +msgstr "" + +#: ../../Zotlabs/Module/Admin.php:1040 ../../Zotlabs/Module/Connedit.php:546 +msgid "Block" +msgstr "" + +#: ../../Zotlabs/Module/Admin.php:1041 ../../Zotlabs/Module/Connedit.php:546 +msgid "Unblock" +msgstr "" + +#: ../../Zotlabs/Module/Admin.php:1048 ../../include/group.php:267 +msgid "All Channels" +msgstr "" + +#: ../../Zotlabs/Module/Admin.php:1049 +msgid "Register date" +msgstr "" + +#: ../../Zotlabs/Module/Admin.php:1050 +msgid "Last login" +msgstr "" + +#: ../../Zotlabs/Module/Admin.php:1051 +msgid "Expires" +msgstr "" + +#: ../../Zotlabs/Module/Admin.php:1052 +msgid "Service Class" +msgstr "" + +#: ../../Zotlabs/Module/Admin.php:1054 +msgid "" +"Selected accounts will be deleted!\\n\\nEverything these accounts had posted " +"on this site will be permanently deleted!\\n\\nAre you sure?" +msgstr "" + +#: ../../Zotlabs/Module/Admin.php:1055 +msgid "" +"The account {0} will be deleted!\\n\\nEverything this account has posted on " +"this site will be permanently deleted!\\n\\nAre you sure?" +msgstr "" + +#: ../../Zotlabs/Module/Admin.php:1091 +#, php-format +msgid "%s channel censored/uncensored" +msgid_plural "%s channels censored/uncensored" +msgstr[0] "" +msgstr[1] "" + +#: ../../Zotlabs/Module/Admin.php:1100 +#, php-format +msgid "%s channel code allowed/disallowed" +msgid_plural "%s channels code allowed/disallowed" +msgstr[0] "" +msgstr[1] "" + +#: ../../Zotlabs/Module/Admin.php:1106 +#, php-format +msgid "%s channel deleted" +msgid_plural "%s channels deleted" +msgstr[0] "" +msgstr[1] "" + +#: ../../Zotlabs/Module/Admin.php:1126 +msgid "Channel not found" +msgstr "" + +#: ../../Zotlabs/Module/Admin.php:1136 +#, php-format +msgid "Channel '%s' deleted" +msgstr "" + +#: ../../Zotlabs/Module/Admin.php:1148 +#, php-format +msgid "Channel '%s' censored" +msgstr "" + +#: ../../Zotlabs/Module/Admin.php:1148 +#, php-format +msgid "Channel '%s' uncensored" +msgstr "" + +#: ../../Zotlabs/Module/Admin.php:1159 +#, php-format +msgid "Channel '%s' code allowed" +msgstr "" + +#: ../../Zotlabs/Module/Admin.php:1159 +#, php-format +msgid "Channel '%s' code disallowed" +msgstr "" + +#: ../../Zotlabs/Module/Admin.php:1210 ../../include/widgets.php:1457 +msgid "Channels" +msgstr "" + +#: ../../Zotlabs/Module/Admin.php:1214 +msgid "Censor" +msgstr "" + +#: ../../Zotlabs/Module/Admin.php:1215 +msgid "Uncensor" +msgstr "" + +#: ../../Zotlabs/Module/Admin.php:1216 +msgid "Allow Code" +msgstr "" + +#: ../../Zotlabs/Module/Admin.php:1217 +msgid "Disallow Code" +msgstr "" + +#: ../../Zotlabs/Module/Admin.php:1218 ../../include/conversation.php:1626 +msgid "Channel" +msgstr "" + +#: ../../Zotlabs/Module/Admin.php:1222 +msgid "UID" +msgstr "" + +#: ../../Zotlabs/Module/Admin.php:1224 ../../Zotlabs/Module/Locs.php:118 +#: ../../Zotlabs/Module/Profiles.php:470 +msgid "Address" +msgstr "" + +#: ../../Zotlabs/Module/Admin.php:1226 +msgid "" +"Selected channels will be deleted!\\n\\nEverything that was posted in these " +"channels on this site will be permanently deleted!\\n\\nAre you sure?" +msgstr "" + +#: ../../Zotlabs/Module/Admin.php:1227 +msgid "" +"The channel {0} will be deleted!\\n\\nEverything that was posted in this " +"channel on this site will be permanently deleted!\\n\\nAre you sure?" +msgstr "" + +#: ../../Zotlabs/Module/Admin.php:1284 +#, php-format +msgid "Plugin %s disabled." +msgstr "" + +#: ../../Zotlabs/Module/Admin.php:1288 +#, php-format +msgid "Plugin %s enabled." +msgstr "" + +#: ../../Zotlabs/Module/Admin.php:1298 ../../Zotlabs/Module/Admin.php:1585 +msgid "Disable" +msgstr "" + +#: ../../Zotlabs/Module/Admin.php:1301 ../../Zotlabs/Module/Admin.php:1587 +msgid "Enable" +msgstr "" + +#: ../../Zotlabs/Module/Admin.php:1330 ../../Zotlabs/Module/Admin.php:1420 +#: ../../include/widgets.php:1460 +msgid "Plugins" +msgstr "" + +#: ../../Zotlabs/Module/Admin.php:1331 ../../Zotlabs/Module/Admin.php:1614 +msgid "Toggle" +msgstr "" + +#: ../../Zotlabs/Module/Admin.php:1332 ../../Zotlabs/Module/Admin.php:1615 +#: ../../Zotlabs/Lib/Apps.php:215 ../../include/nav.php:208 +#: ../../include/widgets.php:638 +msgid "Settings" +msgstr "" + +#: ../../Zotlabs/Module/Admin.php:1339 ../../Zotlabs/Module/Admin.php:1624 +msgid "Author: " +msgstr "" + +#: ../../Zotlabs/Module/Admin.php:1340 ../../Zotlabs/Module/Admin.php:1625 +msgid "Maintainer: " +msgstr "" + +#: ../../Zotlabs/Module/Admin.php:1341 +msgid "Minimum project version: " +msgstr "" + +#: ../../Zotlabs/Module/Admin.php:1342 +msgid "Maximum project version: " +msgstr "" + +#: ../../Zotlabs/Module/Admin.php:1343 +msgid "Minimum PHP version: " +msgstr "" + +#: ../../Zotlabs/Module/Admin.php:1344 +msgid "Requires: " +msgstr "" + +#: ../../Zotlabs/Module/Admin.php:1345 ../../Zotlabs/Module/Admin.php:1425 +msgid "Disabled - version incompatibility" +msgstr "" + +#: ../../Zotlabs/Module/Admin.php:1394 +msgid "Enter the public git repository URL of the plugin repo." +msgstr "" + +#: ../../Zotlabs/Module/Admin.php:1395 +msgid "Plugin repo git URL" +msgstr "" + +#: ../../Zotlabs/Module/Admin.php:1396 +msgid "Custom repo name" +msgstr "" + +#: ../../Zotlabs/Module/Admin.php:1396 +msgid "(optional)" +msgstr "" + +#: ../../Zotlabs/Module/Admin.php:1397 +msgid "Download Plugin Repo" +msgstr "" + +#: ../../Zotlabs/Module/Admin.php:1404 +msgid "Install new repo" +msgstr "" + +#: ../../Zotlabs/Module/Admin.php:1405 ../../Zotlabs/Lib/Apps.php:333 +msgid "Install" +msgstr "" + +#: ../../Zotlabs/Module/Admin.php:1427 +msgid "Manage Repos" +msgstr "" + +#: ../../Zotlabs/Module/Admin.php:1428 +msgid "Installed Plugin Repositories" +msgstr "" + +#: ../../Zotlabs/Module/Admin.php:1429 +msgid "Install a New Plugin Repository" +msgstr "" + +#: ../../Zotlabs/Module/Admin.php:1435 ../../Zotlabs/Module/Settings.php:77 +#: ../../Zotlabs/Module/Settings.php:616 ../../Zotlabs/Lib/Apps.php:333 +msgid "Update" +msgstr "" + +#: ../../Zotlabs/Module/Admin.php:1436 +msgid "Switch branch" +msgstr "" + +#: ../../Zotlabs/Module/Admin.php:1437 ../../Zotlabs/Module/Photos.php:998 +#: ../../Zotlabs/Module/Tagrm.php:137 +msgid "Remove" +msgstr "" + +#: ../../Zotlabs/Module/Admin.php:1550 +msgid "No themes found." +msgstr "" + +#: ../../Zotlabs/Module/Admin.php:1606 +msgid "Screenshot" +msgstr "" + +#: ../../Zotlabs/Module/Admin.php:1613 ../../Zotlabs/Module/Admin.php:1647 +#: ../../include/widgets.php:1461 +msgid "Themes" +msgstr "" + +#: ../../Zotlabs/Module/Admin.php:1652 +msgid "[Experimental]" +msgstr "" + +#: ../../Zotlabs/Module/Admin.php:1653 +msgid "[Unsupported]" +msgstr "" + +#: ../../Zotlabs/Module/Admin.php:1677 +msgid "Log settings updated." +msgstr "" + +#: ../../Zotlabs/Module/Admin.php:1732 ../../include/widgets.php:1482 +#: ../../include/widgets.php:1492 +msgid "Logs" +msgstr "" + +#: ../../Zotlabs/Module/Admin.php:1734 +msgid "Clear" +msgstr "" + +#: ../../Zotlabs/Module/Admin.php:1740 +msgid "Debugging" +msgstr "" + +#: ../../Zotlabs/Module/Admin.php:1741 +msgid "Log file" +msgstr "" + +#: ../../Zotlabs/Module/Admin.php:1741 +msgid "" +"Must be writable by web server. Relative to your top-level webserver " +"directory." +msgstr "" + +#: ../../Zotlabs/Module/Admin.php:1742 +msgid "Log level" +msgstr "" + +#: ../../Zotlabs/Module/Admin.php:2028 +msgid "New Profile Field" +msgstr "" + +#: ../../Zotlabs/Module/Admin.php:2029 ../../Zotlabs/Module/Admin.php:2049 +msgid "Field nickname" +msgstr "" + +#: ../../Zotlabs/Module/Admin.php:2029 ../../Zotlabs/Module/Admin.php:2049 +msgid "System name of field" +msgstr "" + +#: ../../Zotlabs/Module/Admin.php:2030 ../../Zotlabs/Module/Admin.php:2050 +msgid "Input type" +msgstr "" + +#: ../../Zotlabs/Module/Admin.php:2031 ../../Zotlabs/Module/Admin.php:2051 +msgid "Field Name" +msgstr "" + +#: ../../Zotlabs/Module/Admin.php:2031 ../../Zotlabs/Module/Admin.php:2051 +msgid "Label on profile pages" +msgstr "" + +#: ../../Zotlabs/Module/Admin.php:2032 ../../Zotlabs/Module/Admin.php:2052 +msgid "Help text" +msgstr "" + +#: ../../Zotlabs/Module/Admin.php:2032 ../../Zotlabs/Module/Admin.php:2052 +msgid "Additional info (optional)" +msgstr "" + +#: ../../Zotlabs/Module/Admin.php:2042 +msgid "Field definition not found" +msgstr "" + +#: ../../Zotlabs/Module/Admin.php:2048 +msgid "Edit Profile Field" +msgstr "" + +#: ../../Zotlabs/Module/Admin.php:2106 ../../include/widgets.php:1463 +msgid "Profile Fields" +msgstr "" + +#: ../../Zotlabs/Module/Admin.php:2107 +msgid "Basic Profile Fields" +msgstr "" + +#: ../../Zotlabs/Module/Admin.php:2108 +msgid "Advanced Profile Fields" +msgstr "" + +#: ../../Zotlabs/Module/Admin.php:2108 +msgid "(In addition to basic fields)" +msgstr "" + +#: ../../Zotlabs/Module/Admin.php:2110 +msgid "All available fields" +msgstr "" + +#: ../../Zotlabs/Module/Admin.php:2111 +msgid "Custom Fields" +msgstr "" + +#: ../../Zotlabs/Module/Admin.php:2115 +msgid "Create Custom Field" msgstr "" #: ../../Zotlabs/Module/Dirsearch.php:25 ../../Zotlabs/Module/Regdir.php:49 @@ -1467,19 +2301,36 @@ msgstr "" msgid "This directory server requires an access token" msgstr "" -#: ../../Zotlabs/Module/Filer.php:52 -msgid "Save to Folder:" +#: ../../Zotlabs/Module/Blocks.php:154 ../../include/text.php:2242 +msgid "Blocks" msgstr "" -#: ../../Zotlabs/Module/Filer.php:52 -msgid "- select -" +#: ../../Zotlabs/Module/Blocks.php:156 +msgid "Block Title" msgstr "" -#: ../../Zotlabs/Module/Filer.php:53 ../../Zotlabs/Module/Admin.php:2033 -#: ../../Zotlabs/Module/Admin.php:2053 ../../Zotlabs/Module/Rbmark.php:32 -#: ../../Zotlabs/Module/Rbmark.php:104 ../../include/text.php:946 -#: ../../include/text.php:958 ../../include/widgets.php:201 -msgid "Save" +#: ../../Zotlabs/Module/Blocks.php:157 ../../Zotlabs/Module/Layouts.php:190 +#: ../../Zotlabs/Module/Webpages.php:206 ../../Zotlabs/Module/Menu.php:114 +#: ../../include/page_widgets.php:47 +msgid "Created" +msgstr "" + +#: ../../Zotlabs/Module/Blocks.php:158 ../../Zotlabs/Module/Layouts.php:191 +#: ../../Zotlabs/Module/Webpages.php:207 ../../Zotlabs/Module/Menu.php:115 +#: ../../include/page_widgets.php:48 +msgid "Edited" +msgstr "" + +#: ../../Zotlabs/Module/Blocks.php:161 ../../Zotlabs/Module/Layouts.php:193 +#: ../../Zotlabs/Module/Webpages.php:196 ../../Zotlabs/Module/Photos.php:1072 +#: ../../include/conversation.php:1219 +msgid "Share" +msgstr "" + +#: ../../Zotlabs/Module/Blocks.php:166 ../../Zotlabs/Module/Layouts.php:197 +#: ../../Zotlabs/Module/Webpages.php:201 ../../Zotlabs/Module/Pubsites.php:47 +#: ../../include/page_widgets.php:42 +msgid "View" msgstr "" #: ../../Zotlabs/Module/Dreport.php:27 @@ -1561,18 +2412,6 @@ msgstr "" msgid "Edit Webpage" msgstr "" -#: ../../Zotlabs/Module/Follow.php:34 -msgid "Channel added." -msgstr "" - -#: ../../Zotlabs/Module/Acl.php:227 -msgid "network" -msgstr "" - -#: ../../Zotlabs/Module/Acl.php:237 -msgid "RSS" -msgstr "" - #: ../../Zotlabs/Module/Group.php:24 msgid "Privacy group created." msgstr "" @@ -1582,7 +2421,7 @@ msgid "Could not create privacy group." msgstr "" #: ../../Zotlabs/Module/Group.php:42 ../../Zotlabs/Module/Group.php:141 -#: ../../include/items.php:3904 +#: ../../include/items.php:3916 msgid "Privacy group not found." msgstr "" @@ -1626,30 +2465,56 @@ msgstr "" msgid "Click on a channel to add or remove." msgstr "" -#: ../../Zotlabs/Module/Ffsapi.php:12 -msgid "Share content from Firefox to $Projectname" +#: ../../Zotlabs/Module/Appman.php:37 ../../Zotlabs/Module/Appman.php:53 +msgid "App installed." msgstr "" -#: ../../Zotlabs/Module/Ffsapi.php:15 -msgid "Activate the Firefox $Projectname provider" +#: ../../Zotlabs/Module/Appman.php:46 +msgid "Malformed app." msgstr "" -#: ../../Zotlabs/Module/Api.php:61 ../../Zotlabs/Module/Api.php:85 -msgid "Authorize application connection" +#: ../../Zotlabs/Module/Appman.php:104 +msgid "Embed code" msgstr "" -#: ../../Zotlabs/Module/Api.php:62 -msgid "Return to your app and insert this Securty Code:" +#: ../../Zotlabs/Module/Appman.php:110 ../../include/widgets.php:107 +msgid "Edit App" msgstr "" -#: ../../Zotlabs/Module/Api.php:72 -msgid "Please login to continue." +#: ../../Zotlabs/Module/Appman.php:110 +msgid "Create App" msgstr "" -#: ../../Zotlabs/Module/Api.php:87 -msgid "" -"Do you want to authorize this application to access your posts and contacts, " -"and/or create new posts for you?" +#: ../../Zotlabs/Module/Appman.php:115 +msgid "Name of app" +msgstr "" + +#: ../../Zotlabs/Module/Appman.php:116 +msgid "Location (URL) of app" +msgstr "" + +#: ../../Zotlabs/Module/Appman.php:118 +msgid "Photo icon URL" +msgstr "" + +#: ../../Zotlabs/Module/Appman.php:118 +msgid "80 x 80 pixels - optional" +msgstr "" + +#: ../../Zotlabs/Module/Appman.php:119 +msgid "Categories (optional, comma separated list)" +msgstr "" + +#: ../../Zotlabs/Module/Appman.php:120 +msgid "Version ID" +msgstr "" + +#: ../../Zotlabs/Module/Appman.php:121 +msgid "Price of app" +msgstr "" + +#: ../../Zotlabs/Module/Appman.php:122 +msgid "Location (URL) to purchase app" msgstr "" #: ../../Zotlabs/Module/Help.php:26 @@ -1671,6 +2536,51 @@ msgstr "" msgid "$Projectname Documentation" msgstr "" +#: ../../Zotlabs/Module/Attach.php:13 +msgid "Item not available." +msgstr "" + +#: ../../Zotlabs/Module/Layouts.php:183 ../../include/text.php:2244 +msgid "Layouts" +msgstr "" + +#: ../../Zotlabs/Module/Layouts.php:185 +msgid "Comanche page description language help" +msgstr "" + +#: ../../Zotlabs/Module/Layouts.php:189 +msgid "Layout Description" +msgstr "" + +#: ../../Zotlabs/Module/Layouts.php:194 +msgid "Download PDL file" +msgstr "" + +#: ../../Zotlabs/Module/Ffsapi.php:12 +msgid "Share content from Firefox to $Projectname" +msgstr "" + +#: ../../Zotlabs/Module/Ffsapi.php:15 +msgid "Activate the Firefox $Projectname provider" +msgstr "" + +#: ../../Zotlabs/Module/Webpages.php:192 ../../Zotlabs/Lib/Apps.php:217 +#: ../../include/nav.php:106 ../../include/conversation.php:1700 +msgid "Webpages" +msgstr "" + +#: ../../Zotlabs/Module/Webpages.php:203 ../../include/page_widgets.php:44 +msgid "Actions" +msgstr "" + +#: ../../Zotlabs/Module/Webpages.php:204 ../../include/page_widgets.php:45 +msgid "Page Link" +msgstr "" + +#: ../../Zotlabs/Module/Webpages.php:205 +msgid "Page Title" +msgstr "" + #: ../../Zotlabs/Module/Filestorage.php:88 msgid "Permission Denied." msgstr "" @@ -1715,163 +2625,128 @@ msgstr "" msgid "Notify your contacts about this file" msgstr "" -#: ../../Zotlabs/Module/Apps.php:47 ../../include/nav.php:163 -#: ../../include/widgets.php:102 -msgid "Apps" -msgstr "" - -#: ../../Zotlabs/Module/Attach.php:13 -msgid "Item not available." -msgstr "" - -#: ../../Zotlabs/Module/Import.php:32 -#, php-format -msgid "Your service plan only allows %d channels." +#: ../../Zotlabs/Module/Impel.php:41 ../../include/bbcode.php:192 +msgid "webpage" msgstr "" -#: ../../Zotlabs/Module/Import.php:70 ../../Zotlabs/Module/Import_items.php:42 -msgid "Nothing to import." +#: ../../Zotlabs/Module/Impel.php:46 ../../include/bbcode.php:198 +msgid "block" msgstr "" -#: ../../Zotlabs/Module/Import.php:94 ../../Zotlabs/Module/Import_items.php:66 -msgid "Unable to download data from old server" +#: ../../Zotlabs/Module/Impel.php:51 ../../include/bbcode.php:195 +msgid "layout" msgstr "" -#: ../../Zotlabs/Module/Import.php:100 -#: ../../Zotlabs/Module/Import_items.php:72 -msgid "Imported file is empty." +#: ../../Zotlabs/Module/Impel.php:58 ../../include/bbcode.php:201 +msgid "menu" msgstr "" -#: ../../Zotlabs/Module/Import.php:122 -#: ../../Zotlabs/Module/Import_items.php:86 +#: ../../Zotlabs/Module/Impel.php:187 #, php-format -msgid "Warning: Database versions differ by %1$d updates." -msgstr "" - -#: ../../Zotlabs/Module/Import.php:150 ../../include/import.php:86 -msgid "Cloned channel not found. Import failed." -msgstr "" - -#: ../../Zotlabs/Module/Import.php:160 -msgid "No channel. Import failed." +msgid "%s element installed" msgstr "" -#: ../../Zotlabs/Module/Import.php:510 -#: ../../include/Import/import_diaspora.php:142 -msgid "Import completed." +#: ../../Zotlabs/Module/Impel.php:190 +#, php-format +msgid "%s element installation failed" msgstr "" -#: ../../Zotlabs/Module/Import.php:532 -msgid "You must be logged in to use this feature." +#: ../../Zotlabs/Module/Like.php:19 +msgid "Like/Dislike" msgstr "" -#: ../../Zotlabs/Module/Import.php:537 -msgid "Import Channel" +#: ../../Zotlabs/Module/Like.php:24 +msgid "This action is restricted to members." msgstr "" -#: ../../Zotlabs/Module/Import.php:538 +#: ../../Zotlabs/Module/Like.php:25 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:539 -#: ../../Zotlabs/Module/Import_items.php:119 -msgid "File to Upload" -msgstr "" - -#: ../../Zotlabs/Module/Import.php:540 -msgid "Or provide the old server/hub details" -msgstr "" - -#: ../../Zotlabs/Module/Import.php:541 -msgid "Your old identity address (xyz@example.com)" -msgstr "" - -#: ../../Zotlabs/Module/Import.php:542 -msgid "Your old login email address" +"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/Import.php:543 -msgid "Your old login password" +#: ../../Zotlabs/Module/Like.php:105 ../../Zotlabs/Module/Like.php:131 +#: ../../Zotlabs/Module/Like.php:169 +msgid "Invalid request." msgstr "" -#: ../../Zotlabs/Module/Import.php:544 -msgid "" -"For either option, please choose whether to make this hub your new primary " -"address, or whether your old location should continue this role. You will be " -"able to post from either location, but only one can be marked as the primary " -"location for files, photos, and media." +#: ../../Zotlabs/Module/Like.php:117 ../../include/conversation.php:126 +msgid "channel" msgstr "" -#: ../../Zotlabs/Module/Import.php:545 -msgid "Make this hub my primary location" +#: ../../Zotlabs/Module/Like.php:146 +msgid "thing" msgstr "" -#: ../../Zotlabs/Module/Import.php:546 -msgid "" -"Import existing posts if possible (experimental - limited by available memory" +#: ../../Zotlabs/Module/Like.php:192 +msgid "Channel unavailable." msgstr "" -#: ../../Zotlabs/Module/Import.php:547 -msgid "" -"This process may take several minutes to complete. Please submit the form " -"only once and leave this page open until finished." +#: ../../Zotlabs/Module/Like.php:240 +msgid "Previous action reversed." msgstr "" -#: ../../Zotlabs/Module/Item.php:179 -msgid "Unable to locate original post." +#: ../../Zotlabs/Module/Like.php:371 ../../Zotlabs/Module/Subthread.php:87 +#: ../../Zotlabs/Module/Tagger.php:47 ../../include/text.php:1917 +#: ../../include/conversation.php:120 +msgid "photo" msgstr "" -#: ../../Zotlabs/Module/Item.php:428 -msgid "Empty post discarded." +#: ../../Zotlabs/Module/Like.php:371 ../../Zotlabs/Module/Subthread.php:87 +#: ../../include/text.php:1923 ../../include/conversation.php:148 +msgid "status" msgstr "" -#: ../../Zotlabs/Module/Item.php:468 -msgid "Executable content type not permitted to this channel." +#: ../../Zotlabs/Module/Like.php:420 ../../include/conversation.php:164 +#, php-format +msgid "%1$s likes %2$s's %3$s" msgstr "" -#: ../../Zotlabs/Module/Item.php:848 -msgid "Duplicate post suppressed." +#: ../../Zotlabs/Module/Like.php:422 ../../include/conversation.php:167 +#, php-format +msgid "%1$s doesn't like %2$s's %3$s" msgstr "" -#: ../../Zotlabs/Module/Item.php:983 -msgid "System error. Post not saved." +#: ../../Zotlabs/Module/Like.php:424 +#, php-format +msgid "%1$s agrees with %2$s's %3$s" msgstr "" -#: ../../Zotlabs/Module/Item.php:1241 -msgid "Unable to obtain post information from database." +#: ../../Zotlabs/Module/Like.php:426 +#, php-format +msgid "%1$s doesn't agree with %2$s's %3$s" msgstr "" -#: ../../Zotlabs/Module/Item.php:1248 +#: ../../Zotlabs/Module/Like.php:428 #, php-format -msgid "You have reached your limit of %1$.0f top level posts." +msgid "%1$s abstains from a decision on %2$s's %3$s" msgstr "" -#: ../../Zotlabs/Module/Item.php:1255 +#: ../../Zotlabs/Module/Like.php:430 #, php-format -msgid "You have reached your limit of %1$.0f webpages." +msgid "%1$s is attending %2$s's %3$s" msgstr "" -#: ../../Zotlabs/Module/Layouts.php:183 ../../include/text.php:2268 -msgid "Layouts" +#: ../../Zotlabs/Module/Like.php:432 +#, php-format +msgid "%1$s is not attending %2$s's %3$s" msgstr "" -#: ../../Zotlabs/Module/Layouts.php:185 -msgid "Comanche page description language help" +#: ../../Zotlabs/Module/Like.php:434 +#, php-format +msgid "%1$s may attend %2$s's %3$s" msgstr "" -#: ../../Zotlabs/Module/Layouts.php:189 -msgid "Layout Description" +#: ../../Zotlabs/Module/Like.php:537 +msgid "Action completed." msgstr "" -#: ../../Zotlabs/Module/Layouts.php:194 -msgid "Download PDL file" +#: ../../Zotlabs/Module/Like.php:538 +msgid "Thank you." msgstr "" #: ../../Zotlabs/Module/Home.php:61 ../../Zotlabs/Module/Home.php:69 -#: ../../Zotlabs/Module/Siteinfo.php:65 +#: ../../Zotlabs/Module/Siteinfo.php:48 msgid "$Projectname" msgstr "" @@ -1896,12 +2771,6 @@ msgstr "" msgid "Full Name" msgstr "" -#: ../../Zotlabs/Module/Id.php:17 ../../Zotlabs/Module/Id.php:18 -#: ../../Zotlabs/Module/Admin.php:1035 ../../Zotlabs/Module/Admin.php:1047 -#: ../../include/network.php:2176 ../../boot.php:1706 -msgid "Email" -msgstr "" - #: ../../Zotlabs/Module/Id.php:19 ../../Zotlabs/Module/Id.php:20 #: ../../Zotlabs/Module/Id.php:21 ../../Zotlabs/Lib/Apps.php:237 msgid "Profile Photo" @@ -1973,124 +2842,31 @@ msgstr "" msgid "Female" msgstr "" -#: ../../Zotlabs/Module/Impel.php:41 ../../include/bbcode.php:192 -msgid "webpage" -msgstr "" - -#: ../../Zotlabs/Module/Impel.php:46 ../../include/bbcode.php:198 -msgid "block" -msgstr "" - -#: ../../Zotlabs/Module/Impel.php:51 ../../include/bbcode.php:195 -msgid "layout" -msgstr "" - -#: ../../Zotlabs/Module/Impel.php:58 ../../include/bbcode.php:201 -msgid "menu" -msgstr "" - -#: ../../Zotlabs/Module/Impel.php:187 -#, php-format -msgid "%s element installed" -msgstr "" - -#: ../../Zotlabs/Module/Impel.php:190 -#, php-format -msgid "%s element installation failed" -msgstr "" - -#: ../../Zotlabs/Module/Like.php:19 -msgid "Like/Dislike" +#: ../../Zotlabs/Module/Page.php:40 ../../Zotlabs/Module/Block.php:31 +msgid "Invalid item." msgstr "" -#: ../../Zotlabs/Module/Like.php:24 -msgid "This action is restricted to members." +#: ../../Zotlabs/Module/Page.php:56 ../../Zotlabs/Module/Block.php:43 +#: ../../Zotlabs/Module/Cal.php:62 ../../Zotlabs/Module/Wall_upload.php:33 +msgid "Channel not found." msgstr "" -#: ../../Zotlabs/Module/Like.php:25 +#: ../../Zotlabs/Module/Page.php:131 msgid "" -"Please <a href=\"rmagic\">login with your $Projectname ID</a> or <a href=" -"\"register\">register as a new $Projectname member</a> to continue." -msgstr "" - -#: ../../Zotlabs/Module/Like.php:105 ../../Zotlabs/Module/Like.php:131 -#: ../../Zotlabs/Module/Like.php:169 -msgid "Invalid request." -msgstr "" - -#: ../../Zotlabs/Module/Like.php:117 ../../include/conversation.php:126 -msgid "channel" -msgstr "" - -#: ../../Zotlabs/Module/Like.php:146 -msgid "thing" -msgstr "" - -#: ../../Zotlabs/Module/Like.php:192 -msgid "Channel unavailable." -msgstr "" - -#: ../../Zotlabs/Module/Like.php:240 -msgid "Previous action reversed." -msgstr "" - -#: ../../Zotlabs/Module/Like.php:371 ../../Zotlabs/Module/Subthread.php:87 -#: ../../Zotlabs/Module/Tagger.php:47 ../../include/text.php:1941 -#: ../../include/conversation.php:120 -msgid "photo" -msgstr "" - -#: ../../Zotlabs/Module/Like.php:371 ../../Zotlabs/Module/Subthread.php:87 -#: ../../include/text.php:1947 ../../include/conversation.php:148 -msgid "status" -msgstr "" - -#: ../../Zotlabs/Module/Like.php:420 ../../include/conversation.php:164 -#, php-format -msgid "%1$s likes %2$s's %3$s" -msgstr "" - -#: ../../Zotlabs/Module/Like.php:422 ../../include/conversation.php:167 -#, php-format -msgid "%1$s doesn't like %2$s's %3$s" -msgstr "" - -#: ../../Zotlabs/Module/Like.php:424 -#, php-format -msgid "%1$s agrees with %2$s's %3$s" -msgstr "" - -#: ../../Zotlabs/Module/Like.php:426 -#, php-format -msgid "%1$s doesn't agree with %2$s's %3$s" -msgstr "" - -#: ../../Zotlabs/Module/Like.php:428 -#, php-format -msgid "%1$s abstains from a decision on %2$s's %3$s" -msgstr "" - -#: ../../Zotlabs/Module/Like.php:430 -#, php-format -msgid "%1$s is attending %2$s's %3$s" -msgstr "" - -#: ../../Zotlabs/Module/Like.php:432 -#, php-format -msgid "%1$s is not attending %2$s's %3$s" -msgstr "" - -#: ../../Zotlabs/Module/Like.php:434 -#, php-format -msgid "%1$s may attend %2$s's %3$s" +"Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod " +"tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, " +"quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo " +"consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse " +"cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat " +"non proident, sunt in culpa qui officia deserunt mollit anim id est laborum." msgstr "" -#: ../../Zotlabs/Module/Like.php:537 -msgid "Action completed." +#: ../../Zotlabs/Module/Lockview.php:61 +msgid "Remote privacy information not available." msgstr "" -#: ../../Zotlabs/Module/Like.php:538 -msgid "Thank you." +#: ../../Zotlabs/Module/Lockview.php:82 +msgid "Visible to:" msgstr "" #: ../../Zotlabs/Module/Import_items.php:102 @@ -2174,14 +2950,6 @@ msgstr "" msgid "3. Click [Connect]" msgstr "" -#: ../../Zotlabs/Module/Lockview.php:61 -msgid "Remote privacy information not available." -msgstr "" - -#: ../../Zotlabs/Module/Lockview.php:82 -msgid "Visible to:" -msgstr "" - #: ../../Zotlabs/Module/Locs.php:25 ../../Zotlabs/Module/Locs.php:54 msgid "Location not found." msgstr "" @@ -2208,11 +2976,6 @@ msgstr "" msgid "Manage Channel Locations" msgstr "" -#: ../../Zotlabs/Module/Locs.php:118 ../../Zotlabs/Module/Profiles.php:470 -#: ../../Zotlabs/Module/Admin.php:1224 -msgid "Address" -msgstr "" - #: ../../Zotlabs/Module/Locs.php:119 msgid "Primary" msgstr "" @@ -2385,79 +3148,6 @@ msgstr "" msgid "Delegated Channel" msgstr "" -#: ../../Zotlabs/Module/Lostpass.php:19 -msgid "No valid account found." -msgstr "" - -#: ../../Zotlabs/Module/Lostpass.php:33 -msgid "Password reset request issued. Check your email." -msgstr "" - -#: ../../Zotlabs/Module/Lostpass.php:39 ../../Zotlabs/Module/Lostpass.php:107 -#, php-format -msgid "Site Member (%s)" -msgstr "" - -#: ../../Zotlabs/Module/Lostpass.php:44 -#, php-format -msgid "Password reset requested at %s" -msgstr "" - -#: ../../Zotlabs/Module/Lostpass.php:67 -msgid "" -"Request could not be verified. (You may have previously submitted it.) " -"Password reset failed." -msgstr "" - -#: ../../Zotlabs/Module/Lostpass.php:90 ../../boot.php:1712 -msgid "Password Reset" -msgstr "" - -#: ../../Zotlabs/Module/Lostpass.php:91 -msgid "Your password has been reset as requested." -msgstr "" - -#: ../../Zotlabs/Module/Lostpass.php:92 -msgid "Your new password is" -msgstr "" - -#: ../../Zotlabs/Module/Lostpass.php:93 -msgid "Save or copy your new password - and then" -msgstr "" - -#: ../../Zotlabs/Module/Lostpass.php:94 -msgid "click here to login" -msgstr "" - -#: ../../Zotlabs/Module/Lostpass.php:95 -msgid "" -"Your password may be changed from the <em>Settings</em> page after " -"successful login." -msgstr "" - -#: ../../Zotlabs/Module/Lostpass.php:112 -#, php-format -msgid "Your password has changed at %s" -msgstr "" - -#: ../../Zotlabs/Module/Lostpass.php:127 -msgid "Forgot your Password?" -msgstr "" - -#: ../../Zotlabs/Module/Lostpass.php:128 -msgid "" -"Enter your email address and submit to have your password reset. Then check " -"your email for further instructions." -msgstr "" - -#: ../../Zotlabs/Module/Lostpass.php:129 -msgid "Email Address" -msgstr "" - -#: ../../Zotlabs/Module/Lostpass.php:130 -msgid "Reset" -msgstr "" - #: ../../Zotlabs/Module/Menu.php:49 msgid "Unable to update menu." msgstr "" @@ -2494,7 +3184,7 @@ msgstr "" msgid "Submit and proceed" msgstr "" -#: ../../Zotlabs/Module/Menu.php:107 ../../include/text.php:2267 +#: ../../Zotlabs/Module/Menu.php:107 ../../include/text.php:2243 msgid "Menus" msgstr "" @@ -2555,34 +3245,91 @@ msgstr "" msgid "Not found." msgstr "" -#: ../../Zotlabs/Module/Mood.php:67 ../../include/conversation.php:260 +#: ../../Zotlabs/Module/Lostpass.php:19 +msgid "No valid account found." +msgstr "" + +#: ../../Zotlabs/Module/Lostpass.php:33 +msgid "Password reset request issued. Check your email." +msgstr "" + +#: ../../Zotlabs/Module/Lostpass.php:39 ../../Zotlabs/Module/Lostpass.php:107 #, php-format -msgctxt "mood" -msgid "%1$s is %2$s" +msgid "Site Member (%s)" msgstr "" -#: ../../Zotlabs/Module/Mood.php:135 ../../Zotlabs/Lib/Apps.php:226 -msgid "Mood" +#: ../../Zotlabs/Module/Lostpass.php:44 +#, php-format +msgid "Password reset requested at %s" msgstr "" -#: ../../Zotlabs/Module/Mood.php:136 -msgid "Set your current mood and tell your friends" +#: ../../Zotlabs/Module/Lostpass.php:67 +msgid "" +"Request could not be verified. (You may have previously submitted it.) " +"Password reset failed." msgstr "" -#: ../../Zotlabs/Module/Match.php:26 -msgid "Profile Match" +#: ../../Zotlabs/Module/Lostpass.php:90 ../../boot.php:1712 +msgid "Password Reset" msgstr "" -#: ../../Zotlabs/Module/Match.php:35 -msgid "No keywords to match. Please add keywords to your default profile." +#: ../../Zotlabs/Module/Lostpass.php:91 +msgid "Your password has been reset as requested." msgstr "" -#: ../../Zotlabs/Module/Match.php:67 -msgid "is interested in:" +#: ../../Zotlabs/Module/Lostpass.php:92 +msgid "Your new password is" msgstr "" -#: ../../Zotlabs/Module/Match.php:74 -msgid "No matches" +#: ../../Zotlabs/Module/Lostpass.php:93 +msgid "Save or copy your new password - and then" +msgstr "" + +#: ../../Zotlabs/Module/Lostpass.php:94 +msgid "click here to login" +msgstr "" + +#: ../../Zotlabs/Module/Lostpass.php:95 +msgid "" +"Your password may be changed from the <em>Settings</em> page after " +"successful login." +msgstr "" + +#: ../../Zotlabs/Module/Lostpass.php:112 +#, php-format +msgid "Your password has changed at %s" +msgstr "" + +#: ../../Zotlabs/Module/Lostpass.php:127 +msgid "Forgot your Password?" +msgstr "" + +#: ../../Zotlabs/Module/Lostpass.php:128 +msgid "" +"Enter your email address and submit to have your password reset. Then check " +"your email for further instructions." +msgstr "" + +#: ../../Zotlabs/Module/Lostpass.php:129 +msgid "Email Address" +msgstr "" + +#: ../../Zotlabs/Module/Lostpass.php:130 +msgid "Reset" +msgstr "" + +#: ../../Zotlabs/Module/Mood.php:67 ../../include/conversation.php:260 +#, php-format +msgctxt "mood" +msgid "%1$s is %2$s" +msgstr "" + +#: ../../Zotlabs/Module/Mood.php:135 ../../Zotlabs/Lib/Apps.php:226 +msgid "Mood" +msgstr "" + +#: ../../Zotlabs/Module/Mood.php:136 +msgid "Set your current mood and tell your friends" msgstr "" #: ../../Zotlabs/Module/Network.php:96 @@ -2623,6 +3370,22 @@ msgstr "" msgid "System Notifications" msgstr "" +#: ../../Zotlabs/Module/Match.php:26 +msgid "Profile Match" +msgstr "" + +#: ../../Zotlabs/Module/Match.php:35 +msgid "No keywords to match. Please add keywords to your default profile." +msgstr "" + +#: ../../Zotlabs/Module/Match.php:67 +msgid "is interested in:" +msgstr "" + +#: ../../Zotlabs/Module/Match.php:74 +msgid "No matches" +msgstr "" + #: ../../Zotlabs/Module/Mitem.php:52 msgid "Unable to create element." msgstr "" @@ -2740,6 +3503,34 @@ msgstr "" msgid "Link text" msgstr "" +#: ../../Zotlabs/Module/Wiki.php:75 ../../Zotlabs/Lib/Apps.php:218 +msgid "Wiki" +msgstr "" + +#: ../../Zotlabs/Module/Wiki.php:76 +msgid "Sandbox" +msgstr "" + +#: ../../Zotlabs/Module/Wiki.php:143 +msgid "Revision Comparison" +msgstr "" + +#: ../../Zotlabs/Module/Wiki.php:144 +msgid "Revert" +msgstr "" + +#: ../../Zotlabs/Module/Wiki.php:166 +msgid "Enter the name of your new wiki:" +msgstr "" + +#: ../../Zotlabs/Module/Wiki.php:167 +msgid "Enter the name of the new page:" +msgstr "" + +#: ../../Zotlabs/Module/Wiki.php:168 +msgid "Enter the new name:" +msgstr "" + #: ../../Zotlabs/Module/New_channel.php:128 #: ../../Zotlabs/Module/Register.php:231 msgid "Name or caption" @@ -2796,6 +3587,26 @@ msgid "" "or <a href=\"import\">import an existing channel</a> from another location." msgstr "" +#: ../../Zotlabs/Module/Ping.php:265 +msgid "sent you a private message" +msgstr "" + +#: ../../Zotlabs/Module/Ping.php:313 +msgid "added your channel" +msgstr "" + +#: ../../Zotlabs/Module/Ping.php:323 +msgid "g A l F d" +msgstr "" + +#: ../../Zotlabs/Module/Ping.php:346 +msgid "[today]" +msgstr "" + +#: ../../Zotlabs/Module/Ping.php:355 +msgid "posted an event" +msgstr "" + #: ../../Zotlabs/Module/Notifications.php:30 msgid "Invalid request identifier." msgstr "" @@ -2808,14 +3619,59 @@ msgstr "" msgid "Mark all system notifications seen" msgstr "" +#: ../../Zotlabs/Module/Poke.php:168 ../../Zotlabs/Lib/Apps.php:227 +#: ../../include/conversation.php:963 +msgid "Poke" +msgstr "" + +#: ../../Zotlabs/Module/Poke.php:169 +msgid "Poke somebody" +msgstr "" + +#: ../../Zotlabs/Module/Poke.php:172 +msgid "Poke/Prod" +msgstr "" + +#: ../../Zotlabs/Module/Poke.php:173 +msgid "Poke, prod or do other things to somebody" +msgstr "" + +#: ../../Zotlabs/Module/Poke.php:180 +msgid "Recipient" +msgstr "" + +#: ../../Zotlabs/Module/Poke.php:181 +msgid "Choose what you wish to do to recipient" +msgstr "" + +#: ../../Zotlabs/Module/Poke.php:184 ../../Zotlabs/Module/Poke.php:185 +msgid "Make this post private" +msgstr "" + +#: ../../Zotlabs/Module/Oexchange.php:27 +msgid "Unable to find your hub." +msgstr "" + +#: ../../Zotlabs/Module/Oexchange.php:41 +msgid "Post successful." +msgstr "" + +#: ../../Zotlabs/Module/Openid.php:30 +msgid "OpenID protocol error. No ID returned." +msgstr "" + +#: ../../Zotlabs/Module/Openid.php:193 ../../include/auth.php:226 +msgid "Login failed." +msgstr "" + #: ../../Zotlabs/Module/Photos.php:84 msgid "Page owner information could not be retrieved." msgstr "" #: ../../Zotlabs/Module/Photos.php:99 ../../Zotlabs/Module/Photos.php:743 -#: ../../Zotlabs/Module/Profile_photo.php:114 -#: ../../Zotlabs/Module/Profile_photo.php:206 -#: ../../Zotlabs/Module/Profile_photo.php:294 +#: ../../Zotlabs/Module/Profile_photo.php:116 +#: ../../Zotlabs/Module/Profile_photo.php:211 +#: ../../Zotlabs/Module/Profile_photo.php:310 #: ../../include/photo/photo_driver.php:718 msgid "Profile Photos" msgstr "" @@ -2931,11 +3787,6 @@ msgstr "" msgid "View Full Size" msgstr "" -#: ../../Zotlabs/Module/Photos.php:998 ../../Zotlabs/Module/Admin.php:1437 -#: ../../Zotlabs/Module/Tagrm.php:137 -msgid "Remove" -msgstr "" - #: ../../Zotlabs/Module/Photos.php:1032 msgid "Edit photo" msgstr "" @@ -3043,7 +3894,7 @@ msgstr "" #: ../../Zotlabs/Module/Photos.php:1130 ../../Zotlabs/Lib/ThreadItem.php:185 #: ../../include/taxonomy.php:403 ../../include/conversation.php:1756 -#: ../../include/channel.php:1139 +#: ../../include/channel.php:1146 msgctxt "noun" msgid "Like" msgid_plural "Likes" @@ -3094,52 +3945,6 @@ msgstr "" msgid "Recent Photos" msgstr "" -#: ../../Zotlabs/Module/Ping.php:265 -msgid "sent you a private message" -msgstr "" - -#: ../../Zotlabs/Module/Ping.php:313 -msgid "added your channel" -msgstr "" - -#: ../../Zotlabs/Module/Ping.php:323 -msgid "g A l F d" -msgstr "" - -#: ../../Zotlabs/Module/Ping.php:346 -msgid "[today]" -msgstr "" - -#: ../../Zotlabs/Module/Ping.php:355 -msgid "posted an event" -msgstr "" - -#: ../../Zotlabs/Module/Oexchange.php:27 -msgid "Unable to find your hub." -msgstr "" - -#: ../../Zotlabs/Module/Oexchange.php:41 -msgid "Post successful." -msgstr "" - -#: ../../Zotlabs/Module/Openid.php:30 -msgid "OpenID protocol error. No ID returned." -msgstr "" - -#: ../../Zotlabs/Module/Openid.php:193 ../../include/auth.php:226 -msgid "Login failed." -msgstr "" - -#: ../../Zotlabs/Module/Page.php:131 -msgid "" -"Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod " -"tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, " -"quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo " -"consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse " -"cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat " -"non proident, sunt in culpa qui officia deserunt mollit anim id est laborum." -msgstr "" - #: ../../Zotlabs/Module/Pconfig.php:26 ../../Zotlabs/Module/Pconfig.php:59 msgid "This setting requires special processing and editing has been blocked." msgstr "" @@ -3175,35 +3980,6 @@ msgstr "" msgid "Layout Help" msgstr "" -#: ../../Zotlabs/Module/Poke.php:168 ../../Zotlabs/Lib/Apps.php:227 -#: ../../include/conversation.php:963 -msgid "Poke" -msgstr "" - -#: ../../Zotlabs/Module/Poke.php:169 -msgid "Poke somebody" -msgstr "" - -#: ../../Zotlabs/Module/Poke.php:172 -msgid "Poke/Prod" -msgstr "" - -#: ../../Zotlabs/Module/Poke.php:173 -msgid "Poke, prod or do other things to somebody" -msgstr "" - -#: ../../Zotlabs/Module/Poke.php:180 -msgid "Recipient" -msgstr "" - -#: ../../Zotlabs/Module/Poke.php:181 -msgid "Choose what you wish to do to recipient" -msgstr "" - -#: ../../Zotlabs/Module/Poke.php:184 ../../Zotlabs/Module/Poke.php:185 -msgid "Make this post private" -msgstr "" - #: ../../Zotlabs/Module/Probe.php:30 ../../Zotlabs/Module/Probe.php:34 #, php-format msgid "Fetching URL returns error: %1$s" @@ -3295,7 +4071,7 @@ msgid "View this profile" msgstr "" #: ../../Zotlabs/Module/Profiles.php:689 ../../Zotlabs/Module/Profiles.php:771 -#: ../../include/channel.php:940 +#: ../../include/channel.php:946 msgid "Edit visibility" msgstr "" @@ -3307,7 +4083,7 @@ msgstr "" msgid "Change cover photo" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:692 ../../include/channel.php:911 +#: ../../Zotlabs/Module/Profiles.php:692 ../../include/channel.php:917 msgid "Change profile photo" msgstr "" @@ -3468,25 +4244,15 @@ msgstr "" msgid "My other channels" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:767 ../../include/channel.php:936 +#: ../../Zotlabs/Module/Profiles.php:767 ../../include/channel.php:942 msgid "Profile Image" msgstr "" #: ../../Zotlabs/Module/Profiles.php:777 ../../include/nav.php:88 -#: ../../include/channel.php:918 +#: ../../include/channel.php:924 msgid "Edit Profiles" msgstr "" -#: ../../Zotlabs/Module/Profile_photo.php:179 -msgid "" -"Shift-reload the page or clear browser cache if the new photo does not " -"display immediately." -msgstr "" - -#: ../../Zotlabs/Module/Profile_photo.php:367 -msgid "Upload Profile Photo" -msgstr "" - #: ../../Zotlabs/Module/Profperm.php:34 ../../Zotlabs/Module/Profperm.php:63 msgid "Invalid profile identifier." msgstr "" @@ -3495,7 +4261,7 @@ msgstr "" msgid "Profile Visibility Editor" msgstr "" -#: ../../Zotlabs/Module/Profperm.php:117 ../../include/channel.php:1230 +#: ../../Zotlabs/Module/Profperm.php:117 ../../include/channel.php:1238 msgid "Profile" msgstr "" @@ -3549,6 +4315,33 @@ msgstr "" msgid "Rate" msgstr "" +#: ../../Zotlabs/Module/Profile_photo.php:185 +msgid "" +"Shift-reload the page or clear browser cache if the new photo does not " +"display immediately." +msgstr "" + +#: ../../Zotlabs/Module/Profile_photo.php:388 +msgid "Upload Profile Photo" +msgstr "" + +#: ../../Zotlabs/Module/Acl.php:227 +msgid "network" +msgstr "" + +#: ../../Zotlabs/Module/Acl.php:237 +msgid "RSS" +msgstr "" + +#: ../../Zotlabs/Module/Cal.php:69 +msgid "Permissions denied." +msgstr "" + +#: ../../Zotlabs/Module/Rate.php:159 ../../Zotlabs/Module/Connedit.php:720 +#: ../../include/js_strings.php:20 +msgid "Rating" +msgstr "" + #: ../../Zotlabs/Module/Rate.php:160 msgid "Website:" msgstr "" @@ -3582,1069 +4375,302 @@ msgstr "" msgid "Description: " msgstr "" -#: ../../Zotlabs/Module/Admin.php:77 -msgid "Theme settings updated." -msgstr "" - -#: ../../Zotlabs/Module/Admin.php:197 -msgid "# Accounts" -msgstr "" - -#: ../../Zotlabs/Module/Admin.php:198 -msgid "# blocked accounts" -msgstr "" - -#: ../../Zotlabs/Module/Admin.php:199 -msgid "# expired accounts" -msgstr "" - -#: ../../Zotlabs/Module/Admin.php:200 -msgid "# expiring accounts" -msgstr "" - -#: ../../Zotlabs/Module/Admin.php:211 -msgid "# Channels" -msgstr "" - -#: ../../Zotlabs/Module/Admin.php:212 -msgid "# primary" -msgstr "" - -#: ../../Zotlabs/Module/Admin.php:213 -msgid "# clones" -msgstr "" - -#: ../../Zotlabs/Module/Admin.php:219 -msgid "Message queues" -msgstr "" - -#: ../../Zotlabs/Module/Admin.php:236 -msgid "Your software should be updated" -msgstr "" - -#: ../../Zotlabs/Module/Admin.php:241 ../../Zotlabs/Module/Admin.php:490 -#: ../../Zotlabs/Module/Admin.php:711 ../../Zotlabs/Module/Admin.php:755 -#: ../../Zotlabs/Module/Admin.php:1030 ../../Zotlabs/Module/Admin.php:1209 -#: ../../Zotlabs/Module/Admin.php:1329 ../../Zotlabs/Module/Admin.php:1419 -#: ../../Zotlabs/Module/Admin.php:1612 ../../Zotlabs/Module/Admin.php:1646 -#: ../../Zotlabs/Module/Admin.php:1731 -msgid "Administration" -msgstr "" - -#: ../../Zotlabs/Module/Admin.php:242 -msgid "Summary" -msgstr "" - -#: ../../Zotlabs/Module/Admin.php:245 -msgid "Registered accounts" -msgstr "" - -#: ../../Zotlabs/Module/Admin.php:246 ../../Zotlabs/Module/Admin.php:715 -msgid "Pending registrations" -msgstr "" - -#: ../../Zotlabs/Module/Admin.php:247 -msgid "Registered channels" -msgstr "" - -#: ../../Zotlabs/Module/Admin.php:248 ../../Zotlabs/Module/Admin.php:716 -msgid "Active plugins" -msgstr "" - -#: ../../Zotlabs/Module/Admin.php:249 -msgid "Version" -msgstr "" - -#: ../../Zotlabs/Module/Admin.php:250 -msgid "Repository version (master)" -msgstr "" - -#: ../../Zotlabs/Module/Admin.php:251 -msgid "Repository version (dev)" -msgstr "" - -#: ../../Zotlabs/Module/Admin.php:373 -msgid "Site settings updated." -msgstr "" - -#: ../../Zotlabs/Module/Admin.php:400 ../../include/text.php:2845 -msgid "Default" -msgstr "" - -#: ../../Zotlabs/Module/Admin.php:410 ../../Zotlabs/Module/Settings.php:798 -msgid "mobile" -msgstr "" - -#: ../../Zotlabs/Module/Admin.php:412 -msgid "experimental" -msgstr "" - -#: ../../Zotlabs/Module/Admin.php:414 -msgid "unsupported" -msgstr "" - -#: ../../Zotlabs/Module/Admin.php:460 -msgid "Yes - with approval" -msgstr "" - -#: ../../Zotlabs/Module/Admin.php:466 -msgid "My site is not a public server" -msgstr "" - -#: ../../Zotlabs/Module/Admin.php:467 -msgid "My site has paid access only" -msgstr "" - -#: ../../Zotlabs/Module/Admin.php:468 -msgid "My site has free access only" -msgstr "" - -#: ../../Zotlabs/Module/Admin.php:469 -msgid "My site offers free accounts with optional paid upgrades" -msgstr "" - -#: ../../Zotlabs/Module/Admin.php:491 ../../include/widgets.php:1455 -msgid "Site" -msgstr "" - -#: ../../Zotlabs/Module/Admin.php:493 ../../Zotlabs/Module/Register.php:245 -msgid "Registration" -msgstr "" - -#: ../../Zotlabs/Module/Admin.php:494 -msgid "File upload" -msgstr "" - -#: ../../Zotlabs/Module/Admin.php:495 -msgid "Policies" -msgstr "" - -#: ../../Zotlabs/Module/Admin.php:496 ../../include/contact_widgets.php:16 -msgid "Advanced" -msgstr "" - -#: ../../Zotlabs/Module/Admin.php:500 -msgid "Site name" -msgstr "" - -#: ../../Zotlabs/Module/Admin.php:501 -msgid "Banner/Logo" -msgstr "" - -#: ../../Zotlabs/Module/Admin.php:502 -msgid "Administrator Information" -msgstr "" - -#: ../../Zotlabs/Module/Admin.php:502 -msgid "" -"Contact information for site administrators. Displayed on siteinfo page. " -"BBCode can be used here" -msgstr "" - -#: ../../Zotlabs/Module/Admin.php:503 -msgid "System language" -msgstr "" - -#: ../../Zotlabs/Module/Admin.php:504 -msgid "System theme" -msgstr "" - -#: ../../Zotlabs/Module/Admin.php:504 -msgid "" -"Default system theme - may be over-ridden by user profiles - <a href='#' " -"id='cnftheme'>change theme settings</a>" -msgstr "" - -#: ../../Zotlabs/Module/Admin.php:505 -msgid "Mobile system theme" -msgstr "" - -#: ../../Zotlabs/Module/Admin.php:505 -msgid "Theme for mobile devices" -msgstr "" - -#: ../../Zotlabs/Module/Admin.php:507 -msgid "Allow Feeds as Connections" -msgstr "" - -#: ../../Zotlabs/Module/Admin.php:507 -msgid "(Heavy system resource usage)" -msgstr "" - -#: ../../Zotlabs/Module/Admin.php:508 -msgid "Maximum image size" -msgstr "" - -#: ../../Zotlabs/Module/Admin.php:508 -msgid "" -"Maximum size in bytes of uploaded images. Default is 0, which means no " -"limits." -msgstr "" - -#: ../../Zotlabs/Module/Admin.php:509 -msgid "Does this site allow new member registration?" -msgstr "" - -#: ../../Zotlabs/Module/Admin.php:510 -msgid "Invitation only" -msgstr "" - -#: ../../Zotlabs/Module/Admin.php:510 -msgid "" -"Only allow new member registrations with an invitation code. Above register " -"policy must be set to Yes." -msgstr "" - -#: ../../Zotlabs/Module/Admin.php:511 -msgid "Which best describes the types of account offered by this hub?" -msgstr "" - -#: ../../Zotlabs/Module/Admin.php:512 -msgid "Register text" +#: ../../Zotlabs/Module/Apps.php:47 ../../include/nav.php:163 +#: ../../include/widgets.php:102 +msgid "Apps" msgstr "" -#: ../../Zotlabs/Module/Admin.php:512 -msgid "Will be displayed prominently on the registration page." +#: ../../Zotlabs/Module/Connedit.php:80 +msgid "Could not access contact record." msgstr "" -#: ../../Zotlabs/Module/Admin.php:513 -msgid "Site homepage to show visitors (default: login box)" +#: ../../Zotlabs/Module/Connedit.php:104 +msgid "Could not locate selected profile." msgstr "" -#: ../../Zotlabs/Module/Admin.php:513 -msgid "" -"example: 'public' to show public stream, 'page/sys/home' to show a system " -"webpage called 'home' or 'include:home.html' to include a file." +#: ../../Zotlabs/Module/Connedit.php:227 +msgid "Connection updated." msgstr "" -#: ../../Zotlabs/Module/Admin.php:514 -msgid "Preserve site homepage URL" +#: ../../Zotlabs/Module/Connedit.php:229 +msgid "Failed to update connection record." msgstr "" -#: ../../Zotlabs/Module/Admin.php:514 -msgid "" -"Present the site homepage in a frame at the original location instead of " -"redirecting" +#: ../../Zotlabs/Module/Connedit.php:276 +msgid "is now connected to" msgstr "" -#: ../../Zotlabs/Module/Admin.php:515 -msgid "Accounts abandoned after x days" +#: ../../Zotlabs/Module/Connedit.php:411 +msgid "Could not access address book record." msgstr "" -#: ../../Zotlabs/Module/Admin.php:515 -msgid "" -"Will not waste system resources polling external sites for abandonded " -"accounts. Enter 0 for no time limit." +#: ../../Zotlabs/Module/Connedit.php:431 +msgid "Refresh failed - channel is currently unavailable." msgstr "" -#: ../../Zotlabs/Module/Admin.php:516 -msgid "Allowed friend domains" +#: ../../Zotlabs/Module/Connedit.php:446 ../../Zotlabs/Module/Connedit.php:455 +#: ../../Zotlabs/Module/Connedit.php:464 ../../Zotlabs/Module/Connedit.php:473 +#: ../../Zotlabs/Module/Connedit.php:486 +msgid "Unable to set address book parameters." msgstr "" -#: ../../Zotlabs/Module/Admin.php:516 -msgid "" -"Comma separated list of domains which are allowed to establish friendships " -"with this site. Wildcards are accepted. Empty to allow any domains" +#: ../../Zotlabs/Module/Connedit.php:509 +msgid "Connection has been removed." msgstr "" -#: ../../Zotlabs/Module/Admin.php:517 -msgid "Allowed email domains" +#: ../../Zotlabs/Module/Connedit.php:525 ../../Zotlabs/Lib/Apps.php:220 +#: ../../include/nav.php:86 ../../include/conversation.php:957 +msgid "View Profile" msgstr "" -#: ../../Zotlabs/Module/Admin.php:517 -msgid "" -"Comma separated list of domains which are allowed in email addresses for " -"registrations to this site. Wildcards are accepted. Empty to allow any " -"domains" +#: ../../Zotlabs/Module/Connedit.php:528 +#, php-format +msgid "View %s's profile" msgstr "" -#: ../../Zotlabs/Module/Admin.php:518 -msgid "Not allowed email domains" +#: ../../Zotlabs/Module/Connedit.php:532 +msgid "Refresh Permissions" msgstr "" -#: ../../Zotlabs/Module/Admin.php:518 -msgid "" -"Comma separated list of domains which are not allowed in email addresses for " -"registrations to this site. Wildcards are accepted. Empty to allow any " -"domains, unless allowed domains have been defined." +#: ../../Zotlabs/Module/Connedit.php:535 +msgid "Fetch updated permissions" msgstr "" -#: ../../Zotlabs/Module/Admin.php:519 -msgid "Verify Email Addresses" +#: ../../Zotlabs/Module/Connedit.php:539 +msgid "Recent Activity" msgstr "" -#: ../../Zotlabs/Module/Admin.php:519 -msgid "" -"Check to verify email addresses used in account registration (recommended)." +#: ../../Zotlabs/Module/Connedit.php:542 +msgid "View recent posts and comments" msgstr "" -#: ../../Zotlabs/Module/Admin.php:520 -msgid "Force publish" +#: ../../Zotlabs/Module/Connedit.php:549 +msgid "Block (or Unblock) all communications with this connection" msgstr "" -#: ../../Zotlabs/Module/Admin.php:520 -msgid "" -"Check to force all profiles on this site to be listed in the site directory." +#: ../../Zotlabs/Module/Connedit.php:550 +msgid "This connection is blocked!" msgstr "" -#: ../../Zotlabs/Module/Admin.php:521 -msgid "Import Public Streams" +#: ../../Zotlabs/Module/Connedit.php:554 +msgid "Unignore" msgstr "" -#: ../../Zotlabs/Module/Admin.php:521 -msgid "" -"Import and allow access to public content pulled from other sites. Warning: " -"this content is unmoderated." +#: ../../Zotlabs/Module/Connedit.php:557 +msgid "Ignore (or Unignore) all inbound communications from this connection" msgstr "" -#: ../../Zotlabs/Module/Admin.php:522 -msgid "Login on Homepage" +#: ../../Zotlabs/Module/Connedit.php:558 +msgid "This connection is ignored!" msgstr "" -#: ../../Zotlabs/Module/Admin.php:522 -msgid "" -"Present a login box to visitors on the home page if no other content has " -"been configured." +#: ../../Zotlabs/Module/Connedit.php:562 +msgid "Unarchive" msgstr "" -#: ../../Zotlabs/Module/Admin.php:523 -msgid "Enable context help" +#: ../../Zotlabs/Module/Connedit.php:562 +msgid "Archive" msgstr "" -#: ../../Zotlabs/Module/Admin.php:523 +#: ../../Zotlabs/Module/Connedit.php:565 msgid "" -"Display contextual help for the current page when the help button is pressed." -msgstr "" - -#: ../../Zotlabs/Module/Admin.php:525 -msgid "Directory Server URL" +"Archive (or Unarchive) this connection - mark channel dead but keep content" msgstr "" -#: ../../Zotlabs/Module/Admin.php:525 -msgid "Default directory server" +#: ../../Zotlabs/Module/Connedit.php:566 +msgid "This connection is archived!" msgstr "" -#: ../../Zotlabs/Module/Admin.php:527 -msgid "Proxy user" +#: ../../Zotlabs/Module/Connedit.php:570 +msgid "Unhide" msgstr "" -#: ../../Zotlabs/Module/Admin.php:528 -msgid "Proxy URL" +#: ../../Zotlabs/Module/Connedit.php:570 +msgid "Hide" msgstr "" -#: ../../Zotlabs/Module/Admin.php:529 -msgid "Network timeout" +#: ../../Zotlabs/Module/Connedit.php:573 +msgid "Hide or Unhide this connection from your other connections" msgstr "" -#: ../../Zotlabs/Module/Admin.php:529 -msgid "Value is in seconds. Set to 0 for unlimited (not recommended)." +#: ../../Zotlabs/Module/Connedit.php:574 +msgid "This connection is hidden!" msgstr "" -#: ../../Zotlabs/Module/Admin.php:530 -msgid "Delivery interval" +#: ../../Zotlabs/Module/Connedit.php:581 +msgid "Delete this connection" msgstr "" -#: ../../Zotlabs/Module/Admin.php:530 -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." +#: ../../Zotlabs/Module/Connedit.php:596 ../../include/widgets.php:493 +msgid "Me" msgstr "" -#: ../../Zotlabs/Module/Admin.php:531 -msgid "Deliveries per process" +#: ../../Zotlabs/Module/Connedit.php:597 ../../include/widgets.php:494 +msgid "Family" msgstr "" -#: ../../Zotlabs/Module/Admin.php:531 -msgid "" -"Number of deliveries to attempt in a single operating system process. Adjust " -"if necessary to tune system performance. Recommend: 1-5." +#: ../../Zotlabs/Module/Connedit.php:598 ../../Zotlabs/Module/Settings.php:342 +#: ../../Zotlabs/Module/Settings.php:346 ../../Zotlabs/Module/Settings.php:347 +#: ../../Zotlabs/Module/Settings.php:350 ../../Zotlabs/Module/Settings.php:361 +#: ../../include/selectors.php:123 ../../include/channel.php:389 +#: ../../include/channel.php:390 ../../include/channel.php:397 +#: ../../include/widgets.php:495 +msgid "Friends" msgstr "" -#: ../../Zotlabs/Module/Admin.php:532 -msgid "Poll interval" +#: ../../Zotlabs/Module/Connedit.php:599 ../../include/widgets.php:496 +msgid "Acquaintances" msgstr "" -#: ../../Zotlabs/Module/Admin.php:532 -msgid "" -"Delay background polling processes by this many seconds to reduce system " -"load. If 0, use delivery interval." +#: ../../Zotlabs/Module/Connedit.php:660 +msgid "Approve this connection" msgstr "" -#: ../../Zotlabs/Module/Admin.php:533 -msgid "Maximum Load Average" +#: ../../Zotlabs/Module/Connedit.php:660 +msgid "Accept connection to allow communication" msgstr "" -#: ../../Zotlabs/Module/Admin.php:533 -msgid "" -"Maximum system load before delivery and poll processes are deferred - " -"default 50." +#: ../../Zotlabs/Module/Connedit.php:665 +msgid "Set Affinity" msgstr "" -#: ../../Zotlabs/Module/Admin.php:534 -msgid "Expiration period in days for imported (grid/network) content" +#: ../../Zotlabs/Module/Connedit.php:668 +msgid "Set Profile" msgstr "" -#: ../../Zotlabs/Module/Admin.php:534 -msgid "0 for no expiration of imported content" +#: ../../Zotlabs/Module/Connedit.php:671 +msgid "Set Affinity & Profile" msgstr "" -#: ../../Zotlabs/Module/Admin.php:677 ../../Zotlabs/Module/Admin.php:678 -#: ../../Zotlabs/Module/Settings.php:722 -msgid "Off" +#: ../../Zotlabs/Module/Connedit.php:704 +msgid "none" msgstr "" -#: ../../Zotlabs/Module/Admin.php:677 ../../Zotlabs/Module/Admin.php:678 -#: ../../Zotlabs/Module/Settings.php:722 -msgid "On" +#: ../../Zotlabs/Module/Connedit.php:708 ../../include/widgets.php:614 +msgid "Connection Default Permissions" msgstr "" -#: ../../Zotlabs/Module/Admin.php:678 +#: ../../Zotlabs/Module/Connedit.php:708 ../../include/items.php:3949 #, php-format -msgid "Lock feature %s" -msgstr "" - -#: ../../Zotlabs/Module/Admin.php:686 -msgid "Manage Additional Features" -msgstr "" - -#: ../../Zotlabs/Module/Admin.php:703 -msgid "No server found" -msgstr "" - -#: ../../Zotlabs/Module/Admin.php:710 ../../Zotlabs/Module/Admin.php:1046 -msgid "ID" -msgstr "" - -#: ../../Zotlabs/Module/Admin.php:710 -msgid "for channel" -msgstr "" - -#: ../../Zotlabs/Module/Admin.php:710 -msgid "on server" -msgstr "" - -#: ../../Zotlabs/Module/Admin.php:712 -msgid "Server" -msgstr "" - -#: ../../Zotlabs/Module/Admin.php:746 -msgid "" -"By default, unfiltered HTML is allowed in embedded media. This is inherently " -"insecure." -msgstr "" - -#: ../../Zotlabs/Module/Admin.php:749 -msgid "" -"The recommended setting is to only allow unfiltered HTML from the following " -"sites:" +msgid "Connection: %s" msgstr "" -#: ../../Zotlabs/Module/Admin.php:750 -msgid "" -"https://youtube.com/<br />https://www.youtube.com/<br />https://youtu.be/" -"<br />https://vimeo.com/<br />https://soundcloud.com/<br />" +#: ../../Zotlabs/Module/Connedit.php:709 +msgid "Apply these permissions automatically" msgstr "" -#: ../../Zotlabs/Module/Admin.php:751 -msgid "" -"All other embedded content will be filtered, <strong>unless</strong> " -"embedded content from that site is explicitly blocked." +#: ../../Zotlabs/Module/Connedit.php:709 +msgid "Connection requests will be approved without your interaction" msgstr "" -#: ../../Zotlabs/Module/Admin.php:756 ../../include/widgets.php:1458 -msgid "Security" +#: ../../Zotlabs/Module/Connedit.php:711 +msgid "This connection's primary address is" msgstr "" -#: ../../Zotlabs/Module/Admin.php:758 -msgid "Block public" +#: ../../Zotlabs/Module/Connedit.php:712 +msgid "Available locations:" msgstr "" -#: ../../Zotlabs/Module/Admin.php:758 +#: ../../Zotlabs/Module/Connedit.php:716 msgid "" -"Check to block public access to all otherwise public personal pages on this " -"site unless you are currently authenticated." +"The permissions indicated on this page will be applied to all new " +"connections." msgstr "" -#: ../../Zotlabs/Module/Admin.php:759 -msgid "Set \"Transport Security\" HTTP header" +#: ../../Zotlabs/Module/Connedit.php:717 +msgid "Connection Tools" msgstr "" -#: ../../Zotlabs/Module/Admin.php:760 -msgid "Set \"Content Security Policy\" HTTP header" +#: ../../Zotlabs/Module/Connedit.php:719 +msgid "Slide to adjust your degree of friendship" msgstr "" -#: ../../Zotlabs/Module/Admin.php:761 -msgid "Allow communications only from these sites" +#: ../../Zotlabs/Module/Connedit.php:721 +msgid "Slide to adjust your rating" msgstr "" -#: ../../Zotlabs/Module/Admin.php:761 -msgid "" -"One site per line. Leave empty to allow communication from anywhere by " -"default" +#: ../../Zotlabs/Module/Connedit.php:722 ../../Zotlabs/Module/Connedit.php:727 +msgid "Optionally explain your rating" msgstr "" -#: ../../Zotlabs/Module/Admin.php:762 -msgid "Block communications from these sites" +#: ../../Zotlabs/Module/Connedit.php:724 +msgid "Custom Filter" msgstr "" -#: ../../Zotlabs/Module/Admin.php:763 -msgid "Allow communications only from these channels" +#: ../../Zotlabs/Module/Connedit.php:725 +msgid "Only import posts with this text" msgstr "" -#: ../../Zotlabs/Module/Admin.php:763 +#: ../../Zotlabs/Module/Connedit.php:725 ../../Zotlabs/Module/Connedit.php:726 msgid "" -"One channel (hash) per line. Leave empty to allow from any channel by default" -msgstr "" - -#: ../../Zotlabs/Module/Admin.php:764 -msgid "Block communications from these channels" -msgstr "" - -#: ../../Zotlabs/Module/Admin.php:765 -msgid "Only allow embeds from secure (SSL) websites and links." -msgstr "" - -#: ../../Zotlabs/Module/Admin.php:766 -msgid "Allow unfiltered embedded HTML content only from these domains" -msgstr "" - -#: ../../Zotlabs/Module/Admin.php:766 -msgid "One site per line. By default embedded content is filtered." -msgstr "" - -#: ../../Zotlabs/Module/Admin.php:767 -msgid "Block embedded HTML from these domains" -msgstr "" - -#: ../../Zotlabs/Module/Admin.php:785 -msgid "Update has been marked successful" -msgstr "" - -#: ../../Zotlabs/Module/Admin.php:795 -#, php-format -msgid "Executing %s failed. Check system logs." -msgstr "" - -#: ../../Zotlabs/Module/Admin.php:798 -#, php-format -msgid "Update %s was successfully applied." -msgstr "" - -#: ../../Zotlabs/Module/Admin.php:802 -#, php-format -msgid "Update %s did not return a status. Unknown if it succeeded." -msgstr "" - -#: ../../Zotlabs/Module/Admin.php:805 -#, php-format -msgid "Update function %s could not be found." -msgstr "" - -#: ../../Zotlabs/Module/Admin.php:821 -msgid "No failed updates." -msgstr "" - -#: ../../Zotlabs/Module/Admin.php:825 -msgid "Failed Updates" -msgstr "" - -#: ../../Zotlabs/Module/Admin.php:827 -msgid "Mark success (if update was manually applied)" -msgstr "" - -#: ../../Zotlabs/Module/Admin.php:828 -msgid "Attempt to execute this update step automatically" -msgstr "" - -#: ../../Zotlabs/Module/Admin.php:859 -msgid "Queue Statistics" -msgstr "" - -#: ../../Zotlabs/Module/Admin.php:860 -msgid "Total Entries" -msgstr "" - -#: ../../Zotlabs/Module/Admin.php:861 -msgid "Priority" -msgstr "" - -#: ../../Zotlabs/Module/Admin.php:862 -msgid "Destination URL" -msgstr "" - -#: ../../Zotlabs/Module/Admin.php:863 -msgid "Mark hub permanently offline" -msgstr "" - -#: ../../Zotlabs/Module/Admin.php:864 -msgid "Empty queue for this hub" +"words one per line or #tags or /patterns/ or lang=xx, leave blank to import " +"all posts" msgstr "" -#: ../../Zotlabs/Module/Admin.php:865 -msgid "Last known contact" +#: ../../Zotlabs/Module/Connedit.php:726 +msgid "Do not import posts with this text" msgstr "" -#: ../../Zotlabs/Module/Admin.php:901 -#, php-format -msgid "%s account blocked/unblocked" -msgid_plural "%s account blocked/unblocked" -msgstr[0] "" -msgstr[1] "" - -#: ../../Zotlabs/Module/Admin.php:908 -#, php-format -msgid "%s account deleted" -msgid_plural "%s accounts deleted" -msgstr[0] "" -msgstr[1] "" - -#: ../../Zotlabs/Module/Admin.php:944 -msgid "Account not found" +#: ../../Zotlabs/Module/Connedit.php:728 +msgid "This information is public!" msgstr "" -#: ../../Zotlabs/Module/Admin.php:955 -#, php-format -msgid "Account '%s' deleted" +#: ../../Zotlabs/Module/Connedit.php:733 +msgid "Connection Pending Approval" msgstr "" -#: ../../Zotlabs/Module/Admin.php:963 -#, php-format -msgid "Account '%s' blocked" +#: ../../Zotlabs/Module/Connedit.php:736 +msgid "inherited" msgstr "" -#: ../../Zotlabs/Module/Admin.php:971 +#: ../../Zotlabs/Module/Connedit.php:738 #, php-format -msgid "Account '%s' unblocked" -msgstr "" - -#: ../../Zotlabs/Module/Admin.php:1031 ../../Zotlabs/Module/Admin.php:1044 -#: ../../include/widgets.php:1456 -msgid "Accounts" -msgstr "" - -#: ../../Zotlabs/Module/Admin.php:1033 ../../Zotlabs/Module/Admin.php:1212 -msgid "select all" -msgstr "" - -#: ../../Zotlabs/Module/Admin.php:1034 -msgid "Registrations waiting for confirm" -msgstr "" - -#: ../../Zotlabs/Module/Admin.php:1035 -msgid "Request date" -msgstr "" - -#: ../../Zotlabs/Module/Admin.php:1036 -msgid "No registrations." -msgstr "" - -#: ../../Zotlabs/Module/Admin.php:1038 -msgid "Deny" -msgstr "" - -#: ../../Zotlabs/Module/Admin.php:1048 ../../include/group.php:267 -msgid "All Channels" -msgstr "" - -#: ../../Zotlabs/Module/Admin.php:1049 -msgid "Register date" -msgstr "" - -#: ../../Zotlabs/Module/Admin.php:1050 -msgid "Last login" -msgstr "" - -#: ../../Zotlabs/Module/Admin.php:1051 -msgid "Expires" -msgstr "" - -#: ../../Zotlabs/Module/Admin.php:1052 -msgid "Service Class" -msgstr "" - -#: ../../Zotlabs/Module/Admin.php:1054 -msgid "" -"Selected accounts will be deleted!\\n\\nEverything these accounts had posted " -"on this site will be permanently deleted!\\n\\nAre you sure?" -msgstr "" - -#: ../../Zotlabs/Module/Admin.php:1055 msgid "" -"The account {0} will be deleted!\\n\\nEverything this account has posted on " -"this site will be permanently deleted!\\n\\nAre you sure?" -msgstr "" - -#: ../../Zotlabs/Module/Admin.php:1091 -#, php-format -msgid "%s channel censored/uncensored" -msgid_plural "%s channels censored/uncensored" -msgstr[0] "" -msgstr[1] "" - -#: ../../Zotlabs/Module/Admin.php:1100 -#, php-format -msgid "%s channel code allowed/disallowed" -msgid_plural "%s channels code allowed/disallowed" -msgstr[0] "" -msgstr[1] "" - -#: ../../Zotlabs/Module/Admin.php:1106 -#, php-format -msgid "%s channel deleted" -msgid_plural "%s channels deleted" -msgstr[0] "" -msgstr[1] "" - -#: ../../Zotlabs/Module/Admin.php:1126 -msgid "Channel not found" -msgstr "" - -#: ../../Zotlabs/Module/Admin.php:1136 -#, php-format -msgid "Channel '%s' deleted" -msgstr "" - -#: ../../Zotlabs/Module/Admin.php:1148 -#, php-format -msgid "Channel '%s' censored" -msgstr "" - -#: ../../Zotlabs/Module/Admin.php:1148 -#, php-format -msgid "Channel '%s' uncensored" -msgstr "" - -#: ../../Zotlabs/Module/Admin.php:1159 -#, php-format -msgid "Channel '%s' code allowed" -msgstr "" - -#: ../../Zotlabs/Module/Admin.php:1159 -#, php-format -msgid "Channel '%s' code disallowed" -msgstr "" - -#: ../../Zotlabs/Module/Admin.php:1210 ../../include/widgets.php:1457 -msgid "Channels" -msgstr "" - -#: ../../Zotlabs/Module/Admin.php:1214 -msgid "Censor" -msgstr "" - -#: ../../Zotlabs/Module/Admin.php:1215 -msgid "Uncensor" -msgstr "" - -#: ../../Zotlabs/Module/Admin.php:1216 -msgid "Allow Code" -msgstr "" - -#: ../../Zotlabs/Module/Admin.php:1217 -msgid "Disallow Code" +"Please choose the profile you would like to display to %s when viewing your " +"profile securely." msgstr "" -#: ../../Zotlabs/Module/Admin.php:1218 ../../include/conversation.php:1626 -msgid "Channel" +#: ../../Zotlabs/Module/Connedit.php:740 +msgid "Their Settings" msgstr "" -#: ../../Zotlabs/Module/Admin.php:1222 -msgid "UID" +#: ../../Zotlabs/Module/Connedit.php:741 +msgid "My Settings" msgstr "" -#: ../../Zotlabs/Module/Admin.php:1226 -msgid "" -"Selected channels will be deleted!\\n\\nEverything that was posted in these " -"channels on this site will be permanently deleted!\\n\\nAre you sure?" +#: ../../Zotlabs/Module/Connedit.php:743 +msgid "Individual Permissions" msgstr "" -#: ../../Zotlabs/Module/Admin.php:1227 +#: ../../Zotlabs/Module/Connedit.php:744 msgid "" -"The channel {0} will be deleted!\\n\\nEverything that was posted in this " -"channel on this site will be permanently deleted!\\n\\nAre you sure?" -msgstr "" - -#: ../../Zotlabs/Module/Admin.php:1284 -#, php-format -msgid "Plugin %s disabled." -msgstr "" - -#: ../../Zotlabs/Module/Admin.php:1288 -#, php-format -msgid "Plugin %s enabled." -msgstr "" - -#: ../../Zotlabs/Module/Admin.php:1298 ../../Zotlabs/Module/Admin.php:1585 -msgid "Disable" -msgstr "" - -#: ../../Zotlabs/Module/Admin.php:1301 ../../Zotlabs/Module/Admin.php:1587 -msgid "Enable" -msgstr "" - -#: ../../Zotlabs/Module/Admin.php:1330 ../../Zotlabs/Module/Admin.php:1420 -#: ../../include/widgets.php:1460 -msgid "Plugins" -msgstr "" - -#: ../../Zotlabs/Module/Admin.php:1331 ../../Zotlabs/Module/Admin.php:1614 -msgid "Toggle" -msgstr "" - -#: ../../Zotlabs/Module/Admin.php:1332 ../../Zotlabs/Module/Admin.php:1615 -#: ../../Zotlabs/Lib/Apps.php:215 ../../include/nav.php:208 -#: ../../include/widgets.php:638 -msgid "Settings" -msgstr "" - -#: ../../Zotlabs/Module/Admin.php:1339 ../../Zotlabs/Module/Admin.php:1624 -msgid "Author: " -msgstr "" - -#: ../../Zotlabs/Module/Admin.php:1340 ../../Zotlabs/Module/Admin.php:1625 -msgid "Maintainer: " -msgstr "" - -#: ../../Zotlabs/Module/Admin.php:1341 -msgid "Minimum project version: " -msgstr "" - -#: ../../Zotlabs/Module/Admin.php:1342 -msgid "Maximum project version: " -msgstr "" - -#: ../../Zotlabs/Module/Admin.php:1343 -msgid "Minimum PHP version: " -msgstr "" - -#: ../../Zotlabs/Module/Admin.php:1344 -msgid "Requires: " -msgstr "" - -#: ../../Zotlabs/Module/Admin.php:1345 ../../Zotlabs/Module/Admin.php:1425 -msgid "Disabled - version incompatibility" -msgstr "" - -#: ../../Zotlabs/Module/Admin.php:1394 -msgid "Enter the public git repository URL of the plugin repo." -msgstr "" - -#: ../../Zotlabs/Module/Admin.php:1395 -msgid "Plugin repo git URL" -msgstr "" - -#: ../../Zotlabs/Module/Admin.php:1396 -msgid "Custom repo name" -msgstr "" - -#: ../../Zotlabs/Module/Admin.php:1396 -msgid "(optional)" -msgstr "" - -#: ../../Zotlabs/Module/Admin.php:1397 -msgid "Download Plugin Repo" -msgstr "" - -#: ../../Zotlabs/Module/Admin.php:1404 -msgid "Install new repo" -msgstr "" - -#: ../../Zotlabs/Module/Admin.php:1405 ../../Zotlabs/Lib/Apps.php:333 -msgid "Install" -msgstr "" - -#: ../../Zotlabs/Module/Admin.php:1427 -msgid "Manage Repos" -msgstr "" - -#: ../../Zotlabs/Module/Admin.php:1428 -msgid "Installed Plugin Repositories" -msgstr "" - -#: ../../Zotlabs/Module/Admin.php:1429 -msgid "Install a New Plugin Repository" -msgstr "" - -#: ../../Zotlabs/Module/Admin.php:1435 ../../Zotlabs/Module/Settings.php:77 -#: ../../Zotlabs/Module/Settings.php:616 ../../Zotlabs/Lib/Apps.php:333 -msgid "Update" -msgstr "" - -#: ../../Zotlabs/Module/Admin.php:1436 -msgid "Switch branch" -msgstr "" - -#: ../../Zotlabs/Module/Admin.php:1550 -msgid "No themes found." -msgstr "" - -#: ../../Zotlabs/Module/Admin.php:1606 -msgid "Screenshot" -msgstr "" - -#: ../../Zotlabs/Module/Admin.php:1613 ../../Zotlabs/Module/Admin.php:1647 -#: ../../include/widgets.php:1461 -msgid "Themes" -msgstr "" - -#: ../../Zotlabs/Module/Admin.php:1652 -msgid "[Experimental]" -msgstr "" - -#: ../../Zotlabs/Module/Admin.php:1653 -msgid "[Unsupported]" -msgstr "" - -#: ../../Zotlabs/Module/Admin.php:1677 -msgid "Log settings updated." -msgstr "" - -#: ../../Zotlabs/Module/Admin.php:1732 ../../include/widgets.php:1482 -#: ../../include/widgets.php:1492 -msgid "Logs" -msgstr "" - -#: ../../Zotlabs/Module/Admin.php:1734 -msgid "Clear" -msgstr "" - -#: ../../Zotlabs/Module/Admin.php:1740 -msgid "Debugging" -msgstr "" - -#: ../../Zotlabs/Module/Admin.php:1741 -msgid "Log file" +"Some permissions may be inherited from your channel's <a href=\"settings" +"\"><strong>privacy settings</strong></a>, which have higher priority than " +"individual settings. You can <strong>not</strong> change those settings here." msgstr "" -#: ../../Zotlabs/Module/Admin.php:1741 +#: ../../Zotlabs/Module/Connedit.php:745 msgid "" -"Must be writable by web server. Relative to your top-level webserver " -"directory." -msgstr "" - -#: ../../Zotlabs/Module/Admin.php:1742 -msgid "Log level" -msgstr "" - -#: ../../Zotlabs/Module/Admin.php:2028 -msgid "New Profile Field" -msgstr "" - -#: ../../Zotlabs/Module/Admin.php:2029 ../../Zotlabs/Module/Admin.php:2049 -msgid "Field nickname" -msgstr "" - -#: ../../Zotlabs/Module/Admin.php:2029 ../../Zotlabs/Module/Admin.php:2049 -msgid "System name of field" -msgstr "" - -#: ../../Zotlabs/Module/Admin.php:2030 ../../Zotlabs/Module/Admin.php:2050 -msgid "Input type" -msgstr "" - -#: ../../Zotlabs/Module/Admin.php:2031 ../../Zotlabs/Module/Admin.php:2051 -msgid "Field Name" -msgstr "" - -#: ../../Zotlabs/Module/Admin.php:2031 ../../Zotlabs/Module/Admin.php:2051 -msgid "Label on profile pages" -msgstr "" - -#: ../../Zotlabs/Module/Admin.php:2032 ../../Zotlabs/Module/Admin.php:2052 -msgid "Help text" -msgstr "" - -#: ../../Zotlabs/Module/Admin.php:2032 ../../Zotlabs/Module/Admin.php:2052 -msgid "Additional info (optional)" -msgstr "" - -#: ../../Zotlabs/Module/Admin.php:2042 -msgid "Field definition not found" -msgstr "" - -#: ../../Zotlabs/Module/Admin.php:2048 -msgid "Edit Profile Field" -msgstr "" - -#: ../../Zotlabs/Module/Admin.php:2106 ../../include/widgets.php:1463 -msgid "Profile Fields" -msgstr "" - -#: ../../Zotlabs/Module/Admin.php:2107 -msgid "Basic Profile Fields" -msgstr "" - -#: ../../Zotlabs/Module/Admin.php:2108 -msgid "Advanced Profile Fields" -msgstr "" - -#: ../../Zotlabs/Module/Admin.php:2108 -msgid "(In addition to basic fields)" -msgstr "" - -#: ../../Zotlabs/Module/Admin.php:2110 -msgid "All available fields" -msgstr "" - -#: ../../Zotlabs/Module/Admin.php:2111 -msgid "Custom Fields" -msgstr "" - -#: ../../Zotlabs/Module/Admin.php:2115 -msgid "Create Custom Field" -msgstr "" - -#: ../../Zotlabs/Module/Appman.php:37 ../../Zotlabs/Module/Appman.php:53 -msgid "App installed." -msgstr "" - -#: ../../Zotlabs/Module/Appman.php:46 -msgid "Malformed app." -msgstr "" - -#: ../../Zotlabs/Module/Appman.php:104 -msgid "Embed code" -msgstr "" - -#: ../../Zotlabs/Module/Appman.php:110 ../../include/widgets.php:107 -msgid "Edit App" -msgstr "" - -#: ../../Zotlabs/Module/Appman.php:110 -msgid "Create App" -msgstr "" - -#: ../../Zotlabs/Module/Appman.php:115 -msgid "Name of app" -msgstr "" - -#: ../../Zotlabs/Module/Appman.php:116 -msgid "Location (URL) of app" -msgstr "" - -#: ../../Zotlabs/Module/Appman.php:118 -msgid "Photo icon URL" -msgstr "" - -#: ../../Zotlabs/Module/Appman.php:118 -msgid "80 x 80 pixels - optional" +"Some permissions may be inherited from your channel's <a href=\"settings" +"\"><strong>privacy settings</strong></a>, which have higher priority than " +"individual settings. You can change those settings here but they wont have " +"any impact unless the inherited setting changes." msgstr "" -#: ../../Zotlabs/Module/Appman.php:119 -msgid "Categories (optional, comma separated list)" +#: ../../Zotlabs/Module/Connedit.php:746 +msgid "Last update:" msgstr "" -#: ../../Zotlabs/Module/Appman.php:120 -msgid "Version ID" +#: ../../Zotlabs/Module/Channel.php:41 +msgid "Posts and comments" msgstr "" -#: ../../Zotlabs/Module/Appman.php:121 -msgid "Price of app" +#: ../../Zotlabs/Module/Channel.php:42 +msgid "Only posts" msgstr "" -#: ../../Zotlabs/Module/Appman.php:122 -msgid "Location (URL) to purchase app" +#: ../../Zotlabs/Module/Channel.php:102 +msgid "Insufficient permissions. Request redirected to profile page." msgstr "" #: ../../Zotlabs/Module/Rbmark.php:94 @@ -5177,7 +5203,7 @@ msgstr "" msgid "Basic Settings" msgstr "" -#: ../../Zotlabs/Module/Settings.php:1040 ../../include/channel.php:1121 +#: ../../Zotlabs/Module/Settings.php:1040 ../../include/channel.php:1128 msgid "Full Name:" msgstr "" @@ -5929,56 +5955,56 @@ msgstr "" msgid "Version %s" msgstr "" -#: ../../Zotlabs/Module/Siteinfo.php:40 +#: ../../Zotlabs/Module/Siteinfo.php:34 msgid "Installed plugins/addons/apps:" msgstr "" -#: ../../Zotlabs/Module/Siteinfo.php:53 +#: ../../Zotlabs/Module/Siteinfo.php:36 msgid "No installed plugins/addons/apps" msgstr "" -#: ../../Zotlabs/Module/Siteinfo.php:66 +#: ../../Zotlabs/Module/Siteinfo.php:49 msgid "" "This is a hub of $Projectname - a global cooperative network of " "decentralized privacy enhanced websites." msgstr "" -#: ../../Zotlabs/Module/Siteinfo.php:68 +#: ../../Zotlabs/Module/Siteinfo.php:51 msgid "Tag: " msgstr "" -#: ../../Zotlabs/Module/Siteinfo.php:70 +#: ../../Zotlabs/Module/Siteinfo.php:53 msgid "Last background fetch: " msgstr "" -#: ../../Zotlabs/Module/Siteinfo.php:72 +#: ../../Zotlabs/Module/Siteinfo.php:55 msgid "Current load average: " msgstr "" -#: ../../Zotlabs/Module/Siteinfo.php:75 +#: ../../Zotlabs/Module/Siteinfo.php:58 msgid "Running at web location" msgstr "" -#: ../../Zotlabs/Module/Siteinfo.php:76 +#: ../../Zotlabs/Module/Siteinfo.php:59 msgid "" "Please visit <a href=\"http://hubzilla.org\">hubzilla.org</a> to learn more " "about $Projectname." msgstr "" -#: ../../Zotlabs/Module/Siteinfo.php:77 +#: ../../Zotlabs/Module/Siteinfo.php:60 msgid "Bug reports and issues: please visit" msgstr "" -#: ../../Zotlabs/Module/Siteinfo.php:79 +#: ../../Zotlabs/Module/Siteinfo.php:62 msgid "$projectname issues" msgstr "" -#: ../../Zotlabs/Module/Siteinfo.php:80 +#: ../../Zotlabs/Module/Siteinfo.php:63 msgid "" "Suggestions, praise, etc. - please email \"redmatrix\" at librelist - dot com" msgstr "" -#: ../../Zotlabs/Module/Siteinfo.php:82 +#: ../../Zotlabs/Module/Siteinfo.php:65 msgid "Site Administrators" msgstr "" @@ -6079,7 +6105,7 @@ msgstr "" msgid "post" msgstr "" -#: ../../Zotlabs/Module/Tagger.php:57 ../../include/text.php:1949 +#: ../../Zotlabs/Module/Tagger.php:57 ../../include/text.php:1925 #: ../../include/conversation.php:150 msgid "comment" msgstr "" @@ -6233,21 +6259,22 @@ msgstr "" msgid "Source of Item" msgstr "" -#: ../../Zotlabs/Module/Webpages.php:192 ../../Zotlabs/Lib/Apps.php:217 -#: ../../include/conversation.php:1700 ../../include/nav.php:106 -msgid "Webpages" +#: ../../Zotlabs/Module/Api.php:61 ../../Zotlabs/Module/Api.php:85 +msgid "Authorize application connection" msgstr "" -#: ../../Zotlabs/Module/Webpages.php:203 ../../include/page_widgets.php:44 -msgid "Actions" +#: ../../Zotlabs/Module/Api.php:62 +msgid "Return to your app and insert this Securty Code:" msgstr "" -#: ../../Zotlabs/Module/Webpages.php:204 ../../include/page_widgets.php:45 -msgid "Page Link" +#: ../../Zotlabs/Module/Api.php:72 +msgid "Please login to continue." msgstr "" -#: ../../Zotlabs/Module/Webpages.php:205 -msgid "Page Title" +#: ../../Zotlabs/Module/Api.php:87 +msgid "" +"Do you want to authorize this application to access your posts and contacts, " +"and/or create new posts for you?" msgstr "" #: ../../Zotlabs/Module/Xchan.php:10 @@ -6258,248 +6285,110 @@ msgstr "" msgid "Lookup xchan beginning with (or webbie): " msgstr "" -#: ../../Zotlabs/Module/Wiki.php:75 ../../Zotlabs/Lib/Apps.php:218 -msgid "Wiki" -msgstr "" - -#: ../../Zotlabs/Module/Wiki.php:76 -msgid "Sandbox" -msgstr "" - -#: ../../Zotlabs/Module/Wiki.php:156 -msgid "Enter the name of your new wiki:" -msgstr "" - -#: ../../Zotlabs/Module/Wiki.php:157 -msgid "Enter the name of the new page:" -msgstr "" - -#: ../../Zotlabs/Module/Wiki.php:158 -msgid "Enter the new name:" -msgstr "" - -#: ../../Zotlabs/Lib/Chatroom.php:27 -msgid "Missing room name" -msgstr "" - -#: ../../Zotlabs/Lib/Chatroom.php:36 -msgid "Duplicate room name" -msgstr "" - -#: ../../Zotlabs/Lib/Chatroom.php:86 ../../Zotlabs/Lib/Chatroom.php:94 -msgid "Invalid room specifier." -msgstr "" - -#: ../../Zotlabs/Lib/Chatroom.php:126 -msgid "Room not found." -msgstr "" - -#: ../../Zotlabs/Lib/Chatroom.php:147 -msgid "Room is full" -msgstr "" - -#: ../../Zotlabs/Lib/Enotify.php:60 ../../include/network.php:1848 -msgid "$Projectname Notification" -msgstr "" - -#: ../../Zotlabs/Lib/Enotify.php:61 ../../include/network.php:1849 -msgid "$projectname" -msgstr "" - -#: ../../Zotlabs/Lib/Enotify.php:63 ../../include/network.php:1851 -msgid "Thank You," -msgstr "" - -#: ../../Zotlabs/Lib/Enotify.php:65 ../../include/network.php:1853 -#, php-format -msgid "%s Administrator" -msgstr "" - -#: ../../Zotlabs/Lib/Enotify.php:100 -#, php-format -msgid "%s <!item_type!>" -msgstr "" - -#: ../../Zotlabs/Lib/Enotify.php:104 -#, php-format -msgid "[Hubzilla:Notify] New mail received at %s" -msgstr "" - -#: ../../Zotlabs/Lib/Enotify.php:106 -#, php-format -msgid "%1$s, %2$s sent you a new private message at %3$s." -msgstr "" - -#: ../../Zotlabs/Lib/Enotify.php:107 -#, php-format -msgid "%1$s sent you %2$s." -msgstr "" - -#: ../../Zotlabs/Lib/Enotify.php:107 -msgid "a private message" -msgstr "" - -#: ../../Zotlabs/Lib/Enotify.php:108 -#, php-format -msgid "Please visit %s to view and/or reply to your private messages." -msgstr "" - -#: ../../Zotlabs/Lib/Enotify.php:164 -#, php-format -msgid "%1$s, %2$s commented on [zrl=%3$s]a %4$s[/zrl]" -msgstr "" - -#: ../../Zotlabs/Lib/Enotify.php:172 -#, php-format -msgid "%1$s, %2$s commented on [zrl=%3$s]%4$s's %5$s[/zrl]" -msgstr "" - -#: ../../Zotlabs/Lib/Enotify.php:181 -#, php-format -msgid "%1$s, %2$s commented on [zrl=%3$s]your %4$s[/zrl]" -msgstr "" - -#: ../../Zotlabs/Lib/Enotify.php:192 -#, php-format -msgid "[Hubzilla:Notify] Comment to conversation #%1$d by %2$s" -msgstr "" - -#: ../../Zotlabs/Lib/Enotify.php:193 -#, php-format -msgid "%1$s, %2$s commented on an item/conversation you have been following." -msgstr "" - -#: ../../Zotlabs/Lib/Enotify.php:196 ../../Zotlabs/Lib/Enotify.php:211 -#: ../../Zotlabs/Lib/Enotify.php:237 ../../Zotlabs/Lib/Enotify.php:255 -#: ../../Zotlabs/Lib/Enotify.php:269 -#, php-format -msgid "Please visit %s to view and/or reply to the conversation." -msgstr "" - -#: ../../Zotlabs/Lib/Enotify.php:202 -#, php-format -msgid "[Hubzilla:Notify] %s posted to your profile wall" +#: ../../Zotlabs/Lib/Apps.php:204 +msgid "Site Admin" msgstr "" -#: ../../Zotlabs/Lib/Enotify.php:204 -#, php-format -msgid "%1$s, %2$s posted to your profile wall at %3$s" +#: ../../Zotlabs/Lib/Apps.php:205 +msgid "Bug Report" msgstr "" -#: ../../Zotlabs/Lib/Enotify.php:206 -#, php-format -msgid "%1$s, %2$s posted to [zrl=%3$s]your wall[/zrl]" +#: ../../Zotlabs/Lib/Apps.php:206 +msgid "View Bookmarks" msgstr "" -#: ../../Zotlabs/Lib/Enotify.php:230 -#, php-format -msgid "[Hubzilla:Notify] %s tagged you" +#: ../../Zotlabs/Lib/Apps.php:207 +msgid "My Chatrooms" msgstr "" -#: ../../Zotlabs/Lib/Enotify.php:231 -#, php-format -msgid "%1$s, %2$s tagged you at %3$s" +#: ../../Zotlabs/Lib/Apps.php:209 +msgid "Firefox Share" msgstr "" -#: ../../Zotlabs/Lib/Enotify.php:232 -#, php-format -msgid "%1$s, %2$s [zrl=%3$s]tagged you[/zrl]." +#: ../../Zotlabs/Lib/Apps.php:210 +msgid "Remote Diagnostics" msgstr "" -#: ../../Zotlabs/Lib/Enotify.php:244 -#, php-format -msgid "[Hubzilla:Notify] %1$s poked you" +#: ../../Zotlabs/Lib/Apps.php:211 ../../include/features.php:89 +msgid "Suggest Channels" msgstr "" -#: ../../Zotlabs/Lib/Enotify.php:245 -#, php-format -msgid "%1$s, %2$s poked you at %3$s" +#: ../../Zotlabs/Lib/Apps.php:212 ../../include/nav.php:110 +#: ../../boot.php:1704 +msgid "Login" msgstr "" -#: ../../Zotlabs/Lib/Enotify.php:246 -#, php-format -msgid "%1$s, %2$s [zrl=%2$s]poked you[/zrl]." +#: ../../Zotlabs/Lib/Apps.php:214 ../../include/nav.php:179 +msgid "Grid" msgstr "" -#: ../../Zotlabs/Lib/Enotify.php:262 -#, php-format -msgid "[Hubzilla:Notify] %s tagged your post" +#: ../../Zotlabs/Lib/Apps.php:219 ../../include/nav.php:182 +msgid "Channel Home" msgstr "" -#: ../../Zotlabs/Lib/Enotify.php:263 -#, php-format -msgid "%1$s, %2$s tagged your post at %3$s" +#: ../../Zotlabs/Lib/Apps.php:222 ../../include/nav.php:201 +#: ../../include/conversation.php:1664 ../../include/conversation.php:1667 +msgid "Events" msgstr "" -#: ../../Zotlabs/Lib/Enotify.php:264 -#, php-format -msgid "%1$s, %2$s tagged [zrl=%3$s]your post[/zrl]" +#: ../../Zotlabs/Lib/Apps.php:223 ../../include/nav.php:167 +msgid "Directory" msgstr "" -#: ../../Zotlabs/Lib/Enotify.php:276 -msgid "[Hubzilla:Notify] Introduction received" +#: ../../Zotlabs/Lib/Apps.php:225 ../../include/nav.php:193 +msgid "Mail" msgstr "" -#: ../../Zotlabs/Lib/Enotify.php:277 -#, php-format -msgid "%1$s, you've received an new connection request from '%2$s' at %3$s" +#: ../../Zotlabs/Lib/Apps.php:228 ../../include/nav.php:96 +msgid "Chat" msgstr "" -#: ../../Zotlabs/Lib/Enotify.php:278 -#, php-format -msgid "" -"%1$s, you've received [zrl=%2$s]a new connection request[/zrl] from %3$s." +#: ../../Zotlabs/Lib/Apps.php:230 +msgid "Probe" msgstr "" -#: ../../Zotlabs/Lib/Enotify.php:282 ../../Zotlabs/Lib/Enotify.php:301 -#, php-format -msgid "You may visit their profile at %s" +#: ../../Zotlabs/Lib/Apps.php:231 +msgid "Suggest" msgstr "" -#: ../../Zotlabs/Lib/Enotify.php:284 -#, php-format -msgid "Please visit %s to approve or reject the connection request." +#: ../../Zotlabs/Lib/Apps.php:232 +msgid "Random Channel" msgstr "" -#: ../../Zotlabs/Lib/Enotify.php:291 -msgid "[Hubzilla:Notify] Friend suggestion received" +#: ../../Zotlabs/Lib/Apps.php:233 +msgid "Invite" msgstr "" -#: ../../Zotlabs/Lib/Enotify.php:292 -#, php-format -msgid "%1$s, you've received a friend suggestion from '%2$s' at %3$s" +#: ../../Zotlabs/Lib/Apps.php:234 ../../include/widgets.php:1459 +msgid "Features" msgstr "" -#: ../../Zotlabs/Lib/Enotify.php:293 -#, php-format -msgid "" -"%1$s, you've received [zrl=%2$s]a friend suggestion[/zrl] for %3$s from %4$s." +#: ../../Zotlabs/Lib/Apps.php:236 +msgid "Post" msgstr "" -#: ../../Zotlabs/Lib/Enotify.php:299 -msgid "Name:" +#: ../../Zotlabs/Lib/Apps.php:338 +msgid "Purchase" msgstr "" -#: ../../Zotlabs/Lib/Enotify.php:300 -msgid "Photo:" +#: ../../Zotlabs/Lib/Chatroom.php:27 +msgid "Missing room name" msgstr "" -#: ../../Zotlabs/Lib/Enotify.php:303 -#, php-format -msgid "Please visit %s to approve or reject the suggestion." +#: ../../Zotlabs/Lib/Chatroom.php:36 +msgid "Duplicate room name" msgstr "" -#: ../../Zotlabs/Lib/Enotify.php:518 -msgid "[Hubzilla:Notify]" +#: ../../Zotlabs/Lib/Chatroom.php:86 ../../Zotlabs/Lib/Chatroom.php:94 +msgid "Invalid room specifier." msgstr "" -#: ../../Zotlabs/Lib/Enotify.php:667 -msgid "created a new post" +#: ../../Zotlabs/Lib/Chatroom.php:126 +msgid "Room not found." msgstr "" -#: ../../Zotlabs/Lib/Enotify.php:668 -#, php-format -msgid "commented on %s's post" +#: ../../Zotlabs/Lib/Chatroom.php:147 +msgid "Room is full" msgstr "" #: ../../Zotlabs/Lib/ThreadItem.php:95 ../../include/conversation.php:667 @@ -6677,90 +6566,208 @@ msgstr "" msgid "Video" msgstr "" -#: ../../Zotlabs/Lib/Apps.php:204 -msgid "Site Admin" +#: ../../Zotlabs/Lib/Enotify.php:60 ../../include/network.php:1863 +msgid "$Projectname Notification" msgstr "" -#: ../../Zotlabs/Lib/Apps.php:205 -msgid "Bug Report" +#: ../../Zotlabs/Lib/Enotify.php:61 ../../include/network.php:1864 +msgid "$projectname" msgstr "" -#: ../../Zotlabs/Lib/Apps.php:206 -msgid "View Bookmarks" +#: ../../Zotlabs/Lib/Enotify.php:63 ../../include/network.php:1866 +msgid "Thank You," msgstr "" -#: ../../Zotlabs/Lib/Apps.php:207 -msgid "My Chatrooms" +#: ../../Zotlabs/Lib/Enotify.php:65 ../../include/network.php:1868 +#, php-format +msgid "%s Administrator" msgstr "" -#: ../../Zotlabs/Lib/Apps.php:209 -msgid "Firefox Share" +#: ../../Zotlabs/Lib/Enotify.php:100 +#, php-format +msgid "%s <!item_type!>" msgstr "" -#: ../../Zotlabs/Lib/Apps.php:210 -msgid "Remote Diagnostics" +#: ../../Zotlabs/Lib/Enotify.php:104 +#, php-format +msgid "[Hubzilla:Notify] New mail received at %s" msgstr "" -#: ../../Zotlabs/Lib/Apps.php:211 ../../include/features.php:89 -msgid "Suggest Channels" +#: ../../Zotlabs/Lib/Enotify.php:106 +#, php-format +msgid "%1$s, %2$s sent you a new private message at %3$s." msgstr "" -#: ../../Zotlabs/Lib/Apps.php:212 ../../include/nav.php:110 -#: ../../boot.php:1704 -msgid "Login" +#: ../../Zotlabs/Lib/Enotify.php:107 +#, php-format +msgid "%1$s sent you %2$s." msgstr "" -#: ../../Zotlabs/Lib/Apps.php:214 ../../include/nav.php:179 -msgid "Grid" +#: ../../Zotlabs/Lib/Enotify.php:107 +msgid "a private message" msgstr "" -#: ../../Zotlabs/Lib/Apps.php:219 ../../include/nav.php:182 -msgid "Channel Home" +#: ../../Zotlabs/Lib/Enotify.php:108 +#, php-format +msgid "Please visit %s to view and/or reply to your private messages." msgstr "" -#: ../../Zotlabs/Lib/Apps.php:222 ../../include/conversation.php:1664 -#: ../../include/conversation.php:1667 ../../include/nav.php:201 -msgid "Events" +#: ../../Zotlabs/Lib/Enotify.php:164 +#, php-format +msgid "%1$s, %2$s commented on [zrl=%3$s]a %4$s[/zrl]" msgstr "" -#: ../../Zotlabs/Lib/Apps.php:223 ../../include/nav.php:167 -msgid "Directory" +#: ../../Zotlabs/Lib/Enotify.php:172 +#, php-format +msgid "%1$s, %2$s commented on [zrl=%3$s]%4$s's %5$s[/zrl]" msgstr "" -#: ../../Zotlabs/Lib/Apps.php:225 ../../include/nav.php:193 -msgid "Mail" +#: ../../Zotlabs/Lib/Enotify.php:181 +#, php-format +msgid "%1$s, %2$s commented on [zrl=%3$s]your %4$s[/zrl]" msgstr "" -#: ../../Zotlabs/Lib/Apps.php:228 ../../include/nav.php:96 -msgid "Chat" +#: ../../Zotlabs/Lib/Enotify.php:192 +#, php-format +msgid "[Hubzilla:Notify] Comment to conversation #%1$d by %2$s" msgstr "" -#: ../../Zotlabs/Lib/Apps.php:230 -msgid "Probe" +#: ../../Zotlabs/Lib/Enotify.php:193 +#, php-format +msgid "%1$s, %2$s commented on an item/conversation you have been following." msgstr "" -#: ../../Zotlabs/Lib/Apps.php:231 -msgid "Suggest" +#: ../../Zotlabs/Lib/Enotify.php:196 ../../Zotlabs/Lib/Enotify.php:211 +#: ../../Zotlabs/Lib/Enotify.php:237 ../../Zotlabs/Lib/Enotify.php:255 +#: ../../Zotlabs/Lib/Enotify.php:269 +#, php-format +msgid "Please visit %s to view and/or reply to the conversation." msgstr "" -#: ../../Zotlabs/Lib/Apps.php:232 -msgid "Random Channel" +#: ../../Zotlabs/Lib/Enotify.php:202 +#, php-format +msgid "[Hubzilla:Notify] %s posted to your profile wall" msgstr "" -#: ../../Zotlabs/Lib/Apps.php:233 -msgid "Invite" +#: ../../Zotlabs/Lib/Enotify.php:204 +#, php-format +msgid "%1$s, %2$s posted to your profile wall at %3$s" msgstr "" -#: ../../Zotlabs/Lib/Apps.php:234 ../../include/widgets.php:1459 -msgid "Features" +#: ../../Zotlabs/Lib/Enotify.php:206 +#, php-format +msgid "%1$s, %2$s posted to [zrl=%3$s]your wall[/zrl]" msgstr "" -#: ../../Zotlabs/Lib/Apps.php:236 -msgid "Post" +#: ../../Zotlabs/Lib/Enotify.php:230 +#, php-format +msgid "[Hubzilla:Notify] %s tagged you" msgstr "" -#: ../../Zotlabs/Lib/Apps.php:338 -msgid "Purchase" +#: ../../Zotlabs/Lib/Enotify.php:231 +#, php-format +msgid "%1$s, %2$s tagged you at %3$s" +msgstr "" + +#: ../../Zotlabs/Lib/Enotify.php:232 +#, php-format +msgid "%1$s, %2$s [zrl=%3$s]tagged you[/zrl]." +msgstr "" + +#: ../../Zotlabs/Lib/Enotify.php:244 +#, php-format +msgid "[Hubzilla:Notify] %1$s poked you" +msgstr "" + +#: ../../Zotlabs/Lib/Enotify.php:245 +#, php-format +msgid "%1$s, %2$s poked you at %3$s" +msgstr "" + +#: ../../Zotlabs/Lib/Enotify.php:246 +#, php-format +msgid "%1$s, %2$s [zrl=%2$s]poked you[/zrl]." +msgstr "" + +#: ../../Zotlabs/Lib/Enotify.php:262 +#, php-format +msgid "[Hubzilla:Notify] %s tagged your post" +msgstr "" + +#: ../../Zotlabs/Lib/Enotify.php:263 +#, php-format +msgid "%1$s, %2$s tagged your post at %3$s" +msgstr "" + +#: ../../Zotlabs/Lib/Enotify.php:264 +#, php-format +msgid "%1$s, %2$s tagged [zrl=%3$s]your post[/zrl]" +msgstr "" + +#: ../../Zotlabs/Lib/Enotify.php:276 +msgid "[Hubzilla:Notify] Introduction received" +msgstr "" + +#: ../../Zotlabs/Lib/Enotify.php:277 +#, php-format +msgid "%1$s, you've received an new connection request from '%2$s' at %3$s" +msgstr "" + +#: ../../Zotlabs/Lib/Enotify.php:278 +#, php-format +msgid "" +"%1$s, you've received [zrl=%2$s]a new connection request[/zrl] from %3$s." +msgstr "" + +#: ../../Zotlabs/Lib/Enotify.php:282 ../../Zotlabs/Lib/Enotify.php:301 +#, php-format +msgid "You may visit their profile at %s" +msgstr "" + +#: ../../Zotlabs/Lib/Enotify.php:284 +#, php-format +msgid "Please visit %s to approve or reject the connection request." +msgstr "" + +#: ../../Zotlabs/Lib/Enotify.php:291 +msgid "[Hubzilla:Notify] Friend suggestion received" +msgstr "" + +#: ../../Zotlabs/Lib/Enotify.php:292 +#, php-format +msgid "%1$s, you've received a friend suggestion from '%2$s' at %3$s" +msgstr "" + +#: ../../Zotlabs/Lib/Enotify.php:293 +#, php-format +msgid "" +"%1$s, you've received [zrl=%2$s]a friend suggestion[/zrl] for %3$s from %4$s." +msgstr "" + +#: ../../Zotlabs/Lib/Enotify.php:299 +msgid "Name:" +msgstr "" + +#: ../../Zotlabs/Lib/Enotify.php:300 +msgid "Photo:" +msgstr "" + +#: ../../Zotlabs/Lib/Enotify.php:303 +#, php-format +msgid "Please visit %s to approve or reject the suggestion." +msgstr "" + +#: ../../Zotlabs/Lib/Enotify.php:518 +msgid "[Hubzilla:Notify]" +msgstr "" + +#: ../../Zotlabs/Lib/Enotify.php:667 +msgid "created a new post" +msgstr "" + +#: ../../Zotlabs/Lib/Enotify.php:668 +#, php-format +msgid "commented on %s's post" msgstr "" #: ../../include/Import/import_diaspora.php:16 @@ -6776,834 +6783,821 @@ msgstr "" msgid "Cannot locate DNS info for database server '%s'" msgstr "" -#: ../../include/taxonomy.php:188 ../../include/taxonomy.php:270 -#: ../../include/contact_widgets.php:91 ../../include/widgets.php:46 -#: ../../include/widgets.php:429 -msgid "Categories" +#: ../../include/acl_selectors.php:232 +#: ../../include/PermissionDescription.php:31 +msgid "Visible to your default audience" msgstr "" -#: ../../include/taxonomy.php:228 ../../include/taxonomy.php:249 -msgid "Tags" +#: ../../include/acl_selectors.php:268 +#: ../../include/PermissionDescription.php:115 +msgid "Only me" msgstr "" -#: ../../include/taxonomy.php:293 -msgid "Keywords" +#: ../../include/acl_selectors.php:271 +msgid "Who can see this?" msgstr "" -#: ../../include/taxonomy.php:314 -msgid "have" +#: ../../include/acl_selectors.php:272 +msgid "Custom selection" msgstr "" -#: ../../include/taxonomy.php:314 -msgid "has" +#: ../../include/acl_selectors.php:273 +msgid "" +"Select \"Show\" to allow viewing. \"Don't show\" lets you override and limit " +"the scope of \"Show\"." msgstr "" -#: ../../include/taxonomy.php:315 -msgid "want" +#: ../../include/acl_selectors.php:274 +msgid "Show" msgstr "" -#: ../../include/taxonomy.php:315 -msgid "wants" +#: ../../include/acl_selectors.php:275 +msgid "Don't show" msgstr "" -#: ../../include/taxonomy.php:316 -msgid "likes" +#: ../../include/acl_selectors.php:281 +msgid "Other networks and post services" msgstr "" -#: ../../include/taxonomy.php:317 -msgid "dislikes" +#: ../../include/acl_selectors.php:311 +#, 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 "" -#: ../../include/photos.php:114 -#, php-format -msgid "Image exceeds website size limit of %lu bytes" +#: ../../include/bb2diaspora.php:398 +msgid "Attachments:" msgstr "" -#: ../../include/photos.php:121 -msgid "Image file is empty." +#: ../../include/bb2diaspora.php:485 ../../include/event.php:22 +#: ../../include/event.php:69 +msgid "l F d, Y \\@ g:i A" msgstr "" -#: ../../include/photos.php:259 -msgid "Photo storage failed." +#: ../../include/bb2diaspora.php:487 +msgid "$Projectname event notification:" msgstr "" -#: ../../include/photos.php:299 -msgid "a new photo" +#: ../../include/bb2diaspora.php:491 ../../include/event.php:30 +#: ../../include/event.php:73 +msgid "Starts:" msgstr "" -#: ../../include/photos.php:303 -#, php-format -msgctxt "photo_upload" -msgid "%1$s posted %2$s to %3$s" +#: ../../include/bb2diaspora.php:499 ../../include/event.php:40 +#: ../../include/event.php:77 +msgid "Finishes:" msgstr "" -#: ../../include/photos.php:506 ../../include/conversation.php:1650 -msgid "Photo Albums" +#: ../../include/import.php:29 +msgid "" +"Cannot create a duplicate channel identifier on this system. Import failed." msgstr "" -#: ../../include/photos.php:510 -msgid "Upload New Photos" +#: ../../include/import.php:76 +msgid "Channel clone failed. Import failed." msgstr "" -#: ../../include/text.php:428 -msgid "prev" +#: ../../include/items.php:902 ../../include/items.php:947 +msgid "(Unknown)" msgstr "" -#: ../../include/text.php:430 -msgid "first" +#: ../../include/items.php:1146 +msgid "Visible to anybody on the internet." msgstr "" -#: ../../include/text.php:459 -msgid "last" +#: ../../include/items.php:1148 +msgid "Visible to you only." msgstr "" -#: ../../include/text.php:462 -msgid "next" +#: ../../include/items.php:1150 +msgid "Visible to anybody in this network." msgstr "" -#: ../../include/text.php:472 -msgid "older" +#: ../../include/items.php:1152 +msgid "Visible to anybody authenticated." msgstr "" -#: ../../include/text.php:474 -msgid "newer" +#: ../../include/items.php:1154 +#, php-format +msgid "Visible to anybody on %s." msgstr "" -#: ../../include/text.php:863 -msgid "No connections" +#: ../../include/items.php:1156 +msgid "Visible to all connections." +msgstr "" + +#: ../../include/items.php:1158 +msgid "Visible to approved connections." +msgstr "" + +#: ../../include/items.php:1160 +msgid "Visible to specific connections." msgstr "" -#: ../../include/text.php:888 +#: ../../include/items.php:3932 +msgid "Privacy group is empty." +msgstr "" + +#: ../../include/items.php:3939 #, php-format -msgid "View all %s connections" +msgid "Privacy group: %s" msgstr "" -#: ../../include/text.php:1033 ../../include/text.php:1038 -msgid "poke" +#: ../../include/items.php:3951 +msgid "Connection not found." msgstr "" -#: ../../include/text.php:1033 ../../include/text.php:1038 -#: ../../include/conversation.php:243 -msgid "poked" +#: ../../include/items.php:4317 +msgid "profile photo" msgstr "" -#: ../../include/text.php:1039 -msgid "ping" +#: ../../include/oembed.php:326 +msgid "Embedded content" msgstr "" -#: ../../include/text.php:1039 -msgid "pinged" +#: ../../include/oembed.php:335 +msgid "Embedding disabled" msgstr "" -#: ../../include/text.php:1040 -msgid "prod" +#: ../../include/api.php:1326 +msgid "Public Timeline" msgstr "" -#: ../../include/text.php:1040 -msgid "prodded" +#: ../../include/group.php:26 +msgid "" +"A deleted group with this name was revived. Existing item permissions " +"<strong>may</strong> apply to this group and any future members. If this is " +"not what you intended, please create another group with a different name." msgstr "" -#: ../../include/text.php:1041 -msgid "slap" +#: ../../include/group.php:248 +msgid "Add new connections to this privacy group" msgstr "" -#: ../../include/text.php:1041 -msgid "slapped" +#: ../../include/group.php:289 +msgid "edit" msgstr "" -#: ../../include/text.php:1042 -msgid "finger" +#: ../../include/group.php:311 ../../include/features.php:83 +msgid "Privacy Groups" msgstr "" -#: ../../include/text.php:1042 -msgid "fingered" +#: ../../include/group.php:312 +msgid "Edit group" msgstr "" -#: ../../include/text.php:1043 -msgid "rebuff" +#: ../../include/group.php:313 +msgid "Add privacy group" msgstr "" -#: ../../include/text.php:1043 -msgid "rebuffed" +#: ../../include/group.php:314 +msgid "Channels not in any privacy group" msgstr "" -#: ../../include/text.php:1055 -msgid "happy" +#: ../../include/group.php:316 ../../include/widgets.php:282 +msgid "add" msgstr "" -#: ../../include/text.php:1056 -msgid "sad" +#: ../../include/zot.php:709 +msgid "Invalid data packet" msgstr "" -#: ../../include/text.php:1057 -msgid "mellow" +#: ../../include/zot.php:725 +msgid "Unable to verify channel signature" msgstr "" -#: ../../include/text.php:1058 -msgid "tired" +#: ../../include/zot.php:2373 +#, php-format +msgid "Unable to verify site signature for %s" msgstr "" -#: ../../include/text.php:1059 -msgid "perky" +#: ../../include/zot.php:3718 +msgid "invalid target signature" msgstr "" -#: ../../include/text.php:1060 -msgid "angry" +#: ../../include/selectors.php:30 +msgid "Frequently" msgstr "" -#: ../../include/text.php:1061 -msgid "stupefied" +#: ../../include/selectors.php:31 +msgid "Hourly" msgstr "" -#: ../../include/text.php:1062 -msgid "puzzled" +#: ../../include/selectors.php:32 +msgid "Twice daily" msgstr "" -#: ../../include/text.php:1063 -msgid "interested" +#: ../../include/selectors.php:33 +msgid "Daily" msgstr "" -#: ../../include/text.php:1064 -msgid "bitter" +#: ../../include/selectors.php:34 +msgid "Weekly" msgstr "" -#: ../../include/text.php:1065 -msgid "cheerful" +#: ../../include/selectors.php:35 +msgid "Monthly" msgstr "" -#: ../../include/text.php:1066 -msgid "alive" +#: ../../include/selectors.php:49 +msgid "Currently Male" msgstr "" -#: ../../include/text.php:1067 -msgid "annoyed" +#: ../../include/selectors.php:49 +msgid "Currently Female" msgstr "" -#: ../../include/text.php:1068 -msgid "anxious" +#: ../../include/selectors.php:49 +msgid "Mostly Male" msgstr "" -#: ../../include/text.php:1069 -msgid "cranky" +#: ../../include/selectors.php:49 +msgid "Mostly Female" msgstr "" -#: ../../include/text.php:1070 -msgid "disturbed" +#: ../../include/selectors.php:49 +msgid "Transgender" msgstr "" -#: ../../include/text.php:1071 -msgid "frustrated" +#: ../../include/selectors.php:49 +msgid "Intersex" msgstr "" -#: ../../include/text.php:1072 -msgid "depressed" +#: ../../include/selectors.php:49 +msgid "Transsexual" msgstr "" -#: ../../include/text.php:1073 -msgid "motivated" +#: ../../include/selectors.php:49 +msgid "Hermaphrodite" msgstr "" -#: ../../include/text.php:1074 -msgid "relaxed" +#: ../../include/selectors.php:49 +msgid "Neuter" msgstr "" -#: ../../include/text.php:1075 -msgid "surprised" +#: ../../include/selectors.php:49 +msgid "Non-specific" msgstr "" -#: ../../include/text.php:1257 ../../include/js_strings.php:70 -msgid "Monday" +#: ../../include/selectors.php:49 ../../include/selectors.php:66 +#: ../../include/selectors.php:104 ../../include/selectors.php:140 +#: ../../include/permissions.php:881 +msgid "Other" msgstr "" -#: ../../include/text.php:1257 ../../include/js_strings.php:71 -msgid "Tuesday" +#: ../../include/selectors.php:49 +msgid "Undecided" msgstr "" -#: ../../include/text.php:1257 ../../include/js_strings.php:72 -msgid "Wednesday" +#: ../../include/selectors.php:85 ../../include/selectors.php:104 +msgid "Males" msgstr "" -#: ../../include/text.php:1257 ../../include/js_strings.php:73 -msgid "Thursday" +#: ../../include/selectors.php:85 ../../include/selectors.php:104 +msgid "Females" msgstr "" -#: ../../include/text.php:1257 ../../include/js_strings.php:74 -msgid "Friday" +#: ../../include/selectors.php:85 +msgid "Gay" msgstr "" -#: ../../include/text.php:1257 ../../include/js_strings.php:75 -msgid "Saturday" +#: ../../include/selectors.php:85 +msgid "Lesbian" msgstr "" -#: ../../include/text.php:1257 ../../include/js_strings.php:69 -msgid "Sunday" +#: ../../include/selectors.php:85 +msgid "No Preference" msgstr "" -#: ../../include/text.php:1261 ../../include/js_strings.php:45 -msgid "January" +#: ../../include/selectors.php:85 +msgid "Bisexual" msgstr "" -#: ../../include/text.php:1261 ../../include/js_strings.php:46 -msgid "February" +#: ../../include/selectors.php:85 +msgid "Autosexual" msgstr "" -#: ../../include/text.php:1261 ../../include/js_strings.php:47 -msgid "March" +#: ../../include/selectors.php:85 +msgid "Abstinent" msgstr "" -#: ../../include/text.php:1261 ../../include/js_strings.php:48 -msgid "April" +#: ../../include/selectors.php:85 +msgid "Virgin" msgstr "" -#: ../../include/text.php:1261 -msgid "May" +#: ../../include/selectors.php:85 +msgid "Deviant" msgstr "" -#: ../../include/text.php:1261 ../../include/js_strings.php:50 -msgid "June" +#: ../../include/selectors.php:85 +msgid "Fetish" msgstr "" -#: ../../include/text.php:1261 ../../include/js_strings.php:51 -msgid "July" +#: ../../include/selectors.php:85 +msgid "Oodles" msgstr "" -#: ../../include/text.php:1261 ../../include/js_strings.php:52 -msgid "August" +#: ../../include/selectors.php:85 +msgid "Nonsexual" msgstr "" -#: ../../include/text.php:1261 ../../include/js_strings.php:53 -msgid "September" +#: ../../include/selectors.php:123 ../../include/selectors.php:140 +msgid "Single" msgstr "" -#: ../../include/text.php:1261 ../../include/js_strings.php:54 -msgid "October" +#: ../../include/selectors.php:123 +msgid "Lonely" msgstr "" -#: ../../include/text.php:1261 ../../include/js_strings.php:55 -msgid "November" +#: ../../include/selectors.php:123 +msgid "Available" msgstr "" -#: ../../include/text.php:1261 ../../include/js_strings.php:56 -msgid "December" +#: ../../include/selectors.php:123 +msgid "Unavailable" msgstr "" -#: ../../include/text.php:1338 ../../include/text.php:1342 -msgid "Unknown Attachment" +#: ../../include/selectors.php:123 +msgid "Has crush" msgstr "" -#: ../../include/text.php:1344 -msgid "unknown" +#: ../../include/selectors.php:123 +msgid "Infatuated" msgstr "" -#: ../../include/text.php:1380 -msgid "remove category" +#: ../../include/selectors.php:123 ../../include/selectors.php:140 +msgid "Dating" msgstr "" -#: ../../include/text.php:1457 -msgid "remove from file" +#: ../../include/selectors.php:123 +msgid "Unfaithful" msgstr "" -#: ../../include/text.php:1754 ../../include/text.php:1825 -msgid "default" +#: ../../include/selectors.php:123 +msgid "Sex Addict" msgstr "" -#: ../../include/text.php:1762 -msgid "Page layout" +#: ../../include/selectors.php:123 +msgid "Friends/Benefits" msgstr "" -#: ../../include/text.php:1762 -msgid "You can create your own with the layouts tool" +#: ../../include/selectors.php:123 +msgid "Casual" msgstr "" -#: ../../include/text.php:1804 -msgid "Page content type" +#: ../../include/selectors.php:123 +msgid "Engaged" msgstr "" -#: ../../include/text.php:1837 -msgid "Select an alternate language" +#: ../../include/selectors.php:123 ../../include/selectors.php:140 +msgid "Married" msgstr "" -#: ../../include/text.php:1954 -msgid "activity" +#: ../../include/selectors.php:123 +msgid "Imaginarily married" msgstr "" -#: ../../include/text.php:2263 -msgid "Design Tools" +#: ../../include/selectors.php:123 +msgid "Partners" msgstr "" -#: ../../include/text.php:2269 -msgid "Pages" +#: ../../include/selectors.php:123 ../../include/selectors.php:140 +msgid "Cohabiting" msgstr "" -#: ../../include/event.php:22 ../../include/event.php:69 -#: ../../include/bb2diaspora.php:485 -msgid "l F d, Y \\@ g:i A" +#: ../../include/selectors.php:123 +msgid "Common law" msgstr "" -#: ../../include/event.php:30 ../../include/event.php:73 -#: ../../include/bb2diaspora.php:491 -msgid "Starts:" +#: ../../include/selectors.php:123 +msgid "Happy" msgstr "" -#: ../../include/event.php:40 ../../include/event.php:77 -#: ../../include/bb2diaspora.php:499 -msgid "Finishes:" +#: ../../include/selectors.php:123 +msgid "Not looking" msgstr "" -#: ../../include/event.php:812 -msgid "This event has been added to your calendar." +#: ../../include/selectors.php:123 +msgid "Swinger" msgstr "" -#: ../../include/event.php:1012 -msgid "Not specified" +#: ../../include/selectors.php:123 +msgid "Betrayed" msgstr "" -#: ../../include/event.php:1013 -msgid "Needs Action" +#: ../../include/selectors.php:123 ../../include/selectors.php:140 +msgid "Separated" msgstr "" -#: ../../include/event.php:1014 -msgid "Completed" +#: ../../include/selectors.php:123 +msgid "Unstable" msgstr "" -#: ../../include/event.php:1015 -msgid "In Process" +#: ../../include/selectors.php:123 ../../include/selectors.php:140 +msgid "Divorced" msgstr "" -#: ../../include/event.php:1016 -msgid "Cancelled" +#: ../../include/selectors.php:123 +msgid "Imaginarily divorced" msgstr "" -#: ../../include/message.php:20 -msgid "No recipient provided." +#: ../../include/selectors.php:123 ../../include/selectors.php:140 +msgid "Widowed" msgstr "" -#: ../../include/message.php:25 -msgid "[no subject]" +#: ../../include/selectors.php:123 +msgid "Uncertain" msgstr "" -#: ../../include/message.php:45 -msgid "Unable to determine sender." +#: ../../include/selectors.php:123 ../../include/selectors.php:140 +msgid "It's complicated" msgstr "" -#: ../../include/message.php:222 -msgid "Stored post could not be verified." +#: ../../include/selectors.php:123 +msgid "Don't care" msgstr "" -#: ../../include/conversation.php:204 -#, php-format -msgid "%1$s is now connected with %2$s" +#: ../../include/selectors.php:123 +msgid "Ask me" msgstr "" -#: ../../include/conversation.php:239 -#, php-format -msgid "%1$s poked %2$s" +#: ../../include/event.php:812 +msgid "This event has been added to your calendar." msgstr "" -#: ../../include/conversation.php:694 -#, php-format -msgid "View %s's profile @ %s" +#: ../../include/event.php:1012 +msgid "Not specified" msgstr "" -#: ../../include/conversation.php:713 -msgid "Categories:" +#: ../../include/event.php:1013 +msgid "Needs Action" msgstr "" -#: ../../include/conversation.php:714 -msgid "Filed under:" +#: ../../include/event.php:1014 +msgid "Completed" msgstr "" -#: ../../include/conversation.php:741 -msgid "View in context" +#: ../../include/event.php:1015 +msgid "In Process" msgstr "" -#: ../../include/conversation.php:850 -msgid "remove" +#: ../../include/event.php:1016 +msgid "Cancelled" msgstr "" -#: ../../include/conversation.php:854 ../../include/nav.php:247 -msgid "Loading..." +#: ../../include/network.php:697 +msgid "view full size" msgstr "" -#: ../../include/conversation.php:855 -msgid "Delete Selected Items" +#: ../../include/network.php:1911 ../../include/account.php:317 +#: ../../include/account.php:344 ../../include/account.php:404 +msgid "Administrator" msgstr "" -#: ../../include/conversation.php:951 -msgid "View Source" +#: ../../include/network.php:1925 +msgid "No Subject" msgstr "" -#: ../../include/conversation.php:952 -msgid "Follow Thread" +#: ../../include/network.php:2179 ../../include/network.php:2180 +msgid "Friendica" msgstr "" -#: ../../include/conversation.php:953 -msgid "Unfollow Thread" +#: ../../include/network.php:2181 +msgid "OStatus" msgstr "" -#: ../../include/conversation.php:958 -msgid "Activity/Posts" +#: ../../include/network.php:2182 +msgid "GNU-Social" msgstr "" -#: ../../include/conversation.php:960 -msgid "Edit Connection" +#: ../../include/network.php:2183 +msgid "RSS/Atom" msgstr "" -#: ../../include/conversation.php:961 -msgid "Message" +#: ../../include/network.php:2185 +msgid "Diaspora" msgstr "" -#: ../../include/conversation.php:1078 -#, php-format -msgid "%s likes this." +#: ../../include/network.php:2186 +msgid "Facebook" msgstr "" -#: ../../include/conversation.php:1078 -#, php-format -msgid "%s doesn't like this." +#: ../../include/network.php:2187 +msgid "Zot" msgstr "" -#: ../../include/conversation.php:1082 -#, php-format -msgid "<span %1$s>%2$d people</span> like this." -msgid_plural "<span %1$s>%2$d people</span> like this." -msgstr[0] "" -msgstr[1] "" +#: ../../include/network.php:2188 +msgid "LinkedIn" +msgstr "" -#: ../../include/conversation.php:1084 -#, php-format -msgid "<span %1$s>%2$d people</span> don't like this." -msgid_plural "<span %1$s>%2$d people</span> don't like this." -msgstr[0] "" -msgstr[1] "" +#: ../../include/network.php:2189 +msgid "XMPP/IM" +msgstr "" -#: ../../include/conversation.php:1090 -msgid "and" +#: ../../include/network.php:2190 +msgid "MySpace" msgstr "" -#: ../../include/conversation.php:1093 +#: ../../include/bookmarks.php:35 #, php-format -msgid ", and %d other people" -msgid_plural ", and %d other people" -msgstr[0] "" -msgstr[1] "" +msgid "%1$s's bookmarks" +msgstr "" -#: ../../include/conversation.php:1094 -#, php-format -msgid "%s like this." +#: ../../include/page_widgets.php:7 +msgid "New Page" msgstr "" -#: ../../include/conversation.php:1094 -#, php-format -msgid "%s don't like this." +#: ../../include/page_widgets.php:46 +msgid "Title" msgstr "" -#: ../../include/conversation.php:1133 -msgid "Set your location" +#: ../../include/features.php:48 +msgid "General Features" msgstr "" -#: ../../include/conversation.php:1134 -msgid "Clear browser location" +#: ../../include/features.php:50 +msgid "Content Expiration" msgstr "" -#: ../../include/conversation.php:1150 -msgid "Embed image from photo albums" +#: ../../include/features.php:50 +msgid "Remove posts/comments and/or private messages at a future time" msgstr "" -#: ../../include/conversation.php:1182 -msgid "Tag term:" +#: ../../include/features.php:51 +msgid "Multiple Profiles" msgstr "" -#: ../../include/conversation.php:1183 -msgid "Where are you right now?" +#: ../../include/features.php:51 +msgid "Ability to create multiple profiles" msgstr "" -#: ../../include/conversation.php:1186 -msgid "Choose images to embed" +#: ../../include/features.php:52 +msgid "Advanced Profiles" msgstr "" -#: ../../include/conversation.php:1187 -msgid "Choose an album" +#: ../../include/features.php:52 +msgid "Additional profile sections and selections" msgstr "" -#: ../../include/conversation.php:1188 -msgid "Choose a different album..." +#: ../../include/features.php:53 +msgid "Profile Import/Export" msgstr "" -#: ../../include/conversation.php:1189 -msgid "Error getting album list" +#: ../../include/features.php:53 +msgid "Save and load profile details across sites/channels" msgstr "" -#: ../../include/conversation.php:1190 -msgid "Error getting photo link" +#: ../../include/features.php:54 +msgid "Web Pages" msgstr "" -#: ../../include/conversation.php:1191 -msgid "Error getting album" +#: ../../include/features.php:54 +msgid "Provide managed web pages on your channel" msgstr "" -#: ../../include/conversation.php:1221 -msgid "Page link name" +#: ../../include/features.php:55 +msgid "Hide Rating" msgstr "" -#: ../../include/conversation.php:1224 -msgid "Post as" +#: ../../include/features.php:55 +msgid "" +"Hide the rating buttons on your channel and profile pages. Note: People can " +"still rate you somewhere else." msgstr "" -#: ../../include/conversation.php:1234 -msgid "Embed an image from your albums" +#: ../../include/features.php:56 +msgid "Private Notes" msgstr "" -#: ../../include/conversation.php:1236 ../../include/conversation.php:1273 -msgid "OK" +#: ../../include/features.php:56 +msgid "Enables a tool to store notes and reminders (note: not encrypted)" msgstr "" -#: ../../include/conversation.php:1238 -msgid "Toggle voting" +#: ../../include/features.php:57 +msgid "Navigation Channel Select" msgstr "" -#: ../../include/conversation.php:1246 -msgid "Categories (optional, comma-separated list)" +#: ../../include/features.php:57 +msgid "Change channels directly from within the navigation dropdown menu" msgstr "" -#: ../../include/conversation.php:1269 -msgid "Set publish date" +#: ../../include/features.php:58 +msgid "Photo Location" msgstr "" -#: ../../include/conversation.php:1518 -msgid "Discover" +#: ../../include/features.php:58 +msgid "If location data is available on uploaded photos, link this to a map." msgstr "" -#: ../../include/conversation.php:1521 -msgid "Imported public streams" +#: ../../include/features.php:59 +msgid "Access Controlled Chatrooms" msgstr "" -#: ../../include/conversation.php:1526 -msgid "Commented Order" +#: ../../include/features.php:59 +msgid "Provide chatrooms and chat services with access control." msgstr "" -#: ../../include/conversation.php:1529 -msgid "Sort by Comment Date" +#: ../../include/features.php:60 +msgid "Smart Birthdays" msgstr "" -#: ../../include/conversation.php:1533 -msgid "Posted Order" +#: ../../include/features.php:60 +msgid "" +"Make birthday events timezone aware in case your friends are scattered " +"across the planet." msgstr "" -#: ../../include/conversation.php:1536 -msgid "Sort by Post Date" +#: ../../include/features.php:61 +msgid "Expert Mode" msgstr "" -#: ../../include/conversation.php:1544 -msgid "Posts that mention or involve you" +#: ../../include/features.php:61 +msgid "Enable Expert Mode to provide advanced configuration options" msgstr "" -#: ../../include/conversation.php:1553 -msgid "Activity Stream - by date" +#: ../../include/features.php:62 +msgid "Premium Channel" msgstr "" -#: ../../include/conversation.php:1559 -msgid "Starred" +#: ../../include/features.php:62 +msgid "" +"Allows you to set restrictions and terms on those that connect with your " +"channel" msgstr "" -#: ../../include/conversation.php:1562 -msgid "Favourite Posts" +#: ../../include/features.php:67 +msgid "Post Composition Features" msgstr "" -#: ../../include/conversation.php:1569 -msgid "Spam" +#: ../../include/features.php:70 +msgid "Large Photos" msgstr "" -#: ../../include/conversation.php:1572 -msgid "Posts flagged as SPAM" +#: ../../include/features.php:70 +msgid "" +"Include large (1024px) photo thumbnails in posts. If not enabled, use small " +"(640px) photo thumbnails" msgstr "" -#: ../../include/conversation.php:1629 -msgid "Status Messages and Posts" +#: ../../include/features.php:71 +msgid "Automatically import channel content from other channels or feeds" msgstr "" -#: ../../include/conversation.php:1638 -msgid "About" +#: ../../include/features.php:72 +msgid "Even More Encryption" msgstr "" -#: ../../include/conversation.php:1641 -msgid "Profile Details" +#: ../../include/features.php:72 +msgid "" +"Allow optional encryption of content end-to-end with a shared secret key" msgstr "" -#: ../../include/conversation.php:1657 -msgid "Files and Storage" +#: ../../include/features.php:73 +msgid "Enable Voting Tools" msgstr "" -#: ../../include/conversation.php:1677 ../../include/conversation.php:1680 -#: ../../include/widgets.php:842 -msgid "Chatrooms" +#: ../../include/features.php:73 +msgid "Provide a class of post which others can vote on" msgstr "" -#: ../../include/conversation.php:1690 ../../include/nav.php:102 -msgid "Bookmarks" +#: ../../include/features.php:74 +msgid "Delayed Posting" msgstr "" -#: ../../include/conversation.php:1693 -msgid "Saved Bookmarks" +#: ../../include/features.php:74 +msgid "Allow posts to be published at a later date" msgstr "" -#: ../../include/conversation.php:1703 -msgid "Manage Webpages" +#: ../../include/features.php:75 +msgid "Suppress Duplicate Posts/Comments" msgstr "" -#: ../../include/conversation.php:1762 -msgctxt "noun" -msgid "Attending" -msgid_plural "Attending" -msgstr[0] "" -msgstr[1] "" +#: ../../include/features.php:75 +msgid "" +"Prevent posts with identical content to be published with less than two " +"minutes in between submissions." +msgstr "" -#: ../../include/conversation.php:1765 -msgctxt "noun" -msgid "Not Attending" -msgid_plural "Not Attending" -msgstr[0] "" -msgstr[1] "" +#: ../../include/features.php:81 +msgid "Network and Stream Filtering" +msgstr "" -#: ../../include/conversation.php:1768 -msgctxt "noun" -msgid "Undecided" -msgid_plural "Undecided" -msgstr[0] "" -msgstr[1] "" +#: ../../include/features.php:82 +msgid "Search by Date" +msgstr "" -#: ../../include/conversation.php:1771 -msgctxt "noun" -msgid "Agree" -msgid_plural "Agrees" -msgstr[0] "" -msgstr[1] "" +#: ../../include/features.php:82 +msgid "Ability to select posts by date ranges" +msgstr "" -#: ../../include/conversation.php:1774 -msgctxt "noun" -msgid "Disagree" -msgid_plural "Disagrees" -msgstr[0] "" -msgstr[1] "" +#: ../../include/features.php:83 +msgid "Enable management and selection of privacy groups" +msgstr "" -#: ../../include/conversation.php:1777 -msgctxt "noun" -msgid "Abstain" -msgid_plural "Abstains" -msgstr[0] "" -msgstr[1] "" +#: ../../include/features.php:84 ../../include/widgets.php:281 +msgid "Saved Searches" +msgstr "" -#: ../../include/follow.php:27 -msgid "Channel is blocked on this site." +#: ../../include/features.php:84 +msgid "Save search terms for re-use" msgstr "" -#: ../../include/follow.php:32 -msgid "Channel location missing." +#: ../../include/features.php:85 +msgid "Network Personal Tab" msgstr "" -#: ../../include/follow.php:81 -msgid "Response from remote channel was incomplete." +#: ../../include/features.php:85 +msgid "Enable tab to display only Network posts that you've interacted on" msgstr "" -#: ../../include/follow.php:98 -msgid "Channel was deleted and no longer exists." +#: ../../include/features.php:86 +msgid "Network New Tab" msgstr "" -#: ../../include/follow.php:154 ../../include/follow.php:190 -msgid "Protocol disabled." +#: ../../include/features.php:86 +msgid "Enable tab to display all new Network activity" msgstr "" -#: ../../include/follow.php:178 -msgid "Channel discovery failed." +#: ../../include/features.php:87 +msgid "Affinity Tool" msgstr "" -#: ../../include/follow.php:216 -msgid "Cannot connect to yourself." +#: ../../include/features.php:87 +msgid "Filter stream activity by depth of relationships" msgstr "" -#: ../../include/bbcode.php:123 ../../include/bbcode.php:866 -#: ../../include/bbcode.php:869 ../../include/bbcode.php:874 -#: ../../include/bbcode.php:877 ../../include/bbcode.php:880 -#: ../../include/bbcode.php:883 ../../include/bbcode.php:888 -#: ../../include/bbcode.php:891 ../../include/bbcode.php:896 -#: ../../include/bbcode.php:899 ../../include/bbcode.php:902 -#: ../../include/bbcode.php:905 -msgid "Image/photo" +#: ../../include/features.php:88 +msgid "Connection Filtering" msgstr "" -#: ../../include/bbcode.php:162 ../../include/bbcode.php:916 -msgid "Encrypted content" +#: ../../include/features.php:88 +msgid "Filter incoming posts from connections based on keywords/content" msgstr "" -#: ../../include/bbcode.php:178 -#, php-format -msgid "Install %s element: " +#: ../../include/features.php:89 +msgid "Show channel suggestions" msgstr "" -#: ../../include/bbcode.php:182 -#, php-format -msgid "" -"This post contains an installable %s element, however you lack permissions " -"to install it on this site." +#: ../../include/features.php:94 +msgid "Post/Comment Tools" msgstr "" -#: ../../include/bbcode.php:261 -#, php-format -msgid "%1$s wrote the following %2$s %3$s" +#: ../../include/features.php:95 +msgid "Community Tagging" msgstr "" -#: ../../include/bbcode.php:338 ../../include/bbcode.php:346 -msgid "Click to open/close" +#: ../../include/features.php:95 +msgid "Ability to tag existing posts" msgstr "" -#: ../../include/bbcode.php:346 -msgid "spoiler" +#: ../../include/features.php:96 +msgid "Post Categories" msgstr "" -#: ../../include/bbcode.php:607 -msgid "Different viewers will see this text differently" +#: ../../include/features.php:96 +msgid "Add categories to your posts" msgstr "" -#: ../../include/bbcode.php:854 -msgid "$1 wrote:" +#: ../../include/features.php:97 +msgid "Emoji Reactions" msgstr "" -#: ../../include/bookmarks.php:35 -#, php-format -msgid "%1$s's bookmarks" +#: ../../include/features.php:97 +msgid "Add emoji reaction ability to posts" msgstr "" -#: ../../include/dir_fns.php:141 -msgid "Directory Options" +#: ../../include/features.php:98 ../../include/contact_widgets.php:53 +#: ../../include/widgets.php:310 +msgid "Saved Folders" msgstr "" -#: ../../include/dir_fns.php:143 -msgid "Safe Mode" +#: ../../include/features.php:98 +msgid "Ability to file posts under folders" msgstr "" -#: ../../include/dir_fns.php:144 -msgid "Public Forums Only" +#: ../../include/features.php:99 +msgid "Dislike Posts" msgstr "" -#: ../../include/dir_fns.php:145 -msgid "This Website Only" +#: ../../include/features.php:99 +msgid "Ability to dislike posts/comments" msgstr "" -#: ../../include/zot.php:709 -msgid "Invalid data packet" +#: ../../include/features.php:100 +msgid "Star Posts" msgstr "" -#: ../../include/zot.php:725 -msgid "Unable to verify channel signature" +#: ../../include/features.php:100 +msgid "Ability to mark special posts with a star indicator" msgstr "" -#: ../../include/zot.php:2373 -#, php-format -msgid "Unable to verify site signature for %s" +#: ../../include/features.php:101 +msgid "Tag Cloud" msgstr "" -#: ../../include/zot.php:3722 -msgid "invalid target signature" +#: ../../include/features.php:101 +msgid "Provide a personal tag cloud on your channel page" msgstr "" #: ../../include/security.php:383 @@ -7636,7 +7630,7 @@ msgstr "" msgid "Manage/Edit profiles" msgstr "" -#: ../../include/nav.php:90 ../../include/channel.php:922 +#: ../../include/nav.php:90 ../../include/channel.php:928 msgid "Edit Profile" msgstr "" @@ -7656,6 +7650,10 @@ msgstr "" msgid "Your chatrooms" msgstr "" +#: ../../include/nav.php:102 ../../include/conversation.php:1690 +msgid "Bookmarks" +msgstr "" + #: ../../include/nav.php:102 msgid "Your bookmarks" msgstr "" @@ -7785,6 +7783,10 @@ msgstr "" msgid "Site Setup and Configuration" msgstr "" +#: ../../include/nav.php:247 ../../include/conversation.php:854 +msgid "Loading..." +msgstr "" + #: ../../include/nav.php:252 msgid "@name, #tag, ?doc, content" msgstr "" @@ -7793,1136 +7795,988 @@ msgstr "" msgid "Please wait..." msgstr "" -#: ../../include/contact_widgets.php:11 -#, php-format -msgid "%d invitation available" -msgid_plural "%d invitations available" -msgstr[0] "" -msgstr[1] "" - -#: ../../include/contact_widgets.php:19 -msgid "Find Channels" -msgstr "" - -#: ../../include/contact_widgets.php:20 -msgid "Enter name or interest" +#: ../../include/datetime.php:135 +msgid "Birthday" msgstr "" -#: ../../include/contact_widgets.php:21 -msgid "Connect/Follow" +#: ../../include/datetime.php:137 +msgid "Age: " msgstr "" -#: ../../include/contact_widgets.php:22 -msgid "Examples: Robert Morgenstein, Fishing" +#: ../../include/datetime.php:139 +msgid "YYYY-MM-DD or MM-DD" msgstr "" -#: ../../include/contact_widgets.php:26 -msgid "Random Profile" +#: ../../include/datetime.php:272 ../../boot.php:2477 +msgid "never" msgstr "" -#: ../../include/contact_widgets.php:27 -msgid "Invite Friends" +#: ../../include/datetime.php:278 +msgid "less than a second ago" msgstr "" -#: ../../include/contact_widgets.php:29 -msgid "Advanced example: name=fred and country=iceland" +#: ../../include/datetime.php:296 +#, php-format +msgctxt "e.g. 22 hours ago, 1 minute ago" +msgid "%1$d %2$s ago" msgstr "" -#: ../../include/contact_widgets.php:53 ../../include/features.php:98 -#: ../../include/widgets.php:310 -msgid "Saved Folders" -msgstr "" +#: ../../include/datetime.php:307 +msgctxt "relative_date" +msgid "year" +msgid_plural "years" +msgstr[0] "" +msgstr[1] "" -#: ../../include/contact_widgets.php:56 ../../include/contact_widgets.php:94 -#: ../../include/widgets.php:313 ../../include/widgets.php:432 -msgid "Everything" -msgstr "" +#: ../../include/datetime.php:310 +msgctxt "relative_date" +msgid "month" +msgid_plural "months" +msgstr[0] "" +msgstr[1] "" -#: ../../include/contact_widgets.php:122 -#, php-format -msgid "%d connection in common" -msgid_plural "%d connections in common" +#: ../../include/datetime.php:313 +msgctxt "relative_date" +msgid "week" +msgid_plural "weeks" msgstr[0] "" msgstr[1] "" -#: ../../include/contact_widgets.php:127 -msgid "show more" -msgstr "" +#: ../../include/datetime.php:316 +msgctxt "relative_date" +msgid "day" +msgid_plural "days" +msgstr[0] "" +msgstr[1] "" -#: ../../include/selectors.php:30 -msgid "Frequently" -msgstr "" +#: ../../include/datetime.php:319 +msgctxt "relative_date" +msgid "hour" +msgid_plural "hours" +msgstr[0] "" +msgstr[1] "" -#: ../../include/selectors.php:31 -msgid "Hourly" -msgstr "" +#: ../../include/datetime.php:322 +msgctxt "relative_date" +msgid "minute" +msgid_plural "minutes" +msgstr[0] "" +msgstr[1] "" -#: ../../include/selectors.php:32 -msgid "Twice daily" -msgstr "" +#: ../../include/datetime.php:325 +msgctxt "relative_date" +msgid "second" +msgid_plural "seconds" +msgstr[0] "" +msgstr[1] "" -#: ../../include/selectors.php:33 -msgid "Daily" +#: ../../include/datetime.php:562 +#, php-format +msgid "%1$s's birthday" msgstr "" -#: ../../include/selectors.php:34 -msgid "Weekly" +#: ../../include/datetime.php:563 +#, php-format +msgid "Happy Birthday %1$s" msgstr "" -#: ../../include/selectors.php:35 -msgid "Monthly" +#: ../../include/account.php:28 +msgid "Not a valid email address" msgstr "" -#: ../../include/selectors.php:49 -msgid "Currently Male" +#: ../../include/account.php:30 +msgid "Your email domain is not among those allowed on this site" msgstr "" -#: ../../include/selectors.php:49 -msgid "Currently Female" +#: ../../include/account.php:36 +msgid "Your email address is already registered at this site." msgstr "" -#: ../../include/selectors.php:49 -msgid "Mostly Male" +#: ../../include/account.php:68 +msgid "An invitation is required." msgstr "" -#: ../../include/selectors.php:49 -msgid "Mostly Female" +#: ../../include/account.php:72 +msgid "Invitation could not be verified." msgstr "" -#: ../../include/selectors.php:49 -msgid "Transgender" +#: ../../include/account.php:122 +msgid "Please enter the required information." msgstr "" -#: ../../include/selectors.php:49 -msgid "Intersex" +#: ../../include/account.php:189 +msgid "Failed to store account information." msgstr "" -#: ../../include/selectors.php:49 -msgid "Transsexual" +#: ../../include/account.php:249 +#, php-format +msgid "Registration confirmation for %s" msgstr "" -#: ../../include/selectors.php:49 -msgid "Hermaphrodite" +#: ../../include/account.php:315 +#, php-format +msgid "Registration request at %s" msgstr "" -#: ../../include/selectors.php:49 -msgid "Neuter" +#: ../../include/account.php:339 +msgid "your registration password" msgstr "" -#: ../../include/selectors.php:49 -msgid "Non-specific" +#: ../../include/account.php:342 ../../include/account.php:402 +#, php-format +msgid "Registration details for %s" msgstr "" -#: ../../include/selectors.php:49 ../../include/selectors.php:66 -#: ../../include/selectors.php:104 ../../include/selectors.php:140 -#: ../../include/permissions.php:881 -msgid "Other" +#: ../../include/account.php:414 +msgid "Account approved." msgstr "" -#: ../../include/selectors.php:49 -msgid "Undecided" +#: ../../include/account.php:454 +#, php-format +msgid "Registration revoked for %s" msgstr "" -#: ../../include/selectors.php:85 ../../include/selectors.php:104 -msgid "Males" +#: ../../include/account.php:506 +msgid "Account verified. Please login." msgstr "" -#: ../../include/selectors.php:85 ../../include/selectors.php:104 -msgid "Females" +#: ../../include/account.php:723 ../../include/account.php:725 +msgid "Click here to upgrade." msgstr "" -#: ../../include/selectors.php:85 -msgid "Gay" +#: ../../include/account.php:731 +msgid "This action exceeds the limits set by your subscription plan." msgstr "" -#: ../../include/selectors.php:85 -msgid "Lesbian" +#: ../../include/account.php:736 +msgid "This action is not available under your subscription plan." msgstr "" -#: ../../include/selectors.php:85 -msgid "No Preference" +#: ../../include/taxonomy.php:188 ../../include/taxonomy.php:270 +#: ../../include/contact_widgets.php:91 ../../include/widgets.php:46 +#: ../../include/widgets.php:429 +msgid "Categories" msgstr "" -#: ../../include/selectors.php:85 -msgid "Bisexual" +#: ../../include/taxonomy.php:228 ../../include/taxonomy.php:249 +msgid "Tags" msgstr "" -#: ../../include/selectors.php:85 -msgid "Autosexual" +#: ../../include/taxonomy.php:293 +msgid "Keywords" msgstr "" -#: ../../include/selectors.php:85 -msgid "Abstinent" +#: ../../include/taxonomy.php:314 +msgid "have" msgstr "" -#: ../../include/selectors.php:85 -msgid "Virgin" +#: ../../include/taxonomy.php:314 +msgid "has" msgstr "" -#: ../../include/selectors.php:85 -msgid "Deviant" +#: ../../include/taxonomy.php:315 +msgid "want" msgstr "" -#: ../../include/selectors.php:85 -msgid "Fetish" +#: ../../include/taxonomy.php:315 +msgid "wants" msgstr "" -#: ../../include/selectors.php:85 -msgid "Oodles" +#: ../../include/taxonomy.php:316 +msgid "likes" msgstr "" -#: ../../include/selectors.php:85 -msgid "Nonsexual" +#: ../../include/taxonomy.php:317 +msgid "dislikes" msgstr "" -#: ../../include/selectors.php:123 ../../include/selectors.php:140 -msgid "Single" +#: ../../include/follow.php:27 +msgid "Channel is blocked on this site." msgstr "" -#: ../../include/selectors.php:123 -msgid "Lonely" +#: ../../include/follow.php:32 +msgid "Channel location missing." msgstr "" -#: ../../include/selectors.php:123 -msgid "Available" +#: ../../include/follow.php:81 +msgid "Response from remote channel was incomplete." msgstr "" -#: ../../include/selectors.php:123 -msgid "Unavailable" +#: ../../include/follow.php:98 +msgid "Channel was deleted and no longer exists." msgstr "" -#: ../../include/selectors.php:123 -msgid "Has crush" +#: ../../include/follow.php:154 ../../include/follow.php:190 +msgid "Protocol disabled." msgstr "" -#: ../../include/selectors.php:123 -msgid "Infatuated" +#: ../../include/follow.php:178 +msgid "Channel discovery failed." msgstr "" -#: ../../include/selectors.php:123 ../../include/selectors.php:140 -msgid "Dating" +#: ../../include/follow.php:216 +msgid "Cannot connect to yourself." msgstr "" -#: ../../include/selectors.php:123 -msgid "Unfaithful" +#: ../../include/bbcode.php:123 ../../include/bbcode.php:866 +#: ../../include/bbcode.php:869 ../../include/bbcode.php:874 +#: ../../include/bbcode.php:877 ../../include/bbcode.php:880 +#: ../../include/bbcode.php:883 ../../include/bbcode.php:888 +#: ../../include/bbcode.php:891 ../../include/bbcode.php:896 +#: ../../include/bbcode.php:899 ../../include/bbcode.php:902 +#: ../../include/bbcode.php:905 +msgid "Image/photo" msgstr "" -#: ../../include/selectors.php:123 -msgid "Sex Addict" +#: ../../include/bbcode.php:162 ../../include/bbcode.php:916 +msgid "Encrypted content" msgstr "" -#: ../../include/selectors.php:123 -msgid "Friends/Benefits" +#: ../../include/bbcode.php:178 +#, php-format +msgid "Install %s element: " msgstr "" -#: ../../include/selectors.php:123 -msgid "Casual" +#: ../../include/bbcode.php:182 +#, php-format +msgid "" +"This post contains an installable %s element, however you lack permissions " +"to install it on this site." msgstr "" -#: ../../include/selectors.php:123 -msgid "Engaged" +#: ../../include/bbcode.php:261 +#, php-format +msgid "%1$s wrote the following %2$s %3$s" msgstr "" -#: ../../include/selectors.php:123 ../../include/selectors.php:140 -msgid "Married" +#: ../../include/bbcode.php:338 ../../include/bbcode.php:346 +msgid "Click to open/close" msgstr "" -#: ../../include/selectors.php:123 -msgid "Imaginarily married" +#: ../../include/bbcode.php:346 +msgid "spoiler" msgstr "" -#: ../../include/selectors.php:123 -msgid "Partners" +#: ../../include/bbcode.php:607 +msgid "Different viewers will see this text differently" msgstr "" -#: ../../include/selectors.php:123 ../../include/selectors.php:140 -msgid "Cohabiting" +#: ../../include/bbcode.php:854 +msgid "$1 wrote:" msgstr "" -#: ../../include/selectors.php:123 -msgid "Common law" +#: ../../include/text.php:404 +msgid "prev" msgstr "" -#: ../../include/selectors.php:123 -msgid "Happy" +#: ../../include/text.php:406 +msgid "first" msgstr "" -#: ../../include/selectors.php:123 -msgid "Not looking" +#: ../../include/text.php:435 +msgid "last" msgstr "" -#: ../../include/selectors.php:123 -msgid "Swinger" +#: ../../include/text.php:438 +msgid "next" msgstr "" -#: ../../include/selectors.php:123 -msgid "Betrayed" +#: ../../include/text.php:448 +msgid "older" msgstr "" -#: ../../include/selectors.php:123 ../../include/selectors.php:140 -msgid "Separated" +#: ../../include/text.php:450 +msgid "newer" msgstr "" -#: ../../include/selectors.php:123 -msgid "Unstable" +#: ../../include/text.php:839 +msgid "No connections" msgstr "" -#: ../../include/selectors.php:123 ../../include/selectors.php:140 -msgid "Divorced" +#: ../../include/text.php:864 +#, php-format +msgid "View all %s connections" msgstr "" -#: ../../include/selectors.php:123 -msgid "Imaginarily divorced" +#: ../../include/text.php:1009 ../../include/text.php:1014 +msgid "poke" msgstr "" -#: ../../include/selectors.php:123 ../../include/selectors.php:140 -msgid "Widowed" +#: ../../include/text.php:1009 ../../include/text.php:1014 +#: ../../include/conversation.php:243 +msgid "poked" msgstr "" -#: ../../include/selectors.php:123 -msgid "Uncertain" +#: ../../include/text.php:1015 +msgid "ping" msgstr "" -#: ../../include/selectors.php:123 ../../include/selectors.php:140 -msgid "It's complicated" +#: ../../include/text.php:1015 +msgid "pinged" msgstr "" -#: ../../include/selectors.php:123 -msgid "Don't care" +#: ../../include/text.php:1016 +msgid "prod" msgstr "" -#: ../../include/selectors.php:123 -msgid "Ask me" +#: ../../include/text.php:1016 +msgid "prodded" msgstr "" -#: ../../include/channel.php:32 -msgid "Unable to obtain identity information from database" +#: ../../include/text.php:1017 +msgid "slap" msgstr "" -#: ../../include/channel.php:66 -msgid "Empty name" +#: ../../include/text.php:1017 +msgid "slapped" msgstr "" -#: ../../include/channel.php:69 -msgid "Name too long" +#: ../../include/text.php:1018 +msgid "finger" msgstr "" -#: ../../include/channel.php:180 -msgid "No account identifier" +#: ../../include/text.php:1018 +msgid "fingered" msgstr "" -#: ../../include/channel.php:192 -msgid "Nickname is required." +#: ../../include/text.php:1019 +msgid "rebuff" msgstr "" -#: ../../include/channel.php:206 -msgid "Reserved nickname. Please choose another." +#: ../../include/text.php:1019 +msgid "rebuffed" msgstr "" -#: ../../include/channel.php:211 -msgid "" -"Nickname has unsupported characters or is already being used on this site." +#: ../../include/text.php:1031 +msgid "happy" msgstr "" -#: ../../include/channel.php:287 -msgid "Unable to retrieve created identity" +#: ../../include/text.php:1032 +msgid "sad" msgstr "" -#: ../../include/channel.php:345 -msgid "Default Profile" +#: ../../include/text.php:1033 +msgid "mellow" msgstr "" -#: ../../include/channel.php:772 -msgid "Requested channel is not available." +#: ../../include/text.php:1034 +msgid "tired" msgstr "" -#: ../../include/channel.php:919 -msgid "Create New Profile" +#: ../../include/text.php:1035 +msgid "perky" msgstr "" -#: ../../include/channel.php:939 -msgid "Visible to everybody" +#: ../../include/text.php:1036 +msgid "angry" msgstr "" -#: ../../include/channel.php:1012 ../../include/channel.php:1123 -msgid "Gender:" +#: ../../include/text.php:1037 +msgid "stupefied" msgstr "" -#: ../../include/channel.php:1013 ../../include/channel.php:1167 -msgid "Status:" +#: ../../include/text.php:1038 +msgid "puzzled" msgstr "" -#: ../../include/channel.php:1014 ../../include/channel.php:1178 -msgid "Homepage:" +#: ../../include/text.php:1039 +msgid "interested" msgstr "" -#: ../../include/channel.php:1015 -msgid "Online Now" +#: ../../include/text.php:1040 +msgid "bitter" msgstr "" -#: ../../include/channel.php:1128 -msgid "Like this channel" +#: ../../include/text.php:1041 +msgid "cheerful" msgstr "" -#: ../../include/channel.php:1152 -msgid "j F, Y" +#: ../../include/text.php:1042 +msgid "alive" msgstr "" -#: ../../include/channel.php:1153 -msgid "j F" +#: ../../include/text.php:1043 +msgid "annoyed" msgstr "" -#: ../../include/channel.php:1160 -msgid "Birthday:" +#: ../../include/text.php:1044 +msgid "anxious" msgstr "" -#: ../../include/channel.php:1173 -#, php-format -msgid "for %1$d %2$s" +#: ../../include/text.php:1045 +msgid "cranky" msgstr "" -#: ../../include/channel.php:1176 -msgid "Sexual Preference:" +#: ../../include/text.php:1046 +msgid "disturbed" msgstr "" -#: ../../include/channel.php:1182 -msgid "Tags:" +#: ../../include/text.php:1047 +msgid "frustrated" msgstr "" -#: ../../include/channel.php:1184 -msgid "Political Views:" +#: ../../include/text.php:1048 +msgid "depressed" msgstr "" -#: ../../include/channel.php:1186 -msgid "Religion:" +#: ../../include/text.php:1049 +msgid "motivated" msgstr "" -#: ../../include/channel.php:1190 -msgid "Hobbies/Interests:" +#: ../../include/text.php:1050 +msgid "relaxed" msgstr "" -#: ../../include/channel.php:1192 -msgid "Likes:" +#: ../../include/text.php:1051 +msgid "surprised" msgstr "" -#: ../../include/channel.php:1194 -msgid "Dislikes:" +#: ../../include/text.php:1233 ../../include/js_strings.php:70 +msgid "Monday" msgstr "" -#: ../../include/channel.php:1196 -msgid "Contact information and Social Networks:" +#: ../../include/text.php:1233 ../../include/js_strings.php:71 +msgid "Tuesday" msgstr "" -#: ../../include/channel.php:1198 -msgid "My other channels:" +#: ../../include/text.php:1233 ../../include/js_strings.php:72 +msgid "Wednesday" msgstr "" -#: ../../include/channel.php:1200 -msgid "Musical interests:" +#: ../../include/text.php:1233 ../../include/js_strings.php:73 +msgid "Thursday" msgstr "" -#: ../../include/channel.php:1202 -msgid "Books, literature:" +#: ../../include/text.php:1233 ../../include/js_strings.php:74 +msgid "Friday" msgstr "" -#: ../../include/channel.php:1204 -msgid "Television:" +#: ../../include/text.php:1233 ../../include/js_strings.php:75 +msgid "Saturday" msgstr "" -#: ../../include/channel.php:1206 -msgid "Film/dance/culture/entertainment:" +#: ../../include/text.php:1233 ../../include/js_strings.php:69 +msgid "Sunday" msgstr "" -#: ../../include/channel.php:1208 -msgid "Love/Romance:" +#: ../../include/text.php:1237 ../../include/js_strings.php:45 +msgid "January" msgstr "" -#: ../../include/channel.php:1210 -msgid "Work/employment:" +#: ../../include/text.php:1237 ../../include/js_strings.php:46 +msgid "February" msgstr "" -#: ../../include/channel.php:1212 -msgid "School/education:" +#: ../../include/text.php:1237 ../../include/js_strings.php:47 +msgid "March" msgstr "" -#: ../../include/channel.php:1232 -msgid "Like this thing" +#: ../../include/text.php:1237 ../../include/js_strings.php:48 +msgid "April" msgstr "" -#: ../../include/PermissionDescription.php:31 -#: ../../include/acl_selectors.php:232 -msgid "Visible to your default audience" +#: ../../include/text.php:1237 +msgid "May" msgstr "" -#: ../../include/PermissionDescription.php:115 -#: ../../include/acl_selectors.php:268 -msgid "Only me" +#: ../../include/text.php:1237 ../../include/js_strings.php:50 +msgid "June" msgstr "" -#: ../../include/PermissionDescription.php:116 -msgid "Public" +#: ../../include/text.php:1237 ../../include/js_strings.php:51 +msgid "July" msgstr "" -#: ../../include/PermissionDescription.php:117 -msgid "Anybody in the $Projectname network" +#: ../../include/text.php:1237 ../../include/js_strings.php:52 +msgid "August" msgstr "" -#: ../../include/PermissionDescription.php:118 -#, php-format -msgid "Any account on %s" +#: ../../include/text.php:1237 ../../include/js_strings.php:53 +msgid "September" msgstr "" -#: ../../include/PermissionDescription.php:119 -msgid "Any of my connections" +#: ../../include/text.php:1237 ../../include/js_strings.php:54 +msgid "October" msgstr "" -#: ../../include/PermissionDescription.php:120 -msgid "Only connections I specifically allow" +#: ../../include/text.php:1237 ../../include/js_strings.php:55 +msgid "November" msgstr "" -#: ../../include/PermissionDescription.php:121 -msgid "Anybody authenticated (could include visitors from other networks)" +#: ../../include/text.php:1237 ../../include/js_strings.php:56 +msgid "December" msgstr "" -#: ../../include/PermissionDescription.php:122 -msgid "Any connections including those who haven't yet been approved" +#: ../../include/text.php:1314 ../../include/text.php:1318 +msgid "Unknown Attachment" msgstr "" -#: ../../include/PermissionDescription.php:161 -msgid "" -"This is your default setting for the audience of your normal stream, and " -"posts." +#: ../../include/text.php:1320 +msgid "unknown" msgstr "" -#: ../../include/PermissionDescription.php:162 -msgid "" -"This is your default setting for who can view your default channel profile" +#: ../../include/text.php:1356 +msgid "remove category" msgstr "" -#: ../../include/PermissionDescription.php:163 -msgid "This is your default setting for who can view your connections" +#: ../../include/text.php:1433 +msgid "remove from file" msgstr "" -#: ../../include/PermissionDescription.php:164 -msgid "" -"This is your default setting for who can view your file storage and photos" +#: ../../include/text.php:1730 ../../include/text.php:1801 +msgid "default" msgstr "" -#: ../../include/PermissionDescription.php:165 -msgid "This is your default setting for the audience of your webpages" +#: ../../include/text.php:1738 +msgid "Page layout" msgstr "" -#: ../../include/account.php:28 -msgid "Not a valid email address" +#: ../../include/text.php:1738 +msgid "You can create your own with the layouts tool" msgstr "" -#: ../../include/account.php:30 -msgid "Your email domain is not among those allowed on this site" +#: ../../include/text.php:1780 +msgid "Page content type" msgstr "" -#: ../../include/account.php:36 -msgid "Your email address is already registered at this site." +#: ../../include/text.php:1813 +msgid "Select an alternate language" msgstr "" -#: ../../include/account.php:68 -msgid "An invitation is required." +#: ../../include/text.php:1930 +msgid "activity" msgstr "" -#: ../../include/account.php:72 -msgid "Invitation could not be verified." +#: ../../include/text.php:2239 +msgid "Design Tools" msgstr "" -#: ../../include/account.php:122 -msgid "Please enter the required information." +#: ../../include/text.php:2245 +msgid "Pages" msgstr "" -#: ../../include/account.php:189 -msgid "Failed to store account information." +#: ../../include/activities.php:41 +msgid " and " msgstr "" -#: ../../include/account.php:249 -#, php-format -msgid "Registration confirmation for %s" +#: ../../include/activities.php:49 +msgid "public profile" msgstr "" -#: ../../include/account.php:315 +#: ../../include/activities.php:58 #, php-format -msgid "Registration request at %s" -msgstr "" - -#: ../../include/account.php:317 ../../include/account.php:344 -#: ../../include/account.php:404 ../../include/network.php:1896 -msgid "Administrator" -msgstr "" - -#: ../../include/account.php:339 -msgid "your registration password" +msgid "%1$s changed %2$s to “%3$s”" msgstr "" -#: ../../include/account.php:342 ../../include/account.php:402 +#: ../../include/activities.php:59 #, php-format -msgid "Registration details for %s" -msgstr "" - -#: ../../include/account.php:414 -msgid "Account approved." +msgid "Visit %1$s's %2$s" msgstr "" -#: ../../include/account.php:454 +#: ../../include/activities.php:62 #, php-format -msgid "Registration revoked for %s" -msgstr "" - -#: ../../include/account.php:506 -msgid "Account verified. Please login." -msgstr "" - -#: ../../include/account.php:723 ../../include/account.php:725 -msgid "Click here to upgrade." -msgstr "" - -#: ../../include/account.php:731 -msgid "This action exceeds the limits set by your subscription plan." -msgstr "" - -#: ../../include/account.php:736 -msgid "This action is not available under your subscription plan." -msgstr "" - -#: ../../include/attach.php:247 ../../include/attach.php:333 -msgid "Item was not found." -msgstr "" - -#: ../../include/attach.php:499 -msgid "No source file." +msgid "%1$s has an updated %2$s, changing %3$s." msgstr "" -#: ../../include/attach.php:521 -msgid "Cannot locate file to replace" +#: ../../include/connections.php:95 +msgid "New window" msgstr "" -#: ../../include/attach.php:539 -msgid "Cannot locate file to revise/update" +#: ../../include/connections.php:96 +msgid "Open the selected location in a different window or browser tab" msgstr "" -#: ../../include/attach.php:674 +#: ../../include/connections.php:214 #, php-format -msgid "File exceeds size limit of %d" +msgid "User '%s' deleted" msgstr "" -#: ../../include/attach.php:688 +#: ../../include/conversation.php:204 #, php-format -msgid "You have reached your limit of %1$.0f Mbytes attachment storage." -msgstr "" - -#: ../../include/attach.php:846 -msgid "File upload failed. Possible system limit or action terminated." -msgstr "" - -#: ../../include/attach.php:859 -msgid "Stored file could not be verified. Upload failed." -msgstr "" - -#: ../../include/attach.php:915 ../../include/attach.php:931 -msgid "Path not available." -msgstr "" - -#: ../../include/attach.php:977 ../../include/attach.php:1129 -msgid "Empty pathname" -msgstr "" - -#: ../../include/attach.php:1003 -msgid "duplicate filename or path" -msgstr "" - -#: ../../include/attach.php:1025 -msgid "Path not found." -msgstr "" - -#: ../../include/attach.php:1083 -msgid "mkdir failed." -msgstr "" - -#: ../../include/attach.php:1087 -msgid "database storage failed." -msgstr "" - -#: ../../include/attach.php:1135 -msgid "Empty path" -msgstr "" - -#: ../../include/features.php:48 -msgid "General Features" -msgstr "" - -#: ../../include/features.php:50 -msgid "Content Expiration" -msgstr "" - -#: ../../include/features.php:50 -msgid "Remove posts/comments and/or private messages at a future time" -msgstr "" - -#: ../../include/features.php:51 -msgid "Multiple Profiles" -msgstr "" - -#: ../../include/features.php:51 -msgid "Ability to create multiple profiles" -msgstr "" - -#: ../../include/features.php:52 -msgid "Advanced Profiles" +msgid "%1$s is now connected with %2$s" msgstr "" -#: ../../include/features.php:52 -msgid "Additional profile sections and selections" +#: ../../include/conversation.php:239 +#, php-format +msgid "%1$s poked %2$s" msgstr "" -#: ../../include/features.php:53 -msgid "Profile Import/Export" +#: ../../include/conversation.php:694 +#, php-format +msgid "View %s's profile @ %s" msgstr "" -#: ../../include/features.php:53 -msgid "Save and load profile details across sites/channels" +#: ../../include/conversation.php:713 +msgid "Categories:" msgstr "" -#: ../../include/features.php:54 -msgid "Web Pages" +#: ../../include/conversation.php:714 +msgid "Filed under:" msgstr "" -#: ../../include/features.php:54 -msgid "Provide managed web pages on your channel" +#: ../../include/conversation.php:741 +msgid "View in context" msgstr "" -#: ../../include/features.php:55 -msgid "Hide Rating" +#: ../../include/conversation.php:850 +msgid "remove" msgstr "" -#: ../../include/features.php:55 -msgid "" -"Hide the rating buttons on your channel and profile pages. Note: People can " -"still rate you somewhere else." +#: ../../include/conversation.php:855 +msgid "Delete Selected Items" msgstr "" -#: ../../include/features.php:56 -msgid "Private Notes" +#: ../../include/conversation.php:951 +msgid "View Source" msgstr "" -#: ../../include/features.php:56 -msgid "Enables a tool to store notes and reminders (note: not encrypted)" +#: ../../include/conversation.php:952 +msgid "Follow Thread" msgstr "" -#: ../../include/features.php:57 -msgid "Navigation Channel Select" +#: ../../include/conversation.php:953 +msgid "Unfollow Thread" msgstr "" -#: ../../include/features.php:57 -msgid "Change channels directly from within the navigation dropdown menu" +#: ../../include/conversation.php:958 +msgid "Activity/Posts" msgstr "" -#: ../../include/features.php:58 -msgid "Photo Location" +#: ../../include/conversation.php:960 +msgid "Edit Connection" msgstr "" -#: ../../include/features.php:58 -msgid "If location data is available on uploaded photos, link this to a map." +#: ../../include/conversation.php:961 +msgid "Message" msgstr "" -#: ../../include/features.php:59 -msgid "Access Controlled Chatrooms" +#: ../../include/conversation.php:1078 +#, php-format +msgid "%s likes this." msgstr "" -#: ../../include/features.php:59 -msgid "Provide chatrooms and chat services with access control." +#: ../../include/conversation.php:1078 +#, php-format +msgid "%s doesn't like this." msgstr "" -#: ../../include/features.php:60 -msgid "Smart Birthdays" -msgstr "" +#: ../../include/conversation.php:1082 +#, php-format +msgid "<span %1$s>%2$d people</span> like this." +msgid_plural "<span %1$s>%2$d people</span> like this." +msgstr[0] "" +msgstr[1] "" -#: ../../include/features.php:60 -msgid "" -"Make birthday events timezone aware in case your friends are scattered " -"across the planet." -msgstr "" +#: ../../include/conversation.php:1084 +#, php-format +msgid "<span %1$s>%2$d people</span> don't like this." +msgid_plural "<span %1$s>%2$d people</span> don't like this." +msgstr[0] "" +msgstr[1] "" -#: ../../include/features.php:61 -msgid "Expert Mode" +#: ../../include/conversation.php:1090 +msgid "and" msgstr "" -#: ../../include/features.php:61 -msgid "Enable Expert Mode to provide advanced configuration options" -msgstr "" +#: ../../include/conversation.php:1093 +#, php-format +msgid ", and %d other people" +msgid_plural ", and %d other people" +msgstr[0] "" +msgstr[1] "" -#: ../../include/features.php:62 -msgid "Premium Channel" +#: ../../include/conversation.php:1094 +#, php-format +msgid "%s like this." msgstr "" -#: ../../include/features.php:62 -msgid "" -"Allows you to set restrictions and terms on those that connect with your " -"channel" +#: ../../include/conversation.php:1094 +#, php-format +msgid "%s don't like this." msgstr "" -#: ../../include/features.php:67 -msgid "Post Composition Features" +#: ../../include/conversation.php:1133 +msgid "Set your location" msgstr "" -#: ../../include/features.php:70 -msgid "Large Photos" +#: ../../include/conversation.php:1134 +msgid "Clear browser location" msgstr "" -#: ../../include/features.php:70 -msgid "" -"Include large (1024px) photo thumbnails in posts. If not enabled, use small " -"(640px) photo thumbnails" +#: ../../include/conversation.php:1150 +msgid "Embed image from photo albums" msgstr "" -#: ../../include/features.php:71 -msgid "Automatically import channel content from other channels or feeds" +#: ../../include/conversation.php:1182 +msgid "Tag term:" msgstr "" -#: ../../include/features.php:72 -msgid "Even More Encryption" +#: ../../include/conversation.php:1183 +msgid "Where are you right now?" msgstr "" -#: ../../include/features.php:72 -msgid "" -"Allow optional encryption of content end-to-end with a shared secret key" +#: ../../include/conversation.php:1186 +msgid "Choose images to embed" msgstr "" -#: ../../include/features.php:73 -msgid "Enable Voting Tools" +#: ../../include/conversation.php:1187 +msgid "Choose an album" msgstr "" -#: ../../include/features.php:73 -msgid "Provide a class of post which others can vote on" +#: ../../include/conversation.php:1188 +msgid "Choose a different album..." msgstr "" -#: ../../include/features.php:74 -msgid "Delayed Posting" +#: ../../include/conversation.php:1189 +msgid "Error getting album list" msgstr "" -#: ../../include/features.php:74 -msgid "Allow posts to be published at a later date" +#: ../../include/conversation.php:1190 +msgid "Error getting photo link" msgstr "" -#: ../../include/features.php:75 -msgid "Suppress Duplicate Posts/Comments" +#: ../../include/conversation.php:1191 +msgid "Error getting album" msgstr "" -#: ../../include/features.php:75 -msgid "" -"Prevent posts with identical content to be published with less than two " -"minutes in between submissions." +#: ../../include/conversation.php:1221 +msgid "Page link name" msgstr "" -#: ../../include/features.php:81 -msgid "Network and Stream Filtering" +#: ../../include/conversation.php:1224 +msgid "Post as" msgstr "" -#: ../../include/features.php:82 -msgid "Search by Date" +#: ../../include/conversation.php:1234 +msgid "Embed an image from your albums" msgstr "" -#: ../../include/features.php:82 -msgid "Ability to select posts by date ranges" +#: ../../include/conversation.php:1236 ../../include/conversation.php:1273 +msgid "OK" msgstr "" -#: ../../include/features.php:83 ../../include/group.php:311 -msgid "Privacy Groups" +#: ../../include/conversation.php:1238 +msgid "Toggle voting" msgstr "" -#: ../../include/features.php:83 -msgid "Enable management and selection of privacy groups" +#: ../../include/conversation.php:1246 +msgid "Categories (optional, comma-separated list)" msgstr "" -#: ../../include/features.php:84 ../../include/widgets.php:281 -msgid "Saved Searches" +#: ../../include/conversation.php:1269 +msgid "Set publish date" msgstr "" -#: ../../include/features.php:84 -msgid "Save search terms for re-use" +#: ../../include/conversation.php:1518 +msgid "Discover" msgstr "" -#: ../../include/features.php:85 -msgid "Network Personal Tab" +#: ../../include/conversation.php:1521 +msgid "Imported public streams" msgstr "" -#: ../../include/features.php:85 -msgid "Enable tab to display only Network posts that you've interacted on" +#: ../../include/conversation.php:1526 +msgid "Commented Order" msgstr "" -#: ../../include/features.php:86 -msgid "Network New Tab" +#: ../../include/conversation.php:1529 +msgid "Sort by Comment Date" msgstr "" -#: ../../include/features.php:86 -msgid "Enable tab to display all new Network activity" +#: ../../include/conversation.php:1533 +msgid "Posted Order" msgstr "" -#: ../../include/features.php:87 -msgid "Affinity Tool" +#: ../../include/conversation.php:1536 +msgid "Sort by Post Date" msgstr "" -#: ../../include/features.php:87 -msgid "Filter stream activity by depth of relationships" +#: ../../include/conversation.php:1544 +msgid "Posts that mention or involve you" msgstr "" -#: ../../include/features.php:88 -msgid "Connection Filtering" +#: ../../include/conversation.php:1553 +msgid "Activity Stream - by date" msgstr "" -#: ../../include/features.php:88 -msgid "Filter incoming posts from connections based on keywords/content" +#: ../../include/conversation.php:1559 +msgid "Starred" msgstr "" -#: ../../include/features.php:89 -msgid "Show channel suggestions" +#: ../../include/conversation.php:1562 +msgid "Favourite Posts" msgstr "" -#: ../../include/features.php:94 -msgid "Post/Comment Tools" +#: ../../include/conversation.php:1569 +msgid "Spam" msgstr "" -#: ../../include/features.php:95 -msgid "Community Tagging" +#: ../../include/conversation.php:1572 +msgid "Posts flagged as SPAM" msgstr "" -#: ../../include/features.php:95 -msgid "Ability to tag existing posts" +#: ../../include/conversation.php:1629 +msgid "Status Messages and Posts" msgstr "" -#: ../../include/features.php:96 -msgid "Post Categories" +#: ../../include/conversation.php:1638 +msgid "About" msgstr "" -#: ../../include/features.php:96 -msgid "Add categories to your posts" +#: ../../include/conversation.php:1641 +msgid "Profile Details" msgstr "" -#: ../../include/features.php:97 -msgid "Emoji Reactions" +#: ../../include/conversation.php:1650 ../../include/photos.php:506 +msgid "Photo Albums" msgstr "" -#: ../../include/features.php:97 -msgid "Add emoji reaction ability to posts" +#: ../../include/conversation.php:1657 +msgid "Files and Storage" msgstr "" -#: ../../include/features.php:98 -msgid "Ability to file posts under folders" +#: ../../include/conversation.php:1677 ../../include/conversation.php:1680 +#: ../../include/widgets.php:842 +msgid "Chatrooms" msgstr "" -#: ../../include/features.php:99 -msgid "Dislike Posts" +#: ../../include/conversation.php:1693 +msgid "Saved Bookmarks" msgstr "" -#: ../../include/features.php:99 -msgid "Ability to dislike posts/comments" +#: ../../include/conversation.php:1703 +msgid "Manage Webpages" msgstr "" -#: ../../include/features.php:100 -msgid "Star Posts" -msgstr "" +#: ../../include/conversation.php:1762 +msgctxt "noun" +msgid "Attending" +msgid_plural "Attending" +msgstr[0] "" +msgstr[1] "" -#: ../../include/features.php:100 -msgid "Ability to mark special posts with a star indicator" -msgstr "" +#: ../../include/conversation.php:1765 +msgctxt "noun" +msgid "Not Attending" +msgid_plural "Not Attending" +msgstr[0] "" +msgstr[1] "" -#: ../../include/features.php:101 -msgid "Tag Cloud" -msgstr "" +#: ../../include/conversation.php:1768 +msgctxt "noun" +msgid "Undecided" +msgid_plural "Undecided" +msgstr[0] "" +msgstr[1] "" -#: ../../include/features.php:101 -msgid "Provide a personal tag cloud on your channel page" -msgstr "" +#: ../../include/conversation.php:1771 +msgctxt "noun" +msgid "Agree" +msgid_plural "Agrees" +msgstr[0] "" +msgstr[1] "" -#: ../../include/oembed.php:324 -msgid "Embedded content" -msgstr "" +#: ../../include/conversation.php:1774 +msgctxt "noun" +msgid "Disagree" +msgid_plural "Disagrees" +msgstr[0] "" +msgstr[1] "" -#: ../../include/oembed.php:333 -msgid "Embedding disabled" -msgstr "" +#: ../../include/conversation.php:1777 +msgctxt "noun" +msgid "Abstain" +msgid_plural "Abstains" +msgstr[0] "" +msgstr[1] "" -#: ../../include/import.php:29 -msgid "" -"Cannot create a duplicate channel identifier on this system. Import failed." +#: ../../include/attach.php:247 ../../include/attach.php:333 +msgid "Item was not found." msgstr "" -#: ../../include/import.php:76 -msgid "Channel clone failed. Import failed." +#: ../../include/attach.php:499 +msgid "No source file." msgstr "" -#: ../../include/connections.php:95 -msgid "New window" +#: ../../include/attach.php:521 +msgid "Cannot locate file to replace" msgstr "" -#: ../../include/connections.php:96 -msgid "Open the selected location in a different window or browser tab" +#: ../../include/attach.php:539 +msgid "Cannot locate file to revise/update" msgstr "" -#: ../../include/connections.php:214 +#: ../../include/attach.php:674 #, php-format -msgid "User '%s' deleted" -msgstr "" - -#: ../../include/acl_selectors.php:271 -msgid "Who can see this?" -msgstr "" - -#: ../../include/acl_selectors.php:272 -msgid "Custom selection" -msgstr "" - -#: ../../include/acl_selectors.php:273 -msgid "" -"Select \"Show\" to allow viewing. \"Don't show\" lets you override and limit " -"the scope of \"Show\"." -msgstr "" - -#: ../../include/acl_selectors.php:274 -msgid "Show" -msgstr "" - -#: ../../include/acl_selectors.php:275 -msgid "Don't show" -msgstr "" - -#: ../../include/acl_selectors.php:281 -msgid "Other networks and post services" +msgid "File exceeds size limit of %d" msgstr "" -#: ../../include/acl_selectors.php:311 +#: ../../include/attach.php:688 #, 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." +msgid "You have reached your limit of %1$.0f Mbytes attachment storage." msgstr "" -#: ../../include/auth.php:105 -msgid "Logged out." +#: ../../include/attach.php:846 +msgid "File upload failed. Possible system limit or action terminated." msgstr "" -#: ../../include/auth.php:212 -msgid "Failed authentication" +#: ../../include/attach.php:859 +msgid "Stored file could not be verified. Upload failed." msgstr "" -#: ../../include/datetime.php:135 -msgid "Birthday" +#: ../../include/attach.php:915 ../../include/attach.php:931 +msgid "Path not available." msgstr "" -#: ../../include/datetime.php:137 -msgid "Age: " +#: ../../include/attach.php:977 ../../include/attach.php:1129 +msgid "Empty pathname" msgstr "" -#: ../../include/datetime.php:139 -msgid "YYYY-MM-DD or MM-DD" +#: ../../include/attach.php:1003 +msgid "duplicate filename or path" msgstr "" -#: ../../include/datetime.php:272 ../../boot.php:2471 -msgid "never" +#: ../../include/attach.php:1025 +msgid "Path not found." msgstr "" -#: ../../include/datetime.php:278 -msgid "less than a second ago" +#: ../../include/attach.php:1083 +msgid "mkdir failed." msgstr "" -#: ../../include/datetime.php:296 -#, php-format -msgctxt "e.g. 22 hours ago, 1 minute ago" -msgid "%1$d %2$s ago" +#: ../../include/attach.php:1087 +msgid "database storage failed." msgstr "" -#: ../../include/datetime.php:307 -msgctxt "relative_date" -msgid "year" -msgid_plural "years" -msgstr[0] "" -msgstr[1] "" - -#: ../../include/datetime.php:310 -msgctxt "relative_date" -msgid "month" -msgid_plural "months" -msgstr[0] "" -msgstr[1] "" - -#: ../../include/datetime.php:313 -msgctxt "relative_date" -msgid "week" -msgid_plural "weeks" -msgstr[0] "" -msgstr[1] "" - -#: ../../include/datetime.php:316 -msgctxt "relative_date" -msgid "day" -msgid_plural "days" -msgstr[0] "" -msgstr[1] "" - -#: ../../include/datetime.php:319 -msgctxt "relative_date" -msgid "hour" -msgid_plural "hours" -msgstr[0] "" -msgstr[1] "" - -#: ../../include/datetime.php:322 -msgctxt "relative_date" -msgid "minute" -msgid_plural "minutes" -msgstr[0] "" -msgstr[1] "" - -#: ../../include/datetime.php:325 -msgctxt "relative_date" -msgid "second" -msgid_plural "seconds" -msgstr[0] "" -msgstr[1] "" - -#: ../../include/datetime.php:562 -#, php-format -msgid "%1$s's birthday" +#: ../../include/attach.php:1135 +msgid "Empty path" msgstr "" -#: ../../include/datetime.php:563 +#: ../../include/photos.php:114 #, php-format -msgid "Happy Birthday %1$s" -msgstr "" - -#: ../../include/group.php:26 -msgid "" -"A deleted group with this name was revived. Existing item permissions " -"<strong>may</strong> apply to this group and any future members. If this is " -"not what you intended, please create another group with a different name." -msgstr "" - -#: ../../include/group.php:248 -msgid "Add new connections to this privacy group" +msgid "Image exceeds website size limit of %lu bytes" msgstr "" -#: ../../include/group.php:289 -msgid "edit" +#: ../../include/photos.php:121 +msgid "Image file is empty." msgstr "" -#: ../../include/group.php:312 -msgid "Edit group" +#: ../../include/photos.php:259 +msgid "Photo storage failed." msgstr "" -#: ../../include/group.php:313 -msgid "Add privacy group" +#: ../../include/photos.php:299 +msgid "a new photo" msgstr "" -#: ../../include/group.php:314 -msgid "Channels not in any privacy group" +#: ../../include/photos.php:303 +#, php-format +msgctxt "photo_upload" +msgid "%1$s posted %2$s to %3$s" msgstr "" -#: ../../include/group.php:316 ../../include/widgets.php:282 -msgid "add" +#: ../../include/photos.php:510 +msgid "Upload New Photos" msgstr "" #: ../../include/js_strings.php:5 @@ -9169,114 +9023,294 @@ msgctxt "calendar" msgid "All day" msgstr "" -#: ../../include/network.php:682 -msgid "view full size" +#: ../../include/PermissionDescription.php:116 +msgid "Public" msgstr "" -#: ../../include/network.php:1910 -msgid "No Subject" +#: ../../include/PermissionDescription.php:117 +msgid "Anybody in the $Projectname network" msgstr "" -#: ../../include/network.php:2171 ../../include/network.php:2172 -msgid "Friendica" +#: ../../include/PermissionDescription.php:118 +#, php-format +msgid "Any account on %s" msgstr "" -#: ../../include/network.php:2173 -msgid "OStatus" +#: ../../include/PermissionDescription.php:119 +msgid "Any of my connections" msgstr "" -#: ../../include/network.php:2174 -msgid "GNU-Social" +#: ../../include/PermissionDescription.php:120 +msgid "Only connections I specifically allow" msgstr "" -#: ../../include/network.php:2175 -msgid "RSS/Atom" +#: ../../include/PermissionDescription.php:121 +msgid "Anybody authenticated (could include visitors from other networks)" msgstr "" -#: ../../include/network.php:2177 -msgid "Diaspora" +#: ../../include/PermissionDescription.php:122 +msgid "Any connections including those who haven't yet been approved" msgstr "" -#: ../../include/network.php:2178 -msgid "Facebook" +#: ../../include/PermissionDescription.php:161 +msgid "" +"This is your default setting for the audience of your normal stream, and " +"posts." msgstr "" -#: ../../include/network.php:2179 -msgid "Zot" +#: ../../include/PermissionDescription.php:162 +msgid "" +"This is your default setting for who can view your default channel profile" msgstr "" -#: ../../include/network.php:2180 -msgid "LinkedIn" +#: ../../include/PermissionDescription.php:163 +msgid "This is your default setting for who can view your connections" msgstr "" -#: ../../include/network.php:2181 -msgid "XMPP/IM" +#: ../../include/PermissionDescription.php:164 +msgid "" +"This is your default setting for who can view your file storage and photos" msgstr "" -#: ../../include/network.php:2182 -msgid "MySpace" +#: ../../include/PermissionDescription.php:165 +msgid "This is your default setting for the audience of your webpages" msgstr "" -#: ../../include/items.php:902 ../../include/items.php:947 -msgid "(Unknown)" +#: ../../include/contact_widgets.php:11 +#, php-format +msgid "%d invitation available" +msgid_plural "%d invitations available" +msgstr[0] "" +msgstr[1] "" + +#: ../../include/contact_widgets.php:19 +msgid "Find Channels" msgstr "" -#: ../../include/items.php:1146 -msgid "Visible to anybody on the internet." +#: ../../include/contact_widgets.php:20 +msgid "Enter name or interest" msgstr "" -#: ../../include/items.php:1148 -msgid "Visible to you only." +#: ../../include/contact_widgets.php:21 +msgid "Connect/Follow" msgstr "" -#: ../../include/items.php:1150 -msgid "Visible to anybody in this network." +#: ../../include/contact_widgets.php:22 +msgid "Examples: Robert Morgenstein, Fishing" msgstr "" -#: ../../include/items.php:1152 -msgid "Visible to anybody authenticated." +#: ../../include/contact_widgets.php:26 +msgid "Random Profile" msgstr "" -#: ../../include/items.php:1154 +#: ../../include/contact_widgets.php:27 +msgid "Invite Friends" +msgstr "" + +#: ../../include/contact_widgets.php:29 +msgid "Advanced example: name=fred and country=iceland" +msgstr "" + +#: ../../include/contact_widgets.php:56 ../../include/contact_widgets.php:94 +#: ../../include/widgets.php:313 ../../include/widgets.php:432 +msgid "Everything" +msgstr "" + +#: ../../include/contact_widgets.php:122 #, php-format -msgid "Visible to anybody on %s." +msgid "%d connection in common" +msgid_plural "%d connections in common" +msgstr[0] "" +msgstr[1] "" + +#: ../../include/contact_widgets.php:127 +msgid "show more" msgstr "" -#: ../../include/items.php:1156 -msgid "Visible to all connections." +#: ../../include/dir_fns.php:141 +msgid "Directory Options" msgstr "" -#: ../../include/items.php:1158 -msgid "Visible to approved connections." +#: ../../include/dir_fns.php:143 +msgid "Safe Mode" msgstr "" -#: ../../include/items.php:1160 -msgid "Visible to specific connections." +#: ../../include/dir_fns.php:144 +msgid "Public Forums Only" msgstr "" -#: ../../include/items.php:3920 -msgid "Privacy group is empty." +#: ../../include/dir_fns.php:145 +msgid "This Website Only" +msgstr "" + +#: ../../include/message.php:20 +msgid "No recipient provided." +msgstr "" + +#: ../../include/message.php:25 +msgid "[no subject]" +msgstr "" + +#: ../../include/message.php:45 +msgid "Unable to determine sender." +msgstr "" + +#: ../../include/message.php:222 +msgid "Stored post could not be verified." +msgstr "" + +#: ../../include/channel.php:32 +msgid "Unable to obtain identity information from database" +msgstr "" + +#: ../../include/channel.php:66 +msgid "Empty name" +msgstr "" + +#: ../../include/channel.php:69 +msgid "Name too long" +msgstr "" + +#: ../../include/channel.php:180 +msgid "No account identifier" +msgstr "" + +#: ../../include/channel.php:192 +msgid "Nickname is required." +msgstr "" + +#: ../../include/channel.php:206 +msgid "Reserved nickname. Please choose another." +msgstr "" + +#: ../../include/channel.php:211 +msgid "" +"Nickname has unsupported characters or is already being used on this site." +msgstr "" + +#: ../../include/channel.php:287 +msgid "Unable to retrieve created identity" +msgstr "" + +#: ../../include/channel.php:345 +msgid "Default Profile" +msgstr "" + +#: ../../include/channel.php:778 +msgid "Requested channel is not available." +msgstr "" + +#: ../../include/channel.php:925 +msgid "Create New Profile" +msgstr "" + +#: ../../include/channel.php:945 +msgid "Visible to everybody" +msgstr "" + +#: ../../include/channel.php:1018 ../../include/channel.php:1130 +msgid "Gender:" +msgstr "" + +#: ../../include/channel.php:1019 ../../include/channel.php:1174 +msgid "Status:" +msgstr "" + +#: ../../include/channel.php:1020 ../../include/channel.php:1185 +msgid "Homepage:" +msgstr "" + +#: ../../include/channel.php:1021 +msgid "Online Now" +msgstr "" + +#: ../../include/channel.php:1135 +msgid "Like this channel" msgstr "" -#: ../../include/items.php:3927 +#: ../../include/channel.php:1159 +msgid "j F, Y" +msgstr "" + +#: ../../include/channel.php:1160 +msgid "j F" +msgstr "" + +#: ../../include/channel.php:1167 +msgid "Birthday:" +msgstr "" + +#: ../../include/channel.php:1180 #, php-format -msgid "Privacy group: %s" +msgid "for %1$d %2$s" msgstr "" -#: ../../include/items.php:3939 -msgid "Connection not found." +#: ../../include/channel.php:1183 +msgid "Sexual Preference:" msgstr "" -#: ../../include/items.php:4305 -msgid "profile photo" +#: ../../include/channel.php:1189 +msgid "Tags:" msgstr "" -#: ../../include/page_widgets.php:7 -msgid "New Page" +#: ../../include/channel.php:1191 +msgid "Political Views:" msgstr "" -#: ../../include/page_widgets.php:46 -msgid "Title" +#: ../../include/channel.php:1193 +msgid "Religion:" +msgstr "" + +#: ../../include/channel.php:1197 +msgid "Hobbies/Interests:" +msgstr "" + +#: ../../include/channel.php:1199 +msgid "Likes:" +msgstr "" + +#: ../../include/channel.php:1201 +msgid "Dislikes:" +msgstr "" + +#: ../../include/channel.php:1203 +msgid "Contact information and Social Networks:" +msgstr "" + +#: ../../include/channel.php:1205 +msgid "My other channels:" +msgstr "" + +#: ../../include/channel.php:1207 +msgid "Musical interests:" +msgstr "" + +#: ../../include/channel.php:1209 +msgid "Books, literature:" +msgstr "" + +#: ../../include/channel.php:1211 +msgid "Television:" +msgstr "" + +#: ../../include/channel.php:1213 +msgid "Film/dance/culture/entertainment:" +msgstr "" + +#: ../../include/channel.php:1215 +msgid "Love/Romance:" +msgstr "" + +#: ../../include/channel.php:1217 +msgid "Work/employment:" +msgstr "" + +#: ../../include/channel.php:1219 +msgid "School/education:" +msgstr "" + +#: ../../include/channel.php:1240 +msgid "Like this thing" msgstr "" #: ../../include/widgets.php:103 @@ -9648,39 +9682,12 @@ msgstr "" msgid "Custom/Expert Mode" msgstr "" -#: ../../include/activities.php:41 -msgid " and " -msgstr "" - -#: ../../include/activities.php:49 -msgid "public profile" -msgstr "" - -#: ../../include/activities.php:58 -#, php-format -msgid "%1$s changed %2$s to “%3$s”" -msgstr "" - -#: ../../include/activities.php:59 -#, php-format -msgid "Visit %1$s's %2$s" -msgstr "" - -#: ../../include/activities.php:62 -#, php-format -msgid "%1$s has an updated %2$s, changing %3$s." -msgstr "" - -#: ../../include/bb2diaspora.php:398 -msgid "Attachments:" -msgstr "" - -#: ../../include/bb2diaspora.php:487 -msgid "$Projectname event notification:" +#: ../../include/auth.php:105 +msgid "Logged out." msgstr "" -#: ../../include/api.php:1326 -msgid "Public Timeline" +#: ../../include/auth.php:212 +msgid "Failed authentication" msgstr "" #: ../../view/theme/redbasic/php/config.php:82 @@ -9861,20 +9868,20 @@ msgstr "" msgid "toggle mobile" msgstr "" -#: ../../boot.php:2426 +#: ../../boot.php:2432 msgid "Website SSL certificate is not valid. Please correct." msgstr "" -#: ../../boot.php:2429 +#: ../../boot.php:2435 #, php-format msgid "[hubzilla] Website SSL error for %s" msgstr "" -#: ../../boot.php:2470 +#: ../../boot.php:2476 msgid "Cron/Scheduled tasks not running." msgstr "" -#: ../../boot.php:2474 +#: ../../boot.php:2480 #, php-format msgid "[hubzilla] Cron tasks not running on %s" msgstr "" diff --git a/view/tpl/conv_item.tpl b/view/tpl/conv_item.tpl index 9c879e109..903a23eed 100755 --- a/view/tpl/conv_item.tpl +++ b/view/tpl/conv_item.tpl @@ -20,7 +20,7 @@ {{/if}} <div class="wall-item-head"> <div class="wall-item-info" id="wall-item-info-{{$item.id}}" > - <div class="wall-item-photo-wrapper{{if $item.owner_url}} wwfrom{{/if}} h-card" id="wall-item-photo-wrapper-{{$item.id}}"> + <div class="wall-item-photo-wrapper{{if $item.owner_url}} wwfrom{{/if}} h-card p-author" id="wall-item-photo-wrapper-{{$item.id}}"> <a href="{{$item.profile_url}}" title="{{$item.linktitle}}" class="wall-item-photo-link u-url" id="wall-item-photo-link-{{$item.id}}"><img src="{{$item.thumb}}" class="wall-item-photo{{$item.sparkle}} u-photo p-name" id="wall-item-photo-{{$item.id}}" alt="{{$item.name}}" /></a> </div> <div class="wall-item-photo-end" style="clear:both"></div> @@ -133,7 +133,7 @@ <li role="presentation"><a role="menuitem" href="#" onclick="jotShare({{$item.id}}); return false"><i class="fa fa-retweet" title="{{$item.share.0}}"></i> {{$item.share.0}}</a></li> {{/if}} {{if $item.plink}} - <li role="presentation"><a role="menuitem" href="{{$item.plink.href}}" title="{{$item.plink.title}}" ><i class="fa fa-external-link"></i> {{$item.plink.title}}</a></li> + <li role="presentation"><a role="menuitem" href="{{$item.plink.href}}" title="{{$item.plink.title}}" class="u-url"><i class="fa fa-external-link"></i> {{$item.plink.title}}</a></li> {{/if}} {{if $item.edpost}} <li role="presentation"><a role="menuitem" href="{{$item.edpost.0}}" title="{{$item.edpost.1}}"><i class="editpost fa fa-pencil"></i> {{$item.edpost.1}}</a></li> diff --git a/view/tpl/cropcover.tpl b/view/tpl/cropcover.tpl index 68c948889..04b96a603 100755 --- a/view/tpl/cropcover.tpl +++ b/view/tpl/cropcover.tpl @@ -28,7 +28,7 @@ minWidth: 240, minHeight: 87, maxWidth: 320, - maxHeight: 320, + maxHeight: 116, ratioDim: { x: 100, y:36 }, displayOnInit: true, onEndCrop: onEndCrop diff --git a/view/tpl/nav.tpl b/view/tpl/nav.tpl index 5c8c097da..c0e17d6b5 100755 --- a/view/tpl/nav.tpl +++ b/view/tpl/nav.tpl @@ -17,7 +17,7 @@ </button> {{/if}} {{if $userinfo}} - <img class="dropdown-toggle fakelink" data-toggle="dropdown" id="avatar" src="{{$userinfo.icon}}" alt="{{$userinfo.name}}"><span class="caret" id="usermenu-caret"></span> + <img class="dropdown-toggle fakelink" data-toggle="dropdown" id="avatar" src="{{$userinfo.icon}}" alt="{{$userinfo.name}}"><span class="caret dropdown-toggle fakelink" data-toggle="dropdown" id="usermenu-caret"></span> {{if $localuser}} <ul class="dropdown-menu" role="menu" aria-labelledby="avatar"> {{foreach $nav.usermenu as $usermenu}} |