Merge remote-tracking branch 'upstream/master'

Conflicts: mod/page.php
author: Thomas Willingham <founder@kakste.com> 2013-12-18 18:21:47 +0000
committer: Thomas Willingham <founder@kakste.com> 2013-12-18 18:21:47 +0000
commit: 7ac00d02d110ec2f2d33779d8316e17c13cda149 (patch)
tree: 03b41e86e0790895fe56488beea2b5f554fbaeae /util
parent: 733cb37ef14eb4dd5408e1a8c453f13cd41952eb (diff)
parent: df34aaba4733b1c38ac2b8b9c19c5a945d5a841b (diff)
download: volse-hubzilla-7ac00d02d110ec2f2d33779d8316e17c13cda149.tar.gz
volse-hubzilla-7ac00d02d110ec2f2d33779d8316e17c13cda149.tar.bz2
volse-hubzilla-7ac00d02d110ec2f2d33779d8316e17c13cda149.zip
4 files changed, 2707 insertions, 2343 deletions
diff --git a/util/Doxyfile b/util/Doxyfile
index edb8a8464..fce6c1359 100644
--- a/util/Doxyfile
+++ b/util/Doxyfile
@@ -1,7 +1,7 @@
 INPUT = boot.php mod include setup util view
 RECURSIVE = YES
 PROJECT_NAME = "The Red Matrix"
-PROJECT_LOGO = images/rhash-64.png
+PROJECT_LOGO = images/rm-64.png
 EXCLUDE = .htconfig.php library doc .git
 EXCLUDE_PATTERNS = *smarty3* *strings.php *.out *test*
 OUTPUT_DIRECTORY = doc
diff --git a/util/messages.po b/util/messages.po
index d53d35f3a..db21568c7 100644
--- a/util/messages.po
+++ b/util/messages.po
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: 2013-11-15.498\n"
+"Project-Id-Version: 2013-12-13.526\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-11-15 00:03-0800\n"
+"POT-Creation-Date: 2013-12-13 00:04-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"
@@ -53,215 +53,244 @@ msgstr ""
 msgid "%1$s has an updated %2$s, changing %3$s."
 msgstr ""
 
-#: ../../include/api.php:972
-msgid "Public Timeline"
+#: ../../include/dir_fns.php:15
+msgid "Sort Options"
+msgstr ""
+
+#: ../../include/dir_fns.php:16
+msgid "Alphabetic"
+msgstr ""
+
+#: ../../include/dir_fns.php:17
+msgid "Reverse Alphabetic"
+msgstr ""
+
+#: ../../include/dir_fns.php:18
+msgid "Newest to Oldest"
+msgstr ""
+
+#: ../../include/dir_fns.php:30
+msgid "Enable Safe Search"
+msgstr ""
+
+#: ../../include/dir_fns.php:32
+msgid "Disable Safe Search"
+msgstr ""
+
+#: ../../include/dir_fns.php:34
+msgid "Safe Mode"
 msgstr ""
 
-#: ../../include/enotify.php:36
+#: ../../include/enotify.php:40
 msgid "Red Matrix Notification"
 msgstr ""
 
-#: ../../include/enotify.php:39
+#: ../../include/enotify.php:41
+msgid "redmatrix"
+msgstr ""
+
+#: ../../include/enotify.php:43
 msgid "Thank You,"
 msgstr ""
 
-#: ../../include/enotify.php:41
+#: ../../include/enotify.php:45
 #, php-format
 msgid "%s Administrator"
 msgstr ""
 
-#: ../../include/enotify.php:76
+#: ../../include/enotify.php:80
 #, php-format
 msgid "%s <!item_type!>"
 msgstr ""
 
-#: ../../include/enotify.php:80
+#: ../../include/enotify.php:84
 #, php-format
 msgid "[Red:Notify] New mail received at %s"
 msgstr ""
 
-#: ../../include/enotify.php:82
+#: ../../include/enotify.php:86
 #, php-format
-msgid "%1$s sent you a new private message at %2$s."
+msgid "%1$s, %2$s sent you a new private message at %3$s."
 msgstr ""
 
-#: ../../include/enotify.php:83
+#: ../../include/enotify.php:87
 #, php-format
 msgid "%1$s sent you %2$s."
 msgstr ""
 
-#: ../../include/enotify.php:83
+#: ../../include/enotify.php:87
 msgid "a private message"
 msgstr ""
 
-#: ../../include/enotify.php:84
+#: ../../include/enotify.php:88
 #, php-format
 msgid "Please visit %s to view and/or reply to your private messages."
 msgstr ""
 
-#: ../../include/enotify.php:135
+#: ../../include/enotify.php:139
 #, php-format
-msgid "%1$s commented on [zrl=%2$s]a %3$s[/zrl]"
+msgid "%1$s, %2$s commented on [zrl=%3$s]a %4$s[/zrl]"
 msgstr ""
 
-#: ../../include/enotify.php:142
+#: ../../include/enotify.php:147
 #, php-format
-msgid "%1$s commented on [zrl=%2$s]%3$s's %4$s[/zrl]"
+msgid "%1$s, %2$s commented on [zrl=%3$s]%4$s's %5$s[/zrl]"
 msgstr ""
 
-#: ../../include/enotify.php:150
+#: ../../include/enotify.php:156
 #, php-format
-msgid "%1$s commented on [zrl=%2$s]your %3$s[/zrl]"
+msgid "%1$s, %2$s commented on [zrl=%3$s]your %4$s[/zrl]"
 msgstr ""
 
-#: ../../include/enotify.php:160
+#: ../../include/enotify.php:167
 #, php-format
 msgid "[Red:Notify] Comment to conversation #%1$d by %2$s"
 msgstr ""
 
-#: ../../include/enotify.php:161
+#: ../../include/enotify.php:168
 #, php-format
-msgid "%s commented on an item/conversation you have been following."
+msgid "%1$s, %2$s commented on an item/conversation you have been following."
 msgstr ""
 
-#: ../../include/enotify.php:164 ../../include/enotify.php:181
-#: ../../include/enotify.php:206 ../../include/enotify.php:224
-#: ../../include/enotify.php:237
+#: ../../include/enotify.php:171 ../../include/enotify.php:190
+#: ../../include/enotify.php:216 ../../include/enotify.php:235
+#: ../../include/enotify.php:249
 #, php-format
 msgid "Please visit %s to view and/or reply to the conversation."
 msgstr ""
 
-#: ../../include/enotify.php:171
+#: ../../include/enotify.php:178
 #, php-format
 msgid "[Red:Notify] %s posted to your profile wall"
 msgstr ""
 
-#: ../../include/enotify.php:173
+#: ../../include/enotify.php:180
 #, php-format
-msgid "%1$s posted to your profile wall at %2$s"
+msgid "%1$s, %2$s posted to your profile wall at %3$s"
 msgstr ""
 
-#: ../../include/enotify.php:175
+#: ../../include/enotify.php:182
 #, php-format
-msgid "%1$s posted to [zrl=%2$s]your wall[/zrl]"
+msgid "%1$s, %2$s posted to [zrl=%3$s]your wall[/zrl]"
 msgstr ""
 
-#: ../../include/enotify.php:200
+#: ../../include/enotify.php:209
 #, php-format
 msgid "[Red:Notify] %s tagged you"
 msgstr ""
 
-#: ../../include/enotify.php:201
+#: ../../include/enotify.php:210
 #, php-format
-msgid "%1$s tagged you at %2$s"
+msgid "%1$s, %2$s tagged you at %3$s"
 msgstr ""
 
-#: ../../include/enotify.php:202
+#: ../../include/enotify.php:211
 #, php-format
-msgid "%1$s [zrl=%2$s]tagged you[/zrl]."
+msgid "%1$s, %2$s [zrl=%3$s]tagged you[/zrl]."
 msgstr ""
 
-#: ../../include/enotify.php:214
+#: ../../include/enotify.php:224
 #, php-format
 msgid "[Red:Notify] %1$s poked you"
 msgstr ""
 
-#: ../../include/enotify.php:215
+#: ../../include/enotify.php:225
 #, php-format
-msgid "%1$s poked you at %2$s"
+msgid "%1$s, %2$s poked you at %3$s"
 msgstr ""
 
-#: ../../include/enotify.php:216
+#: ../../include/enotify.php:226
 #, php-format
-msgid "%1$s [zrl=%2$s]poked you[/zrl]."
+msgid "%1$s, %2$s [zrl=%2$s]poked you[/zrl]."
 msgstr ""
 
-#: ../../include/enotify.php:231
+#: ../../include/enotify.php:242
 #, php-format
 msgid "[Red:Notify] %s tagged your post"
 msgstr ""
 
-#: ../../include/enotify.php:232
+#: ../../include/enotify.php:243
 #, php-format
-msgid "%1$s tagged your post at %2$s"
+msgid "%1$s, %2$s tagged your post at %3$s"
 msgstr ""
 
-#: ../../include/enotify.php:233
+#: ../../include/enotify.php:244
 #, php-format
-msgid "%1$s tagged [zrl=%2$s]your post[/zrl]"
+msgid "%1$s, %2$s tagged [zrl=%3$s]your post[/zrl]"
 msgstr ""
 
-#: ../../include/enotify.php:244
+#: ../../include/enotify.php:256
 msgid "[Red:Notify] Introduction received"
 msgstr ""
 
-#: ../../include/enotify.php:245
+#: ../../include/enotify.php:257
 #, php-format
-msgid "You've received an introduction from '%1$s' at %2$s"
+msgid "%1$s, you've received an introduction from '%2$s' at %3$s"
 msgstr ""
 
-#: ../../include/enotify.php:246
+#: ../../include/enotify.php:258
 #, php-format
-msgid "You've received [zrl=%1$s]an introduction[/zrl] from %2$s."
+msgid "%1$s, you've received [zrl=%2$s]an introduction[/zrl] from %3$s."
 msgstr ""
 
-#: ../../include/enotify.php:249 ../../include/enotify.php:267
+#: ../../include/enotify.php:262 ../../include/enotify.php:281
 #, php-format
 msgid "You may visit their profile at %s"
 msgstr ""
 
-#: ../../include/enotify.php:251
+#: ../../include/enotify.php:264
 #, php-format
 msgid "Please visit %s to approve or reject the introduction."
 msgstr ""
 
-#: ../../include/enotify.php:258
+#: ../../include/enotify.php:271
 msgid "[Red:Notify] Friend suggestion received"
 msgstr ""
 
-#: ../../include/enotify.php:259
+#: ../../include/enotify.php:272
 #, php-format
-msgid "You've received a friend suggestion from '%1$s' at %2$s"
+msgid "%1$s, you've received a friend suggestion from '%2$s' at %3$s"
 msgstr ""
 
-#: ../../include/enotify.php:260
+#: ../../include/enotify.php:273
 #, php-format
-msgid "You've received [zrl=%1$s]a friend suggestion[/zrl] for %2$s from %3$s."
+msgid ""
+"%1$s, you've received [zrl=%2$s]a friend suggestion[/zrl] for %3$s from %4$s."
 msgstr ""
 
-#: ../../include/enotify.php:265
+#: ../../include/enotify.php:279
 msgid "Name:"
 msgstr ""
 
-#: ../../include/enotify.php:266
+#: ../../include/enotify.php:280
 msgid "Photo:"
 msgstr ""
 
-#: ../../include/enotify.php:269
+#: ../../include/enotify.php:283
 #, php-format
 msgid "Please visit %s to approve or reject the suggestion."
 msgstr ""
 
-#: ../../include/ItemObject.php:88 ../../mod/photos.php:952
+#: ../../include/ItemObject.php:88 ../../mod/photos.php:963
 msgid "Private Message"
 msgstr ""
 
 #: ../../include/ItemObject.php:95 ../../include/page_widgets.php:8
-#: ../../mod/webpages.php:101 ../../mod/settings.php:712 ../../mod/menu.php:55
+#: ../../mod/webpages.php:118 ../../mod/settings.php:671 ../../mod/menu.php:55
 #: ../../mod/layouts.php:102 ../../mod/editlayout.php:100
-#: ../../mod/editwebpage.php:119 ../../mod/blocks.php:93
+#: ../../mod/editwebpage.php:143 ../../mod/blocks.php:93
 #: ../../mod/editpost.php:97 ../../mod/editblock.php:114
 msgid "Edit"
 msgstr ""
 
-#: ../../include/ItemObject.php:107 ../../include/conversation.php:628
-#: ../../mod/settings.php:713 ../../mod/admin.php:677 ../../mod/group.php:182
-#: ../../mod/photos.php:1130 ../../mod/connections.php:354
+#: ../../include/ItemObject.php:107 ../../include/conversation.php:632
+#: ../../mod/settings.php:672 ../../mod/admin.php:693 ../../mod/group.php:182
+#: ../../mod/photos.php:1141 ../../mod/connections.php:378
 #: ../../mod/filestorage.php:82
 msgid "Delete"
 msgstr ""
 
-#: ../../include/ItemObject.php:113 ../../include/conversation.php:627
+#: ../../include/ItemObject.php:113 ../../include/conversation.php:631
 msgid "Select"
 msgstr ""
 
@@ -285,7 +314,7 @@ msgstr ""
 msgid "starred"
 msgstr ""
 
-#: ../../include/ItemObject.php:160 ../../include/conversation.php:638
+#: ../../include/ItemObject.php:160 ../../include/conversation.php:642
 msgid "Message is verified"
 msgstr ""
 
@@ -293,7 +322,7 @@ msgstr ""
 msgid "add tag"
 msgstr ""
 
-#: ../../include/ItemObject.php:174 ../../mod/photos.php:1058
+#: ../../include/ItemObject.php:174 ../../mod/photos.php:1069
 msgid "I like this (toggle)"
 msgstr ""
 
@@ -301,7 +330,7 @@ msgstr ""
 msgid "like"
 msgstr ""
 
-#: ../../include/ItemObject.php:175 ../../mod/photos.php:1059
+#: ../../include/ItemObject.php:175 ../../mod/photos.php:1070
 msgid "I don't like this (toggle)"
 msgstr ""
 
@@ -338,20 +367,20 @@ msgstr ""
 msgid "via Wall-To-Wall:"
 msgstr ""
 
-#: ../../include/ItemObject.php:216 ../../include/conversation.php:682
+#: ../../include/ItemObject.php:216 ../../include/conversation.php:686
 #, php-format
 msgid " from %s"
 msgstr ""
 
-#: ../../include/ItemObject.php:219 ../../include/conversation.php:685
+#: ../../include/ItemObject.php:219 ../../include/conversation.php:689
 #, php-format
 msgid "last edited: %s"
 msgstr ""
 
-#: ../../include/ItemObject.php:246 ../../include/conversation.php:702
-#: ../../include/conversation.php:1112 ../../mod/photos.php:1061
-#: ../../mod/message.php:332 ../../mod/message.php:516
-#: ../../mod/editlayout.php:109 ../../mod/editwebpage.php:128
+#: ../../include/ItemObject.php:246 ../../include/conversation.php:706
+#: ../../include/conversation.php:1116 ../../mod/photos.php:1072
+#: ../../mod/message.php:332 ../../mod/message.php:484
+#: ../../mod/editlayout.php:109 ../../mod/editwebpage.php:152
 #: ../../mod/editpost.php:106 ../../mod/editblock.php:123
 msgid "Please wait"
 msgstr ""
@@ -364,37 +393,38 @@ msgstr[0] ""
 msgstr[1] ""
 
 #: ../../include/ItemObject.php:268 ../../include/js_strings.php:7
-#: ../../include/contact_widgets.php:148
+#: ../../include/contact_widgets.php:124
 msgid "show more"
 msgstr ""
 
-#: ../../include/ItemObject.php:527 ../../mod/photos.php:1077
-#: ../../mod/photos.php:1164
+#: ../../include/ItemObject.php:527 ../../mod/photos.php:1088
+#: ../../mod/photos.php:1175
 msgid "This is you"
 msgstr ""
 
 #: ../../include/ItemObject.php:529 ../../include/js_strings.php:6
-#: ../../mod/photos.php:1079 ../../mod/photos.php:1166
+#: ../../mod/photos.php:1090 ../../mod/photos.php:1177
 msgid "Comment"
 msgstr ""
 
-#: ../../include/ItemObject.php:530 ../../mod/events.php:458
+#: ../../include/ItemObject.php:530 ../../mod/events.php:470
 #: ../../mod/thing.php:190 ../../mod/invite.php:154 ../../mod/setup.php:302
-#: ../../mod/setup.php:345 ../../mod/settings.php:650
-#: ../../mod/settings.php:762 ../../mod/settings.php:790
-#: ../../mod/settings.php:814 ../../mod/settings.php:885
-#: ../../mod/settings.php:1053 ../../mod/connect.php:96
-#: ../../mod/sources.php:83 ../../mod/sources.php:110 ../../mod/admin.php:418
-#: ../../mod/admin.php:670 ../../mod/admin.php:810 ../../mod/admin.php:1009
-#: ../../mod/admin.php:1096 ../../mod/group.php:87 ../../mod/photos.php:685
-#: ../../mod/photos.php:779 ../../mod/photos.php:1040
-#: ../../mod/photos.php:1080 ../../mod/photos.php:1167
-#: ../../mod/message.php:333 ../../mod/message.php:515
-#: ../../mod/connections.php:432 ../../mod/profiles.php:529
-#: ../../mod/import.php:385 ../../mod/crepair.php:166 ../../mod/poke.php:166
-#: ../../mod/fsuggest.php:108 ../../mod/mood.php:137
-#: ../../view/theme/redbasic/php/config.php:79
+#: ../../mod/setup.php:345 ../../mod/settings.php:609
+#: ../../mod/settings.php:721 ../../mod/settings.php:749
+#: ../../mod/settings.php:773 ../../mod/settings.php:844
+#: ../../mod/settings.php:1005 ../../mod/connect.php:96
+#: ../../mod/sources.php:83 ../../mod/sources.php:110 ../../mod/admin.php:420
+#: ../../mod/admin.php:686 ../../mod/admin.php:826 ../../mod/admin.php:1025
+#: ../../mod/admin.php:1112 ../../mod/group.php:87 ../../mod/photos.php:685
+#: ../../mod/photos.php:790 ../../mod/photos.php:1051
+#: ../../mod/photos.php:1091 ../../mod/photos.php:1178
+#: ../../mod/message.php:333 ../../mod/message.php:483
+#: ../../mod/profiles.php:518 ../../mod/connections.php:456
+#: ../../mod/import.php:387 ../../mod/poke.php:166 ../../mod/fsuggest.php:108
+#: ../../mod/mood.php:137 ../../view/theme/redbasic/php/config.php:85
 #: ../../view/theme/apw/php/config.php:231
+#: ../../view/theme/blogga/view/theme/blog/config.php:67
+#: ../../view/theme/blogga/php/config.php:67
 msgid "Submit"
 msgstr ""
 
@@ -430,22 +460,22 @@ msgstr ""
 msgid "Video"
 msgstr ""
 
-#: ../../include/ItemObject.php:539 ../../include/conversation.php:1075
-#: ../../mod/webpages.php:105 ../../mod/photos.php:1081
-#: ../../mod/editlayout.php:129 ../../mod/editwebpage.php:150
+#: ../../include/ItemObject.php:539 ../../include/conversation.php:1079
+#: ../../mod/webpages.php:122 ../../mod/photos.php:1092
+#: ../../mod/editlayout.php:129 ../../mod/editwebpage.php:176
 #: ../../mod/editpost.php:126 ../../mod/editblock.php:144
 msgid "Preview"
 msgstr ""
 
-#: ../../include/ItemObject.php:542 ../../include/conversation.php:1139
-#: ../../mod/message.php:338 ../../mod/message.php:521
+#: ../../include/ItemObject.php:542 ../../include/conversation.php:1143
+#: ../../mod/message.php:338 ../../mod/message.php:489
 #: ../../mod/editpost.php:134
 msgid "Encrypt text"
 msgstr ""
 
-#: ../../include/Contact.php:87 ../../include/contact_widgets.php:23
-#: ../../mod/match.php:58 ../../mod/suggest.php:56 ../../mod/directory.php:198
-#: ../../boot.php:1745
+#: ../../include/Contact.php:87 ../../include/widgets.php:96
+#: ../../include/widgets.php:136 ../../include/identity.php:613
+#: ../../mod/match.php:62 ../../mod/suggest.php:58 ../../mod/directory.php:199
 msgid "Connect"
 msgstr ""
 
@@ -457,34 +487,126 @@ msgstr ""
 msgid "Open the selected location in a different window or browser tab"
 msgstr ""
 
-#: ../../include/Contact.php:524 ../../include/conversation.php:930
-msgid "Poke"
+#: ../../include/widgets.php:5
+msgid "Displays a full channel profile"
 msgstr ""
 
-#: ../../include/Contact.php:525 ../../include/conversation.php:924
-msgid "View Status"
+#: ../../include/widgets.php:6
+msgid "Tag cloud of webpage categories"
 msgstr ""
 
-#: ../../include/Contact.php:526 ../../include/nav.php:76
-#: ../../include/conversation.php:925 ../../mod/connections.php:307
-#: ../../mod/connections.php:421
-msgid "View Profile"
+#: ../../include/widgets.php:7
+msgid "List and filter by collection"
 msgstr ""
 
-#: ../../include/Contact.php:527 ../../include/conversation.php:926
-msgid "View Photos"
+#: ../../include/widgets.php:8
+msgid "Show a couple of channel suggestion"
 msgstr ""
 
-#: ../../include/Contact.php:528
-msgid "Network Posts"
+#: ../../include/widgets.php:9
+msgid "Provide a channel follow form"
 msgstr ""
 
-#: ../../include/Contact.php:529 ../../include/conversation.php:928
-msgid "Edit Contact"
+#: ../../include/widgets.php:39 ../../include/contact_widgets.php:86
+msgid "Categories"
 msgstr ""
 
-#: ../../include/Contact.php:530 ../../include/conversation.php:929
-msgid "Send PM"
+#: ../../include/widgets.php:98 ../../mod/suggest.php:60
+msgid "Ignore/Hide"
+msgstr ""
+
+#: ../../include/widgets.php:104 ../../mod/connections.php:583
+msgid "Suggestions"
+msgstr ""
+
+#: ../../include/widgets.php:105
+msgid "See more..."
+msgstr ""
+
+#: ../../include/widgets.php:127
+#, php-format
+msgid "You have %1$.0f of %2$.0f allowed connections."
+msgstr ""
+
+#: ../../include/widgets.php:133
+msgid "Add New Connection"
+msgstr ""
+
+#: ../../include/widgets.php:134
+msgid "Enter the channel address"
+msgstr ""
+
+#: ../../include/widgets.php:135
+msgid "Example: bob@example.com, http://example.com/barbara"
+msgstr ""
+
+#: ../../include/widgets.php:152
+msgid "Notes"
+msgstr ""
+
+#: ../../include/widgets.php:154 ../../include/text.php:738
+#: ../../include/text.php:752 ../../mod/filer.php:36
+msgid "Save"
+msgstr ""
+
+#: ../../include/widgets.php:224 ../../mod/search.php:20
+msgid "Remove term"
+msgstr ""
+
+#: ../../include/widgets.php:233 ../../include/features.php:48
+#: ../../mod/search.php:17
+msgid "Saved Searches"
+msgstr ""
+
+#: ../../include/widgets.php:234 ../../include/group.php:290
+msgid "add"
+msgstr ""
+
+#: ../../include/widgets.php:264 ../../include/features.php:62
+#: ../../include/contact_widgets.php:52
+msgid "Saved Folders"
+msgstr ""
+
+#: ../../include/widgets.php:267 ../../include/contact_widgets.php:55
+#: ../../include/contact_widgets.php:89
+msgid "Everything"
+msgstr ""
+
+#: ../../include/widgets.php:299 ../../include/items.php:3550
+msgid "Archives"
+msgstr ""
+
+#: ../../include/widgets.php:351
+msgid "Refresh"
+msgstr ""
+
+#: ../../include/widgets.php:352 ../../mod/connections.php:408
+msgid "Me"
+msgstr ""
+
+#: ../../include/widgets.php:353 ../../mod/connections.php:410
+msgid "Best Friends"
+msgstr ""
+
+#: ../../include/widgets.php:354 ../../include/profile_selectors.php:42
+#: ../../include/identity.php:298 ../../mod/connections.php:411
+msgid "Friends"
+msgstr ""
+
+#: ../../include/widgets.php:355
+msgid "Co-workers"
+msgstr ""
+
+#: ../../include/widgets.php:356 ../../mod/connections.php:412
+msgid "Former Friends"
+msgstr ""
+
+#: ../../include/widgets.php:357 ../../mod/connections.php:413
+msgid "Acquaintances"
+msgstr ""
+
+#: ../../include/widgets.php:358
+msgid "Everybody"
 msgstr ""
 
 #: ../../include/contact_selectors.php:30
@@ -547,8 +669,8 @@ msgstr ""
 msgid "RSS/Atom"
 msgstr ""
 
-#: ../../include/contact_selectors.php:77 ../../mod/admin.php:673
-#: ../../mod/admin.php:682 ../../boot.php:1465
+#: ../../include/contact_selectors.php:77 ../../mod/admin.php:689
+#: ../../mod/admin.php:698 ../../boot.php:1442
 msgid "Email"
 msgstr ""
 
@@ -666,231 +788,12 @@ msgstr ""
 msgid "Finishes:"
 msgstr ""
 
-#: ../../include/event.php:40 ../../include/bb2diaspora.php:455
-#: ../../mod/events.php:450 ../../mod/directory.php:173 ../../boot.php:1795
+#: ../../include/event.php:40 ../../include/identity.php:664
+#: ../../include/bb2diaspora.php:455 ../../mod/events.php:463
+#: ../../mod/directory.php:174
 msgid "Location:"
 msgstr ""
 
-#: ../../include/features.php:21
-msgid "General Features"
-msgstr ""
-
-#: ../../include/features.php:23
-msgid "Content Expiration"
-msgstr ""
-
-#: ../../include/features.php:23
-msgid "Remove posts/comments and/or private messages at a future time"
-msgstr ""
-
-#: ../../include/features.php:24
-msgid "Multiple Profiles"
-msgstr ""
-
-#: ../../include/features.php:24
-msgid "Ability to create multiple profiles"
-msgstr ""
-
-#: ../../include/features.php:25
-msgid "Web Pages"
-msgstr ""
-
-#: ../../include/features.php:25
-msgid "Provide managed web pages on your channel"
-msgstr ""
-
-#: ../../include/features.php:26
-msgid "Enhanced Photo Albums"
-msgstr ""
-
-#: ../../include/features.php:26
-msgid "Enable photo album with enhanced features"
-msgstr ""
-
-#: ../../include/features.php:28
-msgid "Extended Identity Sharing"
-msgstr ""
-
-#: ../../include/features.php:28 ../../include/js_strings.php:30
-msgid " "
-msgstr ""
-
-#: ../../include/features.php:29
-msgid "Expert Mode"
-msgstr ""
-
-#: ../../include/features.php:29
-msgid "Enable Expert Mode to provide advanced configuration options"
-msgstr ""
-
-#: ../../include/features.php:30
-msgid "Premium Channel"
-msgstr ""
-
-#: ../../include/features.php:30
-msgid ""
-"Allows you to set restrictions and terms on those that connect with your "
-"channel"
-msgstr ""
-
-#: ../../include/features.php:35
-msgid "Post Composition Features"
-msgstr ""
-
-#: ../../include/features.php:36
-msgid "Richtext Editor"
-msgstr ""
-
-#: ../../include/features.php:36
-msgid "Enable richtext editor"
-msgstr ""
-
-#: ../../include/features.php:37
-msgid "Post Preview"
-msgstr ""
-
-#: ../../include/features.php:37
-msgid "Allow previewing posts and comments before publishing them"
-msgstr ""
-
-#: ../../include/features.php:38 ../../mod/settings.php:120
-#: ../../mod/sources.php:67
-msgid "Channel Sources"
-msgstr ""
-
-#: ../../include/features.php:38
-msgid "Automatically import channel content from other channels or feeds"
-msgstr ""
-
-#: ../../include/features.php:39
-msgid "Even More Encryption"
-msgstr ""
-
-#: ../../include/features.php:39
-msgid "Allow encryption of content end-to-end with a shared secret key"
-msgstr ""
-
-#: ../../include/features.php:44
-msgid "Network and Stream Filtering"
-msgstr ""
-
-#: ../../include/features.php:45
-msgid "Search by Date"
-msgstr ""
-
-#: ../../include/features.php:45
-msgid "Ability to select posts by date ranges"
-msgstr ""
-
-#: ../../include/features.php:46
-msgid "Collections Filter"
-msgstr ""
-
-#: ../../include/features.php:46
-msgid "Enable widget to display Network posts only from selected collections"
-msgstr ""
-
-#: ../../include/features.php:47 ../../mod/network.php:173
-#: ../../mod/search.php:17
-msgid "Saved Searches"
-msgstr ""
-
-#: ../../include/features.php:47
-msgid "Save search terms for re-use"
-msgstr ""
-
-#: ../../include/features.php:48
-msgid "Network Personal Tab"
-msgstr ""
-
-#: ../../include/features.php:48
-msgid "Enable tab to display only Network posts that you've interacted on"
-msgstr ""
-
-#: ../../include/features.php:49
-msgid "Network New Tab"
-msgstr ""
-
-#: ../../include/features.php:49
-msgid "Enable tab to display all new Network activity"
-msgstr ""
-
-#: ../../include/features.php:50
-msgid "Affinity Tool"
-msgstr ""
-
-#: ../../include/features.php:50
-msgid "Filter stream activity by depth of relationships"
-msgstr ""
-
-#: ../../include/features.php:55
-msgid "Post/Comment Tools"
-msgstr ""
-
-#: ../../include/features.php:56
-msgid "Multiple Deletion"
-msgstr ""
-
-#: ../../include/features.php:56
-msgid "Select and delete multiple posts/comments at once"
-msgstr ""
-
-#: ../../include/features.php:57
-msgid "Edit Sent Posts"
-msgstr ""
-
-#: ../../include/features.php:57
-msgid "Edit and correct posts and comments after sending"
-msgstr ""
-
-#: ../../include/features.php:58
-msgid "Tagging"
-msgstr ""
-
-#: ../../include/features.php:58
-msgid "Ability to tag existing posts"
-msgstr ""
-
-#: ../../include/features.php:59
-msgid "Post Categories"
-msgstr ""
-
-#: ../../include/features.php:59
-msgid "Add categories to your posts"
-msgstr ""
-
-#: ../../include/features.php:60 ../../include/contact_widgets.php:76
-msgid "Saved Folders"
-msgstr ""
-
-#: ../../include/features.php:60
-msgid "Ability to file posts under folders"
-msgstr ""
-
-#: ../../include/features.php:61
-msgid "Dislike Posts"
-msgstr ""
-
-#: ../../include/features.php:61
-msgid "Ability to dislike posts/comments"
-msgstr ""
-
-#: ../../include/features.php:62
-msgid "Star Posts"
-msgstr ""
-
-#: ../../include/features.php:62
-msgid "Ability to mark special posts with a star indicator"
-msgstr ""
-
-#: ../../include/features.php:63
-msgid "Tag Cloud"
-msgstr ""
-
-#: ../../include/features.php:63
-msgid "Provide a personal tag cloud on your channel page"
-msgstr ""
-
 #: ../../include/group.php:25
 msgid ""
 "A deleted group with this name was revived. Existing item permissions "
