issue with post signatures if posted from api and logged in locally with a different identity.

author: zotlabs <mike@macgirvin.com> 2016-12-24 15:00:37 -0800
committer: zotlabs <mike@macgirvin.com> 2016-12-24 15:00:37 -0800
commit: 35ed9b9b72cd2f8440c80ef395e119282bcd6383 (patch)
tree: d5a40da68f79081a70996725e0299d08bdf562ec /util/hmessages.po
parent: 1e535283631b99b43e087c8dea292ed3b4dd2e6b (diff)
download: volse-hubzilla-35ed9b9b72cd2f8440c80ef395e119282bcd6383.tar.gz
volse-hubzilla-35ed9b9b72cd2f8440c80ef395e119282bcd6383.tar.bz2
volse-hubzilla-35ed9b9b72cd2f8440c80ef395e119282bcd6383.zip
1 files changed, 3403 insertions, 3362 deletions
diff --git a/util/hmessages.po b/util/hmessages.po
index f49ceab5b..8486a3e93 100644
--- a/util/hmessages.po
+++ b/util/hmessages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 2.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-12-16 00:04-0800\n"
+"POT-Creation-Date: 2016-12-23 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"
@@ -88,12 +88,13 @@ msgid "Special - Group Repository"
 msgstr ""
 
 #: ../../Zotlabs/Access/PermissionRoles.php:249
-#: ../../Zotlabs/Module/Register.php:213
+#: ../../Zotlabs/Module/Register.php:213 ../../Zotlabs/Module/Connedit.php:856
 #: ../../Zotlabs/Module/New_channel.php:132
 #: ../../Zotlabs/Module/Settings/Channel.php:445
+#: ../../extend/addon/addon/cdav/Mod_Cdav.php:1148
 #: ../../extend/addon/addon/cdav/cdav.php:277
 #: ../../extend/addon/addon/cdav/cdav.php:284
-#: ../../extend/addon/addon/cdav/Mod_Cdav.php:1148
+#: ../../include/connections.php:863 ../../include/connections.php:870
 #: ../../include/selectors.php:49 ../../include/selectors.php:66
 #: ../../include/selectors.php:104 ../../include/selectors.php:140
 #: ../../include/permissions.php:949
@@ -173,7 +174,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 ""
 
@@ -204,13 +205,13 @@ msgstr ""
 #: ../../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:1684 ../../include/conversation.php:1029
+#: ../../include/widgets.php:1684 ../../include/conversation.php:1177
 msgid "Unknown"
 msgstr ""
 
 #: ../../Zotlabs/Storage/Browser.php:224 ../../Zotlabs/Module/Fbrowser.php:85
 #: ../../Zotlabs/Lib/Apps.php:219 ../../include/nav.php:96
-#: ../../include/conversation.php:1681
+#: ../../include/conversation.php:1829
 msgid "Files"
 msgstr ""
 
@@ -223,7 +224,8 @@ 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/Connedit.php:859 ../../Zotlabs/Module/Menu.php:118
+#: ../../Zotlabs/Module/New_channel.php:147
 #: ../../Zotlabs/Module/Blocks.php:159 ../../Zotlabs/Module/Layouts.php:184
 #: ../../Zotlabs/Module/Webpages.php:239
 #: ../../extend/addon/addon/cdav/include/widgets.php:127
@@ -233,8 +235,8 @@ msgid "Create"
 msgstr ""
 
 #: ../../Zotlabs/Storage/Browser.php:229 ../../Zotlabs/Storage/Browser.php:323
-#: ../../Zotlabs/Module/Cover_photo.php:357
 #: ../../Zotlabs/Module/Photos.php:816 ../../Zotlabs/Module/Photos.php:1370
+#: ../../Zotlabs/Module/Cover_photo.php:357
 #: ../../Zotlabs/Module/Profile_photo.php:410
 #: ../../Zotlabs/Module/Embedphotos.php:157
 #: ../../extend/addon/addon/cdav/include/widgets.php:132
@@ -245,6 +247,7 @@ msgstr ""
 
 #: ../../Zotlabs/Storage/Browser.php:233
 #: ../../Zotlabs/Module/Admin/Channels.php:159
+#: ../../Zotlabs/Module/Connedit.php:844
 #: ../../Zotlabs/Module/Sharedwithme.php:99 ../../Zotlabs/Module/Wiki.php:151
 #: ../../Zotlabs/Module/Settings/Oauth.php:89
 #: ../../Zotlabs/Module/Settings/Oauth.php:115
@@ -259,7 +262,7 @@ 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:1403
 msgid "Size"
 msgstr ""
 
@@ -269,18 +272,18 @@ msgid "Last Modified"
 msgstr ""
 
 #: ../../Zotlabs/Storage/Browser.php:238
-#: ../../Zotlabs/Module/Connections.php:290
-#: ../../Zotlabs/Module/Connections.php:310
+#: ../../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/Editblock.php:109 ../../Zotlabs/Module/Blocks.php:160
+#: ../../Zotlabs/Module/Layouts.php:192 ../../Zotlabs/Module/Editpost.php:84
 #: ../../Zotlabs/Module/Webpages.php:240 ../../Zotlabs/Module/Wiki.php:144
 #: ../../Zotlabs/Module/Wiki.php:246
 #: ../../Zotlabs/Module/Settings/Oauth.php:149
-#: ../../Zotlabs/Module/Thing.php:260 ../../Zotlabs/Lib/ThreadItem.php:106
-#: ../../Zotlabs/Lib/Apps.php:346
+#: ../../Zotlabs/Module/Thing.php:260 ../../Zotlabs/Lib/Apps.php:346
+#: ../../Zotlabs/Lib/ThreadItem.php:106
 #: ../../extend/addon/addon/cdav/include/widgets.php:125
 #: ../../extend/addon/addon/cdav/include/widgets.php:161
 #: ../../include/channel.php:961 ../../include/channel.php:965
@@ -289,19 +292,19 @@ msgstr ""
 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:1179
+#: ../../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/Connedit.php:641 ../../Zotlabs/Module/Connedit.php:861
 #: ../../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/Blocks.php:162 ../../Zotlabs/Module/Webpages.php:242
 #: ../../Zotlabs/Module/Settings/Oauth.php:150
-#: ../../Zotlabs/Module/Thing.php:261 ../../Zotlabs/Lib/ThreadItem.php:126
-#: ../../Zotlabs/Lib/Apps.php:347
+#: ../../Zotlabs/Module/Thing.php:261 ../../Zotlabs/Lib/Apps.php:347
+#: ../../Zotlabs/Lib/ThreadItem.php:126
 #: ../../extend/addon/addon/cdav/Mod_Cdav.php:864
 #: ../../extend/addon/addon/cdav/Mod_Cdav.php:1153
 #: ../../include/conversation.php:656
@@ -334,13 +337,26 @@ 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/Profperm.php:28
+#: ../../Zotlabs/Module/Import_items.php:114 ../../Zotlabs/Module/Group.php:72
+#: ../../Zotlabs/Module/Dreport.php:10 ../../Zotlabs/Module/Dreport.php:68
+#: ../../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/Register.php:77 ../../Zotlabs/Module/Manage.php:10
 #: ../../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/Connections.php:33
+#: ../../Zotlabs/Module/Channel.php:107 ../../Zotlabs/Module/Channel.php:237
+#: ../../Zotlabs/Module/Channel.php:277 ../../Zotlabs/Module/Message.php:18
+#: ../../Zotlabs/Module/Page.php:35 ../../Zotlabs/Module/Page.php:91
+#: ../../Zotlabs/Module/Photos.php:73 ../../Zotlabs/Module/Connections.php:33
 #: ../../Zotlabs/Module/Cover_photo.php:277
 #: ../../Zotlabs/Module/Cover_photo.php:290
 #: ../../Zotlabs/Module/Editlayout.php:67
@@ -349,33 +365,32 @@ msgstr ""
 #: ../../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:76
+#: ../../Zotlabs/Module/Connedit.php:403 ../../Zotlabs/Module/Network.php:15
+#: ../../Zotlabs/Module/Menu.php:78 ../../Zotlabs/Module/Like.php:181
 #: ../../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:1064
-#: ../../Zotlabs/Module/Settings.php:59 ../../Zotlabs/Module/Mail.php:163
-#: ../../Zotlabs/Module/Block.php:26 ../../Zotlabs/Module/Block.php:76
+#: ../../Zotlabs/Module/Filestorage.php:120
+#: ../../Zotlabs/Module/Editblock.php:67 ../../Zotlabs/Module/Locs.php:87
 #: ../../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/Settings.php:59 ../../Zotlabs/Module/Events.php:267
+#: ../../Zotlabs/Module/Block.php:26 ../../Zotlabs/Module/Block.php:76
+#: ../../Zotlabs/Module/Item.php:220 ../../Zotlabs/Module/Item.php:230
+#: ../../Zotlabs/Module/Item.php:1064 ../../Zotlabs/Module/Mitem.php:115
+#: ../../Zotlabs/Module/Api.php:24 ../../Zotlabs/Module/Mood.php:116
+#: ../../Zotlabs/Module/Group.php:13 ../../Zotlabs/Module/Setup.php:212
 #: ../../Zotlabs/Module/New_channel.php:77
 #: ../../Zotlabs/Module/New_channel.php:104
 #: ../../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/Appman.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/Mail.php:164
 #: ../../Zotlabs/Module/Profile_photo.php:273
 #: ../../Zotlabs/Module/Profile_photo.php:286
-#: ../../Zotlabs/Module/Common.php:39 ../../Zotlabs/Module/Api.php:24
+#: ../../Zotlabs/Module/Common.php:39 ../../Zotlabs/Module/Profiles.php:197
+#: ../../Zotlabs/Module/Profiles.php:595 ../../Zotlabs/Module/Editpost.php:17
 #: ../../Zotlabs/Module/Regmod.php:21 ../../Zotlabs/Module/Pdledit.php:29
 #: ../../Zotlabs/Module/Service_limits.php:11
 #: ../../Zotlabs/Module/Webpages.php:116
@@ -386,41 +401,28 @@ msgstr ""
 #: ../../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
+#: ../../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/items.php:3422 ../../include/photos.php:27
 msgid "Permission denied."
 msgstr ""
 
-#: ../../Zotlabs/Web/Router.php:157 ../../Zotlabs/Module/Page.php:94
-#: ../../Zotlabs/Module/Display.php:120 ../../Zotlabs/Module/Block.php:79
+#: ../../Zotlabs/Web/Router.php:157 ../../Zotlabs/Module/Display.php:120
+#: ../../Zotlabs/Module/Page.php:94 ../../Zotlabs/Module/Block.php:79
 #: ../../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 "
@@ -435,13 +437,13 @@ msgid "Welcome %s. Remote authentication successful."
 msgstr ""
 
 #: ../../Zotlabs/Module/Achievements.php:15
-#: ../../Zotlabs/Module/Connect.php:17 ../../Zotlabs/Module/Editlayout.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/Profile.php:20 ../../Zotlabs/Module/Blocks.php:33
-#: ../../Zotlabs/Module/Layouts.php:31 ../../Zotlabs/Module/Webpages.php:33
-#: ../../include/channel.php:862
+#: ../../Zotlabs/Module/Layouts.php:31 ../../Zotlabs/Module/Connect.php:17
+#: ../../Zotlabs/Module/Webpages.php:33 ../../include/channel.php:862
 msgid "Requested profile is not available."
 msgstr ""
 
@@ -449,14 +451,6 @@ msgstr ""
 msgid "Some blurb about what to do when you're new here"
 msgstr ""
 
-#: ../../Zotlabs/Module/Chatsvc.php:117
-msgid "Away"
-msgstr ""
-
-#: ../../Zotlabs/Module/Chatsvc.php:122
-msgid "Online"
-msgstr ""
-
 #: ../../Zotlabs/Module/Register.php:49
 msgid "Maximum daily site registrations exceeded. Please try again tomorrow."
 msgstr ""
@@ -604,60 +598,243 @@ msgstr ""
 msgid "Fetching URL returns error: %1$s"
 msgstr ""
 
-#: ../../Zotlabs/Module/Match.php:26
-msgid "Profile Match"
+#: ../../Zotlabs/Module/Display.php:17 ../../Zotlabs/Module/Photos.php:509
+#: ../../Zotlabs/Module/Directory.php:64 ../../Zotlabs/Module/Ratings.php:83
+#: ../../Zotlabs/Module/Search.php:17
+#: ../../Zotlabs/Module/Viewconnections.php:23
+#: ../../extend/addon/addon/friendica/dfrn_request.php:794
+msgid "Public access denied."
 msgstr ""
 
-#: ../../Zotlabs/Module/Match.php:35
-msgid "No keywords to match. Please add keywords to your default profile."
+#: ../../Zotlabs/Module/Display.php:40
+#: ../../Zotlabs/Module/Admin/Plugins.php:254
+#: ../../Zotlabs/Module/Admin/Themes.php:69
+#: ../../Zotlabs/Module/Filestorage.php:32 ../../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/Match.php:67
-msgid "is interested in:"
+#: ../../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/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:937
-msgid "Connect"
+#: ../../Zotlabs/Module/Manage.php:143
+msgid "Create a new channel"
 msgstr ""
 
-#: ../../Zotlabs/Module/Match.php:74
-msgid "No matches"
+#: ../../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/Connedit.php:82
-msgid "Could not access contact record."
+#: ../../Zotlabs/Module/Manage.php:164 ../../Zotlabs/Lib/Apps.php:216
+#: ../../include/nav.php:209
+msgid "Channel Manager"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:106
-msgid "Could not locate selected profile."
+#: ../../Zotlabs/Module/Manage.php:165
+msgid "Current Channel"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:258
-msgid "Connection updated."
+#: ../../Zotlabs/Module/Manage.php:167
+msgid "Switch to one of your channels by selecting it."
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:260
-msgid "Failed to update connection record."
+#: ../../Zotlabs/Module/Manage.php:168
+msgid "Default Channel"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:310
-msgid "is now connected to"
+#: ../../Zotlabs/Module/Manage.php:169
+msgid "Make Default"
 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/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/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/Fbrowser.php:29 ../../Zotlabs/Lib/Apps.php:224
+#: ../../include/nav.php:95 ../../include/conversation.php:1822
+msgid "Photos"
+msgstr ""
+
+#: ../../Zotlabs/Module/Fbrowser.php:66 ../../Zotlabs/Module/Fbrowser.php:88
+#: ../../Zotlabs/Module/Admin/Plugins.php:414
+#: ../../Zotlabs/Module/Connedit.php:862 ../../Zotlabs/Module/Wiki.php:238
+#: ../../Zotlabs/Module/Wiki.php:261
+#: ../../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:1394 ../../include/conversation.php:1443
+msgid "Cancel"
+msgstr ""
+
+#: ../../Zotlabs/Module/Bookmarks.php:53
+msgid "Bookmark added"
+msgstr ""
+
+#: ../../Zotlabs/Module/Bookmarks.php:75
+msgid "My Bookmarks"
+msgstr ""
+
+#: ../../Zotlabs/Module/Bookmarks.php:86
+msgid "My Connections Bookmarks"
+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."
+msgstr ""
+
+#: ../../Zotlabs/Module/Channel.php:44
+msgid "Posts and comments"
+msgstr ""
+
+#: ../../Zotlabs/Module/Channel.php:45
+msgid "Only posts"
+msgstr ""
+
+#: ../../Zotlabs/Module/Channel.php:104
+msgid "Insufficient permissions.  Request redirected to profile page."
+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/Page.php:40 ../../Zotlabs/Module/Block.php:31
+msgid "Invalid item."
+msgstr ""
+
+#: ../../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 ""
+
+#: ../../Zotlabs/Module/Page.php:131
+msgid ""
+"Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod "
+"tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, "
+"quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo "
+"consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse "
+"cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat "
+"non proident, sunt in culpa qui officia deserunt mollit anim id est laborum."
+msgstr ""
+
+#: ../../Zotlabs/Module/Filer.php:52
+msgid "Save to Folder:"
+msgstr ""
+
+#: ../../Zotlabs/Module/Filer.php:52
+msgid "- select -"
+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:1000
+#: ../../include/text.php:1012 ../../include/widgets.php:201
+msgid "Save"
+msgstr ""
+
+#: ../../Zotlabs/Module/Photos.php:82
+msgid "Page owner information could not be retrieved."
+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"
+msgstr ""
+
+#: ../../Zotlabs/Module/Photos.php:103 ../../Zotlabs/Module/Photos.php:129
+msgid "Album not found."
+msgstr ""
+
+#: ../../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/Photos.php:190 ../../Zotlabs/Module/Photos.php:1059
+msgid "Delete Photo"
+msgstr ""
+
+#: ../../Zotlabs/Module/Photos.php:520
+msgid "No photos selected"
+msgstr ""
+
+#: ../../Zotlabs/Module/Photos.php:569
+msgid "Access to this item is restricted."
+msgstr ""
+
+#: ../../Zotlabs/Module/Photos.php:608
+#, php-format
+msgid "%1$.2f MB of %2$.2f MB photo storage used."
+msgstr ""
+
+#: ../../Zotlabs/Module/Photos.php:611
+#, php-format
+msgid "%1$.2f MB photo storage used."
+msgstr ""
+
+#: ../../Zotlabs/Module/Photos.php:647
+msgid "Upload Photos"
+msgstr ""
+
+#: ../../Zotlabs/Module/Photos.php:651
+msgid "Enter an album name"
+msgstr ""
+
+#: ../../Zotlabs/Module/Photos.php:652
+msgid "or select an existing album (doubleclick)"
+msgstr ""
+
+#: ../../Zotlabs/Module/Photos.php:653
+msgid "Create a status post for this upload"
+msgstr ""
+
+#: ../../Zotlabs/Module/Photos.php:653 ../../Zotlabs/Module/Admin/Site.php:218
+#: ../../Zotlabs/Module/Connedit.php:417 ../../Zotlabs/Module/Connedit.php:730
+#: ../../Zotlabs/Module/Menu.php:100 ../../Zotlabs/Module/Menu.php:157
+#: ../../Zotlabs/Module/Filestorage.php:160
+#: ../../Zotlabs/Module/Filestorage.php:168
+#: ../../Zotlabs/Module/Events.php:463 ../../Zotlabs/Module/Events.php:464
+#: ../../Zotlabs/Module/Mitem.php:162 ../../Zotlabs/Module/Mitem.php:163
+#: ../../Zotlabs/Module/Mitem.php:240 ../../Zotlabs/Module/Mitem.php:241
+#: ../../Zotlabs/Module/Api.php:97 ../../Zotlabs/Module/Profiles.php:641
 #: ../../Zotlabs/Module/Removeme.php:63 ../../Zotlabs/Module/Wiki.php:159
 #: ../../Zotlabs/Module/Settings/Channel.php:289
 #: ../../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
@@ -709,17 +886,17 @@ msgstr ""
 msgid "No"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:411
-#: ../../Zotlabs/Module/Admin/Site.php:220 ../../Zotlabs/Module/Menu.php:100
+#: ../../Zotlabs/Module/Photos.php:653 ../../Zotlabs/Module/Admin/Site.php:220
+#: ../../Zotlabs/Module/Connedit.php:417 ../../Zotlabs/Module/Menu.php:100
 #: ../../Zotlabs/Module/Menu.php:157 ../../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/Filestorage.php:168
+#: ../../Zotlabs/Module/Events.php:463 ../../Zotlabs/Module/Events.php:464
+#: ../../Zotlabs/Module/Mitem.php:162 ../../Zotlabs/Module/Mitem.php:163
+#: ../../Zotlabs/Module/Mitem.php:240 ../../Zotlabs/Module/Mitem.php:241
+#: ../../Zotlabs/Module/Api.php:96 ../../Zotlabs/Module/Profiles.php:641
 #: ../../Zotlabs/Module/Removeme.php:63 ../../Zotlabs/Module/Wiki.php:159
 #: ../../Zotlabs/Module/Settings/Channel.php:289
 #: ../../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
@@ -771,262 +948,23 @@ msgstr ""
 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:223
-#: ../../extend/addon/addon/openclipatar/openclipatar.php:56
-#: ../../include/nav.php:89 ../../include/conversation.php:935
-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"
-msgstr ""
-
-#: ../../Zotlabs/Module/Connedit.php:592
-msgid "Fetch updated permissions"
-msgstr ""
-
-#: ../../Zotlabs/Module/Connedit.php:596
-msgid "Recent Activity"
-msgstr ""
-
-#: ../../Zotlabs/Module/Connedit.php:599
-msgid "View recent posts and comments"
-msgstr ""
-
-#: ../../Zotlabs/Module/Connedit.php:603
-#: ../../Zotlabs/Module/Admin/Accounts.php:175
-msgid "Unblock"
-msgstr ""
-
-#: ../../Zotlabs/Module/Connedit.php:603
-#: ../../Zotlabs/Module/Admin/Accounts.php:174
-msgid "Block"
-msgstr ""
-
-#: ../../Zotlabs/Module/Connedit.php:606
-msgid "Block (or Unblock) all communications with this connection"
-msgstr ""
-
-#: ../../Zotlabs/Module/Connedit.php:607
-msgid "This connection is blocked!"
-msgstr ""
-
-#: ../../Zotlabs/Module/Connedit.php:611
-msgid "Unignore"
-msgstr ""
-
-#: ../../Zotlabs/Module/Connedit.php:611
-#: ../../Zotlabs/Module/Connections.php:277
-msgid "Ignore"
-msgstr ""
-
-#: ../../Zotlabs/Module/Connedit.php:614
-msgid "Ignore (or Unignore) all inbound communications from this connection"
-msgstr ""
-
-#: ../../Zotlabs/Module/Connedit.php:615
-msgid "This connection is ignored!"
-msgstr ""
-
-#: ../../Zotlabs/Module/Connedit.php:619
-msgid "Unarchive"
-msgstr ""
-
-#: ../../Zotlabs/Module/Connedit.php:619
-msgid "Archive"
-msgstr ""
-
-#: ../../Zotlabs/Module/Connedit.php:622
-msgid ""
-"Archive (or Unarchive) this connection - mark channel dead but keep content"
-msgstr ""
-
-#: ../../Zotlabs/Module/Connedit.php:623
-msgid "This connection is archived!"
-msgstr ""
-
-#: ../../Zotlabs/Module/Connedit.php:627
-msgid "Unhide"
-msgstr ""
-
-#: ../../Zotlabs/Module/Connedit.php:627
-msgid "Hide"
-msgstr ""
-
-#: ../../Zotlabs/Module/Connedit.php:630
-msgid "Hide or Unhide this connection from your other connections"
-msgstr ""
-
-#: ../../Zotlabs/Module/Connedit.php:631
-msgid "This connection is hidden!"
-msgstr ""
-
-#: ../../Zotlabs/Module/Connedit.php:638
-msgid "Delete this connection"
-msgstr ""
-
-#: ../../Zotlabs/Module/Connedit.php:655 ../../include/widgets.php:529
-msgid "Me"
-msgstr ""
-
-#: ../../Zotlabs/Module/Connedit.php:656 ../../include/widgets.php:530
-msgid "Family"
-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"
-msgstr ""
-
-#: ../../Zotlabs/Module/Connedit.php:658 ../../include/widgets.php:532
-msgid "Acquaintances"
-msgstr ""
-
-#: ../../Zotlabs/Module/Connedit.php:659
-#: ../../Zotlabs/Module/Connections.php:92
-#: ../../Zotlabs/Module/Connections.php:107 ../../include/widgets.php:533
-msgid "All"
-msgstr ""
-
-#: ../../Zotlabs/Module/Connedit.php:716
-msgid "Approve this connection"
-msgstr ""
-
-#: ../../Zotlabs/Module/Connedit.php:716
-msgid "Accept connection to allow communication"
-msgstr ""
-
-#: ../../Zotlabs/Module/Connedit.php:721
-msgid "Set Affinity"
-msgstr ""
-
-#: ../../Zotlabs/Module/Connedit.php:724
-msgid "Set Profile"
-msgstr ""
-
-#: ../../Zotlabs/Module/Connedit.php:727
-msgid "Set Affinity & Profile"
-msgstr ""
-
-#: ../../Zotlabs/Module/Connedit.php:776
-msgid "none"
-msgstr ""
-
-#: ../../Zotlabs/Module/Connedit.php:780 ../../include/widgets.php:656
-msgid "Connection Default Permissions"
-msgstr ""
-
-#: ../../Zotlabs/Module/Connedit.php:780 ../../include/items.php:3909
-#, php-format
-msgid "Connection: %s"
-msgstr ""
-
-#: ../../Zotlabs/Module/Connedit.php:781
-msgid "Apply these permissions automatically"
-msgstr ""
-
-#: ../../Zotlabs/Module/Connedit.php:781
-msgid "Connection requests will be approved without your interaction"
-msgstr ""
-
-#: ../../Zotlabs/Module/Connedit.php:784
-msgid "This connection's primary address is"
-msgstr ""
-
-#: ../../Zotlabs/Module/Connedit.php:785
-msgid "Available locations:"
-msgstr ""
-
-#: ../../Zotlabs/Module/Connedit.php:789
-msgid ""
-"The permissions indicated on this page will be applied to all new "
-"connections."
-msgstr ""
-
-#: ../../Zotlabs/Module/Connedit.php:790
-msgid "Connection Tools"
-msgstr ""
-
-#: ../../Zotlabs/Module/Connedit.php:792
-msgid "Slide to adjust your degree of friendship"
-msgstr ""
-
-#: ../../Zotlabs/Module/Connedit.php:793 ../../Zotlabs/Module/Rate.php:155
-#: ../../include/js_strings.php:20
-msgid "Rating"
-msgstr ""
-
-#: ../../Zotlabs/Module/Connedit.php:794
-msgid "Slide to adjust your rating"
-msgstr ""
-
-#: ../../Zotlabs/Module/Connedit.php:795 ../../Zotlabs/Module/Connedit.php:800
-msgid "Optionally explain your rating"
-msgstr ""
-
-#: ../../Zotlabs/Module/Connedit.php:797
-msgid "Custom Filter"
-msgstr ""
-
-#: ../../Zotlabs/Module/Connedit.php:798
-msgid "Only import posts with this text"
-msgstr ""
-
-#: ../../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/Connedit.php:799
-msgid "Do not import posts with this text"
-msgstr ""
-
-#: ../../Zotlabs/Module/Connedit.php:801
-msgid "This information is public!"
+#: ../../Zotlabs/Module/Photos.php:654
+msgid "Caption (optional):"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:806
-msgid "Connection Pending Approval"
+#: ../../Zotlabs/Module/Photos.php:655
+msgid "Description (optional):"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:809
-#: ../../Zotlabs/Module/Settings/Tokens.php:163
-msgid "inherited"
+#: ../../Zotlabs/Module/Photos.php:658 ../../Zotlabs/Module/Photos.php:1047
+#: ../../Zotlabs/Module/Filestorage.php:152 ../../Zotlabs/Module/Thing.php:313
+#: ../../Zotlabs/Module/Thing.php:363 ../../Zotlabs/Module/Chat.php:234
+#: ../../include/acl_selectors.php:208
+msgid "Permissions"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:810 ../../Zotlabs/Module/Locs.php:121
-#: ../../Zotlabs/Module/Connect.php:98
+#: ../../Zotlabs/Module/Photos.php:668 ../../Zotlabs/Module/Photos.php:1058
+#: ../../Zotlabs/Module/Photos.php:1098 ../../Zotlabs/Module/Photos.php:1216
 #: ../../Zotlabs/Module/Admin/Features.php:66
 #: ../../Zotlabs/Module/Admin/Logs.php:84
 #: ../../Zotlabs/Module/Admin/Plugins.php:429
@@ -1036,29 +974,28 @@ msgstr ""
 #: ../../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:127
-#: ../../Zotlabs/Module/Filestorage.php:165 ../../Zotlabs/Module/Mail.php:412
+#: ../../Zotlabs/Module/Admin/Site.php:260 ../../Zotlabs/Module/Import.php:543
+#: ../../Zotlabs/Module/Connedit.php:824 ../../Zotlabs/Module/Cal.php:342
+#: ../../Zotlabs/Module/Filestorage.php:165 ../../Zotlabs/Module/Locs.php:121
+#: ../../Zotlabs/Module/Invite.php:149 ../../Zotlabs/Module/Events.php:484
 #: ../../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/Group.php:85 ../../Zotlabs/Module/Setup.php:309
+#: ../../Zotlabs/Module/Setup.php:357 ../../Zotlabs/Module/Poke.php:186
+#: ../../Zotlabs/Module/Pconfig.php:107 ../../Zotlabs/Module/Appman.php:127
+#: ../../Zotlabs/Module/Rate.php:166 ../../Zotlabs/Module/Mail.php:413
+#: ../../Zotlabs/Module/Profiles.php:681 ../../Zotlabs/Module/Pdledit.php:74
+#: ../../Zotlabs/Module/Connect.php:98 ../../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/Settings/Tokens.php:167
 #: ../../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
+#: ../../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:710
 #: ../../extend/addon/addon/dwpost/dwpost.php:89
@@ -1109,358 +1046,288 @@ msgstr ""
 msgid "Submit"
 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."
-msgstr ""
-
-#: ../../Zotlabs/Module/Connedit.php:813
-#: ../../Zotlabs/Module/Settings/Tokens.php:160
-msgid "Their Settings"
-msgstr ""
-
-#: ../../Zotlabs/Module/Connedit.php:814
-#: ../../Zotlabs/Module/Settings/Tokens.php:161
-msgid "My Settings"
-msgstr ""
-
-#: ../../Zotlabs/Module/Connedit.php:816
-#: ../../Zotlabs/Module/Settings/Tokens.php:165
-msgid "Individual Permissions"
-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."
-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."
-msgstr ""
-
-#: ../../Zotlabs/Module/Connedit.php:819
-msgid "Last update:"
-msgstr ""
-
-#: ../../Zotlabs/Module/Dreport.php:45
-msgid "Invalid message"
-msgstr ""
-
-#: ../../Zotlabs/Module/Dreport.php:78
-msgid "no results"
-msgstr ""
-
-#: ../../Zotlabs/Module/Dreport.php:93
-msgid "channel sync processed"
-msgstr ""
-
-#: ../../Zotlabs/Module/Dreport.php:97
-msgid "queued"
-msgstr ""
-
-#: ../../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"
+#: ../../Zotlabs/Module/Photos.php:686
+msgid "Album name could not be decoded"
 msgstr ""
 
