string update

2 files changed, 926 insertions, 986 deletions

diff --git a/util/messages.po b/util/messages.po
index b3ee12e89..3e4a7873c 100644
--- a/util/messages.po
+++ b/util/messages.po
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: 2015-07-10.1089\n"
+"Project-Id-Version: 2015-07-17.1096\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-07-10 00:04-0700\n"
+"POT-Creation-Date: 2015-07-17 00:04-0700\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -28,401 +28,123 @@ msgstr ""
 msgid "Profile Photos"
 msgstr ""
 
-#: ../../include/text.php:395
-msgid "prev"
-msgstr ""
-
-#: ../../include/text.php:397
-msgid "first"
-msgstr ""
-
-#: ../../include/text.php:426
-msgid "last"
-msgstr ""
-
-#: ../../include/text.php:429
-msgid "next"
-msgstr ""
-
-#: ../../include/text.php:439
-msgid "older"
+#: ../../include/menu.php:107 ../../include/page_widgets.php:8
+#: ../../include/page_widgets.php:36 ../../include/RedDAV/RedBrowser.php:266
+#: ../../include/ItemObject.php:100 ../../include/apps.php:254
+#: ../../mod/webpages.php:181 ../../mod/thing.php:227
+#: ../../mod/connections.php:382 ../../mod/connections.php:395
+#: ../../mod/connections.php:414 ../../mod/blocks.php:153
+#: ../../mod/editpost.php:106 ../../mod/editlayout.php:133
+#: ../../mod/editwebpage.php:178 ../../mod/editblock.php:134
+#: ../../mod/menu.php:103 ../../mod/settings.php:650 ../../mod/layouts.php:183
+msgid "Edit"
 msgstr ""
 
-#: ../../include/text.php:441
-msgid "newer"
+#: ../../include/diaspora.php:2115 ../../include/text.php:1888
+#: ../../include/conversation.php:120 ../../mod/like.php:346
+#: ../../mod/subthread.php:72 ../../mod/subthread.php:174
+#: ../../mod/tagger.php:43
+msgid "photo"
 msgstr ""
 
-#: ../../include/text.php:834
-msgid "No connections"
+#: ../../include/diaspora.php:2115 ../../include/text.php:1894
+#: ../../include/conversation.php:148 ../../mod/like.php:346
+#: ../../mod/subthread.php:72 ../../mod/subthread.php:174
+msgid "status"
 msgstr ""
 
-#: ../../include/text.php:848
+#: ../../include/diaspora.php:2144 ../../include/conversation.php:164
+#: ../../mod/like.php:394
 #, php-format
-msgid "%d Connection"
-msgid_plural "%d Connections"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../../include/text.php:861 ../../mod/viewconnections.php:104
-msgid "View Connections"
-msgstr ""
-
-#: ../../include/text.php:918 ../../include/text.php:930
-#: ../../include/nav.php:165 ../../include/apps.php:147
-#: ../../mod/search.php:38
-msgid "Search"
-msgstr ""
-
-#: ../../include/text.php:919 ../../include/text.php:931
-#: ../../include/widgets.php:192 ../../mod/rbmark.php:28
-#: ../../mod/rbmark.php:98 ../../mod/filer.php:50 ../../mod/admin.php:1457
-#: ../../mod/admin.php:1477
-msgid "Save"
-msgstr ""
-
-#: ../../include/text.php:994
-msgid "poke"
-msgstr ""
-
-#: ../../include/text.php:994 ../../include/conversation.php:243
-msgid "poked"
-msgstr ""
-
-#: ../../include/text.php:995
-msgid "ping"
-msgstr ""
-
-#: ../../include/text.php:995
-msgid "pinged"
-msgstr ""
-
-#: ../../include/text.php:996
-msgid "prod"
-msgstr ""
-
-#: ../../include/text.php:996
-msgid "prodded"
-msgstr ""
-
-#: ../../include/text.php:997
-msgid "slap"
-msgstr ""
-
-#: ../../include/text.php:997
-msgid "slapped"
-msgstr ""
-
-#: ../../include/text.php:998
-msgid "finger"
-msgstr ""
-
-#: ../../include/text.php:998
-msgid "fingered"
-msgstr ""
-
-#: ../../include/text.php:999
-msgid "rebuff"
-msgstr ""
-
-#: ../../include/text.php:999
-msgid "rebuffed"
-msgstr ""
-
-#: ../../include/text.php:1009
-msgid "happy"
-msgstr ""
-
-#: ../../include/text.php:1010
-msgid "sad"
-msgstr ""
-
-#: ../../include/text.php:1011
-msgid "mellow"
-msgstr ""
-
-#: ../../include/text.php:1012
-msgid "tired"
-msgstr ""
-
-#: ../../include/text.php:1013
-msgid "perky"
-msgstr ""
-
-#: ../../include/text.php:1014
-msgid "angry"
-msgstr ""
-
-#: ../../include/text.php:1015
-msgid "stupified"
-msgstr ""
-
-#: ../../include/text.php:1016
-msgid "puzzled"
-msgstr ""
-
-#: ../../include/text.php:1017
-msgid "interested"
-msgstr ""
-
-#: ../../include/text.php:1018
-msgid "bitter"
-msgstr ""
-
-#: ../../include/text.php:1019
-msgid "cheerful"
-msgstr ""
-
-#: ../../include/text.php:1020
-msgid "alive"
-msgstr ""
-
-#: ../../include/text.php:1021
-msgid "annoyed"
-msgstr ""
-
-#: ../../include/text.php:1022
-msgid "anxious"
-msgstr ""
-
-#: ../../include/text.php:1023
-msgid "cranky"
-msgstr ""
-
-#: ../../include/text.php:1024
-msgid "disturbed"
-msgstr ""
-
-#: ../../include/text.php:1025
-msgid "frustrated"
-msgstr ""
-
-#: ../../include/text.php:1026
-msgid "depressed"
-msgstr ""
-
-#: ../../include/text.php:1027
-msgid "motivated"
-msgstr ""
-
-#: ../../include/text.php:1028
-msgid "relaxed"
-msgstr ""
-
-#: ../../include/text.php:1029
-msgid "surprised"
-msgstr ""
-
-#: ../../include/text.php:1201
-msgid "Monday"
-msgstr ""
-
-#: ../../include/text.php:1201
-msgid "Tuesday"
-msgstr ""
-
-#: ../../include/text.php:1201
-msgid "Wednesday"
-msgstr ""
-
-#: ../../include/text.php:1201
-msgid "Thursday"
-msgstr ""
-
-#: ../../include/text.php:1201
-msgid "Friday"
-msgstr ""
-
-#: ../../include/text.php:1201
-msgid "Saturday"
-msgstr ""
-
-#: ../../include/text.php:1201
-msgid "Sunday"
-msgstr ""
-
-#: ../../include/text.php:1205
-msgid "January"
-msgstr ""
-
-#: ../../include/text.php:1205
-msgid "February"
-msgstr ""
-
-#: ../../include/text.php:1205
-msgid "March"
-msgstr ""
-
-#: ../../include/text.php:1205
-msgid "April"
-msgstr ""
-
-#: ../../include/text.php:1205
-msgid "May"
-msgstr ""
-
-#: ../../include/text.php:1205
-msgid "June"
-msgstr ""
-
-#: ../../include/text.php:1205
-msgid "July"
-msgstr ""
-
-#: ../../include/text.php:1205
-msgid "August"
-msgstr ""
-
-#: ../../include/text.php:1205
-msgid "September"
-msgstr ""
-
-#: ../../include/text.php:1205
-msgid "October"
-msgstr ""
-
-#: ../../include/text.php:1205
-msgid "November"
-msgstr ""
-
-#: ../../include/text.php:1205
-msgid "December"
-msgstr ""
-
-#: ../../include/text.php:1310
-msgid "unknown.???"
-msgstr ""
-
-#: ../../include/text.php:1311
-msgid "bytes"
-msgstr ""
-
-#: ../../include/text.php:1347
-msgid "remove category"
-msgstr ""
-
-#: ../../include/text.php:1422
-msgid "remove from file"
-msgstr ""
-
-#: ../../include/text.php:1498 ../../include/text.php:1509
-#: ../../mod/connedit.php:667
-msgid "Click to open/close"
-msgstr ""
-
-#: ../../include/text.php:1665 ../../mod/events.php:444
-msgid "Link to Source"
-msgstr ""
-
-#: ../../include/text.php:1686 ../../include/text.php:1757
-msgid "default"
-msgstr ""
-
-#: ../../include/text.php:1694
-msgid "Page layout"
+msgid "%1$s likes %2$s's %3$s"
 msgstr ""
 
-#: ../../include/text.php:1694
-msgid "You can create your own with the layouts tool"
+#: ../../include/diaspora.php:2490
+msgid "Please choose"
 msgstr ""
 
-#: ../../include/text.php:1735
-msgid "Page content type"
+#: ../../include/diaspora.php:2492
+msgid "Agree"
 msgstr ""
 
-#: ../../include/text.php:1769
-msgid "Select an alternate language"
+#: ../../include/diaspora.php:2494
+msgid "Disagree"
 msgstr ""
 
-#: ../../include/text.php:1888 ../../include/diaspora.php:2115
-#: ../../include/conversation.php:120 ../../mod/like.php:346
-#: ../../mod/subthread.php:72 ../../mod/subthread.php:174
-#: ../../mod/tagger.php:43
-msgid "photo"
+#: ../../include/diaspora.php:2496
+msgid "Abstain"
 msgstr ""
 
-#: ../../include/text.php:1891 ../../include/conversation.php:123
-#: ../../mod/like.php:348 ../../mod/tagger.php:47
-msgid "event"
+#: ../../include/diaspora.php:2518 ../../include/diaspora.php:2529
+#: ../../include/network.php:1586 ../../include/enotify.php:59
+#: ../../mod/p.php:46
+msgid "$projectname"
 msgstr ""
 
-#: ../../include/text.php:1894 ../../include/diaspora.php:2115
-#: ../../include/conversation.php:148 ../../mod/like.php:346
-#: ../../mod/subthread.php:72 ../../mod/subthread.php:174
-msgid "status"
+#: ../../include/contact_selectors.php:56
+msgid "Frequently"
 msgstr ""
 
-#: ../../include/text.php:1896 ../../include/conversation.php:150
-#: ../../mod/tagger.php:53
-msgid "comment"
+#: ../../include/contact_selectors.php:57
+msgid "Hourly"
 msgstr ""
 
-#: ../../include/text.php:1901
-msgid "activity"
+#: ../../include/contact_selectors.php:58
+msgid "Twice daily"
 msgstr ""
 
-#: ../../include/text.php:2196
-msgid "Design Tools"
+#: ../../include/contact_selectors.php:59
+msgid "Daily"
 msgstr ""
 
-#: ../../include/text.php:2199 ../../mod/blocks.php:147
-msgid "Blocks"
+#: ../../include/contact_selectors.php:60
+msgid "Weekly"
 msgstr ""
 
-#: ../../include/text.php:2200 ../../mod/menu.php:98
-msgid "Menus"
+#: ../../include/contact_selectors.php:61
+msgid "Monthly"
 msgstr ""
 
-#: ../../include/text.php:2201 ../../mod/layouts.php:174
-msgid "Layouts"
+#: ../../include/contact_selectors.php:76
+msgid "Friendica"
 msgstr ""
 
-#: ../../include/text.php:2202
-msgid "Pages"
+#: ../../include/contact_selectors.php:77
+msgid "OStatus"
 msgstr ""
 
-#: ../../include/text.php:2553 ../../include/RedDAV/RedBrowser.php:131
-msgid "Collection"
+#: ../../include/contact_selectors.php:78
+msgid "RSS/Atom"
 msgstr ""
 
-#: ../../include/menu.php:107 ../../include/page_widgets.php:8
-#: ../../include/page_widgets.php:36 ../../include/RedDAV/RedBrowser.php:266
-#: ../../include/ItemObject.php:100 ../../include/apps.php:254
-#: ../../mod/webpages.php:181 ../../mod/thing.php:227
-#: ../../mod/connections.php:382 ../../mod/connections.php:395
-#: ../../mod/connections.php:414 ../../mod/blocks.php:153
-#: ../../mod/editlayout.php:139 ../../mod/editwebpage.php:178
-#: ../../mod/editpost.php:113 ../../mod/menu.php:103
-#: ../../mod/editblock.php:140 ../../mod/settings.php:650
-#: ../../mod/layouts.php:183
-msgid "Edit"
+#: ../../include/contact_selectors.php:79 ../../mod/admin.php:822
+#: ../../mod/admin.php:831 ../../mod/id.php:15 ../../mod/id.php:16
+#: ../../boot.php:1553
+msgid "Email"
 msgstr ""
 
