Merge branch '1.8RC'

author: redmatrix <git@macgirvin.com> 2016-06-19 19:12:33 -0700
committer: redmatrix <git@macgirvin.com> 2016-06-19 19:12:33 -0700
commit: fb61c4fb3497d3751bb43f12cadee9e9c7776be9 (patch)
tree: 604989e10424456783fccff1fccc5b14da26db7f /util
parent: bfaabfb7b5ff639992a01b0e1fc374cd43d536e9 (diff)
parent: 4578649f758e65f1d87ebb98da7cd891d0b90d0d (diff)
download: volse-hubzilla-fb61c4fb3497d3751bb43f12cadee9e9c7776be9.tar.gz
volse-hubzilla-fb61c4fb3497d3751bb43f12cadee9e9c7776be9.tar.bz2
volse-hubzilla-fb61c4fb3497d3751bb43f12cadee9e9c7776be9.zip
6 files changed, 4322 insertions, 4254 deletions
diff --git a/util/addons b/util/addons
index 8fcd40cbc..150a7ca09 100755
--- a/util/addons
+++ b/util/addons
@@ -17,7 +17,6 @@ EOT;
 require_once('include/cli_startup.php');
 
 cli_startup();
-$a = get_app();
 
 	$plugs = get_config('system', 'addon');
 	$plugins_arr = array();
diff --git a/util/fresh b/util/fresh
index c70f1cac9..9d74ea584 100755
--- a/util/fresh
+++ b/util/fresh
@@ -68,9 +68,9 @@ function process_command($line) {
 
 		case 'finger':
 			if(argv(1)) {
-				$x = zot_finger(argv(1),$channel);
+				$x = Zotlabs\Zot\Finger::run(argv(1),$channel);
 				if($x['success'])
-					echo jindent($x['body']);
+					echo jindent($x);
 			}
 			break;
 
diff --git a/util/hmessages.po b/util/hmessages.po
index 8b3d88f07..2ec494c7c 100644
--- a/util/hmessages.po
+++ b/util/hmessages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-05-06 00:01-0700\n"
+"POT-Creation-Date: 2016-06-10 00:02-0700\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"
@@ -21,7 +21,7 @@ msgstr ""
 msgid "parent"
 msgstr ""
 
-#: ../../Zotlabs/Storage/Browser.php:131 ../../include/text.php:2635
+#: ../../Zotlabs/Storage/Browser.php:131 ../../include/text.php:2620
 msgid "Collection"
 msgstr ""
 
@@ -45,16 +45,16 @@ msgstr ""
 msgid "Schedule Outbox"
 msgstr ""
 
-#: ../../Zotlabs/Storage/Browser.php:164 ../../Zotlabs/Module/Photos.php:797
-#: ../../Zotlabs/Module/Photos.php:1242 ../../include/apps.php:441
-#: ../../include/apps.php:516 ../../include/widgets.php:1506
-#: ../../include/conversation.php:1037
+#: ../../Zotlabs/Storage/Browser.php:164 ../../Zotlabs/Module/Photos.php:798
+#: ../../Zotlabs/Module/Photos.php:1243 ../../Zotlabs/Lib/Apps.php:486
+#: ../../Zotlabs/Lib/Apps.php:561 ../../include/widgets.php:1505
+#: ../../include/conversation.php:1032
 msgid "Unknown"
 msgstr ""
 
 #: ../../Zotlabs/Storage/Browser.php:226 ../../Zotlabs/Module/Fbrowser.php:85
-#: ../../include/apps.php:167 ../../include/conversation.php:1649
-#: ../../include/nav.php:93
+#: ../../Zotlabs/Lib/Apps.php:216 ../../include/nav.php:93
+#: ../../include/conversation.php:1639
 msgid "Files"
 msgstr ""
 
@@ -66,23 +66,23 @@ msgstr ""
 msgid "Shared"
 msgstr ""
 
-#: ../../Zotlabs/Storage/Browser.php:230 ../../Zotlabs/Storage/Browser.php:303
-#: ../../Zotlabs/Module/Blocks.php:158 ../../Zotlabs/Module/Layouts.php:182
+#: ../../Zotlabs/Storage/Browser.php:230 ../../Zotlabs/Storage/Browser.php:306
+#: ../../Zotlabs/Module/Blocks.php:156 ../../Zotlabs/Module/Layouts.php:182
 #: ../../Zotlabs/Module/Menu.php:118 ../../Zotlabs/Module/New_channel.php:142
-#: ../../Zotlabs/Module/Webpages.php:188
+#: ../../Zotlabs/Module/Webpages.php:186
 msgid "Create"
 msgstr ""
 
-#: ../../Zotlabs/Storage/Browser.php:231 ../../Zotlabs/Storage/Browser.php:305
+#: ../../Zotlabs/Storage/Browser.php:231 ../../Zotlabs/Storage/Browser.php:308
 #: ../../Zotlabs/Module/Cover_photo.php:357
-#: ../../Zotlabs/Module/Photos.php:824 ../../Zotlabs/Module/Photos.php:1366
-#: ../../Zotlabs/Module/Profile_photo.php:368 ../../include/widgets.php:1519
+#: ../../Zotlabs/Module/Photos.php:825 ../../Zotlabs/Module/Photos.php:1364
+#: ../../Zotlabs/Module/Profile_photo.php:368 ../../include/widgets.php:1518
 msgid "Upload"
 msgstr ""
 
-#: ../../Zotlabs/Storage/Browser.php:235 ../../Zotlabs/Module/Admin.php:1180
-#: ../../Zotlabs/Module/Chat.php:245 ../../Zotlabs/Module/Settings.php:590
-#: ../../Zotlabs/Module/Settings.php:616
+#: ../../Zotlabs/Storage/Browser.php:235 ../../Zotlabs/Module/Chat.php:247
+#: ../../Zotlabs/Module/Admin.php:1223 ../../Zotlabs/Module/Settings.php:592
+#: ../../Zotlabs/Module/Settings.php:618
 #: ../../Zotlabs/Module/Sharedwithme.php:99
 msgid "Name"
 msgstr ""
@@ -92,7 +92,7 @@ msgid "Type"
 msgstr ""
 
 #: ../../Zotlabs/Storage/Browser.php:237
-#: ../../Zotlabs/Module/Sharedwithme.php:101 ../../include/text.php:1322
+#: ../../Zotlabs/Module/Sharedwithme.php:101 ../../include/text.php:1344
 msgid "Size"
 msgstr ""
 
@@ -101,121 +101,127 @@ msgstr ""
 msgid "Last Modified"
 msgstr ""
 
-#: ../../Zotlabs/Storage/Browser.php:240 ../../Zotlabs/Module/Admin.php:1796
-#: ../../Zotlabs/Module/Blocks.php:159
+#: ../../Zotlabs/Storage/Browser.php:240 ../../Zotlabs/Module/Blocks.php:157
+#: ../../Zotlabs/Module/Editblock.php:109
 #: ../../Zotlabs/Module/Connections.php:290
 #: ../../Zotlabs/Module/Connections.php:310
-#: ../../Zotlabs/Module/Editblock.php:136
-#: ../../Zotlabs/Module/Editlayout.php:113
 #: ../../Zotlabs/Module/Editpost.php:84
-#: ../../Zotlabs/Module/Editwebpage.php:181
+#: ../../Zotlabs/Module/Editlayout.php:113
+#: ../../Zotlabs/Module/Editwebpage.php:146
 #: ../../Zotlabs/Module/Layouts.php:190 ../../Zotlabs/Module/Menu.php:112
-#: ../../Zotlabs/Module/Settings.php:650 ../../Zotlabs/Module/Thing.php:260
-#: ../../Zotlabs/Module/Webpages.php:189 ../../include/identity.php:937
-#: ../../include/identity.php:941 ../../include/apps.php:291
-#: ../../include/ItemObject.php:100 ../../include/menu.php:108
-#: ../../include/page_widgets.php:8 ../../include/page_widgets.php:36
+#: ../../Zotlabs/Module/Admin.php:2113 ../../Zotlabs/Module/Settings.php:652
+#: ../../Zotlabs/Module/Thing.php:260 ../../Zotlabs/Module/Webpages.php:187
+#: ../../Zotlabs/Lib/Apps.php:337 ../../Zotlabs/Lib/ThreadItem.php:106
+#: ../../include/channel.php:937 ../../include/channel.php:941
+#: ../../include/menu.php:108 ../../include/page_widgets.php:8
+#: ../../include/page_widgets.php:36
 msgid "Edit"
 msgstr ""
 
-#: ../../Zotlabs/Storage/Browser.php:241 ../../Zotlabs/Module/Admin.php:1015
-#: ../../Zotlabs/Module/Admin.php:1174 ../../Zotlabs/Module/Admin.php:1797
-#: ../../Zotlabs/Module/Blocks.php:161
+#: ../../Zotlabs/Storage/Browser.php:241 ../../Zotlabs/Module/Blocks.php:159
+#: ../../Zotlabs/Module/Connedit.php:572
+#: ../../Zotlabs/Module/Editblock.php:134
 #: ../../Zotlabs/Module/Connections.php:263
-#: ../../Zotlabs/Module/Connedit.php:573
-#: ../../Zotlabs/Module/Editblock.php:176
 #: ../../Zotlabs/Module/Editlayout.php:136
-#: ../../Zotlabs/Module/Editwebpage.php:221 ../../Zotlabs/Module/Group.php:177
-#: ../../Zotlabs/Module/Photos.php:1172 ../../Zotlabs/Module/Settings.php:651
-#: ../../Zotlabs/Module/Thing.php:261 ../../Zotlabs/Module/Webpages.php:191
-#: ../../include/apps.php:292 ../../include/ItemObject.php:120
-#: ../../include/conversation.php:657
+#: ../../Zotlabs/Module/Editwebpage.php:170 ../../Zotlabs/Module/Group.php:177
+#: ../../Zotlabs/Module/Photos.php:1173 ../../Zotlabs/Module/Admin.php:1039
+#: ../../Zotlabs/Module/Admin.php:1213 ../../Zotlabs/Module/Admin.php:2114
+#: ../../Zotlabs/Module/Settings.php:653 ../../Zotlabs/Module/Thing.php:261
+#: ../../Zotlabs/Module/Webpages.php:189 ../../Zotlabs/Lib/Apps.php:338
+#: ../../Zotlabs/Lib/ThreadItem.php:126 ../../include/conversation.php:657
 msgid "Delete"
 msgstr ""
 
-#: ../../Zotlabs/Storage/Browser.php:282
+#: ../../Zotlabs/Storage/Browser.php:285
 #, php-format
 msgid "You are using %1$s of your available file storage."
 msgstr ""
 
-#: ../../Zotlabs/Storage/Browser.php:287
+#: ../../Zotlabs/Storage/Browser.php:290
 #, php-format
 msgid "You are using %1$s of %2$s available file storage. (%3$s&#37;)"
 msgstr ""
 
-#: ../../Zotlabs/Storage/Browser.php:299
+#: ../../Zotlabs/Storage/Browser.php:302
 msgid "WARNING:"
 msgstr ""
 
-#: ../../Zotlabs/Storage/Browser.php:302
+#: ../../Zotlabs/Storage/Browser.php:305
 msgid "Create new folder"
 msgstr ""
 
-#: ../../Zotlabs/Storage/Browser.php:304
+#: ../../Zotlabs/Storage/Browser.php:307
 msgid "Upload file"
 msgstr ""
 
-#: ../../Zotlabs/Web/Router.php:65 ../../Zotlabs/Module/Achievements.php:34
-#: ../../Zotlabs/Module/Api.php:13 ../../Zotlabs/Module/Api.php:18
-#: ../../Zotlabs/Module/Appman.php:74 ../../Zotlabs/Module/Authtest.php:16
-#: ../../Zotlabs/Module/Block.php:26 ../../Zotlabs/Module/Block.php:76
-#: ../../Zotlabs/Module/Blocks.php:73 ../../Zotlabs/Module/Blocks.php:80
-#: ../../Zotlabs/Module/Bookmarks.php:61 ../../Zotlabs/Module/Channel.php:104
-#: ../../Zotlabs/Module/Channel.php:224 ../../Zotlabs/Module/Channel.php:264
-#: ../../Zotlabs/Module/Chat.php:98 ../../Zotlabs/Module/Chat.php:103
+#: ../../Zotlabs/Web/WebServer.php:120 ../../Zotlabs/Module/Dreport.php:10
+#: ../../Zotlabs/Module/Dreport.php:49 ../../Zotlabs/Module/Group.php:72
+#: ../../Zotlabs/Module/Like.php:284 ../../Zotlabs/Module/Import_items.php:112
+#: ../../Zotlabs/Module/Profperm.php:28 ../../Zotlabs/Module/Subthread.php:62
+#: ../../include/items.php:385
+msgid "Permission denied"
+msgstr ""
+
+#: ../../Zotlabs/Web/WebServer.php:121 ../../Zotlabs/Web/Router.php:65
+#: ../../Zotlabs/Module/Achievements.php:34 ../../Zotlabs/Module/Blocks.php:73
+#: ../../Zotlabs/Module/Blocks.php:80 ../../Zotlabs/Module/Channel.php:105
+#: ../../Zotlabs/Module/Channel.php:226 ../../Zotlabs/Module/Channel.php:267
+#: ../../Zotlabs/Module/Chat.php:100 ../../Zotlabs/Module/Chat.php:105
+#: ../../Zotlabs/Module/Authtest.php:16 ../../Zotlabs/Module/Block.php:26
+#: ../../Zotlabs/Module/Block.php:76 ../../Zotlabs/Module/Bookmarks.php:61
+#: ../../Zotlabs/Module/Connedit.php:366 ../../Zotlabs/Module/Editblock.php:67
 #: ../../Zotlabs/Module/Common.php:39 ../../Zotlabs/Module/Connections.php:33
-#: ../../Zotlabs/Module/Connedit.php:366
 #: ../../Zotlabs/Module/Cover_photo.php:277
 #: ../../Zotlabs/Module/Cover_photo.php:290
-#: ../../Zotlabs/Module/Editblock.php:66
+#: ../../Zotlabs/Module/Editpost.php:17 ../../Zotlabs/Module/Events.php:265
 #: ../../Zotlabs/Module/Editlayout.php:67
-#: ../../Zotlabs/Module/Editlayout.php:90 ../../Zotlabs/Module/Editpost.php:17
-#: ../../Zotlabs/Module/Editwebpage.php:68
+#: ../../Zotlabs/Module/Editlayout.php:90
+#: ../../Zotlabs/Module/Editwebpage.php:69
 #: ../../Zotlabs/Module/Editwebpage.php:90
 #: ../../Zotlabs/Module/Editwebpage.php:105
-#: ../../Zotlabs/Module/Editwebpage.php:129
-#: ../../Zotlabs/Module/Events.php:264 ../../Zotlabs/Module/Filestorage.php:22
-#: ../../Zotlabs/Module/Filestorage.php:77
-#: ../../Zotlabs/Module/Filestorage.php:92
-#: ../../Zotlabs/Module/Filestorage.php:119
-#: ../../Zotlabs/Module/Fsuggest.php:82 ../../Zotlabs/Module/Group.php:13
-#: ../../Zotlabs/Module/Id.php:76 ../../Zotlabs/Module/Invite.php:17
-#: ../../Zotlabs/Module/Invite.php:91 ../../Zotlabs/Module/Item.php:210
+#: ../../Zotlabs/Module/Editwebpage.php:127 ../../Zotlabs/Module/Group.php:13
+#: ../../Zotlabs/Module/Api.php:13 ../../Zotlabs/Module/Api.php:18
+#: ../../Zotlabs/Module/Filestorage.php:24
+#: ../../Zotlabs/Module/Filestorage.php:79
+#: ../../Zotlabs/Module/Filestorage.php:94
+#: ../../Zotlabs/Module/Filestorage.php:121 ../../Zotlabs/Module/Item.php:210
 #: ../../Zotlabs/Module/Item.php:218 ../../Zotlabs/Module/Item.php:1070
 #: ../../Zotlabs/Module/Layouts.php:71 ../../Zotlabs/Module/Layouts.php:78
-#: ../../Zotlabs/Module/Layouts.php:89 ../../Zotlabs/Module/Like.php:181
-#: ../../Zotlabs/Module/Locs.php:87 ../../Zotlabs/Module/Mail.php:130
-#: ../../Zotlabs/Module/Manage.php:10 ../../Zotlabs/Module/Menu.php:78
-#: ../../Zotlabs/Module/Message.php:20 ../../Zotlabs/Module/Mitem.php:115
-#: ../../Zotlabs/Module/Mood.php:116 ../../Zotlabs/Module/Network.php:16
-#: ../../Zotlabs/Module/New_channel.php:77
+#: ../../Zotlabs/Module/Layouts.php:89 ../../Zotlabs/Module/Id.php:76
+#: ../../Zotlabs/Module/Like.php:181 ../../Zotlabs/Module/Invite.php:17
+#: ../../Zotlabs/Module/Invite.php:91 ../../Zotlabs/Module/Locs.php:87
+#: ../../Zotlabs/Module/Mail.php:129 ../../Zotlabs/Module/Manage.php:10
+#: ../../Zotlabs/Module/Menu.php:78 ../../Zotlabs/Module/Message.php:18
+#: ../../Zotlabs/Module/Mood.php:116 ../../Zotlabs/Module/Network.php:17
+#: ../../Zotlabs/Module/Mitem.php:115 ../../Zotlabs/Module/New_channel.php:77
 #: ../../Zotlabs/Module/New_channel.php:104
-#: ../../Zotlabs/Module/Notifications.php:70 ../../Zotlabs/Module/Page.php:35
+#: ../../Zotlabs/Module/Notifications.php:70
+#: ../../Zotlabs/Module/Photos.php:75 ../../Zotlabs/Module/Page.php:35
 #: ../../Zotlabs/Module/Page.php:90 ../../Zotlabs/Module/Pdledit.php:26
-#: ../../Zotlabs/Module/Photos.php:74 ../../Zotlabs/Module/Poke.php:137
-#: ../../Zotlabs/Module/Profile.php:68 ../../Zotlabs/Module/Profile.php:76
+#: ../../Zotlabs/Module/Poke.php:137 ../../Zotlabs/Module/Profile.php:68
+#: ../../Zotlabs/Module/Profile.php:76 ../../Zotlabs/Module/Profiles.php:203
+#: ../../Zotlabs/Module/Profiles.php:601
 #: ../../Zotlabs/Module/Profile_photo.php:256
 #: ../../Zotlabs/Module/Profile_photo.php:269
-#: ../../Zotlabs/Module/Profiles.php:202 ../../Zotlabs/Module/Profiles.php:600
-#: ../../Zotlabs/Module/Rate.php:115 ../../Zotlabs/Module/Register.php:77
-#: ../../Zotlabs/Module/Regmod.php:21
+#: ../../Zotlabs/Module/Rate.php:113 ../../Zotlabs/Module/Appman.php:75
+#: ../../Zotlabs/Module/Register.php:77 ../../Zotlabs/Module/Regmod.php:21
 #: ../../Zotlabs/Module/Service_limits.php:11
-#: ../../Zotlabs/Module/Settings.php:570 ../../Zotlabs/Module/Setup.php:238
+#: ../../Zotlabs/Module/Settings.php:572 ../../Zotlabs/Module/Setup.php:215
 #: ../../Zotlabs/Module/Sharedwithme.php:11
 #: ../../Zotlabs/Module/Sources.php:74 ../../Zotlabs/Module/Suggest.php:30
 #: ../../Zotlabs/Module/Thing.php:274 ../../Zotlabs/Module/Thing.php:294
 #: ../../Zotlabs/Module/Thing.php:331
-#: ../../Zotlabs/Module/Viewconnections.php:26
-#: ../../Zotlabs/Module/Viewconnections.php:31
-#: ../../Zotlabs/Module/Viewsrc.php:18 ../../Zotlabs/Module/Webpages.php:73
-#: ../../include/photos.php:29 ../../include/chat.php:133
-#: ../../include/items.php:4705 ../../include/attach.php:141
-#: ../../include/attach.php:189 ../../include/attach.php:252
-#: ../../include/attach.php:266 ../../include/attach.php:273
-#: ../../include/attach.php:338 ../../include/attach.php:352
-#: ../../include/attach.php:359 ../../include/attach.php:437
-#: ../../include/attach.php:895 ../../include/attach.php:966
-#: ../../include/attach.php:1118 ../../index.php:174
+#: ../../Zotlabs/Module/Viewconnections.php:25
+#: ../../Zotlabs/Module/Viewconnections.php:30
+#: ../../Zotlabs/Module/Viewsrc.php:18 ../../Zotlabs/Module/Webpages.php:74
+#: ../../Zotlabs/Lib/Chatroom.php:137 ../../include/items.php:3438
+#: ../../include/attach.php:141 ../../include/attach.php:189
+#: ../../include/attach.php:252 ../../include/attach.php:266
+#: ../../include/attach.php:273 ../../include/attach.php:338
+#: ../../include/attach.php:352 ../../include/attach.php:359
+#: ../../include/attach.php:437 ../../include/attach.php:895
+#: ../../include/attach.php:966 ../../include/attach.php:1118
+#: ../../include/photos.php:27
 msgid "Permission denied."
 msgstr ""
 
@@ -224,30 +230,30 @@ msgid "Not Found"
 msgstr ""
 
 #: ../../Zotlabs/Web/Router.php:149 ../../Zotlabs/Module/Block.php:79
-#: ../../Zotlabs/Module/Display.php:121 ../../Zotlabs/Module/Help.php:97
+#: ../../Zotlabs/Module/Display.php:117 ../../Zotlabs/Module/Help.php:97
 #: ../../Zotlabs/Module/Page.php:93
 msgid "Page not found."
 msgstr ""
 
-#: ../../Zotlabs/Zot/Auth.php:140
+#: ../../Zotlabs/Zot/Auth.php:138
 msgid ""
 "Remote authentication blocked. You are logged into this site locally. Please "
 "logout and retry."
 msgstr ""
 
-#: ../../Zotlabs/Zot/Auth.php:248 ../../Zotlabs/Module/Openid.php:76
+#: ../../Zotlabs/Zot/Auth.php:246 ../../Zotlabs/Module/Openid.php:76
 #: ../../Zotlabs/Module/Openid.php:183
 #, php-format
 msgid "Welcome %s. Remote authentication successful."
 msgstr ""
 
 #: ../../Zotlabs/Module/Achievements.php:15 ../../Zotlabs/Module/Blocks.php:33
-#: ../../Zotlabs/Module/Connect.php:17 ../../Zotlabs/Module/Editblock.php:30
+#: ../../Zotlabs/Module/Connect.php:17 ../../Zotlabs/Module/Editblock.php:31
 #: ../../Zotlabs/Module/Editlayout.php:31
-#: ../../Zotlabs/Module/Editwebpage.php:32
-#: ../../Zotlabs/Module/Filestorage.php:58 ../../Zotlabs/Module/Hcard.php:12
+#: ../../Zotlabs/Module/Editwebpage.php:33
+#: ../../Zotlabs/Module/Filestorage.php:60 ../../Zotlabs/Module/Hcard.php:12
 #: ../../Zotlabs/Module/Layouts.php:31 ../../Zotlabs/Module/Profile.php:20
-#: ../../Zotlabs/Module/Webpages.php:33 ../../include/identity.php:837
+#: ../../Zotlabs/Module/Webpages.php:34 ../../include/channel.php:837
 msgid "Requested profile is not available."
 msgstr ""
 
@@ -255,1380 +261,779 @@ msgstr ""
 msgid "Some blurb about what to do when you're new here"
 msgstr ""
 
-#: ../../Zotlabs/Module/Acl.php:225
-msgid "network"
-msgstr ""
-
-#: ../../Zotlabs/Module/Acl.php:235
-msgid "RSS"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin.php:58
-msgid "Theme settings updated."
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin.php:145 ../../Zotlabs/Module/Admin.php:1211
-#: ../../Zotlabs/Module/Admin.php:1463 ../../Zotlabs/Module/Display.php:44
-#: ../../Zotlabs/Module/Filestorage.php:31 ../../Zotlabs/Module/Thing.php:89
-#: ../../Zotlabs/Module/Viewsrc.php:24 ../../include/items.php:4626
-msgid "Item not found."
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin.php:178
-msgid "# Accounts"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin.php:179
-msgid "# blocked accounts"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin.php:180
-msgid "# expired accounts"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin.php:181
-msgid "# expiring accounts"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin.php:192
-msgid "# Channels"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin.php:193
-msgid "# primary"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin.php:194
-msgid "# clones"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin.php:200
-msgid "Message queues"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin.php:216 ../../Zotlabs/Module/Admin.php:462
-#: ../../Zotlabs/Module/Admin.php:683 ../../Zotlabs/Module/Admin.php:727
-#: ../../Zotlabs/Module/Admin.php:1006 ../../Zotlabs/Module/Admin.php:1170
-#: ../../Zotlabs/Module/Admin.php:1285 ../../Zotlabs/Module/Admin.php:1348
-#: ../../Zotlabs/Module/Admin.php:1514 ../../Zotlabs/Module/Admin.php:1548
-#: ../../Zotlabs/Module/Admin.php:1633
-msgid "Administration"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin.php:217
-msgid "Summary"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin.php:220
-msgid "Registered accounts"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin.php:221 ../../Zotlabs/Module/Admin.php:687
-msgid "Pending registrations"
+#: ../../Zotlabs/Module/Blocks.php:97 ../../Zotlabs/Module/Blocks.php:152
+#: ../../Zotlabs/Module/Editblock.php:108
+msgid "Block Name"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:222
-msgid "Registered channels"
+#: ../../Zotlabs/Module/Blocks.php:151 ../../include/text.php:2265
+msgid "Blocks"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:223 ../../Zotlabs/Module/Admin.php:688
-msgid "Active plugins"
+#: ../../Zotlabs/Module/Blocks.php:153
+msgid "Block Title"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:224
-msgid "Version"
+#: ../../Zotlabs/Module/Blocks.php:154 ../../Zotlabs/Module/Layouts.php:188
+#: ../../Zotlabs/Module/Menu.php:114 ../../Zotlabs/Module/Webpages.php:198
+#: ../../include/page_widgets.php:44
+msgid "Created"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:345
-msgid "Site settings updated."
+#: ../../Zotlabs/Module/Blocks.php:155 ../../Zotlabs/Module/Layouts.php:189
+#: ../../Zotlabs/Module/Menu.php:115 ../../Zotlabs/Module/Webpages.php:199
+#: ../../include/page_widgets.php:45
+msgid "Edited"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:372 ../../include/text.php:2856
-msgid "Default"
+#: ../../Zotlabs/Module/Blocks.php:158 ../../Zotlabs/Module/Layouts.php:191
+#: ../../Zotlabs/Module/Photos.php:1072 ../../Zotlabs/Module/Webpages.php:188
+#: ../../include/conversation.php:1208
+msgid "Share"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:382 ../../Zotlabs/Module/Settings.php:796
-msgid "mobile"
+#: ../../Zotlabs/Module/Blocks.php:163 ../../Zotlabs/Module/Layouts.php:195
+#: ../../Zotlabs/Module/Pubsites.php:47 ../../Zotlabs/Module/Webpages.php:193
+#: ../../include/page_widgets.php:39
+msgid "View"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:384
-msgid "experimental"
+#: ../../Zotlabs/Module/Cal.php:62 ../../Zotlabs/Module/Block.php:43
+#: ../../Zotlabs/Module/Page.php:56 ../../Zotlabs/Module/Wall_upload.php:33
+msgid "Channel not found."
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:386
-msgid "unsupported"
+#: ../../Zotlabs/Module/Cal.php:69
+msgid "Permissions denied."
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:431 ../../Zotlabs/Module/Api.php:89
-#: ../../Zotlabs/Module/Connedit.php:379 ../../Zotlabs/Module/Connedit.php:657
-#: ../../Zotlabs/Module/Events.php:458 ../../Zotlabs/Module/Events.php:459
-#: ../../Zotlabs/Module/Events.php:468
-#: ../../Zotlabs/Module/Filestorage.php:155
-#: ../../Zotlabs/Module/Filestorage.php:163 ../../Zotlabs/Module/Menu.php:100
-#: ../../Zotlabs/Module/Menu.php:157 ../../Zotlabs/Module/Mitem.php:158
-#: ../../Zotlabs/Module/Mitem.php:159 ../../Zotlabs/Module/Mitem.php:232
-#: ../../Zotlabs/Module/Mitem.php:233 ../../Zotlabs/Module/Photos.php:665
-#: ../../Zotlabs/Module/Profiles.php:651 ../../Zotlabs/Module/Removeme.php:64
-#: ../../Zotlabs/Module/Settings.php:579 ../../include/dir_fns.php:141
-#: ../../include/dir_fns.php:142 ../../include/dir_fns.php:143
-#: ../../view/theme/redbasic/php/config.php:105
-#: ../../view/theme/redbasic/php/config.php:130 ../../boot.php:1619
-msgid "No"
+#: ../../Zotlabs/Module/Cal.php:259 ../../Zotlabs/Module/Events.php:588
+msgid "l, F j"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:432
-msgid "Yes - with approval"
+#: ../../Zotlabs/Module/Cal.php:308 ../../Zotlabs/Module/Events.php:637
+#: ../../include/text.php:1732
+msgid "Link to Source"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:433 ../../Zotlabs/Module/Api.php:88
-#: ../../Zotlabs/Module/Connedit.php:379 ../../Zotlabs/Module/Events.php:458
-#: ../../Zotlabs/Module/Events.php:459 ../../Zotlabs/Module/Events.php:468
-#: ../../Zotlabs/Module/Filestorage.php:155
-#: ../../Zotlabs/Module/Filestorage.php:163 ../../Zotlabs/Module/Menu.php:100
-#: ../../Zotlabs/Module/Menu.php:157 ../../Zotlabs/Module/Mitem.php:158
-#: ../../Zotlabs/Module/Mitem.php:159 ../../Zotlabs/Module/Mitem.php:232
-#: ../../Zotlabs/Module/Mitem.php:233 ../../Zotlabs/Module/Photos.php:665
-#: ../../Zotlabs/Module/Profiles.php:651 ../../Zotlabs/Module/Removeme.php:64
-#: ../../Zotlabs/Module/Settings.php:579 ../../include/dir_fns.php:141
-#: ../../include/dir_fns.php:142 ../../include/dir_fns.php:143
-#: ../../view/theme/redbasic/php/config.php:105
-#: ../../view/theme/redbasic/php/config.php:130 ../../boot.php:1619
-msgid "Yes"
+#: ../../Zotlabs/Module/Cal.php:331 ../../Zotlabs/Module/Events.php:665
+msgid "Edit Event"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:438
-msgid "My site is not a public server"
+#: ../../Zotlabs/Module/Cal.php:331 ../../Zotlabs/Module/Events.php:665
+msgid "Create Event"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:439
-msgid "My site has paid access only"
+#: ../../Zotlabs/Module/Cal.php:332 ../../Zotlabs/Module/Cal.php:339
+#: ../../Zotlabs/Module/Events.php:666 ../../Zotlabs/Module/Events.php:673
+#: ../../Zotlabs/Module/Photos.php:949
+msgid "Previous"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:440
-msgid "My site has free access only"
+#: ../../Zotlabs/Module/Cal.php:333 ../../Zotlabs/Module/Cal.php:340
+#: ../../Zotlabs/Module/Events.php:667 ../../Zotlabs/Module/Events.php:674
+#: ../../Zotlabs/Module/Photos.php:958 ../../Zotlabs/Module/Setup.php:267
+msgid "Next"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:441
-msgid "My site offers free accounts with optional paid upgrades"
+#: ../../Zotlabs/Module/Cal.php:334 ../../Zotlabs/Module/Events.php:668
+#: ../../include/widgets.php:755
+msgid "Export"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:463 ../../include/widgets.php:1383
-msgid "Site"
+#: ../../Zotlabs/Module/Cal.php:337 ../../Zotlabs/Module/Events.php:671
+#: ../../include/widgets.php:756
+msgid "Import"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:464 ../../Zotlabs/Module/Admin.php:660
-#: ../../Zotlabs/Module/Admin.php:743 ../../Zotlabs/Module/Admin.php:1008
-#: ../../Zotlabs/Module/Admin.php:1172 ../../Zotlabs/Module/Admin.php:1350
-#: ../../Zotlabs/Module/Admin.php:1550 ../../Zotlabs/Module/Admin.php:1635
-#: ../../Zotlabs/Module/Admin.php:1799 ../../Zotlabs/Module/Appman.php:125
-#: ../../Zotlabs/Module/Cal.php:341 ../../Zotlabs/Module/Chat.php:194
-#: ../../Zotlabs/Module/Chat.php:236 ../../Zotlabs/Module/Connect.php:97
-#: ../../Zotlabs/Module/Connedit.php:734 ../../Zotlabs/Module/Events.php:472
-#: ../../Zotlabs/Module/Events.php:669
-#: ../../Zotlabs/Module/Filestorage.php:160
-#: ../../Zotlabs/Module/Fsuggest.php:112 ../../Zotlabs/Module/Group.php:85
-#: ../../Zotlabs/Module/Import.php:546
+#: ../../Zotlabs/Module/Cal.php:338 ../../Zotlabs/Module/Chat.php:196
+#: ../../Zotlabs/Module/Chat.php:238 ../../Zotlabs/Module/Connect.php:98
+#: ../../Zotlabs/Module/Connedit.php:731 ../../Zotlabs/Module/Events.php:475
+#: ../../Zotlabs/Module/Events.php:672 ../../Zotlabs/Module/Group.php:85
+#: ../../Zotlabs/Module/Filestorage.php:162
+#: ../../Zotlabs/Module/Import.php:550
 #: ../../Zotlabs/Module/Import_items.php:120
 #: ../../Zotlabs/Module/Invite.php:146 ../../Zotlabs/Module/Locs.php:121
-#: ../../Zotlabs/Module/Mail.php:384 ../../Zotlabs/Module/Mitem.php:235
-#: ../../Zotlabs/Module/Mood.php:139 ../../Zotlabs/Module/Pconfig.php:107
-#: ../../Zotlabs/Module/Pdledit.php:66 ../../Zotlabs/Module/Photos.php:676
-#: ../../Zotlabs/Module/Photos.php:1051 ../../Zotlabs/Module/Photos.php:1091
-#: ../../Zotlabs/Module/Photos.php:1209 ../../Zotlabs/Module/Poke.php:186
-#: ../../Zotlabs/Module/Profiles.php:691 ../../Zotlabs/Module/Rate.php:172
-#: ../../Zotlabs/Module/Settings.php:588 ../../Zotlabs/Module/Settings.php:701
-#: ../../Zotlabs/Module/Settings.php:729 ../../Zotlabs/Module/Settings.php:752
-#: ../../Zotlabs/Module/Settings.php:840
-#: ../../Zotlabs/Module/Settings.php:1032 ../../Zotlabs/Module/Setup.php:335
-#: ../../Zotlabs/Module/Setup.php:376 ../../Zotlabs/Module/Sources.php:114
+#: ../../Zotlabs/Module/Mail.php:378 ../../Zotlabs/Module/Mood.php:139
+#: ../../Zotlabs/Module/Mitem.php:235 ../../Zotlabs/Module/Photos.php:677
+#: ../../Zotlabs/Module/Photos.php:1052 ../../Zotlabs/Module/Photos.php:1092
+#: ../../Zotlabs/Module/Photos.php:1210 ../../Zotlabs/Module/Pconfig.php:107
+#: ../../Zotlabs/Module/Pdledit.php:66 ../../Zotlabs/Module/Poke.php:186
+#: ../../Zotlabs/Module/Profiles.php:687 ../../Zotlabs/Module/Rate.php:170
+#: ../../Zotlabs/Module/Admin.php:492 ../../Zotlabs/Module/Admin.php:688
+#: ../../Zotlabs/Module/Admin.php:771 ../../Zotlabs/Module/Admin.php:1032
+#: ../../Zotlabs/Module/Admin.php:1211 ../../Zotlabs/Module/Admin.php:1421
+#: ../../Zotlabs/Module/Admin.php:1648 ../../Zotlabs/Module/Admin.php:1733
+#: ../../Zotlabs/Module/Admin.php:2116 ../../Zotlabs/Module/Appman.php:126
+#: ../../Zotlabs/Module/Settings.php:590 ../../Zotlabs/Module/Settings.php:703
+#: ../../Zotlabs/Module/Settings.php:731 ../../Zotlabs/Module/Settings.php:754
+#: ../../Zotlabs/Module/Settings.php:842
+#: ../../Zotlabs/Module/Settings.php:1034 ../../Zotlabs/Module/Setup.php:312
+#: ../../Zotlabs/Module/Setup.php:353 ../../Zotlabs/Module/Sources.php:114
 #: ../../Zotlabs/Module/Sources.php:149 ../../Zotlabs/Module/Thing.php:316
 #: ../../Zotlabs/Module/Thing.php:362 ../../Zotlabs/Module/Xchan.php:15
-#: ../../include/widgets.php:757 ../../include/widgets.php:769
-#: ../../include/ItemObject.php:703 ../../include/js_strings.php:22
+#: ../../Zotlabs/Lib/ThreadItem.php:710 ../../include/widgets.php:757
+#: ../../include/widgets.php:769 ../../include/js_strings.php:22
 #: ../../view/theme/redbasic/php/config.php:99
 msgid "Submit"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:465 ../../Zotlabs/Module/Register.php:245
-msgid "Registration"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin.php:466
-msgid "File upload"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin.php:467
-msgid "Policies"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin.php:468 ../../include/contact_widgets.php:19
-msgid "Advanced"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin.php:472
-msgid "Site name"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin.php:473
-msgid "Banner/Logo"
+#: ../../Zotlabs/Module/Cal.php:341 ../../Zotlabs/Module/Events.php:675
+msgid "Today"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:474
-msgid "Administrator Information"
+#: ../../Zotlabs/Module/Channel.php:29 ../../Zotlabs/Module/Chat.php:25
+msgid "You must be logged in to see this page."
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:474
-msgid ""
-"Contact information for site administrators.  Displayed on siteinfo page.  "
-"BBCode can be used here"
+#: ../../Zotlabs/Module/Channel.php:41
+msgid "Posts and comments"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:475
-msgid "System language"
+#: ../../Zotlabs/Module/Channel.php:42
+msgid "Only posts"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:476
-msgid "System theme"
+#: ../../Zotlabs/Module/Channel.php:102
+msgid "Insufficient permissions.  Request redirected to profile page."
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:476
-msgid ""
-"Default system theme - may be over-ridden by user profiles - <a href='#' "
-"id='cnftheme'>change theme settings</a>"
+#: ../../Zotlabs/Module/Chat.php:181
+msgid "Room not found"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:477
-msgid "Mobile system theme"
+#: ../../Zotlabs/Module/Chat.php:197
+msgid "Leave Room"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:477
-msgid "Theme for mobile devices"
+#: ../../Zotlabs/Module/Chat.php:198
+msgid "Delete Room"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:479
-msgid "Allow Feeds as Connections"
+#: ../../Zotlabs/Module/Chat.php:199
+msgid "I am away right now"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:479
-msgid "(Heavy system resource usage)"
+#: ../../Zotlabs/Module/Chat.php:200
+msgid "I am online"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:480
-msgid "Maximum image size"
+#: ../../Zotlabs/Module/Chat.php:202
+msgid "Bookmark this room"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:480
-msgid ""
-"Maximum size in bytes of uploaded images. Default is 0, which means no "
-"limits."
+#: ../../Zotlabs/Module/Chat.php:205 ../../Zotlabs/Module/Mail.php:205
+#: ../../Zotlabs/Module/Mail.php:314 ../../include/conversation.php:1176
+msgid "Please enter a link URL:"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:481
-msgid "Does this site allow new member registration?"
+#: ../../Zotlabs/Module/Chat.php:206 ../../Zotlabs/Module/Mail.php:258
+#: ../../Zotlabs/Module/Mail.php:383 ../../Zotlabs/Lib/ThreadItem.php:722
+#: ../../include/conversation.php:1256
+msgid "Encrypt text"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:482
-msgid "Invitation only"
+#: ../../Zotlabs/Module/Chat.php:207 ../../Zotlabs/Module/Editblock.php:111
+#: ../../Zotlabs/Module/Editwebpage.php:147 ../../Zotlabs/Module/Mail.php:252
+#: ../../Zotlabs/Module/Mail.php:377 ../../include/conversation.php:1143
+msgid "Insert web link"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:482
-msgid ""
-"Only allow new member registrations with an invitation code. Above register "
-"policy must be set to Yes."
+#: ../../Zotlabs/Module/Chat.php:218
+msgid "Feature disabled."
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:483
-msgid "Which best describes the types of account offered by this hub?"
+#: ../../Zotlabs/Module/Chat.php:232
+msgid "New Chatroom"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:484
-msgid "Register text"
+#: ../../Zotlabs/Module/Chat.php:233
+msgid "Chatroom name"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:484
-msgid "Will be displayed prominently on the registration page."
+#: ../../Zotlabs/Module/Chat.php:234
+msgid "Expiration of chats (minutes)"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:485
-msgid "Site homepage to show visitors (default: login box)"
+#: ../../Zotlabs/Module/Chat.php:235 ../../Zotlabs/Module/Filestorage.php:153
+#: ../../Zotlabs/Module/Photos.php:671 ../../Zotlabs/Module/Photos.php:1045
+#: ../../Zotlabs/Module/Thing.php:313 ../../Zotlabs/Module/Thing.php:359
+#: ../../include/acl_selectors.php:283
+msgid "Permissions"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:485
-msgid ""
-"example: 'public' to show public stream, 'page/sys/home' to show a system "
-"webpage called 'home' or 'include:home.html' to include a file."
+#: ../../Zotlabs/Module/Chat.php:246
+#, php-format
+msgid "%1$s's Chatrooms"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:486
-msgid "Preserve site homepage URL"
+#: ../../Zotlabs/Module/Chat.php:251
+msgid "No chatrooms available"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:486
-msgid ""
-"Present the site homepage in a frame at the original location instead of "
-"redirecting"
+#: ../../Zotlabs/Module/Chat.php:252 ../../Zotlabs/Module/Manage.php:143
+#: ../../Zotlabs/Module/Profiles.php:778
+msgid "Create New"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:487
-msgid "Accounts abandoned after x days"
+#: ../../Zotlabs/Module/Chat.php:255
+msgid "Expiration"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:487
-msgid ""
-"Will not waste system resources polling external sites for abandonded "
-"accounts. Enter 0 for no time limit."
+#: ../../Zotlabs/Module/Chat.php:256
+msgid "min"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:488
-msgid "Allowed friend domains"
+#: ../../Zotlabs/Module/Chatsvc.php:117
+msgid "Away"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:488
-msgid ""
-"Comma separated list of domains which are allowed to establish friendships "
-"with this site. Wildcards are accepted. Empty to allow any domains"
+#: ../../Zotlabs/Module/Chatsvc.php:122
+msgid "Online"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:489
-msgid "Allowed email domains"
+#: ../../Zotlabs/Module/Block.php:31 ../../Zotlabs/Module/Page.php:40
+msgid "Invalid item."
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:489
-msgid ""
-"Comma separated list of domains which are allowed in email addresses for "
-"registrations to this site. Wildcards are accepted. Empty to allow any "
-"domains"
+#: ../../Zotlabs/Module/Bookmarks.php:53
+msgid "Bookmark added"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:490
-msgid "Not allowed email domains"
+#: ../../Zotlabs/Module/Bookmarks.php:75
+msgid "My Bookmarks"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:490
-msgid ""
-"Comma separated list of domains which are not allowed in email addresses for "
-"registrations to this site. Wildcards are accepted. Empty to allow any "
-"domains, unless allowed domains have been defined."
+#: ../../Zotlabs/Module/Bookmarks.php:86
+msgid "My Connections Bookmarks"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:491
-msgid "Verify Email Addresses"
+#: ../../Zotlabs/Module/Connect.php:61 ../../Zotlabs/Module/Connect.php:109
+msgid "Continue"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:491
-msgid ""
-"Check to verify email addresses used in account registration (recommended)."
+#: ../../Zotlabs/Module/Connect.php:90
+msgid "Premium Channel Setup"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:492
-msgid "Force publish"
+#: ../../Zotlabs/Module/Connect.php:92
+msgid "Enable premium channel connection restrictions"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:492
+#: ../../Zotlabs/Module/Connect.php:93
 msgid ""
-"Check to force all profiles on this site to be listed in the site directory."
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin.php:493
-msgid "Import Public Streams"
+"Please enter your restrictions or conditions, such as paypal receipt, usage "
+"guidelines, etc."
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:493
+#: ../../Zotlabs/Module/Connect.php:95 ../../Zotlabs/Module/Connect.php:115
 msgid ""
-"Import and allow access to public content pulled from other sites. Warning: "
-"this content is unmoderated."
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin.php:494
-msgid "Login on Homepage"
+"This channel may require additional steps or acknowledgement of the "
+"following conditions prior to connecting:"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:494
+#: ../../Zotlabs/Module/Connect.php:96
 msgid ""
-"Present a login box to visitors on the home page if no other content has "
-"been configured."
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin.php:495
-msgid "Enable context help"
+"Potential connections will then see the following text before proceeding:"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:495
+#: ../../Zotlabs/Module/Connect.php:97 ../../Zotlabs/Module/Connect.php:118
 msgid ""
-"Display contextual help for the current page when the help button is pressed."
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin.php:497
-msgid "Directory Server URL"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin.php:497
-msgid "Default directory server"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin.php:499
-msgid "Proxy user"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin.php:500
-msgid "Proxy URL"
+"By continuing, I certify that I have complied with any instructions provided "
+"on this page."
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:501
-msgid "Network timeout"
+#: ../../Zotlabs/Module/Connect.php:106
+msgid "(No specific instructions have been provided by the channel owner.)"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:501
-msgid "Value is in seconds. Set to 0 for unlimited (not recommended)."
+#: ../../Zotlabs/Module/Connect.php:114
+msgid "Restricted or Premium Channel"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:502
-msgid "Delivery interval"
+#: ../../Zotlabs/Module/Connedit.php:80
+msgid "Could not access contact record."
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:502
-msgid ""
-"Delay background delivery processes by this many seconds to reduce system "
-"load. Recommend: 4-5 for shared hosts, 2-3 for virtual private servers. 0-1 "
-"for large dedicated servers."
+#: ../../Zotlabs/Module/Connedit.php:104
+msgid "Could not locate selected profile."
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:503
-msgid "Deliveries per process"
+#: ../../Zotlabs/Module/Connedit.php:227
+msgid "Connection updated."
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:503
-msgid ""
-"Number of deliveries to attempt in a single operating system process. Adjust "
-"if necessary to tune system performance. Recommend: 1-5."
+#: ../../Zotlabs/Module/Connedit.php:229
+msgid "Failed to update connection record."
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:504
-msgid "Poll interval"
+#: ../../Zotlabs/Module/Connedit.php:276
+msgid "is now connected to"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:504
-msgid ""
-"Delay background polling processes by this many seconds to reduce system "
-"load. If 0, use delivery interval."
+#: ../../Zotlabs/Module/Connedit.php:379 ../../Zotlabs/Module/Connedit.php:654
+#: ../../Zotlabs/Module/Events.php:459 ../../Zotlabs/Module/Events.php:460
+#: ../../Zotlabs/Module/Events.php:469 ../../Zotlabs/Module/Api.php:89
+#: ../../Zotlabs/Module/Filestorage.php:157
+#: ../../Zotlabs/Module/Filestorage.php:165 ../../Zotlabs/Module/Menu.php:100
+#: ../../Zotlabs/Module/Menu.php:157 ../../Zotlabs/Module/Mitem.php:158
+#: ../../Zotlabs/Module/Mitem.php:159 ../../Zotlabs/Module/Mitem.php:232
+#: ../../Zotlabs/Module/Mitem.php:233 ../../Zotlabs/Module/Photos.php:666
+#: ../../Zotlabs/Module/Profiles.php:647 ../../Zotlabs/Module/Admin.php:459
+#: ../../Zotlabs/Module/Removeme.php:61 ../../Zotlabs/Module/Settings.php:581
+#: ../../include/dir_fns.php:143 ../../include/dir_fns.php:144
+#: ../../include/dir_fns.php:145 ../../view/theme/redbasic/php/config.php:105
+#: ../../view/theme/redbasic/php/config.php:130 ../../boot.php:1707
+msgid "No"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:505
-msgid "Maximum Load Average"
+#: ../../Zotlabs/Module/Connedit.php:379 ../../Zotlabs/Module/Events.php:459
+#: ../../Zotlabs/Module/Events.php:460 ../../Zotlabs/Module/Events.php:469
+#: ../../Zotlabs/Module/Api.php:88 ../../Zotlabs/Module/Filestorage.php:157
+#: ../../Zotlabs/Module/Filestorage.php:165 ../../Zotlabs/Module/Menu.php:100
+#: ../../Zotlabs/Module/Menu.php:157 ../../Zotlabs/Module/Mitem.php:158
+#: ../../Zotlabs/Module/Mitem.php:159 ../../Zotlabs/Module/Mitem.php:232
+#: ../../Zotlabs/Module/Mitem.php:233 ../../Zotlabs/Module/Photos.php:666
+#: ../../Zotlabs/Module/Profiles.php:647 ../../Zotlabs/Module/Admin.php:461
+#: ../../Zotlabs/Module/Removeme.php:61 ../../Zotlabs/Module/Settings.php:581
+#: ../../include/dir_fns.php:143 ../../include/dir_fns.php:144
+#: ../../include/dir_fns.php:145 ../../view/theme/redbasic/php/config.php:105
+#: ../../view/theme/redbasic/php/config.php:130 ../../boot.php:1707
+msgid "Yes"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:505
-msgid ""
-"Maximum system load before delivery and poll processes are deferred - "
-"default 50."
+#: ../../Zotlabs/Module/Connedit.php:411
+msgid "Could not access address book record."
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:506
-msgid "Expiration period in days for imported (grid/network) content"
+#: ../../Zotlabs/Module/Connedit.php:425
+msgid "Refresh failed - channel is currently unavailable."
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:506
-msgid "0 for no expiration of imported content"
+#: ../../Zotlabs/Module/Connedit.php:440 ../../Zotlabs/Module/Connedit.php:449
+#: ../../Zotlabs/Module/Connedit.php:458 ../../Zotlabs/Module/Connedit.php:467
+#: ../../Zotlabs/Module/Connedit.php:480
+msgid "Unable to set address book parameters."
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:649 ../../Zotlabs/Module/Admin.php:650
-#: ../../Zotlabs/Module/Settings.php:720
-msgid "Off"
+#: ../../Zotlabs/Module/Connedit.php:503
+msgid "Connection has been removed."
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:649 ../../Zotlabs/Module/Admin.php:650
-#: ../../Zotlabs/Module/Settings.php:720
-msgid "On"
+#: ../../Zotlabs/Module/Connedit.php:519 ../../Zotlabs/Lib/Apps.php:219
+#: ../../include/nav.php:86 ../../include/conversation.php:954
+msgid "View Profile"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:650
+#: ../../Zotlabs/Module/Connedit.php:522
 #, php-format
-msgid "Lock feature %s"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin.php:658
-msgid "Manage Additional Features"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin.php:675
-msgid "No server found"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin.php:682 ../../Zotlabs/Module/Admin.php:1020
-msgid "ID"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin.php:682
-msgid "for channel"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin.php:682
-msgid "on server"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin.php:682 ../../Zotlabs/Module/Connections.php:270
-msgid "Status"
+msgid "View %s's profile"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:684
-msgid "Server"
+#: ../../Zotlabs/Module/Connedit.php:526
+msgid "Refresh Permissions"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:718
-msgid ""
-"By default, unfiltered HTML is allowed in embedded media. This is inherently "
-"insecure."
+#: ../../Zotlabs/Module/Connedit.php:529
+msgid "Fetch updated permissions"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:721
-msgid ""
-"The recommended setting is to only allow unfiltered HTML from the following "
-"sites:"
+#: ../../Zotlabs/Module/Connedit.php:533
+msgid "Recent Activity"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:722
-msgid ""
-"https://youtube.com/<br />https://www.youtube.com/<br />https://youtu.be/"
-"<br />https://vimeo.com/<br />https://soundcloud.com/<br />"
+#: ../../Zotlabs/Module/Connedit.php:536
+msgid "View recent posts and comments"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:723
-msgid ""
-"All other embedded content will be filtered, <strong>unless</strong> "
-"embedded content from that site is explicitly blocked."
+#: ../../Zotlabs/Module/Connedit.php:540 ../../Zotlabs/Module/Admin.php:1041
+msgid "Unblock"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:728 ../../include/widgets.php:1386
-msgid "Security"
+#: ../../Zotlabs/Module/Connedit.php:540 ../../Zotlabs/Module/Admin.php:1040
+msgid "Block"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:730
-msgid "Block public"
+#: ../../Zotlabs/Module/Connedit.php:543
+msgid "Block (or Unblock) all communications with this connection"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:730
-msgid ""
-"Check to block public access to all otherwise public personal pages on this "
-"site unless you are currently authenticated."
+#: ../../Zotlabs/Module/Connedit.php:544
+msgid "This connection is blocked!"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:731
-msgid "Set \"Transport Security\" HTTP header"
+#: ../../Zotlabs/Module/Connedit.php:548
+msgid "Unignore"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:732
-msgid "Set \"Content Security Policy\" HTTP header"
+#: ../../Zotlabs/Module/Connedit.php:548
+#: ../../Zotlabs/Module/Connections.php:277
+#: ../../Zotlabs/Module/Notifications.php:55
+msgid "Ignore"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:733
-msgid "Allow communications only from these sites"
+#: ../../Zotlabs/Module/Connedit.php:551
+msgid "Ignore (or Unignore) all inbound communications from this connection"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:733
-msgid ""
-"One site per line. Leave empty to allow communication from anywhere by "
-"default"
+#: ../../Zotlabs/Module/Connedit.php:552
+msgid "This connection is ignored!"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:734
-msgid "Block communications from these sites"
+#: ../../Zotlabs/Module/Connedit.php:556
+msgid "Unarchive"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:735
-msgid "Allow communications only from these channels"
+#: ../../Zotlabs/Module/Connedit.php:556
+msgid "Archive"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:735
+#: ../../Zotlabs/Module/Connedit.php:559
 msgid ""
-"One channel (hash) per line. Leave empty to allow from any channel by default"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin.php:736
-msgid "Block communications from these channels"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin.php:737
-msgid "Only allow embeds from secure (SSL) websites and links."
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin.php:738
-msgid "Allow unfiltered embedded HTML content only from these domains"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin.php:738
-msgid "One site per line. By default embedded content is filtered."
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin.php:739
-msgid "Block embedded HTML from these domains"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin.php:757
-msgid "Update has been marked successful"
+"Archive (or Unarchive) this connection - mark channel dead but keep content"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:767
-#, php-format
-msgid "Executing %s failed. Check system logs."
+#: ../../Zotlabs/Module/Connedit.php:560
+msgid "This connection is archived!"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:770
-#, php-format
-msgid "Update %s was successfully applied."
+#: ../../Zotlabs/Module/Connedit.php:564
+msgid "Unhide"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:774
-#, php-format
-msgid "Update %s did not return a status. Unknown if it succeeded."
+#: ../../Zotlabs/Module/Connedit.php:564
+msgid "Hide"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:777
-#, php-format
-msgid "Update function %s could not be found."
+#: ../../Zotlabs/Module/Connedit.php:567
+msgid "Hide or Unhide this connection from your other connections"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:793
-msgid "No failed updates."
+#: ../../Zotlabs/Module/Connedit.php:568
+msgid "This connection is hidden!"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:797
-msgid "Failed Updates"
+#: ../../Zotlabs/Module/Connedit.php:575
+msgid "Delete this connection"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:799
-msgid "Mark success (if update was manually applied)"
+#: ../../Zotlabs/Module/Connedit.php:590 ../../include/widgets.php:493
+msgid "Me"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:800
-msgid "Attempt to execute this update step automatically"
+#: ../../Zotlabs/Module/Connedit.php:591 ../../include/widgets.php:494
+msgid "Family"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:831
-msgid "Queue Statistics"
+#: ../../Zotlabs/Module/Connedit.php:592 ../../Zotlabs/Module/Settings.php:342
+#: ../../Zotlabs/Module/Settings.php:346 ../../Zotlabs/Module/Settings.php:347
+#: ../../Zotlabs/Module/Settings.php:350 ../../Zotlabs/Module/Settings.php:361
+#: ../../include/widgets.php:495 ../../include/selectors.php:123
+#: ../../include/channel.php:389 ../../include/channel.php:390
+#: ../../include/channel.php:397
+msgid "Friends"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:832
-msgid "Total Entries"
+#: ../../Zotlabs/Module/Connedit.php:593 ../../include/widgets.php:496
+msgid "Acquaintances"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:833
-msgid "Priority"
+#: ../../Zotlabs/Module/Connedit.php:594
+#: ../../Zotlabs/Module/Connections.php:92
+#: ../../Zotlabs/Module/Connections.php:107 ../../include/widgets.php:497
+msgid "All"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:834
-msgid "Destination URL"
+#: ../../Zotlabs/Module/Connedit.php:654
+msgid "Approve this connection"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:835
-msgid "Mark hub permanently offline"
+#: ../../Zotlabs/Module/Connedit.php:654
+msgid "Accept connection to allow communication"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:836
-msgid "Empty queue for this hub"
+#: ../../Zotlabs/Module/Connedit.php:659
+msgid "Set Affinity"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:837
-msgid "Last known contact"
+#: ../../Zotlabs/Module/Connedit.php:662
+msgid "Set Profile"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:873
-#, php-format
-msgid "%s account blocked/unblocked"
-msgid_plural "%s account blocked/unblocked"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../../Zotlabs/Module/Admin.php:881
-#, php-format
-msgid "%s account deleted"
-msgid_plural "%s accounts deleted"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../../Zotlabs/Module/Admin.php:917
-msgid "Account not found"
+#: ../../Zotlabs/Module/Connedit.php:665
+msgid "Set Affinity & Profile"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:929
-#, php-format
-msgid "Account '%s' deleted"
+#: ../../Zotlabs/Module/Connedit.php:698
+msgid "none"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:937
-#, php-format
-msgid "Account '%s' blocked"
+#: ../../Zotlabs/Module/Connedit.php:702 ../../include/widgets.php:614
+msgid "Connection Default Permissions"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:945
+#: ../../Zotlabs/Module/Connedit.php:702 ../../include/items.php:3926
 #, php-format
-msgid "Account '%s' unblocked"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin.php:1007 ../../Zotlabs/Module/Admin.php:1019
-msgid "Users"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin.php:1009 ../../Zotlabs/Module/Admin.php:1173
-msgid "select all"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin.php:1010
-msgid "User registrations waiting for confirm"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin.php:1011
-msgid "Request date"
+msgid "Connection: %s"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:1011 ../../Zotlabs/Module/Admin.php:1020
-#: ../../Zotlabs/Module/Id.php:17 ../../Zotlabs/Module/Id.php:18
-#: ../../include/contact_selectors.php:81 ../../boot.php:1617
-msgid "Email"
+#: ../../Zotlabs/Module/Connedit.php:703
+msgid "Apply these permissions automatically"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:1012
-msgid "No registrations."
+#: ../../Zotlabs/Module/Connedit.php:703
+msgid "Connection requests will be approved without your interaction"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:1013
-#: ../../Zotlabs/Module/Connections.php:275
-msgid "Approve"
+#: ../../Zotlabs/Module/Connedit.php:705
+msgid "This connection's primary address is"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:1014
-msgid "Deny"
+#: ../../Zotlabs/Module/Connedit.php:706
+msgid "Available locations:"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:1016 ../../Zotlabs/Module/Connedit.php:541
-msgid "Block"
+#: ../../Zotlabs/Module/Connedit.php:710
+msgid ""
+"The permissions indicated on this page will be applied to all new "
+"connections."
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:1017 ../../Zotlabs/Module/Connedit.php:541
-msgid "Unblock"
+#: ../../Zotlabs/Module/Connedit.php:711
+msgid "Connection Tools"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:1020 ../../include/group.php:267
-msgid "All Channels"
+#: ../../Zotlabs/Module/Connedit.php:713
+msgid "Slide to adjust your degree of friendship"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:1020
-msgid "Register date"
+#: ../../Zotlabs/Module/Connedit.php:714 ../../Zotlabs/Module/Rate.php:159
+#: ../../include/js_strings.php:20
+msgid "Rating"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:1020
-msgid "Last login"
+#: ../../Zotlabs/Module/Connedit.php:715
+msgid "Slide to adjust your rating"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:1020
-msgid "Expires"
+#: ../../Zotlabs/Module/Connedit.php:716 ../../Zotlabs/Module/Connedit.php:721
+msgid "Optionally explain your rating"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:1020
-msgid "Service Class"
+#: ../../Zotlabs/Module/Connedit.php:718
+msgid "Custom Filter"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:1022
-msgid ""
-"Selected accounts will be deleted!\\n\\nEverything these accounts had posted "
-"on this site will be permanently deleted!\\n\\nAre you sure?"
+#: ../../Zotlabs/Module/Connedit.php:719
+msgid "Only import posts with this text"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:1023
+#: ../../Zotlabs/Module/Connedit.php:719 ../../Zotlabs/Module/Connedit.php:720
 msgid ""
-"The account {0} will be deleted!\\n\\nEverything this account has posted on "
-"this site will be permanently deleted!\\n\\nAre you sure?"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin.php:1059
-#, php-format
-msgid "%s channel censored/uncensored"
-msgid_plural "%s channels censored/uncensored"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../../Zotlabs/Module/Admin.php:1068
-#, php-format
-msgid "%s channel code allowed/disallowed"
-msgid_plural "%s channels code allowed/disallowed"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../../Zotlabs/Module/Admin.php:1075
-#, php-format
-msgid "%s channel deleted"
-msgid_plural "%s channels deleted"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../../Zotlabs/Module/Admin.php:1095
-msgid "Channel not found"
+"words one per line or #tags or /patterns/ or lang=xx, leave blank to import "
+"all posts"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:1106
-#, php-format
-msgid "Channel '%s' deleted"
+#: ../../Zotlabs/Module/Connedit.php:720
+msgid "Do not import posts with this text"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:1118
-#, php-format
-msgid "Channel '%s' censored"
+#: ../../Zotlabs/Module/Connedit.php:722
+msgid "This information is public!"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:1118
-#, php-format
-msgid "Channel '%s' uncensored"
+#: ../../Zotlabs/Module/Connedit.php:727
+msgid "Connection Pending Approval"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:1129
-#, php-format
-msgid "Channel '%s' code allowed"
+#: ../../Zotlabs/Module/Connedit.php:730
+msgid "inherited"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:1129
+#: ../../Zotlabs/Module/Connedit.php:732
 #, php-format
-msgid "Channel '%s' code disallowed"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin.php:1171 ../../include/widgets.php:1385
-msgid "Channels"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin.php:1175
-msgid "Censor"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin.php:1176
-msgid "Uncensor"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin.php:1177
-msgid "Allow Code"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin.php:1178
-msgid "Disallow Code"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin.php:1179 ../../include/conversation.php:1621
-msgid "Channel"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin.php:1180
-msgid "UID"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin.php:1180 ../../Zotlabs/Module/Locs.php:118
-#: ../../Zotlabs/Module/Profiles.php:469
-msgid "Address"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin.php:1182
 msgid ""
-"Selected channels will be deleted!\\n\\nEverything that was posted in these "
-"channels on this site will be permanently deleted!\\n\\nAre you sure?"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin.php:1183
-msgid ""
-"The channel {0} will be deleted!\\n\\nEverything that was posted in this "
-"channel on this site will be permanently deleted!\\n\\nAre you sure?"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin.php:1240
-#, php-format
-msgid "Plugin %s disabled."
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin.php:1244
-#, php-format
-msgid "Plugin %s enabled."
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin.php:1254 ../../Zotlabs/Module/Admin.php:1487
-msgid "Disable"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin.php:1257 ../../Zotlabs/Module/Admin.php:1489
-msgid "Enable"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin.php:1286 ../../Zotlabs/Module/Admin.php:1349
-#: ../../include/widgets.php:1388
-msgid "Plugins"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin.php:1287 ../../Zotlabs/Module/Admin.php:1516
-msgid "Toggle"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin.php:1288 ../../Zotlabs/Module/Admin.php:1517
-#: ../../include/apps.php:166 ../../include/widgets.php:638
-#: ../../include/nav.php:208
-msgid "Settings"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin.php:1295 ../../Zotlabs/Module/Admin.php:1526
-msgid "Author: "
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin.php:1296 ../../Zotlabs/Module/Admin.php:1527
-msgid "Maintainer: "
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin.php:1297
-msgid "Minimum project version: "
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin.php:1298
-msgid "Maximum project version: "
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin.php:1299
-msgid "Minimum PHP version: "
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin.php:1300
-msgid "Requires: "
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin.php:1301 ../../Zotlabs/Module/Admin.php:1354
-msgid "Disabled - version incompatibility"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin.php:1452
-msgid "No themes found."
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin.php:1508
-msgid "Screenshot"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin.php:1515 ../../Zotlabs/Module/Admin.php:1549
-#: ../../include/widgets.php:1389
-msgid "Themes"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin.php:1554
-msgid "[Experimental]"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin.php:1555
-msgid "[Unsupported]"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin.php:1579
-msgid "Log settings updated."
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin.php:1634 ../../include/widgets.php:1410
-#: ../../include/widgets.php:1420
-msgid "Logs"
+"Please choose the profile you would like to display to %s when viewing your "
+"profile securely."
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:1636
-msgid "Clear"
+#: ../../Zotlabs/Module/Connedit.php:734
+msgid "Their Settings"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:1642
-msgid "Debugging"
+#: ../../Zotlabs/Module/Connedit.php:735
+msgid "My Settings"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:1643
-msgid "Log file"
+#: ../../Zotlabs/Module/Connedit.php:737
+msgid "Individual Permissions"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:1643
+#: ../../Zotlabs/Module/Connedit.php:738
 msgid ""
-"Must be writable by web server. Relative to your Red top-level directory."
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin.php:1644
-msgid "Log level"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin.php:1711
-msgid "New Profile Field"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin.php:1712 ../../Zotlabs/Module/Admin.php:1732
-msgid "Field nickname"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin.php:1712 ../../Zotlabs/Module/Admin.php:1732
-msgid "System name of field"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin.php:1713 ../../Zotlabs/Module/Admin.php:1733
-msgid "Input type"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin.php:1714 ../../Zotlabs/Module/Admin.php:1734
-msgid "Field Name"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin.php:1714 ../../Zotlabs/Module/Admin.php:1734
-msgid "Label on profile pages"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin.php:1715 ../../Zotlabs/Module/Admin.php:1735
-msgid "Help text"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin.php:1715 ../../Zotlabs/Module/Admin.php:1735
-msgid "Additional info (optional)"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin.php:1716 ../../Zotlabs/Module/Admin.php:1736
-#: ../../Zotlabs/Module/Filer.php:53 ../../Zotlabs/Module/Rbmark.php:32
-#: ../../Zotlabs/Module/Rbmark.php:104 ../../include/widgets.php:201
-#: ../../include/text.php:934 ../../include/text.php:946
-msgid "Save"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin.php:1725
-msgid "Field definition not found"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin.php:1731
-msgid "Edit Profile Field"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin.php:1789 ../../include/widgets.php:1391
-msgid "Profile Fields"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin.php:1790
-msgid "Basic Profile Fields"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin.php:1791
-msgid "Advanced Profile Fields"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin.php:1791
-msgid "(In addition to basic fields)"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin.php:1793
-msgid "All available fields"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin.php:1794
-msgid "Custom Fields"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin.php:1798
-msgid "Create Custom Field"
-msgstr ""
-
-#: ../../Zotlabs/Module/Api.php:61 ../../Zotlabs/Module/Api.php:85
-msgid "Authorize application connection"
-msgstr ""
-
-#: ../../Zotlabs/Module/Api.php:62
-msgid "Return to your app and insert this Securty Code:"
-msgstr ""
-
-#: ../../Zotlabs/Module/Api.php:72
-msgid "Please login to continue."
+"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/Api.php:87
+#: ../../Zotlabs/Module/Connedit.php:739
 msgid ""
-"Do you want to authorize this application to access your posts and contacts, "
-"and/or create new posts for you?"
-msgstr ""
-
-#: ../../Zotlabs/Module/Appman.php:36 ../../Zotlabs/Module/Appman.php:52
-msgid "App installed."
-msgstr ""
-
-#: ../../Zotlabs/Module/Appman.php:45
-msgid "Malformed app."
-msgstr ""
-
-#: ../../Zotlabs/Module/Appman.php:103
-msgid "Embed code"
-msgstr ""
-
-#: ../../Zotlabs/Module/Appman.php:109 ../../include/widgets.php:107
-msgid "Edit App"
-msgstr ""
-
-#: ../../Zotlabs/Module/Appman.php:109
-msgid "Create App"
-msgstr ""
-
-#: ../../Zotlabs/Module/Appman.php:114
-msgid "Name of app"
-msgstr ""
-
-#: ../../Zotlabs/Module/Appman.php:114 ../../Zotlabs/Module/Appman.php:115
-#: ../../Zotlabs/Module/Events.php:448 ../../Zotlabs/Module/Events.php:453
-#: ../../Zotlabs/Module/Profiles.php:713 ../../Zotlabs/Module/Profiles.php:717
-#: ../../include/datetime.php:246
-msgid "Required"
-msgstr ""
-
-#: ../../Zotlabs/Module/Appman.php:115
-msgid "Location (URL) of app"
-msgstr ""
-
-#: ../../Zotlabs/Module/Appman.php:116 ../../Zotlabs/Module/Events.php:461
-#: ../../Zotlabs/Module/Rbmark.php:101
-msgid "Description"
-msgstr ""
-
-#: ../../Zotlabs/Module/Appman.php:117
-msgid "Photo icon URL"
-msgstr ""
-
-#: ../../Zotlabs/Module/Appman.php:117
-msgid "80 x 80 pixels - optional"
-msgstr ""
-
-#: ../../Zotlabs/Module/Appman.php:118
-msgid "Categories (optional, comma separated list)"
-msgstr ""
-
-#: ../../Zotlabs/Module/Appman.php:119
-msgid "Version ID"
-msgstr ""
-
-#: ../../Zotlabs/Module/Appman.php:120
-msgid "Price of app"
-msgstr ""
-
-#: ../../Zotlabs/Module/Appman.php:121
-msgid "Location (URL) to purchase app"
-msgstr ""
-
-#: ../../Zotlabs/Module/Apps.php:46 ../../include/widgets.php:102
-#: ../../include/nav.php:163
-msgid "Apps"
-msgstr ""
-
-#: ../../Zotlabs/Module/Attach.php:13
-msgid "Item not available."
-msgstr ""
-
-#: ../../Zotlabs/Module/Block.php:31 ../../Zotlabs/Module/Page.php:40
-msgid "Invalid item."
-msgstr ""
-
-#: ../../Zotlabs/Module/Block.php:43 ../../Zotlabs/Module/Cal.php:65
-#: ../../Zotlabs/Module/Page.php:56 ../../Zotlabs/Module/Wall_upload.php:33
-msgid "Channel not found."
-msgstr ""
-
-#: ../../Zotlabs/Module/Blocks.php:99 ../../Zotlabs/Module/Blocks.php:154
-msgid "Block Name"
-msgstr ""
-
-#: ../../Zotlabs/Module/Blocks.php:153 ../../include/text.php:2280
-msgid "Blocks"
-msgstr ""
-
-#: ../../Zotlabs/Module/Blocks.php:155
-msgid "Block Title"
-msgstr ""
-
-#: ../../Zotlabs/Module/Blocks.php:156 ../../Zotlabs/Module/Layouts.php:188
-#: ../../Zotlabs/Module/Menu.php:114 ../../Zotlabs/Module/Webpages.php:200
-#: ../../include/page_widgets.php:44
-msgid "Created"
-msgstr ""
-
-#: ../../Zotlabs/Module/Blocks.php:157 ../../Zotlabs/Module/Layouts.php:189
-#: ../../Zotlabs/Module/Menu.php:115 ../../Zotlabs/Module/Webpages.php:201
-#: ../../include/page_widgets.php:45
-msgid "Edited"
-msgstr ""
-
-#: ../../Zotlabs/Module/Blocks.php:160 ../../Zotlabs/Module/Layouts.php:191
-#: ../../Zotlabs/Module/Photos.php:1071 ../../Zotlabs/Module/Webpages.php:190
-#: ../../include/conversation.php:1218
-msgid "Share"
-msgstr ""
-
-#: ../../Zotlabs/Module/Blocks.php:165 ../../Zotlabs/Module/Layouts.php:195
-#: ../../Zotlabs/Module/Pubsites.php:46 ../../Zotlabs/Module/Webpages.php:195
-#: ../../include/page_widgets.php:39
-msgid "View"
-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/Cal.php:72
-msgid "Permissions denied."
-msgstr ""
-
-#: ../../Zotlabs/Module/Cal.php:262 ../../Zotlabs/Module/Events.php:585
-msgid "l, F j"
-msgstr ""
-
-#: ../../Zotlabs/Module/Cal.php:311 ../../Zotlabs/Module/Events.php:634
-#: ../../include/text.php:1743
-msgid "Link to Source"
+"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/Cal.php:334 ../../Zotlabs/Module/Events.php:662
-msgid "Edit Event"
+#: ../../Zotlabs/Module/Connedit.php:740
+msgid "Last update:"
 msgstr ""
 
-#: ../../Zotlabs/Module/Cal.php:334 ../../Zotlabs/Module/Events.php:662
-msgid "Create Event"
+#: ../../Zotlabs/Module/Directory.php:63 ../../Zotlabs/Module/Display.php:17
+#: ../../Zotlabs/Module/Photos.php:522 ../../Zotlabs/Module/Ratings.php:86
+#: ../../Zotlabs/Module/Search.php:17
+#: ../../Zotlabs/Module/Viewconnections.php:20
+msgid "Public access denied."
 msgstr ""
 
-#: ../../Zotlabs/Module/Cal.php:335 ../../Zotlabs/Module/Cal.php:342
-#: ../../Zotlabs/Module/Events.php:663 ../../Zotlabs/Module/Events.php:670
-#: ../../Zotlabs/Module/Photos.php:948
-msgid "Previous"
-msgstr ""
+#: ../../Zotlabs/Module/Directory.php:243
+#, php-format
+msgid "%d rating"
+msgid_plural "%d ratings"
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../../Zotlabs/Module/Cal.php:336 ../../Zotlabs/Module/Cal.php:343
-#: ../../Zotlabs/Module/Events.php:664 ../../Zotlabs/Module/Events.php:671
-#: ../../Zotlabs/Module/Photos.php:957 ../../Zotlabs/Module/Setup.php:290
-msgid "Next"
+#: ../../Zotlabs/Module/Directory.php:254
+msgid "Gender: "
 msgstr ""
 
-#: ../../Zotlabs/Module/Cal.php:337 ../../Zotlabs/Module/Events.php:665
-#: ../../include/widgets.php:755
-msgid "Export"
+#: ../../Zotlabs/Module/Directory.php:256
+msgid "Status: "
 msgstr ""
 
-#: ../../Zotlabs/Module/Cal.php:340 ../../Zotlabs/Module/Events.php:668
-#: ../../include/widgets.php:756
-msgid "Import"
+#: ../../Zotlabs/Module/Directory.php:258
+msgid "Homepage: "
 msgstr ""
 
-#: ../../Zotlabs/Module/Cal.php:344 ../../Zotlabs/Module/Events.php:672
-msgid "Today"
+#: ../../Zotlabs/Module/Directory.php:306 ../../include/channel.php:1183
+msgid "Age:"
 msgstr ""
 
-#: ../../Zotlabs/Module/Channel.php:28 ../../Zotlabs/Module/Chat.php:23
-msgid "You must be logged in to see this page."
+#: ../../Zotlabs/Module/Directory.php:311 ../../include/event.php:52
+#: ../../include/event.php:84 ../../include/channel.php:1027
+#: ../../include/bb2diaspora.php:507
+msgid "Location:"
 msgstr ""
 
-#: ../../Zotlabs/Module/Channel.php:40
-msgid "Posts and comments"
+#: ../../Zotlabs/Module/Directory.php:317
+msgid "Description:"
 msgstr ""
 
-#: ../../Zotlabs/Module/Channel.php:41
-msgid "Only posts"
+#: ../../Zotlabs/Module/Directory.php:322 ../../include/channel.php:1199
+msgid "Hometown:"
 msgstr ""
 
-#: ../../Zotlabs/Module/Channel.php:101
-msgid "Insufficient permissions.  Request redirected to profile page."
+#: ../../Zotlabs/Module/Directory.php:324 ../../include/channel.php:1207
+msgid "About:"
 msgstr ""
 
-#: ../../Zotlabs/Module/Channel.php:135 ../../Zotlabs/Module/Network.php:173
-#: ../../Zotlabs/Module/Rpost.php:118
-msgid "Public"
+#: ../../Zotlabs/Module/Directory.php:325 ../../Zotlabs/Module/Match.php:68
+#: ../../Zotlabs/Module/Suggest.php:56 ../../include/widgets.php:147
+#: ../../include/widgets.php:184 ../../include/connections.php:78
+#: ../../include/conversation.php:956 ../../include/channel.php:1012
+msgid "Connect"
 msgstr ""
 
-#: ../../Zotlabs/Module/Chat.php:179
-msgid "Room not found"
+#: ../../Zotlabs/Module/Directory.php:326
+msgid "Public Forum:"
 msgstr ""
 
-#: ../../Zotlabs/Module/Chat.php:195
-msgid "Leave Room"
+#: ../../Zotlabs/Module/Directory.php:329
+msgid "Keywords: "
 msgstr ""
 
-#: ../../Zotlabs/Module/Chat.php:196
-msgid "Delete Room"
+#: ../../Zotlabs/Module/Directory.php:332
+msgid "Don't suggest"
 msgstr ""
 
-#: ../../Zotlabs/Module/Chat.php:197
-msgid "I am away right now"
+#: ../../Zotlabs/Module/Directory.php:334
+msgid "Common connections:"
 msgstr ""
 
-#: ../../Zotlabs/Module/Chat.php:198
-msgid "I am online"
+#: ../../Zotlabs/Module/Directory.php:383
+msgid "Global Directory"
 msgstr ""
 
-#: ../../Zotlabs/Module/Chat.php:200
-msgid "Bookmark this room"
+#: ../../Zotlabs/Module/Directory.php:383
+msgid "Local Directory"
 msgstr ""
 
-#: ../../Zotlabs/Module/Chat.php:203 ../../Zotlabs/Module/Mail.php:206
-#: ../../Zotlabs/Module/Mail.php:320 ../../include/conversation.php:1186
-msgid "Please enter a link URL:"
+#: ../../Zotlabs/Module/Directory.php:388
+#: ../../Zotlabs/Module/Directory.php:393
+#: ../../Zotlabs/Module/Connections.php:309
+#: ../../include/contact_widgets.php:23
+msgid "Find"
 msgstr ""
 
-#: ../../Zotlabs/Module/Chat.php:204 ../../Zotlabs/Module/Mail.php:259
-#: ../../Zotlabs/Module/Mail.php:389 ../../include/ItemObject.php:715
-#: ../../include/conversation.php:1266
-msgid "Encrypt text"
+#: ../../Zotlabs/Module/Directory.php:389
+msgid "Finding:"
 msgstr ""
 
-#: ../../Zotlabs/Module/Chat.php:205 ../../Zotlabs/Module/Editblock.php:144
-#: ../../Zotlabs/Module/Editwebpage.php:188 ../../Zotlabs/Module/Mail.php:253
-#: ../../Zotlabs/Module/Mail.php:383 ../../include/conversation.php:1141
-msgid "Insert web link"
+#: ../../Zotlabs/Module/Directory.php:392 ../../Zotlabs/Module/Suggest.php:64
+#: ../../include/contact_widgets.php:24
+msgid "Channel Suggestions"
 msgstr ""
 
-#: ../../Zotlabs/Module/Chat.php:216
-msgid "Feature disabled."
+#: ../../Zotlabs/Module/Directory.php:394
+msgid "next page"
 msgstr ""
 
-#: ../../Zotlabs/Module/Chat.php:230
-msgid "New Chatroom"
+#: ../../Zotlabs/Module/Directory.php:394
+msgid "previous page"
 msgstr ""
 
-#: ../../Zotlabs/Module/Chat.php:231
-msgid "Chatroom name"
+#: ../../Zotlabs/Module/Directory.php:395
+msgid "Sort options"
 msgstr ""
 
-#: ../../Zotlabs/Module/Chat.php:232
-msgid "Expiration of chats (minutes)"
+#: ../../Zotlabs/Module/Directory.php:396
+msgid "Alphabetic"
 msgstr ""
 
-#: ../../Zotlabs/Module/Chat.php:233 ../../Zotlabs/Module/Filestorage.php:151
-#: ../../Zotlabs/Module/Photos.php:670 ../../Zotlabs/Module/Photos.php:1044
-#: ../../Zotlabs/Module/Thing.php:313 ../../Zotlabs/Module/Thing.php:359
-#: ../../include/acl_selectors.php:266
-msgid "Permissions"
+#: ../../Zotlabs/Module/Directory.php:397
+msgid "Reverse Alphabetic"
 msgstr ""
 
-#: ../../Zotlabs/Module/Chat.php:244
-#, php-format
-msgid "%1$s's Chatrooms"
+#: ../../Zotlabs/Module/Directory.php:398
+msgid "Newest to Oldest"
 msgstr ""
 
-#: ../../Zotlabs/Module/Chat.php:249
-msgid "No chatrooms available"
+#: ../../Zotlabs/Module/Directory.php:399
+msgid "Oldest to Newest"
 msgstr ""
 
-#: ../../Zotlabs/Module/Chat.php:250 ../../Zotlabs/Module/Manage.php:141
-#: ../../Zotlabs/Module/Profiles.php:782
-msgid "Create New"
+#: ../../Zotlabs/Module/Directory.php:416
+msgid "No entries (some entries may be hidden)."
 msgstr ""
 
-#: ../../Zotlabs/Module/Chat.php:253
-msgid "Expiration"
+#: ../../Zotlabs/Module/Display.php:40 ../../Zotlabs/Module/Filestorage.php:33
+#: ../../Zotlabs/Module/Admin.php:164 ../../Zotlabs/Module/Admin.php:1255
+#: ../../Zotlabs/Module/Admin.php:1561 ../../Zotlabs/Module/Thing.php:89
+#: ../../Zotlabs/Module/Viewsrc.php:24 ../../include/items.php:3359
+msgid "Item not found."
 msgstr ""
 
-#: ../../Zotlabs/Module/Chat.php:254
-msgid "min"
+#: ../../Zotlabs/Module/Editblock.php:79 ../../Zotlabs/Module/Editblock.php:95
+#: ../../Zotlabs/Module/Editpost.php:24 ../../Zotlabs/Module/Editlayout.php:79
+#: ../../Zotlabs/Module/Editwebpage.php:81
+msgid "Item not found"
 msgstr ""
 
-#: ../../Zotlabs/Module/Chatsvc.php:115
-msgid "Away"
+#: ../../Zotlabs/Module/Editblock.php:124 ../../include/conversation.php:1228
+msgid "Title (optional)"
 msgstr ""
 
-#: ../../Zotlabs/Module/Chatsvc.php:120
-msgid "Online"
+#: ../../Zotlabs/Module/Editblock.php:133
+msgid "Edit Block"
 msgstr ""
 
 #: ../../Zotlabs/Module/Common.php:14
@@ -1643,49 +1048,6 @@ msgstr ""
 msgid "No connections in common."
 msgstr ""
 
-#: ../../Zotlabs/Module/Connect.php:60 ../../Zotlabs/Module/Connect.php:108
-msgid "Continue"
-msgstr ""
-
-#: ../../Zotlabs/Module/Connect.php:89
-msgid "Premium Channel Setup"
-msgstr ""
-
-#: ../../Zotlabs/Module/Connect.php:91
-msgid "Enable premium channel connection restrictions"
-msgstr ""
-
-#: ../../Zotlabs/Module/Connect.php:92
-msgid ""
-"Please enter your restrictions or conditions, such as paypal receipt, usage "
-"guidelines, etc."
-msgstr ""
-
-#: ../../Zotlabs/Module/Connect.php:94 ../../Zotlabs/Module/Connect.php:114
-msgid ""
-"This channel may require additional steps or acknowledgement of the "
-"following conditions prior to connecting:"
-msgstr ""
-
-#: ../../Zotlabs/Module/Connect.php:95
-msgid ""
-"Potential connections will then see the following text before proceeding:"
-msgstr ""
-
-#: ../../Zotlabs/Module/Connect.php:96 ../../Zotlabs/Module/Connect.php:117
-msgid ""
-"By continuing, I certify that I have complied with any instructions provided "
-"on this page."
-msgstr ""
-
-#: ../../Zotlabs/Module/Connect.php:105
-msgid "(No specific instructions have been provided by the channel owner.)"
-msgstr ""
-
-#: ../../Zotlabs/Module/Connect.php:113
-msgid "Restricted or Premium Channel"
-msgstr ""
-
 #: ../../Zotlabs/Module/Connections.php:56
 #: ../../Zotlabs/Module/Connections.php:161
 #: ../../Zotlabs/Module/Connections.php:242
@@ -1712,16 +1074,10 @@ msgstr ""
 
 #: ../../Zotlabs/Module/Connections.php:76
 #: ../../Zotlabs/Module/Connections.php:86 ../../Zotlabs/Module/Menu.php:116
-#: ../../include/conversation.php:1545
+#: ../../include/conversation.php:1535
 msgid "New"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connections.php:92
-#: ../../Zotlabs/Module/Connections.php:107
-#: ../../Zotlabs/Module/Connedit.php:597 ../../include/widgets.php:497
-msgid "All"
-msgstr ""
-
 #: ../../Zotlabs/Module/Connections.php:138
 msgid "New Connections"
 msgstr ""
@@ -1780,6 +1136,10 @@ msgstr ""
 msgid "Network"
 msgstr ""
 
+#: ../../Zotlabs/Module/Connections.php:270 ../../Zotlabs/Module/Admin.php:710
+msgid "Status"
+msgstr ""
+
 #: ../../Zotlabs/Module/Connections.php:272
 msgid "Connected"
 msgstr ""
@@ -1788,29 +1148,28 @@ msgstr ""
 msgid "Approve connection"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connections.php:276
-msgid "Ignore connection"
+#: ../../Zotlabs/Module/Connections.php:275
+#: ../../Zotlabs/Module/Admin.php:1037
+msgid "Approve"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connections.php:277
-#: ../../Zotlabs/Module/Connedit.php:549
-#: ../../Zotlabs/Module/Notifications.php:55
-msgid "Ignore"
+#: ../../Zotlabs/Module/Connections.php:276
+msgid "Ignore connection"
 msgstr ""
 
 #: ../../Zotlabs/Module/Connections.php:278
 msgid "Recent activity"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connections.php:302 ../../include/apps.php:159
-#: ../../include/text.php:863 ../../include/nav.php:186
+#: ../../Zotlabs/Module/Connections.php:302 ../../Zotlabs/Lib/Apps.php:208
+#: ../../include/text.php:875 ../../include/nav.php:186
 msgid "Connections"
 msgstr ""
 
 #: ../../Zotlabs/Module/Connections.php:306 ../../Zotlabs/Module/Search.php:44
-#: ../../include/acl_selectors.php:259 ../../include/apps.php:179
-#: ../../include/text.php:933 ../../include/text.php:945
-#: ../../include/nav.php:165
+#: ../../Zotlabs/Lib/Apps.php:228 ../../include/text.php:945
+#: ../../include/text.php:957 ../../include/nav.php:165
+#: ../../include/acl_selectors.php:276
 msgid "Search"
 msgstr ""
 
@@ -1822,298 +1181,6 @@ msgstr ""
 msgid "Connections search"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connections.php:309
-#: ../../Zotlabs/Module/Directory.php:388
-#: ../../Zotlabs/Module/Directory.php:393 ../../include/contact_widgets.php:26
-msgid "Find"
-msgstr ""
-
-#: ../../Zotlabs/Module/Connedit.php:80
-msgid "Could not access contact record."
-msgstr ""
-
-#: ../../Zotlabs/Module/Connedit.php:104
-msgid "Could not locate selected profile."
-msgstr ""
-
-#: ../../Zotlabs/Module/Connedit.php:227
-msgid "Connection updated."
-msgstr ""
-
-#: ../../Zotlabs/Module/Connedit.php:229
-msgid "Failed to update connection record."
-msgstr ""
-
-#: ../../Zotlabs/Module/Connedit.php:276
-msgid "is now connected to"
-msgstr ""
-
-#: ../../Zotlabs/Module/Connedit.php:411
-msgid "Could not access address book record."
-msgstr ""
-
-#: ../../Zotlabs/Module/Connedit.php:425
-msgid "Refresh failed - channel is currently unavailable."
-msgstr ""
-
-#: ../../Zotlabs/Module/Connedit.php:440 ../../Zotlabs/Module/Connedit.php:449
-#: ../../Zotlabs/Module/Connedit.php:458 ../../Zotlabs/Module/Connedit.php:467
-#: ../../Zotlabs/Module/Connedit.php:480
-msgid "Unable to set address book parameters."
-msgstr ""
-
-#: ../../Zotlabs/Module/Connedit.php:504
-msgid "Connection has been removed."
-msgstr ""
-
-#: ../../Zotlabs/Module/Connedit.php:520 ../../include/apps.php:170
-#: ../../include/conversation.php:959 ../../include/nav.php:86
-msgid "View Profile"
-msgstr ""
-
-#: ../../Zotlabs/Module/Connedit.php:523
-#, php-format
-msgid "View %s's profile"
-msgstr ""
-
-#: ../../Zotlabs/Module/Connedit.php:527
-msgid "Refresh Permissions"
-msgstr ""
-
-#: ../../Zotlabs/Module/Connedit.php:530
-msgid "Fetch updated permissions"
-msgstr ""
-
-#: ../../Zotlabs/Module/Connedit.php:534
-msgid "Recent Activity"
-msgstr ""
-
-#: ../../Zotlabs/Module/Connedit.php:537
-msgid "View recent posts and comments"
-msgstr ""
-
-#: ../../Zotlabs/Module/Connedit.php:544
-msgid "Block (or Unblock) all communications with this connection"
-msgstr ""
-
-#: ../../Zotlabs/Module/Connedit.php:545
-msgid "This connection is blocked!"
-msgstr ""
-
-#: ../../Zotlabs/Module/Connedit.php:549
-msgid "Unignore"
-msgstr ""
-
-#: ../../Zotlabs/Module/Connedit.php:552
-msgid "Ignore (or Unignore) all inbound communications from this connection"
-msgstr ""
-
-#: ../../Zotlabs/Module/Connedit.php:553
-msgid "This connection is ignored!"
-msgstr ""
-
-#: ../../Zotlabs/Module/Connedit.php:557
-msgid "Unarchive"
-msgstr ""
-
-#: ../../Zotlabs/Module/Connedit.php:557
-msgid "Archive"
-msgstr ""
-
-#: ../../Zotlabs/Module/Connedit.php:560
-msgid ""
-"Archive (or Unarchive) this connection - mark channel dead but keep content"
-msgstr ""
-
-#: ../../Zotlabs/Module/Connedit.php:561
-msgid "This connection is archived!"
-msgstr ""
-
-#: ../../Zotlabs/Module/Connedit.php:565
-msgid "Unhide"
-msgstr ""
-
-#: ../../Zotlabs/Module/Connedit.php:565
-msgid "Hide"
-msgstr ""
-
-#: ../../Zotlabs/Module/Connedit.php:568
-msgid "Hide or Unhide this connection from your other connections"
-msgstr ""
-
-#: ../../Zotlabs/Module/Connedit.php:569
-msgid "This connection is hidden!"
-msgstr ""
-
-#: ../../Zotlabs/Module/Connedit.php:576
-msgid "Delete this connection"
-msgstr ""
-
-#: ../../Zotlabs/Module/Connedit.php:593 ../../include/widgets.php:493
-msgid "Me"
-msgstr ""
-
-#: ../../Zotlabs/Module/Connedit.php:594 ../../include/widgets.php:494
-msgid "Family"
-msgstr ""
-
-#: ../../Zotlabs/Module/Connedit.php:595 ../../Zotlabs/Module/Settings.php:340
-#: ../../Zotlabs/Module/Settings.php:344 ../../Zotlabs/Module/Settings.php:345
-#: ../../Zotlabs/Module/Settings.php:348 ../../Zotlabs/Module/Settings.php:359
-#: ../../include/identity.php:389 ../../include/identity.php:390
-#: ../../include/identity.php:397 ../../include/profile_selectors.php:80
-#: ../../include/widgets.php:495
-msgid "Friends"
-msgstr ""
-
-#: ../../Zotlabs/Module/Connedit.php:596 ../../include/widgets.php:496
-msgid "Acquaintances"
-msgstr ""
-
-#: ../../Zotlabs/Module/Connedit.php:657
-msgid "Approve this connection"
-msgstr ""
-
-#: ../../Zotlabs/Module/Connedit.php:657
-msgid "Accept connection to allow communication"
-msgstr ""
-
-#: ../../Zotlabs/Module/Connedit.php:662
-msgid "Set Affinity"
-msgstr ""
-
-#: ../../Zotlabs/Module/Connedit.php:665
-msgid "Set Profile"
-msgstr ""
-
-#: ../../Zotlabs/Module/Connedit.php:668
-msgid "Set Affinity & Profile"
-msgstr ""
-
-#: ../../Zotlabs/Module/Connedit.php:701
-msgid "none"
-msgstr ""
-
-#: ../../Zotlabs/Module/Connedit.php:705 ../../include/widgets.php:614
-msgid "Connection Default Permissions"
-msgstr ""
-
-#: ../../Zotlabs/Module/Connedit.php:705 ../../include/items.php:5193
-#, php-format
-msgid "Connection: %s"
-msgstr ""
-
-#: ../../Zotlabs/Module/Connedit.php:706
-msgid "Apply these permissions automatically"
-msgstr ""
-
-#: ../../Zotlabs/Module/Connedit.php:706
-msgid "Connection requests will be approved without your interaction"
-msgstr ""
-
-#: ../../Zotlabs/Module/Connedit.php:708
-msgid "This connection's primary address is"
-msgstr ""
-
-#: ../../Zotlabs/Module/Connedit.php:709
-msgid "Available locations:"
-msgstr ""
-
-#: ../../Zotlabs/Module/Connedit.php:713
-msgid ""
-"The permissions indicated on this page will be applied to all new "
-"connections."
-msgstr ""
-
-#: ../../Zotlabs/Module/Connedit.php:714
-msgid "Connection Tools"
-msgstr ""
-
-#: ../../Zotlabs/Module/Connedit.php:716
-msgid "Slide to adjust your degree of friendship"
-msgstr ""
-
-#: ../../Zotlabs/Module/Connedit.php:717 ../../Zotlabs/Module/Rate.php:161
-#: ../../include/js_strings.php:20
-msgid "Rating"
-msgstr ""
-
-#: ../../Zotlabs/Module/Connedit.php:718
-msgid "Slide to adjust your rating"
-msgstr ""
-
-#: ../../Zotlabs/Module/Connedit.php:719 ../../Zotlabs/Module/Connedit.php:724
-msgid "Optionally explain your rating"
-msgstr ""
-
-#: ../../Zotlabs/Module/Connedit.php:721
-msgid "Custom Filter"
-msgstr ""
-
-#: ../../Zotlabs/Module/Connedit.php:722
-msgid "Only import posts with this text"
-msgstr ""
-
-#: ../../Zotlabs/Module/Connedit.php:722 ../../Zotlabs/Module/Connedit.php:723
-msgid ""
-"words one per line or #tags or /patterns/ or lang=xx, leave blank to import "
-"all posts"
-msgstr ""
-
-#: ../../Zotlabs/Module/Connedit.php:723
-msgid "Do not import posts with this text"
-msgstr ""
-
-#: ../../Zotlabs/Module/Connedit.php:725
-msgid "This information is public!"
-msgstr ""
-
-#: ../../Zotlabs/Module/Connedit.php:730
-msgid "Connection Pending Approval"
-msgstr ""
-
-#: ../../Zotlabs/Module/Connedit.php:733
-msgid "inherited"
-msgstr ""
-
-#: ../../Zotlabs/Module/Connedit.php:735
-#, php-format
-msgid ""
-"Please choose the profile you would like to display to %s when viewing your "
-"profile securely."
-msgstr ""
-
-#: ../../Zotlabs/Module/Connedit.php:737
-msgid "Their Settings"
-msgstr ""
-
-#: ../../Zotlabs/Module/Connedit.php:738
-msgid "My Settings"
-msgstr ""
-
-#: ../../Zotlabs/Module/Connedit.php:740
-msgid "Individual Permissions"
-msgstr ""
-
-#: ../../Zotlabs/Module/Connedit.php:741
-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:742
-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:743
-msgid "Last update:"
-msgstr ""
-
 #: ../../Zotlabs/Module/Cover_photo.php:58
 #: ../../Zotlabs/Module/Profile_photo.php:79
 msgid "Image uploaded but image cropping failed."
@@ -2130,7 +1197,7 @@ msgid "Image resize failed."
 msgstr ""
 
 #: ../../Zotlabs/Module/Cover_photo.php:168
-#: ../../Zotlabs/Module/Profile_photo.php:192 ../../include/photos.php:146
+#: ../../Zotlabs/Module/Profile_photo.php:192 ../../include/photos.php:144
 msgid "Unable to process image"
 msgstr ""
 
@@ -2144,30 +1211,30 @@ msgstr ""
 msgid "Unable to process image."
 msgstr ""
 
-#: ../../Zotlabs/Module/Cover_photo.php:233 ../../include/items.php:5621
+#: ../../Zotlabs/Module/Cover_photo.php:233 ../../include/items.php:4270
 msgid "female"
 msgstr ""
 
-#: ../../Zotlabs/Module/Cover_photo.php:234 ../../include/items.php:5622
+#: ../../Zotlabs/Module/Cover_photo.php:234 ../../include/items.php:4271
 #, php-format
 msgid "%1$s updated her %2$s"
 msgstr ""
 
-#: ../../Zotlabs/Module/Cover_photo.php:235 ../../include/items.php:5623
+#: ../../Zotlabs/Module/Cover_photo.php:235 ../../include/items.php:4272
 msgid "male"
 msgstr ""
 
-#: ../../Zotlabs/Module/Cover_photo.php:236 ../../include/items.php:5624
+#: ../../Zotlabs/Module/Cover_photo.php:236 ../../include/items.php:4273
 #, php-format
 msgid "%1$s updated his %2$s"
 msgstr ""
 
-#: ../../Zotlabs/Module/Cover_photo.php:238 ../../include/items.php:5626
+#: ../../Zotlabs/Module/Cover_photo.php:238 ../../include/items.php:4275
 #, php-format
 msgid "%1$s updated their %2$s"
 msgstr ""
 
-#: ../../Zotlabs/Module/Cover_photo.php:240 ../../include/identity.php:1807
+#: ../../Zotlabs/Module/Cover_photo.php:240 ../../include/channel.php:1661
 msgid "cover photo"
 msgstr ""
 
@@ -2194,7 +1261,7 @@ msgstr ""
 
 #: ../../Zotlabs/Module/Cover_photo.php:361
 #: ../../Zotlabs/Module/Profile_photo.php:374
-#: ../../Zotlabs/Module/Settings.php:983
+#: ../../Zotlabs/Module/Settings.php:985
 msgid "or"
 msgstr ""
 
@@ -2223,128 +1290,169 @@ msgstr ""
 msgid "Done Editing"
 msgstr ""
 
-#: ../../Zotlabs/Module/Dav.php:127
-msgid "$Projectname channel"
+#: ../../Zotlabs/Module/Editpost.php:35
+msgid "Item is not editable"
 msgstr ""
 
-#: ../../Zotlabs/Module/Directory.php:63 ../../Zotlabs/Module/Display.php:21
-#: ../../Zotlabs/Module/Photos.php:521 ../../Zotlabs/Module/Ratings.php:86
-#: ../../Zotlabs/Module/Search.php:17
-#: ../../Zotlabs/Module/Viewconnections.php:21
-msgid "Public access denied."
+#: ../../Zotlabs/Module/Editpost.php:106 ../../Zotlabs/Module/Rpost.php:135
+msgid "Edit post"
 msgstr ""
 
-#: ../../Zotlabs/Module/Directory.php:243
-#, php-format
-msgid "%d rating"
-msgid_plural "%d ratings"
-msgstr[0] ""
-msgstr[1] ""
+#: ../../Zotlabs/Module/Events.php:26
+msgid "Calendar entries imported."
+msgstr ""
 
-#: ../../Zotlabs/Module/Directory.php:254
-msgid "Gender: "
+#: ../../Zotlabs/Module/Events.php:28
+msgid "No calendar entries found."
 msgstr ""
 
-#: ../../Zotlabs/Module/Directory.php:256
-msgid "Status: "
+#: ../../Zotlabs/Module/Events.php:105
+msgid "Event can not end before it has started."
 msgstr ""
 
-#: ../../Zotlabs/Module/Directory.php:258
-msgid "Homepage: "
+#: ../../Zotlabs/Module/Events.php:107 ../../Zotlabs/Module/Events.php:116
+#: ../../Zotlabs/Module/Events.php:136
+msgid "Unable to generate preview."
 msgstr ""
 
-#: ../../Zotlabs/Module/Directory.php:306 ../../include/identity.php:1329
-msgid "Age:"
+#: ../../Zotlabs/Module/Events.php:114
+msgid "Event title and start time are required."
 msgstr ""
 
-#: ../../Zotlabs/Module/Directory.php:311 ../../include/identity.php:1029
-#: ../../include/bb2diaspora.php:509 ../../include/event.php:52
-#: ../../include/text.php:1481
-msgid "Location:"
+#: ../../Zotlabs/Module/Events.php:134 ../../Zotlabs/Module/Events.php:259
+msgid "Event not found."
 msgstr ""
 
-#: ../../Zotlabs/Module/Directory.php:317
-msgid "Description:"
+#: ../../Zotlabs/Module/Events.php:254 ../../Zotlabs/Module/Like.php:373
+#: ../../Zotlabs/Module/Tagger.php:51 ../../include/event.php:949
+#: ../../include/text.php:1943 ../../include/conversation.php:123
+msgid "event"
 msgstr ""
 
-#: ../../Zotlabs/Module/Directory.php:322 ../../include/identity.php:1345
-msgid "Hometown:"
+#: ../../Zotlabs/Module/Events.php:449
+msgid "Edit event title"
 msgstr ""
 
-#: ../../Zotlabs/Module/Directory.php:324 ../../include/identity.php:1353
-msgid "About:"
+#: ../../Zotlabs/Module/Events.php:449
+msgid "Event title"
 msgstr ""
 
-#: ../../Zotlabs/Module/Directory.php:325 ../../Zotlabs/Module/Match.php:68
-#: ../../Zotlabs/Module/Suggest.php:56 ../../include/identity.php:1014
-#: ../../include/widgets.php:147 ../../include/widgets.php:184
-#: ../../include/Contact.php:101 ../../include/conversation.php:961
-msgid "Connect"
+#: ../../Zotlabs/Module/Events.php:449 ../../Zotlabs/Module/Events.php:454
+#: ../../Zotlabs/Module/Profiles.php:709 ../../Zotlabs/Module/Profiles.php:713
+#: ../../Zotlabs/Module/Appman.php:115 ../../Zotlabs/Module/Appman.php:116
+#: ../../include/datetime.php:245
+msgid "Required"
 msgstr ""
 
-#: ../../Zotlabs/Module/Directory.php:326
-msgid "Public Forum:"
+#: ../../Zotlabs/Module/Events.php:451
+msgid "Categories (comma-separated list)"
 msgstr ""
 
-#: ../../Zotlabs/Module/Directory.php:329
-msgid "Keywords: "
+#: ../../Zotlabs/Module/Events.php:452
+msgid "Edit Category"
 msgstr ""
 
-#: ../../Zotlabs/Module/Directory.php:332
-msgid "Don't suggest"
+#: ../../Zotlabs/Module/Events.php:452
+msgid "Category"
 msgstr ""
 
-#: ../../Zotlabs/Module/Directory.php:334
-msgid "Common connections:"
+#: ../../Zotlabs/Module/Events.php:455
+msgid "Edit start date and time"
 msgstr ""
 
-#: ../../Zotlabs/Module/Directory.php:383
-msgid "Global Directory"
+#: ../../Zotlabs/Module/Events.php:455
+msgid "Start date and time"
 msgstr ""
 
-#: ../../Zotlabs/Module/Directory.php:383
-msgid "Local Directory"
+#: ../../Zotlabs/Module/Events.php:456 ../../Zotlabs/Module/Events.php:459
+msgid "Finish date and time are not known or not relevant"
 msgstr ""
 
-#: ../../Zotlabs/Module/Directory.php:389
-msgid "Finding:"
+#: ../../Zotlabs/Module/Events.php:458
+msgid "Edit finish date and time"
 msgstr ""
 
-#: ../../Zotlabs/Module/Directory.php:392 ../../Zotlabs/Module/Suggest.php:64
-#: ../../include/contact_widgets.php:27
-msgid "Channel Suggestions"
+#: ../../Zotlabs/Module/Events.php:458
+msgid "Finish date and time"
 msgstr ""
 
-#: ../../Zotlabs/Module/Directory.php:394
-msgid "next page"
+#: ../../Zotlabs/Module/Events.php:460 ../../Zotlabs/Module/Events.php:461
+msgid "Adjust for viewer timezone"
 msgstr ""
 
-#: ../../Zotlabs/Module/Directory.php:394
-msgid "previous page"
+#: ../../Zotlabs/Module/Events.php:460
+msgid ""
+"Important for events that happen in a particular place. Not practical for "
+"global holidays."
 msgstr ""
 
-#: ../../Zotlabs/Module/Directory.php:395
-msgid "Sort options"
+#: ../../Zotlabs/Module/Events.php:462
+msgid "Edit Description"
 msgstr ""
 
-#: ../../Zotlabs/Module/Directory.php:396
-msgid "Alphabetic"
+#: ../../Zotlabs/Module/Events.php:462 ../../Zotlabs/Module/Appman.php:117
+#: ../../Zotlabs/Module/Rbmark.php:101
+msgid "Description"
 msgstr ""
 
-#: ../../Zotlabs/Module/Directory.php:397
-msgid "Reverse Alphabetic"
+#: ../../Zotlabs/Module/Events.php:464
+msgid "Edit Location"
 msgstr ""
 
-#: ../../Zotlabs/Module/Directory.php:398
-msgid "Newest to Oldest"
+#: ../../Zotlabs/Module/Events.php:464 ../../Zotlabs/Module/Locs.php:117
+#: ../../Zotlabs/Module/Profiles.php:477 ../../Zotlabs/Module/Profiles.php:698
+#: ../../Zotlabs/Module/Pubsites.php:41 ../../include/js_strings.php:25
+msgid "Location"
 msgstr ""
 
-#: ../../Zotlabs/Module/Directory.php:399
-msgid "Oldest to Newest"
+#: ../../Zotlabs/Module/Events.php:467 ../../Zotlabs/Module/Events.php:469
+msgid "Share this event"
 msgstr ""
 
-#: ../../Zotlabs/Module/Directory.php:416
-msgid "No entries (some entries may be hidden)."
+#: ../../Zotlabs/Module/Events.php:470 ../../Zotlabs/Module/Photos.php:1093
+#: ../../Zotlabs/Module/Webpages.php:194 ../../Zotlabs/Lib/ThreadItem.php:719
+#: ../../include/conversation.php:1187 ../../include/page_widgets.php:40
+msgid "Preview"
+msgstr ""
+
+#: ../../Zotlabs/Module/Events.php:471 ../../include/conversation.php:1232
+msgid "Permission settings"
+msgstr ""
+
+#: ../../Zotlabs/Module/Events.php:476
+msgid "Advanced Options"
+msgstr ""
+
+#: ../../Zotlabs/Module/Events.php:610
+msgid "Edit event"
+msgstr ""
+
+#: ../../Zotlabs/Module/Events.php:612
+msgid "Delete event"
+msgstr ""
+
+#: ../../Zotlabs/Module/Events.php:646
+msgid "calendar"
+msgstr ""
+
+#: ../../Zotlabs/Module/Events.php:706
+msgid "Event removed"
+msgstr ""
+
+#: ../../Zotlabs/Module/Events.php:709
+msgid "Failed to remove event"
+msgstr ""
+
+#: ../../Zotlabs/Module/Fbrowser.php:29 ../../Zotlabs/Lib/Apps.php:220
+#: ../../include/nav.php:92 ../../include/conversation.php:1632
+msgid "Photos"
+msgstr ""
+
+#: ../../Zotlabs/Module/Fbrowser.php:66 ../../Zotlabs/Module/Fbrowser.php:88
+#: ../../Zotlabs/Module/Admin.php:1406 ../../Zotlabs/Module/Settings.php:591
+#: ../../Zotlabs/Module/Settings.php:617 ../../Zotlabs/Module/Tagrm.php:15
+#: ../../Zotlabs/Module/Tagrm.php:138 ../../include/conversation.php:1259
+msgid "Cancel"
 msgstr ""
 
 #: ../../Zotlabs/Module/Dirsearch.php:25 ../../Zotlabs/Module/Regdir.php:49
@@ -2355,12 +1463,19 @@ msgstr ""
 msgid "This directory server requires an access token"
 msgstr ""
 
-#: ../../Zotlabs/Module/Dreport.php:10 ../../Zotlabs/Module/Dreport.php:49
-#: ../../Zotlabs/Module/Group.php:72 ../../Zotlabs/Module/Import_items.php:112
-#: ../../Zotlabs/Module/Like.php:284 ../../Zotlabs/Module/Profperm.php:28
-#: ../../Zotlabs/Module/Subthread.php:62 ../../include/items.php:423
-#: ../../index.php:173
-msgid "Permission denied"
+#: ../../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.php:2033
+#: ../../Zotlabs/Module/Admin.php:2053 ../../Zotlabs/Module/Rbmark.php:32
+#: ../../Zotlabs/Module/Rbmark.php:104 ../../include/text.php:946
+#: ../../include/text.php:958 ../../include/widgets.php:201
+msgid "Save"
 msgstr ""
 
 #: ../../Zotlabs/Module/Dreport.php:27
@@ -2420,92 +1535,6 @@ msgstr ""
 msgid "mail delivered"
 msgstr ""
 
-#: ../../Zotlabs/Module/Editblock.php:78 ../../Zotlabs/Module/Editblock.php:94
-#: ../../Zotlabs/Module/Editlayout.php:79 ../../Zotlabs/Module/Editpost.php:24
-#: ../../Zotlabs/Module/Editwebpage.php:81
-msgid "Item not found"
-msgstr ""
-
-#: ../../Zotlabs/Module/Editblock.php:118
-msgid "Delete block?"
-msgstr ""
-
-#: ../../Zotlabs/Module/Editblock.php:137
-#: ../../Zotlabs/Module/Editwebpage.php:182 ../../include/ItemObject.php:704
-#: ../../include/conversation.php:1225
-msgid "Bold"
-msgstr ""
-
-#: ../../Zotlabs/Module/Editblock.php:138
-#: ../../Zotlabs/Module/Editwebpage.php:183 ../../include/ItemObject.php:705
-#: ../../include/conversation.php:1226
-msgid "Italic"
-msgstr ""
-
-#: ../../Zotlabs/Module/Editblock.php:139
-#: ../../Zotlabs/Module/Editwebpage.php:184 ../../include/ItemObject.php:706
-#: ../../include/conversation.php:1227
-msgid "Underline"
-msgstr ""
-
-#: ../../Zotlabs/Module/Editblock.php:140
-#: ../../Zotlabs/Module/Editwebpage.php:185 ../../include/ItemObject.php:707
-#: ../../include/conversation.php:1228
-msgid "Quote"
-msgstr ""
-
-#: ../../Zotlabs/Module/Editblock.php:141
-#: ../../Zotlabs/Module/Editwebpage.php:186 ../../include/ItemObject.php:708
-#: ../../include/conversation.php:1229
-msgid "Code"
-msgstr ""
-
-#: ../../Zotlabs/Module/Editblock.php:143
-#: ../../Zotlabs/Module/Editwebpage.php:187 ../../Zotlabs/Module/Mail.php:252
-#: ../../Zotlabs/Module/Mail.php:382 ../../include/conversation.php:1230
-msgid "Attach file"
-msgstr ""
-
-#: ../../Zotlabs/Module/Editblock.php:147
-#: ../../Zotlabs/Module/Editwebpage.php:191
-#: ../../Zotlabs/Module/Events.php:470 ../../include/conversation.php:1242
-msgid "Permission settings"
-msgstr ""
-
-#: ../../Zotlabs/Module/Editblock.php:155
-#: ../../Zotlabs/Module/Editwebpage.php:200
-msgid "Public post"
-msgstr ""
-
-#: ../../Zotlabs/Module/Editblock.php:158
-#: ../../Zotlabs/Module/Editwebpage.php:205
-#: ../../include/conversation.php:1238
-msgid "Title (optional)"
-msgstr ""
-
-#: ../../Zotlabs/Module/Editblock.php:161
-#: ../../Zotlabs/Module/Editwebpage.php:207
-#: ../../include/conversation.php:1241
-msgid "Categories (optional, comma-separated list)"
-msgstr ""
-
-#: ../../Zotlabs/Module/Editblock.php:162
-#: ../../Zotlabs/Module/Editwebpage.php:208
-msgid "Example: bob@example.com, mary@example.com"
-msgstr ""
-
-#: ../../Zotlabs/Module/Editblock.php:167
-#: ../../Zotlabs/Module/Editwebpage.php:212
-#: ../../Zotlabs/Module/Events.php:469 ../../Zotlabs/Module/Photos.php:1092
-#: ../../Zotlabs/Module/Webpages.php:196 ../../include/ItemObject.php:712
-#: ../../include/conversation.php:1197 ../../include/page_widgets.php:40
-msgid "Preview"
-msgstr ""
-
-#: ../../Zotlabs/Module/Editblock.php:175
-msgid "Edit Block"
-msgstr ""
-
 #: ../../Zotlabs/Module/Editlayout.php:126
 #: ../../Zotlabs/Module/Layouts.php:127 ../../Zotlabs/Module/Layouts.php:186
 msgid "Layout Name"
@@ -2520,312 +1549,321 @@ msgstr ""
 msgid "Edit Layout"
 msgstr ""
 
-#: ../../Zotlabs/Module/Editpost.php:35
-msgid "Item is not editable"
+#: ../../Zotlabs/Module/Editwebpage.php:143
+msgid "Page link"
 msgstr ""
 
-#: ../../Zotlabs/Module/Editpost.php:105 ../../Zotlabs/Module/Rpost.php:134
-msgid "Edit post"
+#: ../../Zotlabs/Module/Editwebpage.php:169
+msgid "Edit Webpage"
 msgstr ""
 
-#: ../../Zotlabs/Module/Editwebpage.php:157
-msgid "Delete webpage?"
+#: ../../Zotlabs/Module/Follow.php:34
+msgid "Channel added."
 msgstr ""
 
-#: ../../Zotlabs/Module/Editwebpage.php:177
-msgid "Page link title"
+#: ../../Zotlabs/Module/Acl.php:227
+msgid "network"
 msgstr ""
 
-#: ../../Zotlabs/Module/Editwebpage.php:220
-msgid "Edit Webpage"
+#: ../../Zotlabs/Module/Acl.php:237
+msgid "RSS"
 msgstr ""
 
-#: ../../Zotlabs/Module/Events.php:25
-msgid "Calendar entries imported."
+#: ../../Zotlabs/Module/Group.php:24
+msgid "Privacy group created."
 msgstr ""
 
-#: ../../Zotlabs/Module/Events.php:27
-msgid "No calendar entries found."
+#: ../../Zotlabs/Module/Group.php:30
+msgid "Could not create privacy group."
 msgstr ""
 
-#: ../../Zotlabs/Module/Events.php:104
-msgid "Event can not end before it has started."
+#: ../../Zotlabs/Module/Group.php:42 ../../Zotlabs/Module/Group.php:141
+#: ../../include/items.php:3893
+msgid "Privacy group not found."
 msgstr ""
 
-#: ../../Zotlabs/Module/Events.php:106 ../../Zotlabs/Module/Events.php:115
-#: ../../Zotlabs/Module/Events.php:135
-msgid "Unable to generate preview."
+#: ../../Zotlabs/Module/Group.php:58
+msgid "Privacy group updated."
 msgstr ""
 
-#: ../../Zotlabs/Module/Events.php:113
-msgid "Event title and start time are required."
+#: ../../Zotlabs/Module/Group.php:90
+msgid "Create a group of channels."
 msgstr ""
 
-#: ../../Zotlabs/Module/Events.php:133 ../../Zotlabs/Module/Events.php:258
-msgid "Event not found."
+#: ../../Zotlabs/Module/Group.php:91 ../../Zotlabs/Module/Group.php:184
+msgid "Privacy group name: "
 msgstr ""
 
-#: ../../Zotlabs/Module/Events.php:253 ../../Zotlabs/Module/Like.php:373
-#: ../../Zotlabs/Module/Tagger.php:51 ../../include/event.php:915
-#: ../../include/text.php:1972 ../../include/conversation.php:123
-msgid "event"
+#: ../../Zotlabs/Module/Group.php:93 ../../Zotlabs/Module/Group.php:187
+msgid "Members are visible to other channels"
 msgstr ""
 
-#: ../../Zotlabs/Module/Events.php:448
-msgid "Edit event title"
+#: ../../Zotlabs/Module/Group.php:111
+msgid "Privacy group removed."
 msgstr ""
 
-#: ../../Zotlabs/Module/Events.php:448
-msgid "Event title"
+#: ../../Zotlabs/Module/Group.php:113
+msgid "Unable to remove privacy group."
 msgstr ""
 
-#: ../../Zotlabs/Module/Events.php:450
-msgid "Categories (comma-separated list)"
+#: ../../Zotlabs/Module/Group.php:183
+msgid "Privacy group editor"
 msgstr ""
 
-#: ../../Zotlabs/Module/Events.php:451
-msgid "Edit Category"
+#: ../../Zotlabs/Module/Group.php:197
+msgid "Members"
 msgstr ""
 
-#: ../../Zotlabs/Module/Events.php:451
-msgid "Category"
+#: ../../Zotlabs/Module/Group.php:199
+msgid "All Connected Channels"
 msgstr ""
 
-#: ../../Zotlabs/Module/Events.php:454
-msgid "Edit start date and time"
+#: ../../Zotlabs/Module/Group.php:231
+msgid "Click on a channel to add or remove."
 msgstr ""
 
-#: ../../Zotlabs/Module/Events.php:454
-msgid "Start date and time"
+#: ../../Zotlabs/Module/Ffsapi.php:12
+msgid "Share content from Firefox to $Projectname"
 msgstr ""
 
-#: ../../Zotlabs/Module/Events.php:455 ../../Zotlabs/Module/Events.php:458
-msgid "Finish date and time are not known or not relevant"
+#: ../../Zotlabs/Module/Ffsapi.php:15
+msgid "Activate the Firefox $Projectname provider"
 msgstr ""
 
-#: ../../Zotlabs/Module/Events.php:457
-msgid "Edit finish date and time"
+#: ../../Zotlabs/Module/Api.php:61 ../../Zotlabs/Module/Api.php:85
+msgid "Authorize application connection"
 msgstr ""
 
-#: ../../Zotlabs/Module/Events.php:457
-msgid "Finish date and time"
+#: ../../Zotlabs/Module/Api.php:62
+msgid "Return to your app and insert this Securty Code:"
 msgstr ""
 
-#: ../../Zotlabs/Module/Events.php:459 ../../Zotlabs/Module/Events.php:460
-msgid "Adjust for viewer timezone"
+#: ../../Zotlabs/Module/Api.php:72
+msgid "Please login to continue."
 msgstr ""
 
-#: ../../Zotlabs/Module/Events.php:459
+#: ../../Zotlabs/Module/Api.php:87
 msgid ""
-"Important for events that happen in a particular place. Not practical for "
-"global holidays."
+"Do you want to authorize this application to access your posts and contacts, "
+"and/or create new posts for you?"
 msgstr ""
 
-#: ../../Zotlabs/Module/Events.php:461
-msgid "Edit Description"
+#: ../../Zotlabs/Module/Help.php:26
+msgid "Documentation Search"
 msgstr ""
 
-#: ../../Zotlabs/Module/Events.php:463
-msgid "Edit Location"
+#: ../../Zotlabs/Module/Help.php:67 ../../Zotlabs/Module/Help.php:73
+#: ../../Zotlabs/Module/Help.php:79
+msgid "Help:"
 msgstr ""
 
-#: ../../Zotlabs/Module/Events.php:463 ../../Zotlabs/Module/Locs.php:117
-#: ../../Zotlabs/Module/Profiles.php:476 ../../Zotlabs/Module/Profiles.php:702
-#: ../../Zotlabs/Module/Pubsites.php:40 ../../include/js_strings.php:25
-msgid "Location"
+#: ../../Zotlabs/Module/Help.php:85 ../../Zotlabs/Module/Help.php:90
+#: ../../Zotlabs/Module/Layouts.php:183 ../../Zotlabs/Lib/Apps.php:223
+#: ../../include/nav.php:159
+msgid "Help"
 msgstr ""
 
-#: ../../Zotlabs/Module/Events.php:466 ../../Zotlabs/Module/Events.php:468
-msgid "Share this event"
+#: ../../Zotlabs/Module/Help.php:120
+msgid "$Projectname Documentation"
 msgstr ""
 
-#: ../../Zotlabs/Module/Events.php:473
-msgid "Advanced Options"
+#: ../../Zotlabs/Module/Filestorage.php:88
+msgid "Permission Denied."
 msgstr ""
 
-#: ../../Zotlabs/Module/Events.php:607
-msgid "Edit event"
+#: ../../Zotlabs/Module/Filestorage.php:104
+msgid "File not found."
 msgstr ""
 
-#: ../../Zotlabs/Module/Events.php:609
-msgid "Delete event"
+#: ../../Zotlabs/Module/Filestorage.php:147
+msgid "Edit file permissions"
 msgstr ""
 
-#: ../../Zotlabs/Module/Events.php:643
-msgid "calendar"
+#: ../../Zotlabs/Module/Filestorage.php:156
+msgid "Set/edit permissions"
 msgstr ""
 
-#: ../../Zotlabs/Module/Events.php:703
-msgid "Event removed"
+#: ../../Zotlabs/Module/Filestorage.php:157
+msgid "Include all files and sub folders"
 msgstr ""
 
-#: ../../Zotlabs/Module/Events.php:706
-msgid "Failed to remove event"
+#: ../../Zotlabs/Module/Filestorage.php:158
+msgid "Return to file list"
 msgstr ""
 
-#: ../../Zotlabs/Module/Fbrowser.php:29 ../../include/apps.php:171
-#: ../../include/conversation.php:1642 ../../include/nav.php:92
-msgid "Photos"
+#: ../../Zotlabs/Module/Filestorage.php:160
+msgid "Copy/paste this code to attach file to a post"
 msgstr ""
 
-#: ../../Zotlabs/Module/Fbrowser.php:66 ../../Zotlabs/Module/Fbrowser.php:88
-#: ../../Zotlabs/Module/Settings.php:589 ../../Zotlabs/Module/Settings.php:615
-#: ../../Zotlabs/Module/Tagrm.php:15 ../../Zotlabs/Module/Tagrm.php:138
-#: ../../include/conversation.php:1269
-msgid "Cancel"
+#: ../../Zotlabs/Module/Filestorage.php:161
+msgid "Copy/paste this URL to link file from a web page"
 msgstr ""
 
-#: ../../Zotlabs/Module/Ffsapi.php:12
-msgid "Share content from Firefox to $Projectname"
+#: ../../Zotlabs/Module/Filestorage.php:163
+msgid "Share this file"
 msgstr ""
 
-#: ../../Zotlabs/Module/Ffsapi.php:15
-msgid "Activate the Firefox $Projectname provider"
+#: ../../Zotlabs/Module/Filestorage.php:164
+msgid "Show URL to this file"
 msgstr ""
 
-#: ../../Zotlabs/Module/Filer.php:52
-msgid "Save to Folder:"
+#: ../../Zotlabs/Module/Filestorage.php:165
+msgid "Notify your contacts about this file"
 msgstr ""
 
-#: ../../Zotlabs/Module/Filer.php:52
-msgid "- select -"
+#: ../../Zotlabs/Module/Apps.php:47 ../../include/widgets.php:102
+#: ../../include/nav.php:163
+msgid "Apps"
 msgstr ""
 
-#: ../../Zotlabs/Module/Filestorage.php:86
-msgid "Permission Denied."
+#: ../../Zotlabs/Module/Attach.php:13
+msgid "Item not available."
 msgstr ""
 
-#: ../../Zotlabs/Module/Filestorage.php:102
-msgid "File not found."
+#: ../../Zotlabs/Module/Import.php:32
+#, php-format
+msgid "Your service plan only allows %d channels."
 msgstr ""
 
-#: ../../Zotlabs/Module/Filestorage.php:145
-msgid "Edit file permissions"
+#: ../../Zotlabs/Module/Import.php:70 ../../Zotlabs/Module/Import_items.php:42
+msgid "Nothing to import."
 msgstr ""
 
-#: ../../Zotlabs/Module/Filestorage.php:154
-msgid "Set/edit permissions"
+#: ../../Zotlabs/Module/Import.php:94 ../../Zotlabs/Module/Import_items.php:66
+msgid "Unable to download data from old server"
 msgstr ""
 
-#: ../../Zotlabs/Module/Filestorage.php:155
-msgid "Include all files and sub folders"
+#: ../../Zotlabs/Module/Import.php:100
+#: ../../Zotlabs/Module/Import_items.php:72
+msgid "Imported file is empty."
 msgstr ""
 
-#: ../../Zotlabs/Module/Filestorage.php:156
-msgid "Return to file list"
+#: ../../Zotlabs/Module/Import.php:122
+#: ../../Zotlabs/Module/Import_items.php:86
+#, php-format
+msgid "Warning: Database versions differ by %1$d updates."
 msgstr ""
 
-#: ../../Zotlabs/Module/Filestorage.php:158
-msgid "Copy/paste this code to attach file to a post"
+#: ../../Zotlabs/Module/Import.php:150 ../../include/import.php:86
+msgid "Cloned channel not found. Import failed."
 msgstr ""
 
-#: ../../Zotlabs/Module/Filestorage.php:159
-msgid "Copy/paste this URL to link file from a web page"
+#: ../../Zotlabs/Module/Import.php:160
+msgid "No channel. Import failed."
 msgstr ""
 
-#: ../../Zotlabs/Module/Filestorage.php:161
-msgid "Share this file"
+#: ../../Zotlabs/Module/Import.php:510
+#: ../../include/Import/import_diaspora.php:142
+msgid "Import completed."
 msgstr ""
 
-#: ../../Zotlabs/Module/Filestorage.php:162
-msgid "Show URL to this file"
+#: ../../Zotlabs/Module/Import.php:532
+msgid "You must be logged in to use this feature."
 msgstr ""
 
-#: ../../Zotlabs/Module/Filestorage.php:163
-msgid "Notify your contacts about this file"
+#: ../../Zotlabs/Module/Import.php:537
+msgid "Import Channel"
 msgstr ""
 
-#: ../../Zotlabs/Module/Follow.php:34
-msgid "Channel added."
+#: ../../Zotlabs/Module/Import.php:538
+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/Fsuggest.php:24 ../../Zotlabs/Module/Fsuggest.php:96
-msgid "Contact not found."
+#: ../../Zotlabs/Module/Import.php:539
+#: ../../Zotlabs/Module/Import_items.php:119
+msgid "File to Upload"
 msgstr ""
 
-#: ../../Zotlabs/Module/Fsuggest.php:67
-msgid "Friend suggestion sent."
+#: ../../Zotlabs/Module/Import.php:540
+msgid "Or provide the old server/hub details"
 msgstr ""
 
-#: ../../Zotlabs/Module/Fsuggest.php:101
-msgid "Suggest Friends"
+#: ../../Zotlabs/Module/Import.php:541
+msgid "Your old identity address (xyz@example.com)"
 msgstr ""
 
-#: ../../Zotlabs/Module/Fsuggest.php:103
-#, php-format
-msgid "Suggest a friend for %s"
+#: ../../Zotlabs/Module/Import.php:542
+msgid "Your old login email address"
 msgstr ""
 
-#: ../../Zotlabs/Module/Group.php:24
-msgid "Privacy group created."
+#: ../../Zotlabs/Module/Import.php:543
+msgid "Your old login password"
 msgstr ""
 
-#: ../../Zotlabs/Module/Group.php:30
-msgid "Could not create privacy group."
+#: ../../Zotlabs/Module/Import.php:544
+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/Group.php:42 ../../Zotlabs/Module/Group.php:141
-#: ../../include/items.php:5160
-msgid "Privacy group not found."
+#: ../../Zotlabs/Module/Import.php:545
+msgid "Make this hub my primary location"
 msgstr ""
 
-#: ../../Zotlabs/Module/Group.php:58
-msgid "Privacy group updated."
+#: ../../Zotlabs/Module/Import.php:546
+msgid ""
+"Import existing posts if possible (experimental - limited by available memory"
 msgstr ""
 
-#: ../../Zotlabs/Module/Group.php:90
-msgid "Create a group of channels."
+#: ../../Zotlabs/Module/Import.php:547
+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/Group.php:91 ../../Zotlabs/Module/Group.php:184
-msgid "Privacy group name: "
+#: ../../Zotlabs/Module/Item.php:178
+msgid "Unable to locate original post."
 msgstr ""
 
-#: ../../Zotlabs/Module/Group.php:93 ../../Zotlabs/Module/Group.php:187
-msgid "Members are visible to other channels"
+#: ../../Zotlabs/Module/Item.php:427
+msgid "Empty post discarded."
 msgstr ""
 
-#: ../../Zotlabs/Module/Group.php:111
-msgid "Privacy group removed."
+#: ../../Zotlabs/Module/Item.php:467
+msgid "Executable content type not permitted to this channel."
 msgstr ""
 
-#: ../../Zotlabs/Module/Group.php:113
-msgid "Unable to remove privacy group."
+#: ../../Zotlabs/Module/Item.php:847
+msgid "Duplicate post suppressed."
 msgstr ""
 
-#: ../../Zotlabs/Module/Group.php:183
-msgid "Privacy group editor"
+#: ../../Zotlabs/Module/Item.php:977
+msgid "System error. Post not saved."
 msgstr ""
 
-#: ../../Zotlabs/Module/Group.php:197
-msgid "Members"
+#: ../../Zotlabs/Module/Item.php:1241
+msgid "Unable to obtain post information from database."
 msgstr ""
 
-#: ../../Zotlabs/Module/Group.php:199
-msgid "All Connected Channels"
+#: ../../Zotlabs/Module/Item.php:1248
+#, php-format
+msgid "You have reached your limit of %1$.0f top level posts."
 msgstr ""
 
-#: ../../Zotlabs/Module/Group.php:231
-msgid "Click on a channel to add or remove."
+#: ../../Zotlabs/Module/Item.php:1255
+#, php-format
+msgid "You have reached your limit of %1$.0f webpages."
 msgstr ""
 
-#: ../../Zotlabs/Module/Help.php:26
-msgid "Documentation Search"
+#: ../../Zotlabs/Module/Layouts.php:181 ../../include/text.php:2267
+msgid "Layouts"
 msgstr ""
 
-#: ../../Zotlabs/Module/Help.php:67 ../../Zotlabs/Module/Help.php:73
-#: ../../Zotlabs/Module/Help.php:79
-msgid "Help:"
+#: ../../Zotlabs/Module/Layouts.php:183
+msgid "Comanche page description language help"
 msgstr ""
 
-#: ../../Zotlabs/Module/Help.php:85 ../../Zotlabs/Module/Help.php:90
-#: ../../Zotlabs/Module/Layouts.php:183 ../../include/apps.php:174
-#: ../../include/nav.php:159
-msgid "Help"
+#: ../../Zotlabs/Module/Layouts.php:187
+msgid "Layout Description"
 msgstr ""
 
-#: ../../Zotlabs/Module/Help.php:120
-msgid "$Projectname Documentation"
+#: ../../Zotlabs/Module/Layouts.php:192
+msgid "Download PDL file"
 msgstr ""
 
 #: ../../Zotlabs/Module/Home.php:61 ../../Zotlabs/Module/Home.php:69
@@ -2854,8 +1892,14 @@ msgstr ""
 msgid "Full Name"
 msgstr ""
 
+#: ../../Zotlabs/Module/Id.php:17 ../../Zotlabs/Module/Id.php:18
+#: ../../Zotlabs/Module/Admin.php:1035 ../../Zotlabs/Module/Admin.php:1047
+#: ../../include/network.php:2151 ../../boot.php:1705
+msgid "Email"
+msgstr ""
+
 #: ../../Zotlabs/Module/Id.php:19 ../../Zotlabs/Module/Id.php:20
-#: ../../Zotlabs/Module/Id.php:21 ../../include/apps.php:187
+#: ../../Zotlabs/Module/Id.php:21 ../../Zotlabs/Lib/Apps.php:236
 msgid "Profile Photo"
 msgstr ""
 
@@ -2887,11 +1931,11 @@ msgstr ""
 msgid "Timezone"
 msgstr ""
 
-#: ../../Zotlabs/Module/Id.php:29 ../../Zotlabs/Module/Profiles.php:735
+#: ../../Zotlabs/Module/Id.php:29 ../../Zotlabs/Module/Profiles.php:731
 msgid "Homepage URL"
 msgstr ""
 
-#: ../../Zotlabs/Module/Id.php:30 ../../include/apps.php:185
+#: ../../Zotlabs/Module/Id.php:30 ../../Zotlabs/Lib/Apps.php:234
 msgid "Language"
 msgstr ""
 
@@ -2911,33 +1955,33 @@ msgstr ""
 msgid "Birthdate"
 msgstr ""
 
-#: ../../Zotlabs/Module/Id.php:35 ../../Zotlabs/Module/Profiles.php:453
+#: ../../Zotlabs/Module/Id.php:35 ../../Zotlabs/Module/Profiles.php:454
 msgid "Gender"
 msgstr ""
 
-#: ../../Zotlabs/Module/Id.php:108 ../../include/profile_selectors.php:6
-#: ../../include/profile_selectors.php:23
+#: ../../Zotlabs/Module/Id.php:108 ../../include/selectors.php:49
+#: ../../include/selectors.php:66
 msgid "Male"
 msgstr ""
 
-#: ../../Zotlabs/Module/Id.php:110 ../../include/profile_selectors.php:6
-#: ../../include/profile_selectors.php:23
+#: ../../Zotlabs/Module/Id.php:110 ../../include/selectors.php:49
+#: ../../include/selectors.php:66
 msgid "Female"
 msgstr ""
 
-#: ../../Zotlabs/Module/Impel.php:41 ../../include/bbcode.php:193
+#: ../../Zotlabs/Module/Impel.php:41 ../../include/bbcode.php:192
 msgid "webpage"
 msgstr ""
 
-#: ../../Zotlabs/Module/Impel.php:46 ../../include/bbcode.php:199
+#: ../../Zotlabs/Module/Impel.php:46 ../../include/bbcode.php:198
 msgid "block"
 msgstr ""
 
-#: ../../Zotlabs/Module/Impel.php:51 ../../include/bbcode.php:196
+#: ../../Zotlabs/Module/Impel.php:51 ../../include/bbcode.php:195
 msgid "layout"
 msgstr ""
 
-#: ../../Zotlabs/Module/Impel.php:58 ../../include/bbcode.php:202
+#: ../../Zotlabs/Module/Impel.php:58 ../../include/bbcode.php:201
 msgid "menu"
 msgstr ""
 
@@ -2951,100 +1995,98 @@ msgstr ""
 msgid "%s element installation failed"
 msgstr ""
 
-#: ../../Zotlabs/Module/Import.php:32
-#, php-format
-msgid "Your service plan only allows %d channels."
+#: ../../Zotlabs/Module/Like.php:19
+msgid "Like/Dislike"
 msgstr ""
 
-#: ../../Zotlabs/Module/Import.php:70 ../../Zotlabs/Module/Import_items.php:42
-msgid "Nothing to import."
+#: ../../Zotlabs/Module/Like.php:24
+msgid "This action is restricted to members."
 msgstr ""
 
-#: ../../Zotlabs/Module/Import.php:94 ../../Zotlabs/Module/Import_items.php:66
-msgid "Unable to download data from old server"
+#: ../../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/Import.php:100
-#: ../../Zotlabs/Module/Import_items.php:72
-msgid "Imported file is empty."
+#: ../../Zotlabs/Module/Like.php:105 ../../Zotlabs/Module/Like.php:131
+#: ../../Zotlabs/Module/Like.php:169
+msgid "Invalid request."
 msgstr ""
 
-#: ../../Zotlabs/Module/Import.php:122
-#: ../../Zotlabs/Module/Import_items.php:86
-#, php-format
-msgid "Warning: Database versions differ by %1$d updates."
+#: ../../Zotlabs/Module/Like.php:117 ../../include/conversation.php:126
+msgid "channel"
 msgstr ""
 
-#: ../../Zotlabs/Module/Import.php:150 ../../include/import.php:80
-msgid "Cloned channel not found. Import failed."
+#: ../../Zotlabs/Module/Like.php:146
+msgid "thing"
 msgstr ""
 
-#: ../../Zotlabs/Module/Import.php:160
-msgid "No channel. Import failed."
+#: ../../Zotlabs/Module/Like.php:192
+msgid "Channel unavailable."
 msgstr ""
 
-#: ../../Zotlabs/Module/Import.php:506
-#: ../../include/Import/import_diaspora.php:143
-msgid "Import completed."
+#: ../../Zotlabs/Module/Like.php:240
+msgid "Previous action reversed."
 msgstr ""
 
-#: ../../Zotlabs/Module/Import.php:528
-msgid "You must be logged in to use this feature."
+#: ../../Zotlabs/Module/Like.php:371 ../../Zotlabs/Module/Subthread.php:87
+#: ../../Zotlabs/Module/Tagger.php:47 ../../include/text.php:1940
+#: ../../include/conversation.php:120
+msgid "photo"
 msgstr ""
 
-#: ../../Zotlabs/Module/Import.php:533
-msgid "Import Channel"
+#: ../../Zotlabs/Module/Like.php:371 ../../Zotlabs/Module/Subthread.php:87
+#: ../../include/text.php:1946 ../../include/conversation.php:148
+msgid "status"
 msgstr ""
 
-#: ../../Zotlabs/Module/Import.php:534
-msgid ""
-"Use this form to import an existing channel from a different server/hub. You "
-"may retrieve the channel identity from the old server/hub via the network or "
-"provide an export file."
+#: ../../Zotlabs/Module/Like.php:420 ../../include/conversation.php:164
+#, php-format
+msgid "%1$s likes %2$s's %3$s"
 msgstr ""
 
-#: ../../Zotlabs/Module/Import.php:535
-#: ../../Zotlabs/Module/Import_items.php:119
-msgid "File to Upload"
+#: ../../Zotlabs/Module/Like.php:422 ../../include/conversation.php:167
+#, php-format
+msgid "%1$s doesn't like %2$s's %3$s"
 msgstr ""
 
-#: ../../Zotlabs/Module/Import.php:536
-msgid "Or provide the old server/hub details"
+#: ../../Zotlabs/Module/Like.php:424
+#, php-format
+msgid "%1$s agrees with %2$s's %3$s"
 msgstr ""
 
-#: ../../Zotlabs/Module/Import.php:537
-msgid "Your old identity address (xyz@example.com)"
+#: ../../Zotlabs/Module/Like.php:426
+#, php-format
+msgid "%1$s doesn't agree with %2$s's %3$s"
 msgstr ""
 
-#: ../../Zotlabs/Module/Import.php:538
-msgid "Your old login email address"
+#: ../../Zotlabs/Module/Like.php:428
+#, php-format
+msgid "%1$s abstains from a decision on %2$s's %3$s"
 msgstr ""
 
-#: ../../Zotlabs/Module/Import.php:539
-msgid "Your old login password"
+#: ../../Zotlabs/Module/Like.php:430
+#, php-format
+msgid "%1$s is attending %2$s's %3$s"
 msgstr ""
 
-#: ../../Zotlabs/Module/Import.php:540
-msgid ""
-"For either option, please choose whether to make this hub your new primary "
-"address, or whether your old location should continue this role. You will be "
-"able to post from either location, but only one can be marked as the primary "
-"location for files, photos, and media."
+#: ../../Zotlabs/Module/Like.php:432
+#, php-format
+msgid "%1$s is not attending %2$s's %3$s"
 msgstr ""
 
-#: ../../Zotlabs/Module/Import.php:541
-msgid "Make this hub my primary location"
+#: ../../Zotlabs/Module/Like.php:434
+#, php-format
+msgid "%1$s may attend %2$s's %3$s"
 msgstr ""
 
-#: ../../Zotlabs/Module/Import.php:542
-msgid ""
-"Import existing posts if possible (experimental - limited by available memory"
+#: ../../Zotlabs/Module/Like.php:537
+msgid "Action completed."
 msgstr ""
 
-#: ../../Zotlabs/Module/Import.php:543
-msgid ""
-"This process may take several minutes to complete. Please submit the form "
-"only once and leave this page open until finished."
+#: ../../Zotlabs/Module/Like.php:538
+msgid "Thank you."
 msgstr ""
 
 #: ../../Zotlabs/Module/Import_items.php:102
@@ -3100,7 +2142,7 @@ msgstr ""
 msgid "Enter email addresses, one per line:"
 msgstr ""
 
-#: ../../Zotlabs/Module/Invite.php:135 ../../Zotlabs/Module/Mail.php:250
+#: ../../Zotlabs/Module/Invite.php:135 ../../Zotlabs/Module/Mail.php:249
 msgid "Your message:"
 msgstr ""
 
@@ -3128,150 +2170,6 @@ msgstr ""
 msgid "3. Click [Connect]"
 msgstr ""
 
-#: ../../Zotlabs/Module/Item.php:178
-msgid "Unable to locate original post."
-msgstr ""
-
-#: ../../Zotlabs/Module/Item.php:427
-msgid "Empty post discarded."
-msgstr ""
-
-#: ../../Zotlabs/Module/Item.php:467
-msgid "Executable content type not permitted to this channel."
-msgstr ""
-
-#: ../../Zotlabs/Module/Item.php:847
-msgid "Duplicate post suppressed."
-msgstr ""
-
-#: ../../Zotlabs/Module/Item.php:977
-msgid "System error. Post not saved."
-msgstr ""
-
-#: ../../Zotlabs/Module/Item.php:1241
-msgid "Unable to obtain post information from database."
-msgstr ""
-
-#: ../../Zotlabs/Module/Item.php:1248
-#, php-format
-msgid "You have reached your limit of %1$.0f top level posts."
-msgstr ""
-
-#: ../../Zotlabs/Module/Item.php:1255
-#, php-format
-msgid "You have reached your limit of %1$.0f webpages."
-msgstr ""
-
-#: ../../Zotlabs/Module/Layouts.php:181 ../../include/text.php:2282
-msgid "Layouts"
-msgstr ""
-
-#: ../../Zotlabs/Module/Layouts.php:183
-msgid "Comanche page description language help"
-msgstr ""
-
-#: ../../Zotlabs/Module/Layouts.php:187
-msgid "Layout Description"
-msgstr ""
-
-#: ../../Zotlabs/Module/Layouts.php:192
-msgid "Download PDL file"
-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:371 ../../Zotlabs/Module/Subthread.php:87
-#: ../../Zotlabs/Module/Tagger.php:47 ../../include/text.php:1969
-#: ../../include/conversation.php:120
-msgid "photo"
-msgstr ""
-
-#: ../../Zotlabs/Module/Like.php:371 ../../Zotlabs/Module/Subthread.php:87
-#: ../../include/text.php:1975 ../../include/conversation.php:148
-msgid "status"
-msgstr ""
-
-#: ../../Zotlabs/Module/Like.php:420 ../../include/conversation.php:164
-#, php-format
-msgid "%1$s likes %2$s's %3$s"
-msgstr ""
-
-#: ../../Zotlabs/Module/Like.php:422 ../../include/conversation.php:167
-#, php-format
-msgid "%1$s doesn't like %2$s's %3$s"
-msgstr ""
-
-#: ../../Zotlabs/Module/Like.php:424
-#, php-format
-msgid "%1$s agrees with %2$s's %3$s"
-msgstr ""
-
-#: ../../Zotlabs/Module/Like.php:426
-#, php-format
-msgid "%1$s doesn't agree with %2$s's %3$s"
-msgstr ""
-
-#: ../../Zotlabs/Module/Like.php:428
-#, php-format
-msgid "%1$s abstains from a decision on %2$s's %3$s"
-msgstr ""
-
-#: ../../Zotlabs/Module/Like.php:430
-#, php-format
-msgid "%1$s is attending %2$s's %3$s"
-msgstr ""
-
-#: ../../Zotlabs/Module/Like.php:432
-#, php-format
-msgid "%1$s is not attending %2$s's %3$s"
-msgstr ""
-
-#: ../../Zotlabs/Module/Like.php:434
-#, php-format
-msgid "%1$s may attend %2$s's %3$s"
-msgstr ""
-
-#: ../../Zotlabs/Module/Like.php:537
-msgid "Action completed."
-msgstr ""
-
-#: ../../Zotlabs/Module/Like.php:538
-msgid "Thank you."
-msgstr ""
-
 #: ../../Zotlabs/Module/Lockview.php:61
 msgid "Remote privacy information not available."
 msgstr ""
@@ -3306,6 +2204,11 @@ msgstr ""
 msgid "Manage Channel Locations"
 msgstr ""
 
+#: ../../Zotlabs/Module/Locs.php:118 ../../Zotlabs/Module/Profiles.php:470
+#: ../../Zotlabs/Module/Admin.php:1224
+msgid "Address"
+msgstr ""
+
 #: ../../Zotlabs/Module/Locs.php:119
 msgid "Primary"
 msgstr ""
@@ -3332,80 +2235,7 @@ msgstr ""
 msgid "Use this form to drop the location if the hub is no longer operating."
 msgstr ""
 
-#: ../../Zotlabs/Module/Lostpass.php:19
-msgid "No valid account found."
-msgstr ""
-
-#: ../../Zotlabs/Module/Lostpass.php:33
-msgid "Password reset request issued. Check your email."
-msgstr ""
-
-#: ../../Zotlabs/Module/Lostpass.php:39 ../../Zotlabs/Module/Lostpass.php:107
-#, php-format
-msgid "Site Member (%s)"
-msgstr ""
-
-#: ../../Zotlabs/Module/Lostpass.php:44
-#, php-format
-msgid "Password reset requested at %s"
-msgstr ""
-
-#: ../../Zotlabs/Module/Lostpass.php:67
-msgid ""
-"Request could not be verified. (You may have previously submitted it.) "
-"Password reset failed."
-msgstr ""
-
-#: ../../Zotlabs/Module/Lostpass.php:90 ../../boot.php:1623
-msgid "Password Reset"
-msgstr ""
-
-#: ../../Zotlabs/Module/Lostpass.php:91
-msgid "Your password has been reset as requested."
-msgstr ""
-
-#: ../../Zotlabs/Module/Lostpass.php:92
-msgid "Your new password is"
-msgstr ""
-
-#: ../../Zotlabs/Module/Lostpass.php:93
-msgid "Save or copy your new password - and then"
-msgstr ""
-
-#: ../../Zotlabs/Module/Lostpass.php:94
-msgid "click here to login"
-msgstr ""
-
-#: ../../Zotlabs/Module/Lostpass.php:95
-msgid ""
-"Your password may be changed from the <em>Settings</em> page after "
-"successful login."
-msgstr ""
-
-#: ../../Zotlabs/Module/Lostpass.php:112
-#, php-format
-msgid "Your password has changed at %s"
-msgstr ""
-
-#: ../../Zotlabs/Module/Lostpass.php:127
-msgid "Forgot your Password?"
-msgstr ""
-
-#: ../../Zotlabs/Module/Lostpass.php:128
-msgid ""
-"Enter your email address and submit to have your password reset. Then check "
-"your email for further instructions."
-msgstr ""
-
-#: ../../Zotlabs/Module/Lostpass.php:129
-msgid "Email Address"
-msgstr ""
-
-#: ../../Zotlabs/Module/Lostpass.php:130
-msgid "Reset"
-msgstr ""
-
-#: ../../Zotlabs/Module/Magic.php:73
+#: ../../Zotlabs/Module/Magic.php:71
 msgid "Hub not found."
 msgstr ""
 
@@ -3413,153 +2243,215 @@ msgstr ""
 msgid "Unable to lookup recipient."
 msgstr ""
 
-#: ../../Zotlabs/Module/Mail.php:46
+#: ../../Zotlabs/Module/Mail.php:45
 msgid "Unable to communicate with requested channel."
 msgstr ""
 
-#: ../../Zotlabs/Module/Mail.php:53
+#: ../../Zotlabs/Module/Mail.php:52
 msgid "Cannot verify requested channel."
 msgstr ""
 
-#: ../../Zotlabs/Module/Mail.php:79
+#: ../../Zotlabs/Module/Mail.php:78
 msgid "Selected channel has private message restrictions. Send failed."
 msgstr ""
 
-#: ../../Zotlabs/Module/Mail.php:144
+#: ../../Zotlabs/Module/Mail.php:143
 msgid "Messages"
 msgstr ""
 
-#: ../../Zotlabs/Module/Mail.php:179
+#: ../../Zotlabs/Module/Mail.php:178
 msgid "Message recalled."
 msgstr ""
 
-#: ../../Zotlabs/Module/Mail.php:192
+#: ../../Zotlabs/Module/Mail.php:191
 msgid "Conversation removed."
 msgstr ""
 
-#: ../../Zotlabs/Module/Mail.php:207 ../../Zotlabs/Module/Mail.php:321
+#: ../../Zotlabs/Module/Mail.php:206 ../../Zotlabs/Module/Mail.php:315
 msgid "Expires YYYY-MM-DD HH:MM"
 msgstr ""
 
-#: ../../Zotlabs/Module/Mail.php:235
+#: ../../Zotlabs/Module/Mail.php:234
 msgid "Requested channel is not in this network"
 msgstr ""
 
-#: ../../Zotlabs/Module/Mail.php:243
+#: ../../Zotlabs/Module/Mail.php:242
 msgid "Send Private Message"
 msgstr ""
 
-#: ../../Zotlabs/Module/Mail.php:244 ../../Zotlabs/Module/Mail.php:374
+#: ../../Zotlabs/Module/Mail.php:243 ../../Zotlabs/Module/Mail.php:368
 msgid "To:"
 msgstr ""
 
-#: ../../Zotlabs/Module/Mail.php:247 ../../Zotlabs/Module/Mail.php:376
+#: ../../Zotlabs/Module/Mail.php:246 ../../Zotlabs/Module/Mail.php:370
 msgid "Subject:"
 msgstr ""
 
-#: ../../Zotlabs/Module/Mail.php:254
+#: ../../Zotlabs/Module/Mail.php:251 ../../Zotlabs/Module/Mail.php:376
+#: ../../include/conversation.php:1220
+msgid "Attach file"
+msgstr ""
+
+#: ../../Zotlabs/Module/Mail.php:253
 msgid "Send"
 msgstr ""
 
-#: ../../Zotlabs/Module/Mail.php:257 ../../Zotlabs/Module/Mail.php:387
-#: ../../include/conversation.php:1261
+#: ../../Zotlabs/Module/Mail.php:256 ../../Zotlabs/Module/Mail.php:381
+#: ../../include/conversation.php:1251
 msgid "Set expiration date"
 msgstr ""
 
-#: ../../Zotlabs/Module/Mail.php:346
+#: ../../Zotlabs/Module/Mail.php:340
 msgid "Delete message"
 msgstr ""
 
-#: ../../Zotlabs/Module/Mail.php:347
+#: ../../Zotlabs/Module/Mail.php:341
 msgid "Delivery report"
 msgstr ""
 
-#: ../../Zotlabs/Module/Mail.php:348
+#: ../../Zotlabs/Module/Mail.php:342
 msgid "Recall message"
 msgstr ""
 
-#: ../../Zotlabs/Module/Mail.php:350
+#: ../../Zotlabs/Module/Mail.php:344
 msgid "Message has been recalled."
 msgstr ""
 
-#: ../../Zotlabs/Module/Mail.php:367
+#: ../../Zotlabs/Module/Mail.php:361
 msgid "Delete Conversation"
 msgstr ""
 
-#: ../../Zotlabs/Module/Mail.php:369
+#: ../../Zotlabs/Module/Mail.php:363
 msgid ""
 "No secure communications available. You <strong>may</strong> be able to "
 "respond from the sender's profile page."
 msgstr ""
 
-#: ../../Zotlabs/Module/Mail.php:373
+#: ../../Zotlabs/Module/Mail.php:367
 msgid "Send Reply"
 msgstr ""
 
-#: ../../Zotlabs/Module/Mail.php:378
+#: ../../Zotlabs/Module/Mail.php:372
 #, php-format
 msgid "Your message for %s (%s):"
 msgstr ""
 
-#: ../../Zotlabs/Module/Manage.php:134
+#: ../../Zotlabs/Module/Manage.php:136
 #: ../../Zotlabs/Module/New_channel.php:121
 #, php-format
 msgid "You have created %1$.0f of %2$.0f allowed channels."
 msgstr ""
 
-#: ../../Zotlabs/Module/Manage.php:141
+#: ../../Zotlabs/Module/Manage.php:143
 msgid "Create a new channel"
 msgstr ""
 
-#: ../../Zotlabs/Module/Manage.php:162 ../../include/apps.php:164
+#: ../../Zotlabs/Module/Manage.php:164 ../../Zotlabs/Lib/Apps.php:213
 #: ../../include/nav.php:206
 msgid "Channel Manager"
 msgstr ""
 
-#: ../../Zotlabs/Module/Manage.php:163
+#: ../../Zotlabs/Module/Manage.php:165
 msgid "Current Channel"
 msgstr ""
 
-#: ../../Zotlabs/Module/Manage.php:165
+#: ../../Zotlabs/Module/Manage.php:167
 msgid "Switch to one of your channels by selecting it."
 msgstr ""
 
-#: ../../Zotlabs/Module/Manage.php:166
+#: ../../Zotlabs/Module/Manage.php:168
 msgid "Default Channel"
 msgstr ""
 
-#: ../../Zotlabs/Module/Manage.php:167
+#: ../../Zotlabs/Module/Manage.php:169
 msgid "Make Default"
 msgstr ""
 
-#: ../../Zotlabs/Module/Manage.php:170
+#: ../../Zotlabs/Module/Manage.php:172
 #, php-format
 msgid "%d new messages"
 msgstr ""
 
-#: ../../Zotlabs/Module/Manage.php:171
+#: ../../Zotlabs/Module/Manage.php:173
 #, php-format
 msgid "%d new introductions"
 msgstr ""
 
-#: ../../Zotlabs/Module/Manage.php:173
+#: ../../Zotlabs/Module/Manage.php:175
 msgid "Delegated Channel"
 msgstr ""
 
-#: ../../Zotlabs/Module/Match.php:26
-msgid "Profile Match"
+#: ../../Zotlabs/Module/Lostpass.php:19
+msgid "No valid account found."
 msgstr ""
 
-#: ../../Zotlabs/Module/Match.php:35
-msgid "No keywords to match. Please add keywords to your default profile."
+#: ../../Zotlabs/Module/Lostpass.php:33
+msgid "Password reset request issued. Check your email."
 msgstr ""
 
-#: ../../Zotlabs/Module/Match.php:67
-msgid "is interested in:"
+#: ../../Zotlabs/Module/Lostpass.php:39 ../../Zotlabs/Module/Lostpass.php:107
+#, php-format
+msgid "Site Member (%s)"
 msgstr ""
 
-#: ../../Zotlabs/Module/Match.php:74
-msgid "No matches"
+#: ../../Zotlabs/Module/Lostpass.php:44
+#, php-format
+msgid "Password reset requested at %s"
+msgstr ""
+
+#: ../../Zotlabs/Module/Lostpass.php:67
+msgid ""
+"Request could not be verified. (You may have previously submitted it.) "
+"Password reset failed."
+msgstr ""
+
+#: ../../Zotlabs/Module/Lostpass.php:90 ../../boot.php:1711
+msgid "Password Reset"
+msgstr ""
+
+#: ../../Zotlabs/Module/Lostpass.php:91
+msgid "Your password has been reset as requested."
+msgstr ""
+
+#: ../../Zotlabs/Module/Lostpass.php:92
+msgid "Your new password is"
+msgstr ""
+
+#: ../../Zotlabs/Module/Lostpass.php:93
+msgid "Save or copy your new password - and then"
+msgstr ""
+
+#: ../../Zotlabs/Module/Lostpass.php:94
+msgid "click here to login"
+msgstr ""
+
+#: ../../Zotlabs/Module/Lostpass.php:95
+msgid ""
+"Your password may be changed from the <em>Settings</em> page after "
+"successful login."
+msgstr ""
+
+#: ../../Zotlabs/Module/Lostpass.php:112
+#, php-format
+msgid "Your password has changed at %s"
+msgstr ""
+
+#: ../../Zotlabs/Module/Lostpass.php:127
+msgid "Forgot your Password?"
+msgstr ""
+
+#: ../../Zotlabs/Module/Lostpass.php:128
+msgid ""
+"Enter your email address and submit to have your password reset. Then check "
+"your email for further instructions."
+msgstr ""
+
+#: ../../Zotlabs/Module/Lostpass.php:129
+msgid "Email Address"
+msgstr ""
+
+#: ../../Zotlabs/Module/Lostpass.php:130
+msgid "Reset"
 msgstr ""
 
 #: ../../Zotlabs/Module/Menu.php:49
@@ -3598,7 +2490,7 @@ msgstr ""
 msgid "Submit and proceed"
 msgstr ""
 
-#: ../../Zotlabs/Module/Menu.php:107 ../../include/text.php:2281
+#: ../../Zotlabs/Module/Menu.php:107 ../../include/text.php:2266
 msgid "Menus"
 msgstr ""
 
@@ -3659,6 +2551,74 @@ msgstr ""
 msgid "Not found."
 msgstr ""
 
+#: ../../Zotlabs/Module/Mood.php:67 ../../include/conversation.php:260
+#, php-format
+msgctxt "mood"
+msgid "%1$s is %2$s"
+msgstr ""
+
+#: ../../Zotlabs/Module/Mood.php:135 ../../Zotlabs/Lib/Apps.php:225
+msgid "Mood"
+msgstr ""
+
+#: ../../Zotlabs/Module/Mood.php:136
+msgid "Set your current mood and tell your friends"
+msgstr ""
+
+#: ../../Zotlabs/Module/Match.php:26
+msgid "Profile Match"
+msgstr ""
+
+#: ../../Zotlabs/Module/Match.php:35
+msgid "No keywords to match. Please add keywords to your default profile."
+msgstr ""
+
+#: ../../Zotlabs/Module/Match.php:67
+msgid "is interested in:"
+msgstr ""
+
+#: ../../Zotlabs/Module/Match.php:74
+msgid "No matches"
+msgstr ""
+
+#: ../../Zotlabs/Module/Network.php:96
+msgid "No such group"
+msgstr ""
+
+#: ../../Zotlabs/Module/Network.php:136
+msgid "No such channel"
+msgstr ""
+
+#: ../../Zotlabs/Module/Network.php:141
+msgid "forum"
+msgstr ""
+
+#: ../../Zotlabs/Module/Network.php:153
+msgid "Search Results For:"
+msgstr ""
+
+#: ../../Zotlabs/Module/Network.php:217
+msgid "Privacy group is empty"
+msgstr ""
+
+#: ../../Zotlabs/Module/Network.php:226
+msgid "Privacy group: "
+msgstr ""
+
+#: ../../Zotlabs/Module/Network.php:252
+msgid "Invalid connection."
+msgstr ""
+
+#: ../../Zotlabs/Module/Notify.php:57
+#: ../../Zotlabs/Module/Notifications.php:98
+msgid "No more system notifications."
+msgstr ""
+
+#: ../../Zotlabs/Module/Notify.php:61
+#: ../../Zotlabs/Module/Notifications.php:102
+msgid "System Notifications"
+msgstr ""
+
 #: ../../Zotlabs/Module/Mitem.php:52
 msgid "Unable to create element."
 msgstr ""
@@ -3676,7 +2636,7 @@ msgid "Menu Item Permissions"
 msgstr ""
 
 #: ../../Zotlabs/Module/Mitem.php:154 ../../Zotlabs/Module/Mitem.php:227
-#: ../../Zotlabs/Module/Settings.php:1066
+#: ../../Zotlabs/Module/Settings.php:1068
 msgid "(click to open/close)"
 msgstr ""
 
@@ -3776,48 +2736,6 @@ msgstr ""
 msgid "Link text"
 msgstr ""
 
-#: ../../Zotlabs/Module/Mood.php:67 ../../include/conversation.php:260
-#, php-format
-msgctxt "mood"
-msgid "%1$s is %2$s"
-msgstr ""
-
-#: ../../Zotlabs/Module/Mood.php:135 ../../include/apps.php:176
-msgid "Mood"
-msgstr ""
-
-#: ../../Zotlabs/Module/Mood.php:136
-msgid "Set your current mood and tell your friends"
-msgstr ""
-
-#: ../../Zotlabs/Module/Network.php:95
-msgid "No such group"
-msgstr ""
-
-#: ../../Zotlabs/Module/Network.php:135
-msgid "No such channel"
-msgstr ""
-
-#: ../../Zotlabs/Module/Network.php:140
-msgid "forum"
-msgstr ""
-
-#: ../../Zotlabs/Module/Network.php:152
-msgid "Search Results For:"
-msgstr ""
-
-#: ../../Zotlabs/Module/Network.php:216
-msgid "Privacy group is empty"
-msgstr ""
-
-#: ../../Zotlabs/Module/Network.php:225
-msgid "Privacy group: "
-msgstr ""
-
-#: ../../Zotlabs/Module/Network.php:251
-msgid "Invalid connection."
-msgstr ""
-
 #: ../../Zotlabs/Module/New_channel.php:128
 #: ../../Zotlabs/Module/Register.php:231
 msgid "Name or caption"
@@ -3882,390 +2800,378 @@ msgstr ""
 msgid "Discard"
 msgstr ""
 
-#: ../../Zotlabs/Module/Notifications.php:98
-#: ../../Zotlabs/Module/Notify.php:57
-msgid "No more system notifications."
-msgstr ""
-
-#: ../../Zotlabs/Module/Notifications.php:102
-#: ../../Zotlabs/Module/Notify.php:61
-msgid "System Notifications"
-msgstr ""
-
 #: ../../Zotlabs/Module/Notifications.php:103 ../../include/nav.php:191
 msgid "Mark all system notifications seen"
 msgstr ""
 
-#: ../../Zotlabs/Module/Oexchange.php:27
-msgid "Unable to find your hub."
-msgstr ""
-
-#: ../../Zotlabs/Module/Oexchange.php:41
-msgid "Post successful."
-msgstr ""
-
-#: ../../Zotlabs/Module/Openid.php:30
-msgid "OpenID protocol error. No ID returned."
-msgstr ""
-
-#: ../../Zotlabs/Module/Openid.php:193 ../../include/auth.php:226
-msgid "Login failed."
-msgstr ""
-
-#: ../../Zotlabs/Module/Page.php:133
-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/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/Pdledit.php:18
-msgid "Layout updated."
-msgstr ""
-
-#: ../../Zotlabs/Module/Pdledit.php:34 ../../Zotlabs/Module/Pdledit.php:61
-msgid "Edit System Page Description"
-msgstr ""
-
-#: ../../Zotlabs/Module/Pdledit.php:56
-msgid "Layout not found."
-msgstr ""
-
-#: ../../Zotlabs/Module/Pdledit.php:62
-msgid "Module Name:"
-msgstr ""
-
-#: ../../Zotlabs/Module/Pdledit.php:63
-msgid "Layout Help"
-msgstr ""
-
-#: ../../Zotlabs/Module/Photos.php:83
+#: ../../Zotlabs/Module/Photos.php:84
 msgid "Page owner information could not be retrieved."
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:98 ../../Zotlabs/Module/Photos.php:742
+#: ../../Zotlabs/Module/Photos.php:99 ../../Zotlabs/Module/Photos.php:743
 #: ../../Zotlabs/Module/Profile_photo.php:114
 #: ../../Zotlabs/Module/Profile_photo.php:206
 #: ../../Zotlabs/Module/Profile_photo.php:294
-#: ../../include/photo/photo_driver.php:722
+#: ../../include/photo/photo_driver.php:718
 msgid "Profile Photos"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:104 ../../Zotlabs/Module/Photos.php:148
+#: ../../Zotlabs/Module/Photos.php:105 ../../Zotlabs/Module/Photos.php:149
 msgid "Album not found."
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:131
+#: ../../Zotlabs/Module/Photos.php:132
 msgid "Delete Album"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:152
+#: ../../Zotlabs/Module/Photos.php:153
 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:209 ../../Zotlabs/Module/Photos.php:1052
+#: ../../Zotlabs/Module/Photos.php:210 ../../Zotlabs/Module/Photos.php:1053
 msgid "Delete Photo"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:532
+#: ../../Zotlabs/Module/Photos.php:533
 msgid "No photos selected"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:581
+#: ../../Zotlabs/Module/Photos.php:582
 msgid "Access to this item is restricted."
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:620
+#: ../../Zotlabs/Module/Photos.php:621
 #, php-format
 msgid "%1$.2f MB of %2$.2f MB photo storage used."
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:623
+#: ../../Zotlabs/Module/Photos.php:624
 #, php-format
 msgid "%1$.2f MB photo storage used."
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:659
+#: ../../Zotlabs/Module/Photos.php:660
 msgid "Upload Photos"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:663
+#: ../../Zotlabs/Module/Photos.php:664
 msgid "Enter an album name"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:664
+#: ../../Zotlabs/Module/Photos.php:665
 msgid "or select an existing album (doubleclick)"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:665
+#: ../../Zotlabs/Module/Photos.php:666
 msgid "Create a status post for this upload"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:666
+#: ../../Zotlabs/Module/Photos.php:667
 msgid "Caption (optional):"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:667
+#: ../../Zotlabs/Module/Photos.php:668
 msgid "Description (optional):"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:694
+#: ../../Zotlabs/Module/Photos.php:695
 msgid "Album name could not be decoded"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:742 ../../Zotlabs/Module/Photos.php:1283
-#: ../../Zotlabs/Module/Photos.php:1300
+#: ../../Zotlabs/Module/Photos.php:743
 msgid "Contact Photos"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:765
+#: ../../Zotlabs/Module/Photos.php:766
 msgid "Show Newest First"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:767
+#: ../../Zotlabs/Module/Photos.php:768
 msgid "Show Oldest First"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:791 ../../Zotlabs/Module/Photos.php:1333
-#: ../../include/widgets.php:1500
+#: ../../Zotlabs/Module/Photos.php:792 ../../Zotlabs/Module/Photos.php:1331
+#: ../../include/widgets.php:1499
 msgid "View Photo"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:822 ../../include/widgets.php:1517
+#: ../../Zotlabs/Module/Photos.php:823 ../../include/widgets.php:1516
 msgid "Edit Album"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:869
+#: ../../Zotlabs/Module/Photos.php:870
 msgid "Permission denied. Access to this item may be restricted."
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:871
+#: ../../Zotlabs/Module/Photos.php:872
 msgid "Photo not available"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:929
+#: ../../Zotlabs/Module/Photos.php:930
 msgid "Use as profile photo"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:930
+#: ../../Zotlabs/Module/Photos.php:931
 msgid "Use as cover photo"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:937
+#: ../../Zotlabs/Module/Photos.php:938
 msgid "Private Photo"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:952
+#: ../../Zotlabs/Module/Photos.php:953
 msgid "View Full Size"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:997 ../../Zotlabs/Module/Tagrm.php:137
+#: ../../Zotlabs/Module/Photos.php:998 ../../Zotlabs/Module/Admin.php:1437
+#: ../../Zotlabs/Module/Tagrm.php:137
 msgid "Remove"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:1031
+#: ../../Zotlabs/Module/Photos.php:1032
 msgid "Edit photo"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:1033
+#: ../../Zotlabs/Module/Photos.php:1034
 msgid "Rotate CW (right)"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:1034
+#: ../../Zotlabs/Module/Photos.php:1035
 msgid "Rotate CCW (left)"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:1037
+#: ../../Zotlabs/Module/Photos.php:1038
 msgid "Enter a new album name"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:1038
+#: ../../Zotlabs/Module/Photos.php:1039
 msgid "or select an existing one (doubleclick)"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:1041
+#: ../../Zotlabs/Module/Photos.php:1042
 msgid "Caption"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:1043
+#: ../../Zotlabs/Module/Photos.php:1044
 msgid "Add a Tag"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:1047
+#: ../../Zotlabs/Module/Photos.php:1048
 msgid "Example: @bob, @Barbara_Jensen, @jim@example.com"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:1050
+#: ../../Zotlabs/Module/Photos.php:1051
 msgid "Flag as adult in album view"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:1069 ../../include/ItemObject.php:254
+#: ../../Zotlabs/Module/Photos.php:1070 ../../Zotlabs/Lib/ThreadItem.php:261
 msgid "I like this (toggle)"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:1070 ../../include/ItemObject.php:255
+#: ../../Zotlabs/Module/Photos.php:1071 ../../Zotlabs/Lib/ThreadItem.php:262
 msgid "I don't like this (toggle)"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:1072 ../../include/ItemObject.php:389
+#: ../../Zotlabs/Module/Photos.php:1073 ../../Zotlabs/Lib/ThreadItem.php:397
 #: ../../include/conversation.php:740
 msgid "Please wait"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:1088 ../../Zotlabs/Module/Photos.php:1206
-#: ../../include/ItemObject.php:700
+#: ../../Zotlabs/Module/Photos.php:1089 ../../Zotlabs/Module/Photos.php:1207
+#: ../../Zotlabs/Lib/ThreadItem.php:707
 msgid "This is you"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:1090 ../../Zotlabs/Module/Photos.php:1208
-#: ../../include/ItemObject.php:702 ../../include/js_strings.php:6
+#: ../../Zotlabs/Module/Photos.php:1091 ../../Zotlabs/Module/Photos.php:1209
+#: ../../Zotlabs/Lib/ThreadItem.php:709 ../../include/js_strings.php:6
 msgid "Comment"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:1106 ../../include/conversation.php:574
+#: ../../Zotlabs/Module/Photos.php:1107 ../../include/conversation.php:574
 msgctxt "title"
 msgid "Likes"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:1106 ../../include/conversation.php:574
+#: ../../Zotlabs/Module/Photos.php:1107 ../../include/conversation.php:574
 msgctxt "title"
 msgid "Dislikes"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:1107 ../../include/conversation.php:575
+#: ../../Zotlabs/Module/Photos.php:1108 ../../include/conversation.php:575
 msgctxt "title"
 msgid "Agree"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:1107 ../../include/conversation.php:575
+#: ../../Zotlabs/Module/Photos.php:1108 ../../include/conversation.php:575
 msgctxt "title"
 msgid "Disagree"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:1107 ../../include/conversation.php:575
+#: ../../Zotlabs/Module/Photos.php:1108 ../../include/conversation.php:575
 msgctxt "title"
 msgid "Abstain"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:1108 ../../include/conversation.php:576
+#: ../../Zotlabs/Module/Photos.php:1109 ../../include/conversation.php:576
 msgctxt "title"
 msgid "Attending"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:1108 ../../include/conversation.php:576
+#: ../../Zotlabs/Module/Photos.php:1109 ../../include/conversation.php:576
 msgctxt "title"
 msgid "Not attending"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:1108 ../../include/conversation.php:576
+#: ../../Zotlabs/Module/Photos.php:1109 ../../include/conversation.php:576
 msgctxt "title"
 msgid "Might attend"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:1125 ../../Zotlabs/Module/Photos.php:1137
-#: ../../include/ItemObject.php:175 ../../include/ItemObject.php:187
-#: ../../include/conversation.php:1728
+#: ../../Zotlabs/Module/Photos.php:1126 ../../Zotlabs/Module/Photos.php:1138
+#: ../../Zotlabs/Lib/ThreadItem.php:181 ../../Zotlabs/Lib/ThreadItem.php:193
+#: ../../include/conversation.php:1717
 msgid "View all"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:1129 ../../include/identity.php:1304
-#: ../../include/ItemObject.php:179 ../../include/conversation.php:1752
-#: ../../include/taxonomy.php:403
+#: ../../Zotlabs/Module/Photos.php:1130 ../../Zotlabs/Lib/ThreadItem.php:185
+#: ../../include/taxonomy.php:403 ../../include/conversation.php:1741
+#: ../../include/channel.php:1158
 msgctxt "noun"
 msgid "Like"
 msgid_plural "Likes"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../../Zotlabs/Module/Photos.php:1134 ../../include/ItemObject.php:184
-#: ../../include/conversation.php:1755
+#: ../../Zotlabs/Module/Photos.php:1135 ../../Zotlabs/Lib/ThreadItem.php:190
+#: ../../include/conversation.php:1744
 msgctxt "noun"
 msgid "Dislike"
 msgid_plural "Dislikes"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../../Zotlabs/Module/Photos.php:1234
+#: ../../Zotlabs/Module/Photos.php:1235
 msgid "Photo Tools"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:1243
+#: ../../Zotlabs/Module/Photos.php:1244
 msgid "In This Photo:"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:1248
+#: ../../Zotlabs/Module/Photos.php:1249
 msgid "Map"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:1256 ../../include/ItemObject.php:378
+#: ../../Zotlabs/Module/Photos.php:1257 ../../Zotlabs/Lib/ThreadItem.php:386
 msgctxt "noun"
 msgid "Likes"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:1257 ../../include/ItemObject.php:379
+#: ../../Zotlabs/Module/Photos.php:1258 ../../Zotlabs/Lib/ThreadItem.php:387
 msgctxt "noun"
 msgid "Dislikes"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:1262 ../../include/acl_selectors.php:268
-#: ../../include/ItemObject.php:384
+#: ../../Zotlabs/Module/Photos.php:1263 ../../Zotlabs/Lib/ThreadItem.php:392
+#: ../../include/acl_selectors.php:285
 msgid "Close"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:1339
+#: ../../Zotlabs/Module/Photos.php:1337
 msgid "View Album"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:1350 ../../Zotlabs/Module/Photos.php:1363
-#: ../../Zotlabs/Module/Photos.php:1364
+#: ../../Zotlabs/Module/Photos.php:1348 ../../Zotlabs/Module/Photos.php:1361
+#: ../../Zotlabs/Module/Photos.php:1362
 msgid "Recent Photos"
 msgstr ""
 
-#: ../../Zotlabs/Module/Ping.php:264
+#: ../../Zotlabs/Module/Ping.php:265
 msgid "sent you a private message"
 msgstr ""
 
-#: ../../Zotlabs/Module/Ping.php:312
+#: ../../Zotlabs/Module/Ping.php:313
 msgid "added your channel"
 msgstr ""
 
-#: ../../Zotlabs/Module/Ping.php:322 ../../include/identity.php:1123
-#: ../../include/identity.php:1199
+#: ../../Zotlabs/Module/Ping.php:323
 msgid "g A l F d"
 msgstr ""
 
-#: ../../Zotlabs/Module/Ping.php:345 ../../include/identity.php:1169
-#: ../../include/identity.php:1239
+#: ../../Zotlabs/Module/Ping.php:346
 msgid "[today]"
 msgstr ""
 
-#: ../../Zotlabs/Module/Ping.php:354
+#: ../../Zotlabs/Module/Ping.php:355
 msgid "posted an event"
 msgstr ""
 
-#: ../../Zotlabs/Module/Poke.php:168 ../../include/apps.php:177
-#: ../../include/conversation.php:965
+#: ../../Zotlabs/Module/Oexchange.php:27
+msgid "Unable to find your hub."
+msgstr ""
+
+#: ../../Zotlabs/Module/Oexchange.php:41
+msgid "Post successful."
+msgstr ""
+
+#: ../../Zotlabs/Module/Openid.php:30
+msgid "OpenID protocol error. No ID returned."
+msgstr ""
+
+#: ../../Zotlabs/Module/Openid.php:193 ../../include/auth.php:226
+msgid "Login failed."
+msgstr ""
+
+#: ../../Zotlabs/Module/Page.php:133
+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/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/Pdledit.php:18
+msgid "Layout updated."
+msgstr ""
+
+#: ../../Zotlabs/Module/Pdledit.php:34 ../../Zotlabs/Module/Pdledit.php:61
+msgid "Edit System Page Description"
+msgstr ""
+
+#: ../../Zotlabs/Module/Pdledit.php:56
+msgid "Layout not found."
+msgstr ""
+
+#: ../../Zotlabs/Module/Pdledit.php:62
+msgid "Module Name:"
+msgstr ""
+
+#: ../../Zotlabs/Module/Pdledit.php:63
+msgid "Layout Help"
+msgstr ""
+
+#: ../../Zotlabs/Module/Poke.php:168 ../../Zotlabs/Lib/Apps.php:226
+#: ../../include/conversation.php:960
 msgid "Poke"
 msgstr ""
 
@@ -4293,289 +3199,289 @@ msgstr ""
 msgid "Make this post private"
 msgstr ""
 
-#: ../../Zotlabs/Module/Probe.php:28 ../../Zotlabs/Module/Probe.php:34
+#: ../../Zotlabs/Module/Probe.php:30 ../../Zotlabs/Module/Probe.php:34
 #, php-format
 msgid "Fetching URL returns error: %1$s"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profile_photo.php:179
-msgid ""
-"Shift-reload the page or clear browser cache if the new photo does not "
-"display immediately."
-msgstr ""
-
-#: ../../Zotlabs/Module/Profile_photo.php:367
-msgid "Upload Profile Photo"
-msgstr ""
-
-#: ../../Zotlabs/Module/Profiles.php:23 ../../Zotlabs/Module/Profiles.php:188
-#: ../../Zotlabs/Module/Profiles.php:245 ../../Zotlabs/Module/Profiles.php:624
+#: ../../Zotlabs/Module/Profiles.php:24 ../../Zotlabs/Module/Profiles.php:189
+#: ../../Zotlabs/Module/Profiles.php:246 ../../Zotlabs/Module/Profiles.php:625
 msgid "Profile not found."
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:43
+#: ../../Zotlabs/Module/Profiles.php:44
 msgid "Profile deleted."
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:67 ../../Zotlabs/Module/Profiles.php:103
+#: ../../Zotlabs/Module/Profiles.php:68 ../../Zotlabs/Module/Profiles.php:104
 msgid "Profile-"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:88 ../../Zotlabs/Module/Profiles.php:131
+#: ../../Zotlabs/Module/Profiles.php:89 ../../Zotlabs/Module/Profiles.php:132
 msgid "New profile created."
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:109
+#: ../../Zotlabs/Module/Profiles.php:110
 msgid "Profile unavailable to clone."
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:150
+#: ../../Zotlabs/Module/Profiles.php:151
 msgid "Profile unavailable to export."
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:255
+#: ../../Zotlabs/Module/Profiles.php:256
 msgid "Profile Name is required."
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:426
+#: ../../Zotlabs/Module/Profiles.php:427
 msgid "Marital Status"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:430
+#: ../../Zotlabs/Module/Profiles.php:431
 msgid "Romantic Partner"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:434 ../../Zotlabs/Module/Profiles.php:740
+#: ../../Zotlabs/Module/Profiles.php:435 ../../Zotlabs/Module/Profiles.php:736
 msgid "Likes"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:438 ../../Zotlabs/Module/Profiles.php:741
+#: ../../Zotlabs/Module/Profiles.php:439 ../../Zotlabs/Module/Profiles.php:737
 msgid "Dislikes"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:442 ../../Zotlabs/Module/Profiles.php:748
+#: ../../Zotlabs/Module/Profiles.php:443 ../../Zotlabs/Module/Profiles.php:744
 msgid "Work/Employment"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:445
+#: ../../Zotlabs/Module/Profiles.php:446
 msgid "Religion"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:449
+#: ../../Zotlabs/Module/Profiles.php:450
 msgid "Political Views"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:457
+#: ../../Zotlabs/Module/Profiles.php:458
 msgid "Sexual Preference"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:461
+#: ../../Zotlabs/Module/Profiles.php:462
 msgid "Homepage"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:465
+#: ../../Zotlabs/Module/Profiles.php:466
 msgid "Interests"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:559
+#: ../../Zotlabs/Module/Profiles.php:560
 msgid "Profile updated."
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:648
+#: ../../Zotlabs/Module/Profiles.php:644
 msgid "Hide your connections list from viewers of this profile"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:690
+#: ../../Zotlabs/Module/Profiles.php:686
 msgid "Edit Profile Details"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:692
+#: ../../Zotlabs/Module/Profiles.php:688
 msgid "View this profile"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:693 ../../Zotlabs/Module/Profiles.php:775
-#: ../../include/identity.php:959
+#: ../../Zotlabs/Module/Profiles.php:689 ../../Zotlabs/Module/Profiles.php:771
+#: ../../include/channel.php:959
 msgid "Edit visibility"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:694
+#: ../../Zotlabs/Module/Profiles.php:690
 msgid "Profile Tools"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:695
+#: ../../Zotlabs/Module/Profiles.php:691
 msgid "Change cover photo"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:696 ../../include/identity.php:930
+#: ../../Zotlabs/Module/Profiles.php:692 ../../include/channel.php:930
 msgid "Change profile photo"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:697
+#: ../../Zotlabs/Module/Profiles.php:693
 msgid "Create a new profile using these settings"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:698
+#: ../../Zotlabs/Module/Profiles.php:694
 msgid "Clone this profile"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:699
+#: ../../Zotlabs/Module/Profiles.php:695
 msgid "Delete this profile"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:700
+#: ../../Zotlabs/Module/Profiles.php:696
 msgid "Add profile things"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:701 ../../include/widgets.php:105
-#: ../../include/conversation.php:1536
+#: ../../Zotlabs/Module/Profiles.php:697 ../../include/widgets.php:105
+#: ../../include/conversation.php:1526
 msgid "Personal"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:703
+#: ../../Zotlabs/Module/Profiles.php:699
 msgid "Relation"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:704 ../../include/datetime.php:48
+#: ../../Zotlabs/Module/Profiles.php:700 ../../include/datetime.php:48
 msgid "Miscellaneous"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:706
+#: ../../Zotlabs/Module/Profiles.php:702
 msgid "Import profile from file"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:707
+#: ../../Zotlabs/Module/Profiles.php:703
 msgid "Export profile to file"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:708
+#: ../../Zotlabs/Module/Profiles.php:704
 msgid "Your gender"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:709
+#: ../../Zotlabs/Module/Profiles.php:705
 msgid "Marital status"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:710
+#: ../../Zotlabs/Module/Profiles.php:706
 msgid "Sexual preference"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:713
+#: ../../Zotlabs/Module/Profiles.php:709
 msgid "Profile name"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:715
+#: ../../Zotlabs/Module/Profiles.php:711
 msgid "This is your default profile."
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:717
+#: ../../Zotlabs/Module/Profiles.php:713
 msgid "Your full name"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:718
+#: ../../Zotlabs/Module/Profiles.php:714
 msgid "Title/Description"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:721
+#: ../../Zotlabs/Module/Profiles.php:717
 msgid "Street address"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:722
+#: ../../Zotlabs/Module/Profiles.php:718
 msgid "Locality/City"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:723
+#: ../../Zotlabs/Module/Profiles.php:719
 msgid "Region/State"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:724
+#: ../../Zotlabs/Module/Profiles.php:720
 msgid "Postal/Zip code"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:725
+#: ../../Zotlabs/Module/Profiles.php:721
 msgid "Country"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:730
+#: ../../Zotlabs/Module/Profiles.php:726
 msgid "Who (if applicable)"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:730
+#: ../../Zotlabs/Module/Profiles.php:726
 msgid "Examples: cathy123, Cathy Williams, cathy@example.com"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:731
+#: ../../Zotlabs/Module/Profiles.php:727
 msgid "Since (date)"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:734
+#: ../../Zotlabs/Module/Profiles.php:730
 msgid "Tell us about yourself"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:736
+#: ../../Zotlabs/Module/Profiles.php:732
 msgid "Hometown"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:737
+#: ../../Zotlabs/Module/Profiles.php:733
 msgid "Political views"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:738
+#: ../../Zotlabs/Module/Profiles.php:734
 msgid "Religious views"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:739
+#: ../../Zotlabs/Module/Profiles.php:735
 msgid "Keywords used in directory listings"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:739
+#: ../../Zotlabs/Module/Profiles.php:735
 msgid "Example: fishing photography software"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:742
+#: ../../Zotlabs/Module/Profiles.php:738
 msgid "Musical interests"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:743
+#: ../../Zotlabs/Module/Profiles.php:739
 msgid "Books, literature"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:744
+#: ../../Zotlabs/Module/Profiles.php:740
 msgid "Television"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:745
+#: ../../Zotlabs/Module/Profiles.php:741
 msgid "Film/Dance/Culture/Entertainment"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:746
+#: ../../Zotlabs/Module/Profiles.php:742
 msgid "Hobbies/Interests"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:747
+#: ../../Zotlabs/Module/Profiles.php:743
 msgid "Love/Romance"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:749
+#: ../../Zotlabs/Module/Profiles.php:745
 msgid "School/Education"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:750
+#: ../../Zotlabs/Module/Profiles.php:746
 msgid "Contact information and social networks"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:751
+#: ../../Zotlabs/Module/Profiles.php:747
 msgid "My other channels"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:771 ../../include/identity.php:955
+#: ../../Zotlabs/Module/Profiles.php:767 ../../include/channel.php:955
 msgid "Profile Image"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:781 ../../include/identity.php:937
-#: ../../include/nav.php:88
+#: ../../Zotlabs/Module/Profiles.php:777 ../../include/nav.php:88
+#: ../../include/channel.php:937
 msgid "Edit Profiles"
 msgstr ""
 
+#: ../../Zotlabs/Module/Profile_photo.php:179
+msgid ""
+"Shift-reload the page or clear browser cache if the new photo does not "
+"display immediately."
+msgstr ""
+
+#: ../../Zotlabs/Module/Profile_photo.php:367
+msgid "Upload Profile Photo"
+msgstr ""
+
 #: ../../Zotlabs/Module/Profperm.php:34 ../../Zotlabs/Module/Profperm.php:63
 msgid "Invalid profile identifier."
 msgstr ""
@@ -4584,7 +3490,7 @@ msgstr ""
 msgid "Profile Visibility Editor"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profperm.php:117 ../../include/identity.php:1395
+#: ../../Zotlabs/Module/Profperm.php:117 ../../include/channel.php:1249
 msgid "Profile"
 msgstr ""
 
@@ -4596,7 +3502,7 @@ msgstr ""
 msgid "Visible To"
 msgstr ""
 
-#: ../../Zotlabs/Module/Pubsites.php:22 ../../include/widgets.php:1271
+#: ../../Zotlabs/Module/Pubsites.php:22 ../../include/widgets.php:1270
 msgid "Public Hubs"
 msgstr ""
 
@@ -4621,29 +3527,37 @@ msgstr ""
 msgid "Registration Policy"
 msgstr ""
 
+#: ../../Zotlabs/Module/Pubsites.php:31
+msgid "Stats"
+msgstr ""
+
+#: ../../Zotlabs/Module/Pubsites.php:31
+msgid "Software"
+msgstr ""
+
 #: ../../Zotlabs/Module/Pubsites.php:31 ../../Zotlabs/Module/Ratings.php:103
-#: ../../include/conversation.php:964
+#: ../../include/conversation.php:959
 msgid "Ratings"
 msgstr ""
 
-#: ../../Zotlabs/Module/Pubsites.php:37
+#: ../../Zotlabs/Module/Pubsites.php:38
 msgid "Rate"
 msgstr ""
 
-#: ../../Zotlabs/Module/Rate.php:162
+#: ../../Zotlabs/Module/Rate.php:160
 msgid "Website:"
 msgstr ""
 
-#: ../../Zotlabs/Module/Rate.php:165
+#: ../../Zotlabs/Module/Rate.php:163
 #, php-format
 msgid "Remote Channel [%s] (not yet known on this site)"
 msgstr ""
 
-#: ../../Zotlabs/Module/Rate.php:166
+#: ../../Zotlabs/Module/Rate.php:164
 msgid "Rating (this information is public)"
 msgstr ""
 
-#: ../../Zotlabs/Module/Rate.php:167
+#: ../../Zotlabs/Module/Rate.php:165
 msgid "Optionally explain your rating (this information is public)"
 msgstr ""
 
@@ -4663,6 +3577,1071 @@ msgstr ""
 msgid "Description: "
 msgstr ""
 
+#: ../../Zotlabs/Module/Admin.php:77
+msgid "Theme settings updated."
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin.php:197
+msgid "# Accounts"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin.php:198
+msgid "# blocked accounts"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin.php:199
+msgid "# expired accounts"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin.php:200
+msgid "# expiring accounts"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin.php:211
+msgid "# Channels"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin.php:212
+msgid "# primary"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin.php:213
+msgid "# clones"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin.php:219
+msgid "Message queues"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin.php:236
+msgid "Your software should be updated"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin.php:241 ../../Zotlabs/Module/Admin.php:490
+#: ../../Zotlabs/Module/Admin.php:711 ../../Zotlabs/Module/Admin.php:755
+#: ../../Zotlabs/Module/Admin.php:1030 ../../Zotlabs/Module/Admin.php:1209
+#: ../../Zotlabs/Module/Admin.php:1329 ../../Zotlabs/Module/Admin.php:1419
+#: ../../Zotlabs/Module/Admin.php:1612 ../../Zotlabs/Module/Admin.php:1646
+#: ../../Zotlabs/Module/Admin.php:1731
+msgid "Administration"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin.php:242
+msgid "Summary"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin.php:245
+msgid "Registered accounts"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin.php:246 ../../Zotlabs/Module/Admin.php:715
+msgid "Pending registrations"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin.php:247
+msgid "Registered channels"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin.php:248 ../../Zotlabs/Module/Admin.php:716
+msgid "Active plugins"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin.php:249
+msgid "Version"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin.php:250
+msgid "Repository version (master)"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin.php:251
+msgid "Repository version (dev)"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin.php:373
+msgid "Site settings updated."
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin.php:400 ../../include/text.php:2841
+msgid "Default"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin.php:410 ../../Zotlabs/Module/Settings.php:798
+msgid "mobile"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin.php:412
+msgid "experimental"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin.php:414
+msgid "unsupported"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin.php:460
+msgid "Yes - with approval"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin.php:466
+msgid "My site is not a public server"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin.php:467
+msgid "My site has paid access only"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin.php:468
+msgid "My site has free access only"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin.php:469
+msgid "My site offers free accounts with optional paid upgrades"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin.php:491 ../../include/widgets.php:1382
+msgid "Site"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin.php:493 ../../Zotlabs/Module/Register.php:245
+msgid "Registration"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin.php:494
+msgid "File upload"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin.php:495
+msgid "Policies"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin.php:496 ../../include/contact_widgets.php:16
+msgid "Advanced"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin.php:500
+msgid "Site name"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin.php:501
+msgid "Banner/Logo"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin.php:502
+msgid "Administrator Information"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin.php:502
+msgid ""
+"Contact information for site administrators.  Displayed on siteinfo page.  "
+"BBCode can be used here"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin.php:503
+msgid "System language"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin.php:504
+msgid "System theme"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin.php:504
+msgid ""
+"Default system theme - may be over-ridden by user profiles - <a href='#' "
+"id='cnftheme'>change theme settings</a>"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin.php:505
+msgid "Mobile system theme"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin.php:505
+msgid "Theme for mobile devices"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin.php:507
+msgid "Allow Feeds as Connections"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin.php:507
+msgid "(Heavy system resource usage)"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin.php:508
+msgid "Maximum image size"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin.php:508
+msgid ""
+"Maximum size in bytes of uploaded images. Default is 0, which means no "
+"limits."
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin.php:509
+msgid "Does this site allow new member registration?"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin.php:510
+msgid "Invitation only"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin.php:510
+msgid ""
+"Only allow new member registrations with an invitation code. Above register "
+"policy must be set to Yes."
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin.php:511
+msgid "Which best describes the types of account offered by this hub?"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin.php:512
+msgid "Register text"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin.php:512
+msgid "Will be displayed prominently on the registration page."
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin.php:513
+msgid "Site homepage to show visitors (default: login box)"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin.php:513
+msgid ""
+"example: 'public' to show public stream, 'page/sys/home' to show a system "
+"webpage called 'home' or 'include:home.html' to include a file."
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin.php:514
+msgid "Preserve site homepage URL"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin.php:514
+msgid ""
+"Present the site homepage in a frame at the original location instead of "
+"redirecting"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin.php:515
+msgid "Accounts abandoned after x days"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin.php:515
+msgid ""
+"Will not waste system resources polling external sites for abandonded "
+"accounts. Enter 0 for no time limit."
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin.php:516
+msgid "Allowed friend domains"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin.php:516
+msgid ""
+"Comma separated list of domains which are allowed to establish friendships "
+"with this site. Wildcards are accepted. Empty to allow any domains"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin.php:517
+msgid "Allowed email domains"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin.php:517
+msgid ""
+"Comma separated list of domains which are allowed in email addresses for "
+"registrations to this site. Wildcards are accepted. Empty to allow any "
+"domains"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin.php:518
+msgid "Not allowed email domains"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin.php:518
+msgid ""
+"Comma separated list of domains which are not allowed in email addresses for "
+"registrations to this site. Wildcards are accepted. Empty to allow any "
+"domains, unless allowed domains have been defined."
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin.php:519
+msgid "Verify Email Addresses"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin.php:519
+msgid ""
+"Check to verify email addresses used in account registration (recommended)."
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin.php:520
+msgid "Force publish"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin.php:520
+msgid ""
+"Check to force all profiles on this site to be listed in the site directory."
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin.php:521
+msgid "Import Public Streams"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin.php:521
+msgid ""
+"Import and allow access to public content pulled from other sites. Warning: "
+"this content is unmoderated."
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin.php:522
+msgid "Login on Homepage"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin.php:522
+msgid ""
+"Present a login box to visitors on the home page if no other content has "
+"been configured."
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin.php:523
+msgid "Enable context help"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin.php:523
+msgid ""
+"Display contextual help for the current page when the help button is pressed."
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin.php:525
+msgid "Directory Server URL"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin.php:525
+msgid "Default directory server"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin.php:527
+msgid "Proxy user"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin.php:528
+msgid "Proxy URL"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin.php:529
+msgid "Network timeout"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin.php:529
+msgid "Value is in seconds. Set to 0 for unlimited (not recommended)."
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin.php:530
+msgid "Delivery interval"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin.php:530
+msgid ""
+"Delay background delivery processes by this many seconds to reduce system "
+"load. Recommend: 4-5 for shared hosts, 2-3 for virtual private servers. 0-1 "
+"for large dedicated servers."
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin.php:531
+msgid "Deliveries per process"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin.php:531
+msgid ""
+"Number of deliveries to attempt in a single operating system process. Adjust "
+"if necessary to tune system performance. Recommend: 1-5."
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin.php:532
+msgid "Poll interval"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin.php:532
+msgid ""
+"Delay background polling processes by this many seconds to reduce system "
+"load. If 0, use delivery interval."
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin.php:533
+msgid "Maximum Load Average"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin.php:533
+msgid ""
+"Maximum system load before delivery and poll processes are deferred - "
+"default 50."
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin.php:534
+msgid "Expiration period in days for imported (grid/network) content"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin.php:534
+msgid "0 for no expiration of imported content"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin.php:677 ../../Zotlabs/Module/Admin.php:678
+#: ../../Zotlabs/Module/Settings.php:722
+msgid "Off"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin.php:677 ../../Zotlabs/Module/Admin.php:678
+#: ../../Zotlabs/Module/Settings.php:722
+msgid "On"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin.php:678
+#, php-format
+msgid "Lock feature %s"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin.php:686
+msgid "Manage Additional Features"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin.php:703
+msgid "No server found"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin.php:710 ../../Zotlabs/Module/Admin.php:1046
+msgid "ID"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin.php:710
+msgid "for channel"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin.php:710
+msgid "on server"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin.php:712
+msgid "Server"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin.php:746
+msgid ""
+"By default, unfiltered HTML is allowed in embedded media. This is inherently "
+"insecure."
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin.php:749
+msgid ""
+"The recommended setting is to only allow unfiltered HTML from the following "
+"sites:"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin.php:750
+msgid ""
+"https://youtube.com/<br />https://www.youtube.com/<br />https://youtu.be/"
+"<br />https://vimeo.com/<br />https://soundcloud.com/<br />"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin.php:751
+msgid ""
+"All other embedded content will be filtered, <strong>unless</strong> "
+"embedded content from that site is explicitly blocked."
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin.php:756 ../../include/widgets.php:1385
+msgid "Security"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin.php:758
+msgid "Block public"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin.php:758
+msgid ""
+"Check to block public access to all otherwise public personal pages on this "
+"site unless you are currently authenticated."
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin.php:759
+msgid "Set \"Transport Security\" HTTP header"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin.php:760
+msgid "Set \"Content Security Policy\" HTTP header"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin.php:761
+msgid "Allow communications only from these sites"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin.php:761
+msgid ""
+"One site per line. Leave empty to allow communication from anywhere by "
+"default"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin.php:762
+msgid "Block communications from these sites"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin.php:763
+msgid "Allow communications only from these channels"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin.php:763
+msgid ""
+"One channel (hash) per line. Leave empty to allow from any channel by default"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin.php:764
+msgid "Block communications from these channels"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin.php:765
+msgid "Only allow embeds from secure (SSL) websites and links."
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin.php:766
+msgid "Allow unfiltered embedded HTML content only from these domains"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin.php:766
+msgid "One site per line. By default embedded content is filtered."
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin.php:767
+msgid "Block embedded HTML from these domains"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin.php:785
+msgid "Update has been marked successful"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin.php:795
+#, php-format
+msgid "Executing %s failed. Check system logs."
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin.php:798
+#, php-format
+msgid "Update %s was successfully applied."
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin.php:802
+#, php-format
+msgid "Update %s did not return a status. Unknown if it succeeded."
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin.php:805
+#, php-format
+msgid "Update function %s could not be found."
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin.php:821
+msgid "No failed updates."
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin.php:825
+msgid "Failed Updates"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin.php:827
+msgid "Mark success (if update was manually applied)"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin.php:828
+msgid "Attempt to execute this update step automatically"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin.php:859
+msgid "Queue Statistics"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin.php:860
+msgid "Total Entries"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin.php:861
+msgid "Priority"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin.php:862
+msgid "Destination URL"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin.php:863
+msgid "Mark hub permanently offline"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin.php:864
+msgid "Empty queue for this hub"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin.php:865
+msgid "Last known contact"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin.php:901
+#, php-format
+msgid "%s account blocked/unblocked"
+msgid_plural "%s account blocked/unblocked"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../../Zotlabs/Module/Admin.php:908
+#, php-format
+msgid "%s account deleted"
+msgid_plural "%s accounts deleted"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../../Zotlabs/Module/Admin.php:944
+msgid "Account not found"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin.php:955
+#, php-format
+msgid "Account '%s' deleted"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin.php:963
+#, php-format
+msgid "Account '%s' blocked"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin.php:971
+#, php-format
+msgid "Account '%s' unblocked"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin.php:1031 ../../Zotlabs/Module/Admin.php:1044
+#: ../../include/widgets.php:1383
+msgid "Accounts"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin.php:1033 ../../Zotlabs/Module/Admin.php:1212
+msgid "select all"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin.php:1034
+msgid "Registrations waiting for confirm"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin.php:1035
+msgid "Request date"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin.php:1036
+msgid "No registrations."
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin.php:1038
+msgid "Deny"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin.php:1048 ../../include/group.php:267
+msgid "All Channels"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin.php:1049
+msgid "Register date"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin.php:1050
+msgid "Last login"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin.php:1051
+msgid "Expires"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin.php:1052
+msgid "Service Class"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin.php:1054
+msgid ""
+"Selected accounts will be deleted!\\n\\nEverything these accounts had posted "
+"on this site will be permanently deleted!\\n\\nAre you sure?"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin.php:1055
+msgid ""
+"The account {0} will be deleted!\\n\\nEverything this account has posted on "
+"this site will be permanently deleted!\\n\\nAre you sure?"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin.php:1091
+#, php-format
+msgid "%s channel censored/uncensored"
+msgid_plural "%s channels censored/uncensored"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../../Zotlabs/Module/Admin.php:1100
+#, php-format
+msgid "%s channel code allowed/disallowed"
+msgid_plural "%s channels code allowed/disallowed"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../../Zotlabs/Module/Admin.php:1106
+#, php-format
+msgid "%s channel deleted"
+msgid_plural "%s channels deleted"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../../Zotlabs/Module/Admin.php:1126
+msgid "Channel not found"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin.php:1136
+#, php-format
+msgid "Channel '%s' deleted"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin.php:1148
+#, php-format
+msgid "Channel '%s' censored"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin.php:1148
+#, php-format
+msgid "Channel '%s' uncensored"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin.php:1159
+#, php-format
+msgid "Channel '%s' code allowed"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin.php:1159
+#, php-format
+msgid "Channel '%s' code disallowed"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin.php:1210 ../../include/widgets.php:1384
+msgid "Channels"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin.php:1214
+msgid "Censor"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin.php:1215
+msgid "Uncensor"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin.php:1216
+msgid "Allow Code"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin.php:1217
+msgid "Disallow Code"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin.php:1218 ../../include/conversation.php:1611
+msgid "Channel"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin.php:1222
+msgid "UID"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin.php:1226
+msgid ""
+"Selected channels will be deleted!\\n\\nEverything that was posted in these "
+"channels on this site will be permanently deleted!\\n\\nAre you sure?"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin.php:1227
+msgid ""
+"The channel {0} will be deleted!\\n\\nEverything that was posted in this "
+"channel on this site will be permanently deleted!\\n\\nAre you sure?"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin.php:1284
+#, php-format
+msgid "Plugin %s disabled."
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin.php:1288
+#, php-format
+msgid "Plugin %s enabled."
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin.php:1298 ../../Zotlabs/Module/Admin.php:1585
+msgid "Disable"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin.php:1301 ../../Zotlabs/Module/Admin.php:1587
+msgid "Enable"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin.php:1330 ../../Zotlabs/Module/Admin.php:1420
+#: ../../include/widgets.php:1387
+msgid "Plugins"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin.php:1331 ../../Zotlabs/Module/Admin.php:1614
+msgid "Toggle"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin.php:1332 ../../Zotlabs/Module/Admin.php:1615
+#: ../../Zotlabs/Lib/Apps.php:215 ../../include/widgets.php:638
+#: ../../include/nav.php:208
+msgid "Settings"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin.php:1339 ../../Zotlabs/Module/Admin.php:1624
+msgid "Author: "
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin.php:1340 ../../Zotlabs/Module/Admin.php:1625
+msgid "Maintainer: "
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin.php:1341
+msgid "Minimum project version: "
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin.php:1342
+msgid "Maximum project version: "
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin.php:1343
+msgid "Minimum PHP version: "
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin.php:1344
+msgid "Requires: "
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin.php:1345 ../../Zotlabs/Module/Admin.php:1425
+msgid "Disabled - version incompatibility"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin.php:1394
+msgid "Enter the public git repository URL of the plugin repo."
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin.php:1395
+msgid "Plugin repo git URL"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin.php:1396
+msgid "Custom repo name"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin.php:1396
+msgid "(optional)"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin.php:1397
+msgid "Download Plugin Repo"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin.php:1404
+msgid "Install new repo"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin.php:1405 ../../Zotlabs/Lib/Apps.php:330
+msgid "Install"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin.php:1427
+msgid "Manage Repos"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin.php:1428
+msgid "Installed Plugin Repositories"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin.php:1429
+msgid "Install a New Plugin Repository"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin.php:1435 ../../Zotlabs/Module/Settings.php:77
+#: ../../Zotlabs/Module/Settings.php:616 ../../Zotlabs/Lib/Apps.php:330
+msgid "Update"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin.php:1436
+msgid "Switch branch"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin.php:1550
+msgid "No themes found."
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin.php:1606
+msgid "Screenshot"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin.php:1613 ../../Zotlabs/Module/Admin.php:1647
+#: ../../include/widgets.php:1388
+msgid "Themes"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin.php:1652
+msgid "[Experimental]"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin.php:1653
+msgid "[Unsupported]"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin.php:1677
+msgid "Log settings updated."
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin.php:1732 ../../include/widgets.php:1409
+#: ../../include/widgets.php:1419
+msgid "Logs"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin.php:1734
+msgid "Clear"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin.php:1740
+msgid "Debugging"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin.php:1741
+msgid "Log file"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin.php:1741
+msgid ""
+"Must be writable by web server. Relative to your top-level webserver "
+"directory."
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin.php:1742
+msgid "Log level"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin.php:2028
+msgid "New Profile Field"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin.php:2029 ../../Zotlabs/Module/Admin.php:2049
+msgid "Field nickname"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin.php:2029 ../../Zotlabs/Module/Admin.php:2049
+msgid "System name of field"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin.php:2030 ../../Zotlabs/Module/Admin.php:2050
+msgid "Input type"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin.php:2031 ../../Zotlabs/Module/Admin.php:2051
+msgid "Field Name"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin.php:2031 ../../Zotlabs/Module/Admin.php:2051
+msgid "Label on profile pages"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin.php:2032 ../../Zotlabs/Module/Admin.php:2052
+msgid "Help text"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin.php:2032 ../../Zotlabs/Module/Admin.php:2052
+msgid "Additional info (optional)"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin.php:2042
+msgid "Field definition not found"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin.php:2048
+msgid "Edit Profile Field"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin.php:2106 ../../include/widgets.php:1390
+msgid "Profile Fields"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin.php:2107
+msgid "Basic Profile Fields"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin.php:2108
+msgid "Advanced Profile Fields"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin.php:2108
+msgid "(In addition to basic fields)"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin.php:2110
+msgid "All available fields"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin.php:2111
+msgid "Custom Fields"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin.php:2115
+msgid "Create Custom Field"
+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:104
+msgid "Embed code"
+msgstr ""
+
+#: ../../Zotlabs/Module/Appman.php:110 ../../include/widgets.php:107
+msgid "Edit App"
+msgstr ""
+
+#: ../../Zotlabs/Module/Appman.php:110
+msgid "Create App"
+msgstr ""
+
+#: ../../Zotlabs/Module/Appman.php:115
+msgid "Name of app"
+msgstr ""
+
+#: ../../Zotlabs/Module/Appman.php:116
+msgid "Location (URL) of app"
+msgstr ""
+
+#: ../../Zotlabs/Module/Appman.php:118
+msgid "Photo icon URL"
+msgstr ""
+
+#: ../../Zotlabs/Module/Appman.php:118
+msgid "80 x 80 pixels - optional"
+msgstr ""
+
+#: ../../Zotlabs/Module/Appman.php:119
+msgid "Categories (optional, comma separated list)"
+msgstr ""
+
+#: ../../Zotlabs/Module/Appman.php:120
+msgid "Version ID"
+msgstr ""
+
+#: ../../Zotlabs/Module/Appman.php:121
+msgid "Price of app"
+msgstr ""
+
+#: ../../Zotlabs/Module/Appman.php:122
+msgid "Location (URL) to purchase app"
+msgstr ""
+
 #: ../../Zotlabs/Module/Rbmark.php:94
 msgid "Select a bookmark folder"
 msgstr ""
@@ -4766,7 +4745,7 @@ msgid "Membership on this site is by invitation only."
 msgstr ""
 
 #: ../../Zotlabs/Module/Register.php:262 ../../include/nav.php:147
-#: ../../boot.php:1597
+#: ../../boot.php:1685
 msgid "Register"
 msgstr ""
 
@@ -4784,45 +4763,45 @@ msgid ""
 "password."
 msgstr ""
 
-#: ../../Zotlabs/Module/Removeaccount.php:61
+#: ../../Zotlabs/Module/Removeaccount.php:56
 msgid "Remove This Account"
 msgstr ""
 
-#: ../../Zotlabs/Module/Removeaccount.php:62
-#: ../../Zotlabs/Module/Removeme.php:62
+#: ../../Zotlabs/Module/Removeaccount.php:57
+#: ../../Zotlabs/Module/Removeme.php:59
 msgid "WARNING: "
 msgstr ""
 
-#: ../../Zotlabs/Module/Removeaccount.php:62
+#: ../../Zotlabs/Module/Removeaccount.php:57
 msgid ""
 "This account and all its channels will be completely removed from the "
 "network. "
 msgstr ""
 
-#: ../../Zotlabs/Module/Removeaccount.php:62
-#: ../../Zotlabs/Module/Removeme.php:62
+#: ../../Zotlabs/Module/Removeaccount.php:57
+#: ../../Zotlabs/Module/Removeme.php:59
 msgid "This action is permanent and can not be undone!"
 msgstr ""
 
-#: ../../Zotlabs/Module/Removeaccount.php:63
-#: ../../Zotlabs/Module/Removeme.php:63
+#: ../../Zotlabs/Module/Removeaccount.php:58
+#: ../../Zotlabs/Module/Removeme.php:60
 msgid "Please enter your password for verification:"
 msgstr ""
 
-#: ../../Zotlabs/Module/Removeaccount.php:64
+#: ../../Zotlabs/Module/Removeaccount.php:59
 msgid ""
 "Remove this account, all its channels and all its channel clones from the "
 "network"
 msgstr ""
 
-#: ../../Zotlabs/Module/Removeaccount.php:64
+#: ../../Zotlabs/Module/Removeaccount.php:59
 msgid ""
 "By default only the instances of the channels located on this hub will be "
 "removed from the network"
 msgstr ""
 
-#: ../../Zotlabs/Module/Removeaccount.php:65
-#: ../../Zotlabs/Module/Settings.php:703
+#: ../../Zotlabs/Module/Removeaccount.php:60
+#: ../../Zotlabs/Module/Settings.php:705
 msgid "Remove Account"
 msgstr ""
 
@@ -4832,25 +4811,25 @@ msgid ""
 "password."
 msgstr ""
 
-#: ../../Zotlabs/Module/Removeme.php:61
+#: ../../Zotlabs/Module/Removeme.php:58
 msgid "Remove This Channel"
 msgstr ""
 
-#: ../../Zotlabs/Module/Removeme.php:62
+#: ../../Zotlabs/Module/Removeme.php:59
 msgid "This channel will be completely removed from the network. "
 msgstr ""
 
-#: ../../Zotlabs/Module/Removeme.php:64
+#: ../../Zotlabs/Module/Removeme.php:61
 msgid "Remove this channel and all its clones from the network"
 msgstr ""
 
-#: ../../Zotlabs/Module/Removeme.php:64
+#: ../../Zotlabs/Module/Removeme.php:61
 msgid ""
 "By default only the instance of the channel located on this hub will be "
 "removed from the network"
 msgstr ""
 
-#: ../../Zotlabs/Module/Removeme.php:65 ../../Zotlabs/Module/Settings.php:1122
+#: ../../Zotlabs/Module/Removeme.php:62 ../../Zotlabs/Module/Settings.php:1124
 msgid "Remove Channel"
 msgstr ""
 
@@ -4894,1021 +4873,1032 @@ msgstr ""
 msgid "No service class restrictions found."
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:67
+#: ../../Zotlabs/Module/Settings.php:69
 msgid "Name is required"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:71
+#: ../../Zotlabs/Module/Settings.php:73
 msgid "Key and Secret are required"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:75 ../../Zotlabs/Module/Settings.php:614
-#: ../../include/apps.php:284
-msgid "Update"
-msgstr ""
-
-#: ../../Zotlabs/Module/Settings.php:223
+#: ../../Zotlabs/Module/Settings.php:225
 msgid "Not valid email."
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:226
+#: ../../Zotlabs/Module/Settings.php:228
 msgid "Protected email address. Cannot change to that email."
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:235
+#: ../../Zotlabs/Module/Settings.php:237
 msgid "System failure storing new email. Please try again."
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:252
+#: ../../Zotlabs/Module/Settings.php:254
 msgid "Password verification failed."
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:259
+#: ../../Zotlabs/Module/Settings.php:261
 msgid "Passwords do not match. Password unchanged."
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:263
+#: ../../Zotlabs/Module/Settings.php:265
 msgid "Empty passwords are not allowed. Password unchanged."
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:277
+#: ../../Zotlabs/Module/Settings.php:279
 msgid "Password changed."
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:279
+#: ../../Zotlabs/Module/Settings.php:281
 msgid "Password update failed. Please try again."
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:523
+#: ../../Zotlabs/Module/Settings.php:525
 msgid "Settings updated."
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:587 ../../Zotlabs/Module/Settings.php:613
-#: ../../Zotlabs/Module/Settings.php:649
+#: ../../Zotlabs/Module/Settings.php:589 ../../Zotlabs/Module/Settings.php:615
+#: ../../Zotlabs/Module/Settings.php:651
 msgid "Add application"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:590
+#: ../../Zotlabs/Module/Settings.php:592
 msgid "Name of application"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:591 ../../Zotlabs/Module/Settings.php:617
+#: ../../Zotlabs/Module/Settings.php:593 ../../Zotlabs/Module/Settings.php:619
 msgid "Consumer Key"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:591 ../../Zotlabs/Module/Settings.php:592
+#: ../../Zotlabs/Module/Settings.php:593 ../../Zotlabs/Module/Settings.php:594
 msgid "Automatically generated - change if desired. Max length 20"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:592 ../../Zotlabs/Module/Settings.php:618
+#: ../../Zotlabs/Module/Settings.php:594 ../../Zotlabs/Module/Settings.php:620
 msgid "Consumer Secret"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:593 ../../Zotlabs/Module/Settings.php:619
+#: ../../Zotlabs/Module/Settings.php:595 ../../Zotlabs/Module/Settings.php:621
 msgid "Redirect"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:593
+#: ../../Zotlabs/Module/Settings.php:595
 msgid ""
 "Redirect URI - leave blank unless your application specifically requires this"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:594 ../../Zotlabs/Module/Settings.php:620
+#: ../../Zotlabs/Module/Settings.php:596 ../../Zotlabs/Module/Settings.php:622
 msgid "Icon url"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:594 ../../Zotlabs/Module/Sources.php:112
+#: ../../Zotlabs/Module/Settings.php:596 ../../Zotlabs/Module/Sources.php:112
 #: ../../Zotlabs/Module/Sources.php:147
 msgid "Optional"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:605
+#: ../../Zotlabs/Module/Settings.php:607
 msgid "Application not found."
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:648
+#: ../../Zotlabs/Module/Settings.php:650
 msgid "Connected Apps"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:652
+#: ../../Zotlabs/Module/Settings.php:654
 msgid "Client key starts with"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:653
+#: ../../Zotlabs/Module/Settings.php:655
 msgid "No name"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:654
+#: ../../Zotlabs/Module/Settings.php:656
 msgid "Remove authorization"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:667
+#: ../../Zotlabs/Module/Settings.php:669
 msgid "No feature settings configured"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:674
+#: ../../Zotlabs/Module/Settings.php:676
 msgid "Feature/Addon Settings"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:697
+#: ../../Zotlabs/Module/Settings.php:699
 msgid "Account Settings"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:698
+#: ../../Zotlabs/Module/Settings.php:700
 msgid "Current Password"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:699
+#: ../../Zotlabs/Module/Settings.php:701
 msgid "Enter New Password"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:700
+#: ../../Zotlabs/Module/Settings.php:702
 msgid "Confirm New Password"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:700
+#: ../../Zotlabs/Module/Settings.php:702
 msgid "Leave password fields blank unless changing"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:702
-#: ../../Zotlabs/Module/Settings.php:1039
+#: ../../Zotlabs/Module/Settings.php:704
+#: ../../Zotlabs/Module/Settings.php:1041
 msgid "Email Address:"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:704
+#: ../../Zotlabs/Module/Settings.php:706
 msgid "Remove this account including all its channels"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:727
+#: ../../Zotlabs/Module/Settings.php:729
 msgid "Additional Features"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:751
+#: ../../Zotlabs/Module/Settings.php:753
 msgid "Connector Settings"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:790
+#: ../../Zotlabs/Module/Settings.php:792
 msgid "No special theme for mobile devices"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:793
+#: ../../Zotlabs/Module/Settings.php:795
 #, php-format
 msgid "%s - (Experimental)"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:835
+#: ../../Zotlabs/Module/Settings.php:837
 msgid "Display Settings"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:836
+#: ../../Zotlabs/Module/Settings.php:838
 msgid "Theme Settings"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:837
+#: ../../Zotlabs/Module/Settings.php:839
 msgid "Custom Theme Settings"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:838
+#: ../../Zotlabs/Module/Settings.php:840
 msgid "Content Settings"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:844
+#: ../../Zotlabs/Module/Settings.php:846
 msgid "Display Theme:"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:845
+#: ../../Zotlabs/Module/Settings.php:847
 msgid "Mobile Theme:"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:846
+#: ../../Zotlabs/Module/Settings.php:848
 msgid "Preload images before rendering the page"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:846
+#: ../../Zotlabs/Module/Settings.php:848
 msgid ""
 "The subjective page load time will be longer but the page will be ready when "
 "displayed"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:847
+#: ../../Zotlabs/Module/Settings.php:849
 msgid "Enable user zoom on mobile devices"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:848
+#: ../../Zotlabs/Module/Settings.php:850
 msgid "Update browser every xx seconds"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:848
+#: ../../Zotlabs/Module/Settings.php:850
 msgid "Minimum of 10 seconds, no maximum"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:849
+#: ../../Zotlabs/Module/Settings.php:851
 msgid "Maximum number of conversations to load at any time:"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:849
+#: ../../Zotlabs/Module/Settings.php:851
 msgid "Maximum of 100 items"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:850
+#: ../../Zotlabs/Module/Settings.php:852
 msgid "Show emoticons (smilies) as images"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:851
+#: ../../Zotlabs/Module/Settings.php:853
 msgid "Link post titles to source"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:852
+#: ../../Zotlabs/Module/Settings.php:854
 msgid "System Page Layout Editor - (advanced)"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:855
+#: ../../Zotlabs/Module/Settings.php:857
 msgid "Use blog/list mode on channel page"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:855 ../../Zotlabs/Module/Settings.php:856
+#: ../../Zotlabs/Module/Settings.php:857 ../../Zotlabs/Module/Settings.php:858
 msgid "(comments displayed separately)"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:856
+#: ../../Zotlabs/Module/Settings.php:858
 msgid "Use blog/list mode on grid page"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:857
+#: ../../Zotlabs/Module/Settings.php:859
 msgid "Channel page max height of content (in pixels)"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:857 ../../Zotlabs/Module/Settings.php:858
+#: ../../Zotlabs/Module/Settings.php:859 ../../Zotlabs/Module/Settings.php:860
 msgid "click to expand content exceeding this height"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:858
+#: ../../Zotlabs/Module/Settings.php:860
 msgid "Grid page max height of content (in pixels)"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:892
+#: ../../Zotlabs/Module/Settings.php:894
 msgid "Nobody except yourself"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:893
+#: ../../Zotlabs/Module/Settings.php:895
 msgid "Only those you specifically allow"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:894
+#: ../../Zotlabs/Module/Settings.php:896
 msgid "Approved connections"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:895
+#: ../../Zotlabs/Module/Settings.php:897
 msgid "Any connections"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:896
+#: ../../Zotlabs/Module/Settings.php:898
 msgid "Anybody on this website"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:897
+#: ../../Zotlabs/Module/Settings.php:899
 msgid "Anybody in this network"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:898
+#: ../../Zotlabs/Module/Settings.php:900
 msgid "Anybody authenticated"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:899
+#: ../../Zotlabs/Module/Settings.php:901
 msgid "Anybody on the internet"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:974
+#: ../../Zotlabs/Module/Settings.php:976
 msgid "Publish your default profile in the network directory"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:979
+#: ../../Zotlabs/Module/Settings.php:981
 msgid "Allow us to suggest you as a potential friend to new members?"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:988
+#: ../../Zotlabs/Module/Settings.php:990
 msgid "Your channel address is"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1030
+#: ../../Zotlabs/Module/Settings.php:1032
 msgid "Channel Settings"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1037
+#: ../../Zotlabs/Module/Settings.php:1039
 msgid "Basic Settings"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1038 ../../include/identity.php:1286
+#: ../../Zotlabs/Module/Settings.php:1040 ../../include/channel.php:1140
 msgid "Full Name:"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1040
+#: ../../Zotlabs/Module/Settings.php:1042
 msgid "Your Timezone:"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1041
+#: ../../Zotlabs/Module/Settings.php:1043
 msgid "Default Post Location:"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1041
+#: ../../Zotlabs/Module/Settings.php:1043
 msgid "Geographical location to display on your posts"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1042
+#: ../../Zotlabs/Module/Settings.php:1044
 msgid "Use Browser Location:"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1044
+#: ../../Zotlabs/Module/Settings.php:1046
 msgid "Adult Content"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1044
+#: ../../Zotlabs/Module/Settings.php:1046
 msgid ""
 "This channel frequently or regularly publishes adult content. (Please tag "
 "any adult material and/or nudity with #NSFW)"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1046
+#: ../../Zotlabs/Module/Settings.php:1048
 msgid "Security and Privacy Settings"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1049
+#: ../../Zotlabs/Module/Settings.php:1051
 msgid "Your permissions are already configured. Click to view/adjust"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1051
+#: ../../Zotlabs/Module/Settings.php:1053
 msgid "Hide my online presence"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1051
+#: ../../Zotlabs/Module/Settings.php:1053
 msgid "Prevents displaying in your profile that you are online"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1053
+#: ../../Zotlabs/Module/Settings.php:1055
 msgid "Simple Privacy Settings:"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1054
+#: ../../Zotlabs/Module/Settings.php:1056
 msgid ""
 "Very Public - <em>extremely permissive (should be used with caution)</em>"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1055
+#: ../../Zotlabs/Module/Settings.php:1057
 msgid ""
 "Typical - <em>default public, privacy when desired (similar to social "
 "network permissions but with improved privacy)</em>"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1056
+#: ../../Zotlabs/Module/Settings.php:1058
 msgid "Private - <em>default private, never open or public</em>"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1057
+#: ../../Zotlabs/Module/Settings.php:1059
 msgid "Blocked - <em>default blocked to/from everybody</em>"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1059
+#: ../../Zotlabs/Module/Settings.php:1061
 msgid "Allow others to tag your posts"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1059
+#: ../../Zotlabs/Module/Settings.php:1061
 msgid ""
 "Often used by the community to retro-actively flag inappropriate content"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1061
+#: ../../Zotlabs/Module/Settings.php:1063
 msgid "Advanced Privacy Settings"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1063
+#: ../../Zotlabs/Module/Settings.php:1065
 msgid "Expire other channel content after this many days"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1063
+#: ../../Zotlabs/Module/Settings.php:1065
+msgid "0 or blank to use the website limit."
+msgstr ""
+
+#: ../../Zotlabs/Module/Settings.php:1065
 #, php-format
-msgid "0 or blank to use the website limit. The website expires after %d days."
+msgid "This website expires after %d days."
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1064
+#: ../../Zotlabs/Module/Settings.php:1065
+msgid "This website does not expire imported content."
+msgstr ""
+
+#: ../../Zotlabs/Module/Settings.php:1065
+msgid "The website limit takes precedence if lower than your limit."
+msgstr ""
+
+#: ../../Zotlabs/Module/Settings.php:1066
 msgid "Maximum Friend Requests/Day:"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1064
+#: ../../Zotlabs/Module/Settings.php:1066
 msgid "May reduce spam activity"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1065
-msgid "Default Post Permissions"
+#: ../../Zotlabs/Module/Settings.php:1067
+msgid "Default Post and Publish Permissions"
+msgstr ""
+
+#: ../../Zotlabs/Module/Settings.php:1069
+msgid "Use my default audience setting for the type of object published"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1070
+#: ../../Zotlabs/Module/Settings.php:1072
 msgid "Channel permissions category:"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1076
+#: ../../Zotlabs/Module/Settings.php:1078
 msgid "Maximum private messages per day from unknown people:"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1076
+#: ../../Zotlabs/Module/Settings.php:1078
 msgid "Useful to reduce spamming"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1079
+#: ../../Zotlabs/Module/Settings.php:1081
 msgid "Notification Settings"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1080
+#: ../../Zotlabs/Module/Settings.php:1082
 msgid "By default post a status message when:"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1081
+#: ../../Zotlabs/Module/Settings.php:1083
 msgid "accepting a friend request"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1082
+#: ../../Zotlabs/Module/Settings.php:1084
 msgid "joining a forum/community"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1083
+#: ../../Zotlabs/Module/Settings.php:1085
 msgid "making an <em>interesting</em> profile change"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1084
+#: ../../Zotlabs/Module/Settings.php:1086
 msgid "Send a notification email when:"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1085
+#: ../../Zotlabs/Module/Settings.php:1087
 msgid "You receive a connection request"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1086
+#: ../../Zotlabs/Module/Settings.php:1088
 msgid "Your connections are confirmed"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1087
+#: ../../Zotlabs/Module/Settings.php:1089
 msgid "Someone writes on your profile wall"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1088
+#: ../../Zotlabs/Module/Settings.php:1090
 msgid "Someone writes a followup comment"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1089
+#: ../../Zotlabs/Module/Settings.php:1091
 msgid "You receive a private message"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1090
+#: ../../Zotlabs/Module/Settings.php:1092
 msgid "You receive a friend suggestion"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1091
+#: ../../Zotlabs/Module/Settings.php:1093
 msgid "You are tagged in a post"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1092
+#: ../../Zotlabs/Module/Settings.php:1094
 msgid "You are poked/prodded/etc. in a post"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1095
+#: ../../Zotlabs/Module/Settings.php:1097
 msgid "Show visual notifications including:"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1097
+#: ../../Zotlabs/Module/Settings.php:1099
 msgid "Unseen grid activity"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1098
+#: ../../Zotlabs/Module/Settings.php:1100
 msgid "Unseen channel activity"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1099
+#: ../../Zotlabs/Module/Settings.php:1101
 msgid "Unseen private messages"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1099
-#: ../../Zotlabs/Module/Settings.php:1104
-#: ../../Zotlabs/Module/Settings.php:1105
+#: ../../Zotlabs/Module/Settings.php:1101
 #: ../../Zotlabs/Module/Settings.php:1106
+#: ../../Zotlabs/Module/Settings.php:1107
+#: ../../Zotlabs/Module/Settings.php:1108
 msgid "Recommended"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1100
+#: ../../Zotlabs/Module/Settings.php:1102
 msgid "Upcoming events"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1101
+#: ../../Zotlabs/Module/Settings.php:1103
 msgid "Events today"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1102
+#: ../../Zotlabs/Module/Settings.php:1104
 msgid "Upcoming birthdays"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1102
+#: ../../Zotlabs/Module/Settings.php:1104
 msgid "Not available in all themes"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1103
+#: ../../Zotlabs/Module/Settings.php:1105
 msgid "System (personal) notifications"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1104
+#: ../../Zotlabs/Module/Settings.php:1106
 msgid "System info messages"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1105
+#: ../../Zotlabs/Module/Settings.php:1107
 msgid "System critical alerts"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1106
+#: ../../Zotlabs/Module/Settings.php:1108
 msgid "New connections"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1107
+#: ../../Zotlabs/Module/Settings.php:1109
 msgid "System Registrations"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1108
+#: ../../Zotlabs/Module/Settings.php:1110
 msgid ""
 "Also show new wall posts, private messages and connections under Notices"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1110
+#: ../../Zotlabs/Module/Settings.php:1112
 msgid "Notify me of events this many days in advance"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1110
+#: ../../Zotlabs/Module/Settings.php:1112
 msgid "Must be greater than 0"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1112
+#: ../../Zotlabs/Module/Settings.php:1114
 msgid "Advanced Account/Page Type Settings"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1113
+#: ../../Zotlabs/Module/Settings.php:1115
 msgid "Change the behaviour of this account for special situations"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1116
+#: ../../Zotlabs/Module/Settings.php:1118
 msgid ""
 "Please enable expert mode (in <a href=\"settings/features\">Settings > "
 "Additional features</a>) to adjust!"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1117
+#: ../../Zotlabs/Module/Settings.php:1119
 msgid "Miscellaneous Settings"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1118
+#: ../../Zotlabs/Module/Settings.php:1120
 msgid "Default photo upload folder"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1118
-#: ../../Zotlabs/Module/Settings.php:1119
+#: ../../Zotlabs/Module/Settings.php:1120
+#: ../../Zotlabs/Module/Settings.php:1121
 msgid "%Y - current year, %m -  current month"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1119
+#: ../../Zotlabs/Module/Settings.php:1121
 msgid "Default file upload folder"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1121
+#: ../../Zotlabs/Module/Settings.php:1123
 msgid "Personal menu to display in your channel pages"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1123
+#: ../../Zotlabs/Module/Settings.php:1125
 msgid "Remove this channel."
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1124
+#: ../../Zotlabs/Module/Settings.php:1126
 msgid "Firefox Share $Projectname provider"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1125
+#: ../../Zotlabs/Module/Settings.php:1127
 msgid "Start calendar week on monday"
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:202
+#: ../../Zotlabs/Module/Setup.php:179
 msgid "$Projectname Server - Setup"
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:206
+#: ../../Zotlabs/Module/Setup.php:183
 msgid "Could not connect to database."
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:210
+#: ../../Zotlabs/Module/Setup.php:187
 msgid ""
 "Could not connect to specified site URL. Possible SSL certificate or DNS "
 "issue."
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:217
+#: ../../Zotlabs/Module/Setup.php:194
 msgid "Could not create table."
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:222
+#: ../../Zotlabs/Module/Setup.php:199
 msgid "Your site database has been installed."
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:226
+#: ../../Zotlabs/Module/Setup.php:203
 msgid ""
 "You may need to import the file \"install/schema_xxx.sql\" manually using a "
 "database client."
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:227 ../../Zotlabs/Module/Setup.php:289
-#: ../../Zotlabs/Module/Setup.php:744
+#: ../../Zotlabs/Module/Setup.php:204 ../../Zotlabs/Module/Setup.php:266
+#: ../../Zotlabs/Module/Setup.php:721
 msgid "Please see the file \"install/INSTALL.txt\"."
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:286
+#: ../../Zotlabs/Module/Setup.php:263
 msgid "System check"
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:291
+#: ../../Zotlabs/Module/Setup.php:268
 msgid "Check again"
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:313
+#: ../../Zotlabs/Module/Setup.php:290
 msgid "Database connection"
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:314
+#: ../../Zotlabs/Module/Setup.php:291
 msgid ""
 "In order to install $Projectname we need to know how to connect to your "
 "database."
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:315
+#: ../../Zotlabs/Module/Setup.php:292
 msgid ""
 "Please contact your hosting provider or site administrator if you have "
 "questions about these settings."
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:316
+#: ../../Zotlabs/Module/Setup.php:293
 msgid ""
 "The database you specify below should already exist. If it does not, please "
 "create it before continuing."
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:320
+#: ../../Zotlabs/Module/Setup.php:297
 msgid "Database Server Name"
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:320
+#: ../../Zotlabs/Module/Setup.php:297
 msgid "Default is 127.0.0.1"
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:321
+#: ../../Zotlabs/Module/Setup.php:298
 msgid "Database Port"
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:321
+#: ../../Zotlabs/Module/Setup.php:298
 msgid "Communication port number - use 0 for default"
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:322
+#: ../../Zotlabs/Module/Setup.php:299
 msgid "Database Login Name"
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:323
+#: ../../Zotlabs/Module/Setup.php:300
 msgid "Database Login Password"
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:324
+#: ../../Zotlabs/Module/Setup.php:301
 msgid "Database Name"
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:325
+#: ../../Zotlabs/Module/Setup.php:302
 msgid "Database Type"
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:327 ../../Zotlabs/Module/Setup.php:367
+#: ../../Zotlabs/Module/Setup.php:304 ../../Zotlabs/Module/Setup.php:344
 msgid "Site administrator email address"
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:327 ../../Zotlabs/Module/Setup.php:367
+#: ../../Zotlabs/Module/Setup.php:304 ../../Zotlabs/Module/Setup.php:344
 msgid ""
 "Your account email address must match this in order to use the web admin "
 "panel."
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:328 ../../Zotlabs/Module/Setup.php:369
+#: ../../Zotlabs/Module/Setup.php:305 ../../Zotlabs/Module/Setup.php:346
 msgid "Website URL"
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:328 ../../Zotlabs/Module/Setup.php:369
+#: ../../Zotlabs/Module/Setup.php:305 ../../Zotlabs/Module/Setup.php:346
 msgid "Please use SSL (https) URL if available."
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:329 ../../Zotlabs/Module/Setup.php:372
+#: ../../Zotlabs/Module/Setup.php:306 ../../Zotlabs/Module/Setup.php:349
 msgid "Please select a default timezone for your website"
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:356
+#: ../../Zotlabs/Module/Setup.php:333
 msgid "Site settings"
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:370
+#: ../../Zotlabs/Module/Setup.php:347
 msgid "Enable $Projectname <strong>advanced</strong> features?"
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:370
+#: ../../Zotlabs/Module/Setup.php:347
 msgid ""
 "Some advanced features, while useful - may be best suited for technically "
 "proficient audiences"
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:411
-msgid "PHP version 5.4 or greater is required."
+#: ../../Zotlabs/Module/Setup.php:388
+msgid "PHP version 5.5 or greater is required."
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:412
+#: ../../Zotlabs/Module/Setup.php:389
 msgid "PHP version"
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:427
+#: ../../Zotlabs/Module/Setup.php:404
 msgid "Could not find a command line version of PHP in the web server PATH."
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:428
+#: ../../Zotlabs/Module/Setup.php:405
 msgid ""
 "If you don't have a command line version of PHP installed on server, you "
 "will not be able to run background polling via cron."
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:432
+#: ../../Zotlabs/Module/Setup.php:409
 msgid "PHP executable path"
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:432
+#: ../../Zotlabs/Module/Setup.php:409
 msgid ""
 "Enter full path to php executable. You can leave this blank to continue the "
 "installation."
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:437
+#: ../../Zotlabs/Module/Setup.php:414
 msgid "Command line PHP"
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:446
+#: ../../Zotlabs/Module/Setup.php:423
 msgid ""
 "The command line version of PHP on your system does not have "
 "\"register_argc_argv\" enabled."
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:447
+#: ../../Zotlabs/Module/Setup.php:424
 msgid "This is required for message delivery to work."
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:450
+#: ../../Zotlabs/Module/Setup.php:427
 msgid "PHP register_argc_argv"
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:468
+#: ../../Zotlabs/Module/Setup.php:445
 #, php-format
 msgid ""
 "Your max allowed total upload size is set to %s. Maximum size of one file to "
 "upload is set to %s. You are allowed to upload up to %d files at once."
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:473
+#: ../../Zotlabs/Module/Setup.php:450
 msgid "You can adjust these settings in the servers php.ini."
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:475
+#: ../../Zotlabs/Module/Setup.php:452
 msgid "PHP upload limits"
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:498
+#: ../../Zotlabs/Module/Setup.php:475
 msgid ""
 "Error: the \"openssl_pkey_new\" function on this system is not able to "
 "generate encryption keys"
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:499
+#: ../../Zotlabs/Module/Setup.php:476
 msgid ""
 "If running under Windows, please see \"http://www.php.net/manual/en/openssl."
 "installation.php\"."
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:502
+#: ../../Zotlabs/Module/Setup.php:479
 msgid "Generate encryption keys"
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:514
+#: ../../Zotlabs/Module/Setup.php:491
 msgid "libCurl PHP module"
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:515
+#: ../../Zotlabs/Module/Setup.php:492
 msgid "GD graphics PHP module"
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:516
+#: ../../Zotlabs/Module/Setup.php:493
 msgid "OpenSSL PHP module"
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:517
+#: ../../Zotlabs/Module/Setup.php:494
 msgid "mysqli or postgres PHP module"
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:518
+#: ../../Zotlabs/Module/Setup.php:495
 msgid "mb_string PHP module"
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:519
+#: ../../Zotlabs/Module/Setup.php:496
 msgid "mcrypt PHP module"
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:520
+#: ../../Zotlabs/Module/Setup.php:497
 msgid "xml PHP module"
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:524 ../../Zotlabs/Module/Setup.php:526
+#: ../../Zotlabs/Module/Setup.php:501 ../../Zotlabs/Module/Setup.php:503
 msgid "Apache mod_rewrite module"
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:524
+#: ../../Zotlabs/Module/Setup.php:501
 msgid ""
 "Error: Apache webserver mod-rewrite module is required but not installed."
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:530 ../../Zotlabs/Module/Setup.php:533
+#: ../../Zotlabs/Module/Setup.php:507 ../../Zotlabs/Module/Setup.php:510
 msgid "proc_open"
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:530
+#: ../../Zotlabs/Module/Setup.php:507
 msgid ""
 "Error: proc_open is required but is either not installed or has been "
 "disabled in php.ini"
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:538
+#: ../../Zotlabs/Module/Setup.php:515
 msgid "Error: libCURL PHP module required but not installed."
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:542
+#: ../../Zotlabs/Module/Setup.php:519
 msgid ""
 "Error: GD graphics PHP module with JPEG support required but not installed."
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:546
+#: ../../Zotlabs/Module/Setup.php:523
 msgid "Error: openssl PHP module required but not installed."
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:550
+#: ../../Zotlabs/Module/Setup.php:527
 msgid ""
 "Error: mysqli or postgres PHP module required but neither are installed."
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:554
+#: ../../Zotlabs/Module/Setup.php:531
 msgid "Error: mb_string PHP module required but not installed."
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:558
+#: ../../Zotlabs/Module/Setup.php:535
 msgid "Error: mcrypt PHP module required but not installed."
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:562
+#: ../../Zotlabs/Module/Setup.php:539
 msgid "Error: xml PHP module required for DAV but not installed."
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:580
+#: ../../Zotlabs/Module/Setup.php:557
 msgid ""
 "The web installer needs to be able to create a file called \".htconfig.php\" "
 "in the top folder of your web server and it is unable to do so."
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:581
+#: ../../Zotlabs/Module/Setup.php:558
 msgid ""
 "This is most often a permission setting, as the web server may not be able "
 "to write files in your folder - even if you can."
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:582
+#: ../../Zotlabs/Module/Setup.php:559
 msgid ""
 "At the end of this procedure, we will give you a text to save in a file "
 "named .htconfig.php in your Red top folder."
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:583
+#: ../../Zotlabs/Module/Setup.php:560
 msgid ""
 "You can alternatively skip this procedure and perform a manual installation. "
 "Please see the file \"install/INSTALL.txt\" for instructions."
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:586
+#: ../../Zotlabs/Module/Setup.php:563
 msgid ".htconfig.php is writable"
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:600
+#: ../../Zotlabs/Module/Setup.php:577
 msgid ""
 "Red uses the Smarty3 template engine to render its web views. Smarty3 "
 "compiles templates to PHP to speed up rendering."
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:601
+#: ../../Zotlabs/Module/Setup.php:578
 #, php-format
 msgid ""
 "In order to store these compiled templates, the web server needs to have "
-"write access to the directory %s under the Red top level folder."
+"write access to the directory %s under the top level web folder."
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:602 ../../Zotlabs/Module/Setup.php:623
+#: ../../Zotlabs/Module/Setup.php:579 ../../Zotlabs/Module/Setup.php:600
 msgid ""
 "Please ensure that the user that your web server runs as (e.g. www-data) has "
 "write access to this folder."
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:603
+#: ../../Zotlabs/Module/Setup.php:580
 #, php-format
 msgid ""
 "Note: as a security measure, you should give the web server write access to "
 "%s only--not the template files (.tpl) that it contains."
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:606
+#: ../../Zotlabs/Module/Setup.php:583
 #, php-format
 msgid "%s is writable"
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:622
+#: ../../Zotlabs/Module/Setup.php:599
 msgid ""
 "Red uses the store directory to save uploaded files. The web server needs to "
 "have write access to the store directory under the Red top level folder"
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:626
+#: ../../Zotlabs/Module/Setup.php:603
 msgid "store is writable"
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:659
+#: ../../Zotlabs/Module/Setup.php:636
 msgid ""
 "SSL certificate cannot be validated. Fix certificate or disable https access "
 "to this site."
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:660
+#: ../../Zotlabs/Module/Setup.php:637
 msgid ""
 "If you have https access to your website or allow connections to TCP port "
 "443 (the https: port), you MUST use a browser-valid certificate. You MUST "
 "NOT use self-signed certificates!"
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:661
+#: ../../Zotlabs/Module/Setup.php:638
 msgid ""
 "This restriction is incorporated because public posts from you may for "
 "example contain references to images on your own hub."
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:662
+#: ../../Zotlabs/Module/Setup.php:639
 msgid ""
 "If your certificate is not recognized, members of other sites (who may "
 "themselves have valid certificates) will get a warning message on their own "
 "site complaining about security issues."
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:663
+#: ../../Zotlabs/Module/Setup.php:640
 msgid ""
 "This can cause usability issues elsewhere (not just on your own site) so we "
 "must insist on this requirement."
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:664
+#: ../../Zotlabs/Module/Setup.php:641
 msgid ""
 "Providers are available that issue free certificates which are browser-valid."
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:666
+#: ../../Zotlabs/Module/Setup.php:643
 msgid "SSL certificate validation"
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:672
+#: ../../Zotlabs/Module/Setup.php:649
 msgid ""
 "Url rewrite in .htaccess is not working. Check your server configuration."
 "Test: "
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:675
+#: ../../Zotlabs/Module/Setup.php:652
 msgid "Url rewrite is working"
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:684
+#: ../../Zotlabs/Module/Setup.php:661
 msgid ""
 "The database configuration file \".htconfig.php\" could not be written. "
 "Please use the enclosed text to create a configuration file in your web "
 "server root."
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:708
+#: ../../Zotlabs/Module/Setup.php:685
 msgid "Errors encountered creating database tables."
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:742
+#: ../../Zotlabs/Module/Setup.php:719
 msgid "<h1>What next</h1>"
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:743
+#: ../../Zotlabs/Module/Setup.php:720
 msgid ""
 "IMPORTANT: You will need to [manually] setup a scheduled task for the poller."
 msgstr ""
@@ -6080,11 +6070,11 @@ msgstr ""
 msgid "Ignore/Hide"
 msgstr ""
 
-#: ../../Zotlabs/Module/Tagger.php:55 ../../include/bbcode.php:257
+#: ../../Zotlabs/Module/Tagger.php:55 ../../include/bbcode.php:256
 msgid "post"
 msgstr ""
 
-#: ../../Zotlabs/Module/Tagger.php:57 ../../include/text.php:1977
+#: ../../Zotlabs/Module/Tagger.php:57 ../../include/text.php:1948
 #: ../../include/conversation.php:150
 msgid "comment"
 msgstr ""
@@ -6221,16 +6211,16 @@ msgid ""
 "or restore these in date order (oldest first)."
 msgstr ""
 
-#: ../../Zotlabs/Module/Viewconnections.php:63
+#: ../../Zotlabs/Module/Viewconnections.php:62
 msgid "No connections."
 msgstr ""
 
-#: ../../Zotlabs/Module/Viewconnections.php:76
+#: ../../Zotlabs/Module/Viewconnections.php:75
 #, php-format
 msgid "Visit %s's profile [%s]"
 msgstr ""
 
-#: ../../Zotlabs/Module/Viewconnections.php:105
+#: ../../Zotlabs/Module/Viewconnections.php:104
 msgid "View Connections"
 msgstr ""
 
@@ -6238,20 +6228,20 @@ msgstr ""
 msgid "Source of Item"
 msgstr ""
 
-#: ../../Zotlabs/Module/Webpages.php:186 ../../include/apps.php:168
-#: ../../include/conversation.php:1696 ../../include/nav.php:106
+#: ../../Zotlabs/Module/Webpages.php:184 ../../Zotlabs/Lib/Apps.php:217
+#: ../../include/nav.php:106 ../../include/conversation.php:1685
 msgid "Webpages"
 msgstr ""
 
-#: ../../Zotlabs/Module/Webpages.php:197 ../../include/page_widgets.php:41
+#: ../../Zotlabs/Module/Webpages.php:195 ../../include/page_widgets.php:41
 msgid "Actions"
 msgstr ""
 
-#: ../../Zotlabs/Module/Webpages.php:198 ../../include/page_widgets.php:42
+#: ../../Zotlabs/Module/Webpages.php:196 ../../include/page_widgets.php:42
 msgid "Page Link"
 msgstr ""
 
-#: ../../Zotlabs/Module/Webpages.php:199
+#: ../../Zotlabs/Module/Webpages.php:197
 msgid "Page Title"
 msgstr ""
 
@@ -6263,670 +6253,948 @@ msgstr ""
 msgid "Lookup xchan beginning with (or webbie): "
 msgstr ""
 
-#: ../../include/Import/import_diaspora.php:17
-msgid "No username found in import file."
+#: ../../Zotlabs/Lib/Apps.php:204
+msgid "Site Admin"
 msgstr ""
 
-#: ../../include/Import/import_diaspora.php:42 ../../include/import.php:44
-msgid "Unable to create a unique channel address. Import failed."
+#: ../../Zotlabs/Lib/Apps.php:205
+msgid "Bug Report"
 msgstr ""
 
-#: ../../include/dba/dba_driver.php:141
-#, php-format
-msgid "Cannot locate DNS info for database server '%s'"
+#: ../../Zotlabs/Lib/Apps.php:206
+msgid "View Bookmarks"
 msgstr ""
 
-#: ../../include/identity.php:32
-msgid "Unable to obtain identity information from database"
+#: ../../Zotlabs/Lib/Apps.php:207
+msgid "My Chatrooms"
 msgstr ""
 
-#: ../../include/identity.php:66
-msgid "Empty name"
+#: ../../Zotlabs/Lib/Apps.php:209
+msgid "Firefox Share"
 msgstr ""
 
-#: ../../include/identity.php:69
-msgid "Name too long"
+#: ../../Zotlabs/Lib/Apps.php:210
+msgid "Remote Diagnostics"
 msgstr ""
 
-#: ../../include/identity.php:180
-msgid "No account identifier"
+#: ../../Zotlabs/Lib/Apps.php:211 ../../include/features.php:89
+msgid "Suggest Channels"
 msgstr ""
 
-#: ../../include/identity.php:192
-msgid "Nickname is required."
+#: ../../Zotlabs/Lib/Apps.php:212 ../../include/nav.php:110
+#: ../../boot.php:1703
+msgid "Login"
 msgstr ""
 
-#: ../../include/identity.php:206
-msgid "Reserved nickname. Please choose another."
+#: ../../Zotlabs/Lib/Apps.php:214 ../../include/nav.php:179
+msgid "Grid"
 msgstr ""
 
-#: ../../include/identity.php:211
-msgid ""
-"Nickname has unsupported characters or is already being used on this site."
+#: ../../Zotlabs/Lib/Apps.php:218 ../../include/nav.php:182
+msgid "Channel Home"
 msgstr ""
 
-#: ../../include/identity.php:287
-msgid "Unable to retrieve created identity"
+#: ../../Zotlabs/Lib/Apps.php:221 ../../include/nav.php:201
+#: ../../include/conversation.php:1649 ../../include/conversation.php:1652
+msgid "Events"
 msgstr ""
 
-#: ../../include/identity.php:345
-msgid "Default Profile"
+#: ../../Zotlabs/Lib/Apps.php:222 ../../include/nav.php:167
+msgid "Directory"
 msgstr ""
 
-#: ../../include/identity.php:791
-msgid "Requested channel is not available."
+#: ../../Zotlabs/Lib/Apps.php:224 ../../include/nav.php:193
+msgid "Mail"
 msgstr ""
 
-#: ../../include/identity.php:938
-msgid "Create New Profile"
+#: ../../Zotlabs/Lib/Apps.php:227 ../../include/nav.php:96
+msgid "Chat"
 msgstr ""
 
-#: ../../include/identity.php:941 ../../include/nav.php:90
-msgid "Edit Profile"
+#: ../../Zotlabs/Lib/Apps.php:229
+msgid "Probe"
 msgstr ""
 
-#: ../../include/identity.php:958
-msgid "Visible to everybody"
+#: ../../Zotlabs/Lib/Apps.php:230
+msgid "Suggest"
 msgstr ""
 
-#: ../../include/identity.php:1033 ../../include/identity.php:1288
-msgid "Gender:"
+#: ../../Zotlabs/Lib/Apps.php:231
+msgid "Random Channel"
 msgstr ""
 
-#: ../../include/identity.php:1034 ../../include/identity.php:1332
-msgid "Status:"
+#: ../../Zotlabs/Lib/Apps.php:232
+msgid "Invite"
 msgstr ""
 
-#: ../../include/identity.php:1035 ../../include/identity.php:1343
-msgid "Homepage:"
+#: ../../Zotlabs/Lib/Apps.php:233 ../../include/widgets.php:1386
+msgid "Features"
 msgstr ""
 
-#: ../../include/identity.php:1036
-msgid "Online Now"
+#: ../../Zotlabs/Lib/Apps.php:235
+msgid "Post"
 msgstr ""
 
-#: ../../include/identity.php:1124 ../../include/identity.php:1200
-msgid "F d"
+#: ../../Zotlabs/Lib/Apps.php:335
+msgid "Purchase"
 msgstr ""
 
-#: ../../include/identity.php:1180
-msgid "Birthday Reminders"
+#: ../../Zotlabs/Lib/Chatroom.php:27
+msgid "Missing room name"
 msgstr ""
 
-#: ../../include/identity.php:1181
-msgid "Birthdays this week:"
+#: ../../Zotlabs/Lib/Chatroom.php:36
+msgid "Duplicate room name"
 msgstr ""
 
-#: ../../include/identity.php:1232
-msgid "[No description]"
+#: ../../Zotlabs/Lib/Chatroom.php:86 ../../Zotlabs/Lib/Chatroom.php:94
+msgid "Invalid room specifier."
 msgstr ""
 
-#: ../../include/identity.php:1250
-msgid "Event Reminders"
+#: ../../Zotlabs/Lib/Chatroom.php:126
+msgid "Room not found."
 msgstr ""
 
-#: ../../include/identity.php:1251
-msgid "Events this week:"
+#: ../../Zotlabs/Lib/Chatroom.php:147
+msgid "Room is full"
 msgstr ""
 
-#: ../../include/identity.php:1293
-msgid "Like this channel"
+#: ../../Zotlabs/Lib/Enotify.php:60 ../../include/network.php:1823
+msgid "$Projectname Notification"
 msgstr ""
 
-#: ../../include/identity.php:1317
-msgid "j F, Y"
+#: ../../Zotlabs/Lib/Enotify.php:61 ../../include/network.php:1824
+msgid "$projectname"
 msgstr ""
 
-#: ../../include/identity.php:1318
-msgid "j F"
+#: ../../Zotlabs/Lib/Enotify.php:63 ../../include/network.php:1826
+msgid "Thank You,"
 msgstr ""
 
-#: ../../include/identity.php:1325
-msgid "Birthday:"
+#: ../../Zotlabs/Lib/Enotify.php:65 ../../include/network.php:1828
+#, php-format
+msgid "%s Administrator"
 msgstr ""
 
-#: ../../include/identity.php:1338
+#: ../../Zotlabs/Lib/Enotify.php:100
 #, php-format
-msgid "for %1$d %2$s"
+msgid "%s <!item_type!>"
 msgstr ""
 
-#: ../../include/identity.php:1341
-msgid "Sexual Preference:"
+#: ../../Zotlabs/Lib/Enotify.php:104
+#, php-format
+msgid "[Hubzilla:Notify] New mail received at %s"
 msgstr ""
 
-#: ../../include/identity.php:1347
-msgid "Tags:"
+#: ../../Zotlabs/Lib/Enotify.php:106
+#, php-format
+msgid "%1$s, %2$s sent you a new private message at %3$s."
 msgstr ""
 
-#: ../../include/identity.php:1349
-msgid "Political Views:"
+#: ../../Zotlabs/Lib/Enotify.php:107
+#, php-format
+msgid "%1$s sent you %2$s."
 msgstr ""
 
-#: ../../include/identity.php:1351
-msgid "Religion:"
+#: ../../Zotlabs/Lib/Enotify.php:107
+msgid "a private message"
 msgstr ""
 
-#: ../../include/identity.php:1355
-msgid "Hobbies/Interests:"
+#: ../../Zotlabs/Lib/Enotify.php:108
+#, php-format
+msgid "Please visit %s to view and/or reply to your private messages."
 msgstr ""
 
-#: ../../include/identity.php:1357
-msgid "Likes:"
+#: ../../Zotlabs/Lib/Enotify.php:164
+#, php-format
+msgid "%1$s, %2$s commented on [zrl=%3$s]a %4$s[/zrl]"
 msgstr ""
 
-#: ../../include/identity.php:1359
-msgid "Dislikes:"
+#: ../../Zotlabs/Lib/Enotify.php:172
+#, php-format
+msgid "%1$s, %2$s commented on [zrl=%3$s]%4$s's %5$s[/zrl]"
 msgstr ""
 
-#: ../../include/identity.php:1361
-msgid "Contact information and Social Networks:"
+#: ../../Zotlabs/Lib/Enotify.php:181
+#, php-format
+msgid "%1$s, %2$s commented on [zrl=%3$s]your %4$s[/zrl]"
 msgstr ""
 
-#: ../../include/identity.php:1363
-msgid "My other channels:"
+#: ../../Zotlabs/Lib/Enotify.php:192
+#, php-format
+msgid "[Hubzilla:Notify] Comment to conversation #%1$d by %2$s"
 msgstr ""
 
-#: ../../include/identity.php:1365
-msgid "Musical interests:"
+#: ../../Zotlabs/Lib/Enotify.php:193
+#, php-format
+msgid "%1$s, %2$s commented on an item/conversation you have been following."
 msgstr ""
 
-#: ../../include/identity.php:1367
-msgid "Books, literature:"
+#: ../../Zotlabs/Lib/Enotify.php:196 ../../Zotlabs/Lib/Enotify.php:211
+#: ../../Zotlabs/Lib/Enotify.php:237 ../../Zotlabs/Lib/Enotify.php:255
+#: ../../Zotlabs/Lib/Enotify.php:269
+#, php-format
+msgid "Please visit %s to view and/or reply to the conversation."
 msgstr ""
 
-#: ../../include/identity.php:1369
-msgid "Television:"
+#: ../../Zotlabs/Lib/Enotify.php:202
+#, php-format
+msgid "[Hubzilla:Notify] %s posted to your profile wall"
 msgstr ""
 
-#: ../../include/identity.php:1371
-msgid "Film/dance/culture/entertainment:"
+#: ../../Zotlabs/Lib/Enotify.php:204
+#, php-format
+msgid "%1$s, %2$s posted to your profile wall at %3$s"
 msgstr ""
 
-#: ../../include/identity.php:1373
-msgid "Love/Romance:"
+#: ../../Zotlabs/Lib/Enotify.php:206
+#, php-format
+msgid "%1$s, %2$s posted to [zrl=%3$s]your wall[/zrl]"
 msgstr ""
 
-#: ../../include/identity.php:1375
-msgid "Work/employment:"
+#: ../../Zotlabs/Lib/Enotify.php:230
+#, php-format
+msgid "[Hubzilla:Notify] %s tagged you"
 msgstr ""
 
-#: ../../include/identity.php:1377
-msgid "School/education:"
+#: ../../Zotlabs/Lib/Enotify.php:231
+#, php-format
+msgid "%1$s, %2$s tagged you at %3$s"
 msgstr ""
 
-#: ../../include/identity.php:1397
-msgid "Like this thing"
+#: ../../Zotlabs/Lib/Enotify.php:232
+#, php-format
+msgid "%1$s, %2$s [zrl=%3$s]tagged you[/zrl]."
 msgstr ""
 
-#: ../../include/notify.php:20
-msgid "created a new post"
+#: ../../Zotlabs/Lib/Enotify.php:244
+#, php-format
+msgid "[Hubzilla:Notify] %1$s poked you"
 msgstr ""
 
-#: ../../include/notify.php:21
+#: ../../Zotlabs/Lib/Enotify.php:245
 #, php-format
-msgid "commented on %s's post"
+msgid "%1$s, %2$s poked you at %3$s"
 msgstr ""
 
-#: ../../include/acl_selectors.php:230
-msgid "Visible to your default audience"
+#: ../../Zotlabs/Lib/Enotify.php:246
+#, php-format
+msgid "%1$s, %2$s [zrl=%2$s]poked you[/zrl]."
 msgstr ""
 
-#: ../../include/acl_selectors.php:255
-msgid "Limit access:"
+#: ../../Zotlabs/Lib/Enotify.php:262
+#, php-format
+msgid "[Hubzilla:Notify] %s tagged your post"
+msgstr ""
+
+#: ../../Zotlabs/Lib/Enotify.php:263
+#, php-format
+msgid "%1$s, %2$s tagged your post at %3$s"
+msgstr ""
+
+#: ../../Zotlabs/Lib/Enotify.php:264
+#, php-format
+msgid "%1$s, %2$s tagged [zrl=%3$s]your post[/zrl]"
+msgstr ""
+
+#: ../../Zotlabs/Lib/Enotify.php:276
+msgid "[Hubzilla:Notify] Introduction received"
+msgstr ""
+
+#: ../../Zotlabs/Lib/Enotify.php:277
+#, php-format
+msgid "%1$s, you've received an new connection request from '%2$s' at %3$s"
 msgstr ""
 
-#: ../../include/acl_selectors.php:256
+#: ../../Zotlabs/Lib/Enotify.php:278
+#, php-format
 msgid ""
-"Select \"Show\" to allow viewing. \"Don't show\" lets you override and limit "
-"the scope of \"Show\"."
+"%1$s, you've received [zrl=%2$s]a new connection request[/zrl] from %3$s."
 msgstr ""
 
-#: ../../include/acl_selectors.php:257
-msgid "Show"
+#: ../../Zotlabs/Lib/Enotify.php:282 ../../Zotlabs/Lib/Enotify.php:301
+#, php-format
+msgid "You may visit their profile at %s"
 msgstr ""
 
-#: ../../include/acl_selectors.php:258
-msgid "Don't show"
+#: ../../Zotlabs/Lib/Enotify.php:284
+#, php-format
+msgid "Please visit %s to approve or reject the connection request."
 msgstr ""
 
-#: ../../include/acl_selectors.php:264
-msgid "Other networks and post services"
+#: ../../Zotlabs/Lib/Enotify.php:291
+msgid "[Hubzilla:Notify] Friend suggestion received"
+msgstr ""
+
+#: ../../Zotlabs/Lib/Enotify.php:292
+#, php-format
+msgid "%1$s, you've received a friend suggestion from '%2$s' at %3$s"
 msgstr ""
 
-#: ../../include/acl_selectors.php:294
+#: ../../Zotlabs/Lib/Enotify.php:293
 #, 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."
+"%1$s, you've received [zrl=%2$s]a friend suggestion[/zrl] for %3$s from %4$s."
 msgstr ""
 
-#: ../../include/profile_selectors.php:6
-msgid "Currently Male"
+#: ../../Zotlabs/Lib/Enotify.php:299
+msgid "Name:"
 msgstr ""
 
-#: ../../include/profile_selectors.php:6
-msgid "Currently Female"
+#: ../../Zotlabs/Lib/Enotify.php:300
+msgid "Photo:"
 msgstr ""
 
-#: ../../include/profile_selectors.php:6
-msgid "Mostly Male"
+#: ../../Zotlabs/Lib/Enotify.php:303
+#, php-format
+msgid "Please visit %s to approve or reject the suggestion."
 msgstr ""
 
-#: ../../include/profile_selectors.php:6
-msgid "Mostly Female"
+#: ../../Zotlabs/Lib/Enotify.php:518
+msgid "[Hubzilla:Notify]"
 msgstr ""
 
-#: ../../include/profile_selectors.php:6
-msgid "Transgender"
+#: ../../Zotlabs/Lib/Enotify.php:667
+msgid "created a new post"
 msgstr ""
 
-#: ../../include/profile_selectors.php:6
-msgid "Intersex"
+#: ../../Zotlabs/Lib/Enotify.php:668
+#, php-format
+msgid "commented on %s's post"
 msgstr ""
 
-#: ../../include/profile_selectors.php:6
-msgid "Transsexual"
+#: ../../Zotlabs/Lib/ThreadItem.php:95 ../../include/conversation.php:664
+msgid "Private Message"
 msgstr ""
 
-#: ../../include/profile_selectors.php:6
-msgid "Hermaphrodite"
+#: ../../Zotlabs/Lib/ThreadItem.php:132 ../../include/conversation.php:656
+msgid "Select"
 msgstr ""
 
-#: ../../include/profile_selectors.php:6
-msgid "Neuter"
+#: ../../Zotlabs/Lib/ThreadItem.php:136
+msgid "Save to Folder"
 msgstr ""
 
-#: ../../include/profile_selectors.php:6
-msgid "Non-specific"
+#: ../../Zotlabs/Lib/ThreadItem.php:157
+msgid "I will attend"
 msgstr ""
 
-#: ../../include/profile_selectors.php:6
-#: ../../include/profile_selectors.php:23
-#: ../../include/profile_selectors.php:61
-#: ../../include/profile_selectors.php:97 ../../include/permissions.php:881
-msgid "Other"
+#: ../../Zotlabs/Lib/ThreadItem.php:157
+msgid "I will not attend"
 msgstr ""
 
-#: ../../include/profile_selectors.php:6
-msgid "Undecided"
+#: ../../Zotlabs/Lib/ThreadItem.php:157
+msgid "I might attend"
 msgstr ""
 
-#: ../../include/profile_selectors.php:42
-#: ../../include/profile_selectors.php:61
-msgid "Males"
+#: ../../Zotlabs/Lib/ThreadItem.php:167
+msgid "I agree"
 msgstr ""
 
-#: ../../include/profile_selectors.php:42
-#: ../../include/profile_selectors.php:61
-msgid "Females"
+#: ../../Zotlabs/Lib/ThreadItem.php:167
+msgid "I disagree"
 msgstr ""
 
-#: ../../include/profile_selectors.php:42
-msgid "Gay"
+#: ../../Zotlabs/Lib/ThreadItem.php:167
+msgid "I abstain"
 msgstr ""
 
-#: ../../include/profile_selectors.php:42
-msgid "Lesbian"
+#: ../../Zotlabs/Lib/ThreadItem.php:218
+msgid "Add Star"
 msgstr ""
 
-#: ../../include/profile_selectors.php:42
-msgid "No Preference"
+#: ../../Zotlabs/Lib/ThreadItem.php:219
+msgid "Remove Star"
 msgstr ""
 
-#: ../../include/profile_selectors.php:42
-msgid "Bisexual"
+#: ../../Zotlabs/Lib/ThreadItem.php:220
+msgid "Toggle Star Status"
 msgstr ""
 
-#: ../../include/profile_selectors.php:42
-msgid "Autosexual"
+#: ../../Zotlabs/Lib/ThreadItem.php:224
+msgid "starred"
 msgstr ""
 
-#: ../../include/profile_selectors.php:42
-msgid "Abstinent"
+#: ../../Zotlabs/Lib/ThreadItem.php:234 ../../include/conversation.php:671
+msgid "Message signature validated"
 msgstr ""
 
-#: ../../include/profile_selectors.php:42
-msgid "Virgin"
+#: ../../Zotlabs/Lib/ThreadItem.php:235 ../../include/conversation.php:672
+msgid "Message signature incorrect"
 msgstr ""
 
-#: ../../include/profile_selectors.php:42
-msgid "Deviant"
+#: ../../Zotlabs/Lib/ThreadItem.php:243
+msgid "Add Tag"
 msgstr ""
 
-#: ../../include/profile_selectors.php:42
-msgid "Fetish"
+#: ../../Zotlabs/Lib/ThreadItem.php:261 ../../include/taxonomy.php:316
+msgid "like"
 msgstr ""
 
-#: ../../include/profile_selectors.php:42
-msgid "Oodles"
+#: ../../Zotlabs/Lib/ThreadItem.php:262 ../../include/taxonomy.php:317
+msgid "dislike"
 msgstr ""
 
-#: ../../include/profile_selectors.php:42
-msgid "Nonsexual"
+#: ../../Zotlabs/Lib/ThreadItem.php:266
+msgid "Share This"
 msgstr ""
 
-#: ../../include/profile_selectors.php:80
-#: ../../include/profile_selectors.php:97
-msgid "Single"
+#: ../../Zotlabs/Lib/ThreadItem.php:266
+msgid "share"
 msgstr ""
 
-#: ../../include/profile_selectors.php:80
-msgid "Lonely"
+#: ../../Zotlabs/Lib/ThreadItem.php:275
+msgid "Delivery Report"
 msgstr ""
 
-#: ../../include/profile_selectors.php:80
-msgid "Available"
+#: ../../Zotlabs/Lib/ThreadItem.php:293
+#, php-format
+msgid "%d comment"
+msgid_plural "%d comments"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../../Zotlabs/Lib/ThreadItem.php:322 ../../Zotlabs/Lib/ThreadItem.php:323
+#, php-format
+msgid "View %s's profile - %s"
 msgstr ""
 
-#: ../../include/profile_selectors.php:80
-msgid "Unavailable"
+#: ../../Zotlabs/Lib/ThreadItem.php:326
+msgid "to"
 msgstr ""
 
-#: ../../include/profile_selectors.php:80
-msgid "Has crush"
+#: ../../Zotlabs/Lib/ThreadItem.php:327
+msgid "via"
 msgstr ""
 
-#: ../../include/profile_selectors.php:80
-msgid "Infatuated"
+#: ../../Zotlabs/Lib/ThreadItem.php:328
+msgid "Wall-to-Wall"
 msgstr ""
 
-#: ../../include/profile_selectors.php:80
-#: ../../include/profile_selectors.php:97
-msgid "Dating"
+#: ../../Zotlabs/Lib/ThreadItem.php:329
+msgid "via Wall-To-Wall:"
 msgstr ""
 
-#: ../../include/profile_selectors.php:80
-msgid "Unfaithful"
+#: ../../Zotlabs/Lib/ThreadItem.php:341 ../../include/conversation.php:719
+#, php-format
+msgid "from %s"
 msgstr ""
 
-#: ../../include/profile_selectors.php:80
-msgid "Sex Addict"
+#: ../../Zotlabs/Lib/ThreadItem.php:344 ../../include/conversation.php:722
+#, php-format
+msgid "last edited: %s"
 msgstr ""
 
-#: ../../include/profile_selectors.php:80
-msgid "Friends/Benefits"
+#: ../../Zotlabs/Lib/ThreadItem.php:345 ../../include/conversation.php:723
+#, php-format
+msgid "Expires: %s"
 msgstr ""
 
-#: ../../include/profile_selectors.php:80
-msgid "Casual"
+#: ../../Zotlabs/Lib/ThreadItem.php:370
+msgid "Save Bookmarks"
 msgstr ""
 
-#: ../../include/profile_selectors.php:80
-msgid "Engaged"
+#: ../../Zotlabs/Lib/ThreadItem.php:371
+msgid "Add to Calendar"
 msgstr ""
 
-#: ../../include/profile_selectors.php:80
-#: ../../include/profile_selectors.php:97
-msgid "Married"
+#: ../../Zotlabs/Lib/ThreadItem.php:380
+msgid "Mark all seen"
 msgstr ""
 
-#: ../../include/profile_selectors.php:80
-msgid "Imaginarily married"
+#: ../../Zotlabs/Lib/ThreadItem.php:421 ../../include/js_strings.php:7
+msgid "[+] show all"
 msgstr ""
 
-#: ../../include/profile_selectors.php:80
-msgid "Partners"
+#: ../../Zotlabs/Lib/ThreadItem.php:711 ../../include/conversation.php:1215
+msgid "Bold"
 msgstr ""
 
-#: ../../include/profile_selectors.php:80
-#: ../../include/profile_selectors.php:97
-msgid "Cohabiting"
+#: ../../Zotlabs/Lib/ThreadItem.php:712 ../../include/conversation.php:1216
+msgid "Italic"
 msgstr ""
 
-#: ../../include/profile_selectors.php:80
-msgid "Common law"
+#: ../../Zotlabs/Lib/ThreadItem.php:713 ../../include/conversation.php:1217
+msgid "Underline"
 msgstr ""
 
-#: ../../include/profile_selectors.php:80
-msgid "Happy"
+#: ../../Zotlabs/Lib/ThreadItem.php:714 ../../include/conversation.php:1218
+msgid "Quote"
 msgstr ""
 
-#: ../../include/profile_selectors.php:80
-msgid "Not looking"
+#: ../../Zotlabs/Lib/ThreadItem.php:715 ../../include/conversation.php:1219
+msgid "Code"
 msgstr ""
 
-#: ../../include/profile_selectors.php:80
-msgid "Swinger"
+#: ../../Zotlabs/Lib/ThreadItem.php:716
+msgid "Image"
 msgstr ""
 
-#: ../../include/profile_selectors.php:80
-msgid "Betrayed"
+#: ../../Zotlabs/Lib/ThreadItem.php:717
+msgid "Insert Link"
 msgstr ""
 
-#: ../../include/profile_selectors.php:80
-#: ../../include/profile_selectors.php:97
-msgid "Separated"
+#: ../../Zotlabs/Lib/ThreadItem.php:718
+msgid "Video"
 msgstr ""
 
-#: ../../include/profile_selectors.php:80
-msgid "Unstable"
+#: ../../include/Import/import_diaspora.php:16
+msgid "No username found in import file."
 msgstr ""
 
-#: ../../include/profile_selectors.php:80
-#: ../../include/profile_selectors.php:97
-msgid "Divorced"
+#: ../../include/Import/import_diaspora.php:41 ../../include/import.php:50
+msgid "Unable to create a unique channel address. Import failed."
 msgstr ""
 
-#: ../../include/profile_selectors.php:80
-msgid "Imaginarily divorced"
+#: ../../include/dba/dba_driver.php:171
+#, php-format
+msgid "Cannot locate DNS info for database server '%s'"
 msgstr ""
 
-#: ../../include/profile_selectors.php:80
-#: ../../include/profile_selectors.php:97
-msgid "Widowed"
+#: ../../include/taxonomy.php:188 ../../include/taxonomy.php:270
+#: ../../include/widgets.php:46 ../../include/widgets.php:429
+#: ../../include/contact_widgets.php:91
+msgid "Categories"
 msgstr ""
 
-#: ../../include/profile_selectors.php:80
-msgid "Uncertain"
+#: ../../include/taxonomy.php:228 ../../include/taxonomy.php:249
+msgid "Tags"
 msgstr ""
 
-#: ../../include/profile_selectors.php:80
-#: ../../include/profile_selectors.php:97
-msgid "It's complicated"
+#: ../../include/taxonomy.php:293
+msgid "Keywords"
 msgstr ""
 
-#: ../../include/profile_selectors.php:80
-msgid "Don't care"
+#: ../../include/taxonomy.php:314
+msgid "have"
 msgstr ""
 
-#: ../../include/profile_selectors.php:80
-msgid "Ask me"
+#: ../../include/taxonomy.php:314
+msgid "has"
 msgstr ""
 
-#: ../../include/activities.php:42
-msgid " and "
+#: ../../include/taxonomy.php:315
+msgid "want"
 msgstr ""
 
-#: ../../include/activities.php:50
-msgid "public profile"
+#: ../../include/taxonomy.php:315
+msgid "wants"
 msgstr ""
 
-#: ../../include/activities.php:59
+#: ../../include/taxonomy.php:316
+msgid "likes"
+msgstr ""
+
+#: ../../include/taxonomy.php:317
+msgid "dislikes"
+msgstr ""
+
+#: ../../include/event.php:22 ../../include/event.php:69
+#: ../../include/bb2diaspora.php:485
+msgid "l F d, Y \\@ g:i A"
+msgstr ""
+
+#: ../../include/event.php:30 ../../include/event.php:73
+#: ../../include/bb2diaspora.php:491
+msgid "Starts:"
+msgstr ""
+
+#: ../../include/event.php:40 ../../include/event.php:77
+#: ../../include/bb2diaspora.php:499
+msgid "Finishes:"
+msgstr ""
+
+#: ../../include/event.php:812
+msgid "This event has been added to your calendar."
+msgstr ""
+
+#: ../../include/event.php:1012
+msgid "Not specified"
+msgstr ""
+
+#: ../../include/event.php:1013
+msgid "Needs Action"
+msgstr ""
+
+#: ../../include/event.php:1014
+msgid "Completed"
+msgstr ""
+
+#: ../../include/event.php:1015
+msgid "In Process"
+msgstr ""
+
+#: ../../include/event.php:1016
+msgid "Cancelled"
+msgstr ""
+
+#: ../../include/import.php:29
+msgid ""
+"Cannot create a duplicate channel identifier on this system. Import failed."
+msgstr ""
+
+#: ../../include/import.php:76
+msgid "Channel clone failed. Import failed."
+msgstr ""
+
+#: ../../include/items.php:892 ../../include/items.php:937
+msgid "(Unknown)"
+msgstr ""
+
+#: ../../include/items.php:1136
+msgid "Visible to anybody on the internet."
+msgstr ""
+
+#: ../../include/items.php:1138
+msgid "Visible to you only."
+msgstr ""
+
+#: ../../include/items.php:1140
+msgid "Visible to anybody in this network."
+msgstr ""
+
+#: ../../include/items.php:1142
+msgid "Visible to anybody authenticated."
+msgstr ""
+
+#: ../../include/items.php:1144
 #, php-format
-msgid "%1$s changed %2$s to &ldquo;%3$s&rdquo;"
+msgid "Visible to anybody on %s."
 msgstr ""
 
-#: ../../include/activities.php:60
+#: ../../include/items.php:1146
+msgid "Visible to all connections."
+msgstr ""
+
+#: ../../include/items.php:1148
+msgid "Visible to approved connections."
+msgstr ""
+
+#: ../../include/items.php:1150
+msgid "Visible to specific connections."
+msgstr ""
+
+#: ../../include/items.php:3909
+msgid "Privacy group is empty."
+msgstr ""
+
+#: ../../include/items.php:3916
 #, php-format
-msgid "Visit %1$s's %2$s"
+msgid "Privacy group: %s"
+msgstr ""
+
+#: ../../include/items.php:3928
+msgid "Connection not found."
+msgstr ""
+
+#: ../../include/items.php:4277
+msgid "profile photo"
+msgstr ""
+
+#: ../../include/message.php:20
+msgid "No recipient provided."
+msgstr ""
+
+#: ../../include/message.php:25
+msgid "[no subject]"
+msgstr ""
+
+#: ../../include/message.php:45
+msgid "Unable to determine sender."
+msgstr ""
+
+#: ../../include/message.php:222
+msgid "Stored post could not be verified."
+msgstr ""
+
+#: ../../include/text.php:428
+msgid "prev"
+msgstr ""
+
+#: ../../include/text.php:430
+msgid "first"
 msgstr ""
 
-#: ../../include/activities.php:63
+#: ../../include/text.php:459
+msgid "last"
+msgstr ""
+
+#: ../../include/text.php:462
+msgid "next"
+msgstr ""
+
+#: ../../include/text.php:472
+msgid "older"
+msgstr ""
+
+#: ../../include/text.php:474
+msgid "newer"
+msgstr ""
+
+#: ../../include/text.php:863
+msgid "No connections"
+msgstr ""
+
+#: ../../include/text.php:888
 #, php-format
-msgid "%1$s has an updated %2$s, changing %3$s."
+msgid "View all %s connections"
 msgstr ""
 
-#: ../../include/apps.php:155
-msgid "Site Admin"
+#: ../../include/text.php:1033 ../../include/text.php:1038
+msgid "poke"
 msgstr ""
 
-#: ../../include/apps.php:156
-msgid "Bug Report"
+#: ../../include/text.php:1033 ../../include/text.php:1038
+#: ../../include/conversation.php:243
+msgid "poked"
 msgstr ""
 
-#: ../../include/apps.php:157
-msgid "View Bookmarks"
+#: ../../include/text.php:1039
+msgid "ping"
 msgstr ""
 
-#: ../../include/apps.php:158
-msgid "My Chatrooms"
+#: ../../include/text.php:1039
+msgid "pinged"
 msgstr ""
 
-#: ../../include/apps.php:160
-msgid "Firefox Share"
+#: ../../include/text.php:1040
+msgid "prod"
 msgstr ""
 
-#: ../../include/apps.php:161
-msgid "Remote Diagnostics"
+#: ../../include/text.php:1040
+msgid "prodded"
 msgstr ""
 
-#: ../../include/apps.php:162 ../../include/features.php:89
-msgid "Suggest Channels"
+#: ../../include/text.php:1041
+msgid "slap"
 msgstr ""
 
-#: ../../include/apps.php:163 ../../include/nav.php:110 ../../boot.php:1615
-msgid "Login"
+#: ../../include/text.php:1041
+msgid "slapped"
 msgstr ""
 
-#: ../../include/apps.php:165 ../../include/nav.php:179
-msgid "Grid"
+#: ../../include/text.php:1042
+msgid "finger"
 msgstr ""
 
-#: ../../include/apps.php:169 ../../include/nav.php:182
-msgid "Channel Home"
+#: ../../include/text.php:1042
+msgid "fingered"
 msgstr ""
 
-#: ../../include/apps.php:172 ../../include/conversation.php:1659
-#: ../../include/conversation.php:1662 ../../include/nav.php:201
-msgid "Events"
+#: ../../include/text.php:1043
+msgid "rebuff"
 msgstr ""
 
-#: ../../include/apps.php:173 ../../include/nav.php:167
-msgid "Directory"
+#: ../../include/text.php:1043
+msgid "rebuffed"
 msgstr ""
 
-#: ../../include/apps.php:175 ../../include/nav.php:193
-msgid "Mail"
+#: ../../include/text.php:1055
+msgid "happy"
 msgstr ""
 
-#: ../../include/apps.php:178 ../../include/nav.php:96
-msgid "Chat"
+#: ../../include/text.php:1056
+msgid "sad"
 msgstr ""
 
-#: ../../include/apps.php:180
-msgid "Probe"
+#: ../../include/text.php:1057
+msgid "mellow"
 msgstr ""
 
-#: ../../include/apps.php:181
-msgid "Suggest"
+#: ../../include/text.php:1058
+msgid "tired"
 msgstr ""
 
-#: ../../include/apps.php:182
-msgid "Random Channel"
+#: ../../include/text.php:1059
+msgid "perky"
 msgstr ""
 
-#: ../../include/apps.php:183
-msgid "Invite"
+#: ../../include/text.php:1060
+msgid "angry"
 msgstr ""
 
-#: ../../include/apps.php:184 ../../include/widgets.php:1387
-msgid "Features"
+#: ../../include/text.php:1061
+msgid "stupefied"
 msgstr ""
 
-#: ../../include/apps.php:186
-msgid "Post"
+#: ../../include/text.php:1062
+msgid "puzzled"
 msgstr ""
 
-#: ../../include/apps.php:284
-msgid "Install"
+#: ../../include/text.php:1063
+msgid "interested"
 msgstr ""
 
-#: ../../include/apps.php:289
-msgid "Purchase"
+#: ../../include/text.php:1064
+msgid "bitter"
 msgstr ""
 
-#: ../../include/photos.php:112
-#, php-format
-msgid "Image exceeds website size limit of %lu bytes"
+#: ../../include/text.php:1065
+msgid "cheerful"
 msgstr ""
 
-#: ../../include/photos.php:119
-msgid "Image file is empty."
+#: ../../include/text.php:1066
+msgid "alive"
 msgstr ""
 
-#: ../../include/photos.php:257
-msgid "Photo storage failed."
+#: ../../include/text.php:1067
+msgid "annoyed"
 msgstr ""
 
-#: ../../include/photos.php:297
-msgid "a new photo"
+#: ../../include/text.php:1068
+msgid "anxious"
 msgstr ""
 
-#: ../../include/photos.php:301
-#, php-format
-msgctxt "photo_upload"
-msgid "%1$s posted %2$s to %3$s"
+#: ../../include/text.php:1069
+msgid "cranky"
 msgstr ""
 
-#: ../../include/photos.php:506 ../../include/conversation.php:1645
-msgid "Photo Albums"
+#: ../../include/text.php:1070
+msgid "disturbed"
 msgstr ""
 
-#: ../../include/photos.php:510
-msgid "Upload New Photos"
+#: ../../include/text.php:1071
+msgid "frustrated"
 msgstr ""
 
-#: ../../include/bb2diaspora.php:398
-msgid "Attachments:"
+#: ../../include/text.php:1072
+msgid "depressed"
 msgstr ""
 
-#: ../../include/bb2diaspora.php:487 ../../include/event.php:22
-#: ../../include/text.php:1466
-msgid "l F d, Y \\@ g:i A"
+#: ../../include/text.php:1073
+msgid "motivated"
 msgstr ""
 
-#: ../../include/bb2diaspora.php:489
-msgid "$Projectname event notification:"
+#: ../../include/text.php:1074
+msgid "relaxed"
 msgstr ""
 
-#: ../../include/bb2diaspora.php:493 ../../include/event.php:30
-#: ../../include/text.php:1470
-msgid "Starts:"
+#: ../../include/text.php:1075
+msgid "surprised"
 msgstr ""
 
-#: ../../include/bb2diaspora.php:501 ../../include/event.php:40
-#: ../../include/text.php:1474
-msgid "Finishes:"
+#: ../../include/text.php:1257 ../../include/js_strings.php:70
+msgid "Monday"
 msgstr ""
 
-#: ../../include/event.php:779
-msgid "This event has been added to your calendar."
+#: ../../include/text.php:1257 ../../include/js_strings.php:71
+msgid "Tuesday"
 msgstr ""
 
-#: ../../include/event.php:978
-msgid "Not specified"
+#: ../../include/text.php:1257 ../../include/js_strings.php:72
+msgid "Wednesday"
 msgstr ""
 
-#: ../../include/event.php:979
-msgid "Needs Action"
+#: ../../include/text.php:1257 ../../include/js_strings.php:73
+msgid "Thursday"
 msgstr ""
 
-#: ../../include/event.php:980
-msgid "Completed"
+#: ../../include/text.php:1257 ../../include/js_strings.php:74
+msgid "Friday"
 msgstr ""
 
-#: ../../include/event.php:981
-msgid "In Process"
+#: ../../include/text.php:1257 ../../include/js_strings.php:75
+msgid "Saturday"
 msgstr ""
 
-#: ../../include/event.php:982
-msgid "Cancelled"
+#: ../../include/text.php:1257 ../../include/js_strings.php:69
+msgid "Sunday"
 msgstr ""
 
-#: ../../include/widgets.php:46 ../../include/widgets.php:429
-#: ../../include/contact_widgets.php:97 ../../include/taxonomy.php:188
-#: ../../include/taxonomy.php:270
-msgid "Categories"
+#: ../../include/text.php:1261 ../../include/js_strings.php:45
+msgid "January"
+msgstr ""
+
+#: ../../include/text.php:1261 ../../include/js_strings.php:46
+msgid "February"
+msgstr ""
+
+#: ../../include/text.php:1261 ../../include/js_strings.php:47
+msgid "March"
+msgstr ""
+
+#: ../../include/text.php:1261 ../../include/js_strings.php:48
+msgid "April"
+msgstr ""
+
+#: ../../include/text.php:1261
+msgid "May"
+msgstr ""
+
+#: ../../include/text.php:1261 ../../include/js_strings.php:50
+msgid "June"
+msgstr ""
+
+#: ../../include/text.php:1261 ../../include/js_strings.php:51
+msgid "July"
+msgstr ""
+
+#: ../../include/text.php:1261 ../../include/js_strings.php:52
+msgid "August"
+msgstr ""
+
+#: ../../include/text.php:1261 ../../include/js_strings.php:53
+msgid "September"
+msgstr ""
+
+#: ../../include/text.php:1261 ../../include/js_strings.php:54
+msgid "October"
+msgstr ""
+
+#: ../../include/text.php:1261 ../../include/js_strings.php:55
+msgid "November"
+msgstr ""
+
+#: ../../include/text.php:1261 ../../include/js_strings.php:56
+msgid "December"
+msgstr ""
+
+#: ../../include/text.php:1338 ../../include/text.php:1342
+msgid "Unknown Attachment"
+msgstr ""
+
+#: ../../include/text.php:1344
+msgid "unknown"
+msgstr ""
+
+#: ../../include/text.php:1380
+msgid "remove category"
+msgstr ""
+
+#: ../../include/text.php:1457
+msgid "remove from file"
+msgstr ""
+
+#: ../../include/text.php:1753 ../../include/text.php:1824
+msgid "default"
+msgstr ""
+
+#: ../../include/text.php:1761
+msgid "Page layout"
+msgstr ""
+
+#: ../../include/text.php:1761
+msgid "You can create your own with the layouts tool"
+msgstr ""
+
+#: ../../include/text.php:1803
+msgid "Page content type"
+msgstr ""
+
+#: ../../include/text.php:1836
+msgid "Select an alternate language"
+msgstr ""
+
+#: ../../include/text.php:1953
+msgid "activity"
+msgstr ""
+
+#: ../../include/text.php:2262
+msgid "Design Tools"
+msgstr ""
+
+#: ../../include/text.php:2268
+msgid "Pages"
 msgstr ""
 
 #: ../../include/widgets.php:103
@@ -6978,13 +7246,13 @@ msgstr ""
 msgid "add"
 msgstr ""
 
-#: ../../include/widgets.php:310 ../../include/contact_widgets.php:57
-#: ../../include/features.php:97
+#: ../../include/widgets.php:310 ../../include/contact_widgets.php:53
+#: ../../include/features.php:98
 msgid "Saved Folders"
 msgstr ""
 
 #: ../../include/widgets.php:313 ../../include/widgets.php:432
-#: ../../include/contact_widgets.php:60 ../../include/contact_widgets.php:100
+#: ../../include/contact_widgets.php:56 ../../include/contact_widgets.php:94
 msgid "Everything"
 msgstr ""
 
@@ -7100,143 +7368,193 @@ msgstr ""
 msgid "Import Calendar"
 msgstr ""
 
-#: ../../include/widgets.php:843 ../../include/conversation.php:1673
-#: ../../include/conversation.php:1676
+#: ../../include/widgets.php:842 ../../include/conversation.php:1662
+#: ../../include/conversation.php:1665
 msgid "Chatrooms"
 msgstr ""
 
-#: ../../include/widgets.php:847
+#: ../../include/widgets.php:846
 msgid "Overview"
 msgstr ""
 
-#: ../../include/widgets.php:854
+#: ../../include/widgets.php:853
 msgid "Chat Members"
 msgstr ""
 
-#: ../../include/widgets.php:877
+#: ../../include/widgets.php:876
 msgid "Bookmarked Chatrooms"
 msgstr ""
 
-#: ../../include/widgets.php:900
+#: ../../include/widgets.php:899
 msgid "Suggested Chatrooms"
 msgstr ""
 
-#: ../../include/widgets.php:1045 ../../include/widgets.php:1157
+#: ../../include/widgets.php:1044 ../../include/widgets.php:1156
 msgid "photo/image"
 msgstr ""
 
-#: ../../include/widgets.php:1100
+#: ../../include/widgets.php:1099
 msgid "Click to show more"
 msgstr ""
 
-#: ../../include/widgets.php:1251
+#: ../../include/widgets.php:1250
 msgid "Rating Tools"
 msgstr ""
 
-#: ../../include/widgets.php:1255 ../../include/widgets.php:1257
+#: ../../include/widgets.php:1254 ../../include/widgets.php:1256
 msgid "Rate Me"
 msgstr ""
 
-#: ../../include/widgets.php:1260
+#: ../../include/widgets.php:1259
 msgid "View Ratings"
 msgstr ""
 
-#: ../../include/widgets.php:1317
+#: ../../include/widgets.php:1316
 msgid "Forums"
 msgstr ""
 
-#: ../../include/widgets.php:1346
+#: ../../include/widgets.php:1345
 msgid "Tasks"
 msgstr ""
 
-#: ../../include/widgets.php:1355
+#: ../../include/widgets.php:1354
 msgid "Documentation"
 msgstr ""
 
-#: ../../include/widgets.php:1357
+#: ../../include/widgets.php:1356
 msgid "Project/Site Information"
 msgstr ""
 
-#: ../../include/widgets.php:1358
+#: ../../include/widgets.php:1357
 msgid "For Members"
 msgstr ""
 
-#: ../../include/widgets.php:1359
+#: ../../include/widgets.php:1358
 msgid "For Administrators"
 msgstr ""
 
-#: ../../include/widgets.php:1360
+#: ../../include/widgets.php:1359
 msgid "For Developers"
 msgstr ""
 
-#: ../../include/widgets.php:1384
-msgid "Accounts"
-msgstr ""
-
-#: ../../include/widgets.php:1384 ../../include/widgets.php:1422
+#: ../../include/widgets.php:1383 ../../include/widgets.php:1421
 msgid "Member registrations waiting for confirmation"
 msgstr ""
 
-#: ../../include/widgets.php:1390
+#: ../../include/widgets.php:1389
 msgid "Inspect queue"
 msgstr ""
 
-#: ../../include/widgets.php:1392
+#: ../../include/widgets.php:1391
 msgid "DB updates"
 msgstr ""
 
-#: ../../include/widgets.php:1417 ../../include/nav.php:216
+#: ../../include/widgets.php:1416 ../../include/nav.php:216
 msgid "Admin"
 msgstr ""
 
-#: ../../include/widgets.php:1418
+#: ../../include/widgets.php:1417
 msgid "Plugin Features"
 msgstr ""
 
+#: ../../include/follow.php:27
+msgid "Channel is blocked on this site."
+msgstr ""
+
+#: ../../include/follow.php:32
+msgid "Channel location missing."
+msgstr ""
+
+#: ../../include/follow.php:81
+msgid "Response from remote channel was incomplete."
+msgstr ""
+
+#: ../../include/follow.php:98
+msgid "Channel was deleted and no longer exists."
+msgstr ""
+
+#: ../../include/follow.php:154 ../../include/follow.php:190
+msgid "Protocol disabled."
+msgstr ""
+
+#: ../../include/follow.php:178
+msgid "Channel discovery failed."
+msgstr ""
+
+#: ../../include/follow.php:216
+msgid "Cannot connect to yourself."
+msgstr ""
+
 #: ../../include/bookmarks.php:35
 #, php-format
 msgid "%1$s's bookmarks"
 msgstr ""
 
-#: ../../include/chat.php:23
-msgid "Missing room name"
+#: ../../include/api.php:1336
+msgid "Public Timeline"
 msgstr ""
 
-#: ../../include/chat.php:32
-msgid "Duplicate room name"
+#: ../../include/bbcode.php:123 ../../include/bbcode.php:844
+#: ../../include/bbcode.php:847 ../../include/bbcode.php:852
+#: ../../include/bbcode.php:855 ../../include/bbcode.php:858
+#: ../../include/bbcode.php:861 ../../include/bbcode.php:866
+#: ../../include/bbcode.php:869 ../../include/bbcode.php:874
+#: ../../include/bbcode.php:877 ../../include/bbcode.php:880
+#: ../../include/bbcode.php:883
+msgid "Image/photo"
 msgstr ""
 
-#: ../../include/chat.php:82 ../../include/chat.php:90
-msgid "Invalid room specifier."
+#: ../../include/bbcode.php:162 ../../include/bbcode.php:894
+msgid "Encrypted content"
 msgstr ""
 
-#: ../../include/chat.php:122
-msgid "Room not found."
+#: ../../include/bbcode.php:178
+#, php-format
+msgid "Install %s element: "
 msgstr ""
 
-#: ../../include/chat.php:143
-msgid "Room is full"
+#: ../../include/bbcode.php:182
+#, php-format
+msgid ""
+"This post contains an installable %s element, however you lack permissions "
+"to install it on this site."
 msgstr ""
 
-#: ../../include/Contact.php:118
-msgid "New window"
+#: ../../include/bbcode.php:254
+#, php-format
+msgid "%1$s wrote the following %2$s %3$s"
 msgstr ""
 
-#: ../../include/Contact.php:119
-msgid "Open the selected location in a different window or browser tab"
+#: ../../include/bbcode.php:331 ../../include/bbcode.php:339
+msgid "Click to open/close"
 msgstr ""
 
-#: ../../include/Contact.php:237
-#, php-format
-msgid "User '%s' deleted"
+#: ../../include/bbcode.php:339
+msgid "spoiler"
 msgstr ""
 
-#: ../../include/auth.php:105
-msgid "Logged out."
+#: ../../include/bbcode.php:585
+msgid "Different viewers will see this text differently"
 msgstr ""
 
-#: ../../include/auth.php:212
-msgid "Failed authentication"
+#: ../../include/bbcode.php:832
+msgid "$1 wrote:"
+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/security.php:383
@@ -7245,981 +7563,1100 @@ msgid ""
 "form has been opened for too long (>3 hours) before submitting it."
 msgstr ""
 
-#: ../../include/import.php:23
-msgid ""
-"Cannot create a duplicate channel identifier on this system. Import failed."
+#: ../../include/nav.php:82 ../../include/nav.php:113 ../../boot.php:1702
+msgid "Logout"
 msgstr ""
 
-#: ../../include/import.php:70
-msgid "Channel clone failed. Import failed."
+#: ../../include/nav.php:82 ../../include/nav.php:113
+msgid "End this session"
 msgstr ""
 
-#: ../../include/items.php:1138 ../../include/items.php:1183
-msgid "(Unknown)"
+#: ../../include/nav.php:85 ../../include/nav.php:144
+msgid "Home"
 msgstr ""
 
-#: ../../include/items.php:1382
-msgid "Visible to anybody on the internet."
+#: ../../include/nav.php:85
+msgid "Your posts and conversations"
 msgstr ""
 
-#: ../../include/items.php:1384
-msgid "Visible to you only."
+#: ../../include/nav.php:86
+msgid "Your profile page"
 msgstr ""
 
-#: ../../include/items.php:1386
-msgid "Visible to anybody in this network."
+#: ../../include/nav.php:88
+msgid "Manage/Edit profiles"
 msgstr ""
 
-#: ../../include/items.php:1388
-msgid "Visible to anybody authenticated."
+#: ../../include/nav.php:90 ../../include/channel.php:941
+msgid "Edit Profile"
 msgstr ""
 
-#: ../../include/items.php:1390
-#, php-format
-msgid "Visible to anybody on %s."
+#: ../../include/nav.php:90
+msgid "Edit your profile"
 msgstr ""
 
-#: ../../include/items.php:1392
-msgid "Visible to all connections."
+#: ../../include/nav.php:92
+msgid "Your photos"
 msgstr ""
 
-#: ../../include/items.php:1394
-msgid "Visible to approved connections."
+#: ../../include/nav.php:93
+msgid "Your files"
 msgstr ""
 
-#: ../../include/items.php:1396
-msgid "Visible to specific connections."
+#: ../../include/nav.php:96
+msgid "Your chatrooms"
 msgstr ""
 
-#: ../../include/items.php:5176
-msgid "Privacy group is empty."
+#: ../../include/nav.php:102 ../../include/conversation.php:1675
+msgid "Bookmarks"
+msgstr ""
+
+#: ../../include/nav.php:102
+msgid "Your bookmarks"
+msgstr ""
+
+#: ../../include/nav.php:106
+msgid "Your webpages"
 msgstr ""
 
-#: ../../include/items.php:5183
+#: ../../include/nav.php:110
+msgid "Sign in"
+msgstr ""
+
+#: ../../include/nav.php:127
 #, php-format
-msgid "Privacy group: %s"
+msgid "%s - click to logout"
 msgstr ""
 
-#: ../../include/items.php:5195
-msgid "Connection not found."
+#: ../../include/nav.php:130
+msgid "Remote authentication"
 msgstr ""
 
-#: ../../include/items.php:5628
-msgid "profile photo"
+#: ../../include/nav.php:130
+msgid "Click to authenticate to your home hub"
 msgstr ""
 
-#: ../../include/contact_selectors.php:56
-msgid "Frequently"
+#: ../../include/nav.php:144
+msgid "Home Page"
 msgstr ""
 
-#: ../../include/contact_selectors.php:57
-msgid "Hourly"
+#: ../../include/nav.php:147
+msgid "Create an account"
 msgstr ""
 
-#: ../../include/contact_selectors.php:58
-msgid "Twice daily"
+#: ../../include/nav.php:159
+msgid "Help and documentation"
 msgstr ""
 
-#: ../../include/contact_selectors.php:59
-msgid "Daily"
+#: ../../include/nav.php:163
+msgid "Applications, utilities, links, games"
 msgstr ""
 
-#: ../../include/contact_selectors.php:60
-msgid "Weekly"
+#: ../../include/nav.php:165
+msgid "Search site @name, #tag, ?docs, content"
 msgstr ""
 
-#: ../../include/contact_selectors.php:61
-msgid "Monthly"
+#: ../../include/nav.php:167
+msgid "Channel Directory"
 msgstr ""
 
-#: ../../include/contact_selectors.php:76
-#: ../../include/contact_selectors.php:77
-msgid "Friendica"
+#: ../../include/nav.php:179
+msgid "Your grid"
 msgstr ""
 
-#: ../../include/contact_selectors.php:78
-msgid "OStatus"
+#: ../../include/nav.php:180
+msgid "Mark all grid notifications seen"
 msgstr ""
 
-#: ../../include/contact_selectors.php:79
-msgid "GNU-Social"
+#: ../../include/nav.php:182
+msgid "Channel home"
 msgstr ""
 
-#: ../../include/contact_selectors.php:80
-msgid "RSS/Atom"
+#: ../../include/nav.php:183
+msgid "Mark all channel notifications seen"
 msgstr ""
 
-#: ../../include/contact_selectors.php:82
-msgid "Diaspora"
+#: ../../include/nav.php:189
+msgid "Notices"
 msgstr ""
 
-#: ../../include/contact_selectors.php:83
-msgid "Facebook"
+#: ../../include/nav.php:189
+msgid "Notifications"
 msgstr ""
 
-#: ../../include/contact_selectors.php:84
-msgid "Zot"
+#: ../../include/nav.php:190
+msgid "See all notifications"
 msgstr ""
 
-#: ../../include/contact_selectors.php:85
-msgid "LinkedIn"
+#: ../../include/nav.php:193
+msgid "Private mail"
 msgstr ""
 
-#: ../../include/contact_selectors.php:86
-msgid "XMPP/IM"
+#: ../../include/nav.php:194
+msgid "See all private messages"
 msgstr ""
 
-#: ../../include/contact_selectors.php:87
-msgid "MySpace"
+#: ../../include/nav.php:195
+msgid "Mark all private messages seen"
+msgstr ""
+
+#: ../../include/nav.php:201
+msgid "Event Calendar"
+msgstr ""
+
+#: ../../include/nav.php:202
+msgid "See all events"
+msgstr ""
+
+#: ../../include/nav.php:203
+msgid "Mark all events seen"
+msgstr ""
+
+#: ../../include/nav.php:206
+msgid "Manage Your Channels"
+msgstr ""
+
+#: ../../include/nav.php:208
+msgid "Account/Channel Settings"
 msgstr ""
 
-#: ../../include/contact_widgets.php:14
+#: ../../include/nav.php:216
+msgid "Site Setup and Configuration"
+msgstr ""
+
+#: ../../include/nav.php:247 ../../include/conversation.php:851
+msgid "Loading..."
+msgstr ""
+
+#: ../../include/nav.php:252
+msgid "@name, #tag, ?doc, content"
+msgstr ""
+
+#: ../../include/nav.php:253
+msgid "Please wait..."
+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/contact_widgets.php:11
 #, php-format
 msgid "%d invitation available"
 msgid_plural "%d invitations available"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../../include/contact_widgets.php:22
+#: ../../include/contact_widgets.php:19
 msgid "Find Channels"
 msgstr ""
 
-#: ../../include/contact_widgets.php:23
+#: ../../include/contact_widgets.php:20
 msgid "Enter name or interest"
 msgstr ""
 
-#: ../../include/contact_widgets.php:24
+#: ../../include/contact_widgets.php:21
 msgid "Connect/Follow"
 msgstr ""
 
-#: ../../include/contact_widgets.php:25
+#: ../../include/contact_widgets.php:22
 msgid "Examples: Robert Morgenstein, Fishing"
 msgstr ""
 
-#: ../../include/contact_widgets.php:29
+#: ../../include/contact_widgets.php:26
 msgid "Random Profile"
 msgstr ""
 
-#: ../../include/contact_widgets.php:30
+#: ../../include/contact_widgets.php:27
 msgid "Invite Friends"
 msgstr ""
 
-#: ../../include/contact_widgets.php:32
+#: ../../include/contact_widgets.php:29
 msgid "Advanced example: name=fred and country=iceland"
 msgstr ""
 
-#: ../../include/contact_widgets.php:130
+#: ../../include/contact_widgets.php:122
 #, php-format
 msgid "%d connection in common"
 msgid_plural "%d connections in common"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../../include/contact_widgets.php:135
+#: ../../include/contact_widgets.php:127
 msgid "show more"
 msgstr ""
 
-#: ../../include/attach.php:247 ../../include/attach.php:333
-msgid "Item was not found."
+#: ../../include/conversation.php:204
+#, php-format
+msgid "%1$s is now connected with %2$s"
 msgstr ""
 
-#: ../../include/attach.php:497
-msgid "No source file."
+#: ../../include/conversation.php:239
+#, php-format
+msgid "%1$s poked %2$s"
 msgstr ""
 
-#: ../../include/attach.php:519
-msgid "Cannot locate file to replace"
+#: ../../include/conversation.php:691
+#, php-format
+msgid "View %s's profile @ %s"
 msgstr ""
 
-#: ../../include/attach.php:537
-msgid "Cannot locate file to revise/update"
+#: ../../include/conversation.php:710
+msgid "Categories:"
 msgstr ""
 
-#: ../../include/attach.php:672
+#: ../../include/conversation.php:711
+msgid "Filed under:"
+msgstr ""
+
+#: ../../include/conversation.php:738
+msgid "View in context"
+msgstr ""
+
+#: ../../include/conversation.php:847
+msgid "remove"
+msgstr ""
+
+#: ../../include/conversation.php:852
+msgid "Delete Selected Items"
+msgstr ""
+
+#: ../../include/conversation.php:948
+msgid "View Source"
+msgstr ""
+
+#: ../../include/conversation.php:949
+msgid "Follow Thread"
+msgstr ""
+
+#: ../../include/conversation.php:950
+msgid "Unfollow Thread"
+msgstr ""
+
+#: ../../include/conversation.php:955
+msgid "Activity/Posts"
+msgstr ""
+
+#: ../../include/conversation.php:957
+msgid "Edit Connection"
+msgstr ""
+
+#: ../../include/conversation.php:958
+msgid "Message"
+msgstr ""
+
+#: ../../include/conversation.php:1075
 #, php-format
-msgid "File exceeds size limit of %d"
+msgid "%s likes this."
 msgstr ""
 
-#: ../../include/attach.php:686
+#: ../../include/conversation.php:1075
 #, php-format
-msgid "You have reached your limit of %1$.0f Mbytes attachment storage."
+msgid "%s doesn't like this."
 msgstr ""
 
-#: ../../include/attach.php:842
-msgid "File upload failed. Possible system limit or action terminated."
+#: ../../include/conversation.php:1079
+#, 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
+#, 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
+msgid "and"
 msgstr ""
 
-#: ../../include/attach.php:855
-msgid "Stored file could not be verified. Upload failed."
+#: ../../include/conversation.php:1090
+#, php-format
+msgid ", and %d other people"
+msgid_plural ", and %d other people"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../../include/conversation.php:1091
+#, php-format
+msgid "%s like this."
 msgstr ""
 
-#: ../../include/attach.php:909 ../../include/attach.php:925
-msgid "Path not available."
+#: ../../include/conversation.php:1091
+#, php-format
+msgid "%s don't like this."
 msgstr ""
 
-#: ../../include/attach.php:971 ../../include/attach.php:1123
-msgid "Empty pathname"
+#: ../../include/conversation.php:1130
+msgid "Set your location"
 msgstr ""
 
-#: ../../include/attach.php:997
-msgid "duplicate filename or path"
+#: ../../include/conversation.php:1131
+msgid "Clear browser location"
 msgstr ""
 
-#: ../../include/attach.php:1019
-msgid "Path not found."
+#: ../../include/conversation.php:1177
+msgid "Tag term:"
 msgstr ""
 
-#: ../../include/attach.php:1077
-msgid "mkdir failed."
+#: ../../include/conversation.php:1178
+msgid "Where are you right now?"
 msgstr ""
 
-#: ../../include/attach.php:1081
-msgid "database storage failed."
+#: ../../include/conversation.php:1210
+msgid "Page link name"
 msgstr ""
 
-#: ../../include/attach.php:1129
-msgid "Empty path"
+#: ../../include/conversation.php:1213
+msgid "Post as"
 msgstr ""
 
-#: ../../include/datetime.php:136
-msgid "Birthday"
+#: ../../include/conversation.php:1223
+msgid "Toggle voting"
 msgstr ""
 
-#: ../../include/datetime.php:138
-msgid "Age: "
+#: ../../include/conversation.php:1231
+msgid "Categories (optional, comma-separated list)"
 msgstr ""
 
-#: ../../include/datetime.php:140
-msgid "YYYY-MM-DD or MM-DD"
+#: ../../include/conversation.php:1254
+msgid "Set publish date"
 msgstr ""
 
-#: ../../include/datetime.php:273 ../../boot.php:2448
-msgid "never"
+#: ../../include/conversation.php:1258
+msgid "OK"
 msgstr ""
 
-#: ../../include/datetime.php:279
-msgid "less than a second ago"
+#: ../../include/conversation.php:1503
+msgid "Discover"
 msgstr ""
 
-#: ../../include/datetime.php:297
-#, php-format
-msgctxt "e.g. 22 hours ago, 1 minute ago"
-msgid "%1$d %2$s ago"
+#: ../../include/conversation.php:1506
+msgid "Imported public streams"
 msgstr ""
 
-#: ../../include/datetime.php:308
-msgctxt "relative_date"
-msgid "year"
-msgid_plural "years"
-msgstr[0] ""
-msgstr[1] ""
+#: ../../include/conversation.php:1511
+msgid "Commented Order"
+msgstr ""
 
-#: ../../include/datetime.php:311
-msgctxt "relative_date"
-msgid "month"
-msgid_plural "months"
-msgstr[0] ""
-msgstr[1] ""
+#: ../../include/conversation.php:1514
+msgid "Sort by Comment Date"
+msgstr ""
 
-#: ../../include/datetime.php:314
-msgctxt "relative_date"
-msgid "week"
-msgid_plural "weeks"
-msgstr[0] ""
-msgstr[1] ""
+#: ../../include/conversation.php:1518
+msgid "Posted Order"
+msgstr ""
 
-#: ../../include/datetime.php:317
-msgctxt "relative_date"
-msgid "day"
-msgid_plural "days"
-msgstr[0] ""
-msgstr[1] ""
+#: ../../include/conversation.php:1521
+msgid "Sort by Post Date"
+msgstr ""
 
-#: ../../include/datetime.php:320
-msgctxt "relative_date"
-msgid "hour"
-msgid_plural "hours"
-msgstr[0] ""
-msgstr[1] ""
+#: ../../include/conversation.php:1529
+msgid "Posts that mention or involve you"
+msgstr ""
 
-#: ../../include/datetime.php:323
-msgctxt "relative_date"
-msgid "minute"
-msgid_plural "minutes"
-msgstr[0] ""
-msgstr[1] ""
+#: ../../include/conversation.php:1538
+msgid "Activity Stream - by date"
+msgstr ""
 
-#: ../../include/datetime.php:326
-msgctxt "relative_date"
-msgid "second"
-msgid_plural "seconds"
-msgstr[0] ""
-msgstr[1] ""
+#: ../../include/conversation.php:1544
+msgid "Starred"
+msgstr ""
 
-#: ../../include/datetime.php:563
-#, php-format
-msgid "%1$s's birthday"
+#: ../../include/conversation.php:1547
+msgid "Favourite Posts"
 msgstr ""
 
-#: ../../include/datetime.php:564
-#, php-format
-msgid "Happy Birthday %1$s"
+#: ../../include/conversation.php:1554
+msgid "Spam"
 msgstr ""
 
-#: ../../include/dir_fns.php:139
-msgid "Directory Options"
+#: ../../include/conversation.php:1557
+msgid "Posts flagged as SPAM"
 msgstr ""
 
-#: ../../include/dir_fns.php:141
-msgid "Safe Mode"
+#: ../../include/conversation.php:1614
+msgid "Status Messages and Posts"
 msgstr ""
 
-#: ../../include/dir_fns.php:142
-msgid "Public Forums Only"
+#: ../../include/conversation.php:1623
+msgid "About"
 msgstr ""
 
-#: ../../include/dir_fns.php:143
-msgid "This Website Only"
+#: ../../include/conversation.php:1626
+msgid "Profile Details"
 msgstr ""
 
-#: ../../include/enotify.php:57 ../../include/network.php:1827
-msgid "$Projectname Notification"
+#: ../../include/conversation.php:1635 ../../include/photos.php:502
+msgid "Photo Albums"
 msgstr ""
 
-#: ../../include/enotify.php:58 ../../include/network.php:1828
-msgid "$projectname"
+#: ../../include/conversation.php:1642
+msgid "Files and Storage"
 msgstr ""
 
-#: ../../include/enotify.php:60 ../../include/network.php:1830
-msgid "Thank You,"
+#: ../../include/conversation.php:1678
+msgid "Saved Bookmarks"
 msgstr ""
 
-#: ../../include/enotify.php:62 ../../include/network.php:1832
-#, php-format
-msgid "%s Administrator"
+#: ../../include/conversation.php:1688
+msgid "Manage Webpages"
 msgstr ""
 
-#: ../../include/enotify.php:96
-#, php-format
-msgid "%s <!item_type!>"
+#: ../../include/conversation.php:1747
+msgctxt "noun"
+msgid "Attending"
+msgid_plural "Attending"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../../include/conversation.php:1750
+msgctxt "noun"
+msgid "Not Attending"
+msgid_plural "Not Attending"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../../include/conversation.php:1753
+msgctxt "noun"
+msgid "Undecided"
+msgid_plural "Undecided"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../../include/conversation.php:1756
+msgctxt "noun"
+msgid "Agree"
+msgid_plural "Agrees"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../../include/conversation.php:1759
+msgctxt "noun"
+msgid "Disagree"
+msgid_plural "Disagrees"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../../include/conversation.php:1762
+msgctxt "noun"
+msgid "Abstain"
+msgid_plural "Abstains"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../../include/selectors.php:30
+msgid "Frequently"
 msgstr ""
 
-#: ../../include/enotify.php:100
-#, php-format
-msgid "[Hubzilla:Notify] New mail received at %s"
+#: ../../include/selectors.php:31
+msgid "Hourly"
 msgstr ""
 
-#: ../../include/enotify.php:102
-#, php-format
-msgid "%1$s, %2$s sent you a new private message at %3$s."
+#: ../../include/selectors.php:32
+msgid "Twice daily"
 msgstr ""
 
-#: ../../include/enotify.php:103
-#, php-format
-msgid "%1$s sent you %2$s."
+#: ../../include/selectors.php:33
+msgid "Daily"
 msgstr ""
 
-#: ../../include/enotify.php:103
-msgid "a private message"
+#: ../../include/selectors.php:34
+msgid "Weekly"
 msgstr ""
 
-#: ../../include/enotify.php:104
-#, php-format
-msgid "Please visit %s to view and/or reply to your private messages."
+#: ../../include/selectors.php:35
+msgid "Monthly"
 msgstr ""
 
-#: ../../include/enotify.php:160
-#, php-format
-msgid "%1$s, %2$s commented on [zrl=%3$s]a %4$s[/zrl]"
+#: ../../include/selectors.php:49
+msgid "Currently Male"
 msgstr ""
 
-#: ../../include/enotify.php:168
-#, php-format
-msgid "%1$s, %2$s commented on [zrl=%3$s]%4$s's %5$s[/zrl]"
+#: ../../include/selectors.php:49
+msgid "Currently Female"
 msgstr ""
 
-#: ../../include/enotify.php:177
-#, php-format
-msgid "%1$s, %2$s commented on [zrl=%3$s]your %4$s[/zrl]"
+#: ../../include/selectors.php:49
+msgid "Mostly Male"
 msgstr ""
 
-#: ../../include/enotify.php:188
-#, php-format
-msgid "[Hubzilla:Notify] Comment to conversation #%1$d by %2$s"
+#: ../../include/selectors.php:49
+msgid "Mostly Female"
 msgstr ""
 
-#: ../../include/enotify.php:189
-#, php-format
-msgid "%1$s, %2$s commented on an item/conversation you have been following."
+#: ../../include/selectors.php:49
+msgid "Transgender"
 msgstr ""
 
-#: ../../include/enotify.php:192 ../../include/enotify.php:207
-#: ../../include/enotify.php:233 ../../include/enotify.php:251
-#: ../../include/enotify.php:265
-#, php-format
-msgid "Please visit %s to view and/or reply to the conversation."
+#: ../../include/selectors.php:49
+msgid "Intersex"
 msgstr ""
 
-#: ../../include/enotify.php:198
-#, php-format
-msgid "[Hubzilla:Notify] %s posted to your profile wall"
+#: ../../include/selectors.php:49
+msgid "Transsexual"
 msgstr ""
 
-#: ../../include/enotify.php:200
-#, php-format
-msgid "%1$s, %2$s posted to your profile wall at %3$s"
+#: ../../include/selectors.php:49
+msgid "Hermaphrodite"
 msgstr ""
 
-#: ../../include/enotify.php:202
-#, php-format
-msgid "%1$s, %2$s posted to [zrl=%3$s]your wall[/zrl]"
+#: ../../include/selectors.php:49
+msgid "Neuter"
 msgstr ""
 
-#: ../../include/enotify.php:226
-#, php-format
-msgid "[Hubzilla:Notify] %s tagged you"
+#: ../../include/selectors.php:49
+msgid "Non-specific"
 msgstr ""
 
-#: ../../include/enotify.php:227
-#, php-format
-msgid "%1$s, %2$s tagged you at %3$s"
+#: ../../include/selectors.php:49 ../../include/selectors.php:66
+#: ../../include/selectors.php:104 ../../include/selectors.php:140
+#: ../../include/permissions.php:881
+msgid "Other"
 msgstr ""
 
-#: ../../include/enotify.php:228
-#, php-format
-msgid "%1$s, %2$s [zrl=%3$s]tagged you[/zrl]."
+#: ../../include/selectors.php:49
+msgid "Undecided"
 msgstr ""
 
-#: ../../include/enotify.php:240
-#, php-format
-msgid "[Hubzilla:Notify] %1$s poked you"
+#: ../../include/selectors.php:85 ../../include/selectors.php:104
+msgid "Males"
 msgstr ""
 
-#: ../../include/enotify.php:241
-#, php-format
-msgid "%1$s, %2$s poked you at %3$s"
+#: ../../include/selectors.php:85 ../../include/selectors.php:104
+msgid "Females"
 msgstr ""
 
-#: ../../include/enotify.php:242
-#, php-format
-msgid "%1$s, %2$s [zrl=%2$s]poked you[/zrl]."
+#: ../../include/selectors.php:85
+msgid "Gay"
 msgstr ""
 
-#: ../../include/enotify.php:258
-#, php-format
-msgid "[Hubzilla:Notify] %s tagged your post"
+#: ../../include/selectors.php:85
+msgid "Lesbian"
 msgstr ""
 
-#: ../../include/enotify.php:259
-#, php-format
-msgid "%1$s, %2$s tagged your post at %3$s"
+#: ../../include/selectors.php:85
+msgid "No Preference"
 msgstr ""
 
-#: ../../include/enotify.php:260
-#, php-format
-msgid "%1$s, %2$s tagged [zrl=%3$s]your post[/zrl]"
+#: ../../include/selectors.php:85
+msgid "Bisexual"
 msgstr ""
 
-#: ../../include/enotify.php:272
-msgid "[Hubzilla:Notify] Introduction received"
+#: ../../include/selectors.php:85
+msgid "Autosexual"
 msgstr ""
 
-#: ../../include/enotify.php:273
-#, php-format
-msgid "%1$s, you've received an new connection request from '%2$s' at %3$s"
+#: ../../include/selectors.php:85
+msgid "Abstinent"
 msgstr ""
 
-#: ../../include/enotify.php:274
-#, php-format
-msgid ""
-"%1$s, you've received [zrl=%2$s]a new connection request[/zrl] from %3$s."
+#: ../../include/selectors.php:85
+msgid "Virgin"
 msgstr ""
 
-#: ../../include/enotify.php:278 ../../include/enotify.php:297
-#, php-format
-msgid "You may visit their profile at %s"
+#: ../../include/selectors.php:85
+msgid "Deviant"
 msgstr ""
 
-#: ../../include/enotify.php:280
-#, php-format
-msgid "Please visit %s to approve or reject the connection request."
+#: ../../include/selectors.php:85
+msgid "Fetish"
 msgstr ""
 
-#: ../../include/enotify.php:287
-msgid "[Hubzilla:Notify] Friend suggestion received"
+#: ../../include/selectors.php:85
+msgid "Oodles"
 msgstr ""
 
-#: ../../include/enotify.php:288
-#, php-format
-msgid "%1$s, you've received a friend suggestion from '%2$s' at %3$s"
+#: ../../include/selectors.php:85
+msgid "Nonsexual"
 msgstr ""
 
-#: ../../include/enotify.php:289
-#, php-format
-msgid ""
-"%1$s, you've received [zrl=%2$s]a friend suggestion[/zrl] for %3$s from %4$s."
+#: ../../include/selectors.php:123 ../../include/selectors.php:140
+msgid "Single"
 msgstr ""
 
-#: ../../include/enotify.php:295
-msgid "Name:"
+#: ../../include/selectors.php:123
+msgid "Lonely"
 msgstr ""
 
-#: ../../include/enotify.php:296
-msgid "Photo:"
+#: ../../include/selectors.php:123
+msgid "Available"
 msgstr ""
 
-#: ../../include/enotify.php:299
-#, php-format
-msgid "Please visit %s to approve or reject the suggestion."
+#: ../../include/selectors.php:123
+msgid "Unavailable"
 msgstr ""
 
-#: ../../include/enotify.php:514
-msgid "[Hubzilla:Notify]"
+#: ../../include/selectors.php:123
+msgid "Has crush"
 msgstr ""
 
-#: ../../include/ItemObject.php:89 ../../include/conversation.php:664
-msgid "Private Message"
+#: ../../include/selectors.php:123
+msgid "Infatuated"
 msgstr ""
 
-#: ../../include/ItemObject.php:126 ../../include/conversation.php:656
-msgid "Select"
+#: ../../include/selectors.php:123 ../../include/selectors.php:140
+msgid "Dating"
 msgstr ""
 
-#: ../../include/ItemObject.php:130
-msgid "Save to Folder"
+#: ../../include/selectors.php:123
+msgid "Unfaithful"
 msgstr ""
 
-#: ../../include/ItemObject.php:151
-msgid "I will attend"
+#: ../../include/selectors.php:123
+msgid "Sex Addict"
 msgstr ""
 
-#: ../../include/ItemObject.php:151
-msgid "I will not attend"
+#: ../../include/selectors.php:123
+msgid "Friends/Benefits"
 msgstr ""
 
-#: ../../include/ItemObject.php:151
-msgid "I might attend"
+#: ../../include/selectors.php:123
+msgid "Casual"
 msgstr ""
 
-#: ../../include/ItemObject.php:161
-msgid "I agree"
+#: ../../include/selectors.php:123
+msgid "Engaged"
 msgstr ""
 
-#: ../../include/ItemObject.php:161
-msgid "I disagree"
+#: ../../include/selectors.php:123 ../../include/selectors.php:140
+msgid "Married"
 msgstr ""
 
-#: ../../include/ItemObject.php:161
-msgid "I abstain"
+#: ../../include/selectors.php:123
+msgid "Imaginarily married"
 msgstr ""
 
-#: ../../include/ItemObject.php:212
-msgid "Add Star"
+#: ../../include/selectors.php:123
+msgid "Partners"
 msgstr ""
 
-#: ../../include/ItemObject.php:213
-msgid "Remove Star"
+#: ../../include/selectors.php:123 ../../include/selectors.php:140
+msgid "Cohabiting"
 msgstr ""
 
-#: ../../include/ItemObject.php:214
-msgid "Toggle Star Status"
+#: ../../include/selectors.php:123
+msgid "Common law"
 msgstr ""
 
-#: ../../include/ItemObject.php:218
-msgid "starred"
+#: ../../include/selectors.php:123
+msgid "Happy"
 msgstr ""
 
-#: ../../include/ItemObject.php:227 ../../include/conversation.php:671
-msgid "Message signature validated"
+#: ../../include/selectors.php:123
+msgid "Not looking"
 msgstr ""
 
-#: ../../include/ItemObject.php:228 ../../include/conversation.php:672
-msgid "Message signature incorrect"
+#: ../../include/selectors.php:123
+msgid "Swinger"
 msgstr ""
 
-#: ../../include/ItemObject.php:236
-msgid "Add Tag"
+#: ../../include/selectors.php:123
+msgid "Betrayed"
 msgstr ""
 
-#: ../../include/ItemObject.php:254 ../../include/taxonomy.php:316
-msgid "like"
+#: ../../include/selectors.php:123 ../../include/selectors.php:140
+msgid "Separated"
 msgstr ""
 
-#: ../../include/ItemObject.php:255 ../../include/taxonomy.php:317
-msgid "dislike"
+#: ../../include/selectors.php:123
+msgid "Unstable"
 msgstr ""
 
-#: ../../include/ItemObject.php:259
-msgid "Share This"
+#: ../../include/selectors.php:123 ../../include/selectors.php:140
+msgid "Divorced"
 msgstr ""
 
-#: ../../include/ItemObject.php:259
-msgid "share"
+#: ../../include/selectors.php:123
+msgid "Imaginarily divorced"
 msgstr ""
 
-#: ../../include/ItemObject.php:268
-msgid "Delivery Report"
+#: ../../include/selectors.php:123 ../../include/selectors.php:140
+msgid "Widowed"
 msgstr ""
 
-#: ../../include/ItemObject.php:286
-#, php-format
-msgid "%d comment"
-msgid_plural "%d comments"
-msgstr[0] ""
-msgstr[1] ""
+#: ../../include/selectors.php:123
+msgid "Uncertain"
+msgstr ""
 
-#: ../../include/ItemObject.php:315 ../../include/ItemObject.php:316
-#, php-format
-msgid "View %s's profile - %s"
+#: ../../include/selectors.php:123 ../../include/selectors.php:140
+msgid "It's complicated"
 msgstr ""
 
-#: ../../include/ItemObject.php:319
-msgid "to"
+#: ../../include/selectors.php:123
+msgid "Don't care"
 msgstr ""
 
-#: ../../include/ItemObject.php:320
-msgid "via"
+#: ../../include/selectors.php:123
+msgid "Ask me"
 msgstr ""
 
-#: ../../include/ItemObject.php:321
-msgid "Wall-to-Wall"
+#: ../../include/PermissionDescription.php:31
+#: ../../include/acl_selectors.php:232
+msgid "Visible to your default audience"
 msgstr ""
 
-#: ../../include/ItemObject.php:322
-msgid "via Wall-To-Wall:"
+#: ../../include/PermissionDescription.php:115
+#: ../../include/acl_selectors.php:268
+msgid "Only me"
 msgstr ""
 
-#: ../../include/ItemObject.php:334 ../../include/conversation.php:719
-#, php-format
-msgid "from %s"
+#: ../../include/PermissionDescription.php:116
+msgid "Public"
 msgstr ""
 
-#: ../../include/ItemObject.php:337 ../../include/conversation.php:722
-#, php-format
-msgid "last edited: %s"
+#: ../../include/PermissionDescription.php:117
+msgid "Anybody in the $Projectname network"
 msgstr ""
 
-#: ../../include/ItemObject.php:338 ../../include/conversation.php:723
+#: ../../include/PermissionDescription.php:118
 #, php-format
-msgid "Expires: %s"
+msgid "Any account on %s"
 msgstr ""
 
-#: ../../include/ItemObject.php:362 ../../bookmarker/bookmarker.php:45
-msgid "Save Bookmarks"
+#: ../../include/PermissionDescription.php:119
+msgid "Any of my connections"
 msgstr ""
 
-#: ../../include/ItemObject.php:363
-msgid "Add to Calendar"
+#: ../../include/PermissionDescription.php:120
+msgid "Only connections I specifically allow"
 msgstr ""
 
-#: ../../include/ItemObject.php:372
-msgid "Mark all seen"
+#: ../../include/PermissionDescription.php:121
+msgid "Anybody authenticated (could include visitors from other networks)"
 msgstr ""
 
-#: ../../include/ItemObject.php:413 ../../include/js_strings.php:7
-msgid "[+] show all"
+#: ../../include/PermissionDescription.php:122
+msgid "Any connections including those who haven't yet been approved"
 msgstr ""
 
-#: ../../include/ItemObject.php:709
-msgid "Image"
+#: ../../include/PermissionDescription.php:161
+msgid ""
+"This is your default setting for the audience of your normal stream, and "
+"posts."
 msgstr ""
 
-#: ../../include/ItemObject.php:710
-msgid "Insert Link"
+#: ../../include/PermissionDescription.php:162
+msgid ""
+"This is your default setting for who can view your default channel profile"
 msgstr ""
 
-#: ../../include/ItemObject.php:711
-msgid "Video"
+#: ../../include/PermissionDescription.php:163
+msgid "This is your default setting for who can view your connections"
 msgstr ""
 
-#: ../../include/text.php:423
-msgid "prev"
+#: ../../include/PermissionDescription.php:164
+msgid ""
+"This is your default setting for who can view your file storage and photos"
 msgstr ""
 
-#: ../../include/text.php:425
-msgid "first"
+#: ../../include/PermissionDescription.php:165
+msgid "This is your default setting for the audience of your webpages"
 msgstr ""
 
-#: ../../include/text.php:454
-msgid "last"
+#: ../../include/account.php:28
+msgid "Not a valid email address"
 msgstr ""
 
-#: ../../include/text.php:457
-msgid "next"
+#: ../../include/account.php:30
+msgid "Your email domain is not among those allowed on this site"
 msgstr ""
 
-#: ../../include/text.php:467
-msgid "older"
+#: ../../include/account.php:36
+msgid "Your email address is already registered at this site."
 msgstr ""
 
-#: ../../include/text.php:469
-msgid "newer"
+#: ../../include/account.php:68
+msgid "An invitation is required."
 msgstr ""
 
-#: ../../include/text.php:851
-msgid "No connections"
+#: ../../include/account.php:72
+msgid "Invitation could not be verified."
 msgstr ""
 
-#: ../../include/text.php:876
-#, php-format
-msgid "View all %s connections"
+#: ../../include/account.php:122
+msgid "Please enter the required information."
 msgstr ""
 
-#: ../../include/text.php:1021 ../../include/text.php:1026
-msgid "poke"
+#: ../../include/account.php:189
+msgid "Failed to store account information."
 msgstr ""
 
-#: ../../include/text.php:1021 ../../include/text.php:1026
-#: ../../include/conversation.php:243
-msgid "poked"
+#: ../../include/account.php:249
+#, php-format
+msgid "Registration confirmation for %s"
 msgstr ""
 
-#: ../../include/text.php:1027
-msgid "ping"
+#: ../../include/account.php:315
+#, php-format
+msgid "Registration request at %s"
 msgstr ""
 
-#: ../../include/text.php:1027
-msgid "pinged"
+#: ../../include/account.php:317 ../../include/account.php:344
+#: ../../include/account.php:404 ../../include/network.php:1871
+msgid "Administrator"
 msgstr ""
 
-#: ../../include/text.php:1028
-msgid "prod"
+#: ../../include/account.php:339
+msgid "your registration password"
 msgstr ""
 
-#: ../../include/text.php:1028
-msgid "prodded"
+#: ../../include/account.php:342 ../../include/account.php:402
+#, php-format
+msgid "Registration details for %s"
 msgstr ""
 
-#: ../../include/text.php:1029
-msgid "slap"
+#: ../../include/account.php:414
+msgid "Account approved."
 msgstr ""
 
-#: ../../include/text.php:1029
-msgid "slapped"
+#: ../../include/account.php:454
+#, php-format
+msgid "Registration revoked for %s"
 msgstr ""
 
-#: ../../include/text.php:1030
-msgid "finger"
+#: ../../include/account.php:506
+msgid "Account verified. Please login."
 msgstr ""
 
-#: ../../include/text.php:1030
-msgid "fingered"
+#: ../../include/account.php:723 ../../include/account.php:725
+msgid "Click here to upgrade."
 msgstr ""
 
-#: ../../include/text.php:1031
-msgid "rebuff"
+#: ../../include/account.php:731
+msgid "This action exceeds the limits set by your subscription plan."
 msgstr ""
 
-#: ../../include/text.php:1031
-msgid "rebuffed"
+#: ../../include/account.php:736
+msgid "This action is not available under your subscription plan."
 msgstr ""
 
-#: ../../include/text.php:1043
-msgid "happy"
+#: ../../include/attach.php:247 ../../include/attach.php:333
+msgid "Item was not found."
 msgstr ""
 
-#: ../../include/text.php:1044
-msgid "sad"
+#: ../../include/attach.php:497
+msgid "No source file."
 msgstr ""
 
-#: ../../include/text.php:1045
-msgid "mellow"
+#: ../../include/attach.php:519
+msgid "Cannot locate file to replace"
 msgstr ""
 
-#: ../../include/text.php:1046
-msgid "tired"
+#: ../../include/attach.php:537
+msgid "Cannot locate file to revise/update"
 msgstr ""
 
-#: ../../include/text.php:1047
-msgid "perky"
+#: ../../include/attach.php:672
+#, php-format
+msgid "File exceeds size limit of %d"
 msgstr ""
 
-#: ../../include/text.php:1048
-msgid "angry"
+#: ../../include/attach.php:686
+#, php-format
+msgid "You have reached your limit of %1$.0f Mbytes attachment storage."
 msgstr ""
 
-#: ../../include/text.php:1049
-msgid "stupefied"
+#: ../../include/attach.php:842
+msgid "File upload failed. Possible system limit or action terminated."
 msgstr ""
 
-#: ../../include/text.php:1050
-msgid "puzzled"
+#: ../../include/attach.php:855
+msgid "Stored file could not be verified. Upload failed."
 msgstr ""
 
-#: ../../include/text.php:1051
-msgid "interested"
+#: ../../include/attach.php:909 ../../include/attach.php:925
+msgid "Path not available."
 msgstr ""
 
-#: ../../include/text.php:1052
-msgid "bitter"
+#: ../../include/attach.php:971 ../../include/attach.php:1123
+msgid "Empty pathname"
 msgstr ""
 
-#: ../../include/text.php:1053
-msgid "cheerful"
+#: ../../include/attach.php:997
+msgid "duplicate filename or path"
 msgstr ""
 
-#: ../../include/text.php:1054
-msgid "alive"
+#: ../../include/attach.php:1019
+msgid "Path not found."
 msgstr ""
 
-#: ../../include/text.php:1055
-msgid "annoyed"
+#: ../../include/attach.php:1077
+msgid "mkdir failed."
 msgstr ""
 
-#: ../../include/text.php:1056
-msgid "anxious"
+#: ../../include/attach.php:1081
+msgid "database storage failed."
 msgstr ""
 
-#: ../../include/text.php:1057
-msgid "cranky"
+#: ../../include/attach.php:1129
+msgid "Empty path"
 msgstr ""
 
-#: ../../include/text.php:1058
-msgid "disturbed"
+#: ../../include/channel.php:32
+msgid "Unable to obtain identity information from database"
 msgstr ""
 
-#: ../../include/text.php:1059
-msgid "frustrated"
+#: ../../include/channel.php:66
+msgid "Empty name"
 msgstr ""
 
-#: ../../include/text.php:1060
-msgid "depressed"
+#: ../../include/channel.php:69
+msgid "Name too long"
 msgstr ""
 
-#: ../../include/text.php:1061
-msgid "motivated"
+#: ../../include/channel.php:180
+msgid "No account identifier"
 msgstr ""
 
-#: ../../include/text.php:1062
-msgid "relaxed"
+#: ../../include/channel.php:192
+msgid "Nickname is required."
 msgstr ""
 
-#: ../../include/text.php:1063
-msgid "surprised"
+#: ../../include/channel.php:206
+msgid "Reserved nickname. Please choose another."
 msgstr ""
 
-#: ../../include/text.php:1235 ../../include/js_strings.php:70
-msgid "Monday"
+#: ../../include/channel.php:211
+msgid ""
+"Nickname has unsupported characters or is already being used on this site."
 msgstr ""
 
-#: ../../include/text.php:1235 ../../include/js_strings.php:71
-msgid "Tuesday"
+#: ../../include/channel.php:287
+msgid "Unable to retrieve created identity"
 msgstr ""
 
-#: ../../include/text.php:1235 ../../include/js_strings.php:72
-msgid "Wednesday"
+#: ../../include/channel.php:345
+msgid "Default Profile"
 msgstr ""
 
-#: ../../include/text.php:1235 ../../include/js_strings.php:73
-msgid "Thursday"
+#: ../../include/channel.php:791
+msgid "Requested channel is not available."
 msgstr ""
 
-#: ../../include/text.php:1235 ../../include/js_strings.php:74
-msgid "Friday"
+#: ../../include/channel.php:938
+msgid "Create New Profile"
 msgstr ""
 
-#: ../../include/text.php:1235 ../../include/js_strings.php:75
-msgid "Saturday"
+#: ../../include/channel.php:958
+msgid "Visible to everybody"
 msgstr ""
 
-#: ../../include/text.php:1235 ../../include/js_strings.php:69
-msgid "Sunday"
+#: ../../include/channel.php:1031 ../../include/channel.php:1142
+msgid "Gender:"
 msgstr ""
 
-#: ../../include/text.php:1239 ../../include/js_strings.php:45
-msgid "January"
+#: ../../include/channel.php:1032 ../../include/channel.php:1186
+msgid "Status:"
 msgstr ""
 
-#: ../../include/text.php:1239 ../../include/js_strings.php:46
-msgid "February"
+#: ../../include/channel.php:1033 ../../include/channel.php:1197
+msgid "Homepage:"
 msgstr ""
 
-#: ../../include/text.php:1239 ../../include/js_strings.php:47
-msgid "March"
+#: ../../include/channel.php:1034
+msgid "Online Now"
 msgstr ""
 
-#: ../../include/text.php:1239 ../../include/js_strings.php:48
-msgid "April"
+#: ../../include/channel.php:1147
+msgid "Like this channel"
 msgstr ""
 
-#: ../../include/text.php:1239
-msgid "May"
+#: ../../include/channel.php:1171
+msgid "j F, Y"
 msgstr ""
 
-#: ../../include/text.php:1239 ../../include/js_strings.php:50
-msgid "June"
+#: ../../include/channel.php:1172
+msgid "j F"
 msgstr ""
 
-#: ../../include/text.php:1239 ../../include/js_strings.php:51
-msgid "July"
+#: ../../include/channel.php:1179
+msgid "Birthday:"
 msgstr ""
 
-#: ../../include/text.php:1239 ../../include/js_strings.php:52
-msgid "August"
+#: ../../include/channel.php:1192
+#, php-format
+msgid "for %1$d %2$s"
 msgstr ""
 
-#: ../../include/text.php:1239 ../../include/js_strings.php:53
-msgid "September"
+#: ../../include/channel.php:1195
+msgid "Sexual Preference:"
 msgstr ""
 
-#: ../../include/text.php:1239 ../../include/js_strings.php:54
-msgid "October"
+#: ../../include/channel.php:1201
+msgid "Tags:"
 msgstr ""
 
-#: ../../include/text.php:1239 ../../include/js_strings.php:55
-msgid "November"
+#: ../../include/channel.php:1203
+msgid "Political Views:"
 msgstr ""
 
-#: ../../include/text.php:1239 ../../include/js_strings.php:56
-msgid "December"
+#: ../../include/channel.php:1205
+msgid "Religion:"
 msgstr ""
 
-#: ../../include/text.php:1316 ../../include/text.php:1320
-msgid "Unknown Attachment"
+#: ../../include/channel.php:1209
+msgid "Hobbies/Interests:"
 msgstr ""
 
-#: ../../include/text.php:1322
-msgid "unknown"
+#: ../../include/channel.php:1211
+msgid "Likes:"
 msgstr ""
 
-#: ../../include/text.php:1358
-msgid "remove category"
+#: ../../include/channel.php:1213
+msgid "Dislikes:"
 msgstr ""
 
-#: ../../include/text.php:1435
-msgid "remove from file"
+#: ../../include/channel.php:1215
+msgid "Contact information and Social Networks:"
 msgstr ""
 
-#: ../../include/text.php:1764 ../../include/text.php:1836
-msgid "default"
+#: ../../include/channel.php:1217
+msgid "My other channels:"
 msgstr ""
 
-#: ../../include/text.php:1772
-msgid "Page layout"
+#: ../../include/channel.php:1219
+msgid "Musical interests:"
 msgstr ""
 
-#: ../../include/text.php:1772
-msgid "You can create your own with the layouts tool"
+#: ../../include/channel.php:1221
+msgid "Books, literature:"
 msgstr ""
 
-#: ../../include/text.php:1814
-msgid "Page content type"
+#: ../../include/channel.php:1223
+msgid "Television:"
 msgstr ""
 
-#: ../../include/text.php:1848
-msgid "Select an alternate language"
+#: ../../include/channel.php:1225
+msgid "Film/dance/culture/entertainment:"
 msgstr ""
 
-#: ../../include/text.php:1982
-msgid "activity"
+#: ../../include/channel.php:1227
+msgid "Love/Romance:"
 msgstr ""
 
-#: ../../include/text.php:2277
-msgid "Design Tools"
+#: ../../include/channel.php:1229
+msgid "Work/employment:"
 msgstr ""
 
-#: ../../include/text.php:2283
-msgid "Pages"
+#: ../../include/channel.php:1231
+msgid "School/education:"
+msgstr ""
+
+#: ../../include/channel.php:1251
+msgid "Like this thing"
 msgstr ""
 
 #: ../../include/features.php:48
@@ -8470,512 +8907,200 @@ msgid "Add categories to your posts"
 msgstr ""
 
 #: ../../include/features.php:97
-msgid "Ability to file posts under folders"
+msgid "Emoji Reactions"
 msgstr ""
 
-#: ../../include/features.php:98
-msgid "Dislike Posts"
+#: ../../include/features.php:97
+msgid "Add emoji reaction ability to posts"
 msgstr ""
 
 #: ../../include/features.php:98
-msgid "Ability to dislike posts/comments"
+msgid "Ability to file posts under folders"
 msgstr ""
 
 #: ../../include/features.php:99
-msgid "Star Posts"
+msgid "Dislike Posts"
 msgstr ""
 
 #: ../../include/features.php:99
-msgid "Ability to mark special posts with a star indicator"
+msgid "Ability to dislike posts/comments"
 msgstr ""
 
 #: ../../include/features.php:100
-msgid "Tag Cloud"
+msgid "Star Posts"
 msgstr ""
 
 #: ../../include/features.php:100
-msgid "Provide a personal tag cloud on your channel page"
-msgstr ""
-
-#: ../../include/follow.php:28
-msgid "Channel is blocked on this site."
+msgid "Ability to mark special posts with a star indicator"
 msgstr ""
 
-#: ../../include/follow.php:33
-msgid "Channel location missing."
+#: ../../include/features.php:101
+msgid "Tag Cloud"
 msgstr ""
 
-#: ../../include/follow.php:82
-msgid "Response from remote channel was incomplete."
+#: ../../include/features.php:101
+msgid "Provide a personal tag cloud on your channel page"
 msgstr ""
 
-#: ../../include/follow.php:99
-msgid "Channel was deleted and no longer exists."
+#: ../../include/oembed.php:324
+msgid "Embedded content"
 msgstr ""
 
-#: ../../include/follow.php:155 ../../include/follow.php:191
-msgid "Protocol disabled."
+#: ../../include/oembed.php:333
+msgid "Embedding disabled"
 msgstr ""
 
-#: ../../include/follow.php:179
-msgid "Channel discovery failed."
+#: ../../include/acl_selectors.php:271
+msgid "Who can see this?"
 msgstr ""
 
-#: ../../include/follow.php:217
-msgid "Cannot connect to yourself."
+#: ../../include/acl_selectors.php:272
+msgid "Custom selection"
 msgstr ""
 
-#: ../../include/group.php:26
+#: ../../include/acl_selectors.php:273
 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/group.php:248
-msgid "Add new connections to this privacy group"
-msgstr ""
-
-#: ../../include/group.php:289
-msgid "edit"
-msgstr ""
-
-#: ../../include/group.php:312
-msgid "Edit group"
-msgstr ""
-
-#: ../../include/group.php:313
-msgid "Add privacy group"
-msgstr ""
-
-#: ../../include/group.php:314
-msgid "Channels not in any privacy group"
-msgstr ""
-
-#: ../../include/network.php:659
-msgid "view full size"
-msgstr ""
-
-#: ../../include/network.php:1875 ../../include/account.php:317
-#: ../../include/account.php:344 ../../include/account.php:404
-msgid "Administrator"
-msgstr ""
-
-#: ../../include/network.php:1889
-msgid "No Subject"
-msgstr ""
-
-#: ../../include/account.php:28
-msgid "Not a valid email address"
-msgstr ""
-
-#: ../../include/account.php:30
-msgid "Your email domain is not among those allowed on this site"
-msgstr ""
-
-#: ../../include/account.php:36
-msgid "Your email address is already registered at this site."
-msgstr ""
-
-#: ../../include/account.php:68
-msgid "An invitation is required."
-msgstr ""
-
-#: ../../include/account.php:72
-msgid "Invitation could not be verified."
-msgstr ""
-
-#: ../../include/account.php:122
-msgid "Please enter the required information."
-msgstr ""
-
-#: ../../include/account.php:189
-msgid "Failed to store account information."
-msgstr ""
-
-#: ../../include/account.php:249
-#, php-format
-msgid "Registration confirmation for %s"
-msgstr ""
-
-#: ../../include/account.php:315
-#, php-format
-msgid "Registration request at %s"
-msgstr ""
-
-#: ../../include/account.php:339
-msgid "your registration password"
-msgstr ""
-
-#: ../../include/account.php:342 ../../include/account.php:402
-#, php-format
-msgid "Registration details for %s"
-msgstr ""
-
-#: ../../include/account.php:414
-msgid "Account approved."
-msgstr ""
-
-#: ../../include/account.php:454
-#, php-format
-msgid "Registration revoked for %s"
-msgstr ""
-
-#: ../../include/account.php:506
-msgid "Account verified. Please login."
-msgstr ""
-
-#: ../../include/account.php:722 ../../include/account.php:724
-msgid "Click here to upgrade."
-msgstr ""
-
-#: ../../include/account.php:730
-msgid "This action exceeds the limits set by your subscription plan."
-msgstr ""
-
-#: ../../include/account.php:735
-msgid "This action is not available under your subscription plan."
+"Select \"Show\" to allow viewing. \"Don't show\" lets you override and limit "
+"the scope of \"Show\"."
 msgstr ""
 
-#: ../../include/bbcode.php:123 ../../include/bbcode.php:863
-#: ../../include/bbcode.php:866 ../../include/bbcode.php:871
-#: ../../include/bbcode.php:874 ../../include/bbcode.php:877
-#: ../../include/bbcode.php:880 ../../include/bbcode.php:885
-#: ../../include/bbcode.php:888 ../../include/bbcode.php:893
-#: ../../include/bbcode.php:896 ../../include/bbcode.php:899
-#: ../../include/bbcode.php:902
-msgid "Image/photo"
+#: ../../include/acl_selectors.php:274
+msgid "Show"
 msgstr ""
 
-#: ../../include/bbcode.php:162 ../../include/bbcode.php:913
-msgid "Encrypted content"
+#: ../../include/acl_selectors.php:275
+msgid "Don't show"
 msgstr ""
 
-#: ../../include/bbcode.php:179
-#, php-format
-msgid "Install %s element: "
+#: ../../include/acl_selectors.php:281
+msgid "Other networks and post services"
 msgstr ""
 
-#: ../../include/bbcode.php:183
+#: ../../include/acl_selectors.php:311
 #, php-format
 msgid ""
-"This post contains an installable %s element, however you lack permissions "
-"to install it on this site."
-msgstr ""
-
-#: ../../include/bbcode.php:255
-#, php-format
-msgid "%1$s wrote the following %2$s %3$s"
-msgstr ""
-
-#: ../../include/bbcode.php:333 ../../include/bbcode.php:341
-msgid "Click to open/close"
-msgstr ""
-
-#: ../../include/bbcode.php:341
-msgid "spoiler"
-msgstr ""
-
-#: ../../include/bbcode.php:598
-msgid "Different viewers will see this text differently"
-msgstr ""
-
-#: ../../include/bbcode.php:851
-msgid "$1 wrote:"
-msgstr ""
-
-#: ../../include/conversation.php:204
-#, php-format
-msgid "%1$s is now connected with %2$s"
-msgstr ""
-
-#: ../../include/conversation.php:239
-#, php-format
-msgid "%1$s poked %2$s"
-msgstr ""
-
-#: ../../include/conversation.php:691
-#, php-format
-msgid "View %s's profile @ %s"
-msgstr ""
-
-#: ../../include/conversation.php:710
-msgid "Categories:"
-msgstr ""
-
-#: ../../include/conversation.php:711
-msgid "Filed under:"
-msgstr ""
-
-#: ../../include/conversation.php:738
-msgid "View in context"
-msgstr ""
-
-#: ../../include/conversation.php:850
-msgid "remove"
-msgstr ""
-
-#: ../../include/conversation.php:854 ../../include/nav.php:247
-msgid "Loading..."
-msgstr ""
-
-#: ../../include/conversation.php:855
-msgid "Delete Selected Items"
-msgstr ""
-
-#: ../../include/conversation.php:953
-msgid "View Source"
+"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/conversation.php:954
-msgid "Follow Thread"
+#: ../../include/auth.php:105
+msgid "Logged out."
 msgstr ""
 
-#: ../../include/conversation.php:955
-msgid "Unfollow Thread"
+#: ../../include/auth.php:212
+msgid "Failed authentication"
 msgstr ""
 
-#: ../../include/conversation.php:960
-msgid "Activity/Posts"
+#: ../../include/datetime.php:135
+msgid "Birthday"
 msgstr ""
 
-#: ../../include/conversation.php:962
-msgid "Edit Connection"
+#: ../../include/datetime.php:137
+msgid "Age: "
 msgstr ""
 
-#: ../../include/conversation.php:963
-msgid "Message"
+#: ../../include/datetime.php:139
+msgid "YYYY-MM-DD or MM-DD"
 msgstr ""
 
-#: ../../include/conversation.php:1080
-#, php-format
-msgid "%s likes this."
+#: ../../include/datetime.php:272 ../../boot.php:2470
+msgid "never"
 msgstr ""
 
-#: ../../include/conversation.php:1080
-#, php-format
-msgid "%s doesn't like this."
+#: ../../include/datetime.php:278
+msgid "less than a second ago"
 msgstr ""
 
-#: ../../include/conversation.php:1084
+#: ../../include/datetime.php:296
 #, 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:1086
-#, 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:1092
-msgid "and"
+msgctxt "e.g. 22 hours ago, 1 minute ago"
+msgid "%1$d %2$s ago"
 msgstr ""
 
-#: ../../include/conversation.php:1095
-#, php-format
-msgid ", and %d other people"
-msgid_plural ", and %d other people"
+#: ../../include/datetime.php:307
+msgctxt "relative_date"
+msgid "year"
+msgid_plural "years"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../../include/conversation.php:1096
-#, php-format
-msgid "%s like this."
-msgstr ""
-
-#: ../../include/conversation.php:1096
-#, php-format
-msgid "%s don't like this."
-msgstr ""
-
-#: ../../include/conversation.php:1136
-msgid "Set your location"
-msgstr ""
-
-#: ../../include/conversation.php:1137
-msgid "Clear browser location"
-msgstr ""
-
-#: ../../include/conversation.php:1187
-msgid "Tag term:"
-msgstr ""
-
-#: ../../include/conversation.php:1188
-msgid "Where are you right now?"
-msgstr ""
-
-#: ../../include/conversation.php:1220
-msgid "Page link name"
-msgstr ""
-
-#: ../../include/conversation.php:1223
-msgid "Post as"
-msgstr ""
-
-#: ../../include/conversation.php:1233
-msgid "Toggle voting"
-msgstr ""
-
-#: ../../include/conversation.php:1264
-msgid "Set publish date"
-msgstr ""
-
-#: ../../include/conversation.php:1268
-msgid "OK"
-msgstr ""
-
-#: ../../include/conversation.php:1513
-msgid "Discover"
-msgstr ""
-
-#: ../../include/conversation.php:1516
-msgid "Imported public streams"
-msgstr ""
-
-#: ../../include/conversation.php:1521
-msgid "Commented Order"
-msgstr ""
-
-#: ../../include/conversation.php:1524
-msgid "Sort by Comment Date"
-msgstr ""
-
-#: ../../include/conversation.php:1528
-msgid "Posted Order"
-msgstr ""
-
-#: ../../include/conversation.php:1531
-msgid "Sort by Post Date"
-msgstr ""
-
-#: ../../include/conversation.php:1539
-msgid "Posts that mention or involve you"
-msgstr ""
-
-#: ../../include/conversation.php:1548
-msgid "Activity Stream - by date"
-msgstr ""
-
-#: ../../include/conversation.php:1554
-msgid "Starred"
-msgstr ""
-
-#: ../../include/conversation.php:1557
-msgid "Favourite Posts"
-msgstr ""
-
-#: ../../include/conversation.php:1564
-msgid "Spam"
-msgstr ""
-
-#: ../../include/conversation.php:1567
-msgid "Posts flagged as SPAM"
-msgstr ""
-
-#: ../../include/conversation.php:1624
-msgid "Status Messages and Posts"
-msgstr ""
-
-#: ../../include/conversation.php:1633
-msgid "About"
-msgstr ""
-
-#: ../../include/conversation.php:1636
-msgid "Profile Details"
-msgstr ""
-
-#: ../../include/conversation.php:1652
-msgid "Files and Storage"
-msgstr ""
-
-#: ../../include/conversation.php:1686 ../../include/nav.php:102
-msgid "Bookmarks"
-msgstr ""
-
-#: ../../include/conversation.php:1689
-msgid "Saved Bookmarks"
-msgstr ""
-
-#: ../../include/conversation.php:1699
-msgid "Manage Webpages"
-msgstr ""
-
-#: ../../include/conversation.php:1758
-msgctxt "noun"
-msgid "Attending"
-msgid_plural "Attending"
+#: ../../include/datetime.php:310
+msgctxt "relative_date"
+msgid "month"
+msgid_plural "months"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../../include/conversation.php:1761
-msgctxt "noun"
-msgid "Not Attending"
-msgid_plural "Not Attending"
+#: ../../include/datetime.php:313
+msgctxt "relative_date"
+msgid "week"
+msgid_plural "weeks"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../../include/conversation.php:1764
-msgctxt "noun"
-msgid "Undecided"
-msgid_plural "Undecided"
+#: ../../include/datetime.php:316
+msgctxt "relative_date"
+msgid "day"
+msgid_plural "days"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../../include/conversation.php:1767
-msgctxt "noun"
-msgid "Agree"
-msgid_plural "Agrees"
+#: ../../include/datetime.php:319
+msgctxt "relative_date"
+msgid "hour"
+msgid_plural "hours"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../../include/conversation.php:1770
-msgctxt "noun"
-msgid "Disagree"
-msgid_plural "Disagrees"
+#: ../../include/datetime.php:322
+msgctxt "relative_date"
+msgid "minute"
+msgid_plural "minutes"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../../include/conversation.php:1773
-msgctxt "noun"
-msgid "Abstain"
-msgid_plural "Abstains"
+#: ../../include/datetime.php:325
+msgctxt "relative_date"
+msgid "second"
+msgid_plural "seconds"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../../include/taxonomy.php:228 ../../include/taxonomy.php:249
-msgid "Tags"
+#: ../../include/datetime.php:562
+#, php-format
+msgid "%1$s's birthday"
 msgstr ""
 
-#: ../../include/taxonomy.php:293
-msgid "Keywords"
+#: ../../include/datetime.php:563
+#, php-format
+msgid "Happy Birthday %1$s"
 msgstr ""
 
-#: ../../include/taxonomy.php:314
-msgid "have"
+#: ../../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/taxonomy.php:314
-msgid "has"
+#: ../../include/group.php:248
+msgid "Add new connections to this privacy group"
 msgstr ""
 
-#: ../../include/taxonomy.php:315
-msgid "want"
+#: ../../include/group.php:289
+msgid "edit"
 msgstr ""
 
-#: ../../include/taxonomy.php:315
-msgid "wants"
+#: ../../include/group.php:312
+msgid "Edit group"
 msgstr ""
 
-#: ../../include/taxonomy.php:316
-msgid "likes"
+#: ../../include/group.php:313
+msgid "Add privacy group"
 msgstr ""
 
-#: ../../include/taxonomy.php:317
-msgid "dislikes"
+#: ../../include/group.php:314
+msgid "Channels not in any privacy group"
 msgstr ""
 
 #: ../../include/js_strings.php:5
@@ -9222,189 +9347,96 @@ msgctxt "calendar"
 msgid "All day"
 msgstr ""
 
-#: ../../include/message.php:20
-msgid "No recipient provided."
-msgstr ""
-
-#: ../../include/message.php:25
-msgid "[no subject]"
-msgstr ""
-
-#: ../../include/message.php:45
-msgid "Unable to determine sender."
-msgstr ""
-
-#: ../../include/message.php:222
-msgid "Stored post could not be verified."
-msgstr ""
-
-#: ../../include/nav.php:82 ../../include/nav.php:113 ../../boot.php:1614
-msgid "Logout"
-msgstr ""
-
-#: ../../include/nav.php:82 ../../include/nav.php:113
-msgid "End this session"
+#: ../../include/network.php:657
+msgid "view full size"
 msgstr ""
 
-#: ../../include/nav.php:85 ../../include/nav.php:144
-msgid "Home"
+#: ../../include/network.php:1885
+msgid "No Subject"
 msgstr ""
 
-#: ../../include/nav.php:85
-msgid "Your posts and conversations"
+#: ../../include/network.php:2146 ../../include/network.php:2147
+msgid "Friendica"
 msgstr ""
 
-#: ../../include/nav.php:86
-msgid "Your profile page"
+#: ../../include/network.php:2148
+msgid "OStatus"
 msgstr ""
 
-#: ../../include/nav.php:88
-msgid "Manage/Edit profiles"
+#: ../../include/network.php:2149
+msgid "GNU-Social"
 msgstr ""
 
-#: ../../include/nav.php:90
-msgid "Edit your profile"
+#: ../../include/network.php:2150
+msgid "RSS/Atom"
 msgstr ""
 
-#: ../../include/nav.php:92
-msgid "Your photos"
+#: ../../include/network.php:2152
+msgid "Diaspora"
 msgstr ""
 
-#: ../../include/nav.php:93
-msgid "Your files"
+#: ../../include/network.php:2153
+msgid "Facebook"
 msgstr ""
 
-#: ../../include/nav.php:96
-msgid "Your chatrooms"
+#: ../../include/network.php:2154
+msgid "Zot"
 msgstr ""
 
-#: ../../include/nav.php:102
-msgid "Your bookmarks"
+#: ../../include/network.php:2155
+msgid "LinkedIn"
 msgstr ""
 
-#: ../../include/nav.php:106
-msgid "Your webpages"
+#: ../../include/network.php:2156
+msgid "XMPP/IM"
 msgstr ""
 
-#: ../../include/nav.php:110
-msgid "Sign in"
+#: ../../include/network.php:2157
+msgid "MySpace"
 msgstr ""
 
-#: ../../include/nav.php:127
+#: ../../include/photos.php:110
 #, php-format
-msgid "%s - click to logout"
-msgstr ""
-
-#: ../../include/nav.php:130
-msgid "Remote authentication"
-msgstr ""
-
-#: ../../include/nav.php:130
-msgid "Click to authenticate to your home hub"
-msgstr ""
-
-#: ../../include/nav.php:144
-msgid "Home Page"
-msgstr ""
-
-#: ../../include/nav.php:147
-msgid "Create an account"
-msgstr ""
-
-#: ../../include/nav.php:159
-msgid "Help and documentation"
-msgstr ""
-
-#: ../../include/nav.php:163
-msgid "Applications, utilities, links, games"
-msgstr ""
-
-#: ../../include/nav.php:165
-msgid "Search site @name, #tag, ?docs, content"
-msgstr ""
-
-#: ../../include/nav.php:167
-msgid "Channel Directory"
-msgstr ""
-
-#: ../../include/nav.php:179
-msgid "Your grid"
-msgstr ""
-
-#: ../../include/nav.php:180
-msgid "Mark all grid notifications seen"
-msgstr ""
-
-#: ../../include/nav.php:182
-msgid "Channel home"
-msgstr ""
-
-#: ../../include/nav.php:183
-msgid "Mark all channel notifications seen"
-msgstr ""
-
-#: ../../include/nav.php:189
-msgid "Notices"
-msgstr ""
-
-#: ../../include/nav.php:189
-msgid "Notifications"
-msgstr ""
-
-#: ../../include/nav.php:190
-msgid "See all notifications"
-msgstr ""
-
-#: ../../include/nav.php:193
-msgid "Private mail"
-msgstr ""
-
-#: ../../include/nav.php:194
-msgid "See all private messages"
-msgstr ""
-
-#: ../../include/nav.php:195
-msgid "Mark all private messages seen"
-msgstr ""
-
-#: ../../include/nav.php:201
-msgid "Event Calendar"
+msgid "Image exceeds website size limit of %lu bytes"
 msgstr ""
 
-#: ../../include/nav.php:202
-msgid "See all events"
+#: ../../include/photos.php:117
+msgid "Image file is empty."
 msgstr ""
 
-#: ../../include/nav.php:203
-msgid "Mark all events seen"
+#: ../../include/photos.php:255
+msgid "Photo storage failed."
 msgstr ""
 
-#: ../../include/nav.php:206
-msgid "Manage Your Channels"
+#: ../../include/photos.php:295
+msgid "a new photo"
 msgstr ""
 
-#: ../../include/nav.php:208
-msgid "Account/Channel Settings"
+#: ../../include/photos.php:299
+#, php-format
+msgctxt "photo_upload"
+msgid "%1$s posted %2$s to %3$s"
 msgstr ""
 
-#: ../../include/nav.php:216
-msgid "Site Setup and Configuration"
+#: ../../include/photos.php:506
+msgid "Upload New Photos"
 msgstr ""
 
-#: ../../include/nav.php:252
-msgid "@name, #tag, ?doc, content"
+#: ../../include/zot.php:699
+msgid "Invalid data packet"
 msgstr ""
 
-#: ../../include/nav.php:253
-msgid "Please wait..."
+#: ../../include/zot.php:715
+msgid "Unable to verify channel signature"
 msgstr ""
 
-#: ../../include/oembed.php:324
-msgid "Embedded content"
+#: ../../include/zot.php:2363
+#, php-format
+msgid "Unable to verify site signature for %s"
 msgstr ""
 
-#: ../../include/oembed.php:333
-msgid "Embedding disabled"
+#: ../../include/zot.php:3712
+msgid "invalid target signature"
 msgstr ""
 
 #: ../../include/page_widgets.php:6
@@ -9555,25 +9587,35 @@ msgstr ""
 msgid "Custom/Expert Mode"
 msgstr ""
 
-#: ../../include/zot.php:680
-msgid "Invalid data packet"
+#: ../../include/activities.php:41
+msgid " and "
 msgstr ""
 
-#: ../../include/zot.php:696
-msgid "Unable to verify channel signature"
+#: ../../include/activities.php:49
+msgid "public profile"
 msgstr ""
 
-#: ../../include/zot.php:2332
+#: ../../include/activities.php:58
 #, php-format
-msgid "Unable to verify site signature for %s"
+msgid "%1$s changed %2$s to &ldquo;%3$s&rdquo;"
 msgstr ""
 
-#: ../../include/zot.php:3670
-msgid "invalid target signature"
+#: ../../include/activities.php:59
+#, php-format
+msgid "Visit %1$s's %2$s"
 msgstr ""
 
-#: ../../include/api.php:1338
-msgid "Public Timeline"
+#: ../../include/activities.php:62
+#, php-format
+msgid "%1$s has an updated %2$s, changing %3$s."
+msgstr ""
+
+#: ../../include/bb2diaspora.php:398
+msgid "Attachments:"
+msgstr ""
+
+#: ../../include/bb2diaspora.php:487
+msgid "$Projectname event notification:"
 msgstr ""
 
 #: ../../view/theme/redbasic/php/config.php:82
@@ -9712,62 +9754,62 @@ msgstr ""
 msgid "Set size of followup author photos"
 msgstr ""
 
-#: ../../boot.php:1075
+#: ../../boot.php:1162
 #, php-format
 msgctxt "opensearch"
 msgid "Search %1$s (%2$s)"
 msgstr ""
 
-#: ../../boot.php:1075
+#: ../../boot.php:1162
 msgctxt "opensearch"
 msgid "$Projectname"
 msgstr ""
 
-#: ../../boot.php:1392
+#: ../../boot.php:1480
 #, php-format
 msgid "Update %s failed. See error logs."
 msgstr ""
 
-#: ../../boot.php:1395
+#: ../../boot.php:1483
 #, php-format
 msgid "Update Error at %s"
 msgstr ""
 
-#: ../../boot.php:1596
+#: ../../boot.php:1684
 msgid ""
 "Create an account to access services and applications within the Hubzilla"
 msgstr ""
 
-#: ../../boot.php:1618
+#: ../../boot.php:1706
 msgid "Password"
 msgstr ""
 
-#: ../../boot.php:1619
+#: ../../boot.php:1707
 msgid "Remember me"
 msgstr ""
 
-#: ../../boot.php:1622
+#: ../../boot.php:1710
 msgid "Forgot your password?"
 msgstr ""
 
-#: ../../boot.php:2254
+#: ../../boot.php:2276
 msgid "toggle mobile"
 msgstr ""
 
-#: ../../boot.php:2407
+#: ../../boot.php:2425
 msgid "Website SSL certificate is not valid. Please correct."
 msgstr ""
 
-#: ../../boot.php:2410
+#: ../../boot.php:2428
 #, php-format
 msgid "[hubzilla] Website SSL error for %s"
 msgstr ""
 
-#: ../../boot.php:2447
+#: ../../boot.php:2469
 msgid "Cron/Scheduled tasks not running."
 msgstr ""
 
-#: ../../boot.php:2451
+#: ../../boot.php:2473
 #, php-format
 msgid "[hubzilla] Cron tasks not running on %s"
 msgstr ""
diff --git a/util/messages.po b/util/messages.po
index f3c9782f3..dd847e9e0 100644
--- a/util/messages.po
+++ b/util/messages.po
@@ -1023,7 +1023,7 @@ msgstr ""
 
 #: ../../include/widgets.php:136 ../../include/widgets.php:175
 #: ../../include/Contact.php:107 ../../include/conversation.php:956
-#: ../../include/identity.php:956 ../../mod/directory.php:316
+#: ../../include/channel.php:956 ../../mod/directory.php:316
 #: ../../mod/match.php:64 ../../mod/suggest.php:52
 msgid "Connect"
 msgstr ""
@@ -1088,8 +1088,8 @@ msgstr ""
 msgid "Family"
 msgstr ""
 
-#: ../../include/widgets.php:431 ../../include/identity.php:394
-#: ../../include/identity.php:395 ../../include/identity.php:402
+#: ../../include/widgets.php:431 ../../include/channel.php:394
+#: ../../include/channel.php:395 ../../include/channel.php:402
 #: ../../include/profile_selectors.php:80 ../../mod/settings.php:345
 #: ../../mod/settings.php:349 ../../mod/settings.php:350
 #: ../../mod/settings.php:353 ../../mod/settings.php:364
@@ -1206,7 +1206,7 @@ msgid "Finishes:"
 msgstr ""
 
 #: ../../include/event.php:50 ../../include/bb2diaspora.php:481
-#: ../../include/identity.php:1007 ../../mod/directory.php:302
+#: ../../include/channel.php:1007 ../../mod/directory.php:302
 #: ../../mod/events.php:684
 msgid "Location:"
 msgstr ""
@@ -1523,7 +1523,7 @@ msgid "View all"
 msgstr ""
 
 #: ../../include/ItemObject.php:179 ../../include/taxonomy.php:396
-#: ../../include/conversation.php:1712 ../../include/identity.php:1266
+#: ../../include/conversation.php:1712 ../../include/channel.php:1266
 #: ../../mod/photos.php:1019
 msgctxt "noun"
 msgid "Like"
@@ -1775,7 +1775,7 @@ msgstr ""
 msgid "Manage/Edit profiles"
 msgstr ""
 
-#: ../../include/nav.php:95 ../../include/identity.php:979
+#: ../../include/nav.php:95 ../../include/channel.php:979
 msgid "Edit Profile"
 msgstr ""
 
@@ -3279,48 +3279,48 @@ msgstr ""
 msgid "database storage failed."
 msgstr ""
 
-#: ../../include/identity.php:33
+#: ../../include/channel.php:33
 msgid "Unable to obtain identity information from database"
 msgstr ""
 
-#: ../../include/identity.php:67
+#: ../../include/channel.php:67
 msgid "Empty name"
 msgstr ""
 
-#: ../../include/identity.php:70
+#: ../../include/channel.php:70
 msgid "Name too long"
 msgstr ""
 
-#: ../../include/identity.php:186
+#: ../../include/channel.php:186
 msgid "No account identifier"
 msgstr ""
 
-#: ../../include/identity.php:198
+#: ../../include/channel.php:198
 msgid "Nickname is required."
 msgstr ""
 
-#: ../../include/identity.php:212
+#: ../../include/channel.php:212
 msgid "Reserved nickname. Please choose another."
 msgstr ""
 
-#: ../../include/identity.php:217 ../../include/dimport.php:34
+#: ../../include/channel.php:217 ../../include/dimport.php:34
 msgid ""
 "Nickname has unsupported characters or is already being used on this site."
 msgstr ""
 
-#: ../../include/identity.php:292
+#: ../../include/channel.php:292
 msgid "Unable to retrieve created identity"
 msgstr ""
 
-#: ../../include/identity.php:350
+#: ../../include/channel.php:350
 msgid "Default Profile"
 msgstr ""
 
-#: ../../include/identity.php:759
+#: ../../include/channel.php:759
 msgid "Requested channel is not available."
 msgstr ""
 
-#: ../../include/identity.php:806 ../../mod/profile.php:16
+#: ../../include/channel.php:806 ../../mod/profile.php:16
 #: ../../mod/achievements.php:11 ../../mod/webpages.php:29
 #: ../../mod/connect.php:13 ../../mod/hcard.php:8 ../../mod/blocks.php:29
 #: ../../mod/editlayout.php:27 ../../mod/editwebpage.php:28
@@ -3329,193 +3329,193 @@ msgstr ""
 msgid "Requested profile is not available."
 msgstr ""
 
-#: ../../include/identity.php:969 ../../mod/profiles.php:774
+#: ../../include/channel.php:969 ../../mod/profiles.php:774
 msgid "Change profile photo"
 msgstr ""
 
-#: ../../include/identity.php:975
+#: ../../include/channel.php:975
 msgid "Profiles"
 msgstr ""
 
-#: ../../include/identity.php:975
+#: ../../include/channel.php:975
 msgid "Manage/edit profiles"
 msgstr ""
 
-#: ../../include/identity.php:976 ../../mod/profiles.php:775
+#: ../../include/channel.php:976 ../../mod/profiles.php:775
 msgid "Create New Profile"
 msgstr ""
 
-#: ../../include/identity.php:991 ../../mod/profiles.php:786
+#: ../../include/channel.php:991 ../../mod/profiles.php:786
 msgid "Profile Image"
 msgstr ""
 
-#: ../../include/identity.php:994
+#: ../../include/channel.php:994
 msgid "visible to everybody"
 msgstr ""
 
-#: ../../include/identity.php:995 ../../mod/profiles.php:669
+#: ../../include/channel.php:995 ../../mod/profiles.php:669
 #: ../../mod/profiles.php:790
 msgid "Edit visibility"
 msgstr ""
 
-#: ../../include/identity.php:1011 ../../include/identity.php:1250
+#: ../../include/channel.php:1011 ../../include/channel.php:1250
 msgid "Gender:"
 msgstr ""
 
-#: ../../include/identity.php:1012 ../../include/identity.php:1294
+#: ../../include/channel.php:1012 ../../include/channel.php:1294
 msgid "Status:"
 msgstr ""
 
-#: ../../include/identity.php:1013 ../../include/identity.php:1305
+#: ../../include/channel.php:1013 ../../include/channel.php:1305
 msgid "Homepage:"
 msgstr ""
 
-#: ../../include/identity.php:1014
+#: ../../include/channel.php:1014
 msgid "Online Now"
 msgstr ""
 
-#: ../../include/identity.php:1097 ../../include/identity.php:1175
+#: ../../include/channel.php:1097 ../../include/channel.php:1175
 #: ../../mod/ping.php:324
 msgid "g A l F d"
 msgstr ""
 
-#: ../../include/identity.php:1098 ../../include/identity.php:1176
+#: ../../include/channel.php:1098 ../../include/channel.php:1176
 msgid "F d"
 msgstr ""
 
-#: ../../include/identity.php:1143 ../../include/identity.php:1215
+#: ../../include/channel.php:1143 ../../include/channel.php:1215
 #: ../../mod/ping.php:346
 msgid "[today]"
 msgstr ""
 
-#: ../../include/identity.php:1154
+#: ../../include/channel.php:1154
 msgid "Birthday Reminders"
 msgstr ""
 
-#: ../../include/identity.php:1155
+#: ../../include/channel.php:1155
 msgid "Birthdays this week:"
 msgstr ""
 
-#: ../../include/identity.php:1208
+#: ../../include/channel.php:1208
 msgid "[No description]"
 msgstr ""
 
-#: ../../include/identity.php:1226
+#: ../../include/channel.php:1226
 msgid "Event Reminders"
 msgstr ""
 
-#: ../../include/identity.php:1227
+#: ../../include/channel.php:1227
 msgid "Events this week:"
 msgstr ""
 
-#: ../../include/identity.php:1240 ../../include/identity.php:1357
+#: ../../include/channel.php:1240 ../../include/channel.php:1357
 #: ../../include/apps.php:138 ../../mod/profperm.php:112
 msgid "Profile"
 msgstr ""
 
-#: ../../include/identity.php:1248 ../../mod/settings.php:1056
+#: ../../include/channel.php:1248 ../../mod/settings.php:1056
 msgid "Full Name:"
 msgstr ""
 
-#: ../../include/identity.php:1255
+#: ../../include/channel.php:1255
 msgid "Like this channel"
 msgstr ""
 
-#: ../../include/identity.php:1279
+#: ../../include/channel.php:1279
 msgid "j F, Y"
 msgstr ""
 
-#: ../../include/identity.php:1280
+#: ../../include/channel.php:1280
 msgid "j F"
 msgstr ""
 
-#: ../../include/identity.php:1287
+#: ../../include/channel.php:1287
 msgid "Birthday:"
 msgstr ""
 
-#: ../../include/identity.php:1291 ../../mod/directory.php:297
+#: ../../include/channel.php:1291 ../../mod/directory.php:297
 msgid "Age:"
 msgstr ""
 
-#: ../../include/identity.php:1300
+#: ../../include/channel.php:1300
 #, php-format
 msgid "for %1$d %2$s"
 msgstr ""
 
-#: ../../include/identity.php:1303 ../../mod/profiles.php:691
+#: ../../include/channel.php:1303 ../../mod/profiles.php:691
 msgid "Sexual Preference:"
 msgstr ""
 
-#: ../../include/identity.php:1307 ../../mod/directory.php:313
+#: ../../include/channel.php:1307 ../../mod/directory.php:313
 #: ../../mod/profiles.php:693
 msgid "Hometown:"
 msgstr ""
 
-#: ../../include/identity.php:1309
+#: ../../include/channel.php:1309
 msgid "Tags:"
 msgstr ""
 
-#: ../../include/identity.php:1311 ../../mod/profiles.php:694
+#: ../../include/channel.php:1311 ../../mod/profiles.php:694
 msgid "Political Views:"
 msgstr ""
 
-#: ../../include/identity.php:1313
+#: ../../include/channel.php:1313
 msgid "Religion:"
 msgstr ""
 
-#: ../../include/identity.php:1315 ../../mod/directory.php:315
+#: ../../include/channel.php:1315 ../../mod/directory.php:315
 msgid "About:"
 msgstr ""
 
-#: ../../include/identity.php:1317
+#: ../../include/channel.php:1317
 msgid "Hobbies/Interests:"
 msgstr ""
 
-#: ../../include/identity.php:1319 ../../mod/profiles.php:697
+#: ../../include/channel.php:1319 ../../mod/profiles.php:697
 msgid "Likes:"
 msgstr ""
 
-#: ../../include/identity.php:1321 ../../mod/profiles.php:698
+#: ../../include/channel.php:1321 ../../mod/profiles.php:698
 msgid "Dislikes:"
 msgstr ""
 
-#: ../../include/identity.php:1323
+#: ../../include/channel.php:1323
 msgid "Contact information and Social Networks:"
 msgstr ""
 
-#: ../../include/identity.php:1325
+#: ../../include/channel.php:1325
 msgid "My other channels:"
 msgstr ""
 
-#: ../../include/identity.php:1327
+#: ../../include/channel.php:1327
 msgid "Musical interests:"
 msgstr ""
 
-#: ../../include/identity.php:1329
+#: ../../include/channel.php:1329
 msgid "Books, literature:"
 msgstr ""
 
-#: ../../include/identity.php:1331
+#: ../../include/channel.php:1331
 msgid "Television:"
 msgstr ""
 
-#: ../../include/identity.php:1333
+#: ../../include/channel.php:1333
 msgid "Film/dance/culture/entertainment:"
 msgstr ""
 
-#: ../../include/identity.php:1335
+#: ../../include/channel.php:1335
 msgid "Love/Romance:"
 msgstr ""
 
-#: ../../include/identity.php:1337
+#: ../../include/channel.php:1337
 msgid "Work/employment:"
 msgstr ""
 
-#: ../../include/identity.php:1339
+#: ../../include/channel.php:1339
 msgid "School/education:"
 msgstr ""
 
-#: ../../include/identity.php:1359
+#: ../../include/channel.php:1359
 msgid "Like this thing"
 msgstr ""
 
diff --git a/util/po2php.php b/util/po2php.php
index 66807083b..ab8c495f9 100644
--- a/util/po2php.php
+++ b/util/po2php.php
@@ -1,7 +1,7 @@
 <?php
 
 
-function po2php_run($argv, $argc) {
+function po2php_run($argc,$argv) {
 
 	if ($argc!=2) {
 		print "Usage: ".$argv[0]." <file.po>\n\n";
@@ -140,5 +140,5 @@ function trim_message($str) {
 }
 
 if (array_search(__file__,get_included_files())===0){
-  po2php_run($argv,$argc);
+  po2php_run($argc,$argv);
 }
diff --git a/util/safemode b/util/safemode
new file mode 100755
index 000000000..05ddbeafe
--- /dev/null
+++ b/util/safemode
@@ -0,0 +1,27 @@
+#!/usr/bin/env bash
+
+if [ $# == 0 ] ; then 
+	echo Usage: $0 on '|' $0 off
+	echo on saves current addons to addons-safemode and uninstalls all of them
+	echo off installs all addons in addons-safemode
+	exit
+fi
+
+
+if [ $1 == 'on' ] ; then
+	util/addons list > addons-safemode
+	for a in `cat addons-safemode` ; do
+		util/addons uninstall $a
+	done
+	exit
+fi
+
+if [ $1 == 'off' ] ; then
+	for a in `cat addons-safemode` ; do
+		util/addons install $a
+	done
+	exit
+fi
+
+
+
author	redmatrix <git@macgirvin.com>	2016-06-19 19:12:33 -0700
committer	redmatrix <git@macgirvin.com>	2016-06-19 19:12:33 -0700
commit	fb61c4fb3497d3751bb43f12cadee9e9c7776be9 (patch)
tree	604989e10424456783fccff1fccc5b14da26db7f /util
parent	bfaabfb7b5ff639992a01b0e1fc374cd43d536e9 (diff)
parent	4578649f758e65f1d87ebb98da7cd891d0b90d0d (diff)
download	volse-hubzilla-fb61c4fb3497d3751bb43f12cadee9e9c7776be9.tar.gz volse-hubzilla-fb61c4fb3497d3751bb43f12cadee9e9c7776be9.tar.bz2 volse-hubzilla-fb61c4fb3497d3751bb43f12cadee9e9c7776be9.zip