-#: ../../Zotlabs/Module/Dreport.php:125
-msgid "duplicate mail received"
+#: ../../Zotlabs/Module/Photos.php:734
+msgid "Contact Photos"
 msgstr ""
 
-#: ../../Zotlabs/Module/Dreport.php:128
-msgid "mail delivered"
+#: ../../Zotlabs/Module/Photos.php:757
+msgid "Show Newest First"
 msgstr ""
 
-#: ../../Zotlabs/Module/Dreport.php:148
-#, php-format
-msgid "Delivery report for %1$s"
+#: ../../Zotlabs/Module/Photos.php:759
+msgid "Show Oldest First"
 msgstr ""
 
-#: ../../Zotlabs/Module/Dreport.php:151
-msgid "Options"
+#: ../../Zotlabs/Module/Photos.php:783 ../../Zotlabs/Module/Photos.php:1337
+#: ../../Zotlabs/Module/Embedphotos.php:139 ../../include/widgets.php:1678
+msgid "View Photo"
 msgstr ""
 
-#: ../../Zotlabs/Module/Dreport.php:152
-msgid "Redeliver"
+#: ../../Zotlabs/Module/Photos.php:814
+#: ../../Zotlabs/Module/Embedphotos.php:155 ../../include/widgets.php:1695
+msgid "Edit Album"
 msgstr ""
 
-#: ../../Zotlabs/Module/Bookmarks.php:53
-msgid "Bookmark added"
+#: ../../Zotlabs/Module/Photos.php:861
+msgid "Permission denied. Access to this item may be restricted."
 msgstr ""
 
-#: ../../Zotlabs/Module/Bookmarks.php:75
-msgid "My Bookmarks"
+#: ../../Zotlabs/Module/Photos.php:863
+msgid "Photo not available"
 msgstr ""
 
-#: ../../Zotlabs/Module/Bookmarks.php:86
-msgid "My Connections Bookmarks"
+#: ../../Zotlabs/Module/Photos.php:921
+msgid "Use as profile photo"
 msgstr ""
 
-#: ../../Zotlabs/Module/Acl.php:313
-msgid "network"
+#: ../../Zotlabs/Module/Photos.php:922
+msgid "Use as cover photo"
 msgstr ""
 
-#: ../../Zotlabs/Module/Acl.php:323
-msgid "RSS"
+#: ../../Zotlabs/Module/Photos.php:929
+msgid "Private Photo"
 msgstr ""
 
-#: ../../Zotlabs/Module/Locs.php:25 ../../Zotlabs/Module/Locs.php:54
-msgid "Location not found."
+#: ../../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"
 msgstr ""
 
-#: ../../Zotlabs/Module/Locs.php:62
-msgid "Location lookup failed."
+#: ../../Zotlabs/Module/Photos.php:944
+msgid "View Full Size"
 msgstr ""
 
-#: ../../Zotlabs/Module/Locs.php:66
-msgid ""
-"Please select another location to become primary before removing the primary "
-"location."
+#: ../../Zotlabs/Module/Photos.php:949 ../../Zotlabs/Module/Cal.php:337
+#: ../../Zotlabs/Module/Cal.php:344 ../../Zotlabs/Module/Events.php:681
+#: ../../Zotlabs/Module/Events.php:690 ../../Zotlabs/Module/Setup.php:264
+#: ../../extend/addon/addon/cdav/Mod_Cdav.php:847
+msgid "Next"
 msgstr ""
 
-#: ../../Zotlabs/Module/Locs.php:95
-msgid "Syncing locations"
+#: ../../Zotlabs/Module/Photos.php:989
+#: ../../Zotlabs/Module/Admin/Plugins.php:445
+#: ../../Zotlabs/Module/Tagrm.php:137
+#: ../../extend/addon/addon/superblock/superblock.php:114
+msgid "Remove"
 msgstr ""
 
-#: ../../Zotlabs/Module/Locs.php:105
-msgid "No locations found."
+#: ../../Zotlabs/Module/Photos.php:1033
+msgid "Edit photo"
 msgstr ""
 
-#: ../../Zotlabs/Module/Locs.php:116
-msgid "Manage Channel Locations"
+#: ../../Zotlabs/Module/Photos.php:1035
+msgid "Rotate CW (right)"
 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/Photos.php:1036
+msgid "Rotate CCW (left)"
 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/Photos.php:1039
+msgid "Move photo to album"
 msgstr ""
 
-#: ../../Zotlabs/Module/Locs.php:119
-msgid "Primary"
+#: ../../Zotlabs/Module/Photos.php:1040
+msgid "Enter a new album name"
 msgstr ""
 
-#: ../../Zotlabs/Module/Locs.php:120 ../../Zotlabs/Module/Menu.php:113
-msgid "Drop"
+#: ../../Zotlabs/Module/Photos.php:1041
+msgid "or select an existing one (doubleclick)"
 msgstr ""
 
-#: ../../Zotlabs/Module/Locs.php:122
-msgid "Sync Now"
+#: ../../Zotlabs/Module/Photos.php:1044
+msgid "Caption"
 msgstr ""
 
-#: ../../Zotlabs/Module/Locs.php:123
-msgid "Please wait several minutes between consecutive operations."
+#: ../../Zotlabs/Module/Photos.php:1046
+msgid "Add a Tag"
 msgstr ""
 
-#: ../../Zotlabs/Module/Locs.php:124
-msgid ""
-"When possible, drop a location by logging into that website/hub and removing "
-"your channel."
+#: ../../Zotlabs/Module/Photos.php:1054
+msgid "Example: @bob, @Barbara_Jensen, @jim@example.com"
 msgstr ""
 
-#: ../../Zotlabs/Module/Locs.php:125
-msgid "Use this form to drop the location if the hub is no longer operating."
+#: ../../Zotlabs/Module/Photos.php:1057
+msgid "Flag as adult in album view"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connect.php:61 ../../Zotlabs/Module/Connect.php:109
-msgid "Continue"
+#: ../../Zotlabs/Module/Photos.php:1076 ../../Zotlabs/Lib/ThreadItem.php:268
+msgid "I like this (toggle)"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connect.php:90
-msgid "Premium Channel Setup"
+#: ../../Zotlabs/Module/Photos.php:1077 ../../Zotlabs/Lib/ThreadItem.php:269
+msgid "I don't like this (toggle)"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connect.php:92
-msgid "Enable premium channel connection restrictions"
+#: ../../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:1378
+msgid "Share"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connect.php:93
-msgid ""
-"Please enter your restrictions or conditions, such as paypal receipt, usage "
-"guidelines, etc."
+#: ../../Zotlabs/Module/Photos.php:1079 ../../Zotlabs/Lib/ThreadItem.php:411
+#: ../../include/conversation.php:738
+msgid "Please wait"
 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/Photos.php:1095 ../../Zotlabs/Module/Photos.php:1213
+#: ../../Zotlabs/Lib/ThreadItem.php:728
+msgid "This is you"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connect.php:96
-msgid ""
-"Potential connections will then see the following text before proceeding:"
+#: ../../Zotlabs/Module/Photos.php:1097 ../../Zotlabs/Module/Photos.php:1215
+#: ../../Zotlabs/Lib/ThreadItem.php:730 ../../include/js_strings.php:6
+msgid "Comment"
 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/Photos.php:1099 ../../Zotlabs/Module/Events.php:471
+#: ../../Zotlabs/Module/Webpages.php:247 ../../Zotlabs/Lib/ThreadItem.php:740
+#: ../../include/page_widgets.php:43 ../../include/conversation.php:1347
+msgid "Preview"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connect.php:106
-msgid "(No specific instructions have been provided by the channel owner.)"
+#: ../../Zotlabs/Module/Photos.php:1113 ../../include/conversation.php:577
+msgctxt "title"
+msgid "Likes"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connect.php:114
-msgid "Restricted or Premium Channel"
+#: ../../Zotlabs/Module/Photos.php:1113 ../../include/conversation.php:577
+msgctxt "title"
+msgid "Dislikes"
 msgstr ""
 
-#: ../../Zotlabs/Module/Page.php:40 ../../Zotlabs/Module/Block.php:31
-msgid "Invalid item."
+#: ../../Zotlabs/Module/Photos.php:1114 ../../include/conversation.php:578
+msgctxt "title"
+msgid "Agree"
 msgstr ""
 
-#: ../../Zotlabs/Module/Page.php:56 ../../Zotlabs/Module/Chanview.php:96
-#: ../../Zotlabs/Module/Block.php:43 ../../Zotlabs/Module/Cal.php:62
-#: ../../Zotlabs/Module/Wall_upload.php:31
-msgid "Channel not found."
+#: ../../Zotlabs/Module/Photos.php:1114 ../../include/conversation.php:578
+msgctxt "title"
+msgid "Disagree"
 msgstr ""
 
-#: ../../Zotlabs/Module/Page.php:131
-msgid ""
-"Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod "
-"tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, "
-"quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo "
-"consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse "
-"cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat "
-"non proident, sunt in culpa qui officia deserunt mollit anim id est laborum."
+#: ../../Zotlabs/Module/Photos.php:1114 ../../include/conversation.php:578
+msgctxt "title"
+msgid "Abstain"
 msgstr ""
 
-#: ../../Zotlabs/Module/Filer.php:52
-msgid "Save to Folder:"
+#: ../../Zotlabs/Module/Photos.php:1115 ../../include/conversation.php:579
+msgctxt "title"
+msgid "Attending"
 msgstr ""
 
-#: ../../Zotlabs/Module/Filer.php:52
-msgid "- select -"
+#: ../../Zotlabs/Module/Photos.php:1115 ../../include/conversation.php:579
+msgctxt "title"
+msgid "Not attending"
 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
-msgid "Save"
+#: ../../Zotlabs/Module/Photos.php:1115 ../../include/conversation.php:579
+msgctxt "title"
+msgid "Might attend"
 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."
+#: ../../Zotlabs/Module/Photos.php:1132 ../../Zotlabs/Module/Photos.php:1144
+#: ../../Zotlabs/Lib/ThreadItem.php:186 ../../Zotlabs/Lib/ThreadItem.php:198
+#: ../../include/conversation.php:1913
+msgid "View all"
 msgstr ""
 
-#: ../../Zotlabs/Module/Manage.php:143
-msgid "Create a new channel"
-msgstr ""
+#: ../../Zotlabs/Module/Photos.php:1136 ../../Zotlabs/Lib/ThreadItem.php:190
+#: ../../include/channel.php:1190 ../../include/conversation.php:1937
+#: ../../include/taxonomy.php:403
+msgctxt "noun"
+msgid "Like"
+msgid_plural "Likes"
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../../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/Photos.php:1141 ../../Zotlabs/Lib/ThreadItem.php:195
+#: ../../include/conversation.php:1940
+msgctxt "noun"
+msgid "Dislike"
+msgid_plural "Dislikes"
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../../Zotlabs/Module/Manage.php:164 ../../Zotlabs/Lib/Apps.php:216
-#: ../../include/nav.php:209
-msgid "Channel Manager"
+#: ../../Zotlabs/Module/Photos.php:1241
+msgid "Photo Tools"
 msgstr ""
 
-#: ../../Zotlabs/Module/Manage.php:165
-msgid "Current Channel"
+#: ../../Zotlabs/Module/Photos.php:1250
+msgid "In This Photo:"
 msgstr ""
 
-#: ../../Zotlabs/Module/Manage.php:167
-msgid "Switch to one of your channels by selecting it."
+#: ../../Zotlabs/Module/Photos.php:1255
+msgid "Map"
 msgstr ""
 
-#: ../../Zotlabs/Module/Manage.php:168
-msgid "Default Channel"
+#: ../../Zotlabs/Module/Photos.php:1263 ../../Zotlabs/Lib/ThreadItem.php:400
+msgctxt "noun"
+msgid "Likes"
 msgstr ""
 
-#: ../../Zotlabs/Module/Manage.php:169
-msgid "Make Default"
+#: ../../Zotlabs/Module/Photos.php:1264 ../../Zotlabs/Lib/ThreadItem.php:401
+msgctxt "noun"
+msgid "Dislikes"
 msgstr ""
 
-#: ../../Zotlabs/Module/Manage.php:172
-#, php-format
-msgid "%d new messages"
+#: ../../Zotlabs/Module/Photos.php:1269 ../../Zotlabs/Lib/ThreadItem.php:406
+#: ../../include/acl_selectors.php:210
+msgid "Close"
 msgstr ""
 
-#: ../../Zotlabs/Module/Manage.php:173
-#, php-format
-msgid "%d new introductions"
+#: ../../Zotlabs/Module/Photos.php:1343
+msgid "View Album"
 msgstr ""
 
-#: ../../Zotlabs/Module/Manage.php:175
-msgid "Delegated Channel"
+#: ../../Zotlabs/Module/Photos.php:1354 ../../Zotlabs/Module/Photos.php:1367
+#: ../../Zotlabs/Module/Photos.php:1368
+msgid "Recent Photos"
 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:1576
+#: ../../include/conversation.php:1724
 msgid "New"
 msgstr ""
 
+#: ../../Zotlabs/Module/Connections.php:92
+#: ../../Zotlabs/Module/Connections.php:107
+#: ../../Zotlabs/Module/Connedit.php:673 ../../include/widgets.php:533
+msgid "All"
+msgstr ""
+
 #: ../../Zotlabs/Module/Connections.php:138
 msgid "New Connections"
 msgstr ""
@@ -1494,77 +1361,86 @@ 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:617
+msgid "Ignore"
+msgstr ""
+
+#: ../../Zotlabs/Module/Connections.php:288
 msgid "Recent activity"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connections.php:302 ../../Zotlabs/Lib/Apps.php:211
-#: ../../include/nav.php:189 ../../include/text.php:916
+#: ../../Zotlabs/Module/Connections.php:312 ../../Zotlabs/Lib/Apps.php:211
+#: ../../include/text.php:929 ../../include/nav.php:189
 msgid "Connections"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connections.php:306 ../../Zotlabs/Module/Search.php:44
-#: ../../Zotlabs/Lib/Apps.php:232 ../../include/nav.php:168
-#: ../../include/text.php:986 ../../include/text.php:998
-#: ../../include/acl_selectors.php:203 ../../include/widgets.php:315
+#: ../../Zotlabs/Module/Connections.php:316 ../../Zotlabs/Module/Search.php:44
+#: ../../Zotlabs/Lib/Apps.php:232 ../../include/acl_selectors.php:203
+#: ../../include/text.php:999 ../../include/text.php:1011
+#: ../../include/nav.php:168 ../../include/widgets.php:315
 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/Connections.php:319
 #: ../../Zotlabs/Module/Directory.php:391
 #: ../../Zotlabs/Module/Directory.php:396 ../../include/contact_widgets.php:23
 msgid "Find"
@@ -1743,14 +1619,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."
@@ -1850,20 +1718,6 @@ msgstr ""
 msgid "Install"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Plugins.php:414
-#: ../../Zotlabs/Module/Fbrowser.php:66 ../../Zotlabs/Module/Fbrowser.php:88
-#: ../../Zotlabs/Module/Wiki.php:238 ../../Zotlabs/Module/Wiki.php:261
-#: ../../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:1246 ../../include/conversation.php:1295
-msgid "Cancel"
-msgstr ""
-
 #: ../../Zotlabs/Module/Admin/Plugins.php:435
 msgid "Manage Repos"
 msgstr ""
@@ -1877,6 +1731,7 @@ msgid "Install a New Plugin Repository"
 msgstr ""
 
 #: ../../Zotlabs/Module/Admin/Plugins.php:443
+#: ../../Zotlabs/Module/Connedit.php:860
 #: ../../Zotlabs/Module/Settings/Oauth.php:42
 #: ../../Zotlabs/Module/Settings/Oauth.php:113 ../../Zotlabs/Lib/Apps.php:339
 #: ../../extend/addon/addon/cdav/Mod_Cdav.php:1152
@@ -1887,12 +1742,6 @@ msgstr ""
 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:114
-msgid "Remove"
-msgstr ""
-
 #: ../../Zotlabs/Module/Admin/Profs.php:69
 msgid "New Profile Field"
 msgstr ""
@@ -2222,6 +2071,7 @@ msgstr ""
 
 #: ../../Zotlabs/Module/Admin/Accounts.php:169
 #: ../../Zotlabs/Module/Admin/Accounts.php:181
+#: ../../Zotlabs/Module/Connedit.php:848
 #: ../../extend/addon/addon/redred/redred.php:107
 #: ../../extend/addon/addon/rtof/rtof.php:93
 #: ../../extend/addon/addon/cdav/Mod_Cdav.php:1140
@@ -2239,6 +2089,16 @@ msgstr ""
 msgid "Deny"
 msgstr ""
 
+#: ../../Zotlabs/Module/Admin/Accounts.php:174
+#: ../../Zotlabs/Module/Connedit.php:609
+msgid "Block"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Accounts.php:175
+#: ../../Zotlabs/Module/Connedit.php:609
+msgid "Unblock"
+msgstr ""
+
 #: ../../Zotlabs/Module/Admin/Accounts.php:180
 msgid "ID"
 msgstr ""
@@ -2346,7 +2206,7 @@ msgid "Disallow Code"
 msgstr ""
 
 #: ../../Zotlabs/Module/Admin/Channels.php:154
-#: ../../include/conversation.php:1653
+#: ../../include/conversation.php:1801
 msgid "Channel"
 msgstr ""
 
@@ -2354,6 +2214,13 @@ msgstr ""
 msgid "UID"
 msgstr ""
 
+#: ../../Zotlabs/Module/Admin/Channels.php:160
+#: ../../Zotlabs/Module/Connedit.php:851 ../../Zotlabs/Module/Locs.php:118
+#: ../../Zotlabs/Module/Profiles.php:464
+#: ../../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 "
@@ -2410,7 +2277,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 ""
 
@@ -2776,111 +2643,534 @@ msgstr ""
 msgid "0 for no expiration of imported content"
 msgstr ""
 
-#: ../../Zotlabs/Module/Pubsites.php:24 ../../include/widgets.php:1385
-msgid "Public Hubs"
+#: ../../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"
 msgstr ""
 
-#: ../../Zotlabs/Module/Pubsites.php:27
+#: ../../Zotlabs/Module/Editlayout.php:127
+#: ../../Zotlabs/Module/Layouts.php:128 ../../Zotlabs/Module/Layouts.php:188
+msgid "Layout Name"
+msgstr ""
+
+#: ../../Zotlabs/Module/Editlayout.php:128
+#: ../../Zotlabs/Module/Layouts.php:131
+msgid "Layout Description (Optional)"
+msgstr ""
+
+#: ../../Zotlabs/Module/Editlayout.php:136
+msgid "Edit Layout"
+msgstr ""
+
+#: ../../Zotlabs/Module/Editwebpage.php:142
+msgid "Page link"
+msgstr ""
+
+#: ../../Zotlabs/Module/Editwebpage.php:146
+#: ../../Zotlabs/Module/Editblock.php:111 ../../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/Editwebpage.php:169
+msgid "Edit Webpage"
+msgstr ""
+
+#: ../../Zotlabs/Module/Import.php:33
+#, php-format
+msgid "Your service plan only allows %d channels."
+msgstr ""
+
+#: ../../Zotlabs/Module/Import.php:71 ../../Zotlabs/Module/Import_items.php:42
+msgid "Nothing to import."
+msgstr ""
+
+#: ../../Zotlabs/Module/Import.php:83 ../../Zotlabs/Module/Import.php:98
+#: ../../Zotlabs/Module/Import_items.php:66
+msgid "Unable to download data from old server"
+msgstr ""
+
+#: ../../Zotlabs/Module/Import.php:105
+#: ../../Zotlabs/Module/Import_items.php:72
+msgid "Imported file is empty."
+msgstr ""
+
+#: ../../Zotlabs/Module/Import.php:127
+#: ../../Zotlabs/Module/Import_items.php:88
+#, php-format
+msgid "Warning: Database versions differ by %1$d updates."
+msgstr ""
+
+#: ../../Zotlabs/Module/Import.php:157 ../../include/import.php:100
+msgid "Cloned channel not found. Import failed."
+msgstr ""
+
+#: ../../Zotlabs/Module/Import.php:167
+msgid "No channel. Import failed."
+msgstr ""
+
+#: ../../Zotlabs/Module/Import.php:503
+#: ../../include/Import/import_diaspora.php:142
+msgid "Import completed."
+msgstr ""
+
+#: ../../Zotlabs/Module/Import.php:525
+msgid "You must be logged in to use this feature."
+msgstr ""
+
+#: ../../Zotlabs/Module/Import.php:530
+msgid "Import Channel"
+msgstr ""
+
+#: ../../Zotlabs/Module/Import.php:531
 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."
+"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/Pubsites.php:33
-msgid "Hub URL"
+#: ../../Zotlabs/Module/Import.php:532
+#: ../../Zotlabs/Module/Import_items.php:121
+msgid "File to Upload"
 msgstr ""
 
-#: ../../Zotlabs/Module/Pubsites.php:33
-msgid "Access Type"
+#: ../../Zotlabs/Module/Import.php:533
+msgid "Or provide the old server/hub details"
 msgstr ""
 
-#: ../../Zotlabs/Module/Pubsites.php:33
-msgid "Registration Policy"
+#: ../../Zotlabs/Module/Import.php:534
+msgid "Your old identity address (xyz@example.com)"
 msgstr ""
 
-#: ../../Zotlabs/Module/Pubsites.php:33
-msgid "Stats"
+#: ../../Zotlabs/Module/Import.php:535
+msgid "Your old login email address"
 msgstr ""
 
-#: ../../Zotlabs/Module/Pubsites.php:33
-msgid "Software"
+#: ../../Zotlabs/Module/Import.php:536
+msgid "Your old login password"
 msgstr ""
 
-#: ../../Zotlabs/Module/Pubsites.php:35 ../../Zotlabs/Module/Ratings.php:97
-#: ../../include/conversation.php:940
-msgid "Ratings"
+#: ../../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."
 msgstr ""
 
-#: ../../Zotlabs/Module/Pubsites.php:48
-msgid "Rate"
+#: ../../Zotlabs/Module/Import.php:538
+msgid "Make this hub my primary location"
 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
-msgid "View"
+#: ../../Zotlabs/Module/Import.php:539
+msgid ""
+"Import existing posts if possible (experimental - limited by available memory"
 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/Import.php:540
+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/Editlayout.php:127
-#: ../../Zotlabs/Module/Layouts.php:128 ../../Zotlabs/Module/Layouts.php:188
-msgid "Layout Name"
+#: ../../Zotlabs/Module/Connedit.php:82
+msgid "Could not access contact record."
 msgstr ""
 
-#: ../../Zotlabs/Module/Editlayout.php:128
-#: ../../Zotlabs/Module/Layouts.php:131
-msgid "Layout Description (Optional)"
+#: ../../Zotlabs/Module/Connedit.php:112
+msgid "Could not locate selected profile."
 msgstr ""
 
-#: ../../Zotlabs/Module/Editlayout.php:136
-msgid "Edit Layout"
+#: ../../Zotlabs/Module/Connedit.php:264
+msgid "Connection updated."
 msgstr ""
 
-#: ../../Zotlabs/Module/Editwebpage.php:142
-msgid "Page link"
+#: ../../Zotlabs/Module/Connedit.php:266
+msgid "Failed to update connection record."
 msgstr ""
 
-#: ../../Zotlabs/Module/Editwebpage.php:146 ../../Zotlabs/Module/Mail.php:286
-#: ../../Zotlabs/Module/Mail.php:411 ../../Zotlabs/Module/Editblock.php:111
-#: ../../Zotlabs/Module/Chat.php:207 ../../include/conversation.php:1147
-msgid "Insert web link"
+#: ../../Zotlabs/Module/Connedit.php:316
+msgid "is now connected to"
 msgstr ""
 
-#: ../../Zotlabs/Module/Editwebpage.php:169
-msgid "Edit Webpage"
+#: ../../Zotlabs/Module/Connedit.php:449
+msgid "Could not access address book record."
 msgstr ""
 
-#: ../../Zotlabs/Module/Fbrowser.php:29 ../../Zotlabs/Lib/Apps.php:224
-#: ../../include/nav.php:95 ../../include/conversation.php:1674
-msgid "Photos"
+#: ../../Zotlabs/Module/Connedit.php:469
+msgid "Refresh failed - channel is currently unavailable."
 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/Connedit.php:484 ../../Zotlabs/Module/Connedit.php:493
+#: ../../Zotlabs/Module/Connedit.php:502 ../../Zotlabs/Module/Connedit.php:511
+#: ../../Zotlabs/Module/Connedit.php:524
+msgid "Unable to set address book parameters."
 msgstr ""
 
-#: ../../Zotlabs/Module/Channel.php:44
-msgid "Posts and comments"
+#: ../../Zotlabs/Module/Connedit.php:548
+msgid "Connection has been removed."
 msgstr ""
 
-#: ../../Zotlabs/Module/Channel.php:45
-msgid "Only posts"
+#: ../../Zotlabs/Module/Connedit.php:588 ../../Zotlabs/Lib/Apps.php:223
+#: ../../extend/addon/addon/openclipatar/openclipatar.php:56
+#: ../../include/nav.php:89 ../../include/conversation.php:936
+#: ../../include/conversation.php:1049
+msgid "View Profile"
 msgstr ""
 
