aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Zotlabs/Widget/Wiki_pages.php2
-rw-r--r--include/import.php1
-rw-r--r--include/zot.php2
-rw-r--r--install/schema_postgres.sql314
-rwxr-xr-xutil/update_autoloader2
-rwxr-xr-xutil/zotsh/zotsh.py4
-rw-r--r--view/css/mod_wiki.css8
-rw-r--r--view/de/hmessages.po28
-rw-r--r--view/es-es/hmessages.po93
-rw-r--r--view/es-es/hstrings.php2
10 files changed, 235 insertions, 221 deletions
diff --git a/Zotlabs/Widget/Wiki_pages.php b/Zotlabs/Widget/Wiki_pages.php
index 7285e2b42..a07c348ff 100644
--- a/Zotlabs/Widget/Wiki_pages.php
+++ b/Zotlabs/Widget/Wiki_pages.php
@@ -23,6 +23,8 @@ class Wiki_pages {
$wikiname = '';
+ $wikiname = '';
+
$pages = array();
$p = \Zotlabs\Lib\NativeWikiPage::page_list($arr['channel_id'],get_observer_hash(),$arr['resource_id']);
diff --git a/include/import.php b/include/import.php
index 2199400af..5cb354cc3 100644
--- a/include/import.php
+++ b/include/import.php
@@ -156,6 +156,7 @@ function import_profiles($channel, $profiles) {
unset($profile['id']);
$profile['aid'] = get_account_id();
$profile['uid'] = $channel['channel_id'];
+ unset($profile['profile_vcard']);
convert_oldfields($profile,'name','fullname');
convert_oldfields($profile,'with','partner');
diff --git a/include/zot.php b/include/zot.php
index 4d056ffeb..3143fa000 100644
--- a/include/zot.php
+++ b/include/zot.php
@@ -3861,7 +3861,7 @@ function zotinfo($arr) {
if($role === 'forum' || $role === 'repository') {
$public_forum = true;
}
- else {
+ elseif($ztarget_hash) {
// check if it has characteristics of a public forum based on custom permissions.
$m = \Zotlabs\Access\Permissions::FilledAutoperms($e['channel_id']);
if($m) {
diff --git a/install/schema_postgres.sql b/install/schema_postgres.sql
index 0bc783692..197cbb4d1 100644
--- a/install/schema_postgres.sql
+++ b/install/schema_postgres.sql
@@ -1,6 +1,6 @@
CREATE TABLE "abconfig" (
"id" serial NOT NULL,
- "chan" bigint NOT NULL DEFAULT '0',
+ "chan" bigint NOT NULL DEFAULT 0,
"xchan" text NOT NULL,
"cat" text NOT NULL,
"k" text NOT NULL,
@@ -73,13 +73,13 @@ CREATE TABLE "account" (
"account_language" varchar(16) NOT NULL DEFAULT 'en',
"account_created" timestamp NOT NULL DEFAULT '0001-01-01 00:00:00',
"account_lastlog" timestamp NOT NULL DEFAULT '0001-01-01 00:00:00',
- "account_flags" bigint NOT NULL DEFAULT '0',
- "account_roles" bigint NOT NULL DEFAULT '0',
+ "account_flags" bigint NOT NULL DEFAULT 0 ,
+ "account_roles" bigint NOT NULL DEFAULT 0 ,
"account_reset" text NOT NULL DEFAULT '',
"account_expires" timestamp NOT NULL DEFAULT '0001-01-01 00:00:00',
"account_expire_notified" timestamp NOT NULL DEFAULT '0001-01-01 00:00:00',
"account_service_class" varchar(32) NOT NULL DEFAULT '',
- "account_level" bigint NOT NULL DEFAULT '0',
+ "account_level" bigint NOT NULL DEFAULT 0 ,
"account_password_changed" timestamp NOT NULL DEFAULT '0001-01-01 00:00:00',
PRIMARY KEY ("account_id")
);
@@ -97,11 +97,11 @@ create index "account_password_changed" on account ("account_password_changed")
CREATE TABLE "addon" (
"id" serial NOT NULL,
"aname" text NOT NULL,
- "version" text NOT NULL DEFAULT '0',
- "installed" numeric(1) NOT NULL DEFAULT '0',
- "hidden" numeric(1) NOT NULL DEFAULT '0',
- "tstamp" numeric(20) NOT NULL DEFAULT '0',
- "plugin_admin" numeric(1) NOT NULL DEFAULT '0',
+ "version" text NOT NULL DEFAULT 0 ,
+ "installed" numeric(1) NOT NULL DEFAULT 0 ,
+ "hidden" numeric(1) NOT NULL DEFAULT 0 ,
+ "tstamp" numeric(20) NOT NULL DEFAULT 0 ,
+ "plugin_admin" numeric(1) NOT NULL DEFAULT 0 ,
PRIMARY KEY ("id")
);
create index "addon_hidden_idx" on addon ("hidden");
@@ -117,13 +117,13 @@ CREATE TABLE "app" (
"app_url" text NOT NULL DEFAULT '',
"app_photo" text NOT NULL DEFAULT '',
"app_version" text NOT NULL DEFAULT '',
- "app_channel" bigint NOT NULL DEFAULT '0',
+ "app_channel" bigint NOT NULL DEFAULT 0 ,
"app_addr" text NOT NULL DEFAULT '',
"app_price" text NOT NULL DEFAULT '',
"app_page" text NOT NULL DEFAULT '',
"app_requires" text NOT NULL DEFAULT '',
- "app_deleted" smallint NOT NULL DEFAULT '0',
- "app_system" smallint NOT NULL DEFAULT '0',
+ "app_deleted" smallint NOT NULL DEFAULT 0 ,
+ "app_system" smallint NOT NULL DEFAULT 0 ,
"app_plugin" text NOT NULL DEFAULT '',
"app_created" timestamp NOT NULL DEFAULT '0001-01-01 00:00:00',
"app_edited" timestamp NOT NULL DEFAULT '0001-01-01 00:00:00',
@@ -158,19 +158,19 @@ create index atoken_expires on atoken (atoken_expires);
CREATE TABLE "attach" (
"id" serial NOT NULL,
- "aid" bigint NOT NULL DEFAULT '0',
- "uid" bigint NOT NULL DEFAULT '0',
+ "aid" bigint NOT NULL DEFAULT 0 ,
+ "uid" bigint NOT NULL DEFAULT 0 ,
"hash" varchar(64) NOT NULL DEFAULT '',
"creator" varchar(128) NOT NULL DEFAULT '',
"filename" text NOT NULL DEFAULT '',
"filetype" varchar(64) NOT NULL DEFAULT '',
- "filesize" bigint NOT NULL DEFAULT '0',
- "revision" bigint NOT NULL DEFAULT '0',
+ "filesize" bigint NOT NULL DEFAULT 0 ,
+ "revision" bigint NOT NULL DEFAULT 0 ,
"folder" varchar(64) NOT NULL DEFAULT '',
- "flags" bigint NOT NULL DEFAULT '0',
- "is_dir" smallint NOT NULL DEFAULT '0',
- "is_photo" smallint NOT NULL DEFAULT '0',
- "os_storage" smallint NOT NULL DEFAULT '0',
+ "flags" bigint NOT NULL DEFAULT 0 ,
+ "is_dir" smallint NOT NULL DEFAULT 0 ,
+ "is_photo" smallint NOT NULL DEFAULT 0 ,
+ "os_storage" smallint NOT NULL DEFAULT 0 ,
"os_path" text NOT NULL,
"display_path" text NOT NULL,
"content" bytea NOT NULL,
@@ -214,8 +214,8 @@ CREATE TABLE "cache" (
);
CREATE TABLE "cal" (
"cal_id" serial NOT NULL,
- "cal_aid" bigint NOT NULL DEFAULT '0',
- "cal_uid" bigint NOT NULL DEFAULT '0',
+ "cal_aid" bigint NOT NULL DEFAULT 0 ,
+ "cal_uid" bigint NOT NULL DEFAULT 0 ,
"cal_hash" text NOT NULL,
"cal_name" text NOT NULL,
"uri" text NOT NULL,
@@ -223,7 +223,7 @@ CREATE TABLE "cal" (
"pass" text NOT NULL,
"ctag" text NOT NULL,
"synctoken" text NOT NULL,
- "cal_types" text NOT NULL DEFAULT '0',
+ "cal_types" text NOT NULL DEFAULT 0 ,
PRIMARY KEY ("cal_id")
);
create index "cal_hash_idx" on cal ("cal_hash");
@@ -234,8 +234,8 @@ create index "cal_uid_idx" on cal ("cal_uid");
CREATE TABLE "channel" (
"channel_id" serial NOT NULL,
- "channel_account_id" bigint NOT NULL DEFAULT '0',
- "channel_primary" numeric(1) NOT NULL DEFAULT '0',
+ "channel_account_id" bigint NOT NULL DEFAULT 0 ,
+ "channel_primary" numeric(1) NOT NULL DEFAULT 0 ,
"channel_name" text NOT NULL DEFAULT '',
"channel_address" text NOT NULL DEFAULT '',
"channel_guid" text NOT NULL DEFAULT '',
@@ -247,14 +247,14 @@ CREATE TABLE "channel" (
"channel_startpage" text NOT NULL DEFAULT '',
"channel_pubkey" text NOT NULL,
"channel_prvkey" text NOT NULL,
- "channel_notifyflags" bigint NOT NULL DEFAULT '65535',
- "channel_pageflags" bigint NOT NULL DEFAULT '0',
+ "channel_notifyflags" bigint NOT NULL DEFAULT 65535,
+ "channel_pageflags" bigint NOT NULL DEFAULT 0 ,
"channel_dirdate" timestamp NOT NULL DEFAULT '0001-01-01 00:00:00',
"channel_lastpost" timestamp NOT NULL DEFAULT '0001-01-01 00:00:00',
"channel_deleted" timestamp NOT NULL DEFAULT '0001-01-01 00:00:00',
- "channel_max_anon_mail" bigint NOT NULL DEFAULT '10',
- "channel_max_friend_req" bigint NOT NULL DEFAULT '10',
- "channel_expire_days" bigint NOT NULL DEFAULT '0',
+ "channel_max_anon_mail" bigint NOT NULL DEFAULT 10,
+ "channel_max_friend_req" bigint NOT NULL DEFAULT 10,
+ "channel_expire_days" bigint NOT NULL DEFAULT 0 ,
"channel_passwd_reset" text NOT NULL DEFAULT '',
"channel_default_group" text NOT NULL DEFAULT '',
"channel_allow_cid" text ,
@@ -291,7 +291,7 @@ create index "channel_system" on channel ("channel_system");
create index "channel_moved" on channel ("channel_moved");
CREATE TABLE "chat" (
"chat_id" serial NOT NULL,
- "chat_room" bigint NOT NULL DEFAULT '0',
+ "chat_room" bigint NOT NULL DEFAULT 0 ,
"chat_xchan" text NOT NULL DEFAULT '',
"chat_text" text NOT NULL,
"created" timestamp NOT NULL DEFAULT '0001-01-01 00:00:00',
@@ -302,7 +302,7 @@ create index "chat_xchan_idx" on chat ("chat_xchan");
create index "chat_created_idx" on chat ("created");
CREATE TABLE "chatpresence" (
"cp_id" serial NOT NULL,
- "cp_room" bigint NOT NULL DEFAULT '0',
+ "cp_room" bigint NOT NULL DEFAULT 0 ,
"cp_xchan" text NOT NULL DEFAULT '',
"cp_last" timestamp NOT NULL DEFAULT '0001-01-01 00:00:00',
"cp_status" text NOT NULL,
@@ -316,12 +316,12 @@ create index "cp_status" on chatpresence ("cp_status");
CREATE TABLE "chatroom" (
"cr_id" serial NOT NULL,
- "cr_aid" bigint NOT NULL DEFAULT '0',
- "cr_uid" bigint NOT NULL DEFAULT '0',
+ "cr_aid" bigint NOT NULL DEFAULT 0 ,
+ "cr_uid" bigint NOT NULL DEFAULT 0 ,
"cr_name" text NOT NULL DEFAULT '',
"cr_created" timestamp NOT NULL DEFAULT '0001-01-01 00:00:00',
"cr_edited" timestamp NOT NULL DEFAULT '0001-01-01 00:00:00',
- "cr_expire" bigint NOT NULL DEFAULT '0',
+ "cr_expire" bigint NOT NULL DEFAULT 0 ,
"allow_cid" text NOT NULL,
"allow_gid" text NOT NULL,
"deny_cid" text NOT NULL,
@@ -340,7 +340,7 @@ CREATE TABLE "clients" (
"redirect_uri" varchar(200) NOT NULL,
"clname" text,
"icon" text,
- "uid" bigint NOT NULL DEFAULT '0',
+ "uid" bigint NOT NULL DEFAULT 0 ,
PRIMARY KEY ("client_id")
);
CREATE TABLE "config" (
@@ -387,9 +387,9 @@ create index "dreport_channel" on dreport ("dreport_channel");
CREATE TABLE "event" (
"id" serial NOT NULL,
- "aid" bigint NOT NULL DEFAULT '0',
+ "aid" bigint NOT NULL DEFAULT 0 ,
"uid" bigint NOT NULL,
- "cal_id" bigint NOT NULL DEFAULT '0',
+ "cal_id" bigint NOT NULL DEFAULT 0 ,
"event_xchan" text NOT NULL DEFAULT '',
"event_hash" text NOT NULL DEFAULT '',
"created" timestamp NOT NULL DEFAULT '0001-01-01 00:00:00',
@@ -400,19 +400,19 @@ CREATE TABLE "event" (
"description" text NOT NULL,
"location" text NOT NULL,
"etype" text NOT NULL,
- "nofinish" numeric(1) NOT NULL DEFAULT '0',
- "adjust" numeric(1) NOT NULL DEFAULT '1',
- "dismissed" numeric(1) NOT NULL DEFAULT '0',
+ "nofinish" numeric(1) NOT NULL DEFAULT 0 ,
+ "adjust" numeric(1) NOT NULL DEFAULT 1,
+ "dismissed" numeric(1) NOT NULL DEFAULT 0 ,
"allow_cid" text NOT NULL,
"allow_gid" text NOT NULL,
"deny_cid" text NOT NULL,
"deny_gid" text NOT NULL,
"event_status" varchar(255) NOT NULL DEFAULT '',
"event_status_date" timestamp NOT NULL DEFAULT '0001-01-01 00:00:00',
- "event_percent" smallint NOT NULL DEFAULT '0',
+ "event_percent" smallint NOT NULL DEFAULT 0 ,
"event_repeat" text NOT NULL,
- "event_sequence" smallint NOT NULL DEFAULT '0',
- "event_priority" smallint NOT NULL DEFAULT '0',
+ "event_sequence" smallint NOT NULL DEFAULT 0 ,
+ "event_priority" smallint NOT NULL DEFAULT 0 ,
"event_vdata" text NOT NULL,
PRIMARY KEY ("id")
);
@@ -446,8 +446,8 @@ CREATE TABLE "groups" (
"id" serial NOT NULL,
"hash" text NOT NULL DEFAULT '',
"uid" bigint NOT NULL,
- "visible" numeric(1) NOT NULL DEFAULT '0',
- "deleted" numeric(1) NOT NULL DEFAULT '0',
+ "visible" numeric(1) NOT NULL DEFAULT 0 ,
+ "deleted" numeric(1) NOT NULL DEFAULT 0 ,
"gname" text NOT NULL,
PRIMARY KEY ("id")
@@ -462,8 +462,8 @@ CREATE TABLE "hook" (
"hook" text NOT NULL,
"file" text NOT NULL,
"fn" text NOT NULL,
- "priority" smallint NOT NULL DEFAULT '0',
- "hook_version" smallint NOT NULL DEFAULT '0',
+ "priority" smallint NOT NULL DEFAULT 0 ,
+ "hook_version" smallint NOT NULL DEFAULT 0 ,
PRIMARY KEY ("id")
);
@@ -478,8 +478,8 @@ CREATE TABLE "hubloc" (
"hubloc_hash" text NOT NULL,
"hubloc_addr" text NOT NULL DEFAULT '',
"hubloc_network" text NOT NULL DEFAULT '',
- "hubloc_flags" bigint NOT NULL DEFAULT '0',
- "hubloc_status" bigint NOT NULL DEFAULT '0',
+ "hubloc_flags" bigint NOT NULL DEFAULT 0 ,
+ "hubloc_status" bigint NOT NULL DEFAULT 0 ,
"hubloc_url" text NOT NULL DEFAULT '',
"hubloc_url_sig" text NOT NULL DEFAULT '',
"hubloc_host" text NOT NULL DEFAULT '',
@@ -488,10 +488,10 @@ CREATE TABLE "hubloc" (
"hubloc_sitekey" text NOT NULL DEFAULT '',
"hubloc_updated" timestamp NOT NULL DEFAULT '0001-01-01 00:00:00',
"hubloc_connected" timestamp NOT NULL DEFAULT '0001-01-01 00:00:00',
- "hubloc_primary" smallint NOT NULL DEFAULT '0',
- "hubloc_orphancheck" smallint NOT NULL DEFAULT '0',
- "hubloc_error" smallint NOT NULL DEFAULT '0',
- "hubloc_deleted" smallint NOT NULL DEFAULT '0',
+ "hubloc_primary" smallint NOT NULL DEFAULT 0 ,
+ "hubloc_orphancheck" smallint NOT NULL DEFAULT 0 ,
+ "hubloc_error" smallint NOT NULL DEFAULT 0 ,
+ "hubloc_deleted" smallint NOT NULL DEFAULT 0 ,
PRIMARY KEY ("hubloc_id")
);
create index "hubloc_url" on hubloc ("hubloc_url");
@@ -510,11 +510,11 @@ create index "hubloc_error" on hubloc ("hubloc_error");
create index "hubloc_deleted" on hubloc ("hubloc_deleted");
CREATE TABLE "iconfig" (
"id" serial NOT NULL,
- "iid" bigint NOT NULL DEFAULT '0',
+ "iid" bigint NOT NULL DEFAULT 0 ,
"cat" text NOT NULL DEFAULT '',
"k" text NOT NULL DEFAULT '',
"v" text NOT NULL DEFAULT '',
- "sharing" int NOT NULL DEFAULT '0',
+ "sharing" int NOT NULL DEFAULT 0 ,
PRIMARY KEY("id")
);
create index "iconfig_iid" on iconfig ("iid");
@@ -541,9 +541,9 @@ create index "issue_component" on issue ("issue_component");
CREATE TABLE "item" (
"id" serial NOT NULL,
"mid" text NOT NULL DEFAULT '',
- "aid" bigint NOT NULL DEFAULT '0',
- "uid" bigint NOT NULL DEFAULT '0',
- "parent" bigint NOT NULL DEFAULT '0',
+ "aid" bigint NOT NULL DEFAULT 0 ,
+ "uid" bigint NOT NULL DEFAULT 0 ,
+ "parent" bigint NOT NULL DEFAULT 0 ,
"parent_mid" text NOT NULL DEFAULT '',
"thr_parent" text NOT NULL DEFAULT '',
"created" timestamp NOT NULL DEFAULT '0001-01-01 00:00:00',
@@ -562,7 +562,7 @@ CREATE TABLE "item" (
"html" text NOT NULL,
"app" text NOT NULL DEFAULT '',
"lang" varchar(64) NOT NULL DEFAULT '',
- "revision" bigint NOT NULL DEFAULT '0',
+ "revision" bigint NOT NULL DEFAULT 0 ,
"verb" text NOT NULL DEFAULT '',
"obj_type" text NOT NULL DEFAULT '',
"obj" text NOT NULL,
@@ -585,32 +585,32 @@ CREATE TABLE "item" (
"allow_gid" text NOT NULL,
"deny_cid" text NOT NULL,
"deny_gid" text NOT NULL,
- "item_restrict" bigint NOT NULL DEFAULT '0',
- "item_flags" bigint NOT NULL DEFAULT '0',
- "item_private" numeric(4) NOT NULL DEFAULT '0',
- "item_unseen" smallint NOT NULL DEFAULT '0',
- "item_wall" smallint NOT NULL DEFAULT '0',
- "item_origin" smallint NOT NULL DEFAULT '0',
- "item_starred" smallint NOT NULL DEFAULT '0',
- "item_uplink" smallint NOT NULL DEFAULT '0',
- "item_consensus" smallint NOT NULL DEFAULT '0',
- "item_thread_top" smallint NOT NULL DEFAULT '0',
- "item_notshown" smallint NOT NULL DEFAULT '0',
- "item_nsfw" smallint NOT NULL DEFAULT '0',
- "item_relay" smallint NOT NULL DEFAULT '0',
- "item_mentionsme" smallint NOT NULL DEFAULT '0',
- "item_nocomment" smallint NOT NULL DEFAULT '0',
- "item_obscured" smallint NOT NULL DEFAULT '0',
- "item_verified" smallint NOT NULL DEFAULT '0',
- "item_retained" smallint NOT NULL DEFAULT '0',
- "item_rss" smallint NOT NULL DEFAULT '0',
- "item_deleted" smallint NOT NULL DEFAULT '0',
- "item_type" int NOT NULL DEFAULT '0',
- "item_hidden" smallint NOT NULL DEFAULT '0',
- "item_unpublished" smallint NOT NULL DEFAULT '0',
- "item_delayed" smallint NOT NULL DEFAULT '0',
- "item_pending_remove" smallint NOT NULL DEFAULT '0',
- "item_blocked" smallint NOT NULL DEFAULT '0',
+ "item_restrict" bigint NOT NULL DEFAULT 0 ,
+ "item_flags" bigint NOT NULL DEFAULT 0 ,
+ "item_private" numeric(4) NOT NULL DEFAULT 0 ,
+ "item_unseen" smallint NOT NULL DEFAULT 0 ,
+ "item_wall" smallint NOT NULL DEFAULT 0 ,
+ "item_origin" smallint NOT NULL DEFAULT 0 ,
+ "item_starred" smallint NOT NULL DEFAULT 0 ,
+ "item_uplink" smallint NOT NULL DEFAULT 0 ,
+ "item_consensus" smallint NOT NULL DEFAULT 0 ,
+ "item_thread_top" smallint NOT NULL DEFAULT 0 ,
+ "item_notshown" smallint NOT NULL DEFAULT 0 ,
+ "item_nsfw" smallint NOT NULL DEFAULT 0 ,
+ "item_relay" smallint NOT NULL DEFAULT 0 ,
+ "item_mentionsme" smallint NOT NULL DEFAULT 0 ,
+ "item_nocomment" smallint NOT NULL DEFAULT 0 ,
+ "item_obscured" smallint NOT NULL DEFAULT 0 ,
+ "item_verified" smallint NOT NULL DEFAULT 0 ,
+ "item_retained" smallint NOT NULL DEFAULT 0 ,
+ "item_rss" smallint NOT NULL DEFAULT 0 ,
+ "item_deleted" smallint NOT NULL DEFAULT 0 ,
+ "item_type" int NOT NULL DEFAULT 0 ,
+ "item_hidden" smallint NOT NULL DEFAULT 0 ,
+ "item_unpublished" smallint NOT NULL DEFAULT 0 ,
+ "item_delayed" smallint NOT NULL DEFAULT 0 ,
+ "item_pending_remove" smallint NOT NULL DEFAULT 0 ,
+ "item_blocked" smallint NOT NULL DEFAULT 0 ,
"item_search_vector" tsvector,
PRIMARY KEY ("id")
);
@@ -710,9 +710,9 @@ create index "likes_target_type" on likes ("target_type");
create index "likes_target_id" on likes ("target_id");
CREATE TABLE "mail" (
"id" serial NOT NULL,
- "convid" bigint NOT NULL DEFAULT '0',
+ "convid" bigint NOT NULL DEFAULT 0 ,
"conv_guid" text NOT NULL,
- "mail_flags" bigint NOT NULL DEFAULT '0',
+ "mail_flags" bigint NOT NULL DEFAULT 0 ,
"from_xchan" text NOT NULL DEFAULT '',
"to_xchan" text NOT NULL DEFAULT '',
"account_id" bigint NOT NULL DEFAULT '0',
@@ -724,13 +724,13 @@ CREATE TABLE "mail" (
"attach" text NOT NULL DEFAULT '',
"mid" text NOT NULL,
"parent_mid" text NOT NULL,
- "mail_deleted" smallint NOT NULL DEFAULT '0',
- "mail_replied" smallint NOT NULL DEFAULT '0',
- "mail_isreply" smallint NOT NULL DEFAULT '0',
- "mail_seen" smallint NOT NULL DEFAULT '0',
- "mail_recalled" smallint NOT NULL DEFAULT '0',
- "mail_obscured" smallint NOT NULL DEFAULT '0',
- "mail_raw" smallint NOT NULL DEFAULT '0',
+ "mail_deleted" smallint NOT NULL DEFAULT 0 ,
+ "mail_replied" smallint NOT NULL DEFAULT 0 ,
+ "mail_isreply" smallint NOT NULL DEFAULT 0 ,
+ "mail_seen" smallint NOT NULL DEFAULT 0 ,
+ "mail_recalled" smallint NOT NULL DEFAULT 0 ,
+ "mail_obscured" smallint NOT NULL DEFAULT 0 ,
+ "mail_raw" smallint NOT NULL DEFAULT 0 ,
"created" timestamp NOT NULL DEFAULT '0001-01-01 00:00:00',
"expires" timestamp NOT NULL DEFAULT '0001-01-01 00:00:00',
PRIMARY KEY ("id")
@@ -754,10 +754,10 @@ create index "mail_recalled" on mail ("mail_recalled");
create index "mail_obscured" on mail ("mail_obscured");
CREATE TABLE "menu" (
"menu_id" serial NOT NULL,
- "menu_channel_id" bigint NOT NULL DEFAULT '0',
+ "menu_channel_id" bigint NOT NULL DEFAULT 0 ,
"menu_name" text NOT NULL DEFAULT '',
"menu_desc" text NOT NULL DEFAULT '',
- "menu_flags" bigint NOT NULL DEFAULT '0',
+ "menu_flags" bigint NOT NULL DEFAULT 0 ,
"menu_created" timestamp NOT NULL DEFAULT '0001-01-01 00:00:00',
"menu_edited" timestamp NOT NULL DEFAULT '0001-01-01 00:00:00',
PRIMARY KEY ("menu_id")
@@ -771,14 +771,14 @@ CREATE TABLE "menu_item" (
"mitem_id" serial NOT NULL,
"mitem_link" text NOT NULL DEFAULT '',
"mitem_desc" text NOT NULL DEFAULT '',
- "mitem_flags" bigint NOT NULL DEFAULT '0',
+ "mitem_flags" bigint NOT NULL DEFAULT 0 ,
"allow_cid" text NOT NULL,
"allow_gid" text NOT NULL,
"deny_cid" text NOT NULL,
"deny_gid" text NOT NULL,
"mitem_channel_id" bigint NOT NULL,
- "mitem_menu_id" bigint NOT NULL DEFAULT '0',
- "mitem_order" bigint NOT NULL DEFAULT '0',
+ "mitem_menu_id" bigint NOT NULL DEFAULT 0 ,
+ "mitem_order" bigint NOT NULL DEFAULT 0 ,
PRIMARY KEY ("mitem_id")
);
@@ -797,7 +797,7 @@ CREATE TABLE "notify" (
"uid" bigint NOT NULL,
"link" text NOT NULL,
"parent" text NOT NULL DEFAULT '',
- "seen" numeric(1) NOT NULL DEFAULT '0',
+ "seen" numeric(1) NOT NULL DEFAULT 0 ,
"ntype" bigint NOT NULL,
"verb" text NOT NULL,
"otype" varchar(16) NOT NULL,
@@ -846,18 +846,18 @@ create index "obj_quantity" on obj ("obj_quantity");
CREATE TABLE "outq" (
"outq_hash" text NOT NULL,
- "outq_account" bigint NOT NULL DEFAULT '0',
- "outq_channel" bigint NOT NULL DEFAULT '0',
+ "outq_account" bigint NOT NULL DEFAULT 0 ,
+ "outq_channel" bigint NOT NULL DEFAULT 0 ,
"outq_driver" varchar(32) NOT NULL DEFAULT '',
"outq_posturl" text NOT NULL DEFAULT '',
- "outq_async" numeric(1) NOT NULL DEFAULT '0',
- "outq_delivered" numeric(1) NOT NULL DEFAULT '0',
+ "outq_async" numeric(1) NOT NULL DEFAULT 0 ,
+ "outq_delivered" numeric(1) NOT NULL DEFAULT 0 ,
"outq_created" timestamp NOT NULL DEFAULT '0001-01-01 00:00:00',
"outq_updated" timestamp NOT NULL DEFAULT '0001-01-01 00:00:00',
"outq_scheduled" timestamp NOT NULL DEFAULT '0001-01-01 00:00:00',
"outq_notify" text NOT NULL,
"outq_msg" text NOT NULL,
- "outq_priority" smallint NOT NULL DEFAULT '0',
+ "outq_priority" smallint NOT NULL DEFAULT 0 ,
PRIMARY KEY ("outq_hash")
);
create index "outq_account" on outq ("outq_account");
@@ -872,7 +872,7 @@ create index "outq_priority" on outq ("outq_priority");
CREATE TABLE "pconfig" (
"id" serial NOT NULL,
- "uid" bigint NOT NULL DEFAULT '0',
+ "uid" bigint NOT NULL DEFAULT 0 ,
"cat" text NOT NULL,
"k" text NOT NULL,
"v" text NOT NULL,
@@ -882,7 +882,7 @@ CREATE TABLE "pconfig" (
CREATE TABLE "photo" (
"id" serial NOT NULL,
- "aid" bigint NOT NULL DEFAULT '0',
+ "aid" bigint NOT NULL DEFAULT 0 ,
"uid" bigint NOT NULL,
"xchan" text NOT NULL DEFAULT '',
"resource_id" text NOT NULL,
@@ -895,16 +895,16 @@ CREATE TABLE "photo" (
"mimetype" varchar(128) NOT NULL DEFAULT 'image/jpeg',
"height" numeric(6) NOT NULL,
"width" numeric(6) NOT NULL,
- "filesize" bigint NOT NULL DEFAULT '0',
+ "filesize" bigint NOT NULL DEFAULT 0 ,
"content" bytea NOT NULL,
- "imgscale" numeric(3) NOT NULL DEFAULT '0',
- "profile" numeric(1) NOT NULL DEFAULT '0',
- "photo_usage" smallint NOT NULL DEFAULT '0',
- "is_nsfw" smallint NOT NULL DEFAULT '0',
- "os_storage" smallint NOT NULL DEFAULT '0',
+ "imgscale" numeric(3) NOT NULL DEFAULT 0 ,
+ "profile" numeric(1) NOT NULL DEFAULT 0 ,
+ "photo_usage" smallint NOT NULL DEFAULT 0 ,
+ "is_nsfw" smallint NOT NULL DEFAULT 0 ,
+ "os_storage" smallint NOT NULL DEFAULT 0 ,
"os_path" text NOT NULL,
"display_path" text NOT NULL,
- "photo_flags" bigint NOT NULL DEFAULT '0',
+ "photo_flags" bigint NOT NULL DEFAULT 0 ,
"allow_cid" text NOT NULL,
"allow_gid" text NOT NULL,
"deny_cid" text NOT NULL,
@@ -927,10 +927,10 @@ create index "photo_os_storage" on photo ("os_storage");
CREATE TABLE "poll" (
"poll_id" serial NOT NULL,
- "poll_channel" bigint NOT NULL DEFAULT '0',
+ "poll_channel" bigint NOT NULL DEFAULT 0 ,
"poll_desc" text NOT NULL,
- "poll_flags" bigint NOT NULL DEFAULT '0',
- "poll_votes" bigint NOT NULL DEFAULT '0',
+ "poll_flags" bigint NOT NULL DEFAULT 0 ,
+ "poll_votes" bigint NOT NULL DEFAULT 0 ,
PRIMARY KEY ("poll_id")
);
@@ -939,10 +939,10 @@ create index "poll_flags" on poll ("poll_flags");
create index "poll_votes" on poll ("poll_votes");
CREATE TABLE "poll_elm" (
"pelm_id" serial NOT NULL,
- "pelm_poll" bigint NOT NULL DEFAULT '0',
+ "pelm_poll" bigint NOT NULL DEFAULT 0 ,
"pelm_desc" text NOT NULL,
- "pelm_flags" bigint NOT NULL DEFAULT '0',
- "pelm_result" float NOT NULL DEFAULT '0',
+ "pelm_flags" bigint NOT NULL DEFAULT 0 ,
+ "pelm_result" float NOT NULL DEFAULT 0 ,
PRIMARY KEY ("pelm_id")
);
create index "pelm_poll" on poll_elm ("pelm_poll");
@@ -960,7 +960,7 @@ CREATE TABLE "profdef" (
create index "profdef_field_name" on profdef ("field_name");
CREATE TABLE "profext" (
"id" serial NOT NULL,
- "channel_id" bigint NOT NULL DEFAULT '0',
+ "channel_id" bigint NOT NULL DEFAULT 0 ,
"hash" text NOT NULL DEFAULT '',
"k" text NOT NULL DEFAULT '',
"v" text NOT NULL,
@@ -976,8 +976,8 @@ CREATE TABLE "profile" (
"aid" bigint NOT NULL DEFAULT '0',
"uid" bigint NOT NULL,
"profile_name" text NOT NULL,
- "is_default" numeric(1) NOT NULL DEFAULT '0',
- "hide_friends" numeric(1) NOT NULL DEFAULT '0',
+ "is_default" numeric(1) NOT NULL DEFAULT 0 ,
+ "hide_friends" numeric(1) NOT NULL DEFAULT 0 ,
"fullname" text NOT NULL,
"pdesc" text NOT NULL DEFAULT '',
"chandesc" text NOT NULL DEFAULT '',
@@ -1014,7 +1014,7 @@ CREATE TABLE "profile" (
"homepage" text NOT NULL DEFAULT '',
"photo" text NOT NULL,
"thumb" text NOT NULL,
- "publish" numeric(1) NOT NULL DEFAULT '0',
+ "publish" numeric(1) NOT NULL DEFAULT 0 ,
"profile_vcard" text NOT NULL DEFAULT '',
PRIMARY KEY ("id"),
UNIQUE ("profile_guid","uid")
@@ -1036,7 +1036,7 @@ create index "profile_guid" on profile ("profile_guid");
CREATE TABLE "profile_check" (
"id" serial NOT NULL,
"uid" bigint NOT NULL,
- "cid" bigint NOT NULL DEFAULT '0',
+ "cid" bigint NOT NULL DEFAULT 0 ,
"dfrn_id" text NOT NULL,
"sec" text NOT NULL,
"expire" bigint NOT NULL,
@@ -1071,8 +1071,8 @@ create index "session_sid" on session ("sid");
create index "session_expire" on session ("expire");
CREATE TABLE "shares" (
"share_id" serial NOT NULL,
- "share_type" bigint NOT NULL DEFAULT '0',
- "share_target" bigint NOT NULL DEFAULT '0',
+ "share_type" bigint NOT NULL DEFAULT 0 ,
+ "share_target" bigint NOT NULL DEFAULT 0 ,
"share_xchan" text NOT NULL DEFAULT '',
PRIMARY KEY ("share_id")
);
@@ -1082,8 +1082,8 @@ create index "share_xchan" on shares ("share_xchan");
CREATE TABLE "sign" (
"id" serial NOT NULL,
- "iid" bigint NOT NULL DEFAULT '0',
- "retract_iid" bigint NOT NULL DEFAULT '0',
+ "iid" bigint NOT NULL DEFAULT 0 ,
+ "retract_iid" bigint NOT NULL DEFAULT 0 ,
"signed_text" text NOT NULL,
"signature" text NOT NULL,
"signer" text NOT NULL,
@@ -1094,19 +1094,19 @@ create index "sign_retract_iid" on "sign" ("retract_iid");
CREATE TABLE "site" (
"site_url" text NOT NULL,
- "site_access" bigint NOT NULL DEFAULT '0',
- "site_flags" bigint NOT NULL DEFAULT '0',
+ "site_access" bigint NOT NULL DEFAULT 0 ,
+ "site_flags" bigint NOT NULL DEFAULT 0 ,
"site_update" timestamp NOT NULL DEFAULT '0001-01-01 00:00:00',
"site_pull" timestamp NOT NULL DEFAULT '0001-01-01 00:00:00',
"site_sync" timestamp NOT NULL DEFAULT '0001-01-01 00:00:00',
"site_directory" text NOT NULL DEFAULT '',
- "site_register" bigint NOT NULL DEFAULT '0',
+ "site_register" bigint NOT NULL DEFAULT 0 ,
"site_sellpage" text NOT NULL DEFAULT '',
"site_location" text NOT NULL DEFAULT '',
"site_realm" text NOT NULL DEFAULT '',
- "site_valid" smallint NOT NULL DEFAULT '0',
- "site_dead" smallint NOT NULL DEFAULT '0',
- "site_type" smallint NOT NULL DEFAULT '0',
+ "site_valid" smallint NOT NULL DEFAULT 0 ,
+ "site_dead" smallint NOT NULL DEFAULT 0 ,
+ "site_type" smallint NOT NULL DEFAULT 0 ,
"site_project" text NOT NULL DEFAULT '',
"site_version" text NOT NULL DEFAULT '',
"site_crypto" text NOT NULL DEFAULT '',
@@ -1126,7 +1126,7 @@ create index "site_project" on site ("site_project");
CREATE TABLE "source" (
"src_id" serial NOT NULL,
- "src_channel_id" bigint NOT NULL DEFAULT '0',
+ "src_channel_id" bigint NOT NULL DEFAULT 0 ,
"src_channel_xchan" text NOT NULL DEFAULT '',
"src_xchan" text NOT NULL DEFAULT '',
"src_patt" text NOT NULL DEFAULT '',
@@ -1146,8 +1146,8 @@ CREATE TABLE "sys_perms" (
);
CREATE TABLE "term" (
"tid" serial NOT NULL,
- "aid" bigint NOT NULL DEFAULT '0',
- "uid" bigint NOT NULL DEFAULT '0',
+ "aid" bigint NOT NULL DEFAULT 0 ,
+ "uid" bigint NOT NULL DEFAULT 0 ,
"oid" bigint NOT NULL,
"otype" numeric(3) NOT NULL,
"ttype" numeric(3) NOT NULL,
@@ -1186,7 +1186,7 @@ CREATE TABLE "updates" (
"ud_guid" text NOT NULL DEFAULT '',
"ud_date" timestamp NOT NULL DEFAULT '0001-01-01 00:00:00',
"ud_last" timestamp NOT NULL DEFAULT '0001-01-01 00:00:00',
- "ud_flags" bigint NOT NULL DEFAULT '0',
+ "ud_flags" bigint NOT NULL DEFAULT 0 ,
"ud_addr" text NOT NULL DEFAULT '',
PRIMARY KEY ("ud_id")
);
@@ -1198,7 +1198,7 @@ create index "ud_addr" on updates ("ud_addr");
create index "ud_last" on updates ("ud_last");
CREATE TABLE "verify" (
"id" serial NOT NULL,
- "channel" bigint NOT NULL DEFAULT '0',
+ "channel" bigint NOT NULL DEFAULT 0 ,
"vtype" varchar(32) NOT NULL DEFAULT '',
"token" text NOT NULL DEFAULT '',
"meta" text NOT NULL DEFAULT '',
@@ -1212,8 +1212,8 @@ create index "verify_meta" on verify ("meta");
create index "verify_created" on verify ("created");
CREATE TABLE "vote" (
"vote_id" serial NOT NULL,
- "vote_poll" bigint NOT NULL DEFAULT '0',
- "vote_element" bigint NOT NULL DEFAULT '0',
+ "vote_poll" bigint NOT NULL DEFAULT 0 ,
+ "vote_element" bigint NOT NULL DEFAULT 0 ,
"vote_result" text NOT NULL,
"vote_xchan" text NOT NULL DEFAULT '',
PRIMARY KEY ("vote_id"),
@@ -1238,16 +1238,16 @@ CREATE TABLE "xchan" (
"xchan_name" text NOT NULL DEFAULT '',
"xchan_network" text NOT NULL DEFAULT '',
"xchan_instance_url" text NOT NULL DEFAULT '',
- "xchan_flags" bigint NOT NULL DEFAULT '0',
+ "xchan_flags" bigint NOT NULL DEFAULT 0 ,
"xchan_photo_date" timestamp NOT NULL DEFAULT '0001-01-01 00:00:00',
"xchan_name_date" timestamp NOT NULL DEFAULT '0001-01-01 00:00:00',
- "xchan_hidden" smallint NOT NULL DEFAULT '0',
- "xchan_orphan" smallint NOT NULL DEFAULT '0',
- "xchan_censored" smallint NOT NULL DEFAULT '0',
- "xchan_selfcensored" smallint NOT NULL DEFAULT '0',
- "xchan_system" smallint NOT NULL DEFAULT '0',
- "xchan_pubforum" smallint NOT NULL DEFAULT '0',
- "xchan_deleted" smallint NOT NULL DEFAULT '0',
+ "xchan_hidden" smallint NOT NULL DEFAULT 0 ,
+ "xchan_orphan" smallint NOT NULL DEFAULT 0 ,
+ "xchan_censored" smallint NOT NULL DEFAULT 0 ,
+ "xchan_selfcensored" smallint NOT NULL DEFAULT 0 ,
+ "xchan_system" smallint NOT NULL DEFAULT 0 ,
+ "xchan_pubforum" smallint NOT NULL DEFAULT 0 ,
+ "xchan_deleted" smallint NOT NULL DEFAULT 0 ,
PRIMARY KEY ("xchan_hash")
);
create index "xchan_guid" on xchan ("xchan_guid");
@@ -1292,7 +1292,7 @@ create index "xconfig_cat" on xconfig ("cat");
create index "xconfig_k" on xconfig ("k");
CREATE TABLE "xign" (
"id" serial NOT NULL,
- "uid" bigint NOT NULL DEFAULT '0',
+ "uid" bigint NOT NULL DEFAULT 0 ,
"xchan" text NOT NULL DEFAULT '',
PRIMARY KEY ("id")
);
@@ -1302,10 +1302,10 @@ CREATE TABLE "xlink" (
"xlink_id" serial NOT NULL,
"xlink_xchan" text NOT NULL DEFAULT '',
"xlink_link" text NOT NULL DEFAULT '',
- "xlink_rating" bigint NOT NULL DEFAULT '0',
+ "xlink_rating" bigint NOT NULL DEFAULT 0 ,
"xlink_rating_text" TEXT NOT NULL DEFAULT '',
"xlink_updated" timestamp NOT NULL DEFAULT '0001-01-01 00:00:00',
- "xlink_static" numeric(1) NOT NULL DEFAULT '0',
+ "xlink_static" numeric(1) NOT NULL DEFAULT 0 ,
"xlink_sig" text NOT NULL DEFAULT '',
PRIMARY KEY ("xlink_id")
);
@@ -1317,7 +1317,7 @@ create index "xlink_static" on xlink ("xlink_static");
CREATE TABLE "xperm" (
"xp_id" serial NOT NULL,
"xp_client" varchar( 20 ) NOT NULL DEFAULT '',
- "xp_channel" bigint NOT NULL DEFAULT '0',
+ "xp_channel" bigint NOT NULL DEFAULT 0 ,
"xp_perm" varchar( 64 ) NOT NULL DEFAULT '',
PRIMARY KEY ("xp_id")
);
@@ -1326,7 +1326,7 @@ create index "xp_channel" on xperm ("xp_channel");
create index "xp_perm" on xperm ("xp_perm");
CREATE TABLE "xprof" (
"xprof_hash" text NOT NULL,
- "xprof_age" numeric(3) NOT NULL DEFAULT '0',
+ "xprof_age" numeric(3) NOT NULL DEFAULT 0 ,
"xprof_desc" text NOT NULL DEFAULT '',
"xprof_dob" varchar(12) NOT NULL DEFAULT '',
"xprof_gender" text NOT NULL DEFAULT '',
@@ -1357,7 +1357,7 @@ CREATE TABLE "xtag" (
"xtag_id" serial NOT NULL,
"xtag_hash" text NOT NULL,
"xtag_term" text NOT NULL DEFAULT '',
- "xtag_flags" bigint NOT NULL DEFAULT '0',
+ "xtag_flags" bigint NOT NULL DEFAULT 0 ,
PRIMARY KEY ("xtag_id")
);
create index "xtag_term" on xtag ("xtag_term");
diff --git a/util/update_autoloader b/util/update_autoloader
new file mode 100755
index 000000000..1a6e8eb8d
--- /dev/null
+++ b/util/update_autoloader
@@ -0,0 +1,2 @@
+#!/bin/bash -f
+composer install --optimize-autoloader --no-dev
diff --git a/util/zotsh/zotsh.py b/util/zotsh/zotsh.py
index 36506b39d..d5e1aa527 100755
--- a/util/zotsh/zotsh.py
+++ b/util/zotsh/zotsh.py
@@ -55,7 +55,7 @@ class ZotSH(object):
@session.setter
def session(self, session):
self._session = session
- self.davclient = easywebdav.connect( self.hostname, protocol='https', session=session, path="cloud", verify_ssl=VERIFY_SSL)
+ self.davclient = easywebdav.connect( self.hostname, protocol='https', session=session, path="dav", verify_ssl=VERIFY_SSL)
@property
def PS1(self):
@@ -205,7 +205,7 @@ class ZotSH(object):
print _fmt('d', 0, "../")
for f in r:
- name = f.name.replace("/cloud"+self.davclient.cwd,"")
+ name = f.name.replace("/dav"+self.davclient.cwd,"")
type = "-"
if name.endswith("/"):
type = "d"
diff --git a/view/css/mod_wiki.css b/view/css/mod_wiki.css
index b44ec4fd8..b77645d4f 100644
--- a/view/css/mod_wiki.css
+++ b/view/css/mod_wiki.css
@@ -38,14 +38,14 @@
padding: 7px 3px 7px 10px;
}
-#wikis-index th:nth-child(3),
-#wikis-index td:nth-child(3){
+#wikis-index th:nth-child(4),
+#wikis-index td:nth-child(4){
padding: 7px 10px 7px 7px;
white-space: nowrap;
}
-#wikis-index th:nth-child(4),
-#wikis-index td:nth-child(4){
+#wikis-index th:nth-child(5),
+#wikis-index td:nth-child(5){
padding: 7px 10px 7px 7px;
}
diff --git a/view/de/hmessages.po b/view/de/hmessages.po
index 8ab7a7f21..db906e701 100644
--- a/view/de/hmessages.po
+++ b/view/de/hmessages.po
@@ -4234,23 +4234,23 @@ msgstr "Berechtigung verweigert."
msgid "Import"
msgstr "Import"
-#: ../../Zotlabs/Module/Api.php:72 ../../Zotlabs/Module/Api.php:93
-msgid "Authorize application connection"
-msgstr "Zugriff für die Anwendung autorisieren"
+#: ../../Zotlabs/Module/Notify.php:61
+#: ../../Zotlabs/Module/Notifications.php:42
+msgid "System Notifications"
+msgstr "System-Benachrichtigungen"
-#: ../../Zotlabs/Module/Api.php:73
-msgid "Return to your app and insert this Security Code:"
-msgstr "Gehen Sie zu Ihrer App zurück und tragen Sie diesen Sicherheitscode ein:"
+#: ../../Zotlabs/Module/Follow.php:31
+msgid "Channel added."
+msgstr "Kanal hinzugefügt."
-#: ../../Zotlabs/Module/Api.php:83
-msgid "Please login to continue."
-msgstr "Zum Weitermachen, bitte einloggen."
+#: ../../Zotlabs/Module/Import.php:144
+#, php-format
+msgid "Your service plan only allows %d channels."
+msgstr "Dein Vertrag erlaubt nur %d Kanäle."
-#: ../../Zotlabs/Module/Api.php:95
-msgid ""
-"Do you want to authorize this application to access your posts and contacts,"
-" and/or create new posts for you?"
-msgstr "Möchtest Du dieser Anwendung erlauben, Deine Nachrichten und Kontakte abzurufen und/oder neue Nachrichten für Dich zu erstellen?"
+#: ../../Zotlabs/Module/Import.php:158
+msgid "No channel. Import failed."
+msgstr "Kein Kanal. Import fehlgeschlagen."
#: ../../Zotlabs/Module/Attach.php:13
msgid "Item not available."
diff --git a/view/es-es/hmessages.po b/view/es-es/hmessages.po
index 3f95bb6a7..44c5309a4 100644
--- a/view/es-es/hmessages.po
+++ b/view/es-es/hmessages.po
@@ -3204,13 +3204,15 @@ msgstr "Un sitio por línea. El contenido incorporado se filtra de forma predete
msgid "Block embedded HTML from these domains"
msgstr "Bloquear contenido con HTML incorporado desde estos dominios"
-#: ../../Zotlabs/Module/Lockview.php:75
-msgid "Remote privacy information not available."
-msgstr "La información privada remota no está disponible."
+#: ../../Zotlabs/Module/Events.php:475
+msgid "Edit Location"
+msgstr "Modificar la dirección"
-#: ../../Zotlabs/Module/Lockview.php:96
-msgid "Visible to:"
-msgstr "Visible para:"
+#: ../../Zotlabs/Module/Events.php:478 ../../Zotlabs/Module/Photos.php:1094
+#: ../../Zotlabs/Module/Webpages.php:251 ../../Zotlabs/Lib/ThreadItem.php:740
+#: ../../include/page_widgets.php:43 ../../include/conversation.php:1347
+msgid "Preview"
+msgstr "Previsualizar"
#: ../../Zotlabs/Module/Lockview.php:117 ../../Zotlabs/Module/Lockview.php:153
#: ../../Zotlabs/Module/Acl.php:117 ../../include/acl_selectors.php:183
@@ -5064,13 +5066,21 @@ msgstr "Por favor ajuste el recorte de la imagen para una visión óptima."
msgid "Done Editing"
msgstr "Edición completada"
-#: ../../Zotlabs/Module/Chatsvc.php:131
-msgid "Away"
-msgstr "Ausente"
+#: ../../Zotlabs/Module/Profile.php:91
+msgid "vcard"
+msgstr "vcard"
-#: ../../Zotlabs/Module/Chatsvc.php:136
-msgid "Online"
-msgstr "Conectado/a"
+#: ../../Zotlabs/Module/Oexchange.php:27
+msgid "Unable to find your hub."
+msgstr "No se puede encontrar su servidor."
+
+#: ../../Zotlabs/Module/Oexchange.php:41
+msgid "Post successful."
+msgstr "Enviado con éxito."
+
+#: ../../Zotlabs/Module/Viewsrc.php:46
+msgid "Source of Item"
+msgstr "Origen del elemento"
#: ../../Zotlabs/Module/Item.php:185
msgid "Unable to locate original post."
@@ -12084,28 +12094,25 @@ msgstr "[sin asunto]"
msgid "Stored post could not be verified."
msgstr "No se han podido verificar las publicaciones guardadas."
-#: ../../include/activities.php:41
-msgid " and "
-msgstr " y "
+#: ../../include/text.php:1106
+msgid "slap"
+msgstr "una bofetada "
-#: ../../include/activities.php:49
-msgid "public profile"
-msgstr "el perfil público"
+#: ../../include/text.php:1106
+msgid "slapped"
+msgstr "ha abofeteado a "
-#: ../../include/activities.php:58
-#, php-format
-msgid "%1$s changed %2$s to “%3$s”"
-msgstr "%1$s ha cambiado %2$s a “%3$s”"
+#: ../../include/text.php:1107
+msgid "finger"
+msgstr "un \"finger\" "
-#: ../../include/activities.php:59
-#, php-format
-msgid "Visit %1$s's %2$s"
-msgstr "Visitar %2$s de %1$s"
+#: ../../include/text.php:1107
+msgid "fingered"
+msgstr "envió un \"finger\" a"
-#: ../../include/activities.php:62
-#, php-format
-msgid "%1$s has an updated %2$s, changing %3$s."
-msgstr "%1$s ha actualizado %2$s, cambiando %3$s."
+#: ../../include/text.php:1108
+msgid "rebuff"
+msgstr "un reproche"
#: ../../include/attach.php:250 ../../include/attach.php:339
msgid "Item was not found."
@@ -12248,9 +12255,9 @@ msgctxt "edit_activity"
msgid "Comment"
msgstr "Comentar"
-#: ../../include/channel.php:33
-msgid "Unable to obtain identity information from database"
-msgstr "No ha sido posible obtener información sobre la identidad desde la base de datos"
+#: ../../include/text.php:1128
+msgid "interested"
+msgstr "interesado/a"
#: ../../include/channel.php:68
msgid "Empty name"
@@ -13093,43 +13100,43 @@ msgstr "Acceder desde su servidor"
msgid "Click to authenticate to your home hub"
msgstr "Pulsar para identificarse en su servidor de inicio"
-#: ../../include/nav.php:99 ../../include/nav.php:123
+#: ../../include/nav.php:103 ../../include/nav.php:127
msgid "End this session"
msgstr "Finalizar esta sesión"
-#: ../../include/nav.php:102
+#: ../../include/nav.php:106
msgid "Your profile page"
msgstr "Su página del perfil"
-#: ../../include/nav.php:105
+#: ../../include/nav.php:109
msgid "Manage/Edit profiles"
msgstr "Administrar/editar perfiles"
-#: ../../include/nav.php:107
+#: ../../include/nav.php:111
msgid "Edit your profile"
msgstr "Editar su perfil"
-#: ../../include/nav.php:113
+#: ../../include/nav.php:117
msgid "Sign in"
msgstr "Acceder"
-#: ../../include/nav.php:138
+#: ../../include/nav.php:142
msgid "Take me home"
msgstr "Volver a la página principal"
-#: ../../include/nav.php:140
+#: ../../include/nav.php:144
msgid "Log me out of this site"
msgstr "Salir de este sitio"
-#: ../../include/nav.php:145
+#: ../../include/nav.php:149
msgid "Create an account"
msgstr "Crear una cuenta"
-#: ../../include/nav.php:157
+#: ../../include/nav.php:161
msgid "Help and documentation"
msgstr "Ayuda y documentación"
-#: ../../include/nav.php:160
+#: ../../include/nav.php:164
msgid "Search site @name, #tag, ?docs, content"
msgstr "Buscar en el sitio por @nombre, #etiqueta, ?ayuda o contenido"
diff --git a/view/es-es/hstrings.php b/view/es-es/hstrings.php
index ca809cb74..21e759cd2 100644
--- a/view/es-es/hstrings.php
+++ b/view/es-es/hstrings.php
@@ -515,7 +515,9 @@ App::$strings["%s - (Incompatible)"] = "%s - (Incompatible)";
App::$strings["mobile"] = "móvil";
App::$strings["experimental"] = "experimental";
App::$strings["unsupported"] = "no soportado";
+App::$strings["No"] = "No";
App::$strings["Yes - with approval"] = "Sí - con aprobación";
+App::$strings["Yes"] = "Sí";
App::$strings["My site is not a public server"] = "Mi sitio no es un servidor público";
App::$strings["My site has paid access only"] = "Mi sitio es un servicio de pago";
App::$strings["My site has free access only"] = "Mi sitio es un servicio gratuito";
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-22 01:37:10 +0000