@@ -902,7 +805,7 @@ msgstr ""
 msgid "Default privacy group for new contacts"
 msgstr ""
 
-#: ../../include/group.php:242
+#: ../../include/group.php:242 ../../mod/admin.php:698
 msgid "All Channels"
 msgstr ""
 
@@ -926,10 +829,6 @@ msgstr ""
 msgid "Channels not in any collection"
 msgstr ""
 
-#: ../../include/group.php:290 ../../mod/network.php:174
-msgid "add"
-msgstr ""
-
 #: ../../include/js_strings.php:5
 msgid "Delete this item?"
 msgstr ""
@@ -1023,6 +922,10 @@ msgstr ""
 msgid "%d years"
 msgstr ""
 
+#: ../../include/js_strings.php:30 ../../include/features.php:29
+msgid " "
+msgstr ""
+
 #: ../../include/js_strings.php:31
 msgid "timeago.numbers"
 msgstr ""
@@ -1043,532 +946,264 @@ msgstr ""
 msgid "Stored post could not be verified."
 msgstr ""
 
-#: ../../include/network.php:1113
-msgid "view full size"
-msgstr ""
-
 #: ../../include/photo/photo_driver.php:609 ../../include/photos.php:51
-#: ../../mod/photos.php:97 ../../mod/photos.php:764 ../../mod/photos.php:786
-#: ../../mod/profile_photo.php:88 ../../mod/profile_photo.php:235
-#: ../../mod/profile_photo.php:346
+#: ../../mod/photos.php:97 ../../mod/photos.php:775 ../../mod/photos.php:797
+#: ../../mod/profile_photo.php:78 ../../mod/profile_photo.php:225
+#: ../../mod/profile_photo.php:336
 msgid "Profile Photos"
 msgstr ""
 
-#: ../../include/profile_advanced.php:7 ../../include/profile_advanced.php:118
-#: ../../mod/profperm.php:112
-msgid "Profile"
-msgstr ""
-
-#: ../../include/profile_advanced.php:15 ../../mod/settings.php:1061
-msgid "Full Name:"
-msgstr ""
-
-#: ../../include/profile_advanced.php:17 ../../mod/directory.php:175
-#: ../../boot.php:1797
-msgid "Gender:"
-msgstr ""
-
-#: ../../include/profile_advanced.php:22
-msgid "j F, Y"
-msgstr ""
-
-#: ../../include/profile_advanced.php:23
-msgid "j F"
-msgstr ""
-
-#: ../../include/profile_advanced.php:30
-msgid "Birthday:"
-msgstr ""
-
-#: ../../include/profile_advanced.php:34
-msgid "Age:"
-msgstr ""
-
-#: ../../include/profile_advanced.php:37 ../../mod/directory.php:177
-#: ../../boot.php:1798
-msgid "Status:"
-msgstr ""
-
-#: ../../include/profile_advanced.php:43
-#, php-format
-msgid "for %1$d %2$s"
-msgstr ""
-
-#: ../../include/profile_advanced.php:46 ../../mod/profiles.php:549
-msgid "Sexual Preference:"
-msgstr ""
-
-#: ../../include/profile_advanced.php:48 ../../mod/directory.php:179
-#: ../../boot.php:1799
-msgid "Homepage:"
-msgstr ""
-
-#: ../../include/profile_advanced.php:50 ../../mod/profiles.php:551
-msgid "Hometown:"
-msgstr ""
-
-#: ../../include/profile_advanced.php:52
-msgid "Tags:"
-msgstr ""
-
-#: ../../include/profile_advanced.php:54 ../../mod/profiles.php:552
-msgid "Political Views:"
-msgstr ""
-
-#: ../../include/profile_advanced.php:56
-msgid "Religion:"
-msgstr ""
-
-#: ../../include/profile_advanced.php:58 ../../mod/directory.php:181
-msgid "About:"
-msgstr ""
-
-#: ../../include/profile_advanced.php:60
-msgid "Hobbies/Interests:"
-msgstr ""
-
-#: ../../include/profile_advanced.php:62 ../../mod/profiles.php:555
-msgid "Likes:"
-msgstr ""
-
-#: ../../include/profile_advanced.php:64 ../../mod/profiles.php:556
-msgid "Dislikes:"
-msgstr ""
-
-#: ../../include/profile_advanced.php:67
-msgid "Contact information and Social Networks:"
-msgstr ""
-
-#: ../../include/profile_advanced.php:69
-msgid "Musical interests:"
-msgstr ""
-
-#: ../../include/profile_advanced.php:71
-msgid "Books, literature:"
-msgstr ""
-
-#: ../../include/profile_advanced.php:73
-msgid "Television:"
-msgstr ""
-
-#: ../../include/profile_advanced.php:75
-msgid "Film/dance/culture/entertainment:"
-msgstr ""
-
-#: ../../include/profile_advanced.php:77
-msgid "Love/Romance:"
-msgstr ""
-
-#: ../../include/profile_advanced.php:79
-msgid "Work/employment:"
-msgstr ""
-
-#: ../../include/profile_advanced.php:81
-msgid "School/education:"
-msgstr ""
-
-#: ../../include/text.php:309
-msgid "prev"
-msgstr ""
-
-#: ../../include/text.php:311
-msgid "first"
-msgstr ""
-
-#: ../../include/text.php:340
-msgid "last"
-msgstr ""
-
-#: ../../include/text.php:343
-msgid "next"
+#: ../../include/api.php:972
+msgid "Public Timeline"
 msgstr ""
 
-#: ../../include/text.php:355
-msgid "older"
+#: ../../include/network.php:640
+msgid "view full size"
 msgstr ""
 
-#: ../../include/text.php:357
-msgid "newer"
+#: ../../include/bbcode.php:94 ../../include/bbcode.php:494
+#: ../../include/bbcode.php:497
+msgid "Image/photo"
 msgstr ""
 
-#: ../../include/text.php:648
-msgid "No connections"
+#: ../../include/bbcode.php:126 ../../include/bbcode.php:502
+msgid "Encrypted content"
 msgstr ""
 
-#: ../../include/text.php:659
+#: ../../include/bbcode.php:173
 #, php-format
-msgid "%d Connection"
-msgid_plural "%d Connections"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../../include/text.php:671
-msgid "View Connections"
-msgstr ""
-
-#: ../../include/text.php:730 ../../include/nav.php:135
-#: ../../mod/search.php:96
-msgid "Search"
-msgstr ""
-
-#: ../../include/text.php:732 ../../mod/filer.php:36
-msgid "Save"
-msgstr ""
-
-#: ../../include/text.php:770
-msgid "poke"
-msgstr ""
-
-#: ../../include/text.php:770 ../../include/conversation.php:236
-msgid "poked"
-msgstr ""
-
-#: ../../include/text.php:771
-msgid "ping"
-msgstr ""
-
-#: ../../include/text.php:771
-msgid "pinged"
-msgstr ""
-
-#: ../../include/text.php:772
-msgid "prod"
-msgstr ""
-
-#: ../../include/text.php:772
-msgid "prodded"
-msgstr ""
-
-#: ../../include/text.php:773
-msgid "slap"
-msgstr ""
-
-#: ../../include/text.php:773
-msgid "slapped"
-msgstr ""
-
-#: ../../include/text.php:774
-msgid "finger"
-msgstr ""
-
-#: ../../include/text.php:774
-msgid "fingered"
-msgstr ""
-
-#: ../../include/text.php:775
-msgid "rebuff"
-msgstr ""
-
-#: ../../include/text.php:775
-msgid "rebuffed"
-msgstr ""
-
-#: ../../include/text.php:787
-msgid "happy"
-msgstr ""
-
-#: ../../include/text.php:788
-msgid "sad"
-msgstr ""
-
-#: ../../include/text.php:789
-msgid "mellow"
-msgstr ""
-
-#: ../../include/text.php:790
-msgid "tired"
-msgstr ""
-
-#: ../../include/text.php:791
-msgid "perky"
-msgstr ""
-
-#: ../../include/text.php:792
-msgid "angry"
-msgstr ""
-
-#: ../../include/text.php:793
-msgid "stupified"
-msgstr ""
-
-#: ../../include/text.php:794
-msgid "puzzled"
-msgstr ""
-
-#: ../../include/text.php:795
-msgid "interested"
-msgstr ""
-
-#: ../../include/text.php:796
-msgid "bitter"
-msgstr ""
-
-#: ../../include/text.php:797
-msgid "cheerful"
-msgstr ""
-
-#: ../../include/text.php:798
-msgid "alive"
-msgstr ""
-
-#: ../../include/text.php:799
-msgid "annoyed"
-msgstr ""
-
-#: ../../include/text.php:800
-msgid "anxious"
-msgstr ""
-
-#: ../../include/text.php:801
-msgid "cranky"
-msgstr ""
-
-#: ../../include/text.php:802
-msgid "disturbed"
-msgstr ""
-
-#: ../../include/text.php:803
-msgid "frustrated"
-msgstr ""
-
-#: ../../include/text.php:804
-msgid "motivated"
+msgid "%1$s wrote the following %2$s %3$s"
 msgstr ""
 
-#: ../../include/text.php:805
-msgid "relaxed"
+#: ../../include/bbcode.php:175
+msgid "post"
 msgstr ""
 
-#: ../../include/text.php:806
-msgid "surprised"
+#: ../../include/bbcode.php:454 ../../include/bbcode.php:474
+msgid "$1 wrote:"
 msgstr ""
 
-#: ../../include/text.php:970
-msgid "Monday"
+#: ../../include/oembed.php:150
+msgid "Embedded content"
 msgstr ""
 
-#: ../../include/text.php:970
-msgid "Tuesday"
+#: ../../include/oembed.php:159
+msgid "Embedding disabled"
 msgstr ""
 
-#: ../../include/text.php:970
-msgid "Wednesday"
+#: ../../include/features.php:21
+msgid "General Features"
 msgstr ""
 
-#: ../../include/text.php:970
-msgid "Thursday"
+#: ../../include/features.php:23
+msgid "Content Expiration"
 msgstr ""
 
-#: ../../include/text.php:970
-msgid "Friday"
+#: ../../include/features.php:23
+msgid "Remove posts/comments and/or private messages at a future time"
 msgstr ""
 
-#: ../../include/text.php:970
-msgid "Saturday"
+#: ../../include/features.php:24
+msgid "Multiple Profiles"
 msgstr ""
 
-#: ../../include/text.php:970
-msgid "Sunday"
+#: ../../include/features.php:24
+msgid "Ability to create multiple profiles"
 msgstr ""
 
-#: ../../include/text.php:974
-msgid "January"
+#: ../../include/features.php:25
+msgid "Web Pages"
 msgstr ""
 
-#: ../../include/text.php:974
-msgid "February"
+#: ../../include/features.php:25
+msgid "Provide managed web pages on your channel"
 msgstr ""
 
-#: ../../include/text.php:974
-msgid "March"
+#: ../../include/features.php:26
+msgid "Private Notes"
 msgstr ""
 
-#: ../../include/text.php:974
-msgid "April"
+#: ../../include/features.php:26
+msgid "Enables a tool to store notes and reminders"
 msgstr ""
 
-#: ../../include/text.php:974
-msgid "May"
+#: ../../include/features.php:27
+msgid "Enhanced Photo Albums"
 msgstr ""
 
-#: ../../include/text.php:974
-msgid "June"
+#: ../../include/features.php:27
+msgid "Enable photo album with enhanced features"
 msgstr ""
 
-#: ../../include/text.php:974
-msgid "July"
+#: ../../include/features.php:29
+msgid "Extended Identity Sharing"
 msgstr ""
 
-#: ../../include/text.php:974
-msgid "August"
+#: ../../include/features.php:30
+msgid "Expert Mode"
 msgstr ""
 
-#: ../../include/text.php:974
-msgid "September"
+#: ../../include/features.php:30
+msgid "Enable Expert Mode to provide advanced configuration options"
 msgstr ""
 
-#: ../../include/text.php:974
-msgid "October"
+#: ../../include/features.php:31
+msgid "Premium Channel"
 msgstr ""
 
-#: ../../include/text.php:974
-msgid "November"
+#: ../../include/features.php:31
+msgid ""
+"Allows you to set restrictions and terms on those that connect with your "
+"channel"
 msgstr ""
 
-#: ../../include/text.php:974
-msgid "December"
+#: ../../include/features.php:36
+msgid "Post Composition Features"
 msgstr ""
 
-#: ../../include/text.php:1052 ../../mod/message.php:453
-msgid "unknown.???"
+#: ../../include/features.php:37
+msgid "Richtext Editor"
 msgstr ""
 
-#: ../../include/text.php:1053 ../../mod/message.php:454
-msgid "bytes"
+#: ../../include/features.php:37
+msgid "Enable richtext editor"
 msgstr ""
 
-#: ../../include/text.php:1088
-msgid "remove category"
+#: ../../include/features.php:38
+msgid "Post Preview"
 msgstr ""
 
-#: ../../include/text.php:1110
-msgid "remove from file"
+#: ../../include/features.php:38
+msgid "Allow previewing posts and comments before publishing them"
 msgstr ""
 
-#: ../../include/text.php:1164 ../../include/text.php:1176
-msgid "Click to open/close"
+#: ../../include/features.php:39 ../../mod/settings.php:120
+#: ../../mod/sources.php:67
+msgid "Channel Sources"
 msgstr ""
 
-#: ../../include/text.php:1352 ../../mod/events.php:326
-msgid "link to source"
+#: ../../include/features.php:39
+msgid "Automatically import channel content from other channels or feeds"
 msgstr ""
 
-#: ../../include/text.php:1371
-msgid "Select a page layout: "
+#: ../../include/features.php:40
+msgid "Even More Encryption"
 msgstr ""
 
-#: ../../include/text.php:1374 ../../include/text.php:1439
-msgid "default"
+#: ../../include/features.php:40
+msgid "Allow encryption of content end-to-end with a shared secret key"
 msgstr ""
 
-#: ../../include/text.php:1410
-msgid "Page content type: "
+#: ../../include/features.php:45
+msgid "Network and Stream Filtering"
 msgstr ""
 
-#: ../../include/text.php:1451
-msgid "Select an alternate language"
+#: ../../include/features.php:46
+msgid "Search by Date"
 msgstr ""
 
-#: ../../include/text.php:1603 ../../include/conversation.php:117
-#: ../../mod/like.php:103 ../../mod/subthread.php:89 ../../mod/tagger.php:45
-msgid "photo"
+#: ../../include/features.php:46
+msgid "Ability to select posts by date ranges"
 msgstr ""
 
-#: ../../include/text.php:1606 ../../include/conversation.php:120
-#: ../../mod/tagger.php:49
-msgid "event"
+#: ../../include/features.php:47
+msgid "Collections Filter"
 msgstr ""
 
-#: ../../include/text.php:1609 ../../include/conversation.php:145
-#: ../../mod/like.php:103 ../../mod/subthread.php:89 ../../mod/tagger.php:53
-msgid "status"
+#: ../../include/features.php:47
+msgid "Enable widget to display Network posts only from selected collections"
 msgstr ""
 
-#: ../../include/text.php:1611 ../../include/conversation.php:147
-#: ../../mod/tagger.php:55
-msgid "comment"
+#: ../../include/features.php:48
+msgid "Save search terms for re-use"
 msgstr ""
 
-#: ../../include/text.php:1616
-msgid "activity"
+#: ../../include/features.php:49
+msgid "Network Personal Tab"
 msgstr ""
 
-#: ../../include/text.php:1878
-msgid "Design"
+#: ../../include/features.php:49
+msgid "Enable tab to display only Network posts that you've interacted on"
 msgstr ""
 
-#: ../../include/text.php:1880
-msgid "Blocks"
+#: ../../include/features.php:50
+msgid "Network New Tab"
 msgstr ""
 
-#: ../../include/text.php:1881
-msgid "Menus"
+#: ../../include/features.php:50
+msgid "Enable tab to display all new Network activity"
 msgstr ""
 
-#: ../../include/text.php:1882
-msgid "Layouts"
+#: ../../include/features.php:51
+msgid "Affinity Tool"
 msgstr ""
 
-#: ../../include/text.php:1883
-msgid "Pages"
+#: ../../include/features.php:51
+msgid "Filter stream activity by depth of relationships"
 msgstr ""
 
-#: ../../include/identity.php:14 ../../mod/item.php:1131
-msgid "Unable to obtain identity information from database"
+#: ../../include/features.php:52
+msgid "Suggest Channels"
 msgstr ""
 
-#: ../../include/identity.php:36
-msgid "Empty name"
+#: ../../include/features.php:52
+msgid "Show channel suggestions"
 msgstr ""
 
-#: ../../include/identity.php:38
-msgid "Name too long"
+#: ../../include/features.php:57
+msgid "Post/Comment Tools"
 msgstr ""
 
-#: ../../include/identity.php:80
-msgid "No account identifier"
+#: ../../include/features.php:59
+msgid "Edit Sent Posts"
 msgstr ""
 
-#: ../../include/identity.php:90
-msgid "Nickname is required."
+#: ../../include/features.php:59
+msgid "Edit and correct posts and comments after sending"
 msgstr ""
 
-#: ../../include/identity.php:104
-msgid ""
-"Nickname has unsupported characters or is already being used on this site."
+#: ../../include/features.php:60
+msgid "Tagging"
 msgstr ""
 
-#: ../../include/identity.php:163
-msgid "Unable to retrieve created identity"
+#: ../../include/features.php:60
+msgid "Ability to tag existing posts"
 msgstr ""
 
-#: ../../include/identity.php:220
-msgid "Default Profile"
+#: ../../include/features.php:61
+msgid "Post Categories"
 msgstr ""
 
-#: ../../include/identity.php:245 ../../include/profile_selectors.php:42
-#: ../../mod/network.php:387 ../../mod/connections.php:387
-msgid "Friends"
+#: ../../include/features.php:61
+msgid "Add categories to your posts"
 msgstr ""
 
-#: ../../include/bbcode.php:94 ../../include/bbcode.php:494
-#: ../../include/bbcode.php:497
-msgid "Image/photo"
+#: ../../include/features.php:62
+msgid "Ability to file posts under folders"
 msgstr ""
 
-#: ../../include/bbcode.php:126 ../../include/bbcode.php:502
-msgid "Encrypted content"
+#: ../../include/features.php:63
+msgid "Dislike Posts"
 msgstr ""
 
-#: ../../include/bbcode.php:173
-#, php-format
-msgid "%1$s wrote the following %2$s %3$s"
+#: ../../include/features.php:63
+msgid "Ability to dislike posts/comments"
 msgstr ""
 
-#: ../../include/bbcode.php:175
-msgid "post"
+#: ../../include/features.php:64
+msgid "Star Posts"
 msgstr ""
 
-#: ../../include/bbcode.php:454 ../../include/bbcode.php:474
-msgid "$1 wrote:"
+#: ../../include/features.php:64
+msgid "Ability to mark special posts with a star indicator"
 msgstr ""
 
-#: ../../include/oembed.php:149
-msgid "Embedded content"
+#: ../../include/features.php:65
+msgid "Tag Cloud"
 msgstr ""
 
-#: ../../include/oembed.php:158
-msgid "Embedding disabled"
+#: ../../include/features.php:65
+msgid "Provide a personal tag cloud on your channel page"
 msgstr ""
 
 #: ../../include/notify.php:23
@@ -1585,29 +1220,29 @@ msgstr ""
 #: ../../include/attach.php:204 ../../include/attach.php:237
 #: ../../include/attach.php:251 ../../include/attach.php:272
 #: ../../include/attach.php:464 ../../include/attach.php:539
-#: ../../include/items.php:3572 ../../mod/common.php:43
-#: ../../mod/events.php:134 ../../mod/invite.php:13 ../../mod/invite.php:102
+#: ../../include/items.php:3429 ../../mod/common.php:35
+#: ../../mod/events.php:140 ../../mod/invite.php:13 ../../mod/invite.php:102
 #: ../../mod/allfriends.php:10 ../../mod/webpages.php:40 ../../mod/api.php:26
-#: ../../mod/api.php:31 ../../mod/lastpost.php:93 ../../mod/page.php:30
-#: ../../mod/page.php:80 ../../mod/setup.php:200 ../../mod/settings.php:627
-#: ../../mod/viewconnections.php:33 ../../mod/viewconnections.php:38
-#: ../../mod/delegate.php:6 ../../mod/sources.php:48 ../../mod/mitem.php:92
+#: ../../mod/api.php:31 ../../mod/page.php:30 ../../mod/page.php:80
+#: ../../mod/setup.php:200 ../../mod/settings.php:586
+#: ../../mod/viewconnections.php:22 ../../mod/viewconnections.php:27
+#: ../../mod/delegate.php:6 ../../mod/sources.php:48 ../../mod/mitem.php:73
 #: ../../mod/group.php:15 ../../mod/photos.php:74 ../../mod/photos.php:654
 #: ../../mod/viewsrc.php:12 ../../mod/menu.php:40 ../../mod/message.php:208
-#: ../../mod/layouts.php:27 ../../mod/layouts.php:42 ../../mod/network.php:7
-#: ../../mod/intro.php:50 ../../mod/connections.php:177
-#: ../../mod/profiles.php:163 ../../mod/profiles.php:476
+#: ../../mod/layouts.php:27 ../../mod/layouts.php:42 ../../mod/network.php:12
+#: ../../mod/profiles.php:152 ../../mod/profiles.php:465
 #: ../../mod/new_channel.php:66 ../../mod/new_channel.php:97
-#: ../../mod/filestorage.php:26 ../../mod/manage.php:6
-#: ../../mod/crepair.php:115 ../../mod/editlayout.php:48
-#: ../../mod/nogroup.php:25 ../../mod/profile_photo.php:197
-#: ../../mod/profile_photo.php:210 ../../mod/editwebpage.php:42
-#: ../../mod/editwebpage.php:64 ../../mod/notifications.php:66
-#: ../../mod/blocks.php:29 ../../mod/blocks.php:44 ../../mod/editpost.php:13
-#: ../../mod/poke.php:128 ../../mod/channel.php:123 ../../mod/fsuggest.php:78
-#: ../../mod/editblock.php:48 ../../mod/item.php:173 ../../mod/item.php:181
-#: ../../mod/suggest.php:32 ../../mod/register.php:60 ../../mod/regmod.php:18
-#: ../../mod/mood.php:114 ../../index.php:178 ../../index.php:340
+#: ../../mod/connections.php:201 ../../mod/filestorage.php:26
+#: ../../mod/manage.php:6 ../../mod/editlayout.php:48
+#: ../../mod/profile_photo.php:187 ../../mod/profile_photo.php:200
+#: ../../mod/editwebpage.php:44 ../../mod/editwebpage.php:83
+#: ../../mod/notifications.php:66 ../../mod/blocks.php:29
+#: ../../mod/blocks.php:44 ../../mod/editpost.php:13 ../../mod/poke.php:128
+#: ../../mod/channel.php:86 ../../mod/fsuggest.php:78
+#: ../../mod/editblock.php:48 ../../mod/item.php:181 ../../mod/item.php:189
+#: ../../mod/suggest.php:33 ../../mod/register.php:68 ../../mod/regmod.php:18
+#: ../../mod/authtest.php:13 ../../mod/mood.php:114 ../../index.php:178
+#: ../../index.php:346
 msgid "Permission denied."
 msgstr ""
 
@@ -1620,7 +1255,7 @@ msgstr ""
 msgid "Image file is empty."
 msgstr ""
 
-#: ../../include/photos.php:124 ../../mod/profile_photo.php:157
+#: ../../include/photos.php:124 ../../mod/profile_photo.php:147
 msgid "Unable to process image"
 msgstr ""
 
@@ -1628,12 +1263,12 @@ msgstr ""
 msgid "Photo storage failed."
 msgstr ""
 
-#: ../../include/photos.php:288 ../../boot.php:2246
+#: ../../include/photos.php:288 ../../include/conversation.php:1457
 msgid "Photo Albums"
 msgstr ""
 
-#: ../../include/photos.php:292 ../../mod/photos.php:802
-#: ../../mod/photos.php:1276
+#: ../../include/photos.php:292 ../../mod/photos.php:813
+#: ../../mod/photos.php:1287
 msgid "Upload New Photos"
 msgstr ""
 
@@ -1923,20 +1558,20 @@ msgstr ""
 msgid "database storage failed."
 msgstr ""
 
-#: ../../include/zot.php:426
+#: ../../include/zot.php:545
 msgid "Invalid data packet"
 msgstr ""
 
-#: ../../include/zot.php:436
+#: ../../include/zot.php:555
 msgid "Unable to verify channel signature"
 msgstr ""
 
-#: ../../include/zot.php:582
+#: ../../include/zot.php:732
 #, php-format
 msgid "Unable to verify site signature for %s"
 msgstr ""
 
-#: ../../include/nav.php:72 ../../include/nav.php:87 ../../boot.php:1462
+#: ../../include/nav.php:72 ../../include/nav.php:87 ../../boot.php:1439
 msgid "Logout"
 msgstr ""
 
@@ -1952,6 +1587,11 @@ msgstr ""
 msgid "Your posts and conversations"
 msgstr ""
 
+#: ../../include/nav.php:76 ../../include/conversation.php:929
+#: ../../mod/connections.php:331 ../../mod/connections.php:445
+msgid "View Profile"
+msgstr ""
+
 #: ../../include/nav.php:76
 msgid "Your profile page"
 msgstr ""
@@ -1964,7 +1604,8 @@ msgstr ""
 msgid "Manage/Edit Profiles"
 msgstr ""
 
-#: ../../include/nav.php:79 ../../mod/fbrowser.php:25 ../../boot.php:2243
+#: ../../include/nav.php:79 ../../include/conversation.php:1454
+#: ../../mod/fbrowser.php:25
 msgid "Photos"
 msgstr ""
 
@@ -1972,7 +1613,7 @@ msgstr ""
 msgid "Your photos"
 msgstr ""
 
-#: ../../include/nav.php:85 ../../boot.php:1463
+#: ../../include/nav.php:85 ../../boot.php:1440
 msgid "Login"
 msgstr ""
 
@@ -1993,7 +1634,7 @@ msgstr ""
 msgid "Home Page"
 msgstr ""
 
-#: ../../include/nav.php:125 ../../mod/register.php:187 ../../boot.php:1439
+#: ../../include/nav.php:125 ../../mod/register.php:195 ../../boot.php:1416
 msgid "Register"
 msgstr ""
 
@@ -2001,7 +1642,7 @@ msgstr ""
 msgid "Create an account"
 msgstr ""
 
-#: ../../include/nav.php:130 ../../mod/help.php:34
+#: ../../include/nav.php:130 ../../mod/help.php:45 ../../mod/help.php:49
 msgid "Help"
 msgstr ""
 
@@ -2017,11 +1658,16 @@ msgstr ""
 msgid "Addon applications, utilities, games"
 msgstr ""
 
+#: ../../include/nav.php:135 ../../include/text.php:736
+#: ../../include/text.php:750 ../../mod/search.php:96
+msgid "Search"
+msgstr ""
+
 #: ../../include/nav.php:135
 msgid "Search site content"
 msgstr ""
 
-#: ../../include/nav.php:138 ../../mod/directory.php:225
+#: ../../include/nav.php:138 ../../mod/directory.php:228
 msgid "Directory"
 msgstr ""
 
@@ -2038,131 +1684,120 @@ msgid "Your matrix"
 msgstr ""
 
 #: ../../include/nav.php:150
-msgid "See all matrix notifications"
-msgstr ""
-
-#: ../../include/nav.php:151
 msgid "Mark all matrix notifications seen"
 msgstr ""
 
-#: ../../include/nav.php:153
+#: ../../include/nav.php:152
 msgid "Channel Home"
 msgstr ""
 
-#: ../../include/nav.php:153
+#: ../../include/nav.php:152
 msgid "Channel home"
 msgstr ""
 
-#: ../../include/nav.php:154
-msgid "See all channel notifications"
-msgstr ""
-
-#: ../../include/nav.php:155
+#: ../../include/nav.php:153
 msgid "Mark all channel notifications seen"
 msgstr ""
 
-#: ../../include/nav.php:158
+#: ../../include/nav.php:156
 msgid "Intros"
 msgstr ""
 
-#: ../../include/nav.php:158 ../../mod/connections.php:565
+#: ../../include/nav.php:156 ../../mod/connections.php:589
 msgid "New Connections"
 msgstr ""
 
 #: ../../include/nav.php:159
-msgid "See all channel introductions"
-msgstr ""
-
-#: ../../include/nav.php:162
 msgid "Notices"
 msgstr ""
 
-#: ../../include/nav.php:162 ../../mod/notifications.php:218
+#: ../../include/nav.php:159
 msgid "Notifications"
 msgstr ""
 
-#: ../../include/nav.php:163
+#: ../../include/nav.php:160
 msgid "See all notifications"
 msgstr ""
 