-#: ../../include/diaspora.php:2144 ../../include/conversation.php:164
-#: ../../mod/like.php:394
-#, php-format
-msgid "%1$s likes %2$s's %3$s"
+#: ../../include/contact_selectors.php:80
+msgid "Diaspora"
 msgstr ""
 
-#: ../../include/diaspora.php:2490
-msgid "Please choose"
+#: ../../include/contact_selectors.php:81
+msgid "Facebook"
 msgstr ""
 
-#: ../../include/diaspora.php:2492
-msgid "Agree"
+#: ../../include/contact_selectors.php:82
+msgid "Zot!"
 msgstr ""
 
-#: ../../include/diaspora.php:2494
-msgid "Disagree"
+#: ../../include/contact_selectors.php:83
+msgid "LinkedIn"
 msgstr ""
 
-#: ../../include/diaspora.php:2496
-msgid "Abstain"
+#: ../../include/contact_selectors.php:84
+msgid "XMPP/IM"
 msgstr ""
 
-#: ../../include/diaspora.php:2518 ../../include/diaspora.php:2529
-#: ../../include/network.php:1586 ../../include/enotify.php:59
-#: ../../mod/p.php:46
-msgid "$projectname"
+#: ../../include/contact_selectors.php:85
+msgid "MySpace"
 msgstr ""
 
 #: ../../include/notify.php:23
@@ -655,6 +377,47 @@ msgstr ""
 msgid "Happy Birthday %1$s"
 msgstr ""
 
+#: ../../include/dir_fns.php:126
+msgid "Directory Options"
+msgstr ""
+
+#: ../../include/dir_fns.php:128
+msgid "Safe Mode"
+msgstr ""
+
+#: ../../include/dir_fns.php:128 ../../include/dir_fns.php:129
+#: ../../include/dir_fns.php:130 ../../mod/api.php:106
+#: ../../mod/photos.php:568 ../../mod/mitem.php:157 ../../mod/mitem.php:158
+#: ../../mod/mitem.php:229 ../../mod/mitem.php:230 ../../mod/menu.php:91
+#: ../../mod/menu.php:147 ../../mod/filestorage.php:151
+#: ../../mod/filestorage.php:159 ../../mod/admin.php:428
+#: ../../mod/settings.php:579 ../../mod/removeme.php:60
+#: ../../mod/connedit.php:631 ../../mod/connedit.php:659
+#: ../../view/theme/redbasic/php/config.php:104
+#: ../../view/theme/redbasic/php/config.php:129 ../../boot.php:1555
+msgid "No"
+msgstr ""
+
+#: ../../include/dir_fns.php:128 ../../include/dir_fns.php:129
+#: ../../include/dir_fns.php:130 ../../mod/api.php:105
+#: ../../mod/photos.php:568 ../../mod/mitem.php:157 ../../mod/mitem.php:158
+#: ../../mod/mitem.php:229 ../../mod/mitem.php:230 ../../mod/menu.php:91
+#: ../../mod/menu.php:147 ../../mod/filestorage.php:151
+#: ../../mod/filestorage.php:159 ../../mod/admin.php:430
+#: ../../mod/settings.php:579 ../../mod/removeme.php:60
+#: ../../view/theme/redbasic/php/config.php:104
+#: ../../view/theme/redbasic/php/config.php:129 ../../boot.php:1555
+msgid "Yes"
+msgstr ""
+
+#: ../../include/dir_fns.php:129
+msgid "Public Forums Only"
+msgstr ""
+
+#: ../../include/dir_fns.php:130
+msgid "This Website Only"
+msgstr ""
+
 #: ../../include/page_widgets.php:6
 msgid "New Page"
 msgstr ""
@@ -666,9 +429,9 @@ msgstr ""
 
 #: ../../include/page_widgets.php:40 ../../include/ItemObject.php:677
 #: ../../include/conversation.php:1155 ../../mod/webpages.php:188
-#: ../../mod/events.php:653 ../../mod/photos.php:982
-#: ../../mod/editwebpage.php:214 ../../mod/editpost.php:150
-#: ../../mod/editblock.php:176
+#: ../../mod/events.php:653 ../../mod/editpost.php:143
+#: ../../mod/photos.php:982 ../../mod/editwebpage.php:214
+#: ../../mod/editblock.php:170
 msgid "Preview"
 msgstr ""
 
@@ -716,7 +479,7 @@ msgid "Finishes:"
 msgstr ""
 
 #: ../../include/event.php:47 ../../include/bb2diaspora.php:481
-#: ../../include/identity.php:879 ../../mod/directory.php:302
+#: ../../include/identity.php:908 ../../mod/directory.php:302
 #: ../../mod/events.php:647
 msgid "Location:"
 msgstr ""
@@ -787,6 +550,7 @@ msgid "Rate This Channel (this is public)"
 msgstr ""
 
 #: ../../include/js_strings.php:20 ../../mod/rate.php:156
+#: ../../mod/connedit.php:667
 msgid "Rating"
 msgstr ""
 
@@ -800,8 +564,8 @@ msgstr ""
 #: ../../mod/photos.php:577 ../../mod/photos.php:654 ../../mod/photos.php:941
 #: ../../mod/photos.php:981 ../../mod/photos.php:1099 ../../mod/pdledit.php:58
 #: ../../mod/import.php:534 ../../mod/chat.php:177 ../../mod/chat.php:211
-#: ../../mod/rate.php:167 ../../mod/invite.php:142 ../../mod/locs.php:105
-#: ../../mod/sources.php:104 ../../mod/sources.php:138
+#: ../../mod/mitem.php:232 ../../mod/rate.php:167 ../../mod/invite.php:142
+#: ../../mod/locs.php:105 ../../mod/sources.php:104 ../../mod/sources.php:138
 #: ../../mod/filestorage.php:156 ../../mod/fsuggest.php:108
 #: ../../mod/poke.php:166 ../../mod/profiles.php:667 ../../mod/setup.php:327
 #: ../../mod/setup.php:367 ../../mod/admin.php:453 ../../mod/admin.php:819
@@ -810,10 +574,9 @@ msgstr ""
 #: ../../mod/settings.php:692 ../../mod/settings.php:718
 #: ../../mod/settings.php:746 ../../mod/settings.php:769
 #: ../../mod/settings.php:854 ../../mod/settings.php:1050
-#: ../../mod/mitem.php:237 ../../mod/mood.php:134 ../../mod/connedit.php:688
-#: ../../mod/mail.php:355 ../../mod/appman.php:99 ../../mod/pconfig.php:108
-#: ../../mod/poll.php:68 ../../mod/bulksetclose.php:24
-#: ../../view/theme/apw/php/config.php:256
+#: ../../mod/mood.php:134 ../../mod/connedit.php:688 ../../mod/mail.php:355
+#: ../../mod/appman.php:99 ../../mod/pconfig.php:108 ../../mod/poll.php:68
+#: ../../mod/bulksetclose.php:24 ../../view/theme/apw/php/config.php:256
 #: ../../view/theme/redbasic/php/config.php:99
 msgid "Submit"
 msgstr ""
@@ -899,6 +662,348 @@ msgstr ""
 msgid "timeago.numbers"
 msgstr ""
 
+#: ../../include/text.php:395
+msgid "prev"
+msgstr ""
+
+#: ../../include/text.php:397
+msgid "first"
+msgstr ""
+
+#: ../../include/text.php:426
+msgid "last"
+msgstr ""
+
+#: ../../include/text.php:429
+msgid "next"
+msgstr ""
+
+#: ../../include/text.php:439
+msgid "older"
+msgstr ""
+
+#: ../../include/text.php:441
+msgid "newer"
+msgstr ""
+
+#: ../../include/text.php:834
+msgid "No connections"
+msgstr ""
+
+#: ../../include/text.php:848
+#, php-format
+msgid "%d Connection"
+msgid_plural "%d Connections"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../../include/text.php:861 ../../mod/viewconnections.php:104
+msgid "View Connections"
+msgstr ""
+
+#: ../../include/text.php:918 ../../include/text.php:930
+#: ../../include/nav.php:165 ../../include/apps.php:147
+#: ../../mod/search.php:38
+msgid "Search"
+msgstr ""
+
+#: ../../include/text.php:919 ../../include/text.php:931
+#: ../../include/widgets.php:192 ../../mod/rbmark.php:28
+#: ../../mod/rbmark.php:98 ../../mod/filer.php:50 ../../mod/admin.php:1457
+#: ../../mod/admin.php:1477
+msgid "Save"
+msgstr ""
+
+#: ../../include/text.php:994
+msgid "poke"
+msgstr ""
+
+#: ../../include/text.php:994 ../../include/conversation.php:243
+msgid "poked"
+msgstr ""
+
+#: ../../include/text.php:995
+msgid "ping"
+msgstr ""
+
+#: ../../include/text.php:995
+msgid "pinged"
+msgstr ""
+
+#: ../../include/text.php:996
+msgid "prod"
+msgstr ""
+
+#: ../../include/text.php:996
+msgid "prodded"
+msgstr ""
+
+#: ../../include/text.php:997
+msgid "slap"
+msgstr ""
+
+#: ../../include/text.php:997
+msgid "slapped"
+msgstr ""
+
+#: ../../include/text.php:998
+msgid "finger"
+msgstr ""
+
+#: ../../include/text.php:998
+msgid "fingered"
+msgstr ""
+
+#: ../../include/text.php:999
+msgid "rebuff"
+msgstr ""
+
+#: ../../include/text.php:999
+msgid "rebuffed"
+msgstr ""
+
+#: ../../include/text.php:1009
+msgid "happy"
+msgstr ""
+
+#: ../../include/text.php:1010
+msgid "sad"
+msgstr ""
+
+#: ../../include/text.php:1011
+msgid "mellow"
+msgstr ""
+
+#: ../../include/text.php:1012
+msgid "tired"
+msgstr ""
+
+#: ../../include/text.php:1013
+msgid "perky"
+msgstr ""
+
+#: ../../include/text.php:1014
+msgid "angry"
+msgstr ""
+
+#: ../../include/text.php:1015
+msgid "stupified"
+msgstr ""
+
+#: ../../include/text.php:1016
+msgid "puzzled"
+msgstr ""
+
+#: ../../include/text.php:1017
+msgid "interested"
+msgstr ""
+
+#: ../../include/text.php:1018
+msgid "bitter"
+msgstr ""
+
+#: ../../include/text.php:1019
+msgid "cheerful"
+msgstr ""
+
+#: ../../include/text.php:1020
+msgid "alive"
+msgstr ""
+
+#: ../../include/text.php:1021
+msgid "annoyed"
+msgstr ""
+
+#: ../../include/text.php:1022
+msgid "anxious"
+msgstr ""
+
+#: ../../include/text.php:1023
+msgid "cranky"
+msgstr ""
+
+#: ../../include/text.php:1024
+msgid "disturbed"
+msgstr ""
+
+#: ../../include/text.php:1025
+msgid "frustrated"
+msgstr ""
+
+#: ../../include/text.php:1026
+msgid "depressed"
+msgstr ""
+
+#: ../../include/text.php:1027
+msgid "motivated"
+msgstr ""
+
+#: ../../include/text.php:1028
+msgid "relaxed"
+msgstr ""
+
+#: ../../include/text.php:1029
+msgid "surprised"
+msgstr ""
+
+#: ../../include/text.php:1201
+msgid "Monday"
+msgstr ""
+
+#: ../../include/text.php:1201
+msgid "Tuesday"
+msgstr ""
+
+#: ../../include/text.php:1201
+msgid "Wednesday"
+msgstr ""
+
+#: ../../include/text.php:1201
+msgid "Thursday"
+msgstr ""
+
+#: ../../include/text.php:1201
+msgid "Friday"
+msgstr ""
+
+#: ../../include/text.php:1201
+msgid "Saturday"
+msgstr ""
+
+#: ../../include/text.php:1201
+msgid "Sunday"
+msgstr ""
+
+#: ../../include/text.php:1205
+msgid "January"
+msgstr ""
+
+#: ../../include/text.php:1205
+msgid "February"
+msgstr ""
+
+#: ../../include/text.php:1205
+msgid "March"
+msgstr ""
+
+#: ../../include/text.php:1205
+msgid "April"
+msgstr ""
+
+#: ../../include/text.php:1205
+msgid "May"
+msgstr ""
+
+#: ../../include/text.php:1205
+msgid "June"
+msgstr ""
+
+#: ../../include/text.php:1205
+msgid "July"
+msgstr ""
+
+#: ../../include/text.php:1205
+msgid "August"
+msgstr ""
+
+#: ../../include/text.php:1205
+msgid "September"
+msgstr ""
+
+#: ../../include/text.php:1205
+msgid "October"
+msgstr ""
+
+#: ../../include/text.php:1205
+msgid "November"
+msgstr ""
+
+#: ../../include/text.php:1205
+msgid "December"
+msgstr ""
+
+#: ../../include/text.php:1310
+msgid "unknown.???"
+msgstr ""
+
+#: ../../include/text.php:1311
+msgid "bytes"
+msgstr ""
+
+#: ../../include/text.php:1347
+msgid "remove category"
+msgstr ""
+
+#: ../../include/text.php:1422
+msgid "remove from file"
+msgstr ""
+
+#: ../../include/text.php:1498 ../../include/text.php:1509
+msgid "Click to open/close"
+msgstr ""
+
+#: ../../include/text.php:1665 ../../mod/events.php:444
+msgid "Link to Source"
+msgstr ""
+
+#: ../../include/text.php:1686 ../../include/text.php:1757
+msgid "default"
+msgstr ""
+
+#: ../../include/text.php:1694
+msgid "Page layout"
+msgstr ""
+
+#: ../../include/text.php:1694
+msgid "You can create your own with the layouts tool"
+msgstr ""
+
+#: ../../include/text.php:1735
+msgid "Page content type"
+msgstr ""
+
+#: ../../include/text.php:1769
+msgid "Select an alternate language"
+msgstr ""
+
+#: ../../include/text.php:1891 ../../include/conversation.php:123
+#: ../../mod/like.php:348 ../../mod/tagger.php:47
+msgid "event"
+msgstr ""
+
+#: ../../include/text.php:1896 ../../include/conversation.php:150
+#: ../../mod/tagger.php:53
+msgid "comment"
+msgstr ""
+
+#: ../../include/text.php:1901
+msgid "activity"
+msgstr ""
+
+#: ../../include/text.php:2196
+msgid "Design Tools"
+msgstr ""
+
+#: ../../include/text.php:2199 ../../mod/blocks.php:147
+msgid "Blocks"
+msgstr ""
+
+#: ../../include/text.php:2200 ../../mod/menu.php:98
+msgid "Menus"
+msgstr ""
+
+#: ../../include/text.php:2201 ../../mod/layouts.php:174
+msgid "Layouts"
+msgstr ""
+
+#: ../../include/text.php:2202
+msgid "Pages"
+msgstr ""
+
+#: ../../include/text.php:2553 ../../include/RedDAV/RedBrowser.php:131
+msgid "Collection"
+msgstr ""
+
 #: ../../include/RedDAV/RedBrowser.php:107
 #: ../../include/RedDAV/RedBrowser.php:265
 msgid "parent"
