Merge remote-tracking branch 'upstream/master'

3 files changed, 521 insertions, 494 deletions

diff --git a/mod/like.php b/mod/like.php
index 26c39bf3b..1de7882e9 100755
--- a/mod/like.php
+++ b/mod/like.php
@@ -299,7 +299,8 @@ function like_content(&$a) {
 
 		
 		$verbs = " '".dbesc($activity)."' ";
-		$multi_undo = 0;		
+
+		$multi_undo = false;		
 
 		// event participation and consensus items are essentially radio toggles. If you make a subsequent choice,
 		// we need to eradicate your first choice. 
@@ -310,15 +311,14 @@ function like_content(&$a) {
 		}
 		if($activity === ACTIVITY_AGREE || $activity === ACTIVITY_DISAGREE || $activity === ACTIVITY_ABSTAIN) {
 			$verbs = " '" . dbesc(ACTIVITY_AGREE) . "','" . dbesc(ACTIVITY_DISAGREE) . "','" . dbesc(ACTIVITY_ABSTAIN) . "' ";
-			$multi_undo = 1;
+			$multi_undo = true;
 		}
 
 		$item_normal = item_normal();
 
 		$r = q("SELECT id, parent, uid, verb FROM item WHERE verb in ( $verbs ) $item_normal
-			AND author_xchan = '%s' AND ( parent = %d OR thr_parent = '%s') and uid = %d ",
+			AND author_xchan = '%s' AND thr_parent = '%s' and uid = %d ",
 			dbesc($observer['xchan_hash']),
-			intval($item_id),
 			dbesc($item['mid']),
 			intval($owner_uid)
 		);
@@ -338,6 +338,12 @@ function like_content(&$a) {
 				// don't fall through and create another
 				if(activity_match($rr['verb'],$activity))
 					$multi_undo = false;
+
+				// drop_item was not done interactively, so we need to invoke the notifier
+				// in order to push the changes to connections
+
+				proc_run('php','include/notifier.php','drop',$rr['id']);
+
 			}
 
 			if($interactive)
diff --git a/util/hmessages.po b/util/hmessages.po
index 53a7f0e98..f26c0013a 100644
--- a/util/hmessages.po
+++ b/util/hmessages.po
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: 2016-02-26.1319H\n"
+"Project-Id-Version: 2016-03-04.1326H\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-02-26 00:03-0800\n"
+"POT-Creation-Date: 2016-03-04 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"
@@ -58,7 +58,7 @@ msgid "Schedule Outbox"
 msgstr ""
 
 #: ../../Zotlabs/Storage/Browser.php:164 ../../include/apps.php:360
-#: ../../include/apps.php:415 ../../include/widgets.php:1410
+#: ../../include/apps.php:415 ../../include/widgets.php:1430
 #: ../../include/conversation.php:1037 ../../mod/photos.php:766
 #: ../../mod/photos.php:1209
 msgid "Unknown"
@@ -85,7 +85,7 @@ msgid "Create"
 msgstr ""
 
 #: ../../Zotlabs/Storage/Browser.php:231 ../../Zotlabs/Storage/Browser.php:305
-#: ../../include/widgets.php:1423 ../../mod/photos.php:793
+#: ../../include/widgets.php:1443 ../../mod/photos.php:793
 #: ../../mod/photos.php:1333 ../../mod/profile_photo.php:401
 #: ../../mod/cover_photo.php:353
 msgid "Upload"
@@ -112,12 +112,13 @@ msgstr ""
 
 #: ../../Zotlabs/Storage/Browser.php:240 ../../include/apps.php:259
 #: ../../include/page_widgets.php:8 ../../include/page_widgets.php:36
-#: ../../include/menu.php:108 ../../include/identity.php:1352
-#: ../../include/ItemObject.php:100 ../../mod/blocks.php:153
-#: ../../mod/connections.php:286 ../../mod/connections.php:306
-#: ../../mod/editblock.php:135 ../../mod/editlayout.php:134
-#: ../../mod/editpost.php:112 ../../mod/editwebpage.php:176
-#: ../../mod/layouts.php:183 ../../mod/menu.php:108 ../../mod/settings.php:659
+#: ../../include/menu.php:108 ../../include/identity.php:924
+#: ../../include/identity.php:928 ../../include/ItemObject.php:100
+#: ../../mod/blocks.php:153 ../../mod/connections.php:286
+#: ../../mod/connections.php:306 ../../mod/editblock.php:135
+#: ../../mod/editlayout.php:134 ../../mod/editpost.php:112
+#: ../../mod/editwebpage.php:176 ../../mod/layouts.php:183
+#: ../../mod/menu.php:108 ../../mod/admin.php:1767 ../../mod/settings.php:659
 #: ../../mod/thing.php:256 ../../mod/webpages.php:183
 msgid "Edit"
 msgstr ""
@@ -125,10 +126,11 @@ msgstr ""
 #: ../../Zotlabs/Storage/Browser.php:241 ../../include/apps.php:260
 #: ../../include/conversation.php:657 ../../include/ItemObject.php:120
 #: ../../mod/blocks.php:155 ../../mod/connections.php:259
-#: ../../mod/connedit.php:562 ../../mod/editblock.php:181
+#: ../../mod/connedit.php:569 ../../mod/editblock.php:181
 #: ../../mod/editlayout.php:179 ../../mod/editwebpage.php:223
 #: ../../mod/group.php:173 ../../mod/photos.php:1140 ../../mod/admin.php:993
-#: ../../mod/admin.php:1152 ../../mod/settings.php:660 ../../mod/thing.php:257
+#: ../../mod/admin.php:1152 ../../mod/admin.php:1768
+#: ../../mod/settings.php:660 ../../mod/thing.php:257
 #: ../../mod/webpages.php:185
 msgid "Delete"
 msgstr ""
@@ -155,13 +157,13 @@ msgstr ""
 msgid "Upload file"
 msgstr ""
 
-#: ../../Zotlabs/Web/Router.php:45 ../../include/attach.php:140
-#: ../../include/attach.php:188 ../../include/attach.php:251
-#: ../../include/attach.php:265 ../../include/attach.php:272
-#: ../../include/attach.php:337 ../../include/attach.php:351
-#: ../../include/attach.php:358 ../../include/attach.php:436
-#: ../../include/attach.php:888 ../../include/attach.php:959
-#: ../../include/attach.php:1111 ../../include/chat.php:133
+#: ../../Zotlabs/Web/Router.php:45 ../../include/chat.php:133
+#: ../../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:889
+#: ../../include/attach.php:960 ../../include/attach.php:1112
 #: ../../include/photos.php:29 ../../include/items.php:4575
 #: ../../index.php:180 ../../mod/achievements.php:30 ../../mod/api.php:26
 #: ../../mod/api.php:31 ../../mod/appman.php:66 ../../mod/authtest.php:13
@@ -170,7 +172,7 @@ msgstr ""
 #: ../../mod/channel.php:100 ../../mod/channel.php:217
 #: ../../mod/channel.php:257 ../../mod/chat.php:94 ../../mod/chat.php:99
 #: ../../mod/common.php:35 ../../mod/connections.php:29
-#: ../../mod/connedit.php:355 ../../mod/editblock.php:65
+#: ../../mod/connedit.php:362 ../../mod/editblock.php:65
 #: ../../mod/editlayout.php:63 ../../mod/editlayout.php:87
 #: ../../mod/editpost.php:13 ../../mod/editwebpage.php:64
 #: ../../mod/editwebpage.php:86 ../../mod/editwebpage.php:101
@@ -179,7 +181,7 @@ msgstr ""
 #: ../../mod/filestorage.php:88 ../../mod/filestorage.php:115
 #: ../../mod/fsuggest.php:78 ../../mod/group.php:9 ../../mod/id.php:71
 #: ../../mod/invite.php:13 ../../mod/invite.php:87 ../../mod/item.php:206
-#: ../../mod/item.php:214 ../../mod/item.php:1056 ../../mod/layouts.php:69
+#: ../../mod/item.php:214 ../../mod/item.php:1069 ../../mod/layouts.php:69
 #: ../../mod/layouts.php:76 ../../mod/layouts.php:87 ../../mod/like.php:177
 #: ../../mod/locs.php:83 ../../mod/mail.php:126 ../../mod/manage.php:6
 #: ../../mod/menu.php:74 ../../mod/message.php:16 ../../mod/mitem.php:111
@@ -192,7 +194,7 @@ msgstr ""
 #: ../../mod/profiles.php:198 ../../mod/profiles.php:584
 #: ../../mod/rate.php:111 ../../mod/register.php:73 ../../mod/regmod.php:17
 #: ../../mod/service_limits.php:7 ../../mod/settings.php:579
-#: ../../mod/setup.php:230 ../../mod/sharedwithme.php:7
+#: ../../mod/setup.php:233 ../../mod/sharedwithme.php:7
 #: ../../mod/sources.php:66 ../../mod/suggest.php:26 ../../mod/thing.php:270
 #: ../../mod/thing.php:290 ../../mod/thing.php:327
 #: ../../mod/viewconnections.php:22 ../../mod/viewconnections.php:27
@@ -211,7 +213,7 @@ msgid "Page not found."
 msgstr ""
 
 #: ../../include/Contact.php:101 ../../include/widgets.php:147
-#: ../../include/widgets.php:185 ../../include/identity.php:954
+#: ../../include/widgets.php:185 ../../include/identity.php:1003
 #: ../../include/conversation.php:961 ../../mod/directory.php:321
 #: ../../mod/match.php:64 ../../mod/suggest.php:52
 msgid "Connect"
@@ -238,7 +240,7 @@ msgstr ""
 msgid "Unable to create a unique channel address. Import failed."
 msgstr ""
 
-#: ../../include/Import/import_diaspora.php:143 ../../mod/import.php:496
+#: ../../include/Import/import_diaspora.php:143 ../../mod/import.php:511
 msgid "Import completed."
 msgstr ""
 
@@ -414,7 +416,7 @@ msgstr ""
 msgid "Channel Home"
 msgstr ""
 
-#: ../../include/apps.php:138 ../../include/identity.php:1359
+#: ../../include/apps.php:138 ../../include/identity.php:1387
 #: ../../mod/profperm.php:112
 msgid "Profile"
 msgstr ""
@@ -477,7 +479,7 @@ msgstr ""
 msgid "Invite"
 msgstr ""
 
-#: ../../include/apps.php:152 ../../include/widgets.php:1296
+#: ../../include/apps.php:152 ../../include/widgets.php:1316
 msgid "Features"
 msgstr ""
 
@@ -507,68 +509,6 @@ msgstr ""
 msgid "Purchase"
 msgstr ""
 
-#: ../../include/attach.php:246 ../../include/attach.php:332
-msgid "Item was not found."
-msgstr ""
-
-#: ../../include/attach.php:496
-msgid "No source file."
-msgstr ""
-
-#: ../../include/attach.php:518
-msgid "Cannot locate file to replace"
-msgstr ""
-
-#: ../../include/attach.php:536
-msgid "Cannot locate file to revise/update"
-msgstr ""
-
-#: ../../include/attach.php:671
-#, php-format
-msgid "File exceeds size limit of %d"
-msgstr ""
-
-#: ../../include/attach.php:685
-#, php-format
-msgid "You have reached your limit of %1$.0f Mbytes attachment storage."
-msgstr ""
-
-#: ../../include/attach.php:841
-msgid "File upload failed. Possible system limit or action terminated."
-msgstr ""
-
-#: ../../include/attach.php:854
-msgid "Stored file could not be verified. Upload failed."
-msgstr ""
-
-#: ../../include/attach.php:902 ../../include/attach.php:918
-msgid "Path not available."
-msgstr ""
-
-#: ../../include/attach.php:964 ../../include/attach.php:1116
-msgid "Empty pathname"
-msgstr ""
-
-#: ../../include/attach.php:990
-msgid "duplicate filename or path"
-msgstr ""
-
-#: ../../include/attach.php:1012
-msgid "Path not found."
-msgstr ""
-
-#: ../../include/attach.php:1070
-msgid "mkdir failed."
-msgstr ""
-
-#: ../../include/attach.php:1074
-msgid "database storage failed."
-msgstr ""
-
-#: ../../include/attach.php:1122
-msgid "Empty path"
-msgstr ""
-
 #: ../../include/auth.php:132
 msgid "Logged out."
 msgstr ""
@@ -605,74 +545,11 @@ msgid "Finishes:"
 msgstr ""
 
 #: ../../include/bb2diaspora.php:487 ../../include/event.php:52
-#: ../../include/text.php:1433 ../../include/identity.php:1005
+#: ../../include/text.php:1433 ../../include/identity.php:1018
 #: ../../mod/directory.php:307
 msgid "Location:"
 msgstr ""
 
-#: ../../include/bbcode.php:123 ../../include/bbcode.php:794
-#: ../../include/bbcode.php:797 ../../include/bbcode.php:802
-#: ../../include/bbcode.php:805 ../../include/bbcode.php:808
-#: ../../include/bbcode.php:811 ../../include/bbcode.php:816
-#: ../../include/bbcode.php:819 ../../include/bbcode.php:824
-#: ../../include/bbcode.php:827 ../../include/bbcode.php:830
-#: ../../include/bbcode.php:833
-msgid "Image/photo"
-msgstr ""
-
-#: ../../include/bbcode.php:162 ../../include/bbcode.php:844
-msgid "Encrypted content"
-msgstr ""
-
-#: ../../include/bbcode.php:179
-#, php-format
-msgid "Install %s element: "
-msgstr ""
-
-#: ../../include/bbcode.php:183
-#, php-format
-msgid ""
-"This post contains an installable %s element, however you lack permissions "
-"to install it on this site."
-msgstr ""
-
-#: ../../include/bbcode.php:193 ../../mod/impel.php:37
-msgid "webpage"
-msgstr ""
-
-#: ../../include/bbcode.php:196 ../../mod/impel.php:47
-msgid "layout"
-msgstr ""
-
-#: ../../include/bbcode.php:199 ../../mod/impel.php:42
-msgid "block"
-msgstr ""
-
-#: ../../include/bbcode.php:202 ../../mod/impel.php:54
-msgid "menu"
-msgstr ""
-
-#: ../../include/bbcode.php:257
-#, php-format
-msgid "%1$s wrote the following %2$s %3$s"
-msgstr ""
-
-#: ../../include/bbcode.php:259 ../../mod/tagger.php:51
-msgid "post"
-msgstr ""
-
-#: ../../include/bbcode.php:547
-msgid "Different viewers will see this text differently"
-msgstr ""
-
-#: ../../include/bbcode.php:755
-msgid "$1 spoiler"
-msgstr ""
-
-#: ../../include/bbcode.php:782
-msgid "$1 wrote:"
-msgstr ""
-
 #: ../../include/bookmarks.php:35
 #, php-format
 msgid "%1$s's bookmarks"
@@ -751,7 +628,7 @@ msgstr ""
 msgid "Advanced example: name=fred and country=iceland"
 msgstr ""
 
-#: ../../include/contact_widgets.php:57 ../../include/features.php:96
+#: ../../include/contact_widgets.php:57 ../../include/features.php:97
 #: ../../include/widgets.php:314
 msgid "Saved Folders"
 msgstr ""
@@ -792,7 +669,7 @@ msgstr ""
 
 #: ../../include/dir_fns.php:141 ../../include/dir_fns.php:142
 #: ../../include/dir_fns.php:143 ../../mod/api.php:102
-#: ../../mod/connedit.php:368 ../../mod/connedit.php:646
+#: ../../mod/connedit.php:375 ../../mod/connedit.php:653
 #: ../../mod/events.php:454 ../../mod/events.php:455 ../../mod/events.php:464
 #: ../../mod/filestorage.php:151 ../../mod/filestorage.php:159
 #: ../../mod/menu.php:96 ../../mod/menu.php:153 ../../mod/mitem.php:154
@@ -805,7 +682,7 @@ msgstr ""
 
 #: ../../include/dir_fns.php:141 ../../include/dir_fns.php:142
 #: ../../include/dir_fns.php:143 ../../mod/api.php:101
-#: ../../mod/connedit.php:368 ../../mod/events.php:454
+#: ../../mod/connedit.php:375 ../../mod/events.php:454
 #: ../../mod/events.php:455 ../../mod/events.php:464
 #: ../../mod/filestorage.php:151 ../../mod/filestorage.php:159
 #: ../../mod/menu.php:96 ../../mod/menu.php:153 ../../mod/mitem.php:154
@@ -961,7 +838,7 @@ msgstr ""
 msgid "Rate This Channel (this is public)"
 msgstr ""
 
-#: ../../include/js_strings.php:20 ../../mod/connedit.php:705
+#: ../../include/js_strings.php:20 ../../mod/connedit.php:712
 #: ../../mod/rate.php:157
 msgid "Rating"
 msgstr ""
@@ -973,10 +850,10 @@ msgstr ""
 #: ../../include/js_strings.php:22 ../../include/widgets.php:702
 #: ../../include/widgets.php:714 ../../include/ItemObject.php:703
 #: ../../mod/appman.php:99 ../../mod/chat.php:184 ../../mod/chat.php:213
-#: ../../mod/connect.php:93 ../../mod/connedit.php:722
+#: ../../mod/connect.php:93 ../../mod/connedit.php:729
 #: ../../mod/events.php:468 ../../mod/events.php:665
 #: ../../mod/filestorage.php:156 ../../mod/fsuggest.php:108
-#: ../../mod/group.php:81 ../../mod/import.php:536
+#: ../../mod/group.php:81 ../../mod/import.php:551
 #: ../../mod/import_items.php:116 ../../mod/invite.php:142
 #: ../../mod/locs.php:116 ../../mod/mail.php:380 ../../mod/mitem.php:231
 #: ../../mod/mood.php:135 ../../mod/pconfig.php:108 ../../mod/pdledit.php:62
@@ -984,13 +861,14 @@ msgstr ""
 #: ../../mod/photos.php:1059 ../../mod/photos.php:1177 ../../mod/admin.php:457
 #: ../../mod/admin.php:646 ../../mod/admin.php:721 ../../mod/admin.php:986
 #: ../../mod/admin.php:1150 ../../mod/admin.php:1326 ../../mod/admin.php:1521
-#: ../../mod/admin.php:1606 ../../mod/poke.php:182 ../../mod/profiles.php:675
-#: ../../mod/rate.php:168 ../../mod/settings.php:597
-#: ../../mod/settings.php:710 ../../mod/settings.php:738
-#: ../../mod/settings.php:761 ../../mod/settings.php:849
-#: ../../mod/settings.php:1041 ../../mod/setup.php:333 ../../mod/setup.php:374
-#: ../../mod/sources.php:104 ../../mod/sources.php:138 ../../mod/thing.php:312
-#: ../../mod/thing.php:358 ../../mod/xchan.php:11 ../../mod/cal.php:332
+#: ../../mod/admin.php:1606 ../../mod/admin.php:1770 ../../mod/poke.php:182
+#: ../../mod/profiles.php:675 ../../mod/rate.php:168
+#: ../../mod/settings.php:597 ../../mod/settings.php:710
+#: ../../mod/settings.php:738 ../../mod/settings.php:761
+#: ../../mod/settings.php:849 ../../mod/settings.php:1041
+#: ../../mod/setup.php:336 ../../mod/setup.php:377 ../../mod/sources.php:104
+#: ../../mod/sources.php:138 ../../mod/thing.php:312 ../../mod/thing.php:358
+#: ../../mod/xchan.php:11 ../../mod/cal.php:332
 #: ../../view/theme/redbasic/php/config.php:99
 msgid "Submit"
 msgstr ""
@@ -1293,7 +1171,7 @@ msgid "Your posts and conversations"
 msgstr ""
 
 #: ../../include/nav.php:86 ../../include/conversation.php:959
-#: ../../mod/connedit.php:509
+#: ../../mod/connedit.php:516
 msgid "View Profile"
 msgstr ""
 
@@ -1301,7 +1179,7 @@ msgstr ""
 msgid "Your profile page"
 msgstr ""
 
-#: ../../include/nav.php:88
+#: ../../include/nav.php:88 ../../include/identity.php:924
 msgid "Edit Profiles"
 msgstr ""
 
@@ -1309,7 +1187,7 @@ msgstr ""
 msgid "Manage/Edit profiles"
 msgstr ""
 
-#: ../../include/nav.php:90 ../../include/identity.php:977
+#: ../../include/nav.php:90 ../../include/identity.php:928
 msgid "Edit Profile"
 msgstr ""
 
@@ -1468,7 +1346,7 @@ msgstr ""
 msgid "Account/Channel Settings"
 msgstr ""
 
-#: ../../include/nav.php:213 ../../include/widgets.php:1323
+#: ../../include/nav.php:213 ../../include/widgets.php:1343
 msgid "Admin"
 msgstr ""
 
@@ -1543,6 +1421,69 @@ msgstr ""
 msgid "Profile Photos"
 msgstr ""
 
+#: ../../include/bbcode.php:123 ../../include/bbcode.php:798
+#: ../../include/bbcode.php:801 ../../include/bbcode.php:806
+#: ../../include/bbcode.php:809 ../../include/bbcode.php:812
+#: ../../include/bbcode.php:815 ../../include/bbcode.php:820
+#: ../../include/bbcode.php:823 ../../include/bbcode.php:828
+#: ../../include/bbcode.php:831 ../../include/bbcode.php:834
+#: ../../include/bbcode.php:837
+msgid "Image/photo"
+msgstr ""
+
+#: ../../include/bbcode.php:162 ../../include/bbcode.php:848
+msgid "Encrypted content"
+msgstr ""
+
+#: ../../include/bbcode.php:179
+#, php-format
+msgid "Install %s element: "
+msgstr ""
+
+#: ../../include/bbcode.php:183
+#, php-format
+msgid ""
+"This post contains an installable %s element, however you lack permissions "
+"to install it on this site."
+msgstr ""
+
+#: ../../include/bbcode.php:193 ../../mod/impel.php:37
+msgid "webpage"
+msgstr ""
+
+#: ../../include/bbcode.php:196 ../../mod/impel.php:47
+msgid "layout"
+msgstr ""
+
+#: ../../include/bbcode.php:199 ../../mod/impel.php:42
+msgid "block"
+msgstr ""
+
+#: ../../include/bbcode.php:202 ../../mod/impel.php:54
+msgid "menu"
+msgstr ""
+
+#: ../../include/bbcode.php:257
+#, php-format
+msgid "%1$s wrote the following %2$s %3$s"
+msgstr ""
+
+#: ../../include/bbcode.php:259 ../../mod/tagger.php:51
+msgid "post"
+msgstr ""
+
+#: ../../include/bbcode.php:547
+msgid "Different viewers will see this text differently"
+msgstr ""
+
+#: ../../include/bbcode.php:759
+msgid "$1 spoiler"
+msgstr ""
+
+#: ../../include/bbcode.php:786
+msgid "$1 wrote:"
+msgstr ""
+
 #: ../../include/profile_selectors.php:6
 #: ../../include/profile_selectors.php:23 ../../mod/id.php:103
 msgid "Male"
@@ -1698,7 +1639,7 @@ msgstr ""
 
 #: ../../include/profile_selectors.php:80 ../../include/widgets.php:451
 #: ../../include/identity.php:390 ../../include/identity.php:391
-#: ../../include/identity.php:398 ../../mod/connedit.php:584
+#: ../../include/identity.php:398 ../../mod/connedit.php:591
 #: ../../mod/settings.php:349 ../../mod/settings.php:353
 #: ../../mod/settings.php:354 ../../mod/settings.php:357
 #: ../../mod/settings.php:368
@@ -1841,7 +1782,7 @@ msgstr ""
 msgid "dislikes"
 msgstr ""
 
-#: ../../include/taxonomy.php:415 ../../include/identity.php:1264
+#: ../../include/taxonomy.php:415 ../../include/identity.php:1296
 #: ../../include/conversation.php:1751 ../../include/ItemObject.php:179
 #: ../../mod/photos.php:1097
 msgctxt "noun"
@@ -1936,23 +1877,85 @@ msgstr ""
 msgid "Happy Birthday %1$s"
 msgstr ""
 
-#: ../../include/zot.php:675
+#: ../../include/zot.php:680
 msgid "Invalid data packet"
 msgstr ""
 
-#: ../../include/zot.php:691
+#: ../../include/zot.php:696
 msgid "Unable to verify channel signature"
 msgstr ""
 
-#: ../../include/zot.php:2267
+#: ../../include/zot.php:2272
 #, php-format
 msgid "Unable to verify site signature for %s"
 msgstr ""
 
-#: ../../include/zot.php:3588
+#: ../../include/zot.php:3607
 msgid "invalid target signature"
 msgstr ""
 
+#: ../../include/attach.php:247 ../../include/attach.php:333
+msgid "Item was not found."
+msgstr ""
+
+#: ../../include/attach.php:497
+msgid "No source file."
+msgstr ""
+
+#: ../../include/attach.php:519
+msgid "Cannot locate file to replace"
+msgstr ""
+
+#: ../../include/attach.php:537
+msgid "Cannot locate file to revise/update"
+msgstr ""
+
+#: ../../include/attach.php:672
+#, php-format
+msgid "File exceeds size limit of %d"
+msgstr ""
+
+#: ../../include/attach.php:686
+#, php-format
+msgid "You have reached your limit of %1$.0f Mbytes attachment storage."
+msgstr ""
+
+#: ../../include/attach.php:842
+msgid "File upload failed. Possible system limit or action terminated."
+msgstr ""
+
+#: ../../include/attach.php:855
+msgid "Stored file could not be verified. Upload failed."
+msgstr ""
+
+#: ../../include/attach.php:903 ../../include/attach.php:919
+msgid "Path not available."
+msgstr ""
+
+#: ../../include/attach.php:965 ../../include/attach.php:1117
+msgid "Empty pathname"
+msgstr ""
+
+#: ../../include/attach.php:991
+msgid "duplicate filename or path"
+msgstr ""
+
+#: ../../include/attach.php:1013
+msgid "Path not found."
+msgstr ""
+
+#: ../../include/attach.php:1071
+msgid "mkdir failed."
+msgstr ""
+
+#: ../../include/attach.php:1075
+msgid "database storage failed."
+msgstr ""
+
+#: ../../include/attach.php:1123
+msgid "Empty path"
+msgstr ""
+
 #: ../../include/contact_selectors.php:56
 msgid "Frequently"
 msgstr ""
@@ -2159,202 +2162,204 @@ msgid "If location data is available on uploaded photos, link this to a map."
 msgstr ""
 
 #: ../../include/features.php:60
-msgid "Expert Mode"
+msgid "Smart Birthdays"
 msgstr ""
 
 #: ../../include/features.php:60
-msgid "Enable Expert Mode to provide advanced configuration options"
+msgid ""
+"Make birthday events timezone aware in case your friends are scattered "
+"across the planet."
 msgstr ""
 
 #: ../../include/features.php:61
-msgid "Premium Channel"
+msgid "Expert Mode"
 msgstr ""
 
 #: ../../include/features.php:61
-msgid ""
-"Allows you to set restrictions and terms on those that connect with your "
-"channel"
+msgid "Enable Expert Mode to provide advanced configuration options"
 msgstr ""
 
-#: ../../include/features.php:66
-msgid "Post Composition Features"
+#: ../../include/features.php:62
+msgid "Premium Channel"
 msgstr ""
 
-#: ../../include/features.php:68
-msgid "Use Markdown"
+#: ../../include/features.php:62
+msgid ""
+"Allows you to set restrictions and terms on those that connect with your "
+"channel"
 msgstr ""
 
-#: ../../include/features.php:68
-msgid "Allow use of \"Markdown\" to format posts"
+#: ../../include/features.php:67
+msgid "Post Composition Features"
 msgstr ""
 
-#: ../../include/features.php:69
+#: ../../include/features.php:70
 msgid "Large Photos"
 msgstr ""
 
-#: ../../include/features.php:69
+#: ../../include/features.php:70
 msgid ""
 "Include large (1024px) photo thumbnails in posts. If not enabled, use small "
 "(640px) photo thumbnails"
 msgstr ""
 
-#: ../../include/features.php:70 ../../include/widgets.php:572
+#: ../../include/features.php:71 ../../include/widgets.php:572
 #: ../../mod/sources.php:88
 msgid "Channel Sources"
 msgstr ""
 
-#: ../../include/features.php:70
+#: ../../include/features.php:71
 msgid "Automatically import channel content from other channels or feeds"
 msgstr ""
 
-#: ../../include/features.php:71
+#: ../../include/features.php:72
 msgid "Even More Encryption"
 msgstr ""
 
-#: ../../include/features.php:71
+#: ../../include/features.php:72
 msgid ""
 "Allow optional encryption of content end-to-end with a shared secret key"
 msgstr ""
 
-#: ../../include/features.php:72
+#: ../../include/features.php:73
 msgid "Enable Voting Tools"
 msgstr ""
 
-#: ../../include/features.php:72
+#: ../../include/features.php:73
 msgid "Provide a class of post which others can vote on"
 msgstr ""
 
-#: ../../include/features.php:73
+#: ../../include/features.php:74
 msgid "Delayed Posting"
 msgstr ""
 
-#: ../../include/features.php:73
+#: ../../include/features.php:74
 msgid "Allow posts to be published at a later date"
 msgstr ""
 
-#: ../../include/features.php:74
+#: ../../include/features.php:75
 msgid "Suppress Duplicate Posts/Comments"
 msgstr ""
 
-#: ../../include/features.php:74
+#: ../../include/features.php:75
 msgid ""
 "Prevent posts with identical content to be published with less than two "
 "minutes in between submissions."
 msgstr ""
 
-#: ../../include/features.php:80
+#: ../../include/features.php:81
 msgid "Network and Stream Filtering"
 msgstr ""
 
-#: ../../include/features.php:81
+#: ../../include/features.php:82
 msgid "Search by Date"
 msgstr ""
 
-#: ../../include/features.php:81
+#: ../../include/features.php:82
 msgid "Ability to select posts by date ranges"
 msgstr ""
 
-#: ../../include/features.php:82 ../../include/group.php:295
+#: ../../include/features.php:83 ../../include/group.php:295
 msgid "Privacy Groups"
 msgstr ""
 
-#: ../../include/features.php:82
+#: ../../include/features.php:83
 msgid "Enable management and selection of privacy groups"
 msgstr ""
 
-#: ../../include/features.php:83 ../../include/widgets.php:284
+#: ../../include/features.php:84 ../../include/widgets.php:284
 msgid "Saved Searches"
 msgstr ""
 
-#: ../../include/features.php:83
+#: ../../include/features.php:84
 msgid "Save search terms for re-use"
 msgstr ""
 
-#: ../../include/features.php:84
+#: ../../include/features.php:85
 msgid "Network Personal Tab"
 msgstr ""
 
-#: ../../include/features.php:84
+#: ../../include/features.php:85
 msgid "Enable tab to display only Network posts that you've interacted on"
 msgstr ""
 
-#: ../../include/features.php:85
+#: ../../include/features.php:86
 msgid "Network New Tab"
 msgstr ""
 
-#: ../../include/features.php:85
+#: ../../include/features.php:86
 msgid "Enable tab to display all new Network activity"
 msgstr ""
 
-#: ../../include/features.php:86
+#: ../../include/features.php:87
 msgid "Affinity Tool"
 msgstr ""
 
-#: ../../include/features.php:86
+#: ../../include/features.php:87
 msgid "Filter stream activity by depth of relationships"
 msgstr ""
 
-#: ../../include/features.php:87
+#: ../../include/features.php:88
 msgid "Connection Filtering"
 msgstr ""
 
-#: ../../include/features.php:87
+#: ../../include/features.php:88
 msgid "Filter incoming posts from connections based on keywords/content"
 msgstr ""
 
-#: ../../include/features.php:88
+#: ../../include/features.php:89
 msgid "Suggest Channels"
 msgstr ""
 
-#: ../../include/features.php:88
+#: ../../include/features.php:89
 msgid "Show channel suggestions"
 msgstr ""
 
-#: ../../include/features.php:93
+#: ../../include/features.php:94
 msgid "Post/Comment Tools"
 msgstr ""
 
-#: ../../include/features.php:94
+#: ../../include/features.php:95
 msgid "Community Tagging"
 msgstr ""
 
-#: ../../include/features.php:94
+#: ../../include/features.php:95
 msgid "Ability to tag existing posts"
 msgstr ""
 
-#: ../../include/features.php:95
+#: ../../include/features.php:96
 msgid "Post Categories"
 msgstr ""
 
-#: ../../include/features.php:95
+#: ../../include/features.php:96
 msgid "Add categories to your posts"
 msgstr ""
 
-#: ../../include/features.php:96
+#: ../../include/features.php:97
 msgid "Ability to file posts under folders"
 msgstr ""
 
-#: ../../include/features.php:97
+#: ../../include/features.php:98
 msgid "Dislike Posts"
 msgstr ""
 
-#: ../../include/features.php:97
+#: ../../include/features.php:98
 msgid "Ability to dislike posts/comments"
 msgstr ""
 
-#: ../../include/features.php:98
+#: ../../include/features.php:99
 msgid "Star Posts"
 msgstr ""
 
-#: ../../include/features.php:98
+#: ../../include/features.php:99
 msgid "Ability to mark special posts with a star indicator"
 msgstr ""
 
-#: ../../include/features.php:99
+#: ../../include/features.php:100
 msgid "Tag Cloud"
 msgstr ""
 
-#: ../../include/features.php:99
+#: ../../include/features.php:100
 msgid "Provide a personal tag cloud on your channel page"
 msgstr ""
 
@@ -2408,8 +2413,8 @@ msgid "Notes"
 msgstr ""
 
 #: ../../include/widgets.php:202 ../../include/text.php:886
-#: ../../include/text.php:898 ../../mod/filer.php:49 ../../mod/admin.php:1666
-#: ../../mod/admin.php:1686 ../../mod/rbmark.php:28 ../../mod/rbmark.php:100
+#: ../../include/text.php:898 ../../mod/filer.php:49 ../../mod/admin.php:1687
+#: ../../mod/admin.php:1707 ../../mod/rbmark.php:28 ../../mod/rbmark.php:100
 msgid "Save"
 msgstr ""
 
@@ -2425,20 +2430,20 @@ msgstr ""
 msgid "Archives"
 msgstr ""
 
-#: ../../include/widgets.php:449 ../../mod/connedit.php:582
+#: ../../include/widgets.php:449 ../../mod/connedit.php:589
 msgid "Me"
 msgstr ""
 
-#: ../../include/widgets.php:450 ../../mod/connedit.php:583
+#: ../../include/widgets.php:450 ../../mod/connedit.php:590
 msgid "Family"
 msgstr ""
 
-#: ../../include/widgets.php:452 ../../mod/connedit.php:585
+#: ../../include/widgets.php:452 ../../mod/connedit.php:592
 msgid "Acquaintances"
 msgstr ""
 
 #: ../../include/widgets.php:453 ../../mod/connections.php:88
-#: ../../mod/connections.php:103 ../../mod/connedit.php:586
+#: ../../mod/connections.php:103 ../../mod/connedit.php:593
 msgid "All"
 msgstr ""
 
@@ -2474,7 +2479,7 @@ msgstr ""
 msgid "Export channel"
 msgstr ""
 
-#: ../../include/widgets.php:556 ../../mod/connedit.php:694
+#: ../../include/widgets.php:556 ../../mod/connedit.php:701
 msgid "Connection Default Permissions"
 msgstr ""
 
@@ -2560,111 +2565,111 @@ msgstr ""
 msgid "Suggested Chatrooms"
 msgstr ""
 
-#: ../../include/widgets.php:972 ../../include/widgets.php:1062
+#: ../../include/widgets.php:972 ../../include/widgets.php:1082
 msgid "photo/image"
 msgstr ""
 
-#: ../../include/widgets.php:1156
+#: ../../include/widgets.php:1176
 msgid "Rating Tools"
 msgstr ""
 
-#: ../../include/widgets.php:1160 ../../include/widgets.php:1162
+#: ../../include/widgets.php:1180 ../../include/widgets.php:1182
 msgid "Rate Me"
 msgstr ""
 
-#: ../../include/widgets.php:1165
+#: ../../include/widgets.php:1185
 msgid "View Ratings"
 msgstr ""
 
-#: ../../include/widgets.php:1176 ../../mod/pubsites.php:18
+#: ../../include/widgets.php:1196 ../../mod/pubsites.php:18
 msgid "Public Hubs"
 msgstr ""
 
-#: ../../include/widgets.php:1224
+#: ../../include/widgets.php:1244
 msgid "Forums"
 msgstr ""
 
-#: ../../include/widgets.php:1253
+#: ../../include/widgets.php:1273
 msgid "Tasks"
 msgstr ""
 
-#: ../../include/widgets.php:1262
+#: ../../include/widgets.php:1282
 msgid "Documentation"
 msgstr ""
 
-#: ../../include/widgets.php:1264
+#: ../../include/widgets.php:1284
 msgid "Project/Site Information"
 msgstr ""
 
-#: ../../include/widgets.php:1265
+#: ../../include/widgets.php:1285
 msgid "For Members"
 msgstr ""
 
-#: ../../include/widgets.php:1266
+#: ../../include/widgets.php:1286
 msgid "For Administrators"
 msgstr ""
 
-#: ../../include/widgets.php:1267
+#: ../../include/widgets.php:1287
 msgid "For Developers"
 msgstr ""
 
-#: ../../include/widgets.php:1292 ../../mod/admin.php:456
+#: ../../include/widgets.php:1312 ../../mod/admin.php:456
 msgid "Site"
 msgstr ""
 
-#: ../../include/widgets.php:1293
+#: ../../include/widgets.php:1313
 msgid "Accounts"
 msgstr ""
 
-#: ../../include/widgets.php:1294 ../../mod/admin.php:1149
+#: ../../include/widgets.php:1314 ../../mod/admin.php:1149
 msgid "Channels"
 msgstr ""
 
-#: ../../include/widgets.php:1295 ../../mod/admin.php:710
+#: ../../include/widgets.php:1315 ../../mod/admin.php:710
 msgid "Security"
 msgstr ""
 
-#: ../../include/widgets.php:1297 ../../mod/admin.php:1264
+#: ../../include/widgets.php:1317 ../../mod/admin.php:1264
 #: ../../mod/admin.php:1325
 msgid "Plugins"
 msgstr ""
 
-#: ../../include/widgets.php:1298 ../../mod/admin.php:1486
+#: ../../include/widgets.php:1318 ../../mod/admin.php:1486
 #: ../../mod/admin.php:1520
 msgid "Themes"
 msgstr ""
 
-#: ../../include/widgets.php:1299
+#: ../../include/widgets.php:1319
 msgid "Inspect queue"
 msgstr ""
 
-#: ../../include/widgets.php:1300
-msgid "Profile Config"
+#: ../../include/widgets.php:1320 ../../mod/admin.php:1760
+msgid "Profile Fields"
 msgstr ""
 
-#: ../../include/widgets.php:1301
+#: ../../include/widgets.php:1321
 msgid "DB updates"
 msgstr ""
 
-#: ../../include/widgets.php:1319 ../../include/widgets.php:1325
+#: ../../include/widgets.php:1339 ../../include/widgets.php:1345
 #: ../../mod/admin.php:1605
 msgid "Logs"
 msgstr ""
 
-#: ../../include/widgets.php:1324
+#: ../../include/widgets.php:1344
 msgid "Plugin Features"
 msgstr ""
 
-#: ../../include/widgets.php:1326
+#: ../../include/widgets.php:1346
 msgid "User registrations waiting for confirmation"
 msgstr ""
 
-#: ../../include/widgets.php:1404 ../../mod/photos.php:760
+#: ../../include/widgets.php:1424 ../../mod/photos.php:760
 #: ../../mod/photos.php:1300
 msgid "View Photo"
 msgstr ""
 
-#: ../../include/widgets.php:1421 ../../mod/photos.php:791
+#: ../../include/widgets.php:1441 ../../mod/photos.php:791
 msgid "Edit Album"
 msgstr ""
 
@@ -3167,11 +3172,11 @@ msgstr ""
 msgid "Default Profile"
 msgstr ""
 
-#: ../../include/identity.php:772
+#: ../../include/identity.php:776
 msgid "Requested channel is not available."
 msgstr ""
 
-#: ../../include/identity.php:818 ../../mod/achievements.php:11
+#: ../../include/identity.php:822 ../../mod/achievements.php:11
 #: ../../mod/blocks.php:29 ../../mod/connect.php:13 ../../mod/editblock.php:29
 #: ../../mod/editlayout.php:27 ../../mod/editwebpage.php:28
 #: ../../mod/filestorage.php:54 ../../mod/hcard.php:8 ../../mod/layouts.php:29
@@ -3179,192 +3184,184 @@ msgstr ""
 msgid "Requested profile is not available."
 msgstr ""
 
-#: ../../include/identity.php:967 ../../mod/profiles.php:782
+#: ../../include/identity.php:917 ../../mod/profiles.php:782
 msgid "Change profile photo"
 msgstr ""
 
-#: ../../include/identity.php:973
-msgid "Profiles"
-msgstr ""
-
-#: ../../include/identity.php:973
-msgid "Manage/edit profiles"
-msgstr ""
-
-#: ../../include/identity.php:974 ../../mod/profiles.php:783
+#: ../../include/identity.php:925 ../../mod/profiles.php:783
 msgid "Create New Profile"
 msgstr ""
 
-#: ../../include/identity.php:989 ../../mod/profiles.php:794
+#: ../../include/identity.php:942 ../../mod/profiles.php:794
 msgid "Profile Image"
 msgstr ""
 
-#: ../../include/identity.php:992
-msgid "visible to everybody"
+#: ../../include/identity.php:945
+msgid "Visible to everybody"
 msgstr ""
 
-#: ../../include/identity.php:993 ../../mod/profiles.php:677
+#: ../../include/identity.php:946 ../../mod/profiles.php:677
 #: ../../mod/profiles.php:798
 msgid "Edit visibility"
 msgstr ""
 
-#: ../../include/identity.php:1009 ../../include/identity.php:1248
+#: ../../include/identity.php:1022 ../../include/identity.php:1280
 msgid "Gender:"
 msgstr ""
 
-#: ../../include/identity.php:1010 ../../include/identity.php:1292
+#: ../../include/identity.php:1023 ../../include/identity.php:1324
 msgid "Status:"
 msgstr ""
 
-#: ../../include/identity.php:1011 ../../include/identity.php:1303
+#: ../../include/identity.php:1024 ../../include/identity.php:1335
 msgid "Homepage:"
 msgstr ""
 
-#: ../../include/identity.php:1012
+#: ../../include/identity.php:1025
 msgid "Online Now"
 msgstr ""
 
-#: ../../include/identity.php:1099 ../../include/identity.php:1177
+#: ../../include/identity.php:1113 ../../include/identity.php:1191
 #: ../../mod/ping.php:318
 msgid "g A l F d"
 msgstr ""
 
-#: ../../include/identity.php:1100 ../../include/identity.php:1178
+#: ../../include/identity.php:1114 ../../include/identity.php:1192
 msgid "F d"
 msgstr ""
 
-#: ../../include/identity.php:1145 ../../include/identity.php:1217
+#: ../../include/identity.php:1159 ../../include/identity.php:1231
 #: ../../mod/ping.php:341
 msgid "[today]"
 msgstr ""
 
-#: ../../include/identity.php:1156
+#: ../../include/identity.php:1170
 msgid "Birthday Reminders"
 msgstr ""
 
-#: ../../include/identity.php:1157
+#: ../../include/identity.php:1171
 msgid "Birthdays this week:"
 msgstr ""
 
-#: ../../include/identity.php:1210
+#: ../../include/identity.php:1224
 msgid "[No description]"
 msgstr ""
 
-#: ../../include/identity.php:1228
+#: ../../include/identity.php:1242
 msgid "Event Reminders"
 msgstr ""
 
-#: ../../include/identity.php:1229
+#: ../../include/identity.php:1243
 msgid "Events this week:"
 msgstr ""
 
-#: ../../include/identity.php:1246 ../../mod/settings.php:1047
+#: ../../include/identity.php:1278 ../../mod/settings.php:1047
 msgid "Full Name:"
 msgstr ""
 
-#: ../../include/identity.php:1253
+#: ../../include/identity.php:1285
 msgid "Like this channel"
 msgstr ""
 
-#: ../../include/identity.php:1277
+#: ../../include/identity.php:1309
 msgid "j F, Y"
 msgstr ""
 
-#: ../../include/identity.php:1278
+#: ../../include/identity.php:1310
 msgid "j F"
 msgstr ""
 
-#: ../../include/identity.php:1285
+#: ../../include/identity.php:1317
 msgid "Birthday:"
 msgstr ""
 
-#: ../../include/identity.php:1289 ../../mod/directory.php:302
+#: ../../include/identity.php:1321 ../../mod/directory.php:302
 msgid "Age:"
 msgstr ""
 
-#: ../../include/identity.php:1298
+#: ../../include/identity.php:1330
 #, php-format
 msgid "for %1$d %2$s"
 msgstr ""
 
-#: ../../include/identity.php:1301 ../../mod/profiles.php:699
+#: ../../include/identity.php:1333 ../../mod/profiles.php:699
 msgid "Sexual Preference:"
 msgstr ""
 
-#: ../../include/identity.php:1305 ../../mod/directory.php:318
+#: ../../include/identity.php:1337 ../../mod/directory.php:318
 #: ../../mod/profiles.php:701
 msgid "Hometown:"
 msgstr ""
 
-#: ../../include/identity.php:1307
+#: ../../include/identity.php:1339
 msgid "Tags:"
 msgstr ""
 
-#: ../../include/identity.php:1309 ../../mod/profiles.php:702
+#: ../../include/identity.php:1341 ../../mod/profiles.php:702
 msgid "Political Views:"
 msgstr ""
 
-#: ../../include/identity.php:1311
+#: ../../include/identity.php:1343
 msgid "Religion:"
 msgstr ""
 
-#: ../../include/identity.php:1313 ../../mod/directory.php:320
+#: ../../include/identity.php:1345 ../../mod/directory.php:320
 msgid "About:"
 msgstr ""
 
-#: ../../include/identity.php:1315
+#: ../../include/identity.php:1347
 msgid "Hobbies/Interests:"
 msgstr ""
 
-#: ../../include/identity.php:1317 ../../mod/profiles.php:705
+#: ../../include/identity.php:1349 ../../mod/profiles.php:705
 msgid "Likes:"
 msgstr ""
 
-#: ../../include/identity.php:1319 ../../mod/profiles.php:706
+#: ../../include/identity.php:1351 ../../mod/profiles.php:706
 msgid "Dislikes:"
 msgstr ""
 
-#: ../../include/identity.php:1321
+#: ../../include/identity.php:1353
 msgid "Contact information and Social Networks:"
 msgstr ""
 
-#: ../../include/identity.php:1323
+#: ../../include/identity.php:1355
 msgid "My other channels:"
 msgstr ""
 
-#: ../../include/identity.php:1325
+#: ../../include/identity.php:1357
 msgid "Musical interests:"
 msgstr ""
 
-#: ../../include/identity.php:1327
+#: ../../include/identity.php:1359
 msgid "Books, literature:"
 msgstr ""
 
-#: ../../include/identity.php:1329
+#: ../../include/identity.php:1361
 msgid "Television:"
 msgstr ""
 
-#: ../../include/identity.php:1331
+#: ../../include/identity.php:1363
 msgid "Film/dance/culture/entertainment:"
 msgstr ""
 
-#: ../../include/identity.php:1333
+#: ../../include/identity.php:1365
 msgid "Love/Romance:"
 msgstr ""
 
-#: ../../include/identity.php:1335
+#: ../../include/identity.php:1367
 msgid "Work/employment:"
 msgstr ""
 
-#: ../../include/identity.php:1337
+#: ../../include/identity.php:1369
 msgid "School/education:"
 msgstr ""
 
-#: ../../include/identity.php:1361
+#: ../../include/identity.php:1389
 msgid "Like this thing"
 msgstr ""
 
-#: ../../include/identity.php:1770 ../../mod/cover_photo.php:236
+#: ../../include/identity.php:1799 ../../mod/cover_photo.php:236
 msgid "cover photo"
 msgstr ""
 
@@ -4270,7 +4267,7 @@ msgstr ""
 msgid "Privacy group: %s"
 msgstr ""
 
-#: ../../include/items.php:5065 ../../mod/connedit.php:694
+#: ../../include/items.php:5065 ../../mod/connedit.php:701
 #, php-format
 msgid "Connection: %s"
 msgstr ""
@@ -4634,7 +4631,7 @@ msgstr ""
 msgid "Ignore connection"
 msgstr ""
 
-#: ../../mod/connections.php:273 ../../mod/connedit.php:538
+#: ../../mod/connections.php:273 ../../mod/connedit.php:545
 #: ../../mod/notifications.php:51
 msgid "Ignore"
 msgstr ""
@@ -4671,225 +4668,225 @@ msgstr ""
 msgid "is now connected to"
 msgstr ""
 
-#: ../../mod/connedit.php:400
+#: ../../mod/connedit.php:407
 msgid "Could not access address book record."
 msgstr ""
 
-#: ../../mod/connedit.php:414
+#: ../../mod/connedit.php:421
 msgid "Refresh failed - channel is currently unavailable."
 msgstr ""
 
-#: ../../mod/connedit.php:429 ../../mod/connedit.php:438
-#: ../../mod/connedit.php:447 ../../mod/connedit.php:456
-#: ../../mod/connedit.php:469
+#: ../../mod/connedit.php:436 ../../mod/connedit.php:445
+#: ../../mod/connedit.php:454 ../../mod/connedit.php:463
+#: ../../mod/connedit.php:476
 msgid "Unable to set address book parameters."
 msgstr ""
 
-#: ../../mod/connedit.php:493
+#: ../../mod/connedit.php:500
 msgid "Connection has been removed."
 msgstr ""
 
-#: ../../mod/connedit.php:512
+#: ../../mod/connedit.php:519
 #, php-format
 msgid "View %s's profile"
 msgstr ""
 
-#: ../../mod/connedit.php:516
+#: ../../mod/connedit.php:523
 msgid "Refresh Permissions"
 msgstr ""
 
-#: ../../mod/connedit.php:519
+#: ../../mod/connedit.php:526
 msgid "Fetch updated permissions"
 msgstr ""
 
-#: ../../mod/connedit.php:523
+#: ../../mod/connedit.php:530
 msgid "Recent Activity"
 msgstr ""
 
-#: ../../mod/connedit.php:526
+#: ../../mod/connedit.php:533
 msgid "View recent posts and comments"
 msgstr ""
 
-#: ../../mod/connedit.php:530 ../../mod/admin.php:995
+#: ../../mod/connedit.php:537 ../../mod/admin.php:995
 msgid "Unblock"
 msgstr ""
 
-#: ../../mod/connedit.php:530 ../../mod/admin.php:994
+#: ../../mod/connedit.php:537 ../../mod/admin.php:994
 msgid "Block"
 msgstr ""
 
-#: ../../mod/connedit.php:533
+#: ../../mod/connedit.php:540
 msgid "Block (or Unblock) all communications with this connection"
 msgstr ""
 
-#: ../../mod/connedit.php:534
+#: ../../mod/connedit.php:541
 msgid "This connection is blocked!"
 msgstr ""
 
-#: ../../mod/connedit.php:538
+#: ../../mod/connedit.php:545
 msgid "Unignore"
 msgstr ""
 
-#: ../../mod/connedit.php:541
+#: ../../mod/connedit.php:548
 msgid "Ignore (or Unignore) all inbound communications from this connection"
 msgstr ""
 
-#: ../../mod/connedit.php:542
+#: ../../mod/connedit.php:549
 msgid "This connection is ignored!"
 msgstr ""
 
-#: ../../mod/connedit.php:546
+#: ../../mod/connedit.php:553
 msgid "Unarchive"
 msgstr ""
 
-#: ../../mod/connedit.php:546
+#: ../../mod/connedit.php:553
 msgid "Archive"
 msgstr ""
 
-#: ../../mod/connedit.php:549
+#: ../../mod/connedit.php:556
 msgid ""
 "Archive (or Unarchive) this connection - mark channel dead but keep content"
 msgstr ""
 
-#: ../../mod/connedit.php:550
+#: ../../mod/connedit.php:557
 msgid "This connection is archived!"
 msgstr ""
 
-#: ../../mod/connedit.php:554
+#: ../../mod/connedit.php:561
 msgid "Unhide"
 msgstr ""
 
-#: ../../mod/connedit.php:554
+#: ../../mod/connedit.php:561
 msgid "Hide"
 msgstr ""
 
-#: ../../mod/connedit.php:557
+#: ../../mod/connedit.php:564
 msgid "Hide or Unhide this connection from your other connections"
 msgstr ""
 
-#: ../../mod/connedit.php:558
+#: ../../mod/connedit.php:565
 msgid "This connection is hidden!"
 msgstr ""
 
-#: ../../mod/connedit.php:565
+#: ../../mod/connedit.php:572
 msgid "Delete this connection"
 msgstr ""
 
-#: ../../mod/connedit.php:646
+#: ../../mod/connedit.php:653
 msgid "Approve this connection"
 msgstr ""
 
-#: ../../mod/connedit.php:646
+#: ../../mod/connedit.php:653
 msgid "Accept connection to allow communication"
 msgstr ""
 
-#: ../../mod/connedit.php:651
+#: ../../mod/connedit.php:658
 msgid "Set Affinity"
 msgstr ""
 
-#: ../../mod/connedit.php:654
+#: ../../mod/connedit.php:661
 msgid "Set Profile"
 msgstr ""
 
-#: ../../mod/connedit.php:657
+#: ../../mod/connedit.php:664
 msgid "Set Affinity & Profile"
 msgstr ""
 
-#: ../../mod/connedit.php:690
+#: ../../mod/connedit.php:697
 msgid "none"
 msgstr ""
 
-#: ../../mod/connedit.php:695
+#: ../../mod/connedit.php:702
 msgid "Apply these permissions automatically"
 msgstr ""
 
-#: ../../mod/connedit.php:695
+#: ../../mod/connedit.php:702
 msgid "Connection requests will be approved without your interaction"
 msgstr ""
 
-#: ../../mod/connedit.php:697
+#: ../../mod/connedit.php:704
 msgid "This connection's primary address is"
 msgstr ""
 
-#: ../../mod/connedit.php:698
+#: ../../mod/connedit.php:705
 msgid "Available locations:"
 msgstr ""
 
-#: ../../mod/connedit.php:702
+#: ../../mod/connedit.php:709
 msgid ""
 "The permissions indicated on this page will be applied to all new "
 "connections."
 msgstr ""
 
-#: ../../mod/connedit.php:704
+#: ../../mod/connedit.php:711
 msgid "Slide to adjust your degree of friendship"
 msgstr ""
 
-#: ../../mod/connedit.php:706
+#: ../../mod/connedit.php:713
 msgid "Slide to adjust your rating"
 msgstr ""
 
-#: ../../mod/connedit.php:707 ../../mod/connedit.php:712
+#: ../../mod/connedit.php:714 ../../mod/connedit.php:719
 msgid "Optionally explain your rating"
 msgstr ""
 
-#: ../../mod/connedit.php:709
+#: ../../mod/connedit.php:716
 msgid "Custom Filter"
 msgstr ""
 
-#: ../../mod/connedit.php:710
+#: ../../mod/connedit.php:717
 msgid "Only import posts with this text"
 msgstr ""
 
-#: ../../mod/connedit.php:710 ../../mod/connedit.php:711
+#: ../../mod/connedit.php:717 ../../mod/connedit.php:718
 msgid ""
 "words one per line or #tags or /patterns/ or lang=xx, leave blank to import "
 "all posts"
 msgstr ""
 
-#: ../../mod/connedit.php:711
+#: ../../mod/connedit.php:718
 msgid "Do not import posts with this text"
 msgstr ""
 
-#: ../../mod/connedit.php:713
+#: ../../mod/connedit.php:720
 msgid "This information is public!"
 msgstr ""
 
-#: ../../mod/connedit.php:718
+#: ../../mod/connedit.php:725
 msgid "Connection Pending Approval"
 msgstr ""
 
-#: ../../mod/connedit.php:721
+#: ../../mod/connedit.php:728
 msgid "inherited"
 msgstr ""
 
-#: ../../mod/connedit.php:723
+#: ../../mod/connedit.php:730
 #, php-format
 msgid ""
 "Please choose the profile you would like to display to %s when viewing your "
 "profile securely."
 msgstr ""
 
-#: ../../mod/connedit.php:725
+#: ../../mod/connedit.php:732
 msgid "Their Settings"
 msgstr ""
 
-#: ../../mod/connedit.php:726
+#: ../../mod/connedit.php:733
 msgid "My Settings"
 msgstr ""
 
-#: ../../mod/connedit.php:728
+#: ../../mod/connedit.php:735
 msgid "Individual Permissions"
 msgstr ""
 
-#: ../../mod/connedit.php:729
+#: ../../mod/connedit.php:736
 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 ""
 
-#: ../../mod/connedit.php:730
+#: ../../mod/connedit.php:737
 msgid ""
 "Some permissions may be inherited from your channel's <a href=\"settings"
 "\"><strong>privacy settings</strong></a>, which have higher priority than "
@@ -4897,7 +4894,7 @@ msgid ""
 "any impact unless the inherited setting changes."
 msgstr ""
 
-#: ../../mod/connedit.php:731
+#: ../../mod/connedit.php:738
 msgid "Last update:"
 msgstr ""
 
@@ -5249,7 +5246,7 @@ msgid "Previous"
 msgstr ""
 
 #: ../../mod/events.php:660 ../../mod/events.php:667 ../../mod/photos.php:925
-#: ../../mod/setup.php:288 ../../mod/cal.php:327 ../../mod/cal.php:334
+#: ../../mod/setup.php:291 ../../mod/cal.php:327 ../../mod/cal.php:334
 msgid "Next"
 msgstr ""
 
@@ -5321,7 +5318,7 @@ msgstr ""
 msgid "Notify your contacts about this file"
 msgstr ""
 
-#: ../../mod/follow.php:25
+#: ../../mod/follow.php:27
 msgid "Channel added."
 msgstr ""
 
@@ -5519,42 +5516,42 @@ msgstr ""
 msgid "No channel. Import failed."
 msgstr ""
 
-#: ../../mod/import.php:518
+#: ../../mod/import.php:533
 msgid "You must be logged in to use this feature."
 msgstr ""
 
-#: ../../mod/import.php:523
+#: ../../mod/import.php:538
 msgid "Import Channel"
 msgstr ""
 
-#: ../../mod/import.php:524
+#: ../../mod/import.php:539
 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 ""
 
-#: ../../mod/import.php:525 ../../mod/import_items.php:115
+#: ../../mod/import.php:540 ../../mod/import_items.php:115
 msgid "File to Upload"
 msgstr ""
 
-#: ../../mod/import.php:526
+#: ../../mod/import.php:541
 msgid "Or provide the old server/hub details"
 msgstr ""
 
-#: ../../mod/import.php:527
+#: ../../mod/import.php:542
 msgid "Your old identity address (xyz@example.com)"
 msgstr ""
 
-#: ../../mod/import.php:528
+#: ../../mod/import.php:543
 msgid "Your old login email address"
 msgstr ""
 
-#: ../../mod/import.php:529
+#: ../../mod/import.php:544
 msgid "Your old login password"
 msgstr ""
 
-#: ../../mod/import.php:530
+#: ../../mod/import.php:545
 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 "
@@ -5562,16 +5559,16 @@ msgid ""
 "location for files, photos, and media."
 msgstr ""
 
-#: ../../mod/import.php:531
+#: ../../mod/import.php:546
 msgid "Make this hub my primary location"
 msgstr ""
 
-#: ../../mod/import.php:532
+#: ../../mod/import.php:547
 msgid ""
 "Import existing posts if possible (experimental - limited by available memory"
 msgstr ""
 
-#: ../../mod/import.php:533
+#: ../../mod/import.php:548
 msgid ""
 "This process may take several minutes to complete. Please submit the form "
 "only once and leave this page open until finished."
@@ -5670,24 +5667,24 @@ msgstr ""
 msgid "Executable content type not permitted to this channel."
 msgstr ""
 
-#: ../../mod/item.php:830
+#: ../../mod/item.php:843
 msgid "Duplicate post suppressed."
 msgstr ""
 
-#: ../../mod/item.php:960
+#: ../../mod/item.php:973
 msgid "System error. Post not saved."
 msgstr ""
 
-#: ../../mod/item.php:1227
+#: ../../mod/item.php:1240
 msgid "Unable to obtain post information from database."
 msgstr ""
 
-#: ../../mod/item.php:1234
+#: ../../mod/item.php:1247
 #, php-format
 msgid "You have reached your limit of %1$.0f top level posts."
 msgstr ""
 
-#: ../../mod/item.php:1241
+#: ../../mod/item.php:1254
 #, php-format
 msgid "You have reached your limit of %1$.0f webpages."
 msgstr ""
@@ -7304,46 +7301,70 @@ msgstr ""
 msgid "Log level"
 msgstr ""
 
-#: ../../mod/admin.php:1661
+#: ../../mod/admin.php:1682
 msgid "New Profile Field"
 msgstr ""
 
-#: ../../mod/admin.php:1662 ../../mod/admin.php:1682
+#: ../../mod/admin.php:1683 ../../mod/admin.php:1703
 msgid "Field nickname"
 msgstr ""
 
-#: ../../mod/admin.php:1662 ../../mod/admin.php:1682
+#: ../../mod/admin.php:1683 ../../mod/admin.php:1703
 msgid "System name of field"
 msgstr ""
 
-#: ../../mod/admin.php:1663 ../../mod/admin.php:1683
+#: ../../mod/admin.php:1684 ../../mod/admin.php:1704
 msgid "Input type"
 msgstr ""
 
-#: ../../mod/admin.php:1664 ../../mod/admin.php:1684
+#: ../../mod/admin.php:1685 ../../mod/admin.php:1705
 msgid "Field Name"
 msgstr ""
 
-#: ../../mod/admin.php:1664 ../../mod/admin.php:1684
+#: ../../mod/admin.php:1685 ../../mod/admin.php:1705
 msgid "Label on profile pages"
 msgstr ""
 
-#: ../../mod/admin.php:1665 ../../mod/admin.php:1685
+#: ../../mod/admin.php:1686 ../../mod/admin.php:1706
 msgid "Help text"
 msgstr ""
 
-#: ../../mod/admin.php:1665 ../../mod/admin.php:1685
+#: ../../mod/admin.php:1686 ../../mod/admin.php:1706
 msgid "Additional info (optional)"
 msgstr ""
 
-#: ../../mod/admin.php:1675
+#: ../../mod/admin.php:1696
 msgid "Field definition not found"
 msgstr ""
 
-#: ../../mod/admin.php:1681
+#: ../../mod/admin.php:1702
 msgid "Edit Profile Field"
 msgstr ""
 
+#: ../../mod/admin.php:1761
+msgid "Basic Profile Fields"
+msgstr ""
+
+#: ../../mod/admin.php:1762
+msgid "Advanced Profile Fields"
+msgstr ""
+
+#: ../../mod/admin.php:1762
+msgid "(In addition to basic fields)"
+msgstr ""
+
+#: ../../mod/admin.php:1764
+msgid "All available fields"
+msgstr ""
+
+#: ../../mod/admin.php:1765
+msgid "Custom Fields"
+msgstr ""
+
+#: ../../mod/admin.php:1769
+msgid "Create Custom Field"
+msgstr ""
+
 #: ../../mod/poke.php:165
 msgid "Poke somebody"
 msgstr ""
@@ -8562,418 +8583,418 @@ msgstr ""
 msgid "Start calendar week on monday"
 msgstr ""
 
-#: ../../mod/setup.php:194
+#: ../../mod/setup.php:197
 msgid "$Projectname Server - Setup"
 msgstr ""
 
-#: ../../mod/setup.php:198
+#: ../../mod/setup.php:201
 msgid "Could not connect to database."
 msgstr ""
 
-#: ../../mod/setup.php:202
+#: ../../mod/setup.php:205
 msgid ""
 "Could not connect to specified site URL. Possible SSL certificate or DNS "
 "issue."
 msgstr ""
 
-#: ../../mod/setup.php:209
+#: ../../mod/setup.php:212
 msgid "Could not create table."
 msgstr ""
 
-#: ../../mod/setup.php:214
+#: ../../mod/setup.php:217
 msgid "Your site database has been installed."
 msgstr ""
 
-#: ../../mod/setup.php:218
+#: ../../mod/setup.php:221
 msgid ""
 "You may need to import the file \"install/schema_xxx.sql\" manually using a "
 "database client."
 msgstr ""
 
-#: ../../mod/setup.php:219 ../../mod/setup.php:287 ../../mod/setup.php:737
+#: ../../mod/setup.php:222 ../../mod/setup.php:290 ../../mod/setup.php:740
 msgid "Please see the file \"install/INSTALL.txt\"."
 msgstr ""
 
-#: ../../mod/setup.php:284
+#: ../../mod/setup.php:287
 msgid "System check"
 msgstr ""
 
-#: ../../mod/setup.php:289
+#: ../../mod/setup.php:292
 msgid "Check again"
 msgstr ""
 
-#: ../../mod/setup.php:311
+#: ../../mod/setup.php:314
 msgid "Database connection"
 msgstr ""
 
-#: ../../mod/setup.php:312
+#: ../../mod/setup.php:315
 msgid ""
 "In order to install $Projectname we need to know how to connect to your "
 "database."
 msgstr ""
 
-#: ../../mod/setup.php:313
+#: ../../mod/setup.php:316
 msgid ""
 "Please contact your hosting provider or site administrator if you have "
 "questions about these settings."
 msgstr ""
 
-#: ../../mod/setup.php:314
+#: ../../mod/setup.php:317
 msgid ""
 "The database you specify below should already exist. If it does not, please "
 "create it before continuing."
 msgstr ""
 
-#: ../../mod/setup.php:318
+#: ../../mod/setup.php:321
 msgid "Database Server Name"
 msgstr ""
 
-#: ../../mod/setup.php:318
+#: ../../mod/setup.php:321
 msgid "Default is 127.0.0.1"
 msgstr ""
 
-#: ../../mod/setup.php:319
+#: ../../mod/setup.php:322
 msgid "Database Port"
 msgstr ""
 
-#: ../../mod/setup.php:319
+#: ../../mod/setup.php:322
 msgid "Communication port number - use 0 for default"
 msgstr ""
 
-#: ../../mod/setup.php:320
+#: ../../mod/setup.php:323
 msgid "Database Login Name"
 msgstr ""
 
-#: ../../mod/setup.php:321
+#: ../../mod/setup.php:324
 msgid "Database Login Password"
 msgstr ""
 
-#: ../../mod/setup.php:322
+#: ../../mod/setup.php:325
 msgid "Database Name"
 msgstr ""
 
-#: ../../mod/setup.php:323
+#: ../../mod/setup.php:326
 msgid "Database Type"
 msgstr ""
 
-#: ../../mod/setup.php:325 ../../mod/setup.php:365
+#: ../../mod/setup.php:328 ../../mod/setup.php:368
 msgid "Site administrator email address"
 msgstr ""
 
-#: ../../mod/setup.php:325 ../../mod/setup.php:365
+#: ../../mod/setup.php:328 ../../mod/setup.php:368
 msgid ""
 "Your account email address must match this in order to use the web admin "
 "panel."
 msgstr ""
 
-#: ../../mod/setup.php:326 ../../mod/setup.php:367
+#: ../../mod/setup.php:329 ../../mod/setup.php:370
 msgid "Website URL"
 msgstr ""
 
-#: ../../mod/setup.php:326 ../../mod/setup.php:367
+#: ../../mod/setup.php:329 ../../mod/setup.php:370
 msgid "Please use SSL (https) URL if available."
 msgstr ""
 
-#: ../../mod/setup.php:327 ../../mod/setup.php:370
+#: ../../mod/setup.php:330 ../../mod/setup.php:373
 msgid "Please select a default timezone for your website"
 msgstr ""
 
-#: ../../mod/setup.php:354
+#: ../../mod/setup.php:357
 msgid "Site settings"
 msgstr ""
 
-#: ../../mod/setup.php:368
+#: ../../mod/setup.php:371
 msgid "Enable $Projectname <strong>advanced</strong> features?"
 msgstr ""
 
-#: ../../mod/setup.php:368
+#: ../../mod/setup.php:371
 msgid ""
 "Some advanced features, while useful - may be best suited for technically "
 "proficient audiences"
 msgstr ""
 
-#: ../../mod/setup.php:420
+#: ../../mod/setup.php:423
 msgid "Could not find a command line version of PHP in the web server PATH."
 msgstr ""
 
-#: ../../mod/setup.php:421
+#: ../../mod/setup.php:424
 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 ""
 
-#: ../../mod/setup.php:425
+#: ../../mod/setup.php:428
 msgid "PHP executable path"
 msgstr ""
 
-#: ../../mod/setup.php:425
+#: ../../mod/setup.php:428
 msgid ""
 "Enter full path to php executable. You can leave this blank to continue the "
 "installation."
 msgstr ""
 
-#: ../../mod/setup.php:430
+#: ../../mod/setup.php:433
 msgid "Command line PHP"
 msgstr ""
 
-#: ../../mod/setup.php:439
+#: ../../mod/setup.php:442
 msgid ""
 "The command line version of PHP on your system does not have "
 "\"register_argc_argv\" enabled."
 msgstr ""
 
-#: ../../mod/setup.php:440
+#: ../../mod/setup.php:443
 msgid "This is required for message delivery to work."
 msgstr ""
 
-#: ../../mod/setup.php:443
+#: ../../mod/setup.php:446
 msgid "PHP register_argc_argv"
 msgstr ""
 
-#: ../../mod/setup.php:461
+#: ../../mod/setup.php:464
 #, 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 ""
 
-#: ../../mod/setup.php:466
+#: ../../mod/setup.php:469
 msgid "You can adjust these settings in the servers php.ini."
 msgstr ""
 
-#: ../../mod/setup.php:468
+#: ../../mod/setup.php:471
 msgid "PHP upload limits"
 msgstr ""
 
-#: ../../mod/setup.php:491
+#: ../../mod/setup.php:494
 msgid ""
 "Error: the \"openssl_pkey_new\" function on this system is not able to "
 "generate encryption keys"
 msgstr ""
 
-#: ../../mod/setup.php:492
+#: ../../mod/setup.php:495
 msgid ""
 "If running under Windows, please see \"http://www.php.net/manual/en/openssl."
 "installation.php\"."
 msgstr ""
 
-#: ../../mod/setup.php:495
+#: ../../mod/setup.php:498
 msgid "Generate encryption keys"
 msgstr ""
 
-#: ../../mod/setup.php:507
+#: ../../mod/setup.php:510
 msgid "libCurl PHP module"
 msgstr ""
 
-#: ../../mod/setup.php:508
+#: ../../mod/setup.php:511
 msgid "GD graphics PHP module"
 msgstr ""
 
-#: ../../mod/setup.php:509
+#: ../../mod/setup.php:512
 msgid "OpenSSL PHP module"
 msgstr ""
 
-#: ../../mod/setup.php:510
+#: ../../mod/setup.php:513
 msgid "mysqli or postgres PHP module"
 msgstr ""
 
-#: ../../mod/setup.php:511
+#: ../../mod/setup.php:514
 msgid "mb_string PHP module"
 msgstr ""
 
-#: ../../mod/setup.php:512
+#: ../../mod/setup.php:515
 msgid "mcrypt PHP module"
 msgstr ""
 
-#: ../../mod/setup.php:513
+#: ../../mod/setup.php:516
 msgid "xml PHP module"
 msgstr ""
 
-#: ../../mod/setup.php:517 ../../mod/setup.php:519
+#: ../../mod/setup.php:520 ../../mod/setup.php:522
 msgid "Apache mod_rewrite module"
 msgstr ""
 
-#: ../../mod/setup.php:517
+#: ../../mod/setup.php:520
 msgid ""
 "Error: Apache webserver mod-rewrite module is required but not installed."
 msgstr ""
 
-#: ../../mod/setup.php:523 ../../mod/setup.php:526
+#: ../../mod/setup.php:526 ../../mod/setup.php:529
 msgid "proc_open"
 msgstr ""
 
-#: ../../mod/setup.php:523
+#: ../../mod/setup.php:526
 msgid ""
 "Error: proc_open is required but is either not installed or has been "
 "disabled in php.ini"
 msgstr ""
 
-#: ../../mod/setup.php:531
+#: ../../mod/setup.php:534
 msgid "Error: libCURL PHP module required but not installed."
 msgstr ""
 
-#: ../../mod/setup.php:535
+#: ../../mod/setup.php:538
 msgid ""
 "Error: GD graphics PHP module with JPEG support required but not installed."
 msgstr ""
 
-#: ../../mod/setup.php:539
+#: ../../mod/setup.php:542
 msgid "Error: openssl PHP module required but not installed."
 msgstr ""
 
-#: ../../mod/setup.php:543
+#: ../../mod/setup.php:546
 msgid ""
 "Error: mysqli or postgres PHP module required but neither are installed."
 msgstr ""
 
-#: ../../mod/setup.php:547
+#: ../../mod/setup.php:550
 msgid "Error: mb_string PHP module required but not installed."
 msgstr ""
 
-#: ../../mod/setup.php:551
+#: ../../mod/setup.php:554
 msgid "Error: mcrypt PHP module required but not installed."
 msgstr ""
 
-#: ../../mod/setup.php:555
+#: ../../mod/setup.php:558
 msgid "Error: xml PHP module required for DAV but not installed."
 msgstr ""
 
-#: ../../mod/setup.php:573
+#: ../../mod/setup.php:576
 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 ""
 
-#: ../../mod/setup.php:574
+#: ../../mod/setup.php:577
 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 ""
 
-#: ../../mod/setup.php:575
+#: ../../mod/setup.php:578
 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 ""
 
-#: ../../mod/setup.php:576
+#: ../../mod/setup.php:579
 msgid ""
 "You can alternatively skip this procedure and perform a manual installation. "
 "Please see the file \"install/INSTALL.txt\" for instructions."
 msgstr ""
 
-#: ../../mod/setup.php:579
+#: ../../mod/setup.php:582
 msgid ".htconfig.php is writable"
 msgstr ""
 
-#: ../../mod/setup.php:593
+#: ../../mod/setup.php:596
 msgid ""
 "Red uses the Smarty3 template engine to render its web views. Smarty3 "
 "compiles templates to PHP to speed up rendering."
 msgstr ""
 
-#: ../../mod/setup.php:594
+#: ../../mod/setup.php:597
 #, 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."
 msgstr ""
 
-#: ../../mod/setup.php:595 ../../mod/setup.php:616
+#: ../../mod/setup.php:598 ../../mod/setup.php:619
 msgid ""
 "Please ensure that the user that your web server runs as (e.g. www-data) has "
 "write access to this folder."
 msgstr ""
 
-#: ../../mod/setup.php:596
+#: ../../mod/setup.php:599
 #, 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 ""
 
-#: ../../mod/setup.php:599
+#: ../../mod/setup.php:602
 #, php-format
 msgid "%s is writable"
 msgstr ""
 
-#: ../../mod/setup.php:615
+#: ../../mod/setup.php:618
 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 ""
 
-#: ../../mod/setup.php:619
+#: ../../mod/setup.php:622
 msgid "store is writable"
 msgstr ""
 
-#: ../../mod/setup.php:652
+#: ../../mod/setup.php:655
 msgid ""
 "SSL certificate cannot be validated. Fix certificate or disable https access "
 "to this site."
 msgstr ""
 
-#: ../../mod/setup.php:653
+#: ../../mod/setup.php:656
 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 ""
 
-#: ../../mod/setup.php:654
+#: ../../mod/setup.php:657
 msgid ""
 "This restriction is incorporated because public posts from you may for "
 "example contain references to images on your own hub."
 msgstr ""
 
-#: ../../mod/setup.php:655
+#: ../../mod/setup.php:658
 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 ""
 
-#: ../../mod/setup.php:656
+#: ../../mod/setup.php:659
 msgid ""
 "This can cause usability issues elsewhere (not just on your own site) so we "
 "must insist on this requirement."
 msgstr ""
 
-#: ../../mod/setup.php:657
+#: ../../mod/setup.php:660
 msgid ""
 "Providers are available that issue free certificates which are browser-valid."
 msgstr ""
 
-#: ../../mod/setup.php:659
+#: ../../mod/setup.php:662
 msgid "SSL certificate validation"
 msgstr ""
 
-#: ../../mod/setup.php:665
+#: ../../mod/setup.php:668
 msgid ""
 "Url rewrite in .htaccess is not working. Check your server configuration."
 "Test: "
 msgstr ""
 
-#: ../../mod/setup.php:668
+#: ../../mod/setup.php:671
 msgid "Url rewrite is working"
 msgstr ""
 
-#: ../../mod/setup.php:677
+#: ../../mod/setup.php:680
 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 ""
 
-#: ../../mod/setup.php:701
+#: ../../mod/setup.php:704
 msgid "Errors encountered creating database tables."
 msgstr ""
 
-#: ../../mod/setup.php:735
+#: ../../mod/setup.php:738
 msgid "<h1>What next</h1>"
 msgstr ""
 
-#: ../../mod/setup.php:736
+#: ../../mod/setup.php:739
 msgid ""
 "IMPORTANT: You will need to [manually] setup a scheduled task for the poller."
 msgstr ""
diff --git a/version.inc b/version.inc
index bac770446..ca28cf2da 100644
--- a/version.inc
+++ b/version.inc
@@ -1 +1 @@
-2016-03-03.1325H
+2016-03-04.1326H