Merge pull request #8 from friendica/master

merging red master into nuvola.red

7 files changed, 3140 insertions, 2925 deletions

diff --git a/util/Doxyfile b/util/Doxyfile
index fce6c1359..44fef3838 100644
--- a/util/Doxyfile
+++ b/util/Doxyfile
@@ -1,8 +1,8 @@
-INPUT = boot.php mod include setup util view
+INPUT = index.php boot.php mod/ include/ setup/ util/ view/
 RECURSIVE = YES
-PROJECT_NAME = "The Red Matrix"
+PROJECT_NAME = "The RedMatrix"
 PROJECT_LOGO = images/rm-64.png
-EXCLUDE = .htconfig.php library doc .git
+EXCLUDE = .htconfig.php library/ doc/ vendor/ .git/ util/zotsh/easywebdav/
 EXCLUDE_PATTERNS = *smarty3* *strings.php *.out *test*
 OUTPUT_DIRECTORY = doc
 GENERATE_HTML = YES
@@ -16,6 +16,5 @@ USE_MDFILE_AS_MAINPAGE = README
 REFERENCED_BY_RELATION = YES
 GENERATE_TREEVIEW = YES
 HTML_FOOTER = util/Doxygen.footer
-
-
-
+ALIASES += "license=@par License:\n"
+ALIASES += "fixme=\xrefitem fixme \"Fixme\" \"Fixme List\""
diff --git a/util/add_addon_repo b/util/add_addon_repo
index caefe820c..4979c06bc 100755
--- a/util/add_addon_repo
+++ b/util/add_addon_repo
@@ -1,6 +1,6 @@
 #!/bin/sh -f
 