@@ -989,9 +1094,9 @@ msgstr ""
 #: ../../include/conversation.php:660 ../../include/apps.php:255
 #: ../../mod/webpages.php:183 ../../mod/thing.php:228 ../../mod/group.php:176
 #: ../../mod/blocks.php:155 ../../mod/photos.php:1062
-#: ../../mod/editlayout.php:107 ../../mod/editwebpage.php:225
-#: ../../mod/admin.php:826 ../../mod/admin.php:988 ../../mod/editblock.php:113
-#: ../../mod/settings.php:651 ../../mod/connedit.php:549
+#: ../../mod/editlayout.php:178 ../../mod/editwebpage.php:225
+#: ../../mod/editblock.php:180 ../../mod/admin.php:826 ../../mod/admin.php:988
+#: ../../mod/settings.php:651 ../../mod/connedit.php:547
 msgid "Delete"
 msgstr ""
 
@@ -1137,7 +1242,7 @@ msgid ""
 "(320px) photo thumbnails"
 msgstr ""
 
-#: ../../include/features.php:59 ../../include/widgets.php:546
+#: ../../include/features.php:59 ../../include/widgets.php:548
 #: ../../mod/sources.php:88
 msgid "Channel Sources"
 msgstr ""
@@ -1284,44 +1389,6 @@ msgstr ""
 msgid "Provide a personal tag cloud on your channel page"
 msgstr ""
 
-#: ../../include/dir_fns.php:126
-msgid "Directory Options"
-msgstr ""
-
-#: ../../include/dir_fns.php:128
-msgid "Safe Mode"
-msgstr ""
-
-#: ../../include/dir_fns.php:128 ../../include/dir_fns.php:129
-#: ../../include/dir_fns.php:130 ../../mod/api.php:106
-#: ../../mod/photos.php:568 ../../mod/menu.php:91 ../../mod/menu.php:145
-#: ../../mod/filestorage.php:151 ../../mod/filestorage.php:159
-#: ../../mod/admin.php:428 ../../mod/settings.php:579 ../../mod/mitem.php:163
-#: ../../mod/mitem.php:164 ../../mod/mitem.php:234 ../../mod/mitem.php:235
-#: ../../mod/removeme.php:60 ../../view/theme/redbasic/php/config.php:104
-#: ../../view/theme/redbasic/php/config.php:129 ../../boot.php:1555
-msgid "No"
-msgstr ""
-
-#: ../../include/dir_fns.php:128 ../../include/dir_fns.php:129
-#: ../../include/dir_fns.php:130 ../../mod/api.php:105
-#: ../../mod/photos.php:568 ../../mod/menu.php:91 ../../mod/menu.php:145
-#: ../../mod/filestorage.php:151 ../../mod/filestorage.php:159
-#: ../../mod/admin.php:430 ../../mod/settings.php:579 ../../mod/mitem.php:163
-#: ../../mod/mitem.php:164 ../../mod/mitem.php:234 ../../mod/mitem.php:235
-#: ../../mod/removeme.php:60 ../../view/theme/redbasic/php/config.php:104
-#: ../../view/theme/redbasic/php/config.php:129 ../../boot.php:1555
-msgid "Yes"
-msgstr ""
-
-#: ../../include/dir_fns.php:129
-msgid "Public Forums Only"
-msgstr ""
-
-#: ../../include/dir_fns.php:130
-msgid "This Website Only"
-msgstr ""
-
 #: ../../include/widgets.php:35 ../../include/taxonomy.php:264
 #: ../../include/contact_widgets.php:92
 msgid "Categories"
@@ -1350,7 +1417,7 @@ msgstr ""
 
 #: ../../include/widgets.php:136 ../../include/widgets.php:175
 #: ../../include/Contact.php:107 ../../include/conversation.php:945
-#: ../../include/identity.php:828 ../../mod/directory.php:316
+#: ../../include/identity.php:857 ../../mod/directory.php:316
 #: ../../mod/match.php:64 ../../mod/suggest.php:52
 msgid "Connect"
 msgstr ""
@@ -1401,116 +1468,116 @@ msgstr ""
 msgid "Archives"
 msgstr ""
 
-#: ../../include/widgets.php:427 ../../mod/connedit.php:578
+#: ../../include/widgets.php:429 ../../mod/connedit.php:567
 msgid "Me"
 msgstr ""
 
-#: ../../include/widgets.php:428 ../../mod/connedit.php:579
+#: ../../include/widgets.php:430 ../../mod/connedit.php:568
 msgid "Family"
 msgstr ""
 
-#: ../../include/widgets.php:429 ../../include/identity.php:394
+#: ../../include/widgets.php:431 ../../include/identity.php:394
 #: ../../include/identity.php:395 ../../include/identity.php:402
 #: ../../include/profile_selectors.php:80 ../../mod/settings.php:345
 #: ../../mod/settings.php:349 ../../mod/settings.php:350
 #: ../../mod/settings.php:353 ../../mod/settings.php:364
-#: ../../mod/connedit.php:580
+#: ../../mod/connedit.php:569
 msgid "Friends"
 msgstr ""
 
-#: ../../include/widgets.php:430 ../../mod/connedit.php:581
+#: ../../include/widgets.php:432 ../../mod/connedit.php:570
 msgid "Acquaintances"
 msgstr ""
 
-#: ../../include/widgets.php:431 ../../mod/connections.php:231
-#: ../../mod/connections.php:246 ../../mod/connedit.php:582
+#: ../../include/widgets.php:433 ../../mod/connections.php:231
+#: ../../mod/connections.php:246 ../../mod/connedit.php:571
 msgid "All"
 msgstr ""
 
-#: ../../include/widgets.php:450
+#: ../../include/widgets.php:452
 msgid "Refresh"
 msgstr ""
 
-#: ../../include/widgets.php:485
+#: ../../include/widgets.php:487
 msgid "Account settings"
 msgstr ""
 
-#: ../../include/widgets.php:491
+#: ../../include/widgets.php:493
 msgid "Channel settings"
 msgstr ""
 
-#: ../../include/widgets.php:497
+#: ../../include/widgets.php:499
 msgid "Additional features"
 msgstr ""
 
-#: ../../include/widgets.php:503
+#: ../../include/widgets.php:505
 msgid "Feature/Addon settings"
 msgstr ""
 
-#: ../../include/widgets.php:509
+#: ../../include/widgets.php:511
 msgid "Display settings"
 msgstr ""
 
-#: ../../include/widgets.php:515
+#: ../../include/widgets.php:517
 msgid "Connected apps"
 msgstr ""
 
-#: ../../include/widgets.php:521
+#: ../../include/widgets.php:523
 msgid "Export channel"
 msgstr ""
 
-#: ../../include/widgets.php:530 ../../mod/connedit.php:659
+#: ../../include/widgets.php:532 ../../mod/connedit.php:658
 msgid "Connection Default Permissions"
 msgstr ""
 
-#: ../../include/widgets.php:538
+#: ../../include/widgets.php:540
 msgid "Premium Channel Settings"
 msgstr ""
 
-#: ../../include/widgets.php:554 ../../include/nav.php:208
+#: ../../include/widgets.php:556 ../../include/nav.php:208
 #: ../../include/apps.php:134 ../../mod/admin.php:1079
 #: ../../mod/admin.php:1279
 msgid "Settings"
 msgstr ""
 
-#: ../../include/widgets.php:567 ../../mod/message.php:31
+#: ../../include/widgets.php:569 ../../mod/message.php:31
 #: ../../mod/mail.php:128
 msgid "Messages"
 msgstr ""
 
-#: ../../include/widgets.php:570
+#: ../../include/widgets.php:572
 msgid "Check Mail"
 msgstr ""
 
-#: ../../include/widgets.php:575 ../../include/nav.php:199
+#: ../../include/widgets.php:577 ../../include/nav.php:199
 msgid "New Message"
 msgstr ""
 
-#: ../../include/widgets.php:650
+#: ../../include/widgets.php:652
 msgid "Chat Rooms"
 msgstr ""
 
-#: ../../include/widgets.php:670
+#: ../../include/widgets.php:672
 msgid "Bookmarked Chatrooms"
 msgstr ""
 
-#: ../../include/widgets.php:690
+#: ../../include/widgets.php:692
 msgid "Suggested Chatrooms"
 msgstr ""
 
-#: ../../include/widgets.php:817 ../../include/widgets.php:875
+#: ../../include/widgets.php:819 ../../include/widgets.php:877
 msgid "photo/image"
 msgstr ""
 
-#: ../../include/widgets.php:970 ../../include/widgets.php:972
+#: ../../include/widgets.php:972 ../../include/widgets.php:974
 msgid "Rate Me"
 msgstr ""
 
-#: ../../include/widgets.php:976
+#: ../../include/widgets.php:978
 msgid "View Ratings"
 msgstr ""
 
-#: ../../include/widgets.php:987
+#: ../../include/widgets.php:989
 msgid "Public Hubs"
 msgstr ""
 
@@ -1692,72 +1759,6 @@ msgstr ""
 msgid "[Red:Notify]"
 msgstr ""
 