-#: ../../Zotlabs/Module/Channel.php:104
-msgid "Insufficient permissions.  Request redirected to profile page."
+#: ../../Zotlabs/Module/Connedit.php:591
+#, php-format
+msgid "View %s's profile"
+msgstr ""
+
+#: ../../Zotlabs/Module/Connedit.php:595
+msgid "Refresh Permissions"
+msgstr ""
+
+#: ../../Zotlabs/Module/Connedit.php:598
+msgid "Fetch updated permissions"
+msgstr ""
+
+#: ../../Zotlabs/Module/Connedit.php:602
+msgid "Recent Activity"
+msgstr ""
+
+#: ../../Zotlabs/Module/Connedit.php:605
+msgid "View recent posts and comments"
+msgstr ""
+
+#: ../../Zotlabs/Module/Connedit.php:612
+msgid "Block (or Unblock) all communications with this connection"
+msgstr ""
+
+#: ../../Zotlabs/Module/Connedit.php:613
+msgid "This connection is blocked!"
+msgstr ""
+
+#: ../../Zotlabs/Module/Connedit.php:617
+msgid "Unignore"
+msgstr ""
+
+#: ../../Zotlabs/Module/Connedit.php:620
+msgid "Ignore (or Unignore) all inbound communications from this connection"
+msgstr ""
+
+#: ../../Zotlabs/Module/Connedit.php:621
+msgid "This connection is ignored!"
+msgstr ""
+
+#: ../../Zotlabs/Module/Connedit.php:625
+msgid "Unarchive"
+msgstr ""
+
+#: ../../Zotlabs/Module/Connedit.php:625
+msgid "Archive"
+msgstr ""
+
+#: ../../Zotlabs/Module/Connedit.php:628
+msgid ""
+"Archive (or Unarchive) this connection - mark channel dead but keep content"
+msgstr ""
+
+#: ../../Zotlabs/Module/Connedit.php:629
+msgid "This connection is archived!"
+msgstr ""
+
+#: ../../Zotlabs/Module/Connedit.php:633
+msgid "Unhide"
+msgstr ""
+
+#: ../../Zotlabs/Module/Connedit.php:633
+msgid "Hide"
+msgstr ""
+
+#: ../../Zotlabs/Module/Connedit.php:636
+msgid "Hide or Unhide this connection from your other connections"
+msgstr ""
+
+#: ../../Zotlabs/Module/Connedit.php:637
+msgid "This connection is hidden!"
+msgstr ""
+
+#: ../../Zotlabs/Module/Connedit.php:644
+msgid "Delete this connection"
+msgstr ""
+
+#: ../../Zotlabs/Module/Connedit.php:669 ../../include/widgets.php:529
+msgid "Me"
+msgstr ""
+
+#: ../../Zotlabs/Module/Connedit.php:670 ../../include/widgets.php:530
+msgid "Family"
+msgstr ""
+
+#: ../../Zotlabs/Module/Connedit.php:671
+#: ../../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/channel.php:402
+#: ../../include/channel.php:403 ../../include/channel.php:410
+#: ../../include/selectors.php:123 ../../include/widgets.php:531
+msgid "Friends"
+msgstr ""
+
+#: ../../Zotlabs/Module/Connedit.php:672 ../../include/widgets.php:532
+msgid "Acquaintances"
+msgstr ""
+
+#: ../../Zotlabs/Module/Connedit.php:730
+msgid "Approve this connection"
+msgstr ""
+
+#: ../../Zotlabs/Module/Connedit.php:730
+msgid "Accept connection to allow communication"
+msgstr ""
+
+#: ../../Zotlabs/Module/Connedit.php:735
+msgid "Set Affinity"
+msgstr ""
+
+#: ../../Zotlabs/Module/Connedit.php:738
+msgid "Set Profile"
+msgstr ""
+
+#: ../../Zotlabs/Module/Connedit.php:741
+msgid "Set Affinity & Profile"
+msgstr ""
+
+#: ../../Zotlabs/Module/Connedit.php:790
+msgid "none"
+msgstr ""
+
+#: ../../Zotlabs/Module/Connedit.php:793 ../../include/widgets.php:656
+msgid "Connection Default Permissions"
+msgstr ""
+
+#: ../../Zotlabs/Module/Connedit.php:793 ../../include/items.php:3909
+#, php-format
+msgid "Connection: %s"
+msgstr ""
+
+#: ../../Zotlabs/Module/Connedit.php:794
+msgid "Apply these permissions automatically"
+msgstr ""
+
+#: ../../Zotlabs/Module/Connedit.php:794
+msgid "Connection requests will be approved without your interaction"
+msgstr ""
+
+#: ../../Zotlabs/Module/Connedit.php:798
+msgid "This connection's primary address is"
+msgstr ""
+
+#: ../../Zotlabs/Module/Connedit.php:799
+msgid "Available locations:"
+msgstr ""
+
+#: ../../Zotlabs/Module/Connedit.php:803
+msgid ""
+"The permissions indicated on this page will be applied to all new "
+"connections."
+msgstr ""
+
+#: ../../Zotlabs/Module/Connedit.php:804
+msgid "Connection Tools"
+msgstr ""
+
+#: ../../Zotlabs/Module/Connedit.php:806
+msgid "Slide to adjust your degree of friendship"
+msgstr ""
+
+#: ../../Zotlabs/Module/Connedit.php:807 ../../Zotlabs/Module/Rate.php:155
+#: ../../include/js_strings.php:20
+msgid "Rating"
+msgstr ""
+
+#: ../../Zotlabs/Module/Connedit.php:808
+msgid "Slide to adjust your rating"
+msgstr ""
+
+#: ../../Zotlabs/Module/Connedit.php:809 ../../Zotlabs/Module/Connedit.php:814
+msgid "Optionally explain your rating"
+msgstr ""
+
+#: ../../Zotlabs/Module/Connedit.php:811
+msgid "Custom Filter"
+msgstr ""
+
+#: ../../Zotlabs/Module/Connedit.php:812
+msgid "Only import posts with this text"
+msgstr ""
+
+#: ../../Zotlabs/Module/Connedit.php:812 ../../Zotlabs/Module/Connedit.php:813
+msgid ""
+"words one per line or #tags or /patterns/ or lang=xx, leave blank to import "
+"all posts"
+msgstr ""
+
+#: ../../Zotlabs/Module/Connedit.php:813
+msgid "Do not import posts with this text"
+msgstr ""
+
+#: ../../Zotlabs/Module/Connedit.php:815
+msgid "This information is public!"
+msgstr ""
+
+#: ../../Zotlabs/Module/Connedit.php:820
+msgid "Connection Pending Approval"
+msgstr ""
+
+#: ../../Zotlabs/Module/Connedit.php:823
+#: ../../Zotlabs/Module/Settings/Tokens.php:163
+msgid "inherited"
+msgstr ""
+
+#: ../../Zotlabs/Module/Connedit.php:825
+#, php-format
+msgid ""
+"Please choose the profile you would like to display to %s when viewing your "
+"profile securely."
+msgstr ""
+
+#: ../../Zotlabs/Module/Connedit.php:827
+#: ../../Zotlabs/Module/Settings/Tokens.php:160
+msgid "Their Settings"
+msgstr ""
+
+#: ../../Zotlabs/Module/Connedit.php:828
+#: ../../Zotlabs/Module/Settings/Tokens.php:161
+msgid "My Settings"
+msgstr ""
+
+#: ../../Zotlabs/Module/Connedit.php:830
+#: ../../Zotlabs/Module/Settings/Tokens.php:165
+msgid "Individual Permissions"
+msgstr ""
+
+#: ../../Zotlabs/Module/Connedit.php:831
+#: ../../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."
+msgstr ""
+
+#: ../../Zotlabs/Module/Connedit.php:832
+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/Connedit.php:833
+msgid "Last update:"
+msgstr ""
+
+#: ../../Zotlabs/Module/Connedit.php:842
+msgid "Details"
+msgstr ""
+
+#: ../../Zotlabs/Module/Connedit.php:845
+#: ../../extend/addon/addon/cdav/Mod_Cdav.php:1137
+msgid "Organisation"
+msgstr ""
+
+#: ../../Zotlabs/Module/Connedit.php:846
+#: ../../extend/addon/addon/cdav/Mod_Cdav.php:1138
+#: ../../include/page_widgets.php:46
+msgid "Title"
+msgstr ""
+
+#: ../../Zotlabs/Module/Connedit.php:847
+#: ../../extend/addon/addon/cdav/Mod_Cdav.php:1139
+msgid "Phone"
+msgstr ""
+
+#: ../../Zotlabs/Module/Connedit.php:849
+#: ../../extend/addon/addon/cdav/Mod_Cdav.php:1141
+msgid "Instant messenger"
+msgstr ""
+
+#: ../../Zotlabs/Module/Connedit.php:850
+#: ../../extend/addon/addon/cdav/Mod_Cdav.php:1142
+msgid "Website"
+msgstr ""
+
+#: ../../Zotlabs/Module/Connedit.php:852
+#: ../../extend/addon/addon/cdav/Mod_Cdav.php:1144
+msgid "Note"
+msgstr ""
+
+#: ../../Zotlabs/Module/Connedit.php:853
+#: ../../extend/addon/addon/cdav/Mod_Cdav.php:1145
+#: ../../extend/addon/addon/cdav/cdav.php:270
+#: ../../include/connections.php:856
+msgid "Mobile"
+msgstr ""
+
+#: ../../Zotlabs/Module/Connedit.php:854
+#: ../../extend/addon/addon/cdav/Mod_Cdav.php:1146
+#: ../../extend/addon/addon/cdav/cdav.php:271
+#: ../../include/connections.php:857 ../../include/nav.php:88
+msgid "Home"
+msgstr ""
+
+#: ../../Zotlabs/Module/Connedit.php:855
+#: ../../extend/addon/addon/cdav/Mod_Cdav.php:1147
+#: ../../extend/addon/addon/cdav/cdav.php:274
+#: ../../include/connections.php:860
+msgid "Work"
+msgstr ""
+
+#: ../../Zotlabs/Module/Connedit.php:857
+#: ../../extend/addon/addon/jappixmini/jappixmini.php:368
+#: ../../extend/addon/addon/cdav/Mod_Cdav.php:1149
+msgid "Add Contact"
+msgstr ""
+
+#: ../../Zotlabs/Module/Connedit.php:858
+#: ../../extend/addon/addon/cdav/Mod_Cdav.php:1150
+msgid "Add Field"
+msgstr ""
+
+#: ../../Zotlabs/Module/Connedit.php:863
+#: ../../extend/addon/addon/cdav/Mod_Cdav.php:1155
+msgid "P.O. Box"
+msgstr ""
+
+#: ../../Zotlabs/Module/Connedit.php:864
+#: ../../extend/addon/addon/cdav/Mod_Cdav.php:1156
+msgid "Additional"
+msgstr ""
+
+#: ../../Zotlabs/Module/Connedit.php:865
+#: ../../extend/addon/addon/cdav/Mod_Cdav.php:1157
+msgid "Street"
+msgstr ""
+
+#: ../../Zotlabs/Module/Connedit.php:866
+#: ../../extend/addon/addon/cdav/Mod_Cdav.php:1158
+msgid "Locality"
+msgstr ""
+
+#: ../../Zotlabs/Module/Connedit.php:867
+#: ../../extend/addon/addon/cdav/Mod_Cdav.php:1159
+msgid "Region"
+msgstr ""
+
+#: ../../Zotlabs/Module/Connedit.php:868
+#: ../../extend/addon/addon/cdav/Mod_Cdav.php:1160
+msgid "ZIP Code"
+msgstr ""
+
+#: ../../Zotlabs/Module/Connedit.php:869 ../../Zotlabs/Module/Profiles.php:715
+#: ../../extend/addon/addon/cdav/Mod_Cdav.php:1161
+msgid "Country"
 msgstr ""
 
 #: ../../Zotlabs/Module/Network.php:96
@@ -2947,10 +3237,14 @@ 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
 #: ../../include/page_widgets.php:47
@@ -3020,106 +3314,167 @@ msgstr ""
 msgid "Not found."
 msgstr ""
 
-#: ../../Zotlabs/Module/Appman.php:37 ../../Zotlabs/Module/Appman.php:53
-msgid "App installed."
+#: ../../Zotlabs/Module/Cal.php:69
+msgid "Permissions denied."
 msgstr ""
 
-#: ../../Zotlabs/Module/Appman.php:46
-msgid "Malformed app."
+#: ../../Zotlabs/Module/Cal.php:263 ../../Zotlabs/Module/Events.php:596
+msgid "l, F j"
 msgstr ""
 
-#: ../../Zotlabs/Module/Appman.php:105
-msgid "Embed code"
+#: ../../Zotlabs/Module/Cal.php:312 ../../Zotlabs/Module/Events.php:651
+#: ../../include/text.php:1761
+msgid "Link to Source"
 msgstr ""
 
-#: ../../Zotlabs/Module/Appman.php:111 ../../include/widgets.php:107
-msgid "Edit App"
+#: ../../Zotlabs/Module/Cal.php:335 ../../Zotlabs/Module/Events.php:679
+msgid "Edit Event"
 msgstr ""
 
-#: ../../Zotlabs/Module/Appman.php:111
-msgid "Create App"
+#: ../../Zotlabs/Module/Cal.php:335 ../../Zotlabs/Module/Events.php:679
+msgid "Create Event"
 msgstr ""
 
-#: ../../Zotlabs/Module/Appman.php:116
-msgid "Name of app"
+#: ../../Zotlabs/Module/Cal.php:338 ../../Zotlabs/Module/Events.php:682
+msgid "Export"
 msgstr ""
 
-#: ../../Zotlabs/Module/Appman.php:116 ../../Zotlabs/Module/Appman.php:117
-#: ../../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/Cal.php:341 ../../include/text.php:2307
+msgid "Import"
 msgstr ""
 
-#: ../../Zotlabs/Module/Appman.php:117
-msgid "Location (URL) of app"
+#: ../../Zotlabs/Module/Cal.php:345 ../../Zotlabs/Module/Events.php:691
+#: ../../extend/addon/addon/cdav/Mod_Cdav.php:848
+msgid "Today"
 msgstr ""
 
-#: ../../Zotlabs/Module/Appman.php:118 ../../Zotlabs/Module/Rbmark.php:101
-#: ../../Zotlabs/Module/Events.php:466
-#: ../../extend/addon/addon/cdav/Mod_Cdav.php:838
-#: ../../extend/addon/addon/rendezvous/rendezvous.php:165
-msgid "Description"
+#: ../../Zotlabs/Module/Rpost.php:138 ../../Zotlabs/Module/Editpost.php:107
+msgid "Edit post"
 msgstr ""
 
-#: ../../Zotlabs/Module/Appman.php:119
-msgid "Photo icon URL"
+#: ../../Zotlabs/Module/Like.php:19
+msgid "Like/Dislike"
 msgstr ""
 
-#: ../../Zotlabs/Module/Appman.php:119
-msgid "80 x 80 pixels - optional"
+#: ../../Zotlabs/Module/Like.php:24
+msgid "This action is restricted to members."
 msgstr ""
 
-#: ../../Zotlabs/Module/Appman.php:120
-msgid "Categories (optional, comma separated list)"
+#: ../../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/Appman.php:121
-msgid "Version ID"
+#: ../../Zotlabs/Module/Like.php:105 ../../Zotlabs/Module/Like.php:131
+#: ../../Zotlabs/Module/Like.php:169
+msgid "Invalid request."
 msgstr ""
 
-#: ../../Zotlabs/Module/Appman.php:122
-msgid "Price of app"
+#: ../../Zotlabs/Module/Like.php:117 ../../include/conversation.php:126
+msgid "channel"
 msgstr ""
 
-#: ../../Zotlabs/Module/Appman.php:123
-msgid "Location (URL) to purchase app"
+#: ../../Zotlabs/Module/Like.php:146
+msgid "thing"
 msgstr ""
 
-#: ../../Zotlabs/Module/Rpost.php:138 ../../Zotlabs/Module/Editpost.php:107
-msgid "Edit post"
+#: ../../Zotlabs/Module/Like.php:192
+msgid "Channel unavailable."
 msgstr ""
 
-#: ../../Zotlabs/Module/Help.php:23
-msgid "Documentation Search"
+#: ../../Zotlabs/Module/Like.php:240
+msgid "Previous action reversed."
 msgstr ""
 
-#: ../../Zotlabs/Module/Help.php:80 ../../include/conversation.php:1665
-msgid "About"
+#: ../../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/text.php:1953 ../../include/conversation.php:120
+msgid "photo"
 msgstr ""
 
-#: ../../Zotlabs/Module/Help.php:81 ../../Zotlabs/Module/Group.php:197
-msgid "Members"
+#: ../../Zotlabs/Module/Like.php:370 ../../Zotlabs/Module/Subthread.php:87
+#: ../../extend/addon/addon/diaspora/inbound.php:1794
+#: ../../include/text.php:1959 ../../include/conversation.php:148
+msgid "status"
 msgstr ""
 
-#: ../../Zotlabs/Module/Help.php:82
-msgid "Administrators"
+#: ../../Zotlabs/Module/Like.php:372 ../../Zotlabs/Module/Events.php:256
+#: ../../Zotlabs/Module/Tagger.php:51 ../../include/event.php:961
+#: ../../include/text.php:1956 ../../include/conversation.php:123
+msgid "event"
 msgstr ""
 
-#: ../../Zotlabs/Module/Help.php:83
-msgid "Developers"
+#: ../../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/Help.php:84
-msgid "Tutorials"
+#: ../../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/Help.php:93
-msgid "$Projectname Documentation"
+#: ../../Zotlabs/Module/Like.php:423
+#, php-format
+msgid "%1$s agrees with %2$s's %3$s"
 msgstr ""
 
-#: ../../Zotlabs/Module/Help.php:94
-msgid "Contents"
+#: ../../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/Profperm.php:34 ../../Zotlabs/Module/Profperm.php:63
+msgid "Invalid profile identifier."
+msgstr ""
+
+#: ../../Zotlabs/Module/Profperm.php:115
+msgid "Profile Visibility Editor"
+msgstr ""
+
+#: ../../Zotlabs/Module/Profperm.php:117 ../../include/channel.php:1282
+msgid "Profile"
+msgstr ""
+
+#: ../../Zotlabs/Module/Profperm.php:119
+msgid "Click on a contact to add or remove."
+msgstr ""
+
+#: ../../Zotlabs/Module/Profperm.php:128
+msgid "Visible To"
 msgstr ""
 
 #: ../../Zotlabs/Module/Ffsapi.php:12
@@ -3130,9 +3485,12 @@ msgstr ""
 msgid "Activate the Firefox $Projectname provider"
 msgstr ""
 
-#: ../../Zotlabs/Module/Apps.php:46 ../../include/nav.php:166
-#: ../../include/widgets.php:102
-msgid "Apps"
+#: ../../Zotlabs/Module/Chatsvc.php:117
+msgid "Away"
+msgstr ""
+
+#: ../../Zotlabs/Module/Chatsvc.php:122
+msgid "Online"
 msgstr ""
 
 #: ../../Zotlabs/Module/Home.php:74 ../../Zotlabs/Module/Home.php:82
@@ -3156,13 +3514,6 @@ msgstr ""
 msgid "Edit file permissions"
 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"
-msgstr ""
-
 #: ../../Zotlabs/Module/Filestorage.php:159
 msgid "Set/edit permissions"
 msgstr ""
@@ -3195,482 +3546,497 @@ msgstr ""
 msgid "Notify your contacts about this file"
 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/Editblock.php:108 ../../Zotlabs/Module/Blocks.php:97
+#: ../../Zotlabs/Module/Blocks.php:155
+msgid "Block Name"
 msgstr ""
 
-#: ../../Zotlabs/Module/Directory.php:245
-#, php-format
-msgid "%d rating"
-msgid_plural "%d ratings"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../../Zotlabs/Module/Directory.php:256
-msgid "Gender: "
+#: ../../Zotlabs/Module/Editblock.php:124 ../../include/conversation.php:1406
+msgid "Title (optional)"
 msgstr ""
 
-#: ../../Zotlabs/Module/Directory.php:258
-msgid "Status: "
+#: ../../Zotlabs/Module/Editblock.php:133
+msgid "Edit Block"
 msgstr ""
 
-#: ../../Zotlabs/Module/Directory.php:260
-msgid "Homepage: "
+#: ../../Zotlabs/Module/Locs.php:25 ../../Zotlabs/Module/Locs.php:54
+msgid "Location not found."
 msgstr ""
 
-#: ../../Zotlabs/Module/Directory.php:309 ../../include/channel.php:1215
-msgid "Age:"
+#: ../../Zotlabs/Module/Locs.php:62
+msgid "Location lookup failed."
 msgstr ""
 
-#: ../../Zotlabs/Module/Directory.php:314 ../../include/channel.php:1051
-#: ../../include/bb2diaspora.php:521 ../../include/event.php:52
-#: ../../include/event.php:84
-msgid "Location:"
+#: ../../Zotlabs/Module/Locs.php:66
+msgid ""
+"Please select another location to become primary before removing the primary "
+"location."
 msgstr ""
 
-#: ../../Zotlabs/Module/Directory.php:320
-msgid "Description:"
+#: ../../Zotlabs/Module/Locs.php:95
+msgid "Syncing locations"
 msgstr ""
 
-#: ../../Zotlabs/Module/Directory.php:325 ../../include/channel.php:1231
-msgid "Hometown:"
+#: ../../Zotlabs/Module/Locs.php:105
+msgid "No locations found."
 msgstr ""
 
-#: ../../Zotlabs/Module/Directory.php:327 ../../include/channel.php:1239
-msgid "About:"
+#: ../../Zotlabs/Module/Locs.php:116
+msgid "Manage Channel Locations"
 msgstr ""
 
-#: ../../Zotlabs/Module/Directory.php:329
-msgid "Public Forum:"
+#: ../../Zotlabs/Module/Locs.php:117 ../../Zotlabs/Module/Events.php:468
+#: ../../Zotlabs/Module/Pubsites.php:51 ../../Zotlabs/Module/Profiles.php:471
+#: ../../Zotlabs/Module/Profiles.php:692
+#: ../../extend/addon/addon/cdav/Mod_Cdav.php:839
+#: ../../include/js_strings.php:25
+msgid "Location"
 msgstr ""
 
-#: ../../Zotlabs/Module/Directory.php:332
-msgid "Keywords: "
+#: ../../Zotlabs/Module/Locs.php:119
+msgid "Primary"
 msgstr ""
 
-#: ../../Zotlabs/Module/Directory.php:335
-msgid "Don't suggest"
+#: ../../Zotlabs/Module/Locs.php:122
+msgid "Sync Now"
 msgstr ""
 
-#: ../../Zotlabs/Module/Directory.php:337
-msgid "Common connections:"
+#: ../../Zotlabs/Module/Locs.php:123
+msgid "Please wait several minutes between consecutive operations."
 msgstr ""
 
-#: ../../Zotlabs/Module/Directory.php:386
-msgid "Global Directory"
+#: ../../Zotlabs/Module/Locs.php:124
+msgid ""
+"When possible, drop a location by logging into that website/hub and removing "
+"your channel."
 msgstr ""
 
-#: ../../Zotlabs/Module/Directory.php:386
-msgid "Local Directory"
+#: ../../Zotlabs/Module/Locs.php:125
+msgid "Use this form to drop the location if the hub is no longer operating."
 msgstr ""
 
-#: ../../Zotlabs/Module/Directory.php:392
-msgid "Finding:"
+#: ../../Zotlabs/Module/Invite.php:29
+msgid "Total invitation limit exceeded."
 msgstr ""
 
-#: ../../Zotlabs/Module/Directory.php:395 ../../Zotlabs/Module/Suggest.php:64
-#: ../../include/contact_widgets.php:24
-msgid "Channel Suggestions"
+#: ../../Zotlabs/Module/Invite.php:53
+#, php-format
+msgid "%s : Not a valid email address."
 msgstr ""
 
-#: ../../Zotlabs/Module/Directory.php:397
-msgid "next page"
+#: ../../Zotlabs/Module/Invite.php:67
+msgid "Please join us on $Projectname"
 msgstr ""
 
-#: ../../Zotlabs/Module/Directory.php:397
-msgid "previous page"
+#: ../../Zotlabs/Module/Invite.php:77
+msgid "Invitation limit exceeded. Please contact your site administrator."
 msgstr ""
 
-#: ../../Zotlabs/Module/Directory.php:398
-msgid "Sort options"
+#: ../../Zotlabs/Module/Invite.php:82
+#, php-format
+msgid "%s : Message delivery failed."
 msgstr ""
 
-#: ../../Zotlabs/Module/Directory.php:399
-msgid "Alphabetic"
+#: ../../Zotlabs/Module/Invite.php:86
+#, php-format
+msgid "%d message sent."
+msgid_plural "%d messages sent."
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../../Zotlabs/Module/Invite.php:105
+msgid "You have no more invitations available"
 msgstr ""
 
-#: ../../Zotlabs/Module/Directory.php:400
-msgid "Reverse Alphabetic"
+#: ../../Zotlabs/Module/Invite.php:136
+msgid "Send invitations"
 msgstr ""
 
-#: ../../Zotlabs/Module/Directory.php:401
-msgid "Newest to Oldest"
+#: ../../Zotlabs/Module/Invite.php:137
+msgid "Enter email addresses, one per line:"
 msgstr ""
 
-#: ../../Zotlabs/Module/Directory.php:402
-msgid "Oldest to Newest"
+#: ../../Zotlabs/Module/Invite.php:138 ../../Zotlabs/Module/Mail.php:284
+msgid "Your message:"
 msgstr ""
 
-#: ../../Zotlabs/Module/Directory.php:419
-msgid "No entries (some entries may be hidden)."
+#: ../../Zotlabs/Module/Invite.php:139
+msgid "Please join my community on $Projectname."
 msgstr ""
 
-#: ../../Zotlabs/Module/Item.php:184
-msgid "Unable to locate original post."
+#: ../../Zotlabs/Module/Invite.php:141
+msgid "You will need to supply this invitation code:"
 msgstr ""
 
-#: ../../Zotlabs/Module/Item.php:447
-msgid "Empty post discarded."
+#: ../../Zotlabs/Module/Invite.php:142
+msgid "1. Register at any $Projectname location (they are all inter-connected)"
 msgstr ""
 
-#: ../../Zotlabs/Module/Item.php:489
-msgid "Executable content type not permitted to this channel."
+#: ../../Zotlabs/Module/Invite.php:144
+msgid "2. Enter my $Projectname network address into the site searchbar."
 msgstr ""
 
-#: ../../Zotlabs/Module/Item.php:837
-msgid "Duplicate post suppressed."
+#: ../../Zotlabs/Module/Invite.php:145
+msgid "or visit"
 msgstr ""
 
-#: ../../Zotlabs/Module/Item.php:979
-msgid "System error. Post not saved."
+#: ../../Zotlabs/Module/Invite.php:147
+msgid "3. Click [Connect]"
 msgstr ""
 
-#: ../../Zotlabs/Module/Item.php:1111
-msgid "Unable to obtain post information from database."
+#: ../../Zotlabs/Module/Acl.php:313
+msgid "network"
 msgstr ""
 
-#: ../../Zotlabs/Module/Item.php:1118
-#, php-format
-msgid "You have reached your limit of %1$.0f top level posts."
+#: ../../Zotlabs/Module/Acl.php:323
+msgid "RSS"
 msgstr ""
 
-#: ../../Zotlabs/Module/Item.php:1125
-#, php-format
-msgid "You have reached your limit of %1$.0f webpages."
+#: ../../Zotlabs/Module/Events.php:25
+msgid "Calendar entries imported."
 msgstr ""
 
-#: ../../Zotlabs/Module/Chanview.php:134
-msgid "toggle full screen mode"
+#: ../../Zotlabs/Module/Events.php:27
+msgid "No calendar entries found."
 msgstr ""
 
-#: ../../Zotlabs/Module/Follow.php:31
-msgid "Channel added."
+#: ../../Zotlabs/Module/Events.php:106
+msgid "Event can not end before it has started."
 msgstr ""
 
-#: ../../Zotlabs/Module/Mail.php:66
-msgid "Unable to lookup recipient."
+#: ../../Zotlabs/Module/Events.php:108 ../../Zotlabs/Module/Events.php:117
+#: ../../Zotlabs/Module/Events.php:139
+msgid "Unable to generate preview."
 msgstr ""
 
-#: ../../Zotlabs/Module/Mail.php:73
-msgid "Unable to communicate with requested channel."
+#: ../../Zotlabs/Module/Events.php:115
+msgid "Event title and start time are required."
 msgstr ""
 
-#: ../../Zotlabs/Module/Mail.php:80
-msgid "Cannot verify requested channel."
+#: ../../Zotlabs/Module/Events.php:137 ../../Zotlabs/Module/Events.php:261
+msgid "Event not found."
 msgstr ""
 
-#: ../../Zotlabs/Module/Mail.php:98
-msgid "Selected channel has private message restrictions. Send failed."
+#: ../../Zotlabs/Module/Events.php:453
+msgid "Edit event title"
 msgstr ""
 
-#: ../../Zotlabs/Module/Mail.php:177
-msgid "Messages"
+#: ../../Zotlabs/Module/Events.php:453
+#: ../../extend/addon/addon/cdav/Mod_Cdav.php:835
+msgid "Event title"
 msgstr ""
 
-#: ../../Zotlabs/Module/Mail.php:212
-msgid "Message recalled."
+#: ../../Zotlabs/Module/Events.php:453 ../../Zotlabs/Module/Events.php:458
+#: ../../Zotlabs/Module/Appman.php:116 ../../Zotlabs/Module/Appman.php:117
+#: ../../Zotlabs/Module/Profiles.php:703 ../../Zotlabs/Module/Profiles.php:707
+#: ../../include/datetime.php:259
+msgid "Required"
 msgstr ""
 
-#: ../../Zotlabs/Module/Mail.php:225
-msgid "Conversation removed."
+#: ../../Zotlabs/Module/Events.php:455
+msgid "Categories (comma-separated list)"
 msgstr ""
 
-#: ../../Zotlabs/Module/Mail.php:239 ../../Zotlabs/Module/Mail.php:348
-#: ../../Zotlabs/Module/Chat.php:205 ../../include/conversation.php:1182
-msgid "Please enter a link URL:"
+#: ../../Zotlabs/Module/Events.php:456
+msgid "Edit Category"
 msgstr ""
 
-#: ../../Zotlabs/Module/Mail.php:240 ../../Zotlabs/Module/Mail.php:349
-msgid "Expires YYYY-MM-DD HH:MM"
+#: ../../Zotlabs/Module/Events.php:456
+msgid "Category"
 msgstr ""
 
-#: ../../Zotlabs/Module/Mail.php:268
-msgid "Requested channel is not in this network"
+#: ../../Zotlabs/Module/Events.php:459
+msgid "Edit start date and time"
 msgstr ""
 
-#: ../../Zotlabs/Module/Mail.php:276
-msgid "Send Private Message"
+#: ../../Zotlabs/Module/Events.php:459
+#: ../../extend/addon/addon/cdav/Mod_Cdav.php:836
+msgid "Start date and time"
 msgstr ""
 
-#: ../../Zotlabs/Module/Mail.php:277 ../../Zotlabs/Module/Mail.php:402
-msgid "To:"
+#: ../../Zotlabs/Module/Events.php:460 ../../Zotlabs/Module/Events.php:463
+msgid "Finish date and time are not known or not relevant"
 msgstr ""
 
-#: ../../Zotlabs/Module/Mail.php:280 ../../Zotlabs/Module/Mail.php:404
-msgid "Subject:"
+#: ../../Zotlabs/Module/Events.php:462
+msgid "Edit finish date and time"
 msgstr ""
 
-#: ../../Zotlabs/Module/Mail.php:283 ../../Zotlabs/Module/Invite.php:138
-msgid "Your message:"
+#: ../../Zotlabs/Module/Events.php:462
+msgid "Finish date and time"
 msgstr ""
 
-#: ../../Zotlabs/Module/Mail.php:285 ../../Zotlabs/Module/Mail.php:410
-#: ../../include/conversation.php:1242
-msgid "Attach file"
+#: ../../Zotlabs/Module/Events.php:464 ../../Zotlabs/Module/Events.php:465
+msgid "Adjust for viewer timezone"
 msgstr ""
 
-#: ../../Zotlabs/Module/Mail.php:287
-msgid "Send"
+#: ../../Zotlabs/Module/Events.php:464
+msgid ""
+"Important for events that happen in a particular place. Not practical for "
+"global holidays."
 msgstr ""
 
-#: ../../Zotlabs/Module/Mail.php:290 ../../Zotlabs/Module/Mail.php:415
-#: ../../include/conversation.php:1287
-msgid "Set expiration date"
+#: ../../Zotlabs/Module/Events.php:466
+msgid "Edit Description"
 msgstr ""
 
-#: ../../Zotlabs/Module/Mail.php:292 ../../Zotlabs/Module/Mail.php:417
-#: ../../Zotlabs/Module/Chat.php:206 ../../Zotlabs/Lib/ThreadItem.php:741
-#: ../../include/conversation.php:1292
-msgid "Encrypt text"
+#: ../../Zotlabs/Module/Events.php:466 ../../Zotlabs/Module/Appman.php:118
+#: ../../Zotlabs/Module/Rbmark.php:101
+#: ../../extend/addon/addon/cdav/Mod_Cdav.php:838
+#: ../../extend/addon/addon/rendezvous/rendezvous.php:165
+msgid "Description"
 msgstr ""
 
-#: ../../Zotlabs/Module/Mail.php:374
-msgid "Delete message"
+#: ../../Zotlabs/Module/Events.php:468
+msgid "Edit Location"
 msgstr ""
 
-#: ../../Zotlabs/Module/Mail.php:375
-msgid "Delivery report"
+#: ../../Zotlabs/Module/Events.php:472 ../../include/conversation.php:1410
+msgid "Permission settings"
 msgstr ""
 
-#: ../../Zotlabs/Module/Mail.php:376
-msgid "Recall message"
+#: ../../Zotlabs/Module/Events.php:485
+msgid "Advanced Options"
 msgstr ""
 
-#: ../../Zotlabs/Module/Mail.php:378
-msgid "Message has been recalled."
+#: ../../Zotlabs/Module/Events.php:624
+msgid "Edit event"
 msgstr ""
 
-#: ../../Zotlabs/Module/Mail.php:395
-msgid "Delete Conversation"
+#: ../../Zotlabs/Module/Events.php:626
+msgid "Delete event"
 msgstr ""
 
-#: ../../Zotlabs/Module/Mail.php:397
-msgid ""
-"No secure communications available. You <strong>may</strong> be able to "
-"respond from the sender's profile page."
+#: ../../Zotlabs/Module/Events.php:660
+msgid "calendar"
 msgstr ""
 
-#: ../../Zotlabs/Module/Mail.php:401
-msgid "Send Reply"
+#: ../../Zotlabs/Module/Events.php:685 ../../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
+#: ../../include/page_widgets.php:42
+msgid "View"
 msgstr ""
 
-#: ../../Zotlabs/Module/Mail.php:406
-#, php-format
-msgid "Your message for %s (%s):"
+#: ../../Zotlabs/Module/Events.php:686
+#: ../../extend/addon/addon/cdav/Mod_Cdav.php:849
+msgid "Month"
 msgstr ""
 
