block adult channels from inclusion in public content feeds

5 files changed, 708 insertions, 708 deletions

diff --git a/doc/html/boot_8php.html b/doc/html/boot_8php.html
index a725415e2..d67b75873 100644
--- a/doc/html/boot_8php.html
+++ b/doc/html/boot_8php.html
@@ -1740,7 +1740,7 @@ Variables</h2></td></tr>
       </table>
 </div><div class="memdoc">
 
-<p>Referenced by <a class="el" href="Contact_8php.html#ae8803c330352cbf1e828eb7490edf47e">abook_connections()</a>, <a class="el" href="Contact_8php.html#ad5b02c2a962ee55b1b7ca6c159d6e4c5">abook_self()</a>, <a class="el" href="acl_8php.html#ac6776dba871806ecdb5d1659bc2eb07a">acl_init()</a>, <a class="el" href="classConversation.html#a8335cdd43f1836e3c255638e61a09e16">Conversation\add_thread()</a>, <a class="el" href="include_2api_8php.html#aa40bae797bcd9ccacffdce5a3b5a1afa">api_get_user()</a>, <a class="el" href="Contact_8php.html#a4e8af0f0525161da74583c04b8b03097">channel_remove()</a>, <a class="el" href="items_8php.html#a772f0ae77ad77c8ab68ed918a3870946">collect_recipients()</a>, <a class="el" href="connections_8php.html#aec2e457420fce3e3bf6a9f48e36df25c">connections_content()</a>, <a class="el" href="connections_8php.html#a1224058db8e3fb56463eb312f98e561d">connections_post()</a>, <a class="el" href="connedit_8php.html#a795acb3d9d841f55c255d7611681ab67">connedit_content()</a>, <a class="el" href="connedit_8php.html#a234c48426b652bf4d37053f2af329ac5">connedit_post()</a>, <a class="el" href="text_8php.html#ad6432621d0fafcbcf3d3b9b49bef7784">contact_block()</a>, <a class="el" href="Contact_8php.html#a28e062c884331dbb5dfa713228c25ad6">contact_remove()</a>, <a class="el" href="acl__selectors_8php.html#a9476997d2968a5794f3723878ed89c91">contact_select()</a>, <a class="el" href="contactgroup_8php.html#a18c7391b1b25debaf98c9dba639caab3">contactgroup_content()</a>, <a class="el" href="identity_8php.html#a345f4c943d84de502ec6e72d2c813945">create_identity()</a>, <a class="el" href="permissions_8php.html#aeca9b280f3dc3358c89976d81d690008">get_all_perms()</a>, <a class="el" href="identity_8php.html#a293f416ce9050220b183e08ff5890216">get_channel_default_perms()</a>, <a class="el" href="item_8php.html#a693cd09805755ab85bbb5ecae69a48c3">item_post()</a>, <a class="el" href="manage_8php.html#a2bca247b5296827638959138367db4f5">manage_content()</a>, <a class="el" href="include_2follow_8php.html#ae387d4ae097c23d69f3247e7f08140c7">new_contact()</a>, <a class="el" href="notifier_8php.html#a568c502f626cff95e344c0748938b85d">notifier_run()</a>, <a class="el" href="permissions_8php.html#a67ada9ed51e77885b6b0f6a28cee1835">perm_is_allowed()</a>, <a class="el" href="ping_8php.html#a77217b1b190b4c5d8770867b45f0c0a1">ping_init()</a>, <a class="el" href="poco_8php.html#a53def16f75e3d41f1d2bb7cfa4905498">poco_init()</a>, <a class="el" href="poller_8php.html#a5f12df3a4738124b6c039971e87e76da">poller_run()</a>, <a class="el" href="zot_8php.html#ac301c67864917c35922257950ae0f95c">process_channel_sync_delivery()</a>, <a class="el" href="settings_8php.html#aa7ee94d88ac088edb04ccf3a26de3586">settings_post()</a>, <a class="el" href="viewconnections_8php.html#ab6c4d983e97b3a8a879567ff76507776">viewconnections_content()</a>, <a class="el" href="widgets_8php.html#ad1bf7aa69e8d100d95faba17c7bc91cd">widget_follow()</a>, <a class="el" href="widgets_8php.html#aaa73bcf1702eaadd9dcd253502f55e01">widget_settings_menu()</a>, <a class="el" href="zfinger_8php.html#a8139b83a22ef98869adc10aa224027a0">zfinger_init()</a>, and <a class="el" href="zot_8php.html#a7ac30ff51274bf0b6d3eade37972145c">zot_refresh()</a>.</p>
+<p>Referenced by <a class="el" href="Contact_8php.html#ae8803c330352cbf1e828eb7490edf47e">abook_connections()</a>, <a class="el" href="Contact_8php.html#ad5b02c2a962ee55b1b7ca6c159d6e4c5">abook_self()</a>, <a class="el" href="acl_8php.html#ac6776dba871806ecdb5d1659bc2eb07a">acl_init()</a>, <a class="el" href="classConversation.html#a8335cdd43f1836e3c255638e61a09e16">Conversation\add_thread()</a>, <a class="el" href="include_2api_8php.html#aa40bae797bcd9ccacffdce5a3b5a1afa">api_get_user()</a>, <a class="el" href="Contact_8php.html#a4e8af0f0525161da74583c04b8b03097">channel_remove()</a>, <a class="el" href="items_8php.html#a772f0ae77ad77c8ab68ed918a3870946">collect_recipients()</a>, <a class="el" href="connections_8php.html#aec2e457420fce3e3bf6a9f48e36df25c">connections_content()</a>, <a class="el" href="connections_8php.html#a1224058db8e3fb56463eb312f98e561d">connections_post()</a>, <a class="el" href="connedit_8php.html#a795acb3d9d841f55c255d7611681ab67">connedit_content()</a>, <a class="el" href="connedit_8php.html#a234c48426b652bf4d37053f2af329ac5">connedit_post()</a>, <a class="el" href="text_8php.html#ad6432621d0fafcbcf3d3b9b49bef7784">contact_block()</a>, <a class="el" href="Contact_8php.html#a28e062c884331dbb5dfa713228c25ad6">contact_remove()</a>, <a class="el" href="acl__selectors_8php.html#a9476997d2968a5794f3723878ed89c91">contact_select()</a>, <a class="el" href="contactgroup_8php.html#a18c7391b1b25debaf98c9dba639caab3">contactgroup_content()</a>, <a class="el" href="identity_8php.html#a345f4c943d84de502ec6e72d2c813945">create_identity()</a>, <a class="el" href="permissions_8php.html#aeca9b280f3dc3358c89976d81d690008">get_all_perms()</a>, <a class="el" href="identity_8php.html#a293f416ce9050220b183e08ff5890216">get_channel_default_perms()</a>, <a class="el" href="conversation_8php.html#aacbb12d372d5e9c3ab0735b4aea48fb3">item_photo_menu()</a>, <a class="el" href="item_8php.html#a693cd09805755ab85bbb5ecae69a48c3">item_post()</a>, <a class="el" href="manage_8php.html#a2bca247b5296827638959138367db4f5">manage_content()</a>, <a class="el" href="include_2follow_8php.html#ae387d4ae097c23d69f3247e7f08140c7">new_contact()</a>, <a class="el" href="notifier_8php.html#a568c502f626cff95e344c0748938b85d">notifier_run()</a>, <a class="el" href="permissions_8php.html#a67ada9ed51e77885b6b0f6a28cee1835">perm_is_allowed()</a>, <a class="el" href="ping_8php.html#a77217b1b190b4c5d8770867b45f0c0a1">ping_init()</a>, <a class="el" href="poco_8php.html#a53def16f75e3d41f1d2bb7cfa4905498">poco_init()</a>, <a class="el" href="poller_8php.html#a5f12df3a4738124b6c039971e87e76da">poller_run()</a>, <a class="el" href="zot_8php.html#ac301c67864917c35922257950ae0f95c">process_channel_sync_delivery()</a>, <a class="el" href="settings_8php.html#aa7ee94d88ac088edb04ccf3a26de3586">settings_post()</a>, <a class="el" href="viewconnections_8php.html#ab6c4d983e97b3a8a879567ff76507776">viewconnections_content()</a>, <a class="el" href="widgets_8php.html#ad1bf7aa69e8d100d95faba17c7bc91cd">widget_follow()</a>, <a class="el" href="widgets_8php.html#aaa73bcf1702eaadd9dcd253502f55e01">widget_settings_menu()</a>, <a class="el" href="zfinger_8php.html#a8139b83a22ef98869adc10aa224027a0">zfinger_init()</a>, and <a class="el" href="zot_8php.html#a7ac30ff51274bf0b6d3eade37972145c">zot_refresh()</a>.</p>
 
 </div>
 </div>
diff --git a/doc/html/dba__driver_8php.html b/doc/html/dba__driver_8php.html
index 5ec3b205c..9ec2c8752 100644
--- a/doc/html/dba__driver_8php.html
+++ b/doc/html/dba__driver_8php.html
@@ -208,7 +208,7 @@ Functions</h2></td></tr>
       </table>
 </div><div class="memdoc">
 
