incorrect obj_type on several items

6 files changed, 621 insertions, 618 deletions

diff --git a/include/conversation.php b/include/conversation.php
index 3b534dc69..747bb5d0a 100644
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -1227,7 +1227,7 @@ function status_editor($a, $x, $popup = false) {
 		'$wait' => t('Please wait'),
 		'$permset' => t('Permission settings'),
 		'$shortpermset' => t('permissions'),
-		'$ptyp' => (($notes_cid) ? 'note' : 'wall'),
+		'$ptyp' => '',
 		'$content' => ((x($x,'body')) ? htmlspecialchars($x['body'], ENT_COMPAT,'UTF-8') : ''),
 		'$attachment' => ((x($x, 'attachment')) ? $x['attachment'] : ''),
 		'$post_id' => '',
diff --git a/include/items.php b/include/items.php
index ef1867c14..8c2e7deb2 100755
--- a/include/items.php
+++ b/include/items.php
@@ -2349,7 +2349,7 @@ function item_store($arr, $allow_exec = false) {
 				return $ret;
 			}
 
-			if($arr['obj_type'] == ACTIVITY_OBJ_NOTE)
+			if(($arr['obj_type'] == ACTIVITY_OBJ_NOTE) && (! $arr['object']))
 				$arr['obj_type'] = ACTIVITY_OBJ_COMMENT;
 
 			// is the new message multi-level threaded?
@@ -2870,6 +2870,7 @@ function send_status_notifications($post_id,$item) {
 	if($x) {
 		foreach($x as $xx) {
 			if($xx['author_xchan'] === $r[0]['channel_hash']) {
+
 				$notify = true;
 
 				// check for an unfollow thread activity - we should probably decode the obj and check the id
diff --git a/mod/item.php b/mod/item.php
index f32ff8844..b3ef57529 100644
--- a/mod/item.php
+++ b/mod/item.php
@@ -107,6 +107,7 @@ function item_post(&$a) {
 	$layout_mid  = ((x($_REQUEST,'layout_mid'))  ? escape_tags($_REQUEST['layout_mid']): '');
 	$plink       = ((x($_REQUEST,'permalink'))   ? escape_tags($_REQUEST['permalink']) : '');
 	$obj_type    = ((x($_REQUEST,'obj_type'))    ? escape_tags($_REQUEST['obj_type'])  : ACTIVITY_OBJ_NOTE);
+
 	// allow API to bulk load a bunch of imported items with sending out a bunch of posts. 
 	$nopush      = ((x($_REQUEST,'nopush'))      ? intval($_REQUEST['nopush'])         : 0);
 
diff --git a/mod/subthread.php b/mod/subthread.php
index 74d742b6a..ce087806e 100755
--- a/mod/subthread.php
+++ b/mod/subthread.php
@@ -147,7 +147,6 @@ function subthread_content(&$a) {
 	$arr['deny_cid']      = $item['deny_cid'];
 	$arr['deny_gid']      = $item['deny_gid'];
 
-
 	$post = item_store($arr);	
 	$post_id = $post['item_id'];
 
diff --git a/util/hmessages.po b/util/hmessages.po
index 2cd008851..9357552b3 100644
--- a/util/hmessages.po
+++ b/util/hmessages.po
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: 2015-12-04.1236\n"
+"Project-Id-Version: 2015-12-11.1243\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-12-04 00:03-0800\n"
+"POT-Creation-Date: 2015-12-11 00:03-0800\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,7 +17,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../../include/Contact.php:101 ../../include/identity.php:953
+#: ../../include/Contact.php:101 ../../include/identity.php:947
 #: ../../include/widgets.php:137 ../../include/widgets.php:175
 #: ../../include/conversation.php:953 ../../mod/match.php:64
 #: ../../mod/directory.php:318 ../../mod/suggest.php:52
@@ -76,25 +76,25 @@ msgstr ""
 #: ../../mod/editwebpage.php:125 ../../mod/profile.php:64
 #: ../../mod/profile.php:72 ../../mod/api.php:26 ../../mod/api.php:31
 #: ../../mod/fsuggest.php:78 ../../mod/sources.php:66
-#: ../../mod/notifications.php:66 ../../mod/photos.php:70
-#: ../../mod/profile_photo.php:341 ../../mod/profile_photo.php:354
-#: ../../mod/thing.php:271 ../../mod/thing.php:291 ../../mod/thing.php:328
-#: ../../mod/editblock.php:65 ../../mod/network.php:12
-#: ../../mod/pdledit.php:21 ../../mod/register.php:72
+#: ../../mod/notifications.php:66 ../../mod/invite.php:13
+#: ../../mod/invite.php:87 ../../mod/profile_photo.php:341
+#: ../../mod/profile_photo.php:354 ../../mod/thing.php:271
+#: ../../mod/thing.php:291 ../../mod/thing.php:328 ../../mod/editblock.php:65
+#: ../../mod/network.php:12 ../../mod/pdledit.php:21 ../../mod/register.php:72
 #: ../../mod/editlayout.php:63 ../../mod/editlayout.php:87
 #: ../../mod/settings.php:568 ../../mod/webpages.php:69
 #: ../../mod/appman.php:66 ../../mod/layouts.php:69 ../../mod/layouts.php:76
-#: ../../mod/layouts.php:87 ../../mod/locs.php:83 ../../mod/invite.php:13
-#: ../../mod/invite.php:104 ../../mod/regmod.php:17 ../../mod/channel.php:100
-#: ../../mod/channel.php:214 ../../mod/channel.php:254
-#: ../../mod/editpost.php:13 ../../mod/chat.php:94 ../../mod/chat.php:99
-#: ../../mod/viewsrc.php:14 ../../mod/authtest.php:13
-#: ../../mod/connections.php:29 ../../mod/manage.php:6 ../../mod/menu.php:74
-#: ../../mod/mail.php:118 ../../mod/service_limits.php:7
-#: ../../mod/suggest.php:26 ../../mod/events.php:260 ../../mod/message.php:16
-#: ../../mod/block.php:22 ../../mod/block.php:72 ../../mod/mitem.php:111
-#: ../../mod/sharedwithme.php:7 ../../mod/viewconnections.php:22
-#: ../../mod/viewconnections.php:27 ../../index.php:182 ../../index.php:365
+#: ../../mod/layouts.php:87 ../../mod/locs.php:83 ../../mod/regmod.php:17
+#: ../../mod/channel.php:100 ../../mod/channel.php:214
+#: ../../mod/channel.php:254 ../../mod/photos.php:70 ../../mod/editpost.php:13
+#: ../../mod/chat.php:94 ../../mod/chat.php:99 ../../mod/viewsrc.php:14
+#: ../../mod/authtest.php:13 ../../mod/connections.php:29
+#: ../../mod/manage.php:6 ../../mod/menu.php:74 ../../mod/mail.php:126
+#: ../../mod/service_limits.php:7 ../../mod/suggest.php:26
+#: ../../mod/events.php:260 ../../mod/message.php:16 ../../mod/block.php:22
+#: ../../mod/block.php:72 ../../mod/mitem.php:111 ../../mod/sharedwithme.php:7
+#: ../../mod/viewconnections.php:22 ../../mod/viewconnections.php:27
+#: ../../index.php:182 ../../index.php:365
 msgid "Permission denied."
 msgstr ""
 
@@ -148,16 +148,16 @@ msgstr ""
 msgid "Schedule Outbox"
 msgstr ""
 
-#: ../../include/RedDAV/RedBrowser.php:164 ../../include/widgets.php:1331
+#: ../../include/RedDAV/RedBrowser.php:164 ../../include/widgets.php:1330
 #: ../../include/conversation.php:1027 ../../include/apps.php:360
-#: ../../include/apps.php:415 ../../mod/photos.php:759
-#: ../../mod/photos.php:1198
+#: ../../include/apps.php:415 ../../mod/photos.php:754
+#: ../../mod/photos.php:1195
 msgid "Unknown"
 msgstr ""
 
 #: ../../include/RedDAV/RedBrowser.php:226 ../../include/conversation.php:1629
 #: ../../include/nav.php:93 ../../include/apps.php:135
-#: ../../mod/fbrowser.php:114
+#: ../../mod/fbrowser.php:109
 msgid "Files"
 msgstr ""
 
@@ -178,12 +178,12 @@ msgstr ""
 
 #: ../../include/RedDAV/RedBrowser.php:231
 #: ../../include/RedDAV/RedBrowser.php:305 ../../include/widgets.php:1343
-#: ../../mod/photos.php:784 ../../mod/photos.php:1317
-#: ../../mod/profile_photo.php:453
+#: ../../mod/profile_photo.php:453 ../../mod/photos.php:781
+#: ../../mod/photos.php:1316
 msgid "Upload"
 msgstr ""
 
-#: ../../include/RedDAV/RedBrowser.php:235 ../../mod/admin.php:974
+#: ../../include/RedDAV/RedBrowser.php:235 ../../mod/admin.php:981
 #: ../../mod/settings.php:588 ../../mod/settings.php:614
 #: ../../mod/sharedwithme.php:95
 msgid "Name"
@@ -218,10 +218,10 @@ msgstr ""
 #: ../../include/RedDAV/RedBrowser.php:241 ../../include/conversation.php:657
 #: ../../include/ItemObject.php:120 ../../include/apps.php:260
 #: ../../mod/group.php:173 ../../mod/blocks.php:155 ../../mod/connedit.php:551
-#: ../../mod/editwebpage.php:223 ../../mod/photos.php:1129
-#: ../../mod/thing.php:258 ../../mod/editblock.php:181 ../../mod/admin.php:809
-#: ../../mod/admin.php:968 ../../mod/editlayout.php:179
-#: ../../mod/settings.php:649 ../../mod/webpages.php:183
+#: ../../mod/editwebpage.php:223 ../../mod/thing.php:258
+#: ../../mod/editblock.php:181 ../../mod/admin.php:816 ../../mod/admin.php:975
+#: ../../mod/editlayout.php:179 ../../mod/settings.php:649
+#: ../../mod/webpages.php:183 ../../mod/photos.php:1126
 msgid "Delete"
 msgstr ""
 
@@ -252,7 +252,7 @@ msgid "Delete this item?"
 msgstr ""
 
 #: ../../include/js_strings.php:6 ../../include/ItemObject.php:696
-#: ../../mod/photos.php:1047 ../../mod/photos.php:1165
+#: ../../mod/photos.php:1044 ../../mod/photos.php:1162
 msgid "Comment"
 msgstr ""
 
@@ -325,17 +325,17 @@ msgstr ""
 #: ../../mod/poke.php:171 ../../mod/profiles.php:675
 #: ../../mod/connedit.php:715 ../../mod/fsuggest.php:108
 #: ../../mod/sources.php:104 ../../mod/sources.php:138
-#: ../../mod/import.php:527 ../../mod/photos.php:637 ../../mod/photos.php:1008
-#: ../../mod/photos.php:1048 ../../mod/photos.php:1166 ../../mod/thing.php:313
+#: ../../mod/import.php:527 ../../mod/invite.php:142 ../../mod/thing.php:313
 #: ../../mod/thing.php:359 ../../mod/import_items.php:122
-#: ../../mod/pdledit.php:58 ../../mod/admin.php:435 ../../mod/admin.php:802
-#: ../../mod/admin.php:966 ../../mod/admin.php:1103 ../../mod/admin.php:1297
-#: ../../mod/admin.php:1382 ../../mod/settings.php:586
+#: ../../mod/pdledit.php:58 ../../mod/admin.php:442 ../../mod/admin.php:809
+#: ../../mod/admin.php:973 ../../mod/admin.php:1110 ../../mod/admin.php:1304
+#: ../../mod/admin.php:1389 ../../mod/settings.php:586
 #: ../../mod/settings.php:698 ../../mod/settings.php:726
 #: ../../mod/settings.php:749 ../../mod/settings.php:834
 #: ../../mod/settings.php:1023 ../../mod/appman.php:99 ../../mod/locs.php:116
-#: ../../mod/invite.php:142 ../../mod/xchan.php:11 ../../mod/chat.php:184
-#: ../../mod/chat.php:213 ../../mod/mail.php:372 ../../mod/events.php:461
+#: ../../mod/xchan.php:11 ../../mod/photos.php:637 ../../mod/photos.php:1005
+#: ../../mod/photos.php:1045 ../../mod/photos.php:1163 ../../mod/chat.php:184
+#: ../../mod/chat.php:213 ../../mod/mail.php:380 ../../mod/events.php:461
 #: ../../mod/events.php:658 ../../mod/mitem.php:231
 #: ../../view/theme/redbasic/php/config.php:99
 msgid "Submit"
@@ -663,8 +663,8 @@ msgid "Visible to specific connections."
 msgstr ""
 
 #: ../../include/items.php:4319 ../../mod/filestorage.php:27
-#: ../../mod/thing.php:86 ../../mod/admin.php:127 ../../mod/admin.php:1005
-#: ../../mod/admin.php:1210 ../../mod/display.php:36 ../../mod/viewsrc.php:20
+#: ../../mod/thing.php:86 ../../mod/admin.php:127 ../../mod/admin.php:1012
+#: ../../mod/admin.php:1217 ../../mod/display.php:36 ../../mod/viewsrc.php:20
 msgid "Item not found."
 msgstr ""
 
@@ -690,36 +690,6 @@ msgstr ""
 msgid "Connection not found."
 msgstr ""
 
-#: ../../include/network.php:630
-msgid "view full size"
-msgstr ""
-
-#: ../../include/network.php:1608 ../../include/enotify.php:57
-msgid "$Projectname Notification"
-msgstr ""
-
-#: ../../include/network.php:1609 ../../include/enotify.php:58
-msgid "$projectname"
-msgstr ""
-
-#: ../../include/network.php:1611 ../../include/enotify.php:60
-msgid "Thank You,"
-msgstr ""
-
-#: ../../include/network.php:1613 ../../include/enotify.php:62
-#, php-format
-msgid "%s Administrator"
-msgstr ""
-
-#: ../../include/network.php:1655 ../../include/account.php:316
-#: ../../include/account.php:343 ../../include/account.php:403
-msgid "Administrator"
-msgstr ""
-
-#: ../../include/network.php:1669
-msgid "No Subject"
-msgstr ""
-
 #: ../../include/event.php:22 ../../include/bb2diaspora.php:471
 #: ../../include/text.php:1392
 msgid "l F d, Y \\@ g:i A"
@@ -735,7 +705,7 @@ msgstr ""
 msgid "Finishes:"
 msgstr ""
 
-#: ../../include/event.php:52 ../../include/identity.php:1004
+#: ../../include/event.php:52 ../../include/identity.php:998
 #: ../../include/bb2diaspora.php:493 ../../include/text.php:1407
 #: ../../mod/directory.php:304
 msgid "Location:"
@@ -830,206 +800,206 @@ msgstr ""
 msgid "Requested profile is not available."
 msgstr ""
 
-#: ../../include/identity.php:966 ../../mod/profiles.php:782
+#: ../../include/identity.php:960 ../../mod/profiles.php:782
 msgid "Change profile photo"
 msgstr ""
 
-#: ../../include/identity.php:972
+#: ../../include/identity.php:966
 msgid "Profiles"
 msgstr ""
 
-#: ../../include/identity.php:972
+#: ../../include/identity.php:966
 msgid "Manage/edit profiles"
 msgstr ""
 
-#: ../../include/identity.php:973 ../../mod/profiles.php:783
+#: ../../include/identity.php:967 ../../mod/profiles.php:783
 msgid "Create New Profile"
 msgstr ""
 
-#: ../../include/identity.php:976 ../../include/nav.php:90
+#: ../../include/identity.php:970 ../../include/nav.php:90
 msgid "Edit Profile"
 msgstr ""
 
-#: ../../include/identity.php:988 ../../mod/profiles.php:794
+#: ../../include/identity.php:982 ../../mod/profiles.php:794
 msgid "Profile Image"
 msgstr ""
 
-#: ../../include/identity.php:991
+#: ../../include/identity.php:985
 msgid "visible to everybody"
 msgstr ""
 
-#: ../../include/identity.php:992 ../../mod/profiles.php:677
+#: ../../include/identity.php:986 ../../mod/profiles.php:677
 #: ../../mod/profiles.php:798
 msgid "Edit visibility"
 msgstr ""
 
-#: ../../include/identity.php:1008 ../../include/identity.php:1248
+#: ../../include/identity.php:1002 ../../include/identity.php:1242
 msgid "Gender:"
 msgstr ""
 
-#: ../../include/identity.php:1009 ../../include/identity.php:1292
+#: ../../include/identity.php:1003 ../../include/identity.php:1286
 msgid "Status:"
 msgstr ""
 
-#: ../../include/identity.php:1010 ../../include/identity.php:1303
+#: ../../include/identity.php:1004 ../../include/identity.php:1297
 msgid "Homepage:"
 msgstr ""
 
-#: ../../include/identity.php:1011
+#: ../../include/identity.php:1005
 msgid "Online Now"
 msgstr ""
 
-#: ../../include/identity.php:1095 ../../include/identity.php:1173
+#: ../../include/identity.php:1089 ../../include/identity.php:1167
 #: ../../mod/ping.php:318
 msgid "g A l F d"
 msgstr ""
 
-#: ../../include/identity.php:1096 ../../include/identity.php:1174
+#: ../../include/identity.php:1090 ../../include/identity.php:1168
 msgid "F d"
 msgstr ""
 
-#: ../../include/identity.php:1141 ../../include/identity.php:1213
+#: ../../include/identity.php:1135 ../../include/identity.php:1207
 #: ../../mod/ping.php:341
 msgid "[today]"
 msgstr ""
 
-#: ../../include/identity.php:1152
+#: ../../include/identity.php:1146
 msgid "Birthday Reminders"
 msgstr ""
 
-#: ../../include/identity.php:1153
+#: ../../include/identity.php:1147
 msgid "Birthdays this week:"
 msgstr ""
 
-#: ../../include/identity.php:1206
+#: ../../include/identity.php:1200
 msgid "[No description]"
 msgstr ""
 
-#: ../../include/identity.php:1224
+#: ../../include/identity.php:1218
 msgid "Event Reminders"
 msgstr ""
 
-#: ../../include/identity.php:1225
+#: ../../include/identity.php:1219
 msgid "Events this week:"
 msgstr ""
 
-#: ../../include/identity.php:1238 ../../include/identity.php:1355
+#: ../../include/identity.php:1232 ../../include/identity.php:1349
 #: ../../include/apps.php:138 ../../mod/profperm.php:112
 msgid "Profile"
 msgstr ""
 
-#: ../../include/identity.php:1246 ../../mod/settings.php:1029
+#: ../../include/identity.php:1240 ../../mod/settings.php:1029
 msgid "Full Name:"
 msgstr ""
 
-#: ../../include/identity.php:1253
+#: ../../include/identity.php:1247
 msgid "Like this channel"
 msgstr ""
 
-#: ../../include/identity.php:1264 ../../include/taxonomy.php:414
+#: ../../include/identity.php:1258 ../../include/taxonomy.php:414
 #: ../../include/conversation.php:1721 ../../include/ItemObject.php:179
-#: ../../mod/photos.php:1086
+#: ../../mod/photos.php:1083
 msgctxt "noun"
 msgid "Like"
 msgid_plural "Likes"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../../include/identity.php:1277
+#: ../../include/identity.php:1271
 msgid "j F, Y"
 msgstr ""
 
-#: ../../include/identity.php:1278
+#: ../../include/identity.php:1272
 msgid "j F"
 msgstr ""
 
-#: ../../include/identity.php:1285
+#: ../../include/identity.php:1279
 msgid "Birthday:"
 msgstr ""
 
-#: ../../include/identity.php:1289 ../../mod/directory.php:299
+#: ../../include/identity.php:1283 ../../mod/directory.php:299
 msgid "Age:"
 msgstr ""
 
-#: ../../include/identity.php:1298
+#: ../../include/identity.php:1292
 #, php-format
 msgid "for %1$d %2$s"
 msgstr ""
 
-#: ../../include/identity.php:1301 ../../mod/profiles.php:699
+#: ../../include/identity.php:1295 ../../mod/profiles.php:699
 msgid "Sexual Preference:"
 msgstr ""
 
-#: ../../include/identity.php:1305 ../../mod/profiles.php:701
+#: ../../include/identity.php:1299 ../../mod/profiles.php:701
 #: ../../mod/directory.php:315
 msgid "Hometown:"
 msgstr ""
 
-#: ../../include/identity.php:1307
+#: ../../include/identity.php:1301
 msgid "Tags:"
 msgstr ""
 
-#: ../../include/identity.php:1309 ../../mod/profiles.php:702
+#: ../../include/identity.php:1303 ../../mod/profiles.php:702
 msgid "Political Views:"
 msgstr ""
 
-#: ../../include/identity.php:1311
+#: ../../include/identity.php:1305
 msgid "Religion:"
 msgstr ""
 
-#: ../../include/identity.php:1313 ../../mod/directory.php:317
+#: ../../include/identity.php:1307 ../../mod/directory.php:317
 msgid "About:"
 msgstr ""
 
-#: ../../include/identity.php:1315
+#: ../../include/identity.php:1309
 msgid "Hobbies/Interests:"
 msgstr ""
 
-#: ../../include/identity.php:1317 ../../mod/profiles.php:705
+#: ../../include/identity.php:1311 ../../mod/profiles.php:705
 msgid "Likes:"
 msgstr ""
 
-#: ../../include/identity.php:1319 ../../mod/profiles.php:706
+#: ../../include/identity.php:1313 ../../mod/profiles.php:706
 msgid "Dislikes:"
 msgstr ""
 
-#: ../../include/identity.php:1321
+#: ../../include/identity.php:1315
 msgid "Contact information and Social Networks:"
 msgstr ""
 
-#: ../../include/identity.php:1323
+#: ../../include/identity.php:1317
 msgid "My other channels:"
 msgstr ""
 
-#: ../../include/identity.php:1325
+#: ../../include/identity.php:1319
 msgid "Musical interests:"
 msgstr ""
 
-#: ../../include/identity.php:1327
+#: ../../include/identity.php:1321
 msgid "Books, literature:"
 msgstr ""
 
-#: ../../include/identity.php:1329
+#: ../../include/identity.php:1323
 msgid "Television:"
 msgstr ""
 
-#: ../../include/identity.php:1331
+#: ../../include/identity.php:1325
 msgid "Film/dance/culture/entertainment:"
 msgstr ""
 
-#: ../../include/identity.php:1333
+#: ../../include/identity.php:1327
 msgid "Love/Romance:"
 msgstr ""
 
-#: ../../include/identity.php:1335
+#: ../../include/identity.php:1329
 msgid "Work/employment:"
 msgstr ""
 
-#: ../../include/identity.php:1337
+#: ../../include/identity.php:1331
 msgid "School/education:"
 msgstr ""
 
-#: ../../include/identity.php:1357
+#: ../../include/identity.php:1351
 msgid "Like this thing"
 msgstr ""
 
@@ -1095,13 +1065,13 @@ msgid "Other networks and post services"
 msgstr ""
 
 #: ../../include/acl_selectors.php:249 ../../mod/filestorage.php:147
-#: ../../mod/photos.php:631 ../../mod/photos.php:1001 ../../mod/thing.php:310
-#: ../../mod/thing.php:356 ../../mod/chat.php:211
+#: ../../mod/thing.php:310 ../../mod/thing.php:356 ../../mod/photos.php:631
+#: ../../mod/photos.php:998 ../../mod/chat.php:211
 msgid "Permissions"
 msgstr ""
 
 #: ../../include/acl_selectors.php:250 ../../include/ItemObject.php:384
-#: ../../mod/photos.php:1218
+#: ../../mod/photos.php:1215
 msgid "Close"
 msgstr ""
 
@@ -1263,7 +1233,7 @@ msgstr ""
 
 #: ../../include/widgets.php:192 ../../include/text.php:868
 #: ../../include/text.php:880 ../../mod/rbmark.php:28 ../../mod/rbmark.php:100
-#: ../../mod/admin.php:1442 ../../mod/admin.php:1462 ../../mod/filer.php:49
+#: ../../mod/admin.php:1449 ../../mod/admin.php:1469 ../../mod/filer.php:49
 msgid "Save"
 msgstr ""
 
@@ -1356,8 +1326,8 @@ msgid "Channel Sources"
 msgstr ""
 
 #: ../../include/widgets.php:554 ../../include/nav.php:202
-#: ../../include/apps.php:134 ../../mod/admin.php:1064
-#: ../../mod/admin.php:1264
+#: ../../include/apps.php:134 ../../mod/admin.php:1071
+#: ../../mod/admin.php:1271
 msgid "Settings"
 msgstr ""
 
@@ -1493,7 +1463,7 @@ msgstr ""
 msgid "For Developers"
 msgstr ""
 
-#: ../../include/widgets.php:1214 ../../mod/admin.php:434
+#: ../../include/widgets.php:1214 ../../mod/admin.php:441
 msgid "Site"
 msgstr ""
 
@@ -1501,17 +1471,17 @@ msgstr ""
 msgid "Accounts"
 msgstr ""
 
-#: ../../include/widgets.php:1216 ../../mod/admin.php:965
+#: ../../include/widgets.php:1216 ../../mod/admin.php:972
 msgid "Channels"
 msgstr ""
 
-#: ../../include/widgets.php:1217 ../../mod/admin.php:1062
-#: ../../mod/admin.php:1102
+#: ../../include/widgets.php:1217 ../../mod/admin.php:1069
+#: ../../mod/admin.php:1109
 msgid "Plugins"
 msgstr ""
 
-#: ../../include/widgets.php:1218 ../../mod/admin.php:1262
-#: ../../mod/admin.php:1296
+#: ../../include/widgets.php:1218 ../../mod/admin.php:1269
+#: ../../mod/admin.php:1303
 msgid "Themes"
 msgstr ""
 
@@ -1528,7 +1498,7 @@ msgid "DB updates"
 msgstr ""
 
 #: ../../include/widgets.php:1239 ../../include/widgets.php:1245
-#: ../../mod/admin.php:1381
+#: ../../mod/admin.php:1388
 msgid "Logs"
 msgstr ""
 
@@ -1544,12 +1514,12 @@ msgstr ""
 msgid "User registrations waiting for confirmation"
 msgstr ""
 
-#: ../../include/widgets.php:1325 ../../mod/photos.php:753
-#: ../../mod/photos.php:1286
+#: ../../include/widgets.php:1324 ../../mod/photos.php:748
+#: ../../mod/photos.php:1283
 msgid "View Photo"
 msgstr ""
 
-#: ../../include/widgets.php:1341 ../../mod/photos.php:782
+#: ../../include/widgets.php:1341 ../../mod/photos.php:779
 msgid "Edit Album"
 msgstr ""
 
@@ -2206,42 +2176,42 @@ msgctxt "mood"
 msgid "%1$s is %2$s"
 msgstr ""
 
-#: ../../include/conversation.php:574 ../../mod/photos.php:1063
+#: ../../include/conversation.php:574 ../../mod/photos.php:1060
 msgctxt "title"
 msgid "Likes"
 msgstr ""
 
-#: ../../include/conversation.php:574 ../../mod/photos.php:1063
+#: ../../include/conversation.php:574 ../../mod/photos.php:1060
 msgctxt "title"
 msgid "Dislikes"
 msgstr ""
 
-#: ../../include/conversation.php:575 ../../mod/photos.php:1064
+#: ../../include/conversation.php:575 ../../mod/photos.php:1061
 msgctxt "title"
 msgid "Agree"
 msgstr ""
 
-#: ../../include/conversation.php:575 ../../mod/photos.php:1064
+#: ../../include/conversation.php:575 ../../mod/photos.php:1061
 msgctxt "title"
 msgid "Disagree"
 msgstr ""
 
-#: ../../include/conversation.php:575 ../../mod/photos.php:1064
+#: ../../include/conversation.php:575 ../../mod/photos.php:1061
 msgctxt "title"
 msgid "Abstain"
 msgstr ""
 
-#: ../../include/conversation.php:576 ../../mod/photos.php:1065
+#: ../../include/conversation.php:576 ../../mod/photos.php:1062
 msgctxt "title"
 msgid "Attending"
 msgstr ""
 
-#: ../../include/conversation.php:576 ../../mod/photos.php:1065
+#: ../../include/conversation.php:576 ../../mod/photos.php:1062
 msgctxt "title"
 msgid "Not attending"
 msgstr ""
 
-#: ../../include/conversation.php:576 ../../mod/photos.php:1065
+#: ../../include/conversation.php:576 ../../mod/photos.php:1062
 msgctxt "title"
 msgid "Might attend"
 msgstr ""
@@ -2296,8 +2266,8 @@ msgstr ""
 
 #: ../../include/conversation.php:740 ../../include/conversation.php:1227
 #: ../../include/ItemObject.php:389 ../../mod/editwebpage.php:190
-#: ../../mod/photos.php:1029 ../../mod/editblock.php:150
-#: ../../mod/editlayout.php:148 ../../mod/editpost.php:129
+#: ../../mod/editblock.php:150 ../../mod/editlayout.php:148
+#: ../../mod/photos.php:1026 ../../mod/editpost.php:129
 msgid "Please wait"
 msgstr ""
 
@@ -2403,8 +2373,8 @@ msgstr ""
 msgid "Visible to <strong>everybody</strong>"
 msgstr ""
 
-#: ../../include/conversation.php:1155 ../../mod/mail.php:194
-#: ../../mod/mail.php:308
+#: ../../include/conversation.php:1155 ../../mod/mail.php:202
+#: ../../mod/mail.php:316
 msgid "Please enter a link URL:"
 msgstr ""
 
@@ -2429,21 +2399,21 @@ msgid "Where are you right now?"
 msgstr ""
 
 #: ../../include/conversation.php:1161 ../../mod/editpost.php:56
-#: ../../mod/mail.php:195 ../../mod/mail.php:309
+#: ../../mod/mail.php:203 ../../mod/mail.php:317
 msgid "Expires YYYY-MM-DD HH:MM"
 msgstr ""
 
 #: ../../include/conversation.php:1169 ../../include/page_widgets.php:40
 #: ../../include/ItemObject.php:706 ../../mod/editwebpage.php:212
-#: ../../mod/photos.php:1049 ../../mod/editblock.php:171
-#: ../../mod/webpages.php:188 ../../mod/editpost.php:149
+#: ../../mod/editblock.php:171 ../../mod/webpages.php:188
+#: ../../mod/photos.php:1046 ../../mod/editpost.php:149
 #: ../../mod/events.php:458
 msgid "Preview"
 msgstr ""
 
 #: ../../include/conversation.php:1192 ../../mod/blocks.php:154
-#: ../../mod/photos.php:1028 ../../mod/webpages.php:182
-#: ../../mod/layouts.php:184
+#: ../../mod/webpages.php:182 ../../mod/layouts.php:184
+#: ../../mod/photos.php:1025
 msgid "Share"
 msgstr ""
 
@@ -2497,7 +2467,7 @@ msgstr ""
 
 #: ../../include/conversation.php:1206 ../../mod/editwebpage.php:183
 #: ../../mod/editblock.php:143 ../../mod/editlayout.php:141
-#: ../../mod/editpost.php:119 ../../mod/mail.php:240 ../../mod/mail.php:370
+#: ../../mod/editpost.php:119 ../../mod/mail.php:248 ../../mod/mail.php:378
 msgid "Attach file"
 msgstr ""
 
@@ -2507,7 +2477,7 @@ msgstr ""
 
 #: ../../include/conversation.php:1208 ../../mod/editwebpage.php:184
 #: ../../mod/editblock.php:144 ../../mod/editlayout.php:142
-#: ../../mod/editpost.php:120 ../../mod/mail.php:241 ../../mod/mail.php:371
+#: ../../mod/editpost.php:120 ../../mod/mail.php:249 ../../mod/mail.php:379
 msgid "Insert web link"
 msgstr ""
 
@@ -2590,7 +2560,7 @@ msgstr ""
 
 #: ../../include/conversation.php:1252 ../../mod/editwebpage.php:217
 #: ../../mod/editblock.php:176 ../../mod/editlayout.php:173
-#: ../../mod/editpost.php:155 ../../mod/mail.php:245 ../../mod/mail.php:375
+#: ../../mod/editpost.php:155 ../../mod/mail.php:253 ../../mod/mail.php:383
 msgid "Set expiration date"
 msgstr ""
 
@@ -2599,7 +2569,7 @@ msgid "Set publish date"
 msgstr ""
 
 #: ../../include/conversation.php:1257 ../../include/ItemObject.php:709
-#: ../../mod/editpost.php:157 ../../mod/mail.php:247 ../../mod/mail.php:377
+#: ../../mod/editpost.php:157 ../../mod/mail.php:255 ../../mod/mail.php:385
 msgid "Encrypt text"
 msgstr ""
 
@@ -2607,8 +2577,8 @@ msgstr ""
 msgid "OK"
 msgstr ""
 
-#: ../../include/conversation.php:1260 ../../mod/fbrowser.php:82
-#: ../../mod/fbrowser.php:117 ../../mod/tagrm.php:11 ../../mod/tagrm.php:134
+#: ../../include/conversation.php:1260 ../../mod/fbrowser.php:77
+#: ../../mod/fbrowser.php:112 ../../mod/tagrm.php:11 ../../mod/tagrm.php:134
 #: ../../mod/settings.php:587 ../../mod/settings.php:613
 #: ../../mod/editpost.php:160
 msgid "Cancel"
@@ -2667,7 +2637,7 @@ msgstr ""
 msgid "Posts flagged as SPAM"
 msgstr ""
 
-#: ../../include/conversation.php:1601 ../../mod/admin.php:973
+#: ../../include/conversation.php:1601 ../../mod/admin.php:980
 msgid "Channel"
 msgstr ""
 
@@ -2719,13 +2689,13 @@ msgid "Manage Webpages"
 msgstr ""
 
 #: ../../include/conversation.php:1697 ../../include/ItemObject.php:175
-#: ../../include/ItemObject.php:187 ../../mod/photos.php:1082
-#: ../../mod/photos.php:1094
+#: ../../include/ItemObject.php:187 ../../mod/photos.php:1079
+#: ../../mod/photos.php:1091
 msgid "View all"
 msgstr ""
 
 #: ../../include/conversation.php:1724 ../../include/ItemObject.php:184
-#: ../../mod/photos.php:1091
+#: ../../mod/photos.php:1088
 msgctxt "noun"
 msgid "Dislike"
 msgid_plural "Dislikes"
@@ -2823,7 +2793,7 @@ msgid "RSS/Atom"
 msgstr ""
 
 #: ../../include/contact_selectors.php:79 ../../mod/id.php:15
-#: ../../mod/id.php:16 ../../mod/admin.php:805 ../../mod/admin.php:814
+#: ../../mod/id.php:16 ../../mod/admin.php:812 ../../mod/admin.php:821
 #: ../../boot.php:1483
 msgid "Email"
 msgstr ""
@@ -2922,7 +2892,7 @@ msgid_plural "%d invitations available"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../../include/contact_widgets.php:19 ../../mod/admin.php:439
+#: ../../include/contact_widgets.php:19 ../../mod/admin.php:446
 msgid "Advanced"
 msgstr ""
 
@@ -2975,6 +2945,23 @@ msgstr[1] ""
 msgid "show more"
 msgstr ""
 
+#: ../../include/enotify.php:57 ../../include/network.php:1608
+msgid "$Projectname Notification"
+msgstr ""
+
+#: ../../include/enotify.php:58 ../../include/network.php:1609
+msgid "$projectname"
+msgstr ""
+
+#: ../../include/enotify.php:60 ../../include/network.php:1611
+msgid "Thank You,"
+msgstr ""
+
+#: ../../include/enotify.php:62 ../../include/network.php:1613
+#, php-format
+msgid "%s Administrator"
+msgstr ""
+
 #: ../../include/enotify.php:96
 #, php-format
 msgid "%s <!item_type!>"
@@ -3169,19 +3156,19 @@ msgstr ""
 msgid "Channel was deleted and no longer exists."
 msgstr ""
 
-#: ../../include/follow.php:152 ../../include/follow.php:180
+#: ../../include/follow.php:152 ../../include/follow.php:181
 msgid "Protocol disabled."
 msgstr ""
 
-#: ../../include/follow.php:170
+#: ../../include/follow.php:171
 msgid "Channel discovery failed."
 msgstr ""
 
-#: ../../include/follow.php:196
+#: ../../include/follow.php:197
 msgid "local account not found."
 msgstr ""
 
-#: ../../include/follow.php:220
+#: ../../include/follow.php:221
 msgid "Cannot connect to yourself."
 msgstr ""
 
@@ -3687,7 +3674,7 @@ msgstr ""
 #: ../../include/dir_fns.php:143 ../../mod/filestorage.php:151
 #: ../../mod/filestorage.php:159 ../../mod/removeme.php:60
 #: ../../mod/connedit.php:635 ../../mod/connedit.php:684 ../../mod/api.php:106
-#: ../../mod/photos.php:626 ../../mod/admin.php:410 ../../mod/settings.php:577
+#: ../../mod/admin.php:410 ../../mod/settings.php:577 ../../mod/photos.php:626
 #: ../../mod/menu.php:96 ../../mod/menu.php:153 ../../mod/events.php:447
 #: ../../mod/events.php:448 ../../mod/events.php:457 ../../mod/mitem.php:154
 #: ../../mod/mitem.php:155 ../../mod/mitem.php:228 ../../mod/mitem.php:229
@@ -3699,8 +3686,8 @@ msgstr ""
 #: ../../include/dir_fns.php:141 ../../include/dir_fns.php:142
 #: ../../include/dir_fns.php:143 ../../mod/filestorage.php:151
 #: ../../mod/filestorage.php:159 ../../mod/removeme.php:60
-#: ../../mod/api.php:105 ../../mod/photos.php:626 ../../mod/admin.php:412
-#: ../../mod/settings.php:577 ../../mod/menu.php:96 ../../mod/menu.php:153
+#: ../../mod/api.php:105 ../../mod/admin.php:412 ../../mod/settings.php:577
+#: ../../mod/photos.php:626 ../../mod/menu.php:96 ../../mod/menu.php:153
 #: ../../mod/events.php:447 ../../mod/events.php:448 ../../mod/events.php:457
 #: ../../mod/mitem.php:154 ../../mod/mitem.php:155 ../../mod/mitem.php:228
 #: ../../mod/mitem.php:229 ../../view/theme/redbasic/php/config.php:104
@@ -3727,7 +3714,7 @@ msgstr ""
 msgid "Add new connections to this collection (privacy group)"
 msgstr ""
 
-#: ../../include/group.php:251 ../../mod/admin.php:814
+#: ../../include/group.php:251 ../../mod/admin.php:821
 msgid "All Channels"
 msgstr ""
 
@@ -3759,12 +3746,12 @@ msgstr ""
 msgid "Unable to verify channel signature"
 msgstr ""
 
-#: ../../include/zot.php:2259
+#: ../../include/zot.php:2275
 #, php-format
 msgid "Unable to verify site signature for %s"
 msgstr ""
 
-#: ../../include/zot.php:3586
+#: ../../include/zot.php:3601
 msgid "invalid target signature"
 msgstr ""
 
@@ -3799,6 +3786,19 @@ msgstr ""
 msgid "Edited"
 msgstr ""
 
+#: ../../include/network.php:630
+msgid "view full size"
+msgstr ""
+
+#: ../../include/network.php:1655 ../../include/account.php:316
+#: ../../include/account.php:343 ../../include/account.php:403
+msgid "Administrator"
+msgstr ""
+
+#: ../../include/network.php:1669
+msgid "No Subject"
+msgstr ""
+
 #: ../../include/dba/dba_driver.php:141
 #, php-format
 msgid "Cannot locate DNS info for database server '%s'"
@@ -3873,11 +3873,11 @@ msgstr ""
 msgid "Add Tag"
 msgstr ""
 
-#: ../../include/ItemObject.php:254 ../../mod/photos.php:1026
+#: ../../include/ItemObject.php:254 ../../mod/photos.php:1023
 msgid "I like this (toggle)"
 msgstr ""
 
-#: ../../include/ItemObject.php:255 ../../mod/photos.php:1027
+#: ../../include/ItemObject.php:255 ../../mod/photos.php:1024
 msgid "I don't like this (toggle)"
 msgstr ""
 
@@ -3933,18 +3933,18 @@ msgstr ""
 msgid "Mark all seen"
 msgstr ""
 
-#: ../../include/ItemObject.php:378 ../../mod/photos.php:1212
+#: ../../include/ItemObject.php:378 ../../mod/photos.php:1209
 msgctxt "noun"
 msgid "Likes"
 msgstr ""
 
-#: ../../include/ItemObject.php:379 ../../mod/photos.php:1213
+#: ../../include/ItemObject.php:379 ../../mod/photos.php:1210
 msgctxt "noun"
 msgid "Dislikes"
 msgstr ""
 
-#: ../../include/ItemObject.php:694 ../../mod/photos.php:1045
-#: ../../mod/photos.php:1163
+#: ../../include/ItemObject.php:694 ../../mod/photos.php:1042
+#: ../../mod/photos.php:1160
 msgid "This is you"
 msgstr ""
 
@@ -3960,78 +3960,6 @@ msgstr ""
 msgid "Video"
 msgstr ""
 
-#: ../../include/account.php:27
-msgid "Not a valid email address"
-msgstr ""
-
-#: ../../include/account.php:29
-msgid "Your email domain is not among those allowed on this site"
-msgstr ""
-
-#: ../../include/account.php:35
-msgid "Your email address is already registered at this site."
-msgstr ""
-
-#: ../../include/account.php:67
-msgid "An invitation is required."
-msgstr ""
-
-#: ../../include/account.php:71
-msgid "Invitation could not be verified."
-msgstr ""
-
-#: ../../include/account.php:121
-msgid "Please enter the required information."
-msgstr ""
-
-#: ../../include/account.php:188
-msgid "Failed to store account information."
-msgstr ""
-
-#: ../../include/account.php:248
-#, php-format
-msgid "Registration confirmation for %s"
-msgstr ""
-
-#: ../../include/account.php:314
-#, php-format
-msgid "Registration request at %s"
-msgstr ""
-
-#: ../../include/account.php:338
-msgid "your registration password"
-msgstr ""
-
-#: ../../include/account.php:341 ../../include/account.php:401
-#, php-format
-msgid "Registration details for %s"
-msgstr ""
-
-#: ../../include/account.php:410
-msgid "Account approved."
-msgstr ""
-
-#: ../../include/account.php:449
-#, php-format
-msgid "Registration revoked for %s"
-msgstr ""
-
-#: ../../include/account.php:494
-msgid "Account verified. Please login."
-msgstr ""
-
-#: ../../include/account.php:707 ../../include/account.php:709
-msgid "Click here to upgrade."
-msgstr ""
-
-#: ../../include/account.php:715
-msgid "This action exceeds the limits set by your subscription plan."
-msgstr ""
-
-#: ../../include/account.php:720
-msgid "This action is not available under your subscription plan."
-msgstr ""
-
 #: ../../include/apps.php:128
 msgid "Site Admin"
 msgstr ""
@@ -4212,12 +4140,84 @@ msgstr ""
 msgid "Custom/Expert Mode"
 msgstr ""
 
-#: ../../include/photo/photo_driver.php:719 ../../mod/photos.php:94
-#: ../../mod/photos.php:699 ../../mod/profile_photo.php:147
+#: ../../include/photo/photo_driver.php:719 ../../mod/profile_photo.php:147
 #: ../../mod/profile_photo.php:239 ../../mod/profile_photo.php:379
+#: ../../mod/photos.php:94 ../../mod/photos.php:699
 msgid "Profile Photos"
 msgstr ""
 
+#: ../../include/account.php:27
+msgid "Not a valid email address"
+msgstr ""
+
+#: ../../include/account.php:29
+msgid "Your email domain is not among those allowed on this site"
+msgstr ""
+
+#: ../../include/account.php:35
+msgid "Your email address is already registered at this site."
+msgstr ""
+
+#: ../../include/account.php:67
+msgid "An invitation is required."
+msgstr ""
+
+#: ../../include/account.php:71
+msgid "Invitation could not be verified."
+msgstr ""
+
+#: ../../include/account.php:121
+msgid "Please enter the required information."
+msgstr ""
+
+#: ../../include/account.php:188
+msgid "Failed to store account information."
+msgstr ""
+
+#: ../../include/account.php:248
+#, php-format
+msgid "Registration confirmation for %s"
+msgstr ""
+
+#: ../../include/account.php:314
+#, php-format
+msgid "Registration request at %s"
+msgstr ""
+
+#: ../../include/account.php:338
+msgid "your registration password"
+msgstr ""
+
+#: ../../include/account.php:341 ../../include/account.php:401
+#, php-format
+msgid "Registration details for %s"
+msgstr ""
+
+#: ../../include/account.php:410
+msgid "Account approved."
+msgstr ""
+
+#: ../../include/account.php:449
+#, php-format
+msgid "Registration revoked for %s"
+msgstr ""
+
+#: ../../include/account.php:494
+msgid "Account verified. Please login."
+msgstr ""
+
+#: ../../include/account.php:707 ../../include/account.php:709
+msgid "Click here to upgrade."
+msgstr ""
+
+#: ../../include/account.php:715
+msgid "This action exceeds the limits set by your subscription plan."
+msgstr ""
+
+#: ../../include/account.php:720
+msgid "This action is not available under your subscription plan."
+msgstr ""
+
 #: ../../mod/filestorage.php:82
 msgid "Permission Denied."
 msgstr ""
@@ -4419,7 +4419,8 @@ msgstr ""
 msgid "OpenID protocol error. No ID returned."
 msgstr ""
 
-#: ../../mod/openid.php:72 ../../mod/openid.php:179 ../../mod/post.php:285
+#: ../../mod/openid.php:72 ../../mod/openid.php:179
+#: ../../Zotlabs/Zot/Auth.php:248
 #, php-format
 msgid "Welcome %s. Remote authentication successful."
 msgstr ""
@@ -4828,7 +4829,7 @@ msgstr ""
 msgid "System check"
 msgstr ""
 
-#: ../../mod/setup.php:285 ../../mod/photos.php:914 ../../mod/events.php:653
+#: ../../mod/setup.php:285 ../../mod/photos.php:911 ../../mod/events.php:653
 #: ../../mod/events.php:660
 msgid "Next"
 msgstr ""
@@ -5215,15 +5216,6 @@ msgstr ""
 msgid "My Connections Bookmarks"
 msgstr ""
 
-#: ../../mod/home.php:57 ../../mod/home.php:65 ../../mod/siteinfo.php:61
-msgid "$Projectname"
-msgstr ""
-
-#: ../../mod/home.php:75
-#, php-format
-msgid "Welcome to %s"
-msgstr ""
-
 #: ../../mod/pconfig.php:27 ../../mod/pconfig.php:60
 msgid "This setting requires special processing and editing has been blocked."
 msgstr ""
@@ -5328,7 +5320,7 @@ msgstr ""
 msgid "Interests"
 msgstr ""
 
-#: ../../mod/profiles.php:457 ../../mod/admin.php:974
+#: ../../mod/profiles.php:457 ../../mod/admin.php:981
 msgid "Address"
 msgstr ""
 
@@ -5581,11 +5573,11 @@ msgstr ""
 msgid "View recent posts and comments"
 msgstr ""
 
-#: ../../mod/connedit.php:519 ../../mod/admin.php:811
+#: ../../mod/connedit.php:519 ../../mod/admin.php:818
 msgid "Unblock"
 msgstr ""
 
-#: ../../mod/connedit.php:519 ../../mod/admin.php:810
+#: ../../mod/connedit.php:519 ../../mod/admin.php:817
 msgid "Block"
 msgstr ""
 
@@ -5741,7 +5733,7 @@ msgid ""
 "communication."
 msgstr ""
 
-#: ../../mod/connedit.php:710 ../../mod/admin.php:807
+#: ../../mod/connedit.php:710 ../../mod/admin.php:814
 msgid "Approve"
 msgstr ""
 
@@ -6054,7 +6046,7 @@ msgstr ""
 msgid "Select a tag to remove: "
 msgstr ""
 
-#: ../../mod/tagrm.php:133 ../../mod/photos.php:954
+#: ../../mod/tagrm.php:133 ../../mod/photos.php:951
 msgid "Remove"
 msgstr ""
 
@@ -6322,155 +6314,73 @@ msgid ""
 "only once and leave this page open until finished."
 msgstr ""
 
-#: ../../mod/photos.php:79
-msgid "Page owner information could not be retrieved."
-msgstr ""
-
-#: ../../mod/photos.php:100
-msgid "Album not found."
-msgstr ""
-
-#: ../../mod/photos.php:127
-msgid "Delete Album"
+#: ../../mod/invite.php:25
+msgid "Total invitation limit exceeded."
 msgstr ""
 
-#: ../../mod/photos.php:171 ../../mod/photos.php:1009
-msgid "Delete Photo"
+#: ../../mod/invite.php:49
+#, php-format
+msgid "%s : Not a valid email address."
 msgstr ""
 
-#: ../../mod/photos.php:501
-msgid "No photos selected"
+#: ../../mod/invite.php:59
+msgid "Please join us on $Projectname"
 msgstr ""
 
-#: ../../mod/photos.php:550
-msgid "Access to this item is restricted."
+#: ../../mod/invite.php:70
+msgid "Invitation limit exceeded. Please contact your site administrator."
 msgstr ""
 
-#: ../../mod/photos.php:589
+#: ../../mod/invite.php:75
 #, php-format
-msgid "%1$.2f MB of %2$.2f MB photo storage used."
+msgid "%s : Message delivery failed."
 msgstr ""
 
-#: ../../mod/photos.php:592
+#: ../../mod/invite.php:79
 #, php-format
-msgid "%1$.2f MB photo storage used."
-msgstr ""
-
-#: ../../mod/photos.php:620
-msgid "Upload Photos"
-msgstr ""
-
-#: ../../mod/photos.php:624
-msgid "Enter an album name"
-msgstr ""
-
-#: ../../mod/photos.php:625
-msgid "or select an existing album (doubleclick)"
-msgstr ""
-
-#: ../../mod/photos.php:626
-msgid "Create a status post for this upload"
-msgstr ""
-
-#: ../../mod/photos.php:627
-msgid "Caption (optional):"
-msgstr ""
-
-#: ../../mod/photos.php:628
-msgid "Description (optional):"
-msgstr ""
-
-#: ../../mod/photos.php:655
-msgid "Album name could not be decoded"
-msgstr ""
-
-#: ../../mod/photos.php:699 ../../mod/photos.php:1236
-#: ../../mod/photos.php:1253
-msgid "Contact Photos"
-msgstr ""
-
-#: ../../mod/photos.php:727
-msgid "Show Newest First"
-msgstr ""
-
-#: ../../mod/photos.php:729
-msgid "Show Oldest First"
-msgstr ""
-
-#: ../../mod/photos.php:827
-msgid "Permission denied. Access to this item may be restricted."
-msgstr ""
-
-#: ../../mod/photos.php:829
-msgid "Photo not available"
-msgstr ""
-
-#: ../../mod/photos.php:887
-msgid "Use as profile photo"
-msgstr ""
-
-#: ../../mod/photos.php:894
-msgid "Private Photo"
-msgstr ""
-
-#: ../../mod/photos.php:905 ../../mod/events.php:652 ../../mod/events.php:659
-msgid "Previous"
-msgstr ""
-
-#: ../../mod/photos.php:909
-msgid "View Full Size"
-msgstr ""
-
-#: ../../mod/photos.php:988
-msgid "Edit photo"
-msgstr ""
-
-#: ../../mod/photos.php:990
-msgid "Rotate CW (right)"
-msgstr ""
-
-#: ../../mod/photos.php:991
-msgid "Rotate CCW (left)"
-msgstr ""
+msgid "%d message sent."
+msgid_plural "%d messages sent."
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../../mod/photos.php:994
-msgid "Enter a new album name"
+#: ../../mod/invite.php:98
+msgid "You have no more invitations available"
 msgstr ""
 
-#: ../../mod/photos.php:995
-msgid "or select an existing one (doubleclick)"
+#: ../../mod/invite.php:129
+msgid "Send invitations"
 msgstr ""
 
-#: ../../mod/photos.php:998
-msgid "Caption"
+#: ../../mod/invite.php:130
+msgid "Enter email addresses, one per line:"
 msgstr ""
 
-#: ../../mod/photos.php:1000
-msgid "Add a Tag"
+#: ../../mod/invite.php:131 ../../mod/mail.php:246
+msgid "Your message:"
 msgstr ""
 
-#: ../../mod/photos.php:1004
-msgid "Example: @bob, @Barbara_Jensen, @jim@example.com"
+#: ../../mod/invite.php:132
+msgid "Please join my community on $Projectname."
 msgstr ""
 
-#: ../../mod/photos.php:1007
-msgid "Flag as adult in album view"
+#: ../../mod/invite.php:134
+msgid "You will need to supply this invitation code: "
 msgstr ""
 
-#: ../../mod/photos.php:1199
-msgid "In This Photo:"
+#: ../../mod/invite.php:135
+msgid "1. Register at any $Projectname location (they are all inter-connected)"
 msgstr ""
 
-#: ../../mod/photos.php:1204
-msgid "Map"
+#: ../../mod/invite.php:137
+msgid "2. Enter my $Projectname network address into the site searchbar."
 msgstr ""
 
-#: ../../mod/photos.php:1292
-msgid "View Album"
+#: ../../mod/invite.php:138
+msgid "or visit "
 msgstr ""
 
-#: ../../mod/photos.php:1315
-msgid "Recent Photos"
+#: ../../mod/invite.php:140
+msgid "3. Click [Connect]"
 msgstr ""
 
 #: ../../mod/probe.php:24 ../../mod/probe.php:30
@@ -6782,7 +6692,7 @@ msgstr ""
 msgid "I am over 13 years of age and accept the %s for this website"
 msgstr ""
 
-#: ../../mod/register.php:207 ../../mod/admin.php:436
+#: ../../mod/register.php:207 ../../mod/admin.php:443
 msgid "Registration"
 msgstr ""
 
@@ -6842,10 +6752,10 @@ msgstr ""
 msgid "Message queues"
 msgstr ""
 
-#: ../../mod/admin.php:198 ../../mod/admin.php:433 ../../mod/admin.php:532
-#: ../../mod/admin.php:800 ../../mod/admin.php:964 ../../mod/admin.php:1061
-#: ../../mod/admin.php:1101 ../../mod/admin.php:1261 ../../mod/admin.php:1295
-#: ../../mod/admin.php:1380
+#: ../../mod/admin.php:198 ../../mod/admin.php:440 ../../mod/admin.php:539
+#: ../../mod/admin.php:807 ../../mod/admin.php:971 ../../mod/admin.php:1068
+#: ../../mod/admin.php:1108 ../../mod/admin.php:1268 ../../mod/admin.php:1302
+#: ../../mod/admin.php:1387
 msgid "Administration"
 msgstr ""
 
@@ -6857,7 +6767,7 @@ msgstr ""
 msgid "Registered accounts"
 msgstr ""
 
-#: ../../mod/admin.php:203 ../../mod/admin.php:536
+#: ../../mod/admin.php:203 ../../mod/admin.php:543
 msgid "Pending registrations"
 msgstr ""
 
@@ -6865,7 +6775,7 @@ msgstr ""
 msgid "Registered channels"
 msgstr ""
 
-#: ../../mod/admin.php:205 ../../mod/admin.php:537
+#: ../../mod/admin.php:205 ../../mod/admin.php:544
 msgid "Active plugins"
 msgstr ""
 
@@ -6909,638 +6819,638 @@ msgstr ""
 msgid "My site offers free accounts with optional paid upgrades"
 msgstr ""
 
-#: ../../mod/admin.php:437
+#: ../../mod/admin.php:444
 msgid "File upload"
 msgstr ""
 
-#: ../../mod/admin.php:438
+#: ../../mod/admin.php:445
 msgid "Policies"
 msgstr ""
 
-#: ../../mod/admin.php:443
+#: ../../mod/admin.php:450
 msgid "Site name"
 msgstr ""
 
-#: ../../mod/admin.php:444
+#: ../../mod/admin.php:451
 msgid "Banner/Logo"
 msgstr ""
 
-#: ../../mod/admin.php:445
+#: ../../mod/admin.php:452
 msgid "Administrator Information"
 msgstr ""
 
-#: ../../mod/admin.php:445
+#: ../../mod/admin.php:452
 msgid ""
 "Contact information for site administrators.  Displayed on siteinfo page.  "
 "BBCode can be used here"
 msgstr ""
 
-#: ../../mod/admin.php:446
+#: ../../mod/admin.php:453
 msgid "System language"
 msgstr ""
 
-#: ../../mod/admin.php:447
+#: ../../mod/admin.php:454
 msgid "System theme"
 msgstr ""
 
-#: ../../mod/admin.php:447
+#: ../../mod/admin.php:454
 msgid ""
 "Default system theme - may be over-ridden by user profiles - <a href='#' "
 "id='cnftheme'>change theme settings</a>"
 msgstr ""
 
-#: ../../mod/admin.php:448
+#: ../../mod/admin.php:455
 msgid "Mobile system theme"
 msgstr ""
 
-#: ../../mod/admin.php:448
+#: ../../mod/admin.php:455
 msgid "Theme for mobile devices"
 msgstr ""
 
-#: ../../mod/admin.php:450
+#: ../../mod/admin.php:457
 msgid "Allow Feeds as Connections"
 msgstr ""
 
-#: ../../mod/admin.php:450
+#: ../../mod/admin.php:457
 msgid "(Heavy system resource usage)"
 msgstr ""
 
-#: ../../mod/admin.php:451
+#: ../../mod/admin.php:458
 msgid "Maximum image size"
 msgstr ""
 
-#: ../../mod/admin.php:451
+#: ../../mod/admin.php:458
 msgid ""
 "Maximum size in bytes of uploaded images. Default is 0, which means no "
 "limits."
 msgstr ""
 
-#: ../../mod/admin.php:452
+#: ../../mod/admin.php:459
 msgid "Does this site allow new member registration?"
 msgstr ""
 
-#: ../../mod/admin.php:453
+#: ../../mod/admin.php:460
 msgid "Which best describes the types of account offered by this hub?"
 msgstr ""
 
-#: ../../mod/admin.php:454
+#: ../../mod/admin.php:461
 msgid "Register text"
 msgstr ""
 
-#: ../../mod/admin.php:454
+#: ../../mod/admin.php:461
 msgid "Will be displayed prominently on the registration page."
 msgstr ""
 
-#: ../../mod/admin.php:455
+#: ../../mod/admin.php:462
 msgid "Site homepage to show visitors (default: login box)"
 msgstr ""
 
-#: ../../mod/admin.php:455
+#: ../../mod/admin.php:462
 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 ""
 
-#: ../../mod/admin.php:456
+#: ../../mod/admin.php:463
 msgid "Preserve site homepage URL"
 msgstr ""
 
-#: ../../mod/admin.php:456
+#: ../../mod/admin.php:463
 msgid ""
 "Present the site homepage in a frame at the original location instead of "
 "redirecting"
 msgstr ""
 
-#: ../../mod/admin.php:457
+#: ../../mod/admin.php:464
 msgid "Accounts abandoned after x days"
 msgstr ""
 
-#: ../../mod/admin.php:457
+#: ../../mod/admin.php:464
 msgid ""
 "Will not waste system resources polling external sites for abandonded "
 "accounts. Enter 0 for no time limit."
 msgstr ""
 
-#: ../../mod/admin.php:458
+#: ../../mod/admin.php:465
 msgid "Allowed friend domains"
 msgstr ""
 
-#: ../../mod/admin.php:458
+#: ../../mod/admin.php:465
 msgid ""
 "Comma separated list of domains which are allowed to establish friendships "
 "with this site. Wildcards are accepted. Empty to allow any domains"
 msgstr ""
 
-#: ../../mod/admin.php:459
+#: ../../mod/admin.php:466
 msgid "Allowed email domains"
 msgstr ""
 
-#: ../../mod/admin.php:459
+#: ../../mod/admin.php:466
 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 ""
 
-#: ../../mod/admin.php:460
+#: ../../mod/admin.php:467
 msgid "Not allowed email domains"
 msgstr ""
 
-#: ../../mod/admin.php:460
+#: ../../mod/admin.php:467
 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 ""
 
-#: ../../mod/admin.php:461
+#: ../../mod/admin.php:468
 msgid "Block public"
 msgstr ""
 
-#: ../../mod/admin.php:461
+#: ../../mod/admin.php:468
 msgid ""
 "Check to block public access to all otherwise public personal pages on this "
 "site unless you are currently logged in."
 msgstr ""
 
-#: ../../mod/admin.php:462
+#: ../../mod/admin.php:469
 msgid "Verify Email Addresses"
 msgstr ""
 
-#: ../../mod/admin.php:462
+#: ../../mod/admin.php:469
 msgid ""
 "Check to verify email addresses used in account registration (recommended)."
 msgstr ""
 
-#: ../../mod/admin.php:463
+#: ../../mod/admin.php:470
 msgid "Force publish"
 msgstr ""
 
-#: ../../mod/admin.php:463
+#: ../../mod/admin.php:470
 msgid ""
 "Check to force all profiles on this site to be listed in the site directory."
 msgstr ""
 
-#: ../../mod/admin.php:464
-msgid "Disable discovery tab"
+#: ../../mod/admin.php:471
+msgid "Import Public Streams"
 msgstr ""
 
-#: ../../mod/admin.php:464
+#: ../../mod/admin.php:471
 msgid ""
-"Remove the tab in the network view with public content pulled from sources "
-"chosen for this site."
+"Import and allow access to public content pulled from other sites. Warning: "
+"this content is unmoderated."
 msgstr ""
 
-#: ../../mod/admin.php:465
+#: ../../mod/admin.php:472
 msgid "login on Homepage"
 msgstr ""
 
-#: ../../mod/admin.php:465
+#: ../../mod/admin.php:472
 msgid ""
 "Present a login box to visitors on the home page if no other content has "
 "been configured."
 msgstr ""
 
-#: ../../mod/admin.php:467
+#: ../../mod/admin.php:474
 msgid "Directory Server URL"
 msgstr ""
 
-#: ../../mod/admin.php:467
+#: ../../mod/admin.php:474
 msgid "Default directory server"
 msgstr ""
 
-#: ../../mod/admin.php:469
+#: ../../mod/admin.php:476
 msgid "Proxy user"
 msgstr ""
 
-#: ../../mod/admin.php:470
+#: ../../mod/admin.php:477
 msgid "Proxy URL"
 msgstr ""
 
-#: ../../mod/admin.php:471
+#: ../../mod/admin.php:478
 msgid "Network timeout"
 msgstr ""
 
-#: ../../mod/admin.php:471
+#: ../../mod/admin.php:478
 msgid "Value is in seconds. Set to 0 for unlimited (not recommended)."
 msgstr ""
 
-#: ../../mod/admin.php:472
+#: ../../mod/admin.php:479
 msgid "Delivery interval"
 msgstr ""
 
-#: ../../mod/admin.php:472
+#: ../../mod/admin.php:479
 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 ""
 
-#: ../../mod/admin.php:473
+#: ../../mod/admin.php:480
 msgid "Deliveries per process"
 msgstr ""
 
-#: ../../mod/admin.php:473
+#: ../../mod/admin.php:480
 msgid ""
 "Number of deliveries to attempt in a single operating system process. Adjust "
 "if necessary to tune system performance. Recommend: 1-5."
 msgstr ""
 
-#: ../../mod/admin.php:474
+#: ../../mod/admin.php:481
 msgid "Poll interval"
 msgstr ""
 
-#: ../../mod/admin.php:474
+#: ../../mod/admin.php:481
 msgid ""
 "Delay background polling processes by this many seconds to reduce system "
 "load. If 0, use delivery interval."
 msgstr ""
 
-#: ../../mod/admin.php:475
+#: ../../mod/admin.php:482
 msgid "Maximum Load Average"
 msgstr ""
 
-#: ../../mod/admin.php:475
+#: ../../mod/admin.php:482
 msgid ""
 "Maximum system load before delivery and poll processes are deferred - "
 "default 50."
 msgstr ""
 
-#: ../../mod/admin.php:476
+#: ../../mod/admin.php:483
 msgid "Expiration period in days for imported (matrix/network) content"
 msgstr ""
 
-#: ../../mod/admin.php:476
+#: ../../mod/admin.php:483
 msgid "0 for no expiration of imported content"
 msgstr ""
 
-#: ../../mod/admin.php:524
+#: ../../mod/admin.php:531
 msgid "No server found"
 msgstr ""
 
-#: ../../mod/admin.php:531 ../../mod/admin.php:814
+#: ../../mod/admin.php:538 ../../mod/admin.php:821
 msgid "ID"
 msgstr ""
 
-#: ../../mod/admin.php:531
+#: ../../mod/admin.php:538
 msgid "for channel"
 msgstr ""
 
-#: ../../mod/admin.php:531
+#: ../../mod/admin.php:538
 msgid "on server"
 msgstr ""
 
-#: ../../mod/admin.php:531
+#: ../../mod/admin.php:538
 msgid "Status"
 msgstr ""
 
-#: ../../mod/admin.php:533
+#: ../../mod/admin.php:540
 msgid "Server"
 msgstr ""
 
-#: ../../mod/admin.php:550
+#: ../../mod/admin.php:557
 msgid "Update has been marked successful"
 msgstr ""
 
-#: ../../mod/admin.php:560
+#: ../../mod/admin.php:567
 #, php-format
 msgid "Executing %s failed. Check system logs."
 msgstr ""
 
-#: ../../mod/admin.php:563
+#: ../../mod/admin.php:570
 #, php-format
 msgid "Update %s was successfully applied."
 msgstr ""
 
-#: ../../mod/admin.php:567
+#: ../../mod/admin.php:574
 #, php-format
 msgid "Update %s did not return a status. Unknown if it succeeded."
 msgstr ""
 
-#: ../../mod/admin.php:570
+#: ../../mod/admin.php:577
 #, php-format
 msgid "Update function %s could not be found."
 msgstr ""
 
-#: ../../mod/admin.php:586
+#: ../../mod/admin.php:593
 msgid "No failed updates."
 msgstr ""
 
-#: ../../mod/admin.php:590
+#: ../../mod/admin.php:597
 msgid "Failed Updates"
 msgstr ""
 
-#: ../../mod/admin.php:592
+#: ../../mod/admin.php:599
 msgid "Mark success (if update was manually applied)"
 msgstr ""
 
-#: ../../mod/admin.php:593
+#: ../../mod/admin.php:600
 msgid "Attempt to execute this update step automatically"
 msgstr ""
 
-#: ../../mod/admin.php:625
+#: ../../mod/admin.php:632
 msgid "Queue Statistics"
 msgstr ""
 
-#: ../../mod/admin.php:626
+#: ../../mod/admin.php:633
 msgid "Total Entries"
 msgstr ""
 
-#: ../../mod/admin.php:627
+#: ../../mod/admin.php:634
 msgid "Priority"
 msgstr ""
 
-#: ../../mod/admin.php:628
+#: ../../mod/admin.php:635
 msgid "Destination URL"
 msgstr ""
 
-#: ../../mod/admin.php:629
+#: ../../mod/admin.php:636
 msgid "Mark hub permanently offline"
 msgstr ""
 
-#: ../../mod/admin.php:630
+#: ../../mod/admin.php:637
 msgid "Empty queue for this hub"
 msgstr ""
 
-#: ../../mod/admin.php:631
+#: ../../mod/admin.php:638
 msgid "Last known contact"
 msgstr ""
 
-#: ../../mod/admin.php:667
+#: ../../mod/admin.php:674
 #, php-format
 msgid "%s account blocked/unblocked"
 msgid_plural "%s account blocked/unblocked"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../../mod/admin.php:675
+#: ../../mod/admin.php:682
 #, php-format
 msgid "%s account deleted"
 msgid_plural "%s accounts deleted"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../../mod/admin.php:711
+#: ../../mod/admin.php:718
 msgid "Account not found"
 msgstr ""
 
-#: ../../mod/admin.php:723
+#: ../../mod/admin.php:730
 #, php-format
 msgid "Account '%s' deleted"
 msgstr ""
 
-#: ../../mod/admin.php:731
+#: ../../mod/admin.php:738
 #, php-format
 msgid "Account '%s' blocked"
 msgstr ""
 
-#: ../../mod/admin.php:739
+#: ../../mod/admin.php:746
 #, php-format
 msgid "Account '%s' unblocked"
 msgstr ""
 
-#: ../../mod/admin.php:801 ../../mod/admin.php:813
+#: ../../mod/admin.php:808 ../../mod/admin.php:820
 msgid "Users"
 msgstr ""
 
-#: ../../mod/admin.php:803 ../../mod/admin.php:967
+#: ../../mod/admin.php:810 ../../mod/admin.php:974
 msgid "select all"
 msgstr ""
 
-#: ../../mod/admin.php:804
+#: ../../mod/admin.php:811
 msgid "User registrations waiting for confirm"
 msgstr ""
 
-#: ../../mod/admin.php:805
+#: ../../mod/admin.php:812
 msgid "Request date"
 msgstr ""
 
-#: ../../mod/admin.php:806
+#: ../../mod/admin.php:813
 msgid "No registrations."
 msgstr ""
 
-#: ../../mod/admin.php:808
+#: ../../mod/admin.php:815
 msgid "Deny"
 msgstr ""
 
-#: ../../mod/admin.php:814
+#: ../../mod/admin.php:821
 msgid "Register date"
 msgstr ""
 
-#: ../../mod/admin.php:814
+#: ../../mod/admin.php:821
 msgid "Last login"
 msgstr ""
 
-#: ../../mod/admin.php:814
+#: ../../mod/admin.php:821
 msgid "Expires"
 msgstr ""
 
-#: ../../mod/admin.php:814
+#: ../../mod/admin.php:821
 msgid "Service Class"
 msgstr ""
 
-#: ../../mod/admin.php:816
+#: ../../mod/admin.php:823
 msgid ""
 "Selected accounts will be deleted!\\n\\nEverything these accounts had posted "
 "on this site will be permanently deleted!\\n\\nAre you sure?"
 msgstr ""
 
-#: ../../mod/admin.php:817
+#: ../../mod/admin.php:824
 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 ""
 
-#: ../../mod/admin.php:853
+#: ../../mod/admin.php:860
 #, php-format
 msgid "%s channel censored/uncensored"
 msgid_plural "%s channels censored/uncensored"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../../mod/admin.php:862
+#: ../../mod/admin.php:869
 #, php-format
 msgid "%s channel code allowed/disallowed"
 msgid_plural "%s channels code allowed/disallowed"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../../mod/admin.php:869
+#: ../../mod/admin.php:876
 #, php-format
 msgid "%s channel deleted"
 msgid_plural "%s channels deleted"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../../mod/admin.php:889
+#: ../../mod/admin.php:896
 msgid "Channel not found"
 msgstr ""
 
-#: ../../mod/admin.php:900
+#: ../../mod/admin.php:907
 #, php-format
 msgid "Channel '%s' deleted"
 msgstr ""
 
-#: ../../mod/admin.php:912
+#: ../../mod/admin.php:919
 #, php-format
 msgid "Channel '%s' censored"
 msgstr ""
 
-#: ../../mod/admin.php:912
+#: ../../mod/admin.php:919
 #, php-format
 msgid "Channel '%s' uncensored"
 msgstr ""
 
-#: ../../mod/admin.php:923
+#: ../../mod/admin.php:930
 #, php-format
 msgid "Channel '%s' code allowed"
 msgstr ""
 
-#: ../../mod/admin.php:923
+#: ../../mod/admin.php:930
 #, php-format
 msgid "Channel '%s' code disallowed"
 msgstr ""
 
-#: ../../mod/admin.php:969
+#: ../../mod/admin.php:976
 msgid "Censor"
 msgstr ""
 
-#: ../../mod/admin.php:970
+#: ../../mod/admin.php:977
 msgid "Uncensor"
 msgstr ""
 
-#: ../../mod/admin.php:971
+#: ../../mod/admin.php:978
 msgid "Allow Code"
 msgstr ""
 
-#: ../../mod/admin.php:972
+#: ../../mod/admin.php:979
 msgid "Disallow Code"
 msgstr ""
 
-#: ../../mod/admin.php:974
+#: ../../mod/admin.php:981
 msgid "UID"
 msgstr ""
 
-#: ../../mod/admin.php:976
+#: ../../mod/admin.php:983
 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 ""
 
-#: ../../mod/admin.php:977
+#: ../../mod/admin.php:984
 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 ""
 
-#: ../../mod/admin.php:1017
+#: ../../mod/admin.php:1024
 #, php-format
 msgid "Plugin %s disabled."
 msgstr ""
 
-#: ../../mod/admin.php:1021
+#: ../../mod/admin.php:1028
 #, php-format
 msgid "Plugin %s enabled."
 msgstr ""
 
-#: ../../mod/admin.php:1031 ../../mod/admin.php:1234
+#: ../../mod/admin.php:1038 ../../mod/admin.php:1241
 msgid "Disable"
 msgstr ""
 
-#: ../../mod/admin.php:1034 ../../mod/admin.php:1236
+#: ../../mod/admin.php:1041 ../../mod/admin.php:1243
 msgid "Enable"
 msgstr ""
 
-#: ../../mod/admin.php:1063 ../../mod/admin.php:1263
+#: ../../mod/admin.php:1070 ../../mod/admin.php:1270
 msgid "Toggle"
 msgstr ""
 
-#: ../../mod/admin.php:1071 ../../mod/admin.php:1273
+#: ../../mod/admin.php:1078 ../../mod/admin.php:1280
 msgid "Author: "
 msgstr ""
 
-#: ../../mod/admin.php:1072 ../../mod/admin.php:1274
+#: ../../mod/admin.php:1079 ../../mod/admin.php:1281
 msgid "Maintainer: "
 msgstr ""
 
-#: ../../mod/admin.php:1199
+#: ../../mod/admin.php:1206
 msgid "No themes found."
 msgstr ""
 
-#: ../../mod/admin.php:1255
+#: ../../mod/admin.php:1262
 msgid "Screenshot"
 msgstr ""
 
-#: ../../mod/admin.php:1301
+#: ../../mod/admin.php:1308
 msgid "[Experimental]"
 msgstr ""
 
-#: ../../mod/admin.php:1302
+#: ../../mod/admin.php:1309
 msgid "[Unsupported]"
 msgstr ""
 
-#: ../../mod/admin.php:1326
+#: ../../mod/admin.php:1333
 msgid "Log settings updated."
 msgstr ""
 
-#: ../../mod/admin.php:1383
+#: ../../mod/admin.php:1390
 msgid "Clear"
 msgstr ""
 
-#: ../../mod/admin.php:1389
+#: ../../mod/admin.php:1396
 msgid "Debugging"
 msgstr ""
 
-#: ../../mod/admin.php:1390
+#: ../../mod/admin.php:1397
 msgid "Log file"
 msgstr ""
 
-#: ../../mod/admin.php:1390
+#: ../../mod/admin.php:1397
 msgid ""
 "Must be writable by web server. Relative to your Red top-level directory."
 msgstr ""
 
-#: ../../mod/admin.php:1391
+#: ../../mod/admin.php:1398
 msgid "Log level"
 msgstr ""
 
-#: ../../mod/admin.php:1437
+#: ../../mod/admin.php:1444
 msgid "New Profile Field"
 msgstr ""
 
-#: ../../mod/admin.php:1438 ../../mod/admin.php:1458
+#: ../../mod/admin.php:1445 ../../mod/admin.php:1465
 msgid "Field nickname"
 msgstr ""
 
-#: ../../mod/admin.php:1438 ../../mod/admin.php:1458
+#: ../../mod/admin.php:1445 ../../mod/admin.php:1465
 msgid "System name of field"
 msgstr ""
 
-#: ../../mod/admin.php:1439 ../../mod/admin.php:1459
+#: ../../mod/admin.php:1446 ../../mod/admin.php:1466
 msgid "Input type"
 msgstr ""
 
-#: ../../mod/admin.php:1440 ../../mod/admin.php:1460
+#: ../../mod/admin.php:1447 ../../mod/admin.php:1467
 msgid "Field Name"
 msgstr ""
 
-#: ../../mod/admin.php:1440 ../../mod/admin.php:1460
+#: ../../mod/admin.php:1447 ../../mod/admin.php:1467
 msgid "Label on profile pages"
 msgstr ""
 
-#: ../../mod/admin.php:1441 ../../mod/admin.php:1461
+#: ../../mod/admin.php:1448 ../../mod/admin.php:1468
 msgid "Help text"
 msgstr ""
 
-#: ../../mod/admin.php:1441 ../../mod/admin.php:1461
+#: ../../mod/admin.php:1448 ../../mod/admin.php:1468
 msgid "Additional info (optional)"
 msgstr ""
 
-#: ../../mod/admin.php:1451
+#: ../../mod/admin.php:1458
 msgid "Field definition not found"
 msgstr ""
 
-#: ../../mod/admin.php:1457
+#: ../../mod/admin.php:1464
 msgid "Edit Profile Field"
 msgstr ""
 
@@ -8258,101 +8168,193 @@ msgstr ""
 msgid "Use this form to drop the location if the hub is no longer operating."
 msgstr ""
 
-#: ../../mod/invite.php:25
-msgid "Total invitation limit exceeded."
+#: ../../mod/home.php:57 ../../mod/home.php:65 ../../mod/siteinfo.php:61
+msgid "$Projectname"
 msgstr ""
 
-#: ../../mod/invite.php:49
+#: ../../mod/home.php:75
 #, php-format
-msgid "%s : Not a valid email address."
+msgid "Welcome to %s"
 msgstr ""
 
-#: ../../mod/invite.php:76
-msgid "Please join us on $Projectname"
+#: ../../mod/regmod.php:11
+msgid "Please login."
 msgstr ""
 
-#: ../../mod/invite.php:87
-msgid "Invitation limit exceeded. Please contact your site administrator."
+#: ../../mod/xchan.php:6
+msgid "Xchan Lookup"
 msgstr ""
 
-#: ../../mod/invite.php:92
+#: ../../mod/xchan.php:9
+msgid "Lookup xchan beginning with (or webbie): "
+msgstr ""
+
+#: ../../mod/xchan.php:37 ../../mod/menu.php:162 ../../mod/mitem.php:116
+msgid "Not found."
+msgstr ""
+
+#: ../../mod/channel.php:25 ../../mod/chat.php:19
+msgid "You must be logged in to see this page."
+msgstr ""
+
+#: ../../mod/channel.php:97
+msgid "Insufficient permissions.  Request redirected to profile page."
+msgstr ""
+
+#: ../../mod/attach.php:9
+msgid "Item not available."
+msgstr ""
+
+#: ../../mod/photos.php:79
+msgid "Page owner information could not be retrieved."
+msgstr ""
+
+#: ../../mod/photos.php:100
+msgid "Album not found."
+msgstr ""
+
+#: ../../mod/photos.php:127
+msgid "Delete Album"
+msgstr ""
+
+#: ../../mod/photos.php:171 ../../mod/photos.php:1006
+msgid "Delete Photo"
+msgstr ""
+
+#: ../../mod/photos.php:501
+msgid "No photos selected"
+msgstr ""
+
+#: ../../mod/photos.php:550
+msgid "Access to this item is restricted."
+msgstr ""
+
+#: ../../mod/photos.php:589
 #, php-format
-msgid "%s : Message delivery failed."
+msgid "%1$.2f MB of %2$.2f MB photo storage used."
 msgstr ""
 
-#: ../../mod/invite.php:96
+#: ../../mod/photos.php:592
 #, php-format
-msgid "%d message sent."
-msgid_plural "%d messages sent."
-msgstr[0] ""
-msgstr[1] ""
+msgid "%1$.2f MB photo storage used."
+msgstr ""
 
-#: ../../mod/invite.php:115
-msgid "You have no more invitations available"
+#: ../../mod/photos.php:620
+msgid "Upload Photos"
 msgstr ""
 
-#: ../../mod/invite.php:129
-msgid "Send invitations"
+#: ../../mod/photos.php:624
+msgid "Enter an album name"
 msgstr ""
 
-#: ../../mod/invite.php:130
-msgid "Enter email addresses, one per line:"
+#: ../../mod/photos.php:625
+msgid "or select an existing album (doubleclick)"
 msgstr ""
 
-#: ../../mod/invite.php:131 ../../mod/mail.php:238
-msgid "Your message:"
+#: ../../mod/photos.php:626
+msgid "Create a status post for this upload"
 msgstr ""
 
-#: ../../mod/invite.php:132
-msgid "Please join my community on $Projectname."
+#: ../../mod/photos.php:627
+msgid "Caption (optional):"
 msgstr ""
 
-#: ../../mod/invite.php:134
-msgid "You will need to supply this invitation code: "
+#: ../../mod/photos.php:628
+msgid "Description (optional):"
 msgstr ""
 
-#: ../../mod/invite.php:135
-msgid "1. Register at any $Projectname location (they are all inter-connected)"
+#: ../../mod/photos.php:655
+msgid "Album name could not be decoded"
 msgstr ""
 
-#: ../../mod/invite.php:137
-msgid "2. Enter my $Projectname network address into the site searchbar."
+#: ../../mod/photos.php:699 ../../mod/photos.php:1233
+#: ../../mod/photos.php:1250
+msgid "Contact Photos"
 msgstr ""
 
-#: ../../mod/invite.php:138
-msgid "or visit "
+#: ../../mod/photos.php:722
+msgid "Show Newest First"
 msgstr ""
 
-#: ../../mod/invite.php:140
-msgid "3. Click [Connect]"
+#: ../../mod/photos.php:724
+msgid "Show Oldest First"
 msgstr ""
 
-#: ../../mod/regmod.php:11
-msgid "Please login."
+#: ../../mod/photos.php:824
+msgid "Permission denied. Access to this item may be restricted."
 msgstr ""
 
-#: ../../mod/xchan.php:6
-msgid "Xchan Lookup"
+#: ../../mod/photos.php:826
+msgid "Photo not available"
 msgstr ""
 
-#: ../../mod/xchan.php:9
-msgid "Lookup xchan beginning with (or webbie): "
+#: ../../mod/photos.php:884
+msgid "Use as profile photo"
 msgstr ""
 
-#: ../../mod/xchan.php:37 ../../mod/menu.php:162 ../../mod/mitem.php:116
-msgid "Not found."
+#: ../../mod/photos.php:891
+msgid "Private Photo"
 msgstr ""
 
-#: ../../mod/channel.php:25 ../../mod/chat.php:19
-msgid "You must be logged in to see this page."
+#: ../../mod/photos.php:902 ../../mod/events.php:652 ../../mod/events.php:659
+msgid "Previous"
 msgstr ""
 
-#: ../../mod/channel.php:97
-msgid "Insufficient permissions.  Request redirected to profile page."
+#: ../../mod/photos.php:906
+msgid "View Full Size"
 msgstr ""
 
-#: ../../mod/attach.php:9
-msgid "Item not available."
+#: ../../mod/photos.php:985
+msgid "Edit photo"
+msgstr ""
+
+#: ../../mod/photos.php:987
+msgid "Rotate CW (right)"
+msgstr ""
+
+#: ../../mod/photos.php:988
+msgid "Rotate CCW (left)"
+msgstr ""
+
+#: ../../mod/photos.php:991
+msgid "Enter a new album name"
+msgstr ""
+
+#: ../../mod/photos.php:992
+msgid "or select an existing one (doubleclick)"
+msgstr ""
+
+#: ../../mod/photos.php:995
+msgid "Caption"
+msgstr ""
+
+#: ../../mod/photos.php:997
+msgid "Add a Tag"
+msgstr ""
+
+#: ../../mod/photos.php:1001
+msgid "Example: @bob, @Barbara_Jensen, @jim@example.com"
+msgstr ""
+
+#: ../../mod/photos.php:1004
+msgid "Flag as adult in album view"
+msgstr ""
+
+#: ../../mod/photos.php:1196
+msgid "In This Photo:"
+msgstr ""
+
+#: ../../mod/photos.php:1201
+msgid "Map"
+msgstr ""
+
+#: ../../mod/photos.php:1289
+msgid "View Album"
+msgstr ""
+
+#: ../../mod/photos.php:1300 ../../mod/photos.php:1313
+#: ../../mod/photos.php:1314
+msgid "Recent Photos"
 msgstr ""
 
 #: ../../mod/lockview.php:37
@@ -8744,95 +8746,89 @@ msgstr ""
 msgid "Allow bookmarks"
 msgstr ""
 
-#: ../../mod/mail.php:33
+#: ../../mod/mail.php:34
 msgid "Unable to lookup recipient."
 msgstr ""
 
-#: ../../mod/mail.php:41
+#: ../../mod/mail.php:42
 msgid "Unable to communicate with requested channel."
 msgstr ""
 
-#: ../../mod/mail.php:48
+#: ../../mod/mail.php:49
 msgid "Cannot verify requested channel."
 msgstr ""
 
-#: ../../mod/mail.php:74
+#: ../../mod/mail.php:75
 msgid "Selected channel has private message restrictions. Send failed."
 msgstr ""
 
-#: ../../mod/mail.php:132
+#: ../../mod/mail.php:140
 msgid "Messages"
 msgstr ""
 
-#: ../../mod/mail.php:167
+#: ../../mod/mail.php:175
 msgid "Message recalled."
 msgstr ""
 
-#: ../../mod/mail.php:180
+#: ../../mod/mail.php:188
 msgid "Conversation removed."
 msgstr ""
 
-#: ../../mod/mail.php:223
+#: ../../mod/mail.php:231
 msgid "Requested channel is not in this network"
 msgstr ""
 
-#: ../../mod/mail.php:231
+#: ../../mod/mail.php:239
 msgid "Send Private Message"
 msgstr ""
 
-#: ../../mod/mail.php:232 ../../mod/mail.php:362
+#: ../../mod/mail.php:240 ../../mod/mail.php:370
 msgid "To:"
 msgstr ""
 
-#: ../../mod/mail.php:235 ../../mod/mail.php:364
+#: ../../mod/mail.php:243 ../../mod/mail.php:372
 msgid "Subject:"
 msgstr ""
 
-#: ../../mod/mail.php:242
+#: ../../mod/mail.php:250
 msgid "Send"
 msgstr ""
 
-#: ../../mod/mail.php:334
+#: ../../mod/mail.php:342
 msgid "Delete message"
 msgstr ""
 
-#: ../../mod/mail.php:335
+#: ../../mod/mail.php:343
 msgid "Delivery report"
 msgstr ""
 
-#: ../../mod/mail.php:336
+#: ../../mod/mail.php:344
 msgid "Recall message"
 msgstr ""
 
-#: ../../mod/mail.php:338
+#: ../../mod/mail.php:346
 msgid "Message has been recalled."
 msgstr ""
 
-#: ../../mod/mail.php:355
+#: ../../mod/mail.php:363
 msgid "Delete Conversation"
 msgstr ""
 
-#: ../../mod/mail.php:357
+#: ../../mod/mail.php:365
 msgid ""
 "No secure communications available. You <strong>may</strong> be able to "
 "respond from the sender's profile page."
 msgstr ""
 
-#: ../../mod/mail.php:361
+#: ../../mod/mail.php:369
 msgid "Send Reply"
 msgstr ""
 
-#: ../../mod/mail.php:366
+#: ../../mod/mail.php:374
 #, php-format
 msgid "Your message for %s (%s):"
 msgstr ""
 
-#: ../../mod/post.php:234
-msgid ""
-"Remote authentication blocked. You are logged into this site locally. Please "
-"logout and retry."
-msgstr ""
-
 #: ../../mod/service_limits.php:19
 msgid "No service class restrictions found."
 msgstr ""
@@ -9368,3 +9364,9 @@ msgstr ""
 #, php-format
 msgid "[hubzilla] Cron tasks not running on %s"
 msgstr ""
+
+#: ../../Zotlabs/Zot/Auth.php:140
+msgid ""
+"Remote authentication blocked. You are logged into this site locally. Please "
+"logout and retry."
+msgstr ""
diff --git a/version.inc b/version.inc
index 8ef02f56e..42838e2e7 100644
--- a/version.inc
+++ b/version.inc
@@ -1 +1 @@
-2015-12-10.1242
+2015-12-11.1243