-#: ../../include/nav.php:164
+#: ../../include/nav.php:161
 msgid "Mark all system notifications seen"
 msgstr ""
 
-#: ../../include/nav.php:166
+#: ../../include/nav.php:163
 msgid "Mail"
 msgstr ""
 
-#: ../../include/nav.php:166
+#: ../../include/nav.php:163
 msgid "Private mail"
 msgstr ""
 
-#: ../../include/nav.php:167
+#: ../../include/nav.php:164
 msgid "See all private messages"
 msgstr ""
 
-#: ../../include/nav.php:168
+#: ../../include/nav.php:165
 msgid "Mark all private messages seen"
 msgstr ""
 
-#: ../../include/nav.php:169
+#: ../../include/nav.php:166
 msgid "Inbox"
 msgstr ""
 
-#: ../../include/nav.php:170
+#: ../../include/nav.php:167
 msgid "Outbox"
 msgstr ""
 
-#: ../../include/nav.php:171 ../../mod/message.php:24
+#: ../../include/nav.php:168 ../../mod/message.php:24
 msgid "New Message"
 msgstr ""
 
-#: ../../include/nav.php:174 ../../mod/events.php:348 ../../boot.php:2254
+#: ../../include/nav.php:171 ../../include/conversation.php:1465
+#: ../../mod/events.php:354
 msgid "Events"
 msgstr ""
 
-#: ../../include/nav.php:174
+#: ../../include/nav.php:171
 msgid "Event Calendar"
 msgstr ""
 
-#: ../../include/nav.php:175
+#: ../../include/nav.php:172
 msgid "See all events"
 msgstr ""
 
-#: ../../include/nav.php:176
+#: ../../include/nav.php:173
 msgid "Mark all events seen"
 msgstr ""
 
-#: ../../include/nav.php:178
+#: ../../include/nav.php:175
 msgid "Channel Select"
 msgstr ""
 
-#: ../../include/nav.php:178
+#: ../../include/nav.php:175
 msgid "Manage Your Channels"
 msgstr ""
 
-#: ../../include/nav.php:180 ../../mod/settings.php:131
-#: ../../mod/admin.php:769 ../../mod/admin.php:974
+#: ../../include/nav.php:177 ../../mod/settings.php:131
+#: ../../mod/admin.php:785 ../../mod/admin.php:990
 msgid "Settings"
 msgstr ""
 
-#: ../../include/nav.php:180
+#: ../../include/nav.php:177
 msgid "Account/Channel Settings"
 msgstr ""
 
-#: ../../include/nav.php:182 ../../mod/connections.php:671
+#: ../../include/nav.php:179 ../../mod/connections.php:694
 msgid "Connections"
 msgstr ""
 
-#: ../../include/nav.php:182
+#: ../../include/nav.php:179
 msgid "Manage/Edit Friends and Connections"
 msgstr ""
 
-#: ../../include/nav.php:189 ../../mod/admin.php:111
+#: ../../include/nav.php:186 ../../mod/admin.php:111
 msgid "Admin"
 msgstr ""
 
-#: ../../include/nav.php:189
+#: ../../include/nav.php:186
 msgid "Site Setup and Configuration"
 msgstr ""
 
@@ -2174,6 +1809,38 @@ msgstr ""
 msgid "Please wait..."
 msgstr ""
 
+#: ../../include/taxonomy.php:210
+msgid "Tags"
+msgstr ""
+
+#: ../../include/taxonomy.php:224
+msgid "Keywords"
+msgstr ""
+
+#: ../../include/taxonomy.php:249
+msgid "have"
+msgstr ""
+
+#: ../../include/taxonomy.php:249
+msgid "has"
+msgstr ""
+
+#: ../../include/taxonomy.php:250
+msgid "want"
+msgstr ""
+
+#: ../../include/taxonomy.php:250
+msgid "wants"
+msgstr ""
+
+#: ../../include/taxonomy.php:251
+msgid "likes"
+msgstr ""
+
+#: ../../include/taxonomy.php:252
+msgid "dislikes"
+msgstr ""
+
 #: ../../include/account.php:23
 msgid "Not a valid email address"
 msgstr ""
@@ -2230,84 +1897,447 @@ msgstr ""
 msgid "Registration revoked for %s"
 msgstr ""
 
-#: ../../include/auth.php:67
-msgid "Logged out."
+#: ../../include/conversation.php:117 ../../include/text.php:1621
+#: ../../mod/like.php:103 ../../mod/subthread.php:89 ../../mod/tagger.php:45
+msgid "photo"
 msgstr ""
 
-#: ../../include/auth.php:179
-msgid "Failed authentication"
+#: ../../include/conversation.php:120 ../../include/text.php:1624
+#: ../../mod/tagger.php:49
+msgid "event"
 msgstr ""
 
-#: ../../include/auth.php:188
-msgid "Login failed."
+#: ../../include/conversation.php:123
+msgid "channel"
 msgstr ""
 
-#: ../../include/contact_widgets.php:14
+#: ../../include/conversation.php:145 ../../include/text.php:1627
+#: ../../mod/like.php:103 ../../mod/subthread.php:89 ../../mod/tagger.php:53
+msgid "status"
+msgstr ""
+
+#: ../../include/conversation.php:147 ../../include/text.php:1629
+#: ../../mod/tagger.php:55
+msgid "comment"
+msgstr ""
+
+#: ../../include/conversation.php:161 ../../mod/like.php:134
 #, php-format
-msgid "You have %1$.0f of %2$.0f allowed connections."
+msgid "%1$s likes %2$s's %3$s"
 msgstr ""
 
-#: ../../include/contact_widgets.php:20
-msgid "Add New Connection"
+#: ../../include/conversation.php:164 ../../mod/like.php:136
+#, php-format
+msgid "%1$s doesn't like %2$s's %3$s"
 msgstr ""
 
-#: ../../include/contact_widgets.php:21
-msgid "Enter the channel address"
+#: ../../include/conversation.php:201
+#, php-format
+msgid "%1$s is now connected with %2$s"
 msgstr ""
 
-#: ../../include/contact_widgets.php:22
-msgid "Example: bob@example.com, http://example.com/barbara"
+#: ../../include/conversation.php:236
+#, php-format
+msgid "%1$s poked %2$s"
+msgstr ""
+
+#: ../../include/conversation.php:240 ../../include/text.php:790
+msgid "poked"
+msgstr ""
+
+#: ../../include/conversation.php:258 ../../mod/mood.php:63
+#, php-format
+msgid "%1$s is currently %2$s"
+msgstr ""
+
+#: ../../include/conversation.php:662
+#, php-format
+msgid "View %s's profile @ %s"
+msgstr ""
+
+#: ../../include/conversation.php:676
+msgid "Categories:"
+msgstr ""
+
+#: ../../include/conversation.php:677
+msgid "Filed under:"
+msgstr ""
+
+#: ../../include/conversation.php:704
+msgid "View in context"
+msgstr ""
+
+#: ../../include/conversation.php:830
+msgid "remove"
+msgstr ""
+
+#: ../../include/conversation.php:834
+msgid "Loading..."
+msgstr ""
+
+#: ../../include/conversation.php:835
+msgid "Delete Selected Items"
+msgstr ""
+
+#: ../../include/conversation.php:926
+msgid "View Source"
+msgstr ""
+
+#: ../../include/conversation.php:927
+msgid "Follow Thread"
+msgstr ""
+
+#: ../../include/conversation.php:928
+msgid "View Status"
+msgstr ""
+
+#: ../../include/conversation.php:930
+msgid "View Photos"
+msgstr ""
+
+#: ../../include/conversation.php:931
+msgid "Matrix Activity"
+msgstr ""
+
+#: ../../include/conversation.php:932
+msgid "Edit Contact"
+msgstr ""
+
+#: ../../include/conversation.php:933
+msgid "Send PM"
+msgstr ""
+
+#: ../../include/conversation.php:934
+msgid "Poke"
+msgstr ""
+
+#: ../../include/conversation.php:996
+#, php-format
+msgid "%s likes this."
+msgstr ""
+
+#: ../../include/conversation.php:996
+#, php-format
+msgid "%s doesn't like this."
 msgstr ""
 
-#: ../../include/contact_widgets.php:38
+#: ../../include/conversation.php:1000
+#, php-format
+msgid "<span  %1$s>%2$d people</span> like this."
+msgid_plural "<span  %1$s>%2$d people</span> like this."
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../../include/conversation.php:1002
+#, php-format
+msgid "<span  %1$s>%2$d people</span> don't like this."
+msgid_plural "<span  %1$s>%2$d people</span> don't like this."
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../../include/conversation.php:1008
+msgid "and"
+msgstr ""
+
+#: ../../include/conversation.php:1011
+#, php-format
+msgid ", and %d other people"
+msgid_plural ", and %d other people"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../../include/conversation.php:1012
+#, php-format
+msgid "%s like this."
+msgstr ""
+
+#: ../../include/conversation.php:1012
+#, php-format
+msgid "%s don't like this."
+msgstr ""
+
+#: ../../include/conversation.php:1062
+msgid "Visible to <strong>everybody</strong>"
+msgstr ""
+
+#: ../../include/conversation.php:1063 ../../mod/message.php:281
+#: ../../mod/message.php:417
+msgid "Please enter a link URL:"
+msgstr ""
+
+#: ../../include/conversation.php:1064
+msgid "Please enter a video link/URL:"
+msgstr ""
+
+#: ../../include/conversation.php:1065
+msgid "Please enter an audio link/URL:"
+msgstr ""
+
+#: ../../include/conversation.php:1066
+msgid "Tag term:"
+msgstr ""
+
+#: ../../include/conversation.php:1067 ../../mod/filer.php:35
+msgid "Save to Folder:"
+msgstr ""
+
+#: ../../include/conversation.php:1068
+msgid "Where are you right now?"
+msgstr ""
+
+#: ../../include/conversation.php:1069 ../../mod/message.php:282
+#: ../../mod/message.php:418 ../../mod/editpost.php:52
+msgid "Expires YYYY-MM-DD HH:MM"
+msgstr ""
+
+#: ../../include/conversation.php:1093 ../../mod/photos.php:1071
+msgid "Share"
+msgstr ""
+
+#: ../../include/conversation.php:1095 ../../mod/editwebpage.php:139
+msgid "Page link title"
+msgstr ""
+
+#: ../../include/conversation.php:1097 ../../mod/message.php:329
+#: ../../mod/message.php:480 ../../mod/editlayout.php:101
+#: ../../mod/editwebpage.php:144 ../../mod/editpost.php:98
+#: ../../mod/editblock.php:115
+msgid "Upload photo"
+msgstr ""
+
+#: ../../include/conversation.php:1098
+msgid "upload photo"
+msgstr ""
+
+#: ../../include/conversation.php:1099 ../../mod/message.php:330
+#: ../../mod/message.php:481 ../../mod/editlayout.php:102
+#: ../../mod/editwebpage.php:145 ../../mod/editpost.php:99
+#: ../../mod/editblock.php:116
+msgid "Attach file"
+msgstr ""
+
+#: ../../include/conversation.php:1100
+msgid "attach file"
+msgstr ""
+
+#: ../../include/conversation.php:1101 ../../mod/message.php:331
+#: ../../mod/message.php:482 ../../mod/editlayout.php:103
+#: ../../mod/editwebpage.php:146 ../../mod/editpost.php:100
+#: ../../mod/editblock.php:117
+msgid "Insert web link"
+msgstr ""
+
+#: ../../include/conversation.php:1102
+msgid "web link"
+msgstr ""
+
+#: ../../include/conversation.php:1103
+msgid "Insert video link"
+msgstr ""
+
+#: ../../include/conversation.php:1104
+msgid "video link"
+msgstr ""
+
+#: ../../include/conversation.php:1105
+msgid "Insert audio link"
+msgstr ""
+
+#: ../../include/conversation.php:1106
+msgid "audio link"
+msgstr ""
+
+#: ../../include/conversation.php:1107 ../../mod/editlayout.php:107
+#: ../../mod/editwebpage.php:150 ../../mod/editpost.php:104
+#: ../../mod/editblock.php:121
+msgid "Set your location"
+msgstr ""
+
+#: ../../include/conversation.php:1108
+msgid "set location"
+msgstr ""
+
+#: ../../include/conversation.php:1109 ../../mod/editlayout.php:108
+#: ../../mod/editwebpage.php:151 ../../mod/editpost.php:105
+#: ../../mod/editblock.php:122
+msgid "Clear browser location"
+msgstr ""
+
+#: ../../include/conversation.php:1110
+msgid "clear location"
+msgstr ""
+
+#: ../../include/conversation.php:1112 ../../mod/editlayout.php:121
+#: ../../mod/editwebpage.php:168 ../../mod/editpost.php:118
+#: ../../mod/editblock.php:136
+msgid "Set title"
+msgstr ""
+
+#: ../../include/conversation.php:1115 ../../mod/editlayout.php:123
+#: ../../mod/editwebpage.php:170 ../../mod/editpost.php:120
+#: ../../mod/editblock.php:138
+msgid "Categories (comma-separated list)"
+msgstr ""
+
+#: ../../include/conversation.php:1117 ../../mod/editlayout.php:110
+#: ../../mod/editwebpage.php:153 ../../mod/editpost.php:107
+#: ../../mod/editblock.php:124
+msgid "Permission settings"
+msgstr ""
+
+#: ../../include/conversation.php:1118
+msgid "permissions"
+msgstr ""
+
+#: ../../include/conversation.php:1126 ../../mod/editlayout.php:118
+#: ../../mod/editwebpage.php:163 ../../mod/editpost.php:115
+#: ../../mod/editblock.php:133
+msgid "Public post"
+msgstr ""
+
+#: ../../include/conversation.php:1128 ../../mod/editlayout.php:124
+#: ../../mod/editwebpage.php:171 ../../mod/editpost.php:121
+#: ../../mod/editblock.php:139
+msgid "Example: bob@example.com, mary@example.com"
+msgstr ""
+
+#: ../../include/conversation.php:1141 ../../mod/message.php:336
+#: ../../mod/message.php:487 ../../mod/editlayout.php:134
+#: ../../mod/editwebpage.php:181 ../../mod/editpost.php:132
+#: ../../mod/editblock.php:149
+msgid "Set expiration date"
+msgstr ""
+
+#: ../../include/conversation.php:1368
+msgid "Commented Order"
+msgstr ""
+
+#: ../../include/conversation.php:1371
+msgid "Sort by Comment Date"
+msgstr ""
+
+#: ../../include/conversation.php:1374
+msgid "Posted Order"
+msgstr ""
+
+#: ../../include/conversation.php:1377
+msgid "Sort by Post Date"
+msgstr ""
+
+#: ../../include/conversation.php:1381
+msgid "Personal"
+msgstr ""
+
+#: ../../include/conversation.php:1384
+msgid "Posts that mention or involve you"
+msgstr ""
+
+#: ../../include/conversation.php:1387 ../../mod/menu.php:57
+#: ../../mod/connections.php:556
+msgid "New"
+msgstr ""
+
+#: ../../include/conversation.php:1390
+msgid "Activity Stream - by date"
+msgstr ""
+
+#: ../../include/conversation.php:1397
+msgid "Starred"
+msgstr ""
+
+#: ../../include/conversation.php:1400
+msgid "Favourite Posts"
+msgstr ""
+
+#: ../../include/conversation.php:1407
+msgid "Spam"
+msgstr ""
+
+#: ../../include/conversation.php:1410
+msgid "Posts flagged as SPAM"
+msgstr ""
+
+#: ../../include/conversation.php:1440
+msgid "Channel"
+msgstr ""
+
+#: ../../include/conversation.php:1443
+msgid "Status Messages and Posts"
+msgstr ""
+
+#: ../../include/conversation.php:1447
+msgid "About"
+msgstr ""
+
+#: ../../include/conversation.php:1450
+msgid "Profile Details"
+msgstr ""
+
+#: ../../include/conversation.php:1468
+msgid "Events and Calendar"
+msgstr ""
+
+#: ../../include/conversation.php:1473
+msgid "Webpages"
+msgstr ""
+
+#: ../../include/conversation.php:1476
+msgid "Manage Webpages"
+msgstr ""
+
+#: ../../include/auth.php:69
+msgid "Logged out."
+msgstr ""
+
+#: ../../include/auth.php:181
+msgid "Failed authentication"
+msgstr ""
+
+#: ../../include/auth.php:190
+msgid "Login failed."
+msgstr ""
+
+#: ../../include/contact_widgets.php:14
 #, php-format
 msgid "%d invitation available"
 msgid_plural "%d invitations available"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../../include/contact_widgets.php:44
+#: ../../include/contact_widgets.php:20
 msgid "Find Channels"
 msgstr ""
 
-#: ../../include/contact_widgets.php:45
+#: ../../include/contact_widgets.php:21
 msgid "Enter name or interest"
 msgstr ""
 
-#: ../../include/contact_widgets.php:46
+#: ../../include/contact_widgets.php:22
 msgid "Connect/Follow"
 msgstr ""
 
-#: ../../include/contact_widgets.php:47
+#: ../../include/contact_widgets.php:23
 msgid "Examples: Robert Morgenstein, Fishing"
 msgstr ""
 
-#: ../../include/contact_widgets.php:48 ../../mod/connections.php:677
-#: ../../mod/directory.php:221 ../../mod/directory.php:226
+#: ../../include/contact_widgets.php:24 ../../mod/connections.php:700
+#: ../../mod/directory.php:224 ../../mod/directory.php:229
 msgid "Find"
 msgstr ""
 
-#: ../../include/contact_widgets.php:49 ../../mod/suggest.php:64
+#: ../../include/contact_widgets.php:25 ../../mod/suggest.php:66
 msgid "Channel Suggestions"
 msgstr ""
 
-#: ../../include/contact_widgets.php:51
+#: ../../include/contact_widgets.php:27
 msgid "Random Profile"
 msgstr ""
 
-#: ../../include/contact_widgets.php:52
+#: ../../include/contact_widgets.php:28
 msgid "Invite Friends"
 msgstr ""
 
-#: ../../include/contact_widgets.php:79 ../../include/contact_widgets.php:113
-msgid "Everything"
-msgstr ""
-
-#: ../../include/contact_widgets.php:110 ../../include/widgets.php:26
-msgid "Categories"
-msgstr ""
-
-#: ../../include/contact_widgets.php:143
+#: ../../include/contact_widgets.php:119
 #, php-format
 msgid "%d connection in common"
 msgid_plural "%d connections in common"
@@ -2318,6 +2348,321 @@ msgstr[1] ""
 msgid "New Page"
 msgstr ""
 
+#: ../../include/text.php:315
+msgid "prev"
+msgstr ""
+
+#: ../../include/text.php:317
+msgid "first"
+msgstr ""
+
+#: ../../include/text.php:346
+msgid "last"
+msgstr ""
+
+#: ../../include/text.php:349
+msgid "next"
+msgstr ""
+
+#: ../../include/text.php:361
+msgid "older"
+msgstr ""
+
+#: ../../include/text.php:363
+msgid "newer"
+msgstr ""
+
+#: ../../include/text.php:654
+msgid "No connections"
+msgstr ""
+
+#: ../../include/text.php:665
+#, php-format
+msgid "%d Connection"
+msgid_plural "%d Connections"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../../include/text.php:677
+msgid "View Connections"
+msgstr ""
+
+#: ../../include/text.php:790
+msgid "poke"
+msgstr ""
+
+#: ../../include/text.php:791
+msgid "ping"
+msgstr ""
+
+#: ../../include/text.php:791
+msgid "pinged"
+msgstr ""
+
+#: ../../include/text.php:792
+msgid "prod"
+msgstr ""
+
+#: ../../include/text.php:792
+msgid "prodded"
+msgstr ""
+
+#: ../../include/text.php:793
+msgid "slap"
+msgstr ""
+
+#: ../../include/text.php:793
+msgid "slapped"
+msgstr ""
+
+#: ../../include/text.php:794
+msgid "finger"
+msgstr ""
+
+#: ../../include/text.php:794
+msgid "fingered"
+msgstr ""
+
+#: ../../include/text.php:795
+msgid "rebuff"
+msgstr ""
+
+#: ../../include/text.php:795
+msgid "rebuffed"
+msgstr ""
+
+#: ../../include/text.php:807
+msgid "happy"
+msgstr ""
+
+#: ../../include/text.php:808
+msgid "sad"
+msgstr ""
+
+#: ../../include/text.php:809
+msgid "mellow"
+msgstr ""
+
+#: ../../include/text.php:810
+msgid "tired"
+msgstr ""
+
+#: ../../include/text.php:811
+msgid "perky"
+msgstr ""
+
+#: ../../include/text.php:812
+msgid "angry"
+msgstr ""
+
+#: ../../include/text.php:813
+msgid "stupified"
+msgstr ""
+
+#: ../../include/text.php:814
+msgid "puzzled"
+msgstr ""
+
+#: ../../include/text.php:815
+msgid "interested"
+msgstr ""
+
+#: ../../include/text.php:816
+msgid "bitter"
+msgstr ""
+
+#: ../../include/text.php:817
+msgid "cheerful"
+msgstr ""
+
+#: ../../include/text.php:818
+msgid "alive"
+msgstr ""
+
+#: ../../include/text.php:819
+msgid "annoyed"
+msgstr ""
+
+#: ../../include/text.php:820
+msgid "anxious"
+msgstr ""
+
+#: ../../include/text.php:821
+msgid "cranky"
+msgstr ""
+
+#: ../../include/text.php:822
+msgid "disturbed"
+msgstr ""
+
+#: ../../include/text.php:823
+msgid "frustrated"
+msgstr ""
+
+#: ../../include/text.php:824
+msgid "motivated"
+msgstr ""
+
+#: ../../include/text.php:825
+msgid "relaxed"
+msgstr ""
+
+#: ../../include/text.php:826
+msgid "surprised"
+msgstr ""
+
+#: ../../include/text.php:988
+msgid "Monday"
+msgstr ""
+
+#: ../../include/text.php:988
+msgid "Tuesday"
+msgstr ""
+
+#: ../../include/text.php:988
+msgid "Wednesday"
+msgstr ""
+
+#: ../../include/text.php:988
+msgid "Thursday"
+msgstr ""
+
+#: ../../include/text.php:988
+msgid "Friday"
+msgstr ""
+
+#: ../../include/text.php:988
+msgid "Saturday"
+msgstr ""
+
+#: ../../include/text.php:988
+msgid "Sunday"
+msgstr ""
+
+#: ../../include/text.php:992
+msgid "January"
+msgstr ""
+
+#: ../../include/text.php:992
+msgid "February"
+msgstr ""
+
+#: ../../include/text.php:992
+msgid "March"
+msgstr ""
+
+#: ../../include/text.php:992
+msgid "April"
+msgstr ""
+
+#: ../../include/text.php:992
+msgid "May"
+msgstr ""
+
+#: ../../include/text.php:992
+msgid "June"
+msgstr ""
+
+#: ../../include/text.php:992
+msgid "July"
+msgstr ""
+
+#: ../../include/text.php:992
+msgid "August"
+msgstr ""
+
+#: ../../include/text.php:992
+msgid "September"
+msgstr ""
+
+#: ../../include/text.php:992
+msgid "October"
+msgstr ""
+
+#: ../../include/text.php:992
+msgid "November"
+msgstr ""
+
+#: ../../include/text.php:992
+msgid "December"
+msgstr ""
+
+#: ../../include/text.php:1070
+msgid "unknown.???"
+msgstr ""
+
+#: ../../include/text.php:1071
+msgid "bytes"
+msgstr ""
+
+#: ../../include/text.php:1106
+msgid "remove category"
+msgstr ""
+
+#: ../../include/text.php:1128
+msgid "remove from file"
+msgstr ""
+
+#: ../../include/text.php:1182 ../../include/text.php:1194
+msgid "Click to open/close"
+msgstr ""
+
+#: ../../include/text.php:1370 ../../mod/events.php:332
+msgid "link to source"
+msgstr ""
+
+#: ../../include/text.php:1389
+msgid "Select a page layout: "
+msgstr ""
+
+#: ../../include/text.php:1392 ../../include/text.php:1457
+msgid "default"
+msgstr ""
+
+#: ../../include/text.php:1428
+msgid "Page content type: "
+msgstr ""
+
+#: ../../include/text.php:1469
+msgid "Select an alternate language"
+msgstr ""
+
+#: ../../include/text.php:1634
+msgid "activity"
+msgstr ""
+
+#: ../../include/text.php:1896
+msgid "Design"
+msgstr ""
+
+#: ../../include/text.php:1898
+msgid "Blocks"
+msgstr ""
+
+#: ../../include/text.php:1899
+msgid "Menus"
+msgstr ""
+
+#: ../../include/text.php:1900
+msgid "Layouts"
+msgstr ""
+
+#: ../../include/text.php:1901
+msgid "Pages"
+msgstr ""
+
+#: ../../include/plugin.php:475 ../../include/plugin.php:477
+msgid "Click here to upgrade."
+msgstr ""
+
+#: ../../include/plugin.php:483
+msgid "This action exceeds the limits set by your subscription plan."
+msgstr ""
+
+#: ../../include/plugin.php:488
+msgid "This action is not available under your subscription plan."
+msgstr ""
+
 #: ../../include/follow.php:21
 msgid "Channel is blocked on this site."
 msgstr ""
@@ -2430,314 +2775,236 @@ msgstr ""
 msgid "Extremely advanced. Leave this alone unless you know what you are doing"
 msgstr ""
 
-#: ../../include/taxonomy.php:210
-msgid "Tags"
-msgstr ""
-
-#: ../../include/taxonomy.php:224
-msgid "Keywords"
-msgstr ""
-
-#: ../../include/taxonomy.php:249
-msgid "have"
-msgstr ""
-
-#: ../../include/taxonomy.php:249
-msgid "has"
-msgstr ""
-
-#: ../../include/taxonomy.php:250
-msgid "want"
-msgstr ""
-
-#: ../../include/taxonomy.php:250
-msgid "wants"
-msgstr ""
-
-#: ../../include/taxonomy.php:251
-msgid "likes"
-msgstr ""
-
-#: ../../include/taxonomy.php:252
-msgid "dislikes"
-msgstr ""
-
-#: ../../include/plugin.php:440 ../../include/plugin.php:442
-msgid "Click here to upgrade."
-msgstr ""
-
-#: ../../include/plugin.php:448
-msgid "This action exceeds the limits set by your subscription plan."
-msgstr ""
-
-#: ../../include/plugin.php:453
-msgid "This action is not available under your subscription plan."
-msgstr ""
-
-#: ../../include/comanche.php:35 ../../view/theme/redbasic/php/config.php:56
+#: ../../include/comanche.php:35 ../../view/theme/redbasic/php/config.php:62
 #: ../../view/theme/apw/php/config.php:176
 msgid "Default"
 msgstr ""
 
-#: ../../include/conversation.php:123
-msgid "channel"
-msgstr ""
-
-#: ../../include/conversation.php:161 ../../mod/like.php:134
-#, php-format
-msgid "%1$s likes %2$s's %3$s"
+#: ../../include/identity.php:29 ../../mod/item.php:1151
+msgid "Unable to obtain identity information from database"
 msgstr ""
 
-#: ../../include/conversation.php:164 ../../mod/like.php:136
-#, php-format
-msgid "%1$s doesn't like %2$s's %3$s"
+#: ../../include/identity.php:62
+msgid "Empty name"
 msgstr ""
 
-#: ../../include/conversation.php:201
-#, php-format
-msgid "%1$s is now connected with %2$s"
+#: ../../include/identity.php:64
+msgid "Name too long"
 msgstr ""
 
-#: ../../include/conversation.php:232
-#, php-format
-msgid "%1$s poked %2$s"
+#: ../../include/identity.php:132
+msgid "No account identifier"
 msgstr ""
 
-#: ../../include/conversation.php:254 ../../mod/mood.php:63
-#, php-format
-msgid "%1$s is currently %2$s"
+#: ../../include/identity.php:142
+msgid "Nickname is required."
 msgstr ""
 
-#: ../../include/conversation.php:658
-#, php-format
-msgid "View %s's profile @ %s"
+#: ../../include/identity.php:156
+msgid ""
+"Nickname has unsupported characters or is already being used on this site."
 msgstr ""
 
-#: ../../include/conversation.php:672
-msgid "Categories:"
+#: ../../include/identity.php:215
+msgid "Unable to retrieve created identity"
 msgstr ""
 
-#: ../../include/conversation.php:673
-msgid "Filed under:"
+#: ../../include/identity.php:273
+msgid "Default Profile"
 msgstr ""
 
-#: ../../include/conversation.php:700
-msgid "View in context"
+#: ../../include/identity.php:465
+msgid "Requested channel is not available."
 msgstr ""
 
-#: ../../include/conversation.php:826
-msgid "remove"
+#: ../../include/identity.php:477
+msgid " Sorry, you don't have the permission to view this profile. "
 msgstr ""
 
-#: ../../include/conversation.php:830
-msgid "Loading..."
+#: ../../include/identity.php:512 ../../mod/webpages.php:8
+#: ../../mod/connect.php:13 ../../mod/layouts.php:8
+#: ../../mod/filestorage.php:8 ../../mod/blocks.php:10
+#: ../../mod/profile.php:16
+msgid "Requested profile is not available."
 msgstr ""
 
-#: ../../include/conversation.php:831
-msgid "Delete Selected Items"
+#: ../../include/identity.php:627 ../../mod/profiles.php:613
+msgid "Change profile photo"
 msgstr ""
 
-#: ../../include/conversation.php:922
-msgid "View Source"
+#: ../../include/identity.php:633
+msgid "Profiles"
 msgstr ""
 
-#: ../../include/conversation.php:923
-msgid "Follow Thread"
+#: ../../include/identity.php:633
+msgid "Manage/edit profiles"
 msgstr ""
 
-#: ../../include/conversation.php:927
-msgid "Matrix Activity"
+#: ../../include/identity.php:634 ../../mod/profiles.php:614
+msgid "Create New Profile"
 msgstr ""
 