-#: ../../include/contact_selectors.php:56
-msgid "Frequently"
-msgstr ""
-
-#: ../../include/contact_selectors.php:57
-msgid "Hourly"
-msgstr ""
-
-#: ../../include/contact_selectors.php:58
-msgid "Twice daily"
-msgstr ""
-
-#: ../../include/contact_selectors.php:59
-msgid "Daily"
-msgstr ""
-
-#: ../../include/contact_selectors.php:60
-msgid "Weekly"
-msgstr ""
-
-#: ../../include/contact_selectors.php:61
-msgid "Monthly"
-msgstr ""
-
-#: ../../include/contact_selectors.php:76
-msgid "Friendica"
-msgstr ""
-
-#: ../../include/contact_selectors.php:77
-msgid "OStatus"
-msgstr ""
-
-#: ../../include/contact_selectors.php:78
-msgid "RSS/Atom"
-msgstr ""
-
-#: ../../include/contact_selectors.php:79 ../../mod/admin.php:822
-#: ../../mod/admin.php:831 ../../mod/id.php:15 ../../mod/id.php:16
-#: ../../boot.php:1553
-msgid "Email"
-msgstr ""
-
-#: ../../include/contact_selectors.php:80
-msgid "Diaspora"
-msgstr ""
-
-#: ../../include/contact_selectors.php:81
-msgid "Facebook"
-msgstr ""
-
-#: ../../include/contact_selectors.php:82
-msgid "Zot!"
-msgstr ""
-
-#: ../../include/contact_selectors.php:83
-msgid "LinkedIn"
-msgstr ""
-
-#: ../../include/contact_selectors.php:84
-msgid "XMPP/IM"
-msgstr ""
-
-#: ../../include/contact_selectors.php:85
-msgid "MySpace"
-msgstr ""
-
 #: ../../include/message.php:18
 msgid "No recipient provided."
 msgstr ""
@@ -1853,7 +1854,7 @@ msgid "View all"
 msgstr ""
 
 #: ../../include/ItemObject.php:179 ../../include/taxonomy.php:396
-#: ../../include/conversation.php:1701 ../../include/identity.php:1138
+#: ../../include/conversation.php:1701 ../../include/identity.php:1167
 #: ../../mod/photos.php:1019
 msgctxt "noun"
 msgid "Like"
@@ -1992,9 +1993,9 @@ msgid "Close"
 msgstr ""
 
 #: ../../include/ItemObject.php:364 ../../include/conversation.php:737
-#: ../../include/conversation.php:1209 ../../mod/photos.php:962
-#: ../../mod/editlayout.php:153 ../../mod/editwebpage.php:192
-#: ../../mod/editpost.php:130 ../../mod/editblock.php:155
+#: ../../include/conversation.php:1209 ../../mod/editpost.php:123
+#: ../../mod/photos.php:962 ../../mod/editlayout.php:147
+#: ../../mod/editwebpage.php:192 ../../mod/editblock.php:149
 #: ../../mod/mail.php:241 ../../mod/mail.php:356
 msgid "Please wait"
 msgstr ""
@@ -2005,32 +2006,32 @@ msgid "This is you"
 msgstr ""
 
 #: ../../include/ItemObject.php:669 ../../include/conversation.php:1181
-#: ../../mod/editlayout.php:140 ../../mod/editwebpage.php:179
-#: ../../mod/editpost.php:114 ../../mod/editblock.php:141
+#: ../../mod/editpost.php:107 ../../mod/editlayout.php:134
+#: ../../mod/editwebpage.php:179 ../../mod/editblock.php:135
 msgid "Bold"
 msgstr ""
 
 #: ../../include/ItemObject.php:670 ../../include/conversation.php:1182
-#: ../../mod/editlayout.php:141 ../../mod/editwebpage.php:180
-#: ../../mod/editpost.php:115 ../../mod/editblock.php:142
+#: ../../mod/editpost.php:108 ../../mod/editlayout.php:135
+#: ../../mod/editwebpage.php:180 ../../mod/editblock.php:136
 msgid "Italic"
 msgstr ""
 
 #: ../../include/ItemObject.php:671 ../../include/conversation.php:1183
-#: ../../mod/editlayout.php:142 ../../mod/editwebpage.php:181
-#: ../../mod/editpost.php:116 ../../mod/editblock.php:143
+#: ../../mod/editpost.php:109 ../../mod/editlayout.php:136
+#: ../../mod/editwebpage.php:181 ../../mod/editblock.php:137
 msgid "Underline"
 msgstr ""
 
 #: ../../include/ItemObject.php:672 ../../include/conversation.php:1184
-#: ../../mod/editlayout.php:143 ../../mod/editwebpage.php:182
-#: ../../mod/editpost.php:117 ../../mod/editblock.php:144
+#: ../../mod/editpost.php:110 ../../mod/editlayout.php:137
+#: ../../mod/editwebpage.php:182 ../../mod/editblock.php:138
 msgid "Quote"
 msgstr ""
 
 #: ../../include/ItemObject.php:673 ../../include/conversation.php:1185
-#: ../../mod/editlayout.php:144 ../../mod/editwebpage.php:183
-#: ../../mod/editpost.php:118 ../../mod/editblock.php:145
+#: ../../mod/editpost.php:111 ../../mod/editlayout.php:138
+#: ../../mod/editwebpage.php:183 ../../mod/editblock.php:139
 msgid "Code"
 msgstr ""
 
@@ -2047,7 +2048,7 @@ msgid "Video"
 msgstr ""
 
 #: ../../include/ItemObject.php:680 ../../include/conversation.php:1236
-#: ../../mod/editpost.php:158 ../../mod/mail.php:247 ../../mod/mail.php:361
+#: ../../mod/editpost.php:151 ../../mod/mail.php:247 ../../mod/mail.php:361
 msgid "Encrypt text"
 msgstr ""
 
@@ -2089,7 +2090,7 @@ msgid "Your posts and conversations"
 msgstr ""
 
 #: ../../include/nav.php:91 ../../include/conversation.php:942
-#: ../../mod/connedit.php:500 ../../mod/connedit.php:666
+#: ../../mod/connedit.php:498
 msgid "View Profile"
 msgstr ""
 
@@ -2105,7 +2106,7 @@ msgstr ""
 msgid "Manage/Edit profiles"
 msgstr ""
 
-#: ../../include/nav.php:95 ../../include/identity.php:851
+#: ../../include/nav.php:95 ../../include/identity.php:880
 msgid "Edit Profile"
 msgstr ""
 
@@ -2722,7 +2723,7 @@ msgstr ""
 msgid "Where are you right now?"
 msgstr ""
 
-#: ../../include/conversation.php:1147 ../../mod/editpost.php:52
+#: ../../include/conversation.php:1147 ../../mod/editpost.php:47
 #: ../../mod/mail.php:175 ../../mod/mail.php:290
 msgid "Expires YYYY-MM-DD HH:MM"
 msgstr ""
@@ -2740,9 +2741,9 @@ msgstr ""
 msgid "Post as"
 msgstr ""
 
-#: ../../include/conversation.php:1186 ../../mod/editlayout.php:145
-#: ../../mod/editwebpage.php:184 ../../mod/editpost.php:119
-#: ../../mod/editblock.php:147 ../../mod/mail.php:238 ../../mod/mail.php:352
+#: ../../include/conversation.php:1186 ../../mod/editpost.php:112
+#: ../../mod/editlayout.php:139 ../../mod/editwebpage.php:184
+#: ../../mod/editblock.php:141 ../../mod/mail.php:238 ../../mod/mail.php:352
 msgid "Upload photo"
 msgstr ""
 
@@ -2750,9 +2751,9 @@ msgstr ""
 msgid "upload photo"
 msgstr ""
 
-#: ../../include/conversation.php:1188 ../../mod/editlayout.php:146
-#: ../../mod/editwebpage.php:185 ../../mod/editpost.php:120
-#: ../../mod/editblock.php:148 ../../mod/mail.php:239 ../../mod/mail.php:353
+#: ../../include/conversation.php:1188 ../../mod/editpost.php:113
+#: ../../mod/editlayout.php:140 ../../mod/editwebpage.php:185
+#: ../../mod/editblock.php:142 ../../mod/mail.php:239 ../../mod/mail.php:353
 msgid "Attach file"
 msgstr ""
 
@@ -2760,9 +2761,9 @@ msgstr ""
 msgid "attach file"
 msgstr ""
 
-#: ../../include/conversation.php:1190 ../../mod/editlayout.php:147
-#: ../../mod/editwebpage.php:186 ../../mod/editpost.php:121
-#: ../../mod/editblock.php:149 ../../mod/mail.php:240 ../../mod/mail.php:354
+#: ../../include/conversation.php:1190 ../../mod/editpost.php:114
+#: ../../mod/editlayout.php:141 ../../mod/editwebpage.php:186
+#: ../../mod/editblock.php:143 ../../mod/mail.php:240 ../../mod/mail.php:354
 msgid "Insert web link"
 msgstr ""
 
@@ -2786,9 +2787,9 @@ msgstr ""
 msgid "audio link"
 msgstr ""
 
-#: ../../include/conversation.php:1196 ../../mod/editlayout.php:151
-#: ../../mod/editwebpage.php:190 ../../mod/editpost.php:125
-#: ../../mod/editblock.php:153
+#: ../../include/conversation.php:1196 ../../mod/editpost.php:118
+#: ../../mod/editlayout.php:145 ../../mod/editwebpage.php:190
+#: ../../mod/editblock.php:147
 msgid "Set your location"
 msgstr ""
 
@@ -2796,13 +2797,13 @@ msgstr ""
 msgid "set location"
 msgstr ""
 
-#: ../../include/conversation.php:1198 ../../mod/editpost.php:127
+#: ../../include/conversation.php:1198 ../../mod/editpost.php:120
 msgid "Toggle voting"
 msgstr ""
 
-#: ../../include/conversation.php:1201 ../../mod/editlayout.php:152
-#: ../../mod/editwebpage.php:191 ../../mod/editpost.php:126
-#: ../../mod/editblock.php:154
+#: ../../include/conversation.php:1201 ../../mod/editpost.php:119
+#: ../../mod/editlayout.php:146 ../../mod/editwebpage.php:191
+#: ../../mod/editblock.php:148
 msgid "Clear browser location"
 msgstr ""
 
@@ -2810,20 +2811,20 @@ msgstr ""
 msgid "clear location"
 msgstr ""
 
-#: ../../include/conversation.php:1204 ../../mod/editwebpage.php:207
-#: ../../mod/editpost.php:142 ../../mod/editblock.php:167
+#: ../../include/conversation.php:1204 ../../mod/editpost.php:135
+#: ../../mod/editwebpage.php:207 ../../mod/editblock.php:161
 msgid "Title (optional)"
 msgstr ""
 
-#: ../../include/conversation.php:1208 ../../mod/editlayout.php:168
-#: ../../mod/editwebpage.php:209 ../../mod/editpost.php:144
-#: ../../mod/editblock.php:170
+#: ../../include/conversation.php:1208 ../../mod/editpost.php:137
+#: ../../mod/editlayout.php:162 ../../mod/editwebpage.php:209
+#: ../../mod/editblock.php:164
 msgid "Categories (optional, comma-separated list)"
 msgstr ""
 
-#: ../../include/conversation.php:1210 ../../mod/editlayout.php:154
-#: ../../mod/editwebpage.php:193 ../../mod/editpost.php:131
-#: ../../mod/editblock.php:156
+#: ../../include/conversation.php:1210 ../../mod/editpost.php:124
+#: ../../mod/editlayout.php:148 ../../mod/editwebpage.php:193
+#: ../../mod/editblock.php:150
 msgid "Permission settings"
 msgstr ""
 
@@ -2831,32 +2832,32 @@ msgstr ""
 msgid "permissions"
 msgstr ""
 
-#: ../../include/conversation.php:1219 ../../mod/editlayout.php:161
-#: ../../mod/editwebpage.php:202 ../../mod/editpost.php:139
-#: ../../mod/editblock.php:164
+#: ../../include/conversation.php:1219 ../../mod/editpost.php:132
+#: ../../mod/editlayout.php:155 ../../mod/editwebpage.php:202
+#: ../../mod/editblock.php:158
 msgid "Public post"
 msgstr ""
 
-#: ../../include/conversation.php:1221 ../../mod/editlayout.php:169
-#: ../../mod/editwebpage.php:210 ../../mod/editpost.php:145
-#: ../../mod/editblock.php:171
+#: ../../include/conversation.php:1221 ../../mod/editpost.php:138
+#: ../../mod/editlayout.php:163 ../../mod/editwebpage.php:210
+#: ../../mod/editblock.php:165
 msgid "Example: bob@example.com, mary@example.com"
 msgstr ""
 
