From ae1f9bf1c44cffa00b8aff566eef0f22bc26e720 Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Fri, 18 Apr 2014 15:31:15 -0700
Subject: move create a new collection below the actual collection list again.
 failed experiment.

---
 util/messages.po | 1739 +++++++++++++++++++++++++++---------------------------
 1 file changed, 870 insertions(+), 869 deletions(-)

(limited to 'util')

diff --git a/util/messages.po b/util/messages.po
index 48989e7af..9ec7d1906 100644
--- a/util/messages.po
+++ b/util/messages.po
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: 2014-04-11.644\n"
+"Project-Id-Version: 2014-04-18.650\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-04-11 00:05-0700\n"
+"POT-Creation-Date: 2014-04-18 00:04-0700\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -22,7 +22,7 @@ msgid "Categories"
 msgstr ""
 
 #: ../../include/widgets.php:115 ../../include/widgets.php:155
-#: ../../include/Contact.php:107 ../../include/identity.php:679
+#: ../../include/Contact.php:107 ../../include/identity.php:675
 #: ../../mod/directory.php:188 ../../mod/match.php:62
 #: ../../mod/dirprofile.php:170 ../../mod/suggest.php:51
 msgid "Connect"
@@ -32,7 +32,7 @@ msgstr ""
 msgid "Ignore/Hide"
 msgstr ""
 
-#: ../../include/widgets.php:123 ../../mod/connections.php:267
+#: ../../include/widgets.php:123 ../../mod/connections.php:265
 msgid "Suggestions"
 msgstr ""
 
@@ -61,8 +61,8 @@ msgstr ""
 msgid "Notes"
 msgstr ""
 
-#: ../../include/widgets.php:173 ../../include/text.php:792
-#: ../../include/text.php:806 ../../mod/filer.php:50 ../../mod/rbmark.php:28
+#: ../../include/widgets.php:173 ../../include/text.php:805
+#: ../../include/text.php:819 ../../mod/filer.php:50 ../../mod/rbmark.php:28
 #: ../../mod/rbmark.php:98
 msgid "Save"
 msgstr ""
@@ -89,121 +89,109 @@ msgstr ""
 msgid "Everything"
 msgstr ""
 
-#: ../../include/widgets.php:319
+#: ../../include/widgets.php:322
 msgid "Archives"
 msgstr ""
 
-#: ../../include/widgets.php:372
+#: ../../include/widgets.php:384
 msgid "Refresh"
 msgstr ""
 
-#: ../../include/widgets.php:373 ../../mod/connedit.php:395
+#: ../../include/widgets.php:385 ../../mod/connedit.php:395
 msgid "Me"
 msgstr ""
 
-#: ../../include/widgets.php:374 ../../mod/connedit.php:397
+#: ../../include/widgets.php:386 ../../mod/connedit.php:397
 msgid "Best Friends"
 msgstr ""
 
-#: ../../include/widgets.php:375 ../../include/identity.php:342
+#: ../../include/widgets.php:387 ../../include/identity.php:342
 #: ../../include/profile_selectors.php:42 ../../mod/connedit.php:398
 msgid "Friends"
 msgstr ""
 
-#: ../../include/widgets.php:376
+#: ../../include/widgets.php:388
 msgid "Co-workers"
 msgstr ""
 
-#: ../../include/widgets.php:377 ../../mod/connedit.php:399
+#: ../../include/widgets.php:389 ../../mod/connedit.php:399
 msgid "Former Friends"
 msgstr ""
 
-#: ../../include/widgets.php:378 ../../mod/connedit.php:400
+#: ../../include/widgets.php:390 ../../mod/connedit.php:400
 msgid "Acquaintances"
 msgstr ""
 
-#: ../../include/widgets.php:379
+#: ../../include/widgets.php:391
 msgid "Everybody"
 msgstr ""
 
-#: ../../include/widgets.php:411
+#: ../../include/widgets.php:423
 msgid "Account settings"
 msgstr ""
 
-#: ../../include/widgets.php:417
+#: ../../include/widgets.php:429
 msgid "Channel settings"
 msgstr ""
 
-#: ../../include/widgets.php:423
+#: ../../include/widgets.php:435
 msgid "Additional features"
 msgstr ""
 
-#: ../../include/widgets.php:429
+#: ../../include/widgets.php:441
 msgid "Feature settings"
 msgstr ""
 
-#: ../../include/widgets.php:435
+#: ../../include/widgets.php:447
 msgid "Display settings"
 msgstr ""
 
-#: ../../include/widgets.php:441
+#: ../../include/widgets.php:453
 msgid "Connected apps"
 msgstr ""
 
-#: ../../include/widgets.php:447
+#: ../../include/widgets.php:459
 msgid "Export channel"
 msgstr ""
 
-#: ../../include/widgets.php:459
+#: ../../include/widgets.php:471
 msgid "Automatic Permissions (Advanced)"
 msgstr ""
 
-#: ../../include/widgets.php:469
+#: ../../include/widgets.php:481
 msgid "Premium Channel Settings"
 msgstr ""
 
-#: ../../include/widgets.php:478 ../../include/features.php:43
+#: ../../include/widgets.php:490 ../../include/features.php:43
 #: ../../mod/sources.php:88
 msgid "Channel Sources"
 msgstr ""
 
-#: ../../include/widgets.php:489 ../../include/nav.php:186
+#: ../../include/widgets.php:501 ../../include/nav.php:186
 #: ../../mod/admin.php:976 ../../mod/admin.php:1181
 msgid "Settings"
 msgstr ""
 
-#: ../../include/widgets.php:506
+#: ../../include/widgets.php:518
 msgid "Check Mail"
 msgstr ""
 
-#: ../../include/widgets.php:511 ../../include/nav.php:177
+#: ../../include/widgets.php:523 ../../include/nav.php:177
 msgid "New Message"
 msgstr ""
 
-#: ../../include/widgets.php:587
+#: ../../include/widgets.php:599
 msgid "Chat Rooms"
 msgstr ""
 
-#: ../../include/widgets.php:605
+#: ../../include/widgets.php:617
 msgid "Bookmarked Chatrooms"
 msgstr ""
 
-#: ../../include/widgets.php:623
+#: ../../include/widgets.php:635
 msgid "Suggested Chatrooms"
 msgstr ""
 
-#: ../../include/acl_selectors.php:235
-msgid "Visible to everybody"
-msgstr ""
-
-#: ../../include/acl_selectors.php:236
-msgid "show"
-msgstr ""
-
-#: ../../include/acl_selectors.php:237
-msgid "don't show"
-msgstr ""
-
 #: ../../include/activities.php:39
 msgid " and "
 msgstr ""
@@ -357,8 +345,8 @@ msgstr ""
 msgid "Addon applications, utilities, games"
 msgstr ""
 
-#: ../../include/nav.php:144 ../../include/text.php:790
-#: ../../include/text.php:804 ../../mod/search.php:29
+#: ../../include/nav.php:144 ../../include/text.php:803
+#: ../../include/text.php:817 ../../mod/search.php:29
 msgid "Search"
 msgstr ""
 
@@ -399,7 +387,7 @@ msgid "Mark all channel notifications seen"
 msgstr ""
 
 #: ../../include/nav.php:165 ../../include/nav.php:188
-#: ../../mod/connections.php:386
+#: ../../mod/connections.php:384
 msgid "Connections"
 msgstr ""
 
@@ -487,659 +475,811 @@ msgstr ""
 msgid "Please wait..."
 msgstr ""
 
-#: ../../include/text.php:320
-msgid "prev"
+#: ../../include/event.php:11 ../../include/bb2diaspora.php:433
+msgid "l F d, Y \\@ g:i A"
 msgstr ""
 
-#: ../../include/text.php:322
-msgid "first"
+#: ../../include/event.php:20 ../../include/bb2diaspora.php:439
+msgid "Starts:"
 msgstr ""
 
-#: ../../include/text.php:351
-msgid "last"
+#: ../../include/event.php:30 ../../include/bb2diaspora.php:447
+msgid "Finishes:"
 msgstr ""
 
-#: ../../include/text.php:354
-msgid "next"
+#: ../../include/event.php:40 ../../include/identity.php:726
+#: ../../include/bb2diaspora.php:455 ../../mod/events.php:465
+#: ../../mod/directory.php:161 ../../mod/dirprofile.php:111
+msgid "Location:"
 msgstr ""
 
-#: ../../include/text.php:366
-msgid "older"
+#: ../../include/api.php:1016
+msgid "Public Timeline"
 msgstr ""
 
-#: ../../include/text.php:368
-msgid "newer"
+#: ../../include/Contact.php:123
+msgid "New window"
 msgstr ""
 
-#: ../../include/text.php:705
-msgid "No connections"
+#: ../../include/Contact.php:124
+msgid "Open the selected location in a different window or browser tab"
 msgstr ""
 
-#: ../../include/text.php:719
-#, php-format
-msgid "%d Connection"
-msgid_plural "%d Connections"
-msgstr[0] ""
-msgstr[1] ""
+#: ../../include/features.php:23
+msgid "General Features"
+msgstr ""
 
-#: ../../include/text.php:731
-msgid "View Connections"
+#: ../../include/features.php:25
+msgid "Content Expiration"
 msgstr ""
 
-#: ../../include/text.php:872
-msgid "poke"
+#: ../../include/features.php:25
+msgid "Remove posts/comments and/or private messages at a future time"
 msgstr ""
 
-#: ../../include/text.php:872 ../../include/conversation.php:240
-msgid "poked"
+#: ../../include/features.php:26
+msgid "Multiple Profiles"
 msgstr ""
 
-#: ../../include/text.php:873
-msgid "ping"
+#: ../../include/features.php:26
+msgid "Ability to create multiple profiles"
 msgstr ""
 
-#: ../../include/text.php:873
-msgid "pinged"
+#: ../../include/features.php:27
+msgid "Web Pages"
 msgstr ""
 
-#: ../../include/text.php:874
-msgid "prod"
+#: ../../include/features.php:27
+msgid "Provide managed web pages on your channel"
 msgstr ""
 
-#: ../../include/text.php:874
-msgid "prodded"
+#: ../../include/features.php:28
+msgid "Private Notes"
 msgstr ""
 
-#: ../../include/text.php:875
-msgid "slap"
+#: ../../include/features.php:28
+msgid "Enables a tool to store notes and reminders"
 msgstr ""
 
-#: ../../include/text.php:875
-msgid "slapped"
+#: ../../include/features.php:33
+msgid "Extended Identity Sharing"
 msgstr ""
 
-#: ../../include/text.php:876
-msgid "finger"
+#: ../../include/features.php:33
+msgid ""
+"Share your identity with all websites on the internet. When disabled, "
+"identity is only shared with sites in the matrix."
 msgstr ""
 
-#: ../../include/text.php:876
-msgid "fingered"
+#: ../../include/features.php:34
+msgid "Expert Mode"
 msgstr ""
 
-#: ../../include/text.php:877
-msgid "rebuff"
+#: ../../include/features.php:34
+msgid "Enable Expert Mode to provide advanced configuration options"
 msgstr ""
 
-#: ../../include/text.php:877
-msgid "rebuffed"
+#: ../../include/features.php:35
+msgid "Premium Channel"
 msgstr ""
 