-#: ../../include/conversation.php:992
-#, php-format
-msgid "%s likes this."
+#: ../../include/identity.php:637
+msgid "Edit Profile"
 msgstr ""
 
-#: ../../include/conversation.php:992
-#, php-format
-msgid "%s doesn't like this."
+#: ../../include/identity.php:648 ../../mod/profiles.php:625
+msgid "Profile Image"
 msgstr ""
 
-#: ../../include/conversation.php:996
-#, php-format
-msgid "<span  %1$s>%2$d people</span> like this."
+#: ../../include/identity.php:651 ../../mod/profiles.php:628
+msgid "visible to everybody"
 msgstr ""
 
-#: ../../include/conversation.php:998
-#, php-format
-msgid "<span  %1$s>%2$d people</span> don't like this."
+#: ../../include/identity.php:652 ../../mod/profiles.php:629
+msgid "Edit visibility"
 msgstr ""
 
-#: ../../include/conversation.php:1004
-msgid "and"
+#: ../../include/identity.php:666 ../../include/identity.php:891
+#: ../../mod/directory.php:176
+msgid "Gender:"
 msgstr ""
 
-#: ../../include/conversation.php:1007
-#, php-format
-msgid ", and %d other people"
+#: ../../include/identity.php:667 ../../include/identity.php:911
+#: ../../mod/directory.php:178
+msgid "Status:"
 msgstr ""
 
-#: ../../include/conversation.php:1008
-#, php-format
-msgid "%s like this."
+#: ../../include/identity.php:668 ../../include/identity.php:922
+#: ../../mod/directory.php:180
+msgid "Homepage:"
 msgstr ""
 
-#: ../../include/conversation.php:1008
-#, php-format
-msgid "%s don't like this."
+#: ../../include/identity.php:735 ../../include/identity.php:815
+#: ../../mod/ping.php:230
+msgid "g A l F d"
 msgstr ""
 
-#: ../../include/conversation.php:1058
-msgid "Visible to <strong>everybody</strong>"
+#: ../../include/identity.php:736 ../../include/identity.php:816
+msgid "F d"
 msgstr ""
 
-#: ../../include/conversation.php:1059 ../../mod/message.php:281
-#: ../../mod/message.php:417
-msgid "Please enter a link URL:"
+#: ../../include/identity.php:781 ../../include/identity.php:856
+#: ../../mod/ping.php:252
+msgid "[today]"
 msgstr ""
 
-#: ../../include/conversation.php:1060
-msgid "Please enter a video link/URL:"
+#: ../../include/identity.php:793
+msgid "Birthday Reminders"
 msgstr ""
 
-#: ../../include/conversation.php:1061
-msgid "Please enter an audio link/URL:"
+#: ../../include/identity.php:794
+msgid "Birthdays this week:"
 msgstr ""
 
-#: ../../include/conversation.php:1062
-msgid "Tag term:"
+#: ../../include/identity.php:849
+msgid "[No description]"
 msgstr ""
 
-#: ../../include/conversation.php:1063 ../../mod/filer.php:35
-msgid "Save to Folder:"
+#: ../../include/identity.php:867
+msgid "Event Reminders"
 msgstr ""
 
-#: ../../include/conversation.php:1064
-msgid "Where are you right now?"
+#: ../../include/identity.php:868
+msgid "Events this week:"
 msgstr ""
 
-#: ../../include/conversation.php:1065 ../../mod/message.php:282
-#: ../../mod/message.php:418 ../../mod/editpost.php:52
-msgid "Expires YYYY-MM-DD HH:MM"
+#: ../../include/identity.php:881 ../../include/identity.php:992
+#: ../../mod/profperm.php:103
+msgid "Profile"
 msgstr ""
 
-#: ../../include/conversation.php:1089 ../../mod/photos.php:1060
-msgid "Share"
+#: ../../include/identity.php:889 ../../mod/settings.php:1013
+msgid "Full Name:"
 msgstr ""
 
-#: ../../include/conversation.php:1091
-msgid "Page link title"
+#: ../../include/identity.php:896
+msgid "j F, Y"
 msgstr ""
 
-#: ../../include/conversation.php:1093 ../../mod/message.php:329
-#: ../../mod/message.php:512 ../../mod/editlayout.php:101
-#: ../../mod/editwebpage.php:120 ../../mod/editpost.php:98
-#: ../../mod/editblock.php:115
-msgid "Upload photo"
+#: ../../include/identity.php:897
+msgid "j F"
 msgstr ""
 
-#: ../../include/conversation.php:1094
-msgid "upload photo"
+#: ../../include/identity.php:904
+msgid "Birthday:"
 msgstr ""
 
-#: ../../include/conversation.php:1095 ../../mod/message.php:330
-#: ../../mod/message.php:513 ../../mod/editlayout.php:102
-#: ../../mod/editwebpage.php:121 ../../mod/editpost.php:99
-#: ../../mod/editblock.php:116
-msgid "Attach file"
+#: ../../include/identity.php:908
+msgid "Age:"
 msgstr ""
 
-#: ../../include/conversation.php:1096
-msgid "attach file"
+#: ../../include/identity.php:917
+#, php-format
+msgid "for %1$d %2$s"
 msgstr ""
 
-#: ../../include/conversation.php:1097 ../../mod/message.php:331
-#: ../../mod/message.php:514 ../../mod/editlayout.php:103
-#: ../../mod/editwebpage.php:122 ../../mod/editpost.php:100
-#: ../../mod/editblock.php:117
-msgid "Insert web link"
+#: ../../include/identity.php:920 ../../mod/profiles.php:538
+msgid "Sexual Preference:"
 msgstr ""
 
-#: ../../include/conversation.php:1098
-msgid "web link"
+#: ../../include/identity.php:924 ../../mod/profiles.php:540
+msgid "Hometown:"
 msgstr ""
 
-#: ../../include/conversation.php:1099
-msgid "Insert video link"
+#: ../../include/identity.php:926
+msgid "Tags:"
 msgstr ""
 
-#: ../../include/conversation.php:1100
-msgid "video link"
+#: ../../include/identity.php:928 ../../mod/profiles.php:541
+msgid "Political Views:"
 msgstr ""
 
-#: ../../include/conversation.php:1101
-msgid "Insert audio link"
+#: ../../include/identity.php:930
+msgid "Religion:"
 msgstr ""
 
-#: ../../include/conversation.php:1102
-msgid "audio link"
+#: ../../include/identity.php:932 ../../mod/directory.php:182
+msgid "About:"
 msgstr ""
 
-#: ../../include/conversation.php:1103 ../../mod/editlayout.php:107
-#: ../../mod/editwebpage.php:126 ../../mod/editpost.php:104
-#: ../../mod/editblock.php:121
-msgid "Set your location"
+#: ../../include/identity.php:934
+msgid "Hobbies/Interests:"
 msgstr ""
 
-#: ../../include/conversation.php:1104
-msgid "set location"
+#: ../../include/identity.php:936 ../../mod/profiles.php:544
+msgid "Likes:"
 msgstr ""
 
-#: ../../include/conversation.php:1105 ../../mod/editlayout.php:108
-#: ../../mod/editwebpage.php:127 ../../mod/editpost.php:105
-#: ../../mod/editblock.php:122
-msgid "Clear browser location"
+#: ../../include/identity.php:938 ../../mod/profiles.php:545
+msgid "Dislikes:"
 msgstr ""
 
-#: ../../include/conversation.php:1106
-msgid "clear location"
+#: ../../include/identity.php:941
+msgid "Contact information and Social Networks:"
 msgstr ""
 
-#: ../../include/conversation.php:1108 ../../mod/editlayout.php:121
-#: ../../mod/editwebpage.php:142 ../../mod/editpost.php:118
-#: ../../mod/editblock.php:136
-msgid "Set title"
+#: ../../include/identity.php:943
+msgid "Musical interests:"
 msgstr ""
 
-#: ../../include/conversation.php:1111 ../../mod/editlayout.php:123
-#: ../../mod/editwebpage.php:144 ../../mod/editpost.php:120
-#: ../../mod/editblock.php:138
-msgid "Categories (comma-separated list)"
+#: ../../include/identity.php:945
+msgid "Books, literature:"
 msgstr ""
 
-#: ../../include/conversation.php:1113 ../../mod/editlayout.php:110
-#: ../../mod/editwebpage.php:129 ../../mod/editpost.php:107
-#: ../../mod/editblock.php:124
-msgid "Permission settings"
+#: ../../include/identity.php:947
+msgid "Television:"
 msgstr ""
 
-#: ../../include/conversation.php:1114
-msgid "permissions"
+#: ../../include/identity.php:949
+msgid "Film/dance/culture/entertainment:"
 msgstr ""
 
-#: ../../include/conversation.php:1122 ../../mod/editlayout.php:118
-#: ../../mod/editwebpage.php:137 ../../mod/editpost.php:115
-#: ../../mod/editblock.php:133
-msgid "Public post"
+#: ../../include/identity.php:951
+msgid "Love/Romance:"
 msgstr ""
 
-#: ../../include/conversation.php:1124 ../../mod/editlayout.php:124
-#: ../../mod/editwebpage.php:145 ../../mod/editpost.php:121
-#: ../../mod/editblock.php:139
-msgid "Example: bob@example.com, mary@example.com"
+#: ../../include/identity.php:953
+msgid "Work/employment:"
 msgstr ""
 
-#: ../../include/conversation.php:1137 ../../mod/message.php:336
-#: ../../mod/message.php:519 ../../mod/editlayout.php:134
-#: ../../mod/editwebpage.php:155 ../../mod/editpost.php:132
-#: ../../mod/editblock.php:149
-msgid "Set expiration date"
+#: ../../include/identity.php:955
+msgid "School/education:"
 msgstr ""
 
 #: ../../include/security.php:49
@@ -2759,138 +3026,116 @@ msgid ""
 msgstr ""
 
 #: ../../include/items.php:201 ../../mod/like.php:55 ../../mod/group.php:74
-#: ../../mod/profperm.php:28 ../../index.php:339
+#: ../../mod/profperm.php:19 ../../index.php:345
 msgid "Permission denied"
 msgstr ""
 
-#: ../../include/items.php:3521 ../../mod/admin.php:150
-#: ../../mod/admin.php:714 ../../mod/admin.php:917 ../../mod/viewsrc.php:18
+#: ../../include/items.php:3367 ../../mod/admin.php:150
+#: ../../mod/admin.php:730 ../../mod/admin.php:933 ../../mod/viewsrc.php:18
 #: ../../mod/home.php:64 ../../mod/display.php:32
 msgid "Item not found."
 msgstr ""
 
-#: ../../include/items.php:3693
-msgid "Archives"
-msgstr ""
-
-#: ../../include/items.php:3854 ../../mod/group.php:44 ../../mod/group.php:146
+#: ../../include/items.php:3718 ../../mod/group.php:44 ../../mod/group.php:146
 msgid "Collection not found."
 msgstr ""
 
-#: ../../include/items.php:3870 ../../mod/network.php:469
-msgid "Group is empty"
-msgstr ""
-
-#: ../../include/items.php:3886
-msgid "Connection not found."
-msgstr ""
-
-#: ../../include/dir_fns.php:15
-msgid "Sort Options"
+#: ../../include/items.php:3733
+msgid "Collection is empty."
 msgstr ""
 
-#: ../../include/dir_fns.php:16
-msgid "Alphabetic"
-msgstr ""
-
-#: ../../include/dir_fns.php:17
-msgid "Reverse Alphabetic"
-msgstr ""
-
-#: ../../include/dir_fns.php:18
-msgid "Newest to Oldest"
-msgstr ""
-
-#: ../../include/dir_fns.php:29
-msgid "Enable Safe Search"
+#: ../../include/items.php:3740
+#, php-format
+msgid "Collection: %s"
 msgstr ""
 
-#: ../../include/dir_fns.php:31
-msgid "Disable Safe Search"
+#: ../../include/items.php:3751
+#, php-format
+msgid "Connection: %s"
 msgstr ""
 
-#: ../../include/dir_fns.php:33
-msgid "Safe Mode"
+#: ../../include/items.php:3754
+msgid "Connection not found."
 msgstr ""
 
 #: ../../mod/common.php:10
 msgid "No channel."
 msgstr ""
 
-#: ../../mod/common.php:47
+#: ../../mod/common.php:39
 msgid "Common connections"
 msgstr ""
 
-#: ../../mod/common.php:52
+#: ../../mod/common.php:44
 msgid "No connections in common."
 msgstr ""
 
-#: ../../mod/events.php:66
+#: ../../mod/events.php:72
 msgid "Event title and start time are required."
 msgstr ""
 
-#: ../../mod/events.php:281
+#: ../../mod/events.php:287
 msgid "l, F j"
 msgstr ""
 
-#: ../../mod/events.php:303
+#: ../../mod/events.php:309
 msgid "Edit event"
 msgstr ""
 
-#: ../../mod/events.php:349
+#: ../../mod/events.php:355
 msgid "Create New Event"
 msgstr ""
 
-#: ../../mod/events.php:350
+#: ../../mod/events.php:356
 msgid "Previous"
 msgstr ""
 
-#: ../../mod/events.php:351 ../../mod/setup.php:256
+#: ../../mod/events.php:357 ../../mod/setup.php:256
 msgid "Next"
 msgstr ""
 
-#: ../../mod/events.php:425
+#: ../../mod/events.php:429
 msgid "hour:minute"
 msgstr ""
 
-#: ../../mod/events.php:435
+#: ../../mod/events.php:448
 msgid "Event details"
 msgstr ""
 
-#: ../../mod/events.php:436
+#: ../../mod/events.php:449
 #, php-format
 msgid "Format is %s %s. Starting date and Title are required."
 msgstr ""
 
-#: ../../mod/events.php:438
+#: ../../mod/events.php:451
 msgid "Event Starts:"
 msgstr ""
 
-#: ../../mod/events.php:438 ../../mod/events.php:452
+#: ../../mod/events.php:451 ../../mod/events.php:465
 msgid "Required"
 msgstr ""
 
-#: ../../mod/events.php:441
+#: ../../mod/events.php:454
 msgid "Finish date/time is not known or not relevant"
 msgstr ""
 
-#: ../../mod/events.php:443
+#: ../../mod/events.php:456
 msgid "Event Finishes:"
 msgstr ""
 
-#: ../../mod/events.php:446
+#: ../../mod/events.php:459
 msgid "Adjust for viewer timezone"
 msgstr ""
 
-#: ../../mod/events.php:448
+#: ../../mod/events.php:461
 msgid "Description:"
 msgstr ""
 
-#: ../../mod/events.php:452
+#: ../../mod/events.php:465
 msgid "Title:"
 msgstr ""
 
-#: ../../mod/events.php:454
+#: ../../mod/events.php:467
 msgid "Share this event"
 msgstr ""
 
@@ -2977,7 +3222,7 @@ msgid "Enter email addresses, one per line:"
 msgstr ""
 
 #: ../../mod/invite.php:141 ../../mod/message.php:326
-#: ../../mod/message.php:508
+#: ../../mod/message.php:476
 msgid "Your message:"
 msgstr ""
 
@@ -3022,13 +3267,7 @@ msgstr ""
 msgid "No friends to display."
 msgstr ""
 
-#: ../../mod/webpages.php:8 ../../mod/connect.php:13 ../../mod/layouts.php:8
-#: ../../mod/filestorage.php:8 ../../mod/blocks.php:10 ../../mod/profile.php:8
-#: ../../boot.php:1644
-msgid "Requested profile is not available."
-msgstr ""
-
-#: ../../mod/webpages.php:104 ../../mod/layouts.php:105
+#: ../../mod/webpages.php:121 ../../mod/layouts.php:105
 #: ../../mod/blocks.php:96
 msgid "View"
 msgstr ""
@@ -3051,24 +3290,16 @@ msgid ""
 "and/or create new posts for you?"
 msgstr ""
 
-#: ../../mod/api.php:105 ../../mod/settings.php:1008
-#: ../../mod/settings.php:1013 ../../mod/settings.php:1036
-#: ../../mod/settings.php:1038 ../../mod/settings.php:1039
-#: ../../mod/settings.php:1040 ../../mod/profiles.php:506
+#: ../../mod/api.php:105 ../../mod/settings.php:967 ../../mod/settings.php:972
+#: ../../mod/profiles.php:495
 msgid "Yes"
 msgstr ""
 
-#: ../../mod/api.php:106 ../../mod/settings.php:1008
-#: ../../mod/settings.php:1013 ../../mod/settings.php:1036
-#: ../../mod/settings.php:1038 ../../mod/settings.php:1039
-#: ../../mod/settings.php:1040 ../../mod/profiles.php:507
+#: ../../mod/api.php:106 ../../mod/settings.php:967 ../../mod/settings.php:972
+#: ../../mod/profiles.php:496
 msgid "No"
 msgstr ""
 
-#: ../../mod/lastpost.php:16 ../../mod/channel.php:16
-msgid "You must be logged in to see this page."
-msgstr ""
-
 #: ../../mod/apps.php:8
 msgid "No installed applications."
 msgstr ""
@@ -3082,11 +3313,11 @@ msgid "Invalid item."
 msgstr ""
 
 #: ../../mod/page.php:47 ../../mod/chanview.php:78 ../../mod/home.php:51
-#: ../../mod/magic.php:77 ../../mod/wall_upload.php:35
+#: ../../mod/wall_upload.php:35
 msgid "Channel not found."
 msgstr ""
 
-#: ../../mod/page.php:83 ../../mod/help.php:41 ../../mod/display.php:92
+#: ../../mod/page.php:83 ../../mod/help.php:56 ../../mod/display.php:100
 #: ../../index.php:229
 msgid "Page not found."
 msgstr ""
@@ -3429,7 +3660,7 @@ msgid ""
 "IMPORTANT: You will need to [manually] setup a scheduled task for the poller."
 msgstr ""
 
-#: ../../mod/rpost.php:83 ../../mod/editpost.php:42
+#: ../../mod/rpost.php:84 ../../mod/editpost.php:42
 msgid "Edit post"
 msgstr ""
 
@@ -3489,439 +3720,407 @@ msgstr ""
 msgid "Premium Channel Settings"
 msgstr ""
 
-#: ../../mod/settings.php:171
+#: ../../mod/settings.php:173
 msgid "Name is required"
 msgstr ""
 
-#: ../../mod/settings.php:175
+#: ../../mod/settings.php:177
 msgid "Key and Secret are required"
 msgstr ""
 
-#: ../../mod/settings.php:179 ../../mod/settings.php:676
+#: ../../mod/settings.php:181 ../../mod/settings.php:635
 msgid "Update"
 msgstr ""
 
-#: ../../mod/settings.php:292
+#: ../../mod/settings.php:294
 msgid "Passwords do not match. Password unchanged."
 msgstr ""
 
-#: ../../mod/settings.php:296
+#: ../../mod/settings.php:298
 msgid "Empty passwords are not allowed. Password unchanged."
 msgstr ""
 
-#: ../../mod/settings.php:309
+#: ../../mod/settings.php:311
 msgid "Password changed."
 msgstr ""
 
-#: ../../mod/settings.php:311
+#: ../../mod/settings.php:313
 msgid "Password update failed. Please try again."
 msgstr ""
 
-#: ../../mod/settings.php:325
+#: ../../mod/settings.php:327
 msgid "Not valid email."
 msgstr ""
 
-#: ../../mod/settings.php:328
+#: ../../mod/settings.php:330
 msgid "Protected email address. Cannot change to that email."
 msgstr ""
 
-#: ../../mod/settings.php:337
+#: ../../mod/settings.php:339
 msgid "System failure storing new email. Please try again."
 msgstr ""
 
-#: ../../mod/settings.php:578
+#: ../../mod/settings.php:537
 msgid "Settings updated."
 msgstr ""
 
-#: ../../mod/settings.php:649 ../../mod/settings.php:675
-#: ../../mod/settings.php:711
+#: ../../mod/settings.php:608 ../../mod/settings.php:634
+#: ../../mod/settings.php:670
 msgid "Add application"
 msgstr ""
 
-#: ../../mod/settings.php:651 ../../mod/settings.php:677
+#: ../../mod/settings.php:610 ../../mod/settings.php:636
 #: ../../mod/tagrm.php:11 ../../mod/tagrm.php:94 ../../mod/fbrowser.php:82
 #: ../../mod/fbrowser.php:117
 msgid "Cancel"
 msgstr ""
 
-#: ../../mod/settings.php:652 ../../mod/settings.php:678
-#: ../../mod/admin.php:673 ../../mod/crepair.php:148
+#: ../../mod/settings.php:611 ../../mod/settings.php:637
+#: ../../mod/admin.php:689
 msgid "Name"
 msgstr ""
 
-#: ../../mod/settings.php:652
+#: ../../mod/settings.php:611
 msgid "Name of application"
 msgstr ""
 
-#: ../../mod/settings.php:653 ../../mod/settings.php:679
+#: ../../mod/settings.php:612 ../../mod/settings.php:638
 msgid "Consumer Key"
 msgstr ""
 
-#: ../../mod/settings.php:653 ../../mod/settings.php:654
+#: ../../mod/settings.php:612 ../../mod/settings.php:613
 msgid "Automatically generated - change if desired. Max length 20"
 msgstr ""
 
-#: ../../mod/settings.php:654 ../../mod/settings.php:680
+#: ../../mod/settings.php:613 ../../mod/settings.php:639
 msgid "Consumer Secret"
 msgstr ""
 
-#: ../../mod/settings.php:655 ../../mod/settings.php:681
+#: ../../mod/settings.php:614 ../../mod/settings.php:640
 msgid "Redirect"
 msgstr ""
 
-#: ../../mod/settings.php:655
+#: ../../mod/settings.php:614
 msgid ""
 "Redirect URI - leave blank unless your application specifically requires this"
 msgstr ""
 
-#: ../../mod/settings.php:656 ../../mod/settings.php:682
+#: ../../mod/settings.php:615 ../../mod/settings.php:641
 msgid "Icon url"
 msgstr ""
 
-#: ../../mod/settings.php:656
+#: ../../mod/settings.php:615
 msgid "Optional"
 msgstr ""
 
-#: ../../mod/settings.php:667
+#: ../../mod/settings.php:626
 msgid "You can't edit this application."
 msgstr ""
 
-#: ../../mod/settings.php:710
+#: ../../mod/settings.php:669
 msgid "Connected Apps"
 msgstr ""
 
-#: ../../mod/settings.php:714
+#: ../../mod/settings.php:673
 msgid "Client key starts with"
 msgstr ""
 
-#: ../../mod/settings.php:715
+#: ../../mod/settings.php:674
 msgid "No name"
 msgstr ""
 
-#: ../../mod/settings.php:716
+#: ../../mod/settings.php:675
 msgid "Remove authorization"
 msgstr ""
 
-#: ../../mod/settings.php:727
+#: ../../mod/settings.php:686
 msgid "No feature settings configured"
 msgstr ""
 
-#: ../../mod/settings.php:735
+#: ../../mod/settings.php:694
 msgid "Feature Settings"
 msgstr ""
 
-#: ../../mod/settings.php:758
+#: ../../mod/settings.php:717
 msgid "Account Settings"
 msgstr ""
 
-#: ../../mod/settings.php:759
+#: ../../mod/settings.php:718
 msgid "Password Settings"
 msgstr ""
 
-#: ../../mod/settings.php:760
+#: ../../mod/settings.php:719
 msgid "New Password:"
 msgstr ""
 
-#: ../../mod/settings.php:761
+#: ../../mod/settings.php:720
 msgid "Confirm:"
 msgstr ""
 
-#: ../../mod/settings.php:761
+#: ../../mod/settings.php:720
 msgid "Leave password fields blank unless changing"
 msgstr ""
 
-#: ../../mod/settings.php:763 ../../mod/settings.php:1062
+#: ../../mod/settings.php:722 ../../mod/settings.php:1014
 msgid "Email Address:"
 msgstr ""
 
-#: ../../mod/settings.php:764
+#: ../../mod/settings.php:723
 msgid "Remove Account"
 msgstr ""
 
-#: ../../mod/settings.php:765
+#: ../../mod/settings.php:724
 msgid "Warning: This action is permanent and cannot be reversed."
 msgstr ""
 
-#: ../../mod/settings.php:781
+#: ../../mod/settings.php:740
 msgid "Off"
 msgstr ""
 
-#: ../../mod/settings.php:781
+#: ../../mod/settings.php:740
 msgid "On"
 msgstr ""
 
-#: ../../mod/settings.php:788
+#: ../../mod/settings.php:747
 msgid "Additional Features"
 msgstr ""
 
-#: ../../mod/settings.php:813
+#: ../../mod/settings.php:772
 msgid "Connector Settings"
 msgstr ""
 
-#: ../../mod/settings.php:843 ../../mod/admin.php:369
+#: ../../mod/settings.php:802 ../../mod/admin.php:371
 msgid "No special theme for mobile devices"
 msgstr ""
 
-#: ../../mod/settings.php:883
+#: ../../mod/settings.php:842
 msgid "Display Settings"
 msgstr ""
 
-#: ../../mod/settings.php:889
+#: ../../mod/settings.php:848
 msgid "Display Theme:"
 msgstr ""
 
-#: ../../mod/settings.php:890
+#: ../../mod/settings.php:849
 msgid "Mobile Theme:"
 msgstr ""
 
-#: ../../mod/settings.php:891
+#: ../../mod/settings.php:850
 msgid "Update browser every xx seconds"
 msgstr ""
 
-#: ../../mod/settings.php:891
+#: ../../mod/settings.php:850
 msgid "Minimum of 10 seconds, no maximum"
 msgstr ""
 
-#: ../../mod/settings.php:892
+#: ../../mod/settings.php:851
 msgid "Maximum number of conversations to load at any time:"
 msgstr ""
 
-#: ../../mod/settings.php:892
+#: ../../mod/settings.php:851
 msgid "Maximum of 100 items"
 msgstr ""
 
-#: ../../mod/settings.php:893
+#: ../../mod/settings.php:852
 msgid "Don't show emoticons"
 msgstr ""
 
-#: ../../mod/settings.php:929
+#: ../../mod/settings.php:888
 msgid "Nobody except yourself"
 msgstr ""
 
-#: ../../mod/settings.php:930
+#: ../../mod/settings.php:889
 msgid "Only those you specifically allow"
 msgstr ""
 
-#: ../../mod/settings.php:931
+#: ../../mod/settings.php:890
 msgid "Anybody in your address book"
 msgstr ""
 
-#: ../../mod/settings.php:932
+#: ../../mod/settings.php:891
 msgid "Anybody on this website"
 msgstr ""
 
-#: ../../mod/settings.php:933
+#: ../../mod/settings.php:892
 msgid "Anybody in this network"
 msgstr ""
 
-#: ../../mod/settings.php:934
+#: ../../mod/settings.php:893
 msgid "Anybody on the internet"
 msgstr ""
 
-#: ../../mod/settings.php:1008
+#: ../../mod/settings.php:967
 msgid "Publish your default profile in the network directory"
 msgstr ""
 
-#: ../../mod/settings.php:1013
+#: ../../mod/settings.php:972
 msgid "Allow us to suggest you as a potential friend to new members?"
 msgstr ""
 
-#: ../../mod/settings.php:1017 ../../mod/profile_photo.php:298
+#: ../../mod/settings.php:976 ../../mod/profile_photo.php:288
 msgid "or"
 msgstr ""
 
-#: ../../mod/settings.php:1022
+#: ../../mod/settings.php:981
 msgid "Your channel address is"
 msgstr ""
 
-#: ../../mod/settings.php:1033
-msgid "Automatically expire posts after this many days:"
-msgstr ""
-
-#: ../../mod/settings.php:1033
-msgid "If empty, posts will not expire. Expired posts will be deleted"
-msgstr ""
-
-#: ../../mod/settings.php:1034
-msgid "Advanced expiration settings"
-msgstr ""
-
-#: ../../mod/settings.php:1035
-msgid "Advanced Expiration"
-msgstr ""
-
-#: ../../mod/settings.php:1036
-msgid "Expire posts:"
-msgstr ""
-
-#: ../../mod/settings.php:1038
-msgid "Expire starred posts:"
-msgstr ""
-
-#: ../../mod/settings.php:1039
-msgid "Expire photos:"
-msgstr ""
-
-#: ../../mod/settings.php:1040
-msgid "Only expire posts by others:"
-msgstr ""
-
-#: ../../mod/settings.php:1051
+#: ../../mod/settings.php:1003
 msgid "Channel Settings"
 msgstr ""
 
-#: ../../mod/settings.php:1060
+#: ../../mod/settings.php:1012
 msgid "Basic Settings"
 msgstr ""
 
-#: ../../mod/settings.php:1063
+#: ../../mod/settings.php:1015
 msgid "Your Timezone:"
 msgstr ""
 
-#: ../../mod/settings.php:1064
+#: ../../mod/settings.php:1016
 msgid "Default Post Location:"
 msgstr ""
 
-#: ../../mod/settings.php:1065
+#: ../../mod/settings.php:1017
 msgid "Use Browser Location:"
 msgstr ""
 
-#: ../../mod/settings.php:1067
+#: ../../mod/settings.php:1019
 msgid "Adult Content"
 msgstr ""
 
-#: ../../mod/settings.php:1067
+#: ../../mod/settings.php:1019
 msgid "This channel publishes adult content."
 msgstr ""
 
-#: ../../mod/settings.php:1069
+#: ../../mod/settings.php:1021
 msgid "Security and Privacy Settings"
 msgstr ""
 
-#: ../../mod/settings.php:1071
+#: ../../mod/settings.php:1023
 msgid "Quick Privacy Settings:"
 msgstr ""
 
-#: ../../mod/settings.php:1072
+#: ../../mod/settings.php:1024
 msgid "Very Public - extremely permissive"
 msgstr ""
 
-#: ../../mod/settings.php:1073
+#: ../../mod/settings.php:1025
 msgid "Typical - default public, privacy when desired"
 msgstr ""
 
-#: ../../mod/settings.php:1074
+#: ../../mod/settings.php:1026
 msgid "Private - default private, rarely open or public"
 msgstr ""
 
-#: ../../mod/settings.php:1075
+#: ../../mod/settings.php:1027
 msgid "Blocked - default blocked to/from everybody"
 msgstr ""
 
