Merge branch 2.2RC2.2

author: Mario Vavti <mario@mariovavti.com> 2017-03-08 09:39:46 +0100
committer: Mario Vavti <mario@mariovavti.com> 2017-03-08 09:39:46 +0100
commit: bc2b948f1f6e62b1c277a4042200bb6678956f3f (patch)
tree: 8586c30e495607eee23f16c0aad40974f0711275 /util
parent: 23e3e2c50499fab52769929a448e73012fd915af (diff)
parent: ff9442474d07cce24c8f66db39ec34471c3874a2 (diff)
download: volse-hubzilla-bc2b948f1f6e62b1c277a4042200bb6678956f3f.tar.gz
volse-hubzilla-bc2b948f1f6e62b1c277a4042200bb6678956f3f.tar.bz2
volse-hubzilla-bc2b948f1f6e62b1c277a4042200bb6678956f3f.zip
5 files changed, 4410 insertions, 3985 deletions
diff --git a/util/hmessages.po b/util/hmessages.po
index 5d0ffd75a..867d1f1ce 100644
--- a/util/hmessages.po
+++ b/util/hmessages.po
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: 1.15.2\n"
+"Project-Id-Version: 2.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-12-09 00:05-0800\n"
+"POT-Creation-Date: 2017-02-17 00:05-0800\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,90 +17,90 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../../Zotlabs/Access/PermissionRoles.php:227
+#: ../../Zotlabs/Access/PermissionRoles.php:248
 #: ../../include/permissions.php:945
 msgid "Social Networking"
 msgstr ""
 
-#: ../../Zotlabs/Access/PermissionRoles.php:228
+#: ../../Zotlabs/Access/PermissionRoles.php:249
 #: ../../include/permissions.php:945
 msgid "Social - Mostly Public"
 msgstr ""
 
-#: ../../Zotlabs/Access/PermissionRoles.php:229
+#: ../../Zotlabs/Access/PermissionRoles.php:250
 #: ../../include/permissions.php:945
 msgid "Social - Restricted"
 msgstr ""
 
-#: ../../Zotlabs/Access/PermissionRoles.php:230
+#: ../../Zotlabs/Access/PermissionRoles.php:251
 #: ../../include/permissions.php:945
 msgid "Social - Private"
 msgstr ""
 
-#: ../../Zotlabs/Access/PermissionRoles.php:233
+#: ../../Zotlabs/Access/PermissionRoles.php:254
 #: ../../include/permissions.php:946
 msgid "Community Forum"
 msgstr ""
 
-#: ../../Zotlabs/Access/PermissionRoles.php:234
+#: ../../Zotlabs/Access/PermissionRoles.php:255
 #: ../../include/permissions.php:946
 msgid "Forum - Mostly Public"
 msgstr ""
 
-#: ../../Zotlabs/Access/PermissionRoles.php:235
+#: ../../Zotlabs/Access/PermissionRoles.php:256
 #: ../../include/permissions.php:946
 msgid "Forum - Restricted"
 msgstr ""
 
-#: ../../Zotlabs/Access/PermissionRoles.php:236
+#: ../../Zotlabs/Access/PermissionRoles.php:257
 #: ../../include/permissions.php:946
 msgid "Forum - Private"
 msgstr ""
 
-#: ../../Zotlabs/Access/PermissionRoles.php:239
+#: ../../Zotlabs/Access/PermissionRoles.php:260
 #: ../../include/permissions.php:947
 msgid "Feed Republish"
 msgstr ""
 
-#: ../../Zotlabs/Access/PermissionRoles.php:240
+#: ../../Zotlabs/Access/PermissionRoles.php:261
 #: ../../include/permissions.php:947
 msgid "Feed - Mostly Public"
 msgstr ""
 
-#: ../../Zotlabs/Access/PermissionRoles.php:241
+#: ../../Zotlabs/Access/PermissionRoles.php:262
 #: ../../include/permissions.php:947
 msgid "Feed - Restricted"
 msgstr ""
 
-#: ../../Zotlabs/Access/PermissionRoles.php:244
+#: ../../Zotlabs/Access/PermissionRoles.php:265
 #: ../../include/permissions.php:948
 msgid "Special Purpose"
 msgstr ""
 
-#: ../../Zotlabs/Access/PermissionRoles.php:245
+#: ../../Zotlabs/Access/PermissionRoles.php:266
 #: ../../include/permissions.php:948
 msgid "Special - Celebrity/Soapbox"
 msgstr ""
 
-#: ../../Zotlabs/Access/PermissionRoles.php:246
+#: ../../Zotlabs/Access/PermissionRoles.php:267
 #: ../../include/permissions.php:948
 msgid "Special - Group Repository"
 msgstr ""
 
-#: ../../Zotlabs/Access/PermissionRoles.php:249
-#: ../../Zotlabs/Module/Register.php:213
+#: ../../Zotlabs/Access/PermissionRoles.php:270
+#: ../../Zotlabs/Module/Register.php:213 ../../Zotlabs/Module/Connedit.php:879
 #: ../../Zotlabs/Module/New_channel.php:132
-#: ../../Zotlabs/Module/Settings/Channel.php:445
-#: ../../extend/addon/addon/cdav/cdav.php:277
-#: ../../extend/addon/addon/cdav/cdav.php:284
+#: ../../Zotlabs/Module/Settings/Channel.php:463
 #: ../../extend/addon/addon/cdav/Mod_Cdav.php:1148
-#: ../../include/selectors.php:49 ../../include/selectors.php:66
-#: ../../include/selectors.php:104 ../../include/selectors.php:140
-#: ../../include/permissions.php:949
+#: ../../extend/addon/addon/cdav/cdav.php:277
+#: ../../extend/addon/addon/cdav/cdav.php:284 ../../include/selectors.php:49
+#: ../../include/selectors.php:66 ../../include/selectors.php:104
+#: ../../include/selectors.php:140 ../../include/connections.php:901
+#: ../../include/connections.php:908 ../../include/permissions.php:949
 msgid "Other"
 msgstr ""
 
-#: ../../Zotlabs/Access/PermissionRoles.php:250
+#: ../../Zotlabs/Access/PermissionRoles.php:271
 #: ../../include/permissions.php:949
 msgid "Custom/Expert Mode"
 msgstr ""
@@ -134,38 +134,46 @@ msgid "Can view my channel webpages"
 msgstr ""
 
 #: ../../Zotlabs/Access/Permissions.php:53
-msgid "Can create/edit my channel webpages"
+msgid "Can view my wiki pages"
 msgstr ""
 
 #: ../../Zotlabs/Access/Permissions.php:54
+msgid "Can create/edit my channel webpages"
+msgstr ""
+
+#: ../../Zotlabs/Access/Permissions.php:55
+msgid "Can write to my wiki pages"
+msgstr ""
+
+#: ../../Zotlabs/Access/Permissions.php:56
 msgid "Can post on my channel (wall) page"
 msgstr ""
 
-#: ../../Zotlabs/Access/Permissions.php:55 ../../include/permissions.php:44
+#: ../../Zotlabs/Access/Permissions.php:57 ../../include/permissions.php:44
 msgid "Can comment on or like my posts"
 msgstr ""
 
-#: ../../Zotlabs/Access/Permissions.php:56 ../../include/permissions.php:45
+#: ../../Zotlabs/Access/Permissions.php:58 ../../include/permissions.php:45
 msgid "Can send me private mail messages"
 msgstr ""
 
-#: ../../Zotlabs/Access/Permissions.php:57
+#: ../../Zotlabs/Access/Permissions.php:59
 msgid "Can like/dislike profiles and profile things"
 msgstr ""
 
-#: ../../Zotlabs/Access/Permissions.php:58
+#: ../../Zotlabs/Access/Permissions.php:60
 msgid "Can forward to all my channel connections via @+ mentions in posts"
 msgstr ""
 
-#: ../../Zotlabs/Access/Permissions.php:59
+#: ../../Zotlabs/Access/Permissions.php:61
 msgid "Can chat with me"
 msgstr ""
 
-#: ../../Zotlabs/Access/Permissions.php:60 ../../include/permissions.php:53
+#: ../../Zotlabs/Access/Permissions.php:62 ../../include/permissions.php:53
 msgid "Can source my public posts in derived channels"
 msgstr ""
 
-#: ../../Zotlabs/Access/Permissions.php:61
+#: ../../Zotlabs/Access/Permissions.php:63
 msgid "Can administer my channel"
 msgstr ""
 
@@ -173,7 +181,7 @@ msgstr ""
 msgid "parent"
 msgstr ""
 
-#: ../../Zotlabs/Storage/Browser.php:130 ../../include/text.php:2682
+#: ../../Zotlabs/Storage/Browser.php:130 ../../include/text.php:2695
 msgid "Collection"
 msgstr ""
 
@@ -197,20 +205,19 @@ msgstr ""
 msgid "Schedule Outbox"
 msgstr ""
 
-#: ../../Zotlabs/Storage/Browser.php:163 ../../Zotlabs/Module/Photos.php:789
-#: ../../Zotlabs/Module/Photos.php:1249
-#: ../../Zotlabs/Module/Embedphotos.php:145 ../../Zotlabs/Lib/Apps.php:490
-#: ../../Zotlabs/Lib/Apps.php:565
+#: ../../Zotlabs/Storage/Browser.php:163 ../../Zotlabs/Module/Photos.php:784
+#: ../../Zotlabs/Module/Photos.php:1244
+#: ../../Zotlabs/Module/Embedphotos.php:145 ../../Zotlabs/Lib/Apps.php:559
+#: ../../Zotlabs/Lib/Apps.php:637
 #: ../../extend/addon/addon/cdav/Mod_Cdav.php:745
 #: ../../extend/addon/addon/cdav/Mod_Cdav.php:746
 #: ../../extend/addon/addon/cdav/Mod_Cdav.php:753
-#: ../../include/widgets.php:1754 ../../include/conversation.php:1047
+#: ../../include/conversation.php:1177 ../../include/widgets.php:1714
 msgid "Unknown"
 msgstr ""
 
 #: ../../Zotlabs/Storage/Browser.php:224 ../../Zotlabs/Module/Fbrowser.php:85
-#: ../../Zotlabs/Lib/Apps.php:217 ../../include/nav.php:96
-#: ../../include/conversation.php:1699
+#: ../../Zotlabs/Lib/Apps.php:224 ../../include/conversation.php:1843
 msgid "Files"
 msgstr ""
 
@@ -223,44 +230,48 @@ msgid "Shared"
 msgstr ""
 
 #: ../../Zotlabs/Storage/Browser.php:228 ../../Zotlabs/Storage/Browser.php:321
-#: ../../Zotlabs/Module/Menu.php:118 ../../Zotlabs/Module/New_channel.php:147
+#: ../../Zotlabs/Module/Menu.php:118 ../../Zotlabs/Module/Connedit.php:882
+#: ../../Zotlabs/Module/New_channel.php:147
 #: ../../Zotlabs/Module/Blocks.php:159 ../../Zotlabs/Module/Layouts.php:184
-#: ../../Zotlabs/Module/Webpages.php:239
+#: ../../Zotlabs/Module/Webpages.php:243
 #: ../../extend/addon/addon/cdav/include/widgets.php:127
 #: ../../extend/addon/addon/cdav/include/widgets.php:164
 #: ../../extend/addon/addon/cdav/Mod_Cdav.php:1151
-#: ../../include/widgets.php:969
 msgid "Create"
 msgstr ""
 
 #: ../../Zotlabs/Storage/Browser.php:229 ../../Zotlabs/Storage/Browser.php:323
+#: ../../Zotlabs/Module/Photos.php:811 ../../Zotlabs/Module/Photos.php:1368
 #: ../../Zotlabs/Module/Cover_photo.php:357
-#: ../../Zotlabs/Module/Photos.php:816 ../../Zotlabs/Module/Photos.php:1370
-#: ../../Zotlabs/Module/Profile_photo.php:410
+#: ../../Zotlabs/Module/Profile_photo.php:412
 #: ../../Zotlabs/Module/Embedphotos.php:157
 #: ../../extend/addon/addon/cdav/include/widgets.php:132
 #: ../../extend/addon/addon/cdav/include/widgets.php:168
-#: ../../include/widgets.php:1767
+#: ../../include/widgets.php:1727
 msgid "Upload"
 msgstr ""
 
 #: ../../Zotlabs/Storage/Browser.php:233
 #: ../../Zotlabs/Module/Admin/Channels.php:159
-#: ../../Zotlabs/Module/Sharedwithme.php:99 ../../Zotlabs/Module/Wiki.php:151
+#: ../../Zotlabs/Module/Connedit.php:867
+#: ../../Zotlabs/Module/Sharedwithme.php:99 ../../Zotlabs/Module/Wiki.php:170
 #: ../../Zotlabs/Module/Settings/Oauth.php:89
 #: ../../Zotlabs/Module/Settings/Oauth.php:115
 #: ../../Zotlabs/Module/Chat.php:250
 #: ../../extend/addon/addon/cdav/Mod_Cdav.php:1136
-#: ../../extend/addon/addon/rendezvous/rendezvous.php:132
+#: ../../extend/addon/addon/rendezvous/rendezvous.php:172
+#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:156
+#: ../../include/widgets.php:990
 msgid "Name"
 msgstr ""
 
-#: ../../Zotlabs/Storage/Browser.php:234 ../../Zotlabs/Module/Wiki.php:152
+#: ../../Zotlabs/Storage/Browser.php:234 ../../Zotlabs/Module/Wiki.php:171
+#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:157
 msgid "Type"
 msgstr ""
 
 #: ../../Zotlabs/Storage/Browser.php:235
-#: ../../Zotlabs/Module/Sharedwithme.php:101 ../../include/text.php:1390
+#: ../../Zotlabs/Module/Sharedwithme.php:101 ../../include/text.php:1408
 msgid "Size"
 msgstr ""
 
@@ -269,43 +280,46 @@ msgstr ""
 msgid "Last Modified"
 msgstr ""
 
-#: ../../Zotlabs/Storage/Browser.php:238
-#: ../../Zotlabs/Module/Connections.php:290
-#: ../../Zotlabs/Module/Connections.php:310
+#: ../../Zotlabs/Storage/Browser.php:238 ../../Zotlabs/Module/Editpost.php:85
+#: ../../Zotlabs/Module/Editblock.php:109
+#: ../../Zotlabs/Module/Connections.php:300
+#: ../../Zotlabs/Module/Connections.php:320
 #: ../../Zotlabs/Module/Admin/Profs.php:154
 #: ../../Zotlabs/Module/Editlayout.php:114
 #: ../../Zotlabs/Module/Editwebpage.php:145 ../../Zotlabs/Module/Menu.php:112
-#: ../../Zotlabs/Module/Editblock.php:109 ../../Zotlabs/Module/Editpost.php:84
 #: ../../Zotlabs/Module/Blocks.php:160 ../../Zotlabs/Module/Layouts.php:192
-#: ../../Zotlabs/Module/Webpages.php:240 ../../Zotlabs/Module/Wiki.php:144
-#: ../../Zotlabs/Module/Wiki.php:252
+#: ../../Zotlabs/Module/Webpages.php:244 ../../Zotlabs/Module/Wiki.php:163
+#: ../../Zotlabs/Module/Wiki.php:273
 #: ../../Zotlabs/Module/Settings/Oauth.php:149
-#: ../../Zotlabs/Module/Thing.php:260 ../../Zotlabs/Lib/Apps.php:341
-#: ../../Zotlabs/Lib/ThreadItem.php:106
+#: ../../Zotlabs/Module/Thing.php:260 ../../Zotlabs/Lib/ThreadItem.php:106
+#: ../../Zotlabs/Lib/Apps.php:357
 #: ../../extend/addon/addon/cdav/include/widgets.php:125
 #: ../../extend/addon/addon/cdav/include/widgets.php:161
-#: ../../include/channel.php:961 ../../include/channel.php:965
-#: ../../include/page_widgets.php:9 ../../include/page_widgets.php:39
-#: ../../include/menu.php:113 ../../include/widgets.php:965
+#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:149
+#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:251
+#: ../../include/menu.php:113 ../../include/channel.php:1044
+#: ../../include/channel.php:1048 ../../include/page_widgets.php:9
+#: ../../include/page_widgets.php:39
 msgid "Edit"
 msgstr ""
 
-#: ../../Zotlabs/Storage/Browser.php:239 ../../Zotlabs/Module/Connedit.php:635
-#: ../../Zotlabs/Module/Connections.php:263
+#: ../../Zotlabs/Storage/Browser.php:239 ../../Zotlabs/Module/Photos.php:1174
+#: ../../Zotlabs/Module/Editblock.php:134
+#: ../../Zotlabs/Module/Connections.php:271
 #: ../../Zotlabs/Module/Admin/Profs.php:155
 #: ../../Zotlabs/Module/Admin/Accounts.php:173
 #: ../../Zotlabs/Module/Admin/Channels.php:149
 #: ../../Zotlabs/Module/Editlayout.php:137
 #: ../../Zotlabs/Module/Editwebpage.php:170
-#: ../../Zotlabs/Module/Editblock.php:134 ../../Zotlabs/Module/Group.php:177
-#: ../../Zotlabs/Module/Photos.php:1179 ../../Zotlabs/Module/Blocks.php:162
-#: ../../Zotlabs/Module/Webpages.php:242
+#: ../../Zotlabs/Module/Connedit.php:626 ../../Zotlabs/Module/Connedit.php:884
+#: ../../Zotlabs/Module/Group.php:177 ../../Zotlabs/Module/Blocks.php:162
+#: ../../Zotlabs/Module/Webpages.php:246
 #: ../../Zotlabs/Module/Settings/Oauth.php:150
-#: ../../Zotlabs/Module/Thing.php:261 ../../Zotlabs/Lib/Apps.php:342
-#: ../../Zotlabs/Lib/ThreadItem.php:126
+#: ../../Zotlabs/Module/Thing.php:261 ../../Zotlabs/Lib/ThreadItem.php:126
+#: ../../Zotlabs/Lib/Apps.php:358
 #: ../../extend/addon/addon/cdav/Mod_Cdav.php:864
 #: ../../extend/addon/addon/cdav/Mod_Cdav.php:1153
-#: ../../include/conversation.php:676
+#: ../../include/conversation.php:656
 msgid "Delete"
 msgstr ""
 
@@ -335,12 +349,24 @@ msgstr ""
 msgid "Drop files here to immediately upload"
 msgstr ""
 
-#: ../../Zotlabs/Web/Router.php:67 ../../Zotlabs/Web/WebServer.php:128
+#: ../../Zotlabs/Web/WebServer.php:127 ../../Zotlabs/Module/Like.php:283
+#: ../../Zotlabs/Module/Group.php:72 ../../Zotlabs/Module/Dreport.php:10
+#: ../../Zotlabs/Module/Dreport.php:68
+#: ../../Zotlabs/Module/Import_items.php:114
+#: ../../Zotlabs/Module/Profperm.php:28 ../../Zotlabs/Module/Subthread.php:62
+#: ../../extend/addon/addon/frphotos/frphotos.php:81
+#: ../../extend/addon/addon/redfiles/redfiles.php:109
+#: ../../extend/addon/addon/redphotos/redphotos.php:119
+#: ../../include/items.php:327
+msgid "Permission denied"
+msgstr ""
+
+#: ../../Zotlabs/Web/WebServer.php:128 ../../Zotlabs/Web/Router.php:67
 #: ../../Zotlabs/Module/Achievements.php:34
-#: ../../Zotlabs/Module/Register.php:77 ../../Zotlabs/Module/Connedit.php:397
-#: ../../Zotlabs/Module/Authtest.php:16 ../../Zotlabs/Module/Bookmarks.php:61
-#: ../../Zotlabs/Module/Locs.php:87 ../../Zotlabs/Module/Page.php:35
-#: ../../Zotlabs/Module/Page.php:91 ../../Zotlabs/Module/Manage.php:10
+#: ../../Zotlabs/Module/Register.php:77 ../../Zotlabs/Module/Photos.php:73
+#: ../../Zotlabs/Module/Editpost.php:17 ../../Zotlabs/Module/Authtest.php:16
+#: ../../Zotlabs/Module/Bookmarks.php:61 ../../Zotlabs/Module/Editblock.php:67
+#: ../../Zotlabs/Module/Page.php:35 ../../Zotlabs/Module/Page.php:91
 #: ../../Zotlabs/Module/Connections.php:33
 #: ../../Zotlabs/Module/Cover_photo.php:277
 #: ../../Zotlabs/Module/Cover_photo.php:290
@@ -349,83 +375,69 @@ msgstr ""
 #: ../../Zotlabs/Module/Editwebpage.php:68
 #: ../../Zotlabs/Module/Editwebpage.php:89
 #: ../../Zotlabs/Module/Editwebpage.php:104
-#: ../../Zotlabs/Module/Editwebpage.php:126
-#: ../../Zotlabs/Module/Channel.php:107 ../../Zotlabs/Module/Channel.php:237
-#: ../../Zotlabs/Module/Channel.php:277 ../../Zotlabs/Module/Network.php:15
-#: ../../Zotlabs/Module/Menu.php:78 ../../Zotlabs/Module/Appman.php:75
+#: ../../Zotlabs/Module/Editwebpage.php:126 ../../Zotlabs/Module/Like.php:181
+#: ../../Zotlabs/Module/Network.php:15 ../../Zotlabs/Module/Menu.php:78
+#: ../../Zotlabs/Module/Locs.php:87 ../../Zotlabs/Module/Connedit.php:388
 #: ../../Zotlabs/Module/Filestorage.php:23
 #: ../../Zotlabs/Module/Filestorage.php:78
 #: ../../Zotlabs/Module/Filestorage.php:93
-#: ../../Zotlabs/Module/Filestorage.php:120 ../../Zotlabs/Module/Item.php:220
-#: ../../Zotlabs/Module/Item.php:230 ../../Zotlabs/Module/Item.php:1098
-#: ../../Zotlabs/Module/Settings.php:59 ../../Zotlabs/Module/Mail.php:135
+#: ../../Zotlabs/Module/Filestorage.php:120
+#: ../../Zotlabs/Module/Settings.php:59 ../../Zotlabs/Module/Group.php:13
 #: ../../Zotlabs/Module/Block.php:26 ../../Zotlabs/Module/Block.php:76
-#: ../../Zotlabs/Module/Invite.php:17 ../../Zotlabs/Module/Invite.php:94
-#: ../../Zotlabs/Module/Editblock.php:67 ../../Zotlabs/Module/Group.php:13
-#: ../../Zotlabs/Module/Mitem.php:115 ../../Zotlabs/Module/Message.php:18
-#: ../../Zotlabs/Module/Mood.php:116 ../../Zotlabs/Module/Photos.php:73
-#: ../../Zotlabs/Module/Setup.php:212 ../../Zotlabs/Module/Editpost.php:17
-#: ../../Zotlabs/Module/New_channel.php:77
-#: ../../Zotlabs/Module/New_channel.php:104
+#: ../../Zotlabs/Module/Manage.php:10 ../../Zotlabs/Module/Mitem.php:115
+#: ../../Zotlabs/Module/Appman.php:81 ../../Zotlabs/Module/Mood.php:116
+#: ../../Zotlabs/Module/Profiles.php:198 ../../Zotlabs/Module/Profiles.php:636
+#: ../../Zotlabs/Module/Api.php:24 ../../Zotlabs/Module/Invite.php:17
+#: ../../Zotlabs/Module/Invite.php:94 ../../Zotlabs/Module/New_channel.php:77
+#: ../../Zotlabs/Module/New_channel.php:104 ../../Zotlabs/Module/Setup.php:212
 #: ../../Zotlabs/Module/Notifications.php:11 ../../Zotlabs/Module/Poke.php:137
-#: ../../Zotlabs/Module/Profiles.php:197 ../../Zotlabs/Module/Profiles.php:595
-#: ../../Zotlabs/Module/Profile.php:68 ../../Zotlabs/Module/Profile.php:76
-#: ../../Zotlabs/Module/Blocks.php:73 ../../Zotlabs/Module/Blocks.php:80
-#: ../../Zotlabs/Module/Layouts.php:71 ../../Zotlabs/Module/Layouts.php:78
-#: ../../Zotlabs/Module/Layouts.php:89 ../../Zotlabs/Module/Rate.php:113
-#: ../../Zotlabs/Module/Like.php:181
-#: ../../Zotlabs/Module/Profile_photo.php:273
-#: ../../Zotlabs/Module/Profile_photo.php:286
-#: ../../Zotlabs/Module/Common.php:39 ../../Zotlabs/Module/Api.php:24
-#: ../../Zotlabs/Module/Regmod.php:21 ../../Zotlabs/Module/Pdledit.php:29
+#: ../../Zotlabs/Module/Item.php:220 ../../Zotlabs/Module/Item.php:230
+#: ../../Zotlabs/Module/Item.php:1067 ../../Zotlabs/Module/Profile.php:70
+#: ../../Zotlabs/Module/Profile.php:87 ../../Zotlabs/Module/Blocks.php:73
+#: ../../Zotlabs/Module/Blocks.php:80 ../../Zotlabs/Module/Layouts.php:71
+#: ../../Zotlabs/Module/Layouts.php:78 ../../Zotlabs/Module/Layouts.php:89
+#: ../../Zotlabs/Module/Rate.php:113
+#: ../../Zotlabs/Module/Profile_photo.php:274
+#: ../../Zotlabs/Module/Profile_photo.php:287
+#: ../../Zotlabs/Module/Events.php:271 ../../Zotlabs/Module/Common.php:39
+#: ../../Zotlabs/Module/Channel.php:107 ../../Zotlabs/Module/Channel.php:237
+#: ../../Zotlabs/Module/Channel.php:277 ../../Zotlabs/Module/Regmod.php:21
+#: ../../Zotlabs/Module/Pdledit.php:29 ../../Zotlabs/Module/Message.php:18
 #: ../../Zotlabs/Module/Service_limits.php:11
 #: ../../Zotlabs/Module/Webpages.php:116
-#: ../../Zotlabs/Module/Sharedwithme.php:11 ../../Zotlabs/Module/Wiki.php:189
-#: ../../Zotlabs/Module/Wiki.php:302 ../../Zotlabs/Module/Sources.php:74
+#: ../../Zotlabs/Module/Sharedwithme.php:11 ../../Zotlabs/Module/Wiki.php:49
+#: ../../Zotlabs/Module/Wiki.php:214 ../../Zotlabs/Module/Wiki.php:313
+#: ../../Zotlabs/Module/Wiki.php:318 ../../Zotlabs/Module/Sources.php:74
 #: ../../Zotlabs/Module/Suggest.php:30 ../../Zotlabs/Module/Thing.php:274
 #: ../../Zotlabs/Module/Thing.php:294 ../../Zotlabs/Module/Thing.php:335
+#: ../../Zotlabs/Module/Mail.php:164
 #: ../../Zotlabs/Module/Viewconnections.php:28
 #: ../../Zotlabs/Module/Viewconnections.php:33
 #: ../../Zotlabs/Module/Viewsrc.php:18 ../../Zotlabs/Module/Chat.php:100
-#: ../../Zotlabs/Module/Chat.php:105 ../../Zotlabs/Module/Events.php:267
-#: ../../Zotlabs/Lib/Chatroom.php:137
+#: ../../Zotlabs/Module/Chat.php:105 ../../Zotlabs/Lib/Chatroom.php:137
 #: ../../extend/addon/addon/friendica/dfrn_confirm.php:55
 #: ../../extend/addon/addon/keepout/keepout.php:36
 #: ../../extend/addon/addon/pumpio/pumpio.php:40
 #: ../../extend/addon/addon/openid/Mod_Id.php:53
 #: ../../extend/addon/addon/diaspora_reconnect/diaspora_reconnect.php:58
-#: ../../include/items.php:3422 ../../include/attach.php:142
-#: ../../include/attach.php:189 ../../include/attach.php:253
-#: ../../include/attach.php:267 ../../include/attach.php:274
-#: ../../include/attach.php:341 ../../include/attach.php:355
-#: ../../include/attach.php:362 ../../include/attach.php:439
-#: ../../include/attach.php:906 ../../include/attach.php:977
-#: ../../include/attach.php:1135 ../../include/photos.php:27
+#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:194
+#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:291
+#: ../../include/attach.php:144 ../../include/attach.php:191
+#: ../../include/attach.php:255 ../../include/attach.php:269
+#: ../../include/attach.php:276 ../../include/attach.php:343
+#: ../../include/attach.php:357 ../../include/attach.php:364
+#: ../../include/attach.php:441 ../../include/attach.php:908
+#: ../../include/attach.php:979 ../../include/attach.php:1137
+#: ../../include/photos.php:27 ../../include/items.php:3445
 msgid "Permission denied."
 msgstr ""
 
-#: ../../Zotlabs/Web/Router.php:148 ../../include/help.php:63
-msgid "Not Found"
-msgstr ""
-
-#: ../../Zotlabs/Web/Router.php:151 ../../Zotlabs/Module/Page.php:94
-#: ../../Zotlabs/Module/Display.php:120 ../../Zotlabs/Module/Block.php:79
-#: ../../include/help.php:66
+#: ../../Zotlabs/Web/Router.php:152 ../../Zotlabs/Module/Display.php:124
+#: ../../Zotlabs/Module/Page.php:94 ../../Zotlabs/Module/Block.php:79
+#: ../../Zotlabs/Lib/NativeWikiPage.php:502 ../../include/help.php:66
 msgid "Page not found."
 msgstr ""
 
-#: ../../Zotlabs/Web/WebServer.php:127 ../../Zotlabs/Module/Dreport.php:10
-#: ../../Zotlabs/Module/Dreport.php:68
-#: ../../Zotlabs/Module/Import_items.php:114 ../../Zotlabs/Module/Group.php:72
-#: ../../Zotlabs/Module/Profperm.php:28 ../../Zotlabs/Module/Like.php:283
-#: ../../Zotlabs/Module/Subthread.php:62
-#: ../../extend/addon/addon/frphotos/frphotos.php:81
-#: ../../extend/addon/addon/redfiles/redfiles.php:109
-#: ../../extend/addon/addon/redphotos/redphotos.php:119
-#: ../../include/items.php:327
-msgid "Permission denied"
-msgstr ""
-
 #: ../../Zotlabs/Zot/Auth.php:138
 msgid ""
 "Remote authentication blocked. You are logged into this site locally. Please "
@@ -434,19 +446,19 @@ msgstr ""
 
 #: ../../Zotlabs/Zot/Auth.php:250
 #: ../../extend/addon/addon/openid/Mod_Openid.php:76
-#: ../../extend/addon/addon/openid/Mod_Openid.php:183
+#: ../../extend/addon/addon/openid/Mod_Openid.php:178
 #, php-format
 msgid "Welcome %s. Remote authentication successful."
 msgstr ""
 
 #: ../../Zotlabs/Module/Achievements.php:15
-#: ../../Zotlabs/Module/Connect.php:17 ../../Zotlabs/Module/Editlayout.php:31
+#: ../../Zotlabs/Module/Connect.php:17 ../../Zotlabs/Module/Editblock.php:31
+#: ../../Zotlabs/Module/Editlayout.php:31
 #: ../../Zotlabs/Module/Editwebpage.php:32
-#: ../../Zotlabs/Module/Filestorage.php:59
-#: ../../Zotlabs/Module/Editblock.php:31 ../../Zotlabs/Module/Hcard.php:12
+#: ../../Zotlabs/Module/Filestorage.php:59 ../../Zotlabs/Module/Hcard.php:12
 #: ../../Zotlabs/Module/Profile.php:20 ../../Zotlabs/Module/Blocks.php:33
 #: ../../Zotlabs/Module/Layouts.php:31 ../../Zotlabs/Module/Webpages.php:33
-#: ../../include/channel.php:862
+#: ../../include/channel.php:945
 msgid "Requested profile is not available."
 msgstr ""
 
@@ -454,12 +466,20 @@ msgstr ""
 msgid "Some blurb about what to do when you're new here"
 msgstr ""
 
-#: ../../Zotlabs/Module/Chatsvc.php:117
-msgid "Away"
+#: ../../Zotlabs/Module/Display.php:17 ../../Zotlabs/Module/Photos.php:508
+#: ../../Zotlabs/Module/Search.php:17 ../../Zotlabs/Module/Ratings.php:83
+#: ../../Zotlabs/Module/Directory.php:64
+#: ../../Zotlabs/Module/Viewconnections.php:23
+#: ../../extend/addon/addon/friendica/dfrn_request.php:794
+msgid "Public access denied."
 msgstr ""
 
-#: ../../Zotlabs/Module/Chatsvc.php:122
-msgid "Online"
+#: ../../Zotlabs/Module/Display.php:38 ../../Zotlabs/Module/Admin.php:60
+#: ../../Zotlabs/Module/Admin/Themes.php:69
+#: ../../Zotlabs/Module/Admin/Plugins.php:254
+#: ../../Zotlabs/Module/Filestorage.php:32 ../../Zotlabs/Module/Thing.php:89
+#: ../../Zotlabs/Module/Viewsrc.php:24 ../../include/items.php:3366
+msgid "Item not found."
 msgstr ""
 
 #: ../../Zotlabs/Module/Register.php:49
@@ -593,8 +613,8 @@ msgstr ""
 msgid "Membership on this site is by invitation only."
 msgstr ""
 
-#: ../../Zotlabs/Module/Register.php:270 ../../include/nav.php:150
-#: ../../boot.php:1701
+#: ../../Zotlabs/Module/Register.php:270 ../../include/nav.php:162
+#: ../../boot.php:1713
 msgid "Register"
 msgstr ""
 
@@ -609,60 +629,82 @@ msgstr ""
 msgid "Fetching URL returns error: %1$s"
 msgstr ""
 
-#: ../../Zotlabs/Module/Match.php:26
-msgid "Profile Match"
+#: ../../Zotlabs/Module/Photos.php:82
+msgid "Page owner information could not be retrieved."
 msgstr ""
 
-#: ../../Zotlabs/Module/Match.php:35
-msgid "No keywords to match. Please add keywords to your default profile."
+#: ../../Zotlabs/Module/Photos.php:97 ../../Zotlabs/Module/Photos.php:729
+#: ../../Zotlabs/Module/Profile_photo.php:115
+#: ../../Zotlabs/Module/Profile_photo.php:220
+#: ../../include/photo/photo_driver.php:730
+msgid "Profile Photos"
 msgstr ""
 
-#: ../../Zotlabs/Module/Match.php:67
-msgid "is interested in:"
+#: ../../Zotlabs/Module/Photos.php:103 ../../Zotlabs/Module/Photos.php:129
+msgid "Album not found."
 msgstr ""
 
-#: ../../Zotlabs/Module/Match.php:68 ../../Zotlabs/Module/Directory.php:328
-#: ../../Zotlabs/Module/Suggest.php:56 ../../include/channel.php:1036
-#: ../../include/connections.php:78 ../../include/widgets.php:147
-#: ../../include/widgets.php:184 ../../include/conversation.php:971
-msgid "Connect"
+#: ../../Zotlabs/Module/Photos.php:112
+msgid "Delete Album"
+msgstr ""
+
+#: ../../Zotlabs/Module/Photos.php:133
+msgid ""
+"Multiple storage folders exist with this album name, but within different "
+"directories. Please remove the desired folder or folders using the Files "
+"manager"
 msgstr ""
 
-#: ../../Zotlabs/Module/Match.php:74
-msgid "No matches"
+#: ../../Zotlabs/Module/Photos.php:190 ../../Zotlabs/Module/Photos.php:1054
+msgid "Delete Photo"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:82
-msgid "Could not access contact record."
+#: ../../Zotlabs/Module/Photos.php:519
+msgid "No photos selected"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:106
-msgid "Could not locate selected profile."
+#: ../../Zotlabs/Module/Photos.php:568
+msgid "Access to this item is restricted."
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:258
-msgid "Connection updated."
+#: ../../Zotlabs/Module/Photos.php:607
+#, php-format
+msgid "%1$.2f MB of %2$.2f MB photo storage used."
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:260
-msgid "Failed to update connection record."
+#: ../../Zotlabs/Module/Photos.php:610
+#, php-format
+msgid "%1$.2f MB photo storage used."
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:310
-msgid "is now connected to"
+#: ../../Zotlabs/Module/Photos.php:646
+msgid "Upload Photos"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:411 ../../Zotlabs/Module/Connedit.php:716
-#: ../../Zotlabs/Module/Admin/Site.php:218 ../../Zotlabs/Module/Menu.php:100
-#: ../../Zotlabs/Module/Menu.php:157 ../../Zotlabs/Module/Filestorage.php:160
+#: ../../Zotlabs/Module/Photos.php:650
+msgid "Enter an album name"
+msgstr ""
+
+#: ../../Zotlabs/Module/Photos.php:651
+msgid "or select an existing album (doubleclick)"
+msgstr ""
+
+#: ../../Zotlabs/Module/Photos.php:652
+msgid "Create a status post for this upload"
+msgstr ""
+
+#: ../../Zotlabs/Module/Photos.php:652 ../../Zotlabs/Module/Admin/Site.php:218
+#: ../../Zotlabs/Module/Menu.php:100 ../../Zotlabs/Module/Menu.php:157
+#: ../../Zotlabs/Module/Connedit.php:402 ../../Zotlabs/Module/Connedit.php:740
+#: ../../Zotlabs/Module/Filestorage.php:160
 #: ../../Zotlabs/Module/Filestorage.php:168 ../../Zotlabs/Module/Mitem.php:162
 #: ../../Zotlabs/Module/Mitem.php:163 ../../Zotlabs/Module/Mitem.php:240
-#: ../../Zotlabs/Module/Mitem.php:241 ../../Zotlabs/Module/Photos.php:653
-#: ../../Zotlabs/Module/Profiles.php:641 ../../Zotlabs/Module/Api.php:97
-#: ../../Zotlabs/Module/Removeme.php:63 ../../Zotlabs/Module/Wiki.php:159
-#: ../../Zotlabs/Module/Settings/Channel.php:289
+#: ../../Zotlabs/Module/Mitem.php:241 ../../Zotlabs/Module/Profiles.php:682
+#: ../../Zotlabs/Module/Api.php:97 ../../Zotlabs/Module/Events.php:470
+#: ../../Zotlabs/Module/Events.php:471 ../../Zotlabs/Module/Removeme.php:63
+#: ../../Zotlabs/Module/Wiki.php:178
+#: ../../Zotlabs/Module/Settings/Channel.php:294
 #: ../../Zotlabs/Module/Settings/Display.php:103
-#: ../../Zotlabs/Module/Events.php:463 ../../Zotlabs/Module/Events.php:464
 #: ../../extend/addon/addon/dwpost/dwpost.php:73
 #: ../../extend/addon/addon/dwpost/dwpost.php:85
 #: ../../extend/addon/addon/flattrwidget/flattrwidget.php:120
@@ -707,24 +749,26 @@ msgstr ""
 #: ../../extend/addon/addon/wppost/wppost.php:105
 #: ../../extend/addon/addon/wppost/wppost.php:109
 #: ../../extend/addon/addon/xmpp/xmpp.php:53
-#: ../../extend/addon/addon/cdav/cdav.php:234 ../../include/dir_fns.php:143
-#: ../../include/dir_fns.php:144 ../../include/dir_fns.php:145
-#: ../../include/widgets.php:978 ../../view/theme/redbasic/php/config.php:111
-#: ../../view/theme/redbasic/php/config.php:136 ../../boot.php:1723
+#: ../../extend/addon/addon/cdav/cdav.php:234
+#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:164
+#: ../../include/dir_fns.php:143 ../../include/dir_fns.php:144
+#: ../../include/dir_fns.php:145 ../../view/theme/redbasic/php/config.php:111
+#: ../../view/theme/redbasic/php/config.php:136 ../../boot.php:1736
 msgid "No"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:411
-#: ../../Zotlabs/Module/Admin/Site.php:220 ../../Zotlabs/Module/Menu.php:100
-#: ../../Zotlabs/Module/Menu.php:157 ../../Zotlabs/Module/Filestorage.php:160
+#: ../../Zotlabs/Module/Photos.php:652 ../../Zotlabs/Module/Admin/Site.php:220
+#: ../../Zotlabs/Module/Menu.php:100 ../../Zotlabs/Module/Menu.php:157
+#: ../../Zotlabs/Module/Connedit.php:402
+#: ../../Zotlabs/Module/Filestorage.php:160
 #: ../../Zotlabs/Module/Filestorage.php:168 ../../Zotlabs/Module/Mitem.php:162
 #: ../../Zotlabs/Module/Mitem.php:163 ../../Zotlabs/Module/Mitem.php:240
-#: ../../Zotlabs/Module/Mitem.php:241 ../../Zotlabs/Module/Photos.php:653
-#: ../../Zotlabs/Module/Profiles.php:641 ../../Zotlabs/Module/Api.php:96
-#: ../../Zotlabs/Module/Removeme.php:63 ../../Zotlabs/Module/Wiki.php:159
-#: ../../Zotlabs/Module/Settings/Channel.php:289
+#: ../../Zotlabs/Module/Mitem.php:241 ../../Zotlabs/Module/Profiles.php:682
+#: ../../Zotlabs/Module/Api.php:96 ../../Zotlabs/Module/Events.php:470
+#: ../../Zotlabs/Module/Events.php:471 ../../Zotlabs/Module/Removeme.php:63
+#: ../../Zotlabs/Module/Wiki.php:178
+#: ../../Zotlabs/Module/Settings/Channel.php:294
 #: ../../Zotlabs/Module/Settings/Display.php:103
-#: ../../Zotlabs/Module/Events.php:463 ../../Zotlabs/Module/Events.php:464
 #: ../../extend/addon/addon/dwpost/dwpost.php:73
 #: ../../extend/addon/addon/dwpost/dwpost.php:85
 #: ../../extend/addon/addon/flattrwidget/flattrwidget.php:120
@@ -769,594 +813,585 @@ msgstr ""
 #: ../../extend/addon/addon/wppost/wppost.php:105
 #: ../../extend/addon/addon/wppost/wppost.php:109
 #: ../../extend/addon/addon/xmpp/xmpp.php:53
-#: ../../extend/addon/addon/cdav/cdav.php:234 ../../include/dir_fns.php:143
-#: ../../include/dir_fns.php:144 ../../include/dir_fns.php:145
-#: ../../include/widgets.php:978 ../../view/theme/redbasic/php/config.php:111
-#: ../../view/theme/redbasic/php/config.php:136 ../../boot.php:1723
+#: ../../extend/addon/addon/cdav/cdav.php:234
+#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:164
+#: ../../include/dir_fns.php:143 ../../include/dir_fns.php:144
+#: ../../include/dir_fns.php:145 ../../view/theme/redbasic/php/config.php:111
+#: ../../view/theme/redbasic/php/config.php:136 ../../boot.php:1736
 msgid "Yes"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:443
-msgid "Could not access address book record."
-msgstr ""
-
-#: ../../Zotlabs/Module/Connedit.php:463
-msgid "Refresh failed - channel is currently unavailable."
-msgstr ""
-
-#: ../../Zotlabs/Module/Connedit.php:478 ../../Zotlabs/Module/Connedit.php:487
-#: ../../Zotlabs/Module/Connedit.php:496 ../../Zotlabs/Module/Connedit.php:505
-#: ../../Zotlabs/Module/Connedit.php:518
-msgid "Unable to set address book parameters."
-msgstr ""
-
-#: ../../Zotlabs/Module/Connedit.php:542
-msgid "Connection has been removed."
-msgstr ""
-
-#: ../../Zotlabs/Module/Connedit.php:582 ../../Zotlabs/Lib/Apps.php:221
-#: ../../extend/addon/addon/openclipatar/openclipatar.php:56
-#: ../../include/nav.php:89 ../../include/conversation.php:969
-msgid "View Profile"
-msgstr ""
-
-#: ../../Zotlabs/Module/Connedit.php:585
-#, php-format
-msgid "View %s's profile"
-msgstr ""
-
-#: ../../Zotlabs/Module/Connedit.php:589
-msgid "Refresh Permissions"
+#: ../../Zotlabs/Module/Photos.php:653
+msgid "Caption (optional):"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:592
-msgid "Fetch updated permissions"
+#: ../../Zotlabs/Module/Photos.php:654
+msgid "Description (optional):"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:596
-msgid "Recent Activity"
+#: ../../Zotlabs/Module/Photos.php:657 ../../Zotlabs/Module/Photos.php:1042
+#: ../../Zotlabs/Module/Connedit.php:637
+#: ../../Zotlabs/Module/Filestorage.php:152 ../../Zotlabs/Module/Thing.php:313
+#: ../../Zotlabs/Module/Thing.php:363 ../../Zotlabs/Module/Chat.php:234
+#: ../../include/acl_selectors.php:218
+msgid "Permissions"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:599
-msgid "View recent posts and comments"
+#: ../../Zotlabs/Module/Photos.php:667 ../../Zotlabs/Module/Photos.php:1053
+#: ../../Zotlabs/Module/Photos.php:1093 ../../Zotlabs/Module/Photos.php:1211
+#: ../../Zotlabs/Module/Connect.php:98
+#: ../../Zotlabs/Module/Admin/Features.php:66
+#: ../../Zotlabs/Module/Admin/Logs.php:84
+#: ../../Zotlabs/Module/Admin/Profs.php:157
+#: ../../Zotlabs/Module/Admin/Security.php:104
+#: ../../Zotlabs/Module/Admin/Themes.php:156
+#: ../../Zotlabs/Module/Admin/Account_edit.php:74
+#: ../../Zotlabs/Module/Admin/Accounts.php:166
+#: ../../Zotlabs/Module/Admin/Channels.php:147
+#: ../../Zotlabs/Module/Admin/Site.php:260
+#: ../../Zotlabs/Module/Admin/Plugins.php:433
+#: ../../Zotlabs/Module/Locs.php:121 ../../Zotlabs/Module/Connedit.php:847
+#: ../../Zotlabs/Module/Filestorage.php:165 ../../Zotlabs/Module/Cal.php:342
+#: ../../Zotlabs/Module/Group.php:85 ../../Zotlabs/Module/Import_items.php:122
+#: ../../Zotlabs/Module/Import.php:507 ../../Zotlabs/Module/Mitem.php:243
+#: ../../Zotlabs/Module/Appman.php:133 ../../Zotlabs/Module/Mood.php:139
+#: ../../Zotlabs/Module/Profiles.php:722 ../../Zotlabs/Module/Invite.php:149
+#: ../../Zotlabs/Module/Setup.php:309 ../../Zotlabs/Module/Setup.php:357
+#: ../../Zotlabs/Module/Poke.php:186 ../../Zotlabs/Module/Pconfig.php:107
+#: ../../Zotlabs/Module/Rate.php:166 ../../Zotlabs/Module/Events.php:493
+#: ../../Zotlabs/Module/Pdledit.php:74 ../../Zotlabs/Module/Wiki.php:167
+#: ../../Zotlabs/Module/Sources.php:114 ../../Zotlabs/Module/Sources.php:149
+#: ../../Zotlabs/Module/Settings/Features.php:47
+#: ../../Zotlabs/Module/Settings/Oauth.php:87
+#: ../../Zotlabs/Module/Settings/Account.php:118
+#: ../../Zotlabs/Module/Settings/Tokens.php:168
+#: ../../Zotlabs/Module/Settings/Featured.php:50
+#: ../../Zotlabs/Module/Settings/Channel.php:476
+#: ../../Zotlabs/Module/Settings/Display.php:196
+#: ../../Zotlabs/Module/Settings/Permcats.php:112
+#: ../../Zotlabs/Module/Thing.php:320 ../../Zotlabs/Module/Thing.php:370
+#: ../../Zotlabs/Module/Mail.php:413 ../../Zotlabs/Module/Chat.php:196
+#: ../../Zotlabs/Module/Chat.php:241 ../../Zotlabs/Module/Xchan.php:15
+#: ../../Zotlabs/Lib/ThreadItem.php:731
+#: ../../extend/addon/addon/chords/Mod_Chords.php:60
+#: ../../extend/addon/addon/diaspora/diaspora.php:714
+#: ../../extend/addon/addon/dwpost/dwpost.php:89
+#: ../../extend/addon/addon/flattrwidget/flattrwidget.php:124
+#: ../../extend/addon/addon/friendica/friendica.php:128
+#: ../../extend/addon/addon/frphotos/frphotos.php:96
+#: ../../extend/addon/addon/hubwall/hubwall.php:95
+#: ../../extend/addon/addon/ijpost/ijpost.php:89
+#: ../../extend/addon/addon/irc/irc.php:53
+#: ../../extend/addon/addon/jappixmini/jappixmini.php:371
+#: ../../extend/addon/addon/libertree/libertree.php:85
+#: ../../extend/addon/addon/ljpost/ljpost.php:86
+#: ../../extend/addon/addon/logrot/logrot.php:35
+#: ../../extend/addon/addon/mailhost/mailhost.php:40
+#: ../../extend/addon/addon/nofed/nofed.php:80
+#: ../../extend/addon/addon/nsabait/nsabait.php:161
+#: ../../extend/addon/addon/nsfw/nsfw.php:92
+#: ../../extend/addon/addon/openclipatar/openclipatar.php:53
+#: ../../extend/addon/addon/openstreetmap/openstreetmap.php:168
+#: ../../extend/addon/addon/pageheader/pageheader.php:48
+#: ../../extend/addon/addon/piwik/piwik.php:95
+#: ../../extend/addon/addon/planets/planets.php:157
+#: ../../extend/addon/addon/pumpio/pumpio.php:237
+#: ../../extend/addon/addon/rainbowtag/rainbowtag.php:85
+#: ../../extend/addon/addon/redfiles/redfiles.php:124
+#: ../../extend/addon/addon/redphotos/redphotos.php:136
+#: ../../extend/addon/addon/redred/redred.php:119
+#: ../../extend/addon/addon/rtof/rtof.php:101
+#: ../../extend/addon/addon/skeleton/skeleton.php:65
+#: ../../extend/addon/addon/smileybutton/smileybutton.php:281
+#: ../../extend/addon/addon/startpage/startpage.php:113
+#: ../../extend/addon/addon/statusnet/statusnet.php:322
+#: ../../extend/addon/addon/statusnet/statusnet.php:380
+#: ../../extend/addon/addon/statusnet/statusnet.php:432
+#: ../../extend/addon/addon/statusnet/statusnet.php:899
+#: ../../extend/addon/addon/superblock/superblock.php:118
+#: ../../extend/addon/addon/twitter/twitter.php:217
+#: ../../extend/addon/addon/twitter/twitter.php:259
+#: ../../extend/addon/addon/visage/visage.php:170
+#: ../../extend/addon/addon/wppost/wppost.php:113
+#: ../../extend/addon/addon/xmpp/xmpp.php:69
+#: ../../extend/addon/addon/cdav/cdav.php:246
+#: ../../extend/addon/addon/likebanner/likebanner.php:57
+#: ../../extend/addon/addon/mailtest/mailtest.php:100
+#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:153
+#: ../../extend/addon/addon/gnusoc/gnusoc.php:133
+#: ../../include/widgets.php:815 ../../include/js_strings.php:22
+#: ../../view/theme/redbasic/php/config.php:106
+msgid "Submit"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:603
-#: ../../Zotlabs/Module/Admin/Accounts.php:175
-msgid "Unblock"
+#: ../../Zotlabs/Module/Photos.php:685
+msgid "Album name could not be decoded"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:603
-#: ../../Zotlabs/Module/Admin/Accounts.php:174
-msgid "Block"
+#: ../../Zotlabs/Module/Photos.php:729
+msgid "Contact Photos"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:606
-msgid "Block (or Unblock) all communications with this connection"
+#: ../../Zotlabs/Module/Photos.php:752
+msgid "Show Newest First"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:607
-msgid "This connection is blocked!"
+#: ../../Zotlabs/Module/Photos.php:754
+msgid "Show Oldest First"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:611
-msgid "Unignore"
+#: ../../Zotlabs/Module/Photos.php:778 ../../Zotlabs/Module/Photos.php:1335
+#: ../../Zotlabs/Module/Embedphotos.php:139 ../../include/widgets.php:1708
+msgid "View Photo"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:611
-#: ../../Zotlabs/Module/Connections.php:277
-msgid "Ignore"
+#: ../../Zotlabs/Module/Photos.php:809
+#: ../../Zotlabs/Module/Embedphotos.php:155 ../../include/widgets.php:1725
+msgid "Edit Album"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:614
-msgid "Ignore (or Unignore) all inbound communications from this connection"
+#: ../../Zotlabs/Module/Photos.php:856
+msgid "Permission denied. Access to this item may be restricted."
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:615
-msgid "This connection is ignored!"
+#: ../../Zotlabs/Module/Photos.php:858
+msgid "Photo not available"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:619
-msgid "Unarchive"
+#: ../../Zotlabs/Module/Photos.php:916
+msgid "Use as profile photo"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:619
-msgid "Archive"
+#: ../../Zotlabs/Module/Photos.php:917
+msgid "Use as cover photo"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:622
-msgid ""
-"Archive (or Unarchive) this connection - mark channel dead but keep content"
+#: ../../Zotlabs/Module/Photos.php:924
+msgid "Private Photo"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:623
-msgid "This connection is archived!"
+#: ../../Zotlabs/Module/Photos.php:935 ../../Zotlabs/Module/Cal.php:336
+#: ../../Zotlabs/Module/Cal.php:343 ../../Zotlabs/Module/Events.php:689
+#: ../../Zotlabs/Module/Events.php:698
+#: ../../extend/addon/addon/cdav/Mod_Cdav.php:846
+msgid "Previous"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:627
-msgid "Unhide"
+#: ../../Zotlabs/Module/Photos.php:939
+msgid "View Full Size"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:627
-msgid "Hide"
+#: ../../Zotlabs/Module/Photos.php:944 ../../Zotlabs/Module/Cal.php:337
+#: ../../Zotlabs/Module/Cal.php:344 ../../Zotlabs/Module/Setup.php:264
+#: ../../Zotlabs/Module/Events.php:690 ../../Zotlabs/Module/Events.php:699
+#: ../../extend/addon/addon/cdav/Mod_Cdav.php:847
+msgid "Next"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:630
-msgid "Hide or Unhide this connection from your other connections"
+#: ../../Zotlabs/Module/Photos.php:984
+#: ../../Zotlabs/Module/Admin/Plugins.php:450
+#: ../../Zotlabs/Module/Tagrm.php:137
+#: ../../extend/addon/addon/superblock/superblock.php:114
+msgid "Remove"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:631
-msgid "This connection is hidden!"
+#: ../../Zotlabs/Module/Photos.php:1028
+msgid "Edit photo"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:638
-msgid "Delete this connection"
+#: ../../Zotlabs/Module/Photos.php:1030
+msgid "Rotate CW (right)"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:655 ../../include/widgets.php:529
-msgid "Me"
+#: ../../Zotlabs/Module/Photos.php:1031
+msgid "Rotate CCW (left)"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:656 ../../include/widgets.php:530
-msgid "Family"
+#: ../../Zotlabs/Module/Photos.php:1034
+msgid "Move photo to album"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:657
-#: ../../Zotlabs/Module/Settings/Channel.php:61
-#: ../../Zotlabs/Module/Settings/Channel.php:65
-#: ../../Zotlabs/Module/Settings/Channel.php:66
-#: ../../Zotlabs/Module/Settings/Channel.php:69
-#: ../../Zotlabs/Module/Settings/Channel.php:80
-#: ../../include/selectors.php:123 ../../include/channel.php:402
-#: ../../include/channel.php:403 ../../include/channel.php:410
-#: ../../include/widgets.php:531
-msgid "Friends"
+#: ../../Zotlabs/Module/Photos.php:1035
+msgid "Enter a new album name"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:658 ../../include/widgets.php:532
-msgid "Acquaintances"
+#: ../../Zotlabs/Module/Photos.php:1036
+msgid "or select an existing one (doubleclick)"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:659
-#: ../../Zotlabs/Module/Connections.php:92
-#: ../../Zotlabs/Module/Connections.php:107 ../../include/widgets.php:533
-msgid "All"
+#: ../../Zotlabs/Module/Photos.php:1039
+msgid "Caption"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:716
-msgid "Approve this connection"
+#: ../../Zotlabs/Module/Photos.php:1041
+msgid "Add a Tag"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:716
-msgid "Accept connection to allow communication"
+#: ../../Zotlabs/Module/Photos.php:1049
+msgid "Example: @bob, @Barbara_Jensen, @jim@example.com"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:721
-msgid "Set Affinity"
+#: ../../Zotlabs/Module/Photos.php:1052
+msgid "Flag as adult in album view"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:724
-msgid "Set Profile"
+#: ../../Zotlabs/Module/Photos.php:1071 ../../Zotlabs/Lib/ThreadItem.php:268
+msgid "I like this (toggle)"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:727
-msgid "Set Affinity & Profile"
+#: ../../Zotlabs/Module/Photos.php:1072 ../../Zotlabs/Lib/ThreadItem.php:269
+msgid "I don't like this (toggle)"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:776
-msgid "none"
+#: ../../Zotlabs/Module/Photos.php:1073 ../../Zotlabs/Module/Blocks.php:161
+#: ../../Zotlabs/Module/Layouts.php:193 ../../Zotlabs/Module/Webpages.php:245
+#: ../../extend/addon/addon/cdav/include/widgets.php:123
+#: ../../include/conversation.php:1378
+msgid "Share"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:780 ../../include/widgets.php:656
-msgid "Connection Default Permissions"
+#: ../../Zotlabs/Module/Photos.php:1074 ../../Zotlabs/Lib/ThreadItem.php:411
+#: ../../include/conversation.php:738
+msgid "Please wait"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:780 ../../include/items.php:3909
-#, php-format
-msgid "Connection: %s"
+#: ../../Zotlabs/Module/Photos.php:1090 ../../Zotlabs/Module/Photos.php:1208
+#: ../../Zotlabs/Lib/ThreadItem.php:728
+msgid "This is you"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:781
-msgid "Apply these permissions automatically"
+#: ../../Zotlabs/Module/Photos.php:1092 ../../Zotlabs/Module/Photos.php:1210
+#: ../../Zotlabs/Lib/ThreadItem.php:730 ../../include/js_strings.php:6
+msgid "Comment"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:781
-msgid "Connection requests will be approved without your interaction"
+#: ../../Zotlabs/Module/Photos.php:1094 ../../Zotlabs/Module/Events.php:478
+#: ../../Zotlabs/Module/Webpages.php:251 ../../Zotlabs/Lib/ThreadItem.php:740
+#: ../../include/conversation.php:1347 ../../include/page_widgets.php:43
+msgid "Preview"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:784
-msgid "This connection's primary address is"
+#: ../../Zotlabs/Module/Photos.php:1108 ../../include/conversation.php:577
+msgctxt "title"
+msgid "Likes"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:785
-msgid "Available locations:"
+#: ../../Zotlabs/Module/Photos.php:1108 ../../include/conversation.php:577
+msgctxt "title"
+msgid "Dislikes"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:789
-msgid ""
-"The permissions indicated on this page will be applied to all new "
-"connections."
+#: ../../Zotlabs/Module/Photos.php:1109 ../../include/conversation.php:578
+msgctxt "title"
+msgid "Agree"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:790
-msgid "Connection Tools"
+#: ../../Zotlabs/Module/Photos.php:1109 ../../include/conversation.php:578
+msgctxt "title"
+msgid "Disagree"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:792
-msgid "Slide to adjust your degree of friendship"
+#: ../../Zotlabs/Module/Photos.php:1109 ../../include/conversation.php:578
+msgctxt "title"
+msgid "Abstain"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:793 ../../Zotlabs/Module/Rate.php:155
-#: ../../include/js_strings.php:20
-msgid "Rating"
+#: ../../Zotlabs/Module/Photos.php:1110 ../../include/conversation.php:579
+msgctxt "title"
+msgid "Attending"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:794
-msgid "Slide to adjust your rating"
+#: ../../Zotlabs/Module/Photos.php:1110 ../../include/conversation.php:579
+msgctxt "title"
+msgid "Not attending"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:795 ../../Zotlabs/Module/Connedit.php:800
-msgid "Optionally explain your rating"
+#: ../../Zotlabs/Module/Photos.php:1110 ../../include/conversation.php:579
+msgctxt "title"
+msgid "Might attend"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:797
-msgid "Custom Filter"
+#: ../../Zotlabs/Module/Photos.php:1127 ../../Zotlabs/Module/Photos.php:1139
+#: ../../Zotlabs/Lib/ThreadItem.php:186 ../../Zotlabs/Lib/ThreadItem.php:198
+#: ../../include/conversation.php:1928
+msgid "View all"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:798
-msgid "Only import posts with this text"
-msgstr ""
+#: ../../Zotlabs/Module/Photos.php:1131 ../../Zotlabs/Lib/ThreadItem.php:190
+#: ../../include/taxonomy.php:403 ../../include/conversation.php:1952
+#: ../../include/channel.php:1273
+msgctxt "noun"
+msgid "Like"
+msgid_plural "Likes"
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../../Zotlabs/Module/Connedit.php:798 ../../Zotlabs/Module/Connedit.php:799
-msgid ""
-"words one per line or #tags or /patterns/ or lang=xx, leave blank to import "
-"all posts"
-msgstr ""
+#: ../../Zotlabs/Module/Photos.php:1136 ../../Zotlabs/Lib/ThreadItem.php:195
+#: ../../include/conversation.php:1955
+msgctxt "noun"
+msgid "Dislike"
+msgid_plural "Dislikes"
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../../Zotlabs/Module/Connedit.php:799
-msgid "Do not import posts with this text"
+#: ../../Zotlabs/Module/Photos.php:1236
+msgid "Photo Tools"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:801
-msgid "This information is public!"
+#: ../../Zotlabs/Module/Photos.php:1245
+msgid "In This Photo:"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:806
-msgid "Connection Pending Approval"
+#: ../../Zotlabs/Module/Photos.php:1250
+msgid "Map"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:809
-#: ../../Zotlabs/Module/Settings/Tokens.php:163
-msgid "inherited"
+#: ../../Zotlabs/Module/Photos.php:1258 ../../Zotlabs/Lib/ThreadItem.php:400
+msgctxt "noun"
+msgid "Likes"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:810 ../../Zotlabs/Module/Locs.php:121
-#: ../../Zotlabs/Module/Connect.php:98
-#: ../../Zotlabs/Module/Admin/Features.php:66
-#: ../../Zotlabs/Module/Admin/Logs.php:84
-#: ../../Zotlabs/Module/Admin/Plugins.php:429
-#: ../../Zotlabs/Module/Admin/Profs.php:157
-#: ../../Zotlabs/Module/Admin/Security.php:104
-#: ../../Zotlabs/Module/Admin/Themes.php:156
-#: ../../Zotlabs/Module/Admin/Account_edit.php:74
-#: ../../Zotlabs/Module/Admin/Accounts.php:166
-#: ../../Zotlabs/Module/Admin/Channels.php:147
-#: ../../Zotlabs/Module/Admin/Site.php:260 ../../Zotlabs/Module/Appman.php:126
-#: ../../Zotlabs/Module/Filestorage.php:165 ../../Zotlabs/Module/Mail.php:384
-#: ../../Zotlabs/Module/Import_items.php:122
-#: ../../Zotlabs/Module/Invite.php:149 ../../Zotlabs/Module/Group.php:85
-#: ../../Zotlabs/Module/Mitem.php:243 ../../Zotlabs/Module/Mood.php:139
-#: ../../Zotlabs/Module/Photos.php:668 ../../Zotlabs/Module/Photos.php:1058
-#: ../../Zotlabs/Module/Photos.php:1098 ../../Zotlabs/Module/Photos.php:1216
-#: ../../Zotlabs/Module/Setup.php:309 ../../Zotlabs/Module/Setup.php:357
-#: ../../Zotlabs/Module/Poke.php:186 ../../Zotlabs/Module/Profiles.php:681
-#: ../../Zotlabs/Module/Pconfig.php:107 ../../Zotlabs/Module/Rate.php:166
-#: ../../Zotlabs/Module/Pdledit.php:74 ../../Zotlabs/Module/Cal.php:342
-#: ../../Zotlabs/Module/Wiki.php:148 ../../Zotlabs/Module/Sources.php:114
-#: ../../Zotlabs/Module/Sources.php:149
-#: ../../Zotlabs/Module/Settings/Features.php:47
-#: ../../Zotlabs/Module/Settings/Oauth.php:87
-#: ../../Zotlabs/Module/Settings/Tokens.php:167
-#: ../../Zotlabs/Module/Settings/Account.php:118
-#: ../../Zotlabs/Module/Settings/Channel.php:455
-#: ../../Zotlabs/Module/Settings/Display.php:196
-#: ../../Zotlabs/Module/Thing.php:320 ../../Zotlabs/Module/Thing.php:370
-#: ../../Zotlabs/Module/Import.php:543 ../../Zotlabs/Module/Chat.php:196
-#: ../../Zotlabs/Module/Chat.php:241 ../../Zotlabs/Module/Xchan.php:15
-#: ../../Zotlabs/Module/Events.php:484 ../../Zotlabs/Lib/ThreadItem.php:729
-#: ../../extend/addon/addon/chords/Mod_Chords.php:60
-#: ../../extend/addon/addon/diaspora/diaspora.php:710
-#: ../../extend/addon/addon/dwpost/dwpost.php:89
-#: ../../extend/addon/addon/flattrwidget/flattrwidget.php:124
-#: ../../extend/addon/addon/friendica/friendica.php:128
-#: ../../extend/addon/addon/frphotos/frphotos.php:96
-#: ../../extend/addon/addon/gnusoc/gnusoc.php:129
-#: ../../extend/addon/addon/hubwall/hubwall.php:95
-#: ../../extend/addon/addon/ijpost/ijpost.php:89
-#: ../../extend/addon/addon/irc/irc.php:53
-#: ../../extend/addon/addon/jappixmini/jappixmini.php:371
-#: ../../extend/addon/addon/libertree/libertree.php:85
-#: ../../extend/addon/addon/ljpost/ljpost.php:86
-#: ../../extend/addon/addon/logrot/logrot.php:35
-#: ../../extend/addon/addon/mailhost/mailhost.php:40
-#: ../../extend/addon/addon/nofed/nofed.php:80
-#: ../../extend/addon/addon/nsabait/nsabait.php:161
-#: ../../extend/addon/addon/nsfw/nsfw.php:92
-#: ../../extend/addon/addon/openclipatar/openclipatar.php:52
-#: ../../extend/addon/addon/openstreetmap/openstreetmap.php:168
-#: ../../extend/addon/addon/pageheader/pageheader.php:48
-#: ../../extend/addon/addon/piwik/piwik.php:95
-#: ../../extend/addon/addon/planets/planets.php:157
-#: ../../extend/addon/addon/pumpio/pumpio.php:237
-#: ../../extend/addon/addon/rainbowtag/rainbowtag.php:85
-#: ../../extend/addon/addon/redfiles/redfiles.php:124
-#: ../../extend/addon/addon/redphotos/redphotos.php:136
-#: ../../extend/addon/addon/redred/redred.php:119
-#: ../../extend/addon/addon/rtof/rtof.php:101
-#: ../../extend/addon/addon/skeleton/skeleton.php:65
-#: ../../extend/addon/addon/smileybutton/smileybutton.php:281
-#: ../../extend/addon/addon/startpage/startpage.php:113
-#: ../../extend/addon/addon/statusnet/statusnet.php:322
-#: ../../extend/addon/addon/statusnet/statusnet.php:380
-#: ../../extend/addon/addon/statusnet/statusnet.php:432
-#: ../../extend/addon/addon/statusnet/statusnet.php:899
-#: ../../extend/addon/addon/superblock/superblock.php:114
-#: ../../extend/addon/addon/twitter/twitter.php:217
-#: ../../extend/addon/addon/twitter/twitter.php:259
-#: ../../extend/addon/addon/visage/visage.php:170
-#: ../../extend/addon/addon/wppost/wppost.php:113
-#: ../../extend/addon/addon/xmpp/xmpp.php:69
-#: ../../extend/addon/addon/cdav/cdav.php:246
-#: ../../extend/addon/addon/likebanner/likebanner.php:57
-#: ../../extend/addon/addon/mailtest/mailtest.php:100
-#: ../../include/js_strings.php:22 ../../include/widgets.php:796
-#: ../../view/theme/redbasic/php/config.php:106
-msgid "Submit"
+#: ../../Zotlabs/Module/Photos.php:1259 ../../Zotlabs/Lib/ThreadItem.php:401
+msgctxt "noun"
+msgid "Dislikes"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:811
-#, php-format
-msgid ""
-"Please choose the profile you would like to display to %s when viewing your "
-"profile securely."
+#: ../../Zotlabs/Module/Photos.php:1264 ../../Zotlabs/Lib/ThreadItem.php:406
+#: ../../include/acl_selectors.php:220
+msgid "Close"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:813
-#: ../../Zotlabs/Module/Settings/Tokens.php:160
-msgid "Their Settings"
+#: ../../Zotlabs/Module/Photos.php:1341
+msgid "View Album"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:814
-#: ../../Zotlabs/Module/Settings/Tokens.php:161
-msgid "My Settings"
+#: ../../Zotlabs/Module/Photos.php:1352 ../../Zotlabs/Module/Photos.php:1365
+#: ../../Zotlabs/Module/Photos.php:1366
+msgid "Recent Photos"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:816
-#: ../../Zotlabs/Module/Settings/Tokens.php:165
-msgid "Individual Permissions"
+#: ../../Zotlabs/Module/Editpost.php:24 ../../Zotlabs/Module/Editblock.php:79
+#: ../../Zotlabs/Module/Editblock.php:95
+#: ../../Zotlabs/Module/Editlayout.php:79
+#: ../../Zotlabs/Module/Editwebpage.php:80
+msgid "Item not found"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:817
-#: ../../Zotlabs/Module/Settings/Tokens.php:166
-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."
+#: ../../Zotlabs/Module/Editpost.php:35
+msgid "Item is not editable"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:818
-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 change those settings here but they wont have "
-"any impact unless the inherited setting changes."
+#: ../../Zotlabs/Module/Editpost.php:108 ../../Zotlabs/Module/Rpost.php:138
+msgid "Edit post"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:819
-msgid "Last update:"
+#: ../../Zotlabs/Module/Acl.php:117 ../../Zotlabs/Module/Lockview.php:117
+#: ../../Zotlabs/Module/Lockview.php:153 ../../include/acl_selectors.php:183
+msgctxt "acl"
+msgid "Profile"
 msgstr ""
 
-#: ../../Zotlabs/Module/Dreport.php:45
-msgid "Invalid message"
+#: ../../Zotlabs/Module/Acl.php:344
+msgid "network"
 msgstr ""
 
-#: ../../Zotlabs/Module/Dreport.php:78
-msgid "no results"
+#: ../../Zotlabs/Module/Acl.php:354
+msgid "RSS"
 msgstr ""
 
-#: ../../Zotlabs/Module/Dreport.php:93
-msgid "channel sync processed"
+#: ../../Zotlabs/Module/Help.php:23
+msgid "Documentation Search"
 msgstr ""
 
-#: ../../Zotlabs/Module/Dreport.php:97
-msgid "queued"
+#: ../../Zotlabs/Module/Help.php:80 ../../include/conversation.php:1827
+msgid "About"
 msgstr ""
 
-#: ../../Zotlabs/Module/Dreport.php:101
-msgid "posted"
+#: ../../Zotlabs/Module/Help.php:81 ../../Zotlabs/Module/Group.php:197
+msgid "Members"
 msgstr ""
 
-#: ../../Zotlabs/Module/Dreport.php:105
-msgid "accepted for delivery"
+#: ../../Zotlabs/Module/Help.php:82
+msgid "Administrators"
 msgstr ""
 
-#: ../../Zotlabs/Module/Dreport.php:109
-msgid "updated"
+#: ../../Zotlabs/Module/Help.php:83
+msgid "Developers"
 msgstr ""
 
-#: ../../Zotlabs/Module/Dreport.php:112
-msgid "update ignored"
+#: ../../Zotlabs/Module/Help.php:84
+msgid "Tutorials"
 msgstr ""
 
-#: ../../Zotlabs/Module/Dreport.php:115
-msgid "permission denied"
+#: ../../Zotlabs/Module/Help.php:93
+msgid "$Projectname Documentation"
 msgstr ""
 
-#: ../../Zotlabs/Module/Dreport.php:119
-msgid "recipient not found"
+#: ../../Zotlabs/Module/Help.php:94
+msgid "Contents"
 msgstr ""
 
-#: ../../Zotlabs/Module/Dreport.php:122
-msgid "mail recalled"
+#: ../../Zotlabs/Module/Bookmarks.php:53
+msgid "Bookmark added"
 msgstr ""
 
-#: ../../Zotlabs/Module/Dreport.php:125
-msgid "duplicate mail received"
+#: ../../Zotlabs/Module/Bookmarks.php:75
+msgid "My Bookmarks"
 msgstr ""
 
-#: ../../Zotlabs/Module/Dreport.php:128
-msgid "mail delivered"
+#: ../../Zotlabs/Module/Bookmarks.php:86
+msgid "My Connections Bookmarks"
 msgstr ""
 
-#: ../../Zotlabs/Module/Dreport.php:148
-#, php-format
-msgid "Delivery report for %1$s"
+#: ../../Zotlabs/Module/Connect.php:61 ../../Zotlabs/Module/Connect.php:109
+msgid "Continue"
 msgstr ""
 
-#: ../../Zotlabs/Module/Dreport.php:151
-msgid "Options"
+#: ../../Zotlabs/Module/Connect.php:90
+msgid "Premium Channel Setup"
 msgstr ""
 
-#: ../../Zotlabs/Module/Dreport.php:152
-msgid "Redeliver"
+#: ../../Zotlabs/Module/Connect.php:92
+msgid "Enable premium channel connection restrictions"
 msgstr ""
 
-#: ../../Zotlabs/Module/Bookmarks.php:53
-msgid "Bookmark added"
+#: ../../Zotlabs/Module/Connect.php:93
+msgid ""
+"Please enter your restrictions or conditions, such as paypal receipt, usage "
+"guidelines, etc."
 msgstr ""
 
-#: ../../Zotlabs/Module/Bookmarks.php:75
-msgid "My Bookmarks"
+#: ../../Zotlabs/Module/Connect.php:95 ../../Zotlabs/Module/Connect.php:115
+msgid ""
+"This channel may require additional steps or acknowledgement of the "
+"following conditions prior to connecting:"
 msgstr ""
 
-#: ../../Zotlabs/Module/Bookmarks.php:86
-msgid "My Connections Bookmarks"
+#: ../../Zotlabs/Module/Connect.php:96
+msgid ""
+"Potential connections will then see the following text before proceeding:"
 msgstr ""
 
-#: ../../Zotlabs/Module/Acl.php:313
-msgid "network"
+#: ../../Zotlabs/Module/Connect.php:97 ../../Zotlabs/Module/Connect.php:118
+msgid ""
+"By continuing, I certify that I have complied with any instructions provided "
+"on this page."
 msgstr ""
 
-#: ../../Zotlabs/Module/Acl.php:323
-msgid "RSS"
+#: ../../Zotlabs/Module/Connect.php:106
+msgid "(No specific instructions have been provided by the channel owner.)"
 msgstr ""
 
-#: ../../Zotlabs/Module/Locs.php:25 ../../Zotlabs/Module/Locs.php:54
-msgid "Location not found."
+#: ../../Zotlabs/Module/Connect.php:114
+msgid "Restricted or Premium Channel"
 msgstr ""
 
-#: ../../Zotlabs/Module/Locs.php:62
-msgid "Location lookup failed."
+#: ../../Zotlabs/Module/Admin.php:94
+msgid "# Accounts"
 msgstr ""
 
-#: ../../Zotlabs/Module/Locs.php:66
-msgid ""
-"Please select another location to become primary before removing the primary "
-"location."
+#: ../../Zotlabs/Module/Admin.php:95
+msgid "# blocked accounts"
 msgstr ""
 
-#: ../../Zotlabs/Module/Locs.php:95
-msgid "Syncing locations"
+#: ../../Zotlabs/Module/Admin.php:96
+msgid "# expired accounts"
 msgstr ""
 
-#: ../../Zotlabs/Module/Locs.php:105
-msgid "No locations found."
+#: ../../Zotlabs/Module/Admin.php:97
+msgid "# expiring accounts"
 msgstr ""
 
-#: ../../Zotlabs/Module/Locs.php:116
-msgid "Manage Channel Locations"
+#: ../../Zotlabs/Module/Admin.php:108
+msgid "# Channels"
 msgstr ""
 
-#: ../../Zotlabs/Module/Locs.php:117 ../../Zotlabs/Module/Pubsites.php:51
-#: ../../Zotlabs/Module/Profiles.php:471 ../../Zotlabs/Module/Profiles.php:692
-#: ../../Zotlabs/Module/Events.php:468
-#: ../../extend/addon/addon/cdav/Mod_Cdav.php:839
-#: ../../include/js_strings.php:25
-msgid "Location"
+#: ../../Zotlabs/Module/Admin.php:109
+msgid "# primary"
 msgstr ""
 
-#: ../../Zotlabs/Module/Locs.php:118
-#: ../../Zotlabs/Module/Admin/Channels.php:160
-#: ../../Zotlabs/Module/Profiles.php:464
-#: ../../extend/addon/addon/cdav/Mod_Cdav.php:1143
-msgid "Address"
+#: ../../Zotlabs/Module/Admin.php:110
+msgid "# clones"
 msgstr ""
 
-#: ../../Zotlabs/Module/Locs.php:119
-msgid "Primary"
+#: ../../Zotlabs/Module/Admin.php:116
+msgid "Message queues"
 msgstr ""
 
-#: ../../Zotlabs/Module/Locs.php:120 ../../Zotlabs/Module/Menu.php:113
-msgid "Drop"
+#: ../../Zotlabs/Module/Admin.php:133
+msgid "Your software should be updated"
 msgstr ""
 
-#: ../../Zotlabs/Module/Locs.php:122
-msgid "Sync Now"
+#: ../../Zotlabs/Module/Admin.php:137 ../../Zotlabs/Module/Admin/Logs.php:82
+#: ../../Zotlabs/Module/Admin/Security.php:86
+#: ../../Zotlabs/Module/Admin/Themes.php:120
+#: ../../Zotlabs/Module/Admin/Themes.php:154
+#: ../../Zotlabs/Module/Admin/Accounts.php:164
+#: ../../Zotlabs/Module/Admin/Channels.php:145
+#: ../../Zotlabs/Module/Admin/Site.php:258
+#: ../../Zotlabs/Module/Admin/Plugins.php:336
+#: ../../Zotlabs/Module/Admin/Plugins.php:431
+msgid "Administration"
 msgstr ""
 
-#: ../../Zotlabs/Module/Locs.php:123
-msgid "Please wait several minutes between consecutive operations."
+#: ../../Zotlabs/Module/Admin.php:138
+msgid "Summary"
 msgstr ""
 
-#: ../../Zotlabs/Module/Locs.php:124
-msgid ""
-"When possible, drop a location by logging into that website/hub and removing "
-"your channel."
+#: ../../Zotlabs/Module/Admin.php:141
+msgid "Registered accounts"
 msgstr ""
 
-#: ../../Zotlabs/Module/Locs.php:125
-msgid "Use this form to drop the location if the hub is no longer operating."
+#: ../../Zotlabs/Module/Admin.php:142
+msgid "Pending registrations"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connect.php:61 ../../Zotlabs/Module/Connect.php:109
-msgid "Continue"
+#: ../../Zotlabs/Module/Admin.php:143
+msgid "Registered channels"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connect.php:90
-msgid "Premium Channel Setup"
+#: ../../Zotlabs/Module/Admin.php:144
+msgid "Active plugins"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connect.php:92
-msgid "Enable premium channel connection restrictions"
+#: ../../Zotlabs/Module/Admin.php:145
+msgid "Version"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connect.php:93
-msgid ""
-"Please enter your restrictions or conditions, such as paypal receipt, usage "
-"guidelines, etc."
+#: ../../Zotlabs/Module/Admin.php:146
+msgid "Repository version (master)"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connect.php:95 ../../Zotlabs/Module/Connect.php:115
-msgid ""
-"This channel may require additional steps or acknowledgement of the "
-"following conditions prior to connecting:"
+#: ../../Zotlabs/Module/Admin.php:147
+msgid "Repository version (dev)"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connect.php:96
-msgid ""
-"Potential connections will then see the following text before proceeding:"
+#: ../../Zotlabs/Module/Editblock.php:108 ../../Zotlabs/Module/Blocks.php:97
+#: ../../Zotlabs/Module/Blocks.php:155
+msgid "Block Name"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connect.php:97 ../../Zotlabs/Module/Connect.php:118
-msgid ""
-"By continuing, I certify that I have complied with any instructions provided "
-"on this page."
+#: ../../Zotlabs/Module/Editblock.php:111
+#: ../../Zotlabs/Module/Editwebpage.php:146 ../../Zotlabs/Module/Mail.php:287
+#: ../../Zotlabs/Module/Mail.php:412 ../../Zotlabs/Module/Chat.php:207
+#: ../../include/conversation.php:1295
+msgid "Insert web link"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connect.php:106
-msgid "(No specific instructions have been provided by the channel owner.)"
+#: ../../Zotlabs/Module/Editblock.php:124 ../../include/conversation.php:1406
+msgid "Title (optional)"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connect.php:114
-msgid "Restricted or Premium Channel"
+#: ../../Zotlabs/Module/Editblock.php:133
+msgid "Edit Block"
 msgstr ""
 
 #: ../../Zotlabs/Module/Page.php:40 ../../Zotlabs/Module/Block.php:31
 msgid "Invalid item."
 msgstr ""
 
-#: ../../Zotlabs/Module/Page.php:56 ../../Zotlabs/Module/Chanview.php:96
-#: ../../Zotlabs/Module/Block.php:43 ../../Zotlabs/Module/Cal.php:62
+#: ../../Zotlabs/Module/Page.php:56 ../../Zotlabs/Module/Cal.php:62
+#: ../../Zotlabs/Module/Block.php:43 ../../Zotlabs/Module/Chanview.php:96
 #: ../../Zotlabs/Module/Wall_upload.php:31
 msgid "Channel not found."
 msgstr ""
@@ -1381,91 +1416,67 @@ msgstr ""
 
 #: ../../Zotlabs/Module/Filer.php:53 ../../Zotlabs/Module/Admin/Profs.php:74
 #: ../../Zotlabs/Module/Admin/Profs.php:94 ../../Zotlabs/Module/Rbmark.php:32
-#: ../../Zotlabs/Module/Rbmark.php:104 ../../include/text.php:987
-#: ../../include/text.php:999 ../../include/widgets.php:201
+#: ../../Zotlabs/Module/Rbmark.php:104 ../../include/widgets.php:202
+#: ../../include/text.php:1005 ../../include/text.php:1017
 msgid "Save"
 msgstr ""
 
-#: ../../Zotlabs/Module/Manage.php:136
-#: ../../Zotlabs/Module/New_channel.php:121
-#, php-format
-msgid "You have created %1$.0f of %2$.0f allowed channels."
-msgstr ""
-
-#: ../../Zotlabs/Module/Manage.php:143
-msgid "Create a new channel"
-msgstr ""
-
-#: ../../Zotlabs/Module/Manage.php:143 ../../Zotlabs/Module/Profiles.php:772
-#: ../../Zotlabs/Module/Wiki.php:147 ../../Zotlabs/Module/Chat.php:255
-msgid "Create New"
-msgstr ""
-
-#: ../../Zotlabs/Module/Manage.php:164 ../../Zotlabs/Lib/Apps.php:214
-#: ../../include/nav.php:209
-msgid "Channel Manager"
-msgstr ""
-
-#: ../../Zotlabs/Module/Manage.php:165
-msgid "Current Channel"
-msgstr ""
-
-#: ../../Zotlabs/Module/Manage.php:167
-msgid "Switch to one of your channels by selecting it."
-msgstr ""
-
-#: ../../Zotlabs/Module/Manage.php:168
-msgid "Default Channel"
+#: ../../Zotlabs/Module/Ping.php:254
+msgid "sent you a private message"
 msgstr ""
 
-#: ../../Zotlabs/Module/Manage.php:169
-msgid "Make Default"
+#: ../../Zotlabs/Module/Ping.php:302
+msgid "added your channel"
 msgstr ""
 
-#: ../../Zotlabs/Module/Manage.php:172
-#, php-format
-msgid "%d new messages"
+#: ../../Zotlabs/Module/Ping.php:312
+msgid "g A l F d"
 msgstr ""
 
-#: ../../Zotlabs/Module/Manage.php:173
-#, php-format
-msgid "%d new introductions"
+#: ../../Zotlabs/Module/Ping.php:330
+msgid "[today]"
 msgstr ""
 
-#: ../../Zotlabs/Module/Manage.php:175
-msgid "Delegated Channel"
+#: ../../Zotlabs/Module/Ping.php:339
+msgid "posted an event"
 msgstr ""
 
 #: ../../Zotlabs/Module/Connections.php:56
 #: ../../Zotlabs/Module/Connections.php:161
-#: ../../Zotlabs/Module/Connections.php:242
+#: ../../Zotlabs/Module/Connections.php:250
 msgid "Blocked"
 msgstr ""
 
 #: ../../Zotlabs/Module/Connections.php:61
 #: ../../Zotlabs/Module/Connections.php:168
-#: ../../Zotlabs/Module/Connections.php:241
+#: ../../Zotlabs/Module/Connections.php:249
 msgid "Ignored"
 msgstr ""
 
 #: ../../Zotlabs/Module/Connections.php:66
 #: ../../Zotlabs/Module/Connections.php:182
-#: ../../Zotlabs/Module/Connections.php:240
+#: ../../Zotlabs/Module/Connections.php:248
 msgid "Hidden"
 msgstr ""
 
 #: ../../Zotlabs/Module/Connections.php:71
 #: ../../Zotlabs/Module/Connections.php:175
-#: ../../Zotlabs/Module/Connections.php:239
+#: ../../Zotlabs/Module/Connections.php:247
 msgid "Archived"
 msgstr ""
 
 #: ../../Zotlabs/Module/Connections.php:76
 #: ../../Zotlabs/Module/Connections.php:86 ../../Zotlabs/Module/Menu.php:116
-#: ../../include/conversation.php:1594
+#: ../../include/conversation.php:1724
 msgid "New"
 msgstr ""
 
+#: ../../Zotlabs/Module/Connections.php:92
+#: ../../Zotlabs/Module/Connections.php:107
+#: ../../Zotlabs/Module/Connedit.php:674 ../../include/widgets.php:544
+msgid "All"
+msgstr ""
+
 #: ../../Zotlabs/Module/Connections.php:138
 msgid "New Connections"
 msgstr ""
@@ -1475,7 +1486,7 @@ msgid "Show pending (new) connections"
 msgstr ""
 
 #: ../../Zotlabs/Module/Connections.php:145
-#: ../../Zotlabs/Module/Profperm.php:144
+#: ../../Zotlabs/Module/Profperm.php:140
 msgid "All Connections"
 msgstr ""
 
@@ -1499,79 +1510,88 @@ msgstr ""
 msgid "Only show hidden connections"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connections.php:238
+#: ../../Zotlabs/Module/Connections.php:246
 msgid "Pending approval"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connections.php:254
+#: ../../Zotlabs/Module/Connections.php:262
 #, php-format
 msgid "%1$s [%2$s]"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connections.php:255
+#: ../../Zotlabs/Module/Connections.php:263
 msgid "Edit connection"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connections.php:256
+#: ../../Zotlabs/Module/Connections.php:264
 msgid "Delete connection"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connections.php:265
+#: ../../Zotlabs/Module/Connections.php:273
 msgid "Channel address"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connections.php:267
+#: ../../Zotlabs/Module/Connections.php:275
 msgid "Network"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connections.php:270
+#: ../../Zotlabs/Module/Connections.php:278
+msgid "Call"
+msgstr ""
+
+#: ../../Zotlabs/Module/Connections.php:280
 msgid "Status"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connections.php:272
+#: ../../Zotlabs/Module/Connections.php:282
 msgid "Connected"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connections.php:274
+#: ../../Zotlabs/Module/Connections.php:284
 msgid "Approve connection"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connections.php:275
+#: ../../Zotlabs/Module/Connections.php:285
 #: ../../Zotlabs/Module/Admin/Accounts.php:171
 msgid "Approve"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connections.php:276
+#: ../../Zotlabs/Module/Connections.php:286
 msgid "Ignore connection"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connections.php:278
+#: ../../Zotlabs/Module/Connections.php:287
+#: ../../Zotlabs/Module/Connedit.php:602
+msgid "Ignore"
+msgstr ""
+
+#: ../../Zotlabs/Module/Connections.php:288
 msgid "Recent activity"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connections.php:302 ../../Zotlabs/Lib/Apps.php:209
-#: ../../include/nav.php:189 ../../include/text.php:916
+#: ../../Zotlabs/Module/Connections.php:312 ../../Zotlabs/Lib/Apps.php:216
+#: ../../include/text.php:934 ../../include/nav.php:203
 msgid "Connections"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connections.php:306 ../../Zotlabs/Module/Search.php:44
-#: ../../Zotlabs/Lib/Apps.php:230 ../../include/nav.php:168
-#: ../../include/text.php:986 ../../include/text.php:998
-#: ../../include/widgets.php:315 ../../include/acl_selectors.php:203
+#: ../../Zotlabs/Module/Connections.php:316 ../../Zotlabs/Module/Search.php:44
+#: ../../Zotlabs/Lib/Apps.php:237 ../../include/acl_selectors.php:213
+#: ../../include/widgets.php:316 ../../include/text.php:1004
+#: ../../include/text.php:1016 ../../include/nav.php:180
 msgid "Search"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connections.php:307
+#: ../../Zotlabs/Module/Connections.php:317
 msgid "Search your connections"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connections.php:308
+#: ../../Zotlabs/Module/Connections.php:318
 msgid "Connections search"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connections.php:309
-#: ../../Zotlabs/Module/Directory.php:391
-#: ../../Zotlabs/Module/Directory.php:396 ../../include/contact_widgets.php:23
+#: ../../Zotlabs/Module/Connections.php:319
+#: ../../Zotlabs/Module/Directory.php:392
+#: ../../Zotlabs/Module/Directory.php:397 ../../include/contact_widgets.php:23
 msgid "Find"
 msgstr ""
 
@@ -1591,61 +1611,61 @@ msgid "Image resize failed."
 msgstr ""
 
 #: ../../Zotlabs/Module/Cover_photo.php:168
-#: ../../Zotlabs/Module/Profile_photo.php:196 ../../include/photos.php:149
+#: ../../Zotlabs/Module/Profile_photo.php:197 ../../include/photos.php:149
 msgid "Unable to process image"
 msgstr ""
 
 #: ../../Zotlabs/Module/Cover_photo.php:192
-#: ../../Zotlabs/Module/Profile_photo.php:231
+#: ../../Zotlabs/Module/Profile_photo.php:232
 msgid "Image upload failed."
 msgstr ""
 
 #: ../../Zotlabs/Module/Cover_photo.php:210
-#: ../../Zotlabs/Module/Profile_photo.php:250
+#: ../../Zotlabs/Module/Profile_photo.php:251
 msgid "Unable to process image."
 msgstr ""
 
-#: ../../Zotlabs/Module/Cover_photo.php:233 ../../include/items.php:4253
+#: ../../Zotlabs/Module/Cover_photo.php:233 ../../include/items.php:4276
 msgid "female"
 msgstr ""
 
-#: ../../Zotlabs/Module/Cover_photo.php:234 ../../include/items.php:4254
+#: ../../Zotlabs/Module/Cover_photo.php:234 ../../include/items.php:4277
 #, php-format
 msgid "%1$s updated her %2$s"
 msgstr ""
 
-#: ../../Zotlabs/Module/Cover_photo.php:235 ../../include/items.php:4255
+#: ../../Zotlabs/Module/Cover_photo.php:235 ../../include/items.php:4278
 msgid "male"
 msgstr ""
 
-#: ../../Zotlabs/Module/Cover_photo.php:236 ../../include/items.php:4256
+#: ../../Zotlabs/Module/Cover_photo.php:236 ../../include/items.php:4279
 #, php-format
 msgid "%1$s updated his %2$s"
 msgstr ""
 
-#: ../../Zotlabs/Module/Cover_photo.php:238 ../../include/items.php:4258
+#: ../../Zotlabs/Module/Cover_photo.php:238 ../../include/items.php:4281
 #, php-format
 msgid "%1$s updated their %2$s"
 msgstr ""
 
-#: ../../Zotlabs/Module/Cover_photo.php:240 ../../include/channel.php:1677
+#: ../../Zotlabs/Module/Cover_photo.php:240 ../../include/channel.php:1764
 msgid "cover photo"
 msgstr ""
 
 #: ../../Zotlabs/Module/Cover_photo.php:303
 #: ../../Zotlabs/Module/Cover_photo.php:318
-#: ../../Zotlabs/Module/Profile_photo.php:311
-#: ../../Zotlabs/Module/Profile_photo.php:352
+#: ../../Zotlabs/Module/Profile_photo.php:312
+#: ../../Zotlabs/Module/Profile_photo.php:354
 msgid "Photo not available."
 msgstr ""
 
 #: ../../Zotlabs/Module/Cover_photo.php:354
-#: ../../Zotlabs/Module/Profile_photo.php:407
+#: ../../Zotlabs/Module/Profile_photo.php:409
 msgid "Upload File:"
 msgstr ""
 
 #: ../../Zotlabs/Module/Cover_photo.php:355
-#: ../../Zotlabs/Module/Profile_photo.php:408
+#: ../../Zotlabs/Module/Profile_photo.php:410
 msgid "Select a profile:"
 msgstr ""
 
@@ -1654,33 +1674,33 @@ msgid "Upload Cover Photo"
 msgstr ""
 
 #: ../../Zotlabs/Module/Cover_photo.php:361
-#: ../../Zotlabs/Module/Profile_photo.php:416
-#: ../../Zotlabs/Module/Settings/Channel.php:399
+#: ../../Zotlabs/Module/Profile_photo.php:418
+#: ../../Zotlabs/Module/Settings/Channel.php:404
 msgid "or"
 msgstr ""
 
 #: ../../Zotlabs/Module/Cover_photo.php:361
-#: ../../Zotlabs/Module/Profile_photo.php:416
+#: ../../Zotlabs/Module/Profile_photo.php:418
 msgid "skip this step"
 msgstr ""
 
 #: ../../Zotlabs/Module/Cover_photo.php:361
-#: ../../Zotlabs/Module/Profile_photo.php:416
+#: ../../Zotlabs/Module/Profile_photo.php:418
 msgid "select a photo from your photo albums"
 msgstr ""
 
 #: ../../Zotlabs/Module/Cover_photo.php:377
-#: ../../Zotlabs/Module/Profile_photo.php:435
+#: ../../Zotlabs/Module/Profile_photo.php:437
 msgid "Crop Image"
 msgstr ""
 
 #: ../../Zotlabs/Module/Cover_photo.php:378
-#: ../../Zotlabs/Module/Profile_photo.php:436
+#: ../../Zotlabs/Module/Profile_photo.php:438
 msgid "Please adjust the image cropping for optimum viewing."
 msgstr ""
 
 #: ../../Zotlabs/Module/Cover_photo.php:380
-#: ../../Zotlabs/Module/Profile_photo.php:438
+#: ../../Zotlabs/Module/Profile_photo.php:440
 msgid "Done Editing"
 msgstr ""
 
@@ -1709,20 +1729,8 @@ msgstr ""
 msgid "Log settings updated."
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Logs.php:82
-#: ../../Zotlabs/Module/Admin/Plugins.php:336
-#: ../../Zotlabs/Module/Admin/Plugins.php:427
-#: ../../Zotlabs/Module/Admin/Security.php:86
-#: ../../Zotlabs/Module/Admin/Themes.php:120
-#: ../../Zotlabs/Module/Admin/Themes.php:154
-#: ../../Zotlabs/Module/Admin/Accounts.php:164
-#: ../../Zotlabs/Module/Admin/Channels.php:145
-#: ../../Zotlabs/Module/Admin/Site.php:258 ../../Zotlabs/Module/Admin.php:137
-msgid "Administration"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin/Logs.php:83 ../../include/widgets.php:1658
-#: ../../include/widgets.php:1668
+#: ../../Zotlabs/Module/Admin/Logs.php:83 ../../include/widgets.php:1618
+#: ../../include/widgets.php:1628
 msgid "Logs"
 msgstr ""
 
@@ -1748,156 +1756,6 @@ msgstr ""
 msgid "Log level"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Plugins.php:254
-#: ../../Zotlabs/Module/Admin/Themes.php:69
-#: ../../Zotlabs/Module/Filestorage.php:32 ../../Zotlabs/Module/Display.php:40
-#: ../../Zotlabs/Module/Admin.php:60 ../../Zotlabs/Module/Thing.php:89
-#: ../../Zotlabs/Module/Viewsrc.php:24 ../../include/items.php:3343
-msgid "Item not found."
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin/Plugins.php:284
-#, php-format
-msgid "Plugin %s disabled."
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin/Plugins.php:289
-#, php-format
-msgid "Plugin %s enabled."
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin/Plugins.php:305
-#: ../../Zotlabs/Module/Admin/Themes.php:93
-msgid "Disable"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin/Plugins.php:308
-#: ../../Zotlabs/Module/Admin/Themes.php:95
-msgid "Enable"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin/Plugins.php:337
-#: ../../Zotlabs/Module/Admin/Plugins.php:428 ../../include/widgets.php:1636
-msgid "Plugins"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin/Plugins.php:338
-#: ../../Zotlabs/Module/Admin/Themes.php:122
-msgid "Toggle"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin/Plugins.php:339
-#: ../../Zotlabs/Module/Admin/Themes.php:123 ../../Zotlabs/Lib/Apps.php:216
-#: ../../include/nav.php:211 ../../include/widgets.php:680
-msgid "Settings"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin/Plugins.php:346
-#: ../../Zotlabs/Module/Admin/Themes.php:132
-msgid "Author: "
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin/Plugins.php:347
-#: ../../Zotlabs/Module/Admin/Themes.php:133
-msgid "Maintainer: "
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin/Plugins.php:348
-msgid "Minimum project version: "
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin/Plugins.php:349
-msgid "Maximum project version: "
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin/Plugins.php:350
-msgid "Minimum PHP version: "
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin/Plugins.php:351
-msgid "Compatible Server Roles: "
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin/Plugins.php:352
-msgid "Requires: "
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin/Plugins.php:353
-#: ../../Zotlabs/Module/Admin/Plugins.php:433
-msgid "Disabled - version incompatibility"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin/Plugins.php:402
-msgid "Enter the public git repository URL of the plugin repo."
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin/Plugins.php:403
-msgid "Plugin repo git URL"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin/Plugins.php:404
-msgid "Custom repo name"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin/Plugins.php:404
-msgid "(optional)"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin/Plugins.php:405
-msgid "Download Plugin Repo"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin/Plugins.php:412
-msgid "Install new repo"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin/Plugins.php:413 ../../Zotlabs/Lib/Apps.php:334
-msgid "Install"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin/Plugins.php:414
-#: ../../Zotlabs/Module/Fbrowser.php:66 ../../Zotlabs/Module/Fbrowser.php:88
-#: ../../Zotlabs/Module/Wiki.php:242 ../../Zotlabs/Module/Wiki.php:277
-#: ../../Zotlabs/Module/Settings/Oauth.php:88
-#: ../../Zotlabs/Module/Settings/Oauth.php:114
-#: ../../Zotlabs/Module/Tagrm.php:15 ../../Zotlabs/Module/Tagrm.php:138
-#: ../../extend/addon/addon/friendica/dfrn_request.php:879
-#: ../../extend/addon/addon/js_upload/js_upload.php:46
-#: ../../extend/addon/addon/cdav/Mod_Cdav.php:866
-#: ../../extend/addon/addon/cdav/Mod_Cdav.php:1154
-#: ../../include/conversation.php:1264 ../../include/conversation.php:1313
-msgid "Cancel"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin/Plugins.php:435
-msgid "Manage Repos"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin/Plugins.php:436
-msgid "Installed Plugin Repositories"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin/Plugins.php:437
-msgid "Install a New Plugin Repository"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin/Plugins.php:443
-#: ../../Zotlabs/Module/Settings/Oauth.php:42
-#: ../../Zotlabs/Module/Settings/Oauth.php:113 ../../Zotlabs/Lib/Apps.php:334
-#: ../../extend/addon/addon/cdav/Mod_Cdav.php:1152
-msgid "Update"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin/Plugins.php:444
-msgid "Switch branch"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin/Plugins.php:445
-#: ../../Zotlabs/Module/Photos.php:989 ../../Zotlabs/Module/Tagrm.php:137
-#: ../../extend/addon/addon/superblock/superblock.php:110
-msgid "Remove"
-msgstr ""
-
 #: ../../Zotlabs/Module/Admin/Profs.php:69
 msgid "New Profile Field"
 msgstr ""
@@ -1945,7 +1803,7 @@ msgstr ""
 msgid "Edit Profile Field"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Profs.php:147 ../../include/widgets.php:1639
+#: ../../Zotlabs/Module/Admin/Profs.php:147 ../../include/widgets.php:1599
 msgid "Profile Fields"
 msgstr ""
 
@@ -1973,34 +1831,6 @@ msgstr ""
 msgid "Create Custom Field"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Queue.php:36
-msgid "Queue Statistics"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin/Queue.php:37
-msgid "Total Entries"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin/Queue.php:38
-msgid "Priority"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin/Queue.php:39
-msgid "Destination URL"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin/Queue.php:40
-msgid "Mark hub permanently offline"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin/Queue.php:41
-msgid "Empty queue for this hub"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin/Queue.php:42
-msgid "Last known contact"
-msgstr ""
-
 #: ../../Zotlabs/Module/Admin/Security.php:77
 msgid ""
 "By default, unfiltered HTML is allowed in embedded media. This is inherently "
@@ -2025,7 +1855,7 @@ msgid ""
 "embedded content from that site is explicitly blocked."
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Security.php:87 ../../include/widgets.php:1634
+#: ../../Zotlabs/Module/Admin/Security.php:87 ../../include/widgets.php:1594
 msgid "Security"
 msgstr ""
 
@@ -2120,15 +1950,46 @@ msgstr ""
 msgid "No themes found."
 msgstr ""
 
+#: ../../Zotlabs/Module/Admin/Themes.php:93
+#: ../../Zotlabs/Module/Admin/Plugins.php:305
+msgid "Disable"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Themes.php:95
+#: ../../Zotlabs/Module/Admin/Plugins.php:308
+msgid "Enable"
+msgstr ""
+
 #: ../../Zotlabs/Module/Admin/Themes.php:114
 msgid "Screenshot"
 msgstr ""
 
 #: ../../Zotlabs/Module/Admin/Themes.php:121
-#: ../../Zotlabs/Module/Admin/Themes.php:155 ../../include/widgets.php:1637
+#: ../../Zotlabs/Module/Admin/Themes.php:155 ../../include/widgets.php:1597
 msgid "Themes"
 msgstr ""
 
+#: ../../Zotlabs/Module/Admin/Themes.php:122
+#: ../../Zotlabs/Module/Admin/Plugins.php:338
+msgid "Toggle"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Themes.php:123
+#: ../../Zotlabs/Module/Admin/Plugins.php:339 ../../Zotlabs/Lib/Apps.php:223
+#: ../../include/widgets.php:699 ../../include/nav.php:225
+msgid "Settings"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Themes.php:132
+#: ../../Zotlabs/Module/Admin/Plugins.php:346
+msgid "Author: "
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Themes.php:133
+#: ../../Zotlabs/Module/Admin/Plugins.php:347
+msgid "Maintainer: "
+msgstr ""
+
 #: ../../Zotlabs/Module/Admin/Themes.php:160
 msgid "[Experimental]"
 msgstr ""
@@ -2208,7 +2069,7 @@ msgid "Account '%s' unblocked"
 msgstr ""
 
 #: ../../Zotlabs/Module/Admin/Accounts.php:165
-#: ../../Zotlabs/Module/Admin/Accounts.php:178 ../../include/widgets.php:1632
+#: ../../Zotlabs/Module/Admin/Accounts.php:178 ../../include/widgets.php:1592
 msgid "Accounts"
 msgstr ""
 
@@ -2227,12 +2088,13 @@ msgstr ""
 
 #: ../../Zotlabs/Module/Admin/Accounts.php:169
 #: ../../Zotlabs/Module/Admin/Accounts.php:181
+#: ../../Zotlabs/Module/Connedit.php:871
 #: ../../extend/addon/addon/redred/redred.php:107
 #: ../../extend/addon/addon/rtof/rtof.php:93
 #: ../../extend/addon/addon/cdav/Mod_Cdav.php:1140
 #: ../../extend/addon/addon/openid/MysqlProvider.php:56
 #: ../../extend/addon/addon/openid/MysqlProvider.php:57
-#: ../../include/network.php:2237
+#: ../../include/network.php:2247
 msgid "Email"
 msgstr ""
 
@@ -2244,11 +2106,21 @@ msgstr ""
 msgid "Deny"
 msgstr ""
 
+#: ../../Zotlabs/Module/Admin/Accounts.php:174
+#: ../../Zotlabs/Module/Connedit.php:594
+msgid "Block"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Accounts.php:175
+#: ../../Zotlabs/Module/Connedit.php:594
+msgid "Unblock"
+msgstr ""
+
 #: ../../Zotlabs/Module/Admin/Accounts.php:180
 msgid "ID"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Accounts.php:182 ../../include/group.php:267
+#: ../../Zotlabs/Module/Admin/Accounts.php:182 ../../include/group.php:287
 msgid "All Channels"
 msgstr ""
 
@@ -2330,7 +2202,7 @@ msgstr ""
 msgid "Channel '%s' code disallowed"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Channels.php:146 ../../include/widgets.php:1633
+#: ../../Zotlabs/Module/Admin/Channels.php:146 ../../include/widgets.php:1593
 msgid "Channels"
 msgstr ""
 
@@ -2351,7 +2223,7 @@ msgid "Disallow Code"
 msgstr ""
 
 #: ../../Zotlabs/Module/Admin/Channels.php:154
-#: ../../include/conversation.php:1671
+#: ../../include/conversation.php:1815
 msgid "Channel"
 msgstr ""
 
@@ -2359,6 +2231,13 @@ msgstr ""
 msgid "UID"
 msgstr ""
 
+#: ../../Zotlabs/Module/Admin/Channels.php:160
+#: ../../Zotlabs/Module/Locs.php:118 ../../Zotlabs/Module/Connedit.php:874
+#: ../../Zotlabs/Module/Profiles.php:503
+#: ../../extend/addon/addon/cdav/Mod_Cdav.php:1143
+msgid "Address"
+msgstr ""
+
 #: ../../Zotlabs/Module/Admin/Channels.php:162
 msgid ""
 "Selected channels will be deleted!\\n\\nEverything that was posted in these "
@@ -2415,7 +2294,7 @@ msgstr ""
 msgid "Site settings updated."
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:159 ../../include/text.php:2918
+#: ../../Zotlabs/Module/Admin/Site.php:159 ../../include/text.php:2931
 msgid "Default"
 msgstr ""
 
@@ -2488,7 +2367,7 @@ msgstr ""
 msgid "Wizard - I probably know more than you do"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:259 ../../include/widgets.php:1631
+#: ../../Zotlabs/Module/Admin/Site.php:259 ../../include/widgets.php:1591
 msgid "Site"
 msgstr ""
 
@@ -2781,60 +2660,151 @@ msgstr ""
 msgid "0 for no expiration of imported content"
 msgstr ""
 
-#: ../../Zotlabs/Module/Pubsites.php:24 ../../include/widgets.php:1454
-msgid "Public Hubs"
+#: ../../Zotlabs/Module/Admin/Plugins.php:284
+#, php-format
+msgid "Plugin %s disabled."
 msgstr ""
 
-#: ../../Zotlabs/Module/Pubsites.php:27
-msgid ""
-"The listed hubs allow public registration for the $Projectname network. All "
-"hubs in the network are interlinked so membership on any of them conveys "
-"membership in the network as a whole. Some hubs may require subscription or "
-"provide tiered service plans. The hub itself <strong>may</strong> provide "
-"additional details."
+#: ../../Zotlabs/Module/Admin/Plugins.php:289
+#, php-format
+msgid "Plugin %s enabled."
 msgstr ""
 
-#: ../../Zotlabs/Module/Pubsites.php:33
-msgid "Hub URL"
+#: ../../Zotlabs/Module/Admin/Plugins.php:337
+#: ../../Zotlabs/Module/Admin/Plugins.php:432 ../../include/widgets.php:1596
+msgid "Plugins"
 msgstr ""
 
-#: ../../Zotlabs/Module/Pubsites.php:33
-msgid "Access Type"
+#: ../../Zotlabs/Module/Admin/Plugins.php:348
+msgid "Minimum project version: "
 msgstr ""
 
-#: ../../Zotlabs/Module/Pubsites.php:33
-msgid "Registration Policy"
+#: ../../Zotlabs/Module/Admin/Plugins.php:349
+msgid "Maximum project version: "
 msgstr ""
 
-#: ../../Zotlabs/Module/Pubsites.php:33
-msgid "Stats"
+#: ../../Zotlabs/Module/Admin/Plugins.php:350
+msgid "Minimum PHP version: "
 msgstr ""
 
-#: ../../Zotlabs/Module/Pubsites.php:33
-msgid "Software"
+#: ../../Zotlabs/Module/Admin/Plugins.php:351
+msgid "Compatible Server Roles: "
 msgstr ""
 
-#: ../../Zotlabs/Module/Pubsites.php:35 ../../Zotlabs/Module/Ratings.php:97
-#: ../../include/conversation.php:974
-msgid "Ratings"
+#: ../../Zotlabs/Module/Admin/Plugins.php:352
+msgid "Requires: "
 msgstr ""
 
-#: ../../Zotlabs/Module/Pubsites.php:48
-msgid "Rate"
+#: ../../Zotlabs/Module/Admin/Plugins.php:353
+#: ../../Zotlabs/Module/Admin/Plugins.php:437
+msgid "Disabled - version incompatibility"
 msgstr ""
 
-#: ../../Zotlabs/Module/Pubsites.php:59 ../../Zotlabs/Module/Blocks.php:166
-#: ../../Zotlabs/Module/Layouts.php:197 ../../Zotlabs/Module/Webpages.php:246
-#: ../../Zotlabs/Module/Wiki.php:146 ../../Zotlabs/Module/Events.php:685
-#: ../../include/page_widgets.php:42 ../../include/widgets.php:967
-msgid "View"
+#: ../../Zotlabs/Module/Admin/Plugins.php:406
+msgid "Enter the public git repository URL of the plugin repo."
 msgstr ""
 
-#: ../../Zotlabs/Module/Editlayout.php:79
-#: ../../Zotlabs/Module/Editwebpage.php:80
-#: ../../Zotlabs/Module/Editblock.php:79 ../../Zotlabs/Module/Editblock.php:95
-#: ../../Zotlabs/Module/Editpost.php:24
-msgid "Item not found"
+#: ../../Zotlabs/Module/Admin/Plugins.php:407
+msgid "Plugin repo git URL"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Plugins.php:408
+msgid "Custom repo name"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Plugins.php:408
+msgid "(optional)"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Plugins.php:409
+msgid "Download Plugin Repo"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Plugins.php:416
+msgid "Install new repo"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Plugins.php:417 ../../Zotlabs/Lib/Apps.php:348
+msgid "Install"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Plugins.php:418
+#: ../../Zotlabs/Module/Connedit.php:885 ../../Zotlabs/Module/Fbrowser.php:66
+#: ../../Zotlabs/Module/Fbrowser.php:88 ../../Zotlabs/Module/Wiki.php:263
+#: ../../Zotlabs/Module/Wiki.php:288
+#: ../../Zotlabs/Module/Settings/Oauth.php:88
+#: ../../Zotlabs/Module/Settings/Oauth.php:114
+#: ../../Zotlabs/Module/Tagrm.php:15 ../../Zotlabs/Module/Tagrm.php:138
+#: ../../extend/addon/addon/friendica/dfrn_request.php:879
+#: ../../extend/addon/addon/js_upload/js_upload.php:46
+#: ../../extend/addon/addon/cdav/Mod_Cdav.php:866
+#: ../../extend/addon/addon/cdav/Mod_Cdav.php:1154
+#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:243
+#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:266
+#: ../../include/conversation.php:1394 ../../include/conversation.php:1443
+msgid "Cancel"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Plugins.php:440
+msgid "Manage Repos"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Plugins.php:441
+msgid "Installed Plugin Repositories"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Plugins.php:442
+msgid "Install a New Plugin Repository"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Plugins.php:448
+#: ../../Zotlabs/Module/Connedit.php:883
+#: ../../Zotlabs/Module/Settings/Oauth.php:42
+#: ../../Zotlabs/Module/Settings/Oauth.php:113 ../../Zotlabs/Lib/Apps.php:348
+#: ../../extend/addon/addon/cdav/Mod_Cdav.php:1152
+msgid "Update"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Plugins.php:449
+msgid "Switch branch"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Queue.php:35
+msgid "Queue Statistics"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Queue.php:36
+msgid "Total Entries"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Queue.php:37
+msgid "Priority"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Queue.php:38
+msgid "Destination URL"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Queue.php:39
+msgid "Mark hub permanently offline"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Queue.php:40
+msgid "Empty queue for this hub"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Queue.php:41
+msgid "Last known contact"
+msgstr ""
+
+#: ../../Zotlabs/Module/Search.php:223
+#, php-format
+msgid "Items tagged with: %s"
+msgstr ""
+
+#: ../../Zotlabs/Module/Search.php:225
+#, php-format
+msgid "Search results for: %s"
 msgstr ""
 
 #: ../../Zotlabs/Module/Editlayout.php:127
@@ -2855,37 +2825,121 @@ msgstr ""
 msgid "Page link"
 msgstr ""
 
-#: ../../Zotlabs/Module/Editwebpage.php:146 ../../Zotlabs/Module/Mail.php:258
-#: ../../Zotlabs/Module/Mail.php:383 ../../Zotlabs/Module/Editblock.php:111
-#: ../../Zotlabs/Module/Chat.php:207 ../../include/conversation.php:1165
-msgid "Insert web link"
-msgstr ""
-
 #: ../../Zotlabs/Module/Editwebpage.php:169
 msgid "Edit Webpage"
 msgstr ""
 
-#: ../../Zotlabs/Module/Fbrowser.php:29 ../../Zotlabs/Lib/Apps.php:222
-#: ../../include/nav.php:95 ../../include/conversation.php:1692
-msgid "Photos"
+#: ../../Zotlabs/Module/Like.php:19
+msgid "Like/Dislike"
 msgstr ""
 
-#: ../../Zotlabs/Module/Channel.php:32 ../../Zotlabs/Module/Wiki.php:20
-#: ../../Zotlabs/Module/Chat.php:25
-#: ../../extend/addon/addon/chess/chess.php:400
-msgid "You must be logged in to see this page."
+#: ../../Zotlabs/Module/Like.php:24
+msgid "This action is restricted to members."
 msgstr ""
 
-#: ../../Zotlabs/Module/Channel.php:44
-msgid "Posts and comments"
+#: ../../Zotlabs/Module/Like.php:25
+msgid ""
+"Please <a href=\"rmagic\">login with your $Projectname ID</a> or <a href="
+"\"register\">register as a new $Projectname member</a> to continue."
 msgstr ""
 
-#: ../../Zotlabs/Module/Channel.php:45
-msgid "Only posts"
+#: ../../Zotlabs/Module/Like.php:105 ../../Zotlabs/Module/Like.php:131
+#: ../../Zotlabs/Module/Like.php:169
+msgid "Invalid request."
 msgstr ""
 
-#: ../../Zotlabs/Module/Channel.php:104
-msgid "Insufficient permissions.  Request redirected to profile page."
+#: ../../Zotlabs/Module/Like.php:117 ../../include/conversation.php:126
+msgid "channel"
+msgstr ""
+
+#: ../../Zotlabs/Module/Like.php:146
+msgid "thing"
+msgstr ""
+
+#: ../../Zotlabs/Module/Like.php:192
+msgid "Channel unavailable."
+msgstr ""
+
+#: ../../Zotlabs/Module/Like.php:240
+msgid "Previous action reversed."
+msgstr ""
+
+#: ../../Zotlabs/Module/Like.php:370 ../../Zotlabs/Module/Subthread.php:87
+#: ../../Zotlabs/Module/Tagger.php:47
+#: ../../extend/addon/addon/diaspora/inbound.php:1794
+#: ../../extend/addon/addon/redphotos/redphotohelper.php:74
+#: ../../include/conversation.php:120 ../../include/text.php:1953
+msgid "photo"
+msgstr ""
+
+#: ../../Zotlabs/Module/Like.php:370 ../../Zotlabs/Module/Subthread.php:87
+#: ../../extend/addon/addon/diaspora/inbound.php:1794
+#: ../../include/conversation.php:148 ../../include/text.php:1959
+msgid "status"
+msgstr ""
+
+#: ../../Zotlabs/Module/Like.php:372 ../../Zotlabs/Module/Events.php:260
+#: ../../Zotlabs/Module/Tagger.php:51 ../../include/conversation.php:123
+#: ../../include/text.php:1956 ../../include/event.php:1000
+msgid "event"
+msgstr ""
+
+#: ../../Zotlabs/Module/Like.php:419
+#: ../../extend/addon/addon/diaspora/inbound.php:1823
+#: ../../include/conversation.php:164
+#, php-format
+msgid "%1$s likes %2$s's %3$s"
+msgstr ""
+
+#: ../../Zotlabs/Module/Like.php:421 ../../include/conversation.php:167
+#, php-format
+msgid "%1$s doesn't like %2$s's %3$s"
+msgstr ""
+
+#: ../../Zotlabs/Module/Like.php:423
+#, php-format
+msgid "%1$s agrees with %2$s's %3$s"
+msgstr ""
+
+#: ../../Zotlabs/Module/Like.php:425
+#, php-format
+msgid "%1$s doesn't agree with %2$s's %3$s"
+msgstr ""
+
+#: ../../Zotlabs/Module/Like.php:427
+#, php-format
+msgid "%1$s abstains from a decision on %2$s's %3$s"
+msgstr ""
+
+#: ../../Zotlabs/Module/Like.php:429
+#, php-format
+msgid "%1$s is attending %2$s's %3$s"
+msgstr ""
+
+#: ../../Zotlabs/Module/Like.php:431
+#, php-format
+msgid "%1$s is not attending %2$s's %3$s"
+msgstr ""
+
+#: ../../Zotlabs/Module/Like.php:433
+#, php-format
+msgid "%1$s may attend %2$s's %3$s"
+msgstr ""
+
+#: ../../Zotlabs/Module/Like.php:538
+msgid "Action completed."
+msgstr ""
+
+#: ../../Zotlabs/Module/Like.php:539
+msgid "Thank you."
+msgstr ""
+
+#: ../../Zotlabs/Module/Dirsearch.php:25 ../../Zotlabs/Module/Regdir.php:49
+msgid "This site is not a directory server"
+msgstr ""
+
+#: ../../Zotlabs/Module/Dirsearch.php:33
+msgid "This directory server requires an access token"
 msgstr ""
 
 #: ../../Zotlabs/Module/Network.php:96
@@ -2952,18 +3006,22 @@ msgstr ""
 msgid "Submit and proceed"
 msgstr ""
 
-#: ../../Zotlabs/Module/Menu.php:107 ../../include/text.php:2271
+#: ../../Zotlabs/Module/Menu.php:107 ../../include/text.php:2284
 msgid "Menus"
 msgstr ""
 
+#: ../../Zotlabs/Module/Menu.php:113 ../../Zotlabs/Module/Locs.php:120
+msgid "Drop"
+msgstr ""
+
 #: ../../Zotlabs/Module/Menu.php:114 ../../Zotlabs/Module/Blocks.php:157
-#: ../../Zotlabs/Module/Layouts.php:190 ../../Zotlabs/Module/Webpages.php:251
+#: ../../Zotlabs/Module/Layouts.php:190 ../../Zotlabs/Module/Webpages.php:255
 #: ../../include/page_widgets.php:47
 msgid "Created"
 msgstr ""
 
 #: ../../Zotlabs/Module/Menu.php:115 ../../Zotlabs/Module/Blocks.php:158
-#: ../../Zotlabs/Module/Layouts.php:191 ../../Zotlabs/Module/Webpages.php:252
+#: ../../Zotlabs/Module/Layouts.php:191 ../../Zotlabs/Module/Webpages.php:256
 #: ../../include/page_widgets.php:48
 msgid "Edited"
 msgstr ""
@@ -3025,564 +3083,639 @@ msgstr ""
 msgid "Not found."
 msgstr ""
 
-#: ../../Zotlabs/Module/Appman.php:37 ../../Zotlabs/Module/Appman.php:53
-msgid "App installed."
+#: ../../Zotlabs/Module/Locs.php:25 ../../Zotlabs/Module/Locs.php:54
+msgid "Location not found."
 msgstr ""
 
-#: ../../Zotlabs/Module/Appman.php:46
-msgid "Malformed app."
+#: ../../Zotlabs/Module/Locs.php:62
+msgid "Location lookup failed."
 msgstr ""
 
-#: ../../Zotlabs/Module/Appman.php:104
-msgid "Embed code"
+#: ../../Zotlabs/Module/Locs.php:66
+msgid ""
+"Please select another location to become primary before removing the primary "
+"location."
 msgstr ""
 
-#: ../../Zotlabs/Module/Appman.php:110 ../../include/widgets.php:107
-msgid "Edit App"
+#: ../../Zotlabs/Module/Locs.php:95
+msgid "Syncing locations"
 msgstr ""
 
-#: ../../Zotlabs/Module/Appman.php:110
-msgid "Create App"
+#: ../../Zotlabs/Module/Locs.php:105
+msgid "No locations found."
 msgstr ""
 
-#: ../../Zotlabs/Module/Appman.php:115
-msgid "Name of app"
+#: ../../Zotlabs/Module/Locs.php:116
+msgid "Manage Channel Locations"
 msgstr ""
 
-#: ../../Zotlabs/Module/Appman.php:115 ../../Zotlabs/Module/Appman.php:116
-#: ../../Zotlabs/Module/Profiles.php:703 ../../Zotlabs/Module/Profiles.php:707
-#: ../../Zotlabs/Module/Events.php:453 ../../Zotlabs/Module/Events.php:458
-#: ../../include/datetime.php:259
-msgid "Required"
+#: ../../Zotlabs/Module/Locs.php:117 ../../Zotlabs/Module/Pubsites.php:51
+#: ../../Zotlabs/Module/Profiles.php:510 ../../Zotlabs/Module/Profiles.php:733
+#: ../../Zotlabs/Module/Events.php:475
+#: ../../extend/addon/addon/cdav/Mod_Cdav.php:839
+#: ../../include/js_strings.php:25
+msgid "Location"
 msgstr ""
 
-#: ../../Zotlabs/Module/Appman.php:116
-msgid "Location (URL) of app"
+#: ../../Zotlabs/Module/Locs.php:119
+msgid "Primary"
 msgstr ""
 
-#: ../../Zotlabs/Module/Appman.php:117 ../../Zotlabs/Module/Rbmark.php:101
-#: ../../Zotlabs/Module/Events.php:466
-#: ../../extend/addon/addon/cdav/Mod_Cdav.php:838
-#: ../../extend/addon/addon/rendezvous/rendezvous.php:133
-msgid "Description"
+#: ../../Zotlabs/Module/Locs.php:122
+msgid "Sync Now"
 msgstr ""
 
-#: ../../Zotlabs/Module/Appman.php:118
-msgid "Photo icon URL"
+#: ../../Zotlabs/Module/Locs.php:123
+msgid "Please wait several minutes between consecutive operations."
 msgstr ""
 
-#: ../../Zotlabs/Module/Appman.php:118
-msgid "80 x 80 pixels - optional"
+#: ../../Zotlabs/Module/Locs.php:124
+msgid ""
+"When possible, drop a location by logging into that website/hub and removing "
+"your channel."
 msgstr ""
 
-#: ../../Zotlabs/Module/Appman.php:119
-msgid "Categories (optional, comma separated list)"
+#: ../../Zotlabs/Module/Locs.php:125
+msgid "Use this form to drop the location if the hub is no longer operating."
 msgstr ""
 
-#: ../../Zotlabs/Module/Appman.php:120
-msgid "Version ID"
+#: ../../Zotlabs/Module/Pubsites.php:24 ../../include/widgets.php:1415
+msgid "Public Hubs"
 msgstr ""
 
-#: ../../Zotlabs/Module/Appman.php:121
-msgid "Price of app"
+#: ../../Zotlabs/Module/Pubsites.php:27
+msgid ""
+"The listed hubs allow public registration for the $Projectname network. All "
+"hubs in the network are interlinked so membership on any of them conveys "
+"membership in the network as a whole. Some hubs may require subscription or "
+"provide tiered service plans. The hub itself <strong>may</strong> provide "
+"additional details."
 msgstr ""
 
-#: ../../Zotlabs/Module/Appman.php:122
-msgid "Location (URL) to purchase app"
+#: ../../Zotlabs/Module/Pubsites.php:33
+msgid "Hub URL"
 msgstr ""
 
-#: ../../Zotlabs/Module/Rpost.php:138 ../../Zotlabs/Module/Editpost.php:107
-msgid "Edit post"
+#: ../../Zotlabs/Module/Pubsites.php:33
+msgid "Access Type"
 msgstr ""
 
-#: ../../Zotlabs/Module/Help.php:23
-msgid "Documentation Search"
+#: ../../Zotlabs/Module/Pubsites.php:33
+msgid "Registration Policy"
 msgstr ""
 
-#: ../../Zotlabs/Module/Help.php:82
-msgid "$Projectname Documentation"
+#: ../../Zotlabs/Module/Pubsites.php:33
+msgid "Stats"
 msgstr ""
 
-#: ../../Zotlabs/Module/Ffsapi.php:12
-msgid "Share content from Firefox to $Projectname"
+#: ../../Zotlabs/Module/Pubsites.php:33
+msgid "Software"
 msgstr ""
 
-#: ../../Zotlabs/Module/Ffsapi.php:15
-msgid "Activate the Firefox $Projectname provider"
+#: ../../Zotlabs/Module/Pubsites.php:35 ../../Zotlabs/Module/Ratings.php:97
+#: ../../include/conversation.php:941 ../../include/conversation.php:1099
+msgid "Ratings"
 msgstr ""
 
-#: ../../Zotlabs/Module/Apps.php:46 ../../include/nav.php:166
-#: ../../include/widgets.php:102
-msgid "Apps"
+#: ../../Zotlabs/Module/Pubsites.php:48
+msgid "Rate"
 msgstr ""
 
-#: ../../Zotlabs/Module/Home.php:74 ../../Zotlabs/Module/Home.php:82
-msgid "$Projectname"
+#: ../../Zotlabs/Module/Pubsites.php:59 ../../Zotlabs/Module/Blocks.php:166
+#: ../../Zotlabs/Module/Layouts.php:197 ../../Zotlabs/Module/Events.php:694
+#: ../../Zotlabs/Module/Webpages.php:250 ../../Zotlabs/Module/Wiki.php:165
+#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:151
+#: ../../include/page_widgets.php:42
+msgid "View"
 msgstr ""
 
-#: ../../Zotlabs/Module/Home.php:92
-#, php-format
-msgid "Welcome to %s"
+#: ../../Zotlabs/Module/Connedit.php:82
+msgid "Could not access contact record."
 msgstr ""
 
-#: ../../Zotlabs/Module/Filestorage.php:87
-msgid "Permission Denied."
+#: ../../Zotlabs/Module/Connedit.php:112
+msgid "Could not locate selected profile."
 msgstr ""
 
-#: ../../Zotlabs/Module/Filestorage.php:103
-msgid "File not found."
+#: ../../Zotlabs/Module/Connedit.php:249
+msgid "Connection updated."
 msgstr ""
 
-#: ../../Zotlabs/Module/Filestorage.php:146
-msgid "Edit file permissions"
+#: ../../Zotlabs/Module/Connedit.php:251
+msgid "Failed to update connection record."
 msgstr ""
 
-#: ../../Zotlabs/Module/Filestorage.php:152
-#: ../../Zotlabs/Module/Photos.php:658 ../../Zotlabs/Module/Photos.php:1047
-#: ../../Zotlabs/Module/Thing.php:313 ../../Zotlabs/Module/Thing.php:363
-#: ../../Zotlabs/Module/Chat.php:234 ../../include/acl_selectors.php:208
-msgid "Permissions"
+#: ../../Zotlabs/Module/Connedit.php:301
+msgid "is now connected to"
 msgstr ""
 
-#: ../../Zotlabs/Module/Filestorage.php:159
-msgid "Set/edit permissions"
+#: ../../Zotlabs/Module/Connedit.php:434
+msgid "Could not access address book record."
 msgstr ""
 
-#: ../../Zotlabs/Module/Filestorage.php:160
-msgid "Include all files and sub folders"
+#: ../../Zotlabs/Module/Connedit.php:454
+msgid "Refresh failed - channel is currently unavailable."
 msgstr ""
 
-#: ../../Zotlabs/Module/Filestorage.php:161
-msgid "Return to file list"
+#: ../../Zotlabs/Module/Connedit.php:469 ../../Zotlabs/Module/Connedit.php:478
+#: ../../Zotlabs/Module/Connedit.php:487 ../../Zotlabs/Module/Connedit.php:496
+#: ../../Zotlabs/Module/Connedit.php:509
+msgid "Unable to set address book parameters."
 msgstr ""
 
-#: ../../Zotlabs/Module/Filestorage.php:163
-msgid "Copy/paste this code to attach file to a post"
+#: ../../Zotlabs/Module/Connedit.php:533
+msgid "Connection has been removed."
 msgstr ""
 
-#: ../../Zotlabs/Module/Filestorage.php:164
-msgid "Copy/paste this URL to link file from a web page"
+#: ../../Zotlabs/Module/Connedit.php:573 ../../Zotlabs/Lib/Apps.php:228
+#: ../../extend/addon/addon/openclipatar/openclipatar.php:57
+#: ../../include/conversation.php:936 ../../include/conversation.php:1049
+#: ../../include/nav.php:103
+msgid "View Profile"
 msgstr ""
 
-#: ../../Zotlabs/Module/Filestorage.php:166
-msgid "Share this file"
+#: ../../Zotlabs/Module/Connedit.php:576
+#, php-format
+msgid "View %s's profile"
 msgstr ""
 
-#: ../../Zotlabs/Module/Filestorage.php:167
-msgid "Show URL to this file"
+#: ../../Zotlabs/Module/Connedit.php:580
+msgid "Refresh Permissions"
 msgstr ""
 
-#: ../../Zotlabs/Module/Filestorage.php:168
-msgid "Notify your contacts about this file"
+#: ../../Zotlabs/Module/Connedit.php:583
+msgid "Fetch updated permissions"
 msgstr ""
 
-#: ../../Zotlabs/Module/Directory.php:64 ../../Zotlabs/Module/Display.php:17
-#: ../../Zotlabs/Module/Ratings.php:83 ../../Zotlabs/Module/Photos.php:509
-#: ../../Zotlabs/Module/Search.php:17
-#: ../../Zotlabs/Module/Viewconnections.php:23
-#: ../../extend/addon/addon/friendica/dfrn_request.php:794
-msgid "Public access denied."
+#: ../../Zotlabs/Module/Connedit.php:587
+msgid "Recent Activity"
 msgstr ""
 
-#: ../../Zotlabs/Module/Directory.php:245
-#, php-format
-msgid "%d rating"
-msgid_plural "%d ratings"
-msgstr[0] ""
-msgstr[1] ""
+#: ../../Zotlabs/Module/Connedit.php:590
+msgid "View recent posts and comments"
+msgstr ""
 
-#: ../../Zotlabs/Module/Directory.php:256
-msgid "Gender: "
+#: ../../Zotlabs/Module/Connedit.php:597
+msgid "Block (or Unblock) all communications with this connection"
 msgstr ""
 
-#: ../../Zotlabs/Module/Directory.php:258
-msgid "Status: "
+#: ../../Zotlabs/Module/Connedit.php:598
+msgid "This connection is blocked!"
 msgstr ""
 
-#: ../../Zotlabs/Module/Directory.php:260
-msgid "Homepage: "
+#: ../../Zotlabs/Module/Connedit.php:602
+msgid "Unignore"
 msgstr ""
 
-#: ../../Zotlabs/Module/Directory.php:309 ../../include/channel.php:1215
-msgid "Age:"
+#: ../../Zotlabs/Module/Connedit.php:605
+msgid "Ignore (or Unignore) all inbound communications from this connection"
 msgstr ""
 
-#: ../../Zotlabs/Module/Directory.php:314 ../../include/channel.php:1051
-#: ../../include/event.php:52 ../../include/event.php:84
-#: ../../include/bb2diaspora.php:520
-msgid "Location:"
+#: ../../Zotlabs/Module/Connedit.php:606
+msgid "This connection is ignored!"
 msgstr ""
 
-#: ../../Zotlabs/Module/Directory.php:320
-msgid "Description:"
+#: ../../Zotlabs/Module/Connedit.php:610
+msgid "Unarchive"
 msgstr ""
 
-#: ../../Zotlabs/Module/Directory.php:325 ../../include/channel.php:1231
-msgid "Hometown:"
+#: ../../Zotlabs/Module/Connedit.php:610
+msgid "Archive"
 msgstr ""
 
-#: ../../Zotlabs/Module/Directory.php:327 ../../include/channel.php:1239
-msgid "About:"
+#: ../../Zotlabs/Module/Connedit.php:613
+msgid ""
+"Archive (or Unarchive) this connection - mark channel dead but keep content"
 msgstr ""
 
-#: ../../Zotlabs/Module/Directory.php:329
-msgid "Public Forum:"
+#: ../../Zotlabs/Module/Connedit.php:614
+msgid "This connection is archived!"
 msgstr ""
 
-#: ../../Zotlabs/Module/Directory.php:332
-msgid "Keywords: "
+#: ../../Zotlabs/Module/Connedit.php:618
+msgid "Unhide"
 msgstr ""
 
-#: ../../Zotlabs/Module/Directory.php:335
-msgid "Don't suggest"
+#: ../../Zotlabs/Module/Connedit.php:618
+msgid "Hide"
 msgstr ""
 
-#: ../../Zotlabs/Module/Directory.php:337
-msgid "Common connections:"
+#: ../../Zotlabs/Module/Connedit.php:621
+msgid "Hide or Unhide this connection from your other connections"
 msgstr ""
 
-#: ../../Zotlabs/Module/Directory.php:386
-msgid "Global Directory"
+#: ../../Zotlabs/Module/Connedit.php:622
+msgid "This connection is hidden!"
 msgstr ""
 
-#: ../../Zotlabs/Module/Directory.php:386
-msgid "Local Directory"
+#: ../../Zotlabs/Module/Connedit.php:629
+msgid "Delete this connection"
 msgstr ""
 
-#: ../../Zotlabs/Module/Directory.php:392
-msgid "Finding:"
+#: ../../Zotlabs/Module/Connedit.php:640
+msgid "Open Individual Permissions section by default"
 msgstr ""
 
-#: ../../Zotlabs/Module/Directory.php:395 ../../Zotlabs/Module/Suggest.php:64
-#: ../../include/contact_widgets.php:24
-msgid "Channel Suggestions"
+#: ../../Zotlabs/Module/Connedit.php:663
+msgid "Affinity"
 msgstr ""
 
-#: ../../Zotlabs/Module/Directory.php:397
-msgid "next page"
+#: ../../Zotlabs/Module/Connedit.php:666
+msgid "Open Set Affinity section by default"
 msgstr ""
 
-#: ../../Zotlabs/Module/Directory.php:397
-msgid "previous page"
+#: ../../Zotlabs/Module/Connedit.php:670 ../../include/widgets.php:540
+msgid "Me"
 msgstr ""
 
-#: ../../Zotlabs/Module/Directory.php:398
-msgid "Sort options"
+#: ../../Zotlabs/Module/Connedit.php:671 ../../include/widgets.php:541
+msgid "Family"
 msgstr ""
 
-#: ../../Zotlabs/Module/Directory.php:399
-msgid "Alphabetic"
+#: ../../Zotlabs/Module/Connedit.php:672
+#: ../../Zotlabs/Module/Settings/Channel.php:62
+#: ../../Zotlabs/Module/Settings/Channel.php:66
+#: ../../Zotlabs/Module/Settings/Channel.php:67
+#: ../../Zotlabs/Module/Settings/Channel.php:70
+#: ../../Zotlabs/Module/Settings/Channel.php:81
+#: ../../include/selectors.php:123 ../../include/widgets.php:542
+#: ../../include/channel.php:408 ../../include/channel.php:409
+#: ../../include/channel.php:416
+msgid "Friends"
 msgstr ""
 
-#: ../../Zotlabs/Module/Directory.php:400
-msgid "Reverse Alphabetic"
+#: ../../Zotlabs/Module/Connedit.php:673 ../../include/widgets.php:543
+msgid "Acquaintances"
 msgstr ""
 
-#: ../../Zotlabs/Module/Directory.php:401
-msgid "Newest to Oldest"
+#: ../../Zotlabs/Module/Connedit.php:700
+msgid "Filter"
 msgstr ""
 
-#: ../../Zotlabs/Module/Directory.php:402
-msgid "Oldest to Newest"
+#: ../../Zotlabs/Module/Connedit.php:703
+msgid "Open Custom Filter section by default"
 msgstr ""
 
-#: ../../Zotlabs/Module/Directory.php:419
-msgid "No entries (some entries may be hidden)."
+#: ../../Zotlabs/Module/Connedit.php:740
+msgid "Approve this connection"
 msgstr ""
 
-#: ../../Zotlabs/Module/Item.php:184
-msgid "Unable to locate original post."
+#: ../../Zotlabs/Module/Connedit.php:740
+msgid "Accept connection to allow communication"
 msgstr ""
 
-#: ../../Zotlabs/Module/Item.php:447
-msgid "Empty post discarded."
+#: ../../Zotlabs/Module/Connedit.php:745
+msgid "Set Affinity"
 msgstr ""
 
-#: ../../Zotlabs/Module/Item.php:489
-msgid "Executable content type not permitted to this channel."
+#: ../../Zotlabs/Module/Connedit.php:748
+msgid "Set Profile"
 msgstr ""
 
-#: ../../Zotlabs/Module/Item.php:871
-msgid "Duplicate post suppressed."
+#: ../../Zotlabs/Module/Connedit.php:751
+msgid "Set Affinity & Profile"
 msgstr ""
 
-#: ../../Zotlabs/Module/Item.php:1013
-msgid "System error. Post not saved."
+#: ../../Zotlabs/Module/Connedit.php:809
+msgid "none"
 msgstr ""
 
-#: ../../Zotlabs/Module/Item.php:1137
-msgid "Unable to obtain post information from database."
+#: ../../Zotlabs/Module/Connedit.php:812 ../../include/widgets.php:675
+msgid "Connection Default Permissions"
 msgstr ""
 
-#: ../../Zotlabs/Module/Item.php:1144
+#: ../../Zotlabs/Module/Connedit.php:812 ../../include/items.php:3932
 #, php-format
-msgid "You have reached your limit of %1$.0f top level posts."
+msgid "Connection: %s"
 msgstr ""
 
-#: ../../Zotlabs/Module/Item.php:1151
-#, php-format
-msgid "You have reached your limit of %1$.0f webpages."
+#: ../../Zotlabs/Module/Connedit.php:813
+msgid "Apply these permissions automatically"
 msgstr ""
 
-#: ../../Zotlabs/Module/Chanview.php:134
-msgid "toggle full screen mode"
+#: ../../Zotlabs/Module/Connedit.php:813
+msgid "Connection requests will be approved without your interaction"
 msgstr ""
 
-#: ../../Zotlabs/Module/Follow.php:31
-msgid "Channel added."
+#: ../../Zotlabs/Module/Connedit.php:814
+msgid "Permission role"
 msgstr ""
 
-#: ../../Zotlabs/Module/Mail.php:38
-msgid "Unable to lookup recipient."
+#: ../../Zotlabs/Module/Connedit.php:815
+msgid "Add permission role"
 msgstr ""
 
-#: ../../Zotlabs/Module/Mail.php:45
-msgid "Unable to communicate with requested channel."
+#: ../../Zotlabs/Module/Connedit.php:821
+msgid "This connection's primary address is"
 msgstr ""
 
-#: ../../Zotlabs/Module/Mail.php:52
-msgid "Cannot verify requested channel."
+#: ../../Zotlabs/Module/Connedit.php:822
+msgid "Available locations:"
 msgstr ""
 
-#: ../../Zotlabs/Module/Mail.php:70
-msgid "Selected channel has private message restrictions. Send failed."
+#: ../../Zotlabs/Module/Connedit.php:826
+msgid ""
+"The permissions indicated on this page will be applied to all new "
+"connections."
 msgstr ""
 
-#: ../../Zotlabs/Module/Mail.php:149
-msgid "Messages"
+#: ../../Zotlabs/Module/Connedit.php:827
+msgid "Connection Tools"
 msgstr ""
 
-#: ../../Zotlabs/Module/Mail.php:184
-msgid "Message recalled."
+#: ../../Zotlabs/Module/Connedit.php:829
+msgid "Slide to adjust your degree of friendship"
 msgstr ""
 
-#: ../../Zotlabs/Module/Mail.php:197
-msgid "Conversation removed."
+#: ../../Zotlabs/Module/Connedit.php:830 ../../Zotlabs/Module/Rate.php:155
+#: ../../include/js_strings.php:20
+msgid "Rating"
 msgstr ""
 
-#: ../../Zotlabs/Module/Mail.php:211 ../../Zotlabs/Module/Mail.php:320
-#: ../../Zotlabs/Module/Chat.php:205 ../../include/conversation.php:1200
-msgid "Please enter a link URL:"
+#: ../../Zotlabs/Module/Connedit.php:831
+msgid "Slide to adjust your rating"
 msgstr ""
 
-#: ../../Zotlabs/Module/Mail.php:212 ../../Zotlabs/Module/Mail.php:321
-msgid "Expires YYYY-MM-DD HH:MM"
+#: ../../Zotlabs/Module/Connedit.php:832 ../../Zotlabs/Module/Connedit.php:837
+msgid "Optionally explain your rating"
 msgstr ""
 
-#: ../../Zotlabs/Module/Mail.php:240
-msgid "Requested channel is not in this network"
+#: ../../Zotlabs/Module/Connedit.php:834
+msgid "Custom Filter"
 msgstr ""
 
-#: ../../Zotlabs/Module/Mail.php:248
-msgid "Send Private Message"
+#: ../../Zotlabs/Module/Connedit.php:835
+msgid "Only import posts with this text"
 msgstr ""
 
-#: ../../Zotlabs/Module/Mail.php:249 ../../Zotlabs/Module/Mail.php:374
-msgid "To:"
+#: ../../Zotlabs/Module/Connedit.php:835 ../../Zotlabs/Module/Connedit.php:836
+msgid ""
+"words one per line or #tags or /patterns/ or lang=xx, leave blank to import "
+"all posts"
 msgstr ""
 
-#: ../../Zotlabs/Module/Mail.php:252 ../../Zotlabs/Module/Mail.php:376
-msgid "Subject:"
+#: ../../Zotlabs/Module/Connedit.php:836
+msgid "Do not import posts with this text"
 msgstr ""
 
-#: ../../Zotlabs/Module/Mail.php:255 ../../Zotlabs/Module/Invite.php:138
-msgid "Your message:"
+#: ../../Zotlabs/Module/Connedit.php:838
+msgid "This information is public!"
 msgstr ""
 
-#: ../../Zotlabs/Module/Mail.php:257 ../../Zotlabs/Module/Mail.php:382
-#: ../../include/conversation.php:1260
-msgid "Attach file"
+#: ../../Zotlabs/Module/Connedit.php:843
+msgid "Connection Pending Approval"
 msgstr ""
 
-#: ../../Zotlabs/Module/Mail.php:259
-msgid "Send"
+#: ../../Zotlabs/Module/Connedit.php:846
+#: ../../Zotlabs/Module/Settings/Tokens.php:163
+#: ../../Zotlabs/Module/Settings/Permcats.php:107
+msgid "inherited"
 msgstr ""
 
-#: ../../Zotlabs/Module/Mail.php:262 ../../Zotlabs/Module/Mail.php:387
-#: ../../include/conversation.php:1305
-msgid "Set expiration date"
+#: ../../Zotlabs/Module/Connedit.php:848
+#, php-format
+msgid ""
+"Please choose the profile you would like to display to %s when viewing your "
+"profile securely."
 msgstr ""
 
-#: ../../Zotlabs/Module/Mail.php:264 ../../Zotlabs/Module/Mail.php:389
-#: ../../Zotlabs/Module/Chat.php:206 ../../Zotlabs/Lib/ThreadItem.php:741
-#: ../../include/conversation.php:1310
-msgid "Encrypt text"
+#: ../../Zotlabs/Module/Connedit.php:850
+#: ../../Zotlabs/Module/Settings/Tokens.php:160
+msgid "Their Settings"
 msgstr ""
 
-#: ../../Zotlabs/Module/Mail.php:346
-msgid "Delete message"
+#: ../../Zotlabs/Module/Connedit.php:851
+#: ../../Zotlabs/Module/Settings/Tokens.php:161
+#: ../../Zotlabs/Module/Settings/Permcats.php:105
+msgid "My Settings"
 msgstr ""
 
-#: ../../Zotlabs/Module/Mail.php:347
-msgid "Delivery report"
+#: ../../Zotlabs/Module/Connedit.php:853
+#: ../../Zotlabs/Module/Settings/Tokens.php:166
+#: ../../Zotlabs/Module/Settings/Permcats.php:110
+msgid "Individual Permissions"
 msgstr ""
 
-#: ../../Zotlabs/Module/Mail.php:348
-msgid "Recall message"
+#: ../../Zotlabs/Module/Connedit.php:854
+#: ../../Zotlabs/Module/Settings/Tokens.php:167
+#: ../../Zotlabs/Module/Settings/Permcats.php:111
+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/Mail.php:350
-msgid "Message has been recalled."
+#: ../../Zotlabs/Module/Connedit.php:855
+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 change those settings here but they wont have "
+"any impact unless the inherited setting changes."
 msgstr ""
 
-#: ../../Zotlabs/Module/Mail.php:367
-msgid "Delete Conversation"
+#: ../../Zotlabs/Module/Connedit.php:856
+msgid "Last update:"
 msgstr ""
 
-#: ../../Zotlabs/Module/Mail.php:369
-msgid ""
-"No secure communications available. You <strong>may</strong> be able to "
-"respond from the sender's profile page."
+#: ../../Zotlabs/Module/Connedit.php:865
+msgid "Details"
 msgstr ""
 
-#: ../../Zotlabs/Module/Mail.php:373
-msgid "Send Reply"
+#: ../../Zotlabs/Module/Connedit.php:868
+#: ../../extend/addon/addon/cdav/Mod_Cdav.php:1137
+msgid "Organisation"
 msgstr ""
 
-#: ../../Zotlabs/Module/Mail.php:378
-#, php-format
-msgid "Your message for %s (%s):"
+#: ../../Zotlabs/Module/Connedit.php:869
+#: ../../extend/addon/addon/cdav/Mod_Cdav.php:1138
+#: ../../include/page_widgets.php:46
+msgid "Title"
 msgstr ""
 
-#: ../../Zotlabs/Module/Impel.php:41 ../../include/bbcode.php:203
-msgid "webpage"
+#: ../../Zotlabs/Module/Connedit.php:870
+#: ../../extend/addon/addon/cdav/Mod_Cdav.php:1139
+msgid "Phone"
 msgstr ""
 
-#: ../../Zotlabs/Module/Impel.php:46 ../../include/bbcode.php:209
-msgid "block"
+#: ../../Zotlabs/Module/Connedit.php:872
+#: ../../extend/addon/addon/cdav/Mod_Cdav.php:1141
+msgid "Instant messenger"
 msgstr ""
 
-#: ../../Zotlabs/Module/Impel.php:51 ../../include/bbcode.php:206
-msgid "layout"
+#: ../../Zotlabs/Module/Connedit.php:873
+#: ../../extend/addon/addon/cdav/Mod_Cdav.php:1142
+msgid "Website"
 msgstr ""
 
-#: ../../Zotlabs/Module/Impel.php:58 ../../include/bbcode.php:212
-msgid "menu"
+#: ../../Zotlabs/Module/Connedit.php:875
+#: ../../extend/addon/addon/cdav/Mod_Cdav.php:1144
+msgid "Note"
 msgstr ""
 
-#: ../../Zotlabs/Module/Impel.php:191
-#, php-format
-msgid "%s element installed"
+#: ../../Zotlabs/Module/Connedit.php:876
+#: ../../extend/addon/addon/cdav/Mod_Cdav.php:1145
+#: ../../extend/addon/addon/cdav/cdav.php:270
+#: ../../include/connections.php:894
+msgid "Mobile"
 msgstr ""
 
-#: ../../Zotlabs/Module/Impel.php:194
-#, php-format
-msgid "%s element installation failed"
+#: ../../Zotlabs/Module/Connedit.php:877
+#: ../../extend/addon/addon/cdav/Mod_Cdav.php:1146
+#: ../../extend/addon/addon/cdav/cdav.php:271
+#: ../../include/connections.php:895
+msgid "Home"
 msgstr ""
 
-#: ../../Zotlabs/Module/Import_items.php:42 ../../Zotlabs/Module/Import.php:71
-msgid "Nothing to import."
+#: ../../Zotlabs/Module/Connedit.php:878
+#: ../../extend/addon/addon/cdav/Mod_Cdav.php:1147
+#: ../../extend/addon/addon/cdav/cdav.php:274
+#: ../../include/connections.php:898
+msgid "Work"
 msgstr ""
 
-#: ../../Zotlabs/Module/Import_items.php:66 ../../Zotlabs/Module/Import.php:83
-#: ../../Zotlabs/Module/Import.php:98
-msgid "Unable to download data from old server"
+#: ../../Zotlabs/Module/Connedit.php:880
+#: ../../extend/addon/addon/jappixmini/jappixmini.php:368
+#: ../../extend/addon/addon/cdav/Mod_Cdav.php:1149
+msgid "Add Contact"
 msgstr ""
 
-#: ../../Zotlabs/Module/Import_items.php:72
-#: ../../Zotlabs/Module/Import.php:105
-msgid "Imported file is empty."
+#: ../../Zotlabs/Module/Connedit.php:881
+#: ../../extend/addon/addon/cdav/Mod_Cdav.php:1150
+msgid "Add Field"
 msgstr ""
 
-#: ../../Zotlabs/Module/Import_items.php:88
-#: ../../Zotlabs/Module/Import.php:127
-#, php-format
-msgid "Warning: Database versions differ by %1$d updates."
+#: ../../Zotlabs/Module/Connedit.php:886
+#: ../../extend/addon/addon/cdav/Mod_Cdav.php:1155
+msgid "P.O. Box"
 msgstr ""
 
-#: ../../Zotlabs/Module/Import_items.php:104
-msgid "Import completed"
+#: ../../Zotlabs/Module/Connedit.php:887
+#: ../../extend/addon/addon/cdav/Mod_Cdav.php:1156
+msgid "Additional"
 msgstr ""
 
-#: ../../Zotlabs/Module/Import_items.php:119
-msgid "Import Items"
+#: ../../Zotlabs/Module/Connedit.php:888
+#: ../../extend/addon/addon/cdav/Mod_Cdav.php:1157
+msgid "Street"
 msgstr ""
 
-#: ../../Zotlabs/Module/Import_items.php:120
-msgid "Use this form to import existing posts and content from an export file."
+#: ../../Zotlabs/Module/Connedit.php:889
+#: ../../extend/addon/addon/cdav/Mod_Cdav.php:1158
+msgid "Locality"
 msgstr ""
 
-#: ../../Zotlabs/Module/Import_items.php:121
-#: ../../Zotlabs/Module/Import.php:532
-msgid "File to Upload"
+#: ../../Zotlabs/Module/Connedit.php:890
+#: ../../extend/addon/addon/cdav/Mod_Cdav.php:1159
+msgid "Region"
 msgstr ""
 
-#: ../../Zotlabs/Module/Invite.php:29
-msgid "Total invitation limit exceeded."
+#: ../../Zotlabs/Module/Connedit.php:891
+#: ../../extend/addon/addon/cdav/Mod_Cdav.php:1160
+msgid "ZIP Code"
 msgstr ""
 
-#: ../../Zotlabs/Module/Invite.php:53
+#: ../../Zotlabs/Module/Connedit.php:892 ../../Zotlabs/Module/Profiles.php:756
+#: ../../extend/addon/addon/cdav/Mod_Cdav.php:1161
+msgid "Country"
+msgstr ""
+
+#: ../../Zotlabs/Module/Home.php:74 ../../Zotlabs/Module/Home.php:82
+#: ../../extend/addon/addon/opensearch/opensearch.php:42
+msgid "$Projectname"
+msgstr ""
+
+#: ../../Zotlabs/Module/Home.php:92
 #, php-format
-msgid "%s : Not a valid email address."
+msgid "Welcome to %s"
 msgstr ""
 
-#: ../../Zotlabs/Module/Invite.php:67
-msgid "Please join us on $Projectname"
+#: ../../Zotlabs/Module/Filestorage.php:87
+msgid "Permission Denied."
 msgstr ""
 
-#: ../../Zotlabs/Module/Invite.php:77
-msgid "Invitation limit exceeded. Please contact your site administrator."
+#: ../../Zotlabs/Module/Filestorage.php:103
+msgid "File not found."
 msgstr ""
 
-#: ../../Zotlabs/Module/Invite.php:82
-#, php-format
-msgid "%s : Message delivery failed."
+#: ../../Zotlabs/Module/Filestorage.php:146
+msgid "Edit file permissions"
 msgstr ""
 
-#: ../../Zotlabs/Module/Invite.php:86
-#, php-format
-msgid "%d message sent."
-msgid_plural "%d messages sent."
-msgstr[0] ""
-msgstr[1] ""
+#: ../../Zotlabs/Module/Filestorage.php:159
+msgid "Set/edit permissions"
+msgstr ""
 
-#: ../../Zotlabs/Module/Invite.php:105
-msgid "You have no more invitations available"
+#: ../../Zotlabs/Module/Filestorage.php:160
+msgid "Include all files and sub folders"
 msgstr ""
 
-#: ../../Zotlabs/Module/Invite.php:136
-msgid "Send invitations"
+#: ../../Zotlabs/Module/Filestorage.php:161
+msgid "Return to file list"
 msgstr ""
 
-#: ../../Zotlabs/Module/Invite.php:137
-msgid "Enter email addresses, one per line:"
+#: ../../Zotlabs/Module/Filestorage.php:163
+msgid "Copy/paste this code to attach file to a post"
 msgstr ""
 
-#: ../../Zotlabs/Module/Invite.php:139
-msgid "Please join my community on $Projectname."
+#: ../../Zotlabs/Module/Filestorage.php:164
+msgid "Copy/paste this URL to link file from a web page"
 msgstr ""
 
-#: ../../Zotlabs/Module/Invite.php:141
-msgid "You will need to supply this invitation code:"
+#: ../../Zotlabs/Module/Filestorage.php:166
+msgid "Share this file"
 msgstr ""
 
-#: ../../Zotlabs/Module/Invite.php:142
-msgid "1. Register at any $Projectname location (they are all inter-connected)"
+#: ../../Zotlabs/Module/Filestorage.php:167
+msgid "Show URL to this file"
 msgstr ""
 
-#: ../../Zotlabs/Module/Invite.php:144
-msgid "2. Enter my $Projectname network address into the site searchbar."
+#: ../../Zotlabs/Module/Filestorage.php:168
+msgid "Notify your contacts about this file"
 msgstr ""
 
-#: ../../Zotlabs/Module/Invite.php:145
-msgid "or visit"
+#: ../../Zotlabs/Module/Fbrowser.php:29 ../../Zotlabs/Lib/Apps.php:229
+#: ../../include/conversation.php:1836
+msgid "Photos"
 msgstr ""
 
-#: ../../Zotlabs/Module/Invite.php:147
-msgid "3. Click [Connect]"
+#: ../../Zotlabs/Module/Apps.php:45 ../../include/widgets.php:102
+#: ../../include/nav.php:178
+msgid "Apps"
 msgstr ""
 
-#: ../../Zotlabs/Module/Editblock.php:108 ../../Zotlabs/Module/Blocks.php:97
-#: ../../Zotlabs/Module/Blocks.php:155
-msgid "Block Name"
+#: ../../Zotlabs/Module/Cal.php:69
+msgid "Permissions denied."
 msgstr ""
 
-#: ../../Zotlabs/Module/Editblock.php:124 ../../include/conversation.php:1276
-msgid "Title (optional)"
+#: ../../Zotlabs/Module/Cal.php:263 ../../Zotlabs/Module/Events.php:605
+msgid "l, F j"
 msgstr ""
 
-#: ../../Zotlabs/Module/Editblock.php:133
-msgid "Edit Block"
+#: ../../Zotlabs/Module/Cal.php:312 ../../Zotlabs/Module/Events.php:660
+#: ../../include/text.php:1761
+msgid "Link to Source"
+msgstr ""
+
+#: ../../Zotlabs/Module/Cal.php:335 ../../Zotlabs/Module/Events.php:688
+msgid "Edit Event"
+msgstr ""
+
+#: ../../Zotlabs/Module/Cal.php:335 ../../Zotlabs/Module/Events.php:688
+msgid "Create Event"
+msgstr ""
+
+#: ../../Zotlabs/Module/Cal.php:338 ../../Zotlabs/Module/Events.php:691
+#: ../../include/channel.php:1370
+msgid "Export"
+msgstr ""
+
+#: ../../Zotlabs/Module/Cal.php:341 ../../include/text.php:2307
+msgid "Import"
+msgstr ""
+
+#: ../../Zotlabs/Module/Cal.php:345 ../../Zotlabs/Module/Events.php:700
+#: ../../extend/addon/addon/cdav/Mod_Cdav.php:848
+msgid "Today"
 msgstr ""
 
 #: ../../Zotlabs/Module/Group.php:24
@@ -3594,7 +3727,7 @@ msgid "Could not create privacy group."
 msgstr ""
 
 #: ../../Zotlabs/Module/Group.php:42 ../../Zotlabs/Module/Group.php:141
-#: ../../include/items.php:3876
+#: ../../include/items.php:3899
 msgid "Privacy group not found."
 msgstr ""
 
@@ -3626,10 +3759,6 @@ msgstr ""
 msgid "Privacy group editor"
 msgstr ""
 
-#: ../../Zotlabs/Module/Group.php:197
-msgid "Members"
-msgstr ""
-
 #: ../../Zotlabs/Module/Group.php:199
 msgid "All Connected Channels"
 msgstr ""
@@ -3638,24 +3767,261 @@ msgstr ""
 msgid "Click on a channel to add or remove."
 msgstr ""
 
-#: ../../Zotlabs/Module/Profperm.php:34 ../../Zotlabs/Module/Profperm.php:63
-msgid "Invalid profile identifier."
+#: ../../Zotlabs/Module/Dreport.php:45
+msgid "Invalid message"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profperm.php:115
-msgid "Profile Visibility Editor"
+#: ../../Zotlabs/Module/Dreport.php:78
+msgid "no results"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profperm.php:117 ../../include/channel.php:1282
-msgid "Profile"
+#: ../../Zotlabs/Module/Dreport.php:93
+msgid "channel sync processed"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profperm.php:119
-msgid "Click on a contact to add or remove."
+#: ../../Zotlabs/Module/Dreport.php:97
+msgid "queued"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profperm.php:128
-msgid "Visible To"
+#: ../../Zotlabs/Module/Dreport.php:101
+msgid "posted"
+msgstr ""
+
+#: ../../Zotlabs/Module/Dreport.php:105
+msgid "accepted for delivery"
+msgstr ""
+
+#: ../../Zotlabs/Module/Dreport.php:109
+msgid "updated"
+msgstr ""
+
+#: ../../Zotlabs/Module/Dreport.php:112
+msgid "update ignored"
+msgstr ""
+
+#: ../../Zotlabs/Module/Dreport.php:115
+msgid "permission denied"
+msgstr ""
+
+#: ../../Zotlabs/Module/Dreport.php:119
+msgid "recipient not found"
+msgstr ""
+
+#: ../../Zotlabs/Module/Dreport.php:122
+msgid "mail recalled"
+msgstr ""
+
+#: ../../Zotlabs/Module/Dreport.php:125
+msgid "duplicate mail received"
+msgstr ""
+
+#: ../../Zotlabs/Module/Dreport.php:128
+msgid "mail delivered"
+msgstr ""
+
+#: ../../Zotlabs/Module/Dreport.php:148
+#, php-format
+msgid "Delivery report for %1$s"
+msgstr ""
+
+#: ../../Zotlabs/Module/Dreport.php:151
+msgid "Options"
+msgstr ""
+
+#: ../../Zotlabs/Module/Dreport.php:152
+msgid "Redeliver"
+msgstr ""
+
+#: ../../Zotlabs/Module/Impel.php:41 ../../include/bbcode.php:203
+msgid "webpage"
+msgstr ""
+
+#: ../../Zotlabs/Module/Impel.php:46 ../../include/bbcode.php:209
+msgid "block"
+msgstr ""
+
+#: ../../Zotlabs/Module/Impel.php:51 ../../include/bbcode.php:206
+msgid "layout"
+msgstr ""
+
+#: ../../Zotlabs/Module/Impel.php:58 ../../include/bbcode.php:212
+msgid "menu"
+msgstr ""
+
+#: ../../Zotlabs/Module/Impel.php:191
+#, php-format
+msgid "%s element installed"
+msgstr ""
+
+#: ../../Zotlabs/Module/Impel.php:194
+#, php-format
+msgid "%s element installation failed"
+msgstr ""
+
+#: ../../Zotlabs/Module/Import_items.php:42 ../../Zotlabs/Module/Import.php:57
+msgid "Nothing to import."
+msgstr ""
+
+#: ../../Zotlabs/Module/Import_items.php:66 ../../Zotlabs/Module/Import.php:69
+#: ../../Zotlabs/Module/Import.php:84
+msgid "Unable to download data from old server"
+msgstr ""
+
+#: ../../Zotlabs/Module/Import_items.php:72 ../../Zotlabs/Module/Import.php:91
+msgid "Imported file is empty."
+msgstr ""
+
+#: ../../Zotlabs/Module/Import_items.php:88
+#: ../../Zotlabs/Module/Import.php:111
+#, php-format
+msgid "Warning: Database versions differ by %1$d updates."
+msgstr ""
+
+#: ../../Zotlabs/Module/Import_items.php:104
+msgid "Import completed"
+msgstr ""
+
+#: ../../Zotlabs/Module/Import_items.php:119
+msgid "Import Items"
+msgstr ""
+
+#: ../../Zotlabs/Module/Import_items.php:120
+msgid "Use this form to import existing posts and content from an export file."
+msgstr ""
+
+#: ../../Zotlabs/Module/Import_items.php:121
+#: ../../Zotlabs/Module/Import.php:495
+msgid "File to Upload"
+msgstr ""
+
+#: ../../Zotlabs/Module/Manage.php:136
+#: ../../Zotlabs/Module/New_channel.php:121
+#, php-format
+msgid "You have created %1$.0f of %2$.0f allowed channels."
+msgstr ""
+
+#: ../../Zotlabs/Module/Manage.php:143
+msgid "Create a new channel"
+msgstr ""
+
+#: ../../Zotlabs/Module/Manage.php:143 ../../Zotlabs/Module/Profiles.php:813
+#: ../../Zotlabs/Module/Wiki.php:166 ../../Zotlabs/Module/Chat.php:255
+#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:152
+msgid "Create New"
+msgstr ""
+
+#: ../../Zotlabs/Module/Manage.php:164 ../../Zotlabs/Lib/Apps.php:221
+#: ../../include/nav.php:223
+msgid "Channel Manager"
+msgstr ""
+
+#: ../../Zotlabs/Module/Manage.php:165
+msgid "Current Channel"
+msgstr ""
+
+#: ../../Zotlabs/Module/Manage.php:167
+msgid "Switch to one of your channels by selecting it."
+msgstr ""
+
+#: ../../Zotlabs/Module/Manage.php:168
+msgid "Default Channel"
+msgstr ""
+
+#: ../../Zotlabs/Module/Manage.php:169
+msgid "Make Default"
+msgstr ""
+
+#: ../../Zotlabs/Module/Manage.php:172
+#, php-format
+msgid "%d new messages"
+msgstr ""
+
+#: ../../Zotlabs/Module/Manage.php:173
+#, php-format
+msgid "%d new introductions"
+msgstr ""
+
+#: ../../Zotlabs/Module/Manage.php:175
+msgid "Delegated Channel"
+msgstr ""
+
+#: ../../Zotlabs/Module/Import.php:134
+#, php-format
+msgid "Your service plan only allows %d channels."
+msgstr ""
+
+#: ../../Zotlabs/Module/Import.php:149
+msgid "No channel. Import failed."
+msgstr ""
+
+#: ../../Zotlabs/Module/Import.php:467
+#: ../../extend/addon/addon/diaspora/import_diaspora.php:142
+msgid "Import completed."
+msgstr ""
+
+#: ../../Zotlabs/Module/Import.php:488
+msgid "You must be logged in to use this feature."
+msgstr ""
+
+#: ../../Zotlabs/Module/Import.php:493
+msgid "Import Channel"
+msgstr ""
+
+#: ../../Zotlabs/Module/Import.php:494
+msgid ""
+"Use this form to import an existing channel from a different server/hub. You "
+"may retrieve the channel identity from the old server/hub via the network or "
+"provide an export file."
+msgstr ""
+
+#: ../../Zotlabs/Module/Import.php:496
+msgid "Or provide the old server/hub details"
+msgstr ""
+
+#: ../../Zotlabs/Module/Import.php:497
+msgid "Your old identity address (xyz@example.com)"
+msgstr ""
+
+#: ../../Zotlabs/Module/Import.php:498
+msgid "Your old login email address"
+msgstr ""
+
+#: ../../Zotlabs/Module/Import.php:499
+msgid "Your old login password"
+msgstr ""
+
+#: ../../Zotlabs/Module/Import.php:500
+msgid ""
+"For either option, please choose whether to make this hub your new primary "
+"address, or whether your old location should continue this role. You will be "
+"able to post from either location, but only one can be marked as the primary "
+"location for files, photos, and media."
+msgstr ""
+
+#: ../../Zotlabs/Module/Import.php:501
+msgid "Make this hub my primary location"
+msgstr ""
+
+#: ../../Zotlabs/Module/Import.php:502
+msgid "Move this channel (disable all previous locations)"
+msgstr ""
+
+#: ../../Zotlabs/Module/Import.php:503
+msgid "Import a few months of posts if possible (limited by available memory"
+msgstr ""
+
+#: ../../Zotlabs/Module/Import.php:504
+msgid ""
+"This process may take several minutes to complete. Please submit the form "
+"only once and leave this page open until finished."
+msgstr ""
+
+#: ../../Zotlabs/Module/Lockview.php:75
+msgid "Remote privacy information not available."
+msgstr ""
+
+#: ../../Zotlabs/Module/Lockview.php:96
+msgid "Visible to:"
 msgstr ""
 
 #: ../../Zotlabs/Module/Magic.php:71
@@ -3679,7 +4045,7 @@ msgid "Menu Item Permissions"
 msgstr ""
 
 #: ../../Zotlabs/Module/Mitem.php:154 ../../Zotlabs/Module/Mitem.php:231
-#: ../../Zotlabs/Module/Settings/Channel.php:489
+#: ../../Zotlabs/Module/Settings/Channel.php:510
 msgid "(click to open/close)"
 msgstr ""
 
@@ -3779,6 +4145,72 @@ msgstr ""
 msgid "Link text"
 msgstr ""
 
+#: ../../Zotlabs/Module/Appman.php:38 ../../Zotlabs/Module/Appman.php:54
+msgid "App installed."
+msgstr ""
+
+#: ../../Zotlabs/Module/Appman.php:47
+msgid "Malformed app."
+msgstr ""
+
+#: ../../Zotlabs/Module/Appman.php:110
+msgid "Embed code"
+msgstr ""
+
+#: ../../Zotlabs/Module/Appman.php:116
+msgid "Edit App"
+msgstr ""
+
+#: ../../Zotlabs/Module/Appman.php:116
+msgid "Create App"
+msgstr ""
+
+#: ../../Zotlabs/Module/Appman.php:121
+msgid "Name of app"
+msgstr ""
+
+#: ../../Zotlabs/Module/Appman.php:121 ../../Zotlabs/Module/Appman.php:122
+#: ../../Zotlabs/Module/Profiles.php:744 ../../Zotlabs/Module/Profiles.php:748
+#: ../../Zotlabs/Module/Events.php:460 ../../Zotlabs/Module/Events.php:465
+#: ../../include/datetime.php:259
+msgid "Required"
+msgstr ""
+
+#: ../../Zotlabs/Module/Appman.php:122
+msgid "Location (URL) of app"
+msgstr ""
+
+#: ../../Zotlabs/Module/Appman.php:123 ../../Zotlabs/Module/Events.php:473
+#: ../../Zotlabs/Module/Rbmark.php:101
+#: ../../extend/addon/addon/cdav/Mod_Cdav.php:838
+#: ../../extend/addon/addon/rendezvous/rendezvous.php:173
+msgid "Description"
+msgstr ""
+
+#: ../../Zotlabs/Module/Appman.php:124
+msgid "Photo icon URL"
+msgstr ""
+
+#: ../../Zotlabs/Module/Appman.php:124
+msgid "80 x 80 pixels - optional"
+msgstr ""
+
+#: ../../Zotlabs/Module/Appman.php:125
+msgid "Categories (optional, comma separated list)"
+msgstr ""
+
+#: ../../Zotlabs/Module/Appman.php:126
+msgid "Version ID"
+msgstr ""
+
+#: ../../Zotlabs/Module/Appman.php:127
+msgid "Price of app"
+msgstr ""
+
+#: ../../Zotlabs/Module/Appman.php:128
+msgid "Location (URL) to purchase app"
+msgstr ""
+
 #: ../../Zotlabs/Module/Ratings.php:70
 msgid "No ratings"
 msgstr ""
@@ -3805,7 +4237,7 @@ msgctxt "mood"
 msgid "%1$s is %2$s"
 msgstr ""
 
-#: ../../Zotlabs/Module/Mood.php:135 ../../Zotlabs/Lib/Apps.php:227
+#: ../../Zotlabs/Module/Mood.php:135 ../../Zotlabs/Lib/Apps.php:234
 msgid "Mood"
 msgstr ""
 
@@ -3814,325 +4246,429 @@ msgid "Set your current mood and tell your friends"
 msgstr ""
 
 #: ../../Zotlabs/Module/Notify.php:57
-#: ../../Zotlabs/Module/Notifications.php:35
+#: ../../Zotlabs/Module/Notifications.php:38
 msgid "No more system notifications."
 msgstr ""
 
 #: ../../Zotlabs/Module/Notify.php:61
-#: ../../Zotlabs/Module/Notifications.php:39
+#: ../../Zotlabs/Module/Notifications.php:42
 msgid "System Notifications"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:82
-msgid "Page owner information could not be retrieved."
+#: ../../Zotlabs/Module/Profiles.php:24 ../../Zotlabs/Module/Profiles.php:184
+#: ../../Zotlabs/Module/Profiles.php:241 ../../Zotlabs/Module/Profiles.php:660
+#: ../../extend/addon/addon/friendica/dfrn_confirm.php:62
+msgid "Profile not found."
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:97 ../../Zotlabs/Module/Photos.php:734
-#: ../../Zotlabs/Module/Profile_photo.php:115
-#: ../../Zotlabs/Module/Profile_photo.php:219
-#: ../../extend/addon/addon/openclipatar/openclipatar.php:225
-#: ../../include/photo/photo_driver.php:728
-msgid "Profile Photos"
+#: ../../Zotlabs/Module/Profiles.php:44
+msgid "Profile deleted."
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:103 ../../Zotlabs/Module/Photos.php:129
-msgid "Album not found."
+#: ../../Zotlabs/Module/Profiles.php:68 ../../Zotlabs/Module/Profiles.php:105
+msgid "Profile-"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:112
-msgid "Delete Album"
+#: ../../Zotlabs/Module/Profiles.php:90 ../../Zotlabs/Module/Profiles.php:127
+msgid "New profile created."
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:133
-msgid ""
-"Multiple storage folders exist with this album name, but within different "
-"directories. Please remove the desired folder or folders using the Files "
-"manager"
+#: ../../Zotlabs/Module/Profiles.php:111
+msgid "Profile unavailable to clone."
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:190 ../../Zotlabs/Module/Photos.php:1059
-msgid "Delete Photo"
+#: ../../Zotlabs/Module/Profiles.php:146
+msgid "Profile unavailable to export."
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:520
-msgid "No photos selected"
+#: ../../Zotlabs/Module/Profiles.php:252
+msgid "Profile Name is required."
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:569
-msgid "Access to this item is restricted."
+#: ../../Zotlabs/Module/Profiles.php:460
+msgid "Marital Status"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:608
-#, php-format
-msgid "%1$.2f MB of %2$.2f MB photo storage used."
+#: ../../Zotlabs/Module/Profiles.php:464
+msgid "Romantic Partner"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:611
-#, php-format
-msgid "%1$.2f MB photo storage used."
+#: ../../Zotlabs/Module/Profiles.php:468 ../../Zotlabs/Module/Profiles.php:771
+msgid "Likes"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:647
-msgid "Upload Photos"
+#: ../../Zotlabs/Module/Profiles.php:472 ../../Zotlabs/Module/Profiles.php:772
+msgid "Dislikes"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:651
-msgid "Enter an album name"
+#: ../../Zotlabs/Module/Profiles.php:476 ../../Zotlabs/Module/Profiles.php:779
+msgid "Work/Employment"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:652
-msgid "or select an existing album (doubleclick)"
+#: ../../Zotlabs/Module/Profiles.php:479
+msgid "Religion"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:653
-msgid "Create a status post for this upload"
+#: ../../Zotlabs/Module/Profiles.php:483
+msgid "Political Views"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:654
-msgid "Caption (optional):"
+#: ../../Zotlabs/Module/Profiles.php:487
+#: ../../extend/addon/addon/openid/MysqlProvider.php:74
+msgid "Gender"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:655
-msgid "Description (optional):"
+#: ../../Zotlabs/Module/Profiles.php:491
+msgid "Sexual Preference"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:686
-msgid "Album name could not be decoded"
+#: ../../Zotlabs/Module/Profiles.php:495
+msgid "Homepage"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:734
-msgid "Contact Photos"
+#: ../../Zotlabs/Module/Profiles.php:499
+msgid "Interests"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:757
-msgid "Show Newest First"
+#: ../../Zotlabs/Module/Profiles.php:595
+msgid "Profile updated."
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:759
-msgid "Show Oldest First"
+#: ../../Zotlabs/Module/Profiles.php:679
+msgid "Hide your connections list from viewers of this profile"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:783 ../../Zotlabs/Module/Photos.php:1337
-#: ../../Zotlabs/Module/Embedphotos.php:139 ../../include/widgets.php:1748
-msgid "View Photo"
+#: ../../Zotlabs/Module/Profiles.php:721
+msgid "Edit Profile Details"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:814
-#: ../../Zotlabs/Module/Embedphotos.php:155 ../../include/widgets.php:1765
-msgid "Edit Album"
+#: ../../Zotlabs/Module/Profiles.php:723
+msgid "View this profile"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:861
-msgid "Permission denied. Access to this item may be restricted."
+#: ../../Zotlabs/Module/Profiles.php:724 ../../Zotlabs/Module/Profiles.php:806
+#: ../../include/channel.php:1066
+msgid "Edit visibility"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:863
-msgid "Photo not available"
+#: ../../Zotlabs/Module/Profiles.php:725
+msgid "Profile Tools"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:921
-msgid "Use as profile photo"
+#: ../../Zotlabs/Module/Profiles.php:726
+msgid "Change cover photo"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:922
-msgid "Use as cover photo"
+#: ../../Zotlabs/Module/Profiles.php:727 ../../include/channel.php:1037
+msgid "Change profile photo"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:929
-msgid "Private Photo"
+#: ../../Zotlabs/Module/Profiles.php:728
+msgid "Create a new profile using these settings"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:940 ../../Zotlabs/Module/Cal.php:336
-#: ../../Zotlabs/Module/Cal.php:343 ../../Zotlabs/Module/Events.php:680
-#: ../../Zotlabs/Module/Events.php:689
-#: ../../extend/addon/addon/cdav/Mod_Cdav.php:846
-msgid "Previous"
+#: ../../Zotlabs/Module/Profiles.php:729
+msgid "Clone this profile"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:944
-msgid "View Full Size"
+#: ../../Zotlabs/Module/Profiles.php:730
+msgid "Delete this profile"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:949 ../../Zotlabs/Module/Setup.php:264
-#: ../../Zotlabs/Module/Cal.php:337 ../../Zotlabs/Module/Cal.php:344
-#: ../../Zotlabs/Module/Events.php:681 ../../Zotlabs/Module/Events.php:690
-#: ../../extend/addon/addon/cdav/Mod_Cdav.php:847
-msgid "Next"
+#: ../../Zotlabs/Module/Profiles.php:731
+msgid "Add profile things"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:1033
-msgid "Edit photo"
+#: ../../Zotlabs/Module/Profiles.php:732 ../../include/conversation.php:1715
+#: ../../include/widgets.php:105
+msgid "Personal"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:1035
-msgid "Rotate CW (right)"
+#: ../../Zotlabs/Module/Profiles.php:734
+msgid "Relation"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:1036
-msgid "Rotate CCW (left)"
+#: ../../Zotlabs/Module/Profiles.php:735 ../../include/datetime.php:55
+msgid "Miscellaneous"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:1039
-msgid "Move photo to album"
+#: ../../Zotlabs/Module/Profiles.php:737
+msgid "Import profile from file"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:1040
-msgid "Enter a new album name"
+#: ../../Zotlabs/Module/Profiles.php:738
+msgid "Export profile to file"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:1041
-msgid "or select an existing one (doubleclick)"
+#: ../../Zotlabs/Module/Profiles.php:739
+msgid "Your gender"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:1044
-msgid "Caption"
+#: ../../Zotlabs/Module/Profiles.php:740
+msgid "Marital status"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:1046
-msgid "Add a Tag"
+#: ../../Zotlabs/Module/Profiles.php:741
+msgid "Sexual preference"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:1054
-msgid "Example: @bob, @Barbara_Jensen, @jim@example.com"
+#: ../../Zotlabs/Module/Profiles.php:744
+msgid "Profile name"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:1057
-msgid "Flag as adult in album view"
+#: ../../Zotlabs/Module/Profiles.php:746
+msgid "This is your default profile."
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:1076 ../../Zotlabs/Lib/ThreadItem.php:268
-msgid "I like this (toggle)"
+#: ../../Zotlabs/Module/Profiles.php:748
+msgid "Your full name"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:1077 ../../Zotlabs/Lib/ThreadItem.php:269
-msgid "I don't like this (toggle)"
+#: ../../Zotlabs/Module/Profiles.php:749
+msgid "Title/Description"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:1078 ../../Zotlabs/Module/Blocks.php:161
-#: ../../Zotlabs/Module/Layouts.php:193 ../../Zotlabs/Module/Webpages.php:241
-#: ../../extend/addon/addon/cdav/include/widgets.php:123
-#: ../../include/conversation.php:1248
-msgid "Share"
+#: ../../Zotlabs/Module/Profiles.php:752
+msgid "Street address"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:1079 ../../Zotlabs/Lib/ThreadItem.php:409
-#: ../../include/conversation.php:757
-msgid "Please wait"
+#: ../../Zotlabs/Module/Profiles.php:753
+msgid "Locality/City"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:1095 ../../Zotlabs/Module/Photos.php:1213
-#: ../../Zotlabs/Lib/ThreadItem.php:726
-msgid "This is you"
+#: ../../Zotlabs/Module/Profiles.php:754
+msgid "Region/State"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:1097 ../../Zotlabs/Module/Photos.php:1215
-#: ../../Zotlabs/Lib/ThreadItem.php:728 ../../include/js_strings.php:6
-msgid "Comment"
+#: ../../Zotlabs/Module/Profiles.php:755
+msgid "Postal/Zip code"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:1099 ../../Zotlabs/Module/Webpages.php:247
-#: ../../Zotlabs/Module/Events.php:471 ../../Zotlabs/Lib/ThreadItem.php:738
-#: ../../include/page_widgets.php:43 ../../include/conversation.php:1217
-msgid "Preview"
+#: ../../Zotlabs/Module/Profiles.php:761
+msgid "Who (if applicable)"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:1113 ../../include/conversation.php:593
-msgctxt "title"
-msgid "Likes"
+#: ../../Zotlabs/Module/Profiles.php:761
+msgid "Examples: cathy123, Cathy Williams, cathy@example.com"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:1113 ../../include/conversation.php:593
-msgctxt "title"
-msgid "Dislikes"
+#: ../../Zotlabs/Module/Profiles.php:762
+msgid "Since (date)"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:1114 ../../include/conversation.php:594
-msgctxt "title"
-msgid "Agree"
+#: ../../Zotlabs/Module/Profiles.php:765
+msgid "Tell us about yourself"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:1114 ../../include/conversation.php:594
-msgctxt "title"
-msgid "Disagree"
+#: ../../Zotlabs/Module/Profiles.php:766
+#: ../../extend/addon/addon/openid/MysqlProvider.php:68
+msgid "Homepage URL"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:1114 ../../include/conversation.php:594
-msgctxt "title"
-msgid "Abstain"
+#: ../../Zotlabs/Module/Profiles.php:767
+msgid "Hometown"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:1115 ../../include/conversation.php:595
-msgctxt "title"
-msgid "Attending"
+#: ../../Zotlabs/Module/Profiles.php:768
+msgid "Political views"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:1115 ../../include/conversation.php:595
-msgctxt "title"
-msgid "Not attending"
+#: ../../Zotlabs/Module/Profiles.php:769
+msgid "Religious views"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:1115 ../../include/conversation.php:595
-msgctxt "title"
-msgid "Might attend"
+#: ../../Zotlabs/Module/Profiles.php:770
+msgid "Keywords used in directory listings"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:1132 ../../Zotlabs/Module/Photos.php:1144
-#: ../../Zotlabs/Lib/ThreadItem.php:186 ../../Zotlabs/Lib/ThreadItem.php:198
-#: ../../include/conversation.php:1783
-msgid "View all"
+#: ../../Zotlabs/Module/Profiles.php:770
+msgid "Example: fishing photography software"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:1136 ../../Zotlabs/Lib/ThreadItem.php:190
-#: ../../include/channel.php:1190 ../../include/taxonomy.php:403
-#: ../../include/conversation.php:1807
-msgctxt "noun"
-msgid "Like"
-msgid_plural "Likes"
-msgstr[0] ""
-msgstr[1] ""
+#: ../../Zotlabs/Module/Profiles.php:773
+msgid "Musical interests"
+msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:1141 ../../Zotlabs/Lib/ThreadItem.php:195
-#: ../../include/conversation.php:1810
-msgctxt "noun"
-msgid "Dislike"
-msgid_plural "Dislikes"
+#: ../../Zotlabs/Module/Profiles.php:774
+msgid "Books, literature"
+msgstr ""
+
+#: ../../Zotlabs/Module/Profiles.php:775
+msgid "Television"
+msgstr ""
+
+#: ../../Zotlabs/Module/Profiles.php:776
+msgid "Film/Dance/Culture/Entertainment"
+msgstr ""
+
+#: ../../Zotlabs/Module/Profiles.php:777
+msgid "Hobbies/Interests"
+msgstr ""
+
+#: ../../Zotlabs/Module/Profiles.php:778
+msgid "Love/Romance"
+msgstr ""
+
+#: ../../Zotlabs/Module/Profiles.php:780
+msgid "School/Education"
+msgstr ""
+
+#: ../../Zotlabs/Module/Profiles.php:781
+msgid "Contact information and social networks"
+msgstr ""
+
+#: ../../Zotlabs/Module/Profiles.php:782
+msgid "My other channels"
+msgstr ""
+
+#: ../../Zotlabs/Module/Profiles.php:802 ../../include/channel.php:1062
+msgid "Profile Image"
+msgstr ""
+
+#: ../../Zotlabs/Module/Profiles.php:812 ../../include/channel.php:1044
+#: ../../include/nav.php:105
+msgid "Edit Profiles"
+msgstr ""
+
+#: ../../Zotlabs/Module/Api.php:72 ../../Zotlabs/Module/Api.php:93
+msgid "Authorize application connection"
+msgstr ""
+
+#: ../../Zotlabs/Module/Api.php:73
+msgid "Return to your app and insert this Security Code:"
+msgstr ""
+
+#: ../../Zotlabs/Module/Api.php:83
+msgid "Please login to continue."
+msgstr ""
+
+#: ../../Zotlabs/Module/Api.php:95
+msgid ""
+"Do you want to authorize this application to access your posts and contacts, "
+"and/or create new posts for you?"
+msgstr ""
+
+#: ../../Zotlabs/Module/Invite.php:29
+msgid "Total invitation limit exceeded."
+msgstr ""
+
+#: ../../Zotlabs/Module/Invite.php:53
+#, php-format
+msgid "%s : Not a valid email address."
+msgstr ""
+
+#: ../../Zotlabs/Module/Invite.php:67
+msgid "Please join us on $Projectname"
+msgstr ""
+
+#: ../../Zotlabs/Module/Invite.php:77
+msgid "Invitation limit exceeded. Please contact your site administrator."
+msgstr ""
+
+#: ../../Zotlabs/Module/Invite.php:82
+#, php-format
+msgid "%s : Message delivery failed."
+msgstr ""
+
+#: ../../Zotlabs/Module/Invite.php:86
+#, php-format
+msgid "%d message sent."
+msgid_plural "%d messages sent."
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../../Zotlabs/Module/Photos.php:1241
-msgid "Photo Tools"
+#: ../../Zotlabs/Module/Invite.php:105
+msgid "You have no more invitations available"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:1250
-msgid "In This Photo:"
+#: ../../Zotlabs/Module/Invite.php:136
+msgid "Send invitations"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:1255
-msgid "Map"
+#: ../../Zotlabs/Module/Invite.php:137
+msgid "Enter email addresses, one per line:"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:1263 ../../Zotlabs/Lib/ThreadItem.php:398
-msgctxt "noun"
-msgid "Likes"
+#: ../../Zotlabs/Module/Invite.php:138 ../../Zotlabs/Module/Mail.php:284
+msgid "Your message:"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:1264 ../../Zotlabs/Lib/ThreadItem.php:399
-msgctxt "noun"
-msgid "Dislikes"
+#: ../../Zotlabs/Module/Invite.php:139
+msgid "Please join my community on $Projectname."
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:1269 ../../Zotlabs/Lib/ThreadItem.php:404
-#: ../../include/acl_selectors.php:210
-msgid "Close"
+#: ../../Zotlabs/Module/Invite.php:141
+msgid "You will need to supply this invitation code:"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:1343
-msgid "View Album"
+#: ../../Zotlabs/Module/Invite.php:142
+msgid "1. Register at any $Projectname location (they are all inter-connected)"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:1354 ../../Zotlabs/Module/Photos.php:1367
-#: ../../Zotlabs/Module/Photos.php:1368
-msgid "Recent Photos"
+#: ../../Zotlabs/Module/Invite.php:144
+msgid "2. Enter my $Projectname network address into the site searchbar."
+msgstr ""
+
+#: ../../Zotlabs/Module/Invite.php:145
+msgid "or visit"
+msgstr ""
+
+#: ../../Zotlabs/Module/Invite.php:147
+msgid "3. Click [Connect]"
+msgstr ""
+
+#: ../../Zotlabs/Module/Siteinfo.php:20
+msgid "About this site"
+msgstr ""
+
+#: ../../Zotlabs/Module/Siteinfo.php:21
+msgid "Site Name"
+msgstr ""
+
+#: ../../Zotlabs/Module/Siteinfo.php:25 ../../include/network.php:1972
+msgid "Administrator"
+msgstr ""
+
+#: ../../Zotlabs/Module/Siteinfo.php:28
+msgid "Software and Project information"
+msgstr ""
+
+#: ../../Zotlabs/Module/Siteinfo.php:29
+msgid "This site is powered by $Projectname"
+msgstr ""
+
+#: ../../Zotlabs/Module/Siteinfo.php:30
+msgid ""
+"Federated and decentralised networking and identity services provided by Zot"
+msgstr ""
+
+#: ../../Zotlabs/Module/Siteinfo.php:32
+#, php-format
+msgid "Version %s"
+msgstr ""
+
+#: ../../Zotlabs/Module/Siteinfo.php:33
+msgid "Project homepage"
+msgstr ""
+
+#: ../../Zotlabs/Module/Siteinfo.php:34
+msgid "Developer homepage"
+msgstr ""
+
+#: ../../Zotlabs/Module/New_channel.php:140
+msgid "Create Channel"
+msgstr ""
+
+#: ../../Zotlabs/Module/New_channel.php:141
+msgid ""
+"A channel is your identity on this network. It can represent a person, a "
+"blog, or a forum to name a few. Channels can make connections with other "
+"channels to share information with highly detailed permissions."
+msgstr ""
+
+#: ../../Zotlabs/Module/New_channel.php:142
+msgid ""
+"or <a href=\"import\">import an existing channel</a> from another location."
 msgstr ""
 
 #: ../../Zotlabs/Module/Setup.php:176
@@ -4164,7 +4700,7 @@ msgid ""
 msgstr ""
 
 #: ../../Zotlabs/Module/Setup.php:201 ../../Zotlabs/Module/Setup.php:263
-#: ../../Zotlabs/Module/Setup.php:745
+#: ../../Zotlabs/Module/Setup.php:750
 msgid "Please see the file \"install/INSTALL.txt\"."
 msgstr ""
 
@@ -4339,192 +4875,192 @@ msgstr ""
 msgid "Generate encryption keys"
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:500
+#: ../../Zotlabs/Module/Setup.php:505
 msgid "libCurl PHP module"
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:501
+#: ../../Zotlabs/Module/Setup.php:506
 msgid "GD graphics PHP module"
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:502
+#: ../../Zotlabs/Module/Setup.php:507
 msgid "OpenSSL PHP module"
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:503
+#: ../../Zotlabs/Module/Setup.php:508
 msgid "PDO database PHP module"
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:504
+#: ../../Zotlabs/Module/Setup.php:509
 msgid "mb_string PHP module"
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:505
+#: ../../Zotlabs/Module/Setup.php:510
 msgid "xml PHP module"
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:509 ../../Zotlabs/Module/Setup.php:511
+#: ../../Zotlabs/Module/Setup.php:514 ../../Zotlabs/Module/Setup.php:516
 msgid "Apache mod_rewrite module"
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:509
+#: ../../Zotlabs/Module/Setup.php:514
 msgid ""
 "Error: Apache webserver mod-rewrite module is required but not installed."
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:515 ../../Zotlabs/Module/Setup.php:518
+#: ../../Zotlabs/Module/Setup.php:520 ../../Zotlabs/Module/Setup.php:523
 msgid "exec"
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:515
+#: ../../Zotlabs/Module/Setup.php:520
 msgid ""
 "Error: exec is required but is either not installed or has been disabled in "
 "php.ini"
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:521 ../../Zotlabs/Module/Setup.php:524
+#: ../../Zotlabs/Module/Setup.php:526 ../../Zotlabs/Module/Setup.php:529
 msgid "shell_exec"
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:521
+#: ../../Zotlabs/Module/Setup.php:526
 msgid ""
 "Error: shell_exec is required but is either not installed or has been "
 "disabled in php.ini"
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:529
+#: ../../Zotlabs/Module/Setup.php:534
 msgid "Error: libCURL PHP module required but not installed."
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:533
+#: ../../Zotlabs/Module/Setup.php:538
 msgid ""
 "Error: GD graphics PHP module with JPEG support required but not installed."
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:537
+#: ../../Zotlabs/Module/Setup.php:542
 msgid "Error: openssl PHP module required but not installed."
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:541
+#: ../../Zotlabs/Module/Setup.php:546
 msgid "Error: PDO database PHP module required but not installed."
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:545
+#: ../../Zotlabs/Module/Setup.php:550
 msgid "Error: mb_string PHP module required but not installed."
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:549
+#: ../../Zotlabs/Module/Setup.php:554
 msgid "Error: xml PHP module required for DAV but not installed."
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:567
+#: ../../Zotlabs/Module/Setup.php:572
 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:568
+#: ../../Zotlabs/Module/Setup.php:573
 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:569
+#: ../../Zotlabs/Module/Setup.php:574
 msgid ""
 "At the end of this procedure, we will give you a text to save in a file "
 "named .htconfig.php in your Red top folder."
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:570
+#: ../../Zotlabs/Module/Setup.php:575
 msgid ""
 "You can alternatively skip this procedure and perform a manual installation. "
 "Please see the file \"install/INSTALL.txt\" for instructions."
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:573
+#: ../../Zotlabs/Module/Setup.php:578
 msgid ".htconfig.php is writable"
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:587
+#: ../../Zotlabs/Module/Setup.php:592
 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:588
+#: ../../Zotlabs/Module/Setup.php:593
 #, 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:589 ../../Zotlabs/Module/Setup.php:610
+#: ../../Zotlabs/Module/Setup.php:594 ../../Zotlabs/Module/Setup.php:615
 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:590
+#: ../../Zotlabs/Module/Setup.php:595
 #, 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:593
+#: ../../Zotlabs/Module/Setup.php:598
 #, php-format
 msgid "%s is writable"
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:609
+#: ../../Zotlabs/Module/Setup.php:614
 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:613
+#: ../../Zotlabs/Module/Setup.php:618
 msgid "store is writable"
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:646
+#: ../../Zotlabs/Module/Setup.php:651
 msgid ""
 "SSL certificate cannot be validated. Fix certificate or disable https access "
 "to this site."
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:647
+#: ../../Zotlabs/Module/Setup.php:652
 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:648
+#: ../../Zotlabs/Module/Setup.php:653
 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:649
+#: ../../Zotlabs/Module/Setup.php:654
 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:650
+#: ../../Zotlabs/Module/Setup.php:655
 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:651
+#: ../../Zotlabs/Module/Setup.php:656
 msgid ""
 "Providers are available that issue free certificates which are browser-valid."
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:653
+#: ../../Zotlabs/Module/Setup.php:658
 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. "
@@ -4532,72 +5068,48 @@ msgid ""
 "server communications."
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:655
+#: ../../Zotlabs/Module/Setup.php:660
 msgid "SSL certificate validation"
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:661
+#: ../../Zotlabs/Module/Setup.php:666
 msgid ""
 "Url rewrite in .htaccess is not working. Check your server configuration."
 "Test: "
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:664
+#: ../../Zotlabs/Module/Setup.php:669
 msgid "Url rewrite is working"
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:678
+#: ../../Zotlabs/Module/Setup.php:683
 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:702
+#: ../../Zotlabs/Module/Setup.php:707
 #: ../../extend/addon/addon/cdav/cdav.php:41
-#: ../../extend/addon/addon/rendezvous/rendezvous.php:352
+#: ../../extend/addon/addon/rendezvous/rendezvous.php:401
 msgid "Errors encountered creating database tables."
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:743
+#: ../../Zotlabs/Module/Setup.php:748
 msgid "<h1>What next</h1>"
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:744
+#: ../../Zotlabs/Module/Setup.php:749
 msgid ""
 "IMPORTANT: You will need to [manually] setup a scheduled task for the poller."
 msgstr ""
 
-#: ../../Zotlabs/Module/Editpost.php:35
-msgid "Item is not editable"
-msgstr ""
-
-#: ../../Zotlabs/Module/Regdir.php:49 ../../Zotlabs/Module/Dirsearch.php:25
-msgid "This site is not a directory server"
-msgstr ""
-
-#: ../../Zotlabs/Module/New_channel.php:140
-msgid "Create Channel"
-msgstr ""
-
-#: ../../Zotlabs/Module/New_channel.php:141
-msgid ""
-"A channel is your identity on this network. It can represent a person, a "
-"blog, or a forum to name a few. Channels can make connections with other "
-"channels to share information with highly detailed permissions."
-msgstr ""
-
-#: ../../Zotlabs/Module/New_channel.php:142
-msgid ""
-"or <a href=\"import\">import an existing channel</a> from another location."
-msgstr ""
-
-#: ../../Zotlabs/Module/Notifications.php:40 ../../include/nav.php:194
+#: ../../Zotlabs/Module/Notifications.php:43 ../../include/nav.php:208
 msgid "Mark all system notifications seen"
 msgstr ""
 
-#: ../../Zotlabs/Module/Poke.php:168 ../../Zotlabs/Lib/Apps.php:228
-#: ../../include/conversation.php:975
+#: ../../Zotlabs/Module/Poke.php:168 ../../Zotlabs/Lib/Apps.php:235
+#: ../../include/conversation.php:942 ../../include/conversation.php:1109
 msgid "Poke"
 msgstr ""
 
@@ -4625,292 +5137,46 @@ msgstr ""
 msgid "Make this post private"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:24 ../../Zotlabs/Module/Profiles.php:183
-#: ../../Zotlabs/Module/Profiles.php:240 ../../Zotlabs/Module/Profiles.php:619
-#: ../../extend/addon/addon/friendica/dfrn_confirm.php:62
-msgid "Profile not found."
-msgstr ""
-
-#: ../../Zotlabs/Module/Profiles.php:44
-msgid "Profile deleted."
-msgstr ""
-
-#: ../../Zotlabs/Module/Profiles.php:68 ../../Zotlabs/Module/Profiles.php:104
-msgid "Profile-"
-msgstr ""
-
-#: ../../Zotlabs/Module/Profiles.php:89 ../../Zotlabs/Module/Profiles.php:126
-msgid "New profile created."
-msgstr ""
-
-#: ../../Zotlabs/Module/Profiles.php:110
-msgid "Profile unavailable to clone."
-msgstr ""
-
-#: ../../Zotlabs/Module/Profiles.php:145
-msgid "Profile unavailable to export."
-msgstr ""
-
-#: ../../Zotlabs/Module/Profiles.php:250
-msgid "Profile Name is required."
-msgstr ""
-
-#: ../../Zotlabs/Module/Profiles.php:421
-msgid "Marital Status"
-msgstr ""
-
-#: ../../Zotlabs/Module/Profiles.php:425
-msgid "Romantic Partner"
-msgstr ""
-
-#: ../../Zotlabs/Module/Profiles.php:429 ../../Zotlabs/Module/Profiles.php:730
-msgid "Likes"
-msgstr ""
-
-#: ../../Zotlabs/Module/Profiles.php:433 ../../Zotlabs/Module/Profiles.php:731
-msgid "Dislikes"
-msgstr ""
-
-#: ../../Zotlabs/Module/Profiles.php:437 ../../Zotlabs/Module/Profiles.php:738
-msgid "Work/Employment"
-msgstr ""
-
-#: ../../Zotlabs/Module/Profiles.php:440
-msgid "Religion"
-msgstr ""
-
-#: ../../Zotlabs/Module/Profiles.php:444
-msgid "Political Views"
-msgstr ""
-
-#: ../../Zotlabs/Module/Profiles.php:448
-#: ../../extend/addon/addon/openid/MysqlProvider.php:74
-msgid "Gender"
-msgstr ""
-
-#: ../../Zotlabs/Module/Profiles.php:452
-msgid "Sexual Preference"
-msgstr ""
-
-#: ../../Zotlabs/Module/Profiles.php:456
-msgid "Homepage"
-msgstr ""
-
-#: ../../Zotlabs/Module/Profiles.php:460
-msgid "Interests"
-msgstr ""
-
-#: ../../Zotlabs/Module/Profiles.php:554
-msgid "Profile updated."
-msgstr ""
-
-#: ../../Zotlabs/Module/Profiles.php:638
-msgid "Hide your connections list from viewers of this profile"
-msgstr ""
-
-#: ../../Zotlabs/Module/Profiles.php:680
-msgid "Edit Profile Details"
-msgstr ""
-
-#: ../../Zotlabs/Module/Profiles.php:682
-msgid "View this profile"
-msgstr ""
-
-#: ../../Zotlabs/Module/Profiles.php:683 ../../Zotlabs/Module/Profiles.php:765
-#: ../../include/channel.php:983
-msgid "Edit visibility"
-msgstr ""
-
-#: ../../Zotlabs/Module/Profiles.php:684
-msgid "Profile Tools"
-msgstr ""
-
-#: ../../Zotlabs/Module/Profiles.php:685
-msgid "Change cover photo"
-msgstr ""
-
-#: ../../Zotlabs/Module/Profiles.php:686 ../../include/channel.php:954
-msgid "Change profile photo"
-msgstr ""
-
-#: ../../Zotlabs/Module/Profiles.php:687
-msgid "Create a new profile using these settings"
-msgstr ""
-
-#: ../../Zotlabs/Module/Profiles.php:688
-msgid "Clone this profile"
-msgstr ""
-
-#: ../../Zotlabs/Module/Profiles.php:689
-msgid "Delete this profile"
-msgstr ""
-
-#: ../../Zotlabs/Module/Profiles.php:690
-msgid "Add profile things"
-msgstr ""
-
-#: ../../Zotlabs/Module/Profiles.php:691 ../../include/widgets.php:105
-#: ../../include/conversation.php:1585
-msgid "Personal"
-msgstr ""
-
-#: ../../Zotlabs/Module/Profiles.php:693
-msgid "Relation"
-msgstr ""
-
-#: ../../Zotlabs/Module/Profiles.php:694 ../../include/datetime.php:55
-msgid "Miscellaneous"
-msgstr ""
-
-#: ../../Zotlabs/Module/Profiles.php:696
-msgid "Import profile from file"
-msgstr ""
-
-#: ../../Zotlabs/Module/Profiles.php:697
-msgid "Export profile to file"
-msgstr ""
-
-#: ../../Zotlabs/Module/Profiles.php:698
-msgid "Your gender"
-msgstr ""
-
-#: ../../Zotlabs/Module/Profiles.php:699
-msgid "Marital status"
-msgstr ""
-
-#: ../../Zotlabs/Module/Profiles.php:700
-msgid "Sexual preference"
-msgstr ""
-
-#: ../../Zotlabs/Module/Profiles.php:703
-msgid "Profile name"
-msgstr ""
-
-#: ../../Zotlabs/Module/Profiles.php:705
-msgid "This is your default profile."
-msgstr ""
-
-#: ../../Zotlabs/Module/Profiles.php:707
-msgid "Your full name"
-msgstr ""
-
-#: ../../Zotlabs/Module/Profiles.php:708
-msgid "Title/Description"
-msgstr ""
-
-#: ../../Zotlabs/Module/Profiles.php:711
-msgid "Street address"
-msgstr ""
-
-#: ../../Zotlabs/Module/Profiles.php:712
-msgid "Locality/City"
-msgstr ""
-
-#: ../../Zotlabs/Module/Profiles.php:713
-msgid "Region/State"
-msgstr ""
-
-#: ../../Zotlabs/Module/Profiles.php:714
-msgid "Postal/Zip code"
-msgstr ""
-
-#: ../../Zotlabs/Module/Profiles.php:715
-#: ../../extend/addon/addon/cdav/Mod_Cdav.php:1161
-msgid "Country"
-msgstr ""
-
-#: ../../Zotlabs/Module/Profiles.php:720
-msgid "Who (if applicable)"
-msgstr ""
-
-#: ../../Zotlabs/Module/Profiles.php:720
-msgid "Examples: cathy123, Cathy Williams, cathy@example.com"
-msgstr ""
-
-#: ../../Zotlabs/Module/Profiles.php:721
-msgid "Since (date)"
-msgstr ""
-
-#: ../../Zotlabs/Module/Profiles.php:724
-msgid "Tell us about yourself"
-msgstr ""
-
-#: ../../Zotlabs/Module/Profiles.php:725
-#: ../../extend/addon/addon/openid/MysqlProvider.php:68
-msgid "Homepage URL"
-msgstr ""
-
-#: ../../Zotlabs/Module/Profiles.php:726
-msgid "Hometown"
-msgstr ""
-
-#: ../../Zotlabs/Module/Profiles.php:727
-msgid "Political views"
-msgstr ""
-
-#: ../../Zotlabs/Module/Profiles.php:728
-msgid "Religious views"
-msgstr ""
-
-#: ../../Zotlabs/Module/Profiles.php:729
-msgid "Keywords used in directory listings"
-msgstr ""
-
-#: ../../Zotlabs/Module/Profiles.php:729
-msgid "Example: fishing photography software"
-msgstr ""
-
-#: ../../Zotlabs/Module/Profiles.php:732
-msgid "Musical interests"
-msgstr ""
-
-#: ../../Zotlabs/Module/Profiles.php:733
-msgid "Books, literature"
-msgstr ""
-
-#: ../../Zotlabs/Module/Profiles.php:734
-msgid "Television"
-msgstr ""
-
-#: ../../Zotlabs/Module/Profiles.php:735
-msgid "Film/Dance/Culture/Entertainment"
+#: ../../Zotlabs/Module/Oexchange.php:27
+msgid "Unable to find your hub."
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:736
-msgid "Hobbies/Interests"
+#: ../../Zotlabs/Module/Oexchange.php:41
+msgid "Post successful."
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:737
-msgid "Love/Romance"
+#: ../../Zotlabs/Module/Item.php:184
+msgid "Unable to locate original post."
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:739
-msgid "School/Education"
+#: ../../Zotlabs/Module/Item.php:450
+msgid "Empty post discarded."
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:740
-msgid "Contact information and social networks"
+#: ../../Zotlabs/Module/Item.php:492
+msgid "Executable content type not permitted to this channel."
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:741
-msgid "My other channels"
+#: ../../Zotlabs/Module/Item.php:842
+msgid "Duplicate post suppressed."
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:761 ../../include/channel.php:979
-msgid "Profile Image"
+#: ../../Zotlabs/Module/Item.php:984
+msgid "System error. Post not saved."
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:771 ../../include/channel.php:961
-#: ../../include/nav.php:91
-msgid "Edit Profiles"
+#: ../../Zotlabs/Module/Item.php:1114
+msgid "Unable to obtain post information from database."
 msgstr ""
 
-#: ../../Zotlabs/Module/Oexchange.php:27
-msgid "Unable to find your hub."
+#: ../../Zotlabs/Module/Item.php:1121
+#, php-format
+msgid "You have reached your limit of %1$.0f top level posts."
 msgstr ""
 
-#: ../../Zotlabs/Module/Oexchange.php:41
-msgid "Post successful."
+#: ../../Zotlabs/Module/Item.php:1128
+#, php-format
+msgid "You have reached your limit of %1$.0f webpages."
 msgstr ""
 
 #: ../../Zotlabs/Module/Pconfig.php:26 ../../Zotlabs/Module/Pconfig.php:59
@@ -4928,7 +5194,11 @@ msgid ""
 "to correctly use this feature."
 msgstr ""
 
-#: ../../Zotlabs/Module/Blocks.php:154 ../../include/text.php:2270
+#: ../../Zotlabs/Module/Profile.php:78
+msgid "vcard"
+msgstr ""
+
+#: ../../Zotlabs/Module/Blocks.php:154 ../../include/text.php:2283
 msgid "Blocks"
 msgstr ""
 
@@ -4936,12 +5206,12 @@ msgstr ""
 msgid "Block Title"
 msgstr ""
 
-#: ../../Zotlabs/Module/Layouts.php:183 ../../include/text.php:2272
+#: ../../Zotlabs/Module/Layouts.php:183 ../../include/text.php:2285
 msgid "Layouts"
 msgstr ""
 
-#: ../../Zotlabs/Module/Layouts.php:185 ../../Zotlabs/Lib/Apps.php:225
-#: ../../include/nav.php:162 ../../include/help.php:53
+#: ../../Zotlabs/Module/Layouts.php:185 ../../Zotlabs/Lib/Apps.php:232
+#: ../../include/nav.php:174 ../../include/help.php:53
 #: ../../include/help.php:59
 msgid "Help"
 msgstr ""
@@ -4975,228 +5245,211 @@ msgstr ""
 msgid "Optionally explain your rating (this information is public)"
 msgstr ""
 
-#: ../../Zotlabs/Module/Like.php:19
-msgid "Like/Dislike"
+#: ../../Zotlabs/Module/Profile_photo.php:190
+#: ../../extend/addon/addon/openclipatar/openclipatar.php:295
+msgid ""
+"Shift-reload the page or clear browser cache if the new photo does not "
+"display immediately."
 msgstr ""
 
-#: ../../Zotlabs/Module/Like.php:24
-msgid "This action is restricted to members."
+#: ../../Zotlabs/Module/Profile_photo.php:411
+msgid "Use Photo for Profile"
 msgstr ""
 
-#: ../../Zotlabs/Module/Like.php:25
-msgid ""
-"Please <a href=\"rmagic\">login with your $Projectname ID</a> or <a href="
-"\"register\">register as a new $Projectname member</a> to continue."
+#: ../../Zotlabs/Module/Profile_photo.php:411
+msgid "Upload Profile Photo"
 msgstr ""
 
-#: ../../Zotlabs/Module/Like.php:105 ../../Zotlabs/Module/Like.php:131
-#: ../../Zotlabs/Module/Like.php:169
-msgid "Invalid request."
+#: ../../Zotlabs/Module/Profile_photo.php:412
+#: ../../extend/addon/addon/openclipatar/openclipatar.php:182
+#: ../../extend/addon/addon/openclipatar/openclipatar.php:194
+msgid "Use"
 msgstr ""
 
-#: ../../Zotlabs/Module/Like.php:117 ../../include/conversation.php:126
-msgid "channel"
+#: ../../Zotlabs/Module/Events.php:25
+msgid "Calendar entries imported."
 msgstr ""
 
-#: ../../Zotlabs/Module/Like.php:146
-msgid "thing"
+#: ../../Zotlabs/Module/Events.php:27
+msgid "No calendar entries found."
 msgstr ""
 
-#: ../../Zotlabs/Module/Like.php:192
-msgid "Channel unavailable."
+#: ../../Zotlabs/Module/Events.php:110
+msgid "Event can not end before it has started."
 msgstr ""
 
-#: ../../Zotlabs/Module/Like.php:240
-msgid "Previous action reversed."
+#: ../../Zotlabs/Module/Events.php:112 ../../Zotlabs/Module/Events.php:121
+#: ../../Zotlabs/Module/Events.php:143
+msgid "Unable to generate preview."
 msgstr ""
 
-#: ../../Zotlabs/Module/Like.php:370 ../../Zotlabs/Module/Subthread.php:87
-#: ../../Zotlabs/Module/Tagger.php:47
-#: ../../extend/addon/addon/diaspora/inbound.php:1792
-#: ../../extend/addon/addon/redphotos/redphotohelper.php:74
-#: ../../include/text.php:1940 ../../include/conversation.php:120
-msgid "photo"
+#: ../../Zotlabs/Module/Events.php:119
+msgid "Event title and start time are required."
 msgstr ""
 
-#: ../../Zotlabs/Module/Like.php:370 ../../Zotlabs/Module/Subthread.php:87
-#: ../../extend/addon/addon/diaspora/inbound.php:1792
-#: ../../include/text.php:1946 ../../include/conversation.php:148
-msgid "status"
+#: ../../Zotlabs/Module/Events.php:141 ../../Zotlabs/Module/Events.php:265
+msgid "Event not found."
 msgstr ""
 
-#: ../../Zotlabs/Module/Like.php:372 ../../Zotlabs/Module/Tagger.php:51
-#: ../../Zotlabs/Module/Events.php:256 ../../include/text.php:1943
-#: ../../include/event.php:961 ../../include/conversation.php:123
-msgid "event"
+#: ../../Zotlabs/Module/Events.php:460
+msgid "Edit event title"
 msgstr ""
 
-#: ../../Zotlabs/Module/Like.php:419
-#: ../../extend/addon/addon/diaspora/inbound.php:1821
-#: ../../include/conversation.php:164
-#, php-format
-msgid "%1$s likes %2$s's %3$s"
+#: ../../Zotlabs/Module/Events.php:460
+#: ../../extend/addon/addon/cdav/Mod_Cdav.php:835
+msgid "Event title"
 msgstr ""
 
-#: ../../Zotlabs/Module/Like.php:421 ../../include/conversation.php:167
-#, php-format
-msgid "%1$s doesn't like %2$s's %3$s"
+#: ../../Zotlabs/Module/Events.php:462
+msgid "Categories (comma-separated list)"
 msgstr ""
 
-#: ../../Zotlabs/Module/Like.php:423
-#, php-format
-msgid "%1$s agrees with %2$s's %3$s"
+#: ../../Zotlabs/Module/Events.php:463
+msgid "Edit Category"
 msgstr ""
 
-#: ../../Zotlabs/Module/Like.php:425
-#, php-format
-msgid "%1$s doesn't agree with %2$s's %3$s"
+#: ../../Zotlabs/Module/Events.php:463
+msgid "Category"
 msgstr ""
 
-#: ../../Zotlabs/Module/Like.php:427
-#, php-format
-msgid "%1$s abstains from a decision on %2$s's %3$s"
+#: ../../Zotlabs/Module/Events.php:466
+msgid "Edit start date and time"
 msgstr ""
 
-#: ../../Zotlabs/Module/Like.php:429
-#, php-format
-msgid "%1$s is attending %2$s's %3$s"
+#: ../../Zotlabs/Module/Events.php:466
+#: ../../extend/addon/addon/cdav/Mod_Cdav.php:836
+msgid "Start date and time"
 msgstr ""
 
-#: ../../Zotlabs/Module/Like.php:431
-#, php-format
-msgid "%1$s is not attending %2$s's %3$s"
+#: ../../Zotlabs/Module/Events.php:467 ../../Zotlabs/Module/Events.php:470
+msgid "Finish date and time are not known or not relevant"
 msgstr ""
 
-#: ../../Zotlabs/Module/Like.php:433
-#, php-format
-msgid "%1$s may attend %2$s's %3$s"
+#: ../../Zotlabs/Module/Events.php:469
+msgid "Edit finish date and time"
 msgstr ""
 
-#: ../../Zotlabs/Module/Like.php:538
-msgid "Action completed."
+#: ../../Zotlabs/Module/Events.php:469
+msgid "Finish date and time"
 msgstr ""
 
-#: ../../Zotlabs/Module/Like.php:539
-msgid "Thank you."
+#: ../../Zotlabs/Module/Events.php:471 ../../Zotlabs/Module/Events.php:472
+msgid "Adjust for viewer timezone"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profile_photo.php:186
-#: ../../extend/addon/addon/openclipatar/openclipatar.php:293
+#: ../../Zotlabs/Module/Events.php:471
 msgid ""
-"Shift-reload the page or clear browser cache if the new photo does not "
-"display immediately."
+"Important for events that happen in a particular place. Not practical for "
+"global holidays."
 msgstr ""
 
-#: ../../Zotlabs/Module/Profile_photo.php:409
-msgid "Use Photo for Profile"
+#: ../../Zotlabs/Module/Events.php:473
+msgid "Edit Description"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profile_photo.php:409
-msgid "Upload Profile Photo"
+#: ../../Zotlabs/Module/Events.php:475
+msgid "Edit Location"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profile_photo.php:410
-#: ../../extend/addon/addon/openclipatar/openclipatar.php:181
-#: ../../extend/addon/addon/openclipatar/openclipatar.php:193
-msgid "Use"
+#: ../../Zotlabs/Module/Events.php:479 ../../include/conversation.php:1410
+msgid "Permission settings"
 msgstr ""
 
-#: ../../Zotlabs/Module/Search.php:223
-#, php-format
-msgid "Items tagged with: %s"
+#: ../../Zotlabs/Module/Events.php:489
+msgid "Timezone:"
 msgstr ""
 
-#: ../../Zotlabs/Module/Search.php:225
-#, php-format
-msgid "Search results for: %s"
+#: ../../Zotlabs/Module/Events.php:494
+msgid "Advanced Options"
 msgstr ""
 
-#: ../../Zotlabs/Module/Common.php:14
-msgid "No channel."
+#: ../../Zotlabs/Module/Events.php:633
+msgid "Edit event"
 msgstr ""
 
-#: ../../Zotlabs/Module/Common.php:43
-msgid "Common connections"
+#: ../../Zotlabs/Module/Events.php:635
+msgid "Delete event"
 msgstr ""
 
-#: ../../Zotlabs/Module/Common.php:48
-msgid "No connections in common."
+#: ../../Zotlabs/Module/Events.php:669
+msgid "calendar"
 msgstr ""
 
-#: ../../Zotlabs/Module/Api.php:72 ../../Zotlabs/Module/Api.php:93
-msgid "Authorize application connection"
+#: ../../Zotlabs/Module/Events.php:695
+#: ../../extend/addon/addon/cdav/Mod_Cdav.php:849
+msgid "Month"
 msgstr ""
 
-#: ../../Zotlabs/Module/Api.php:73
-msgid "Return to your app and insert this Security Code:"
+#: ../../Zotlabs/Module/Events.php:696
+#: ../../extend/addon/addon/cdav/Mod_Cdav.php:850
+msgid "Week"
 msgstr ""
 
-#: ../../Zotlabs/Module/Api.php:83
-msgid "Please login to continue."
+#: ../../Zotlabs/Module/Events.php:697
+#: ../../extend/addon/addon/cdav/Mod_Cdav.php:851
+msgid "Day"
 msgstr ""
 
-#: ../../Zotlabs/Module/Api.php:95
-msgid ""
-"Do you want to authorize this application to access your posts and contacts, "
-"and/or create new posts for you?"
+#: ../../Zotlabs/Module/Events.php:731
+msgid "Event removed"
 msgstr ""
 
-#: ../../Zotlabs/Module/Ping.php:254
-msgid "sent you a private message"
+#: ../../Zotlabs/Module/Events.php:734
+msgid "Failed to remove event"
 msgstr ""
 
-#: ../../Zotlabs/Module/Ping.php:302
-msgid "added your channel"
+#: ../../Zotlabs/Module/Common.php:14
+msgid "No channel."
 msgstr ""
 
-#: ../../Zotlabs/Module/Ping.php:312
-msgid "g A l F d"
+#: ../../Zotlabs/Module/Common.php:43
+msgid "Common connections"
 msgstr ""
 
-#: ../../Zotlabs/Module/Ping.php:330
-msgid "[today]"
+#: ../../Zotlabs/Module/Common.php:48
+msgid "No connections in common."
 msgstr ""
 
-#: ../../Zotlabs/Module/Ping.php:339
-msgid "posted an event"
+#: ../../Zotlabs/Module/Chanview.php:134
+msgid "toggle full screen mode"
 msgstr ""
 
-#: ../../Zotlabs/Module/Siteinfo.php:20
-msgid "About this site"
+#: ../../Zotlabs/Module/Profperm.php:34 ../../Zotlabs/Module/Profperm.php:63
+msgid "Invalid profile identifier."
 msgstr ""
 
-#: ../../Zotlabs/Module/Siteinfo.php:21
-msgid "Site Name"
+#: ../../Zotlabs/Module/Profperm.php:111
+msgid "Profile Visibility Editor"
 msgstr ""
 
-#: ../../Zotlabs/Module/Siteinfo.php:25 ../../include/network.php:1962
-msgid "Administrator"
+#: ../../Zotlabs/Module/Profperm.php:113 ../../include/channel.php:1367
+msgid "Profile"
 msgstr ""
 
-#: ../../Zotlabs/Module/Siteinfo.php:28
-msgid "Software and Project information"
+#: ../../Zotlabs/Module/Profperm.php:115
+msgid "Click on a contact to add or remove."
 msgstr ""
 
-#: ../../Zotlabs/Module/Siteinfo.php:29
-msgid "This site is powered by $Projectname"
+#: ../../Zotlabs/Module/Profperm.php:124
+msgid "Visible To"
 msgstr ""
 
-#: ../../Zotlabs/Module/Siteinfo.php:30
-msgid ""
-"Federated and decentralised networking and identity services provided by Zot"
+#: ../../Zotlabs/Module/Channel.php:32 ../../Zotlabs/Module/Chat.php:25
+#: ../../extend/addon/addon/chess/chess.php:400
+#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:26
+msgid "You must be logged in to see this page."
 msgstr ""
 
-#: ../../Zotlabs/Module/Siteinfo.php:32
-#, php-format
-msgid "Version %s"
+#: ../../Zotlabs/Module/Channel.php:44
+msgid "Posts and comments"
 msgstr ""
 
-#: ../../Zotlabs/Module/Siteinfo.php:33
-msgid "Project homepage"
+#: ../../Zotlabs/Module/Channel.php:45
+msgid "Only posts"
 msgstr ""
 
-#: ../../Zotlabs/Module/Siteinfo.php:34
-msgid "Developer homepage"
+#: ../../Zotlabs/Module/Channel.php:104
+msgid "Insufficient permissions.  Request redirected to profile page."
 msgstr ""
 
 #: ../../Zotlabs/Module/Lostpass.php:19
@@ -5223,7 +5476,7 @@ msgid ""
 "Password reset failed."
 msgstr ""
 
-#: ../../Zotlabs/Module/Lostpass.php:91 ../../boot.php:1727
+#: ../../Zotlabs/Module/Lostpass.php:91 ../../boot.php:1740
 msgid "Password Reset"
 msgstr ""
 
@@ -5288,23 +5541,23 @@ msgstr ""
 msgid "Or enter new bookmark folder name"
 msgstr ""
 
-#: ../../Zotlabs/Module/Dirsearch.php:33
-msgid "This directory server requires an access token"
+#: ../../Zotlabs/Module/Follow.php:31
+msgid "Channel added."
 msgstr ""
 
 #: ../../Zotlabs/Module/Rmagic.php:35
 msgid "Authentication failed."
 msgstr ""
 
-#: ../../Zotlabs/Module/Rmagic.php:75
+#: ../../Zotlabs/Module/Rmagic.php:75 ../../include/channel.php:1991
 msgid "Remote Authentication"
 msgstr ""
 
-#: ../../Zotlabs/Module/Rmagic.php:76
+#: ../../Zotlabs/Module/Rmagic.php:76 ../../include/channel.php:1992
 msgid "Enter your channel address (e.g. channel@example.com)"
 msgstr ""
 
-#: ../../Zotlabs/Module/Rmagic.php:77
+#: ../../Zotlabs/Module/Rmagic.php:77 ../../include/channel.php:1993
 msgid "Authenticate"
 msgstr ""
 
@@ -5384,22 +5637,22 @@ msgstr ""
 msgid "Layout Help"
 msgstr ""
 
-#: ../../Zotlabs/Module/Uexport.php:55 ../../Zotlabs/Module/Uexport.php:56
+#: ../../Zotlabs/Module/Uexport.php:57 ../../Zotlabs/Module/Uexport.php:58
 msgid "Export Channel"
 msgstr ""
 
-#: ../../Zotlabs/Module/Uexport.php:57
+#: ../../Zotlabs/Module/Uexport.php:59
 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:58
+#: ../../Zotlabs/Module/Uexport.php:60
 msgid "Export Content"
 msgstr ""
 
-#: ../../Zotlabs/Module/Uexport.php:59
+#: ../../Zotlabs/Module/Uexport.php:61
 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 "
@@ -5408,11 +5661,11 @@ msgid ""
 "this download to begin."
 msgstr ""
 
-#: ../../Zotlabs/Module/Uexport.php:60
+#: ../../Zotlabs/Module/Uexport.php:63
 msgid "Export your posts from a given year."
 msgstr ""
 
-#: ../../Zotlabs/Module/Uexport.php:62
+#: ../../Zotlabs/Module/Uexport.php:65
 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. "
@@ -5420,21 +5673,21 @@ msgid ""
 "please try again selecting a more limited date range."
 msgstr ""
 
-#: ../../Zotlabs/Module/Uexport.php:63
+#: ../../Zotlabs/Module/Uexport.php:66
 #, 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:64
+#: ../../Zotlabs/Module/Uexport.php:67
 #, 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:65
+#: ../../Zotlabs/Module/Uexport.php:68
 #, php-format
 msgid ""
 "These content files may be imported or restored by visiting <a href=\"%1$s\">"
@@ -5442,114 +5695,125 @@ msgid ""
 "or restore these in date order (oldest first)."
 msgstr ""
 
-#: ../../Zotlabs/Module/Cal.php:69
-msgid "Permissions denied."
+#: ../../Zotlabs/Module/Directory.php:246
+#, php-format
+msgid "%d rating"
+msgid_plural "%d ratings"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../../Zotlabs/Module/Directory.php:257
+msgid "Gender: "
 msgstr ""
 
-#: ../../Zotlabs/Module/Cal.php:263 ../../Zotlabs/Module/Events.php:596
-msgid "l, F j"
+#: ../../Zotlabs/Module/Directory.php:259
+msgid "Status: "
 msgstr ""
 
-#: ../../Zotlabs/Module/Cal.php:312 ../../Zotlabs/Module/Events.php:651
-#: ../../include/text.php:1748
-msgid "Link to Source"
+#: ../../Zotlabs/Module/Directory.php:261
+msgid "Homepage: "
 msgstr ""
 
-#: ../../Zotlabs/Module/Cal.php:335 ../../Zotlabs/Module/Events.php:679
-msgid "Edit Event"
+#: ../../Zotlabs/Module/Directory.php:310 ../../include/channel.php:1298
+msgid "Age:"
 msgstr ""
 
-#: ../../Zotlabs/Module/Cal.php:335 ../../Zotlabs/Module/Events.php:679
-msgid "Create Event"
+#: ../../Zotlabs/Module/Directory.php:315 ../../include/markdown.php:561
+#: ../../include/channel.php:1134 ../../include/event.php:52
+#: ../../include/event.php:84
+msgid "Location:"
 msgstr ""
 
-#: ../../Zotlabs/Module/Cal.php:338 ../../Zotlabs/Module/Events.php:682
-msgid "Export"
+#: ../../Zotlabs/Module/Directory.php:321
+msgid "Description:"
 msgstr ""
 
-#: ../../Zotlabs/Module/Cal.php:341 ../../include/text.php:2294
-msgid "Import"
+#: ../../Zotlabs/Module/Directory.php:326 ../../include/channel.php:1314
+msgid "Hometown:"
 msgstr ""
 
-#: ../../Zotlabs/Module/Cal.php:345 ../../Zotlabs/Module/Events.php:691
-#: ../../extend/addon/addon/cdav/Mod_Cdav.php:848
-msgid "Today"
+#: ../../Zotlabs/Module/Directory.php:328 ../../include/channel.php:1322
+msgid "About:"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:94
-msgid "# Accounts"
+#: ../../Zotlabs/Module/Directory.php:329 ../../Zotlabs/Module/Suggest.php:56
+#: ../../include/connections.php:110 ../../include/conversation.php:938
+#: ../../include/conversation.php:1069 ../../include/widgets.php:148
+#: ../../include/widgets.php:185 ../../include/channel.php:1119
+msgid "Connect"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:95
-msgid "# blocked accounts"
+#: ../../Zotlabs/Module/Directory.php:330
+msgid "Public Forum:"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:96
-msgid "# expired accounts"
+#: ../../Zotlabs/Module/Directory.php:333
+msgid "Keywords: "
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:97
-msgid "# expiring accounts"
+#: ../../Zotlabs/Module/Directory.php:336
+msgid "Don't suggest"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:108
-msgid "# Channels"
+#: ../../Zotlabs/Module/Directory.php:338
+msgid "Common connections:"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:109
-msgid "# primary"
+#: ../../Zotlabs/Module/Directory.php:387
+msgid "Global Directory"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:110
-msgid "# clones"
+#: ../../Zotlabs/Module/Directory.php:387
+msgid "Local Directory"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:116
-msgid "Message queues"
+#: ../../Zotlabs/Module/Directory.php:393
+msgid "Finding:"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:133
-msgid "Your software should be updated"
+#: ../../Zotlabs/Module/Directory.php:396 ../../Zotlabs/Module/Suggest.php:64
+#: ../../include/contact_widgets.php:24
+msgid "Channel Suggestions"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:138
-msgid "Summary"
+#: ../../Zotlabs/Module/Directory.php:398
+msgid "next page"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:141
-msgid "Registered accounts"
+#: ../../Zotlabs/Module/Directory.php:398
+msgid "previous page"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:142
-msgid "Pending registrations"
+#: ../../Zotlabs/Module/Directory.php:399
+msgid "Sort options"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:143
-msgid "Registered channels"
+#: ../../Zotlabs/Module/Directory.php:400
+msgid "Alphabetic"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:144
-msgid "Active plugins"
+#: ../../Zotlabs/Module/Directory.php:401
+msgid "Reverse Alphabetic"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:145
-msgid "Version"
+#: ../../Zotlabs/Module/Directory.php:402
+msgid "Newest to Oldest"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:146
-msgid "Repository version (master)"
+#: ../../Zotlabs/Module/Directory.php:403
+msgid "Oldest to Newest"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:147
-msgid "Repository version (dev)"
+#: ../../Zotlabs/Module/Directory.php:420
+msgid "No entries (some entries may be hidden)."
 msgstr ""
 
-#: ../../Zotlabs/Module/Lockview.php:75
-msgid "Remote privacy information not available."
+#: ../../Zotlabs/Module/Chatsvc.php:131
+msgid "Away"
 msgstr ""
 
-#: ../../Zotlabs/Module/Lockview.php:96
-msgid "Visible to:"
+#: ../../Zotlabs/Module/Chatsvc.php:136
+msgid "Online"
 msgstr ""
 
 #: ../../Zotlabs/Module/Service_limits.php:23
@@ -5572,40 +5836,40 @@ msgstr ""
 msgid "Export selected"
 msgstr ""
 
-#: ../../Zotlabs/Module/Webpages.php:237 ../../Zotlabs/Lib/Apps.php:218
-#: ../../include/nav.php:109 ../../include/conversation.php:1745
+#: ../../Zotlabs/Module/Webpages.php:241 ../../Zotlabs/Lib/Apps.php:225
+#: ../../include/conversation.php:1889
 msgid "Webpages"
 msgstr ""
 
-#: ../../Zotlabs/Module/Webpages.php:248 ../../include/page_widgets.php:44
+#: ../../Zotlabs/Module/Webpages.php:252 ../../include/page_widgets.php:44
 msgid "Actions"
 msgstr ""
 
-#: ../../Zotlabs/Module/Webpages.php:249 ../../include/page_widgets.php:45
+#: ../../Zotlabs/Module/Webpages.php:253 ../../include/page_widgets.php:45
 msgid "Page Link"
 msgstr ""
 
-#: ../../Zotlabs/Module/Webpages.php:250
+#: ../../Zotlabs/Module/Webpages.php:254
 msgid "Page Title"
 msgstr ""
 
-#: ../../Zotlabs/Module/Webpages.php:280
+#: ../../Zotlabs/Module/Webpages.php:284
 msgid "Invalid file type."
 msgstr ""
 
-#: ../../Zotlabs/Module/Webpages.php:292
+#: ../../Zotlabs/Module/Webpages.php:296
 msgid "Error opening zip file"
 msgstr ""
 
-#: ../../Zotlabs/Module/Webpages.php:303
+#: ../../Zotlabs/Module/Webpages.php:307
 msgid "Invalid folder path."
 msgstr ""
 
-#: ../../Zotlabs/Module/Webpages.php:330
+#: ../../Zotlabs/Module/Webpages.php:334
 msgid "No webpage elements detected."
 msgstr ""
 
-#: ../../Zotlabs/Module/Webpages.php:405
+#: ../../Zotlabs/Module/Webpages.php:409
 msgid "Import complete."
 msgstr ""
 
@@ -5634,7 +5898,7 @@ msgid ""
 msgstr ""
 
 #: ../../Zotlabs/Module/Removeme.php:64
-#: ../../Zotlabs/Module/Settings/Channel.php:547
+#: ../../Zotlabs/Module/Settings/Channel.php:575
 msgid "Remove Channel"
 msgstr ""
 
@@ -5654,132 +5918,182 @@ msgstr ""
 msgid "Remove this file"
 msgstr ""
 
-#: ../../Zotlabs/Module/Wiki.php:34
-msgid "Not found"
-msgstr ""
-
-#: ../../Zotlabs/Module/Wiki.php:55
-msgid "Invalid channel"
-msgstr ""
-
-#: ../../Zotlabs/Module/Wiki.php:100
-msgid "Error retrieving wiki"
+#: ../../Zotlabs/Module/Wiki.php:29
+msgid "Profile Unavailable."
 msgstr ""
 
-#: ../../Zotlabs/Module/Wiki.php:107
-msgid "Error creating zip file export folder"
+#: ../../Zotlabs/Module/Wiki.php:43
+#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:40
+msgid "Not found"
 msgstr ""
 
-#: ../../Zotlabs/Module/Wiki.php:125
-msgid "Error downloading wiki: "
+#: ../../Zotlabs/Module/Wiki.php:67
+#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:60
+msgid "Invalid channel"
 msgstr ""
 
-#: ../../Zotlabs/Module/Wiki.php:139 ../../include/nav.php:111
-#: ../../include/conversation.php:1755
+#: ../../Zotlabs/Module/Wiki.php:158
+#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:144
+#: ../../include/conversation.php:1900
 msgid "Wikis"
 msgstr ""
 
-#: ../../Zotlabs/Module/Wiki.php:145 ../../include/widgets.php:966
+#: ../../Zotlabs/Module/Wiki.php:164
+#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:150
 msgid "Download"
 msgstr ""
 
-#: ../../Zotlabs/Module/Wiki.php:149 ../../include/widgets.php:970
+#: ../../Zotlabs/Module/Wiki.php:168
+#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:154
 msgid "Wiki name"
 msgstr ""
 
-#: ../../Zotlabs/Module/Wiki.php:150
+#: ../../Zotlabs/Module/Wiki.php:169
+#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:155
 msgid "Content type"
 msgstr ""
 
-#: ../../Zotlabs/Module/Wiki.php:159
+#: ../../Zotlabs/Module/Wiki.php:178
+#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:164
 msgid "Create a status post for this wiki"
 msgstr ""
 
-#: ../../Zotlabs/Module/Wiki.php:178
+#: ../../Zotlabs/Module/Wiki.php:203
+#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:183
 msgid "Wiki not found"
 msgstr ""
 
-#: ../../Zotlabs/Module/Wiki.php:203
+#: ../../Zotlabs/Module/Wiki.php:227
+#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:208
 msgid "Rename page"
 msgstr ""
 
-#: ../../Zotlabs/Module/Wiki.php:207
+#: ../../Zotlabs/Module/Wiki.php:231
+#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:212
 msgid "Error retrieving page content"
 msgstr ""
 
-#: ../../Zotlabs/Module/Wiki.php:240
+#: ../../Zotlabs/Module/Wiki.php:261
+#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:241
 msgid "Revision Comparison"
 msgstr ""
 
-#: ../../Zotlabs/Module/Wiki.php:241
+#: ../../Zotlabs/Module/Wiki.php:262
+#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:242
 msgid "Revert"
 msgstr ""
 
-#: ../../Zotlabs/Module/Wiki.php:250
-msgid "Choose an available wiki from the list on the left."
+#: ../../Zotlabs/Module/Wiki.php:266
+msgid "Short description of your changes (optional)"
 msgstr ""
 
-#: ../../Zotlabs/Module/Wiki.php:252
+#: ../../Zotlabs/Module/Wiki.php:273
+#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:251
 msgid "Source"
 msgstr ""
 
-#: ../../Zotlabs/Module/Wiki.php:269
+#: ../../Zotlabs/Module/Wiki.php:281
+#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:259
 msgid "New page name"
 msgstr ""
 
-#: ../../Zotlabs/Module/Wiki.php:275 ../../include/conversation.php:1169
+#: ../../Zotlabs/Module/Wiki.php:286
+#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:264
+#: ../../include/conversation.php:1299
 msgid "Embed image from photo albums"
 msgstr ""
 
-#: ../../Zotlabs/Module/Wiki.php:276 ../../include/conversation.php:1263
+#: ../../Zotlabs/Module/Wiki.php:287
+#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:265
+#: ../../include/conversation.php:1393
 msgid "Embed an image from your albums"
 msgstr ""
 
-#: ../../Zotlabs/Module/Wiki.php:278 ../../include/conversation.php:1265
-#: ../../include/conversation.php:1312
+#: ../../Zotlabs/Module/Wiki.php:289
+#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:267
+#: ../../include/conversation.php:1395 ../../include/conversation.php:1442
 msgid "OK"
 msgstr ""
 
-#: ../../Zotlabs/Module/Wiki.php:279 ../../include/conversation.php:1205
+#: ../../Zotlabs/Module/Wiki.php:290
+#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:268
+#: ../../include/conversation.php:1335
 msgid "Choose images to embed"
 msgstr ""
 
-#: ../../Zotlabs/Module/Wiki.php:280 ../../include/conversation.php:1206
+#: ../../Zotlabs/Module/Wiki.php:291
+#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:269
+#: ../../include/conversation.php:1336
 msgid "Choose an album"
 msgstr ""
 
-#: ../../Zotlabs/Module/Wiki.php:281 ../../include/conversation.php:1207
-msgid "Choose a different album..."
+#: ../../Zotlabs/Module/Wiki.php:292
+#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:270
+msgid "Choose a different album"
 msgstr ""
 
-#: ../../Zotlabs/Module/Wiki.php:282 ../../include/conversation.php:1208
+#: ../../Zotlabs/Module/Wiki.php:293
+#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:271
+#: ../../include/conversation.php:1338
 msgid "Error getting album list"
 msgstr ""
 
-#: ../../Zotlabs/Module/Wiki.php:283 ../../include/conversation.php:1209
+#: ../../Zotlabs/Module/Wiki.php:294
+#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:272
+#: ../../include/conversation.php:1339
 msgid "Error getting photo link"
 msgstr ""
 
-#: ../../Zotlabs/Module/Wiki.php:284 ../../include/conversation.php:1210
+#: ../../Zotlabs/Module/Wiki.php:295
+#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:273
+#: ../../include/conversation.php:1340
 msgid "Error getting album"
 msgstr ""
 
-#: ../../Zotlabs/Module/Wiki.php:348
+#: ../../Zotlabs/Module/Wiki.php:364
+#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:337
 msgid "Error creating wiki. Invalid name."
 msgstr ""
 
-#: ../../Zotlabs/Module/Wiki.php:359
+#: ../../Zotlabs/Module/Wiki.php:376
+#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:348
 msgid "Wiki created, but error creating Home page."
 msgstr ""
 
-#: ../../Zotlabs/Module/Wiki.php:364
+#: ../../Zotlabs/Module/Wiki.php:383
+#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:353
 msgid "Error creating wiki"
 msgstr ""
 
-#: ../../Zotlabs/Module/Wiki.php:410
+#: ../../Zotlabs/Module/Wiki.php:395
+msgid "Wiki delete permission denied."
+msgstr ""
+
+#: ../../Zotlabs/Module/Wiki.php:405
+msgid "Error deleting wiki"
+msgstr ""
+
+#: ../../Zotlabs/Module/Wiki.php:431
+#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:400
 msgid "New page created"
 msgstr ""
 
+#: ../../Zotlabs/Module/Wiki.php:546
+msgid "Cannot delete Home"
+msgstr ""
+
+#: ../../Zotlabs/Module/Wiki.php:610
+msgid "Current Revision"
+msgstr ""
+
+#: ../../Zotlabs/Module/Wiki.php:610
+msgid "Selected Revision"
+msgstr ""
+
+#: ../../Zotlabs/Module/Wiki.php:660
+msgid "You must be authenticated."
+msgstr ""
+
 #: ../../Zotlabs/Module/Sources.php:37
 msgid "Failed to create source. No channel selected."
 msgstr ""
@@ -5796,8 +6110,8 @@ msgstr ""
 msgid "*"
 msgstr ""
 
-#: ../../Zotlabs/Module/Sources.php:96 ../../include/features.php:195
-#: ../../include/widgets.php:672
+#: ../../Zotlabs/Module/Sources.php:96 ../../include/widgets.php:691
+#: ../../include/features.php:213
 msgid "Channel Sources"
 msgstr ""
 
@@ -5874,7 +6188,7 @@ msgid ""
 "hours."
 msgstr ""
 
-#: ../../Zotlabs/Module/Suggest.php:58 ../../include/widgets.php:149
+#: ../../Zotlabs/Module/Suggest.php:58 ../../include/widgets.php:150
 msgid "Ignore/Hide"
 msgstr ""
 
@@ -5882,12 +6196,12 @@ msgstr ""
 msgid "post"
 msgstr ""
 
-#: ../../Zotlabs/Module/Tagger.php:57 ../../include/text.php:1948
-#: ../../include/conversation.php:150
+#: ../../Zotlabs/Module/Tagger.php:57 ../../include/conversation.php:150
+#: ../../include/text.php:1961
 msgid "comment"
 msgstr ""
 
-#: ../../Zotlabs/Module/Tagger.php:100
+#: ../../Zotlabs/Module/Tagger.php:95
 #, php-format
 msgid "%1$s tagged %2$s's %3$s with %4$s"
 msgstr ""
@@ -5968,49 +6282,6 @@ msgstr ""
 msgid "Remove authorization"
 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 ../../include/widgets.php:647
-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/Account.php:20
 msgid "Not valid email."
 msgstr ""
@@ -6076,7 +6347,7 @@ msgid "Used to provide a member experience matched to your comfort level"
 msgstr ""
 
 #: ../../Zotlabs/Module/Settings/Account.php:119
-#: ../../Zotlabs/Module/Settings/Channel.php:462
+#: ../../Zotlabs/Module/Settings/Channel.php:483
 msgid "Email Address:"
 msgstr ""
 
@@ -6084,7 +6355,74 @@ msgstr ""
 msgid "Remove this account including all its channels"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Channel.php:246
+#: ../../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 ../../include/widgets.php:658
+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/Featured.php:20
+msgid "Affinity Slider settings updated."
+msgstr ""
+
+#: ../../Zotlabs/Module/Settings/Featured.php:34
+msgid "No feature settings configured"
+msgstr ""
+
+#: ../../Zotlabs/Module/Settings/Featured.php:41
+msgid "Default maximum affinity level"
+msgstr ""
+
+#: ../../Zotlabs/Module/Settings/Featured.php:46
+msgid "Default minimum affinity level"
+msgstr ""
+
+#: ../../Zotlabs/Module/Settings/Featured.php:50
+msgid "Affinity Slider Settings"
+msgstr ""
+
+#: ../../Zotlabs/Module/Settings/Featured.php:60
+msgid "Feature/Addon Settings"
+msgstr ""
+
+#: ../../Zotlabs/Module/Settings/Channel.php:251
 #: ../../extend/addon/addon/logrot/logrot.php:54
 #: ../../extend/addon/addon/msgfooter/msgfooter.php:54
 #: ../../extend/addon/addon/openstreetmap/openstreetmap.php:184
@@ -6095,361 +6433,369 @@ msgstr ""
 msgid "Settings updated."
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Channel.php:307
+#: ../../Zotlabs/Module/Settings/Channel.php:312
 msgid "Nobody except yourself"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Channel.php:308
+#: ../../Zotlabs/Module/Settings/Channel.php:313
 msgid "Only those you specifically allow"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Channel.php:309
+#: ../../Zotlabs/Module/Settings/Channel.php:314
 msgid "Approved connections"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Channel.php:310
+#: ../../Zotlabs/Module/Settings/Channel.php:315
 msgid "Any connections"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Channel.php:311
+#: ../../Zotlabs/Module/Settings/Channel.php:316
 msgid "Anybody on this website"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Channel.php:312
+#: ../../Zotlabs/Module/Settings/Channel.php:317
 msgid "Anybody in this network"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Channel.php:313
+#: ../../Zotlabs/Module/Settings/Channel.php:318
 msgid "Anybody authenticated"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Channel.php:314
+#: ../../Zotlabs/Module/Settings/Channel.php:319
 msgid "Anybody on the internet"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Channel.php:390
+#: ../../Zotlabs/Module/Settings/Channel.php:395
 msgid "Publish your default profile in the network directory"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Channel.php:395
+#: ../../Zotlabs/Module/Settings/Channel.php:400
 msgid "Allow us to suggest you as a potential friend to new members?"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Channel.php:404
+#: ../../Zotlabs/Module/Settings/Channel.php:409
 msgid "Your channel address is"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Channel.php:407
+#: ../../Zotlabs/Module/Settings/Channel.php:412
 msgid "Your files/photos are accessible via WebDAV at"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Channel.php:453
+#: ../../Zotlabs/Module/Settings/Channel.php:474
 msgid "Channel Settings"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Channel.php:460
+#: ../../Zotlabs/Module/Settings/Channel.php:481
 msgid "Basic Settings"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Channel.php:461
-#: ../../include/channel.php:1172
+#: ../../Zotlabs/Module/Settings/Channel.php:482
+#: ../../include/channel.php:1255
 msgid "Full Name:"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Channel.php:463
+#: ../../Zotlabs/Module/Settings/Channel.php:484
 msgid "Your Timezone:"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Channel.php:464
+#: ../../Zotlabs/Module/Settings/Channel.php:485
 msgid "Default Post Location:"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Channel.php:464
+#: ../../Zotlabs/Module/Settings/Channel.php:485
 msgid "Geographical location to display on your posts"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Channel.php:465
+#: ../../Zotlabs/Module/Settings/Channel.php:486
 msgid "Use Browser Location:"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Channel.php:467
+#: ../../Zotlabs/Module/Settings/Channel.php:488
 msgid "Adult Content"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Channel.php:467
+#: ../../Zotlabs/Module/Settings/Channel.php:488
 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:469
+#: ../../Zotlabs/Module/Settings/Channel.php:490
 msgid "Security and Privacy Settings"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Channel.php:472
+#: ../../Zotlabs/Module/Settings/Channel.php:493
 msgid "Your permissions are already configured. Click to view/adjust"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Channel.php:474
+#: ../../Zotlabs/Module/Settings/Channel.php:495
 msgid "Hide my online presence"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Channel.php:474
+#: ../../Zotlabs/Module/Settings/Channel.php:495
 msgid "Prevents displaying in your profile that you are online"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Channel.php:476
+#: ../../Zotlabs/Module/Settings/Channel.php:497
 msgid "Simple Privacy Settings:"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Channel.php:477
+#: ../../Zotlabs/Module/Settings/Channel.php:498
 msgid ""
 "Very Public - <em>extremely permissive (should be used with caution)</em>"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Channel.php:478
+#: ../../Zotlabs/Module/Settings/Channel.php:499
 msgid ""
 "Typical - <em>default public, privacy when desired (similar to social "
 "network permissions but with improved privacy)</em>"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Channel.php:479
+#: ../../Zotlabs/Module/Settings/Channel.php:500
 msgid "Private - <em>default private, never open or public</em>"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Channel.php:480
+#: ../../Zotlabs/Module/Settings/Channel.php:501
 msgid "Blocked - <em>default blocked to/from everybody</em>"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Channel.php:482
+#: ../../Zotlabs/Module/Settings/Channel.php:503
 msgid "Allow others to tag your posts"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Channel.php:482
+#: ../../Zotlabs/Module/Settings/Channel.php:503
 msgid ""
 "Often used by the community to retro-actively flag inappropriate content"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Channel.php:484
+#: ../../Zotlabs/Module/Settings/Channel.php:505
 msgid "Channel Permission Limits"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Channel.php:486
+#: ../../Zotlabs/Module/Settings/Channel.php:507
 msgid "Expire other channel content after this many days"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Channel.php:486
+#: ../../Zotlabs/Module/Settings/Channel.php:507
 msgid "0 or blank to use the website limit."
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Channel.php:486
+#: ../../Zotlabs/Module/Settings/Channel.php:507
 #, php-format
 msgid "This website expires after %d days."
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Channel.php:486
+#: ../../Zotlabs/Module/Settings/Channel.php:507
 msgid "This website does not expire imported content."
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Channel.php:486
+#: ../../Zotlabs/Module/Settings/Channel.php:507
 msgid "The website limit takes precedence if lower than your limit."
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Channel.php:487
+#: ../../Zotlabs/Module/Settings/Channel.php:508
 msgid "Maximum Friend Requests/Day:"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Channel.php:487
+#: ../../Zotlabs/Module/Settings/Channel.php:508
 msgid "May reduce spam activity"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Channel.php:488
+#: ../../Zotlabs/Module/Settings/Channel.php:509
 msgid "Default Access Control List (ACL)"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Channel.php:490
+#: ../../Zotlabs/Module/Settings/Channel.php:511
 msgid "Use my default audience setting for the type of object published"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Channel.php:497
+#: ../../Zotlabs/Module/Settings/Channel.php:518
 msgid "Channel permissions category:"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Channel.php:503
+#: ../../Zotlabs/Module/Settings/Channel.php:519
+msgid "Default Permissions Group"
+msgstr ""
+
+#: ../../Zotlabs/Module/Settings/Channel.php:525
 msgid "Maximum private messages per day from unknown people:"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Channel.php:503
+#: ../../Zotlabs/Module/Settings/Channel.php:525
 msgid "Useful to reduce spamming"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Channel.php:506
+#: ../../Zotlabs/Module/Settings/Channel.php:528
 msgid "Notification Settings"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Channel.php:507
+#: ../../Zotlabs/Module/Settings/Channel.php:529
 msgid "By default post a status message when:"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Channel.php:508
+#: ../../Zotlabs/Module/Settings/Channel.php:530
 msgid "accepting a friend request"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Channel.php:509
+#: ../../Zotlabs/Module/Settings/Channel.php:531
 msgid "joining a forum/community"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Channel.php:510
+#: ../../Zotlabs/Module/Settings/Channel.php:532
 msgid "making an <em>interesting</em> profile change"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Channel.php:511
+#: ../../Zotlabs/Module/Settings/Channel.php:533
 msgid "Send a notification email when:"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Channel.php:512
+#: ../../Zotlabs/Module/Settings/Channel.php:534
 msgid "You receive a connection request"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Channel.php:513
+#: ../../Zotlabs/Module/Settings/Channel.php:535
 msgid "Your connections are confirmed"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Channel.php:514
+#: ../../Zotlabs/Module/Settings/Channel.php:536
 msgid "Someone writes on your profile wall"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Channel.php:515
+#: ../../Zotlabs/Module/Settings/Channel.php:537
 msgid "Someone writes a followup comment"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Channel.php:516
+#: ../../Zotlabs/Module/Settings/Channel.php:538
 msgid "You receive a private message"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Channel.php:517
+#: ../../Zotlabs/Module/Settings/Channel.php:539
 msgid "You receive a friend suggestion"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Channel.php:518
+#: ../../Zotlabs/Module/Settings/Channel.php:540
 msgid "You are tagged in a post"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Channel.php:519
+#: ../../Zotlabs/Module/Settings/Channel.php:541
 msgid "You are poked/prodded/etc. in a post"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Channel.php:522
+#: ../../Zotlabs/Module/Settings/Channel.php:543
+msgid "Someone likes your post/comment"
+msgstr ""
+
+#: ../../Zotlabs/Module/Settings/Channel.php:546
 msgid "Show visual notifications including:"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Channel.php:524
+#: ../../Zotlabs/Module/Settings/Channel.php:548
 msgid "Unseen grid activity"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Channel.php:525
+#: ../../Zotlabs/Module/Settings/Channel.php:549
 msgid "Unseen channel activity"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Channel.php:526
+#: ../../Zotlabs/Module/Settings/Channel.php:550
 msgid "Unseen private messages"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Channel.php:526
-#: ../../Zotlabs/Module/Settings/Channel.php:531
-#: ../../Zotlabs/Module/Settings/Channel.php:532
-#: ../../Zotlabs/Module/Settings/Channel.php:533
+#: ../../Zotlabs/Module/Settings/Channel.php:550
+#: ../../Zotlabs/Module/Settings/Channel.php:555
+#: ../../Zotlabs/Module/Settings/Channel.php:556
+#: ../../Zotlabs/Module/Settings/Channel.php:557
 #: ../../extend/addon/addon/jappixmini/jappixmini.php:343
 msgid "Recommended"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Channel.php:527
+#: ../../Zotlabs/Module/Settings/Channel.php:551
 msgid "Upcoming events"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Channel.php:528
+#: ../../Zotlabs/Module/Settings/Channel.php:552
 msgid "Events today"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Channel.php:529
+#: ../../Zotlabs/Module/Settings/Channel.php:553
 msgid "Upcoming birthdays"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Channel.php:529
+#: ../../Zotlabs/Module/Settings/Channel.php:553
 msgid "Not available in all themes"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Channel.php:530
+#: ../../Zotlabs/Module/Settings/Channel.php:554
 msgid "System (personal) notifications"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Channel.php:531
+#: ../../Zotlabs/Module/Settings/Channel.php:555
 msgid "System info messages"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Channel.php:532
+#: ../../Zotlabs/Module/Settings/Channel.php:556
 msgid "System critical alerts"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Channel.php:533
+#: ../../Zotlabs/Module/Settings/Channel.php:557
 msgid "New connections"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Channel.php:534
+#: ../../Zotlabs/Module/Settings/Channel.php:558
 msgid "System Registrations"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Channel.php:535
+#: ../../Zotlabs/Module/Settings/Channel.php:559
 msgid ""
 "Also show new wall posts, private messages and connections under Notices"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Channel.php:537
+#: ../../Zotlabs/Module/Settings/Channel.php:561
 msgid "Notify me of events this many days in advance"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Channel.php:537
+#: ../../Zotlabs/Module/Settings/Channel.php:561
 msgid "Must be greater than 0"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Channel.php:539
+#: ../../Zotlabs/Module/Settings/Channel.php:567
 msgid "Advanced Account/Page Type Settings"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Channel.php:540
+#: ../../Zotlabs/Module/Settings/Channel.php:568
 msgid "Change the behaviour of this account for special situations"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Channel.php:542
+#: ../../Zotlabs/Module/Settings/Channel.php:570
 msgid "Miscellaneous Settings"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Channel.php:543
+#: ../../Zotlabs/Module/Settings/Channel.php:571
 msgid "Default photo upload folder"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Channel.php:543
-#: ../../Zotlabs/Module/Settings/Channel.php:544
+#: ../../Zotlabs/Module/Settings/Channel.php:571
+#: ../../Zotlabs/Module/Settings/Channel.php:572
 msgid "%Y - current year, %m -  current month"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Channel.php:544
+#: ../../Zotlabs/Module/Settings/Channel.php:572
 msgid "Default file upload folder"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Channel.php:546
+#: ../../Zotlabs/Module/Settings/Channel.php:574
 msgid "Personal menu to display in your channel pages"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Channel.php:548
+#: ../../Zotlabs/Module/Settings/Channel.php:576
 msgid "Remove this channel."
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Channel.php:549
+#: ../../Zotlabs/Module/Settings/Channel.php:577
 msgid "Firefox Share $Projectname provider"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Channel.php:550
+#: ../../Zotlabs/Module/Settings/Channel.php:578
 msgid "Start calendar week on monday"
 msgstr ""
 
@@ -6529,7 +6875,7 @@ msgid "Manual conversation updates"
 msgstr ""
 
 #: ../../Zotlabs/Module/Settings/Display.php:209
-msgid "Default is automatic, which may increase screen jumping"
+msgid "Default is on, turning this off may increase screen jumping"
 msgstr ""
 
 #: ../../Zotlabs/Module/Settings/Display.php:210
@@ -6566,12 +6912,22 @@ msgstr ""
 msgid "Grid page max height of content (in pixels)"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Featured.php:24
-msgid "No feature settings configured"
+#: ../../Zotlabs/Module/Settings/Permcats.php:37
+msgid "Permission category saved."
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Featured.php:31
-msgid "Feature/Addon Settings"
+#: ../../Zotlabs/Module/Settings/Permcats.php:63
+msgid ""
+"Use this form to create permission rules for various classes of people or "
+"connections."
+msgstr ""
+
+#: ../../Zotlabs/Module/Settings/Permcats.php:96
+msgid "Permission Categories"
+msgstr ""
+
+#: ../../Zotlabs/Module/Settings/Permcats.php:104
+msgid "Permission Name"
 msgstr ""
 
 #: ../../Zotlabs/Module/Tagrm.php:48 ../../Zotlabs/Module/Tagrm.php:98
@@ -6643,76 +6999,112 @@ msgstr ""
 msgid "Add Thing to your Profile"
 msgstr ""
 
-#: ../../Zotlabs/Module/Import.php:33
-#, php-format
-msgid "Your service plan only allows %d channels."
+#: ../../Zotlabs/Module/Mail.php:65
+msgid "Unable to lookup recipient."
 msgstr ""
 
-#: ../../Zotlabs/Module/Import.php:157 ../../include/import.php:100
-msgid "Cloned channel not found. Import failed."
+#: ../../Zotlabs/Module/Mail.php:72
+msgid "Unable to communicate with requested channel."
 msgstr ""
 
-#: ../../Zotlabs/Module/Import.php:167
-msgid "No channel. Import failed."
+#: ../../Zotlabs/Module/Mail.php:79
+msgid "Cannot verify requested channel."
 msgstr ""
 
-#: ../../Zotlabs/Module/Import.php:503
-#: ../../include/Import/import_diaspora.php:142
-msgid "Import completed."
+#: ../../Zotlabs/Module/Mail.php:97
+msgid "Selected channel has private message restrictions. Send failed."
 msgstr ""
 
-#: ../../Zotlabs/Module/Import.php:525
-msgid "You must be logged in to use this feature."
+#: ../../Zotlabs/Module/Mail.php:178
+msgid "Messages"
 msgstr ""
 
-#: ../../Zotlabs/Module/Import.php:530
-msgid "Import Channel"
+#: ../../Zotlabs/Module/Mail.php:213
+msgid "Message recalled."
 msgstr ""
 
-#: ../../Zotlabs/Module/Import.php:531
-msgid ""
-"Use this form to import an existing channel from a different server/hub. You "
-"may retrieve the channel identity from the old server/hub via the network or "
-"provide an export file."
+#: ../../Zotlabs/Module/Mail.php:226
+msgid "Conversation removed."
 msgstr ""
 
-#: ../../Zotlabs/Module/Import.php:533
-msgid "Or provide the old server/hub details"
+#: ../../Zotlabs/Module/Mail.php:240 ../../Zotlabs/Module/Mail.php:349
+#: ../../Zotlabs/Module/Chat.php:205 ../../include/conversation.php:1330
+msgid "Please enter a link URL:"
 msgstr ""
 
-#: ../../Zotlabs/Module/Import.php:534
-msgid "Your old identity address (xyz@example.com)"
+#: ../../Zotlabs/Module/Mail.php:241 ../../Zotlabs/Module/Mail.php:350
+msgid "Expires YYYY-MM-DD HH:MM"
 msgstr ""
 
-#: ../../Zotlabs/Module/Import.php:535
-msgid "Your old login email address"
+#: ../../Zotlabs/Module/Mail.php:269
+msgid "Requested channel is not in this network"
 msgstr ""
 
-#: ../../Zotlabs/Module/Import.php:536
-msgid "Your old login password"
+#: ../../Zotlabs/Module/Mail.php:277
+msgid "Send Private Message"
 msgstr ""
 
-#: ../../Zotlabs/Module/Import.php:537
-msgid ""
-"For either option, please choose whether to make this hub your new primary "
-"address, or whether your old location should continue this role. You will be "
-"able to post from either location, but only one can be marked as the primary "
-"location for files, photos, and media."
+#: ../../Zotlabs/Module/Mail.php:278 ../../Zotlabs/Module/Mail.php:403
+msgid "To:"
 msgstr ""
 
-#: ../../Zotlabs/Module/Import.php:538
-msgid "Make this hub my primary location"
+#: ../../Zotlabs/Module/Mail.php:281 ../../Zotlabs/Module/Mail.php:405
+msgid "Subject:"
 msgstr ""
 
-#: ../../Zotlabs/Module/Import.php:539
-msgid ""
-"Import existing posts if possible (experimental - limited by available memory"
+#: ../../Zotlabs/Module/Mail.php:286 ../../Zotlabs/Module/Mail.php:411
+#: ../../include/conversation.php:1390
+msgid "Attach file"
+msgstr ""
+
+#: ../../Zotlabs/Module/Mail.php:288
+msgid "Send"
+msgstr ""
+
+#: ../../Zotlabs/Module/Mail.php:291 ../../Zotlabs/Module/Mail.php:416
+#: ../../include/conversation.php:1435
+msgid "Set expiration date"
+msgstr ""
+
+#: ../../Zotlabs/Module/Mail.php:293 ../../Zotlabs/Module/Mail.php:418
+#: ../../Zotlabs/Module/Chat.php:206 ../../Zotlabs/Lib/ThreadItem.php:743
+#: ../../include/conversation.php:1440
+msgid "Encrypt text"
 msgstr ""
 
-#: ../../Zotlabs/Module/Import.php:540
+#: ../../Zotlabs/Module/Mail.php:375
+msgid "Delete message"
+msgstr ""
+
+#: ../../Zotlabs/Module/Mail.php:376
+msgid "Delivery report"
+msgstr ""
+
+#: ../../Zotlabs/Module/Mail.php:377
+msgid "Recall message"
+msgstr ""
+
+#: ../../Zotlabs/Module/Mail.php:379
+msgid "Message has been recalled."
+msgstr ""
+
+#: ../../Zotlabs/Module/Mail.php:396
+msgid "Delete Conversation"
+msgstr ""
+
+#: ../../Zotlabs/Module/Mail.php:398
 msgid ""
-"This process may take several minutes to complete. Please submit the form "
-"only once and leave this page open until finished."
+"No secure communications available. You <strong>may</strong> be able to "
+"respond from the sender's profile page."
+msgstr ""
+
+#: ../../Zotlabs/Module/Mail.php:402
+msgid "Send Reply"
+msgstr ""
+
+#: ../../Zotlabs/Module/Mail.php:407
+#, php-format
+msgid "Your message for %s (%s):"
 msgstr ""
 
 #: ../../Zotlabs/Module/Viewconnections.php:65
@@ -6793,256 +7185,246 @@ msgstr ""
 msgid "Lookup xchan beginning with (or webbie): "
 msgstr ""
 
-#: ../../Zotlabs/Module/Events.php:25
-msgid "Calendar entries imported."
-msgstr ""
-
-#: ../../Zotlabs/Module/Events.php:27
-msgid "No calendar entries found."
-msgstr ""
-
-#: ../../Zotlabs/Module/Events.php:106
-msgid "Event can not end before it has started."
-msgstr ""
-
-#: ../../Zotlabs/Module/Events.php:108 ../../Zotlabs/Module/Events.php:117
-#: ../../Zotlabs/Module/Events.php:139
-msgid "Unable to generate preview."
-msgstr ""
-
-#: ../../Zotlabs/Module/Events.php:115
-msgid "Event title and start time are required."
-msgstr ""
-
-#: ../../Zotlabs/Module/Events.php:137 ../../Zotlabs/Module/Events.php:261
-msgid "Event not found."
-msgstr ""
-
-#: ../../Zotlabs/Module/Events.php:453
-msgid "Edit event title"
-msgstr ""
-
-#: ../../Zotlabs/Module/Events.php:453
-#: ../../extend/addon/addon/cdav/Mod_Cdav.php:835
-msgid "Event title"
-msgstr ""
-
-#: ../../Zotlabs/Module/Events.php:455
-msgid "Categories (comma-separated list)"
-msgstr ""
-
-#: ../../Zotlabs/Module/Events.php:456
-msgid "Edit Category"
+#: ../../Zotlabs/Lib/Chatroom.php:27
+msgid "Missing room name"
 msgstr ""
 
-#: ../../Zotlabs/Module/Events.php:456
-msgid "Category"
+#: ../../Zotlabs/Lib/Chatroom.php:36
+msgid "Duplicate room name"
 msgstr ""
 
-#: ../../Zotlabs/Module/Events.php:459
-msgid "Edit start date and time"
+#: ../../Zotlabs/Lib/Chatroom.php:86 ../../Zotlabs/Lib/Chatroom.php:94
+msgid "Invalid room specifier."
 msgstr ""
 
-#: ../../Zotlabs/Module/Events.php:459
-#: ../../extend/addon/addon/cdav/Mod_Cdav.php:836
-msgid "Start date and time"
+#: ../../Zotlabs/Lib/Chatroom.php:126
+msgid "Room not found."
 msgstr ""
 
-#: ../../Zotlabs/Module/Events.php:460 ../../Zotlabs/Module/Events.php:463
-msgid "Finish date and time are not known or not relevant"
+#: ../../Zotlabs/Lib/Chatroom.php:147
+msgid "Room is full"
 msgstr ""
 
-#: ../../Zotlabs/Module/Events.php:462
-msgid "Edit finish date and time"
+#: ../../Zotlabs/Lib/Enotify.php:60 ../../include/network.php:1924
+msgid "$Projectname Notification"
 msgstr ""
 
-#: ../../Zotlabs/Module/Events.php:462
-msgid "Finish date and time"
+#: ../../Zotlabs/Lib/Enotify.php:61 ../../extend/addon/addon/diaspora/p.php:46
+#: ../../extend/addon/addon/diaspora/util.php:218
+#: ../../extend/addon/addon/diaspora/util.php:231
+#: ../../include/network.php:1925
+msgid "$projectname"
 msgstr ""
 
-#: ../../Zotlabs/Module/Events.php:464 ../../Zotlabs/Module/Events.php:465
-msgid "Adjust for viewer timezone"
+#: ../../Zotlabs/Lib/Enotify.php:63 ../../include/network.php:1927
+msgid "Thank You,"
 msgstr ""
 
-#: ../../Zotlabs/Module/Events.php:464
-msgid ""
-"Important for events that happen in a particular place. Not practical for "
-"global holidays."
+#: ../../Zotlabs/Lib/Enotify.php:65 ../../include/network.php:1929
+#, php-format
+msgid "%s Administrator"
 msgstr ""
 
-#: ../../Zotlabs/Module/Events.php:466
-msgid "Edit Description"
+#: ../../Zotlabs/Lib/Enotify.php:116
+#, php-format
+msgid "%s <!item_type!>"
 msgstr ""
 
-#: ../../Zotlabs/Module/Events.php:468
-msgid "Edit Location"
+#: ../../Zotlabs/Lib/Enotify.php:120
+#, php-format
+msgid "[$Projectname:Notify] New mail received at %s"
 msgstr ""
 
-#: ../../Zotlabs/Module/Events.php:472 ../../include/conversation.php:1280
-msgid "Permission settings"
+#: ../../Zotlabs/Lib/Enotify.php:122
+#, php-format
+msgid "%1$s, %2$s sent you a new private message at %3$s."
 msgstr ""
 
-#: ../../Zotlabs/Module/Events.php:485
-msgid "Advanced Options"
+#: ../../Zotlabs/Lib/Enotify.php:123
+#, php-format
+msgid "%1$s sent you %2$s."
 msgstr ""
 
-#: ../../Zotlabs/Module/Events.php:624
-msgid "Edit event"
+#: ../../Zotlabs/Lib/Enotify.php:123
+msgid "a private message"
 msgstr ""
 
-#: ../../Zotlabs/Module/Events.php:626
-msgid "Delete event"
+#: ../../Zotlabs/Lib/Enotify.php:124
+#, php-format
+msgid "Please visit %s to view and/or reply to your private messages."
 msgstr ""
 
-#: ../../Zotlabs/Module/Events.php:660
-msgid "calendar"
+#: ../../Zotlabs/Lib/Enotify.php:183
+#, php-format
+msgid "%1$s, %2$s commented on [zrl=%3$s]a %4$s[/zrl]"
 msgstr ""
 
-#: ../../Zotlabs/Module/Events.php:686
-#: ../../extend/addon/addon/cdav/Mod_Cdav.php:849
-msgid "Month"
+#: ../../Zotlabs/Lib/Enotify.php:191
+#, php-format
+msgid "%1$s, %2$s commented on [zrl=%3$s]%4$s's %5$s[/zrl]"
 msgstr ""
 
-#: ../../Zotlabs/Module/Events.php:687
-#: ../../extend/addon/addon/cdav/Mod_Cdav.php:850
-msgid "Week"
+#: ../../Zotlabs/Lib/Enotify.php:200
+#, php-format
+msgid "%1$s, %2$s commented on [zrl=%3$s]your %4$s[/zrl]"
 msgstr ""
 
-#: ../../Zotlabs/Module/Events.php:688
-#: ../../extend/addon/addon/cdav/Mod_Cdav.php:851
-msgid "Day"
+#: ../../Zotlabs/Lib/Enotify.php:211
+#, php-format
+msgid "[$Projectname:Notify] Comment to conversation #%1$d by %2$s"
 msgstr ""
 
-#: ../../Zotlabs/Module/Events.php:722
-msgid "Event removed"
+#: ../../Zotlabs/Lib/Enotify.php:212
+#, php-format
+msgid "%1$s, %2$s commented on an item/conversation you have been following."
 msgstr ""
 
-#: ../../Zotlabs/Module/Events.php:725
-msgid "Failed to remove event"
+#: ../../Zotlabs/Lib/Enotify.php:215 ../../Zotlabs/Lib/Enotify.php:292
+#: ../../Zotlabs/Lib/Enotify.php:309 ../../Zotlabs/Lib/Enotify.php:335
+#: ../../Zotlabs/Lib/Enotify.php:353 ../../Zotlabs/Lib/Enotify.php:367
+#, php-format
+msgid "Please visit %s to view and/or reply to the conversation."
 msgstr ""
 
-#: ../../Zotlabs/Lib/Chatroom.php:27
-msgid "Missing room name"
+#: ../../Zotlabs/Lib/Enotify.php:273
+#, php-format
+msgid "%1$s, %2$s liked [zrl=%3$s]your %4$s[/zrl]"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Chatroom.php:36
-msgid "Duplicate room name"
+#: ../../Zotlabs/Lib/Enotify.php:288
+#, php-format
+msgid "[$Projectname:Notify] Like received to conversation #%1$d by %2$s"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Chatroom.php:86 ../../Zotlabs/Lib/Chatroom.php:94
-msgid "Invalid room specifier."
+#: ../../Zotlabs/Lib/Enotify.php:289
+#, php-format
+msgid "%1$s, %2$s liked an item/conversation you created."
 msgstr ""
 
-#: ../../Zotlabs/Lib/Chatroom.php:126
-msgid "Room not found."
+#: ../../Zotlabs/Lib/Enotify.php:300
+#, php-format
+msgid "[$Projectname:Notify] %s posted to your profile wall"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Chatroom.php:147
-msgid "Room is full"
+#: ../../Zotlabs/Lib/Enotify.php:302
+#, php-format
+msgid "%1$s, %2$s posted to your profile wall at %3$s"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Apps.php:205
-msgid "Site Admin"
+#: ../../Zotlabs/Lib/Enotify.php:304
+#, php-format
+msgid "%1$s, %2$s posted to [zrl=%3$s]your wall[/zrl]"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Apps.php:206
-#: ../../extend/addon/addon/buglink/buglink.php:16
-msgid "Report Bug"
+#: ../../Zotlabs/Lib/Enotify.php:328
+#, php-format
+msgid "[$Projectname:Notify] %s tagged you"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Apps.php:207
-msgid "View Bookmarks"
+#: ../../Zotlabs/Lib/Enotify.php:329
+#, php-format
+msgid "%1$s, %2$s tagged you at %3$s"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Apps.php:208
-msgid "My Chatrooms"
+#: ../../Zotlabs/Lib/Enotify.php:330
+#, php-format
+msgid "%1$s, %2$s [zrl=%3$s]tagged you[/zrl]."
 msgstr ""
 
-#: ../../Zotlabs/Lib/Apps.php:210
-msgid "Firefox Share"
+#: ../../Zotlabs/Lib/Enotify.php:342
+#, php-format
+msgid "[$Projectname:Notify] %1$s poked you"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Apps.php:211
-msgid "Remote Diagnostics"
+#: ../../Zotlabs/Lib/Enotify.php:343
+#, php-format
+msgid "%1$s, %2$s poked you at %3$s"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Apps.php:212 ../../include/features.php:319
-msgid "Suggest Channels"
+#: ../../Zotlabs/Lib/Enotify.php:344
+#, php-format
+msgid "%1$s, %2$s [zrl=%2$s]poked you[/zrl]."
 msgstr ""
 
-#: ../../Zotlabs/Lib/Apps.php:213 ../../include/nav.php:115
-#: ../../boot.php:1719
-msgid "Login"
+#: ../../Zotlabs/Lib/Enotify.php:360
+#, php-format
+msgid "[$Projectname:Notify] %s tagged your post"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Apps.php:215 ../../include/nav.php:182
-msgid "Grid"
+#: ../../Zotlabs/Lib/Enotify.php:361
+#, php-format
+msgid "%1$s, %2$s tagged your post at %3$s"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Apps.php:219 ../../include/features.php:99
-#: ../../include/conversation.php:1758
-msgid "Wiki"
+#: ../../Zotlabs/Lib/Enotify.php:362
+#, php-format
+msgid "%1$s, %2$s tagged [zrl=%3$s]your post[/zrl]"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Apps.php:220 ../../include/nav.php:185
-msgid "Channel Home"
+#: ../../Zotlabs/Lib/Enotify.php:374
+msgid "[$Projectname:Notify] Introduction received"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Apps.php:223 ../../include/nav.php:204
-#: ../../include/conversation.php:1709 ../../include/conversation.php:1712
-msgid "Events"
+#: ../../Zotlabs/Lib/Enotify.php:375
+#, php-format
+msgid "%1$s, you've received an new connection request from '%2$s' at %3$s"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Apps.php:224 ../../include/nav.php:170
-msgid "Directory"
+#: ../../Zotlabs/Lib/Enotify.php:376
+#, php-format
+msgid ""
+"%1$s, you've received [zrl=%2$s]a new connection request[/zrl] from %3$s."
 msgstr ""
 
-#: ../../Zotlabs/Lib/Apps.php:226 ../../include/nav.php:196
-msgid "Mail"
+#: ../../Zotlabs/Lib/Enotify.php:380 ../../Zotlabs/Lib/Enotify.php:399
+#, php-format
+msgid "You may visit their profile at %s"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Apps.php:229 ../../include/nav.php:99
-msgid "Chat"
+#: ../../Zotlabs/Lib/Enotify.php:382
+#, php-format
+msgid "Please visit %s to approve or reject the connection request."
 msgstr ""
 
-#: ../../Zotlabs/Lib/Apps.php:231
-msgid "Probe"
+#: ../../Zotlabs/Lib/Enotify.php:389
+msgid "[$Projectname:Notify] Friend suggestion received"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Apps.php:232
-msgid "Suggest"
+#: ../../Zotlabs/Lib/Enotify.php:390
+#, php-format
+msgid "%1$s, you've received a friend suggestion from '%2$s' at %3$s"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Apps.php:233
-msgid "Random Channel"
+#: ../../Zotlabs/Lib/Enotify.php:391
+#, php-format
+msgid ""
+"%1$s, you've received [zrl=%2$s]a friend suggestion[/zrl] for %3$s from %4$s."
 msgstr ""
 
-#: ../../Zotlabs/Lib/Apps.php:234
-msgid "Invite"
+#: ../../Zotlabs/Lib/Enotify.php:397
+msgid "Name:"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Apps.php:235 ../../include/widgets.php:1635
-msgid "Features"
+#: ../../Zotlabs/Lib/Enotify.php:398
+msgid "Photo:"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Apps.php:236
-#: ../../extend/addon/addon/openid/MysqlProvider.php:69
-msgid "Language"
+#: ../../Zotlabs/Lib/Enotify.php:401
+#, php-format
+msgid "Please visit %s to approve or reject the suggestion."
 msgstr ""
 
-#: ../../Zotlabs/Lib/Apps.php:237
-msgid "Post"
+#: ../../Zotlabs/Lib/Enotify.php:619
+msgid "[$Projectname:Notify]"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Apps.php:238
-#: ../../extend/addon/addon/openid/MysqlProvider.php:58
-#: ../../extend/addon/addon/openid/MysqlProvider.php:59
-#: ../../extend/addon/addon/openid/MysqlProvider.php:60
-msgid "Profile Photo"
+#: ../../Zotlabs/Lib/Enotify.php:779
+msgid "created a new post"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Apps.php:339
-msgid "Purchase"
+#: ../../Zotlabs/Lib/Enotify.php:780
+#, php-format
+msgid "commented on %s's post"
 msgstr ""
 
 #: ../../Zotlabs/Lib/PermissionDescription.php:34
@@ -7051,7 +7433,7 @@ msgid "Visible to your default audience"
 msgstr ""
 
 #: ../../Zotlabs/Lib/PermissionDescription.php:107
-#: ../../include/acl_selectors.php:191
+#: ../../include/acl_selectors.php:201
 msgid "Only me"
 msgstr ""
 
@@ -7108,11 +7490,11 @@ msgstr ""
 msgid "This is your default setting for the audience of your webpages"
 msgstr ""
 
-#: ../../Zotlabs/Lib/ThreadItem.php:95 ../../include/conversation.php:683
+#: ../../Zotlabs/Lib/ThreadItem.php:95 ../../include/conversation.php:663
 msgid "Private Message"
 msgstr ""
 
-#: ../../Zotlabs/Lib/ThreadItem.php:132 ../../include/conversation.php:675
+#: ../../Zotlabs/Lib/ThreadItem.php:132 ../../include/conversation.php:655
 msgid "Select"
 msgstr ""
 
@@ -7160,11 +7542,11 @@ msgstr ""
 msgid "starred"
 msgstr ""
 
-#: ../../Zotlabs/Lib/ThreadItem.php:239 ../../include/conversation.php:690
+#: ../../Zotlabs/Lib/ThreadItem.php:239 ../../include/conversation.php:670
 msgid "Message signature validated"
 msgstr ""
 
-#: ../../Zotlabs/Lib/ThreadItem.php:240 ../../include/conversation.php:691
+#: ../../Zotlabs/Lib/ThreadItem.php:240 ../../include/conversation.php:671
 msgid "Message signature incorrect"
 msgstr ""
 
@@ -7220,292 +7602,280 @@ msgstr ""
 msgid "via Wall-To-Wall:"
 msgstr ""
 
-#: ../../Zotlabs/Lib/ThreadItem.php:348 ../../include/conversation.php:736
+#: ../../Zotlabs/Lib/ThreadItem.php:350 ../../include/conversation.php:717
 #, php-format
 msgid "from %s"
 msgstr ""
 
-#: ../../Zotlabs/Lib/ThreadItem.php:351 ../../include/conversation.php:739
+#: ../../Zotlabs/Lib/ThreadItem.php:353 ../../include/conversation.php:720
 #, php-format
 msgid "last edited: %s"
 msgstr ""
 
-#: ../../Zotlabs/Lib/ThreadItem.php:352 ../../include/conversation.php:740
+#: ../../Zotlabs/Lib/ThreadItem.php:354 ../../include/conversation.php:721
 #, php-format
 msgid "Expires: %s"
 msgstr ""
 
-#: ../../Zotlabs/Lib/ThreadItem.php:358
+#: ../../Zotlabs/Lib/ThreadItem.php:360
 msgid "Attend"
 msgstr ""
 
-#: ../../Zotlabs/Lib/ThreadItem.php:359
+#: ../../Zotlabs/Lib/ThreadItem.php:361
 msgid "Attendance Options"
 msgstr ""
 
-#: ../../Zotlabs/Lib/ThreadItem.php:360
+#: ../../Zotlabs/Lib/ThreadItem.php:362
 msgid "Vote"
 msgstr ""
 
-#: ../../Zotlabs/Lib/ThreadItem.php:361
+#: ../../Zotlabs/Lib/ThreadItem.php:363
 msgid "Voting Options"
 msgstr ""
 
-#: ../../Zotlabs/Lib/ThreadItem.php:381
+#: ../../Zotlabs/Lib/ThreadItem.php:383
 #: ../../extend/addon/addon/bookmarker/bookmarker.php:38
 msgid "Save Bookmarks"
 msgstr ""
 
-#: ../../Zotlabs/Lib/ThreadItem.php:382
+#: ../../Zotlabs/Lib/ThreadItem.php:384
 msgid "Add to Calendar"
 msgstr ""
 
-#: ../../Zotlabs/Lib/ThreadItem.php:391
+#: ../../Zotlabs/Lib/ThreadItem.php:393
 msgid "Mark all seen"
 msgstr ""
 
-#: ../../Zotlabs/Lib/ThreadItem.php:440 ../../include/js_strings.php:7
+#: ../../Zotlabs/Lib/ThreadItem.php:442 ../../include/js_strings.php:7
 #, php-format
 msgid "%s show all"
 msgstr ""
 
-#: ../../Zotlabs/Lib/ThreadItem.php:730 ../../include/conversation.php:1255
+#: ../../Zotlabs/Lib/ThreadItem.php:732 ../../include/conversation.php:1385
 msgid "Bold"
 msgstr ""
 
-#: ../../Zotlabs/Lib/ThreadItem.php:731 ../../include/conversation.php:1256
+#: ../../Zotlabs/Lib/ThreadItem.php:733 ../../include/conversation.php:1386
 msgid "Italic"
 msgstr ""
 
-#: ../../Zotlabs/Lib/ThreadItem.php:732 ../../include/conversation.php:1257
+#: ../../Zotlabs/Lib/ThreadItem.php:734 ../../include/conversation.php:1387
 msgid "Underline"
 msgstr ""
 
-#: ../../Zotlabs/Lib/ThreadItem.php:733 ../../include/conversation.php:1258
+#: ../../Zotlabs/Lib/ThreadItem.php:735 ../../include/conversation.php:1388
 msgid "Quote"
 msgstr ""
 
-#: ../../Zotlabs/Lib/ThreadItem.php:734 ../../include/conversation.php:1259
+#: ../../Zotlabs/Lib/ThreadItem.php:736 ../../include/conversation.php:1389
 msgid "Code"
 msgstr ""
 
-#: ../../Zotlabs/Lib/ThreadItem.php:735
+#: ../../Zotlabs/Lib/ThreadItem.php:737
 msgid "Image"
 msgstr ""
 
-#: ../../Zotlabs/Lib/ThreadItem.php:736
+#: ../../Zotlabs/Lib/ThreadItem.php:738
 msgid "Insert Link"
 msgstr ""
 
-#: ../../Zotlabs/Lib/ThreadItem.php:737
+#: ../../Zotlabs/Lib/ThreadItem.php:739
 msgid "Video"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Enotify.php:60 ../../include/network.php:1914
-msgid "$Projectname Notification"
+#: ../../Zotlabs/Lib/Apps.php:212
+msgid "Site Admin"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Enotify.php:61 ../../extend/addon/addon/diaspora/p.php:46
-#: ../../extend/addon/addon/diaspora/util.php:218
-#: ../../extend/addon/addon/diaspora/util.php:231
-#: ../../include/network.php:1915
-msgid "$projectname"
+#: ../../Zotlabs/Lib/Apps.php:213
+#: ../../extend/addon/addon/buglink/buglink.php:16
+msgid "Report Bug"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Enotify.php:63 ../../include/network.php:1917
-msgid "Thank You,"
+#: ../../Zotlabs/Lib/Apps.php:214
+msgid "View Bookmarks"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Enotify.php:65 ../../include/network.php:1919
-#, php-format
-msgid "%s Administrator"
+#: ../../Zotlabs/Lib/Apps.php:215
+msgid "My Chatrooms"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Enotify.php:116
-#, php-format
-msgid "%s <!item_type!>"
+#: ../../Zotlabs/Lib/Apps.php:217
+msgid "Firefox Share"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Enotify.php:120
-#, php-format
-msgid "[$Projectname:Notify] New mail received at %s"
+#: ../../Zotlabs/Lib/Apps.php:218
+msgid "Remote Diagnostics"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Enotify.php:122
-#, php-format
-msgid "%1$s, %2$s sent you a new private message at %3$s."
+#: ../../Zotlabs/Lib/Apps.php:219 ../../include/features.php:337
+msgid "Suggest Channels"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Enotify.php:123
-#, php-format
-msgid "%1$s sent you %2$s."
+#: ../../Zotlabs/Lib/Apps.php:220 ../../include/nav.php:130
+#: ../../boot.php:1732
+msgid "Login"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Enotify.php:123
-msgid "a private message"
+#: ../../Zotlabs/Lib/Apps.php:222 ../../include/nav.php:194
+msgid "Grid"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Enotify.php:124
-#, php-format
-msgid "Please visit %s to view and/or reply to your private messages."
+#: ../../Zotlabs/Lib/Apps.php:226 ../../include/conversation.php:1903
+#: ../../include/features.php:99
+msgid "Wiki"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Enotify.php:183
-#, php-format
-msgid "%1$s, %2$s commented on [zrl=%3$s]a %4$s[/zrl]"
+#: ../../Zotlabs/Lib/Apps.php:227 ../../include/nav.php:198
+msgid "Channel Home"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Enotify.php:191
-#, php-format
-msgid "%1$s, %2$s commented on [zrl=%3$s]%4$s's %5$s[/zrl]"
+#: ../../Zotlabs/Lib/Apps.php:230 ../../include/conversation.php:1853
+#: ../../include/conversation.php:1856 ../../include/nav.php:218
+msgid "Events"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Enotify.php:200
-#, php-format
-msgid "%1$s, %2$s commented on [zrl=%3$s]your %4$s[/zrl]"
+#: ../../Zotlabs/Lib/Apps.php:231 ../../include/nav.php:182
+msgid "Directory"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Enotify.php:211
-#, php-format
-msgid "[$Projectname:Notify] Comment to conversation #%1$d by %2$s"
+#: ../../Zotlabs/Lib/Apps.php:233 ../../include/nav.php:210
+msgid "Mail"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Enotify.php:212
-#, php-format
-msgid "%1$s, %2$s commented on an item/conversation you have been following."
+#: ../../Zotlabs/Lib/Apps.php:236
+msgid "Chat"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Enotify.php:215 ../../Zotlabs/Lib/Enotify.php:230
-#: ../../Zotlabs/Lib/Enotify.php:256 ../../Zotlabs/Lib/Enotify.php:274
-#: ../../Zotlabs/Lib/Enotify.php:288
-#, php-format
-msgid "Please visit %s to view and/or reply to the conversation."
+#: ../../Zotlabs/Lib/Apps.php:238
+msgid "Probe"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Enotify.php:221
-#, php-format
-msgid "[$Projectname:Notify] %s posted to your profile wall"
+#: ../../Zotlabs/Lib/Apps.php:239
+msgid "Suggest"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Enotify.php:223
-#, php-format
-msgid "%1$s, %2$s posted to your profile wall at %3$s"
+#: ../../Zotlabs/Lib/Apps.php:240
+msgid "Random Channel"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Enotify.php:225
-#, php-format
-msgid "%1$s, %2$s posted to [zrl=%3$s]your wall[/zrl]"
+#: ../../Zotlabs/Lib/Apps.php:241
+msgid "Invite"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Enotify.php:249
-#, php-format
-msgid "[$Projectname:Notify] %s tagged you"
+#: ../../Zotlabs/Lib/Apps.php:242 ../../include/widgets.php:1595
+msgid "Features"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Enotify.php:250
-#, php-format
-msgid "%1$s, %2$s tagged you at %3$s"
+#: ../../Zotlabs/Lib/Apps.php:243
+#: ../../extend/addon/addon/openid/MysqlProvider.php:69
+msgid "Language"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Enotify.php:251
-#, php-format
-msgid "%1$s, %2$s [zrl=%3$s]tagged you[/zrl]."
+#: ../../Zotlabs/Lib/Apps.php:244
+msgid "Post"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Enotify.php:263
-#, php-format
-msgid "[$Projectname:Notify] %1$s poked you"
+#: ../../Zotlabs/Lib/Apps.php:245
+#: ../../extend/addon/addon/openid/MysqlProvider.php:58
+#: ../../extend/addon/addon/openid/MysqlProvider.php:59
+#: ../../extend/addon/addon/openid/MysqlProvider.php:60
+msgid "Profile Photo"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Enotify.php:264
-#, php-format
-msgid "%1$s, %2$s poked you at %3$s"
+#: ../../Zotlabs/Lib/Apps.php:355
+msgid "Purchase"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Enotify.php:265
-#, php-format
-msgid "%1$s, %2$s [zrl=%2$s]poked you[/zrl]."
+#: ../../Zotlabs/Lib/Apps.php:359
+msgid "Undelete"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Enotify.php:281
-#, php-format
-msgid "[$Projectname:Notify] %s tagged your post"
+#: ../../Zotlabs/Lib/NativeWiki.php:126
+msgid "Wiki files deleted successfully"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Enotify.php:282
-#, php-format
-msgid "%1$s, %2$s tagged your post at %3$s"
+#: ../../Zotlabs/Lib/Permcat.php:58
+msgctxt "permcat"
+msgid "default"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Enotify.php:283
-#, php-format
-msgid "%1$s, %2$s tagged [zrl=%3$s]your post[/zrl]"
+#: ../../Zotlabs/Lib/Permcat.php:96
+msgctxt "permcat"
+msgid "follower"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Enotify.php:295
-msgid "[$Projectname:Notify] Introduction received"
+#: ../../Zotlabs/Lib/Permcat.php:100
+msgctxt "permcat"
+msgid "contributor"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Enotify.php:296
-#, php-format
-msgid "%1$s, you've received an new connection request from '%2$s' at %3$s"
+#: ../../Zotlabs/Lib/Permcat.php:104
+msgctxt "permcat"
+msgid "publisher"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Enotify.php:297
-#, php-format
-msgid ""
-"%1$s, you've received [zrl=%2$s]a new connection request[/zrl] from %3$s."
+#: ../../Zotlabs/Lib/NativeWikiPage.php:31
+#: ../../Zotlabs/Lib/NativeWikiPage.php:62
+msgid "(No Title)"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Enotify.php:301 ../../Zotlabs/Lib/Enotify.php:320
-#, php-format
-msgid "You may visit their profile at %s"
+#: ../../Zotlabs/Lib/NativeWikiPage.php:76
+msgid "Wiki page create failed."
 msgstr ""
 
-#: ../../Zotlabs/Lib/Enotify.php:303
-#, php-format
-msgid "Please visit %s to approve or reject the connection request."
+#: ../../Zotlabs/Lib/NativeWikiPage.php:89
+msgid "Wiki not found."
 msgstr ""
 
-#: ../../Zotlabs/Lib/Enotify.php:310
-msgid "[$Projectname:Notify] Friend suggestion received"
+#: ../../Zotlabs/Lib/NativeWikiPage.php:100
+msgid "Destination name already exists"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Enotify.php:311
-#, php-format
-msgid "%1$s, you've received a friend suggestion from '%2$s' at %3$s"
+#: ../../Zotlabs/Lib/NativeWikiPage.php:126
+#: ../../Zotlabs/Lib/NativeWikiPage.php:345
+msgid "Page not found"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Enotify.php:312
-#, php-format
-msgid ""
-"%1$s, you've received [zrl=%2$s]a friend suggestion[/zrl] for %3$s from %4$s."
+#: ../../Zotlabs/Lib/NativeWikiPage.php:156
+msgid "Error reading page content"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Enotify.php:318
-msgid "Name:"
+#: ../../Zotlabs/Lib/NativeWikiPage.php:338
+#: ../../Zotlabs/Lib/NativeWikiPage.php:383
+#: ../../Zotlabs/Lib/NativeWikiPage.php:450
+#: ../../Zotlabs/Lib/NativeWikiPage.php:491
+msgid "Error reading wiki"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Enotify.php:319
-msgid "Photo:"
+#: ../../Zotlabs/Lib/NativeWikiPage.php:371
+msgid "Page update failed."
 msgstr ""
 
-#: ../../Zotlabs/Lib/Enotify.php:322
-#, php-format
-msgid "Please visit %s to approve or reject the suggestion."
+#: ../../Zotlabs/Lib/NativeWikiPage.php:405
+msgid "Nothing deleted"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Enotify.php:540
-msgid "[$Projectname:Notify]"
+#: ../../Zotlabs/Lib/NativeWikiPage.php:471
+msgid "Compare: object not found."
 msgstr ""
 
-#: ../../Zotlabs/Lib/Enotify.php:700
-msgid "created a new post"
+#: ../../Zotlabs/Lib/NativeWikiPage.php:477
+msgid "Page updated"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Enotify.php:701
-#, php-format
-msgid "commented on %s's post"
+#: ../../Zotlabs/Lib/NativeWikiPage.php:480
+msgid "Untitled"
+msgstr ""
+
+#: ../../Zotlabs/Lib/NativeWikiPage.php:486
+msgid "Wiki resource_id required for git commit"
+msgstr ""
+
+#: ../../Zotlabs/Lib/NativeWikiPage.php:557
+#: ../../extend/addon/addon/gitwiki/gitwiki_backend.php:579
+#: ../../include/bbcode.php:610 ../../include/bbcode.php:756
+msgid "Different viewers will see this text differently"
 msgstr ""
 
 #: ../../extend/addon/addon/adultphotoflag/adultphotoflag.php:24
@@ -7564,27 +7934,36 @@ msgstr ""
 msgid "Quick Reference"
 msgstr ""
 
-#: ../../extend/addon/addon/diaspora/diaspora.php:671
+#: ../../extend/addon/addon/diaspora/import_diaspora.php:16
+msgid "No username found in import file."
+msgstr ""
+
+#: ../../extend/addon/addon/diaspora/import_diaspora.php:41
+#: ../../include/import.php:51
+msgid "Unable to create a unique channel address. Import failed."
+msgstr ""
+
+#: ../../extend/addon/addon/diaspora/diaspora.php:677
 msgid "Diaspora Protocol Settings updated."
 msgstr ""
 
-#: ../../extend/addon/addon/diaspora/diaspora.php:692
+#: ../../extend/addon/addon/diaspora/diaspora.php:696
 msgid "Enable the Diaspora protocol for this channel"
 msgstr ""
 
-#: ../../extend/addon/addon/diaspora/diaspora.php:696
+#: ../../extend/addon/addon/diaspora/diaspora.php:700
 msgid "Allow any Diaspora member to comment on your public posts"
 msgstr ""
 
-#: ../../extend/addon/addon/diaspora/diaspora.php:700
+#: ../../extend/addon/addon/diaspora/diaspora.php:704
 msgid "Prevent your hashtags from being redirected to other sites"
 msgstr ""
 
-#: ../../extend/addon/addon/diaspora/diaspora.php:705
+#: ../../extend/addon/addon/diaspora/diaspora.php:709
 msgid "Followed hashtags (comma separated, do not include the #)"
 msgstr ""
 
-#: ../../extend/addon/addon/diaspora/diaspora.php:710
+#: ../../extend/addon/addon/diaspora/diaspora.php:714
 msgid "Diaspora Protocol Settings"
 msgstr ""
 
@@ -8065,7 +8444,7 @@ msgid "Add a personal note:"
 msgstr ""
 
 #: ../../extend/addon/addon/friendica/dfrn_request.php:871
-#: ../../include/network.php:2232 ../../include/network.php:2233
+#: ../../include/network.php:2242 ../../include/network.php:2243
 msgid "Friendica"
 msgstr ""
 
@@ -8074,7 +8453,7 @@ msgid "StatusNet/Federated Social Web"
 msgstr ""
 
 #: ../../extend/addon/addon/friendica/dfrn_request.php:873
-#: ../../include/network.php:2238
+#: ../../include/network.php:2248
 msgid "Diaspora"
 msgstr ""
 
@@ -8094,7 +8473,7 @@ msgid "Submit Request"
 msgstr ""
 
 #: ../../extend/addon/addon/friendica/friendica.php:113
-#: ../../extend/addon/addon/gnusoc/gnusoc.php:114
+#: ../../extend/addon/addon/gnusoc/gnusoc.php:118
 msgid "GNU-Social Protocol Settings updated."
 msgstr ""
 
@@ -8103,17 +8482,17 @@ msgid "Enable the (experimental) GNU-Social protocol for this channel"
 msgstr ""
 
 #: ../../extend/addon/addon/friendica/friendica.php:128
-#: ../../extend/addon/addon/gnusoc/gnusoc.php:129
+#: ../../extend/addon/addon/gnusoc/gnusoc.php:133
 msgid "GNU-Social Protocol Settings"
 msgstr ""
 
 #: ../../extend/addon/addon/friendica/friendica.php:185
-#: ../../extend/addon/addon/gnusoc/gnusoc.php:319
+#: ../../extend/addon/addon/gnusoc/gnusoc.php:323
 msgid "Follow"
 msgstr ""
 
 #: ../../extend/addon/addon/friendica/friendica.php:188
-#: ../../extend/addon/addon/gnusoc/gnusoc.php:322
+#: ../../extend/addon/addon/gnusoc/gnusoc.php:326
 #, php-format
 msgid "%1$s is now following %2$s"
 msgstr ""
@@ -8138,10 +8517,6 @@ msgstr ""
 msgid "Friendica Login Password"
 msgstr ""
 
-#: ../../extend/addon/addon/gnusoc/gnusoc.php:125
-msgid "Enable the GNU-Social protocol for this channel"
-msgstr ""
-
 #: ../../extend/addon/addon/hubwall/hubwall.php:19
 msgid "Send email to all members"
 msgstr ""
@@ -8233,7 +8608,7 @@ msgid "IRC Chatroom"
 msgstr ""
 
 #: ../../extend/addon/addon/jappixmini/jappixmini.php:305
-#: ../../include/channel.php:1056 ../../include/channel.php:1218
+#: ../../include/channel.php:1139 ../../include/channel.php:1301
 msgid "Status:"
 msgstr ""
 
@@ -8283,11 +8658,6 @@ msgstr ""
 msgid "Configuration Help"
 msgstr ""
 
-#: ../../extend/addon/addon/jappixmini/jappixmini.php:368
-#: ../../extend/addon/addon/cdav/Mod_Cdav.php:1149
-msgid "Add Contact"
-msgstr ""
-
 #: ../../extend/addon/addon/jappixmini/jappixmini.php:371
 msgid "Jappix Mini Settings"
 msgstr ""
@@ -8720,7 +9090,7 @@ msgid "Comma separated list of keywords to hide"
 msgstr ""
 
 #: ../../extend/addon/addon/nsfw/nsfw.php:88
-msgid "Use /expression/ to provide regular expressions"
+msgid "Word, /regular-expression/, lang=xx, lang!=xx"
 msgstr ""
 
 #: ../../extend/addon/addon/nsfw/nsfw.php:92
@@ -8741,109 +9111,109 @@ msgstr ""
 
 #: ../../extend/addon/addon/nsfw/nsfw.php:211
 #, php-format
-msgid "%s - click to open/close"
+msgid "%s - view"
 msgstr ""
 
-#: ../../extend/addon/addon/openclipatar/openclipatar.php:49
-#: ../../extend/addon/addon/openclipatar/openclipatar.php:127
+#: ../../extend/addon/addon/openclipatar/openclipatar.php:50
+#: ../../extend/addon/addon/openclipatar/openclipatar.php:128
 msgid "System defaults:"
 msgstr ""
 
-#: ../../extend/addon/addon/openclipatar/openclipatar.php:53
+#: ../../extend/addon/addon/openclipatar/openclipatar.php:54
 msgid "Preferred Clipart IDs"
 msgstr ""
 
-#: ../../extend/addon/addon/openclipatar/openclipatar.php:53
+#: ../../extend/addon/addon/openclipatar/openclipatar.php:54
 msgid "List of preferred clipart ids. These will be shown first."
 msgstr ""
 
-#: ../../extend/addon/addon/openclipatar/openclipatar.php:54
+#: ../../extend/addon/addon/openclipatar/openclipatar.php:55
 msgid "Default Search Term"
 msgstr ""
 
-#: ../../extend/addon/addon/openclipatar/openclipatar.php:54
+#: ../../extend/addon/addon/openclipatar/openclipatar.php:55
 msgid "The default search term. These will be shown second."
 msgstr ""
 
-#: ../../extend/addon/addon/openclipatar/openclipatar.php:55
+#: ../../extend/addon/addon/openclipatar/openclipatar.php:56
 msgid "Return After"
 msgstr ""
 
-#: ../../extend/addon/addon/openclipatar/openclipatar.php:55
+#: ../../extend/addon/addon/openclipatar/openclipatar.php:56
 msgid "Page to load after image selection."
 msgstr ""
 
-#: ../../extend/addon/addon/openclipatar/openclipatar.php:57
-#: ../../include/channel.php:965 ../../include/nav.php:93
+#: ../../extend/addon/addon/openclipatar/openclipatar.php:58
+#: ../../include/channel.php:1048 ../../include/nav.php:107
 msgid "Edit Profile"
 msgstr ""
 
-#: ../../extend/addon/addon/openclipatar/openclipatar.php:58
+#: ../../extend/addon/addon/openclipatar/openclipatar.php:59
 msgid "Profile List"
 msgstr ""
 
-#: ../../extend/addon/addon/openclipatar/openclipatar.php:60
+#: ../../extend/addon/addon/openclipatar/openclipatar.php:61
 msgid "Order of Preferred"
 msgstr ""
 
-#: ../../extend/addon/addon/openclipatar/openclipatar.php:60
+#: ../../extend/addon/addon/openclipatar/openclipatar.php:61
 msgid "Sort order of preferred clipart ids."
 msgstr ""
 
-#: ../../extend/addon/addon/openclipatar/openclipatar.php:61
-#: ../../extend/addon/addon/openclipatar/openclipatar.php:67
+#: ../../extend/addon/addon/openclipatar/openclipatar.php:62
+#: ../../extend/addon/addon/openclipatar/openclipatar.php:68
 msgid "Newest first"
 msgstr ""
 
-#: ../../extend/addon/addon/openclipatar/openclipatar.php:64
+#: ../../extend/addon/addon/openclipatar/openclipatar.php:65
 msgid "As entered"
 msgstr ""
 
-#: ../../extend/addon/addon/openclipatar/openclipatar.php:66
+#: ../../extend/addon/addon/openclipatar/openclipatar.php:67
 msgid "Order of other"
 msgstr ""
 
-#: ../../extend/addon/addon/openclipatar/openclipatar.php:66
+#: ../../extend/addon/addon/openclipatar/openclipatar.php:67
 msgid "Sort order of other clipart ids."
 msgstr ""
 
-#: ../../extend/addon/addon/openclipatar/openclipatar.php:68
+#: ../../extend/addon/addon/openclipatar/openclipatar.php:69
 msgid "Most downloaded first"
 msgstr ""
 
-#: ../../extend/addon/addon/openclipatar/openclipatar.php:69
+#: ../../extend/addon/addon/openclipatar/openclipatar.php:70
 msgid "Most liked first"
 msgstr ""
 
-#: ../../extend/addon/addon/openclipatar/openclipatar.php:71
+#: ../../extend/addon/addon/openclipatar/openclipatar.php:72
 msgid "Preferred IDs Message"
 msgstr ""
 
-#: ../../extend/addon/addon/openclipatar/openclipatar.php:71
+#: ../../extend/addon/addon/openclipatar/openclipatar.php:72
 msgid "Message to display above preferred results."
 msgstr ""
 
-#: ../../extend/addon/addon/openclipatar/openclipatar.php:77
+#: ../../extend/addon/addon/openclipatar/openclipatar.php:78
 msgid "Uploaded by: "
 msgstr ""
 
-#: ../../extend/addon/addon/openclipatar/openclipatar.php:77
+#: ../../extend/addon/addon/openclipatar/openclipatar.php:78
 msgid "Drawn by: "
 msgstr ""
 
-#: ../../extend/addon/addon/openclipatar/openclipatar.php:191
+#: ../../extend/addon/addon/openclipatar/openclipatar.php:192
 msgid "Or select from a free OpenClipart.org image:"
 msgstr ""
 
-#: ../../extend/addon/addon/openclipatar/openclipatar.php:194
+#: ../../extend/addon/addon/openclipatar/openclipatar.php:195
 msgid "Search Term"
 msgstr ""
 
-#: ../../extend/addon/addon/openclipatar/openclipatar.php:216
+#: ../../extend/addon/addon/openclipatar/openclipatar.php:232
 msgid "Unknown error. Please try again later."
 msgstr ""
 
-#: ../../extend/addon/addon/openclipatar/openclipatar.php:303
+#: ../../extend/addon/addon/openclipatar/openclipatar.php:305
 msgid "Profile photo updated successfully."
 msgstr ""
 
@@ -9382,23 +9752,23 @@ msgstr ""
 msgid "Application name"
 msgstr ""
 
-#: ../../extend/addon/addon/superblock/superblock.php:106
+#: ../../extend/addon/addon/superblock/superblock.php:110
 msgid "Currently blocked"
 msgstr ""
 
-#: ../../extend/addon/addon/superblock/superblock.php:108
+#: ../../extend/addon/addon/superblock/superblock.php:112
 msgid "No channels currently blocked"
 msgstr ""
 
-#: ../../extend/addon/addon/superblock/superblock.php:114
+#: ../../extend/addon/addon/superblock/superblock.php:118
 msgid "\"Superblock\" Settings"
 msgstr ""
 
-#: ../../extend/addon/addon/superblock/superblock.php:279
+#: ../../extend/addon/addon/superblock/superblock.php:322
 msgid "Block Completely"
 msgstr ""
 
-#: ../../extend/addon/addon/superblock/superblock.php:326
+#: ../../extend/addon/addon/superblock/superblock.php:371
 msgid "superblock settings updated"
 msgstr ""
 
@@ -9900,71 +10270,6 @@ msgstr ""
 msgid "Select an addressbook to import to"
 msgstr ""
 
-#: ../../extend/addon/addon/cdav/cdav.php:36
-msgid "Errors encountered creating database table: "
-msgstr ""
-
-#: ../../extend/addon/addon/cdav/cdav.php:197
-msgid "Default Calendar"
-msgstr ""
-
-#: ../../extend/addon/addon/cdav/cdav.php:206
-msgid "Default Addressbook"
-msgstr ""
-
-#: ../../extend/addon/addon/cdav/cdav.php:215
-msgid "CalDAV/CardDAV Settings saved."
-msgstr ""
-
-#: ../../extend/addon/addon/cdav/cdav.php:234
-msgid "Enable CalDAV/CardDAV Server for this channel"
-msgstr ""
-
-#: ../../extend/addon/addon/cdav/cdav.php:237
-#, php-format
-msgid "Your CalDAV resources are located at %s "
-msgstr ""
-
-#: ../../extend/addon/addon/cdav/cdav.php:240
-#, php-format
-msgid "Your CardDAV resources are located at %s "
-msgstr ""
-
-#: ../../extend/addon/addon/cdav/cdav.php:246
-msgid "CalDAV/CardDAV Settings"
-msgstr ""
-
-#: ../../extend/addon/addon/cdav/cdav.php:270
-#: ../../extend/addon/addon/cdav/Mod_Cdav.php:1145
-msgid "Mobile"
-msgstr ""
-
-#: ../../extend/addon/addon/cdav/cdav.php:271
-#: ../../extend/addon/addon/cdav/Mod_Cdav.php:1146 ../../include/nav.php:88
-msgid "Home"
-msgstr ""
-
-#: ../../extend/addon/addon/cdav/cdav.php:272
-msgid "Home, Voice"
-msgstr ""
-
-#: ../../extend/addon/addon/cdav/cdav.php:273
-msgid "Home, Fax"
-msgstr ""
-
-#: ../../extend/addon/addon/cdav/cdav.php:274
-#: ../../extend/addon/addon/cdav/Mod_Cdav.php:1147
-msgid "Work"
-msgstr ""
-
-#: ../../extend/addon/addon/cdav/cdav.php:275
-msgid "Work, Voice"
-msgstr ""
-
-#: ../../extend/addon/addon/cdav/cdav.php:276
-msgid "Work, Fax"
-msgstr ""
-
 #: ../../extend/addon/addon/cdav/Mod_Cdav.php:744
 msgid "INVALID EVENT DISMISSED!"
 msgstr ""
@@ -10037,57 +10342,58 @@ msgstr ""
 msgid "Sorry! Editing of recurrent events is not yet implemented."
 msgstr ""
 
-#: ../../extend/addon/addon/cdav/Mod_Cdav.php:1137
-msgid "Organisation"
-msgstr ""
-
-#: ../../extend/addon/addon/cdav/Mod_Cdav.php:1138
-#: ../../include/page_widgets.php:46
-msgid "Title"
+#: ../../extend/addon/addon/cdav/cdav.php:36
+msgid "Errors encountered creating database table: "
 msgstr ""
 
-#: ../../extend/addon/addon/cdav/Mod_Cdav.php:1139
-msgid "Phone"
+#: ../../extend/addon/addon/cdav/cdav.php:197
+msgid "Default Calendar"
 msgstr ""
 
-#: ../../extend/addon/addon/cdav/Mod_Cdav.php:1141
-msgid "Instant messenger"
+#: ../../extend/addon/addon/cdav/cdav.php:206
+msgid "Default Addressbook"
 msgstr ""
 
-#: ../../extend/addon/addon/cdav/Mod_Cdav.php:1142
-msgid "Website"
+#: ../../extend/addon/addon/cdav/cdav.php:215
+msgid "CalDAV/CardDAV Settings saved."
 msgstr ""
 
-#: ../../extend/addon/addon/cdav/Mod_Cdav.php:1144
-msgid "Note"
+#: ../../extend/addon/addon/cdav/cdav.php:234
+msgid "Enable CalDAV/CardDAV Server for this channel"
 msgstr ""
 
-#: ../../extend/addon/addon/cdav/Mod_Cdav.php:1150
-msgid "Add Field"
+#: ../../extend/addon/addon/cdav/cdav.php:237
+#, php-format
+msgid "Your CalDAV resources are located at %s "
 msgstr ""
 
-#: ../../extend/addon/addon/cdav/Mod_Cdav.php:1155
-msgid "P.O. Box"
+#: ../../extend/addon/addon/cdav/cdav.php:240
+#, php-format
+msgid "Your CardDAV resources are located at %s "
 msgstr ""
 
-#: ../../extend/addon/addon/cdav/Mod_Cdav.php:1156
-msgid "Additional"
+#: ../../extend/addon/addon/cdav/cdav.php:246
+msgid "CalDAV/CardDAV Settings"
 msgstr ""
 
-#: ../../extend/addon/addon/cdav/Mod_Cdav.php:1157
-msgid "Street"
+#: ../../extend/addon/addon/cdav/cdav.php:272
+#: ../../include/connections.php:896
+msgid "Home, Voice"
 msgstr ""
 
-#: ../../extend/addon/addon/cdav/Mod_Cdav.php:1158
-msgid "Locality"
+#: ../../extend/addon/addon/cdav/cdav.php:273
+#: ../../include/connections.php:897
+msgid "Home, Fax"
 msgstr ""
 
-#: ../../extend/addon/addon/cdav/Mod_Cdav.php:1159
-msgid "Region"
+#: ../../extend/addon/addon/cdav/cdav.php:275
+#: ../../include/connections.php:899
+msgid "Work, Voice"
 msgstr ""
 
-#: ../../extend/addon/addon/cdav/Mod_Cdav.php:1160
-msgid "ZIP Code"
+#: ../../extend/addon/addon/cdav/cdav.php:276
+#: ../../include/connections.php:900
+msgid "Work, Fax"
 msgstr ""
 
 #: ../../extend/addon/addon/chess/chess.php:276
@@ -10120,7 +10426,7 @@ msgstr ""
 msgid "Error creating new game."
 msgstr ""
 
-#: ../../extend/addon/addon/chess/chess.php:379 ../../include/channel.php:816
+#: ../../extend/addon/addon/chess/chess.php:379 ../../include/channel.php:899
 msgid "Requested channel is not available."
 msgstr ""
 
@@ -10162,15 +10468,6 @@ msgstr ""
 msgid "Female"
 msgstr ""
 
-#: ../../extend/addon/addon/openid/Mod_Openid.php:30
-msgid "OpenID protocol error. No ID returned."
-msgstr ""
-
-#: ../../extend/addon/addon/openid/Mod_Openid.php:193
-#: ../../include/auth.php:286
-msgid "Login failed."
-msgstr ""
-
 #: ../../extend/addon/addon/openid/MysqlProvider.php:52
 msgid "First Name"
 msgstr ""
@@ -10237,6 +10534,15 @@ msgstr ""
 msgid "The error message was:"
 msgstr ""
 
+#: ../../extend/addon/addon/openid/Mod_Openid.php:30
+msgid "OpenID protocol error. No ID returned."
+msgstr ""
+
+#: ../../extend/addon/addon/openid/Mod_Openid.php:188
+#: ../../include/auth.php:286
+msgid "Login failed."
+msgstr ""
+
 #: ../../extend/addon/addon/diaspora_reconnect/diaspora_reconnect.php:44
 #, php-format
 msgid "Reconnecting %d connections"
@@ -10296,71 +10602,96 @@ msgid ""
 "from Mapbox instead of the default OpenStreetMap tile server."
 msgstr ""
 
-#: ../../extend/addon/addon/rendezvous/rendezvous.php:122
+#: ../../extend/addon/addon/rendezvous/rendezvous.php:162
 msgid "Rendezvous"
 msgstr ""
 
-#: ../../extend/addon/addon/rendezvous/rendezvous.php:127
+#: ../../extend/addon/addon/rendezvous/rendezvous.php:167
 msgid ""
 "This identity has been deleted by another member due to inactivity. Please "
 "press the \"New identity\" button or refresh the page to register a new "
 "identity. You may use the same name."
 msgstr ""
 
-#: ../../extend/addon/addon/rendezvous/rendezvous.php:128
+#: ../../extend/addon/addon/rendezvous/rendezvous.php:168
 msgid "Welcome to Rendezvous!"
 msgstr ""
 
-#: ../../extend/addon/addon/rendezvous/rendezvous.php:129
+#: ../../extend/addon/addon/rendezvous/rendezvous.php:169
 msgid ""
 "Enter your name to join this rendezvous. To begin sharing your location with "
 "the other members, tap the GPS control. When your location is discovered, a "
 "red dot will appear and others will be able to see you on the map."
 msgstr ""
 
-#: ../../extend/addon/addon/rendezvous/rendezvous.php:131
+#: ../../extend/addon/addon/rendezvous/rendezvous.php:171
 msgid "Let's meet here"
 msgstr ""
 
-#: ../../extend/addon/addon/rendezvous/rendezvous.php:134
+#: ../../extend/addon/addon/rendezvous/rendezvous.php:174
 msgid "New marker"
 msgstr ""
 
-#: ../../extend/addon/addon/rendezvous/rendezvous.php:135
+#: ../../extend/addon/addon/rendezvous/rendezvous.php:175
 msgid "Edit marker"
 msgstr ""
 
-#: ../../extend/addon/addon/rendezvous/rendezvous.php:136
+#: ../../extend/addon/addon/rendezvous/rendezvous.php:176
 msgid "New identity"
 msgstr ""
 
-#: ../../extend/addon/addon/rendezvous/rendezvous.php:137
+#: ../../extend/addon/addon/rendezvous/rendezvous.php:177
 msgid "Delete marker"
 msgstr ""
 
-#: ../../extend/addon/addon/rendezvous/rendezvous.php:138
+#: ../../extend/addon/addon/rendezvous/rendezvous.php:178
 msgid "Delete member"
 msgstr ""
 
-#: ../../extend/addon/addon/rendezvous/rendezvous.php:139
+#: ../../extend/addon/addon/rendezvous/rendezvous.php:179
 msgid "Edit proximity alert"
 msgstr ""
 
-#: ../../extend/addon/addon/rendezvous/rendezvous.php:140
+#: ../../extend/addon/addon/rendezvous/rendezvous.php:180
 msgid ""
 "A proximity alert will be issued when this member is within a certain radius "
 "of you.<br><br>Enter a radius in meters (0 to disable):"
 msgstr ""
 
-#: ../../extend/addon/addon/rendezvous/rendezvous.php:140
+#: ../../extend/addon/addon/rendezvous/rendezvous.php:180
+#: ../../extend/addon/addon/rendezvous/rendezvous.php:185
 msgid "distance"
 msgstr ""
 
-#: ../../extend/addon/addon/rendezvous/rendezvous.php:150
+#: ../../extend/addon/addon/rendezvous/rendezvous.php:181
+msgid "Proximity alert distance (meters)"
+msgstr ""
+
+#: ../../extend/addon/addon/rendezvous/rendezvous.php:182
+#: ../../extend/addon/addon/rendezvous/rendezvous.php:184
+msgid ""
+"A proximity alert will be issued when you are within a certain radius of the "
+"marker location.<br><br>Enter a radius in meters (0 to disable):"
+msgstr ""
+
+#: ../../extend/addon/addon/rendezvous/rendezvous.php:183
+msgid "Marker proximity alert"
+msgstr ""
+
+#: ../../extend/addon/addon/rendezvous/rendezvous.php:186
+msgid "Reminder note"
+msgstr ""
+
+#: ../../extend/addon/addon/rendezvous/rendezvous.php:187
+msgid ""
+"Enter a note to be displayed when you are within the specified proximity..."
+msgstr ""
+
+#: ../../extend/addon/addon/rendezvous/rendezvous.php:199
 msgid "Add new rendezvous"
 msgstr ""
 
-#: ../../extend/addon/addon/rendezvous/rendezvous.php:151
+#: ../../extend/addon/addon/rendezvous/rendezvous.php:200
 msgid ""
 "Create a new rendezvous and share the access link with those you wish to "
 "invite to the group. Those who open the link become members of the "
@@ -10368,102 +10699,80 @@ msgid ""
 "share their own locations with the group."
 msgstr ""
 
-#: ../../include/Import/import_diaspora.php:16
-msgid "No username found in import file."
+#: ../../extend/addon/addon/firefox/firefox.php:23
+msgid "Install Firefox Sharing Tools"
 msgstr ""
 
-#: ../../include/Import/import_diaspora.php:41 ../../include/import.php:51
-msgid "Unable to create a unique channel address. Import failed."
+#: ../../extend/addon/addon/firefox/firefox.php:34
+msgid "Share content from Firefox to $Projectname"
 msgstr ""
 
-#: ../../include/dba/dba_driver.php:187
-#, php-format
-msgid "Cannot locate DNS info for database server '%s'"
+#: ../../extend/addon/addon/firefox/firefox.php:37
+msgid "Install Firefox Sharing Tools to this web browser"
 msgstr ""
 
-#: ../../include/datetime.php:147
-msgid "Birthday"
+#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:105
+msgid "Error retrieving wiki"
 msgstr ""
 
-#: ../../include/datetime.php:149
-msgid "Age: "
+#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:112
+msgid "Error creating zip file export folder"
 msgstr ""
 
-#: ../../include/datetime.php:151
-msgid "YYYY-MM-DD or MM-DD"
+#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:130
+msgid "Error downloading wiki: "
 msgstr ""
 
-#: ../../include/datetime.php:286 ../../boot.php:2563
-msgid "never"
+#: ../../extend/addon/addon/gitwiki/gitwiki.php:76
+#: ../../include/widgets.php:970
+msgid "Wiki Pages"
 msgstr ""
 
-#: ../../include/datetime.php:292
-msgid "less than a second ago"
+#: ../../extend/addon/addon/gitwiki/gitwiki.php:81
+#: ../../include/widgets.php:976
+msgid "Add new page"
 msgstr ""
 
-#: ../../include/datetime.php:310
-#, php-format
-msgctxt "e.g. 22 hours ago, 1 minute ago"
-msgid "%1$d %2$s ago"
+#: ../../extend/addon/addon/gitwiki/gitwiki.php:82
+#: ../../include/widgets.php:977
+msgid "Page name"
 msgstr ""
 
-#: ../../include/datetime.php:321
-msgctxt "relative_date"
-msgid "year"
-msgid_plural "years"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../../include/datetime.php:324
-msgctxt "relative_date"
-msgid "month"
-msgid_plural "months"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../../include/datetime.php:327
-msgctxt "relative_date"
-msgid "week"
-msgid_plural "weeks"
-msgstr[0] ""
-msgstr[1] ""
+#: ../../extend/addon/addon/gitwiki/gitwiki.php:95
+#: ../../include/widgets.php:927
+msgid "Wiki List"
+msgstr ""
 
-#: ../../include/datetime.php:330
-msgctxt "relative_date"
-msgid "day"
-msgid_plural "days"
-msgstr[0] ""
-msgstr[1] ""
+#: ../../extend/addon/addon/gnusoc/gnusoc.php:129
+msgid "Enable the GNU-Social protocol for this channel"
+msgstr ""
 
-#: ../../include/datetime.php:333
-msgctxt "relative_date"
-msgid "hour"
-msgid_plural "hours"
-msgstr[0] ""
-msgstr[1] ""
+#: ../../extend/addon/addon/opensearch/opensearch.php:26 ../../boot.php:1187
+#, php-format
+msgctxt "opensearch"
+msgid "Search %1$s (%2$s)"
+msgstr ""
 
-#: ../../include/datetime.php:336
-msgctxt "relative_date"
-msgid "minute"
-msgid_plural "minutes"
-msgstr[0] ""
-msgstr[1] ""
+#: ../../extend/addon/addon/opensearch/opensearch.php:28 ../../boot.php:1187
+msgctxt "opensearch"
+msgid "$Projectname"
+msgstr ""
 
-#: ../../include/datetime.php:339
-msgctxt "relative_date"
-msgid "second"
-msgid_plural "seconds"
-msgstr[0] ""
-msgstr[1] ""
+#: ../../extend/addon/addon/opensearch/opensearch.php:43
+msgid "Search $Projectname"
+msgstr ""
 
-#: ../../include/datetime.php:576
+#: ../../include/dba/dba_driver.php:187
 #, php-format
-msgid "%1$s's birthday"
+msgid "Cannot locate DNS info for database server '%s'"
 msgstr ""
 
-#: ../../include/datetime.php:577
-#, php-format
-msgid "Happy Birthday %1$s"
+#: ../../include/language.php:367 ../../include/text.php:1783
+msgid "default"
+msgstr ""
+
+#: ../../include/language.php:380
+msgid "Select an alternate language"
 msgstr ""
 
 #: ../../include/account.php:35
@@ -10534,20 +10843,179 @@ msgstr ""
 msgid "This action is not available under your subscription plan."
 msgstr ""
 
-#: ../../include/message.php:20
-msgid "No recipient provided."
+#: ../../include/acl_selectors.php:208
+msgid "Who can see this?"
 msgstr ""
 
-#: ../../include/message.php:25
-msgid "[no subject]"
+#: ../../include/acl_selectors.php:209
+msgid "Custom selection"
 msgstr ""
 
-#: ../../include/message.php:45
-msgid "Unable to determine sender."
+#: ../../include/acl_selectors.php:210
+msgid ""
+"Select \"Show\" to allow viewing. \"Don't show\" lets you override and limit "
+"the scope of \"Show\"."
 msgstr ""
 
-#: ../../include/message.php:223
-msgid "Stored post could not be verified."
+#: ../../include/acl_selectors.php:211
+msgid "Show"
+msgstr ""
+
+#: ../../include/acl_selectors.php:212
+msgid "Don't show"
+msgstr ""
+
+#: ../../include/acl_selectors.php:245
+#, php-format
+msgid ""
+"Post permissions %s cannot be changed %s after a post is shared.</br />These "
+"permissions set who is allowed to view the post."
+msgstr ""
+
+#: ../../include/taxonomy.php:188 ../../include/taxonomy.php:270
+#: ../../include/widgets.php:46 ../../include/widgets.php:469
+#: ../../include/contact_widgets.php:91
+msgid "Categories"
+msgstr ""
+
+#: ../../include/taxonomy.php:228 ../../include/taxonomy.php:249
+msgid "Tags"
+msgstr ""
+
+#: ../../include/taxonomy.php:293
+msgid "Keywords"
+msgstr ""
+
+#: ../../include/taxonomy.php:314
+msgid "have"
+msgstr ""
+
+#: ../../include/taxonomy.php:314
+msgid "has"
+msgstr ""
+
+#: ../../include/taxonomy.php:315
+msgid "want"
+msgstr ""
+
+#: ../../include/taxonomy.php:315
+msgid "wants"
+msgstr ""
+
+#: ../../include/taxonomy.php:316
+msgid "likes"
+msgstr ""
+
+#: ../../include/taxonomy.php:317
+msgid "dislikes"
+msgstr ""
+
+#: ../../include/markdown.php:444
+msgid "Attachments:"
+msgstr ""
+
+#: ../../include/markdown.php:539 ../../include/event.php:22
+#: ../../include/event.php:69
+msgid "l F d, Y \\@ g:i A"
+msgstr ""
+
+#: ../../include/markdown.php:541
+msgid "$Projectname event notification:"
+msgstr ""
+
+#: ../../include/markdown.php:545 ../../include/event.php:30
+#: ../../include/event.php:73
+msgid "Starts:"
+msgstr ""
+
+#: ../../include/markdown.php:553 ../../include/event.php:40
+#: ../../include/event.php:77
+msgid "Finishes:"
+msgstr ""
+
+#: ../../include/datetime.php:147
+msgid "Birthday"
+msgstr ""
+
+#: ../../include/datetime.php:149
+msgid "Age: "
+msgstr ""
+
+#: ../../include/datetime.php:151
+msgid "YYYY-MM-DD or MM-DD"
+msgstr ""
+
+#: ../../include/datetime.php:286 ../../boot.php:2578
+msgid "never"
+msgstr ""
+
+#: ../../include/datetime.php:292
+msgid "less than a second ago"
+msgstr ""
+
+#: ../../include/datetime.php:310
+#, php-format
+msgctxt "e.g. 22 hours ago, 1 minute ago"
+msgid "%1$d %2$s ago"
+msgstr ""
+
+#: ../../include/datetime.php:321
+msgctxt "relative_date"
+msgid "year"
+msgid_plural "years"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../../include/datetime.php:324
+msgctxt "relative_date"
+msgid "month"
+msgid_plural "months"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../../include/datetime.php:327
+msgctxt "relative_date"
+msgid "week"
+msgid_plural "weeks"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../../include/datetime.php:330
+msgctxt "relative_date"
+msgid "day"
+msgid_plural "days"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../../include/datetime.php:333
+msgctxt "relative_date"
+msgid "hour"
+msgid_plural "hours"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../../include/datetime.php:336
+msgctxt "relative_date"
+msgid "minute"
+msgid_plural "minutes"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../../include/datetime.php:339
+msgctxt "relative_date"
+msgid "second"
+msgid_plural "seconds"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../../include/datetime.php:576
+#, php-format
+msgid "%1$s's birthday"
+msgstr ""
+
+#: ../../include/datetime.php:577
+#, php-format
+msgid "Happy Birthday %1$s"
 msgstr ""
 
 #: ../../include/selectors.php:30
@@ -10790,1876 +11258,1792 @@ msgstr ""
 msgid "Ask me"
 msgstr ""
 
-#: ../../include/channel.php:33
-msgid "Unable to obtain identity information from database"
-msgstr ""
-
-#: ../../include/channel.php:67
-msgid "Empty name"
-msgstr ""
-
-#: ../../include/channel.php:70
-msgid "Name too long"
-msgstr ""
-
-#: ../../include/channel.php:181
-msgid "No account identifier"
-msgstr ""
-
-#: ../../include/channel.php:193
-msgid "Nickname is required."
-msgstr ""
-
-#: ../../include/channel.php:207
-msgid "Reserved nickname. Please choose another."
-msgstr ""
-
-#: ../../include/channel.php:212
-msgid ""
-"Nickname has unsupported characters or is already being used on this site."
-msgstr ""
-
-#: ../../include/channel.php:272
-msgid "Unable to retrieve created identity"
-msgstr ""
-
-#: ../../include/channel.php:341
-msgid "Default Profile"
-msgstr ""
-
-#: ../../include/channel.php:962
-msgid "Create New Profile"
-msgstr ""
-
-#: ../../include/channel.php:982
-msgid "Visible to everybody"
-msgstr ""
-
-#: ../../include/channel.php:1055 ../../include/channel.php:1174
-msgid "Gender:"
-msgstr ""
-
-#: ../../include/channel.php:1057 ../../include/channel.php:1229
-msgid "Homepage:"
-msgstr ""
-
-#: ../../include/channel.php:1058
-msgid "Online Now"
-msgstr ""
-
-#: ../../include/channel.php:1179
-msgid "Like this channel"
-msgstr ""
-
-#: ../../include/channel.php:1203
-msgid "j F, Y"
-msgstr ""
-
-#: ../../include/channel.php:1204
-msgid "j F"
+#: ../../include/connections.php:127
+msgid "New window"
 msgstr ""
 
-#: ../../include/channel.php:1211
-msgid "Birthday:"
+#: ../../include/connections.php:128
+msgid "Open the selected location in a different window or browser tab"
 msgstr ""
 
-#: ../../include/channel.php:1224
+#: ../../include/connections.php:246
 #, php-format
-msgid "for %1$d %2$s"
-msgstr ""
-
-#: ../../include/channel.php:1227
-msgid "Sexual Preference:"
-msgstr ""
-
-#: ../../include/channel.php:1233
-msgid "Tags:"
-msgstr ""
-
-#: ../../include/channel.php:1235
-msgid "Political Views:"
+msgid "User '%s' deleted"
 msgstr ""
 
-#: ../../include/channel.php:1237
-msgid "Religion:"
+#: ../../include/conversation.php:204
+#, php-format
+msgid "%1$s is now connected with %2$s"
 msgstr ""
 
-#: ../../include/channel.php:1241
-msgid "Hobbies/Interests:"
+#: ../../include/conversation.php:239
+#, php-format
+msgid "%1$s poked %2$s"
 msgstr ""
 
-#: ../../include/channel.php:1243
-msgid "Likes:"
+#: ../../include/conversation.php:243 ../../include/text.php:1092
+#: ../../include/text.php:1097
+msgid "poked"
 msgstr ""
 
-#: ../../include/channel.php:1245
-msgid "Dislikes:"
+#: ../../include/conversation.php:690
+#, php-format
+msgid "View %s's profile @ %s"
 msgstr ""
 
-#: ../../include/channel.php:1247
-msgid "Contact information and Social Networks:"
+#: ../../include/conversation.php:710
+msgid "Categories:"
 msgstr ""
 
-#: ../../include/channel.php:1249
-msgid "My other channels:"
+#: ../../include/conversation.php:711
+msgid "Filed under:"
 msgstr ""
 
-#: ../../include/channel.php:1251
-msgid "Musical interests:"
+#: ../../include/conversation.php:736
+msgid "View in context"
 msgstr ""
 
-#: ../../include/channel.php:1253
-msgid "Books, literature:"
+#: ../../include/conversation.php:832
+msgid "remove"
 msgstr ""
 
-#: ../../include/channel.php:1255
-msgid "Television:"
+#: ../../include/conversation.php:836 ../../include/nav.php:292
+msgid "Loading..."
 msgstr ""
 
-#: ../../include/channel.php:1257
-msgid "Film/dance/culture/entertainment:"
+#: ../../include/conversation.php:837
+msgid "Delete Selected Items"
 msgstr ""
 
-#: ../../include/channel.php:1259
-msgid "Love/Romance:"
+#: ../../include/conversation.php:930 ../../include/conversation.php:972
+msgid "View Source"
 msgstr ""
 
-#: ../../include/channel.php:1261
-msgid "Work/employment:"
+#: ../../include/conversation.php:931 ../../include/conversation.php:982
+msgid "Follow Thread"
 msgstr ""
 
-#: ../../include/channel.php:1263
-msgid "School/education:"
+#: ../../include/conversation.php:932 ../../include/conversation.php:991
+msgid "Unfollow Thread"
 msgstr ""
 
-#: ../../include/channel.php:1284
-msgid "Like this thing"
+#: ../../include/conversation.php:937 ../../include/conversation.php:1059
+msgid "Activity/Posts"
 msgstr ""
 
-#: ../../include/connections.php:95
-msgid "New window"
+#: ../../include/conversation.php:939 ../../include/conversation.php:1079
+msgid "Edit Connection"
 msgstr ""
 
-#: ../../include/connections.php:96
-msgid "Open the selected location in a different window or browser tab"
+#: ../../include/conversation.php:940 ../../include/conversation.php:1089
+msgid "Message"
 msgstr ""
 
-#: ../../include/connections.php:214
+#: ../../include/conversation.php:1223
 #, php-format
-msgid "User '%s' deleted"
-msgstr ""
-
-#: ../../include/dir_fns.php:141
-msgid "Directory Options"
+msgid "%s likes this."
 msgstr ""
 
-#: ../../include/dir_fns.php:143
-msgid "Safe Mode"
+#: ../../include/conversation.php:1223
+#, php-format
+msgid "%s doesn't like this."
 msgstr ""
 
-#: ../../include/dir_fns.php:144
-msgid "Public Forums Only"
-msgstr ""
+#: ../../include/conversation.php:1227
+#, 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/dir_fns.php:145
-msgid "This Website Only"
-msgstr ""
+#: ../../include/conversation.php:1229
+#, 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/nav.php:85 ../../include/nav.php:118 ../../boot.php:1718
-msgid "Logout"
+#: ../../include/conversation.php:1235
+msgid "and"
 msgstr ""
 
-#: ../../include/nav.php:85 ../../include/nav.php:118
-msgid "End this session"
-msgstr ""
+#: ../../include/conversation.php:1238
+#, php-format
+msgid ", and %d other people"
+msgid_plural ", and %d other people"
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../../include/nav.php:88
-msgid "Your posts and conversations"
+#: ../../include/conversation.php:1239
+#, php-format
+msgid "%s like this."
 msgstr ""
 
-#: ../../include/nav.php:89
-msgid "Your profile page"
+#: ../../include/conversation.php:1239
+#, php-format
+msgid "%s don't like this."
 msgstr ""
 
-#: ../../include/nav.php:91
-msgid "Manage/Edit profiles"
+#: ../../include/conversation.php:1282
+msgid "Set your location"
 msgstr ""
 
-#: ../../include/nav.php:93
-msgid "Edit your profile"
+#: ../../include/conversation.php:1283
+msgid "Clear browser location"
 msgstr ""
 
-#: ../../include/nav.php:95
-msgid "Your photos"
+#: ../../include/conversation.php:1331
+msgid "Tag term:"
 msgstr ""
 
-#: ../../include/nav.php:96
-msgid "Your files"
+#: ../../include/conversation.php:1332
+msgid "Where are you right now?"
 msgstr ""
 
-#: ../../include/nav.php:99
-msgid "Your chatrooms"
+#: ../../include/conversation.php:1337
+msgid "Choose a different album..."
 msgstr ""
 
-#: ../../include/nav.php:105 ../../include/conversation.php:1735
-msgid "Bookmarks"
+#: ../../include/conversation.php:1341
+msgid "Comments enabled"
 msgstr ""
 
-#: ../../include/nav.php:105
-msgid "Your bookmarks"
+#: ../../include/conversation.php:1342
+msgid "Comments disabled"
 msgstr ""
 
-#: ../../include/nav.php:109
-msgid "Your webpages"
+#: ../../include/conversation.php:1380
+msgid "Page link name"
 msgstr ""
 
-#: ../../include/nav.php:111
-msgid "Your wikis"
+#: ../../include/conversation.php:1383
+msgid "Post as"
 msgstr ""
 
-#: ../../include/nav.php:115
-msgid "Sign in"
+#: ../../include/conversation.php:1397
+msgid "Toggle voting"
 msgstr ""
 
-#: ../../include/nav.php:131
-msgid "Remote authentication"
+#: ../../include/conversation.php:1400
+msgid "Disable comments"
 msgstr ""
 
-#: ../../include/nav.php:131
-msgid "Click to authenticate to your home hub"
+#: ../../include/conversation.php:1401
+msgid "Toggle comments"
 msgstr ""
 
-#: ../../include/nav.php:143
-msgid "Get me home"
+#: ../../include/conversation.php:1409
+msgid "Categories (optional, comma-separated list)"
 msgstr ""
 
-#: ../../include/nav.php:145
-msgid "Log me out of this site"
+#: ../../include/conversation.php:1432
+msgid "Other networks and post services"
 msgstr ""
 
-#: ../../include/nav.php:150
-msgid "Create an account"
+#: ../../include/conversation.php:1438
+msgid "Set publish date"
 msgstr ""
 
-#: ../../include/nav.php:162
-msgid "Help and documentation"
+#: ../../include/conversation.php:1692
+msgid "Discover"
 msgstr ""
 
-#: ../../include/nav.php:166
-msgid "Applications, utilities, links, games"
+#: ../../include/conversation.php:1695
+msgid "Imported public streams"
 msgstr ""
 
-#: ../../include/nav.php:168
-msgid "Search site @name, #tag, ?docs, content"
+#: ../../include/conversation.php:1700
+msgid "Commented Order"
 msgstr ""
 
-#: ../../include/nav.php:170
-msgid "Channel Directory"
+#: ../../include/conversation.php:1703
+msgid "Sort by Comment Date"
 msgstr ""
 
-#: ../../include/nav.php:182
-msgid "Your grid"
+#: ../../include/conversation.php:1707
+msgid "Posted Order"
 msgstr ""
 
-#: ../../include/nav.php:183
-msgid "Mark all grid notifications seen"
+#: ../../include/conversation.php:1710
+msgid "Sort by Post Date"
 msgstr ""
 
-#: ../../include/nav.php:185
-msgid "Channel home"
+#: ../../include/conversation.php:1718
+msgid "Posts that mention or involve you"
 msgstr ""
 
-#: ../../include/nav.php:186
-msgid "Mark all channel notifications seen"
+#: ../../include/conversation.php:1727
+msgid "Activity Stream - by date"
 msgstr ""
 
-#: ../../include/nav.php:192
-msgid "Notices"
+#: ../../include/conversation.php:1733
+msgid "Starred"
 msgstr ""
 
-#: ../../include/nav.php:192
-msgid "Notifications"
+#: ../../include/conversation.php:1736
+msgid "Favourite Posts"
 msgstr ""
 
-#: ../../include/nav.php:193
-msgid "See all notifications"
+#: ../../include/conversation.php:1743
+msgid "Spam"
 msgstr ""
 
-#: ../../include/nav.php:196
-msgid "Private mail"
+#: ../../include/conversation.php:1746
+msgid "Posts flagged as SPAM"
 msgstr ""
 
-#: ../../include/nav.php:197
-msgid "See all private messages"
+#: ../../include/conversation.php:1818
+msgid "Status Messages and Posts"
 msgstr ""
 
-#: ../../include/nav.php:198
-msgid "Mark all private messages seen"
+#: ../../include/conversation.php:1830
+msgid "Profile Details"
 msgstr ""
 
-#: ../../include/nav.php:199 ../../include/widgets.php:700
-msgid "Inbox"
+#: ../../include/conversation.php:1839 ../../include/photos.php:515
+msgid "Photo Albums"
 msgstr ""
 
-#: ../../include/nav.php:200 ../../include/widgets.php:705
-msgid "Outbox"
+#: ../../include/conversation.php:1846
+msgid "Files and Storage"
 msgstr ""
 
-#: ../../include/nav.php:201 ../../include/widgets.php:710
-msgid "New Message"
+#: ../../include/conversation.php:1866 ../../include/conversation.php:1869
+#: ../../include/widgets.php:902
+msgid "Chatrooms"
 msgstr ""
 
-#: ../../include/nav.php:204
-msgid "Event Calendar"
+#: ../../include/conversation.php:1879
+msgid "Bookmarks"
 msgstr ""
 
-#: ../../include/nav.php:205
-msgid "See all events"
+#: ../../include/conversation.php:1882
+msgid "Saved Bookmarks"
 msgstr ""
 
-#: ../../include/nav.php:206
-msgid "Mark all events seen"
+#: ../../include/conversation.php:1892
+msgid "View Webpages"
 msgstr ""
 
-#: ../../include/nav.php:209
-msgid "Manage Your Channels"
-msgstr ""
+#: ../../include/conversation.php:1958
+msgctxt "noun"
+msgid "Attending"
+msgid_plural "Attending"
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../../include/nav.php:211
-msgid "Account/Channel Settings"
-msgstr ""
+#: ../../include/conversation.php:1961
+msgctxt "noun"
+msgid "Not Attending"
+msgid_plural "Not Attending"
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../../include/nav.php:219 ../../include/widgets.php:1665
-msgid "Admin"
-msgstr ""
+#: ../../include/conversation.php:1964
+msgctxt "noun"
+msgid "Undecided"
+msgid_plural "Undecided"
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../../include/nav.php:219
-msgid "Site Setup and Configuration"
-msgstr ""
+#: ../../include/conversation.php:1967
+msgctxt "noun"
+msgid "Agree"
+msgid_plural "Agrees"
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../../include/nav.php:250 ../../include/conversation.php:869
-msgid "Loading..."
-msgstr ""
+#: ../../include/conversation.php:1970
+msgctxt "noun"
+msgid "Disagree"
+msgid_plural "Disagrees"
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../../include/nav.php:255
-msgid "@name, #tag, ?doc, content"
-msgstr ""
+#: ../../include/conversation.php:1973
+msgctxt "noun"
+msgid "Abstain"
+msgid_plural "Abstains"
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../../include/nav.php:256
-msgid "Please wait..."
+#: ../../include/message.php:32
+msgid "Unable to determine sender."
 msgstr ""
 
-#: ../../include/features.php:58
-msgid "General Features"
+#: ../../include/message.php:69
+msgid "No recipient provided."
 msgstr ""
 
-#: ../../include/features.php:63
-msgid "Multiple Profiles"
+#: ../../include/message.php:74
+msgid "[no subject]"
 msgstr ""
 
-#: ../../include/features.php:64
-msgid "Ability to create multiple profiles"
+#: ../../include/message.php:225
+msgid "Stored post could not be verified."
 msgstr ""
 
-#: ../../include/features.php:72
-msgid "Advanced Profiles"
+#: ../../include/security.php:117
+msgid "guest:"
 msgstr ""
 
-#: ../../include/features.php:73
-msgid "Additional profile sections and selections"
+#: ../../include/security.php:532
+msgid ""
+"The form security token was not correct. This probably happened because the "
+"form has been opened for too long (>3 hours) before submitting it."
 msgstr ""
 
-#: ../../include/features.php:81
-msgid "Profile Import/Export"
+#: ../../include/widgets.php:103
+msgid "System"
 msgstr ""
 
-#: ../../include/features.php:82
-msgid "Save and load profile details across sites/channels"
+#: ../../include/widgets.php:106
+msgid "New App"
 msgstr ""
 
-#: ../../include/features.php:90
-msgid "Web Pages"
+#: ../../include/widgets.php:107
+msgid "Edit Apps"
 msgstr ""
 
-#: ../../include/features.php:91
-msgid "Provide managed web pages on your channel"
+#: ../../include/widgets.php:155
+msgid "Suggestions"
 msgstr ""
 
-#: ../../include/features.php:100
-msgid "Provide a wiki for your channel"
+#: ../../include/widgets.php:156
+msgid "See more..."
 msgstr ""
 
-#: ../../include/features.php:117
-msgid "Private Notes"
+#: ../../include/widgets.php:176
+#, php-format
+msgid "You have %1$.0f of %2$.0f allowed connections."
 msgstr ""
 
-#: ../../include/features.php:118
-msgid "Enables a tool to store notes and reminders (note: not encrypted)"
+#: ../../include/widgets.php:182
+msgid "Add New Connection"
 msgstr ""
 
-#: ../../include/features.php:126
-msgid "Navigation Channel Select"
+#: ../../include/widgets.php:183
+msgid "Enter channel address"
 msgstr ""
 
-#: ../../include/features.php:127
-msgid "Change channels directly from within the navigation dropdown menu"
+#: ../../include/widgets.php:184
+msgid "Examples: bob@example.com, https://example.com/barbara"
 msgstr ""
 
-#: ../../include/features.php:135
-msgid "Photo Location"
+#: ../../include/widgets.php:200
+msgid "Notes"
 msgstr ""
 
-#: ../../include/features.php:136
-msgid "If location data is available on uploaded photos, link this to a map."
+#: ../../include/widgets.php:276
+msgid "Remove term"
 msgstr ""
 
-#: ../../include/features.php:144
-msgid "Access Controlled Chatrooms"
+#: ../../include/widgets.php:284 ../../include/features.php:301
+msgid "Saved Searches"
 msgstr ""
 
-#: ../../include/features.php:145
-msgid "Provide chatrooms and chat services with access control."
+#: ../../include/widgets.php:285 ../../include/group.php:336
+msgid "add"
 msgstr ""
 
-#: ../../include/features.php:153
-msgid "Smart Birthdays"
+#: ../../include/widgets.php:347 ../../include/contact_widgets.php:53
+#: ../../include/features.php:390
+msgid "Saved Folders"
 msgstr ""
 
-#: ../../include/features.php:154
-msgid ""
-"Make birthday events timezone aware in case your friends are scattered "
-"across the planet."
+#: ../../include/widgets.php:350 ../../include/widgets.php:472
+#: ../../include/contact_widgets.php:56 ../../include/contact_widgets.php:94
+msgid "Everything"
 msgstr ""
 
-#: ../../include/features.php:162
-msgid "Advanced Directory Search"
+#: ../../include/widgets.php:391
+msgid "Archives"
 msgstr ""
 
-#: ../../include/features.php:163
-msgid "Allows creation of complex directory search queries"
+#: ../../include/widgets.php:563
+msgid "Refresh"
 msgstr ""
 
-#: ../../include/features.php:171
-msgid "Advanced Theme and Layout Settings"
+#: ../../include/widgets.php:603
+msgid "Account settings"
 msgstr ""
 
-#: ../../include/features.php:172
-msgid "Allows fine tuning of themes and page layouts"
+#: ../../include/widgets.php:609
+msgid "Channel settings"
 msgstr ""
 
-#: ../../include/features.php:182
-msgid "Post Composition Features"
+#: ../../include/widgets.php:618
+msgid "Additional features"
 msgstr ""
 
-#: ../../include/features.php:186
-msgid "Large Photos"
+#: ../../include/widgets.php:625
+msgid "Feature/Addon settings"
 msgstr ""
 
-#: ../../include/features.php:187
-msgid ""
-"Include large (1024px) photo thumbnails in posts. If not enabled, use small "
-"(640px) photo thumbnails"
+#: ../../include/widgets.php:631
+msgid "Display settings"
 msgstr ""
 
-#: ../../include/features.php:196
-msgid "Automatically import channel content from other channels or feeds"
+#: ../../include/widgets.php:638
+msgid "Manage locations"
 msgstr ""
 
-#: ../../include/features.php:204
-msgid "Even More Encryption"
+#: ../../include/widgets.php:645
+msgid "Export channel"
 msgstr ""
 
-#: ../../include/features.php:205
-msgid ""
-"Allow optional encryption of content end-to-end with a shared secret key"
+#: ../../include/widgets.php:651
+msgid "Connected apps"
 msgstr ""
 
-#: ../../include/features.php:213
-msgid "Enable Voting Tools"
+#: ../../include/widgets.php:666 ../../include/features.php:153
+msgid "Permission Groups"
 msgstr ""
 
-#: ../../include/features.php:214
-msgid "Provide a class of post which others can vote on"
+#: ../../include/widgets.php:683
+msgid "Premium Channel Settings"
 msgstr ""
 
-#: ../../include/features.php:222
-msgid "Disable Comments"
+#: ../../include/widgets.php:712
+msgid "Private Mail Menu"
 msgstr ""
 
-#: ../../include/features.php:223
-msgid "Provide the option to disable comments for a post"
+#: ../../include/widgets.php:714
+msgid "Combined View"
 msgstr ""
 
-#: ../../include/features.php:231
-msgid "Delayed Posting"
+#: ../../include/widgets.php:719 ../../include/nav.php:213
+msgid "Inbox"
 msgstr ""
 
-#: ../../include/features.php:232
-msgid "Allow posts to be published at a later date"
+#: ../../include/widgets.php:724 ../../include/nav.php:214
+msgid "Outbox"
 msgstr ""
 
-#: ../../include/features.php:240
-msgid "Content Expiration"
+#: ../../include/widgets.php:729 ../../include/nav.php:215
+msgid "New Message"
 msgstr ""
 
-#: ../../include/features.php:241
-msgid "Remove posts/comments and/or private messages at a future time"
+#: ../../include/widgets.php:746 ../../include/widgets.php:758
+msgid "Conversations"
 msgstr ""
 
-#: ../../include/features.php:249
-msgid "Suppress Duplicate Posts/Comments"
+#: ../../include/widgets.php:750
+msgid "Received Messages"
 msgstr ""
 
-#: ../../include/features.php:250
-msgid ""
-"Prevent posts with identical content to be published with less than two "
-"minutes in between submissions."
+#: ../../include/widgets.php:754
+msgid "Sent Messages"
 msgstr ""
 
-#: ../../include/features.php:261
-msgid "Network and Stream Filtering"
+#: ../../include/widgets.php:768
+msgid "No messages."
 msgstr ""
 
-#: ../../include/features.php:265
-msgid "Search by Date"
+#: ../../include/widgets.php:786
+msgid "Delete conversation"
 msgstr ""
 
-#: ../../include/features.php:266
-msgid "Ability to select posts by date ranges"
+#: ../../include/widgets.php:812
+msgid "Events Tools"
 msgstr ""
 
-#: ../../include/features.php:274 ../../include/group.php:311
-msgid "Privacy Groups"
+#: ../../include/widgets.php:813
+msgid "Export Calendar"
 msgstr ""
 
-#: ../../include/features.php:275
-msgid "Enable management and selection of privacy groups"
+#: ../../include/widgets.php:814
+msgid "Import Calendar"
 msgstr ""
 
-#: ../../include/features.php:283 ../../include/widgets.php:283
-msgid "Saved Searches"
+#: ../../include/widgets.php:906
+msgid "Overview"
 msgstr ""
 
-#: ../../include/features.php:284
-msgid "Save search terms for re-use"
+#: ../../include/widgets.php:913
+msgid "Chat Members"
 msgstr ""
 
-#: ../../include/features.php:292
-msgid "Network Personal Tab"
+#: ../../include/widgets.php:991
+msgctxt "wiki_history"
+msgid "Message"
 msgstr ""
 
-#: ../../include/features.php:293
-msgid "Enable tab to display only Network posts that you've interacted on"
+#: ../../include/widgets.php:1013
+msgid "Bookmarked Chatrooms"
 msgstr ""
 
-#: ../../include/features.php:301
-msgid "Network New Tab"
+#: ../../include/widgets.php:1044
+msgid "Suggested Chatrooms"
 msgstr ""
 
-#: ../../include/features.php:302
-msgid "Enable tab to display all new Network activity"
+#: ../../include/widgets.php:1189 ../../include/widgets.php:1301
+msgid "photo/image"
 msgstr ""
 
-#: ../../include/features.php:310
-msgid "Affinity Tool"
+#: ../../include/widgets.php:1244
+msgid "Click to show more"
 msgstr ""
 
-#: ../../include/features.php:311
-msgid "Filter stream activity by depth of relationships"
+#: ../../include/widgets.php:1395
+msgid "Rating Tools"
 msgstr ""
 
-#: ../../include/features.php:320
-msgid "Show friend and connection suggestions"
+#: ../../include/widgets.php:1399 ../../include/widgets.php:1401
+msgid "Rate Me"
 msgstr ""
 
-#: ../../include/features.php:328
-msgid "Connection Filtering"
+#: ../../include/widgets.php:1404
+msgid "View Ratings"
 msgstr ""
 
-#: ../../include/features.php:329
-msgid "Filter incoming posts from connections based on keywords/content"
+#: ../../include/widgets.php:1497
+msgid "Forums"
 msgstr ""
 
-#: ../../include/features.php:341
-msgid "Post/Comment Tools"
+#: ../../include/widgets.php:1526
+msgid "Tasks"
 msgstr ""
 
-#: ../../include/features.php:345
-msgid "Community Tagging"
+#: ../../include/widgets.php:1592 ../../include/widgets.php:1630
+msgid "Member registrations waiting for confirmation"
 msgstr ""
 
-#: ../../include/features.php:346
-msgid "Ability to tag existing posts"
+#: ../../include/widgets.php:1598
+msgid "Inspect queue"
 msgstr ""
 
-#: ../../include/features.php:354
-msgid "Post Categories"
+#: ../../include/widgets.php:1600
+msgid "DB updates"
 msgstr ""
 
-#: ../../include/features.php:355
-msgid "Add categories to your posts"
+#: ../../include/widgets.php:1625 ../../include/nav.php:233
+msgid "Admin"
 msgstr ""
 
-#: ../../include/features.php:363
-msgid "Emoji Reactions"
+#: ../../include/widgets.php:1626
+msgid "Plugin Features"
 msgstr ""
 
-#: ../../include/features.php:364
-msgid "Add emoji reaction ability to posts"
+#: ../../include/zot.php:652
+msgid "Invalid data packet"
 msgstr ""
 
-#: ../../include/features.php:372 ../../include/contact_widgets.php:53
-#: ../../include/widgets.php:346
-msgid "Saved Folders"
+#: ../../include/zot.php:668
+msgid "Unable to verify channel signature"
 msgstr ""
 
-#: ../../include/features.php:373
-msgid "Ability to file posts under folders"
+#: ../../include/zot.php:2319
+#, php-format
+msgid "Unable to verify site signature for %s"
 msgstr ""
 
-#: ../../include/features.php:381
-msgid "Dislike Posts"
+#: ../../include/zot.php:3725
+msgid "invalid target signature"
 msgstr ""
 
-#: ../../include/features.php:382
-msgid "Ability to dislike posts/comments"
+#: ../../include/channel.php:33
+msgid "Unable to obtain identity information from database"
 msgstr ""
 
-#: ../../include/features.php:390
-msgid "Star Posts"
+#: ../../include/channel.php:67
+msgid "Empty name"
 msgstr ""
 
-#: ../../include/features.php:391
-msgid "Ability to mark special posts with a star indicator"
+#: ../../include/channel.php:70
+msgid "Name too long"
 msgstr ""
 
-#: ../../include/features.php:399
-msgid "Tag Cloud"
+#: ../../include/channel.php:181
+msgid "No account identifier"
 msgstr ""
 
-#: ../../include/features.php:400
-msgid "Provide a personal tag cloud on your channel page"
+#: ../../include/channel.php:193
+msgid "Nickname is required."
 msgstr ""
 
-#: ../../include/features.php:412
-msgid "Premium Channel"
+#: ../../include/channel.php:207
+msgid "Reserved nickname. Please choose another."
 msgstr ""
 
-#: ../../include/features.php:413
+#: ../../include/channel.php:212
 msgid ""
-"Allows you to set restrictions and terms on those that connect with your "
-"channel"
-msgstr ""
-
-#: ../../include/text.php:460
-msgid "prev"
-msgstr ""
-
-#: ../../include/text.php:462
-msgid "first"
-msgstr ""
-
-#: ../../include/text.php:491
-msgid "last"
-msgstr ""
-
-#: ../../include/text.php:494
-msgid "next"
-msgstr ""
-
-#: ../../include/text.php:505
-msgid "older"
+"Nickname has unsupported characters or is already being used on this site."
 msgstr ""
 
-#: ../../include/text.php:507
-msgid "newer"
+#: ../../include/channel.php:272
+msgid "Unable to retrieve created identity"
 msgstr ""
 
-#: ../../include/text.php:904
-msgid "No connections"
+#: ../../include/channel.php:344
+msgid "Default Profile"
 msgstr ""
 
-#: ../../include/text.php:929
-#, php-format
-msgid "View all %s connections"
+#: ../../include/channel.php:1045
+msgid "Create New Profile"
 msgstr ""
 
-#: ../../include/text.php:1074 ../../include/text.php:1079
-msgid "poke"
+#: ../../include/channel.php:1065
+msgid "Visible to everybody"
 msgstr ""
 
-#: ../../include/text.php:1074 ../../include/text.php:1079
-#: ../../include/conversation.php:243
-msgid "poked"
+#: ../../include/channel.php:1138 ../../include/channel.php:1257
+msgid "Gender:"
 msgstr ""
 
-#: ../../include/text.php:1080
-msgid "ping"
+#: ../../include/channel.php:1140 ../../include/channel.php:1312
+msgid "Homepage:"
 msgstr ""
 
-#: ../../include/text.php:1080
-msgid "pinged"
+#: ../../include/channel.php:1141
+msgid "Online Now"
 msgstr ""
 
-#: ../../include/text.php:1081
-msgid "prod"
+#: ../../include/channel.php:1262
+msgid "Like this channel"
 msgstr ""
 
-#: ../../include/text.php:1081
-msgid "prodded"
+#: ../../include/channel.php:1286
+msgid "j F, Y"
 msgstr ""
 
-#: ../../include/text.php:1082
-msgid "slap"
+#: ../../include/channel.php:1287
+msgid "j F"
 msgstr ""
 
-#: ../../include/text.php:1082
-msgid "slapped"
+#: ../../include/channel.php:1294
+msgid "Birthday:"
 msgstr ""
 
-#: ../../include/text.php:1083
-msgid "finger"
+#: ../../include/channel.php:1307
+#, php-format
+msgid "for %1$d %2$s"
 msgstr ""
 
-#: ../../include/text.php:1083
-msgid "fingered"
+#: ../../include/channel.php:1310
+msgid "Sexual Preference:"
 msgstr ""
 
-#: ../../include/text.php:1084
-msgid "rebuff"
+#: ../../include/channel.php:1316
+msgid "Tags:"
 msgstr ""
 
-#: ../../include/text.php:1084
-msgid "rebuffed"
+#: ../../include/channel.php:1318
+msgid "Political Views:"
 msgstr ""
 
-#: ../../include/text.php:1096
-msgid "happy"
+#: ../../include/channel.php:1320
+msgid "Religion:"
 msgstr ""
 
-#: ../../include/text.php:1097
-msgid "sad"
+#: ../../include/channel.php:1324
+msgid "Hobbies/Interests:"
 msgstr ""
 
-#: ../../include/text.php:1098
-msgid "mellow"
+#: ../../include/channel.php:1326
+msgid "Likes:"
 msgstr ""
 
-#: ../../include/text.php:1099
-msgid "tired"
+#: ../../include/channel.php:1328
+msgid "Dislikes:"
 msgstr ""
 
-#: ../../include/text.php:1100
-msgid "perky"
+#: ../../include/channel.php:1330
+msgid "Contact information and Social Networks:"
 msgstr ""
 
-#: ../../include/text.php:1101
-msgid "angry"
+#: ../../include/channel.php:1332
+msgid "My other channels:"
 msgstr ""
 
-#: ../../include/text.php:1102
-msgid "stupefied"
+#: ../../include/channel.php:1334
+msgid "Musical interests:"
 msgstr ""
 
-#: ../../include/text.php:1103
-msgid "puzzled"
+#: ../../include/channel.php:1336
+msgid "Books, literature:"
 msgstr ""
 
-#: ../../include/text.php:1104
-msgid "interested"
+#: ../../include/channel.php:1338
+msgid "Television:"
 msgstr ""
 
-#: ../../include/text.php:1105
-msgid "bitter"
+#: ../../include/channel.php:1340
+msgid "Film/dance/culture/entertainment:"
 msgstr ""
 
-#: ../../include/text.php:1106
-msgid "cheerful"
+#: ../../include/channel.php:1342
+msgid "Love/Romance:"
 msgstr ""
 
-#: ../../include/text.php:1107
-msgid "alive"
+#: ../../include/channel.php:1344
+msgid "Work/employment:"
 msgstr ""
 
-#: ../../include/text.php:1108
-msgid "annoyed"
+#: ../../include/channel.php:1346
+msgid "School/education:"
 msgstr ""
 
-#: ../../include/text.php:1109
-msgid "anxious"
+#: ../../include/channel.php:1369
+msgid "Like this thing"
 msgstr ""
 
-#: ../../include/text.php:1110
-msgid "cranky"
+#: ../../include/page_widgets.php:7
+msgid "New Page"
 msgstr ""
 
-#: ../../include/text.php:1111
-msgid "disturbed"
-msgstr ""
+#: ../../include/contact_widgets.php:11
+#, php-format
+msgid "%d invitation available"
+msgid_plural "%d invitations available"
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../../include/text.php:1112
-msgid "frustrated"
+#: ../../include/contact_widgets.php:19
+msgid "Find Channels"
 msgstr ""
 
-#: ../../include/text.php:1113
-msgid "depressed"
+#: ../../include/contact_widgets.php:20
+msgid "Enter name or interest"
 msgstr ""
 
-#: ../../include/text.php:1114
-msgid "motivated"
+#: ../../include/contact_widgets.php:21
+msgid "Connect/Follow"
 msgstr ""
 
-#: ../../include/text.php:1115
-msgid "relaxed"
+#: ../../include/contact_widgets.php:22
+msgid "Examples: Robert Morgenstein, Fishing"
 msgstr ""
 
-#: ../../include/text.php:1116
-msgid "surprised"
+#: ../../include/contact_widgets.php:26
+msgid "Random Profile"
 msgstr ""
 
-#: ../../include/text.php:1303 ../../include/js_strings.php:70
-msgid "Monday"
+#: ../../include/contact_widgets.php:27
+msgid "Invite Friends"
 msgstr ""
 
-#: ../../include/text.php:1303 ../../include/js_strings.php:71
-msgid "Tuesday"
+#: ../../include/contact_widgets.php:29
+msgid "Advanced example: name=fred and country=iceland"
 msgstr ""
 
-#: ../../include/text.php:1303 ../../include/js_strings.php:72
-msgid "Wednesday"
-msgstr ""
+#: ../../include/contact_widgets.php:122
+#, php-format
+msgid "%d connection in common"
+msgid_plural "%d connections in common"
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../../include/text.php:1303 ../../include/js_strings.php:73
-msgid "Thursday"
+#: ../../include/contact_widgets.php:127
+msgid "show more"
 msgstr ""
 
-#: ../../include/text.php:1303 ../../include/js_strings.php:74
-msgid "Friday"
+#: ../../include/selectors.php:123
+msgid "Partners"
 msgstr ""
 
-#: ../../include/text.php:1303 ../../include/js_strings.php:75
-msgid "Saturday"
+#: ../../include/selectors.php:123 ../../include/selectors.php:140
+msgid "Cohabiting"
 msgstr ""
 
-#: ../../include/text.php:1303 ../../include/js_strings.php:69
-msgid "Sunday"
+#: ../../include/selectors.php:123
+msgid "Common law"
 msgstr ""
 
-#: ../../include/text.php:1307 ../../include/js_strings.php:45
+#: ../../include/js_strings.php:45 ../../include/text.php:1325
 msgid "January"
 msgstr ""
 
-#: ../../include/text.php:1307 ../../include/js_strings.php:46
+#: ../../include/js_strings.php:46 ../../include/text.php:1325
 msgid "February"
 msgstr ""
 
-#: ../../include/text.php:1307 ../../include/js_strings.php:47
+#: ../../include/js_strings.php:47 ../../include/text.php:1325
 msgid "March"
 msgstr ""
 
-#: ../../include/text.php:1307 ../../include/js_strings.php:48
+#: ../../include/js_strings.php:48 ../../include/text.php:1325
 msgid "April"
 msgstr ""
 
-#: ../../include/text.php:1307
+#: ../../include/js_strings.php:49
+msgctxt "long"
 msgid "May"
 msgstr ""
 
-#: ../../include/text.php:1307 ../../include/js_strings.php:50
+#: ../../include/js_strings.php:50 ../../include/text.php:1325
 msgid "June"
 msgstr ""
 
-#: ../../include/text.php:1307 ../../include/js_strings.php:51
+#: ../../include/js_strings.php:51 ../../include/text.php:1325
 msgid "July"
 msgstr ""
 
-#: ../../include/text.php:1307 ../../include/js_strings.php:52
+#: ../../include/js_strings.php:52 ../../include/text.php:1325
 msgid "August"
 msgstr ""
 
-#: ../../include/text.php:1307 ../../include/js_strings.php:53
+#: ../../include/js_strings.php:53 ../../include/text.php:1325
 msgid "September"
 msgstr ""
 
-#: ../../include/text.php:1307 ../../include/js_strings.php:54
+#: ../../include/js_strings.php:54 ../../include/text.php:1325
 msgid "October"
 msgstr ""
 
-#: ../../include/text.php:1307 ../../include/js_strings.php:55
+#: ../../include/js_strings.php:55 ../../include/text.php:1325
 msgid "November"
 msgstr ""
 
-#: ../../include/text.php:1307 ../../include/js_strings.php:56
+#: ../../include/js_strings.php:56 ../../include/text.php:1325
 msgid "December"
 msgstr ""
 
-#: ../../include/text.php:1384 ../../include/text.php:1388
-msgid "Unknown Attachment"
+#: ../../include/js_strings.php:57
+msgid "Jan"
 msgstr ""
 
-#: ../../include/text.php:1390
-msgid "unknown"
+#: ../../include/selectors.php:123
+msgid "Swinger"
 msgstr ""
 
-#: ../../include/text.php:1426
-msgid "remove category"
+#: ../../include/selectors.php:123
+msgid "Betrayed"
 msgstr ""
 
-#: ../../include/text.php:1503
-msgid "remove from file"
+#: ../../include/selectors.php:123 ../../include/selectors.php:140
+msgid "Separated"
 msgstr ""
 
-#: ../../include/text.php:1770 ../../include/language.php:367
-msgid "default"
+#: ../../include/selectors.php:123
+msgid "Unstable"
 msgstr ""
 
-#: ../../include/text.php:1778
-msgid "Page layout"
+#: ../../include/selectors.php:123 ../../include/selectors.php:140
+msgid "Divorced"
 msgstr ""
 
-#: ../../include/text.php:1778
-msgid "You can create your own with the layouts tool"
+#: ../../include/selectors.php:123
+msgid "Imaginarily divorced"
 msgstr ""
 
-#: ../../include/text.php:1820
-msgid "Page content type"
+#: ../../include/selectors.php:123 ../../include/selectors.php:140
+msgid "Widowed"
 msgstr ""
 
-#: ../../include/text.php:1953
-msgid "activity"
+#: ../../include/selectors.php:123
+msgid "Uncertain"
 msgstr ""
 
-#: ../../include/text.php:2267
-msgid "Design Tools"
+#: ../../include/selectors.php:123 ../../include/selectors.php:140
+msgid "It's complicated"
 msgstr ""
 
-#: ../../include/text.php:2273
-msgid "Pages"
+#: ../../include/selectors.php:123
+msgid "Don't care"
 msgstr ""
 
-#: ../../include/text.php:2295
-msgid "Import website..."
+#: ../../include/selectors.php:123
+msgid "Ask me"
 msgstr ""
 
-#: ../../include/text.php:2296
-msgid "Select folder to import"
+#: ../../include/js_strings.php:69 ../../include/text.php:1321
+msgid "Sunday"
 msgstr ""
 
-#: ../../include/text.php:2297
-msgid "Import from a zipped folder:"
+#: ../../include/js_strings.php:70 ../../include/text.php:1321
+msgid "Monday"
 msgstr ""
 
-#: ../../include/text.php:2298
-msgid "Import from cloud files:"
+#: ../../include/js_strings.php:71 ../../include/text.php:1321
+msgid "Tuesday"
 msgstr ""
 
-#: ../../include/text.php:2299
-msgid "/cloud/channel/path/to/folder"
+#: ../../include/js_strings.php:72 ../../include/text.php:1321
+msgid "Wednesday"
 msgstr ""
 
-#: ../../include/text.php:2300
-msgid "Enter path to website files"
+#: ../../include/js_strings.php:73 ../../include/text.php:1321
+msgid "Thursday"
 msgstr ""
 
-#: ../../include/text.php:2301
-msgid "Select folder"
+#: ../../include/js_strings.php:74 ../../include/text.php:1321
+msgid "Friday"
 msgstr ""
 
-#: ../../include/text.php:2302
-msgid "Export website..."
+#: ../../include/js_strings.php:75 ../../include/text.php:1321
+msgid "Saturday"
 msgstr ""
 
-#: ../../include/text.php:2303
-msgid "Export to a zip file"
+#: ../../include/js_strings.php:76
+msgid "Sun"
 msgstr ""
 
-#: ../../include/text.php:2304
-msgid "website.zip"
+#: ../../include/permissions.php:39
+msgid "Can view my webpages"
 msgstr ""
 
-#: ../../include/text.php:2305
-msgid "Enter a name for the zip file."
+#: ../../include/permissions.php:43
+msgid "Can post on my channel page (\"wall\")"
 msgstr ""
 
-#: ../../include/text.php:2306
-msgid "Export to cloud files"
+#: ../../include/permissions.php:46
+msgid "Can like/dislike stuff"
 msgstr ""
 
-#: ../../include/text.php:2307
-msgid "/path/to/export/folder"
+#: ../../include/js_strings.php:80
+msgid "Thu"
 msgstr ""
 
-#: ../../include/text.php:2308
-msgid "Enter a path to a cloud files destination."
+#: ../../include/js_strings.php:81
+msgid "Fri"
 msgstr ""
 
-#: ../../include/text.php:2309
-msgid "Specify folder"
+#: ../../include/js_strings.php:82
+msgid "Sat"
 msgstr ""
 
-#: ../../include/bookmarks.php:35
-#, php-format
-msgid "%1$s's bookmarks"
+#: ../../include/js_strings.php:83
+msgctxt "calendar"
+msgid "today"
 msgstr ""
 
-#: ../../include/wiki.php:545 ../../include/bbcode.php:552
-#: ../../include/bbcode.php:683
-msgid "Different viewers will see this text differently"
+#: ../../include/js_strings.php:84
+msgctxt "calendar"
+msgid "month"
 msgstr ""
 
-#: ../../include/help.php:31
-msgid "Help:"
+#: ../../include/js_strings.php:85
+msgctxt "calendar"
+msgid "week"
 msgstr ""
 
-#: ../../include/page_widgets.php:7
-msgid "New Page"
+#: ../../include/js_strings.php:86
+msgctxt "calendar"
+msgid "day"
 msgstr ""
 
-#: ../../include/contact_widgets.php:11
-#, php-format
-msgid "%d invitation available"
-msgid_plural "%d invitations available"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../../include/contact_widgets.php:19
-msgid "Find Channels"
+#: ../../include/js_strings.php:87
+msgctxt "calendar"
+msgid "All day"
 msgstr ""
 
-#: ../../include/contact_widgets.php:20
-msgid "Enter name or interest"
+#: ../../include/dir_fns.php:141
+msgid "Directory Options"
 msgstr ""
 
-#: ../../include/contact_widgets.php:21
-msgid "Connect/Follow"
+#: ../../include/dir_fns.php:143
+msgid "Safe Mode"
 msgstr ""
 
-#: ../../include/contact_widgets.php:22
-msgid "Examples: Robert Morgenstein, Fishing"
+#: ../../include/dir_fns.php:144
+msgid "Public Forums Only"
 msgstr ""
 
-#: ../../include/contact_widgets.php:26
-msgid "Random Profile"
+#: ../../include/dir_fns.php:145
+msgid "This Website Only"
 msgstr ""
 
-#: ../../include/contact_widgets.php:27
-msgid "Invite Friends"
+#: ../../include/attach.php:250 ../../include/attach.php:338
+msgid "Item was not found."
 msgstr ""
 
-#: ../../include/contact_widgets.php:29
-msgid "Advanced example: name=fred and country=iceland"
+#: ../../include/attach.php:499
+msgid "No source file."
 msgstr ""
 
-#: ../../include/contact_widgets.php:56 ../../include/contact_widgets.php:94
-#: ../../include/widgets.php:349 ../../include/widgets.php:468
-msgid "Everything"
+#: ../../include/attach.php:521
+msgid "Cannot locate file to replace"
 msgstr ""
 
-#: ../../include/contact_widgets.php:91 ../../include/taxonomy.php:188
-#: ../../include/taxonomy.php:270 ../../include/widgets.php:46
-#: ../../include/widgets.php:465
-msgid "Categories"
+#: ../../include/attach.php:539
+msgid "Cannot locate file to revise/update"
 msgstr ""
 
-#: ../../include/contact_widgets.php:122
+#: ../../include/attach.php:670
 #, php-format
-msgid "%d connection in common"
-msgid_plural "%d connections in common"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../../include/contact_widgets.php:127
-msgid "show more"
-msgstr ""
-
-#: ../../include/selectors.php:123
-msgid "Partners"
+msgid "File exceeds size limit of %d"
 msgstr ""
 
-#: ../../include/selectors.php:123 ../../include/selectors.php:140
-msgid "Cohabiting"
+#: ../../include/attach.php:684
+#, php-format
+msgid "You have reached your limit of %1$.0f Mbytes attachment storage."
 msgstr ""
 
-#: ../../include/selectors.php:123
-msgid "Common law"
+#: ../../include/attach.php:854
+msgid "File upload failed. Possible system limit or action terminated."
 msgstr ""
 
-#: ../../include/selectors.php:123
-msgid "Happy"
+#: ../../include/attach.php:867
+msgid "Stored file could not be verified. Upload failed."
 msgstr ""
 
-#: ../../include/selectors.php:123
-msgid "Not looking"
+#: ../../include/attach.php:922 ../../include/attach.php:938
+msgid "Path not available."
 msgstr ""
 
-#: ../../include/selectors.php:123
-msgid "Swinger"
+#: ../../include/attach.php:984 ../../include/attach.php:1142
+msgid "Empty pathname"
 msgstr ""
 
-#: ../../include/selectors.php:123
-msgid "Betrayed"
+#: ../../include/attach.php:1010
+msgid "duplicate filename or path"
 msgstr ""
 
-#: ../../include/selectors.php:123 ../../include/selectors.php:140
-msgid "Separated"
+#: ../../include/attach.php:1032
+msgid "Path not found."
 msgstr ""
 
-#: ../../include/selectors.php:123
-msgid "Unstable"
+#: ../../include/attach.php:1096
+msgid "mkdir failed."
 msgstr ""
 
-#: ../../include/selectors.php:123 ../../include/selectors.php:140
-msgid "Divorced"
+#: ../../include/attach.php:1100
+msgid "database storage failed."
 msgstr ""
 
-#: ../../include/selectors.php:123
-msgid "Imaginarily divorced"
+#: ../../include/attach.php:1148
+msgid "Empty path"
 msgstr ""
 
-#: ../../include/selectors.php:123 ../../include/selectors.php:140
-msgid "Widowed"
+#: ../../include/network.php:733
+msgid "view full size"
 msgstr ""
 
-#: ../../include/selectors.php:123
-msgid "Uncertain"
+#: ../../include/network.php:1988
+msgid "No Subject"
 msgstr ""
 
-#: ../../include/selectors.php:123 ../../include/selectors.php:140
-msgid "It's complicated"
+#: ../../include/network.php:2244
+msgid "OStatus"
 msgstr ""
 
-#: ../../include/selectors.php:123
-msgid "Don't care"
+#: ../../include/network.php:2245
+msgid "GNU-Social"
 msgstr ""
 
-#: ../../include/selectors.php:123
-msgid "Ask me"
+#: ../../include/network.php:2246
+msgid "RSS/Atom"
 msgstr ""
 
-#: ../../include/permissions.php:35
-msgid "Can view my normal stream and posts"
+#: ../../include/network.php:2249
+msgid "Facebook"
 msgstr ""
 
-#: ../../include/permissions.php:39
-msgid "Can view my webpages"
+#: ../../include/network.php:2250
+msgid "Zot"
 msgstr ""
 
-#: ../../include/permissions.php:43
-msgid "Can post on my channel page (\"wall\")"
+#: ../../include/network.php:2251
+msgid "LinkedIn"
 msgstr ""
 
-#: ../../include/permissions.php:46
-msgid "Can like/dislike stuff"
+#: ../../include/network.php:2252
+msgid "XMPP/IM"
 msgstr ""
 
-#: ../../include/permissions.php:46
-msgid "Profiles and things other than posts/comments"
+#: ../../include/network.php:2253
+msgid "MySpace"
 msgstr ""
 
-#: ../../include/permissions.php:48
-msgid "Can forward to all my channel contacts via post @mentions"
+#: ../../include/oembed.php:308
+msgid " by "
 msgstr ""
 
-#: ../../include/permissions.php:48
-msgid "Advanced - useful for creating group forum channels"
+#: ../../include/oembed.php:309
+msgid " on "
 msgstr ""
 
-#: ../../include/permissions.php:49
-msgid "Can chat with me (when available)"
+#: ../../include/oembed.php:338
+msgid "Embedded content"
 msgstr ""
 
-#: ../../include/permissions.php:50
-msgid "Can write to my file storage and photos"
+#: ../../include/oembed.php:347
+msgid "Embedding disabled"
 msgstr ""
 
-#: ../../include/permissions.php:51
-msgid "Can edit my webpages"
+#: ../../include/photos.php:115
+#, php-format
+msgid "Image exceeds website size limit of %lu bytes"
 msgstr ""
 
-#: ../../include/permissions.php:53
-msgid "Somewhat advanced - very useful in open communities"
+#: ../../include/photos.php:122
+msgid "Image file is empty."
 msgstr ""
 
-#: ../../include/permissions.php:55
-msgid "Can administer my channel resources"
+#: ../../include/photos.php:260
+msgid "Photo storage failed."
 msgstr ""
 
-#: ../../include/network.php:729
-msgid "view full size"
+#: ../../include/photos.php:300
+msgid "a new photo"
 msgstr ""
 
-#: ../../include/network.php:1978
-msgid "No Subject"
+#: ../../include/photos.php:304
+#, php-format
+msgctxt "photo_upload"
+msgid "%1$s posted %2$s to %3$s"
 msgstr ""
 
-#: ../../include/network.php:2234
-msgid "OStatus"
+#: ../../include/photos.php:519
+msgid "Upload New Photos"
 msgstr ""
 
-#: ../../include/network.php:2235
-msgid "GNU-Social"
+#: ../../include/text.php:460
+msgid "prev"
 msgstr ""
 
-#: ../../include/network.php:2236
-msgid "RSS/Atom"
+#: ../../include/text.php:462
+msgid "first"
 msgstr ""
 
-#: ../../include/network.php:2239
-msgid "Facebook"
+#: ../../include/text.php:491
+msgid "last"
 msgstr ""
 
-#: ../../include/network.php:2240
-msgid "Zot"
+#: ../../include/text.php:494
+msgid "next"
 msgstr ""
 
-#: ../../include/network.php:2241
-msgid "LinkedIn"
+#: ../../include/text.php:505
+msgid "older"
 msgstr ""
 
-#: ../../include/network.php:2242
-msgid "XMPP/IM"
+#: ../../include/text.php:507
+msgid "newer"
 msgstr ""
 
-#: ../../include/network.php:2243
-msgid "MySpace"
+#: ../../include/text.php:922
+msgid "No connections"
 msgstr ""
 
-#: ../../include/taxonomy.php:228 ../../include/taxonomy.php:249
-msgid "Tags"
+#: ../../include/text.php:947
+#, php-format
+msgid "View all %s connections"
 msgstr ""
 
-#: ../../include/taxonomy.php:293
-msgid "Keywords"
+#: ../../include/text.php:1092 ../../include/text.php:1097
+msgid "poke"
 msgstr ""
 
-#: ../../include/taxonomy.php:314
-msgid "have"
+#: ../../include/text.php:1098
+msgid "ping"
 msgstr ""
 
-#: ../../include/taxonomy.php:314
-msgid "has"
+#: ../../include/text.php:1098
+msgid "pinged"
 msgstr ""
 
-#: ../../include/taxonomy.php:315
-msgid "want"
+#: ../../include/text.php:1099
+msgid "prod"
 msgstr ""
 
-#: ../../include/taxonomy.php:315
-msgid "wants"
+#: ../../include/text.php:1099
+msgid "prodded"
 msgstr ""
 
-#: ../../include/taxonomy.php:316
-msgid "likes"
+#: ../../include/text.php:1100
+msgid "slap"
 msgstr ""
 
-#: ../../include/taxonomy.php:317
-msgid "dislikes"
+#: ../../include/text.php:1100
+msgid "slapped"
 msgstr ""
 
-#: ../../include/import.php:30
-msgid ""
-"Cannot create a duplicate channel identifier on this system. Import failed."
+#: ../../include/text.php:1101
+msgid "finger"
 msgstr ""
 
-#: ../../include/import.php:90
-msgid "Channel clone failed. Import failed."
+#: ../../include/text.php:1101
+msgid "fingered"
 msgstr ""
 
-#: ../../include/import.php:1354
-msgid "Unable to import element \""
+#: ../../include/text.php:1102
+msgid "rebuff"
 msgstr ""
 
-#: ../../include/security.php:117
-msgid "guest:"
+#: ../../include/text.php:1102
+msgid "rebuffed"
 msgstr ""
 
-#: ../../include/security.php:535
-msgid ""
-"The form security token was not correct. This probably happened because the "
-"form has been opened for too long (>3 hours) before submitting it."
+#: ../../include/text.php:1114
+msgid "happy"
 msgstr ""
 
-#: ../../include/zot.php:662
-msgid "Invalid data packet"
+#: ../../include/text.php:1115
+msgid "sad"
 msgstr ""
 
-#: ../../include/zot.php:678
-msgid "Unable to verify channel signature"
+#: ../../include/text.php:1116
+msgid "mellow"
 msgstr ""
 
-#: ../../include/zot.php:2320
-#, php-format
-msgid "Unable to verify site signature for %s"
+#: ../../include/text.php:1117
+msgid "tired"
 msgstr ""
 
-#: ../../include/zot.php:3718
-msgid "invalid target signature"
+#: ../../include/text.php:1118
+msgid "perky"
 msgstr ""
 
-#: ../../include/items.php:837 ../../include/items.php:882
-msgid "(Unknown)"
+#: ../../include/text.php:1119
+msgid "angry"
 msgstr ""
 
-#: ../../include/items.php:1080
-msgid "Visible to anybody on the internet."
+#: ../../include/text.php:1120
+msgid "stupefied"
 msgstr ""
 
-#: ../../include/items.php:1082
-msgid "Visible to you only."
+#: ../../include/text.php:1121
+msgid "puzzled"
 msgstr ""
 
-#: ../../include/items.php:1084
-msgid "Visible to anybody in this network."
+#: ../../include/text.php:1122
+msgid "interested"
 msgstr ""
 
-#: ../../include/items.php:1086
-msgid "Visible to anybody authenticated."
+#: ../../include/text.php:1123
+msgid "bitter"
 msgstr ""
 
-#: ../../include/items.php:1088
-#, php-format
-msgid "Visible to anybody on %s."
+#: ../../include/text.php:1124
+msgid "cheerful"
 msgstr ""
 
-#: ../../include/items.php:1090
-msgid "Visible to all connections."
+#: ../../include/text.php:1125
+msgid "alive"
 msgstr ""
 
-#: ../../include/items.php:1092
-msgid "Visible to approved connections."
+#: ../../include/text.php:1126
+msgid "annoyed"
 msgstr ""
 
-#: ../../include/items.php:1094
-msgid "Visible to specific connections."
+#: ../../include/text.php:1127
+msgid "anxious"
 msgstr ""
 
-#: ../../include/items.php:3892
-msgid "Privacy group is empty."
+#: ../../include/text.php:1128
+msgid "cranky"
 msgstr ""
 
-#: ../../include/items.php:3899
-#, php-format
-msgid "Privacy group: %s"
+#: ../../include/text.php:1129
+msgid "disturbed"
 msgstr ""
 
-#: ../../include/items.php:3911
-msgid "Connection not found."
+#: ../../include/text.php:1130
+msgid "frustrated"
 msgstr ""
 
-#: ../../include/items.php:4260
-msgid "profile photo"
+#: ../../include/text.php:1131
+msgid "depressed"
 msgstr ""
 
-#: ../../include/items.php:4456
-#, php-format
-msgid "[Edited %s]"
+#: ../../include/text.php:1132
+msgid "motivated"
 msgstr ""
 
-#: ../../include/items.php:4456
-msgctxt "edit_activity"
-msgid "Post"
+#: ../../include/text.php:1133
+msgid "relaxed"
 msgstr ""
 
-#: ../../include/items.php:4456
-msgctxt "edit_activity"
-msgid "Comment"
+#: ../../include/text.php:1134
+msgid "surprised"
 msgstr ""
 
-#: ../../include/auth.php:148
-msgid "Logged out."
+#: ../../include/text.php:1325
+msgid "May"
 msgstr ""
 
-#: ../../include/auth.php:275
-msgid "Failed authentication"
+#: ../../include/text.php:1402 ../../include/text.php:1406
+msgid "Unknown Attachment"
 msgstr ""
 
-#: ../../include/activities.php:41
-msgid " and "
+#: ../../include/text.php:1408
+msgid "unknown"
 msgstr ""
 
-#: ../../include/activities.php:49
-msgid "public profile"
+#: ../../include/text.php:1444
+msgid "remove category"
 msgstr ""
 
-#: ../../include/activities.php:58
-#, php-format
-msgid "%1$s changed %2$s to &ldquo;%3$s&rdquo;"
+#: ../../include/text.php:1521
+msgid "remove from file"
 msgstr ""
 
-#: ../../include/activities.php:59
-#, php-format
-msgid "Visit %1$s's %2$s"
+#: ../../include/text.php:1791
+msgid "Page layout"
 msgstr ""
 
-#: ../../include/activities.php:62
-#, php-format
-msgid "%1$s has an updated %2$s, changing %3$s."
+#: ../../include/text.php:1791
+msgid "You can create your own with the layouts tool"
 msgstr ""
 
-#: ../../include/attach.php:248 ../../include/attach.php:336
-msgid "Item was not found."
+#: ../../include/text.php:1833
+msgid "Page content type"
 msgstr ""
 
-#: ../../include/attach.php:497
-msgid "No source file."
+#: ../../include/text.php:1966
+msgid "activity"
 msgstr ""
 
-#: ../../include/attach.php:519
-msgid "Cannot locate file to replace"
+#: ../../include/text.php:2280
+msgid "Design Tools"
 msgstr ""
 
-#: ../../include/attach.php:537
-msgid "Cannot locate file to revise/update"
+#: ../../include/text.php:2286
+msgid "Pages"
 msgstr ""
 
-#: ../../include/attach.php:668
-#, php-format
-msgid "File exceeds size limit of %d"
+#: ../../include/text.php:2308
+msgid "Import website..."
 msgstr ""
 
-#: ../../include/attach.php:682
-#, php-format
-msgid "You have reached your limit of %1$.0f Mbytes attachment storage."
+#: ../../include/text.php:2309
+msgid "Select folder to import"
 msgstr ""
 
-#: ../../include/attach.php:852
-msgid "File upload failed. Possible system limit or action terminated."
+#: ../../include/text.php:2310
+msgid "Import from a zipped folder:"
 msgstr ""
 
-#: ../../include/attach.php:865
-msgid "Stored file could not be verified. Upload failed."
+#: ../../include/text.php:2311
+msgid "Import from cloud files:"
 msgstr ""
 
-#: ../../include/attach.php:920 ../../include/attach.php:936
-msgid "Path not available."
+#: ../../include/text.php:2312
+msgid "/cloud/channel/path/to/folder"
 msgstr ""
 
-#: ../../include/attach.php:982 ../../include/attach.php:1140
-msgid "Empty pathname"
+#: ../../include/text.php:2313
+msgid "Enter path to website files"
 msgstr ""
 
-#: ../../include/attach.php:1008
-msgid "duplicate filename or path"
+#: ../../include/text.php:2314
+msgid "Select folder"
 msgstr ""
 
-#: ../../include/attach.php:1030
-msgid "Path not found."
+#: ../../include/text.php:2315
+msgid "Export website..."
 msgstr ""
 
-#: ../../include/attach.php:1094
-msgid "mkdir failed."
+#: ../../include/text.php:2316
+msgid "Export to a zip file"
 msgstr ""
 
-#: ../../include/attach.php:1098
-msgid "database storage failed."
+#: ../../include/text.php:2317
+msgid "website.zip"
 msgstr ""
 
-#: ../../include/attach.php:1146
-msgid "Empty path"
+#: ../../include/text.php:2318
+msgid "Enter a name for the zip file."
 msgstr ""
 
-#: ../../include/event.php:22 ../../include/event.php:69
-#: ../../include/bb2diaspora.php:498
-msgid "l F d, Y \\@ g:i A"
+#: ../../include/text.php:2319
+msgid "Export to cloud files"
 msgstr ""
 
-#: ../../include/event.php:30 ../../include/event.php:73
-#: ../../include/bb2diaspora.php:504
-msgid "Starts:"
+#: ../../include/text.php:2320
+msgid "/path/to/export/folder"
 msgstr ""
 
-#: ../../include/event.php:40 ../../include/event.php:77
-#: ../../include/bb2diaspora.php:512
-msgid "Finishes:"
+#: ../../include/text.php:2321
+msgid "Enter a path to a cloud files destination."
 msgstr ""
 
-#: ../../include/event.php:824
-msgid "This event has been added to your calendar."
+#: ../../include/text.php:2322
+msgid "Specify folder"
 msgstr ""
 
-#: ../../include/event.php:1024
-msgid "Not specified"
+#: ../../include/nav.php:88
+msgid "Remote authentication"
 msgstr ""
 
-#: ../../include/event.php:1025
-msgid "Needs Action"
+#: ../../include/nav.php:88
+msgid "Click to authenticate to your home hub"
 msgstr ""
 
-#: ../../include/event.php:1026
-msgid "Completed"
+#: ../../include/nav.php:99 ../../include/nav.php:140 ../../boot.php:1731
+msgid "Logout"
 msgstr ""
 
-#: ../../include/event.php:1027
-msgid "In Process"
+#: ../../include/nav.php:99 ../../include/nav.php:140
+msgid "End this session"
 msgstr ""
 
-#: ../../include/event.php:1028
-msgid "Cancelled"
+#: ../../include/nav.php:103
+msgid "Your profile page"
 msgstr ""
 
-#: ../../include/follow.php:27
-msgid "Channel is blocked on this site."
+#: ../../include/nav.php:105
+msgid "Manage/Edit profiles"
 msgstr ""
 
-#: ../../include/follow.php:32
-msgid "Channel location missing."
+#: ../../include/nav.php:107
+msgid "Edit your profile"
 msgstr ""
 
-#: ../../include/follow.php:80
-msgid "Response from remote channel was incomplete."
+#: ../../include/nav.php:130
+msgid "Sign in"
 msgstr ""
 
-#: ../../include/follow.php:97
-msgid "Channel was deleted and no longer exists."
+#: ../../include/nav.php:155
+msgid "Get me home"
 msgstr ""
 
-#: ../../include/follow.php:147 ../../include/follow.php:183
-msgid "Protocol disabled."
+#: ../../include/nav.php:157
+msgid "Log me out of this site"
 msgstr ""
 
-#: ../../include/follow.php:171
-msgid "Channel discovery failed."
+#: ../../include/nav.php:162
+msgid "Create an account"
 msgstr ""
 
-#: ../../include/follow.php:210
-msgid "Cannot connect to yourself."
+#: ../../include/nav.php:174
+msgid "Help and documentation"
 msgstr ""
 
-#: ../../include/group.php:26
-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/nav.php:178
+msgid "Applications, utilities, links, games"
 msgstr ""
 
-#: ../../include/group.php:248
-msgid "Add new connections to this privacy group"
+#: ../../include/nav.php:180
+msgid "Search site @name, #tag, ?docs, content"
 msgstr ""
 
-#: ../../include/group.php:289
-msgid "edit"
+#: ../../include/nav.php:182
+msgid "Channel Directory"
 msgstr ""
 
-#: ../../include/group.php:312
-msgid "Edit group"
+#: ../../include/nav.php:194
+msgid "Your grid"
 msgstr ""
 
-#: ../../include/group.php:313
-msgid "Add privacy group"
+#: ../../include/nav.php:195
+msgid "View your network/grid"
 msgstr ""
 
-#: ../../include/group.php:314
-msgid "Channels not in any privacy group"
+#: ../../include/nav.php:196
+msgid "Mark all grid notifications seen"
 msgstr ""
 
-#: ../../include/group.php:316 ../../include/widgets.php:284
-msgid "add"
+#: ../../include/nav.php:198
+msgid "Channel home"
 msgstr ""
 
-#: ../../include/language.php:380
-msgid "Select an alternate language"
+#: ../../include/nav.php:199
+msgid "View your channel home"
 msgstr ""
 
-#: ../../include/photos.php:115
-#, php-format
-msgid "Image exceeds website size limit of %lu bytes"
+#: ../../include/nav.php:200
+msgid "Mark all channel notifications seen"
 msgstr ""
 
-#: ../../include/photos.php:122
-msgid "Image file is empty."
+#: ../../include/nav.php:206
+msgid "Notices"
 msgstr ""
 
-#: ../../include/photos.php:260
-msgid "Photo storage failed."
+#: ../../include/nav.php:206
+msgid "Notifications"
 msgstr ""
 
-#: ../../include/photos.php:300
-msgid "a new photo"
+#: ../../include/nav.php:207
+msgid "View all notifications"
 msgstr ""
 
-#: ../../include/photos.php:304
-#, php-format
-msgctxt "photo_upload"
-msgid "%1$s posted %2$s to %3$s"
+#: ../../include/nav.php:210
+msgid "Private mail"
 msgstr ""
 
-#: ../../include/photos.php:507 ../../include/conversation.php:1695
-msgid "Photo Albums"
+#: ../../include/nav.php:211
+msgid "View your private messages"
 msgstr ""
 
-#: ../../include/photos.php:511
-msgid "Upload New Photos"
+#: ../../include/nav.php:212
+msgid "Mark all private messages seen"
 msgstr ""
 
-#: ../../include/widgets.php:103
-msgid "System"
+#: ../../include/nav.php:218
+msgid "Event Calendar"
 msgstr ""
 
-#: ../../include/widgets.php:106
-msgid "New App"
+#: ../../include/nav.php:219
+msgid "View events"
 msgstr ""
 
-#: ../../include/widgets.php:154
-msgid "Suggestions"
+#: ../../include/nav.php:220
+msgid "Mark all events seen"
 msgstr ""
 
-#: ../../include/widgets.php:155
-msgid "See more..."
+#: ../../include/nav.php:223
+msgid "Manage Your Channels"
 msgstr ""
 
-#: ../../include/widgets.php:175
-#, php-format
-msgid "You have %1$.0f of %2$.0f allowed connections."
+#: ../../include/nav.php:225
+msgid "Account/Channel Settings"
 msgstr ""
 
-#: ../../include/widgets.php:181
-msgid "Add New Connection"
+#: ../../include/nav.php:233
+msgid "Site Setup and Configuration"
 msgstr ""
 
-#: ../../include/widgets.php:182
-msgid "Enter channel address"
+#: ../../include/nav.php:288
+msgid "Documentation"
 msgstr ""
 
-#: ../../include/widgets.php:183
-msgid "Examples: bob@example.com, https://example.com/barbara"
+#: ../../include/nav.php:297
+msgid "@name, #tag, ?doc, content"
 msgstr ""
 
-#: ../../include/widgets.php:199
-msgid "Notes"
+#: ../../include/nav.php:298
+msgid "Please wait..."
 msgstr ""
 
-#: ../../include/widgets.php:275
-msgid "Remove term"
+#: ../../include/import.php:30
+msgid ""
+"Cannot create a duplicate channel identifier on this system. Import failed."
 msgstr ""
 
-#: ../../include/widgets.php:390
-msgid "Archives"
+#: ../../include/import.php:90
+msgid "Channel clone failed. Import failed."
 msgstr ""
 
-#: ../../include/widgets.php:552
-msgid "Refresh"
+#: ../../include/import.php:100
+msgid "Cloned channel not found. Import failed."
 msgstr ""
 
-#: ../../include/widgets.php:592
-msgid "Account settings"
+#: ../../include/import.php:1373
+msgid "Unable to import element \""
 msgstr ""
 
-#: ../../include/widgets.php:598
-msgid "Channel settings"
+#: ../../include/auth.php:148
+msgid "Logged out."
 msgstr ""
 
-#: ../../include/widgets.php:607
-msgid "Additional features"
+#: ../../include/auth.php:275
+msgid "Failed authentication"
 msgstr ""
 
-#: ../../include/widgets.php:614
-msgid "Feature/Addon settings"
+#: ../../include/follow.php:26
+msgid "Channel is blocked on this site."
 msgstr ""
 
-#: ../../include/widgets.php:620
-msgid "Display settings"
+#: ../../include/follow.php:31
+msgid "Channel location missing."
 msgstr ""
 
-#: ../../include/widgets.php:627
-msgid "Manage locations"
+#: ../../include/follow.php:73
+msgid "Response from remote channel was incomplete."
 msgstr ""
 
-#: ../../include/widgets.php:634
-msgid "Export channel"
+#: ../../include/follow.php:90
+msgid "Channel was deleted and no longer exists."
 msgstr ""
 
-#: ../../include/widgets.php:640
-msgid "Connected apps"
+#: ../../include/follow.php:140 ../../include/follow.php:175
+msgid "Protocol disabled."
 msgstr ""
 
-#: ../../include/widgets.php:664
-msgid "Premium Channel Settings"
+#: ../../include/follow.php:163
+msgid "Channel discovery failed."
 msgstr ""
 
-#: ../../include/widgets.php:693
-msgid "Private Mail Menu"
+#: ../../include/follow.php:202
+msgid "Cannot connect to yourself."
 msgstr ""
 
-#: ../../include/widgets.php:695
-msgid "Combined View"
+#: ../../include/activities.php:41
+msgid " and "
 msgstr ""
 
-#: ../../include/widgets.php:727 ../../include/widgets.php:739
-msgid "Conversations"
+#: ../../include/activities.php:49
+msgid "public profile"
 msgstr ""
 
-#: ../../include/widgets.php:731
-msgid "Received Messages"
+#: ../../include/activities.php:58
+#, php-format
+msgid "%1$s changed %2$s to &ldquo;%3$s&rdquo;"
 msgstr ""
 
-#: ../../include/widgets.php:735
-msgid "Sent Messages"
+#: ../../include/activities.php:59
+#, php-format
+msgid "Visit %1$s's %2$s"
 msgstr ""
 
-#: ../../include/widgets.php:749
-msgid "No messages."
+#: ../../include/activities.php:62
+#, php-format
+msgid "%1$s has an updated %2$s, changing %3$s."
 msgstr ""
 
-#: ../../include/widgets.php:767
-msgid "Delete conversation"
+#: ../../include/bbcode.php:134 ../../include/bbcode.php:1040
+#: ../../include/bbcode.php:1043 ../../include/bbcode.php:1048
+#: ../../include/bbcode.php:1051 ../../include/bbcode.php:1054
+#: ../../include/bbcode.php:1057 ../../include/bbcode.php:1062
+#: ../../include/bbcode.php:1065 ../../include/bbcode.php:1070
+#: ../../include/bbcode.php:1073 ../../include/bbcode.php:1076
+#: ../../include/bbcode.php:1079
+msgid "Image/photo"
 msgstr ""
 
-#: ../../include/widgets.php:793
-msgid "Events Tools"
+#: ../../include/bbcode.php:173 ../../include/bbcode.php:1090
+msgid "Encrypted content"
 msgstr ""
 
-#: ../../include/widgets.php:794
-msgid "Export Calendar"
+#: ../../include/bbcode.php:189
+#, php-format
+msgid "Install %s element: "
 msgstr ""
 
-#: ../../include/widgets.php:795
-msgid "Import Calendar"
+#: ../../include/bbcode.php:193
+#, php-format
+msgid ""
+"This post contains an installable %s element, however you lack permissions "
+"to install it on this site."
 msgstr ""
 
-#: ../../include/widgets.php:883 ../../include/conversation.php:1722
-#: ../../include/conversation.php:1725
-msgid "Chatrooms"
+#: ../../include/bbcode.php:272
+#, php-format
+msgid "%1$s wrote the following %2$s %3$s"
 msgstr ""
 
-#: ../../include/widgets.php:887
-msgid "Overview"
+#: ../../include/bbcode.php:349 ../../include/bbcode.php:357
+msgid "Click to open/close"
 msgstr ""
 
-#: ../../include/widgets.php:894
-msgid "Chat Members"
+#: ../../include/bbcode.php:357
+msgid "spoiler"
 msgstr ""
 
-#: ../../include/widgets.php:960
-msgid "Wiki List"
+#: ../../include/bbcode.php:1028
+msgid "$1 wrote:"
 msgstr ""
 
-#: ../../include/widgets.php:968
-msgid "Create new wiki"
+#: ../../include/bookmarks.php:34
+#, php-format
+msgid "%1$s's bookmarks"
 msgstr ""
 
-#: ../../include/widgets.php:978
-msgid "Send notification"
+#: ../../include/group.php:26
+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 ""
 
-#: ../../include/widgets.php:1014
-msgid "Wiki Pages"
+#: ../../include/group.php:268
+msgid "Add new connections to this privacy group"
 msgstr ""
 
-#: ../../include/widgets.php:1019
-msgid "Add new page"
+#: ../../include/group.php:309
+msgid "edit"
 msgstr ""
 
-#: ../../include/widgets.php:1020
-msgid "Page name"
+#: ../../include/group.php:331 ../../include/features.php:292
+msgid "Privacy Groups"
 msgstr ""
 
-#: ../../include/widgets.php:1052
-msgid "Bookmarked Chatrooms"
+#: ../../include/group.php:332
+msgid "Edit group"
 msgstr ""
 
-#: ../../include/widgets.php:1083
-msgid "Suggested Chatrooms"
+#: ../../include/group.php:333
+msgid "Add privacy group"
 msgstr ""
 
-#: ../../include/widgets.php:1228 ../../include/widgets.php:1340
-msgid "photo/image"
+#: ../../include/group.php:334
+msgid "Channels not in any privacy group"
 msgstr ""
 
-#: ../../include/widgets.php:1283
-msgid "Click to show more"
+#: ../../include/event.php:863
+msgid "This event has been added to your calendar."
 msgstr ""
 
-#: ../../include/widgets.php:1434
-msgid "Rating Tools"
+#: ../../include/event.php:1063
+msgid "Not specified"
 msgstr ""
 
-#: ../../include/widgets.php:1438 ../../include/widgets.php:1440
-msgid "Rate Me"
+#: ../../include/event.php:1064
+msgid "Needs Action"
 msgstr ""
 
-#: ../../include/widgets.php:1443
-msgid "View Ratings"
+#: ../../include/event.php:1065
+msgid "Completed"
 msgstr ""
 
-#: ../../include/widgets.php:1536
-msgid "Forums"
+#: ../../include/event.php:1066
+msgid "In Process"
 msgstr ""
 
-#: ../../include/widgets.php:1565
-msgid "Tasks"
+#: ../../include/event.php:1067
+msgid "Cancelled"
 msgstr ""
 
-#: ../../include/widgets.php:1576
-msgid "Documentation"
+#: ../../include/items.php:841 ../../include/items.php:888
+msgid "(Unknown)"
 msgstr ""
 
-#: ../../include/widgets.php:1632 ../../include/widgets.php:1670
-msgid "Member registrations waiting for confirmation"
+#: ../../include/items.php:1089
+msgid "Visible to anybody on the internet."
 msgstr ""
 
-#: ../../include/widgets.php:1638
-msgid "Inspect queue"
+#: ../../include/items.php:1091
+msgid "Visible to you only."
 msgstr ""
 
-#: ../../include/widgets.php:1640
-msgid "DB updates"
+#: ../../include/items.php:1093
+msgid "Visible to anybody in this network."
 msgstr ""
 
-#: ../../include/widgets.php:1666
-msgid "Plugin Features"
+#: ../../include/items.php:1095
+msgid "Visible to anybody authenticated."
 msgstr ""
 
-#: ../../include/acl_selectors.php:198
-msgid "Who can see this?"
+#: ../../include/items.php:1097
+#, php-format
+msgid "Visible to anybody on %s."
 msgstr ""
 
-#: ../../include/acl_selectors.php:199
-msgid "Custom selection"
+#: ../../include/items.php:1099
+msgid "Visible to all connections."
 msgstr ""
 
-#: ../../include/acl_selectors.php:200
-msgid ""
-"Select \"Show\" to allow viewing. \"Don't show\" lets you override and limit "
-"the scope of \"Show\"."
+#: ../../include/items.php:1101
+msgid "Visible to approved connections."
 msgstr ""
 
-#: ../../include/acl_selectors.php:201
-msgid "Show"
+#: ../../include/items.php:1103
+msgid "Visible to specific connections."
 msgstr ""
 
-#: ../../include/acl_selectors.php:202
-msgid "Don't show"
+#: ../../include/items.php:3915
+msgid "Privacy group is empty."
 msgstr ""
 
-#: ../../include/acl_selectors.php:235
+#: ../../include/items.php:3922
 #, php-format
-msgid ""
-"Post permissions %s cannot be changed %s after a post is shared.</br />These "
-"permissions set who is allowed to view the post."
-msgstr ""
-
-#: ../../include/oembed.php:312
-msgid " by "
+msgid "Privacy group: %s"
 msgstr ""
 
-#: ../../include/oembed.php:313
-msgid " on "
+#: ../../include/items.php:3934
+msgid "Connection not found."
 msgstr ""
 
-#: ../../include/oembed.php:342
-msgid "Embedded content"
+#: ../../include/items.php:4283
+msgid "profile photo"
 msgstr ""
 
-#: ../../include/oembed.php:351
-msgid "Embedding disabled"
+#: ../../include/items.php:4479
+#, php-format
+msgid "[Edited %s]"
 msgstr ""
 
-#: ../../include/bb2diaspora.php:403
-msgid "Attachments:"
+#: ../../include/items.php:4479
+msgctxt "edit_activity"
+msgid "Post"
 msgstr ""
 
-#: ../../include/bb2diaspora.php:500
-msgid "$Projectname event notification:"
+#: ../../include/items.php:4479
+msgctxt "edit_activity"
+msgid "Comment"
 msgstr ""
 
 #: ../../include/permissions.php:35
@@ -12714,321 +13098,317 @@ msgstr ""
 msgid "Extremely advanced. Leave this alone unless you know what you are doing"
 msgstr ""
 
-#: ../../include/conversation.php:204
-#, php-format
-msgid "%1$s is now connected with %2$s"
+#: ../../include/features.php:58
+msgid "General Features"
 msgstr ""
 
-#: ../../include/conversation.php:239
-#, php-format
-msgid "%1$s poked %2$s"
+#: ../../include/features.php:63
+msgid "Multiple Profiles"
 msgstr ""
 
-#: ../../include/conversation.php:710
-#, php-format
-msgid "View %s's profile @ %s"
+#: ../../include/features.php:64
+msgid "Ability to create multiple profiles"
 msgstr ""
 
-#: ../../include/conversation.php:729
-msgid "Categories:"
+#: ../../include/features.php:72
+msgid "Advanced Profiles"
 msgstr ""
 
-#: ../../include/conversation.php:730
-msgid "Filed under:"
+#: ../../include/features.php:73
+msgid "Additional profile sections and selections"
 msgstr ""
 
-#: ../../include/conversation.php:755
-msgid "View in context"
+#: ../../include/features.php:81
+msgid "Profile Import/Export"
 msgstr ""
 
-#: ../../include/conversation.php:865
-msgid "remove"
+#: ../../include/features.php:82
+msgid "Save and load profile details across sites/channels"
 msgstr ""
 
-#: ../../include/conversation.php:870
-msgid "Delete Selected Items"
+#: ../../include/features.php:90
+msgid "Web Pages"
 msgstr ""
 
-#: ../../include/conversation.php:963
-msgid "View Source"
+#: ../../include/features.php:91
+msgid "Provide managed web pages on your channel"
 msgstr ""
 
-#: ../../include/conversation.php:964
-msgid "Follow Thread"
+#: ../../include/features.php:100
+msgid "Provide a wiki for your channel"
 msgstr ""
 
-#: ../../include/conversation.php:965
-msgid "Unfollow Thread"
+#: ../../include/features.php:117
+msgid "Private Notes"
 msgstr ""
 
-#: ../../include/conversation.php:970
-msgid "Activity/Posts"
+#: ../../include/features.php:118
+msgid "Enables a tool to store notes and reminders (note: not encrypted)"
 msgstr ""
 
-#: ../../include/conversation.php:972
-msgid "Edit Connection"
+#: ../../include/features.php:126
+msgid "Navigation Channel Select"
 msgstr ""
 
-#: ../../include/conversation.php:973
-msgid "Message"
+#: ../../include/features.php:127
+msgid "Change channels directly from within the navigation dropdown menu"
 msgstr ""
 
-#: ../../include/conversation.php:1093
-#, php-format
-msgid "%s likes this."
+#: ../../include/features.php:135
+msgid "Photo Location"
 msgstr ""
 
-#: ../../include/conversation.php:1093
-#, php-format
-msgid "%s doesn't like this."
+#: ../../include/features.php:136
+msgid "If location data is available on uploaded photos, link this to a map."
 msgstr ""
 
-#: ../../include/conversation.php:1097
-#, 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/features.php:144
+msgid "Access Controlled Chatrooms"
+msgstr ""
 
-#: ../../include/conversation.php:1099
-#, 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/features.php:145
+msgid "Provide chatrooms and chat services with access control."
+msgstr ""
 
-#: ../../include/conversation.php:1105
-msgid "and"
+#: ../../include/features.php:154
+msgid "Provide alternate connection permission roles."
 msgstr ""
 
-#: ../../include/conversation.php:1108
-#, php-format
-msgid ", and %d other people"
-msgid_plural ", and %d other people"
-msgstr[0] ""
-msgstr[1] ""
+#: ../../include/features.php:162
+msgid "Smart Birthdays"
+msgstr ""
 
-#: ../../include/conversation.php:1109
-#, php-format
-msgid "%s like this."
+#: ../../include/features.php:163
+msgid ""
+"Make birthday events timezone aware in case your friends are scattered "
+"across the planet."
 msgstr ""
 
-#: ../../include/conversation.php:1109
-#, php-format
-msgid "%s don't like this."
+#: ../../include/features.php:171
+msgid "Event Timezone Selection"
 msgstr ""
 
-#: ../../include/conversation.php:1152
-msgid "Set your location"
+#: ../../include/features.php:172
+msgid "Allow event creation in timezones other than your own."
 msgstr ""
 
-#: ../../include/conversation.php:1153
-msgid "Clear browser location"
+#: ../../include/features.php:180
+msgid "Advanced Directory Search"
 msgstr ""
 
-#: ../../include/conversation.php:1201
-msgid "Tag term:"
+#: ../../include/features.php:181
+msgid "Allows creation of complex directory search queries"
 msgstr ""
 
-#: ../../include/conversation.php:1202
-msgid "Where are you right now?"
+#: ../../include/features.php:189
+msgid "Advanced Theme and Layout Settings"
 msgstr ""
 
-#: ../../include/conversation.php:1211
-msgid "Comments enabled"
+#: ../../include/features.php:190
+msgid "Allows fine tuning of themes and page layouts"
 msgstr ""
 
-#: ../../include/conversation.php:1212
-msgid "Comments disabled"
+#: ../../include/features.php:200
+msgid "Post Composition Features"
 msgstr ""
 
-#: ../../include/conversation.php:1250
-msgid "Page link name"
+#: ../../include/features.php:204
+msgid "Large Photos"
 msgstr ""
 
-#: ../../include/conversation.php:1253
-msgid "Post as"
+#: ../../include/features.php:205
+msgid ""
+"Include large (1024px) photo thumbnails in posts. If not enabled, use small "
+"(640px) photo thumbnails"
 msgstr ""
 
-#: ../../include/conversation.php:1267
-msgid "Toggle voting"
+#: ../../include/features.php:214
+msgid "Automatically import channel content from other channels or feeds"
 msgstr ""
 
-#: ../../include/conversation.php:1270
-msgid "Disable comments"
+#: ../../include/features.php:222
+msgid "Even More Encryption"
 msgstr ""
 
-#: ../../include/conversation.php:1271
-msgid "Toggle comments"
+#: ../../include/features.php:223
+msgid ""
+"Allow optional encryption of content end-to-end with a shared secret key"
 msgstr ""
 
-#: ../../include/conversation.php:1279
-msgid "Categories (optional, comma-separated list)"
+#: ../../include/features.php:231
+msgid "Enable Voting Tools"
 msgstr ""
 
-#: ../../include/conversation.php:1302
-msgid "Other networks and post services"
+#: ../../include/features.php:232
+msgid "Provide a class of post which others can vote on"
 msgstr ""
 
-#: ../../include/conversation.php:1308
-msgid "Set publish date"
+#: ../../include/features.php:240
+msgid "Disable Comments"
 msgstr ""
 
-#: ../../include/conversation.php:1562
-msgid "Discover"
+#: ../../include/features.php:241
+msgid "Provide the option to disable comments for a post"
 msgstr ""
 
-#: ../../include/conversation.php:1565
-msgid "Imported public streams"
+#: ../../include/features.php:249
+msgid "Delayed Posting"
 msgstr ""
 
-#: ../../include/conversation.php:1570
-msgid "Commented Order"
+#: ../../include/features.php:250
+msgid "Allow posts to be published at a later date"
 msgstr ""
 
-#: ../../include/conversation.php:1573
-msgid "Sort by Comment Date"
+#: ../../include/features.php:258
+msgid "Content Expiration"
 msgstr ""
 
-#: ../../include/conversation.php:1577
-msgid "Posted Order"
+#: ../../include/features.php:259
+msgid "Remove posts/comments and/or private messages at a future time"
 msgstr ""
 
-#: ../../include/conversation.php:1580
-msgid "Sort by Post Date"
+#: ../../include/features.php:267
+msgid "Suppress Duplicate Posts/Comments"
 msgstr ""
 
-#: ../../include/conversation.php:1588
-msgid "Posts that mention or involve you"
+#: ../../include/features.php:268
+msgid ""
+"Prevent posts with identical content to be published with less than two "
+"minutes in between submissions."
 msgstr ""
 
-#: ../../include/conversation.php:1597
-msgid "Activity Stream - by date"
+#: ../../include/features.php:279
+msgid "Network and Stream Filtering"
 msgstr ""
 
-#: ../../include/conversation.php:1603
-msgid "Starred"
+#: ../../include/features.php:283
+msgid "Search by Date"
 msgstr ""
 
-#: ../../include/conversation.php:1606
-msgid "Favourite Posts"
+#: ../../include/features.php:284
+msgid "Ability to select posts by date ranges"
 msgstr ""
 
-#: ../../include/conversation.php:1613
-msgid "Spam"
+#: ../../include/features.php:293
+msgid "Enable management and selection of privacy groups"
 msgstr ""
 
-#: ../../include/conversation.php:1616
-msgid "Posts flagged as SPAM"
+#: ../../include/features.php:302
+msgid "Save search terms for re-use"
 msgstr ""
 
-#: ../../include/conversation.php:1674
-msgid "Status Messages and Posts"
+#: ../../include/features.php:310
+msgid "Network Personal Tab"
 msgstr ""
 
-#: ../../include/conversation.php:1683
-msgid "About"
+#: ../../include/features.php:311
+msgid "Enable tab to display only Network posts that you've interacted on"
 msgstr ""
 
-#: ../../include/conversation.php:1686
-msgid "Profile Details"
+#: ../../include/features.php:319
+msgid "Network New Tab"
 msgstr ""
 
-#: ../../include/conversation.php:1702
-msgid "Files and Storage"
+#: ../../include/features.php:320
+msgid "Enable tab to display all new Network activity"
 msgstr ""
 
-#: ../../include/conversation.php:1738
-msgid "Saved Bookmarks"
+#: ../../include/features.php:328
+msgid "Affinity Tool"
 msgstr ""
 
-#: ../../include/conversation.php:1748
-msgid "Manage Webpages"
+#: ../../include/features.php:329
+msgid "Filter stream activity by depth of relationships"
 msgstr ""
 
-#: ../../include/conversation.php:1813
-msgctxt "noun"
-msgid "Attending"
-msgid_plural "Attending"
-msgstr[0] ""
-msgstr[1] ""
+#: ../../include/features.php:338
+msgid "Show friend and connection suggestions"
+msgstr ""
 
-#: ../../include/conversation.php:1816
-msgctxt "noun"
-msgid "Not Attending"
-msgid_plural "Not Attending"
-msgstr[0] ""
-msgstr[1] ""
+#: ../../include/features.php:346
+msgid "Connection Filtering"
+msgstr ""
 
-#: ../../include/conversation.php:1819
-msgctxt "noun"
-msgid "Undecided"
-msgid_plural "Undecided"
-msgstr[0] ""
-msgstr[1] ""
+#: ../../include/features.php:347
+msgid "Filter incoming posts from connections based on keywords/content"
+msgstr ""
 
-#: ../../include/conversation.php:1822
-msgctxt "noun"
-msgid "Agree"
-msgid_plural "Agrees"
-msgstr[0] ""
-msgstr[1] ""
+#: ../../include/features.php:359
+msgid "Post/Comment Tools"
+msgstr ""
 
-#: ../../include/conversation.php:1825
-msgctxt "noun"
-msgid "Disagree"
-msgid_plural "Disagrees"
-msgstr[0] ""
-msgstr[1] ""
+#: ../../include/features.php:363
+msgid "Community Tagging"
+msgstr ""
 
-#: ../../include/conversation.php:1828
-msgctxt "noun"
-msgid "Abstain"
-msgid_plural "Abstains"
-msgstr[0] ""
-msgstr[1] ""
+#: ../../include/features.php:364
+msgid "Ability to tag existing posts"
+msgstr ""
 
-#: ../../include/bbcode.php:134 ../../include/bbcode.php:962
-#: ../../include/bbcode.php:965 ../../include/bbcode.php:970
-#: ../../include/bbcode.php:973 ../../include/bbcode.php:976
-#: ../../include/bbcode.php:979 ../../include/bbcode.php:984
-#: ../../include/bbcode.php:987 ../../include/bbcode.php:992
-#: ../../include/bbcode.php:995 ../../include/bbcode.php:998
-#: ../../include/bbcode.php:1001
-msgid "Image/photo"
+#: ../../include/features.php:372
+msgid "Post Categories"
 msgstr ""
 
-#: ../../include/bbcode.php:173 ../../include/bbcode.php:1012
-msgid "Encrypted content"
+#: ../../include/features.php:373
+msgid "Add categories to your posts"
 msgstr ""
 
-#: ../../include/bbcode.php:189
-#, php-format
-msgid "Install %s element: "
+#: ../../include/features.php:381
+msgid "Emoji Reactions"
 msgstr ""
 
-#: ../../include/bbcode.php:193
-#, php-format
-msgid ""
-"This post contains an installable %s element, however you lack permissions "
-"to install it on this site."
+#: ../../include/features.php:382
+msgid "Add emoji reaction ability to posts"
 msgstr ""
 
-#: ../../include/bbcode.php:272
-#, php-format
-msgid "%1$s wrote the following %2$s %3$s"
+#: ../../include/features.php:391
+msgid "Ability to file posts under folders"
 msgstr ""
 
-#: ../../include/bbcode.php:349 ../../include/bbcode.php:357
-msgid "Click to open/close"
+#: ../../include/features.php:399
+msgid "Dislike Posts"
 msgstr ""
 
-#: ../../include/bbcode.php:357
-msgid "spoiler"
+#: ../../include/features.php:400
+msgid "Ability to dislike posts/comments"
 msgstr ""
 
-#: ../../include/bbcode.php:950
-msgid "$1 wrote:"
+#: ../../include/features.php:408
+msgid "Star Posts"
+msgstr ""
+
+#: ../../include/features.php:409
+msgid "Ability to mark special posts with a star indicator"
+msgstr ""
+
+#: ../../include/features.php:417
+msgid "Tag Cloud"
+msgstr ""
+
+#: ../../include/features.php:418
+msgid "Provide a personal tag cloud on your channel page"
+msgstr ""
+
+#: ../../include/features.php:430
+msgid "Premium Channel"
+msgstr ""
+
+#: ../../include/features.php:431
+msgid ""
+"Allows you to set restrictions and terms on those that connect with your "
+"channel"
+msgstr ""
+
+#: ../../include/help.php:31
+msgid "Help:"
+msgstr ""
+
+#: ../../include/help.php:63
+msgid "Not Found"
+msgstr ""
+
+#: ../../util/nconfig.php:34
+msgid "Source channel not found."
 msgstr ""
 
 #: ../../view/theme/redbasic/php/config.php:9
@@ -13163,66 +13543,54 @@ msgstr ""
 msgid "Set size of followup author photos"
 msgstr ""
 
-#: ../../boot.php:1175
-#, php-format
-msgctxt "opensearch"
-msgid "Search %1$s (%2$s)"
-msgstr ""
-
-#: ../../boot.php:1175
-msgctxt "opensearch"
-msgid "$Projectname"
-msgstr ""
-
-#: ../../boot.php:1493
+#: ../../boot.php:1505
 #, php-format
 msgid "Update %s failed. See error logs."
 msgstr ""
 
-#: ../../boot.php:1496
+#: ../../boot.php:1508
 #, php-format
 msgid "Update Error at %s"
 msgstr ""
 
-#: ../../boot.php:1700
-msgid ""
-"Create an account to access services and applications within the Hubzilla"
+#: ../../boot.php:1712
+msgid "Create an account to access services and applications"
 msgstr ""
 
-#: ../../boot.php:1721
+#: ../../boot.php:1734
 msgid "Login/Email"
 msgstr ""
 
-#: ../../boot.php:1722
+#: ../../boot.php:1735
 msgid "Password"
 msgstr ""
 
-#: ../../boot.php:1723
+#: ../../boot.php:1736
 msgid "Remember me"
 msgstr ""
 
-#: ../../boot.php:1726
+#: ../../boot.php:1739
 msgid "Forgot your password?"
 msgstr ""
 
-#: ../../boot.php:2287
+#: ../../boot.php:2300
 msgid "toggle mobile"
 msgstr ""
 
-#: ../../boot.php:2442
+#: ../../boot.php:2455
 msgid "Website SSL certificate is not valid. Please correct."
 msgstr ""
 
-#: ../../boot.php:2445
+#: ../../boot.php:2458
 #, php-format
 msgid "[hubzilla] Website SSL error for %s"
 msgstr ""
 
-#: ../../boot.php:2562
+#: ../../boot.php:2577
 msgid "Cron/Scheduled tasks not running."
 msgstr ""
 
-#: ../../boot.php:2566
+#: ../../boot.php:2581
 #, php-format
 msgid "[hubzilla] Cron tasks not running on %s"
 msgstr ""
diff --git a/util/hz b/util/hz
index cb6ccf419..8a432c30d 100755
--- a/util/hz
+++ b/util/hz
@@ -33,6 +33,6 @@ echo "enter your message to be posted as $USER @ $HUB, then hit Ctrl-D to send."
 
 MSG=$(cat)
 
-curl -ssl -u${USER}:${PASS} --data-urlencode "status=${MSG}" https://${HUB}/api/statuses/update
+curl -ssl -u${USER}:${PASS} --data-urlencode "body=${MSG}" https://${HUB}/api/z/1.0/item/update
 
 
diff --git a/util/nconfig.php b/util/nconfig.php
new file mode 100644
index 000000000..a7cf350d0
--- /dev/null
+++ b/util/nconfig.php
@@ -0,0 +1,53 @@
+#!/usr/bin/env php
+<?php
+
+/**
+* switch off channel email notifications utility
+* This is a preliminary solution using the existing functions from include/channel.php. 
+* More options would be nice.
+**/
+
+if(! file_exists('include/cli_startup.php')) {
+    echo 'Run from the top level $Projectname web directory, as util/nconfig <args>' . PHP_EOL;
+    exit(1);
+}
+
+require_once('include/cli_startup.php');
+require_once('include/channel.php');
+
+cli_startup();
+
+
+	if($argc != 2) {
+		echo 'Usage: util/nconfig channel_id|channel_address off' . PHP_EOL;
+		exit(1);
+	}
+
+	if(ctype_digit($argv[1])) {
+		$c = channelx_by_n($argv[1]);
+	}
+	else {
+		$c = channelx_by_nick($argv[1]);
+	}
+
+	if(! $c) {
+		echo t('Source channel not found.');
+		exit(1);
+	}
+
+	switch ($argv[2]) {
+		case 'off':
+			$result = notifications_off($c['channel_id']);
+			break;
+		default:
+			echo 'Only on or off in lower cases are allowed' . PHP_EOL;
+			exit(1);
+	}
+
+	if($result['success'] == false) {
+		echo $result['message'];
+		exit(1);
+	}
+
+	exit(0);
+  
diff --git a/util/pconfig b/util/pconfig
index 1847a5a81..36d894fb5 100755
--- a/util/pconfig
+++ b/util/pconfig
@@ -73,8 +73,10 @@ if($argc == 4) {
 
 if($argc == 3) {
 	load_pconfig($argv[1],$argv[2]);
-	foreach(App::$config[$argv[1]][$argv[2]] as $k => $x) {
-		echo "pconfig[{$argv[1]}][{$argv[2]}][{$k}] = " . $x . "\n";
+	if(App::$config[$argv[1]][$argv[2]]) {
+		foreach(App::$config[$argv[1]][$argv[2]] as $k => $x) {
+			echo "pconfig[{$argv[1]}][{$argv[2]}][{$k}] = " . $x . "\n";
+		}
 	}
 }
 
diff --git a/util/typo.php b/util/typo.php
index 3f6ffb166..f9c9e5353 100644
--- a/util/typo.php
+++ b/util/typo.php
@@ -38,8 +38,10 @@
 	echo "Directory: Zotlabs\n";
 	$files = glob('Zotlabs/*/*.php');
 	foreach($files as $file) {
-		echo $file . "\n";
-		include_once($file);
+		if(strpos($file,'SiteModule') === false) {
+			echo $file . "\n";
+			include_once($file);
+		}
 	}
 
 	echo "Directory: Zotlabs/Module (sub-modules)\n";
author	Mario Vavti <mario@mariovavti.com>	2017-03-08 09:39:46 +0100
committer	Mario Vavti <mario@mariovavti.com>	2017-03-08 09:39:46 +0100
commit	bc2b948f1f6e62b1c277a4042200bb6678956f3f (patch)
tree	8586c30e495607eee23f16c0aad40974f0711275 /util
parent	23e3e2c50499fab52769929a448e73012fd915af (diff)
parent	ff9442474d07cce24c8f66db39ec34471c3874a2 (diff)
download	volse-hubzilla-bc2b948f1f6e62b1c277a4042200bb6678956f3f.tar.gz volse-hubzilla-bc2b948f1f6e62b1c277a4042200bb6678956f3f.tar.bz2 volse-hubzilla-bc2b948f1f6e62b1c277a4042200bb6678956f3f.zip