-#: ../../include/conversation.php:1234 ../../mod/editlayout.php:178
-#: ../../mod/editwebpage.php:219 ../../mod/editpost.php:156
-#: ../../mod/editblock.php:181 ../../mod/mail.php:245 ../../mod/mail.php:359
+#: ../../include/conversation.php:1234 ../../mod/editpost.php:149
+#: ../../mod/editlayout.php:172 ../../mod/editwebpage.php:219
+#: ../../mod/editblock.php:175 ../../mod/mail.php:245 ../../mod/mail.php:359
 msgid "Set expiration date"
 msgstr ""
 
 #: ../../include/conversation.php:1238 ../../mod/events.php:637
-#: ../../mod/editpost.php:160
+#: ../../mod/editpost.php:153
 msgid "OK"
 msgstr ""
 
 #: ../../include/conversation.php:1239 ../../mod/tagrm.php:11
 #: ../../mod/tagrm.php:134 ../../mod/events.php:636 ../../mod/fbrowser.php:82
-#: ../../mod/fbrowser.php:117 ../../mod/editpost.php:161
+#: ../../mod/fbrowser.php:117 ../../mod/editpost.php:154
 #: ../../mod/settings.php:589 ../../mod/settings.php:615
 msgid "Cancel"
 msgstr ""
@@ -2994,7 +2995,7 @@ msgstr[1] ""
 
 #: ../../include/items.php:413 ../../mod/like.php:270
 #: ../../mod/subthread.php:49 ../../mod/group.php:68 ../../mod/profperm.php:23
-#: ../../mod/bulksetclose.php:11 ../../index.php:381
+#: ../../mod/bulksetclose.php:11 ../../index.php:392
 msgid "Permission denied"
 msgstr ""
 
@@ -3036,9 +3037,9 @@ msgid "Visible to specific connections."
 msgstr ""
 
 #: ../../include/items.php:4198 ../../mod/thing.php:74
-#: ../../mod/display.php:36 ../../mod/filestorage.php:27
-#: ../../mod/viewsrc.php:20 ../../mod/admin.php:167 ../../mod/admin.php:1025
-#: ../../mod/admin.php:1225
+#: ../../mod/filestorage.php:27 ../../mod/viewsrc.php:20
+#: ../../mod/admin.php:167 ../../mod/admin.php:1025 ../../mod/admin.php:1225
+#: ../../mod/display.php:36
 msgid "Item not found."
 msgstr ""
 
@@ -3057,22 +3058,22 @@ msgstr ""
 #: ../../mod/events.php:219 ../../mod/group.php:9 ../../mod/item.php:206
 #: ../../mod/item.php:214 ../../mod/item.php:978 ../../mod/network.php:12
 #: ../../mod/common.php:35 ../../mod/connections.php:169
-#: ../../mod/blocks.php:69 ../../mod/blocks.php:76 ../../mod/photos.php:69
-#: ../../mod/pdledit.php:21 ../../mod/authtest.php:13
+#: ../../mod/blocks.php:69 ../../mod/blocks.php:76 ../../mod/editpost.php:13
+#: ../../mod/photos.php:69 ../../mod/pdledit.php:21 ../../mod/authtest.php:13
 #: ../../mod/editlayout.php:63 ../../mod/editlayout.php:87
-#: ../../mod/chat.php:90 ../../mod/chat.php:95 ../../mod/editwebpage.php:64
-#: ../../mod/editwebpage.php:86 ../../mod/editwebpage.php:101
-#: ../../mod/editwebpage.php:125 ../../mod/rate.php:110
-#: ../../mod/editpost.php:13 ../../mod/invite.php:13 ../../mod/invite.php:104
-#: ../../mod/locs.php:77 ../../mod/sources.php:66 ../../mod/menu.php:69
-#: ../../mod/filestorage.php:18 ../../mod/filestorage.php:73
-#: ../../mod/filestorage.php:88 ../../mod/filestorage.php:115
-#: ../../mod/fsuggest.php:78 ../../mod/poke.php:128 ../../mod/profiles.php:188
+#: ../../mod/chat.php:90 ../../mod/chat.php:95 ../../mod/mitem.php:109
+#: ../../mod/editwebpage.php:64 ../../mod/editwebpage.php:86
+#: ../../mod/editwebpage.php:101 ../../mod/editwebpage.php:125
+#: ../../mod/rate.php:110 ../../mod/editblock.php:65 ../../mod/invite.php:13
+#: ../../mod/invite.php:104 ../../mod/locs.php:77 ../../mod/sources.php:66
+#: ../../mod/menu.php:69 ../../mod/filestorage.php:18
+#: ../../mod/filestorage.php:73 ../../mod/filestorage.php:88
+#: ../../mod/filestorage.php:115 ../../mod/fsuggest.php:78
+#: ../../mod/poke.php:128 ../../mod/profiles.php:188
 #: ../../mod/profiles.php:576 ../../mod/viewsrc.php:14 ../../mod/setup.php:223
 #: ../../mod/viewconnections.php:22 ../../mod/viewconnections.php:27
-#: ../../mod/editblock.php:65 ../../mod/register.php:72
-#: ../../mod/settings.php:570 ../../mod/id.php:71 ../../mod/message.php:16
-#: ../../mod/mitem.php:115 ../../mod/mood.php:111 ../../mod/connedit.php:337
+#: ../../mod/register.php:72 ../../mod/settings.php:570 ../../mod/id.php:71
+#: ../../mod/message.php:16 ../../mod/mood.php:111 ../../mod/connedit.php:336
 #: ../../mod/mail.php:114 ../../mod/notifications.php:66
 #: ../../mod/regmod.php:17 ../../mod/new_channel.php:68
 #: ../../mod/new_channel.php:99 ../../mod/appman.php:66
@@ -3081,7 +3082,7 @@ msgstr ""
 #: ../../mod/channel.php:100 ../../mod/channel.php:219
 #: ../../mod/channel.php:262 ../../mod/suggest.php:26
 #: ../../mod/service_limits.php:7 ../../mod/sharedwithme.php:7
-#: ../../index.php:182 ../../index.php:382
+#: ../../index.php:182 ../../index.php:393
 msgid "Permission denied."
 msgstr ""
 
@@ -3099,7 +3100,7 @@ msgstr ""
 msgid "Collection: %s"
 msgstr ""
 
-#: ../../include/items.php:4706
+#: ../../include/items.php:4706 ../../mod/connedit.php:658
 #, php-format
 msgid "Connection: %s"
 msgstr ""
@@ -3116,7 +3117,7 @@ msgstr ""
 msgid "Unable to verify channel signature"
 msgstr ""
 
-#: ../../include/zot.php:2126
+#: ../../include/zot.php:2131
 #, php-format
 msgid "Unable to verify site signature for %s"
 msgstr ""
@@ -3314,206 +3315,206 @@ msgstr ""
 msgid "Default Profile"
 msgstr ""
 
-#: ../../include/identity.php:631
+#: ../../include/identity.php:660
 msgid "Requested channel is not available."
 msgstr ""
 
-#: ../../include/identity.php:678 ../../mod/profile.php:16
+#: ../../include/identity.php:707 ../../mod/profile.php:16
 #: ../../mod/achievements.php:11 ../../mod/webpages.php:29
 #: ../../mod/connect.php:13 ../../mod/hcard.php:8 ../../mod/blocks.php:29
 #: ../../mod/editlayout.php:27 ../../mod/editwebpage.php:28
-#: ../../mod/filestorage.php:54 ../../mod/editblock.php:29
+#: ../../mod/editblock.php:29 ../../mod/filestorage.php:54
 #: ../../mod/layouts.php:29
 msgid "Requested profile is not available."
 msgstr ""
 
-#: ../../include/identity.php:841 ../../mod/profiles.php:774
+#: ../../include/identity.php:870 ../../mod/profiles.php:774
 msgid "Change profile photo"
 msgstr ""
 
-#: ../../include/identity.php:847
+#: ../../include/identity.php:876
 msgid "Profiles"
 msgstr ""
 
-#: ../../include/identity.php:847
+#: ../../include/identity.php:876
 msgid "Manage/edit profiles"
 msgstr ""
 
-#: ../../include/identity.php:848 ../../mod/profiles.php:775
+#: ../../include/identity.php:877 ../../mod/profiles.php:775
 msgid "Create New Profile"
 msgstr ""
 
-#: ../../include/identity.php:863 ../../mod/profiles.php:786
+#: ../../include/identity.php:892 ../../mod/profiles.php:786
 msgid "Profile Image"
 msgstr ""
 
-#: ../../include/identity.php:866
+#: ../../include/identity.php:895
 msgid "visible to everybody"
 msgstr ""
 
-#: ../../include/identity.php:867 ../../mod/profiles.php:669
+#: ../../include/identity.php:896 ../../mod/profiles.php:669
 #: ../../mod/profiles.php:790
 msgid "Edit visibility"
 msgstr ""
 
-#: ../../include/identity.php:883 ../../include/identity.php:1122
+#: ../../include/identity.php:912 ../../include/identity.php:1151
 msgid "Gender:"
 msgstr ""
 
-#: ../../include/identity.php:884 ../../include/identity.php:1166
+#: ../../include/identity.php:913 ../../include/identity.php:1195
 msgid "Status:"
 msgstr ""
 
-#: ../../include/identity.php:885 ../../include/identity.php:1177
+#: ../../include/identity.php:914 ../../include/identity.php:1206
 msgid "Homepage:"
 msgstr ""
 
-#: ../../include/identity.php:886
+#: ../../include/identity.php:915
 msgid "Online Now"
 msgstr ""
 
-#: ../../include/identity.php:969 ../../include/identity.php:1047
+#: ../../include/identity.php:998 ../../include/identity.php:1076
 #: ../../mod/ping.php:324
 msgid "g A l F d"
 msgstr ""
 
-#: ../../include/identity.php:970 ../../include/identity.php:1048
+#: ../../include/identity.php:999 ../../include/identity.php:1077
 msgid "F d"
 msgstr ""
 
-#: ../../include/identity.php:1015 ../../include/identity.php:1087
+#: ../../include/identity.php:1044 ../../include/identity.php:1116
 #: ../../mod/ping.php:346
 msgid "[today]"
 msgstr ""
 
-#: ../../include/identity.php:1026
+#: ../../include/identity.php:1055
 msgid "Birthday Reminders"
 msgstr ""
 
-#: ../../include/identity.php:1027
+#: ../../include/identity.php:1056
 msgid "Birthdays this week:"
 msgstr ""
 
-#: ../../include/identity.php:1080
+#: ../../include/identity.php:1109
 msgid "[No description]"
 msgstr ""
 
-#: ../../include/identity.php:1098
+#: ../../include/identity.php:1127
 msgid "Event Reminders"
 msgstr ""
 
-#: ../../include/identity.php:1099
+#: ../../include/identity.php:1128
 msgid "Events this week:"
 msgstr ""
 
-#: ../../include/identity.php:1112 ../../include/identity.php:1229
+#: ../../include/identity.php:1141 ../../include/identity.php:1258
 #: ../../include/apps.php:138 ../../mod/profperm.php:112
 msgid "Profile"
 msgstr ""
 
-#: ../../include/identity.php:1120 ../../mod/settings.php:1056
+#: ../../include/identity.php:1149 ../../mod/settings.php:1056
 msgid "Full Name:"
 msgstr ""
 
-#: ../../include/identity.php:1127
+#: ../../include/identity.php:1156
 msgid "Like this channel"
 msgstr ""
 
-#: ../../include/identity.php:1151
+#: ../../include/identity.php:1180
 msgid "j F, Y"
 msgstr ""
 
-#: ../../include/identity.php:1152
+#: ../../include/identity.php:1181
 msgid "j F"
 msgstr ""
 
-#: ../../include/identity.php:1159
+#: ../../include/identity.php:1188
 msgid "Birthday:"
 msgstr ""
 
-#: ../../include/identity.php:1163 ../../mod/directory.php:297
+#: ../../include/identity.php:1192 ../../mod/directory.php:297
 msgid "Age:"
 msgstr ""
 
-#: ../../include/identity.php:1172
+#: ../../include/identity.php:1201
 #, php-format
 msgid "for %1$d %2$s"
 msgstr ""
 
-#: ../../include/identity.php:1175 ../../mod/profiles.php:691
+#: ../../include/identity.php:1204 ../../mod/profiles.php:691
 msgid "Sexual Preference:"
 msgstr ""
 
