aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorzotlabs <mike@macgirvin.com>2016-10-23 17:49:15 -0700
committerzotlabs <mike@macgirvin.com>2016-10-23 17:49:15 -0700
commit8d52a278a964de86f2159441ed0cffe3add0d916 (patch)
tree5037abae57c01c7ff9f53e760314bb552d2b7773
parentd30892ea601e9131c6dc3b25aeee1f258f72a104 (diff)
parent5fbba27d17c78081e784fc2f8e9bb1907b79b4b7 (diff)
downloadvolse-hubzilla-8d52a278a964de86f2159441ed0cffe3add0d916.tar.gz
volse-hubzilla-8d52a278a964de86f2159441ed0cffe3add0d916.tar.bz2
volse-hubzilla-8d52a278a964de86f2159441ed0cffe3add0d916.zip
Merge branch 'dev' into pdo
Diffstat
-rw-r--r--Zotlabs/Module/Cover_photo.php4
-rw-r--r--Zotlabs/Module/Events.php13
-rw-r--r--Zotlabs/Module/Photos.php2
-rw-r--r--Zotlabs/Module/Profile_photo.php4
-rw-r--r--Zotlabs/Module/Profiles.php2
-rw-r--r--Zotlabs/Module/Wiki.php30
-rw-r--r--Zotlabs/Storage/Directory.php6
-rw-r--r--include/api_zot.php2
-rw-r--r--include/attach.php32
-rw-r--r--include/bb2diaspora.php2
-rw-r--r--include/import.php2
-rw-r--r--include/message.php2
-rwxr-xr-xinclude/oembed.php12
-rw-r--r--util/hmessages.po6063
-rw-r--r--view/js/autocomplete.js2
-rwxr-xr-xview/tpl/event_form.tpl2
-rwxr-xr-xview/tpl/event_head.tpl11
-rw-r--r--view/tpl/wiki.tpl4
-rw-r--r--view/tpl/wikilist.tpl1
19 files changed, 3114 insertions, 3082 deletions
diff --git a/Zotlabs/Module/Cover_photo.php b/Zotlabs/Module/Cover_photo.php
index 7c8e1323c..72ec1020d 100644
--- a/Zotlabs/Module/Cover_photo.php
+++ b/Zotlabs/Module/Cover_photo.php
@@ -88,7 +88,7 @@ class Cover_photo extends \Zotlabs\Web\Controller {
if($r) {
$base_image = $r[0];
- $base_image['content'] = (($r[0]['os_storage']) ? @file_get_contents($base_image['content']) : dbunescbin($base_image['content']));
+ $base_image['content'] = (($r[0]['os_storage']) ? @file_get_contents(dbunescbin($base_image['content'])) : dbunescbin($base_image['content']));
$im = photo_factory($base_image['content'], $base_image['mimetype']);
if($im->is_valid()) {
@@ -320,7 +320,7 @@ class Cover_photo extends \Zotlabs\Web\Controller {
}
if(intval($r[0]['os_storage']))
- $data = @file_get_contents($r[0]['content']);
+ $data = @file_get_contents(dbunescbin($r[0]['content']));
else
$data = dbunescbin($r[0]['content']);
diff --git a/Zotlabs/Module/Events.php b/Zotlabs/Module/Events.php
index a5cc868be..26455cf8e 100644
--- a/Zotlabs/Module/Events.php
+++ b/Zotlabs/Module/Events.php
@@ -440,8 +440,6 @@ class Events extends \Zotlabs\Web\Controller {
$permissions = ((x($orig_event)) ? $orig_event : $perm_defaults);
- //print_r(acl2json($permissions['allow_gid'])); killme();
-
$tpl = get_markup_template('event_form.tpl');
$form = replace_macros($tpl,array(
@@ -469,9 +467,6 @@ class Events extends \Zotlabs\Web\Controller {
'$l_text' => (($event_id) ? t('Edit Location') : t('Location')),
'$l_orig' => $l_orig,
'$t_orig' => $t_orig,
- '$sh_text' => t('Share this event'),
- '$sh_checked' => $sh_checked,
- '$share' => array('distr', t('Share this event'), $sh_checked, '', array(t('No'),t('Yes'))),
'$preview' => t('Preview'),
'$perms_label' => t('Permission settings'),
// populating the acl dialog was a permission description from view_stream because Cal.php, which
@@ -483,6 +478,8 @@ class Events extends \Zotlabs\Web\Controller {
'$deny_cid' => acl2json($permissions['deny_cid']),
'$deny_gid' => acl2json($permissions['deny_gid']),
+ '$lockstate' => (($acl->is_private()) ? 'lock' : 'unlock'),
+
'$submit' => t('Submit'),
'$advanced' => t('Advanced Options')
@@ -611,6 +608,12 @@ class Events extends \Zotlabs\Web\Controller {
$end = null;
} else {
$end = (($rr['adjust']) ? datetime_convert('UTC',date_default_timezone_get(),$rr['dtend'], 'c') : datetime_convert('UTC','UTC',$rr['dtend'],'c'));
+
+ // give a fake end to birthdays so they get crammed into a
+ // single day on the calendar
+
+ if($rr['etype'] === 'birthday')
+ $end = null;
}
diff --git a/Zotlabs/Module/Photos.php b/Zotlabs/Module/Photos.php
index 1534dcfd6..3f0ab3ab0 100644
--- a/Zotlabs/Module/Photos.php
+++ b/Zotlabs/Module/Photos.php
@@ -246,7 +246,7 @@ class Photos extends \Zotlabs\Web\Controller {
intval($page_owner_uid)
);
if(count($r)) {
- $d = (($r[0]['os_storage']) ? @file_get_contents($r[0]['content']) : dbunescbin($r[0]['content']));
+ $d = (($r[0]['os_storage']) ? @file_get_contents(dbunescbin($r[0]['content'])) : dbunescbin($r[0]['content']));
$ph = photo_factory($d, $r[0]['mimetype']);
if($ph->is_valid()) {
$rotate_deg = ( (intval($_POST['rotate']) == 1) ? 270 : 90 );
diff --git a/Zotlabs/Module/Profile_photo.php b/Zotlabs/Module/Profile_photo.php
index 8a12e3799..231b80bcf 100644
--- a/Zotlabs/Module/Profile_photo.php
+++ b/Zotlabs/Module/Profile_photo.php
@@ -98,7 +98,7 @@ class Profile_photo extends \Zotlabs\Web\Controller {
if($r) {
$base_image = $r[0];
- $base_image['content'] = (($r[0]['os_storage']) ? @file_get_contents($base_image['content']) : dbunescbin($base_image['content']));
+ $base_image['content'] = (($r[0]['os_storage']) ? @file_get_contents(dbunescbin($base_image['content'])) : dbunescbin($base_image['content']));
$im = photo_factory($base_image['content'], $base_image['mimetype']);
if($im->is_valid()) {
@@ -354,7 +354,7 @@ class Profile_photo extends \Zotlabs\Web\Controller {
}
if(intval($r[0]['os_storage']))
- $data = @file_get_contents($r[0]['content']);
+ $data = @file_get_contents(dbunescbin($r[0]['content']));
else
$data = dbunescbin($r[0]['content']);
diff --git a/Zotlabs/Module/Profiles.php b/Zotlabs/Module/Profiles.php
index 127304f92..19a642a83 100644
--- a/Zotlabs/Module/Profiles.php
+++ b/Zotlabs/Module/Profiles.php
@@ -31,7 +31,7 @@ class Profiles extends \Zotlabs\Web\Controller {
// move every contact using this profile as their default to the user default
- $r = q("UPDATE abook SET abook_profile = (SELECT profile_guid AS FROM profile WHERE is_default = 1 AND uid = %d LIMIT 1) WHERE abook_profile = '%s' AND abook_channel = %d ",
+ $r = q("UPDATE abook SET abook_profile = (SELECT profile_guid FROM profile WHERE is_default = 1 AND uid = %d LIMIT 1) WHERE abook_profile = '%s' AND abook_channel = %d ",
intval(local_channel()),
dbesc($profile_guid),
intval(local_channel())
diff --git a/Zotlabs/Module/Wiki.php b/Zotlabs/Module/Wiki.php
index bb4e9179c..8cf106b33 100644
--- a/Zotlabs/Module/Wiki.php
+++ b/Zotlabs/Module/Wiki.php
@@ -90,6 +90,35 @@ class Wiki extends \Zotlabs\Web\Controller {
// Not the channel owner
$channel_acl = $x = array();
}
+
+ // Download a wiki
+ if ((argc() > 3) && (argv(2) === 'download') && (argv(3) === 'wiki')) {
+ $resource_id = argv(4);
+ $w = wiki_get_wiki($resource_id);
+ if (!$w['path']) {
+ notice('Error retrieving wiki' . EOL);
+ }
+ $zip_folder_name = random_string(10);
+ $zip_folderpath = '/tmp/' . $zip_folder_name;
+ if (!mkdir($zip_folderpath, 0770, false)) {
+ logger('Error creating zip file export folder: ' . $zip_folderpath, LOGGER_NORMAL);
+ notice('Error creating zip file export folder' . EOL);
+ }
+ $zip_filename = $w['urlName'];
+ $zip_filepath = '/tmp/' . $zip_folder_name . '/' . $zip_filename;
+ // Generate the zip file
+ \Zotlabs\Lib\ExtendedZip::zipTree($w['path'], $zip_filepath, \ZipArchive::CREATE);
+ // Output the file for download
+ header('Content-disposition: attachment; filename="' . $zip_filename . '.zip"');
+ header("Content-Type: application/zip");
+ $success = readfile($zip_filepath);
+ if ($success) {
+ rrmdir($zip_folderpath); // delete temporary files
+ } else {
+ rrmdir($zip_folderpath); // delete temporary files
+ logger('Error downloading wiki: ' . $resource_id);
+ }
+ }
switch (argc()) {
case 2:
@@ -297,6 +326,7 @@ class Wiki extends \Zotlabs\Web\Controller {
}
}
+
// Create a page
if ((argc() === 4) && (argv(2) === 'create') && (argv(3) === 'page')) {
$nick = argv(1);
diff --git a/Zotlabs/Storage/Directory.php b/Zotlabs/Storage/Directory.php
index ad450b2dd..5d078b04e 100644
--- a/Zotlabs/Storage/Directory.php
+++ b/Zotlabs/Storage/Directory.php
@@ -244,8 +244,8 @@ class Directory extends DAV\Node implements DAV\ICollection, DAV\IQuota {
$deny_gid = $c[0]['channel_deny_gid'];
}
- $r = q("INSERT INTO attach ( aid, uid, hash, creator, filename, folder, os_storage, filetype, filesize, revision, is_photo, content, created, edited, allow_cid, allow_gid, deny_cid, deny_gid )
- VALUES ( %d, %d, '%s', '%s', '%s', '%s', '%s', '%s', %d, %d, %d, '%s', '%s', '%s', '%s', '%s', '%s', '%s' ) ",
+ $r = q("INSERT INTO attach ( aid, uid, hash, creator, filename, folder, os_storage, filetype, filesize, revision, is_photo, content, created, edited, os_path, display_path, allow_cid, allow_gid, deny_cid, deny_gid )
+ VALUES ( %d, %d, '%s', '%s', '%s', '%s', '%s', '%s', %d, %d, %d, '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s' ) ",
intval($c[0]['channel_account_id']),
intval($c[0]['channel_id']),
dbesc($hash),
@@ -260,6 +260,8 @@ class Directory extends DAV\Node implements DAV\ICollection, DAV\IQuota {
dbesc($f),
dbesc(datetime_convert()),
dbesc(datetime_convert()),
+ '', //TODO: use os_path
+ '', //TODO: use display_path
dbesc($allow_cid),
dbesc($allow_gid),
dbesc($deny_cid),
diff --git a/include/api_zot.php b/include/api_zot.php
index e91d82b0b..38919cb95 100644
--- a/include/api_zot.php
+++ b/include/api_zot.php
@@ -83,7 +83,7 @@
$ptr['content'] = '';
elseif(! intval($r[0]['os_storage'])) {
$ptr['start'] = $start;
- $x = substr(dbunescbin($ptr['content'],$start,$length));
+ $x = substr(dbunescbin($ptr['content']),$start,$length);
$ptr['length'] = strlen($x);
$ptr['content'] = base64_encode($x);
}
diff --git a/include/attach.php b/include/attach.php
index 4e8b3c056..e2e214ce3 100644
--- a/include/attach.php
+++ b/include/attach.php
@@ -704,6 +704,7 @@ function attach_store($channel, $observer_hash, $options = '', $arr = null) {
// not yet used
$os_path = '';
+ $display_path = '';
if($src)
@file_put_contents($os_basepath . $os_relpath,@file_get_contents($src));
@@ -719,7 +720,7 @@ function attach_store($channel, $observer_hash, $options = '', $arr = null) {
$edited = $created;
if($options === 'replace') {
- $r = q("update attach set filename = '%s', filetype = '%s', folder = '%s', filesize = %d, os_storage = %d, is_photo = %d, content = '%s', edited = '%s', os_path = '%s' where id = %d and uid = %d",
+ $r = q("update attach set filename = '%s', filetype = '%s', folder = '%s', filesize = %d, os_storage = %d, is_photo = %d, content = '%s', edited = '%s', os_path = '%s', display_path = '%s' where id = %d and uid = %d",
dbesc($filename),
dbesc($mimetype),
dbesc($folder_hash),
@@ -729,13 +730,14 @@ function attach_store($channel, $observer_hash, $options = '', $arr = null) {
dbesc($os_basepath . $os_relpath),
dbesc($created),
dbesc($os_path),
+ dbesc($display_path),
intval($existing_id),
intval($channel_id)
);
}
elseif($options === 'revise') {
- $r = q("insert into attach ( aid, uid, hash, creator, filename, filetype, folder, filesize, revision, os_storage, is_photo, content, created, edited, os_path, allow_cid, allow_gid, deny_cid, deny_gid )
- VALUES ( %d, %d, '%s', '%s', '%s', '%s', '%s', %d, %d, %d, %d, '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s' ) ",
+ $r = q("insert into attach ( aid, uid, hash, creator, filename, filetype, folder, filesize, revision, os_storage, is_photo, content, created, edited, os_path, display_path, allow_cid, allow_gid, deny_cid, deny_gid )
+ VALUES ( %d, %d, '%s', '%s', '%s', '%s', '%s', %d, %d, %d, %d, '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s' ) ",
intval($x[0]['aid']),
intval($channel_id),
dbesc($x[0]['hash']),
@@ -751,6 +753,7 @@ function attach_store($channel, $observer_hash, $options = '', $arr = null) {
dbesc($created),
dbesc($created),
dbesc($os_path),
+ dbesc($display_path),
dbesc($x[0]['allow_cid']),
dbesc($x[0]['allow_gid']),
dbesc($x[0]['deny_cid']),
@@ -758,8 +761,8 @@ function attach_store($channel, $observer_hash, $options = '', $arr = null) {
);
}
elseif($options === 'update') {
- $r = q("update attach set filename = '%s', filetype = '%s', folder = '%s', edited = '%s', os_storage = %d, is_photo = %d, os_path = '%s',
- allow_cid = '%s', allow_gid = '%s', deny_cid = '%s', deny_gid = '%s' where id = %d and uid = %d",
+ $r = q("update attach set filename = '%s', filetype = '%s', folder = '%s', edited = '%s', os_storage = %d, is_photo = %d, os_path = '%s',
+ display_path = '%s', allow_cid = '%s', allow_gid = '%s', deny_cid = '%s', deny_gid = '%s' where id = %d and uid = %d",
dbesc((array_key_exists('filename',$arr)) ? $arr['filename'] : $x[0]['filename']),
dbesc((array_key_exists('filetype',$arr)) ? $arr['filetype'] : $x[0]['filetype']),
dbesc(($folder_hash) ? $folder_hash : $x[0]['folder']),
@@ -767,6 +770,7 @@ function attach_store($channel, $observer_hash, $options = '', $arr = null) {
dbesc((array_key_exists('os_storage',$arr)) ? $arr['os_storage'] : $x[0]['os_storage']),
dbesc((array_key_exists('is_photo',$arr)) ? $arr['is_photo'] : $x[0]['is_photo']),
dbesc((array_key_exists('os_path',$arr)) ? $arr['os_path'] : $x[0]['os_path']),
+ dbesc((array_key_exists('display_path',$arr)) ? $arr['display_path'] : $x[0]['display_path']),
dbesc((array_key_exists('allow_cid',$arr)) ? $arr['allow_cid'] : $x[0]['allow_cid']),
dbesc((array_key_exists('allow_gid',$arr)) ? $arr['allow_gid'] : $x[0]['allow_gid']),
dbesc((array_key_exists('deny_cid',$arr)) ? $arr['deny_cid'] : $x[0]['deny_cid']),
@@ -776,8 +780,9 @@ function attach_store($channel, $observer_hash, $options = '', $arr = null) {
);
}
else {
- $r = q("INSERT INTO attach ( aid, uid, hash, creator, filename, filetype, folder, filesize, revision, os_storage, is_photo, content, created, edited, os_path, allow_cid, allow_gid,deny_cid, deny_gid )
- VALUES ( %d, %d, '%s', '%s', '%s', '%s', '%s', %d, %d, %d, %d, '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s' ) ",
+
+ $r = q("INSERT INTO attach ( aid, uid, hash, creator, filename, filetype, folder, filesize, revision, os_storage, is_photo, content, created, edited, os_path, display_path, allow_cid, allow_gid,deny_cid, deny_gid )
+ VALUES ( %d, %d, '%s', '%s', '%s', '%s', '%s', %d, %d, %d, %d, '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s' ) ",
intval($channel['channel_account_id']),
intval($channel_id),
dbesc($hash),
@@ -793,6 +798,7 @@ function attach_store($channel, $observer_hash, $options = '', $arr = null) {
dbesc($created),
dbesc($created),
dbesc($os_path),
+ dbesc($display_path),
dbesc(($arr && array_key_exists('allow_cid',$arr)) ? $arr['allow_cid'] : $str_contact_allow),
dbesc(($arr && array_key_exists('allow_gid',$arr)) ? $arr['allow_gid'] : $str_group_allow),
dbesc(($arr && array_key_exists('deny_cid',$arr)) ? $arr['deny_cid'] : $str_contact_deny),
@@ -1037,8 +1043,12 @@ function attach_mkdir($channel, $observer_hash, $arr = null) {
$created = datetime_convert();
- $r = q("INSERT INTO attach ( aid, uid, hash, creator, filename, filetype, filesize, revision, folder, os_storage, is_dir, content, created, edited, allow_cid, allow_gid, deny_cid, deny_gid )
- VALUES ( %d, %d, '%s', '%s', '%s', '%s', %d, %d, '%s', %d, '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s' ) ",
+ // not yet used
+ $os_path = '';
+ $display_path = '';
+
+ $r = q("INSERT INTO attach ( aid, uid, hash, creator, filename, filetype, filesize, revision, folder, os_storage, is_dir, content, created, edited, os_path, display_path, allow_cid, allow_gid, deny_cid, deny_gid )
+ VALUES ( %d, %d, '%s', '%s', '%s', '%s', %d, %d, '%s', %d, '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s' ) ",
intval($channel['channel_account_id']),
intval($channel_id),
dbesc($arr['hash']),
@@ -1053,6 +1063,8 @@ function attach_mkdir($channel, $observer_hash, $arr = null) {
dbesc($path),
dbesc($created),
dbesc($created),
+ dbesc($os_path),
+ dbesc($display_path),
dbesc(($arr && array_key_exists('allow_cid',$arr)) ? $arr['allow_cid'] : $channel['channel_allow_cid']),
dbesc(($arr && array_key_exists('allow_gid',$arr)) ? $arr['allow_gid'] : $channel['channel_allow_gid']),
dbesc(($arr && array_key_exists('deny_cid',$arr)) ? $arr['deny_cid'] : $channel['channel_deny_cid']),
@@ -2233,4 +2245,4 @@ function attach_folder_rpaths($all_folders,$that_folder) {
}
return (($error) ? false : [ $current_hash , $path ]);
-} \ No newline at end of file
+}
diff --git a/include/bb2diaspora.php b/include/bb2diaspora.php
index 14d5b4eef..514b2b339 100644
--- a/include/bb2diaspora.php
+++ b/include/bb2diaspora.php
@@ -321,7 +321,7 @@ function bb2diaspora_itemwallwall(&$item,$uplink = false) {
}
-function bb2diaspora_itembody($item, $force_update = false, $have_channel = false, $uplink) {
+function bb2diaspora_itembody($item, $force_update = false, $have_channel = false, $uplink = false) {
if(! get_iconfig($item,'diaspora','fields')) {
diff --git a/include/import.php b/include/import.php
index d5f6e5c8a..49cdb2574 100644
--- a/include/import.php
+++ b/include/import.php
@@ -860,7 +860,7 @@ function import_conv($channel,$convs) {
if($channel && $convs) {
foreach($convs as $conv) {
if($conv['deleted']) {
- q("delete from conv where guid = '%s' and uid = %d limit 1",
+ q("delete from conv where guid = '%s' and uid = %d",
dbesc($conv['guid']),
intval($channel['channel_id'])
);
diff --git a/include/message.php b/include/message.php
index 25986092d..f5821490d 100644
--- a/include/message.php
+++ b/include/message.php
@@ -436,7 +436,7 @@ function private_messages_drop($channel_id, $messageitem_id, $drop_conversation
intval($channel_id)
);
if($z) {
- q("delete from conv where guid = '%s' and uid = %d limit 1",
+ q("delete from conv where guid = '%s' and uid = %d",
dbesc($x[0]['conv_guid']),
intval($channel_id)
);
diff --git a/include/oembed.php b/include/oembed.php
index 1780e7046..52fb04058 100755
--- a/include/oembed.php
+++ b/include/oembed.php
@@ -137,10 +137,6 @@ function oembed_fetch_url($embedurl){
if($action !== 'block') {
$txt = Zlib\Cache::get('[' . App::$videowidth . '] ' . $embedurl);
-
- if(strstr($txt,'youtu') && strstr(z_root(),'https:')) {
- $txt = str_replace('http:','https:',$txt);
- }
}
if(is_null($txt)) {
@@ -272,13 +268,7 @@ function oembed_format_object($j){
$th=120; $tw = $th*$tr;
$tpl=get_markup_template('oembed_video.tpl');
- if(strstr($embedurl,'youtu') && strstr(z_root(),'https:')) {
- $embedurl = str_replace('http:','https:',$embedurl);
- $j['thumbnail_url'] = str_replace('http:','https:', $j['thumbnail_url']);
- $jhtml = str_replace('http:','https:', $jhtml);
- $j['html'] = str_replace('http:','https:', $j['html']);
-
- }
+
$ret.=replace_macros($tpl, array(
'$baseurl' => z_root(),
'$embedurl'=>$embedurl,
diff --git a/util/hmessages.po b/util/hmessages.po
index 8a6612be7..de23ec385 100644
--- a/util/hmessages.po
+++ b/util/hmessages.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: 1.15.1\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-10-18 16:26-0700\n"
+"POT-Creation-Date: 2016-10-21 00:04-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"
@@ -203,13 +203,13 @@ msgstr ""
#: ../../extend/addon/addon/cdav/Mod_Cdav.php:744
#: ../../extend/addon/addon/cdav/Mod_Cdav.php:745
#: ../../extend/addon/addon/cdav/Mod_Cdav.php:752
-#: ../../include/conversation.php:1031 ../../include/widgets.php:1682
+#: ../../include/widgets.php:1682 ../../include/conversation.php:1031
msgid "Unknown"
msgstr ""
#: ../../Zotlabs/Storage/Browser.php:224 ../../Zotlabs/Module/Fbrowser.php:85
-#: ../../Zotlabs/Lib/Apps.php:217 ../../include/conversation.php:1679
-#: ../../include/nav.php:96
+#: ../../Zotlabs/Lib/Apps.php:217 ../../include/nav.php:96
+#: ../../include/conversation.php:1683
msgid "Files"
msgstr ""
@@ -233,8 +233,8 @@ msgstr ""
#: ../../Zotlabs/Storage/Browser.php:229 ../../Zotlabs/Storage/Browser.php:323
#: ../../Zotlabs/Module/Cover_photo.php:357
-#: ../../Zotlabs/Module/Profile_photo.php:390
#: ../../Zotlabs/Module/Photos.php:816 ../../Zotlabs/Module/Photos.php:1370
+#: ../../Zotlabs/Module/Profile_photo.php:410
#: ../../Zotlabs/Module/Embedphotos.php:157
#: ../../extend/addon/addon/cdav/include/widgets.php:132
#: ../../extend/addon/addon/cdav/include/widgets.php:168
@@ -268,14 +268,14 @@ msgid "Last Modified"
msgstr ""
#: ../../Zotlabs/Storage/Browser.php:238
+#: ../../Zotlabs/Module/Editblock.php:109
#: ../../Zotlabs/Module/Connections.php:290
#: ../../Zotlabs/Module/Connections.php:310
#: ../../Zotlabs/Module/Admin/Profs.php:154
#: ../../Zotlabs/Module/Editlayout.php:114
#: ../../Zotlabs/Module/Editwebpage.php:145 ../../Zotlabs/Module/Menu.php:112
-#: ../../Zotlabs/Module/Blocks.php:160 ../../Zotlabs/Module/Layouts.php:192
-#: ../../Zotlabs/Module/Editblock.php:109 ../../Zotlabs/Module/Editpost.php:84
-#: ../../Zotlabs/Module/Webpages.php:240
+#: ../../Zotlabs/Module/Editpost.php:84 ../../Zotlabs/Module/Blocks.php:160
+#: ../../Zotlabs/Module/Layouts.php:192 ../../Zotlabs/Module/Webpages.php:240
#: ../../Zotlabs/Module/Settings/Oauth.php:149
#: ../../Zotlabs/Module/Thing.php:260 ../../Zotlabs/Lib/Apps.php:341
#: ../../Zotlabs/Lib/ThreadItem.php:106
@@ -287,16 +287,16 @@ msgstr ""
msgid "Edit"
msgstr ""
-#: ../../Zotlabs/Storage/Browser.php:239 ../../Zotlabs/Module/Group.php:177
+#: ../../Zotlabs/Storage/Browser.php:239
+#: ../../Zotlabs/Module/Editblock.php:134
#: ../../Zotlabs/Module/Connections.php:263
#: ../../Zotlabs/Module/Admin/Profs.php:155
#: ../../Zotlabs/Module/Admin/Accounts.php:173
#: ../../Zotlabs/Module/Admin/Channels.php:149
#: ../../Zotlabs/Module/Editlayout.php:137
-#: ../../Zotlabs/Module/Editwebpage.php:170
-#: ../../Zotlabs/Module/Connedit.php:607 ../../Zotlabs/Module/Blocks.php:162
-#: ../../Zotlabs/Module/Editblock.php:134 ../../Zotlabs/Module/Photos.php:1179
-#: ../../Zotlabs/Module/Webpages.php:242
+#: ../../Zotlabs/Module/Editwebpage.php:170 ../../Zotlabs/Module/Group.php:177
+#: ../../Zotlabs/Module/Photos.php:1179 ../../Zotlabs/Module/Blocks.php:162
+#: ../../Zotlabs/Module/Connedit.php:607 ../../Zotlabs/Module/Webpages.php:242
#: ../../Zotlabs/Module/Settings/Oauth.php:150
#: ../../Zotlabs/Module/Thing.php:261 ../../Zotlabs/Lib/Apps.php:342
#: ../../Zotlabs/Lib/ThreadItem.php:126
@@ -332,11 +332,10 @@ msgstr ""
msgid "Drop files here to immediately upload"
msgstr ""
-#: ../../Zotlabs/Web/WebServer.php:127 ../../Zotlabs/Module/Group.php:72
-#: ../../Zotlabs/Module/Profperm.php:28
-#: ../../Zotlabs/Module/Import_items.php:114 ../../Zotlabs/Module/Like.php:283
-#: ../../Zotlabs/Module/Dreport.php:10 ../../Zotlabs/Module/Dreport.php:68
-#: ../../Zotlabs/Module/Subthread.php:62
+#: ../../Zotlabs/Web/WebServer.php:127 ../../Zotlabs/Module/Profperm.php:28
+#: ../../Zotlabs/Module/Group.php:72 ../../Zotlabs/Module/Import_items.php:114
+#: ../../Zotlabs/Module/Like.php:283 ../../Zotlabs/Module/Dreport.php:10
+#: ../../Zotlabs/Module/Dreport.php:68 ../../Zotlabs/Module/Subthread.php:62
#: ../../extend/addon/addon/frphotos/frphotos.php:81
#: ../../extend/addon/addon/redfiles/redfiles.php:109
#: ../../extend/addon/addon/redphotos/redphotos.php:119
@@ -346,45 +345,46 @@ msgstr ""
#: ../../Zotlabs/Web/WebServer.php:128 ../../Zotlabs/Web/Router.php:67
#: ../../Zotlabs/Module/Achievements.php:34
-#: ../../Zotlabs/Module/Register.php:77 ../../Zotlabs/Module/Group.php:13
-#: ../../Zotlabs/Module/Authtest.php:16 ../../Zotlabs/Module/Bookmarks.php:61
-#: ../../Zotlabs/Module/Profiles.php:197 ../../Zotlabs/Module/Profiles.php:595
+#: ../../Zotlabs/Module/Register.php:77 ../../Zotlabs/Module/Authtest.php:16
+#: ../../Zotlabs/Module/Bookmarks.php:61 ../../Zotlabs/Module/Editblock.php:67
#: ../../Zotlabs/Module/Page.php:35 ../../Zotlabs/Module/Page.php:91
#: ../../Zotlabs/Module/Connections.php:33
#: ../../Zotlabs/Module/Cover_photo.php:277
-#: ../../Zotlabs/Module/Cover_photo.php:290 ../../Zotlabs/Module/Invite.php:17
-#: ../../Zotlabs/Module/Invite.php:94 ../../Zotlabs/Module/Setup.php:218
+#: ../../Zotlabs/Module/Cover_photo.php:290
#: ../../Zotlabs/Module/Editlayout.php:67
#: ../../Zotlabs/Module/Editlayout.php:90
#: ../../Zotlabs/Module/Editwebpage.php:68
#: ../../Zotlabs/Module/Editwebpage.php:89
#: ../../Zotlabs/Module/Editwebpage.php:104
-#: ../../Zotlabs/Module/Editwebpage.php:126
-#: ../../Zotlabs/Module/Events.php:264 ../../Zotlabs/Module/Manage.php:10
+#: ../../Zotlabs/Module/Editwebpage.php:126 ../../Zotlabs/Module/Manage.php:10
#: ../../Zotlabs/Module/Menu.php:78 ../../Zotlabs/Module/Appman.php:75
-#: ../../Zotlabs/Module/Filestorage.php:23
+#: ../../Zotlabs/Module/Api.php:12 ../../Zotlabs/Module/Filestorage.php:23
#: ../../Zotlabs/Module/Filestorage.php:78
#: ../../Zotlabs/Module/Filestorage.php:93
-#: ../../Zotlabs/Module/Filestorage.php:120
-#: ../../Zotlabs/Module/Settings.php:59 ../../Zotlabs/Module/Connedit.php:395
+#: ../../Zotlabs/Module/Filestorage.php:120 ../../Zotlabs/Module/Item.php:216
+#: ../../Zotlabs/Module/Item.php:224 ../../Zotlabs/Module/Item.php:1072
+#: ../../Zotlabs/Module/Profiles.php:197 ../../Zotlabs/Module/Profiles.php:595
+#: ../../Zotlabs/Module/Settings.php:59 ../../Zotlabs/Module/Group.php:13
#: ../../Zotlabs/Module/Block.php:26 ../../Zotlabs/Module/Block.php:76
-#: ../../Zotlabs/Module/Api.php:12 ../../Zotlabs/Module/Locs.php:87
+#: ../../Zotlabs/Module/Channel.php:106 ../../Zotlabs/Module/Channel.php:231
+#: ../../Zotlabs/Module/Channel.php:271 ../../Zotlabs/Module/Locs.php:87
#: ../../Zotlabs/Module/Like.php:181 ../../Zotlabs/Module/Mitem.php:115
#: ../../Zotlabs/Module/Message.php:18 ../../Zotlabs/Module/Mood.php:116
+#: ../../Zotlabs/Module/Editpost.php:17 ../../Zotlabs/Module/Photos.php:73
+#: ../../Zotlabs/Module/Setup.php:218 ../../Zotlabs/Module/Network.php:15
#: ../../Zotlabs/Module/New_channel.php:77
#: ../../Zotlabs/Module/New_channel.php:104 ../../Zotlabs/Module/Mail.php:121
#: ../../Zotlabs/Module/Notifications.php:11 ../../Zotlabs/Module/Poke.php:137
+#: ../../Zotlabs/Module/Invite.php:17 ../../Zotlabs/Module/Invite.php:94
#: ../../Zotlabs/Module/Profile.php:68 ../../Zotlabs/Module/Profile.php:76
#: ../../Zotlabs/Module/Blocks.php:73 ../../Zotlabs/Module/Blocks.php:80
#: ../../Zotlabs/Module/Layouts.php:71 ../../Zotlabs/Module/Layouts.php:78
#: ../../Zotlabs/Module/Layouts.php:89 ../../Zotlabs/Module/Rate.php:113
-#: ../../Zotlabs/Module/Profile_photo.php:265
-#: ../../Zotlabs/Module/Profile_photo.php:278
-#: ../../Zotlabs/Module/Network.php:15 ../../Zotlabs/Module/Common.php:39
-#: ../../Zotlabs/Module/Editblock.php:67 ../../Zotlabs/Module/Editpost.php:17
-#: ../../Zotlabs/Module/Photos.php:73 ../../Zotlabs/Module/Regmod.php:21
-#: ../../Zotlabs/Module/Pdledit.php:29 ../../Zotlabs/Module/Channel.php:106
-#: ../../Zotlabs/Module/Channel.php:231 ../../Zotlabs/Module/Channel.php:271
+#: ../../Zotlabs/Module/Profile_photo.php:273
+#: ../../Zotlabs/Module/Profile_photo.php:286
+#: ../../Zotlabs/Module/Common.php:39 ../../Zotlabs/Module/Events.php:266
+#: ../../Zotlabs/Module/Regmod.php:21 ../../Zotlabs/Module/Pdledit.php:29
+#: ../../Zotlabs/Module/Connedit.php:395
#: ../../Zotlabs/Module/Service_limits.php:11
#: ../../Zotlabs/Module/Webpages.php:116
#: ../../Zotlabs/Module/Sharedwithme.php:11
@@ -394,9 +394,7 @@ msgstr ""
#: ../../Zotlabs/Module/Viewconnections.php:28
#: ../../Zotlabs/Module/Viewconnections.php:33
#: ../../Zotlabs/Module/Viewsrc.php:18 ../../Zotlabs/Module/Chat.php:100
-#: ../../Zotlabs/Module/Chat.php:105 ../../Zotlabs/Module/Item.php:216
-#: ../../Zotlabs/Module/Item.php:224 ../../Zotlabs/Module/Item.php:1072
-#: ../../Zotlabs/Lib/Chatroom.php:137
+#: ../../Zotlabs/Module/Chat.php:105 ../../Zotlabs/Lib/Chatroom.php:137
#: ../../extend/addon/addon/friendica/dfrn_confirm.php:55
#: ../../extend/addon/addon/keepout/keepout.php:36
#: ../../extend/addon/addon/pumpio/pumpio.php:40
@@ -435,12 +433,13 @@ msgid "Welcome %s. Remote authentication successful."
msgstr ""
#: ../../Zotlabs/Module/Achievements.php:15
-#: ../../Zotlabs/Module/Connect.php:17 ../../Zotlabs/Module/Editlayout.php:31
+#: ../../Zotlabs/Module/Connect.php:17 ../../Zotlabs/Module/Editblock.php:31
+#: ../../Zotlabs/Module/Editlayout.php:31
#: ../../Zotlabs/Module/Editwebpage.php:32
#: ../../Zotlabs/Module/Filestorage.php:59 ../../Zotlabs/Module/Hcard.php:12
#: ../../Zotlabs/Module/Profile.php:20 ../../Zotlabs/Module/Blocks.php:33
-#: ../../Zotlabs/Module/Layouts.php:31 ../../Zotlabs/Module/Editblock.php:31
-#: ../../Zotlabs/Module/Webpages.php:33 ../../include/channel.php:862
+#: ../../Zotlabs/Module/Layouts.php:31 ../../Zotlabs/Module/Webpages.php:33
+#: ../../include/channel.php:862
msgid "Requested profile is not available."
msgstr ""
@@ -603,153 +602,121 @@ msgstr ""
msgid "Fetching URL returns error: %1$s"
msgstr ""
-#: ../../Zotlabs/Module/Directory.php:64 ../../Zotlabs/Module/Display.php:17
-#: ../../Zotlabs/Module/Ratings.php:83 ../../Zotlabs/Module/Search.php:17
+#: ../../Zotlabs/Module/Display.php:17 ../../Zotlabs/Module/Search.php:17
+#: ../../Zotlabs/Module/Directory.php:64 ../../Zotlabs/Module/Ratings.php:83
#: ../../Zotlabs/Module/Photos.php:509
#: ../../Zotlabs/Module/Viewconnections.php:23
#: ../../extend/addon/addon/friendica/dfrn_request.php:794
msgid "Public access denied."
msgstr ""
-#: ../../Zotlabs/Module/Directory.php:245
-#, php-format
-msgid "%d rating"
-msgid_plural "%d ratings"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../../Zotlabs/Module/Directory.php:256
-msgid "Gender: "
-msgstr ""
-
-#: ../../Zotlabs/Module/Directory.php:258
-msgid "Status: "
-msgstr ""
-
-#: ../../Zotlabs/Module/Directory.php:260
-msgid "Homepage: "
-msgstr ""
-
-#: ../../Zotlabs/Module/Directory.php:309 ../../include/channel.php:1215
-msgid "Age:"
-msgstr ""
-
-#: ../../Zotlabs/Module/Directory.php:314 ../../include/channel.php:1051
-#: ../../include/bb2diaspora.php:510 ../../include/event.php:52
-#: ../../include/event.php:84
-msgid "Location:"
-msgstr ""
-
-#: ../../Zotlabs/Module/Directory.php:320
-msgid "Description:"
-msgstr ""
-
-#: ../../Zotlabs/Module/Directory.php:325 ../../include/channel.php:1231
-msgid "Hometown:"
-msgstr ""
-
-#: ../../Zotlabs/Module/Directory.php:327 ../../include/channel.php:1239
-msgid "About:"
-msgstr ""
-
-#: ../../Zotlabs/Module/Directory.php:328 ../../Zotlabs/Module/Match.php:68
-#: ../../Zotlabs/Module/Suggest.php:56 ../../include/channel.php:1036
-#: ../../include/conversation.php:955 ../../include/connections.php:78
-#: ../../include/widgets.php:147 ../../include/widgets.php:184
-msgid "Connect"
-msgstr ""
-
-#: ../../Zotlabs/Module/Directory.php:329
-msgid "Public Forum:"
+#: ../../Zotlabs/Module/Display.php:40
+#: ../../Zotlabs/Module/Admin/Plugins.php:254
+#: ../../Zotlabs/Module/Admin/Themes.php:69
+#: ../../Zotlabs/Module/Filestorage.php:32 ../../Zotlabs/Module/Admin.php:60
+#: ../../Zotlabs/Module/Thing.php:89 ../../Zotlabs/Module/Viewsrc.php:24
+#: ../../include/items.php:3411
+msgid "Item not found."
msgstr ""
-#: ../../Zotlabs/Module/Directory.php:332
-msgid "Keywords: "
+#: ../../Zotlabs/Module/Import.php:33
+#, php-format
+msgid "Your service plan only allows %d channels."
msgstr ""
-#: ../../Zotlabs/Module/Directory.php:335
-msgid "Don't suggest"
+#: ../../Zotlabs/Module/Import.php:71 ../../Zotlabs/Module/Import_items.php:42
+msgid "Nothing to import."
msgstr ""
-#: ../../Zotlabs/Module/Directory.php:337
-msgid "Common connections:"
+#: ../../Zotlabs/Module/Import.php:83 ../../Zotlabs/Module/Import.php:98
+#: ../../Zotlabs/Module/Import_items.php:66
+msgid "Unable to download data from old server"
msgstr ""
-#: ../../Zotlabs/Module/Directory.php:386
-msgid "Global Directory"
+#: ../../Zotlabs/Module/Import.php:105
+#: ../../Zotlabs/Module/Import_items.php:72
+msgid "Imported file is empty."
msgstr ""
-#: ../../Zotlabs/Module/Directory.php:386
-msgid "Local Directory"
+#: ../../Zotlabs/Module/Import.php:127
+#: ../../Zotlabs/Module/Import_items.php:88
+#, php-format
+msgid "Warning: Database versions differ by %1$d updates."
msgstr ""
-#: ../../Zotlabs/Module/Directory.php:391
-#: ../../Zotlabs/Module/Directory.php:396
-#: ../../Zotlabs/Module/Connections.php:309
-#: ../../include/contact_widgets.php:23
-msgid "Find"
+#: ../../Zotlabs/Module/Import.php:157 ../../include/import.php:100
+msgid "Cloned channel not found. Import failed."
msgstr ""
-#: ../../Zotlabs/Module/Directory.php:392
-msgid "Finding:"
+#: ../../Zotlabs/Module/Import.php:167
+msgid "No channel. Import failed."
msgstr ""
-#: ../../Zotlabs/Module/Directory.php:395 ../../Zotlabs/Module/Suggest.php:64
-#: ../../include/contact_widgets.php:24
-msgid "Channel Suggestions"
+#: ../../Zotlabs/Module/Import.php:503
+#: ../../include/Import/import_diaspora.php:142
+msgid "Import completed."
msgstr ""
-#: ../../Zotlabs/Module/Directory.php:397
-msgid "next page"
+#: ../../Zotlabs/Module/Import.php:525
+msgid "You must be logged in to use this feature."
msgstr ""
-#: ../../Zotlabs/Module/Directory.php:397
-msgid "previous page"
+#: ../../Zotlabs/Module/Import.php:530
+msgid "Import Channel"
msgstr ""
-#: ../../Zotlabs/Module/Directory.php:398
-msgid "Sort options"
+#: ../../Zotlabs/Module/Import.php:531
+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/Directory.php:399
-msgid "Alphabetic"
+#: ../../Zotlabs/Module/Import.php:532
+#: ../../Zotlabs/Module/Import_items.php:121
+msgid "File to Upload"
msgstr ""
-#: ../../Zotlabs/Module/Directory.php:400
-msgid "Reverse Alphabetic"
+#: ../../Zotlabs/Module/Import.php:533
+msgid "Or provide the old server/hub details"
msgstr ""
-#: ../../Zotlabs/Module/Directory.php:401
-msgid "Newest to Oldest"
+#: ../../Zotlabs/Module/Import.php:534
+msgid "Your old identity address (xyz@example.com)"
msgstr ""
-#: ../../Zotlabs/Module/Directory.php:402
-msgid "Oldest to Newest"
+#: ../../Zotlabs/Module/Import.php:535
+msgid "Your old login email address"
msgstr ""
-#: ../../Zotlabs/Module/Directory.php:419
-msgid "No entries (some entries may be hidden)."
+#: ../../Zotlabs/Module/Import.php:536
+msgid "Your old login password"
msgstr ""
-#: ../../Zotlabs/Module/Group.php:24
-msgid "Privacy group created."
+#: ../../Zotlabs/Module/Import.php:537
+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/Group.php:30
-msgid "Could not create privacy group."
+#: ../../Zotlabs/Module/Import.php:538
+msgid "Make this hub my primary location"
msgstr ""
-#: ../../Zotlabs/Module/Group.php:42 ../../Zotlabs/Module/Group.php:141
-#: ../../include/items.php:3944
-msgid "Privacy group not found."
+#: ../../Zotlabs/Module/Import.php:539
+msgid ""
+"Import existing posts if possible (experimental - limited by available memory"
msgstr ""
-#: ../../Zotlabs/Module/Group.php:58
-msgid "Privacy group updated."
+#: ../../Zotlabs/Module/Import.php:540
+msgid ""
+"This process may take several minutes to complete. Please submit the form "
+"only once and leave this page open until finished."
msgstr ""
-#: ../../Zotlabs/Module/Group.php:85 ../../Zotlabs/Module/Connect.php:98
-#: ../../Zotlabs/Module/Profiles.php:681
+#: ../../Zotlabs/Module/Import.php:543 ../../Zotlabs/Module/Connect.php:98
#: ../../Zotlabs/Module/Admin/Features.php:66
#: ../../Zotlabs/Module/Admin/Logs.php:84
#: ../../Zotlabs/Module/Admin/Plugins.php:429
@@ -759,18 +726,18 @@ msgstr ""
#: ../../Zotlabs/Module/Admin/Account_edit.php:74
#: ../../Zotlabs/Module/Admin/Accounts.php:166
#: ../../Zotlabs/Module/Admin/Channels.php:147
-#: ../../Zotlabs/Module/Admin/Site.php:258 ../../Zotlabs/Module/Invite.php:149
-#: ../../Zotlabs/Module/Setup.php:315 ../../Zotlabs/Module/Setup.php:363
-#: ../../Zotlabs/Module/Events.php:484 ../../Zotlabs/Module/Appman.php:126
+#: ../../Zotlabs/Module/Admin/Site.php:258 ../../Zotlabs/Module/Appman.php:126
#: ../../Zotlabs/Module/Filestorage.php:165
-#: ../../Zotlabs/Module/Import.php:543 ../../Zotlabs/Module/Connedit.php:779
+#: ../../Zotlabs/Module/Profiles.php:681 ../../Zotlabs/Module/Group.php:85
#: ../../Zotlabs/Module/Import_items.php:122 ../../Zotlabs/Module/Locs.php:121
#: ../../Zotlabs/Module/Mitem.php:243 ../../Zotlabs/Module/Mood.php:139
+#: ../../Zotlabs/Module/Photos.php:668 ../../Zotlabs/Module/Photos.php:1058
+#: ../../Zotlabs/Module/Photos.php:1098 ../../Zotlabs/Module/Photos.php:1216
+#: ../../Zotlabs/Module/Setup.php:315 ../../Zotlabs/Module/Setup.php:363
#: ../../Zotlabs/Module/Mail.php:370 ../../Zotlabs/Module/Poke.php:186
-#: ../../Zotlabs/Module/Pconfig.php:107 ../../Zotlabs/Module/Rate.php:166
-#: ../../Zotlabs/Module/Cal.php:338 ../../Zotlabs/Module/Photos.php:668
-#: ../../Zotlabs/Module/Photos.php:1058 ../../Zotlabs/Module/Photos.php:1098
-#: ../../Zotlabs/Module/Photos.php:1216 ../../Zotlabs/Module/Pdledit.php:74
+#: ../../Zotlabs/Module/Invite.php:149 ../../Zotlabs/Module/Pconfig.php:107
+#: ../../Zotlabs/Module/Rate.php:166 ../../Zotlabs/Module/Events.php:486
+#: ../../Zotlabs/Module/Pdledit.php:74 ../../Zotlabs/Module/Connedit.php:779
#: ../../Zotlabs/Module/Sources.php:114 ../../Zotlabs/Module/Sources.php:149
#: ../../Zotlabs/Module/Settings/Display.php:194
#: ../../Zotlabs/Module/Settings/Features.php:47
@@ -779,8 +746,9 @@ msgstr ""
#: ../../Zotlabs/Module/Settings/Account.php:118
#: ../../Zotlabs/Module/Settings/Channel.php:452
#: ../../Zotlabs/Module/Thing.php:320 ../../Zotlabs/Module/Thing.php:370
-#: ../../Zotlabs/Module/Chat.php:196 ../../Zotlabs/Module/Chat.php:241
-#: ../../Zotlabs/Module/Xchan.php:15 ../../Zotlabs/Lib/ThreadItem.php:725
+#: ../../Zotlabs/Module/Cal.php:338 ../../Zotlabs/Module/Chat.php:196
+#: ../../Zotlabs/Module/Chat.php:241 ../../Zotlabs/Module/Xchan.php:15
+#: ../../Zotlabs/Lib/ThreadItem.php:725
#: ../../extend/addon/addon/chords/Mod_Chords.php:60
#: ../../extend/addon/addon/diaspora/diaspora.php:693
#: ../../extend/addon/addon/dwpost/dwpost.php:89
@@ -831,42 +799,6 @@ msgstr ""
msgid "Submit"
msgstr ""
-#: ../../Zotlabs/Module/Group.php:90
-msgid "Create a group of channels."
-msgstr ""
-
-#: ../../Zotlabs/Module/Group.php:91 ../../Zotlabs/Module/Group.php:184
-msgid "Privacy group name: "
-msgstr ""
-
-#: ../../Zotlabs/Module/Group.php:93 ../../Zotlabs/Module/Group.php:187
-msgid "Members are visible to other channels"
-msgstr ""
-
-#: ../../Zotlabs/Module/Group.php:111
-msgid "Privacy group removed."
-msgstr ""
-
-#: ../../Zotlabs/Module/Group.php:113
-msgid "Unable to remove privacy group."
-msgstr ""
-
-#: ../../Zotlabs/Module/Group.php:183
-msgid "Privacy group editor"
-msgstr ""
-
-#: ../../Zotlabs/Module/Group.php:197
-msgid "Members"
-msgstr ""
-
-#: ../../Zotlabs/Module/Group.php:199
-msgid "All Connected Channels"
-msgstr ""
-
-#: ../../Zotlabs/Module/Group.php:231
-msgid "Click on a channel to add or remove."
-msgstr ""
-
#: ../../Zotlabs/Module/Connect.php:61 ../../Zotlabs/Module/Connect.php:109
msgid "Continue"
msgstr ""
@@ -910,29 +842,21 @@ msgstr ""
msgid "Restricted or Premium Channel"
msgstr ""
-#: ../../Zotlabs/Module/Profperm.php:34 ../../Zotlabs/Module/Profperm.php:63
-msgid "Invalid profile identifier."
-msgstr ""
-
-#: ../../Zotlabs/Module/Profperm.php:115
-msgid "Profile Visibility Editor"
-msgstr ""
-
-#: ../../Zotlabs/Module/Profperm.php:117 ../../include/channel.php:1282
-msgid "Profile"
-msgstr ""
-
-#: ../../Zotlabs/Module/Profperm.php:119
-msgid "Click on a contact to add or remove."
+#: ../../Zotlabs/Module/Search.php:44 ../../Zotlabs/Module/Connections.php:306
+#: ../../Zotlabs/Lib/Apps.php:230 ../../include/acl_selectors.php:203
+#: ../../include/nav.php:170 ../../include/text.php:993
+#: ../../include/text.php:1005 ../../include/widgets.php:315
+msgid "Search"
msgstr ""
-#: ../../Zotlabs/Module/Profperm.php:128
-msgid "Visible To"
+#: ../../Zotlabs/Module/Search.php:216
+#, php-format
+msgid "Items tagged with: %s"
msgstr ""
-#: ../../Zotlabs/Module/Profperm.php:144
-#: ../../Zotlabs/Module/Connections.php:145
-msgid "All Connections"
+#: ../../Zotlabs/Module/Search.php:218
+#, php-format
+msgid "Search results for: %s"
msgstr ""
#: ../../Zotlabs/Module/Bookmarks.php:53
@@ -947,447 +871,56 @@ msgstr ""
msgid "My Connections Bookmarks"
msgstr ""
-#: ../../Zotlabs/Module/Display.php:40
-#: ../../Zotlabs/Module/Admin/Plugins.php:254
-#: ../../Zotlabs/Module/Admin/Themes.php:69
-#: ../../Zotlabs/Module/Filestorage.php:32 ../../Zotlabs/Module/Thing.php:89
-#: ../../Zotlabs/Module/Admin.php:60 ../../Zotlabs/Module/Viewsrc.php:24
-#: ../../include/items.php:3411
-msgid "Item not found."
-msgstr ""
-
-#: ../../Zotlabs/Module/Profiles.php:24 ../../Zotlabs/Module/Profiles.php:183
-#: ../../Zotlabs/Module/Profiles.php:240 ../../Zotlabs/Module/Profiles.php:619
-#: ../../extend/addon/addon/friendica/dfrn_confirm.php:62
-msgid "Profile not found."
-msgstr ""
-
-#: ../../Zotlabs/Module/Profiles.php:44
-msgid "Profile deleted."
-msgstr ""
-
-#: ../../Zotlabs/Module/Profiles.php:68 ../../Zotlabs/Module/Profiles.php:104
-msgid "Profile-"
-msgstr ""
-
-#: ../../Zotlabs/Module/Profiles.php:89 ../../Zotlabs/Module/Profiles.php:126
-msgid "New profile created."
-msgstr ""
-
-#: ../../Zotlabs/Module/Profiles.php:110
-msgid "Profile unavailable to clone."
-msgstr ""
-
-#: ../../Zotlabs/Module/Profiles.php:145
-msgid "Profile unavailable to export."
-msgstr ""
-
-#: ../../Zotlabs/Module/Profiles.php:250
-msgid "Profile Name is required."
-msgstr ""
-
-#: ../../Zotlabs/Module/Profiles.php:421
-msgid "Marital Status"
-msgstr ""
-
-#: ../../Zotlabs/Module/Profiles.php:425
-msgid "Romantic Partner"
-msgstr ""
-
-#: ../../Zotlabs/Module/Profiles.php:429 ../../Zotlabs/Module/Profiles.php:730
-msgid "Likes"
-msgstr ""
-
-#: ../../Zotlabs/Module/Profiles.php:433 ../../Zotlabs/Module/Profiles.php:731
-msgid "Dislikes"
-msgstr ""
-
-#: ../../Zotlabs/Module/Profiles.php:437 ../../Zotlabs/Module/Profiles.php:738
-msgid "Work/Employment"
-msgstr ""
-
-#: ../../Zotlabs/Module/Profiles.php:440
-msgid "Religion"
-msgstr ""
-
-#: ../../Zotlabs/Module/Profiles.php:444
-msgid "Political Views"
-msgstr ""
-
-#: ../../Zotlabs/Module/Profiles.php:448
-#: ../../extend/addon/addon/openid/MysqlProvider.php:74
-msgid "Gender"
-msgstr ""
-
-#: ../../Zotlabs/Module/Profiles.php:452
-msgid "Sexual Preference"
-msgstr ""
-
-#: ../../Zotlabs/Module/Profiles.php:456
-msgid "Homepage"
-msgstr ""
-
-#: ../../Zotlabs/Module/Profiles.php:460
-msgid "Interests"
-msgstr ""
-
-#: ../../Zotlabs/Module/Profiles.php:464
-#: ../../Zotlabs/Module/Admin/Channels.php:160
-#: ../../Zotlabs/Module/Locs.php:118
-#: ../../extend/addon/addon/cdav/Mod_Cdav.php:1139
-msgid "Address"
-msgstr ""
-
-#: ../../Zotlabs/Module/Profiles.php:471 ../../Zotlabs/Module/Profiles.php:692
-#: ../../Zotlabs/Module/Events.php:467 ../../Zotlabs/Module/Locs.php:117
-#: ../../Zotlabs/Module/Pubsites.php:51
-#: ../../extend/addon/addon/cdav/Mod_Cdav.php:835
-#: ../../include/js_strings.php:25
-msgid "Location"
-msgstr ""
-
-#: ../../Zotlabs/Module/Profiles.php:554
-msgid "Profile updated."
-msgstr ""
-
-#: ../../Zotlabs/Module/Profiles.php:638
-msgid "Hide your connections list from viewers of this profile"
-msgstr ""
-
-#: ../../Zotlabs/Module/Profiles.php:641
-#: ../../Zotlabs/Module/Admin/Site.php:216 ../../Zotlabs/Module/Events.php:462
-#: ../../Zotlabs/Module/Events.php:463 ../../Zotlabs/Module/Events.php:472
-#: ../../Zotlabs/Module/Menu.php:100 ../../Zotlabs/Module/Menu.php:157
-#: ../../Zotlabs/Module/Filestorage.php:160
-#: ../../Zotlabs/Module/Filestorage.php:168
-#: ../../Zotlabs/Module/Connedit.php:408 ../../Zotlabs/Module/Connedit.php:686
-#: ../../Zotlabs/Module/Api.php:85 ../../Zotlabs/Module/Mitem.php:162
-#: ../../Zotlabs/Module/Mitem.php:163 ../../Zotlabs/Module/Mitem.php:240
-#: ../../Zotlabs/Module/Mitem.php:241 ../../Zotlabs/Module/Photos.php:653
-#: ../../Zotlabs/Module/Removeme.php:63
-#: ../../Zotlabs/Module/Settings/Display.php:101
-#: ../../Zotlabs/Module/Settings/Channel.php:289
-#: ../../extend/addon/addon/dwpost/dwpost.php:73
-#: ../../extend/addon/addon/dwpost/dwpost.php:85
-#: ../../extend/addon/addon/flattrwidget/flattrwidget.php:120
-#: ../../extend/addon/addon/friendica/dfrn_request.php:865
-#: ../../extend/addon/addon/ijpost/ijpost.php:73
-#: ../../extend/addon/addon/ijpost/ijpost.php:85
-#: ../../extend/addon/addon/jappixmini/jappixmini.php:309
-#: ../../extend/addon/addon/jappixmini/jappixmini.php:313
-#: ../../extend/addon/addon/jappixmini/jappixmini.php:343
-#: ../../extend/addon/addon/jappixmini/jappixmini.php:351
-#: ../../extend/addon/addon/jappixmini/jappixmini.php:355
-#: ../../extend/addon/addon/jappixmini/jappixmini.php:359
-#: ../../extend/addon/addon/libertree/libertree.php:69
-#: ../../extend/addon/addon/libertree/libertree.php:81
-#: ../../extend/addon/addon/ljpost/ljpost.php:70
-#: ../../extend/addon/addon/ljpost/ljpost.php:82
-#: ../../extend/addon/addon/nofed/nofed.php:72
-#: ../../extend/addon/addon/nofed/nofed.php:76
-#: ../../extend/addon/addon/nsabait/nsabait.php:157
-#: ../../extend/addon/addon/nsfw/nsfw.php:84
-#: ../../extend/addon/addon/planets/planets.php:153
-#: ../../extend/addon/addon/pumpio/pumpio.php:219
-#: ../../extend/addon/addon/pumpio/pumpio.php:223
-#: ../../extend/addon/addon/pumpio/pumpio.php:227
-#: ../../extend/addon/addon/pumpio/pumpio.php:231
-#: ../../extend/addon/addon/rainbowtag/rainbowtag.php:81
-#: ../../extend/addon/addon/redred/redred.php:95
-#: ../../extend/addon/addon/redred/redred.php:99
-#: ../../extend/addon/addon/rtof/rtof.php:81
-#: ../../extend/addon/addon/rtof/rtof.php:85
-#: ../../extend/addon/addon/smileybutton/smileybutton.php:276
-#: ../../extend/addon/addon/smileybutton/smileybutton.php:280
-#: ../../extend/addon/addon/statusnet/statusnet.php:389
-#: ../../extend/addon/addon/statusnet/statusnet.php:411
-#: ../../extend/addon/addon/statusnet/statusnet.php:415
-#: ../../extend/addon/addon/statusnet/statusnet.php:424
-#: ../../extend/addon/addon/twitter/twitter.php:242
-#: ../../extend/addon/addon/twitter/twitter.php:246
-#: ../../extend/addon/addon/twitter/twitter.php:255
-#: ../../extend/addon/addon/visage/visage.php:166
-#: ../../extend/addon/addon/wppost/wppost.php:82
-#: ../../extend/addon/addon/wppost/wppost.php:105
-#: ../../extend/addon/addon/wppost/wppost.php:109
-#: ../../extend/addon/addon/xmpp/xmpp.php:53
-#: ../../extend/addon/addon/cdav/cdav.php:227 ../../include/dir_fns.php:143
-#: ../../include/dir_fns.php:144 ../../include/dir_fns.php:145
-#: ../../view/theme/redbasic/php/config.php:111
-#: ../../view/theme/redbasic/php/config.php:136 ../../boot.php:1713
-msgid "No"
-msgstr ""
-
-#: ../../Zotlabs/Module/Profiles.php:641
-#: ../../Zotlabs/Module/Admin/Site.php:218 ../../Zotlabs/Module/Events.php:462
-#: ../../Zotlabs/Module/Events.php:463 ../../Zotlabs/Module/Events.php:472
-#: ../../Zotlabs/Module/Menu.php:100 ../../Zotlabs/Module/Menu.php:157
-#: ../../Zotlabs/Module/Filestorage.php:160
-#: ../../Zotlabs/Module/Filestorage.php:168
-#: ../../Zotlabs/Module/Connedit.php:408 ../../Zotlabs/Module/Api.php:84
-#: ../../Zotlabs/Module/Mitem.php:162 ../../Zotlabs/Module/Mitem.php:163
-#: ../../Zotlabs/Module/Mitem.php:240 ../../Zotlabs/Module/Mitem.php:241
-#: ../../Zotlabs/Module/Photos.php:653 ../../Zotlabs/Module/Removeme.php:63
-#: ../../Zotlabs/Module/Settings/Display.php:101
-#: ../../Zotlabs/Module/Settings/Channel.php:289
-#: ../../extend/addon/addon/dwpost/dwpost.php:73
-#: ../../extend/addon/addon/dwpost/dwpost.php:85
-#: ../../extend/addon/addon/flattrwidget/flattrwidget.php:120
-#: ../../extend/addon/addon/friendica/dfrn_request.php:865
-#: ../../extend/addon/addon/ijpost/ijpost.php:73
-#: ../../extend/addon/addon/ijpost/ijpost.php:85
-#: ../../extend/addon/addon/jappixmini/jappixmini.php:309
-#: ../../extend/addon/addon/jappixmini/jappixmini.php:313
-#: ../../extend/addon/addon/jappixmini/jappixmini.php:343
-#: ../../extend/addon/addon/jappixmini/jappixmini.php:351
-#: ../../extend/addon/addon/jappixmini/jappixmini.php:355
-#: ../../extend/addon/addon/jappixmini/jappixmini.php:359
-#: ../../extend/addon/addon/libertree/libertree.php:69
-#: ../../extend/addon/addon/libertree/libertree.php:81
-#: ../../extend/addon/addon/ljpost/ljpost.php:70
-#: ../../extend/addon/addon/ljpost/ljpost.php:82
-#: ../../extend/addon/addon/nofed/nofed.php:72
-#: ../../extend/addon/addon/nofed/nofed.php:76
-#: ../../extend/addon/addon/nsabait/nsabait.php:157
-#: ../../extend/addon/addon/nsfw/nsfw.php:84
-#: ../../extend/addon/addon/planets/planets.php:153
-#: ../../extend/addon/addon/pumpio/pumpio.php:219
-#: ../../extend/addon/addon/pumpio/pumpio.php:223
-#: ../../extend/addon/addon/pumpio/pumpio.php:227
-#: ../../extend/addon/addon/pumpio/pumpio.php:231
-#: ../../extend/addon/addon/rainbowtag/rainbowtag.php:81
-#: ../../extend/addon/addon/redred/redred.php:95
-#: ../../extend/addon/addon/redred/redred.php:99
-#: ../../extend/addon/addon/rtof/rtof.php:81
-#: ../../extend/addon/addon/rtof/rtof.php:85
-#: ../../extend/addon/addon/smileybutton/smileybutton.php:276
-#: ../../extend/addon/addon/smileybutton/smileybutton.php:280
-#: ../../extend/addon/addon/statusnet/statusnet.php:389
-#: ../../extend/addon/addon/statusnet/statusnet.php:411
-#: ../../extend/addon/addon/statusnet/statusnet.php:415
-#: ../../extend/addon/addon/statusnet/statusnet.php:424
-#: ../../extend/addon/addon/twitter/twitter.php:242
-#: ../../extend/addon/addon/twitter/twitter.php:246
-#: ../../extend/addon/addon/twitter/twitter.php:255
-#: ../../extend/addon/addon/visage/visage.php:166
-#: ../../extend/addon/addon/wppost/wppost.php:82
-#: ../../extend/addon/addon/wppost/wppost.php:105
-#: ../../extend/addon/addon/wppost/wppost.php:109
-#: ../../extend/addon/addon/xmpp/xmpp.php:53
-#: ../../extend/addon/addon/cdav/cdav.php:227 ../../include/dir_fns.php:143
-#: ../../include/dir_fns.php:144 ../../include/dir_fns.php:145
-#: ../../view/theme/redbasic/php/config.php:111
-#: ../../view/theme/redbasic/php/config.php:136 ../../boot.php:1713
-msgid "Yes"
-msgstr ""
-
-#: ../../Zotlabs/Module/Profiles.php:680
-msgid "Edit Profile Details"
-msgstr ""
-
-#: ../../Zotlabs/Module/Profiles.php:682
-msgid "View this profile"
-msgstr ""
-
-#: ../../Zotlabs/Module/Profiles.php:683 ../../Zotlabs/Module/Profiles.php:765
-#: ../../include/channel.php:983
-msgid "Edit visibility"
-msgstr ""
-
-#: ../../Zotlabs/Module/Profiles.php:684
-msgid "Profile Tools"
-msgstr ""
-
-#: ../../Zotlabs/Module/Profiles.php:685
-msgid "Change cover photo"
-msgstr ""
-
-#: ../../Zotlabs/Module/Profiles.php:686 ../../include/channel.php:954
-msgid "Change profile photo"
-msgstr ""
-
-#: ../../Zotlabs/Module/Profiles.php:687
-msgid "Create a new profile using these settings"
-msgstr ""
-
-#: ../../Zotlabs/Module/Profiles.php:688
-msgid "Clone this profile"
-msgstr ""
-
-#: ../../Zotlabs/Module/Profiles.php:689
-msgid "Delete this profile"
-msgstr ""
-
-#: ../../Zotlabs/Module/Profiles.php:690
-msgid "Add profile things"
-msgstr ""
-
-#: ../../Zotlabs/Module/Profiles.php:691 ../../include/conversation.php:1564
-#: ../../include/widgets.php:105
-msgid "Personal"
-msgstr ""
-
-#: ../../Zotlabs/Module/Profiles.php:693
-msgid "Relation"
-msgstr ""
-
-#: ../../Zotlabs/Module/Profiles.php:694 ../../include/datetime.php:55
-msgid "Miscellaneous"
-msgstr ""
-
-#: ../../Zotlabs/Module/Profiles.php:696
-msgid "Import profile from file"
-msgstr ""
-
-#: ../../Zotlabs/Module/Profiles.php:697
-msgid "Export profile to file"
-msgstr ""
-
-#: ../../Zotlabs/Module/Profiles.php:698
-msgid "Your gender"
-msgstr ""
-
-#: ../../Zotlabs/Module/Profiles.php:699
-msgid "Marital status"
-msgstr ""
-
-#: ../../Zotlabs/Module/Profiles.php:700
-msgid "Sexual preference"
-msgstr ""
-
-#: ../../Zotlabs/Module/Profiles.php:703
-msgid "Profile name"
-msgstr ""
-
-#: ../../Zotlabs/Module/Profiles.php:703 ../../Zotlabs/Module/Profiles.php:707
-#: ../../Zotlabs/Module/Events.php:452 ../../Zotlabs/Module/Events.php:457
-#: ../../Zotlabs/Module/Appman.php:115 ../../Zotlabs/Module/Appman.php:116
-#: ../../include/datetime.php:259
-msgid "Required"
-msgstr ""
-
-#: ../../Zotlabs/Module/Profiles.php:705
-msgid "This is your default profile."
-msgstr ""
-
-#: ../../Zotlabs/Module/Profiles.php:707
-msgid "Your full name"
-msgstr ""
-
-#: ../../Zotlabs/Module/Profiles.php:708
-msgid "Title/Description"
-msgstr ""
-
-#: ../../Zotlabs/Module/Profiles.php:711
-msgid "Street address"
-msgstr ""
-
-#: ../../Zotlabs/Module/Profiles.php:712
-msgid "Locality/City"
-msgstr ""
-
-#: ../../Zotlabs/Module/Profiles.php:713
-msgid "Region/State"
-msgstr ""
-
-#: ../../Zotlabs/Module/Profiles.php:714
-msgid "Postal/Zip code"
-msgstr ""
-
-#: ../../Zotlabs/Module/Profiles.php:715
-#: ../../extend/addon/addon/cdav/Mod_Cdav.php:1157
-msgid "Country"
-msgstr ""
-
-#: ../../Zotlabs/Module/Profiles.php:720
-msgid "Who (if applicable)"
-msgstr ""
-
-#: ../../Zotlabs/Module/Profiles.php:720
-msgid "Examples: cathy123, Cathy Williams, cathy@example.com"
-msgstr ""
-
-#: ../../Zotlabs/Module/Profiles.php:721
-msgid "Since (date)"
-msgstr ""
-
-#: ../../Zotlabs/Module/Profiles.php:724
-msgid "Tell us about yourself"
-msgstr ""
-
-#: ../../Zotlabs/Module/Profiles.php:725
-#: ../../extend/addon/addon/openid/MysqlProvider.php:68
-msgid "Homepage URL"
-msgstr ""
-
-#: ../../Zotlabs/Module/Profiles.php:726
-msgid "Hometown"
-msgstr ""
-
-#: ../../Zotlabs/Module/Profiles.php:727
-msgid "Political views"
-msgstr ""
-
-#: ../../Zotlabs/Module/Profiles.php:728
-msgid "Religious views"
-msgstr ""
-
-#: ../../Zotlabs/Module/Profiles.php:729
-msgid "Keywords used in directory listings"
-msgstr ""
-
-#: ../../Zotlabs/Module/Profiles.php:729
-msgid "Example: fishing photography software"
-msgstr ""
-
-#: ../../Zotlabs/Module/Profiles.php:732
-msgid "Musical interests"
-msgstr ""
-
-#: ../../Zotlabs/Module/Profiles.php:733
-msgid "Books, literature"
+#: ../../Zotlabs/Module/Editblock.php:79 ../../Zotlabs/Module/Editblock.php:95
+#: ../../Zotlabs/Module/Editlayout.php:79
+#: ../../Zotlabs/Module/Editwebpage.php:80
+#: ../../Zotlabs/Module/Editpost.php:24
+msgid "Item not found"
msgstr ""
-#: ../../Zotlabs/Module/Profiles.php:734
-msgid "Television"
+#: ../../Zotlabs/Module/Editblock.php:108 ../../Zotlabs/Module/Blocks.php:97
+#: ../../Zotlabs/Module/Blocks.php:155
+msgid "Block Name"
msgstr ""
-#: ../../Zotlabs/Module/Profiles.php:735
-msgid "Film/Dance/Culture/Entertainment"
+#: ../../Zotlabs/Module/Editblock.php:111
+#: ../../Zotlabs/Module/Editwebpage.php:146 ../../Zotlabs/Module/Mail.php:244
+#: ../../Zotlabs/Module/Mail.php:369 ../../Zotlabs/Module/Chat.php:207
+#: ../../include/conversation.php:1149
+msgid "Insert web link"
msgstr ""
-#: ../../Zotlabs/Module/Profiles.php:736
-msgid "Hobbies/Interests"
+#: ../../Zotlabs/Module/Editblock.php:124 ../../include/conversation.php:1260
+msgid "Title (optional)"
msgstr ""
-#: ../../Zotlabs/Module/Profiles.php:737
-msgid "Love/Romance"
+#: ../../Zotlabs/Module/Editblock.php:133
+msgid "Edit Block"
msgstr ""
-#: ../../Zotlabs/Module/Profiles.php:739
-msgid "School/Education"
+#: ../../Zotlabs/Module/Profperm.php:34 ../../Zotlabs/Module/Profperm.php:63
+msgid "Invalid profile identifier."
msgstr ""
-#: ../../Zotlabs/Module/Profiles.php:740
-msgid "Contact information and social networks"
+#: ../../Zotlabs/Module/Profperm.php:115
+msgid "Profile Visibility Editor"
msgstr ""
-#: ../../Zotlabs/Module/Profiles.php:741
-msgid "My other channels"
+#: ../../Zotlabs/Module/Profperm.php:117 ../../include/channel.php:1282
+msgid "Profile"
msgstr ""
-#: ../../Zotlabs/Module/Profiles.php:761 ../../include/channel.php:979
-msgid "Profile Image"
+#: ../../Zotlabs/Module/Profperm.php:119
+msgid "Click on a contact to add or remove."
msgstr ""
-#: ../../Zotlabs/Module/Profiles.php:771 ../../include/channel.php:961
-#: ../../include/nav.php:91
-msgid "Edit Profiles"
+#: ../../Zotlabs/Module/Profperm.php:128
+msgid "Visible To"
msgstr ""
-#: ../../Zotlabs/Module/Profiles.php:772 ../../Zotlabs/Module/Manage.php:143
-#: ../../Zotlabs/Module/Chat.php:255
-msgid "Create New"
+#: ../../Zotlabs/Module/Profperm.php:144
+#: ../../Zotlabs/Module/Connections.php:145
+msgid "All Connections"
msgstr ""
#: ../../Zotlabs/Module/Page.php:40 ../../Zotlabs/Module/Block.php:31
@@ -1424,6 +957,14 @@ msgstr ""
msgid "Save"
msgstr ""
+#: ../../Zotlabs/Module/Dirsearch.php:25 ../../Zotlabs/Module/Regdir.php:49
+msgid "This site is not a directory server"
+msgstr ""
+
+#: ../../Zotlabs/Module/Dirsearch.php:33
+msgid "This directory server requires an access token"
+msgstr ""
+
#: ../../Zotlabs/Module/Connections.php:56
#: ../../Zotlabs/Module/Connections.php:161
#: ../../Zotlabs/Module/Connections.php:242
@@ -1450,7 +991,7 @@ msgstr ""
#: ../../Zotlabs/Module/Connections.php:76
#: ../../Zotlabs/Module/Connections.php:86 ../../Zotlabs/Module/Menu.php:116
-#: ../../include/conversation.php:1573
+#: ../../include/conversation.php:1577
msgid "New"
msgstr ""
@@ -1548,13 +1089,6 @@ msgstr ""
msgid "Connections"
msgstr ""
-#: ../../Zotlabs/Module/Connections.php:306 ../../Zotlabs/Module/Search.php:44
-#: ../../Zotlabs/Lib/Apps.php:230 ../../include/acl_selectors.php:203
-#: ../../include/nav.php:170 ../../include/text.php:993
-#: ../../include/text.php:1005 ../../include/widgets.php:315
-msgid "Search"
-msgstr ""
-
#: ../../Zotlabs/Module/Connections.php:307
msgid "Search your connections"
msgstr ""
@@ -1563,6 +1097,12 @@ msgstr ""
msgid "Connections search"
msgstr ""
+#: ../../Zotlabs/Module/Connections.php:309
+#: ../../Zotlabs/Module/Directory.php:391
+#: ../../Zotlabs/Module/Directory.php:396 ../../include/contact_widgets.php:23
+msgid "Find"
+msgstr ""
+
#: ../../Zotlabs/Module/Cover_photo.php:58
#: ../../Zotlabs/Module/Profile_photo.php:61
msgid "Image uploaded but image cropping failed."
@@ -1584,12 +1124,12 @@ msgid "Unable to process image"
msgstr ""
#: ../../Zotlabs/Module/Cover_photo.php:192
-#: ../../Zotlabs/Module/Profile_photo.php:223
+#: ../../Zotlabs/Module/Profile_photo.php:231
msgid "Image upload failed."
msgstr ""
#: ../../Zotlabs/Module/Cover_photo.php:210
-#: ../../Zotlabs/Module/Profile_photo.php:242
+#: ../../Zotlabs/Module/Profile_photo.php:250
msgid "Unable to process image."
msgstr ""
@@ -1622,18 +1162,18 @@ msgstr ""
#: ../../Zotlabs/Module/Cover_photo.php:303
#: ../../Zotlabs/Module/Cover_photo.php:318
-#: ../../Zotlabs/Module/Profile_photo.php:300
-#: ../../Zotlabs/Module/Profile_photo.php:341
+#: ../../Zotlabs/Module/Profile_photo.php:311
+#: ../../Zotlabs/Module/Profile_photo.php:352
msgid "Photo not available."
msgstr ""
#: ../../Zotlabs/Module/Cover_photo.php:354
-#: ../../Zotlabs/Module/Profile_photo.php:387
+#: ../../Zotlabs/Module/Profile_photo.php:407
msgid "Upload File:"
msgstr ""
#: ../../Zotlabs/Module/Cover_photo.php:355
-#: ../../Zotlabs/Module/Profile_photo.php:388
+#: ../../Zotlabs/Module/Profile_photo.php:408
msgid "Select a profile:"
msgstr ""
@@ -1642,33 +1182,33 @@ msgid "Upload Cover Photo"
msgstr ""
#: ../../Zotlabs/Module/Cover_photo.php:361
-#: ../../Zotlabs/Module/Profile_photo.php:396
+#: ../../Zotlabs/Module/Profile_photo.php:416
#: ../../Zotlabs/Module/Settings/Channel.php:399
msgid "or"
msgstr ""
#: ../../Zotlabs/Module/Cover_photo.php:361
-#: ../../Zotlabs/Module/Profile_photo.php:396
+#: ../../Zotlabs/Module/Profile_photo.php:416
msgid "skip this step"
msgstr ""
#: ../../Zotlabs/Module/Cover_photo.php:361
-#: ../../Zotlabs/Module/Profile_photo.php:396
+#: ../../Zotlabs/Module/Profile_photo.php:416
msgid "select a photo from your photo albums"
msgstr ""
#: ../../Zotlabs/Module/Cover_photo.php:377
-#: ../../Zotlabs/Module/Profile_photo.php:415
+#: ../../Zotlabs/Module/Profile_photo.php:435
msgid "Crop Image"
msgstr ""
#: ../../Zotlabs/Module/Cover_photo.php:378
-#: ../../Zotlabs/Module/Profile_photo.php:416
+#: ../../Zotlabs/Module/Profile_photo.php:436
msgid "Please adjust the image cropping for optimum viewing."
msgstr ""
#: ../../Zotlabs/Module/Cover_photo.php:380
-#: ../../Zotlabs/Module/Profile_photo.php:418
+#: ../../Zotlabs/Module/Profile_photo.php:438
msgid "Done Editing"
msgstr ""
@@ -2340,7 +1880,7 @@ msgid "Disallow Code"
msgstr ""
#: ../../Zotlabs/Module/Admin/Channels.php:154
-#: ../../include/conversation.php:1651
+#: ../../include/conversation.php:1655
msgid "Channel"
msgstr ""
@@ -2348,6 +1888,12 @@ msgstr ""
msgid "UID"
msgstr ""
+#: ../../Zotlabs/Module/Admin/Channels.php:160
+#: ../../Zotlabs/Module/Profiles.php:464 ../../Zotlabs/Module/Locs.php:118
+#: ../../extend/addon/addon/cdav/Mod_Cdav.php:1139
+msgid "Address"
+msgstr ""
+
#: ../../Zotlabs/Module/Admin/Channels.php:162
msgid ""
"Selected channels will be deleted!\\n\\nEverything that was posted in these "
@@ -2421,10 +1967,136 @@ msgstr ""
msgid "unsupported"
msgstr ""
+#: ../../Zotlabs/Module/Admin/Site.php:216 ../../Zotlabs/Module/Menu.php:100
+#: ../../Zotlabs/Module/Menu.php:157 ../../Zotlabs/Module/Api.php:85
+#: ../../Zotlabs/Module/Filestorage.php:160
+#: ../../Zotlabs/Module/Filestorage.php:168
+#: ../../Zotlabs/Module/Profiles.php:641 ../../Zotlabs/Module/Mitem.php:162
+#: ../../Zotlabs/Module/Mitem.php:163 ../../Zotlabs/Module/Mitem.php:240
+#: ../../Zotlabs/Module/Mitem.php:241 ../../Zotlabs/Module/Photos.php:653
+#: ../../Zotlabs/Module/Events.php:464 ../../Zotlabs/Module/Events.php:465
+#: ../../Zotlabs/Module/Events.php:474 ../../Zotlabs/Module/Connedit.php:408
+#: ../../Zotlabs/Module/Connedit.php:686 ../../Zotlabs/Module/Removeme.php:63
+#: ../../Zotlabs/Module/Settings/Display.php:101
+#: ../../Zotlabs/Module/Settings/Channel.php:289
+#: ../../extend/addon/addon/dwpost/dwpost.php:73
+#: ../../extend/addon/addon/dwpost/dwpost.php:85
+#: ../../extend/addon/addon/flattrwidget/flattrwidget.php:120
+#: ../../extend/addon/addon/friendica/dfrn_request.php:865
+#: ../../extend/addon/addon/ijpost/ijpost.php:73
+#: ../../extend/addon/addon/ijpost/ijpost.php:85
+#: ../../extend/addon/addon/jappixmini/jappixmini.php:309
+#: ../../extend/addon/addon/jappixmini/jappixmini.php:313
+#: ../../extend/addon/addon/jappixmini/jappixmini.php:343
+#: ../../extend/addon/addon/jappixmini/jappixmini.php:351
+#: ../../extend/addon/addon/jappixmini/jappixmini.php:355
+#: ../../extend/addon/addon/jappixmini/jappixmini.php:359
+#: ../../extend/addon/addon/libertree/libertree.php:69
+#: ../../extend/addon/addon/libertree/libertree.php:81
+#: ../../extend/addon/addon/ljpost/ljpost.php:70
+#: ../../extend/addon/addon/ljpost/ljpost.php:82
+#: ../../extend/addon/addon/nofed/nofed.php:72
+#: ../../extend/addon/addon/nofed/nofed.php:76
+#: ../../extend/addon/addon/nsabait/nsabait.php:157
+#: ../../extend/addon/addon/nsfw/nsfw.php:84
+#: ../../extend/addon/addon/planets/planets.php:153
+#: ../../extend/addon/addon/pumpio/pumpio.php:219
+#: ../../extend/addon/addon/pumpio/pumpio.php:223
+#: ../../extend/addon/addon/pumpio/pumpio.php:227
+#: ../../extend/addon/addon/pumpio/pumpio.php:231
+#: ../../extend/addon/addon/rainbowtag/rainbowtag.php:81
+#: ../../extend/addon/addon/redred/redred.php:95
+#: ../../extend/addon/addon/redred/redred.php:99
+#: ../../extend/addon/addon/rtof/rtof.php:81
+#: ../../extend/addon/addon/rtof/rtof.php:85
+#: ../../extend/addon/addon/smileybutton/smileybutton.php:276
+#: ../../extend/addon/addon/smileybutton/smileybutton.php:280
+#: ../../extend/addon/addon/statusnet/statusnet.php:389
+#: ../../extend/addon/addon/statusnet/statusnet.php:411
+#: ../../extend/addon/addon/statusnet/statusnet.php:415
+#: ../../extend/addon/addon/statusnet/statusnet.php:424
+#: ../../extend/addon/addon/twitter/twitter.php:242
+#: ../../extend/addon/addon/twitter/twitter.php:246
+#: ../../extend/addon/addon/twitter/twitter.php:255
+#: ../../extend/addon/addon/visage/visage.php:166
+#: ../../extend/addon/addon/wppost/wppost.php:82
+#: ../../extend/addon/addon/wppost/wppost.php:105
+#: ../../extend/addon/addon/wppost/wppost.php:109
+#: ../../extend/addon/addon/xmpp/xmpp.php:53
+#: ../../extend/addon/addon/cdav/cdav.php:227 ../../include/dir_fns.php:143
+#: ../../include/dir_fns.php:144 ../../include/dir_fns.php:145
+#: ../../view/theme/redbasic/php/config.php:111
+#: ../../view/theme/redbasic/php/config.php:136 ../../boot.php:1713
+msgid "No"
+msgstr ""
+
#: ../../Zotlabs/Module/Admin/Site.php:217
msgid "Yes - with approval"
msgstr ""
+#: ../../Zotlabs/Module/Admin/Site.php:218 ../../Zotlabs/Module/Menu.php:100
+#: ../../Zotlabs/Module/Menu.php:157 ../../Zotlabs/Module/Api.php:84
+#: ../../Zotlabs/Module/Filestorage.php:160
+#: ../../Zotlabs/Module/Filestorage.php:168
+#: ../../Zotlabs/Module/Profiles.php:641 ../../Zotlabs/Module/Mitem.php:162
+#: ../../Zotlabs/Module/Mitem.php:163 ../../Zotlabs/Module/Mitem.php:240
+#: ../../Zotlabs/Module/Mitem.php:241 ../../Zotlabs/Module/Photos.php:653
+#: ../../Zotlabs/Module/Events.php:464 ../../Zotlabs/Module/Events.php:465
+#: ../../Zotlabs/Module/Events.php:474 ../../Zotlabs/Module/Connedit.php:408
+#: ../../Zotlabs/Module/Removeme.php:63
+#: ../../Zotlabs/Module/Settings/Display.php:101
+#: ../../Zotlabs/Module/Settings/Channel.php:289
+#: ../../extend/addon/addon/dwpost/dwpost.php:73
+#: ../../extend/addon/addon/dwpost/dwpost.php:85
+#: ../../extend/addon/addon/flattrwidget/flattrwidget.php:120
+#: ../../extend/addon/addon/friendica/dfrn_request.php:865
+#: ../../extend/addon/addon/ijpost/ijpost.php:73
+#: ../../extend/addon/addon/ijpost/ijpost.php:85
+#: ../../extend/addon/addon/jappixmini/jappixmini.php:309
+#: ../../extend/addon/addon/jappixmini/jappixmini.php:313
+#: ../../extend/addon/addon/jappixmini/jappixmini.php:343
+#: ../../extend/addon/addon/jappixmini/jappixmini.php:351
+#: ../../extend/addon/addon/jappixmini/jappixmini.php:355
+#: ../../extend/addon/addon/jappixmini/jappixmini.php:359
+#: ../../extend/addon/addon/libertree/libertree.php:69
+#: ../../extend/addon/addon/libertree/libertree.php:81
+#: ../../extend/addon/addon/ljpost/ljpost.php:70
+#: ../../extend/addon/addon/ljpost/ljpost.php:82
+#: ../../extend/addon/addon/nofed/nofed.php:72
+#: ../../extend/addon/addon/nofed/nofed.php:76
+#: ../../extend/addon/addon/nsabait/nsabait.php:157
+#: ../../extend/addon/addon/nsfw/nsfw.php:84
+#: ../../extend/addon/addon/planets/planets.php:153
+#: ../../extend/addon/addon/pumpio/pumpio.php:219
+#: ../../extend/addon/addon/pumpio/pumpio.php:223
+#: ../../extend/addon/addon/pumpio/pumpio.php:227
+#: ../../extend/addon/addon/pumpio/pumpio.php:231
+#: ../../extend/addon/addon/rainbowtag/rainbowtag.php:81
+#: ../../extend/addon/addon/redred/redred.php:95
+#: ../../extend/addon/addon/redred/redred.php:99
+#: ../../extend/addon/addon/rtof/rtof.php:81
+#: ../../extend/addon/addon/rtof/rtof.php:85
+#: ../../extend/addon/addon/smileybutton/smileybutton.php:276
+#: ../../extend/addon/addon/smileybutton/smileybutton.php:280
+#: ../../extend/addon/addon/statusnet/statusnet.php:389
+#: ../../extend/addon/addon/statusnet/statusnet.php:411
+#: ../../extend/addon/addon/statusnet/statusnet.php:415
+#: ../../extend/addon/addon/statusnet/statusnet.php:424
+#: ../../extend/addon/addon/twitter/twitter.php:242
+#: ../../extend/addon/addon/twitter/twitter.php:246
+#: ../../extend/addon/addon/twitter/twitter.php:255
+#: ../../extend/addon/addon/visage/visage.php:166
+#: ../../extend/addon/addon/wppost/wppost.php:82
+#: ../../extend/addon/addon/wppost/wppost.php:105
+#: ../../extend/addon/addon/wppost/wppost.php:109
+#: ../../extend/addon/addon/xmpp/xmpp.php:53
+#: ../../extend/addon/addon/cdav/cdav.php:227 ../../include/dir_fns.php:143
+#: ../../include/dir_fns.php:144 ../../include/dir_fns.php:145
+#: ../../view/theme/redbasic/php/config.php:111
+#: ../../view/theme/redbasic/php/config.php:136 ../../boot.php:1713
+msgid "Yes"
+msgstr ""
+
#: ../../Zotlabs/Module/Admin/Site.php:223
msgid "My site is not a public server"
msgstr ""
@@ -2759,505 +2431,12 @@ msgstr ""
msgid "0 for no expiration of imported content"
msgstr ""
-#: ../../Zotlabs/Module/Invite.php:29
-msgid "Total invitation limit exceeded."
-msgstr ""
-
-#: ../../Zotlabs/Module/Invite.php:53
-#, php-format
-msgid "%s : Not a valid email address."
-msgstr ""
-
-#: ../../Zotlabs/Module/Invite.php:67
-msgid "Please join us on $Projectname"
-msgstr ""
-
-#: ../../Zotlabs/Module/Invite.php:77
-msgid "Invitation limit exceeded. Please contact your site administrator."
-msgstr ""
-
-#: ../../Zotlabs/Module/Invite.php:82
-#, php-format
-msgid "%s : Message delivery failed."
-msgstr ""
-
-#: ../../Zotlabs/Module/Invite.php:86
-#, php-format
-msgid "%d message sent."
-msgid_plural "%d messages sent."
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../../Zotlabs/Module/Invite.php:105
-msgid "You have no more invitations available"
-msgstr ""
-
-#: ../../Zotlabs/Module/Invite.php:136
-msgid "Send invitations"
-msgstr ""
-
-#: ../../Zotlabs/Module/Invite.php:137
-msgid "Enter email addresses, one per line:"
-msgstr ""
-
-#: ../../Zotlabs/Module/Invite.php:138 ../../Zotlabs/Module/Mail.php:241
-msgid "Your message:"
-msgstr ""
-
-#: ../../Zotlabs/Module/Invite.php:139
-msgid "Please join my community on $Projectname."
-msgstr ""
-
-#: ../../Zotlabs/Module/Invite.php:141
-msgid "You will need to supply this invitation code:"
-msgstr ""
-
-#: ../../Zotlabs/Module/Invite.php:142
-msgid "1. Register at any $Projectname location (they are all inter-connected)"
-msgstr ""
-
-#: ../../Zotlabs/Module/Invite.php:144
-msgid "2. Enter my $Projectname network address into the site searchbar."
-msgstr ""
-
-#: ../../Zotlabs/Module/Invite.php:145
-msgid "or visit"
-msgstr ""
-
-#: ../../Zotlabs/Module/Invite.php:147
-msgid "3. Click [Connect]"
-msgstr ""
-
-#: ../../Zotlabs/Module/Setup.php:182
-msgid "$Projectname Server - Setup"
-msgstr ""
-
-#: ../../Zotlabs/Module/Setup.php:186
-msgid "Could not connect to database."
-msgstr ""
-
-#: ../../Zotlabs/Module/Setup.php:190
-msgid ""
-"Could not connect to specified site URL. Possible SSL certificate or DNS "
-"issue."
-msgstr ""
-
-#: ../../Zotlabs/Module/Setup.php:197
-msgid "Could not create table."
-msgstr ""
-
-#: ../../Zotlabs/Module/Setup.php:202
-msgid "Your site database has been installed."
-msgstr ""
-
-#: ../../Zotlabs/Module/Setup.php:206
-msgid ""
-"You may need to import the file \"install/schema_xxx.sql\" manually using a "
-"database client."
-msgstr ""
-
-#: ../../Zotlabs/Module/Setup.php:207 ../../Zotlabs/Module/Setup.php:269
-#: ../../Zotlabs/Module/Setup.php:740
-msgid "Please see the file \"install/INSTALL.txt\"."
-msgstr ""
-
-#: ../../Zotlabs/Module/Setup.php:266
-msgid "System check"
-msgstr ""
-
-#: ../../Zotlabs/Module/Setup.php:270 ../../Zotlabs/Module/Events.php:676
-#: ../../Zotlabs/Module/Events.php:685 ../../Zotlabs/Module/Cal.php:333
-#: ../../Zotlabs/Module/Cal.php:340 ../../Zotlabs/Module/Photos.php:949
-#: ../../extend/addon/addon/cdav/Mod_Cdav.php:843
-msgid "Next"
-msgstr ""
-
-#: ../../Zotlabs/Module/Setup.php:271
-msgid "Check again"
-msgstr ""
-
-#: ../../Zotlabs/Module/Setup.php:293
-msgid "Database connection"
-msgstr ""
-
-#: ../../Zotlabs/Module/Setup.php:294
-msgid ""
-"In order to install $Projectname we need to know how to connect to your "
-"database."
-msgstr ""
-
-#: ../../Zotlabs/Module/Setup.php:295
-msgid ""
-"Please contact your hosting provider or site administrator if you have "
-"questions about these settings."
-msgstr ""
-
-#: ../../Zotlabs/Module/Setup.php:296
-msgid ""
-"The database you specify below should already exist. If it does not, please "
-"create it before continuing."
-msgstr ""
-
-#: ../../Zotlabs/Module/Setup.php:300
-msgid "Database Server Name"
-msgstr ""
-
-#: ../../Zotlabs/Module/Setup.php:300
-msgid "Default is 127.0.0.1"
-msgstr ""
-
-#: ../../Zotlabs/Module/Setup.php:301
-msgid "Database Port"
-msgstr ""
-
-#: ../../Zotlabs/Module/Setup.php:301
-msgid "Communication port number - use 0 for default"
-msgstr ""
-
-#: ../../Zotlabs/Module/Setup.php:302
-msgid "Database Login Name"
-msgstr ""
-
-#: ../../Zotlabs/Module/Setup.php:303
-msgid "Database Login Password"
-msgstr ""
-
-#: ../../Zotlabs/Module/Setup.php:304
-msgid "Database Name"
-msgstr ""
-
-#: ../../Zotlabs/Module/Setup.php:305
-msgid "Database Type"
-msgstr ""
-
-#: ../../Zotlabs/Module/Setup.php:307 ../../Zotlabs/Module/Setup.php:353
-msgid "Site administrator email address"
-msgstr ""
-
-#: ../../Zotlabs/Module/Setup.php:307 ../../Zotlabs/Module/Setup.php:353
-msgid ""
-"Your account email address must match this in order to use the web admin "
-"panel."
-msgstr ""
-
-#: ../../Zotlabs/Module/Setup.php:308 ../../Zotlabs/Module/Setup.php:355
-msgid "Website URL"
-msgstr ""
-
-#: ../../Zotlabs/Module/Setup.php:308 ../../Zotlabs/Module/Setup.php:355
-msgid "Please use SSL (https) URL if available."
-msgstr ""
-
-#: ../../Zotlabs/Module/Setup.php:309 ../../Zotlabs/Module/Setup.php:359
-msgid "Please select a default timezone for your website"
-msgstr ""
-
-#: ../../Zotlabs/Module/Setup.php:342
-msgid "Site settings"
-msgstr ""
-
-#: ../../Zotlabs/Module/Setup.php:398
-msgid "PHP version 5.5 or greater is required."
-msgstr ""
-
-#: ../../Zotlabs/Module/Setup.php:399
-msgid "PHP version"
-msgstr ""
-
-#: ../../Zotlabs/Module/Setup.php:414
-msgid "Could not find a command line version of PHP in the web server PATH."
-msgstr ""
-
-#: ../../Zotlabs/Module/Setup.php:415
-msgid ""
-"If you don't have a command line version of PHP installed on server, you "
-"will not be able to run background polling via cron."
-msgstr ""
-
-#: ../../Zotlabs/Module/Setup.php:419
-msgid "PHP executable path"
-msgstr ""
-
-#: ../../Zotlabs/Module/Setup.php:419
-msgid ""
-"Enter full path to php executable. You can leave this blank to continue the "
-"installation."
-msgstr ""
-
-#: ../../Zotlabs/Module/Setup.php:424
-msgid "Command line PHP"
-msgstr ""
-
-#: ../../Zotlabs/Module/Setup.php:433
-msgid ""
-"The command line version of PHP on your system does not have "
-"\"register_argc_argv\" enabled."
-msgstr ""
-
-#: ../../Zotlabs/Module/Setup.php:434
-msgid "This is required for message delivery to work."
-msgstr ""
-
-#: ../../Zotlabs/Module/Setup.php:437
-msgid "PHP register_argc_argv"
-msgstr ""
-
-#: ../../Zotlabs/Module/Setup.php:455
-#, php-format
-msgid ""
-"Your max allowed total upload size is set to %s. Maximum size of one file to "
-"upload is set to %s. You are allowed to upload up to %d files at once."
-msgstr ""
-
-#: ../../Zotlabs/Module/Setup.php:460
-msgid "You can adjust these settings in the servers php.ini."
-msgstr ""
-
-#: ../../Zotlabs/Module/Setup.php:462
-msgid "PHP upload limits"
-msgstr ""
-
-#: ../../Zotlabs/Module/Setup.php:485
-msgid ""
-"Error: the \"openssl_pkey_new\" function on this system is not able to "
-"generate encryption keys"
-msgstr ""
-
-#: ../../Zotlabs/Module/Setup.php:486
-msgid ""
-"If running under Windows, please see \"http://www.php.net/manual/en/openssl."
-"installation.php\"."
-msgstr ""
-
-#: ../../Zotlabs/Module/Setup.php:489
-msgid "Generate encryption keys"
-msgstr ""
-
-#: ../../Zotlabs/Module/Setup.php:501
-msgid "libCurl PHP module"
-msgstr ""
-
-#: ../../Zotlabs/Module/Setup.php:502
-msgid "GD graphics PHP module"
-msgstr ""
-
-#: ../../Zotlabs/Module/Setup.php:503
-msgid "OpenSSL PHP module"
-msgstr ""
-
-#: ../../Zotlabs/Module/Setup.php:504
-msgid "mysqli or postgres PHP module"
-msgstr ""
-
-#: ../../Zotlabs/Module/Setup.php:505
-msgid "mb_string PHP module"
-msgstr ""
-
-#: ../../Zotlabs/Module/Setup.php:506
-msgid "xml PHP module"
-msgstr ""
-
-#: ../../Zotlabs/Module/Setup.php:510 ../../Zotlabs/Module/Setup.php:512
-msgid "Apache mod_rewrite module"
-msgstr ""
-
-#: ../../Zotlabs/Module/Setup.php:510
-msgid ""
-"Error: Apache webserver mod-rewrite module is required but not installed."
-msgstr ""
-
-#: ../../Zotlabs/Module/Setup.php:516 ../../Zotlabs/Module/Setup.php:519
-msgid "proc_open"
-msgstr ""
-
-#: ../../Zotlabs/Module/Setup.php:516
-msgid ""
-"Error: proc_open is required but is either not installed or has been "
-"disabled in php.ini"
-msgstr ""
-
-#: ../../Zotlabs/Module/Setup.php:524
-msgid "Error: libCURL PHP module required but not installed."
-msgstr ""
-
-#: ../../Zotlabs/Module/Setup.php:528
-msgid ""
-"Error: GD graphics PHP module with JPEG support required but not installed."
-msgstr ""
-
-#: ../../Zotlabs/Module/Setup.php:532
-msgid "Error: openssl PHP module required but not installed."
-msgstr ""
-
-#: ../../Zotlabs/Module/Setup.php:536
-msgid ""
-"Error: mysqli or postgres PHP module required but neither are installed."
-msgstr ""
-
-#: ../../Zotlabs/Module/Setup.php:540
-msgid "Error: mb_string PHP module required but not installed."
-msgstr ""
-
-#: ../../Zotlabs/Module/Setup.php:544
-msgid "Error: xml PHP module required for DAV but not installed."
-msgstr ""
-
-#: ../../Zotlabs/Module/Setup.php:562
-msgid ""
-"The web installer needs to be able to create a file called \".htconfig.php\" "
-"in the top folder of your web server and it is unable to do so."
-msgstr ""
-
-#: ../../Zotlabs/Module/Setup.php:563
-msgid ""
-"This is most often a permission setting, as the web server may not be able "
-"to write files in your folder - even if you can."
-msgstr ""
-
-#: ../../Zotlabs/Module/Setup.php:564
-msgid ""
-"At the end of this procedure, we will give you a text to save in a file "
-"named .htconfig.php in your Red top folder."
-msgstr ""
-
-#: ../../Zotlabs/Module/Setup.php:565
-msgid ""
-"You can alternatively skip this procedure and perform a manual installation. "
-"Please see the file \"install/INSTALL.txt\" for instructions."
-msgstr ""
-
-#: ../../Zotlabs/Module/Setup.php:568
-msgid ".htconfig.php is writable"
-msgstr ""
-
-#: ../../Zotlabs/Module/Setup.php:582
-msgid ""
-"Red uses the Smarty3 template engine to render its web views. Smarty3 "
-"compiles templates to PHP to speed up rendering."
-msgstr ""
-
-#: ../../Zotlabs/Module/Setup.php:583
-#, php-format
-msgid ""
-"In order to store these compiled templates, the web server needs to have "
-"write access to the directory %s under the top level web folder."
-msgstr ""
-
-#: ../../Zotlabs/Module/Setup.php:584 ../../Zotlabs/Module/Setup.php:605
-msgid ""
-"Please ensure that the user that your web server runs as (e.g. www-data) has "
-"write access to this folder."
-msgstr ""
-
-#: ../../Zotlabs/Module/Setup.php:585
-#, php-format
-msgid ""
-"Note: as a security measure, you should give the web server write access to "
-"%s only--not the template files (.tpl) that it contains."
-msgstr ""
-
-#: ../../Zotlabs/Module/Setup.php:588
-#, php-format
-msgid "%s is writable"
-msgstr ""
-
-#: ../../Zotlabs/Module/Setup.php:604
-msgid ""
-"This software uses the store directory to save uploaded files. The web "
-"server needs to have write access to the store directory under the Red top "
-"level folder"
-msgstr ""
-
-#: ../../Zotlabs/Module/Setup.php:608
-msgid "store is writable"
-msgstr ""
-
-#: ../../Zotlabs/Module/Setup.php:641
-msgid ""
-"SSL certificate cannot be validated. Fix certificate or disable https access "
-"to this site."
-msgstr ""
-
-#: ../../Zotlabs/Module/Setup.php:642
-msgid ""
-"If you have https access to your website or allow connections to TCP port "
-"443 (the https: port), you MUST use a browser-valid certificate. You MUST "
-"NOT use self-signed certificates!"
-msgstr ""
-
-#: ../../Zotlabs/Module/Setup.php:643
-msgid ""
-"This restriction is incorporated because public posts from you may for "
-"example contain references to images on your own hub."
-msgstr ""
-
-#: ../../Zotlabs/Module/Setup.php:644
-msgid ""
-"If your certificate is not recognized, members of other sites (who may "
-"themselves have valid certificates) will get a warning message on their own "
-"site complaining about security issues."
-msgstr ""
-
-#: ../../Zotlabs/Module/Setup.php:645
-msgid ""
-"This can cause usability issues elsewhere (not just on your own site) so we "
-"must insist on this requirement."
-msgstr ""
-
-#: ../../Zotlabs/Module/Setup.php:646
-msgid ""
-"Providers are available that issue free certificates which are browser-valid."
-msgstr ""
-
-#: ../../Zotlabs/Module/Setup.php:648
-msgid ""
-"If you are confident that the certificate is valid and signed by a trusted "
-"authority, check to see if you have failed to install an intermediate cert. "
-"These are not normally required by browsers, but are required for server-to-"
-"server communications."
-msgstr ""
-
-#: ../../Zotlabs/Module/Setup.php:650
-msgid "SSL certificate validation"
-msgstr ""
-
-#: ../../Zotlabs/Module/Setup.php:656
-msgid ""
-"Url rewrite in .htaccess is not working. Check your server configuration."
-"Test: "
-msgstr ""
-
-#: ../../Zotlabs/Module/Setup.php:659
-msgid "Url rewrite is working"
-msgstr ""
-
-#: ../../Zotlabs/Module/Setup.php:673
-msgid ""
-"The database configuration file \".htconfig.php\" could not be written. "
-"Please use the enclosed text to create a configuration file in your web "
-"server root."
-msgstr ""
-
-#: ../../Zotlabs/Module/Setup.php:697
-#: ../../extend/addon/addon/cdav/cdav.php:40
-#: ../../extend/addon/addon/rendezvous/rendezvous.php:355
-msgid "Errors encountered creating database tables."
-msgstr ""
-
-#: ../../Zotlabs/Module/Setup.php:738
-msgid "<h1>What next</h1>"
-msgstr ""
-
-#: ../../Zotlabs/Module/Setup.php:739
-msgid ""
-"IMPORTANT: You will need to [manually] setup a scheduled task for the poller."
+#: ../../Zotlabs/Module/Lockview.php:75
+msgid "Remote privacy information not available."
msgstr ""
-#: ../../Zotlabs/Module/Editlayout.php:79
-#: ../../Zotlabs/Module/Editwebpage.php:80
-#: ../../Zotlabs/Module/Editblock.php:79 ../../Zotlabs/Module/Editblock.php:95
-#: ../../Zotlabs/Module/Editpost.php:24
-msgid "Item not found"
+#: ../../Zotlabs/Module/Lockview.php:96
+msgid "Visible to:"
msgstr ""
#: ../../Zotlabs/Module/Editlayout.php:127
@@ -3278,204 +2457,12 @@ msgstr ""
msgid "Page link"
msgstr ""
-#: ../../Zotlabs/Module/Editwebpage.php:146 ../../Zotlabs/Module/Mail.php:244
-#: ../../Zotlabs/Module/Mail.php:369 ../../Zotlabs/Module/Editblock.php:111
-#: ../../Zotlabs/Module/Chat.php:207 ../../include/conversation.php:1149
-msgid "Insert web link"
-msgstr ""
-
#: ../../Zotlabs/Module/Editwebpage.php:169
msgid "Edit Webpage"
msgstr ""
-#: ../../Zotlabs/Module/Events.php:25
-msgid "Calendar entries imported."
-msgstr ""
-
-#: ../../Zotlabs/Module/Events.php:27
-msgid "No calendar entries found."
-msgstr ""
-
-#: ../../Zotlabs/Module/Events.php:104
-msgid "Event can not end before it has started."
-msgstr ""
-
-#: ../../Zotlabs/Module/Events.php:106 ../../Zotlabs/Module/Events.php:115
-#: ../../Zotlabs/Module/Events.php:135
-msgid "Unable to generate preview."
-msgstr ""
-
-#: ../../Zotlabs/Module/Events.php:113
-msgid "Event title and start time are required."
-msgstr ""
-
-#: ../../Zotlabs/Module/Events.php:133 ../../Zotlabs/Module/Events.php:258
-msgid "Event not found."
-msgstr ""
-
-#: ../../Zotlabs/Module/Events.php:253 ../../Zotlabs/Module/Like.php:372
-#: ../../Zotlabs/Module/Tagger.php:51 ../../include/conversation.php:123
-#: ../../include/event.php:961 ../../include/text.php:1987
-msgid "event"
-msgstr ""
-
-#: ../../Zotlabs/Module/Events.php:452
-msgid "Edit event title"
-msgstr ""
-
-#: ../../Zotlabs/Module/Events.php:452
-#: ../../extend/addon/addon/cdav/Mod_Cdav.php:831
-msgid "Event title"
-msgstr ""
-
-#: ../../Zotlabs/Module/Events.php:454
-msgid "Categories (comma-separated list)"
-msgstr ""
-
-#: ../../Zotlabs/Module/Events.php:455
-msgid "Edit Category"
-msgstr ""
-
-#: ../../Zotlabs/Module/Events.php:455
-msgid "Category"
-msgstr ""
-
-#: ../../Zotlabs/Module/Events.php:458
-msgid "Edit start date and time"
-msgstr ""
-
-#: ../../Zotlabs/Module/Events.php:458
-#: ../../extend/addon/addon/cdav/Mod_Cdav.php:832
-msgid "Start date and time"
-msgstr ""
-
-#: ../../Zotlabs/Module/Events.php:459 ../../Zotlabs/Module/Events.php:462
-msgid "Finish date and time are not known or not relevant"
-msgstr ""
-
-#: ../../Zotlabs/Module/Events.php:461
-msgid "Edit finish date and time"
-msgstr ""
-
-#: ../../Zotlabs/Module/Events.php:461
-msgid "Finish date and time"
-msgstr ""
-
-#: ../../Zotlabs/Module/Events.php:463 ../../Zotlabs/Module/Events.php:464
-msgid "Adjust for viewer timezone"
-msgstr ""
-
-#: ../../Zotlabs/Module/Events.php:463
-msgid ""
-"Important for events that happen in a particular place. Not practical for "
-"global holidays."
-msgstr ""
-
-#: ../../Zotlabs/Module/Events.php:465
-msgid "Edit Description"
-msgstr ""
-
-#: ../../Zotlabs/Module/Events.php:465 ../../Zotlabs/Module/Appman.php:117
-#: ../../Zotlabs/Module/Rbmark.php:101
-#: ../../extend/addon/addon/cdav/Mod_Cdav.php:834
-#: ../../extend/addon/addon/rendezvous/rendezvous.php:136
-msgid "Description"
-msgstr ""
-
-#: ../../Zotlabs/Module/Events.php:467
-msgid "Edit Location"
-msgstr ""
-
-#: ../../Zotlabs/Module/Events.php:470 ../../Zotlabs/Module/Events.php:472
-msgid "Share this event"
-msgstr ""
-
-#: ../../Zotlabs/Module/Events.php:473 ../../Zotlabs/Module/Photos.php:1099
-#: ../../Zotlabs/Module/Webpages.php:247 ../../Zotlabs/Lib/ThreadItem.php:734
-#: ../../include/conversation.php:1201 ../../include/page_widgets.php:43
-msgid "Preview"
-msgstr ""
-
-#: ../../Zotlabs/Module/Events.php:474 ../../include/conversation.php:1264
-msgid "Permission settings"
-msgstr ""
-
-#: ../../Zotlabs/Module/Events.php:485
-msgid "Advanced Options"
-msgstr ""
-
-#: ../../Zotlabs/Module/Events.php:597 ../../Zotlabs/Module/Cal.php:259
-msgid "l, F j"
-msgstr ""
-
-#: ../../Zotlabs/Module/Events.php:619
-msgid "Edit event"
-msgstr ""
-
-#: ../../Zotlabs/Module/Events.php:621
-msgid "Delete event"
-msgstr ""
-
-#: ../../Zotlabs/Module/Events.php:646 ../../Zotlabs/Module/Cal.php:308
-#: ../../include/text.php:1792
-msgid "Link to Source"
-msgstr ""
-
-#: ../../Zotlabs/Module/Events.php:655
-msgid "calendar"
-msgstr ""
-
-#: ../../Zotlabs/Module/Events.php:674 ../../Zotlabs/Module/Cal.php:331
-msgid "Edit Event"
-msgstr ""
-
-#: ../../Zotlabs/Module/Events.php:674 ../../Zotlabs/Module/Cal.php:331
-msgid "Create Event"
-msgstr ""
-
-#: ../../Zotlabs/Module/Events.php:675 ../../Zotlabs/Module/Events.php:684
-#: ../../Zotlabs/Module/Cal.php:332 ../../Zotlabs/Module/Cal.php:339
-#: ../../Zotlabs/Module/Photos.php:940
-#: ../../extend/addon/addon/cdav/Mod_Cdav.php:842
-msgid "Previous"
-msgstr ""
-
-#: ../../Zotlabs/Module/Events.php:677 ../../Zotlabs/Module/Cal.php:334
-msgid "Export"
-msgstr ""
-
-#: ../../Zotlabs/Module/Events.php:680 ../../Zotlabs/Module/Blocks.php:166
-#: ../../Zotlabs/Module/Layouts.php:197 ../../Zotlabs/Module/Pubsites.php:59
-#: ../../Zotlabs/Module/Webpages.php:246 ../../include/page_widgets.php:42
-msgid "View"
-msgstr ""
-
-#: ../../Zotlabs/Module/Events.php:681
-#: ../../extend/addon/addon/cdav/Mod_Cdav.php:845
-msgid "Month"
-msgstr ""
-
-#: ../../Zotlabs/Module/Events.php:682
-#: ../../extend/addon/addon/cdav/Mod_Cdav.php:846
-msgid "Week"
-msgstr ""
-
-#: ../../Zotlabs/Module/Events.php:683
-#: ../../extend/addon/addon/cdav/Mod_Cdav.php:847
-msgid "Day"
-msgstr ""
-
-#: ../../Zotlabs/Module/Events.php:686 ../../Zotlabs/Module/Cal.php:341
-#: ../../extend/addon/addon/cdav/Mod_Cdav.php:844
-msgid "Today"
-msgstr ""
-
-#: ../../Zotlabs/Module/Events.php:717
-msgid "Event removed"
-msgstr ""
-
-#: ../../Zotlabs/Module/Events.php:720
-msgid "Failed to remove event"
+#: ../../Zotlabs/Module/Follow.php:31
+msgid "Channel added."
msgstr ""
#: ../../Zotlabs/Module/Manage.php:136
@@ -3488,6 +2475,11 @@ msgstr ""
msgid "Create a new channel"
msgstr ""
+#: ../../Zotlabs/Module/Manage.php:143 ../../Zotlabs/Module/Profiles.php:772
+#: ../../Zotlabs/Module/Chat.php:255
+msgid "Create New"
+msgstr ""
+
#: ../../Zotlabs/Module/Manage.php:164 ../../Zotlabs/Lib/Apps.php:214
#: ../../include/nav.php:211
msgid "Channel Manager"
@@ -3660,10 +2652,24 @@ msgstr ""
msgid "Name of app"
msgstr ""
+#: ../../Zotlabs/Module/Appman.php:115 ../../Zotlabs/Module/Appman.php:116
+#: ../../Zotlabs/Module/Profiles.php:703 ../../Zotlabs/Module/Profiles.php:707
+#: ../../Zotlabs/Module/Events.php:454 ../../Zotlabs/Module/Events.php:459
+#: ../../include/datetime.php:259
+msgid "Required"
+msgstr ""
+
#: ../../Zotlabs/Module/Appman.php:116
msgid "Location (URL) of app"
msgstr ""
+#: ../../Zotlabs/Module/Appman.php:117 ../../Zotlabs/Module/Events.php:467
+#: ../../Zotlabs/Module/Rbmark.php:101
+#: ../../extend/addon/addon/cdav/Mod_Cdav.php:834
+#: ../../extend/addon/addon/rendezvous/rendezvous.php:136
+msgid "Description"
+msgstr ""
+
#: ../../Zotlabs/Module/Appman.php:118
msgid "Photo icon URL"
msgstr ""
@@ -3692,16 +2698,30 @@ msgstr ""
msgid "Edit post"
msgstr ""
-#: ../../Zotlabs/Module/Acl.php:313
-msgid "network"
+#: ../../Zotlabs/Module/Api.php:60 ../../Zotlabs/Module/Api.php:81
+msgid "Authorize application connection"
msgstr ""
-#: ../../Zotlabs/Module/Acl.php:323
-msgid "RSS"
+#: ../../Zotlabs/Module/Api.php:61
+msgid "Return to your app and insert this Security Code:"
msgstr ""
-#: ../../Zotlabs/Module/Follow.php:31
-msgid "Channel added."
+#: ../../Zotlabs/Module/Api.php:71
+msgid "Please login to continue."
+msgstr ""
+
+#: ../../Zotlabs/Module/Api.php:83
+msgid ""
+"Do you want to authorize this application to access your posts and contacts, "
+"and/or create new posts for you?"
+msgstr ""
+
+#: ../../Zotlabs/Module/Help.php:23
+msgid "Documentation Search"
+msgstr ""
+
+#: ../../Zotlabs/Module/Help.php:51
+msgid "$Projectname Documentation"
msgstr ""
#: ../../Zotlabs/Module/Ffsapi.php:12
@@ -3778,416 +2798,500 @@ msgstr ""
msgid "Notify your contacts about this file"
msgstr ""
-#: ../../Zotlabs/Module/Import.php:33
-#, php-format
-msgid "Your service plan only allows %d channels."
+#: ../../Zotlabs/Module/Item.php:182
+msgid "Unable to locate original post."
msgstr ""
-#: ../../Zotlabs/Module/Import.php:71 ../../Zotlabs/Module/Import_items.php:42
-msgid "Nothing to import."
+#: ../../Zotlabs/Module/Item.php:435
+msgid "Empty post discarded."
msgstr ""
-#: ../../Zotlabs/Module/Import.php:83 ../../Zotlabs/Module/Import.php:98
-#: ../../Zotlabs/Module/Import_items.php:66
-msgid "Unable to download data from old server"
+#: ../../Zotlabs/Module/Item.php:475
+msgid "Executable content type not permitted to this channel."
msgstr ""
-#: ../../Zotlabs/Module/Import.php:105
-#: ../../Zotlabs/Module/Import_items.php:72
-msgid "Imported file is empty."
+#: ../../Zotlabs/Module/Item.php:855
+msgid "Duplicate post suppressed."
msgstr ""
-#: ../../Zotlabs/Module/Import.php:127
-#: ../../Zotlabs/Module/Import_items.php:88
+#: ../../Zotlabs/Module/Item.php:990
+msgid "System error. Post not saved."
+msgstr ""
+
+#: ../../Zotlabs/Module/Item.php:1111
+msgid "Unable to obtain post information from database."
+msgstr ""
+
+#: ../../Zotlabs/Module/Item.php:1118
#, php-format
-msgid "Warning: Database versions differ by %1$d updates."
+msgid "You have reached your limit of %1$.0f top level posts."
msgstr ""
-#: ../../Zotlabs/Module/Import.php:157 ../../include/import.php:100
-msgid "Cloned channel not found. Import failed."
+#: ../../Zotlabs/Module/Item.php:1125
+#, php-format
+msgid "You have reached your limit of %1$.0f webpages."
msgstr ""
-#: ../../Zotlabs/Module/Import.php:167
-msgid "No channel. Import failed."
+#: ../../Zotlabs/Module/Profiles.php:24 ../../Zotlabs/Module/Profiles.php:183
+#: ../../Zotlabs/Module/Profiles.php:240 ../../Zotlabs/Module/Profiles.php:619
+#: ../../extend/addon/addon/friendica/dfrn_confirm.php:62
+msgid "Profile not found."
msgstr ""
-#: ../../Zotlabs/Module/Import.php:503
-#: ../../include/Import/import_diaspora.php:142
-msgid "Import completed."
+#: ../../Zotlabs/Module/Profiles.php:44
+msgid "Profile deleted."
msgstr ""
-#: ../../Zotlabs/Module/Import.php:525
-msgid "You must be logged in to use this feature."
+#: ../../Zotlabs/Module/Profiles.php:68 ../../Zotlabs/Module/Profiles.php:104
+msgid "Profile-"
msgstr ""
-#: ../../Zotlabs/Module/Import.php:530
-msgid "Import Channel"
+#: ../../Zotlabs/Module/Profiles.php:89 ../../Zotlabs/Module/Profiles.php:126
+msgid "New profile created."
msgstr ""
-#: ../../Zotlabs/Module/Import.php:531
-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."
+#: ../../Zotlabs/Module/Profiles.php:110
+msgid "Profile unavailable to clone."
msgstr ""
-#: ../../Zotlabs/Module/Import.php:532
-#: ../../Zotlabs/Module/Import_items.php:121
-msgid "File to Upload"
+#: ../../Zotlabs/Module/Profiles.php:145
+msgid "Profile unavailable to export."
msgstr ""
-#: ../../Zotlabs/Module/Import.php:533
-msgid "Or provide the old server/hub details"
+#: ../../Zotlabs/Module/Profiles.php:250
+msgid "Profile Name is required."
msgstr ""
-#: ../../Zotlabs/Module/Import.php:534
-msgid "Your old identity address (xyz@example.com)"
+#: ../../Zotlabs/Module/Profiles.php:421
+msgid "Marital Status"
msgstr ""
-#: ../../Zotlabs/Module/Import.php:535
-msgid "Your old login email address"
+#: ../../Zotlabs/Module/Profiles.php:425
+msgid "Romantic Partner"
msgstr ""
-#: ../../Zotlabs/Module/Import.php:536
-msgid "Your old login password"
+#: ../../Zotlabs/Module/Profiles.php:429 ../../Zotlabs/Module/Profiles.php:730
+msgid "Likes"
msgstr ""
-#: ../../Zotlabs/Module/Import.php:537
-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/Profiles.php:433 ../../Zotlabs/Module/Profiles.php:731
+msgid "Dislikes"
msgstr ""
-#: ../../Zotlabs/Module/Import.php:538
-msgid "Make this hub my primary location"
+#: ../../Zotlabs/Module/Profiles.php:437 ../../Zotlabs/Module/Profiles.php:738
+msgid "Work/Employment"
msgstr ""
-#: ../../Zotlabs/Module/Import.php:539
-msgid ""
-"Import existing posts if possible (experimental - limited by available memory"
+#: ../../Zotlabs/Module/Profiles.php:440
+msgid "Religion"
msgstr ""
-#: ../../Zotlabs/Module/Import.php:540
-msgid ""
-"This process may take several minutes to complete. Please submit the form "
-"only once and leave this page open until finished."
+#: ../../Zotlabs/Module/Profiles.php:444
+msgid "Political Views"
msgstr ""
-#: ../../Zotlabs/Module/Match.php:26
-msgid "Profile Match"
+#: ../../Zotlabs/Module/Profiles.php:448
+#: ../../extend/addon/addon/openid/MysqlProvider.php:74
+msgid "Gender"
msgstr ""
-#: ../../Zotlabs/Module/Match.php:35
-msgid "No keywords to match. Please add keywords to your default profile."
+#: ../../Zotlabs/Module/Profiles.php:452
+msgid "Sexual Preference"
msgstr ""
-#: ../../Zotlabs/Module/Match.php:67
-msgid "is interested in:"
+#: ../../Zotlabs/Module/Profiles.php:456
+msgid "Homepage"
msgstr ""
-#: ../../Zotlabs/Module/Match.php:74
-msgid "No matches"
+#: ../../Zotlabs/Module/Profiles.php:460
+msgid "Interests"
msgstr ""
-#: ../../Zotlabs/Module/Connedit.php:80
-msgid "Could not access contact record."
+#: ../../Zotlabs/Module/Profiles.php:471 ../../Zotlabs/Module/Profiles.php:692
+#: ../../Zotlabs/Module/Locs.php:117 ../../Zotlabs/Module/Events.php:469
+#: ../../Zotlabs/Module/Pubsites.php:51
+#: ../../extend/addon/addon/cdav/Mod_Cdav.php:835
+#: ../../include/js_strings.php:25
+msgid "Location"
msgstr ""
-#: ../../Zotlabs/Module/Connedit.php:104
-msgid "Could not locate selected profile."
+#: ../../Zotlabs/Module/Profiles.php:554
+msgid "Profile updated."
msgstr ""
-#: ../../Zotlabs/Module/Connedit.php:256
-msgid "Connection updated."
+#: ../../Zotlabs/Module/Profiles.php:638
+msgid "Hide your connections list from viewers of this profile"
msgstr ""
-#: ../../Zotlabs/Module/Connedit.php:258
-msgid "Failed to update connection record."
+#: ../../Zotlabs/Module/Profiles.php:680
+msgid "Edit Profile Details"
msgstr ""
-#: ../../Zotlabs/Module/Connedit.php:308
-msgid "is now connected to"
+#: ../../Zotlabs/Module/Profiles.php:682
+msgid "View this profile"
msgstr ""
-#: ../../Zotlabs/Module/Connedit.php:440
-msgid "Could not access address book record."
+#: ../../Zotlabs/Module/Profiles.php:683 ../../Zotlabs/Module/Profiles.php:765
+#: ../../include/channel.php:983
+msgid "Edit visibility"
msgstr ""
-#: ../../Zotlabs/Module/Connedit.php:460
-msgid "Refresh failed - channel is currently unavailable."
+#: ../../Zotlabs/Module/Profiles.php:684
+msgid "Profile Tools"
msgstr ""
-#: ../../Zotlabs/Module/Connedit.php:475 ../../Zotlabs/Module/Connedit.php:484
-#: ../../Zotlabs/Module/Connedit.php:493 ../../Zotlabs/Module/Connedit.php:502
-#: ../../Zotlabs/Module/Connedit.php:515
-msgid "Unable to set address book parameters."
+#: ../../Zotlabs/Module/Profiles.php:685
+msgid "Change cover photo"
msgstr ""
-#: ../../Zotlabs/Module/Connedit.php:538
-msgid "Connection has been removed."
+#: ../../Zotlabs/Module/Profiles.php:686 ../../include/channel.php:954
+msgid "Change profile photo"
msgstr ""
-#: ../../Zotlabs/Module/Connedit.php:554 ../../Zotlabs/Lib/Apps.php:221
-#: ../../extend/addon/addon/openclipatar/openclipatar.php:56
-#: ../../include/conversation.php:953 ../../include/nav.php:89
-msgid "View Profile"
+#: ../../Zotlabs/Module/Profiles.php:687
+msgid "Create a new profile using these settings"
msgstr ""
-#: ../../Zotlabs/Module/Connedit.php:557
-#, php-format
-msgid "View %s's profile"
+#: ../../Zotlabs/Module/Profiles.php:688
+msgid "Clone this profile"
msgstr ""
-#: ../../Zotlabs/Module/Connedit.php:561
-msgid "Refresh Permissions"
+#: ../../Zotlabs/Module/Profiles.php:689
+msgid "Delete this profile"
msgstr ""
-#: ../../Zotlabs/Module/Connedit.php:564
-msgid "Fetch updated permissions"
+#: ../../Zotlabs/Module/Profiles.php:690
+msgid "Add profile things"
msgstr ""
-#: ../../Zotlabs/Module/Connedit.php:568
-msgid "Recent Activity"
+#: ../../Zotlabs/Module/Profiles.php:691 ../../include/widgets.php:105
+#: ../../include/conversation.php:1568
+msgid "Personal"
msgstr ""
-#: ../../Zotlabs/Module/Connedit.php:571
-msgid "View recent posts and comments"
+#: ../../Zotlabs/Module/Profiles.php:693
+msgid "Relation"
msgstr ""
-#: ../../Zotlabs/Module/Connedit.php:578
-msgid "Block (or Unblock) all communications with this connection"
+#: ../../Zotlabs/Module/Profiles.php:694 ../../include/datetime.php:55
+msgid "Miscellaneous"
msgstr ""
-#: ../../Zotlabs/Module/Connedit.php:579
-msgid "This connection is blocked!"
+#: ../../Zotlabs/Module/Profiles.php:696
+msgid "Import profile from file"
msgstr ""
-#: ../../Zotlabs/Module/Connedit.php:583
-msgid "Unignore"
+#: ../../Zotlabs/Module/Profiles.php:697
+msgid "Export profile to file"
msgstr ""
-#: ../../Zotlabs/Module/Connedit.php:586
-msgid "Ignore (or Unignore) all inbound communications from this connection"
+#: ../../Zotlabs/Module/Profiles.php:698
+msgid "Your gender"
msgstr ""
-#: ../../Zotlabs/Module/Connedit.php:587
-msgid "This connection is ignored!"
+#: ../../Zotlabs/Module/Profiles.php:699
+msgid "Marital status"
msgstr ""
-#: ../../Zotlabs/Module/Connedit.php:591
-msgid "Unarchive"
+#: ../../Zotlabs/Module/Profiles.php:700
+msgid "Sexual preference"
msgstr ""
-#: ../../Zotlabs/Module/Connedit.php:591
-msgid "Archive"
+#: ../../Zotlabs/Module/Profiles.php:703
+msgid "Profile name"
msgstr ""
-#: ../../Zotlabs/Module/Connedit.php:594
-msgid ""
-"Archive (or Unarchive) this connection - mark channel dead but keep content"
+#: ../../Zotlabs/Module/Profiles.php:705
+msgid "This is your default profile."
msgstr ""
-#: ../../Zotlabs/Module/Connedit.php:595
-msgid "This connection is archived!"
+#: ../../Zotlabs/Module/Profiles.php:707
+msgid "Your full name"
msgstr ""
-#: ../../Zotlabs/Module/Connedit.php:599
-msgid "Unhide"
+#: ../../Zotlabs/Module/Profiles.php:708
+msgid "Title/Description"
msgstr ""
-#: ../../Zotlabs/Module/Connedit.php:599
-msgid "Hide"
+#: ../../Zotlabs/Module/Profiles.php:711
+msgid "Street address"
msgstr ""
-#: ../../Zotlabs/Module/Connedit.php:602
-msgid "Hide or Unhide this connection from your other connections"
+#: ../../Zotlabs/Module/Profiles.php:712
+msgid "Locality/City"
msgstr ""
-#: ../../Zotlabs/Module/Connedit.php:603
-msgid "This connection is hidden!"
+#: ../../Zotlabs/Module/Profiles.php:713
+msgid "Region/State"
msgstr ""
-#: ../../Zotlabs/Module/Connedit.php:610
-msgid "Delete this connection"
+#: ../../Zotlabs/Module/Profiles.php:714
+msgid "Postal/Zip code"
msgstr ""
-#: ../../Zotlabs/Module/Connedit.php:625 ../../include/widgets.php:529
-msgid "Me"
+#: ../../Zotlabs/Module/Profiles.php:715
+#: ../../extend/addon/addon/cdav/Mod_Cdav.php:1157
+msgid "Country"
msgstr ""
-#: ../../Zotlabs/Module/Connedit.php:626 ../../include/widgets.php:530
-msgid "Family"
+#: ../../Zotlabs/Module/Profiles.php:720
+msgid "Who (if applicable)"
msgstr ""
-#: ../../Zotlabs/Module/Connedit.php:627
-#: ../../Zotlabs/Module/Settings/Channel.php:61
-#: ../../Zotlabs/Module/Settings/Channel.php:65
-#: ../../Zotlabs/Module/Settings/Channel.php:66
-#: ../../Zotlabs/Module/Settings/Channel.php:69
-#: ../../Zotlabs/Module/Settings/Channel.php:80 ../../include/channel.php:402
-#: ../../include/channel.php:403 ../../include/channel.php:410
-#: ../../include/selectors.php:123 ../../include/widgets.php:531
-msgid "Friends"
+#: ../../Zotlabs/Module/Profiles.php:720
+msgid "Examples: cathy123, Cathy Williams, cathy@example.com"
msgstr ""
-#: ../../Zotlabs/Module/Connedit.php:628 ../../include/widgets.php:532
-msgid "Acquaintances"
+#: ../../Zotlabs/Module/Profiles.php:721
+msgid "Since (date)"
msgstr ""
-#: ../../Zotlabs/Module/Connedit.php:686
-msgid "Approve this connection"
+#: ../../Zotlabs/Module/Profiles.php:724
+msgid "Tell us about yourself"
msgstr ""
-#: ../../Zotlabs/Module/Connedit.php:686
-msgid "Accept connection to allow communication"
+#: ../../Zotlabs/Module/Profiles.php:725
+#: ../../extend/addon/addon/openid/MysqlProvider.php:68
+msgid "Homepage URL"
msgstr ""
-#: ../../Zotlabs/Module/Connedit.php:691
-msgid "Set Affinity"
+#: ../../Zotlabs/Module/Profiles.php:726
+msgid "Hometown"
msgstr ""
-#: ../../Zotlabs/Module/Connedit.php:694
-msgid "Set Profile"
+#: ../../Zotlabs/Module/Profiles.php:727
+msgid "Political views"
msgstr ""
-#: ../../Zotlabs/Module/Connedit.php:697
-msgid "Set Affinity & Profile"
+#: ../../Zotlabs/Module/Profiles.php:728
+msgid "Religious views"
msgstr ""
-#: ../../Zotlabs/Module/Connedit.php:746
-msgid "none"
+#: ../../Zotlabs/Module/Profiles.php:729
+msgid "Keywords used in directory listings"
msgstr ""
-#: ../../Zotlabs/Module/Connedit.php:750 ../../include/widgets.php:656
-msgid "Connection Default Permissions"
+#: ../../Zotlabs/Module/Profiles.php:729
+msgid "Example: fishing photography software"
msgstr ""
-#: ../../Zotlabs/Module/Connedit.php:750 ../../include/items.php:3977
+#: ../../Zotlabs/Module/Profiles.php:732
+msgid "Musical interests"
+msgstr ""
+
+#: ../../Zotlabs/Module/Profiles.php:733
+msgid "Books, literature"
+msgstr ""
+
+#: ../../Zotlabs/Module/Profiles.php:734
+msgid "Television"
+msgstr ""
+
+#: ../../Zotlabs/Module/Profiles.php:735
+msgid "Film/Dance/Culture/Entertainment"
+msgstr ""
+
+#: ../../Zotlabs/Module/Profiles.php:736
+msgid "Hobbies/Interests"
+msgstr ""
+
+#: ../../Zotlabs/Module/Profiles.php:737
+msgid "Love/Romance"
+msgstr ""
+
+#: ../../Zotlabs/Module/Profiles.php:739
+msgid "School/Education"
+msgstr ""
+
+#: ../../Zotlabs/Module/Profiles.php:740
+msgid "Contact information and social networks"
+msgstr ""
+
+#: ../../Zotlabs/Module/Profiles.php:741
+msgid "My other channels"
+msgstr ""
+
+#: ../../Zotlabs/Module/Profiles.php:761 ../../include/channel.php:979
+msgid "Profile Image"
+msgstr ""
+
+#: ../../Zotlabs/Module/Profiles.php:771 ../../include/channel.php:961
+#: ../../include/nav.php:91
+msgid "Edit Profiles"
+msgstr ""
+
+#: ../../Zotlabs/Module/Acl.php:313
+msgid "network"
+msgstr ""
+
+#: ../../Zotlabs/Module/Acl.php:323
+msgid "RSS"
+msgstr ""
+
+#: ../../Zotlabs/Module/Directory.php:245
#, php-format
-msgid "Connection: %s"
+msgid "%d rating"
+msgid_plural "%d ratings"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../../Zotlabs/Module/Directory.php:256
+msgid "Gender: "
msgstr ""
-#: ../../Zotlabs/Module/Connedit.php:751
-msgid "Apply these permissions automatically"
+#: ../../Zotlabs/Module/Directory.php:258
+msgid "Status: "
msgstr ""
-#: ../../Zotlabs/Module/Connedit.php:751
-msgid "Connection requests will be approved without your interaction"
+#: ../../Zotlabs/Module/Directory.php:260
+msgid "Homepage: "
msgstr ""
-#: ../../Zotlabs/Module/Connedit.php:753
-msgid "This connection's primary address is"
+#: ../../Zotlabs/Module/Directory.php:309 ../../include/channel.php:1215
+msgid "Age:"
msgstr ""
-#: ../../Zotlabs/Module/Connedit.php:754
-msgid "Available locations:"
+#: ../../Zotlabs/Module/Directory.php:314 ../../include/channel.php:1051
+#: ../../include/event.php:52 ../../include/event.php:84
+#: ../../include/bb2diaspora.php:510
+msgid "Location:"
msgstr ""
-#: ../../Zotlabs/Module/Connedit.php:758
-msgid ""
-"The permissions indicated on this page will be applied to all new "
-"connections."
+#: ../../Zotlabs/Module/Directory.php:320
+msgid "Description:"
msgstr ""
-#: ../../Zotlabs/Module/Connedit.php:759
-msgid "Connection Tools"
+#: ../../Zotlabs/Module/Directory.php:325 ../../include/channel.php:1231
+msgid "Hometown:"
msgstr ""
-#: ../../Zotlabs/Module/Connedit.php:761
-msgid "Slide to adjust your degree of friendship"
+#: ../../Zotlabs/Module/Directory.php:327 ../../include/channel.php:1239
+msgid "About:"
msgstr ""
-#: ../../Zotlabs/Module/Connedit.php:762 ../../Zotlabs/Module/Rate.php:155
-#: ../../include/js_strings.php:20
-msgid "Rating"
+#: ../../Zotlabs/Module/Directory.php:328 ../../Zotlabs/Module/Suggest.php:56
+#: ../../Zotlabs/Module/Match.php:68 ../../include/channel.php:1036
+#: ../../include/connections.php:78 ../../include/widgets.php:147
+#: ../../include/widgets.php:184 ../../include/conversation.php:955
+msgid "Connect"
msgstr ""
-#: ../../Zotlabs/Module/Connedit.php:763
-msgid "Slide to adjust your rating"
+#: ../../Zotlabs/Module/Directory.php:329
+msgid "Public Forum:"
msgstr ""
-#: ../../Zotlabs/Module/Connedit.php:764 ../../Zotlabs/Module/Connedit.php:769
-msgid "Optionally explain your rating"
+#: ../../Zotlabs/Module/Directory.php:332
+msgid "Keywords: "
msgstr ""
-#: ../../Zotlabs/Module/Connedit.php:766
-msgid "Custom Filter"
+#: ../../Zotlabs/Module/Directory.php:335
+msgid "Don't suggest"
msgstr ""
-#: ../../Zotlabs/Module/Connedit.php:767
-msgid "Only import posts with this text"
+#: ../../Zotlabs/Module/Directory.php:337
+msgid "Common connections:"
msgstr ""
-#: ../../Zotlabs/Module/Connedit.php:767 ../../Zotlabs/Module/Connedit.php:768
-msgid ""
-"words one per line or #tags or /patterns/ or lang=xx, leave blank to import "
-"all posts"
+#: ../../Zotlabs/Module/Directory.php:386
+msgid "Global Directory"
msgstr ""
-#: ../../Zotlabs/Module/Connedit.php:768
-msgid "Do not import posts with this text"
+#: ../../Zotlabs/Module/Directory.php:386
+msgid "Local Directory"
msgstr ""
-#: ../../Zotlabs/Module/Connedit.php:770
-msgid "This information is public!"
+#: ../../Zotlabs/Module/Directory.php:392
+msgid "Finding:"
msgstr ""
-#: ../../Zotlabs/Module/Connedit.php:775
-msgid "Connection Pending Approval"
+#: ../../Zotlabs/Module/Directory.php:395 ../../Zotlabs/Module/Suggest.php:64
+#: ../../include/contact_widgets.php:24
+msgid "Channel Suggestions"
msgstr ""
-#: ../../Zotlabs/Module/Connedit.php:778
-#: ../../Zotlabs/Module/Settings/Tokens.php:163
-msgid "inherited"
+#: ../../Zotlabs/Module/Directory.php:397
+msgid "next page"
msgstr ""
-#: ../../Zotlabs/Module/Connedit.php:780
-#, php-format
-msgid ""
-"Please choose the profile you would like to display to %s when viewing your "
-"profile securely."
+#: ../../Zotlabs/Module/Directory.php:397
+msgid "previous page"
msgstr ""
-#: ../../Zotlabs/Module/Connedit.php:782
-#: ../../Zotlabs/Module/Settings/Tokens.php:160
-msgid "Their Settings"
+#: ../../Zotlabs/Module/Directory.php:398
+msgid "Sort options"
msgstr ""
-#: ../../Zotlabs/Module/Connedit.php:783
-#: ../../Zotlabs/Module/Settings/Tokens.php:161
-msgid "My Settings"
+#: ../../Zotlabs/Module/Directory.php:399
+msgid "Alphabetic"
msgstr ""
-#: ../../Zotlabs/Module/Connedit.php:785
-#: ../../Zotlabs/Module/Settings/Tokens.php:165
-msgid "Individual Permissions"
+#: ../../Zotlabs/Module/Directory.php:400
+msgid "Reverse Alphabetic"
msgstr ""
-#: ../../Zotlabs/Module/Connedit.php:786
-#: ../../Zotlabs/Module/Settings/Tokens.php:166
-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."
+#: ../../Zotlabs/Module/Directory.php:401
+msgid "Newest to Oldest"
msgstr ""
-#: ../../Zotlabs/Module/Connedit.php:787
-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."
+#: ../../Zotlabs/Module/Directory.php:402
+msgid "Oldest to Newest"
msgstr ""
-#: ../../Zotlabs/Module/Connedit.php:788
-msgid "Last update:"
+#: ../../Zotlabs/Module/Directory.php:419
+msgid "No entries (some entries may be hidden)."
msgstr ""
-#: ../../Zotlabs/Module/Fbrowser.php:29 ../../Zotlabs/Lib/Apps.php:222
-#: ../../include/conversation.php:1672 ../../include/nav.php:95
-msgid "Photos"
+#: ../../Zotlabs/Module/Group.php:24
+msgid "Privacy group created."
+msgstr ""
+
+#: ../../Zotlabs/Module/Group.php:30
+msgid "Could not create privacy group."
+msgstr ""
+
+#: ../../Zotlabs/Module/Group.php:42 ../../Zotlabs/Module/Group.php:141
+#: ../../include/items.php:3944
+msgid "Privacy group not found."
+msgstr ""
+
+#: ../../Zotlabs/Module/Group.php:58
+msgid "Privacy group updated."
+msgstr ""
+
+#: ../../Zotlabs/Module/Group.php:90
+msgid "Create a group of channels."
+msgstr ""
+
+#: ../../Zotlabs/Module/Group.php:91 ../../Zotlabs/Module/Group.php:184
+msgid "Privacy group name: "
+msgstr ""
+
+#: ../../Zotlabs/Module/Group.php:93 ../../Zotlabs/Module/Group.php:187
+msgid "Members are visible to other channels"
+msgstr ""
+
+#: ../../Zotlabs/Module/Group.php:111
+msgid "Privacy group removed."
+msgstr ""
+
+#: ../../Zotlabs/Module/Group.php:113
+msgid "Unable to remove privacy group."
+msgstr ""
+
+#: ../../Zotlabs/Module/Group.php:183
+msgid "Privacy group editor"
+msgstr ""
+
+#: ../../Zotlabs/Module/Group.php:197
+msgid "Members"
+msgstr ""
+
+#: ../../Zotlabs/Module/Group.php:199
+msgid "All Connected Channels"
+msgstr ""
+
+#: ../../Zotlabs/Module/Group.php:231
+msgid "Click on a channel to add or remove."
msgstr ""
#: ../../Zotlabs/Module/Impel.php:41 ../../include/bbcode.php:203
@@ -4228,22 +3332,22 @@ msgstr ""
msgid "Use this form to import existing posts and content from an export file."
msgstr ""
-#: ../../Zotlabs/Module/Api.php:60 ../../Zotlabs/Module/Api.php:81
-msgid "Authorize application connection"
+#: ../../Zotlabs/Module/Channel.php:32 ../../Zotlabs/Module/Wiki.php:20
+#: ../../Zotlabs/Module/Chat.php:25
+#: ../../extend/addon/addon/chess/chess.php:400
+msgid "You must be logged in to see this page."
msgstr ""
-#: ../../Zotlabs/Module/Api.php:61
-msgid "Return to your app and insert this Security Code:"
+#: ../../Zotlabs/Module/Channel.php:44
+msgid "Posts and comments"
msgstr ""
-#: ../../Zotlabs/Module/Api.php:71
-msgid "Please login to continue."
+#: ../../Zotlabs/Module/Channel.php:45
+msgid "Only posts"
msgstr ""
-#: ../../Zotlabs/Module/Api.php:83
-msgid ""
-"Do you want to authorize this application to access your posts and contacts, "
-"and/or create new posts for you?"
+#: ../../Zotlabs/Module/Channel.php:103
+msgid "Insufficient permissions. Request redirected to profile page."
msgstr ""
#: ../../Zotlabs/Module/Locs.php:25 ../../Zotlabs/Module/Locs.php:54
@@ -4294,6 +3398,74 @@ msgstr ""
msgid "Use this form to drop the location if the hub is no longer operating."
msgstr ""
+#: ../../Zotlabs/Module/Admin.php:94
+msgid "# Accounts"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin.php:95
+msgid "# blocked accounts"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin.php:96
+msgid "# expired accounts"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin.php:97
+msgid "# expiring accounts"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin.php:108
+msgid "# Channels"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin.php:109
+msgid "# primary"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin.php:110
+msgid "# clones"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin.php:116
+msgid "Message queues"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin.php:133
+msgid "Your software should be updated"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin.php:138
+msgid "Summary"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin.php:141
+msgid "Registered accounts"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin.php:142
+msgid "Pending registrations"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin.php:143
+msgid "Registered channels"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin.php:144
+msgid "Active plugins"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin.php:145
+msgid "Version"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin.php:146
+msgid "Repository version (master)"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin.php:147
+msgid "Repository version (dev)"
+msgstr ""
+
#: ../../Zotlabs/Module/Like.php:19
msgid "Like/Dislike"
msgstr ""
@@ -4333,16 +3505,22 @@ msgstr ""
#: ../../Zotlabs/Module/Tagger.php:47
#: ../../extend/addon/addon/diaspora/inbound.php:1786
#: ../../extend/addon/addon/redphotos/redphotohelper.php:74
-#: ../../include/conversation.php:120 ../../include/text.php:1984
+#: ../../include/text.php:1984 ../../include/conversation.php:120
msgid "photo"
msgstr ""
#: ../../Zotlabs/Module/Like.php:370 ../../Zotlabs/Module/Subthread.php:87
#: ../../extend/addon/addon/diaspora/inbound.php:1786
-#: ../../include/conversation.php:148 ../../include/text.php:1990
+#: ../../include/text.php:1990 ../../include/conversation.php:148
msgid "status"
msgstr ""
+#: ../../Zotlabs/Module/Like.php:372 ../../Zotlabs/Module/Events.php:255
+#: ../../Zotlabs/Module/Tagger.php:51 ../../include/event.php:961
+#: ../../include/text.php:1987 ../../include/conversation.php:123
+msgid "event"
+msgstr ""
+
#: ../../Zotlabs/Module/Like.php:419
#: ../../extend/addon/addon/diaspora/inbound.php:1815
#: ../../include/conversation.php:164
@@ -4553,24 +3731,6 @@ msgstr ""
msgid "Set your current mood and tell your friends"
msgstr ""
-#: ../../Zotlabs/Module/Dirsearch.php:25 ../../Zotlabs/Module/Regdir.php:49
-msgid "This site is not a directory server"
-msgstr ""
-
-#: ../../Zotlabs/Module/Dirsearch.php:33
-msgid "This directory server requires an access token"
-msgstr ""
-
-#: ../../Zotlabs/Module/Notify.php:57
-#: ../../Zotlabs/Module/Notifications.php:35
-msgid "No more system notifications."
-msgstr ""
-
-#: ../../Zotlabs/Module/Notify.php:61
-#: ../../Zotlabs/Module/Notifications.php:39
-msgid "System Notifications"
-msgstr ""
-
#: ../../Zotlabs/Module/Dreport.php:45
msgid "Invalid message"
msgstr ""
@@ -4636,22 +3796,776 @@ msgstr ""
msgid "Redeliver"
msgstr ""
-#: ../../Zotlabs/Module/Search.php:216
+#: ../../Zotlabs/Module/Notify.php:57
+#: ../../Zotlabs/Module/Notifications.php:35
+msgid "No more system notifications."
+msgstr ""
+
+#: ../../Zotlabs/Module/Notify.php:61
+#: ../../Zotlabs/Module/Notifications.php:39
+msgid "System Notifications"
+msgstr ""
+
+#: ../../Zotlabs/Module/Editpost.php:35
+msgid "Item is not editable"
+msgstr ""
+
+#: ../../Zotlabs/Module/Photos.php:82
+msgid "Page owner information could not be retrieved."
+msgstr ""
+
+#: ../../Zotlabs/Module/Photos.php:97 ../../Zotlabs/Module/Photos.php:734
+#: ../../Zotlabs/Module/Profile_photo.php:115
+#: ../../Zotlabs/Module/Profile_photo.php:219
+#: ../../extend/addon/addon/openclipatar/openclipatar.php:225
+#: ../../include/photo/photo_driver.php:728
+msgid "Profile Photos"
+msgstr ""
+
+#: ../../Zotlabs/Module/Photos.php:103 ../../Zotlabs/Module/Photos.php:129
+msgid "Album not found."
+msgstr ""
+
+#: ../../Zotlabs/Module/Photos.php:112
+msgid "Delete Album"
+msgstr ""
+
+#: ../../Zotlabs/Module/Photos.php:133
+msgid ""
+"Multiple storage folders exist with this album name, but within different "
+"directories. Please remove the desired folder or folders using the Files "
+"manager"
+msgstr ""
+
+#: ../../Zotlabs/Module/Photos.php:190 ../../Zotlabs/Module/Photos.php:1059
+msgid "Delete Photo"
+msgstr ""
+
+#: ../../Zotlabs/Module/Photos.php:520
+msgid "No photos selected"
+msgstr ""
+
+#: ../../Zotlabs/Module/Photos.php:569
+msgid "Access to this item is restricted."
+msgstr ""
+
+#: ../../Zotlabs/Module/Photos.php:608
#, php-format
-msgid "Items tagged with: %s"
+msgid "%1$.2f MB of %2$.2f MB photo storage used."
msgstr ""
-#: ../../Zotlabs/Module/Search.php:218
+#: ../../Zotlabs/Module/Photos.php:611
#, php-format
-msgid "Search results for: %s"
+msgid "%1$.2f MB photo storage used."
msgstr ""
-#: ../../Zotlabs/Module/Lockview.php:75
-msgid "Remote privacy information not available."
+#: ../../Zotlabs/Module/Photos.php:647
+msgid "Upload Photos"
msgstr ""
-#: ../../Zotlabs/Module/Lockview.php:96
-msgid "Visible to:"
+#: ../../Zotlabs/Module/Photos.php:651
+msgid "Enter an album name"
+msgstr ""
+
+#: ../../Zotlabs/Module/Photos.php:652
+msgid "or select an existing album (doubleclick)"
+msgstr ""
+
+#: ../../Zotlabs/Module/Photos.php:653
+msgid "Create a status post for this upload"
+msgstr ""
+
+#: ../../Zotlabs/Module/Photos.php:654
+msgid "Caption (optional):"
+msgstr ""
+
+#: ../../Zotlabs/Module/Photos.php:655
+msgid "Description (optional):"
+msgstr ""
+
+#: ../../Zotlabs/Module/Photos.php:686
+msgid "Album name could not be decoded"
+msgstr ""
+
+#: ../../Zotlabs/Module/Photos.php:734
+msgid "Contact Photos"
+msgstr ""
+
+#: ../../Zotlabs/Module/Photos.php:757
+msgid "Show Newest First"
+msgstr ""
+
+#: ../../Zotlabs/Module/Photos.php:759
+msgid "Show Oldest First"
+msgstr ""
+
+#: ../../Zotlabs/Module/Photos.php:783 ../../Zotlabs/Module/Photos.php:1337
+#: ../../Zotlabs/Module/Embedphotos.php:139 ../../include/widgets.php:1676
+msgid "View Photo"
+msgstr ""
+
+#: ../../Zotlabs/Module/Photos.php:814
+#: ../../Zotlabs/Module/Embedphotos.php:155 ../../include/widgets.php:1693
+msgid "Edit Album"
+msgstr ""
+
+#: ../../Zotlabs/Module/Photos.php:861
+msgid "Permission denied. Access to this item may be restricted."
+msgstr ""
+
+#: ../../Zotlabs/Module/Photos.php:863
+msgid "Photo not available"
+msgstr ""
+
+#: ../../Zotlabs/Module/Photos.php:921
+msgid "Use as profile photo"
+msgstr ""
+
+#: ../../Zotlabs/Module/Photos.php:922
+msgid "Use as cover photo"
+msgstr ""
+
+#: ../../Zotlabs/Module/Photos.php:929
+msgid "Private Photo"
+msgstr ""
+
+#: ../../Zotlabs/Module/Photos.php:940 ../../Zotlabs/Module/Events.php:677
+#: ../../Zotlabs/Module/Events.php:686 ../../Zotlabs/Module/Cal.php:332
+#: ../../Zotlabs/Module/Cal.php:339
+#: ../../extend/addon/addon/cdav/Mod_Cdav.php:842
+msgid "Previous"
+msgstr ""
+
+#: ../../Zotlabs/Module/Photos.php:944
+msgid "View Full Size"
+msgstr ""
+
+#: ../../Zotlabs/Module/Photos.php:949 ../../Zotlabs/Module/Setup.php:270
+#: ../../Zotlabs/Module/Events.php:678 ../../Zotlabs/Module/Events.php:687
+#: ../../Zotlabs/Module/Cal.php:333 ../../Zotlabs/Module/Cal.php:340
+#: ../../extend/addon/addon/cdav/Mod_Cdav.php:843
+msgid "Next"
+msgstr ""
+
+#: ../../Zotlabs/Module/Photos.php:1033
+msgid "Edit photo"
+msgstr ""
+
+#: ../../Zotlabs/Module/Photos.php:1035
+msgid "Rotate CW (right)"
+msgstr ""
+
+#: ../../Zotlabs/Module/Photos.php:1036
+msgid "Rotate CCW (left)"
+msgstr ""
+
+#: ../../Zotlabs/Module/Photos.php:1039
+msgid "Move photo to album"
+msgstr ""
+
+#: ../../Zotlabs/Module/Photos.php:1040
+msgid "Enter a new album name"
+msgstr ""
+
+#: ../../Zotlabs/Module/Photos.php:1041
+msgid "or select an existing one (doubleclick)"
+msgstr ""
+
+#: ../../Zotlabs/Module/Photos.php:1044
+msgid "Caption"
+msgstr ""
+
+#: ../../Zotlabs/Module/Photos.php:1046
+msgid "Add a Tag"
+msgstr ""
+
+#: ../../Zotlabs/Module/Photos.php:1054
+msgid "Example: @bob, @Barbara_Jensen, @jim@example.com"
+msgstr ""
+
+#: ../../Zotlabs/Module/Photos.php:1057
+msgid "Flag as adult in album view"
+msgstr ""
+
+#: ../../Zotlabs/Module/Photos.php:1076 ../../Zotlabs/Lib/ThreadItem.php:268
+msgid "I like this (toggle)"
+msgstr ""
+
+#: ../../Zotlabs/Module/Photos.php:1077 ../../Zotlabs/Lib/ThreadItem.php:269
+msgid "I don't like this (toggle)"
+msgstr ""
+
+#: ../../Zotlabs/Module/Photos.php:1078 ../../Zotlabs/Module/Blocks.php:161
+#: ../../Zotlabs/Module/Layouts.php:193 ../../Zotlabs/Module/Webpages.php:241
+#: ../../extend/addon/addon/cdav/include/widgets.php:123
+#: ../../include/conversation.php:1232
+msgid "Share"
+msgstr ""
+
+#: ../../Zotlabs/Module/Photos.php:1079 ../../Zotlabs/Lib/ThreadItem.php:405
+#: ../../include/conversation.php:741
+msgid "Please wait"
+msgstr ""
+
+#: ../../Zotlabs/Module/Photos.php:1095 ../../Zotlabs/Module/Photos.php:1213
+#: ../../Zotlabs/Lib/ThreadItem.php:722
+msgid "This is you"
+msgstr ""
+
+#: ../../Zotlabs/Module/Photos.php:1097 ../../Zotlabs/Module/Photos.php:1215
+#: ../../Zotlabs/Lib/ThreadItem.php:724 ../../include/js_strings.php:6
+msgid "Comment"
+msgstr ""
+
+#: ../../Zotlabs/Module/Photos.php:1099 ../../Zotlabs/Module/Events.php:475
+#: ../../Zotlabs/Module/Webpages.php:247 ../../Zotlabs/Lib/ThreadItem.php:734
+#: ../../include/page_widgets.php:43 ../../include/conversation.php:1201
+msgid "Preview"
+msgstr ""
+
+#: ../../Zotlabs/Module/Photos.php:1113 ../../include/conversation.php:577
+msgctxt "title"
+msgid "Likes"
+msgstr ""
+
+#: ../../Zotlabs/Module/Photos.php:1113 ../../include/conversation.php:577
+msgctxt "title"
+msgid "Dislikes"
+msgstr ""
+
+#: ../../Zotlabs/Module/Photos.php:1114 ../../include/conversation.php:578
+msgctxt "title"
+msgid "Agree"
+msgstr ""
+
+#: ../../Zotlabs/Module/Photos.php:1114 ../../include/conversation.php:578
+msgctxt "title"
+msgid "Disagree"
+msgstr ""
+
+#: ../../Zotlabs/Module/Photos.php:1114 ../../include/conversation.php:578
+msgctxt "title"
+msgid "Abstain"
+msgstr ""
+
+#: ../../Zotlabs/Module/Photos.php:1115 ../../include/conversation.php:579
+msgctxt "title"
+msgid "Attending"
+msgstr ""
+
+#: ../../Zotlabs/Module/Photos.php:1115 ../../include/conversation.php:579
+msgctxt "title"
+msgid "Not attending"
+msgstr ""
+
+#: ../../Zotlabs/Module/Photos.php:1115 ../../include/conversation.php:579
+msgctxt "title"
+msgid "Might attend"
+msgstr ""
+
+#: ../../Zotlabs/Module/Photos.php:1132 ../../Zotlabs/Module/Photos.php:1144
+#: ../../Zotlabs/Lib/ThreadItem.php:186 ../../Zotlabs/Lib/ThreadItem.php:198
+#: ../../include/conversation.php:1767
+msgid "View all"
+msgstr ""
+
+#: ../../Zotlabs/Module/Photos.php:1136 ../../Zotlabs/Lib/ThreadItem.php:190
+#: ../../include/channel.php:1190 ../../include/taxonomy.php:403
+#: ../../include/conversation.php:1791
+msgctxt "noun"
+msgid "Like"
+msgid_plural "Likes"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../../Zotlabs/Module/Photos.php:1141 ../../Zotlabs/Lib/ThreadItem.php:195
+#: ../../include/conversation.php:1794
+msgctxt "noun"
+msgid "Dislike"
+msgid_plural "Dislikes"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../../Zotlabs/Module/Photos.php:1241
+msgid "Photo Tools"
+msgstr ""
+
+#: ../../Zotlabs/Module/Photos.php:1250
+msgid "In This Photo:"
+msgstr ""
+
+#: ../../Zotlabs/Module/Photos.php:1255
+msgid "Map"
+msgstr ""
+
+#: ../../Zotlabs/Module/Photos.php:1263 ../../Zotlabs/Lib/ThreadItem.php:394
+msgctxt "noun"
+msgid "Likes"
+msgstr ""
+
+#: ../../Zotlabs/Module/Photos.php:1264 ../../Zotlabs/Lib/ThreadItem.php:395
+msgctxt "noun"
+msgid "Dislikes"
+msgstr ""
+
+#: ../../Zotlabs/Module/Photos.php:1269 ../../Zotlabs/Lib/ThreadItem.php:400
+#: ../../include/acl_selectors.php:210
+msgid "Close"
+msgstr ""
+
+#: ../../Zotlabs/Module/Photos.php:1343
+msgid "View Album"
+msgstr ""
+
+#: ../../Zotlabs/Module/Photos.php:1354 ../../Zotlabs/Module/Photos.php:1367
+#: ../../Zotlabs/Module/Photos.php:1368
+msgid "Recent Photos"
+msgstr ""
+
+#: ../../Zotlabs/Module/Setup.php:182
+msgid "$Projectname Server - Setup"
+msgstr ""
+
+#: ../../Zotlabs/Module/Setup.php:186
+msgid "Could not connect to database."
+msgstr ""
+
+#: ../../Zotlabs/Module/Setup.php:190
+msgid ""
+"Could not connect to specified site URL. Possible SSL certificate or DNS "
+"issue."
+msgstr ""
+
+#: ../../Zotlabs/Module/Setup.php:197
+msgid "Could not create table."
+msgstr ""
+
+#: ../../Zotlabs/Module/Setup.php:202
+msgid "Your site database has been installed."
+msgstr ""
+
+#: ../../Zotlabs/Module/Setup.php:206
+msgid ""
+"You may need to import the file \"install/schema_xxx.sql\" manually using a "
+"database client."
+msgstr ""
+
+#: ../../Zotlabs/Module/Setup.php:207 ../../Zotlabs/Module/Setup.php:269
+#: ../../Zotlabs/Module/Setup.php:740
+msgid "Please see the file \"install/INSTALL.txt\"."
+msgstr ""
+
+#: ../../Zotlabs/Module/Setup.php:266
+msgid "System check"
+msgstr ""
+
+#: ../../Zotlabs/Module/Setup.php:271
+msgid "Check again"
+msgstr ""
+
+#: ../../Zotlabs/Module/Setup.php:293
+msgid "Database connection"
+msgstr ""
+
+#: ../../Zotlabs/Module/Setup.php:294
+msgid ""
+"In order to install $Projectname we need to know how to connect to your "
+"database."
+msgstr ""
+
+#: ../../Zotlabs/Module/Setup.php:295
+msgid ""
+"Please contact your hosting provider or site administrator if you have "
+"questions about these settings."
+msgstr ""
+
+#: ../../Zotlabs/Module/Setup.php:296
+msgid ""
+"The database you specify below should already exist. If it does not, please "
+"create it before continuing."
+msgstr ""
+
+#: ../../Zotlabs/Module/Setup.php:300
+msgid "Database Server Name"
+msgstr ""
+
+#: ../../Zotlabs/Module/Setup.php:300
+msgid "Default is 127.0.0.1"
+msgstr ""
+
+#: ../../Zotlabs/Module/Setup.php:301
+msgid "Database Port"
+msgstr ""
+
+#: ../../Zotlabs/Module/Setup.php:301
+msgid "Communication port number - use 0 for default"
+msgstr ""
+
+#: ../../Zotlabs/Module/Setup.php:302
+msgid "Database Login Name"
+msgstr ""
+
+#: ../../Zotlabs/Module/Setup.php:303
+msgid "Database Login Password"
+msgstr ""
+
+#: ../../Zotlabs/Module/Setup.php:304
+msgid "Database Name"
+msgstr ""
+
+#: ../../Zotlabs/Module/Setup.php:305
+msgid "Database Type"
+msgstr ""
+
+#: ../../Zotlabs/Module/Setup.php:307 ../../Zotlabs/Module/Setup.php:353
+msgid "Site administrator email address"
+msgstr ""
+
+#: ../../Zotlabs/Module/Setup.php:307 ../../Zotlabs/Module/Setup.php:353
+msgid ""
+"Your account email address must match this in order to use the web admin "
+"panel."
+msgstr ""
+
+#: ../../Zotlabs/Module/Setup.php:308 ../../Zotlabs/Module/Setup.php:355
+msgid "Website URL"
+msgstr ""
+
+#: ../../Zotlabs/Module/Setup.php:308 ../../Zotlabs/Module/Setup.php:355
+msgid "Please use SSL (https) URL if available."
+msgstr ""
+
+#: ../../Zotlabs/Module/Setup.php:309 ../../Zotlabs/Module/Setup.php:359
+msgid "Please select a default timezone for your website"
+msgstr ""
+
+#: ../../Zotlabs/Module/Setup.php:342
+msgid "Site settings"
+msgstr ""
+
+#: ../../Zotlabs/Module/Setup.php:398
+msgid "PHP version 5.5 or greater is required."
+msgstr ""
+
+#: ../../Zotlabs/Module/Setup.php:399
+msgid "PHP version"
+msgstr ""
+
+#: ../../Zotlabs/Module/Setup.php:414
+msgid "Could not find a command line version of PHP in the web server PATH."
+msgstr ""
+
+#: ../../Zotlabs/Module/Setup.php:415
+msgid ""
+"If you don't have a command line version of PHP installed on server, you "
+"will not be able to run background polling via cron."
+msgstr ""
+
+#: ../../Zotlabs/Module/Setup.php:419
+msgid "PHP executable path"
+msgstr ""
+
+#: ../../Zotlabs/Module/Setup.php:419
+msgid ""
+"Enter full path to php executable. You can leave this blank to continue the "
+"installation."
+msgstr ""
+
+#: ../../Zotlabs/Module/Setup.php:424
+msgid "Command line PHP"
+msgstr ""
+
+#: ../../Zotlabs/Module/Setup.php:433
+msgid ""
+"The command line version of PHP on your system does not have "
+"\"register_argc_argv\" enabled."
+msgstr ""
+
+#: ../../Zotlabs/Module/Setup.php:434
+msgid "This is required for message delivery to work."
+msgstr ""
+
+#: ../../Zotlabs/Module/Setup.php:437
+msgid "PHP register_argc_argv"
+msgstr ""
+
+#: ../../Zotlabs/Module/Setup.php:455
+#, php-format
+msgid ""
+"Your max allowed total upload size is set to %s. Maximum size of one file to "
+"upload is set to %s. You are allowed to upload up to %d files at once."
+msgstr ""
+
+#: ../../Zotlabs/Module/Setup.php:460
+msgid "You can adjust these settings in the servers php.ini."
+msgstr ""
+
+#: ../../Zotlabs/Module/Setup.php:462
+msgid "PHP upload limits"
+msgstr ""
+
+#: ../../Zotlabs/Module/Setup.php:485
+msgid ""
+"Error: the \"openssl_pkey_new\" function on this system is not able to "
+"generate encryption keys"
+msgstr ""
+
+#: ../../Zotlabs/Module/Setup.php:486
+msgid ""
+"If running under Windows, please see \"http://www.php.net/manual/en/openssl."
+"installation.php\"."
+msgstr ""
+
+#: ../../Zotlabs/Module/Setup.php:489
+msgid "Generate encryption keys"
+msgstr ""
+
+#: ../../Zotlabs/Module/Setup.php:501
+msgid "libCurl PHP module"
+msgstr ""
+
+#: ../../Zotlabs/Module/Setup.php:502
+msgid "GD graphics PHP module"
+msgstr ""
+
+#: ../../Zotlabs/Module/Setup.php:503
+msgid "OpenSSL PHP module"
+msgstr ""
+
+#: ../../Zotlabs/Module/Setup.php:504
+msgid "mysqli or postgres PHP module"
+msgstr ""
+
+#: ../../Zotlabs/Module/Setup.php:505
+msgid "mb_string PHP module"
+msgstr ""
+
+#: ../../Zotlabs/Module/Setup.php:506
+msgid "xml PHP module"
+msgstr ""
+
+#: ../../Zotlabs/Module/Setup.php:510 ../../Zotlabs/Module/Setup.php:512
+msgid "Apache mod_rewrite module"
+msgstr ""
+
+#: ../../Zotlabs/Module/Setup.php:510
+msgid ""
+"Error: Apache webserver mod-rewrite module is required but not installed."
+msgstr ""
+
+#: ../../Zotlabs/Module/Setup.php:516 ../../Zotlabs/Module/Setup.php:519
+msgid "proc_open"
+msgstr ""
+
+#: ../../Zotlabs/Module/Setup.php:516
+msgid ""
+"Error: proc_open is required but is either not installed or has been "
+"disabled in php.ini"
+msgstr ""
+
+#: ../../Zotlabs/Module/Setup.php:524
+msgid "Error: libCURL PHP module required but not installed."
+msgstr ""
+
+#: ../../Zotlabs/Module/Setup.php:528
+msgid ""
+"Error: GD graphics PHP module with JPEG support required but not installed."
+msgstr ""
+
+#: ../../Zotlabs/Module/Setup.php:532
+msgid "Error: openssl PHP module required but not installed."
+msgstr ""
+
+#: ../../Zotlabs/Module/Setup.php:536
+msgid ""
+"Error: mysqli or postgres PHP module required but neither are installed."
+msgstr ""
+
+#: ../../Zotlabs/Module/Setup.php:540
+msgid "Error: mb_string PHP module required but not installed."
+msgstr ""
+
+#: ../../Zotlabs/Module/Setup.php:544
+msgid "Error: xml PHP module required for DAV but not installed."
+msgstr ""
+
+#: ../../Zotlabs/Module/Setup.php:562
+msgid ""
+"The web installer needs to be able to create a file called \".htconfig.php\" "
+"in the top folder of your web server and it is unable to do so."
+msgstr ""
+
+#: ../../Zotlabs/Module/Setup.php:563
+msgid ""
+"This is most often a permission setting, as the web server may not be able "
+"to write files in your folder - even if you can."
+msgstr ""
+
+#: ../../Zotlabs/Module/Setup.php:564
+msgid ""
+"At the end of this procedure, we will give you a text to save in a file "
+"named .htconfig.php in your Red top folder."
+msgstr ""
+
+#: ../../Zotlabs/Module/Setup.php:565
+msgid ""
+"You can alternatively skip this procedure and perform a manual installation. "
+"Please see the file \"install/INSTALL.txt\" for instructions."
+msgstr ""
+
+#: ../../Zotlabs/Module/Setup.php:568
+msgid ".htconfig.php is writable"
+msgstr ""
+
+#: ../../Zotlabs/Module/Setup.php:582
+msgid ""
+"Red uses the Smarty3 template engine to render its web views. Smarty3 "
+"compiles templates to PHP to speed up rendering."
+msgstr ""
+
+#: ../../Zotlabs/Module/Setup.php:583
+#, php-format
+msgid ""
+"In order to store these compiled templates, the web server needs to have "
+"write access to the directory %s under the top level web folder."
+msgstr ""
+
+#: ../../Zotlabs/Module/Setup.php:584 ../../Zotlabs/Module/Setup.php:605
+msgid ""
+"Please ensure that the user that your web server runs as (e.g. www-data) has "
+"write access to this folder."
+msgstr ""
+
+#: ../../Zotlabs/Module/Setup.php:585
+#, php-format
+msgid ""
+"Note: as a security measure, you should give the web server write access to "
+"%s only--not the template files (.tpl) that it contains."
+msgstr ""
+
+#: ../../Zotlabs/Module/Setup.php:588
+#, php-format
+msgid "%s is writable"
+msgstr ""
+
+#: ../../Zotlabs/Module/Setup.php:604
+msgid ""
+"This software uses the store directory to save uploaded files. The web "
+"server needs to have write access to the store directory under the Red top "
+"level folder"
+msgstr ""
+
+#: ../../Zotlabs/Module/Setup.php:608
+msgid "store is writable"
+msgstr ""
+
+#: ../../Zotlabs/Module/Setup.php:641
+msgid ""
+"SSL certificate cannot be validated. Fix certificate or disable https access "
+"to this site."
+msgstr ""
+
+#: ../../Zotlabs/Module/Setup.php:642
+msgid ""
+"If you have https access to your website or allow connections to TCP port "
+"443 (the https: port), you MUST use a browser-valid certificate. You MUST "
+"NOT use self-signed certificates!"
+msgstr ""
+
+#: ../../Zotlabs/Module/Setup.php:643
+msgid ""
+"This restriction is incorporated because public posts from you may for "
+"example contain references to images on your own hub."
+msgstr ""
+
+#: ../../Zotlabs/Module/Setup.php:644
+msgid ""
+"If your certificate is not recognized, members of other sites (who may "
+"themselves have valid certificates) will get a warning message on their own "
+"site complaining about security issues."
+msgstr ""
+
+#: ../../Zotlabs/Module/Setup.php:645
+msgid ""
+"This can cause usability issues elsewhere (not just on your own site) so we "
+"must insist on this requirement."
+msgstr ""
+
+#: ../../Zotlabs/Module/Setup.php:646
+msgid ""
+"Providers are available that issue free certificates which are browser-valid."
+msgstr ""
+
+#: ../../Zotlabs/Module/Setup.php:648
+msgid ""
+"If you are confident that the certificate is valid and signed by a trusted "
+"authority, check to see if you have failed to install an intermediate cert. "
+"These are not normally required by browsers, but are required for server-to-"
+"server communications."
+msgstr ""
+
+#: ../../Zotlabs/Module/Setup.php:650
+msgid "SSL certificate validation"
+msgstr ""
+
+#: ../../Zotlabs/Module/Setup.php:656
+msgid ""
+"Url rewrite in .htaccess is not working. Check your server configuration."
+"Test: "
+msgstr ""
+
+#: ../../Zotlabs/Module/Setup.php:659
+msgid "Url rewrite is working"
+msgstr ""
+
+#: ../../Zotlabs/Module/Setup.php:673
+msgid ""
+"The database configuration file \".htconfig.php\" could not be written. "
+"Please use the enclosed text to create a configuration file in your web "
+"server root."
+msgstr ""
+
+#: ../../Zotlabs/Module/Setup.php:697
+#: ../../extend/addon/addon/cdav/cdav.php:40
+#: ../../extend/addon/addon/rendezvous/rendezvous.php:355
+msgid "Errors encountered creating database tables."
+msgstr ""
+
+#: ../../Zotlabs/Module/Setup.php:738
+msgid "<h1>What next</h1>"
+msgstr ""
+
+#: ../../Zotlabs/Module/Setup.php:739
+msgid ""
+"IMPORTANT: You will need to [manually] setup a scheduled task for the poller."
+msgstr ""
+
+#: ../../Zotlabs/Module/Network.php:95
+msgid "No such group"
+msgstr ""
+
+#: ../../Zotlabs/Module/Network.php:135
+msgid "No such channel"
+msgstr ""
+
+#: ../../Zotlabs/Module/Network.php:140
+msgid "forum"
+msgstr ""
+
+#: ../../Zotlabs/Module/Network.php:152
+msgid "Search Results For:"
+msgstr ""
+
+#: ../../Zotlabs/Module/Network.php:218
+msgid "Privacy group is empty"
+msgstr ""
+
+#: ../../Zotlabs/Module/Network.php:227
+msgid "Privacy group: "
+msgstr ""
+
+#: ../../Zotlabs/Module/Network.php:253
+msgid "Invalid connection."
msgstr ""
#: ../../Zotlabs/Module/New_channel.php:140
@@ -4723,6 +4637,10 @@ msgstr ""
msgid "Subject:"
msgstr ""
+#: ../../Zotlabs/Module/Mail.php:241 ../../Zotlabs/Module/Invite.php:138
+msgid "Your message:"
+msgstr ""
+
#: ../../Zotlabs/Module/Mail.php:243 ../../Zotlabs/Module/Mail.php:368
#: ../../include/conversation.php:1244
msgid "Attach file"
@@ -4811,12 +4729,69 @@ msgstr ""
msgid "Make this post private"
msgstr ""
-#: ../../Zotlabs/Module/Help.php:23
-msgid "Documentation Search"
+#: ../../Zotlabs/Module/Invite.php:29
+msgid "Total invitation limit exceeded."
msgstr ""
-#: ../../Zotlabs/Module/Help.php:51
-msgid "$Projectname Documentation"
+#: ../../Zotlabs/Module/Invite.php:53
+#, php-format
+msgid "%s : Not a valid email address."
+msgstr ""
+
+#: ../../Zotlabs/Module/Invite.php:67
+msgid "Please join us on $Projectname"
+msgstr ""
+
+#: ../../Zotlabs/Module/Invite.php:77
+msgid "Invitation limit exceeded. Please contact your site administrator."
+msgstr ""
+
+#: ../../Zotlabs/Module/Invite.php:82
+#, php-format
+msgid "%s : Message delivery failed."
+msgstr ""
+
+#: ../../Zotlabs/Module/Invite.php:86
+#, php-format
+msgid "%d message sent."
+msgid_plural "%d messages sent."
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../../Zotlabs/Module/Invite.php:105
+msgid "You have no more invitations available"
+msgstr ""
+
+#: ../../Zotlabs/Module/Invite.php:136
+msgid "Send invitations"
+msgstr ""
+
+#: ../../Zotlabs/Module/Invite.php:137
+msgid "Enter email addresses, one per line:"
+msgstr ""
+
+#: ../../Zotlabs/Module/Invite.php:139
+msgid "Please join my community on $Projectname."
+msgstr ""
+
+#: ../../Zotlabs/Module/Invite.php:141
+msgid "You will need to supply this invitation code:"
+msgstr ""
+
+#: ../../Zotlabs/Module/Invite.php:142
+msgid "1. Register at any $Projectname location (they are all inter-connected)"
+msgstr ""
+
+#: ../../Zotlabs/Module/Invite.php:144
+msgid "2. Enter my $Projectname network address into the site searchbar."
+msgstr ""
+
+#: ../../Zotlabs/Module/Invite.php:145
+msgid "or visit"
+msgstr ""
+
+#: ../../Zotlabs/Module/Invite.php:147
+msgid "3. Click [Connect]"
msgstr ""
#: ../../Zotlabs/Module/Oexchange.php:27
@@ -4900,11 +4875,6 @@ msgstr ""
msgid "Site Administrators"
msgstr ""
-#: ../../Zotlabs/Module/Blocks.php:97 ../../Zotlabs/Module/Blocks.php:155
-#: ../../Zotlabs/Module/Editblock.php:108
-msgid "Block Name"
-msgstr ""
-
#: ../../Zotlabs/Module/Blocks.php:154 ../../include/text.php:2311
msgid "Blocks"
msgstr ""
@@ -4913,11 +4883,10 @@ msgstr ""
msgid "Block Title"
msgstr ""
-#: ../../Zotlabs/Module/Blocks.php:161 ../../Zotlabs/Module/Layouts.php:193
-#: ../../Zotlabs/Module/Photos.php:1078 ../../Zotlabs/Module/Webpages.php:241
-#: ../../extend/addon/addon/cdav/include/widgets.php:123
-#: ../../include/conversation.php:1232
-msgid "Share"
+#: ../../Zotlabs/Module/Blocks.php:166 ../../Zotlabs/Module/Layouts.php:197
+#: ../../Zotlabs/Module/Events.php:682 ../../Zotlabs/Module/Pubsites.php:59
+#: ../../Zotlabs/Module/Webpages.php:246 ../../include/page_widgets.php:42
+msgid "View"
msgstr ""
#: ../../Zotlabs/Module/Layouts.php:183 ../../include/text.php:2313
@@ -4925,8 +4894,8 @@ msgid "Layouts"
msgstr ""
#: ../../Zotlabs/Module/Layouts.php:185 ../../Zotlabs/Lib/Apps.php:225
-#: ../../include/nav.php:164 ../../include/help.php:53
-#: ../../include/help.php:58
+#: ../../include/help.php:53 ../../include/help.php:58
+#: ../../include/nav.php:164
msgid "Help"
msgstr ""
@@ -4942,6 +4911,11 @@ msgstr ""
msgid "Download PDL file"
msgstr ""
+#: ../../Zotlabs/Module/Rate.php:155 ../../Zotlabs/Module/Connedit.php:762
+#: ../../include/js_strings.php:20
+msgid "Rating"
+msgstr ""
+
#: ../../Zotlabs/Module/Rate.php:156
msgid "Website:"
msgstr ""
@@ -4959,23 +4933,6 @@ msgstr ""
msgid "Optionally explain your rating (this information is public)"
msgstr ""
-#: ../../Zotlabs/Module/Cal.php:69
-msgid "Permissions denied."
-msgstr ""
-
-#: ../../Zotlabs/Module/Cal.php:337 ../../include/text.php:2335
-msgid "Import"
-msgstr ""
-
-#: ../../Zotlabs/Module/Profile_photo.php:115
-#: ../../Zotlabs/Module/Profile_photo.php:212
-#: ../../Zotlabs/Module/Profile_photo.php:311
-#: ../../Zotlabs/Module/Photos.php:97 ../../Zotlabs/Module/Photos.php:734
-#: ../../extend/addon/addon/openclipatar/openclipatar.php:225
-#: ../../include/photo/photo_driver.php:728
-msgid "Profile Photos"
-msgstr ""
-
#: ../../Zotlabs/Module/Profile_photo.php:186
#: ../../extend/addon/addon/openclipatar/openclipatar.php:293
msgid ""
@@ -4983,36 +4940,18 @@ msgid ""
"display immediately."
msgstr ""
-#: ../../Zotlabs/Module/Profile_photo.php:389
-msgid "Upload Profile Photo"
-msgstr ""
-
-#: ../../Zotlabs/Module/Network.php:95
-msgid "No such group"
-msgstr ""
-
-#: ../../Zotlabs/Module/Network.php:135
-msgid "No such channel"
-msgstr ""
-
-#: ../../Zotlabs/Module/Network.php:140
-msgid "forum"
-msgstr ""
-
-#: ../../Zotlabs/Module/Network.php:152
-msgid "Search Results For:"
+#: ../../Zotlabs/Module/Profile_photo.php:409
+msgid "Use Photo for Profile"
msgstr ""
-#: ../../Zotlabs/Module/Network.php:218
-msgid "Privacy group is empty"
-msgstr ""
-
-#: ../../Zotlabs/Module/Network.php:227
-msgid "Privacy group: "
+#: ../../Zotlabs/Module/Profile_photo.php:409
+msgid "Upload Profile Photo"
msgstr ""
-#: ../../Zotlabs/Module/Network.php:253
-msgid "Invalid connection."
+#: ../../Zotlabs/Module/Profile_photo.php:410
+#: ../../extend/addon/addon/openclipatar/openclipatar.php:181
+#: ../../extend/addon/addon/openclipatar/openclipatar.php:193
+msgid "Use"
msgstr ""
#: ../../Zotlabs/Module/Common.php:14
@@ -5027,293 +4966,187 @@ msgstr ""
msgid "No connections in common."
msgstr ""
-#: ../../Zotlabs/Module/Editblock.php:124 ../../include/conversation.php:1260
-msgid "Title (optional)"
-msgstr ""
-
-#: ../../Zotlabs/Module/Editblock.php:133
-msgid "Edit Block"
-msgstr ""
-
-#: ../../Zotlabs/Module/Editpost.php:35
-msgid "Item is not editable"
-msgstr ""
-
-#: ../../Zotlabs/Module/Photos.php:82
-msgid "Page owner information could not be retrieved."
-msgstr ""
-
-#: ../../Zotlabs/Module/Photos.php:103 ../../Zotlabs/Module/Photos.php:129
-msgid "Album not found."
-msgstr ""
-
-#: ../../Zotlabs/Module/Photos.php:112
-msgid "Delete Album"
-msgstr ""
-
-#: ../../Zotlabs/Module/Photos.php:133
-msgid ""
-"Multiple storage folders exist with this album name, but within different "
-"directories. Please remove the desired folder or folders using the Files "
-"manager"
-msgstr ""
-
-#: ../../Zotlabs/Module/Photos.php:190 ../../Zotlabs/Module/Photos.php:1059
-msgid "Delete Photo"
-msgstr ""
-
-#: ../../Zotlabs/Module/Photos.php:520
-msgid "No photos selected"
-msgstr ""
-
-#: ../../Zotlabs/Module/Photos.php:569
-msgid "Access to this item is restricted."
-msgstr ""
-
-#: ../../Zotlabs/Module/Photos.php:608
-#, php-format
-msgid "%1$.2f MB of %2$.2f MB photo storage used."
-msgstr ""
-
-#: ../../Zotlabs/Module/Photos.php:611
-#, php-format
-msgid "%1$.2f MB photo storage used."
-msgstr ""
-
-#: ../../Zotlabs/Module/Photos.php:647
-msgid "Upload Photos"
-msgstr ""
-
-#: ../../Zotlabs/Module/Photos.php:651
-msgid "Enter an album name"
-msgstr ""
-
-#: ../../Zotlabs/Module/Photos.php:652
-msgid "or select an existing album (doubleclick)"
-msgstr ""
-
-#: ../../Zotlabs/Module/Photos.php:653
-msgid "Create a status post for this upload"
-msgstr ""
-
-#: ../../Zotlabs/Module/Photos.php:654
-msgid "Caption (optional):"
-msgstr ""
-
-#: ../../Zotlabs/Module/Photos.php:655
-msgid "Description (optional):"
-msgstr ""
-
-#: ../../Zotlabs/Module/Photos.php:686
-msgid "Album name could not be decoded"
-msgstr ""
-
-#: ../../Zotlabs/Module/Photos.php:734
-msgid "Contact Photos"
+#: ../../Zotlabs/Module/Events.php:25
+msgid "Calendar entries imported."
msgstr ""
-#: ../../Zotlabs/Module/Photos.php:757
-msgid "Show Newest First"
+#: ../../Zotlabs/Module/Events.php:27
+msgid "No calendar entries found."
msgstr ""
-#: ../../Zotlabs/Module/Photos.php:759
-msgid "Show Oldest First"
+#: ../../Zotlabs/Module/Events.php:104
+msgid "Event can not end before it has started."
msgstr ""
-#: ../../Zotlabs/Module/Photos.php:783 ../../Zotlabs/Module/Photos.php:1337
-#: ../../Zotlabs/Module/Embedphotos.php:139 ../../include/widgets.php:1676
-msgid "View Photo"
+#: ../../Zotlabs/Module/Events.php:106 ../../Zotlabs/Module/Events.php:115
+#: ../../Zotlabs/Module/Events.php:137
+msgid "Unable to generate preview."
msgstr ""
-#: ../../Zotlabs/Module/Photos.php:814
-#: ../../Zotlabs/Module/Embedphotos.php:155 ../../include/widgets.php:1693
-msgid "Edit Album"
+#: ../../Zotlabs/Module/Events.php:113
+msgid "Event title and start time are required."
msgstr ""
-#: ../../Zotlabs/Module/Photos.php:861
-msgid "Permission denied. Access to this item may be restricted."
+#: ../../Zotlabs/Module/Events.php:135 ../../Zotlabs/Module/Events.php:260
+msgid "Event not found."
msgstr ""
-#: ../../Zotlabs/Module/Photos.php:863
-msgid "Photo not available"
+#: ../../Zotlabs/Module/Events.php:454
+msgid "Edit event title"
msgstr ""
-#: ../../Zotlabs/Module/Photos.php:921
-msgid "Use as profile photo"
+#: ../../Zotlabs/Module/Events.php:454
+#: ../../extend/addon/addon/cdav/Mod_Cdav.php:831
+msgid "Event title"
msgstr ""
-#: ../../Zotlabs/Module/Photos.php:922
-msgid "Use as cover photo"
+#: ../../Zotlabs/Module/Events.php:456
+msgid "Categories (comma-separated list)"
msgstr ""
-#: ../../Zotlabs/Module/Photos.php:929
-msgid "Private Photo"
+#: ../../Zotlabs/Module/Events.php:457
+msgid "Edit Category"
msgstr ""
-#: ../../Zotlabs/Module/Photos.php:944
-msgid "View Full Size"
+#: ../../Zotlabs/Module/Events.php:457
+msgid "Category"
msgstr ""
-#: ../../Zotlabs/Module/Photos.php:1033
-msgid "Edit photo"
+#: ../../Zotlabs/Module/Events.php:460
+msgid "Edit start date and time"
msgstr ""
-#: ../../Zotlabs/Module/Photos.php:1035
-msgid "Rotate CW (right)"
+#: ../../Zotlabs/Module/Events.php:460
+#: ../../extend/addon/addon/cdav/Mod_Cdav.php:832
+msgid "Start date and time"
msgstr ""
-#: ../../Zotlabs/Module/Photos.php:1036
-msgid "Rotate CCW (left)"
+#: ../../Zotlabs/Module/Events.php:461 ../../Zotlabs/Module/Events.php:464
+msgid "Finish date and time are not known or not relevant"
msgstr ""
-#: ../../Zotlabs/Module/Photos.php:1039
-msgid "Move photo to album"
+#: ../../Zotlabs/Module/Events.php:463
+msgid "Edit finish date and time"
msgstr ""
-#: ../../Zotlabs/Module/Photos.php:1040
-msgid "Enter a new album name"
+#: ../../Zotlabs/Module/Events.php:463
+msgid "Finish date and time"
msgstr ""
-#: ../../Zotlabs/Module/Photos.php:1041
-msgid "or select an existing one (doubleclick)"
+#: ../../Zotlabs/Module/Events.php:465 ../../Zotlabs/Module/Events.php:466
+msgid "Adjust for viewer timezone"
msgstr ""
-#: ../../Zotlabs/Module/Photos.php:1044
-msgid "Caption"
+#: ../../Zotlabs/Module/Events.php:465
+msgid ""
+"Important for events that happen in a particular place. Not practical for "
+"global holidays."
msgstr ""
-#: ../../Zotlabs/Module/Photos.php:1046
-msgid "Add a Tag"
+#: ../../Zotlabs/Module/Events.php:467
+msgid "Edit Description"
msgstr ""
-#: ../../Zotlabs/Module/Photos.php:1054
-msgid "Example: @bob, @Barbara_Jensen, @jim@example.com"
+#: ../../Zotlabs/Module/Events.php:469
+msgid "Edit Location"
msgstr ""
-#: ../../Zotlabs/Module/Photos.php:1057
-msgid "Flag as adult in album view"
+#: ../../Zotlabs/Module/Events.php:472 ../../Zotlabs/Module/Events.php:474
+msgid "Share this event"
msgstr ""
-#: ../../Zotlabs/Module/Photos.php:1076 ../../Zotlabs/Lib/ThreadItem.php:268
-msgid "I like this (toggle)"
+#: ../../Zotlabs/Module/Events.php:476 ../../include/conversation.php:1264
+msgid "Permission settings"
msgstr ""
-#: ../../Zotlabs/Module/Photos.php:1077 ../../Zotlabs/Lib/ThreadItem.php:269
-msgid "I don't like this (toggle)"
+#: ../../Zotlabs/Module/Events.php:487
+msgid "Advanced Options"
msgstr ""
-#: ../../Zotlabs/Module/Photos.php:1079 ../../Zotlabs/Lib/ThreadItem.php:405
-#: ../../include/conversation.php:741
-msgid "Please wait"
+#: ../../Zotlabs/Module/Events.php:599 ../../Zotlabs/Module/Cal.php:259
+msgid "l, F j"
msgstr ""
-#: ../../Zotlabs/Module/Photos.php:1095 ../../Zotlabs/Module/Photos.php:1213
-#: ../../Zotlabs/Lib/ThreadItem.php:722
-msgid "This is you"
+#: ../../Zotlabs/Module/Events.php:621
+msgid "Edit event"
msgstr ""
-#: ../../Zotlabs/Module/Photos.php:1097 ../../Zotlabs/Module/Photos.php:1215
-#: ../../Zotlabs/Lib/ThreadItem.php:724 ../../include/js_strings.php:6
-msgid "Comment"
+#: ../../Zotlabs/Module/Events.php:623
+msgid "Delete event"
msgstr ""
-#: ../../Zotlabs/Module/Photos.php:1113 ../../include/conversation.php:577
-msgctxt "title"
-msgid "Likes"
+#: ../../Zotlabs/Module/Events.php:648 ../../Zotlabs/Module/Cal.php:308
+#: ../../include/text.php:1792
+msgid "Link to Source"
msgstr ""
-#: ../../Zotlabs/Module/Photos.php:1113 ../../include/conversation.php:577
-msgctxt "title"
-msgid "Dislikes"
+#: ../../Zotlabs/Module/Events.php:657
+msgid "calendar"
msgstr ""
-#: ../../Zotlabs/Module/Photos.php:1114 ../../include/conversation.php:578
-msgctxt "title"
-msgid "Agree"
+#: ../../Zotlabs/Module/Events.php:676 ../../Zotlabs/Module/Cal.php:331
+msgid "Edit Event"
msgstr ""
-#: ../../Zotlabs/Module/Photos.php:1114 ../../include/conversation.php:578
-msgctxt "title"
-msgid "Disagree"
+#: ../../Zotlabs/Module/Events.php:676 ../../Zotlabs/Module/Cal.php:331
+msgid "Create Event"
msgstr ""
-#: ../../Zotlabs/Module/Photos.php:1114 ../../include/conversation.php:578
-msgctxt "title"
-msgid "Abstain"
+#: ../../Zotlabs/Module/Events.php:679 ../../Zotlabs/Module/Cal.php:334
+msgid "Export"
msgstr ""
-#: ../../Zotlabs/Module/Photos.php:1115 ../../include/conversation.php:579
-msgctxt "title"
-msgid "Attending"
+#: ../../Zotlabs/Module/Events.php:683
+#: ../../extend/addon/addon/cdav/Mod_Cdav.php:845
+msgid "Month"
msgstr ""
-#: ../../Zotlabs/Module/Photos.php:1115 ../../include/conversation.php:579
-msgctxt "title"
-msgid "Not attending"
+#: ../../Zotlabs/Module/Events.php:684
+#: ../../extend/addon/addon/cdav/Mod_Cdav.php:846
+msgid "Week"
msgstr ""
-#: ../../Zotlabs/Module/Photos.php:1115 ../../include/conversation.php:579
-msgctxt "title"
-msgid "Might attend"
+#: ../../Zotlabs/Module/Events.php:685
+#: ../../extend/addon/addon/cdav/Mod_Cdav.php:847
+msgid "Day"
msgstr ""
-#: ../../Zotlabs/Module/Photos.php:1132 ../../Zotlabs/Module/Photos.php:1144
-#: ../../Zotlabs/Lib/ThreadItem.php:186 ../../Zotlabs/Lib/ThreadItem.php:198
-#: ../../include/conversation.php:1763
-msgid "View all"
+#: ../../Zotlabs/Module/Events.php:688 ../../Zotlabs/Module/Cal.php:341
+#: ../../extend/addon/addon/cdav/Mod_Cdav.php:844
+msgid "Today"
msgstr ""
-#: ../../Zotlabs/Module/Photos.php:1136 ../../Zotlabs/Lib/ThreadItem.php:190
-#: ../../include/channel.php:1190 ../../include/conversation.php:1787
-#: ../../include/taxonomy.php:403
-msgctxt "noun"
-msgid "Like"
-msgid_plural "Likes"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../../Zotlabs/Module/Photos.php:1141 ../../Zotlabs/Lib/ThreadItem.php:195
-#: ../../include/conversation.php:1790
-msgctxt "noun"
-msgid "Dislike"
-msgid_plural "Dislikes"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../../Zotlabs/Module/Photos.php:1241
-msgid "Photo Tools"
+#: ../../Zotlabs/Module/Events.php:719
+msgid "Event removed"
msgstr ""
-#: ../../Zotlabs/Module/Photos.php:1250
-msgid "In This Photo:"
+#: ../../Zotlabs/Module/Events.php:722
+msgid "Failed to remove event"
msgstr ""
-#: ../../Zotlabs/Module/Photos.php:1255
-msgid "Map"
+#: ../../Zotlabs/Module/Fbrowser.php:29 ../../Zotlabs/Lib/Apps.php:222
+#: ../../include/nav.php:95 ../../include/conversation.php:1676
+msgid "Photos"
msgstr ""
-#: ../../Zotlabs/Module/Photos.php:1263 ../../Zotlabs/Lib/ThreadItem.php:394
-msgctxt "noun"
-msgid "Likes"
+#: ../../Zotlabs/Module/Ping.php:254
+msgid "sent you a private message"
msgstr ""
-#: ../../Zotlabs/Module/Photos.php:1264 ../../Zotlabs/Lib/ThreadItem.php:395
-msgctxt "noun"
-msgid "Dislikes"
+#: ../../Zotlabs/Module/Ping.php:302
+msgid "added your channel"
msgstr ""
-#: ../../Zotlabs/Module/Photos.php:1269 ../../Zotlabs/Lib/ThreadItem.php:400
-#: ../../include/acl_selectors.php:210
-msgid "Close"
+#: ../../Zotlabs/Module/Ping.php:312
+msgid "g A l F d"
msgstr ""
-#: ../../Zotlabs/Module/Photos.php:1343
-msgid "View Album"
+#: ../../Zotlabs/Module/Ping.php:334
+msgid "[today]"
msgstr ""
-#: ../../Zotlabs/Module/Photos.php:1354 ../../Zotlabs/Module/Photos.php:1367
-#: ../../Zotlabs/Module/Photos.php:1368
-msgid "Recent Photos"
+#: ../../Zotlabs/Module/Ping.php:343
+msgid "posted an event"
msgstr ""
#: ../../Zotlabs/Module/Lostpass.php:19
@@ -5555,26 +5388,6 @@ msgid ""
"or restore these in date order (oldest first)."
msgstr ""
-#: ../../Zotlabs/Module/Ping.php:254
-msgid "sent you a private message"
-msgstr ""
-
-#: ../../Zotlabs/Module/Ping.php:302
-msgid "added your channel"
-msgstr ""
-
-#: ../../Zotlabs/Module/Ping.php:312
-msgid "g A l F d"
-msgstr ""
-
-#: ../../Zotlabs/Module/Ping.php:334
-msgid "[today]"
-msgstr ""
-
-#: ../../Zotlabs/Module/Ping.php:343
-msgid "posted an event"
-msgstr ""
-
#: ../../Zotlabs/Module/Pubsites.php:24 ../../include/widgets.php:1391
msgid "Public Hubs"
msgstr ""
@@ -5612,22 +5425,293 @@ msgstr ""
msgid "Rate"
msgstr ""
-#: ../../Zotlabs/Module/Channel.php:32 ../../Zotlabs/Module/Wiki.php:20
-#: ../../Zotlabs/Module/Chat.php:25
-#: ../../extend/addon/addon/chess/chess.php:400
-msgid "You must be logged in to see this page."
+#: ../../Zotlabs/Module/Connedit.php:80
+msgid "Could not access contact record."
msgstr ""
-#: ../../Zotlabs/Module/Channel.php:44
-msgid "Posts and comments"
+#: ../../Zotlabs/Module/Connedit.php:104
+msgid "Could not locate selected profile."
msgstr ""
-#: ../../Zotlabs/Module/Channel.php:45
-msgid "Only posts"
+#: ../../Zotlabs/Module/Connedit.php:256
+msgid "Connection updated."
msgstr ""
-#: ../../Zotlabs/Module/Channel.php:103
-msgid "Insufficient permissions. Request redirected to profile page."
+#: ../../Zotlabs/Module/Connedit.php:258
+msgid "Failed to update connection record."
+msgstr ""
+
+#: ../../Zotlabs/Module/Connedit.php:308
+msgid "is now connected to"
+msgstr ""
+
+#: ../../Zotlabs/Module/Connedit.php:440
+msgid "Could not access address book record."
+msgstr ""
+
+#: ../../Zotlabs/Module/Connedit.php:460
+msgid "Refresh failed - channel is currently unavailable."
+msgstr ""
+
+#: ../../Zotlabs/Module/Connedit.php:475 ../../Zotlabs/Module/Connedit.php:484
+#: ../../Zotlabs/Module/Connedit.php:493 ../../Zotlabs/Module/Connedit.php:502
+#: ../../Zotlabs/Module/Connedit.php:515
+msgid "Unable to set address book parameters."
+msgstr ""
+
+#: ../../Zotlabs/Module/Connedit.php:538
+msgid "Connection has been removed."
+msgstr ""
+
+#: ../../Zotlabs/Module/Connedit.php:554 ../../Zotlabs/Lib/Apps.php:221
+#: ../../extend/addon/addon/openclipatar/openclipatar.php:56
+#: ../../include/nav.php:89 ../../include/conversation.php:953
+msgid "View Profile"
+msgstr ""
+
+#: ../../Zotlabs/Module/Connedit.php:557
+#, php-format
+msgid "View %s's profile"
+msgstr ""
+
+#: ../../Zotlabs/Module/Connedit.php:561
+msgid "Refresh Permissions"
+msgstr ""
+
+#: ../../Zotlabs/Module/Connedit.php:564
+msgid "Fetch updated permissions"
+msgstr ""
+
+#: ../../Zotlabs/Module/Connedit.php:568
+msgid "Recent Activity"
+msgstr ""
+
+#: ../../Zotlabs/Module/Connedit.php:571
+msgid "View recent posts and comments"
+msgstr ""
+
+#: ../../Zotlabs/Module/Connedit.php:578
+msgid "Block (or Unblock) all communications with this connection"
+msgstr ""
+
+#: ../../Zotlabs/Module/Connedit.php:579
+msgid "This connection is blocked!"
+msgstr ""
+
+#: ../../Zotlabs/Module/Connedit.php:583
+msgid "Unignore"
+msgstr ""
+
+#: ../../Zotlabs/Module/Connedit.php:586
+msgid "Ignore (or Unignore) all inbound communications from this connection"
+msgstr ""
+
+#: ../../Zotlabs/Module/Connedit.php:587
+msgid "This connection is ignored!"
+msgstr ""
+
+#: ../../Zotlabs/Module/Connedit.php:591
+msgid "Unarchive"
+msgstr ""
+
+#: ../../Zotlabs/Module/Connedit.php:591
+msgid "Archive"
+msgstr ""
+
+#: ../../Zotlabs/Module/Connedit.php:594
+msgid ""
+"Archive (or Unarchive) this connection - mark channel dead but keep content"
+msgstr ""
+
+#: ../../Zotlabs/Module/Connedit.php:595
+msgid "This connection is archived!"
+msgstr ""
+
+#: ../../Zotlabs/Module/Connedit.php:599
+msgid "Unhide"
+msgstr ""
+
+#: ../../Zotlabs/Module/Connedit.php:599
+msgid "Hide"
+msgstr ""
+
+#: ../../Zotlabs/Module/Connedit.php:602
+msgid "Hide or Unhide this connection from your other connections"
+msgstr ""
+
+#: ../../Zotlabs/Module/Connedit.php:603
+msgid "This connection is hidden!"
+msgstr ""
+
+#: ../../Zotlabs/Module/Connedit.php:610
+msgid "Delete this connection"
+msgstr ""
+
+#: ../../Zotlabs/Module/Connedit.php:625 ../../include/widgets.php:529
+msgid "Me"
+msgstr ""
+
+#: ../../Zotlabs/Module/Connedit.php:626 ../../include/widgets.php:530
+msgid "Family"
+msgstr ""
+
+#: ../../Zotlabs/Module/Connedit.php:627
+#: ../../Zotlabs/Module/Settings/Channel.php:61
+#: ../../Zotlabs/Module/Settings/Channel.php:65
+#: ../../Zotlabs/Module/Settings/Channel.php:66
+#: ../../Zotlabs/Module/Settings/Channel.php:69
+#: ../../Zotlabs/Module/Settings/Channel.php:80 ../../include/channel.php:402
+#: ../../include/channel.php:403 ../../include/channel.php:410
+#: ../../include/selectors.php:123 ../../include/widgets.php:531
+msgid "Friends"
+msgstr ""
+
+#: ../../Zotlabs/Module/Connedit.php:628 ../../include/widgets.php:532
+msgid "Acquaintances"
+msgstr ""
+
+#: ../../Zotlabs/Module/Connedit.php:686
+msgid "Approve this connection"
+msgstr ""
+
+#: ../../Zotlabs/Module/Connedit.php:686
+msgid "Accept connection to allow communication"
+msgstr ""
+
+#: ../../Zotlabs/Module/Connedit.php:691
+msgid "Set Affinity"
+msgstr ""
+
+#: ../../Zotlabs/Module/Connedit.php:694
+msgid "Set Profile"
+msgstr ""
+
+#: ../../Zotlabs/Module/Connedit.php:697
+msgid "Set Affinity & Profile"
+msgstr ""
+
+#: ../../Zotlabs/Module/Connedit.php:746
+msgid "none"
+msgstr ""
+
+#: ../../Zotlabs/Module/Connedit.php:750 ../../include/widgets.php:656
+msgid "Connection Default Permissions"
+msgstr ""
+
+#: ../../Zotlabs/Module/Connedit.php:750 ../../include/items.php:3977
+#, php-format
+msgid "Connection: %s"
+msgstr ""
+
+#: ../../Zotlabs/Module/Connedit.php:751
+msgid "Apply these permissions automatically"
+msgstr ""
+
+#: ../../Zotlabs/Module/Connedit.php:751
+msgid "Connection requests will be approved without your interaction"
+msgstr ""
+
+#: ../../Zotlabs/Module/Connedit.php:753
+msgid "This connection's primary address is"
+msgstr ""
+
+#: ../../Zotlabs/Module/Connedit.php:754
+msgid "Available locations:"
+msgstr ""
+
+#: ../../Zotlabs/Module/Connedit.php:758
+msgid ""
+"The permissions indicated on this page will be applied to all new "
+"connections."
+msgstr ""
+
+#: ../../Zotlabs/Module/Connedit.php:759
+msgid "Connection Tools"
+msgstr ""
+
+#: ../../Zotlabs/Module/Connedit.php:761
+msgid "Slide to adjust your degree of friendship"
+msgstr ""
+
+#: ../../Zotlabs/Module/Connedit.php:763
+msgid "Slide to adjust your rating"
+msgstr ""
+
+#: ../../Zotlabs/Module/Connedit.php:764 ../../Zotlabs/Module/Connedit.php:769
+msgid "Optionally explain your rating"
+msgstr ""
+
+#: ../../Zotlabs/Module/Connedit.php:766
+msgid "Custom Filter"
+msgstr ""
+
+#: ../../Zotlabs/Module/Connedit.php:767
+msgid "Only import posts with this text"
+msgstr ""
+
+#: ../../Zotlabs/Module/Connedit.php:767 ../../Zotlabs/Module/Connedit.php:768
+msgid ""
+"words one per line or #tags or /patterns/ or lang=xx, leave blank to import "
+"all posts"
+msgstr ""
+
+#: ../../Zotlabs/Module/Connedit.php:768
+msgid "Do not import posts with this text"
+msgstr ""
+
+#: ../../Zotlabs/Module/Connedit.php:770
+msgid "This information is public!"
+msgstr ""
+
+#: ../../Zotlabs/Module/Connedit.php:775
+msgid "Connection Pending Approval"
+msgstr ""
+
+#: ../../Zotlabs/Module/Connedit.php:778
+#: ../../Zotlabs/Module/Settings/Tokens.php:163
+msgid "inherited"
+msgstr ""
+
+#: ../../Zotlabs/Module/Connedit.php:780
+#, php-format
+msgid ""
+"Please choose the profile you would like to display to %s when viewing your "
+"profile securely."
+msgstr ""
+
+#: ../../Zotlabs/Module/Connedit.php:782
+#: ../../Zotlabs/Module/Settings/Tokens.php:160
+msgid "Their Settings"
+msgstr ""
+
+#: ../../Zotlabs/Module/Connedit.php:783
+#: ../../Zotlabs/Module/Settings/Tokens.php:161
+msgid "My Settings"
+msgstr ""
+
+#: ../../Zotlabs/Module/Connedit.php:785
+#: ../../Zotlabs/Module/Settings/Tokens.php:165
+msgid "Individual Permissions"
+msgstr ""
+
+#: ../../Zotlabs/Module/Connedit.php:786
+#: ../../Zotlabs/Module/Settings/Tokens.php:166
+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."
+msgstr ""
+
+#: ../../Zotlabs/Module/Connedit.php:787
+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:788
+msgid "Last update:"
msgstr ""
#: ../../Zotlabs/Module/Service_limits.php:23
@@ -5651,7 +5735,7 @@ msgid "Export selected"
msgstr ""
#: ../../Zotlabs/Module/Webpages.php:237 ../../Zotlabs/Lib/Apps.php:218
-#: ../../include/conversation.php:1725 ../../include/nav.php:109
+#: ../../include/nav.php:109 ../../include/conversation.php:1729
msgid "Webpages"
msgstr ""
@@ -5737,8 +5821,8 @@ msgid "Not found"
msgstr ""
#: ../../Zotlabs/Module/Wiki.php:97 ../../Zotlabs/Lib/Apps.php:219
-#: ../../include/conversation.php:1735 ../../include/conversation.php:1738
#: ../../include/features.php:99 ../../include/nav.php:111
+#: ../../include/conversation.php:1739 ../../include/conversation.php:1742
msgid "Wiki"
msgstr ""
@@ -5911,8 +5995,8 @@ msgstr ""
msgid "post"
msgstr ""
-#: ../../Zotlabs/Module/Tagger.php:57 ../../include/conversation.php:150
-#: ../../include/text.php:1992
+#: ../../Zotlabs/Module/Tagger.php:57 ../../include/text.php:1992
+#: ../../include/conversation.php:150
msgid "comment"
msgstr ""
@@ -6660,72 +6744,12 @@ msgstr ""
msgid "Add Thing to your Profile"
msgstr ""
-#: ../../Zotlabs/Module/Admin.php:94
-msgid "# Accounts"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin.php:95
-msgid "# blocked accounts"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin.php:96
-msgid "# expired accounts"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin.php:97
-msgid "# expiring accounts"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin.php:108
-msgid "# Channels"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin.php:109
-msgid "# primary"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin.php:110
-msgid "# clones"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin.php:116
-msgid "Message queues"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin.php:133
-msgid "Your software should be updated"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin.php:138
-msgid "Summary"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin.php:141
-msgid "Registered accounts"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin.php:142
-msgid "Pending registrations"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin.php:143
-msgid "Registered channels"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin.php:144
-msgid "Active plugins"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin.php:145
-msgid "Version"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin.php:146
-msgid "Repository version (master)"
+#: ../../Zotlabs/Module/Cal.php:69
+msgid "Permissions denied."
msgstr ""
-#: ../../Zotlabs/Module/Admin.php:147
-msgid "Repository version (dev)"
+#: ../../Zotlabs/Module/Cal.php:337 ../../include/text.php:2335
+msgid "Import"
msgstr ""
#: ../../Zotlabs/Module/Viewconnections.php:65
@@ -6806,38 +6830,20 @@ msgstr ""
msgid "Lookup xchan beginning with (or webbie): "
msgstr ""
-#: ../../Zotlabs/Module/Item.php:182
-msgid "Unable to locate original post."
-msgstr ""
-
-#: ../../Zotlabs/Module/Item.php:435
-msgid "Empty post discarded."
-msgstr ""
-
-#: ../../Zotlabs/Module/Item.php:475
-msgid "Executable content type not permitted to this channel."
-msgstr ""
-
-#: ../../Zotlabs/Module/Item.php:855
-msgid "Duplicate post suppressed."
-msgstr ""
-
-#: ../../Zotlabs/Module/Item.php:990
-msgid "System error. Post not saved."
+#: ../../Zotlabs/Module/Match.php:26
+msgid "Profile Match"
msgstr ""
-#: ../../Zotlabs/Module/Item.php:1111
-msgid "Unable to obtain post information from database."
+#: ../../Zotlabs/Module/Match.php:35
+msgid "No keywords to match. Please add keywords to your default profile."
msgstr ""
-#: ../../Zotlabs/Module/Item.php:1118
-#, php-format
-msgid "You have reached your limit of %1$.0f top level posts."
+#: ../../Zotlabs/Module/Match.php:67
+msgid "is interested in:"
msgstr ""
-#: ../../Zotlabs/Module/Item.php:1125
-#, php-format
-msgid "You have reached your limit of %1$.0f webpages."
+#: ../../Zotlabs/Module/Match.php:74
+msgid "No matches"
msgstr ""
#: ../../Zotlabs/Lib/Chatroom.php:27
@@ -6860,69 +6866,6 @@ msgstr ""
msgid "Room is full"
msgstr ""
-#: ../../Zotlabs/Lib/PermissionDescription.php:31
-#: ../../include/acl_selectors.php:128
-msgid "Visible to your default audience"
-msgstr ""
-
-#: ../../Zotlabs/Lib/PermissionDescription.php:106
-#: ../../include/acl_selectors.php:191
-msgid "Only me"
-msgstr ""
-
-#: ../../Zotlabs/Lib/PermissionDescription.php:107
-msgid "Public"
-msgstr ""
-
-#: ../../Zotlabs/Lib/PermissionDescription.php:108
-msgid "Anybody in the $Projectname network"
-msgstr ""
-
-#: ../../Zotlabs/Lib/PermissionDescription.php:109
-#, php-format
-msgid "Any account on %s"
-msgstr ""
-
-#: ../../Zotlabs/Lib/PermissionDescription.php:110
-msgid "Any of my connections"
-msgstr ""
-
-#: ../../Zotlabs/Lib/PermissionDescription.php:111
-msgid "Only connections I specifically allow"
-msgstr ""
-
-#: ../../Zotlabs/Lib/PermissionDescription.php:112
-msgid "Anybody authenticated (could include visitors from other networks)"
-msgstr ""
-
-#: ../../Zotlabs/Lib/PermissionDescription.php:113
-msgid "Any connections including those who haven't yet been approved"
-msgstr ""
-
-#: ../../Zotlabs/Lib/PermissionDescription.php:152
-msgid ""
-"This is your default setting for the audience of your normal stream, and "
-"posts."
-msgstr ""
-
-#: ../../Zotlabs/Lib/PermissionDescription.php:153
-msgid ""
-"This is your default setting for who can view your default channel profile"
-msgstr ""
-
-#: ../../Zotlabs/Lib/PermissionDescription.php:154
-msgid "This is your default setting for who can view your connections"
-msgstr ""
-
-#: ../../Zotlabs/Lib/PermissionDescription.php:155
-msgid ""
-"This is your default setting for who can view your file storage and photos"
-msgstr ""
-
-#: ../../Zotlabs/Lib/PermissionDescription.php:156
-msgid "This is your default setting for the audience of your webpages"
-msgstr ""
-
#: ../../Zotlabs/Lib/Apps.php:205
msgid "Site Admin"
msgstr ""
@@ -6964,8 +6907,8 @@ msgstr ""
msgid "Channel Home"
msgstr ""
-#: ../../Zotlabs/Lib/Apps.php:223 ../../include/conversation.php:1689
-#: ../../include/conversation.php:1692 ../../include/nav.php:206
+#: ../../Zotlabs/Lib/Apps.php:223 ../../include/nav.php:206
+#: ../../include/conversation.php:1693 ../../include/conversation.php:1696
msgid "Events"
msgstr ""
@@ -7405,6 +7348,69 @@ msgstr ""
msgid "commented on %s's post"
msgstr ""
+#: ../../Zotlabs/Lib/PermissionDescription.php:34
+#: ../../include/acl_selectors.php:128
+msgid "Visible to your default audience"
+msgstr ""
+
+#: ../../Zotlabs/Lib/PermissionDescription.php:107
+#: ../../include/acl_selectors.php:191
+msgid "Only me"
+msgstr ""
+
+#: ../../Zotlabs/Lib/PermissionDescription.php:108
+msgid "Public"
+msgstr ""
+
+#: ../../Zotlabs/Lib/PermissionDescription.php:109
+msgid "Anybody in the $Projectname network"
+msgstr ""
+
+#: ../../Zotlabs/Lib/PermissionDescription.php:110
+#, php-format
+msgid "Any account on %s"
+msgstr ""
+
+#: ../../Zotlabs/Lib/PermissionDescription.php:111
+msgid "Any of my connections"
+msgstr ""
+
+#: ../../Zotlabs/Lib/PermissionDescription.php:112
+msgid "Only connections I specifically allow"
+msgstr ""
+
+#: ../../Zotlabs/Lib/PermissionDescription.php:113
+msgid "Anybody authenticated (could include visitors from other networks)"
+msgstr ""
+
+#: ../../Zotlabs/Lib/PermissionDescription.php:114
+msgid "Any connections including those who haven't yet been approved"
+msgstr ""
+
+#: ../../Zotlabs/Lib/PermissionDescription.php:150
+msgid ""
+"This is your default setting for the audience of your normal stream, and "
+"posts."
+msgstr ""
+
+#: ../../Zotlabs/Lib/PermissionDescription.php:151
+msgid ""
+"This is your default setting for who can view your default channel profile"
+msgstr ""
+
+#: ../../Zotlabs/Lib/PermissionDescription.php:152
+msgid "This is your default setting for who can view your connections"
+msgstr ""
+
+#: ../../Zotlabs/Lib/PermissionDescription.php:153
+msgid ""
+"This is your default setting for who can view your file storage and photos"
+msgstr ""
+
+#: ../../Zotlabs/Lib/PermissionDescription.php:154
+msgid "This is your default setting for the audience of your webpages"
+msgstr ""
+
#: ../../extend/addon/addon/adultphotoflag/adultphotoflag.php:24
msgid "Flag Adult Photos"
msgstr ""
@@ -8732,11 +8738,6 @@ msgstr ""
msgid "Drawn by: "
msgstr ""
-#: ../../extend/addon/addon/openclipatar/openclipatar.php:181
-#: ../../extend/addon/addon/openclipatar/openclipatar.php:193
-msgid "Use"
-msgstr ""
-
#: ../../extend/addon/addon/openclipatar/openclipatar.php:191
msgid "Or select from a free OpenClipart.org image:"
msgstr ""
@@ -10258,103 +10259,6 @@ msgstr ""
msgid "Cannot locate DNS info for database server '%s'"
msgstr ""
-#: ../../include/account.php:35
-msgid "Not a valid email address"
-msgstr ""
-
-#: ../../include/account.php:37
-msgid "Your email domain is not among those allowed on this site"
-msgstr ""
-
-#: ../../include/account.php:43
-msgid "Your email address is already registered at this site."
-msgstr ""
-
-#: ../../include/account.php:75
-msgid "An invitation is required."
-msgstr ""
-
-#: ../../include/account.php:79
-msgid "Invitation could not be verified."
-msgstr ""
-
-#: ../../include/account.php:130
-msgid "Please enter the required information."
-msgstr ""
-
-#: ../../include/account.php:198
-msgid "Failed to store account information."
-msgstr ""
-
-#: ../../include/account.php:263
-#, php-format
-msgid "Registration confirmation for %s"
-msgstr ""
-
-#: ../../include/account.php:330
-#, php-format
-msgid "Registration request at %s"
-msgstr ""
-
-#: ../../include/account.php:352
-msgid "your registration password"
-msgstr ""
-
-#: ../../include/account.php:358 ../../include/account.php:420
-#, php-format
-msgid "Registration details for %s"
-msgstr ""
-
-#: ../../include/account.php:431
-msgid "Account approved."
-msgstr ""
-
-#: ../../include/account.php:471
-#, php-format
-msgid "Registration revoked for %s"
-msgstr ""
-
-#: ../../include/account.php:756 ../../include/account.php:758
-msgid "Click here to upgrade."
-msgstr ""
-
-#: ../../include/account.php:764
-msgid "This action exceeds the limits set by your subscription plan."
-msgstr ""
-
-#: ../../include/account.php:769
-msgid "This action is not available under your subscription plan."
-msgstr ""
-
-#: ../../include/acl_selectors.php:198
-msgid "Who can see this?"
-msgstr ""
-
-#: ../../include/acl_selectors.php:199
-msgid "Custom selection"
-msgstr ""
-
-#: ../../include/acl_selectors.php:200
-msgid ""
-"Select \"Show\" to allow viewing. \"Don't show\" lets you override and limit "
-"the scope of \"Show\"."
-msgstr ""
-
-#: ../../include/acl_selectors.php:201
-msgid "Show"
-msgstr ""
-
-#: ../../include/acl_selectors.php:202
-msgid "Don't show"
-msgstr ""
-
-#: ../../include/acl_selectors.php:235
-#, 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/attach.php:248 ../../include/attach.php:336
msgid "Item was not found."
msgstr ""
@@ -10417,53 +10321,6 @@ msgstr ""
msgid "Empty path"
msgstr ""
-#: ../../include/bbcode.php:134 ../../include/bbcode.php:902
-#: ../../include/bbcode.php:905 ../../include/bbcode.php:910
-#: ../../include/bbcode.php:913 ../../include/bbcode.php:916
-#: ../../include/bbcode.php:919 ../../include/bbcode.php:924
-#: ../../include/bbcode.php:927 ../../include/bbcode.php:932
-#: ../../include/bbcode.php:935 ../../include/bbcode.php:938
-#: ../../include/bbcode.php:941
-msgid "Image/photo"
-msgstr ""
-
-#: ../../include/bbcode.php:173 ../../include/bbcode.php:952
-msgid "Encrypted content"
-msgstr ""
-
-#: ../../include/bbcode.php:189
-#, php-format
-msgid "Install %s element: "
-msgstr ""
-
-#: ../../include/bbcode.php:193
-#, php-format
-msgid ""
-"This post contains an installable %s element, however you lack permissions "
-"to install it on this site."
-msgstr ""
-
-#: ../../include/bbcode.php:272
-#, php-format
-msgid "%1$s wrote the following %2$s %3$s"
-msgstr ""
-
-#: ../../include/bbcode.php:349 ../../include/bbcode.php:357
-msgid "Click to open/close"
-msgstr ""
-
-#: ../../include/bbcode.php:357
-msgid "spoiler"
-msgstr ""
-
-#: ../../include/bbcode.php:633 ../../include/wiki.php:525
-msgid "Different viewers will see this text differently"
-msgstr ""
-
-#: ../../include/bbcode.php:890
-msgid "$1 wrote:"
-msgstr ""
-
#: ../../include/channel.php:33
msgid "Unable to obtain identity information from database"
msgstr ""
@@ -10610,350 +10467,461 @@ msgstr ""
msgid "Like this thing"
msgstr ""
-#: ../../include/conversation.php:204
-#, php-format
-msgid "%1$s is now connected with %2$s"
+#: ../../include/network.php:704
+msgid "view full size"
msgstr ""
-#: ../../include/conversation.php:239
+#: ../../include/network.php:1937
+msgid "Administrator"
+msgstr ""
+
+#: ../../include/network.php:1953
+msgid "No Subject"
+msgstr ""
+
+#: ../../include/network.php:2209
+msgid "OStatus"
+msgstr ""
+
+#: ../../include/network.php:2210
+msgid "GNU-Social"
+msgstr ""
+
+#: ../../include/network.php:2211
+msgid "RSS/Atom"
+msgstr ""
+
+#: ../../include/network.php:2214
+msgid "Facebook"
+msgstr ""
+
+#: ../../include/network.php:2215
+msgid "Zot"
+msgstr ""
+
+#: ../../include/network.php:2216
+msgid "LinkedIn"
+msgstr ""
+
+#: ../../include/network.php:2217
+msgid "XMPP/IM"
+msgstr ""
+
+#: ../../include/network.php:2218
+msgid "MySpace"
+msgstr ""
+
+#: ../../include/photos.php:114
#, php-format
-msgid "%1$s poked %2$s"
+msgid "Image exceeds website size limit of %lu bytes"
msgstr ""
-#: ../../include/conversation.php:243 ../../include/text.php:1081
-#: ../../include/text.php:1086
-msgid "poked"
+#: ../../include/photos.php:121
+msgid "Image file is empty."
msgstr ""
-#: ../../include/conversation.php:694
+#: ../../include/photos.php:259
+msgid "Photo storage failed."
+msgstr ""
+
+#: ../../include/photos.php:299
+msgid "a new photo"
+msgstr ""
+
+#: ../../include/photos.php:303
#, php-format
-msgid "View %s's profile @ %s"
+msgctxt "photo_upload"
+msgid "%1$s posted %2$s to %3$s"
msgstr ""
-#: ../../include/conversation.php:713
-msgid "Categories:"
+#: ../../include/photos.php:506 ../../include/conversation.php:1679
+msgid "Photo Albums"
msgstr ""
-#: ../../include/conversation.php:714
-msgid "Filed under:"
+#: ../../include/photos.php:510
+msgid "Upload New Photos"
msgstr ""
-#: ../../include/conversation.php:739
-msgid "View in context"
+#: ../../include/selectors.php:30
+msgid "Frequently"
msgstr ""
-#: ../../include/conversation.php:849
-msgid "remove"
+#: ../../include/selectors.php:31
+msgid "Hourly"
msgstr ""
-#: ../../include/conversation.php:853 ../../include/nav.php:252
-msgid "Loading..."
+#: ../../include/selectors.php:32
+msgid "Twice daily"
msgstr ""
-#: ../../include/conversation.php:854
-msgid "Delete Selected Items"
+#: ../../include/selectors.php:33
+msgid "Daily"
msgstr ""
-#: ../../include/conversation.php:947
-msgid "View Source"
+#: ../../include/selectors.php:34
+msgid "Weekly"
msgstr ""
-#: ../../include/conversation.php:948
-msgid "Follow Thread"
+#: ../../include/selectors.php:35
+msgid "Monthly"
msgstr ""
-#: ../../include/conversation.php:949
-msgid "Unfollow Thread"
+#: ../../include/selectors.php:49
+msgid "Currently Male"
msgstr ""
-#: ../../include/conversation.php:954
-msgid "Activity/Posts"
+#: ../../include/selectors.php:49
+msgid "Currently Female"
msgstr ""
-#: ../../include/conversation.php:956
-msgid "Edit Connection"
+#: ../../include/selectors.php:49
+msgid "Mostly Male"
msgstr ""
-#: ../../include/conversation.php:957
-msgid "Message"
+#: ../../include/selectors.php:49
+msgid "Mostly Female"
msgstr ""
-#: ../../include/conversation.php:1077
-#, php-format
-msgid "%s likes this."
+#: ../../include/selectors.php:49
+msgid "Transgender"
msgstr ""
-#: ../../include/conversation.php:1077
-#, php-format
-msgid "%s doesn't like this."
+#: ../../include/selectors.php:49
+msgid "Intersex"
msgstr ""
-#: ../../include/conversation.php:1081
-#, 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/selectors.php:49
+msgid "Transsexual"
+msgstr ""
-#: ../../include/conversation.php:1083
-#, 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/selectors.php:49
+msgid "Hermaphrodite"
+msgstr ""
-#: ../../include/conversation.php:1089
-msgid "and"
+#: ../../include/selectors.php:49
+msgid "Neuter"
msgstr ""
-#: ../../include/conversation.php:1092
-#, php-format
-msgid ", and %d other people"
-msgid_plural ", and %d other people"
-msgstr[0] ""
-msgstr[1] ""
+#: ../../include/selectors.php:49
+msgid "Non-specific"
+msgstr ""
-#: ../../include/conversation.php:1093
-#, php-format
-msgid "%s like this."
+#: ../../include/selectors.php:49
+msgid "Undecided"
msgstr ""
-#: ../../include/conversation.php:1093
-#, php-format
-msgid "%s don't like this."
+#: ../../include/selectors.php:85 ../../include/selectors.php:104
+msgid "Males"
msgstr ""
-#: ../../include/conversation.php:1136
-msgid "Set your location"
+#: ../../include/selectors.php:85 ../../include/selectors.php:104
+msgid "Females"
msgstr ""
-#: ../../include/conversation.php:1137
-msgid "Clear browser location"
+#: ../../include/selectors.php:85
+msgid "Gay"
msgstr ""
-#: ../../include/conversation.php:1185
-msgid "Tag term:"
+#: ../../include/selectors.php:85
+msgid "Lesbian"
msgstr ""
-#: ../../include/conversation.php:1186
-msgid "Where are you right now?"
+#: ../../include/selectors.php:85
+msgid "No Preference"
msgstr ""
-#: ../../include/conversation.php:1195
-msgid "Comments enabled"
+#: ../../include/selectors.php:85
+msgid "Bisexual"
msgstr ""
-#: ../../include/conversation.php:1196
-msgid "Comments disabled"
+#: ../../include/selectors.php:85
+msgid "Autosexual"
msgstr ""
-#: ../../include/conversation.php:1234
-msgid "Page link name"
+#: ../../include/selectors.php:85
+msgid "Abstinent"
msgstr ""
-#: ../../include/conversation.php:1237
-msgid "Post as"
+#: ../../include/selectors.php:85
+msgid "Virgin"
msgstr ""
-#: ../../include/conversation.php:1251
-msgid "Toggle voting"
+#: ../../include/selectors.php:85
+msgid "Deviant"
msgstr ""
-#: ../../include/conversation.php:1254
-msgid "Disable comments"
+#: ../../include/selectors.php:85
+msgid "Fetish"
msgstr ""
-#: ../../include/conversation.php:1255
-msgid "Toggle comments"
+#: ../../include/selectors.php:85
+msgid "Oodles"
msgstr ""
-#: ../../include/conversation.php:1263
-msgid "Categories (optional, comma-separated list)"
+#: ../../include/selectors.php:85
+msgid "Nonsexual"
msgstr ""
-#: ../../include/conversation.php:1286
-msgid "Other networks and post services"
+#: ../../include/selectors.php:123 ../../include/selectors.php:140
+msgid "Single"
msgstr ""
-#: ../../include/conversation.php:1292
-msgid "Set publish date"
+#: ../../include/selectors.php:123
+msgid "Lonely"
msgstr ""
-#: ../../include/conversation.php:1541
-msgid "Discover"
+#: ../../include/selectors.php:123
+msgid "Available"
msgstr ""
-#: ../../include/conversation.php:1544
-msgid "Imported public streams"
+#: ../../include/selectors.php:123
+msgid "Unavailable"
msgstr ""
-#: ../../include/conversation.php:1549
-msgid "Commented Order"
+#: ../../include/selectors.php:123
+msgid "Has crush"
msgstr ""
-#: ../../include/conversation.php:1552
-msgid "Sort by Comment Date"
+#: ../../include/selectors.php:123
+msgid "Infatuated"
msgstr ""
-#: ../../include/conversation.php:1556
-msgid "Posted Order"
+#: ../../include/selectors.php:123 ../../include/selectors.php:140
+msgid "Dating"
msgstr ""
-#: ../../include/conversation.php:1559
-msgid "Sort by Post Date"
+#: ../../include/selectors.php:123
+msgid "Unfaithful"
msgstr ""
-#: ../../include/conversation.php:1567
-msgid "Posts that mention or involve you"
+#: ../../include/selectors.php:123
+msgid "Sex Addict"
msgstr ""
-#: ../../include/conversation.php:1576
-msgid "Activity Stream - by date"
+#: ../../include/selectors.php:123
+msgid "Friends/Benefits"
msgstr ""
-#: ../../include/conversation.php:1582
-msgid "Starred"
+#: ../../include/selectors.php:123
+msgid "Casual"
msgstr ""
-#: ../../include/conversation.php:1585
-msgid "Favourite Posts"
+#: ../../include/selectors.php:123
+msgid "Engaged"
msgstr ""
-#: ../../include/conversation.php:1592
-msgid "Spam"
+#: ../../include/selectors.php:123 ../../include/selectors.php:140
+msgid "Married"
msgstr ""
-#: ../../include/conversation.php:1595
-msgid "Posts flagged as SPAM"
+#: ../../include/selectors.php:123
+msgid "Imaginarily married"
msgstr ""
-#: ../../include/conversation.php:1654
-msgid "Status Messages and Posts"
+#: ../../include/selectors.php:123
+msgid "Partners"
msgstr ""
-#: ../../include/conversation.php:1663
-msgid "About"
+#: ../../include/selectors.php:123 ../../include/selectors.php:140
+msgid "Cohabiting"
msgstr ""
-#: ../../include/conversation.php:1666
-msgid "Profile Details"
+#: ../../include/selectors.php:123
+msgid "Common law"
msgstr ""
-#: ../../include/conversation.php:1675 ../../include/photos.php:506
-msgid "Photo Albums"
+#: ../../include/selectors.php:123
+msgid "Happy"
msgstr ""
-#: ../../include/conversation.php:1682
-msgid "Files and Storage"
+#: ../../include/selectors.php:123
+msgid "Not looking"
msgstr ""
-#: ../../include/conversation.php:1702 ../../include/conversation.php:1705
-#: ../../include/widgets.php:883
-msgid "Chatrooms"
+#: ../../include/selectors.php:123
+msgid "Swinger"
msgstr ""
-#: ../../include/conversation.php:1715 ../../include/nav.php:105
-msgid "Bookmarks"
+#: ../../include/selectors.php:123
+msgid "Betrayed"
msgstr ""
-#: ../../include/conversation.php:1718
-msgid "Saved Bookmarks"
+#: ../../include/selectors.php:123 ../../include/selectors.php:140
+msgid "Separated"
msgstr ""
-#: ../../include/conversation.php:1728
-msgid "Manage Webpages"
+#: ../../include/selectors.php:123
+msgid "Unstable"
msgstr ""
-#: ../../include/conversation.php:1793
-msgctxt "noun"
-msgid "Attending"
-msgid_plural "Attending"
-msgstr[0] ""
-msgstr[1] ""
+#: ../../include/selectors.php:123 ../../include/selectors.php:140
+msgid "Divorced"
+msgstr ""
-#: ../../include/conversation.php:1796
-msgctxt "noun"
-msgid "Not Attending"
-msgid_plural "Not Attending"
-msgstr[0] ""
-msgstr[1] ""
+#: ../../include/selectors.php:123
+msgid "Imaginarily divorced"
+msgstr ""
-#: ../../include/conversation.php:1799
-msgctxt "noun"
-msgid "Undecided"
-msgid_plural "Undecided"
-msgstr[0] ""
-msgstr[1] ""
+#: ../../include/selectors.php:123 ../../include/selectors.php:140
+msgid "Widowed"
+msgstr ""
-#: ../../include/conversation.php:1802
-msgctxt "noun"
-msgid "Agree"
-msgid_plural "Agrees"
-msgstr[0] ""
-msgstr[1] ""
+#: ../../include/selectors.php:123
+msgid "Uncertain"
+msgstr ""
-#: ../../include/conversation.php:1805
-msgctxt "noun"
-msgid "Disagree"
-msgid_plural "Disagrees"
-msgstr[0] ""
-msgstr[1] ""
+#: ../../include/selectors.php:123 ../../include/selectors.php:140
+msgid "It's complicated"
+msgstr ""
-#: ../../include/conversation.php:1808
-msgctxt "noun"
-msgid "Abstain"
-msgid_plural "Abstains"
-msgstr[0] ""
-msgstr[1] ""
+#: ../../include/selectors.php:123
+msgid "Don't care"
+msgstr ""
-#: ../../include/photos.php:114
+#: ../../include/selectors.php:123
+msgid "Ask me"
+msgstr ""
+
+#: ../../include/acl_selectors.php:198
+msgid "Who can see this?"
+msgstr ""
+
+#: ../../include/acl_selectors.php:199
+msgid "Custom selection"
+msgstr ""
+
+#: ../../include/acl_selectors.php:200
+msgid ""
+"Select \"Show\" to allow viewing. \"Don't show\" lets you override and limit "
+"the scope of \"Show\"."
+msgstr ""
+
+#: ../../include/acl_selectors.php:201
+msgid "Show"
+msgstr ""
+
+#: ../../include/acl_selectors.php:202
+msgid "Don't show"
+msgstr ""
+
+#: ../../include/acl_selectors.php:235
#, php-format
-msgid "Image exceeds website size limit of %lu bytes"
+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:121
-msgid "Image file is empty."
+#: ../../include/event.php:22 ../../include/event.php:69
+#: ../../include/bb2diaspora.php:488
+msgid "l F d, Y \\@ g:i A"
msgstr ""
-#: ../../include/photos.php:259
-msgid "Photo storage failed."
+#: ../../include/event.php:30 ../../include/event.php:73
+#: ../../include/bb2diaspora.php:494
+msgid "Starts:"
msgstr ""
-#: ../../include/photos.php:299
-msgid "a new photo"
+#: ../../include/event.php:40 ../../include/event.php:77
+#: ../../include/bb2diaspora.php:502
+msgid "Finishes:"
msgstr ""
-#: ../../include/photos.php:303
+#: ../../include/event.php:824
+msgid "This event has been added to your calendar."
+msgstr ""
+
+#: ../../include/event.php:1024
+msgid "Not specified"
+msgstr ""
+
+#: ../../include/event.php:1025
+msgid "Needs Action"
+msgstr ""
+
+#: ../../include/event.php:1026
+msgid "Completed"
+msgstr ""
+
+#: ../../include/event.php:1027
+msgid "In Process"
+msgstr ""
+
+#: ../../include/event.php:1028
+msgid "Cancelled"
+msgstr ""
+
+#: ../../include/help.php:31
+msgid "Help:"
+msgstr ""
+
+#: ../../include/items.php:909 ../../include/items.php:954
+msgid "(Unknown)"
+msgstr ""
+
+#: ../../include/items.php:1152
+msgid "Visible to anybody on the internet."
+msgstr ""
+
+#: ../../include/items.php:1154
+msgid "Visible to you only."
+msgstr ""
+
+#: ../../include/items.php:1156
+msgid "Visible to anybody in this network."
+msgstr ""
+
+#: ../../include/items.php:1158
+msgid "Visible to anybody authenticated."
+msgstr ""
+
+#: ../../include/items.php:1160
#, php-format
-msgctxt "photo_upload"
-msgid "%1$s posted %2$s to %3$s"
+msgid "Visible to anybody on %s."
msgstr ""
-#: ../../include/photos.php:510
-msgid "Upload New Photos"
+#: ../../include/items.php:1162
+msgid "Visible to all connections."
msgstr ""
-#: ../../include/bb2diaspora.php:401
-msgid "Attachments:"
+#: ../../include/items.php:1164
+msgid "Visible to approved connections."
msgstr ""
-#: ../../include/bb2diaspora.php:488 ../../include/event.php:22
-#: ../../include/event.php:69
-msgid "l F d, Y \\@ g:i A"
+#: ../../include/items.php:1166
+msgid "Visible to specific connections."
msgstr ""
-#: ../../include/bb2diaspora.php:490
-msgid "$Projectname event notification:"
+#: ../../include/items.php:3960
+msgid "Privacy group is empty."
msgstr ""
-#: ../../include/bb2diaspora.php:494 ../../include/event.php:30
-#: ../../include/event.php:73
-msgid "Starts:"
+#: ../../include/items.php:3967
+#, php-format
+msgid "Privacy group: %s"
msgstr ""
-#: ../../include/bb2diaspora.php:502 ../../include/event.php:40
-#: ../../include/event.php:77
-msgid "Finishes:"
+#: ../../include/items.php:3979
+msgid "Connection not found."
+msgstr ""
+
+#: ../../include/items.php:4332
+msgid "profile photo"
+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/features.php:58
@@ -11258,17 +11226,12 @@ msgid ""
"channel"
msgstr ""
-#: ../../include/connections.php:95
-msgid "New window"
-msgstr ""
-
-#: ../../include/connections.php:96
-msgid "Open the selected location in a different window or browser tab"
+#: ../../include/bb2diaspora.php:401
+msgid "Attachments:"
msgstr ""
-#: ../../include/connections.php:214
-#, php-format
-msgid "User '%s' deleted"
+#: ../../include/bb2diaspora.php:490
+msgid "$Projectname event notification:"
msgstr ""
#: ../../include/bookmarks.php:35
@@ -11312,6 +11275,10 @@ msgstr ""
msgid "Your chatrooms"
msgstr ""
+#: ../../include/nav.php:105 ../../include/conversation.php:1719
+msgid "Bookmarks"
+msgstr ""
+
#: ../../include/nav.php:105
msgid "Your bookmarks"
msgstr ""
@@ -11445,6 +11412,10 @@ msgstr ""
msgid "Site Setup and Configuration"
msgstr ""
+#: ../../include/nav.php:252 ../../include/conversation.php:853
+msgid "Loading..."
+msgstr ""
+
#: ../../include/nav.php:257
msgid "@name, #tag, ?doc, content"
msgstr ""
@@ -11453,95 +11424,14 @@ msgstr ""
msgid "Please wait..."
msgstr ""
-#: ../../include/datetime.php:147
-msgid "Birthday"
-msgstr ""
-
-#: ../../include/datetime.php:149
-msgid "Age: "
-msgstr ""
-
-#: ../../include/datetime.php:151
-msgid "YYYY-MM-DD or MM-DD"
-msgstr ""
-
-#: ../../include/datetime.php:286 ../../boot.php:2548
-msgid "never"
-msgstr ""
-
-#: ../../include/datetime.php:292
-msgid "less than a second ago"
-msgstr ""
-
-#: ../../include/datetime.php:310
-#, php-format
-msgctxt "e.g. 22 hours ago, 1 minute ago"
-msgid "%1$d %2$s ago"
-msgstr ""
-
-#: ../../include/datetime.php:321
-msgctxt "relative_date"
-msgid "year"
-msgid_plural "years"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../../include/datetime.php:324
-msgctxt "relative_date"
-msgid "month"
-msgid_plural "months"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../../include/datetime.php:327
-msgctxt "relative_date"
-msgid "week"
-msgid_plural "weeks"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../../include/datetime.php:330
-msgctxt "relative_date"
-msgid "day"
-msgid_plural "days"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../../include/datetime.php:333
-msgctxt "relative_date"
-msgid "hour"
-msgid_plural "hours"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../../include/datetime.php:336
-msgctxt "relative_date"
-msgid "minute"
-msgid_plural "minutes"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../../include/datetime.php:339
-msgctxt "relative_date"
-msgid "second"
-msgid_plural "seconds"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../../include/datetime.php:576
-#, php-format
-msgid "%1$s's birthday"
-msgstr ""
-
-#: ../../include/datetime.php:577
-#, php-format
-msgid "Happy Birthday %1$s"
-msgstr ""
-
#: ../../include/page_widgets.php:7
msgid "New Page"
msgstr ""
+#: ../../include/wiki.php:525 ../../include/bbcode.php:633
+msgid "Different viewers will see this text differently"
+msgstr ""
+
#: ../../include/contact_widgets.php:11
#, php-format
msgid "%d invitation available"
@@ -11599,44 +11489,33 @@ msgstr[1] ""
msgid "show more"
msgstr ""
-#: ../../include/oembed.php:322
+#: ../../include/oembed.php:312
msgid " by "
msgstr ""
-#: ../../include/oembed.php:323
+#: ../../include/oembed.php:313
msgid " on "
msgstr ""
-#: ../../include/oembed.php:352
+#: ../../include/oembed.php:342
msgid "Embedded content"
msgstr ""
-#: ../../include/oembed.php:361
+#: ../../include/oembed.php:351
msgid "Embedding disabled"
msgstr ""
-#: ../../include/event.php:824
-msgid "This event has been added to your calendar."
-msgstr ""
-
-#: ../../include/event.php:1024
-msgid "Not specified"
-msgstr ""
-
-#: ../../include/event.php:1025
-msgid "Needs Action"
-msgstr ""
-
-#: ../../include/event.php:1026
-msgid "Completed"
+#: ../../include/connections.php:95
+msgid "New window"
msgstr ""
-#: ../../include/event.php:1027
-msgid "In Process"
+#: ../../include/connections.php:96
+msgid "Open the selected location in a different window or browser tab"
msgstr ""
-#: ../../include/event.php:1028
-msgid "Cancelled"
+#: ../../include/connections.php:214
+#, php-format
+msgid "User '%s' deleted"
msgstr ""
#: ../../include/js_strings.php:5
@@ -12002,16 +11881,6 @@ msgstr ""
msgid "This Website Only"
msgstr ""
-#: ../../include/security.php:117
-msgid "guest:"
-msgstr ""
-
-#: ../../include/security.php:535
-msgid ""
-"The form security token was not correct. This probably happened because the "
-"form has been opened for too long (>3 hours) before submitting it."
-msgstr ""
-
#: ../../include/auth.php:148
msgid "Logged out."
msgstr ""
@@ -12043,977 +11912,1109 @@ msgstr ""
msgid "%1$s has an updated %2$s, changing %3$s."
msgstr ""
-#: ../../include/import.php:30
-msgid ""
-"Cannot create a duplicate channel identifier on this system. Import failed."
+#: ../../include/text.php:459
+msgid "prev"
msgstr ""
-#: ../../include/import.php:90
-msgid "Channel clone failed. Import failed."
+#: ../../include/text.php:461
+msgid "first"
msgstr ""
-#: ../../include/import.php:1354
-msgid "Unable to import element \""
+#: ../../include/text.php:490
+msgid "last"
msgstr ""
-#: ../../include/taxonomy.php:228 ../../include/taxonomy.php:249
-msgid "Tags"
+#: ../../include/text.php:493
+msgid "next"
msgstr ""
-#: ../../include/taxonomy.php:293
-msgid "Keywords"
+#: ../../include/text.php:504
+msgid "older"
msgstr ""
-#: ../../include/taxonomy.php:314
-msgid "have"
+#: ../../include/text.php:506
+msgid "newer"
msgstr ""
-#: ../../include/taxonomy.php:314
-msgid "has"
+#: ../../include/text.php:911
+msgid "No connections"
msgstr ""
-#: ../../include/taxonomy.php:315
-msgid "want"
+#: ../../include/text.php:936
+#, php-format
+msgid "View all %s connections"
msgstr ""
-#: ../../include/taxonomy.php:315
-msgid "wants"
+#: ../../include/text.php:1081 ../../include/text.php:1086
+msgid "poke"
msgstr ""
-#: ../../include/taxonomy.php:316
-msgid "likes"
+#: ../../include/text.php:1081 ../../include/text.php:1086
+#: ../../include/conversation.php:243
+msgid "poked"
msgstr ""
-#: ../../include/taxonomy.php:317
-msgid "dislikes"
+#: ../../include/text.php:1087
+msgid "ping"
msgstr ""
-#: ../../include/language.php:367 ../../include/text.php:1814
-msgid "default"
+#: ../../include/text.php:1087
+msgid "pinged"
msgstr ""
-#: ../../include/language.php:380
-msgid "Select an alternate language"
+#: ../../include/text.php:1088
+msgid "prod"
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."
+#: ../../include/text.php:1088
+msgid "prodded"
msgstr ""
-#: ../../include/group.php:248
-msgid "Add new connections to this privacy group"
+#: ../../include/text.php:1089
+msgid "slap"
msgstr ""
-#: ../../include/group.php:289
-msgid "edit"
+#: ../../include/text.php:1089
+msgid "slapped"
msgstr ""
-#: ../../include/group.php:312
-msgid "Edit group"
+#: ../../include/text.php:1090
+msgid "finger"
msgstr ""
-#: ../../include/group.php:313
-msgid "Add privacy group"
+#: ../../include/text.php:1090
+msgid "fingered"
msgstr ""
-#: ../../include/group.php:314
-msgid "Channels not in any privacy group"
+#: ../../include/text.php:1091
+msgid "rebuff"
msgstr ""
-#: ../../include/group.php:316 ../../include/widgets.php:284
-msgid "add"
+#: ../../include/text.php:1091
+msgid "rebuffed"
msgstr ""
-#: ../../include/help.php:31
-msgid "Help:"
+#: ../../include/text.php:1103
+msgid "happy"
msgstr ""
-#: ../../include/selectors.php:30
-msgid "Frequently"
+#: ../../include/text.php:1104
+msgid "sad"
msgstr ""
-#: ../../include/selectors.php:31
-msgid "Hourly"
+#: ../../include/text.php:1105
+msgid "mellow"
msgstr ""
-#: ../../include/selectors.php:32
-msgid "Twice daily"
+#: ../../include/text.php:1106
+msgid "tired"
msgstr ""
-#: ../../include/selectors.php:33
-msgid "Daily"
+#: ../../include/text.php:1107
+msgid "perky"
msgstr ""
-#: ../../include/selectors.php:34
-msgid "Weekly"
+#: ../../include/text.php:1108
+msgid "angry"
msgstr ""
-#: ../../include/selectors.php:35
-msgid "Monthly"
+#: ../../include/text.php:1109
+msgid "stupefied"
msgstr ""
-#: ../../include/selectors.php:49
-msgid "Currently Male"
+#: ../../include/text.php:1110
+msgid "puzzled"
msgstr ""
-#: ../../include/selectors.php:49
-msgid "Currently Female"
+#: ../../include/text.php:1111
+msgid "interested"
msgstr ""
-#: ../../include/selectors.php:49
-msgid "Mostly Male"
+#: ../../include/text.php:1112
+msgid "bitter"
msgstr ""
-#: ../../include/selectors.php:49
-msgid "Mostly Female"
+#: ../../include/text.php:1113
+msgid "cheerful"
msgstr ""
-#: ../../include/selectors.php:49
-msgid "Transgender"
+#: ../../include/text.php:1114
+msgid "alive"
msgstr ""
-#: ../../include/selectors.php:49
-msgid "Intersex"
+#: ../../include/text.php:1115
+msgid "annoyed"
msgstr ""
-#: ../../include/selectors.php:49
-msgid "Transsexual"
+#: ../../include/text.php:1116
+msgid "anxious"
msgstr ""
-#: ../../include/selectors.php:49
-msgid "Hermaphrodite"
+#: ../../include/text.php:1117
+msgid "cranky"
msgstr ""
-#: ../../include/selectors.php:49
-msgid "Neuter"
+#: ../../include/text.php:1118
+msgid "disturbed"
msgstr ""
-#: ../../include/selectors.php:49
-msgid "Non-specific"
+#: ../../include/text.php:1119
+msgid "frustrated"
msgstr ""
-#: ../../include/selectors.php:49
-msgid "Undecided"
+#: ../../include/text.php:1120
+msgid "depressed"
msgstr ""
-#: ../../include/selectors.php:85 ../../include/selectors.php:104
-msgid "Males"
+#: ../../include/text.php:1121
+msgid "motivated"
msgstr ""
-#: ../../include/selectors.php:85 ../../include/selectors.php:104
-msgid "Females"
+#: ../../include/text.php:1122
+msgid "relaxed"
msgstr ""
-#: ../../include/selectors.php:85
-msgid "Gay"
+#: ../../include/text.php:1123
+msgid "surprised"
msgstr ""
-#: ../../include/selectors.php:85
-msgid "Lesbian"
+#: ../../include/text.php:1314
+msgid "May"
msgstr ""
-#: ../../include/selectors.php:85
-msgid "No Preference"
+#: ../../include/text.php:1391 ../../include/text.php:1395
+msgid "Unknown Attachment"
msgstr ""
-#: ../../include/selectors.php:85
-msgid "Bisexual"
+#: ../../include/text.php:1397
+msgid "unknown"
msgstr ""
-#: ../../include/selectors.php:85
-msgid "Autosexual"
+#: ../../include/text.php:1433
+msgid "remove category"
msgstr ""
-#: ../../include/selectors.php:85
-msgid "Abstinent"
+#: ../../include/text.php:1510
+msgid "remove from file"
msgstr ""
-#: ../../include/selectors.php:85
-msgid "Virgin"
+#: ../../include/text.php:1814 ../../include/language.php:367
+msgid "default"
msgstr ""
-#: ../../include/selectors.php:85
-msgid "Deviant"
+#: ../../include/text.php:1822
+msgid "Page layout"
msgstr ""
-#: ../../include/selectors.php:85
-msgid "Fetish"
+#: ../../include/text.php:1822
+msgid "You can create your own with the layouts tool"
msgstr ""
-#: ../../include/selectors.php:85
-msgid "Oodles"
+#: ../../include/text.php:1864
+msgid "Page content type"
msgstr ""
-#: ../../include/selectors.php:85
-msgid "Nonsexual"
+#: ../../include/text.php:1997
+msgid "activity"
msgstr ""
-#: ../../include/selectors.php:123 ../../include/selectors.php:140
-msgid "Single"
+#: ../../include/text.php:2308
+msgid "Design Tools"
msgstr ""
-#: ../../include/selectors.php:123
-msgid "Lonely"
+#: ../../include/text.php:2314
+msgid "Pages"
msgstr ""
-#: ../../include/selectors.php:123
-msgid "Available"
+#: ../../include/text.php:2336
+msgid "Import website..."
msgstr ""
-#: ../../include/selectors.php:123
-msgid "Unavailable"
+#: ../../include/text.php:2337
+msgid "Select folder to import"
msgstr ""
-#: ../../include/selectors.php:123
-msgid "Has crush"
+#: ../../include/text.php:2338
+msgid "Import from a zipped folder:"
msgstr ""
-#: ../../include/selectors.php:123
-msgid "Infatuated"
+#: ../../include/text.php:2339
+msgid "Import from cloud files:"
msgstr ""
-#: ../../include/selectors.php:123 ../../include/selectors.php:140
-msgid "Dating"
+#: ../../include/text.php:2340
+msgid "/cloud/channel/path/to/folder"
msgstr ""
-#: ../../include/selectors.php:123
-msgid "Unfaithful"
+#: ../../include/text.php:2341
+msgid "Enter path to website files"
msgstr ""
-#: ../../include/selectors.php:123
-msgid "Sex Addict"
+#: ../../include/text.php:2342
+msgid "Select folder"
msgstr ""
-#: ../../include/selectors.php:123
-msgid "Friends/Benefits"
+#: ../../include/text.php:2343
+msgid "Export website..."
msgstr ""
-#: ../../include/selectors.php:123
-msgid "Casual"
+#: ../../include/text.php:2344
+msgid "Export to a zip file"
msgstr ""
-#: ../../include/selectors.php:123
-msgid "Engaged"
+#: ../../include/text.php:2345
+msgid "website.zip"
msgstr ""
-#: ../../include/selectors.php:123 ../../include/selectors.php:140
-msgid "Married"
+#: ../../include/text.php:2346
+msgid "Enter a name for the zip file."
msgstr ""
-#: ../../include/selectors.php:123
-msgid "Imaginarily married"
+#: ../../include/text.php:2347
+msgid "Export to cloud files"
msgstr ""
-#: ../../include/selectors.php:123
-msgid "Partners"
+#: ../../include/text.php:2348
+msgid "/path/to/export/folder"
msgstr ""
-#: ../../include/selectors.php:123 ../../include/selectors.php:140
-msgid "Cohabiting"
+#: ../../include/text.php:2349
+msgid "Enter a path to a cloud files destination."
msgstr ""
-#: ../../include/selectors.php:123
-msgid "Common law"
+#: ../../include/text.php:2350
+msgid "Specify folder"
msgstr ""
-#: ../../include/selectors.php:123
-msgid "Happy"
+#: ../../include/taxonomy.php:228 ../../include/taxonomy.php:249
+msgid "Tags"
msgstr ""
-#: ../../include/selectors.php:123
-msgid "Not looking"
+#: ../../include/taxonomy.php:293
+msgid "Keywords"
msgstr ""
-#: ../../include/selectors.php:123
-msgid "Swinger"
+#: ../../include/taxonomy.php:314
+msgid "have"
msgstr ""
-#: ../../include/selectors.php:123
-msgid "Betrayed"
+#: ../../include/taxonomy.php:314
+msgid "has"
msgstr ""
-#: ../../include/selectors.php:123 ../../include/selectors.php:140
-msgid "Separated"
+#: ../../include/taxonomy.php:315
+msgid "want"
msgstr ""
-#: ../../include/selectors.php:123
-msgid "Unstable"
+#: ../../include/taxonomy.php:315
+msgid "wants"
msgstr ""
-#: ../../include/selectors.php:123 ../../include/selectors.php:140
-msgid "Divorced"
+#: ../../include/taxonomy.php:316
+msgid "likes"
msgstr ""
-#: ../../include/selectors.php:123
-msgid "Imaginarily divorced"
+#: ../../include/taxonomy.php:317
+msgid "dislikes"
msgstr ""
-#: ../../include/selectors.php:123 ../../include/selectors.php:140
-msgid "Widowed"
+#: ../../include/security.php:117
+msgid "guest:"
msgstr ""
-#: ../../include/selectors.php:123
-msgid "Uncertain"
+#: ../../include/security.php:535
+msgid ""
+"The form security token was not correct. This probably happened because the "
+"form has been opened for too long (>3 hours) before submitting it."
msgstr ""
-#: ../../include/selectors.php:123 ../../include/selectors.php:140
-msgid "It's complicated"
+#: ../../include/widgets.php:103
+msgid "System"
msgstr ""
-#: ../../include/selectors.php:123
-msgid "Don't care"
+#: ../../include/widgets.php:106
+msgid "New App"
msgstr ""
-#: ../../include/selectors.php:123
-msgid "Ask me"
+#: ../../include/widgets.php:154
+msgid "Suggestions"
msgstr ""
-#: ../../include/message.php:20
-msgid "No recipient provided."
+#: ../../include/widgets.php:155
+msgid "See more..."
msgstr ""
-#: ../../include/message.php:25
-msgid "[no subject]"
+#: ../../include/widgets.php:175
+#, php-format
+msgid "You have %1$.0f of %2$.0f allowed connections."
msgstr ""
-#: ../../include/message.php:45
-msgid "Unable to determine sender."
+#: ../../include/widgets.php:181
+msgid "Add New Connection"
msgstr ""
-#: ../../include/message.php:222
-msgid "Stored post could not be verified."
+#: ../../include/widgets.php:182
+msgid "Enter channel address"
msgstr ""
-#: ../../include/permissions.php:35
-msgid "Can view my normal stream and posts"
+#: ../../include/widgets.php:183
+msgid "Examples: bob@example.com, https://example.com/barbara"
msgstr ""
-#: ../../include/permissions.php:39
-msgid "Can view my webpages"
+#: ../../include/widgets.php:199
+msgid "Notes"
msgstr ""
-#: ../../include/permissions.php:43
-msgid "Can post on my channel page (\"wall\")"
+#: ../../include/widgets.php:275
+msgid "Remove term"
msgstr ""
-#: ../../include/permissions.php:46
-msgid "Can like/dislike stuff"
+#: ../../include/widgets.php:284 ../../include/group.php:316
+msgid "add"
msgstr ""
-#: ../../include/permissions.php:46
-msgid "Profiles and things other than posts/comments"
+#: ../../include/widgets.php:390
+msgid "Archives"
msgstr ""
-#: ../../include/permissions.php:48
-msgid "Can forward to all my channel contacts via post @mentions"
+#: ../../include/widgets.php:552
+msgid "Refresh"
msgstr ""
-#: ../../include/permissions.php:48
-msgid "Advanced - useful for creating group forum channels"
+#: ../../include/widgets.php:592
+msgid "Account settings"
msgstr ""
-#: ../../include/permissions.php:49
-msgid "Can chat with me (when available)"
+#: ../../include/widgets.php:598
+msgid "Channel settings"
msgstr ""
-#: ../../include/permissions.php:50
-msgid "Can write to my file storage and photos"
+#: ../../include/widgets.php:607
+msgid "Additional features"
msgstr ""
-#: ../../include/permissions.php:51
-msgid "Can edit my webpages"
+#: ../../include/widgets.php:614
+msgid "Feature/Addon settings"
msgstr ""
-#: ../../include/permissions.php:53
-msgid "Somewhat advanced - very useful in open communities"
+#: ../../include/widgets.php:620
+msgid "Display settings"
msgstr ""
-#: ../../include/permissions.php:55
-msgid "Can administer my channel resources"
+#: ../../include/widgets.php:627
+msgid "Manage locations"
msgstr ""
-#: ../../include/permissions.php:55
-msgid "Extremely advanced. Leave this alone unless you know what you are doing"
+#: ../../include/widgets.php:634
+msgid "Export channel"
msgstr ""
-#: ../../include/items.php:909 ../../include/items.php:954
-msgid "(Unknown)"
+#: ../../include/widgets.php:640
+msgid "Connected apps"
msgstr ""
-#: ../../include/items.php:1152
-msgid "Visible to anybody on the internet."
+#: ../../include/widgets.php:664
+msgid "Premium Channel Settings"
msgstr ""
-#: ../../include/items.php:1154
-msgid "Visible to you only."
+#: ../../include/widgets.php:693
+msgid "Private Mail Menu"
msgstr ""
-#: ../../include/items.php:1156
-msgid "Visible to anybody in this network."
+#: ../../include/widgets.php:695
+msgid "Combined View"
msgstr ""
-#: ../../include/items.php:1158
-msgid "Visible to anybody authenticated."
+#: ../../include/widgets.php:727 ../../include/widgets.php:739
+msgid "Conversations"
msgstr ""
-#: ../../include/items.php:1160
-#, php-format
-msgid "Visible to anybody on %s."
+#: ../../include/widgets.php:731
+msgid "Received Messages"
msgstr ""
-#: ../../include/items.php:1162
-msgid "Visible to all connections."
+#: ../../include/widgets.php:735
+msgid "Sent Messages"
msgstr ""
-#: ../../include/items.php:1164
-msgid "Visible to approved connections."
+#: ../../include/widgets.php:749
+msgid "No messages."
msgstr ""
-#: ../../include/items.php:1166
-msgid "Visible to specific connections."
+#: ../../include/widgets.php:767
+msgid "Delete conversation"
msgstr ""
-#: ../../include/items.php:3960
-msgid "Privacy group is empty."
+#: ../../include/widgets.php:793
+msgid "Events Tools"
msgstr ""
-#: ../../include/items.php:3967
-#, php-format
-msgid "Privacy group: %s"
+#: ../../include/widgets.php:794
+msgid "Export Calendar"
msgstr ""
-#: ../../include/items.php:3979
-msgid "Connection not found."
+#: ../../include/widgets.php:795
+msgid "Import Calendar"
msgstr ""
-#: ../../include/items.php:4332
-msgid "profile photo"
+#: ../../include/widgets.php:883 ../../include/conversation.php:1706
+#: ../../include/conversation.php:1709
+msgid "Chatrooms"
msgstr ""
-#: ../../include/network.php:704
-msgid "view full size"
+#: ../../include/widgets.php:887
+msgid "Overview"
msgstr ""
-#: ../../include/network.php:1937
-msgid "Administrator"
+#: ../../include/widgets.php:894
+msgid "Chat Members"
msgstr ""
-#: ../../include/network.php:1953
-msgid "No Subject"
+#: ../../include/widgets.php:916
+msgid "Wiki List"
msgstr ""
-#: ../../include/network.php:2209
-msgid "OStatus"
+#: ../../include/widgets.php:954
+msgid "Wiki Pages"
msgstr ""
-#: ../../include/network.php:2210
-msgid "GNU-Social"
+#: ../../include/widgets.php:989
+msgid "Bookmarked Chatrooms"
msgstr ""
-#: ../../include/network.php:2211
-msgid "RSS/Atom"
+#: ../../include/widgets.php:1020
+msgid "Suggested Chatrooms"
msgstr ""
-#: ../../include/network.php:2214
-msgid "Facebook"
+#: ../../include/widgets.php:1165 ../../include/widgets.php:1277
+msgid "photo/image"
msgstr ""
-#: ../../include/network.php:2215
-msgid "Zot"
+#: ../../include/widgets.php:1220
+msgid "Click to show more"
msgstr ""
-#: ../../include/network.php:2216
-msgid "LinkedIn"
+#: ../../include/widgets.php:1371
+msgid "Rating Tools"
msgstr ""
-#: ../../include/network.php:2217
-msgid "XMPP/IM"
+#: ../../include/widgets.php:1375 ../../include/widgets.php:1377
+msgid "Rate Me"
msgstr ""
-#: ../../include/network.php:2218
-msgid "MySpace"
+#: ../../include/widgets.php:1380
+msgid "View Ratings"
msgstr ""
-#: ../../include/text.php:459
-msgid "prev"
+#: ../../include/widgets.php:1464
+msgid "Forums"
msgstr ""
-#: ../../include/text.php:461
-msgid "first"
+#: ../../include/widgets.php:1493
+msgid "Tasks"
msgstr ""
-#: ../../include/text.php:490
-msgid "last"
+#: ../../include/widgets.php:1504
+msgid "Documentation"
msgstr ""
-#: ../../include/text.php:493
-msgid "next"
+#: ../../include/widgets.php:1560 ../../include/widgets.php:1598
+msgid "Member registrations waiting for confirmation"
msgstr ""
-#: ../../include/text.php:504
-msgid "older"
+#: ../../include/widgets.php:1566
+msgid "Inspect queue"
msgstr ""
-#: ../../include/text.php:506
-msgid "newer"
+#: ../../include/widgets.php:1568
+msgid "DB updates"
msgstr ""
-#: ../../include/text.php:911
-msgid "No connections"
+#: ../../include/widgets.php:1594
+msgid "Plugin Features"
msgstr ""
-#: ../../include/text.php:936
-#, php-format
-msgid "View all %s connections"
+#: ../../include/zot.php:705
+msgid "Invalid data packet"
msgstr ""
-#: ../../include/text.php:1081 ../../include/text.php:1086
-msgid "poke"
+#: ../../include/zot.php:721
+msgid "Unable to verify channel signature"
msgstr ""
-#: ../../include/text.php:1087
-msgid "ping"
+#: ../../include/zot.php:2336
+#, php-format
+msgid "Unable to verify site signature for %s"
msgstr ""
-#: ../../include/text.php:1087
-msgid "pinged"
+#: ../../include/zot.php:3721
+msgid "invalid target signature"
msgstr ""
-#: ../../include/text.php:1088
-msgid "prod"
+#: ../../include/conversation.php:204
+#, php-format
+msgid "%1$s is now connected with %2$s"
msgstr ""
-#: ../../include/text.php:1088
-msgid "prodded"
+#: ../../include/conversation.php:239
+#, php-format
+msgid "%1$s poked %2$s"
msgstr ""
-#: ../../include/text.php:1089
-msgid "slap"
+#: ../../include/conversation.php:694
+#, php-format
+msgid "View %s's profile @ %s"
msgstr ""
-#: ../../include/text.php:1089
-msgid "slapped"
+#: ../../include/conversation.php:713
+msgid "Categories:"
msgstr ""
-#: ../../include/text.php:1090
-msgid "finger"
+#: ../../include/conversation.php:714
+msgid "Filed under:"
msgstr ""
-#: ../../include/text.php:1090
-msgid "fingered"
+#: ../../include/conversation.php:739
+msgid "View in context"
msgstr ""
-#: ../../include/text.php:1091
-msgid "rebuff"
+#: ../../include/conversation.php:849
+msgid "remove"
msgstr ""
-#: ../../include/text.php:1091
-msgid "rebuffed"
+#: ../../include/conversation.php:854
+msgid "Delete Selected Items"
msgstr ""
-#: ../../include/text.php:1103
-msgid "happy"
+#: ../../include/conversation.php:947
+msgid "View Source"
msgstr ""
-#: ../../include/text.php:1104
-msgid "sad"
+#: ../../include/conversation.php:948
+msgid "Follow Thread"
msgstr ""
-#: ../../include/text.php:1105
-msgid "mellow"
+#: ../../include/conversation.php:949
+msgid "Unfollow Thread"
msgstr ""
-#: ../../include/text.php:1106
-msgid "tired"
+#: ../../include/conversation.php:954
+msgid "Activity/Posts"
msgstr ""
-#: ../../include/text.php:1107
-msgid "perky"
+#: ../../include/conversation.php:956
+msgid "Edit Connection"
msgstr ""
-#: ../../include/text.php:1108
-msgid "angry"
+#: ../../include/conversation.php:957
+msgid "Message"
msgstr ""
-#: ../../include/text.php:1109
-msgid "stupefied"
+#: ../../include/conversation.php:1077
+#, php-format
+msgid "%s likes this."
msgstr ""
-#: ../../include/text.php:1110
-msgid "puzzled"
+#: ../../include/conversation.php:1077
+#, php-format
+msgid "%s doesn't like this."
msgstr ""
-#: ../../include/text.php:1111
-msgid "interested"
-msgstr ""
+#: ../../include/conversation.php:1081
+#, 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/text.php:1112
-msgid "bitter"
-msgstr ""
+#: ../../include/conversation.php:1083
+#, 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/text.php:1113
-msgid "cheerful"
+#: ../../include/conversation.php:1089
+msgid "and"
msgstr ""
-#: ../../include/text.php:1114
-msgid "alive"
+#: ../../include/conversation.php:1092
+#, php-format
+msgid ", and %d other people"
+msgid_plural ", and %d other people"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../../include/conversation.php:1093
+#, php-format
+msgid "%s like this."
msgstr ""
-#: ../../include/text.php:1115
-msgid "annoyed"
+#: ../../include/conversation.php:1093
+#, php-format
+msgid "%s don't like this."
msgstr ""
-#: ../../include/text.php:1116
-msgid "anxious"
+#: ../../include/conversation.php:1136
+msgid "Set your location"
msgstr ""
-#: ../../include/text.php:1117
-msgid "cranky"
+#: ../../include/conversation.php:1137
+msgid "Clear browser location"
msgstr ""
-#: ../../include/text.php:1118
-msgid "disturbed"
+#: ../../include/conversation.php:1185
+msgid "Tag term:"
msgstr ""
-#: ../../include/text.php:1119
-msgid "frustrated"
+#: ../../include/conversation.php:1186
+msgid "Where are you right now?"
msgstr ""
-#: ../../include/text.php:1120
-msgid "depressed"
+#: ../../include/conversation.php:1195
+msgid "Comments enabled"
msgstr ""
-#: ../../include/text.php:1121
-msgid "motivated"
+#: ../../include/conversation.php:1196
+msgid "Comments disabled"
msgstr ""
-#: ../../include/text.php:1122
-msgid "relaxed"
+#: ../../include/conversation.php:1234
+msgid "Page link name"
msgstr ""
-#: ../../include/text.php:1123
-msgid "surprised"
+#: ../../include/conversation.php:1237
+msgid "Post as"
msgstr ""
-#: ../../include/text.php:1314
-msgid "May"
+#: ../../include/conversation.php:1251
+msgid "Toggle voting"
msgstr ""
-#: ../../include/text.php:1391 ../../include/text.php:1395
-msgid "Unknown Attachment"
+#: ../../include/conversation.php:1254
+msgid "Disable comments"
msgstr ""
-#: ../../include/text.php:1397
-msgid "unknown"
+#: ../../include/conversation.php:1255
+msgid "Toggle comments"
msgstr ""
-#: ../../include/text.php:1433
-msgid "remove category"
+#: ../../include/conversation.php:1263
+msgid "Categories (optional, comma-separated list)"
msgstr ""
-#: ../../include/text.php:1510
-msgid "remove from file"
+#: ../../include/conversation.php:1286
+msgid "Other networks and post services"
msgstr ""
-#: ../../include/text.php:1822
-msgid "Page layout"
+#: ../../include/conversation.php:1292
+msgid "Set publish date"
msgstr ""
-#: ../../include/text.php:1822
-msgid "You can create your own with the layouts tool"
+#: ../../include/conversation.php:1545
+msgid "Discover"
msgstr ""
-#: ../../include/text.php:1864
-msgid "Page content type"
+#: ../../include/conversation.php:1548
+msgid "Imported public streams"
msgstr ""
-#: ../../include/text.php:1997
-msgid "activity"
+#: ../../include/conversation.php:1553
+msgid "Commented Order"
msgstr ""
-#: ../../include/text.php:2308
-msgid "Design Tools"
+#: ../../include/conversation.php:1556
+msgid "Sort by Comment Date"
msgstr ""
-#: ../../include/text.php:2314
-msgid "Pages"
+#: ../../include/conversation.php:1560
+msgid "Posted Order"
msgstr ""
-#: ../../include/text.php:2336
-msgid "Import website..."
+#: ../../include/conversation.php:1563
+msgid "Sort by Post Date"
msgstr ""
-#: ../../include/text.php:2337
-msgid "Select folder to import"
+#: ../../include/conversation.php:1571
+msgid "Posts that mention or involve you"
msgstr ""
-#: ../../include/text.php:2338
-msgid "Import from a zipped folder:"
+#: ../../include/conversation.php:1580
+msgid "Activity Stream - by date"
msgstr ""
-#: ../../include/text.php:2339
-msgid "Import from cloud files:"
+#: ../../include/conversation.php:1586
+msgid "Starred"
msgstr ""
-#: ../../include/text.php:2340
-msgid "/cloud/channel/path/to/folder"
+#: ../../include/conversation.php:1589
+msgid "Favourite Posts"
msgstr ""
-#: ../../include/text.php:2341
-msgid "Enter path to website files"
+#: ../../include/conversation.php:1596
+msgid "Spam"
msgstr ""
-#: ../../include/text.php:2342
-msgid "Select folder"
+#: ../../include/conversation.php:1599
+msgid "Posts flagged as SPAM"
msgstr ""
-#: ../../include/text.php:2343
-msgid "Export website..."
+#: ../../include/conversation.php:1658
+msgid "Status Messages and Posts"
msgstr ""
-#: ../../include/text.php:2344
-msgid "Export to a zip file"
+#: ../../include/conversation.php:1667
+msgid "About"
msgstr ""
-#: ../../include/text.php:2345
-msgid "website.zip"
+#: ../../include/conversation.php:1670
+msgid "Profile Details"
msgstr ""
-#: ../../include/text.php:2346
-msgid "Enter a name for the zip file."
+#: ../../include/conversation.php:1686
+msgid "Files and Storage"
msgstr ""
-#: ../../include/text.php:2347
-msgid "Export to cloud files"
+#: ../../include/conversation.php:1722
+msgid "Saved Bookmarks"
msgstr ""
-#: ../../include/text.php:2348
-msgid "/path/to/export/folder"
+#: ../../include/conversation.php:1732
+msgid "Manage Webpages"
msgstr ""
-#: ../../include/text.php:2349
-msgid "Enter a path to a cloud files destination."
+#: ../../include/conversation.php:1797
+msgctxt "noun"
+msgid "Attending"
+msgid_plural "Attending"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../../include/conversation.php:1800
+msgctxt "noun"
+msgid "Not Attending"
+msgid_plural "Not Attending"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../../include/conversation.php:1803
+msgctxt "noun"
+msgid "Undecided"
+msgid_plural "Undecided"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../../include/conversation.php:1806
+msgctxt "noun"
+msgid "Agree"
+msgid_plural "Agrees"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../../include/conversation.php:1809
+msgctxt "noun"
+msgid "Disagree"
+msgid_plural "Disagrees"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../../include/conversation.php:1812
+msgctxt "noun"
+msgid "Abstain"
+msgid_plural "Abstains"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../../include/permissions.php:35
+msgid "Can view my normal stream and posts"
msgstr ""
-#: ../../include/text.php:2350
-msgid "Specify folder"
+#: ../../include/permissions.php:39
+msgid "Can view my webpages"
msgstr ""
-#: ../../include/widgets.php:103
-msgid "System"
+#: ../../include/permissions.php:43
+msgid "Can post on my channel page (\"wall\")"
msgstr ""
-#: ../../include/widgets.php:106
-msgid "New App"
+#: ../../include/permissions.php:46
+msgid "Can like/dislike stuff"
msgstr ""
-#: ../../include/widgets.php:154
-msgid "Suggestions"
+#: ../../include/permissions.php:46
+msgid "Profiles and things other than posts/comments"
msgstr ""
-#: ../../include/widgets.php:155
-msgid "See more..."
+#: ../../include/permissions.php:48
+msgid "Can forward to all my channel contacts via post @mentions"
msgstr ""
-#: ../../include/widgets.php:175
-#, php-format
-msgid "You have %1$.0f of %2$.0f allowed connections."
+#: ../../include/permissions.php:48
+msgid "Advanced - useful for creating group forum channels"
msgstr ""
-#: ../../include/widgets.php:181
-msgid "Add New Connection"
+#: ../../include/permissions.php:49
+msgid "Can chat with me (when available)"
msgstr ""
-#: ../../include/widgets.php:182
-msgid "Enter channel address"
+#: ../../include/permissions.php:50
+msgid "Can write to my file storage and photos"
msgstr ""
-#: ../../include/widgets.php:183
-msgid "Examples: bob@example.com, https://example.com/barbara"
+#: ../../include/permissions.php:51
+msgid "Can edit my webpages"
msgstr ""
-#: ../../include/widgets.php:199
-msgid "Notes"
+#: ../../include/permissions.php:53
+msgid "Somewhat advanced - very useful in open communities"
msgstr ""
-#: ../../include/widgets.php:275
-msgid "Remove term"
+#: ../../include/permissions.php:55
+msgid "Can administer my channel resources"
msgstr ""
-#: ../../include/widgets.php:390
-msgid "Archives"
+#: ../../include/permissions.php:55
+msgid "Extremely advanced. Leave this alone unless you know what you are doing"
msgstr ""
-#: ../../include/widgets.php:552
-msgid "Refresh"
+#: ../../include/account.php:35
+msgid "Not a valid email address"
msgstr ""
-#: ../../include/widgets.php:592
-msgid "Account settings"
+#: ../../include/account.php:37
+msgid "Your email domain is not among those allowed on this site"
msgstr ""
-#: ../../include/widgets.php:598
-msgid "Channel settings"
+#: ../../include/account.php:43
+msgid "Your email address is already registered at this site."
msgstr ""
-#: ../../include/widgets.php:607
-msgid "Additional features"
+#: ../../include/account.php:75
+msgid "An invitation is required."
msgstr ""
-#: ../../include/widgets.php:614
-msgid "Feature/Addon settings"
+#: ../../include/account.php:79
+msgid "Invitation could not be verified."
msgstr ""
-#: ../../include/widgets.php:620
-msgid "Display settings"
+#: ../../include/account.php:130
+msgid "Please enter the required information."
msgstr ""
-#: ../../include/widgets.php:627
-msgid "Manage locations"
+#: ../../include/account.php:198
+msgid "Failed to store account information."
msgstr ""
-#: ../../include/widgets.php:634
-msgid "Export channel"
+#: ../../include/account.php:263
+#, php-format
+msgid "Registration confirmation for %s"
msgstr ""
-#: ../../include/widgets.php:640
-msgid "Connected apps"
+#: ../../include/account.php:330
+#, php-format
+msgid "Registration request at %s"
msgstr ""
-#: ../../include/widgets.php:664
-msgid "Premium Channel Settings"
+#: ../../include/account.php:352
+msgid "your registration password"
msgstr ""
-#: ../../include/widgets.php:693
-msgid "Private Mail Menu"
+#: ../../include/account.php:358 ../../include/account.php:420
+#, php-format
+msgid "Registration details for %s"
msgstr ""
-#: ../../include/widgets.php:695
-msgid "Combined View"
+#: ../../include/account.php:431
+msgid "Account approved."
msgstr ""
-#: ../../include/widgets.php:727 ../../include/widgets.php:739
-msgid "Conversations"
+#: ../../include/account.php:471
+#, php-format
+msgid "Registration revoked for %s"
msgstr ""
-#: ../../include/widgets.php:731
-msgid "Received Messages"
+#: ../../include/account.php:756 ../../include/account.php:758
+msgid "Click here to upgrade."
msgstr ""
-#: ../../include/widgets.php:735
-msgid "Sent Messages"
+#: ../../include/account.php:764
+msgid "This action exceeds the limits set by your subscription plan."
msgstr ""
-#: ../../include/widgets.php:749
-msgid "No messages."
+#: ../../include/account.php:769
+msgid "This action is not available under your subscription plan."
msgstr ""
-#: ../../include/widgets.php:767
-msgid "Delete conversation"
+#: ../../include/datetime.php:147
+msgid "Birthday"
msgstr ""
-#: ../../include/widgets.php:793
-msgid "Events Tools"
+#: ../../include/datetime.php:149
+msgid "Age: "
msgstr ""
-#: ../../include/widgets.php:794
-msgid "Export Calendar"
+#: ../../include/datetime.php:151
+msgid "YYYY-MM-DD or MM-DD"
msgstr ""
-#: ../../include/widgets.php:795
-msgid "Import Calendar"
+#: ../../include/datetime.php:286 ../../boot.php:2548
+msgid "never"
msgstr ""
-#: ../../include/widgets.php:887
-msgid "Overview"
+#: ../../include/datetime.php:292
+msgid "less than a second ago"
msgstr ""
-#: ../../include/widgets.php:894
-msgid "Chat Members"
+#: ../../include/datetime.php:310
+#, php-format
+msgctxt "e.g. 22 hours ago, 1 minute ago"
+msgid "%1$d %2$s ago"
msgstr ""
-#: ../../include/widgets.php:916
-msgid "Wiki List"
+#: ../../include/datetime.php:321
+msgctxt "relative_date"
+msgid "year"
+msgid_plural "years"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../../include/datetime.php:324
+msgctxt "relative_date"
+msgid "month"
+msgid_plural "months"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../../include/datetime.php:327
+msgctxt "relative_date"
+msgid "week"
+msgid_plural "weeks"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../../include/datetime.php:330
+msgctxt "relative_date"
+msgid "day"
+msgid_plural "days"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../../include/datetime.php:333
+msgctxt "relative_date"
+msgid "hour"
+msgid_plural "hours"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../../include/datetime.php:336
+msgctxt "relative_date"
+msgid "minute"
+msgid_plural "minutes"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../../include/datetime.php:339
+msgctxt "relative_date"
+msgid "second"
+msgid_plural "seconds"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../../include/datetime.php:576
+#, php-format
+msgid "%1$s's birthday"
msgstr ""
-#: ../../include/widgets.php:954
-msgid "Wiki Pages"
+#: ../../include/datetime.php:577
+#, php-format
+msgid "Happy Birthday %1$s"
msgstr ""
-#: ../../include/widgets.php:989
-msgid "Bookmarked Chatrooms"
+#: ../../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/widgets.php:1020
-msgid "Suggested Chatrooms"
+#: ../../include/group.php:248
+msgid "Add new connections to this privacy group"
msgstr ""
-#: ../../include/widgets.php:1165 ../../include/widgets.php:1277
-msgid "photo/image"
+#: ../../include/group.php:289
+msgid "edit"
msgstr ""
-#: ../../include/widgets.php:1220
-msgid "Click to show more"
+#: ../../include/group.php:312
+msgid "Edit group"
msgstr ""
-#: ../../include/widgets.php:1371
-msgid "Rating Tools"
+#: ../../include/group.php:313
+msgid "Add privacy group"
msgstr ""
-#: ../../include/widgets.php:1375 ../../include/widgets.php:1377
-msgid "Rate Me"
+#: ../../include/group.php:314
+msgid "Channels not in any privacy group"
msgstr ""
-#: ../../include/widgets.php:1380
-msgid "View Ratings"
+#: ../../include/import.php:30
+msgid ""
+"Cannot create a duplicate channel identifier on this system. Import failed."
msgstr ""
-#: ../../include/widgets.php:1464
-msgid "Forums"
+#: ../../include/import.php:90
+msgid "Channel clone failed. Import failed."
msgstr ""
-#: ../../include/widgets.php:1493
-msgid "Tasks"
+#: ../../include/import.php:1354
+msgid "Unable to import element \""
msgstr ""
-#: ../../include/widgets.php:1504
-msgid "Documentation"
+#: ../../include/language.php:380
+msgid "Select an alternate language"
msgstr ""
-#: ../../include/widgets.php:1560 ../../include/widgets.php:1598
-msgid "Member registrations waiting for confirmation"
+#: ../../include/bbcode.php:134 ../../include/bbcode.php:902
+#: ../../include/bbcode.php:905 ../../include/bbcode.php:910
+#: ../../include/bbcode.php:913 ../../include/bbcode.php:916
+#: ../../include/bbcode.php:919 ../../include/bbcode.php:924
+#: ../../include/bbcode.php:927 ../../include/bbcode.php:932
+#: ../../include/bbcode.php:935 ../../include/bbcode.php:938
+#: ../../include/bbcode.php:941
+msgid "Image/photo"
msgstr ""
-#: ../../include/widgets.php:1566
-msgid "Inspect queue"
+#: ../../include/bbcode.php:173 ../../include/bbcode.php:952
+msgid "Encrypted content"
msgstr ""
-#: ../../include/widgets.php:1568
-msgid "DB updates"
+#: ../../include/bbcode.php:189
+#, php-format
+msgid "Install %s element: "
msgstr ""
-#: ../../include/widgets.php:1594
-msgid "Plugin Features"
+#: ../../include/bbcode.php:193
+#, php-format
+msgid ""
+"This post contains an installable %s element, however you lack permissions "
+"to install it on this site."
msgstr ""
-#: ../../include/zot.php:705
-msgid "Invalid data packet"
+#: ../../include/bbcode.php:272
+#, php-format
+msgid "%1$s wrote the following %2$s %3$s"
msgstr ""
-#: ../../include/zot.php:721
-msgid "Unable to verify channel signature"
+#: ../../include/bbcode.php:349 ../../include/bbcode.php:357
+msgid "Click to open/close"
msgstr ""
-#: ../../include/zot.php:2336
-#, php-format
-msgid "Unable to verify site signature for %s"
+#: ../../include/bbcode.php:357
+msgid "spoiler"
msgstr ""
-#: ../../include/zot.php:3721
-msgid "invalid target signature"
+#: ../../include/bbcode.php:890
+msgid "$1 wrote:"
msgstr ""
#: ../../view/theme/redbasic/php/config.php:9
diff --git a/view/js/autocomplete.js b/view/js/autocomplete.js
index 62a3b6f06..571b5a5b1 100644
--- a/view/js/autocomplete.js
+++ b/view/js/autocomplete.js
@@ -202,7 +202,7 @@ function string2bb(element) {
$.fn.search_autocomplete = function(backend_url) {
// Autocomplete contacts
contacts = {
- match: /(^@)([^\n]{2,})$/,
+ match: /(^@)([^\n]{3,})$/,
index: 2,
search: function(term, callback) { contact_search(term, callback, backend_url, 'x', [], spinelement='#nav-search-spinner'); },
replace: basic_replace,
diff --git a/view/tpl/event_form.tpl b/view/tpl/event_form.tpl
index 0f37d8287..2c1fc762c 100755
--- a/view/tpl/event_form.tpl
+++ b/view/tpl/event_form.tpl
@@ -111,7 +111,7 @@
<div class="btn-group pull-right">
<button id="event-edit-preview-btn" class="btn btn-default" type="button" title="{{$preview}}" onclick="doEventPreview();"><i class="fa fa-eye" ></i></button>
{{if ! $eid}}
- <button id="dbtn-acl" class="btn btn-default" type="button" data-toggle="modal" data-target="#aclModal" title="{{$perms_label}}"><i id="jot-perms-icon" class="fa"></i></button>
+ <button id="dbtn-acl" class="btn btn-default" type="button" data-toggle="modal" data-target="#aclModal" title="{{$perms_label}}"><i id="jot-perms-icon" class="fa fa-{{$lockstate}}"></i></button>
{{/if}}
<button id="event-submit" class="btn btn-primary" type="submit" name="submit">{{$submit}}</button>
</div>
diff --git a/view/tpl/event_head.tpl b/view/tpl/event_head.tpl
index 646c68564..1d1b6f15b 100755
--- a/view/tpl/event_head.tpl
+++ b/view/tpl/event_head.tpl
@@ -153,17 +153,6 @@
}
});
- // ACL
- $('#id_distr').change(function() {
-
- if ($('#id_distr').is(':checked')) {
- $('#dbtn-acl').show();
- }
- else {
- $('#dbtn-acl').hide();
- }
- }).trigger('change');
-
});
</script>
diff --git a/view/tpl/wiki.tpl b/view/tpl/wiki.tpl
index c05b33a61..8fdf56e77 100644
--- a/view/tpl/wiki.tpl
+++ b/view/tpl/wiki.tpl
@@ -239,6 +239,10 @@ function wiki_delete_wiki(wikiHtmlName, resource_id) {
}, 'json');
}
+
+function wiki_download_wiki(resource_id) {
+ window.location = "wiki/{{$channel}}/download/wiki/" + resource_id;
+}
$('#new-page-submit').click(function (ev) {
if (window.wiki_resource_id === '') {
diff --git a/view/tpl/wikilist.tpl b/view/tpl/wikilist.tpl
index be353ca5e..6b37be4c5 100644
--- a/view/tpl/wikilist.tpl
+++ b/view/tpl/wikilist.tpl
@@ -8,6 +8,7 @@
</a>
<ul class="dropdown-menu pull-right">
<li><a href="/wiki/{{$channel}}/{{$wiki.urlName}}/Home" title="View {{$wiki.title}}">View</a></li>
+ <li><a href="#" onclick="wiki_download_wiki('{{$wiki.resource_id}}'); return false;" title="Download {{$wiki.title}}">Download</a></li>
{{if $showControls}}
<li class="divider"></li>
<li><a href="#" onclick="wiki_delete_wiki('{{$wiki.title}}','{{$wiki.resource_id}}'); return false;" title="Delete {{$wiki.title}}">Delete wiki</a></li>
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-18 18:17:50 +0000