-#: ../../include/text.php:889
-msgid "happy"
+#: ../../include/features.php:35
+msgid ""
+"Allows you to set restrictions and terms on those that connect with your "
+"channel"
 msgstr ""
 
-#: ../../include/text.php:890
-msgid "sad"
+#: ../../include/features.php:40
+msgid "Post Composition Features"
 msgstr ""
 
-#: ../../include/text.php:891
-msgid "mellow"
+#: ../../include/features.php:41
+msgid "Richtext Editor"
 msgstr ""
 
-#: ../../include/text.php:892
-msgid "tired"
+#: ../../include/features.php:41
+msgid "Enable richtext editor"
 msgstr ""
 
-#: ../../include/text.php:893
-msgid "perky"
+#: ../../include/features.php:42
+msgid "Post Preview"
 msgstr ""
 
-#: ../../include/text.php:894
-msgid "angry"
+#: ../../include/features.php:42
+msgid "Allow previewing posts and comments before publishing them"
 msgstr ""
 
-#: ../../include/text.php:895
-msgid "stupified"
+#: ../../include/features.php:43
+msgid "Automatically import channel content from other channels or feeds"
 msgstr ""
 
-#: ../../include/text.php:896
-msgid "puzzled"
+#: ../../include/features.php:44
+msgid "Even More Encryption"
 msgstr ""
 
-#: ../../include/text.php:897
-msgid "interested"
+#: ../../include/features.php:44
+msgid ""
+"Allow optional encryption of content end-to-end with a shared secret key"
 msgstr ""
 
-#: ../../include/text.php:898
-msgid "bitter"
+#: ../../include/features.php:49
+msgid "Network and Stream Filtering"
 msgstr ""
 
-#: ../../include/text.php:899
-msgid "cheerful"
+#: ../../include/features.php:50
+msgid "Search by Date"
 msgstr ""
 
-#: ../../include/text.php:900
-msgid "alive"
+#: ../../include/features.php:50
+msgid "Ability to select posts by date ranges"
 msgstr ""
 
-#: ../../include/text.php:901
-msgid "annoyed"
+#: ../../include/features.php:51
+msgid "Collections Filter"
 msgstr ""
 
-#: ../../include/text.php:902
-msgid "anxious"
+#: ../../include/features.php:51
+msgid "Enable widget to display Network posts only from selected collections"
 msgstr ""
 
-#: ../../include/text.php:903
-msgid "cranky"
+#: ../../include/features.php:52
+msgid "Save search terms for re-use"
 msgstr ""
 
-#: ../../include/text.php:904
-msgid "disturbed"
+#: ../../include/features.php:53
+msgid "Network Personal Tab"
 msgstr ""
 
-#: ../../include/text.php:905
-msgid "frustrated"
+#: ../../include/features.php:53
+msgid "Enable tab to display only Network posts that you've interacted on"
 msgstr ""
 
-#: ../../include/text.php:906
-msgid "motivated"
+#: ../../include/features.php:54
+msgid "Network New Tab"
 msgstr ""
 
-#: ../../include/text.php:907
-msgid "relaxed"
+#: ../../include/features.php:54
+msgid "Enable tab to display all new Network activity"
 msgstr ""
 
-#: ../../include/text.php:908
-msgid "surprised"
+#: ../../include/features.php:55
+msgid "Affinity Tool"
 msgstr ""
 
-#: ../../include/text.php:1069
-msgid "Monday"
+#: ../../include/features.php:55
+msgid "Filter stream activity by depth of relationships"
 msgstr ""
 
-#: ../../include/text.php:1069
-msgid "Tuesday"
+#: ../../include/features.php:56
+msgid "Suggest Channels"
 msgstr ""
 
-#: ../../include/text.php:1069
-msgid "Wednesday"
+#: ../../include/features.php:56
+msgid "Show channel suggestions"
 msgstr ""
 
-#: ../../include/text.php:1069
-msgid "Thursday"
+#: ../../include/features.php:61
+msgid "Post/Comment Tools"
 msgstr ""
 
-#: ../../include/text.php:1069
-msgid "Friday"
+#: ../../include/features.php:63
+msgid "Edit Sent Posts"
 msgstr ""
 
-#: ../../include/text.php:1069
-msgid "Saturday"
+#: ../../include/features.php:63
+msgid "Edit and correct posts and comments after sending"
 msgstr ""
 
-#: ../../include/text.php:1069
-msgid "Sunday"
+#: ../../include/features.php:64
+msgid "Tagging"
 msgstr ""
 
-#: ../../include/text.php:1073
-msgid "January"
+#: ../../include/features.php:64
+msgid "Ability to tag existing posts"
 msgstr ""
 
-#: ../../include/text.php:1073
-msgid "February"
+#: ../../include/features.php:65
+msgid "Post Categories"
 msgstr ""
 
-#: ../../include/text.php:1073
-msgid "March"
+#: ../../include/features.php:65
+msgid "Add categories to your posts"
 msgstr ""
 
-#: ../../include/text.php:1073
-msgid "April"
+#: ../../include/features.php:66
+msgid "Ability to file posts under folders"
 msgstr ""
 
-#: ../../include/text.php:1073
-msgid "May"
+#: ../../include/features.php:67
+msgid "Dislike Posts"
 msgstr ""
 
-#: ../../include/text.php:1073
-msgid "June"
+#: ../../include/features.php:67
+msgid "Ability to dislike posts/comments"
 msgstr ""
 
-#: ../../include/text.php:1073
-msgid "July"
+#: ../../include/features.php:68
+msgid "Star Posts"
 msgstr ""
 
-#: ../../include/text.php:1073
-msgid "August"
+#: ../../include/features.php:68
+msgid "Ability to mark special posts with a star indicator"
 msgstr ""
 
-#: ../../include/text.php:1073
-msgid "September"
+#: ../../include/features.php:69
+msgid "Tag Cloud"
 msgstr ""
 
-#: ../../include/text.php:1073
-msgid "October"
+#: ../../include/features.php:69
+msgid "Provide a personal tag cloud on your channel page"
 msgstr ""
 
-#: ../../include/text.php:1073
-msgid "November"
+#: ../../include/contact_selectors.php:30
+msgid "Unknown | Not categorised"
 msgstr ""
 
-#: ../../include/text.php:1073
-msgid "December"
+#: ../../include/contact_selectors.php:31
+msgid "Block immediately"
 msgstr ""
 
-#: ../../include/text.php:1151
-msgid "unknown.???"
+#: ../../include/contact_selectors.php:32
+msgid "Shady, spammer, self-marketer"
 msgstr ""
 
-#: ../../include/text.php:1152
-msgid "bytes"
+#: ../../include/contact_selectors.php:33
+msgid "Known to me, but no opinion"
 msgstr ""
 
-#: ../../include/text.php:1187
-msgid "remove category"
+#: ../../include/contact_selectors.php:34
+msgid "OK, probably harmless"
 msgstr ""
 
-#: ../../include/text.php:1236
-msgid "remove from file"
+#: ../../include/contact_selectors.php:35
+msgid "Reputable, has my trust"
 msgstr ""
 
-#: ../../include/text.php:1297 ../../include/text.php:1309
-msgid "Click to open/close"
+#: ../../include/contact_selectors.php:54
+msgid "Frequently"
 msgstr ""
 
-#: ../../include/text.php:1464 ../../mod/events.php:335
-msgid "link to source"
+#: ../../include/contact_selectors.php:55
+msgid "Hourly"
 msgstr ""
 
-#: ../../include/text.php:1483
-msgid "Select a page layout: "
+#: ../../include/contact_selectors.php:56
+msgid "Twice daily"
 msgstr ""
 
-#: ../../include/text.php:1486 ../../include/text.php:1551
-msgid "default"
+#: ../../include/contact_selectors.php:57
+msgid "Daily"
 msgstr ""
 
-#: ../../include/text.php:1522
-msgid "Page content type: "
+#: ../../include/contact_selectors.php:58
+msgid "Weekly"
 msgstr ""
 
-#: ../../include/text.php:1563
-msgid "Select an alternate language"
+#: ../../include/contact_selectors.php:59
+msgid "Monthly"
 msgstr ""
 
-#: ../../include/text.php:1684 ../../include/conversation.php:117
+#: ../../include/contact_selectors.php:74
+msgid "Friendica"
+msgstr ""
+
+#: ../../include/contact_selectors.php:75
+msgid "OStatus"
+msgstr ""
+
+#: ../../include/contact_selectors.php:76
+msgid "RSS/Atom"
+msgstr ""
+
+#: ../../include/contact_selectors.php:77 ../../mod/admin.php:753
+#: ../../mod/admin.php:762 ../../boot.php:1446
+msgid "Email"
+msgstr ""
+
+#: ../../include/contact_selectors.php:78
+msgid "Diaspora"
+msgstr ""
+
+#: ../../include/contact_selectors.php:79
+msgid "Facebook"
+msgstr ""
+
+#: ../../include/contact_selectors.php:80
+msgid "Zot!"
+msgstr ""
+
+#: ../../include/contact_selectors.php:81
+msgid "LinkedIn"
+msgstr ""
+
+#: ../../include/contact_selectors.php:82
+msgid "XMPP/IM"
+msgstr ""
+
+#: ../../include/contact_selectors.php:83
+msgid "MySpace"
+msgstr ""
+
+#: ../../include/conversation.php:117 ../../include/text.php:1697
 #: ../../mod/like.php:111 ../../mod/subthread.php:89 ../../mod/tagger.php:45
 msgid "photo"
 msgstr ""
 
-#: ../../include/text.php:1687 ../../include/conversation.php:120
+#: ../../include/conversation.php:120 ../../include/text.php:1700
 #: ../../mod/tagger.php:49
 msgid "event"
 msgstr ""
 
-#: ../../include/text.php:1690 ../../include/conversation.php:145
+#: ../../include/conversation.php:123
+msgid "channel"
+msgstr ""
+
+#: ../../include/conversation.php:145 ../../include/text.php:1703
 #: ../../mod/like.php:111 ../../mod/subthread.php:89 ../../mod/tagger.php:53
 msgid "status"
 msgstr ""
 
-#: ../../include/text.php:1692 ../../include/conversation.php:147
+#: ../../include/conversation.php:147 ../../include/text.php:1705
 #: ../../mod/tagger.php:55
 msgid "comment"
 msgstr ""
 
-#: ../../include/text.php:1697
-msgid "activity"
+#: ../../include/conversation.php:161 ../../mod/like.php:142
+#, php-format
+msgid "%1$s likes %2$s's %3$s"
 msgstr ""
 
-#: ../../include/text.php:1956
-msgid "Design"
+#: ../../include/conversation.php:164 ../../mod/like.php:144
+#, php-format
+msgid "%1$s doesn't like %2$s's %3$s"
 msgstr ""
 
-#: ../../include/text.php:1958
-msgid "Blocks"
+#: ../../include/conversation.php:201
+#, php-format
+msgid "%1$s is now connected with %2$s"
 msgstr ""
 
-#: ../../include/text.php:1959
-msgid "Menus"
+#: ../../include/conversation.php:236
+#, php-format
+msgid "%1$s poked %2$s"
 msgstr ""
 
