13 files changed, 363 insertions, 309 deletions

diff --git a/Zotlabs/Widget/Wiki_pages.php b/Zotlabs/Widget/Wiki_pages.php
index ac44b8d88..6e3a22551 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 702fa7e54..f32f655da 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 dad30dbb0..37c3c1444 100644
--- a/include/zot.php
+++ b/include/zot.php
@@ -4065,7 +4065,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 65acb644b..b8bbf5867 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")
 );
@@ -712,9 +712,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',
@@ -726,13 +726,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")
@@ -756,10 +756,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")
@@ -773,14 +773,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")
 
 );
@@ -799,7 +799,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,
@@ -848,18 +848,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");
@@ -874,7 +874,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,
@@ -884,7 +884,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,
@@ -897,16 +897,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,
@@ -929,10 +929,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")
 
 );
@@ -941,10 +941,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");
@@ -962,7 +962,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,
@@ -978,8 +978,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 '',
@@ -1016,7 +1016,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")
@@ -1038,7 +1038,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,
@@ -1073,8 +1073,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")
 );
@@ -1084,8 +1084,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,
@@ -1096,19 +1096,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 '',
@@ -1128,7 +1128,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 '',
@@ -1148,8 +1148,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,
@@ -1188,7 +1188,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")
 );
@@ -1200,7 +1200,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 '',
@@ -1214,8 +1214,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"),
@@ -1240,16 +1240,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");
@@ -1294,7 +1294,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")
 );
@@ -1304,10 +1304,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")
 );
@@ -1319,7 +1319,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")
 );
@@ -1328,7 +1328,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 '',
@@ -1359,7 +1359,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 8a2eb961f..b1be04b10 100644
--- a/util/hmessages.po
+++ b/util/hmessages.po
@@ -6313,20 +6313,21 @@ msgstr ""
 msgid "Redeliver"
 msgstr ""
 
-#: ../../Zotlabs/Module/Sources.php:37
-msgid "Failed to create source. No channel selected."
+#: ../../Zotlabs/Module/Profiles.php:728 ../../Zotlabs/Module/Profiles.php:827
+#: ../../include/channel.php:1081
+msgid "Edit visibility"
 msgstr ""
 
-#: ../../Zotlabs/Module/Sources.php:51
-msgid "Source created."
+#: ../../Zotlabs/Module/Profiles.php:729
+msgid "Profile Tools"
 msgstr ""
 
-#: ../../Zotlabs/Module/Sources.php:64
-msgid "Source updated."
+#: ../../Zotlabs/Module/Profiles.php:730
+msgid "Change cover photo"
 msgstr ""
 
-#: ../../Zotlabs/Module/Sources.php:90
-msgid "*"
+#: ../../Zotlabs/Module/Profiles.php:731 ../../include/channel.php:1052
+msgid "Change profile photo"
 msgstr ""
 
 #: ../../Zotlabs/Module/Sources.php:96
@@ -6334,56 +6335,52 @@ msgstr ""
 msgid "Channel Sources"
 msgstr ""
 
-#: ../../Zotlabs/Module/Sources.php:97
-msgid "Manage remote sources of content for your channel."
+#: ../../Zotlabs/Module/Profiles.php:733
+msgid "Clone this profile"
 msgstr ""
 
-#: ../../Zotlabs/Module/Sources.php:98 ../../Zotlabs/Module/Sources.php:108
-msgid "New Source"
+#: ../../Zotlabs/Module/Profiles.php:734
+msgid "Delete this profile"
 msgstr ""
 
-#: ../../Zotlabs/Module/Sources.php:109 ../../Zotlabs/Module/Sources.php:143
-msgid ""
-"Import all or selected content from the following channel into this channel "
-"and distribute it according to your channel settings."
+#: ../../Zotlabs/Module/Profiles.php:735
+msgid "Add profile things"
 msgstr ""
 
-#: ../../Zotlabs/Module/Sources.php:110 ../../Zotlabs/Module/Sources.php:144
-msgid "Only import content with these words (one per line)"
+#: ../../Zotlabs/Module/Profiles.php:736 ../../include/conversation.php:1654
+msgid "Personal"
 msgstr ""
 
-#: ../../Zotlabs/Module/Sources.php:110 ../../Zotlabs/Module/Sources.php:144
-msgid "Leave blank to import all public content"
+#: ../../Zotlabs/Module/Profiles.php:738
+msgid "Relation"
 msgstr ""
 
-#: ../../Zotlabs/Module/Sources.php:111 ../../Zotlabs/Module/Sources.php:148
-msgid "Channel Name"
+#: ../../Zotlabs/Module/Profiles.php:739 ../../include/datetime.php:55
+msgid "Miscellaneous"
 msgstr ""
 
-#: ../../Zotlabs/Module/Sources.php:112 ../../Zotlabs/Module/Sources.php:147
-msgid ""
-"Add the following categories to posts imported from this source (comma "
-"separated)"
+#: ../../Zotlabs/Module/Profiles.php:741
+msgid "Import profile from file"
 msgstr ""
 
 #: ../../Zotlabs/Module/Sources.php:133 ../../Zotlabs/Module/Sources.php:161
 msgid "Source not found."
 msgstr ""
 
-#: ../../Zotlabs/Module/Sources.php:140
-msgid "Edit Source"
+#: ../../Zotlabs/Module/Profiles.php:744
+msgid "Marital status"
 msgstr ""
 
-#: ../../Zotlabs/Module/Sources.php:141
-msgid "Delete Source"
+#: ../../Zotlabs/Module/Profiles.php:745
+msgid "Sexual preference"
 msgstr ""
 
-#: ../../Zotlabs/Module/Sources.php:169
-msgid "Source removed"
+#: ../../Zotlabs/Module/Profiles.php:748
+msgid "Profile name"
 msgstr ""
 
-#: ../../Zotlabs/Module/Sources.php:171
-msgid "Unable to remove source."
+#: ../../Zotlabs/Module/Profiles.php:750
+msgid "This is your default profile."
 msgstr ""
 
 #: ../../Zotlabs/Module/Like.php:19