-#: ../../mod/settings.php:1078
+#: ../../mod/settings.php:1030
 msgid "Maximum Friend Requests/Day:"
 msgstr ""
 
-#: ../../mod/settings.php:1078
+#: ../../mod/settings.php:1030
 msgid "May reduce spam activity"
 msgstr ""
 
-#: ../../mod/settings.php:1079
+#: ../../mod/settings.php:1031
 msgid "Default Post Permissions"
 msgstr ""
 
-#: ../../mod/settings.php:1080
+#: ../../mod/settings.php:1032 ../../mod/mitem.php:137 ../../mod/mitem.php:180
 msgid "(click to open/close)"
 msgstr ""
 
-#: ../../mod/settings.php:1093
+#: ../../mod/settings.php:1043
 msgid "Maximum private messages per day from unknown people:"
 msgstr ""
 
-#: ../../mod/settings.php:1093
+#: ../../mod/settings.php:1043
 msgid "Useful to reduce spamming"
 msgstr ""
 
-#: ../../mod/settings.php:1096
+#: ../../mod/settings.php:1046
 msgid "Notification Settings"
 msgstr ""
 
-#: ../../mod/settings.php:1097
+#: ../../mod/settings.php:1047
 msgid "By default post a status message when:"
 msgstr ""
 
-#: ../../mod/settings.php:1098
+#: ../../mod/settings.php:1048
 msgid "accepting a friend request"
 msgstr ""
 
-#: ../../mod/settings.php:1099
+#: ../../mod/settings.php:1049
 msgid "joining a forum/community"
 msgstr ""
 
-#: ../../mod/settings.php:1100
+#: ../../mod/settings.php:1050
 msgid "making an <em>interesting</em> profile change"
 msgstr ""
 
-#: ../../mod/settings.php:1101
+#: ../../mod/settings.php:1051
 msgid "Send a notification email when:"
 msgstr ""
 
-#: ../../mod/settings.php:1102
+#: ../../mod/settings.php:1052
 msgid "You receive an introduction"
 msgstr ""
 
-#: ../../mod/settings.php:1103
+#: ../../mod/settings.php:1053
 msgid "Your introductions are confirmed"
 msgstr ""
 
-#: ../../mod/settings.php:1104
+#: ../../mod/settings.php:1054
 msgid "Someone writes on your profile wall"
 msgstr ""
 
-#: ../../mod/settings.php:1105
+#: ../../mod/settings.php:1055
 msgid "Someone writes a followup comment"
 msgstr ""
 
-#: ../../mod/settings.php:1106
+#: ../../mod/settings.php:1056
 msgid "You receive a private message"
 msgstr ""
 
-#: ../../mod/settings.php:1107
+#: ../../mod/settings.php:1057
 msgid "You receive a friend suggestion"
 msgstr ""
 
-#: ../../mod/settings.php:1108
+#: ../../mod/settings.php:1058
 msgid "You are tagged in a post"
 msgstr ""
 
-#: ../../mod/settings.php:1109
+#: ../../mod/settings.php:1059
 msgid "You are poked/prodded/etc. in a post"
 msgstr ""
 
-#: ../../mod/settings.php:1112
+#: ../../mod/settings.php:1062
 msgid "Advanced Account/Page Type Settings"
 msgstr ""
 
-#: ../../mod/settings.php:1113
+#: ../../mod/settings.php:1063
 msgid "Change the behaviour of this account for special situations"
 msgstr ""
 
-#: ../../mod/viewconnections.php:28 ../../mod/photos.php:576
-#: ../../mod/display.php:9 ../../mod/search.php:80 ../../mod/community.php:18
-#: ../../mod/directory.php:32
+#: ../../mod/viewconnections.php:17 ../../mod/search.php:80
+#: ../../mod/photos.php:576 ../../mod/display.php:9 ../../mod/community.php:18
+#: ../../mod/directory.php:33
 msgid "Public access denied."
 msgstr ""
 
-#: ../../mod/viewconnections.php:57
+#: ../../mod/viewconnections.php:43
 msgid "No connections."
 msgstr ""
 
-#: ../../mod/viewconnections.php:69 ../../mod/nogroup.php:40
+#: ../../mod/viewconnections.php:55
 #, php-format
 msgid "Visit %s's profile [%s]"
 msgstr ""
 
-#: ../../mod/viewconnections.php:84
+#: ../../mod/viewconnections.php:70
 msgid "View Connnections"
 msgstr ""
 
@@ -4078,23 +4277,23 @@ msgstr ""
 msgid "Theme settings updated."
 msgstr ""
 
-#: ../../mod/admin.php:87 ../../mod/admin.php:417
+#: ../../mod/admin.php:87 ../../mod/admin.php:419
 msgid "Site"
 msgstr ""
 
-#: ../../mod/admin.php:88 ../../mod/admin.php:669 ../../mod/admin.php:681
+#: ../../mod/admin.php:88 ../../mod/admin.php:685 ../../mod/admin.php:697
 msgid "Users"
 msgstr ""
 
-#: ../../mod/admin.php:89 ../../mod/admin.php:767 ../../mod/admin.php:809
+#: ../../mod/admin.php:89 ../../mod/admin.php:783 ../../mod/admin.php:825
 msgid "Plugins"
 msgstr ""
 
-#: ../../mod/admin.php:90 ../../mod/admin.php:972 ../../mod/admin.php:1008
+#: ../../mod/admin.php:90 ../../mod/admin.php:988 ../../mod/admin.php:1024
 msgid "Themes"
 msgstr ""
 
-#: ../../mod/admin.php:91 ../../mod/admin.php:475
+#: ../../mod/admin.php:91 ../../mod/admin.php:478
 msgid "Server"
 msgstr ""
 
@@ -4102,7 +4301,7 @@ msgstr ""
 msgid "DB updates"
 msgstr ""
 
-#: ../../mod/admin.php:106 ../../mod/admin.php:113 ../../mod/admin.php:1095
+#: ../../mod/admin.php:106 ../../mod/admin.php:113 ../../mod/admin.php:1111
 msgid "Logs"
 msgstr ""
 
@@ -4118,9 +4317,9 @@ msgstr ""
 msgid "Message queues"
 msgstr ""
 
-#: ../../mod/admin.php:193 ../../mod/admin.php:416 ../../mod/admin.php:474
-#: ../../mod/admin.php:668 ../../mod/admin.php:766 ../../mod/admin.php:808
-#: ../../mod/admin.php:971 ../../mod/admin.php:1007 ../../mod/admin.php:1094
+#: ../../mod/admin.php:193 ../../mod/admin.php:418 ../../mod/admin.php:477
+#: ../../mod/admin.php:684 ../../mod/admin.php:782 ../../mod/admin.php:824
+#: ../../mod/admin.php:987 ../../mod/admin.php:1023 ../../mod/admin.php:1110
 msgid "Administration"
 msgstr ""
 
@@ -4132,7 +4331,7 @@ msgstr ""
 msgid "Registered users"
 msgstr ""
 
-#: ../../mod/admin.php:198 ../../mod/admin.php:478
+#: ../../mod/admin.php:198 ../../mod/admin.php:481
 msgid "Pending registrations"
 msgstr ""
 
@@ -4140,579 +4339,581 @@ msgstr ""
 msgid "Version"
 msgstr ""
 
-#: ../../mod/admin.php:201 ../../mod/admin.php:479
+#: ../../mod/admin.php:201 ../../mod/admin.php:482
 msgid "Active plugins"
 msgstr ""
 
-#: ../../mod/admin.php:340
+#: ../../mod/admin.php:342
 msgid "Site settings updated."
 msgstr ""
 
-#: ../../mod/admin.php:371
+#: ../../mod/admin.php:373
 msgid "No special theme for accessibility"
 msgstr ""
 
-#: ../../mod/admin.php:396
+#: ../../mod/admin.php:398
 msgid "Closed"
 msgstr ""
 
-#: ../../mod/admin.php:397
+#: ../../mod/admin.php:399
 msgid "Requires approval"
 msgstr ""
 
-#: ../../mod/admin.php:398
+#: ../../mod/admin.php:400
 msgid "Open"
 msgstr ""
 
-#: ../../mod/admin.php:403
+#: ../../mod/admin.php:405
 msgid "Private"
 msgstr ""
 
-#: ../../mod/admin.php:404
+#: ../../mod/admin.php:406
 msgid "Paid Access"
 msgstr ""
 
-#: ../../mod/admin.php:405
+#: ../../mod/admin.php:407
 msgid "Free Access"
 msgstr ""
 
-#: ../../mod/admin.php:406
+#: ../../mod/admin.php:408
 msgid "Tiered Access"
 msgstr ""
 
-#: ../../mod/admin.php:419 ../../mod/register.php:172
+#: ../../mod/admin.php:421 ../../mod/register.php:180
 msgid "Registration"
 msgstr ""
 
-#: ../../mod/admin.php:420
+#: ../../mod/admin.php:422
 msgid "File upload"
 msgstr ""
 
-#: ../../mod/admin.php:421
+#: ../../mod/admin.php:423
 msgid "Policies"
 msgstr ""
 
-#: ../../mod/admin.php:422
+#: ../../mod/admin.php:424
 msgid "Advanced"
 msgstr ""
 
-#: ../../mod/admin.php:426
+#: ../../mod/admin.php:428
 msgid "Site name"
 msgstr ""
 
-#: ../../mod/admin.php:427
+#: ../../mod/admin.php:429
 msgid "Banner/Logo"
 msgstr ""
 
-#: ../../mod/admin.php:428
+#: ../../mod/admin.php:430
 msgid "System language"
 msgstr ""
 
-#: ../../mod/admin.php:429
+#: ../../mod/admin.php:431
 msgid "System theme"
 msgstr ""
 
-#: ../../mod/admin.php:429
+#: ../../mod/admin.php:431
 msgid ""
 "Default system theme - may be over-ridden by user profiles - <a href='#' "
 "id='cnftheme'>change theme settings</a>"
 msgstr ""
 
-#: ../../mod/admin.php:430
+#: ../../mod/admin.php:432
 msgid "Mobile system theme"
 msgstr ""
 
-#: ../../mod/admin.php:430
+#: ../../mod/admin.php:432
 msgid "Theme for mobile devices"
 msgstr ""
 
-#: ../../mod/admin.php:431
+#: ../../mod/admin.php:433
 msgid "Accessibility system theme"
 msgstr ""
 
-#: ../../mod/admin.php:431
+#: ../../mod/admin.php:433
 msgid "Accessibility theme"
 msgstr ""
 
-#: ../../mod/admin.php:432
+#: ../../mod/admin.php:434
 msgid "Channel to use for this website's static pages"
 msgstr ""
 
-#: ../../mod/admin.php:432
+#: ../../mod/admin.php:434
 msgid "Site Channel"
 msgstr ""
 
-#: ../../mod/admin.php:434
+#: ../../mod/admin.php:436
 msgid "Maximum image size"
 msgstr ""
 
-#: ../../mod/admin.php:434
+#: ../../mod/admin.php:436
 msgid ""
 "Maximum size in bytes of uploaded images. Default is 0, which means no "
 "limits."
 msgstr ""
 
-#: ../../mod/admin.php:435
+#: ../../mod/admin.php:437
 msgid "Register policy"
 msgstr ""
 
-#: ../../mod/admin.php:436
+#: ../../mod/admin.php:438
 msgid "Access policy"
 msgstr ""
 
-#: ../../mod/admin.php:437
+#: ../../mod/admin.php:439
 msgid "Register text"
 msgstr ""
 
-#: ../../mod/admin.php:437
+#: ../../mod/admin.php:439
 msgid "Will be displayed prominently on the registration page."
 msgstr ""
 
-#: ../../mod/admin.php:438
+#: ../../mod/admin.php:440
 msgid "Accounts abandoned after x days"
 msgstr ""
 
-#: ../../mod/admin.php:438
+#: ../../mod/admin.php:440
 msgid ""
 "Will not waste system resources polling external sites for abandonded "
 "accounts. Enter 0 for no time limit."
 msgstr ""
 
-#: ../../mod/admin.php:439
+#: ../../mod/admin.php:441
 msgid "Allowed friend domains"
 msgstr ""
 
-#: ../../mod/admin.php:439
+#: ../../mod/admin.php:441
 msgid ""
 "Comma separated list of domains which are allowed to establish friendships "
 "with this site. Wildcards are accepted. Empty to allow any domains"
 msgstr ""
 
-#: ../../mod/admin.php:440
+#: ../../mod/admin.php:442
 msgid "Allowed email domains"
 msgstr ""
 
-#: ../../mod/admin.php:440
+#: ../../mod/admin.php:442
 msgid ""
 "Comma separated list of domains which are allowed in email addresses for "
 "registrations to this site. Wildcards are accepted. Empty to allow any "
 "domains"
 msgstr ""
 
-#: ../../mod/admin.php:441
+#: ../../mod/admin.php:443
 msgid "Block public"
 msgstr ""
 
-#: ../../mod/admin.php:441
+#: ../../mod/admin.php:443
 msgid ""
 "Check to block public access to all otherwise public personal pages on this "
 "site unless you are currently logged in."
 msgstr ""
 
-#: ../../mod/admin.php:442
+#: ../../mod/admin.php:444
 msgid "Force publish"
 msgstr ""
 
-#: ../../mod/admin.php:442
+#: ../../mod/admin.php:444
 msgid ""
 "Check to force all profiles on this site to be listed in the site directory."
 msgstr ""
 
-#: ../../mod/admin.php:444
-msgid "Proxy user"
+#: ../../mod/admin.php:445
+msgid "No login on Homepage"
 msgstr ""
 
 #: ../../mod/admin.php:445
+msgid ""
+"Check to hide the login form from your sites homepage when visitors arrive "
+"who are not logged in (e.g. when you put the content of the homepage in via "
+"the site channel)."
+msgstr ""
+
+#: ../../mod/admin.php:447
+msgid "Proxy user"
+msgstr ""
+
+#: ../../mod/admin.php:448
 msgid "Proxy URL"
 msgstr ""
 
-#: ../../mod/admin.php:446
+#: ../../mod/admin.php:449
 msgid "Network timeout"
 msgstr ""
 
-#: ../../mod/admin.php:446
+#: ../../mod/admin.php:449
 msgid "Value is in seconds. Set to 0 for unlimited (not recommended)."
 msgstr ""
 
-#: ../../mod/admin.php:447
+#: ../../mod/admin.php:450
 msgid "Delivery interval"
 msgstr ""
 
-#: ../../mod/admin.php:447
+#: ../../mod/admin.php:450
 msgid ""
 "Delay background delivery processes by this many seconds to reduce system "
 "load. Recommend: 4-5 for shared hosts, 2-3 for virtual private servers. 0-1 "
 "for large dedicated servers."
 msgstr ""
 
-#: ../../mod/admin.php:448
+#: ../../mod/admin.php:451
 msgid "Poll interval"
 msgstr ""
 
-#: ../../mod/admin.php:448
+#: ../../mod/admin.php:451
 msgid ""
 "Delay background polling processes by this many seconds to reduce system "
 "load. If 0, use delivery interval."
 msgstr ""
 
-#: ../../mod/admin.php:449
+#: ../../mod/admin.php:452
 msgid "Maximum Load Average"
 msgstr ""
 
-#: ../../mod/admin.php:449
+#: ../../mod/admin.php:452
 msgid ""
 "Maximum system load before delivery and poll processes are deferred - "
 "default 50."
 msgstr ""
 
-#: ../../mod/admin.php:466
+#: ../../mod/admin.php:469
 msgid "No server found"
 msgstr ""
 
-#: ../../mod/admin.php:473
+#: ../../mod/admin.php:476 ../../mod/admin.php:698
 msgid "ID"
 msgstr ""
 
-#: ../../mod/admin.php:473
+#: ../../mod/admin.php:476
 msgid "for channel"
 msgstr ""
 
-#: ../../mod/admin.php:473
+#: ../../mod/admin.php:476
 msgid "on server"
 msgstr ""
 
-#: ../../mod/admin.php:473
+#: ../../mod/admin.php:476
 msgid "Status"
 msgstr ""
 
-#: ../../mod/admin.php:493
+#: ../../mod/admin.php:496
 msgid "Update has been marked successful"
 msgstr ""
 
-#: ../../mod/admin.php:503
+#: ../../mod/admin.php:506
 #, php-format
 msgid "Executing %s failed. Check system logs."
 msgstr ""
 
-#: ../../mod/admin.php:506
+#: ../../mod/admin.php:509
 #, php-format
 msgid "Update %s was successfully applied."
 msgstr ""
 
-#: ../../mod/admin.php:510
+#: ../../mod/admin.php:513
 #, php-format
 msgid "Update %s did not return a status. Unknown if it succeeded."
 msgstr ""
 
-#: ../../mod/admin.php:513
+#: ../../mod/admin.php:516
 #, php-format
 msgid "Update function %s could not be found."
 msgstr ""
 
-#: ../../mod/admin.php:528
+#: ../../mod/admin.php:531
 msgid "No failed updates."
 msgstr ""
 
-#: ../../mod/admin.php:532
+#: ../../mod/admin.php:535
 msgid "Failed Updates"
 msgstr ""
 
-#: ../../mod/admin.php:534
+#: ../../mod/admin.php:537
 msgid "Mark success (if update was manually applied)"
 msgstr ""
 
-#: ../../mod/admin.php:535
+#: ../../mod/admin.php:538
 msgid "Attempt to execute this update step automatically"
 msgstr ""
 
-#: ../../mod/admin.php:561
+#: ../../mod/admin.php:564
 #, php-format
 msgid "%s user blocked/unblocked"
 msgid_plural "%s users blocked/unblocked"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../../mod/admin.php:568
+#: ../../mod/admin.php:571
 #, php-format
 msgid "%s user deleted"
 msgid_plural "%s users deleted"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../../mod/admin.php:599
+#: ../../mod/admin.php:602
 msgid "Account not found"
 msgstr ""
 
-#: ../../mod/admin.php:610
+#: ../../mod/admin.php:613
 #, php-format
 msgid "User '%s' deleted"
 msgstr ""
 
-#: ../../mod/admin.php:619
+#: ../../mod/admin.php:622
 #, php-format
 msgid "User '%s' unblocked"
 msgstr ""
 
-#: ../../mod/admin.php:619
+#: ../../mod/admin.php:622
 #, php-format
 msgid "User '%s' blocked"
 msgstr ""
 
-#: ../../mod/admin.php:650
-msgid "Normal Account"
-msgstr ""
-
-#: ../../mod/admin.php:651
-msgid "Soapbox Account"
-msgstr ""
-
-#: ../../mod/admin.php:652
-msgid "Community/Celebrity Account"
-msgstr ""
-
-#: ../../mod/admin.php:653
-msgid "Automatic Friend Account"
-msgstr ""
-
-#: ../../mod/admin.php:671
+#: ../../mod/admin.php:687
 msgid "select all"
 msgstr ""
 
-#: ../../mod/admin.php:672
+#: ../../mod/admin.php:688
 msgid "User registrations waiting for confirm"
 msgstr ""
 
-#: ../../mod/admin.php:673
+#: ../../mod/admin.php:689
 msgid "Request date"
 msgstr ""
 
-#: ../../mod/admin.php:674
+#: ../../mod/admin.php:690
 msgid "No registrations."
 msgstr ""
 
-#: ../../mod/admin.php:675 ../../mod/intro.php:11 ../../mod/intro.php:98
-#: ../../mod/notifications.php:159 ../../mod/notifications.php:206
+#: ../../mod/admin.php:691
 msgid "Approve"
 msgstr ""
 
-#: ../../mod/admin.php:676
+#: ../../mod/admin.php:692
 msgid "Deny"
 msgstr ""
 
-#: ../../mod/admin.php:678 ../../mod/intro.php:14 ../../mod/intro.php:99
-#: ../../mod/connections.php:328 ../../mod/connections.php:470
+#: ../../mod/admin.php:694 ../../mod/connections.php:352
+#: ../../mod/connections.php:494
 msgid "Block"
 msgstr ""
 
-#: ../../mod/admin.php:679 ../../mod/connections.php:328
-#: ../../mod/connections.php:470
+#: ../../mod/admin.php:695 ../../mod/connections.php:352
+#: ../../mod/connections.php:494
 msgid "Unblock"
 msgstr ""
 
-#: ../../mod/admin.php:682
+#: ../../mod/admin.php:698
 msgid "Register date"
 msgstr ""
 
-#: ../../mod/admin.php:682
+#: ../../mod/admin.php:698
 msgid "Last login"
 msgstr ""
 
-#: ../../mod/admin.php:682
+#: ../../mod/admin.php:698
+msgid "Expires"
+msgstr ""
+
+#: ../../mod/admin.php:698
 msgid "Service Class"
 msgstr ""
 
-#: ../../mod/admin.php:684
+#: ../../mod/admin.php:700
 msgid ""
 "Selected users will be deleted!\\n\\nEverything these users had posted on "
 "this site will be permanently deleted!\\n\\nAre you sure?"
 msgstr ""
 
-#: ../../mod/admin.php:685
+#: ../../mod/admin.php:701
 msgid ""
 "The user {0} will be deleted!\\n\\nEverything this user has posted on this "
 "site will be permanently deleted!\\n\\nAre you sure?"
 msgstr ""
 
-#: ../../mod/admin.php:726
+#: ../../mod/admin.php:742
 #, php-format
 msgid "Plugin %s disabled."
 msgstr ""
 
-#: ../../mod/admin.php:730
+#: ../../mod/admin.php:746
 #, php-format
 msgid "Plugin %s enabled."
 msgstr ""
 
-#: ../../mod/admin.php:740 ../../mod/admin.php:942
+#: ../../mod/admin.php:756 ../../mod/admin.php:958
 msgid "Disable"
 msgstr ""
 
-#: ../../mod/admin.php:742 ../../mod/admin.php:944
+#: ../../mod/admin.php:758 ../../mod/admin.php:960
 msgid "Enable"
 msgstr ""
 
-#: ../../mod/admin.php:768 ../../mod/admin.php:973
+#: ../../mod/admin.php:784 ../../mod/admin.php:989
 msgid "Toggle"
 msgstr ""
 
-#: ../../mod/admin.php:776 ../../mod/admin.php:983
+#: ../../mod/admin.php:792 ../../mod/admin.php:999
 msgid "Author: "
 msgstr ""
 
-#: ../../mod/admin.php:777 ../../mod/admin.php:984
+#: ../../mod/admin.php:793 ../../mod/admin.php:1000
 msgid "Maintainer: "
 msgstr ""
 
-#: ../../mod/admin.php:906
+#: ../../mod/admin.php:922
 msgid "No themes found."
 msgstr ""
 
-#: ../../mod/admin.php:965
+#: ../../mod/admin.php:981
 msgid "Screenshot"
 msgstr ""
 
-#: ../../mod/admin.php:1013
+#: ../../mod/admin.php:1029
 msgid "[Experimental]"
 msgstr ""
 
-#: ../../mod/admin.php:1014
+#: ../../mod/admin.php:1030
 msgid "[Unsupported]"
 msgstr ""
 
-#: ../../mod/admin.php:1041
+#: ../../mod/admin.php:1057
 msgid "Log settings updated."
 msgstr ""
 
-#: ../../mod/admin.php:1097
+#: ../../mod/admin.php:1113
 msgid "Clear"
 msgstr ""
 
-#: ../../mod/admin.php:1103
+#: ../../mod/admin.php:1119
 msgid "Debugging"
 msgstr ""
 
-#: ../../mod/admin.php:1104
+#: ../../mod/admin.php:1120
 msgid "Log file"
 msgstr ""
 
-#: ../../mod/admin.php:1104
+#: ../../mod/admin.php:1120
 msgid ""
 "Must be writable by web server. Relative to your Red top-level directory."
 msgstr ""
 
-#: ../../mod/admin.php:1105
+#: ../../mod/admin.php:1121
 msgid "Log level"
 msgstr ""
 
-#: ../../mod/mitem.php:13 ../../mod/menu.php:87
+#: ../../mod/mitem.php:14 ../../mod/menu.php:87
 msgid "Menu not found."
 msgstr ""
 
-#: ../../mod/mitem.php:66
+#: ../../mod/mitem.php:47
 msgid "Menu element updated."
 msgstr ""
 
-#: ../../mod/mitem.php:70
+#: ../../mod/mitem.php:51
 msgid "Unable to update menu element."
 msgstr ""
 
-#: ../../mod/mitem.php:76
+#: ../../mod/mitem.php:57
 msgid "Menu element added."
 msgstr ""
 
-#: ../../mod/mitem.php:80
+#: ../../mod/mitem.php:61
 msgid "Unable to add menu element."
 msgstr ""
 
-#: ../../mod/mitem.php:97 ../../mod/xchan.php:25 ../../mod/menu.php:113
+#: ../../mod/mitem.php:78 ../../mod/xchan.php:25 ../../mod/menu.php:113
 msgid "Not found."
 msgstr ""
 
-#: ../../mod/mitem.php:116
+#: ../../mod/mitem.php:99
 msgid "Manage Menu Elements"
 msgstr ""
 
-#: ../../mod/mitem.php:119
+#: ../../mod/mitem.php:102
 msgid "Edit menu"
 msgstr ""
 
-#: ../../mod/mitem.php:122
+#: ../../mod/mitem.php:105
 msgid "Edit element"
 msgstr ""
 
-#: ../../mod/mitem.php:123
+#: ../../mod/mitem.php:106
 msgid "Drop element"
 msgstr ""
 
-#: ../../mod/mitem.php:124
+#: ../../mod/mitem.php:107
 msgid "New element"
 msgstr ""
 
-#: ../../mod/mitem.php:125
+#: ../../mod/mitem.php:108
 msgid "Edit this menu container"
 msgstr ""
 
-#: ../../mod/mitem.php:126
+#: ../../mod/mitem.php:109
 msgid "Add menu element"
 msgstr ""
 
-#: ../../mod/mitem.php:127
+#: ../../mod/mitem.php:110
 msgid "Delete this menu item"
 msgstr ""
 
-#: ../../mod/mitem.php:128
+#: ../../mod/mitem.php:111
 msgid "Edit this menu item"
 msgstr ""
 
-#: ../../mod/mitem.php:141
+#: ../../mod/mitem.php:134
 msgid "New Menu Element"
 msgstr ""
 
-#: ../../mod/mitem.php:143 ../../mod/mitem.php:184
+#: ../../mod/mitem.php:136 ../../mod/mitem.php:179
+msgid "Menu Item Permissions"
+msgstr ""
+
+#: ../../mod/mitem.php:139 ../../mod/mitem.php:183
 msgid "Link text"
 msgstr ""
 
-#: ../../mod/mitem.php:144 ../../mod/mitem.php:185
+#: ../../mod/mitem.php:140 ../../mod/mitem.php:184
 msgid "URL of link"
 msgstr ""
 
-#: ../../mod/mitem.php:145 ../../mod/mitem.php:186
+#: ../../mod/mitem.php:141 ../../mod/mitem.php:185
 msgid "Use Red magic-auth if available"
 msgstr ""
 
-#: ../../mod/mitem.php:146 ../../mod/mitem.php:187
+#: ../../mod/mitem.php:142 ../../mod/mitem.php:186
 msgid "Open link in new window"
 msgstr ""
 
-#: ../../mod/mitem.php:148 ../../mod/mitem.php:189
+#: ../../mod/mitem.php:144 ../../mod/mitem.php:188
 msgid "Order in list"
 msgstr ""
 
-#: ../../mod/mitem.php:148 ../../mod/mitem.php:189
+#: ../../mod/mitem.php:144 ../../mod/mitem.php:188
 msgid "Higher numbers will sink to bottom of listing"
 msgstr ""
 
-#: ../../mod/mitem.php:149 ../../mod/menu.php:79 ../../mod/new_channel.php:117
+#: ../../mod/mitem.php:145 ../../mod/menu.php:79 ../../mod/new_channel.php:117
 msgid "Create"
 msgstr ""
 
-#: ../../mod/mitem.php:161
+#: ../../mod/mitem.php:157
 msgid "Menu item not found."
 msgstr ""
 
-#: ../../mod/mitem.php:170
+#: ../../mod/mitem.php:166
 msgid "Menu item deleted."
 msgstr ""
 
-#: ../../mod/mitem.php:172
+#: ../../mod/mitem.php:168
 msgid "Menu item could not be deleted."
 msgstr ""
 
-#: ../../mod/mitem.php:181
+#: ../../mod/mitem.php:177
 msgid "Edit Menu Element"
 msgstr ""
 
-#: ../../mod/mitem.php:190 ../../mod/menu.php:107
+#: ../../mod/mitem.php:189 ../../mod/menu.php:107
 msgid "Modify"
 msgstr ""
 
@@ -4725,7 +4926,7 @@ msgid "Could not create collection."
 msgstr ""
 
 #: ../../mod/group.php:60
-msgid "Collection name changed."
+msgid "Collection updated."
 msgstr ""
 
 #: ../../mod/group.php:92
@@ -4772,11 +4973,11 @@ msgstr ""
 msgid "Album not found."
 msgstr ""
 
-#: ../../mod/photos.php:125 ../../mod/photos.php:780
+#: ../../mod/photos.php:125 ../../mod/photos.php:791
 msgid "Delete Album"
 msgstr ""
 
-#: ../../mod/photos.php:165 ../../mod/photos.php:1041
+#: ../../mod/photos.php:165 ../../mod/photos.php:1052
 msgid "Delete Photo"
 msgstr ""
 
@@ -4807,96 +5008,96 @@ msgstr ""
 msgid "You have used %1$.2f Mbytes of photo storage."
 msgstr ""
 
-#: ../../mod/photos.php:707
+#: ../../mod/photos.php:718
 msgid "Upload Photos"
 msgstr ""
 
-#: ../../mod/photos.php:711 ../../mod/photos.php:775
+#: ../../mod/photos.php:722 ../../mod/photos.php:786
 msgid "New album name: "
 msgstr ""
 
-#: ../../mod/photos.php:712
+#: ../../mod/photos.php:723
 msgid "or existing album name: "
 msgstr ""
 