-#: ../../include/text.php:1960
-msgid "Layouts"
+#: ../../include/conversation.php:240 ../../include/text.php:885
+msgid "poked"
 msgstr ""
 
-#: ../../include/text.php:1961
-msgid "Pages"
+#: ../../include/conversation.php:258 ../../mod/mood.php:63
+#, php-format
+msgid "%1$s is currently %2$s"
 msgstr ""
 
-#: ../../include/event.php:11 ../../include/bb2diaspora.php:433
-msgid "l F d, Y \\@ g:i A"
+#: ../../include/conversation.php:631 ../../include/ItemObject.php:114
+msgid "Select"
 msgstr ""
 
-#: ../../include/event.php:20 ../../include/bb2diaspora.php:439
-msgid "Starts:"
+#: ../../include/conversation.php:632 ../../include/ItemObject.php:108
+#: ../../mod/thing.php:236 ../../mod/settings.php:578 ../../mod/group.php:176
+#: ../../mod/admin.php:757 ../../mod/admin.php:886 ../../mod/connedit.php:365
+#: ../../mod/filestorage.php:171 ../../mod/photos.php:1043
+msgid "Delete"
 msgstr ""
 
-#: ../../include/event.php:30 ../../include/bb2diaspora.php:447
-msgid "Finishes:"
+#: ../../include/conversation.php:639 ../../include/ItemObject.php:89
+#: ../../mod/photos.php:846
+msgid "Private Message"
 msgstr ""
 
-#: ../../include/event.php:40 ../../include/identity.php:730
-#: ../../include/bb2diaspora.php:455 ../../mod/events.php:465
-#: ../../mod/directory.php:161 ../../mod/dirprofile.php:111
-msgid "Location:"
+#: ../../include/conversation.php:646 ../../include/ItemObject.php:161
+msgid "Message is verified"
 msgstr ""
 
-#: ../../include/api.php:1016
-msgid "Public Timeline"
+#: ../../include/conversation.php:666
+#, php-format
+msgid "View %s's profile @ %s"
 msgstr ""
 
-#: ../../include/Contact.php:123
-msgid "New window"
+#: ../../include/conversation.php:680
+msgid "Categories:"
 msgstr ""
 
-#: ../../include/Contact.php:124
-msgid "Open the selected location in a different window or browser tab"
+#: ../../include/conversation.php:681
+msgid "Filed under:"
 msgstr ""
 
-#: ../../include/features.php:23
-msgid "General Features"
+#: ../../include/conversation.php:690 ../../include/ItemObject.php:226
+#, php-format
+msgid " from %s"
 msgstr ""
 
-#: ../../include/features.php:25
-msgid "Content Expiration"
+#: ../../include/conversation.php:693 ../../include/ItemObject.php:229
+#, php-format
+msgid "last edited: %s"
 msgstr ""
 
-#: ../../include/features.php:25
-msgid "Remove posts/comments and/or private messages at a future time"
+#: ../../include/conversation.php:694 ../../include/ItemObject.php:230
+#, php-format
+msgid "Expires: %s"
 msgstr ""
 
-#: ../../include/features.php:26
-msgid "Multiple Profiles"
+#: ../../include/conversation.php:709
+msgid "View in context"
 msgstr ""
 
-#: ../../include/features.php:26
-msgid "Ability to create multiple profiles"
+#: ../../include/conversation.php:711 ../../include/conversation.php:1127
+#: ../../include/ItemObject.php:259 ../../mod/mail.php:222
+#: ../../mod/mail.php:336 ../../mod/editpost.php:121
+#: ../../mod/editblock.php:120 ../../mod/editlayout.php:115
+#: ../../mod/editwebpage.php:152 ../../mod/photos.php:974
+msgid "Please wait"
 msgstr ""
 
-#: ../../include/features.php:27
-msgid "Web Pages"
+#: ../../include/conversation.php:838
+msgid "remove"
 msgstr ""
 
-#: ../../include/features.php:27
-msgid "Provide managed web pages on your channel"
+#: ../../include/conversation.php:842
+msgid "Loading..."
 msgstr ""
 
-#: ../../include/features.php:28
-msgid "Private Notes"
+#: ../../include/conversation.php:843
+msgid "Delete Selected Items"
 msgstr ""
 
-#: ../../include/features.php:28
-msgid "Enables a tool to store notes and reminders"
+#: ../../include/conversation.php:934
+msgid "View Source"
 msgstr ""
 
-#: ../../include/features.php:33
-msgid "Extended Identity Sharing"
+#: ../../include/conversation.php:935
+msgid "Follow Thread"
 msgstr ""
 
-#: ../../include/features.php:33
-msgid ""
-"Share your identity with all websites on the internet. When disabled, "
-"identity is only shared with sites in the matrix."
+#: ../../include/conversation.php:936
+msgid "View Status"
 msgstr ""
 
-#: ../../include/features.php:34
-msgid "Expert Mode"
+#: ../../include/conversation.php:938
+msgid "View Photos"
 msgstr ""
 
-#: ../../include/features.php:34
-msgid "Enable Expert Mode to provide advanced configuration options"
+#: ../../include/conversation.php:939
+msgid "Matrix Activity"
 msgstr ""
 
-#: ../../include/features.php:35
-msgid "Premium Channel"
+#: ../../include/conversation.php:940
+msgid "Edit Contact"
 msgstr ""
 
-#: ../../include/features.php:35
-msgid ""
-"Allows you to set restrictions and terms on those that connect with your "
-"channel"
+#: ../../include/conversation.php:941
+msgid "Send PM"
 msgstr ""
 
-#: ../../include/features.php:40
-msgid "Post Composition Features"
+#: ../../include/conversation.php:942
+msgid "Poke"
 msgstr ""
 
-#: ../../include/features.php:41
-msgid "Richtext Editor"
+#: ../../include/conversation.php:998
+#, php-format
+msgid "%s likes this."
 msgstr ""
 
-#: ../../include/features.php:41
-msgid "Enable richtext editor"
+#: ../../include/conversation.php:998
+#, php-format
+msgid "%s doesn't like this."
 msgstr ""
 
-#: ../../include/features.php:42
-msgid "Post Preview"
+#: ../../include/conversation.php:1002
+#, 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:1004
+#, 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:1010
+msgid "and"
 msgstr ""
 
-#: ../../include/features.php:42
-msgid "Allow previewing posts and comments before publishing them"
+#: ../../include/conversation.php:1013
+#, php-format
+msgid ", and %d other people"
+msgid_plural ", and %d other people"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../../include/conversation.php:1014
+#, php-format
+msgid "%s like this."
 msgstr ""
 
-#: ../../include/features.php:43
-msgid "Automatically import channel content from other channels or feeds"
+#: ../../include/conversation.php:1014
+#, php-format
+msgid "%s don't like this."
 msgstr ""
 
-#: ../../include/features.php:44
-msgid "Even More Encryption"
+#: ../../include/conversation.php:1071
+msgid "Visible to <strong>everybody</strong>"
 msgstr ""
 
-#: ../../include/features.php:44
-msgid ""
-"Allow optional encryption of content end-to-end with a shared secret key"
+#: ../../include/conversation.php:1072 ../../mod/mail.php:171
+#: ../../mod/mail.php:269
+msgid "Please enter a link URL:"
 msgstr ""
 
-#: ../../include/features.php:49
-msgid "Network and Stream Filtering"
+#: ../../include/conversation.php:1073
+msgid "Please enter a video link/URL:"
 msgstr ""
 
-#: ../../include/features.php:50
-msgid "Search by Date"
+#: ../../include/conversation.php:1074
+msgid "Please enter an audio link/URL:"
 msgstr ""
 
-#: ../../include/features.php:50
-msgid "Ability to select posts by date ranges"
+#: ../../include/conversation.php:1075
+msgid "Tag term:"
 msgstr ""
 
-#: ../../include/features.php:51
-msgid "Collections Filter"
+#: ../../include/conversation.php:1076 ../../mod/filer.php:49
+msgid "Save to Folder:"
 msgstr ""
 
-#: ../../include/features.php:51
-msgid "Enable widget to display Network posts only from selected collections"
+#: ../../include/conversation.php:1077
+msgid "Where are you right now?"
 msgstr ""
 
-#: ../../include/features.php:52
-msgid "Save search terms for re-use"
+#: ../../include/conversation.php:1078 ../../mod/mail.php:172
+#: ../../mod/mail.php:270 ../../mod/editpost.php:52
+msgid "Expires YYYY-MM-DD HH:MM"
+msgstr ""
+
+#: ../../include/conversation.php:1088 ../../include/ItemObject.php:557
+#: ../../mod/webpages.php:123 ../../mod/editpost.php:140
+#: ../../mod/editblock.php:141 ../../mod/editlayout.php:135
+#: ../../mod/editwebpage.php:175 ../../mod/photos.php:994
+msgid "Preview"
+msgstr ""
+
+#: ../../include/conversation.php:1102 ../../mod/layouts.php:113
+#: ../../mod/photos.php:973
+msgid "Share"
+msgstr ""
+
+#: ../../include/conversation.php:1104 ../../mod/editwebpage.php:139
+msgid "Page link title"
+msgstr ""
+
+#: ../../include/conversation.php:1107
+msgid "Post as"
+msgstr ""
+
+#: ../../include/conversation.php:1108 ../../mod/mail.php:219
+#: ../../mod/mail.php:332 ../../mod/editpost.php:113
+#: ../../mod/editblock.php:112 ../../mod/editlayout.php:107
+#: ../../mod/editwebpage.php:144
+msgid "Upload photo"
+msgstr ""
+
+#: ../../include/conversation.php:1109
+msgid "upload photo"
+msgstr ""
+
+#: ../../include/conversation.php:1110 ../../mod/mail.php:220
+#: ../../mod/mail.php:333 ../../mod/editpost.php:114
+#: ../../mod/editblock.php:113 ../../mod/editlayout.php:108
+#: ../../mod/editwebpage.php:145
+msgid "Attach file"
+msgstr ""
+
+#: ../../include/conversation.php:1111
+msgid "attach file"
 msgstr ""
 
-#: ../../include/features.php:53
-msgid "Network Personal Tab"
+#: ../../include/conversation.php:1112 ../../mod/mail.php:221
+#: ../../mod/mail.php:334 ../../mod/editpost.php:115
+#: ../../mod/editblock.php:114 ../../mod/editlayout.php:109
+#: ../../mod/editwebpage.php:146
+msgid "Insert web link"
 msgstr ""
 
-#: ../../include/features.php:53
-msgid "Enable tab to display only Network posts that you've interacted on"
+#: ../../include/conversation.php:1113
+msgid "web link"
 msgstr ""
 
-#: ../../include/features.php:54
-msgid "Network New Tab"
+#: ../../include/conversation.php:1114
+msgid "Insert video link"
 msgstr ""
 
-#: ../../include/features.php:54
-msgid "Enable tab to display all new Network activity"
+#: ../../include/conversation.php:1115
+msgid "video link"
 msgstr ""
 
-#: ../../include/features.php:55
-msgid "Affinity Tool"
+#: ../../include/conversation.php:1116
+msgid "Insert audio link"
 msgstr ""
 
-#: ../../include/features.php:55
-msgid "Filter stream activity by depth of relationships"
+#: ../../include/conversation.php:1117
+msgid "audio link"
 msgstr ""
 