-<p>Referenced by <a class="el" href="socgraph_8php.html#a7d34cd58025bcd9e575282f44db75918">common_friends()</a>, <a class="el" href="connect_8php.html#a417ec27afe33f21a929667a665e32ee2">connect_post()</a>, <a class="el" href="account_8php.html#a0d183a3cb4c67a0f5e906811df7a1fc9">downgrade_accounts()</a>, <a class="el" href="externals_8php.html#a4df44079e6f915286088b7a0d44db926">externals_run()</a>, <a class="el" href="security_8php.html#a9355488460ab11d6058656ff919e5cf9">item_permissions_sql()</a>, <a class="el" href="security_8php.html#afa683bc025a1d2fe9065e2f6cd71a22f">permissions_sql()</a>, <a class="el" href="poller_8php.html#a5f12df3a4738124b6c039971e87e76da">poller_run()</a>, <a class="el" href="security_8php.html#ab3bdd30dc60d9ee72370b866aa4a2d01">public_permissions_sql()</a>, <a class="el" href="Contact_8php.html#a7e3f5bef8ea1d2bf8434c9be36a2b713">random_profile()</a>, <a class="el" href="search_8php.html#ab2568591359edde5b483a6cd9a24b2cc">search_content()</a>, and <a class="el" href="widgets_8php.html#a829c5a5c7448129266fc1df3ae1a3c2e">widget_random_block()</a>.</p>
+<p>Referenced by <a class="el" href="Contact_8php.html#a024919623a830e8703ac4f23496dd66c">abook_toggle_flag()</a>, <a class="el" href="socgraph_8php.html#a7d34cd58025bcd9e575282f44db75918">common_friends()</a>, <a class="el" href="connect_8php.html#a417ec27afe33f21a929667a665e32ee2">connect_post()</a>, <a class="el" href="account_8php.html#a0d183a3cb4c67a0f5e906811df7a1fc9">downgrade_accounts()</a>, <a class="el" href="externals_8php.html#a4df44079e6f915286088b7a0d44db926">externals_run()</a>, <a class="el" href="security_8php.html#a9355488460ab11d6058656ff919e5cf9">item_permissions_sql()</a>, <a class="el" href="security_8php.html#afa683bc025a1d2fe9065e2f6cd71a22f">permissions_sql()</a>, <a class="el" href="poller_8php.html#a5f12df3a4738124b6c039971e87e76da">poller_run()</a>, <a class="el" href="security_8php.html#ab3bdd30dc60d9ee72370b866aa4a2d01">public_permissions_sql()</a>, <a class="el" href="Contact_8php.html#a7e3f5bef8ea1d2bf8434c9be36a2b713">random_profile()</a>, <a class="el" href="search_8php.html#ab2568591359edde5b483a6cd9a24b2cc">search_content()</a>, and <a class="el" href="widgets_8php.html#a829c5a5c7448129266fc1df3ae1a3c2e">widget_random_block()</a>.</p>
 
 </div>
 </div>