-#: ../../Zotlabs/Module/Impel.php:41 ../../include/bbcode.php:203
-msgid "webpage"
+#: ../../Zotlabs/Module/Events.php:687
+#: ../../extend/addon/addon/cdav/Mod_Cdav.php:850
+msgid "Week"
 msgstr ""
 
-#: ../../Zotlabs/Module/Impel.php:46 ../../include/bbcode.php:209
-msgid "block"
+#: ../../Zotlabs/Module/Events.php:688
+#: ../../extend/addon/addon/cdav/Mod_Cdav.php:851
+msgid "Day"
 msgstr ""
 
-#: ../../Zotlabs/Module/Impel.php:51 ../../include/bbcode.php:206
-msgid "layout"
+#: ../../Zotlabs/Module/Events.php:722
+msgid "Event removed"
 msgstr ""
 
-#: ../../Zotlabs/Module/Impel.php:58 ../../include/bbcode.php:212
-msgid "menu"
+#: ../../Zotlabs/Module/Events.php:725
+msgid "Failed to remove event"
 msgstr ""
 
-#: ../../Zotlabs/Module/Impel.php:191
+#: ../../Zotlabs/Module/Directory.php:245
 #, php-format
-msgid "%s element installed"
+msgid "%d rating"
+msgid_plural "%d ratings"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../../Zotlabs/Module/Directory.php:256
+msgid "Gender: "
 msgstr ""
 
-#: ../../Zotlabs/Module/Impel.php:194
-#, php-format
-msgid "%s element installation failed"
+#: ../../Zotlabs/Module/Directory.php:258
+msgid "Status: "
 msgstr ""
 
-#: ../../Zotlabs/Module/Import_items.php:42 ../../Zotlabs/Module/Import.php:71
-msgid "Nothing to import."
+#: ../../Zotlabs/Module/Directory.php:260
+msgid "Homepage: "
 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/Directory.php:309 ../../include/channel.php:1215
+msgid "Age:"
 msgstr ""
 
-#: ../../Zotlabs/Module/Import_items.php:72
-#: ../../Zotlabs/Module/Import.php:105
-msgid "Imported file is empty."
+#: ../../Zotlabs/Module/Directory.php:314 ../../include/event.php:52
+#: ../../include/event.php:84 ../../include/bb2diaspora.php:526
+#: ../../include/channel.php:1051
+msgid "Location:"
 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/Directory.php:320
+msgid "Description:"
 msgstr ""
 
-#: ../../Zotlabs/Module/Import_items.php:104
-msgid "Import completed"
+#: ../../Zotlabs/Module/Directory.php:325 ../../include/channel.php:1231
+msgid "Hometown:"
 msgstr ""
 
-#: ../../Zotlabs/Module/Import_items.php:119
-msgid "Import Items"
+#: ../../Zotlabs/Module/Directory.php:327 ../../include/channel.php:1239
+msgid "About:"
 msgstr ""
 
-#: ../../Zotlabs/Module/Import_items.php:120
-msgid "Use this form to import existing posts and content from an export file."
+#: ../../Zotlabs/Module/Directory.php:328 ../../Zotlabs/Module/Match.php:68
+#: ../../Zotlabs/Module/Suggest.php:56 ../../include/channel.php:1036
+#: ../../include/connections.php:78 ../../include/widgets.php:147
+#: ../../include/widgets.php:184 ../../include/conversation.php:938
+#: ../../include/conversation.php:1069
+msgid "Connect"
 msgstr ""
 
-#: ../../Zotlabs/Module/Import_items.php:121
-#: ../../Zotlabs/Module/Import.php:532
-msgid "File to Upload"
+#: ../../Zotlabs/Module/Directory.php:329
+msgid "Public Forum:"
 msgstr ""
 
-#: ../../Zotlabs/Module/Invite.php:29
-msgid "Total invitation limit exceeded."
+#: ../../Zotlabs/Module/Directory.php:332
+msgid "Keywords: "
 msgstr ""
 
-#: ../../Zotlabs/Module/Invite.php:53
-#, php-format
-msgid "%s : Not a valid email address."
+#: ../../Zotlabs/Module/Directory.php:335
+msgid "Don't suggest"
 msgstr ""
 
-#: ../../Zotlabs/Module/Invite.php:67
-msgid "Please join us on $Projectname"
+#: ../../Zotlabs/Module/Directory.php:337
+msgid "Common connections:"
 msgstr ""
 
-#: ../../Zotlabs/Module/Invite.php:77
-msgid "Invitation limit exceeded. Please contact your site administrator."
+#: ../../Zotlabs/Module/Directory.php:386
+msgid "Global Directory"
 msgstr ""
 
-#: ../../Zotlabs/Module/Invite.php:82
-#, php-format
-msgid "%s : Message delivery failed."
+#: ../../Zotlabs/Module/Directory.php:386
+msgid "Local Directory"
 msgstr ""
 
-#: ../../Zotlabs/Module/Invite.php:86
-#, php-format
-msgid "%d message sent."
-msgid_plural "%d messages sent."
-msgstr[0] ""
-msgstr[1] ""
+#: ../../Zotlabs/Module/Directory.php:392
+msgid "Finding:"
+msgstr ""
 
-#: ../../Zotlabs/Module/Invite.php:105
-msgid "You have no more invitations available"
+#: ../../Zotlabs/Module/Directory.php:395 ../../Zotlabs/Module/Suggest.php:64
+#: ../../include/contact_widgets.php:24
+msgid "Channel Suggestions"
 msgstr ""
 
-#: ../../Zotlabs/Module/Invite.php:136
-msgid "Send invitations"
+#: ../../Zotlabs/Module/Directory.php:397
+msgid "next page"
 msgstr ""
 
-#: ../../Zotlabs/Module/Invite.php:137
-msgid "Enter email addresses, one per line:"
+#: ../../Zotlabs/Module/Directory.php:397
+msgid "previous page"
 msgstr ""
 
-#: ../../Zotlabs/Module/Invite.php:139
-msgid "Please join my community on $Projectname."
+#: ../../Zotlabs/Module/Directory.php:398
+msgid "Sort options"
 msgstr ""
 
-#: ../../Zotlabs/Module/Invite.php:141
-msgid "You will need to supply this invitation code:"
+#: ../../Zotlabs/Module/Directory.php:399
+msgid "Alphabetic"
 msgstr ""
 
-#: ../../Zotlabs/Module/Invite.php:142
-msgid "1. Register at any $Projectname location (they are all inter-connected)"
+#: ../../Zotlabs/Module/Directory.php:400
+msgid "Reverse Alphabetic"
 msgstr ""
 
-#: ../../Zotlabs/Module/Invite.php:144
-msgid "2. Enter my $Projectname network address into the site searchbar."
+#: ../../Zotlabs/Module/Directory.php:401
+msgid "Newest to Oldest"
 msgstr ""
 
-#: ../../Zotlabs/Module/Invite.php:145
-msgid "or visit"
+#: ../../Zotlabs/Module/Directory.php:402
+msgid "Oldest to Newest"
 msgstr ""
 
-#: ../../Zotlabs/Module/Invite.php:147
-msgid "3. Click [Connect]"
+#: ../../Zotlabs/Module/Directory.php:419
+msgid "No entries (some entries may be hidden)."
 msgstr ""
 
-#: ../../Zotlabs/Module/Editblock.php:108 ../../Zotlabs/Module/Blocks.php:97
-#: ../../Zotlabs/Module/Blocks.php:155
-msgid "Block Name"
+#: ../../Zotlabs/Module/Impel.php:41 ../../include/bbcode.php:203
+msgid "webpage"
 msgstr ""
 
-#: ../../Zotlabs/Module/Editblock.php:124 ../../include/conversation.php:1258
-msgid "Title (optional)"
+#: ../../Zotlabs/Module/Impel.php:46 ../../include/bbcode.php:209
+msgid "block"
 msgstr ""
 
-#: ../../Zotlabs/Module/Editblock.php:133
-msgid "Edit Block"
+#: ../../Zotlabs/Module/Impel.php:51 ../../include/bbcode.php:206
+msgid "layout"
 msgstr ""
 
-#: ../../Zotlabs/Module/Group.php:24
-msgid "Privacy group created."
+#: ../../Zotlabs/Module/Impel.php:58 ../../include/bbcode.php:212
+msgid "menu"
 msgstr ""
 
-#: ../../Zotlabs/Module/Group.php:30
-msgid "Could not create privacy group."
+#: ../../Zotlabs/Module/Impel.php:191
+#, php-format
+msgid "%s element installed"
 msgstr ""
 
-#: ../../Zotlabs/Module/Group.php:42 ../../Zotlabs/Module/Group.php:141
-#: ../../include/items.php:3876
-msgid "Privacy group not found."
+#: ../../Zotlabs/Module/Impel.php:194
+#, php-format
+msgid "%s element installation failed"
 msgstr ""
 
-#: ../../Zotlabs/Module/Group.php:58
-msgid "Privacy group updated."
+#: ../../Zotlabs/Module/Import_items.php:104
+msgid "Import completed"
 msgstr ""
 
-#: ../../Zotlabs/Module/Group.php:90
-msgid "Create a group of channels."
+#: ../../Zotlabs/Module/Import_items.php:119
+msgid "Import Items"
 msgstr ""
 
-#: ../../Zotlabs/Module/Group.php:91 ../../Zotlabs/Module/Group.php:184
-msgid "Privacy group name: "
+#: ../../Zotlabs/Module/Import_items.php:120
+msgid "Use this form to import existing posts and content from an export file."
 msgstr ""
 
-#: ../../Zotlabs/Module/Group.php:93 ../../Zotlabs/Module/Group.php:187
-msgid "Members are visible to other channels"
+#: ../../Zotlabs/Module/Lockview.php:75
+msgid "Remote privacy information not available."
 msgstr ""
 
-#: ../../Zotlabs/Module/Group.php:111
-msgid "Privacy group removed."
+#: ../../Zotlabs/Module/Lockview.php:96
+msgid "Visible to:"
 msgstr ""
 
-#: ../../Zotlabs/Module/Group.php:113
-msgid "Unable to remove privacy group."
+#: ../../Zotlabs/Module/Follow.php:31
+msgid "Channel added."
 msgstr ""
 
-#: ../../Zotlabs/Module/Group.php:183
-msgid "Privacy group editor"
+#: ../../Zotlabs/Module/Item.php:184
+msgid "Unable to locate original post."
 msgstr ""
 
-#: ../../Zotlabs/Module/Group.php:199
-msgid "All Connected Channels"
+#: ../../Zotlabs/Module/Item.php:447
+msgid "Empty post discarded."
 msgstr ""
 
-#: ../../Zotlabs/Module/Group.php:231
-msgid "Click on a channel to add or remove."
+#: ../../Zotlabs/Module/Item.php:489
+msgid "Executable content type not permitted to this channel."
 msgstr ""
 
-#: ../../Zotlabs/Module/Profperm.php:34 ../../Zotlabs/Module/Profperm.php:63
-msgid "Invalid profile identifier."
+#: ../../Zotlabs/Module/Item.php:837
+msgid "Duplicate post suppressed."
 msgstr ""
 
-#: ../../Zotlabs/Module/Profperm.php:115
-msgid "Profile Visibility Editor"
+#: ../../Zotlabs/Module/Item.php:979
+msgid "System error. Post not saved."
 msgstr ""
 
-#: ../../Zotlabs/Module/Profperm.php:117 ../../include/channel.php:1282
-msgid "Profile"
+#: ../../Zotlabs/Module/Item.php:1111
+msgid "Unable to obtain post information from database."
 msgstr ""
 
-#: ../../Zotlabs/Module/Profperm.php:119
-msgid "Click on a contact to add or remove."
+#: ../../Zotlabs/Module/Item.php:1118
+#, php-format
+msgid "You have reached your limit of %1$.0f top level posts."
 msgstr ""
 
-#: ../../Zotlabs/Module/Profperm.php:128
-msgid "Visible To"
+#: ../../Zotlabs/Module/Item.php:1125
+#, php-format
+msgid "You have reached your limit of %1$.0f webpages."
 msgstr ""
 
 #: ../../Zotlabs/Module/Magic.php:71
@@ -3794,10 +4160,33 @@ msgstr ""
 msgid "Link text"
 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/Ratings.php:70
 msgid "No ratings"
 msgstr ""
 
+#: ../../Zotlabs/Module/Ratings.php:97 ../../Zotlabs/Module/Pubsites.php:35
+#: ../../include/conversation.php:941 ../../include/conversation.php:1099
+msgid "Ratings"
+msgstr ""
+
 #: ../../Zotlabs/Module/Ratings.php:98
 msgid "Rating: "
 msgstr ""
@@ -3828,326 +4217,87 @@ msgstr ""
 msgid "Set your current mood and tell your friends"
 msgstr ""
 
-#: ../../Zotlabs/Module/Notify.php:57
-#: ../../Zotlabs/Module/Notifications.php:35
-msgid "No more system notifications."
-msgstr ""
-
-#: ../../Zotlabs/Module/Notify.php:61
-#: ../../Zotlabs/Module/Notifications.php:39
-msgid "System Notifications"
-msgstr ""
-
-#: ../../Zotlabs/Module/Photos.php:82
-msgid "Page owner information could not be retrieved."
-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"
-msgstr ""
-
-#: ../../Zotlabs/Module/Photos.php:103 ../../Zotlabs/Module/Photos.php:129
-msgid "Album not found."
-msgstr ""
-
-#: ../../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/Photos.php:190 ../../Zotlabs/Module/Photos.php:1059
-msgid "Delete Photo"
-msgstr ""
-
-#: ../../Zotlabs/Module/Photos.php:520
-msgid "No photos selected"
-msgstr ""
-
-#: ../../Zotlabs/Module/Photos.php:569
-msgid "Access to this item is restricted."
-msgstr ""
-
-#: ../../Zotlabs/Module/Photos.php:608
-#, php-format
-msgid "%1$.2f MB of %2$.2f MB photo storage used."
-msgstr ""
-
-#: ../../Zotlabs/Module/Photos.php:611
-#, php-format
-msgid "%1$.2f MB photo storage used."
-msgstr ""
-
-#: ../../Zotlabs/Module/Photos.php:647
-msgid "Upload Photos"
-msgstr ""
-
-#: ../../Zotlabs/Module/Photos.php:651
-msgid "Enter an album name"
-msgstr ""
-
-#: ../../Zotlabs/Module/Photos.php:652
-msgid "or select an existing album (doubleclick)"
-msgstr ""
-
-#: ../../Zotlabs/Module/Photos.php:653
-msgid "Create a status post for this upload"
-msgstr ""
-
-#: ../../Zotlabs/Module/Photos.php:654
-msgid "Caption (optional):"
-msgstr ""
-
-#: ../../Zotlabs/Module/Photos.php:655
-msgid "Description (optional):"
-msgstr ""
-
-#: ../../Zotlabs/Module/Photos.php:686
-msgid "Album name could not be decoded"
-msgstr ""
-
-#: ../../Zotlabs/Module/Photos.php:734
-msgid "Contact Photos"
-msgstr ""
-
-#: ../../Zotlabs/Module/Photos.php:757
-msgid "Show Newest First"
-msgstr ""
-
-#: ../../Zotlabs/Module/Photos.php:759
-msgid "Show Oldest First"
-msgstr ""
-
-#: ../../Zotlabs/Module/Photos.php:783 ../../Zotlabs/Module/Photos.php:1337
-#: ../../Zotlabs/Module/Embedphotos.php:139 ../../include/widgets.php:1678
-msgid "View Photo"
-msgstr ""
-
-#: ../../Zotlabs/Module/Photos.php:814
-#: ../../Zotlabs/Module/Embedphotos.php:155 ../../include/widgets.php:1695
-msgid "Edit Album"
-msgstr ""
-
-#: ../../Zotlabs/Module/Photos.php:861
-msgid "Permission denied. Access to this item may be restricted."
-msgstr ""
-
-#: ../../Zotlabs/Module/Photos.php:863
-msgid "Photo not available"
-msgstr ""
-
-#: ../../Zotlabs/Module/Photos.php:921
-msgid "Use as profile photo"
-msgstr ""
-
-#: ../../Zotlabs/Module/Photos.php:922
-msgid "Use as cover photo"
-msgstr ""
-
-#: ../../Zotlabs/Module/Photos.php:929
-msgid "Private Photo"
-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"
-msgstr ""
-
-#: ../../Zotlabs/Module/Photos.php:944
-msgid "View Full Size"
-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"
-msgstr ""
-
-#: ../../Zotlabs/Module/Photos.php:1033
-msgid "Edit photo"
-msgstr ""
-
-#: ../../Zotlabs/Module/Photos.php:1035
-msgid "Rotate CW (right)"
-msgstr ""
-
-#: ../../Zotlabs/Module/Photos.php:1036
-msgid "Rotate CCW (left)"
-msgstr ""
-
-#: ../../Zotlabs/Module/Photos.php:1039
-msgid "Move photo to album"
-msgstr ""
-
-#: ../../Zotlabs/Module/Photos.php:1040
-msgid "Enter a new album name"
-msgstr ""
-
-#: ../../Zotlabs/Module/Photos.php:1041
-msgid "or select an existing one (doubleclick)"
-msgstr ""
-
-#: ../../Zotlabs/Module/Photos.php:1044
-msgid "Caption"
-msgstr ""
-
-#: ../../Zotlabs/Module/Photos.php:1046
-msgid "Add a Tag"
-msgstr ""
-
-#: ../../Zotlabs/Module/Photos.php:1054
-msgid "Example: @bob, @Barbara_Jensen, @jim@example.com"
-msgstr ""
-
-#: ../../Zotlabs/Module/Photos.php:1057
-msgid "Flag as adult in album view"
-msgstr ""
-
-#: ../../Zotlabs/Module/Photos.php:1076 ../../Zotlabs/Lib/ThreadItem.php:268
-msgid "I like this (toggle)"
-msgstr ""
-
-#: ../../Zotlabs/Module/Photos.php:1077 ../../Zotlabs/Lib/ThreadItem.php:269
-msgid "I don't like this (toggle)"
-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:1230
-msgid "Share"
-msgstr ""
-
-#: ../../Zotlabs/Module/Photos.php:1079 ../../Zotlabs/Lib/ThreadItem.php:409
-#: ../../include/conversation.php:737
-msgid "Please wait"
-msgstr ""
-
-#: ../../Zotlabs/Module/Photos.php:1095 ../../Zotlabs/Module/Photos.php:1213
-#: ../../Zotlabs/Lib/ThreadItem.php:726
-msgid "This is you"
+#: ../../Zotlabs/Module/Ping.php:254
+msgid "sent you a private message"
 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/Ping.php:302
+msgid "added your channel"
 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:1199
-msgid "Preview"
+#: ../../Zotlabs/Module/Ping.php:312
+msgid "g A l F d"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:1113 ../../include/conversation.php:577
-msgctxt "title"
-msgid "Likes"
+#: ../../Zotlabs/Module/Ping.php:330
+msgid "[today]"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:1113 ../../include/conversation.php:577
-msgctxt "title"
-msgid "Dislikes"
+#: ../../Zotlabs/Module/Ping.php:339
+msgid "posted an event"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:1114 ../../include/conversation.php:578
-msgctxt "title"
-msgid "Agree"
+#: ../../Zotlabs/Module/Notify.php:57
+#: ../../Zotlabs/Module/Notifications.php:35
+msgid "No more system notifications."
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:1114 ../../include/conversation.php:578
-msgctxt "title"
-msgid "Disagree"
+#: ../../Zotlabs/Module/Notify.php:61
+#: ../../Zotlabs/Module/Notifications.php:39
+msgid "System Notifications"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:1114 ../../include/conversation.php:578
-msgctxt "title"
-msgid "Abstain"
+#: ../../Zotlabs/Module/Group.php:24
+msgid "Privacy group created."
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:1115 ../../include/conversation.php:579
-msgctxt "title"
-msgid "Attending"
+#: ../../Zotlabs/Module/Group.php:30
+msgid "Could not create privacy group."
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:1115 ../../include/conversation.php:579
-msgctxt "title"
-msgid "Not attending"
+#: ../../Zotlabs/Module/Group.php:42 ../../Zotlabs/Module/Group.php:141
+#: ../../include/items.php:3876
+msgid "Privacy group not found."
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:1115 ../../include/conversation.php:579
-msgctxt "title"
-msgid "Might attend"
+#: ../../Zotlabs/Module/Group.php:58
+msgid "Privacy group updated."
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:1132 ../../Zotlabs/Module/Photos.php:1144
-#: ../../Zotlabs/Lib/ThreadItem.php:186 ../../Zotlabs/Lib/ThreadItem.php:198
-#: ../../include/conversation.php:1765
-msgid "View all"
+#: ../../Zotlabs/Module/Group.php:90
+msgid "Create a group of channels."
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:1136 ../../Zotlabs/Lib/ThreadItem.php:190
-#: ../../include/channel.php:1190 ../../include/taxonomy.php:403
-#: ../../include/conversation.php:1789
-msgctxt "noun"
-msgid "Like"
-msgid_plural "Likes"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../../Zotlabs/Module/Photos.php:1141 ../../Zotlabs/Lib/ThreadItem.php:195
-#: ../../include/conversation.php:1792
-msgctxt "noun"
-msgid "Dislike"
-msgid_plural "Dislikes"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../../Zotlabs/Module/Photos.php:1241
-msgid "Photo Tools"
+#: ../../Zotlabs/Module/Group.php:91 ../../Zotlabs/Module/Group.php:184
+msgid "Privacy group name: "
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:1250
-msgid "In This Photo:"
+#: ../../Zotlabs/Module/Group.php:93 ../../Zotlabs/Module/Group.php:187
+msgid "Members are visible to other channels"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:1255
-msgid "Map"
+#: ../../Zotlabs/Module/Group.php:111
+msgid "Privacy group removed."
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:1263 ../../Zotlabs/Lib/ThreadItem.php:398
-msgctxt "noun"
-msgid "Likes"
+#: ../../Zotlabs/Module/Group.php:113
+msgid "Unable to remove privacy group."
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:1264 ../../Zotlabs/Lib/ThreadItem.php:399
-msgctxt "noun"
-msgid "Dislikes"
+#: ../../Zotlabs/Module/Group.php:183
+msgid "Privacy group editor"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:1269 ../../Zotlabs/Lib/ThreadItem.php:404
-#: ../../include/acl_selectors.php:210
-msgid "Close"
+#: ../../Zotlabs/Module/Group.php:197 ../../Zotlabs/Module/Help.php:81
+msgid "Members"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:1343
-msgid "View Album"
+#: ../../Zotlabs/Module/Group.php:199
+msgid "All Connected Channels"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:1354 ../../Zotlabs/Module/Photos.php:1367
-#: ../../Zotlabs/Module/Photos.php:1368
-msgid "Recent Photos"
+#: ../../Zotlabs/Module/Group.php:231
+msgid "Click on a channel to add or remove."
 msgstr ""
 
 #: ../../Zotlabs/Module/Setup.php:176
@@ -4583,14 +4733,6 @@ 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 ""
@@ -4607,12 +4749,22 @@ msgid ""
 "or <a href=\"import\">import an existing channel</a> from another location."
 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/Notifications.php:40 ../../include/nav.php:194
 msgid "Mark all system notifications seen"
 msgstr ""
 
 #: ../../Zotlabs/Module/Poke.php:168 ../../Zotlabs/Lib/Apps.php:230
-#: ../../include/conversation.php:941
+#: ../../include/conversation.php:942 ../../include/conversation.php:1109
 msgid "Poke"
 msgstr ""
 
@@ -4640,6 +4792,414 @@ msgstr ""
 msgid "Make this post private"
 msgstr ""
 
+#: ../../Zotlabs/Module/Pubsites.php:24 ../../include/widgets.php:1385
+msgid "Public Hubs"
+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."
+msgstr ""
+
+#: ../../Zotlabs/Module/Pubsites.php:33
+msgid "Hub URL"
+msgstr ""
+
+#: ../../Zotlabs/Module/Pubsites.php:33
+msgid "Access Type"
+msgstr ""
+
+#: ../../Zotlabs/Module/Pubsites.php:33
+msgid "Registration Policy"
+msgstr ""
+
+#: ../../Zotlabs/Module/Pubsites.php:33
+msgid "Stats"
+msgstr ""
+
+#: ../../Zotlabs/Module/Pubsites.php:33
+msgid "Software"
+msgstr ""
+
+#: ../../Zotlabs/Module/Pubsites.php:48
+msgid "Rate"
+msgstr ""
+
+#: ../../Zotlabs/Module/Oexchange.php:27
+msgid "Unable to find your hub."
+msgstr ""
+
+#: ../../Zotlabs/Module/Oexchange.php:41
+msgid "Post successful."
+msgstr ""
+
+#: ../../Zotlabs/Module/Pconfig.php:26 ../../Zotlabs/Module/Pconfig.php:59
+msgid "This setting requires special processing and editing has been blocked."
+msgstr ""
+
+#: ../../Zotlabs/Module/Pconfig.php:48
+msgid "Configuration Editor"
+msgstr ""
+
+#: ../../Zotlabs/Module/Pconfig.php:49
+msgid ""
+"Warning: Changing some settings could render your channel inoperable. Please "
+"leave this page unless you are comfortable with and knowledgeable about how "
+"to correctly use this feature."
+msgstr ""
+
+#: ../../Zotlabs/Module/Appman.php:37 ../../Zotlabs/Module/Appman.php:53
+msgid "App installed."
+msgstr ""
+
+#: ../../Zotlabs/Module/Appman.php:46
+msgid "Malformed app."
+msgstr ""
+
+#: ../../Zotlabs/Module/Appman.php:105
+msgid "Embed code"
+msgstr ""
+
+#: ../../Zotlabs/Module/Appman.php:111 ../../include/widgets.php:107
+msgid "Edit App"
+msgstr ""
+
+#: ../../Zotlabs/Module/Appman.php:111
+msgid "Create App"
+msgstr ""
+
+#: ../../Zotlabs/Module/Appman.php:116
+msgid "Name of app"
+msgstr ""
+
+#: ../../Zotlabs/Module/Appman.php:117
+msgid "Location (URL) of app"
+msgstr ""
+
+#: ../../Zotlabs/Module/Appman.php:119
+msgid "Photo icon URL"
+msgstr ""
+
+#: ../../Zotlabs/Module/Appman.php:119
+msgid "80 x 80 pixels - optional"
+msgstr ""
+
+#: ../../Zotlabs/Module/Appman.php:120
+msgid "Categories (optional, comma separated list)"
+msgstr ""
+
+#: ../../Zotlabs/Module/Appman.php:121
+msgid "Version ID"
+msgstr ""
+
+#: ../../Zotlabs/Module/Appman.php:122
+msgid "Price of app"
+msgstr ""
+
+#: ../../Zotlabs/Module/Appman.php:123
+msgid "Location (URL) to purchase app"
+msgstr ""
+
+#: ../../Zotlabs/Module/Blocks.php:154 ../../include/text.php:2283
+msgid "Blocks"
+msgstr ""
+
+#: ../../Zotlabs/Module/Blocks.php:156
+msgid "Block Title"
+msgstr ""
+
+#: ../../Zotlabs/Module/Layouts.php:183 ../../include/text.php:2285
+msgid "Layouts"
+msgstr ""
+
+#: ../../Zotlabs/Module/Layouts.php:185 ../../Zotlabs/Lib/Apps.php:227
+#: ../../include/nav.php:162 ../../include/help.php:53
+#: ../../include/help.php:59
+msgid "Help"
+msgstr ""
+
+#: ../../Zotlabs/Module/Layouts.php:185
+msgid "Comanche page description language help"
+msgstr ""
+
+#: ../../Zotlabs/Module/Layouts.php:189
+msgid "Layout Description"
+msgstr ""
+
+#: ../../Zotlabs/Module/Layouts.php:194
+msgid "Download PDL file"
+msgstr ""
+
+#: ../../Zotlabs/Module/Rate.php:156
+msgid "Website:"
+msgstr ""
+
+#: ../../Zotlabs/Module/Rate.php:159
+#, php-format
+msgid "Remote Channel [%s] (not yet known on this site)"
+msgstr ""
+
+#: ../../Zotlabs/Module/Rate.php:160
+msgid "Rating (this information is public)"
+msgstr ""
+
+#: ../../Zotlabs/Module/Rate.php:161
+msgid "Optionally explain your rating (this information is public)"
+msgstr ""
+
+#: ../../Zotlabs/Module/Mail.php:65
+msgid "Unable to lookup recipient."
+msgstr ""
+
+#: ../../Zotlabs/Module/Mail.php:72
+msgid "Unable to communicate with requested channel."
+msgstr ""
+
+#: ../../Zotlabs/Module/Mail.php:79
+msgid "Cannot verify requested channel."
+msgstr ""
+
+#: ../../Zotlabs/Module/Mail.php:97
+msgid "Selected channel has private message restrictions. Send failed."
+msgstr ""
+
+#: ../../Zotlabs/Module/Mail.php:178
+msgid "Messages"
+msgstr ""
+
+#: ../../Zotlabs/Module/Mail.php:213
+msgid "Message recalled."
+msgstr ""
+
+#: ../../Zotlabs/Module/Mail.php:226
+msgid "Conversation removed."
+msgstr ""
+
+#: ../../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/Mail.php:241 ../../Zotlabs/Module/Mail.php:350
+msgid "Expires YYYY-MM-DD HH:MM"
+msgstr ""
+
+#: ../../Zotlabs/Module/Mail.php:269
+msgid "Requested channel is not in this network"
+msgstr ""
+
+#: ../../Zotlabs/Module/Mail.php:277
+msgid "Send Private Message"
+msgstr ""
+
+#: ../../Zotlabs/Module/Mail.php:278 ../../Zotlabs/Module/Mail.php:403
+msgid "To:"
+msgstr ""
+
+#: ../../Zotlabs/Module/Mail.php:281 ../../Zotlabs/Module/Mail.php:405
+msgid "Subject:"
+msgstr ""
+
+#: ../../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/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 ""
+"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/Profile_photo.php:186
+#: ../../extend/addon/addon/openclipatar/openclipatar.php:293
+msgid ""
+"Shift-reload the page or clear browser cache if the new photo does not "
+"display immediately."
+msgstr ""
+
+#: ../../Zotlabs/Module/Profile_photo.php:409
+msgid "Use Photo for Profile"
+msgstr ""
+
+#: ../../Zotlabs/Module/Profile_photo.php:409
+msgid "Upload Profile Photo"
+msgstr ""
+
+#: ../../Zotlabs/Module/Profile_photo.php:410
+#: ../../extend/addon/addon/openclipatar/openclipatar.php:181
+#: ../../extend/addon/addon/openclipatar/openclipatar.php:193
+msgid "Use"
+msgstr ""
+
+#: ../../Zotlabs/Module/Dreport.php:45
+msgid "Invalid message"
+msgstr ""
+
+#: ../../Zotlabs/Module/Dreport.php:78
+msgid "no results"
+msgstr ""
+
+#: ../../Zotlabs/Module/Dreport.php:93
+msgid "channel sync processed"
+msgstr ""
+
+#: ../../Zotlabs/Module/Dreport.php:97
+msgid "queued"
+msgstr ""
+
+#: ../../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/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:1962
+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/Common.php:14
+msgid "No channel."
+msgstr ""
+
+#: ../../Zotlabs/Module/Common.php:43
+msgid "Common connections"
+msgstr ""
+
+#: ../../Zotlabs/Module/Common.php:48
+msgid "No connections in common."
+msgstr ""
+
+#: ../../Zotlabs/Module/Apps.php:46 ../../include/nav.php:166
+#: ../../include/widgets.php:102
+msgid "Apps"
+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
@@ -4765,7 +5325,7 @@ msgid "Add profile things"
 msgstr ""
 
 #: ../../Zotlabs/Module/Profiles.php:691 ../../include/widgets.php:105