-#: ../../include/features.php:56
-msgid "Suggest Channels"
+#: ../../include/conversation.php:1118 ../../mod/editpost.php:119
+#: ../../mod/editblock.php:118 ../../mod/editlayout.php:113
+#: ../../mod/editwebpage.php:150
+msgid "Set your location"
 msgstr ""
 
-#: ../../include/features.php:56
-msgid "Show channel suggestions"
+#: ../../include/conversation.php:1119
+msgid "set location"
 msgstr ""
 
-#: ../../include/features.php:61
-msgid "Post/Comment Tools"
+#: ../../include/conversation.php:1120 ../../mod/editpost.php:120
+#: ../../mod/editblock.php:119 ../../mod/editlayout.php:114
+#: ../../mod/editwebpage.php:151
+msgid "Clear browser location"
 msgstr ""
 
-#: ../../include/features.php:63
-msgid "Edit Sent Posts"
+#: ../../include/conversation.php:1121
+msgid "clear location"
 msgstr ""
 
-#: ../../include/features.php:63
-msgid "Edit and correct posts and comments after sending"
+#: ../../include/conversation.php:1123 ../../mod/editpost.php:132
+#: ../../mod/editblock.php:132 ../../mod/editlayout.php:126
+#: ../../mod/editwebpage.php:167
+msgid "Set title"
 msgstr ""
 
-#: ../../include/features.php:64
-msgid "Tagging"
+#: ../../include/conversation.php:1126 ../../mod/editpost.php:134
+#: ../../mod/editblock.php:135 ../../mod/editlayout.php:129
+#: ../../mod/editwebpage.php:169
+msgid "Categories (comma-separated list)"
 msgstr ""
 
-#: ../../include/features.php:64
-msgid "Ability to tag existing posts"
+#: ../../include/conversation.php:1128 ../../mod/editpost.php:122
+#: ../../mod/editblock.php:121 ../../mod/editlayout.php:116
+#: ../../mod/editwebpage.php:153
+msgid "Permission settings"
 msgstr ""
 
-#: ../../include/features.php:65
-msgid "Post Categories"
+#: ../../include/conversation.php:1129
+msgid "permissions"
 msgstr ""
 
-#: ../../include/features.php:65
-msgid "Add categories to your posts"
+#: ../../include/conversation.php:1136 ../../mod/editpost.php:129
+#: ../../mod/editblock.php:129 ../../mod/editlayout.php:123
+#: ../../mod/editwebpage.php:162
+msgid "Public post"
 msgstr ""
 
-#: ../../include/features.php:66
-msgid "Ability to file posts under folders"
+#: ../../include/conversation.php:1138 ../../mod/editpost.php:135
+#: ../../mod/editblock.php:136 ../../mod/editlayout.php:130
+#: ../../mod/editwebpage.php:170
+msgid "Example: bob@example.com, mary@example.com"
 msgstr ""
 
-#: ../../include/features.php:67
-msgid "Dislike Posts"
+#: ../../include/conversation.php:1151 ../../mod/mail.php:226
+#: ../../mod/mail.php:339 ../../mod/editpost.php:146
+#: ../../mod/editblock.php:146 ../../mod/editlayout.php:140
+#: ../../mod/editwebpage.php:180
+msgid "Set expiration date"
 msgstr ""
 
-#: ../../include/features.php:67
-msgid "Ability to dislike posts/comments"
+#: ../../include/conversation.php:1153 ../../include/ItemObject.php:560
+#: ../../mod/mail.php:228 ../../mod/mail.php:341 ../../mod/editpost.php:148
+msgid "Encrypt text"
 msgstr ""
 
-#: ../../include/features.php:68
-msgid "Star Posts"
+#: ../../include/conversation.php:1155 ../../mod/editpost.php:150
+msgid "OK"
 msgstr ""
 
-#: ../../include/features.php:68
-msgid "Ability to mark special posts with a star indicator"
+#: ../../include/conversation.php:1156 ../../mod/settings.php:516
+#: ../../mod/settings.php:542 ../../mod/editpost.php:151
+#: ../../mod/tagrm.php:11 ../../mod/tagrm.php:94 ../../mod/fbrowser.php:82
+#: ../../mod/fbrowser.php:117
+msgid "Cancel"
 msgstr ""
 
-#: ../../include/features.php:69
-msgid "Tag Cloud"
+#: ../../include/conversation.php:1395
+msgid "Discover"
 msgstr ""
 
-#: ../../include/features.php:69
-msgid "Provide a personal tag cloud on your channel page"
+#: ../../include/conversation.php:1398
+msgid "Imported public streams"
 msgstr ""
 
-#: ../../include/contact_selectors.php:30
-msgid "Unknown | Not categorised"
+#: ../../include/conversation.php:1403
+msgid "Commented Order"
 msgstr ""
 
-#: ../../include/contact_selectors.php:31
-msgid "Block immediately"
+#: ../../include/conversation.php:1406
+msgid "Sort by Comment Date"
 msgstr ""
 
-#: ../../include/contact_selectors.php:32
-msgid "Shady, spammer, self-marketer"
+#: ../../include/conversation.php:1410
+msgid "Posted Order"
 msgstr ""
 
-#: ../../include/contact_selectors.php:33
-msgid "Known to me, but no opinion"
+#: ../../include/conversation.php:1413
+msgid "Sort by Post Date"
 msgstr ""
 
-#: ../../include/contact_selectors.php:34
-msgid "OK, probably harmless"
+#: ../../include/conversation.php:1418
+msgid "Personal"
 msgstr ""
 
-#: ../../include/contact_selectors.php:35
-msgid "Reputable, has my trust"
+#: ../../include/conversation.php:1421
+msgid "Posts that mention or involve you"
 msgstr ""
 
-#: ../../include/contact_selectors.php:54
-msgid "Frequently"
+#: ../../include/conversation.php:1427 ../../mod/menu.php:61
+#: ../../mod/connections.php:211 ../../mod/connections.php:223
+msgid "New"
 msgstr ""
 
-#: ../../include/contact_selectors.php:55
-msgid "Hourly"
+#: ../../include/conversation.php:1430
+msgid "Activity Stream - by date"
 msgstr ""
 
-#: ../../include/contact_selectors.php:56
-msgid "Twice daily"
+#: ../../include/conversation.php:1436
+msgid "Starred"
 msgstr ""
 
-#: ../../include/contact_selectors.php:57
-msgid "Daily"
+#: ../../include/conversation.php:1439
+msgid "Favourite Posts"
 msgstr ""
 
-#: ../../include/contact_selectors.php:58
-msgid "Weekly"
+#: ../../include/conversation.php:1446
+msgid "Spam"
 msgstr ""
 
-#: ../../include/contact_selectors.php:59
-msgid "Monthly"
+#: ../../include/conversation.php:1449
+msgid "Posts flagged as SPAM"
 msgstr ""
 
-#: ../../include/contact_selectors.php:74
-msgid "Friendica"
+#: ../../include/conversation.php:1483 ../../mod/admin.php:890
+msgid "Channel"
 msgstr ""
 
-#: ../../include/contact_selectors.php:75
-msgid "OStatus"
+#: ../../include/conversation.php:1486
+msgid "Status Messages and Posts"
 msgstr ""
 
-#: ../../include/contact_selectors.php:76
-msgid "RSS/Atom"
+#: ../../include/conversation.php:1495
+msgid "About"
 msgstr ""
 
-#: ../../include/contact_selectors.php:77 ../../mod/admin.php:753
-#: ../../mod/admin.php:762 ../../boot.php:1446
-msgid "Email"
+#: ../../include/conversation.php:1498
+msgid "Profile Details"
 msgstr ""
 
-#: ../../include/contact_selectors.php:78
-msgid "Diaspora"
+#: ../../include/conversation.php:1507 ../../include/photos.php:311
+msgid "Photo Albums"
 msgstr ""
 
-#: ../../include/contact_selectors.php:79
-msgid "Facebook"
+#: ../../include/conversation.php:1516
+msgid "Files and Storage"
 msgstr ""
 
-#: ../../include/contact_selectors.php:80
-msgid "Zot!"
+#: ../../include/conversation.php:1525 ../../include/conversation.php:1528
+msgid "Chatrooms"
 msgstr ""
 
-#: ../../include/contact_selectors.php:81
-msgid "LinkedIn"
+#: ../../include/conversation.php:1538
+msgid "Events and Calendar"
 msgstr ""
 
-#: ../../include/contact_selectors.php:82
-msgid "XMPP/IM"
+#: ../../include/conversation.php:1546
+msgid "Saved Bookmarks"
 msgstr ""
 
-#: ../../include/contact_selectors.php:83
-msgid "MySpace"
+#: ../../include/conversation.php:1557
+msgid "Manage Webpages"
 msgstr ""
 
 #: ../../include/datetime.php:43 ../../include/datetime.php:45
@@ -1443,31 +1583,30 @@ msgstr ""
 #: ../../mod/invite.php:104 ../../mod/mail.php:108 ../../mod/settings.php:492
 #: ../../mod/menu.php:44 ../../mod/webpages.php:40 ../../mod/api.php:26
 #: ../../mod/api.php:31 ../../mod/editpost.php:13 ../../mod/bookmarks.php:46
-#: ../../mod/item.php:179 ../../mod/item.php:187 ../../mod/item.php:860
-#: ../../mod/chat.php:89 ../../mod/chat.php:94
 #: ../../mod/viewconnections.php:22 ../../mod/viewconnections.php:27
-#: ../../mod/delegate.php:6 ../../mod/pdledit.php:21 ../../mod/mitem.php:73
+#: ../../mod/delegate.php:6 ../../mod/pdledit.php:21 ../../mod/item.php:179
+#: ../../mod/item.php:187 ../../mod/item.php:860 ../../mod/mitem.php:73
 #: ../../mod/group.php:9 ../../mod/viewsrc.php:12 ../../mod/setup.php:203
 #: ../../mod/connedit.php:188 ../../mod/layouts.php:27
 #: ../../mod/layouts.php:39 ../../mod/page.php:30 ../../mod/page.php:80
 #: ../../mod/network.php:12 ../../mod/profiles.php:152
 #: ../../mod/profiles.php:453 ../../mod/sources.php:66 ../../mod/blocks.php:29