-if [ $# -eq '3' ]; then
+if [ $# -ne 2 ]; then
 	echo usage: $0 repo_url nickname
 	exit 1
 fi
@@ -8,29 +8,31 @@ fi
 mkdir -p extend/addon/$2
 mkdir addon > /dev/null 2>&1
 git clone $1 extend/addon/$2
-if [ $? -eq '0' ]; then
+if [ $? -ne 0 ]; then
 	exit $?
 fi
 
 filelist=(`ls extend/addon/$2`)
 
+
 cd addon
 for a in "${filelist[@]}" ; do
 	base=`basename $a`
 	if [ $base = '.git' ]; then
-		echo 'ignoring git'
+#		echo 'ignoring git'
 		continue;
 	fi
 	if [ ! -d ../extend/addon/$2/$base ]; then
-		echo $a 'not a directory'
+#		echo $a 'not a directory'
 		continue;
 	fi
-	echo linking $base 
 	if [ -x $base ]; then
-		echo $base 'file exists'
+#		echo $base 'file exists'
 		continue;
 	fi
 
+	echo linking $base 
+
 	ln -s ../extend/addon/$2/$base $base
 done
 
diff --git a/util/add_theme_repo b/util/add_theme_repo
index fe4384604..70a8c6432 100755
--- a/util/add_theme_repo
+++ b/util/add_theme_repo
@@ -1,14 +1,14 @@
 #!/bin/sh -f
 
 
-if [ $# -eq '3' ]; then
+if [ $# -ne 2 ]; then
 	echo usage: $0 repo_url nickname
 	exit 1
 fi
 
 mkdir -p extend/theme/$2
 git clone $1 extend/theme/$2
-if [ $? -eq '0' ]; then
+if [ $? -ne 0 ]; then
 	exit $?
 fi
 
@@ -18,19 +18,19 @@ cd view/theme
 for a in "${filelist[@]}" ; do
 	base=`basename $a`
 	if [ $base = '.git' ]; then
-		echo 'ignoring git'
+#		echo 'ignoring git'
 		continue;
 	fi
 	if [ ! -d ../../extend/theme/$2/$base ]; then
-		echo $a 'not a directory'
+#		echo $a 'not a directory'
 		continue;
 	fi
-	echo linking $base 
 	if [ -x $base ]; then
-		echo $base 'file exists'
+#		echo $base 'file exists'
 		continue;
 	fi
 
+	echo linking $base 
 	ln -s ../../extend/theme/$2/$base $base
 done
 
diff --git a/util/messages.po b/util/messages.po
index 05e49605d..43c36f167 100644
--- a/util/messages.po
+++ b/util/messages.po
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: 2015-02-20.950\n"
+"Project-Id-Version: 2015-03-20.977\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-02-20 00:04-0800\n"
+"POT-Creation-Date: 2015-03-20 00:03-0700\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,92 +17,386 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../../include/dba/dba_driver.php:142
+#: ../../include/dba/dba_driver.php:141
 #, php-format
 msgid "Cannot locate DNS info for database server '%s'"
 msgstr ""
 
-#: ../../include/photo/photo_driver.php:680 ../../include/photos.php:52
-#: ../../mod/profile_photo.php:143 ../../mod/profile_photo.php:302
-#: ../../mod/profile_photo.php:424 ../../mod/photos.php:91
-#: ../../mod/photos.php:625
+#: ../../include/photo/photo_driver.php:687 ../../mod/profile_photo.php:143
+#: ../../mod/profile_photo.php:302 ../../mod/profile_photo.php:424
+#: ../../mod/photos.php:91 ../../mod/photos.php:625
 msgid "Profile Photos"
 msgstr ""
 
-#: ../../include/photos.php:15 ../../include/attach.php:137
-#: ../../include/attach.php:184 ../../include/attach.php:247
-#: ../../include/attach.php:261 ../../include/attach.php:301
-#: ../../include/attach.php:315 ../../include/attach.php:339
-#: ../../include/attach.php:532 ../../include/attach.php:606
-#: ../../include/chat.php:116 ../../include/items.php:4072
-#: ../../mod/profile.php:64 ../../mod/profile.php:72
-#: ../../mod/achievements.php:30 ../../mod/editblock.php:65
-#: ../../mod/manage.php:6 ../../mod/api.php:26 ../../mod/api.php:31
-#: ../../mod/blocks.php:67 ../../mod/blocks.php:75 ../../mod/connedit.php:321
-#: ../../mod/editpost.php:13 ../../mod/profile_photo.php:264
-#: ../../mod/profile_photo.php:277 ../../mod/block.php:22
-#: ../../mod/block.php:72 ../../mod/network.php:12 ../../mod/events.php:219
-#: ../../mod/settings.php:560 ../../mod/group.php:9 ../../mod/setup.php:207
-#: ../../mod/common.php:35 ../../mod/suggest.php:26
-#: ../../mod/connections.php:169 ../../mod/item.php:197 ../../mod/item.php:205
-#: ../../mod/item.php:938 ../../mod/thing.php:247 ../../mod/thing.php:264
-#: ../../mod/thing.php:299 ../../mod/pdledit.php:21 ../../mod/appman.php:66
-#: ../../mod/authtest.php:13 ../../mod/editlayout.php:64
-#: ../../mod/editlayout.php:89 ../../mod/chat.php:90 ../../mod/chat.php:95
-#: ../../mod/editwebpage.php:64 ../../mod/editwebpage.php:86
-#: ../../mod/editwebpage.php:118 ../../mod/rate.php:110
-#: ../../mod/invite.php:13 ../../mod/invite.php:104 ../../mod/locs.php:77
-#: ../../mod/sources.php:66 ../../mod/menu.php:61 ../../mod/filestorage.php:18
-#: ../../mod/filestorage.php:72 ../../mod/filestorage.php:87
-#: ../../mod/filestorage.php:114 ../../mod/fsuggest.php:78
-#: ../../mod/poke.php:128 ../../mod/profiles.php:188
-#: ../../mod/profiles.php:576 ../../mod/viewsrc.php:14
-#: ../../mod/webpages.php:67 ../../mod/delegate.php:6
-#: ../../mod/viewconnections.php:22 ../../mod/viewconnections.php:27
-#: ../../mod/regmod.php:17 ../../mod/message.php:16 ../../mod/mitem.php:106
-#: ../../mod/mood.php:111 ../../mod/layouts.php:67 ../../mod/layouts.php:74
-#: ../../mod/layouts.php:85 ../../mod/like.php:178 ../../mod/mail.php:114
-#: ../../mod/notifications.php:66 ../../mod/new_channel.php:68
-#: ../../mod/new_channel.php:99 ../../mod/photos.php:68 ../../mod/page.php:28
-#: ../../mod/page.php:78 ../../mod/bookmarks.php:46 ../../mod/channel.php:90
-#: ../../mod/channel.php:199 ../../mod/channel.php:242
-#: ../../mod/register.php:72 ../../mod/service_limits.php:7
-#: ../../mod/sharedwithme.php:7 ../../index.php:190 ../../index.php:390
-msgid "Permission denied."
+#: ../../include/security.php:349
+msgid ""
+"The form security token was not correct. This probably happened because the "
+"form has been opened for too long (>3 hours) before submitting it."
+msgstr ""
+
+#: ../../include/notify.php:23
+msgid "created a new post"
 msgstr ""
 
-#: ../../include/photos.php:105
+#: ../../include/notify.php:24
 #, php-format
-msgid "Image exceeds website size limit of %lu bytes"
+msgid "commented on %s's post"
 msgstr ""
 
-#: ../../include/photos.php:112
-msgid "Image file is empty."
+#: ../../include/group.php:26
+msgid ""
+"A deleted group with this name was revived. Existing item permissions "
+"<strong>may</strong> apply to this group and any future members. If this is "
+"not what you intended, please create another group with a different name."
 msgstr ""
 
-#: ../../include/photos.php:141 ../../mod/profile_photo.php:217
-msgid "Unable to process image"
+#: ../../include/group.php:235
+msgid "Default privacy group for new contacts"
 msgstr ""
 
-#: ../../include/photos.php:213
-msgid "Photo storage failed."
+#: ../../include/group.php:254 ../../mod/admin.php:821
+msgid "All Channels"
 msgstr ""
 
-#: ../../include/photos.php:355 ../../include/conversation.php:1589
-msgid "Photo Albums"
+#: ../../include/group.php:276
+msgid "edit"
 msgstr ""
 
-#: ../../include/photos.php:359
-msgid "Upload New Photos"
+#: ../../include/group.php:298
+msgid "Collections"
 msgstr ""
 
-#: ../../include/notify.php:23
-msgid "created a new post"
+#: ../../include/group.php:299
+msgid "Edit collection"
 msgstr ""
 
-#: ../../include/notify.php:24
+#: ../../include/group.php:300
+msgid "Create a new collection"
+msgstr ""
+
+#: ../../include/group.php:301
+msgid "Channels not in any collection"
+msgstr ""
+
+#: ../../include/group.php:303 ../../include/widgets.php:275
+msgid "add"
+msgstr ""
+
+#: ../../include/bbcode.php:115 ../../include/bbcode.php:694
+#: ../../include/bbcode.php:697 ../../include/bbcode.php:702
+#: ../../include/bbcode.php:705 ../../include/bbcode.php:708
+#: ../../include/bbcode.php:711 ../../include/bbcode.php:716
+#: ../../include/bbcode.php:719 ../../include/bbcode.php:724
+#: ../../include/bbcode.php:727 ../../include/bbcode.php:730
+#: ../../include/bbcode.php:733
+msgid "Image/photo"
+msgstr ""
+
+#: ../../include/bbcode.php:150 ../../include/bbcode.php:744
+msgid "Encrypted content"
+msgstr ""
+
+#: ../../include/bbcode.php:168
+msgid "Install design element: "
+msgstr ""
+
+#: ../../include/bbcode.php:174
+msgid "QR code"
+msgstr ""
+
+#: ../../include/bbcode.php:223
 #, php-format
-msgid "commented on %s's post"
+msgid "%1$s wrote the following %2$s %3$s"
+msgstr ""
+
+#: ../../include/bbcode.php:225
+msgid "post"
+msgstr ""
+
+#: ../../include/bbcode.php:447
+msgid "Different viewers will see this text differently"
+msgstr ""
+
+#: ../../include/bbcode.php:662
+msgid "$1 spoiler"
+msgstr ""
+
+#: ../../include/bbcode.php:682
+msgid "$1 wrote:"
+msgstr ""
+
+#: ../../include/identity.php:31 ../../mod/item.php:1078
+msgid "Unable to obtain identity information from database"
+msgstr ""
+
+#: ../../include/identity.php:66
+msgid "Empty name"
+msgstr ""
+
+#: ../../include/identity.php:68
+msgid "Name too long"
+msgstr ""
+
+#: ../../include/identity.php:169
+msgid "No account identifier"
+msgstr ""
+
+#: ../../include/identity.php:182
+msgid "Nickname is required."
+msgstr ""
+
+#: ../../include/identity.php:196
+msgid "Reserved nickname. Please choose another."
+msgstr ""
+
+#: ../../include/identity.php:201 ../../include/dimport.php:34
+msgid ""
+"Nickname has unsupported characters or is already being used on this site."
+msgstr ""
+
+#: ../../include/identity.php:283
+msgid "Unable to retrieve created identity"
+msgstr ""
+
+#: ../../include/identity.php:343
+msgid "Default Profile"
+msgstr ""
+
+#: ../../include/identity.php:387 ../../include/identity.php:388
+#: ../../include/identity.php:395 ../../include/widgets.php:430
+#: ../../include/profile_selectors.php:80 ../../mod/settings.php:339
+#: ../../mod/settings.php:343 ../../mod/settings.php:344
+#: ../../mod/settings.php:347 ../../mod/settings.php:358
+#: ../../mod/connedit.php:567
+msgid "Friends"
+msgstr ""
+
+#: ../../include/identity.php:643
+msgid "Requested channel is not available."
+msgstr ""
+
+#: ../../include/identity.php:691 ../../mod/profile.php:16
+#: ../../mod/achievements.php:11 ../../mod/blocks.php:29
+#: ../../mod/connect.php:13 ../../mod/hcard.php:8 ../../mod/editlayout.php:28
+#: ../../mod/editwebpage.php:28 ../../mod/filestorage.php:53
+#: ../../mod/webpages.php:29 ../../mod/editblock.php:29
+#: ../../mod/layouts.php:29
+msgid "Requested profile is not available."
+msgstr ""
+
+#: ../../include/identity.php:842 ../../include/widgets.php:136
+#: ../../include/widgets.php:175 ../../include/conversation.php:940
+#: ../../include/Contact.php:107 ../../mod/match.php:62
+#: ../../mod/directory.php:291 ../../mod/suggest.php:51
+msgid "Connect"
+msgstr ""
+
+#: ../../include/identity.php:856 ../../mod/profiles.php:774
+msgid "Change profile photo"
+msgstr ""
+
+#: ../../include/identity.php:863
+msgid "Profiles"
+msgstr ""
+
+#: ../../include/identity.php:863
+msgid "Manage/edit profiles"
+msgstr ""
+
+#: ../../include/identity.php:864 ../../mod/profiles.php:775
+msgid "Create New Profile"
+msgstr ""
+
+#: ../../include/identity.php:867 ../../include/nav.php:95
+msgid "Edit Profile"
+msgstr ""
+
+#: ../../include/identity.php:880 ../../mod/profiles.php:786
+msgid "Profile Image"
+msgstr ""
+
+#: ../../include/identity.php:883
+msgid "visible to everybody"
+msgstr ""
+
+#: ../../include/identity.php:884 ../../mod/profiles.php:669
+#: ../../mod/profiles.php:790
+msgid "Edit visibility"
+msgstr ""
+
+#: ../../include/identity.php:896 ../../include/bb2diaspora.php:450
+#: ../../include/event.php:40 ../../mod/events.php:645
+#: ../../mod/directory.php:223
+msgid "Location:"
+msgstr ""
+
+#: ../../include/identity.php:900 ../../include/identity.php:1142
+msgid "Gender:"
+msgstr ""
+
+#: ../../include/identity.php:901 ../../include/identity.php:1186
+msgid "Status:"
+msgstr ""
+
+#: ../../include/identity.php:902 ../../include/identity.php:1197
+msgid "Homepage:"
+msgstr ""
+
+#: ../../include/identity.php:903
+msgid "Online Now"
+msgstr ""
+
+#: ../../include/identity.php:986 ../../include/identity.php:1066
+#: ../../mod/ping.php:324
+msgid "g A l F d"
+msgstr ""
+
+#: ../../include/identity.php:987 ../../include/identity.php:1067
+msgid "F d"
+msgstr ""
+
+#: ../../include/identity.php:1032 ../../include/identity.php:1107
+#: ../../mod/ping.php:346
+msgid "[today]"
+msgstr ""
+
+#: ../../include/identity.php:1044
+msgid "Birthday Reminders"
+msgstr ""
+
+#: ../../include/identity.php:1045
+msgid "Birthdays this week:"
+msgstr ""
+
+#: ../../include/identity.php:1100
+msgid "[No description]"
+msgstr ""
+
+#: ../../include/identity.php:1118
+msgid "Event Reminders"
+msgstr ""
+
+#: ../../include/identity.php:1119
+msgid "Events this week:"
+msgstr ""
+
+#: ../../include/identity.php:1132 ../../include/identity.php:1249
+#: ../../include/apps.php:138 ../../mod/profperm.php:112
+msgid "Profile"
+msgstr ""
+
+#: ../../include/identity.php:1140 ../../mod/settings.php:1045
+msgid "Full Name:"
+msgstr ""
+
+#: ../../include/identity.php:1147
+msgid "Like this channel"
+msgstr ""
+
+#: ../../include/identity.php:1158 ../../include/conversation.php:1692
+#: ../../include/ItemObject.php:179 ../../include/taxonomy.php:391
+#: ../../mod/photos.php:1007
+msgctxt "noun"
+msgid "Like"
+msgid_plural "Likes"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../../include/identity.php:1171
+msgid "j F, Y"
+msgstr ""
+
+#: ../../include/identity.php:1172
+msgid "j F"
+msgstr ""
+
+#: ../../include/identity.php:1179
+msgid "Birthday:"
+msgstr ""
+
+#: ../../include/identity.php:1183
+msgid "Age:"
+msgstr ""
+
+#: ../../include/identity.php:1192
+#, php-format
+msgid "for %1$d %2$s"
+msgstr ""
+
+#: ../../include/identity.php:1195 ../../mod/profiles.php:691
+msgid "Sexual Preference:"
+msgstr ""
+
+#: ../../include/identity.php:1199 ../../mod/profiles.php:693
+msgid "Hometown:"
+msgstr ""
+
+#: ../../include/identity.php:1201
+msgid "Tags:"
+msgstr ""
+
+#: ../../include/identity.php:1203 ../../mod/profiles.php:694
+msgid "Political Views:"
+msgstr ""
+
+#: ../../include/identity.php:1205
+msgid "Religion:"
+msgstr ""
+
+#: ../../include/identity.php:1207
+msgid "About:"
+msgstr ""
+
+#: ../../include/identity.php:1209
+msgid "Hobbies/Interests:"
+msgstr ""
+
+#: ../../include/identity.php:1211 ../../mod/profiles.php:697
+msgid "Likes:"
+msgstr ""
+
+#: ../../include/identity.php:1213 ../../mod/profiles.php:698
+msgid "Dislikes:"
+msgstr ""
+
+#: ../../include/identity.php:1215
+msgid "Contact information and Social Networks:"
+msgstr ""
+
+#: ../../include/identity.php:1217
+msgid "My other channels:"
+msgstr ""
+
+#: ../../include/identity.php:1219
+msgid "Musical interests:"
+msgstr ""
+
+#: ../../include/identity.php:1221
+msgid "Books, literature:"
+msgstr ""
+
+#: ../../include/identity.php:1223
+msgid "Television:"
+msgstr ""
+
+#: ../../include/identity.php:1225
+msgid "Film/dance/culture/entertainment:"
+msgstr ""
+
+#: ../../include/identity.php:1227
+msgid "Love/Romance:"
+msgstr ""
+
+#: ../../include/identity.php:1229
+msgid "Work/employment:"
+msgstr ""
+
+#: ../../include/identity.php:1231
+msgid "School/education:"
+msgstr ""
+
+#: ../../include/identity.php:1251
+msgid "Like this thing"
 msgstr ""
 
 #: ../../include/page_widgets.php:6
@@ -112,12 +406,12 @@ msgstr ""
 #: ../../include/page_widgets.php:8 ../../include/page_widgets.php:36
 #: ../../include/RedDAV/RedBrowser.php:267 ../../include/ItemObject.php:100
 #: ../../include/apps.php:254 ../../include/menu.php:42
-#: ../../mod/editblock.php:143 ../../mod/blocks.php:132
-#: ../../mod/editpost.php:113 ../../mod/settings.php:645
+#: ../../mod/settings.php:644 ../../mod/blocks.php:132
 #: ../../mod/connections.php:382 ../../mod/connections.php:395
 #: ../../mod/connections.php:414 ../../mod/thing.php:233
 #: ../../mod/editlayout.php:139 ../../mod/editwebpage.php:174
-#: ../../mod/menu.php:78 ../../mod/webpages.php:162 ../../mod/layouts.php:167
+#: ../../mod/editpost.php:113 ../../mod/menu.php:78 ../../mod/webpages.php:162
+#: ../../mod/editblock.php:143 ../../mod/layouts.php:167
 msgid "Edit"
 msgstr ""
 
@@ -126,9 +420,9 @@ msgstr ""
 msgid "View"
 msgstr ""
 
-#: ../../include/page_widgets.php:40 ../../include/ItemObject.php:677
-#: ../../include/conversation.php:1152 ../../mod/events.php:651
-#: ../../mod/webpages.php:166 ../../mod/photos.php:964
+#: ../../include/page_widgets.php:40 ../../include/conversation.php:1152
+#: ../../include/ItemObject.php:677 ../../mod/events.php:651
+#: ../../mod/webpages.php:166 ../../mod/photos.php:970
 msgid "Preview"
 msgstr ""
 
@@ -152,7 +446,7 @@ msgstr ""
 msgid "Edited"
 msgstr ""
 
-#: ../../include/widgets.php:35 ../../include/taxonomy.php:255
+#: ../../include/widgets.php:35 ../../include/taxonomy.php:264
 #: ../../include/contact_widgets.php:92
 msgid "Categories"
 msgstr ""
@@ -166,7 +460,7 @@ msgstr ""
 msgid "System"
 msgstr ""
 
-#: ../../include/widgets.php:94 ../../include/conversation.php:1494
+#: ../../include/widgets.php:94 ../../include/conversation.php:1498
 msgid "Personal"
 msgstr ""
 
@@ -178,13 +472,6 @@ msgstr ""
 msgid "Edit Personal App"
 msgstr ""
 
-#: ../../include/widgets.php:136 ../../include/widgets.php:175
-#: ../../include/identity.php:840 ../../include/Contact.php:107
-#: ../../include/conversation.php:940 ../../mod/suggest.php:51
-#: ../../mod/directory.php:272 ../../mod/match.php:62
-msgid "Connect"
-msgstr ""
-
 #: ../../include/widgets.php:138 ../../mod/suggest.php:53
 msgid "Ignore/Hide"
 msgstr ""
@@ -218,699 +505,825 @@ msgstr ""
 msgid "Notes"
 msgstr ""
 
-#: ../../include/widgets.php:192 ../../include/text.php:838
-#: ../../include/text.php:850 ../../mod/filer.php:50 ../../mod/rbmark.php:28
-#: ../../mod/rbmark.php:98 ../../mod/admin.php:1344 ../../mod/admin.php:1365
+#: ../../include/widgets.php:192 ../../include/text.php:833
+#: ../../include/text.php:845 ../../mod/rbmark.php:28 ../../mod/rbmark.php:98
+#: ../../mod/filer.php:50 ../../mod/admin.php:1412 ../../mod/admin.php:1432
 msgid "Save"
 msgstr ""
 
-#: ../../include/widgets.php:264
+#: ../../include/widgets.php:266
 msgid "Remove term"
 msgstr ""
 
-#: ../../include/widgets.php:272 ../../include/features.php:72
+#: ../../include/widgets.php:274 ../../include/features.php:73
 msgid "Saved Searches"
 msgstr ""
 
-#: ../../include/widgets.php:273 ../../include/group.php:303
-msgid "add"
-msgstr ""
-
-#: ../../include/widgets.php:302 ../../include/features.php:84
+#: ../../include/widgets.php:304 ../../include/features.php:85
 #: ../../include/contact_widgets.php:57
 msgid "Saved Folders"
 msgstr ""
 
-#: ../../include/widgets.php:305 ../../include/contact_widgets.php:60
+#: ../../include/widgets.php:307 ../../include/contact_widgets.php:60
 #: ../../include/contact_widgets.php:95
 msgid "Everything"
 msgstr ""
 
-#: ../../include/widgets.php:347
+#: ../../include/widgets.php:349
 msgid "Archives"
 msgstr ""
 
-#: ../../include/widgets.php:425
+#: ../../include/widgets.php:427
 msgid "Refresh"
 msgstr ""
 
-#: ../../include/widgets.php:426 ../../mod/connedit.php:563
+#: ../../include/widgets.php:428 ../../mod/connedit.php:563
 msgid "Me"
 msgstr ""
 
-#: ../../include/widgets.php:427 ../../mod/connedit.php:566
+#: ../../include/widgets.php:429 ../../mod/connedit.php:566
 msgid "Best Friends"
 msgstr ""
 
-#: ../../include/widgets.php:428 ../../include/identity.php:387
-#: ../../include/identity.php:388 ../../include/identity.php:395
-#: ../../include/profile_selectors.php:80 ../../mod/connedit.php:567
-#: ../../mod/settings.php:335 ../../mod/settings.php:339
-#: ../../mod/settings.php:340 ../../mod/settings.php:343
-#: ../../mod/settings.php:354
-msgid "Friends"
-msgstr ""
-
-#: ../../include/widgets.php:429
+#: ../../include/widgets.php:431
 msgid "Co-workers"
 msgstr ""
 
-#: ../../include/widgets.php:430 ../../mod/connedit.php:568
+#: ../../include/widgets.php:432 ../../mod/connedit.php:568
 msgid "Former Friends"
 msgstr ""
 
-#: ../../include/widgets.php:431 ../../mod/connedit.php:569
+#: ../../include/widgets.php:433 ../../mod/connedit.php:569
 msgid "Acquaintances"
 msgstr ""
 
-#: ../../include/widgets.php:432
+#: ../../include/widgets.php:434
 msgid "Everybody"
 msgstr ""
 
-#: ../../include/widgets.php:466
+#: ../../include/widgets.php:468
 msgid "Account settings"
 msgstr ""
 
-#: ../../include/widgets.php:472
+#: ../../include/widgets.php:474
 msgid "Channel settings"
 msgstr ""
 
-#: ../../include/widgets.php:478
+#: ../../include/widgets.php:480
 msgid "Additional features"
 msgstr ""
 
-#: ../../include/widgets.php:484
+#: ../../include/widgets.php:486
 msgid "Feature/Addon settings"
 msgstr ""
 
-#: ../../include/widgets.php:490
+#: ../../include/widgets.php:492
 msgid "Display settings"
 msgstr ""
 
-#: ../../include/widgets.php:496
+#: ../../include/widgets.php:498
 msgid "Connected apps"
 msgstr ""
 
-#: ../../include/widgets.php:502
+#: ../../include/widgets.php:504
 msgid "Export channel"
 msgstr ""
 
-#: ../../include/widgets.php:511 ../../mod/connedit.php:627
+#: ../../include/widgets.php:513 ../../mod/connedit.php:627
 msgid "Connection Default Permissions"
 msgstr ""
 
-#: ../../include/widgets.php:519
+#: ../../include/widgets.php:521
 msgid "Premium Channel Settings"
 msgstr ""
 
-#: ../../include/widgets.php:527 ../../include/features.php:61
+#: ../../include/widgets.php:529 ../../include/features.php:62
 #: ../../mod/sources.php:88
 msgid "Channel Sources"
 msgstr ""
 
-#: ../../include/widgets.php:535 ../../include/nav.php:210
-#: ../../include/apps.php:134 ../../mod/admin.php:956 ../../mod/admin.php:1161
+#: ../../include/widgets.php:537 ../../include/nav.php:208
+#: ../../include/apps.php:134 ../../mod/admin.php:1035
+#: ../../mod/admin.php:1235
 msgid "Settings"
 msgstr ""
 
-#: ../../include/widgets.php:548 ../../mod/message.php:31
+#: ../../include/widgets.php:550 ../../mod/message.php:31
 #: ../../mod/mail.php:128
 msgid "Messages"
 msgstr ""
 
-#: ../../include/widgets.php:551
+#: ../../include/widgets.php:553
 msgid "Check Mail"
 msgstr ""
 
-#: ../../include/widgets.php:556 ../../include/nav.php:201
+#: ../../include/widgets.php:558 ../../include/nav.php:199
 msgid "New Message"
 msgstr ""
 
-#: ../../include/widgets.php:634
+#: ../../include/widgets.php:633
 msgid "Chat Rooms"
 msgstr ""
 
-#: ../../include/widgets.php:654
+#: ../../include/widgets.php:653
 msgid "Bookmarked Chatrooms"
 msgstr ""
 
-#: ../../include/widgets.php:674
+#: ../../include/widgets.php:673
 msgid "Suggested Chatrooms"
 msgstr ""
 
-#: ../../include/widgets.php:801 ../../include/widgets.php:859
+#: ../../include/widgets.php:800 ../../include/widgets.php:858
 msgid "photo/image"
 msgstr ""
 
-#: ../../include/widgets.php:954 ../../include/widgets.php:956
+#: ../../include/widgets.php:953 ../../include/widgets.php:955
 msgid "Rate Me"
 msgstr ""
 
-#: ../../include/widgets.php:960
+#: ../../include/widgets.php:959
 msgid "View Ratings"
 msgstr ""
 
-#: ../../include/widgets.php:971
+#: ../../include/widgets.php:970
 msgid "Public Hubs"
 msgstr ""
 
-#: ../../include/enotify.php:41
-msgid "Red Matrix Notification"
+#: ../../include/conversation.php:120 ../../include/text.php:1747
+#: ../../include/diaspora.php:2030 ../../mod/like.php:335
+#: ../../mod/subthread.php:72 ../../mod/subthread.php:174
+#: ../../mod/tagger.php:43
+msgid "photo"
 msgstr ""
 
-#: ../../include/enotify.php:42
-msgid "redmatrix"
+#: ../../include/conversation.php:123 ../../include/text.php:1750
+#: ../../mod/like.php:337 ../../mod/tagger.php:47
+msgid "event"
 msgstr ""
 
-#: ../../include/enotify.php:44
-msgid "Thank You,"
+#: ../../include/conversation.php:126 ../../mod/like.php:113
+msgid "channel"
 msgstr ""
 
-#: ../../include/enotify.php:46
-#, php-format
-msgid "%s Administrator"
+#: ../../include/conversation.php:148 ../../include/text.php:1753
+#: ../../include/diaspora.php:2030 ../../mod/like.php:335
+#: ../../mod/subthread.php:72 ../../mod/subthread.php:174
+#: ../../mod/tagger.php:51
+msgid "status"
 msgstr ""
 
-#: ../../include/enotify.php:81
-#, php-format
-msgid "%s <!item_type!>"
+#: ../../include/conversation.php:150 ../../include/text.php:1755
+#: ../../mod/tagger.php:53
+msgid "comment"
 msgstr ""
 
-#: ../../include/enotify.php:85
+#: ../../include/conversation.php:164 ../../include/diaspora.php:2059
+#: ../../mod/like.php:383
 #, php-format
-msgid "[Red:Notify] New mail received at %s"
+msgid "%1$s likes %2$s's %3$s"
 msgstr ""
 
-#: ../../include/enotify.php:87
+#: ../../include/conversation.php:167 ../../mod/like.php:385
 #, php-format
-msgid "%1$s, %2$s sent you a new private message at %3$s."
+msgid "%1$s doesn't like %2$s's %3$s"
 msgstr ""
 
-#: ../../include/enotify.php:88
+#: ../../include/conversation.php:204
 #, php-format
-msgid "%1$s sent you %2$s."
+msgid "%1$s is now connected with %2$s"
 msgstr ""
 
-#: ../../include/enotify.php:88
-msgid "a private message"
+#: ../../include/conversation.php:239
+#, php-format
+msgid "%1$s poked %2$s"
 msgstr ""
 
-#: ../../include/enotify.php:89
-#, php-format
-msgid "Please visit %s to view and/or reply to your private messages."
+#: ../../include/conversation.php:243 ../../include/text.php:911
+msgid "poked"
 msgstr ""
 
-#: ../../include/enotify.php:144
+#: ../../include/conversation.php:261 ../../mod/mood.php:63
 #, php-format
-msgid "%1$s, %2$s commented on [zrl=%3$s]a %4$s[/zrl]"
+msgctxt "mood"
+msgid "%1$s is %2$s"
 msgstr ""
 
-#: ../../include/enotify.php:152
-#, php-format
-msgid "%1$s, %2$s commented on [zrl=%3$s]%4$s's %5$s[/zrl]"
+#: ../../include/conversation.php:556 ../../mod/photos.php:984
+msgctxt "title"
+msgid "Likes"
 msgstr ""
 
-#: ../../include/enotify.php:161
-#, php-format
-msgid "%1$s, %2$s commented on [zrl=%3$s]your %4$s[/zrl]"
+#: ../../include/conversation.php:556 ../../mod/photos.php:984
+msgctxt "title"
+msgid "Dislikes"
 msgstr ""
 
-#: ../../include/enotify.php:172
-#, php-format
-msgid "[Red:Notify] Comment to conversation #%1$d by %2$s"
+#: ../../include/conversation.php:557 ../../mod/photos.php:985
+msgctxt "title"
+msgid "Agree"
 msgstr ""
 
-#: ../../include/enotify.php:173
-#, php-format
-msgid "%1$s, %2$s commented on an item/conversation you have been following."
+#: ../../include/conversation.php:557 ../../mod/photos.php:985
+msgctxt "title"
+msgid "Disagree"
 msgstr ""
 
-#: ../../include/enotify.php:176 ../../include/enotify.php:191
-#: ../../include/enotify.php:217 ../../include/enotify.php:236
-#: ../../include/enotify.php:250
-#, php-format
-msgid "Please visit %s to view and/or reply to the conversation."
+#: ../../include/conversation.php:557 ../../mod/photos.php:985
+msgctxt "title"
+msgid "Abstain"
 msgstr ""
 
-#: ../../include/enotify.php:182
-#, php-format
-msgid "[Red:Notify] %s posted to your profile wall"
+#: ../../include/conversation.php:558 ../../mod/photos.php:986
+msgctxt "title"
+msgid "Attending"
 msgstr ""
 
-#: ../../include/enotify.php:184
-#, php-format
-msgid "%1$s, %2$s posted to your profile wall at %3$s"
+#: ../../include/conversation.php:558 ../../mod/photos.php:986
+msgctxt "title"
+msgid "Not attending"
 msgstr ""
 
-#: ../../include/enotify.php:186
-#, php-format
-msgid "%1$s, %2$s posted to [zrl=%3$s]your wall[/zrl]"
+#: ../../include/conversation.php:558 ../../mod/photos.php:986
+msgctxt "title"
+msgid "Might attend"
 msgstr ""
 
-#: ../../include/enotify.php:210
-#, php-format
-msgid "[Red:Notify] %s tagged you"
+#: ../../include/conversation.php:644 ../../include/ItemObject.php:126
+msgid "Select"
 msgstr ""
 
-#: ../../include/enotify.php:211
-#, php-format
-msgid "%1$s, %2$s tagged you at %3$s"
+#: ../../include/conversation.php:645 ../../include/RedDAV/RedBrowser.php:268
+#: ../../include/ItemObject.php:120 ../../include/apps.php:255
+#: ../../mod/settings.php:645 ../../mod/connedit.php:533
+#: ../../mod/group.php:176 ../../mod/thing.php:234 ../../mod/admin.php:816
+#: ../../mod/admin.php:945 ../../mod/photos.php:1050
+msgid "Delete"
 msgstr ""
 
-#: ../../include/enotify.php:212
-#, php-format
-msgid "%1$s, %2$s [zrl=%3$s]tagged you[/zrl]."
+#: ../../include/conversation.php:652 ../../include/ItemObject.php:89
+msgid "Private Message"
 msgstr ""
 
-#: ../../include/enotify.php:225
-#, php-format
-msgid "[Red:Notify] %1$s poked you"
+#: ../../include/conversation.php:659 ../../include/ItemObject.php:227
+msgid "Message signature validated"
 msgstr ""
 
-#: ../../include/enotify.php:226
-#, php-format
-msgid "%1$s, %2$s poked you at %3$s"
+#: ../../include/conversation.php:660 ../../include/ItemObject.php:228
+msgid "Message signature incorrect"
 msgstr ""
 
-#: ../../include/enotify.php:227
+#: ../../include/conversation.php:680
 #, php-format
-msgid "%1$s, %2$s [zrl=%2$s]poked you[/zrl]."
+msgid "View %s's profile @ %s"
 msgstr ""
 
-#: ../../include/enotify.php:243
-#, php-format
-msgid "[Red:Notify] %s tagged your post"
+#: ../../include/conversation.php:695
+msgid "Categories:"
 msgstr ""
 
-#: ../../include/enotify.php:244
-#, php-format
-msgid "%1$s, %2$s tagged your post at %3$s"
+#: ../../include/conversation.php:696
+msgid "Filed under:"
 msgstr ""
 
-#: ../../include/enotify.php:245
+#: ../../include/conversation.php:704 ../../include/ItemObject.php:312
 #, php-format
-msgid "%1$s, %2$s tagged [zrl=%3$s]your post[/zrl]"
+msgid " from %s"
 msgstr ""
 
-#: ../../include/enotify.php:257
-msgid "[Red:Notify] Introduction received"
+#: ../../include/conversation.php:707 ../../include/ItemObject.php:315
+#, php-format
+msgid "last edited: %s"
 msgstr ""
 
-#: ../../include/enotify.php:258
+#: ../../include/conversation.php:708 ../../include/ItemObject.php:316
 #, php-format
-msgid "%1$s, you've received an new connection request from '%2$s' at %3$s"
+msgid "Expires: %s"
 msgstr ""
 
-#: ../../include/enotify.php:259
-#, php-format
-msgid ""
-"%1$s, you've received [zrl=%2$s]a new connection request[/zrl] from %3$s."
+#: ../../include/conversation.php:723
+msgid "View in context"
 msgstr ""
 
-#: ../../include/enotify.php:263 ../../include/enotify.php:282
-#, php-format
-msgid "You may visit their profile at %s"
+#: ../../include/conversation.php:725 ../../include/conversation.php:1203
+#: ../../include/ItemObject.php:364 ../../mod/editlayout.php:153
+#: ../../mod/editwebpage.php:188 ../../mod/editpost.php:130
+#: ../../mod/editblock.php:157 ../../mod/photos.php:950 ../../mod/mail.php:241
+#: ../../mod/mail.php:356
+msgid "Please wait"
 msgstr ""
 
-#: ../../include/enotify.php:265
-#, php-format
-msgid "Please visit %s to approve or reject the connection request."
+#: ../../include/conversation.php:838
+msgid "remove"
 msgstr ""
 
-#: ../../include/enotify.php:272
-msgid "[Red:Notify] Friend suggestion received"
+#: ../../include/conversation.php:842 ../../include/nav.php:247
+msgid "Loading..."
 msgstr ""
 
-#: ../../include/enotify.php:273
-#, php-format
-msgid "%1$s, you've received a friend suggestion from '%2$s' at %3$s"
+#: ../../include/conversation.php:843
+msgid "Delete Selected Items"
 msgstr ""
 
-#: ../../include/enotify.php:274
-#, php-format
-msgid ""
-"%1$s, you've received [zrl=%2$s]a friend suggestion[/zrl] for %3$s from %4$s."
+#: ../../include/conversation.php:934
+msgid "View Source"
 msgstr ""
 
-#: ../../include/enotify.php:280
-msgid "Name:"
+#: ../../include/conversation.php:935
+msgid "Follow Thread"
 msgstr ""
 
-#: ../../include/enotify.php:281
-msgid "Photo:"
+#: ../../include/conversation.php:936
+msgid "View Status"
 msgstr ""
 
-#: ../../include/enotify.php:284
-#, php-format
-msgid "Please visit %s to approve or reject the suggestion."
+#: ../../include/conversation.php:937 ../../include/nav.php:91
+#: ../../mod/connedit.php:484 ../../mod/connedit.php:634
+msgid "View Profile"
 msgstr ""
 
-#: ../../include/enotify.php:499
-msgid "[Red:Notify]"
+#: ../../include/conversation.php:938
+msgid "View Photos"
 msgstr ""
 
-#: ../../include/text.php:320
-msgid "prev"
+#: ../../include/conversation.php:939
+msgid "Matrix Activity"
 msgstr ""
 
-#: ../../include/text.php:322
-msgid "first"
+#: ../../include/conversation.php:941
+msgid "Edit Contact"
 msgstr ""
 
-#: ../../include/text.php:351
-msgid "last"
+#: ../../include/conversation.php:942
+msgid "Send PM"
 msgstr ""
 
-#: ../../include/text.php:354
-msgid "next"
+#: ../../include/conversation.php:943 ../../include/apps.php:145
+msgid "Poke"
 msgstr ""
 
-#: ../../include/text.php:366
-msgid "older"
+#: ../../include/conversation.php:1019 ../../include/RedDAV/RedBrowser.php:163
+#: ../../include/apps.php:336 ../../include/apps.php:387
+#: ../../mod/connedit.php:570 ../../mod/photos.php:681
+#: ../../mod/photos.php:1119
+msgid "Unknown"
 msgstr ""
 
-#: ../../include/text.php:368
-msgid "newer"
+#: ../../include/conversation.php:1061
+#, php-format
+msgid "%s likes this."
 msgstr ""
 
-#: ../../include/text.php:751
-msgid "No connections"
+#: ../../include/conversation.php:1061
+#, php-format
+msgid "%s doesn't like this."
 msgstr ""
 
-#: ../../include/text.php:767
+#: ../../include/conversation.php:1065
 #, php-format
-msgid "%d Connection"
-msgid_plural "%d Connections"
+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/text.php:780 ../../mod/viewconnections.php:86
-msgid "View Connections"
-msgstr ""
+#: ../../include/conversation.php:1067
+#, 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/text.php:837 ../../include/text.php:849
-#: ../../include/nav.php:165 ../../include/apps.php:147
-#: ../../mod/search.php:34
-msgid "Search"
+#: ../../include/conversation.php:1073
+msgid "and"
 msgstr ""
 
-#: ../../include/text.php:916
-msgid "poke"
-msgstr ""
+#: ../../include/conversation.php:1076
+#, php-format
+msgid ", and %d other people"
+msgid_plural ", and %d other people"
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../../include/text.php:916 ../../include/conversation.php:243
-msgid "poked"
+#: ../../include/conversation.php:1077
+#, php-format
+msgid "%s like this."
 msgstr ""
 
-#: ../../include/text.php:917
-msgid "ping"
+#: ../../include/conversation.php:1077
+#, php-format
+msgid "%s don't like this."
 msgstr ""
 
-#: ../../include/text.php:917
-msgid "pinged"
+#: ../../include/conversation.php:1136
+msgid "Visible to <strong>everybody</strong>"
 msgstr ""
 
-#: ../../include/text.php:918
-msgid "prod"
+#: ../../include/conversation.php:1137 ../../mod/mail.php:174
+#: ../../mod/mail.php:289
+msgid "Please enter a link URL:"
 msgstr ""
 
-#: ../../include/text.php:918
-msgid "prodded"
+#: ../../include/conversation.php:1138
+msgid "Please enter a video link/URL:"
 msgstr ""
 
-#: ../../include/text.php:919
-msgid "slap"
+#: ../../include/conversation.php:1139
+msgid "Please enter an audio link/URL:"
 msgstr ""
 
-#: ../../include/text.php:919
-msgid "slapped"
+#: ../../include/conversation.php:1140
+msgid "Tag term:"
 msgstr ""
 
-#: ../../include/text.php:920
-msgid "finger"
+#: ../../include/conversation.php:1141 ../../mod/filer.php:49
+msgid "Save to Folder:"
 msgstr ""
 
-#: ../../include/text.php:920
-msgid "fingered"
+#: ../../include/conversation.php:1142
+msgid "Where are you right now?"
 msgstr ""
 
-#: ../../include/text.php:921
-msgid "rebuff"
+#: ../../include/conversation.php:1143 ../../mod/editpost.php:52
+#: ../../mod/mail.php:175 ../../mod/mail.php:290
+msgid "Expires YYYY-MM-DD HH:MM"
 msgstr ""
 
-#: ../../include/text.php:921
-msgid "rebuffed"
+#: ../../include/conversation.php:1169 ../../mod/editlayout.php:198
+#: ../../mod/editwebpage.php:235 ../../mod/editblock.php:203
+#: ../../mod/photos.php:949 ../../mod/layouts.php:168
+msgid "Share"
 msgstr ""
 
-#: ../../include/text.php:931
-msgid "happy"
+#: ../../include/conversation.php:1171 ../../mod/editwebpage.php:170
+msgid "Page link title"
 msgstr ""
 
-#: ../../include/text.php:932
-msgid "sad"
+#: ../../include/conversation.php:1174
+msgid "Post as"
 msgstr ""
 
-#: ../../include/text.php:933
-msgid "mellow"
+#: ../../include/conversation.php:1176 ../../include/ItemObject.php:669
+#: ../../mod/editlayout.php:140 ../../mod/editwebpage.php:175
+#: ../../mod/editpost.php:114 ../../mod/editblock.php:144
+msgid "Bold"
 msgstr ""
 
-#: ../../include/text.php:934
-msgid "tired"
+#: ../../include/conversation.php:1177 ../../include/ItemObject.php:670
+#: ../../mod/editlayout.php:141 ../../mod/editwebpage.php:176
+#: ../../mod/editpost.php:115 ../../mod/editblock.php:145
+msgid "Italic"
 msgstr ""
 
-#: ../../include/text.php:935
-msgid "perky"
+#: ../../include/conversation.php:1178 ../../include/ItemObject.php:671
+#: ../../mod/editlayout.php:142 ../../mod/editwebpage.php:177
+#: ../../mod/editpost.php:116 ../../mod/editblock.php:146
+msgid "Underline"
 msgstr ""
 
-#: ../../include/text.php:936
-msgid "angry"
+#: ../../include/conversation.php:1179 ../../include/ItemObject.php:672
+#: ../../mod/editlayout.php:143 ../../mod/editwebpage.php:178
+#: ../../mod/editpost.php:117 ../../mod/editblock.php:147
+msgid "Quote"
 msgstr ""
 
-#: ../../include/text.php:937
-msgid "stupified"
+#: ../../include/conversation.php:1180 ../../include/ItemObject.php:673
+#: ../../mod/editlayout.php:144 ../../mod/editwebpage.php:179
+#: ../../mod/editpost.php:118 ../../mod/editblock.php:148
+msgid "Code"
 msgstr ""
 
-#: ../../include/text.php:938
-msgid "puzzled"
+#: ../../include/conversation.php:1181 ../../mod/editlayout.php:145
+#: ../../mod/editwebpage.php:180 ../../mod/editpost.php:119
+#: ../../mod/editblock.php:149 ../../mod/mail.php:238 ../../mod/mail.php:352
+msgid "Upload photo"
 msgstr ""
 
-#: ../../include/text.php:939
-msgid "interested"
+#: ../../include/conversation.php:1182
+msgid "upload photo"
 msgstr ""
 
-#: ../../include/text.php:940
-msgid "bitter"
+#: ../../include/conversation.php:1183 ../../mod/editlayout.php:146
+#: ../../mod/editwebpage.php:181 ../../mod/editpost.php:120
+#: ../../mod/editblock.php:150 ../../mod/mail.php:239 ../../mod/mail.php:353
+msgid "Attach file"
 msgstr ""
 
-#: ../../include/text.php:941
-msgid "cheerful"
+#: ../../include/conversation.php:1184
+msgid "attach file"
 msgstr ""
 
-#: ../../include/text.php:942
-msgid "alive"
+#: ../../include/conversation.php:1185 ../../mod/editlayout.php:147
+#: ../../mod/editwebpage.php:182 ../../mod/editpost.php:121
+#: ../../mod/editblock.php:151 ../../mod/mail.php:240 ../../mod/mail.php:354
+msgid "Insert web link"
 msgstr ""
 
-#: ../../include/text.php:943
-msgid "annoyed"
+#: ../../include/conversation.php:1186
+msgid "web link"
 msgstr ""
 
-#: ../../include/text.php:944
-msgid "anxious"
+#: ../../include/conversation.php:1187
+msgid "Insert video link"
 msgstr ""
 
-#: ../../include/text.php:945
-msgid "cranky"
+#: ../../include/conversation.php:1188
+msgid "video link"
 msgstr ""
 
-#: ../../include/text.php:946
-msgid "disturbed"
+#: ../../include/conversation.php:1189
+msgid "Insert audio link"
 msgstr ""
 
-#: ../../include/text.php:947
-msgid "frustrated"
+#: ../../include/conversation.php:1190
+msgid "audio link"
 msgstr ""
 
-#: ../../include/text.php:948
-msgid "depressed"
+#: ../../include/conversation.php:1191 ../../mod/editlayout.php:151
+#: ../../mod/editwebpage.php:186 ../../mod/editpost.php:125
+#: ../../mod/editblock.php:155
+msgid "Set your location"
 msgstr ""
 
-#: ../../include/text.php:949
-msgid "motivated"
+#: ../../include/conversation.php:1192
+msgid "set location"
 msgstr ""
 
-#: ../../include/text.php:950
-msgid "relaxed"
+#: ../../include/conversation.php:1193 ../../mod/editpost.php:127
+msgid "Toggle voting"
 msgstr ""
 
-#: ../../include/text.php:951
-msgid "surprised"
+#: ../../include/conversation.php:1196 ../../mod/editlayout.php:152
+#: ../../mod/editwebpage.php:187 ../../mod/editpost.php:126
+#: ../../mod/editblock.php:156
+msgid "Clear browser location"
 msgstr ""
 
-#: ../../include/text.php:1117
-msgid "Monday"
+#: ../../include/conversation.php:1197
+msgid "clear location"
 msgstr ""
 
-#: ../../include/text.php:1117
-msgid "Tuesday"
+#: ../../include/conversation.php:1199 ../../mod/editlayout.php:164
+#: ../../mod/editwebpage.php:203 ../../mod/editpost.php:141
+#: ../../mod/editblock.php:169
+msgid "Title (optional)"
 msgstr ""
 
-#: ../../include/text.php:1117
-msgid "Wednesday"
+#: ../../include/conversation.php:1202 ../../mod/editlayout.php:167
+#: ../../mod/editwebpage.php:205 ../../mod/editpost.php:143
+#: ../../mod/editblock.php:172
+msgid "Categories (optional, comma-separated list)"
 msgstr ""
 
-#: ../../include/text.php:1117
-msgid "Thursday"
+#: ../../include/conversation.php:1204 ../../mod/editlayout.php:154
+#: ../../mod/editwebpage.php:189 ../../mod/editpost.php:131
+#: ../../mod/editblock.php:158
+msgid "Permission settings"
 msgstr ""
 
-#: ../../include/text.php:1117
-msgid "Friday"
+#: ../../include/conversation.php:1205
+msgid "permissions"
 msgstr ""
 
-#: ../../include/text.php:1117
-msgid "Saturday"
+#: ../../include/conversation.php:1212 ../../mod/editlayout.php:161
+#: ../../mod/editwebpage.php:198 ../../mod/editpost.php:138
+#: ../../mod/editblock.php:166
+msgid "Public post"
 msgstr ""
 
-#: ../../include/text.php:1117
-msgid "Sunday"
+#: ../../include/conversation.php:1214 ../../mod/editlayout.php:168
+#: ../../mod/editwebpage.php:206 ../../mod/editpost.php:144
+#: ../../mod/editblock.php:173
+msgid "Example: bob@example.com, mary@example.com"
 msgstr ""
 
-#: ../../include/text.php:1121
-msgid "January"
+#: ../../include/conversation.php:1227 ../../mod/editlayout.php:178
+#: ../../mod/editwebpage.php:215 ../../mod/editpost.php:155
+#: ../../mod/editblock.php:183 ../../mod/mail.php:245 ../../mod/mail.php:359
+msgid "Set expiration date"
 msgstr ""
 
-#: ../../include/text.php:1121
-msgid "February"
+#: ../../include/conversation.php:1229 ../../include/ItemObject.php:680
+#: ../../mod/editpost.php:157 ../../mod/mail.php:247 ../../mod/mail.php:361
+msgid "Encrypt text"
 msgstr ""
 
-#: ../../include/text.php:1121
-msgid "March"
+#: ../../include/conversation.php:1231 ../../mod/events.php:635
+#: ../../mod/editpost.php:159
+msgid "OK"
 msgstr ""
 
-#: ../../include/text.php:1121
-msgid "April"
+#: ../../include/conversation.php:1232 ../../mod/settings.php:583
+#: ../../mod/settings.php:609 ../../mod/tagrm.php:11 ../../mod/tagrm.php:134
+#: ../../mod/events.php:634 ../../mod/fbrowser.php:82
+#: ../../mod/fbrowser.php:117 ../../mod/editpost.php:160
+msgid "Cancel"
 msgstr ""
 
-#: ../../include/text.php:1121
-msgid "May"
+#: ../../include/conversation.php:1475
+msgid "Discover"
 msgstr ""
 
-#: ../../include/text.php:1121
-msgid "June"
+#: ../../include/conversation.php:1478
+msgid "Imported public streams"
 msgstr ""
 
-#: ../../include/text.php:1121
-msgid "July"
+#: ../../include/conversation.php:1483
+msgid "Commented Order"
 msgstr ""
 
-#: ../../include/text.php:1121
-msgid "August"
+#: ../../include/conversation.php:1486
+msgid "Sort by Comment Date"
 msgstr ""
 
-#: ../../include/text.php:1121
-msgid "September"
+#: ../../include/conversation.php:1490
+msgid "Posted Order"
 msgstr ""
 
-#: ../../include/text.php:1121
-msgid "October"
+#: ../../include/conversation.php:1493
+msgid "Sort by Post Date"
 msgstr ""
 
-#: ../../include/text.php:1121
-msgid "November"
+#: ../../include/conversation.php:1501
+msgid "Posts that mention or involve you"
 msgstr ""
 
-#: ../../include/text.php:1121
-msgid "December"
+#: ../../include/conversation.php:1507 ../../mod/connections.php:212
+#: ../../mod/connections.php:225 ../../mod/menu.php:80
+msgid "New"
 msgstr ""
 
-#: ../../include/text.php:1199
-msgid "unknown.???"
+#: ../../include/conversation.php:1510
+msgid "Activity Stream - by date"
 msgstr ""
 
-#: ../../include/text.php:1200
-msgid "bytes"
+#: ../../include/conversation.php:1516
+msgid "Starred"
 msgstr ""
 
-#: ../../include/text.php:1236
-msgid "remove category"
+#: ../../include/conversation.php:1519
+msgid "Favourite Posts"
 msgstr ""
 
-#: ../../include/text.php:1305
-msgid "remove from file"
+#: ../../include/conversation.php:1526
+msgid "Spam"
 msgstr ""
 
-#: ../../include/text.php:1381 ../../include/text.php:1392
-#: ../../mod/connedit.php:635
-msgid "Click to open/close"
+#: ../../include/conversation.php:1529
+msgid "Posts flagged as SPAM"
 msgstr ""
 
-#: ../../include/text.php:1540 ../../mod/events.php:444
-msgid "Link to Source"
+#: ../../include/conversation.php:1568 ../../mod/admin.php:949
+msgid "Channel"
 msgstr ""
 
-#: ../../include/text.php:1559
-msgid "Select a page layout: "
+#: ../../include/conversation.php:1571
+msgid "Status Messages and Posts"
 msgstr ""
 
-#: ../../include/text.php:1562 ../../include/text.php:1622
-msgid "default"
+#: ../../include/conversation.php:1580
+msgid "About"
 msgstr ""
 
-#: ../../include/text.php:1595
-msgid "Page content type: "
+#: ../../include/conversation.php:1583
+msgid "Profile Details"
 msgstr ""
 
-#: ../../include/text.php:1634
-msgid "Select an alternate language"
+#: ../../include/conversation.php:1589 ../../include/nav.php:97
+#: ../../include/apps.php:139 ../../mod/fbrowser.php:25
+msgid "Photos"
 msgstr ""
 
-#: ../../include/text.php:1753 ../../include/diaspora.php:1909
-#: ../../include/conversation.php:120 ../../mod/subthread.php:72
-#: ../../mod/subthread.php:174 ../../mod/tagger.php:43 ../../mod/like.php:335
-msgid "photo"
+#: ../../include/conversation.php:1592 ../../include/photos.php:356
+msgid "Photo Albums"
 msgstr ""
 
-#: ../../include/text.php:1756 ../../include/conversation.php:123
-#: ../../mod/tagger.php:47 ../../mod/like.php:337
-msgid "event"
+#: ../../include/conversation.php:1598 ../../include/RedDAV/RedBrowser.php:249
+#: ../../include/nav.php:98 ../../include/apps.php:135
+#: ../../mod/fbrowser.php:114
+msgid "Files"
 msgstr ""
 
-#: ../../include/text.php:1759 ../../include/diaspora.php:1909
-#: ../../include/conversation.php:148 ../../mod/subthread.php:72
-#: ../../mod/subthread.php:174 ../../mod/tagger.php:51 ../../mod/like.php:335
-msgid "status"
+#: ../../include/conversation.php:1601
+msgid "Files and Storage"
 msgstr ""
 
-#: ../../include/text.php:1761 ../../include/conversation.php:150
-#: ../../mod/tagger.php:53
-msgid "comment"
+#: ../../include/conversation.php:1611 ../../include/conversation.php:1614
+msgid "Chatrooms"
 msgstr ""
 
-#: ../../include/text.php:1766
-msgid "activity"
+#: ../../include/conversation.php:1624 ../../include/nav.php:109
+#: ../../include/apps.php:129
+msgid "Bookmarks"
 msgstr ""
 
-#: ../../include/text.php:2053
-msgid "Design"
+#: ../../include/conversation.php:1627
+msgid "Saved Bookmarks"
 msgstr ""
 
-#: ../../include/text.php:2056
-msgid "Blocks"
+#: ../../include/conversation.php:1635 ../../include/nav.php:113
+#: ../../include/apps.php:136 ../../mod/webpages.php:160
+msgid "Webpages"
 msgstr ""
 
-#: ../../include/text.php:2057
-msgid "Menus"
+#: ../../include/conversation.php:1638
+msgid "Manage Webpages"
 msgstr ""
 
-#: ../../include/text.php:2058
-msgid "Layouts"
+#: ../../include/conversation.php:1667 ../../include/ItemObject.php:175
+#: ../../include/ItemObject.php:187 ../../mod/photos.php:1003
+#: ../../mod/photos.php:1015
+msgid "View all"
 msgstr ""
 
-#: ../../include/text.php:2059
-msgid "Pages"
-msgstr ""
+#: ../../include/conversation.php:1695 ../../include/ItemObject.php:184
+#: ../../mod/photos.php:1012
+msgctxt "noun"
+msgid "Dislike"
+msgid_plural "Dislikes"
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../../include/text.php:2395 ../../include/RedDAV/RedBrowser.php:130
-msgid "Collection"
+#: ../../include/conversation.php:1698
+msgctxt "noun"
+msgid "Attending"
+msgid_plural "Attending"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../../include/conversation.php:1701
+msgctxt "noun"
+msgid "Not Attending"
+msgid_plural "Not Attending"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../../include/conversation.php:1704
+msgctxt "noun"
+msgid "Undecided"
+msgid_plural "Undecided"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../../include/conversation.php:1707
+msgctxt "noun"
+msgid "Agree"
+msgid_plural "Agrees"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../../include/conversation.php:1710
+msgctxt "noun"
+msgid "Disagree"
+msgid_plural "Disagrees"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../../include/conversation.php:1713
+msgctxt "noun"
+msgid "Abstain"
+msgid_plural "Abstains"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../../include/attach.php:137 ../../include/attach.php:184
+#: ../../include/attach.php:247 ../../include/attach.php:261
+#: ../../include/attach.php:301 ../../include/attach.php:315
+#: ../../include/attach.php:339 ../../include/attach.php:532
+#: ../../include/attach.php:606 ../../include/items.php:4093
+#: ../../include/photos.php:15 ../../include/chat.php:131
+#: ../../mod/profile.php:64 ../../mod/profile.php:72
+#: ../../mod/achievements.php:30 ../../mod/manage.php:6
+#: ../../mod/settings.php:564 ../../mod/api.php:26 ../../mod/api.php:31
+#: ../../mod/blocks.php:67 ../../mod/blocks.php:75
+#: ../../mod/profile_photo.php:264 ../../mod/profile_photo.php:277
+#: ../../mod/block.php:22 ../../mod/block.php:72 ../../mod/like.php:178
+#: ../../mod/events.php:219 ../../mod/connedit.php:321 ../../mod/group.php:9
+#: ../../mod/setup.php:207 ../../mod/common.php:35 ../../mod/id.php:61
+#: ../../mod/connections.php:169 ../../mod/item.php:197 ../../mod/item.php:205
+#: ../../mod/item.php:938 ../../mod/thing.php:247 ../../mod/thing.php:264
+#: ../../mod/thing.php:299 ../../mod/pdledit.php:21 ../../mod/authtest.php:13
+#: ../../mod/editlayout.php:64 ../../mod/editlayout.php:89
+#: ../../mod/chat.php:90 ../../mod/chat.php:95 ../../mod/editwebpage.php:64
+#: ../../mod/editwebpage.php:86 ../../mod/editwebpage.php:118
+#: ../../mod/rate.php:110 ../../mod/editpost.php:13 ../../mod/invite.php:13
+#: ../../mod/invite.php:104 ../../mod/locs.php:77 ../../mod/sources.php:66
+#: ../../mod/menu.php:61 ../../mod/filestorage.php:18
+#: ../../mod/filestorage.php:72 ../../mod/filestorage.php:87
+#: ../../mod/filestorage.php:114 ../../mod/fsuggest.php:78
+#: ../../mod/poke.php:128 ../../mod/profiles.php:188
+#: ../../mod/profiles.php:576 ../../mod/viewsrc.php:14
+#: ../../mod/webpages.php:67 ../../mod/viewconnections.php:22
+#: ../../mod/viewconnections.php:27 ../../mod/editblock.php:65
+#: ../../mod/register.php:72 ../../mod/photos.php:68 ../../mod/message.php:16
+#: ../../mod/mitem.php:106 ../../mod/mood.php:111 ../../mod/layouts.php:67
+#: ../../mod/layouts.php:74 ../../mod/layouts.php:85 ../../mod/mail.php:114
+#: ../../mod/notifications.php:66 ../../mod/regmod.php:17
+#: ../../mod/network.php:12 ../../mod/new_channel.php:68
+#: ../../mod/new_channel.php:99 ../../mod/appman.php:66 ../../mod/page.php:28
+#: ../../mod/page.php:78 ../../mod/bookmarks.php:46 ../../mod/channel.php:95
+#: ../../mod/channel.php:206 ../../mod/channel.php:249
+#: ../../mod/suggest.php:26 ../../mod/service_limits.php:7
+#: ../../mod/sharedwithme.php:7 ../../index.php:190 ../../index.php:393
+msgid "Permission denied."
 msgstr ""
 
 #: ../../include/attach.php:242 ../../include/attach.php:296
@@ -971,12 +1384,89 @@ msgstr ""
 msgid "database storage failed."
 msgstr ""
 
+#: ../../include/account.php:23
+msgid "Not a valid email address"
+msgstr ""
+
+#: ../../include/account.php:25
+msgid "Your email domain is not among those allowed on this site"
+msgstr ""
+
+#: ../../include/account.php:31
+msgid "Your email address is already registered at this site."
+msgstr ""
+
+#: ../../include/account.php:64
+msgid "An invitation is required."
+msgstr ""
+
+#: ../../include/account.php:68
+msgid "Invitation could not be verified."
+msgstr ""
+
+#: ../../include/account.php:119
+msgid "Please enter the required information."
+msgstr ""
+
+#: ../../include/account.php:187
+msgid "Failed to store account information."
+msgstr ""
+
+#: ../../include/account.php:245
+#, php-format
+msgid "Registration confirmation for %s"
+msgstr ""
+
+#: ../../include/account.php:313
+#, php-format
+msgid "Registration request at %s"
+msgstr ""
+
+#: ../../include/account.php:315 ../../include/account.php:342
+#: ../../include/account.php:399
+msgid "Administrator"
+msgstr ""
+
+#: ../../include/account.php:337
+msgid "your registration password"
+msgstr ""
+
+#: ../../include/account.php:340 ../../include/account.php:397
+#, php-format
+msgid "Registration details for %s"
+msgstr ""
+
+#: ../../include/account.php:406
+msgid "Account approved."
+msgstr ""
+
+#: ../../include/account.php:440
+#, php-format
+msgid "Registration revoked for %s"
+msgstr ""
+
+#: ../../include/account.php:486
+msgid "Account verified. Please login."
+msgstr ""
+
+#: ../../include/account.php:706 ../../include/account.php:708
+msgid "Click here to upgrade."
+msgstr ""
+
+#: ../../include/account.php:714
+msgid "This action exceeds the limits set by your subscription plan."
+msgstr ""
+
+#: ../../include/account.php:719
+msgid "This action is not available under your subscription plan."
+msgstr ""
+
 #: ../../include/js_strings.php:5
 msgid "Delete this item?"
 msgstr ""
 
 #: ../../include/js_strings.php:6 ../../include/ItemObject.php:667
-#: ../../mod/photos.php:962 ../../mod/photos.php:1080
+#: ../../mod/photos.php:968 ../../mod/photos.php:1086
 msgid "Comment"
 msgstr ""
 
@@ -1041,97 +1531,102 @@ msgid "Describe (optional)"
 msgstr ""
 
 #: ../../include/js_strings.php:22 ../../include/ItemObject.php:668
-#: ../../mod/xchan.php:11 ../../mod/connedit.php:653 ../../mod/connect.php:93
-#: ../../mod/events.php:654 ../../mod/settings.php:583
-#: ../../mod/settings.php:708 ../../mod/settings.php:737
-#: ../../mod/settings.php:760 ../../mod/settings.php:842
-#: ../../mod/settings.php:1038 ../../mod/group.php:81 ../../mod/setup.php:313
-#: ../../mod/setup.php:358 ../../mod/thing.php:284 ../../mod/thing.php:327
-#: ../../mod/pdledit.php:58 ../../mod/appman.php:99 ../../mod/import.php:504
+#: ../../mod/settings.php:582 ../../mod/settings.php:684
+#: ../../mod/settings.php:710 ../../mod/settings.php:738
+#: ../../mod/settings.php:761 ../../mod/settings.php:843
+#: ../../mod/settings.php:1039 ../../mod/xchan.php:11 ../../mod/connect.php:93
+#: ../../mod/events.php:654 ../../mod/connedit.php:653 ../../mod/group.php:81
+#: ../../mod/setup.php:313 ../../mod/setup.php:358 ../../mod/thing.php:284
+#: ../../mod/thing.php:327 ../../mod/pdledit.php:58 ../../mod/import.php:504
 #: ../../mod/chat.php:177 ../../mod/chat.php:211 ../../mod/rate.php:167
 #: ../../mod/invite.php:142 ../../mod/locs.php:105 ../../mod/sources.php:104
 #: ../../mod/sources.php:138 ../../mod/filestorage.php:155
 #: ../../mod/fsuggest.php:108 ../../mod/poke.php:166
-#: ../../mod/profiles.php:667 ../../mod/admin.php:416 ../../mod/admin.php:728
-#: ../../mod/admin.php:864 ../../mod/admin.php:997 ../../mod/admin.php:1196
-#: ../../mod/admin.php:1283 ../../mod/mood.php:134 ../../mod/mail.php:355
-#: ../../mod/photos.php:565 ../../mod/photos.php:642 ../../mod/photos.php:923
-#: ../../mod/photos.php:963 ../../mod/photos.php:1081 ../../mod/poll.php:68
+#: ../../mod/profiles.php:667 ../../mod/admin.php:441 ../../mod/admin.php:809
+#: ../../mod/admin.php:943 ../../mod/admin.php:1074 ../../mod/admin.php:1269
+#: ../../mod/admin.php:1352 ../../mod/photos.php:565 ../../mod/photos.php:642
+#: ../../mod/photos.php:929 ../../mod/photos.php:969 ../../mod/photos.php:1087
+#: ../../mod/mood.php:134 ../../mod/mail.php:355 ../../mod/appman.php:99
+#: ../../mod/poll.php:68 ../../mod/bulksetclose.php:24
 #: ../../view/theme/apw/php/config.php:256
-#: ../../view/theme/redbasic/php/config.php:99
+#: ../../view/theme/redbasic/php/config.php:97
 msgid "Submit"
 msgstr ""
 
-#: ../../include/js_strings.php:24
-msgid "timeago.prefixAgo"
+#: ../../include/js_strings.php:23
+msgid "Please enter a link URL"
 msgstr ""
 
 #: ../../include/js_strings.php:25
-msgid "timeago.prefixFromNow"
+msgid "timeago.prefixAgo"
 msgstr ""
 
 #: ../../include/js_strings.php:26
-msgid "ago"
+msgid "timeago.prefixFromNow"
 msgstr ""
 
 #: ../../include/js_strings.php:27
-msgid "from now"
+msgid "ago"
 msgstr ""
 
 #: ../../include/js_strings.php:28
-msgid "less than a minute"
+msgid "from now"
 msgstr ""
 
 #: ../../include/js_strings.php:29
-msgid "about a minute"
+msgid "less than a minute"
 msgstr ""
 
 #: ../../include/js_strings.php:30
+msgid "about a minute"
+msgstr ""
+
+#: ../../include/js_strings.php:31
 #, php-format
 msgid "%d minutes"
 msgstr ""
 
-#: ../../include/js_strings.php:31
+#: ../../include/js_strings.php:32
 msgid "about an hour"
 msgstr ""
 
-#: ../../include/js_strings.php:32
+#: ../../include/js_strings.php:33
 #, php-format
 msgid "about %d hours"
 msgstr ""
 
-#: ../../include/js_strings.php:33
+#: ../../include/js_strings.php:34
 msgid "a day"
 msgstr ""
 
-#: ../../include/js_strings.php:34
+#: ../../include/js_strings.php:35
 #, php-format
 msgid "%d days"
 msgstr ""
 
-#: ../../include/js_strings.php:35
+#: ../../include/js_strings.php:36
 msgid "about a month"
 msgstr ""
 
-#: ../../include/js_strings.php:36
+#: ../../include/js_strings.php:37
 #, php-format
 msgid "%d months"
 msgstr ""
 
-#: ../../include/js_strings.php:37
+#: ../../include/js_strings.php:38
 msgid "about a year"
 msgstr ""
 
-#: ../../include/js_strings.php:38
+#: ../../include/js_strings.php:39
 #, php-format
 msgid "%d years"
 msgstr ""
 
-#: ../../include/js_strings.php:39
+#: ../../include/js_strings.php:40
 msgid " "
 msgstr ""
 
-#: ../../include/js_strings.php:40
+#: ../../include/js_strings.php:41
 msgid "timeago.numbers"
 msgstr ""
 
@@ -1140,6 +1635,10 @@ msgstr ""
 msgid "parent"
 msgstr ""
 
+#: ../../include/RedDAV/RedBrowser.php:130 ../../include/text.php:2395
+msgid "Collection"
+msgstr ""
+
 #: ../../include/RedDAV/RedBrowser.php:133
 msgid "Principal"
 msgstr ""
@@ -1160,13 +1659,6 @@ msgstr ""
 msgid "Schedule Outbox"
 msgstr ""
 
-#: ../../include/RedDAV/RedBrowser.php:163 ../../include/apps.php:336
-#: ../../include/apps.php:387 ../../include/conversation.php:1019
-#: ../../mod/connedit.php:570 ../../mod/photos.php:681
-#: ../../mod/photos.php:1113
-msgid "Unknown"
-msgstr ""
-
 #: ../../include/RedDAV/RedBrowser.php:225
 #, php-format
 msgid "%1$s used"
@@ -1177,12 +1669,6 @@ msgstr ""
 msgid "%1$s used of %2$s (%3$s&#37;)"
 msgstr ""
 
-#: ../../include/RedDAV/RedBrowser.php:249 ../../include/nav.php:98
-#: ../../include/apps.php:135 ../../include/conversation.php:1595
-#: ../../mod/fbrowser.php:114
-msgid "Files"
-msgstr ""
-
 #: ../../include/RedDAV/RedBrowser.php:251
 msgid "Total"
 msgstr ""
@@ -1199,12 +1685,12 @@ msgstr ""
 
 #: ../../include/RedDAV/RedBrowser.php:255
 #: ../../include/RedDAV/RedBrowser.php:305 ../../mod/profile_photo.php:362
-#: ../../mod/photos.php:706 ../../mod/photos.php:1228
+#: ../../mod/photos.php:706 ../../mod/photos.php:1236
 msgid "Upload"
 msgstr ""
 
-#: ../../include/RedDAV/RedBrowser.php:262 ../../mod/settings.php:585
-#: ../../mod/settings.php:611 ../../mod/admin.php:871
+#: ../../include/RedDAV/RedBrowser.php:262 ../../mod/settings.php:584
+#: ../../mod/settings.php:610 ../../mod/admin.php:950
 #: ../../mod/sharedwithme.php:100
 msgid "Name"
 msgstr ""
@@ -1221,14 +1707,6 @@ msgstr ""
 msgid "Last Modified"
 msgstr ""
 
-#: ../../include/RedDAV/RedBrowser.php:268 ../../include/ItemObject.php:120
-#: ../../include/apps.php:255 ../../include/conversation.php:645
-#: ../../mod/connedit.php:533 ../../mod/settings.php:646
-#: ../../mod/group.php:176 ../../mod/thing.php:234 ../../mod/admin.php:735
-#: ../../mod/admin.php:866 ../../mod/photos.php:1044
-msgid "Delete"
-msgstr ""
-
 #: ../../include/RedDAV/RedBrowser.php:302
 msgid "Create new folder"
 msgstr ""
@@ -1242,55 +1720,11 @@ msgstr ""
 msgid "%1$s's bookmarks"
 msgstr ""
 
-#: ../../include/taxonomy.php:215 ../../include/taxonomy.php:234
-msgid "Tags"
-msgstr ""
-
-#: ../../include/taxonomy.php:274
-msgid "Keywords"
-msgstr ""
-
-#: ../../include/taxonomy.php:299
-msgid "have"
-msgstr ""
-
-#: ../../include/taxonomy.php:299
-msgid "has"
-msgstr ""
-
-#: ../../include/taxonomy.php:300
-msgid "want"
-msgstr ""
-
-#: ../../include/taxonomy.php:300
-msgid "wants"
-msgstr ""
-
-#: ../../include/taxonomy.php:301 ../../include/ItemObject.php:254
-msgid "like"
-msgstr ""
-
-#: ../../include/taxonomy.php:301
-msgid "likes"
-msgstr ""
-
-#: ../../include/taxonomy.php:302 ../../include/ItemObject.php:255
-msgid "dislike"
-msgstr ""
-
-#: ../../include/taxonomy.php:302
-msgid "dislikes"
+#: ../../include/comanche.php:34 ../../mod/admin.php:381
+#: ../../view/theme/apw/php/config.php:185
+msgid "Default"
 msgstr ""
 
-#: ../../include/taxonomy.php:385 ../../include/identity.php:1155
-#: ../../include/ItemObject.php:179 ../../include/conversation.php:1692
-#: ../../mod/photos.php:1001
-msgctxt "noun"
-msgid "Like"
-msgid_plural "Likes"
-msgstr[0] ""
-msgstr[1] ""
-
 #: ../../include/features.php:38
 msgid "General Features"
 msgstr ""
@@ -1351,199 +1785,268 @@ msgstr ""
 msgid "Change channels directly from within the navigation dropdown menu"
 msgstr ""
 
-#: ../../include/features.php:50
+#: ../../include/features.php:47
+msgid "Photo Location"
+msgstr ""
+
+#: ../../include/features.php:47
+msgid "If location data is available on uploaded photos, link this to a map."
+msgstr ""
+
+#: ../../include/features.php:51
 msgid "Extended Identity Sharing"
 msgstr ""
 
-#: ../../include/features.php:50
+#: ../../include/features.php:51
 msgid ""
 "Share your identity with all websites on the internet. When disabled, "
 "identity is only shared with sites in the matrix."
 msgstr ""
 
-#: ../../include/features.php:51
+#: ../../include/features.php:52
 msgid "Expert Mode"
 msgstr ""
 
-#: ../../include/features.php:51
+#: ../../include/features.php:52
 msgid "Enable Expert Mode to provide advanced configuration options"
 msgstr ""
 
-#: ../../include/features.php:52
+#: ../../include/features.php:53
 msgid "Premium Channel"
 msgstr ""
 
-#: ../../include/features.php:52
+#: ../../include/features.php:53
 msgid ""
 "Allows you to set restrictions and terms on those that connect with your "
 "channel"
 msgstr ""
 
-#: ../../include/features.php:57
+#: ../../include/features.php:58
 msgid "Post Composition Features"
 msgstr ""
 
-#: ../../include/features.php:59
+#: ../../include/features.php:60
 msgid "Use Markdown"
 msgstr ""
 
-#: ../../include/features.php:59
+#: ../../include/features.php:60
 msgid "Allow use of \"Markdown\" to format posts"
 msgstr ""
 
-#: ../../include/features.php:60
+#: ../../include/features.php:61
 msgid "Large Photos"
 msgstr ""
 
-#: ../../include/features.php:60
+#: ../../include/features.php:61
 msgid ""
 "Include large (640px) photo thumbnails in posts. If not enabled, use small "
 "(320px) photo thumbnails"
 msgstr ""
 
-#: ../../include/features.php:61
+#: ../../include/features.php:62
 msgid "Automatically import channel content from other channels or feeds"
 msgstr ""
 
-#: ../../include/features.php:62
+#: ../../include/features.php:63
 msgid "Even More Encryption"
 msgstr ""
 
-#: ../../include/features.php:62
+#: ../../include/features.php:63
 msgid ""
 "Allow optional encryption of content end-to-end with a shared secret key"
 msgstr ""
 
-#: ../../include/features.php:63
+#: ../../include/features.php:64
 msgid "Enable voting tools"
 msgstr ""
 
-#: ../../include/features.php:63
+#: ../../include/features.php:64
 msgid "Provide a class of post which others can vote on"
 msgstr ""
 
-#: ../../include/features.php:64
+#: ../../include/features.php:65
 msgid "Flag Adult Photos"
 msgstr ""
 
-#: ../../include/features.php:64
+#: ../../include/features.php:65
 msgid "Provide photo edit option to hide adult photos from default album view"
 msgstr ""
 
-#: ../../include/features.php:69
+#: ../../include/features.php:70
 msgid "Network and Stream Filtering"
 msgstr ""
 
-#: ../../include/features.php:70
+#: ../../include/features.php:71
 msgid "Search by Date"
 msgstr ""
 
-#: ../../include/features.php:70
+#: ../../include/features.php:71
 msgid "Ability to select posts by date ranges"
 msgstr ""
 
-#: ../../include/features.php:71
+#: ../../include/features.php:72
 msgid "Collections Filter"
 msgstr ""
 
-#: ../../include/features.php:71
+#: ../../include/features.php:72
 msgid "Enable widget to display Network posts only from selected collections"
 msgstr ""
 
-#: ../../include/features.php:72
+#: ../../include/features.php:73
 msgid "Save search terms for re-use"
 msgstr ""
 
-#: ../../include/features.php:73
+#: ../../include/features.php:74
 msgid "Network Personal Tab"
 msgstr ""
 
-#: ../../include/features.php:73
+#: ../../include/features.php:74
 msgid "Enable tab to display only Network posts that you've interacted on"
 msgstr ""
 
-#: ../../include/features.php:74
+#: ../../include/features.php:75
 msgid "Network New Tab"
 msgstr ""
 
-#: ../../include/features.php:74
+#: ../../include/features.php:75
 msgid "Enable tab to display all new Network activity"
 msgstr ""
 
-#: ../../include/features.php:75
+#: ../../include/features.php:76
 msgid "Affinity Tool"
 msgstr ""
 
-#: ../../include/features.php:75
+#: ../../include/features.php:76
 msgid "Filter stream activity by depth of relationships"
 msgstr ""
 
-#: ../../include/features.php:76
+#: ../../include/features.php:77
 msgid "Suggest Channels"
 msgstr ""
 
-#: ../../include/features.php:76
+#: ../../include/features.php:77
 msgid "Show channel suggestions"
 msgstr ""
 
-#: ../../include/features.php:81
+#: ../../include/features.php:82
 msgid "Post/Comment Tools"
 msgstr ""
 
-#: ../../include/features.php:82
+#: ../../include/features.php:83
 msgid "Tagging"
 msgstr ""
 
-#: ../../include/features.php:82
+#: ../../include/features.php:83
 msgid "Ability to tag existing posts"
 msgstr ""
 
-#: ../../include/features.php:83
+#: ../../include/features.php:84
 msgid "Post Categories"
 msgstr ""
 
-#: ../../include/features.php:83
+#: ../../include/features.php:84
 msgid "Add categories to your posts"
 msgstr ""
 
-#: ../../include/features.php:84
+#: ../../include/features.php:85
 msgid "Ability to file posts under folders"
 msgstr ""
 
-#: ../../include/features.php:85
+#: ../../include/features.php:86
 msgid "Dislike Posts"
 msgstr ""
 
-#: ../../include/features.php:85
+#: ../../include/features.php:86
 msgid "Ability to dislike posts/comments"
 msgstr ""
 
-#: ../../include/features.php:86
+#: ../../include/features.php:87
 msgid "Star Posts"
 msgstr ""
 
-#: ../../include/features.php:86
+#: ../../include/features.php:87
 msgid "Ability to mark special posts with a star indicator"
 msgstr ""
 
-#: ../../include/features.php:87
+#: ../../include/features.php:88
 msgid "Tag Cloud"
 msgstr ""
 
-#: ../../include/features.php:87
+#: ../../include/features.php:88
 msgid "Provide a personal tag cloud on your channel page"
 msgstr ""
 
-#: ../../include/auth.php:130
-msgid "Logged out."
+#: ../../include/items.php:382 ../../mod/like.php:270
+#: ../../mod/subthread.php:49 ../../mod/group.php:68 ../../mod/profperm.php:23
+#: ../../mod/bulksetclose.php:11 ../../index.php:392
+msgid "Permission denied"
 msgstr ""
 
-#: ../../include/auth.php:271
-msgid "Failed authentication"
+#: ../../include/items.php:979 ../../include/items.php:1024
+msgid "(Unknown)"
 msgstr ""
 
-#: ../../include/auth.php:285 ../../mod/openid.php:190
-msgid "Login failed."
+#: ../../include/items.php:1181
+msgid "Visible to anybody on the internet."
+msgstr ""
+
+#: ../../include/items.php:1183
+msgid "Visible to you only."
+msgstr ""
+
+#: ../../include/items.php:1185
+msgid "Visible to anybody in this network."
+msgstr ""
+
+#: ../../include/items.php:1187
+msgid "Visible to anybody authenticated."
+msgstr ""
+
+#: ../../include/items.php:1189
+#, php-format
+msgid "Visible to anybody on %s."
+msgstr ""
+
+#: ../../include/items.php:1191
+msgid "Visible to all connections."
+msgstr ""
+
+#: ../../include/items.php:1193
+msgid "Visible to approved connections."
+msgstr ""
+
+#: ../../include/items.php:1195
+msgid "Visible to specific connections."
+msgstr ""
+
+#: ../../include/items.php:4023 ../../mod/thing.php:76
+#: ../../mod/display.php:32 ../../mod/filestorage.php:27
+#: ../../mod/viewsrc.php:20 ../../mod/admin.php:167 ../../mod/admin.php:981
+#: ../../mod/admin.php:1181
+msgid "Item not found."
+msgstr ""
+
+#: ../../include/items.php:4476 ../../mod/group.php:38 ../../mod/group.php:140
+#: ../../mod/bulksetclose.php:51
+msgid "Collection not found."
+msgstr ""
+
+#: ../../include/items.php:4491
+msgid "Collection is empty."
+msgstr ""
+
+#: ../../include/items.php:4498
+#, php-format
+msgid "Collection: %s"
+msgstr ""
+
+#: ../../include/items.php:4509
+#, php-format
+msgid "Connection: %s"
+msgstr ""
+
+#: ../../include/items.php:4512
+msgid "Connection not found."
 msgstr ""
 
 #: ../../include/contact_selectors.php:56
@@ -1582,8 +2085,9 @@ msgstr ""
 msgid "RSS/Atom"
 msgstr ""
 
-#: ../../include/contact_selectors.php:79 ../../mod/admin.php:731
-#: ../../mod/admin.php:740 ../../boot.php:1554
+#: ../../include/contact_selectors.php:79 ../../mod/id.php:12
+#: ../../mod/id.php:13 ../../mod/admin.php:812 ../../mod/admin.php:821
+#: ../../boot.php:1554
 msgid "Email"
 msgstr ""
 
@@ -1611,341 +2115,196 @@ msgstr ""
 msgid "MySpace"
 msgstr ""
 
-#: ../../include/group.php:26
-msgid ""
-"A deleted group with this name was revived. Existing item permissions "
-"<strong>may</strong> apply to this group and any future members. If this is "
-"not what you intended, please create another group with a different name."
-msgstr ""
-
-#: ../../include/group.php:235
-msgid "Default privacy group for new contacts"
-msgstr ""
-
-#: ../../include/group.php:254 ../../mod/admin.php:740
-msgid "All Channels"
-msgstr ""
-
-#: ../../include/group.php:276
-msgid "edit"
-msgstr ""
-
-#: ../../include/group.php:298
-msgid "Collections"
-msgstr ""
-
-#: ../../include/group.php:299
-msgid "Edit collection"
-msgstr ""
-
-#: ../../include/group.php:300
-msgid "Create a new collection"
-msgstr ""
-
-#: ../../include/group.php:301
-msgid "Channels not in any collection"
-msgstr ""
-
-#: ../../include/identity.php:31 ../../mod/item.php:1078
-msgid "Unable to obtain identity information from database"
-msgstr ""
-
-#: ../../include/identity.php:66
-msgid "Empty name"
-msgstr ""
-
-#: ../../include/identity.php:68
-msgid "Name too long"
-msgstr ""
-
-#: ../../include/identity.php:169
-msgid "No account identifier"
-msgstr ""
-
-#: ../../include/identity.php:182
-msgid "Nickname is required."
-msgstr ""
-
-#: ../../include/identity.php:196
-msgid "Reserved nickname. Please choose another."
-msgstr ""
-
-#: ../../include/identity.php:201 ../../include/dimport.php:34
-msgid ""
-"Nickname has unsupported characters or is already being used on this site."
-msgstr ""
-
-#: ../../include/identity.php:283
-msgid "Unable to retrieve created identity"
-msgstr ""
-
-#: ../../include/identity.php:343
-msgid "Default Profile"
-msgstr ""
-
-#: ../../include/identity.php:643
-msgid "Requested channel is not available."
+#: ../../include/message.php:18
+msgid "No recipient provided."
 msgstr ""
 
-#: ../../include/identity.php:691 ../../mod/profile.php:16
-#: ../../mod/achievements.php:11 ../../mod/editblock.php:29
-#: ../../mod/blocks.php:29 ../../mod/connect.php:13 ../../mod/hcard.php:8
-#: ../../mod/editlayout.php:28 ../../mod/editwebpage.php:28
-#: ../../mod/filestorage.php:53 ../../mod/webpages.php:29
-#: ../../mod/layouts.php:29
-msgid "Requested profile is not available."
+#: ../../include/message.php:23
+msgid "[no subject]"
 msgstr ""
 
-#: ../../include/identity.php:854 ../../mod/profiles.php:774
-msgid "Change profile photo"
+#: ../../include/message.php:45
+msgid "Unable to determine sender."
 msgstr ""
 
-#: ../../include/identity.php:861
-msgid "Profiles"
+#: ../../include/message.php:200
+msgid "Stored post could not be verified."
 msgstr ""
 
-#: ../../include/identity.php:861
-msgid "Manage/edit profiles"
+#: ../../include/follow.php:28
+msgid "Channel is blocked on this site."
 msgstr ""
 
-#: ../../include/identity.php:862 ../../mod/profiles.php:775
-msgid "Create New Profile"
+#: ../../include/follow.php:33
+msgid "Channel location missing."
 msgstr ""
 
-#: ../../include/identity.php:865 ../../include/nav.php:95
-msgid "Edit Profile"
+#: ../../include/follow.php:83
+msgid "Response from remote channel was incomplete."
 msgstr ""
 
-#: ../../include/identity.php:878 ../../mod/profiles.php:786
-msgid "Profile Image"
+#: ../../include/follow.php:100
+msgid "Channel was deleted and no longer exists."
 msgstr ""
 
-#: ../../include/identity.php:881
-msgid "visible to everybody"
+#: ../../include/follow.php:135 ../../include/follow.php:197
+msgid "Protocol disabled."
 msgstr ""
 
-#: ../../include/identity.php:882 ../../mod/profiles.php:669
-#: ../../mod/profiles.php:790
-msgid "Edit visibility"
+#: ../../include/follow.php:170
+msgid "Channel discovery failed."
 msgstr ""
 
-#: ../../include/identity.php:894 ../../include/bb2diaspora.php:450
-#: ../../include/event.php:40 ../../mod/events.php:645
-#: ../../mod/directory.php:204
-msgid "Location:"
+#: ../../include/follow.php:186
+msgid "local account not found."
 msgstr ""
 
-#: ../../include/identity.php:898 ../../include/identity.php:1139
-msgid "Gender:"
+#: ../../include/follow.php:215
+msgid "Cannot connect to yourself."
 msgstr ""
 
-#: ../../include/identity.php:899 ../../include/identity.php:1183
-msgid "Status:"
+#: ../../include/ItemObject.php:130
+msgid "Save to Folder"
 msgstr ""
 
-#: ../../include/identity.php:900 ../../include/identity.php:1194
-msgid "Homepage:"
+#: ../../include/ItemObject.php:151
+msgid "I will attend"
 msgstr ""
 
-#: ../../include/identity.php:901
-msgid "Online Now"
+#: ../../include/ItemObject.php:151
+msgid "I will not attend"
 msgstr ""
 
-#: ../../include/identity.php:983 ../../include/identity.php:1063
-#: ../../mod/ping.php:324
-msgid "g A l F d"
+#: ../../include/ItemObject.php:151
+msgid "I might attend"
 msgstr ""
 
-#: ../../include/identity.php:984 ../../include/identity.php:1064
-msgid "F d"
+#: ../../include/ItemObject.php:161
+msgid "I agree"
 msgstr ""
 
-#: ../../include/identity.php:1029 ../../include/identity.php:1104
-#: ../../mod/ping.php:346
-msgid "[today]"
+#: ../../include/ItemObject.php:161
+msgid "I disagree"
 msgstr ""
 
-#: ../../include/identity.php:1041
-msgid "Birthday Reminders"
+#: ../../include/ItemObject.php:161
+msgid "I abstain"
 msgstr ""
 
-#: ../../include/identity.php:1042
-msgid "Birthdays this week:"
+#: ../../include/ItemObject.php:212
+msgid "Add Star"
 msgstr ""
 
-#: ../../include/identity.php:1097
-msgid "[No description]"
+#: ../../include/ItemObject.php:213
+msgid "Remove Star"
 msgstr ""
 
-#: ../../include/identity.php:1115
-msgid "Event Reminders"
+#: ../../include/ItemObject.php:214
+msgid "Toggle Star Status"
 msgstr ""
 
-#: ../../include/identity.php:1116
-msgid "Events this week:"
+#: ../../include/ItemObject.php:218
+msgid "starred"
 msgstr ""
 
-#: ../../include/identity.php:1129 ../../include/identity.php:1246
-#: ../../include/apps.php:138 ../../mod/profperm.php:112
-msgid "Profile"
+#: ../../include/ItemObject.php:236
+msgid "Add Tag"
 msgstr ""
 
-#: ../../include/identity.php:1137 ../../mod/settings.php:1044
-msgid "Full Name:"
+#: ../../include/ItemObject.php:254 ../../mod/photos.php:947
+msgid "I like this (toggle)"
 msgstr ""
 
-#: ../../include/identity.php:1144
-msgid "Like this channel"
+#: ../../include/ItemObject.php:254 ../../include/taxonomy.php:305
+msgid "like"
 msgstr ""
 
-#: ../../include/identity.php:1168
-msgid "j F, Y"
+#: ../../include/ItemObject.php:255 ../../mod/photos.php:948
+msgid "I don't like this (toggle)"
 msgstr ""
 
-#: ../../include/identity.php:1169
-msgid "j F"
+#: ../../include/ItemObject.php:255 ../../include/taxonomy.php:306
+msgid "dislike"
 msgstr ""
 
-#: ../../include/identity.php:1176
-msgid "Birthday:"
+#: ../../include/ItemObject.php:259
+msgid "Share This"
 msgstr ""
 
-#: ../../include/identity.php:1180
-msgid "Age:"
+#: ../../include/ItemObject.php:259
+msgid "share"
 msgstr ""
 
-#: ../../include/identity.php:1189
+#: ../../include/ItemObject.php:276
 #, php-format
-msgid "for %1$d %2$s"
-msgstr ""
-
-#: ../../include/identity.php:1192 ../../mod/profiles.php:691
-msgid "Sexual Preference:"
-msgstr ""
-
-#: ../../include/identity.php:1196 ../../mod/profiles.php:693
-msgid "Hometown:"
-msgstr ""
-
-#: ../../include/identity.php:1198
-msgid "Tags:"
-msgstr ""
-
-#: ../../include/identity.php:1200 ../../mod/profiles.php:694
-msgid "Political Views:"
-msgstr ""
-
-#: ../../include/identity.php:1202
-msgid "Religion:"
-msgstr ""
-
-#: ../../include/identity.php:1204
-msgid "About:"
-msgstr ""
-
-#: ../../include/identity.php:1206
-msgid "Hobbies/Interests:"
-msgstr ""
-
-#: ../../include/identity.php:1208 ../../mod/profiles.php:697
-msgid "Likes:"
-msgstr ""
-
-#: ../../include/identity.php:1210 ../../mod/profiles.php:698
-msgid "Dislikes:"
-msgstr ""
-
-#: ../../include/identity.php:1212
-msgid "Contact information and Social Networks:"
-msgstr ""
-
-#: ../../include/identity.php:1214
-msgid "My other channels:"
-msgstr ""
-
-#: ../../include/identity.php:1216
-msgid "Musical interests:"
-msgstr ""
-
-#: ../../include/identity.php:1218
-msgid "Books, literature:"
-msgstr ""
-
-#: ../../include/identity.php:1220
-msgid "Television:"
-msgstr ""
-
-#: ../../include/identity.php:1222
-msgid "Film/dance/culture/entertainment:"
-msgstr ""
-
-#: ../../include/identity.php:1224
-msgid "Love/Romance:"
-msgstr ""
-
-#: ../../include/identity.php:1226
-msgid "Work/employment:"
-msgstr ""
+msgid "%d comment"
+msgid_plural "%d comments"
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../../include/identity.php:1228
-msgid "School/education:"
+#: ../../include/ItemObject.php:294 ../../include/ItemObject.php:295
+#, php-format
+msgid "View %s's profile - %s"
 msgstr ""
 
-#: ../../include/identity.php:1248
-msgid "Like this thing"
+#: ../../include/ItemObject.php:298
+msgid "to"
 msgstr ""
 
-#: ../../include/message.php:18
-msgid "No recipient provided."
+#: ../../include/ItemObject.php:299
+msgid "via"
 msgstr ""
 
-#: ../../include/message.php:23
-msgid "[no subject]"
+#: ../../include/ItemObject.php:300
+msgid "Wall-to-Wall"
 msgstr ""
 
-#: ../../include/message.php:45
-msgid "Unable to determine sender."
+#: ../../include/ItemObject.php:301
+msgid "via Wall-To-Wall:"
 msgstr ""
 
-#: ../../include/message.php:200
-msgid "Stored post could not be verified."
+#: ../../include/ItemObject.php:337
+msgid "Save Bookmarks"
 msgstr ""
 
-#: ../../include/follow.php:28
-msgid "Channel is blocked on this site."
+#: ../../include/ItemObject.php:338
+msgid "Add to Calendar"
 msgstr ""
 
-#: ../../include/follow.php:33
-msgid "Channel location missing."
+#: ../../include/ItemObject.php:347
+msgid "Mark all seen"
 msgstr ""
 
-#: ../../include/follow.php:83
-msgid "Response from remote channel was incomplete."
+#: ../../include/ItemObject.php:353 ../../mod/photos.php:1133
+msgctxt "noun"
+msgid "Likes"
 msgstr ""
 
-#: ../../include/follow.php:100
-msgid "Channel was deleted and no longer exists."
+#: ../../include/ItemObject.php:354 ../../mod/photos.php:1134
+msgctxt "noun"
+msgid "Dislikes"
 msgstr ""
 
-#: ../../include/follow.php:135 ../../include/follow.php:197
-msgid "Protocol disabled."
+#: ../../include/ItemObject.php:359 ../../include/acl_selectors.php:249
+#: ../../mod/photos.php:1139
+msgid "Close"
 msgstr ""
 
-#: ../../include/follow.php:170
-msgid "Channel discovery failed."
+#: ../../include/ItemObject.php:665 ../../mod/photos.php:966
+#: ../../mod/photos.php:1084
+msgid "This is you"
 msgstr ""
 
-#: ../../include/follow.php:186
-msgid "local account not found."
+#: ../../include/ItemObject.php:674
+msgid "Image"
 msgstr ""
 
-#: ../../include/follow.php:215
-msgid "Cannot connect to yourself."
+#: ../../include/ItemObject.php:675
+msgid "Insert Link"
 msgstr ""
 
-#: ../../include/comanche.php:35 ../../mod/admin.php:357
-#: ../../view/theme/apw/php/config.php:185
-msgid "Default"
+#: ../../include/ItemObject.php:676
+msgid "Video"
 msgstr ""
 
 #: ../../include/datetime.php:35
@@ -1961,7 +2320,7 @@ msgstr ""
 msgid "Required"
 msgstr ""
 
-#: ../../include/datetime.php:231
+#: ../../include/datetime.php:231 ../../boot.php:2356
 msgid "never"
 msgstr ""
 
@@ -2040,6 +2399,19 @@ msgstr ""
 msgid "Happy Birthday %1$s"
 msgstr ""
 
+#: ../../include/Contact.php:124
+msgid "New window"
+msgstr ""
+
+#: ../../include/Contact.php:125
+msgid "Open the selected location in a different window or browser tab"
+msgstr ""
+
+#: ../../include/Contact.php:215 ../../mod/admin.php:726
+#, php-format
+msgid "User '%s' deleted"
+msgstr ""
+
 #: ../../include/bb2diaspora.php:349
 msgid "Attachments:"
 msgstr ""
@@ -2060,26 +2432,6 @@ msgstr ""
 msgid "Finishes:"
 msgstr ""
 
-#: ../../include/chat.php:10
-msgid "Missing room name"
-msgstr ""
-
-#: ../../include/chat.php:19
-msgid "Duplicate room name"
-msgstr ""
-
-#: ../../include/chat.php:68 ../../include/chat.php:76
-msgid "Invalid room specifier."
-msgstr ""
-
-#: ../../include/chat.php:105
-msgid "Room not found."
-msgstr ""
-
-#: ../../include/chat.php:126
-msgid "Room is full"
-msgstr ""
-
 #: ../../include/nav.php:87 ../../include/nav.php:120 ../../boot.php:1551
 msgid "Logout"
 msgstr ""
@@ -2096,11 +2448,6 @@ msgstr ""
 msgid "Your posts and conversations"
 msgstr ""
 
-#: ../../include/nav.php:91 ../../include/conversation.php:937
-#: ../../mod/connedit.php:484 ../../mod/connedit.php:634
-msgid "View Profile"
-msgstr ""
-
 #: ../../include/nav.php:91
 msgid "Your profile page"
 msgstr ""
@@ -2117,11 +2464,6 @@ msgstr ""
 msgid "Edit your profile"
 msgstr ""
 
-#: ../../include/nav.php:97 ../../include/apps.php:139
-#: ../../include/conversation.php:1586 ../../mod/fbrowser.php:25
-msgid "Photos"
-msgstr ""
-
 #: ../../include/nav.php:97
 msgid "Your photos"
 msgstr ""
@@ -2138,20 +2480,10 @@ msgstr ""
 msgid "Your chatrooms"
 msgstr ""
 
-#: ../../include/nav.php:109 ../../include/apps.php:129
-#: ../../include/conversation.php:1621
-msgid "Bookmarks"
-msgstr ""
-
 #: ../../include/nav.php:109
 msgid "Your bookmarks"
 msgstr ""
 
-#: ../../include/nav.php:113 ../../include/apps.php:136
-#: ../../include/conversation.php:1632 ../../mod/webpages.php:160
-msgid "Webpages"
-msgstr ""
-
 #: ../../include/nav.php:113
 msgid "Your webpages"
 msgstr ""
@@ -2202,12 +2534,18 @@ msgstr ""
 msgid "Applications, utilities, links, games"
 msgstr ""
 
+#: ../../include/nav.php:165 ../../include/apps.php:147
+#: ../../include/text.php:832 ../../include/text.php:844
+#: ../../mod/search.php:34
+msgid "Search"
+msgstr ""
+
 #: ../../include/nav.php:165
 msgid "Search site content"
 msgstr ""
 
 #: ../../include/nav.php:168 ../../include/apps.php:141
-#: ../../mod/directory.php:334
+#: ../../mod/directory.php:353
 msgid "Directory"
 msgstr ""
 
@@ -2215,547 +2553,449 @@ msgstr ""
 msgid "Channel Directory"
 msgstr ""
 
-#: ../../include/nav.php:182 ../../include/apps.php:133
+#: ../../include/nav.php:180 ../../include/apps.php:133
 msgid "Matrix"
 msgstr ""
 
-#: ../../include/nav.php:182
+#: ../../include/nav.php:180
 msgid "Your matrix"
 msgstr ""
 
-#: ../../include/nav.php:183
+#: ../../include/nav.php:181
 msgid "Mark all matrix notifications seen"
 msgstr ""
 
-#: ../../include/nav.php:185 ../../include/apps.php:137
+#: ../../include/nav.php:183 ../../include/apps.php:137
 msgid "Channel Home"
 msgstr ""
 
-#: ../../include/nav.php:185
+#: ../../include/nav.php:183
 msgid "Channel home"
 msgstr ""
 
-#: ../../include/nav.php:186
+#: ../../include/nav.php:184
 msgid "Mark all channel notifications seen"
 msgstr ""
 
-#: ../../include/nav.php:189 ../../mod/connections.php:407
+#: ../../include/nav.php:187 ../../mod/connections.php:407
 msgid "Connections"
 msgstr ""
 
-#: ../../include/nav.php:192
+#: ../../include/nav.php:190
 msgid "Notices"
 msgstr ""
 
-#: ../../include/nav.php:192
+#: ../../include/nav.php:190
 msgid "Notifications"
 msgstr ""
 
-#: ../../include/nav.php:193
+#: ../../include/nav.php:191
 msgid "See all notifications"
 msgstr ""
 
-#: ../../include/nav.php:194 ../../mod/notifications.php:99
+#: ../../include/nav.php:192 ../../mod/notifications.php:99
 msgid "Mark all system notifications seen"
 msgstr ""
 
-#: ../../include/nav.php:196 ../../include/apps.php:143
+#: ../../include/nav.php:194 ../../include/apps.php:143
 msgid "Mail"
 msgstr ""
 
-#: ../../include/nav.php:196
+#: ../../include/nav.php:194
 msgid "Private mail"
 msgstr ""
 
-#: ../../include/nav.php:197
+#: ../../include/nav.php:195
 msgid "See all private messages"
 msgstr ""
 
-#: ../../include/nav.php:198
+#: ../../include/nav.php:196
 msgid "Mark all private messages seen"
 msgstr ""
 
-#: ../../include/nav.php:199
+#: ../../include/nav.php:197
 msgid "Inbox"
 msgstr ""
 
-#: ../../include/nav.php:200
+#: ../../include/nav.php:198
 msgid "Outbox"
 msgstr ""
 
-#: ../../include/nav.php:204 ../../include/apps.php:140
+#: ../../include/nav.php:202 ../../include/apps.php:140
 #: ../../mod/events.php:472
 msgid "Events"
 msgstr ""
 
-#: ../../include/nav.php:204
+#: ../../include/nav.php:202
 msgid "Event Calendar"
 msgstr ""
 
-#: ../../include/nav.php:205
+#: ../../include/nav.php:203
 msgid "See all events"
 msgstr ""
 
-#: ../../include/nav.php:206
+#: ../../include/nav.php:204
 msgid "Mark all events seen"
 msgstr ""
 
-#: ../../include/nav.php:208 ../../include/apps.php:132
-#: ../../mod/manage.php:148
+#: ../../include/nav.php:206 ../../include/apps.php:132
+#: ../../mod/manage.php:164
 msgid "Channel Manager"
 msgstr ""
 
-#: ../../include/nav.php:208
+#: ../../include/nav.php:206
 msgid "Manage Your Channels"
 msgstr ""
 
-#: ../../include/nav.php:210
+#: ../../include/nav.php:208
 msgid "Account/Channel Settings"
 msgstr ""
 
-#: ../../include/nav.php:218 ../../mod/admin.php:123
+#: ../../include/nav.php:216 ../../mod/admin.php:120
 msgid "Admin"
 msgstr ""
 
-#: ../../include/nav.php:218
+#: ../../include/nav.php:216
 msgid "Site Setup and Configuration"
 msgstr ""
 
-#: ../../include/nav.php:249 ../../include/conversation.php:842
-msgid "Loading..."
-msgstr ""
-
-#: ../../include/nav.php:254
+#: ../../include/nav.php:252
 msgid "@name, #tag, content"
 msgstr ""
 
-#: ../../include/nav.php:255
+#: ../../include/nav.php:253
 msgid "Please wait..."
 msgstr ""
 
-#: ../../include/security.php:357
-msgid ""
-"The form security token was not correct. This probably happened because the "
-"form has been opened for too long (>3 hours) before submitting it."
-msgstr ""
-
-#: ../../include/ItemObject.php:89 ../../include/conversation.php:652
-msgid "Private Message"
-msgstr ""
-
-#: ../../include/ItemObject.php:126 ../../include/conversation.php:644
-msgid "Select"
-msgstr ""
-
-#: ../../include/ItemObject.php:130
-msgid "Save to Folder"
-msgstr ""
-
-#: ../../include/ItemObject.php:151
-msgid "I will attend"
-msgstr ""
-
-#: ../../include/ItemObject.php:151
-msgid "I will not attend"
-msgstr ""
-
-#: ../../include/ItemObject.php:151
-msgid "I might attend"
-msgstr ""
-
-#: ../../include/ItemObject.php:161
-msgid "I agree"
-msgstr ""
-
-#: ../../include/ItemObject.php:161
-msgid "I disagree"
-msgstr ""
-
-#: ../../include/ItemObject.php:161
-msgid "I abstain"
-msgstr ""
-
-#: ../../include/ItemObject.php:175 ../../include/ItemObject.php:187
-#: ../../include/conversation.php:1667 ../../mod/photos.php:997
-#: ../../mod/photos.php:1009
-msgid "View all"
-msgstr ""
-
-#: ../../include/ItemObject.php:184 ../../include/conversation.php:1695
-#: ../../mod/photos.php:1006
-msgctxt "noun"
-msgid "Dislike"
-msgid_plural "Dislikes"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../../include/ItemObject.php:212
-msgid "Add Star"
-msgstr ""
-
-#: ../../include/ItemObject.php:213
-msgid "Remove Star"
+#: ../../include/taxonomy.php:222 ../../include/taxonomy.php:243
+msgid "Tags"
 msgstr ""
 
-#: ../../include/ItemObject.php:214
-msgid "Toggle Star Status"
+#: ../../include/taxonomy.php:282
+msgid "Keywords"
 msgstr ""
 
-#: ../../include/ItemObject.php:218
-msgid "starred"
+#: ../../include/taxonomy.php:303
+msgid "have"
 msgstr ""
 
-#: ../../include/ItemObject.php:227 ../../include/conversation.php:659
-msgid "Message signature validated"
+#: ../../include/taxonomy.php:303
+msgid "has"
 msgstr ""
 
-#: ../../include/ItemObject.php:228 ../../include/conversation.php:660
-msgid "Message signature incorrect"
+#: ../../include/taxonomy.php:304
+msgid "want"
 msgstr ""
 
-#: ../../include/ItemObject.php:236
-msgid "Add Tag"
+#: ../../include/taxonomy.php:304
+msgid "wants"
 msgstr ""
 
-#: ../../include/ItemObject.php:254 ../../mod/photos.php:941
-msgid "I like this (toggle)"
+#: ../../include/taxonomy.php:305
+msgid "likes"
 msgstr ""
 
-#: ../../include/ItemObject.php:255 ../../mod/photos.php:942
-msgid "I don't like this (toggle)"
+#: ../../include/taxonomy.php:306
+msgid "dislikes"
 msgstr ""
 
-#: ../../include/ItemObject.php:259
-msgid "Share This"
+#: ../../include/activities.php:39
+msgid " and "
 msgstr ""
 
-#: ../../include/ItemObject.php:259
-msgid "share"
+#: ../../include/activities.php:47
+msgid "public profile"
 msgstr ""
 
-#: ../../include/ItemObject.php:276
-#, php-format
-msgid "%d comment"
-msgid_plural "%d comments"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../../include/ItemObject.php:294 ../../include/ItemObject.php:295
+#: ../../include/activities.php:56
 #, php-format
-msgid "View %s's profile - %s"
-msgstr ""
-
-#: ../../include/ItemObject.php:298
-msgid "to"
+msgid "%1$s changed %2$s to &ldquo;%3$s&rdquo;"
 msgstr ""
 
-#: ../../include/ItemObject.php:299
-msgid "via"
+#: ../../include/activities.php:57
+#, php-format
+msgid "Visit %1$s's %2$s"
 msgstr ""
 
-#: ../../include/ItemObject.php:300
-msgid "Wall-to-Wall"
+#: ../../include/activities.php:60
+#, php-format
+msgid "%1$s has an updated %2$s, changing %3$s."
 msgstr ""
 
-#: ../../include/ItemObject.php:301
-msgid "via Wall-To-Wall:"
+#: ../../include/event.php:376
+msgid "This event has been added to your calendar."
 msgstr ""
 
-#: ../../include/ItemObject.php:312 ../../include/conversation.php:704
-#, php-format
-msgid " from %s"
+#: ../../include/api.php:1081
+msgid "Public Timeline"
 msgstr ""
 
-#: ../../include/ItemObject.php:315 ../../include/conversation.php:707
-#, php-format
-msgid "last edited: %s"
+#: ../../include/network.php:620
+msgid "view full size"
 msgstr ""
 
-#: ../../include/ItemObject.php:316 ../../include/conversation.php:708
-#, php-format
-msgid "Expires: %s"
+#: ../../include/dir_fns.php:134
+msgid "Directory Options"
 msgstr ""
 
-#: ../../include/ItemObject.php:337
-msgid "Save Bookmarks"
+#: ../../include/dir_fns.php:135
+msgid "Alphabetic"
 msgstr ""
 
-#: ../../include/ItemObject.php:338
-msgid "Add to Calendar"
+#: ../../include/dir_fns.php:136
+msgid "Reverse Alphabetic"
 msgstr ""
 
-#: ../../include/ItemObject.php:347
-msgid "Mark all seen"
+#: ../../include/dir_fns.php:137
+msgid "Newest to Oldest"
 msgstr ""
 
-#: ../../include/ItemObject.php:353 ../../mod/photos.php:1125
-msgctxt "noun"
-msgid "Likes"
+#: ../../include/dir_fns.php:138
+msgid "Oldest to Newest"
 msgstr ""
 
-#: ../../include/ItemObject.php:354 ../../mod/photos.php:1126
-msgctxt "noun"
-msgid "Dislikes"
+#: ../../include/dir_fns.php:139
+msgid "Sort"
 msgstr ""
 
-#: ../../include/ItemObject.php:359 ../../include/acl_selectors.php:249
-#: ../../mod/photos.php:1131
-msgid "Close"
+#: ../../include/dir_fns.php:143
+msgid "Safe Mode"
 msgstr ""
 
-#: ../../include/ItemObject.php:364 ../../include/conversation.php:725
-#: ../../include/conversation.php:1198 ../../mod/editblock.php:152
-#: ../../mod/editpost.php:125 ../../mod/editlayout.php:148
-#: ../../mod/editwebpage.php:183 ../../mod/mail.php:241 ../../mod/mail.php:356
-#: ../../mod/photos.php:944
-msgid "Please wait"
+#: ../../include/dir_fns.php:145
+msgid "Public Forums Only"
 msgstr ""
 
-#: ../../include/ItemObject.php:665 ../../mod/photos.php:960
-#: ../../mod/photos.php:1078
-msgid "This is you"
+#: ../../include/dir_fns.php:146
+msgid "This Website Only"
 msgstr ""
 
-#: ../../include/ItemObject.php:669
-msgid "Bold"
+#: ../../include/oembed.php:183
+msgid "Embedded content"
 msgstr ""
 
-#: ../../include/ItemObject.php:670
-msgid "Italic"
+#: ../../include/oembed.php:192
+msgid "Embedding disabled"
 msgstr ""
 
-#: ../../include/ItemObject.php:671
-msgid "Underline"
+#: ../../include/zot.php:679
+msgid "Invalid data packet"
 msgstr ""
 
-#: ../../include/ItemObject.php:672
-msgid "Quote"
+#: ../../include/zot.php:695
+msgid "Unable to verify channel signature"
 msgstr ""
 
-#: ../../include/ItemObject.php:673
-msgid "Code"
+#: ../../include/zot.php:2079
+#, php-format
+msgid "Unable to verify site signature for %s"
 msgstr ""
 
-#: ../../include/ItemObject.php:674
-msgid "Image"
+#: ../../include/auth.php:130
+msgid "Logged out."
 msgstr ""
 
-#: ../../include/ItemObject.php:675
-msgid "Link"
+#: ../../include/auth.php:271
+msgid "Failed authentication"
 msgstr ""
 
-#: ../../include/ItemObject.php:676
-msgid "Video"
+#: ../../include/auth.php:285 ../../mod/openid.php:190
+msgid "Login failed."
 msgstr ""
 
-#: ../../include/ItemObject.php:680 ../../include/conversation.php:1224
-#: ../../mod/editpost.php:152 ../../mod/mail.php:247 ../../mod/mail.php:361
-msgid "Encrypt text"
+#: ../../include/enotify.php:41
+msgid "Red Matrix Notification"
 msgstr ""
 
-#: ../../include/activities.php:39
-msgid " and "
+#: ../../include/enotify.php:42
+msgid "redmatrix"
 msgstr ""
 
-#: ../../include/activities.php:47
-msgid "public profile"
+#: ../../include/enotify.php:44
+msgid "Thank You,"
 msgstr ""
 
-#: ../../include/activities.php:56
+#: ../../include/enotify.php:46
 #, php-format
-msgid "%1$s changed %2$s to &ldquo;%3$s&rdquo;"
+msgid "%s Administrator"
 msgstr ""
 
-#: ../../include/activities.php:57
+#: ../../include/enotify.php:81
 #, php-format
-msgid "Visit %1$s's %2$s"
+msgid "%s <!item_type!>"
 msgstr ""
 
-#: ../../include/activities.php:60
+#: ../../include/enotify.php:85
 #, php-format
-msgid "%1$s has an updated %2$s, changing %3$s."
-msgstr ""
-
-#: ../../include/dir_fns.php:96
-msgid "Directory Options"
-msgstr ""
-
-#: ../../include/dir_fns.php:97
-msgid "Alphabetic"
-msgstr ""
-
-#: ../../include/dir_fns.php:98
-msgid "Reverse Alphabetic"
-msgstr ""
-
-#: ../../include/dir_fns.php:99
-msgid "Newest to Oldest"
-msgstr ""
-
-#: ../../include/dir_fns.php:100
-msgid "Oldest to Newest"
-msgstr ""
-
-#: ../../include/dir_fns.php:101
-msgid "Public Forums Only"
+msgid "[Red:Notify] New mail received at %s"
 msgstr ""
 
-#: ../../include/dir_fns.php:103
-msgid "Sort"
+#: ../../include/enotify.php:87
+#, php-format
+msgid "%1$s, %2$s sent you a new private message at %3$s."
 msgstr ""
 
-#: ../../include/dir_fns.php:119
-msgid "Enable Safe Search"
+#: ../../include/enotify.php:88
+#, php-format
+msgid "%1$s sent you %2$s."
 msgstr ""
 
-#: ../../include/dir_fns.php:121
-msgid "Disable Safe Search"
+#: ../../include/enotify.php:88
+msgid "a private message"
 msgstr ""
 
-#: ../../include/dir_fns.php:123
-msgid "Safe Mode"
+#: ../../include/enotify.php:89
+#, php-format
+msgid "Please visit %s to view and/or reply to your private messages."
 msgstr ""
 
-#: ../../include/items.php:382 ../../mod/subthread.php:49
-#: ../../mod/group.php:68 ../../mod/profperm.php:23 ../../mod/like.php:270
-#: ../../index.php:389
-msgid "Permission denied"
+#: ../../include/enotify.php:144
+#, php-format
+msgid "%1$s, %2$s commented on [zrl=%3$s]a %4$s[/zrl]"
 msgstr ""
 
-#: ../../include/items.php:979 ../../include/items.php:1024
-msgid "(Unknown)"
+#: ../../include/enotify.php:152
+#, php-format
+msgid "%1$s, %2$s commented on [zrl=%3$s]%4$s's %5$s[/zrl]"
 msgstr ""
 
-#: ../../include/items.php:1181
-msgid "Visible to anybody on the internet."
+#: ../../include/enotify.php:161
+#, php-format
+msgid "%1$s, %2$s commented on [zrl=%3$s]your %4$s[/zrl]"
 msgstr ""
 
-#: ../../include/items.php:1183
-msgid "Visible to you only."
+#: ../../include/enotify.php:172
+#, php-format
+msgid "[Red:Notify] Comment to conversation #%1$d by %2$s"
 msgstr ""
 
-#: ../../include/items.php:1185
-msgid "Visible to anybody in this network."
+#: ../../include/enotify.php:173
+#, php-format
+msgid "%1$s, %2$s commented on an item/conversation you have been following."
 msgstr ""
 
-#: ../../include/items.php:1187
-msgid "Visible to anybody authenticated."
+#: ../../include/enotify.php:176 ../../include/enotify.php:191
+#: ../../include/enotify.php:217 ../../include/enotify.php:236
+#: ../../include/enotify.php:250
+#, php-format
+msgid "Please visit %s to view and/or reply to the conversation."
 msgstr ""
 
-#: ../../include/items.php:1189
+#: ../../include/enotify.php:182
 #, php-format
-msgid "Visible to anybody on %s."
+msgid "[Red:Notify] %s posted to your profile wall"
 msgstr ""
 
-#: ../../include/items.php:1191
-msgid "Visible to all connections."
+#: ../../include/enotify.php:184
+#, php-format
+msgid "%1$s, %2$s posted to your profile wall at %3$s"
 msgstr ""
 
-#: ../../include/items.php:1193
-msgid "Visible to approved connections."
+#: ../../include/enotify.php:186
+#, php-format
+msgid "%1$s, %2$s posted to [zrl=%3$s]your wall[/zrl]"
 msgstr ""
 
-#: ../../include/items.php:1195
-msgid "Visible to specific connections."
+#: ../../include/enotify.php:210
+#, php-format
+msgid "[Red:Notify] %s tagged you"
 msgstr ""
 
-#: ../../include/items.php:4002 ../../mod/thing.php:76
-#: ../../mod/display.php:32 ../../mod/filestorage.php:27
-#: ../../mod/viewsrc.php:20 ../../mod/admin.php:168 ../../mod/admin.php:901
-#: ../../mod/admin.php:1104
-msgid "Item not found."
+#: ../../include/enotify.php:211
+#, php-format
+msgid "%1$s, %2$s tagged you at %3$s"
 msgstr ""
 
-#: ../../include/items.php:4455 ../../mod/group.php:38 ../../mod/group.php:140
-msgid "Collection not found."
+#: ../../include/enotify.php:212
+#, php-format
+msgid "%1$s, %2$s [zrl=%3$s]tagged you[/zrl]."
 msgstr ""
 
-#: ../../include/items.php:4470
-msgid "Collection is empty."
+#: ../../include/enotify.php:225
+#, php-format
+msgid "[Red:Notify] %1$s poked you"
 msgstr ""
 
-#: ../../include/items.php:4477
+#: ../../include/enotify.php:226
 #, php-format
-msgid "Collection: %s"
+msgid "%1$s, %2$s poked you at %3$s"
 msgstr ""
 
-#: ../../include/items.php:4488
+#: ../../include/enotify.php:227
 #, php-format
-msgid "Connection: %s"
+msgid "%1$s, %2$s [zrl=%2$s]poked you[/zrl]."
 msgstr ""
 
-#: ../../include/items.php:4491
-msgid "Connection not found."
+#: ../../include/enotify.php:243
+#, php-format
+msgid "[Red:Notify] %s tagged your post"
 msgstr ""
 
-#: ../../include/event.php:376
-msgid "This event has been added to your calendar."
+#: ../../include/enotify.php:244
+#, php-format
+msgid "%1$s, %2$s tagged your post at %3$s"
 msgstr ""
 
-#: ../../include/Contact.php:124
-msgid "New window"
+#: ../../include/enotify.php:245
+#, php-format
+msgid "%1$s, %2$s tagged [zrl=%3$s]your post[/zrl]"
 msgstr ""
 
-#: ../../include/Contact.php:125
-msgid "Open the selected location in a different window or browser tab"
+#: ../../include/enotify.php:257
+msgid "[Red:Notify] Introduction received"
 msgstr ""
 
-#: ../../include/Contact.php:215 ../../mod/admin.php:651
+#: ../../include/enotify.php:258
 #, php-format
-msgid "User '%s' deleted"
-msgstr ""
-
-#: ../../include/network.php:613
-msgid "view full size"
+msgid "%1$s, you've received an new connection request from '%2$s' at %3$s"
 msgstr ""
 
-#: ../../include/diaspora.php:1938 ../../include/conversation.php:164
-#: ../../mod/like.php:383
+#: ../../include/enotify.php:259
 #, php-format
-msgid "%1$s likes %2$s's %3$s"
+msgid ""
+"%1$s, you've received [zrl=%2$s]a new connection request[/zrl] from %3$s."
 msgstr ""
 
-#: ../../include/bbcode.php:115 ../../include/bbcode.php:694
-#: ../../include/bbcode.php:697 ../../include/bbcode.php:702
-#: ../../include/bbcode.php:705 ../../include/bbcode.php:708
-#: ../../include/bbcode.php:711 ../../include/bbcode.php:716
-#: ../../include/bbcode.php:719 ../../include/bbcode.php:724
-#: ../../include/bbcode.php:727 ../../include/bbcode.php:730
-#: ../../include/bbcode.php:733
-msgid "Image/photo"
+#: ../../include/enotify.php:263 ../../include/enotify.php:282
+#, php-format
+msgid "You may visit their profile at %s"
 msgstr ""
 
-#: ../../include/bbcode.php:150 ../../include/bbcode.php:744
-msgid "Encrypted content"
+#: ../../include/enotify.php:265
+#, php-format
+msgid "Please visit %s to approve or reject the connection request."
 msgstr ""
 
-#: ../../include/bbcode.php:168
-msgid "Install design element: "
+#: ../../include/enotify.php:272
+msgid "[Red:Notify] Friend suggestion received"
 msgstr ""
 
-#: ../../include/bbcode.php:174
-msgid "QR code"
+#: ../../include/enotify.php:273
+#, php-format
+msgid "%1$s, you've received a friend suggestion from '%2$s' at %3$s"
 msgstr ""
 
-#: ../../include/bbcode.php:223
+#: ../../include/enotify.php:274
 #, php-format
-msgid "%1$s wrote the following %2$s %3$s"
+msgid ""
+"%1$s, you've received [zrl=%2$s]a friend suggestion[/zrl] for %3$s from %4$s."
 msgstr ""
 
-#: ../../include/bbcode.php:225
-msgid "post"
+#: ../../include/enotify.php:280
+msgid "Name:"
 msgstr ""
 
-#: ../../include/bbcode.php:447
-msgid "Different viewers will see this text differently"
+#: ../../include/enotify.php:281
+msgid "Photo:"
 msgstr ""
 
-#: ../../include/bbcode.php:662
-msgid "$1 spoiler"
+#: ../../include/enotify.php:284
+#, php-format
+msgid "Please visit %s to approve or reject the suggestion."
 msgstr ""
 
-#: ../../include/bbcode.php:682
-msgid "$1 wrote:"
+#: ../../include/enotify.php:499
+msgid "[Red:Notify]"
 msgstr ""
 
 #: ../../include/contact_widgets.php:14
@@ -2765,7 +3005,7 @@ msgid_plural "%d invitations available"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../../include/contact_widgets.php:19 ../../mod/admin.php:420
+#: ../../include/contact_widgets.php:19 ../../mod/admin.php:445
 msgid "Advanced"
 msgstr ""
 
@@ -2786,12 +3026,12 @@ msgid "Examples: Robert Morgenstein, Fishing"
 msgstr ""
 
 #: ../../include/contact_widgets.php:26 ../../mod/connections.php:413
-#: ../../mod/directory.php:330 ../../mod/directory.php:335
+#: ../../mod/directory.php:349 ../../mod/directory.php:354
 msgid "Find"
 msgstr ""
 
-#: ../../include/contact_widgets.php:27 ../../mod/suggest.php:59
-#: ../../mod/directory.php:334
+#: ../../include/contact_widgets.php:27 ../../mod/directory.php:353
+#: ../../mod/suggest.php:59
 msgid "Channel Suggestions"
 msgstr ""
 
@@ -2832,34 +3072,38 @@ msgstr ""
 
 #: ../../include/acl_selectors.php:248 ../../mod/events.php:652
 #: ../../mod/chat.php:209 ../../mod/filestorage.php:146
-#: ../../mod/photos.php:559 ../../mod/photos.php:916
+#: ../../mod/photos.php:559 ../../mod/photos.php:922
 msgid "Permissions"
 msgstr ""
 
-#: ../../include/api.php:1081
-msgid "Public Timeline"
+#: ../../include/photos.php:86
+#, php-format
+msgid "Image exceeds website size limit of %lu bytes"
 msgstr ""
 
-#: ../../include/zot.php:673
-msgid "Invalid data packet"
+#: ../../include/photos.php:93
+msgid "Image file is empty."
 msgstr ""
 
-#: ../../include/zot.php:689
-msgid "Unable to verify channel signature"
+#: ../../include/photos.php:121 ../../mod/profile_photo.php:217
+msgid "Unable to process image"
 msgstr ""
 
-#: ../../include/zot.php:1961
-#, php-format
-msgid "Unable to verify site signature for %s"
+#: ../../include/photos.php:194
+msgid "Photo storage failed."
+msgstr ""
+
+#: ../../include/photos.php:360
+msgid "Upload New Photos"
 msgstr ""
 
 #: ../../include/profile_selectors.php:6
-#: ../../include/profile_selectors.php:23
+#: ../../include/profile_selectors.php:23 ../../mod/id.php:93
 msgid "Male"
 msgstr ""
 
 #: ../../include/profile_selectors.php:6
-#: ../../include/profile_selectors.php:23
+#: ../../include/profile_selectors.php:23 ../../mod/id.php:95
 msgid "Female"
 msgstr ""
 
@@ -3108,10 +3352,6 @@ msgstr ""
 msgid "Mood"
 msgstr ""
 
-#: ../../include/apps.php:145 ../../include/conversation.php:943
-msgid "Poke"
-msgstr ""
-
 #: ../../include/apps.php:148
 msgid "Probe"
 msgstr ""
@@ -3132,7 +3372,7 @@ msgstr ""
 msgid "Features"
 msgstr ""
 
-#: ../../include/apps.php:153
+#: ../../include/apps.php:153 ../../mod/id.php:25
 msgid "Language"
 msgstr ""
 
@@ -3140,12 +3380,13 @@ msgstr ""
 msgid "Post"
 msgstr ""
 
-#: ../../include/apps.php:155
+#: ../../include/apps.php:155 ../../mod/id.php:14 ../../mod/id.php:15
+#: ../../mod/id.php:16
 msgid "Profile Photo"
 msgstr ""
 
-#: ../../include/apps.php:247 ../../mod/settings.php:81
-#: ../../mod/settings.php:609
+#: ../../include/apps.php:247 ../../mod/settings.php:84
+#: ../../mod/settings.php:608
 msgid "Update"
 msgstr ""
 
@@ -3157,549 +3398,332 @@ msgstr ""
 msgid "Purchase"
 msgstr ""
 
-#: ../../include/account.php:23
-msgid "Not a valid email address"
-msgstr ""
-
-#: ../../include/account.php:25
-msgid "Your email domain is not among those allowed on this site"
-msgstr ""
-
-#: ../../include/account.php:31
-msgid "Your email address is already registered at this site."
-msgstr ""
-
-#: ../../include/account.php:64
-msgid "An invitation is required."
-msgstr ""
-
-#: ../../include/account.php:68
-msgid "Invitation could not be verified."
-msgstr ""
-
-#: ../../include/account.php:119
-msgid "Please enter the required information."
-msgstr ""
-
-#: ../../include/account.php:187
-msgid "Failed to store account information."
-msgstr ""
-
-#: ../../include/account.php:245
-#, php-format
-msgid "Registration confirmation for %s"
-msgstr ""
-
-#: ../../include/account.php:313
-#, php-format
-msgid "Registration request at %s"
-msgstr ""
-
-#: ../../include/account.php:315 ../../include/account.php:342
-#: ../../include/account.php:399
-msgid "Administrator"
-msgstr ""
-
-#: ../../include/account.php:337
-msgid "your registration password"
-msgstr ""
-
-#: ../../include/account.php:340 ../../include/account.php:397
-#, php-format
-msgid "Registration details for %s"
-msgstr ""
-
-#: ../../include/account.php:406
-msgid "Account approved."
-msgstr ""
-
-#: ../../include/account.php:440
-#, php-format
-msgid "Registration revoked for %s"
-msgstr ""
-
-#: ../../include/account.php:486
-msgid "Account verified. Please login."
-msgstr ""
-
-#: ../../include/account.php:674 ../../include/account.php:676
-msgid "Click here to upgrade."
-msgstr ""
-
-#: ../../include/account.php:682
-msgid "This action exceeds the limits set by your subscription plan."
-msgstr ""
-
-#: ../../include/account.php:687
-msgid "This action is not available under your subscription plan."
-msgstr ""
-
-#: ../../include/conversation.php:126 ../../mod/like.php:113
-msgid "channel"
-msgstr ""
-
-#: ../../include/conversation.php:167 ../../mod/like.php:385
-#, php-format
-msgid "%1$s doesn't like %2$s's %3$s"
-msgstr ""
-
-#: ../../include/conversation.php:204
-#, php-format
-msgid "%1$s is now connected with %2$s"
-msgstr ""
-
-#: ../../include/conversation.php:239
-#, php-format
-msgid "%1$s poked %2$s"
-msgstr ""
-
-#: ../../include/conversation.php:261 ../../mod/mood.php:63
-#, php-format
-msgctxt "mood"
-msgid "%1$s is %2$s"
-msgstr ""
-
-#: ../../include/conversation.php:556 ../../mod/photos.php:978
-msgctxt "title"
-msgid "Likes"
-msgstr ""
-
-#: ../../include/conversation.php:556 ../../mod/photos.php:978
-msgctxt "title"
-msgid "Dislikes"
+#: ../../include/text.php:318
+msgid "prev"
 msgstr ""
 
-#: ../../include/conversation.php:557 ../../mod/photos.php:979
-msgctxt "title"
-msgid "Agree"
+#: ../../include/text.php:320
+msgid "first"
 msgstr ""
 
-#: ../../include/conversation.php:557 ../../mod/photos.php:979
-msgctxt "title"
-msgid "Disagree"
+#: ../../include/text.php:349
+msgid "last"
 msgstr ""
 
-#: ../../include/conversation.php:557 ../../mod/photos.php:979
-msgctxt "title"
-msgid "Abstain"
+#: ../../include/text.php:352
+msgid "next"
 msgstr ""
 
-#: ../../include/conversation.php:558 ../../mod/photos.php:980
-msgctxt "title"
-msgid "Attending"
+#: ../../include/text.php:362
+msgid "older"
 msgstr ""
 
-#: ../../include/conversation.php:558 ../../mod/photos.php:980
-msgctxt "title"
-msgid "Not attending"
+#: ../../include/text.php:364
+msgid "newer"
 msgstr ""
 
-#: ../../include/conversation.php:558 ../../mod/photos.php:980
-msgctxt "title"
-msgid "Might attend"
+#: ../../include/text.php:748
+msgid "No connections"
 msgstr ""
 
-#: ../../include/conversation.php:680
+#: ../../include/text.php:762
 #, php-format
-msgid "View %s's profile @ %s"
-msgstr ""
-
-#: ../../include/conversation.php:695
-msgid "Categories:"
-msgstr ""
-
-#: ../../include/conversation.php:696
-msgid "Filed under:"
-msgstr ""
+msgid "%d Connection"
+msgid_plural "%d Connections"
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../../include/conversation.php:723
-msgid "View in context"
+#: ../../include/text.php:775 ../../mod/viewconnections.php:86
+msgid "View Connections"
 msgstr ""
 
-#: ../../include/conversation.php:838
-msgid "remove"
+#: ../../include/text.php:911
+msgid "poke"
 msgstr ""
 
-#: ../../include/conversation.php:843
-msgid "Delete Selected Items"
+#: ../../include/text.php:912
+msgid "ping"
 msgstr ""
 
-#: ../../include/conversation.php:934
-msgid "View Source"
+#: ../../include/text.php:912
+msgid "pinged"
 msgstr ""
 
-#: ../../include/conversation.php:935
-msgid "Follow Thread"
+#: ../../include/text.php:913
+msgid "prod"
 msgstr ""
 
-#: ../../include/conversation.php:936
-msgid "View Status"
+#: ../../include/text.php:913
+msgid "prodded"
 msgstr ""
 
-#: ../../include/conversation.php:938
-msgid "View Photos"
+#: ../../include/text.php:914
+msgid "slap"
 msgstr ""
 
-#: ../../include/conversation.php:939
-msgid "Matrix Activity"
+#: ../../include/text.php:914
+msgid "slapped"
 msgstr ""
 
-#: ../../include/conversation.php:941
-msgid "Edit Contact"
+#: ../../include/text.php:915
+msgid "finger"
 msgstr ""
 
-#: ../../include/conversation.php:942
-msgid "Send PM"
+#: ../../include/text.php:915
+msgid "fingered"
 msgstr ""
 
-#: ../../include/conversation.php:1061
-#, php-format
-msgid "%s likes this."
+#: ../../include/text.php:916
+msgid "rebuff"
 msgstr ""
 
-#: ../../include/conversation.php:1061
-#, php-format
-msgid "%s doesn't like this."
+#: ../../include/text.php:916
+msgid "rebuffed"
 msgstr ""
 
-#: ../../include/conversation.php:1065
-#, 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:1067
-#, 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:1073
-msgid "and"
+#: ../../include/text.php:926
+msgid "happy"
 msgstr ""
 
-#: ../../include/conversation.php:1076
-#, php-format
-msgid ", and %d other people"
-msgid_plural ", and %d other people"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../../include/conversation.php:1077
-#, php-format
-msgid "%s like this."
+#: ../../include/text.php:927
+msgid "sad"
 msgstr ""
 
-#: ../../include/conversation.php:1077
-#, php-format
-msgid "%s don't like this."
+#: ../../include/text.php:928
+msgid "mellow"
 msgstr ""
 
-#: ../../include/conversation.php:1136
-msgid "Visible to <strong>everybody</strong>"
+#: ../../include/text.php:929
+msgid "tired"
 msgstr ""
 
-#: ../../include/conversation.php:1137 ../../mod/mail.php:174
-#: ../../mod/mail.php:289
-msgid "Please enter a link URL:"
+#: ../../include/text.php:930
+msgid "perky"
 msgstr ""
 
-#: ../../include/conversation.php:1138
-msgid "Please enter a video link/URL:"
+#: ../../include/text.php:931
+msgid "angry"
 msgstr ""
 
-#: ../../include/conversation.php:1139
-msgid "Please enter an audio link/URL:"
+#: ../../include/text.php:932
+msgid "stupified"
 msgstr ""
 
-#: ../../include/conversation.php:1140
-msgid "Tag term:"
+#: ../../include/text.php:933
+msgid "puzzled"
 msgstr ""
 
-#: ../../include/conversation.php:1141 ../../mod/filer.php:49
-msgid "Save to Folder:"
+#: ../../include/text.php:934
+msgid "interested"
 msgstr ""
 
-#: ../../include/conversation.php:1142
-msgid "Where are you right now?"
+#: ../../include/text.php:935
+msgid "bitter"
 msgstr ""
 
-#: ../../include/conversation.php:1143 ../../mod/editpost.php:52
-#: ../../mod/mail.php:175 ../../mod/mail.php:290
-msgid "Expires YYYY-MM-DD HH:MM"
+#: ../../include/text.php:936
+msgid "cheerful"
 msgstr ""
 
-#: ../../include/conversation.php:1170 ../../mod/editblock.php:198
-#: ../../mod/editlayout.php:193 ../../mod/editwebpage.php:230
-#: ../../mod/layouts.php:168 ../../mod/photos.php:943
-msgid "Share"
+#: ../../include/text.php:937
+msgid "alive"
 msgstr ""
 
-#: ../../include/conversation.php:1172 ../../mod/editwebpage.php:170
-msgid "Page link title"
+#: ../../include/text.php:938
+msgid "annoyed"
 msgstr ""
 
-#: ../../include/conversation.php:1175
-msgid "Post as"
+#: ../../include/text.php:939
+msgid "anxious"
 msgstr ""
 
-#: ../../include/conversation.php:1176 ../../mod/editblock.php:144
-#: ../../mod/editpost.php:114 ../../mod/editlayout.php:140
-#: ../../mod/editwebpage.php:175 ../../mod/mail.php:238 ../../mod/mail.php:352
-msgid "Upload photo"
+#: ../../include/text.php:940
+msgid "cranky"
 msgstr ""
 
-#: ../../include/conversation.php:1177
-msgid "upload photo"
+#: ../../include/text.php:941
+msgid "disturbed"
 msgstr ""
 
-#: ../../include/conversation.php:1178 ../../mod/editblock.php:145
-#: ../../mod/editpost.php:115 ../../mod/editlayout.php:141
-#: ../../mod/editwebpage.php:176 ../../mod/mail.php:239 ../../mod/mail.php:353
-msgid "Attach file"
+#: ../../include/text.php:942
+msgid "frustrated"
 msgstr ""
 
-#: ../../include/conversation.php:1179
-msgid "attach file"
+#: ../../include/text.php:943
+msgid "depressed"
 msgstr ""
 
-#: ../../include/conversation.php:1180 ../../mod/editblock.php:146
-#: ../../mod/editpost.php:116 ../../mod/editlayout.php:142
-#: ../../mod/editwebpage.php:177 ../../mod/mail.php:240 ../../mod/mail.php:354
-msgid "Insert web link"
+#: ../../include/text.php:944
+msgid "motivated"
 msgstr ""
 
-#: ../../include/conversation.php:1181
-msgid "web link"
+#: ../../include/text.php:945
+msgid "relaxed"
 msgstr ""
 
-#: ../../include/conversation.php:1182
-msgid "Insert video link"
+#: ../../include/text.php:946
+msgid "surprised"
 msgstr ""
 
-#: ../../include/conversation.php:1183
-msgid "video link"
+#: ../../include/text.php:1111
+msgid "Monday"
 msgstr ""
 
-#: ../../include/conversation.php:1184
-msgid "Insert audio link"
+#: ../../include/text.php:1111
+msgid "Tuesday"
 msgstr ""
 
-#: ../../include/conversation.php:1185
-msgid "audio link"
+#: ../../include/text.php:1111
+msgid "Wednesday"
 msgstr ""
 
-#: ../../include/conversation.php:1186 ../../mod/editblock.php:150
-#: ../../mod/editpost.php:120 ../../mod/editlayout.php:146
-#: ../../mod/editwebpage.php:181
-msgid "Set your location"
+#: ../../include/text.php:1111
+msgid "Thursday"
 msgstr ""
 
-#: ../../include/conversation.php:1187
-msgid "set location"
+#: ../../include/text.php:1111
+msgid "Friday"
 msgstr ""
 
-#: ../../include/conversation.php:1188 ../../mod/editpost.php:122
-msgid "Toggle voting"
+#: ../../include/text.php:1111
+msgid "Saturday"
 msgstr ""
 
-#: ../../include/conversation.php:1191 ../../mod/editblock.php:151
-#: ../../mod/editpost.php:121 ../../mod/editlayout.php:147
-#: ../../mod/editwebpage.php:182
-msgid "Clear browser location"
+#: ../../include/text.php:1111
+msgid "Sunday"
 msgstr ""
 
-#: ../../include/conversation.php:1192
-msgid "clear location"
+#: ../../include/text.php:1115
+msgid "January"
 msgstr ""
 
-#: ../../include/conversation.php:1194 ../../mod/editblock.php:164
-#: ../../mod/editpost.php:136 ../../mod/editlayout.php:159
-#: ../../mod/editwebpage.php:198
-msgid "Title (optional)"
+#: ../../include/text.php:1115
+msgid "February"
 msgstr ""
 
-#: ../../include/conversation.php:1197 ../../mod/editblock.php:167
-#: ../../mod/editpost.php:138 ../../mod/editlayout.php:162
-#: ../../mod/editwebpage.php:200
-msgid "Categories (optional, comma-separated list)"
+#: ../../include/text.php:1115
+msgid "March"
 msgstr ""
 
-#: ../../include/conversation.php:1199 ../../mod/editblock.php:153
-#: ../../mod/editpost.php:126 ../../mod/editlayout.php:149
-#: ../../mod/editwebpage.php:184
-msgid "Permission settings"
+#: ../../include/text.php:1115
+msgid "April"
 msgstr ""
 
-#: ../../include/conversation.php:1200
-msgid "permissions"
+#: ../../include/text.php:1115
+msgid "May"
 msgstr ""
 
-#: ../../include/conversation.php:1207 ../../mod/editblock.php:161
-#: ../../mod/editpost.php:133 ../../mod/editlayout.php:156
-#: ../../mod/editwebpage.php:193
-msgid "Public post"
+#: ../../include/text.php:1115
+msgid "June"
 msgstr ""
 
-#: ../../include/conversation.php:1209 ../../mod/editblock.php:168
-#: ../../mod/editpost.php:139 ../../mod/editlayout.php:163
-#: ../../mod/editwebpage.php:201
-msgid "Example: bob@example.com, mary@example.com"
+#: ../../include/text.php:1115
+msgid "July"
 msgstr ""
 
-#: ../../include/conversation.php:1222 ../../mod/editblock.php:178
-#: ../../mod/editpost.php:150 ../../mod/editlayout.php:173
-#: ../../mod/editwebpage.php:210 ../../mod/mail.php:245 ../../mod/mail.php:359
-msgid "Set expiration date"
+#: ../../include/text.php:1115
+msgid "August"
 msgstr ""
 
-#: ../../include/conversation.php:1226 ../../mod/editpost.php:154
-#: ../../mod/events.php:635
-msgid "OK"
+#: ../../include/text.php:1115
+msgid "September"
 msgstr ""
 
-#: ../../include/conversation.php:1227 ../../mod/editpost.php:155
-#: ../../mod/events.php:634 ../../mod/fbrowser.php:82
-#: ../../mod/fbrowser.php:117 ../../mod/settings.php:584
-#: ../../mod/settings.php:610 ../../mod/tagrm.php:11 ../../mod/tagrm.php:134
-msgid "Cancel"
+#: ../../include/text.php:1115
+msgid "October"
 msgstr ""
 
-#: ../../include/conversation.php:1471
-msgid "Discover"
+#: ../../include/text.php:1115
+msgid "November"
 msgstr ""
 
-#: ../../include/conversation.php:1474
-msgid "Imported public streams"
+#: ../../include/text.php:1115
+msgid "December"
 msgstr ""
 
-#: ../../include/conversation.php:1479
-msgid "Commented Order"
+#: ../../include/text.php:1193
+msgid "unknown.???"
 msgstr ""
 
-#: ../../include/conversation.php:1482
-msgid "Sort by Comment Date"
+#: ../../include/text.php:1194
+msgid "bytes"
 msgstr ""
 
-#: ../../include/conversation.php:1486
-msgid "Posted Order"
+#: ../../include/text.php:1230
+msgid "remove category"
 msgstr ""
 
-#: ../../include/conversation.php:1489
-msgid "Sort by Post Date"
+#: ../../include/text.php:1299
+msgid "remove from file"
 msgstr ""
 
-#: ../../include/conversation.php:1497
-msgid "Posts that mention or involve you"
+#: ../../include/text.php:1375 ../../include/text.php:1386
+#: ../../mod/connedit.php:635
+msgid "Click to open/close"
 msgstr ""
 
-#: ../../include/conversation.php:1503 ../../mod/connections.php:212
-#: ../../mod/connections.php:225 ../../mod/menu.php:80
-msgid "New"
+#: ../../include/text.php:1534 ../../mod/events.php:444
+msgid "Link to Source"
 msgstr ""
 
-#: ../../include/conversation.php:1506
-msgid "Activity Stream - by date"
+#: ../../include/text.php:1553
+msgid "Select a page layout: "
 msgstr ""
 
-#: ../../include/conversation.php:1512
-msgid "Starred"
+#: ../../include/text.php:1556 ../../include/text.php:1616
+msgid "default"
 msgstr ""
 
-#: ../../include/conversation.php:1515
-msgid "Favourite Posts"
+#: ../../include/text.php:1589
+msgid "Page content type: "
 msgstr ""
 
-#: ../../include/conversation.php:1522
-msgid "Spam"
+#: ../../include/text.php:1628
+msgid "Select an alternate language"
 msgstr ""
 
-#: ../../include/conversation.php:1525
-msgid "Posts flagged as SPAM"
+#: ../../include/text.php:1760
+msgid "activity"
 msgstr ""
 
-#: ../../include/conversation.php:1565 ../../mod/admin.php:870
-msgid "Channel"
+#: ../../include/text.php:2047
+msgid "Design"
 msgstr ""
 
-#: ../../include/conversation.php:1568
-msgid "Status Messages and Posts"
+#: ../../include/text.php:2050
+msgid "Blocks"
 msgstr ""
 
-#: ../../include/conversation.php:1577
-msgid "About"
+#: ../../include/text.php:2051
+msgid "Menus"
 msgstr ""
 
-#: ../../include/conversation.php:1580
-msgid "Profile Details"
+#: ../../include/text.php:2052
+msgid "Layouts"
 msgstr ""
 
-#: ../../include/conversation.php:1598
-msgid "Files and Storage"
+#: ../../include/text.php:2053
+msgid "Pages"
 msgstr ""
 
-#: ../../include/conversation.php:1608 ../../include/conversation.php:1611
-msgid "Chatrooms"
+#: ../../include/chat.php:23
+msgid "Missing room name"
 msgstr ""
 
-#: ../../include/conversation.php:1624
-msgid "Saved Bookmarks"
+#: ../../include/chat.php:32
+msgid "Duplicate room name"
 msgstr ""
 
-#: ../../include/conversation.php:1635
-msgid "Manage Webpages"
+#: ../../include/chat.php:82 ../../include/chat.php:90
+msgid "Invalid room specifier."
 msgstr ""
 
-#: ../../include/conversation.php:1698
-msgctxt "noun"
-msgid "Attending"
-msgid_plural "Attending"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../../include/conversation.php:1701
-msgctxt "noun"
-msgid "Not Attending"
-msgid_plural "Not Attending"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../../include/conversation.php:1704
-msgctxt "noun"
-msgid "Undecided"
-msgid_plural "Undecided"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../../include/conversation.php:1707
-msgctxt "noun"
-msgid "Agree"
-msgid_plural "Agrees"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../../include/conversation.php:1710
-msgctxt "noun"
-msgid "Disagree"
-msgid_plural "Disagrees"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../../include/conversation.php:1713
-msgctxt "noun"
-msgid "Abstain"
-msgid_plural "Abstains"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../../include/oembed.php:171
-msgid "Embedded content"
+#: ../../include/chat.php:120
+msgid "Room not found."
 msgstr ""
 
-#: ../../include/oembed.php:180
-msgid "Embedding disabled"
+#: ../../include/chat.php:141
+msgid "Room is full"
 msgstr ""
 
 #: ../../include/permissions.php:26
@@ -3836,467 +3860,686 @@ msgstr ""
 msgid "Some blurb about what to do when you're new here"
 msgstr ""
 
-#: ../../mod/editblock.php:79 ../../mod/editblock.php:95
-#: ../../mod/editpost.php:20 ../../mod/editlayout.php:78
-#: ../../mod/editwebpage.php:77
-msgid "Item not found"
+#: ../../mod/manage.php:136
+#, php-format
+msgid "You have created %1$.0f of %2$.0f allowed channels."
 msgstr ""
 
-#: ../../mod/editblock.php:115
-msgid "Edit Block"
+#: ../../mod/manage.php:144
+msgid "Create a new channel"
 msgstr ""
 
-#: ../../mod/editblock.php:125
-msgid "Delete block?"
+#: ../../mod/manage.php:165
+msgid "Current Channel"
 msgstr ""
 
-#: ../../mod/editblock.php:147 ../../mod/editpost.php:117
-#: ../../mod/editlayout.php:143 ../../mod/editwebpage.php:178
-msgid "Insert YouTube video"
+#: ../../mod/manage.php:167
+msgid "Switch to one of your channels by selecting it."
 msgstr ""
 
-#: ../../mod/editblock.php:148 ../../mod/editpost.php:118
-#: ../../mod/editlayout.php:144 ../../mod/editwebpage.php:179
-msgid "Insert Vorbis [.ogg] video"
+#: ../../mod/manage.php:168
+msgid "Default Channel"
 msgstr ""
 
-#: ../../mod/editblock.php:149 ../../mod/editpost.php:119
-#: ../../mod/editlayout.php:145 ../../mod/editwebpage.php:180
-msgid "Insert Vorbis [.ogg] audio"
+#: ../../mod/manage.php:169
+msgid "Make Default"
 msgstr ""
 
-#: ../../mod/editblock.php:183
-msgid "Delete Block"
+#: ../../mod/manage.php:172
+#, php-format
+msgid "%d new messages"
 msgstr ""
 
-#: ../../mod/manage.php:136
+#: ../../mod/manage.php:173
 #, php-format
-msgid "You have created %1$.0f of %2$.0f allowed channels."
+msgid "%d new introductions"
 msgstr ""
 
-#: ../../mod/manage.php:144
-msgid "Create a new channel"
+#: ../../mod/manage.php:175
+msgid "Delegated Channels"
 msgstr ""
 
-#: ../../mod/manage.php:149
-msgid "Current Channel"
+#: ../../mod/settings.php:76
+msgid "Name is required"
 msgstr ""
 
-#: ../../mod/manage.php:151
-msgid "Switch to one of your channels by selecting it."
+#: ../../mod/settings.php:80
+msgid "Key and Secret are required"
 msgstr ""
 
-#: ../../mod/manage.php:152
-msgid "Default Channel"
+#: ../../mod/settings.php:124
+msgid "Diaspora Policy Settings updated."
 msgstr ""
 
-#: ../../mod/manage.php:153
-msgid "Make Default"
+#: ../../mod/settings.php:232
+msgid "Passwords do not match. Password unchanged."
 msgstr ""
 
-#: ../../mod/manage.php:156
-#, php-format
-msgid "%d new messages"
+#: ../../mod/settings.php:236
+msgid "Empty passwords are not allowed. Password unchanged."
 msgstr ""
 
-#: ../../mod/manage.php:157
-#, php-format
-msgid "%d new introductions"
+#: ../../mod/settings.php:250
+msgid "Password changed."
 msgstr ""
 
-#: ../../mod/xchan.php:6
-msgid "Xchan Lookup"
+#: ../../mod/settings.php:252
+msgid "Password update failed. Please try again."
 msgstr ""
 
-#: ../../mod/xchan.php:9
-msgid "Lookup xchan beginning with (or webbie): "
+#: ../../mod/settings.php:266
+msgid "Not valid email."
 msgstr ""
 
-#: ../../mod/xchan.php:37 ../../mod/menu.php:136 ../../mod/mitem.php:111
-msgid "Not found."
+#: ../../mod/settings.php:269
+msgid "Protected email address. Cannot change to that email."
 msgstr ""
 
-#: ../../mod/api.php:76 ../../mod/api.php:102
-msgid "Authorize application connection"
+#: ../../mod/settings.php:278
+msgid "System failure storing new email. Please try again."
 msgstr ""
 
-#: ../../mod/api.php:77
-msgid "Return to your app and insert this Securty Code:"
+#: ../../mod/settings.php:517
+msgid "Settings updated."
 msgstr ""
 
-#: ../../mod/api.php:89
-msgid "Please login to continue."
+#: ../../mod/settings.php:573 ../../mod/api.php:106 ../../mod/admin.php:419
+#: ../../mod/removeme.php:60 ../../view/theme/redbasic/php/config.php:102
+#: ../../view/theme/redbasic/php/config.php:127 ../../boot.php:1556
+msgid "No"
 msgstr ""
 
-#: ../../mod/api.php:104
+#: ../../mod/settings.php:573 ../../mod/api.php:105 ../../mod/admin.php:421
+#: ../../mod/removeme.php:60 ../../view/theme/redbasic/php/config.php:102
+#: ../../view/theme/redbasic/php/config.php:127 ../../boot.php:1556
+msgid "Yes"
+msgstr ""
+
+#: ../../mod/settings.php:581 ../../mod/settings.php:607
+#: ../../mod/settings.php:643
+msgid "Add application"
+msgstr ""
+
+#: ../../mod/settings.php:584
+msgid "Name of application"
+msgstr ""
+
+#: ../../mod/settings.php:585 ../../mod/settings.php:611
+msgid "Consumer Key"
+msgstr ""
+
+#: ../../mod/settings.php:585 ../../mod/settings.php:586
+msgid "Automatically generated - change if desired. Max length 20"
+msgstr ""
+
+#: ../../mod/settings.php:586 ../../mod/settings.php:612
+msgid "Consumer Secret"
+msgstr ""
+
+#: ../../mod/settings.php:587 ../../mod/settings.php:613
+msgid "Redirect"
+msgstr ""
+
+#: ../../mod/settings.php:587
 msgid ""
-"Do you want to authorize this application to access your posts and contacts, "
-"and/or create new posts for you?"
+"Redirect URI - leave blank unless your application specifically requires this"
 msgstr ""
 
-#: ../../mod/api.php:105 ../../mod/settings.php:974 ../../mod/settings.php:979
-#: ../../mod/settings.php:1064 ../../mod/admin.php:396
-msgid "Yes"
+#: ../../mod/settings.php:588 ../../mod/settings.php:614
+msgid "Icon url"
 msgstr ""
 
-#: ../../mod/api.php:106 ../../mod/settings.php:974 ../../mod/settings.php:979
-#: ../../mod/settings.php:1064 ../../mod/admin.php:394
-msgid "No"
+#: ../../mod/settings.php:588
+msgid "Optional"
 msgstr ""
 
-#: ../../mod/blocks.php:99
-msgid "Block Name"
+#: ../../mod/settings.php:599
+msgid "You can't edit this application."
 msgstr ""
 
-#: ../../mod/connedit.php:75 ../../mod/connections.php:37
-msgid "Could not access contact record."
+#: ../../mod/settings.php:642
+msgid "Connected Apps"
 msgstr ""
 
-#: ../../mod/connedit.php:99 ../../mod/connections.php:51
-msgid "Could not locate selected profile."
+#: ../../mod/settings.php:646
+msgid "Client key starts with"
 msgstr ""
 
-#: ../../mod/connedit.php:204 ../../mod/connections.php:94
-msgid "Connection updated."
+#: ../../mod/settings.php:647
+msgid "No name"
 msgstr ""
 
-#: ../../mod/connedit.php:206 ../../mod/connections.php:96
-msgid "Failed to update connection record."
+#: ../../mod/settings.php:648
+msgid "Remove authorization"
 msgstr ""
 
-#: ../../mod/connedit.php:252
-msgid "is now connected to"
+#: ../../mod/settings.php:662
+msgid "No feature settings configured"
 msgstr ""
 
-#: ../../mod/connedit.php:365
-msgid "Could not access address book record."
+#: ../../mod/settings.php:678
+msgid "Feature/Addon Settings"
 msgstr ""
 
-#: ../../mod/connedit.php:379
-msgid "Refresh failed - channel is currently unavailable."
+#: ../../mod/settings.php:680
+msgid "Settings for the built-in Diaspora emulator"
 msgstr ""
 
-#: ../../mod/connedit.php:386
-msgid "Channel has been unblocked"
+#: ../../mod/settings.php:681
+msgid "Allow any Diaspora member to comment on your public posts"
 msgstr ""
 
-#: ../../mod/connedit.php:387
-msgid "Channel has been blocked"
+#: ../../mod/settings.php:682
+msgid "Diaspora Policy Settings"
 msgstr ""
 
-#: ../../mod/connedit.php:391 ../../mod/connedit.php:403
-#: ../../mod/connedit.php:415 ../../mod/connedit.php:427
-#: ../../mod/connedit.php:443
-msgid "Unable to set address book parameters."
+#: ../../mod/settings.php:683
+msgid "Prevent your hashtags from being redirected to other sites"
 msgstr ""
 
-#: ../../mod/connedit.php:398
-msgid "Channel has been unignored"
+#: ../../mod/settings.php:707
+msgid "Account Settings"
 msgstr ""
 
-#: ../../mod/connedit.php:399
-msgid "Channel has been ignored"
+#: ../../mod/settings.php:708
+msgid "Enter New Password:"
 msgstr ""
 
-#: ../../mod/connedit.php:410
-msgid "Channel has been unarchived"
+#: ../../mod/settings.php:709
+msgid "Confirm New Password:"
 msgstr ""
 
-#: ../../mod/connedit.php:411
-msgid "Channel has been archived"
+#: ../../mod/settings.php:709
+msgid "Leave password fields blank unless changing"
 msgstr ""
 
-#: ../../mod/connedit.php:422
-msgid "Channel has been unhidden"
+#: ../../mod/settings.php:711 ../../mod/settings.php:1046
+msgid "Email Address:"
 msgstr ""
 
-#: ../../mod/connedit.php:423
-msgid "Channel has been hidden"
+#: ../../mod/settings.php:712 ../../mod/removeaccount.php:61
+msgid "Remove Account"
 msgstr ""
 
-#: ../../mod/connedit.php:438
-msgid "Channel has been approved"
+#: ../../mod/settings.php:713
+msgid "Remove this account including all its channels"
 msgstr ""
 
-#: ../../mod/connedit.php:439
-msgid "Channel has been unapproved"
+#: ../../mod/settings.php:729
+msgid "Off"
 msgstr ""
 
-#: ../../mod/connedit.php:467
-msgid "Connection has been removed."
+#: ../../mod/settings.php:729
+msgid "On"
 msgstr ""
 
-#: ../../mod/connedit.php:487
+#: ../../mod/settings.php:736
+msgid "Additional Features"
+msgstr ""
+
+#: ../../mod/settings.php:760
+msgid "Connector Settings"
+msgstr ""
+
+#: ../../mod/settings.php:799
+msgid "No special theme for mobile devices"
+msgstr ""
+
+#: ../../mod/settings.php:802
 #, php-format
-msgid "View %s's profile"
+msgid "%s - (Experimental)"
 msgstr ""
 
-#: ../../mod/connedit.php:491
-msgid "Refresh Permissions"
+#: ../../mod/settings.php:805 ../../mod/admin.php:391
+msgid "mobile"
 msgstr ""
 
-#: ../../mod/connedit.php:494
-msgid "Fetch updated permissions"
+#: ../../mod/settings.php:841
+msgid "Display Settings"
 msgstr ""
 
-#: ../../mod/connedit.php:498
-msgid "Recent Activity"
+#: ../../mod/settings.php:847
+msgid "Display Theme:"
 msgstr ""
 
-#: ../../mod/connedit.php:501
-msgid "View recent posts and comments"
+#: ../../mod/settings.php:848
+msgid "Mobile Theme:"
 msgstr ""
 
-#: ../../mod/connedit.php:507 ../../mod/connedit.php:694
-#: ../../mod/admin.php:737
-msgid "Unblock"
+#: ../../mod/settings.php:849
+msgid "Enable user zoom on mobile devices"
 msgstr ""
 
-#: ../../mod/connedit.php:507 ../../mod/connedit.php:694
-#: ../../mod/admin.php:736
-msgid "Block"
+#: ../../mod/settings.php:850
+msgid "Update browser every xx seconds"
 msgstr ""
 
-#: ../../mod/connedit.php:510
-msgid "Block (or Unblock) all communications with this connection"
+#: ../../mod/settings.php:850
+msgid "Minimum of 10 seconds, no maximum"
 msgstr ""
 
-#: ../../mod/connedit.php:514 ../../mod/connedit.php:695
-msgid "Unignore"
+#: ../../mod/settings.php:851
+msgid "Maximum number of conversations to load at any time:"
 msgstr ""
 
-#: ../../mod/connedit.php:514 ../../mod/connedit.php:695
-#: ../../mod/notifications.php:51
-msgid "Ignore"
+#: ../../mod/settings.php:851
+msgid "Maximum of 100 items"
 msgstr ""
 
-#: ../../mod/connedit.php:517
-msgid "Ignore (or Unignore) all inbound communications from this connection"
+#: ../../mod/settings.php:852
+msgid "Show emoticons (smilies) as images"
 msgstr ""
 
-#: ../../mod/connedit.php:520
-msgid "Unarchive"
+#: ../../mod/settings.php:853
+msgid "Link post titles to source"
 msgstr ""
 
-#: ../../mod/connedit.php:520
-msgid "Archive"
+#: ../../mod/settings.php:854
+msgid "System Page Layout Editor - (advanced)"
 msgstr ""
 
-#: ../../mod/connedit.php:523
-msgid ""
-"Archive (or Unarchive) this connection - mark channel dead but keep content"
+#: ../../mod/settings.php:857
+msgid "Use blog/list mode on channel page"
 msgstr ""
 
-#: ../../mod/connedit.php:526
-msgid "Unhide"
+#: ../../mod/settings.php:857 ../../mod/settings.php:858
+msgid "(comments displayed separately)"
 msgstr ""
 
-#: ../../mod/connedit.php:526
-msgid "Hide"
+#: ../../mod/settings.php:858
+msgid "Use blog/list mode on matrix page"
 msgstr ""
 
-#: ../../mod/connedit.php:529
-msgid "Hide or Unhide this connection from your other connections"
+#: ../../mod/settings.php:859
+msgid "Channel page max height of content (in pixels)"
 msgstr ""
 
-#: ../../mod/connedit.php:536
-msgid "Delete this connection"
+#: ../../mod/settings.php:859 ../../mod/settings.php:860
+msgid "click to expand content exceeding this height"
 msgstr ""
 
-#: ../../mod/connedit.php:611 ../../mod/connedit.php:649
-msgid "Approve this connection"
+#: ../../mod/settings.php:860
+msgid "Matrix page max height of content (in pixels)"
 msgstr ""
 
-#: ../../mod/connedit.php:611
-msgid "Accept connection to allow communication"
+#: ../../mod/settings.php:894
+msgid "Nobody except yourself"
 msgstr ""
 
-#: ../../mod/connedit.php:627
-#, php-format
-msgid "Connections: settings for %s"
+#: ../../mod/settings.php:895
+msgid "Only those you specifically allow"
 msgstr ""
 
-#: ../../mod/connedit.php:628
-msgid "Apply these permissions automatically"
+#: ../../mod/settings.php:896
+msgid "Approved connections"
 msgstr ""
 
-#: ../../mod/connedit.php:632
-msgid "Apply the permissions indicated on this page to all new connections."
+#: ../../mod/settings.php:897
+msgid "Any connections"
 msgstr ""
 
-#: ../../mod/connedit.php:636
-msgid "Slide to adjust your degree of friendship"
+#: ../../mod/settings.php:898
+msgid "Anybody on this website"
 msgstr ""
 
-#: ../../mod/connedit.php:637 ../../mod/rate.php:161
-msgid "Rating (this information is public)"
+#: ../../mod/settings.php:899
+msgid "Anybody in this network"
 msgstr ""
 
-#: ../../mod/connedit.php:638 ../../mod/rate.php:162
-msgid "Optionally explain your rating (this information is public)"
+#: ../../mod/settings.php:900
+msgid "Anybody authenticated"
 msgstr ""
 
-#: ../../mod/connedit.php:645
-msgid ""
-"Default permissions for your channel type have (just) been applied. They "
-"have not yet been submitted. Please review the permissions on this page and "
-"make any desired changes at this time. This new connection may <em>not</em> "
-"be able to communicate with you until you submit this page, which will "
-"install and apply the selected permissions."
+#: ../../mod/settings.php:901
+msgid "Anybody on the internet"
 msgstr ""
 
-#: ../../mod/connedit.php:648
-msgid "inherited"
+#: ../../mod/settings.php:975
+msgid "Publish your default profile in the network directory"
 msgstr ""
 
-#: ../../mod/connedit.php:651
-msgid "Connection has no individual permissions!"
+#: ../../mod/settings.php:980
+msgid "Allow us to suggest you as a potential friend to new members?"
 msgstr ""
 
-#: ../../mod/connedit.php:652
+#: ../../mod/settings.php:984 ../../mod/profile_photo.php:366
+msgid "or"
+msgstr ""
+
+#: ../../mod/settings.php:989
+msgid "Your channel address is"
+msgstr ""
+
+#: ../../mod/settings.php:1037
+msgid "Channel Settings"
+msgstr ""
+
+#: ../../mod/settings.php:1044
+msgid "Basic Settings"
+msgstr ""
+
+#: ../../mod/settings.php:1047
+msgid "Your Timezone:"
+msgstr ""
+
+#: ../../mod/settings.php:1048
+msgid "Default Post Location:"
+msgstr ""
+
+#: ../../mod/settings.php:1048
+msgid "Geographical location to display on your posts"
+msgstr ""
+
+#: ../../mod/settings.php:1049
+msgid "Use Browser Location:"
+msgstr ""
+
+#: ../../mod/settings.php:1051
+msgid "Adult Content"
+msgstr ""
+
+#: ../../mod/settings.php:1051
 msgid ""
-"This may be appropriate based on your <a href=\"settings\">privacy settings</"
-"a>, though you may wish to review the \"Advanced Permissions\"."
+"This channel frequently or regularly publishes adult content. (Please tag "
+"any adult material and/or nudity with #NSFW)"
 msgstr ""
 
-#: ../../mod/connedit.php:654
-msgid "Profile Visibility"
+#: ../../mod/settings.php:1053
+msgid "Security and Privacy Settings"
 msgstr ""
 
-#: ../../mod/connedit.php:655
-#, php-format
+#: ../../mod/settings.php:1055
+msgid "Your permissions are already configured. Click to view/adjust"
+msgstr ""
+
+#: ../../mod/settings.php:1057
+msgid "Hide my online presence"
+msgstr ""
+
+#: ../../mod/settings.php:1057
+msgid "Prevents displaying in your profile that you are online"
+msgstr ""
+
+#: ../../mod/settings.php:1059
+msgid "Simple Privacy Settings:"
+msgstr ""
+
+#: ../../mod/settings.php:1060
 msgid ""
-"Please choose the profile you would like to display to %s when viewing your "
-"profile securely."
+"Very Public - <em>extremely permissive (should be used with caution)</em>"
 msgstr ""
 
-#: ../../mod/connedit.php:656
-msgid "Contact Information / Notes"
+#: ../../mod/settings.php:1061
+msgid ""
+"Typical - <em>default public, privacy when desired (similar to social "
+"network permissions but with improved privacy)</em>"
 msgstr ""
 
-#: ../../mod/connedit.php:657
-msgid "Edit contact notes"
+#: ../../mod/settings.php:1062
+msgid "Private - <em>default private, never open or public</em>"
 msgstr ""
 
-#: ../../mod/connedit.php:659
-msgid "Their Settings"
+#: ../../mod/settings.php:1063
+msgid "Blocked - <em>default blocked to/from everybody</em>"
 msgstr ""
 
-#: ../../mod/connedit.php:660
-msgid "My Settings"
+#: ../../mod/settings.php:1065
+msgid "Allow others to tag your posts"
 msgstr ""
 
-#: ../../mod/connedit.php:662
+#: ../../mod/settings.php:1065
 msgid ""
-"Default permissions for this channel type have (just) been applied. They "
-"have <em>not</em> been saved and there are currently no stored default "
-"permissions. Please review/edit the applied settings and click [Submit] to "
-"finalize."
+"Often used by the community to retro-actively flag inappropriate content"
 msgstr ""
 
-#: ../../mod/connedit.php:663
-msgid "Clear/Disable Automatic Permissions"
+#: ../../mod/settings.php:1067
+msgid "Advanced Privacy Settings"
 msgstr ""
 
-#: ../../mod/connedit.php:664
-msgid "Forum Members"
+#: ../../mod/settings.php:1069
+msgid "Expire other channel content after this many days"
 msgstr ""
 
-#: ../../mod/connedit.php:665
-msgid "Soapbox"
+#: ../../mod/settings.php:1069
+msgid "0 or blank prevents expiration"
 msgstr ""
 
-#: ../../mod/connedit.php:666
-msgid "Full Sharing (typical social network permissions)"
+#: ../../mod/settings.php:1070
+msgid "Maximum Friend Requests/Day:"
 msgstr ""
 
-#: ../../mod/connedit.php:667
-msgid "Cautious Sharing "
+#: ../../mod/settings.php:1070
+msgid "May reduce spam activity"
 msgstr ""
 
-#: ../../mod/connedit.php:668
-msgid "Follow Only"
+#: ../../mod/settings.php:1071
+msgid "Default Post Permissions"
 msgstr ""
 
-#: ../../mod/connedit.php:669
-msgid "Individual Permissions"
+#: ../../mod/settings.php:1072 ../../mod/mitem.php:161 ../../mod/mitem.php:204
+msgid "(click to open/close)"
 msgstr ""
 
-#: ../../mod/connedit.php:670
+#: ../../mod/settings.php:1076
+msgid "Channel permissions category:"
+msgstr ""
+
+#: ../../mod/settings.php:1082
+msgid "Maximum private messages per day from unknown people:"
+msgstr ""
+
+#: ../../mod/settings.php:1082
+msgid "Useful to reduce spamming"
+msgstr ""
+
+#: ../../mod/settings.php:1085
+msgid "Notification Settings"
+msgstr ""
+
+#: ../../mod/settings.php:1086
+msgid "By default post a status message when:"
+msgstr ""
+
+#: ../../mod/settings.php:1087
+msgid "accepting a friend request"
+msgstr ""
+
+#: ../../mod/settings.php:1088
+msgid "joining a forum/community"
+msgstr ""
+
+#: ../../mod/settings.php:1089
+msgid "making an <em>interesting</em> profile change"
+msgstr ""
+
+#: ../../mod/settings.php:1090
+msgid "Send a notification email when:"
+msgstr ""
+
+#: ../../mod/settings.php:1091
+msgid "You receive a connection request"
+msgstr ""
+
+#: ../../mod/settings.php:1092
+msgid "Your connections are confirmed"
+msgstr ""
+
+#: ../../mod/settings.php:1093
+msgid "Someone writes on your profile wall"
+msgstr ""
+
+#: ../../mod/settings.php:1094
+msgid "Someone writes a followup comment"
+msgstr ""
+
+#: ../../mod/settings.php:1095
+msgid "You receive a private message"
+msgstr ""
+
+#: ../../mod/settings.php:1096
+msgid "You receive a friend suggestion"
+msgstr ""
+
+#: ../../mod/settings.php:1097
+msgid "You are tagged in a post"
+msgstr ""
+
+#: ../../mod/settings.php:1098
+msgid "You are poked/prodded/etc. in a post"
+msgstr ""
+
+#: ../../mod/settings.php:1101
+msgid "Show visual notifications including:"
+msgstr ""
+
+#: ../../mod/settings.php:1103
+msgid "Unseen matrix activity"
+msgstr ""
+
+#: ../../mod/settings.php:1104
+msgid "Unseen channel activity"
+msgstr ""
+
+#: ../../mod/settings.php:1105
+msgid "Unseen private messages"
+msgstr ""
+
+#: ../../mod/settings.php:1105 ../../mod/settings.php:1110
+#: ../../mod/settings.php:1111 ../../mod/settings.php:1112
+msgid "Recommended"
+msgstr ""
+
+#: ../../mod/settings.php:1106
+msgid "Upcoming events"
+msgstr ""
+
+#: ../../mod/settings.php:1107
+msgid "Events today"
+msgstr ""
+
+#: ../../mod/settings.php:1108
+msgid "Upcoming birthdays"
+msgstr ""
+
+#: ../../mod/settings.php:1108
+msgid "Not available in all themes"
+msgstr ""
+
+#: ../../mod/settings.php:1109
+msgid "System (personal) notifications"
+msgstr ""
+
+#: ../../mod/settings.php:1110
+msgid "System info messages"
+msgstr ""
+
+#: ../../mod/settings.php:1111
+msgid "System critical alerts"
+msgstr ""
+
+#: ../../mod/settings.php:1112
+msgid "New connections"
+msgstr ""
+
+#: ../../mod/settings.php:1113
+msgid "System Registrations"
+msgstr ""
+
+#: ../../mod/settings.php:1114
 msgid ""
-"Some permissions may be inherited from your channel <a href=\"settings"
-"\">privacy settings</a>, which have higher priority than individual "
-"settings. Changing those inherited settings on this page will have no effect."
+"Also show new wall posts, private messages and connections under Notices"
 msgstr ""
 
-#: ../../mod/connedit.php:671
-msgid "Advanced Permissions"
+#: ../../mod/settings.php:1116
+msgid "Notify me of events this many days in advance"
 msgstr ""
 
-#: ../../mod/connedit.php:672
-msgid "Simple Permissions (select one and submit)"
+#: ../../mod/settings.php:1116
+msgid "Must be greater than 0"
 msgstr ""
 
-#: ../../mod/connedit.php:676
-#, php-format
-msgid "Visit %s's profile - %s"
+#: ../../mod/settings.php:1118
+msgid "Advanced Account/Page Type Settings"
 msgstr ""
 
-#: ../../mod/connedit.php:677
-msgid "Block/Unblock contact"
+#: ../../mod/settings.php:1119
+msgid "Change the behaviour of this account for special situations"
 msgstr ""
 
-#: ../../mod/connedit.php:678
-msgid "Ignore contact"
+#: ../../mod/settings.php:1122
+msgid ""
+"Please enable expert mode (in <a href=\"settings/features\">Settings > "
+"Additional features</a>) to adjust!"
 msgstr ""
 
-#: ../../mod/connedit.php:679
-msgid "Repair URL settings"
+#: ../../mod/settings.php:1123
+msgid "Miscellaneous Settings"
 msgstr ""
 
-#: ../../mod/connedit.php:680
-msgid "View conversations"
+#: ../../mod/settings.php:1125
+msgid "Personal menu to display in your channel pages"
 msgstr ""
 
-#: ../../mod/connedit.php:682
-msgid "Delete contact"
+#: ../../mod/settings.php:1126 ../../mod/removeme.php:61
+msgid "Remove Channel"
 msgstr ""
 
-#: ../../mod/connedit.php:686
-msgid "Last update:"
+#: ../../mod/settings.php:1127
+msgid "Remove this channel."
 msgstr ""
 
-#: ../../mod/connedit.php:688
-msgid "Update public posts"
+#: ../../mod/xchan.php:6
+msgid "Xchan Lookup"
 msgstr ""
 
-#: ../../mod/connedit.php:690
-msgid "Update now"
+#: ../../mod/xchan.php:9
+msgid "Lookup xchan beginning with (or webbie): "
 msgstr ""
 
-#: ../../mod/connedit.php:696
-msgid "Currently blocked"
+#: ../../mod/xchan.php:37 ../../mod/menu.php:136 ../../mod/mitem.php:111
+msgid "Not found."
 msgstr ""
 
-#: ../../mod/connedit.php:697
-msgid "Currently ignored"
+#: ../../mod/api.php:76 ../../mod/api.php:102
+msgid "Authorize application connection"
 msgstr ""
 
-#: ../../mod/connedit.php:698
-msgid "Currently archived"
+#: ../../mod/api.php:77
+msgid "Return to your app and insert this Securty Code:"
 msgstr ""
 
-#: ../../mod/connedit.php:699
-msgid "Currently pending"
+#: ../../mod/api.php:89
+msgid "Please login to continue."
 msgstr ""
 
-#: ../../mod/home.php:48
-msgid "Red Matrix - &quot;The Network&quot;"
+#: ../../mod/api.php:104
+msgid ""
+"Do you want to authorize this application to access your posts and contacts, "
+"and/or create new posts for you?"
 msgstr ""
 
-#: ../../mod/home.php:101
-#, php-format
-msgid "Welcome to %s"
+#: ../../mod/blocks.php:99
+msgid "Block Name"
+msgstr ""
+
+#: ../../mod/follow.php:25
+msgid "Channel added."
+msgstr ""
+
+#: ../../mod/tagrm.php:44 ../../mod/tagrm.php:94
+msgid "Tag removed"
+msgstr ""
+
+#: ../../mod/tagrm.php:119
+msgid "Remove Item Tag"
+msgstr ""
+
+#: ../../mod/tagrm.php:121
+msgid "Select a tag to remove: "
+msgstr ""
+
+#: ../../mod/tagrm.php:133 ../../mod/photos.php:875
+msgid "Remove"
 msgstr ""
 
 #: ../../mod/connect.php:56 ../../mod/connect.php:104
@@ -4342,16 +4585,20 @@ msgstr ""
 msgid "Restricted or Premium Channel"
 msgstr ""
 
-#: ../../mod/editpost.php:31
-msgid "Item is not editable"
+#: ../../mod/match.php:16
+msgid "Profile Match"
 msgstr ""
 
-#: ../../mod/editpost.php:42 ../../mod/rpost.php:97
-msgid "Edit post"
+#: ../../mod/match.php:24
+msgid "No keywords to match. Please add keywords to your default profile."
 msgstr ""
 
-#: ../../mod/editpost.php:53
-msgid "Delete item?"
+#: ../../mod/match.php:61
+msgid "is interested in:"
+msgstr ""
+
+#: ../../mod/match.php:69
+msgid "No matches"
 msgstr ""
 
 #: ../../mod/attach.php:9
@@ -4363,8 +4610,13 @@ msgstr ""
 msgid "Fetching URL returns error: %1$s"
 msgstr ""
 
-#: ../../mod/dav.php:121
-msgid "RedMatrix channel"
+#: ../../mod/home.php:48
+msgid "Red Matrix - &quot;The Network&quot;"
+msgstr ""
+
+#: ../../mod/home.php:101
+#, php-format
+msgid "Welcome to %s"
 msgstr ""
 
 #: ../../mod/profile_photo.php:108
@@ -4406,10 +4658,6 @@ msgstr ""
 msgid "Upload Profile Photo"
 msgstr ""
 
-#: ../../mod/profile_photo.php:366 ../../mod/settings.php:983
-msgid "or"
-msgstr ""
-
 #: ../../mod/profile_photo.php:366
 msgid "skip this step"
 msgstr ""
@@ -4456,28 +4704,72 @@ msgstr ""
 msgid "Page not found."
 msgstr ""
 
-#: ../../mod/network.php:84
-msgid "No such group"
+#: ../../mod/like.php:15
+msgid "Like/Dislike"
 msgstr ""
 
-#: ../../mod/network.php:122
-msgid "Search Results For:"
+#: ../../mod/like.php:20
+msgid "This action is restricted to members."
 msgstr ""
 
-#: ../../mod/network.php:176
-msgid "Collection is empty"
+#: ../../mod/like.php:21
+msgid ""
+"Please <a href=\"rmagic\">login with your RedMatrix ID</a> or <a href="
+"\"register\">register as a new RedMatrix member</a> to continue."
 msgstr ""
 
-#: ../../mod/network.php:184
-msgid "Collection: "
+#: ../../mod/like.php:101 ../../mod/like.php:128 ../../mod/like.php:166
+msgid "Invalid request."
 msgstr ""
 
-#: ../../mod/network.php:197
-msgid "Connection: "
+#: ../../mod/like.php:143
+msgid "thing"
 msgstr ""
 
-#: ../../mod/network.php:200
-msgid "Invalid connection."
+#: ../../mod/like.php:189
+msgid "Channel unavailable."
+msgstr ""
+
+#: ../../mod/like.php:228
+msgid "Previous action reversed."
+msgstr ""
+
+#: ../../mod/like.php:387
+#, php-format
+msgid "%1$s agrees with %2$s's %3$s"
+msgstr ""
+
+#: ../../mod/like.php:389
+#, php-format
+msgid "%1$s doesn't agree with %2$s's %3$s"
+msgstr ""
+
+#: ../../mod/like.php:391
+#, php-format
+msgid "%1$s abstains from a decision on %2$s's %3$s"
+msgstr ""
+
+#: ../../mod/like.php:393
+#, php-format
+msgid "%1$s is attending %2$s's %3$s"
+msgstr ""
+
+#: ../../mod/like.php:395
+#, php-format
+msgid "%1$s is not attending %2$s's %3$s"
+msgstr ""
+
+#: ../../mod/like.php:397
+#, php-format
+msgid "%1$s may attend %2$s's %3$s"
+msgstr ""
+
+#: ../../mod/like.php:481
+msgid "Action completed."
+msgstr ""
+
+#: ../../mod/like.php:482
+msgid "Thank you."
 msgstr ""
 
 #: ../../mod/events.php:87
@@ -4628,597 +4920,350 @@ msgstr ""
 msgid "View ratings"
 msgstr ""
 
-#: ../../mod/settings.php:73
-msgid "Name is required"
-msgstr ""
-
-#: ../../mod/settings.php:77
-msgid "Key and Secret are required"
-msgstr ""
-
-#: ../../mod/settings.php:120
-msgid "Diaspora Policy Settings updated."
-msgstr ""
-
-#: ../../mod/settings.php:228
-msgid "Passwords do not match. Password unchanged."
-msgstr ""
-
-#: ../../mod/settings.php:232
-msgid "Empty passwords are not allowed. Password unchanged."
-msgstr ""
-
-#: ../../mod/settings.php:246
-msgid "Password changed."
-msgstr ""
-
-#: ../../mod/settings.php:248
-msgid "Password update failed. Please try again."
-msgstr ""
-
-#: ../../mod/settings.php:262
-msgid "Not valid email."
-msgstr ""
-
-#: ../../mod/settings.php:265
-msgid "Protected email address. Cannot change to that email."
-msgstr ""
-
-#: ../../mod/settings.php:274
-msgid "System failure storing new email. Please try again."
-msgstr ""
-
-#: ../../mod/settings.php:513
-msgid "Settings updated."
-msgstr ""
-
-#: ../../mod/settings.php:582 ../../mod/settings.php:608
-#: ../../mod/settings.php:644
-msgid "Add application"
-msgstr ""
-
-#: ../../mod/settings.php:585
-msgid "Name of application"
-msgstr ""
-
-#: ../../mod/settings.php:586 ../../mod/settings.php:612
-msgid "Consumer Key"
-msgstr ""
-
-#: ../../mod/settings.php:586 ../../mod/settings.php:587
-msgid "Automatically generated - change if desired. Max length 20"
-msgstr ""
-
-#: ../../mod/settings.php:587 ../../mod/settings.php:613
-msgid "Consumer Secret"
-msgstr ""
-
-#: ../../mod/settings.php:588 ../../mod/settings.php:614
-msgid "Redirect"
-msgstr ""
-
-#: ../../mod/settings.php:588
-msgid ""
-"Redirect URI - leave blank unless your application specifically requires this"
-msgstr ""
-
-#: ../../mod/settings.php:589 ../../mod/settings.php:615
-msgid "Icon url"
-msgstr ""
-
-#: ../../mod/settings.php:589
-msgid "Optional"
-msgstr ""
-
-#: ../../mod/settings.php:600
-msgid "You can't edit this application."
-msgstr ""
-
-#: ../../mod/settings.php:643
-msgid "Connected Apps"
-msgstr ""
-
-#: ../../mod/settings.php:647
-msgid "Client key starts with"
-msgstr ""
-
-#: ../../mod/settings.php:648
-msgid "No name"
-msgstr ""
-
-#: ../../mod/settings.php:649
-msgid "Remove authorization"
-msgstr ""
-
-#: ../../mod/settings.php:663
-msgid "No feature settings configured"
+#: ../../mod/connedit.php:75 ../../mod/connections.php:37
+msgid "Could not access contact record."
 msgstr ""
 
-#: ../../mod/settings.php:676
-msgid "Feature Settings"
+#: ../../mod/connedit.php:99 ../../mod/connections.php:51
+msgid "Could not locate selected profile."
 msgstr ""
 
-#: ../../mod/settings.php:679
-msgid "Diaspora Policy Settings"
+#: ../../mod/connedit.php:204 ../../mod/connections.php:94
+msgid "Connection updated."
 msgstr ""
 
-#: ../../mod/settings.php:680
-msgid "Allow any Diaspora member to comment on your public posts."
+#: ../../mod/connedit.php:206 ../../mod/connections.php:96
+msgid "Failed to update connection record."
 msgstr ""
 
-#: ../../mod/settings.php:681
-msgid "Submit Diaspora Policy Settings"
+#: ../../mod/connedit.php:252
+msgid "is now connected to"
 msgstr ""
 
-#: ../../mod/settings.php:704
-msgid "Account Settings"
+#: ../../mod/connedit.php:365
+msgid "Could not access address book record."
 msgstr ""
 
-#: ../../mod/settings.php:705
-msgid "Password Settings"
+#: ../../mod/connedit.php:379
+msgid "Refresh failed - channel is currently unavailable."
 msgstr ""
 
-#: ../../mod/settings.php:706
-msgid "New Password:"
+#: ../../mod/connedit.php:386
+msgid "Channel has been unblocked"
 msgstr ""
 
-#: ../../mod/settings.php:707
-msgid "Confirm:"
+#: ../../mod/connedit.php:387
+msgid "Channel has been blocked"
 msgstr ""
 
-#: ../../mod/settings.php:707
-msgid "Leave password fields blank unless changing"
+#: ../../mod/connedit.php:391 ../../mod/connedit.php:403
+#: ../../mod/connedit.php:415 ../../mod/connedit.php:427
+#: ../../mod/connedit.php:443
+msgid "Unable to set address book parameters."
 msgstr ""
 
-#: ../../mod/settings.php:709 ../../mod/settings.php:1045
-msgid "Email Address:"
+#: ../../mod/connedit.php:398
+msgid "Channel has been unignored"
 msgstr ""
 
-#: ../../mod/settings.php:710 ../../mod/removeaccount.php:61
-msgid "Remove Account"
+#: ../../mod/connedit.php:399
+msgid "Channel has been ignored"
 msgstr ""
 
-#: ../../mod/settings.php:711
-msgid "Remove this account from this server including all its channels"
+#: ../../mod/connedit.php:410
+msgid "Channel has been unarchived"
 msgstr ""
 
-#: ../../mod/settings.php:712 ../../mod/settings.php:1126
-msgid "Warning: This action is permanent and cannot be reversed."
+#: ../../mod/connedit.php:411
+msgid "Channel has been archived"
 msgstr ""
 
-#: ../../mod/settings.php:728
-msgid "Off"
+#: ../../mod/connedit.php:422
+msgid "Channel has been unhidden"
 msgstr ""
 
-#: ../../mod/settings.php:728
-msgid "On"
+#: ../../mod/connedit.php:423
+msgid "Channel has been hidden"
 msgstr ""
 
-#: ../../mod/settings.php:735
-msgid "Additional Features"
+#: ../../mod/connedit.php:438
+msgid "Channel has been approved"
 msgstr ""
 
-#: ../../mod/settings.php:759
-msgid "Connector Settings"
+#: ../../mod/connedit.php:439
+msgid "Channel has been unapproved"
 msgstr ""
 
-#: ../../mod/settings.php:798
-msgid "No special theme for mobile devices"
+#: ../../mod/connedit.php:467
+msgid "Connection has been removed."
 msgstr ""
 
-#: ../../mod/settings.php:801
+#: ../../mod/connedit.php:487
 #, php-format
-msgid "%s - (Experimental)"
-msgstr ""
-
-#: ../../mod/settings.php:804 ../../mod/admin.php:367
-msgid "mobile"
-msgstr ""
-
-#: ../../mod/settings.php:840
-msgid "Display Settings"
-msgstr ""
-
-#: ../../mod/settings.php:846
-msgid "Display Theme:"
-msgstr ""
-
-#: ../../mod/settings.php:847
-msgid "Mobile Theme:"
-msgstr ""
-
-#: ../../mod/settings.php:848
-msgid "Enable user zoom on mobile devices"
-msgstr ""
-
-#: ../../mod/settings.php:849
-msgid "Update browser every xx seconds"
-msgstr ""
-
-#: ../../mod/settings.php:849
-msgid "Minimum of 10 seconds, no maximum"
-msgstr ""
-
-#: ../../mod/settings.php:850
-msgid "Maximum number of conversations to load at any time:"
-msgstr ""
-
-#: ../../mod/settings.php:850
-msgid "Maximum of 100 items"
-msgstr ""
-
-#: ../../mod/settings.php:851
-msgid "Don't show emoticons"
-msgstr ""
-
-#: ../../mod/settings.php:852
-msgid "Link post titles to source"
+msgid "View %s's profile"
 msgstr ""
 
-#: ../../mod/settings.php:853
-msgid "System Page Layout Editor - (advanced)"
+#: ../../mod/connedit.php:491
+msgid "Refresh Permissions"
 msgstr ""
 
-#: ../../mod/settings.php:856
-msgid "Use blog/list mode on channel page"
+#: ../../mod/connedit.php:494
+msgid "Fetch updated permissions"
 msgstr ""
 
-#: ../../mod/settings.php:856 ../../mod/settings.php:857
-msgid "(comments displayed separately)"
+#: ../../mod/connedit.php:498
+msgid "Recent Activity"
 msgstr ""
 
-#: ../../mod/settings.php:857
-msgid "Use blog/list mode on matrix page"
+#: ../../mod/connedit.php:501
+msgid "View recent posts and comments"
 msgstr ""
 
-#: ../../mod/settings.php:858
-msgid "Channel page max height of content (in pixels)"
+#: ../../mod/connedit.php:507 ../../mod/connedit.php:694
+#: ../../mod/admin.php:818
+msgid "Unblock"
 msgstr ""
 
-#: ../../mod/settings.php:858 ../../mod/settings.php:859
-msgid "click to expand content exceeding this height"
+#: ../../mod/connedit.php:507 ../../mod/connedit.php:694
+#: ../../mod/admin.php:817
+msgid "Block"
 msgstr ""
 
-#: ../../mod/settings.php:859
-msgid "Matrix page max height of content (in pixels)"
+#: ../../mod/connedit.php:510
+msgid "Block (or Unblock) all communications with this connection"
 msgstr ""
 
-#: ../../mod/settings.php:893
-msgid "Nobody except yourself"
+#: ../../mod/connedit.php:514 ../../mod/connedit.php:695
+msgid "Unignore"
 msgstr ""
 
-#: ../../mod/settings.php:894
-msgid "Only those you specifically allow"
+#: ../../mod/connedit.php:514 ../../mod/connedit.php:695
+#: ../../mod/notifications.php:51
+msgid "Ignore"
 msgstr ""
 
-#: ../../mod/settings.php:895
-msgid "Approved connections"
+#: ../../mod/connedit.php:517
+msgid "Ignore (or Unignore) all inbound communications from this connection"
 msgstr ""
 
-#: ../../mod/settings.php:896
-msgid "Any connections"
+#: ../../mod/connedit.php:520
+msgid "Unarchive"
 msgstr ""
 
-#: ../../mod/settings.php:897
-msgid "Anybody on this website"
+#: ../../mod/connedit.php:520
+msgid "Archive"
 msgstr ""
 
-#: ../../mod/settings.php:898
-msgid "Anybody in this network"
+#: ../../mod/connedit.php:523
+msgid ""
+"Archive (or Unarchive) this connection - mark channel dead but keep content"
 msgstr ""
 
-#: ../../mod/settings.php:899
-msgid "Anybody authenticated"
+#: ../../mod/connedit.php:526
+msgid "Unhide"
 msgstr ""
 
-#: ../../mod/settings.php:900
-msgid "Anybody on the internet"
+#: ../../mod/connedit.php:526
+msgid "Hide"
 msgstr ""
 
-#: ../../mod/settings.php:974
-msgid "Publish your default profile in the network directory"
+#: ../../mod/connedit.php:529
+msgid "Hide or Unhide this connection from your other connections"
 msgstr ""
 
-#: ../../mod/settings.php:979
-msgid "Allow us to suggest you as a potential friend to new members?"
+#: ../../mod/connedit.php:536
+msgid "Delete this connection"
 msgstr ""
 
-#: ../../mod/settings.php:988
-msgid "Your channel address is"
+#: ../../mod/connedit.php:611 ../../mod/connedit.php:649
+msgid "Approve this connection"
 msgstr ""
 
-#: ../../mod/settings.php:1036
-msgid "Channel Settings"
+#: ../../mod/connedit.php:611
+msgid "Accept connection to allow communication"
 msgstr ""
 
-#: ../../mod/settings.php:1043
-msgid "Basic Settings"
+#: ../../mod/connedit.php:627
+#, php-format
+msgid "Connections: settings for %s"
 msgstr ""
 
-#: ../../mod/settings.php:1046
-msgid "Your Timezone:"
+#: ../../mod/connedit.php:628
+msgid "Apply these permissions automatically"
 msgstr ""
 
-#: ../../mod/settings.php:1047
-msgid "Default Post Location:"
+#: ../../mod/connedit.php:632
+msgid "Apply the permissions indicated on this page to all new connections."
 msgstr ""
 
-#: ../../mod/settings.php:1047
-msgid "Geographical location to display on your posts"
+#: ../../mod/connedit.php:636
+msgid "Slide to adjust your degree of friendship"
 msgstr ""
 
-#: ../../mod/settings.php:1048
-msgid "Use Browser Location:"
+#: ../../mod/connedit.php:637 ../../mod/rate.php:161
+msgid "Rating (this information is public)"
 msgstr ""
 
-#: ../../mod/settings.php:1050
-msgid "Adult Content"
+#: ../../mod/connedit.php:638 ../../mod/rate.php:162
+msgid "Optionally explain your rating (this information is public)"
 msgstr ""
 
-#: ../../mod/settings.php:1050
+#: ../../mod/connedit.php:645
 msgid ""
-"This channel frequently or regularly publishes adult content. (Please tag "
-"any adult material and/or nudity with #NSFW)"
-msgstr ""
-
-#: ../../mod/settings.php:1052
-msgid "Security and Privacy Settings"
-msgstr ""
-
-#: ../../mod/settings.php:1054
-msgid "Your permissions are already configured. Click to view/adjust"
-msgstr ""
-
-#: ../../mod/settings.php:1056
-msgid "Hide my online presence"
-msgstr ""
-
-#: ../../mod/settings.php:1056
-msgid "Prevents displaying in your profile that you are online"
+"Default permissions for your channel type have (just) been applied. They "
+"have not yet been submitted. Please review the permissions on this page and "
+"make any desired changes at this time. This new connection may <em>not</em> "
+"be able to communicate with you until you submit this page, which will "
+"install and apply the selected permissions."
 msgstr ""
 
-#: ../../mod/settings.php:1058
-msgid "Simple Privacy Settings:"
+#: ../../mod/connedit.php:648
+msgid "inherited"
 msgstr ""
 
-#: ../../mod/settings.php:1059
-msgid ""
-"Very Public - <em>extremely permissive (should be used with caution)</em>"
+#: ../../mod/connedit.php:651
+msgid "Connection has no individual permissions!"
 msgstr ""
 
-#: ../../mod/settings.php:1060
+#: ../../mod/connedit.php:652
 msgid ""
-"Typical - <em>default public, privacy when desired (similar to social "
-"network permissions but with improved privacy)</em>"
-msgstr ""
-
-#: ../../mod/settings.php:1061
-msgid "Private - <em>default private, never open or public</em>"
-msgstr ""
-
-#: ../../mod/settings.php:1062
-msgid "Blocked - <em>default blocked to/from everybody</em>"
+"This may be appropriate based on your <a href=\"settings\">privacy settings</"
+"a>, though you may wish to review the \"Advanced Permissions\"."
 msgstr ""
 
-#: ../../mod/settings.php:1064
-msgid "Allow others to tag your posts"
+#: ../../mod/connedit.php:654
+msgid "Profile Visibility"
 msgstr ""
 
-#: ../../mod/settings.php:1064
+#: ../../mod/connedit.php:655
+#, php-format
 msgid ""
-"Often used by the community to retro-actively flag inappropriate content"
-msgstr ""
-
-#: ../../mod/settings.php:1066
-msgid "Advanced Privacy Settings"
-msgstr ""
-
-#: ../../mod/settings.php:1068
-msgid "Expire other channel content after this many days"
-msgstr ""
-
-#: ../../mod/settings.php:1068
-msgid "0 or blank prevents expiration"
-msgstr ""
-
-#: ../../mod/settings.php:1069
-msgid "Maximum Friend Requests/Day:"
-msgstr ""
-
-#: ../../mod/settings.php:1069
-msgid "May reduce spam activity"
-msgstr ""
-
-#: ../../mod/settings.php:1070
-msgid "Default Post Permissions"
-msgstr ""
-
-#: ../../mod/settings.php:1071 ../../mod/mitem.php:161 ../../mod/mitem.php:204
-msgid "(click to open/close)"
-msgstr ""
-
-#: ../../mod/settings.php:1075
-msgid "Channel permissions category:"
-msgstr ""
-
-#: ../../mod/settings.php:1081
-msgid "Maximum private messages per day from unknown people:"
-msgstr ""
-
-#: ../../mod/settings.php:1081
-msgid "Useful to reduce spamming"
-msgstr ""
-
-#: ../../mod/settings.php:1084
-msgid "Notification Settings"
-msgstr ""
-
-#: ../../mod/settings.php:1085
-msgid "By default post a status message when:"
-msgstr ""
-
-#: ../../mod/settings.php:1086
-msgid "accepting a friend request"
-msgstr ""
-
-#: ../../mod/settings.php:1087
-msgid "joining a forum/community"
-msgstr ""
-
-#: ../../mod/settings.php:1088
-msgid "making an <em>interesting</em> profile change"
-msgstr ""
-
-#: ../../mod/settings.php:1089
-msgid "Send a notification email when:"
-msgstr ""
-
-#: ../../mod/settings.php:1090
-msgid "You receive a connection request"
-msgstr ""
-
-#: ../../mod/settings.php:1091
-msgid "Your connections are confirmed"
-msgstr ""
-
-#: ../../mod/settings.php:1092
-msgid "Someone writes on your profile wall"
-msgstr ""
-
-#: ../../mod/settings.php:1093
-msgid "Someone writes a followup comment"
-msgstr ""
-
-#: ../../mod/settings.php:1094
-msgid "You receive a private message"
-msgstr ""
-
-#: ../../mod/settings.php:1095
-msgid "You receive a friend suggestion"
-msgstr ""
-
-#: ../../mod/settings.php:1096
-msgid "You are tagged in a post"
+"Please choose the profile you would like to display to %s when viewing your "
+"profile securely."
 msgstr ""
 
-#: ../../mod/settings.php:1097
-msgid "You are poked/prodded/etc. in a post"
+#: ../../mod/connedit.php:656
+msgid "Contact Information / Notes"
 msgstr ""
 
-#: ../../mod/settings.php:1100
-msgid "Show visual notifications including:"
+#: ../../mod/connedit.php:657
+msgid "Edit contact notes"
 msgstr ""
 
-#: ../../mod/settings.php:1102
-msgid "Unseen matrix activity"
+#: ../../mod/connedit.php:659
+msgid "Their Settings"
 msgstr ""
 
-#: ../../mod/settings.php:1103
-msgid "Unseen channel activity"
+#: ../../mod/connedit.php:660
+msgid "My Settings"
 msgstr ""
 
-#: ../../mod/settings.php:1104
-msgid "Unseen private messages"
+#: ../../mod/connedit.php:662
+msgid ""
+"Default permissions for this channel type have (just) been applied. They "
+"have <em>not</em> been saved and there are currently no stored default "
+"permissions. Please review/edit the applied settings and click [Submit] to "
+"finalize."
 msgstr ""
 
-#: ../../mod/settings.php:1104 ../../mod/settings.php:1109
-#: ../../mod/settings.php:1110 ../../mod/settings.php:1111
-msgid "Recommended"
+#: ../../mod/connedit.php:663
+msgid "Clear/Disable Automatic Permissions"
 msgstr ""
 
-#: ../../mod/settings.php:1105
-msgid "Upcoming events"
+#: ../../mod/connedit.php:664
+msgid "Forum Members"
 msgstr ""
 
-#: ../../mod/settings.php:1106
-msgid "Events today"
+#: ../../mod/connedit.php:665
+msgid "Soapbox"
 msgstr ""
 
-#: ../../mod/settings.php:1107
-msgid "Upcoming birthdays"
+#: ../../mod/connedit.php:666
+msgid "Full Sharing (typical social network permissions)"
 msgstr ""
 
-#: ../../mod/settings.php:1107
-msgid "Not available in all themes"
+#: ../../mod/connedit.php:667
+msgid "Cautious Sharing "
 msgstr ""
 
-#: ../../mod/settings.php:1108
-msgid "System (personal) notifications"
+#: ../../mod/connedit.php:668
+msgid "Follow Only"
 msgstr ""
 
-#: ../../mod/settings.php:1109
-msgid "System info messages"
+#: ../../mod/connedit.php:669
+msgid "Individual Permissions"
 msgstr ""
 
-#: ../../mod/settings.php:1110
-msgid "System critical alerts"
+#: ../../mod/connedit.php:670
+msgid ""
+"Some permissions may be inherited from your channel <a href=\"settings"
+"\">privacy settings</a>, which have higher priority than individual "
+"settings. Changing those inherited settings on this page will have no effect."
 msgstr ""
 
-#: ../../mod/settings.php:1111
-msgid "New connections"
+#: ../../mod/connedit.php:671
+msgid "Advanced Permissions"
 msgstr ""
 
-#: ../../mod/settings.php:1112
-msgid "System Registrations"
+#: ../../mod/connedit.php:672
+msgid "Simple Permissions (select one and submit)"
 msgstr ""
 
-#: ../../mod/settings.php:1113
-msgid ""
-"Also show new wall posts, private messages and connections under Notices"
+#: ../../mod/connedit.php:676
+#, php-format
+msgid "Visit %s's profile - %s"
 msgstr ""
 
-#: ../../mod/settings.php:1115
-msgid "Notify me of events this many days in advance"
+#: ../../mod/connedit.php:677
+msgid "Block/Unblock contact"
 msgstr ""
 
-#: ../../mod/settings.php:1115
-msgid "Must be greater than 0"
+#: ../../mod/connedit.php:678
+msgid "Ignore contact"
 msgstr ""
 
-#: ../../mod/settings.php:1117
-msgid "Advanced Account/Page Type Settings"
+#: ../../mod/connedit.php:679
+msgid "Repair URL settings"
 msgstr ""
 
-#: ../../mod/settings.php:1118
-msgid "Change the behaviour of this account for special situations"
+#: ../../mod/connedit.php:680
+msgid "View conversations"
 msgstr ""
 
-#: ../../mod/settings.php:1121
-msgid ""
-"Please enable expert mode (in <a href=\"settings/features\">Settings > "
-"Additional features</a>) to adjust!"
+#: ../../mod/connedit.php:682
+msgid "Delete contact"
 msgstr ""
 
-#: ../../mod/settings.php:1122
-msgid "Miscellaneous Settings"
+#: ../../mod/connedit.php:686
+msgid "Last update:"
 msgstr ""
 
-#: ../../mod/settings.php:1124
-msgid "Personal menu to display in your channel pages"
+#: ../../mod/connedit.php:688
+msgid "Update public posts"
 msgstr ""
 
-#: ../../mod/settings.php:1125
-msgid "Remove this channel"
+#: ../../mod/connedit.php:690
+msgid "Update now"
 msgstr ""
 
-#: ../../mod/cloud.php:120
-msgid "RedMatrix - Guests: Username: {your email address}, Password: +++"
+#: ../../mod/connedit.php:696
+msgid "Currently blocked"
 msgstr ""
 
-#: ../../mod/tagrm.php:44 ../../mod/tagrm.php:94
-msgid "Tag removed"
+#: ../../mod/connedit.php:697
+msgid "Currently ignored"
 msgstr ""
 
-#: ../../mod/tagrm.php:119
-msgid "Remove Item Tag"
+#: ../../mod/connedit.php:698
+msgid "Currently archived"
 msgstr ""
 
-#: ../../mod/tagrm.php:121
-msgid "Select a tag to remove: "
+#: ../../mod/connedit.php:699
+msgid "Currently pending"
 msgstr ""
 
-#: ../../mod/tagrm.php:133 ../../mod/delegate.php:130 ../../mod/photos.php:873
-msgid "Remove"
+#: ../../mod/dav.php:121
+msgid "RedMatrix channel"
 msgstr ""
 
 #: ../../mod/group.php:20
@@ -5257,69 +5302,69 @@ msgstr ""
 msgid "Collection Editor"
 msgstr ""
 
-#: ../../mod/group.php:196
+#: ../../mod/group.php:196 ../../mod/bulksetclose.php:89
 msgid "Members"
 msgstr ""
 
-#: ../../mod/group.php:198
+#: ../../mod/group.php:198 ../../mod/bulksetclose.php:91
 msgid "All Connected Channels"
 msgstr ""
 
-#: ../../mod/group.php:233
+#: ../../mod/group.php:233 ../../mod/bulksetclose.php:126
 msgid "Click on a channel to add or remove."
 msgstr ""
 
-#: ../../mod/siteinfo.php:93
+#: ../../mod/siteinfo.php:106
 #, php-format
 msgid "Version %s"
 msgstr ""
 
-#: ../../mod/siteinfo.php:114
+#: ../../mod/siteinfo.php:127
 msgid "Installed plugins/addons/apps:"
 msgstr ""
 
-#: ../../mod/siteinfo.php:127
+#: ../../mod/siteinfo.php:140
 msgid "No installed plugins/addons/apps"
 msgstr ""
 
-#: ../../mod/siteinfo.php:136
+#: ../../mod/siteinfo.php:149
 msgid "Red"
 msgstr ""
 
-#: ../../mod/siteinfo.php:137
+#: ../../mod/siteinfo.php:150
 msgid ""
 "This is a hub of the Red Matrix - a global cooperative network of "
 "decentralized privacy enhanced websites."
 msgstr ""
 
-#: ../../mod/siteinfo.php:139
+#: ../../mod/siteinfo.php:152
 msgid "Tag: "
 msgstr ""
 
-#: ../../mod/siteinfo.php:141
+#: ../../mod/siteinfo.php:154
 msgid "Last background fetch: "
 msgstr ""
 
-#: ../../mod/siteinfo.php:144
+#: ../../mod/siteinfo.php:157
 msgid "Running at web location"
 msgstr ""
 
-#: ../../mod/siteinfo.php:145
+#: ../../mod/siteinfo.php:158
 msgid ""
 "Please visit <a href=\"https://redmatrix.me\">RedMatrix.me</a> to learn more "
 "about the Red Matrix."
 msgstr ""
 
-#: ../../mod/siteinfo.php:146
+#: ../../mod/siteinfo.php:159
 msgid "Bug reports and issues: please visit"
 msgstr ""
 
-#: ../../mod/siteinfo.php:149
+#: ../../mod/siteinfo.php:162
 msgid ""
 "Suggestions, praise, etc. - please email \"redmatrix\" at librelist - dot com"
 msgstr ""
 
-#: ../../mod/siteinfo.php:151
+#: ../../mod/siteinfo.php:164
 msgid "Site Administrators"
 msgstr ""
 
@@ -5726,10 +5771,72 @@ msgstr ""
 msgid "No connections in common."
 msgstr ""
 
-#: ../../mod/suggest.php:35
-msgid ""
-"No suggestions available. If this is a new site, please try again in 24 "
-"hours."
+#: ../../mod/id.php:8
+msgid "First Name"
+msgstr ""
+
+#: ../../mod/id.php:9
+msgid "Last Name"
+msgstr ""
+
+#: ../../mod/id.php:10
+msgid "Nickname"
+msgstr ""
+
+#: ../../mod/id.php:11
+msgid "Full Name"
+msgstr ""
+
+#: ../../mod/id.php:17
+msgid "Profile Photo 16px"
+msgstr ""
+
+#: ../../mod/id.php:18
+msgid "Profile Photo 32px"
+msgstr ""
+
+#: ../../mod/id.php:19
+msgid "Profile Photo 48px"
+msgstr ""
+
+#: ../../mod/id.php:20
+msgid "Profile Photo 64px"
+msgstr ""
+
+#: ../../mod/id.php:21
+msgid "Profile Photo 80px"
+msgstr ""
+
+#: ../../mod/id.php:22
+msgid "Profile Photo 128px"
+msgstr ""
+
+#: ../../mod/id.php:23
+msgid "Timezone"
+msgstr ""
+
+#: ../../mod/id.php:24
+msgid "Homepage URL"
+msgstr ""
+
+#: ../../mod/id.php:26
+msgid "Birth Year"
+msgstr ""
+
+#: ../../mod/id.php:27
+msgid "Birth Month"
+msgstr ""
+
+#: ../../mod/id.php:28
+msgid "Birth Day"
+msgstr ""
+
+#: ../../mod/id.php:29
+msgid "Birthdate"
+msgstr ""
+
+#: ../../mod/id.php:30 ../../mod/profiles.php:431
+msgid "Gender"
 msgstr ""
 
 #: ../../mod/connections.php:192 ../../mod/connections.php:293
@@ -5835,6 +5942,10 @@ msgstr ""
 msgid "%1$s tagged %2$s's %3$s with %4$s"
 msgstr ""
 
+#: ../../mod/cloud.php:120
+msgid "RedMatrix - Guests: Username: {your email address}, Password: +++"
+msgstr ""
+
 #: ../../mod/item.php:165
 msgid "Unable to locate original post."
 msgstr ""
@@ -5862,7 +5973,7 @@ msgid "You have reached your limit of %1$.0f webpages."
 msgstr ""
 
 #: ../../mod/search.php:13 ../../mod/display.php:9 ../../mod/ratings.php:82
-#: ../../mod/directory.php:22 ../../mod/viewconnections.php:17
+#: ../../mod/directory.php:47 ../../mod/viewconnections.php:17
 #: ../../mod/photos.php:429
 msgid "Public access denied."
 msgstr ""
@@ -5932,8 +6043,24 @@ msgstr ""
 msgid "Online"
 msgstr ""
 
-#: ../../mod/follow.php:25
-msgid "Channel added."
+#: ../../mod/rbmark.php:88
+msgid "Select a bookmark folder"
+msgstr ""
+
+#: ../../mod/rbmark.php:93
+msgid "Save Bookmark"
+msgstr ""
+
+#: ../../mod/rbmark.php:94
+msgid "URL of bookmark"
+msgstr ""
+
+#: ../../mod/rbmark.php:95 ../../mod/appman.php:93
+msgid "Description"
+msgstr ""
+
+#: ../../mod/rbmark.php:99
+msgid "Or enter new bookmark folder name"
 msgstr ""
 
 #: ../../mod/notify.php:53 ../../mod/notifications.php:94
@@ -5972,58 +6099,6 @@ msgstr ""
 msgid "Layout Help"
 msgstr ""
 
-#: ../../mod/appman.php:28 ../../mod/appman.php:44
-msgid "App installed."
-msgstr ""
-
-#: ../../mod/appman.php:37
-msgid "Malformed app."
-msgstr ""
-
-#: ../../mod/appman.php:80
-msgid "Embed code"
-msgstr ""
-
-#: ../../mod/appman.php:86
-msgid "Edit App"
-msgstr ""
-
-#: ../../mod/appman.php:86
-msgid "Create App"
-msgstr ""
-
-#: ../../mod/appman.php:91
-msgid "Name of app"
-msgstr ""
-
-#: ../../mod/appman.php:92
-msgid "Location (URL) of app"
-msgstr ""
-
-#: ../../mod/appman.php:93 ../../mod/rbmark.php:95
-msgid "Description"
-msgstr ""
-
-#: ../../mod/appman.php:94
-msgid "Photo icon URL"
-msgstr ""
-
-#: ../../mod/appman.php:94
-msgid "80 x 80 pixels - optional"
-msgstr ""
-
-#: ../../mod/appman.php:95
-msgid "Version ID"
-msgstr ""
-
-#: ../../mod/appman.php:96
-msgid "Price of app"
-msgstr ""
-
-#: ../../mod/appman.php:97
-msgid "Location (URL) to purchase app"
-msgstr ""
-
 #: ../../mod/filer.php:49
 msgid "- select -"
 msgstr ""
@@ -6118,6 +6193,12 @@ msgstr ""
 msgid "Import existing posts if possible"
 msgstr ""
 
+#: ../../mod/editlayout.php:78 ../../mod/editwebpage.php:77
+#: ../../mod/editpost.php:20 ../../mod/editblock.php:79
+#: ../../mod/editblock.php:95
+msgid "Item not found"
+msgstr ""
+
 #: ../../mod/editlayout.php:108
 msgid "Edit Layout"
 msgstr ""
@@ -6126,7 +6207,22 @@ msgstr ""
 msgid "Delete layout?"
 msgstr ""
 
-#: ../../mod/editlayout.php:178
+#: ../../mod/editlayout.php:148 ../../mod/editwebpage.php:183
+#: ../../mod/editpost.php:122 ../../mod/editblock.php:152
+msgid "Insert YouTube video"
+msgstr ""
+
+#: ../../mod/editlayout.php:149 ../../mod/editwebpage.php:184
+#: ../../mod/editpost.php:123 ../../mod/editblock.php:153
+msgid "Insert Vorbis [.ogg] video"
+msgstr ""
+
+#: ../../mod/editlayout.php:150 ../../mod/editwebpage.php:185
+#: ../../mod/editpost.php:124 ../../mod/editblock.php:154
+msgid "Insert Vorbis [.ogg] audio"
+msgstr ""
+
+#: ../../mod/editlayout.php:183
 msgid "Delete Layout"
 msgstr ""
 
@@ -6179,14 +6275,18 @@ msgstr ""
 msgid "Delete webpage?"
 msgstr ""
 
-#: ../../mod/editwebpage.php:215
+#: ../../mod/editwebpage.php:220
 msgid "Delete Webpage"
 msgstr ""
 
-#: ../../mod/dirsearch.php:20 ../../mod/regdir.php:22
+#: ../../mod/dirsearch.php:21 ../../mod/regdir.php:47
 msgid "This site is not a directory server"
 msgstr ""
 
+#: ../../mod/dirsearch.php:29
+msgid "This directory server requires an access token"
+msgstr ""
+
 #: ../../mod/lostpass.php:15
 msgid "No valid account found."
 msgstr ""
@@ -6269,6 +6369,18 @@ msgstr ""
 msgid "Remote Channel [%s] (not yet known on this site)"
 msgstr ""
 
+#: ../../mod/editpost.php:31
+msgid "Item is not editable"
+msgstr ""
+
+#: ../../mod/editpost.php:42 ../../mod/rpost.php:98
+msgid "Edit post"
+msgstr ""
+
+#: ../../mod/editpost.php:53
+msgid "Delete item?"
+msgstr ""
+
 #: ../../mod/invite.php:25
 msgid "Total invitation limit exceeded."
 msgstr ""
@@ -6586,7 +6698,7 @@ msgstr ""
 msgid "Suggest a friend for %s"
 msgstr ""
 
-#: ../../mod/magic.php:70
+#: ../../mod/magic.php:69
 msgid "Hub not found."
 msgstr ""
 
@@ -6691,10 +6803,6 @@ msgstr ""
 msgid "Political Views"
 msgstr ""
 
-#: ../../mod/profiles.php:431
-msgid "Gender"
-msgstr ""
-
 #: ../../mod/profiles.php:435
 msgid "Sexual Preference"
 msgstr ""
@@ -6707,7 +6815,7 @@ msgstr ""
 msgid "Interests"
 msgstr ""
 
-#: ../../mod/profiles.php:447 ../../mod/admin.php:871
+#: ../../mod/profiles.php:447 ../../mod/admin.php:950
 msgid "Address"
 msgstr ""
 
@@ -6875,7 +6983,7 @@ msgstr ""
 msgid "This is your default profile."
 msgstr ""
 
-#: ../../mod/profiles.php:728 ../../mod/directory.php:188
+#: ../../mod/profiles.php:728 ../../mod/directory.php:207
 msgid "Age: "
 msgstr ""
 
@@ -6911,108 +7019,66 @@ msgstr ""
 msgid "Description: "
 msgstr ""
 
-#: ../../mod/delegate.php:95
-msgid "No potential page delegates located."
-msgstr ""
-
-#: ../../mod/delegate.php:121
-msgid "Delegate Page Management"
-msgstr ""
-
-#: ../../mod/delegate.php:123
-msgid ""
-"Delegates are able to manage all aspects of this account/page except for "
-"basic account settings. Please do not delegate your personal account to "
-"anybody that you do not trust completely."
-msgstr ""
-
-#: ../../mod/delegate.php:124
-msgid "Existing Page Managers"
-msgstr ""
-
-#: ../../mod/delegate.php:126
-msgid "Existing Page Delegates"
-msgstr ""
-
-#: ../../mod/delegate.php:128
-msgid "Potential Delegates"
-msgstr ""
-
-#: ../../mod/delegate.php:131
-msgid "Add"
+#: ../../mod/openid.php:26
+msgid "OpenID protocol error. No ID returned."
 msgstr ""
 
-#: ../../mod/delegate.php:132
-msgid "No entries."
+#: ../../mod/openid.php:72 ../../mod/openid.php:180 ../../mod/post.php:290
+#, php-format
+msgid "Welcome %s. Remote authentication successful."
 msgstr ""
 
-#: ../../mod/directory.php:194
+#: ../../mod/directory.php:213
 #, php-format
 msgid "%d rating"
 msgid_plural "%d ratings"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../../mod/directory.php:206
+#: ../../mod/directory.php:225
 msgid "Gender: "
 msgstr ""
 
-#: ../../mod/directory.php:208
+#: ../../mod/directory.php:227
 msgid "Status: "
 msgstr ""
 
-#: ../../mod/directory.php:210
+#: ../../mod/directory.php:229
 msgid "Homepage: "
 msgstr ""
 
-#: ../../mod/directory.php:213
+#: ../../mod/directory.php:232
 msgid "Hometown: "
 msgstr ""
 
-#: ../../mod/directory.php:215
+#: ../../mod/directory.php:234
 msgid "About: "
 msgstr ""
 
-#: ../../mod/directory.php:273
+#: ../../mod/directory.php:292
 msgid "Public Forum:"
 msgstr ""
 
-#: ../../mod/directory.php:276
+#: ../../mod/directory.php:295
 msgid "Keywords: "
 msgstr ""
 
-#: ../../mod/directory.php:331
+#: ../../mod/directory.php:350
 msgid "Finding:"
 msgstr ""
 
-#: ../../mod/directory.php:336
+#: ../../mod/directory.php:355
 msgid "next page"
 msgstr ""
 
-#: ../../mod/directory.php:336
+#: ../../mod/directory.php:355
 msgid "previous page"
 msgstr ""
 
-#: ../../mod/directory.php:353
+#: ../../mod/directory.php:372
 msgid "No entries (some entries may be hidden)."
 msgstr ""
 
-#: ../../mod/rbmark.php:88
-msgid "Select a bookmark folder"
-msgstr ""
-
-#: ../../mod/rbmark.php:93
-msgid "Save Bookmark"
-msgstr ""
-
-#: ../../mod/rbmark.php:94
-msgid "URL of bookmark"
-msgstr ""
-
-#: ../../mod/rbmark.php:99
-msgid "Or enter new bookmark folder name"
-msgstr ""
-
 #: ../../mod/uexport.php:33 ../../mod/uexport.php:34
 msgid "Export Channel"
 msgstr ""
@@ -7054,654 +7120,718 @@ msgstr ""
 msgid "Theme settings updated."
 msgstr ""
 
-#: ../../mod/admin.php:97 ../../mod/admin.php:415
+#: ../../mod/admin.php:93 ../../mod/admin.php:440
 msgid "Site"
 msgstr ""
 
-#: ../../mod/admin.php:98
+#: ../../mod/admin.php:94
 msgid "Accounts"
 msgstr ""
 
-#: ../../mod/admin.php:99 ../../mod/admin.php:863
+#: ../../mod/admin.php:95 ../../mod/admin.php:942
 msgid "Channels"
 msgstr ""
 
-#: ../../mod/admin.php:100 ../../mod/admin.php:954 ../../mod/admin.php:996
+#: ../../mod/admin.php:96 ../../mod/admin.php:1033 ../../mod/admin.php:1073
 msgid "Plugins"
 msgstr ""
 
-#: ../../mod/admin.php:101 ../../mod/admin.php:1159 ../../mod/admin.php:1195
+#: ../../mod/admin.php:97 ../../mod/admin.php:1233 ../../mod/admin.php:1268
 msgid "Themes"
 msgstr ""
 
-#: ../../mod/admin.php:102 ../../mod/admin.php:517
-msgid "Server"
+#: ../../mod/admin.php:98
+msgid "Inspect queue"
 msgstr ""
 
-#: ../../mod/admin.php:103
+#: ../../mod/admin.php:100
 msgid "Profile Config"
 msgstr ""
 
-#: ../../mod/admin.php:104
+#: ../../mod/admin.php:101
 msgid "DB updates"
 msgstr ""
 
-#: ../../mod/admin.php:118 ../../mod/admin.php:125 ../../mod/admin.php:1282
+#: ../../mod/admin.php:115 ../../mod/admin.php:122 ../../mod/admin.php:1351
 msgid "Logs"
 msgstr ""
 
-#: ../../mod/admin.php:124
+#: ../../mod/admin.php:121
 msgid "Plugin Features"
 msgstr ""
 
-#: ../../mod/admin.php:126
+#: ../../mod/admin.php:123
 msgid "User registrations waiting for confirmation"
 msgstr ""
 
-#: ../../mod/admin.php:206
+#: ../../mod/admin.php:200
+msgid "# Accounts"
+msgstr ""
+
+#: ../../mod/admin.php:201
+msgid "# blocked accounts"
+msgstr ""
+
+#: ../../mod/admin.php:202
+msgid "# expired accounts"
+msgstr ""
+
+#: ../../mod/admin.php:203
+msgid "# expiring accounts"
+msgstr ""
+
+#: ../../mod/admin.php:216
+msgid "# Channels"
+msgstr ""
+
+#: ../../mod/admin.php:217
+msgid "# primary"
+msgstr ""
+
+#: ../../mod/admin.php:218
+msgid "# clones"
+msgstr ""
+
+#: ../../mod/admin.php:224
 msgid "Message queues"
 msgstr ""
 
-#: ../../mod/admin.php:211 ../../mod/admin.php:414 ../../mod/admin.php:516
-#: ../../mod/admin.php:726 ../../mod/admin.php:862 ../../mod/admin.php:953
-#: ../../mod/admin.php:995 ../../mod/admin.php:1158 ../../mod/admin.php:1194
-#: ../../mod/admin.php:1281
+#: ../../mod/admin.php:240 ../../mod/admin.php:439 ../../mod/admin.php:533
+#: ../../mod/admin.php:807 ../../mod/admin.php:941 ../../mod/admin.php:1032
+#: ../../mod/admin.php:1072 ../../mod/admin.php:1232 ../../mod/admin.php:1267
+#: ../../mod/admin.php:1350
 msgid "Administration"
 msgstr ""
 
-#: ../../mod/admin.php:212
+#: ../../mod/admin.php:241
 msgid "Summary"
 msgstr ""
 
-#: ../../mod/admin.php:214
-msgid "Registered users"
+#: ../../mod/admin.php:244
+msgid "Registered accounts"
 msgstr ""
 
-#: ../../mod/admin.php:216 ../../mod/admin.php:520
+#: ../../mod/admin.php:245 ../../mod/admin.php:537
 msgid "Pending registrations"
 msgstr ""
 
-#: ../../mod/admin.php:217
-msgid "Version"
+#: ../../mod/admin.php:246
+msgid "Registered channels"
 msgstr ""
 
-#: ../../mod/admin.php:219 ../../mod/admin.php:521
+#: ../../mod/admin.php:247 ../../mod/admin.php:538
 msgid "Active plugins"
 msgstr ""
 
-#: ../../mod/admin.php:330
+#: ../../mod/admin.php:248
+msgid "Version"
+msgstr ""
+
+#: ../../mod/admin.php:356
 msgid "Site settings updated."
 msgstr ""
 
-#: ../../mod/admin.php:369
+#: ../../mod/admin.php:393
 msgid "experimental"
 msgstr ""
 
-#: ../../mod/admin.php:371
+#: ../../mod/admin.php:395
 msgid "unsupported"
 msgstr ""
 
-#: ../../mod/admin.php:395
+#: ../../mod/admin.php:420
 msgid "Yes - with approval"
 msgstr ""
 
-#: ../../mod/admin.php:401
+#: ../../mod/admin.php:426
 msgid "My site is not a public server"
 msgstr ""
 
-#: ../../mod/admin.php:402
+#: ../../mod/admin.php:427
 msgid "My site has paid access only"
 msgstr ""
 
-#: ../../mod/admin.php:403
+#: ../../mod/admin.php:428
 msgid "My site has free access only"
 msgstr ""
 
-#: ../../mod/admin.php:404
+#: ../../mod/admin.php:429
 msgid "My site offers free accounts with optional paid upgrades"
 msgstr ""
 
-#: ../../mod/admin.php:417 ../../mod/register.php:207
+#: ../../mod/admin.php:442 ../../mod/register.php:207
 msgid "Registration"
 msgstr ""
 
-#: ../../mod/admin.php:418
+#: ../../mod/admin.php:443
 msgid "File upload"
 msgstr ""
 
-#: ../../mod/admin.php:419
+#: ../../mod/admin.php:444
 msgid "Policies"
 msgstr ""
 
-#: ../../mod/admin.php:424
+#: ../../mod/admin.php:449
 msgid "Site name"
 msgstr ""
 
-#: ../../mod/admin.php:425
+#: ../../mod/admin.php:450
 msgid "Banner/Logo"
 msgstr ""
 
-#: ../../mod/admin.php:426
+#: ../../mod/admin.php:451
 msgid "Administrator Information"
 msgstr ""
 
-#: ../../mod/admin.php:426
+#: ../../mod/admin.php:451
 msgid ""
 "Contact information for site administrators.  Displayed on siteinfo page.  "
 "BBCode can be used here"
 msgstr ""
 
-#: ../../mod/admin.php:427
+#: ../../mod/admin.php:452
 msgid "System language"
 msgstr ""
 
-#: ../../mod/admin.php:428
+#: ../../mod/admin.php:453
 msgid "System theme"
 msgstr ""
 
-#: ../../mod/admin.php:428
+#: ../../mod/admin.php:453
 msgid ""
 "Default system theme - may be over-ridden by user profiles - <a href='#' "
 "id='cnftheme'>change theme settings</a>"
 msgstr ""
 
-#: ../../mod/admin.php:429
+#: ../../mod/admin.php:454
 msgid "Mobile system theme"
 msgstr ""
 
-#: ../../mod/admin.php:429
+#: ../../mod/admin.php:454
 msgid "Theme for mobile devices"
 msgstr ""
 
-#: ../../mod/admin.php:431
+#: ../../mod/admin.php:456
 msgid "Enable Diaspora Protocol"
 msgstr ""
 
-#: ../../mod/admin.php:431
+#: ../../mod/admin.php:456
 msgid "Communicate with Diaspora and Friendica - experimental"
 msgstr ""
 
-#: ../../mod/admin.php:432
+#: ../../mod/admin.php:457
 msgid "Allow Feeds as Connections"
 msgstr ""
 
-#: ../../mod/admin.php:432
+#: ../../mod/admin.php:457
 msgid "(Heavy system resource usage)"
 msgstr ""
 
-#: ../../mod/admin.php:433
+#: ../../mod/admin.php:458
 msgid "Maximum image size"
 msgstr ""
 
-#: ../../mod/admin.php:433
+#: ../../mod/admin.php:458
 msgid ""
 "Maximum size in bytes of uploaded images. Default is 0, which means no "
 "limits."
 msgstr ""
 
-#: ../../mod/admin.php:434
+#: ../../mod/admin.php:459
 msgid "Does this site allow new member registration?"
 msgstr ""
 
-#: ../../mod/admin.php:435
+#: ../../mod/admin.php:460
 msgid "Which best describes the types of account offered by this hub?"
 msgstr ""
 
-#: ../../mod/admin.php:436
+#: ../../mod/admin.php:461
 msgid "Register text"
 msgstr ""
 
-#: ../../mod/admin.php:436
+#: ../../mod/admin.php:461
 msgid "Will be displayed prominently on the registration page."
 msgstr ""
 
-#: ../../mod/admin.php:437
+#: ../../mod/admin.php:462
 msgid "Accounts abandoned after x days"
 msgstr ""
 
-#: ../../mod/admin.php:437
+#: ../../mod/admin.php:462
 msgid ""
 "Will not waste system resources polling external sites for abandonded "
 "accounts. Enter 0 for no time limit."
 msgstr ""
 
-#: ../../mod/admin.php:438
+#: ../../mod/admin.php:463
 msgid "Allowed friend domains"
 msgstr ""
 
-#: ../../mod/admin.php:438
+#: ../../mod/admin.php:463
 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:439
+#: ../../mod/admin.php:464
 msgid "Allowed email domains"
 msgstr ""
 
-#: ../../mod/admin.php:439
+#: ../../mod/admin.php:464
 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:440
+#: ../../mod/admin.php:465
 msgid "Not allowed email domains"
 msgstr ""
 
-#: ../../mod/admin.php:440
+#: ../../mod/admin.php:465
 msgid ""
 "Comma separated list of domains which are not allowed in email addresses for "
 "registrations to this site. Wildcards are accepted. Empty to allow any "
 "domains, unless allowed domains have been defined."
 msgstr ""
 
-#: ../../mod/admin.php:441
+#: ../../mod/admin.php:466
 msgid "Block public"
 msgstr ""
 
-#: ../../mod/admin.php:441
+#: ../../mod/admin.php:466
 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:467
 msgid "Verify Email Addresses"
 msgstr ""
 
-#: ../../mod/admin.php:442
+#: ../../mod/admin.php:467
 msgid ""
 "Check to verify email addresses used in account registration (recommended)."
 msgstr ""
 
-#: ../../mod/admin.php:443
+#: ../../mod/admin.php:468
 msgid "Force publish"
 msgstr ""
 
-#: ../../mod/admin.php:443
+#: ../../mod/admin.php:468
 msgid ""
 "Check to force all profiles on this site to be listed in the site directory."
 msgstr ""
 
-#: ../../mod/admin.php:444
+#: ../../mod/admin.php:469
 msgid "Disable discovery tab"
 msgstr ""
 
-#: ../../mod/admin.php:444
+#: ../../mod/admin.php:469
 msgid ""
 "Remove the tab in the network view with public content pulled from sources "
 "chosen for this site."
 msgstr ""
 
-#: ../../mod/admin.php:445
+#: ../../mod/admin.php:470
 msgid "No login on Homepage"
 msgstr ""
 
-#: ../../mod/admin.php:445
+#: ../../mod/admin.php:470
 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
+#: ../../mod/admin.php:472
 msgid "Proxy user"
 msgstr ""
 
-#: ../../mod/admin.php:448
+#: ../../mod/admin.php:473
 msgid "Proxy URL"
 msgstr ""
 
-#: ../../mod/admin.php:449
+#: ../../mod/admin.php:474
 msgid "Network timeout"
 msgstr ""
 
-#: ../../mod/admin.php:449
+#: ../../mod/admin.php:474
 msgid "Value is in seconds. Set to 0 for unlimited (not recommended)."
 msgstr ""
 
-#: ../../mod/admin.php:450
+#: ../../mod/admin.php:475
 msgid "Delivery interval"
 msgstr ""
 
-#: ../../mod/admin.php:450
+#: ../../mod/admin.php:475
 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:451
+#: ../../mod/admin.php:476
 msgid "Poll interval"
 msgstr ""
 
-#: ../../mod/admin.php:451
+#: ../../mod/admin.php:476
 msgid ""
 "Delay background polling processes by this many seconds to reduce system "
 "load. If 0, use delivery interval."
 msgstr ""
 
-#: ../../mod/admin.php:452
+#: ../../mod/admin.php:477
 msgid "Maximum Load Average"
 msgstr ""
 
-#: ../../mod/admin.php:452
+#: ../../mod/admin.php:477
 msgid ""
 "Maximum system load before delivery and poll processes are deferred - "
 "default 50."
 msgstr ""
 
-#: ../../mod/admin.php:508
+#: ../../mod/admin.php:525
 msgid "No server found"
 msgstr ""
 
-#: ../../mod/admin.php:515 ../../mod/admin.php:740
+#: ../../mod/admin.php:532 ../../mod/admin.php:821
 msgid "ID"
 msgstr ""
 
-#: ../../mod/admin.php:515
+#: ../../mod/admin.php:532
 msgid "for channel"
 msgstr ""
 
-#: ../../mod/admin.php:515
+#: ../../mod/admin.php:532
 msgid "on server"
 msgstr ""
 
-#: ../../mod/admin.php:515
+#: ../../mod/admin.php:532
 msgid "Status"
 msgstr ""
 
-#: ../../mod/admin.php:536
+#: ../../mod/admin.php:534
+msgid "Server"
+msgstr ""
+
+#: ../../mod/admin.php:551
 msgid "Update has been marked successful"
 msgstr ""
 
-#: ../../mod/admin.php:546
+#: ../../mod/admin.php:561
 #, php-format
 msgid "Executing %s failed. Check system logs."
 msgstr ""
 
-#: ../../mod/admin.php:549
+#: ../../mod/admin.php:564
 #, php-format
 msgid "Update %s was successfully applied."
 msgstr ""
 
-#: ../../mod/admin.php:553
+#: ../../mod/admin.php:568
 #, php-format
 msgid "Update %s did not return a status. Unknown if it succeeded."
 msgstr ""
 
-#: ../../mod/admin.php:556
+#: ../../mod/admin.php:571
 #, php-format
 msgid "Update function %s could not be found."
 msgstr ""
 
-#: ../../mod/admin.php:571
+#: ../../mod/admin.php:587
 msgid "No failed updates."
 msgstr ""
 
-#: ../../mod/admin.php:575
+#: ../../mod/admin.php:591
 msgid "Failed Updates"
 msgstr ""
 
-#: ../../mod/admin.php:577
+#: ../../mod/admin.php:593
 msgid "Mark success (if update was manually applied)"
 msgstr ""
 
-#: ../../mod/admin.php:578
+#: ../../mod/admin.php:594
 msgid "Attempt to execute this update step automatically"
 msgstr ""
 
-#: ../../mod/admin.php:604
+#: ../../mod/admin.php:628
+msgid "Queue Statistics"
+msgstr ""
+
+#: ../../mod/admin.php:629
+msgid "Total Entries"
+msgstr ""
+
+#: ../../mod/admin.php:630
+msgid "Priority"
+msgstr ""
+
+#: ../../mod/admin.php:631
+msgid "Destination URL"
+msgstr ""
+
+#: ../../mod/admin.php:632
+msgid "Mark hub permanently offline"
+msgstr ""
+
+#: ../../mod/admin.php:633
+msgid "Empty queue for this hub"
+msgstr ""
+
+#: ../../mod/admin.php:634
+msgid "Last known contact"
+msgstr ""
+
+#: ../../mod/admin.php:670
 #, php-format
 msgid "%s user blocked/unblocked"
 msgid_plural "%s users blocked/unblocked"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../../mod/admin.php:611
+#: ../../mod/admin.php:678
 #, php-format
 msgid "%s user deleted"
 msgid_plural "%s users deleted"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../../mod/admin.php:640
+#: ../../mod/admin.php:714
 msgid "Account not found"
 msgstr ""
 
-#: ../../mod/admin.php:660
+#: ../../mod/admin.php:734
 #, php-format
-msgid "User '%s' unblocked"
+msgid "User '%s' blocked"
 msgstr ""
 
-#: ../../mod/admin.php:660
+#: ../../mod/admin.php:742
 #, php-format
-msgid "User '%s' blocked"
+msgid "User '%s' unblocked"
 msgstr ""
 
-#: ../../mod/admin.php:727 ../../mod/admin.php:739
+#: ../../mod/admin.php:808 ../../mod/admin.php:820
 msgid "Users"
 msgstr ""
 
-#: ../../mod/admin.php:729 ../../mod/admin.php:865
+#: ../../mod/admin.php:810 ../../mod/admin.php:944
 msgid "select all"
 msgstr ""
 
-#: ../../mod/admin.php:730
+#: ../../mod/admin.php:811
 msgid "User registrations waiting for confirm"
 msgstr ""
 
-#: ../../mod/admin.php:731
+#: ../../mod/admin.php:812
 msgid "Request date"
 msgstr ""
 
-#: ../../mod/admin.php:732
+#: ../../mod/admin.php:813
 msgid "No registrations."
 msgstr ""
 
-#: ../../mod/admin.php:733
+#: ../../mod/admin.php:814
 msgid "Approve"
 msgstr ""
 
-#: ../../mod/admin.php:734
+#: ../../mod/admin.php:815
 msgid "Deny"
 msgstr ""
 
-#: ../../mod/admin.php:740
+#: ../../mod/admin.php:821
 msgid "Register date"
 msgstr ""
 
-#: ../../mod/admin.php:740
+#: ../../mod/admin.php:821
 msgid "Last login"
 msgstr ""
 
-#: ../../mod/admin.php:740
+#: ../../mod/admin.php:821
 msgid "Expires"
 msgstr ""
 
-#: ../../mod/admin.php:740
+#: ../../mod/admin.php:821
 msgid "Service Class"
 msgstr ""
 
-#: ../../mod/admin.php:742
+#: ../../mod/admin.php:823
 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:743
+#: ../../mod/admin.php:824
 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:776
+#: ../../mod/admin.php:858
 #, php-format
 msgid "%s channel censored/uncensored"
 msgid_plural "%s channels censored/uncensored"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../../mod/admin.php:783
+#: ../../mod/admin.php:865
 #, php-format
 msgid "%s channel deleted"
 msgid_plural "%s channels deleted"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../../mod/admin.php:802
+#: ../../mod/admin.php:883
 msgid "Channel not found"
 msgstr ""
 
-#: ../../mod/admin.php:813
+#: ../../mod/admin.php:894
 #, php-format
 msgid "Channel '%s' deleted"
 msgstr ""
 
-#: ../../mod/admin.php:824
+#: ../../mod/admin.php:905
 #, php-format
 msgid "Channel '%s' uncensored"
 msgstr ""
 
-#: ../../mod/admin.php:824
+#: ../../mod/admin.php:905
 #, php-format
 msgid "Channel '%s' censored"
 msgstr ""
 
-#: ../../mod/admin.php:867
+#: ../../mod/admin.php:946
 msgid "Censor"
 msgstr ""
 
-#: ../../mod/admin.php:868
+#: ../../mod/admin.php:947
 msgid "Uncensor"
 msgstr ""
 
-#: ../../mod/admin.php:871
+#: ../../mod/admin.php:950
 msgid "UID"
 msgstr ""
 
-#: ../../mod/admin.php:873
+#: ../../mod/admin.php:952
 msgid ""
 "Selected channels will be deleted!\\n\\nEverything that was posted in these "
 "channels on this site will be permanently deleted!\\n\\nAre you sure?"
 msgstr ""
 
-#: ../../mod/admin.php:874
+#: ../../mod/admin.php:953
 msgid ""
 "The channel {0} will be deleted!\\n\\nEverything that was posted in this "
 "channel on this site will be permanently deleted!\\n\\nAre you sure?"
 msgstr ""
 
-#: ../../mod/admin.php:913
+#: ../../mod/admin.php:993
 #, php-format
 msgid "Plugin %s disabled."
 msgstr ""
 
-#: ../../mod/admin.php:917
+#: ../../mod/admin.php:997
 #, php-format
 msgid "Plugin %s enabled."
 msgstr ""
 
-#: ../../mod/admin.php:927 ../../mod/admin.php:1129
+#: ../../mod/admin.php:1007 ../../mod/admin.php:1205
 msgid "Disable"
 msgstr ""
 
-#: ../../mod/admin.php:929 ../../mod/admin.php:1131
+#: ../../mod/admin.php:1010 ../../mod/admin.php:1207
 msgid "Enable"
 msgstr ""
 
-#: ../../mod/admin.php:955 ../../mod/admin.php:1160
+#: ../../mod/admin.php:1034 ../../mod/admin.php:1234
 msgid "Toggle"
 msgstr ""
 
-#: ../../mod/admin.php:963 ../../mod/admin.php:1170
+#: ../../mod/admin.php:1042 ../../mod/admin.php:1244
 msgid "Author: "
 msgstr ""
 
-#: ../../mod/admin.php:964 ../../mod/admin.php:1171
+#: ../../mod/admin.php:1043 ../../mod/admin.php:1245
 msgid "Maintainer: "
 msgstr ""
 
-#: ../../mod/admin.php:1093
+#: ../../mod/admin.php:1170
 msgid "No themes found."
 msgstr ""
 
-#: ../../mod/admin.php:1152
+#: ../../mod/admin.php:1226
 msgid "Screenshot"
 msgstr ""
 
-#: ../../mod/admin.php:1200
+#: ../../mod/admin.php:1273
 msgid "[Experimental]"
 msgstr ""
 
-#: ../../mod/admin.php:1201
+#: ../../mod/admin.php:1274
 msgid "[Unsupported]"
 msgstr ""
 
-#: ../../mod/admin.php:1228
+#: ../../mod/admin.php:1298
 msgid "Log settings updated."
 msgstr ""
 
-#: ../../mod/admin.php:1284
+#: ../../mod/admin.php:1353
 msgid "Clear"
 msgstr ""
 
-#: ../../mod/admin.php:1290
+#: ../../mod/admin.php:1359
 msgid "Debugging"
 msgstr ""
 
-#: ../../mod/admin.php:1291
+#: ../../mod/admin.php:1360
 msgid "Log file"
 msgstr ""
 
-#: ../../mod/admin.php:1291
+#: ../../mod/admin.php:1360
 msgid ""
 "Must be writable by web server. Relative to your Red top-level directory."
 msgstr ""
 
-#: ../../mod/admin.php:1292
+#: ../../mod/admin.php:1361
 msgid "Log level"
 msgstr ""
 
-#: ../../mod/admin.php:1339
+#: ../../mod/admin.php:1407
 msgid "New Profile Field"
 msgstr ""
 
-#: ../../mod/admin.php:1340 ../../mod/admin.php:1361
+#: ../../mod/admin.php:1408 ../../mod/admin.php:1428
 msgid "Field nickname"
 msgstr ""
 
-#: ../../mod/admin.php:1340 ../../mod/admin.php:1361
+#: ../../mod/admin.php:1408 ../../mod/admin.php:1428
 msgid "System name of field"
 msgstr ""
 
-#: ../../mod/admin.php:1341 ../../mod/admin.php:1362
+#: ../../mod/admin.php:1409 ../../mod/admin.php:1429
 msgid "Input type"
 msgstr ""
 
-#: ../../mod/admin.php:1342 ../../mod/admin.php:1363
+#: ../../mod/admin.php:1410 ../../mod/admin.php:1430
 msgid "Field Name"
 msgstr ""
 
-#: ../../mod/admin.php:1342 ../../mod/admin.php:1363
+#: ../../mod/admin.php:1410 ../../mod/admin.php:1430
 msgid "Label on profile pages"
 msgstr ""
 
-#: ../../mod/admin.php:1343 ../../mod/admin.php:1364
+#: ../../mod/admin.php:1411 ../../mod/admin.php:1431
 msgid "Help text"
 msgstr ""
 
-#: ../../mod/admin.php:1343 ../../mod/admin.php:1364
+#: ../../mod/admin.php:1411 ../../mod/admin.php:1431
 msgid "Additional info (optional)"
 msgstr ""
 
-#: ../../mod/admin.php:1354
+#: ../../mod/admin.php:1421
 msgid "Field definition not found"
 msgstr ""
 
-#: ../../mod/admin.php:1360
+#: ../../mod/admin.php:1427
 msgid "Edit Profile Field"
 msgstr ""
 
@@ -7713,19 +7843,90 @@ msgstr ""
 msgid "Post successful."
 msgstr ""
 
-#: ../../mod/post.php:229
+#: ../../mod/editblock.php:115
+msgid "Edit Block"
+msgstr ""
+
+#: ../../mod/editblock.php:125
+msgid "Delete block?"
+msgstr ""
+
+#: ../../mod/editblock.php:188
+msgid "Delete Block"
+msgstr ""
+
+#: ../../mod/register.php:44
+msgid "Maximum daily site registrations exceeded. Please try again tomorrow."
+msgstr ""
+
+#: ../../mod/register.php:50
 msgid ""
-"Remote authentication blocked. You are logged into this site locally. Please "
-"logout and retry."
+"Please indicate acceptance of the Terms of Service. Registration failed."
+msgstr ""
+
+#: ../../mod/register.php:84
+msgid "Passwords do not match."
+msgstr ""
+
+#: ../../mod/register.php:117
+msgid ""
+"Registration successful. Please check your email for validation instructions."
+msgstr ""
+
+#: ../../mod/register.php:123
+msgid "Your registration is pending approval by the site owner."
 msgstr ""
 
-#: ../../mod/post.php:261 ../../mod/openid.php:72 ../../mod/openid.php:180
+#: ../../mod/register.php:126
+msgid "Your registration can not be processed."
+msgstr ""
+
+#: ../../mod/register.php:163
+msgid "Registration on this site/hub is by approval only."
+msgstr ""
+
+#: ../../mod/register.php:164
+msgid "<a href=\"pubsites\">Register at another affiliated site/hub</a>"
+msgstr ""
+
+#: ../../mod/register.php:174
+msgid ""
+"This site has exceeded the number of allowed daily account registrations. "
+"Please try again tomorrow."
+msgstr ""
+
+#: ../../mod/register.php:185
+msgid "Terms of Service"
+msgstr ""
+
+#: ../../mod/register.php:191
 #, php-format
-msgid "Welcome %s. Remote authentication successful."
+msgid "I accept the %s for this website"
 msgstr ""
 
-#: ../../mod/regmod.php:11
-msgid "Please login."
+#: ../../mod/register.php:193
+#, php-format
+msgid "I am over 13 years of age and accept the %s for this website"
+msgstr ""
+
+#: ../../mod/register.php:212
+msgid "Membership on this site is by invitation only."
+msgstr ""
+
+#: ../../mod/register.php:213
+msgid "Please enter your invitation code"
+msgstr ""
+
+#: ../../mod/register.php:216
+msgid "Your email address"
+msgstr ""
+
+#: ../../mod/register.php:217
+msgid "Choose a password"
+msgstr ""
+
+#: ../../mod/register.php:218
+msgid "Please re-enter your password"
 msgstr ""
 
 #: ../../mod/removeaccount.php:30
@@ -7738,10 +7939,18 @@ msgstr ""
 msgid "Remove This Account"
 msgstr ""
 
+#: ../../mod/removeaccount.php:58 ../../mod/removeme.php:58
+msgid "WARNING: "
+msgstr ""
+
 #: ../../mod/removeaccount.php:58
 msgid ""
-"This will completely remove this account including all its channels from the "
-"network. Once this has been done it is not recoverable."
+"This account and all its channels will be completely removed from the "
+"network. "
+msgstr ""
+
+#: ../../mod/removeaccount.php:58 ../../mod/removeme.php:58
+msgid "This action is permanent and can not be undone!"
 msgstr ""
 
 #: ../../mod/removeaccount.php:59 ../../mod/removeme.php:59
@@ -7766,24 +7975,149 @@ msgstr ""
 msgid "[Embedded content - reload page to view]"
 msgstr ""
 
-#: ../../mod/wall_upload.php:35
-msgid "Wall Photos"
+#: ../../mod/photos.php:77
+msgid "Page owner information could not be retrieved."
 msgstr ""
 
-#: ../../mod/match.php:16
-msgid "Profile Match"
+#: ../../mod/photos.php:97
+msgid "Album not found."
 msgstr ""
 
-#: ../../mod/match.php:24
-msgid "No keywords to match. Please add keywords to your default profile."
+#: ../../mod/photos.php:119 ../../mod/photos.php:643
+msgid "Delete Album"
 msgstr ""
 
-#: ../../mod/match.php:61
-msgid "is interested in:"
+#: ../../mod/photos.php:159 ../../mod/photos.php:930
+msgid "Delete Photo"
 msgstr ""
 
-#: ../../mod/match.php:69
-msgid "No matches"
+#: ../../mod/photos.php:440
+msgid "No photos selected"
+msgstr ""
+
+#: ../../mod/photos.php:484
+msgid "Access to this item is restricted."
+msgstr ""
+
+#: ../../mod/photos.php:523
+#, php-format
+msgid "%1$.2f MB of %2$.2f MB photo storage used."
+msgstr ""
+
+#: ../../mod/photos.php:526
+#, php-format
+msgid "%1$.2f MB photo storage used."
+msgstr ""
+
+#: ../../mod/photos.php:550
+msgid "Upload Photos"
+msgstr ""
+
+#: ../../mod/photos.php:554 ../../mod/photos.php:636 ../../mod/photos.php:915
+msgid "Enter a new album name"
+msgstr ""
+
+#: ../../mod/photos.php:555 ../../mod/photos.php:637 ../../mod/photos.php:916
+msgid "or select an existing one (doubleclick)"
+msgstr ""
+
+#: ../../mod/photos.php:556
+msgid "Create a status post for this upload"
+msgstr ""
+
+#: ../../mod/photos.php:584
+msgid "Album name could not be decoded"
+msgstr ""
+
+#: ../../mod/photos.php:625 ../../mod/photos.php:1157
+#: ../../mod/photos.php:1173
+msgid "Contact Photos"
+msgstr ""
+
+#: ../../mod/photos.php:649
+msgid "Show Newest First"
+msgstr ""
+
+#: ../../mod/photos.php:651
+msgid "Show Oldest First"
+msgstr ""
+
+#: ../../mod/photos.php:675 ../../mod/photos.php:1205
+msgid "View Photo"
+msgstr ""
+
+#: ../../mod/photos.php:704
+msgid "Edit Album"
+msgstr ""
+
+#: ../../mod/photos.php:749
+msgid "Permission denied. Access to this item may be restricted."
+msgstr ""
+
+#: ../../mod/photos.php:751
+msgid "Photo not available"
+msgstr ""
+
+#: ../../mod/photos.php:809
+msgid "Use as profile photo"
+msgstr ""
+
+#: ../../mod/photos.php:816
+msgid "Private Photo"
+msgstr ""
+
+#: ../../mod/photos.php:831
+msgid "View Full Size"
+msgstr ""
+
+#: ../../mod/photos.php:909
+msgid "Edit photo"
+msgstr ""
+
+#: ../../mod/photos.php:911
+msgid "Rotate CW (right)"
+msgstr ""
+
+#: ../../mod/photos.php:912
+msgid "Rotate CCW (left)"
+msgstr ""
+
+#: ../../mod/photos.php:919
+msgid "Caption"
+msgstr ""
+
+#: ../../mod/photos.php:921
+msgid "Add a Tag"
+msgstr ""
+
+#: ../../mod/photos.php:925
+msgid "Example: @bob, @Barbara_Jensen, @jim@example.com"
+msgstr ""
+
+#: ../../mod/photos.php:928
+msgid "Flag as adult in album view"
+msgstr ""
+
+#: ../../mod/photos.php:1120
+msgid "In This Photo:"
+msgstr ""
+
+#: ../../mod/photos.php:1125
+msgid "Map"
+msgstr ""
+
+#: ../../mod/photos.php:1211
+msgid "View Album"
+msgstr ""
+
+#: ../../mod/photos.php:1234
+msgid "Recent Photos"
+msgstr ""
+
+#: ../../mod/post.php:234
+msgid ""
+"Remote authentication blocked. You are logged into this site locally. Please "
+"logout and retry."
 msgstr ""
 
 #: ../../mod/message.php:41
@@ -7925,9 +8259,7 @@ msgid "Remove This Channel"
 msgstr ""
 
 #: ../../mod/removeme.php:58
-msgid ""
-"This will completely remove this channel from the network. Once this has "
-"been done it is not recoverable."
+msgid "This channel will be completely removed from the network. "
 msgstr ""
 
 #: ../../mod/removeme.php:60
@@ -7940,10 +8272,6 @@ msgid ""
 "removed from the network"
 msgstr ""
 
-#: ../../mod/removeme.php:61
-msgid "Remove Channel"
-msgstr ""
-
 #: ../../mod/layouts.php:110
 msgid "Help with this feature"
 msgstr ""
@@ -7952,72 +8280,30 @@ msgstr ""
 msgid "Layout Name"
 msgstr ""
 
-#: ../../mod/like.php:15
-msgid "Like/Dislike"
-msgstr ""
-
-#: ../../mod/like.php:20
-msgid "This action is restricted to members."
-msgstr ""
-
-#: ../../mod/like.php:21
+#: ../../mod/rmagic.php:40
 msgid ""
-"Please <a href=\"rmagic\">login with your RedMatrix ID</a> or <a href="
-"\"register\">register as a new RedMatrix member</a> to continue."
-msgstr ""
-
-#: ../../mod/like.php:101 ../../mod/like.php:128 ../../mod/like.php:166
-msgid "Invalid request."
-msgstr ""
-
-#: ../../mod/like.php:143
-msgid "thing"
-msgstr ""
-
-#: ../../mod/like.php:189
-msgid "Channel unavailable."
-msgstr ""
-
-#: ../../mod/like.php:228
-msgid "Previous action reversed."
-msgstr ""
-
-#: ../../mod/like.php:387
-#, php-format
-msgid "%1$s agrees with %2$s's %3$s"
-msgstr ""
-
-#: ../../mod/like.php:389
-#, php-format
-msgid "%1$s doesn't agree with %2$s's %3$s"
-msgstr ""
-
-#: ../../mod/like.php:391
-#, php-format
-msgid "%1$s abstains from a decision on %2$s's %3$s"
+"We encountered a problem while logging in with the OpenID you provided. "
+"Please check the correct spelling of the ID."
 msgstr ""
 
-#: ../../mod/like.php:393
-#, php-format
-msgid "%1$s is attending %2$s's %3$s"
+#: ../../mod/rmagic.php:40
+msgid "The error message was:"
 msgstr ""
 
-#: ../../mod/like.php:395
-#, php-format
-msgid "%1$s is not attending %2$s's %3$s"
+#: ../../mod/rmagic.php:44
+msgid "Authentication failed."
 msgstr ""
 
-#: ../../mod/like.php:397
-#, php-format
-msgid "%1$s may attend %2$s's %3$s"
+#: ../../mod/rmagic.php:84
+msgid "Remote Authentication"
 msgstr ""
 
-#: ../../mod/like.php:481
-msgid "Action completed."
+#: ../../mod/rmagic.php:85
+msgid "Enter your channel address (e.g. channel@example.com)"
 msgstr ""
 
-#: ../../mod/like.php:482
-msgid "Thank you."
+#: ../../mod/rmagic.php:86
+msgid "Authenticate"
 msgstr ""
 
 #: ../../mod/mail.php:33
@@ -8098,6 +8384,34 @@ msgstr ""
 msgid "Discard"
 msgstr ""
 
+#: ../../mod/regmod.php:11
+msgid "Please login."
+msgstr ""
+
+#: ../../mod/network.php:90
+msgid "No such group"
+msgstr ""
+
+#: ../../mod/network.php:128
+msgid "Search Results For:"
+msgstr ""
+
+#: ../../mod/network.php:182
+msgid "Collection is empty"
+msgstr ""
+
+#: ../../mod/network.php:190
+msgid "Collection: "
+msgstr ""
+
+#: ../../mod/network.php:203
+msgid "Connection: "
+msgstr ""
+
+#: ../../mod/network.php:206
+msgid "Invalid connection."
+msgstr ""
+
 #: ../../mod/new_channel.php:109
 msgid "Add a Channel"
 msgstr ""
@@ -8145,143 +8459,52 @@ msgstr ""
 msgid "Read more about roles"
 msgstr ""
 
-#: ../../mod/openid.php:26
-msgid "OpenID protocol error. No ID returned."
-msgstr ""
-
-#: ../../mod/photos.php:77
-msgid "Page owner information could not be retrieved."
-msgstr ""
-
-#: ../../mod/photos.php:97
-msgid "Album not found."
-msgstr ""
-
-#: ../../mod/photos.php:119 ../../mod/photos.php:643
-msgid "Delete Album"
-msgstr ""
-
-#: ../../mod/photos.php:159 ../../mod/photos.php:924
-msgid "Delete Photo"
-msgstr ""
-
-#: ../../mod/photos.php:440
-msgid "No photos selected"
-msgstr ""
-
-#: ../../mod/photos.php:484
-msgid "Access to this item is restricted."
-msgstr ""
-
-#: ../../mod/photos.php:523
-#, php-format
-msgid "%1$.2f MB of %2$.2f MB photo storage used."
-msgstr ""
-
-#: ../../mod/photos.php:526
-#, php-format
-msgid "%1$.2f MB photo storage used."
-msgstr ""
-
-#: ../../mod/photos.php:550
-msgid "Upload Photos"
-msgstr ""
-
-#: ../../mod/photos.php:554 ../../mod/photos.php:636 ../../mod/photos.php:909
-msgid "Enter a new album name"
-msgstr ""
-
-#: ../../mod/photos.php:555 ../../mod/photos.php:637 ../../mod/photos.php:910
-msgid "or select an existing one (doubleclick)"
-msgstr ""
-
-#: ../../mod/photos.php:556
-msgid "Do not show a status post for this upload"
-msgstr ""
-
-#: ../../mod/photos.php:584
-msgid "Album name could not be decoded"
-msgstr ""
-
-#: ../../mod/photos.php:625 ../../mod/photos.php:1149
-#: ../../mod/photos.php:1165
-msgid "Contact Photos"
-msgstr ""
-
-#: ../../mod/photos.php:649
-msgid "Show Newest First"
-msgstr ""
-
-#: ../../mod/photos.php:651
-msgid "Show Oldest First"
-msgstr ""
-
-#: ../../mod/photos.php:675 ../../mod/photos.php:1197
-msgid "View Photo"
-msgstr ""
-
-#: ../../mod/photos.php:704
-msgid "Edit Album"
-msgstr ""
-
-#: ../../mod/photos.php:749
-msgid "Permission denied. Access to this item may be restricted."
-msgstr ""
-
-#: ../../mod/photos.php:751
-msgid "Photo not available"
-msgstr ""
-
-#: ../../mod/photos.php:809
-msgid "Use as profile photo"
-msgstr ""
-
-#: ../../mod/photos.php:816
-msgid "Private Photo"
+#: ../../mod/appman.php:28 ../../mod/appman.php:44
+msgid "App installed."
 msgstr ""
 
-#: ../../mod/photos.php:831
-msgid "View Full Size"
+#: ../../mod/appman.php:37
+msgid "Malformed app."
 msgstr ""
 
-#: ../../mod/photos.php:903
-msgid "Edit photo"
+#: ../../mod/appman.php:80
+msgid "Embed code"
 msgstr ""
 
-#: ../../mod/photos.php:905
-msgid "Rotate CW (right)"
+#: ../../mod/appman.php:86
+msgid "Edit App"
 msgstr ""
 
-#: ../../mod/photos.php:906
-msgid "Rotate CCW (left)"
+#: ../../mod/appman.php:86
+msgid "Create App"
 msgstr ""
 
-#: ../../mod/photos.php:913
-msgid "Caption"
+#: ../../mod/appman.php:91
+msgid "Name of app"
 msgstr ""
 
-#: ../../mod/photos.php:915
-msgid "Add a Tag"
+#: ../../mod/appman.php:92
+msgid "Location (URL) of app"
 msgstr ""
 
-#: ../../mod/photos.php:919
-msgid "Example: @bob, @Barbara_Jensen, @jim@example.com"
+#: ../../mod/appman.php:94
+msgid "Photo icon URL"
 msgstr ""
 
-#: ../../mod/photos.php:922
-msgid "Flag as adult in album view"
+#: ../../mod/appman.php:94
+msgid "80 x 80 pixels - optional"
 msgstr ""
 
-#: ../../mod/photos.php:1114
-msgid "In This Photo:"
+#: ../../mod/appman.php:95
+msgid "Version ID"
 msgstr ""
 
-#: ../../mod/photos.php:1203
-msgid "View Album"
+#: ../../mod/appman.php:96
+msgid "Price of app"
 msgstr ""
 
-#: ../../mod/photos.php:1226
-msgid "Recent Photos"
+#: ../../mod/appman.php:97
+msgid "Location (URL) to purchase app"
 msgstr ""
 
 #: ../../mod/ping.php:263
@@ -8308,108 +8531,14 @@ msgstr ""
 msgid "My Connections Bookmarks"
 msgstr ""
 
-#: ../../mod/channel.php:87
+#: ../../mod/channel.php:92
 msgid "Insufficient permissions.  Request redirected to profile page."
 msgstr ""
 
-#: ../../mod/register.php:44
-msgid "Maximum daily site registrations exceeded. Please try again tomorrow."
-msgstr ""
-
-#: ../../mod/register.php:50
-msgid ""
-"Please indicate acceptance of the Terms of Service. Registration failed."
-msgstr ""
-
-#: ../../mod/register.php:84
-msgid "Passwords do not match."
-msgstr ""
-
-#: ../../mod/register.php:117
-msgid ""
-"Registration successful. Please check your email for validation instructions."
-msgstr ""
-
-#: ../../mod/register.php:123
-msgid "Your registration is pending approval by the site owner."
-msgstr ""
-
-#: ../../mod/register.php:126
-msgid "Your registration can not be processed."
-msgstr ""
-
-#: ../../mod/register.php:163
-msgid "Registration on this site/hub is by approval only."
-msgstr ""
-
-#: ../../mod/register.php:164
-msgid "<a href=\"pubsites\">Register at another affiliated site/hub</a>"
-msgstr ""
-
-#: ../../mod/register.php:174
-msgid ""
-"This site has exceeded the number of allowed daily account registrations. "
-"Please try again tomorrow."
-msgstr ""
-
-#: ../../mod/register.php:185
-msgid "Terms of Service"
-msgstr ""
-
-#: ../../mod/register.php:191
-#, php-format
-msgid "I accept the %s for this website"
-msgstr ""
-
-#: ../../mod/register.php:193
-#, php-format
-msgid "I am over 13 years of age and accept the %s for this website"
-msgstr ""
-
-#: ../../mod/register.php:212
-msgid "Membership on this site is by invitation only."
-msgstr ""
-
-#: ../../mod/register.php:213
-msgid "Please enter your invitation code"
-msgstr ""
-
-#: ../../mod/register.php:216
-msgid "Your email address"
-msgstr ""
-
-#: ../../mod/register.php:217
-msgid "Choose a password"
-msgstr ""
-
-#: ../../mod/register.php:218
-msgid "Please re-enter your password"
-msgstr ""
-
-#: ../../mod/rmagic.php:38
+#: ../../mod/suggest.php:35
 msgid ""
-"We encountered a problem while logging in with the OpenID you provided. "
-"Please check the correct spelling of the ID."
-msgstr ""
-
-#: ../../mod/rmagic.php:38
-msgid "The error message was:"
-msgstr ""
-
-#: ../../mod/rmagic.php:42
-msgid "Authentication failed."
-msgstr ""
-
-#: ../../mod/rmagic.php:82
-msgid "Remote Authentication"
-msgstr ""
-
-#: ../../mod/rmagic.php:83
-msgid "Enter your channel address (e.g. channel@example.com)"
-msgstr ""
-
-#: ../../mod/rmagic.php:84
-msgid "Authenticate"
+"No suggestions available. If this is a new site, please try again in 24 "
+"hours."
 msgstr ""
 
 #: ../../mod/poll.php:64
@@ -8450,17 +8579,16 @@ msgid "Monospace"
 msgstr ""
 
 #: ../../view/theme/apw/php/config.php:259
-#: ../../view/theme/redbasic/php/config.php:102
+#: ../../view/theme/redbasic/php/config.php:100
 msgid "Theme settings"
 msgstr ""
 
 #: ../../view/theme/apw/php/config.php:260
-#: ../../view/theme/redbasic/php/config.php:103
 msgid "Set scheme"
 msgstr ""
 
 #: ../../view/theme/apw/php/config.php:261
-#: ../../view/theme/redbasic/php/config.php:124
+#: ../../view/theme/redbasic/php/config.php:122
 msgid "Set font-size for posts and comments"
 msgstr ""
 
@@ -8580,130 +8708,134 @@ msgstr ""
 msgid "Right offset of the aside element"
 msgstr ""
 
-#: ../../view/theme/redbasic/php/config.php:84
+#: ../../view/theme/redbasic/php/config.php:82
 msgid "Light (Red Matrix default)"
 msgstr ""
 
-#: ../../view/theme/redbasic/php/config.php:104
+#: ../../view/theme/redbasic/php/config.php:101
+msgid "Select scheme"
+msgstr ""
+
+#: ../../view/theme/redbasic/php/config.php:102
 msgid "Narrow navbar"
 msgstr ""
 
-#: ../../view/theme/redbasic/php/config.php:105
+#: ../../view/theme/redbasic/php/config.php:103
 msgid "Navigation bar background color"
 msgstr ""
 
-#: ../../view/theme/redbasic/php/config.php:106
+#: ../../view/theme/redbasic/php/config.php:104
 msgid "Navigation bar gradient top color"
 msgstr ""
 
-#: ../../view/theme/redbasic/php/config.php:107
+#: ../../view/theme/redbasic/php/config.php:105
 msgid "Navigation bar gradient bottom color"
 msgstr ""
 
-#: ../../view/theme/redbasic/php/config.php:108
+#: ../../view/theme/redbasic/php/config.php:106
 msgid "Navigation active button gradient top color"
 msgstr ""
 
-#: ../../view/theme/redbasic/php/config.php:109
+#: ../../view/theme/redbasic/php/config.php:107
 msgid "Navigation active button gradient bottom color"
 msgstr ""
 
-#: ../../view/theme/redbasic/php/config.php:110
+#: ../../view/theme/redbasic/php/config.php:108
 msgid "Navigation bar border color "
 msgstr ""
 
-#: ../../view/theme/redbasic/php/config.php:111
+#: ../../view/theme/redbasic/php/config.php:109
 msgid "Navigation bar icon color "
 msgstr ""
 
-#: ../../view/theme/redbasic/php/config.php:112
+#: ../../view/theme/redbasic/php/config.php:110
 msgid "Navigation bar active icon color "
 msgstr ""
 
-#: ../../view/theme/redbasic/php/config.php:113
+#: ../../view/theme/redbasic/php/config.php:111
 msgid "link color"
 msgstr ""
 
-#: ../../view/theme/redbasic/php/config.php:114
+#: ../../view/theme/redbasic/php/config.php:112
 msgid "Set font-color for banner"
 msgstr ""
 
-#: ../../view/theme/redbasic/php/config.php:115
+#: ../../view/theme/redbasic/php/config.php:113
 msgid "Set the background color"
 msgstr ""
 
-#: ../../view/theme/redbasic/php/config.php:116
+#: ../../view/theme/redbasic/php/config.php:114
 msgid "Set the background image"
 msgstr ""
 
-#: ../../view/theme/redbasic/php/config.php:117
+#: ../../view/theme/redbasic/php/config.php:115
 msgid "Set the background color of items"
 msgstr ""
 
-#: ../../view/theme/redbasic/php/config.php:118
+#: ../../view/theme/redbasic/php/config.php:116
 msgid "Set the background color of comments"
 msgstr ""
 
-#: ../../view/theme/redbasic/php/config.php:119
+#: ../../view/theme/redbasic/php/config.php:117
 msgid "Set the border color of comments"
 msgstr ""
 
-#: ../../view/theme/redbasic/php/config.php:120
+#: ../../view/theme/redbasic/php/config.php:118
 msgid "Set the indent for comments"
 msgstr ""
 
-#: ../../view/theme/redbasic/php/config.php:121
+#: ../../view/theme/redbasic/php/config.php:119
 msgid "Set the basic color for item icons"
 msgstr ""
 
-#: ../../view/theme/redbasic/php/config.php:122
+#: ../../view/theme/redbasic/php/config.php:120
 msgid "Set the hover color for item icons"
 msgstr ""
 
-#: ../../view/theme/redbasic/php/config.php:123
+#: ../../view/theme/redbasic/php/config.php:121
 msgid "Set font-size for the entire application"
 msgstr ""
 
-#: ../../view/theme/redbasic/php/config.php:125
+#: ../../view/theme/redbasic/php/config.php:121
+msgid "Example: 14px"
+msgstr ""
+
+#: ../../view/theme/redbasic/php/config.php:123
 msgid "Set font-color for posts and comments"
 msgstr ""
 
-#: ../../view/theme/redbasic/php/config.php:126
+#: ../../view/theme/redbasic/php/config.php:124
 msgid "Set radius of corners"
 msgstr ""
 
-#: ../../view/theme/redbasic/php/config.php:127
+#: ../../view/theme/redbasic/php/config.php:125
 msgid "Set shadow depth of photos"
 msgstr ""
 
-#: ../../view/theme/redbasic/php/config.php:128
-msgid "Set maximum width of conversation regions"
+#: ../../view/theme/redbasic/php/config.php:126
+msgid "Set maximum width of content region in pixel"
 msgstr ""
 
-#: ../../view/theme/redbasic/php/config.php:129
-msgid "Center conversation regions"
+#: ../../view/theme/redbasic/php/config.php:126
+msgid "Leave empty for default width"
 msgstr ""
 
-#: ../../view/theme/redbasic/php/config.php:130
+#: ../../view/theme/redbasic/php/config.php:127
+msgid "Center page content"
+msgstr ""
+
+#: ../../view/theme/redbasic/php/config.php:128
 msgid "Set minimum opacity of nav bar - to hide it"
 msgstr ""
 
-#: ../../view/theme/redbasic/php/config.php:131
+#: ../../view/theme/redbasic/php/config.php:129
 msgid "Set size of conversation author photo"
 msgstr ""
 
-#: ../../view/theme/redbasic/php/config.php:132
+#: ../../view/theme/redbasic/php/config.php:130
 msgid "Set size of followup author photos"
 msgstr ""
 
-#: ../../view/theme/redbasic/php/config.php:133
-msgid "Sloppy photo albums"
-msgstr ""
-
-#: ../../view/theme/redbasic/php/config.php:133
-msgid "Are you a clean desk or a messy desk person?"
-msgstr ""
-
 #: ../../boot.php:1357
 #, php-format
 msgid "Update %s failed. See error logs."
@@ -8731,14 +8863,24 @@ msgstr ""
 msgid "Forgot your password?"
 msgstr ""
 
-#: ../../boot.php:1674
-msgid "permission denied"
+#: ../../boot.php:2182
+msgid "toggle mobile"
 msgstr ""
 
-#: ../../boot.php:1675
-msgid "Got Zot?"
+#: ../../boot.php:2314
+msgid "Website SSL certificate is not valid. Please correct."
 msgstr ""
 
-#: ../../boot.php:2158
-msgid "toggle mobile"
+#: ../../boot.php:2317
+#, php-format
+msgid "[red] Website SSL error for %s"
+msgstr ""
+
+#: ../../boot.php:2355
+msgid "Cron/Scheduled tasks not running."
+msgstr ""
+
+#: ../../boot.php:2359
+#, php-format
+msgid "[red] Cron tasks not running on %s"
 msgstr ""
diff --git a/util/shredder/readme b/util/shredder/readme
new file mode 100644
index 000000000..44ed6f45c
--- /dev/null
+++ b/util/shredder/readme
@@ -0,0 +1,11 @@
+http://kmkeen.com/jshon/
+
+
+
+Jshon was made to be part of the usual text processing pipeline. However, every single -u is printed out to its own line. Most shell tools expect fields to be tab separated, and newlines between sets of fields. The paste tool does this. However, paste breaks down on blank lines so use sed to pad out the empty lines.
+
+jshon ... | sed 's/^$/-/' |  paste -s -d "\t\t\n" | ....
+
+The arguments need a little explaining.
+-s is mysteriously needed for paste to correctly handle input.
+-d is less obvious from the manpage, because it can take multiple characters which are looped through. The above example concatenates every three lines together.
diff --git a/util/update_addon_repo b/util/update_addon_repo
index d5dedeb50..c6c2c4a47 100755
--- a/util/update_addon_repo
+++ b/util/update_addon_repo
@@ -1,10 +1,39 @@
 #!/bin/sh -f
 
-if [ $# -eq '2' ]; then
-	echo usage: $0 nickname
+if [ $# -ne 1 ]; then
+	echo usage: $0 repository
+	echo "Repositories:"
+	ls extend/addon
 	exit 1
 fi
 
 cd extend/addon/$1
-git pull
 
+if [ -d .git ] ; then
+	git pull
+fi
+
+cd ../../..
+
+filelist=(`ls extend/addon/$1`)
+
+cd addon
+
+for a in "${filelist[@]}" ; do
+	base=`basename $a`
+	if [ $base = '.git' ]; then
+#		echo 'ignoring git'
+		continue;
+	fi
+	if [ ! -d ../extend/theme/$1/$base ]; then
+#		echo $a 'not a directory'
+		continue;
+	fi
+	if [ -x $base ]; then
+#		echo $base 'file exists'
+		continue;
+	fi
+
+	echo linking $base 
+	ln -s ../extend/theme/$1/$base $base
+done
diff --git a/util/update_theme_repo b/util/update_theme_repo
index 51d2f4175..443b26591 100755
--- a/util/update_theme_repo
+++ b/util/update_theme_repo
@@ -1,10 +1,42 @@
 #!/bin/sh -f
 
-if [ $# -eq '2' ]; then
-	echo usage: $0 nickname
+
+if [ $# -ne 1 ]; then
+	echo usage: $0 repository
+	echo "Repositories:"
+	ls extend/theme
 	exit 1
 fi
 
 cd extend/theme/$1
-git pull
+
+if [ -d .git ] ; then
+	git pull
+fi
+
+cd ../../..
+
+filelist=(`ls extend/theme/$1`)
+
+cd view/theme
+
+for a in "${filelist[@]}" ; do
+	base=`basename $a`
+	if [ $base = '.git' ]; then
+#		echo 'ignoring git'
+		continue;
+	fi
+	if [ ! -d ../../extend/theme/$1/$base ]; then
+#		echo $a 'not a directory'
+		continue;
+	fi
+	if [ -x $base ]; then
+#		echo $base 'file exists'
+		continue;
+	fi
+
+	echo linking $base 
+	ln -s ../../extend/theme/$1/$base $base
+done
+