-#: ../../include/conversation.php:1567
+#: ../../include/conversation.php:1715
 msgid "Personal"
 msgstr ""
 
@@ -4829,11 +5389,6 @@ msgstr ""
 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 ""
@@ -4920,298 +5475,72 @@ msgstr ""
 msgid "Edit Profiles"
 msgstr ""
 
-#: ../../Zotlabs/Module/Oexchange.php:27
-msgid "Unable to find your hub."
-msgstr ""
-
-#: ../../Zotlabs/Module/Oexchange.php:41
-msgid "Post successful."
-msgstr ""
-
-#: ../../Zotlabs/Module/Pconfig.php:26 ../../Zotlabs/Module/Pconfig.php:59
-msgid "This setting requires special processing and editing has been blocked."
-msgstr ""
-
-#: ../../Zotlabs/Module/Pconfig.php:48
-msgid "Configuration Editor"
-msgstr ""
-
-#: ../../Zotlabs/Module/Pconfig.php:49
-msgid ""
-"Warning: Changing some settings could render your channel inoperable. Please "
-"leave this page unless you are comfortable with and knowledgeable about how "
-"to correctly use this feature."
-msgstr ""
-
-#: ../../Zotlabs/Module/Blocks.php:154 ../../include/text.php:2270
-msgid "Blocks"
-msgstr ""
-
-#: ../../Zotlabs/Module/Blocks.php:156
-msgid "Block Title"
-msgstr ""
-
-#: ../../Zotlabs/Module/Layouts.php:183 ../../include/text.php:2272
-msgid "Layouts"
-msgstr ""
-
-#: ../../Zotlabs/Module/Layouts.php:185 ../../Zotlabs/Lib/Apps.php:227
-#: ../../include/nav.php:162 ../../include/help.php:53
-#: ../../include/help.php:59
-msgid "Help"
-msgstr ""
-
-#: ../../Zotlabs/Module/Layouts.php:185
-msgid "Comanche page description language help"
-msgstr ""
-
-#: ../../Zotlabs/Module/Layouts.php:189
-msgid "Layout Description"
-msgstr ""
-
-#: ../../Zotlabs/Module/Layouts.php:194
-msgid "Download PDL file"
-msgstr ""
-
-#: ../../Zotlabs/Module/Rate.php:156
-msgid "Website:"
-msgstr ""
-
-#: ../../Zotlabs/Module/Rate.php:159
-#, php-format
-msgid "Remote Channel [%s] (not yet known on this site)"
-msgstr ""
-
-#: ../../Zotlabs/Module/Rate.php:160
-msgid "Rating (this information is public)"
-msgstr ""
-
-#: ../../Zotlabs/Module/Rate.php:161
-msgid "Optionally explain your rating (this information is public)"
-msgstr ""
-
-#: ../../Zotlabs/Module/Like.php:19
-msgid "Like/Dislike"
-msgstr ""
-
-#: ../../Zotlabs/Module/Like.php:24
-msgid "This action is restricted to members."
-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."
-msgstr ""
-
-#: ../../Zotlabs/Module/Like.php:105 ../../Zotlabs/Module/Like.php:131
-#: ../../Zotlabs/Module/Like.php:169
-msgid "Invalid request."
-msgstr ""
-
-#: ../../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/text.php:1940 ../../include/conversation.php:120
-msgid "photo"
-msgstr ""
-
-#: ../../Zotlabs/Module/Like.php:370 ../../Zotlabs/Module/Subthread.php:87
-#: ../../extend/addon/addon/diaspora/inbound.php:1794
-#: ../../include/text.php:1946 ../../include/conversation.php:148
-msgid "status"
-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"
-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/Profile_photo.php:186
-#: ../../extend/addon/addon/openclipatar/openclipatar.php:293
-msgid ""
-"Shift-reload the page or clear browser cache if the new photo does not "
-"display immediately."
-msgstr ""
-
-#: ../../Zotlabs/Module/Profile_photo.php:409
-msgid "Use Photo for Profile"
-msgstr ""
-
-#: ../../Zotlabs/Module/Profile_photo.php:409
-msgid "Upload Profile Photo"
-msgstr ""
-
-#: ../../Zotlabs/Module/Profile_photo.php:410
-#: ../../extend/addon/addon/openclipatar/openclipatar.php:181
-#: ../../extend/addon/addon/openclipatar/openclipatar.php:193
-msgid "Use"
-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/Common.php:14
-msgid "No channel."
-msgstr ""
-
-#: ../../Zotlabs/Module/Common.php:43
-msgid "Common connections"
-msgstr ""
-
-#: ../../Zotlabs/Module/Common.php:48
-msgid "No connections in common."
-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:"
+#: ../../Zotlabs/Module/Admin.php:94
+msgid "# Accounts"
 msgstr ""
 
-#: ../../Zotlabs/Module/Api.php:83
-msgid "Please login to continue."
+#: ../../Zotlabs/Module/Admin.php:95
+msgid "# blocked accounts"
 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/Admin.php:96
+msgid "# expired accounts"
 msgstr ""
 
-#: ../../Zotlabs/Module/Ping.php:254
-msgid "sent you a private message"
+#: ../../Zotlabs/Module/Admin.php:97
+msgid "# expiring accounts"
 msgstr ""
 
-#: ../../Zotlabs/Module/Ping.php:302
-msgid "added your channel"
+#: ../../Zotlabs/Module/Admin.php:108
+msgid "# Channels"
 msgstr ""
 
-#: ../../Zotlabs/Module/Ping.php:312
-msgid "g A l F d"
+#: ../../Zotlabs/Module/Admin.php:109
+msgid "# primary"
 msgstr ""
 
-#: ../../Zotlabs/Module/Ping.php:330
-msgid "[today]"
+#: ../../Zotlabs/Module/Admin.php:110
+msgid "# clones"
 msgstr ""
 
-#: ../../Zotlabs/Module/Ping.php:339
-msgid "posted an event"
+#: ../../Zotlabs/Module/Admin.php:116
+msgid "Message queues"
 msgstr ""
 
-#: ../../Zotlabs/Module/Siteinfo.php:20
-msgid "About this site"
+#: ../../Zotlabs/Module/Admin.php:133
+msgid "Your software should be updated"
 msgstr ""
 
-#: ../../Zotlabs/Module/Siteinfo.php:21
-msgid "Site Name"
+#: ../../Zotlabs/Module/Admin.php:138
+msgid "Summary"
 msgstr ""
 
-#: ../../Zotlabs/Module/Siteinfo.php:25 ../../include/network.php:1962
-msgid "Administrator"
+#: ../../Zotlabs/Module/Admin.php:141
+msgid "Registered accounts"
 msgstr ""
 
-#: ../../Zotlabs/Module/Siteinfo.php:28
-msgid "Software and Project information"
+#: ../../Zotlabs/Module/Admin.php:142
+msgid "Pending registrations"
 msgstr ""
 
-#: ../../Zotlabs/Module/Siteinfo.php:29
-msgid "This site is powered by $Projectname"
+#: ../../Zotlabs/Module/Admin.php:143
+msgid "Registered channels"
 msgstr ""
 
-#: ../../Zotlabs/Module/Siteinfo.php:30
-msgid ""
-"Federated and decentralised networking and identity services provided by Zot"
+#: ../../Zotlabs/Module/Admin.php:144
+msgid "Active plugins"
 msgstr ""
 
-#: ../../Zotlabs/Module/Siteinfo.php:32
-#, php-format
-msgid "Version %s"
+#: ../../Zotlabs/Module/Admin.php:145
+msgid "Version"
 msgstr ""
 
-#: ../../Zotlabs/Module/Siteinfo.php:33
-msgid "Project homepage"
+#: ../../Zotlabs/Module/Admin.php:146
+msgid "Repository version (master)"
 msgstr ""
 
-#: ../../Zotlabs/Module/Siteinfo.php:34
-msgid "Developer homepage"
+#: ../../Zotlabs/Module/Admin.php:147
+msgid "Repository version (dev)"
 msgstr ""
 
 #: ../../Zotlabs/Module/Lostpass.php:19
@@ -5303,8 +5632,8 @@ msgstr ""
 msgid "Or enter new bookmark folder name"
 msgstr ""
 
-#: ../../Zotlabs/Module/Dirsearch.php:33
-msgid "This directory server requires an access token"
+#: ../../Zotlabs/Module/Editpost.php:35
+msgid "Item is not editable"
 msgstr ""
 
 #: ../../Zotlabs/Module/Rmagic.php:35
@@ -5457,114 +5786,67 @@ msgid ""
 "or restore these in date order (oldest first)."
 msgstr ""
 
-#: ../../Zotlabs/Module/Cal.php:69
-msgid "Permissions denied."
-msgstr ""
-
-#: ../../Zotlabs/Module/Cal.php:263 ../../Zotlabs/Module/Events.php:596
-msgid "l, F j"
-msgstr ""
-
-#: ../../Zotlabs/Module/Cal.php:312 ../../Zotlabs/Module/Events.php:651
-#: ../../include/text.php:1748
-msgid "Link to Source"
-msgstr ""
-
-#: ../../Zotlabs/Module/Cal.php:335 ../../Zotlabs/Module/Events.php:679
-msgid "Edit Event"
-msgstr ""
-
-#: ../../Zotlabs/Module/Cal.php:335 ../../Zotlabs/Module/Events.php:679
-msgid "Create Event"
-msgstr ""
-
-#: ../../Zotlabs/Module/Cal.php:338 ../../Zotlabs/Module/Events.php:682
-msgid "Export"
-msgstr ""
-
-#: ../../Zotlabs/Module/Cal.php:341 ../../include/text.php:2294
-msgid "Import"
-msgstr ""
-
-#: ../../Zotlabs/Module/Cal.php:345 ../../Zotlabs/Module/Events.php:691
-#: ../../extend/addon/addon/cdav/Mod_Cdav.php:848
-msgid "Today"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin.php:94
-msgid "# Accounts"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin.php:95
-msgid "# blocked accounts"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin.php:96
-msgid "# expired accounts"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin.php:97
-msgid "# expiring accounts"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin.php:108
-msgid "# Channels"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin.php:109
-msgid "# primary"
+#: ../../Zotlabs/Module/Connect.php:61 ../../Zotlabs/Module/Connect.php:109
+msgid "Continue"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:110
-msgid "# clones"
+#: ../../Zotlabs/Module/Connect.php:90
+msgid "Premium Channel Setup"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:116
-msgid "Message queues"
+#: ../../Zotlabs/Module/Connect.php:92
+msgid "Enable premium channel connection restrictions"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:133
-msgid "Your software should be updated"
+#: ../../Zotlabs/Module/Connect.php:93
+msgid ""
+"Please enter your restrictions or conditions, such as paypal receipt, usage "
+"guidelines, etc."
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:138
-msgid "Summary"
+#: ../../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/Admin.php:141
-msgid "Registered accounts"
+#: ../../Zotlabs/Module/Connect.php:96
+msgid ""
+"Potential connections will then see the following text before proceeding:"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:142
-msgid "Pending registrations"
+#: ../../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/Admin.php:143
-msgid "Registered channels"
+#: ../../Zotlabs/Module/Connect.php:106
+msgid "(No specific instructions have been provided by the channel owner.)"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:144
-msgid "Active plugins"
+#: ../../Zotlabs/Module/Connect.php:114
+msgid "Restricted or Premium Channel"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:145
-msgid "Version"
+#: ../../Zotlabs/Module/Chanview.php:134
+msgid "toggle full screen mode"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:146
-msgid "Repository version (master)"
+#: ../../Zotlabs/Module/Match.php:26
+msgid "Profile Match"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:147
-msgid "Repository version (dev)"
+#: ../../Zotlabs/Module/Match.php:35
+msgid "No keywords to match. Please add keywords to your default profile."
 msgstr ""
 
-#: ../../Zotlabs/Module/Lockview.php:75
-msgid "Remote privacy information not available."
+#: ../../Zotlabs/Module/Match.php:67
+msgid "is interested in:"
 msgstr ""
 
-#: ../../Zotlabs/Module/Lockview.php:96
-msgid "Visible to:"
+#: ../../Zotlabs/Module/Match.php:74
+msgid "No matches"
 msgstr ""
 
 #: ../../Zotlabs/Module/Service_limits.php:23
@@ -5588,7 +5870,7 @@ msgid "Export selected"
 msgstr ""
 
 #: ../../Zotlabs/Module/Webpages.php:237 ../../Zotlabs/Lib/Apps.php:220
-#: ../../include/nav.php:109 ../../include/conversation.php:1727
+#: ../../include/nav.php:109 ../../include/conversation.php:1875
 msgid "Webpages"
 msgstr ""
 
@@ -5690,7 +5972,7 @@ msgid "Error downloading wiki: "
 msgstr ""
 
 #: ../../Zotlabs/Module/Wiki.php:139 ../../include/nav.php:111
-#: ../../include/conversation.php:1737
+#: ../../include/conversation.php:1885
 msgid "Wikis"
 msgstr ""
 
@@ -5738,24 +6020,24 @@ msgstr ""
 msgid "New page name"
 msgstr ""
 
-#: ../../Zotlabs/Module/Wiki.php:259 ../../include/conversation.php:1151
+#: ../../Zotlabs/Module/Wiki.php:259 ../../include/conversation.php:1299
 msgid "Embed image from photo albums"
 msgstr ""
 
-#: ../../Zotlabs/Module/Wiki.php:260 ../../include/conversation.php:1245
+#: ../../Zotlabs/Module/Wiki.php:260 ../../include/conversation.php:1393
 msgid "Embed an image from your albums"
 msgstr ""
 
-#: ../../Zotlabs/Module/Wiki.php:262 ../../include/conversation.php:1247
-#: ../../include/conversation.php:1294
+#: ../../Zotlabs/Module/Wiki.php:262 ../../include/conversation.php:1395
+#: ../../include/conversation.php:1442
 msgid "OK"
 msgstr ""
 
-#: ../../Zotlabs/Module/Wiki.php:263 ../../include/conversation.php:1187
+#: ../../Zotlabs/Module/Wiki.php:263 ../../include/conversation.php:1335
 msgid "Choose images to embed"
 msgstr ""
 
-#: ../../Zotlabs/Module/Wiki.php:264 ../../include/conversation.php:1188
+#: ../../Zotlabs/Module/Wiki.php:264 ../../include/conversation.php:1336
 msgid "Choose an album"
 msgstr ""
 
@@ -5763,15 +6045,15 @@ msgstr ""
 msgid "Choose a different album"
 msgstr ""
 
-#: ../../Zotlabs/Module/Wiki.php:266 ../../include/conversation.php:1190
+#: ../../Zotlabs/Module/Wiki.php:266 ../../include/conversation.php:1338
 msgid "Error getting album list"
 msgstr ""
 
-#: ../../Zotlabs/Module/Wiki.php:267 ../../include/conversation.php:1191
+#: ../../Zotlabs/Module/Wiki.php:267 ../../include/conversation.php:1339
 msgid "Error getting photo link"
 msgstr ""
 
-#: ../../Zotlabs/Module/Wiki.php:268 ../../include/conversation.php:1192
+#: ../../Zotlabs/Module/Wiki.php:268 ../../include/conversation.php:1340
 msgid "Error getting album"
 msgstr ""
 
@@ -5893,7 +6175,7 @@ msgstr ""
 msgid "post"
 msgstr ""
 
-#: ../../Zotlabs/Module/Tagger.php:57 ../../include/text.php:1948
+#: ../../Zotlabs/Module/Tagger.php:57 ../../include/text.php:1961
 #: ../../include/conversation.php:150
 msgid "comment"
 msgstr ""
@@ -5979,49 +6261,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 ""
@@ -6589,6 +6828,49 @@ msgstr ""
 msgid "Feature/Addon Settings"
 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/Tagrm.php:48 ../../Zotlabs/Module/Tagrm.php:98
 msgid "Tag removed"
 msgstr ""
@@ -6658,78 +6940,6 @@ msgstr ""
 msgid "Add Thing to your Profile"
 msgstr ""
 
-#: ../../Zotlabs/Module/Import.php:33
-#, php-format
-msgid "Your service plan only allows %d channels."
-msgstr ""
-
-#: ../../Zotlabs/Module/Import.php:157 ../../include/import.php:100
-msgid "Cloned channel not found. Import failed."
-msgstr ""
-
-#: ../../Zotlabs/Module/Import.php:167
-msgid "No channel. Import failed."
-msgstr ""
-
-#: ../../Zotlabs/Module/Import.php:503
-#: ../../include/Import/import_diaspora.php:142
-msgid "Import completed."
-msgstr ""
-
-#: ../../Zotlabs/Module/Import.php:525
-msgid "You must be logged in to use this feature."
-msgstr ""
-
-#: ../../Zotlabs/Module/Import.php:530
-msgid "Import Channel"
-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."
-msgstr ""
-
-#: ../../Zotlabs/Module/Import.php:533
-msgid "Or provide the old server/hub details"
-msgstr ""
-
-#: ../../Zotlabs/Module/Import.php:534
-msgid "Your old identity address (xyz@example.com)"
-msgstr ""
-
-#: ../../Zotlabs/Module/Import.php:535
-msgid "Your old login email address"
-msgstr ""
-
-#: ../../Zotlabs/Module/Import.php:536
-msgid "Your old login password"
-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."
-msgstr ""
-
-#: ../../Zotlabs/Module/Import.php:538
-msgid "Make this hub my primary location"
-msgstr ""
-
-#: ../../Zotlabs/Module/Import.php:539
-msgid ""
-"Import existing posts if possible (experimental - limited by available memory"
-msgstr ""
-
-#: ../../Zotlabs/Module/Import.php:540
-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/Viewconnections.php:65
 msgid "No connections."
 msgstr ""
@@ -6808,132 +7018,32 @@ 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"
-msgstr ""
-
-#: ../../Zotlabs/Module/Events.php:456
-msgid "Category"
-msgstr ""
-
-#: ../../Zotlabs/Module/Events.php:459
-msgid "Edit start date and time"
-msgstr ""
-
-#: ../../Zotlabs/Module/Events.php:459
-#: ../../extend/addon/addon/cdav/Mod_Cdav.php:836
-msgid "Start date and time"
-msgstr ""
-
-#: ../../Zotlabs/Module/Events.php:460 ../../Zotlabs/Module/Events.php:463
-msgid "Finish date and time are not known or not relevant"
-msgstr ""
-
-#: ../../Zotlabs/Module/Events.php:462
-msgid "Edit finish date and time"
-msgstr ""
-
-#: ../../Zotlabs/Module/Events.php:462
-msgid "Finish date and time"
-msgstr ""
-
-#: ../../Zotlabs/Module/Events.php:464 ../../Zotlabs/Module/Events.php:465
-msgid "Adjust for viewer timezone"
-msgstr ""
-
-#: ../../Zotlabs/Module/Events.php:464
-msgid ""
-"Important for events that happen in a particular place. Not practical for "
-"global holidays."
-msgstr ""
-
-#: ../../Zotlabs/Module/Events.php:466
-msgid "Edit Description"
-msgstr ""
-
-#: ../../Zotlabs/Module/Events.php:468
-msgid "Edit Location"
-msgstr ""
-
-#: ../../Zotlabs/Module/Events.php:472 ../../include/conversation.php:1262
-msgid "Permission settings"
-msgstr ""
-
-#: ../../Zotlabs/Module/Events.php:485
-msgid "Advanced Options"
-msgstr ""
-
-#: ../../Zotlabs/Module/Events.php:624
-msgid "Edit event"
-msgstr ""
-
-#: ../../Zotlabs/Module/Events.php:626
-msgid "Delete event"
+#: ../../Zotlabs/Module/Help.php:23
+msgid "Documentation Search"
 msgstr ""
 
-#: ../../Zotlabs/Module/Events.php:660
-msgid "calendar"
+#: ../../Zotlabs/Module/Help.php:80 ../../include/conversation.php:1813
+msgid "About"
 msgstr ""
 
-#: ../../Zotlabs/Module/Events.php:686
-#: ../../extend/addon/addon/cdav/Mod_Cdav.php:849
-msgid "Month"
+#: ../../Zotlabs/Module/Help.php:82
+msgid "Administrators"
 msgstr ""
 
-#: ../../Zotlabs/Module/Events.php:687
-#: ../../extend/addon/addon/cdav/Mod_Cdav.php:850
-msgid "Week"
+#: ../../Zotlabs/Module/Help.php:83
+msgid "Developers"
 msgstr ""
 
-#: ../../Zotlabs/Module/Events.php:688
-#: ../../extend/addon/addon/cdav/Mod_Cdav.php:851
-msgid "Day"
+#: ../../Zotlabs/Module/Help.php:84
+msgid "Tutorials"
 msgstr ""
 
-#: ../../Zotlabs/Module/Events.php:722
-msgid "Event removed"
+#: ../../Zotlabs/Module/Help.php:93
+msgid "$Projectname Documentation"
 msgstr ""
 
-#: ../../Zotlabs/Module/Events.php:725
-msgid "Failed to remove event"
+#: ../../Zotlabs/Module/Help.php:94
+msgid "Contents"
 msgstr ""
 
 #: ../../Zotlabs/Lib/Chatroom.php:27
@@ -6956,260 +7066,289 @@ msgstr ""
 msgid "Room is full"
 msgstr ""
 
-#: ../../Zotlabs/Lib/PermissionDescription.php:34
-#: ../../include/acl_selectors.php:128
-msgid "Visible to your default audience"
-msgstr ""
-
-#: ../../Zotlabs/Lib/PermissionDescription.php:107
-#: ../../include/acl_selectors.php:191
-msgid "Only me"
+#: ../../Zotlabs/Lib/Enotify.php:60 ../../include/network.php:1914
+msgid "$Projectname Notification"
 msgstr ""
 
-#: ../../Zotlabs/Lib/PermissionDescription.php:108
-msgid "Public"
+#: ../../Zotlabs/Lib/Enotify.php:61
+#: ../../extend/addon/addon/diaspora/util.php:218
+#: ../../extend/addon/addon/diaspora/util.php:231
+#: ../../extend/addon/addon/diaspora/p.php:46 ../../include/network.php:1915
+msgid "$projectname"
 msgstr ""
 
-#: ../../Zotlabs/Lib/PermissionDescription.php:109
-msgid "Anybody in the $Projectname network"
+#: ../../Zotlabs/Lib/Enotify.php:63 ../../include/network.php:1917
+msgid "Thank You,"
 msgstr ""
 
-#: ../../Zotlabs/Lib/PermissionDescription.php:110
+#: ../../Zotlabs/Lib/Enotify.php:65 ../../include/network.php:1919
 #, php-format
-msgid "Any account on %s"
+msgid "%s Administrator"
 msgstr ""
 
-#: ../../Zotlabs/Lib/PermissionDescription.php:111
-msgid "Any of my connections"
+#: ../../Zotlabs/Lib/Enotify.php:116
+#, php-format
+msgid "%s <!item_type!>"
 msgstr ""
 
-#: ../../Zotlabs/Lib/PermissionDescription.php:112
-msgid "Only connections I specifically allow"
+#: ../../Zotlabs/Lib/Enotify.php:120
+#, php-format
+msgid "[$Projectname:Notify] New mail received at %s"
 msgstr ""
 
-#: ../../Zotlabs/Lib/PermissionDescription.php:113
-msgid "Anybody authenticated (could include visitors from other networks)"
+#: ../../Zotlabs/Lib/Enotify.php:122
+#, php-format
+msgid "%1$s, %2$s sent you a new private message at %3$s."
 msgstr ""
 
-#: ../../Zotlabs/Lib/PermissionDescription.php:114
-msgid "Any connections including those who haven't yet been approved"
+#: ../../Zotlabs/Lib/Enotify.php:123
+#, php-format
+msgid "%1$s sent you %2$s."
 msgstr ""
 
-#: ../../Zotlabs/Lib/PermissionDescription.php:150
-msgid ""
-"This is your default setting for the audience of your normal stream, and "
-"posts."
+#: ../../Zotlabs/Lib/Enotify.php:123
+msgid "a private message"
 msgstr ""
 
-#: ../../Zotlabs/Lib/PermissionDescription.php:151
-msgid ""
-"This is your default setting for who can view your default channel profile"
+#: ../../Zotlabs/Lib/Enotify.php:124
+#, php-format
+msgid "Please visit %s to view and/or reply to your private messages."
 msgstr ""
 
-#: ../../Zotlabs/Lib/PermissionDescription.php:152
-msgid "This is your default setting for who can view your connections"
+#: ../../Zotlabs/Lib/Enotify.php:183
+#, php-format
+msgid "%1$s, %2$s commented on [zrl=%3$s]a %4$s[/zrl]"
 msgstr ""
 
-#: ../../Zotlabs/Lib/PermissionDescription.php:153
-msgid ""
-"This is your default setting for who can view your file storage and photos"
+#: ../../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/Lib/PermissionDescription.php:154
-msgid "This is your default setting for the audience of your webpages"
+#: ../../Zotlabs/Lib/Enotify.php:200
+#, php-format
+msgid "%1$s, %2$s commented on [zrl=%3$s]your %4$s[/zrl]"
 msgstr ""
 
-#: ../../Zotlabs/Lib/ThreadItem.php:95 ../../include/conversation.php:663
-msgid "Private Message"
+#: ../../Zotlabs/Lib/Enotify.php:211
+#, php-format
+msgid "[$Projectname:Notify] Comment to conversation #%1$d by %2$s"
 msgstr ""
 
-#: ../../Zotlabs/Lib/ThreadItem.php:132 ../../include/conversation.php:655
-msgid "Select"
+#: ../../Zotlabs/Lib/Enotify.php:212
+#, php-format
+msgid "%1$s, %2$s commented on an item/conversation you have been following."
 msgstr ""
 
-#: ../../Zotlabs/Lib/ThreadItem.php:136
-msgid "Save to Folder"
+#: ../../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/ThreadItem.php:157
-msgid "I will attend"
+#: ../../Zotlabs/Lib/Enotify.php:273
+#, php-format
+msgid "%1$s, %2$s liked [zrl=%3$s]your %4$s[/zrl]"
 msgstr ""
 
-#: ../../Zotlabs/Lib/ThreadItem.php:157
-msgid "I will not attend"
+#: ../../Zotlabs/Lib/Enotify.php:288
+#, php-format
+msgid "[$Projectname:Notify] Like received to conversation #%1$d by %2$s"
 msgstr ""
 
-#: ../../Zotlabs/Lib/ThreadItem.php:157
-msgid "I might attend"
+#: ../../Zotlabs/Lib/Enotify.php:289
+#, php-format
+msgid "%1$s, %2$s liked an item/conversation you created."
 msgstr ""
 
-#: ../../Zotlabs/Lib/ThreadItem.php:167
-msgid "I agree"
+#: ../../Zotlabs/Lib/Enotify.php:300
+#, php-format
+msgid "[$Projectname:Notify] %s posted to your profile wall"
 msgstr ""
 
-#: ../../Zotlabs/Lib/ThreadItem.php:167
-msgid "I disagree"
+#: ../../Zotlabs/Lib/Enotify.php:302
+#, php-format
+msgid "%1$s, %2$s posted to your profile wall at %3$s"
 msgstr ""
 
-#: ../../Zotlabs/Lib/ThreadItem.php:167
-msgid "I abstain"
+#: ../../Zotlabs/Lib/Enotify.php:304
+#, php-format
+msgid "%1$s, %2$s posted to [zrl=%3$s]your wall[/zrl]"
 msgstr ""
 
-#: ../../Zotlabs/Lib/ThreadItem.php:223
-msgid "Add Star"
+#: ../../Zotlabs/Lib/Enotify.php:328
+#, php-format
+msgid "[$Projectname:Notify] %s tagged you"
 msgstr ""
 
-#: ../../Zotlabs/Lib/ThreadItem.php:224
-msgid "Remove Star"
+#: ../../Zotlabs/Lib/Enotify.php:329
+#, php-format
+msgid "%1$s, %2$s tagged you at %3$s"
 msgstr ""
 
-#: ../../Zotlabs/Lib/ThreadItem.php:225
-msgid "Toggle Star Status"
+#: ../../Zotlabs/Lib/Enotify.php:330
+#, php-format
+msgid "%1$s, %2$s [zrl=%3$s]tagged you[/zrl]."
 msgstr ""
 
-#: ../../Zotlabs/Lib/ThreadItem.php:229
-msgid "starred"
+#: ../../Zotlabs/Lib/Enotify.php:342
+#, php-format
+msgid "[$Projectname:Notify] %1$s poked you"
 msgstr ""
 
-#: ../../Zotlabs/Lib/ThreadItem.php:239 ../../include/conversation.php:670
-msgid "Message signature validated"
+#: ../../Zotlabs/Lib/Enotify.php:343
+#, php-format
+msgid "%1$s, %2$s poked you at %3$s"
 msgstr ""
 