-#: ../../mod/blocks.php:44 ../../mod/new_channel.php:66
-#: ../../mod/new_channel.php:97 ../../mod/achievements.php:27
-#: ../../mod/editblock.php:34 ../../mod/manage.php:6
-#: ../../mod/editlayout.php:48 ../../mod/profile_photo.php:187
-#: ../../mod/profile_photo.php:200 ../../mod/connections.php:169
-#: ../../mod/notifications.php:66 ../../mod/block.php:22
-#: ../../mod/block.php:72 ../../mod/editwebpage.php:44
-#: ../../mod/editwebpage.php:83 ../../mod/poke.php:128
-#: ../../mod/channel.php:88 ../../mod/channel.php:188
-#: ../../mod/channel.php:231 ../../mod/fsuggest.php:78
-#: ../../mod/filestorage.php:10 ../../mod/filestorage.php:59
-#: ../../mod/filestorage.php:75 ../../mod/filestorage.php:98
-#: ../../mod/suggest.php:26 ../../mod/message.php:16 ../../mod/register.php:68
-#: ../../mod/regmod.php:18 ../../mod/authtest.php:13 ../../mod/photos.php:68
-#: ../../mod/photos.php:526 ../../mod/mood.php:119 ../../index.php:176
-#: ../../index.php:351
+#: ../../mod/blocks.php:44 ../../mod/chat.php:89 ../../mod/chat.php:94
+#: ../../mod/new_channel.php:66 ../../mod/new_channel.php:97
+#: ../../mod/achievements.php:27 ../../mod/editblock.php:34
+#: ../../mod/manage.php:6 ../../mod/editlayout.php:48
+#: ../../mod/profile_photo.php:187 ../../mod/profile_photo.php:200
+#: ../../mod/connections.php:169 ../../mod/notifications.php:66
+#: ../../mod/block.php:22 ../../mod/block.php:72 ../../mod/editwebpage.php:44
+#: ../../mod/editwebpage.php:83 ../../mod/profile.php:64
+#: ../../mod/profile.php:72 ../../mod/poke.php:128 ../../mod/channel.php:89
+#: ../../mod/channel.php:193 ../../mod/channel.php:236
+#: ../../mod/fsuggest.php:78 ../../mod/filestorage.php:10
+#: ../../mod/filestorage.php:59 ../../mod/filestorage.php:75
+#: ../../mod/filestorage.php:98 ../../mod/suggest.php:26
+#: ../../mod/message.php:16 ../../mod/register.php:68 ../../mod/regmod.php:18
+#: ../../mod/authtest.php:13 ../../mod/photos.php:68 ../../mod/photos.php:526
+#: ../../mod/mood.php:119 ../../index.php:176 ../../index.php:351
 msgid "Permission denied."
 msgstr ""
 
@@ -1534,7 +1673,29 @@ msgstr ""
 msgid "%1$s's bookmarks"
 msgstr ""
 
-#: ../../include/identity.php:30 ../../mod/item.php:1166
+#: ../../include/acl_selectors.php:238
+msgid "Visible to everybody"
+msgstr ""
+
+#: ../../include/acl_selectors.php:239
+msgid "Show"
+msgstr ""
+
+#: ../../include/acl_selectors.php:240
+msgid "Don't show"
+msgstr ""
+
+#: ../../include/acl_selectors.php:246 ../../mod/chat.php:206
+#: ../../mod/filestorage.php:124 ../../mod/photos.php:606
+#: ../../mod/photos.php:949
+msgid "Permissions"
+msgstr ""
+
+#: ../../include/acl_selectors.php:247
+msgid "Close"
+msgstr ""
+
+#: ../../include/identity.php:30 ../../mod/item.php:1232
 msgid "Unable to obtain identity information from database"
 msgstr ""
 
@@ -1582,221 +1743,201 @@ msgstr ""
 msgid "Requested profile is not available."
 msgstr ""
 
-#: ../../include/identity.php:616
-msgid " Sorry, you don't have the permission to view this profile. "
-msgstr ""
-
-#: ../../include/identity.php:693 ../../mod/profiles.php:603
+#: ../../include/identity.php:689 ../../mod/profiles.php:603
 msgid "Change profile photo"
 msgstr ""
 
-#: ../../include/identity.php:699
+#: ../../include/identity.php:695
 msgid "Profiles"
 msgstr ""
 
-#: ../../include/identity.php:699
+#: ../../include/identity.php:695
 msgid "Manage/edit profiles"
 msgstr ""
 
-#: ../../include/identity.php:700 ../../mod/profiles.php:604
+#: ../../include/identity.php:696 ../../mod/profiles.php:604
 msgid "Create New Profile"
 msgstr ""
 
-#: ../../include/identity.php:703
+#: ../../include/identity.php:699
 msgid "Edit Profile"
 msgstr ""
 
-#: ../../include/identity.php:714 ../../mod/profiles.php:615
+#: ../../include/identity.php:710 ../../mod/profiles.php:615
 msgid "Profile Image"
 msgstr ""
 
-#: ../../include/identity.php:717 ../../mod/profiles.php:618
+#: ../../include/identity.php:713 ../../mod/profiles.php:618
 msgid "visible to everybody"
 msgstr ""
 
-#: ../../include/identity.php:718 ../../mod/profiles.php:619
+#: ../../include/identity.php:714 ../../mod/profiles.php:619
 msgid "Edit visibility"
 msgstr ""
 
-#: ../../include/identity.php:732 ../../include/identity.php:956
+#: ../../include/identity.php:728 ../../include/identity.php:952
 #: ../../mod/directory.php:163
 msgid "Gender:"
 msgstr ""
 
-#: ../../include/identity.php:733 ../../include/identity.php:976
+#: ../../include/identity.php:729 ../../include/identity.php:972
 #: ../../mod/directory.php:165
 msgid "Status:"
 msgstr ""
 
-#: ../../include/identity.php:734 ../../include/identity.php:987
+#: ../../include/identity.php:730 ../../include/identity.php:983
 #: ../../mod/directory.php:167
 msgid "Homepage:"
 msgstr ""
 
-#: ../../include/identity.php:735 ../../mod/dirprofile.php:157
+#: ../../include/identity.php:731 ../../mod/dirprofile.php:157
 msgid "Online Now"
 msgstr ""
 
-#: ../../include/identity.php:800 ../../include/identity.php:880
+#: ../../include/identity.php:796 ../../include/identity.php:876
 #: ../../mod/ping.php:262
 msgid "g A l F d"
 msgstr ""
 
-#: ../../include/identity.php:801 ../../include/identity.php:881
+#: ../../include/identity.php:797 ../../include/identity.php:877
 msgid "F d"
 msgstr ""
 
-#: ../../include/identity.php:846 ../../include/identity.php:921
+#: ../../include/identity.php:842 ../../include/identity.php:917
 #: ../../mod/ping.php:284
 msgid "[today]"
 msgstr ""
 
-#: ../../include/identity.php:858
+#: ../../include/identity.php:854
 msgid "Birthday Reminders"
 msgstr ""
 
-#: ../../include/identity.php:859
+#: ../../include/identity.php:855
 msgid "Birthdays this week:"
 msgstr ""
 
-#: ../../include/identity.php:914
+#: ../../include/identity.php:910
 msgid "[No description]"
 msgstr ""
 
-#: ../../include/identity.php:932
+#: ../../include/identity.php:928
 msgid "Event Reminders"
 msgstr ""
 
-#: ../../include/identity.php:933
+#: ../../include/identity.php:929
 msgid "Events this week:"
 msgstr ""
 
-#: ../../include/identity.php:946 ../../include/identity.php:1030
+#: ../../include/identity.php:942 ../../include/identity.php:1026
 #: ../../mod/profperm.php:107
 msgid "Profile"
 msgstr ""
 
-#: ../../include/identity.php:954 ../../mod/settings.php:937
+#: ../../include/identity.php:950 ../../mod/settings.php:937
 msgid "Full Name:"
 msgstr ""
 
-#: ../../include/identity.php:961
+#: ../../include/identity.php:957
 msgid "j F, Y"
 msgstr ""
 
-#: ../../include/identity.php:962
+#: ../../include/identity.php:958
 msgid "j F"
 msgstr ""
 
-#: ../../include/identity.php:969
+#: ../../include/identity.php:965
 msgid "Birthday:"
 msgstr ""
 
-#: ../../include/identity.php:973
+#: ../../include/identity.php:969
 msgid "Age:"
 msgstr ""
 
-#: ../../include/identity.php:982
+#: ../../include/identity.php:978
 #, php-format
 msgid "for %1$d %2$s"
 msgstr ""
 
-#: ../../include/identity.php:985 ../../mod/profiles.php:526
+#: ../../include/identity.php:981 ../../mod/profiles.php:526
 msgid "Sexual Preference:"
 msgstr ""
 
-#: ../../include/identity.php:989 ../../mod/profiles.php:528
+#: ../../include/identity.php:985 ../../mod/profiles.php:528
 msgid "Hometown:"
 msgstr ""
 
-#: ../../include/identity.php:991
+#: ../../include/identity.php:987
 msgid "Tags:"
 msgstr ""
 
-#: ../../include/identity.php:993 ../../mod/profiles.php:529
+#: ../../include/identity.php:989 ../../mod/profiles.php:529
 msgid "Political Views:"
 msgstr ""
 
-#: ../../include/identity.php:995
+#: ../../include/identity.php:991
 msgid "Religion:"
 msgstr ""
 
-#: ../../include/identity.php:997 ../../mod/directory.php:169
+#: ../../include/identity.php:993 ../../mod/directory.php:169
 msgid "About:"
 msgstr ""
 
-#: ../../include/identity.php:999
+#: ../../include/identity.php:995
 msgid "Hobbies/Interests:"
 msgstr ""
 
-#: ../../include/identity.php:1001 ../../mod/profiles.php:532
+#: ../../include/identity.php:997 ../../mod/profiles.php:532
 msgid "Likes:"
 msgstr ""
 
-#: ../../include/identity.php:1003 ../../mod/profiles.php:533
+#: ../../include/identity.php:999 ../../mod/profiles.php:533
 msgid "Dislikes:"
 msgstr ""
 
-#: ../../include/identity.php:1006
+#: ../../include/identity.php:1002
 msgid "Contact information and Social Networks:"
 msgstr ""
 
-#: ../../include/identity.php:1008
+#: ../../include/identity.php:1004
 msgid "My other channels:"
 msgstr ""
 
-#: ../../include/identity.php:1010
+#: ../../include/identity.php:1006
 msgid "Musical interests:"
 msgstr ""
 
-#: ../../include/identity.php:1012
+#: ../../include/identity.php:1008
 msgid "Books, literature:"
 msgstr ""
 
-#: ../../include/identity.php:1014
+#: ../../include/identity.php:1010
 msgid "Television:"
 msgstr ""
 
-#: ../../include/identity.php:1016
+#: ../../include/identity.php:1012
 msgid "Film/dance/culture/entertainment:"
 msgstr ""
 
-#: ../../include/identity.php:1018
+#: ../../include/identity.php:1014
 msgid "Love/Romance:"
 msgstr ""
 
-#: ../../include/identity.php:1020
+#: ../../include/identity.php:1016
 msgid "Work/employment:"
 msgstr ""
 
-#: ../../include/identity.php:1022
+#: ../../include/identity.php:1018
 msgid "School/education:"
 msgstr ""
 
-#: ../../include/ItemObject.php:89 ../../include/conversation.php:639
-#: ../../mod/photos.php:846
-msgid "Private Message"
-msgstr ""
-
 #: ../../include/ItemObject.php:96 ../../include/page_widgets.php:8
 #: ../../include/menu.php:42 ../../mod/thing.php:235
 #: ../../mod/settings.php:577 ../../mod/menu.php:59 ../../mod/webpages.php:119
 #: ../../mod/editpost.php:112 ../../mod/layouts.php:112
 #: ../../mod/blocks.php:94 ../../mod/editblock.php:111
-#: ../../mod/editlayout.php:106 ../../mod/connections.php:393
+#: ../../mod/editlayout.php:106 ../../mod/connections.php:391
 #: ../../mod/editwebpage.php:143 ../../mod/filestorage.php:170