@@ -10532,17 +10529,13 @@ msgstr ""
 
 #: ../../addon/twitter/twitter.php:183
 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:205
 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:207
@@ -10555,10 +10548,11 @@ msgstr ""
 
 #: ../../addon/twitter/twitter.php:237
 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:242
@@ -10567,8 +10561,8 @@ msgstr ""
 
 #: ../../addon/twitter/twitter.php:242
 msgid ""
-"If enabled your public postings can be posted to the associated Twitter "
-"account"
+"Valid examples include  A, A7, Am7, Amaj7, Amaj9, Ammaj7, Aadd4, Asus2Add4, "
+"E7b13b11 ..."
 msgstr ""
 
 #: ../../addon/twitter/twitter.php:246
@@ -12846,16 +12840,14 @@ msgstr ""
 msgid "Encrypted content"
 msgstr ""
 
-#: ../../include/bbcode.php:249
+#: ../../include/attach.php:673
 #, php-format
-msgid "Install %s element: "
+msgid "File exceeds size limit of %d"
 msgstr ""
 
-#: ../../include/bbcode.php:253
+#: ../../include/attach.php:687
 #, 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
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/vendor/composer/autoload_classmap.php b/vendor/composer/autoload_classmap.php
index 125c5c325..5bdec71aa 100644
--- a/vendor/composer/autoload_classmap.php
+++ b/vendor/composer/autoload_classmap.php
@@ -791,6 +791,7 @@ return array(
     'Zotlabs\\Module\\Admin\\Security' => $baseDir . '/Zotlabs/Module/Admin/Security.php',
     'Zotlabs\\Module\\Admin\\Site' => $baseDir . '/Zotlabs/Module/Admin/Site.php',
     'Zotlabs\\Module\\Admin\\Themes' => $baseDir . '/Zotlabs/Module/Admin/Themes.php',
+    'Zotlabs\\Module\\Ap_probe' => $baseDir . '/Zotlabs/Module/Ap_probe.php',
     'Zotlabs\\Module\\Api' => $baseDir . '/Zotlabs/Module/Api.php',
     'Zotlabs\\Module\\Appman' => $baseDir . '/Zotlabs/Module/Appman.php',
     'Zotlabs\\Module\\Apporder' => $baseDir . '/Zotlabs/Module/Apporder.php',
diff --git a/vendor/composer/autoload_static.php b/vendor/composer/autoload_static.php
index 0374e7872..c2fe0cc04 100644
--- a/vendor/composer/autoload_static.php
+++ b/vendor/composer/autoload_static.php
@@ -920,6 +920,7 @@ class ComposerStaticInit7b34d7e50a62201ec5d5e526a5b8b35d
         'Zotlabs\\Module\\Admin\\Security' => __DIR__ . '/../..' . '/Zotlabs/Module/Admin/Security.php',
         'Zotlabs\\Module\\Admin\\Site' => __DIR__ . '/../..' . '/Zotlabs/Module/Admin/Site.php',
         'Zotlabs\\Module\\Admin\\Themes' => __DIR__ . '/../..' . '/Zotlabs/Module/Admin/Themes.php',
+        'Zotlabs\\Module\\Ap_probe' => __DIR__ . '/../..' . '/Zotlabs/Module/Ap_probe.php',
         'Zotlabs\\Module\\Api' => __DIR__ . '/../..' . '/Zotlabs/Module/Api.php',
         'Zotlabs\\Module\\Appman' => __DIR__ . '/../..' . '/Zotlabs/Module/Appman.php',
         'Zotlabs\\Module\\Apporder' => __DIR__ . '/../..' . '/Zotlabs/Module/Apporder.php',
diff --git a/view/de/hmessages.po b/view/de/hmessages.po
index 85fb8ca4e..6f0c1b05f 100644
--- a/view/de/hmessages.po
+++ b/view/de/hmessages.po
@@ -840,6 +840,11 @@ msgstr "Nur Beiträge"
 msgid "Insufficient permissions.  Request redirected to profile page."
 msgstr "Unzureichende Zugriffsrechte. Die Anfrage wurde zur Profil-Seite umgeleitet."
 
+#: ../../Zotlabs/Module/Lang.php:8 ../../Zotlabs/Lib/Apps.php:256
+#: ../../addon/openid/MysqlProvider.php:69
+msgid "Language"
+msgstr "Sprache"
+
 #: ../../Zotlabs/Module/Uexport.php:57 ../../Zotlabs/Module/Uexport.php:58
 msgid "Export Channel"
 msgstr "Kanal exportieren"
@@ -1246,6 +1251,13 @@ msgstr "Termin nicht gefunden."
 msgid "event"
 msgstr "Termin"
 
+#: ../../Zotlabs/Module/Events.php:275 ../../Zotlabs/Lib/Apps.php:243
+#: ../../include/conversation.php:1799 ../../include/conversation.php:1802
+#: ../../include/nav.php:195 ../../include/nav.php:397
+#: ../../include/nav.php:400
+msgid "Events"
+msgstr "Termine"
+
 #: ../../Zotlabs/Module/Events.php:460
 msgid "Edit event title"
 msgstr "Termintitel bearbeiten"
@@ -2595,7 +2607,7 @@ msgstr "[Experimentell]"
 msgid "[Unsupported]"
 msgstr "[Nicht unterstützt]"
 
-#: ../../Zotlabs/Module/Admin/Site.php:144
+#: ../../Zotlabs/Module/Admin/Site.php:142
 msgid "Site settings updated."
 msgstr "Site-Einstellungen aktualisiert."
 
@@ -2605,42 +2617,42 @@ msgstr "Site-Einstellungen aktualisiert."
 msgid "Default"
 msgstr "Standard"
 
-#: ../../Zotlabs/Module/Admin/Site.php:181
+#: ../../Zotlabs/Module/Admin/Site.php:179
 #: ../../Zotlabs/Module/Settings/Display.php:137
 #, php-format
 msgid "%s - (Incompatible)"
 msgstr "%s - (Inkompatibel)"
 
-#: ../../Zotlabs/Module/Admin/Site.php:188
+#: ../../Zotlabs/Module/Admin/Site.php:186
 #: ../../Zotlabs/Module/Settings/Display.php:151
 msgid "mobile"
 msgstr "mobil"
 
-#: ../../Zotlabs/Module/Admin/Site.php:190
+#: ../../Zotlabs/Module/Admin/Site.php:188
 msgid "experimental"
 msgstr "experimentell"
 
-#: ../../Zotlabs/Module/Admin/Site.php:192
+#: ../../Zotlabs/Module/Admin/Site.php:190
 msgid "unsupported"
 msgstr "nicht unterstützt"
 
-#: ../../Zotlabs/Module/Admin/Site.php:238
+#: ../../Zotlabs/Module/Admin/Site.php:236
 msgid "Yes - with approval"
 msgstr "Ja - mit Zustimmung"
 
-#: ../../Zotlabs/Module/Admin/Site.php:244
+#: ../../Zotlabs/Module/Admin/Site.php:242
 msgid "My site is not a public server"
 msgstr "Mein Server ist kein öffentlicher Server"
 
-#: ../../Zotlabs/Module/Admin/Site.php:245
+#: ../../Zotlabs/Module/Admin/Site.php:243
 msgid "My site has paid access only"
 msgstr "Meine Seite hat nur bezahlten Zugriff"
 
-#: ../../Zotlabs/Module/Admin/Site.php:246
+#: ../../Zotlabs/Module/Admin/Site.php:244
 msgid "My site has free access only"
 msgstr "Meine Seite hat nur freien Zugriff"
 
-#: ../../Zotlabs/Module/Admin/Site.php:247
+#: ../../Zotlabs/Module/Admin/Site.php:245
 msgid "My site offers free accounts with optional paid upgrades"
 msgstr "Mein Server bietet kostenlose Konten mit der Möglichkeit zu bezahlten Upgrades"
 
@@ -4238,23 +4250,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."
@@ -6434,6 +6446,10 @@ msgstr "Quelle gelöscht"
 msgid "Unable to remove source."
 msgstr "Konnte die Quelle nicht löschen."
 
+#: ../../Zotlabs/Module/Rpost.php:63 ../../Zotlabs/Lib/Apps.php:257
+msgid "Post"
+msgstr "Beitrag schreiben"
+
 #: ../../Zotlabs/Module/Like.php:19
 msgid "Like/Dislike"
 msgstr "Mögen/Nicht mögen"
@@ -6519,6 +6535,10 @@ msgstr "Aktion durchgeführt."
 msgid "Thank you."
 msgstr "Vielen Dank."
 
+#: ../../Zotlabs/Module/Directory.php:80 ../../Zotlabs/Lib/Apps.php:244
+msgid "Directory"
+msgstr "Verzeichnis"
+
 #: ../../Zotlabs/Module/Directory.php:245
 #, php-format
 msgid "%d rating"
@@ -7045,6 +7065,10 @@ msgstr "Forum"
 msgid "Search Results For:"
 msgstr "Suchergebnisse für:"
 
+#: ../../Zotlabs/Module/Network.php:157 ../../Zotlabs/Lib/Apps.php:235
+msgid "Activity"
+msgstr "Aktivität"
+
 #: ../../Zotlabs/Module/Network.php:221
 msgid "Privacy group is empty"
 msgstr "Gruppe ist leer"
diff --git a/view/de/hstrings.php b/view/de/hstrings.php
index 25011af40..a5e81d36c 100644
--- a/view/de/hstrings.php
+++ b/view/de/hstrings.php
@@ -60,6 +60,7 @@ App::$strings["%d message sent."] = array(
 	0 => "%d Nachricht gesendet.",
 	1 => "%d Nachrichten gesendet.",
 );
+App::$strings["Invite"] = "Einladen";
 App::$strings["You have no more invitations available"] = "Du hast keine weiteren verfügbare Einladungen";
 App::$strings["Send invitations"] = "Einladungen senden";
 App::$strings["Enter email addresses, one per line:"] = "Email-Adressen eintragen, eine pro Zeile:";
@@ -138,7 +139,9 @@ App::$strings["This site is not a directory server"] = "Diese Webseite ist kein
 App::$strings["You must be logged in to see this page."] = "Du musst angemeldet sein, um diese Seite betrachten zu können.";
 App::$strings["Posts and comments"] = "Beiträge und Kommentare";
 App::$strings["Only posts"] = "Nur Beiträge";
+App::$strings["Channel Home"] = "Mein Kanal";
 App::$strings["Insufficient permissions.  Request redirected to profile page."] = "Unzureichende Zugriffsrechte. Die Anfrage wurde zur Profil-Seite umgeleitet.";
+App::$strings["Language"] = "Sprache";
 App::$strings["Export Channel"] = "Kanal exportieren";
 App::$strings["Export your basic channel information to a file.  This acts as a backup of your connections, permissions, profile and basic data, which can be used to import your data to a new server hub, but does not contain your content."] = "Exportiert die grundlegenden Kanal-Informationen in eine kleine Datei. Diese stellt eine Sicherung Deiner Verbindungen, Berechtigungen, Profile und Basisdaten bereit, die für den Import auf einem anderen Hub verwendet werden kann, aber nicht die Beiträge Deines Kanals enthält.";
 App::$strings["Export Content"] = "Kanal und Inhalte exportieren";
@@ -207,6 +210,7 @@ App::$strings["Unable to generate preview."] = "Vorschau konnte nicht erzeugt we
 App::$strings["Event title and start time are required."] = "Titel und Startzeit des Termins sind erforderlich.";
 App::$strings["Event not found."] = "Termin nicht gefunden.";
 App::$strings["event"] = "Termin";
+App::$strings["Events"] = "Termine";
 App::$strings["Edit event title"] = "Termintitel bearbeiten";
 App::$strings["Required"] = "Benötigt";
 App::$strings["Categories (comma-separated list)"] = "Kategorien (Kommagetrennte Liste)";
@@ -884,6 +888,7 @@ App::$strings["Create new app"] = "Neue App erstellen";
 App::$strings["__ctx:mood__ %1\$s is %2\$s"] = "%1\$s ist %2\$s";
 App::$strings["Mood"] = "Laune";
 App::$strings["Set your current mood and tell your friends"] = "Wähle Deine aktuelle Stimmung und teile sie mit Deinen Freunden";
+App::$strings["Connections"] = "Verbindungen";
 App::$strings["Blocked"] = "Blockiert";
 App::$strings["Ignored"] = "Ignoriert";
 App::$strings["Hidden"] = "Versteckt";
@@ -912,12 +917,12 @@ App::$strings["Approve connection"] = "Verbindung genehmigen";
 App::$strings["Ignore connection"] = "Verbindung ignorieren";
 App::$strings["Ignore"] = "Ignorieren";
 App::$strings["Recent activity"] = "Kürzliche Aktivitäten";
-App::$strings["Connections"] = "Verbindungen";
 App::$strings["Search your connections"] = "Verbindungen durchsuchen";
 App::$strings["Connections search"] = "Verbindung suchen";
 App::$strings["Find"] = "Finde";
 App::$strings["item"] = "Beitrag";
 App::$strings["Source of Item"] = "Quelle des Elements";
+App::$strings["View Bookmarks"] = "Lesezeichen ansehen";
 App::$strings["Bookmark added"] = "Lesezeichen hinzugefügt";
 App::$strings["My Bookmarks"] = "Meine Lesezeichen";
 App::$strings["My Connections Bookmarks"] = "Lesezeichen meiner Kontakte";
@@ -932,6 +937,7 @@ App::$strings["Delete Album"] = "Album löschen";
 App::$strings["Delete Photo"] = "Foto löschen";
 App::$strings["No photos selected"] = "Keine Fotos ausgewählt";
 App::$strings["Access to this item is restricted."] = "Der Zugriff auf dieses Foto ist eingeschränkt.";
+App::$strings["Photos"] = "Fotos";
 App::$strings["%1$.2f MB of %2$.2f MB photo storage used."] = "%1$.2f MB von %2$.2f MB Foto-Speicher belegt.";
 App::$strings["%1$.2f MB photo storage used."] = "%1$.2f MB Foto-Speicher belegt.";
 App::$strings["Upload Photos"] = "Fotos hochladen";
@@ -1181,7 +1187,6 @@ App::$strings["%1\$s's Chatrooms"] = "%1\$ss Chaträume";
 App::$strings["No chatrooms available"] = "Keine Chaträume verfügbar";
 App::$strings["Expiration"] = "Verfall";
 App::$strings["min"] = "min";
-App::$strings["Photos"] = "Fotos";
 App::$strings["Files"] = "Dateien";
 App::$strings["Unable to update menu."] = "Kann Menü nicht aktualisieren.";
 App::$strings["Unable to create menu."] = "Kann Menü nicht erstellen.";
@@ -1326,11 +1331,11 @@ App::$strings["Ratings"] = "Bewertungen";
 App::$strings["Rating: "] = "Bewertung: ";
 App::$strings["Website: "] = "Webseite: ";
 App::$strings["Description: "] = "Beschreibung: ";
+App::$strings["Webpages"] = "Webseiten";
 App::$strings["Import Webpage Elements"] = "Webseitenelemente importieren";
 App::$strings["Import selected"] = "Import ausgewählt";
 App::$strings["Export Webpage Elements"] = "Webseitenelemente exportieren";
 App::$strings["Export selected"] = "Exportieren ausgewählt";
-App::$strings["Webpages"] = "Webseiten";
 App::$strings["Actions"] = "Aktionen";
 App::$strings["Page Link"] = "Seiten-Link";
 App::$strings["Page Title"] = "Seitentitel";
@@ -1381,6 +1386,7 @@ App::$strings["Edit Source"] = "Quelle bearbeiten";
 App::$strings["Delete Source"] = "Quelle löschen";
 App::$strings["Source removed"] = "Quelle gelöscht";
 App::$strings["Unable to remove source."] = "Konnte die Quelle nicht löschen.";
+App::$strings["Post"] = "Beitrag schreiben";
 App::$strings["Like/Dislike"] = "Mögen/Nicht mögen";
 App::$strings["This action is restricted to members."] = "Diese Aktion kann nur von Mitgliedern ausgeführt werden.";
 App::$strings["Please <a href=\"rmagic\">login with your \$Projectname ID</a> or <a href=\"register\">register as a new \$Projectname member</a> to continue."] = "Um fortzufahren <a href=\"rmagic\">melde Dich bitte mit Deiner \$Projectname-ID an</a> oder <a href=\"register\">registriere Dich als neues \$Projectname-Mitglied</a>.";
@@ -1399,6 +1405,7 @@ App::$strings["%1\$s is not attending %2\$s's %3\$s"] = "%1\$s nimmt an %2\$ss %
 App::$strings["%1\$s may attend %2\$s's %3\$s"] = "%1\$s nimmt vielleicht an %2\$ss %3\$s teil";
 App::$strings["Action completed."] = "Aktion durchgeführt.";
 App::$strings["Thank you."] = "Vielen Dank.";
+App::$strings["Directory"] = "Verzeichnis";
 App::$strings["%d rating"] = array(
 	0 => "%d Bewertung",
 	1 => "%d Bewertungen",
@@ -1430,6 +1437,7 @@ App::$strings["Oldest to Newest"] = "Älteste zuerst";
 App::$strings["No entries (some entries may be hidden)."] = "Keine Einträge gefunden (einige könnten versteckt sein).";
 App::$strings["Xchan Lookup"] = "Xchan-Suche";
 App::$strings["Lookup xchan beginning with (or webbie): "] = "Nach xchans oder Webbies (Kanal-Adressen) suchen, die wie folgt beginnen:";
+App::$strings["Suggest Channels"] = "Kanäle vorschlagen";
 App::$strings["No suggestions available. If this is a new site, please try again in 24 hours."] = "Keine Vorschläge vorhanden. Wenn das ein neuer Server ist, versuche es in 24 Stunden noch einmal.";
 App::$strings["Ignore/Hide"] = "Ignorieren/Verstecken";
 App::$strings["Unable to find your hub."] = "Konnte Deinen Server nicht finden.";
@@ -1438,6 +1446,7 @@ App::$strings["Unable to lookup recipient."] = "Konnte den Empfänger nicht find
 App::$strings["Unable to communicate with requested channel."] = "Die Kommunikation mit dem ausgewählten Kanal ist fehlgeschlagen.";
 App::$strings["Cannot verify requested channel."] = "Verifizierung des angeforderten Kanals fehlgeschlagen.";
 App::$strings["Selected channel has private message restrictions. Send failed."] = "Der ausgewählte Kanal hat Einschränkungen bzgl. privater Nachrichten. Senden fehlgeschlagen.";
+App::$strings["Mail"] = "Mail";
 App::$strings["Messages"] = "Nachrichten";
 App::$strings["message"] = "Nachricht";
 App::$strings["Message recalled."] = "Nachricht widerrufen.";
@@ -1479,6 +1488,7 @@ App::$strings["Or enter new bookmark folder name"] = "Oder gib einen neuen Namen
 App::$strings["Enter a folder name"] = "Gib einen Ordnernamen ein";
 App::$strings["or select an existing folder (doubleclick)"] = "oder wähle einen vorhanden Ordner aus (Doppelklick)";
 App::$strings["Save to Folder"] = "In Ordner speichern";
+App::$strings["Remote Diagnostics"] = "Ferndiagnose";
 App::$strings["Fetching URL returns error: %1\$s"] = "Abrufen der URL gab einen Fehler zurück: %1\$s";
 App::$strings["Maximum daily site registrations exceeded. Please try again tomorrow."] = "Maximale Anzahl täglicher Neuanmeldungen erreicht. Bitte versuche es morgen noch einmal.";
 App::$strings["Please indicate acceptance of the Terms of Service. Registration failed."] = "Bitte stimme den Nutzungsbedingungen zu. Registrierung fehlgeschlagen.";
@@ -1524,6 +1534,7 @@ App::$strings["No such group"] = "Gruppe nicht gefunden";
 App::$strings["No such channel"] = "Kanal nicht gefunden";
 App::$strings["forum"] = "Forum";
 App::$strings["Search Results For:"] = "Suchergebnisse für:";
+App::$strings["Activity"] = "Aktivität";
 App::$strings["Privacy group is empty"] = "Gruppe ist leer";
 App::$strings["Privacy group: "] = "Gruppe:";
 App::$strings["Invalid connection."] = "Ungültige Verbindung.";
@@ -1592,26 +1603,13 @@ App::$strings["4. Expert - I can write computer code"] = "4. Experte - Ich kann
 App::$strings["5. Wizard - I probably know more than you do"] = "5. Zauberer - ich kann wahrscheinlich mehr als Du";
 App::$strings["Site Admin"] = "Hub-Administration";
 App::$strings["Report Bug"] = "Fehler melden";
-App::$strings["View Bookmarks"] = "Lesezeichen ansehen";
-App::$strings["My Chatrooms"] = "Meine Chaträume";
 App::$strings["Firefox Share"] = "Teilen-Knopf für Firefox";
-App::$strings["Remote Diagnostics"] = "Ferndiagnose";
-App::$strings["Suggest Channels"] = "Kanäle vorschlagen";
 App::$strings["Login"] = "Anmelden";
-App::$strings["Activity"] = "Aktivität";
-App::$strings["Wiki"] = "Wiki";
-App::$strings["Channel Home"] = "Mein Kanal";
-App::$strings["Events"] = "Termine";
-App::$strings["Directory"] = "Verzeichnis";
-App::$strings["Mail"] = "Mail";
 App::$strings["Chat"] = "Chat";
 App::$strings["Probe"] = "Testen";
 App::$strings["Suggest"] = "Empfehlen";
 App::$strings["Random Channel"] = "Zufälliger Kanal";
-App::$strings["Invite"] = "Einladen";
 App::$strings["Features"] = "Funktionen";
-App::$strings["Language"] = "Sprache";
-App::$strings["Post"] = "Beitrag schreiben";
 App::$strings["Profile Photo"] = "Profilfoto";
 App::$strings["Purchase"] = "Kaufen";
 App::$strings["Undelete"] = "Wieder hergestellt";
@@ -2903,6 +2901,7 @@ App::$strings["Friendica"] = "Friendica";
 App::$strings["OStatus"] = "OStatus";
 App::$strings["GNU-Social"] = "GNU-Social";
 App::$strings["RSS/Atom"] = "RSS/Atom";
+App::$strings["ActivityPub"] = "ActivityPub";
 App::$strings["Diaspora"] = "Diaspora";
 App::$strings["Facebook"] = "Facebook";
 App::$strings["Zot"] = "Zot!";
diff --git a/view/es-es/hmessages.po b/view/es-es/hmessages.po
index 99cc86107..901c37572 100644
--- a/view/es-es/hmessages.po
+++ b/view/es-es/hmessages.po
@@ -828,6 +828,11 @@ msgstr "Solo publicaciones"
 msgid "Insufficient permissions.  Request redirected to profile page."
 msgstr "Permisos insuficientes. Petición redirigida a la página del perfil."
 
+#: ../../Zotlabs/Module/Lang.php:8 ../../Zotlabs/Lib/Apps.php:256
+#: ../../addon/openid/MysqlProvider.php:69
+msgid "Language"
+msgstr "Idioma"
+
 #: ../../Zotlabs/Module/Uexport.php:57 ../../Zotlabs/Module/Uexport.php:58
 msgid "Export Channel"
 msgstr "Exportar el canal"
@@ -1234,6 +1239,13 @@ msgstr "Evento no encontrado."
 msgid "event"
 msgstr "evento"
 
+#: ../../Zotlabs/Module/Events.php:275 ../../Zotlabs/Lib/Apps.php:243
+#: ../../include/conversation.php:1799 ../../include/conversation.php:1802
+#: ../../include/nav.php:195 ../../include/nav.php:397
+#: ../../include/nav.php:400
+msgid "Events"
+msgstr "Eventos"
+
 #: ../../Zotlabs/Module/Events.php:460
 msgid "Edit event title"
 msgstr "Editar el título del evento"
@@ -2583,7 +2595,7 @@ msgstr "[Experimental]"
 msgid "[Unsupported]"
 msgstr "[No soportado]"
 
-#: ../../Zotlabs/Module/Admin/Site.php:144
+#: ../../Zotlabs/Module/Admin/Site.php:142
 msgid "Site settings updated."
 msgstr "Ajustes del sitio actualizados."
 
@@ -2593,42 +2605,42 @@ msgstr "Ajustes del sitio actualizados."
 msgid "Default"
 msgstr "Predeterminado"
 
-#: ../../Zotlabs/Module/Admin/Site.php:181
+#: ../../Zotlabs/Module/Admin/Site.php:179
 #: ../../Zotlabs/Module/Settings/Display.php:137
 #, php-format
 msgid "%s - (Incompatible)"
 msgstr "%s - (Incompatible)"
 
-#: ../../Zotlabs/Module/Admin/Site.php:188
+#: ../../Zotlabs/Module/Admin/Site.php:186
 #: ../../Zotlabs/Module/Settings/Display.php:151
 msgid "mobile"
 msgstr "móvil"
 
-#: ../../Zotlabs/Module/Admin/Site.php:190
+#: ../../Zotlabs/Module/Admin/Site.php:188
 msgid "experimental"
 msgstr "experimental"
 
-#: ../../Zotlabs/Module/Admin/Site.php:192
+#: ../../Zotlabs/Module/Admin/Site.php:190
 msgid "unsupported"
 msgstr "no soportado"
 
-#: ../../Zotlabs/Module/Admin/Site.php:238
+#: ../../Zotlabs/Module/Admin/Site.php:236
 msgid "Yes - with approval"
 msgstr "Sí - con aprobación"
 
-#: ../../Zotlabs/Module/Admin/Site.php:244
+#: ../../Zotlabs/Module/Admin/Site.php:242
 msgid "My site is not a public server"
 msgstr "Mi sitio no es un servidor público"
 
-#: ../../Zotlabs/Module/Admin/Site.php:245
+#: ../../Zotlabs/Module/Admin/Site.php:243
 msgid "My site has paid access only"
 msgstr "Mi sitio es un servicio de pago"
 
-#: ../../Zotlabs/Module/Admin/Site.php:246
+#: ../../Zotlabs/Module/Admin/Site.php:244
 msgid "My site has free access only"
 msgstr "Mi sitio es un servicio gratuito"
 
-#: ../../Zotlabs/Module/Admin/Site.php:247
+#: ../../Zotlabs/Module/Admin/Site.php:245
 msgid "My site offers free accounts with optional paid upgrades"
 msgstr "Mi sitio ofrece cuentas gratuitas con opciones extra de pago"
 
@@ -3207,13 +3219,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:118 ../../include/acl_selectors.php:183
@@ -5112,13 +5126,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."
@@ -6422,6 +6444,10 @@ msgstr "Fuente eliminada"
 msgid "Unable to remove source."
 msgstr "No se puede eliminar la fuente."
 
+#: ../../Zotlabs/Module/Rpost.php:63 ../../Zotlabs/Lib/Apps.php:257
+msgid "Post"
+msgstr "Publicación"
+
 #: ../../Zotlabs/Module/Like.php:19
 msgid "Like/Dislike"
 msgstr "Me gusta/No me gusta"
@@ -6507,6 +6533,10 @@ msgstr "Acción completada."
 msgid "Thank you."
 msgstr "Gracias."
 
+#: ../../Zotlabs/Module/Directory.php:80 ../../Zotlabs/Lib/Apps.php:244
+msgid "Directory"
+msgstr "Directorio"
+
 #: ../../Zotlabs/Module/Directory.php:245
 #, php-format
 msgid "%d rating"
@@ -7033,6 +7063,10 @@ msgstr "foro"
 msgid "Search Results For:"
 msgstr "Buscar resultados para:"
 
+#: ../../Zotlabs/Module/Network.php:157 ../../Zotlabs/Lib/Apps.php:235
+msgid "Activity"
+msgstr "Actividad"
+
 #: ../../Zotlabs/Module/Network.php:221
 msgid "Privacy group is empty"
 msgstr "El grupo de canales está vacío"
@@ -12433,28 +12467,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:250 ../../include/attach.php:339
 msgid "Item was not found."
diff --git a/view/es-es/hstrings.php b/view/es-es/hstrings.php
index 0e2a03bb5..1a3c6d997 100644
--- a/view/es-es/hstrings.php
+++ b/view/es-es/hstrings.php
@@ -60,6 +60,7 @@ App::$strings["%d message sent."] = array(
 	0 => "%d mensajes enviados.",
 	1 => "%d mensajes enviados.",
 );
+App::$strings["Invite"] = "Invitar";
 App::$strings["You have no more invitations available"] = "No tiene más invitaciones disponibles";
 App::$strings["Send invitations"] = "Enviar invitaciones";
 App::$strings["Enter email addresses, one per line:"] = "Introduzca las direcciones de correo electrónico, una por línea:";
@@ -138,7 +139,9 @@ App::$strings["This site is not a directory server"] = "Este sitio no es un serv
 App::$strings["You must be logged in to see this page."] = "Debe haber iniciado sesión para poder ver esta página.";
 App::$strings["Posts and comments"] = "Publicaciones y comentarios";
 App::$strings["Only posts"] = "Solo publicaciones";
+App::$strings["Channel Home"] = "Mi canal";
 App::$strings["Insufficient permissions.  Request redirected to profile page."] = "Permisos insuficientes. Petición redirigida a la página del perfil.";
+App::$strings["Language"] = "Idioma";
 App::$strings["Export Channel"] = "Exportar el canal";
 App::$strings["Export your basic channel information to a file.  This acts as a backup of your connections, permissions, profile and basic data, which can be used to import your data to a new server hub, but does not contain your content."] = "Exportar la información básica del canal a un fichero. Este equivale a una copia de seguridad de sus conexiones, el perfil y datos fundamentales, que puede usarse para importar sus datos a un nuevo servidor, pero no incluye su contenido.";
 App::$strings["Export Content"] = "Exportar contenidos";
@@ -207,6 +210,7 @@ App::$strings["Unable to generate preview."] = "No se puede crear la vista previ
 App::$strings["Event title and start time are required."] = "Se requieren el título del evento y su hora de inicio.";
 App::$strings["Event not found."] = "Evento no encontrado.";
 App::$strings["event"] = "evento";
+App::$strings["Events"] = "Eventos";
 App::$strings["Edit event title"] = "Editar el título del evento";
 App::$strings["Required"] = "Obligatorio";
 App::$strings["Categories (comma-separated list)"] = "Temas (lista separada por comas)";
@@ -510,7 +514,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";
@@ -884,6 +890,7 @@ App::$strings["Create new app"] = "Crear una nueva aplicación";
 App::$strings["__ctx:mood__ %1\$s is %2\$s"] = "%1\$s está %2\$s";
 App::$strings["Mood"] = "Estado de ánimo";
 App::$strings["Set your current mood and tell your friends"] = "Describir su estado de ánimo para comunicárselo a sus amigos";
+App::$strings["Connections"] = "Conexiones";
 App::$strings["Blocked"] = "Bloqueadas";
 App::$strings["Ignored"] = "Ignoradas";
 App::$strings["Hidden"] = "Ocultas";
@@ -912,12 +919,12 @@ App::$strings["Approve connection"] = "Aprobar esta conexión";
 App::$strings["Ignore connection"] = "Ignorar esta conexión";
 App::$strings["Ignore"] = "Ignorar";
 App::$strings["Recent activity"] = "Actividad reciente";
-App::$strings["Connections"] = "Conexiones";
 App::$strings["Search your connections"] = "Buscar sus conexiones";
 App::$strings["Connections search"] = "Buscar conexiones";
 App::$strings["Find"] = "Encontrar";
 App::$strings["item"] = "elemento";
 App::$strings["Source of Item"] = "Origen del elemento";
+App::$strings["View Bookmarks"] = "Ver los marcadores";
 App::$strings["Bookmark added"] = "Marcador añadido";
 App::$strings["My Bookmarks"] = "Mis marcadores";
 App::$strings["My Connections Bookmarks"] = "Marcadores de mis conexiones";
@@ -932,6 +939,7 @@ App::$strings["Delete Album"] = "Borrar álbum";
 App::$strings["Delete Photo"] = "Borrar foto";
 App::$strings["No photos selected"] = "No hay fotos seleccionadas";
 App::$strings["Access to this item is restricted."] = "El acceso a este elemento está restringido.";
+App::$strings["Photos"] = "Fotos";
 App::$strings["%1$.2f MB of %2$.2f MB photo storage used."] = "%1$.2f MB de %2$.2f MB de almacenamiento de fotos utilizado.";
 App::$strings["%1$.2f MB photo storage used."] = "%1$.2f MB de almacenamiento de fotos utilizado.";
 App::$strings["Upload Photos"] = "Subir fotos";
@@ -1181,7 +1189,6 @@ App::$strings["%1\$s's Chatrooms"] = "Salas de chat de %1\$s";
 App::$strings["No chatrooms available"] = "No hay salas de chat disponibles";
 App::$strings["Expiration"] = "Caducidad";
 App::$strings["min"] = "min";
-App::$strings["Photos"] = "Fotos";
 App::$strings["Files"] = "Ficheros";
 App::$strings["Unable to update menu."] = "No se puede actualizar el menú.";
 App::$strings["Unable to create menu."] = "No se puede crear el menú.";
@@ -1326,11 +1333,11 @@ App::$strings["Ratings"] = "Valoraciones";
 App::$strings["Rating: "] = "Valoración:";
 App::$strings["Website: "] = "Sitio web:";
 App::$strings["Description: "] = "Descripción:";
+App::$strings["Webpages"] = "Páginas web";
 App::$strings["Import Webpage Elements"] = "Importar elementos de una página web";
 App::$strings["Import selected"] = "Importar elementos seleccionados";
 App::$strings["Export Webpage Elements"] = "Exportar elementos de una página web";
 App::$strings["Export selected"] = "Exportar los elementos seleccionados";
-App::$strings["Webpages"] = "Páginas web";
 App::$strings["Actions"] = "Acciones";
 App::$strings["Page Link"] = "Vínculo de la página";
 App::$strings["Page Title"] = "Título de página";
@@ -1381,6 +1388,7 @@ App::$strings["Edit Source"] = "Editar fuente";
 App::$strings["Delete Source"] = "Eliminar fuente";
 App::$strings["Source removed"] = "Fuente eliminada";
 App::$strings["Unable to remove source."] = "No se puede eliminar la fuente.";
+App::$strings["Post"] = "Publicación";
 App::$strings["Like/Dislike"] = "Me gusta/No me gusta";
 App::$strings["This action is restricted to members."] = "Esta acción está restringida solo para miembros.";
 App::$strings["Please <a href=\"rmagic\">login with your \$Projectname ID</a> or <a href=\"register\">register as a new \$Projectname member</a> to continue."] = "Por favor, <a href=\"rmagic\">identifíquese con su \$Projectname ID</a> o <a href=\"register\">rregístrese como un nuevo \$Projectname member</a> para continuar.";
@@ -1399,6 +1407,7 @@ App::$strings["%1\$s is not attending %2\$s's %3\$s"] = "%3\$s de %2\$s: %1\$s n
 App::$strings["%1\$s may attend %2\$s's %3\$s"] = "%3\$s de %2\$s: %1\$s quizá participe";
 App::$strings["Action completed."] = "Acción completada.";
 App::$strings["Thank you."] = "Gracias.";
+App::$strings["Directory"] = "Directorio";
 App::$strings["%d rating"] = array(
 	0 => "%d valoración",
 	1 => "%d valoraciones",
@@ -1430,6 +1439,7 @@ App::$strings["Oldest to Newest"] = "De más antiguo a más nuevo";
 App::$strings["No entries (some entries may be hidden)."] = "Sin entradas (algunas entradas pueden estar ocultas).";
 App::$strings["Xchan Lookup"] = "Búsqueda de canales";
 App::$strings["Lookup xchan beginning with (or webbie): "] = "Buscar un canal (o un \"webbie\") que comience por:";
+App::$strings["Suggest Channels"] = "Sugerir canales";
 App::$strings["No suggestions available. If this is a new site, please try again in 24 hours."] = "No hay sugerencias disponibles. Si es un sitio nuevo, espere 24 horas y pruebe de nuevo.";
 App::$strings["Ignore/Hide"] = "Ignorar/Ocultar";
 App::$strings["Unable to find your hub."] = "No se puede encontrar su servidor.";
@@ -1438,6 +1448,7 @@ App::$strings["Unable to lookup recipient."] = "No se puede asociar a un destina
 App::$strings["Unable to communicate with requested channel."] = "No se puede establecer la comunicación con el canal solicitado.";
 App::$strings["Cannot verify requested channel."] = "No se puede verificar el canal solicitado.";
 App::$strings["Selected channel has private message restrictions. Send failed."] = "El canal seleccionado tiene restricciones sobre los mensajes privados. El envío falló.";
+App::$strings["Mail"] = "Correo";
 App::$strings["Messages"] = "Mensajes";
 App::$strings["message"] = "mensaje";
 App::$strings["Message recalled."] = "Mensaje revocado.";
@@ -1479,6 +1490,7 @@ App::$strings["Or enter new bookmark folder name"] = "O introduzca un nuevo nomb
 App::$strings["Enter a folder name"] = "Escriba un nombre de carpeta";
 App::$strings["or select an existing folder (doubleclick)"] = "o seleccione una (con un doble click)";
 App::$strings["Save to Folder"] = "Guardar en carpeta";
+App::$strings["Remote Diagnostics"] = "Diagnóstico remoto";
 App::$strings["Fetching URL returns error: %1\$s"] = "Al intentar obtener la dirección, retorna el error: %1\$s";
 App::$strings["Maximum daily site registrations exceeded. Please try again tomorrow."] = "Se ha superado el límite máximo de inscripciones diarias de este sitio. Por favor, pruebe de nuevo mañana.";
 App::$strings["Please indicate acceptance of the Terms of Service. Registration failed."] = "Por favor, confirme que acepta los Términos del servicio. El registro ha fallado.";
@@ -1524,6 +1536,7 @@ App::$strings["No such group"] = "No se encuentra el grupo";
 App::$strings["No such channel"] = "No se encuentra el  canal";
 App::$strings["forum"] = "foro";
 App::$strings["Search Results For:"] = "Buscar resultados para:";
+App::$strings["Activity"] = "Actividad";
 App::$strings["Privacy group is empty"] = "El grupo de canales está vacío";
 App::$strings["Privacy group: "] = "Grupo de canales: ";
 App::$strings["Invalid connection."] = "Conexión no válida.";
@@ -1592,26 +1605,13 @@ App::$strings["4. Expert - I can write computer code"] = "4. Experto - Puedo esc
 App::$strings["5. Wizard - I probably know more than you do"] = "5. Asistente - probablemente sé más que tú";
 App::$strings["Site Admin"] = "Administrador del sitio";
 App::$strings["Report Bug"] = "Informe de errores";
-App::$strings["View Bookmarks"] = "Ver los marcadores";
-App::$strings["My Chatrooms"] = "Mis salas de chat";
 App::$strings["Firefox Share"] = "Servicio de compartición de Firefox";
-App::$strings["Remote Diagnostics"] = "Diagnóstico remoto";
-App::$strings["Suggest Channels"] = "Sugerir canales";
 App::$strings["Login"] = "Iniciar sesión";
-App::$strings["Activity"] = "Actividad";
-App::$strings["Wiki"] = "Wiki";
-App::$strings["Channel Home"] = "Mi canal";
-App::$strings["Events"] = "Eventos";
-App::$strings["Directory"] = "Directorio";
-App::$strings["Mail"] = "Correo";
 App::$strings["Chat"] = "Chat";
 App::$strings["Probe"] = "Probar";
 App::$strings["Suggest"] = "Sugerir";
 App::$strings["Random Channel"] = "Canal aleatorio";
-App::$strings["Invite"] = "Invitar";
 App::$strings["Features"] = "Funcionalidades";
-App::$strings["Language"] = "Idioma";
-App::$strings["Post"] = "Publicación";
 App::$strings["Profile Photo"] = "Foto del perfil";
 App::$strings["Purchase"] = "Comprar";
 App::$strings["Undelete"] = "Recuperar";
@@ -2903,6 +2903,7 @@ App::$strings["Friendica"] = "Friendica";
 App::$strings["OStatus"] = "OStatus";
 App::$strings["GNU-Social"] = "GNU Social";
 App::$strings["RSS/Atom"] = "RSS/Atom";
+App::$strings["ActivityPub"] = "ActivityPub";
 App::$strings["Diaspora"] = "Diaspora";
 App::$strings["Facebook"] = "Facebook";
 App::$strings["Zot"] = "Zot";