-#: ../../Zotlabs/Lib/ThreadItem.php:240 ../../include/conversation.php:671
-msgid "Message signature incorrect"
+#: ../../Zotlabs/Lib/Enotify.php:344
+#, php-format
+msgid "%1$s, %2$s [zrl=%2$s]poked you[/zrl]."
 msgstr ""
 
-#: ../../Zotlabs/Lib/ThreadItem.php:248
-msgid "Add Tag"
+#: ../../Zotlabs/Lib/Enotify.php:360
+#, php-format
+msgid "[$Projectname:Notify] %s tagged your post"
 msgstr ""
 
-#: ../../Zotlabs/Lib/ThreadItem.php:268 ../../include/taxonomy.php:316
-msgid "like"
+#: ../../Zotlabs/Lib/Enotify.php:361
+#, php-format
+msgid "%1$s, %2$s tagged your post at %3$s"
 msgstr ""
 
-#: ../../Zotlabs/Lib/ThreadItem.php:269 ../../include/taxonomy.php:317
-msgid "dislike"
+#: ../../Zotlabs/Lib/Enotify.php:362
+#, php-format
+msgid "%1$s, %2$s tagged [zrl=%3$s]your post[/zrl]"
 msgstr ""
 
-#: ../../Zotlabs/Lib/ThreadItem.php:273
-msgid "Share This"
+#: ../../Zotlabs/Lib/Enotify.php:374
+msgid "[$Projectname:Notify] Introduction received"
 msgstr ""
 
-#: ../../Zotlabs/Lib/ThreadItem.php:273
-msgid "share"
+#: ../../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/ThreadItem.php:282
-msgid "Delivery Report"
+#: ../../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/ThreadItem.php:300
+#: ../../Zotlabs/Lib/Enotify.php:380 ../../Zotlabs/Lib/Enotify.php:399
 #, php-format
-msgid "%d comment"
-msgid_plural "%d comments"
-msgstr[0] ""
-msgstr[1] ""
+msgid "You may visit their profile at %s"
+msgstr ""
 
-#: ../../Zotlabs/Lib/ThreadItem.php:329 ../../Zotlabs/Lib/ThreadItem.php:330
+#: ../../Zotlabs/Lib/Enotify.php:382
 #, php-format
-msgid "View %s's profile - %s"
+msgid "Please visit %s to approve or reject the connection request."
 msgstr ""
 
-#: ../../Zotlabs/Lib/ThreadItem.php:333
-msgid "to"
+#: ../../Zotlabs/Lib/Enotify.php:389
+msgid "[$Projectname:Notify] Friend suggestion received"
 msgstr ""
 
-#: ../../Zotlabs/Lib/ThreadItem.php:334
-msgid "via"
+#: ../../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/ThreadItem.php:335
-msgid "Wall-to-Wall"
+#: ../../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/ThreadItem.php:336
-msgid "via Wall-To-Wall:"
+#: ../../Zotlabs/Lib/Enotify.php:397
+msgid "Name:"
 msgstr ""
 
-#: ../../Zotlabs/Lib/ThreadItem.php:348 ../../include/conversation.php:716
-#, php-format
-msgid "from %s"
+#: ../../Zotlabs/Lib/Enotify.php:398
+msgid "Photo:"
 msgstr ""
 
-#: ../../Zotlabs/Lib/ThreadItem.php:351 ../../include/conversation.php:719
+#: ../../Zotlabs/Lib/Enotify.php:401
 #, php-format
-msgid "last edited: %s"
+msgid "Please visit %s to approve or reject the suggestion."
 msgstr ""
 
-#: ../../Zotlabs/Lib/ThreadItem.php:352 ../../include/conversation.php:720
-#, php-format
-msgid "Expires: %s"
+#: ../../Zotlabs/Lib/Enotify.php:619
+msgid "[$Projectname:Notify]"
 msgstr ""
 
-#: ../../Zotlabs/Lib/ThreadItem.php:358
-msgid "Attend"
+#: ../../Zotlabs/Lib/Enotify.php:779
+msgid "created a new post"
 msgstr ""
 
-#: ../../Zotlabs/Lib/ThreadItem.php:359
-msgid "Attendance Options"
+#: ../../Zotlabs/Lib/Enotify.php:780
+#, php-format
+msgid "commented on %s's post"
 msgstr ""
 
-#: ../../Zotlabs/Lib/ThreadItem.php:360
-msgid "Vote"
+#: ../../Zotlabs/Lib/PermissionDescription.php:34
+#: ../../include/acl_selectors.php:128
+msgid "Visible to your default audience"
 msgstr ""
 
-#: ../../Zotlabs/Lib/ThreadItem.php:361
-msgid "Voting Options"
+#: ../../Zotlabs/Lib/PermissionDescription.php:107
+#: ../../include/acl_selectors.php:191
+msgid "Only me"
 msgstr ""
 
-#: ../../Zotlabs/Lib/ThreadItem.php:381
-#: ../../extend/addon/addon/bookmarker/bookmarker.php:38
-msgid "Save Bookmarks"
+#: ../../Zotlabs/Lib/PermissionDescription.php:108
+msgid "Public"
 msgstr ""
 
-#: ../../Zotlabs/Lib/ThreadItem.php:382
-msgid "Add to Calendar"
+#: ../../Zotlabs/Lib/PermissionDescription.php:109
+msgid "Anybody in the $Projectname network"
 msgstr ""
 
-#: ../../Zotlabs/Lib/ThreadItem.php:391
-msgid "Mark all seen"
+#: ../../Zotlabs/Lib/PermissionDescription.php:110
+#, php-format
+msgid "Any account on %s"
 msgstr ""
 
-#: ../../Zotlabs/Lib/ThreadItem.php:440 ../../include/js_strings.php:7
-#, php-format
-msgid "%s show all"
+#: ../../Zotlabs/Lib/PermissionDescription.php:111
+msgid "Any of my connections"
 msgstr ""
 
-#: ../../Zotlabs/Lib/ThreadItem.php:730 ../../include/conversation.php:1237
-msgid "Bold"
+#: ../../Zotlabs/Lib/PermissionDescription.php:112
+msgid "Only connections I specifically allow"
 msgstr ""
 
-#: ../../Zotlabs/Lib/ThreadItem.php:731 ../../include/conversation.php:1238
-msgid "Italic"
+#: ../../Zotlabs/Lib/PermissionDescription.php:113
+msgid "Anybody authenticated (could include visitors from other networks)"
 msgstr ""
 
-#: ../../Zotlabs/Lib/ThreadItem.php:732 ../../include/conversation.php:1239
-msgid "Underline"
+#: ../../Zotlabs/Lib/PermissionDescription.php:114
+msgid "Any connections including those who haven't yet been approved"
 msgstr ""
 
-#: ../../Zotlabs/Lib/ThreadItem.php:733 ../../include/conversation.php:1240
-msgid "Quote"
+#: ../../Zotlabs/Lib/PermissionDescription.php:150
+msgid ""
+"This is your default setting for the audience of your normal stream, and "
+"posts."
 msgstr ""
 
-#: ../../Zotlabs/Lib/ThreadItem.php:734 ../../include/conversation.php:1241
-msgid "Code"
+#: ../../Zotlabs/Lib/PermissionDescription.php:151
+msgid ""
+"This is your default setting for who can view your default channel profile"
 msgstr ""
 
-#: ../../Zotlabs/Lib/ThreadItem.php:735
-msgid "Image"
+#: ../../Zotlabs/Lib/PermissionDescription.php:152
+msgid "This is your default setting for who can view your connections"
 msgstr ""
 
-#: ../../Zotlabs/Lib/ThreadItem.php:736
-msgid "Insert Link"
+#: ../../Zotlabs/Lib/PermissionDescription.php:153
+msgid ""
+"This is your default setting for who can view your file storage and photos"
 msgstr ""
 
-#: ../../Zotlabs/Lib/ThreadItem.php:737
-msgid "Video"
+#: ../../Zotlabs/Lib/PermissionDescription.php:154
+msgid "This is your default setting for the audience of your webpages"
 msgstr ""
 
 #: ../../Zotlabs/Lib/Apps.php:207
@@ -7251,7 +7390,7 @@ msgid "Grid"
 msgstr ""
 
 #: ../../Zotlabs/Lib/Apps.php:221 ../../include/features.php:99
-#: ../../include/conversation.php:1740
+#: ../../include/conversation.php:1888
 msgid "Wiki"
 msgstr ""
 
@@ -7260,7 +7399,7 @@ msgid "Channel Home"
 msgstr ""
 
 #: ../../Zotlabs/Lib/Apps.php:225 ../../include/nav.php:204
-#: ../../include/conversation.php:1691 ../../include/conversation.php:1694
+#: ../../include/conversation.php:1839 ../../include/conversation.php:1842
 msgid "Events"
 msgstr ""
 
@@ -7320,226 +7459,197 @@ msgstr ""
 msgid "Undelete"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Enotify.php:60 ../../include/network.php:1914
-msgid "$Projectname Notification"
+#: ../../Zotlabs/Lib/ThreadItem.php:95 ../../include/conversation.php:663
+msgid "Private Message"
 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/ThreadItem.php:132 ../../include/conversation.php:655
+msgid "Select"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Enotify.php:63 ../../include/network.php:1917
-msgid "Thank You,"
+#: ../../Zotlabs/Lib/ThreadItem.php:136
+msgid "Save to Folder"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Enotify.php:65 ../../include/network.php:1919
-#, php-format
-msgid "%s Administrator"
+#: ../../Zotlabs/Lib/ThreadItem.php:157
+msgid "I will attend"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Enotify.php:116
-#, php-format
-msgid "%s <!item_type!>"
+#: ../../Zotlabs/Lib/ThreadItem.php:157
+msgid "I will not attend"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Enotify.php:120
-#, php-format
-msgid "[$Projectname:Notify] New mail received at %s"
+#: ../../Zotlabs/Lib/ThreadItem.php:157
+msgid "I might attend"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Enotify.php:122
-#, php-format
-msgid "%1$s, %2$s sent you a new private message at %3$s."
+#: ../../Zotlabs/Lib/ThreadItem.php:167
+msgid "I agree"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Enotify.php:123
-#, php-format
-msgid "%1$s sent you %2$s."
+#: ../../Zotlabs/Lib/ThreadItem.php:167
+msgid "I disagree"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Enotify.php:123
-msgid "a private message"
+#: ../../Zotlabs/Lib/ThreadItem.php:167
+msgid "I abstain"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Enotify.php:124
-#, php-format
-msgid "Please visit %s to view and/or reply to your private messages."
+#: ../../Zotlabs/Lib/ThreadItem.php:223
+msgid "Add Star"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Enotify.php:183
-#, php-format
-msgid "%1$s, %2$s commented on [zrl=%3$s]a %4$s[/zrl]"
+#: ../../Zotlabs/Lib/ThreadItem.php:224
+msgid "Remove Star"
 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/ThreadItem.php:225
+msgid "Toggle Star Status"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Enotify.php:200
-#, php-format
-msgid "%1$s, %2$s commented on [zrl=%3$s]your %4$s[/zrl]"
+#: ../../Zotlabs/Lib/ThreadItem.php:229
+msgid "starred"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Enotify.php:211
-#, php-format
-msgid "[$Projectname:Notify] Comment to conversation #%1$d by %2$s"
+#: ../../Zotlabs/Lib/ThreadItem.php:239 ../../include/conversation.php:670
+msgid "Message signature validated"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Enotify.php:212
-#, php-format
-msgid "%1$s, %2$s commented on an item/conversation you have been following."
+#: ../../Zotlabs/Lib/ThreadItem.php:240 ../../include/conversation.php:671
+msgid "Message signature incorrect"
 msgstr ""
 
-#: ../../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."
+#: ../../Zotlabs/Lib/ThreadItem.php:248
+msgid "Add Tag"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Enotify.php:273
-#, php-format
-msgid "%1$s, %2$s liked [zrl=%3$s]your %4$s[/zrl]"
+#: ../../Zotlabs/Lib/ThreadItem.php:268 ../../include/taxonomy.php:316
+msgid "like"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Enotify.php:288
-#, php-format
-msgid "[$Projectname:Notify] Like received to conversation #%1$d by %2$s"
+#: ../../Zotlabs/Lib/ThreadItem.php:269 ../../include/taxonomy.php:317
+msgid "dislike"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Enotify.php:289
-#, php-format
-msgid "%1$s, %2$s liked an item/conversation you created."
+#: ../../Zotlabs/Lib/ThreadItem.php:273
+msgid "Share This"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Enotify.php:300
-#, php-format
-msgid "[$Projectname:Notify] %s posted to your profile wall"
+#: ../../Zotlabs/Lib/ThreadItem.php:273
+msgid "share"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Enotify.php:302
-#, php-format
-msgid "%1$s, %2$s posted to your profile wall at %3$s"
+#: ../../Zotlabs/Lib/ThreadItem.php:282
+msgid "Delivery Report"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Enotify.php:304
+#: ../../Zotlabs/Lib/ThreadItem.php:300
 #, php-format
-msgid "%1$s, %2$s posted to [zrl=%3$s]your wall[/zrl]"
-msgstr ""
+msgid "%d comment"
+msgid_plural "%d comments"
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../../Zotlabs/Lib/Enotify.php:328
+#: ../../Zotlabs/Lib/ThreadItem.php:329 ../../Zotlabs/Lib/ThreadItem.php:330
 #, php-format
-msgid "[$Projectname:Notify] %s tagged you"
+msgid "View %s's profile - %s"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Enotify.php:329
-#, php-format
-msgid "%1$s, %2$s tagged you at %3$s"
+#: ../../Zotlabs/Lib/ThreadItem.php:333
+msgid "to"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Enotify.php:330
-#, php-format
-msgid "%1$s, %2$s [zrl=%3$s]tagged you[/zrl]."
+#: ../../Zotlabs/Lib/ThreadItem.php:334
+msgid "via"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Enotify.php:342
-#, php-format
-msgid "[$Projectname:Notify] %1$s poked you"
+#: ../../Zotlabs/Lib/ThreadItem.php:335
+msgid "Wall-to-Wall"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Enotify.php:343
-#, php-format
-msgid "%1$s, %2$s poked you at %3$s"
+#: ../../Zotlabs/Lib/ThreadItem.php:336
+msgid "via Wall-To-Wall:"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Enotify.php:344
+#: ../../Zotlabs/Lib/ThreadItem.php:350 ../../include/conversation.php:717
 #, php-format
-msgid "%1$s, %2$s [zrl=%2$s]poked you[/zrl]."
+msgid "from %s"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Enotify.php:360
+#: ../../Zotlabs/Lib/ThreadItem.php:353 ../../include/conversation.php:720
 #, php-format
-msgid "[$Projectname:Notify] %s tagged your post"
+msgid "last edited: %s"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Enotify.php:361
+#: ../../Zotlabs/Lib/ThreadItem.php:354 ../../include/conversation.php:721
 #, php-format
-msgid "%1$s, %2$s tagged your post at %3$s"
+msgid "Expires: %s"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Enotify.php:362
-#, php-format
-msgid "%1$s, %2$s tagged [zrl=%3$s]your post[/zrl]"
+#: ../../Zotlabs/Lib/ThreadItem.php:360
+msgid "Attend"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Enotify.php:374
-msgid "[$Projectname:Notify] Introduction received"
+#: ../../Zotlabs/Lib/ThreadItem.php:361
+msgid "Attendance Options"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Enotify.php:375
-#, php-format
-msgid "%1$s, you've received an new connection request from '%2$s' at %3$s"
+#: ../../Zotlabs/Lib/ThreadItem.php:362
+msgid "Vote"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Enotify.php:376
-#, php-format
-msgid ""
-"%1$s, you've received [zrl=%2$s]a new connection request[/zrl] from %3$s."
+#: ../../Zotlabs/Lib/ThreadItem.php:363
+msgid "Voting Options"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Enotify.php:380 ../../Zotlabs/Lib/Enotify.php:399
-#, php-format
-msgid "You may visit their profile at %s"
+#: ../../Zotlabs/Lib/ThreadItem.php:383
+#: ../../extend/addon/addon/bookmarker/bookmarker.php:38
+msgid "Save Bookmarks"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Enotify.php:382
-#, php-format
-msgid "Please visit %s to approve or reject the connection request."
+#: ../../Zotlabs/Lib/ThreadItem.php:384
+msgid "Add to Calendar"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Enotify.php:389
-msgid "[$Projectname:Notify] Friend suggestion received"
+#: ../../Zotlabs/Lib/ThreadItem.php:393
+msgid "Mark all seen"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Enotify.php:390
+#: ../../Zotlabs/Lib/ThreadItem.php:442 ../../include/js_strings.php:7
 #, php-format
-msgid "%1$s, you've received a friend suggestion from '%2$s' at %3$s"
+msgid "%s show all"
 msgstr ""
 
-#: ../../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."
+#: ../../Zotlabs/Lib/ThreadItem.php:732 ../../include/conversation.php:1385
+msgid "Bold"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Enotify.php:397
-msgid "Name:"
+#: ../../Zotlabs/Lib/ThreadItem.php:733 ../../include/conversation.php:1386
+msgid "Italic"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Enotify.php:398
-msgid "Photo:"
+#: ../../Zotlabs/Lib/ThreadItem.php:734 ../../include/conversation.php:1387
+msgid "Underline"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Enotify.php:401
-#, php-format
-msgid "Please visit %s to approve or reject the suggestion."
+#: ../../Zotlabs/Lib/ThreadItem.php:735 ../../include/conversation.php:1388
+msgid "Quote"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Enotify.php:619
-msgid "[$Projectname:Notify]"
+#: ../../Zotlabs/Lib/ThreadItem.php:736 ../../include/conversation.php:1389
+msgid "Code"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Enotify.php:779
-msgid "created a new post"
+#: ../../Zotlabs/Lib/ThreadItem.php:737
+msgid "Image"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Enotify.php:780
-#, php-format
-msgid "commented on %s's post"
+#: ../../Zotlabs/Lib/ThreadItem.php:738
+msgid "Insert Link"
+msgstr ""
+
+#: ../../Zotlabs/Lib/ThreadItem.php:739
+msgid "Video"
 msgstr ""
 
 #: ../../extend/addon/addon/adultphotoflag/adultphotoflag.php:24
@@ -8317,11 +8427,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 ""
@@ -9428,11 +9533,11 @@ msgstr ""
 msgid "\"Superblock\" Settings"
 msgstr ""
 
-#: ../../extend/addon/addon/superblock/superblock.php:316
+#: ../../extend/addon/addon/superblock/superblock.php:322
 msgid "Block Completely"
 msgstr ""
 
-#: ../../extend/addon/addon/superblock/superblock.php:361
+#: ../../extend/addon/addon/superblock/superblock.php:371
 msgid "superblock settings updated"
 msgstr ""
 
@@ -9934,71 +10039,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 ""
@@ -10071,57 +10111,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:858
+msgid "Home, Voice"
 msgstr ""
 
-#: ../../extend/addon/addon/cdav/Mod_Cdav.php:1158
-msgid "Locality"
+#: ../../extend/addon/addon/cdav/cdav.php:273
+#: ../../include/connections.php:859
+msgid "Home, Fax"
 msgstr ""
 
-#: ../../extend/addon/addon/cdav/Mod_Cdav.php:1159
-msgid "Region"
+#: ../../extend/addon/addon/cdav/cdav.php:275
+#: ../../include/connections.php:861
+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:862
+msgid "Work, Fax"
 msgstr ""
 
 #: ../../extend/addon/addon/chess/chess.php:276
@@ -10415,89 +10456,20 @@ msgstr ""
 msgid "Cannot locate DNS info for database server '%s'"
 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:2564
-msgid "never"
-msgstr ""
-
-#: ../../include/datetime.php:292
-msgid "less than a second ago"
+#: ../../include/message.php:32
+msgid "Unable to determine sender."
 msgstr ""
 
-#: ../../include/datetime.php:310
-#, php-format
-msgctxt "e.g. 22 hours ago, 1 minute ago"
-msgid "%1$d %2$s ago"
+#: ../../include/message.php:69
+msgid "No recipient provided."
 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"
+#: ../../include/message.php:74
+msgid "[no subject]"
 msgstr ""
 
-#: ../../include/datetime.php:577
-#, php-format
-msgid "Happy Birthday %1$s"
+#: ../../include/message.php:225
+msgid "Stored post could not be verified."
 msgstr ""
 
 #: ../../include/account.php:35
@@ -10568,244 +10540,190 @@ msgstr ""
 msgid "This action is not available under your subscription plan."
 msgstr ""
 
-#: ../../include/selectors.php:30
-msgid "Frequently"
-msgstr ""
-
-#: ../../include/selectors.php:31
-msgid "Hourly"
-msgstr ""
-
-#: ../../include/selectors.php:32
-msgid "Twice daily"
-msgstr ""
-
-#: ../../include/selectors.php:33
-msgid "Daily"
-msgstr ""
-
-#: ../../include/selectors.php:34
-msgid "Weekly"
-msgstr ""
-
-#: ../../include/selectors.php:35
-msgid "Monthly"
-msgstr ""
-
-#: ../../include/selectors.php:49
-msgid "Currently Male"
-msgstr ""
-
-#: ../../include/selectors.php:49
-msgid "Currently Female"
-msgstr ""
-
-#: ../../include/selectors.php:49
-msgid "Mostly Male"
-msgstr ""
-
-#: ../../include/selectors.php:49
-msgid "Mostly Female"
-msgstr ""
-
-#: ../../include/selectors.php:49
-msgid "Transgender"
-msgstr ""
-
-#: ../../include/selectors.php:49
-msgid "Intersex"
-msgstr ""
-
-#: ../../include/selectors.php:49
-msgid "Transsexual"
-msgstr ""
-
-#: ../../include/selectors.php:49
-msgid "Hermaphrodite"
-msgstr ""
-
-#: ../../include/selectors.php:49
-msgid "Neuter"
-msgstr ""
-
-#: ../../include/selectors.php:49
-msgid "Non-specific"
-msgstr ""
-
-#: ../../include/selectors.php:49
-msgid "Undecided"
-msgstr ""
-
-#: ../../include/selectors.php:85 ../../include/selectors.php:104
-msgid "Males"
-msgstr ""
-
-#: ../../include/selectors.php:85 ../../include/selectors.php:104
-msgid "Females"
-msgstr ""
-
-#: ../../include/selectors.php:85
-msgid "Gay"
+#: ../../include/acl_selectors.php:198
+msgid "Who can see this?"
 msgstr ""
 
-#: ../../include/selectors.php:85
-msgid "Lesbian"
+#: ../../include/acl_selectors.php:199
+msgid "Custom selection"
 msgstr ""
 
-#: ../../include/selectors.php:85
-msgid "No Preference"
+#: ../../include/acl_selectors.php:200
+msgid ""
+"Select \"Show\" to allow viewing. \"Don't show\" lets you override and limit "
+"the scope of \"Show\"."
 msgstr ""
 
-#: ../../include/selectors.php:85
-msgid "Bisexual"
+#: ../../include/acl_selectors.php:201
+msgid "Show"
 msgstr ""
 
-#: ../../include/selectors.php:85
-msgid "Autosexual"
+#: ../../include/acl_selectors.php:202
+msgid "Don't show"
 msgstr ""
 
-#: ../../include/selectors.php:85
-msgid "Abstinent"
+#: ../../include/acl_selectors.php:235
+#, 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/selectors.php:85
-msgid "Virgin"
+#: ../../include/attach.php:248 ../../include/attach.php:336
+msgid "Item was not found."
 msgstr ""
 
-#: ../../include/selectors.php:85
-msgid "Deviant"
+#: ../../include/attach.php:497
+msgid "No source file."
 msgstr ""
 
-#: ../../include/selectors.php:85
-msgid "Fetish"
+#: ../../include/attach.php:519
+msgid "Cannot locate file to replace"
 msgstr ""
 
-#: ../../include/selectors.php:85
-msgid "Oodles"
+#: ../../include/attach.php:537
+msgid "Cannot locate file to revise/update"
 msgstr ""
 
-#: ../../include/selectors.php:85
-msgid "Nonsexual"
+#: ../../include/attach.php:668
+#, php-format
+msgid "File exceeds size limit of %d"
 msgstr ""
 
-#: ../../include/selectors.php:123 ../../include/selectors.php:140
-msgid "Single"
+#: ../../include/attach.php:682
+#, php-format
+msgid "You have reached your limit of %1$.0f Mbytes attachment storage."
 msgstr ""
 
-#: ../../include/selectors.php:123
-msgid "Lonely"
+#: ../../include/attach.php:852
+msgid "File upload failed. Possible system limit or action terminated."
 msgstr ""
 
-#: ../../include/selectors.php:123
-msgid "Available"
+#: ../../include/attach.php:865
+msgid "Stored file could not be verified. Upload failed."
 msgstr ""
 
-#: ../../include/selectors.php:123
-msgid "Unavailable"
+#: ../../include/attach.php:920 ../../include/attach.php:936
+msgid "Path not available."
 msgstr ""
 
-#: ../../include/selectors.php:123
-msgid "Has crush"
+#: ../../include/attach.php:982 ../../include/attach.php:1140
+msgid "Empty pathname"
 msgstr ""
 
-#: ../../include/selectors.php:123
-msgid "Infatuated"
+#: ../../include/attach.php:1008
+msgid "duplicate filename or path"
 msgstr ""
 
-#: ../../include/selectors.php:123 ../../include/selectors.php:140
-msgid "Dating"
+#: ../../include/attach.php:1030
+msgid "Path not found."
 msgstr ""
 
-#: ../../include/selectors.php:123
-msgid "Unfaithful"
+#: ../../include/attach.php:1094
+msgid "mkdir failed."
 msgstr ""
 
-#: ../../include/selectors.php:123
-msgid "Sex Addict"
+#: ../../include/attach.php:1098
+msgid "database storage failed."
 msgstr ""
 
-#: ../../include/selectors.php:123
-msgid "Friends/Benefits"
+#: ../../include/attach.php:1146
+msgid "Empty path"
 msgstr ""
 
-#: ../../include/selectors.php:123
-msgid "Casual"
+#: ../../include/event.php:22 ../../include/event.php:69
+#: ../../include/bb2diaspora.php:504
+msgid "l F d, Y \\@ g:i A"
 msgstr ""
 
-#: ../../include/selectors.php:123
-msgid "Engaged"
+#: ../../include/event.php:30 ../../include/event.php:73
+#: ../../include/bb2diaspora.php:510
+msgid "Starts:"
 msgstr ""
 
-#: ../../include/selectors.php:123 ../../include/selectors.php:140
-msgid "Married"
+#: ../../include/event.php:40 ../../include/event.php:77
+#: ../../include/bb2diaspora.php:518
+msgid "Finishes:"
 msgstr ""
 
-#: ../../include/selectors.php:123
-msgid "Imaginarily married"
+#: ../../include/event.php:824
+msgid "This event has been added to your calendar."
 msgstr ""
 
-#: ../../include/selectors.php:123
-msgid "Partners"
+#: ../../include/event.php:1024
+msgid "Not specified"
 msgstr ""
 
-#: ../../include/selectors.php:123 ../../include/selectors.php:140
-msgid "Cohabiting"
+#: ../../include/event.php:1025
+msgid "Needs Action"
 msgstr ""
 
-#: ../../include/selectors.php:123
-msgid "Common law"
+#: ../../include/event.php:1026
+msgid "Completed"
 msgstr ""
 
-#: ../../include/selectors.php:123
-msgid "Happy"
+#: ../../include/event.php:1027
+msgid "In Process"
 msgstr ""
 
-#: ../../include/selectors.php:123
-msgid "Not looking"
+#: ../../include/event.php:1028
+msgid "Cancelled"
 msgstr ""
 
-#: ../../include/selectors.php:123
-msgid "Swinger"
+#: ../../include/bb2diaspora.php:409
+msgid "Attachments:"
 msgstr ""
 
-#: ../../include/selectors.php:123
-msgid "Betrayed"
+#: ../../include/bb2diaspora.php:506
+msgid "$Projectname event notification:"
 msgstr ""
 
-#: ../../include/selectors.php:123 ../../include/selectors.php:140
-msgid "Separated"
+#: ../../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"
 msgstr ""
 
-#: ../../include/selectors.php:123
-msgid "Unstable"
+#: ../../include/bbcode.php:173 ../../include/bbcode.php:1012
+msgid "Encrypted content"
 msgstr ""
 
-#: ../../include/selectors.php:123 ../../include/selectors.php:140
-msgid "Divorced"
+#: ../../include/bbcode.php:189
+#, php-format
+msgid "Install %s element: "
 msgstr ""
 
-#: ../../include/selectors.php:123
-msgid "Imaginarily divorced"
+#: ../../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/selectors.php:123 ../../include/selectors.php:140
-msgid "Widowed"
+#: ../../include/bbcode.php:272
+#, php-format
+msgid "%1$s wrote the following %2$s %3$s"
 msgstr ""
 
-#: ../../include/selectors.php:123
-msgid "Uncertain"
+#: ../../include/bbcode.php:349 ../../include/bbcode.php:357
+msgid "Click to open/close"
 msgstr ""
 
-#: ../../include/selectors.php:123 ../../include/selectors.php:140
-msgid "It's complicated"
+#: ../../include/bbcode.php:357
+msgid "spoiler"
 msgstr ""
 
-#: ../../include/selectors.php:123
-msgid "Don't care"
+#: ../../include/bbcode.php:552 ../../include/bbcode.php:683
+#: ../../include/wiki.php:546
+msgid "Different viewers will see this text differently"
 msgstr ""
 
-#: ../../include/selectors.php:123
-msgid "Ask me"
+#: ../../include/bbcode.php:950
+msgid "$1 wrote:"
 msgstr ""
 
 #: ../../include/channel.php:33
@@ -10954,219 +10872,6 @@ msgstr ""
 msgid "Like this thing"
 msgstr ""
 