-#: ../../mod/photos.php:713
+#: ../../mod/photos.php:724
 msgid "Do not show a status post for this upload"
 msgstr ""
 
-#: ../../mod/photos.php:715 ../../mod/photos.php:1036
+#: ../../mod/photos.php:726 ../../mod/photos.php:1047
 msgid "Permissions"
 msgstr ""
 
-#: ../../mod/photos.php:764 ../../mod/photos.php:786 ../../mod/photos.php:1212
-#: ../../mod/photos.php:1227
+#: ../../mod/photos.php:775 ../../mod/photos.php:797 ../../mod/photos.php:1223
+#: ../../mod/photos.php:1238
 msgid "Contact Photos"
 msgstr ""
 
-#: ../../mod/photos.php:790
+#: ../../mod/photos.php:801
 msgid "Edit Album"
 msgstr ""
 
-#: ../../mod/photos.php:796
+#: ../../mod/photos.php:807
 msgid "Show Newest First"
 msgstr ""
 
-#: ../../mod/photos.php:798
+#: ../../mod/photos.php:809
 msgid "Show Oldest First"
 msgstr ""
 
-#: ../../mod/photos.php:842 ../../mod/photos.php:1259
+#: ../../mod/photos.php:853 ../../mod/photos.php:1270
 msgid "View Photo"
 msgstr ""
 
-#: ../../mod/photos.php:886
+#: ../../mod/photos.php:897
 msgid "Permission denied. Access to this item may be restricted."
 msgstr ""
 
-#: ../../mod/photos.php:888
+#: ../../mod/photos.php:899
 msgid "Photo not available"
 msgstr ""
 
-#: ../../mod/photos.php:946
+#: ../../mod/photos.php:957
 msgid "Use as profile photo"
 msgstr ""
 
-#: ../../mod/photos.php:970
+#: ../../mod/photos.php:981
 msgid "View Full Size"
 msgstr ""
 
-#: ../../mod/photos.php:1024
+#: ../../mod/photos.php:1035
 msgid "Edit photo"
 msgstr ""
 
-#: ../../mod/photos.php:1026
+#: ../../mod/photos.php:1037
 msgid "Rotate CW (right)"
 msgstr ""
 
-#: ../../mod/photos.php:1027
+#: ../../mod/photos.php:1038
 msgid "Rotate CCW (left)"
 msgstr ""
 
-#: ../../mod/photos.php:1029
+#: ../../mod/photos.php:1040
 msgid "New album name"
 msgstr ""
 
-#: ../../mod/photos.php:1032
+#: ../../mod/photos.php:1043
 msgid "Caption"
 msgstr ""
 
-#: ../../mod/photos.php:1034
+#: ../../mod/photos.php:1045
 msgid "Add a Tag"
 msgstr ""
 
-#: ../../mod/photos.php:1038
+#: ../../mod/photos.php:1049
 msgid "Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping"
 msgstr ""
 
-#: ../../mod/photos.php:1265
+#: ../../mod/photos.php:1276
 msgid "View Album"
 msgstr ""
 
-#: ../../mod/photos.php:1274
+#: ../../mod/photos.php:1285
 msgid "Recent Photos"
 msgstr ""
 
@@ -4908,14 +5109,6 @@ msgstr ""
 msgid "added your channel"
 msgstr ""
 
-#: ../../mod/ping.php:230 ../../boot.php:1862 ../../boot.php:1942
-msgid "g A l F d"
-msgstr ""
-
-#: ../../mod/ping.php:252 ../../boot.php:1908 ../../boot.php:1983
-msgid "[today]"
-msgstr ""
-
 #: ../../mod/ping.php:262
 msgid "posted an event"
 msgstr ""
@@ -4948,11 +5141,6 @@ msgstr ""
 msgid "Drop"
 msgstr ""
 
-#: ../../mod/menu.php:57 ../../mod/network.php:321
-#: ../../mod/connections.php:532
-msgid "New"
-msgstr ""
-
 #: ../../mod/menu.php:58
 msgid "Create a new menu"
 msgstr ""
@@ -5030,7 +5218,7 @@ msgstr ""
 msgid "Selected channel has private message restrictions. Send failed."
 msgstr ""
 
-#: ../../mod/message.php:223 ../../mod/notifications.php:101
+#: ../../mod/message.php:223
 msgid "Messages"
 msgstr ""
 
@@ -5050,11 +5238,11 @@ msgstr ""
 msgid "Send Private Message"
 msgstr ""
 
-#: ../../mod/message.php:317 ../../mod/message.php:503
+#: ../../mod/message.php:317 ../../mod/message.php:471
 msgid "To:"
 msgstr ""
 
-#: ../../mod/message.php:322 ../../mod/message.php:505
+#: ../../mod/message.php:322 ../../mod/message.php:473
 msgid "Subject:"
 msgstr ""
 
@@ -5062,7 +5250,7 @@ msgstr ""
 msgid "No messages."
 msgstr ""
 
-#: ../../mod/message.php:375 ../../mod/message.php:472
+#: ../../mod/message.php:375 ../../mod/message.php:440
 msgid "Delete message"
 msgstr ""
 
@@ -5074,36 +5262,32 @@ msgstr ""
 msgid "Message not found."
 msgstr ""
 
-#: ../../mod/message.php:473
+#: ../../mod/message.php:441
 msgid "Recall message"
 msgstr ""
 
-#: ../../mod/message.php:475
+#: ../../mod/message.php:443
 msgid "Message has been recalled."
 msgstr ""
 
-#: ../../mod/message.php:492
+#: ../../mod/message.php:460
 msgid "Private Conversation"
 msgstr ""
 
-#: ../../mod/message.php:496
+#: ../../mod/message.php:464
 msgid "Delete conversation"
 msgstr ""
 
-#: ../../mod/message.php:498
+#: ../../mod/message.php:466
 msgid ""
 "No secure communications available. You <strong>may</strong> be able to "
 "respond from the sender's profile page."
 msgstr ""
 
-#: ../../mod/message.php:502
+#: ../../mod/message.php:470
 msgid "Send Reply"
 msgstr ""
 
-#: ../../mod/hcard.php:10
-msgid "No profile"
-msgstr ""
-
 #: ../../mod/layouts.php:52
 msgid "Layout Help"
 msgstr ""
@@ -5116,11 +5300,11 @@ msgstr ""
 msgid "Layout Name"
 msgstr ""
 
-#: ../../mod/help.php:30
+#: ../../mod/help.php:41
 msgid "Help:"
 msgstr ""
 
-#: ../../mod/help.php:38 ../../index.php:226
+#: ../../mod/help.php:53 ../../index.php:226
 msgid "Not Found"
 msgstr ""
 
@@ -5136,836 +5320,725 @@ msgstr ""
 msgid "Authenticate"
 msgstr ""
 
-#: ../../mod/network.php:164 ../../mod/search.php:20
-msgid "Remove term"
+#: ../../mod/network.php:79
+msgid "No such group"
 msgstr ""
 
-#: ../../mod/network.php:302
-msgid "Commented Order"
+#: ../../mod/network.php:118
+msgid "Search Results For:"
 msgstr ""
 
-#: ../../mod/network.php:305
-msgid "Sort by Comment Date"
+#: ../../mod/network.php:172
+msgid "Collection is empty"
 msgstr ""
 
-#: ../../mod/network.php:308
-msgid "Posted Order"
+#: ../../mod/network.php:180
+msgid "Collection: "
 msgstr ""
 
-#: ../../mod/network.php:311
-msgid "Sort by Post Date"
+#: ../../mod/network.php:193
+msgid "Connection: "
 msgstr ""
 
-#: ../../mod/network.php:315 ../../mod/notifications.php:86
-msgid "Personal"
+#: ../../mod/network.php:196
+msgid "Invalid connection."
 msgstr ""
 
-#: ../../mod/network.php:318
-msgid "Posts that mention or involve you"
+#: ../../mod/post.php:222
+msgid ""
+"Remote authentication blocked. You are logged into this site locally. Please "
+"logout and retry."
 msgstr ""
 
-#: ../../mod/network.php:324
-msgid "Activity Stream - by date"
+#: ../../mod/post.php:251
+#, php-format
+msgid "Welcome %s. Remote authentication successful."
 msgstr ""
 
-#: ../../mod/network.php:331
-msgid "Starred"
+#: ../../mod/dirsearch.php:21
+msgid "This site is not a directory server"
 msgstr ""
 
-#: ../../mod/network.php:334
-msgid "Favourite Posts"
+#: ../../mod/lockview.php:34
+msgid "Remote privacy information not available."
 msgstr ""
 
-#: ../../mod/network.php:341
-msgid "Spam"
+#: ../../mod/lockview.php:43
+msgid "Visible to:"
 msgstr ""
 
-#: ../../mod/network.php:344
-msgid "Posts flagged as SPAM"
+#: ../../mod/magic.php:63
+msgid "Hub not found."
 msgstr ""
 
-#: ../../mod/network.php:384
-msgid "Refresh"
+#: ../../mod/profiles.php:18 ../../mod/profiles.php:138
+#: ../../mod/profiles.php:168 ../../mod/profiles.php:475
+msgid "Profile not found."
 msgstr ""
 
-#: ../../mod/network.php:385 ../../mod/connections.php:384
-msgid "Me"
+#: ../../mod/profiles.php:38
+msgid "Profile deleted."
 msgstr ""
 
-#: ../../mod/network.php:386 ../../mod/connections.php:386
-msgid "Best Friends"
+#: ../../mod/profiles.php:56 ../../mod/profiles.php:92
+msgid "Profile-"
 msgstr ""
 
-#: ../../mod/network.php:388
-msgid "Co-workers"
+#: ../../mod/profiles.php:77 ../../mod/profiles.php:120
+msgid "New profile created."
 msgstr ""
 
-#: ../../mod/network.php:389 ../../mod/connections.php:388
-msgid "Former Friends"
+#: ../../mod/profiles.php:98
+msgid "Profile unavailable to clone."
 msgstr ""
 
-#: ../../mod/network.php:390 ../../mod/connections.php:389
-msgid "Acquaintances"
+#: ../../mod/profiles.php:178
+msgid "Profile Name is required."
 msgstr ""
 
-#: ../../mod/network.php:391
-msgid "Everybody"
+#: ../../mod/profiles.php:306
+msgid "Marital Status"
 msgstr ""
 
-#: ../../mod/network.php:408
-msgid "Search Results For:"
+#: ../../mod/profiles.php:310
+msgid "Romantic Partner"
 msgstr ""
 
-#: ../../mod/network.php:453
-msgid "No such group"
+#: ../../mod/profiles.php:314
+msgid "Likes"
 msgstr ""
 
-#: ../../mod/network.php:484
-msgid "Connection: "
+#: ../../mod/profiles.php:318
+msgid "Dislikes"
 msgstr ""
 
-#: ../../mod/network.php:487
-msgid "Invalid connection."
+#: ../../mod/profiles.php:322
+msgid "Work/Employment"
 msgstr ""
 
-#: ../../mod/intro.php:17 ../../mod/intro.php:100
-#: ../../mod/connections.php:335 ../../mod/connections.php:471
-#: ../../mod/notifications.php:51 ../../mod/notifications.php:162
-#: ../../mod/notifications.php:208
-msgid "Ignore"
+#: ../../mod/profiles.php:325
+msgid "Religion"
 msgstr ""
 
-#: ../../mod/intro.php:29 ../../mod/connections.php:122
-msgid "Connection updated."
+#: ../../mod/profiles.php:329
+msgid "Political Views"
 msgstr ""
 
-#: ../../mod/intro.php:31
-msgid "Connection update failed."
+#: ../../mod/profiles.php:333
+msgid "Gender"
 msgstr ""
 
-#: ../../mod/intro.php:56
-msgid "Introductions and Connection Requests"
+#: ../../mod/profiles.php:337
+msgid "Sexual Preference"
 msgstr ""
 
-#: ../../mod/intro.php:67
-msgid "No pending introductions."
+#: ../../mod/profiles.php:341
+msgid "Homepage"
 msgstr ""
 
-#: ../../mod/intro.php:72
-msgid "System error. Please try again later."
+#: ../../mod/profiles.php:345
+msgid "Interests"
 msgstr ""
 
-#: ../../mod/intro.php:95 ../../mod/connections.php:476
-#: ../../mod/notifications.php:155 ../../mod/notifications.php:202
-msgid "Hide this contact from others"
+#: ../../mod/profiles.php:349
+msgid "Address"
 msgstr ""
 
-#: ../../mod/intro.php:96 ../../mod/notifications.php:156
-#: ../../mod/notifications.php:203
-msgid "Post a new friend activity"
+#: ../../mod/profiles.php:356 ../../mod/pubsites.php:31
+msgid "Location"
 msgstr ""
 
-#: ../../mod/intro.php:96 ../../mod/notifications.php:156
-#: ../../mod/notifications.php:203
-msgid "if applicable"
+#: ../../mod/profiles.php:439
+msgid "Profile updated."
 msgstr ""
 
-#: ../../mod/intro.php:101 ../../mod/notifications.php:35
-#: ../../mod/notifications.php:163 ../../mod/notifications.php:209
-msgid "Discard"
+#: ../../mod/profiles.php:494
+msgid "Hide your contact/friend list from viewers of this profile?"
+msgstr ""
+
+#: ../../mod/profiles.php:517
+msgid "Edit Profile Details"
+msgstr ""
+
+#: ../../mod/profiles.php:519
+msgid "View this profile"
+msgstr ""
+
+#: ../../mod/profiles.php:520
+msgid "Change Profile Photo"
+msgstr ""
+
+#: ../../mod/profiles.php:521
+msgid "Create a new profile using these settings"
+msgstr ""
+
+#: ../../mod/profiles.php:522
+msgid "Clone this profile"
+msgstr ""
+
+#: ../../mod/profiles.php:523
+msgid "Delete this profile"
+msgstr ""
+
+#: ../../mod/profiles.php:524
+msgid "Profile Name:"
+msgstr ""
+
+#: ../../mod/profiles.php:525
+msgid "Your Full Name:"
+msgstr ""
+
+#: ../../mod/profiles.php:526
+msgid "Title/Description:"
+msgstr ""
+
+#: ../../mod/profiles.php:527
+msgid "Your Gender:"
+msgstr ""
+
+#: ../../mod/profiles.php:528
+#, php-format
+msgid "Birthday (%s):"
+msgstr ""
+
+#: ../../mod/profiles.php:529
+msgid "Street Address:"
+msgstr ""
+
+#: ../../mod/profiles.php:530
+msgid "Locality/City:"
+msgstr ""
+
+#: ../../mod/profiles.php:531
+msgid "Postal/Zip Code:"
+msgstr ""
+
+#: ../../mod/profiles.php:532
+msgid "Country:"
+msgstr ""
+
+#: ../../mod/profiles.php:533
+msgid "Region/State:"
+msgstr ""
+
+#: ../../mod/profiles.php:534
+msgid "<span class=\"heart\">&hearts;</span> Marital Status:"
+msgstr ""
+
+#: ../../mod/profiles.php:535
+msgid "Who: (if applicable)"
+msgstr ""
+
+#: ../../mod/profiles.php:536
+msgid "Examples: cathy123, Cathy Williams, cathy@example.com"
+msgstr ""
+
+#: ../../mod/profiles.php:537
+msgid "Since [date]:"
+msgstr ""
+
+#: ../../mod/profiles.php:539
+msgid "Homepage URL:"
+msgstr ""
+
+#: ../../mod/profiles.php:542
+msgid "Religious Views:"
+msgstr ""
+
+#: ../../mod/profiles.php:543
+msgid "Keywords:"
+msgstr ""
+
+#: ../../mod/profiles.php:546
+msgid "Example: fishing photography software"
+msgstr ""
+
+#: ../../mod/profiles.php:547
+msgid "Used in directory listings"
+msgstr ""
+
+#: ../../mod/profiles.php:548
+msgid "Tell us about yourself..."
+msgstr ""
+
+#: ../../mod/profiles.php:549
+msgid "Hobbies/Interests"
+msgstr ""
+
+#: ../../mod/profiles.php:550
+msgid "Contact information and Social Networks"
+msgstr ""
+
+#: ../../mod/profiles.php:551
+msgid "My other channels"
+msgstr ""
+
+#: ../../mod/profiles.php:552
+msgid "Musical interests"
+msgstr ""
+
+#: ../../mod/profiles.php:553
+msgid "Books, literature"
+msgstr ""
+
+#: ../../mod/profiles.php:554
+msgid "Television"
+msgstr ""
+
+#: ../../mod/profiles.php:555
+msgid "Film/dance/culture/entertainment"
+msgstr ""
+
+#: ../../mod/profiles.php:556
+msgid "Love/romance"
+msgstr ""
+
+#: ../../mod/profiles.php:557
+msgid "Work/employment"
+msgstr ""
+
+#: ../../mod/profiles.php:558
+msgid "School/education"
+msgstr ""
+
+#: ../../mod/profiles.php:563
+msgid ""
+"This is your <strong>public</strong> profile.<br />It <strong>may</strong> "
+"be visible to anybody using the internet."
 msgstr ""
 
-#: ../../mod/connections.php:67
+#: ../../mod/profiles.php:573 ../../mod/directory.php:161
+msgid "Age: "
+msgstr ""
+
+#: ../../mod/profiles.php:612
+msgid "Edit/Manage Profiles"
+msgstr ""
+
+#: ../../mod/new_channel.php:107
+msgid "Add a Channel"
+msgstr ""
+
+#: ../../mod/new_channel.php:108
+msgid ""
+"A channel is your own collection of related web pages. A channel can be used "
+"to hold social network profiles, blogs, conversation groups and forums, "
+"celebrity pages, and much more. You may create as many channels as your "
+"service provider allows."
+msgstr ""
+
+#: ../../mod/new_channel.php:111
+msgid ""
+"Examples: \"Bob Jameson\", \"Lisa and her Horses\", \"Soccer\", \"Aviation "
+"Group\" "
+msgstr ""
+
+#: ../../mod/new_channel.php:112
+msgid "Choose a short nickname"
+msgstr ""
+
+#: ../../mod/new_channel.php:113
+msgid ""
+"Your nickname will be used to create an easily remembered channel address "
+"(like an email address) which you can share with others."
+msgstr ""
+
+#: ../../mod/new_channel.php:114
+msgid ""
+"Or <a href=\"import\">import an existing channel</a> from another location"
+msgstr ""
+
+#: ../../mod/connections.php:71
 msgid "Could not access contact record."
 msgstr ""
 
-#: ../../mod/connections.php:81
+#: ../../mod/connections.php:85
 msgid "Could not locate selected profile."
 msgstr ""
 
-#: ../../mod/connections.php:124
+#: ../../mod/connections.php:126
+msgid "Connection updated."
+msgstr ""
+
+#: ../../mod/connections.php:128
 msgid "Failed to update connection record."
 msgstr ""
 
-#: ../../mod/connections.php:199
+#: ../../mod/connections.php:223
 msgid "Could not access address book record."
 msgstr ""
 
-#: ../../mod/connections.php:213
+#: ../../mod/connections.php:237
 msgid "Refresh failed - channel is currently unavailable."
 msgstr ""
 
-#: ../../mod/connections.php:220
+#: ../../mod/connections.php:244
 msgid "Channel has been unblocked"
 msgstr ""
 
-#: ../../mod/connections.php:221
+#: ../../mod/connections.php:245
 msgid "Channel has been blocked"
 msgstr ""
 
-#: ../../mod/connections.php:225 ../../mod/connections.php:237
 #: ../../mod/connections.php:249 ../../mod/connections.php:261
-#: ../../mod/connections.php:276
+#: ../../mod/connections.php:273 ../../mod/connections.php:285
+#: ../../mod/connections.php:300
 msgid "Unable to set address book parameters."
 msgstr ""
 
-#: ../../mod/connections.php:232
+#: ../../mod/connections.php:256
 msgid "Channel has been unignored"
 msgstr ""
 
-#: ../../mod/connections.php:233
+#: ../../mod/connections.php:257
 msgid "Channel has been ignored"
 msgstr ""
 
-#: ../../mod/connections.php:244
+#: ../../mod/connections.php:268
 msgid "Channel has been unarchived"
 msgstr ""
 
-#: ../../mod/connections.php:245
+#: ../../mod/connections.php:269
 msgid "Channel has been archived"
 msgstr ""
 
-#: ../../mod/connections.php:256
+#: ../../mod/connections.php:280
 msgid "Channel has been unhidden"
 msgstr ""
 
-#: ../../mod/connections.php:257
+#: ../../mod/connections.php:281
 msgid "Channel has been hidden"
 msgstr ""
 
-#: ../../mod/connections.php:271
+#: ../../mod/connections.php:295
 msgid "Channel has been approved"
 msgstr ""
 
-#: ../../mod/connections.php:272
+#: ../../mod/connections.php:296
 msgid "Channel has been unapproved"
 msgstr ""
 
-#: ../../mod/connections.php:290
+#: ../../mod/connections.php:314
 msgid "Contact has been removed."
 msgstr ""
 
-#: ../../mod/connections.php:310
+#: ../../mod/connections.php:334
 #, php-format
 msgid "View %s's profile"
 msgstr ""
 
-#: ../../mod/connections.php:314
+#: ../../mod/connections.php:338
 msgid "Refresh Permissions"
 msgstr ""
 
-#: ../../mod/connections.php:317
+#: ../../mod/connections.php:341
 msgid "Fetch updated permissions"
 msgstr ""
 
-#: ../../mod/connections.php:321
+#: ../../mod/connections.php:345
 msgid "Recent Activity"
 msgstr ""
 
-#: ../../mod/connections.php:324
+#: ../../mod/connections.php:348
 msgid "View recent posts and comments"
 msgstr ""
 
-#: ../../mod/connections.php:331
+#: ../../mod/connections.php:355
 msgid "Block or Unblock this connection"
 msgstr ""
 
-#: ../../mod/connections.php:335 ../../mod/connections.php:471
+#: ../../mod/connections.php:359 ../../mod/connections.php:495
 msgid "Unignore"
 msgstr ""
 
-#: ../../mod/connections.php:338
+#: ../../mod/connections.php:359 ../../mod/connections.php:495
+#: ../../mod/notifications.php:51
+msgid "Ignore"
+msgstr ""
+
+#: ../../mod/connections.php:362
 msgid "Ignore or Unignore this connection"
 msgstr ""
 
-#: ../../mod/connections.php:341
+#: ../../mod/connections.php:365
 msgid "Unarchive"
 msgstr ""
 
-#: ../../mod/connections.php:341
+#: ../../mod/connections.php:365
 msgid "Archive"
 msgstr ""
 
-#: ../../mod/connections.php:344
+#: ../../mod/connections.php:368
 msgid "Archive or Unarchive this connection"
 msgstr ""
 
-#: ../../mod/connections.php:347
+#: ../../mod/connections.php:371
 msgid "Unhide"
 msgstr ""
 
-#: ../../mod/connections.php:347
+#: ../../mod/connections.php:371
 msgid "Hide"
 msgstr ""
 
-#: ../../mod/connections.php:350
+#: ../../mod/connections.php:374
 msgid "Hide or Unhide this connection"
 msgstr ""
 
-#: ../../mod/connections.php:357
+#: ../../mod/connections.php:381
 msgid "Delete this connection"
 msgstr ""
 
-#: ../../mod/connections.php:390
+#: ../../mod/connections.php:414
 msgid "Unknown"
 msgstr ""
 
-#: ../../mod/connections.php:400 ../../mod/connections.php:429
+#: ../../mod/connections.php:424 ../../mod/connections.php:453
 msgid "Approve this connection"
 msgstr ""
 
-#: ../../mod/connections.php:400
+#: ../../mod/connections.php:424
 msgid "Accept connection to allow communication"
 msgstr ""
 
-#: ../../mod/connections.php:416
+#: ../../mod/connections.php:440
 msgid "Automatic Permissions Settings"
 msgstr ""
 
-#: ../../mod/connections.php:416
+#: ../../mod/connections.php:440
 #, php-format
 msgid "Connections: settings for %s"
 msgstr ""
 
-#: ../../mod/connections.php:420
+#: ../../mod/connections.php:444
 msgid ""
 "When receiving a channel introduction, any permissions provided here will be "
 "applied to the new connection automatically and the introduction approved. "
 "Leave this page if you do not wish to use this feature."
 msgstr ""
 
-#: ../../mod/connections.php:422
+#: ../../mod/connections.php:446
 msgid "Slide to adjust your degree of friendship"
 msgstr ""
 
-#: ../../mod/connections.php:428
+#: ../../mod/connections.php:452
 msgid "inherited"
 msgstr ""
 
-#: ../../mod/connections.php:430
+#: ../../mod/connections.php:454
 msgid "Connection has no individual permissions!"
 msgstr ""
 
-#: ../../mod/connections.php:431
+#: ../../mod/connections.php:455
 msgid ""
 "This may be appropriate based on your <a href=\"settings\">privacy settings</"
 "a>, though you may wish to review the \"Advanced Permissions\"."
 msgstr ""
 
-#: ../../mod/connections.php:433
+#: ../../mod/connections.php:457
 msgid "Profile Visibility"
 msgstr ""
 
-#: ../../mod/connections.php:434
+#: ../../mod/connections.php:458
 #, php-format
 msgid ""
 "Please choose the profile you would like to display to %s when viewing your "
 "profile securely."
 msgstr ""
 
-#: ../../mod/connections.php:435
+#: ../../mod/connections.php:459
 msgid "Contact Information / Notes"
 msgstr ""
 
-#: ../../mod/connections.php:436
+#: ../../mod/connections.php:460
 msgid "Edit contact notes"
 msgstr ""
 
-#: ../../mod/connections.php:438
+#: ../../mod/connections.php:462
 msgid "Their Settings"
 msgstr ""
 
-#: ../../mod/connections.php:439
+#: ../../mod/connections.php:463
 msgid "My Settings"
 msgstr ""
 
-#: ../../mod/connections.php:441
+#: ../../mod/connections.php:465
 msgid "Forum Members"
 msgstr ""
 
-#: ../../mod/connections.php:442
+#: ../../mod/connections.php:466
 msgid "Soapbox"
 msgstr ""
 
-#: ../../mod/connections.php:443
+#: ../../mod/connections.php:467
 msgid "Full Sharing"
 msgstr ""
 
-#: ../../mod/connections.php:444
+#: ../../mod/connections.php:468
 msgid "Cautious Sharing"
 msgstr ""
 
-#: ../../mod/connections.php:445
+#: ../../mod/connections.php:469
 msgid "Follow Only"
 msgstr ""
 
-#: ../../mod/connections.php:446
+#: ../../mod/connections.php:470
 msgid "Individual Permissions"
 msgstr ""
 
-#: ../../mod/connections.php:447
+#: ../../mod/connections.php:471
 msgid ""
-"Some permissions may be inherited from your <a href=\"settings\">privacy "
-"settings</a>, which have higher priority. Changing those on this page will "
-"have no effect."
+"Some permissions may be inherited from your channel <a href=\"settings"
+"\">privacy settings</a>, which have higher priority. Changing those "
+"inherited settings on this page will have no effect."
 msgstr ""
 
-#: ../../mod/connections.php:448
+#: ../../mod/connections.php:472
 msgid "Advanced Permissions"
 msgstr ""
 
-#: ../../mod/connections.php:449
+#: ../../mod/connections.php:473
 msgid "Quick Links"
 msgstr ""
 
-#: ../../mod/connections.php:453
+#: ../../mod/connections.php:477
 #, php-format
 msgid "Visit %s's profile - %s"
 msgstr ""
 
-#: ../../mod/connections.php:454
+#: ../../mod/connections.php:478
 msgid "Block/Unblock contact"
 msgstr ""
 
-#: ../../mod/connections.php:455
+#: ../../mod/connections.php:479
 msgid "Ignore contact"
 msgstr ""
 
-#: ../../mod/connections.php:456
+#: ../../mod/connections.php:480
 msgid "Repair URL settings"
 msgstr ""
 
-#: ../../mod/connections.php:457
+#: ../../mod/connections.php:481
 msgid "View conversations"
 msgstr ""
 
-#: ../../mod/connections.php:459
+#: ../../mod/connections.php:483
 msgid "Delete contact"
 msgstr ""
 
-#: ../../mod/connections.php:462
+#: ../../mod/connections.php:486
 msgid "Last update:"
 msgstr ""
 
-#: ../../mod/connections.php:464
+#: ../../mod/connections.php:488
 msgid "Update public posts"
 msgstr ""
 
-#: ../../mod/connections.php:466
+#: ../../mod/connections.php:490
 msgid "Update now"
 msgstr ""
 
-#: ../../mod/connections.php:472
+#: ../../mod/connections.php:496
 msgid "Currently blocked"
 msgstr ""
 
-#: ../../mod/connections.php:473
+#: ../../mod/connections.php:497
 msgid "Currently ignored"
 msgstr ""
 
-#: ../../mod/connections.php:474
+#: ../../mod/connections.php:498
 msgid "Currently archived"
 msgstr ""
 
-#: ../../mod/connections.php:475
+#: ../../mod/connections.php:499
 msgid "Currently pending"
 msgstr ""
 
-#: ../../mod/connections.php:476
+#: ../../mod/connections.php:500
+msgid "Hide this contact from others"
+msgstr ""
+
+#: ../../mod/connections.php:500
 msgid ""
 "Replies/likes to your public posts <strong>may</strong> still be visible"
 msgstr ""
 
-#: ../../mod/connections.php:512 ../../mod/connections.php:584
+#: ../../mod/connections.php:536 ../../mod/connections.php:608
 msgid "Blocked"
 msgstr ""
 
-#: ../../mod/connections.php:517 ../../mod/connections.php:591
+#: ../../mod/connections.php:541 ../../mod/connections.php:615
 msgid "Ignored"
 msgstr ""
 
-#: ../../mod/connections.php:522 ../../mod/connections.php:605
+#: ../../mod/connections.php:546 ../../mod/connections.php:629
 msgid "Hidden"
 msgstr ""
 
-#: ../../mod/connections.php:527 ../../mod/connections.php:598
+#: ../../mod/connections.php:551 ../../mod/connections.php:622
 msgid "Archived"
 msgstr ""
 
