Merge branch '3.8RC'3.8

author: Mario Vavti <mario@mariovavti.com> 2018-10-19 11:18:28 +0200
committer: Mario Vavti <mario@mariovavti.com> 2018-10-19 11:18:28 +0200
commit: fa9e9510e5d993d183feb942fe74be5fdd07f5cf (patch)
tree: 41fec09f527a9346e043b8099b458a97d81b03ed /util
parent: 32de123db0ac526795a237ff46885fe8a332cbc0 (diff)
parent: 06b3ad1071c755757555baf941e2c0f446f97b21 (diff)
download: volse-hubzilla-fa9e9510e5d993d183feb942fe74be5fdd07f5cf.tar.gz
volse-hubzilla-fa9e9510e5d993d183feb942fe74be5fdd07f5cf.tar.bz2
volse-hubzilla-fa9e9510e5d993d183feb942fe74be5fdd07f5cf.zip
6 files changed, 3132 insertions, 2831 deletions
diff --git a/util/dcp b/util/dcp
index ecef67804..5dd9a8807 100755
--- a/util/dcp
+++ b/util/dcp
@@ -28,7 +28,7 @@ if($argc < 3) {
 	if(strpos($dstfile,'store/') === 0)
 		$dstfile = substr($dstfile,6);
 
-	if(strpos($dstfile,'/'))
+	if(strpos($dstfile,'/')) {
 		$nick = substr($dstfile,0,strpos($dstfile,'/'));
 		$dstfile = substr($dstfile,strlen($nick)+1);
 	}
diff --git a/util/hmessages.po b/util/hmessages.po
index f0ab348ef..d1baafded 100644
--- a/util/hmessages.po
+++ b/util/hmessages.po
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: 3.6RC\n"
+"Project-Id-Version: 3.9.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-07-18 11:47+0200\n"
+"POT-Creation-Date: 2018-10-19 11:04+0200\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"
@@ -150,12 +150,10 @@ msgid "Special - Group Repository"
 msgstr ""
 
 #: ../../Zotlabs/Access/PermissionRoles.php:306
-#: ../../Zotlabs/Module/Cdav.php:1182 ../../Zotlabs/Module/New_channel.php:172
-#: ../../Zotlabs/Module/Settings/Channel.php:496
-#: ../../Zotlabs/Module/Connedit.php:918 ../../Zotlabs/Module/Profiles.php:795
-#: ../../Zotlabs/Module/Register.php:233 ../../include/selectors.php:49
-#: ../../include/selectors.php:66 ../../include/selectors.php:104
-#: ../../include/selectors.php:140 ../../include/event.php:1315
+#: ../../Zotlabs/Module/Cdav.php:1227 ../../Zotlabs/Module/Connedit.php:919
+#: ../../Zotlabs/Module/Profiles.php:795 ../../include/selectors.php:60
+#: ../../include/selectors.php:77 ../../include/selectors.php:115
+#: ../../include/selectors.php:151 ../../include/event.php:1315
 #: ../../include/event.php:1322 ../../include/connections.php:703
 #: ../../include/connections.php:710
 msgid "Other"
@@ -165,22 +163,22 @@ msgstr ""
 msgid "Custom/Expert Mode"
 msgstr ""
 
-#: ../../Zotlabs/Module/Blocks.php:33 ../../Zotlabs/Module/Articles.php:29
+#: ../../Zotlabs/Module/Blocks.php:33 ../../Zotlabs/Module/Articles.php:34
 #: ../../Zotlabs/Module/Editlayout.php:31 ../../Zotlabs/Module/Connect.php:17
 #: ../../Zotlabs/Module/Achievements.php:15 ../../Zotlabs/Module/Hcard.php:12
 #: ../../Zotlabs/Module/Editblock.php:31 ../../Zotlabs/Module/Profile.php:20
 #: ../../Zotlabs/Module/Menu.php:91 ../../Zotlabs/Module/Layouts.php:31
-#: ../../Zotlabs/Module/Editwebpage.php:32 ../../Zotlabs/Module/Cards.php:33
-#: ../../Zotlabs/Module/Webpages.php:33 ../../Zotlabs/Module/Filestorage.php:51
-#: ../../include/channel.php:1197
+#: ../../Zotlabs/Module/Editwebpage.php:32 ../../Zotlabs/Module/Cards.php:37
+#: ../../Zotlabs/Module/Webpages.php:39 ../../Zotlabs/Module/Filestorage.php:51
+#: ../../addon/gallery/Mod_Gallery.php:47 ../../include/channel.php:1204
 msgid "Requested profile is not available."
 msgstr ""
 
 #: ../../Zotlabs/Module/Blocks.php:73 ../../Zotlabs/Module/Blocks.php:80
-#: ../../Zotlabs/Module/Invite.php:17 ../../Zotlabs/Module/Invite.php:94
-#: ../../Zotlabs/Module/Articles.php:68 ../../Zotlabs/Module/Editlayout.php:67
-#: ../../Zotlabs/Module/Editlayout.php:90 ../../Zotlabs/Module/Channel.php:115
-#: ../../Zotlabs/Module/Channel.php:281 ../../Zotlabs/Module/Channel.php:320
+#: ../../Zotlabs/Module/Invite.php:21 ../../Zotlabs/Module/Invite.php:102
+#: ../../Zotlabs/Module/Articles.php:80 ../../Zotlabs/Module/Editlayout.php:67
+#: ../../Zotlabs/Module/Editlayout.php:90 ../../Zotlabs/Module/Channel.php:119
+#: ../../Zotlabs/Module/Channel.php:286 ../../Zotlabs/Module/Channel.php:325
 #: ../../Zotlabs/Module/Settings.php:59 ../../Zotlabs/Module/Locs.php:87
 #: ../../Zotlabs/Module/Mitem.php:129 ../../Zotlabs/Module/Events.php:271
 #: ../../Zotlabs/Module/Appman.php:87 ../../Zotlabs/Module/Regmod.php:20
@@ -189,42 +187,41 @@ msgstr ""
 #: ../../Zotlabs/Module/New_channel.php:130
 #: ../../Zotlabs/Module/Sharedwithme.php:16 ../../Zotlabs/Module/Setup.php:209
 #: ../../Zotlabs/Module/Moderate.php:13
-#: ../../Zotlabs/Module/Settings/Features.php:38
 #: ../../Zotlabs/Module/Achievements.php:34 ../../Zotlabs/Module/Thing.php:280
 #: ../../Zotlabs/Module/Thing.php:300 ../../Zotlabs/Module/Thing.php:341
 #: ../../Zotlabs/Module/Api.php:24 ../../Zotlabs/Module/Editblock.php:67
 #: ../../Zotlabs/Module/Profile.php:85 ../../Zotlabs/Module/Profile.php:101
-#: ../../Zotlabs/Module/Mood.php:116 ../../Zotlabs/Module/Connections.php:29
-#: ../../Zotlabs/Module/Viewsrc.php:19 ../../Zotlabs/Module/Bookmarks.php:64
-#: ../../Zotlabs/Module/Photos.php:69 ../../Zotlabs/Module/Wiki.php:50
-#: ../../Zotlabs/Module/Wiki.php:273 ../../Zotlabs/Module/Wiki.php:404
-#: ../../Zotlabs/Module/Pdledit.php:29 ../../Zotlabs/Module/Poke.php:149
+#: ../../Zotlabs/Module/Mood.php:124 ../../Zotlabs/Module/Connections.php:32
+#: ../../Zotlabs/Module/Viewsrc.php:19 ../../Zotlabs/Module/Bookmarks.php:70
+#: ../../Zotlabs/Module/Photos.php:69 ../../Zotlabs/Module/Wiki.php:59
+#: ../../Zotlabs/Module/Wiki.php:285 ../../Zotlabs/Module/Wiki.php:428
+#: ../../Zotlabs/Module/Pdledit.php:34 ../../Zotlabs/Module/Poke.php:157
 #: ../../Zotlabs/Module/Profile_photo.php:302
 #: ../../Zotlabs/Module/Profile_photo.php:315
 #: ../../Zotlabs/Module/Authtest.php:16 ../../Zotlabs/Module/Item.php:229
-#: ../../Zotlabs/Module/Item.php:246 ../../Zotlabs/Module/Item.php:256
-#: ../../Zotlabs/Module/Item.php:1108 ../../Zotlabs/Module/Page.php:34
-#: ../../Zotlabs/Module/Page.php:133 ../../Zotlabs/Module/Connedit.php:389
-#: ../../Zotlabs/Module/Chat.php:100 ../../Zotlabs/Module/Chat.php:105
+#: ../../Zotlabs/Module/Item.php:248 ../../Zotlabs/Module/Item.php:258
+#: ../../Zotlabs/Module/Item.php:1110 ../../Zotlabs/Module/Page.php:34
+#: ../../Zotlabs/Module/Page.php:133 ../../Zotlabs/Module/Connedit.php:390
+#: ../../Zotlabs/Module/Chat.php:115 ../../Zotlabs/Module/Chat.php:120
 #: ../../Zotlabs/Module/Menu.php:129 ../../Zotlabs/Module/Menu.php:140
 #: ../../Zotlabs/Module/Layouts.php:71 ../../Zotlabs/Module/Layouts.php:78
 #: ../../Zotlabs/Module/Layouts.php:89 ../../Zotlabs/Module/Cloud.php:40
-#: ../../Zotlabs/Module/Defperms.php:173 ../../Zotlabs/Module/Group.php:12
-#: ../../Zotlabs/Module/Group.php:24 ../../Zotlabs/Module/Profiles.php:198
+#: ../../Zotlabs/Module/Defperms.php:181 ../../Zotlabs/Module/Group.php:14
+#: ../../Zotlabs/Module/Group.php:30 ../../Zotlabs/Module/Profiles.php:198
 #: ../../Zotlabs/Module/Profiles.php:635
 #: ../../Zotlabs/Module/Editwebpage.php:68
 #: ../../Zotlabs/Module/Editwebpage.php:89
 #: ../../Zotlabs/Module/Editwebpage.php:107
 #: ../../Zotlabs/Module/Editwebpage.php:121 ../../Zotlabs/Module/Manage.php:10
-#: ../../Zotlabs/Module/Cards.php:72 ../../Zotlabs/Module/Webpages.php:118
+#: ../../Zotlabs/Module/Cards.php:81 ../../Zotlabs/Module/Webpages.php:133
 #: ../../Zotlabs/Module/Block.php:24 ../../Zotlabs/Module/Block.php:74
-#: ../../Zotlabs/Module/Editpost.php:17 ../../Zotlabs/Module/Sources.php:77
-#: ../../Zotlabs/Module/Like.php:185 ../../Zotlabs/Module/Suggest.php:28
+#: ../../Zotlabs/Module/Editpost.php:17 ../../Zotlabs/Module/Sources.php:80
+#: ../../Zotlabs/Module/Like.php:185 ../../Zotlabs/Module/Suggest.php:32
 #: ../../Zotlabs/Module/Message.php:18 ../../Zotlabs/Module/Mail.php:146
 #: ../../Zotlabs/Module/Register.php:77
 #: ../../Zotlabs/Module/Cover_photo.php:313
 #: ../../Zotlabs/Module/Cover_photo.php:326
-#: ../../Zotlabs/Module/Display.php:449 ../../Zotlabs/Module/Network.php:15
+#: ../../Zotlabs/Module/Display.php:448 ../../Zotlabs/Module/Network.php:17
 #: ../../Zotlabs/Module/Filestorage.php:15
 #: ../../Zotlabs/Module/Filestorage.php:70
 #: ../../Zotlabs/Module/Filestorage.php:96
@@ -241,7 +238,7 @@ msgstr ""
 #: ../../include/attach.php:393 ../../include/attach.php:400
 #: ../../include/attach.php:482 ../../include/attach.php:1042
 #: ../../include/attach.php:1116 ../../include/attach.php:1281
-#: ../../include/items.php:3653 ../../include/photos.php:27
+#: ../../include/items.php:3675 ../../include/photos.php:27
 msgid "Permission denied."
 msgstr ""
 
@@ -250,7 +247,7 @@ msgstr ""
 msgid "Block Name"
 msgstr ""
 
-#: ../../Zotlabs/Module/Blocks.php:154 ../../include/text.php:2458
+#: ../../Zotlabs/Module/Blocks.php:154 ../../include/text.php:2465
 msgid "Blocks"
 msgstr ""
 
@@ -259,20 +256,20 @@ msgid "Block Title"
 msgstr ""
 
 #: ../../Zotlabs/Module/Blocks.php:157 ../../Zotlabs/Module/Menu.php:177
-#: ../../Zotlabs/Module/Layouts.php:191 ../../Zotlabs/Module/Webpages.php:251
+#: ../../Zotlabs/Module/Layouts.php:191 ../../Zotlabs/Module/Webpages.php:266
 msgid "Created"
 msgstr ""
 
 #: ../../Zotlabs/Module/Blocks.php:158 ../../Zotlabs/Module/Menu.php:178
-#: ../../Zotlabs/Module/Layouts.php:192 ../../Zotlabs/Module/Webpages.php:252
+#: ../../Zotlabs/Module/Layouts.php:192 ../../Zotlabs/Module/Webpages.php:267
 msgid "Edited"
 msgstr ""
 
-#: ../../Zotlabs/Module/Blocks.php:159 ../../Zotlabs/Module/Articles.php:96
-#: ../../Zotlabs/Module/Cdav.php:1185 ../../Zotlabs/Module/New_channel.php:188
-#: ../../Zotlabs/Module/Connedit.php:921 ../../Zotlabs/Module/Menu.php:181
+#: ../../Zotlabs/Module/Blocks.php:159 ../../Zotlabs/Module/Articles.php:108
+#: ../../Zotlabs/Module/Cdav.php:1230 ../../Zotlabs/Module/New_channel.php:189
+#: ../../Zotlabs/Module/Connedit.php:922 ../../Zotlabs/Module/Menu.php:181
 #: ../../Zotlabs/Module/Layouts.php:185 ../../Zotlabs/Module/Profiles.php:798
-#: ../../Zotlabs/Module/Cards.php:100 ../../Zotlabs/Module/Webpages.php:239
+#: ../../Zotlabs/Module/Cards.php:109 ../../Zotlabs/Module/Webpages.php:254
 #: ../../Zotlabs/Storage/Browser.php:276 ../../Zotlabs/Storage/Browser.php:390
 #: ../../Zotlabs/Widget/Cdav.php:128 ../../Zotlabs/Widget/Cdav.php:165
 msgid "Create"
@@ -280,216 +277,255 @@ msgstr ""
 
 #: ../../Zotlabs/Module/Blocks.php:160 ../../Zotlabs/Module/Editlayout.php:114
 #: ../../Zotlabs/Module/Article_edit.php:99
-#: ../../Zotlabs/Module/Admin/Profs.php:175
-#: ../../Zotlabs/Module/Settings/Oauth2.php:150
-#: ../../Zotlabs/Module/Settings/Oauth.php:150
-#: ../../Zotlabs/Module/Thing.php:266 ../../Zotlabs/Module/Editblock.php:114
-#: ../../Zotlabs/Module/Connections.php:281
-#: ../../Zotlabs/Module/Connections.php:319
-#: ../../Zotlabs/Module/Connections.php:339 ../../Zotlabs/Module/Wiki.php:202
-#: ../../Zotlabs/Module/Wiki.php:362 ../../Zotlabs/Module/Menu.php:175
-#: ../../Zotlabs/Module/Layouts.php:193 ../../Zotlabs/Module/Group.php:216
+#: ../../Zotlabs/Module/Admin/Profs.php:175 ../../Zotlabs/Module/Thing.php:266
+#: ../../Zotlabs/Module/Oauth2.php:194 ../../Zotlabs/Module/Editblock.php:114
+#: ../../Zotlabs/Module/Connections.php:284
+#: ../../Zotlabs/Module/Connections.php:322
+#: ../../Zotlabs/Module/Connections.php:342 ../../Zotlabs/Module/Wiki.php:211
+#: ../../Zotlabs/Module/Wiki.php:384 ../../Zotlabs/Module/Menu.php:175
+#: ../../Zotlabs/Module/Layouts.php:193 ../../Zotlabs/Module/Group.php:235
 #: ../../Zotlabs/Module/Editwebpage.php:142
-#: ../../Zotlabs/Module/Webpages.php:240 ../../Zotlabs/Module/Card_edit.php:99
-#: ../../Zotlabs/Lib/Apps.php:475 ../../Zotlabs/Lib/ThreadItem.php:128
-#: ../../Zotlabs/Storage/Browser.php:290 ../../Zotlabs/Widget/Cdav.php:126
-#: ../../Zotlabs/Widget/Cdav.php:162 ../../include/channel.php:1296
-#: ../../include/channel.php:1300 ../../include/menu.php:118
+#: ../../Zotlabs/Module/Webpages.php:255 ../../Zotlabs/Module/Card_edit.php:99
+#: ../../Zotlabs/Module/Oauth.php:173 ../../Zotlabs/Lib/Apps.php:534
+#: ../../Zotlabs/Lib/ThreadItem.php:130 ../../Zotlabs/Storage/Browser.php:290
+#: ../../Zotlabs/Widget/Cdav.php:126 ../../Zotlabs/Widget/Cdav.php:162
+#: ../../include/channel.php:1303 ../../include/channel.php:1307
+#: ../../include/menu.php:118
 msgid "Edit"
 msgstr ""
 
-#: ../../Zotlabs/Module/Blocks.php:161 ../../Zotlabs/Module/Photos.php:1107
-#: ../../Zotlabs/Module/Wiki.php:287 ../../Zotlabs/Module/Layouts.php:194
-#: ../../Zotlabs/Module/Webpages.php:241 ../../Zotlabs/Widget/Cdav.php:124
-#: ../../include/conversation.php:1374
+#: ../../Zotlabs/Module/Blocks.php:161 ../../Zotlabs/Module/Photos.php:1104
+#: ../../Zotlabs/Module/Wiki.php:301 ../../Zotlabs/Module/Layouts.php:194
+#: ../../Zotlabs/Module/Webpages.php:256 ../../Zotlabs/Widget/Cdav.php:124
+#: ../../addon/hsse/hsse.php:186 ../../include/conversation.php:1389
 msgid "Share"
 msgstr ""
 
 #: ../../Zotlabs/Module/Blocks.php:162 ../../Zotlabs/Module/Editlayout.php:138
-#: ../../Zotlabs/Module/Cdav.php:897 ../../Zotlabs/Module/Cdav.php:1187
+#: ../../Zotlabs/Module/Cdav.php:942 ../../Zotlabs/Module/Cdav.php:1232
 #: ../../Zotlabs/Module/Article_edit.php:129
 #: ../../Zotlabs/Module/Admin/Accounts.php:175
 #: ../../Zotlabs/Module/Admin/Channels.php:149
-#: ../../Zotlabs/Module/Admin/Profs.php:176
-#: ../../Zotlabs/Module/Settings/Oauth2.php:151
-#: ../../Zotlabs/Module/Settings/Oauth.php:151
-#: ../../Zotlabs/Module/Thing.php:267 ../../Zotlabs/Module/Editblock.php:139
-#: ../../Zotlabs/Module/Connections.php:289
-#: ../../Zotlabs/Module/Photos.php:1208 ../../Zotlabs/Module/Connedit.php:654
-#: ../../Zotlabs/Module/Connedit.php:923 ../../Zotlabs/Module/Profiles.php:800
+#: ../../Zotlabs/Module/Admin/Profs.php:176 ../../Zotlabs/Module/Thing.php:267
+#: ../../Zotlabs/Module/Oauth2.php:195 ../../Zotlabs/Module/Editblock.php:139
+#: ../../Zotlabs/Module/Connections.php:292
+#: ../../Zotlabs/Module/Photos.php:1205 ../../Zotlabs/Module/Connedit.php:655
+#: ../../Zotlabs/Module/Connedit.php:924 ../../Zotlabs/Module/Profiles.php:800
 #: ../../Zotlabs/Module/Editwebpage.php:167
-#: ../../Zotlabs/Module/Webpages.php:242 ../../Zotlabs/Module/Card_edit.php:129
-#: ../../Zotlabs/Lib/Apps.php:476 ../../Zotlabs/Lib/ThreadItem.php:148
-#: ../../Zotlabs/Storage/Browser.php:291 ../../include/conversation.php:691
-#: ../../include/conversation.php:736
+#: ../../Zotlabs/Module/Webpages.php:257 ../../Zotlabs/Module/Card_edit.php:129
+#: ../../Zotlabs/Module/Oauth.php:174 ../../Zotlabs/Lib/Apps.php:535
+#: ../../Zotlabs/Lib/ThreadItem.php:150 ../../Zotlabs/Storage/Browser.php:291
+#: ../../include/conversation.php:691 ../../include/conversation.php:736
 msgid "Delete"
 msgstr ""
 
-#: ../../Zotlabs/Module/Blocks.php:166 ../../Zotlabs/Module/Events.php:694
-#: ../../Zotlabs/Module/Wiki.php:204 ../../Zotlabs/Module/Layouts.php:198
-#: ../../Zotlabs/Module/Webpages.php:246 ../../Zotlabs/Module/Pubsites.php:60
+#: ../../Zotlabs/Module/Blocks.php:166 ../../Zotlabs/Module/Events.php:695
+#: ../../Zotlabs/Module/Wiki.php:213 ../../Zotlabs/Module/Wiki.php:409
+#: ../../Zotlabs/Module/Layouts.php:198 ../../Zotlabs/Module/Webpages.php:261
+#: ../../Zotlabs/Module/Pubsites.php:60
 msgid "View"
 msgstr ""
 
-#: ../../Zotlabs/Module/Invite.php:29
+#: ../../Zotlabs/Module/Invite.php:37
 msgid "Total invitation limit exceeded."
 msgstr ""
 
-#: ../../Zotlabs/Module/Invite.php:53
+#: ../../Zotlabs/Module/Invite.php:61
 #, php-format
 msgid "%s : Not a valid email address."
 msgstr ""
 
-#: ../../Zotlabs/Module/Invite.php:67
+#: ../../Zotlabs/Module/Invite.php:75
 msgid "Please join us on $Projectname"
 msgstr ""
 
-#: ../../Zotlabs/Module/Invite.php:77
+#: ../../Zotlabs/Module/Invite.php:85
 msgid "Invitation limit exceeded. Please contact your site administrator."
 msgstr ""
 
-#: ../../Zotlabs/Module/Invite.php:82
+#: ../../Zotlabs/Module/Invite.php:90
 #: ../../addon/notifyadmin/notifyadmin.php:40
 #, php-format
 msgid "%s : Message delivery failed."
 msgstr ""
 
-#: ../../Zotlabs/Module/Invite.php:86
+#: ../../Zotlabs/Module/Invite.php:94
 #, php-format
 msgid "%d message sent."
 msgid_plural "%d messages sent."
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../../Zotlabs/Module/Invite.php:107
+#: ../../Zotlabs/Module/Invite.php:110
+msgid "Invite App"
+msgstr ""
+
+#: ../../Zotlabs/Module/Invite.php:110 ../../Zotlabs/Module/Articles.php:43
+#: ../../Zotlabs/Module/Cdav.php:839 ../../Zotlabs/Module/Cdav.php:848
+#: ../../Zotlabs/Module/Permcats.php:62 ../../Zotlabs/Module/Lang.php:17
+#: ../../Zotlabs/Module/Uexport.php:61 ../../Zotlabs/Module/Pubstream.php:20
+#: ../../Zotlabs/Module/Connect.php:104 ../../Zotlabs/Module/Tokens.php:99
+#: ../../Zotlabs/Module/Oauth2.php:106 ../../Zotlabs/Module/Randprof.php:29
+#: ../../Zotlabs/Module/Mood.php:132 ../../Zotlabs/Module/Bookmarks.php:78
+#: ../../Zotlabs/Module/Wiki.php:52 ../../Zotlabs/Module/Pdledit.php:42
+#: ../../Zotlabs/Module/Poke.php:165 ../../Zotlabs/Module/Chat.php:102
+#: ../../Zotlabs/Module/Notes.php:55 ../../Zotlabs/Module/Defperms.php:189
+#: ../../Zotlabs/Module/Group.php:101 ../../Zotlabs/Module/Cards.php:46
+#: ../../Zotlabs/Module/Webpages.php:48 ../../Zotlabs/Module/Sources.php:88
+#: ../../Zotlabs/Module/Suggest.php:40 ../../Zotlabs/Module/Probe.php:18
+#: ../../Zotlabs/Module/Oauth.php:100
+msgid "Not Installed"
+msgstr ""
+
+#: ../../Zotlabs/Module/Invite.php:111
+msgid "Send email invitations to join this network"
+msgstr ""
+
+#: ../../Zotlabs/Module/Invite.php:124
 msgid "You have no more invitations available"
 msgstr ""
 
-#: ../../Zotlabs/Module/Invite.php:138
+#: ../../Zotlabs/Module/Invite.php:155
 msgid "Send invitations"
 msgstr ""
 
-#: ../../Zotlabs/Module/Invite.php:139
+#: ../../Zotlabs/Module/Invite.php:156
 msgid "Enter email addresses, one per line:"
 msgstr ""
 
-#: ../../Zotlabs/Module/Invite.php:140 ../../Zotlabs/Module/Mail.php:285
+#: ../../Zotlabs/Module/Invite.php:157 ../../Zotlabs/Module/Mail.php:285
 msgid "Your message:"
 msgstr ""
 
-#: ../../Zotlabs/Module/Invite.php:141
+#: ../../Zotlabs/Module/Invite.php:158
 msgid "Please join my community on $Projectname."
 msgstr ""
 
-#: ../../Zotlabs/Module/Invite.php:143
+#: ../../Zotlabs/Module/Invite.php:160
 msgid "You will need to supply this invitation code:"
 msgstr ""
 
-#: ../../Zotlabs/Module/Invite.php:144
+#: ../../Zotlabs/Module/Invite.php:161
 msgid "1. Register at any $Projectname location (they are all inter-connected)"
 msgstr ""
 
-#: ../../Zotlabs/Module/Invite.php:146
+#: ../../Zotlabs/Module/Invite.php:163
 msgid "2. Enter my $Projectname network address into the site searchbar."
 msgstr ""
 
-#: ../../Zotlabs/Module/Invite.php:147
+#: ../../Zotlabs/Module/Invite.php:164
 msgid "or visit"
 msgstr ""
 
-#: ../../Zotlabs/Module/Invite.php:149
+#: ../../Zotlabs/Module/Invite.php:166
 msgid "3. Click [Connect]"
 msgstr ""
 
-#: ../../Zotlabs/Module/Invite.php:151 ../../Zotlabs/Module/Locs.php:121
-#: ../../Zotlabs/Module/Mitem.php:259 ../../Zotlabs/Module/Events.php:493
-#: ../../Zotlabs/Module/Appman.php:153
+#: ../../Zotlabs/Module/Invite.php:168 ../../Zotlabs/Module/Permcats.php:128
+#: ../../Zotlabs/Module/Locs.php:121 ../../Zotlabs/Module/Mitem.php:259
+#: ../../Zotlabs/Module/Events.php:495 ../../Zotlabs/Module/Appman.php:155
 #: ../../Zotlabs/Module/Import_items.php:129 ../../Zotlabs/Module/Setup.php:308
-#: ../../Zotlabs/Module/Setup.php:349 ../../Zotlabs/Module/Connect.php:98
+#: ../../Zotlabs/Module/Setup.php:349 ../../Zotlabs/Module/Connect.php:124
 #: ../../Zotlabs/Module/Admin/Features.php:66
 #: ../../Zotlabs/Module/Admin/Accounts.php:168
 #: ../../Zotlabs/Module/Admin/Logs.php:84
 #: ../../Zotlabs/Module/Admin/Channels.php:147
 #: ../../Zotlabs/Module/Admin/Themes.php:158
-#: ../../Zotlabs/Module/Admin/Site.php:309
+#: ../../Zotlabs/Module/Admin/Site.php:289
 #: ../../Zotlabs/Module/Admin/Addons.php:438
 #: ../../Zotlabs/Module/Admin/Profs.php:178
-#: ../../Zotlabs/Module/Admin/Account_edit.php:74
+#: ../../Zotlabs/Module/Admin/Account_edit.php:73
 #: ../../Zotlabs/Module/Admin/Security.php:112
-#: ../../Zotlabs/Module/Settings/Permcats.php:115
-#: ../../Zotlabs/Module/Settings/Channel.php:516
-#: ../../Zotlabs/Module/Settings/Features.php:79
-#: ../../Zotlabs/Module/Settings/Tokens.php:168
-#: ../../Zotlabs/Module/Settings/Oauth2.php:85
-#: ../../Zotlabs/Module/Settings/Account.php:118
+#: ../../Zotlabs/Module/Settings/Channel.php:493
+#: ../../Zotlabs/Module/Settings/Features.php:46
+#: ../../Zotlabs/Module/Settings/Events.php:41
+#: ../../Zotlabs/Module/Settings/Calendar.php:41
+#: ../../Zotlabs/Module/Settings/Conversation.php:48
+#: ../../Zotlabs/Module/Settings/Connections.php:41
+#: ../../Zotlabs/Module/Settings/Photos.php:41
+#: ../../Zotlabs/Module/Settings/Account.php:103
+#: ../../Zotlabs/Module/Settings/Profiles.php:50
+#: ../../Zotlabs/Module/Settings/Manage.php:41
 #: ../../Zotlabs/Module/Settings/Featured.php:54
-#: ../../Zotlabs/Module/Settings/Display.php:192
-#: ../../Zotlabs/Module/Settings/Oauth.php:88
-#: ../../Zotlabs/Module/Thing.php:326 ../../Zotlabs/Module/Thing.php:379
-#: ../../Zotlabs/Module/Import.php:565 ../../Zotlabs/Module/Cal.php:345
-#: ../../Zotlabs/Module/Mood.php:139 ../../Zotlabs/Module/Photos.php:1087
-#: ../../Zotlabs/Module/Photos.php:1127 ../../Zotlabs/Module/Photos.php:1245
-#: ../../Zotlabs/Module/Wiki.php:206 ../../Zotlabs/Module/Pdledit.php:98
-#: ../../Zotlabs/Module/Poke.php:200 ../../Zotlabs/Module/Connedit.php:887
-#: ../../Zotlabs/Module/Chat.php:196 ../../Zotlabs/Module/Chat.php:242
+#: ../../Zotlabs/Module/Settings/Channel_home.php:89
+#: ../../Zotlabs/Module/Settings/Directory.php:41
+#: ../../Zotlabs/Module/Settings/Editor.php:41
+#: ../../Zotlabs/Module/Settings/Display.php:189
+#: ../../Zotlabs/Module/Settings/Network.php:61
+#: ../../Zotlabs/Module/Tokens.php:188 ../../Zotlabs/Module/Thing.php:326
+#: ../../Zotlabs/Module/Thing.php:379 ../../Zotlabs/Module/Import.php:565
+#: ../../Zotlabs/Module/Oauth2.php:116 ../../Zotlabs/Module/Cal.php:344
+#: ../../Zotlabs/Module/Mood.php:156 ../../Zotlabs/Module/Photos.php:1084
+#: ../../Zotlabs/Module/Photos.php:1124 ../../Zotlabs/Module/Photos.php:1242
+#: ../../Zotlabs/Module/Wiki.php:215 ../../Zotlabs/Module/Pdledit.php:107
+#: ../../Zotlabs/Module/Poke.php:217 ../../Zotlabs/Module/Connedit.php:888
+#: ../../Zotlabs/Module/Chat.php:211 ../../Zotlabs/Module/Chat.php:250
 #: ../../Zotlabs/Module/Email_validation.php:40
-#: ../../Zotlabs/Module/Pconfig.php:107 ../../Zotlabs/Module/Defperms.php:249
-#: ../../Zotlabs/Module/Group.php:121 ../../Zotlabs/Module/Group.php:137
+#: ../../Zotlabs/Module/Pconfig.php:111 ../../Zotlabs/Module/Defperms.php:265
+#: ../../Zotlabs/Module/Group.php:140 ../../Zotlabs/Module/Group.php:156
 #: ../../Zotlabs/Module/Profiles.php:723 ../../Zotlabs/Module/Editpost.php:85
-#: ../../Zotlabs/Module/Sources.php:117 ../../Zotlabs/Module/Sources.php:154
+#: ../../Zotlabs/Module/Sources.php:125 ../../Zotlabs/Module/Sources.php:162
 #: ../../Zotlabs/Module/Xchan.php:15 ../../Zotlabs/Module/Mail.php:431
 #: ../../Zotlabs/Module/Filestorage.php:183 ../../Zotlabs/Module/Rate.php:166
-#: ../../Zotlabs/Lib/ThreadItem.php:757 ../../Zotlabs/Widget/Eventstools.php:16
-#: ../../Zotlabs/Widget/Wiki_pages.php:40
-#: ../../Zotlabs/Widget/Wiki_pages.php:97
+#: ../../Zotlabs/Module/Oauth.php:111 ../../Zotlabs/Lib/ThreadItem.php:767
+#: ../../Zotlabs/Widget/Eventstools.php:16
+#: ../../Zotlabs/Widget/Wiki_pages.php:42
+#: ../../Zotlabs/Widget/Wiki_pages.php:99
 #: ../../view/theme/redbasic_c/php/config.php:95
-#: ../../view/theme/redbasic/php/config.php:93
-#: ../../addon/skeleton/skeleton.php:65 ../../addon/gnusoc/gnusoc.php:284
-#: ../../addon/planets/planets.php:153
+#: ../../view/theme/redbasic/php/config.php:94
+#: ../../addon/skeleton/skeleton.php:65 ../../addon/planets/planets.php:153
 #: ../../addon/openclipatar/openclipatar.php:53
-#: ../../addon/wppost/wppost.php:113 ../../addon/nsfw/nsfw.php:92
+#: ../../addon/wppost/Mod_Wppost.php:97 ../../addon/nsfw/Mod_Nsfw.php:61
 #: ../../addon/ijpost/ijpost.php:89 ../../addon/dwpost/dwpost.php:89
 #: ../../addon/likebanner/likebanner.php:57
 #: ../../addon/redphotos/redphotos.php:136 ../../addon/irc/irc.php:53
-#: ../../addon/ljpost/ljpost.php:86 ../../addon/startpage/startpage.php:113
-#: ../../addon/diaspora/diaspora.php:830
-#: ../../addon/rainbowtag/rainbowtag.php:85 ../../addon/hzfiles/hzfiles.php:84
+#: ../../addon/ljpost/ljpost.php:86 ../../addon/startpage/Mod_Startpage.php:73
+#: ../../addon/diaspora/Mod_Diaspora.php:99 ../../addon/hzfiles/hzfiles.php:84
 #: ../../addon/visage/visage.php:170 ../../addon/nsabait/nsabait.php:161
 #: ../../addon/mailtest/mailtest.php:100
 #: ../../addon/openstreetmap/openstreetmap.php:168
 #: ../../addon/fuzzloc/fuzzloc.php:191 ../../addon/rtof/rtof.php:101
 #: ../../addon/jappixmini/jappixmini.php:371
-#: ../../addon/superblock/superblock.php:120 ../../addon/nofed/nofed.php:80
-#: ../../addon/redred/redred.php:119 ../../addon/logrot/logrot.php:35
-#: ../../addon/frphotos/frphotos.php:97 ../../addon/pubcrawl/pubcrawl.php:1159
+#: ../../addon/channelreputation/channelreputation.php:139
+#: ../../addon/nofed/nofed.php:80 ../../addon/redred/redred.php:119
+#: ../../addon/logrot/logrot.php:35 ../../addon/frphotos/frphotos.php:97
+#: ../../addon/pubcrawl/Mod_Pubcrawl.php:63
 #: ../../addon/chords/Mod_Chords.php:60 ../../addon/libertree/libertree.php:85
 #: ../../addon/flattrwidget/flattrwidget.php:124
 #: ../../addon/statusnet/statusnet.php:322
 #: ../../addon/statusnet/statusnet.php:380
 #: ../../addon/statusnet/statusnet.php:432
-#: ../../addon/statusnet/statusnet.php:900 ../../addon/twitter/twitter.php:218
-#: ../../addon/twitter/twitter.php:265
-#: ../../addon/smileybutton/smileybutton.php:219 ../../addon/cart/cart.php:1251
-#: ../../addon/cart/submodules/paypalbutton.php:144
-#: ../../addon/cart/submodules/hzservices.php:78
-#: ../../addon/cart/submodules/hzservices.php:647
+#: ../../addon/statusnet/statusnet.php:900 ../../addon/twitter/twitter.php:221
+#: ../../addon/twitter/twitter.php:268
+#: ../../addon/smileybutton/smileybutton.php:219
+#: ../../addon/cart/Settings/Cart.php:114 ../../addon/cart/cart.php:1263
+#: ../../addon/cart/submodules/manualcat.php:248
+#: ../../addon/cart/submodules/hzservices.php:640
+#: ../../addon/cart/submodules/subscriptions.php:410
 #: ../../addon/piwik/piwik.php:95 ../../addon/pageheader/pageheader.php:48
-#: ../../addon/authchoose/authchoose.php:71 ../../addon/xmpp/xmpp.php:69
-#: ../../addon/pumpio/pumpio.php:237 ../../addon/redfiles/redfiles.php:124
-#: ../../addon/hubwall/hubwall.php:95 ../../include/js_strings.php:22
+#: ../../addon/xmpp/xmpp.php:69 ../../addon/pumpio/pumpio.php:237
+#: ../../addon/redfiles/redfiles.php:124 ../../addon/hubwall/hubwall.php:95
+#: ../../include/js_strings.php:22
 msgid "Submit"
 msgstr ""
 
-#: ../../Zotlabs/Module/Articles.php:38 ../../Zotlabs/Module/Articles.php:191
-#: ../../Zotlabs/Lib/Apps.php:292 ../../include/features.php:133
-#: ../../include/nav.php:461
-msgid "Articles"
+#: ../../Zotlabs/Module/Articles.php:43
+msgid "Articles App"
+msgstr ""
+
+#: ../../Zotlabs/Module/Articles.php:44
+msgid "Create interactive articles"
 msgstr ""
 
-#: ../../Zotlabs/Module/Articles.php:95
+#: ../../Zotlabs/Module/Articles.php:107
 msgid "Add Article"
 msgstr ""
 
+#: ../../Zotlabs/Module/Articles.php:214 ../../Zotlabs/Lib/Apps.php:302
+#: ../../include/nav.php:482
+msgid "Articles"
+msgstr ""
+
 #: ../../Zotlabs/Module/Editlayout.php:79
 #: ../../Zotlabs/Module/Article_edit.php:17
 #: ../../Zotlabs/Module/Article_edit.php:33
@@ -512,32 +548,31 @@ msgstr ""
 msgid "Edit Layout"
 msgstr ""
 
-#: ../../Zotlabs/Module/Editlayout.php:140 ../../Zotlabs/Module/Cdav.php:899
-#: ../../Zotlabs/Module/Cdav.php:1188 ../../Zotlabs/Module/Article_edit.php:131
+#: ../../Zotlabs/Module/Editlayout.php:140 ../../Zotlabs/Module/Cdav.php:944
+#: ../../Zotlabs/Module/Cdav.php:1233 ../../Zotlabs/Module/Article_edit.php:131
 #: ../../Zotlabs/Module/Admin/Addons.php:423
-#: ../../Zotlabs/Module/Settings/Oauth2.php:86
-#: ../../Zotlabs/Module/Settings/Oauth2.php:114
-#: ../../Zotlabs/Module/Settings/Oauth.php:89
-#: ../../Zotlabs/Module/Settings/Oauth.php:115
-#: ../../Zotlabs/Module/Editblock.php:141 ../../Zotlabs/Module/Wiki.php:347
-#: ../../Zotlabs/Module/Wiki.php:379 ../../Zotlabs/Module/Profile_photo.php:465
-#: ../../Zotlabs/Module/Connedit.php:924 ../../Zotlabs/Module/Fbrowser.php:66
+#: ../../Zotlabs/Module/Oauth2.php:117 ../../Zotlabs/Module/Oauth2.php:145
+#: ../../Zotlabs/Module/Editblock.php:141 ../../Zotlabs/Module/Wiki.php:368
+#: ../../Zotlabs/Module/Wiki.php:401 ../../Zotlabs/Module/Profile_photo.php:465
+#: ../../Zotlabs/Module/Connedit.php:925 ../../Zotlabs/Module/Fbrowser.php:66
 #: ../../Zotlabs/Module/Fbrowser.php:88 ../../Zotlabs/Module/Profiles.php:801
 #: ../../Zotlabs/Module/Editwebpage.php:169
 #: ../../Zotlabs/Module/Editpost.php:109 ../../Zotlabs/Module/Filer.php:55
 #: ../../Zotlabs/Module/Cover_photo.php:399 ../../Zotlabs/Module/Tagrm.php:15
 #: ../../Zotlabs/Module/Tagrm.php:138 ../../Zotlabs/Module/Card_edit.php:131
-#: ../../include/conversation.php:1397 ../../include/conversation.php:1446
+#: ../../Zotlabs/Module/Oauth.php:112 ../../Zotlabs/Module/Oauth.php:138
+#: ../../addon/hsse/hsse.php:209 ../../addon/hsse/hsse.php:258
+#: ../../include/conversation.php:1412 ../../include/conversation.php:1461
 msgid "Cancel"
 msgstr ""
 
 #: ../../Zotlabs/Module/Profperm.php:28 ../../Zotlabs/Module/Subthread.php:86
 #: ../../Zotlabs/Module/Import_items.php:120 ../../Zotlabs/Module/Cloud.php:126
-#: ../../Zotlabs/Module/Group.php:83 ../../Zotlabs/Module/Dreport.php:10
+#: ../../Zotlabs/Module/Group.php:93 ../../Zotlabs/Module/Dreport.php:10
 #: ../../Zotlabs/Module/Dreport.php:68 ../../Zotlabs/Module/Like.php:296
 #: ../../Zotlabs/Web/WebServer.php:122 ../../addon/redphotos/redphotos.php:119
 #: ../../addon/hzfiles/hzfiles.php:73 ../../addon/frphotos/frphotos.php:82
-#: ../../addon/redfiles/redfiles.php:109 ../../include/items.php:364
+#: ../../addon/redfiles/redfiles.php:109 ../../include/items.php:384
 msgid "Permission denied"
 msgstr ""
 
@@ -549,7 +584,8 @@ msgstr ""
 msgid "Profile Visibility Editor"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profperm.php:113 ../../include/channel.php:1644
+#: ../../Zotlabs/Module/Profperm.php:113 ../../Zotlabs/Lib/Apps.php:337
+#: ../../include/channel.php:1651
 msgid "Profile"
 msgstr ""
 
@@ -562,269 +598,282 @@ msgid "Visible To"
 msgstr ""
 
 #: ../../Zotlabs/Module/Profperm.php:140
-#: ../../Zotlabs/Module/Connections.php:200
+#: ../../Zotlabs/Module/Connections.php:203
 msgid "All Connections"
 msgstr ""
 
-#: ../../Zotlabs/Module/Cdav.php:785
+#: ../../Zotlabs/Module/Cdav.php:810
 msgid "INVALID EVENT DISMISSED!"
 msgstr ""
 
-#: ../../Zotlabs/Module/Cdav.php:786
+#: ../../Zotlabs/Module/Cdav.php:811
 msgid "Summary: "
 msgstr ""
 
-#: ../../Zotlabs/Module/Cdav.php:786 ../../Zotlabs/Module/Cdav.php:787
-#: ../../Zotlabs/Module/Cdav.php:794 ../../Zotlabs/Module/Embedphotos.php:146
-#: ../../Zotlabs/Module/Photos.php:822 ../../Zotlabs/Module/Photos.php:1278
-#: ../../Zotlabs/Lib/Apps.php:819 ../../Zotlabs/Lib/Apps.php:898
-#: ../../Zotlabs/Storage/Browser.php:164 ../../Zotlabs/Widget/Portfolio.php:95
-#: ../../Zotlabs/Widget/Album.php:84 ../../addon/pubcrawl/as.php:961
-#: ../../include/conversation.php:1165
+#: ../../Zotlabs/Module/Cdav.php:811 ../../Zotlabs/Module/Cdav.php:812
+#: ../../Zotlabs/Module/Cdav.php:819 ../../Zotlabs/Module/Embedphotos.php:146
+#: ../../Zotlabs/Module/Photos.php:819 ../../Zotlabs/Module/Photos.php:1275
+#: ../../Zotlabs/Lib/Activity.php:858 ../../Zotlabs/Lib/Apps.php:994
+#: ../../Zotlabs/Lib/Apps.php:1078 ../../Zotlabs/Storage/Browser.php:164
+#: ../../Zotlabs/Widget/Portfolio.php:95 ../../Zotlabs/Widget/Album.php:84
+#: ../../addon/pubcrawl/as.php:963 ../../include/conversation.php:1166
 msgid "Unknown"
 msgstr ""
 
-#: ../../Zotlabs/Module/Cdav.php:787
+#: ../../Zotlabs/Module/Cdav.php:812
 msgid "Date: "
 msgstr ""
 
-#: ../../Zotlabs/Module/Cdav.php:788 ../../Zotlabs/Module/Cdav.php:795
+#: ../../Zotlabs/Module/Cdav.php:813 ../../Zotlabs/Module/Cdav.php:820
 msgid "Reason: "
 msgstr ""
 
-#: ../../Zotlabs/Module/Cdav.php:793
+#: ../../Zotlabs/Module/Cdav.php:818
 msgid "INVALID CARD DISMISSED!"
 msgstr ""
 
-#: ../../Zotlabs/Module/Cdav.php:794
+#: ../../Zotlabs/Module/Cdav.php:819
 msgid "Name: "
 msgstr ""
 
-#: ../../Zotlabs/Module/Cdav.php:868 ../../Zotlabs/Module/Events.php:460
+#: ../../Zotlabs/Module/Cdav.php:839
+msgid "CalDAV App"
+msgstr ""
+
+#: ../../Zotlabs/Module/Cdav.php:840
+msgid "CalDAV capable calendar"
+msgstr ""
+
+#: ../../Zotlabs/Module/Cdav.php:848
+msgid "CardDAV App"
+msgstr ""
+
+#: ../../Zotlabs/Module/Cdav.php:849
+msgid "CalDAV capable addressbook"
+msgstr ""
+
+#: ../../Zotlabs/Module/Cdav.php:913 ../../Zotlabs/Module/Events.php:462
 msgid "Event title"
 msgstr ""
 
-#: ../../Zotlabs/Module/Cdav.php:869 ../../Zotlabs/Module/Events.php:466
+#: ../../Zotlabs/Module/Cdav.php:914 ../../Zotlabs/Module/Events.php:468
 msgid "Start date and time"
 msgstr ""
 
-#: ../../Zotlabs/Module/Cdav.php:869 ../../Zotlabs/Module/Cdav.php:870
+#: ../../Zotlabs/Module/Cdav.php:914 ../../Zotlabs/Module/Cdav.php:915
 msgid "Example: YYYY-MM-DD HH:mm"
 msgstr ""
 
-#: ../../Zotlabs/Module/Cdav.php:870
+#: ../../Zotlabs/Module/Cdav.php:915
 msgid "End date and time"
 msgstr ""
 
-#: ../../Zotlabs/Module/Cdav.php:871 ../../Zotlabs/Module/Events.php:473
-#: ../../Zotlabs/Module/Appman.php:143 ../../Zotlabs/Module/Rbmark.php:101
+#: ../../Zotlabs/Module/Cdav.php:916 ../../Zotlabs/Module/Events.php:475
+#: ../../Zotlabs/Module/Appman.php:145 ../../Zotlabs/Module/Rbmark.php:101
 #: ../../addon/rendezvous/rendezvous.php:173
-#: ../../addon/cart/submodules/hzservices.php:659
+#: ../../addon/cart/submodules/manualcat.php:260
+#: ../../addon/cart/submodules/hzservices.php:652
 msgid "Description"
 msgstr ""
 
-#: ../../Zotlabs/Module/Cdav.php:872 ../../Zotlabs/Module/Locs.php:117
-#: ../../Zotlabs/Module/Events.php:475 ../../Zotlabs/Module/Profiles.php:509
+#: ../../Zotlabs/Module/Cdav.php:917 ../../Zotlabs/Module/Locs.php:117
+#: ../../Zotlabs/Module/Events.php:477 ../../Zotlabs/Module/Profiles.php:509
 #: ../../Zotlabs/Module/Profiles.php:734 ../../Zotlabs/Module/Pubsites.php:52
 #: ../../include/js_strings.php:25
 msgid "Location"
 msgstr ""
 
-#: ../../Zotlabs/Module/Cdav.php:879 ../../Zotlabs/Module/Events.php:689
-#: ../../Zotlabs/Module/Events.php:698 ../../Zotlabs/Module/Cal.php:339
-#: ../../Zotlabs/Module/Cal.php:346 ../../Zotlabs/Module/Photos.php:976
+#: ../../Zotlabs/Module/Cdav.php:924 ../../Zotlabs/Module/Events.php:690
+#: ../../Zotlabs/Module/Events.php:699 ../../Zotlabs/Module/Cal.php:338
+#: ../../Zotlabs/Module/Cal.php:345 ../../Zotlabs/Module/Photos.php:973
 msgid "Previous"
 msgstr ""
 
-#: ../../Zotlabs/Module/Cdav.php:880 ../../Zotlabs/Module/Events.php:690
-#: ../../Zotlabs/Module/Events.php:699 ../../Zotlabs/Module/Setup.php:263
-#: ../../Zotlabs/Module/Cal.php:340 ../../Zotlabs/Module/Cal.php:347
-#: ../../Zotlabs/Module/Photos.php:985
+#: ../../Zotlabs/Module/Cdav.php:925 ../../Zotlabs/Module/Events.php:691
+#: ../../Zotlabs/Module/Events.php:700 ../../Zotlabs/Module/Setup.php:263
+#: ../../Zotlabs/Module/Cal.php:339 ../../Zotlabs/Module/Cal.php:346
+#: ../../Zotlabs/Module/Photos.php:982
 msgid "Next"
 msgstr ""
 
-#: ../../Zotlabs/Module/Cdav.php:881 ../../Zotlabs/Module/Events.php:700
-#: ../../Zotlabs/Module/Cal.php:348
+#: ../../Zotlabs/Module/Cdav.php:926 ../../Zotlabs/Module/Events.php:701
+#: ../../Zotlabs/Module/Cal.php:347
 msgid "Today"
 msgstr ""
 
-#: ../../Zotlabs/Module/Cdav.php:882 ../../Zotlabs/Module/Events.php:695
+#: ../../Zotlabs/Module/Cdav.php:927 ../../Zotlabs/Module/Events.php:696
 msgid "Month"
 msgstr ""
 
-#: ../../Zotlabs/Module/Cdav.php:883 ../../Zotlabs/Module/Events.php:696
+#: ../../Zotlabs/Module/Cdav.php:928 ../../Zotlabs/Module/Events.php:697
 msgid "Week"
 msgstr ""
 
-#: ../../Zotlabs/Module/Cdav.php:884 ../../Zotlabs/Module/Events.php:697
+#: ../../Zotlabs/Module/Cdav.php:929 ../../Zotlabs/Module/Events.php:698
 msgid "Day"
 msgstr ""
 
-#: ../../Zotlabs/Module/Cdav.php:885
+#: ../../Zotlabs/Module/Cdav.php:930
 msgid "List month"
 msgstr ""
 
-#: ../../Zotlabs/Module/Cdav.php:886
+#: ../../Zotlabs/Module/Cdav.php:931
 msgid "List week"
 msgstr ""
 
-#: ../../Zotlabs/Module/Cdav.php:887
+#: ../../Zotlabs/Module/Cdav.php:932
 msgid "List day"
 msgstr ""
 
-#: ../../Zotlabs/Module/Cdav.php:894
+#: ../../Zotlabs/Module/Cdav.php:939
 msgid "More"
 msgstr ""
 
-#: ../../Zotlabs/Module/Cdav.php:895
+#: ../../Zotlabs/Module/Cdav.php:940
 msgid "Less"
 msgstr ""
 
-#: ../../Zotlabs/Module/Cdav.php:896
+#: ../../Zotlabs/Module/Cdav.php:941
 msgid "Select calendar"
 msgstr ""
 
-#: ../../Zotlabs/Module/Cdav.php:898
+#: ../../Zotlabs/Module/Cdav.php:943
 msgid "Delete all"
 msgstr ""
 
-#: ../../Zotlabs/Module/Cdav.php:900
+#: ../../Zotlabs/Module/Cdav.php:945
 msgid "Sorry! Editing of recurrent events is not yet implemented."
 msgstr ""
 
-#: ../../Zotlabs/Module/Cdav.php:1170 ../../Zotlabs/Module/Sharedwithme.php:105
+#: ../../Zotlabs/Module/Cdav.php:1215 ../../Zotlabs/Module/Sharedwithme.php:104
 #: ../../Zotlabs/Module/Admin/Channels.php:159
-#: ../../Zotlabs/Module/Settings/Oauth2.php:87
-#: ../../Zotlabs/Module/Settings/Oauth2.php:115
-#: ../../Zotlabs/Module/Settings/Oauth.php:90
-#: ../../Zotlabs/Module/Settings/Oauth.php:116
-#: ../../Zotlabs/Module/Wiki.php:209 ../../Zotlabs/Module/Connedit.php:906
-#: ../../Zotlabs/Module/Chat.php:251 ../../Zotlabs/Module/Group.php:125
-#: ../../Zotlabs/Lib/NativeWikiPage.php:558
+#: ../../Zotlabs/Module/Oauth2.php:118 ../../Zotlabs/Module/Oauth2.php:146
+#: ../../Zotlabs/Module/Wiki.php:218 ../../Zotlabs/Module/Connedit.php:907
+#: ../../Zotlabs/Module/Chat.php:259 ../../Zotlabs/Module/Group.php:144
+#: ../../Zotlabs/Module/Oauth.php:113 ../../Zotlabs/Module/Oauth.php:139
+#: ../../Zotlabs/Lib/NativeWikiPage.php:561
 #: ../../Zotlabs/Storage/Browser.php:285
 #: ../../Zotlabs/Widget/Wiki_page_history.php:22
 #: ../../addon/rendezvous/rendezvous.php:172
 msgid "Name"
 msgstr ""
 
-#: ../../Zotlabs/Module/Cdav.php:1171 ../../Zotlabs/Module/Connedit.php:907
+#: ../../Zotlabs/Module/Cdav.php:1216 ../../Zotlabs/Module/Connedit.php:908
 msgid "Organisation"
 msgstr ""
 
-#: ../../Zotlabs/Module/Cdav.php:1172 ../../Zotlabs/Module/Connedit.php:908
+#: ../../Zotlabs/Module/Cdav.php:1217 ../../Zotlabs/Module/Connedit.php:909
 msgid "Title"
 msgstr ""
 
-#: ../../Zotlabs/Module/Cdav.php:1173 ../../Zotlabs/Module/Connedit.php:909
+#: ../../Zotlabs/Module/Cdav.php:1218 ../../Zotlabs/Module/Connedit.php:910
 #: ../../Zotlabs/Module/Profiles.php:786
 msgid "Phone"
 msgstr ""
 
-#: ../../Zotlabs/Module/Cdav.php:1174
+#: ../../Zotlabs/Module/Cdav.php:1219
 #: ../../Zotlabs/Module/Admin/Accounts.php:171
 #: ../../Zotlabs/Module/Admin/Accounts.php:183
-#: ../../Zotlabs/Module/Connedit.php:910 ../../Zotlabs/Module/Profiles.php:787
+#: ../../Zotlabs/Module/Connedit.php:911 ../../Zotlabs/Module/Profiles.php:787
 #: ../../addon/openid/MysqlProvider.php:56
 #: ../../addon/openid/MysqlProvider.php:57 ../../addon/rtof/rtof.php:93
-#: ../../addon/redred/redred.php:107 ../../include/network.php:1769
+#: ../../addon/redred/redred.php:107 ../../include/network.php:1779
 msgid "Email"
 msgstr ""
 
-#: ../../Zotlabs/Module/Cdav.php:1175 ../../Zotlabs/Module/Connedit.php:911
+#: ../../Zotlabs/Module/Cdav.php:1220 ../../Zotlabs/Module/Connedit.php:912
 #: ../../Zotlabs/Module/Profiles.php:788
 msgid "Instant messenger"
 msgstr ""
 
-#: ../../Zotlabs/Module/Cdav.php:1176 ../../Zotlabs/Module/Connedit.php:912
+#: ../../Zotlabs/Module/Cdav.php:1221 ../../Zotlabs/Module/Connedit.php:913
 #: ../../Zotlabs/Module/Profiles.php:789
 msgid "Website"
 msgstr ""
 
-#: ../../Zotlabs/Module/Cdav.php:1177 ../../Zotlabs/Module/Locs.php:118
+#: ../../Zotlabs/Module/Cdav.php:1222 ../../Zotlabs/Module/Locs.php:118
 #: ../../Zotlabs/Module/Admin/Channels.php:160
-#: ../../Zotlabs/Module/Connedit.php:913 ../../Zotlabs/Module/Profiles.php:502
+#: ../../Zotlabs/Module/Connedit.php:914 ../../Zotlabs/Module/Profiles.php:502
 #: ../../Zotlabs/Module/Profiles.php:790
 msgid "Address"
 msgstr ""
 
-#: ../../Zotlabs/Module/Cdav.php:1178 ../../Zotlabs/Module/Connedit.php:914
+#: ../../Zotlabs/Module/Cdav.php:1223 ../../Zotlabs/Module/Connedit.php:915
 #: ../../Zotlabs/Module/Profiles.php:791
 msgid "Note"
 msgstr ""
 
-#: ../../Zotlabs/Module/Cdav.php:1179 ../../Zotlabs/Module/Connedit.php:915
+#: ../../Zotlabs/Module/Cdav.php:1224 ../../Zotlabs/Module/Connedit.php:916
 #: ../../Zotlabs/Module/Profiles.php:792 ../../include/event.php:1308
 #: ../../include/connections.php:696
 msgid "Mobile"
 msgstr ""
 
-#: ../../Zotlabs/Module/Cdav.php:1180 ../../Zotlabs/Module/Connedit.php:916
+#: ../../Zotlabs/Module/Cdav.php:1225 ../../Zotlabs/Module/Connedit.php:917
 #: ../../Zotlabs/Module/Profiles.php:793 ../../include/event.php:1309
 #: ../../include/connections.php:697
 msgid "Home"
 msgstr ""
 
-#: ../../Zotlabs/Module/Cdav.php:1181 ../../Zotlabs/Module/Connedit.php:917
+#: ../../Zotlabs/Module/Cdav.php:1226 ../../Zotlabs/Module/Connedit.php:918
 #: ../../Zotlabs/Module/Profiles.php:794 ../../include/event.php:1312
 #: ../../include/connections.php:700
 msgid "Work"
 msgstr ""
 
-#: ../../Zotlabs/Module/Cdav.php:1183 ../../Zotlabs/Module/Connedit.php:919
+#: ../../Zotlabs/Module/Cdav.php:1228 ../../Zotlabs/Module/Connedit.php:920
 #: ../../Zotlabs/Module/Profiles.php:796
 #: ../../addon/jappixmini/jappixmini.php:368
 msgid "Add Contact"
 msgstr ""
 
-#: ../../Zotlabs/Module/Cdav.php:1184 ../../Zotlabs/Module/Connedit.php:920
+#: ../../Zotlabs/Module/Cdav.php:1229 ../../Zotlabs/Module/Connedit.php:921
 #: ../../Zotlabs/Module/Profiles.php:797
 msgid "Add Field"
 msgstr ""
 
-#: ../../Zotlabs/Module/Cdav.php:1186 ../../Zotlabs/Module/Admin/Addons.php:453
-#: ../../Zotlabs/Module/Settings/Oauth2.php:40
-#: ../../Zotlabs/Module/Settings/Oauth2.php:113
-#: ../../Zotlabs/Module/Settings/Oauth.php:43
-#: ../../Zotlabs/Module/Settings/Oauth.php:114
-#: ../../Zotlabs/Module/Connedit.php:922 ../../Zotlabs/Module/Profiles.php:799
-#: ../../Zotlabs/Lib/Apps.php:456
+#: ../../Zotlabs/Module/Cdav.php:1231 ../../Zotlabs/Module/Admin/Addons.php:453
+#: ../../Zotlabs/Module/Oauth2.php:58 ../../Zotlabs/Module/Oauth2.php:144
+#: ../../Zotlabs/Module/Connedit.php:923 ../../Zotlabs/Module/Profiles.php:799
+#: ../../Zotlabs/Module/Oauth.php:53 ../../Zotlabs/Module/Oauth.php:137
+#: ../../Zotlabs/Lib/Apps.php:513
 msgid "Update"
 msgstr ""
 
-#: ../../Zotlabs/Module/Cdav.php:1189 ../../Zotlabs/Module/Connedit.php:925
+#: ../../Zotlabs/Module/Cdav.php:1234 ../../Zotlabs/Module/Connedit.php:926
 msgid "P.O. Box"
 msgstr ""
 
-#: ../../Zotlabs/Module/Cdav.php:1190 ../../Zotlabs/Module/Connedit.php:926
+#: ../../Zotlabs/Module/Cdav.php:1235 ../../Zotlabs/Module/Connedit.php:927
 msgid "Additional"
 msgstr ""
 
-#: ../../Zotlabs/Module/Cdav.php:1191 ../../Zotlabs/Module/Connedit.php:927
+#: ../../Zotlabs/Module/Cdav.php:1236 ../../Zotlabs/Module/Connedit.php:928
 msgid "Street"
 msgstr ""
 
-#: ../../Zotlabs/Module/Cdav.php:1192 ../../Zotlabs/Module/Connedit.php:928
+#: ../../Zotlabs/Module/Cdav.php:1237 ../../Zotlabs/Module/Connedit.php:929
 msgid "Locality"
 msgstr ""
 
-#: ../../Zotlabs/Module/Cdav.php:1193 ../../Zotlabs/Module/Connedit.php:929
+#: ../../Zotlabs/Module/Cdav.php:1238 ../../Zotlabs/Module/Connedit.php:930
 msgid "Region"
 msgstr ""
 
-#: ../../Zotlabs/Module/Cdav.php:1194 ../../Zotlabs/Module/Connedit.php:930
+#: ../../Zotlabs/Module/Cdav.php:1239 ../../Zotlabs/Module/Connedit.php:931
 msgid "ZIP Code"
 msgstr ""
 
-#: ../../Zotlabs/Module/Cdav.php:1195 ../../Zotlabs/Module/Connedit.php:931
+#: ../../Zotlabs/Module/Cdav.php:1240 ../../Zotlabs/Module/Connedit.php:932
 #: ../../Zotlabs/Module/Profiles.php:757
 msgid "Country"
 msgstr ""
 
-#: ../../Zotlabs/Module/Cdav.php:1242
+#: ../../Zotlabs/Module/Cdav.php:1287
 msgid "Default Calendar"
 msgstr ""
 
-#: ../../Zotlabs/Module/Cdav.php:1252
+#: ../../Zotlabs/Module/Cdav.php:1297
 msgid "Default Addressbook"
 msgstr ""
 
@@ -832,51 +881,125 @@ msgstr ""
 msgid "This site is not a directory server"
 msgstr ""
 
-#: ../../Zotlabs/Module/Channel.php:35 ../../Zotlabs/Module/Ochannel.php:32
-#: ../../Zotlabs/Module/Chat.php:25 ../../addon/chess/chess.php:508
+#: ../../Zotlabs/Module/Permcats.php:28
+msgid "Permission category name is required."
+msgstr ""
+
+#: ../../Zotlabs/Module/Permcats.php:47
+msgid "Permission category saved."
+msgstr ""
+
+#: ../../Zotlabs/Module/Permcats.php:62
+msgid "Permission Categories App"
+msgstr ""
+
+#: ../../Zotlabs/Module/Permcats.php:63
+msgid "Create custom connection permission limits"
+msgstr ""
+
+#: ../../Zotlabs/Module/Permcats.php:79
+msgid ""
+"Use this form to create permission rules for various classes of people or "
+"connections."
+msgstr ""
+
+#: ../../Zotlabs/Module/Permcats.php:112 ../../Zotlabs/Lib/Apps.php:350
+msgid "Permission Categories"
+msgstr ""
+
+#: ../../Zotlabs/Module/Permcats.php:120
+msgid "Permission category name"
+msgstr ""
+
+#: ../../Zotlabs/Module/Permcats.php:121 ../../Zotlabs/Module/Tokens.php:181
+#: ../../Zotlabs/Module/Connedit.php:892 ../../Zotlabs/Module/Defperms.php:266
+msgid "My Settings"
+msgstr ""
+
+#: ../../Zotlabs/Module/Permcats.php:123 ../../Zotlabs/Module/Tokens.php:183
+#: ../../Zotlabs/Module/Connedit.php:887 ../../Zotlabs/Module/Defperms.php:264
+msgid "inherited"
+msgstr ""
+
+#: ../../Zotlabs/Module/Permcats.php:126 ../../Zotlabs/Module/Tokens.php:186
+#: ../../Zotlabs/Module/Connedit.php:894 ../../Zotlabs/Module/Defperms.php:269
+msgid "Individual Permissions"
+msgstr ""
+
+#: ../../Zotlabs/Module/Permcats.php:127 ../../Zotlabs/Module/Tokens.php:187
+#: ../../Zotlabs/Module/Connedit.php:895
+msgid ""
+"Some permissions may be inherited from your channel's <a href=\"settings"
+"\"><strong>privacy settings</strong></a>, which have higher priority than "
+"individual settings. You can <strong>not</strong> change those settings here."
+msgstr ""
+
+#: ../../Zotlabs/Module/Channel.php:39 ../../Zotlabs/Module/Ochannel.php:32
+#: ../../Zotlabs/Module/Chat.php:31 ../../addon/chess/chess.php:508
 msgid "You must be logged in to see this page."
 msgstr ""
 
-#: ../../Zotlabs/Module/Channel.php:50 ../../Zotlabs/Module/Hcard.php:37
+#: ../../Zotlabs/Module/Channel.php:54 ../../Zotlabs/Module/Hcard.php:37
 #: ../../Zotlabs/Module/Profile.php:45
 msgid "Posts and comments"
 msgstr ""
 
-#: ../../Zotlabs/Module/Channel.php:57 ../../Zotlabs/Module/Hcard.php:44
+#: ../../Zotlabs/Module/Channel.php:61 ../../Zotlabs/Module/Hcard.php:44
 #: ../../Zotlabs/Module/Profile.php:52
 msgid "Only posts"
 msgstr ""
 
-#: ../../Zotlabs/Module/Channel.php:112
+#: ../../Zotlabs/Module/Channel.php:116
 msgid "Insufficient permissions.  Request redirected to profile page."
 msgstr ""
 
-#: ../../Zotlabs/Module/Channel.php:129 ../../Zotlabs/Module/Network.php:174
+#: ../../Zotlabs/Module/Channel.php:133 ../../Zotlabs/Module/Network.php:163
 msgid "Search Results For:"
 msgstr ""
 
-#: ../../Zotlabs/Module/Channel.php:164 ../../Zotlabs/Module/Hq.php:134
-#: ../../Zotlabs/Module/Pubstream.php:80 ../../Zotlabs/Module/Display.php:81
-#: ../../Zotlabs/Module/Network.php:204
+#: ../../Zotlabs/Module/Channel.php:168 ../../Zotlabs/Module/Hq.php:134
+#: ../../Zotlabs/Module/Pubstream.php:94 ../../Zotlabs/Module/Display.php:80
+#: ../../Zotlabs/Module/Network.php:193
 msgid "Reset form"
 msgstr ""
 
-#: ../../Zotlabs/Module/Uexport.php:57 ../../Zotlabs/Module/Uexport.php:58
+#: ../../Zotlabs/Module/Channel.php:424 ../../Zotlabs/Module/Display.php:374
+msgid ""
+"You must enable javascript for your browser to be able to view this content."
+msgstr ""
+
+#: ../../Zotlabs/Module/Lang.php:17
+msgid "Language App"
+msgstr ""
+
+#: ../../Zotlabs/Module/Lang.php:18
+msgid "Change UI language"
+msgstr ""
+
+#: ../../Zotlabs/Module/Uexport.php:61
+msgid "Channel Export App"
+msgstr ""
+
+#: ../../Zotlabs/Module/Uexport.php:62
+msgid "Export your channel"
+msgstr ""
+
+#: ../../Zotlabs/Module/Uexport.php:72 ../../Zotlabs/Module/Uexport.php:73
 msgid "Export Channel"
 msgstr ""
 
-#: ../../Zotlabs/Module/Uexport.php:59
+#: ../../Zotlabs/Module/Uexport.php:74
 msgid ""
 "Export your basic channel information to a file.  This acts as a backup of "
 "your connections, permissions, profile and basic data, which can be used to "
 "import your data to a new server hub, but does not contain your content."
 msgstr ""
 
-#: ../../Zotlabs/Module/Uexport.php:60
+#: ../../Zotlabs/Module/Uexport.php:75
 msgid "Export Content"
 msgstr ""
 
-#: ../../Zotlabs/Module/Uexport.php:61
+#: ../../Zotlabs/Module/Uexport.php:76
 msgid ""
 "Export your channel information and recent content to a JSON backup that can "
 "be restored or imported to another server hub. This backs up all of your "
@@ -885,11 +1008,11 @@ msgid ""
 "this download to begin."
 msgstr ""
 
-#: ../../Zotlabs/Module/Uexport.php:63
+#: ../../Zotlabs/Module/Uexport.php:78
 msgid "Export your posts from a given year."
 msgstr ""
 
-#: ../../Zotlabs/Module/Uexport.php:65
+#: ../../Zotlabs/Module/Uexport.php:80
 msgid ""
 "You may also export your posts and conversations for a particular year or "
 "month. Adjust the date in your browser location bar to select other dates. "
@@ -897,21 +1020,21 @@ msgid ""
 "please try again selecting a more limited date range."
 msgstr ""
 
-#: ../../Zotlabs/Module/Uexport.php:66
+#: ../../Zotlabs/Module/Uexport.php:81
 #, php-format
 msgid ""
 "To select all posts for a given year, such as this year, visit <a href=\"%1$s"
 "\">%2$s</a>"
 msgstr ""
 
-#: ../../Zotlabs/Module/Uexport.php:67
+#: ../../Zotlabs/Module/Uexport.php:82
 #, php-format
 msgid ""
 "To select all posts for a given month, such as January of this year, visit "
 "<a href=\"%1$s\">%2$s</a>"
 msgstr ""
 
-#: ../../Zotlabs/Module/Uexport.php:68
+#: ../../Zotlabs/Module/Uexport.php:83
 #, php-format
 msgid ""
 "These content files may be imported or restored by visiting <a href=\"%1$s\">"
@@ -928,17 +1051,17 @@ msgid "You have got no unseen posts..."
 msgstr ""
 
 #: ../../Zotlabs/Module/Search.php:17 ../../Zotlabs/Module/Photos.php:545
-#: ../../Zotlabs/Module/Ratings.php:83 ../../Zotlabs/Module/Directory.php:63
-#: ../../Zotlabs/Module/Directory.php:68 ../../Zotlabs/Module/Display.php:30
+#: ../../Zotlabs/Module/Ratings.php:83 ../../Zotlabs/Module/Directory.php:67
+#: ../../Zotlabs/Module/Directory.php:72 ../../Zotlabs/Module/Display.php:29
 #: ../../Zotlabs/Module/Viewconnections.php:23
 msgid "Public access denied."
 msgstr ""
 
-#: ../../Zotlabs/Module/Search.php:44 ../../Zotlabs/Module/Connections.php:335
-#: ../../Zotlabs/Lib/Apps.php:318 ../../Zotlabs/Widget/Sitesearch.php:31
-#: ../../Zotlabs/Widget/Activity_filter.php:148 ../../include/text.php:1062
-#: ../../include/text.php:1074 ../../include/acl_selectors.php:118
-#: ../../include/nav.php:185
+#: ../../Zotlabs/Module/Search.php:44 ../../Zotlabs/Module/Connections.php:338
+#: ../../Zotlabs/Lib/Apps.php:328 ../../Zotlabs/Widget/Sitesearch.php:31
+#: ../../Zotlabs/Widget/Activity_filter.php:150 ../../include/text.php:1068
+#: ../../include/text.php:1080 ../../include/acl_selectors.php:118
+#: ../../include/nav.php:183
 msgid "Search"
 msgstr ""
 
@@ -952,7 +1075,15 @@ msgstr ""
 msgid "Search results for: %s"
 msgstr ""
 
-#: ../../Zotlabs/Module/Pubstream.php:95
+#: ../../Zotlabs/Module/Pubstream.php:20
+msgid "Public Stream App"
+msgstr ""
+
+#: ../../Zotlabs/Module/Pubstream.php:21
+msgid "The unmoderated public stream of this hub"
+msgstr ""
+
+#: ../../Zotlabs/Module/Pubstream.php:109 ../../Zotlabs/Lib/Apps.php:352
 #: ../../Zotlabs/Widget/Notifications.php:142
 msgid "Public Stream"
 msgstr ""
@@ -1053,7 +1184,7 @@ msgid "Menu Item Permissions"
 msgstr ""
 
 #: ../../Zotlabs/Module/Mitem.php:168 ../../Zotlabs/Module/Mitem.php:247
-#: ../../Zotlabs/Module/Settings/Channel.php:549
+#: ../../Zotlabs/Module/Settings/Channel.php:526
 msgid "(click to open/close)"
 msgstr ""
 
@@ -1075,118 +1206,134 @@ msgstr ""
 
 #: ../../Zotlabs/Module/Mitem.php:176 ../../Zotlabs/Module/Mitem.php:177
 #: ../../Zotlabs/Module/Mitem.php:256 ../../Zotlabs/Module/Mitem.php:257
-#: ../../Zotlabs/Module/Events.php:470 ../../Zotlabs/Module/Events.php:471
-#: ../../Zotlabs/Module/Removeme.php:63 ../../Zotlabs/Module/Admin/Site.php:266
-#: ../../Zotlabs/Module/Settings/Channel.php:315
-#: ../../Zotlabs/Module/Settings/Display.php:100
+#: ../../Zotlabs/Module/Events.php:472 ../../Zotlabs/Module/Events.php:473
+#: ../../Zotlabs/Module/Removeme.php:63 ../../Zotlabs/Module/Admin/Site.php:255
+#: ../../Zotlabs/Module/Settings/Channel.php:309
+#: ../../Zotlabs/Module/Settings/Display.php:89
 #: ../../Zotlabs/Module/Import.php:554 ../../Zotlabs/Module/Import.php:558
 #: ../../Zotlabs/Module/Import.php:559 ../../Zotlabs/Module/Api.php:99
-#: ../../Zotlabs/Module/Photos.php:702 ../../Zotlabs/Module/Wiki.php:218
-#: ../../Zotlabs/Module/Wiki.php:219 ../../Zotlabs/Module/Connedit.php:396
-#: ../../Zotlabs/Module/Connedit.php:779 ../../Zotlabs/Module/Menu.php:162
-#: ../../Zotlabs/Module/Menu.php:221 ../../Zotlabs/Module/Defperms.php:180
-#: ../../Zotlabs/Module/Profiles.php:681 ../../Zotlabs/Module/Sources.php:116
-#: ../../Zotlabs/Module/Sources.php:151
+#: ../../Zotlabs/Module/Photos.php:699 ../../Zotlabs/Module/Wiki.php:227
+#: ../../Zotlabs/Module/Wiki.php:228 ../../Zotlabs/Module/Connedit.php:397
+#: ../../Zotlabs/Module/Connedit.php:780 ../../Zotlabs/Module/Menu.php:162
+#: ../../Zotlabs/Module/Menu.php:221 ../../Zotlabs/Module/Defperms.php:197
+#: ../../Zotlabs/Module/Profiles.php:681 ../../Zotlabs/Module/Sources.php:124
+#: ../../Zotlabs/Module/Sources.php:159
 #: ../../Zotlabs/Module/Filestorage.php:178
-#: ../../Zotlabs/Module/Filestorage.php:186
-#: ../../Zotlabs/Storage/Browser.php:405 ../../boot.php:1618
+#: ../../Zotlabs/Module/Filestorage.php:186 ../../Zotlabs/Lib/Libzotdir.php:162
+#: ../../Zotlabs/Lib/Libzotdir.php:163 ../../Zotlabs/Lib/Libzotdir.php:165
+#: ../../Zotlabs/Storage/Browser.php:405 ../../boot.php:1630
 #: ../../view/theme/redbasic_c/php/config.php:100
 #: ../../view/theme/redbasic_c/php/config.php:115
-#: ../../view/theme/redbasic/php/config.php:98
-#: ../../addon/planets/planets.php:149 ../../addon/wppost/wppost.php:82
-#: ../../addon/wppost/wppost.php:105 ../../addon/wppost/wppost.php:109
-#: ../../addon/nsfw/nsfw.php:84 ../../addon/ijpost/ijpost.php:73
+#: ../../view/theme/redbasic/php/config.php:99
+#: ../../view/theme/redbasic/php/config.php:116
+#: ../../addon/planets/planets.php:149 ../../addon/wppost/Mod_Wppost.php:82
+#: ../../addon/wppost/Mod_Wppost.php:86 ../../addon/ijpost/ijpost.php:73
 #: ../../addon/ijpost/ijpost.php:85 ../../addon/dwpost/dwpost.php:73
 #: ../../addon/dwpost/dwpost.php:85 ../../addon/ljpost/ljpost.php:70
-#: ../../addon/ljpost/ljpost.php:82 ../../addon/rainbowtag/rainbowtag.php:81
-#: ../../addon/visage/visage.php:166 ../../addon/nsabait/nsabait.php:157
-#: ../../addon/fuzzloc/fuzzloc.php:178 ../../addon/rtof/rtof.php:81
-#: ../../addon/rtof/rtof.php:85 ../../addon/jappixmini/jappixmini.php:309
+#: ../../addon/ljpost/ljpost.php:82 ../../addon/visage/visage.php:166
+#: ../../addon/nsabait/nsabait.php:157 ../../addon/fuzzloc/fuzzloc.php:178
+#: ../../addon/rtof/rtof.php:81 ../../addon/rtof/rtof.php:85
+#: ../../addon/jappixmini/jappixmini.php:309
 #: ../../addon/jappixmini/jappixmini.php:313
 #: ../../addon/jappixmini/jappixmini.php:343
 #: ../../addon/jappixmini/jappixmini.php:351
 #: ../../addon/jappixmini/jappixmini.php:355
-#: ../../addon/jappixmini/jappixmini.php:359 ../../addon/nofed/nofed.php:72
-#: ../../addon/nofed/nofed.php:76 ../../addon/redred/redred.php:95
-#: ../../addon/redred/redred.php:99 ../../addon/libertree/libertree.php:69
+#: ../../addon/jappixmini/jappixmini.php:359
+#: ../../addon/channelreputation/channelreputation.php:111
+#: ../../addon/nofed/nofed.php:72 ../../addon/nofed/nofed.php:76
+#: ../../addon/redred/redred.php:95 ../../addon/redred/redred.php:99
+#: ../../addon/libertree/libertree.php:69
 #: ../../addon/libertree/libertree.php:81
 #: ../../addon/flattrwidget/flattrwidget.php:120
 #: ../../addon/statusnet/statusnet.php:389
 #: ../../addon/statusnet/statusnet.php:411
 #: ../../addon/statusnet/statusnet.php:415
-#: ../../addon/statusnet/statusnet.php:424 ../../addon/twitter/twitter.php:243
-#: ../../addon/twitter/twitter.php:252 ../../addon/twitter/twitter.php:261
+#: ../../addon/statusnet/statusnet.php:424 ../../addon/twitter/twitter.php:246
+#: ../../addon/twitter/twitter.php:255 ../../addon/twitter/twitter.php:264
 #: ../../addon/smileybutton/smileybutton.php:211
-#: ../../addon/smileybutton/smileybutton.php:215 ../../addon/cart/cart.php:1206
-#: ../../addon/cart/cart.php:1213 ../../addon/cart/cart.php:1221
-#: ../../addon/cart/submodules/paypalbutton.php:99
-#: ../../addon/cart/submodules/paypalbutton.php:104
-#: ../../addon/cart/submodules/hzservices.php:73
-#: ../../addon/cart/submodules/hzservices.php:653
-#: ../../addon/cart/submodules/hzservices.php:657
-#: ../../addon/authchoose/authchoose.php:67 ../../addon/xmpp/xmpp.php:53
-#: ../../addon/pumpio/pumpio.php:219 ../../addon/pumpio/pumpio.php:223
-#: ../../addon/pumpio/pumpio.php:227 ../../addon/pumpio/pumpio.php:231
-#: ../../include/dir_fns.php:143 ../../include/dir_fns.php:144
-#: ../../include/dir_fns.php:145
+#: ../../addon/smileybutton/smileybutton.php:215
+#: ../../addon/cart/Settings/Cart.php:59 ../../addon/cart/Settings/Cart.php:71
+#: ../../addon/cart/cart.php:1257
+#: ../../addon/cart/submodules/paypalbutton.php:87
+#: ../../addon/cart/submodules/paypalbutton.php:95
+#: ../../addon/cart/submodules/manualcat.php:63
+#: ../../addon/cart/submodules/manualcat.php:254
+#: ../../addon/cart/submodules/manualcat.php:258
+#: ../../addon/cart/submodules/hzservices.php:64
+#: ../../addon/cart/submodules/hzservices.php:646
+#: ../../addon/cart/submodules/hzservices.php:650
+#: ../../addon/cart/submodules/subscriptions.php:153
+#: ../../addon/cart/submodules/subscriptions.php:425
+#: ../../addon/xmpp/xmpp.php:53 ../../addon/pumpio/pumpio.php:219
+#: ../../addon/pumpio/pumpio.php:223 ../../addon/pumpio/pumpio.php:227
+#: ../../addon/pumpio/pumpio.php:231 ../../include/dir_fns.php:143
+#: ../../include/dir_fns.php:144 ../../include/dir_fns.php:145
 msgid "No"
 msgstr ""
 
 #: ../../Zotlabs/Module/Mitem.php:176 ../../Zotlabs/Module/Mitem.php:177
 #: ../../Zotlabs/Module/Mitem.php:256 ../../Zotlabs/Module/Mitem.php:257
-#: ../../Zotlabs/Module/Events.php:470 ../../Zotlabs/Module/Events.php:471
-#: ../../Zotlabs/Module/Removeme.php:63 ../../Zotlabs/Module/Admin/Site.php:268
-#: ../../Zotlabs/Module/Settings/Channel.php:315
-#: ../../Zotlabs/Module/Settings/Display.php:100
+#: ../../Zotlabs/Module/Events.php:472 ../../Zotlabs/Module/Events.php:473
+#: ../../Zotlabs/Module/Removeme.php:63 ../../Zotlabs/Module/Admin/Site.php:257
+#: ../../Zotlabs/Module/Settings/Channel.php:309
+#: ../../Zotlabs/Module/Settings/Display.php:89
 #: ../../Zotlabs/Module/Import.php:554 ../../Zotlabs/Module/Import.php:558
 #: ../../Zotlabs/Module/Import.php:559 ../../Zotlabs/Module/Api.php:98
-#: ../../Zotlabs/Module/Photos.php:702 ../../Zotlabs/Module/Wiki.php:218
-#: ../../Zotlabs/Module/Wiki.php:219 ../../Zotlabs/Module/Connedit.php:396
+#: ../../Zotlabs/Module/Photos.php:699 ../../Zotlabs/Module/Wiki.php:227
+#: ../../Zotlabs/Module/Wiki.php:228 ../../Zotlabs/Module/Connedit.php:397
 #: ../../Zotlabs/Module/Menu.php:162 ../../Zotlabs/Module/Menu.php:221
-#: ../../Zotlabs/Module/Defperms.php:180 ../../Zotlabs/Module/Profiles.php:681
-#: ../../Zotlabs/Module/Sources.php:116 ../../Zotlabs/Module/Sources.php:151
+#: ../../Zotlabs/Module/Defperms.php:197 ../../Zotlabs/Module/Profiles.php:681
+#: ../../Zotlabs/Module/Sources.php:124 ../../Zotlabs/Module/Sources.php:159
 #: ../../Zotlabs/Module/Filestorage.php:178
-#: ../../Zotlabs/Module/Filestorage.php:186
-#: ../../Zotlabs/Storage/Browser.php:405 ../../boot.php:1618
+#: ../../Zotlabs/Module/Filestorage.php:186 ../../Zotlabs/Lib/Libzotdir.php:162
+#: ../../Zotlabs/Lib/Libzotdir.php:163 ../../Zotlabs/Lib/Libzotdir.php:165
+#: ../../Zotlabs/Storage/Browser.php:405 ../../boot.php:1630
 #: ../../view/theme/redbasic_c/php/config.php:100
 #: ../../view/theme/redbasic_c/php/config.php:115
-#: ../../view/theme/redbasic/php/config.php:98
-#: ../../addon/planets/planets.php:149 ../../addon/wppost/wppost.php:82
-#: ../../addon/wppost/wppost.php:105 ../../addon/wppost/wppost.php:109
-#: ../../addon/nsfw/nsfw.php:84 ../../addon/ijpost/ijpost.php:73
+#: ../../view/theme/redbasic/php/config.php:99
+#: ../../view/theme/redbasic/php/config.php:116
+#: ../../addon/planets/planets.php:149 ../../addon/wppost/Mod_Wppost.php:82
+#: ../../addon/wppost/Mod_Wppost.php:86 ../../addon/ijpost/ijpost.php:73
 #: ../../addon/ijpost/ijpost.php:85 ../../addon/dwpost/dwpost.php:73
 #: ../../addon/dwpost/dwpost.php:85 ../../addon/ljpost/ljpost.php:70
-#: ../../addon/ljpost/ljpost.php:82 ../../addon/rainbowtag/rainbowtag.php:81
-#: ../../addon/visage/visage.php:166 ../../addon/nsabait/nsabait.php:157
-#: ../../addon/fuzzloc/fuzzloc.php:178 ../../addon/rtof/rtof.php:81
-#: ../../addon/rtof/rtof.php:85 ../../addon/jappixmini/jappixmini.php:309
+#: ../../addon/ljpost/ljpost.php:82 ../../addon/visage/visage.php:166
+#: ../../addon/nsabait/nsabait.php:157 ../../addon/fuzzloc/fuzzloc.php:178
+#: ../../addon/rtof/rtof.php:81 ../../addon/rtof/rtof.php:85
+#: ../../addon/jappixmini/jappixmini.php:309
 #: ../../addon/jappixmini/jappixmini.php:313
 #: ../../addon/jappixmini/jappixmini.php:343
 #: ../../addon/jappixmini/jappixmini.php:351
 #: ../../addon/jappixmini/jappixmini.php:355
-#: ../../addon/jappixmini/jappixmini.php:359 ../../addon/nofed/nofed.php:72
-#: ../../addon/nofed/nofed.php:76 ../../addon/redred/redred.php:95
-#: ../../addon/redred/redred.php:99 ../../addon/libertree/libertree.php:69
+#: ../../addon/jappixmini/jappixmini.php:359
+#: ../../addon/channelreputation/channelreputation.php:111
+#: ../../addon/nofed/nofed.php:72 ../../addon/nofed/nofed.php:76
+#: ../../addon/redred/redred.php:95 ../../addon/redred/redred.php:99
+#: ../../addon/libertree/libertree.php:69
 #: ../../addon/libertree/libertree.php:81
 #: ../../addon/flattrwidget/flattrwidget.php:120
 #: ../../addon/statusnet/statusnet.php:389
 #: ../../addon/statusnet/statusnet.php:411
 #: ../../addon/statusnet/statusnet.php:415
-#: ../../addon/statusnet/statusnet.php:424 ../../addon/twitter/twitter.php:243
-#: ../../addon/twitter/twitter.php:252 ../../addon/twitter/twitter.php:261
+#: ../../addon/statusnet/statusnet.php:424 ../../addon/twitter/twitter.php:246
+#: ../../addon/twitter/twitter.php:255 ../../addon/twitter/twitter.php:264
 #: ../../addon/smileybutton/smileybutton.php:211
-#: ../../addon/smileybutton/smileybutton.php:215 ../../addon/cart/cart.php:1206
-#: ../../addon/cart/cart.php:1213 ../../addon/cart/cart.php:1221
-#: ../../addon/cart/submodules/paypalbutton.php:99
-#: ../../addon/cart/submodules/paypalbutton.php:104
-#: ../../addon/cart/submodules/hzservices.php:73
-#: ../../addon/cart/submodules/hzservices.php:653
-#: ../../addon/cart/submodules/hzservices.php:657
-#: ../../addon/authchoose/authchoose.php:67 ../../addon/xmpp/xmpp.php:53
-#: ../../addon/pumpio/pumpio.php:219 ../../addon/pumpio/pumpio.php:223
-#: ../../addon/pumpio/pumpio.php:227 ../../addon/pumpio/pumpio.php:231
-#: ../../include/dir_fns.php:143 ../../include/dir_fns.php:144
-#: ../../include/dir_fns.php:145
+#: ../../addon/smileybutton/smileybutton.php:215
+#: ../../addon/cart/Settings/Cart.php:59 ../../addon/cart/Settings/Cart.php:71
+#: ../../addon/cart/cart.php:1257
+#: ../../addon/cart/submodules/paypalbutton.php:87
+#: ../../addon/cart/submodules/paypalbutton.php:95
+#: ../../addon/cart/submodules/manualcat.php:63
+#: ../../addon/cart/submodules/manualcat.php:254
+#: ../../addon/cart/submodules/manualcat.php:258
+#: ../../addon/cart/submodules/hzservices.php:64
+#: ../../addon/cart/submodules/hzservices.php:646
+#: ../../addon/cart/submodules/hzservices.php:650
+#: ../../addon/cart/submodules/subscriptions.php:153
+#: ../../addon/cart/submodules/subscriptions.php:425
+#: ../../addon/xmpp/xmpp.php:53 ../../addon/pumpio/pumpio.php:219
+#: ../../addon/pumpio/pumpio.php:223 ../../addon/pumpio/pumpio.php:227
+#: ../../addon/pumpio/pumpio.php:231 ../../include/dir_fns.php:143
+#: ../../include/dir_fns.php:144 ../../include/dir_fns.php:145
 msgid "Yes"
 msgstr ""
 
@@ -1297,124 +1444,125 @@ msgstr ""
 
 #: ../../Zotlabs/Module/Events.php:260 ../../Zotlabs/Module/Tagger.php:73
 #: ../../Zotlabs/Module/Like.php:386 ../../include/conversation.php:119
-#: ../../include/text.php:2025 ../../include/event.php:1153
+#: ../../include/text.php:2031 ../../include/event.php:1153
 msgid "event"
 msgstr ""
 
-#: ../../Zotlabs/Module/Events.php:460
+#: ../../Zotlabs/Module/Events.php:462
 msgid "Edit event title"
 msgstr ""
 
-#: ../../Zotlabs/Module/Events.php:460 ../../Zotlabs/Module/Events.php:465
-#: ../../Zotlabs/Module/Appman.php:141 ../../Zotlabs/Module/Appman.php:142
+#: ../../Zotlabs/Module/Events.php:462 ../../Zotlabs/Module/Events.php:467
+#: ../../Zotlabs/Module/Appman.php:143 ../../Zotlabs/Module/Appman.php:144
 #: ../../Zotlabs/Module/Profiles.php:745 ../../Zotlabs/Module/Profiles.php:749
 #: ../../include/datetime.php:211
 msgid "Required"
 msgstr ""
 
-#: ../../Zotlabs/Module/Events.php:462
+#: ../../Zotlabs/Module/Events.php:464
 msgid "Categories (comma-separated list)"
 msgstr ""
 
-#: ../../Zotlabs/Module/Events.php:463
+#: ../../Zotlabs/Module/Events.php:465
 msgid "Edit Category"
 msgstr ""
 
-#: ../../Zotlabs/Module/Events.php:463
+#: ../../Zotlabs/Module/Events.php:465
 msgid "Category"
 msgstr ""
 
-#: ../../Zotlabs/Module/Events.php:466
+#: ../../Zotlabs/Module/Events.php:468
 msgid "Edit start date and time"
 msgstr ""
 
-#: ../../Zotlabs/Module/Events.php:467 ../../Zotlabs/Module/Events.php:470
+#: ../../Zotlabs/Module/Events.php:469 ../../Zotlabs/Module/Events.php:472
 msgid "Finish date and time are not known or not relevant"
 msgstr ""
 
-#: ../../Zotlabs/Module/Events.php:469
+#: ../../Zotlabs/Module/Events.php:471
 msgid "Edit finish date and time"
 msgstr ""
 
-#: ../../Zotlabs/Module/Events.php:469
+#: ../../Zotlabs/Module/Events.php:471
 msgid "Finish date and time"
 msgstr ""
 
-#: ../../Zotlabs/Module/Events.php:471 ../../Zotlabs/Module/Events.php:472
+#: ../../Zotlabs/Module/Events.php:473 ../../Zotlabs/Module/Events.php:474
 msgid "Adjust for viewer timezone"
 msgstr ""
 
-#: ../../Zotlabs/Module/Events.php:471
+#: ../../Zotlabs/Module/Events.php:473
 msgid ""
 "Important for events that happen in a particular place. Not practical for "
 "global holidays."
 msgstr ""
 
-#: ../../Zotlabs/Module/Events.php:473
+#: ../../Zotlabs/Module/Events.php:475
 msgid "Edit Description"
 msgstr ""
 
-#: ../../Zotlabs/Module/Events.php:475
+#: ../../Zotlabs/Module/Events.php:477
 msgid "Edit Location"
 msgstr ""
 
-#: ../../Zotlabs/Module/Events.php:478 ../../Zotlabs/Module/Photos.php:1128
-#: ../../Zotlabs/Module/Webpages.php:247 ../../Zotlabs/Lib/ThreadItem.php:767
-#: ../../include/conversation.php:1341
+#: ../../Zotlabs/Module/Events.php:480 ../../Zotlabs/Module/Photos.php:1125
+#: ../../Zotlabs/Module/Webpages.php:262 ../../Zotlabs/Lib/ThreadItem.php:777
+#: ../../addon/hsse/hsse.php:153 ../../include/conversation.php:1356
 msgid "Preview"
 msgstr ""
 
-#: ../../Zotlabs/Module/Events.php:479 ../../include/conversation.php:1413
+#: ../../Zotlabs/Module/Events.php:481 ../../addon/hsse/hsse.php:225
+#: ../../include/conversation.php:1428
 msgid "Permission settings"
 msgstr ""
 
-#: ../../Zotlabs/Module/Events.php:489
+#: ../../Zotlabs/Module/Events.php:491
 msgid "Timezone:"
 msgstr ""
 
-#: ../../Zotlabs/Module/Events.php:494
+#: ../../Zotlabs/Module/Events.php:496
 msgid "Advanced Options"
 msgstr ""
 
-#: ../../Zotlabs/Module/Events.php:605 ../../Zotlabs/Module/Cal.php:266
+#: ../../Zotlabs/Module/Events.php:607 ../../Zotlabs/Module/Cal.php:264
 msgid "l, F j"
 msgstr ""
 
-#: ../../Zotlabs/Module/Events.php:633
+#: ../../Zotlabs/Module/Events.php:635
 msgid "Edit event"
 msgstr ""
 
-#: ../../Zotlabs/Module/Events.php:635
+#: ../../Zotlabs/Module/Events.php:637
 msgid "Delete event"
 msgstr ""
 
-#: ../../Zotlabs/Module/Events.php:660 ../../Zotlabs/Module/Cal.php:315
-#: ../../include/text.php:1844
+#: ../../Zotlabs/Module/Events.php:663 ../../Zotlabs/Module/Cal.php:314
+#: ../../include/text.php:1850
 msgid "Link to Source"
 msgstr ""
 
-#: ../../Zotlabs/Module/Events.php:669
+#: ../../Zotlabs/Module/Events.php:670
 msgid "calendar"
 msgstr ""
 
-#: ../../Zotlabs/Module/Events.php:688 ../../Zotlabs/Module/Cal.php:338
+#: ../../Zotlabs/Module/Events.php:689 ../../Zotlabs/Module/Cal.php:337
 msgid "Edit Event"
 msgstr ""
 
-#: ../../Zotlabs/Module/Events.php:688 ../../Zotlabs/Module/Cal.php:338
+#: ../../Zotlabs/Module/Events.php:689 ../../Zotlabs/Module/Cal.php:337
 msgid "Create Event"
 msgstr ""
 
-#: ../../Zotlabs/Module/Events.php:691 ../../Zotlabs/Module/Cal.php:341
-#: ../../include/channel.php:1647
+#: ../../Zotlabs/Module/Events.php:692 ../../Zotlabs/Module/Cal.php:340
+#: ../../include/channel.php:1654
 msgid "Export"
 msgstr ""
 
-#: ../../Zotlabs/Module/Events.php:731
+#: ../../Zotlabs/Module/Events.php:732
 msgid "Event removed"
 msgstr ""
 
-#: ../../Zotlabs/Module/Events.php:734
+#: ../../Zotlabs/Module/Events.php:735
 msgid "Failed to remove event"
 msgstr ""
 
@@ -1426,47 +1574,47 @@ msgstr ""
 msgid "Malformed app."
 msgstr ""
 
-#: ../../Zotlabs/Module/Appman.php:130
+#: ../../Zotlabs/Module/Appman.php:132
 msgid "Embed code"
 msgstr ""
 
-#: ../../Zotlabs/Module/Appman.php:136
+#: ../../Zotlabs/Module/Appman.php:138
 msgid "Edit App"
 msgstr ""
 
-#: ../../Zotlabs/Module/Appman.php:136
+#: ../../Zotlabs/Module/Appman.php:138
 msgid "Create App"
 msgstr ""
 
-#: ../../Zotlabs/Module/Appman.php:141
+#: ../../Zotlabs/Module/Appman.php:143
 msgid "Name of app"
 msgstr ""
 
-#: ../../Zotlabs/Module/Appman.php:142
+#: ../../Zotlabs/Module/Appman.php:144
 msgid "Location (URL) of app"
 msgstr ""
 
-#: ../../Zotlabs/Module/Appman.php:144
+#: ../../Zotlabs/Module/Appman.php:146
 msgid "Photo icon URL"
 msgstr ""
 
-#: ../../Zotlabs/Module/Appman.php:144
+#: ../../Zotlabs/Module/Appman.php:146
 msgid "80 x 80 pixels - optional"
 msgstr ""
 
-#: ../../Zotlabs/Module/Appman.php:145
+#: ../../Zotlabs/Module/Appman.php:147
 msgid "Categories (optional, comma separated list)"
 msgstr ""
 
-#: ../../Zotlabs/Module/Appman.php:146
+#: ../../Zotlabs/Module/Appman.php:148
 msgid "Version ID"
 msgstr ""
 
-#: ../../Zotlabs/Module/Appman.php:147
+#: ../../Zotlabs/Module/Appman.php:149
 msgid "Price of app"
 msgstr ""
 
-#: ../../Zotlabs/Module/Appman.php:148
+#: ../../Zotlabs/Module/Appman.php:150
 msgid "Location (URL) to purchase app"
 msgstr ""
 
@@ -1479,16 +1627,17 @@ msgid "Hub not found."
 msgstr ""
 
 #: ../../Zotlabs/Module/Subthread.php:111 ../../Zotlabs/Module/Tagger.php:69
-#: ../../Zotlabs/Module/Like.php:384
+#: ../../Zotlabs/Module/Like.php:384 ../../Zotlabs/Lib/Activity.php:1570
 #: ../../addon/redphotos/redphotohelper.php:71
-#: ../../addon/diaspora/Receiver.php:1530 ../../addon/pubcrawl/as.php:1509
-#: ../../include/conversation.php:116 ../../include/text.php:2022
+#: ../../addon/diaspora/Receiver.php:1539 ../../addon/pubcrawl/as.php:1511
+#: ../../include/conversation.php:116 ../../include/text.php:2028
 msgid "photo"
 msgstr ""
 
 #: ../../Zotlabs/Module/Subthread.php:111 ../../Zotlabs/Module/Like.php:384
-#: ../../addon/diaspora/Receiver.php:1530 ../../addon/pubcrawl/as.php:1509
-#: ../../include/conversation.php:144 ../../include/text.php:2028
+#: ../../Zotlabs/Lib/Activity.php:1570 ../../addon/diaspora/Receiver.php:1539
+#: ../../addon/pubcrawl/as.php:1511 ../../include/conversation.php:144
+#: ../../include/text.php:2034
 msgid "status"
 msgstr ""
 
@@ -1502,7 +1651,7 @@ msgstr ""
 msgid "%1$s stopped following %2$s's %3$s"
 msgstr ""
 
-#: ../../Zotlabs/Module/Article_edit.php:44 ../../Zotlabs/Module/Cal.php:62
+#: ../../Zotlabs/Module/Article_edit.php:44 ../../Zotlabs/Module/Cal.php:63
 #: ../../Zotlabs/Module/Chanview.php:96 ../../Zotlabs/Module/Page.php:75
 #: ../../Zotlabs/Module/Wall_upload.php:31 ../../Zotlabs/Module/Block.php:41
 #: ../../Zotlabs/Module/Card_edit.php:44
@@ -1510,17 +1659,17 @@ msgid "Channel not found."
 msgstr ""
 
 #: ../../Zotlabs/Module/Article_edit.php:101
-#: ../../Zotlabs/Module/Editblock.php:116 ../../Zotlabs/Module/Chat.php:207
+#: ../../Zotlabs/Module/Editblock.php:116 ../../Zotlabs/Module/Chat.php:222
 #: ../../Zotlabs/Module/Editwebpage.php:143 ../../Zotlabs/Module/Mail.php:288
 #: ../../Zotlabs/Module/Mail.php:430 ../../Zotlabs/Module/Card_edit.php:101
-#: ../../include/conversation.php:1283
+#: ../../addon/hsse/hsse.php:95 ../../include/conversation.php:1298
 msgid "Insert web link"
 msgstr ""
 
 #: ../../Zotlabs/Module/Article_edit.php:117
-#: ../../Zotlabs/Module/Editblock.php:129 ../../Zotlabs/Module/Photos.php:703
-#: ../../Zotlabs/Module/Photos.php:1073 ../../Zotlabs/Module/Card_edit.php:117
-#: ../../include/conversation.php:1409
+#: ../../Zotlabs/Module/Editblock.php:129 ../../Zotlabs/Module/Photos.php:700
+#: ../../Zotlabs/Module/Photos.php:1070 ../../Zotlabs/Module/Card_edit.php:117
+#: ../../addon/hsse/hsse.php:221 ../../include/conversation.php:1424
 msgid "Title (optional)"
 msgstr ""
 
@@ -1568,75 +1717,75 @@ msgstr ""
 msgid "You have created %1$.0f of %2$.0f allowed channels."
 msgstr ""
 
-#: ../../Zotlabs/Module/New_channel.php:154
-#: ../../Zotlabs/Module/New_channel.php:161
-#: ../../Zotlabs/Module/Connedit.php:852 ../../Zotlabs/Module/Defperms.php:240
-#: ../../Zotlabs/Widget/Notifications.php:162 ../../include/nav.php:276
+#: ../../Zotlabs/Module/New_channel.php:157
+#: ../../Zotlabs/Module/New_channel.php:164
+#: ../../Zotlabs/Module/Connedit.php:853 ../../Zotlabs/Module/Defperms.php:256
+#: ../../Zotlabs/Widget/Notifications.php:162 ../../include/nav.php:293
 msgid "Loading"
 msgstr ""
 
-#: ../../Zotlabs/Module/New_channel.php:156
+#: ../../Zotlabs/Module/New_channel.php:159
 msgid "Your real name is recommended."
 msgstr ""
 
-#: ../../Zotlabs/Module/New_channel.php:157
+#: ../../Zotlabs/Module/New_channel.php:160
 msgid ""
 "Examples: \"Bob Jameson\", \"Lisa and her Horses\", \"Soccer\", \"Aviation "
 "Group\""
 msgstr ""
 
-#: ../../Zotlabs/Module/New_channel.php:162
+#: ../../Zotlabs/Module/New_channel.php:165
 msgid ""
 "This will be used to create a unique network address (like an email address)."
 msgstr ""
 
-#: ../../Zotlabs/Module/New_channel.php:164
+#: ../../Zotlabs/Module/New_channel.php:167
 msgid "Allowed characters are a-z 0-9, - and _"
 msgstr ""
 
-#: ../../Zotlabs/Module/New_channel.php:174
+#: ../../Zotlabs/Module/New_channel.php:175
 msgid "Channel name"
 msgstr ""
 
-#: ../../Zotlabs/Module/New_channel.php:176
-#: ../../Zotlabs/Module/Register.php:265
+#: ../../Zotlabs/Module/New_channel.php:177
+#: ../../Zotlabs/Module/Register.php:260
 msgid "Choose a short nickname"
 msgstr ""
 
-#: ../../Zotlabs/Module/New_channel.php:177
-#: ../../Zotlabs/Module/Settings/Channel.php:560
-#: ../../Zotlabs/Module/Register.php:266
+#: ../../Zotlabs/Module/New_channel.php:178
+#: ../../Zotlabs/Module/Settings/Channel.php:535
+#: ../../Zotlabs/Module/Register.php:261
 msgid "Channel role and privacy"
 msgstr ""
 
-#: ../../Zotlabs/Module/New_channel.php:177
+#: ../../Zotlabs/Module/New_channel.php:178
 msgid ""
 "Select a channel permission role compatible with your usage needs and "
 "privacy requirements."
 msgstr ""
 
-#: ../../Zotlabs/Module/New_channel.php:177
-#: ../../Zotlabs/Module/Register.php:266
+#: ../../Zotlabs/Module/New_channel.php:178
+#: ../../Zotlabs/Module/Register.php:261
 msgid "Read more about channel permission roles"
 msgstr ""
 
-#: ../../Zotlabs/Module/New_channel.php:180
+#: ../../Zotlabs/Module/New_channel.php:181
 msgid "Create a Channel"
 msgstr ""
 
-#: ../../Zotlabs/Module/New_channel.php:181
+#: ../../Zotlabs/Module/New_channel.php:182
 msgid ""
 "A channel is a unique network identity. It can represent a person (social "
 "network profile), a forum (group), a business or celebrity page, a newsfeed, "
 "and many other things."
 msgstr ""
 
-#: ../../Zotlabs/Module/New_channel.php:182
+#: ../../Zotlabs/Module/New_channel.php:183
 msgid ""
 "or <a href=\"import\">import an existing channel</a> from another location."
 msgstr ""
 
-#: ../../Zotlabs/Module/New_channel.php:187
+#: ../../Zotlabs/Module/New_channel.php:188
 msgid "Validate"
 msgstr ""
 
@@ -1682,33 +1831,33 @@ msgid ""
 msgstr ""
 
 #: ../../Zotlabs/Module/Removeme.php:64
-#: ../../Zotlabs/Module/Settings/Channel.php:622
+#: ../../Zotlabs/Module/Settings/Channel.php:594
 msgid "Remove Channel"
 msgstr ""
 
-#: ../../Zotlabs/Module/Sharedwithme.php:104
+#: ../../Zotlabs/Module/Sharedwithme.php:103
 msgid "Files: shared with me"
 msgstr ""
 
-#: ../../Zotlabs/Module/Sharedwithme.php:106
+#: ../../Zotlabs/Module/Sharedwithme.php:105
 msgid "NEW"
 msgstr ""
 
-#: ../../Zotlabs/Module/Sharedwithme.php:107
-#: ../../Zotlabs/Storage/Browser.php:287 ../../include/text.php:1451
+#: ../../Zotlabs/Module/Sharedwithme.php:106
+#: ../../Zotlabs/Storage/Browser.php:287 ../../include/text.php:1457
 msgid "Size"
 msgstr ""
 
-#: ../../Zotlabs/Module/Sharedwithme.php:108
+#: ../../Zotlabs/Module/Sharedwithme.php:107
 #: ../../Zotlabs/Storage/Browser.php:288
 msgid "Last Modified"
 msgstr ""
 
-#: ../../Zotlabs/Module/Sharedwithme.php:109
+#: ../../Zotlabs/Module/Sharedwithme.php:108
 msgid "Remove all files"
 msgstr ""
 
-#: ../../Zotlabs/Module/Sharedwithme.php:110
+#: ../../Zotlabs/Module/Sharedwithme.php:109
 msgid "Remove this file"
 msgstr ""
 
@@ -1741,7 +1890,7 @@ msgid ""
 msgstr ""
 
 #: ../../Zotlabs/Module/Setup.php:198 ../../Zotlabs/Module/Setup.php:262
-#: ../../Zotlabs/Module/Setup.php:749
+#: ../../Zotlabs/Module/Setup.php:756
 msgid "Please see the file \"install/INSTALL.txt\"."
 msgstr ""
 
@@ -1979,129 +2128,135 @@ msgstr ""
 
 #: ../../Zotlabs/Module/Setup.php:531
 msgid ""
-"Error: GD graphics PHP module with JPEG support required but not installed."
+"Error: GD PHP module with JPEG support or ImageMagick graphics library "
+"required but not installed."
 msgstr ""
 
 #: ../../Zotlabs/Module/Setup.php:535
 msgid "Error: openssl PHP module required but not installed."
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:539
+#: ../../Zotlabs/Module/Setup.php:541
+msgid ""
+"Error: PDO database PHP module missing a driver for either mysql or pgsql."
+msgstr ""
+
+#: ../../Zotlabs/Module/Setup.php:546
 msgid "Error: PDO database PHP module required but not installed."
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:543
+#: ../../Zotlabs/Module/Setup.php:550
 msgid "Error: mb_string PHP module required but not installed."
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:547
+#: ../../Zotlabs/Module/Setup.php:554
 msgid "Error: xml PHP module required for DAV but not installed."
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:551
+#: ../../Zotlabs/Module/Setup.php:558
 msgid "Error: zip PHP module required but not installed."
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:570 ../../Zotlabs/Module/Setup.php:579
+#: ../../Zotlabs/Module/Setup.php:577 ../../Zotlabs/Module/Setup.php:586
 msgid ".htconfig.php is writable"
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:575
+#: ../../Zotlabs/Module/Setup.php:582
 msgid ""
 "The web installer needs to be able to create a file called \".htconfig.php\" "
 "in the top folder of your web server and it is unable to do so."
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:576
+#: ../../Zotlabs/Module/Setup.php:583
 msgid ""
 "This is most often a permission setting, as the web server may not be able "
 "to write files in your folder - even if you can."
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:577
+#: ../../Zotlabs/Module/Setup.php:584
 msgid "Please see install/INSTALL.txt for additional information."
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:593
+#: ../../Zotlabs/Module/Setup.php:600
 msgid ""
 "This software uses the Smarty3 template engine to render its web views. "
 "Smarty3 compiles templates to PHP to speed up rendering."
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:594
+#: ../../Zotlabs/Module/Setup.php:601
 #, php-format
 msgid ""
 "In order to store these compiled templates, the web server needs to have "
 "write access to the directory %s under the top level web folder."
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:595 ../../Zotlabs/Module/Setup.php:616
+#: ../../Zotlabs/Module/Setup.php:602 ../../Zotlabs/Module/Setup.php:623
 msgid ""
 "Please ensure that the user that your web server runs as (e.g. www-data) has "
 "write access to this folder."
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:596
+#: ../../Zotlabs/Module/Setup.php:603
 #, php-format
 msgid ""
 "Note: as a security measure, you should give the web server write access to "
 "%s only--not the template files (.tpl) that it contains."
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:599
+#: ../../Zotlabs/Module/Setup.php:606
 #, php-format
 msgid "%s is writable"
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:615
+#: ../../Zotlabs/Module/Setup.php:622
 msgid ""
 "This software uses the store directory to save uploaded files. The web "
 "server needs to have write access to the store directory under the top level "
 "web folder"
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:619
+#: ../../Zotlabs/Module/Setup.php:626
 msgid "store is writable"
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:651
+#: ../../Zotlabs/Module/Setup.php:658
 msgid ""
 "SSL certificate cannot be validated. Fix certificate or disable https access "
 "to this site."
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:652
+#: ../../Zotlabs/Module/Setup.php:659
 msgid ""
 "If you have https access to your website or allow connections to TCP port "
 "443 (the https: port), you MUST use a browser-valid certificate. You MUST "
 "NOT use self-signed certificates!"
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:653
+#: ../../Zotlabs/Module/Setup.php:660
 msgid ""
 "This restriction is incorporated because public posts from you may for "
 "example contain references to images on your own hub."
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:654
+#: ../../Zotlabs/Module/Setup.php:661
 msgid ""
 "If your certificate is not recognized, members of other sites (who may "
 "themselves have valid certificates) will get a warning message on their own "
 "site complaining about security issues."
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:655
+#: ../../Zotlabs/Module/Setup.php:662
 msgid ""
 "This can cause usability issues elsewhere (not just on your own site) so we "
 "must insist on this requirement."
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:656
+#: ../../Zotlabs/Module/Setup.php:663
 msgid ""
 "Providers are available that issue free certificates which are browser-valid."
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:658
+#: ../../Zotlabs/Module/Setup.php:665
 msgid ""
 "If you are confident that the certificate is valid and signed by a trusted "
 "authority, check to see if you have failed to install an intermediate cert. "
@@ -2109,80 +2264,90 @@ msgid ""
 "server communications."
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:660
+#: ../../Zotlabs/Module/Setup.php:667
 msgid "SSL certificate validation"
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:666
+#: ../../Zotlabs/Module/Setup.php:673
 msgid ""
 "Url rewrite in .htaccess is not working. Check your server configuration."
 "Test: "
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:669
+#: ../../Zotlabs/Module/Setup.php:676
 msgid "Url rewrite is working"
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:683
+#: ../../Zotlabs/Module/Setup.php:690
 msgid ""
 "The database configuration file \".htconfig.php\" could not be written. "
 "Please use the enclosed text to create a configuration file in your web "
 "server root."
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:707 ../../addon/rendezvous/rendezvous.php:401
+#: ../../Zotlabs/Module/Setup.php:714 ../../addon/rendezvous/rendezvous.php:401
 msgid "Errors encountered creating database tables."
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:747
+#: ../../Zotlabs/Module/Setup.php:754
 msgid "<h1>What next?</h1>"
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:748
+#: ../../Zotlabs/Module/Setup.php:755
 msgid ""
 "IMPORTANT: You will need to [manually] setup a scheduled task for the poller."
 msgstr ""
 
-#: ../../Zotlabs/Module/Connect.php:61 ../../Zotlabs/Module/Connect.php:109
+#: ../../Zotlabs/Module/Connect.php:73 ../../Zotlabs/Module/Connect.php:135
 msgid "Continue"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connect.php:90
+#: ../../Zotlabs/Module/Connect.php:104
+msgid "Premium Channel App"
+msgstr ""
+
+#: ../../Zotlabs/Module/Connect.php:105
+msgid ""
+"Allows you to set restrictions and terms on those that connect with your "
+"channel"
+msgstr ""
+
+#: ../../Zotlabs/Module/Connect.php:116
 msgid "Premium Channel Setup"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connect.php:92
+#: ../../Zotlabs/Module/Connect.php:118
 msgid "Enable premium channel connection restrictions"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connect.php:93
+#: ../../Zotlabs/Module/Connect.php:119
 msgid ""
 "Please enter your restrictions or conditions, such as paypal receipt, usage "
 "guidelines, etc."
 msgstr ""
 
-#: ../../Zotlabs/Module/Connect.php:95 ../../Zotlabs/Module/Connect.php:115
+#: ../../Zotlabs/Module/Connect.php:121 ../../Zotlabs/Module/Connect.php:141
 msgid ""
 "This channel may require additional steps or acknowledgement of the "
 "following conditions prior to connecting:"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connect.php:96
+#: ../../Zotlabs/Module/Connect.php:122
 msgid ""
 "Potential connections will then see the following text before proceeding:"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connect.php:97 ../../Zotlabs/Module/Connect.php:118
+#: ../../Zotlabs/Module/Connect.php:123 ../../Zotlabs/Module/Connect.php:144
 msgid ""
 "By continuing, I certify that I have complied with any instructions provided "
 "on this page."
 msgstr ""
 
-#: ../../Zotlabs/Module/Connect.php:106
+#: ../../Zotlabs/Module/Connect.php:132
 msgid "(No specific instructions have been provided by the channel owner.)"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connect.php:114
+#: ../../Zotlabs/Module/Connect.php:140
 msgid "Restricted or Premium Channel"
 msgstr ""
 
@@ -2216,13 +2381,13 @@ msgstr ""
 
 #: ../../Zotlabs/Module/Admin/Features.php:55
 #: ../../Zotlabs/Module/Admin/Features.php:56
-#: ../../Zotlabs/Module/Settings/Features.php:65
+#: ../../Zotlabs/Module/Settings/Features.php:36 ../../include/features.php:55
 msgid "Off"
 msgstr ""
 
 #: ../../Zotlabs/Module/Admin/Features.php:55
 #: ../../Zotlabs/Module/Admin/Features.php:56
-#: ../../Zotlabs/Module/Settings/Features.php:65
+#: ../../Zotlabs/Module/Settings/Features.php:36 ../../include/features.php:55
 msgid "On"
 msgstr ""
 
@@ -2293,7 +2458,7 @@ msgstr[1] ""
 msgid "Account not found"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Accounts.php:91 ../../include/channel.php:2490
+#: ../../Zotlabs/Module/Admin/Accounts.php:91 ../../include/channel.php:2497
 #, php-format
 msgid "Account '%s' deleted"
 msgstr ""
@@ -2313,7 +2478,7 @@ msgstr ""
 #: ../../Zotlabs/Module/Admin/Channels.php:145
 #: ../../Zotlabs/Module/Admin/Themes.php:122
 #: ../../Zotlabs/Module/Admin/Themes.php:156
-#: ../../Zotlabs/Module/Admin/Site.php:307
+#: ../../Zotlabs/Module/Admin/Site.php:287
 #: ../../Zotlabs/Module/Admin/Addons.php:341
 #: ../../Zotlabs/Module/Admin/Addons.php:436
 #: ../../Zotlabs/Module/Admin/Security.php:92
@@ -2345,22 +2510,22 @@ msgid "No registrations."
 msgstr ""
 
 #: ../../Zotlabs/Module/Admin/Accounts.php:173
-#: ../../Zotlabs/Module/Connections.php:303 ../../include/conversation.php:735
+#: ../../Zotlabs/Module/Connections.php:306 ../../include/conversation.php:735
 msgid "Approve"
 msgstr ""
 
 #: ../../Zotlabs/Module/Admin/Accounts.php:174
-#: ../../Zotlabs/Module/Authorize.php:26
+#: ../../Zotlabs/Module/Authorize.php:33
 msgid "Deny"
 msgstr ""
 
 #: ../../Zotlabs/Module/Admin/Accounts.php:176
-#: ../../Zotlabs/Module/Connedit.php:622
+#: ../../Zotlabs/Module/Connedit.php:623
 msgid "Block"
 msgstr ""
 
 #: ../../Zotlabs/Module/Admin/Accounts.php:177
-#: ../../Zotlabs/Module/Connedit.php:622
+#: ../../Zotlabs/Module/Connedit.php:623
 msgid "Unblock"
 msgstr ""
 
@@ -2502,8 +2667,7 @@ msgstr ""
 msgid "Disallow Code"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Channels.php:154
-#: ../../include/conversation.php:1820 ../../include/nav.php:370
+#: ../../Zotlabs/Module/Admin/Channels.php:154 ../../include/nav.php:391
 msgid "Channel"
 msgstr ""
 
@@ -2533,9 +2697,9 @@ msgstr ""
 
 #: ../../Zotlabs/Module/Admin/Themes.php:72
 #: ../../Zotlabs/Module/Admin/Addons.php:259 ../../Zotlabs/Module/Thing.php:94
-#: ../../Zotlabs/Module/Viewsrc.php:25 ../../Zotlabs/Module/Display.php:46
-#: ../../Zotlabs/Module/Display.php:453 ../../Zotlabs/Module/Filestorage.php:24
-#: ../../Zotlabs/Module/Admin.php:62 ../../include/items.php:3566
+#: ../../Zotlabs/Module/Viewsrc.php:25 ../../Zotlabs/Module/Display.php:45
+#: ../../Zotlabs/Module/Display.php:452 ../../Zotlabs/Module/Filestorage.php:24
+#: ../../Zotlabs/Module/Admin.php:62 ../../include/items.php:3587
 msgid "Item not found."
 msgstr ""
 
@@ -2564,9 +2728,9 @@ msgid "Toggle"
 msgstr ""
 
 #: ../../Zotlabs/Module/Admin/Themes.php:125
-#: ../../Zotlabs/Module/Admin/Addons.php:344 ../../Zotlabs/Lib/Apps.php:304
-#: ../../Zotlabs/Widget/Newmember.php:46
-#: ../../Zotlabs/Widget/Settings_menu.php:141 ../../include/nav.php:99
+#: ../../Zotlabs/Module/Admin/Addons.php:344 ../../Zotlabs/Lib/Apps.php:314
+#: ../../Zotlabs/Widget/Newmember.php:53
+#: ../../Zotlabs/Widget/Settings_menu.php:68 ../../include/nav.php:97
 msgid "Settings"
 msgstr ""
 
@@ -2588,488 +2752,452 @@ msgstr ""
 msgid "[Unsupported]"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:172
+#: ../../Zotlabs/Module/Admin/Site.php:161
 msgid "Site settings updated."
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:198
+#: ../../Zotlabs/Module/Admin/Site.php:187
 #: ../../view/theme/redbasic_c/php/config.php:15
-#: ../../view/theme/redbasic/php/config.php:15 ../../include/text.php:3078
+#: ../../view/theme/redbasic/php/config.php:15 ../../include/text.php:3087
 msgid "Default"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:209
-#: ../../Zotlabs/Module/Settings/Display.php:130
+#: ../../Zotlabs/Module/Admin/Site.php:198
+#: ../../Zotlabs/Module/Settings/Display.php:119
 #, php-format
 msgid "%s - (Incompatible)"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:216
+#: ../../Zotlabs/Module/Admin/Site.php:205
 msgid "mobile"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:218
+#: ../../Zotlabs/Module/Admin/Site.php:207
 msgid "experimental"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:220
+#: ../../Zotlabs/Module/Admin/Site.php:209
 msgid "unsupported"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:267
+#: ../../Zotlabs/Module/Admin/Site.php:256
 msgid "Yes - with approval"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:273
+#: ../../Zotlabs/Module/Admin/Site.php:262
 msgid "My site is not a public server"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:274
+#: ../../Zotlabs/Module/Admin/Site.php:263
 msgid "My site has paid access only"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:275
+#: ../../Zotlabs/Module/Admin/Site.php:264
 msgid "My site has free access only"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:276
+#: ../../Zotlabs/Module/Admin/Site.php:265
 msgid "My site offers free accounts with optional paid upgrades"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:288
-msgid "Beginner/Basic"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin/Site.php:289
-msgid "Novice - not skilled but willing to learn"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin/Site.php:290
-msgid "Intermediate - somewhat comfortable"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin/Site.php:291
-msgid "Advanced - very comfortable"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin/Site.php:292
-msgid "Expert - I can write computer code"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin/Site.php:293
-msgid "Wizard - I probably know more than you do"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin/Site.php:299
+#: ../../Zotlabs/Module/Admin/Site.php:279
 msgid "Default permission role for new accounts"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:299
+#: ../../Zotlabs/Module/Admin/Site.php:279
 msgid ""
 "This role will be used for the first channel created after registration."
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:308 ../../Zotlabs/Widget/Admin.php:22
+#: ../../Zotlabs/Module/Admin/Site.php:288 ../../Zotlabs/Widget/Admin.php:22
 msgid "Site"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:310
-#: ../../Zotlabs/Module/Register.php:278
+#: ../../Zotlabs/Module/Admin/Site.php:290
+#: ../../Zotlabs/Module/Register.php:273
 msgid "Registration"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:311
+#: ../../Zotlabs/Module/Admin/Site.php:291
 msgid "File upload"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:312
+#: ../../Zotlabs/Module/Admin/Site.php:292
 msgid "Policies"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:313 ../../include/contact_widgets.php:16
+#: ../../Zotlabs/Module/Admin/Site.php:293 ../../include/contact_widgets.php:16
 msgid "Advanced"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:317
+#: ../../Zotlabs/Module/Admin/Site.php:297
 #: ../../addon/statusnet/statusnet.php:891
 msgid "Site name"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:319
-msgid "Site default technical skill level"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin/Site.php:319
-msgid "Used to provide a member experience matched to technical comfort level"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin/Site.php:321
-msgid "Lock the technical skill level setting"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin/Site.php:321
-msgid "Members can set their own technical comfort level by default"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin/Site.php:323
+#: ../../Zotlabs/Module/Admin/Site.php:299
 msgid "Banner/Logo"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:323
+#: ../../Zotlabs/Module/Admin/Site.php:299
 msgid "Unfiltered HTML/CSS/JS is allowed"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:324
+#: ../../Zotlabs/Module/Admin/Site.php:300
 msgid "Administrator Information"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:324
+#: ../../Zotlabs/Module/Admin/Site.php:300
 msgid ""
 "Contact information for site administrators.  Displayed on siteinfo page.  "
 "BBCode can be used here"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:325 ../../Zotlabs/Module/Siteinfo.php:24
+#: ../../Zotlabs/Module/Admin/Site.php:301 ../../Zotlabs/Module/Siteinfo.php:24
 msgid "Site Information"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:325
+#: ../../Zotlabs/Module/Admin/Site.php:301
 msgid ""
 "Publicly visible description of this site.  Displayed on siteinfo page.  "
 "BBCode can be used here"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:326
+#: ../../Zotlabs/Module/Admin/Site.php:302
 msgid "System language"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:327
+#: ../../Zotlabs/Module/Admin/Site.php:303
 msgid "System theme"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:327
+#: ../../Zotlabs/Module/Admin/Site.php:303
 msgid ""
 "Default system theme - may be over-ridden by user profiles - <a href='#' "
 "id='cnftheme'>change theme settings</a>"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:330
+#: ../../Zotlabs/Module/Admin/Site.php:306
 msgid "Allow Feeds as Connections"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:330
+#: ../../Zotlabs/Module/Admin/Site.php:306
 msgid "(Heavy system resource usage)"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:331
+#: ../../Zotlabs/Module/Admin/Site.php:307
 msgid "Maximum image size"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:331
+#: ../../Zotlabs/Module/Admin/Site.php:307
 msgid ""
 "Maximum size in bytes of uploaded images. Default is 0, which means no "
 "limits."
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:332
+#: ../../Zotlabs/Module/Admin/Site.php:308
 msgid "Does this site allow new member registration?"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:333
+#: ../../Zotlabs/Module/Admin/Site.php:309
 msgid "Invitation only"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:333
+#: ../../Zotlabs/Module/Admin/Site.php:309
 msgid ""
 "Only allow new member registrations with an invitation code. Above register "
 "policy must be set to Yes."
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:334
+#: ../../Zotlabs/Module/Admin/Site.php:310
 msgid "Minimum age"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:334
+#: ../../Zotlabs/Module/Admin/Site.php:310
 msgid "Minimum age (in years) for who may register on this site."
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:335
+#: ../../Zotlabs/Module/Admin/Site.php:311
 msgid "Which best describes the types of account offered by this hub?"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:336
+#: ../../Zotlabs/Module/Admin/Site.php:311
+msgid "This is displayed on the public server site list."
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Site.php:312
 msgid "Register text"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:336
+#: ../../Zotlabs/Module/Admin/Site.php:312
 msgid "Will be displayed prominently on the registration page."
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:338
+#: ../../Zotlabs/Module/Admin/Site.php:314
 msgid "Site homepage to show visitors (default: login box)"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:338
+#: ../../Zotlabs/Module/Admin/Site.php:314
 msgid ""
-"example: 'public' to show public stream, 'page/sys/home' to show a system "
+"example: 'pubstream' to show public stream, 'page/sys/home' to show a system "
 "webpage called 'home' or 'include:home.html' to include a file."
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:339
+#: ../../Zotlabs/Module/Admin/Site.php:315
 msgid "Preserve site homepage URL"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:339
+#: ../../Zotlabs/Module/Admin/Site.php:315
 msgid ""
 "Present the site homepage in a frame at the original location instead of "
 "redirecting"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:340
+#: ../../Zotlabs/Module/Admin/Site.php:316
 msgid "Accounts abandoned after x days"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:340
+#: ../../Zotlabs/Module/Admin/Site.php:316
 msgid ""
 "Will not waste system resources polling external sites for abandonded "
 "accounts. Enter 0 for no time limit."
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:341
+#: ../../Zotlabs/Module/Admin/Site.php:317
 msgid "Allowed friend domains"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:341
+#: ../../Zotlabs/Module/Admin/Site.php:317
 msgid ""
 "Comma separated list of domains which are allowed to establish friendships "
 "with this site. Wildcards are accepted. Empty to allow any domains"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:342
+#: ../../Zotlabs/Module/Admin/Site.php:318
 msgid "Verify Email Addresses"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:342
+#: ../../Zotlabs/Module/Admin/Site.php:318
 msgid ""
 "Check to verify email addresses used in account registration (recommended)."
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:343
+#: ../../Zotlabs/Module/Admin/Site.php:319
 msgid "Force publish"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:343
+#: ../../Zotlabs/Module/Admin/Site.php:319
 msgid ""
 "Check to force all profiles on this site to be listed in the site directory."
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:344
+#: ../../Zotlabs/Module/Admin/Site.php:320
 msgid "Import Public Streams"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:344
+#: ../../Zotlabs/Module/Admin/Site.php:320
 msgid ""
 "Import and allow access to public content pulled from other sites. Warning: "
 "this content is unmoderated."
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:345
+#: ../../Zotlabs/Module/Admin/Site.php:321
 msgid "Site only Public Streams"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:345
+#: ../../Zotlabs/Module/Admin/Site.php:321
 msgid ""
 "Allow access to public content originating only from this site if Imported "
 "Public Streams are disabled."
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:346
+#: ../../Zotlabs/Module/Admin/Site.php:322
 msgid "Allow anybody on the internet to access the Public streams"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:346
+#: ../../Zotlabs/Module/Admin/Site.php:322
 msgid ""
 "Disable to require authentication before viewing. Warning: this content is "
 "unmoderated."
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:347
+#: ../../Zotlabs/Module/Admin/Site.php:323
 msgid "Only import Public stream posts with this text"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:347
-#: ../../Zotlabs/Module/Admin/Site.php:348
-#: ../../Zotlabs/Module/Connedit.php:875 ../../Zotlabs/Module/Connedit.php:876
+#: ../../Zotlabs/Module/Admin/Site.php:323
+#: ../../Zotlabs/Module/Admin/Site.php:324
+#: ../../Zotlabs/Module/Connedit.php:876 ../../Zotlabs/Module/Connedit.php:877
 msgid ""
 "words one per line or #tags or /patterns/ or lang=xx, leave blank to import "
 "all posts"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:348
+#: ../../Zotlabs/Module/Admin/Site.php:324
 msgid "Do not import Public stream posts with this text"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:351
+#: ../../Zotlabs/Module/Admin/Site.php:327
 msgid "Login on Homepage"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:351
+#: ../../Zotlabs/Module/Admin/Site.php:327
 msgid ""
 "Present a login box to visitors on the home page if no other content has "
 "been configured."
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:352
+#: ../../Zotlabs/Module/Admin/Site.php:328
 msgid "Enable context help"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:352
+#: ../../Zotlabs/Module/Admin/Site.php:328
 msgid ""
 "Display contextual help for the current page when the help button is pressed."
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:354
+#: ../../Zotlabs/Module/Admin/Site.php:330
 msgid "Reply-to email address for system generated email."
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:355
+#: ../../Zotlabs/Module/Admin/Site.php:331
 msgid "Sender (From) email address for system generated email."
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:356
+#: ../../Zotlabs/Module/Admin/Site.php:332
 msgid "Name of email sender for system generated email."
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:358
+#: ../../Zotlabs/Module/Admin/Site.php:334
 msgid "Directory Server URL"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:358
+#: ../../Zotlabs/Module/Admin/Site.php:334
 msgid "Default directory server"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:360
+#: ../../Zotlabs/Module/Admin/Site.php:336
 msgid "Proxy user"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:361
+#: ../../Zotlabs/Module/Admin/Site.php:337
 msgid "Proxy URL"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:362
+#: ../../Zotlabs/Module/Admin/Site.php:338
 msgid "Network timeout"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:362
+#: ../../Zotlabs/Module/Admin/Site.php:338
 msgid "Value is in seconds. Set to 0 for unlimited (not recommended)."
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:363
+#: ../../Zotlabs/Module/Admin/Site.php:339
 msgid "Delivery interval"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:363
+#: ../../Zotlabs/Module/Admin/Site.php:339
 msgid ""
 "Delay background delivery processes by this many seconds to reduce system "
 "load. Recommend: 4-5 for shared hosts, 2-3 for virtual private servers. 0-1 "
 "for large dedicated servers."
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:364
+#: ../../Zotlabs/Module/Admin/Site.php:340
 msgid "Deliveries per process"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:364
+#: ../../Zotlabs/Module/Admin/Site.php:340
 msgid ""
 "Number of deliveries to attempt in a single operating system process. Adjust "
 "if necessary to tune system performance. Recommend: 1-5."
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:365
+#: ../../Zotlabs/Module/Admin/Site.php:341
 msgid "Queue Threshold"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:365
+#: ../../Zotlabs/Module/Admin/Site.php:341
 msgid ""
 "Always defer immediate delivery if queue contains more than this number of "
 "entries."
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:366
+#: ../../Zotlabs/Module/Admin/Site.php:342
 msgid "Poll interval"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:366
+#: ../../Zotlabs/Module/Admin/Site.php:342
 msgid ""
 "Delay background polling processes by this many seconds to reduce system "
 "load. If 0, use delivery interval."
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:367
+#: ../../Zotlabs/Module/Admin/Site.php:343
 msgid "Path to ImageMagick convert program"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:367
+#: ../../Zotlabs/Module/Admin/Site.php:343
 msgid ""
 "If set, use this program to generate photo thumbnails for huge images ( > "
 "4000 pixels in either dimension), otherwise memory exhaustion may occur. "
 "Example: /usr/bin/convert"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:368
+#: ../../Zotlabs/Module/Admin/Site.php:344
 msgid "Allow SVG thumbnails in file browser"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:368
+#: ../../Zotlabs/Module/Admin/Site.php:344
 msgid "WARNING: SVG images may contain malicious code."
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:369
+#: ../../Zotlabs/Module/Admin/Site.php:345
 msgid "Maximum Load Average"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:369
+#: ../../Zotlabs/Module/Admin/Site.php:345
 msgid ""
 "Maximum system load before delivery and poll processes are deferred - "
 "default 50."
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:370
+#: ../../Zotlabs/Module/Admin/Site.php:346
 msgid "Expiration period in days for imported (grid/network) content"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:370
+#: ../../Zotlabs/Module/Admin/Site.php:346
 msgid "0 for no expiration of imported content"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:371
+#: ../../Zotlabs/Module/Admin/Site.php:347
 msgid ""
 "Do not expire any posts which have comments less than this many days ago"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:373
+#: ../../Zotlabs/Module/Admin/Site.php:349
 msgid ""
 "Public servers: Optional landing (marketing) webpage for new registrants"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:373
+#: ../../Zotlabs/Module/Admin/Site.php:349
 #, php-format
 msgid "Create this page first. Default is %s/register"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:374
+#: ../../Zotlabs/Module/Admin/Site.php:350
 msgid "Page to display after creating a new channel"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:374
+#: ../../Zotlabs/Module/Admin/Site.php:350
 msgid "Default: profiles"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:376
+#: ../../Zotlabs/Module/Admin/Site.php:352
 msgid "Optional: site location"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:376
+#: ../../Zotlabs/Module/Admin/Site.php:352
 msgid "Region or country"
 msgstr ""
 
@@ -3137,7 +3265,7 @@ msgstr ""
 msgid "Install new repo"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Addons.php:422 ../../Zotlabs/Lib/Apps.php:456
+#: ../../Zotlabs/Module/Admin/Addons.php:422 ../../Zotlabs/Lib/Apps.php:513
 msgid "Install"
 msgstr ""
 
@@ -3158,8 +3286,8 @@ msgid "Switch branch"
 msgstr ""
 
 #: ../../Zotlabs/Module/Admin/Addons.php:455
-#: ../../Zotlabs/Module/Photos.php:1025 ../../Zotlabs/Module/Tagrm.php:137
-#: ../../addon/superblock/superblock.php:116
+#: ../../Zotlabs/Module/Photos.php:1022 ../../Zotlabs/Module/Tagrm.php:137
+#: ../../addon/superblock/Mod_Superblock.php:91
 msgid "Remove"
 msgstr ""
 
@@ -3205,8 +3333,8 @@ msgstr ""
 #: ../../Zotlabs/Module/Admin/Profs.php:94
 #: ../../Zotlabs/Module/Admin/Profs.php:114 ../../Zotlabs/Module/Rbmark.php:32
 #: ../../Zotlabs/Module/Rbmark.php:104 ../../Zotlabs/Module/Filer.php:53
-#: ../../Zotlabs/Widget/Notes.php:18 ../../include/text.php:1063
-#: ../../include/text.php:1075
+#: ../../Zotlabs/Widget/Notes.php:23 ../../include/text.php:1069
+#: ../../include/text.php:1081
 msgid "Save"
 msgstr ""
 
@@ -3272,14 +3400,10 @@ msgid "New Password again"
 msgstr ""
 
 #: ../../Zotlabs/Module/Admin/Account_edit.php:71
-msgid "Technical skill level"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin/Account_edit.php:72
 msgid "Account language (for emails)"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Account_edit.php:73
+#: ../../Zotlabs/Module/Admin/Account_edit.php:72
 msgid "Service class"
 msgstr ""
 
@@ -3429,709 +3553,523 @@ msgstr ""
 msgid "Comment deleted"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Permcats.php:23
-msgid "Permission Name is required."
-msgstr ""
-
-#: ../../Zotlabs/Module/Settings/Permcats.php:42
-msgid "Permission category saved."
-msgstr ""
-
-#: ../../Zotlabs/Module/Settings/Permcats.php:66
-msgid ""
-"Use this form to create permission rules for various classes of people or "
-"connections."
-msgstr ""
-
-#: ../../Zotlabs/Module/Settings/Permcats.php:99
-#: ../../Zotlabs/Widget/Settings_menu.php:108 ../../include/features.php:240
-msgid "Permission Categories"
-msgstr ""
-
-#: ../../Zotlabs/Module/Settings/Permcats.php:107
-msgid "Permission Name"
-msgstr ""
-
-#: ../../Zotlabs/Module/Settings/Permcats.php:108
-#: ../../Zotlabs/Module/Settings/Tokens.php:161
-#: ../../Zotlabs/Module/Connedit.php:891 ../../Zotlabs/Module/Defperms.php:250
-msgid "My Settings"
-msgstr ""
-
-#: ../../Zotlabs/Module/Settings/Permcats.php:110
-#: ../../Zotlabs/Module/Settings/Tokens.php:163
-#: ../../Zotlabs/Module/Connedit.php:886 ../../Zotlabs/Module/Defperms.php:248
-msgid "inherited"
-msgstr ""
-
-#: ../../Zotlabs/Module/Settings/Permcats.php:113
-#: ../../Zotlabs/Module/Settings/Tokens.php:166
-#: ../../Zotlabs/Module/Connedit.php:893 ../../Zotlabs/Module/Defperms.php:253
-msgid "Individual Permissions"
-msgstr ""
-
-#: ../../Zotlabs/Module/Settings/Permcats.php:114
-#: ../../Zotlabs/Module/Settings/Tokens.php:167
-#: ../../Zotlabs/Module/Connedit.php:894
-msgid ""
-"Some permissions may be inherited from your channel's <a href=\"settings"
-"\"><strong>privacy settings</strong></a>, which have higher priority than "
-"individual settings. You can <strong>not</strong> change those settings here."
-msgstr ""
-
-#: ../../Zotlabs/Module/Settings/Channel.php:68
-#: ../../Zotlabs/Module/Settings/Channel.php:72
-#: ../../Zotlabs/Module/Settings/Channel.php:73
-#: ../../Zotlabs/Module/Settings/Channel.php:76
-#: ../../Zotlabs/Module/Settings/Channel.php:87
-#: ../../Zotlabs/Module/Connedit.php:711 ../../Zotlabs/Widget/Affinity.php:24
-#: ../../include/selectors.php:123 ../../include/channel.php:437
-#: ../../include/channel.php:438 ../../include/channel.php:445
+#: ../../Zotlabs/Module/Settings/Channel.php:70
+#: ../../Zotlabs/Module/Settings/Channel.php:74
+#: ../../Zotlabs/Module/Settings/Channel.php:75
+#: ../../Zotlabs/Module/Settings/Channel.php:78
+#: ../../Zotlabs/Module/Settings/Channel.php:89
+#: ../../Zotlabs/Module/Connedit.php:712 ../../Zotlabs/Widget/Affinity.php:24
+#: ../../include/selectors.php:134 ../../include/channel.php:444
+#: ../../include/channel.php:445 ../../include/channel.php:452
 msgid "Friends"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Channel.php:272
-#: ../../Zotlabs/Module/Defperms.php:103
+#: ../../Zotlabs/Module/Settings/Channel.php:266
+#: ../../Zotlabs/Module/Defperms.php:111
 #: ../../addon/rendezvous/rendezvous.php:82
 #: ../../addon/openstreetmap/openstreetmap.php:184
 #: ../../addon/msgfooter/msgfooter.php:54 ../../addon/logrot/logrot.php:54
-#: ../../addon/twitter/twitter.php:772 ../../addon/piwik/piwik.php:116
+#: ../../addon/twitter/twitter.php:775 ../../addon/piwik/piwik.php:116
 #: ../../addon/xmpp/xmpp.php:102
 msgid "Settings updated."
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Channel.php:333
+#: ../../Zotlabs/Module/Settings/Channel.php:327
 msgid "Nobody except yourself"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Channel.php:334
+#: ../../Zotlabs/Module/Settings/Channel.php:328
 msgid "Only those you specifically allow"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Channel.php:335
+#: ../../Zotlabs/Module/Settings/Channel.php:329
 msgid "Approved connections"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Channel.php:336
+#: ../../Zotlabs/Module/Settings/Channel.php:330
 msgid "Any connections"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Channel.php:337
+#: ../../Zotlabs/Module/Settings/Channel.php:331
 msgid "Anybody on this website"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Channel.php:338
+#: ../../Zotlabs/Module/Settings/Channel.php:332
 msgid "Anybody in this network"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Channel.php:339
+#: ../../Zotlabs/Module/Settings/Channel.php:333
 msgid "Anybody authenticated"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Channel.php:340
+#: ../../Zotlabs/Module/Settings/Channel.php:334
 msgid "Anybody on the internet"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Channel.php:415
+#: ../../Zotlabs/Module/Settings/Channel.php:409
 msgid "Publish your default profile in the network directory"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Channel.php:420
+#: ../../Zotlabs/Module/Settings/Channel.php:414
 msgid "Allow us to suggest you as a potential friend to new members?"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Channel.php:424
+#: ../../Zotlabs/Module/Settings/Channel.php:418
 msgid "or"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Channel.php:433
+#: ../../Zotlabs/Module/Settings/Channel.php:427
 msgid "Your channel address is"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Channel.php:436
+#: ../../Zotlabs/Module/Settings/Channel.php:430
 msgid "Your files/photos are accessible via WebDAV at"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Channel.php:488
+#: ../../Zotlabs/Module/Settings/Channel.php:470
 msgid "Automatic membership approval"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Channel.php:488
-#: ../../Zotlabs/Module/Defperms.php:239
+#: ../../Zotlabs/Module/Settings/Channel.php:470
+#: ../../Zotlabs/Module/Defperms.php:255
 msgid ""
 "If enabled, connection requests will be approved without your interaction"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Channel.php:514
+#: ../../Zotlabs/Module/Settings/Channel.php:491
 msgid "Channel Settings"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Channel.php:521
+#: ../../Zotlabs/Module/Settings/Channel.php:498
 msgid "Basic Settings"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Channel.php:522 ../../include/channel.php:1521
+#: ../../Zotlabs/Module/Settings/Channel.php:499 ../../include/channel.php:1528
 msgid "Full Name:"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Channel.php:523
-#: ../../Zotlabs/Module/Settings/Account.php:119
+#: ../../Zotlabs/Module/Settings/Channel.php:500
+#: ../../Zotlabs/Module/Settings/Account.php:104
 msgid "Email Address:"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Channel.php:524
+#: ../../Zotlabs/Module/Settings/Channel.php:501
 msgid "Your Timezone:"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Channel.php:525
+#: ../../Zotlabs/Module/Settings/Channel.php:502
 msgid "Default Post Location:"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Channel.php:525
+#: ../../Zotlabs/Module/Settings/Channel.php:502
 msgid "Geographical location to display on your posts"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Channel.php:526
+#: ../../Zotlabs/Module/Settings/Channel.php:503
 msgid "Use Browser Location:"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Channel.php:528
+#: ../../Zotlabs/Module/Settings/Channel.php:505
 msgid "Adult Content"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Channel.php:528
+#: ../../Zotlabs/Module/Settings/Channel.php:505
 msgid ""
 "This channel frequently or regularly publishes adult content. (Please tag "
 "any adult material and/or nudity with #NSFW)"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Channel.php:530
+#: ../../Zotlabs/Module/Settings/Channel.php:507
 msgid "Security and Privacy Settings"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Channel.php:532
+#: ../../Zotlabs/Module/Settings/Channel.php:509
 msgid "Your permissions are already configured. Click to view/adjust"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Channel.php:534
+#: ../../Zotlabs/Module/Settings/Channel.php:511
 msgid "Hide my online presence"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Channel.php:534
+#: ../../Zotlabs/Module/Settings/Channel.php:511
 msgid "Prevents displaying in your profile that you are online"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Channel.php:536
+#: ../../Zotlabs/Module/Settings/Channel.php:513
 msgid "Simple Privacy Settings:"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Channel.php:537
+#: ../../Zotlabs/Module/Settings/Channel.php:514
 msgid ""
 "Very Public - <em>extremely permissive (should be used with caution)</em>"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Channel.php:538
+#: ../../Zotlabs/Module/Settings/Channel.php:515
 msgid ""
 "Typical - <em>default public, privacy when desired (similar to social "
 "network permissions but with improved privacy)</em>"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Channel.php:539
+#: ../../Zotlabs/Module/Settings/Channel.php:516
 msgid "Private - <em>default private, never open or public</em>"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Channel.php:540
+#: ../../Zotlabs/Module/Settings/Channel.php:517
 msgid "Blocked - <em>default blocked to/from everybody</em>"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Channel.php:542
+#: ../../Zotlabs/Module/Settings/Channel.php:519
 msgid "Allow others to tag your posts"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Channel.php:542
+#: ../../Zotlabs/Module/Settings/Channel.php:519
 msgid ""
 "Often used by the community to retro-actively flag inappropriate content"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Channel.php:544
+#: ../../Zotlabs/Module/Settings/Channel.php:521
 msgid "Channel Permission Limits"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Channel.php:546
+#: ../../Zotlabs/Module/Settings/Channel.php:523
 msgid "Expire other channel content after this many days"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Channel.php:546
+#: ../../Zotlabs/Module/Settings/Channel.php:523
 msgid "0 or blank to use the website limit."
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Channel.php:546
+#: ../../Zotlabs/Module/Settings/Channel.php:523
 #, php-format
 msgid "This website expires after %d days."
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Channel.php:546
+#: ../../Zotlabs/Module/Settings/Channel.php:523
 msgid "This website does not expire imported content."
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Channel.php:546
+#: ../../Zotlabs/Module/Settings/Channel.php:523
 msgid "The website limit takes precedence if lower than your limit."
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Channel.php:547
+#: ../../Zotlabs/Module/Settings/Channel.php:524
 msgid "Maximum Friend Requests/Day:"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Channel.php:547
+#: ../../Zotlabs/Module/Settings/Channel.php:524
 msgid "May reduce spam activity"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Channel.php:548
+#: ../../Zotlabs/Module/Settings/Channel.php:525
 msgid "Default Privacy Group"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Channel.php:550
+#: ../../Zotlabs/Module/Settings/Channel.php:527
 msgid "Use my default audience setting for the type of object published"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Channel.php:551
-msgid "Profile to assign new connections"
-msgstr ""
-
-#: ../../Zotlabs/Module/Settings/Channel.php:561
-msgid "Default Permissions Group"
+#: ../../Zotlabs/Module/Settings/Channel.php:536
+msgid "Default permissions category"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Channel.php:567
+#: ../../Zotlabs/Module/Settings/Channel.php:542
 msgid "Maximum private messages per day from unknown people:"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Channel.php:567
+#: ../../Zotlabs/Module/Settings/Channel.php:542
 msgid "Useful to reduce spamming"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Channel.php:570
+#: ../../Zotlabs/Module/Settings/Channel.php:545
 #: ../../Zotlabs/Lib/Enotify.php:68
 msgid "Notification Settings"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Channel.php:571
+#: ../../Zotlabs/Module/Settings/Channel.php:546
 msgid "By default post a status message when:"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Channel.php:572
+#: ../../Zotlabs/Module/Settings/Channel.php:547
 msgid "accepting a friend request"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Channel.php:573
+#: ../../Zotlabs/Module/Settings/Channel.php:548
 msgid "joining a forum/community"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Channel.php:574
+#: ../../Zotlabs/Module/Settings/Channel.php:549
 msgid "making an <em>interesting</em> profile change"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Channel.php:575
+#: ../../Zotlabs/Module/Settings/Channel.php:550
 msgid "Send a notification email when:"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Channel.php:576
+#: ../../Zotlabs/Module/Settings/Channel.php:551
 msgid "You receive a connection request"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Channel.php:577
+#: ../../Zotlabs/Module/Settings/Channel.php:552
 msgid "Your connections are confirmed"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Channel.php:578
+#: ../../Zotlabs/Module/Settings/Channel.php:553
 msgid "Someone writes on your profile wall"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Channel.php:579
+#: ../../Zotlabs/Module/Settings/Channel.php:554
 msgid "Someone writes a followup comment"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Channel.php:580
+#: ../../Zotlabs/Module/Settings/Channel.php:555
 msgid "You receive a private message"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Channel.php:581
+#: ../../Zotlabs/Module/Settings/Channel.php:556
 msgid "You receive a friend suggestion"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Channel.php:582
+#: ../../Zotlabs/Module/Settings/Channel.php:557
 msgid "You are tagged in a post"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Channel.php:583
+#: ../../Zotlabs/Module/Settings/Channel.php:558
 msgid "You are poked/prodded/etc. in a post"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Channel.php:585
+#: ../../Zotlabs/Module/Settings/Channel.php:560
 msgid "Someone likes your post/comment"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Channel.php:588
+#: ../../Zotlabs/Module/Settings/Channel.php:563
 msgid "Show visual notifications including:"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Channel.php:590
-msgid "Unseen grid activity"
+#: ../../Zotlabs/Module/Settings/Channel.php:565
+msgid "Unseen stream activity"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Channel.php:591
+#: ../../Zotlabs/Module/Settings/Channel.php:566
 msgid "Unseen channel activity"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Channel.php:592
+#: ../../Zotlabs/Module/Settings/Channel.php:567
 msgid "Unseen private messages"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Channel.php:592
-#: ../../Zotlabs/Module/Settings/Channel.php:597
-#: ../../Zotlabs/Module/Settings/Channel.php:598
-#: ../../Zotlabs/Module/Settings/Channel.php:599
+#: ../../Zotlabs/Module/Settings/Channel.php:567
+#: ../../Zotlabs/Module/Settings/Channel.php:572
+#: ../../Zotlabs/Module/Settings/Channel.php:573
+#: ../../Zotlabs/Module/Settings/Channel.php:574
 #: ../../addon/jappixmini/jappixmini.php:343
 msgid "Recommended"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Channel.php:593
+#: ../../Zotlabs/Module/Settings/Channel.php:568
 msgid "Upcoming events"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Channel.php:594
+#: ../../Zotlabs/Module/Settings/Channel.php:569
 msgid "Events today"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Channel.php:595
+#: ../../Zotlabs/Module/Settings/Channel.php:570
 msgid "Upcoming birthdays"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Channel.php:595
+#: ../../Zotlabs/Module/Settings/Channel.php:570
 msgid "Not available in all themes"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Channel.php:596
+#: ../../Zotlabs/Module/Settings/Channel.php:571
 msgid "System (personal) notifications"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Channel.php:597
+#: ../../Zotlabs/Module/Settings/Channel.php:572
 msgid "System info messages"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Channel.php:598
+#: ../../Zotlabs/Module/Settings/Channel.php:573
 msgid "System critical alerts"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Channel.php:599
+#: ../../Zotlabs/Module/Settings/Channel.php:574
 msgid "New connections"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Channel.php:600
+#: ../../Zotlabs/Module/Settings/Channel.php:575
 msgid "System Registrations"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Channel.php:601
+#: ../../Zotlabs/Module/Settings/Channel.php:576
 msgid "Unseen shared files"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Channel.php:602
-msgid "Unseen public activity"
+#: ../../Zotlabs/Module/Settings/Channel.php:577
+msgid "Unseen public stream activity"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Channel.php:603
+#: ../../Zotlabs/Module/Settings/Channel.php:578
 msgid "Unseen likes and dislikes"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Channel.php:604
+#: ../../Zotlabs/Module/Settings/Channel.php:579
 msgid "Unseen forum posts"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Channel.php:605
+#: ../../Zotlabs/Module/Settings/Channel.php:580
 msgid "Email notification hub (hostname)"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Channel.php:605
+#: ../../Zotlabs/Module/Settings/Channel.php:580
 #, php-format
 msgid ""
 "If your channel is mirrored to multiple hubs, set this to your preferred "
 "location. This will prevent duplicate email notifications. Example: %s"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Channel.php:606
+#: ../../Zotlabs/Module/Settings/Channel.php:581
 msgid "Show new wall posts, private messages and connections under Notices"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Channel.php:608
+#: ../../Zotlabs/Module/Settings/Channel.php:583
 msgid "Notify me of events this many days in advance"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Channel.php:608
+#: ../../Zotlabs/Module/Settings/Channel.php:583
 msgid "Must be greater than 0"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Channel.php:614
+#: ../../Zotlabs/Module/Settings/Channel.php:588
 msgid "Advanced Account/Page Type Settings"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Channel.php:615
+#: ../../Zotlabs/Module/Settings/Channel.php:589
 msgid "Change the behaviour of this account for special situations"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Channel.php:617
+#: ../../Zotlabs/Module/Settings/Channel.php:591
 msgid "Miscellaneous Settings"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Channel.php:618
+#: ../../Zotlabs/Module/Settings/Channel.php:592
 msgid "Default photo upload folder"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Channel.php:618
-#: ../../Zotlabs/Module/Settings/Channel.php:619
+#: ../../Zotlabs/Module/Settings/Channel.php:592
+#: ../../Zotlabs/Module/Settings/Channel.php:593
 msgid "%Y - current year, %m -  current month"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Channel.php:619
+#: ../../Zotlabs/Module/Settings/Channel.php:593
 msgid "Default file upload folder"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Channel.php:621
-msgid "Personal menu to display in your channel pages"
-msgstr ""
-
-#: ../../Zotlabs/Module/Settings/Channel.php:623
+#: ../../Zotlabs/Module/Settings/Channel.php:595
 msgid "Remove this channel."
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Channel.php:624
-msgid "Firefox Share $Projectname provider"
-msgstr ""
-
-#: ../../Zotlabs/Module/Settings/Channel.php:625
-msgid "Start calendar week on Monday"
-msgstr ""
-
-#: ../../Zotlabs/Module/Settings/Features.php:73
+#: ../../Zotlabs/Module/Settings/Features.php:43
 msgid "Additional Features"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Features.php:74
-#: ../../Zotlabs/Module/Settings/Account.php:116
-msgid "Your technical skill level"
-msgstr ""
-
-#: ../../Zotlabs/Module/Settings/Features.php:74
-#: ../../Zotlabs/Module/Settings/Account.php:116
-msgid ""
-"Used to provide a member experience and additional features consistent with "
-"your comfort level"
-msgstr ""
-
-#: ../../Zotlabs/Module/Settings/Tokens.php:31
-#, php-format
-msgid "This channel is limited to %d tokens"
-msgstr ""
-
-#: ../../Zotlabs/Module/Settings/Tokens.php:37
-msgid "Name and Password are required."
-msgstr ""
-
-#: ../../Zotlabs/Module/Settings/Tokens.php:77
-msgid "Token saved."
-msgstr ""
-
-#: ../../Zotlabs/Module/Settings/Tokens.php:113
-msgid ""
-"Use this form to create temporary access identifiers to share things with "
-"non-members. These identities may be used in Access Control Lists and "
-"visitors may login using these credentials to access private content."
-msgstr ""
-
-#: ../../Zotlabs/Module/Settings/Tokens.php:115
-msgid ""
-"You may also provide <em>dropbox</em> style access links to friends and "
-"associates by adding the Login Password to any specific site URL as shown. "
-"Examples:"
-msgstr ""
-
-#: ../../Zotlabs/Module/Settings/Tokens.php:150
-#: ../../Zotlabs/Widget/Settings_menu.php:100
-msgid "Guest Access Tokens"
-msgstr ""
-
-#: ../../Zotlabs/Module/Settings/Tokens.php:157
-msgid "Login Name"
-msgstr ""
-
-#: ../../Zotlabs/Module/Settings/Tokens.php:158
-msgid "Login Password"
-msgstr ""
-
-#: ../../Zotlabs/Module/Settings/Tokens.php:159
-msgid "Expires (yyyy-mm-dd)"
-msgstr ""
-
-#: ../../Zotlabs/Module/Settings/Tokens.php:160
-#: ../../Zotlabs/Module/Connedit.php:890
-msgid "Their Settings"
-msgstr ""
-
-#: ../../Zotlabs/Module/Settings/Oauth2.php:36
-msgid "Name and Secret are required"
-msgstr ""
-
-#: ../../Zotlabs/Module/Settings/Oauth2.php:84
-msgid "Add OAuth2 application"
-msgstr ""
-
-#: ../../Zotlabs/Module/Settings/Oauth2.php:87
-#: ../../Zotlabs/Module/Settings/Oauth2.php:115
-#: ../../Zotlabs/Module/Settings/Oauth.php:90
-msgid "Name of application"
-msgstr ""
-
-#: ../../Zotlabs/Module/Settings/Oauth2.php:88
-#: ../../Zotlabs/Module/Settings/Oauth2.php:116
-#: ../../Zotlabs/Module/Settings/Oauth.php:92
-#: ../../Zotlabs/Module/Settings/Oauth.php:118
-#: ../../addon/statusnet/statusnet.php:893 ../../addon/twitter/twitter.php:782
-msgid "Consumer Secret"
-msgstr ""
-
-#: ../../Zotlabs/Module/Settings/Oauth2.php:88
-#: ../../Zotlabs/Module/Settings/Oauth2.php:116
-#: ../../Zotlabs/Module/Settings/Oauth.php:91
-#: ../../Zotlabs/Module/Settings/Oauth.php:92
-msgid "Automatically generated - change if desired. Max length 20"
-msgstr ""
-
-#: ../../Zotlabs/Module/Settings/Oauth2.php:89
-#: ../../Zotlabs/Module/Settings/Oauth2.php:117
-#: ../../Zotlabs/Module/Settings/Oauth.php:93
-#: ../../Zotlabs/Module/Settings/Oauth.php:119
-msgid "Redirect"
-msgstr ""
-
-#: ../../Zotlabs/Module/Settings/Oauth2.php:89
-#: ../../Zotlabs/Module/Settings/Oauth2.php:117
-#: ../../Zotlabs/Module/Settings/Oauth.php:93
-msgid ""
-"Redirect URI - leave blank unless your application specifically requires this"
-msgstr ""
-
-#: ../../Zotlabs/Module/Settings/Oauth2.php:90
-#: ../../Zotlabs/Module/Settings/Oauth2.php:118
-msgid "Grant Types"
-msgstr ""
-
-#: ../../Zotlabs/Module/Settings/Oauth2.php:90
-#: ../../Zotlabs/Module/Settings/Oauth2.php:91
-#: ../../Zotlabs/Module/Settings/Oauth2.php:118
-#: ../../Zotlabs/Module/Settings/Oauth2.php:119
-msgid "leave blank unless your application sepcifically requires this"
-msgstr ""
-
-#: ../../Zotlabs/Module/Settings/Oauth2.php:91
-#: ../../Zotlabs/Module/Settings/Oauth2.php:119
-msgid "Authorization scope"
+#: ../../Zotlabs/Module/Settings/Events.php:39
+msgid "Events Settings"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Oauth2.php:103
-msgid "OAuth2 Application not found."
+#: ../../Zotlabs/Module/Settings/Calendar.php:39
+msgid "CalDAV Settings"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Oauth2.php:112
-#: ../../Zotlabs/Module/Settings/Oauth2.php:149
-#: ../../Zotlabs/Module/Settings/Oauth.php:87
-#: ../../Zotlabs/Module/Settings/Oauth.php:113
-#: ../../Zotlabs/Module/Settings/Oauth.php:149
-msgid "Add application"
+#: ../../Zotlabs/Module/Settings/Conversation.php:22
+msgid "Settings saved."
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Oauth2.php:148
-msgid "Connected OAuth2 Apps"
+#: ../../Zotlabs/Module/Settings/Conversation.php:24
+msgid "Settings saved. Reload page please."
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Oauth2.php:152
-#: ../../Zotlabs/Module/Settings/Oauth.php:152
-msgid "Client key starts with"
+#: ../../Zotlabs/Module/Settings/Conversation.php:46
+msgid "Conversation Settings"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Oauth2.php:153
-#: ../../Zotlabs/Module/Settings/Oauth.php:153
-msgid "No name"
+#: ../../Zotlabs/Module/Settings/Connections.php:39
+msgid "Connections Settings"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Oauth2.php:154
-#: ../../Zotlabs/Module/Settings/Oauth.php:154
-msgid "Remove authorization"
+#: ../../Zotlabs/Module/Settings/Photos.php:39
+msgid "Photos Settings"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Account.php:20
+#: ../../Zotlabs/Module/Settings/Account.php:19
 msgid "Not valid email."
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Account.php:23
+#: ../../Zotlabs/Module/Settings/Account.php:22
 msgid "Protected email address. Cannot change to that email."
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Account.php:32
+#: ../../Zotlabs/Module/Settings/Account.php:31
 msgid "System failure storing new email. Please try again."
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Account.php:40
-msgid "Technical skill level updated"
-msgstr ""
-
-#: ../../Zotlabs/Module/Settings/Account.php:56
+#: ../../Zotlabs/Module/Settings/Account.php:48
 msgid "Password verification failed."
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Account.php:63
+#: ../../Zotlabs/Module/Settings/Account.php:55
 msgid "Passwords do not match. Password unchanged."
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Account.php:67
+#: ../../Zotlabs/Module/Settings/Account.php:59
 msgid "Empty passwords are not allowed. Password unchanged."
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Account.php:81
+#: ../../Zotlabs/Module/Settings/Account.php:73
 msgid "Password changed."
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Account.php:83
+#: ../../Zotlabs/Module/Settings/Account.php:75
 msgid "Password update failed. Please try again."
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Account.php:112
+#: ../../Zotlabs/Module/Settings/Account.php:99
 msgid "Account Settings"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Account.php:113
+#: ../../Zotlabs/Module/Settings/Account.php:100
 msgid "Current Password"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Account.php:114
+#: ../../Zotlabs/Module/Settings/Account.php:101
 msgid "Enter New Password"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Account.php:115
+#: ../../Zotlabs/Module/Settings/Account.php:102
 msgid "Confirm New Password"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Account.php:115
+#: ../../Zotlabs/Module/Settings/Account.php:102
 msgid "Leave password fields blank unless changing"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Account.php:120
+#: ../../Zotlabs/Module/Settings/Account.php:105
 #: ../../Zotlabs/Module/Removeaccount.php:61
 msgid "Remove Account"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Account.php:121
+#: ../../Zotlabs/Module/Settings/Account.php:106
 msgid "Remove this account including all its channels"
 msgstr ""
 
+#: ../../Zotlabs/Module/Settings/Profiles.php:47
+msgid "Profiles Settings"
+msgstr ""
+
+#: ../../Zotlabs/Module/Settings/Manage.php:39
+msgid "Channel Manager Settings"
+msgstr ""
+
 #: ../../Zotlabs/Module/Settings/Featured.php:23
 msgid "Affinity Slider settings updated."
 msgstr ""
@@ -4168,169 +4106,201 @@ msgstr ""
 msgid "Please save/submit changes to any panel before opening another."
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Display.php:139
+#: ../../Zotlabs/Module/Settings/Channel_home.php:44
+#: ../../Zotlabs/Module/Settings/Network.php:41
+msgid "Max height of content (in pixels)"
+msgstr ""
+
+#: ../../Zotlabs/Module/Settings/Channel_home.php:46
+#: ../../Zotlabs/Module/Settings/Network.php:43
+msgid "Click to expand content exceeding this height"
+msgstr ""
+
+#: ../../Zotlabs/Module/Settings/Channel_home.php:59
+msgid "Personal menu to display in your channel pages"
+msgstr ""
+
+#: ../../Zotlabs/Module/Settings/Channel_home.php:86
+msgid "Channel Home Settings"
+msgstr ""
+
+#: ../../Zotlabs/Module/Settings/Directory.php:39
+msgid "Directory Settings"
+msgstr ""
+
+#: ../../Zotlabs/Module/Settings/Editor.php:39
+msgid "Editor Settings"
+msgstr ""
+
+#: ../../Zotlabs/Module/Settings/Display.php:128
 #, php-format
 msgid "%s - (Experimental)"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Display.php:187
+#: ../../Zotlabs/Module/Settings/Display.php:184
 msgid "Display Settings"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Display.php:188
+#: ../../Zotlabs/Module/Settings/Display.php:185
 msgid "Theme Settings"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Display.php:189
+#: ../../Zotlabs/Module/Settings/Display.php:186
 msgid "Custom Theme Settings"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Display.php:190
+#: ../../Zotlabs/Module/Settings/Display.php:187
 msgid "Content Settings"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Display.php:196
+#: ../../Zotlabs/Module/Settings/Display.php:193
 msgid "Display Theme:"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Display.php:197
+#: ../../Zotlabs/Module/Settings/Display.php:194
 msgid "Select scheme"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Display.php:199
+#: ../../Zotlabs/Module/Settings/Display.php:196
 msgid "Preload images before rendering the page"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Display.php:199
+#: ../../Zotlabs/Module/Settings/Display.php:196
 msgid ""
 "The subjective page load time will be longer but the page will be ready when "
 "displayed"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Display.php:200
+#: ../../Zotlabs/Module/Settings/Display.php:197
 msgid "Enable user zoom on mobile devices"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Display.php:201
+#: ../../Zotlabs/Module/Settings/Display.php:198
 msgid "Update browser every xx seconds"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Display.php:201
+#: ../../Zotlabs/Module/Settings/Display.php:198
 msgid "Minimum of 10 seconds, no maximum"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Display.php:202
+#: ../../Zotlabs/Module/Settings/Display.php:199
 msgid "Maximum number of conversations to load at any time:"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Display.php:202
+#: ../../Zotlabs/Module/Settings/Display.php:199
 msgid "Maximum of 100 items"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Display.php:203
+#: ../../Zotlabs/Module/Settings/Display.php:200
 msgid "Show emoticons (smilies) as images"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Display.php:204
+#: ../../Zotlabs/Module/Settings/Display.php:201
 msgid "Provide channel menu in navigation bar"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Display.php:204
+#: ../../Zotlabs/Module/Settings/Display.php:201
 msgid "Default: channel menu located in app menu"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Display.php:205
+#: ../../Zotlabs/Module/Settings/Display.php:202
 msgid "Manual conversation updates"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Display.php:205
+#: ../../Zotlabs/Module/Settings/Display.php:202
 msgid "Default is on, turning this off may increase screen jumping"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Display.php:206
+#: ../../Zotlabs/Module/Settings/Display.php:203
 msgid "Link post titles to source"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Display.php:207
-msgid "System Page Layout Editor - (advanced)"
+#: ../../Zotlabs/Module/Settings/Display.php:205
+#: ../../Zotlabs/Widget/Newmember.php:75
+msgid "New Member Links"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Display.php:210
-msgid "Use blog/list mode on channel page"
+#: ../../Zotlabs/Module/Settings/Display.php:205
+msgid "Display new member quick links menu"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Display.php:210
-#: ../../Zotlabs/Module/Settings/Display.php:211
-msgid "(comments displayed separately)"
+#: ../../Zotlabs/Module/Settings/Network.php:58
+msgid "Stream Settings"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Display.php:211
-msgid "Use blog/list mode on grid page"
+#: ../../Zotlabs/Module/Embedphotos.php:140 ../../Zotlabs/Module/Photos.php:813
+#: ../../Zotlabs/Module/Photos.php:1352 ../../Zotlabs/Widget/Portfolio.php:87
+#: ../../Zotlabs/Widget/Album.php:78
+msgid "View Photo"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Display.php:212
-msgid "Channel page max height of content (in pixels)"
+#: ../../Zotlabs/Module/Embedphotos.php:156 ../../Zotlabs/Module/Photos.php:844
+#: ../../Zotlabs/Widget/Portfolio.php:108 ../../Zotlabs/Widget/Album.php:95
+msgid "Edit Album"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Display.php:212
-#: ../../Zotlabs/Module/Settings/Display.php:213
-msgid "click to expand content exceeding this height"
+#: ../../Zotlabs/Module/Embedphotos.php:158 ../../Zotlabs/Module/Photos.php:714
+#: ../../Zotlabs/Module/Profile_photo.php:459
+#: ../../Zotlabs/Module/Cover_photo.php:395
+#: ../../Zotlabs/Storage/Browser.php:392 ../../Zotlabs/Widget/Cdav.php:133
+#: ../../Zotlabs/Widget/Cdav.php:169 ../../Zotlabs/Widget/Portfolio.php:110
+#: ../../Zotlabs/Widget/Album.php:97
+msgid "Upload"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Display.php:213
-msgid "Grid page max height of content (in pixels)"
+#: ../../Zotlabs/Module/Tokens.php:39
+#, php-format
+msgid "This channel is limited to %d tokens"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Oauth.php:35
-msgid "Name is required"
+#: ../../Zotlabs/Module/Tokens.php:45
+msgid "Name and Password are required."
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Oauth.php:39
-msgid "Key and Secret are required"
+#: ../../Zotlabs/Module/Tokens.php:85
+msgid "Token saved."
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Oauth.php:91
-#: ../../Zotlabs/Module/Settings/Oauth.php:117
-#: ../../addon/statusnet/statusnet.php:894 ../../addon/twitter/twitter.php:781
-msgid "Consumer Key"
+#: ../../Zotlabs/Module/Tokens.php:99
+msgid "Guest Access App"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Oauth.php:94
-#: ../../Zotlabs/Module/Settings/Oauth.php:120
-msgid "Icon url"
+#: ../../Zotlabs/Module/Tokens.php:100
+msgid "Create access tokens so that non-members can access private content"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Oauth.php:94
-#: ../../Zotlabs/Module/Sources.php:115 ../../Zotlabs/Module/Sources.php:150
-msgid "Optional"
+#: ../../Zotlabs/Module/Tokens.php:133
+msgid ""
+"Use this form to create temporary access identifiers to share things with "
+"non-members. These identities may be used in Access Control Lists and "
+"visitors may login using these credentials to access private content."
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Oauth.php:105
-msgid "Application not found."
+#: ../../Zotlabs/Module/Tokens.php:135
+msgid ""
+"You may also provide <em>dropbox</em> style access links to friends and "
+"associates by adding the Login Password to any specific site URL as shown. "
+"Examples:"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Oauth.php:148
-msgid "Connected Apps"
+#: ../../Zotlabs/Module/Tokens.php:170
+msgid "Guest Access Tokens"
 msgstr ""
 
-#: ../../Zotlabs/Module/Embedphotos.php:140 ../../Zotlabs/Module/Photos.php:816
-#: ../../Zotlabs/Module/Photos.php:1355 ../../Zotlabs/Widget/Portfolio.php:87
-#: ../../Zotlabs/Widget/Album.php:78
-msgid "View Photo"
+#: ../../Zotlabs/Module/Tokens.php:177
+msgid "Login Name"
 msgstr ""
 
-#: ../../Zotlabs/Module/Embedphotos.php:156 ../../Zotlabs/Module/Photos.php:847
-#: ../../Zotlabs/Widget/Portfolio.php:108 ../../Zotlabs/Widget/Album.php:95
-msgid "Edit Album"
+#: ../../Zotlabs/Module/Tokens.php:178
+msgid "Login Password"
 msgstr ""
 
-#: ../../Zotlabs/Module/Embedphotos.php:158 ../../Zotlabs/Module/Photos.php:717
-#: ../../Zotlabs/Module/Profile_photo.php:459
-#: ../../Zotlabs/Module/Cover_photo.php:395
-#: ../../Zotlabs/Storage/Browser.php:392 ../../Zotlabs/Widget/Cdav.php:133
-#: ../../Zotlabs/Widget/Cdav.php:169 ../../Zotlabs/Widget/Portfolio.php:110
-#: ../../Zotlabs/Widget/Album.php:97
-msgid "Upload"
+#: ../../Zotlabs/Module/Tokens.php:179
+msgid "Expires (yyyy-mm-dd)"
+msgstr ""
+
+#: ../../Zotlabs/Module/Tokens.php:180 ../../Zotlabs/Module/Connedit.php:891
+msgid "Their Settings"
 msgstr ""
 
 #: ../../Zotlabs/Module/Achievements.php:38
@@ -4391,8 +4361,8 @@ msgid "URL for photo of thing (optional)"
 msgstr ""
 
 #: ../../Zotlabs/Module/Thing.php:319 ../../Zotlabs/Module/Thing.php:372
-#: ../../Zotlabs/Module/Photos.php:707 ../../Zotlabs/Module/Photos.php:1076
-#: ../../Zotlabs/Module/Connedit.php:676 ../../Zotlabs/Module/Chat.php:235
+#: ../../Zotlabs/Module/Photos.php:704 ../../Zotlabs/Module/Photos.php:1073
+#: ../../Zotlabs/Module/Connedit.php:677 ../../Zotlabs/Module/Chat.php:243
 #: ../../Zotlabs/Module/Filestorage.php:170 ../../include/acl_selectors.php:123
 msgid "Permissions"
 msgstr ""
@@ -4423,7 +4393,7 @@ msgid "No channel. Import failed."
 msgstr ""
 
 #: ../../Zotlabs/Module/Import.php:513
-#: ../../addon/diaspora/import_diaspora.php:139
+#: ../../addon/diaspora/import_diaspora.php:141
 msgid "Import completed."
 msgstr ""
 
@@ -4498,24 +4468,109 @@ msgstr ""
 msgid "Authentication failed."
 msgstr ""
 
-#: ../../Zotlabs/Module/Rmagic.php:75 ../../boot.php:1614
-#: ../../include/channel.php:2334
+#: ../../Zotlabs/Module/Rmagic.php:75 ../../boot.php:1626
+#: ../../include/channel.php:2341
 msgid "Remote Authentication"
 msgstr ""
 
-#: ../../Zotlabs/Module/Rmagic.php:76 ../../include/channel.php:2335
+#: ../../Zotlabs/Module/Rmagic.php:76 ../../include/channel.php:2342
 msgid "Enter your channel address (e.g. channel@example.com)"
 msgstr ""
 
-#: ../../Zotlabs/Module/Rmagic.php:77 ../../include/channel.php:2336
+#: ../../Zotlabs/Module/Rmagic.php:77 ../../include/channel.php:2343
 msgid "Authenticate"
 msgstr ""
 
-#: ../../Zotlabs/Module/Cal.php:69
+#: ../../Zotlabs/Module/Oauth2.php:54
+msgid "Name and Secret are required"
+msgstr ""
+
+#: ../../Zotlabs/Module/Oauth2.php:106
+msgid "OAuth2 Apps Manager App"
+msgstr ""
+
+#: ../../Zotlabs/Module/Oauth2.php:107
+msgid "OAuth2 authenticatication tokens for mobile and remote apps"
+msgstr ""
+
+#: ../../Zotlabs/Module/Oauth2.php:115
+msgid "Add OAuth2 application"
+msgstr ""
+
+#: ../../Zotlabs/Module/Oauth2.php:118 ../../Zotlabs/Module/Oauth2.php:146
+#: ../../Zotlabs/Module/Oauth.php:113
+msgid "Name of application"
+msgstr ""
+
+#: ../../Zotlabs/Module/Oauth2.php:119 ../../Zotlabs/Module/Oauth2.php:147
+#: ../../Zotlabs/Module/Oauth.php:115 ../../Zotlabs/Module/Oauth.php:141
+#: ../../addon/statusnet/statusnet.php:893 ../../addon/twitter/twitter.php:785
+msgid "Consumer Secret"
+msgstr ""
+
+#: ../../Zotlabs/Module/Oauth2.php:119 ../../Zotlabs/Module/Oauth2.php:147
+#: ../../Zotlabs/Module/Oauth.php:114 ../../Zotlabs/Module/Oauth.php:115
+msgid "Automatically generated - change if desired. Max length 20"
+msgstr ""
+
+#: ../../Zotlabs/Module/Oauth2.php:120 ../../Zotlabs/Module/Oauth2.php:148
+#: ../../Zotlabs/Module/Oauth.php:116 ../../Zotlabs/Module/Oauth.php:142
+msgid "Redirect"
+msgstr ""
+
+#: ../../Zotlabs/Module/Oauth2.php:120 ../../Zotlabs/Module/Oauth2.php:148
+#: ../../Zotlabs/Module/Oauth.php:116
+msgid ""
+"Redirect URI - leave blank unless your application specifically requires this"
+msgstr ""
+
+#: ../../Zotlabs/Module/Oauth2.php:121 ../../Zotlabs/Module/Oauth2.php:149
+msgid "Grant Types"
+msgstr ""
+
+#: ../../Zotlabs/Module/Oauth2.php:121 ../../Zotlabs/Module/Oauth2.php:122
+msgid "leave blank unless your application sepcifically requires this"
+msgstr ""
+
+#: ../../Zotlabs/Module/Oauth2.php:122 ../../Zotlabs/Module/Oauth2.php:150
+msgid "Authorization scope"
+msgstr ""
+
+#: ../../Zotlabs/Module/Oauth2.php:134
+msgid "OAuth2 Application not found."
+msgstr ""
+
+#: ../../Zotlabs/Module/Oauth2.php:143 ../../Zotlabs/Module/Oauth2.php:193
+#: ../../Zotlabs/Module/Oauth.php:110 ../../Zotlabs/Module/Oauth.php:136
+#: ../../Zotlabs/Module/Oauth.php:172
+msgid "Add application"
+msgstr ""
+
+#: ../../Zotlabs/Module/Oauth2.php:149 ../../Zotlabs/Module/Oauth2.php:150
+msgid "leave blank unless your application specifically requires this"
+msgstr ""
+
+#: ../../Zotlabs/Module/Oauth2.php:192
+msgid "Connected OAuth2 Apps"
+msgstr ""
+
+#: ../../Zotlabs/Module/Oauth2.php:196 ../../Zotlabs/Module/Oauth.php:175
+msgid "Client key starts with"
+msgstr ""
+
+#: ../../Zotlabs/Module/Oauth2.php:197 ../../Zotlabs/Module/Oauth.php:176
+msgid "No name"
+msgstr ""
+
+#: ../../Zotlabs/Module/Oauth2.php:198 ../../Zotlabs/Module/Oauth.php:177
+msgid "Remove authorization"
+msgstr ""
+
+#: ../../Zotlabs/Module/Cal.php:70
 msgid "Permissions denied."
 msgstr ""
 
-#: ../../Zotlabs/Module/Cal.php:344 ../../include/text.php:2482
+#: ../../Zotlabs/Module/Cal.php:343 ../../include/text.php:2489
 msgid "Import"
 msgstr ""
 
@@ -4541,6 +4596,14 @@ msgstr ""
 msgid "Item not available."
 msgstr ""
 
+#: ../../Zotlabs/Module/Randprof.php:29
+msgid "Random Channel App"
+msgstr ""
+
+#: ../../Zotlabs/Module/Randprof.php:30
+msgid "Visit a random channel in the $Projectname network"
+msgstr ""
+
 #: ../../Zotlabs/Module/Editblock.php:138
 msgid "Edit Block"
 msgstr ""
@@ -4549,189 +4612,196 @@ msgstr ""
 msgid "vcard"
 msgstr ""
 
-#: ../../Zotlabs/Module/Apps.php:50 ../../Zotlabs/Lib/Apps.php:291
-msgid "Apps"
+#: ../../Zotlabs/Module/Apps.php:50 ../../Zotlabs/Widget/Appstore.php:14
+msgid "Available Apps"
+msgstr ""
+
+#: ../../Zotlabs/Module/Apps.php:50
+msgid "Installed Apps"
 msgstr ""
 
 #: ../../Zotlabs/Module/Apps.php:53
-msgid "Manage apps"
+msgid "Manage Apps"
 msgstr ""
 
 #: ../../Zotlabs/Module/Apps.php:54
-msgid "Create new app"
+msgid "Create Custom App"
 msgstr ""
 
-#: ../../Zotlabs/Module/Mood.php:67 ../../include/conversation.php:268
+#: ../../Zotlabs/Module/Mood.php:75 ../../include/conversation.php:268
 #, php-format
 msgctxt "mood"
 msgid "%1$s is %2$s"
 msgstr ""
 
-#: ../../Zotlabs/Module/Mood.php:135 ../../Zotlabs/Lib/Apps.php:315
-msgid "Mood"
+#: ../../Zotlabs/Module/Mood.php:132
+msgid "Mood App"
 msgstr ""
 
-#: ../../Zotlabs/Module/Mood.php:136
+#: ../../Zotlabs/Module/Mood.php:133 ../../Zotlabs/Module/Mood.php:153
 msgid "Set your current mood and tell your friends"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connections.php:55
-#: ../../Zotlabs/Module/Connections.php:112
-#: ../../Zotlabs/Module/Connections.php:256
+#: ../../Zotlabs/Module/Mood.php:152 ../../Zotlabs/Lib/Apps.php:325
+msgid "Mood"
+msgstr ""
+
+#: ../../Zotlabs/Module/Connections.php:58
+#: ../../Zotlabs/Module/Connections.php:115
+#: ../../Zotlabs/Module/Connections.php:259
 msgid "Active"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connections.php:60
-#: ../../Zotlabs/Module/Connections.php:164
-#: ../../Zotlabs/Module/Connections.php:261
+#: ../../Zotlabs/Module/Connections.php:63
+#: ../../Zotlabs/Module/Connections.php:167
+#: ../../Zotlabs/Module/Connections.php:264
 msgid "Blocked"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connections.php:65
-#: ../../Zotlabs/Module/Connections.php:171
-#: ../../Zotlabs/Module/Connections.php:260
+#: ../../Zotlabs/Module/Connections.php:68
+#: ../../Zotlabs/Module/Connections.php:174
+#: ../../Zotlabs/Module/Connections.php:263
 msgid "Ignored"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connections.php:70
-#: ../../Zotlabs/Module/Connections.php:185
-#: ../../Zotlabs/Module/Connections.php:259
+#: ../../Zotlabs/Module/Connections.php:73
+#: ../../Zotlabs/Module/Connections.php:188
+#: ../../Zotlabs/Module/Connections.php:262
 msgid "Hidden"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connections.php:75
-#: ../../Zotlabs/Module/Connections.php:178
+#: ../../Zotlabs/Module/Connections.php:78
+#: ../../Zotlabs/Module/Connections.php:181
 msgid "Archived/Unreachable"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connections.php:80
-#: ../../Zotlabs/Module/Connections.php:89 ../../Zotlabs/Module/Menu.php:179
+#: ../../Zotlabs/Module/Connections.php:83
+#: ../../Zotlabs/Module/Connections.php:92 ../../Zotlabs/Module/Menu.php:179
 #: ../../Zotlabs/Module/Notifications.php:50
-#: ../../include/conversation.php:1726
 msgid "New"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connections.php:94
-#: ../../Zotlabs/Module/Connections.php:108
-#: ../../Zotlabs/Module/Connedit.php:713 ../../Zotlabs/Widget/Affinity.php:26
+#: ../../Zotlabs/Module/Connections.php:97
+#: ../../Zotlabs/Module/Connections.php:111
+#: ../../Zotlabs/Module/Connedit.php:714 ../../Zotlabs/Widget/Affinity.php:26
 msgid "All"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connections.php:140
+#: ../../Zotlabs/Module/Connections.php:143
 msgid "Active Connections"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connections.php:143
+#: ../../Zotlabs/Module/Connections.php:146
 msgid "Show active connections"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connections.php:147
+#: ../../Zotlabs/Module/Connections.php:150
 #: ../../Zotlabs/Widget/Notifications.php:84
 msgid "New Connections"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connections.php:150
+#: ../../Zotlabs/Module/Connections.php:153
 msgid "Show pending (new) connections"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connections.php:167
+#: ../../Zotlabs/Module/Connections.php:170
 msgid "Only show blocked connections"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connections.php:174
+#: ../../Zotlabs/Module/Connections.php:177
 msgid "Only show ignored connections"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connections.php:181
+#: ../../Zotlabs/Module/Connections.php:184
 msgid "Only show archived/unreachable connections"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connections.php:188
+#: ../../Zotlabs/Module/Connections.php:191
 msgid "Only show hidden connections"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connections.php:203
+#: ../../Zotlabs/Module/Connections.php:206
 msgid "Show all connections"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connections.php:257
+#: ../../Zotlabs/Module/Connections.php:260
 msgid "Pending approval"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connections.php:258
+#: ../../Zotlabs/Module/Connections.php:261
 msgid "Archived"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connections.php:262
+#: ../../Zotlabs/Module/Connections.php:265
 msgid "Not connected at this location"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connections.php:279
+#: ../../Zotlabs/Module/Connections.php:282
 #, php-format
 msgid "%1$s [%2$s]"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connections.php:280
+#: ../../Zotlabs/Module/Connections.php:283
 msgid "Edit connection"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connections.php:282
+#: ../../Zotlabs/Module/Connections.php:285
 msgid "Delete connection"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connections.php:291
+#: ../../Zotlabs/Module/Connections.php:294
 msgid "Channel address"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connections.php:293
+#: ../../Zotlabs/Module/Connections.php:296 ../../include/features.php:313
 msgid "Network"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connections.php:296
+#: ../../Zotlabs/Module/Connections.php:299
 msgid "Call"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connections.php:298
+#: ../../Zotlabs/Module/Connections.php:301
 msgid "Status"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connections.php:300
+#: ../../Zotlabs/Module/Connections.php:303
 msgid "Connected"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connections.php:302
+#: ../../Zotlabs/Module/Connections.php:305
 msgid "Approve connection"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connections.php:304
+#: ../../Zotlabs/Module/Connections.php:307
 msgid "Ignore connection"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connections.php:305
-#: ../../Zotlabs/Module/Connedit.php:630
+#: ../../Zotlabs/Module/Connections.php:308
+#: ../../Zotlabs/Module/Connedit.php:631
 msgid "Ignore"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connections.php:306
+#: ../../Zotlabs/Module/Connections.php:309
 msgid "Recent activity"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connections.php:331 ../../Zotlabs/Lib/Apps.php:298
-#: ../../include/text.php:975
+#: ../../Zotlabs/Module/Connections.php:334 ../../Zotlabs/Lib/Apps.php:308
+#: ../../include/text.php:981 ../../include/features.php:125
 msgid "Connections"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connections.php:336
+#: ../../Zotlabs/Module/Connections.php:339
 msgid "Search your connections"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connections.php:337
+#: ../../Zotlabs/Module/Connections.php:340
 msgid "Connections search"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connections.php:338
-#: ../../Zotlabs/Module/Directory.php:401
-#: ../../Zotlabs/Module/Directory.php:406 ../../include/contact_widgets.php:23
+#: ../../Zotlabs/Module/Connections.php:341
+#: ../../Zotlabs/Module/Directory.php:405
+#: ../../Zotlabs/Module/Directory.php:410 ../../include/contact_widgets.php:23
 msgid "Find"
 msgstr ""
 
@@ -4739,15 +4809,23 @@ msgstr ""
 msgid "item"
 msgstr ""
 
-#: ../../Zotlabs/Module/Bookmarks.php:56
+#: ../../Zotlabs/Module/Bookmarks.php:62
 msgid "Bookmark added"
 msgstr ""
 
+#: ../../Zotlabs/Module/Bookmarks.php:78
+msgid "Bookmarks App"
+msgstr ""
+
 #: ../../Zotlabs/Module/Bookmarks.php:79
+msgid "Bookmark links from posts and manage them"
+msgstr ""
+
+#: ../../Zotlabs/Module/Bookmarks.php:92
 msgid "My Bookmarks"
 msgstr ""
 
-#: ../../Zotlabs/Module/Bookmarks.php:90
+#: ../../Zotlabs/Module/Bookmarks.php:103
 msgid "My Connections Bookmarks"
 msgstr ""
 
@@ -4791,7 +4869,7 @@ msgstr ""
 msgid "Delete Album"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:174 ../../Zotlabs/Module/Photos.php:1088
+#: ../../Zotlabs/Module/Photos.php:174 ../../Zotlabs/Module/Photos.php:1085
 msgid "Delete Photo"
 msgstr ""
 
@@ -4803,178 +4881,178 @@ msgstr ""
 msgid "Access to this item is restricted."
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:651
+#: ../../Zotlabs/Module/Photos.php:648
 #, php-format
 msgid "%1$.2f MB of %2$.2f MB photo storage used."
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:654
+#: ../../Zotlabs/Module/Photos.php:651
 #, php-format
 msgid "%1$.2f MB photo storage used."
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:696
+#: ../../Zotlabs/Module/Photos.php:693
 msgid "Upload Photos"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:700
+#: ../../Zotlabs/Module/Photos.php:697
 msgid "Enter an album name"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:701
+#: ../../Zotlabs/Module/Photos.php:698
 msgid "or select an existing album (doubleclick)"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:702
+#: ../../Zotlabs/Module/Photos.php:699
 msgid "Create a status post for this upload"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:704
+#: ../../Zotlabs/Module/Photos.php:701
 msgid "Description (optional)"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:790
+#: ../../Zotlabs/Module/Photos.php:787
 msgid "Show Newest First"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:792
+#: ../../Zotlabs/Module/Photos.php:789
 msgid "Show Oldest First"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:849 ../../Zotlabs/Module/Photos.php:1386
+#: ../../Zotlabs/Module/Photos.php:846 ../../Zotlabs/Module/Photos.php:1383
 msgid "Add Photos"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:897
+#: ../../Zotlabs/Module/Photos.php:894
 msgid "Permission denied. Access to this item may be restricted."
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:899
+#: ../../Zotlabs/Module/Photos.php:896
 msgid "Photo not available"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:957
+#: ../../Zotlabs/Module/Photos.php:954
 msgid "Use as profile photo"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:958
+#: ../../Zotlabs/Module/Photos.php:955
 msgid "Use as cover photo"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:965
+#: ../../Zotlabs/Module/Photos.php:962
 msgid "Private Photo"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:980
+#: ../../Zotlabs/Module/Photos.php:977
 msgid "View Full Size"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:1062
+#: ../../Zotlabs/Module/Photos.php:1059
 msgid "Edit photo"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:1064
+#: ../../Zotlabs/Module/Photos.php:1061
 msgid "Rotate CW (right)"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:1065
+#: ../../Zotlabs/Module/Photos.php:1062
 msgid "Rotate CCW (left)"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:1068
+#: ../../Zotlabs/Module/Photos.php:1065
 msgid "Move photo to album"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:1069
+#: ../../Zotlabs/Module/Photos.php:1066
 msgid "Enter a new album name"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:1070
+#: ../../Zotlabs/Module/Photos.php:1067
 msgid "or select an existing one (doubleclick)"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:1075
+#: ../../Zotlabs/Module/Photos.php:1072
 msgid "Add a Tag"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:1083
+#: ../../Zotlabs/Module/Photos.php:1080
 msgid "Example: @bob, @Barbara_Jensen, @jim@example.com"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:1086
+#: ../../Zotlabs/Module/Photos.php:1083
 msgid "Flag as adult in album view"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:1105 ../../Zotlabs/Lib/ThreadItem.php:285
+#: ../../Zotlabs/Module/Photos.php:1102 ../../Zotlabs/Lib/ThreadItem.php:289
 msgid "I like this (toggle)"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:1106 ../../Zotlabs/Lib/ThreadItem.php:286
+#: ../../Zotlabs/Module/Photos.php:1103 ../../Zotlabs/Lib/ThreadItem.php:290
 msgid "I don't like this (toggle)"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:1108 ../../Zotlabs/Lib/ThreadItem.php:432
+#: ../../Zotlabs/Module/Photos.php:1105 ../../Zotlabs/Lib/ThreadItem.php:441
 #: ../../include/conversation.php:787
 msgid "Please wait"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:1124 ../../Zotlabs/Module/Photos.php:1242
-#: ../../Zotlabs/Lib/ThreadItem.php:754
+#: ../../Zotlabs/Module/Photos.php:1121 ../../Zotlabs/Module/Photos.php:1239
+#: ../../Zotlabs/Lib/ThreadItem.php:764
 msgid "This is you"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:1126 ../../Zotlabs/Module/Photos.php:1244
-#: ../../Zotlabs/Lib/ThreadItem.php:756 ../../include/js_strings.php:6
+#: ../../Zotlabs/Module/Photos.php:1123 ../../Zotlabs/Module/Photos.php:1241
+#: ../../Zotlabs/Lib/ThreadItem.php:766 ../../include/js_strings.php:6
 msgid "Comment"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:1142 ../../include/conversation.php:619
+#: ../../Zotlabs/Module/Photos.php:1139 ../../include/conversation.php:619
 msgctxt "title"
 msgid "Likes"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:1142 ../../include/conversation.php:619
+#: ../../Zotlabs/Module/Photos.php:1139 ../../include/conversation.php:619
 msgctxt "title"
 msgid "Dislikes"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:1143 ../../include/conversation.php:620
+#: ../../Zotlabs/Module/Photos.php:1140 ../../include/conversation.php:620
 msgctxt "title"
 msgid "Agree"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:1143 ../../include/conversation.php:620
+#: ../../Zotlabs/Module/Photos.php:1140 ../../include/conversation.php:620
 msgctxt "title"
 msgid "Disagree"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:1143 ../../include/conversation.php:620
+#: ../../Zotlabs/Module/Photos.php:1140 ../../include/conversation.php:620
 msgctxt "title"
 msgid "Abstain"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:1144 ../../include/conversation.php:621
+#: ../../Zotlabs/Module/Photos.php:1141 ../../include/conversation.php:621
 msgctxt "title"
 msgid "Attending"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:1144 ../../include/conversation.php:621
+#: ../../Zotlabs/Module/Photos.php:1141 ../../include/conversation.php:621
 msgctxt "title"
 msgid "Not attending"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:1144 ../../include/conversation.php:621
+#: ../../Zotlabs/Module/Photos.php:1141 ../../include/conversation.php:621
 msgctxt "title"
 msgid "Might attend"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:1161 ../../Zotlabs/Module/Photos.php:1173
-#: ../../Zotlabs/Lib/ThreadItem.php:212 ../../Zotlabs/Lib/ThreadItem.php:224
+#: ../../Zotlabs/Module/Photos.php:1158 ../../Zotlabs/Module/Photos.php:1170
+#: ../../Zotlabs/Lib/ThreadItem.php:214 ../../Zotlabs/Lib/ThreadItem.php:226
 msgid "View all"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:1165 ../../Zotlabs/Lib/ThreadItem.php:216
-#: ../../include/conversation.php:1990 ../../include/channel.php:1539
+#: ../../Zotlabs/Module/Photos.php:1162 ../../Zotlabs/Lib/ThreadItem.php:218
+#: ../../include/conversation.php:1693 ../../include/channel.php:1546
 #: ../../include/taxonomy.php:661
 msgctxt "noun"
 msgid "Like"
@@ -4982,262 +5060,278 @@ msgid_plural "Likes"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../../Zotlabs/Module/Photos.php:1170 ../../Zotlabs/Lib/ThreadItem.php:221
-#: ../../include/conversation.php:1993
+#: ../../Zotlabs/Module/Photos.php:1167 ../../Zotlabs/Lib/ThreadItem.php:223
+#: ../../include/conversation.php:1696
 msgctxt "noun"
 msgid "Dislike"
 msgid_plural "Dislikes"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../../Zotlabs/Module/Photos.php:1270
+#: ../../Zotlabs/Module/Photos.php:1267
 msgid "Photo Tools"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:1279
+#: ../../Zotlabs/Module/Photos.php:1276
 msgid "In This Photo:"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:1284
+#: ../../Zotlabs/Module/Photos.php:1281
 msgid "Map"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:1292 ../../Zotlabs/Lib/ThreadItem.php:420
+#: ../../Zotlabs/Module/Photos.php:1289 ../../Zotlabs/Lib/ThreadItem.php:429
 msgctxt "noun"
 msgid "Likes"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:1293 ../../Zotlabs/Lib/ThreadItem.php:421
+#: ../../Zotlabs/Module/Photos.php:1290 ../../Zotlabs/Lib/ThreadItem.php:430
 msgctxt "noun"
 msgid "Dislikes"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:1298 ../../Zotlabs/Lib/ThreadItem.php:426
+#: ../../Zotlabs/Module/Photos.php:1295 ../../Zotlabs/Lib/ThreadItem.php:435
 #: ../../include/acl_selectors.php:125
 msgid "Close"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:1370 ../../Zotlabs/Module/Photos.php:1383
-#: ../../Zotlabs/Module/Photos.php:1384 ../../include/photos.php:668
+#: ../../Zotlabs/Module/Photos.php:1367 ../../Zotlabs/Module/Photos.php:1380
+#: ../../Zotlabs/Module/Photos.php:1381 ../../include/photos.php:668
 msgid "Recent Photos"
 msgstr ""
 
-#: ../../Zotlabs/Module/Wiki.php:30 ../../addon/cart/cart.php:1293
+#: ../../Zotlabs/Module/Wiki.php:35 ../../addon/cart/cart.php:1297
 msgid "Profile Unavailable."
 msgstr ""
 
-#: ../../Zotlabs/Module/Wiki.php:44 ../../Zotlabs/Module/Cloud.php:123
-msgid "Not found"
+#: ../../Zotlabs/Module/Wiki.php:52
+msgid "Wiki App"
 msgstr ""
 
-#: ../../Zotlabs/Module/Wiki.php:68 ../../addon/cart/myshop.php:51
-#: ../../addon/cart/cart.php:1420
-#: ../../addon/cart/submodules/paypalbutton.php:481
-#: ../../addon/cart/manual_payments.php:62
+#: ../../Zotlabs/Module/Wiki.php:53
+msgid "Provide a wiki for your channel"
+msgstr ""
+
+#: ../../Zotlabs/Module/Wiki.php:77 ../../addon/cart/myshop.php:37
+#: ../../addon/cart/cart.php:1440
+#: ../../addon/cart/submodules/paypalbutton.php:456
+#: ../../addon/cart/manual_payments.php:93
 msgid "Invalid channel"
 msgstr ""
 
-#: ../../Zotlabs/Module/Wiki.php:124
+#: ../../Zotlabs/Module/Wiki.php:133
 msgid "Error retrieving wiki"
 msgstr ""
 
-#: ../../Zotlabs/Module/Wiki.php:131
+#: ../../Zotlabs/Module/Wiki.php:140
 msgid "Error creating zip file export folder"
 msgstr ""
 
-#: ../../Zotlabs/Module/Wiki.php:182
+#: ../../Zotlabs/Module/Wiki.php:191
 msgid "Error downloading wiki: "
 msgstr ""
 
-#: ../../Zotlabs/Module/Wiki.php:197 ../../include/conversation.php:1937
-#: ../../include/nav.php:486
+#: ../../Zotlabs/Module/Wiki.php:206 ../../Zotlabs/Widget/Wiki_list.php:19
+#: ../../include/nav.php:506
 msgid "Wikis"
 msgstr ""
 
-#: ../../Zotlabs/Module/Wiki.php:203
+#: ../../Zotlabs/Module/Wiki.php:212
 msgid "Download"
 msgstr ""
 
-#: ../../Zotlabs/Module/Wiki.php:205 ../../Zotlabs/Module/Chat.php:256
+#: ../../Zotlabs/Module/Wiki.php:214 ../../Zotlabs/Module/Chat.php:264
 #: ../../Zotlabs/Module/Profiles.php:831 ../../Zotlabs/Module/Manage.php:145
 msgid "Create New"
 msgstr ""
 
-#: ../../Zotlabs/Module/Wiki.php:207
+#: ../../Zotlabs/Module/Wiki.php:216
 msgid "Wiki name"
 msgstr ""
 
-#: ../../Zotlabs/Module/Wiki.php:208
+#: ../../Zotlabs/Module/Wiki.php:217
 msgid "Content type"
 msgstr ""
 
-#: ../../Zotlabs/Module/Wiki.php:208 ../../Zotlabs/Module/Wiki.php:350
-#: ../../Zotlabs/Widget/Wiki_pages.php:36
-#: ../../Zotlabs/Widget/Wiki_pages.php:93 ../../addon/mdpost/mdpost.php:40
-#: ../../include/text.php:1886
+#: ../../Zotlabs/Module/Wiki.php:217 ../../Zotlabs/Module/Wiki.php:371
+#: ../../Zotlabs/Widget/Wiki_pages.php:38
+#: ../../Zotlabs/Widget/Wiki_pages.php:95 ../../addon/mdpost/mdpost.php:41
+#: ../../include/text.php:1892
 msgid "Markdown"
 msgstr ""
 
-#: ../../Zotlabs/Module/Wiki.php:208 ../../Zotlabs/Module/Wiki.php:350
-#: ../../Zotlabs/Widget/Wiki_pages.php:36
-#: ../../Zotlabs/Widget/Wiki_pages.php:93 ../../include/text.php:1884
+#: ../../Zotlabs/Module/Wiki.php:217 ../../Zotlabs/Module/Wiki.php:371
+#: ../../Zotlabs/Widget/Wiki_pages.php:38
+#: ../../Zotlabs/Widget/Wiki_pages.php:95 ../../include/text.php:1890
 msgid "BBcode"
 msgstr ""
 
-#: ../../Zotlabs/Module/Wiki.php:208 ../../Zotlabs/Widget/Wiki_pages.php:36
-#: ../../Zotlabs/Widget/Wiki_pages.php:93 ../../include/text.php:1887
+#: ../../Zotlabs/Module/Wiki.php:217 ../../Zotlabs/Widget/Wiki_pages.php:38
+#: ../../Zotlabs/Widget/Wiki_pages.php:95 ../../include/text.php:1893
 msgid "Text"
 msgstr ""
 
-#: ../../Zotlabs/Module/Wiki.php:210 ../../Zotlabs/Storage/Browser.php:286
+#: ../../Zotlabs/Module/Wiki.php:219 ../../Zotlabs/Storage/Browser.php:286
 msgid "Type"
 msgstr ""
 
-#: ../../Zotlabs/Module/Wiki.php:211
+#: ../../Zotlabs/Module/Wiki.php:220
 msgid "Any&nbsp;type"
 msgstr ""
 
-#: ../../Zotlabs/Module/Wiki.php:218
+#: ../../Zotlabs/Module/Wiki.php:227
 msgid "Lock content type"
 msgstr ""
 
-#: ../../Zotlabs/Module/Wiki.php:219
+#: ../../Zotlabs/Module/Wiki.php:228
 msgid "Create a status post for this wiki"
 msgstr ""
 
-#: ../../Zotlabs/Module/Wiki.php:220
+#: ../../Zotlabs/Module/Wiki.php:229
 msgid "Edit Wiki Name"
 msgstr ""
 
-#: ../../Zotlabs/Module/Wiki.php:262
+#: ../../Zotlabs/Module/Wiki.php:274
 msgid "Wiki not found"
 msgstr ""
 
-#: ../../Zotlabs/Module/Wiki.php:286
+#: ../../Zotlabs/Module/Wiki.php:300
 msgid "Rename page"
 msgstr ""
 
-#: ../../Zotlabs/Module/Wiki.php:307
+#: ../../Zotlabs/Module/Wiki.php:321
 msgid "Error retrieving page content"
 msgstr ""
 
-#: ../../Zotlabs/Module/Wiki.php:315 ../../Zotlabs/Module/Wiki.php:317
+#: ../../Zotlabs/Module/Wiki.php:329 ../../Zotlabs/Module/Wiki.php:331
 msgid "New page"
 msgstr ""
 
-#: ../../Zotlabs/Module/Wiki.php:345
+#: ../../Zotlabs/Module/Wiki.php:366
 msgid "Revision Comparison"
 msgstr ""
 
-#: ../../Zotlabs/Module/Wiki.php:346
+#: ../../Zotlabs/Module/Wiki.php:367 ../../Zotlabs/Lib/NativeWikiPage.php:564
+#: ../../Zotlabs/Widget/Wiki_page_history.php:25
 msgid "Revert"
 msgstr ""
 
-#: ../../Zotlabs/Module/Wiki.php:353
+#: ../../Zotlabs/Module/Wiki.php:374
 msgid "Short description of your changes (optional)"
 msgstr ""
 
-#: ../../Zotlabs/Module/Wiki.php:362
+#: ../../Zotlabs/Module/Wiki.php:384
 msgid "Source"
 msgstr ""
 
-#: ../../Zotlabs/Module/Wiki.php:372
+#: ../../Zotlabs/Module/Wiki.php:394
 msgid "New page name"
 msgstr ""
 
-#: ../../Zotlabs/Module/Wiki.php:377
+#: ../../Zotlabs/Module/Wiki.php:399
 msgid "Embed image from photo albums"
 msgstr ""
 
-#: ../../Zotlabs/Module/Wiki.php:378 ../../include/conversation.php:1396
+#: ../../Zotlabs/Module/Wiki.php:400 ../../addon/hsse/hsse.php:208
+#: ../../include/conversation.php:1411
 msgid "Embed an image from your albums"
 msgstr ""
 
-#: ../../Zotlabs/Module/Wiki.php:380 ../../Zotlabs/Module/Profile_photo.php:466
-#: ../../Zotlabs/Module/Cover_photo.php:400 ../../include/conversation.php:1398
-#: ../../include/conversation.php:1445
+#: ../../Zotlabs/Module/Wiki.php:402 ../../Zotlabs/Module/Profile_photo.php:466
+#: ../../Zotlabs/Module/Cover_photo.php:400 ../../addon/hsse/hsse.php:210
+#: ../../addon/hsse/hsse.php:257 ../../include/conversation.php:1413
+#: ../../include/conversation.php:1460
 msgid "OK"
 msgstr ""
 
-#: ../../Zotlabs/Module/Wiki.php:381 ../../Zotlabs/Module/Profile_photo.php:467
-#: ../../Zotlabs/Module/Cover_photo.php:401 ../../include/conversation.php:1327
+#: ../../Zotlabs/Module/Wiki.php:403 ../../Zotlabs/Module/Profile_photo.php:467
+#: ../../Zotlabs/Module/Cover_photo.php:401 ../../addon/hsse/hsse.php:139
+#: ../../include/conversation.php:1342
 msgid "Choose images to embed"
 msgstr ""
 
-#: ../../Zotlabs/Module/Wiki.php:382 ../../Zotlabs/Module/Profile_photo.php:468
-#: ../../Zotlabs/Module/Cover_photo.php:402 ../../include/conversation.php:1328
+#: ../../Zotlabs/Module/Wiki.php:404 ../../Zotlabs/Module/Profile_photo.php:468
+#: ../../Zotlabs/Module/Cover_photo.php:402 ../../addon/hsse/hsse.php:140
+#: ../../include/conversation.php:1343
 msgid "Choose an album"
 msgstr ""
 
-#: ../../Zotlabs/Module/Wiki.php:383 ../../Zotlabs/Module/Profile_photo.php:469
+#: ../../Zotlabs/Module/Wiki.php:405 ../../Zotlabs/Module/Profile_photo.php:469
 #: ../../Zotlabs/Module/Cover_photo.php:403
 msgid "Choose a different album"
 msgstr ""
 
-#: ../../Zotlabs/Module/Wiki.php:384 ../../Zotlabs/Module/Profile_photo.php:470
-#: ../../Zotlabs/Module/Cover_photo.php:404 ../../include/conversation.php:1330
+#: ../../Zotlabs/Module/Wiki.php:406 ../../Zotlabs/Module/Profile_photo.php:470
+#: ../../Zotlabs/Module/Cover_photo.php:404 ../../addon/hsse/hsse.php:142
+#: ../../include/conversation.php:1345
 msgid "Error getting album list"
 msgstr ""
 
-#: ../../Zotlabs/Module/Wiki.php:385 ../../Zotlabs/Module/Profile_photo.php:471
-#: ../../Zotlabs/Module/Cover_photo.php:405 ../../include/conversation.php:1331
+#: ../../Zotlabs/Module/Wiki.php:407 ../../Zotlabs/Module/Profile_photo.php:471
+#: ../../Zotlabs/Module/Cover_photo.php:405 ../../addon/hsse/hsse.php:143
+#: ../../include/conversation.php:1346
 msgid "Error getting photo link"
 msgstr ""
 
-#: ../../Zotlabs/Module/Wiki.php:386 ../../Zotlabs/Module/Profile_photo.php:472
-#: ../../Zotlabs/Module/Cover_photo.php:406 ../../include/conversation.php:1332
+#: ../../Zotlabs/Module/Wiki.php:408 ../../Zotlabs/Module/Profile_photo.php:472
+#: ../../Zotlabs/Module/Cover_photo.php:406 ../../addon/hsse/hsse.php:144
+#: ../../include/conversation.php:1347
 msgid "Error getting album"
 msgstr ""
 
-#: ../../Zotlabs/Module/Wiki.php:462
+#: ../../Zotlabs/Module/Wiki.php:410
+msgid "History"
+msgstr ""
+
+#: ../../Zotlabs/Module/Wiki.php:488
 msgid "Error creating wiki. Invalid name."
 msgstr ""
 
-#: ../../Zotlabs/Module/Wiki.php:469
+#: ../../Zotlabs/Module/Wiki.php:495
 msgid "A wiki with this name already exists."
 msgstr ""
 
-#: ../../Zotlabs/Module/Wiki.php:482
+#: ../../Zotlabs/Module/Wiki.php:508
 msgid "Wiki created, but error creating Home page."
 msgstr ""
 
-#: ../../Zotlabs/Module/Wiki.php:489
+#: ../../Zotlabs/Module/Wiki.php:515
 msgid "Error creating wiki"
 msgstr ""
 
-#: ../../Zotlabs/Module/Wiki.php:512
+#: ../../Zotlabs/Module/Wiki.php:539
 msgid "Error updating wiki. Invalid name."
 msgstr ""
 
-#: ../../Zotlabs/Module/Wiki.php:532
+#: ../../Zotlabs/Module/Wiki.php:559
 msgid "Error updating wiki"
 msgstr ""
 
-#: ../../Zotlabs/Module/Wiki.php:547
+#: ../../Zotlabs/Module/Wiki.php:574
 msgid "Wiki delete permission denied."
 msgstr ""
 
-#: ../../Zotlabs/Module/Wiki.php:557
+#: ../../Zotlabs/Module/Wiki.php:584
 msgid "Error deleting wiki"
 msgstr ""
 
-#: ../../Zotlabs/Module/Wiki.php:590
+#: ../../Zotlabs/Module/Wiki.php:617
 msgid "New page created"
 msgstr ""
 
-#: ../../Zotlabs/Module/Wiki.php:711
+#: ../../Zotlabs/Module/Wiki.php:739
 msgid "Cannot delete Home"
 msgstr ""
 
-#: ../../Zotlabs/Module/Wiki.php:775
+#: ../../Zotlabs/Module/Wiki.php:803
 msgid "Current Revision"
 msgstr ""
 
-#: ../../Zotlabs/Module/Wiki.php:775
+#: ../../Zotlabs/Module/Wiki.php:803
 msgid "Selected Revision"
 msgstr ""
 
-#: ../../Zotlabs/Module/Wiki.php:825
+#: ../../Zotlabs/Module/Wiki.php:853
 msgid "You must be authenticated."
 msgstr ""
 
@@ -5245,72 +5339,84 @@ msgstr ""
 msgid "toggle full screen mode"
 msgstr ""
 
-#: ../../Zotlabs/Module/Pdledit.php:21
+#: ../../Zotlabs/Module/Pdledit.php:26
 msgid "Layout updated."
 msgstr ""
 
-#: ../../Zotlabs/Module/Pdledit.php:34 ../../Zotlabs/Module/Chat.php:219
-msgid "Feature disabled."
+#: ../../Zotlabs/Module/Pdledit.php:42
+msgid "PDL Editor App"
 msgstr ""
 
-#: ../../Zotlabs/Module/Pdledit.php:47 ../../Zotlabs/Module/Pdledit.php:90
+#: ../../Zotlabs/Module/Pdledit.php:43
+msgid "Provides the ability to edit system page layouts"
+msgstr ""
+
+#: ../../Zotlabs/Module/Pdledit.php:56 ../../Zotlabs/Module/Pdledit.php:99
 msgid "Edit System Page Description"
 msgstr ""
 
-#: ../../Zotlabs/Module/Pdledit.php:68
+#: ../../Zotlabs/Module/Pdledit.php:77
 msgid "(modified)"
 msgstr ""
 
-#: ../../Zotlabs/Module/Pdledit.php:68 ../../Zotlabs/Module/Lostpass.php:133
+#: ../../Zotlabs/Module/Pdledit.php:77 ../../Zotlabs/Module/Lostpass.php:133
 msgid "Reset"
 msgstr ""
 
-#: ../../Zotlabs/Module/Pdledit.php:85
+#: ../../Zotlabs/Module/Pdledit.php:94
 msgid "Layout not found."
 msgstr ""
 
-#: ../../Zotlabs/Module/Pdledit.php:91
+#: ../../Zotlabs/Module/Pdledit.php:100
 msgid "Module Name:"
 msgstr ""
 
-#: ../../Zotlabs/Module/Pdledit.php:92
+#: ../../Zotlabs/Module/Pdledit.php:101
 msgid "Layout Help"
 msgstr ""
 
-#: ../../Zotlabs/Module/Pdledit.php:93
+#: ../../Zotlabs/Module/Pdledit.php:102
 msgid "Edit another layout"
 msgstr ""
 
-#: ../../Zotlabs/Module/Pdledit.php:94
+#: ../../Zotlabs/Module/Pdledit.php:103
 msgid "System layout"
 msgstr ""
 
-#: ../../Zotlabs/Module/Poke.php:182 ../../Zotlabs/Lib/Apps.php:316
-#: ../../include/conversation.php:1097
+#: ../../Zotlabs/Module/Poke.php:165
+msgid "Poke App"
+msgstr ""
+
+#: ../../Zotlabs/Module/Poke.php:166
+msgid "Poke somebody in your addressbook"
+msgstr ""
+
+#: ../../Zotlabs/Module/Poke.php:199 ../../Zotlabs/Lib/Apps.php:326
+#: ../../include/conversation.php:1098
 msgid "Poke"
 msgstr ""
 
-#: ../../Zotlabs/Module/Poke.php:183
+#: ../../Zotlabs/Module/Poke.php:200
 msgid "Poke somebody"
 msgstr ""
 
-#: ../../Zotlabs/Module/Poke.php:186
+#: ../../Zotlabs/Module/Poke.php:203
 msgid "Poke/Prod"
 msgstr ""
 
-#: ../../Zotlabs/Module/Poke.php:187
+#: ../../Zotlabs/Module/Poke.php:204
 msgid "Poke, prod or do other things to somebody"
 msgstr ""
 
-#: ../../Zotlabs/Module/Poke.php:194
+#: ../../Zotlabs/Module/Poke.php:211
 msgid "Recipient"
 msgstr ""
 
-#: ../../Zotlabs/Module/Poke.php:195
+#: ../../Zotlabs/Module/Poke.php:212
 msgid "Choose what you wish to do to recipient"
 msgstr ""
 
-#: ../../Zotlabs/Module/Poke.php:198 ../../Zotlabs/Module/Poke.php:199
+#: ../../Zotlabs/Module/Poke.php:215 ../../Zotlabs/Module/Poke.php:216
 msgid "Make this post private"
 msgstr ""
 
@@ -5432,69 +5538,69 @@ msgstr ""
 msgid "Unable to locate original post."
 msgstr ""
 
-#: ../../Zotlabs/Module/Item.php:477
+#: ../../Zotlabs/Module/Item.php:479
 msgid "Empty post discarded."
 msgstr ""
 
-#: ../../Zotlabs/Module/Item.php:864
+#: ../../Zotlabs/Module/Item.php:866
 msgid "Duplicate post suppressed."
 msgstr ""
 
-#: ../../Zotlabs/Module/Item.php:1009
+#: ../../Zotlabs/Module/Item.php:1011
 msgid "System error. Post not saved."
 msgstr ""
 
-#: ../../Zotlabs/Module/Item.php:1045
+#: ../../Zotlabs/Module/Item.php:1047
 msgid "Your comment is awaiting approval."
 msgstr ""
 
-#: ../../Zotlabs/Module/Item.php:1162
+#: ../../Zotlabs/Module/Item.php:1164
 msgid "Unable to obtain post information from database."
 msgstr ""
 
-#: ../../Zotlabs/Module/Item.php:1191
+#: ../../Zotlabs/Module/Item.php:1171
 #, php-format
 msgid "You have reached your limit of %1$.0f top level posts."
 msgstr ""
 
-#: ../../Zotlabs/Module/Item.php:1198
+#: ../../Zotlabs/Module/Item.php:1178
 #, php-format
 msgid "You have reached your limit of %1$.0f webpages."
 msgstr ""
 
-#: ../../Zotlabs/Module/Ping.php:332
+#: ../../Zotlabs/Module/Ping.php:337
 msgid "sent you a private message"
 msgstr ""
 
-#: ../../Zotlabs/Module/Ping.php:385
+#: ../../Zotlabs/Module/Ping.php:390
 msgid "added your channel"
 msgstr ""
 
-#: ../../Zotlabs/Module/Ping.php:409
+#: ../../Zotlabs/Module/Ping.php:414
 msgid "requires approval"
 msgstr ""
 
-#: ../../Zotlabs/Module/Ping.php:419
+#: ../../Zotlabs/Module/Ping.php:424
 msgid "g A l F d"
 msgstr ""
 
-#: ../../Zotlabs/Module/Ping.php:437
+#: ../../Zotlabs/Module/Ping.php:442
 msgid "[today]"
 msgstr ""
 
-#: ../../Zotlabs/Module/Ping.php:446
+#: ../../Zotlabs/Module/Ping.php:451
 msgid "posted an event"
 msgstr ""
 
-#: ../../Zotlabs/Module/Ping.php:479
+#: ../../Zotlabs/Module/Ping.php:484
 msgid "shared a file with you"
 msgstr ""
 
-#: ../../Zotlabs/Module/Ping.php:654
+#: ../../Zotlabs/Module/Ping.php:659
 msgid "Private forum"
 msgstr ""
 
-#: ../../Zotlabs/Module/Ping.php:654
+#: ../../Zotlabs/Module/Ping.php:659
 msgid "Public forum"
 msgstr ""
 
@@ -5503,10 +5609,10 @@ msgid "Invalid item."
 msgstr ""
 
 #: ../../Zotlabs/Module/Page.php:136 ../../Zotlabs/Module/Block.php:77
-#: ../../Zotlabs/Module/Display.php:141 ../../Zotlabs/Module/Display.php:158
-#: ../../Zotlabs/Module/Display.php:175
-#: ../../Zotlabs/Lib/NativeWikiPage.php:519 ../../Zotlabs/Web/Router.php:167
-#: ../../include/help.php:81
+#: ../../Zotlabs/Module/Display.php:140 ../../Zotlabs/Module/Display.php:157
+#: ../../Zotlabs/Module/Display.php:174
+#: ../../Zotlabs/Lib/NativeWikiPage.php:521 ../../Zotlabs/Web/Router.php:185
+#: ../../include/help.php:132
 msgid "Page not found."
 msgstr ""
 
@@ -5520,303 +5626,302 @@ msgid ""
 "non proident, sunt in culpa qui officia deserunt mollit anim id est laborum."
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:79 ../../Zotlabs/Module/Defperms.php:59
+#: ../../Zotlabs/Module/Connedit.php:80 ../../Zotlabs/Module/Defperms.php:67
 msgid "Could not access contact record."
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:109
+#: ../../Zotlabs/Module/Connedit.php:110
 msgid "Could not locate selected profile."
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:246
+#: ../../Zotlabs/Module/Connedit.php:247
 msgid "Connection updated."
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:248
+#: ../../Zotlabs/Module/Connedit.php:249
 msgid "Failed to update connection record."
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:302
+#: ../../Zotlabs/Module/Connedit.php:303
 msgid "is now connected to"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:427
+#: ../../Zotlabs/Module/Connedit.php:428
 msgid "Could not access address book record."
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:475
+#: ../../Zotlabs/Module/Connedit.php:476
 msgid "Refresh failed - channel is currently unavailable."
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:490 ../../Zotlabs/Module/Connedit.php:499
-#: ../../Zotlabs/Module/Connedit.php:508 ../../Zotlabs/Module/Connedit.php:517
-#: ../../Zotlabs/Module/Connedit.php:530
+#: ../../Zotlabs/Module/Connedit.php:491 ../../Zotlabs/Module/Connedit.php:500
+#: ../../Zotlabs/Module/Connedit.php:509 ../../Zotlabs/Module/Connedit.php:518
+#: ../../Zotlabs/Module/Connedit.php:531
 msgid "Unable to set address book parameters."
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:554
+#: ../../Zotlabs/Module/Connedit.php:555
 msgid "Connection has been removed."
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:594 ../../Zotlabs/Lib/Apps.php:309
+#: ../../Zotlabs/Module/Connedit.php:595 ../../Zotlabs/Lib/Apps.php:319
 #: ../../addon/openclipatar/openclipatar.php:57
-#: ../../include/conversation.php:1037 ../../include/nav.php:108
+#: ../../include/conversation.php:1038 ../../include/nav.php:106
 msgid "View Profile"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:597
+#: ../../Zotlabs/Module/Connedit.php:598
 #, php-format
 msgid "View %s's profile"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:601
+#: ../../Zotlabs/Module/Connedit.php:602
 msgid "Refresh Permissions"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:604
+#: ../../Zotlabs/Module/Connedit.php:605
 msgid "Fetch updated permissions"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:608
+#: ../../Zotlabs/Module/Connedit.php:609
 msgid "Refresh Photo"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:611
+#: ../../Zotlabs/Module/Connedit.php:612
 msgid "Fetch updated photo"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:615 ../../include/conversation.php:1047
+#: ../../Zotlabs/Module/Connedit.php:616 ../../include/conversation.php:1048
 msgid "Recent Activity"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:618
+#: ../../Zotlabs/Module/Connedit.php:619
 msgid "View recent posts and comments"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:625
+#: ../../Zotlabs/Module/Connedit.php:626
 msgid "Block (or Unblock) all communications with this connection"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:626
+#: ../../Zotlabs/Module/Connedit.php:627
 msgid "This connection is blocked!"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:630
+#: ../../Zotlabs/Module/Connedit.php:631
 msgid "Unignore"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:633
+#: ../../Zotlabs/Module/Connedit.php:634
 msgid "Ignore (or Unignore) all inbound communications from this connection"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:634
+#: ../../Zotlabs/Module/Connedit.php:635
 msgid "This connection is ignored!"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:638
+#: ../../Zotlabs/Module/Connedit.php:639
 msgid "Unarchive"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:638
+#: ../../Zotlabs/Module/Connedit.php:639
 msgid "Archive"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:641
+#: ../../Zotlabs/Module/Connedit.php:642
 msgid ""
 "Archive (or Unarchive) this connection - mark channel dead but keep content"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:642
+#: ../../Zotlabs/Module/Connedit.php:643
 msgid "This connection is archived!"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:646
+#: ../../Zotlabs/Module/Connedit.php:647
 msgid "Unhide"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:646
+#: ../../Zotlabs/Module/Connedit.php:647
 msgid "Hide"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:649
+#: ../../Zotlabs/Module/Connedit.php:650
 msgid "Hide or Unhide this connection from your other connections"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:650
+#: ../../Zotlabs/Module/Connedit.php:651
 msgid "This connection is hidden!"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:657
+#: ../../Zotlabs/Module/Connedit.php:658
 msgid "Delete this connection"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:665
+#: ../../Zotlabs/Module/Connedit.php:666
 msgid "Fetch Vcard"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:668
+#: ../../Zotlabs/Module/Connedit.php:669
 msgid "Fetch electronic calling card for this connection"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:679
+#: ../../Zotlabs/Module/Connedit.php:680
 msgid "Open Individual Permissions section by default"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:702
+#: ../../Zotlabs/Module/Connedit.php:703
 msgid "Affinity"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:705
+#: ../../Zotlabs/Module/Connedit.php:706
 msgid "Open Set Affinity section by default"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:709 ../../Zotlabs/Widget/Affinity.php:22
+#: ../../Zotlabs/Module/Connedit.php:710 ../../Zotlabs/Widget/Affinity.php:22
 msgid "Me"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:710 ../../Zotlabs/Widget/Affinity.php:23
+#: ../../Zotlabs/Module/Connedit.php:711 ../../Zotlabs/Widget/Affinity.php:23
 msgid "Family"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:712 ../../Zotlabs/Widget/Affinity.php:25
+#: ../../Zotlabs/Module/Connedit.php:713 ../../Zotlabs/Widget/Affinity.php:25
 msgid "Acquaintances"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:739
+#: ../../Zotlabs/Module/Connedit.php:740
 msgid "Filter"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:742
+#: ../../Zotlabs/Module/Connedit.php:743
 msgid "Open Custom Filter section by default"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:779
+#: ../../Zotlabs/Module/Connedit.php:780
 msgid "Approve this connection"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:779
+#: ../../Zotlabs/Module/Connedit.php:780
 msgid "Accept connection to allow communication"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:784
+#: ../../Zotlabs/Module/Connedit.php:785
 msgid "Set Affinity"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:787
+#: ../../Zotlabs/Module/Connedit.php:788
 msgid "Set Profile"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:790
+#: ../../Zotlabs/Module/Connedit.php:791
 msgid "Set Affinity & Profile"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:838
+#: ../../Zotlabs/Module/Connedit.php:839
 msgid "This connection is unreachable from this location."
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:839
+#: ../../Zotlabs/Module/Connedit.php:840
 msgid "This connection may be unreachable from other channel locations."
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:841
+#: ../../Zotlabs/Module/Connedit.php:842
 msgid "Location independence is not supported by their network."
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:847
+#: ../../Zotlabs/Module/Connedit.php:848
 msgid ""
 "This connection is unreachable from this location. Location independence is "
 "not supported by their network."
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:850 ../../Zotlabs/Module/Defperms.php:238
-#: ../../Zotlabs/Widget/Settings_menu.php:117
+#: ../../Zotlabs/Module/Connedit.php:851 ../../Zotlabs/Module/Defperms.php:254
 msgid "Connection Default Permissions"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:850 ../../include/items.php:4158
+#: ../../Zotlabs/Module/Connedit.php:851 ../../include/items.php:4200
 #, php-format
 msgid "Connection: %s"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:851 ../../Zotlabs/Module/Defperms.php:239
+#: ../../Zotlabs/Module/Connedit.php:852 ../../Zotlabs/Module/Defperms.php:255
 msgid "Apply these permissions automatically"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:851
+#: ../../Zotlabs/Module/Connedit.php:852
 msgid "Connection requests will be approved without your interaction"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:852 ../../Zotlabs/Module/Defperms.php:240
+#: ../../Zotlabs/Module/Connedit.php:853 ../../Zotlabs/Module/Defperms.php:256
 msgid "Permission role"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:853 ../../Zotlabs/Module/Defperms.php:241
+#: ../../Zotlabs/Module/Connedit.php:854 ../../Zotlabs/Module/Defperms.php:257
 msgid "Add permission role"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:860
+#: ../../Zotlabs/Module/Connedit.php:861
 msgid "This connection's primary address is"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:861
+#: ../../Zotlabs/Module/Connedit.php:862
 msgid "Available locations:"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:866 ../../Zotlabs/Module/Defperms.php:245
+#: ../../Zotlabs/Module/Connedit.php:867 ../../Zotlabs/Module/Defperms.php:261
 msgid ""
 "The permissions indicated on this page will be applied to all new "
 "connections."
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:867
+#: ../../Zotlabs/Module/Connedit.php:868
 msgid "Connection Tools"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:869
+#: ../../Zotlabs/Module/Connedit.php:870
 msgid "Slide to adjust your degree of friendship"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:870 ../../Zotlabs/Module/Rate.php:155
+#: ../../Zotlabs/Module/Connedit.php:871 ../../Zotlabs/Module/Rate.php:155
 #: ../../include/js_strings.php:20
 msgid "Rating"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:871
+#: ../../Zotlabs/Module/Connedit.php:872
 msgid "Slide to adjust your rating"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:872 ../../Zotlabs/Module/Connedit.php:877
+#: ../../Zotlabs/Module/Connedit.php:873 ../../Zotlabs/Module/Connedit.php:878
 msgid "Optionally explain your rating"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:874
+#: ../../Zotlabs/Module/Connedit.php:875
 msgid "Custom Filter"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:875
+#: ../../Zotlabs/Module/Connedit.php:876
 msgid "Only import posts with this text"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:876
+#: ../../Zotlabs/Module/Connedit.php:877
 msgid "Do not import posts with this text"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:878
+#: ../../Zotlabs/Module/Connedit.php:879
 msgid "This information is public!"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:883
+#: ../../Zotlabs/Module/Connedit.php:884
 msgid "Connection Pending Approval"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:888
+#: ../../Zotlabs/Module/Connedit.php:889
 #, php-format
 msgid ""
 "Please choose the profile you would like to display to %s when viewing your "
 "profile securely."
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:895
+#: ../../Zotlabs/Module/Connedit.php:896
 msgid ""
 "Some permissions may be inherited from your channel's <a href=\"settings"
 "\"><strong>privacy settings</strong></a>, which have higher priority than "
@@ -5824,86 +5929,94 @@ msgid ""
 "any impact unless the inherited setting changes."
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:896
+#: ../../Zotlabs/Module/Connedit.php:897
 msgid "Last update:"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:904
+#: ../../Zotlabs/Module/Connedit.php:905
 msgid "Details"
 msgstr ""
 
-#: ../../Zotlabs/Module/Chat.php:181
+#: ../../Zotlabs/Module/Chat.php:102
+msgid "Chatrooms App"
+msgstr ""
+
+#: ../../Zotlabs/Module/Chat.php:103
+msgid "Access Controlled Chatrooms"
+msgstr ""
+
+#: ../../Zotlabs/Module/Chat.php:196
 msgid "Room not found"
 msgstr ""
 
-#: ../../Zotlabs/Module/Chat.php:197
+#: ../../Zotlabs/Module/Chat.php:212
 msgid "Leave Room"
 msgstr ""
 
-#: ../../Zotlabs/Module/Chat.php:198
+#: ../../Zotlabs/Module/Chat.php:213
 msgid "Delete Room"
 msgstr ""
 
-#: ../../Zotlabs/Module/Chat.php:199
+#: ../../Zotlabs/Module/Chat.php:214
 msgid "I am away right now"
 msgstr ""
 
-#: ../../Zotlabs/Module/Chat.php:200
+#: ../../Zotlabs/Module/Chat.php:215
 msgid "I am online"
 msgstr ""
 
-#: ../../Zotlabs/Module/Chat.php:202
+#: ../../Zotlabs/Module/Chat.php:217
 msgid "Bookmark this room"
 msgstr ""
 
-#: ../../Zotlabs/Module/Chat.php:205 ../../Zotlabs/Module/Mail.php:241
-#: ../../Zotlabs/Module/Mail.php:362 ../../include/conversation.php:1322
+#: ../../Zotlabs/Module/Chat.php:220 ../../Zotlabs/Module/Mail.php:241
+#: ../../Zotlabs/Module/Mail.php:362 ../../addon/hsse/hsse.php:134
+#: ../../include/conversation.php:1337
 msgid "Please enter a link URL:"
 msgstr ""
 
-#: ../../Zotlabs/Module/Chat.php:206 ../../Zotlabs/Module/Mail.php:294
-#: ../../Zotlabs/Module/Mail.php:436 ../../Zotlabs/Lib/ThreadItem.php:771
-#: ../../include/conversation.php:1443
+#: ../../Zotlabs/Module/Chat.php:221 ../../Zotlabs/Module/Mail.php:294
+#: ../../Zotlabs/Module/Mail.php:436 ../../Zotlabs/Lib/ThreadItem.php:781
+#: ../../addon/hsse/hsse.php:255 ../../include/conversation.php:1458
 msgid "Encrypt text"
 msgstr ""
 
-#: ../../Zotlabs/Module/Chat.php:232
+#: ../../Zotlabs/Module/Chat.php:240
 msgid "New Chatroom"
 msgstr ""
 
-#: ../../Zotlabs/Module/Chat.php:233
+#: ../../Zotlabs/Module/Chat.php:241
 msgid "Chatroom name"
 msgstr ""
 
-#: ../../Zotlabs/Module/Chat.php:234
+#: ../../Zotlabs/Module/Chat.php:242
 msgid "Expiration of chats (minutes)"
 msgstr ""
 
-#: ../../Zotlabs/Module/Chat.php:250
+#: ../../Zotlabs/Module/Chat.php:258
 #, php-format
 msgid "%1$s's Chatrooms"
 msgstr ""
 
-#: ../../Zotlabs/Module/Chat.php:255
+#: ../../Zotlabs/Module/Chat.php:263
 msgid "No chatrooms available"
 msgstr ""
 
-#: ../../Zotlabs/Module/Chat.php:259
+#: ../../Zotlabs/Module/Chat.php:267
 msgid "Expiration"
 msgstr ""
 
-#: ../../Zotlabs/Module/Chat.php:260
+#: ../../Zotlabs/Module/Chat.php:268
 msgid "min"
 msgstr ""
 
-#: ../../Zotlabs/Module/Fbrowser.php:29 ../../Zotlabs/Lib/Apps.php:310
-#: ../../include/conversation.php:1843 ../../include/nav.php:393
+#: ../../Zotlabs/Module/Fbrowser.php:29 ../../Zotlabs/Lib/Apps.php:320
+#: ../../include/features.php:391 ../../include/nav.php:414
 msgid "Photos"
 msgstr ""
 
-#: ../../Zotlabs/Module/Fbrowser.php:85 ../../Zotlabs/Lib/Apps.php:305
-#: ../../Zotlabs/Storage/Browser.php:272 ../../include/conversation.php:1851
-#: ../../include/nav.php:401
+#: ../../Zotlabs/Module/Fbrowser.php:85 ../../Zotlabs/Lib/Apps.php:315
+#: ../../Zotlabs/Storage/Browser.php:272 ../../include/nav.php:422
 msgid "Files"
 msgstr ""
 
@@ -5943,7 +6056,7 @@ msgstr ""
 msgid "Submit and proceed"
 msgstr ""
 
-#: ../../Zotlabs/Module/Menu.php:170 ../../include/text.php:2459
+#: ../../Zotlabs/Module/Menu.php:170 ../../include/text.php:2466
 msgid "Menus"
 msgstr ""
 
@@ -5995,13 +6108,13 @@ msgstr ""
 msgid "Allow bookmarks"
 msgstr ""
 
-#: ../../Zotlabs/Module/Layouts.php:184 ../../include/text.php:2460
+#: ../../Zotlabs/Module/Layouts.php:184 ../../include/text.php:2467
 msgid "Layouts"
 msgstr ""
 
-#: ../../Zotlabs/Module/Layouts.php:186 ../../Zotlabs/Lib/Apps.php:313
-#: ../../include/nav.php:170 ../../include/nav.php:272
-#: ../../include/help.php:68 ../../include/help.php:74
+#: ../../Zotlabs/Module/Layouts.php:186 ../../Zotlabs/Lib/Apps.php:323
+#: ../../include/nav.php:168 ../../include/nav.php:289
+#: ../../include/help.php:117 ../../include/help.php:125
 msgid "Help"
 msgstr ""
 
@@ -6017,6 +6130,18 @@ msgstr ""
 msgid "Download PDL file"
 msgstr ""
 
+#: ../../Zotlabs/Module/Notes.php:55
+msgid "Notes App"
+msgstr ""
+
+#: ../../Zotlabs/Module/Notes.php:56
+msgid "A simple notes app with a widget (note: notes are not encrypted)"
+msgstr ""
+
+#: ../../Zotlabs/Module/Cloud.php:123
+msgid "Not found"
+msgstr ""
+
 #: ../../Zotlabs/Module/Cloud.php:129
 msgid "Please refresh page"
 msgstr ""
@@ -6054,13 +6179,13 @@ msgstr ""
 msgid "Post not found."
 msgstr ""
 
-#: ../../Zotlabs/Module/Tagger.php:77 ../../include/markdown.php:160
+#: ../../Zotlabs/Module/Tagger.php:77 ../../include/markdown.php:202
 #: ../../include/bbcode.php:354
 msgid "post"
 msgstr ""
 
 #: ../../Zotlabs/Module/Tagger.php:79 ../../include/conversation.php:146
-#: ../../include/text.php:2030
+#: ../../include/text.php:2036
 msgid "comment"
 msgstr ""
 
@@ -6069,26 +6194,34 @@ msgstr ""
 msgid "%1$s tagged %2$s's %3$s with %4$s"
 msgstr ""
 
-#: ../../Zotlabs/Module/Pconfig.php:26 ../../Zotlabs/Module/Pconfig.php:59
+#: ../../Zotlabs/Module/Pconfig.php:27 ../../Zotlabs/Module/Pconfig.php:63
 msgid "This setting requires special processing and editing has been blocked."
 msgstr ""
 
-#: ../../Zotlabs/Module/Pconfig.php:48
+#: ../../Zotlabs/Module/Pconfig.php:52
 msgid "Configuration Editor"
 msgstr ""
 
-#: ../../Zotlabs/Module/Pconfig.php:49
+#: ../../Zotlabs/Module/Pconfig.php:53
 msgid ""
 "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."
 msgstr ""
 
-#: ../../Zotlabs/Module/Defperms.php:246
+#: ../../Zotlabs/Module/Defperms.php:189
+msgid "Default Permissions App"
+msgstr ""
+
+#: ../../Zotlabs/Module/Defperms.php:190
+msgid "Set custom default permissions for new connections"
+msgstr ""
+
+#: ../../Zotlabs/Module/Defperms.php:262
 msgid "Automatic approval settings"
 msgstr ""
 
-#: ../../Zotlabs/Module/Defperms.php:254
+#: ../../Zotlabs/Module/Defperms.php:270
 msgid ""
 "Some individual permissions may have been preset or locked based on your "
 "channel type and privacy settings."
@@ -6098,88 +6231,97 @@ msgstr ""
 msgid "Unknown App"
 msgstr ""
 
-#: ../../Zotlabs/Module/Authorize.php:22
+#: ../../Zotlabs/Module/Authorize.php:29
 msgid "Authorize"
 msgstr ""
 
-#: ../../Zotlabs/Module/Authorize.php:23
+#: ../../Zotlabs/Module/Authorize.php:30
 #, php-format
 msgid "Do you authorize the app %s to access your channel data?"
 msgstr ""
 
-#: ../../Zotlabs/Module/Authorize.php:25
+#: ../../Zotlabs/Module/Authorize.php:32
 msgid "Allow"
 msgstr ""
 
-#: ../../Zotlabs/Module/Group.php:35
+#: ../../Zotlabs/Module/Group.php:45
 msgid "Privacy group created."
 msgstr ""
 
-#: ../../Zotlabs/Module/Group.php:38
+#: ../../Zotlabs/Module/Group.php:48
 msgid "Could not create privacy group."
 msgstr ""
 
-#: ../../Zotlabs/Module/Group.php:51 ../../Zotlabs/Module/Group.php:181
-#: ../../include/items.php:4125
+#: ../../Zotlabs/Module/Group.php:61 ../../Zotlabs/Module/Group.php:200
+#: ../../include/items.php:4167
 msgid "Privacy group not found."
 msgstr ""
 
-#: ../../Zotlabs/Module/Group.php:67
+#: ../../Zotlabs/Module/Group.php:77
 msgid "Privacy group updated."
 msgstr ""
 
-#: ../../Zotlabs/Module/Group.php:113 ../../Zotlabs/Module/Group.php:124
-#: ../../Zotlabs/Widget/Activity_filter.php:68 ../../include/features.php:221
-#: ../../include/nav.php:97 ../../include/group.php:320
+#: ../../Zotlabs/Module/Group.php:101
+msgid "Privacy Groups App"
+msgstr ""
+
+#: ../../Zotlabs/Module/Group.php:102
+msgid "Management of privacy groups"
+msgstr ""
+
+#: ../../Zotlabs/Module/Group.php:132 ../../Zotlabs/Module/Group.php:143
+#: ../../Zotlabs/Lib/Apps.php:339 ../../Zotlabs/Lib/Group.php:324
+#: ../../Zotlabs/Widget/Activity_filter.php:70 ../../include/nav.php:95
+#: ../../include/group.php:320
 msgid "Privacy Groups"
 msgstr ""
 
-#: ../../Zotlabs/Module/Group.php:114
+#: ../../Zotlabs/Module/Group.php:133
 msgid "Add Group"
 msgstr ""
 
-#: ../../Zotlabs/Module/Group.php:118
+#: ../../Zotlabs/Module/Group.php:137
 msgid "Privacy group name"
 msgstr ""
 
-#: ../../Zotlabs/Module/Group.php:119 ../../Zotlabs/Module/Group.php:220
+#: ../../Zotlabs/Module/Group.php:138 ../../Zotlabs/Module/Group.php:239
 msgid "Members are visible to other channels"
 msgstr ""
 
-#: ../../Zotlabs/Module/Group.php:126 ../../Zotlabs/Module/Help.php:81
+#: ../../Zotlabs/Module/Group.php:145 ../../Zotlabs/Module/Help.php:81
 msgid "Members"
 msgstr ""
 
-#: ../../Zotlabs/Module/Group.php:151
+#: ../../Zotlabs/Module/Group.php:170
 msgid "Privacy group removed."
 msgstr ""
 
-#: ../../Zotlabs/Module/Group.php:153
+#: ../../Zotlabs/Module/Group.php:172
 msgid "Unable to remove privacy group."
 msgstr ""
 
-#: ../../Zotlabs/Module/Group.php:215
+#: ../../Zotlabs/Module/Group.php:234
 #, php-format
 msgid "Privacy Group: %s"
 msgstr ""
 
-#: ../../Zotlabs/Module/Group.php:217
+#: ../../Zotlabs/Module/Group.php:236
 msgid "Privacy group name: "
 msgstr ""
 
-#: ../../Zotlabs/Module/Group.php:222
+#: ../../Zotlabs/Module/Group.php:241
 msgid "Delete Group"
 msgstr ""
 
-#: ../../Zotlabs/Module/Group.php:232
+#: ../../Zotlabs/Module/Group.php:251
 msgid "Group members"
 msgstr ""
 
-#: ../../Zotlabs/Module/Group.php:234
+#: ../../Zotlabs/Module/Group.php:253
 msgid "Not in this group"
 msgstr ""
 
-#: ../../Zotlabs/Module/Group.php:266
+#: ../../Zotlabs/Module/Group.php:285
 msgid "Click a channel to toggle membership"
 msgstr ""
 
@@ -6274,7 +6416,7 @@ msgid "View this profile"
 msgstr ""
 
 #: ../../Zotlabs/Module/Profiles.php:725 ../../Zotlabs/Module/Profiles.php:824
-#: ../../include/channel.php:1319
+#: ../../include/channel.php:1326
 msgid "Edit visibility"
 msgstr ""
 
@@ -6286,7 +6428,7 @@ msgstr ""
 msgid "Change cover photo"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:728 ../../include/channel.php:1289
+#: ../../Zotlabs/Module/Profiles.php:728 ../../include/channel.php:1296
 msgid "Change profile photo"
 msgstr ""
 
@@ -6306,7 +6448,7 @@ msgstr ""
 msgid "Add profile things"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:733 ../../include/conversation.php:1717
+#: ../../Zotlabs/Module/Profiles.php:733
 msgid "Personal"
 msgstr ""
 
@@ -6314,7 +6456,7 @@ msgstr ""
 msgid "Relationship"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:736 ../../Zotlabs/Widget/Newmember.php:44
+#: ../../Zotlabs/Module/Profiles.php:736 ../../Zotlabs/Widget/Newmember.php:51
 #: ../../include/datetime.php:58
 msgid "Miscellaneous"
 msgstr ""
@@ -6452,12 +6594,12 @@ msgstr ""
 msgid "Communications"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:820 ../../include/channel.php:1315
+#: ../../Zotlabs/Module/Profiles.php:820 ../../include/channel.php:1322
 msgid "Profile Image"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:830 ../../include/channel.php:1296
-#: ../../include/nav.php:111
+#: ../../Zotlabs/Module/Profiles.php:830 ../../include/channel.php:1303
+#: ../../include/nav.php:109
 msgid "Edit Profiles"
 msgstr ""
 
@@ -6490,7 +6632,7 @@ msgstr ""
 msgid "Edit your default profile"
 msgstr ""
 
-#: ../../Zotlabs/Module/Go.php:38 ../../Zotlabs/Widget/Newmember.php:34
+#: ../../Zotlabs/Module/Go.php:38 ../../Zotlabs/Widget/Newmember.php:41
 msgid "View friend suggestions"
 msgstr ""
 
@@ -6536,8 +6678,8 @@ msgstr ""
 msgid "Create a new channel"
 msgstr ""
 
-#: ../../Zotlabs/Module/Manage.php:170 ../../Zotlabs/Lib/Apps.php:302
-#: ../../include/nav.php:94
+#: ../../Zotlabs/Module/Manage.php:170 ../../Zotlabs/Lib/Apps.php:312
+#: ../../include/nav.php:92
 msgid "Channel Manager"
 msgstr ""
 
@@ -6571,16 +6713,23 @@ msgstr ""
 msgid "Delegated Channel"
 msgstr ""
 
-#: ../../Zotlabs/Module/Cards.php:42 ../../Zotlabs/Module/Cards.php:194
-#: ../../Zotlabs/Lib/Apps.php:293 ../../include/conversation.php:1902
-#: ../../include/features.php:123 ../../include/nav.php:450
-msgid "Cards"
+#: ../../Zotlabs/Module/Cards.php:46
+msgid "Cards App"
 msgstr ""
 
-#: ../../Zotlabs/Module/Cards.php:99
+#: ../../Zotlabs/Module/Cards.php:47
+msgid "Create personal planning cards"
+msgstr ""
+
+#: ../../Zotlabs/Module/Cards.php:108
 msgid "Add Card"
 msgstr ""
 
+#: ../../Zotlabs/Module/Cards.php:203 ../../Zotlabs/Lib/Apps.php:303
+#: ../../include/nav.php:471
+msgid "Cards"
+msgstr ""
+
 #: ../../Zotlabs/Module/Dirsearch.php:33
 msgid "This directory server requires an access token"
 msgstr ""
@@ -6597,7 +6746,7 @@ msgstr ""
 msgid "Administrator"
 msgstr ""
 
-#: ../../Zotlabs/Module/Siteinfo.php:28 ../../Zotlabs/Module/Register.php:241
+#: ../../Zotlabs/Module/Siteinfo.php:28 ../../Zotlabs/Module/Register.php:236
 msgid "Terms of Service"
 msgstr ""
 
@@ -6636,7 +6785,7 @@ msgid "No ratings"
 msgstr ""
 
 #: ../../Zotlabs/Module/Ratings.php:97 ../../Zotlabs/Module/Pubsites.php:35
-#: ../../include/conversation.php:1087
+#: ../../include/conversation.php:1088
 msgid "Ratings"
 msgstr ""
 
@@ -6652,56 +6801,64 @@ msgstr ""
 msgid "Description: "
 msgstr ""
 
-#: ../../Zotlabs/Module/Webpages.php:54
+#: ../../Zotlabs/Module/Webpages.php:48
+msgid "Webpages App"
+msgstr ""
+
+#: ../../Zotlabs/Module/Webpages.php:49
+msgid "Provide managed web pages on your channel"
+msgstr ""
+
+#: ../../Zotlabs/Module/Webpages.php:69
 msgid "Import Webpage Elements"
 msgstr ""
 
-#: ../../Zotlabs/Module/Webpages.php:55
+#: ../../Zotlabs/Module/Webpages.php:70
 msgid "Import selected"
 msgstr ""
 
-#: ../../Zotlabs/Module/Webpages.php:78
+#: ../../Zotlabs/Module/Webpages.php:93
 msgid "Export Webpage Elements"
 msgstr ""
 
-#: ../../Zotlabs/Module/Webpages.php:79
+#: ../../Zotlabs/Module/Webpages.php:94
 msgid "Export selected"
 msgstr ""
 
-#: ../../Zotlabs/Module/Webpages.php:237 ../../Zotlabs/Lib/Apps.php:306
-#: ../../include/conversation.php:1924 ../../include/nav.php:473
+#: ../../Zotlabs/Module/Webpages.php:252 ../../Zotlabs/Lib/Apps.php:316
+#: ../../include/nav.php:494
 msgid "Webpages"
 msgstr ""
 
-#: ../../Zotlabs/Module/Webpages.php:248
+#: ../../Zotlabs/Module/Webpages.php:263
 msgid "Actions"
 msgstr ""
 
-#: ../../Zotlabs/Module/Webpages.php:249
+#: ../../Zotlabs/Module/Webpages.php:264
 msgid "Page Link"
 msgstr ""
 
-#: ../../Zotlabs/Module/Webpages.php:250
+#: ../../Zotlabs/Module/Webpages.php:265
 msgid "Page Title"
 msgstr ""
 
-#: ../../Zotlabs/Module/Webpages.php:280
+#: ../../Zotlabs/Module/Webpages.php:295
 msgid "Invalid file type."
 msgstr ""
 
-#: ../../Zotlabs/Module/Webpages.php:292
+#: ../../Zotlabs/Module/Webpages.php:307
 msgid "Error opening zip file"
 msgstr ""
 
-#: ../../Zotlabs/Module/Webpages.php:303
+#: ../../Zotlabs/Module/Webpages.php:318
 msgid "Invalid folder path."
 msgstr ""
 
-#: ../../Zotlabs/Module/Webpages.php:330
+#: ../../Zotlabs/Module/Webpages.php:345
 msgid "No webpage elements detected."
 msgstr ""
 
-#: ../../Zotlabs/Module/Webpages.php:405
+#: ../../Zotlabs/Module/Webpages.php:420
 msgid "Import complete."
 msgstr ""
 
@@ -6711,13 +6868,13 @@ msgid ""
 "password."
 msgstr ""
 
-#: ../../Zotlabs/Module/Changeaddr.php:46 ../../include/channel.php:214
-#: ../../include/channel.php:599
+#: ../../Zotlabs/Module/Changeaddr.php:46 ../../include/channel.php:221
+#: ../../include/channel.php:606
 msgid "Reserved nickname. Please choose another."
 msgstr ""
 
-#: ../../Zotlabs/Module/Changeaddr.php:51 ../../include/channel.php:219
-#: ../../include/channel.php:604
+#: ../../Zotlabs/Module/Changeaddr.php:51 ../../include/channel.php:226
+#: ../../include/channel.php:611
 msgid ""
 "Nickname has unsupported characters or is already being used on this site."
 msgstr ""
@@ -6803,8 +6960,8 @@ msgstr ""
 msgid "Delivery report for %1$s"
 msgstr ""
 
-#: ../../Zotlabs/Module/Dreport.php:151 ../../Zotlabs/Widget/Wiki_pages.php:39
-#: ../../Zotlabs/Widget/Wiki_pages.php:96
+#: ../../Zotlabs/Module/Dreport.php:151 ../../Zotlabs/Widget/Wiki_pages.php:41
+#: ../../Zotlabs/Widget/Wiki_pages.php:98
 msgid "Options"
 msgstr ""
 
@@ -6812,84 +6969,96 @@ msgstr ""
 msgid "Redeliver"
 msgstr ""
 
-#: ../../Zotlabs/Module/Sources.php:38
+#: ../../Zotlabs/Module/Sources.php:41
 msgid "Failed to create source. No channel selected."
 msgstr ""
 
-#: ../../Zotlabs/Module/Sources.php:54
+#: ../../Zotlabs/Module/Sources.php:57
 msgid "Source created."
 msgstr ""
 
-#: ../../Zotlabs/Module/Sources.php:67
+#: ../../Zotlabs/Module/Sources.php:70
 msgid "Source updated."
 msgstr ""
 
-#: ../../Zotlabs/Module/Sources.php:93
+#: ../../Zotlabs/Module/Sources.php:88
+msgid "Sources App"
+msgstr ""
+
+#: ../../Zotlabs/Module/Sources.php:89
+msgid "Automatically import channel content from other channels or feeds"
+msgstr ""
+
+#: ../../Zotlabs/Module/Sources.php:101
 msgid "*"
 msgstr ""
 
-#: ../../Zotlabs/Module/Sources.php:99
-#: ../../Zotlabs/Widget/Settings_menu.php:133 ../../include/features.php:292
+#: ../../Zotlabs/Module/Sources.php:107 ../../Zotlabs/Lib/Apps.php:344
 msgid "Channel Sources"
 msgstr ""
 
-#: ../../Zotlabs/Module/Sources.php:100
+#: ../../Zotlabs/Module/Sources.php:108
 msgid "Manage remote sources of content for your channel."
 msgstr ""
 
-#: ../../Zotlabs/Module/Sources.php:101 ../../Zotlabs/Module/Sources.php:111
+#: ../../Zotlabs/Module/Sources.php:109 ../../Zotlabs/Module/Sources.php:119
 msgid "New Source"
 msgstr ""
 
-#: ../../Zotlabs/Module/Sources.php:112 ../../Zotlabs/Module/Sources.php:146
+#: ../../Zotlabs/Module/Sources.php:120 ../../Zotlabs/Module/Sources.php:154
 msgid ""
 "Import all or selected content from the following channel into this channel "
 "and distribute it according to your channel settings."
 msgstr ""
 
-#: ../../Zotlabs/Module/Sources.php:113 ../../Zotlabs/Module/Sources.php:147
+#: ../../Zotlabs/Module/Sources.php:121 ../../Zotlabs/Module/Sources.php:155
 msgid "Only import content with these words (one per line)"
 msgstr ""
 
-#: ../../Zotlabs/Module/Sources.php:113 ../../Zotlabs/Module/Sources.php:147
+#: ../../Zotlabs/Module/Sources.php:121 ../../Zotlabs/Module/Sources.php:155
 msgid "Leave blank to import all public content"
 msgstr ""
 
-#: ../../Zotlabs/Module/Sources.php:114 ../../Zotlabs/Module/Sources.php:153
+#: ../../Zotlabs/Module/Sources.php:122 ../../Zotlabs/Module/Sources.php:161
 msgid "Channel Name"
 msgstr ""
 
-#: ../../Zotlabs/Module/Sources.php:115 ../../Zotlabs/Module/Sources.php:150
+#: ../../Zotlabs/Module/Sources.php:123 ../../Zotlabs/Module/Sources.php:158
 msgid ""
 "Add the following categories to posts imported from this source (comma "
 "separated)"
 msgstr ""
 
-#: ../../Zotlabs/Module/Sources.php:116 ../../Zotlabs/Module/Sources.php:151
+#: ../../Zotlabs/Module/Sources.php:123 ../../Zotlabs/Module/Sources.php:158
+#: ../../Zotlabs/Module/Oauth.php:117
+msgid "Optional"
+msgstr ""
+
+#: ../../Zotlabs/Module/Sources.php:124 ../../Zotlabs/Module/Sources.php:159
 msgid "Resend posts with this channel as author"
 msgstr ""
 
-#: ../../Zotlabs/Module/Sources.php:116 ../../Zotlabs/Module/Sources.php:151
+#: ../../Zotlabs/Module/Sources.php:124 ../../Zotlabs/Module/Sources.php:159
 msgid "Copyrights may apply"
 msgstr ""
 
-#: ../../Zotlabs/Module/Sources.php:136 ../../Zotlabs/Module/Sources.php:166
+#: ../../Zotlabs/Module/Sources.php:144 ../../Zotlabs/Module/Sources.php:174
 msgid "Source not found."
 msgstr ""
 
-#: ../../Zotlabs/Module/Sources.php:143
+#: ../../Zotlabs/Module/Sources.php:151
 msgid "Edit Source"
 msgstr ""
 
-#: ../../Zotlabs/Module/Sources.php:144
+#: ../../Zotlabs/Module/Sources.php:152
 msgid "Delete Source"
 msgstr ""
 
-#: ../../Zotlabs/Module/Sources.php:174
+#: ../../Zotlabs/Module/Sources.php:182
 msgid "Source removed"
 msgstr ""
 
-#: ../../Zotlabs/Module/Sources.php:176
+#: ../../Zotlabs/Module/Sources.php:184
 msgid "Unable to remove source."
 msgstr ""
 
@@ -6928,14 +7097,15 @@ msgstr ""
 msgid "Previous action reversed."
 msgstr ""
 
-#: ../../Zotlabs/Module/Like.php:438 ../../addon/diaspora/Receiver.php:1559
-#: ../../addon/pubcrawl/as.php:1544 ../../include/conversation.php:160
+#: ../../Zotlabs/Module/Like.php:438 ../../Zotlabs/Lib/Activity.php:1605
+#: ../../addon/diaspora/Receiver.php:1568 ../../addon/pubcrawl/as.php:1546
+#: ../../include/conversation.php:160
 #, php-format
 msgid "%1$s likes %2$s's %3$s"
 msgstr ""
 
-#: ../../Zotlabs/Module/Like.php:440 ../../addon/pubcrawl/as.php:1546
-#: ../../include/conversation.php:163
+#: ../../Zotlabs/Module/Like.php:440 ../../Zotlabs/Lib/Activity.php:1607
+#: ../../addon/pubcrawl/as.php:1548 ../../include/conversation.php:163
 #, php-format
 msgid "%1$s doesn't like %2$s's %3$s"
 msgstr ""
@@ -6955,17 +7125,17 @@ msgstr ""
 msgid "%1$s abstains from a decision on %2$s's %3$s"
 msgstr ""
 
-#: ../../Zotlabs/Module/Like.php:448 ../../addon/diaspora/Receiver.php:2102
+#: ../../Zotlabs/Module/Like.php:448 ../../addon/diaspora/Receiver.php:2111
 #, php-format
 msgid "%1$s is attending %2$s's %3$s"
 msgstr ""
 
-#: ../../Zotlabs/Module/Like.php:450 ../../addon/diaspora/Receiver.php:2104
+#: ../../Zotlabs/Module/Like.php:450 ../../addon/diaspora/Receiver.php:2113
 #, php-format
 msgid "%1$s is not attending %2$s's %3$s"
 msgstr ""
 
-#: ../../Zotlabs/Module/Like.php:452 ../../addon/diaspora/Receiver.php:2106
+#: ../../Zotlabs/Module/Like.php:452 ../../addon/diaspora/Receiver.php:2115
 #, php-format
 msgid "%1$s may attend %2$s's %3$s"
 msgstr ""
@@ -6978,119 +7148,119 @@ msgstr ""
 msgid "Thank you."
 msgstr ""
 
-#: ../../Zotlabs/Module/Directory.php:106
+#: ../../Zotlabs/Module/Directory.php:110
 msgid "No default suggestions were found."
 msgstr ""
 
-#: ../../Zotlabs/Module/Directory.php:255
+#: ../../Zotlabs/Module/Directory.php:259
 #, php-format
 msgid "%d rating"
 msgid_plural "%d ratings"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../../Zotlabs/Module/Directory.php:266
+#: ../../Zotlabs/Module/Directory.php:270
 msgid "Gender: "
 msgstr ""
 
-#: ../../Zotlabs/Module/Directory.php:268
+#: ../../Zotlabs/Module/Directory.php:272
 msgid "Status: "
 msgstr ""
 
-#: ../../Zotlabs/Module/Directory.php:270
+#: ../../Zotlabs/Module/Directory.php:274
 msgid "Homepage: "
 msgstr ""
 
-#: ../../Zotlabs/Module/Directory.php:319 ../../include/channel.php:1564
+#: ../../Zotlabs/Module/Directory.php:323 ../../include/channel.php:1571
 msgid "Age:"
 msgstr ""
 
-#: ../../Zotlabs/Module/Directory.php:324 ../../include/channel.php:1391
+#: ../../Zotlabs/Module/Directory.php:328 ../../include/channel.php:1398
 #: ../../include/event.php:54 ../../include/event.php:86
 msgid "Location:"
 msgstr ""
 
-#: ../../Zotlabs/Module/Directory.php:330
+#: ../../Zotlabs/Module/Directory.php:334
 msgid "Description:"
 msgstr ""
 
-#: ../../Zotlabs/Module/Directory.php:335 ../../include/channel.php:1593
+#: ../../Zotlabs/Module/Directory.php:339 ../../include/channel.php:1600
 msgid "Hometown:"
 msgstr ""
 
-#: ../../Zotlabs/Module/Directory.php:337 ../../include/channel.php:1599
+#: ../../Zotlabs/Module/Directory.php:341 ../../include/channel.php:1606
 msgid "About:"
 msgstr ""
 
-#: ../../Zotlabs/Module/Directory.php:338 ../../Zotlabs/Module/Suggest.php:56
+#: ../../Zotlabs/Module/Directory.php:342 ../../Zotlabs/Module/Suggest.php:71
 #: ../../Zotlabs/Widget/Follow.php:32 ../../Zotlabs/Widget/Suggestions.php:44
-#: ../../include/conversation.php:1057 ../../include/channel.php:1376
+#: ../../include/conversation.php:1058 ../../include/channel.php:1383
 #: ../../include/connections.php:110
 msgid "Connect"
 msgstr ""
 
-#: ../../Zotlabs/Module/Directory.php:339
+#: ../../Zotlabs/Module/Directory.php:343
 msgid "Public Forum:"
 msgstr ""
 
-#: ../../Zotlabs/Module/Directory.php:342
+#: ../../Zotlabs/Module/Directory.php:346
 msgid "Keywords: "
 msgstr ""
 
-#: ../../Zotlabs/Module/Directory.php:345
+#: ../../Zotlabs/Module/Directory.php:349
 msgid "Don't suggest"
 msgstr ""
 
-#: ../../Zotlabs/Module/Directory.php:347
+#: ../../Zotlabs/Module/Directory.php:351
 msgid "Common connections (estimated):"
 msgstr ""
 
-#: ../../Zotlabs/Module/Directory.php:396
+#: ../../Zotlabs/Module/Directory.php:400
 msgid "Global Directory"
 msgstr ""
 
-#: ../../Zotlabs/Module/Directory.php:396
+#: ../../Zotlabs/Module/Directory.php:400
 msgid "Local Directory"
 msgstr ""
 
-#: ../../Zotlabs/Module/Directory.php:402
+#: ../../Zotlabs/Module/Directory.php:406
 msgid "Finding:"
 msgstr ""
 
-#: ../../Zotlabs/Module/Directory.php:405 ../../Zotlabs/Module/Suggest.php:64
+#: ../../Zotlabs/Module/Directory.php:409 ../../Zotlabs/Module/Suggest.php:79
 #: ../../include/contact_widgets.php:24
 msgid "Channel Suggestions"
 msgstr ""
 
-#: ../../Zotlabs/Module/Directory.php:407
+#: ../../Zotlabs/Module/Directory.php:411
 msgid "next page"
 msgstr ""
 
-#: ../../Zotlabs/Module/Directory.php:407
+#: ../../Zotlabs/Module/Directory.php:411
 msgid "previous page"
 msgstr ""
 
-#: ../../Zotlabs/Module/Directory.php:408
+#: ../../Zotlabs/Module/Directory.php:412
 msgid "Sort options"
 msgstr ""
 
-#: ../../Zotlabs/Module/Directory.php:409
+#: ../../Zotlabs/Module/Directory.php:413
 msgid "Alphabetic"
 msgstr ""
 
-#: ../../Zotlabs/Module/Directory.php:410
+#: ../../Zotlabs/Module/Directory.php:414
 msgid "Reverse Alphabetic"
 msgstr ""
 
-#: ../../Zotlabs/Module/Directory.php:411
+#: ../../Zotlabs/Module/Directory.php:415
 msgid "Newest to Oldest"
 msgstr ""
 
-#: ../../Zotlabs/Module/Directory.php:412
+#: ../../Zotlabs/Module/Directory.php:416
 msgid "Oldest to Newest"
 msgstr ""
 
-#: ../../Zotlabs/Module/Directory.php:429
+#: ../../Zotlabs/Module/Directory.php:433
 msgid "No entries (some entries may be hidden)."
 msgstr ""
 
@@ -7102,13 +7272,23 @@ msgstr ""
 msgid "Lookup xchan beginning with (or webbie): "
 msgstr ""
 
-#: ../../Zotlabs/Module/Suggest.php:39
+#: ../../Zotlabs/Module/Suggest.php:40
+msgid "Suggest Channels App"
+msgstr ""
+
+#: ../../Zotlabs/Module/Suggest.php:41
+msgid ""
+"Suggestions for channels in the $Projectname network you might be interested "
+"in"
+msgstr ""
+
+#: ../../Zotlabs/Module/Suggest.php:54
 msgid ""
 "No suggestions available. If this is a new site, please try again in 24 "
 "hours."
 msgstr ""
 
-#: ../../Zotlabs/Module/Suggest.php:58 ../../Zotlabs/Widget/Suggestions.php:46
+#: ../../Zotlabs/Module/Suggest.php:73 ../../Zotlabs/Widget/Suggestions.php:46
 msgid "Ignore/Hide"
 msgstr ""
 
@@ -7181,7 +7361,7 @@ msgid "Send"
 msgstr ""
 
 #: ../../Zotlabs/Module/Mail.php:292 ../../Zotlabs/Module/Mail.php:434
-#: ../../include/conversation.php:1438
+#: ../../addon/hsse/hsse.php:250 ../../include/conversation.php:1453
 msgid "Set expiration date"
 msgstr ""
 
@@ -7307,13 +7487,16 @@ msgstr ""
 msgid "or select an existing folder (doubleclick)"
 msgstr ""
 
-#: ../../Zotlabs/Module/Filer.php:54 ../../Zotlabs/Lib/ThreadItem.php:162
+#: ../../Zotlabs/Module/Filer.php:54 ../../Zotlabs/Lib/ThreadItem.php:164
 msgid "Save to Folder"
 msgstr ""
 
-#: ../../Zotlabs/Module/Probe.php:30 ../../Zotlabs/Module/Probe.php:34
-#, php-format
-msgid "Fetching URL returns error: %1$s"
+#: ../../Zotlabs/Module/Probe.php:18
+msgid "Remote Diagnostics App"
+msgstr ""
+
+#: ../../Zotlabs/Module/Probe.php:19
+msgid "Perform diagnostics on remote channels"
 msgstr ""
 
 #: ../../Zotlabs/Module/Register.php:49
@@ -7368,67 +7551,67 @@ msgid ""
 "Please try again tomorrow."
 msgstr ""
 
-#: ../../Zotlabs/Module/Register.php:247
+#: ../../Zotlabs/Module/Register.php:242
 #, php-format
 msgid "I accept the %s for this website"
 msgstr ""
 
-#: ../../Zotlabs/Module/Register.php:254
+#: ../../Zotlabs/Module/Register.php:249
 #, php-format
 msgid "I am over %s years of age and accept the %s for this website"
 msgstr ""
 
-#: ../../Zotlabs/Module/Register.php:259
+#: ../../Zotlabs/Module/Register.php:254
 msgid "Your email address"
 msgstr ""
 
-#: ../../Zotlabs/Module/Register.php:260
+#: ../../Zotlabs/Module/Register.php:255
 msgid "Choose a password"
 msgstr ""
 
-#: ../../Zotlabs/Module/Register.php:261
+#: ../../Zotlabs/Module/Register.php:256
 msgid "Please re-enter your password"
 msgstr ""
 
-#: ../../Zotlabs/Module/Register.php:262
+#: ../../Zotlabs/Module/Register.php:257
 msgid "Please enter your invitation code"
 msgstr ""
 
-#: ../../Zotlabs/Module/Register.php:263
+#: ../../Zotlabs/Module/Register.php:258
 msgid "Your Name"
 msgstr ""
 
-#: ../../Zotlabs/Module/Register.php:263
+#: ../../Zotlabs/Module/Register.php:258
 msgid "Real names are preferred."
 msgstr ""
 
-#: ../../Zotlabs/Module/Register.php:265
+#: ../../Zotlabs/Module/Register.php:260
 #, php-format
 msgid ""
 "Your nickname will be used to create an easy to remember channel address e."
 "g. nickname%s"
 msgstr ""
 
-#: ../../Zotlabs/Module/Register.php:266
+#: ../../Zotlabs/Module/Register.php:261
 msgid ""
 "Select a channel permission role for your usage needs and privacy "
 "requirements."
 msgstr ""
 
-#: ../../Zotlabs/Module/Register.php:267
+#: ../../Zotlabs/Module/Register.php:262
 msgid "no"
 msgstr ""
 
-#: ../../Zotlabs/Module/Register.php:267
+#: ../../Zotlabs/Module/Register.php:262
 msgid "yes"
 msgstr ""
 
-#: ../../Zotlabs/Module/Register.php:294 ../../boot.php:1593
-#: ../../include/nav.php:158
+#: ../../Zotlabs/Module/Register.php:289 ../../boot.php:1605
+#: ../../include/nav.php:156
 msgid "Register"
 msgstr ""
 
-#: ../../Zotlabs/Module/Register.php:295
+#: ../../Zotlabs/Module/Register.php:290
 msgid ""
 "This site requires email verification. After completing this form, please "
 "check your email for further instructions."
@@ -7439,30 +7622,30 @@ msgstr ""
 msgid "Cover Photos"
 msgstr ""
 
-#: ../../Zotlabs/Module/Cover_photo.php:269 ../../include/items.php:4502
+#: ../../Zotlabs/Module/Cover_photo.php:269 ../../include/items.php:4544
 msgid "female"
 msgstr ""
 
-#: ../../Zotlabs/Module/Cover_photo.php:270 ../../include/items.php:4503
+#: ../../Zotlabs/Module/Cover_photo.php:270 ../../include/items.php:4545
 #, php-format
 msgid "%1$s updated her %2$s"
 msgstr ""
 
-#: ../../Zotlabs/Module/Cover_photo.php:271 ../../include/items.php:4504
+#: ../../Zotlabs/Module/Cover_photo.php:271 ../../include/items.php:4546
 msgid "male"
 msgstr ""
 
-#: ../../Zotlabs/Module/Cover_photo.php:272 ../../include/items.php:4505
+#: ../../Zotlabs/Module/Cover_photo.php:272 ../../include/items.php:4547
 #, php-format
 msgid "%1$s updated his %2$s"
 msgstr ""
 
-#: ../../Zotlabs/Module/Cover_photo.php:274 ../../include/items.php:4507
+#: ../../Zotlabs/Module/Cover_photo.php:274 ../../include/items.php:4549
 #, php-format
 msgid "%1$s updated their %2$s"
 msgstr ""
 
-#: ../../Zotlabs/Module/Cover_photo.php:276 ../../include/channel.php:2081
+#: ../../Zotlabs/Module/Cover_photo.php:276 ../../include/channel.php:2088
 msgid "cover photo"
 msgstr ""
 
@@ -7478,8 +7661,7 @@ msgstr ""
 msgid "Documentation Search"
 msgstr ""
 
-#: ../../Zotlabs/Module/Help.php:80 ../../include/conversation.php:1833
-#: ../../include/nav.php:383
+#: ../../Zotlabs/Module/Help.php:80 ../../include/nav.php:404
 msgid "About"
 msgstr ""
 
@@ -7503,11 +7685,11 @@ msgstr ""
 msgid "Contents"
 msgstr ""
 
-#: ../../Zotlabs/Module/Display.php:394
+#: ../../Zotlabs/Module/Display.php:393
 msgid "Article"
 msgstr ""
 
-#: ../../Zotlabs/Module/Display.php:446
+#: ../../Zotlabs/Module/Display.php:445
 msgid "Item has been removed."
 msgstr ""
 
@@ -7523,23 +7705,23 @@ msgstr ""
 msgid "Select a tag to remove: "
 msgstr ""
 
-#: ../../Zotlabs/Module/Network.php:116
+#: ../../Zotlabs/Module/Network.php:107
 msgid "No such group"
 msgstr ""
 
-#: ../../Zotlabs/Module/Network.php:157
+#: ../../Zotlabs/Module/Network.php:148
 msgid "No such channel"
 msgstr ""
 
-#: ../../Zotlabs/Module/Network.php:242
+#: ../../Zotlabs/Module/Network.php:231
 msgid "Privacy group is empty"
 msgstr ""
 
-#: ../../Zotlabs/Module/Network.php:253
+#: ../../Zotlabs/Module/Network.php:242
 msgid "Privacy group: "
 msgstr ""
 
-#: ../../Zotlabs/Module/Network.php:304 ../../addon/redred/redred.php:65
+#: ../../Zotlabs/Module/Network.php:291 ../../addon/redred/redred.php:65
 msgid "Invalid channel."
 msgstr ""
 
@@ -7547,12 +7729,12 @@ msgstr ""
 msgid "network"
 msgstr ""
 
-#: ../../Zotlabs/Module/Home.php:74 ../../Zotlabs/Module/Home.php:82
+#: ../../Zotlabs/Module/Home.php:72 ../../Zotlabs/Module/Home.php:80
 #: ../../Zotlabs/Lib/Enotify.php:66 ../../addon/opensearch/opensearch.php:42
 msgid "$Projectname"
 msgstr ""
 
-#: ../../Zotlabs/Module/Home.php:92
+#: ../../Zotlabs/Module/Home.php:90
 #, php-format
 msgid "Welcome to %s"
 msgstr ""
@@ -7740,7 +7922,7 @@ msgid ""
 "Password reset failed."
 msgstr ""
 
-#: ../../Zotlabs/Module/Lostpass.php:91 ../../boot.php:1622
+#: ../../Zotlabs/Module/Lostpass.php:91 ../../boot.php:1634
 msgid "Password Reset"
 msgstr ""
 
@@ -7785,11 +7967,51 @@ msgstr ""
 msgid "Email Address"
 msgstr ""
 
+#: ../../Zotlabs/Module/Oauth.php:45
+msgid "Name is required"
+msgstr ""
+
+#: ../../Zotlabs/Module/Oauth.php:49
+msgid "Key and Secret are required"
+msgstr ""
+
+#: ../../Zotlabs/Module/Oauth.php:100
+msgid "OAuth Apps Manager App"
+msgstr ""
+
+#: ../../Zotlabs/Module/Oauth.php:101
+msgid "OAuth authentication tokens for mobile and remote apps"
+msgstr ""
+
+#: ../../Zotlabs/Module/Oauth.php:114 ../../Zotlabs/Module/Oauth.php:140
+#: ../../addon/statusnet/statusnet.php:894 ../../addon/twitter/twitter.php:784
+msgid "Consumer Key"
+msgstr ""
+
+#: ../../Zotlabs/Module/Oauth.php:117 ../../Zotlabs/Module/Oauth.php:143
+msgid "Icon url"
+msgstr ""
+
+#: ../../Zotlabs/Module/Oauth.php:128
+msgid "Application not found."
+msgstr ""
+
+#: ../../Zotlabs/Module/Oauth.php:171
+msgid "Connected OAuth Apps"
+msgstr ""
+
 #: ../../Zotlabs/Module/Notifications.php:60
-#: ../../Zotlabs/Lib/ThreadItem.php:413
+#: ../../Zotlabs/Lib/ThreadItem.php:422
 msgid "Mark all seen"
 msgstr ""
 
+#: ../../Zotlabs/Lib/Activity.php:1417 ../../Zotlabs/Lib/Activity.php:1614
+#: ../../widget/Netselect/Netselect.php:42 ../../addon/pubcrawl/as.php:1221
+#: ../../addon/pubcrawl/as.php:1376 ../../addon/pubcrawl/as.php:1555
+#: ../../include/network.php:1778
+msgid "ActivityPub"
+msgstr ""
+
 #: ../../Zotlabs/Lib/Techlevels.php:10
 msgid "0. Beginner/Basic"
 msgstr ""
@@ -7814,120 +8036,179 @@ msgstr ""
 msgid "5. Wizard - I probably know more than you do"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Apps.php:294
+#: ../../Zotlabs/Lib/Libzot.php:663 ../../include/zot.php:800
+msgid "Unable to verify channel signature"
+msgstr ""
+
+#: ../../Zotlabs/Lib/Apps.php:301
+msgid "Apps"
+msgstr ""
+
+#: ../../Zotlabs/Lib/Apps.php:304
 msgid "Site Admin"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Apps.php:295 ../../addon/buglink/buglink.php:16
+#: ../../Zotlabs/Lib/Apps.php:305 ../../addon/buglink/buglink.php:16
 msgid "Report Bug"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Apps.php:296
-msgid "View Bookmarks"
+#: ../../Zotlabs/Lib/Apps.php:306 ../../include/nav.php:460
+msgid "Bookmarks"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Apps.php:297
-msgid "My Chatrooms"
+#: ../../Zotlabs/Lib/Apps.php:307 ../../Zotlabs/Widget/Chatroom_list.php:16
+#: ../../include/nav.php:447 ../../include/nav.php:450
+msgid "Chatrooms"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Apps.php:299
+#: ../../Zotlabs/Lib/Apps.php:309
 msgid "Remote Diagnostics"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Apps.php:300 ../../include/features.php:435
+#: ../../Zotlabs/Lib/Apps.php:310 ../../include/features.php:373
 msgid "Suggest Channels"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Apps.php:301 ../../boot.php:1613 ../../include/nav.php:120
-#: ../../include/nav.php:124
+#: ../../Zotlabs/Lib/Apps.php:311 ../../boot.php:1625 ../../include/nav.php:118
+#: ../../include/nav.php:122
 msgid "Login"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Apps.php:303
-msgid "Activity"
+#: ../../Zotlabs/Lib/Apps.php:313
+msgid "Stream"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Apps.php:307 ../../include/conversation.php:1940
-#: ../../include/features.php:96 ../../include/nav.php:489
+#: ../../Zotlabs/Lib/Apps.php:317 ../../include/nav.php:509
 msgid "Wiki"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Apps.php:308
+#: ../../Zotlabs/Lib/Apps.php:318 ../../include/features.php:96
 msgid "Channel Home"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Apps.php:311 ../../include/conversation.php:1862
-#: ../../include/conversation.php:1865
+#: ../../Zotlabs/Lib/Apps.php:321 ../../include/features.php:269
 msgid "Events"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Apps.php:312
+#: ../../Zotlabs/Lib/Apps.php:322 ../../include/features.php:176
 msgid "Directory"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Apps.php:314
+#: ../../Zotlabs/Lib/Apps.php:324
 msgid "Mail"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Apps.php:317
+#: ../../Zotlabs/Lib/Apps.php:327
 msgid "Chat"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Apps.php:319
+#: ../../Zotlabs/Lib/Apps.php:329
 msgid "Probe"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Apps.php:320
+#: ../../Zotlabs/Lib/Apps.php:330
 msgid "Suggest"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Apps.php:321
+#: ../../Zotlabs/Lib/Apps.php:331
 msgid "Random Channel"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Apps.php:322
+#: ../../Zotlabs/Lib/Apps.php:332
 msgid "Invite"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Apps.php:323 ../../Zotlabs/Widget/Admin.php:26
+#: ../../Zotlabs/Lib/Apps.php:333 ../../Zotlabs/Widget/Admin.php:26
 msgid "Features"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Apps.php:324 ../../addon/openid/MysqlProvider.php:69
+#: ../../Zotlabs/Lib/Apps.php:334 ../../addon/openid/MysqlProvider.php:69
 msgid "Language"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Apps.php:325
+#: ../../Zotlabs/Lib/Apps.php:335
 msgid "Post"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Apps.php:326 ../../addon/openid/MysqlProvider.php:58
+#: ../../Zotlabs/Lib/Apps.php:336 ../../addon/openid/MysqlProvider.php:58
 #: ../../addon/openid/MysqlProvider.php:59
 #: ../../addon/openid/MysqlProvider.php:60
 msgid "Profile Photo"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Apps.php:473
+#: ../../Zotlabs/Lib/Apps.php:338 ../../include/features.php:405
+msgid "Profiles"
+msgstr ""
+
+#: ../../Zotlabs/Lib/Apps.php:340
+msgid "Notifications"
+msgstr ""
+
+#: ../../Zotlabs/Lib/Apps.php:341
+msgid "Order Apps"
+msgstr ""
+
+#: ../../Zotlabs/Lib/Apps.php:342 ../../include/features.php:82
+msgid "CalDAV"
+msgstr ""
+
+#: ../../Zotlabs/Lib/Apps.php:343
+msgid "CardDAV"
+msgstr ""
+
+#: ../../Zotlabs/Lib/Apps.php:345
+msgid "Guest Access"
+msgstr ""
+
+#: ../../Zotlabs/Lib/Apps.php:346 ../../Zotlabs/Widget/Notes.php:21
+msgid "Notes"
+msgstr ""
+
+#: ../../Zotlabs/Lib/Apps.php:347
+msgid "OAuth Apps Manager"
+msgstr ""
+
+#: ../../Zotlabs/Lib/Apps.php:348
+msgid "OAuth2 Apps Manager"
+msgstr ""
+
+#: ../../Zotlabs/Lib/Apps.php:349
+msgid "PDL Editor"
+msgstr ""
+
+#: ../../Zotlabs/Lib/Apps.php:351
+msgid "Premium Channel"
+msgstr ""
+
+#: ../../Zotlabs/Lib/Apps.php:353
+msgid "My Chatrooms"
+msgstr ""
+
+#: ../../Zotlabs/Lib/Apps.php:354
+msgid "Channel Export"
+msgstr ""
+
+#: ../../Zotlabs/Lib/Apps.php:531
 msgid "Purchase"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Apps.php:477
+#: ../../Zotlabs/Lib/Apps.php:536
 msgid "Undelete"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Apps.php:485
+#: ../../Zotlabs/Lib/Apps.php:545
 msgid "Add to app-tray"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Apps.php:486
+#: ../../Zotlabs/Lib/Apps.php:546
 msgid "Remove from app-tray"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Apps.php:487
+#: ../../Zotlabs/Lib/Apps.php:547
 msgid "Pin to navbar"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Apps.php:488
+#: ../../Zotlabs/Lib/Apps.php:548
 msgid "Unpin from navbar"
 msgstr ""
 
@@ -7952,69 +8233,79 @@ msgid "publisher"
 msgstr ""
 
 #: ../../Zotlabs/Lib/NativeWikiPage.php:42
-#: ../../Zotlabs/Lib/NativeWikiPage.php:93
+#: ../../Zotlabs/Lib/NativeWikiPage.php:94
 msgid "(No Title)"
 msgstr ""
 
-#: ../../Zotlabs/Lib/NativeWikiPage.php:107
+#: ../../Zotlabs/Lib/NativeWikiPage.php:109
 msgid "Wiki page create failed."
 msgstr ""
 
-#: ../../Zotlabs/Lib/NativeWikiPage.php:120
+#: ../../Zotlabs/Lib/NativeWikiPage.php:122
 msgid "Wiki not found."
 msgstr ""
 
-#: ../../Zotlabs/Lib/NativeWikiPage.php:131
+#: ../../Zotlabs/Lib/NativeWikiPage.php:133
 msgid "Destination name already exists"
 msgstr ""
 
-#: ../../Zotlabs/Lib/NativeWikiPage.php:163
-#: ../../Zotlabs/Lib/NativeWikiPage.php:359
+#: ../../Zotlabs/Lib/NativeWikiPage.php:166
+#: ../../Zotlabs/Lib/NativeWikiPage.php:362
 msgid "Page not found"
 msgstr ""
 
-#: ../../Zotlabs/Lib/NativeWikiPage.php:194
+#: ../../Zotlabs/Lib/NativeWikiPage.php:197
 msgid "Error reading page content"
 msgstr ""
 
-#: ../../Zotlabs/Lib/NativeWikiPage.php:350
-#: ../../Zotlabs/Lib/NativeWikiPage.php:400
-#: ../../Zotlabs/Lib/NativeWikiPage.php:467
-#: ../../Zotlabs/Lib/NativeWikiPage.php:508
+#: ../../Zotlabs/Lib/NativeWikiPage.php:353
+#: ../../Zotlabs/Lib/NativeWikiPage.php:402
+#: ../../Zotlabs/Lib/NativeWikiPage.php:469
+#: ../../Zotlabs/Lib/NativeWikiPage.php:510
 msgid "Error reading wiki"
 msgstr ""
 
-#: ../../Zotlabs/Lib/NativeWikiPage.php:388
+#: ../../Zotlabs/Lib/NativeWikiPage.php:390
 msgid "Page update failed."
 msgstr ""
 
-#: ../../Zotlabs/Lib/NativeWikiPage.php:422
+#: ../../Zotlabs/Lib/NativeWikiPage.php:424
 msgid "Nothing deleted"
 msgstr ""
 
-#: ../../Zotlabs/Lib/NativeWikiPage.php:488
+#: ../../Zotlabs/Lib/NativeWikiPage.php:490
 msgid "Compare: object not found."
 msgstr ""
 
-#: ../../Zotlabs/Lib/NativeWikiPage.php:494
+#: ../../Zotlabs/Lib/NativeWikiPage.php:496
 msgid "Page updated"
 msgstr ""
 
-#: ../../Zotlabs/Lib/NativeWikiPage.php:497
+#: ../../Zotlabs/Lib/NativeWikiPage.php:499
 msgid "Untitled"
 msgstr ""
 
-#: ../../Zotlabs/Lib/NativeWikiPage.php:503
+#: ../../Zotlabs/Lib/NativeWikiPage.php:505
 msgid "Wiki resource_id required for git commit"
 msgstr ""
 
-#: ../../Zotlabs/Lib/NativeWikiPage.php:559
+#: ../../Zotlabs/Lib/NativeWikiPage.php:562
 #: ../../Zotlabs/Widget/Wiki_page_history.php:23
 msgctxt "wiki_history"
 msgid "Message"
 msgstr ""
 
-#: ../../Zotlabs/Lib/NativeWikiPage.php:597 ../../include/bbcode.php:746
+#: ../../Zotlabs/Lib/NativeWikiPage.php:563
+#: ../../Zotlabs/Widget/Wiki_page_history.php:24
+msgid "Date"
+msgstr ""
+
+#: ../../Zotlabs/Lib/NativeWikiPage.php:565
+#: ../../Zotlabs/Widget/Wiki_page_history.php:26
+msgid "Compare"
+msgstr ""
+
+#: ../../Zotlabs/Lib/NativeWikiPage.php:603 ../../include/bbcode.php:746
 #: ../../include/bbcode.php:916
 msgid "Different viewers will see this text differently"
 msgstr ""
@@ -8082,6 +8373,54 @@ msgstr ""
 msgid "This is your default setting for the audience of your webpages"
 msgstr ""
 
+#: ../../Zotlabs/Lib/Libzotdir.php:160 ../../include/dir_fns.php:141
+msgid "Directory Options"
+msgstr ""
+
+#: ../../Zotlabs/Lib/Libzotdir.php:162 ../../include/dir_fns.php:143
+msgid "Safe Mode"
+msgstr ""
+
+#: ../../Zotlabs/Lib/Libzotdir.php:163 ../../include/dir_fns.php:144
+msgid "Public Forums Only"
+msgstr ""
+
+#: ../../Zotlabs/Lib/Libzotdir.php:165 ../../include/dir_fns.php:145
+msgid "This Website Only"
+msgstr ""
+
+#: ../../Zotlabs/Lib/Group.php:28 ../../include/group.php:22
+msgid ""
+"A deleted group with this name was revived. Existing item permissions "
+"<strong>may</strong> apply to this group and any future members. If this is "
+"not what you intended, please create another group with a different name."
+msgstr ""
+
+#: ../../Zotlabs/Lib/Group.php:270 ../../include/group.php:264
+msgid "Add new connections to this privacy group"
+msgstr ""
+
+#: ../../Zotlabs/Lib/Group.php:302 ../../include/group.php:298
+msgid "edit"
+msgstr ""
+
+#: ../../Zotlabs/Lib/Group.php:325 ../../include/group.php:321
+msgid "Edit group"
+msgstr ""
+
+#: ../../Zotlabs/Lib/Group.php:326 ../../include/group.php:322
+msgid "Add privacy group"
+msgstr ""
+
+#: ../../Zotlabs/Lib/Group.php:327 ../../include/group.php:323
+msgid "Channels not in any privacy group"
+msgstr ""
+
+#: ../../Zotlabs/Lib/Group.php:329 ../../Zotlabs/Widget/Savedsearch.php:84
+#: ../../include/group.php:325
+msgid "add"
+msgstr ""
+
 #: ../../Zotlabs/Lib/Chatroom.php:23
 msgid "Missing room name"
 msgstr ""
@@ -8102,6 +8441,11 @@ msgstr ""
 msgid "Room is full"
 msgstr ""
 
+#: ../../Zotlabs/Lib/Libsync.php:733 ../../include/zot.php:2571
+#, php-format
+msgid "Unable to verify site signature for %s"
+msgstr ""
+
 #: ../../Zotlabs/Lib/Enotify.php:60
 msgid "$Projectname Notification"
 msgstr ""
@@ -8369,11 +8713,11 @@ msgstr ""
 msgid "edited a comment dated %s"
 msgstr ""
 
-#: ../../Zotlabs/Lib/NativeWiki.php:151
+#: ../../Zotlabs/Lib/NativeWiki.php:152
 msgid "Wiki updated successfully"
 msgstr ""
 
-#: ../../Zotlabs/Lib/NativeWiki.php:205
+#: ../../Zotlabs/Lib/NativeWiki.php:206
 msgid "Wiki files deleted successfully"
 msgstr ""
 
@@ -8387,200 +8731,210 @@ msgstr ""
 msgid "Update %s failed. See error logs."
 msgstr ""
 
-#: ../../Zotlabs/Lib/ThreadItem.php:97 ../../include/conversation.php:700
+#: ../../Zotlabs/Lib/ThreadItem.php:99 ../../include/conversation.php:700
 msgid "Private Message"
 msgstr ""
 
-#: ../../Zotlabs/Lib/ThreadItem.php:152 ../../Zotlabs/Storage/Browser.php:280
+#: ../../Zotlabs/Lib/ThreadItem.php:154 ../../Zotlabs/Storage/Browser.php:280
 msgid "Admin Delete"
 msgstr ""
 
-#: ../../Zotlabs/Lib/ThreadItem.php:158 ../../include/conversation.php:690
+#: ../../Zotlabs/Lib/ThreadItem.php:160 ../../include/conversation.php:690
 msgid "Select"
 msgstr ""
 
-#: ../../Zotlabs/Lib/ThreadItem.php:183
+#: ../../Zotlabs/Lib/ThreadItem.php:185
 msgid "I will attend"
 msgstr ""
 
-#: ../../Zotlabs/Lib/ThreadItem.php:183
+#: ../../Zotlabs/Lib/ThreadItem.php:185
 msgid "I will not attend"
 msgstr ""
 
-#: ../../Zotlabs/Lib/ThreadItem.php:183
+#: ../../Zotlabs/Lib/ThreadItem.php:185
 msgid "I might attend"
 msgstr ""
 
-#: ../../Zotlabs/Lib/ThreadItem.php:193
+#: ../../Zotlabs/Lib/ThreadItem.php:195
 msgid "I agree"
 msgstr ""
 
-#: ../../Zotlabs/Lib/ThreadItem.php:193
+#: ../../Zotlabs/Lib/ThreadItem.php:195
 msgid "I disagree"
 msgstr ""
 
-#: ../../Zotlabs/Lib/ThreadItem.php:193
+#: ../../Zotlabs/Lib/ThreadItem.php:195
 msgid "I abstain"
 msgstr ""
 
-#: ../../Zotlabs/Lib/ThreadItem.php:247 ../../include/conversation.php:695
+#: ../../Zotlabs/Lib/ThreadItem.php:249 ../../include/conversation.php:695
 msgid "Toggle Star Status"
 msgstr ""
 
-#: ../../Zotlabs/Lib/ThreadItem.php:258 ../../include/conversation.php:707
+#: ../../Zotlabs/Lib/ThreadItem.php:260 ../../include/conversation.php:707
 msgid "Message signature validated"
 msgstr ""
 
-#: ../../Zotlabs/Lib/ThreadItem.php:259 ../../include/conversation.php:708
+#: ../../Zotlabs/Lib/ThreadItem.php:261 ../../include/conversation.php:708
 msgid "Message signature incorrect"
 msgstr ""
 
-#: ../../Zotlabs/Lib/ThreadItem.php:267
+#: ../../Zotlabs/Lib/ThreadItem.php:269
 msgid "Add Tag"
 msgstr ""
 
-#: ../../Zotlabs/Lib/ThreadItem.php:285 ../../include/taxonomy.php:575
+#: ../../Zotlabs/Lib/ThreadItem.php:273 ../../include/conversation.php:891
+msgid "Conversation Tools"
+msgstr ""
+
+#: ../../Zotlabs/Lib/ThreadItem.php:289 ../../include/taxonomy.php:575
 msgid "like"
 msgstr ""
 
-#: ../../Zotlabs/Lib/ThreadItem.php:286 ../../include/taxonomy.php:576
+#: ../../Zotlabs/Lib/ThreadItem.php:290 ../../include/taxonomy.php:576
 msgid "dislike"
 msgstr ""
 
-#: ../../Zotlabs/Lib/ThreadItem.php:290
+#: ../../Zotlabs/Lib/ThreadItem.php:294
 msgid "Share This"
 msgstr ""
 
-#: ../../Zotlabs/Lib/ThreadItem.php:290
+#: ../../Zotlabs/Lib/ThreadItem.php:294
 msgid "share"
 msgstr ""
 
-#: ../../Zotlabs/Lib/ThreadItem.php:299
+#: ../../Zotlabs/Lib/ThreadItem.php:303
 msgid "Delivery Report"
 msgstr ""
 
-#: ../../Zotlabs/Lib/ThreadItem.php:317
+#: ../../Zotlabs/Lib/ThreadItem.php:321
 #, php-format
 msgid "%d comment"
 msgid_plural "%d comments"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../../Zotlabs/Lib/ThreadItem.php:347 ../../Zotlabs/Lib/ThreadItem.php:348
+#: ../../Zotlabs/Lib/ThreadItem.php:355 ../../Zotlabs/Lib/ThreadItem.php:356
 #, php-format
 msgid "View %s's profile - %s"
 msgstr ""
 
-#: ../../Zotlabs/Lib/ThreadItem.php:351
+#: ../../Zotlabs/Lib/ThreadItem.php:359
 msgid "to"
 msgstr ""
 
-#: ../../Zotlabs/Lib/ThreadItem.php:352
+#: ../../Zotlabs/Lib/ThreadItem.php:360
 msgid "via"
 msgstr ""
 
-#: ../../Zotlabs/Lib/ThreadItem.php:353
+#: ../../Zotlabs/Lib/ThreadItem.php:361
 msgid "Wall-to-Wall"
 msgstr ""
 
-#: ../../Zotlabs/Lib/ThreadItem.php:354
+#: ../../Zotlabs/Lib/ThreadItem.php:362
 msgid "via Wall-To-Wall:"
 msgstr ""
 
-#: ../../Zotlabs/Lib/ThreadItem.php:367 ../../include/conversation.php:766
+#: ../../Zotlabs/Lib/ThreadItem.php:375 ../../include/conversation.php:766
 #, php-format
 msgid "from %s"
 msgstr ""
 
-#: ../../Zotlabs/Lib/ThreadItem.php:370 ../../include/conversation.php:769
+#: ../../Zotlabs/Lib/ThreadItem.php:378 ../../include/conversation.php:769
 #, php-format
 msgid "last edited: %s"
 msgstr ""
 
-#: ../../Zotlabs/Lib/ThreadItem.php:371 ../../include/conversation.php:770
+#: ../../Zotlabs/Lib/ThreadItem.php:379 ../../include/conversation.php:770
 #, php-format
 msgid "Expires: %s"
 msgstr ""
 
-#: ../../Zotlabs/Lib/ThreadItem.php:379
+#: ../../Zotlabs/Lib/ThreadItem.php:387
 msgid "Attend"
 msgstr ""
 
-#: ../../Zotlabs/Lib/ThreadItem.php:380
+#: ../../Zotlabs/Lib/ThreadItem.php:388
 msgid "Attendance Options"
 msgstr ""
 
-#: ../../Zotlabs/Lib/ThreadItem.php:381
+#: ../../Zotlabs/Lib/ThreadItem.php:389
 msgid "Vote"
 msgstr ""
 
-#: ../../Zotlabs/Lib/ThreadItem.php:382
+#: ../../Zotlabs/Lib/ThreadItem.php:390
 msgid "Voting Options"
 msgstr ""
 
-#: ../../Zotlabs/Lib/ThreadItem.php:403
+#: ../../Zotlabs/Lib/ThreadItem.php:411
 #: ../../addon/bookmarker/bookmarker.php:38
 msgid "Save Bookmarks"
 msgstr ""
 
-#: ../../Zotlabs/Lib/ThreadItem.php:404
+#: ../../Zotlabs/Lib/ThreadItem.php:412
 msgid "Add to Calendar"
 msgstr ""
 
-#: ../../Zotlabs/Lib/ThreadItem.php:431 ../../include/conversation.php:483
+#: ../../Zotlabs/Lib/ThreadItem.php:440 ../../include/conversation.php:483
 msgid "This is an unsaved preview"
 msgstr ""
 
-#: ../../Zotlabs/Lib/ThreadItem.php:463 ../../include/js_strings.php:7
+#: ../../Zotlabs/Lib/ThreadItem.php:473 ../../include/js_strings.php:7
 #, php-format
 msgid "%s show all"
 msgstr ""
 
-#: ../../Zotlabs/Lib/ThreadItem.php:758 ../../include/conversation.php:1388
+#: ../../Zotlabs/Lib/ThreadItem.php:768 ../../addon/hsse/hsse.php:200
+#: ../../include/conversation.php:1403
 msgid "Bold"
 msgstr ""
 
-#: ../../Zotlabs/Lib/ThreadItem.php:759 ../../include/conversation.php:1389
+#: ../../Zotlabs/Lib/ThreadItem.php:769 ../../addon/hsse/hsse.php:201
+#: ../../include/conversation.php:1404
 msgid "Italic"
 msgstr ""
 
-#: ../../Zotlabs/Lib/ThreadItem.php:760 ../../include/conversation.php:1390
+#: ../../Zotlabs/Lib/ThreadItem.php:770 ../../addon/hsse/hsse.php:202
+#: ../../include/conversation.php:1405
 msgid "Underline"
 msgstr ""
 
-#: ../../Zotlabs/Lib/ThreadItem.php:761 ../../include/conversation.php:1391
+#: ../../Zotlabs/Lib/ThreadItem.php:771 ../../addon/hsse/hsse.php:203
+#: ../../include/conversation.php:1406
 msgid "Quote"
 msgstr ""
 
-#: ../../Zotlabs/Lib/ThreadItem.php:762 ../../include/conversation.php:1392
+#: ../../Zotlabs/Lib/ThreadItem.php:772 ../../addon/hsse/hsse.php:204
+#: ../../include/conversation.php:1407
 msgid "Code"
 msgstr ""
 
-#: ../../Zotlabs/Lib/ThreadItem.php:763
+#: ../../Zotlabs/Lib/ThreadItem.php:773
 msgid "Image"
 msgstr ""
 
-#: ../../Zotlabs/Lib/ThreadItem.php:764 ../../include/conversation.php:1393
+#: ../../Zotlabs/Lib/ThreadItem.php:774 ../../addon/hsse/hsse.php:205
+#: ../../include/conversation.php:1408
 msgid "Attach/Upload file"
 msgstr ""
 
-#: ../../Zotlabs/Lib/ThreadItem.php:765
+#: ../../Zotlabs/Lib/ThreadItem.php:775
 msgid "Insert Link"
 msgstr ""
 
-#: ../../Zotlabs/Lib/ThreadItem.php:766
+#: ../../Zotlabs/Lib/ThreadItem.php:776
 msgid "Video"
 msgstr ""
 
-#: ../../Zotlabs/Lib/ThreadItem.php:776
+#: ../../Zotlabs/Lib/ThreadItem.php:786
 msgid "Your full name (required)"
 msgstr ""
 
-#: ../../Zotlabs/Lib/ThreadItem.php:777
+#: ../../Zotlabs/Lib/ThreadItem.php:787
 msgid "Your email address (required)"
 msgstr ""
 
-#: ../../Zotlabs/Lib/ThreadItem.php:778
+#: ../../Zotlabs/Lib/ThreadItem.php:788
 msgid "Your website URL (optional)"
 msgstr ""
 
@@ -8600,7 +8954,7 @@ msgstr ""
 msgid "parent"
 msgstr ""
 
-#: ../../Zotlabs/Storage/Browser.php:131 ../../include/text.php:2817
+#: ../../Zotlabs/Storage/Browser.php:131 ../../include/text.php:2824
 msgid "Collection"
 msgstr ""
 
@@ -8612,8 +8966,8 @@ msgstr ""
 msgid "Addressbook"
 msgstr ""
 
-#: ../../Zotlabs/Storage/Browser.php:140 ../../include/nav.php:412
-#: ../../include/nav.php:415
+#: ../../Zotlabs/Storage/Browser.php:140 ../../include/nav.php:433
+#: ../../include/nav.php:436
 msgid "Calendar"
 msgstr ""
 
@@ -8664,7 +9018,7 @@ msgid "Drop files here to immediately upload"
 msgstr ""
 
 #: ../../Zotlabs/Widget/Forums.php:100
-#: ../../Zotlabs/Widget/Activity_filter.php:100
+#: ../../Zotlabs/Widget/Activity_filter.php:102
 #: ../../Zotlabs/Widget/Notifications.php:119
 #: ../../Zotlabs/Widget/Notifications.php:120
 msgid "Forums"
@@ -8755,9 +9109,9 @@ msgid "Categories"
 msgstr ""
 
 #: ../../Zotlabs/Widget/Appcategories.php:46 ../../Zotlabs/Widget/Filer.php:31
-#: ../../widgets/Netselect/Netselect.php:26
-#: ../../include/contact_widgets.php:56 ../../include/contact_widgets.php:100
-#: ../../include/contact_widgets.php:144 ../../include/contact_widgets.php:189
+#: ../../widget/Netselect/Netselect.php:26 ../../include/contact_widgets.php:56
+#: ../../include/contact_widgets.php:100 ../../include/contact_widgets.php:144
+#: ../../include/contact_widgets.php:189
 msgid "Everything"
 msgstr ""
 
@@ -8805,12 +9159,6 @@ msgstr ""
 msgid "New Message"
 msgstr ""
 
-#: ../../Zotlabs/Widget/Chatroom_list.php:16
-#: ../../include/conversation.php:1876 ../../include/conversation.php:1879
-#: ../../include/nav.php:426 ../../include/nav.php:429
-msgid "Chatrooms"
-msgstr ""
-
 #: ../../Zotlabs/Widget/Chatroom_list.php:20
 msgid "Overview"
 msgstr ""
@@ -8832,59 +9180,59 @@ msgctxt "widget"
 msgid "Activity"
 msgstr ""
 
-#: ../../Zotlabs/Widget/Activity_filter.php:24
+#: ../../Zotlabs/Widget/Activity_filter.php:26
 msgid "Personal Posts"
 msgstr ""
 
-#: ../../Zotlabs/Widget/Activity_filter.php:28
+#: ../../Zotlabs/Widget/Activity_filter.php:30
 msgid "Show posts that mention or involve me"
 msgstr ""
 
-#: ../../Zotlabs/Widget/Activity_filter.php:39
+#: ../../Zotlabs/Widget/Activity_filter.php:41
 msgid "Starred Posts"
 msgstr ""
 
-#: ../../Zotlabs/Widget/Activity_filter.php:43
+#: ../../Zotlabs/Widget/Activity_filter.php:45
 msgid "Show posts that I have starred"
 msgstr ""
 
-#: ../../Zotlabs/Widget/Activity_filter.php:63
+#: ../../Zotlabs/Widget/Activity_filter.php:65
 #, php-format
 msgid "Show posts related to the %s privacy group"
 msgstr ""
 
-#: ../../Zotlabs/Widget/Activity_filter.php:72
+#: ../../Zotlabs/Widget/Activity_filter.php:74
 msgid "Show my privacy groups"
 msgstr ""
 
-#: ../../Zotlabs/Widget/Activity_filter.php:93
+#: ../../Zotlabs/Widget/Activity_filter.php:95
 msgid "Show posts to this forum"
 msgstr ""
 
-#: ../../Zotlabs/Widget/Activity_filter.php:104
+#: ../../Zotlabs/Widget/Activity_filter.php:106
 msgid "Show forums"
 msgstr ""
 
-#: ../../Zotlabs/Widget/Activity_filter.php:128
+#: ../../Zotlabs/Widget/Activity_filter.php:130
 #, php-format
 msgid "Show posts that I have filed to %s"
 msgstr ""
 
-#: ../../Zotlabs/Widget/Activity_filter.php:134
+#: ../../Zotlabs/Widget/Activity_filter.php:136
 #: ../../Zotlabs/Widget/Filer.php:28 ../../include/contact_widgets.php:53
-#: ../../include/features.php:488
+#: ../../include/features.php:325
 msgid "Saved Folders"
 msgstr ""
 
-#: ../../Zotlabs/Widget/Activity_filter.php:138
+#: ../../Zotlabs/Widget/Activity_filter.php:140
 msgid "Show filed post categories"
 msgstr ""
 
-#: ../../Zotlabs/Widget/Activity_filter.php:152
+#: ../../Zotlabs/Widget/Activity_filter.php:154
 msgid "Panel search"
 msgstr ""
 
-#: ../../Zotlabs/Widget/Activity_filter.php:162
+#: ../../Zotlabs/Widget/Activity_filter.php:164
 #: ../../Zotlabs/Widget/Notifications.php:27
 #: ../../Zotlabs/Widget/Notifications.php:46
 #: ../../Zotlabs/Widget/Notifications.php:122
@@ -8892,12 +9240,12 @@ msgstr ""
 msgid "Filter by name"
 msgstr ""
 
-#: ../../Zotlabs/Widget/Activity_filter.php:177
+#: ../../Zotlabs/Widget/Activity_filter.php:179
 msgid "Remove active filter"
 msgstr ""
 
-#: ../../Zotlabs/Widget/Activity_filter.php:193
-msgid "Activity Filters"
+#: ../../Zotlabs/Widget/Activity_filter.php:195
+msgid "Stream Filters"
 msgstr ""
 
 #: ../../Zotlabs/Widget/Follow.php:22
@@ -8917,10 +9265,6 @@ msgstr ""
 msgid "Examples: bob@example.com, https://example.com/barbara"
 msgstr ""
 
-#: ../../Zotlabs/Widget/Wiki_list.php:15
-msgid "Wiki List"
-msgstr ""
-
 #: ../../Zotlabs/Widget/Archive.php:43
 msgid "Archives"
 msgstr ""
@@ -8957,28 +9301,20 @@ msgstr ""
 msgid "Remove term"
 msgstr ""
 
-#: ../../Zotlabs/Widget/Savedsearch.php:83 ../../include/features.php:381
+#: ../../Zotlabs/Widget/Savedsearch.php:83 ../../include/features.php:317
 msgid "Saved Searches"
 msgstr ""
 
-#: ../../Zotlabs/Widget/Savedsearch.php:84 ../../include/group.php:325
-msgid "add"
-msgstr ""
-
-#: ../../Zotlabs/Widget/Notes.php:16
-msgid "Notes"
-msgstr ""
-
-#: ../../Zotlabs/Widget/Wiki_pages.php:32
-#: ../../Zotlabs/Widget/Wiki_pages.php:89
+#: ../../Zotlabs/Widget/Wiki_pages.php:34
+#: ../../Zotlabs/Widget/Wiki_pages.php:91
 msgid "Add new page"
 msgstr ""
 
-#: ../../Zotlabs/Widget/Wiki_pages.php:83
+#: ../../Zotlabs/Widget/Wiki_pages.php:85
 msgid "Wiki Pages"
 msgstr ""
 
-#: ../../Zotlabs/Widget/Wiki_pages.php:94
+#: ../../Zotlabs/Widget/Wiki_pages.php:96
 msgid "Page name"
 msgstr ""
 
@@ -8998,35 +9334,35 @@ msgstr ""
 msgid "See more..."
 msgstr ""
 
-#: ../../Zotlabs/Widget/Activity_order.php:86
+#: ../../Zotlabs/Widget/Activity_order.php:90
 msgid "Commented Date"
 msgstr ""
 
-#: ../../Zotlabs/Widget/Activity_order.php:90
+#: ../../Zotlabs/Widget/Activity_order.php:94
 msgid "Order by last commented date"
 msgstr ""
 
-#: ../../Zotlabs/Widget/Activity_order.php:93
+#: ../../Zotlabs/Widget/Activity_order.php:97
 msgid "Posted Date"
 msgstr ""
 
-#: ../../Zotlabs/Widget/Activity_order.php:97
+#: ../../Zotlabs/Widget/Activity_order.php:101
 msgid "Order by last posted date"
 msgstr ""
 
-#: ../../Zotlabs/Widget/Activity_order.php:100
+#: ../../Zotlabs/Widget/Activity_order.php:104
 msgid "Date Unthreaded"
 msgstr ""
 
-#: ../../Zotlabs/Widget/Activity_order.php:104
+#: ../../Zotlabs/Widget/Activity_order.php:108
 msgid "Order unthreaded by date"
 msgstr ""
 
-#: ../../Zotlabs/Widget/Activity_order.php:119
-msgid "Activity Order"
+#: ../../Zotlabs/Widget/Activity_order.php:123
+msgid "Stream Order"
 msgstr ""
 
-#: ../../Zotlabs/Widget/Cover_photo.php:54
+#: ../../Zotlabs/Widget/Cover_photo.php:65
 msgid "Click to show more"
 msgstr ""
 
@@ -9040,63 +9376,67 @@ msgid "App Collections"
 msgstr ""
 
 #: ../../Zotlabs/Widget/Appstore.php:13
-msgid "Available Apps"
-msgstr ""
-
-#: ../../Zotlabs/Widget/Appstore.php:14
 msgid "Installed apps"
 msgstr ""
 
-#: ../../Zotlabs/Widget/Newmember.php:24
+#: ../../Zotlabs/Widget/Newmember.php:31
 msgid "Profile Creation"
 msgstr ""
 
-#: ../../Zotlabs/Widget/Newmember.php:26
+#: ../../Zotlabs/Widget/Newmember.php:33
 msgid "Upload profile photo"
 msgstr ""
 
-#: ../../Zotlabs/Widget/Newmember.php:27
+#: ../../Zotlabs/Widget/Newmember.php:34
 msgid "Upload cover photo"
 msgstr ""
 
-#: ../../Zotlabs/Widget/Newmember.php:28 ../../include/nav.php:113
+#: ../../Zotlabs/Widget/Newmember.php:35 ../../include/nav.php:111
 msgid "Edit your profile"
 msgstr ""
 
-#: ../../Zotlabs/Widget/Newmember.php:31
+#: ../../Zotlabs/Widget/Newmember.php:38
 msgid "Find and Connect with others"
 msgstr ""
 
-#: ../../Zotlabs/Widget/Newmember.php:33
+#: ../../Zotlabs/Widget/Newmember.php:40
 msgid "View the directory"
 msgstr ""
 
-#: ../../Zotlabs/Widget/Newmember.php:35
+#: ../../Zotlabs/Widget/Newmember.php:42
 msgid "Manage your connections"
 msgstr ""
 
-#: ../../Zotlabs/Widget/Newmember.php:38
+#: ../../Zotlabs/Widget/Newmember.php:45
 msgid "Communicate"
 msgstr ""
 
-#: ../../Zotlabs/Widget/Newmember.php:40
+#: ../../Zotlabs/Widget/Newmember.php:47
 msgid "View your channel homepage"
 msgstr ""
 
-#: ../../Zotlabs/Widget/Newmember.php:41
+#: ../../Zotlabs/Widget/Newmember.php:48
 msgid "View your network stream"
 msgstr ""
 
-#: ../../Zotlabs/Widget/Newmember.php:47
+#: ../../Zotlabs/Widget/Newmember.php:54
 msgid "Documentation"
 msgstr ""
 
-#: ../../Zotlabs/Widget/Newmember.php:58
-msgid "View public stream"
+#: ../../Zotlabs/Widget/Newmember.php:57
+msgid "Missing Features?"
 msgstr ""
 
-#: ../../Zotlabs/Widget/Newmember.php:62 ../../include/features.php:60
-msgid "New Member Links"
+#: ../../Zotlabs/Widget/Newmember.php:59
+msgid "Pin apps to navigation bar"
+msgstr ""
+
+#: ../../Zotlabs/Widget/Newmember.php:60
+msgid "Install more apps"
+msgstr ""
+
+#: ../../Zotlabs/Widget/Newmember.php:71
+msgid "View public stream"
 msgstr ""
 
 #: ../../Zotlabs/Widget/Admin.php:23 ../../Zotlabs/Widget/Admin.php:60
@@ -9111,7 +9451,7 @@ msgstr ""
 msgid "DB updates"
 msgstr ""
 
-#: ../../Zotlabs/Widget/Admin.php:55 ../../include/nav.php:191
+#: ../../Zotlabs/Widget/Admin.php:55 ../../include/nav.php:189
 msgid "Admin"
 msgstr ""
 
@@ -9119,46 +9459,26 @@ msgstr ""
 msgid "Addon Features"
 msgstr ""
 
-#: ../../Zotlabs/Widget/Settings_menu.php:35
+#: ../../Zotlabs/Widget/Settings_menu.php:32
 msgid "Account settings"
 msgstr ""
 
-#: ../../Zotlabs/Widget/Settings_menu.php:41
+#: ../../Zotlabs/Widget/Settings_menu.php:38
 msgid "Channel settings"
 msgstr ""
 
-#: ../../Zotlabs/Widget/Settings_menu.php:50
-msgid "Additional features"
+#: ../../Zotlabs/Widget/Settings_menu.php:47
+msgid "Display settings"
 msgstr ""
 
-#: ../../Zotlabs/Widget/Settings_menu.php:57
+#: ../../Zotlabs/Widget/Settings_menu.php:53
 msgid "Addon settings"
 msgstr ""
 
-#: ../../Zotlabs/Widget/Settings_menu.php:63
-msgid "Display settings"
-msgstr ""
-
-#: ../../Zotlabs/Widget/Settings_menu.php:70
+#: ../../Zotlabs/Widget/Settings_menu.php:60
 msgid "Manage locations"
 msgstr ""
 
-#: ../../Zotlabs/Widget/Settings_menu.php:77
-msgid "Export channel"
-msgstr ""
-
-#: ../../Zotlabs/Widget/Settings_menu.php:84
-msgid "OAuth1 apps"
-msgstr ""
-
-#: ../../Zotlabs/Widget/Settings_menu.php:92
-msgid "OAuth2 apps"
-msgstr ""
-
-#: ../../Zotlabs/Widget/Settings_menu.php:125
-msgid "Premium Channel Settings"
-msgstr ""
-
 #: ../../Zotlabs/Widget/Bookmarkedchats.php:24
 msgid "Bookmarked Chatrooms"
 msgstr ""
@@ -9287,53 +9607,78 @@ msgstr ""
 msgid "Source channel not found."
 msgstr ""
 
-#: ../../boot.php:1592
+#: ../../widget/Netselect/Netselect.php:24
+msgid "Network/Protocol"
+msgstr ""
+
+#: ../../widget/Netselect/Netselect.php:28 ../../include/network.php:1782
+msgid "Zot"
+msgstr ""
+
+#: ../../widget/Netselect/Netselect.php:31 ../../include/network.php:1780
+msgid "Diaspora"
+msgstr ""
+
+#: ../../widget/Netselect/Netselect.php:33 ../../include/network.php:1773
+#: ../../include/network.php:1774
+msgid "Friendica"
+msgstr ""
+
+#: ../../widget/Netselect/Netselect.php:38 ../../include/network.php:1775
+msgid "OStatus"
+msgstr ""
+
+#: ../../boot.php:1604
 msgid "Create an account to access services and applications"
 msgstr ""
 
-#: ../../boot.php:1612 ../../include/nav.php:105 ../../include/nav.php:134
-#: ../../include/nav.php:153
+#: ../../boot.php:1624 ../../include/nav.php:103 ../../include/nav.php:132
+#: ../../include/nav.php:151
 msgid "Logout"
 msgstr ""
 
-#: ../../boot.php:1616
+#: ../../boot.php:1628
 msgid "Login/Email"
 msgstr ""
 
-#: ../../boot.php:1617
+#: ../../boot.php:1629
 msgid "Password"
 msgstr ""
 
-#: ../../boot.php:1618
+#: ../../boot.php:1630
 msgid "Remember me"
 msgstr ""
 
-#: ../../boot.php:1621
+#: ../../boot.php:1633
 msgid "Forgot your password?"
 msgstr ""
 
-#: ../../boot.php:2405
+#: ../../boot.php:2431
 #, php-format
 msgid "[$Projectname] Website SSL error for %s"
 msgstr ""
 
-#: ../../boot.php:2410
+#: ../../boot.php:2436
 msgid "Website SSL certificate is not valid. Please correct."
 msgstr ""
 
-#: ../../boot.php:2526
+#: ../../boot.php:2552
 #, php-format
 msgid "[$Projectname] Cron tasks not running on %s"
 msgstr ""
 
-#: ../../boot.php:2531
+#: ../../boot.php:2557
 msgid "Cron/Scheduled tasks not running."
 msgstr ""
 
-#: ../../boot.php:2532 ../../include/datetime.php:238
+#: ../../boot.php:2558 ../../include/datetime.php:238
 msgid "never"
 msgstr ""
 
+#: ../../store/[data]/smarty3/compiled/a0a1289f91f53b2c12e4e0b45ffe8291540ba895_0.file.cover_photo.tpl.php:127
+msgid "Cover Photo"
+msgstr ""
+
 #: ../../view/theme/redbasic_c/php/config.php:16
 #: ../../view/theme/redbasic_c/php/config.php:19
 #: ../../view/theme/redbasic/php/config.php:16
@@ -9342,97 +9687,97 @@ msgid "Focus (Hubzilla default)"
 msgstr ""
 
 #: ../../view/theme/redbasic_c/php/config.php:99
-#: ../../view/theme/redbasic/php/config.php:97
+#: ../../view/theme/redbasic/php/config.php:98
 msgid "Theme settings"
 msgstr ""
 
 #: ../../view/theme/redbasic_c/php/config.php:100
-#: ../../view/theme/redbasic/php/config.php:98
+#: ../../view/theme/redbasic/php/config.php:99
 msgid "Narrow navbar"
 msgstr ""
 
 #: ../../view/theme/redbasic_c/php/config.php:101
-#: ../../view/theme/redbasic/php/config.php:99
+#: ../../view/theme/redbasic/php/config.php:100
 msgid "Navigation bar background color"
 msgstr ""
 
 #: ../../view/theme/redbasic_c/php/config.php:102
-#: ../../view/theme/redbasic/php/config.php:100
+#: ../../view/theme/redbasic/php/config.php:101
 msgid "Navigation bar icon color "
 msgstr ""
 
 #: ../../view/theme/redbasic_c/php/config.php:103
-#: ../../view/theme/redbasic/php/config.php:101
+#: ../../view/theme/redbasic/php/config.php:102
 msgid "Navigation bar active icon color "
 msgstr ""
 
 #: ../../view/theme/redbasic_c/php/config.php:104
-#: ../../view/theme/redbasic/php/config.php:102
+#: ../../view/theme/redbasic/php/config.php:103
 msgid "Link color"
 msgstr ""
 
 #: ../../view/theme/redbasic_c/php/config.php:105
-#: ../../view/theme/redbasic/php/config.php:103
+#: ../../view/theme/redbasic/php/config.php:104
 msgid "Set font-color for banner"
 msgstr ""
 
 #: ../../view/theme/redbasic_c/php/config.php:106
-#: ../../view/theme/redbasic/php/config.php:104
+#: ../../view/theme/redbasic/php/config.php:105
 msgid "Set the background color"
 msgstr ""
 
 #: ../../view/theme/redbasic_c/php/config.php:107
-#: ../../view/theme/redbasic/php/config.php:105
+#: ../../view/theme/redbasic/php/config.php:106
 msgid "Set the background image"
 msgstr ""
 
 #: ../../view/theme/redbasic_c/php/config.php:108
-#: ../../view/theme/redbasic/php/config.php:106
+#: ../../view/theme/redbasic/php/config.php:107
 msgid "Set the background color of items"
 msgstr ""
 
 #: ../../view/theme/redbasic_c/php/config.php:109
-#: ../../view/theme/redbasic/php/config.php:107
+#: ../../view/theme/redbasic/php/config.php:108
 msgid "Set the background color of comments"
 msgstr ""
 
 #: ../../view/theme/redbasic_c/php/config.php:110
-#: ../../view/theme/redbasic/php/config.php:108
+#: ../../view/theme/redbasic/php/config.php:109
 msgid "Set font-size for the entire application"
 msgstr ""
 
 #: ../../view/theme/redbasic_c/php/config.php:110
-#: ../../view/theme/redbasic/php/config.php:108
+#: ../../view/theme/redbasic/php/config.php:109
 msgid "Examples: 1rem, 100%, 16px"
 msgstr ""
 
 #: ../../view/theme/redbasic_c/php/config.php:111
-#: ../../view/theme/redbasic/php/config.php:109
+#: ../../view/theme/redbasic/php/config.php:110
 msgid "Set font-color for posts and comments"
 msgstr ""
 
 #: ../../view/theme/redbasic_c/php/config.php:112
-#: ../../view/theme/redbasic/php/config.php:110
+#: ../../view/theme/redbasic/php/config.php:111
 msgid "Set radius of corners"
 msgstr ""
 
 #: ../../view/theme/redbasic_c/php/config.php:112
-#: ../../view/theme/redbasic/php/config.php:110
+#: ../../view/theme/redbasic/php/config.php:111
 msgid "Example: 4px"
 msgstr ""
 
 #: ../../view/theme/redbasic_c/php/config.php:113
-#: ../../view/theme/redbasic/php/config.php:111
+#: ../../view/theme/redbasic/php/config.php:112
 msgid "Set shadow depth of photos"
 msgstr ""
 
 #: ../../view/theme/redbasic_c/php/config.php:114
-#: ../../view/theme/redbasic/php/config.php:112
+#: ../../view/theme/redbasic/php/config.php:113
 msgid "Set maximum width of content region in pixel"
 msgstr ""
 
 #: ../../view/theme/redbasic_c/php/config.php:114
-#: ../../view/theme/redbasic/php/config.php:112
+#: ../../view/theme/redbasic/php/config.php:113
 msgid "Leave empty for default width"
 msgstr ""
 
@@ -9441,47 +9786,24 @@ msgid "Left align page content"
 msgstr ""
 
 #: ../../view/theme/redbasic_c/php/config.php:116
-#: ../../view/theme/redbasic/php/config.php:113
+#: ../../view/theme/redbasic/php/config.php:114
 msgid "Set size of conversation author photo"
 msgstr ""
 
 #: ../../view/theme/redbasic_c/php/config.php:117
-#: ../../view/theme/redbasic/php/config.php:114
+#: ../../view/theme/redbasic/php/config.php:115
 msgid "Set size of followup author photos"
 msgstr ""
 
-#: ../../widgets/Netselect/Netselect.php:24
-msgid "Network/Protocol"
-msgstr ""
-
-#: ../../widgets/Netselect/Netselect.php:28 ../../include/network.php:1772
-msgid "Zot"
-msgstr ""
-
-#: ../../widgets/Netselect/Netselect.php:31 ../../include/network.php:1770
-msgid "Diaspora"
-msgstr ""
-
-#: ../../widgets/Netselect/Netselect.php:33 ../../include/network.php:1763
-#: ../../include/network.php:1764
-msgid "Friendica"
-msgstr ""
-
-#: ../../widgets/Netselect/Netselect.php:38 ../../include/network.php:1765
-msgid "OStatus"
-msgstr ""
-
-#: ../../widgets/Netselect/Netselect.php:42 ../../addon/pubcrawl/as.php:1219
-#: ../../addon/pubcrawl/as.php:1374 ../../addon/pubcrawl/as.php:1553
-#: ../../include/network.php:1768
-msgid "ActivityPub"
+#: ../../view/theme/redbasic/php/config.php:116
+msgid "Show advanced settings"
 msgstr ""
 
 #: ../../addon/rendezvous/rendezvous.php:57
 msgid "Errors encountered deleting database table "
 msgstr ""
 
-#: ../../addon/rendezvous/rendezvous.php:95 ../../addon/twitter/twitter.php:779
+#: ../../addon/rendezvous/rendezvous.php:95 ../../addon/twitter/twitter.php:782
 msgid "Submit Settings"
 msgstr ""
 
@@ -9618,30 +9940,22 @@ msgstr ""
 msgid "Skeleton Settings"
 msgstr ""
 
-#: ../../addon/gnusoc/gnusoc.php:258
-msgid "GNU-Social Protocol Settings updated."
-msgstr ""
-
-#: ../../addon/gnusoc/gnusoc.php:277
+#: ../../addon/gnusoc/Mod_Gnusoc.php:16
 msgid ""
 "The GNU-Social protocol does not support location independence. Connections "
 "you make within that network may be unreachable from alternate channel "
 "locations."
 msgstr ""
 
-#: ../../addon/gnusoc/gnusoc.php:280
-msgid "Enable the GNU-Social protocol for this channel"
+#: ../../addon/gnusoc/Mod_Gnusoc.php:34
+msgid "GNU-Social Protocol"
 msgstr ""
 
-#: ../../addon/gnusoc/gnusoc.php:284
-msgid "GNU-Social Protocol Settings"
-msgstr ""
-
-#: ../../addon/gnusoc/gnusoc.php:480
+#: ../../addon/gnusoc/gnusoc.php:451
 msgid "Follow"
 msgstr ""
 
-#: ../../addon/gnusoc/gnusoc.php:483
+#: ../../addon/gnusoc/gnusoc.php:454
 #, php-format
 msgid "%1$s is now following %2$s"
 msgstr ""
@@ -9687,8 +10001,8 @@ msgstr ""
 msgid "Page to load after image selection."
 msgstr ""
 
-#: ../../addon/openclipatar/openclipatar.php:58 ../../include/channel.php:1300
-#: ../../include/nav.php:113
+#: ../../addon/openclipatar/openclipatar.php:58 ../../include/channel.php:1307
+#: ../../include/nav.php:111
 msgid "Edit Profile"
 msgstr ""
 
@@ -9776,95 +10090,91 @@ msgid ""
 "view"
 msgstr ""
 
-#: ../../addon/wppost/wppost.php:45
-msgid "Post to WordPress"
+#: ../../addon/wppost/Mod_Wppost.php:28
+msgid "Wordpress Settings saved."
 msgstr ""
 
-#: ../../addon/wppost/wppost.php:82
-msgid "Enable WordPress Post Plugin"
+#: ../../addon/wppost/Mod_Wppost.php:42
+msgid "Post to WordPress or anything else which uses the wordpress XMLRPC API"
 msgstr ""
 
-#: ../../addon/wppost/wppost.php:86
+#: ../../addon/wppost/Mod_Wppost.php:65
 msgid "WordPress username"
 msgstr ""
 
-#: ../../addon/wppost/wppost.php:90
+#: ../../addon/wppost/Mod_Wppost.php:69
 msgid "WordPress password"
 msgstr ""
 
-#: ../../addon/wppost/wppost.php:94
+#: ../../addon/wppost/Mod_Wppost.php:73
 msgid "WordPress API URL"
 msgstr ""
 
-#: ../../addon/wppost/wppost.php:95
+#: ../../addon/wppost/Mod_Wppost.php:74
 msgid "Typically https://your-blog.tld/xmlrpc.php"
 msgstr ""
 
-#: ../../addon/wppost/wppost.php:98
+#: ../../addon/wppost/Mod_Wppost.php:77
 msgid "WordPress blogid"
 msgstr ""
 
-#: ../../addon/wppost/wppost.php:99
+#: ../../addon/wppost/Mod_Wppost.php:78
 msgid "For multi-user sites such as wordpress.com, otherwise leave blank"
 msgstr ""
 
-#: ../../addon/wppost/wppost.php:105
+#: ../../addon/wppost/Mod_Wppost.php:82
 msgid "Post to WordPress by default"
 msgstr ""
 
-#: ../../addon/wppost/wppost.php:109
+#: ../../addon/wppost/Mod_Wppost.php:86
 msgid "Forward comments (requires hubzilla_wp plugin)"
 msgstr ""
 
-#: ../../addon/wppost/wppost.php:113
-msgid "WordPress Post Settings"
-msgstr ""
-
-#: ../../addon/wppost/wppost.php:129
-msgid "Wordpress Settings saved."
+#: ../../addon/wppost/Mod_Wppost.php:94
+msgid "Wordpress Post"
 msgstr ""
 
-#: ../../addon/nsfw/nsfw.php:80
-msgid ""
-"This plugin looks in posts for the words/text you specify below, and "
-"collapses any content containing those keywords so it is not displayed at "
-"inappropriate times, such as sexual innuendo that may be improper in a work "
-"setting. It is polite and recommended to tag any content containing nudity "
-"with #NSFW.  This filter can also match any other word/text you specify, and "
-"can thereby be used as a general purpose content filter."
+#: ../../addon/wppost/wppost.php:46
+msgid "Post to WordPress"
 msgstr ""
 
-#: ../../addon/nsfw/nsfw.php:84
-msgid "Enable Content filter"
+#: ../../addon/nsfw/nsfw.php:152
+msgid "Possible adult content"
 msgstr ""
 
-#: ../../addon/nsfw/nsfw.php:88
-msgid "Comma separated list of keywords to hide"
+#: ../../addon/nsfw/nsfw.php:167
+#, php-format
+msgid "%s - view"
 msgstr ""
 
-#: ../../addon/nsfw/nsfw.php:88
-msgid "Word, /regular-expression/, lang=xx, lang!=xx"
+#: ../../addon/nsfw/Mod_Nsfw.php:22
+msgid "NSFW Settings saved."
 msgstr ""
 
-#: ../../addon/nsfw/nsfw.php:92
-msgid "Not Safe For Work Settings"
+#: ../../addon/nsfw/Mod_Nsfw.php:34
+msgid "Collapse content that contains predefined words"
 msgstr ""
 
-#: ../../addon/nsfw/nsfw.php:92
-msgid "General Purpose Content Filter"
+#: ../../addon/nsfw/Mod_Nsfw.php:44
+msgid ""
+"This app looks in posts for the words/text you specify below, and collapses "
+"any content containing those keywords so it is not displayed at "
+"inappropriate times, such as sexual innuendo that may be improper in a work "
+"setting. It is polite and recommended to tag any content containing nudity "
+"with #NSFW.  This filter can also match any other word/text you specify, and "
+"can thereby be used as a general purpose content filter."
 msgstr ""
 
-#: ../../addon/nsfw/nsfw.php:110
-msgid "NSFW Settings saved."
+#: ../../addon/nsfw/Mod_Nsfw.php:49
+msgid "Comma separated list of keywords to hide"
 msgstr ""
 
-#: ../../addon/nsfw/nsfw.php:207
-msgid "Possible adult content"
+#: ../../addon/nsfw/Mod_Nsfw.php:49
+msgid "Word, /regular-expression/, lang=xx, lang!=xx"
 msgstr ""
 
-#: ../../addon/nsfw/nsfw.php:222
-#, php-format
-msgid "%s - view"
+#: ../../addon/nsfw/Mod_Nsfw.php:58
+msgid "NSFW"
 msgstr ""
 
 #: ../../addon/ijpost/ijpost.php:42
@@ -10074,14 +10384,18 @@ msgstr ""
 msgid "IRC Chatroom"
 msgstr ""
 
-#: ../../addon/gallery/gallery.php:42 ../../addon/gallery/Mod_Gallery.php:111
+#: ../../addon/gallery/gallery.php:47 ../../addon/gallery/Mod_Gallery.php:115
 msgid "Gallery"
 msgstr ""
 
-#: ../../addon/gallery/gallery.php:45
+#: ../../addon/gallery/gallery.php:50
 msgid "Photo Gallery"
 msgstr ""
 
+#: ../../addon/gallery/Mod_Gallery.php:57
+msgid "A simple gallery for your photo albums"
+msgstr ""
+
 #: ../../addon/ljpost/ljpost.php:42
 msgid "Post to LiveJournal"
 msgstr ""
@@ -10188,13 +10502,13 @@ msgstr ""
 msgid "Login failed."
 msgstr ""
 
-#: ../../addon/openid/Mod_Id.php:85 ../../include/selectors.php:49
-#: ../../include/selectors.php:66 ../../include/channel.php:1480
+#: ../../addon/openid/Mod_Id.php:85 ../../include/selectors.php:60
+#: ../../include/selectors.php:77 ../../include/channel.php:1487
 msgid "Male"
 msgstr ""
 
-#: ../../addon/openid/Mod_Id.php:87 ../../include/selectors.php:49
-#: ../../include/selectors.php:66 ../../include/channel.php:1478
+#: ../../addon/openid/Mod_Id.php:87 ../../include/selectors.php:60
+#: ../../include/selectors.php:77 ../../include/channel.php:1485
 msgid "Female"
 msgstr ""
 
@@ -10214,19 +10528,23 @@ msgstr ""
 msgid "&lt;blush&gt;"
 msgstr ""
 
-#: ../../addon/startpage/startpage.php:109
+#: ../../addon/startpage/Mod_Startpage.php:51
+msgid "Set a preferred page to load on login from home page"
+msgstr ""
+
+#: ../../addon/startpage/Mod_Startpage.php:62
 msgid "Page to load after login"
 msgstr ""
 
-#: ../../addon/startpage/startpage.php:109
+#: ../../addon/startpage/Mod_Startpage.php:62
 msgid ""
 "Examples: &quot;apps&quot;, &quot;network?f=&gid=37&quot; (privacy "
 "collection), &quot;channel&quot; or &quot;notifications/system&quot; (leave "
 "blank for default network page (grid)."
 msgstr ""
 
-#: ../../addon/startpage/startpage.php:113
-msgid "Startpage Settings"
+#: ../../addon/startpage/Mod_Startpage.php:70
+msgid "Startpage"
 msgstr ""
 
 #: ../../addon/morepokes/morepokes.php:19
@@ -10381,46 +10699,42 @@ msgstr ""
 msgid "declared undying love for"
 msgstr ""
 
-#: ../../addon/diaspora/diaspora.php:786
+#: ../../addon/diaspora/Mod_Diaspora.php:40
 msgid "Diaspora Protocol Settings updated."
 msgstr ""
 
-#: ../../addon/diaspora/diaspora.php:805
+#: ../../addon/diaspora/Mod_Diaspora.php:49
 msgid ""
-"The Diaspora protocol does not support location independence. Connections "
+"The diaspora protocol does not support location independence. Connections "
 "you make within that network may be unreachable from alternate channel "
 "locations."
 msgstr ""
 
-#: ../../addon/diaspora/diaspora.php:808
-msgid "Enable the Diaspora protocol for this channel"
-msgstr ""
-
-#: ../../addon/diaspora/diaspora.php:812
+#: ../../addon/diaspora/Mod_Diaspora.php:74
 msgid "Allow any Diaspora member to comment on your public posts"
 msgstr ""
 
-#: ../../addon/diaspora/diaspora.php:816
+#: ../../addon/diaspora/Mod_Diaspora.php:78
 msgid "Prevent your hashtags from being redirected to other sites"
 msgstr ""
 
-#: ../../addon/diaspora/diaspora.php:820
+#: ../../addon/diaspora/Mod_Diaspora.php:82
 msgid "Sign and forward posts and comments with no existing Diaspora signature"
 msgstr ""
 
-#: ../../addon/diaspora/diaspora.php:825
+#: ../../addon/diaspora/Mod_Diaspora.php:87
 msgid "Followed hashtags (comma separated, do not include the #)"
 msgstr ""
 
-#: ../../addon/diaspora/diaspora.php:830
-msgid "Diaspora Protocol Settings"
+#: ../../addon/diaspora/Mod_Diaspora.php:96
+msgid "Diaspora Protocol"
 msgstr ""
 
-#: ../../addon/diaspora/import_diaspora.php:16
+#: ../../addon/diaspora/import_diaspora.php:18
 msgid "No username found in import file."
 msgstr ""
 
-#: ../../addon/diaspora/import_diaspora.php:41 ../../include/import.php:72
+#: ../../addon/diaspora/import_diaspora.php:43 ../../include/import.php:72
 msgid "Unable to create a unique channel address. Import failed."
 msgstr ""
 
@@ -10433,16 +10747,12 @@ msgstr ""
 msgid "Your $Productname test account is about to expire."
 msgstr ""
 
-#: ../../addon/rainbowtag/rainbowtag.php:81
-msgid "Enable Rainbowtag"
+#: ../../addon/rainbowtag/Mod_Rainbowtag.php:15
+msgid "Add some colour to tag clouds"
 msgstr ""
 
-#: ../../addon/rainbowtag/rainbowtag.php:85
-msgid "Rainbowtag Settings"
-msgstr ""
-
-#: ../../addon/rainbowtag/rainbowtag.php:101
-msgid "Rainbowtag Settings saved."
+#: ../../addon/rainbowtag/Mod_Rainbowtag.php:34
+msgid "Rainbow Tag"
 msgstr ""
 
 #: ../../addon/upload_limits/upload_limits.php:25
@@ -10666,7 +10976,7 @@ msgstr ""
 msgid "Message subject"
 msgstr ""
 
-#: ../../addon/mdpost/mdpost.php:41
+#: ../../addon/mdpost/mdpost.php:42
 msgid "Use markdown for editing posts"
 msgstr ""
 
@@ -10777,8 +11087,8 @@ msgstr ""
 msgid "Hubzilla to Friendica Post Settings"
 msgstr ""
 
-#: ../../addon/jappixmini/jappixmini.php:305 ../../include/channel.php:1396
-#: ../../include/channel.php:1567
+#: ../../addon/jappixmini/jappixmini.php:305 ../../include/channel.php:1403
+#: ../../include/channel.php:1574
 msgid "Status:"
 msgstr ""
 
@@ -10831,26 +11141,127 @@ msgstr ""
 msgid "Jappix Mini Settings"
 msgstr ""
 
-#: ../../addon/superblock/superblock.php:112
-msgid "Currently blocked"
+#: ../../addon/upgrade_info/upgrade_info.php:43
+msgid "Your channel has been upgraded to the latest $Projectname version."
 msgstr ""
 
-#: ../../addon/superblock/superblock.php:114
-msgid "No channels currently blocked"
+#: ../../addon/upgrade_info/upgrade_info.php:44
+msgid ""
+"To improve usability, we have converted some features into installable stand-"
+"alone apps."
+msgstr ""
+
+#: ../../addon/upgrade_info/upgrade_info.php:45
+msgid "Please visit the $Projectname"
+msgstr ""
+
+#: ../../addon/upgrade_info/upgrade_info.php:46
+msgid "app store"
+msgstr ""
+
+#: ../../addon/upgrade_info/upgrade_info.php:47
+msgid "and install possibly missing apps."
+msgstr ""
+
+#: ../../addon/upgrade_info/upgrade_info.php:52
+msgid "Upgrade Info"
+msgstr ""
+
+#: ../../addon/upgrade_info/upgrade_info.php:56
+msgid "Do not show this again"
+msgstr ""
+
+#: ../../addon/channelreputation/channelreputation.php:101
+#: ../../addon/channelreputation/channelreputation.php:102
+#: ../../addon/cart/myshop.php:141 ../../addon/cart/myshop.php:177
+#: ../../addon/cart/myshop.php:211 ../../addon/cart/myshop.php:259
+#: ../../addon/cart/myshop.php:294 ../../addon/cart/myshop.php:317
+msgid "Access Denied"
+msgstr ""
+
+#: ../../addon/channelreputation/channelreputation.php:109
+msgid "Enable Community Moderation"
+msgstr ""
+
+#: ../../addon/channelreputation/channelreputation.php:117
+msgid "Reputation automatically given to new members"
+msgstr ""
+
+#: ../../addon/channelreputation/channelreputation.php:118
+msgid "Reputation will never fall below this value"
 msgstr ""
 
-#: ../../addon/superblock/superblock.php:120
-msgid "Superblock Settings"
+#: ../../addon/channelreputation/channelreputation.php:119
+msgid "Minimum reputation before posting is allowed"
 msgstr ""
 
-#: ../../addon/superblock/superblock.php:345
+#: ../../addon/channelreputation/channelreputation.php:120
+msgid "Minimum reputation before commenting is allowed"
+msgstr ""
+
+#: ../../addon/channelreputation/channelreputation.php:121
+msgid "Minimum reputation before a member is able to moderate other posts"
+msgstr ""
+
+#: ../../addon/channelreputation/channelreputation.php:122
+msgid ""
+"Max ratio of moderator's reputation that can be added to/deducted from "
+"reputation of person being moderated"
+msgstr ""
+
+#: ../../addon/channelreputation/channelreputation.php:123
+msgid "Reputation \"cost\" to post"
+msgstr ""
+
+#: ../../addon/channelreputation/channelreputation.php:124
+msgid "Reputation \"cost\" to comment"
+msgstr ""
+
+#: ../../addon/channelreputation/channelreputation.php:125
+msgid ""
+"Reputation automatically recovers at this rate per hour until it reaches "
+"minimum_to_post"
+msgstr ""
+
+#: ../../addon/channelreputation/channelreputation.php:126
+msgid ""
+"When minimum_to_moderate > reputation > minimum_to_post reputation recovers "
+"at this rate per hour"
+msgstr ""
+
+#: ../../addon/channelreputation/channelreputation.php:138
+msgid "Community Moderation Settings"
+msgstr ""
+
+#: ../../addon/channelreputation/channelreputation.php:359
+msgid "Can moderate reputation on my channel."
+msgstr ""
+
+#: ../../addon/channelreputation/channelreputation.php:544
+#: ../../addon/channelreputation/channelreputation.php:547
+msgid "Channel Reputation"
+msgstr ""
+
+#: ../../addon/superblock/superblock.php:318
 msgid "Block Completely"
 msgstr ""
 
-#: ../../addon/superblock/superblock.php:394
+#: ../../addon/superblock/Mod_Superblock.php:21
+msgid "Block channels"
+msgstr ""
+
+#: ../../addon/superblock/Mod_Superblock.php:63
 msgid "superblock settings updated"
 msgstr ""
 
+#: ../../addon/superblock/Mod_Superblock.php:87
+msgid "Currently blocked"
+msgstr ""
+
+#: ../../addon/superblock/Mod_Superblock.php:89
+msgid "No channels currently blocked"
+msgstr ""
+
 #: ../../addon/nofed/nofed.php:42
 msgid "Federate"
 msgstr ""
@@ -10943,41 +11354,109 @@ msgstr ""
 msgid "Friendica Login Password"
 msgstr ""
 
-#: ../../addon/pubcrawl/pubcrawl.php:1136
+#: ../../addon/hsse/Mod_Hsse.php:15
+msgid "WYSIWYG status editor"
+msgstr ""
+
+#: ../../addon/hsse/Mod_Hsse.php:34
+msgid "WYSIWYG Status"
+msgstr ""
+
+#: ../../addon/hsse/hsse.php:82 ../../include/conversation.php:1285
+msgid "Set your location"
+msgstr ""
+
+#: ../../addon/hsse/hsse.php:83 ../../include/conversation.php:1286
+msgid "Clear browser location"
+msgstr ""
+
+#: ../../addon/hsse/hsse.php:99 ../../include/conversation.php:1302
+msgid "Embed (existing) photo from your photo albums"
+msgstr ""
+
+#: ../../addon/hsse/hsse.php:135 ../../include/conversation.php:1338
+msgid "Tag term:"
+msgstr ""
+
+#: ../../addon/hsse/hsse.php:136 ../../include/conversation.php:1339
+msgid "Where are you right now?"
+msgstr ""
+
+#: ../../addon/hsse/hsse.php:141 ../../include/conversation.php:1344
+msgid "Choose a different album..."
+msgstr ""
+
+#: ../../addon/hsse/hsse.php:145 ../../include/conversation.php:1348
+msgid "Comments enabled"
+msgstr ""
+
+#: ../../addon/hsse/hsse.php:146 ../../include/conversation.php:1349
+msgid "Comments disabled"
+msgstr ""
+
+#: ../../addon/hsse/hsse.php:195 ../../include/conversation.php:1398
+msgid "Page link name"
+msgstr ""
+
+#: ../../addon/hsse/hsse.php:198 ../../include/conversation.php:1401
+msgid "Post as"
+msgstr ""
+
+#: ../../addon/hsse/hsse.php:212 ../../include/conversation.php:1415
+msgid "Toggle voting"
+msgstr ""
+
+#: ../../addon/hsse/hsse.php:215 ../../include/conversation.php:1418
+msgid "Disable comments"
+msgstr ""
+
+#: ../../addon/hsse/hsse.php:216 ../../include/conversation.php:1419
+msgid "Toggle comments"
+msgstr ""
+
+#: ../../addon/hsse/hsse.php:224 ../../include/conversation.php:1427
+msgid "Categories (optional, comma-separated list)"
+msgstr ""
+
+#: ../../addon/hsse/hsse.php:247 ../../include/conversation.php:1450
+msgid "Other networks and post services"
+msgstr ""
+
+#: ../../addon/hsse/hsse.php:253 ../../include/conversation.php:1456
+msgid "Set publish date"
+msgstr ""
+
+#: ../../addon/pubcrawl/Mod_Pubcrawl.php:25
 msgid "ActivityPub Protocol Settings updated."
 msgstr ""
 
-#: ../../addon/pubcrawl/pubcrawl.php:1145
+#: ../../addon/pubcrawl/Mod_Pubcrawl.php:34
 msgid ""
-"The ActivityPub protocol does not support location independence. Connections "
+"The activitypub protocol does not support location independence. Connections "
 "you make within that network may be unreachable from alternate channel "
 "locations."
 msgstr ""
 
-#: ../../addon/pubcrawl/pubcrawl.php:1148
-msgid "Enable the ActivityPub protocol for this channel"
-msgstr ""
-
-#: ../../addon/pubcrawl/pubcrawl.php:1151
+#: ../../addon/pubcrawl/Mod_Pubcrawl.php:48
 msgid "Deliver to ActivityPub recipients in privacy groups"
 msgstr ""
 
-#: ../../addon/pubcrawl/pubcrawl.php:1151
+#: ../../addon/pubcrawl/Mod_Pubcrawl.php:48
 msgid ""
 "May result in a large number of mentions and expose all the members of your "
 "privacy group"
 msgstr ""
 
-#: ../../addon/pubcrawl/pubcrawl.php:1155
+#: ../../addon/pubcrawl/Mod_Pubcrawl.php:52
 msgid "Send multi-media HTML articles"
 msgstr ""
 
-#: ../../addon/pubcrawl/pubcrawl.php:1155
+#: ../../addon/pubcrawl/Mod_Pubcrawl.php:52
 msgid "Not supported by some microblog services such as Mastodon"
 msgstr ""
 
-#: ../../addon/pubcrawl/pubcrawl.php:1159
-msgid "ActivityPub Protocol Settings"
+#: ../../addon/pubcrawl/Mod_Pubcrawl.php:60
+msgid "Activitypub Protocol"
 msgstr ""
 
 #: ../../addon/donate/donate.php:21
@@ -11281,7 +11760,7 @@ msgstr ""
 msgid "Cancel GNU social Connection"
 msgstr ""
 
-#: ../../addon/statusnet/statusnet.php:401 ../../addon/twitter/twitter.php:233
+#: ../../addon/statusnet/statusnet.php:401 ../../addon/twitter/twitter.php:236
 msgid "Currently connected to: "
 msgstr ""
 
@@ -11313,7 +11792,7 @@ msgid ""
 "account by default"
 msgstr ""
 
-#: ../../addon/statusnet/statusnet.php:424 ../../addon/twitter/twitter.php:261
+#: ../../addon/statusnet/statusnet.php:424 ../../addon/twitter/twitter.php:264
 msgid "Clear OAuth configuration"
 msgstr ""
 
@@ -11365,7 +11844,7 @@ msgstr ""
 msgid "Error creating new game."
 msgstr ""
 
-#: ../../addon/chess/chess.php:486 ../../include/channel.php:1151
+#: ../../addon/chess/chess.php:486 ../../include/channel.php:1158
 msgid "Requested channel is not available."
 msgstr ""
 
@@ -11377,34 +11856,34 @@ msgstr ""
 msgid "Enable notifications"
 msgstr ""
 
-#: ../../addon/twitter/twitter.php:99
+#: ../../addon/twitter/twitter.php:102
 msgid "Post to Twitter"
 msgstr ""
 
-#: ../../addon/twitter/twitter.php:155
+#: ../../addon/twitter/twitter.php:158
 msgid "Twitter settings updated."
 msgstr ""
 
-#: ../../addon/twitter/twitter.php:184
+#: ../../addon/twitter/twitter.php:187
 msgid ""
 "<strong><em>Or</em></strong> become a project sponsor (Hubzilla Project only)"
 msgstr ""
 
-#: ../../addon/twitter/twitter.php:206
+#: ../../addon/twitter/twitter.php:209
 msgid ""
 "Please indicate if you would like your first name or full name (or nothing) "
 "to appear in our sponsor listing"
 msgstr ""
 
-#: ../../addon/twitter/twitter.php:208
+#: ../../addon/twitter/twitter.php:211
 msgid "Log in with Twitter"
 msgstr ""
 
-#: ../../addon/twitter/twitter.php:211
+#: ../../addon/twitter/twitter.php:214
 msgid "Copy the PIN from Twitter here"
 msgstr ""
 
-#: ../../addon/twitter/twitter.php:238
+#: ../../addon/twitter/twitter.php:241
 msgid ""
 "This is a fairly comprehensive and complete guitar chord dictionary which "
 "will list most of the available ways to play a certain chord, starting from "
@@ -11413,35 +11892,35 @@ msgid ""
 "provided for the benefit of slide players, etc."
 msgstr ""
 
-#: ../../addon/twitter/twitter.php:243
+#: ../../addon/twitter/twitter.php:246
 msgid "Allow posting to Twitter"
 msgstr ""
 
-#: ../../addon/twitter/twitter.php:243
+#: ../../addon/twitter/twitter.php:246
 msgid ""
 "If enabled your public postings can be posted to the associated Twitter "
 "account"
 msgstr ""
 
-#: ../../addon/twitter/twitter.php:247
+#: ../../addon/twitter/twitter.php:250
 msgid "Twitter post length"
 msgstr ""
 
-#: ../../addon/twitter/twitter.php:247
+#: ../../addon/twitter/twitter.php:250
 msgid "Maximum tweet length"
 msgstr ""
 
-#: ../../addon/twitter/twitter.php:252
+#: ../../addon/twitter/twitter.php:255
 msgid "Send public postings to Twitter by default"
 msgstr ""
 
-#: ../../addon/twitter/twitter.php:252
+#: ../../addon/twitter/twitter.php:255
 msgid ""
 "If enabled your public postings will be posted to the associated Twitter "
 "account by default"
 msgstr ""
 
-#: ../../addon/twitter/twitter.php:270
+#: ../../addon/twitter/twitter.php:273
 msgid "Twitter Post Settings"
 msgstr ""
 
@@ -11457,206 +11936,250 @@ msgstr ""
 msgid "Smileybutton Settings"
 msgstr ""
 
-#: ../../addon/cart/myshop.php:44
-msgid "Access Denied."
+#: ../../addon/cart/Settings/Cart.php:56
+msgid "Enable Test Catalog"
 msgstr ""
 
-#: ../../addon/cart/myshop.php:125 ../../addon/cart/cart.php:1324
-msgid "Order Not Found"
+#: ../../addon/cart/Settings/Cart.php:68
+msgid "Enable Manual Payments"
 msgstr ""
 
-#: ../../addon/cart/myshop.php:155 ../../addon/cart/myshop.php:191
-#: ../../addon/cart/myshop.php:225 ../../addon/cart/myshop.php:273
-#: ../../addon/cart/myshop.php:308 ../../addon/cart/myshop.php:331
-msgid "Access Denied"
+#: ../../addon/cart/Settings/Cart.php:88
+msgid "Base Merchant Currency"
 msgstr ""
 
-#: ../../addon/cart/myshop.php:200 ../../addon/cart/myshop.php:234
-#: ../../addon/cart/myshop.php:283 ../../addon/cart/myshop.php:341
-msgid "Invalid Item"
+#: ../../addon/cart/Settings/Cart.php:111 ../../addon/cart/cart.php:1262
+msgid "Cart Settings"
 msgstr ""
 
-#: ../../addon/cart/cart.php:467
-msgid "[cart] Item Added"
+#: ../../addon/cart/myshop.php:30
+msgid "Access Denied."
 msgstr ""
 
-#: ../../addon/cart/cart.php:851
-msgid "Order already checked out."
+#: ../../addon/cart/myshop.php:111 ../../addon/cart/cart.php:1330
+msgid "Order Not Found"
 msgstr ""
 
-#: ../../addon/cart/cart.php:1204
-msgid "Enable Shopping Cart"
+#: ../../addon/cart/myshop.php:186 ../../addon/cart/myshop.php:220
+#: ../../addon/cart/myshop.php:269 ../../addon/cart/myshop.php:327
+msgid "Invalid Item"
 msgstr ""
 
-#: ../../addon/cart/cart.php:1211
-msgid "Enable Test Catalog"
+#: ../../addon/cart/cart.php:159
+msgid "DB Cleanup Failure"
 msgstr ""
 
-#: ../../addon/cart/cart.php:1219
-msgid "Enable Manual Payments"
+#: ../../addon/cart/cart.php:564
+msgid "[cart] Item Added"
 msgstr ""
 
-#: ../../addon/cart/cart.php:1238
-msgid "Base Merchant Currency"
+#: ../../addon/cart/cart.php:952
+msgid "Order already checked out."
 msgstr ""
 
-#: ../../addon/cart/cart.php:1250
-msgid "Cart - Base Settings"
+#: ../../addon/cart/cart.php:1255
+msgid "Drop database tables when uninstalling."
 msgstr ""
 
-#: ../../addon/cart/cart.php:1271 ../../addon/cart/cart.php:1274
+#: ../../addon/cart/cart.php:1274 ../../addon/cart/cart.php:1277
 msgid "Shop"
 msgstr ""
 
-#: ../../addon/cart/cart.php:1401
-msgid "You must be logged into the Grid to shop."
+#: ../../addon/cart/cart.php:1391
+msgid "Cart utilities for orders and payments"
 msgstr ""
 
-#: ../../addon/cart/cart.php:1411
-msgid "Cart Not Enabled (profile: "
+#: ../../addon/cart/cart.php:1429
+msgid "You must be logged into the Grid to shop."
 msgstr ""
 
-#: ../../addon/cart/cart.php:1442
-#: ../../addon/cart/submodules/paypalbutton.php:417
-#: ../../addon/cart/manual_payments.php:37
+#: ../../addon/cart/cart.php:1462
+#: ../../addon/cart/submodules/paypalbutton.php:392
+#: ../../addon/cart/manual_payments.php:68
 msgid "Order not found."
 msgstr ""
 
-#: ../../addon/cart/cart.php:1451
+#: ../../addon/cart/cart.php:1470
 msgid "Access denied."
 msgstr ""
 
-#: ../../addon/cart/cart.php:1503 ../../addon/cart/cart.php:1647
+#: ../../addon/cart/cart.php:1522 ../../addon/cart/cart.php:1665
 msgid "No Order Found"
 msgstr ""
 
-#: ../../addon/cart/cart.php:1512
+#: ../../addon/cart/cart.php:1531
 msgid "An unknown error has occurred Please start again."
 msgstr ""
 
-#: ../../addon/cart/cart.php:1680
+#: ../../addon/cart/cart.php:1698
 msgid "Invalid Payment Type.  Please start again."
 msgstr ""
 
-#: ../../addon/cart/cart.php:1687
+#: ../../addon/cart/cart.php:1705
 msgid "Order not found"
 msgstr ""
 
-#: ../../addon/cart/submodules/paypalbutton.php:97
+#: ../../addon/cart/submodules/paypalbutton.php:85
 msgid "Enable Paypal Button Module"
 msgstr ""
 
-#: ../../addon/cart/submodules/paypalbutton.php:102
+#: ../../addon/cart/submodules/paypalbutton.php:93
 msgid "Use Production Key"
 msgstr ""
 
-#: ../../addon/cart/submodules/paypalbutton.php:109
+#: ../../addon/cart/submodules/paypalbutton.php:100
 msgid "Paypal Sandbox Client Key"
 msgstr ""
 
-#: ../../addon/cart/submodules/paypalbutton.php:116
+#: ../../addon/cart/submodules/paypalbutton.php:107
 msgid "Paypal Sandbox Secret Key"
 msgstr ""
 
-#: ../../addon/cart/submodules/paypalbutton.php:122
+#: ../../addon/cart/submodules/paypalbutton.php:113
 msgid "Paypal Production Client Key"
 msgstr ""
 
-#: ../../addon/cart/submodules/paypalbutton.php:129
+#: ../../addon/cart/submodules/paypalbutton.php:120
 msgid "Paypal Production Secret Key"
 msgstr ""
 
-#: ../../addon/cart/submodules/paypalbutton.php:143
-msgid "Cart - Paypal Addon"
-msgstr ""
-
-#: ../../addon/cart/submodules/paypalbutton.php:277
+#: ../../addon/cart/submodules/paypalbutton.php:252
 msgid "Paypal button payments are not enabled."
 msgstr ""
 
-#: ../../addon/cart/submodules/paypalbutton.php:295
+#: ../../addon/cart/submodules/paypalbutton.php:270
 msgid ""
 "Paypal button payments are not properly configured.  Please choose another "
 "payment option."
 msgstr ""
 
-#: ../../addon/cart/submodules/hzservices.php:71
-msgid "Enable Hubzilla Services Module"
+#: ../../addon/cart/submodules/manualcat.php:61
+msgid "Enable Manual Cart Module"
 msgstr ""
 
-#: ../../addon/cart/submodules/hzservices.php:77
-msgid "Cart - Hubzilla Services Addon"
-msgstr ""
-
-#: ../../addon/cart/submodules/hzservices.php:169
+#: ../../addon/cart/submodules/manualcat.php:173
+#: ../../addon/cart/submodules/hzservices.php:160
 msgid "New Sku"
 msgstr ""
 
-#: ../../addon/cart/submodules/hzservices.php:204
+#: ../../addon/cart/submodules/manualcat.php:209
+#: ../../addon/cart/submodules/hzservices.php:195
 msgid "Cannot save edits to locked item."
 msgstr ""
 
-#: ../../addon/cart/submodules/hzservices.php:252
-#: ../../addon/cart/submodules/hzservices.php:339
+#: ../../addon/cart/submodules/manualcat.php:252
+#: ../../addon/cart/submodules/hzservices.php:644
+msgid "Changes Locked"
+msgstr ""
+
+#: ../../addon/cart/submodules/manualcat.php:256
+#: ../../addon/cart/submodules/hzservices.php:648
+msgid "Item available for purchase."
+msgstr ""
+
+#: ../../addon/cart/submodules/manualcat.php:263
+#: ../../addon/cart/submodules/hzservices.php:655
+msgid "Price"
+msgstr ""
+
+#: ../../addon/cart/submodules/hzservices.php:62
+msgid "Enable Hubzilla Services Module"
+msgstr ""
+
+#: ../../addon/cart/submodules/hzservices.php:243
+#: ../../addon/cart/submodules/hzservices.php:330
 msgid "SKU not found."
 msgstr ""
 
-#: ../../addon/cart/submodules/hzservices.php:305
-#: ../../addon/cart/submodules/hzservices.php:309
+#: ../../addon/cart/submodules/hzservices.php:296
+#: ../../addon/cart/submodules/hzservices.php:300
 msgid "Invalid Activation Directive."
 msgstr ""
 
-#: ../../addon/cart/submodules/hzservices.php:380
-#: ../../addon/cart/submodules/hzservices.php:384
+#: ../../addon/cart/submodules/hzservices.php:371
+#: ../../addon/cart/submodules/hzservices.php:375
 msgid "Invalid Deactivation Directive."
 msgstr ""
 
-#: ../../addon/cart/submodules/hzservices.php:570
+#: ../../addon/cart/submodules/hzservices.php:561
 msgid "Add to this privacy group"
 msgstr ""
 
-#: ../../addon/cart/submodules/hzservices.php:586
+#: ../../addon/cart/submodules/hzservices.php:577
 msgid "Set user service class"
 msgstr ""
 
-#: ../../addon/cart/submodules/hzservices.php:613
+#: ../../addon/cart/submodules/hzservices.php:604
 msgid "You must be using a local account to purchase this service."
 msgstr ""
 
-#: ../../addon/cart/submodules/hzservices.php:651
-msgid "Changes Locked"
+#: ../../addon/cart/submodules/hzservices.php:659
+msgid "Add buyer to privacy group"
 msgstr ""
 
-#: ../../addon/cart/submodules/hzservices.php:655
-msgid "Item available for purchase."
+#: ../../addon/cart/submodules/hzservices.php:664
+msgid "Add buyer as connection"
 msgstr ""
 
-#: ../../addon/cart/submodules/hzservices.php:662
-msgid "Price"
+#: ../../addon/cart/submodules/hzservices.php:672
+#: ../../addon/cart/submodules/hzservices.php:714
+msgid "Set Service Class"
 msgstr ""
 
-#: ../../addon/cart/submodules/hzservices.php:665
-msgid "Add buyer to privacy group"
+#: ../../addon/cart/submodules/subscriptions.php:151
+msgid "Enable Subscription Management Module"
 msgstr ""
 
-#: ../../addon/cart/submodules/hzservices.php:670
-msgid "Add buyer as connection"
+#: ../../addon/cart/submodules/subscriptions.php:223
+msgid ""
+"Cannot include subscription items with different terms in the same order."
 msgstr ""
 
-#: ../../addon/cart/submodules/hzservices.php:677
-#: ../../addon/cart/submodules/hzservices.php:718
-msgid "Set Service Class"
+#: ../../addon/cart/submodules/subscriptions.php:372
+msgid "Select Subscription to Edit"
+msgstr ""
+
+#: ../../addon/cart/submodules/subscriptions.php:380
+msgid "Edit Subscriptions"
+msgstr ""
+
+#: ../../addon/cart/submodules/subscriptions.php:414
+msgid "Subscription SKU"
+msgstr ""
+
+#: ../../addon/cart/submodules/subscriptions.php:419
+msgid "Catalog Description"
+msgstr ""
+
+#: ../../addon/cart/submodules/subscriptions.php:423
+msgid "Subscription available for purchase."
+msgstr ""
+
+#: ../../addon/cart/submodules/subscriptions.php:428
+msgid "Maximum active subscriptions to this item per account."
+msgstr ""
+
+#: ../../addon/cart/submodules/subscriptions.php:431
+msgid "Subscription price."
+msgstr ""
+
+#: ../../addon/cart/submodules/subscriptions.php:435
+msgid "Quantity"
+msgstr ""
+
+#: ../../addon/cart/submodules/subscriptions.php:439
+msgid "Term"
 msgstr ""
 
 #: ../../addon/cart/manual_payments.php:7
 msgid "Error: order mismatch. Please try again."
 msgstr ""
 
-#: ../../addon/cart/manual_payments.php:30
+#: ../../addon/cart/manual_payments.php:61
 msgid "Manual payments are not enabled."
 msgstr ""
 
-#: ../../addon/cart/manual_payments.php:46
+#: ../../addon/cart/manual_payments.php:77
 msgid "Finished"
 msgstr ""
 
@@ -11862,14 +12385,12 @@ msgid ""
 "return key"
 msgstr ""
 
-#: ../../addon/sendzid/sendzid.php:25
-msgid "Extended Identity Sharing"
+#: ../../addon/sendzid/Mod_Sendzid.php:14
+msgid "Send your identity to all websites"
 msgstr ""
 
-#: ../../addon/sendzid/sendzid.php:26
-msgid ""
-"Share your identity with all websites on the internet. When disabled, "
-"identity is only shared with $Projectname sites."
+#: ../../addon/sendzid/Mod_Sendzid.php:32
+msgid "Send ZID"
 msgstr ""
 
 #: ../../addon/tictac/tictac.php:21
@@ -11938,20 +12459,13 @@ msgstr ""
 msgid "pageheader Settings saved."
 msgstr ""
 
-#: ../../addon/authchoose/authchoose.php:67
-msgid "Only authenticate automatically to sites of your friends"
-msgstr ""
-
-#: ../../addon/authchoose/authchoose.php:67
-msgid "By default you are automatically authenticated anywhere in the network"
-msgstr ""
-
-#: ../../addon/authchoose/authchoose.php:71
-msgid "Authchoose Settings"
+#: ../../addon/authchoose/Mod_Authchoose.php:22
+msgid ""
+"Allow magic authentication only to websites of your immediate connections"
 msgstr ""
 
-#: ../../addon/authchoose/authchoose.php:85
-msgid "Atuhchoose Settings updated."
+#: ../../addon/authchoose/Mod_Authchoose.php:39
+msgid "Authchoose"
 msgstr ""
 
 #: ../../addon/moremoods/moremoods.php:19
@@ -12197,243 +12711,247 @@ msgstr ""
 msgid "Test mode (only send to hub administrator)"
 msgstr ""
 
-#: ../../include/selectors.php:30
+#: ../../include/selectors.php:18
+msgid "Profile to assign new connections"
+msgstr ""
+
+#: ../../include/selectors.php:41
 msgid "Frequently"
 msgstr ""
 
-#: ../../include/selectors.php:31
+#: ../../include/selectors.php:42
 msgid "Hourly"
 msgstr ""
 
-#: ../../include/selectors.php:32
+#: ../../include/selectors.php:43
 msgid "Twice daily"
 msgstr ""
 
-#: ../../include/selectors.php:33
+#: ../../include/selectors.php:44
 msgid "Daily"
 msgstr ""
 
-#: ../../include/selectors.php:34
+#: ../../include/selectors.php:45
 msgid "Weekly"
 msgstr ""
 
-#: ../../include/selectors.php:35
+#: ../../include/selectors.php:46
 msgid "Monthly"
 msgstr ""
 
-#: ../../include/selectors.php:49
+#: ../../include/selectors.php:60
 msgid "Currently Male"
 msgstr ""
 
-#: ../../include/selectors.php:49
+#: ../../include/selectors.php:60
 msgid "Currently Female"
 msgstr ""
 
-#: ../../include/selectors.php:49
+#: ../../include/selectors.php:60
 msgid "Mostly Male"
 msgstr ""
 
-#: ../../include/selectors.php:49
+#: ../../include/selectors.php:60
 msgid "Mostly Female"
 msgstr ""
 
-#: ../../include/selectors.php:49
+#: ../../include/selectors.php:60
 msgid "Transgender"
 msgstr ""
 
-#: ../../include/selectors.php:49
+#: ../../include/selectors.php:60
 msgid "Intersex"
 msgstr ""
 
-#: ../../include/selectors.php:49
+#: ../../include/selectors.php:60
 msgid "Transsexual"
 msgstr ""
 
-#: ../../include/selectors.php:49
+#: ../../include/selectors.php:60
 msgid "Hermaphrodite"
 msgstr ""
 
-#: ../../include/selectors.php:49 ../../include/channel.php:1484
+#: ../../include/selectors.php:60 ../../include/channel.php:1491
 msgid "Neuter"
 msgstr ""
 
-#: ../../include/selectors.php:49 ../../include/channel.php:1486
+#: ../../include/selectors.php:60 ../../include/channel.php:1493
 msgid "Non-specific"
 msgstr ""
 
-#: ../../include/selectors.php:49
+#: ../../include/selectors.php:60
 msgid "Undecided"
 msgstr ""
 
-#: ../../include/selectors.php:85 ../../include/selectors.php:104
+#: ../../include/selectors.php:96 ../../include/selectors.php:115
 msgid "Males"
 msgstr ""
 
-#: ../../include/selectors.php:85 ../../include/selectors.php:104
+#: ../../include/selectors.php:96 ../../include/selectors.php:115
 msgid "Females"
 msgstr ""
 
-#: ../../include/selectors.php:85
+#: ../../include/selectors.php:96
 msgid "Gay"
 msgstr ""
 
-#: ../../include/selectors.php:85
+#: ../../include/selectors.php:96
 msgid "Lesbian"
 msgstr ""
 
-#: ../../include/selectors.php:85
+#: ../../include/selectors.php:96
 msgid "No Preference"
 msgstr ""
 
-#: ../../include/selectors.php:85
+#: ../../include/selectors.php:96
 msgid "Bisexual"
 msgstr ""
 
-#: ../../include/selectors.php:85
+#: ../../include/selectors.php:96
 msgid "Autosexual"
 msgstr ""
 
-#: ../../include/selectors.php:85
+#: ../../include/selectors.php:96
 msgid "Abstinent"
 msgstr ""
 
-#: ../../include/selectors.php:85
+#: ../../include/selectors.php:96
 msgid "Virgin"
 msgstr ""
 
-#: ../../include/selectors.php:85
+#: ../../include/selectors.php:96
 msgid "Deviant"
 msgstr ""
 
-#: ../../include/selectors.php:85
+#: ../../include/selectors.php:96
 msgid "Fetish"
 msgstr ""
 
-#: ../../include/selectors.php:85
+#: ../../include/selectors.php:96
 msgid "Oodles"
 msgstr ""
 
-#: ../../include/selectors.php:85
+#: ../../include/selectors.php:96
 msgid "Nonsexual"
 msgstr ""
 
-#: ../../include/selectors.php:123 ../../include/selectors.php:140
+#: ../../include/selectors.php:134 ../../include/selectors.php:151
 msgid "Single"
 msgstr ""
 
-#: ../../include/selectors.php:123
+#: ../../include/selectors.php:134
 msgid "Lonely"
 msgstr ""
 
-#: ../../include/selectors.php:123
+#: ../../include/selectors.php:134
 msgid "Available"
 msgstr ""
 
-#: ../../include/selectors.php:123
+#: ../../include/selectors.php:134
 msgid "Unavailable"
 msgstr ""
 
-#: ../../include/selectors.php:123
+#: ../../include/selectors.php:134
 msgid "Has crush"
 msgstr ""
 
-#: ../../include/selectors.php:123
+#: ../../include/selectors.php:134
 msgid "Infatuated"
 msgstr ""
 
-#: ../../include/selectors.php:123 ../../include/selectors.php:140
+#: ../../include/selectors.php:134 ../../include/selectors.php:151
 msgid "Dating"
 msgstr ""
 
-#: ../../include/selectors.php:123
+#: ../../include/selectors.php:134
 msgid "Unfaithful"
 msgstr ""
 
-#: ../../include/selectors.php:123
+#: ../../include/selectors.php:134
 msgid "Sex Addict"
 msgstr ""
 
-#: ../../include/selectors.php:123
+#: ../../include/selectors.php:134
 msgid "Friends/Benefits"
 msgstr ""
 
-#: ../../include/selectors.php:123
+#: ../../include/selectors.php:134
 msgid "Casual"
 msgstr ""
 
-#: ../../include/selectors.php:123
+#: ../../include/selectors.php:134
 msgid "Engaged"
 msgstr ""
 
-#: ../../include/selectors.php:123 ../../include/selectors.php:140
+#: ../../include/selectors.php:134 ../../include/selectors.php:151
 msgid "Married"
 msgstr ""
 
-#: ../../include/selectors.php:123
+#: ../../include/selectors.php:134
 msgid "Imaginarily married"
 msgstr ""
 
-#: ../../include/selectors.php:123
+#: ../../include/selectors.php:134
 msgid "Partners"
 msgstr ""
 
-#: ../../include/selectors.php:123 ../../include/selectors.php:140
+#: ../../include/selectors.php:134 ../../include/selectors.php:151
 msgid "Cohabiting"
 msgstr ""
 
-#: ../../include/selectors.php:123
+#: ../../include/selectors.php:134
 msgid "Common law"
 msgstr ""
 
-#: ../../include/selectors.php:123
+#: ../../include/selectors.php:134
 msgid "Happy"
 msgstr ""
 
-#: ../../include/selectors.php:123
+#: ../../include/selectors.php:134
 msgid "Not looking"
 msgstr ""
 
-#: ../../include/selectors.php:123
+#: ../../include/selectors.php:134
 msgid "Swinger"
 msgstr ""
 
-#: ../../include/selectors.php:123
+#: ../../include/selectors.php:134
 msgid "Betrayed"
 msgstr ""
 
-#: ../../include/selectors.php:123 ../../include/selectors.php:140
+#: ../../include/selectors.php:134 ../../include/selectors.php:151
 msgid "Separated"
 msgstr ""
 
-#: ../../include/selectors.php:123
+#: ../../include/selectors.php:134
 msgid "Unstable"
 msgstr ""
 
-#: ../../include/selectors.php:123 ../../include/selectors.php:140
+#: ../../include/selectors.php:134 ../../include/selectors.php:151
 msgid "Divorced"
 msgstr ""
 
-#: ../../include/selectors.php:123
+#: ../../include/selectors.php:134
 msgid "Imaginarily divorced"
 msgstr ""
 
-#: ../../include/selectors.php:123 ../../include/selectors.php:140
+#: ../../include/selectors.php:134 ../../include/selectors.php:151
 msgid "Widowed"
 msgstr ""
 
-#: ../../include/selectors.php:123
+#: ../../include/selectors.php:134
 msgid "Uncertain"
 msgstr ""
 
-#: ../../include/selectors.php:123 ../../include/selectors.php:140
+#: ../../include/selectors.php:134 ../../include/selectors.php:151
 msgid "It's complicated"
 msgstr ""
 
-#: ../../include/selectors.php:123
+#: ../../include/selectors.php:134
 msgid "Don't care"
 msgstr ""
 
-#: ../../include/selectors.php:123
+#: ../../include/selectors.php:134
 msgid "Ask me"
 msgstr ""
 
@@ -12457,8 +12975,8 @@ msgstr ""
 msgid "%1$s poked %2$s"
 msgstr ""
 
-#: ../../include/conversation.php:251 ../../include/text.php:1140
-#: ../../include/text.php:1144
+#: ../../include/conversation.php:251 ../../include/text.php:1146
+#: ../../include/text.php:1150
 msgid "poked"
 msgstr ""
 
@@ -12487,278 +13005,117 @@ msgstr ""
 msgid "Loading..."
 msgstr ""
 
-#: ../../include/conversation.php:891
+#: ../../include/conversation.php:892
 msgid "Delete Selected Items"
 msgstr ""
 
-#: ../../include/conversation.php:934
+#: ../../include/conversation.php:935
 msgid "View Source"
 msgstr ""
 
-#: ../../include/conversation.php:944
+#: ../../include/conversation.php:945
 msgid "Follow Thread"
 msgstr ""
 
-#: ../../include/conversation.php:953
+#: ../../include/conversation.php:954
 msgid "Unfollow Thread"
 msgstr ""
 
-#: ../../include/conversation.php:1067
+#: ../../include/conversation.php:1068
 msgid "Edit Connection"
 msgstr ""
 
-#: ../../include/conversation.php:1077
+#: ../../include/conversation.php:1078
 msgid "Message"
 msgstr ""
 
-#: ../../include/conversation.php:1211
+#: ../../include/conversation.php:1212
 #, php-format
 msgid "%s likes this."
 msgstr ""
 
-#: ../../include/conversation.php:1211
+#: ../../include/conversation.php:1212
 #, php-format
 msgid "%s doesn't like this."
 msgstr ""
 
-#: ../../include/conversation.php:1215
+#: ../../include/conversation.php:1216
 #, 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:1217
+#: ../../include/conversation.php:1218
 #, 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:1223
+#: ../../include/conversation.php:1224
 msgid "and"
 msgstr ""
 
-#: ../../include/conversation.php:1226
+#: ../../include/conversation.php:1227
 #, php-format
 msgid ", and %d other people"
 msgid_plural ", and %d other people"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../../include/conversation.php:1227
+#: ../../include/conversation.php:1228
 #, php-format
 msgid "%s like this."
 msgstr ""
 
-#: ../../include/conversation.php:1227
+#: ../../include/conversation.php:1228
 #, php-format
 msgid "%s don't like this."
 msgstr ""
 
-#: ../../include/conversation.php:1270
-msgid "Set your location"
-msgstr ""
-
-#: ../../include/conversation.php:1271
-msgid "Clear browser location"
-msgstr ""
-
-#: ../../include/conversation.php:1287
-msgid "Embed (existing) photo from your photo albums"
-msgstr ""
-
-#: ../../include/conversation.php:1323
-msgid "Tag term:"
-msgstr ""
-
-#: ../../include/conversation.php:1324
-msgid "Where are you right now?"
-msgstr ""
-
-#: ../../include/conversation.php:1329
-msgid "Choose a different album..."
-msgstr ""
-
-#: ../../include/conversation.php:1333
-msgid "Comments enabled"
-msgstr ""
-
-#: ../../include/conversation.php:1334
-msgid "Comments disabled"
-msgstr ""
-
-#: ../../include/conversation.php:1383
-msgid "Page link name"
-msgstr ""
-
-#: ../../include/conversation.php:1386
-msgid "Post as"
-msgstr ""
-
-#: ../../include/conversation.php:1400
-msgid "Toggle voting"
-msgstr ""
-
-#: ../../include/conversation.php:1403
-msgid "Disable comments"
-msgstr ""
-
-#: ../../include/conversation.php:1404
-msgid "Toggle comments"
-msgstr ""
-
-#: ../../include/conversation.php:1412
-msgid "Categories (optional, comma-separated list)"
-msgstr ""
-
-#: ../../include/conversation.php:1435
-msgid "Other networks and post services"
-msgstr ""
-
-#: ../../include/conversation.php:1441
-msgid "Set publish date"
-msgstr ""
-
-#: ../../include/conversation.php:1702
-msgid "Commented Order"
-msgstr ""
-
-#: ../../include/conversation.php:1705
-msgid "Sort by Comment Date"
-msgstr ""
-
-#: ../../include/conversation.php:1709
-msgid "Posted Order"
-msgstr ""
-
-#: ../../include/conversation.php:1712
-msgid "Sort by Post Date"
-msgstr ""
-
-#: ../../include/conversation.php:1720
-msgid "Posts that mention or involve you"
-msgstr ""
-
-#: ../../include/conversation.php:1729
-msgid "Activity Stream - by date"
-msgstr ""
-
-#: ../../include/conversation.php:1735
-msgid "Starred"
-msgstr ""
-
-#: ../../include/conversation.php:1738
-msgid "Favourite Posts"
-msgstr ""
-
-#: ../../include/conversation.php:1745
-msgid "Spam"
-msgstr ""
-
-#: ../../include/conversation.php:1748
-msgid "Posts flagged as SPAM"
-msgstr ""
-
-#: ../../include/conversation.php:1823 ../../include/nav.php:373
-msgid "Status Messages and Posts"
-msgstr ""
-
-#: ../../include/conversation.php:1836 ../../include/nav.php:386
-msgid "Profile Details"
-msgstr ""
-
-#: ../../include/conversation.php:1846 ../../include/nav.php:396
-#: ../../include/photos.php:667
-msgid "Photo Albums"
-msgstr ""
-
-#: ../../include/conversation.php:1854 ../../include/nav.php:404
-msgid "Files and Storage"
-msgstr ""
-
-#: ../../include/conversation.php:1891 ../../include/nav.php:439
-msgid "Bookmarks"
-msgstr ""
-
-#: ../../include/conversation.php:1894 ../../include/nav.php:442
-msgid "Saved Bookmarks"
-msgstr ""
-
-#: ../../include/conversation.php:1905 ../../include/nav.php:453
-msgid "View Cards"
-msgstr ""
-
-#: ../../include/conversation.php:1913
-msgid "articles"
-msgstr ""
-
-#: ../../include/conversation.php:1916 ../../include/nav.php:464
-msgid "View Articles"
-msgstr ""
-
-#: ../../include/conversation.php:1927 ../../include/nav.php:476
-msgid "View Webpages"
-msgstr ""
-
-#: ../../include/conversation.php:1996
+#: ../../include/conversation.php:1699
 msgctxt "noun"
 msgid "Attending"
 msgid_plural "Attending"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../../include/conversation.php:1999
+#: ../../include/conversation.php:1702
 msgctxt "noun"
 msgid "Not Attending"
 msgid_plural "Not Attending"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../../include/conversation.php:2002
+#: ../../include/conversation.php:1705
 msgctxt "noun"
 msgid "Undecided"
 msgid_plural "Undecided"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../../include/conversation.php:2005
+#: ../../include/conversation.php:1708
 msgctxt "noun"
 msgid "Agree"
 msgid_plural "Agrees"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../../include/conversation.php:2008
+#: ../../include/conversation.php:1711
 msgctxt "noun"
 msgid "Disagree"
 msgid_plural "Disagrees"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../../include/conversation.php:2011
+#: ../../include/conversation.php:1714
 msgctxt "noun"
 msgid "Abstain"
 msgid_plural "Abstains"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../../include/dir_fns.php:141
-msgid "Directory Options"
-msgstr ""
-
-#: ../../include/dir_fns.php:143
-msgid "Safe Mode"
-msgstr ""
-
-#: ../../include/dir_fns.php:144
-msgid "Public Forums Only"
-msgstr ""
-
-#: ../../include/dir_fns.php:145
-msgid "This Website Only"
-msgstr ""
-
 #: ../../include/bookmarks.php:34
 #, php-format
 msgid "%1$s's bookmarks"
@@ -12773,373 +13130,373 @@ msgid ""
 "Cannot create a duplicate channel identifier on this system. Import failed."
 msgstr ""
 
-#: ../../include/import.php:116
+#: ../../include/import.php:117
 msgid "Cloned channel not found. Import failed."
 msgstr ""
 
-#: ../../include/text.php:492
+#: ../../include/text.php:498
 msgid "prev"
 msgstr ""
 
-#: ../../include/text.php:494
+#: ../../include/text.php:500
 msgid "first"
 msgstr ""
 
-#: ../../include/text.php:523
+#: ../../include/text.php:529
 msgid "last"
 msgstr ""
 
-#: ../../include/text.php:526
+#: ../../include/text.php:532
 msgid "next"
 msgstr ""
 
-#: ../../include/text.php:537
+#: ../../include/text.php:543
 msgid "older"
 msgstr ""
 
-#: ../../include/text.php:539
+#: ../../include/text.php:545
 msgid "newer"
 msgstr ""
 
-#: ../../include/text.php:963
+#: ../../include/text.php:969
 msgid "No connections"
 msgstr ""
 
-#: ../../include/text.php:995
+#: ../../include/text.php:1001
 #, php-format
 msgid "View all %s connections"
 msgstr ""
 
-#: ../../include/text.php:1051
+#: ../../include/text.php:1057
 #, php-format
 msgid "Network: %s"
 msgstr ""
 
-#: ../../include/text.php:1140 ../../include/text.php:1144
+#: ../../include/text.php:1146 ../../include/text.php:1150
 msgid "poke"
 msgstr ""
 
-#: ../../include/text.php:1145
+#: ../../include/text.php:1151
 msgid "ping"
 msgstr ""
 
-#: ../../include/text.php:1145
+#: ../../include/text.php:1151
 msgid "pinged"
 msgstr ""
 
-#: ../../include/text.php:1146
+#: ../../include/text.php:1152
 msgid "prod"
 msgstr ""
 
-#: ../../include/text.php:1146
+#: ../../include/text.php:1152
 msgid "prodded"
 msgstr ""
 
-#: ../../include/text.php:1147
+#: ../../include/text.php:1153
 msgid "slap"
 msgstr ""
 
-#: ../../include/text.php:1147
+#: ../../include/text.php:1153
 msgid "slapped"
 msgstr ""
 
-#: ../../include/text.php:1148
+#: ../../include/text.php:1154
 msgid "finger"
 msgstr ""
 
-#: ../../include/text.php:1148
+#: ../../include/text.php:1154
 msgid "fingered"
 msgstr ""
 
-#: ../../include/text.php:1149
+#: ../../include/text.php:1155
 msgid "rebuff"
 msgstr ""
 
-#: ../../include/text.php:1149
+#: ../../include/text.php:1155
 msgid "rebuffed"
 msgstr ""
 
-#: ../../include/text.php:1172
+#: ../../include/text.php:1178
 msgid "happy"
 msgstr ""
 
-#: ../../include/text.php:1173
+#: ../../include/text.php:1179
 msgid "sad"
 msgstr ""
 
-#: ../../include/text.php:1174
+#: ../../include/text.php:1180
 msgid "mellow"
 msgstr ""
 
-#: ../../include/text.php:1175
+#: ../../include/text.php:1181
 msgid "tired"
 msgstr ""
 
-#: ../../include/text.php:1176
+#: ../../include/text.php:1182
 msgid "perky"
 msgstr ""
 
-#: ../../include/text.php:1177
+#: ../../include/text.php:1183
 msgid "angry"
 msgstr ""
 
-#: ../../include/text.php:1178
+#: ../../include/text.php:1184
 msgid "stupefied"
 msgstr ""
 
-#: ../../include/text.php:1179
+#: ../../include/text.php:1185
 msgid "puzzled"
 msgstr ""
 
-#: ../../include/text.php:1180
+#: ../../include/text.php:1186
 msgid "interested"
 msgstr ""
 
-#: ../../include/text.php:1181
+#: ../../include/text.php:1187
 msgid "bitter"
 msgstr ""
 
-#: ../../include/text.php:1182
+#: ../../include/text.php:1188
 msgid "cheerful"
 msgstr ""
 
-#: ../../include/text.php:1183
+#: ../../include/text.php:1189
 msgid "alive"
 msgstr ""
 
-#: ../../include/text.php:1184
+#: ../../include/text.php:1190
 msgid "annoyed"
 msgstr ""
 
-#: ../../include/text.php:1185
+#: ../../include/text.php:1191
 msgid "anxious"
 msgstr ""
 
-#: ../../include/text.php:1186
+#: ../../include/text.php:1192
 msgid "cranky"
 msgstr ""
 
-#: ../../include/text.php:1187
+#: ../../include/text.php:1193
 msgid "disturbed"
 msgstr ""
 
-#: ../../include/text.php:1188
+#: ../../include/text.php:1194
 msgid "frustrated"
 msgstr ""
 
-#: ../../include/text.php:1189
+#: ../../include/text.php:1195
 msgid "depressed"
 msgstr ""
 
-#: ../../include/text.php:1190
+#: ../../include/text.php:1196
 msgid "motivated"
 msgstr ""
 
-#: ../../include/text.php:1191
+#: ../../include/text.php:1197
 msgid "relaxed"
 msgstr ""
 
-#: ../../include/text.php:1192
+#: ../../include/text.php:1198
 msgid "surprised"
 msgstr ""
 
-#: ../../include/text.php:1371 ../../include/js_strings.php:86
+#: ../../include/text.php:1377 ../../include/js_strings.php:95
 msgid "Monday"
 msgstr ""
 
-#: ../../include/text.php:1371 ../../include/js_strings.php:87
+#: ../../include/text.php:1377 ../../include/js_strings.php:96
 msgid "Tuesday"
 msgstr ""
 
-#: ../../include/text.php:1371 ../../include/js_strings.php:88
+#: ../../include/text.php:1377 ../../include/js_strings.php:97
 msgid "Wednesday"
 msgstr ""
 
-#: ../../include/text.php:1371 ../../include/js_strings.php:89
+#: ../../include/text.php:1377 ../../include/js_strings.php:98
 msgid "Thursday"
 msgstr ""
 
-#: ../../include/text.php:1371 ../../include/js_strings.php:90
+#: ../../include/text.php:1377 ../../include/js_strings.php:99
 msgid "Friday"
 msgstr ""
 
-#: ../../include/text.php:1371 ../../include/js_strings.php:91
+#: ../../include/text.php:1377 ../../include/js_strings.php:100
 msgid "Saturday"
 msgstr ""
 
-#: ../../include/text.php:1371 ../../include/js_strings.php:85
+#: ../../include/text.php:1377 ../../include/js_strings.php:94
 msgid "Sunday"
 msgstr ""
 
-#: ../../include/text.php:1375 ../../include/js_strings.php:61
+#: ../../include/text.php:1381 ../../include/js_strings.php:70
 msgid "January"
 msgstr ""
 
-#: ../../include/text.php:1375 ../../include/js_strings.php:62
+#: ../../include/text.php:1381 ../../include/js_strings.php:71
 msgid "February"
 msgstr ""
 
-#: ../../include/text.php:1375 ../../include/js_strings.php:63
+#: ../../include/text.php:1381 ../../include/js_strings.php:72
 msgid "March"
 msgstr ""
 
-#: ../../include/text.php:1375 ../../include/js_strings.php:64
+#: ../../include/text.php:1381 ../../include/js_strings.php:73
 msgid "April"
 msgstr ""
 
-#: ../../include/text.php:1375
+#: ../../include/text.php:1381
 msgid "May"
 msgstr ""
 
-#: ../../include/text.php:1375 ../../include/js_strings.php:66
+#: ../../include/text.php:1381 ../../include/js_strings.php:75
 msgid "June"
 msgstr ""
 
-#: ../../include/text.php:1375 ../../include/js_strings.php:67
+#: ../../include/text.php:1381 ../../include/js_strings.php:76
 msgid "July"
 msgstr ""
 
-#: ../../include/text.php:1375 ../../include/js_strings.php:68
+#: ../../include/text.php:1381 ../../include/js_strings.php:77
 msgid "August"
 msgstr ""
 
-#: ../../include/text.php:1375 ../../include/js_strings.php:69
+#: ../../include/text.php:1381 ../../include/js_strings.php:78
 msgid "September"
 msgstr ""
 
-#: ../../include/text.php:1375 ../../include/js_strings.php:70
+#: ../../include/text.php:1381 ../../include/js_strings.php:79
 msgid "October"
 msgstr ""
 
-#: ../../include/text.php:1375 ../../include/js_strings.php:71
+#: ../../include/text.php:1381 ../../include/js_strings.php:80
 msgid "November"
 msgstr ""
 
-#: ../../include/text.php:1375 ../../include/js_strings.php:72
+#: ../../include/text.php:1381 ../../include/js_strings.php:81
 msgid "December"
 msgstr ""
 
-#: ../../include/text.php:1449
+#: ../../include/text.php:1455
 msgid "Unknown Attachment"
 msgstr ""
 
-#: ../../include/text.php:1451 ../../include/feedutils.php:860
+#: ../../include/text.php:1457 ../../include/feedutils.php:860
 msgid "unknown"
 msgstr ""
 
-#: ../../include/text.php:1487
+#: ../../include/text.php:1493
 msgid "remove category"
 msgstr ""
 
-#: ../../include/text.php:1561
+#: ../../include/text.php:1567
 msgid "remove from file"
 msgstr ""
 
-#: ../../include/text.php:1703 ../../include/message.php:12
+#: ../../include/text.php:1709 ../../include/message.php:13
 msgid "Download binary/encrypted content"
 msgstr ""
 
-#: ../../include/text.php:1866 ../../include/language.php:397
+#: ../../include/text.php:1872 ../../include/language.php:423
 msgid "default"
 msgstr ""
 
-#: ../../include/text.php:1874
+#: ../../include/text.php:1880
 msgid "Page layout"
 msgstr ""
 
-#: ../../include/text.php:1874
+#: ../../include/text.php:1880
 msgid "You can create your own with the layouts tool"
 msgstr ""
 
-#: ../../include/text.php:1885
+#: ../../include/text.php:1891
 msgid "HTML"
 msgstr ""
 
-#: ../../include/text.php:1888
+#: ../../include/text.php:1894
 msgid "Comanche Layout"
 msgstr ""
 
-#: ../../include/text.php:1893
+#: ../../include/text.php:1899
 msgid "PHP"
 msgstr ""
 
-#: ../../include/text.php:1902
+#: ../../include/text.php:1908
 msgid "Page content type"
 msgstr ""
 
-#: ../../include/text.php:2035
+#: ../../include/text.php:2041
 msgid "activity"
 msgstr ""
 
-#: ../../include/text.php:2135
+#: ../../include/text.php:2142
 msgid "a-z, 0-9, -, and _ only"
 msgstr ""
 
-#: ../../include/text.php:2455
+#: ../../include/text.php:2462
 msgid "Design Tools"
 msgstr ""
 
-#: ../../include/text.php:2461
+#: ../../include/text.php:2468
 msgid "Pages"
 msgstr ""
 
-#: ../../include/text.php:2483
+#: ../../include/text.php:2490
 msgid "Import website..."
 msgstr ""
 
-#: ../../include/text.php:2484
+#: ../../include/text.php:2491
 msgid "Select folder to import"
 msgstr ""
 
-#: ../../include/text.php:2485
+#: ../../include/text.php:2492
 msgid "Import from a zipped folder:"
 msgstr ""
 
-#: ../../include/text.php:2486
+#: ../../include/text.php:2493
 msgid "Import from cloud files:"
 msgstr ""
 
-#: ../../include/text.php:2487
+#: ../../include/text.php:2494
 msgid "/cloud/channel/path/to/folder"
 msgstr ""
 
-#: ../../include/text.php:2488
+#: ../../include/text.php:2495
 msgid "Enter path to website files"
 msgstr ""
 
-#: ../../include/text.php:2489
+#: ../../include/text.php:2496
 msgid "Select folder"
 msgstr ""
 
-#: ../../include/text.php:2490
+#: ../../include/text.php:2497
 msgid "Export website..."
 msgstr ""
 
-#: ../../include/text.php:2491
+#: ../../include/text.php:2498
 msgid "Export to a zip file"
 msgstr ""
 
-#: ../../include/text.php:2492
+#: ../../include/text.php:2499
 msgid "website.zip"
 msgstr ""
 
-#: ../../include/text.php:2493
+#: ../../include/text.php:2500
 msgid "Enter a name for the zip file."
 msgstr ""
 
-#: ../../include/text.php:2494
+#: ../../include/text.php:2501
 msgid "Export to cloud files"
 msgstr ""
 
-#: ../../include/text.php:2495
+#: ../../include/text.php:2502
 msgid "/path/to/export/folder"
 msgstr ""
 
-#: ../../include/text.php:2496
+#: ../../include/text.php:2503
 msgid "Enter a path to a cloud files destination."
 msgstr ""
 
-#: ../../include/text.php:2497
+#: ../../include/text.php:2504
 msgid "Specify folder"
 msgstr ""
 
@@ -13187,7 +13544,7 @@ msgstr ""
 msgid "View all %d common connections"
 msgstr ""
 
-#: ../../include/markdown.php:158 ../../include/bbcode.php:358
+#: ../../include/markdown.php:200 ../../include/bbcode.php:358
 #, php-format
 msgid "%1$s wrote the following %2$s %3$s"
 msgstr ""
@@ -13338,198 +13695,208 @@ msgid " channel name"
 msgstr ""
 
 #: ../../include/js_strings.php:41
+#, php-format
+msgid "%d minutes"
+msgid_plural "%d minutes"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../../include/js_strings.php:42
+#, php-format
+msgid "about %d hours"
+msgid_plural "about %d hours"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../../include/js_strings.php:43
+#, php-format
+msgid "%d days"
+msgid_plural "%d days"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../../include/js_strings.php:44
+#, php-format
+msgid "%d months"
+msgid_plural "%d months"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../../include/js_strings.php:45
+#, php-format
+msgid "%d years"
+msgid_plural "%d years"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../../include/js_strings.php:50
 msgid "timeago.prefixAgo"
 msgstr ""
 
-#: ../../include/js_strings.php:42
+#: ../../include/js_strings.php:51
 msgid "timeago.prefixFromNow"
 msgstr ""
 
-#: ../../include/js_strings.php:43
+#: ../../include/js_strings.php:52
 msgid "timeago.suffixAgo"
 msgstr ""
 
-#: ../../include/js_strings.php:44
+#: ../../include/js_strings.php:53
 msgid "timeago.suffixFromNow"
 msgstr ""
 
-#: ../../include/js_strings.php:47
+#: ../../include/js_strings.php:56
 msgid "less than a minute"
 msgstr ""
 
-#: ../../include/js_strings.php:48
+#: ../../include/js_strings.php:57
 msgid "about a minute"
 msgstr ""
 
-#: ../../include/js_strings.php:49
-#, php-format
-msgid "%d minutes"
-msgstr ""
-
-#: ../../include/js_strings.php:50
+#: ../../include/js_strings.php:59
 msgid "about an hour"
 msgstr ""
 
-#: ../../include/js_strings.php:51
-#, php-format
-msgid "about %d hours"
-msgstr ""
-
-#: ../../include/js_strings.php:52
+#: ../../include/js_strings.php:61
 msgid "a day"
 msgstr ""
 
-#: ../../include/js_strings.php:53
-#, php-format
-msgid "%d days"
-msgstr ""
-
-#: ../../include/js_strings.php:54
+#: ../../include/js_strings.php:63
 msgid "about a month"
 msgstr ""
 
-#: ../../include/js_strings.php:55
-#, php-format
-msgid "%d months"
-msgstr ""
-
-#: ../../include/js_strings.php:56
+#: ../../include/js_strings.php:65
 msgid "about a year"
 msgstr ""
 
-#: ../../include/js_strings.php:57
-#, php-format
-msgid "%d years"
-msgstr ""
-
-#: ../../include/js_strings.php:58
+#: ../../include/js_strings.php:67
 msgid " "
 msgstr ""
 
-#: ../../include/js_strings.php:59
+#: ../../include/js_strings.php:68
 msgid "timeago.numbers"
 msgstr ""
 
-#: ../../include/js_strings.php:65
+#: ../../include/js_strings.php:74
 msgctxt "long"
 msgid "May"
 msgstr ""
 
-#: ../../include/js_strings.php:73
+#: ../../include/js_strings.php:82
 msgid "Jan"
 msgstr ""
 
-#: ../../include/js_strings.php:74
+#: ../../include/js_strings.php:83
 msgid "Feb"
 msgstr ""
 
-#: ../../include/js_strings.php:75
+#: ../../include/js_strings.php:84
 msgid "Mar"
 msgstr ""
 
-#: ../../include/js_strings.php:76
+#: ../../include/js_strings.php:85
 msgid "Apr"
 msgstr ""
 
-#: ../../include/js_strings.php:77
+#: ../../include/js_strings.php:86
 msgctxt "short"
 msgid "May"
 msgstr ""
 
-#: ../../include/js_strings.php:78
+#: ../../include/js_strings.php:87
 msgid "Jun"
 msgstr ""
 
-#: ../../include/js_strings.php:79
+#: ../../include/js_strings.php:88
 msgid "Jul"
 msgstr ""
 
-#: ../../include/js_strings.php:80
+#: ../../include/js_strings.php:89
 msgid "Aug"
 msgstr ""
 
-#: ../../include/js_strings.php:81
+#: ../../include/js_strings.php:90
 msgid "Sep"
 msgstr ""
 
-#: ../../include/js_strings.php:82
+#: ../../include/js_strings.php:91
 msgid "Oct"
 msgstr ""
 
-#: ../../include/js_strings.php:83
+#: ../../include/js_strings.php:92
 msgid "Nov"
 msgstr ""
 
-#: ../../include/js_strings.php:84
+#: ../../include/js_strings.php:93
 msgid "Dec"
 msgstr ""
 
-#: ../../include/js_strings.php:92
+#: ../../include/js_strings.php:101
 msgid "Sun"
 msgstr ""
 
-#: ../../include/js_strings.php:93
+#: ../../include/js_strings.php:102
 msgid "Mon"
 msgstr ""
 
-#: ../../include/js_strings.php:94
+#: ../../include/js_strings.php:103
 msgid "Tue"
 msgstr ""
 
-#: ../../include/js_strings.php:95
+#: ../../include/js_strings.php:104
 msgid "Wed"
 msgstr ""
 
-#: ../../include/js_strings.php:96
+#: ../../include/js_strings.php:105
 msgid "Thu"
 msgstr ""
 
-#: ../../include/js_strings.php:97
+#: ../../include/js_strings.php:106
 msgid "Fri"
 msgstr ""
 
-#: ../../include/js_strings.php:98
+#: ../../include/js_strings.php:107
 msgid "Sat"
 msgstr ""
 
-#: ../../include/js_strings.php:99
+#: ../../include/js_strings.php:108
 msgctxt "calendar"
 msgid "today"
 msgstr ""
 
-#: ../../include/js_strings.php:100
+#: ../../include/js_strings.php:109
 msgctxt "calendar"
 msgid "month"
 msgstr ""
 
-#: ../../include/js_strings.php:101
+#: ../../include/js_strings.php:110
 msgctxt "calendar"
 msgid "week"
 msgstr ""
 
-#: ../../include/js_strings.php:102
+#: ../../include/js_strings.php:111
 msgctxt "calendar"
 msgid "day"
 msgstr ""
 
-#: ../../include/js_strings.php:103
+#: ../../include/js_strings.php:112
 msgctxt "calendar"
 msgid "All day"
 msgstr ""
 
-#: ../../include/message.php:40
+#: ../../include/message.php:41
 msgid "Unable to determine sender."
 msgstr ""
 
-#: ../../include/message.php:79
+#: ../../include/message.php:80
 msgid "No recipient provided."
 msgstr ""
 
-#: ../../include/message.php:84
+#: ../../include/message.php:85
 msgid "[no subject]"
 msgstr ""
 
-#: ../../include/message.php:214
+#: ../../include/message.php:215
 msgid "Stored post could not be verified."
 msgstr ""
 
@@ -13628,221 +13995,221 @@ msgid ""
 "form has been opened for too long (>3 hours) before submitting it."
 msgstr ""
 
-#: ../../include/items.php:891 ../../include/items.php:951
+#: ../../include/items.php:911 ../../include/items.php:971
 msgid "(Unknown)"
 msgstr ""
 
-#: ../../include/items.php:1137
+#: ../../include/items.php:1157
 msgid "Visible to anybody on the internet."
 msgstr ""
 
-#: ../../include/items.php:1139
+#: ../../include/items.php:1159
 msgid "Visible to you only."
 msgstr ""
 
-#: ../../include/items.php:1141
+#: ../../include/items.php:1161
 msgid "Visible to anybody in this network."
 msgstr ""
 
-#: ../../include/items.php:1143
+#: ../../include/items.php:1163
 msgid "Visible to anybody authenticated."
 msgstr ""
 
-#: ../../include/items.php:1145
+#: ../../include/items.php:1165
 #, php-format
 msgid "Visible to anybody on %s."
 msgstr ""
 
-#: ../../include/items.php:1147
+#: ../../include/items.php:1167
 msgid "Visible to all connections."
 msgstr ""
 
-#: ../../include/items.php:1149
+#: ../../include/items.php:1169
 msgid "Visible to approved connections."
 msgstr ""
 
-#: ../../include/items.php:1151
+#: ../../include/items.php:1171
 msgid "Visible to specific connections."
 msgstr ""
 
-#: ../../include/items.php:4141
+#: ../../include/items.php:4183
 msgid "Privacy group is empty."
 msgstr ""
 
-#: ../../include/items.php:4148
+#: ../../include/items.php:4190
 #, php-format
 msgid "Privacy group: %s"
 msgstr ""
 
-#: ../../include/items.php:4160
+#: ../../include/items.php:4202
 msgid "Connection not found."
 msgstr ""
 
-#: ../../include/items.php:4509
+#: ../../include/items.php:4551
 msgid "profile photo"
 msgstr ""
 
-#: ../../include/items.php:4700
+#: ../../include/items.php:4742
 #, php-format
 msgid "[Edited %s]"
 msgstr ""
 
-#: ../../include/items.php:4700
+#: ../../include/items.php:4742
 msgctxt "edit_activity"
 msgid "Post"
 msgstr ""
 
-#: ../../include/items.php:4700
+#: ../../include/items.php:4742
 msgctxt "edit_activity"
 msgid "Comment"
 msgstr ""
 
-#: ../../include/channel.php:35
+#: ../../include/channel.php:42
 msgid "Unable to obtain identity information from database"
 msgstr ""
 
-#: ../../include/channel.php:69
+#: ../../include/channel.php:75
 msgid "Empty name"
 msgstr ""
 
-#: ../../include/channel.php:72
+#: ../../include/channel.php:78
 msgid "Name too long"
 msgstr ""
 
-#: ../../include/channel.php:188
+#: ../../include/channel.php:195
 msgid "No account identifier"
 msgstr ""
 
-#: ../../include/channel.php:200
+#: ../../include/channel.php:207
 msgid "Nickname is required."
 msgstr ""
 
-#: ../../include/channel.php:277
+#: ../../include/channel.php:284
 msgid "Unable to retrieve created identity"
 msgstr ""
 
-#: ../../include/channel.php:373
+#: ../../include/channel.php:380
 msgid "Default Profile"
 msgstr ""
 
-#: ../../include/channel.php:532 ../../include/channel.php:621
+#: ../../include/channel.php:539 ../../include/channel.php:628
 msgid "Unable to retrieve modified identity"
 msgstr ""
 
-#: ../../include/channel.php:1297
+#: ../../include/channel.php:1304
 msgid "Create New Profile"
 msgstr ""
 
-#: ../../include/channel.php:1318
+#: ../../include/channel.php:1325
 msgid "Visible to everybody"
 msgstr ""
 
-#: ../../include/channel.php:1395 ../../include/channel.php:1523
+#: ../../include/channel.php:1402 ../../include/channel.php:1530
 msgid "Gender:"
 msgstr ""
 
-#: ../../include/channel.php:1397 ../../include/channel.php:1591
+#: ../../include/channel.php:1404 ../../include/channel.php:1598
 msgid "Homepage:"
 msgstr ""
 
-#: ../../include/channel.php:1398
+#: ../../include/channel.php:1405
 msgid "Online Now"
 msgstr ""
 
-#: ../../include/channel.php:1451
+#: ../../include/channel.php:1458
 msgid "Change your profile photo"
 msgstr ""
 
-#: ../../include/channel.php:1482
+#: ../../include/channel.php:1489
 msgid "Trans"
 msgstr ""
 
-#: ../../include/channel.php:1528
+#: ../../include/channel.php:1535
 msgid "Like this channel"
 msgstr ""
 
-#: ../../include/channel.php:1552
+#: ../../include/channel.php:1559
 msgid "j F, Y"
 msgstr ""
 
-#: ../../include/channel.php:1553
+#: ../../include/channel.php:1560
 msgid "j F"
 msgstr ""
 
-#: ../../include/channel.php:1560
+#: ../../include/channel.php:1567
 msgid "Birthday:"
 msgstr ""
 
-#: ../../include/channel.php:1573
+#: ../../include/channel.php:1580
 #, php-format
 msgid "for %1$d %2$s"
 msgstr ""
 
-#: ../../include/channel.php:1585
+#: ../../include/channel.php:1592
 msgid "Tags:"
 msgstr ""
 
-#: ../../include/channel.php:1589
+#: ../../include/channel.php:1596
 msgid "Sexual Preference:"
 msgstr ""
 
-#: ../../include/channel.php:1595
+#: ../../include/channel.php:1602
 msgid "Political Views:"
 msgstr ""
 
-#: ../../include/channel.php:1597
+#: ../../include/channel.php:1604
 msgid "Religion:"
 msgstr ""
 
-#: ../../include/channel.php:1601
+#: ../../include/channel.php:1608
 msgid "Hobbies/Interests:"
 msgstr ""
 
-#: ../../include/channel.php:1603
+#: ../../include/channel.php:1610
 msgid "Likes:"
 msgstr ""
 
-#: ../../include/channel.php:1605
+#: ../../include/channel.php:1612
 msgid "Dislikes:"
 msgstr ""
 
-#: ../../include/channel.php:1607
+#: ../../include/channel.php:1614
 msgid "Contact information and Social Networks:"
 msgstr ""
 
-#: ../../include/channel.php:1609
+#: ../../include/channel.php:1616
 msgid "My other channels:"
 msgstr ""
 
-#: ../../include/channel.php:1611
+#: ../../include/channel.php:1618
 msgid "Musical interests:"
 msgstr ""
 
-#: ../../include/channel.php:1613
+#: ../../include/channel.php:1620
 msgid "Books, literature:"
 msgstr ""
 
-#: ../../include/channel.php:1615
+#: ../../include/channel.php:1622
 msgid "Television:"
 msgstr ""
 
-#: ../../include/channel.php:1617
+#: ../../include/channel.php:1624
 msgid "Film/dance/culture/entertainment:"
 msgstr ""
 
-#: ../../include/channel.php:1619
+#: ../../include/channel.php:1626
 msgid "Love/Romance:"
 msgstr ""
 
-#: ../../include/channel.php:1621
+#: ../../include/channel.php:1628
 msgid "Work/employment:"
 msgstr ""
 
-#: ../../include/channel.php:1623
+#: ../../include/channel.php:1630
 msgid "School/education:"
 msgstr ""
 
-#: ../../include/channel.php:1646
+#: ../../include/channel.php:1653
 msgid "Like this thing"
 msgstr ""
 
@@ -13898,35 +14265,35 @@ msgstr ""
 msgid "Work, Fax"
 msgstr ""
 
-#: ../../include/network.php:760
+#: ../../include/network.php:770
 msgid "view full size"
 msgstr ""
 
-#: ../../include/network.php:1766
+#: ../../include/network.php:1776
 msgid "GNU-Social"
 msgstr ""
 
-#: ../../include/network.php:1767
+#: ../../include/network.php:1777
 msgid "RSS/Atom"
 msgstr ""
 
-#: ../../include/network.php:1771
+#: ../../include/network.php:1781
 msgid "Facebook"
 msgstr ""
 
-#: ../../include/network.php:1773
+#: ../../include/network.php:1783
 msgid "LinkedIn"
 msgstr ""
 
-#: ../../include/network.php:1774
+#: ../../include/network.php:1784
 msgid "XMPP/IM"
 msgstr ""
 
-#: ../../include/network.php:1775
+#: ../../include/network.php:1785
 msgid "MySpace"
 msgstr ""
 
-#: ../../include/language.php:410
+#: ../../include/language.php:436
 msgid "Select an alternate language"
 msgstr ""
 
@@ -13964,17 +14331,17 @@ msgstr ""
 msgid "Cannot locate DNS info for database server '%s'"
 msgstr ""
 
-#: ../../include/bbcode.php:200 ../../include/bbcode.php:1202
-#: ../../include/bbcode.php:1205 ../../include/bbcode.php:1210
-#: ../../include/bbcode.php:1213 ../../include/bbcode.php:1216
-#: ../../include/bbcode.php:1219 ../../include/bbcode.php:1224
-#: ../../include/bbcode.php:1227 ../../include/bbcode.php:1232
-#: ../../include/bbcode.php:1235 ../../include/bbcode.php:1238
-#: ../../include/bbcode.php:1241
+#: ../../include/bbcode.php:200 ../../include/bbcode.php:1201
+#: ../../include/bbcode.php:1204 ../../include/bbcode.php:1209
+#: ../../include/bbcode.php:1212 ../../include/bbcode.php:1215
+#: ../../include/bbcode.php:1218 ../../include/bbcode.php:1223
+#: ../../include/bbcode.php:1226 ../../include/bbcode.php:1231
+#: ../../include/bbcode.php:1234 ../../include/bbcode.php:1237
+#: ../../include/bbcode.php:1240
 msgid "Image/photo"
 msgstr ""
 
-#: ../../include/bbcode.php:239 ../../include/bbcode.php:1252
+#: ../../include/bbcode.php:239 ../../include/bbcode.php:1251
 msgid "Encrypted content"
 msgstr ""
 
@@ -14016,7 +14383,7 @@ msgstr ""
 msgid "View summary"
 msgstr ""
 
-#: ../../include/bbcode.php:1190
+#: ../../include/bbcode.php:1189
 msgid "$1 wrote:"
 msgstr ""
 
@@ -14045,373 +14412,287 @@ msgstr ""
 msgid "OpenWebAuth: %1$s welcomes %2$s"
 msgstr ""
 
-#: ../../include/features.php:56
-msgid "General Features"
-msgstr ""
-
-#: ../../include/features.php:61
-msgid "Display new member quick links menu"
-msgstr ""
-
-#: ../../include/features.php:69
-msgid "Advanced Profiles"
+#: ../../include/features.php:86 ../../include/features.php:273
+msgid "Start calendar week on Monday"
 msgstr ""
 
-#: ../../include/features.php:70
-msgid "Additional profile sections and selections"
+#: ../../include/features.php:87 ../../include/features.php:274
+msgid "Default is Sunday"
 msgstr ""
 
-#: ../../include/features.php:78
-msgid "Profile Import/Export"
+#: ../../include/features.php:100
+msgid "Search by Date"
 msgstr ""
 
-#: ../../include/features.php:79
-msgid "Save and load profile details across sites/channels"
+#: ../../include/features.php:101
+msgid "Ability to select posts by date ranges"
 msgstr ""
 
-#: ../../include/features.php:87
-msgid "Web Pages"
+#: ../../include/features.php:108
+msgid "Tag Cloud"
 msgstr ""
 
-#: ../../include/features.php:88
-msgid "Provide managed web pages on your channel"
+#: ../../include/features.php:109
+msgid "Provide a personal tag cloud on your channel page"
 msgstr ""
 
-#: ../../include/features.php:97
-msgid "Provide a wiki for your channel"
+#: ../../include/features.php:116 ../../include/features.php:381
+msgid "Use blog/list mode"
 msgstr ""
 
-#: ../../include/features.php:114
-msgid "Private Notes"
+#: ../../include/features.php:117 ../../include/features.php:382
+msgid "Comments will be displayed separately"
 msgstr ""
 
-#: ../../include/features.php:115
-msgid "Enables a tool to store notes and reminders (note: not encrypted)"
+#: ../../include/features.php:129
+msgid "Connection Filtering"
 msgstr ""
 
-#: ../../include/features.php:124
-msgid "Create personal planning cards"
+#: ../../include/features.php:130
+msgid "Filter incoming posts from connections based on keywords/content"
 msgstr ""
 
-#: ../../include/features.php:134
-msgid "Create interactive articles"
+#: ../../include/features.php:138
+msgid "Conversation"
 msgstr ""
 
 #: ../../include/features.php:142
-msgid "Navigation Channel Select"
+msgid "Community Tagging"
 msgstr ""
 
 #: ../../include/features.php:143
-msgid "Change channels directly from within the navigation dropdown menu"
-msgstr ""
-
-#: ../../include/features.php:151
-msgid "Photo Location"
+msgid "Ability to tag existing posts"
 msgstr ""
 
-#: ../../include/features.php:152
-msgid "If location data is available on uploaded photos, link this to a map."
+#: ../../include/features.php:150
+msgid "Emoji Reactions"
 msgstr ""
 
-#: ../../include/features.php:160
-msgid "Access Controlled Chatrooms"
+#: ../../include/features.php:151
+msgid "Add emoji reaction ability to posts"
 msgstr ""
 
-#: ../../include/features.php:161
-msgid "Provide chatrooms and chat services with access control."
+#: ../../include/features.php:158
+msgid "Dislike Posts"
 msgstr ""
 
-#: ../../include/features.php:170
-msgid "Smart Birthdays"
+#: ../../include/features.php:159
+msgid "Ability to dislike posts/comments"
 msgstr ""
 
-#: ../../include/features.php:171
-msgid ""
-"Make birthday events timezone aware in case your friends are scattered "
-"across the planet."
+#: ../../include/features.php:166
+msgid "Star Posts"
 msgstr ""
 
-#: ../../include/features.php:179
-msgid "Event Timezone Selection"
+#: ../../include/features.php:167
+msgid "Ability to mark special posts with a star indicator"
 msgstr ""
 
 #: ../../include/features.php:180
-msgid "Allow event creation in timezones other than your own."
-msgstr ""
-
-#: ../../include/features.php:189
-msgid "Premium Channel"
-msgstr ""
-
-#: ../../include/features.php:190
-msgid ""
-"Allows you to set restrictions and terms on those that connect with your "
-"channel"
-msgstr ""
-
-#: ../../include/features.php:198
 msgid "Advanced Directory Search"
 msgstr ""
 
-#: ../../include/features.php:199
+#: ../../include/features.php:181
 msgid "Allows creation of complex directory search queries"
 msgstr ""
 
-#: ../../include/features.php:207
-msgid "Advanced Theme and Layout Settings"
-msgstr ""
-
-#: ../../include/features.php:208
-msgid "Allows fine tuning of themes and page layouts"
-msgstr ""
-
-#: ../../include/features.php:217
-msgid "Access Control and Permissions"
-msgstr ""
-
-#: ../../include/features.php:222
-msgid "Enable management and selection of privacy groups"
-msgstr ""
-
-#: ../../include/features.php:230
-msgid "Multiple Profiles"
-msgstr ""
-
-#: ../../include/features.php:231
-msgid "Ability to create multiple profiles"
-msgstr ""
-
-#: ../../include/features.php:241
-msgid "Create custom connection permission limits"
-msgstr ""
-
-#: ../../include/features.php:249
-msgid "OAuth1 Clients"
-msgstr ""
-
-#: ../../include/features.php:250
-msgid "Manage OAuth1 authenticatication tokens for mobile and remote apps."
-msgstr ""
-
-#: ../../include/features.php:258
-msgid "OAuth2 Clients"
-msgstr ""
-
-#: ../../include/features.php:259
-msgid "Manage OAuth2 authenticatication tokens for mobile and remote apps."
-msgstr ""
-
-#: ../../include/features.php:267
-msgid "Access Tokens"
+#: ../../include/features.php:190
+msgid "Editor"
 msgstr ""
 
-#: ../../include/features.php:268
-msgid "Create access tokens so that non-members can access private content."
+#: ../../include/features.php:194
+msgid "Post Categories"
 msgstr ""
 
-#: ../../include/features.php:279
-msgid "Post Composition Features"
+#: ../../include/features.php:195
+msgid "Add categories to your posts"
 msgstr ""
 
-#: ../../include/features.php:283
+#: ../../include/features.php:203
 msgid "Large Photos"
 msgstr ""
 
-#: ../../include/features.php:284
+#: ../../include/features.php:204
 msgid ""
 "Include large (1024px) photo thumbnails in posts. If not enabled, use small "
 "(640px) photo thumbnails"
 msgstr ""
 
-#: ../../include/features.php:293
-msgid "Automatically import channel content from other channels or feeds"
-msgstr ""
-
-#: ../../include/features.php:301
+#: ../../include/features.php:211
 msgid "Even More Encryption"
 msgstr ""
 
-#: ../../include/features.php:302
+#: ../../include/features.php:212
 msgid ""
 "Allow optional encryption of content end-to-end with a shared secret key"
 msgstr ""
 
-#: ../../include/features.php:310
+#: ../../include/features.php:219
 msgid "Enable Voting Tools"
 msgstr ""
 
-#: ../../include/features.php:311
+#: ../../include/features.php:220
 msgid "Provide a class of post which others can vote on"
 msgstr ""
 
-#: ../../include/features.php:319
+#: ../../include/features.php:227
 msgid "Disable Comments"
 msgstr ""
 
-#: ../../include/features.php:320
+#: ../../include/features.php:228
 msgid "Provide the option to disable comments for a post"
 msgstr ""
 
-#: ../../include/features.php:328
+#: ../../include/features.php:235
 msgid "Delayed Posting"
 msgstr ""
 
-#: ../../include/features.php:329
+#: ../../include/features.php:236
 msgid "Allow posts to be published at a later date"
 msgstr ""
 
-#: ../../include/features.php:337
+#: ../../include/features.php:243
 msgid "Content Expiration"
 msgstr ""
 
-#: ../../include/features.php:338
+#: ../../include/features.php:244
 msgid "Remove posts/comments and/or private messages at a future time"
 msgstr ""
 
-#: ../../include/features.php:346
+#: ../../include/features.php:251
 msgid "Suppress Duplicate Posts/Comments"
 msgstr ""
 
-#: ../../include/features.php:347
+#: ../../include/features.php:252
 msgid ""
 "Prevent posts with identical content to be published with less than two "
 "minutes in between submissions."
 msgstr ""
 
-#: ../../include/features.php:355
+#: ../../include/features.php:259
 msgid "Auto-save drafts of posts and comments"
 msgstr ""
 
-#: ../../include/features.php:356
+#: ../../include/features.php:260
 msgid ""
 "Automatically saves post and comment drafts in local browser storage to help "
 "prevent accidental loss of compositions"
 msgstr ""
 
-#: ../../include/features.php:367
-msgid "Network and Stream Filtering"
+#: ../../include/features.php:281
+msgid "Smart Birthdays"
 msgstr ""
 
-#: ../../include/features.php:371
-msgid "Search by Date"
+#: ../../include/features.php:282
+msgid ""
+"Make birthday events timezone aware in case your friends are scattered "
+"across the planet."
 msgstr ""
 
-#: ../../include/features.php:372
-msgid "Ability to select posts by date ranges"
+#: ../../include/features.php:289
+msgid "Event Timezone Selection"
+msgstr ""
+
+#: ../../include/features.php:290
+msgid "Allow event creation in timezones other than your own."
+msgstr ""
+
+#: ../../include/features.php:299
+msgid "Manage"
+msgstr ""
+
+#: ../../include/features.php:303
+msgid "Navigation Channel Select"
+msgstr ""
+
+#: ../../include/features.php:304
+msgid "Change channels directly from within the navigation dropdown menu"
 msgstr ""
 
-#: ../../include/features.php:382
+#: ../../include/features.php:318
 msgid "Save search terms for re-use"
 msgstr ""
 
-#: ../../include/features.php:390
+#: ../../include/features.php:326
+msgid "Ability to file posts under folders"
+msgstr ""
+
+#: ../../include/features.php:333
 msgid "Alternate Stream Order"
 msgstr ""
 
-#: ../../include/features.php:391
+#: ../../include/features.php:334
 msgid ""
 "Ability to order the stream by last post date, last comment date or "
 "unthreaded activities"
 msgstr ""
 
-#: ../../include/features.php:399
+#: ../../include/features.php:341
 msgid "Contact Filter"
 msgstr ""
 
-#: ../../include/features.php:400
+#: ../../include/features.php:342
 msgid "Ability to display only posts of a selected contact"
 msgstr ""
 
-#: ../../include/features.php:408
+#: ../../include/features.php:349
 msgid "Forum Filter"
 msgstr ""
 
-#: ../../include/features.php:409
+#: ../../include/features.php:350
 msgid "Ability to display only posts of a specific forum"
 msgstr ""
 
-#: ../../include/features.php:417
+#: ../../include/features.php:357
 msgid "Personal Posts Filter"
 msgstr ""
 
-#: ../../include/features.php:418
+#: ../../include/features.php:358
 msgid "Ability to display only posts that you've interacted on"
 msgstr ""
 
-#: ../../include/features.php:426
+#: ../../include/features.php:365
 msgid "Affinity Tool"
 msgstr ""
 
-#: ../../include/features.php:427
+#: ../../include/features.php:366
 msgid "Filter stream activity by depth of relationships"
 msgstr ""
 
-#: ../../include/features.php:436
+#: ../../include/features.php:374
 msgid "Show friend and connection suggestions"
 msgstr ""
 
-#: ../../include/features.php:444
-msgid "Connection Filtering"
-msgstr ""
-
-#: ../../include/features.php:445
-msgid "Filter incoming posts from connections based on keywords/content"
-msgstr ""
-
-#: ../../include/features.php:457
-msgid "Post/Comment Tools"
-msgstr ""
-
-#: ../../include/features.php:461
-msgid "Community Tagging"
-msgstr ""
-
-#: ../../include/features.php:462
-msgid "Ability to tag existing posts"
-msgstr ""
-
-#: ../../include/features.php:470
-msgid "Post Categories"
-msgstr ""
-
-#: ../../include/features.php:471
-msgid "Add categories to your posts"
-msgstr ""
-
-#: ../../include/features.php:479
-msgid "Emoji Reactions"
-msgstr ""
-
-#: ../../include/features.php:480
-msgid "Add emoji reaction ability to posts"
+#: ../../include/features.php:395
+msgid "Photo Location"
 msgstr ""
 
-#: ../../include/features.php:489
-msgid "Ability to file posts under folders"
+#: ../../include/features.php:396
+msgid "If location data is available on uploaded photos, link this to a map."
 msgstr ""
 
-#: ../../include/features.php:497
-msgid "Dislike Posts"
+#: ../../include/features.php:409
+msgid "Advanced Profiles"
 msgstr ""
 
-#: ../../include/features.php:498
-msgid "Ability to dislike posts/comments"
+#: ../../include/features.php:410
+msgid "Additional profile sections and selections"
 msgstr ""
 
-#: ../../include/features.php:506
-msgid "Star Posts"
+#: ../../include/features.php:417
+msgid "Profile Import/Export"
 msgstr ""
 
-#: ../../include/features.php:507
-msgid "Ability to mark special posts with a star indicator"
+#: ../../include/features.php:418
+msgid "Save and load profile details across sites/channels"
 msgstr ""
 
-#: ../../include/features.php:515
-msgid "Tag Cloud"
+#: ../../include/features.php:425
+msgid "Multiple Profiles"
 msgstr ""
 
-#: ../../include/features.php:516
-msgid "Provide a personal tag cloud on your channel page"
+#: ../../include/features.php:426
+msgid "Ability to create multiple profiles"
 msgstr ""
 
 #: ../../include/taxonomy.php:320
@@ -14595,155 +14876,151 @@ msgstr ""
 msgid "Happy Birthday %1$s"
 msgstr ""
 
-#: ../../include/nav.php:88
+#: ../../include/nav.php:86
 msgid "Remote authentication"
 msgstr ""
 
-#: ../../include/nav.php:88
+#: ../../include/nav.php:86
 msgid "Click to authenticate to your home hub"
 msgstr ""
 
-#: ../../include/nav.php:94
+#: ../../include/nav.php:92
 msgid "Manage your channels"
 msgstr ""
 
-#: ../../include/nav.php:97
+#: ../../include/nav.php:95
 msgid "Manage your privacy groups"
 msgstr ""
 
-#: ../../include/nav.php:99
+#: ../../include/nav.php:97
 msgid "Account/Channel Settings"
 msgstr ""
 
-#: ../../include/nav.php:105 ../../include/nav.php:134
+#: ../../include/nav.php:103 ../../include/nav.php:132
 msgid "End this session"
 msgstr ""
 
-#: ../../include/nav.php:108
+#: ../../include/nav.php:106
 msgid "Your profile page"
 msgstr ""
 
-#: ../../include/nav.php:111
+#: ../../include/nav.php:109
 msgid "Manage/Edit profiles"
 msgstr ""
 
-#: ../../include/nav.php:120 ../../include/nav.php:124
+#: ../../include/nav.php:118 ../../include/nav.php:122
 msgid "Sign in"
 msgstr ""
 
-#: ../../include/nav.php:151
+#: ../../include/nav.php:149
 msgid "Take me home"
 msgstr ""
 
-#: ../../include/nav.php:153
+#: ../../include/nav.php:151
 msgid "Log me out of this site"
 msgstr ""
 
-#: ../../include/nav.php:158
+#: ../../include/nav.php:156
 msgid "Create an account"
 msgstr ""
 
-#: ../../include/nav.php:170
+#: ../../include/nav.php:168
 msgid "Help and documentation"
 msgstr ""
 
-#: ../../include/nav.php:185
+#: ../../include/nav.php:183
 msgid "Search site @name, !forum, #tag, ?docs, content"
 msgstr ""
 
-#: ../../include/nav.php:191
+#: ../../include/nav.php:189
 msgid "Site Setup and Configuration"
 msgstr ""
 
-#: ../../include/nav.php:282
+#: ../../include/nav.php:299
 msgid "@name, !forum, #tag, ?doc, content"
 msgstr ""
 
-#: ../../include/nav.php:283
+#: ../../include/nav.php:300
 msgid "Please wait..."
 msgstr ""
 
-#: ../../include/nav.php:289
+#: ../../include/nav.php:306
 msgid "Add Apps"
 msgstr ""
 
-#: ../../include/nav.php:290
+#: ../../include/nav.php:307
 msgid "Arrange Apps"
 msgstr ""
 
-#: ../../include/nav.php:291
+#: ../../include/nav.php:308
 msgid "Toggle System Apps"
 msgstr ""
 
-#: ../../include/photos.php:151
-#, php-format
-msgid "Image exceeds website size limit of %lu bytes"
+#: ../../include/nav.php:394
+msgid "Status Messages and Posts"
 msgstr ""
 
-#: ../../include/photos.php:162
-msgid "Image file is empty."
+#: ../../include/nav.php:407
+msgid "Profile Details"
 msgstr ""
 
-#: ../../include/photos.php:327
-msgid "Photo storage failed."
+#: ../../include/nav.php:417 ../../include/photos.php:667
+msgid "Photo Albums"
 msgstr ""
 
-#: ../../include/photos.php:376
-msgid "a new photo"
+#: ../../include/nav.php:425
+msgid "Files and Storage"
 msgstr ""
 
-#: ../../include/photos.php:380
-#, php-format
-msgctxt "photo_upload"
-msgid "%1$s posted %2$s to %3$s"
+#: ../../include/nav.php:463
+msgid "Saved Bookmarks"
 msgstr ""
 
-#: ../../include/photos.php:672
-msgid "Upload New Photos"
+#: ../../include/nav.php:474
+msgid "View Cards"
 msgstr ""
 
-#: ../../include/zot.php:772
-msgid "Invalid data packet"
+#: ../../include/nav.php:485
+msgid "View Articles"
 msgstr ""
 
-#: ../../include/zot.php:799
-msgid "Unable to verify channel signature"
+#: ../../include/nav.php:497
+msgid "View Webpages"
 msgstr ""
 
-#: ../../include/zot.php:2557
+#: ../../include/photos.php:151
 #, php-format
-msgid "Unable to verify site signature for %s"
+msgid "Image exceeds website size limit of %lu bytes"
 msgstr ""
 
-#: ../../include/zot.php:4221
-msgid "invalid target signature"
+#: ../../include/photos.php:162
+msgid "Image file is empty."
 msgstr ""
 
-#: ../../include/group.php:22
-msgid ""
-"A deleted group with this name was revived. Existing item permissions "
-"<strong>may</strong> apply to this group and any future members. If this is "
-"not what you intended, please create another group with a different name."
+#: ../../include/photos.php:327
+msgid "Photo storage failed."
 msgstr ""
 
-#: ../../include/group.php:264
-msgid "Add new connections to this privacy group"
+#: ../../include/photos.php:376
+msgid "a new photo"
 msgstr ""
 
-#: ../../include/group.php:298
-msgid "edit"
+#: ../../include/photos.php:380
+#, php-format
+msgctxt "photo_upload"
+msgid "%1$s posted %2$s to %3$s"
 msgstr ""
 
-#: ../../include/group.php:321
-msgid "Edit group"
+#: ../../include/photos.php:672
+msgid "Upload New Photos"
 msgstr ""
 
-#: ../../include/group.php:322
-msgid "Add privacy group"
+#: ../../include/zot.php:773
+msgid "Invalid data packet"
 msgstr ""
 
-#: ../../include/group.php:323
-msgid "Channels not in any privacy group"
+#: ../../include/zot.php:4235
+msgid "invalid target signature"
 msgstr ""
 
 #: ../../include/connections.php:133
@@ -14770,10 +15047,10 @@ msgstr ""
 msgid "Failed authentication"
 msgstr ""
 
-#: ../../include/help.php:34
+#: ../../include/help.php:80
 msgid "Help:"
 msgstr ""
 
-#: ../../include/help.php:78
+#: ../../include/help.php:129
 msgid "Not Found"
 msgstr ""
diff --git a/util/php2po.php b/util/php2po.php
index c165006a1..ca33f8b01 100644
--- a/util/php2po.php
+++ b/util/php2po.php
@@ -7,65 +7,79 @@
         }
     }
 
-	if ($argc!=2) {
-		print "Usage: ".$argv[0]." <hstrings.php>\n\n";
-		return;
-	}
-	
-	$phpfile = $argv[1];
-	$pofile = dirname($phpfile)."/hmessages.po";
+        if ($argc!=2) {
+                print "Usage: ".$argv[0]." <hstrings.php>\n\n";
+                return;
+        }
+
+        $phpfile = $argv[1];
+        $pofile = dirname($phpfile)."/hmessages.po";
+
+        if (!file_exists($phpfile)){
+                print "Unable to find '$phpfile'\n";
+                return;
+        }
+
+        include_once($phpfile);
+
+        print "Out to '$pofile'\n";
 
-	if (!file_exists($phpfile)){
-		print "Unable to find '$phpfile'\n";
-		return;
-	}
+        $out = "";
+        $infile = file($pofile);
+        $k = "";
+        $c = "";
+        $ink = False;
+        foreach ($infile as $l) {
 
-	include_once($phpfile);
+                $l = trim($l, " ");
+                if (!preg_match("/^msgstr\[[1-9]/",$l)) {
+                        if ($k!="" && (substr($l,0,7)=="msgstr " || substr($l,0,8)=="msgstr[0")){
+                                $ink = False;
+                                $k = stripcslashes($k);
+                                $v = "";
+                                if (isset(App::$strings[$k])) {
+                                        $v = App::$strings[$k];
+                                } else {
+                                        $k = "__ctx:".$c."__ ".$k;
+                                        if (isset(App::$strings[$k])) {
+                                                $v = App::$strings[$k];
+                                                $c = "";
+                                        };
+                                }
+                                if (!empty($v)) {
+                                        if (is_array($v)) {
+                                                $l = "";
+                                                $n = 0;
+                                                foreach ($v as &$value) {
+                                                        $l .= "msgstr[".$n."] \"".addcslashes($value,"\"\n")."\"\n";
+                                                        $n++;
+                                                }
+                                        } else {
+                                                $l = "msgstr \"".addcslashes($v,"\"\n")."\"\n";
+                                        }
+                                }
+                        }
 
-	print "Out to '$pofile'\n";
-	
-	$out = "";	
-	$infile = file($pofile);
-	$k="";
-	$ink = False;
-	foreach ($infile as $l) {
-	
-		if ($k!="" && substr($l,0,7)=="msgstr "){
-			$ink = False;
-			$v = '';
-			//echo "DBG: k:'$k'\n";
-			if (isset(App::$strings[$k])) {
-				$v= App::$strings[$k];
-				//echo "DBG\n";
-				//var_dump($k, $v, App::$strings[$k], $v);
-				//echo "/DBG\n";
-				
-			}
-			//echo "DBG: v:'$v'\n";
-			$l = "msgstr \"".str_replace('"','\"',$v)."\"\n";
-		}
-	
-		if (substr($l,0,6)=="msgid_" || substr($l,0,7)=="msgstr[" )$ink = False;;
-	
-		if ($ink) {
-			$k .= trim($l,"\"\r\n");
-			$k = str_replace('\"','"',$k); 
-		}
-		
-		if (substr($l,0,6)=="msgid "){
-			$arr=False;
-			$k = str_replace("msgid ","",$l);
-			if ($k != '""' ) {
-				$k = trim($k,"\"\r\n");
-				$k = str_replace('\"','"',$k);
-			} else {
-				$k = "";
-			}
-			$ink = True;
-		}
-		
-		$out .= $l;
-	}
-	//echo $out;
-	file_put_contents($pofile, $out);
-?>
-\ No newline at end of file
+                        if (substr($l,0,6)=="msgid_" || substr($l,0,7)=="msgstr[") $ink = False;
+
+                        if ($ink) {
+                                preg_match('/^"(.*)"$/',$l,$m);
+                                $k .= $m[1];
+                        }
+
+                        if (substr($l,0,6)=="msgid ") {
+                                preg_match('/^msgid "(.*)"$/',$l,$m);
+                                $k = $m[1];
+                                $ink = True;
+                        }
+
+                        if (substr($l,0,8)=="msgctxt ") {
+                                preg_match('/^msgctxt "(.*)"$/',$l,$m);
+                                $c = $m[1];
+                        }
+
+                        $out .= $l;
+                }
+        }
+        file_put_contents($pofile, $out);
+?>
diff --git a/util/po2php.php b/util/po2php.php
index 50941c062..9ffcb64c4 100644
--- a/util/po2php.php
+++ b/util/po2php.php
@@ -58,8 +58,9 @@ function po2php_run($argc,$argv) {
 			$out .= 'function string_plural_select_' . $lang . '($n){'."\n";
 			$out .= '	return '.$cond.';'."\n";
 			$out .= '}}'."\n";
-
-			$out .= 'App::$rtl = ' . intval($rtl) ;
+			
+			$out .= 'App::$rtl = ' . intval($rtl) . ";\n" ;
+			$out .= 'App::$strings["plural_function_code"] = "' . str_replace("$", "", $cond) . '"';
 		}
 		
 		if ($k!="" && substr($l,0,7)=="msgstr "){
diff --git a/util/typo.php b/util/typo.php
index e25e57601..bed5fa5f6 100644
--- a/util/typo.php
+++ b/util/typo.php
@@ -12,25 +12,27 @@
 	
 	App::init();
 
+	$cmd = ((x(App::$config,'system')) && (x(App::$config['system'],'php_path')) && (strlen(App::$config['system']['php_path'])) ? App::$config['system']['php_path'] : 'php') . ' -l ';
+
 
 	echo "Directory: include\n";
 	$files = glob('include/*.php');
 	foreach($files as $file) {
-		echo $file . "\n";
+		echo exec($cmd . $file) . "\n";
 		include_once($file);
 	}
 
 	echo "Directory: include/dba\n";
 	$files = glob('include/dba/*.php');
 	foreach($files as $file) {
-		echo $file . "\n";
+		echo exec($cmd . $file) . "\n";
 		include_once($file);
 	}
 
 	echo "Directory: include/photo\n";
 	$files = glob('include/photo/*.php');
 	foreach($files as $file) {
-		echo $file . "\n";
+		echo exec($cmd . $file) . "\n";
 		include_once($file);
 	}
 
@@ -39,7 +41,7 @@
 	$files = glob('Zotlabs/*/*.php');
 	foreach($files as $file) {
 		if((strpos($file,'SiteModule') === false) || (strpos($file,'SiteWidget') === false)) {
-			echo $file . "\n";
+			echo exec($cmd . $file) . "\n";
 			include_once($file);
 		}
 	}
@@ -47,7 +49,7 @@
 	echo "Directory: Zotlabs/Module (sub-modules)\n";
 	$files = glob('Zotlabs/Module/*/*.php');
 	foreach($files as $file) {
-		echo $file . "\n";
+		echo exec($cmd . $file) . "\n";
 		include_once($file);
 	}
 
@@ -58,7 +60,7 @@
 		$addon = basename($dir);
 		$files = glob($dir . '/' . $addon . '.php');
 		foreach($files as $file) {
-			echo $file . "\n";
+			echo exec($cmd . $file) . "\n";
 			include_once($file);
 		}
 	}
@@ -77,6 +79,6 @@
 	$files = glob('view/*/hstrings.php');
 
 	foreach($files as $file) {
-		echo $file . "\n";
+		echo exec($cmd . $file) . "\n";
 		passthru($phpath . ' util/typohelper.php ' . $file);
 	}
diff --git a/util/update_addon_repo b/util/update_addon_repo
index 0e471eb4f..02c860c8c 100755
--- a/util/update_addon_repo
+++ b/util/update_addon_repo
@@ -44,3 +44,10 @@ for a in "${filelist[@]}" ; do
 	echo linking $base 
 	ln -s ../extend/addon/$1/$base $base
 done
+
+for x in `ls` ; do 
+	if [ -L "$x" ] && ! [ -e "$x" ]; then 
+		echo "removing dead symlink $x" ; 
+		rm -- "$x"; 
+	fi;
+done
author	Mario Vavti <mario@mariovavti.com>	2018-10-19 11:18:28 +0200
committer	Mario Vavti <mario@mariovavti.com>	2018-10-19 11:18:28 +0200
commit	fa9e9510e5d993d183feb942fe74be5fdd07f5cf (patch)
tree	41fec09f527a9346e043b8099b458a97d81b03ed /util
parent	32de123db0ac526795a237ff46885fe8a332cbc0 (diff)
parent	06b3ad1071c755757555baf941e2c0f446f97b21 (diff)
download	volse-hubzilla-fa9e9510e5d993d183feb942fe74be5fdd07f5cf.tar.gz volse-hubzilla-fa9e9510e5d993d183feb942fe74be5fdd07f5cf.tar.bz2 volse-hubzilla-fa9e9510e5d993d183feb942fe74be5fdd07f5cf.zip