-#: ../../include/connections.php:95
-msgid "New window"
-msgstr ""
-
-#: ../../include/connections.php:96
-msgid "Open the selected location in a different window or browser tab"
-msgstr ""
-
-#: ../../include/connections.php:214
-#, php-format
-msgid "User '%s' deleted"
-msgstr ""
-
-#: ../../include/dir_fns.php:141
-msgid "Directory Options"
-msgstr ""
-
-#: ../../include/dir_fns.php:143
-msgid "Safe Mode"
-msgstr ""
-
-#: ../../include/dir_fns.php:144
-msgid "Public Forums Only"
-msgstr ""
-
-#: ../../include/dir_fns.php:145
-msgid "This Website Only"
-msgstr ""
-
-#: ../../include/nav.php:85 ../../include/nav.php:118 ../../boot.php:1719
-msgid "Logout"
-msgstr ""
-
-#: ../../include/nav.php:85 ../../include/nav.php:118
-msgid "End this session"
-msgstr ""
-
-#: ../../include/nav.php:88
-msgid "Your posts and conversations"
-msgstr ""
-
-#: ../../include/nav.php:89
-msgid "Your profile page"
-msgstr ""
-
-#: ../../include/nav.php:91
-msgid "Manage/Edit profiles"
-msgstr ""
-
-#: ../../include/nav.php:93
-msgid "Edit your profile"
-msgstr ""
-
-#: ../../include/nav.php:95
-msgid "Your photos"
-msgstr ""
-
-#: ../../include/nav.php:96
-msgid "Your files"
-msgstr ""
-
-#: ../../include/nav.php:99
-msgid "Your chatrooms"
-msgstr ""
-
-#: ../../include/nav.php:105 ../../include/conversation.php:1717
-msgid "Bookmarks"
-msgstr ""
-
-#: ../../include/nav.php:105
-msgid "Your bookmarks"
-msgstr ""
-
-#: ../../include/nav.php:109
-msgid "Your webpages"
-msgstr ""
-
-#: ../../include/nav.php:111
-msgid "Your wikis"
-msgstr ""
-
-#: ../../include/nav.php:115
-msgid "Sign in"
-msgstr ""
-
-#: ../../include/nav.php:131
-msgid "Remote authentication"
-msgstr ""
-
-#: ../../include/nav.php:131
-msgid "Click to authenticate to your home hub"
-msgstr ""
-
-#: ../../include/nav.php:143
-msgid "Get me home"
-msgstr ""
-
-#: ../../include/nav.php:145
-msgid "Log me out of this site"
-msgstr ""
-
-#: ../../include/nav.php:150
-msgid "Create an account"
-msgstr ""
-
-#: ../../include/nav.php:162
-msgid "Help and documentation"
-msgstr ""
-
-#: ../../include/nav.php:166
-msgid "Applications, utilities, links, games"
-msgstr ""
-
-#: ../../include/nav.php:168
-msgid "Search site @name, #tag, ?docs, content"
-msgstr ""
-
-#: ../../include/nav.php:170
-msgid "Channel Directory"
-msgstr ""
-
-#: ../../include/nav.php:182
-msgid "Your grid"
-msgstr ""
-
-#: ../../include/nav.php:183
-msgid "Mark all grid notifications seen"
-msgstr ""
-
-#: ../../include/nav.php:185
-msgid "Channel home"
-msgstr ""
-
-#: ../../include/nav.php:186
-msgid "Mark all channel notifications seen"
-msgstr ""
-
-#: ../../include/nav.php:192
-msgid "Notices"
-msgstr ""
-
-#: ../../include/nav.php:192
-msgid "Notifications"
-msgstr ""
-
-#: ../../include/nav.php:193
-msgid "See all notifications"
-msgstr ""
-
-#: ../../include/nav.php:196
-msgid "Private mail"
-msgstr ""
-
-#: ../../include/nav.php:197
-msgid "See all private messages"
-msgstr ""
-
-#: ../../include/nav.php:198
-msgid "Mark all private messages seen"
-msgstr ""
-
-#: ../../include/nav.php:199 ../../include/widgets.php:700
-msgid "Inbox"
-msgstr ""
-
-#: ../../include/nav.php:200 ../../include/widgets.php:705
-msgid "Outbox"
-msgstr ""
-
-#: ../../include/nav.php:201 ../../include/widgets.php:710
-msgid "New Message"
-msgstr ""
-
-#: ../../include/nav.php:204
-msgid "Event Calendar"
-msgstr ""
-
-#: ../../include/nav.php:205
-msgid "See all events"
-msgstr ""
-
-#: ../../include/nav.php:206
-msgid "Mark all events seen"
-msgstr ""
-
-#: ../../include/nav.php:209
-msgid "Manage Your Channels"
-msgstr ""
-
-#: ../../include/nav.php:211
-msgid "Account/Channel Settings"
-msgstr ""
-
-#: ../../include/nav.php:219 ../../include/widgets.php:1595
-msgid "Admin"
-msgstr ""
-
-#: ../../include/nav.php:219
-msgid "Site Setup and Configuration"
-msgstr ""
-
-#: ../../include/nav.php:250 ../../include/conversation.php:835
-msgid "Loading..."
-msgstr ""
-
-#: ../../include/nav.php:255
-msgid "@name, #tag, ?doc, content"
-msgstr ""
-
-#: ../../include/nav.php:256
-msgid "Please wait..."
-msgstr ""
-
 #: ../../include/features.php:58
 msgid "General Features"
 msgstr ""
@@ -11469,45 +11174,384 @@ msgid ""
 "channel"
 msgstr ""
 
-#: ../../include/bb2diaspora.php:404
-msgid "Attachments:"
+#: ../../include/connections.php:95
+msgid "New window"
 msgstr ""
 
-#: ../../include/bb2diaspora.php:499 ../../include/event.php:22
-#: ../../include/event.php:69
-msgid "l F d, Y \\@ g:i A"
+#: ../../include/connections.php:96
+msgid "Open the selected location in a different window or browser tab"
 msgstr ""
 
-#: ../../include/bb2diaspora.php:501
-msgid "$Projectname event notification:"
+#: ../../include/connections.php:214
+#, php-format
+msgid "User '%s' deleted"
 msgstr ""
 
-#: ../../include/bb2diaspora.php:505 ../../include/event.php:30
-#: ../../include/event.php:73
-msgid "Starts:"
+#: ../../include/bookmarks.php:35
+#, php-format
+msgid "%1$s's bookmarks"
 msgstr ""
 
-#: ../../include/bb2diaspora.php:513 ../../include/event.php:40
-#: ../../include/event.php:77
-msgid "Finishes:"
+#: ../../include/oembed.php:307
+msgid " by "
 msgstr ""
 
-#: ../../include/bookmarks.php:35
+#: ../../include/oembed.php:308
+msgid " on "
+msgstr ""
+
+#: ../../include/oembed.php:337
+msgid "Embedded content"
+msgstr ""
+
+#: ../../include/oembed.php:346
+msgid "Embedding disabled"
+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"
+msgstr ""
+
+#: ../../include/text.php:507
+msgid "newer"
+msgstr ""
+
+#: ../../include/text.php:917
+msgid "No connections"
+msgstr ""
+
+#: ../../include/text.php:942
 #, php-format
-msgid "%1$s's bookmarks"
+msgid "View all %s connections"
 msgstr ""
 
-#: ../../include/help.php:31
-msgid "Help:"
+#: ../../include/text.php:1087 ../../include/text.php:1092
+msgid "poke"
 msgstr ""
 
-#: ../../include/help.php:63
-msgid "Not Found"
+#: ../../include/text.php:1087 ../../include/text.php:1092
+#: ../../include/conversation.php:243
+msgid "poked"
 msgstr ""
 
-#: ../../include/wiki.php:546 ../../include/bbcode.php:552
-#: ../../include/bbcode.php:683
-msgid "Different viewers will see this text differently"
+#: ../../include/text.php:1093
+msgid "ping"
+msgstr ""
+
+#: ../../include/text.php:1093
+msgid "pinged"
+msgstr ""
+
+#: ../../include/text.php:1094
+msgid "prod"
+msgstr ""
+
+#: ../../include/text.php:1094
+msgid "prodded"
+msgstr ""
+
+#: ../../include/text.php:1095
+msgid "slap"
+msgstr ""
+
+#: ../../include/text.php:1095
+msgid "slapped"
+msgstr ""
+
+#: ../../include/text.php:1096
+msgid "finger"
+msgstr ""
+
+#: ../../include/text.php:1096
+msgid "fingered"
+msgstr ""
+
+#: ../../include/text.php:1097
+msgid "rebuff"
+msgstr ""
+
+#: ../../include/text.php:1097
+msgid "rebuffed"
+msgstr ""
+
+#: ../../include/text.php:1109
+msgid "happy"
+msgstr ""
+
+#: ../../include/text.php:1110
+msgid "sad"
+msgstr ""
+
+#: ../../include/text.php:1111
+msgid "mellow"
+msgstr ""
+
+#: ../../include/text.php:1112
+msgid "tired"
+msgstr ""
+
+#: ../../include/text.php:1113
+msgid "perky"
+msgstr ""
+
+#: ../../include/text.php:1114
+msgid "angry"
+msgstr ""
+
+#: ../../include/text.php:1115
+msgid "stupefied"
+msgstr ""
+
+#: ../../include/text.php:1116
+msgid "puzzled"
+msgstr ""
+
+#: ../../include/text.php:1117
+msgid "interested"
+msgstr ""
+
+#: ../../include/text.php:1118
+msgid "bitter"
+msgstr ""
+
+#: ../../include/text.php:1119
+msgid "cheerful"
+msgstr ""
+
+#: ../../include/text.php:1120
+msgid "alive"
+msgstr ""
+
+#: ../../include/text.php:1121
+msgid "annoyed"
+msgstr ""
+
+#: ../../include/text.php:1122
+msgid "anxious"
+msgstr ""
+
+#: ../../include/text.php:1123
+msgid "cranky"
+msgstr ""
+
+#: ../../include/text.php:1124
+msgid "disturbed"
+msgstr ""
+
+#: ../../include/text.php:1125
+msgid "frustrated"
+msgstr ""
+
+#: ../../include/text.php:1126
+msgid "depressed"
+msgstr ""
+
+#: ../../include/text.php:1127
+msgid "motivated"
+msgstr ""
+
+#: ../../include/text.php:1128
+msgid "relaxed"
+msgstr ""
+
+#: ../../include/text.php:1129
+msgid "surprised"
+msgstr ""
+
+#: ../../include/text.php:1316 ../../include/js_strings.php:70
+msgid "Monday"
+msgstr ""
+
+#: ../../include/text.php:1316 ../../include/js_strings.php:71
+msgid "Tuesday"
+msgstr ""
+
+#: ../../include/text.php:1316 ../../include/js_strings.php:72
+msgid "Wednesday"
+msgstr ""
+
+#: ../../include/text.php:1316 ../../include/js_strings.php:73
+msgid "Thursday"
+msgstr ""
+
+#: ../../include/text.php:1316 ../../include/js_strings.php:74
+msgid "Friday"
+msgstr ""
+
+#: ../../include/text.php:1316 ../../include/js_strings.php:75
+msgid "Saturday"
+msgstr ""
+
+#: ../../include/text.php:1316 ../../include/js_strings.php:69
+msgid "Sunday"
+msgstr ""
+
+#: ../../include/text.php:1320 ../../include/js_strings.php:45
+msgid "January"
+msgstr ""
+
+#: ../../include/text.php:1320 ../../include/js_strings.php:46
+msgid "February"
+msgstr ""
+
+#: ../../include/text.php:1320 ../../include/js_strings.php:47
+msgid "March"
+msgstr ""
+
+#: ../../include/text.php:1320 ../../include/js_strings.php:48
+msgid "April"
+msgstr ""
+
+#: ../../include/text.php:1320
+msgid "May"
+msgstr ""
+
+#: ../../include/text.php:1320 ../../include/js_strings.php:50
+msgid "June"
+msgstr ""
+
+#: ../../include/text.php:1320 ../../include/js_strings.php:51
+msgid "July"
+msgstr ""
+
+#: ../../include/text.php:1320 ../../include/js_strings.php:52
+msgid "August"
+msgstr ""
+
+#: ../../include/text.php:1320 ../../include/js_strings.php:53
+msgid "September"
+msgstr ""
+
+#: ../../include/text.php:1320 ../../include/js_strings.php:54
+msgid "October"
+msgstr ""
+
+#: ../../include/text.php:1320 ../../include/js_strings.php:55
+msgid "November"
+msgstr ""
+
+#: ../../include/text.php:1320 ../../include/js_strings.php:56
+msgid "December"
+msgstr ""
+
+#: ../../include/text.php:1397 ../../include/text.php:1401
+msgid "Unknown Attachment"
+msgstr ""
+
+#: ../../include/text.php:1403
+msgid "unknown"
+msgstr ""
+
+#: ../../include/text.php:1439
+msgid "remove category"
+msgstr ""
+
+#: ../../include/text.php:1516
+msgid "remove from file"
+msgstr ""
+
+#: ../../include/text.php:1783 ../../include/language.php:367
+msgid "default"
+msgstr ""
+
+#: ../../include/text.php:1791
+msgid "Page layout"
+msgstr ""
+
+#: ../../include/text.php:1791
+msgid "You can create your own with the layouts tool"
+msgstr ""
+
+#: ../../include/text.php:1833
+msgid "Page content type"
+msgstr ""
+
+#: ../../include/text.php:1966
+msgid "activity"
+msgstr ""
+
+#: ../../include/text.php:2280
+msgid "Design Tools"
+msgstr ""
+
+#: ../../include/text.php:2286
+msgid "Pages"
+msgstr ""
+
+#: ../../include/text.php:2308
+msgid "Import website..."
+msgstr ""
+
+#: ../../include/text.php:2309
+msgid "Select folder to import"
+msgstr ""
+
+#: ../../include/text.php:2310
+msgid "Import from a zipped folder:"
+msgstr ""
+
+#: ../../include/text.php:2311
+msgid "Import from cloud files:"
+msgstr ""
+
+#: ../../include/text.php:2312
+msgid "/cloud/channel/path/to/folder"
+msgstr ""
+
+#: ../../include/text.php:2313
+msgid "Enter path to website files"
+msgstr ""
+
+#: ../../include/text.php:2314
+msgid "Select folder"
+msgstr ""
+
+#: ../../include/text.php:2315
+msgid "Export website..."
+msgstr ""
+
+#: ../../include/text.php:2316
+msgid "Export to a zip file"
+msgstr ""
+
+#: ../../include/text.php:2317
+msgid "website.zip"
+msgstr ""
+
+#: ../../include/text.php:2318
+msgid "Enter a name for the zip file."
+msgstr ""
+
+#: ../../include/text.php:2319
+msgid "Export to cloud files"
+msgstr ""
+
+#: ../../include/text.php:2320
+msgid "/path/to/export/folder"
+msgstr ""
+
+#: ../../include/text.php:2321
+msgid "Enter a path to a cloud files destination."
+msgstr ""
+
+#: ../../include/text.php:2322
+msgid "Specify folder"
 msgstr ""
 
 #: ../../include/zot.php:667
@@ -11531,22 +11575,6 @@ msgstr ""
 msgid "New Page"
 msgstr ""
 
-#: ../../include/message.php:32
-msgid "Unable to determine sender."
-msgstr ""
-
-#: ../../include/message.php:69
-msgid "No recipient provided."
-msgstr ""
-
-#: ../../include/message.php:74
-msgid "[no subject]"
-msgstr ""
-
-#: ../../include/message.php:225
-msgid "Stored post could not be verified."
-msgstr ""
-
 #: ../../include/contact_widgets.php:11
 #, php-format
 msgid "%d invitation available"
@@ -11587,9 +11615,9 @@ msgstr ""
 msgid "Everything"
 msgstr ""
 
-#: ../../include/contact_widgets.php:91 ../../include/taxonomy.php:188
-#: ../../include/taxonomy.php:270 ../../include/widgets.php:46
-#: ../../include/widgets.php:465
+#: ../../include/contact_widgets.php:91 ../../include/widgets.php:46
+#: ../../include/widgets.php:465 ../../include/taxonomy.php:188
+#: ../../include/taxonomy.php:270
 msgid "Categories"
 msgstr ""
 
@@ -11744,55 +11772,11 @@ msgstr ""
 msgid "timeago.numbers"
 msgstr ""
 
-#: ../../include/js_strings.php:45 ../../include/text.php:1307
-msgid "January"
-msgstr ""
-
-#: ../../include/js_strings.php:46 ../../include/text.php:1307
-msgid "February"
-msgstr ""
-
-#: ../../include/js_strings.php:47 ../../include/text.php:1307
-msgid "March"
-msgstr ""
-
-#: ../../include/js_strings.php:48 ../../include/text.php:1307
-msgid "April"
-msgstr ""
-
 #: ../../include/js_strings.php:49
 msgctxt "long"
 msgid "May"
 msgstr ""
 
-#: ../../include/js_strings.php:50 ../../include/text.php:1307
-msgid "June"
-msgstr ""
-
-#: ../../include/js_strings.php:51 ../../include/text.php:1307
-msgid "July"
-msgstr ""
-
-#: ../../include/js_strings.php:52 ../../include/text.php:1307
-msgid "August"
-msgstr ""
-
-#: ../../include/js_strings.php:53 ../../include/text.php:1307
-msgid "September"
-msgstr ""
-
-#: ../../include/js_strings.php:54 ../../include/text.php:1307
-msgid "October"
-msgstr ""
-
-#: ../../include/js_strings.php:55 ../../include/text.php:1307
-msgid "November"
-msgstr ""
-
-#: ../../include/js_strings.php:56 ../../include/text.php:1307
-msgid "December"
-msgstr ""
-
 #: ../../include/js_strings.php:57
 msgid "Jan"
 msgstr ""
@@ -11842,34 +11826,6 @@ msgstr ""
 msgid "Dec"
 msgstr ""
 
-#: ../../include/js_strings.php:69 ../../include/text.php:1303
-msgid "Sunday"
-msgstr ""
-
-#: ../../include/js_strings.php:70 ../../include/text.php:1303
-msgid "Monday"
-msgstr ""
-
-#: ../../include/js_strings.php:71 ../../include/text.php:1303
-msgid "Tuesday"
-msgstr ""
-
-#: ../../include/js_strings.php:72 ../../include/text.php:1303
-msgid "Wednesday"
-msgstr ""
-
-#: ../../include/js_strings.php:73 ../../include/text.php:1303
-msgid "Thursday"
-msgstr ""
-
-#: ../../include/js_strings.php:74 ../../include/text.php:1303
-msgid "Friday"
-msgstr ""
-
-#: ../../include/js_strings.php:75 ../../include/text.php:1303
-msgid "Saturday"
-msgstr ""
-
 #: ../../include/js_strings.php:76
 msgid "Sun"
 msgstr ""
@@ -11923,323 +11879,320 @@ msgctxt "calendar"
 msgid "All day"
 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"
+#: ../../include/follow.php:27
+msgid "Channel is blocked on this site."
 msgstr ""
 
-#: ../../include/taxonomy.php:314
-msgid "has"
+#: ../../include/follow.php:32
+msgid "Channel location missing."
 msgstr ""
 
-#: ../../include/taxonomy.php:315
-msgid "want"
+#: ../../include/follow.php:80
+msgid "Response from remote channel was incomplete."
 msgstr ""
 
-#: ../../include/taxonomy.php:315
-msgid "wants"
+#: ../../include/follow.php:97
+msgid "Channel was deleted and no longer exists."
 msgstr ""
 
-#: ../../include/taxonomy.php:316
-msgid "likes"
+#: ../../include/follow.php:147 ../../include/follow.php:183
+msgid "Protocol disabled."
 msgstr ""
 
-#: ../../include/taxonomy.php:317
-msgid "dislikes"
+#: ../../include/follow.php:171
+msgid "Channel discovery failed."
 msgstr ""
 
-#: ../../include/text.php:460
-msgid "prev"
+#: ../../include/follow.php:210
+msgid "Cannot connect to yourself."
 msgstr ""
 
-#: ../../include/text.php:462
-msgid "first"
+#: ../../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/text.php:491
-msgid "last"
+#: ../../include/group.php:248
+msgid "Add new connections to this privacy group"
 msgstr ""
 
-#: ../../include/text.php:494
-msgid "next"
+#: ../../include/group.php:289
+msgid "edit"
 msgstr ""
 
-#: ../../include/text.php:505
-msgid "older"
+#: ../../include/group.php:312
+msgid "Edit group"
 msgstr ""
 
-#: ../../include/text.php:507
-msgid "newer"
+#: ../../include/group.php:313
+msgid "Add privacy group"
 msgstr ""
 
-#: ../../include/text.php:904
-msgid "No connections"
+#: ../../include/group.php:314
+msgid "Channels not in any privacy group"
 msgstr ""
 
-#: ../../include/text.php:929
-#, php-format
-msgid "View all %s connections"
+#: ../../include/group.php:316 ../../include/widgets.php:284
+msgid "add"
 msgstr ""
 
-#: ../../include/text.php:1074 ../../include/text.php:1079
-msgid "poke"
+#: ../../include/items.php:837 ../../include/items.php:882
+msgid "(Unknown)"
 msgstr ""
 
-#: ../../include/text.php:1074 ../../include/text.php:1079
-#: ../../include/conversation.php:243
-msgid "poked"
+#: ../../include/items.php:1080
+msgid "Visible to anybody on the internet."
 msgstr ""
 
-#: ../../include/text.php:1080
-msgid "ping"
+#: ../../include/items.php:1082
+msgid "Visible to you only."
 msgstr ""
 
-#: ../../include/text.php:1080
-msgid "pinged"
+#: ../../include/items.php:1084
+msgid "Visible to anybody in this network."
 msgstr ""
 
-#: ../../include/text.php:1081
-msgid "prod"
+#: ../../include/items.php:1086
+msgid "Visible to anybody authenticated."
 msgstr ""
 
-#: ../../include/text.php:1081
-msgid "prodded"
+#: ../../include/items.php:1088
+#, php-format
+msgid "Visible to anybody on %s."
 msgstr ""
 
-#: ../../include/text.php:1082
-msgid "slap"
+#: ../../include/items.php:1090
+msgid "Visible to all connections."
 msgstr ""
 
-#: ../../include/text.php:1082
-msgid "slapped"
+#: ../../include/items.php:1092
+msgid "Visible to approved connections."
 msgstr ""
 
-#: ../../include/text.php:1083
-msgid "finger"
+#: ../../include/items.php:1094
+msgid "Visible to specific connections."
 msgstr ""
 
-#: ../../include/text.php:1083
-msgid "fingered"
+#: ../../include/items.php:3892
+msgid "Privacy group is empty."
 msgstr ""
 
-#: ../../include/text.php:1084
-msgid "rebuff"
+#: ../../include/items.php:3899
+#, php-format
+msgid "Privacy group: %s"
 msgstr ""
 
-#: ../../include/text.php:1084
-msgid "rebuffed"
+#: ../../include/items.php:3911
+msgid "Connection not found."
 msgstr ""
 
-#: ../../include/text.php:1096
-msgid "happy"
+#: ../../include/items.php:4260
+msgid "profile photo"
 msgstr ""
 
-#: ../../include/text.php:1097
-msgid "sad"
+#: ../../include/items.php:4456
+#, php-format
+msgid "[Edited %s]"
 msgstr ""
 
-#: ../../include/text.php:1098
-msgid "mellow"
+#: ../../include/items.php:4456
+msgctxt "edit_activity"
+msgid "Post"
 msgstr ""
 
-#: ../../include/text.php:1099
-msgid "tired"
+#: ../../include/items.php:4456
+msgctxt "edit_activity"
+msgid "Comment"
 msgstr ""
 
-#: ../../include/text.php:1100
-msgid "perky"
+#: ../../include/language.php:380
+msgid "Select an alternate language"
 msgstr ""
 
-#: ../../include/text.php:1101
-msgid "angry"
+#: ../../include/nav.php:85 ../../include/nav.php:118 ../../boot.php:1719
+msgid "Logout"
 msgstr ""
 
-#: ../../include/text.php:1102
-msgid "stupefied"
+#: ../../include/nav.php:85 ../../include/nav.php:118
+msgid "End this session"
 msgstr ""
 
-#: ../../include/text.php:1103
-msgid "puzzled"
+#: ../../include/nav.php:88
+msgid "Your posts and conversations"
 msgstr ""
 
-#: ../../include/text.php:1104
-msgid "interested"
+#: ../../include/nav.php:89
+msgid "Your profile page"
 msgstr ""
 
-#: ../../include/text.php:1105
-msgid "bitter"
+#: ../../include/nav.php:91
+msgid "Manage/Edit profiles"
 msgstr ""
 
-#: ../../include/text.php:1106
-msgid "cheerful"
+#: ../../include/nav.php:93
+msgid "Edit your profile"
 msgstr ""
 
-#: ../../include/text.php:1107
-msgid "alive"
+#: ../../include/nav.php:95
+msgid "Your photos"
 msgstr ""
 
-#: ../../include/text.php:1108
-msgid "annoyed"
+#: ../../include/nav.php:96
+msgid "Your files"
 msgstr ""
 
-#: ../../include/text.php:1109
-msgid "anxious"
+#: ../../include/nav.php:99
+msgid "Your chatrooms"
 msgstr ""
 
-#: ../../include/text.php:1110
-msgid "cranky"
+#: ../../include/nav.php:105 ../../include/conversation.php:1865
+msgid "Bookmarks"
 msgstr ""
 
-#: ../../include/text.php:1111
-msgid "disturbed"
+#: ../../include/nav.php:105
+msgid "Your bookmarks"
 msgstr ""
 
-#: ../../include/text.php:1112
-msgid "frustrated"
+#: ../../include/nav.php:109
+msgid "Your webpages"
 msgstr ""
 
-#: ../../include/text.php:1113
-msgid "depressed"
+#: ../../include/nav.php:111
+msgid "Your wikis"
 msgstr ""
 
-#: ../../include/text.php:1114
-msgid "motivated"
+#: ../../include/nav.php:115
+msgid "Sign in"
 msgstr ""
 
-#: ../../include/text.php:1115
-msgid "relaxed"
+#: ../../include/nav.php:131
+msgid "Remote authentication"
 msgstr ""
 
-#: ../../include/text.php:1116
-msgid "surprised"
+#: ../../include/nav.php:131
+msgid "Click to authenticate to your home hub"
 msgstr ""
 
-#: ../../include/text.php:1307
-msgid "May"
+#: ../../include/nav.php:143
+msgid "Get me home"
 msgstr ""
 
-#: ../../include/text.php:1384 ../../include/text.php:1388
-msgid "Unknown Attachment"
+#: ../../include/nav.php:145
+msgid "Log me out of this site"
 msgstr ""
 
-#: ../../include/text.php:1390
-msgid "unknown"
+#: ../../include/nav.php:150
+msgid "Create an account"
 msgstr ""
 
-#: ../../include/text.php:1426
-msgid "remove category"
+#: ../../include/nav.php:162
+msgid "Help and documentation"
 msgstr ""
 
-#: ../../include/text.php:1503
-msgid "remove from file"
+#: ../../include/nav.php:166
+msgid "Applications, utilities, links, games"
 msgstr ""
 
-#: ../../include/text.php:1770 ../../include/language.php:367
-msgid "default"
+#: ../../include/nav.php:168
+msgid "Search site @name, #tag, ?docs, content"
 msgstr ""
 
-#: ../../include/text.php:1778
-msgid "Page layout"
+#: ../../include/nav.php:170
+msgid "Channel Directory"
 msgstr ""
 
-#: ../../include/text.php:1778
-msgid "You can create your own with the layouts tool"
+#: ../../include/nav.php:182
+msgid "Your grid"
 msgstr ""
 
-#: ../../include/text.php:1820
-msgid "Page content type"
+#: ../../include/nav.php:183
+msgid "Mark all grid notifications seen"
 msgstr ""
 
-#: ../../include/text.php:1953
-msgid "activity"
+#: ../../include/nav.php:185
+msgid "Channel home"
 msgstr ""
 
-#: ../../include/text.php:2267
-msgid "Design Tools"
+#: ../../include/nav.php:186
+msgid "Mark all channel notifications seen"
 msgstr ""
 
-#: ../../include/text.php:2273
-msgid "Pages"
+#: ../../include/nav.php:192
+msgid "Notices"
 msgstr ""
 
-#: ../../include/text.php:2295
-msgid "Import website..."
+#: ../../include/nav.php:192
+msgid "Notifications"
 msgstr ""
 
-#: ../../include/text.php:2296
-msgid "Select folder to import"
+#: ../../include/nav.php:193
+msgid "See all notifications"
 msgstr ""
 
-#: ../../include/text.php:2297
-msgid "Import from a zipped folder:"
+#: ../../include/nav.php:196
+msgid "Private mail"
 msgstr ""
 
-#: ../../include/text.php:2298
-msgid "Import from cloud files:"
+#: ../../include/nav.php:197
+msgid "See all private messages"
 msgstr ""
 
-#: ../../include/text.php:2299
-msgid "/cloud/channel/path/to/folder"
+#: ../../include/nav.php:198
+msgid "Mark all private messages seen"
 msgstr ""
 
-#: ../../include/text.php:2300
-msgid "Enter path to website files"
+#: ../../include/nav.php:199 ../../include/widgets.php:700
+msgid "Inbox"
 msgstr ""
 
-#: ../../include/text.php:2301
-msgid "Select folder"
+#: ../../include/nav.php:200 ../../include/widgets.php:705
+msgid "Outbox"
 msgstr ""
 
-#: ../../include/text.php:2302
-msgid "Export website..."
+#: ../../include/nav.php:201 ../../include/widgets.php:710
+msgid "New Message"
 msgstr ""
 
-#: ../../include/text.php:2303
-msgid "Export to a zip file"
+#: ../../include/nav.php:204
+msgid "Event Calendar"
 msgstr ""
 
-#: ../../include/text.php:2304
-msgid "website.zip"
+#: ../../include/nav.php:205
+msgid "See all events"
 msgstr ""
 
-#: ../../include/text.php:2305
-msgid "Enter a name for the zip file."
+#: ../../include/nav.php:206
+msgid "Mark all events seen"
 msgstr ""
 
-#: ../../include/text.php:2306
-msgid "Export to cloud files"
+#: ../../include/nav.php:209
+msgid "Manage Your Channels"
 msgstr ""
 
-#: ../../include/text.php:2307
-msgid "/path/to/export/folder"
+#: ../../include/nav.php:211
+msgid "Account/Channel Settings"
 msgstr ""
 
-#: ../../include/text.php:2308
-msgid "Enter a path to a cloud files destination."
+#: ../../include/nav.php:219 ../../include/widgets.php:1595
+msgid "Admin"
 msgstr ""
 
-#: ../../include/text.php:2309
-msgid "Specify folder"
+#: ../../include/nav.php:219
+msgid "Site Setup and Configuration"
 msgstr ""
 