-#: ../../include/identity.php:1179 ../../mod/directory.php:313
+#: ../../include/identity.php:1208 ../../mod/directory.php:313
 #: ../../mod/profiles.php:693
 msgid "Hometown:"
 msgstr ""
 
-#: ../../include/identity.php:1181
+#: ../../include/identity.php:1210
 msgid "Tags:"
 msgstr ""
 
-#: ../../include/identity.php:1183 ../../mod/profiles.php:694
+#: ../../include/identity.php:1212 ../../mod/profiles.php:694
 msgid "Political Views:"
 msgstr ""
 
-#: ../../include/identity.php:1185
+#: ../../include/identity.php:1214
 msgid "Religion:"
 msgstr ""
 
-#: ../../include/identity.php:1187 ../../mod/directory.php:315
+#: ../../include/identity.php:1216 ../../mod/directory.php:315
 msgid "About:"
 msgstr ""
 
-#: ../../include/identity.php:1189
+#: ../../include/identity.php:1218
 msgid "Hobbies/Interests:"
 msgstr ""
 
-#: ../../include/identity.php:1191 ../../mod/profiles.php:697
+#: ../../include/identity.php:1220 ../../mod/profiles.php:697
 msgid "Likes:"
 msgstr ""
 
-#: ../../include/identity.php:1193 ../../mod/profiles.php:698
+#: ../../include/identity.php:1222 ../../mod/profiles.php:698
 msgid "Dislikes:"
 msgstr ""
 
-#: ../../include/identity.php:1195
+#: ../../include/identity.php:1224
 msgid "Contact information and Social Networks:"
 msgstr ""
 
-#: ../../include/identity.php:1197
+#: ../../include/identity.php:1226
 msgid "My other channels:"
 msgstr ""
 
-#: ../../include/identity.php:1199
+#: ../../include/identity.php:1228
 msgid "Musical interests:"
 msgstr ""
 
-#: ../../include/identity.php:1201
+#: ../../include/identity.php:1230
 msgid "Books, literature:"
 msgstr ""
 
-#: ../../include/identity.php:1203
+#: ../../include/identity.php:1232
 msgid "Television:"
 msgstr ""
 
-#: ../../include/identity.php:1205
+#: ../../include/identity.php:1234
 msgid "Film/dance/culture/entertainment:"
 msgstr ""
 
-#: ../../include/identity.php:1207
+#: ../../include/identity.php:1236
 msgid "Love/Romance:"
 msgstr ""
 
-#: ../../include/identity.php:1209
+#: ../../include/identity.php:1238
 msgid "Work/employment:"
 msgstr ""
 
-#: ../../include/identity.php:1211
+#: ../../include/identity.php:1240
 msgid "School/education:"
 msgstr ""
 
-#: ../../include/identity.php:1231
+#: ../../include/identity.php:1260
 msgid "Like this thing"
 msgstr ""
 
@@ -3811,17 +3812,17 @@ msgstr ""
 msgid "Purchase"
 msgstr ""
 
-#: ../../include/bbcode.php:122 ../../include/bbcode.php:764
-#: ../../include/bbcode.php:767 ../../include/bbcode.php:772
-#: ../../include/bbcode.php:775 ../../include/bbcode.php:778
-#: ../../include/bbcode.php:781 ../../include/bbcode.php:786
-#: ../../include/bbcode.php:789 ../../include/bbcode.php:794
-#: ../../include/bbcode.php:797 ../../include/bbcode.php:800
-#: ../../include/bbcode.php:803
+#: ../../include/bbcode.php:122 ../../include/bbcode.php:768
+#: ../../include/bbcode.php:771 ../../include/bbcode.php:776
+#: ../../include/bbcode.php:779 ../../include/bbcode.php:782
+#: ../../include/bbcode.php:785 ../../include/bbcode.php:790
+#: ../../include/bbcode.php:793 ../../include/bbcode.php:798
+#: ../../include/bbcode.php:801 ../../include/bbcode.php:804
+#: ../../include/bbcode.php:807
 msgid "Image/photo"
 msgstr ""
 
-#: ../../include/bbcode.php:161 ../../include/bbcode.php:814
+#: ../../include/bbcode.php:161 ../../include/bbcode.php:818
 msgid "Encrypted content"
 msgstr ""
 
@@ -3830,44 +3831,51 @@ msgstr ""
 msgid "Install %s element: "
 msgstr ""
 
-#: ../../include/bbcode.php:188 ../../mod/impel.php:37
+#: ../../include/bbcode.php:182
+#, php-format
+msgid ""
+"This post contains an installable %s element, however you lack permissions "
+"to install it on this site."
+msgstr ""
+
+#: ../../include/bbcode.php:192 ../../mod/impel.php:37
 msgid "webpage"
 msgstr ""
 
-#: ../../include/bbcode.php:191 ../../mod/impel.php:47
+#: ../../include/bbcode.php:195 ../../mod/impel.php:47
 msgid "layout"
 msgstr ""
 
-#: ../../include/bbcode.php:194 ../../mod/impel.php:42
+#: ../../include/bbcode.php:198 ../../mod/impel.php:42
 msgid "block"
 msgstr ""
 
-#: ../../include/bbcode.php:197 ../../mod/impel.php:54
+#: ../../include/bbcode.php:201 ../../mod/impel.php:54
 msgid "menu"
 msgstr ""
 
-#: ../../include/bbcode.php:211
+#: ../../include/bbcode.php:215
 msgid "QR code"
 msgstr ""
 
-#: ../../include/bbcode.php:262
+#: ../../include/bbcode.php:266
 #, php-format
 msgid "%1$s wrote the following %2$s %3$s"
 msgstr ""
 
-#: ../../include/bbcode.php:264 ../../mod/tagger.php:51
+#: ../../include/bbcode.php:268 ../../mod/tagger.php:51
 msgid "post"
 msgstr ""
 
-#: ../../include/bbcode.php:514
+#: ../../include/bbcode.php:518
 msgid "Different viewers will see this text differently"
 msgstr ""
 
-#: ../../include/bbcode.php:725
+#: ../../include/bbcode.php:729
 msgid "$1 spoiler"
 msgstr ""
 
-#: ../../include/bbcode.php:752
+#: ../../include/bbcode.php:756
 msgid "$1 wrote:"
 msgstr ""
 
@@ -3956,8 +3964,8 @@ msgid "Delegated Channels"
 msgstr ""
 
 #: ../../mod/directory.php:59 ../../mod/photos.php:441 ../../mod/search.php:13
-#: ../../mod/display.php:13 ../../mod/ratings.php:82
-#: ../../mod/viewconnections.php:17
+#: ../../mod/ratings.php:82 ../../mod/viewconnections.php:17
+#: ../../mod/display.php:13
 msgid "Public access denied."
 msgstr ""
 
@@ -4052,7 +4060,7 @@ msgstr ""
 msgid "Lookup xchan beginning with (or webbie): "
 msgstr ""
 
-#: ../../mod/xchan.php:37 ../../mod/menu.php:154 ../../mod/mitem.php:120
+#: ../../mod/xchan.php:37 ../../mod/mitem.php:114 ../../mod/menu.php:156
 msgid "Not found."
 msgstr ""
 
@@ -4291,8 +4299,8 @@ msgstr ""
 msgid "Channel not found."
 msgstr ""
 
-#: ../../mod/block.php:75 ../../mod/display.php:106 ../../mod/help.php:79
-#: ../../mod/page.php:89 ../../index.php:230
+#: ../../mod/block.php:75 ../../mod/display.php:110 ../../mod/help.php:79
+#: ../../mod/page.php:89 ../../index.php:241
 msgid "Page not found."
 msgstr ""
 
@@ -4508,7 +4516,7 @@ msgstr ""
 msgid "View ratings"
 msgstr ""
 
-#: ../../mod/rpost.php:131 ../../mod/editpost.php:42
+#: ../../mod/rpost.php:131 ../../mod/editpost.php:158
 msgid "Edit post"
 msgstr ""
 
@@ -4704,11 +4712,11 @@ msgstr ""
 msgid "Could not locate selected profile."
 msgstr ""
 
-#: ../../mod/connections.php:94 ../../mod/connedit.php:220
+#: ../../mod/connections.php:94 ../../mod/connedit.php:219
 msgid "Connection updated."
 msgstr ""
 
-#: ../../mod/connections.php:96 ../../mod/connedit.php:222
+#: ../../mod/connections.php:96 ../../mod/connedit.php:221
 msgid "Failed to update connection record."
 msgstr ""
 
@@ -4797,6 +4805,35 @@ msgstr ""
 msgid "Block Title"
 msgstr ""
 
+#: ../../mod/editpost.php:20 ../../mod/editlayout.php:76
+#: ../../mod/editwebpage.php:77 ../../mod/editblock.php:78
+#: ../../mod/editblock.php:94
+msgid "Item not found"
+msgstr ""
+
+#: ../../mod/editpost.php:31
+msgid "Item is not editable"
+msgstr ""
+
+#: ../../mod/editpost.php:48
+msgid "Delete item?"
+msgstr ""
+
+#: ../../mod/editpost.php:115 ../../mod/editlayout.php:142
+#: ../../mod/editwebpage.php:187 ../../mod/editblock.php:144
+msgid "Insert YouTube video"
+msgstr ""
+
+#: ../../mod/editpost.php:116 ../../mod/editlayout.php:143
+#: ../../mod/editwebpage.php:188 ../../mod/editblock.php:145
+msgid "Insert Vorbis [.ogg] video"
+msgstr ""
+
+#: ../../mod/editpost.php:117 ../../mod/editlayout.php:144
+#: ../../mod/editwebpage.php:189 ../../mod/editblock.php:146
+msgid "Insert Vorbis [.ogg] audio"
+msgstr ""
+
 #: ../../mod/cloud.php:120
 msgid "$Projectname - Guests: Username: {your email address}, Password: +++"
 msgstr ""
@@ -5131,44 +5168,23 @@ msgid ""
 "only once and leave this page open until finished."
 msgstr ""
 
-#: ../../mod/editlayout.php:76 ../../mod/editwebpage.php:77
-#: ../../mod/editpost.php:20 ../../mod/editblock.php:78
-#: ../../mod/editblock.php:94
-msgid "Item not found"
-msgstr ""
-
-#: ../../mod/editlayout.php:106
-msgid "Edit Layout"
-msgstr ""
-
-#: ../../mod/editlayout.php:117
+#: ../../mod/editlayout.php:111
 msgid "Delete layout?"
 msgstr ""
 
-#: ../../mod/editlayout.php:148 ../../mod/editwebpage.php:187
-#: ../../mod/editpost.php:122 ../../mod/editblock.php:150
-msgid "Insert YouTube video"
-msgstr ""
-
-#: ../../mod/editlayout.php:149 ../../mod/editwebpage.php:188
-#: ../../mod/editpost.php:123 ../../mod/editblock.php:151
-msgid "Insert Vorbis [.ogg] video"
-msgstr ""
-
-#: ../../mod/editlayout.php:150 ../../mod/editwebpage.php:189
-#: ../../mod/editpost.php:124 ../../mod/editblock.php:152
-msgid "Insert Vorbis [.ogg] audio"
-msgstr ""
-
-#: ../../mod/editlayout.php:164 ../../mod/layouts.php:124
+#: ../../mod/editlayout.php:158 ../../mod/layouts.php:124
 msgid "Layout Description (Optional)"
 msgstr ""
 
-#: ../../mod/editlayout.php:166 ../../mod/layouts.php:121
+#: ../../mod/editlayout.php:160 ../../mod/layouts.php:121
 #: ../../mod/layouts.php:179
 msgid "Layout Name"
 msgstr ""
 
+#: ../../mod/editlayout.php:177
+msgid "Edit Layout"
+msgstr ""
+
 #: ../../mod/chat.php:19 ../../mod/channel.php:25
 msgid "You must be logged in to see this page."
 msgstr ""
@@ -5210,6 +5226,126 @@ msgstr ""
 msgid "%1$s's Chatrooms"
 msgstr ""
 