-#: ../../mod/connections.php:538
+#: ../../mod/connections.php:562
 msgid "All"
 msgstr ""
 
-#: ../../mod/connections.php:559
-msgid "Suggestions"
-msgstr ""
-
-#: ../../mod/connections.php:562
+#: ../../mod/connections.php:586
 msgid "Suggest new connections"
 msgstr ""
 
-#: ../../mod/connections.php:568
+#: ../../mod/connections.php:592
 msgid "Show pending (new) connections"
 msgstr ""
 
-#: ../../mod/connections.php:571
+#: ../../mod/connections.php:595
 msgid "All Connections"
 msgstr ""
 
-#: ../../mod/connections.php:574
+#: ../../mod/connections.php:598
 msgid "Show all connections"
 msgstr ""
 
-#: ../../mod/connections.php:577
+#: ../../mod/connections.php:601
 msgid "Unblocked"
 msgstr ""
 
-#: ../../mod/connections.php:580
+#: ../../mod/connections.php:604
 msgid "Only show unblocked connections"
 msgstr ""
 
-#: ../../mod/connections.php:587
+#: ../../mod/connections.php:611
 msgid "Only show blocked connections"
 msgstr ""
 
-#: ../../mod/connections.php:594
+#: ../../mod/connections.php:618
 msgid "Only show ignored connections"
 msgstr ""
 
-#: ../../mod/connections.php:601
+#: ../../mod/connections.php:625
 msgid "Only show archived connections"
 msgstr ""
 
-#: ../../mod/connections.php:608
+#: ../../mod/connections.php:632
 msgid "Only show hidden connections"
 msgstr ""
 
-#: ../../mod/connections.php:650
+#: ../../mod/connections.php:674
 #, php-format
 msgid "%1$s [%2$s]"
 msgstr ""
 
-#: ../../mod/connections.php:651 ../../mod/nogroup.php:41
+#: ../../mod/connections.php:675
 msgid "Edit contact"
 msgstr ""
 
-#: ../../mod/connections.php:675
+#: ../../mod/connections.php:698
 msgid "Search your connections"
 msgstr ""
 
-#: ../../mod/connections.php:676
+#: ../../mod/connections.php:699
 msgid "Finding: "
 msgstr ""
 
-#: ../../mod/dirsearch.php:21
-msgid "This site is not a directory server"
-msgstr ""
-
-#: ../../mod/lockview.php:34
-msgid "Remote privacy information not available."
-msgstr ""
-
-#: ../../mod/lockview.php:43
-msgid "Visible to:"
-msgstr ""
-
-#: ../../mod/profiles.php:18 ../../mod/profiles.php:138
-#: ../../mod/profiles.php:179 ../../mod/profiles.php:486
-msgid "Profile not found."
-msgstr ""
-
-#: ../../mod/profiles.php:38
-msgid "Profile deleted."
-msgstr ""
-
-#: ../../mod/profiles.php:56 ../../mod/profiles.php:92
-msgid "Profile-"
-msgstr ""
-
-#: ../../mod/profiles.php:77 ../../mod/profiles.php:120
-msgid "New profile created."
-msgstr ""
-
-#: ../../mod/profiles.php:98
-msgid "Profile unavailable to clone."
-msgstr ""
-
-#: ../../mod/profiles.php:189
-msgid "Profile Name is required."
-msgstr ""
-
-#: ../../mod/profiles.php:317
-msgid "Marital Status"
-msgstr ""
-
-#: ../../mod/profiles.php:321
-msgid "Romantic Partner"
-msgstr ""
-
-#: ../../mod/profiles.php:325
-msgid "Likes"
-msgstr ""
-
-#: ../../mod/profiles.php:329
-msgid "Dislikes"
-msgstr ""
-
-#: ../../mod/profiles.php:333
-msgid "Work/Employment"
-msgstr ""
-
-#: ../../mod/profiles.php:336
-msgid "Religion"
-msgstr ""
-
-#: ../../mod/profiles.php:340
-msgid "Political Views"
-msgstr ""
-
-#: ../../mod/profiles.php:344
-msgid "Gender"
-msgstr ""
-
-#: ../../mod/profiles.php:348
-msgid "Sexual Preference"
-msgstr ""
-
-#: ../../mod/profiles.php:352
-msgid "Homepage"
-msgstr ""
-
-#: ../../mod/profiles.php:356
-msgid "Interests"
-msgstr ""
-
-#: ../../mod/profiles.php:360
-msgid "Address"
-msgstr ""
-
-#: ../../mod/profiles.php:367 ../../mod/pubsites.php:31
-msgid "Location"
-msgstr ""
-
-#: ../../mod/profiles.php:450
-msgid "Profile updated."
-msgstr ""
-
-#: ../../mod/profiles.php:505
-msgid "Hide your contact/friend list from viewers of this profile?"
-msgstr ""
-
-#: ../../mod/profiles.php:528
-msgid "Edit Profile Details"
-msgstr ""
-
-#: ../../mod/profiles.php:530
-msgid "View this profile"
-msgstr ""
-
-#: ../../mod/profiles.php:531
-msgid "Change Profile Photo"
-msgstr ""
-
-#: ../../mod/profiles.php:532
-msgid "Create a new profile using these settings"
-msgstr ""
-
-#: ../../mod/profiles.php:533
-msgid "Clone this profile"
-msgstr ""
-
-#: ../../mod/profiles.php:534
-msgid "Delete this profile"
-msgstr ""
-
-#: ../../mod/profiles.php:535
-msgid "Profile Name:"
-msgstr ""
-
-#: ../../mod/profiles.php:536
-msgid "Your Full Name:"
-msgstr ""
-
-#: ../../mod/profiles.php:537
-msgid "Title/Description:"
-msgstr ""
-
-#: ../../mod/profiles.php:538
-msgid "Your Gender:"
-msgstr ""
-
-#: ../../mod/profiles.php:539
-#, php-format
-msgid "Birthday (%s):"
-msgstr ""
-
-#: ../../mod/profiles.php:540
-msgid "Street Address:"
-msgstr ""
-
-#: ../../mod/profiles.php:541
-msgid "Locality/City:"
-msgstr ""
-
-#: ../../mod/profiles.php:542
-msgid "Postal/Zip Code:"
-msgstr ""
-
-#: ../../mod/profiles.php:543
-msgid "Country:"
-msgstr ""
-
-#: ../../mod/profiles.php:544
-msgid "Region/State:"
-msgstr ""
-
-#: ../../mod/profiles.php:545
-msgid "<span class=\"heart\">&hearts;</span> Marital Status:"
-msgstr ""
-
-#: ../../mod/profiles.php:546
-msgid "Who: (if applicable)"
-msgstr ""
-
-#: ../../mod/profiles.php:547
-msgid "Examples: cathy123, Cathy Williams, cathy@example.com"
-msgstr ""
-
-#: ../../mod/profiles.php:548
-msgid "Since [date]:"
-msgstr ""
-
-#: ../../mod/profiles.php:550
-msgid "Homepage URL:"
-msgstr ""
-
-#: ../../mod/profiles.php:553
-msgid "Religious Views:"
-msgstr ""
-
-#: ../../mod/profiles.php:554
-msgid "Keywords:"
-msgstr ""
-
-#: ../../mod/profiles.php:557
-msgid "Example: fishing photography software"
-msgstr ""
-
-#: ../../mod/profiles.php:558
-msgid "Used in directory listings"
-msgstr ""
-
-#: ../../mod/profiles.php:559
-msgid "Tell us about yourself..."
-msgstr ""
-
-#: ../../mod/profiles.php:560
-msgid "Hobbies/Interests"
-msgstr ""
-
-#: ../../mod/profiles.php:561
-msgid "Contact information and Social Networks"
-msgstr ""
-
-#: ../../mod/profiles.php:562
-msgid "My other channels"
-msgstr ""
-
-#: ../../mod/profiles.php:563
-msgid "Musical interests"
-msgstr ""
-
-#: ../../mod/profiles.php:564
-msgid "Books, literature"
-msgstr ""
-
-#: ../../mod/profiles.php:565
-msgid "Television"
-msgstr ""
-
-#: ../../mod/profiles.php:566
-msgid "Film/dance/culture/entertainment"
-msgstr ""
-
-#: ../../mod/profiles.php:567
-msgid "Love/romance"
-msgstr ""
-
-#: ../../mod/profiles.php:568
-msgid "Work/employment"
-msgstr ""
-
-#: ../../mod/profiles.php:569
-msgid "School/education"
-msgstr ""
-
-#: ../../mod/profiles.php:574
-msgid ""
-"This is your <strong>public</strong> profile.<br />It <strong>may</strong> "
-"be visible to anybody using the internet."
-msgstr ""
-
-#: ../../mod/profiles.php:584 ../../mod/directory.php:160
-msgid "Age: "
-msgstr ""
-
-#: ../../mod/profiles.php:623
-msgid "Edit/Manage Profiles"
-msgstr ""
-
-#: ../../mod/profiles.php:624 ../../boot.php:1759
-msgid "Change profile photo"
-msgstr ""
-
-#: ../../mod/profiles.php:625 ../../boot.php:1766
-msgid "Create New Profile"
-msgstr ""
-
-#: ../../mod/profiles.php:636 ../../boot.php:1780
-msgid "Profile Image"
-msgstr ""
-
-#: ../../mod/profiles.php:639 ../../boot.php:1783
-msgid "visible to everybody"
-msgstr ""
-
-#: ../../mod/profiles.php:640 ../../boot.php:1784
-msgid "Edit visibility"
-msgstr ""
-
-#: ../../mod/new_channel.php:107
-msgid "Add a Channel"
-msgstr ""
-
-#: ../../mod/new_channel.php:108
-msgid ""
-"A channel is your own collection of related web pages. A channel can be used "
-"to hold social network profiles, blogs, conversation groups and forums, "
-"celebrity pages, and much more. You may create as many channels as your "
-"service provider allows."
-msgstr ""
-
-#: ../../mod/new_channel.php:111
-msgid ""
-"Examples: \"Bob Jameson\", \"Lisa and her Horses\", \"Soccer\", \"Aviation "
-"Group\" "
-msgstr ""
-
-#: ../../mod/new_channel.php:112
-msgid "Choose a short nickname"
-msgstr ""
-
-#: ../../mod/new_channel.php:113
-msgid ""
-"Your nickname will be used to create an easily remembered channel address "
-"(like an email address) which you can share with others."
-msgstr ""
-
-#: ../../mod/new_channel.php:114
-msgid ""
-"Or <a href=\"import\">import an existing channel</a> from another location"
-msgstr ""
-
 #: ../../mod/filestorage.php:35
 msgid "Permission Denied."
 msgstr ""
@@ -6010,7 +6083,7 @@ msgid ""
 "Password reset failed."
 msgstr ""
 
-#: ../../mod/lostpass.php:85 ../../boot.php:1473
+#: ../../mod/lostpass.php:85 ../../boot.php:1450
 msgid "Password Reset"
 msgstr ""
 
@@ -6084,19 +6157,19 @@ msgstr ""
 msgid "Cloned channel not found. Import failed."
 msgstr ""
 
-#: ../../mod/import.php:356
+#: ../../mod/import.php:358
 msgid "Import completed."
 msgstr ""
 
-#: ../../mod/import.php:369
+#: ../../mod/import.php:371
 msgid "You must be logged in to use this feature."
 msgstr ""
 
-#: ../../mod/import.php:374
+#: ../../mod/import.php:376
 msgid "Import Channel"
 msgstr ""
 
-#: ../../mod/import.php:375
+#: ../../mod/import.php:377
 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 "
@@ -6104,27 +6177,27 @@ msgid ""
 "imported. Importation of content is not yet available."
 msgstr ""
 
-#: ../../mod/import.php:376
+#: ../../mod/import.php:378
 msgid "File to Upload"
 msgstr ""
 
-#: ../../mod/import.php:377
+#: ../../mod/import.php:379
 msgid "Or provide the old server/hub details"
 msgstr ""
 
-#: ../../mod/import.php:378
+#: ../../mod/import.php:380
 msgid "Your old identity address (xyz@example.com)"
 msgstr ""
 
-#: ../../mod/import.php:379
+#: ../../mod/import.php:381
 msgid "Your old login email address"
 msgstr ""
 
-#: ../../mod/import.php:380
+#: ../../mod/import.php:382
 msgid "Your old login password"
 msgstr ""
 
-#: ../../mod/import.php:381
+#: ../../mod/import.php:383
 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 "
@@ -6132,7 +6205,7 @@ msgid ""
 "location for files, photos, and media."
 msgstr ""
 
-#: ../../mod/import.php:382
+#: ../../mod/import.php:384
 msgid "Make this hub my primary location"
 msgstr ""
 
@@ -6173,87 +6246,22 @@ msgstr ""
 msgid "Average Rating"
 msgstr ""
 
-#: ../../mod/match.php:12
+#: ../../mod/match.php:16
 msgid "Profile Match"
 msgstr ""
 
-#: ../../mod/match.php:20
+#: ../../mod/match.php:24
 msgid "No keywords to match. Please add keywords to your default profile."
 msgstr ""
 
-#: ../../mod/match.php:57
+#: ../../mod/match.php:61
 msgid "is interested in:"
 msgstr ""
 
-#: ../../mod/match.php:65
+#: ../../mod/match.php:69
 msgid "No matches"
 msgstr ""
 
-#: ../../mod/crepair.php:102
-msgid "Contact settings applied."
-msgstr ""
-
-#: ../../mod/crepair.php:104
-msgid "Contact update failed."
-msgstr ""
-
-#: ../../mod/crepair.php:129 ../../mod/fsuggest.php:20
-#: ../../mod/fsuggest.php:92
-msgid "Contact not found."
-msgstr ""
-
-#: ../../mod/crepair.php:135
-msgid "Repair Contact Settings"
-msgstr ""
-
-#: ../../mod/crepair.php:137
-msgid ""
-"<strong>WARNING: This is highly advanced</strong> and if you enter incorrect "
-"information your communications with this contact may stop working."
-msgstr ""
-
-#: ../../mod/crepair.php:138
-msgid ""
-"Please use your browser 'Back' button <strong>now</strong> if you are "
-"uncertain what to do on this page."
-msgstr ""
-
-#: ../../mod/crepair.php:144
-msgid "Return to contact editor"
-msgstr ""
-
-#: ../../mod/crepair.php:149
-msgid "Account Nickname"
-msgstr ""
-
-#: ../../mod/crepair.php:150
-msgid "@Tagname - overrides Name/Nickname"
-msgstr ""
-
-#: ../../mod/crepair.php:151
-msgid "Account URL"
-msgstr ""
-
-#: ../../mod/crepair.php:152
-msgid "Friend Request URL"
-msgstr ""
-
-#: ../../mod/crepair.php:153
-msgid "Friend Confirm URL"
-msgstr ""
-
-#: ../../mod/crepair.php:154
-msgid "Notification Endpoint URL"
-msgstr ""
-
-#: ../../mod/crepair.php:155
-msgid "Poll/Feed URL"
-msgstr ""
-
-#: ../../mod/crepair.php:156
-msgid "New photo from this URL"
-msgstr ""
-
 #: ../../mod/zfinger.php:23
 msgid "invalid target signature"
 msgstr ""
@@ -6262,7 +6270,7 @@ msgstr ""
 msgid "Channel added."
 msgstr ""
 
-#: ../../mod/editlayout.php:36 ../../mod/editwebpage.php:30
+#: ../../mod/editlayout.php:36 ../../mod/editwebpage.php:32
 #: ../../mod/editpost.php:20 ../../mod/editblock.php:36
 msgid "Item not found"
 msgstr ""
@@ -6271,17 +6279,17 @@ msgstr ""
 msgid "Edit Layout"
 msgstr ""
 
-#: ../../mod/editlayout.php:104 ../../mod/editwebpage.php:123
+#: ../../mod/editlayout.php:104 ../../mod/editwebpage.php:147
 #: ../../mod/editpost.php:101 ../../mod/editblock.php:118
 msgid "Insert YouTube video"
 msgstr ""
 
-#: ../../mod/editlayout.php:105 ../../mod/editwebpage.php:124
+#: ../../mod/editlayout.php:105 ../../mod/editwebpage.php:148
 #: ../../mod/editpost.php:102 ../../mod/editblock.php:119
 msgid "Insert Vorbis [.ogg] video"
 msgstr ""
 
-#: ../../mod/editlayout.php:106 ../../mod/editwebpage.php:125
+#: ../../mod/editlayout.php:106 ../../mod/editwebpage.php:149
 #: ../../mod/editpost.php:103 ../../mod/editblock.php:120
 msgid "Insert Vorbis [.ogg] audio"
 msgstr ""
@@ -6290,91 +6298,87 @@ msgstr ""
 msgid "Delete Layout"
 msgstr ""
 
-#: ../../mod/nogroup.php:58
-msgid "Contacts who are not members of a group"
-msgstr ""
-
-#: ../../mod/profile_photo.php:54
+#: ../../mod/profile_photo.php:44
 msgid "Image uploaded but image cropping failed."
 msgstr ""
 
-#: ../../mod/profile_photo.php:107
+#: ../../mod/profile_photo.php:97
 msgid "Image resize failed."
 msgstr ""
 
-#: ../../mod/profile_photo.php:151
+#: ../../mod/profile_photo.php:141
 msgid ""
 "Shift-reload the page or clear browser cache if the new photo does not "
 "display immediately."
 msgstr ""
 
-#: ../../mod/profile_photo.php:173
+#: ../../mod/profile_photo.php:163
 #, php-format
 msgid "Image exceeds size limit of %d"
 msgstr ""
 
-#: ../../mod/profile_photo.php:182
+#: ../../mod/profile_photo.php:172
 msgid "Unable to process image."
 msgstr ""
 
-#: ../../mod/profile_photo.php:224 ../../mod/profile_photo.php:272
+#: ../../mod/profile_photo.php:214 ../../mod/profile_photo.php:262
 msgid "Photo not available."
 msgstr ""
 
-#: ../../mod/profile_photo.php:291
+#: ../../mod/profile_photo.php:281
 msgid "Upload File:"
 msgstr ""
 
-#: ../../mod/profile_photo.php:292
+#: ../../mod/profile_photo.php:282
 msgid "Select a profile:"
 msgstr ""
 
-#: ../../mod/profile_photo.php:293
+#: ../../mod/profile_photo.php:283
 msgid "Upload Profile Photo"
 msgstr ""
 
-#: ../../mod/profile_photo.php:294
+#: ../../mod/profile_photo.php:284
 msgid "Upload"
 msgstr ""
 
-#: ../../mod/profile_photo.php:298
+#: ../../mod/profile_photo.php:288
 msgid "skip this step"
 msgstr ""
 
-#: ../../mod/profile_photo.php:298
+#: ../../mod/profile_photo.php:288
 msgid "select a photo from your photo albums"
 msgstr ""
 
-#: ../../mod/profile_photo.php:312
+#: ../../mod/profile_photo.php:302
 msgid "Crop Image"
 msgstr ""
 
-#: ../../mod/profile_photo.php:313
+#: ../../mod/profile_photo.php:303
 msgid "Please adjust the image cropping for optimum viewing."
 msgstr ""
 
-#: ../../mod/profile_photo.php:315
+#: ../../mod/profile_photo.php:305
 msgid "Done Editing"
 msgstr ""
 
-#: ../../mod/profile_photo.php:350
+#: ../../mod/profile_photo.php:340
 msgid "Image uploaded successfully."
 msgstr ""
 
-#: ../../mod/profile_photo.php:352
+#: ../../mod/profile_photo.php:342
 msgid "Image upload failed."
 msgstr ""
 
-#: ../../mod/profile_photo.php:361
+#: ../../mod/profile_photo.php:351
 #, php-format
 msgid "Image size reduction [%s] failed."
 msgstr ""
 
-#: ../../mod/editwebpage.php:87
+#: ../../mod/editwebpage.php:106
 msgid "Edit Webpage"
 msgstr ""
 
-#: ../../mod/editwebpage.php:162
+#: ../../mod/editwebpage.php:188
 msgid "Delete Webpage"
 msgstr ""
 
@@ -6382,136 +6386,18 @@ msgstr ""
 msgid "Invalid request identifier."
 msgstr ""
 
-#: ../../mod/notifications.php:76
-msgid "System"
-msgstr ""
-
-#: ../../mod/notifications.php:96
-msgid "Introductions"
-msgstr ""
-
-#: ../../mod/notifications.php:121
-msgid "Show Ignored Requests"
-msgstr ""
-
-#: ../../mod/notifications.php:121
-msgid "Hide Ignored Requests"
-msgstr ""
-
-#: ../../mod/notifications.php:147 ../../mod/notifications.php:193
-msgid "Notification type: "
-msgstr ""
-
-#: ../../mod/notifications.php:148
-msgid "Friend Suggestion"
-msgstr ""
-
-#: ../../mod/notifications.php:150
-#, php-format
-msgid "suggested by %s"
-msgstr ""
-
-#: ../../mod/notifications.php:179
-msgid "Claims to be known to you: "
-msgstr ""
-
-#: ../../mod/notifications.php:179
-msgid "yes"
-msgstr ""
-
-#: ../../mod/notifications.php:179
-msgid "no"
-msgstr ""
-
-#: ../../mod/notifications.php:186
-msgid "Approve as: "
-msgstr ""
-
-#: ../../mod/notifications.php:187
-msgid "Friend"
-msgstr ""
-
-#: ../../mod/notifications.php:188
-msgid "Sharer"
-msgstr ""
-
-#: ../../mod/notifications.php:188
-msgid "Fan/Admirer"
-msgstr ""
-
-#: ../../mod/notifications.php:194
-msgid "Friend/Connect Request"
-msgstr ""
-
-#: ../../mod/notifications.php:194
-msgid "New Follower"
-msgstr ""
-
-#: ../../mod/notifications.php:215
-msgid "No introductions."
-msgstr ""
-
-#: ../../mod/notifications.php:257 ../../mod/notifications.php:382
-#: ../../mod/notifications.php:465
-#, php-format
-msgid "%s liked %s's post"
-msgstr ""
-
-#: ../../mod/notifications.php:266 ../../mod/notifications.php:391
-#: ../../mod/notifications.php:474
-#, php-format
-msgid "%s disliked %s's post"
-msgstr ""
-
-#: ../../mod/notifications.php:280 ../../mod/notifications.php:405
-#: ../../mod/notifications.php:488
-#, php-format
-msgid "%s is now friends with %s"
-msgstr ""
-
-#: ../../mod/notifications.php:287 ../../mod/notifications.php:412
-#, php-format
-msgid "%s created a new post"
-msgstr ""
-
-#: ../../mod/notifications.php:288 ../../mod/notifications.php:413
-#: ../../mod/notifications.php:497
-#, php-format
-msgid "%s commented on %s's post"
-msgstr ""
-
-#: ../../mod/notifications.php:302
-msgid "No more network notifications."
-msgstr ""
-
-#: ../../mod/notifications.php:306
-msgid "Network Notifications"
+#: ../../mod/notifications.php:35
+msgid "Discard"
 msgstr ""
 
-#: ../../mod/notifications.php:332 ../../mod/notify.php:54
+#: ../../mod/notifications.php:93 ../../mod/notify.php:54
 msgid "No more system notifications."
 msgstr ""
 
-#: ../../mod/notifications.php:336 ../../mod/notify.php:58
+#: ../../mod/notifications.php:97 ../../mod/notify.php:58
 msgid "System Notifications"
 msgstr ""
 
-#: ../../mod/notifications.php:427
-msgid "No more personal notifications."
-msgstr ""
-
-#: ../../mod/notifications.php:431
-msgid "Personal Notifications"
-msgstr ""
-
-#: ../../mod/notifications.php:504
-msgid "No more home notifications."
-msgstr ""
-
-#: ../../mod/notifications.php:508
-msgid "Home Notifications"
-msgstr ""
-
 #: ../../mod/blocks.php:65
 msgid "Block Name"
 msgstr ""
@@ -6528,7 +6414,7 @@ msgstr ""
 msgid "Item is not editable"
 msgstr ""
 
-#: ../../mod/profile.php:111
+#: ../../mod/profile.php:64 ../../mod/profile.php:72
 msgid "Access to this profile has been restricted."
 msgstr ""
 
@@ -6552,11 +6438,15 @@ msgstr ""
 msgid "Make this post private"
 msgstr ""
 
-#: ../../mod/wall_upload.php:41 ../../mod/item.php:1057
+#: ../../mod/wall_upload.php:41 ../../mod/item.php:1077
 msgid "Wall Photos"
 msgstr ""
 
-#: ../../mod/channel.php:120
+#: ../../mod/channel.php:25
+msgid "You must be logged in to see this page."
+msgstr ""
+
+#: ../../mod/channel.php:83
 msgid "Insufficient permissions.  Request redirected to profile page."
 msgstr ""
 
@@ -6576,6 +6466,10 @@ msgstr ""
 msgid "Files"
 msgstr ""
 
+#: ../../mod/fsuggest.php:20 ../../mod/fsuggest.php:92
+msgid "Contact not found."
+msgstr ""
+
 #: ../../mod/fsuggest.php:63
 msgid "Friend suggestion sent."
 msgstr ""
@@ -6597,48 +6491,48 @@ msgstr ""
 msgid "Delete Block"
 msgstr ""
 
-#: ../../mod/profperm.php:34 ../../mod/profperm.php:64
+#: ../../mod/profperm.php:25 ../../mod/profperm.php:55
 msgid "Invalid profile identifier."
 msgstr ""
 
-#: ../../mod/profperm.php:110
+#: ../../mod/profperm.php:101
 msgid "Profile Visibility Editor"
 msgstr ""
 
-#: ../../mod/profperm.php:114
+#: ../../mod/profperm.php:105
 msgid "Click on a contact to add or remove."
 msgstr ""
 
-#: ../../mod/profperm.php:123
+#: ../../mod/profperm.php:114
 msgid "Visible To"
 msgstr ""
 
-#: ../../mod/profperm.php:139
+#: ../../mod/profperm.php:130
 msgid "All Contacts (with secure profile access)"
 msgstr ""
 
-#: ../../mod/item.php:136
+#: ../../mod/item.php:144
 msgid "Unable to locate original post."
 msgstr ""
 
-#: ../../mod/item.php:321
+#: ../../mod/item.php:341
 msgid "Empty post discarded."
 msgstr ""
 
-#: ../../mod/item.php:363
+#: ../../mod/item.php:383
 msgid "Executable content type not permitted to this channel."
 msgstr ""
 
-#: ../../mod/item.php:772
+#: ../../mod/item.php:793
 msgid "System error. Post not saved."
 msgstr ""
 
-#: ../../mod/item.php:1136
+#: ../../mod/item.php:1156
 #, php-format
 msgid "You have reached your limit of %1$.0f top level posts."
 msgstr ""
 
-#: ../../mod/item.php:1142
+#: ../../mod/item.php:1162
 #, php-format
 msgid "You have reached your limit of %1$.0f webpages."
 msgstr ""
@@ -6686,16 +6580,12 @@ msgid ""
 "librelist - dot com"
 msgstr ""
 
-#: ../../mod/suggest.php:41
+#: ../../mod/suggest.php:42
 msgid ""
 "No suggestions available. If this is a new site, please try again in 24 "
 "hours."
 msgstr ""
 
-#: ../../mod/suggest.php:58
-msgid "Ignore/Hide"
-msgstr ""
-
 #: ../../mod/pubsites.php:22
 msgid "Public Sites"
 msgstr ""
@@ -6721,69 +6611,69 @@ msgstr ""
 msgid "Registration Policy"
 msgstr ""
 
-#: ../../mod/register.php:35
+#: ../../mod/register.php:43
 msgid "Maximum daily site registrations exceeded. Please try again tomorrow."
 msgstr ""
 
-#: ../../mod/register.php:41
+#: ../../mod/register.php:49
 msgid ""
 "Please indicate acceptance of the Terms of Service. Registration failed."
 msgstr ""
 
-#: ../../mod/register.php:69
+#: ../../mod/register.php:77
 msgid "Passwords do not match."
 msgstr ""
 
-#: ../../mod/register.php:97
+#: ../../mod/register.php:105
 msgid ""
 "Registration successful. Please check your email for validation instructions."
 msgstr ""
 
-#: ../../mod/register.php:103
+#: ../../mod/register.php:111
 msgid "Your registration is pending approval by the site owner."
 msgstr ""
 
-#: ../../mod/register.php:106
+#: ../../mod/register.php:114
 msgid "Your registration can not be processed."
 msgstr ""
 
-#: ../../mod/register.php:141
+#: ../../mod/register.php:149
 msgid ""
 "This site has exceeded the number of allowed daily account registrations. "
 "Please try again tomorrow."
 msgstr ""
 
-#: ../../mod/register.php:152
+#: ../../mod/register.php:160
 msgid "Terms of Service"
 msgstr ""
 
-#: ../../mod/register.php:158
+#: ../../mod/register.php:166
 #, php-format
 msgid "I accept the %s for this website"
 msgstr ""
 
-#: ../../mod/register.php:160
+#: ../../mod/register.php:168
 #, php-format
 msgid "I am over 13 years of age and accept the %s for this website"
 msgstr ""
 
-#: ../../mod/register.php:175
+#: ../../mod/register.php:183
 msgid "Membership on this site is by invitation only."
 msgstr ""
 
-#: ../../mod/register.php:176
+#: ../../mod/register.php:184
 msgid "Please enter your invitation code"
 msgstr ""
 
-#: ../../mod/register.php:179
+#: ../../mod/register.php:187
 msgid "Your email address"
 msgstr ""
 
-#: ../../mod/register.php:180
+#: ../../mod/register.php:188
 msgid "Choose a password"
 msgstr ""
 
-#: ../../mod/register.php:181
+#: ../../mod/register.php:189
 msgid "Please re-enter your password"
 msgstr ""
 
@@ -6791,17 +6681,6 @@ msgstr ""
 msgid "Please login."
 msgstr ""
 