-#: ../../include/import.php:30
-msgid ""
-"Cannot create a duplicate channel identifier on this system. Import failed."
+#: ../../include/nav.php:250 ../../include/conversation.php:836
+msgid "Loading..."
 msgstr ""
 
-#: ../../include/import.php:90
-msgid "Channel clone failed. Import failed."
+#: ../../include/nav.php:255
+msgid "@name, #tag, ?doc, content"
 msgstr ""
 
-#: ../../include/import.php:1354
-msgid "Unable to import element \""
+#: ../../include/nav.php:256
+msgid "Please wait..."
 msgstr ""
 
 #: ../../include/security.php:117
@@ -12252,329 +12205,415 @@ msgid ""
 "form has been opened for too long (>3 hours) before submitting it."
 msgstr ""
 
-#: ../../include/items.php:837 ../../include/items.php:882
-msgid "(Unknown)"
+#: ../../include/help.php:31
+msgid "Help:"
 msgstr ""
 
-#: ../../include/items.php:1080
-msgid "Visible to anybody on the internet."
+#: ../../include/help.php:63
+msgid "Not Found"
 msgstr ""
 
-#: ../../include/items.php:1082
-msgid "Visible to you only."
+#: ../../include/auth.php:148
+msgid "Logged out."
 msgstr ""
 
-#: ../../include/items.php:1084
-msgid "Visible to anybody in this network."
+#: ../../include/auth.php:275
+msgid "Failed authentication"
 msgstr ""
 
-#: ../../include/items.php:1086
-msgid "Visible to anybody authenticated."
+#: ../../include/activities.php:41
+msgid " and "
 msgstr ""
 
-#: ../../include/items.php:1088
+#: ../../include/activities.php:49
+msgid "public profile"
+msgstr ""
+
+#: ../../include/activities.php:58
 #, php-format
-msgid "Visible to anybody on %s."
+msgid "%1$s changed %2$s to &ldquo;%3$s&rdquo;"
 msgstr ""
 
-#: ../../include/items.php:1090
-msgid "Visible to all connections."
+#: ../../include/activities.php:59
+#, php-format
+msgid "Visit %1$s's %2$s"
 msgstr ""
 
-#: ../../include/items.php:1092
-msgid "Visible to approved connections."
+#: ../../include/activities.php:62
+#, php-format
+msgid "%1$s has an updated %2$s, changing %3$s."
 msgstr ""
 
-#: ../../include/items.php:1094
-msgid "Visible to specific connections."
+#: ../../include/datetime.php:147
+msgid "Birthday"
 msgstr ""
 
-#: ../../include/items.php:3892
-msgid "Privacy group is empty."
+#: ../../include/datetime.php:149
+msgid "Age: "
 msgstr ""
 
-#: ../../include/items.php:3899
-#, php-format
-msgid "Privacy group: %s"
+#: ../../include/datetime.php:151
+msgid "YYYY-MM-DD or MM-DD"
 msgstr ""
 
-#: ../../include/items.php:3911
-msgid "Connection not found."
+#: ../../include/datetime.php:286 ../../boot.php:2564
+msgid "never"
 msgstr ""
 
-#: ../../include/items.php:4260
-msgid "profile photo"
+#: ../../include/datetime.php:292
+msgid "less than a second ago"
 msgstr ""
 
-#: ../../include/items.php:4456
+#: ../../include/datetime.php:310
 #, php-format
-msgid "[Edited %s]"
+msgctxt "e.g. 22 hours ago, 1 minute ago"
+msgid "%1$d %2$s ago"
 msgstr ""
 
-#: ../../include/items.php:4456
-msgctxt "edit_activity"
-msgid "Post"
+#: ../../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/items.php:4456
-msgctxt "edit_activity"
-msgid "Comment"
+#: ../../include/datetime.php:577
+#, php-format
+msgid "Happy Birthday %1$s"
 msgstr ""
 
-#: ../../include/auth.php:148
-msgid "Logged out."
+#: ../../include/dir_fns.php:141
+msgid "Directory Options"
 msgstr ""
 
-#: ../../include/auth.php:275
-msgid "Failed authentication"
+#: ../../include/dir_fns.php:143
+msgid "Safe Mode"
 msgstr ""
 
-#: ../../include/activities.php:41
-msgid " and "
+#: ../../include/dir_fns.php:144
+msgid "Public Forums Only"
 msgstr ""
 
-#: ../../include/activities.php:49
-msgid "public profile"
+#: ../../include/dir_fns.php:145
+msgid "This Website Only"
 msgstr ""
 
-#: ../../include/activities.php:58
+#: ../../include/photos.php:115
 #, php-format
-msgid "%1$s changed %2$s to &ldquo;%3$s&rdquo;"
+msgid "Image exceeds website size limit of %lu bytes"
 msgstr ""
 
-#: ../../include/activities.php:59
-#, php-format
-msgid "Visit %1$s's %2$s"
+#: ../../include/photos.php:122
+msgid "Image file is empty."
 msgstr ""
 
-#: ../../include/activities.php:62
+#: ../../include/photos.php:260
+msgid "Photo storage failed."
+msgstr ""
+
+#: ../../include/photos.php:300
+msgid "a new photo"
+msgstr ""
+
+#: ../../include/photos.php:304
 #, php-format
-msgid "%1$s has an updated %2$s, changing %3$s."
+msgctxt "photo_upload"
+msgid "%1$s posted %2$s to %3$s"
 msgstr ""
 
-#: ../../include/attach.php:248 ../../include/attach.php:336
-msgid "Item was not found."
+#: ../../include/photos.php:507 ../../include/conversation.php:1825
+msgid "Photo Albums"
 msgstr ""
 
-#: ../../include/attach.php:497
-msgid "No source file."
+#: ../../include/photos.php:511
+msgid "Upload New Photos"
 msgstr ""
 
-#: ../../include/attach.php:519
-msgid "Cannot locate file to replace"
+#: ../../include/selectors.php:30
+msgid "Frequently"
 msgstr ""
 
-#: ../../include/attach.php:537
-msgid "Cannot locate file to revise/update"
+#: ../../include/selectors.php:31
+msgid "Hourly"
 msgstr ""
 
-#: ../../include/attach.php:668
-#, php-format
-msgid "File exceeds size limit of %d"
+#: ../../include/selectors.php:32
+msgid "Twice daily"
 msgstr ""
 
-#: ../../include/attach.php:682
-#, php-format
-msgid "You have reached your limit of %1$.0f Mbytes attachment storage."
+#: ../../include/selectors.php:33
+msgid "Daily"
 msgstr ""
 
-#: ../../include/attach.php:852
-msgid "File upload failed. Possible system limit or action terminated."
+#: ../../include/selectors.php:34
+msgid "Weekly"
 msgstr ""
 
-#: ../../include/attach.php:865
-msgid "Stored file could not be verified. Upload failed."
+#: ../../include/selectors.php:35
+msgid "Monthly"
 msgstr ""
 
-#: ../../include/attach.php:920 ../../include/attach.php:936
-msgid "Path not available."
+#: ../../include/selectors.php:49
+msgid "Currently Male"
 msgstr ""
 
-#: ../../include/attach.php:982 ../../include/attach.php:1140
-msgid "Empty pathname"
+#: ../../include/selectors.php:49
+msgid "Currently Female"
 msgstr ""
 
-#: ../../include/attach.php:1008
-msgid "duplicate filename or path"
+#: ../../include/selectors.php:49
+msgid "Mostly Male"
 msgstr ""
 
-#: ../../include/attach.php:1030
-msgid "Path not found."
+#: ../../include/selectors.php:49
+msgid "Mostly Female"
 msgstr ""
 
-#: ../../include/attach.php:1094
-msgid "mkdir failed."
+#: ../../include/selectors.php:49
+msgid "Transgender"
 msgstr ""
 
-#: ../../include/attach.php:1098
-msgid "database storage failed."
+#: ../../include/selectors.php:49
+msgid "Intersex"
 msgstr ""
 
-#: ../../include/attach.php:1146
-msgid "Empty path"
+#: ../../include/selectors.php:49
+msgid "Transsexual"
 msgstr ""
 
-#: ../../include/event.php:824
-msgid "This event has been added to your calendar."
+#: ../../include/selectors.php:49
+msgid "Hermaphrodite"
 msgstr ""
 
-#: ../../include/event.php:1024
-msgid "Not specified"
+#: ../../include/selectors.php:49
+msgid "Neuter"
 msgstr ""
 
-#: ../../include/event.php:1025
-msgid "Needs Action"
+#: ../../include/selectors.php:49
+msgid "Non-specific"
 msgstr ""
 
-#: ../../include/event.php:1026
-msgid "Completed"
+#: ../../include/selectors.php:49
+msgid "Undecided"
 msgstr ""
 
-#: ../../include/event.php:1027
-msgid "In Process"
+#: ../../include/selectors.php:85 ../../include/selectors.php:104
+msgid "Males"
 msgstr ""
 
-#: ../../include/event.php:1028
-msgid "Cancelled"
+#: ../../include/selectors.php:85 ../../include/selectors.php:104
+msgid "Females"
 msgstr ""
 
-#: ../../include/follow.php:27
-msgid "Channel is blocked on this site."
+#: ../../include/selectors.php:85
+msgid "Gay"
 msgstr ""
 
-#: ../../include/follow.php:32
-msgid "Channel location missing."
+#: ../../include/selectors.php:85
+msgid "Lesbian"
 msgstr ""
 
-#: ../../include/follow.php:80
-msgid "Response from remote channel was incomplete."
+#: ../../include/selectors.php:85
+msgid "No Preference"
 msgstr ""
 
-#: ../../include/follow.php:97
-msgid "Channel was deleted and no longer exists."
+#: ../../include/selectors.php:85
+msgid "Bisexual"
 msgstr ""
 
-#: ../../include/follow.php:147 ../../include/follow.php:183
-msgid "Protocol disabled."
+#: ../../include/selectors.php:85
+msgid "Autosexual"
 msgstr ""
 
-#: ../../include/follow.php:171
-msgid "Channel discovery failed."
+#: ../../include/selectors.php:85
+msgid "Abstinent"
 msgstr ""
 
-#: ../../include/follow.php:210
-msgid "Cannot connect to yourself."
+#: ../../include/selectors.php:85
+msgid "Virgin"
 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/selectors.php:85
+msgid "Deviant"
 msgstr ""
 
-#: ../../include/group.php:248
-msgid "Add new connections to this privacy group"
+#: ../../include/selectors.php:85
+msgid "Fetish"
 msgstr ""
 
-#: ../../include/group.php:289
-msgid "edit"
+#: ../../include/selectors.php:85
+msgid "Oodles"
 msgstr ""
 
-#: ../../include/group.php:312
-msgid "Edit group"
+#: ../../include/selectors.php:85
+msgid "Nonsexual"
 msgstr ""
 
-#: ../../include/group.php:313
-msgid "Add privacy group"
+#: ../../include/selectors.php:123 ../../include/selectors.php:140
+msgid "Single"
 msgstr ""
 
-#: ../../include/group.php:314
-msgid "Channels not in any privacy group"
+#: ../../include/selectors.php:123
+msgid "Lonely"
 msgstr ""
 
-#: ../../include/group.php:316 ../../include/widgets.php:284
-msgid "add"
+#: ../../include/selectors.php:123
+msgid "Available"
 msgstr ""
 
-#: ../../include/language.php:380
-msgid "Select an alternate language"
+#: ../../include/selectors.php:123
+msgid "Unavailable"
 msgstr ""
 
-#: ../../include/photos.php:115
-#, php-format
-msgid "Image exceeds website size limit of %lu bytes"
+#: ../../include/selectors.php:123
+msgid "Has crush"
 msgstr ""
 
-#: ../../include/photos.php:122
-msgid "Image file is empty."
+#: ../../include/selectors.php:123
+msgid "Infatuated"
 msgstr ""
 
-#: ../../include/photos.php:260
-msgid "Photo storage failed."
+#: ../../include/selectors.php:123 ../../include/selectors.php:140
+msgid "Dating"
 msgstr ""
 
-#: ../../include/photos.php:300
-msgid "a new photo"
+#: ../../include/selectors.php:123
+msgid "Unfaithful"
 msgstr ""
 
-#: ../../include/photos.php:304
-#, php-format
-msgctxt "photo_upload"
-msgid "%1$s posted %2$s to %3$s"
+#: ../../include/selectors.php:123
+msgid "Sex Addict"
 msgstr ""
 
-#: ../../include/photos.php:507 ../../include/conversation.php:1677
-msgid "Photo Albums"
+#: ../../include/selectors.php:123
+msgid "Friends/Benefits"
 msgstr ""
 
-#: ../../include/photos.php:511
-msgid "Upload New Photos"
+#: ../../include/selectors.php:123
+msgid "Casual"
 msgstr ""
 
-#: ../../include/acl_selectors.php:198
-msgid "Who can see this?"
+#: ../../include/selectors.php:123
+msgid "Engaged"
 msgstr ""
 
-#: ../../include/acl_selectors.php:199
-msgid "Custom selection"
+#: ../../include/selectors.php:123 ../../include/selectors.php:140
+msgid "Married"
 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/selectors.php:123
+msgid "Imaginarily married"
 msgstr ""
 
-#: ../../include/acl_selectors.php:201
-msgid "Show"
+#: ../../include/selectors.php:123
+msgid "Partners"
 msgstr ""
 
-#: ../../include/acl_selectors.php:202
-msgid "Don't show"
+#: ../../include/selectors.php:123 ../../include/selectors.php:140
+msgid "Cohabiting"
 msgstr ""
 
-#: ../../include/acl_selectors.php:235
-#, 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."
+#: ../../include/selectors.php:123
+msgid "Common law"
 msgstr ""
 
-#: ../../include/oembed.php:312
-msgid " by "
+#: ../../include/selectors.php:123
+msgid "Happy"
 msgstr ""
 
-#: ../../include/oembed.php:313
-msgid " on "
+#: ../../include/selectors.php:123
+msgid "Not looking"
 msgstr ""
 
-#: ../../include/oembed.php:342
-msgid "Embedded content"
+#: ../../include/selectors.php:123
+msgid "Swinger"
 msgstr ""
 
-#: ../../include/oembed.php:351
-msgid "Embedding disabled"
+#: ../../include/selectors.php:123
+msgid "Betrayed"
+msgstr ""
+
+#: ../../include/selectors.php:123 ../../include/selectors.php:140
+msgid "Separated"
+msgstr ""
+
+#: ../../include/selectors.php:123
+msgid "Unstable"
+msgstr ""
+
+#: ../../include/selectors.php:123 ../../include/selectors.php:140
+msgid "Divorced"
+msgstr ""
+
+#: ../../include/selectors.php:123
+msgid "Imaginarily divorced"
+msgstr ""
+
+#: ../../include/selectors.php:123 ../../include/selectors.php:140
+msgid "Widowed"
+msgstr ""
+
+#: ../../include/selectors.php:123
+msgid "Uncertain"
+msgstr ""
+
+#: ../../include/selectors.php:123 ../../include/selectors.php:140
+msgid "It's complicated"
+msgstr ""
+
+#: ../../include/selectors.php:123
+msgid "Don't care"
+msgstr ""
+
+#: ../../include/selectors.php:123
+msgid "Ask me"
 msgstr ""
 
 #: ../../include/widgets.php:103
@@ -12702,8 +12741,8 @@ msgstr ""
 msgid "Import Calendar"
 msgstr ""
 
-#: ../../include/widgets.php:883 ../../include/conversation.php:1704
-#: ../../include/conversation.php:1707
+#: ../../include/widgets.php:883 ../../include/conversation.php:1852
+#: ../../include/conversation.php:1855
 msgid "Chatrooms"
 msgstr ""
 
@@ -12783,98 +12822,6 @@ msgstr ""
 msgid "Plugin Features"
 msgstr ""
 
-#: ../../include/network.php:729
-msgid "view full size"
-msgstr ""
-
-#: ../../include/network.php:1978
-msgid "No Subject"
-msgstr ""
-
-#: ../../include/network.php:2234
-msgid "OStatus"
-msgstr ""
-
-#: ../../include/network.php:2235
-msgid "GNU-Social"
-msgstr ""
-
-#: ../../include/network.php:2236
-msgid "RSS/Atom"
-msgstr ""
-
-#: ../../include/network.php:2239
-msgid "Facebook"
-msgstr ""
-
-#: ../../include/network.php:2240
-msgid "Zot"
-msgstr ""
-
-#: ../../include/network.php:2241
-msgid "LinkedIn"
-msgstr ""
-
-#: ../../include/network.php:2242
-msgid "XMPP/IM"
-msgstr ""
-
-#: ../../include/network.php:2243
-msgid "MySpace"
-msgstr ""
-
-#: ../../include/permissions.php:35
-msgid "Can view my normal stream and posts"
-msgstr ""
-
-#: ../../include/permissions.php:39
-msgid "Can view my webpages"
-msgstr ""
-
-#: ../../include/permissions.php:43
-msgid "Can post on my channel page (\"wall\")"
-msgstr ""
-
-#: ../../include/permissions.php:46
-msgid "Can like/dislike stuff"
-msgstr ""
-
-#: ../../include/permissions.php:46
-msgid "Profiles and things other than posts/comments"
-msgstr ""
-
-#: ../../include/permissions.php:48
-msgid "Can forward to all my channel contacts via post @mentions"
-msgstr ""
-
-#: ../../include/permissions.php:48
-msgid "Advanced - useful for creating group forum channels"
-msgstr ""
-
-#: ../../include/permissions.php:49
-msgid "Can chat with me (when available)"
-msgstr ""
-
-#: ../../include/permissions.php:50
-msgid "Can write to my file storage and photos"
-msgstr ""
-
-#: ../../include/permissions.php:51
-msgid "Can edit my webpages"
-msgstr ""
-
-#: ../../include/permissions.php:53
-msgid "Somewhat advanced - very useful in open communities"
-msgstr ""
-
-#: ../../include/permissions.php:55
-msgid "Can administer my channel resources"
-msgstr ""
-
-#: ../../include/permissions.php:55
-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"
@@ -12890,306 +12837,400 @@ msgstr ""
 msgid "View %s's profile @ %s"
 msgstr ""
 
-#: ../../include/conversation.php:709
+#: ../../include/conversation.php:710
 msgid "Categories:"
 msgstr ""
 
-#: ../../include/conversation.php:710
+#: ../../include/conversation.php:711
 msgid "Filed under:"
 msgstr ""
 
-#: ../../include/conversation.php:735
+#: ../../include/conversation.php:736
 msgid "View in context"
 msgstr ""
 
-#: ../../include/conversation.php:831
+#: ../../include/conversation.php:832
 msgid "remove"
 msgstr ""
 
-#: ../../include/conversation.php:836
+#: ../../include/conversation.php:837
 msgid "Delete Selected Items"
 msgstr ""
 
-#: ../../include/conversation.php:929
+#: ../../include/conversation.php:930 ../../include/conversation.php:972
 msgid "View Source"
 msgstr ""
 
-#: ../../include/conversation.php:930
+#: ../../include/conversation.php:931 ../../include/conversation.php:982
 msgid "Follow Thread"
 msgstr ""
 
-#: ../../include/conversation.php:931
+#: ../../include/conversation.php:932 ../../include/conversation.php:991
 msgid "Unfollow Thread"
 msgstr ""
 
-#: ../../include/conversation.php:936
+#: ../../include/conversation.php:937 ../../include/conversation.php:1059
 msgid "Activity/Posts"
 msgstr ""
 
-#: ../../include/conversation.php:938
+#: ../../include/conversation.php:939 ../../include/conversation.php:1079
 msgid "Edit Connection"
 msgstr ""
 
-#: ../../include/conversation.php:939
+#: ../../include/conversation.php:940 ../../include/conversation.php:1089
 msgid "Message"
 msgstr ""
 
-#: ../../include/conversation.php:1075
+#: ../../include/conversation.php:1223
 #, php-format
 msgid "%s likes this."
 msgstr ""
 
-#: ../../include/conversation.php:1075
+#: ../../include/conversation.php:1223
 #, php-format
 msgid "%s doesn't like this."
 msgstr ""
 
-#: ../../include/conversation.php:1079
+#: ../../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/conversation.php:1081
+#: ../../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/conversation.php:1087
+#: ../../include/conversation.php:1235
 msgid "and"
 msgstr ""
 
-#: ../../include/conversation.php:1090
+#: ../../include/conversation.php:1238
 #, php-format
 msgid ", and %d other people"
 msgid_plural ", and %d other people"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../../include/conversation.php:1091
+#: ../../include/conversation.php:1239
 #, php-format
 msgid "%s like this."
 msgstr ""
 
-#: ../../include/conversation.php:1091
+#: ../../include/conversation.php:1239
 #, php-format
 msgid "%s don't like this."
 msgstr ""
 
-#: ../../include/conversation.php:1134
+#: ../../include/conversation.php:1282
 msgid "Set your location"
 msgstr ""
 
-#: ../../include/conversation.php:1135
+#: ../../include/conversation.php:1283
 msgid "Clear browser location"
 msgstr ""
 
-#: ../../include/conversation.php:1183
+#: ../../include/conversation.php:1331
 msgid "Tag term:"
 msgstr ""
 
-#: ../../include/conversation.php:1184
+#: ../../include/conversation.php:1332
 msgid "Where are you right now?"
 msgstr ""
 
-#: ../../include/conversation.php:1189
+#: ../../include/conversation.php:1337
 msgid "Choose a different album..."
 msgstr ""
 
-#: ../../include/conversation.php:1193
+#: ../../include/conversation.php:1341
 msgid "Comments enabled"
 msgstr ""
 
-#: ../../include/conversation.php:1194
+#: ../../include/conversation.php:1342
 msgid "Comments disabled"
 msgstr ""
 
-#: ../../include/conversation.php:1232
+#: ../../include/conversation.php:1380
 msgid "Page link name"
 msgstr ""
 
-#: ../../include/conversation.php:1235
+#: ../../include/conversation.php:1383
 msgid "Post as"
 msgstr ""
 
-#: ../../include/conversation.php:1249
+#: ../../include/conversation.php:1397
 msgid "Toggle voting"
 msgstr ""
 
-#: ../../include/conversation.php:1252
+#: ../../include/conversation.php:1400
 msgid "Disable comments"
 msgstr ""
 
-#: ../../include/conversation.php:1253
+#: ../../include/conversation.php:1401
 msgid "Toggle comments"
 msgstr ""
 
-#: ../../include/conversation.php:1261
+#: ../../include/conversation.php:1409
 msgid "Categories (optional, comma-separated list)"
 msgstr ""
 
-#: ../../include/conversation.php:1284
+#: ../../include/conversation.php:1432
 msgid "Other networks and post services"
 msgstr ""
 
-#: ../../include/conversation.php:1290
+#: ../../include/conversation.php:1438
 msgid "Set publish date"
 msgstr ""
 
-#: ../../include/conversation.php:1544
+#: ../../include/conversation.php:1692
 msgid "Discover"
 msgstr ""
 
-#: ../../include/conversation.php:1547
+#: ../../include/conversation.php:1695
 msgid "Imported public streams"
 msgstr ""
 
-#: ../../include/conversation.php:1552
+#: ../../include/conversation.php:1700
 msgid "Commented Order"
 msgstr ""
 
-#: ../../include/conversation.php:1555
+#: ../../include/conversation.php:1703
 msgid "Sort by Comment Date"
 msgstr ""
 
-#: ../../include/conversation.php:1559
+#: ../../include/conversation.php:1707
 msgid "Posted Order"
 msgstr ""
 
-#: ../../include/conversation.php:1562
+#: ../../include/conversation.php:1710
 msgid "Sort by Post Date"
 msgstr ""
 
-#: ../../include/conversation.php:1570
+#: ../../include/conversation.php:1718
 msgid "Posts that mention or involve you"
 msgstr ""
 
-#: ../../include/conversation.php:1579
+#: ../../include/conversation.php:1727
 msgid "Activity Stream - by date"
 msgstr ""
 
-#: ../../include/conversation.php:1585
+#: ../../include/conversation.php:1733
 msgid "Starred"
 msgstr ""
 
-#: ../../include/conversation.php:1588
+#: ../../include/conversation.php:1736
 msgid "Favourite Posts"
 msgstr ""
 
-#: ../../include/conversation.php:1595
+#: ../../include/conversation.php:1743
 msgid "Spam"
 msgstr ""
 
-#: ../../include/conversation.php:1598
+#: ../../include/conversation.php:1746
 msgid "Posts flagged as SPAM"
 msgstr ""
 
-#: ../../include/conversation.php:1656
+#: ../../include/conversation.php:1804
 msgid "Status Messages and Posts"
 msgstr ""
 
-#: ../../include/conversation.php:1668
+#: ../../include/conversation.php:1816
 msgid "Profile Details"
 msgstr ""
 
-#: ../../include/conversation.php:1684
+#: ../../include/conversation.php:1832
 msgid "Files and Storage"
 msgstr ""
 
-#: ../../include/conversation.php:1720
+#: ../../include/conversation.php:1868
 msgid "Saved Bookmarks"
 msgstr ""
 
-#: ../../include/conversation.php:1730
+#: ../../include/conversation.php:1878
 msgid "Manage Webpages"
 msgstr ""
 
-#: ../../include/conversation.php:1795
+#: ../../include/conversation.php:1943
 msgctxt "noun"
 msgid "Attending"
 msgid_plural "Attending"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../../include/conversation.php:1798
+#: ../../include/conversation.php:1946
 msgctxt "noun"
 msgid "Not Attending"
 msgid_plural "Not Attending"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../../include/conversation.php:1801
+#: ../../include/conversation.php:1949
 msgctxt "noun"
 msgid "Undecided"
 msgid_plural "Undecided"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../../include/conversation.php:1804
+#: ../../include/conversation.php:1952
 msgctxt "noun"
 msgid "Agree"
 msgid_plural "Agrees"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../../include/conversation.php:1807
+#: ../../include/conversation.php:1955
 msgctxt "noun"
 msgid "Disagree"
 msgid_plural "Disagrees"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../../include/conversation.php:1810
+#: ../../include/conversation.php:1958
 msgctxt "noun"
 msgid "Abstain"
 msgid_plural "Abstains"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../../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/permissions.php:35
+msgid "Can view my normal stream and posts"
 msgstr ""
 
-#: ../../include/bbcode.php:173 ../../include/bbcode.php:1012
-msgid "Encrypted content"
+#: ../../include/permissions.php:39
+msgid "Can view my webpages"
 msgstr ""
 
-#: ../../include/bbcode.php:189
-#, php-format
-msgid "Install %s element: "
+#: ../../include/permissions.php:43
+msgid "Can post on my channel page (\"wall\")"
 msgstr ""
 
-#: ../../include/bbcode.php:193
-#, php-format
+#: ../../include/permissions.php:46
+msgid "Can like/dislike stuff"
+msgstr ""
+
+#: ../../include/permissions.php:46
+msgid "Profiles and things other than posts/comments"
+msgstr ""
+
+#: ../../include/permissions.php:48
+msgid "Can forward to all my channel contacts via post @mentions"
+msgstr ""
+
+#: ../../include/permissions.php:48
+msgid "Advanced - useful for creating group forum channels"
+msgstr ""
+
+#: ../../include/permissions.php:49
+msgid "Can chat with me (when available)"
+msgstr ""
+
+#: ../../include/permissions.php:50
+msgid "Can write to my file storage and photos"
+msgstr ""
+
+#: ../../include/permissions.php:51
+msgid "Can edit my webpages"
+msgstr ""
+
+#: ../../include/permissions.php:53
+msgid "Somewhat advanced - very useful in open communities"
+msgstr ""
+
+#: ../../include/permissions.php:55
+msgid "Can administer my channel resources"
+msgstr ""
+
+#: ../../include/permissions.php:55
+msgid "Extremely advanced. Leave this alone unless you know what you are doing"
+msgstr ""
+
+#: ../../include/import.php:30
 msgid ""
-"This post contains an installable %s element, however you lack permissions "
-"to install it on this site."
+"Cannot create a duplicate channel identifier on this system. Import failed."
 msgstr ""
 
-#: ../../include/bbcode.php:272
-#, php-format
-msgid "%1$s wrote the following %2$s %3$s"
+#: ../../include/import.php:90
+msgid "Channel clone failed. Import failed."
 msgstr ""
 
-#: ../../include/bbcode.php:349 ../../include/bbcode.php:357
-msgid "Click to open/close"
+#: ../../include/import.php:1354
+msgid "Unable to import element \""
 msgstr ""
 
-#: ../../include/bbcode.php:357
-msgid "spoiler"
+#: ../../include/network.php:729
+msgid "view full size"
 msgstr ""
 
-#: ../../include/bbcode.php:950
-msgid "$1 wrote:"
+#: ../../include/network.php:1978
+msgid "No Subject"
+msgstr ""
+
+#: ../../include/network.php:2234
+msgid "OStatus"
+msgstr ""
+
+#: ../../include/network.php:2235
+msgid "GNU-Social"
+msgstr ""
+
+#: ../../include/network.php:2236
+msgid "RSS/Atom"
+msgstr ""
+
+#: ../../include/network.php:2239
+msgid "Facebook"
+msgstr ""
+
+#: ../../include/network.php:2240
+msgid "Zot"
+msgstr ""
+
+#: ../../include/network.php:2241
+msgid "LinkedIn"
+msgstr ""
+
+#: ../../include/network.php:2242
+msgid "XMPP/IM"
+msgstr ""
+
+#: ../../include/network.php:2243
+msgid "MySpace"
+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 ""
 
 #: ../../util/nconfig.php:34
author	zotlabs <mike@macgirvin.com>	2016-12-24 15:00:37 -0800
committer	zotlabs <mike@macgirvin.com>	2016-12-24 15:00:37 -0800
commit	35ed9b9b72cd2f8440c80ef395e119282bcd6383 (patch)
tree	d5a40da68f79081a70996725e0299d08bdf562ec /util/hmessages.po
parent	1e535283631b99b43e087c8dea292ed3b4dd2e6b (diff)
download	volse-hubzilla-35ed9b9b72cd2f8440c80ef395e119282bcd6383.tar.gz volse-hubzilla-35ed9b9b72cd2f8440c80ef395e119282bcd6383.tar.bz2 volse-hubzilla-35ed9b9b72cd2f8440c80ef395e119282bcd6383.zip