-msgid "Edit"
-msgstr ""
-
-#: ../../include/ItemObject.php:108 ../../include/conversation.php:632
-#: ../../mod/thing.php:236 ../../mod/settings.php:578 ../../mod/group.php:176
-#: ../../mod/admin.php:757 ../../mod/admin.php:886 ../../mod/connedit.php:365
-#: ../../mod/filestorage.php:171 ../../mod/photos.php:1043
-msgid "Delete"
-msgstr ""
-
-#: ../../include/ItemObject.php:114 ../../include/conversation.php:631
-msgid "Select"
+msgid "Edit"
 msgstr ""
 
 #: ../../include/ItemObject.php:118
@@ -1819,10 +1960,6 @@ msgstr ""
 msgid "starred"
 msgstr ""
 
-#: ../../include/ItemObject.php:161 ../../include/conversation.php:646
-msgid "Message is verified"
-msgstr ""
-
 #: ../../include/ItemObject.php:169
 msgid "add tag"
 msgstr ""
@@ -1872,33 +2009,10 @@ msgstr ""
 msgid "via Wall-To-Wall:"
 msgstr ""
 
-#: ../../include/ItemObject.php:226 ../../include/conversation.php:690
-#, php-format
-msgid " from %s"
-msgstr ""
-
-#: ../../include/ItemObject.php:229 ../../include/conversation.php:693
-#, php-format
-msgid "last edited: %s"
-msgstr ""
-
-#: ../../include/ItemObject.php:230 ../../include/conversation.php:694
-#, php-format
-msgid "Expires: %s"
-msgstr ""
-
 #: ../../include/ItemObject.php:250
 msgid "Bookmark Links"
 msgstr ""
 
-#: ../../include/ItemObject.php:259 ../../include/conversation.php:711
-#: ../../include/conversation.php:1127 ../../mod/mail.php:222
-#: ../../mod/mail.php:336 ../../mod/editpost.php:121
-#: ../../mod/editblock.php:120 ../../mod/editlayout.php:115
-#: ../../mod/editwebpage.php:152 ../../mod/photos.php:974
-msgid "Please wait"
-msgstr ""
-
 #: ../../include/ItemObject.php:280
 #, php-format
 msgid "%d comment"
@@ -1916,16 +2030,17 @@ msgstr ""
 #: ../../mod/mail.php:223 ../../mod/mail.php:335 ../../mod/settings.php:515
 #: ../../mod/settings.php:627 ../../mod/settings.php:655
 #: ../../mod/settings.php:679 ../../mod/settings.php:751
-#: ../../mod/settings.php:929 ../../mod/chat.php:175 ../../mod/chat.php:207
-#: ../../mod/connect.php:92 ../../mod/pdledit.php:58 ../../mod/group.php:81
-#: ../../mod/admin.php:441 ../../mod/admin.php:750 ../../mod/admin.php:884
-#: ../../mod/admin.php:1017 ../../mod/admin.php:1216 ../../mod/admin.php:1303
-#: ../../mod/setup.php:307 ../../mod/setup.php:350 ../../mod/connedit.php:443
+#: ../../mod/settings.php:929 ../../mod/connect.php:92
+#: ../../mod/pdledit.php:58 ../../mod/group.php:81 ../../mod/admin.php:441
+#: ../../mod/admin.php:750 ../../mod/admin.php:884 ../../mod/admin.php:1017
+#: ../../mod/admin.php:1216 ../../mod/admin.php:1303 ../../mod/setup.php:307
+#: ../../mod/setup.php:350 ../../mod/connedit.php:443
 #: ../../mod/profiles.php:506 ../../mod/sources.php:104
-#: ../../mod/sources.php:138 ../../mod/import.php:387 ../../mod/poke.php:166
-#: ../../mod/fsuggest.php:108 ../../mod/filestorage.php:131
-#: ../../mod/photos.php:565 ../../mod/photos.php:670 ../../mod/photos.php:953
-#: ../../mod/photos.php:993 ../../mod/photos.php:1080 ../../mod/mood.php:142
+#: ../../mod/sources.php:138 ../../mod/chat.php:175 ../../mod/chat.php:208
+#: ../../mod/import.php:387 ../../mod/poke.php:166 ../../mod/fsuggest.php:108
+#: ../../mod/filestorage.php:131 ../../mod/photos.php:565
+#: ../../mod/photos.php:670 ../../mod/photos.php:953 ../../mod/photos.php:993
+#: ../../mod/photos.php:1080 ../../mod/mood.php:142
 #: ../../view/theme/redbasic/php/config.php:95
 #: ../../view/theme/apw/php/config.php:256
 #: ../../view/theme/blogga/view/theme/blog/config.php:67
@@ -1965,18 +2080,6 @@ msgstr ""
 msgid "Video"
 msgstr ""
 
-#: ../../include/ItemObject.php:557 ../../include/conversation.php:1088
-#: ../../mod/webpages.php:123 ../../mod/editpost.php:140
-#: ../../mod/editblock.php:141 ../../mod/editlayout.php:135
-#: ../../mod/editwebpage.php:175 ../../mod/photos.php:994
-msgid "Preview"
-msgstr ""
-
-#: ../../include/ItemObject.php:560 ../../include/conversation.php:1153
-#: ../../mod/mail.php:228 ../../mod/mail.php:341 ../../mod/editpost.php:148
-msgid "Encrypt text"
-msgstr ""
-
 #: ../../include/reddav.php:1069
 msgid "Edit File properties"
 msgstr ""
@@ -1985,404 +2088,307 @@ msgstr ""
 msgid "view full size"
 msgstr ""
 
-#: ../../include/conversation.php:123
-msgid "channel"
-msgstr ""
-
-#: ../../include/conversation.php:161 ../../mod/like.php:142
-#, php-format
-msgid "%1$s likes %2$s's %3$s"
-msgstr ""
-
-#: ../../include/conversation.php:164 ../../mod/like.php:144
-#, php-format
-msgid "%1$s doesn't like %2$s's %3$s"
-msgstr ""
-
-#: ../../include/conversation.php:201
-#, php-format
-msgid "%1$s is now connected with %2$s"
-msgstr ""
-
-#: ../../include/conversation.php:236
-#, php-format
-msgid "%1$s poked %2$s"
-msgstr ""
-
-#: ../../include/conversation.php:258 ../../mod/mood.php:63
-#, php-format
-msgid "%1$s is currently %2$s"
-msgstr ""
-
-#: ../../include/conversation.php:666
-#, php-format
-msgid "View %s's profile @ %s"
-msgstr ""
-
-#: ../../include/conversation.php:680
-msgid "Categories:"
-msgstr ""
-
-#: ../../include/conversation.php:681
-msgid "Filed under:"
-msgstr ""
-
-#: ../../include/conversation.php:709
-msgid "View in context"
+#: ../../include/text.php:320
+msgid "prev"
 msgstr ""
 
-#: ../../include/conversation.php:838
-msgid "remove"
+#: ../../include/text.php:322
+msgid "first"
 msgstr ""
 
-#: ../../include/conversation.php:842
-msgid "Loading..."
+#: ../../include/text.php:351
+msgid "last"
 msgstr ""
 
-#: ../../include/conversation.php:843
-msgid "Delete Selected Items"
+#: ../../include/text.php:354
+msgid "next"
 msgstr ""
 
-#: ../../include/conversation.php:934
-msgid "View Source"
+#: ../../include/text.php:366
+msgid "older"
 msgstr ""
 
-#: ../../include/conversation.php:935
-msgid "Follow Thread"
+#: ../../include/text.php:368
+msgid "newer"
 msgstr ""
 
-#: ../../include/conversation.php:936
-msgid "View Status"
+#: ../../include/text.php:719
+msgid "No connections"
 msgstr ""
 
-#: ../../include/conversation.php:938
-msgid "View Photos"
-msgstr ""
+#: ../../include/text.php:732
+#, php-format
+msgid "%d Connection"
+msgid_plural "%d Connections"
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../../include/conversation.php:939
-msgid "Matrix Activity"
+#: ../../include/text.php:744
+msgid "View Connections"
 msgstr ""
 
-#: ../../include/conversation.php:940
-msgid "Edit Contact"
+#: ../../include/text.php:885
+msgid "poke"
 msgstr ""
 
-#: ../../include/conversation.php:941
-msgid "Send PM"
+#: ../../include/text.php:886
+msgid "ping"
 msgstr ""
 
-#: ../../include/conversation.php:942
-msgid "Poke"
+#: ../../include/text.php:886
+msgid "pinged"
 msgstr ""
 
-#: ../../include/conversation.php:998
-#, php-format
-msgid "%s likes this."
+#: ../../include/text.php:887
+msgid "prod"
 msgstr ""
 
-#: ../../include/conversation.php:998
-#, php-format
-msgid "%s doesn't like this."
+#: ../../include/text.php:887
+msgid "prodded"
 msgstr ""
 
-#: ../../include/conversation.php:1002
-#, 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:1004
-#, 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:1010
-msgid "and"
+#: ../../include/text.php:888
+msgid "slap"
 msgstr ""
 
-#: ../../include/conversation.php:1013
-#, php-format
-msgid ", and %d other people"
-msgid_plural ", and %d other people"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../../include/conversation.php:1014
-#, php-format
-msgid "%s like this."
+#: ../../include/text.php:888
+msgid "slapped"
 msgstr ""
 
-#: ../../include/conversation.php:1014
-#, php-format
-msgid "%s don't like this."
+#: ../../include/text.php:889
+msgid "finger"
 msgstr ""
 
-#: ../../include/conversation.php:1071
-msgid "Visible to <strong>everybody</strong>"
+#: ../../include/text.php:889
+msgid "fingered"
 msgstr ""
 
-#: ../../include/conversation.php:1072 ../../mod/mail.php:171
-#: ../../mod/mail.php:269
-msgid "Please enter a link URL:"
+#: ../../include/text.php:890
+msgid "rebuff"
 msgstr ""
 
-#: ../../include/conversation.php:1073
-msgid "Please enter a video link/URL:"
+#: ../../include/text.php:890
+msgid "rebuffed"
 msgstr ""
 
-#: ../../include/conversation.php:1074
-msgid "Please enter an audio link/URL:"
+#: ../../include/text.php:902
+msgid "happy"
 msgstr ""
 
-#: ../../include/conversation.php:1075
-msgid "Tag term:"
+#: ../../include/text.php:903
+msgid "sad"
 msgstr ""
 
-#: ../../include/conversation.php:1076 ../../mod/filer.php:49
-msgid "Save to Folder:"
+#: ../../include/text.php:904
+msgid "mellow"
 msgstr ""
 
-#: ../../include/conversation.php:1077
-msgid "Where are you right now?"
+#: ../../include/text.php:905
+msgid "tired"
 msgstr ""
 
-#: ../../include/conversation.php:1078 ../../mod/mail.php:172
-#: ../../mod/mail.php:270 ../../mod/editpost.php:52
-msgid "Expires YYYY-MM-DD HH:MM"
+#: ../../include/text.php:906
+msgid "perky"
 msgstr ""
 
-#: ../../include/conversation.php:1102 ../../mod/layouts.php:113
-#: ../../mod/photos.php:973
-msgid "Share"
+#: ../../include/text.php:907
+msgid "angry"
 msgstr ""
 
