Merge https://github.com/redmatrix/hubzilla into pending_merge

18 files changed, 1520 insertions, 657 deletions

diff --git a/doc/faq_developers.bb b/doc/faq_developers.bb
index 027efe8f4..c74ec3c56 100644
--- a/doc/faq_developers.bb
+++ b/doc/faq_developers.bb
@@ -28,6 +28,427 @@ function foo() {
 [/code]
 
 
+An example (large) &$a object showing some of its many members and structures-- in JSON format for easier readability-- is here:
+
+[code]  {
+  "category": null,
+  "nav_sel": {
+    "home": null,
+    "community": null,
+    "contacts": null,
+    "directory": null,
+    "settings": null,
+    "notifications": null,
+    "intros": null,
+    "messages": null,
+    "register": null,
+    "manage": null,
+    "profiles": null,
+    "network": null,
+    "help": "active"
+  },
+  "argc": 2,
+  "install": false,
+  "is_mobile": false,
+  "timezone": "America/Los_Angeles",
+  "sourcename": "",
+  "module_loaded": true,
+  "contacts": null,
+  "interactive": true,
+  "config": {
+    "system": {
+      "max_import_size": 200000,
+      "logfile": "/tmp/hubzilla.log",
+      "channels_active_monthly_stat": "3",
+      "last_expire_day": "4",
+      "loglevel": "4",
+      "sitename": "Hubzilla",
+      "access_policy": 0,
+      "directory_mode": 0,
+      "debugging": "1",
+      "verify_email": 1,
+      "register_text": "",
+      "urlverify": "687474703a2f2f6875627a696c6c61",
+      "register_policy": 2,
+      "theme": "redbasic",
+      "smarty3_folder": "/home/src/hubzilla/store/[data]/smarty3",
+      "channels_total_stat": "4",
+      "admin_email": "foo@bar.com",
+      "channels_active_halfyear_stat": "3",
+      "location_hash": "910792b7bf75296cbf238ae29a5493f3c78805812652d3f0396e88763a26ce1b",
+      "local_posts_stat": "63",
+      "lastpollcheck": "2015-11-03 07:40:38",
+      "baseurl": "http://hubzilla",
+      "config_loaded": true,
+      "pubkey": "-----BEGIN PUBLIC KEY-----\nMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAuR4neYAxuWwZg34fqofU\nZg8y1YSTX39Tzhgcgn7QFCeH600NHJBHWXbPdS5imdYq6W+P1vtKxsVNLI9d01+j\ns3MF3amgEuJH0X+JLLjyittQksyAiukvh/o4MSit8mcYcXs8Dxaybe+KaY09N4ys\ndxKcn6EPlthUiQPJMPitybp4vYkw9LupWZOQWThz9ur6T5wnk9ehBIPFN8gYvKrT\nAG9RFfbq3y59rTOiSHNA2PIUMzo2HEh4QBVCvVolKt7GPhUM4Bze40VRe8ELZTPp\nyehNxEHyhHZfnC+XRVNlvSPXBU2vtE+zcok+5DXsKAqMt8YgFIThNEOLQKvff/lv\nsdGvk6jJZok7+9lKtYfwnNnRWf51aVVuSAO3aIIVLroLyhiji0KA7G5YRHeF1rNL\np88e8peMyUMCX2Svv1wudJzqOfWSvOpY0NLZrdGZXRN2/rXyHPRD/TtS3SNDdd7J\nYQUjyxGjF1/zB3xqvPr09s8tzXqJl9pZNcN9iz58oPBbTuGdUr8CJro/3nVHgkRf\nw7/zhapSW1UaroJjecrC9yWx5QUD3KNU51phsP9iHCFdMyPBdUHjmNvE5f7YJWBh\nO1rRKUoE3i+eHLYAWeYblFX7T+EKOCB2hd3NUrIqDL98OSpfDiZT7rf9PdcWCOY5\nuddm6KzwHjffl5kZd8MM8bMCAwEAAQ==\n-----END PUBLIC KEY-----\n",
+      "addon": "converse",
+      "lastpoll": "2015-11-04 07:40:01",
+      "php_path": "/usr/bin/php",
+      "allowed_themes": "redbasic",
+      "sellpage": "",
+      "prvkey": "-----BEGIN PRIVATE KEY-----\n-----END PRIVATE KEY-----\n",
+      "directory_server": "https://red.zottel.red",
+      "curl_ssl_ciphers": "ALL:!eNULL",
+      "db_version": "1158"
+    },
+    "config": {
+      "config_loaded": true
+    },
+    "feature": {
+      "config_loaded": true
+    },
+    "2": {
+      "redbasic": {
+        "schema": "dark",
+        "comment_indent": "",
+        "toolicon_activecolour": "",
+        "item_colour": "",
+        "nav_gradient_top": "",
+        "nav_active_icon_colour": "",
+        "nav_active_gradient_top": "",
+        "top_photo": "",
+        "converse_width": "",
+        "nav_min_opacity": "",
+        "body_font_size": "",
+        "reply_photo": "",
+        "background_colour": "",
+        "radius": "",
+        "nav_gradient_bottom": "",
+        "toolicon_colour": "",
+        "nav_active_gradient_bottom": "",
+        "nav_icon_colour": "",
+        "narrow_navbar": "",
+        "nav_bg": "",
+        "comment_item_colour": "",
+        "config_loaded": true,
+        "banner_colour": "",
+        "comment_border_colour": "",
+        "align_left": "",
+        "font_size": "",
+        "font_colour": "",
+        "nav_bd": "",
+        "photo_shadow": "",
+        "background_image": "",
+        "link_colour": ""
+      },
+      "system": {
+        "network_list_mode": "0",
+        "post_joingroup": "0",
+        "channel_list_mode": "0",
+        "title_tosource": "0",
+        "blocktags": "0",
+        "photo_path": "%Y-%m",
+        "suggestme": "0",
+        "autoperms": "0",
+        "hide_presence": "0",
+        "channel_divmore_height": "400",
+        "network_divmore_height": "400",
+        "post_profilechange": "0",
+        "channel_menu": "",
+        "always_show_in_notices": "0",
+        "use_browser_location": "0",
+        "update_interval": "80000",
+        "itemspage": "20",
+        "attach_path": "%Y-%m",
+        "permissions_role": "social",
+        "vnotify": "2047",
+        "post_newfriend": "0",
+        "config_loaded": true,
+        "no_smilies": "0",
+        "evdays": "3",
+        "user_scalable": "1"
+      }
+    }
+  },
+  "layout": {
+    "region_aside": "\n<div class="widget"><h3>Documentation</h3><ul class="nav nav-pills nav-stacked"><li><a href="help/general">Project/Site Information</a></li><li><a href="help/members">For Members</a></li><li><a href="help/admins">For Administrators</a></li><li><a href="help/develop">For Developers</a></li></ul></div>\n"
+  },
+  "is_sys": false,
+  "content": null,
+  "cid": null,
+  "profile_uid": 0,
+  "hooks": {
+    "construct_page": [
+      [
+        "addon/converse/converse.php",
+        "converse_content"
+      ]
+    ]
+  },
+  "strings": [],
+  "js_sources": [
+    "jquery.js",
+    "library/justifiedGallery/jquery.justifiedGallery.min.js",
+    "library/sprintf.js/dist/sprintf.min.js",
+    "spin.js",
+    "jquery.spin.js",
+    "jquery.textinputs.js",
+    "autocomplete.js",
+    "library/jquery-textcomplete/jquery.textcomplete.js",
+    "library/jquery.timeago.js",
+    "library/readmore.js/readmore.js",
+    "library/jgrowl/jquery.jgrowl_minimized.js",
+    "library/cryptojs/components/core-min.js",
+    "library/cryptojs/rollups/aes.js",
+    "library/cryptojs/rollups/rabbit.js",
+    "library/cryptojs/rollups/tripledes.js",
+    "acl.js",
+    "webtoolkit.base64.js",
+    "main.js",
+    "crypto.js",
+    "library/jRange/jquery.range.js",
+    "library/colorbox/jquery.colorbox-min.js",
+    "library/jquery.AreYouSure/jquery.are-you-sure.js",
+    "library/tableofcontents/jquery.toc.js",
+    "library/bootstrap/js/bootstrap.min.js",
+    "library/bootbox/bootbox.min.js",
+    "library/bootstrap-tagsinput/bootstrap-tagsinput.js",
+    "library/datetimepicker/jquery.datetimepicker.js",
+    "library/bootstrap-colorpicker/dist/js/bootstrap-colorpicker.js",
+    "view/theme/redbasic/js/redbasic.js",
+    "mod_help.js"
+  ],
+  "channel": {
+    "channel_hash": "uRy0nF-urp6k_bFrkdtCc2EkBynwpgCJL_FQFoTwyw2Hep7AHkrSt1MZcHWV_8DQucNlHSY1vHgUNS2Fvoirpw",
+    "channel_address": "testes",
+    "channel_primary": "1",
+    "channel_allow_gid": "",
+    "xchan_deleted": "0",
+    "xchan_connpage": "",
+    "channel_r_storage": "1",
+    "xchan_pubforum": "0",
+    "channel_pubkey": "-----BEGIN PUBLIC KEY-----\nMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEA7MP/xxsq/srA8I7m+WKf\nHlguwwg0b1tz+I3o+djp7b+wF8q03XPKQpYmKfXIj47vpAOu75nKA4Tn90lLymmk\nSXUHogOqOMy1CHoaVrAw2T2/tAeRoMAjAJ5IxSOAM7Xda0nVUK6FmfxPcvftKf9y\nPmvvFadXpaHT4JGPH0tszDhGXLkqlt9xSkIkpsgMA6emj/7bacc6x8eTdtvzo2e5\n/NyPXvBKH4henmYaKjq/4aIYZcBWYVGt6onxaP2j1cSNbksnOY7GbJl+hy95iFoZ\nDWGxiFwQd+CroiBbdlpVGp13cV/WKp2spZzlzkmCRGYoNbbM5RlgFLnmyTa4XMZE\nwnA3ZUB59MsrUJK+0H/utiZrpX5NQcFl33z8k5zB3pPnhc5S5/P+UJZRnqhet1wQ\n7AZVmdP30D75QD8LZ4SytZ1DHn/N76EsVhSADNMnUfEphs708V33Z0gFWultYDoK\nlvXUf4O0/V8GTufFHb6XdAiy92IUzrormXCpXoOmdOcJdaH9RnotZi/DkuQ0zP+Y\nCvxU9nrjyZvAwAdew//XFDjw4HoThVM4k4jzkIhCTlCao/yRnNM7A/i3OKcXq9wU\n7OZqcRfM9o0BFpZTIoXB7BMtpeioJcBi/7FUaV9U9uYLFuLL0qWa1YxLwfsN9rDk\n6A1gbhD60G9/dAbolp8xAHkCAwEAAQ==\n-----END PUBLIC KEY-----\n",
+    "xchan_flags": "0",
+    "channel_allow_cid": "",
+    "xchan_censored": "0",
+    "channel_w_pages": "128",
+    "xchan_instance_url": "",
+    "xchan_photo_s": "http://hubzilla/photo/profile/s/2",
+    "channel_w_stream": "128",
+    "channel_timezone": "America/Los_Angeles",
+    "xchan_pubkey": "-----BEGIN PUBLIC KEY-----\nMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEA7MP/xxsq/srA8I7m+WKf\nHlguwwg0b1tz+I3o+djp7b+wF8q03XPKQpYmKfXIj47vpAOu75nKA4Tn90lLymmk\nSXUHogOqOMy1CHoaVrAw2T2/tAeRoMAjAJ5IxSOAM7Xda0nVUK6FmfxPcvftKf9y\nPmvvFadXpaHT4JGPH0tszDhGXLkqlt9xSkIkpsgMA6emj/7bacc6x8eTdtvzo2e5\n/NyPXvBKH4henmYaKjq/4aIYZcBWYVGt6onxaP2j1cSNbksnOY7GbJl+hy95iFoZ\nDWGxiFwQd+CroiBbdlpVGp13cV/WKp2spZzlzkmCRGYoNbbM5RlgFLnmyTa4XMZE\nwnA3ZUB59MsrUJK+0H/utiZrpX5NQcFl33z8k5zB3pPnhc5S5/P+UJZRnqhet1wQ\n7AZVmdP30D75QD8LZ4SytZ1DHn/N76EsVhSADNMnUfEphs708V33Z0gFWultYDoK\nlvXUf4O0/V8GTufFHb6XdAiy92IUzrormXCpXoOmdOcJdaH9RnotZi/DkuQ0zP+Y\nCvxU9nrjyZvAwAdew//XFDjw4HoThVM4k4jzkIhCTlCao/yRnNM7A/i3OKcXq9wU\n7OZqcRfM9o0BFpZTIoXB7BMtpeioJcBi/7FUaV9U9uYLFuLL0qWa1YxLwfsN9rDk\n6A1gbhD60G9/dAbolp8xAHkCAwEAAQ==\n-----END PUBLIC KEY-----\n",
+    "channel_w_chat": "128",
+    "xchan_connurl": "http://hubzilla/poco/testes",
+    "channel_guid_sig": "XXX",
+    "xchan_name_date": "2015-10-09 00:45:41",
+    "channel_expire_days": "0",
+    "xchan_system": "0",
+    "xchan_photo_date": "2015-10-09 00:45:41",
+    "channel_startpage": "",
+    "channel_deny_gid": "",
+    "channel_lastpost": "2015-10-09 02:53:23",
+    "xchan_photo_m": "http://hubzilla/photo/profile/m/2",
+    "channel_passwd_reset": "",
+    "xchan_hidden": "0",
+    "xchan_selfcensored": "0",
+    "xchan_photo_mimetype": "image/jpeg",
+    "channel_a_republish": "128",
+    "channel_w_tagwall": "128",
+    "channel_r_stream": "1",
+    "channel_w_comment": "128",
+    "channel_system": "0",
+    "channel_w_mail": "128",
+    "channel_pageflags": "0",
+    "xchan_network": "zot",
+    "channel_id": "2",
+    "xchan_guid": "Ok-ycNKQYMzjokLnIz5OTCF8M5f4CtRT4vJCUeUivJhIOJWk3ORwIQgGx3P5g2Yz79KxQ-rs_Cn2G_jsgM6hmw",
+    "channel_removed": "0",
+    "channel_dirdate": "2015-10-09 00:46:00",
+    "channel_w_storage": "128",
+    "channel_w_photos": "0",
+    "channel_prvkey": "-----BEGIN PRIVATE KEY----------END PRIVATE KEY-----\n",
+    "channel_guid": "Ok-ycNKQYMzjokLnIz5OTCF8M5f4CtRT4vJCUeUivJhIOJWk3ORwIQgGx3P5g2Yz79KxQ-rs_Cn2G_jsgM6hmw",
+    "channel_max_friend_req": "0",
+    "channel_w_wall": "128",
+    "channel_r_abook": "1",
+    "channel_max_anon_mail": "0",
+    "channel_location": "",
+    "channel_a_delegate": "128",
+    "channel_deny_cid": "",
+    "channel_r_profile": "1",
+    "channel_name": "testes",
+    "xchan_guid_sig": "XXX",
+    "xchan_hash": "uRy0nF-urp6k_bFrkdtCc2EkBynwpgCJL_FQFoTwyw2Hep7AHkrSt1MZcHWV_8DQucNlHSY1vHgUNS2Fvoirpw",
+    "channel_notifyflags": "703",
+    "channel_theme": "redbasic",
+    "channel_w_like": "2",
+    "xchan_url": "http://hubzilla/channel/testes",
+    "channel_default_group": "",
+    "channel_r_photos": "0",
+    "channel_account_id": "1",
+    "xchan_addr": "testes@hubzilla",
+    "channel_r_pages": "1",
+    "channel_deleted": "0000-00-00 00:00:00",
+    "xchan_orphan": "0",
+    "xchan_follow": "http://hubzilla/follow?f=&url=%s",
+    "xchan_name": "testes",
+    "xchan_photo_l": "http://hubzilla/photo/profile/l/2"
+  },
+  "page": {
+    "content": "<div id="help-content" class="generic-content-wrapper">\n\t<div class="section-title-wrapper">\n\t<h2>Hubzilla Documentation</h2>\n\t</div>\n\t<div class="section-content-wrapper">\n\t<h2>Documentation for Developers</h2><br /><br /><h3>Technical Documentation</h3><br /><a class="zrl" href="http://hubzilla/help/Zot---A-High-Level-Overview" target="_newwin" >A high level overview of Zot</a><br /><a class="zrl" href="http://hubzilla/help/zot" target="_newwin" >An introduction to Zot</a><br /><a class="zrl" href="http://hubzilla/help/zot_structures" target="_newwin" >Zot Stuctures</a><br /><a class="zrl" href="http://hubzilla/help/comanche" target="_newwin" >Comanche Page Descriptions</a><br /><a class="zrl" href="http://hubzilla/help/Creating-Templates" target="_newwin" >Creating Comanche Templates</a><br /><a class="zrl" href="http://hubzilla/help/Widgets" target="_newwin" >Widgets</a><br /><a class="zrl" href="http://hubzilla/help/plugins" target="_newwin" >Plugins</a><br /><a class="zrl" href="http://hubzilla/help/hooks" target="_newwin" >Hooks</a><br /><a class="zrl" href="http://hubzilla/help/doco" target="_newwin" >Contributing Documentation</a><br /><a class="zrl" href="http://hubzilla/help/DerivedTheme1" target="_newwin" >Creating Derivative Themes</a><br /><a class="zrl" href="http://hubzilla/help/schema_development" target="_newwin" >Schemas</a><br /><a class="zrl" href="http://hubzilla/help/Translations" target="_newwin" >Translations</a><br /><a class="zrl" href="http://hubzilla/help/developers" target="_newwin" >Developers</a><br /><a class="zrl" href="http://hubzilla/help/intro_for_developers" target="_newwin" >Intro for Developers</a><br /><a class="zrl" href="http://hubzilla/help/database" target="_newwin" >Database schema documantation</a><br /><a class="zrl" href="http://hubzilla/help/api_functions" target="_newwin" >API functions</a><br /><a class="zrl" href="http://hubzilla/help/api_posting" target="_newwin" >Posting to the red# using the API</a><br /><a class="zrl" href="http://hubzilla/help/developer_function_primer" target="_newwin" >Red Functions 101</a><br /><a class="zrl" href="http://hubzilla/doc/html/" target="_newwin" >Code Reference (Doxygen generated - sets cookies)</a><br /><a class="zrl" href="http://hubzilla/help/to_do_doco" target="_newwin" >To-Do list for the Red Documentation Project</a><br /><a class="zrl" href="http://hubzilla/help/to_do_code" target="_newwin" >To-Do list for Developers</a><br /><a class="zrl" href="http://hubzilla/help/roadmap" target="_newwin" >Version 3 roadmap</a><br /><a class="zrl" href="http://hubzilla/help/git_for_non_developers" target="_newwin" >Git for Non-Developers</a><br /><a class="zrl" href="http://hubzilla/help/dev_beginner" target="_newwin" >Step-for-step manual for beginning developers</a><br /><br /><h3>Frequently Asked Questions For Developers</h3><br /><a class="zrl" href="http://hubzilla/help/faq_developers" target="_newwin" >FAQ For Developers</a><br /><br /><h3>External Resources</h3><br /><br /><a href="https://zothub.com/channel/one" target="_newwin" >Development Channel</a><br /><a href="https://federated.social/channel/postgres" target="_newwin" >Postgres-specific Hubzilla Admin Support Channel</a><br />\n\t</div>\n</div>\n<script>var homebase = "http://hubzilla/channel/testes";</script>",
+    "page_title": "help",
+    "title": "Help: Develop",
+    "nav": "\t<div class="container-fluid">\n\t\t<div class="navbar-header">\n\t\t\t<button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#navbar-collapse-1">\n\t\t\t\t<span class="icon-bar"></span>\n\t\t\t\t<span class="icon-bar"></span>\n\t\t\t\t<span class="icon-bar"></span>\n\t\t\t</button>\n\t\t\t<button id="expand-tabs" type="button" class="navbar-toggle" data-toggle="collapse" data-target="#tabs-collapse-1">\n\t\t\t\t<i class="icon-circle-arrow-down" id="expand-tabs-icon"></i>\n\t\t\t</button>\n\t\t\t<button id="expand-aside" type="button" class="navbar-toggle" data-toggle="offcanvas" data-target="#region_1">\n\t\t\t\t<i class="icon-circle-arrow-right" id="expand-aside-icon"></i>\n\t\t\t</button>\n\t\t\t\t\t\t\t<img class="dropdown-toggle fakelink" data-toggle="dropdown" id="avatar" src="http://hubzilla/photo/profile/m/2" alt="testes@hubzilla"><span class="caret" id="usermenu-caret"></span>\n\t\t\t\t\t\t\t\t\t<ul class="dropdown-menu" role="menu" aria-labelledby="avatar">\n\t\t\t\t\t\t\t\t\t\t\t\t<li role="presentation"><a href="channel/testes" title="Your posts and conversations" role="menuitem" id="channel_nav_btn">Home</a></li>\n\t\t\t\t\t\t\t\t\t\t\t\t<li role="presentation"><a href="profile/testes" title="Your profile page" role="menuitem" id="profile_nav_btn">View Profile</a></li>\n\t\t\t\t\t\t\t\t\t\t\t\t<li role="presentation"><a href="profiles/2" title="Edit your profile" role="menuitem" id="profiles_nav_btn">Edit Profile</a></li>\n\t\t\t\t\t\t\t\t\t\t\t\t<li role="presentation"><a href="photos/testes" title="Your photos" role="menuitem" id="photos_nav_btn">Photos</a></li>\n\t\t\t\t\t\t\t\t\t\t\t\t<li role="presentation"><a href="cloud/testes" title="Your files" role="menuitem" id="cloud_nav_btn">Files</a></li>\n\t\t\t\t\t\t\t\t\t\t\t\t<li role="presentation"><a href="chat/testes/new" title="Your chatrooms" role="menuitem" id="chat_nav_btn">Chat</a></li>\n\t\t\t\t\t\t\t\t\t\t\t\t<li role="presentation" class="divider"></li>\n\t\t\t\t\t\t\t\t\t\t\t\t<li role="presentation"><a href="settings" title="Account/Channel Settings" role="menuitem" id="settings_nav_btn">Settings</a></li>\t\t\t\t\t\t<li role="presentation"><a href="manage" title="Manage Your Channels" role="menuitem" id="manage_nav_btn">Channel Manager</a></li>\t\n\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t<li role="presentation" class="divider"></li>\n\t\t\t\t\t\t<li role="presentation"><a href="admin/" title="Site Setup and Configuration" role="menuitem" id="admin_nav_btn">Admin</a></li>\n\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t<li role="presentation" class="divider"></li>\n\t\t\t\t\t\t<li role="presentation"><a href="logout" title="End this session" role="menuitem" id="logout_nav_btn">Logout</a></li>\n\t\t\t\t\t\t\t\t\t\t\t</ul>\n\t\t\t\t\t\t\t\t\t</div>\n\t\t<div class="collapse navbar-collapse" id="navbar-collapse-1">\n\t\t\t<ul class="nav navbar-nav navbar-left">\n\t\t\t\t\t\t\n\t\t\t\n\t\t\t\t\t\t\t<li class=" hidden-xs">\n\t\t\t\t\t<a href="network" title="Your grid" id="network_nav_btn"><i class="icon-th"></i></a>\n\t\t\t\t\t<span class="net-update badge dropdown-toggle" data-toggle="dropdown" rel="#nav-network-menu"></span>\n\t\t\t\t\t<ul id="nav-network-menu" role="menu" class="dropdown-menu" rel="network">\n\t\t\t\t\t\t\n\t\t\t\t\t\t<li id="nav-network-mark-all"><a href="#" onclick="markRead('network'); return false;">Mark all grid notifications seen</a></li>\n\t\t\t\t\t\t<li class="empty">Loading...</li>\n\t\t\t\t\t</ul>\n\t\t\t\t</li>\n\t\t\t\t<li class=" visible-xs">\n\t\t\t\t\t<a href="network" title="Your grid" ><i class="icon-th"></i></a>\n\t\t\t\t\t<span class="net-update badge" rel="#nav-network-menu"></span>\n\t\t\t\t</li>\n\t\t\t\n\t\t\t\t\t\t\t<li class=" hidden-xs">\n\t\t\t\t\t<a class="" href="channel/testes" title="Channel home" id="home_nav_btn"><i class="icon-home"></i></a>\n\t\t\t\t\t<span class="home-update badge dropdown-toggle" data-toggle="dropdown" rel="#nav-home-menu"></span>\n\t\t\t\t\t<ul id="nav-home-menu" class="dropdown-menu" rel="home">\n\t\t\t\t\t\t\n\t\t\t\t\t\t<li id="nav-home-mark-all"><a href="#" onclick="markRead('home'); return false;">Mark all channel notifications seen</a></li>\n\t\t\t\t\t\t<li class="empty">Loading...</li>\n\t\t\t\t\t</ul>\n\t\t\t\t</li>\n\t\t\t\t<li class=" visible-xs">\n\t\t\t\t\t<a class="" href="channel/testes" title="Channel home" ><i class="icon-home"></i></a>\n\t\t\t\t\t<span class="home-update badge" rel="#nav-home-menu"></span>\n\t\t\t\t</li>\n\t\t\t\n\n\t\t\t\t\t\t\t<li class=" hidden-xs">\n\t\t\t\t\t<a class="" href="mail/combined" title="Private mail" id="mail_nav_btn"><i class="icon-envelope"></i></a>\n\t\t\t\t\t<span class="mail-update badge dropdown-toggle" data-toggle="dropdown" rel="#nav-messages-menu"></span>\n\t\t\t\t\t<ul id="nav-messages-menu" class="dropdown-menu" rel="messages">\n\t\t\t\t\t\t<li id="nav-messages-see-all"><a href="mail/combined">See all private messages</a></li>\n\t\t\t\t\t\t<li id="nav-messages-mark-all"><a href="#" onclick="markRead('messages'); return false;">Mark all private messages seen</a></li>\n\t\t\t\t\t\t<li class="empty">Loading...</li>\n\t\t\t\t\t</ul>\n\t\t\t\t</li>\n\t\t\t\t<li class=" visible-xs">\n\t\t\t\t\t<a class="" href="mail/combined" title="Private mail" ><i class="icon-envelope"></i></a>\n\t\t\t\t\t<span class="mail-update badge" rel="#nav-messages-menu"></span>\n\t\t\t\t</li>\n\t\t\t\n\t\t\t\t\t\t\t<li class=" hidden-xs">\n\t\t\t\t\t<a class="" href="events" title="Event Calendar" id='events_nav_btn'><i class="icon-calendar"></i></a>\n\t\t\t\t\t<span class="all_events-update badge dropdown-toggle" data-toggle="dropdown" rel="#nav-all_events-menu"></span>\n\t\t\t\t\t<ul id="nav-all_events-menu" class="dropdown-menu" rel="all_events">\n\t\t\t\t\t\t<li id="nav-all_events-see-all"><a href="events">See all events</a></li>\n\t\t\t\t\t\t<li id="nav-all_events-mark-all"><a href="#" onclick="markRead('all_events'); return false;">Mark all events seen</a></li>\n\t\t\t\t\t\t<li class="empty">Loading...</li>\n\t\t\t\t\t</ul>\n\t\t\t\t</li>\n\t\t\t\t<li class=" visible-xs">\n\t\t\t\t\t<a class="" href="events" title="Event Calendar" ><i class="icon-calendar"></i></a>\n\t\t\t\t\t<span class="all_events-update badge" rel="#nav-all_events-menu"></span>\n\t\t\t\t</li>\n\t\t\t\n\t\t\t\t\t\t\t<li class=" hidden-xs">\n\t\t\t\t\t<a class="" href="connections/ifpending" title="Connections" id="connections_nav_btn"><i class="icon-user"></i></a>\n\t\t\t\t\t<span class="intro-update badge dropdown-toggle" data-toggle="dropdown" rel="#nav-intros-menu"></span>\n\t\t\t\t\t<ul id="nav-intros-menu" class="dropdown-menu" rel="intros">\n\t\t\t\t\t\t<li id="nav-intros-see-all"><a href=""></a></li>\n\t\t\t\t\t\t<li class="empty">Loading...</li>\n\t\t\t\t\t</ul>\n\t\t\t\t</li>\n\t\t\t\t<li class=" visible-xs">\n\t\t\t\t\t<a class="" href="connections/ifpending" title="Connections" ><i class="icon-user"></i></a>\n\t\t\t\t\t<span class="intro-update badge" rel="#nav-intros-menu"></span>\n\t\t\t\t</li>\n\t\t\t\t\t\n\t\t\t\t\t\t\t<li class=" hidden-xs">\n\t\t\t\t\t<a href="notifications/system" title="Notices" id="notifications_nav_btn"><i class="icon-exclamation"></i></a>\n\t\t\t\t\t<span class="notify-update badge dropdown-toggle" data-toggle="dropdown" rel="#nav-notify-menu"></span>\n\t\t\t\t\t<ul id="nav-notify-menu" class="dropdown-menu" rel="notify">\n\t\t\t\t\t\t<li id="nav-notify-see-all"><a href="notifications/system">See all notifications</a></li>\n\t\t\t\t\t\t<li id="nav-notify-mark-all"><a href="#" onclick="markRead('notify'); return false;">Mark all system notifications seen</a></li>\n\t\t\t\t\t\t<li class="empty">Loading...</li>\n\t\t\t\t\t</ul>\n\t\t\t\t</li>\n\t\t\t\t<li class=" visible-xs">\n\t\t\t\t\t<a href="notifications/system" title="Notices"><i class="icon-exclamation"></i></a>\n\t\t\t\t\t<span class="notify-update badge" rel="#nav-notify-menu"></span>\n\t\t\t\t</li>\n\t\t\t\t\t\t</ul>\n\t\t\t<ul class="nav navbar-nav navbar-right">\n\t\t\t\t<li class="hidden-xs">\n\t\t\t\t\t<form method="get" action="search" role="search">\n\t\t\t\t\t\t<div id="nav-search-spinner"></div><input class="icon-search" id="nav-search-text" type="text" value="" placeholder=" @name, #tag, ?doc, content" name="search" title="Search site @name, #tag, ?docs, content" onclick="this.submit();"/>\n\t\t\t\t\t</form>\n\t\t\t\t</li>\n\t\t\t\t<li class="visible-xs">\n\t\t\t\t\t<a href="/search" title="Search site @name, #tag, ?docs, content"><i class="icon-search"></i></a>\n\t\t\t\t</li>\n\n\t\t\t\t\t\t\t\t\t\t<li class="">\n\t\t\t\t\t<a class="" href="directory" title="Channel Directory" id="directory_nav_btn"><i class="icon-sitemap"></i></a>\n\t\t\t\t</li>\n\t\t\t\n\t\t\t\t\t\t\t<li class="">\n\t\t\t\t\t<a class="" href="apps" title="Applications, utilities, links, games" id="apps_nav_btn"><i class="icon-cogs"></i></a>\n\t\t\t\t</li>\n\t\t\t\n\t\t\t\t\t\t\t<li class="active">\n\t\t\t\t\t<a class="" target="hubzilla-help" href="http://hubzilla/help?f=&cmd=help/develop" title="Help and documentation" id="help_nav_btn"><i class="icon-question"></i></a>\n\t\t\t\t</li>\n\t\t\t\t\t\t</ul>\n\t\t</div>\n\t</div>\n",
+    "htmlhead": "<meta http-equiv="Content-Type" content="text/html;charset=utf-8" />\n<base href="http://hubzilla/" />\n<meta name="viewport" content="width=device-width, height=device-height, initial-scale=1, user-scalable=1" />\n<meta name="generator" content="hubzilla 2015-11-03.1205H" />\n\n<!--[if IE]>\n<script src="http://hubzilla/library/html5.js"></script>\n<![endif]-->\n\n<link rel="stylesheet" href="http://hubzilla/library/font_awesome/css/font-awesome.min.css" type="text/css" media="screen">\r\n<link rel="stylesheet" href="http://hubzilla/library/bootstrap/css/bootstrap.min.css" type="text/css" media="screen">\r\n<link rel="stylesheet" href="http://hubzilla/library/bootstrap-tagsinput/bootstrap-tagsinput.css" type="text/css" media="screen">\r\n<link rel="stylesheet" href="http://hubzilla/view/css/bootstrap-red.css" type="text/css" media="screen">\r\n<link rel="stylesheet" href="http://hubzilla/library/datetimepicker/jquery.datetimepicker.css" type="text/css" media="screen">\r\n<link rel="stylesheet" href="http://hubzilla/library/bootstrap-colorpicker/dist/css/bootstrap-colorpicker.min.css" type="text/css" media="screen">\r\n<link rel="stylesheet" href="http://hubzilla/library/tiptip/tipTip.css" type="text/css" media="screen">\r\n<link rel="stylesheet" href="http://hubzilla/library/jgrowl/jquery.jgrowl.css" type="text/css" media="screen">\r\n<link rel="stylesheet" href="http://hubzilla/library/jRange/jquery.range.css" type="text/css" media="screen">\r\n<link rel="stylesheet" href="http://hubzilla/view/css/conversation.css" type="text/css" media="screen">\r\n<link rel="stylesheet" href="http://hubzilla/view/css/widgets.css" type="text/css" media="screen">\r\n<link rel="stylesheet" href="http://hubzilla/view/css/colorbox.css" type="text/css" media="screen">\r\n<link rel="stylesheet" href="http://hubzilla/library/justifiedGallery/justifiedGallery.min.css" type="text/css" media="screen">\r\n<link rel="stylesheet" href="http://hubzilla/view/css/default.css" type="text/css" media="screen">\r\n<link rel="stylesheet" href="http://hubzilla/view/theme/redbasic/php/style.pcss" type="text/css" media="screen">\r\n\n\n<script>\n\n\tvar aStr = {\n\n\t\t'delitem'     : "Delete this item?",\n\t\t'comment'     : "Comment",\n\t\t'showmore'    : "[+] show all",\n\t\t'showfewer'   : "[-] show less",\n\t\t'divgrowmore' : "[+] expand",\n\t\t'divgrowless' : "[-] collapse",\n\t\t'pwshort'     : "Password too short",\n\t\t'pwnomatch'   : "Passwords do not match",\n\t\t'everybody'   : "everybody",\n\t\t'passphrase'  : "Secret Passphrase",\n\t\t'passhint'    : "Passphrase hint",\n\t\t'permschange' : "Notice: Permissions have changed but have not yet been submitted.",\n\t\t'closeAll'    : "close all",\n\t\t'nothingnew'  : "Nothing new here",\n\t\t'rating_desc' : "Rate This Channel (this is public)",\n\t\t'rating_val'  : "Rating",\n\t\t'rating_text' : "Describe (optional)",\n\t\t'submit'      : "Submit",\n\t\t'linkurl'     : "Please enter a link URL",\n\t\t'leavethispage' : "Unsaved changes. Are you sure you wish to leave this page?",\n\n\t\t't01' : "",\n\t\t't02' : "",\n\t\t't03' : "ago",\n\t\t't04' : "from now",\n\t\t't05' : "less than a minute",\n\t\t't06' : "about a minute",\n\t\t't07' : "%d minutes",\n\t\t't08' : "about an hour",\n\t\t't09' : "about %d hours",\n\t\t't10' : "a day",\n\t\t't11' : "%d days",\n\t\t't12' : "about a month",\n\t\t't13' : "%d months",\n\t\t't14' : "about a year",\n\t\t't15' : "%d years",\n\t\t't16' : " ",\n\t\t't17' : "[]",\n\n\t\t'monthNames' : [ "January","February","March","April","May","June","July","August","September","October","November","December" ],\n\t\t'monthNamesShort' : [ "Jan","Feb","Mar","Apr","May","Jun","Jul","Aug","Sep","Oct","Nov","Dec" ],\n\t\t'dayNames' : ["Sunday","Monday","Tuesday","Wednesday","Thursday","Friday","Saturday"],\n\t\t'dayNamesShort' : ["Sun","Mon","Tue","Wed","Thu","Fri","Sat"],\n\t\t'today' : "today",\n\t\t'month' : "month",\n\t\t'week' : "week",\n\t\t'day' : "day",\n\t\t'allday' : "All day"\n\t};\n\n</script>\n\t\t\n\n\n<script src="http://hubzilla/view/js/jquery.js" ></script>\r\n<script src="http://hubzilla/library/justifiedGallery/jquery.justifiedGallery.min.js" ></script>\r\n<script src="http://hubzilla/library/sprintf.js/dist/sprintf.min.js" ></script>\r\n<script src="http://hubzilla/view/js/spin.js" ></script>\r\n<script src="http://hubzilla/view/js/jquery.spin.js" ></script>\r\n<script src="http://hubzilla/view/js/jquery.textinputs.js" ></script>\r\n<script src="http://hubzilla/view/js/autocomplete.js" ></script>\r\n<script src="http://hubzilla/library/jquery-textcomplete/jquery.textcomplete.js" ></script>\r\n<script src="http://hubzilla/library/jquery.timeago.js" ></script>\r\n<script src="http://hubzilla/library/readmore.js/readmore.js" ></script>\r\n<script src="http://hubzilla/library/jgrowl/jquery.jgrowl_minimized.js" ></script>\r\n<script src="http://hubzilla/library/cryptojs/components/core-min.js" ></script>\r\n<script src="http://hubzilla/library/cryptojs/rollups/aes.js" ></script>\r\n<script src="http://hubzilla/library/cryptojs/rollups/rabbit.js" ></script>\r\n<script src="http://hubzilla/library/cryptojs/rollups/tripledes.js" ></script>\r\n<script src="http://hubzilla/view/js/acl.js" ></script>\r\n<script src="http://hubzilla/view/js/webtoolkit.base64.js" ></script>\r\n<script src="http://hubzilla/view/js/crypto.js" ></script>\r\n<script src="http://hubzilla/library/jRange/jquery.range.js" ></script>\r\n<script src="http://hubzilla/library/colorbox/jquery.colorbox-min.js" ></script>\r\n<script src="http://hubzilla/library/jquery.AreYouSure/jquery.are-you-sure.js" ></script>\r\n<script src="http://hubzilla/library/tableofcontents/jquery.toc.js" ></script>\r\n<script src="http://hubzilla/library/bootstrap/js/bootstrap.min.js" ></script>\r\n<script src="http://hubzilla/library/bootbox/bootbox.min.js" ></script>\r\n<script src="http://hubzilla/library/bootstrap-tagsinput/bootstrap-tagsinput.js" ></script>\r\n<script src="http://hubzilla/library/datetimepicker/jquery.datetimepicker.js" ></script>\r\n<script src="http://hubzilla/library/bootstrap-colorpicker/dist/js/bootstrap-colorpicker.js" ></script>\r\n<script src="http://hubzilla/view/theme/redbasic/js/redbasic.js" ></script>\r\n\n\n<link rel="shortcut icon" href="http://hubzilla/images/hz-32.png" />\n<link rel="search"\n         href="http://hubzilla/opensearch" \n         type="application/opensearchdescription+xml" \n         title="Search in the Hubzilla" />\n\n\n<script>\n\n\tvar updateInterval = 80000;\n\tvar localUser = 2;\n\tvar zid = 'testes@hubzilla';\n\tvar justifiedGalleryActive = false;\n\t\t\n</script>\n\n\n\n\n<script>$(document).ready(function() {\n\t$("#nav-search-text").search_autocomplete('http://hubzilla/acl');\n});\n\n</script><script src="http://hubzilla/view/js/main.js" ></script>\r\n<link rel="stylesheet" href="http://hubzilla/addon/converse/converse.min.js" media="all" /><script src="http://hubzilla/addon/converse/converse.min.js"></script>",
+    "header": "<div id="banner" class="hidden-sm hidden-xs">Hubzilla</div>\n\n<ul id="nav-notifications-template" style="display:none;" rel="template">\n\t<li class="{5}"><a href="{0}" title="{2} {3}"><img data-src="{1}"><span class="contactname">{2}</span><span class="dropdown-sub-text">{3}<br>{4}</span></a></li>\n</ul>\n"
+  },
+  "poi": null,
+  "force_max_items": 0,
+  "module": "help",
+  "template_engines": {
+    "smarty3": "FriendicaSmartyEngine",
+    "internal": "Template"
+  },
+  "account": {
+    "account_flags": "0",
+    "account_service_class": "",
+    "account_id": "1",
+    "account_salt": "9bf8c193c35a56c4c666f47728fe20da",
+    "account_expires": "0000-00-00 00:00:00",
+    "account_lastlog": "2015-11-04 07:47:55",
+    "account_password_changed": "0000-00-00 00:00:00",
+    "account_language": "en",
+    "account_default_channel": "2",
+    "account_password": "",
+    "account_parent": "1",
+    "account_expire_notified": "0000-00-00 00:00:00",
+    "account_reset": "",
+    "account_email": "foo@bar.com",
+    "account_level": "0",
+    "account_roles": "4096",
+    "account_external": "",
+    "account_created": "2015-10-09 00:44:51"
+  },
+  "theme_info": [],
+  "argv": [
+    "help",
+    "develop"
+  ],
+  "template_engine_instance": {
+    "smarty3": {}
+  },
+  "language": "en",
+  "pager": {
+    "page": 1,
+    "itemspage": 60,
+    "start": 0,
+    "total": 0
+  },
+  "plugins": [
+    "converse"
+  ],
+  "error": false,
+  "pdl": "[region=aside]\n[widget=helpindex][/widget]\n[/region]\n",
+  "query_string": "help/develop",
+  "cmd": "help/develop",
+  "groups": null,
+  "videowidth": 425,
+  "css_sources": [
+    [
+      "library/font_awesome/css/font-awesome.min.css",
+      "screen"
+    ],
+    [
+      "library/bootstrap/css/bootstrap.min.css",
+      "screen"
+    ],
+    [
+      "library/bootstrap-tagsinput/bootstrap-tagsinput.css",
+      "screen"
+    ],
+    [
+      "view/css/bootstrap-red.css",
+      "screen"
+    ],
+    [
+      "library/datetimepicker/jquery.datetimepicker.css",
+      "screen"
+    ],
+    [
+      "library/bootstrap-colorpicker/dist/css/bootstrap-colorpicker.min.css",
+      "screen"
+    ],
+    [
+      "library/tiptip/tipTip.css",
+      "screen"
+    ],
+    [
+      "library/jgrowl/jquery.jgrowl.css",
+      "screen"
+    ],
+    [
+      "library/jRange/jquery.range.css",
+      "screen"
+    ],
+    [
+      "view/css/conversation.css",
+      "screen"
+    ],
+    [
+      "view/css/widgets.css",
+      "screen"
+    ],
+    [
+      "view/css/colorbox.css",
+      "screen"
+    ],
+    [
+      "library/justifiedGallery/justifiedGallery.min.css",
+      "screen"
+    ],
+    [
+      "default.css",
+      "screen"
+    ],
+    [
+      "mod_help.css",
+      "screen"
+    ],
+    [
+      "view/theme/redbasic/php/style.pcss",
+      "screen"
+    ]
+  ],
+  "is_tablet": false,
+  "observer": {
+    "xchan_deleted": "0",
+    "xchan_connpage": "",
+    "xchan_pubforum": "0",
+    "xchan_flags": "0",
+    "xchan_censored": "0",
+    "xchan_instance_url": "",
+    "xchan_photo_s": "http://hubzilla/photo/profile/s/2",
+    "xchan_pubkey": "-----BEGIN PUBLIC KEY-----\nMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEA7MP/xxsq/srA8I7m+WKf\nHlguwwg0b1tz+I3o+djp7b+wF8q03XPKQpYmKfXIj47vpAOu75nKA4Tn90lLymmk\nSXUHogOqOMy1CHoaVrAw2T2/tAeRoMAjAJ5IxSOAM7Xda0nVUK6FmfxPcvftKf9y\nPmvvFadXpaHT4JGPH0tszDhGXLkqlt9xSkIkpsgMA6emj/7bacc6x8eTdtvzo2e5\n/NyPXvBKH4henmYaKjq/4aIYZcBWYVGt6onxaP2j1cSNbksnOY7GbJl+hy95iFoZ\nDWGxiFwQd+CroiBbdlpVGp13cV/WKp2spZzlzkmCRGYoNbbM5RlgFLnmyTa4XMZE\nwnA3ZUB59MsrUJK+0H/utiZrpX5NQcFl33z8k5zB3pPnhc5S5/P+UJZRnqhet1wQ\n7AZVmdP30D75QD8LZ4SytZ1DHn/N76EsVhSADNMnUfEphs708V33Z0gFWultYDoK\nlvXUf4O0/V8GTufFHb6XdAiy92IUzrormXCpXoOmdOcJdaH9RnotZi/DkuQ0zP+Y\nCvxU9nrjyZvAwAdew//XFDjw4HoThVM4k4jzkIhCTlCao/yRnNM7A/i3OKcXq9wU\n7OZqcRfM9o0BFpZTIoXB7BMtpeioJcBi/7FUaV9U9uYLFuLL0qWa1YxLwfsN9rDk\n6A1gbhD60G9/dAbolp8xAHkCAwEAAQ==\n-----END PUBLIC KEY-----\n",
+    "xchan_connurl": "http://hubzilla/poco/testes",
+    "xchan_name_date": "2015-10-09 00:45:41",
+    "xchan_system": "0",
+    "xchan_photo_date": "2015-10-09 00:45:41",
+    "xchan_photo_m": "http://hubzilla/photo/profile/m/2",
+    "xchan_hidden": "0",
+    "xchan_selfcensored": "0",
+    "xchan_photo_mimetype": "image/jpeg",
+    "xchan_network": "zot",
+    "xchan_guid": "Ok-ycNKQYMzjokLnIz5OTCF8M5f4CtRT4vJCUeUivJhIOJWk3ORwIQgGx3P5g2Yz79KxQ-rs_Cn2G_jsgM6hmw",
+    "xchan_guid_sig": "XXX",
+    "xchan_hash": "uRy0nF-urp6k_bFrkdtCc2EkBynwpgCJL_FQFoTwyw2Hep7AHkrSt1MZcHWV_8DQucNlHSY1vHgUNS2Fvoirpw",
+    "xchan_url": "http://hubzilla/channel/testes",
+    "xchan_addr": "testes@hubzilla",
+    "xchan_orphan": "0",
+    "xchan_follow": "http://hubzilla/follow?f=&url=%s",
+    "xchan_name": "testes",
+    "xchan_photo_l": "http://hubzilla/photo/profile/l/2"
+  },
+  "contact": null,
+  "identities": null,
+  "user": null,
+  "videoheight": 350,
+  "profile": null,
+  "theme_thread_allow": true,
+  "data": {
+    "pageicon": "/images/hz-32.png"
+  }
+}[/code]
+
 
 #include doc/macros/main_footer.bb;
 
diff --git a/doc/hooks.html b/doc/hooks.html
index e488e8a97..c05de58ef 100644
--- a/doc/hooks.html
+++ b/doc/hooks.html
@@ -1 +1 @@
-<div><h3>Hooks</h3><table><tr><td>Function</td><td>Source File</td><td>Arg</td></tr><tr><td></td><td></td><td></td></tr><tr><td>$a-&gt;module . _mod_aftercontent</td><td>index.php</td><td>$arr</td></tr><tr><td>$a-&gt;module . _mod_content</td><td>index.php</td><td>$arr</td></tr><tr><td>$a-&gt;module . _mod_init</td><td>index.php</td><td>$placeholder</td></tr><tr><td>$a-&gt;module . _mod_post</td><td>index.php</td><td>$_POST</td></tr><tr><td>$a-&gt;module . _post_ . $selname</td><td>include/acl_selectors.php</td><td>$o</td></tr><tr><td>$a-&gt;module . _post_ . $selname</td><td>include/acl_selectors.php</td><td>$o</td></tr><tr><td>$a-&gt;module . _post_ . $selname</td><td>include/acl_selectors.php</td><td>$o</td></tr><tr><td>$a-&gt;module . _pre_ . $selname</td><td>include/acl_selectors.php</td><td>$arr</td></tr><tr><td>$a-&gt;module . _pre_ . $selname</td><td>include/acl_selectors.php</td><td>$arr</td></tr><tr><td>$a-&gt;module . _pre_ . $selname</td><td>include/acl_selectors.php</td><td>$arr</td></tr><tr><td>$name</td><td>include/plugin.php</td><td>&amp;$data = null</td></tr><tr><td>about_hook</td><td>mod/siteinfo.php</td><td>$o</td></tr><tr><td>accept_follow</td><td>mod/connedit.php</td><td>$arr</td></tr><tr><td>account_downgrade</td><td>include/account.php</td><td>$ret</td></tr><tr><td>account_downgrade</td><td>include/account.php</td><td>$ret</td></tr><tr><td>account_settings</td><td>mod/settings.php</td><td>$account_settings</td></tr><tr><td>activity_received</td><td>include/zot.php</td><td>$parr</td></tr><tr><td>affinity_labels</td><td>include/widgets.php</td><td>$labels</td></tr><tr><td>affinity_labels</td><td>mod/connedit.php</td><td>$labels</td></tr><tr><td>api_perm_is_allowed</td><td>include/permissions.php</td><td>$arr</td></tr><tr><td>app_menu</td><td>index.php</td><td>$arr</td></tr><tr><td>atom_author</td><td>include/items.php</td><td>$o</td></tr><tr><td>atom_entry</td><td>include/items.php</td><td>$o</td></tr><tr><td>atom_feed</td><td>include/items.php</td><td>$atom</td></tr><tr><td>atom_feed_end</td><td>include/items.php</td><td>$atom</td></tr><tr><td>attach_upload_file</td><td>include/attach.php</td><td>$f</td></tr><tr><td>authenticate</td><td>include/auth.php</td><td>$addon_auth</td></tr><tr><td>avatar_lookup</td><td>include/network.php</td><td>$avatar</td></tr><tr><td>bb2diaspora</td><td>include/bb2diaspora.php</td><td>$Text</td></tr><tr><td>bbcode</td><td>include/bbcode.php</td><td>$Text</td></tr><tr><td>channel_remove</td><td>include/Contact.php</td><td>$r[0]</td></tr><tr><td>chat_message</td><td>include/chat.php</td><td>$arr</td></tr><tr><td>chat_post</td><td>mod/chatsvc.php</td><td>$arr</td></tr><tr><td>check_account_email</td><td>include/account.php</td><td>$arr</td></tr><tr><td>check_account_invite</td><td>include/account.php</td><td>$arr</td></tr><tr><td>check_account_password</td><td>include/account.php</td><td>$arr</td></tr><tr><td>connect_premium</td><td>mod/connect.php</td><td>$arr</td></tr><tr><td>connector_settings</td><td>mod/settings.php</td><td>$settings_connectors</td></tr><tr><td>construct_page</td><td>boot.php</td><td>$arr</td></tr><tr><td>contact_block_end</td><td>include/text.php</td><td>$arr</td></tr><tr><td>contact_edit</td><td>mod/connedit.php</td><td>$arr</td></tr><tr><td>contact_edit_post</td><td>mod/connedit.php</td><td>$_POST</td></tr><tr><td>contact_select_options</td><td>include/acl_selectors.php</td><td>$x</td></tr><tr><td>conversation_start</td><td>include/conversation.php</td><td>$cb</td></tr><tr><td>create_identity</td><td>include/identity.php</td><td>$newuid</td></tr><tr><td>cron</td><td>include/cronhooks.php</td><td>$d</td></tr><tr><td>cron_daily</td><td>include/poller.php</td><td>datetime_convert()</td></tr><tr><td>cron_weekly</td><td>include/poller.php</td><td>datetime_convert()</td></tr><tr><td>directory_item</td><td>mod/directory.php</td><td>$arr</td></tr><tr><td>discover_by_webbie</td><td>include/network.php</td><td>$arr</td></tr><tr><td>display_item</td><td>include/ItemObject.php</td><td>$arr</td></tr><tr><td>display_item</td><td>include/conversation.php</td><td>$arr</td></tr><tr><td>display_settings</td><td>mod/settings.php</td><td>$o</td></tr><tr><td>display_settings_post</td><td>mod/settings.php</td><td>$_POST</td></tr><tr><td>donate_contributors</td><td>extend/addon/matrix/donate/donate.php</td><td>$contributors</td></tr><tr><td>donate_plugin</td><td>extend/addon/matrix/donate/donate.php</td><td>$o</td></tr><tr><td>donate_sponsors</td><td>extend/addon/matrix/donate/donate.php</td><td>$sponsors</td></tr><tr><td>dreport_is_storable</td><td>include/zot.php</td><td>$dr</td></tr><tr><td>drop_item</td><td>include/items.php</td><td>$arr</td></tr><tr><td>enotify</td><td>include/enotify.php</td><td>$h</td></tr><tr><td>enotify_mail</td><td>include/enotify.php</td><td>$datarray</td></tr><tr><td>enotify_store</td><td>include/enotify.php</td><td>$datarray</td></tr><tr><td>event_created</td><td>include/event.php</td><td>$event[id]</td></tr><tr><td>event_updated</td><td>include/event.php</td><td>$event[id]</td></tr><tr><td>externals_url_select</td><td>include/externals.php</td><td>$arr</td></tr><tr><td>feature_enabled</td><td>include/features.php</td><td>$arr</td></tr><tr><td>feature_settings</td><td>mod/settings.php</td><td>$settings_addons</td></tr><tr><td>feature_settings_post</td><td>mod/settings.php</td><td>$_POST</td></tr><tr><td>follow</td><td>include/follow.php</td><td>$arr</td></tr><tr><td>follow</td><td>include/follow.php</td><td>$arr</td></tr><tr><td>follow_allow</td><td>include/follow.php</td><td>$x</td></tr><tr><td>gender_selector</td><td>include/profile_selectors.php</td><td>$select</td></tr><tr><td>gender_selector_min</td><td>include/profile_selectors.php</td><td>$select</td></tr><tr><td>generate_map</td><td>include/text.php</td><td>$arr</td></tr><tr><td>generate_named_map</td><td>include/text.php</td><td>$arr</td></tr><tr><td>get_all_api_perms</td><td>include/permissions.php</td><td>$arr</td></tr><tr><td>get_all_perms</td><td>include/permissions.php</td><td>$arr</td></tr><tr><td>get_features</td><td>include/features.php</td><td>$arr</td></tr><tr><td>get_role_perms</td><td>include/permissions.php</td><td>$ret</td></tr><tr><td>get_widgets</td><td>boot.php</td><td>$arr</td></tr><tr><td>get_widgets</td><td>boot.php</td><td>$arr</td></tr><tr><td>global_permissions</td><td>include/permissions.php</td><td>$ret</td></tr><tr><td>home_content</td><td>mod/home.php</td><td>$o</td></tr><tr><td>home_init</td><td>mod/home.php</td><td>$ret</td></tr><tr><td>hostxrd</td><td>mod/hostxrd.php</td><td>$arr</td></tr><tr><td>html2bbcode</td><td>include/html2bbcode.php</td><td>$message</td></tr><tr><td>identity_basic_export</td><td>include/identity.php</td><td>$addon</td></tr><tr><td>import_author_xchan</td><td>include/items.php</td><td>$arr</td></tr><tr><td>import_channel</td><td>mod/import.php</td><td>$addon</td></tr><tr><td>import_directory_profile</td><td>include/zot.php</td><td>$d</td></tr><tr><td>import_xchan</td><td>include/zot.php</td><td>$arr</td></tr><tr><td>item_photo_menu</td><td>include/conversation.php</td><td>$args</td></tr><tr><td>item_store</td><td>include/items.php</td><td>$d</td></tr><tr><td>item_store</td><td>include/items.php</td><td>$arr</td></tr><tr><td>item_store_update</td><td>include/items.php</td><td>$d</td></tr><tr><td>item_translate</td><td>include/items.php</td><td>$translate</td></tr><tr><td>item_translate</td><td>include/items.php</td><td>$translate</td></tr><tr><td>jot_networks</td><td>include/acl_selectors.php</td><td>$jotnets</td></tr><tr><td>jot_networks</td><td>include/conversation.php</td><td>$jotnets</td></tr><tr><td>jot_networks</td><td>mod/editblock.php</td><td>$jotnets</td></tr><tr><td>jot_networks</td><td>mod/editpost.php</td><td>$jotnets</td></tr><tr><td>jot_networks</td><td>mod/editwebpage.php</td><td>$jotnets</td></tr><tr><td>jot_networks</td><td>mod/editlayout.php</td><td>$jotnets</td></tr><tr><td>jot_tool</td><td>include/conversation.php</td><td>$jotplugins</td></tr><tr><td>jot_tool</td><td>mod/editblock.php</td><td>$jotplugins</td></tr><tr><td>jot_tool</td><td>mod/editpost.php</td><td>$jotplugins</td></tr><tr><td>jot_tool</td><td>mod/editwebpage.php</td><td>$jotplugins</td></tr><tr><td>jot_tool</td><td>mod/editlayout.php</td><td>$jotplugins</td></tr><tr><td>load_pdl</td><td>boot.php</td><td>$arr</td></tr><tr><td>local_dir_update</td><td>include/dir_fns.php</td><td>$arr</td></tr><tr><td>logged_in</td><td>include/oauth.php</td><td>$a-&gt;user</td></tr><tr><td>logged_in</td><td>include/api.php</td><td>$a-&gt;user</td></tr><tr><td>logged_in</td><td>include/security.php</td><td>$a-&gt;account</td></tr><tr><td>logged_in</td><td>include/security.php</td><td>$user_record</td></tr><tr><td>logging_out</td><td>include/auth.php</td><td>$args</td></tr><tr><td>login_hook</td><td>boot.php</td><td>$o</td></tr><tr><td>magic_auth</td><td>mod/magic.php</td><td>$arr</td></tr><tr><td>magic_auth_openid_success</td><td>mod/openid.php</td><td>$arr</td></tr><tr><td>magic_auth_openid_success</td><td>mod/openid.php</td><td>$arr</td></tr><tr><td>magic_auth_success</td><td>mod/post.php</td><td>$arr</td></tr><tr><td>main_slider</td><td>include/widgets.php</td><td>$arr</td></tr><tr><td>marital_selector</td><td>include/profile_selectors.php</td><td>$select</td></tr><tr><td>marital_selector_min</td><td>include/profile_selectors.php</td><td>$select</td></tr><tr><td>module_loaded</td><td>index.php</td><td>$x</td></tr><tr><td>mood_verbs</td><td>include/text.php</td><td>$arr</td></tr><tr><td>nav</td><td>include/nav.php</td><td>$x</td></tr><tr><td>network_content_init</td><td>mod/network.php</td><td>$arr</td></tr><tr><td>network_ping</td><td>mod/ping.php</td><td>$arr</td></tr><tr><td>network_tabs</td><td>include/conversation.php</td><td>$arr</td></tr><tr><td>network_to_name</td><td>include/contact_selectors.php</td><td>$nets</td></tr><tr><td>notifier_end</td><td>include/notifier.php</td><td>$target_item</td></tr><tr><td>notifier_hub</td><td>include/notifier.php</td><td>$narr</td></tr><tr><td>notifier_normal</td><td>include/deliver_hooks.php</td><td>$r[0]</td></tr><tr><td>obj_verbs</td><td>include/taxonomy.php</td><td>$arr</td></tr><tr><td>oembed_probe</td><td>include/oembed.php</td><td>$x</td></tr><tr><td>page_content_top</td><td>index.php</td><td>$a-&gt;page[content]</td></tr><tr><td>page_end</td><td>index.php</td><td>$a-&gt;page[content]</td></tr><tr><td>page_header</td><td>include/nav.php</td><td>$a-&gt;page[nav]</td></tr><tr><td>parse_atom</td><td>include/items.php</td><td>$arr</td></tr><tr><td>parse_link</td><td>mod/linkinfo.php</td><td>$arr</td></tr><tr><td>pdl_selector</td><td>include/comanche.php</td><td>$arr</td></tr><tr><td>perm_is_allowed</td><td>include/permissions.php</td><td>$arr</td></tr><tr><td>permissions_create</td><td>include/notifier.php</td><td>$perm_update</td></tr><tr><td>permissions_update</td><td>include/notifier.php</td><td>$perm_update</td></tr><tr><td>personal_xrd</td><td>mod/xrd.php</td><td>$arr</td></tr><tr><td>photo_post_end</td><td>include/photos.php</td><td>$ret</td></tr><tr><td>photo_post_end</td><td>include/photos.php</td><td>$ret</td></tr><tr><td>photo_upload_begin</td><td>include/attach.php</td><td>$arr</td></tr><tr><td>photo_upload_begin</td><td>include/photos.php</td><td>$args</td></tr><tr><td>photo_upload_end</td><td>include/attach.php</td><td>$ret</td></tr><tr><td>photo_upload_end</td><td>include/attach.php</td><td>$ret</td></tr><tr><td>photo_upload_end</td><td>include/attach.php</td><td>$ret</td></tr><tr><td>photo_upload_end</td><td>include/attach.php</td><td>$ret</td></tr><tr><td>photo_upload_end</td><td>include/attach.php</td><td>$ret</td></tr><tr><td>photo_upload_end</td><td>include/photos.php</td><td>$ret</td></tr><tr><td>photo_upload_end</td><td>include/photos.php</td><td>$ret</td></tr><tr><td>photo_upload_end</td><td>include/photos.php</td><td>$ret</td></tr><tr><td>photo_upload_end</td><td>include/photos.php</td><td>$ret</td></tr><tr><td>photo_upload_file</td><td>include/attach.php</td><td>$f</td></tr><tr><td>photo_upload_file</td><td>include/photos.php</td><td>$f</td></tr><tr><td>photo_upload_form</td><td>mod/photos.php</td><td>$ret</td></tr><tr><td>poke_verbs</td><td>include/text.php</td><td>$arr</td></tr><tr><td>post_local</td><td>include/zot.php</td><td>$arr</td></tr><tr><td>post_local</td><td>include/items.php</td><td>$arr</td></tr><tr><td>post_local</td><td>mod/item.php</td><td>$datarray</td></tr><tr><td>post_local_end</td><td>include/items.php</td><td>$arr</td></tr><tr><td>post_local_end</td><td>include/attach.php</td><td>$arr</td></tr><tr><td>post_local_end</td><td>include/attach.php</td><td>$arr</td></tr><tr><td>post_local_end</td><td>extend/addon/matrix/randpost/randpost.php</td><td>$x</td></tr><tr><td>post_local_end</td><td>extend/addon/matrix/randpost/randpost.php</td><td>$x</td></tr><tr><td>post_local_end</td><td>mod/mood.php</td><td>$arr</td></tr><tr><td>post_local_end</td><td>mod/like.php</td><td>$arr</td></tr><tr><td>post_local_end</td><td>mod/item.php</td><td>$datarray</td></tr><tr><td>post_local_end</td><td>mod/subthread.php</td><td>$arr</td></tr><tr><td>post_local_end</td><td>mod/subthread.php</td><td>$arr</td></tr><tr><td>post_local_start</td><td>mod/item.php</td><td>$_REQUEST</td></tr><tr><td>post_mail</td><td>include/items.php</td><td>$arr</td></tr><tr><td>post_mail_end</td><td>include/items.php</td><td>$arr</td></tr><tr><td>post_remote</td><td>include/items.php</td><td>$arr</td></tr><tr><td>post_remote_end</td><td>include/items.php</td><td>$arr</td></tr><tr><td>post_remote_update</td><td>include/items.php</td><td>$arr</td></tr><tr><td>post_remote_update_end</td><td>include/items.php</td><td>$arr</td></tr><tr><td>prepare_body</td><td>include/text.php</td><td>$prep_arr</td></tr><tr><td>prepare_body_final</td><td>include/text.php</td><td>$prep_arr</td></tr><tr><td>prepare_body_init</td><td>include/text.php</td><td>$item</td></tr><tr><td>probe_well_known</td><td>include/probe.php</td><td>$ret</td></tr><tr><td>proc_run</td><td>boot.php</td><td>$arr</td></tr><tr><td>process_channel_sync_delivery</td><td>include/zot.php</td><td>$addon</td></tr><tr><td>profile_advanced</td><td>mod/profile.php</td><td>$o</td></tr><tr><td>profile_edit</td><td>mod/profiles.php</td><td>$arr</td></tr><tr><td>profile_photo_content_end</td><td>mod/profile_photo.php</td><td>$o</td></tr><tr><td>profile_post</td><td>mod/profiles.php</td><td>$_POST</td></tr><tr><td>profile_sidebar</td><td>include/identity.php</td><td>$arr</td></tr><tr><td>profile_sidebar_enter</td><td>include/identity.php</td><td>$profile</td></tr><tr><td>profile_tabs</td><td>include/conversation.php</td><td>$arr</td></tr><tr><td>register_account</td><td>include/account.php</td><td>$result</td></tr><tr><td>render_location</td><td>include/conversation.php</td><td>$locate</td></tr><tr><td>replace_macros</td><td>include/text.php</td><td>$arr</td></tr><tr><td>reverse_magic_auth</td><td>mod/rmagic.php</td><td>$arr</td></tr><tr><td>settings_account</td><td>mod/settings.php</td><td>$_POST</td></tr><tr><td>settings_form</td><td>mod/settings.php</td><td>$o</td></tr><tr><td>settings_post</td><td>mod/settings.php</td><td>$_POST</td></tr><tr><td>sexpref_selector</td><td>include/profile_selectors.php</td><td>$select</td></tr><tr><td>sexpref_selector_min</td><td>include/profile_selectors.php</td><td>$select</td></tr><tr><td>smilie</td><td>include/text.php</td><td>$params</td></tr><tr><td>smilie</td><td>extend/addon/matrix/smileybutton/smileybutton.php</td><td>$params</td></tr><tr><td>tagged</td><td>include/items.php</td><td>$arr</td></tr><tr><td>validate_channelname</td><td>include/identity.php</td><td>$arr</td></tr><tr><td>webfinger</td><td>mod/wfinger.php</td><td>$arr</td></tr><tr><td>well_known</td><td>mod/_well_known.php</td><td>$arr</td></tr><tr><td>zid</td><td>include/identity.php</td><td>$arr</td></tr><tr><td>zid_init</td><td>include/identity.php</td><td>$arr</td></tr><tr><td>zot_finger</td><td>include/zot.php</td><td>$ret</td></tr></table></div>
\ No newline at end of file
+<div><h3>Hooks</h3><table><tr><td>Function</td><td>Source File</td><td>Arg</td></tr><tr><td></td><td></td><td></td></tr><tr><td></td><td></td><td></td></tr><tr><td></td><td></td><td></td></tr><tr><td>$a-&gt;module . _mod_aftercontent</td><td>index.php</td><td>$arr</td></tr><tr><td>$a-&gt;module . _mod_content</td><td>index.php</td><td>$arr</td></tr><tr><td>$a-&gt;module . _mod_init</td><td>index.php</td><td>$placeholder</td></tr><tr><td>$a-&gt;module . _mod_post</td><td>index.php</td><td>$_POST</td></tr><tr><td>$a-&gt;module . _post_ . $selname</td><td>include/acl_selectors.php</td><td>$o</td></tr><tr><td>$a-&gt;module . _post_ . $selname</td><td>include/acl_selectors.php</td><td>$o</td></tr><tr><td>$a-&gt;module . _post_ . $selname</td><td>include/acl_selectors.php</td><td>$o</td></tr><tr><td>$a-&gt;module . _pre_ . $selname</td><td>include/acl_selectors.php</td><td>$arr</td></tr><tr><td>$a-&gt;module . _pre_ . $selname</td><td>include/acl_selectors.php</td><td>$arr</td></tr><tr><td>$a-&gt;module . _pre_ . $selname</td><td>include/acl_selectors.php</td><td>$arr</td></tr><tr><td>$name</td><td>include/plugin.php</td><td>&amp;$data = null</td></tr><tr><td>about_hook</td><td>mod/siteinfo.php</td><td>$o</td></tr><tr><td>accept_follow</td><td>mod/connedit.php</td><td>$arr</td></tr><tr><td>account_downgrade</td><td>include/account.php</td><td>$ret</td></tr><tr><td>account_downgrade</td><td>include/account.php</td><td>$ret</td></tr><tr><td>account_settings</td><td>mod/settings.php</td><td>$account_settings</td></tr><tr><td>activity_received</td><td>include/zot.php</td><td>$parr</td></tr><tr><td>affinity_labels</td><td>include/widgets.php</td><td>$labels</td></tr><tr><td>affinity_labels</td><td>mod/connedit.php</td><td>$labels</td></tr><tr><td>api_perm_is_allowed</td><td>include/permissions.php</td><td>$arr</td></tr><tr><td>app_menu</td><td>index.php</td><td>$arr</td></tr><tr><td>atom_author</td><td>include/items.php</td><td>$o</td></tr><tr><td>atom_entry</td><td>include/items.php</td><td>$o</td></tr><tr><td>atom_feed</td><td>include/items.php</td><td>$atom</td></tr><tr><td>atom_feed_end</td><td>include/items.php</td><td>$atom</td></tr><tr><td>attach_upload_file</td><td>include/attach.php</td><td>$f</td></tr><tr><td>authenticate</td><td>include/auth.php</td><td>$addon_auth</td></tr><tr><td>avatar_lookup</td><td>include/network.php</td><td>$avatar</td></tr><tr><td>bb2diaspora</td><td>include/bb2diaspora.php</td><td>$Text</td></tr><tr><td>bbcode</td><td>include/bbcode.php</td><td>$Text</td></tr><tr><td>channel_remove</td><td>include/Contact.php</td><td>$r[0]</td></tr><tr><td>chat_message</td><td>include/chat.php</td><td>$arr</td></tr><tr><td>chat_post</td><td>mod/chatsvc.php</td><td>$arr</td></tr><tr><td>check_account_email</td><td>include/account.php</td><td>$arr</td></tr><tr><td>check_account_invite</td><td>include/account.php</td><td>$arr</td></tr><tr><td>check_account_password</td><td>include/account.php</td><td>$arr</td></tr><tr><td>connect_premium</td><td>mod/connect.php</td><td>$arr</td></tr><tr><td>connector_settings</td><td>mod/settings.php</td><td>$settings_connectors</td></tr><tr><td>construct_page</td><td>boot.php</td><td>$arr</td></tr><tr><td>contact_block_end</td><td>include/text.php</td><td>$arr</td></tr><tr><td>contact_edit</td><td>mod/connedit.php</td><td>$arr</td></tr><tr><td>contact_edit_post</td><td>mod/connedit.php</td><td>$_POST</td></tr><tr><td>contact_select_options</td><td>include/acl_selectors.php</td><td>$x</td></tr><tr><td>conversation_start</td><td>include/conversation.php</td><td>$cb</td></tr><tr><td>create_identity</td><td>include/identity.php</td><td>$newuid</td></tr><tr><td>cron</td><td>include/cronhooks.php</td><td>$d</td></tr><tr><td>cron_daily</td><td>include/poller.php</td><td>datetime_convert()</td></tr><tr><td>cron_weekly</td><td>include/poller.php</td><td>datetime_convert()</td></tr><tr><td>directory_item</td><td>mod/directory.php</td><td>$arr</td></tr><tr><td>discover_by_webbie</td><td>include/network.php</td><td>$arr</td></tr><tr><td>display_item</td><td>include/ItemObject.php</td><td>$arr</td></tr><tr><td>display_item</td><td>include/conversation.php</td><td>$arr</td></tr><tr><td>display_settings</td><td>mod/settings.php</td><td>$o</td></tr><tr><td>display_settings_post</td><td>mod/settings.php</td><td>$_POST</td></tr><tr><td>donate_contributors</td><td>extend/addon/matrix/donate/donate.php</td><td>$contributors</td></tr><tr><td>donate_plugin</td><td>extend/addon/matrix/donate/donate.php</td><td>$o</td></tr><tr><td>donate_sponsors</td><td>extend/addon/matrix/donate/donate.php</td><td>$sponsors</td></tr><tr><td>dreport_is_storable</td><td>include/zot.php</td><td>$dr</td></tr><tr><td>drop_item</td><td>include/items.php</td><td>$arr</td></tr><tr><td>enotify</td><td>include/enotify.php</td><td>$h</td></tr><tr><td>enotify_mail</td><td>include/enotify.php</td><td>$datarray</td></tr><tr><td>enotify_store</td><td>include/enotify.php</td><td>$datarray</td></tr><tr><td>event_created</td><td>include/event.php</td><td>$event[id]</td></tr><tr><td>event_updated</td><td>include/event.php</td><td>$event[id]</td></tr><tr><td>externals_url_select</td><td>include/externals.php</td><td>$arr</td></tr><tr><td>feature_enabled</td><td>include/features.php</td><td>$arr</td></tr><tr><td>feature_settings</td><td>mod/settings.php</td><td>$settings_addons</td></tr><tr><td>feature_settings_post</td><td>mod/settings.php</td><td>$_POST</td></tr><tr><td>follow</td><td>include/follow.php</td><td>$arr</td></tr><tr><td>follow</td><td>include/follow.php</td><td>$arr</td></tr><tr><td>follow_allow</td><td>include/follow.php</td><td>$x</td></tr><tr><td>gender_selector</td><td>include/profile_selectors.php</td><td>$select</td></tr><tr><td>gender_selector_min</td><td>include/profile_selectors.php</td><td>$select</td></tr><tr><td>generate_map</td><td>include/text.php</td><td>$arr</td></tr><tr><td>generate_named_map</td><td>include/text.php</td><td>$arr</td></tr><tr><td>get_all_api_perms</td><td>include/permissions.php</td><td>$arr</td></tr><tr><td>get_all_perms</td><td>include/permissions.php</td><td>$arr</td></tr><tr><td>get_features</td><td>include/features.php</td><td>$arr</td></tr><tr><td>get_role_perms</td><td>include/permissions.php</td><td>$ret</td></tr><tr><td>get_widgets</td><td>boot.php</td><td>$arr</td></tr><tr><td>get_widgets</td><td>boot.php</td><td>$arr</td></tr><tr><td>global_permissions</td><td>include/permissions.php</td><td>$ret</td></tr><tr><td>home_content</td><td>mod/home.php</td><td>$o</td></tr><tr><td>home_init</td><td>mod/home.php</td><td>$ret</td></tr><tr><td>hostxrd</td><td>mod/hostxrd.php</td><td>$arr</td></tr><tr><td>html2bbcode</td><td>include/html2bbcode.php</td><td>$message</td></tr><tr><td>identity_basic_export</td><td>include/identity.php</td><td>$addon</td></tr><tr><td>import_author_xchan</td><td>include/items.php</td><td>$arr</td></tr><tr><td>import_channel</td><td>mod/import.php</td><td>$addon</td></tr><tr><td>import_directory_profile</td><td>include/zot.php</td><td>$d</td></tr><tr><td>import_xchan</td><td>include/zot.php</td><td>$arr</td></tr><tr><td>item_photo_menu</td><td>include/conversation.php</td><td>$args</td></tr><tr><td>item_store</td><td>include/items.php</td><td>$d</td></tr><tr><td>item_store</td><td>include/items.php</td><td>$arr</td></tr><tr><td>item_store_update</td><td>include/items.php</td><td>$d</td></tr><tr><td>item_translate</td><td>include/items.php</td><td>$translate</td></tr><tr><td>item_translate</td><td>include/items.php</td><td>$translate</td></tr><tr><td>jot_networks</td><td>include/acl_selectors.php</td><td>$jotnets</td></tr><tr><td>jot_networks</td><td>include/conversation.php</td><td>$jotnets</td></tr><tr><td>jot_networks</td><td>mod/editblock.php</td><td>$jotnets</td></tr><tr><td>jot_networks</td><td>mod/editpost.php</td><td>$jotnets</td></tr><tr><td>jot_networks</td><td>mod/editwebpage.php</td><td>$jotnets</td></tr><tr><td>jot_networks</td><td>mod/editlayout.php</td><td>$jotnets</td></tr><tr><td>jot_tool</td><td>include/conversation.php</td><td>$jotplugins</td></tr><tr><td>jot_tool</td><td>mod/editblock.php</td><td>$jotplugins</td></tr><tr><td>jot_tool</td><td>mod/editpost.php</td><td>$jotplugins</td></tr><tr><td>jot_tool</td><td>mod/editwebpage.php</td><td>$jotplugins</td></tr><tr><td>jot_tool</td><td>mod/editlayout.php</td><td>$jotplugins</td></tr><tr><td>load_pdl</td><td>boot.php</td><td>$arr</td></tr><tr><td>local_dir_update</td><td>include/dir_fns.php</td><td>$arr</td></tr><tr><td>logged_in</td><td>include/oauth.php</td><td>$a-&gt;user</td></tr><tr><td>logged_in</td><td>include/api.php</td><td>$a-&gt;user</td></tr><tr><td>logged_in</td><td>include/security.php</td><td>$a-&gt;account</td></tr><tr><td>logged_in</td><td>include/security.php</td><td>$user_record</td></tr><tr><td>logging_out</td><td>include/auth.php</td><td>$args</td></tr><tr><td>login_hook</td><td>boot.php</td><td>$o</td></tr><tr><td>magic_auth</td><td>mod/magic.php</td><td>$arr</td></tr><tr><td>magic_auth_openid_success</td><td>mod/openid.php</td><td>$arr</td></tr><tr><td>magic_auth_openid_success</td><td>mod/openid.php</td><td>$arr</td></tr><tr><td>magic_auth_success</td><td>mod/post.php</td><td>$arr</td></tr><tr><td>main_slider</td><td>include/widgets.php</td><td>$arr</td></tr><tr><td>marital_selector</td><td>include/profile_selectors.php</td><td>$select</td></tr><tr><td>marital_selector_min</td><td>include/profile_selectors.php</td><td>$select</td></tr><tr><td>module_loaded</td><td>index.php</td><td>$x</td></tr><tr><td>mood_verbs</td><td>include/text.php</td><td>$arr</td></tr><tr><td>nav</td><td>include/nav.php</td><td>$x</td></tr><tr><td>network_content_init</td><td>mod/network.php</td><td>$arr</td></tr><tr><td>network_ping</td><td>mod/ping.php</td><td>$arr</td></tr><tr><td>network_tabs</td><td>include/conversation.php</td><td>$arr</td></tr><tr><td>network_to_name</td><td>include/contact_selectors.php</td><td>$nets</td></tr><tr><td>notifier_end</td><td>include/notifier.php</td><td>$target_item</td></tr><tr><td>notifier_hub</td><td>include/notifier.php</td><td>$narr</td></tr><tr><td>notifier_normal</td><td>include/deliver_hooks.php</td><td>$r[0]</td></tr><tr><td>obj_verbs</td><td>include/taxonomy.php</td><td>$arr</td></tr><tr><td>oembed_probe</td><td>include/oembed.php</td><td>$x</td></tr><tr><td>page_content_top</td><td>index.php</td><td>$a-&gt;page[content]</td></tr><tr><td>page_end</td><td>index.php</td><td>$a-&gt;page[content]</td></tr><tr><td>page_header</td><td>include/nav.php</td><td>$a-&gt;page[nav]</td></tr><tr><td>parse_atom</td><td>include/items.php</td><td>$arr</td></tr><tr><td>parse_link</td><td>mod/linkinfo.php</td><td>$arr</td></tr><tr><td>pdl_selector</td><td>include/comanche.php</td><td>$arr</td></tr><tr><td>perm_is_allowed</td><td>include/permissions.php</td><td>$arr</td></tr><tr><td>permissions_create</td><td>include/notifier.php</td><td>$perm_update</td></tr><tr><td>permissions_update</td><td>include/notifier.php</td><td>$perm_update</td></tr><tr><td>personal_xrd</td><td>mod/xrd.php</td><td>$arr</td></tr><tr><td>photo_post_end</td><td>include/photos.php</td><td>$ret</td></tr><tr><td>photo_post_end</td><td>include/photos.php</td><td>$ret</td></tr><tr><td>photo_upload_begin</td><td>include/attach.php</td><td>$arr</td></tr><tr><td>photo_upload_begin</td><td>include/photos.php</td><td>$args</td></tr><tr><td>photo_upload_end</td><td>include/attach.php</td><td>$ret</td></tr><tr><td>photo_upload_end</td><td>include/attach.php</td><td>$ret</td></tr><tr><td>photo_upload_end</td><td>include/attach.php</td><td>$ret</td></tr><tr><td>photo_upload_end</td><td>include/attach.php</td><td>$ret</td></tr><tr><td>photo_upload_end</td><td>include/attach.php</td><td>$ret</td></tr><tr><td>photo_upload_end</td><td>include/photos.php</td><td>$ret</td></tr><tr><td>photo_upload_end</td><td>include/photos.php</td><td>$ret</td></tr><tr><td>photo_upload_end</td><td>include/photos.php</td><td>$ret</td></tr><tr><td>photo_upload_end</td><td>include/photos.php</td><td>$ret</td></tr><tr><td>photo_upload_file</td><td>include/attach.php</td><td>$f</td></tr><tr><td>photo_upload_file</td><td>include/photos.php</td><td>$f</td></tr><tr><td>photo_upload_form</td><td>mod/photos.php</td><td>$ret</td></tr><tr><td>poke_verbs</td><td>include/text.php</td><td>$arr</td></tr><tr><td>post_local</td><td>include/zot.php</td><td>$arr</td></tr><tr><td>post_local</td><td>include/items.php</td><td>$arr</td></tr><tr><td>post_local</td><td>mod/item.php</td><td>$datarray</td></tr><tr><td>post_local_end</td><td>include/items.php</td><td>$arr</td></tr><tr><td>post_local_end</td><td>include/attach.php</td><td>$arr</td></tr><tr><td>post_local_end</td><td>include/attach.php</td><td>$arr</td></tr><tr><td>post_local_end</td><td>extend/addon/matrix/randpost/randpost.php</td><td>$x</td></tr><tr><td>post_local_end</td><td>extend/addon/matrix/randpost/randpost.php</td><td>$x</td></tr><tr><td>post_local_end</td><td>mod/mood.php</td><td>$arr</td></tr><tr><td>post_local_end</td><td>mod/like.php</td><td>$arr</td></tr><tr><td>post_local_end</td><td>mod/item.php</td><td>$datarray</td></tr><tr><td>post_local_end</td><td>mod/subthread.php</td><td>$arr</td></tr><tr><td>post_local_start</td><td>mod/item.php</td><td>$_REQUEST</td></tr><tr><td>post_mail</td><td>include/items.php</td><td>$arr</td></tr><tr><td>post_mail_end</td><td>include/items.php</td><td>$arr</td></tr><tr><td>post_remote</td><td>include/items.php</td><td>$arr</td></tr><tr><td>post_remote_end</td><td>include/items.php</td><td>$arr</td></tr><tr><td>post_remote_update</td><td>include/items.php</td><td>$arr</td></tr><tr><td>post_remote_update_end</td><td>include/items.php</td><td>$arr</td></tr><tr><td>prepare_body</td><td>include/text.php</td><td>$prep_arr</td></tr><tr><td>prepare_body_final</td><td>include/text.php</td><td>$prep_arr</td></tr><tr><td>prepare_body_init</td><td>include/text.php</td><td>$item</td></tr><tr><td>probe_well_known</td><td>include/probe.php</td><td>$ret</td></tr><tr><td>proc_run</td><td>boot.php</td><td>$arr</td></tr><tr><td>process_channel_sync_delivery</td><td>include/zot.php</td><td>$addon</td></tr><tr><td>profile_advanced</td><td>mod/profile.php</td><td>$o</td></tr><tr><td>profile_edit</td><td>mod/profiles.php</td><td>$arr</td></tr><tr><td>profile_photo_content_end</td><td>mod/profile_photo.php</td><td>$o</td></tr><tr><td>profile_post</td><td>mod/profiles.php</td><td>$_POST</td></tr><tr><td>profile_sidebar</td><td>include/identity.php</td><td>$arr</td></tr><tr><td>profile_sidebar_enter</td><td>include/identity.php</td><td>$profile</td></tr><tr><td>profile_tabs</td><td>include/conversation.php</td><td>$arr</td></tr><tr><td>register_account</td><td>include/account.php</td><td>$result</td></tr><tr><td>render_location</td><td>include/conversation.php</td><td>$locate</td></tr><tr><td>replace_macros</td><td>include/text.php</td><td>$arr</td></tr><tr><td>reverse_magic_auth</td><td>mod/rmagic.php</td><td>$arr</td></tr><tr><td>settings_account</td><td>mod/settings.php</td><td>$_POST</td></tr><tr><td>settings_form</td><td>mod/settings.php</td><td>$o</td></tr><tr><td>settings_post</td><td>mod/settings.php</td><td>$_POST</td></tr><tr><td>sexpref_selector</td><td>include/profile_selectors.php</td><td>$select</td></tr><tr><td>sexpref_selector_min</td><td>include/profile_selectors.php</td><td>$select</td></tr><tr><td>smilie</td><td>include/text.php</td><td>$params</td></tr><tr><td>smilie</td><td>extend/addon/matrix/smileybutton/smileybutton.php</td><td>$params</td></tr><tr><td>tagged</td><td>include/items.php</td><td>$arr</td></tr><tr><td>validate_channelname</td><td>include/identity.php</td><td>$arr</td></tr><tr><td>webfinger</td><td>mod/wfinger.php</td><td>$arr</td></tr><tr><td>well_known</td><td>mod/_well_known.php</td><td>$arr</td></tr><tr><td>zid</td><td>include/identity.php</td><td>$arr</td></tr><tr><td>zid_init</td><td>include/identity.php</td><td>$arr</td></tr><tr><td>zot_finger</td><td>include/zot.php</td><td>$ret</td></tr></table><p>Generated Tue Nov 03 21:19:02 PST 2015</p></div>
\ No newline at end of file
diff --git a/util/generate-hooks-index/.gitignore b/util/generate-hooks-index/.gitignore
new file mode 100644
index 000000000..c53038ec0
--- /dev/null
+++ b/util/generate-hooks-index/.gitignore
@@ -0,0 +1,11 @@
+/target
+/classes
+/checkouts
+pom.xml
+pom.xml.asc
+*.jar
+*.class
+/.lein-*
+/.nrepl-port
+.hgignore
+.hg/
diff --git a/util/generate-hooks-index/CHANGELOG.md b/util/generate-hooks-index/CHANGELOG.md
new file mode 100644
index 000000000..5e3bde1c9
--- /dev/null
+++ b/util/generate-hooks-index/CHANGELOG.md
@@ -0,0 +1,24 @@
+# Change Log
+All notable changes to this project will be documented in this file. This change log follows the conventions of [keepachangelog.com](http://keepachangelog.com/).
+
+## [Unreleased][unreleased]
+### Changed
+- Add a new arity to `make-widget-async` to provide a different widget shape.
+
+## [0.1.1] - 2015-11-03
+### Changed
+- Documentation on how to make the widgets.
+
+### Removed
+- `make-widget-sync` - we're all async, all the time.
+
+### Fixed
+- Fixed widget maker to keep working when daylight savings switches over.
+
+## 0.1.0 - 2015-11-03
+### Added
+- Files from the new template.
+- Widget maker public API - `make-widget-sync`.
+
+[unreleased]: https://github.com/your-name/generate-hooks-index/compare/0.1.1...HEAD
+[0.1.1]: https://github.com/your-name/generate-hooks-index/compare/0.1.0...0.1.1
diff --git a/util/generate-hooks-index/LICENSE b/util/generate-hooks-index/LICENSE
new file mode 100644
index 000000000..7689f30ef
--- /dev/null
+++ b/util/generate-hooks-index/LICENSE
@@ -0,0 +1,214 @@
+THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC
+LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM
+CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
+
+1. DEFINITIONS
+
+"Contribution" means:
+
+a) in the case of the initial Contributor, the initial code and
+documentation distributed under this Agreement, and
+
+b) in the case of each subsequent Contributor:
+
+i) changes to the Program, and
+
+ii) additions to the Program;
+
+where such changes and/or additions to the Program originate from and are
+distributed by that particular Contributor. A Contribution 'originates' from
+a Contributor if it was added to the Program by such Contributor itself or
+anyone acting on such Contributor's behalf. Contributions do not include
+additions to the Program which: (i) are separate modules of software
+distributed in conjunction with the Program under their own license
+agreement, and (ii) are not derivative works of the Program.
+
+"Contributor" means any person or entity that distributes the Program.
+
+"Licensed Patents" mean patent claims licensable by a Contributor which are
+necessarily infringed by the use or sale of its Contribution alone or when
+combined with the Program.
+
+"Program" means the Contributions distributed in accordance with this
+Agreement.
+
+"Recipient" means anyone who receives the Program under this Agreement,
+including all Contributors.
+
+2. GRANT OF RIGHTS
+
+a) Subject to the terms of this Agreement, each Contributor hereby grants
+Recipient a non-exclusive, worldwide, royalty-free copyright license to
+reproduce, prepare derivative works of, publicly display, publicly perform,
+distribute and sublicense the Contribution of such Contributor, if any, and
+such derivative works, in source code and object code form.
+
+b) Subject to the terms of this Agreement, each Contributor hereby grants
+Recipient a non-exclusive, worldwide, royalty-free patent license under
+Licensed Patents to make, use, sell, offer to sell, import and otherwise
+transfer the Contribution of such Contributor, if any, in source code and
+object code form.  This patent license shall apply to the combination of the
+Contribution and the Program if, at the time the Contribution is added by the
+Contributor, such addition of the Contribution causes such combination to be
+covered by the Licensed Patents. The patent license shall not apply to any
+other combinations which include the Contribution. No hardware per se is
+licensed hereunder.
+
+c) Recipient understands that although each Contributor grants the licenses
+to its Contributions set forth herein, no assurances are provided by any
+Contributor that the Program does not infringe the patent or other
+intellectual property rights of any other entity. Each Contributor disclaims
+any liability to Recipient for claims brought by any other entity based on
+infringement of intellectual property rights or otherwise. As a condition to
+exercising the rights and licenses granted hereunder, each Recipient hereby
+assumes sole responsibility to secure any other intellectual property rights
+needed, if any. For example, if a third party patent license is required to
+allow Recipient to distribute the Program, it is Recipient's responsibility
+to acquire that license before distributing the Program.
+
+d) Each Contributor represents that to its knowledge it has sufficient
+copyright rights in its Contribution, if any, to grant the copyright license
+set forth in this Agreement.
+
+3. REQUIREMENTS
+
+A Contributor may choose to distribute the Program in object code form under
+its own license agreement, provided that:
+
+a) it complies with the terms and conditions of this Agreement; and
+
+b) its license agreement:
+
+i) effectively disclaims on behalf of all Contributors all warranties and
+conditions, express and implied, including warranties or conditions of title
+and non-infringement, and implied warranties or conditions of merchantability
+and fitness for a particular purpose;
+
+ii) effectively excludes on behalf of all Contributors all liability for
+damages, including direct, indirect, special, incidental and consequential
+damages, such as lost profits;
+
+iii) states that any provisions which differ from this Agreement are offered
+by that Contributor alone and not by any other party; and
+
+iv) states that source code for the Program is available from such
+Contributor, and informs licensees how to obtain it in a reasonable manner on
+or through a medium customarily used for software exchange.
+
+When the Program is made available in source code form:
+
+a) it must be made available under this Agreement; and
+
+b) a copy of this Agreement must be included with each copy of the Program.
+
+Contributors may not remove or alter any copyright notices contained within
+the Program.
+
+Each Contributor must identify itself as the originator of its Contribution,
+if any, in a manner that reasonably allows subsequent Recipients to identify
+the originator of the Contribution.
+
+4. COMMERCIAL DISTRIBUTION
+
+Commercial distributors of software may accept certain responsibilities with
+respect to end users, business partners and the like. While this license is
+intended to facilitate the commercial use of the Program, the Contributor who
+includes the Program in a commercial product offering should do so in a
+manner which does not create potential liability for other Contributors.
+Therefore, if a Contributor includes the Program in a commercial product
+offering, such Contributor ("Commercial Contributor") hereby agrees to defend
+and indemnify every other Contributor ("Indemnified Contributor") against any
+losses, damages and costs (collectively "Losses") arising from claims,
+lawsuits and other legal actions brought by a third party against the
+Indemnified Contributor to the extent caused by the acts or omissions of such
+Commercial Contributor in connection with its distribution of the Program in
+a commercial product offering.  The obligations in this section do not apply
+to any claims or Losses relating to any actual or alleged intellectual
+property infringement. In order to qualify, an Indemnified Contributor must:
+a) promptly notify the Commercial Contributor in writing of such claim, and
+b) allow the Commercial Contributor tocontrol, and cooperate with the
+Commercial Contributor in, the defense and any related settlement
+negotiations. The Indemnified Contributor may participate in any such claim
+at its own expense.
+
+For example, a Contributor might include the Program in a commercial product
+offering, Product X. That Contributor is then a Commercial Contributor. If
+that Commercial Contributor then makes performance claims, or offers
+warranties related to Product X, those performance claims and warranties are
+such Commercial Contributor's responsibility alone. Under this section, the
+Commercial Contributor would have to defend claims against the other
+Contributors related to those performance claims and warranties, and if a
+court requires any other Contributor to pay any damages as a result, the
+Commercial Contributor must pay those damages.
+
+5. NO WARRANTY
+
+EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS PROVIDED ON
+AN "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER
+EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR
+CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A
+PARTICULAR PURPOSE. Each Recipient is solely responsible for determining the
+appropriateness of using and distributing the Program and assumes all risks
+associated with its exercise of rights under this Agreement , including but
+not limited to the risks and costs of program errors, compliance with
+applicable laws, damage to or loss of data, programs or equipment, and
+unavailability or interruption of operations.
+
+6. DISCLAIMER OF LIABILITY
+
+EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT NOR ANY
+CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION
+LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE
+EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY
+OF SUCH DAMAGES.
+
+7. GENERAL
+
+If any provision of this Agreement is invalid or unenforceable under
+applicable law, it shall not affect the validity or enforceability of the
+remainder of the terms of this Agreement, and without further action by the
+parties hereto, such provision shall be reformed to the minimum extent
+necessary to make such provision valid and enforceable.
+
+If Recipient institutes patent litigation against any entity (including a
+cross-claim or counterclaim in a lawsuit) alleging that the Program itself
+(excluding combinations of the Program with other software or hardware)
+infringes such Recipient's patent(s), then such Recipient's rights granted
+under Section 2(b) shall terminate as of the date such litigation is filed.
+
+All Recipient's rights under this Agreement shall terminate if it fails to
+comply with any of the material terms or conditions of this Agreement and
+does not cure such failure in a reasonable period of time after becoming
+aware of such noncompliance. If all Recipient's rights under this Agreement
+terminate, Recipient agrees to cease use and distribution of the Program as
+soon as reasonably practicable. However, Recipient's obligations under this
+Agreement and any licenses granted by Recipient relating to the Program shall
+continue and survive.
+
+Everyone is permitted to copy and distribute copies of this Agreement, but in
+order to avoid inconsistency the Agreement is copyrighted and may only be
+modified in the following manner. The Agreement Steward reserves the right to
+publish new versions (including revisions) of this Agreement from time to
+time. No one other than the Agreement Steward has the right to modify this
+Agreement. The Eclipse Foundation is the initial Agreement Steward. The
+Eclipse Foundation may assign the responsibility to serve as the Agreement
+Steward to a suitable separate entity. Each new version of the Agreement will
+be given a distinguishing version number. The Program (including
+Contributions) may always be distributed subject to the version of the
+Agreement under which it was received. In addition, after a new version of
+the Agreement is published, Contributor may elect to distribute the Program
+(including its Contributions) under the new version. Except as expressly
+stated in Sections 2(a) and 2(b) above, Recipient receives no rights or
+licenses to the intellectual property of any Contributor under this
+Agreement, whether expressly, by implication, estoppel or otherwise. All
+rights in the Program not expressly granted under this Agreement are
+reserved.
+
+This Agreement is governed by the laws of the State of New York and the
+intellectual property laws of the United States of America. No party to this
+Agreement will bring a legal action under this Agreement more than one year
+after the cause of action arose. Each party waives its rights to a jury trial
+in any resulting litigation.
diff --git a/util/generate-hooks-index/README.md b/util/generate-hooks-index/README.md
new file mode 100644
index 000000000..a3d4f7666
--- /dev/null
+++ b/util/generate-hooks-index/README.md
@@ -0,0 +1,30 @@
+# Generate hooks
+
+This program generates hooks.html documentation from the Hubzilla source.
+
+## Usage
+
+Download and install leiningen
+
+Change directory into  hubzilla/util/generate-hooks-index
+
+At shell prompt, do:
+
+```sh
+lein run
+```
+
+Hooks docs will get dumped into hubzilla/doc/hooks.html
+
+## Requirements
+
+* JVM like OpenJDK etc
+
+* [Leiningen](http://leiningen.org/)
+
+## License
+
+Copyright © 2015 ken restivo (ken@restivo.org)
+
+Distributed under the Eclipse Public License either version 1.0 or (at
+your option) any later version.
diff --git a/util/generate-hooks-index/doc/intro.md b/util/generate-hooks-index/doc/intro.md
new file mode 100644
index 000000000..203ef8b8c
--- /dev/null
+++ b/util/generate-hooks-index/doc/intro.md
@@ -0,0 +1,3 @@
+# Introduction to generate-hooks-index
+
+TODO: write [great documentation](http://jacobian.org/writing/what-to-write/)
diff --git a/util/generate-hooks-index/project.clj b/util/generate-hooks-index/project.clj
new file mode 100644
index 000000000..730fe76d8
--- /dev/null
+++ b/util/generate-hooks-index/project.clj
@@ -0,0 +1,10 @@
+(defproject generate-hooks-index "0.1.0-SNAPSHOT"
+  :description "Generates Hooks docs for Hubzilla"
+  :url "https://github.com/redmatrix/hubzilla"
+  :license {:name "Eclipse Public License"
+            :url "http://www.eclipse.org/legal/epl-v10.html"}
+  :dependencies [[org.clojure/clojure "1.7.0"]
+                 [com.taoensso/timbre "4.1.2"]
+                 [hiccup "1.0.0"]]
+  :main generate-hooks-index.core)
+
diff --git a/util/generate-hooks-index/src/generate_hooks_index/core.clj b/util/generate-hooks-index/src/generate_hooks_index/core.clj
new file mode 100644
index 000000000..2112647b0
--- /dev/null
+++ b/util/generate-hooks-index/src/generate_hooks_index/core.clj
@@ -0,0 +1,82 @@
+(ns generate-hooks-index.core
+  (:require [clojure.string :as str]
+            [hiccup.core :as h]
+            [taoensso.timbre :as log]
+            [clojure.java.shell :as sh])
+  (:gen-class))
+
+(log/set-level! :info)
+
+(defn clean-fn-arg
+  [s]
+  (-> s
+      (str/replace #"'" "")
+      (str/replace #"\"" "")
+      str/trim))
+
+(defn check-fn-args
+  [xs]
+  (when (-> xs first empty?)
+    (throw (Exception. "empty function")))
+  (map clean-fn-arg xs))
+
+
+(defn get-fn-arg
+  [s]
+  (->> s
+       (re-matches #".*call_hooks\((.+)\,(.*)\).*")
+       rest
+       check-fn-args))
+
+
+
+(defn fix-path
+  [path file]
+  (str/replace file path ""))
+
+
+(defn show-hooks
+  [path]
+  (for [s (-> (sh/sh "rgrep" "call_hooks" path)
+              :out
+              str/split-lines)
+        :let [[file hook]   (str/split s #"\t*:")]]
+    (try
+      (-> (zipmap [:function :arg] (get-fn-arg hook))
+          (assoc  :file (fix-path path file)))
+      (catch Exception e
+        (log/debug e s file hook)))))
+
+
+
+(defn hiccupy
+  [path]
+  [:div
+   [:h3 "Hooks"]
+   [:table
+    [:tr (map #(vector :td %) ["Function" "Source File" "Arg"])]
+    (for [{:keys [function arg file]} 
+          (->> path
+               show-hooks
+               (sort-by :function))]
+      [:tr  (map #(vector :td (h/h %)) [function file arg])])]
+   [:p "Generated " (-> (java.util.Date.) str)]])
+
+
+(defn make-hook-docs
+  [path-to-hubzillla]
+  (->> path-to-hubzillla
+       hiccupy
+       h/html
+       (spit (str path-to-hubzillla "doc/hooks.html"))))
+
+
+(defn -main
+  [& args]
+  (log/info "Starting..")
+  (make-hook-docs (str (System/getProperty "user.dir") "/../../"))
+  (log/info "Done!")
+  (System/exit 0))
+
+
+
diff --git a/util/generate-hooks-index/test/generate_hooks_index/core_test.clj b/util/generate-hooks-index/test/generate_hooks_index/core_test.clj
new file mode 100644
index 000000000..913864ce4
--- /dev/null
+++ b/util/generate-hooks-index/test/generate_hooks_index/core_test.clj
@@ -0,0 +1,7 @@
+(ns generate-hooks-index.core-test
+  (:require [clojure.test :refer :all]
+            [generate-hooks-index.core :refer :all]))
+
+(deftest a-test
+  (testing "FIXME, I fail."
+    (is (= 0 1))))
diff --git a/view/css/mod_chat.css b/view/css/mod_chat.css
index 99037aeef..ded4b0ceb 100644
--- a/view/css/mod_chat.css
+++ b/view/css/mod_chat.css
@@ -6,18 +6,19 @@
  #chatTopBar {
 	 float: left;
 	 height: 400px;
-	 width: 400px;
+	 width: 77%;
 	 overflow-y: auto;
  }
  
  #chatSide {
 	 float: right;
-	 width: 150px;
+	 width: 20%;
 	 height: 100%;
  }
 
  #chatDrop {
-	margin-bottom: 20px;
+	margin: 20px 0;
+	float: right;
 }
 
  #chatUsers {
@@ -31,6 +32,14 @@
 	 margin-top: 20px;
  }
  
+#chatOptionsBar {
+	margin-top: 20px;
+}
+
+ #chatText {
+	 width: 100%;
+ }
+
  section {
 	 padding-bottom: 0;
  }
@@ -60,3 +69,5 @@
 	padding: 3px;
 	display: inline-block;
 }
+
+
diff --git a/view/css/widgets.css b/view/css/widgets.css
index 516e59e6f..eb771cc06 100644
--- a/view/css/widgets.css
+++ b/view/css/widgets.css
@@ -27,6 +27,7 @@
 
 #side-follow-url {
 	margin-top: 5px;
+	width: 100%;
 }
 
 #side-follow-submit {
diff --git a/view/it/hmessages.po b/view/it/hmessages.po
index 956477e67..5d1014fad 100644
--- a/view/it/hmessages.po
+++ b/view/it/hmessages.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Redmatrix\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-10-23 00:03-0700\n"
-"PO-Revision-Date: 2015-10-24 09:56+0000\n"
+"POT-Creation-Date: 2015-10-30 00:03-0700\n"
+"PO-Revision-Date: 2015-11-04 13:49+0000\n"
 "Last-Translator: tuscanhobbit <pynolo@tarine.net>\n"
 "Language-Team: Italian (http://www.transifex.com/Friendica/red-matrix/language/it/)\n"
 "MIME-Version: 1.0\n"
@@ -19,32 +19,6 @@ msgstr ""
 "Language: it\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../../include/bb2diaspora.php:388
-msgid "Attachments:"
-msgstr "Allegati:"
-
-#: ../../include/bb2diaspora.php:474 ../../include/event.php:22
-msgid "l F d, Y \\@ g:i A"
-msgstr "l d F Y \\@ G:i"
-
-#: ../../include/bb2diaspora.php:476
-msgid "$Projectname event notification:"
-msgstr "Notifica evento $Projectname:"
-
-#: ../../include/bb2diaspora.php:480 ../../include/event.php:30
-msgid "Starts:"
-msgstr "Inizio:"
-
-#: ../../include/bb2diaspora.php:488 ../../include/event.php:40
-msgid "Finishes:"
-msgstr "Fine:"
-
-#: ../../include/bb2diaspora.php:496 ../../include/event.php:50
-#: ../../include/identity.php:1016 ../../mod/directory.php:302
-#: ../../mod/events.php:701
-msgid "Location:"
-msgstr "Luogo:"
-
 #: ../../include/Import/import_diaspora.php:17
 msgid "No username found in import file."
 msgstr "Impossibile trovare il nome utente nel file da importare."
@@ -62,7 +36,7 @@ msgstr "L'importazione è terminata con successo."
 msgid "parent"
 msgstr "cartella superiore"
 
-#: ../../include/RedDAV/RedBrowser.php:131 ../../include/text.php:2509
+#: ../../include/RedDAV/RedBrowser.php:131 ../../include/text.php:2529
 msgid "Collection"
 msgstr "Cartella"
 
@@ -88,12 +62,12 @@ msgstr "Appuntamenti inviati"
 
 #: ../../include/RedDAV/RedBrowser.php:164 ../../include/apps.php:360
 #: ../../include/apps.php:415 ../../include/conversation.php:1023
-#: ../../mod/photos.php:756 ../../mod/photos.php:1195
+#: ../../mod/photos.php:759 ../../mod/photos.php:1198
 msgid "Unknown"
 msgstr "Sconosciuto"
 
 #: ../../include/RedDAV/RedBrowser.php:226 ../../include/apps.php:135
-#: ../../include/conversation.php:1613 ../../include/nav.php:93
+#: ../../include/conversation.php:1620 ../../include/nav.php:93
 #: ../../mod/fbrowser.php:114
 msgid "Files"
 msgstr "Archivio file"
@@ -114,8 +88,8 @@ msgid "Create"
 msgstr "Crea"
 
 #: ../../include/RedDAV/RedBrowser.php:231
-#: ../../include/RedDAV/RedBrowser.php:305 ../../mod/photos.php:781
-#: ../../mod/photos.php:1314 ../../mod/profile_photo.php:450
+#: ../../include/RedDAV/RedBrowser.php:305 ../../mod/photos.php:784
+#: ../../mod/photos.php:1317 ../../mod/profile_photo.php:450
 msgid "Upload"
 msgstr "Carica"
 
@@ -141,7 +115,7 @@ msgstr "Ultima modifica"
 #: ../../include/page_widgets.php:8 ../../include/page_widgets.php:36
 #: ../../include/apps.php:259 ../../include/ItemObject.php:100
 #: ../../mod/layouts.php:183 ../../mod/editblock.php:135
-#: ../../mod/editpost.php:113 ../../mod/menu.php:108
+#: ../../mod/editpost.php:112 ../../mod/menu.php:108
 #: ../../mod/webpages.php:181 ../../mod/blocks.php:153 ../../mod/thing.php:257
 #: ../../mod/settings.php:645 ../../mod/connections.php:235
 #: ../../mod/connections.php:248 ../../mod/connections.php:267
@@ -151,7 +125,7 @@ msgstr "Modifica"
 
 #: ../../include/RedDAV/RedBrowser.php:241 ../../include/apps.php:260
 #: ../../include/ItemObject.php:120 ../../include/conversation.php:657
-#: ../../mod/connedit.php:546 ../../mod/photos.php:1126
+#: ../../mod/connedit.php:546 ../../mod/photos.php:1129
 #: ../../mod/editblock.php:181 ../../mod/admin.php:783 ../../mod/admin.php:942
 #: ../../mod/webpages.php:183 ../../mod/blocks.php:155 ../../mod/thing.php:258
 #: ../../mod/settings.php:646 ../../mod/editlayout.php:179
@@ -327,31 +301,31 @@ msgstr "Il nome della chat non è valido."
 msgid "Room not found."
 msgstr "Chat non trovata."
 
-#: ../../include/chat.php:133 ../../include/items.php:4376
-#: ../../include/photos.php:26 ../../include/attach.php:137
-#: ../../include/attach.php:185 ../../include/attach.php:248
-#: ../../include/attach.php:262 ../../include/attach.php:269
-#: ../../include/attach.php:334 ../../include/attach.php:348
-#: ../../include/attach.php:355 ../../include/attach.php:433
-#: ../../include/attach.php:875 ../../include/attach.php:946
-#: ../../include/attach.php:1098 ../../mod/achievements.php:30
+#: ../../include/chat.php:133 ../../include/items.php:4377
+#: ../../include/photos.php:29 ../../include/attach.php:140
+#: ../../include/attach.php:188 ../../include/attach.php:251
+#: ../../include/attach.php:265 ../../include/attach.php:272
+#: ../../include/attach.php:337 ../../include/attach.php:351
+#: ../../include/attach.php:358 ../../include/attach.php:436
+#: ../../include/attach.php:884 ../../include/attach.php:955
+#: ../../include/attach.php:1107 ../../mod/achievements.php:30
 #: ../../mod/fsuggest.php:78 ../../mod/authtest.php:13
 #: ../../mod/bookmarks.php:48 ../../mod/block.php:22 ../../mod/block.php:72
 #: ../../mod/id.php:71 ../../mod/like.php:177 ../../mod/common.php:35
 #: ../../mod/mitem.php:111 ../../mod/connedit.php:347 ../../mod/mood.php:112
-#: ../../mod/photos.php:70 ../../mod/filestorage.php:18
-#: ../../mod/filestorage.php:73 ../../mod/filestorage.php:88
-#: ../../mod/filestorage.php:115 ../../mod/layouts.php:69
-#: ../../mod/layouts.php:76 ../../mod/layouts.php:87 ../../mod/poke.php:133
-#: ../../mod/network.php:12 ../../mod/chat.php:94 ../../mod/chat.php:99
-#: ../../mod/rate.php:111 ../../mod/mail.php:118 ../../mod/editblock.php:65
+#: ../../mod/filestorage.php:18 ../../mod/filestorage.php:73
+#: ../../mod/filestorage.php:88 ../../mod/filestorage.php:115
+#: ../../mod/layouts.php:69 ../../mod/layouts.php:76 ../../mod/layouts.php:87
+#: ../../mod/poke.php:133 ../../mod/network.php:12 ../../mod/chat.php:94
+#: ../../mod/chat.php:99 ../../mod/rate.php:111 ../../mod/mail.php:118
+#: ../../mod/photos.php:70 ../../mod/editblock.php:65
 #: ../../mod/editpost.php:13 ../../mod/appman.php:66 ../../mod/profile.php:64
 #: ../../mod/profile.php:72 ../../mod/menu.php:74 ../../mod/page.php:31
 #: ../../mod/page.php:86 ../../mod/new_channel.php:68
 #: ../../mod/new_channel.php:99 ../../mod/notifications.php:66
 #: ../../mod/pdledit.php:21 ../../mod/events.php:256
 #: ../../mod/profile_photo.php:338 ../../mod/profile_photo.php:351
-#: ../../mod/item.php:205 ../../mod/item.php:213 ../../mod/item.php:1002
+#: ../../mod/item.php:205 ../../mod/item.php:213 ../../mod/item.php:1004
 #: ../../mod/message.php:16 ../../mod/webpages.php:69
 #: ../../mod/register.php:72 ../../mod/blocks.php:69 ../../mod/blocks.php:76
 #: ../../mod/service_limits.php:7 ../../mod/sources.php:66
@@ -595,131 +569,139 @@ msgid ""
 msgstr "Rendi possibile la crifratura aggiuntiva tra mittente e destinatario usando una parola chiave conosciuta a entrambi"
 
 #: ../../include/features.php:61
-msgid "Enable voting tools"
-msgstr "Permetti i post con votazione"
+msgid "Enable Voting Tools"
+msgstr "Abilita gli strumenti per votare"
 
 #: ../../include/features.php:61
 msgid "Provide a class of post which others can vote on"
 msgstr "Rende possibile la creazione di post in cui sarà possibile votare"
 
-#: ../../include/features.php:67
+#: ../../include/features.php:62
+msgid "Delayed Posting"
+msgstr "Pubblicazione ritardata"
+
+#: ../../include/features.php:62
+msgid "Allow posts to be published at a later date"
+msgstr "Per scegliere una data e un'ora a cui far uscire i post"
+
+#: ../../include/features.php:68
 msgid "Network and Stream Filtering"
 msgstr "Filtraggio dei contenuti"
 
-#: ../../include/features.php:68
+#: ../../include/features.php:69
 msgid "Search by Date"
 msgstr "Ricerca per data"
 
-#: ../../include/features.php:68
+#: ../../include/features.php:69
 msgid "Ability to select posts by date ranges"
 msgstr "Per selezionare i post in un intervallo tra date"
 
-#: ../../include/features.php:69
+#: ../../include/features.php:70
 msgid "Collections Filter"
 msgstr "Filtra per insiemi di canali"
 
-#: ../../include/features.php:69
+#: ../../include/features.php:70
 msgid "Enable widget to display Network posts only from selected collections"
 msgstr "Mostra il riquadro per filtrare i post di certi insiemi di canali"
 
-#: ../../include/features.php:70 ../../include/widgets.php:273
+#: ../../include/features.php:71 ../../include/widgets.php:273
 msgid "Saved Searches"
 msgstr "Ricerche salvate"
 
-#: ../../include/features.php:70
+#: ../../include/features.php:71
 msgid "Save search terms for re-use"
 msgstr "Salva i termini delle ricerche per poterle ripetere"
 
-#: ../../include/features.php:71
+#: ../../include/features.php:72
 msgid "Network Personal Tab"
 msgstr "Attività personale"
 
-#: ../../include/features.php:71
+#: ../../include/features.php:72
 msgid "Enable tab to display only Network posts that you've interacted on"
 msgstr "Abilita il link per mostrare solamente i contenuti con cui hai interagito"
 
-#: ../../include/features.php:72
+#: ../../include/features.php:73
 msgid "Network New Tab"
 msgstr "Contenuti nuovi"
 
-#: ../../include/features.php:72
+#: ../../include/features.php:73
 msgid "Enable tab to display all new Network activity"
 msgstr "Abilita il link per visualizzare solo i nuovi contenuti"
 
-#: ../../include/features.php:73
+#: ../../include/features.php:74
 msgid "Affinity Tool"
 msgstr "Filtro per affinità"
 
-#: ../../include/features.php:73
+#: ../../include/features.php:74
 msgid "Filter stream activity by depth of relationships"
 msgstr "Permette di selezionare i contenuti in base al livello di amicizia"
 
-#: ../../include/features.php:74
+#: ../../include/features.php:75
 msgid "Connection Filtering"
 msgstr "Filtro sui contatti"
 
-#: ../../include/features.php:74
+#: ../../include/features.php:75
 msgid "Filter incoming posts from connections based on keywords/content"
 msgstr "Filtra i post che ricevi con parole chiave"
 
-#: ../../include/features.php:75
+#: ../../include/features.php:76
 msgid "Suggest Channels"
 msgstr "Suggerisci canali"
 
-#: ../../include/features.php:75
+#: ../../include/features.php:76
 msgid "Show channel suggestions"
 msgstr "Mostra alcuni canali che potrebbero interessarti"
 
-#: ../../include/features.php:80
+#: ../../include/features.php:81
 msgid "Post/Comment Tools"
 msgstr "Gestione post e commenti"
 
-#: ../../include/features.php:81
+#: ../../include/features.php:82
 msgid "Tagging"
 msgstr "Tag"
 
-#: ../../include/features.php:81
+#: ../../include/features.php:82
 msgid "Ability to tag existing posts"
 msgstr "Permetti l'aggiunta di tag su post già esistenti"
 
-#: ../../include/features.php:82
+#: ../../include/features.php:83
 msgid "Post Categories"
 msgstr "Categorie dei post"
 
-#: ../../include/features.php:82
+#: ../../include/features.php:83
 msgid "Add categories to your posts"
 msgstr "Abilita le categorie per i tuoi post"
 
-#: ../../include/features.php:83 ../../include/contact_widgets.php:57
+#: ../../include/features.php:84 ../../include/contact_widgets.php:57
 #: ../../include/widgets.php:303
 msgid "Saved Folders"
 msgstr "Cartelle salvate"
 
-#: ../../include/features.php:83
+#: ../../include/features.php:84
 msgid "Ability to file posts under folders"
 msgstr "Abilita la raccolta dei tuoi articoli in cartelle"
 
-#: ../../include/features.php:84
+#: ../../include/features.php:85
 msgid "Dislike Posts"
 msgstr "Non mi piace"
 
-#: ../../include/features.php:84
+#: ../../include/features.php:85
 msgid "Ability to dislike posts/comments"
 msgstr "Abilità la funzionalità \"non mi piace\" per i tuoi post"
 
-#: ../../include/features.php:85
+#: ../../include/features.php:86
 msgid "Star Posts"
 msgstr "Post con stella"
 
-#: ../../include/features.php:85
+#: ../../include/features.php:86
 msgid "Ability to mark special posts with a star indicator"
 msgstr "Mostra la stella per segnare i post preferiti"
 
-#: ../../include/features.php:86
+#: ../../include/features.php:87
 msgid "Tag Cloud"
 msgstr "Nuvola di tag"
 
-#: ../../include/features.php:86
+#: ../../include/features.php:87
 msgid "Provide a personal tag cloud on your channel page"
 msgstr "Mostra la nuvola dei tag che usi di più sulla pagina del tuo canale"
 
@@ -732,7 +714,7 @@ msgid "Delete this item?"
 msgstr "Eliminare questo elemento?"
 
 #: ../../include/js_strings.php:6 ../../include/ItemObject.php:681
-#: ../../mod/photos.php:1044 ../../mod/photos.php:1162
+#: ../../mod/photos.php:1047 ../../mod/photos.php:1165
 msgid "Comment"
 msgstr "Commento"
 
@@ -788,7 +770,7 @@ msgstr "Niente di nuovo qui"
 msgid "Rate This Channel (this is public)"
 msgstr "Valuta questo canale (visibile a tutti)"
 
-#: ../../include/js_strings.php:20 ../../mod/connedit.php:666
+#: ../../include/js_strings.php:20 ../../mod/connedit.php:684
 #: ../../mod/rate.php:157
 msgid "Rating"
 msgstr "Valutazioni"
@@ -799,17 +781,17 @@ msgstr "Descrizione (facoltativa)"
 
 #: ../../include/js_strings.php:22 ../../include/ItemObject.php:682
 #: ../../mod/fsuggest.php:108 ../../mod/mitem.php:231
-#: ../../mod/connedit.php:687 ../../mod/mood.php:135 ../../mod/pconfig.php:108
-#: ../../mod/photos.php:634 ../../mod/photos.php:1005
-#: ../../mod/photos.php:1045 ../../mod/photos.php:1163
+#: ../../mod/connedit.php:705 ../../mod/mood.php:135 ../../mod/pconfig.php:108
 #: ../../mod/filestorage.php:156 ../../mod/poke.php:171 ../../mod/chat.php:184
 #: ../../mod/chat.php:213 ../../mod/rate.php:168 ../../mod/mail.php:371
-#: ../../mod/admin.php:411 ../../mod/admin.php:776 ../../mod/admin.php:940
-#: ../../mod/admin.php:1072 ../../mod/admin.php:1266 ../../mod/admin.php:1351
-#: ../../mod/appman.php:99 ../../mod/pdledit.php:58 ../../mod/events.php:534
-#: ../../mod/events.php:710 ../../mod/sources.php:104
-#: ../../mod/sources.php:138 ../../mod/import.php:517 ../../mod/thing.php:313
-#: ../../mod/thing.php:359 ../../mod/invite.php:142 ../../mod/settings.php:583
+#: ../../mod/photos.php:637 ../../mod/photos.php:1008
+#: ../../mod/photos.php:1048 ../../mod/photos.php:1166 ../../mod/admin.php:411
+#: ../../mod/admin.php:776 ../../mod/admin.php:940 ../../mod/admin.php:1072
+#: ../../mod/admin.php:1266 ../../mod/admin.php:1351 ../../mod/appman.php:99
+#: ../../mod/pdledit.php:58 ../../mod/events.php:534 ../../mod/events.php:710
+#: ../../mod/sources.php:104 ../../mod/sources.php:138
+#: ../../mod/import.php:517 ../../mod/thing.php:313 ../../mod/thing.php:359
+#: ../../mod/invite.php:142 ../../mod/settings.php:583
 #: ../../mod/settings.php:695 ../../mod/settings.php:723
 #: ../../mod/settings.php:746 ../../mod/settings.php:831
 #: ../../mod/settings.php:1020 ../../mod/xchan.php:11 ../../mod/group.php:81
@@ -900,19 +882,19 @@ msgstr " "
 msgid "timeago.numbers"
 msgstr "timeago.numbers"
 
-#: ../../include/js_strings.php:44 ../../include/text.php:1144
+#: ../../include/js_strings.php:44 ../../include/text.php:1153
 msgid "January"
 msgstr "gennaio"
 
-#: ../../include/js_strings.php:45 ../../include/text.php:1144
+#: ../../include/js_strings.php:45 ../../include/text.php:1153
 msgid "February"
 msgstr "febbraio"
 
-#: ../../include/js_strings.php:46 ../../include/text.php:1144
+#: ../../include/js_strings.php:46 ../../include/text.php:1153
 msgid "March"
 msgstr "marzo"
 
-#: ../../include/js_strings.php:47 ../../include/text.php:1144
+#: ../../include/js_strings.php:47 ../../include/text.php:1153
 msgid "April"
 msgstr "aprile"
 
@@ -921,31 +903,31 @@ msgctxt "long"
 msgid "May"
 msgstr "maggio"
 
-#: ../../include/js_strings.php:49 ../../include/text.php:1144
+#: ../../include/js_strings.php:49 ../../include/text.php:1153
 msgid "June"
 msgstr "giugno"
 
-#: ../../include/js_strings.php:50 ../../include/text.php:1144
+#: ../../include/js_strings.php:50 ../../include/text.php:1153
 msgid "July"
 msgstr "luglio"
 
-#: ../../include/js_strings.php:51 ../../include/text.php:1144
+#: ../../include/js_strings.php:51 ../../include/text.php:1153
 msgid "August"
 msgstr "agosto"
 
-#: ../../include/js_strings.php:52 ../../include/text.php:1144
+#: ../../include/js_strings.php:52 ../../include/text.php:1153
 msgid "September"
 msgstr "settembre"
 
-#: ../../include/js_strings.php:53 ../../include/text.php:1144
+#: ../../include/js_strings.php:53 ../../include/text.php:1153
 msgid "October"
 msgstr "ottobre"
 
-#: ../../include/js_strings.php:54 ../../include/text.php:1144
+#: ../../include/js_strings.php:54 ../../include/text.php:1153
 msgid "November"
 msgstr "novembre"
 
-#: ../../include/js_strings.php:55 ../../include/text.php:1144
+#: ../../include/js_strings.php:55 ../../include/text.php:1153
 msgid "December"
 msgstr "dicembre"
 
@@ -998,31 +980,31 @@ msgstr "Nov"
 msgid "Dec"
 msgstr "Dic"
 
-#: ../../include/js_strings.php:68 ../../include/text.php:1140
+#: ../../include/js_strings.php:68 ../../include/text.php:1149
 msgid "Sunday"
 msgstr "domenica"
 
-#: ../../include/js_strings.php:69 ../../include/text.php:1140
+#: ../../include/js_strings.php:69 ../../include/text.php:1149
 msgid "Monday"
 msgstr "lunedì"
 
-#: ../../include/js_strings.php:70 ../../include/text.php:1140
+#: ../../include/js_strings.php:70 ../../include/text.php:1149
 msgid "Tuesday"
 msgstr "martedì"
 
-#: ../../include/js_strings.php:71 ../../include/text.php:1140
+#: ../../include/js_strings.php:71 ../../include/text.php:1149
 msgid "Wednesday"
 msgstr "mercoledì"
 
-#: ../../include/js_strings.php:72 ../../include/text.php:1140
+#: ../../include/js_strings.php:72 ../../include/text.php:1149
 msgid "Thursday"
 msgstr "giovedì"
 
-#: ../../include/js_strings.php:73 ../../include/text.php:1140
+#: ../../include/js_strings.php:73 ../../include/text.php:1149
 msgid "Friday"
 msgstr "venerdì"
 
-#: ../../include/js_strings.php:74 ../../include/text.php:1140
+#: ../../include/js_strings.php:74 ../../include/text.php:1149
 msgid "Saturday"
 msgstr "sabato"
 
@@ -1237,36 +1219,36 @@ msgstr "Visibile ai contatti approvati."
 msgid "Visible to specific connections."
 msgstr "Visibile ad alcuni contatti scelti."
 
-#: ../../include/items.php:4297 ../../mod/display.php:36
+#: ../../include/items.php:4298 ../../mod/display.php:36
 #: ../../mod/filestorage.php:27 ../../mod/admin.php:127
 #: ../../mod/admin.php:979 ../../mod/admin.php:1179 ../../mod/thing.php:86
 #: ../../mod/viewsrc.php:20
 msgid "Item not found."
 msgstr "Elemento non trovato."
 
-#: ../../include/items.php:4806 ../../mod/group.php:38 ../../mod/group.php:137
+#: ../../include/items.php:4807 ../../mod/group.php:38 ../../mod/group.php:137
 msgid "Collection not found."
 msgstr "Insieme di canali non trovato."
 
-#: ../../include/items.php:4822
+#: ../../include/items.php:4823
 msgid "Collection is empty."
 msgstr "L'insieme di canali è vuoto."
 
-#: ../../include/items.php:4829
+#: ../../include/items.php:4830
 #, php-format
 msgid "Collection: %s"
 msgstr "Insieme: %s"
 
-#: ../../include/items.php:4839 ../../mod/connedit.php:657
+#: ../../include/items.php:4840 ../../mod/connedit.php:673
 #, php-format
 msgid "Connection: %s"
 msgstr "Contatto: %s"
 
-#: ../../include/items.php:4841
+#: ../../include/items.php:4842
 msgid "Connection not found."
 msgstr "Contatto non trovato."
 
-#: ../../include/api.php:1321
+#: ../../include/api.php:1324
 msgid "Public Timeline"
 msgstr "Diario pubblico"
 
@@ -1317,15 +1299,14 @@ msgstr "Mostra"
 msgid "Don't show"
 msgstr "Non mostrare"
 
-#: ../../include/acl_selectors.php:247 ../../mod/photos.php:628
-#: ../../mod/photos.php:998 ../../mod/filestorage.php:147
-#: ../../mod/chat.php:211 ../../mod/events.php:708 ../../mod/thing.php:310
-#: ../../mod/thing.php:356
+#: ../../include/acl_selectors.php:247 ../../mod/filestorage.php:147
+#: ../../mod/chat.php:211 ../../mod/photos.php:631 ../../mod/photos.php:1001
+#: ../../mod/events.php:708 ../../mod/thing.php:310 ../../mod/thing.php:356
 msgid "Permissions"
 msgstr "Permessi"
 
 #: ../../include/acl_selectors.php:248 ../../include/ItemObject.php:369
-#: ../../mod/photos.php:1215
+#: ../../mod/photos.php:1218
 msgid "Close"
 msgstr "Chiudi"
 
@@ -1342,28 +1323,28 @@ msgstr "Impossibile clonare il canale. L'importazione è fallita."
 msgid "Cloned channel not found. Import failed."
 msgstr "Impossibile trovare il canale clonato. L'importazione è fallita."
 
-#: ../../include/photos.php:109
+#: ../../include/photos.php:112
 #, php-format
 msgid "Image exceeds website size limit of %lu bytes"
 msgstr "L'immagine supera il limite massimo di %lu bytes"
 
-#: ../../include/photos.php:116
+#: ../../include/photos.php:119
 msgid "Image file is empty."
 msgstr "Il file dell'immagine è vuoto."
 
-#: ../../include/photos.php:143 ../../mod/profile_photo.php:222
+#: ../../include/photos.php:146 ../../mod/profile_photo.php:222
 msgid "Unable to process image"
 msgstr "Impossibile elaborare l'immagine"
 
-#: ../../include/photos.php:232
+#: ../../include/photos.php:257
 msgid "Photo storage failed."
 msgstr "Impossibile salvare la foto."
 
-#: ../../include/photos.php:452 ../../include/conversation.php:1609
+#: ../../include/photos.php:483 ../../include/conversation.php:1616
 msgid "Photo Albums"
 msgstr "Album foto"
 
-#: ../../include/photos.php:456
+#: ../../include/photos.php:487
 msgid "Upload New Photos"
 msgstr "Carica nuove foto"
 
@@ -1386,8 +1367,8 @@ msgid "View"
 msgstr "Guarda"
 
 #: ../../include/page_widgets.php:40 ../../include/ItemObject.php:691
-#: ../../include/conversation.php:1160 ../../mod/photos.php:1046
-#: ../../mod/editblock.php:171 ../../mod/editpost.php:150
+#: ../../include/conversation.php:1160 ../../mod/photos.php:1049
+#: ../../mod/editblock.php:171 ../../mod/editpost.php:149
 #: ../../mod/events.php:707 ../../mod/webpages.php:188
 #: ../../mod/editwebpage.php:212
 msgid "Preview"
@@ -1415,8 +1396,8 @@ msgstr "Creato"
 msgid "Edited"
 msgstr "Modificato"
 
-#: ../../include/photo/photo_driver.php:705 ../../mod/photos.php:94
-#: ../../mod/photos.php:696 ../../mod/profile_photo.php:146
+#: ../../include/photo/photo_driver.php:708 ../../mod/photos.php:94
+#: ../../mod/photos.php:699 ../../mod/profile_photo.php:146
 #: ../../mod/profile_photo.php:236 ../../mod/profile_photo.php:376
 msgid "Profile Photos"
 msgstr "Foto del profilo"
@@ -1674,11 +1655,29 @@ msgstr "Contenuti incorporati"
 msgid "Embedding disabled"
 msgstr "Disabilita la creazione di contenuti incorporati"
 
+#: ../../include/event.php:22 ../../include/bb2diaspora.php:468
+msgid "l F d, Y \\@ g:i A"
+msgstr "l d F Y \\@ G:i"
+
+#: ../../include/event.php:30 ../../include/bb2diaspora.php:474
+msgid "Starts:"
+msgstr "Inizio:"
+
+#: ../../include/event.php:40 ../../include/bb2diaspora.php:482
+msgid "Finishes:"
+msgstr "Fine:"
+
+#: ../../include/event.php:50 ../../include/identity.php:1016
+#: ../../include/bb2diaspora.php:490 ../../mod/directory.php:302
+#: ../../mod/events.php:701
+msgid "Location:"
+msgstr "Luogo:"
+
 #: ../../include/event.php:766
 msgid "This event has been added to your calendar."
 msgstr "Questo evento è stato aggiunto al tuo calendario"
 
-#: ../../include/event.php:896 ../../include/text.php:1846
+#: ../../include/event.php:896 ../../include/text.php:1866
 #: ../../include/conversation.php:123 ../../mod/like.php:363
 #: ../../mod/tagger.php:47 ../../mod/events.php:245
 msgid "event"
@@ -1708,7 +1707,7 @@ msgstr "Annullato"
 msgid "Site Admin"
 msgstr "Amministrazione sito"
 
-#: ../../include/apps.php:129 ../../include/conversation.php:1639
+#: ../../include/apps.php:129 ../../include/conversation.php:1646
 #: ../../include/nav.php:103
 msgid "Bookmarks"
 msgstr "Segnalibri"
@@ -1735,7 +1734,7 @@ msgstr "Rete"
 msgid "Settings"
 msgstr "Impostazioni"
 
-#: ../../include/apps.php:136 ../../include/conversation.php:1649
+#: ../../include/apps.php:136 ../../include/conversation.php:1656
 #: ../../include/nav.php:107 ../../mod/webpages.php:178
 msgid "Webpages"
 msgstr "Pagine web"
@@ -1749,7 +1748,7 @@ msgstr "Bacheca del canale"
 msgid "Profile"
 msgstr "Profilo"
 
-#: ../../include/apps.php:139 ../../include/conversation.php:1606
+#: ../../include/apps.php:139 ../../include/conversation.php:1613
 #: ../../include/nav.php:92 ../../mod/fbrowser.php:25
 msgid "Photos"
 msgstr "Foto"
@@ -1786,7 +1785,7 @@ msgstr "Chat"
 
 #: ../../include/apps.php:147 ../../include/text.php:857
 #: ../../include/text.php:869 ../../include/nav.php:159
-#: ../../mod/search.php:38
+#: ../../mod/search.php:40
 msgid "Search"
 msgstr "Cerca"
 
@@ -1836,6 +1835,68 @@ msgstr "Installa"
 msgid "Purchase"
 msgstr "Acquista"
 
+#: ../../include/attach.php:246 ../../include/attach.php:332
+msgid "Item was not found."
+msgstr "Elemento non trovato."
+
+#: ../../include/attach.php:496
+msgid "No source file."
+msgstr "Nessun file di origine."
+
+#: ../../include/attach.php:514
+msgid "Cannot locate file to replace"
+msgstr "Il file da sostituire non è stato trovato"
+
+#: ../../include/attach.php:532
+msgid "Cannot locate file to revise/update"
+msgstr "Il file da aggiornare non è stato trovato"
+
+#: ../../include/attach.php:667
+#, php-format
+msgid "File exceeds size limit of %d"
+msgstr "Il file supera la dimensione massima di %d"
+
+#: ../../include/attach.php:681
+#, php-format
+msgid "You have reached your limit of %1$.0f Mbytes attachment storage."
+msgstr "Hai raggiunto il limite complessivo di %1$.0f Mbytes per gli allegati."
+
+#: ../../include/attach.php:837
+msgid "File upload failed. Possible system limit or action terminated."
+msgstr "Caricamento file fallito, potrebbe essere stato interrotto o potrebbe aver superato lo spazio assegnato."
+
+#: ../../include/attach.php:850
+msgid "Stored file could not be verified. Upload failed."
+msgstr "Il file non può essere verificato. Caricamento fallito."
+
+#: ../../include/attach.php:898 ../../include/attach.php:914
+msgid "Path not available."
+msgstr "Percorso non disponibile."
+
+#: ../../include/attach.php:960 ../../include/attach.php:1112
+msgid "Empty pathname"
+msgstr "Il percorso del file è vuoto"
+
+#: ../../include/attach.php:986
+msgid "duplicate filename or path"
+msgstr "il file o il percorso del file è duplicato"
+
+#: ../../include/attach.php:1008
+msgid "Path not found."
+msgstr "Percorso del file non trovato."
+
+#: ../../include/attach.php:1066
+msgid "mkdir failed."
+msgstr "mkdir fallito."
+
+#: ../../include/attach.php:1070
+msgid "database storage failed."
+msgstr "scrittura su database fallita."
+
+#: ../../include/attach.php:1118
+msgid "Empty path"
+msgstr "La posizione è vuota"
+
 #: ../../include/auth.php:131
 msgid "Logged out."
 msgstr "Uscita effettuata."
@@ -2064,22 +2125,22 @@ msgid "I abstain"
 msgstr "Mi astengo"
 
 #: ../../include/ItemObject.php:175 ../../include/ItemObject.php:187
-#: ../../include/conversation.php:1681 ../../mod/photos.php:1079
-#: ../../mod/photos.php:1091
+#: ../../include/conversation.php:1688 ../../mod/photos.php:1082
+#: ../../mod/photos.php:1094
 msgid "View all"
 msgstr "Vedi tutto"
 
 #: ../../include/ItemObject.php:179 ../../include/identity.php:1276
-#: ../../include/taxonomy.php:403 ../../include/conversation.php:1705
-#: ../../mod/photos.php:1083
+#: ../../include/taxonomy.php:403 ../../include/conversation.php:1712
+#: ../../mod/photos.php:1086
 msgctxt "noun"
 msgid "Like"
 msgid_plural "Likes"
 msgstr[0] "Mi piace"
 msgstr[1] "Mi piace"
 
-#: ../../include/ItemObject.php:184 ../../include/conversation.php:1708
-#: ../../mod/photos.php:1088
+#: ../../include/ItemObject.php:184 ../../include/conversation.php:1715
+#: ../../mod/photos.php:1091
 msgctxt "noun"
 msgid "Dislike"
 msgid_plural "Dislikes"
@@ -2114,7 +2175,7 @@ msgstr "Massaggio con firma non corretta"
 msgid "Add Tag"
 msgstr "Aggiungi un tag"
 
-#: ../../include/ItemObject.php:254 ../../mod/photos.php:1023
+#: ../../include/ItemObject.php:254 ../../mod/photos.php:1026
 msgid "I like this (toggle)"
 msgstr "Attiva/disattiva Mi piace"
 
@@ -2122,7 +2183,7 @@ msgstr "Attiva/disattiva Mi piace"
 msgid "like"
 msgstr "mi piace"
 
-#: ../../include/ItemObject.php:255 ../../mod/photos.php:1024
+#: ../../include/ItemObject.php:255 ../../mod/photos.php:1027
 msgid "I don't like this (toggle)"
 msgstr "Attiva/disattiva Non mi piace"
 
@@ -2197,54 +2258,54 @@ msgstr "Aggiungi al calendario"
 msgid "Mark all seen"
 msgstr "Marca tutto come letto"
 
-#: ../../include/ItemObject.php:363 ../../mod/photos.php:1209
+#: ../../include/ItemObject.php:363 ../../mod/photos.php:1212
 msgctxt "noun"
 msgid "Likes"
 msgstr "Mi piace"
 
-#: ../../include/ItemObject.php:364 ../../mod/photos.php:1210
+#: ../../include/ItemObject.php:364 ../../mod/photos.php:1213
 msgctxt "noun"
 msgid "Dislikes"
 msgstr "Non mi piace"
 
 #: ../../include/ItemObject.php:374 ../../include/conversation.php:739
-#: ../../include/conversation.php:1214 ../../mod/photos.php:1026
-#: ../../mod/editblock.php:150 ../../mod/editpost.php:130
+#: ../../include/conversation.php:1218 ../../mod/photos.php:1029
+#: ../../mod/editblock.php:150 ../../mod/editpost.php:129
 #: ../../mod/editlayout.php:148 ../../mod/editwebpage.php:190
 msgid "Please wait"
 msgstr "Attendere"
 
-#: ../../include/ItemObject.php:679 ../../mod/photos.php:1042
-#: ../../mod/photos.php:1160
+#: ../../include/ItemObject.php:679 ../../mod/photos.php:1045
+#: ../../mod/photos.php:1163
 msgid "This is you"
 msgstr "Questo sei tu"
 
-#: ../../include/ItemObject.php:683 ../../include/conversation.php:1186
-#: ../../mod/editblock.php:136 ../../mod/editpost.php:114
+#: ../../include/ItemObject.php:683 ../../include/conversation.php:1190
+#: ../../mod/editblock.php:136 ../../mod/editpost.php:113
 #: ../../mod/editlayout.php:135 ../../mod/editwebpage.php:177
 msgid "Bold"
 msgstr "Grassetto"
 
-#: ../../include/ItemObject.php:684 ../../include/conversation.php:1187
-#: ../../mod/editblock.php:137 ../../mod/editpost.php:115
+#: ../../include/ItemObject.php:684 ../../include/conversation.php:1191
+#: ../../mod/editblock.php:137 ../../mod/editpost.php:114
 #: ../../mod/editlayout.php:136 ../../mod/editwebpage.php:178
 msgid "Italic"
 msgstr "Corsivo"
 
-#: ../../include/ItemObject.php:685 ../../include/conversation.php:1188
-#: ../../mod/editblock.php:138 ../../mod/editpost.php:116
+#: ../../include/ItemObject.php:685 ../../include/conversation.php:1192
+#: ../../mod/editblock.php:138 ../../mod/editpost.php:115
 #: ../../mod/editlayout.php:137 ../../mod/editwebpage.php:179
 msgid "Underline"
 msgstr "Sottolineato"
 
-#: ../../include/ItemObject.php:686 ../../include/conversation.php:1189
-#: ../../mod/editblock.php:139 ../../mod/editpost.php:117
+#: ../../include/ItemObject.php:686 ../../include/conversation.php:1193
+#: ../../mod/editblock.php:139 ../../mod/editpost.php:116
 #: ../../mod/editlayout.php:138 ../../mod/editwebpage.php:180
 msgid "Quote"
 msgstr "Citazione"
 
-#: ../../include/ItemObject.php:687 ../../include/conversation.php:1190
-#: ../../mod/editblock.php:140 ../../mod/editpost.php:118
+#: ../../include/ItemObject.php:687 ../../include/conversation.php:1194
+#: ../../mod/editblock.php:140 ../../mod/editpost.php:117
 #: ../../mod/editlayout.php:139 ../../mod/editwebpage.php:181
 msgid "Code"
 msgstr "Codice"
@@ -2261,8 +2322,8 @@ msgstr "Collegamento"
 msgid "Video"
 msgstr "Video"
 
-#: ../../include/ItemObject.php:694 ../../include/conversation.php:1241
-#: ../../mod/mail.php:247 ../../mod/mail.php:376 ../../mod/editpost.php:158
+#: ../../include/ItemObject.php:694 ../../include/conversation.php:1248
+#: ../../mod/mail.php:247 ../../mod/mail.php:376 ../../mod/editpost.php:157
 msgid "Encrypt text"
 msgstr "Cifratura del messaggio"
 
@@ -2312,228 +2373,228 @@ msgstr "Elenco contatti"
 msgid "Save"
 msgstr "Salva"
 
-#: ../../include/text.php:933
+#: ../../include/text.php:942
 msgid "poke"
 msgstr "poke"
 
-#: ../../include/text.php:933 ../../include/conversation.php:243
+#: ../../include/text.php:942 ../../include/conversation.php:243
 msgid "poked"
 msgstr "ha ricevuto un poke"
 
-#: ../../include/text.php:934
+#: ../../include/text.php:943
 msgid "ping"
 msgstr "ping"
 
-#: ../../include/text.php:934
+#: ../../include/text.php:943
 msgid "pinged"
 msgstr "ha ricevuto un ping"
 
-#: ../../include/text.php:935
+#: ../../include/text.php:944
 msgid "prod"
 msgstr "spintone"
 
-#: ../../include/text.php:935
+#: ../../include/text.php:944
 msgid "prodded"
 msgstr "ha ricevuto uno spintone"
 
-#: ../../include/text.php:936
+#: ../../include/text.php:945
 msgid "slap"
 msgstr "schiaffo"
 
-#: ../../include/text.php:936
+#: ../../include/text.php:945
 msgid "slapped"
 msgstr "ha ricevuto uno schiaffo"
 
-#: ../../include/text.php:937
+#: ../../include/text.php:946
 msgid "finger"
 msgstr "finger"
 
-#: ../../include/text.php:937
+#: ../../include/text.php:946
 msgid "fingered"
 msgstr "ha ricevuto un finger"
 
-#: ../../include/text.php:938
+#: ../../include/text.php:947
 msgid "rebuff"
 msgstr "rifiuto"
 
-#: ../../include/text.php:938
+#: ../../include/text.php:947
 msgid "rebuffed"
 msgstr "ha ricevuto un rifiuto"
 
-#: ../../include/text.php:948
+#: ../../include/text.php:957
 msgid "happy"
 msgstr "felice"
 
-#: ../../include/text.php:949
+#: ../../include/text.php:958
 msgid "sad"
 msgstr "triste"
 
-#: ../../include/text.php:950
+#: ../../include/text.php:959
 msgid "mellow"
 msgstr "calmo"
 
-#: ../../include/text.php:951
+#: ../../include/text.php:960
 msgid "tired"
 msgstr "stanco"
 
-#: ../../include/text.php:952
+#: ../../include/text.php:961
 msgid "perky"
 msgstr "vivace"
 
-#: ../../include/text.php:953
+#: ../../include/text.php:962
 msgid "angry"
 msgstr "arrabbiato"
 
-#: ../../include/text.php:954
+#: ../../include/text.php:963
 msgid "stupified"
 msgstr "stordito"
 
-#: ../../include/text.php:955
+#: ../../include/text.php:964
 msgid "puzzled"
 msgstr "confuso"
 
-#: ../../include/text.php:956
+#: ../../include/text.php:965
 msgid "interested"
 msgstr "attento"
 
-#: ../../include/text.php:957
+#: ../../include/text.php:966
 msgid "bitter"
 msgstr "amaro"
 
-#: ../../include/text.php:958
+#: ../../include/text.php:967
 msgid "cheerful"
 msgstr "allegro"
 
-#: ../../include/text.php:959
+#: ../../include/text.php:968
 msgid "alive"
 msgstr "vivace"
 
-#: ../../include/text.php:960
+#: ../../include/text.php:969
 msgid "annoyed"
 msgstr "seccato"
 
-#: ../../include/text.php:961
+#: ../../include/text.php:970
 msgid "anxious"
 msgstr "ansioso"
 
-#: ../../include/text.php:962
+#: ../../include/text.php:971
 msgid "cranky"
 msgstr "irritabile"
 
-#: ../../include/text.php:963
+#: ../../include/text.php:972
 msgid "disturbed"
 msgstr "turbato"
 
-#: ../../include/text.php:964
+#: ../../include/text.php:973
 msgid "frustrated"
 msgstr "frustrato"
 
-#: ../../include/text.php:965
+#: ../../include/text.php:974
 msgid "depressed"
 msgstr "in depressione"
 
-#: ../../include/text.php:966
+#: ../../include/text.php:975
 msgid "motivated"
 msgstr "motivato"
 
-#: ../../include/text.php:967
+#: ../../include/text.php:976
 msgid "relaxed"
 msgstr "rilassato"
 
-#: ../../include/text.php:968
+#: ../../include/text.php:977
 msgid "surprised"
 msgstr "sorpreso"
 
-#: ../../include/text.php:1144
+#: ../../include/text.php:1153
 msgid "May"
 msgstr "maggio"
 
-#: ../../include/text.php:1221 ../../include/text.php:1225
+#: ../../include/text.php:1230 ../../include/text.php:1234
 msgid "Unknown Attachment"
 msgstr "Allegato non riconoscuto"
 
-#: ../../include/text.php:1227
+#: ../../include/text.php:1236
 msgid "Attachment"
 msgstr "Allegato"
 
-#: ../../include/text.php:1227
+#: ../../include/text.php:1236
 msgid "Size Unknown"
 msgstr "Dimensioni non note"
 
-#: ../../include/text.php:1263
+#: ../../include/text.php:1272
 msgid "remove category"
 msgstr "rimuovi la categoria"
 
-#: ../../include/text.php:1340
+#: ../../include/text.php:1349
 msgid "remove from file"
 msgstr "rimuovi dal file"
 
-#: ../../include/text.php:1441 ../../include/text.php:1452
+#: ../../include/text.php:1461 ../../include/text.php:1472
 msgid "Click to open/close"
 msgstr "Clicca per aprire/chiudere"
 
-#: ../../include/text.php:1620 ../../mod/events.php:497
+#: ../../include/text.php:1640 ../../mod/events.php:497
 msgid "Link to Source"
 msgstr "Link al sito d'origine"
 
-#: ../../include/text.php:1641 ../../include/text.php:1712
+#: ../../include/text.php:1661 ../../include/text.php:1732
 msgid "default"
 msgstr "predefinito"
 
-#: ../../include/text.php:1649
+#: ../../include/text.php:1669
 msgid "Page layout"
 msgstr "Layout della pagina"
 
-#: ../../include/text.php:1649
+#: ../../include/text.php:1669
 msgid "You can create your own with the layouts tool"
 msgstr "Con la configurazione del layout puoi crearne uno tuo"
 
-#: ../../include/text.php:1690
+#: ../../include/text.php:1710
 msgid "Page content type"
 msgstr "Tipo di contenuto della pagina"
 
-#: ../../include/text.php:1724
+#: ../../include/text.php:1744
 msgid "Select an alternate language"
 msgstr "Seleziona una lingua diversa"
 
-#: ../../include/text.php:1843 ../../include/conversation.php:120
+#: ../../include/text.php:1863 ../../include/conversation.php:120
 #: ../../mod/like.php:361 ../../mod/tagger.php:43 ../../mod/subthread.php:72
 #: ../../mod/subthread.php:172
 msgid "photo"
 msgstr "la foto"
 
-#: ../../include/text.php:1849 ../../include/conversation.php:148
+#: ../../include/text.php:1869 ../../include/conversation.php:148
 #: ../../mod/like.php:361 ../../mod/subthread.php:72
 #: ../../mod/subthread.php:172
 msgid "status"
 msgstr "il messaggio di stato"
 
-#: ../../include/text.php:1851 ../../include/conversation.php:150
+#: ../../include/text.php:1871 ../../include/conversation.php:150
 #: ../../mod/tagger.php:53
 msgid "comment"
 msgstr "il commento"
 
-#: ../../include/text.php:1856
+#: ../../include/text.php:1876
 msgid "activity"
 msgstr "l'attività"
 
-#: ../../include/text.php:2151
+#: ../../include/text.php:2171
 msgid "Design Tools"
 msgstr "Strumenti di design"
 
-#: ../../include/text.php:2154 ../../mod/blocks.php:147
+#: ../../include/text.php:2174 ../../mod/blocks.php:147
 msgid "Blocks"
 msgstr "Riquadri"
 
-#: ../../include/text.php:2155 ../../mod/menu.php:103
+#: ../../include/text.php:2175 ../../mod/menu.php:103
 msgid "Menus"
 msgstr "Menù"
 
-#: ../../include/text.php:2156 ../../mod/layouts.php:174
+#: ../../include/text.php:2176 ../../mod/layouts.php:174
 msgid "Layouts"
 msgstr "Layout"
 
-#: ../../include/text.php:2157
+#: ../../include/text.php:2177
 msgid "Pages"
 msgstr "Pagine"
 
@@ -3091,6 +3152,14 @@ msgstr "Scuola:"
 msgid "Like this thing"
 msgstr "Mi piace"
 
+#: ../../include/bb2diaspora.php:382
+msgid "Attachments:"
+msgstr "Allegati:"
+
+#: ../../include/bb2diaspora.php:470
+msgid "$Projectname event notification:"
+msgstr "Notifica evento $Projectname:"
+
 #: ../../include/taxonomy.php:229 ../../include/taxonomy.php:250
 msgid "Tags"
 msgstr "Tag"
@@ -3123,68 +3192,6 @@ msgstr "gli piace"
 msgid "dislikes"
 msgstr "non gli piace"
 
-#: ../../include/attach.php:243 ../../include/attach.php:329
-msgid "Item was not found."
-msgstr "Elemento non trovato."
-
-#: ../../include/attach.php:493
-msgid "No source file."
-msgstr "Nessun file di origine."
-
-#: ../../include/attach.php:511
-msgid "Cannot locate file to replace"
-msgstr "Il file da sostituire non è stato trovato"
-
-#: ../../include/attach.php:529
-msgid "Cannot locate file to revise/update"
-msgstr "Il file da aggiornare non è stato trovato"
-
-#: ../../include/attach.php:664
-#, php-format
-msgid "File exceeds size limit of %d"
-msgstr "Il file supera la dimensione massima di %d"
-
-#: ../../include/attach.php:678
-#, php-format
-msgid "You have reached your limit of %1$.0f Mbytes attachment storage."
-msgstr "Hai raggiunto il limite complessivo di %1$.0f Mbytes per gli allegati."
-
-#: ../../include/attach.php:828
-msgid "File upload failed. Possible system limit or action terminated."
-msgstr "Caricamento file fallito, potrebbe essere stato interrotto o potrebbe aver superato lo spazio assegnato."
-
-#: ../../include/attach.php:841
-msgid "Stored file could not be verified. Upload failed."
-msgstr "Il file non può essere verificato. Caricamento fallito."
-
-#: ../../include/attach.php:889 ../../include/attach.php:905
-msgid "Path not available."
-msgstr "Percorso non disponibile."
-
-#: ../../include/attach.php:951 ../../include/attach.php:1103
-msgid "Empty pathname"
-msgstr "Il percorso del file è vuoto"
-
-#: ../../include/attach.php:977
-msgid "duplicate filename or path"
-msgstr "il file o il percorso del file è duplicato"
-
-#: ../../include/attach.php:999
-msgid "Path not found."
-msgstr "Percorso del file non trovato."
-
-#: ../../include/attach.php:1057
-msgid "mkdir failed."
-msgstr "mkdir fallito."
-
-#: ../../include/attach.php:1061
-msgid "database storage failed."
-msgstr "scrittura su database fallita."
-
-#: ../../include/attach.php:1109
-msgid "Empty path"
-msgstr "La posizione è vuota"
-
 #: ../../include/conversation.php:126 ../../mod/like.php:113
 msgid "channel"
 msgstr "il canale"
@@ -3215,42 +3222,42 @@ msgctxt "mood"
 msgid "%1$s is %2$s"
 msgstr "%1$s è %2$s"
 
-#: ../../include/conversation.php:574 ../../mod/photos.php:1060
+#: ../../include/conversation.php:574 ../../mod/photos.php:1063
 msgctxt "title"
 msgid "Likes"
 msgstr "Mi piace"
 
-#: ../../include/conversation.php:574 ../../mod/photos.php:1060
+#: ../../include/conversation.php:574 ../../mod/photos.php:1063
 msgctxt "title"
 msgid "Dislikes"
 msgstr "Non mi piace"
 
-#: ../../include/conversation.php:575 ../../mod/photos.php:1061
+#: ../../include/conversation.php:575 ../../mod/photos.php:1064
 msgctxt "title"
 msgid "Agree"
 msgstr "D'accordo"
 
-#: ../../include/conversation.php:575 ../../mod/photos.php:1061
+#: ../../include/conversation.php:575 ../../mod/photos.php:1064
 msgctxt "title"
 msgid "Disagree"
 msgstr "Non d'accordo"
 
-#: ../../include/conversation.php:575 ../../mod/photos.php:1061
+#: ../../include/conversation.php:575 ../../mod/photos.php:1064
 msgctxt "title"
 msgid "Abstain"
 msgstr "Astenuti"
 
-#: ../../include/conversation.php:576 ../../mod/photos.php:1062
+#: ../../include/conversation.php:576 ../../mod/photos.php:1065
 msgctxt "title"
 msgid "Attending"
 msgstr "Partecipano"
 
-#: ../../include/conversation.php:576 ../../mod/photos.php:1062
+#: ../../include/conversation.php:576 ../../mod/photos.php:1065
 msgctxt "title"
 msgid "Not attending"
 msgstr "Non partecipano"
 
-#: ../../include/conversation.php:576 ../../mod/photos.php:1062
+#: ../../include/conversation.php:576 ../../mod/photos.php:1065
 msgctxt "title"
 msgid "Might attend"
 msgstr "Forse partecipano"
@@ -3396,269 +3403,273 @@ msgstr "Dove sei ora?"
 msgid "Expires YYYY-MM-DD HH:MM"
 msgstr "Scade il YYYY-MM-DD HH:MM"
 
-#: ../../include/conversation.php:1179 ../../mod/photos.php:1025
-#: ../../mod/layouts.php:184 ../../mod/webpages.php:182
+#: ../../include/conversation.php:1183 ../../mod/layouts.php:184
+#: ../../mod/photos.php:1028 ../../mod/webpages.php:182
 #: ../../mod/blocks.php:154
 msgid "Share"
 msgstr "Condividi"
 
-#: ../../include/conversation.php:1181
+#: ../../include/conversation.php:1185
 msgid "Page link name"
 msgstr "Nome del link alla pagina"
 
-#: ../../include/conversation.php:1184
+#: ../../include/conversation.php:1188
 msgid "Post as"
 msgstr "Pubblica come "
 
-#: ../../include/conversation.php:1191 ../../mod/editblock.php:142
-#: ../../mod/editpost.php:119 ../../mod/editlayout.php:140
+#: ../../include/conversation.php:1195 ../../mod/editblock.php:142
+#: ../../mod/editpost.php:118 ../../mod/editlayout.php:140
 #: ../../mod/editwebpage.php:182
 msgid "Upload photo"
 msgstr "Carica foto"
 
-#: ../../include/conversation.php:1192
+#: ../../include/conversation.php:1196
 msgid "upload photo"
 msgstr "carica foto"
 
-#: ../../include/conversation.php:1193 ../../mod/mail.php:240
+#: ../../include/conversation.php:1197 ../../mod/mail.php:240
 #: ../../mod/mail.php:369 ../../mod/editblock.php:143
-#: ../../mod/editpost.php:120 ../../mod/editlayout.php:141
+#: ../../mod/editpost.php:119 ../../mod/editlayout.php:141
 #: ../../mod/editwebpage.php:183
 msgid "Attach file"
 msgstr "Allega file"
 
-#: ../../include/conversation.php:1194
+#: ../../include/conversation.php:1198
 msgid "attach file"
 msgstr "allega file"
 
-#: ../../include/conversation.php:1195 ../../mod/mail.php:241
+#: ../../include/conversation.php:1199 ../../mod/mail.php:241
 #: ../../mod/mail.php:370 ../../mod/editblock.php:144
-#: ../../mod/editpost.php:121 ../../mod/editlayout.php:142
+#: ../../mod/editpost.php:120 ../../mod/editlayout.php:142
 #: ../../mod/editwebpage.php:184
 msgid "Insert web link"
 msgstr "Inserisci un indirizzo web"
 
-#: ../../include/conversation.php:1196
+#: ../../include/conversation.php:1200
 msgid "web link"
 msgstr "link web"
 
-#: ../../include/conversation.php:1197
+#: ../../include/conversation.php:1201
 msgid "Insert video link"
 msgstr "Inserisci l'indirizzo del video"
 
-#: ../../include/conversation.php:1198
+#: ../../include/conversation.php:1202
 msgid "video link"
 msgstr "link video"
 
-#: ../../include/conversation.php:1199
+#: ../../include/conversation.php:1203
 msgid "Insert audio link"
 msgstr "Inserisci l'indirizzo dell'audio"
 
-#: ../../include/conversation.php:1200
+#: ../../include/conversation.php:1204
 msgid "audio link"
 msgstr "link audio"
 
-#: ../../include/conversation.php:1201 ../../mod/editblock.php:148
-#: ../../mod/editpost.php:125 ../../mod/editlayout.php:146
+#: ../../include/conversation.php:1205 ../../mod/editblock.php:148
+#: ../../mod/editpost.php:124 ../../mod/editlayout.php:146
 #: ../../mod/editwebpage.php:188
 msgid "Set your location"
 msgstr "La tua località"
 
-#: ../../include/conversation.php:1202
+#: ../../include/conversation.php:1206
 msgid "set location"
 msgstr "la tua località"
 
-#: ../../include/conversation.php:1203 ../../mod/editpost.php:127
+#: ../../include/conversation.php:1207 ../../mod/editpost.php:126
 msgid "Toggle voting"
 msgstr "Abilita/disabilita il voto"
 
-#: ../../include/conversation.php:1206 ../../mod/editblock.php:149
-#: ../../mod/editpost.php:126 ../../mod/editlayout.php:147
+#: ../../include/conversation.php:1210 ../../mod/editblock.php:149
+#: ../../mod/editpost.php:125 ../../mod/editlayout.php:147
 #: ../../mod/editwebpage.php:189
 msgid "Clear browser location"
 msgstr "Rimuovi la località data dal browser"
 
-#: ../../include/conversation.php:1207
+#: ../../include/conversation.php:1211
 msgid "clear location"
 msgstr "rimuovi la località"
 
-#: ../../include/conversation.php:1209 ../../mod/editblock.php:162
-#: ../../mod/editpost.php:142 ../../mod/editwebpage.php:205
+#: ../../include/conversation.php:1213 ../../mod/editblock.php:162
+#: ../../mod/editpost.php:141 ../../mod/editwebpage.php:205
 msgid "Title (optional)"
-msgstr "Titolo (opzionale)"
+msgstr "Titolo (facoltativo)"
 
-#: ../../include/conversation.php:1213 ../../mod/editblock.php:165
-#: ../../mod/editpost.php:144 ../../mod/editlayout.php:163
+#: ../../include/conversation.php:1217 ../../mod/editblock.php:165
+#: ../../mod/editpost.php:143 ../../mod/editlayout.php:163
 #: ../../mod/editwebpage.php:207
 msgid "Categories (optional, comma-separated list)"
-msgstr "Categorie (lista separata da virgole)"
+msgstr "Categorie (facoltative, lista separata da virgole)"
 
-#: ../../include/conversation.php:1215 ../../mod/editblock.php:151
-#: ../../mod/editpost.php:131 ../../mod/editlayout.php:149
+#: ../../include/conversation.php:1219 ../../mod/editblock.php:151
+#: ../../mod/editpost.php:130 ../../mod/editlayout.php:149
 #: ../../mod/editwebpage.php:191
 msgid "Permission settings"
 msgstr "Permessi dei tuoi contatti"
 
-#: ../../include/conversation.php:1216
+#: ../../include/conversation.php:1220
 msgid "permissions"
 msgstr "permessi"
 
-#: ../../include/conversation.php:1224 ../../mod/editblock.php:159
-#: ../../mod/editpost.php:139 ../../mod/editlayout.php:156
+#: ../../include/conversation.php:1228 ../../mod/editblock.php:159
+#: ../../mod/editpost.php:138 ../../mod/editlayout.php:156
 #: ../../mod/editwebpage.php:200
 msgid "Public post"
 msgstr "Post pubblico"
 
-#: ../../include/conversation.php:1226 ../../mod/editblock.php:166
-#: ../../mod/editpost.php:145 ../../mod/editlayout.php:164
+#: ../../include/conversation.php:1230 ../../mod/editblock.php:166
+#: ../../mod/editpost.php:144 ../../mod/editlayout.php:164
 #: ../../mod/editwebpage.php:208
 msgid "Example: bob@example.com, mary@example.com"
 msgstr "Per esempio: mario@esempio.com, simona@esempio.com"
 
-#: ../../include/conversation.php:1239 ../../mod/mail.php:245
+#: ../../include/conversation.php:1243 ../../mod/mail.php:245
 #: ../../mod/mail.php:374 ../../mod/editblock.php:176
-#: ../../mod/editpost.php:156 ../../mod/editlayout.php:173
+#: ../../mod/editpost.php:155 ../../mod/editlayout.php:173
 #: ../../mod/editwebpage.php:217
 msgid "Set expiration date"
 msgstr "Data di scadenza"
 
-#: ../../include/conversation.php:1243 ../../mod/editpost.php:160
+#: ../../include/conversation.php:1246
+msgid "Set publish date"
+msgstr "Data di uscita programmata"
+
+#: ../../include/conversation.php:1250 ../../mod/editpost.php:159
 #: ../../mod/events.php:691
 msgid "OK"
 msgstr "OK"
 
-#: ../../include/conversation.php:1244 ../../mod/fbrowser.php:82
-#: ../../mod/fbrowser.php:117 ../../mod/editpost.php:161
+#: ../../include/conversation.php:1251 ../../mod/fbrowser.php:82
+#: ../../mod/fbrowser.php:117 ../../mod/editpost.php:160
 #: ../../mod/events.php:690 ../../mod/tagrm.php:11 ../../mod/tagrm.php:134
 #: ../../mod/settings.php:584 ../../mod/settings.php:610
 msgid "Cancel"
 msgstr "Annulla"
 
-#: ../../include/conversation.php:1487
+#: ../../include/conversation.php:1494
 msgid "Discover"
 msgstr "Scopri"
 
-#: ../../include/conversation.php:1490
+#: ../../include/conversation.php:1497
 msgid "Imported public streams"
 msgstr "Contenuti pubblici importati"
 
-#: ../../include/conversation.php:1495
+#: ../../include/conversation.php:1502
 msgid "Commented Order"
 msgstr "Ultimi commenti"
 
-#: ../../include/conversation.php:1498
+#: ../../include/conversation.php:1505
 msgid "Sort by Comment Date"
 msgstr "Per data del commento"
 
-#: ../../include/conversation.php:1502
+#: ../../include/conversation.php:1509
 msgid "Posted Order"
 msgstr "Ultimi post"
 
-#: ../../include/conversation.php:1505
+#: ../../include/conversation.php:1512
 msgid "Sort by Post Date"
 msgstr "Per data di creazione"
 
-#: ../../include/conversation.php:1510 ../../include/widgets.php:94
+#: ../../include/conversation.php:1517 ../../include/widgets.php:94
 msgid "Personal"
 msgstr "Personali"
 
-#: ../../include/conversation.php:1513
+#: ../../include/conversation.php:1520
 msgid "Posts that mention or involve you"
 msgstr "Post che ti riguardano"
 
-#: ../../include/conversation.php:1519 ../../mod/menu.php:112
+#: ../../include/conversation.php:1526 ../../mod/menu.php:112
 #: ../../mod/connections.php:72 ../../mod/connections.php:82
 msgid "New"
 msgstr "Novità"
 
-#: ../../include/conversation.php:1522
+#: ../../include/conversation.php:1529
 msgid "Activity Stream - by date"
 msgstr "Elenco attività - per data"
 
-#: ../../include/conversation.php:1528
+#: ../../include/conversation.php:1535
 msgid "Starred"
 msgstr "Preferiti"
 
-#: ../../include/conversation.php:1531
+#: ../../include/conversation.php:1538
 msgid "Favourite Posts"
 msgstr "Post preferiti"
 
-#: ../../include/conversation.php:1538
+#: ../../include/conversation.php:1545
 msgid "Spam"
 msgstr "Spam"
 
-#: ../../include/conversation.php:1541
+#: ../../include/conversation.php:1548
 msgid "Posts flagged as SPAM"
 msgstr "Post marcati come spam"
 
-#: ../../include/conversation.php:1585 ../../mod/admin.php:947
+#: ../../include/conversation.php:1592 ../../mod/admin.php:947
 msgid "Channel"
 msgstr "Canale"
 
-#: ../../include/conversation.php:1588
+#: ../../include/conversation.php:1595
 msgid "Status Messages and Posts"
 msgstr "Post e messaggi di stato"
 
-#: ../../include/conversation.php:1597
+#: ../../include/conversation.php:1604
 msgid "About"
 msgstr "Informazioni"
 
-#: ../../include/conversation.php:1600
+#: ../../include/conversation.php:1607
 msgid "Profile Details"
 msgstr "Dettagli del profilo"
 
-#: ../../include/conversation.php:1616
+#: ../../include/conversation.php:1623
 msgid "Files and Storage"
 msgstr "Archivio file"
 
-#: ../../include/conversation.php:1626 ../../include/conversation.php:1629
+#: ../../include/conversation.php:1633 ../../include/conversation.php:1636
 msgid "Chatrooms"
 msgstr "Chat"
 
-#: ../../include/conversation.php:1642
+#: ../../include/conversation.php:1649
 msgid "Saved Bookmarks"
 msgstr "Segnalibri salvati"
 
-#: ../../include/conversation.php:1652
+#: ../../include/conversation.php:1659
 msgid "Manage Webpages"
 msgstr "Gestisci le pagine web"
 
-#: ../../include/conversation.php:1711
+#: ../../include/conversation.php:1718
 msgctxt "noun"
 msgid "Attending"
 msgid_plural "Attending"
 msgstr[0] "Partecipa"
 msgstr[1] "Partecipano"
 
-#: ../../include/conversation.php:1714
+#: ../../include/conversation.php:1721
 msgctxt "noun"
 msgid "Not Attending"
 msgid_plural "Not Attending"
 msgstr[0] "Non partecipa"
 msgstr[1] "Non partecipano"
 
-#: ../../include/conversation.php:1717
+#: ../../include/conversation.php:1724
 msgctxt "noun"
 msgid "Undecided"
 msgid_plural "Undecided"
 msgstr[0] "Indeciso"
 msgstr[1] "Indecisi"
 
-#: ../../include/conversation.php:1720
+#: ../../include/conversation.php:1727
 msgctxt "noun"
 msgid "Agree"
 msgid_plural "Agrees"
 msgstr[0] "D'accordo"
 msgstr[1] "D'accordo"
 
-#: ../../include/conversation.php:1723
+#: ../../include/conversation.php:1730
 msgctxt "noun"
 msgid "Disagree"
 msgid_plural "Disagrees"
 msgstr[0] "Non d'accordo"
 msgstr[1] "Non d'accordo"
 
-#: ../../include/conversation.php:1726
+#: ../../include/conversation.php:1733
 msgctxt "noun"
 msgid "Abstain"
 msgid_plural "Abstains"
@@ -3772,7 +3783,7 @@ msgstr "App connesse"
 msgid "Export channel"
 msgstr "Esporta il canale"
 
-#: ../../include/widgets.php:529 ../../mod/connedit.php:657
+#: ../../include/widgets.php:529 ../../mod/connedit.php:673
 msgid "Connection Default Permissions"
 msgstr "Permessi predefiniti dei nuovi contatti"
 
@@ -4120,8 +4131,8 @@ msgstr "Modalità SafeSearch"
 #: ../../include/dir_fns.php:130 ../../mod/removeme.php:60
 #: ../../mod/mitem.php:154 ../../mod/mitem.php:155 ../../mod/mitem.php:228
 #: ../../mod/mitem.php:229 ../../mod/connedit.php:630
-#: ../../mod/connedit.php:658 ../../mod/photos.php:625
-#: ../../mod/filestorage.php:151 ../../mod/filestorage.php:159
+#: ../../mod/connedit.php:674 ../../mod/filestorage.php:151
+#: ../../mod/filestorage.php:159 ../../mod/photos.php:626
 #: ../../mod/admin.php:386 ../../mod/menu.php:96 ../../mod/menu.php:153
 #: ../../mod/settings.php:574 ../../mod/api.php:106
 #: ../../view/theme/redbasic/php/config.php:104
@@ -4132,8 +4143,8 @@ msgstr "No"
 #: ../../include/dir_fns.php:128 ../../include/dir_fns.php:129
 #: ../../include/dir_fns.php:130 ../../mod/removeme.php:60
 #: ../../mod/mitem.php:154 ../../mod/mitem.php:155 ../../mod/mitem.php:228
-#: ../../mod/mitem.php:229 ../../mod/photos.php:625
-#: ../../mod/filestorage.php:151 ../../mod/filestorage.php:159
+#: ../../mod/mitem.php:229 ../../mod/filestorage.php:151
+#: ../../mod/filestorage.php:159 ../../mod/photos.php:626
 #: ../../mod/admin.php:388 ../../mod/menu.php:96 ../../mod/menu.php:153
 #: ../../mod/settings.php:574 ../../mod/api.php:105
 #: ../../view/theme/redbasic/php/config.php:104
@@ -4170,8 +4181,8 @@ msgstr "Suggerisci amici"
 msgid "Suggest a friend for %s"
 msgstr "Suggerisci un amico a %s"
 
-#: ../../mod/directory.php:59 ../../mod/display.php:13
-#: ../../mod/photos.php:489 ../../mod/search.php:13 ../../mod/ratings.php:82
+#: ../../mod/directory.php:59 ../../mod/display.php:13 ../../mod/search.php:13
+#: ../../mod/photos.php:490 ../../mod/ratings.php:82
 #: ../../mod/viewconnections.php:17
 msgid "Public access denied."
 msgstr "Accesso pubblico negato."
@@ -4856,100 +4867,109 @@ msgstr "Scegli il profilo da mostrare"
 msgid "Set Affinity & Profile"
 msgstr "Affinità e profilo"
 
-#: ../../mod/connedit.php:658
+#: ../../mod/connedit.php:669
+msgid "none"
+msgstr "--"
+
+#: ../../mod/connedit.php:674
 msgid "Apply these permissions automatically"
 msgstr "Applica automaticamente questi permessi"
 
-#: ../../mod/connedit.php:660
-msgid "This connection's address is"
-msgstr "Indirizzo di questo contatto"
+#: ../../mod/connedit.php:676
+msgid "This connection's primary address is"
+msgstr "Indirizzo primario di questo canale"
+
+#: ../../mod/connedit.php:677
+msgid "Available locations:"
+msgstr "Indirizzi disponibili"
 
-#: ../../mod/connedit.php:663
+#: ../../mod/connedit.php:681
 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."
 
-#: ../../mod/connedit.php:665
+#: ../../mod/connedit.php:683
 msgid "Slide to adjust your degree of friendship"
 msgstr "Trascina per restringere il grado di amicizia da mostrare"
 
-#: ../../mod/connedit.php:667
+#: ../../mod/connedit.php:685
 msgid "Slide to adjust your rating"
 msgstr "Trascina per cambiare la tua valutazione"
 
-#: ../../mod/connedit.php:668 ../../mod/connedit.php:673
+#: ../../mod/connedit.php:686 ../../mod/connedit.php:691
 msgid "Optionally explain your rating"
-msgstr "Commento opzionale"
+msgstr "Commento facoltativo"
 
-#: ../../mod/connedit.php:670
+#: ../../mod/connedit.php:688
 msgid "Custom Filter"
 msgstr "Filtro personalizzato"
 
-#: ../../mod/connedit.php:671
+#: ../../mod/connedit.php:689
 msgid "Only import posts with this text"
 msgstr "Importa solo i post che contengono queste parole chiave"
 
-#: ../../mod/connedit.php:671 ../../mod/connedit.php:672
+#: ../../mod/connedit.php:689 ../../mod/connedit.php:690
 msgid ""
-"words one per line or #tags or /patterns/, leave blank to import all posts"
-msgstr "una parola per riga, oppure #tag o /pattern/ oppure lascia vuoto per importare tutto"
+"words one per line or #tags or /patterns/ or lang=xx, leave blank to import "
+"all posts"
+msgstr "per ogni riga: parole, #tag, /pattern/ o lang=xx , lascia vuoto per importare tutto"
 
-#: ../../mod/connedit.php:672
+#: ../../mod/connedit.php:690
 msgid "Do not import posts with this text"
 msgstr "Non importare i post con queste parole chiave"
 
-#: ../../mod/connedit.php:674
+#: ../../mod/connedit.php:692
 msgid "This information is public!"
 msgstr "Questa informazione è pubblica!"
 
-#: ../../mod/connedit.php:679
+#: ../../mod/connedit.php:697
 msgid "Connection Pending Approval"
 msgstr "Contatti in attesa di approvazione"
 
-#: ../../mod/connedit.php:680
+#: ../../mod/connedit.php:698
 msgid "Connection Request"
 msgstr "Richiesta di entrare in contatto"
 
-#: ../../mod/connedit.php:681
+#: ../../mod/connedit.php:699
 #, php-format
 msgid ""
 "(%s) would like to connect with you. Please approve this connection to allow"
 " communication."
 msgstr "(%s) vorrebbe entrare in contatto con te. Per permettere la comunicazione è necessario che tu approvi."
 
-#: ../../mod/connedit.php:682 ../../mod/admin.php:781
+#: ../../mod/connedit.php:700 ../../mod/admin.php:781
 msgid "Approve"
 msgstr "Approva"
 
-#: ../../mod/connedit.php:683
+#: ../../mod/connedit.php:701
 msgid "Approve Later"
 msgstr "Approva più tardi"
 
-#: ../../mod/connedit.php:686
+#: ../../mod/connedit.php:704
 msgid "inherited"
 msgstr "derivato"
 
-#: ../../mod/connedit.php:688
+#: ../../mod/connedit.php:706
 #, php-format
 msgid ""
 "Please choose the profile you would like to display to %s when viewing your "
 "profile securely."
 msgstr "Seleziona il profilo che vuoi mostrare a %s dopo che ha effettuato l'accesso."
 
-#: ../../mod/connedit.php:690
+#: ../../mod/connedit.php:708
 msgid "Their Settings"
 msgstr "Permessi concessi a te"
 
-#: ../../mod/connedit.php:691
+#: ../../mod/connedit.php:709
 msgid "My Settings"
 msgstr "Permessi che concedo"
 
-#: ../../mod/connedit.php:693
+#: ../../mod/connedit.php:711
 msgid "Individual Permissions"
 msgstr "Permessi individuali"
 
-#: ../../mod/connedit.php:694
+#: ../../mod/connedit.php:712
 msgid ""
 "Some permissions may be inherited from your channel's <a "
 "href=\"settings\"><strong>privacy settings</strong></a>, which have higher "
@@ -4957,7 +4977,7 @@ msgid ""
 " settings here."
 msgstr "Alcuni permessi derivano dalle <a href=\"settings\"><strong>impostazioni di privacy</strong></a> del tuo canale, che hanno priorità assoluta su qualsiasi altra impostazione scelta per i singoli contatti. Da questa pagina <strong>non</strong> puoi cambiarle."
 
-#: ../../mod/connedit.php:695
+#: ../../mod/connedit.php:713
 msgid ""
 "Some permissions may be inherited from your channel's <a "
 "href=\"settings\"><strong>privacy settings</strong></a>, which have higher "
@@ -4965,7 +4985,7 @@ msgid ""
 "they wont have any impact unless the inherited setting changes."
 msgstr "Alcuni permessi derivano dalle <a href=\"settings\"><strong>impostazioni di privacy</strong></a> del tuo canale, che hanno priorità assoluta su qualsiasi altra impostazione scelta per i singoli contatti. Le personalizzazioni che effettuerai qui potrebbero non essere effettive a meno che tu non cambi le impostazioni generali."
 
-#: ../../mod/connedit.php:696
+#: ../../mod/connedit.php:714
 msgid "Last update:"
 msgstr "Ultimo aggiornamento:"
 
@@ -4992,165 +5012,6 @@ msgid ""
 " to correctly use this feature."
 msgstr "Attenzione: alcune delle impostazioni, se cambiate, potrebbero rendere questo canale non funzionante. Lascia questa pagina a meno che tu non sappia con assoluta certezza quali modifiche effettuare."
 
-#: ../../mod/photos.php:79
-msgid "Page owner information could not be retrieved."
-msgstr "Impossibile ottenere informazioni sul proprietario della pagina."
-
-#: ../../mod/photos.php:100
-msgid "Album not found."
-msgstr "Album non trovato."
-
-#: ../../mod/photos.php:127
-msgid "Delete Album"
-msgstr "Elimina album"
-
-#: ../../mod/photos.php:171 ../../mod/photos.php:1006
-msgid "Delete Photo"
-msgstr "Elimina foto"
-
-#: ../../mod/photos.php:500
-msgid "No photos selected"
-msgstr "Nessuna foto selezionata"
-
-#: ../../mod/photos.php:549
-msgid "Access to this item is restricted."
-msgstr "Questo elemento non è visibile a tutti."
-
-#: ../../mod/photos.php:588
-#, php-format
-msgid "%1$.2f MB of %2$.2f MB photo storage used."
-msgstr "Hai usato %1$.2f Mb dei %2$.2f Mb di spazio disponibile."
-
-#: ../../mod/photos.php:591
-#, php-format
-msgid "%1$.2f MB photo storage used."
-msgstr "Hai usato %1$.2f Mb del tuo spazio disponibile."
-
-#: ../../mod/photos.php:619
-msgid "Upload Photos"
-msgstr "Carica foto"
-
-#: ../../mod/photos.php:623
-msgid "Enter an album name"
-msgstr "Scegli il nome dell'album"
-
-#: ../../mod/photos.php:624
-msgid "or select an existing album (doubleclick)"
-msgstr "o seleziona un album esistente (doppio click)"
-
-#: ../../mod/photos.php:625
-msgid "Create a status post for this upload"
-msgstr "Pubblica sulla bacheca"
-
-#: ../../mod/photos.php:652
-msgid "Album name could not be decoded"
-msgstr "Non è stato possibile leggere il nome dell'album"
-
-#: ../../mod/photos.php:696 ../../mod/photos.php:1233
-#: ../../mod/photos.php:1250
-msgid "Contact Photos"
-msgstr "Foto dei contatti"
-
-#: ../../mod/photos.php:724
-msgid "Show Newest First"
-msgstr "Prima i più recenti"
-
-#: ../../mod/photos.php:726
-msgid "Show Oldest First"
-msgstr "Prima i più vecchi"
-
-#: ../../mod/photos.php:750 ../../mod/photos.php:1283
-msgid "View Photo"
-msgstr "Guarda la foto"
-
-#: ../../mod/photos.php:779
-msgid "Edit Album"
-msgstr "Modifica album"
-
-#: ../../mod/photos.php:824
-msgid "Permission denied. Access to this item may be restricted."
-msgstr "Permesso negato. L'accesso a questo elemento può essere stato limitato."
-
-#: ../../mod/photos.php:826
-msgid "Photo not available"
-msgstr "Foto non disponibile"
-
-#: ../../mod/photos.php:884
-msgid "Use as profile photo"
-msgstr "Usa come foto del profilo"
-
-#: ../../mod/photos.php:891
-msgid "Private Photo"
-msgstr "Foto privata"
-
-#: ../../mod/photos.php:902 ../../mod/events.php:528
-msgid "Previous"
-msgstr "Precendente"
-
-#: ../../mod/photos.php:906
-msgid "View Full Size"
-msgstr "Vedi nelle dimensioni originali"
-
-#: ../../mod/photos.php:911 ../../mod/events.php:529 ../../mod/setup.php:285
-msgid "Next"
-msgstr "Successivo"
-
-#: ../../mod/photos.php:951 ../../mod/tagrm.php:133
-msgid "Remove"
-msgstr "Rimuovi"
-
-#: ../../mod/photos.php:985
-msgid "Edit photo"
-msgstr "Modifica la foto"
-
-#: ../../mod/photos.php:987
-msgid "Rotate CW (right)"
-msgstr "Ruota (senso orario)"
-
-#: ../../mod/photos.php:988
-msgid "Rotate CCW (left)"
-msgstr "Ruota (senso antiorario)"
-
-#: ../../mod/photos.php:991
-msgid "Enter a new album name"
-msgstr "Inserisci il nome del nuovo album"
-
-#: ../../mod/photos.php:992
-msgid "or select an existing one (doubleclick)"
-msgstr "o seleziona uno esistente (doppio click)"
-
-#: ../../mod/photos.php:995
-msgid "Caption"
-msgstr "Didascalia"
-
-#: ../../mod/photos.php:997
-msgid "Add a Tag"
-msgstr "Aggiungi tag"
-
-#: ../../mod/photos.php:1001
-msgid "Example: @bob, @Barbara_Jensen, @jim@example.com"
-msgstr "Esempio: @bob, @Barbara_Jensen, @jim@example.com"
-
-#: ../../mod/photos.php:1004
-msgid "Flag as adult in album view"
-msgstr "Marca come 'per adulti'"
-
-#: ../../mod/photos.php:1196
-msgid "In This Photo:"
-msgstr "In questa foto:"
-
-#: ../../mod/photos.php:1201
-msgid "Map"
-msgstr "Mappa"
-
-#: ../../mod/photos.php:1289
-msgid "View Album"
-msgstr "Guarda l'album"
-
-#: ../../mod/photos.php:1312
-msgid "Recent Photos"
-msgstr "Foto recenti"
-
 #: ../../mod/filestorage.php:82
 msgid "Permission Denied."
 msgstr "Permesso negato."
@@ -5306,19 +5167,19 @@ msgstr "Nome della chat"
 
 #: ../../mod/chat.php:210
 msgid "Expiration of chats (minutes)"
-msgstr "Scadenza dei messaggi in chat (minuti)"
+msgstr "Scadenza dei messaggi della chat (minuti)"
 
 #: ../../mod/chat.php:227
 #, php-format
 msgid "%1$s's Chatrooms"
 msgstr "Le chat di %1$s"
 
-#: ../../mod/search.php:209
+#: ../../mod/search.php:211
 #, php-format
 msgid "Items tagged with: %s"
 msgstr "Elementi taggati con: %s"
 
-#: ../../mod/search.php:211
+#: ../../mod/search.php:213
 #, php-format
 msgid "Search results for: %s"
 msgstr "Risultati ricerca: %s"
@@ -5427,6 +5288,173 @@ msgstr "Invia la risposta"
 msgid "Your message for %s (%s):"
 msgstr "Il tuo messaggio per %s (%s):"
 
+#: ../../mod/photos.php:79
+msgid "Page owner information could not be retrieved."
+msgstr "Impossibile ottenere informazioni sul proprietario della pagina."
+
+#: ../../mod/photos.php:100
+msgid "Album not found."
+msgstr "Album non trovato."
+
+#: ../../mod/photos.php:127
+msgid "Delete Album"
+msgstr "Elimina album"
+
+#: ../../mod/photos.php:171 ../../mod/photos.php:1009
+msgid "Delete Photo"
+msgstr "Elimina foto"
+
+#: ../../mod/photos.php:501
+msgid "No photos selected"
+msgstr "Nessuna foto selezionata"
+
+#: ../../mod/photos.php:550
+msgid "Access to this item is restricted."
+msgstr "Questo elemento non è visibile a tutti."
+
+#: ../../mod/photos.php:589
+#, php-format
+msgid "%1$.2f MB of %2$.2f MB photo storage used."
+msgstr "Hai usato %1$.2f Mb dei %2$.2f Mb di spazio disponibile."
+
+#: ../../mod/photos.php:592
+#, php-format
+msgid "%1$.2f MB photo storage used."
+msgstr "Hai usato %1$.2f Mb del tuo spazio disponibile."
+
+#: ../../mod/photos.php:620
+msgid "Upload Photos"
+msgstr "Carica foto"
+
+#: ../../mod/photos.php:624
+msgid "Enter an album name"
+msgstr "Scegli il nome dell'album"
+
+#: ../../mod/photos.php:625
+msgid "or select an existing album (doubleclick)"
+msgstr "o seleziona un album esistente (doppio click)"
+
+#: ../../mod/photos.php:626
+msgid "Create a status post for this upload"
+msgstr "Pubblica sulla bacheca"
+
+#: ../../mod/photos.php:627
+msgid "Caption (optional):"
+msgstr "Titolo (facoltativo):"
+
+#: ../../mod/photos.php:628
+msgid "Description (optional):"
+msgstr "Descrizione (facoltativa):"
+
+#: ../../mod/photos.php:655
+msgid "Album name could not be decoded"
+msgstr "Non è stato possibile leggere il nome dell'album"
+
+#: ../../mod/photos.php:699 ../../mod/photos.php:1236
+#: ../../mod/photos.php:1253
+msgid "Contact Photos"
+msgstr "Foto dei contatti"
+
+#: ../../mod/photos.php:727
+msgid "Show Newest First"
+msgstr "Prima i più recenti"
+
+#: ../../mod/photos.php:729
+msgid "Show Oldest First"
+msgstr "Prima i più vecchi"
+
+#: ../../mod/photos.php:753 ../../mod/photos.php:1286
+msgid "View Photo"
+msgstr "Guarda la foto"
+
+#: ../../mod/photos.php:782
+msgid "Edit Album"
+msgstr "Modifica album"
+
+#: ../../mod/photos.php:827
+msgid "Permission denied. Access to this item may be restricted."
+msgstr "Permesso negato. L'accesso a questo elemento può essere stato limitato."
+
+#: ../../mod/photos.php:829
+msgid "Photo not available"
+msgstr "Foto non disponibile"
+
+#: ../../mod/photos.php:887
+msgid "Use as profile photo"
+msgstr "Usa come foto del profilo"
+
+#: ../../mod/photos.php:894
+msgid "Private Photo"
+msgstr "Foto privata"
+
+#: ../../mod/photos.php:905 ../../mod/events.php:528
+msgid "Previous"
+msgstr "Precendente"
+
+#: ../../mod/photos.php:909
+msgid "View Full Size"
+msgstr "Vedi nelle dimensioni originali"
+
+#: ../../mod/photos.php:914 ../../mod/events.php:529 ../../mod/setup.php:285
+msgid "Next"
+msgstr "Successivo"
+
+#: ../../mod/photos.php:954 ../../mod/tagrm.php:133
+msgid "Remove"
+msgstr "Rimuovi"
+
+#: ../../mod/photos.php:988
+msgid "Edit photo"
+msgstr "Modifica la foto"
+
+#: ../../mod/photos.php:990
+msgid "Rotate CW (right)"
+msgstr "Ruota (senso orario)"
+
+#: ../../mod/photos.php:991
+msgid "Rotate CCW (left)"
+msgstr "Ruota (senso antiorario)"
+
+#: ../../mod/photos.php:994
+msgid "Enter a new album name"
+msgstr "Inserisci il nome del nuovo album"
+
+#: ../../mod/photos.php:995
+msgid "or select an existing one (doubleclick)"
+msgstr "o seleziona uno esistente (doppio click)"
+
+#: ../../mod/photos.php:998
+msgid "Caption"
+msgstr "Didascalia"
+
+#: ../../mod/photos.php:1000
+msgid "Add a Tag"
+msgstr "Aggiungi tag"
+
+#: ../../mod/photos.php:1004
+msgid "Example: @bob, @Barbara_Jensen, @jim@example.com"
+msgstr "Esempio: @bob, @Barbara_Jensen, @jim@example.com"
+
+#: ../../mod/photos.php:1007
+msgid "Flag as adult in album view"
+msgstr "Marca come 'per adulti'"
+
+#: ../../mod/photos.php:1199
+msgid "In This Photo:"
+msgstr "In questa foto:"
+
+#: ../../mod/photos.php:1204
+msgid "Map"
+msgstr "Mappa"
+
+#: ../../mod/photos.php:1292
+msgid "View Album"
+msgstr "Guarda l'album"
+
+#: ../../mod/photos.php:1315
+msgid "Recent Photos"
+msgstr "Foto recenti"
+
 #: ../../mod/dreport.php:23
 msgid "Invalid message"
 msgstr "Messaggio non valido"
@@ -5494,17 +5522,17 @@ msgstr "Elemento non trovato"
 msgid "Delete block?"
 msgstr "Vuoi eliminare questo riquadro?"
 
-#: ../../mod/editblock.php:145 ../../mod/editpost.php:122
+#: ../../mod/editblock.php:145 ../../mod/editpost.php:121
 #: ../../mod/editlayout.php:143 ../../mod/editwebpage.php:185
 msgid "Insert YouTube video"
 msgstr "Inserisci video da YouTube"
 
-#: ../../mod/editblock.php:146 ../../mod/editpost.php:123
+#: ../../mod/editblock.php:146 ../../mod/editpost.php:122
 #: ../../mod/editlayout.php:144 ../../mod/editwebpage.php:186
 msgid "Insert Vorbis [.ogg] video"
 msgstr "Inserisci video Vorbis [.ogg]"
 
-#: ../../mod/editblock.php:147 ../../mod/editpost.php:124
+#: ../../mod/editblock.php:147 ../../mod/editpost.php:123
 #: ../../mod/editlayout.php:145 ../../mod/editwebpage.php:187
 msgid "Insert Vorbis [.ogg] audio"
 msgstr "Inserisci audio Vorbis [.ogg]"
@@ -5525,7 +5553,7 @@ msgstr "L'elemento non è modificabile"
 msgid "Delete item?"
 msgstr "Eliminare questo elemento?"
 
-#: ../../mod/editpost.php:165 ../../mod/rpost.php:128
+#: ../../mod/editpost.php:164 ../../mod/rpost.php:128
 msgid "Edit post"
 msgstr "Modifica post"
 
@@ -6265,7 +6293,7 @@ msgstr "Testo di aiuto"
 
 #: ../../mod/admin.php:1410 ../../mod/admin.php:1430
 msgid "Additional info (optional)"
-msgstr "Informazioni aggiuntive (opzionali)"
+msgstr "Informazioni aggiuntive (facoltative)"
 
 #: ../../mod/admin.php:1420
 msgid "Field definition not found"
@@ -6871,20 +6899,20 @@ msgstr "Il post vuoto è stato ignorato."
 msgid "Executable content type not permitted to this channel."
 msgstr "I contenuti eseguibili non sono permessi su questo canale."
 
-#: ../../mod/item.php:906
+#: ../../mod/item.php:908
 msgid "System error. Post not saved."
 msgstr "Errore di sistema. Post non salvato."
 
-#: ../../mod/item.php:1173
+#: ../../mod/item.php:1175
 msgid "Unable to obtain post information from database."
 msgstr "Impossibile caricare il post dal database."
 
-#: ../../mod/item.php:1180
+#: ../../mod/item.php:1182
 #, php-format
 msgid "You have reached your limit of %1$.0f top level posts."
 msgstr "Hai raggiunto il limite massimo di %1$.0f post sulla pagina principale."
 
-#: ../../mod/item.php:1187
+#: ../../mod/item.php:1189
 #, php-format
 msgid "You have reached your limit of %1$.0f webpages."
 msgstr "Hai raggiunto il limite massimo di %1$.0f pagine web."
@@ -7364,7 +7392,7 @@ msgstr "Nome dell'oggetto"
 
 #: ../../mod/thing.php:306 ../../mod/thing.php:354
 msgid "URL of thing (optional)"
-msgstr "Indirizzo web dell'oggetto (opzionale)"
+msgstr "Indirizzo web dell'oggetto (facoltativo)"
 
 #: ../../mod/thing.php:308 ../../mod/thing.php:355
 msgid "URL for photo of thing (optional)"
@@ -7527,7 +7555,7 @@ msgstr "Url icona"
 
 #: ../../mod/settings.php:589
 msgid "Optional"
-msgstr "Opzionale"
+msgstr "Facoltativo"
 
 #: ../../mod/settings.php:600
 msgid "You can't edit this application."
@@ -9034,6 +9062,10 @@ msgid ""
 "Use this form to import existing posts and content from an export file."
 msgstr "Usa questa funzionalità per importare i vecchi contenuti e i post da un file esportato in precedenza."
 
+#: ../../mod/wholikesme.php:13
+msgid "Who likes me?"
+msgstr "Chi mi ha dato un \"Mi piace\"?"
+
 #: ../../view/theme/redbasic/php/config.php:82
 msgid "Focus (Hubzilla default)"
 msgstr "Focus (predefinito)"
diff --git a/view/it/hstrings.php b/view/it/hstrings.php
index 4ecbab3f1..e69c42745 100644
--- a/view/it/hstrings.php
+++ b/view/it/hstrings.php
@@ -5,12 +5,6 @@ function string_plural_select_it($n){
 	return ($n != 1);;
 }}
 ;
-$a->strings["Attachments:"] = "Allegati:";
-$a->strings["l F d, Y \\@ g:i A"] = "l d F Y \\@ G:i";
-$a->strings["\$Projectname event notification:"] = "Notifica evento \$Projectname:";
-$a->strings["Starts:"] = "Inizio:";
-$a->strings["Finishes:"] = "Fine:";
-$a->strings["Location:"] = "Luogo:";
 $a->strings["No username found in import file."] = "Impossibile trovare il nome utente nel file da importare.";
 $a->strings["Unable to create a unique channel address. Import failed."] = "Impossibile creare un indirizzo univoco per il canale. L'import è fallito.";
 $a->strings["Import completed."] = "L'importazione è terminata con successo.";
@@ -127,8 +121,10 @@ $a->strings["Channel Sources"] = "Sorgenti del canale";
 $a->strings["Automatically import channel content from other channels or feeds"] = "Importa automaticamente il contenuto del canale da altri canali o feed";
 $a->strings["Even More Encryption"] = "Cifratura addizionale";
 $a->strings["Allow optional encryption of content end-to-end with a shared secret key"] = "Rendi possibile la crifratura aggiuntiva tra mittente e destinatario usando una parola chiave conosciuta a entrambi";
-$a->strings["Enable voting tools"] = "Permetti i post con votazione";
+$a->strings["Enable Voting Tools"] = "Abilita gli strumenti per votare";
 $a->strings["Provide a class of post which others can vote on"] = "Rende possibile la creazione di post in cui sarà possibile votare";
+$a->strings["Delayed Posting"] = "Pubblicazione ritardata";
+$a->strings["Allow posts to be published at a later date"] = "Per scegliere una data e un'ora a cui far uscire i post";
 $a->strings["Network and Stream Filtering"] = "Filtraggio dei contenuti";
 $a->strings["Search by Date"] = "Ricerca per data";
 $a->strings["Ability to select posts by date ranges"] = "Per selezionare i post in un intervallo tra date";
@@ -375,6 +371,10 @@ $a->strings["Don't care"] = "Chi se ne frega";
 $a->strings["Ask me"] = "Chiedimelo";
 $a->strings["Embedded content"] = "Contenuti incorporati";
 $a->strings["Embedding disabled"] = "Disabilita la creazione di contenuti incorporati";
+$a->strings["l F d, Y \\@ g:i A"] = "l d F Y \\@ G:i";
+$a->strings["Starts:"] = "Inizio:";
+$a->strings["Finishes:"] = "Fine:";
+$a->strings["Location:"] = "Luogo:";
 $a->strings["This event has been added to your calendar."] = "Questo evento è stato aggiunto al tuo calendario";
 $a->strings["event"] = "l'evento";
 $a->strings["Not specified"] = "Non specificato";
@@ -412,6 +412,21 @@ $a->strings["Profile Photo"] = "Foto del profilo";
 $a->strings["Update"] = "Aggiorna";
 $a->strings["Install"] = "Installa";
 $a->strings["Purchase"] = "Acquista";
+$a->strings["Item was not found."] = "Elemento non trovato.";
+$a->strings["No source file."] = "Nessun file di origine.";
+$a->strings["Cannot locate file to replace"] = "Il file da sostituire non è stato trovato";
+$a->strings["Cannot locate file to revise/update"] = "Il file da aggiornare non è stato trovato";
+$a->strings["File exceeds size limit of %d"] = "Il file supera la dimensione massima di %d";
+$a->strings["You have reached your limit of %1$.0f Mbytes attachment storage."] = "Hai raggiunto il limite complessivo di %1$.0f Mbytes per gli allegati.";
+$a->strings["File upload failed. Possible system limit or action terminated."] = "Caricamento file fallito, potrebbe essere stato interrotto o potrebbe aver superato lo spazio assegnato.";
+$a->strings["Stored file could not be verified. Upload failed."] = "Il file non può essere verificato. Caricamento fallito.";
+$a->strings["Path not available."] = "Percorso non disponibile.";
+$a->strings["Empty pathname"] = "Il percorso del file è vuoto";
+$a->strings["duplicate filename or path"] = "il file o il percorso del file è duplicato";
+$a->strings["Path not found."] = "Percorso del file non trovato.";
+$a->strings["mkdir failed."] = "mkdir fallito.";
+$a->strings["database storage failed."] = "scrittura su database fallita.";
+$a->strings["Empty path"] = "La posizione è vuota";
 $a->strings["Logged out."] = "Uscita effettuata.";
 $a->strings["Failed authentication"] = "Autenticazione fallita";
 $a->strings["Login failed."] = "Accesso fallito.";
@@ -713,6 +728,8 @@ $a->strings["Love/Romance:"] = "Amore:";
 $a->strings["Work/employment:"] = "Lavoro:";
 $a->strings["School/education:"] = "Scuola:";
 $a->strings["Like this thing"] = "Mi piace";
+$a->strings["Attachments:"] = "Allegati:";
+$a->strings["\$Projectname event notification:"] = "Notifica evento \$Projectname:";
 $a->strings["Tags"] = "Tag";
 $a->strings["Keywords"] = "Parole chiave";
 $a->strings["have"] = "ho";
@@ -721,21 +738,6 @@ $a->strings["want"] = "voglio";
 $a->strings["wants"] = "vuole";
 $a->strings["likes"] = "gli piace";
 $a->strings["dislikes"] = "non gli piace";
-$a->strings["Item was not found."] = "Elemento non trovato.";
-$a->strings["No source file."] = "Nessun file di origine.";
-$a->strings["Cannot locate file to replace"] = "Il file da sostituire non è stato trovato";
-$a->strings["Cannot locate file to revise/update"] = "Il file da aggiornare non è stato trovato";
-$a->strings["File exceeds size limit of %d"] = "Il file supera la dimensione massima di %d";
-$a->strings["You have reached your limit of %1$.0f Mbytes attachment storage."] = "Hai raggiunto il limite complessivo di %1$.0f Mbytes per gli allegati.";
-$a->strings["File upload failed. Possible system limit or action terminated."] = "Caricamento file fallito, potrebbe essere stato interrotto o potrebbe aver superato lo spazio assegnato.";
-$a->strings["Stored file could not be verified. Upload failed."] = "Il file non può essere verificato. Caricamento fallito.";
-$a->strings["Path not available."] = "Percorso non disponibile.";
-$a->strings["Empty pathname"] = "Il percorso del file è vuoto";
-$a->strings["duplicate filename or path"] = "il file o il percorso del file è duplicato";
-$a->strings["Path not found."] = "Percorso del file non trovato.";
-$a->strings["mkdir failed."] = "mkdir fallito.";
-$a->strings["database storage failed."] = "scrittura su database fallita.";
-$a->strings["Empty path"] = "La posizione è vuota";
 $a->strings["channel"] = "il canale";
 $a->strings["%1\$s likes %2\$s's %3\$s"] = "A %1\$s piace %3\$s di %2\$s";
 $a->strings["%1\$s doesn't like %2\$s's %3\$s"] = "A %1\$s non piace %3\$s di %2\$s";
@@ -808,13 +810,14 @@ $a->strings["set location"] = "la tua località";
 $a->strings["Toggle voting"] = "Abilita/disabilita il voto";
 $a->strings["Clear browser location"] = "Rimuovi la località data dal browser";
 $a->strings["clear location"] = "rimuovi la località";
-$a->strings["Title (optional)"] = "Titolo (opzionale)";
-$a->strings["Categories (optional, comma-separated list)"] = "Categorie (lista separata da virgole)";
+$a->strings["Title (optional)"] = "Titolo (facoltativo)";
+$a->strings["Categories (optional, comma-separated list)"] = "Categorie (facoltative, lista separata da virgole)";
 $a->strings["Permission settings"] = "Permessi dei tuoi contatti";
 $a->strings["permissions"] = "permessi";
 $a->strings["Public post"] = "Post pubblico";
 $a->strings["Example: bob@example.com, mary@example.com"] = "Per esempio: mario@esempio.com, simona@esempio.com";
 $a->strings["Set expiration date"] = "Data di scadenza";
+$a->strings["Set publish date"] = "Data di uscita programmata";
 $a->strings["OK"] = "OK";
 $a->strings["Cancel"] = "Annulla";
 $a->strings["Discover"] = "Scopri";
@@ -1146,15 +1149,17 @@ $a->strings["Accept connection to allow communication"] = "Entra in contatto per
 $a->strings["Set Affinity"] = "Scegli l'affinità";
 $a->strings["Set Profile"] = "Scegli il profilo da mostrare";
 $a->strings["Set Affinity & Profile"] = "Affinità e profilo";
+$a->strings["none"] = "--";
 $a->strings["Apply these permissions automatically"] = "Applica automaticamente questi permessi";
-$a->strings["This connection's address is"] = "Indirizzo di questo contatto";
+$a->strings["This connection's primary address is"] = "Indirizzo primario di questo canale";
+$a->strings["Available locations:"] = "Indirizzi disponibili";
 $a->strings["The permissions indicated on this page will be applied to all new connections."] = "I permessi indicati su questa pagina saranno applicati a tutti i nuovi contatti da ora in poi.";
 $a->strings["Slide to adjust your degree of friendship"] = "Trascina per restringere il grado di amicizia da mostrare";
 $a->strings["Slide to adjust your rating"] = "Trascina per cambiare la tua valutazione";
-$a->strings["Optionally explain your rating"] = "Commento opzionale";
+$a->strings["Optionally explain your rating"] = "Commento facoltativo";
 $a->strings["Custom Filter"] = "Filtro personalizzato";
 $a->strings["Only import posts with this text"] = "Importa solo i post che contengono queste parole chiave";
-$a->strings["words one per line or #tags or /patterns/, leave blank to import all posts"] = "una parola per riga, oppure #tag o /pattern/ oppure lascia vuoto per importare tutto";
+$a->strings["words one per line or #tags or /patterns/ or lang=xx, leave blank to import all posts"] = "per ogni riga: parole, #tag, /pattern/ o lang=xx , lascia vuoto per importare tutto";
 $a->strings["Do not import posts with this text"] = "Non importare i post con queste parole chiave";
 $a->strings["This information is public!"] = "Questa informazione è pubblica!";
 $a->strings["Connection Pending Approval"] = "Contatti in attesa di approvazione";
@@ -1175,45 +1180,6 @@ $a->strings["Hub not found."] = "Hub non trovato.";
 $a->strings["This setting requires special processing and editing has been blocked."] = "Questa impostazione è bloccata, richiede criteri di modifica speciali";
 $a->strings["Configuration Editor"] = "Editor di configurazione";
 $a->strings["Warning: Changing some settings could render your channel inoperable. Please leave this page unless you are comfortable with and knowledgeable about how to correctly use this feature."] = "Attenzione: alcune delle impostazioni, se cambiate, potrebbero rendere questo canale non funzionante. Lascia questa pagina a meno che tu non sappia con assoluta certezza quali modifiche effettuare.";
-$a->strings["Page owner information could not be retrieved."] = "Impossibile ottenere informazioni sul proprietario della pagina.";
-$a->strings["Album not found."] = "Album non trovato.";
-$a->strings["Delete Album"] = "Elimina album";
-$a->strings["Delete Photo"] = "Elimina foto";
-$a->strings["No photos selected"] = "Nessuna foto selezionata";
-$a->strings["Access to this item is restricted."] = "Questo elemento non è visibile a tutti.";
-$a->strings["%1$.2f MB of %2$.2f MB photo storage used."] = "Hai usato %1$.2f Mb dei %2$.2f Mb di spazio disponibile.";
-$a->strings["%1$.2f MB photo storage used."] = "Hai usato %1$.2f Mb del tuo spazio disponibile.";
-$a->strings["Upload Photos"] = "Carica foto";
-$a->strings["Enter an album name"] = "Scegli il nome dell'album";
-$a->strings["or select an existing album (doubleclick)"] = "o seleziona un album esistente (doppio click)";
-$a->strings["Create a status post for this upload"] = "Pubblica sulla bacheca";
-$a->strings["Album name could not be decoded"] = "Non è stato possibile leggere il nome dell'album";
-$a->strings["Contact Photos"] = "Foto dei contatti";
-$a->strings["Show Newest First"] = "Prima i più recenti";
-$a->strings["Show Oldest First"] = "Prima i più vecchi";
-$a->strings["View Photo"] = "Guarda la foto";
-$a->strings["Edit Album"] = "Modifica album";
-$a->strings["Permission denied. Access to this item may be restricted."] = "Permesso negato. L'accesso a questo elemento può essere stato limitato.";
-$a->strings["Photo not available"] = "Foto non disponibile";
-$a->strings["Use as profile photo"] = "Usa come foto del profilo";
-$a->strings["Private Photo"] = "Foto privata";
-$a->strings["Previous"] = "Precendente";
-$a->strings["View Full Size"] = "Vedi nelle dimensioni originali";
-$a->strings["Next"] = "Successivo";
-$a->strings["Remove"] = "Rimuovi";
-$a->strings["Edit photo"] = "Modifica la foto";
-$a->strings["Rotate CW (right)"] = "Ruota (senso orario)";
-$a->strings["Rotate CCW (left)"] = "Ruota (senso antiorario)";
-$a->strings["Enter a new album name"] = "Inserisci il nome del nuovo album";
-$a->strings["or select an existing one (doubleclick)"] = "o seleziona uno esistente (doppio click)";
-$a->strings["Caption"] = "Didascalia";
-$a->strings["Add a Tag"] = "Aggiungi tag";
-$a->strings["Example: @bob, @Barbara_Jensen, @jim@example.com"] = "Esempio: @bob, @Barbara_Jensen, @jim@example.com";
-$a->strings["Flag as adult in album view"] = "Marca come 'per adulti'";
-$a->strings["In This Photo:"] = "In questa foto:";
-$a->strings["Map"] = "Mappa";
-$a->strings["View Album"] = "Guarda l'album";
-$a->strings["Recent Photos"] = "Foto recenti";
 $a->strings["Permission Denied."] = "Permesso negato.";
 $a->strings["File not found."] = "File non trovato.";
 $a->strings["Edit file permissions"] = "Modifica i permessi del file";
@@ -1252,7 +1218,7 @@ $a->strings["I am online"] = "Sono online";
 $a->strings["Bookmark this room"] = "Aggiungi questa chat ai segnalibri";
 $a->strings["New Chatroom"] = "Nuova chat";
 $a->strings["Chatroom Name"] = "Nome della chat";
-$a->strings["Expiration of chats (minutes)"] = "Scadenza dei messaggi in chat (minuti)";
+$a->strings["Expiration of chats (minutes)"] = "Scadenza dei messaggi della chat (minuti)";
 $a->strings["%1\$s's Chatrooms"] = "Le chat di %1\$s";
 $a->strings["Items tagged with: %s"] = "Elementi taggati con: %s";
 $a->strings["Search results for: %s"] = "Risultati ricerca: %s";
@@ -1281,6 +1247,47 @@ $a->strings["Delete Conversation"] = "Elimina la conversazione";
 $a->strings["No secure communications available. You <strong>may</strong> be able to respond from the sender's profile page."] = "Non è disponibile alcun modo sicuro di comunicare con questo canale. <strong>Se possibile</strong>, prova a rispondere direttamente dalla pagina del profilo del mittente.";
 $a->strings["Send Reply"] = "Invia la risposta";
 $a->strings["Your message for %s (%s):"] = "Il tuo messaggio per %s (%s):";
+$a->strings["Page owner information could not be retrieved."] = "Impossibile ottenere informazioni sul proprietario della pagina.";
+$a->strings["Album not found."] = "Album non trovato.";
+$a->strings["Delete Album"] = "Elimina album";
+$a->strings["Delete Photo"] = "Elimina foto";
+$a->strings["No photos selected"] = "Nessuna foto selezionata";
+$a->strings["Access to this item is restricted."] = "Questo elemento non è visibile a tutti.";
+$a->strings["%1$.2f MB of %2$.2f MB photo storage used."] = "Hai usato %1$.2f Mb dei %2$.2f Mb di spazio disponibile.";
+$a->strings["%1$.2f MB photo storage used."] = "Hai usato %1$.2f Mb del tuo spazio disponibile.";
+$a->strings["Upload Photos"] = "Carica foto";
+$a->strings["Enter an album name"] = "Scegli il nome dell'album";
+$a->strings["or select an existing album (doubleclick)"] = "o seleziona un album esistente (doppio click)";
+$a->strings["Create a status post for this upload"] = "Pubblica sulla bacheca";
+$a->strings["Caption (optional):"] = "Titolo (facoltativo):";
+$a->strings["Description (optional):"] = "Descrizione (facoltativa):";
+$a->strings["Album name could not be decoded"] = "Non è stato possibile leggere il nome dell'album";
+$a->strings["Contact Photos"] = "Foto dei contatti";
+$a->strings["Show Newest First"] = "Prima i più recenti";
+$a->strings["Show Oldest First"] = "Prima i più vecchi";
+$a->strings["View Photo"] = "Guarda la foto";
+$a->strings["Edit Album"] = "Modifica album";
+$a->strings["Permission denied. Access to this item may be restricted."] = "Permesso negato. L'accesso a questo elemento può essere stato limitato.";
+$a->strings["Photo not available"] = "Foto non disponibile";
+$a->strings["Use as profile photo"] = "Usa come foto del profilo";
+$a->strings["Private Photo"] = "Foto privata";
+$a->strings["Previous"] = "Precendente";
+$a->strings["View Full Size"] = "Vedi nelle dimensioni originali";
+$a->strings["Next"] = "Successivo";
+$a->strings["Remove"] = "Rimuovi";
+$a->strings["Edit photo"] = "Modifica la foto";
+$a->strings["Rotate CW (right)"] = "Ruota (senso orario)";
+$a->strings["Rotate CCW (left)"] = "Ruota (senso antiorario)";
+$a->strings["Enter a new album name"] = "Inserisci il nome del nuovo album";
+$a->strings["or select an existing one (doubleclick)"] = "o seleziona uno esistente (doppio click)";
+$a->strings["Caption"] = "Didascalia";
+$a->strings["Add a Tag"] = "Aggiungi tag";
+$a->strings["Example: @bob, @Barbara_Jensen, @jim@example.com"] = "Esempio: @bob, @Barbara_Jensen, @jim@example.com";
+$a->strings["Flag as adult in album view"] = "Marca come 'per adulti'";
+$a->strings["In This Photo:"] = "In questa foto:";
+$a->strings["Map"] = "Mappa";
+$a->strings["View Album"] = "Guarda l'album";
+$a->strings["Recent Photos"] = "Foto recenti";
 $a->strings["Invalid message"] = "Messaggio non valido";
 $a->strings["no results"] = "nessun risultato";
 $a->strings["Delivery report for %1\$s"] = "Rapporto di consegna - %1\$s";
@@ -1484,7 +1491,7 @@ $a->strings["Input type"] = "Tipo di dati";
 $a->strings["Field Name"] = "Nome del campo";
 $a->strings["Label on profile pages"] = "Etichetta da mostrare sulla pagina del profilo";
 $a->strings["Help text"] = "Testo di aiuto";
-$a->strings["Additional info (optional)"] = "Informazioni aggiuntive (opzionali)";
+$a->strings["Additional info (optional)"] = "Informazioni aggiuntive (facoltative)";
 $a->strings["Field definition not found"] = "Impossibile trovare la definizione del campo";
 $a->strings["Edit Profile Field"] = "Modifica campo del profilo";
 $a->strings["App installed."] = "App installata";
@@ -1738,7 +1745,7 @@ $a->strings["Select a profile"] = "Scegli un profilo";
 $a->strings["Post an activity"] = "Pubblica un'attività";
 $a->strings["Only sends to viewers of the applicable profile"] = "Invia solo a chi può vedere il profilo scelto";
 $a->strings["Name of thing e.g. something"] = "Nome dell'oggetto";
-$a->strings["URL of thing (optional)"] = "Indirizzo web dell'oggetto (opzionale)";
+$a->strings["URL of thing (optional)"] = "Indirizzo web dell'oggetto (facoltativo)";
 $a->strings["URL for photo of thing (optional)"] = "Indirizzo di un'immagine dell'oggetto (facoltativo)";
 $a->strings["Add Thing to your Profile"] = "Aggiungi l'oggetto al tuo profilo";
 $a->strings["Total invitation limit exceeded."] = "Hai superato il numero massimo di inviti.";
@@ -1779,7 +1786,7 @@ $a->strings["Consumer Secret"] = "Consumer Secret";
 $a->strings["Redirect"] = "Redirect";
 $a->strings["Redirect URI - leave blank unless your application specifically requires this"] = "URI di riderezione - lasciare vuoto se non richiesto specificamente dall'applicazione";
 $a->strings["Icon url"] = "Url icona";
-$a->strings["Optional"] = "Opzionale";
+$a->strings["Optional"] = "Facoltativo";
 $a->strings["You can't edit this application."] = "Non puoi modificare questa applicazione.";
 $a->strings["Connected Apps"] = "App connesse";
 $a->strings["Client key starts with"] = "La client key inizia con";
@@ -2130,6 +2137,7 @@ $a->strings["Or enter new bookmark folder name"] = "O inserisci il nome di una n
 $a->strings["Import completed"] = "Importazione completata";
 $a->strings["Import Items"] = "Importa i contenuti";
 $a->strings["Use this form to import existing posts and content from an export file."] = "Usa questa funzionalità per importare i vecchi contenuti e i post da un file esportato in precedenza.";
+$a->strings["Who likes me?"] = "Chi mi ha dato un \"Mi piace\"?";
 $a->strings["Focus (Hubzilla default)"] = "Focus (predefinito)";
 $a->strings["Theme settings"] = "Impostazioni del tema";
 $a->strings["Select scheme"] = "Scegli uno schema";
diff --git a/view/theme/redbasic/schema/bluegrid.css b/view/theme/redbasic/schema/bluegrid.css
index 15e17c48b..2c6f34558 100644
--- a/view/theme/redbasic/schema/bluegrid.css
+++ b/view/theme/redbasic/schema/bluegrid.css
@@ -337,7 +337,7 @@ input {
     background-color: #FFF;
 }
 
-.btn-primary, input#event-submit, input#rmagic-submit-button, input#lostpass-submit-button, input#side-follow-submit, .profile-edit-submit-wrapper > input.profile-edit-submit-button, input#profile-photo-submit, form#chat-form > input, div#adminpage > form > div.submit > input, input.sources-submit, input.contact-edit-submit {
+.btn-primary, input#event-submit, input#rmagic-submit-button, input#lostpass-submit-button, input#side-follow-submit, .profile-edit-submit-wrapper > input.profile-edit-submit-button, input#profile-photo-submit, form#chat-form > input, div#adminpage > form > div.submit > input, input.sources-submit, input.contact-edit-submit, input#dbtn-submit {
     background-color: #FFF;
     color: #43488A;
 	border-radius: 0px;
@@ -346,7 +346,7 @@ input {
     transition: all .3s ease-in-out;
 }
 
-.btn-primary:hover, .btn-primary:focus, input#event-submit:hover, input#event-submit:focus, input#rmagic-submit-button:hover, input#rmagic-submit-button:focus, input#lostpass-submit-button:hover, input#lostpass-submit-button:focus, input#side-follow-submit:hover, input#side-follow-submit:focus, .profile-edit-submit-wrapper > input.profile-edit-submit-button:hover, .profile-edit-submit-wrapper > input.profile-edit-submit-button:focus, input#profile-photo-submit:hover, input#profile-photo-submit:focus, form#chat-form > input:hover, form#chat-form > input:focus, div#adminpage > form > div.submit > input:hover, div#adminpage > form > div.submit > input:focus, input.sources-submit:hover, input.sources-submit:focus, input.contact-edit-submit:focus, input.contact-edit-submit:hover {
+.btn-primary:hover, .btn-primary:focus, input#event-submit:hover, input#event-submit:focus, input#rmagic-submit-button:hover, input#rmagic-submit-button:focus, input#lostpass-submit-button:hover, input#lostpass-submit-button:focus, input#side-follow-submit:hover, input#side-follow-submit:focus, .profile-edit-submit-wrapper > input.profile-edit-submit-button:hover, .profile-edit-submit-wrapper > input.profile-edit-submit-button:focus, input#profile-photo-submit:hover, input#profile-photo-submit:focus, form#chat-form > input:hover, form#chat-form > input:focus, div#adminpage > form > div.submit > input:hover, div#adminpage > form > div.submit > input:focus, input.sources-submit:hover, input.sources-submit:focus, input.contact-edit-submit:focus, input.contact-edit-submit:hover, input#dbtn-submit:hover, input#dbtn-submit:focus {
     border-color: #FFF;
     background-color: #43488A;
     color: #FFF;
diff --git a/view/theme/redbasic/schema/dark.css b/view/theme/redbasic/schema/dark.css
index 9574df182..20f9e0833 100644
--- a/view/theme/redbasic/schema/dark.css
+++ b/view/theme/redbasic/schema/dark.css
@@ -307,6 +307,11 @@ pre {
     border-color: #222; 
 }
 
+.pmenu-item:hover a {
+	background-color: #333 !important;
+	color: #ddd;
+}
+
 .preview {
 	background: url('../img/gray_and_black_diagonal_stripes_background_seamless.gif');
 }
diff --git a/view/tpl/chat.tpl b/view/tpl/chat.tpl
index 003e0192b..18576fd56 100644
--- a/view/tpl/chat.tpl
+++ b/view/tpl/chat.tpl
@@ -1,12 +1,5 @@
 <div class="generic-content-wrapper-styled">
-<h1>{{$room_name}}</h1>
-<div id="chatContainer">
-
-    <div id="chatTopBar">
-    	<div id="chatLineHolder"></div>
-	</div>
 
-	<div id="chatSide">
 	{{if $is_owner}} 
 	<div id="chatDrop">
 	<form id="chat-destroy" method="post" action="chat">
@@ -14,9 +7,20 @@
 		<input type="hidden" name="action" value="drop" />
         <input type="submit" name="submit" value="{{$drop}}" onclick="return confirmDelete();"/>
 	</form>
-	</div><br />		
+	</div>		
 	{{/if}}
 
+<h1>{{$room_name}}</h1>
+
+
+<div id="chatContainer">
+
+    <div id="chatTopBar">
+    	<div id="chatLineHolder"></div>
+	</div>
+
+	<div id="chatSide">
+
     <div id="chatUsers"></div><br />
 	</div>
 	<div class="clear"></div>
@@ -25,14 +29,14 @@
 
         <form id="chat-form" method="post" action="#">
 			<input type="hidden" name="room_id" value="{{$room_id}}" />
-            <textarea id="chatText" name="chat_text" rows=3 cols=80></textarea><br />
+            <textarea id="chatText" name="chat_text" rows=3></textarea><br />
             <input type="submit" name="submit" value="{{$submit}}" />
         </form>
 
-		<a href="{{$baseurl}}/chat/{{$nickname}}/{{$room_id}}/leave">{{$leave}}</a> | <a href="{{$baseurl}}/chatsvc?f=&room_id={{$room_id}}&status=away">{{$away}}</a> | <a href="{{$baseurl}}/chatsvc?f=&room_id={{$room_id}}&status=online">{{$online}}</a>{{if $bookmark_link}} | <a href="{{$bookmark_link}}" target="_blank" >{{$bookmark}}</a>{{/if}}
-
     </div>
-
+	<div id="chatOptionsBar">
+		<a href="{{$baseurl}}/chat/{{$nickname}}/{{$room_id}}/leave">{{$leave}}</a> | <a href="{{$baseurl}}/chatsvc?f=&room_id={{$room_id}}&status=away">{{$away}}</a> | <a href="{{$baseurl}}/chatsvc?f=&room_id={{$room_id}}&status=online">{{$online}}</a>{{if $bookmark_link}} | <a href="{{$bookmark_link}}" target="_blank" >{{$bookmark}}</a>{{/if}}
+	</div>
 </div>
 </div>
 
diff --git a/view/tpl/follow.tpl b/view/tpl/follow.tpl
index f643a3597..0c808b9a5 100755
--- a/view/tpl/follow.tpl
+++ b/view/tpl/follow.tpl
@@ -2,7 +2,7 @@
 	<h3>{{$connect}}</h3>
 	<div id="connect-desc">{{$desc}}</div>
 	<form action="follow" method="post" />
-		<input id="side-follow-url" type="text" name="url" size="24" title="{{$hint}}" />
+		<input id="side-follow-url" type="text" name="url" title="{{$hint}}" />
 		<input id="side-follow-submit" type="submit" name="submit" class="btn btn-default" value="{{$follow}}" />
 	</form>
 	{{if $abook_usage_message}}