-#: ../../mod/post.php:114
-msgid ""
-"Remote authentication blocked. You are logged into this site locally. Please "
-"logout and retry."
-msgstr ""
-
-#: ../../mod/post.php:127
-#, php-format
-msgid "Welcome %s. Remote authentication successful."
-msgstr ""
-
 #: ../../mod/removeme.php:49
 msgid "Remove This Channel"
 msgstr ""
@@ -6830,23 +6709,23 @@ msgstr ""
 msgid "Remove My Account"
 msgstr ""
 
-#: ../../mod/directory.php:163
+#: ../../mod/directory.php:164
 msgid "Gender: "
 msgstr ""
 
-#: ../../mod/directory.php:222
+#: ../../mod/directory.php:225
 msgid "Finding:"
 msgstr ""
 
-#: ../../mod/directory.php:230
+#: ../../mod/directory.php:233
 msgid "next page"
 msgstr ""
 
-#: ../../mod/directory.php:230
+#: ../../mod/directory.php:233
 msgid "previous page"
 msgstr ""
 
-#: ../../mod/directory.php:237
+#: ../../mod/directory.php:240
 msgid "No entries (some entries may be hidden)."
 msgstr ""
 
@@ -6858,94 +6737,108 @@ msgstr ""
 msgid "Set your current mood and tell your friends"
 msgstr ""
 
-#: ../../view/theme/redbasic/php/config.php:68
+#: ../../view/theme/redbasic/php/config.php:74
 msgid "Scheme Default"
 msgstr ""
 
-#: ../../view/theme/redbasic/php/config.php:69
+#: ../../view/theme/redbasic/php/config.php:75
 msgid "red"
 msgstr ""
 
-#: ../../view/theme/redbasic/php/config.php:70
+#: ../../view/theme/redbasic/php/config.php:76
 msgid "black"
 msgstr ""
 
-#: ../../view/theme/redbasic/php/config.php:71
+#: ../../view/theme/redbasic/php/config.php:77
 msgid "silver"
 msgstr ""
 
-#: ../../view/theme/redbasic/php/config.php:82
+#: ../../view/theme/redbasic/php/config.php:88
 #: ../../view/theme/apw/php/config.php:234
+#: ../../view/theme/blogga/view/theme/blog/config.php:69
+#: ../../view/theme/blogga/php/config.php:69
 msgid "Theme settings"
 msgstr ""
 
-#: ../../view/theme/redbasic/php/config.php:83
+#: ../../view/theme/redbasic/php/config.php:89
 #: ../../view/theme/apw/php/config.php:235
 msgid "Set scheme"
 msgstr ""
 
-#: ../../view/theme/redbasic/php/config.php:84
+#: ../../view/theme/redbasic/php/config.php:90
 msgid "Navigation bar colour"
 msgstr ""
 
-#: ../../view/theme/redbasic/php/config.php:85
+#: ../../view/theme/redbasic/php/config.php:91
 msgid "Set font-colour for banner"
 msgstr ""
 
-#: ../../view/theme/redbasic/php/config.php:86
+#: ../../view/theme/redbasic/php/config.php:92
 msgid "Set the background colour"
 msgstr ""
 
-#: ../../view/theme/redbasic/php/config.php:87
+#: ../../view/theme/redbasic/php/config.php:93
 msgid "Set the background image"
 msgstr ""
 
-#: ../../view/theme/redbasic/php/config.php:88
+#: ../../view/theme/redbasic/php/config.php:94
 msgid "Set the background colour of items"
 msgstr ""
 
-#: ../../view/theme/redbasic/php/config.php:89
+#: ../../view/theme/redbasic/php/config.php:95
 msgid "Set the opacity of items"
 msgstr ""
 
-#: ../../view/theme/redbasic/php/config.php:90
+#: ../../view/theme/redbasic/php/config.php:96
 msgid "Set the basic colour for item icons"
 msgstr ""
 
-#: ../../view/theme/redbasic/php/config.php:91
+#: ../../view/theme/redbasic/php/config.php:97
 msgid "Set the hover colour for item icons"
 msgstr ""
 
-#: ../../view/theme/redbasic/php/config.php:92
+#: ../../view/theme/redbasic/php/config.php:98
+msgid "Set font-size for the entire application"
+msgstr ""
+
+#: ../../view/theme/redbasic/php/config.php:99
 #: ../../view/theme/apw/php/config.php:236
 msgid "Set font-size for posts and comments"
 msgstr ""
 
-#: ../../view/theme/redbasic/php/config.php:93
+#: ../../view/theme/redbasic/php/config.php:100
 msgid "Set font-colour for posts and comments"
 msgstr ""
 
-#: ../../view/theme/redbasic/php/config.php:94
+#: ../../view/theme/redbasic/php/config.php:101
 msgid "Set radius of corners"
 msgstr ""
 
-#: ../../view/theme/redbasic/php/config.php:95
+#: ../../view/theme/redbasic/php/config.php:102
 msgid "Set shadow depth of photos"
 msgstr ""
 
-#: ../../view/theme/redbasic/php/config.php:96
+#: ../../view/theme/redbasic/php/config.php:103
 msgid "Set maximum width of conversation regions"
 msgstr ""
 
-#: ../../view/theme/redbasic/php/config.php:97
+#: ../../view/theme/redbasic/php/config.php:104
 msgid "Set minimum opacity of nav bar - to hide it"
 msgstr ""
 
-#: ../../view/theme/redbasic/php/config.php:98
+#: ../../view/theme/redbasic/php/config.php:105
+msgid "Set size of conversation author photo"
+msgstr ""
+
+#: ../../view/theme/redbasic/php/config.php:106
+msgid "Set size of followup author photos"
+msgstr ""
+
+#: ../../view/theme/redbasic/php/config.php:107
 msgid "Sloppy photo albums"
 msgstr ""
 
-#: ../../view/theme/redbasic/php/config.php:98
+#: ../../view/theme/redbasic/php/config.php:107
 msgid "Are you a clean desk or a messy desk person?"
 msgstr ""
 
@@ -7074,113 +6967,56 @@ msgstr ""
 msgid "Right offset of the aside element"
 msgstr ""
 
-#: ../../boot.php:1278
+#: ../../view/theme/blogga/view/theme/blog/config.php:47
+#: ../../view/theme/blogga/php/config.php:47
+msgid "None"
+msgstr ""
+
+#: ../../view/theme/blogga/view/theme/blog/config.php:70
+#: ../../view/theme/blogga/php/config.php:70
+msgid "Header image"
+msgstr ""
+
+#: ../../view/theme/blogga/view/theme/blog/config.php:71
+#: ../../view/theme/blogga/php/config.php:71
+msgid "Header image only on profile pages"
+msgstr ""
+
+#: ../../boot.php:1255
 #, php-format
 msgid "Update %s failed. See error logs."
 msgstr ""
 
-#: ../../boot.php:1281
+#: ../../boot.php:1258
 #, php-format
 msgid "Update Error at %s"
 msgstr ""
 
-#: ../../boot.php:1438
+#: ../../boot.php:1415
 msgid ""
 "Create an account to access services and applications within the Red Matrix"
 msgstr ""
 
-#: ../../boot.php:1466
+#: ../../boot.php:1443
 msgid "Password"
 msgstr ""
 
-#: ../../boot.php:1467
+#: ../../boot.php:1444
 msgid "Remember me"
 msgstr ""
 
-#: ../../boot.php:1472
+#: ../../boot.php:1449
 msgid "Forgot your password?"
 msgstr ""
 
-#: ../../boot.php:1537
+#: ../../boot.php:1514
 msgid "permission denied"
 msgstr ""
 
-#: ../../boot.php:1538
+#: ../../boot.php:1515
 msgid "Got Zot?"
 msgstr ""
 
-#: ../../boot.php:1597
-msgid "Requested channel is not available."
-msgstr ""
-
-#: ../../boot.php:1609
-msgid " Sorry, you don't have the permission to view this profile. "
-msgstr ""
-
-#: ../../boot.php:1765
-msgid "Profiles"
-msgstr ""
-
-#: ../../boot.php:1765
-msgid "Manage/edit profiles"
-msgstr ""
-
-#: ../../boot.php:1769
-msgid "Edit Profile"
-msgstr ""
-
-#: ../../boot.php:1863 ../../boot.php:1943
-msgid "F d"
-msgstr ""
-
-#: ../../boot.php:1920
-msgid "Birthday Reminders"
-msgstr ""
-
-#: ../../boot.php:1921
-msgid "Birthdays this week:"
-msgstr ""
-
-#: ../../boot.php:1976
-msgid "[No description]"
-msgstr ""
-
-#: ../../boot.php:1994
-msgid "Event Reminders"
-msgstr ""
-
-#: ../../boot.php:1995
-msgid "Events this week:"
-msgstr ""
-
-#: ../../boot.php:2229
-msgid "Channel"
-msgstr ""
-
-#: ../../boot.php:2232
-msgid "Status Messages and Posts"
-msgstr ""
-
-#: ../../boot.php:2236
-msgid "About"
-msgstr ""
-
-#: ../../boot.php:2239
-msgid "Profile Details"
-msgstr ""
-
-#: ../../boot.php:2257
-msgid "Events and Calendar"
-msgstr ""
-
-#: ../../boot.php:2262
-msgid "Webpages"
-msgstr ""
-
-#: ../../boot.php:2265
-msgid "Manage Webpages"
-msgstr ""
-
-#: ../../boot.php:2547
+#: ../../boot.php:1907
 msgid "toggle mobile"
 msgstr ""
diff --git a/util/wp/post_to_red/post_to_red.php b/util/wp/post_to_red/post_to_red.php
new file mode 100644
index 000000000..e7f18985e
--- /dev/null
+++ b/util/wp/post_to_red/post_to_red.php
@@ -0,0 +1,489 @@
+<?php
+/*
+Plugin Name: CrossPost to Red Matrix
+Plugin URI: http://blog.duthied.com/2011/09/12/friendika-cross-poster-wordpress-plugin/
+Description: This plugin allows you to cross post to your Red Matrix account. Extended by Mike Macgirvin from a Friendica cross-posting tool 
+Version: 1.2
+Author: Devlon Duthied
+Author URI: http://blog.duthied.com
+*/
+
+/*  Copyright 2011 Devlon Duthie (email: duthied@gmail.com)
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License, version 2, as 
+    published by the Free Software Foundation.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+*/
+
+define("post_to_red_path", WP_PLUGIN_URL . "/" . str_replace(basename( __FILE__), "", plugin_basename(__FILE__)));
+define("post_to_red_version", "1.2");
+$plugin_dir = basename(dirname(__FILE__));
+$plugin = plugin_basename(__FILE__); 
+
+define("post_to_red_acct_name", "post_to_red_admin_options");
+
+function post_to_red_deactivate() {
+	delete_option('post_to_red_seed_location');
+	delete_option('post_to_red_acct_name');
+	delete_option('post_to_red_user_name');
+	delete_option('post_to_red_password');
+}
+
+function post_to_red_get_seed_location() {
+	return get_option('post_to_red_seed_location');
+}
+
+function post_to_red_get_acct_name() {
+	return get_option('post_to_red_acct_name');
+}
+
+function post_to_red_get_channel_name() {
+	return get_option('post_to_red_channel_name');
+}
+
+function post_to_red_get_password() {
+	return get_option('post_to_red_password');
+}
+
+function post_to_red_post($post_id) {
+
+	$post = get_post($post_id);
+	
+    if (isset($_POST['post_to_red'])) {
+		update_post_meta($post_id, 'post_to_red', '1');
+	} 
+
+	// if meta has been set
+	if (get_post_meta($post_id, "post_to_red", true) === '1') {
+
+		$user_name = post_to_red_get_acct_name();
+		$password = post_to_red_get_password();
+		$seed_location = post_to_red_get_seed_location();
+		$channel = post_to_red_get_channel_name();
+		$backlink = get_option('post_to_red_backlink');
+		
+		if ((isset($user_name)) && (isset($password)) && (isset($seed_location))) {
+			// remove potential comments
+			$message = preg_replace('/<!--(.*)-->/Uis', '', $post->post_content);
+
+			// get any tags and make them hashtags
+			$post_tags = get_the_tags($post_id);
+			if ($post_tags) {
+				foreach($post_tags as $tag) {
+			    	$tag_string .= "#" . $tag->name . " "; 
+			  	}
+			}
+
+			$message_id = site_url() . '/' . $post_id;
+
+			if (isset($tag_string)) {
+				$message .=  "<br />$tag_string";	
+			}
+
+			$cats = '';
+
+			$terms = get_the_terms($post_id,'category');
+			if($terms) {
+				foreach($terms as $term) {
+					if(strlen($cats))
+						$cats .= ',';
+					$cats .= htmlspecialchars_decode($term->name, ENT_COMPAT);
+				}
+			}
+
+
+
+			$bbcode = xpost_to_html2bbcode($message);
+
+			if($backlink)
+				$bbcode .= "\n\n" . _('Source:') . ' ' . '[url]' . get_permalink($post_id) . '[/url]';
+			
+			$url = $seed_location . '/api/statuses/update';
+			
+			$headers = array('Authorization' => 'Basic '.base64_encode("$user_name:$password"));
+			$body = array(
+				'title'     => xpost_to_html2bbcode($post->post_title),
+				'status'    => $bbcode,
+				'source'    => 'WordPress', 
+				'namespace' => 'wordpress',
+				'remote_id' => $message_id,
+				'permalink' => $post->guid
+			);
+			if($channel)
+				$body['channel'] = $channel;
+			if($cats)
+				$body['category'] = $cats;
+
+			// post:
+			$request = new WP_Http;
+			$result = $request->request($url , array( 'method' => 'POST', 'body' => $body, 'headers' => $headers));
+
+		}
+		
+	}
+}
+
+
+function post_to_red_delete_post($post_id) {
+
+	$post = get_post($post_id);
+	
+	// if meta has been set
+	if ((get_post_meta($post_id, "post_to_red", true) == '1') || (get_post_meta($post_id, "post_from_red", true) == '1')) {
+
+		$user_name = post_to_red_get_acct_name();
+		$password = post_to_red_get_password();
+		$seed_location = post_to_red_get_seed_location();
+		$channel = post_to_red_get_channel_name();
+		
+		if ((isset($user_name)) && (isset($password)) && (isset($seed_location))) {
+
+			$message_id = site_url() . '/' . $post_id;
+			$url = $seed_location . '/api/statuses/destroy';
+			
+			$headers = array('Authorization' => 'Basic '.base64_encode("$user_name:$password"));
+			$body = array(
+				'namespace' => 'wordpress',
+				'remote_id' => $message_id,
+			);
+			if($channel)
+				$body['channel'] = $channel;
+			
+			// post:
+			$request = new WP_Http;
+			$result = $request->request($url , array( 'method' => 'POST', 'body' => $body, 'headers' => $headers));
+
+		}
+		
+	}
+}
+
+function post_to_red_delete_comment($post_id) {
+
+	// The comment may already be destroyed so we can't query it or the parent post. That means
+	// we have to make a network call for any deleted comment to see if it's registered on Red. 
+	// We really need a "before_delete_comment" action in WP to make
+	// this more efficient.
+
+	$user_name = post_to_red_get_acct_name();
+	$password = post_to_red_get_password();
+	$seed_location = post_to_red_get_seed_location();
+	$channel = post_to_red_get_channel_name();
+		
+	if ((isset($user_name)) && (isset($password)) && (isset($seed_location))) {
+
+		$message_id = site_url() . '/' . $post_id;
+		$url = $seed_location . '/api/statuses/destroy';
+			
+		$headers = array('Authorization' => 'Basic '.base64_encode("$user_name:$password"));
+		$body = array(
+			'namespace' => 'wordpress',
+			'comment_id' => $message_id,
+		);
+		if($channel)
+			$body['channel'] = $channel;
+			
+		// post:
+		$request = new WP_Http;
+		$result = $request->request($url , array( 'method' => 'POST', 'body' => $body, 'headers' => $headers));
+	}
+}
+
+
+
+
+function post_to_red_displayAdminContent() {
+	
+	$seed_url = post_to_red_get_seed_location();
+	$password = post_to_red_get_password();
+	$user_acct = post_to_red_get_acct_name();
+	$channel = post_to_red_get_channel_name();
+	$backlink = get_option('post_to_red_backlink');
+	$backlink_checked = ((intval($backlink)) ? ' checked="checked" ' : '');
+	// debug...
+	// echo "seed location: $seed_url</br>";
+	// echo "password: $password</br>";
+	// echo "user_acct: $user_acct</br>";
+	
+	echo <<<EOF
+	<div class='wrap'>
+		<h2>CrossPost to Red Matrix</h2>
+		<p>This plugin allows you to cross post to your Red Matrix channel.</p>
+	</div>
+	
+	<div class="wrap">
+		<h2>Configuration</h2>
+		<form method="post" action="{$_SERVER["REQUEST_URI"]}">
+			Enter the login details of your Red Matrix account<br /><br />
+			Login (email): <input type="text" name="post_to_red_acct_name" value="{$user_acct}"/><br />
+			Password: <input type="password" name="post_to_red_password" value="{$password}"/><br />
+			Red Matrix URL: <input type="text" name="post_to_red_url" value="{$seed_url}"/><br />
+			Optional channel nickname: <input type="text" name="post_to_red_channel" value="{$channel}"/><br />
+			Add permalink to posts? <input type="checkbox" name="post_to_red_backlink" value="1" {$backlink_checked} /><br />
+			<input type="submit" value="Save" name="submit" />
+		</form>
+		<p></p>
+	</div>
+EOF;
+
+	if(isset($_POST['submit']))	{
+		echo "<div style='text-align:center;padding:4px;width:200px;background-color:#FFFF99;border:1xp solid #CCCCCC;color:#000000;'>Settings Saved!</div>";
+	}
+}
+
+function post_to_red_post_checkbox() {
+
+    add_meta_box(
+        'post_to_red_meta_box_id', 
+        'Cross Post to Red Matrix',
+        'post_to_red_post_meta_content',
+        'post',
+        'normal',
+        'default'
+    );
+}
+
+function post_to_red_post_meta_content($post_id) {
+    wp_nonce_field(plugin_basename( __FILE__ ), 'post_to_red_nonce');
+    echo '<input type="checkbox" name="post_to_red" value="1" /> Cross post?';
+}
+
+function post_to_red_post_field_data($post_id) {
+
+    // check if this isn't an auto save
+    if (defined('DOING_AUTOSAVE') && DOING_AUTOSAVE)
+        return;
+
+    // security check
+	if((! array_key_exists('post_to_red_nonce', $_POST))
+    || (!wp_verify_nonce( $_POST['post_to_red_nonce'], plugin_basename( __FILE__ ))))
+        return;
+
+    // now store data in custom fields based on checkboxes selected
+    if (isset($_POST['post_to_red'])) {
+		update_post_meta($post_id, 'post_to_red', '1');
+	} 
+}
+
+function post_to_red_display_admin_page() {
+	
+	if ((isset($_REQUEST["post_to_red_acct_name"])) && (isset($_REQUEST["post_to_red_password"]))) {
+		
+		$password = $_REQUEST["post_to_red_password"];
+		$red_url = $_REQUEST["post_to_red_url"];
+		$channelname = $_REQUEST['post_to_red_channel'];
+
+		
+		update_option('post_to_red_acct_name', $_REQUEST["post_to_red_acct_name"]);
+		update_option('post_to_red_channel_name', $channelname);
+		update_option('post_to_red_seed_location', $red_url);
+		update_option('post_to_red_password', $password);
+		update_option('post_to_red_backlink', $_REQUEST['post_to_red_backlink']);		
+	}
+	
+	post_to_red_displayAdminContent();
+}
+
+function post_to_red_settings_link($links) { 
+	$settings_link = '<a href="options-general.php?page=xpost-to-redmatrix">Settings</a>'; 
+  	array_unshift($links, $settings_link); 
+  	return $links; 
+}
+
+function post_to_red_admin() {
+	add_options_page("Crosspost to redmatrix", "Crosspost to redmatrix", "manage_options", "xpost-to-redmatrix", "post_to_red_display_admin_page");
+}
+
+register_deactivation_hook( __FILE__, 'post_to_red_deactivate' );
+
+add_filter("plugin_action_links_$plugin", "post_to_red_settings_link");
+
+add_action("admin_menu", "post_to_red_admin");
+add_action('publish_post', 'post_to_red_post');
+add_action('add_meta_boxes', 'post_to_red_post_checkbox');
+add_action('save_post', 'post_to_red_post_field_data');
+add_action('before_delete_post', 'post_to_red_delete_post');
+
+add_action('delete_comment', 'post_to_red_delete_comment');
+
+add_filter('xmlrpc_methods', 'red_xmlrpc_methods');
+
+add_filter('get_avatar', 'post_to_red_get_avatar',10,5);
+
+
+function red_xmlrpc_methods($methods) {
+	$methods['red.Comment'] = 'red_comment';
+	return $methods;
+}
+
+function red_comment($args) {
+	global $wp_xmlrpc_server;
+	$wp_xmlrpc_server->escape( $args );
+
+	$blog_id  = $args[0];
+	$username = $args[1];
+	$password = $args[2];
+	$post       = $args[3];
+	$content_struct = $args[4];
+
+	if ( ! $user = $wp_xmlrpc_server->login( $username, $password ) )
+		return $wp_xmlrpc_server->error;
+
+	if ( is_numeric($post) )
+		$post_id = absint($post);
+	else
+		$post_id = url_to_postid($post);
+
+	if ( ! $post_id )
+		return new IXR_Error( 404, __( 'Invalid post ID.' ) );
+	if ( ! get_post($post_id) )
+		return new IXR_Error( 404, __( 'Invalid post ID.' ) );
+
+	$comment['comment_post_ID'] = $post_id;
+
+	$comment['comment_author'] = '';
+	if ( isset($content_struct['author']) )
+		$comment['comment_author'] = $content_struct['author'];
+
+	$comment['comment_author_email'] = '';
+	if ( isset($content_struct['author_email']) )
+		$comment['comment_author_email'] = $content_struct['author_email'];
+
+	$comment['comment_author_url'] = '';
+	if ( isset($content_struct['author_url']) )
+		$comment['comment_author_url'] = $content_struct['author_url'];
+
+	$comment['user_ID'] = 0;
+
+	if ( get_option('require_name_email') ) {
+		if ( 6 > strlen($comment['comment_author_email']) || '' == $comment['comment_author'] )
+			return new IXR_Error( 403, __( 'Comment author name and email are required' ) );
+		elseif ( !is_email($comment['comment_author_email']) )
+			return new IXR_Error( 403, __( 'A valid email address is required' ) );
+	}
+
+	if(isset($content_struct['comment_id'])) {
+		$comment['comment_ID'] = intval($content_struct['comment_id']);
+		$edit = true;
+	}
+	$comment['comment_post_ID']  = $post_id;
+	$comment['comment_parent']   = isset($content_struct['comment_parent']) ? absint($content_struct['comment_parent']) : 0;
+	$comment['comment_content']  = isset($content_struct['content'])        ? $content_struct['content'] : null;
+
+	do_action('xmlrpc_call', 'red.Comment');
+
+	if($edit) {
+		$result = wp_update_comment($comment);
+		$comment_ID = $comment['comment_ID'];
+	}
+	else {
+       	$comment_ID = wp_new_comment( $comment );
+		if($comment_ID)
+			wp_set_comment_status($comment_ID,'approve');
+	}
+
+	if(isset($content_struct['red_avatar']))
+		add_comment_meta($comment_ID,'red_avatar',$content_struct['red_avatar'],true);
+
+	do_action( 'xmlrpc_call_success_red_Comment', $comment_ID, $args );
+
+	return $comment_ID;
+}
+
+function post_to_red_get_avatar($avatar,$id_or_email,$size,$default,$alt) {
+
+	if(! is_object($id_or_email))
+		return $avatar;
+	if((! array_key_exists('comment_author_email',$id_or_email)) || (empty($id_or_email->comment_author_email)))
+		return $avatar;
+	if((! array_key_exists('comment_ID', $id_or_email)) || (! intval($id_or_email->comment_ID)))
+		return $avatar;
+	$l = get_comment_meta($id_or_email->comment_ID,'red_avatar',true);
+	if($l) {
+		$safe_alt = esc_attr($alt);
+		$avatar = "<img alt='{$safe_alt}' src='{$l}' class='avatar avatar-{$size} photo' height='{$size}' width='{$size}' />";
+	}
+	return $avatar;
+}
+
+
+// from:
+// http://www.docgate.com/tutorial/php/how-to-convert-html-to-bbcode-with-php-script.html
+function xpost_to_html2bbcode($text) {
+	$htmltags = array(
+		'/\<b\>(.*?)\<\/b\>/is',
+		'/\<i\>(.*?)\<\/i\>/is',
+		'/\<u\>(.*?)\<\/u\>/is',
+		'/\<ul.*?\>(.*?)\<\/ul\>/is',
+		'/\<li\>(.*?)\<\/li\>/is',
+		'/\<img(.*?) src=\"(.*?)\" alt=\"(.*?)\" title=\"Smile(y?)\" \/\>/is',		// some smiley
+		'/\<img(.*?) src=\"http:\/\/(.*?)\" (.*?)\>/is',
+		'/\<img(.*?) src=\"(.*?)\" alt=\":(.*?)\" .*? \/\>/is',						// some smiley
+		'/\<div class=\"quotecontent\"\>(.*?)\<\/div\>/is',	
+		'/\<div class=\"codecontent\"\>(.*?)\<\/div\>/is',	
+		'/\<div class=\"quotetitle\"\>(.*?)\<\/div\>/is',	
+		'/\<div class=\"codetitle\"\>(.*?)\<\/div\>/is',
+		'/\<cite.*?\>(.*?)\<\/cite\>/is',
+		'/\<blockquote.*?\>(.*?)\<\/blockquote\>/is',
+		'/\<div\>(.*?)\<\/div\>/is',
+		'/\<code\>(.*?)\<\/code\>/is',
+		'/\<br(.*?)\>/is',
+		'/\<strong\>(.*?)\<\/strong\>/is',
+		'/\<em\>(.*?)\<\/em\>/is',
+		'/\<a href=\"mailto:(.*?)\"(.*?)\>(.*?)\<\/a\>/is',
+		'/\<a .*?href=\"(.*?)\"(.*?)\>http:\/\/(.*?)\<\/a\>/is',
+		'/\<a .*?href=\"(.*?)\"(.*?)\>(.*?)\<\/a\>/is'
+	);
+
+	$bbtags = array(
+		'[b]$1[/b]',
+		'[i]$1[/i]',
+		'[u]$1[/u]',
+		'[list]$1[/list]',
+		'[*]$1',
+		'$3',
+		'[img]http://$2[/img]' . "\n",
+		':$3',
+		'\[quote\]$1\[/quote\]',
+		'\[code\]$1\[/code\]',
+		'',
+		'',
+		'',
+		'\[quote\]$1\[/quote\]',
+		'$1',
+		'\[code\]$1\[/code\]',
+		"\n",
+		'[b]$1[/b]',
+		'[i]$1[/i]',
+		'[email=$1]$3[/email]',
+		'[url]$1[/url]',
+		'[url=$1]$3[/url]'
+	);
+
+	$text = str_replace ("\n", ' ', $text);
+	$ntext = preg_replace ($htmltags, $bbtags, $text);
+	$ntext = preg_replace ($htmltags, $bbtags, $ntext);
+
+	// for too large text and cannot handle by str_replace
+	if (!$ntext) {
+		$ntext = str_replace(array('<br>', '<br />'), "\n", $text);
+		$ntext = str_replace(array('<strong>', '</strong>'), array('[b]', '[/b]'), $ntext);
+		$ntext = str_replace(array('<em>', '</em>'), array('[i]', '[/i]'), $ntext);
+	}
+
+	$ntext = strip_tags($ntext);
+	
+	$ntext = trim(html_entity_decode($ntext,ENT_QUOTES,'UTF-8'));
+	return $ntext;
+}
+
+
diff --git a/util/wp/post_to_red/readme.txt b/util/wp/post_to_red/readme.txt
new file mode 100644
index 000000000..e27c46236
--- /dev/null
+++ b/util/wp/post_to_red/readme.txt
@@ -0,0 +1,39 @@
+=== CrossPost to redmatrix ===
+Contributors: duthied, macgirvin
+Donate link: TBD
+Tags: redmatrix, crosspost
+Requires at least: 3.2
+Tested up to: 3.2
+Stable tag: 1.2
+
+CrossPost to Red Matrix for WordPress
+
+== Description ==
+This plugin allows you to cross post to your Red Matrix account.
+
+**Note, this plugin converts the html from wordpress into bbcode.  
+The bbcode conversion doesn't handle height and width of an image, so be warned that if you post a very large
+image that is resized via height and with attributes, those attributes won't be honored in the resulatant post.
+
+== Changelog ==
+= 1.2 =
+* ensured no function name collision
+
+= 1.1 =
+* Added feedback to settings form post.
+
+= 1.0 =
+* Initial release.
+
+== Installation ==
+
+1. Install the plugin from your Wordpress admin panel.
+
+OR
+
+1. Upload the plugin folder to the `/wp-content/plugins/` directory.
+2. Activate the plugin through the 'Plugins' menu in WordPress.
+3. On the settings page enter your account name and password and the nickname of the channel to post to -  then click the submit button
+4. To cross-post ensure the check box in the 'Cross Post To redmatrix' is checked before publishing.
+
+== Frequently Asked Questions ==
author	Thomas Willingham <founder@kakste.com>	2013-12-18 18:21:47 +0000
committer	Thomas Willingham <founder@kakste.com>	2013-12-18 18:21:47 +0000
commit	7ac00d02d110ec2f2d33779d8316e17c13cda149 (patch)
tree	03b41e86e0790895fe56488beea2b5f554fbaeae /util
parent	733cb37ef14eb4dd5408e1a8c453f13cd41952eb (diff)
parent	df34aaba4733b1c38ac2b8b9c19c5a945d5a841b (diff)
download	volse-hubzilla-7ac00d02d110ec2f2d33779d8316e17c13cda149.tar.gz volse-hubzilla-7ac00d02d110ec2f2d33779d8316e17c13cda149.tar.bz2 volse-hubzilla-7ac00d02d110ec2f2d33779d8316e17c13cda149.zip