-#: ../../include/conversation.php:1104 ../../mod/editwebpage.php:139
-msgid "Page link title"
+#: ../../include/text.php:908
+msgid "stupified"
 msgstr ""
 
-#: ../../include/conversation.php:1107
-msgid "Post as"
+#: ../../include/text.php:909
+msgid "puzzled"
 msgstr ""
 
-#: ../../include/conversation.php:1108 ../../mod/mail.php:219
-#: ../../mod/mail.php:332 ../../mod/editpost.php:113
-#: ../../mod/editblock.php:112 ../../mod/editlayout.php:107
-#: ../../mod/editwebpage.php:144
-msgid "Upload photo"
+#: ../../include/text.php:910
+msgid "interested"
 msgstr ""
 
-#: ../../include/conversation.php:1109
-msgid "upload photo"
+#: ../../include/text.php:911
+msgid "bitter"
 msgstr ""
 
-#: ../../include/conversation.php:1110 ../../mod/mail.php:220
-#: ../../mod/mail.php:333 ../../mod/editpost.php:114
-#: ../../mod/editblock.php:113 ../../mod/editlayout.php:108
-#: ../../mod/editwebpage.php:145
-msgid "Attach file"
+#: ../../include/text.php:912
+msgid "cheerful"
 msgstr ""
 
-#: ../../include/conversation.php:1111
-msgid "attach file"
+#: ../../include/text.php:913
+msgid "alive"
 msgstr ""
 
-#: ../../include/conversation.php:1112 ../../mod/mail.php:221
-#: ../../mod/mail.php:334 ../../mod/editpost.php:115
-#: ../../mod/editblock.php:114 ../../mod/editlayout.php:109
-#: ../../mod/editwebpage.php:146
-msgid "Insert web link"
+#: ../../include/text.php:914
+msgid "annoyed"
 msgstr ""
 
-#: ../../include/conversation.php:1113
-msgid "web link"
+#: ../../include/text.php:915
+msgid "anxious"
 msgstr ""
 
-#: ../../include/conversation.php:1114
-msgid "Insert video link"
+#: ../../include/text.php:916
+msgid "cranky"
 msgstr ""
 
-#: ../../include/conversation.php:1115
-msgid "video link"
+#: ../../include/text.php:917
+msgid "disturbed"
 msgstr ""
 
-#: ../../include/conversation.php:1116
-msgid "Insert audio link"
+#: ../../include/text.php:918
+msgid "frustrated"
 msgstr ""
 
-#: ../../include/conversation.php:1117
-msgid "audio link"
+#: ../../include/text.php:919
+msgid "motivated"
 msgstr ""
 
-#: ../../include/conversation.php:1118 ../../mod/editpost.php:119
-#: ../../mod/editblock.php:118 ../../mod/editlayout.php:113
-#: ../../mod/editwebpage.php:150
-msgid "Set your location"
+#: ../../include/text.php:920
+msgid "relaxed"
 msgstr ""
-
-#: ../../include/conversation.php:1119
-msgid "set location"
+
+#: ../../include/text.php:921
+msgid "surprised"
 msgstr ""
 
-#: ../../include/conversation.php:1120 ../../mod/editpost.php:120
-#: ../../mod/editblock.php:119 ../../mod/editlayout.php:114
-#: ../../mod/editwebpage.php:151
-msgid "Clear browser location"
+#: ../../include/text.php:1082
+msgid "Monday"
 msgstr ""
 
-#: ../../include/conversation.php:1121
-msgid "clear location"
+#: ../../include/text.php:1082
+msgid "Tuesday"
 msgstr ""
 
-#: ../../include/conversation.php:1123 ../../mod/editpost.php:132
-#: ../../mod/editblock.php:132 ../../mod/editlayout.php:126
-#: ../../mod/editwebpage.php:167
-msgid "Set title"
+#: ../../include/text.php:1082
+msgid "Wednesday"
 msgstr ""
 
-#: ../../include/conversation.php:1126 ../../mod/editpost.php:134
-#: ../../mod/editblock.php:135 ../../mod/editlayout.php:129
-#: ../../mod/editwebpage.php:169
-msgid "Categories (comma-separated list)"
+#: ../../include/text.php:1082
+msgid "Thursday"
 msgstr ""
 
-#: ../../include/conversation.php:1128 ../../mod/editpost.php:122
-#: ../../mod/editblock.php:121 ../../mod/editlayout.php:116
-#: ../../mod/editwebpage.php:153
-msgid "Permission settings"
+#: ../../include/text.php:1082
+msgid "Friday"
 msgstr ""
 
-#: ../../include/conversation.php:1129
-msgid "permissions"
+#: ../../include/text.php:1082
+msgid "Saturday"
 msgstr ""
 
-#: ../../include/conversation.php:1136 ../../mod/editpost.php:129
-#: ../../mod/editblock.php:129 ../../mod/editlayout.php:123
-#: ../../mod/editwebpage.php:162
-msgid "Public post"
+#: ../../include/text.php:1082
+msgid "Sunday"
 msgstr ""
 
-#: ../../include/conversation.php:1138 ../../mod/editpost.php:135
-#: ../../mod/editblock.php:136 ../../mod/editlayout.php:130
-#: ../../mod/editwebpage.php:170
-msgid "Example: bob@example.com, mary@example.com"
+#: ../../include/text.php:1086
+msgid "January"
 msgstr ""
 
-#: ../../include/conversation.php:1151 ../../mod/mail.php:226
-#: ../../mod/mail.php:339 ../../mod/editpost.php:146
-#: ../../mod/editblock.php:146 ../../mod/editlayout.php:140
-#: ../../mod/editwebpage.php:180
-msgid "Set expiration date"
+#: ../../include/text.php:1086
+msgid "February"
 msgstr ""
 
-#: ../../include/conversation.php:1155 ../../mod/editpost.php:150
-msgid "OK"
+#: ../../include/text.php:1086
+msgid "March"
 msgstr ""
 
-#: ../../include/conversation.php:1156 ../../mod/settings.php:516
-#: ../../mod/settings.php:542 ../../mod/editpost.php:151
-#: ../../mod/tagrm.php:11 ../../mod/tagrm.php:94 ../../mod/fbrowser.php:82
-#: ../../mod/fbrowser.php:117
-msgid "Cancel"
+#: ../../include/text.php:1086
+msgid "April"
 msgstr ""
 
-#: ../../include/conversation.php:1395
-msgid "Discover"
+#: ../../include/text.php:1086
+msgid "May"
 msgstr ""
 
-#: ../../include/conversation.php:1398
-msgid "Imported public streams"
+#: ../../include/text.php:1086
+msgid "June"
 msgstr ""
 
-#: ../../include/conversation.php:1403
-msgid "Commented Order"
+#: ../../include/text.php:1086
+msgid "July"
 msgstr ""
 
-#: ../../include/conversation.php:1406
-msgid "Sort by Comment Date"
+#: ../../include/text.php:1086
+msgid "August"
 msgstr ""
 
-#: ../../include/conversation.php:1410
-msgid "Posted Order"
+#: ../../include/text.php:1086
+msgid "September"
 msgstr ""
 
-#: ../../include/conversation.php:1413
-msgid "Sort by Post Date"
+#: ../../include/text.php:1086
+msgid "October"
 msgstr ""
 
-#: ../../include/conversation.php:1418
-msgid "Personal"
+#: ../../include/text.php:1086
+msgid "November"
 msgstr ""
 
-#: ../../include/conversation.php:1421
-msgid "Posts that mention or involve you"
+#: ../../include/text.php:1086
+msgid "December"
 msgstr ""
 
-#: ../../include/conversation.php:1427 ../../mod/menu.php:61
-#: ../../mod/connections.php:211 ../../mod/connections.php:225
-msgid "New"
+#: ../../include/text.php:1164
+msgid "unknown.???"
 msgstr ""
 
-#: ../../include/conversation.php:1430
-msgid "Activity Stream - by date"
+#: ../../include/text.php:1165
+msgid "bytes"
 msgstr ""
 
-#: ../../include/conversation.php:1436
-msgid "Starred"
+#: ../../include/text.php:1200
+msgid "remove category"
 msgstr ""
 
-#: ../../include/conversation.php:1439
-msgid "Favourite Posts"
+#: ../../include/text.php:1249
+msgid "remove from file"
 msgstr ""
 
-#: ../../include/conversation.php:1446
-msgid "Spam"
+#: ../../include/text.php:1310 ../../include/text.php:1322
+msgid "Click to open/close"
 msgstr ""
 
-#: ../../include/conversation.php:1449
-msgid "Posts flagged as SPAM"
+#: ../../include/text.php:1477 ../../mod/events.php:335
+msgid "link to source"
 msgstr ""
 
-#: ../../include/conversation.php:1483 ../../mod/admin.php:890
-msgid "Channel"
+#: ../../include/text.php:1496
+msgid "Select a page layout: "
 msgstr ""
 
-#: ../../include/conversation.php:1486
-msgid "Status Messages and Posts"
+#: ../../include/text.php:1499 ../../include/text.php:1564
+msgid "default"
 msgstr ""
 
-#: ../../include/conversation.php:1495
-msgid "About"
+#: ../../include/text.php:1535
+msgid "Page content type: "
 msgstr ""
 
-#: ../../include/conversation.php:1498
-msgid "Profile Details"
+#: ../../include/text.php:1576
+msgid "Select an alternate language"
 msgstr ""
 
-#: ../../include/conversation.php:1507 ../../include/photos.php:311
-msgid "Photo Albums"
+#: ../../include/text.php:1710
+msgid "activity"
 msgstr ""
 
-#: ../../include/conversation.php:1516
-msgid "Files and Storage"
+#: ../../include/text.php:1969
+msgid "Design"
 msgstr ""
 
-#: ../../include/conversation.php:1525 ../../include/conversation.php:1528
-msgid "Chatrooms"
+#: ../../include/text.php:1971
+msgid "Blocks"
 msgstr ""
 
-#: ../../include/conversation.php:1538
-msgid "Events and Calendar"
+#: ../../include/text.php:1972
+msgid "Menus"
 msgstr ""
 
-#: ../../include/conversation.php:1546
-msgid "Saved Bookmarks"
+#: ../../include/text.php:1973
+msgid "Layouts"
 msgstr ""
 
-#: ../../include/conversation.php:1557
-msgid "Manage Webpages"
+#: ../../include/text.php:1974
+msgid "Pages"
 msgstr ""
 
 #: ../../include/notify.php:23
@@ -3016,7 +3022,7 @@ msgid "Examples: Robert Morgenstein, Fishing"
 msgstr ""
 
 #: ../../include/contact_widgets.php:26 ../../mod/directory.php:211
-#: ../../mod/directory.php:216 ../../mod/connections.php:392
+#: ../../mod/directory.php:216 ../../mod/connections.php:390
 msgid "Find"
 msgstr ""
 
@@ -3078,25 +3084,25 @@ msgstr ""
 msgid "Item not found."
 msgstr ""
 
-#: ../../include/items.php:3924 ../../mod/group.php:38 ../../mod/group.php:140
+#: ../../include/items.php:3928 ../../mod/group.php:38 ../../mod/group.php:140
 msgid "Collection not found."
 msgstr ""
 