+#: ../../mod/mitem.php:24 ../../mod/menu.php:134
+msgid "Menu not found."
+msgstr ""
+
+#: ../../mod/mitem.php:48
+msgid "Unable to create element."
+msgstr ""
+
+#: ../../mod/mitem.php:71
+msgid "Unable to update menu element."
+msgstr ""
+
+#: ../../mod/mitem.php:86
+msgid "Unable to add menu element."
+msgstr ""
+
+#: ../../mod/mitem.php:152 ../../mod/mitem.php:223
+msgid "Menu Item Permissions"
+msgstr ""
+
+#: ../../mod/mitem.php:153 ../../mod/mitem.php:224 ../../mod/settings.php:1083
+msgid "(click to open/close)"
+msgstr ""
+
+#: ../../mod/mitem.php:155 ../../mod/mitem.php:171
+msgid "Link Name"
+msgstr ""
+
+#: ../../mod/mitem.php:156 ../../mod/mitem.php:228
+msgid "Link or Submenu Target"
+msgstr ""
+
+#: ../../mod/mitem.php:156
+msgid "Enter URL of the link or select a menu name to create a submenu"
+msgstr ""
+
+#: ../../mod/mitem.php:157 ../../mod/mitem.php:229
+msgid "Use magic-auth if available"
+msgstr ""
+
+#: ../../mod/mitem.php:158 ../../mod/mitem.php:230
+msgid "Open link in new window"
+msgstr ""
+
+#: ../../mod/mitem.php:159 ../../mod/mitem.php:231
+msgid "Order in list"
+msgstr ""
+
+#: ../../mod/mitem.php:159 ../../mod/mitem.php:231
+msgid "Higher numbers will sink to bottom of listing"
+msgstr ""
+
+#: ../../mod/mitem.php:160
+msgid "Submit and finish"
+msgstr ""
+
+#: ../../mod/mitem.php:161
+msgid "Submit and continue"
+msgstr ""
+
+#: ../../mod/mitem.php:169
+msgid "Menu:"
+msgstr ""
+
+#: ../../mod/mitem.php:172
+msgid "Link Target"
+msgstr ""
+
+#: ../../mod/mitem.php:175
+msgid "Edit menu"
+msgstr ""
+
+#: ../../mod/mitem.php:178
+msgid "Edit element"
+msgstr ""
+
+#: ../../mod/mitem.php:179
+msgid "Drop element"
+msgstr ""
+
+#: ../../mod/mitem.php:180
+msgid "New element"
+msgstr ""
+
+#: ../../mod/mitem.php:181
+msgid "Edit this menu container"
+msgstr ""
+
+#: ../../mod/mitem.php:182
+msgid "Add menu element"
+msgstr ""
+
+#: ../../mod/mitem.php:183
+msgid "Delete this menu item"
+msgstr ""
+
+#: ../../mod/mitem.php:184
+msgid "Edit this menu item"
+msgstr ""
+
+#: ../../mod/mitem.php:201
+msgid "Menu item not found."
+msgstr ""
+
+#: ../../mod/mitem.php:212
+msgid "Menu item deleted."
+msgstr ""
+
+#: ../../mod/mitem.php:214
+msgid "Menu item could not be deleted."
+msgstr ""
+
+#: ../../mod/mitem.php:221
+msgid "Edit Menu Element"
+msgstr ""
+
+#: ../../mod/mitem.php:227
+msgid "Link text"
+msgstr ""
+
 #: ../../mod/editwebpage.php:152
 msgid "Delete webpage?"
 msgstr ""
@@ -5308,21 +5444,20 @@ msgstr ""
 msgid "Remote Channel [%s] (not yet known on this site)"
 msgstr ""
 
-#: ../../mod/rate.php:161 ../../mod/connedit.php:669
+#: ../../mod/rate.php:161
 msgid "Rating (this information is public)"
 msgstr ""
 
-#: ../../mod/rate.php:162 ../../mod/connedit.php:670
-#: ../../mod/connedit.php:674
+#: ../../mod/rate.php:162
 msgid "Optionally explain your rating (this information is public)"
 msgstr ""
 
-#: ../../mod/editpost.php:31
-msgid "Item is not editable"
+#: ../../mod/editblock.php:117
+msgid "Delete block?"
 msgstr ""
 
-#: ../../mod/editpost.php:53
-msgid "Delete item?"
+#: ../../mod/editblock.php:179
+msgid "Edit Block"
 msgstr ""
 
 #: ../../mod/invite.php:25
@@ -5513,11 +5648,11 @@ msgstr ""
 msgid "Allow Bookmarks"
 msgstr ""
 
-#: ../../mod/menu.php:91 ../../mod/menu.php:145
+#: ../../mod/menu.php:91 ../../mod/menu.php:147
 msgid "Menu may be used to store saved bookmarks"
 msgstr ""
 
-#: ../../mod/menu.php:92 ../../mod/menu.php:147
+#: ../../mod/menu.php:92 ../../mod/menu.php:149
 msgid "Submit and proceed"
 msgstr ""
 
@@ -5533,7 +5668,7 @@ msgstr ""
 msgid "Delete this menu"
 msgstr ""
 
-#: ../../mod/menu.php:111 ../../mod/menu.php:142
+#: ../../mod/menu.php:111 ../../mod/menu.php:144
 msgid "Edit menu contents"
 msgstr ""
 
@@ -5545,35 +5680,31 @@ msgstr ""
 msgid "Menu could not be deleted."
 msgstr ""
 
-#: ../../mod/menu.php:134 ../../mod/mitem.php:24
-msgid "Menu not found."
-msgstr ""
-
 #: ../../mod/menu.php:139
 msgid "Edit Menu"
 msgstr ""
 
-#: ../../mod/menu.php:141
+#: ../../mod/menu.php:143
 msgid "Add or remove entries to this menu"
 msgstr ""
 
-#: ../../mod/menu.php:143
+#: ../../mod/menu.php:145
 msgid "Menu name"
 msgstr ""
 
-#: ../../mod/menu.php:143
+#: ../../mod/menu.php:145
 msgid "Must be unique, only seen by you"
 msgstr ""
 
-#: ../../mod/menu.php:144
+#: ../../mod/menu.php:146
 msgid "Menu title"
 msgstr ""
 
-#: ../../mod/menu.php:144
+#: ../../mod/menu.php:146
 msgid "Menu title as seen by others"
 msgstr ""
 
-#: ../../mod/menu.php:145
+#: ../../mod/menu.php:147
 msgid "Allow bookmarks"
 msgstr ""
 
@@ -6389,22 +6520,22 @@ msgstr ""
 msgid "%1$s tagged %2$s's %3$s with %4$s"
 msgstr ""
 
-#: ../../mod/uexport.php:33 ../../mod/uexport.php:34
+#: ../../mod/uexport.php:41 ../../mod/uexport.php:42
 msgid "Export Channel"
 msgstr ""
 
-#: ../../mod/uexport.php:35
+#: ../../mod/uexport.php:43
 msgid ""
 "Export your basic channel information to a small file.  This acts as a "
 "backup of your connections, permissions, profile and basic data, which can "
 "be used to import your data to a new hub, but\tdoes not contain your content."
 msgstr ""
 
-#: ../../mod/uexport.php:36
+#: ../../mod/uexport.php:44
 msgid "Export Content"
 msgstr ""
 
-#: ../../mod/uexport.php:37
+#: ../../mod/uexport.php:45
 msgid ""
 "Export your channel information and all the content to a JSON backup. This "
 "backs up all of your connections, permissions, profile data and all of your "
@@ -6972,7 +7103,7 @@ msgstr ""
 msgid "No registrations."
 msgstr ""
 
-#: ../../mod/admin.php:824
+#: ../../mod/admin.php:824 ../../mod/connedit.php:683
 msgid "Approve"
 msgstr ""
 
@@ -6980,13 +7111,11 @@ msgstr ""
 msgid "Deny"
 msgstr ""
 
-#: ../../mod/admin.php:827 ../../mod/connedit.php:523
-#: ../../mod/connedit.php:729
+#: ../../mod/admin.php:827 ../../mod/connedit.php:519
 msgid "Block"
 msgstr ""
 
-#: ../../mod/admin.php:828 ../../mod/connedit.php:523
-#: ../../mod/connedit.php:729
+#: ../../mod/admin.php:828 ../../mod/connedit.php:519
 msgid "Unblock"
 msgstr ""
 
@@ -7219,14 +7348,6 @@ msgstr ""
 msgid "Post successful."
 msgstr ""
 
-#: ../../mod/editblock.php:112
-msgid "Edit Block"
-msgstr ""
-
-#: ../../mod/editblock.php:123
-msgid "Delete block?"
-msgstr ""
-
 #: ../../mod/register.php:44
 msgid "Maximum daily site registrations exceeded. Please try again tomorrow."
 msgstr ""
@@ -7349,7 +7470,7 @@ msgstr ""
 msgid "Help:"
 msgstr ""
 
-#: ../../mod/help.php:76 ../../index.php:227
+#: ../../mod/help.php:76 ../../index.php:238
 msgid "Not Found"
 msgstr ""
 
@@ -7780,10 +7901,6 @@ msgstr ""
 msgid "Default Post Permissions"
 msgstr ""
 
-#: ../../mod/settings.php:1083 ../../mod/mitem.php:159 ../../mod/mitem.php:229
-msgid "(click to open/close)"
-msgstr ""
-
 #: ../../mod/settings.php:1087
 msgid "Channel permissions category:"
 msgstr ""
@@ -8032,118 +8149,6 @@ msgstr ""
 msgid "D, d M Y - g:i A"
 msgstr ""
 
-#: ../../mod/mitem.php:51
-msgid "Unable to create element."
-msgstr ""
-
-#: ../../mod/mitem.php:74
-msgid "Unable to update menu element."
-msgstr ""
-
-#: ../../mod/mitem.php:89
-msgid "Unable to add menu element."
-msgstr ""
-
-#: ../../mod/mitem.php:158 ../../mod/mitem.php:228
-msgid "Menu Item Permissions"
-msgstr ""
-
-#: ../../mod/mitem.php:161 ../../mod/mitem.php:176
-msgid "Link Name"
-msgstr ""
-
-#: ../../mod/mitem.php:162 ../../mod/mitem.php:233
-msgid "Link or Submenu Target"
-msgstr ""
-
-#: ../../mod/mitem.php:162
-msgid "Enter URL of the link or select a menu name to create a submenu"
-msgstr ""
-
-#: ../../mod/mitem.php:163 ../../mod/mitem.php:234
-msgid "Use magic-auth if available"
-msgstr ""
-
-#: ../../mod/mitem.php:164 ../../mod/mitem.php:235
-msgid "Open link in new window"
-msgstr ""
-
-#: ../../mod/mitem.php:165 ../../mod/mitem.php:236
-msgid "Order in list"
-msgstr ""
-
-#: ../../mod/mitem.php:165 ../../mod/mitem.php:236
-msgid "Higher numbers will sink to bottom of listing"
-msgstr ""
-
-#: ../../mod/mitem.php:166
-msgid "Submit and finish"
-msgstr ""
-
-#: ../../mod/mitem.php:167
-msgid "Submit and continue"
-msgstr ""
-
-#: ../../mod/mitem.php:174
-msgid "Menu:"
-msgstr ""
-
-#: ../../mod/mitem.php:177
-msgid "Link Target"
-msgstr ""
-
-#: ../../mod/mitem.php:180
-msgid "Edit menu"
-msgstr ""
-
-#: ../../mod/mitem.php:183
-msgid "Edit element"
-msgstr ""
-
-#: ../../mod/mitem.php:184
-msgid "Drop element"
-msgstr ""
-
-#: ../../mod/mitem.php:185
-msgid "New element"
-msgstr ""
-
-#: ../../mod/mitem.php:186
-msgid "Edit this menu container"
-msgstr ""
-
-#: ../../mod/mitem.php:187
-msgid "Add menu element"
-msgstr ""
-
-#: ../../mod/mitem.php:188
-msgid "Delete this menu item"
-msgstr ""
-
-#: ../../mod/mitem.php:189
-msgid "Edit this menu item"
-msgstr ""
-
-#: ../../mod/mitem.php:206
-msgid "Menu item not found."
-msgstr ""
-
-#: ../../mod/mitem.php:217
-msgid "Menu item deleted."
-msgstr ""
-
-#: ../../mod/mitem.php:219
-msgid "Menu item could not be deleted."
-msgstr ""
-
-#: ../../mod/mitem.php:226
-msgid "Edit Menu Element"
-msgstr ""
-
-#: ../../mod/mitem.php:232
-msgid "Link text"
-msgstr ""
-
 #: ../../mod/mood.php:131
 msgid "Set your current mood and tell your friends"
 msgstr ""
@@ -8180,160 +8185,184 @@ msgid ""
 "removed from the network"
 msgstr ""
 
