aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Zotlabs/Access/PermissionLimits.php2
-rw-r--r--Zotlabs/Module/Photo.php12
-rw-r--r--Zotlabs/Widget/Wiki_pages.php2
-rw-r--r--include/connections.php2
-rw-r--r--include/import.php1
-rw-r--r--include/zot.php2
-rw-r--r--install/schema_postgres.sql296
-rw-r--r--util/hmessages.po91
-rwxr-xr-xutil/update_autoloader3
-rwxr-xr-xutil/update_theme_repo1
-rwxr-xr-xutil/zotsh/zotsh.py4
-rw-r--r--view/es-es/hmessages.po85
-rw-r--r--view/es-es/hstrings.php2
-rw-r--r--view/fr/hmessages.po52
-rw-r--r--view/it/hmessages.po80
-rw-r--r--view/it/hstrings.php2
16 files changed, 388 insertions, 249 deletions
diff --git a/Zotlabs/Access/PermissionLimits.php b/Zotlabs/Access/PermissionLimits.php
index c11dc95e6..b8ca3034c 100644
--- a/Zotlabs/Access/PermissionLimits.php
+++ b/Zotlabs/Access/PermissionLimits.php
@@ -88,4 +88,4 @@ class PermissionLimits {
return false;
}
-} \ No newline at end of file
+}
diff --git a/Zotlabs/Module/Photo.php b/Zotlabs/Module/Photo.php
index 8efc00707..3f68e5c67 100644
--- a/Zotlabs/Module/Photo.php
+++ b/Zotlabs/Module/Photo.php
@@ -151,6 +151,18 @@ class Photo extends \Zotlabs\Web\Controller {
$allowed = attach_can_view($r[0]['uid'],$observer_xchan,$photo);
}
+ if(intval($r[0]['photo_usage'])) {
+ $allowed = 1;
+ if(intval($r[0]['photo_usage']) === PHOTO_COVER)
+ if($resolution < PHOTO_RES_COVER_1200)
+ $allowed = (-1);
+ if(intval($r[0]['photo_usage']) === PHOTO_PROFILE)
+ if(! in_array($resolution,[4,5,6]))
+ $allowed = (-1);
+ }
+ if($allowed === (-1))
+ $allowed = attach_can_view($r[0]['uid'],$observer_xchan,$photo);
+
$channel = channelx_by_n($r[0]['uid']);
// Now we'll see if we can access the photo
diff --git a/Zotlabs/Widget/Wiki_pages.php b/Zotlabs/Widget/Wiki_pages.php
index ecd2c9100..06b32b5f5 100644
--- a/Zotlabs/Widget/Wiki_pages.php
+++ b/Zotlabs/Widget/Wiki_pages.php
@@ -59,6 +59,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/connections.php b/include/connections.php
index 807d07220..76b26e468 100644
--- a/include/connections.php
+++ b/include/connections.php
@@ -379,6 +379,8 @@ function contact_remove($channel_id, $abook_id) {
intval($channel_id)
);
if($r) {
+ $r = fetch_post_tags($r,true);
+
foreach($r as $rr) {
$x = q("select uid from term where otype = %d and oid = %d ttype = %d limit 1",
intval(TERM_OBJ_POST),
diff --git a/include/import.php b/include/import.php
index 91a26b23b..4953834c9 100644
--- a/include/import.php
+++ b/include/import.php
@@ -167,6 +167,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 5c74947d6..19e1298c3 100644
--- a/include/zot.php
+++ b/include/zot.php
@@ -4313,7 +4313,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 d4ffed130..4584e4f2e 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,8 +247,8 @@ 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',
@@ -293,7 +293,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',
@@ -304,7 +304,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,
@@ -318,12 +318,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,
@@ -342,7 +342,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" (
@@ -389,9 +389,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',
@@ -402,19 +402,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")
);
@@ -448,8 +448,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")
@@ -464,8 +464,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")
);
@@ -480,8 +480,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 '',
@@ -490,10 +490,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");
@@ -512,11 +512,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");
@@ -543,9 +543,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',
@@ -564,7 +564,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,
@@ -587,32 +587,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")
);
@@ -714,9 +714,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',
@@ -728,13 +728,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")
@@ -758,10 +758,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")
@@ -775,14 +775,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")
);
@@ -801,7 +801,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,
@@ -850,18 +850,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");
@@ -889,7 +889,7 @@ create index "pchan_hash" on pchan ("pchan_hash");
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,
@@ -899,7 +899,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,
@@ -912,16 +912,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,
@@ -948,8 +948,8 @@ CREATE TABLE "poll" (
"poll_channel" bigint NOT NULL DEFAULT '0',
"poll_author" text NOT NULL,
"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")
);
@@ -985,7 +985,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,
@@ -1001,8 +1001,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 '',
@@ -1039,7 +1039,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")
@@ -1061,7 +1061,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,
@@ -1096,8 +1096,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")
);
@@ -1107,8 +1107,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,
@@ -1119,19 +1119,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 '',
@@ -1151,7 +1151,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 '',
@@ -1171,8 +1171,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,
@@ -1211,7 +1211,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")
);
@@ -1223,7 +1223,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 '',
@@ -1265,16 +1265,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");
@@ -1319,7 +1319,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")
);
@@ -1329,10 +1329,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")
);
@@ -1344,7 +1344,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")
);
@@ -1353,7 +1353,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 '',
@@ -1384,7 +1384,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/hmessages.po b/util/hmessages.po
index 98dbc59e6..f0ab348ef 100644
--- a/util/hmessages.po
+++ b/util/hmessages.po
@@ -10541,6 +10541,66 @@ msgstr ""
msgid "Until modified date yyyy-mm-dd"
msgstr ""
+#: ../../addon/gravatar/gravatar.php:123
+msgid "generic profile image"
+msgstr ""
+
+#: ../../addon/gravatar/gravatar.php:124
+msgid "random geometric pattern"
+msgstr ""
+
+#: ../../addon/gravatar/gravatar.php:125
+msgid "monster face"
+msgstr ""
+
+#: ../../addon/gravatar/gravatar.php:126
+msgid "computer generated face"
+msgstr ""
+
+#: ../../addon/gravatar/gravatar.php:127
+msgid "retro arcade style face"
+msgstr ""
+
+#: ../../addon/gravatar/gravatar.php:128
+msgid "Hub default profile photo"
+msgstr ""
+
+#: ../../addon/gravatar/gravatar.php:143
+msgid "Information"
+msgstr ""
+
+#: ../../addon/gravatar/gravatar.php:143
+msgid ""
+"Libravatar addon is installed, too. Please disable Libravatar addon or this "
+"Gravatar addon.<br>The Libravatar addon will fall back to Gravatar if "
+"nothing was found at Libravatar."
+msgstr ""
+
+#: ../../addon/gravatar/gravatar.php:150 ../../addon/msgfooter/msgfooter.php:46
+#: ../../addon/xmpp/xmpp.php:91
+msgid "Save Settings"
+msgstr ""
+
+#: ../../addon/gravatar/gravatar.php:151
+msgid "Default avatar image"
+msgstr ""
+
+#: ../../addon/gravatar/gravatar.php:151
+msgid "Select default avatar image if none was found at Gravatar. See README"
+msgstr ""
+
+#: ../../addon/gravatar/gravatar.php:152
+msgid "Rating of images"
+msgstr ""
+
+#: ../../addon/gravatar/gravatar.php:152
+msgid "Select the appropriate avatar rating for your site. See README"
+msgstr ""
+
+#: ../../addon/gravatar/gravatar.php:165
+msgid "Gravatar settings updated."
+msgstr ""
+
#: ../../addon/visage/visage.php:93
msgid "Recent Channel/Profile Viewers"
msgstr ""
@@ -11327,17 +11387,13 @@ msgstr ""
#: ../../addon/twitter/twitter.php:184
msgid ""
-"No consumer key pair for Twitter found. Please contact your site "
-"administrator."
+"<strong><em>Or</em></strong> become a project sponsor (Hubzilla Project only)"
msgstr ""
#: ../../addon/twitter/twitter.php:206
msgid ""
-"At this Hubzilla instance the Twitter plugin was enabled but you have not "
-"yet connected your account to your Twitter account. To do so click the "
-"button below to get a PIN from Twitter which you have to copy into the input "
-"box below and submit the form. Only your <strong>public</strong> posts will "
-"be posted to Twitter."
+"Please indicate if you would like your first name or full name (or nothing) "
+"to appear in our sponsor listing"
msgstr ""
#: ../../addon/twitter/twitter.php:208
@@ -11350,10 +11406,11 @@ msgstr ""
#: ../../addon/twitter/twitter.php:238
msgid ""
-"<strong>Note:</strong> Due your privacy settings (<em>Hide your profile "
-"details from unknown viewers?</em>) the link potentially included in public "
-"postings relayed to Twitter will lead the visitor to a blank page informing "
-"the visitor that the access to your profile has been restricted."
+"This is a fairly comprehensive and complete guitar chord dictionary which "
+"will list most of the available ways to play a certain chord, starting from "
+"the base of the fingerboard up to a few frets beyond the twelfth fret "
+"(beyond which everything repeats). A couple of non-standard tunings are "
+"provided for the benefit of slide players, etc."
msgstr ""
#: ../../addon/twitter/twitter.php:243
@@ -13644,11 +13701,11 @@ msgstr ""
msgid "Unable to obtain identity information from database"
msgstr ""
-#: ../../include/channel.php:68
+#: ../../include/channel.php:69
msgid "Empty name"
msgstr ""
-#: ../../include/channel.php:71
+#: ../../include/channel.php:72
msgid "Name too long"
msgstr ""
@@ -13928,9 +13985,11 @@ msgstr ""
#: ../../include/bbcode.php:259
#, php-format
-msgid ""
-"This post contains an installable %s element, however you lack permissions "
-"to install it on this site."
+msgid "You have reached your limit of %1$.0f Mbytes attachment storage."
+msgstr ""
+
+#: ../../include/bbcode.php:331
+msgid "card"
msgstr ""
#: ../../include/bbcode.php:350
diff --git a/util/update_autoloader b/util/update_autoloader
new file mode 100755
index 000000000..1e65bed5c
--- /dev/null
+++ b/util/update_autoloader
@@ -0,0 +1,3 @@
+#!/usr/bin/env bash -f
+
+composer install --optimize-autoloader --no-dev
diff --git a/util/update_theme_repo b/util/update_theme_repo
index b4de55568..3d3cafe84 100755
--- a/util/update_theme_repo
+++ b/util/update_theme_repo
@@ -2,6 +2,7 @@
set -f
+set -f
if [ $# -ne 1 ]; then
echo usage: $0 repository
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/es-es/hmessages.po b/view/es-es/hmessages.po
index b4087fef8..84983a60f 100644
--- a/view/es-es/hmessages.po
+++ b/view/es-es/hmessages.po
@@ -3361,13 +3361,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:121 ../../include/acl_selectors.php:88
@@ -5359,13 +5361,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:194
msgid "Unable to locate original post."
@@ -9980,12 +9990,12 @@ msgid "Login failed."
msgstr "El acceso ha fallado."
#: ../../addon/openid/Mod_Id.php:85 ../../include/selectors.php:49
-#: ../../include/selectors.php:66 ../../include/channel.php:1480
+#: ../../include/selectors.php:66 ../../include/channel.php:1481
msgid "Male"
msgstr "Hombre"
#: ../../addon/openid/Mod_Id.php:87 ../../include/selectors.php:49
-#: ../../include/selectors.php:66 ../../include/channel.php:1478
+#: ../../include/selectors.php:66 ../../include/channel.php:1479
msgid "Female"
msgstr "Mujer"
@@ -11852,11 +11862,11 @@ msgstr "Transexual"
msgid "Hermaphrodite"
msgstr "Hermafrodita"
-#: ../../include/selectors.php:49 ../../include/channel.php:1484
+#: ../../include/selectors.php:49 ../../include/channel.php:1485
msgid "Neuter"
msgstr "Neutral"
-#: ../../include/selectors.php:49 ../../include/channel.php:1486
+#: ../../include/selectors.php:49 ../../include/channel.php:1487
msgid "Non-specific"
msgstr "No especificado"
@@ -13081,28 +13091,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 &ldquo;%3$s&rdquo;"
-msgstr "%1$s ha cambiado %2$s a &ldquo;%3$s&rdquo;"
+#: ../../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:265 ../../include/attach.php:361
msgid "Item was not found."
@@ -13301,23 +13308,23 @@ msgstr "Cambiar su foto del perfil"
msgid "Trans"
msgstr "Trans"
-#: ../../include/channel.php:1528
+#: ../../include/channel.php:1529
msgid "Like this channel"
msgstr "Me gusta este canal"
-#: ../../include/channel.php:1552
+#: ../../include/channel.php:1553
msgid "j F, Y"
msgstr "j F Y"
-#: ../../include/channel.php:1553
+#: ../../include/channel.php:1554
msgid "j F"
msgstr "j F"
-#: ../../include/channel.php:1560
+#: ../../include/channel.php:1561
msgid "Birthday:"
msgstr "Cumpleaños:"
-#: ../../include/channel.php:1573
+#: ../../include/channel.php:1574
#, php-format
msgid "for %1$d %2$s"
msgstr "por %1$d %2$s"
diff --git a/view/es-es/hstrings.php b/view/es-es/hstrings.php
index 6f07ece43..d035cb699 100644
--- a/view/es-es/hstrings.php
+++ b/view/es-es/hstrings.php
@@ -522,7 +522,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";
diff --git a/view/fr/hmessages.po b/view/fr/hmessages.po
index c5263c2df..8c75a9416 100644
--- a/view/fr/hmessages.po
+++ b/view/fr/hmessages.po
@@ -4360,12 +4360,12 @@ msgstr "Notifications du système"
msgid "Connection added."
msgstr "Connexion ajoutée."
-#: ../../Zotlabs/Module/Import.php:144
+#: ../../Zotlabs/Module/Import.php:143
#, php-format
msgid "Your service plan only allows %d channels."
msgstr "Votre forfait n'autorise que %d canaux."
-#: ../../Zotlabs/Module/Import.php:158
+#: ../../Zotlabs/Module/Import.php:157
msgid "No channel. Import failed."
msgstr "Pas de canal. Echec de l'import."
@@ -8910,6 +8910,54 @@ msgstr "Voir le flux public"
msgid "New Member Links"
msgstr "Liens pour les nouveaux membres"
+#: ../../Zotlabs/Widget/Newmember.php:33
+msgid "Profile Creation"
+msgstr "Création de profil"
+
+#: ../../Zotlabs/Widget/Newmember.php:35
+msgid "Upload profile photo"
+msgstr "Téléverser la photo du profil"
+
+#: ../../Zotlabs/Widget/Newmember.php:36
+msgid "Upload cover photo"
+msgstr "Téléverser la photo de couverture"
+
+#: ../../Zotlabs/Widget/Newmember.php:37 ../../include/nav.php:119
+msgid "Edit your profile"
+msgstr "Modifier votre profil"
+
+#: ../../Zotlabs/Widget/Newmember.php:40
+msgid "Find and Connect with others"
+msgstr "Trouver et connecter avec des autres personnes"
+
+#: ../../Zotlabs/Widget/Newmember.php:44
+msgid "Manage your connections"
+msgstr "Gérez vos connexions"
+
+#: ../../Zotlabs/Widget/Newmember.php:47
+msgid "Communicate"
+msgstr "Communiquer"
+
+#: ../../Zotlabs/Widget/Newmember.php:49
+msgid "View your channel homepage"
+msgstr "Voir la page d'accueil de votre canal"
+
+#: ../../Zotlabs/Widget/Newmember.php:50
+msgid "View your network stream"
+msgstr "Visualisez votre flux réseau"
+
+#: ../../Zotlabs/Widget/Newmember.php:56
+msgid "Documentation"
+msgstr "Documentation"
+
+#: ../../Zotlabs/Widget/Newmember.php:67
+msgid "View public stream. Warning: not moderated"
+msgstr "Voir le flux public. Avertissement : non modéré"
+
+#: ../../Zotlabs/Widget/Newmember.php:71
+msgid "New Member Links"
+msgstr "Liens pour les nouveaux membres"
+
#: ../../Zotlabs/Widget/Admin.php:23 ../../Zotlabs/Widget/Admin.php:60
msgid "Member registrations waiting for confirmation"
msgstr "Inscriptions en attente d'approbation"
diff --git a/view/it/hmessages.po b/view/it/hmessages.po
index fc4772846..ae8107d44 100644
--- a/view/it/hmessages.po
+++ b/view/it/hmessages.po
@@ -5656,8 +5656,8 @@ msgstr "Permessi predefiniti dei nuovi contatti"
#: ../../Zotlabs/Module/Connedit.php:850 ../../include/items.php:4214
#, php-format
-msgid "Connection: %s"
-msgstr "Contatto: %s"
+msgid "%1$s tagged %2$s's %3$s with %4$s"
+msgstr "%1$s ha taggato %3$s di %2$s con %4$s"
#: ../../Zotlabs/Module/Connedit.php:851 ../../Zotlabs/Module/Defperms.php:239
msgid "Apply these permissions automatically"
@@ -5690,9 +5690,9 @@ msgstr "Indirizzi disponibili"
#: ../../Zotlabs/Module/Connedit.php:866 ../../Zotlabs/Module/Defperms.php:245
msgid ""
-"The permissions indicated on this page will be applied to all new "
-"connections."
-msgstr "I permessi indicati su questa pagina saranno applicati a tutti i nuovi contatti da ora in poi."
+"Some individual permissions may have been preset or locked based on your "
+"channel type and privacy settings."
+msgstr ""
#: ../../Zotlabs/Module/Connedit.php:867
msgid "Connection Tools"
@@ -5839,41 +5839,42 @@ msgstr "Foto"
msgid "Files"
msgstr "Archivio file"
-#: ../../Zotlabs/Module/Menu.php:49
-msgid "Unable to update menu."
-msgstr "Impossibile aggiornare il menù."
+#: ../../Zotlabs/Module/Profiles.php:594
+msgid "Profile updated."
+msgstr "Profilo aggiornato."
-#: ../../Zotlabs/Module/Menu.php:60
-msgid "Unable to create menu."
-msgstr "Impossibile creare il menù."
+#: ../../Zotlabs/Module/Profiles.php:678
+msgid "Hide your connections list from viewers of this profile"
+msgstr "Nascondi la tua lista di contatti ai visitatori di questo profilo"
-#: ../../Zotlabs/Module/Menu.php:98 ../../Zotlabs/Module/Menu.php:110
-msgid "Menu Name"
-msgstr "Nome del menu"
+#: ../../Zotlabs/Module/Profiles.php:725
+msgid "Edit Profile Details"
+msgstr "Modifica i dettagli del profilo"
-#: ../../Zotlabs/Module/Menu.php:98
-msgid "Unique name (not visible on webpage) - required"
-msgstr "Nome unico (non visibile sulla pagina) - obbligatorio"
+#: ../../Zotlabs/Module/Profiles.php:727
+msgid "View this profile"
+msgstr "Guarda questo profilo"
-#: ../../Zotlabs/Module/Menu.php:99 ../../Zotlabs/Module/Menu.php:111
-msgid "Menu Title"
-msgstr "Titolo del menu"
+#: ../../Zotlabs/Module/Profiles.php:728 ../../Zotlabs/Module/Profiles.php:827
+#: ../../include/channel.php:1320
+msgid "Edit visibility"
+msgstr "Cambia la visibilità"
-#: ../../Zotlabs/Module/Menu.php:99
-msgid "Visible on webpage - leave empty for no title"
-msgstr "Visibile sulla pagina - lascia vuoto per non avere un titolo"
+#: ../../Zotlabs/Module/Profiles.php:729
+msgid "Profile Tools"
+msgstr "Gestione del profilo"
-#: ../../Zotlabs/Module/Menu.php:100
-msgid "Allow Bookmarks"
-msgstr "Permetti i segnalibri"
+#: ../../Zotlabs/Module/Profiles.php:730
+msgid "Change cover photo"
+msgstr "Cambia la copertina del canale"
-#: ../../Zotlabs/Module/Menu.php:100 ../../Zotlabs/Module/Menu.php:157
-msgid "Menu may be used to store saved bookmarks"
-msgstr "Puoi salvare i segnalibri nei menù"
+#: ../../Zotlabs/Module/Profiles.php:731 ../../include/channel.php:1290
+msgid "Change profile photo"
+msgstr "Cambia la foto del profilo"
-#: ../../Zotlabs/Module/Menu.php:101 ../../Zotlabs/Module/Menu.php:159
-msgid "Submit and proceed"
-msgstr "Salva e procedi"
+#: ../../Zotlabs/Module/Profiles.php:732
+msgid "Create a new profile using these settings"
+msgstr "Crea un nuovo profilo usando queste impostazioni"
#: ../../Zotlabs/Module/Menu.php:107 ../../include/text.php:2423
msgid "Menus"
@@ -5883,13 +5884,14 @@ msgstr "Menù"
msgid "Bookmarks allowed"
msgstr "Permetti segnalibri"
-#: ../../Zotlabs/Module/Menu.php:119
-msgid "Delete this menu"
-msgstr "Elimina questo menù"
+#: ../../Zotlabs/Module/Profiles.php:739 ../../Zotlabs/Widget/Newmember.php:53
+#: ../../include/datetime.php:58
+msgid "Miscellaneous"
+msgstr "Altro"
-#: ../../Zotlabs/Module/Menu.php:120 ../../Zotlabs/Module/Menu.php:154
-msgid "Edit menu contents"
-msgstr "Modifica i contenuti del menù"
+#: ../../Zotlabs/Module/Profiles.php:741
+msgid "Import profile from file"
+msgstr "Importa il profilo da un file"
#: ../../Zotlabs/Module/Menu.php:121
msgid "Edit this menu"
@@ -6543,7 +6545,7 @@ msgstr "Homepage del progetto"
#: ../../Zotlabs/Module/Siteinfo.php:32
msgid "Developer homepage"
-msgstr "Homepege dello sviluppatore"
+msgstr "Homepage dello sviluppatore"
#: ../../Zotlabs/Module/Ratings.php:70
msgid "No ratings"
diff --git a/view/it/hstrings.php b/view/it/hstrings.php
index 42fc58347..1f5527946 100644
--- a/view/it/hstrings.php
+++ b/view/it/hstrings.php
@@ -1393,7 +1393,7 @@ App::$strings["This site is powered by \$Projectname"] = "Questo sito è costrui
App::$strings["Federated and decentralised networking and identity services provided by Zot"] = "";
App::$strings["Version %s"] = "Versione %s";
App::$strings["Project homepage"] = "Homepage del progetto";
-App::$strings["Developer homepage"] = "Homepege dello sviluppatore";
+App::$strings["Developer homepage"] = "Homepage dello sviluppatore";
App::$strings["No ratings"] = "Nessuna valutazione";
App::$strings["Ratings"] = "Valutazioni";
App::$strings["Rating: "] = "Valutazione:";
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-19 16:34:41 +0000