-#: ../../include/items.php:3939
+#: ../../include/items.php:3943
 msgid "Collection is empty."
 msgstr ""
 
-#: ../../include/items.php:3946
+#: ../../include/items.php:3950
 #, php-format
 msgid "Collection: %s"
 msgstr ""
 
-#: ../../include/items.php:3957
+#: ../../include/items.php:3961
 #, php-format
 msgid "Connection: %s"
 msgstr ""
 
-#: ../../include/items.php:3960
+#: ../../include/items.php:3964
 msgid "Connection not found."
 msgstr ""
 
@@ -3128,7 +3134,7 @@ msgstr ""
 msgid "Cannot connect to yourself."
 msgstr ""
 
-#: ../../include/security.php:294
+#: ../../include/security.php:295
 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."
@@ -3234,7 +3240,7 @@ msgstr ""
 msgid "Unable to verify channel signature"
 msgstr ""
 
-#: ../../include/zot.php:776
+#: ../../include/zot.php:790
 #, php-format
 msgid "Unable to verify site signature for %s"
 msgstr ""
@@ -4170,32 +4176,6 @@ msgstr ""
 msgid "My Connections Bookmarks"
 msgstr ""
 
-#: ../../mod/item.php:147
-msgid "Unable to locate original post."
-msgstr ""
-
-#: ../../mod/item.php:345
-msgid "Empty post discarded."
-msgstr ""
-
-#: ../../mod/item.php:385
-msgid "Executable content type not permitted to this channel."
-msgstr ""
-
-#: ../../mod/item.php:794
-msgid "System error. Post not saved."
-msgstr ""
-
-#: ../../mod/item.php:1171
-#, php-format
-msgid "You have reached your limit of %1$.0f top level posts."
-msgstr ""
-
-#: ../../mod/item.php:1177
-#, php-format
-msgid "You have reached your limit of %1$.0f webpages."
-msgstr ""
-
 #: ../../mod/subthread.php:105
 #, php-format
 msgid "%1$s is following %2$s's %3$s"
@@ -4220,41 +4200,8 @@ msgstr ""
 msgid "%1$s tagged %2$s's %3$s with %4$s"
 msgstr ""
 
-#: ../../mod/chat.php:19 ../../mod/channel.php:25
-msgid "You must be logged in to see this page."
-msgstr ""
-
-#: ../../mod/chat.php:166
-msgid "Room not found"
-msgstr ""
-
-#: ../../mod/chat.php:176
-msgid "Leave Room"
-msgstr ""
-
-#: ../../mod/chat.php:177
-msgid "I am away right now"
-msgstr ""
-
-#: ../../mod/chat.php:178
-msgid "I am online"
-msgstr ""
-
-#: ../../mod/chat.php:180
-msgid "Bookmark this room"
-msgstr ""
-
-#: ../../mod/chat.php:204 ../../mod/chat.php:225
-msgid "New Chatroom"
-msgstr ""
-
-#: ../../mod/chat.php:205
-msgid "Chatroom Name"
-msgstr ""
-
-#: ../../mod/chat.php:221
-#, php-format
-msgid "%1$s's Chatrooms"
+#: ../../mod/acl.php:239
+msgid "network"
 msgstr ""
 
 #: ../../mod/viewconnections.php:17 ../../mod/search.php:13
@@ -4263,16 +4210,16 @@ msgstr ""
 msgid "Public access denied."
 msgstr ""
 
-#: ../../mod/viewconnections.php:52
+#: ../../mod/viewconnections.php:50
 msgid "No connections."
 msgstr ""
 
-#: ../../mod/viewconnections.php:64
+#: ../../mod/viewconnections.php:62
 #, php-format
 msgid "Visit %s's profile [%s]"
 msgstr ""
 
-#: ../../mod/viewconnections.php:79
+#: ../../mod/viewconnections.php:77
 msgid "View Connnections"
 msgstr ""
 
@@ -4394,6 +4341,32 @@ msgstr ""
 msgid "Item not available."
 msgstr ""
 
+#: ../../mod/item.php:147
+msgid "Unable to locate original post."
+msgstr ""
+
+#: ../../mod/item.php:345
+msgid "Empty post discarded."
+msgstr ""
+
+#: ../../mod/item.php:385
+msgid "Executable content type not permitted to this channel."
+msgstr ""
+
+#: ../../mod/item.php:794
+msgid "System error. Post not saved."
+msgstr ""
+
+#: ../../mod/item.php:1237
+#, php-format
+msgid "You have reached your limit of %1$.0f top level posts."
+msgstr ""
+
+#: ../../mod/item.php:1243
+#, php-format
+msgid "You have reached your limit of %1$.0f webpages."
+msgstr ""
+
 #: ../../mod/mitem.php:47
 msgid "Menu element updated."
 msgstr ""
@@ -4494,6 +4467,10 @@ msgstr ""
 msgid "Edit Menu Element"
 msgstr ""
 
+#: ../../mod/zfinger.php:23
+msgid "invalid target signature"
+msgstr ""
+
 #: ../../mod/profperm.php:29 ../../mod/profperm.php:58
 msgid "Invalid profile identifier."
 msgstr ""
@@ -4510,7 +4487,7 @@ msgstr ""
 msgid "Visible To"
 msgstr ""
 
-#: ../../mod/profperm.php:134 ../../mod/connections.php:279
+#: ../../mod/profperm.php:134 ../../mod/connections.php:277
 msgid "All Connections"
 msgstr ""
 
@@ -6300,6 +6277,43 @@ msgstr ""
 msgid "Hub not found."
 msgstr ""
 
+#: ../../mod/chat.php:19 ../../mod/channel.php:25
+msgid "You must be logged in to see this page."
+msgstr ""
+
+#: ../../mod/chat.php:166
+msgid "Room not found"
+msgstr ""
+
+#: ../../mod/chat.php:176
+msgid "Leave Room"
+msgstr ""
+
+#: ../../mod/chat.php:177
+msgid "I am away right now"
+msgstr ""
+
+#: ../../mod/chat.php:178
+msgid "I am online"
+msgstr ""
+
+#: ../../mod/chat.php:180
+msgid "Bookmark this room"
+msgstr ""
+
+#: ../../mod/chat.php:204 ../../mod/chat.php:226
+msgid "New Chatroom"
+msgstr ""
+
+#: ../../mod/chat.php:205
+msgid "Chatroom Name"
+msgstr ""
+
+#: ../../mod/chat.php:222
+#, php-format
+msgid "%1$s's Chatrooms"
+msgstr ""
+
 #: ../../mod/siteinfo.php:57
 #, php-format
 msgid "Version %s"
@@ -6614,10 +6628,6 @@ msgstr ""
 msgid "No matches"
 msgstr ""
 
-#: ../../mod/zfinger.php:23
-msgid "invalid target signature"
-msgstr ""
-
 #: ../../mod/chatsvc.php:102
 msgid "Away"
 msgstr ""
@@ -6734,88 +6744,88 @@ msgstr ""
 msgid "Image size reduction [%s] failed."
 msgstr ""
 
-#: ../../mod/connections.php:191 ../../mod/connections.php:292
+#: ../../mod/connections.php:191 ../../mod/connections.php:290
 msgid "Blocked"
 msgstr ""
 
-#: ../../mod/connections.php:196 ../../mod/connections.php:299
+#: ../../mod/connections.php:196 ../../mod/connections.php:297
 msgid "Ignored"
 msgstr ""
 
-#: ../../mod/connections.php:201 ../../mod/connections.php:313
+#: ../../mod/connections.php:201 ../../mod/connections.php:311
 msgid "Hidden"
 msgstr ""
 
-#: ../../mod/connections.php:206 ../../mod/connections.php:306
+#: ../../mod/connections.php:206 ../../mod/connections.php:304
 msgid "Archived"
 msgstr ""
 
-#: ../../mod/connections.php:231 ../../mod/connections.php:245
+#: ../../mod/connections.php:229 ../../mod/connections.php:243
 msgid "All"
 msgstr ""
 
-#: ../../mod/connections.php:240 ../../mod/connections.php:320
+#: ../../mod/connections.php:238 ../../mod/connections.php:318
 msgid "Unconnected"
 msgstr ""
 
-#: ../../mod/connections.php:270
+#: ../../mod/connections.php:268
 msgid "Suggest new connections"
 msgstr ""
 
-#: ../../mod/connections.php:273
+#: ../../mod/connections.php:271
 msgid "New Connections"
 msgstr ""
 
-#: ../../mod/connections.php:276
+#: ../../mod/connections.php:274
 msgid "Show pending (new) connections"
 msgstr ""
 
-#: ../../mod/connections.php:282
+#: ../../mod/connections.php:280
 msgid "Show all connections"
 msgstr ""
 
-#: ../../mod/connections.php:285
+#: ../../mod/connections.php:283
 msgid "Unblocked"
 msgstr ""
 
-#: ../../mod/connections.php:288
+#: ../../mod/connections.php:286
 msgid "Only show unblocked connections"
 msgstr ""
 
-#: ../../mod/connections.php:295
+#: ../../mod/connections.php:293
 msgid "Only show blocked connections"
 msgstr ""
 
-#: ../../mod/connections.php:302
+#: ../../mod/connections.php:300
 msgid "Only show ignored connections"
 msgstr ""
 
-#: ../../mod/connections.php:309
+#: ../../mod/connections.php:307
 msgid "Only show archived connections"
 msgstr ""
 
-#: ../../mod/connections.php:316
+#: ../../mod/connections.php:314
 msgid "Only show hidden connections"
 msgstr ""
 
-#: ../../mod/connections.php:323
+#: ../../mod/connections.php:321
 msgid "Only show one-way connections"
 msgstr ""
 
-#: ../../mod/connections.php:368
+#: ../../mod/connections.php:366
 #, php-format
 msgid "%1$s [%2$s]"
 msgstr ""
 
-#: ../../mod/connections.php:369
+#: ../../mod/connections.php:367
 msgid "Edit contact"
 msgstr ""
 
-#: ../../mod/connections.php:390
+#: ../../mod/connections.php:388
 msgid "Search your connections"
 msgstr ""
 
-#: ../../mod/connections.php:391
+#: ../../mod/connections.php:389
 msgid "Finding: "
 msgstr ""
 
@@ -6855,10 +6865,6 @@ msgstr ""
 msgid "Delete Webpage"
 msgstr ""
 
-#: ../../mod/profile.php:64 ../../mod/profile.php:72
-msgid "Access to this profile has been restricted."
-msgstr ""
-
 #: ../../mod/follow.php:25
 msgid "Channel added."
 msgstr ""
@@ -6887,7 +6893,7 @@ msgstr ""
 msgid "Wall Photos"
 msgstr ""
 
-#: ../../mod/channel.php:85
+#: ../../mod/channel.php:86
 msgid "Insufficient permissions.  Request redirected to profile page."
 msgstr ""
 
@@ -6944,11 +6950,6 @@ msgstr ""
 msgid "Edit file permissions"
 msgstr ""
 
-#: ../../mod/filestorage.php:124 ../../mod/photos.php:606
-#: ../../mod/photos.php:949
-msgid "Permissions"
-msgstr ""
-
 #: ../../mod/filestorage.php:126
 msgid "Include all files and sub folders"
 msgstr ""
-- 
cgit v1.2.3