diff --git a/include/security.php b/include/security.php
index 8066a76f6..e3915f4a8 100644
--- a/include/security.php
+++ b/include/security.php
@@ -380,7 +380,7 @@ function stream_perms_api_uids($perms = NULL ) {
 		$ret[] = local_user();
 	$r = q("select channel_id from channel where channel_r_stream > 0 and (channel_r_stream & %d)>0 and not (channel_pageflags & %d)>0",
 		intval($perms),
-		intval(PAGE_CENSORED|PAGE_SYSTEM|PAGE_REMOVED)
+		intval(PAGE_ADULT|PAGE_CENSORED|PAGE_SYSTEM|PAGE_REMOVED)
 	);
 	if($r)
 		foreach($r as $rr)
@@ -407,7 +407,7 @@ function stream_perms_xchans($perms = NULL ) {
 
 	$r = q("select channel_hash from channel where channel_r_stream > 0 and (channel_r_stream & %d)>0 and not (channel_pageflags & %d)>0",
 		intval($perms),
-		intval(PAGE_CENSORED|PAGE_SYETEM|PAGE_REMOVED)
+		intval(PAGE_ADULT|PAGE_CENSORED|PAGE_SYSTEM|PAGE_REMOVED)
 	);
 	if($r)
 		foreach($r as $rr)
diff --git a/util/messages.po b/util/messages.po
index d19d392ad..5ed73624f 100644
--- a/util/messages.po
+++ b/util/messages.po
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: 2014-11-28.873\n"
+"Project-Id-Version: 2014-12-05.880\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-11-28 00:04-0800\n"
+"POT-Creation-Date: 2014-12-05 00:03-0800\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -29,528 +29,6 @@ msgstr ""
 msgid "Profile Photos"
 msgstr ""
 
-#: ../../include/conversation.php:120 ../../include/text.php:1747
-#: ../../include/diaspora.php:1928 ../../mod/subthread.php:72
-#: ../../mod/subthread.php:174 ../../mod/like.php:290 ../../mod/tagger.php:45
-msgid "photo"
-msgstr ""
-
-#: ../../include/conversation.php:123 ../../include/text.php:1750
-#: ../../mod/tagger.php:49
-msgid "event"
-msgstr ""
-
-#: ../../include/conversation.php:126 ../../mod/like.php:89
-msgid "channel"
-msgstr ""
-
-#: ../../include/conversation.php:148 ../../include/text.php:1753
-#: ../../include/diaspora.php:1928 ../../mod/subthread.php:72
-#: ../../mod/subthread.php:174 ../../mod/like.php:290 ../../mod/tagger.php:53
-msgid "status"
-msgstr ""
-
-#: ../../include/conversation.php:150 ../../include/text.php:1755
-#: ../../mod/tagger.php:55
-msgid "comment"
-msgstr ""
-
-#: ../../include/conversation.php:164 ../../include/diaspora.php:1957
-#: ../../mod/like.php:336
-#, php-format
-msgid "%1$s likes %2$s's %3$s"
-msgstr ""
-
-#: ../../include/conversation.php:167 ../../mod/like.php:338
-#, php-format
-msgid "%1$s doesn't like %2$s's %3$s"
-msgstr ""
-
-#: ../../include/conversation.php:204
-#, php-format
-msgid "%1$s is now connected with %2$s"
-msgstr ""
-
-#: ../../include/conversation.php:239
-#, php-format
-msgid "%1$s poked %2$s"
-msgstr ""
-
-#: ../../include/conversation.php:243 ../../include/text.php:905
-msgid "poked"
-msgstr ""
-
-#: ../../include/conversation.php:261 ../../mod/mood.php:63
-#, php-format
-msgctxt "mood"
-msgid "%1$s is %2$s"
-msgstr ""
-
-#: ../../include/conversation.php:633 ../../include/ItemObject.php:126
-msgid "Select"
-msgstr ""
-
-#: ../../include/conversation.php:634 ../../include/RedDAV/RedBrowser.php:251
-#: ../../include/apps.php:250 ../../include/ItemObject.php:120
-#: ../../mod/settings.php:626 ../../mod/connedit.php:476
-#: ../../mod/thing.php:234 ../../mod/group.php:176 ../../mod/admin.php:730
-#: ../../mod/admin.php:861 ../../mod/photos.php:1070
-msgid "Delete"
-msgstr ""
-
-#: ../../include/conversation.php:641 ../../include/ItemObject.php:89
-msgid "Private Message"
-msgstr ""
-
-#: ../../include/conversation.php:648 ../../include/ItemObject.php:194
-msgid "Message signature validated"
-msgstr ""
-
-#: ../../include/conversation.php:649 ../../include/ItemObject.php:195
-msgid "Message signature incorrect"
-msgstr ""
-
-#: ../../include/conversation.php:670
-#, php-format
-msgid "View %s's profile @ %s"
-msgstr ""
-
-#: ../../include/conversation.php:685
-msgid "Categories:"
-msgstr ""
-
-#: ../../include/conversation.php:686
-msgid "Filed under:"
-msgstr ""
-
-#: ../../include/conversation.php:694 ../../include/ItemObject.php:266
-#, php-format
-msgid " from %s"
-msgstr ""
-
-#: ../../include/conversation.php:697 ../../include/ItemObject.php:269
-#, php-format
-msgid "last edited: %s"
-msgstr ""
-
-#: ../../include/conversation.php:698 ../../include/ItemObject.php:270
-#, php-format
-msgid "Expires: %s"
-msgstr ""
-
-#: ../../include/conversation.php:713
-msgid "View in context"
-msgstr ""
-
-#: ../../include/conversation.php:715 ../../include/conversation.php:1137
-#: ../../include/ItemObject.php:317 ../../mod/editblock.php:152
-#: ../../mod/editlayout.php:148 ../../mod/editpost.php:121
-#: ../../mod/editwebpage.php:183 ../../mod/mail.php:238 ../../mod/mail.php:353
-#: ../../mod/photos.php:978
-msgid "Please wait"
-msgstr ""
-
-#: ../../include/conversation.php:831
-msgid "remove"
-msgstr ""
-
-#: ../../include/conversation.php:835 ../../include/nav.php:257
-msgid "Loading..."
-msgstr ""
-
-#: ../../include/conversation.php:836
-msgid "Delete Selected Items"
-msgstr ""
-
-#: ../../include/conversation.php:926
-msgid "View Source"
-msgstr ""
-
-#: ../../include/conversation.php:927
-msgid "Follow Thread"
-msgstr ""
-
-#: ../../include/conversation.php:928
-msgid "View Status"
-msgstr ""
-
-#: ../../include/conversation.php:929 ../../include/nav.php:99
-#: ../../mod/connedit.php:429 ../../mod/connedit.php:544
-msgid "View Profile"
-msgstr ""
-
-#: ../../include/conversation.php:930
-msgid "View Photos"
-msgstr ""
-
-#: ../../include/conversation.php:931
-msgid "Matrix Activity"
-msgstr ""
-
-#: ../../include/conversation.php:932 ../../include/identity.php:840
-#: ../../include/widgets.php:135 ../../include/widgets.php:175
-#: ../../include/Contact.php:107 ../../mod/suggest.php:51
-#: ../../mod/match.php:62 ../../mod/directory.php:235
-msgid "Connect"
-msgstr ""
-
-#: ../../include/conversation.php:933
-msgid "Edit Contact"
-msgstr ""
-
-#: ../../include/conversation.php:934
-msgid "Send PM"
-msgstr ""
-
-#: ../../include/conversation.php:935 ../../include/apps.php:143
-msgid "Poke"
-msgstr ""
-
-#: ../../include/conversation.php:987 ../../include/RedDAV/RedBrowser.php:163
-#: ../../include/apps.php:331 ../../include/apps.php:382
-#: ../../mod/connedit.php:512 ../../mod/photos.php:713
-#: ../../mod/photos.php:1132
-msgid "Unknown"
-msgstr ""
-
-#: ../../include/conversation.php:1008
-#, php-format
-msgid "%s likes this."
-msgstr ""
-
-#: ../../include/conversation.php:1008
-#, php-format
-msgid "%s doesn't like this."
-msgstr ""
-
-#: ../../include/conversation.php:1012
-#, php-format
-msgid "<span  %1$s>%2$d people</span> like this."
-msgid_plural "<span  %1$s>%2$d people</span> like this."
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../../include/conversation.php:1014
-#, php-format
-msgid "<span  %1$s>%2$d people</span> don't like this."
-msgid_plural "<span  %1$s>%2$d people</span> don't like this."
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../../include/conversation.php:1020
-msgid "and"
-msgstr ""
-
-#: ../../include/conversation.php:1023
-#, php-format
-msgid ", and %d other people"
-msgid_plural ", and %d other people"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../../include/conversation.php:1024
-#, php-format
-msgid "%s like this."
-msgstr ""
-
-#: ../../include/conversation.php:1024
-#, php-format
-msgid "%s don't like this."
-msgstr ""
-
-#: ../../include/conversation.php:1081
-msgid "Visible to <strong>everybody</strong>"
-msgstr ""
-
-#: ../../include/conversation.php:1082 ../../mod/mail.php:171
-#: ../../mod/mail.php:286
-msgid "Please enter a link URL:"
-msgstr ""
-
-#: ../../include/conversation.php:1083
-msgid "Please enter a video link/URL:"
-msgstr ""
-
-#: ../../include/conversation.php:1084
-msgid "Please enter an audio link/URL:"
-msgstr ""
-
-#: ../../include/conversation.php:1085
-msgid "Tag term:"
-msgstr ""
-
-#: ../../include/conversation.php:1086 ../../mod/filer.php:49
-msgid "Save to Folder:"
-msgstr ""
-
-#: ../../include/conversation.php:1087
-msgid "Where are you right now?"
-msgstr ""
-
-#: ../../include/conversation.php:1088 ../../mod/editpost.php:52
-#: ../../mod/mail.php:172 ../../mod/mail.php:287
-msgid "Expires YYYY-MM-DD HH:MM"
-msgstr ""
-
-#: ../../include/conversation.php:1098 ../../include/page_widgets.php:40
-#: ../../include/ItemObject.php:630 ../../mod/webpages.php:166
-#: ../../mod/editblock.php:173 ../../mod/editlayout.php:168
-#: ../../mod/editpost.php:140 ../../mod/editwebpage.php:205
-#: ../../mod/photos.php:998
-msgid "Preview"
-msgstr ""
-
-#: ../../include/conversation.php:1112 ../../mod/editblock.php:198
-#: ../../mod/editlayout.php:193 ../../mod/editwebpage.php:230
-#: ../../mod/layouts.php:168 ../../mod/photos.php:977
-msgid "Share"
-msgstr ""
-
-#: ../../include/conversation.php:1114 ../../mod/editwebpage.php:170
-msgid "Page link title"
-msgstr ""
-
-#: ../../include/conversation.php:1117
-msgid "Post as"
-msgstr ""
-
-#: ../../include/conversation.php:1118 ../../mod/editblock.php:144
-#: ../../mod/editlayout.php:140 ../../mod/editpost.php:113
-#: ../../mod/editwebpage.php:175 ../../mod/mail.php:235 ../../mod/mail.php:349
-msgid "Upload photo"
-msgstr ""
-
-#: ../../include/conversation.php:1119
-msgid "upload photo"
-msgstr ""
-
-#: ../../include/conversation.php:1120 ../../mod/editblock.php:145
-#: ../../mod/editlayout.php:141 ../../mod/editpost.php:114
-#: ../../mod/editwebpage.php:176 ../../mod/mail.php:236 ../../mod/mail.php:350
-msgid "Attach file"
-msgstr ""
-
-#: ../../include/conversation.php:1121
-msgid "attach file"
-msgstr ""
-
-#: ../../include/conversation.php:1122 ../../mod/editblock.php:146
-#: ../../mod/editlayout.php:142 ../../mod/editpost.php:115
-#: ../../mod/editwebpage.php:177 ../../mod/mail.php:237 ../../mod/mail.php:351
-msgid "Insert web link"
-msgstr ""
-
-#: ../../include/conversation.php:1123
-msgid "web link"
-msgstr ""
-
-#: ../../include/conversation.php:1124
-msgid "Insert video link"
-msgstr ""
-
-#: ../../include/conversation.php:1125
-msgid "video link"
-msgstr ""
-
-#: ../../include/conversation.php:1126
-msgid "Insert audio link"
-msgstr ""
-
-#: ../../include/conversation.php:1127
-msgid "audio link"
-msgstr ""
-
-#: ../../include/conversation.php:1128 ../../mod/editblock.php:150
-#: ../../mod/editlayout.php:146 ../../mod/editpost.php:119
-#: ../../mod/editwebpage.php:181
-msgid "Set your location"
-msgstr ""
-
-#: ../../include/conversation.php:1129
-msgid "set location"
-msgstr ""
-
-#: ../../include/conversation.php:1130 ../../mod/editblock.php:151
-#: ../../mod/editlayout.php:147 ../../mod/editpost.php:120
-#: ../../mod/editwebpage.php:182
-msgid "Clear browser location"
-msgstr ""
-
-#: ../../include/conversation.php:1131
-msgid "clear location"
-msgstr ""
-
-#: ../../include/conversation.php:1133 ../../mod/editblock.php:164
-#: ../../mod/editlayout.php:159 ../../mod/editpost.php:132
-#: ../../mod/editwebpage.php:198
-msgid "Set title"
-msgstr ""
-
-#: ../../include/conversation.php:1136 ../../mod/events.php:574
-#: ../../mod/editblock.php:167 ../../mod/editlayout.php:162
-#: ../../mod/editpost.php:134 ../../mod/editwebpage.php:200
-msgid "Categories (comma-separated list)"
-msgstr ""
-
-#: ../../include/conversation.php:1138 ../../mod/editblock.php:153
-#: ../../mod/editlayout.php:149 ../../mod/editpost.php:122
-#: ../../mod/editwebpage.php:184
-msgid "Permission settings"
-msgstr ""
-
-#: ../../include/conversation.php:1139
-msgid "permissions"
-msgstr ""
-
-#: ../../include/conversation.php:1146 ../../mod/editblock.php:161
-#: ../../mod/editlayout.php:156 ../../mod/editpost.php:129
-#: ../../mod/editwebpage.php:193
-msgid "Public post"
-msgstr ""
-
-#: ../../include/conversation.php:1148 ../../mod/editblock.php:168
-#: ../../mod/editlayout.php:163 ../../mod/editpost.php:135
-#: ../../mod/editwebpage.php:201
-msgid "Example: bob@example.com, mary@example.com"
-msgstr ""
-
-#: ../../include/conversation.php:1161 ../../mod/editblock.php:178
-#: ../../mod/editlayout.php:173 ../../mod/editpost.php:146
-#: ../../mod/editwebpage.php:210 ../../mod/mail.php:242 ../../mod/mail.php:356
-msgid "Set expiration date"
-msgstr ""
-
-#: ../../include/conversation.php:1163 ../../include/ItemObject.php:633
-#: ../../mod/editpost.php:148 ../../mod/mail.php:244 ../../mod/mail.php:358
-msgid "Encrypt text"
-msgstr ""
-
-#: ../../include/conversation.php:1165 ../../mod/events.php:580
-#: ../../mod/editpost.php:150
-msgid "OK"
-msgstr ""
-
-#: ../../include/conversation.php:1166 ../../mod/settings.php:564
-#: ../../mod/settings.php:590 ../../mod/events.php:579
-#: ../../mod/editpost.php:151 ../../mod/fbrowser.php:82
-#: ../../mod/fbrowser.php:117 ../../mod/tagrm.php:11 ../../mod/tagrm.php:134
-msgid "Cancel"
-msgstr ""
-
-#: ../../include/conversation.php:1410
-msgid "Discover"
-msgstr ""
-
-#: ../../include/conversation.php:1413
-msgid "Imported public streams"
-msgstr ""
-
-#: ../../include/conversation.php:1418
-msgid "Commented Order"
-msgstr ""
-
-#: ../../include/conversation.php:1421
-msgid "Sort by Comment Date"
-msgstr ""
-
-#: ../../include/conversation.php:1425
-msgid "Posted Order"
-msgstr ""
-
-#: ../../include/conversation.php:1428
-msgid "Sort by Post Date"
-msgstr ""
-
-#: ../../include/conversation.php:1433 ../../include/widgets.php:89
-msgid "Personal"
-msgstr ""
-
-#: ../../include/conversation.php:1436
-msgid "Posts that mention or involve you"
-msgstr ""
-
-#: ../../include/conversation.php:1442 ../../mod/connections.php:211
-#: ../../mod/connections.php:224 ../../mod/menu.php:80
-msgid "New"
-msgstr ""
-
-#: ../../include/conversation.php:1445
-msgid "Activity Stream - by date"
-msgstr ""
-
-#: ../../include/conversation.php:1451
-msgid "Starred"
-msgstr ""
-
-#: ../../include/conversation.php:1454
-msgid "Favourite Posts"
-msgstr ""
-
-#: ../../include/conversation.php:1461
-msgid "Spam"
-msgstr ""
-
-#: ../../include/conversation.php:1464
-msgid "Posts flagged as SPAM"
-msgstr ""
-
-#: ../../include/conversation.php:1504 ../../mod/admin.php:865
-msgid "Channel"
-msgstr ""
-
-#: ../../include/conversation.php:1507
-msgid "Status Messages and Posts"
-msgstr ""
-
-#: ../../include/conversation.php:1516
-msgid "About"
-msgstr ""
-
-#: ../../include/conversation.php:1519
-msgid "Profile Details"
-msgstr ""
-
-#: ../../include/conversation.php:1525 ../../include/nav.php:105
-#: ../../include/apps.php:137 ../../mod/fbrowser.php:25
-msgid "Photos"
-msgstr ""
-
-#: ../../include/conversation.php:1528 ../../include/photos.php:341
-msgid "Photo Albums"
-msgstr ""
-
-#: ../../include/conversation.php:1534 ../../include/RedDAV/RedBrowser.php:241
-#: ../../include/nav.php:106 ../../include/apps.php:133
-#: ../../mod/fbrowser.php:114
-msgid "Files"
-msgstr ""
-
-#: ../../include/conversation.php:1537
-msgid "Files and Storage"
-msgstr ""
-
-#: ../../include/conversation.php:1547 ../../include/conversation.php:1550
-msgid "Chatrooms"
-msgstr ""
-
-#: ../../include/conversation.php:1560 ../../include/nav.php:117
-#: ../../include/apps.php:127
-msgid "Bookmarks"
-msgstr ""
-
-#: ../../include/conversation.php:1563
-msgid "Saved Bookmarks"
-msgstr ""
-
-#: ../../include/conversation.php:1571 ../../include/nav.php:121
-#: ../../include/apps.php:134 ../../mod/webpages.php:160
-msgid "Webpages"
-msgstr ""
-
-#: ../../include/conversation.php:1574
-msgid "Manage Webpages"
-msgstr ""
-
 #: ../../include/follow.php:28
 msgid "Channel is blocked on this site."
 msgstr ""
@@ -614,6 +92,14 @@ msgstr ""
 msgid "View"
 msgstr ""
 
+#: ../../include/page_widgets.php:40 ../../include/conversation.php:1099
+#: ../../include/ItemObject.php:630 ../../mod/webpages.php:166
+#: ../../mod/editblock.php:173 ../../mod/editlayout.php:168
+#: ../../mod/editpost.php:140 ../../mod/editwebpage.php:205
+#: ../../mod/photos.php:998
+msgid "Preview"
+msgstr ""
+
 #: ../../include/page_widgets.php:41 ../../mod/webpages.php:167
 msgid "Actions"
 msgstr ""
@@ -933,6 +419,13 @@ msgstr ""
 msgid "Schedule Outbox"
 msgstr ""
 
+#: ../../include/RedDAV/RedBrowser.php:163 ../../include/conversation.php:988
+#: ../../include/apps.php:331 ../../include/apps.php:382
+#: ../../mod/connedit.php:513 ../../mod/photos.php:713
+#: ../../mod/photos.php:1132
+msgid "Unknown"
+msgstr ""
+
 #: ../../include/RedDAV/RedBrowser.php:223
 #, php-format
 msgid "%1$s used"
@@ -943,6 +436,12 @@ msgstr ""
 msgid "%1$s used of %2$s (%3$s&#37;)"
 msgstr ""
 
+#: ../../include/RedDAV/RedBrowser.php:241 ../../include/nav.php:106
+#: ../../include/conversation.php:1535 ../../include/apps.php:133
+#: ../../mod/fbrowser.php:114
+msgid "Files"
+msgstr ""
+
 #: ../../include/RedDAV/RedBrowser.php:245 ../../mod/settings.php:565
 #: ../../mod/settings.php:591 ../../mod/admin.php:866
 msgid "Name"
@@ -960,6 +459,14 @@ msgstr ""
 msgid "Last Modified"
 msgstr ""
 
+#: ../../include/RedDAV/RedBrowser.php:251 ../../include/conversation.php:634
+#: ../../include/apps.php:250 ../../include/ItemObject.php:120
+#: ../../mod/settings.php:626 ../../mod/connedit.php:476
+#: ../../mod/thing.php:234 ../../mod/group.php:176 ../../mod/admin.php:730
+#: ../../mod/admin.php:861 ../../mod/photos.php:1070
+msgid "Delete"
+msgstr ""
+
 #: ../../include/RedDAV/RedBrowser.php:252
 msgid "Total"
 msgstr ""
@@ -1003,6 +510,11 @@ msgstr ""
 msgid "Your posts and conversations"
 msgstr ""
 
+#: ../../include/nav.php:99 ../../include/conversation.php:930
+#: ../../mod/connedit.php:429 ../../mod/connedit.php:545
+msgid "View Profile"
+msgstr ""
+
 #: ../../include/nav.php:99
 msgid "Your profile page"
 msgstr ""
@@ -1023,6 +535,11 @@ msgstr ""
 msgid "Edit your profile"
 msgstr ""
 
+#: ../../include/nav.php:105 ../../include/conversation.php:1526
+#: ../../include/apps.php:137 ../../mod/fbrowser.php:25
+msgid "Photos"
+msgstr ""
+
 #: ../../include/nav.php:105
 msgid "Your photos"
 msgstr ""
@@ -1039,10 +556,20 @@ msgstr ""
 msgid "Your chatrooms"
 msgstr ""
 
+#: ../../include/nav.php:117 ../../include/conversation.php:1561
+#: ../../include/apps.php:127
+msgid "Bookmarks"
+msgstr ""
+
 #: ../../include/nav.php:117
 msgid "Your bookmarks"
 msgstr ""
 
+#: ../../include/nav.php:121 ../../include/conversation.php:1572
+#: ../../include/apps.php:134 ../../mod/webpages.php:160
+msgid "Webpages"
+msgstr ""
+
 #: ../../include/nav.php:121
 msgid "Your webpages"
 msgstr ""
@@ -1232,6 +759,10 @@ msgstr ""
 msgid "Site Setup and Configuration"
 msgstr ""
 
+#: ../../include/nav.php:257 ../../include/conversation.php:835
+msgid "Loading..."
+msgstr ""
+
 #: ../../include/nav.php:262
 msgid "Please wait..."
 msgstr ""
@@ -1352,7 +883,7 @@ msgstr ""
 #: ../../include/profile_selectors.php:80 ../../mod/settings.php:318
 #: ../../mod/settings.php:322 ../../mod/settings.php:323
 #: ../../mod/settings.php:326 ../../mod/settings.php:337
-#: ../../mod/connedit.php:509
+#: ../../mod/connedit.php:510
 msgid "Friends"
 msgstr ""
 
@@ -1368,6 +899,13 @@ msgstr ""
 msgid "Requested profile is not available."
 msgstr ""
 
+#: ../../include/identity.php:840 ../../include/Contact.php:107
+#: ../../include/widgets.php:135 ../../include/widgets.php:175
+#: ../../include/conversation.php:933 ../../mod/suggest.php:51
+#: ../../mod/match.php:62 ../../mod/directory.php:235
+msgid "Connect"
+msgstr ""
+
 #: ../../include/identity.php:854 ../../mod/profiles.php:740
 msgid "Change profile photo"
 msgstr ""
@@ -1452,7 +990,7 @@ msgstr ""
 msgid "Profile"
 msgstr ""
 
-#: ../../include/identity.php:1130 ../../mod/settings.php:1005
+#: ../../include/identity.php:1130 ../../mod/settings.php:1010
 msgid "Full Name:"
 msgstr ""
 
@@ -1691,17 +1229,17 @@ msgstr ""
 msgid "Happy Birthday %1$s"
 msgstr ""
 
-#: ../../include/zot.php:664
-msgid "Invalid data packet"
+#: ../../include/Contact.php:123
+msgid "New window"
 msgstr ""
 
-#: ../../include/zot.php:680
-msgid "Unable to verify channel signature"
+#: ../../include/Contact.php:124
+msgid "Open the selected location in a different window or browser tab"
 msgstr ""
 
-#: ../../include/zot.php:1818
+#: ../../include/Contact.php:213 ../../mod/admin.php:646
 #, php-format
-msgid "Unable to verify site signature for %s"
+msgid "User '%s' deleted"
 msgstr ""
 
 #: ../../include/taxonomy.php:210
@@ -2318,6 +1856,10 @@ msgstr ""
 msgid "poke"
 msgstr ""
 
+#: ../../include/text.php:905 ../../include/conversation.php:243
+msgid "poked"
+msgstr ""
+
 #: ../../include/text.php:906
 msgid "ping"
 msgstr ""
@@ -2558,6 +2100,28 @@ msgstr ""
 msgid "Select an alternate language"
 msgstr ""
 
+#: ../../include/text.php:1747 ../../include/conversation.php:120
+#: ../../include/diaspora.php:1928 ../../mod/subthread.php:72
+#: ../../mod/subthread.php:174 ../../mod/like.php:290 ../../mod/tagger.php:45
+msgid "photo"
+msgstr ""
+
+#: ../../include/text.php:1750 ../../include/conversation.php:123
+#: ../../mod/tagger.php:49
+msgid "event"
+msgstr ""
+
+#: ../../include/text.php:1753 ../../include/conversation.php:148
+#: ../../include/diaspora.php:1928 ../../mod/subthread.php:72
+#: ../../mod/subthread.php:174 ../../mod/like.php:290 ../../mod/tagger.php:53
+msgid "status"
+msgstr ""
+
+#: ../../include/text.php:1755 ../../include/conversation.php:150
+#: ../../mod/tagger.php:55
+msgid "comment"
+msgstr ""
+
 #: ../../include/text.php:1760
 msgid "activity"
 msgstr ""
@@ -2813,6 +2377,10 @@ msgstr ""
 msgid "Photo storage failed."
 msgstr ""
 
+#: ../../include/photos.php:341 ../../include/conversation.php:1529
+msgid "Photo Albums"
+msgstr ""
+
 #: ../../include/photos.php:345
 msgid "Upload New Photos"
 msgstr ""
@@ -2899,6 +2467,10 @@ msgstr ""
 msgid "System"
 msgstr ""
 
+#: ../../include/widgets.php:89 ../../include/conversation.php:1434
+msgid "Personal"
+msgstr ""
+
 #: ../../include/widgets.php:90
 msgid "Create Personal App"
 msgstr ""
@@ -2956,7 +2528,7 @@ msgstr ""
 msgid "Me"
 msgstr ""
 
-#: ../../include/widgets.php:430 ../../mod/connedit.php:508
+#: ../../include/widgets.php:430 ../../mod/connedit.php:509
 msgid "Best Friends"
 msgstr ""
 
@@ -2964,11 +2536,11 @@ msgstr ""
 msgid "Co-workers"
 msgstr ""
 
-#: ../../include/widgets.php:433 ../../mod/connedit.php:510
+#: ../../include/widgets.php:433 ../../mod/connedit.php:511
 msgid "Former Friends"
 msgstr ""
 
-#: ../../include/widgets.php:434 ../../mod/connedit.php:511
+#: ../../include/widgets.php:434 ../../mod/connedit.php:512
 msgid "Acquaintances"
 msgstr ""
 
@@ -3008,7 +2580,7 @@ msgstr ""
 msgid "Export content"
 msgstr ""
 
-#: ../../include/widgets.php:520 ../../mod/connedit.php:538
+#: ../../include/widgets.php:520 ../../mod/connedit.php:539
 msgid "Connection Default Permissions"
 msgstr ""
 
@@ -3041,17 +2613,445 @@ msgstr ""
 msgid "photo/image"
 msgstr ""
 
-#: ../../include/Contact.php:123
-msgid "New window"
+#: ../../include/conversation.php:126 ../../mod/like.php:89
+msgid "channel"
 msgstr ""
 
-#: ../../include/Contact.php:124
-msgid "Open the selected location in a different window or browser tab"
+#: ../../include/conversation.php:164 ../../include/diaspora.php:1957
+#: ../../mod/like.php:336
+#, php-format
+msgid "%1$s likes %2$s's %3$s"
 msgstr ""
 
-#: ../../include/Contact.php:211 ../../mod/admin.php:646
+#: ../../include/conversation.php:167 ../../mod/like.php:338
 #, php-format
-msgid "User '%s' deleted"
+msgid "%1$s doesn't like %2$s's %3$s"
+msgstr ""
+
+#: ../../include/conversation.php:204
+#, php-format
+msgid "%1$s is now connected with %2$s"
+msgstr ""
+
+#: ../../include/conversation.php:239
+#, php-format
+msgid "%1$s poked %2$s"
+msgstr ""
+
+#: ../../include/conversation.php:261 ../../mod/mood.php:63
+#, php-format
+msgctxt "mood"
+msgid "%1$s is %2$s"
+msgstr ""
+
+#: ../../include/conversation.php:633 ../../include/ItemObject.php:126
+msgid "Select"
+msgstr ""
+
+#: ../../include/conversation.php:641 ../../include/ItemObject.php:89
+msgid "Private Message"
+msgstr ""
+
+#: ../../include/conversation.php:648 ../../include/ItemObject.php:194
+msgid "Message signature validated"
+msgstr ""
+
+#: ../../include/conversation.php:649 ../../include/ItemObject.php:195
+msgid "Message signature incorrect"
+msgstr ""
+
+#: ../../include/conversation.php:670
+#, php-format
+msgid "View %s's profile @ %s"
+msgstr ""
+
+#: ../../include/conversation.php:685
+msgid "Categories:"
+msgstr ""
+
+#: ../../include/conversation.php:686
+msgid "Filed under:"
+msgstr ""
+
+#: ../../include/conversation.php:694 ../../include/ItemObject.php:266
+#, php-format
+msgid " from %s"
+msgstr ""
+
+#: ../../include/conversation.php:697 ../../include/ItemObject.php:269
+#, php-format
+msgid "last edited: %s"
+msgstr ""
+
+#: ../../include/conversation.php:698 ../../include/ItemObject.php:270
+#, php-format
+msgid "Expires: %s"
+msgstr ""
+
+#: ../../include/conversation.php:713
+msgid "View in context"
+msgstr ""
+
+#: ../../include/conversation.php:715 ../../include/conversation.php:1138
+#: ../../include/ItemObject.php:317 ../../mod/editblock.php:152
+#: ../../mod/editlayout.php:148 ../../mod/editpost.php:121
+#: ../../mod/editwebpage.php:183 ../../mod/mail.php:238 ../../mod/mail.php:353
+#: ../../mod/photos.php:978
+msgid "Please wait"
+msgstr ""
+
+#: ../../include/conversation.php:831
+msgid "remove"
+msgstr ""
+
+#: ../../include/conversation.php:836
+msgid "Delete Selected Items"
+msgstr ""
+
+#: ../../include/conversation.php:927
+msgid "View Source"
+msgstr ""
+
+#: ../../include/conversation.php:928
+msgid "Follow Thread"
+msgstr ""
+
+#: ../../include/conversation.php:929
+msgid "View Status"
+msgstr ""
+
+#: ../../include/conversation.php:931
+msgid "View Photos"
+msgstr ""
+
+#: ../../include/conversation.php:932
+msgid "Matrix Activity"
+msgstr ""
+
+#: ../../include/conversation.php:934
+msgid "Edit Contact"
+msgstr ""
+
+#: ../../include/conversation.php:935
+msgid "Send PM"
+msgstr ""
+
+#: ../../include/conversation.php:936 ../../include/apps.php:143
+msgid "Poke"
+msgstr ""
+
+#: ../../include/conversation.php:1009
+#, php-format
+msgid "%s likes this."
+msgstr ""
+
+#: ../../include/conversation.php:1009
+#, php-format
+msgid "%s doesn't like this."
+msgstr ""
+
+#: ../../include/conversation.php:1013
+#, php-format
+msgid "<span  %1$s>%2$d people</span> like this."
+msgid_plural "<span  %1$s>%2$d people</span> like this."
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../../include/conversation.php:1015
+#, php-format
+msgid "<span  %1$s>%2$d people</span> don't like this."
+msgid_plural "<span  %1$s>%2$d people</span> don't like this."
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../../include/conversation.php:1021
+msgid "and"
+msgstr ""
+
+#: ../../include/conversation.php:1024
+#, php-format
+msgid ", and %d other people"
+msgid_plural ", and %d other people"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../../include/conversation.php:1025
+#, php-format
+msgid "%s like this."
+msgstr ""
+
+#: ../../include/conversation.php:1025
+#, php-format
+msgid "%s don't like this."
+msgstr ""
+
+#: ../../include/conversation.php:1082
+msgid "Visible to <strong>everybody</strong>"
+msgstr ""
+
+#: ../../include/conversation.php:1083 ../../mod/mail.php:171
+#: ../../mod/mail.php:286
+msgid "Please enter a link URL:"
+msgstr ""
+
+#: ../../include/conversation.php:1084
+msgid "Please enter a video link/URL:"
+msgstr ""
+
+#: ../../include/conversation.php:1085
+msgid "Please enter an audio link/URL:"
+msgstr ""
+
+#: ../../include/conversation.php:1086
+msgid "Tag term:"
+msgstr ""
+
+#: ../../include/conversation.php:1087 ../../mod/filer.php:49
+msgid "Save to Folder:"
+msgstr ""
+
+#: ../../include/conversation.php:1088
+msgid "Where are you right now?"
+msgstr ""
+
+#: ../../include/conversation.php:1089 ../../mod/editpost.php:52
+#: ../../mod/mail.php:172 ../../mod/mail.php:287
+msgid "Expires YYYY-MM-DD HH:MM"
+msgstr ""
+
+#: ../../include/conversation.php:1113 ../../mod/editblock.php:198
+#: ../../mod/editlayout.php:193 ../../mod/editwebpage.php:230
+#: ../../mod/layouts.php:168 ../../mod/photos.php:977
+msgid "Share"
+msgstr ""
+
+#: ../../include/conversation.php:1115 ../../mod/editwebpage.php:170
+msgid "Page link title"
+msgstr ""
+
+#: ../../include/conversation.php:1118
+msgid "Post as"
+msgstr ""
+
+#: ../../include/conversation.php:1119 ../../mod/editblock.php:144
+#: ../../mod/editlayout.php:140 ../../mod/editpost.php:113
+#: ../../mod/editwebpage.php:175 ../../mod/mail.php:235 ../../mod/mail.php:349
+msgid "Upload photo"
+msgstr ""
+
+#: ../../include/conversation.php:1120
+msgid "upload photo"
+msgstr ""
+
+#: ../../include/conversation.php:1121 ../../mod/editblock.php:145
+#: ../../mod/editlayout.php:141 ../../mod/editpost.php:114
+#: ../../mod/editwebpage.php:176 ../../mod/mail.php:236 ../../mod/mail.php:350
+msgid "Attach file"
+msgstr ""
+
+#: ../../include/conversation.php:1122
+msgid "attach file"
+msgstr ""
+
+#: ../../include/conversation.php:1123 ../../mod/editblock.php:146
+#: ../../mod/editlayout.php:142 ../../mod/editpost.php:115
+#: ../../mod/editwebpage.php:177 ../../mod/mail.php:237 ../../mod/mail.php:351
+msgid "Insert web link"
+msgstr ""
+
+#: ../../include/conversation.php:1124
+msgid "web link"
+msgstr ""
+
+#: ../../include/conversation.php:1125
+msgid "Insert video link"
+msgstr ""
+
+#: ../../include/conversation.php:1126
+msgid "video link"
+msgstr ""
+
+#: ../../include/conversation.php:1127
+msgid "Insert audio link"
+msgstr ""
+
+#: ../../include/conversation.php:1128
+msgid "audio link"
+msgstr ""
+
+#: ../../include/conversation.php:1129 ../../mod/editblock.php:150
+#: ../../mod/editlayout.php:146 ../../mod/editpost.php:119
+#: ../../mod/editwebpage.php:181
+msgid "Set your location"
+msgstr ""
+
+#: ../../include/conversation.php:1130
+msgid "set location"
+msgstr ""
+
+#: ../../include/conversation.php:1131 ../../mod/editblock.php:151
+#: ../../mod/editlayout.php:147 ../../mod/editpost.php:120
+#: ../../mod/editwebpage.php:182
+msgid "Clear browser location"
+msgstr ""
+
+#: ../../include/conversation.php:1132
+msgid "clear location"
+msgstr ""
+
+#: ../../include/conversation.php:1134 ../../mod/editblock.php:164
+#: ../../mod/editlayout.php:159 ../../mod/editpost.php:132
+#: ../../mod/editwebpage.php:198
+msgid "Set title"
+msgstr ""
+
+#: ../../include/conversation.php:1137 ../../mod/events.php:574
+#: ../../mod/editblock.php:167 ../../mod/editlayout.php:162
+#: ../../mod/editpost.php:134 ../../mod/editwebpage.php:200
+msgid "Categories (comma-separated list)"
+msgstr ""
+
+#: ../../include/conversation.php:1139 ../../mod/editblock.php:153
+#: ../../mod/editlayout.php:149 ../../mod/editpost.php:122
+#: ../../mod/editwebpage.php:184
+msgid "Permission settings"
+msgstr ""
+
+#: ../../include/conversation.php:1140
+msgid "permissions"
+msgstr ""
+
+#: ../../include/conversation.php:1147 ../../mod/editblock.php:161
+#: ../../mod/editlayout.php:156 ../../mod/editpost.php:129
+#: ../../mod/editwebpage.php:193
+msgid "Public post"
+msgstr ""
+
+#: ../../include/conversation.php:1149 ../../mod/editblock.php:168
+#: ../../mod/editlayout.php:163 ../../mod/editpost.php:135
+#: ../../mod/editwebpage.php:201
+msgid "Example: bob@example.com, mary@example.com"
+msgstr ""
+
+#: ../../include/conversation.php:1162 ../../mod/editblock.php:178
+#: ../../mod/editlayout.php:173 ../../mod/editpost.php:146
+#: ../../mod/editwebpage.php:210 ../../mod/mail.php:242 ../../mod/mail.php:356
+msgid "Set expiration date"
+msgstr ""
+
+#: ../../include/conversation.php:1164 ../../include/ItemObject.php:633
+#: ../../mod/editpost.php:148 ../../mod/mail.php:244 ../../mod/mail.php:358
+msgid "Encrypt text"
+msgstr ""
+
+#: ../../include/conversation.php:1166 ../../mod/events.php:580
+#: ../../mod/editpost.php:150
+msgid "OK"
+msgstr ""
+
+#: ../../include/conversation.php:1167 ../../mod/settings.php:564
+#: ../../mod/settings.php:590 ../../mod/events.php:579
+#: ../../mod/editpost.php:151 ../../mod/fbrowser.php:82
+#: ../../mod/fbrowser.php:117 ../../mod/tagrm.php:11 ../../mod/tagrm.php:134
+msgid "Cancel"
+msgstr ""
+
+#: ../../include/conversation.php:1411
+msgid "Discover"
+msgstr ""
+
+#: ../../include/conversation.php:1414
+msgid "Imported public streams"
+msgstr ""
+
+#: ../../include/conversation.php:1419
+msgid "Commented Order"
+msgstr ""
+
+#: ../../include/conversation.php:1422
+msgid "Sort by Comment Date"
+msgstr ""
+
+#: ../../include/conversation.php:1426
+msgid "Posted Order"
+msgstr ""
+
+#: ../../include/conversation.php:1429
+msgid "Sort by Post Date"
+msgstr ""
+
+#: ../../include/conversation.php:1437
+msgid "Posts that mention or involve you"
+msgstr ""
+
+#: ../../include/conversation.php:1443 ../../mod/connections.php:211
+#: ../../mod/connections.php:224 ../../mod/menu.php:80
+msgid "New"
+msgstr ""
+
+#: ../../include/conversation.php:1446
+msgid "Activity Stream - by date"
+msgstr ""
+
+#: ../../include/conversation.php:1452
+msgid "Starred"
+msgstr ""
+
+#: ../../include/conversation.php:1455
+msgid "Favourite Posts"
+msgstr ""
+
+#: ../../include/conversation.php:1462
+msgid "Spam"
+msgstr ""
+
+#: ../../include/conversation.php:1465
+msgid "Posts flagged as SPAM"
+msgstr ""
+
+#: ../../include/conversation.php:1505 ../../mod/admin.php:865
+msgid "Channel"
+msgstr ""
+
+#: ../../include/conversation.php:1508
+msgid "Status Messages and Posts"
+msgstr ""
+
+#: ../../include/conversation.php:1517
+msgid "About"
+msgstr ""
+
+#: ../../include/conversation.php:1520
+msgid "Profile Details"
+msgstr ""
+
+#: ../../include/conversation.php:1538
+msgid "Files and Storage"
+msgstr ""
+
+#: ../../include/conversation.php:1548 ../../include/conversation.php:1551
+msgid "Chatrooms"
+msgstr ""
+
+#: ../../include/conversation.php:1564
+msgid "Saved Bookmarks"
+msgstr ""
+
+#: ../../include/conversation.php:1575
+msgid "Manage Webpages"
+msgstr ""
+
+#: ../../include/zot.php:664
+msgid "Invalid data packet"
+msgstr ""
+
+#: ../../include/zot.php:680
+msgid "Unable to verify channel signature"
+msgstr ""
+
+#: ../../include/zot.php:1819
+#, php-format
+msgid "Unable to verify site signature for %s"
 msgstr ""
 
 #: ../../include/js_strings.php:5
@@ -3600,9 +3600,9 @@ msgstr ""
 #: ../../mod/sources.php:104 ../../mod/sources.php:138 ../../mod/poke.php:166
 #: ../../mod/setup.php:313 ../../mod/setup.php:358 ../../mod/settings.php:563
 #: ../../mod/settings.php:675 ../../mod/settings.php:704
-#: ../../mod/settings.php:728 ../../mod/settings.php:805
-#: ../../mod/settings.php:997 ../../mod/events.php:598 ../../mod/chat.php:177
-#: ../../mod/chat.php:211 ../../mod/connect.php:93 ../../mod/connedit.php:555
+#: ../../mod/settings.php:728 ../../mod/settings.php:810
+#: ../../mod/settings.php:1002 ../../mod/events.php:598 ../../mod/chat.php:177
+#: ../../mod/chat.php:211 ../../mod/connect.php:93 ../../mod/connedit.php:556
 #: ../../mod/thing.php:284 ../../mod/thing.php:327 ../../mod/profiles.php:633
 #: ../../mod/pdledit.php:58 ../../mod/fsuggest.php:108
 #: ../../mod/filestorage.php:146 ../../mod/group.php:81
@@ -3741,7 +3741,7 @@ msgstr ""
 msgid "Menu Item Permissions"
 msgstr ""
 
-#: ../../mod/mitem.php:161 ../../mod/mitem.php:204 ../../mod/settings.php:1032
+#: ../../mod/mitem.php:161 ../../mod/mitem.php:204 ../../mod/settings.php:1037
 msgid "(click to open/close)"
 msgstr ""
 
@@ -3996,14 +3996,14 @@ msgid ""
 "and/or create new posts for you?"
 msgstr ""
 
-#: ../../mod/api.php:105 ../../mod/settings.php:937 ../../mod/settings.php:942
-#: ../../mod/settings.php:1025 ../../mod/profiles.php:591
+#: ../../mod/api.php:105 ../../mod/settings.php:942 ../../mod/settings.php:947
+#: ../../mod/settings.php:1030 ../../mod/profiles.php:591
 #: ../../mod/admin.php:392
 msgid "Yes"
 msgstr ""
 
-#: ../../mod/api.php:106 ../../mod/settings.php:937 ../../mod/settings.php:942
-#: ../../mod/settings.php:1025 ../../mod/profiles.php:592
+#: ../../mod/api.php:106 ../../mod/settings.php:942 ../../mod/settings.php:947
+#: ../../mod/settings.php:1030 ../../mod/profiles.php:592
 #: ../../mod/admin.php:390
 msgid "No"
 msgstr ""
@@ -4558,7 +4558,7 @@ msgstr ""
 msgid "Leave password fields blank unless changing"
 msgstr ""
 
-#: ../../mod/settings.php:676 ../../mod/settings.php:1006
+#: ../../mod/settings.php:676 ../../mod/settings.php:1011
 msgid "Email Address:"
 msgstr ""
 
@@ -4570,7 +4570,7 @@ msgstr ""
 msgid "Remove this account from this server including all its channels"
 msgstr ""
 
-#: ../../mod/settings.php:679 ../../mod/settings.php:1088
+#: ../../mod/settings.php:679 ../../mod/settings.php:1093
 msgid "Warning: This action is permanent and cannot be reversed."
 msgstr ""
 
@@ -4594,389 +4594,393 @@ msgstr ""
 msgid "No special theme for mobile devices"
 msgstr ""
 
-#: ../../mod/settings.php:767
+#: ../../mod/settings.php:769
 #, php-format
 msgid "%s - (Experimental)"
 msgstr ""
 
-#: ../../mod/settings.php:803
+#: ../../mod/settings.php:773 ../../mod/admin.php:363
+msgid "mobile"
+msgstr ""
+
+#: ../../mod/settings.php:808
 msgid "Display Settings"
 msgstr ""
 
-#: ../../mod/settings.php:809
+#: ../../mod/settings.php:814
 msgid "Display Theme:"
 msgstr ""
 
-#: ../../mod/settings.php:810
+#: ../../mod/settings.php:815
 msgid "Mobile Theme:"
 msgstr ""
 
-#: ../../mod/settings.php:811
+#: ../../mod/settings.php:816
 msgid "Enable user zoom on mobile devices"
 msgstr ""
 
-#: ../../mod/settings.php:812
+#: ../../mod/settings.php:817
 msgid "Update browser every xx seconds"
 msgstr ""
 
-#: ../../mod/settings.php:812
+#: ../../mod/settings.php:817
 msgid "Minimum of 10 seconds, no maximum"
 msgstr ""
 
-#: ../../mod/settings.php:813
+#: ../../mod/settings.php:818
 msgid "Maximum number of conversations to load at any time:"
 msgstr ""
 
-#: ../../mod/settings.php:813
+#: ../../mod/settings.php:818
 msgid "Maximum of 100 items"
 msgstr ""
 
-#: ../../mod/settings.php:814
+#: ../../mod/settings.php:819
 msgid "Don't show emoticons"
 msgstr ""
 
-#: ../../mod/settings.php:815
+#: ../../mod/settings.php:820
 msgid "Link post titles to source"
 msgstr ""
 
-#: ../../mod/settings.php:816
+#: ../../mod/settings.php:821
 msgid "System Page Layout Editor - (advanced)"
 msgstr ""
 
-#: ../../mod/settings.php:819
+#: ../../mod/settings.php:824
 msgid "Use blog/list mode on channel page"
 msgstr ""
 
-#: ../../mod/settings.php:819 ../../mod/settings.php:820
+#: ../../mod/settings.php:824 ../../mod/settings.php:825
 msgid "(comments displayed separately)"
 msgstr ""
 
-#: ../../mod/settings.php:820
+#: ../../mod/settings.php:825
 msgid "Use blog/list mode on matrix page"
 msgstr ""
 
-#: ../../mod/settings.php:821
+#: ../../mod/settings.php:826
 msgid "Channel page max height of content (in pixels)"
 msgstr ""
 
-#: ../../mod/settings.php:821 ../../mod/settings.php:822
+#: ../../mod/settings.php:826 ../../mod/settings.php:827
 msgid "click to expand content exceeding this height"
 msgstr ""
 
-#: ../../mod/settings.php:822
+#: ../../mod/settings.php:827
 msgid "Matrix page max height of content (in pixels)"
 msgstr ""
 
-#: ../../mod/settings.php:856
+#: ../../mod/settings.php:861
 msgid "Nobody except yourself"
 msgstr ""
 
-#: ../../mod/settings.php:857
+#: ../../mod/settings.php:862
 msgid "Only those you specifically allow"
 msgstr ""
 
-#: ../../mod/settings.php:858
+#: ../../mod/settings.php:863
 msgid "Approved connections"
 msgstr ""
 
-#: ../../mod/settings.php:859
+#: ../../mod/settings.php:864
 msgid "Any connections"
 msgstr ""
 
-#: ../../mod/settings.php:860
+#: ../../mod/settings.php:865
 msgid "Anybody on this website"
 msgstr ""
 
-#: ../../mod/settings.php:861
+#: ../../mod/settings.php:866
 msgid "Anybody in this network"
 msgstr ""
 
-#: ../../mod/settings.php:862
+#: ../../mod/settings.php:867
 msgid "Anybody authenticated"
 msgstr ""
 
-#: ../../mod/settings.php:863
+#: ../../mod/settings.php:868
 msgid "Anybody on the internet"
 msgstr ""
 
-#: ../../mod/settings.php:937
+#: ../../mod/settings.php:942
 msgid "Publish your default profile in the network directory"
 msgstr ""
 
-#: ../../mod/settings.php:942
+#: ../../mod/settings.php:947
 msgid "Allow us to suggest you as a potential friend to new members?"
 msgstr ""
 
-#: ../../mod/settings.php:946 ../../mod/profile_photo.php:365
+#: ../../mod/settings.php:951 ../../mod/profile_photo.php:365
 msgid "or"
 msgstr ""
 
-#: ../../mod/settings.php:951
+#: ../../mod/settings.php:956
 msgid "Your channel address is"
 msgstr ""
 
-#: ../../mod/settings.php:995
+#: ../../mod/settings.php:1000
 msgid "Channel Settings"
 msgstr ""
 
-#: ../../mod/settings.php:1004
+#: ../../mod/settings.php:1009
 msgid "Basic Settings"
 msgstr ""
 
-#: ../../mod/settings.php:1007
+#: ../../mod/settings.php:1012
 msgid "Your Timezone:"
 msgstr ""
 
-#: ../../mod/settings.php:1008
+#: ../../mod/settings.php:1013
 msgid "Default Post Location:"
 msgstr ""
 
-#: ../../mod/settings.php:1008
+#: ../../mod/settings.php:1013
 msgid "Geographical location to display on your posts"
 msgstr ""
 
-#: ../../mod/settings.php:1009
+#: ../../mod/settings.php:1014
 msgid "Use Browser Location:"
 msgstr ""
 
-#: ../../mod/settings.php:1011
+#: ../../mod/settings.php:1016
 msgid "Adult Content"
 msgstr ""
 
-#: ../../mod/settings.php:1011
+#: ../../mod/settings.php:1016
 msgid ""
 "This channel frequently or regularly publishes adult content. (Please tag "
 "any adult material and/or nudity with #NSFW)"
 msgstr ""
 
-#: ../../mod/settings.php:1013
+#: ../../mod/settings.php:1018
 msgid "Security and Privacy Settings"
 msgstr ""
 
-#: ../../mod/settings.php:1015
+#: ../../mod/settings.php:1020
 msgid "Your permissions are already configured. Click to view/adjust"
 msgstr ""
 
-#: ../../mod/settings.php:1017
+#: ../../mod/settings.php:1022
 msgid "Hide my online presence"
 msgstr ""
 
-#: ../../mod/settings.php:1017
+#: ../../mod/settings.php:1022
 msgid "Prevents displaying in your profile that you are online"
 msgstr ""
 
-#: ../../mod/settings.php:1019
+#: ../../mod/settings.php:1024
 msgid "Simple Privacy Settings:"
 msgstr ""
 
-#: ../../mod/settings.php:1020
+#: ../../mod/settings.php:1025
 msgid ""
 "Very Public - <em>extremely permissive (should be used with caution)</em>"
 msgstr ""
 
-#: ../../mod/settings.php:1021
+#: ../../mod/settings.php:1026
 msgid ""
 "Typical - <em>default public, privacy when desired (similar to social "
 "network permissions but with improved privacy)</em>"
 msgstr ""
 
-#: ../../mod/settings.php:1022
+#: ../../mod/settings.php:1027
 msgid "Private - <em>default private, never open or public</em>"
 msgstr ""
 
-#: ../../mod/settings.php:1023
+#: ../../mod/settings.php:1028
 msgid "Blocked - <em>default blocked to/from everybody</em>"
 msgstr ""
 
-#: ../../mod/settings.php:1025
+#: ../../mod/settings.php:1030
 msgid "Allow others to tag your posts"
 msgstr ""
 
-#: ../../mod/settings.php:1025
+#: ../../mod/settings.php:1030
 msgid ""
 "Often used by the community to retro-actively flag inappropriate content"
 msgstr ""
 
-#: ../../mod/settings.php:1027
+#: ../../mod/settings.php:1032
 msgid "Advanced Privacy Settings"
 msgstr ""
 
-#: ../../mod/settings.php:1029
+#: ../../mod/settings.php:1034
 msgid "Expire other channel content after this many days"
 msgstr ""
 
-#: ../../mod/settings.php:1029
+#: ../../mod/settings.php:1034
 msgid "0 or blank prevents expiration"
 msgstr ""
 
-#: ../../mod/settings.php:1030
+#: ../../mod/settings.php:1035
 msgid "Maximum Friend Requests/Day:"
 msgstr ""
 
-#: ../../mod/settings.php:1030
+#: ../../mod/settings.php:1035
 msgid "May reduce spam activity"
 msgstr ""
 
-#: ../../mod/settings.php:1031
+#: ../../mod/settings.php:1036
 msgid "Default Post Permissions"
 msgstr ""
 
-#: ../../mod/settings.php:1036
+#: ../../mod/settings.php:1041
 msgid "Channel permissions category:"
 msgstr ""
 
-#: ../../mod/settings.php:1044
+#: ../../mod/settings.php:1049
 msgid "Maximum private messages per day from unknown people:"
 msgstr ""
 
-#: ../../mod/settings.php:1044
+#: ../../mod/settings.php:1049
 msgid "Useful to reduce spamming"
 msgstr ""
 
-#: ../../mod/settings.php:1047
+#: ../../mod/settings.php:1052
 msgid "Notification Settings"
 msgstr ""
 
-#: ../../mod/settings.php:1048
+#: ../../mod/settings.php:1053
 msgid "By default post a status message when:"
 msgstr ""
 
-#: ../../mod/settings.php:1049
+#: ../../mod/settings.php:1054
 msgid "accepting a friend request"
 msgstr ""
 
-#: ../../mod/settings.php:1050
+#: ../../mod/settings.php:1055
 msgid "joining a forum/community"
 msgstr ""
 
-#: ../../mod/settings.php:1051
+#: ../../mod/settings.php:1056
 msgid "making an <em>interesting</em> profile change"
 msgstr ""
 
-#: ../../mod/settings.php:1052
+#: ../../mod/settings.php:1057
 msgid "Send a notification email when:"
 msgstr ""
 
-#: ../../mod/settings.php:1053
+#: ../../mod/settings.php:1058
 msgid "You receive a connection request"
 msgstr ""
 
-#: ../../mod/settings.php:1054
+#: ../../mod/settings.php:1059
 msgid "Your connections are confirmed"
 msgstr ""
 
-#: ../../mod/settings.php:1055
+#: ../../mod/settings.php:1060
 msgid "Someone writes on your profile wall"
 msgstr ""
 
-#: ../../mod/settings.php:1056
+#: ../../mod/settings.php:1061
 msgid "Someone writes a followup comment"
 msgstr ""
 
-#: ../../mod/settings.php:1057
+#: ../../mod/settings.php:1062
 msgid "You receive a private message"
 msgstr ""
 
-#: ../../mod/settings.php:1058
+#: ../../mod/settings.php:1063
 msgid "You receive a friend suggestion"
 msgstr ""
 
-#: ../../mod/settings.php:1059
+#: ../../mod/settings.php:1064
 msgid "You are tagged in a post"
 msgstr ""
 
-#: ../../mod/settings.php:1060
+#: ../../mod/settings.php:1065
 msgid "You are poked/prodded/etc. in a post"
 msgstr ""
 
-#: ../../mod/settings.php:1063
+#: ../../mod/settings.php:1068
 msgid "Show visual notifications including:"
 msgstr ""
 
-#: ../../mod/settings.php:1065
+#: ../../mod/settings.php:1070
 msgid "Unseen matrix activity"
 msgstr ""
 
-#: ../../mod/settings.php:1066
+#: ../../mod/settings.php:1071
 msgid "Unseen channel activity"
 msgstr ""
 
-#: ../../mod/settings.php:1067
+#: ../../mod/settings.php:1072
 msgid "Unseen private messages"
 msgstr ""
 
-#: ../../mod/settings.php:1067 ../../mod/settings.php:1072
-#: ../../mod/settings.php:1073 ../../mod/settings.php:1074
+#: ../../mod/settings.php:1072 ../../mod/settings.php:1077
+#: ../../mod/settings.php:1078 ../../mod/settings.php:1079
 msgid "Recommended"
 msgstr ""
 
-#: ../../mod/settings.php:1068
+#: ../../mod/settings.php:1073
 msgid "Upcoming events"
 msgstr ""
 
-#: ../../mod/settings.php:1069
+#: ../../mod/settings.php:1074
 msgid "Events today"
 msgstr ""
 
-#: ../../mod/settings.php:1070
+#: ../../mod/settings.php:1075
 msgid "Upcoming birthdays"
 msgstr ""
 
-#: ../../mod/settings.php:1070
+#: ../../mod/settings.php:1075
 msgid "Not available in all themes"
 msgstr ""
 
-#: ../../mod/settings.php:1071
+#: ../../mod/settings.php:1076
 msgid "System (personal) notifications"
 msgstr ""
 
-#: ../../mod/settings.php:1072
+#: ../../mod/settings.php:1077
 msgid "System info messages"
 msgstr ""
 
-#: ../../mod/settings.php:1073
+#: ../../mod/settings.php:1078
 msgid "System critical alerts"
 msgstr ""
 
-#: ../../mod/settings.php:1074
+#: ../../mod/settings.php:1079
 msgid "New connections"
 msgstr ""
 
-#: ../../mod/settings.php:1075
+#: ../../mod/settings.php:1080
 msgid "System Registrations"
 msgstr ""
 
-#: ../../mod/settings.php:1077
+#: ../../mod/settings.php:1082
 msgid "Notify me of events this many days in advance"
 msgstr ""
 
-#: ../../mod/settings.php:1077
+#: ../../mod/settings.php:1082
 msgid "Must be greater than 0"
 msgstr ""
 
-#: ../../mod/settings.php:1079
+#: ../../mod/settings.php:1084
 msgid "Advanced Account/Page Type Settings"
 msgstr ""
 
-#: ../../mod/settings.php:1080
+#: ../../mod/settings.php:1085
 msgid "Change the behaviour of this account for special situations"
 msgstr ""
 
-#: ../../mod/settings.php:1083
+#: ../../mod/settings.php:1088
 msgid ""
 "Please enable expert mode (in <a href=\"settings/features\">Settings > "
 "Additional features</a>) to adjust!"
 msgstr ""
 
-#: ../../mod/settings.php:1084
+#: ../../mod/settings.php:1089
 msgid "Miscellaneous Settings"
 msgstr ""
 
-#: ../../mod/settings.php:1086
+#: ../../mod/settings.php:1091
 msgid "Personal menu to display in your channel pages"
 msgstr ""
 
-#: ../../mod/settings.php:1087
+#: ../../mod/settings.php:1092
 msgid "Remove this channel"
 msgstr ""
 
@@ -5553,12 +5557,12 @@ msgstr ""
 msgid "View recent posts and comments"
 msgstr ""
 
-#: ../../mod/connedit.php:450 ../../mod/connedit.php:594
+#: ../../mod/connedit.php:450 ../../mod/connedit.php:595
 #: ../../mod/admin.php:732
 msgid "Unblock"
 msgstr ""
 
-#: ../../mod/connedit.php:450 ../../mod/connedit.php:594
+#: ../../mod/connedit.php:450 ../../mod/connedit.php:595
 #: ../../mod/admin.php:731
 msgid "Block"
 msgstr ""
@@ -5567,11 +5571,11 @@ msgstr ""
 msgid "Block or Unblock this connection"
 msgstr ""
 
-#: ../../mod/connedit.php:457 ../../mod/connedit.php:595
+#: ../../mod/connedit.php:457 ../../mod/connedit.php:596
 msgid "Unignore"
 msgstr ""
 
-#: ../../mod/connedit.php:457 ../../mod/connedit.php:595
+#: ../../mod/connedit.php:457 ../../mod/connedit.php:596
 #: ../../mod/notifications.php:51
 msgid "Ignore"
 msgstr ""
@@ -5608,173 +5612,173 @@ msgstr ""
 msgid "Delete this connection"
 msgstr ""
 
-#: ../../mod/connedit.php:522 ../../mod/connedit.php:552
+#: ../../mod/connedit.php:523 ../../mod/connedit.php:553
 msgid "Approve this connection"
 msgstr ""
 
-#: ../../mod/connedit.php:522
+#: ../../mod/connedit.php:523
 msgid "Accept connection to allow communication"
 msgstr ""
 
-#: ../../mod/connedit.php:538
+#: ../../mod/connedit.php:539
 #, php-format
 msgid "Connections: settings for %s"
 msgstr ""
 
-#: ../../mod/connedit.php:539
+#: ../../mod/connedit.php:540
 msgid "Apply these permissions automatically"
 msgstr ""
 
-#: ../../mod/connedit.php:543
+#: ../../mod/connedit.php:544
 msgid "Apply the permissions indicated on this page to all new connections."
 msgstr ""
 
-#: ../../mod/connedit.php:545
+#: ../../mod/connedit.php:546
 msgid "Slide to adjust your degree of friendship"
 msgstr ""
 
-#: ../../mod/connedit.php:551
+#: ../../mod/connedit.php:552
 msgid "inherited"
 msgstr ""
 
-#: ../../mod/connedit.php:553
+#: ../../mod/connedit.php:554
 msgid "Connection has no individual permissions!"
 msgstr ""
 
-#: ../../mod/connedit.php:554
+#: ../../mod/connedit.php:555
 msgid ""
 "This may be appropriate based on your <a href=\"settings\">privacy settings</"
 "a>, though you may wish to review the \"Advanced Permissions\"."
 msgstr ""
 
-#: ../../mod/connedit.php:556
+#: ../../mod/connedit.php:557
 msgid "Profile Visibility"
 msgstr ""
 
-#: ../../mod/connedit.php:557
+#: ../../mod/connedit.php:558
 #, php-format
 msgid ""
 "Please choose the profile you would like to display to %s when viewing your "
 "profile securely."
 msgstr ""
 
-#: ../../mod/connedit.php:558
+#: ../../mod/connedit.php:559
 msgid "Contact Information / Notes"
 msgstr ""
 
-#: ../../mod/connedit.php:559
+#: ../../mod/connedit.php:560
 msgid "Edit contact notes"
 msgstr ""
 
-#: ../../mod/connedit.php:561
+#: ../../mod/connedit.php:562
 msgid "Their Settings"
 msgstr ""
 
-#: ../../mod/connedit.php:562
+#: ../../mod/connedit.php:563
 msgid "My Settings"
 msgstr ""
 
-#: ../../mod/connedit.php:564
+#: ../../mod/connedit.php:565
 msgid "Clear/Disable Automatic Permissions"
 msgstr ""
 
-#: ../../mod/connedit.php:565
+#: ../../mod/connedit.php:566
 msgid "Forum Members"
 msgstr ""
 
-#: ../../mod/connedit.php:566
+#: ../../mod/connedit.php:567
 msgid "Soapbox"
 msgstr ""
 
-#: ../../mod/connedit.php:567
+#: ../../mod/connedit.php:568
 msgid "Full Sharing (typical social network permissions)"
 msgstr ""
 
-#: ../../mod/connedit.php:568
+#: ../../mod/connedit.php:569
 msgid "Cautious Sharing "
 msgstr ""
 
-#: ../../mod/connedit.php:569
+#: ../../mod/connedit.php:570
 msgid "Follow Only"
 msgstr ""
 
-#: ../../mod/connedit.php:570
+#: ../../mod/connedit.php:571
 msgid "Individual Permissions"
 msgstr ""
 
-#: ../../mod/connedit.php:571
+#: ../../mod/connedit.php:572
 msgid ""
 "Some permissions may be inherited from your channel <a href=\"settings"
 "\">privacy settings</a>, which have higher priority than individual "
 "settings. Changing those inherited settings on this page will have no effect."
 msgstr ""
 
-#: ../../mod/connedit.php:572
+#: ../../mod/connedit.php:573
 msgid "Advanced Permissions"
 msgstr ""
 
-#: ../../mod/connedit.php:573
+#: ../../mod/connedit.php:574
 msgid "Simple Permissions (select one and submit)"
 msgstr ""
 
-#: ../../mod/connedit.php:577
+#: ../../mod/connedit.php:578
 #, php-format
 msgid "Visit %s's profile - %s"
 msgstr ""
 
-#: ../../mod/connedit.php:578
+#: ../../mod/connedit.php:579
 msgid "Block/Unblock contact"
 msgstr ""
 
-#: ../../mod/connedit.php:579
+#: ../../mod/connedit.php:580
 msgid "Ignore contact"
 msgstr ""
 
-#: ../../mod/connedit.php:580
+#: ../../mod/connedit.php:581
 msgid "Repair URL settings"
 msgstr ""
 
-#: ../../mod/connedit.php:581
+#: ../../mod/connedit.php:582
 msgid "View conversations"
 msgstr ""
 
-#: ../../mod/connedit.php:583
+#: ../../mod/connedit.php:584
 msgid "Delete contact"
 msgstr ""
 
-#: ../../mod/connedit.php:586
+#: ../../mod/connedit.php:587
 msgid "Last update:"
 msgstr ""
 
-#: ../../mod/connedit.php:588
+#: ../../mod/connedit.php:589
 msgid "Update public posts"
 msgstr ""
 
-#: ../../mod/connedit.php:590
+#: ../../mod/connedit.php:591
 msgid "Update now"
 msgstr ""
 
-#: ../../mod/connedit.php:596
+#: ../../mod/connedit.php:597
 msgid "Currently blocked"
 msgstr ""
 
-#: ../../mod/connedit.php:597
+#: ../../mod/connedit.php:598
 msgid "Currently ignored"
 msgstr ""
 
-#: ../../mod/connedit.php:598
+#: ../../mod/connedit.php:599
 msgid "Currently archived"
 msgstr ""
 
-#: ../../mod/connedit.php:599
+#: ../../mod/connedit.php:600
 msgid "Currently pending"
 msgstr ""
 
-#: ../../mod/connedit.php:600
+#: ../../mod/connedit.php:601
 msgid "Hide this contact from others"
 msgstr ""
 
-#: ../../mod/connedit.php:600
+#: ../../mod/connedit.php:601
 msgid ""
 "Replies/likes to your public posts <strong>may</strong> still be visible"
 msgstr ""
@@ -6259,6 +6263,14 @@ msgstr ""
 msgid "Delete item?"
 msgstr ""
 
+#: ../../mod/help.php:41 ../../mod/help.php:47 ../../mod/help.php:53
+msgid "Help:"
+msgstr ""
+
+#: ../../mod/help.php:67 ../../index.php:238
+msgid "Not Found"
+msgstr ""
+
 #: ../../mod/editwebpage.php:140
 msgid "Edit Webpage"
 msgstr ""
@@ -6435,14 +6447,6 @@ msgstr ""
 msgid "Copy/paste this URL to link file from a web page"
 msgstr ""
 
-#: ../../mod/help.php:41 ../../mod/help.php:47 ../../mod/help.php:53
-msgid "Help:"
-msgstr ""
-
-#: ../../mod/help.php:67 ../../index.php:238
-msgid "Not Found"
-msgstr ""
-
 #: ../../mod/acl.php:245
 msgid "network"
 msgstr ""
@@ -6739,10 +6743,6 @@ msgstr ""
 msgid "Site settings updated."
 msgstr ""
 
-#: ../../mod/admin.php:363
-msgid "mobile"
-msgstr ""
-
 #: ../../mod/admin.php:365
 msgid "experimental"
 msgstr ""
diff --git a/version.inc b/version.inc
index 5af006ab2..01554a171 100644
--- a/version.inc
+++ b/version.inc
@@ -1 +1 @@
-2014-12-03.878
+2014-12-10.885