-#: ../../mod/connedit.php:268
+#: ../../mod/connedit.php:267
 msgid "is now connected to"
 msgstr ""
 
-#: ../../mod/connedit.php:381
+#: ../../mod/connedit.php:380
 msgid "Could not access address book record."
 msgstr ""
 
-#: ../../mod/connedit.php:395
+#: ../../mod/connedit.php:394
 msgid "Refresh failed - channel is currently unavailable."
 msgstr ""
 
-#: ../../mod/connedit.php:402
+#: ../../mod/connedit.php:401
 msgid "Channel has been unblocked"
 msgstr ""
 
-#: ../../mod/connedit.php:403
+#: ../../mod/connedit.php:402
 msgid "Channel has been blocked"
 msgstr ""
 
-#: ../../mod/connedit.php:407 ../../mod/connedit.php:419
-#: ../../mod/connedit.php:431 ../../mod/connedit.php:443
-#: ../../mod/connedit.php:459
+#: ../../mod/connedit.php:406 ../../mod/connedit.php:418
+#: ../../mod/connedit.php:430 ../../mod/connedit.php:442
+#: ../../mod/connedit.php:458
 msgid "Unable to set address book parameters."
 msgstr ""
 
-#: ../../mod/connedit.php:414
+#: ../../mod/connedit.php:413
 msgid "Channel has been unignored"
 msgstr ""
 
-#: ../../mod/connedit.php:415
+#: ../../mod/connedit.php:414
 msgid "Channel has been ignored"
 msgstr ""
 
-#: ../../mod/connedit.php:426
+#: ../../mod/connedit.php:425
 msgid "Channel has been unarchived"
 msgstr ""
 
-#: ../../mod/connedit.php:427
+#: ../../mod/connedit.php:426
 msgid "Channel has been archived"
 msgstr ""
 
-#: ../../mod/connedit.php:438
+#: ../../mod/connedit.php:437
 msgid "Channel has been unhidden"
 msgstr ""
 
-#: ../../mod/connedit.php:439
+#: ../../mod/connedit.php:438
 msgid "Channel has been hidden"
 msgstr ""
 
-#: ../../mod/connedit.php:454
+#: ../../mod/connedit.php:453
 msgid "Channel has been approved"
 msgstr ""
 
-#: ../../mod/connedit.php:455
+#: ../../mod/connedit.php:454
 msgid "Channel has been unapproved"
 msgstr ""
 
-#: ../../mod/connedit.php:483
+#: ../../mod/connedit.php:482
 msgid "Connection has been removed."
 msgstr ""
 
-#: ../../mod/connedit.php:503
+#: ../../mod/connedit.php:501
 #, php-format
 msgid "View %s's profile"
 msgstr ""
 
-#: ../../mod/connedit.php:507
+#: ../../mod/connedit.php:505
 msgid "Refresh Permissions"
 msgstr ""
 
-#: ../../mod/connedit.php:510
+#: ../../mod/connedit.php:508
 msgid "Fetch updated permissions"
 msgstr ""
 
-#: ../../mod/connedit.php:514
+#: ../../mod/connedit.php:512
 msgid "Recent Activity"
 msgstr ""
 
-#: ../../mod/connedit.php:517
+#: ../../mod/connedit.php:515
 msgid "View recent posts and comments"
 msgstr ""
 
-#: ../../mod/connedit.php:526
+#: ../../mod/connedit.php:522
 msgid "Block (or Unblock) all communications with this connection"
 msgstr ""
 
-#: ../../mod/connedit.php:530 ../../mod/connedit.php:730
+#: ../../mod/connedit.php:526
 msgid "Unignore"
 msgstr ""
 
-#: ../../mod/connedit.php:530 ../../mod/connedit.php:730
-#: ../../mod/notifications.php:51
+#: ../../mod/connedit.php:526 ../../mod/notifications.php:51
 msgid "Ignore"
 msgstr ""
 
-#: ../../mod/connedit.php:533
+#: ../../mod/connedit.php:529
 msgid "Ignore (or Unignore) all inbound communications from this connection"
 msgstr ""
 
-#: ../../mod/connedit.php:536
+#: ../../mod/connedit.php:533
 msgid "Unarchive"
 msgstr ""
 
-#: ../../mod/connedit.php:536
+#: ../../mod/connedit.php:533
 msgid "Archive"
 msgstr ""
 
-#: ../../mod/connedit.php:539
+#: ../../mod/connedit.php:536
 msgid ""
 "Archive (or Unarchive) this connection - mark channel dead but keep content"
 msgstr ""
 
-#: ../../mod/connedit.php:542
+#: ../../mod/connedit.php:540
 msgid "Unhide"
 msgstr ""
 
-#: ../../mod/connedit.php:542
+#: ../../mod/connedit.php:540
 msgid "Hide"
 msgstr ""
 
-#: ../../mod/connedit.php:545
+#: ../../mod/connedit.php:543
 msgid "Hide or Unhide this connection from your other connections"
 msgstr ""
 
-#: ../../mod/connedit.php:552
+#: ../../mod/connedit.php:550
 msgid "Delete this connection"
 msgstr ""
 
-#: ../../mod/connedit.php:643 ../../mod/connedit.php:684
+#: ../../mod/connedit.php:631
 msgid "Approve this connection"
 msgstr ""
 
-#: ../../mod/connedit.php:643
+#: ../../mod/connedit.php:631
 msgid "Accept connection to allow communication"
 msgstr ""
 
-#: ../../mod/connedit.php:659
-#, php-format
-msgid "Connections: settings for %s"
+#: ../../mod/connedit.php:636
+msgid "Set Affinity"
 msgstr ""
 
-#: ../../mod/connedit.php:660
+#: ../../mod/connedit.php:639
+msgid "Set Profile"
+msgstr ""
+
+#: ../../mod/connedit.php:642
+msgid "Set Affinity & Profile"
+msgstr ""
+
+#: ../../mod/connedit.php:659
 msgid "Apply these permissions automatically"
 msgstr ""
 
+#: ../../mod/connedit.php:661
+msgid "This connection's address is"
+msgstr ""
+
 #: ../../mod/connedit.php:664
-msgid "Apply the permissions indicated on this page to all new connections."
+msgid ""
+"The permissions indicated on this page will be applied to all new "
+"connections."
 msgstr ""
 
-#: ../../mod/connedit.php:668
+#: ../../mod/connedit.php:666
 msgid "Slide to adjust your degree of friendship"
 msgstr ""
 
+#: ../../mod/connedit.php:668
+msgid "Slide to adjust your rating"
+msgstr ""
+
+#: ../../mod/connedit.php:669 ../../mod/connedit.php:674
+msgid "Optionally explain your rating"
+msgstr ""
+
+#: ../../mod/connedit.php:671
+msgid "Custom Filter"
+msgstr ""
+
 #: ../../mod/connedit.php:672
 msgid "Only import posts with this text"
 msgstr ""
@@ -8347,34 +8376,34 @@ msgstr ""
 msgid "Do not import posts with this text"
 msgstr ""
 
-#: ../../mod/connedit.php:680
-msgid ""
-"Default permissions for your channel type have (just) been applied. They "
-"have not yet been submitted. Please review the permissions on this page and "
-"make any desired changes at this time. This new connection may <em>not</em> "
-"be able to communicate with you until you submit this page, which will "
-"install and apply the selected permissions."
+#: ../../mod/connedit.php:675
+msgid "This information is public!"
 msgstr ""
 
-#: ../../mod/connedit.php:683
-msgid "inherited"
+#: ../../mod/connedit.php:680
+msgid "Connection Pending Approval"
 msgstr ""
 
-#: ../../mod/connedit.php:686
-msgid "Connection has no individual permissions!"
+#: ../../mod/connedit.php:681
+msgid "Connection Request"
 msgstr ""
 
-#: ../../mod/connedit.php:687
+#: ../../mod/connedit.php:682
+#, php-format
 msgid ""
-"This may be appropriate based on your <a href=\"settings\">privacy settings</"
-"a>, though you may wish to review the \"Advanced Permissions\"."
+"(%s) would like to connect with you. Please approve this connection to allow "
+"communication."
 msgstr ""
 
-#: ../../mod/connedit.php:689
-msgid "Profile Visibility"
+#: ../../mod/connedit.php:684
+msgid "Approve Later"
+msgstr ""
+
+#: ../../mod/connedit.php:687
+msgid "inherited"
 msgstr ""
 
-#: ../../mod/connedit.php:690
+#: ../../mod/connedit.php:689
 #, php-format
 msgid ""
 "Please choose the profile you would like to display to %s when viewing your "
@@ -8382,125 +8411,36 @@ msgid ""
 msgstr ""
 
 #: ../../mod/connedit.php:691
-msgid "Contact Information / Notes"
+msgid "Their Settings"
 msgstr ""
 
 #: ../../mod/connedit.php:692
-msgid "Edit contact notes"
+msgid "My Settings"
 msgstr ""
 
 #: ../../mod/connedit.php:694
-msgid "Their Settings"
+msgid "Individual Permissions"
 msgstr ""
 
 #: ../../mod/connedit.php:695
-msgid "My Settings"
-msgstr ""
-
-#: ../../mod/connedit.php:697
 msgid ""
-"Default permissions for this channel type have (just) been applied. They "
-"have <em>not</em> been saved and there are currently no stored default "
-"permissions. Please review/edit the applied settings and click [Submit] to "
-"finalize."
-msgstr ""
-
-#: ../../mod/connedit.php:698
-msgid "Clear/Disable Automatic Permissions"
-msgstr ""
-
-#: ../../mod/connedit.php:699
-msgid "Forum Members"
-msgstr ""
-
-#: ../../mod/connedit.php:700
-msgid "Soapbox"
-msgstr ""
-
-#: ../../mod/connedit.php:701
-msgid "Full Sharing (typical social network permissions)"
-msgstr ""
-
-#: ../../mod/connedit.php:702
-msgid "Cautious Sharing "
-msgstr ""
-
-#: ../../mod/connedit.php:703
-msgid "Follow Only"
+"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:704
-msgid "Individual Permissions"
-msgstr ""
-
-#: ../../mod/connedit.php:705
+#: ../../mod/connedit.php:696
 msgid ""
-"Some permissions may be inherited from your channel <a href=\"settings"
-"\">privacy settings</a>, which have higher priority than individual "
-"settings. Changing those inherited settings on this page will have no effect."
-msgstr ""
-
-#: ../../mod/connedit.php:706
-msgid "Advanced Permissions"
-msgstr ""
-
-#: ../../mod/connedit.php:707
-msgid "Simple Permissions (select one and submit)"
-msgstr ""
-
-#: ../../mod/connedit.php:711
-#, php-format
-msgid "Visit %s's profile - %s"
-msgstr ""
-
-#: ../../mod/connedit.php:712
-msgid "Block/Unblock contact"
-msgstr ""
-
-#: ../../mod/connedit.php:713
-msgid "Ignore contact"
+"Some permissions may be inherited from your channel's <a href=\"settings"
+"\"><strong>privacy settings</strong></a>, which have higher priority than "
+"individual settings. You can change those settings here but they wont have "
+"any impact unless the inherited setting changes."
 msgstr ""
 
-#: ../../mod/connedit.php:714
-msgid "Repair URL settings"
-msgstr ""
-
-#: ../../mod/connedit.php:715
-msgid "View conversations"
-msgstr ""
-
-#: ../../mod/connedit.php:717
-msgid "Delete contact"
-msgstr ""
-
-#: ../../mod/connedit.php:721
+#: ../../mod/connedit.php:697
 msgid "Last update:"
 msgstr ""
 
-#: ../../mod/connedit.php:723
-msgid "Update public posts"
-msgstr ""
-
-#: ../../mod/connedit.php:725
-msgid "Update now"
-msgstr ""
-
-#: ../../mod/connedit.php:731
-msgid "Currently blocked"
-msgstr ""
-
-#: ../../mod/connedit.php:732
-msgid "Currently ignored"
-msgstr ""
-
-#: ../../mod/connedit.php:733
-msgid "Currently archived"
-msgstr ""
-
-#: ../../mod/connedit.php:734
-msgid "Currently pending"
-msgstr ""
-
 #: ../../mod/rmagic.php:40
 msgid ""
 "We encountered a problem while logging in with the OpenID you provided. "
diff --git a/version.inc b/version.inc
index b66e936cd..249734f42 100644
--- a/version.inc
+++ b/version.inc
@@ -1 +1 @@
-2015-07-16.1095
+2015-07-19.1098