aboutsummaryrefslogtreecommitdiffstats
path: root/util
diff options
context:
space:
mode:
Diffstat (limited to 'util')
-rw-r--r--util/messages.po2262
-rwxr-xr-xutil/shredder/shredder24
2 files changed, 1157 insertions, 1129 deletions
diff --git a/util/messages.po b/util/messages.po
index 013a2e788..d5a8ca18c 100644
--- a/util/messages.po
+++ b/util/messages.po
@@ -6,9 +6,9 @@
#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: 2014-07-11.733\n"
+"Project-Id-Version: 2014-08-01.754\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-07-11 00:03-0700\n"
+"POT-Creation-Date: 2014-08-01 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"
@@ -29,11 +29,11 @@ msgstr ""
msgid "Profile Photos"
msgstr ""
-#: ../../include/oembed.php:171
+#: ../../include/oembed.php:163
msgid "Embedded content"
msgstr ""
-#: ../../include/oembed.php:180
+#: ../../include/oembed.php:172
msgid "Embedding disabled"
msgstr ""
@@ -46,506 +46,349 @@ msgstr ""
msgid "commented on %s's post"
msgstr ""
-#: ../../include/conversation.php:120 ../../include/text.php:1730
-#: ../../mod/subthread.php:72 ../../mod/subthread.php:174
-#: ../../mod/tagger.php:45 ../../mod/like.php:254
-msgid "photo"
-msgstr ""
-
-#: ../../include/conversation.php:123 ../../include/text.php:1733
-#: ../../mod/tagger.php:49
-msgid "event"
-msgstr ""
-
-#: ../../include/conversation.php:126 ../../mod/like.php:72
-msgid "channel"
-msgstr ""
-
-#: ../../include/conversation.php:148 ../../include/text.php:1736
-#: ../../mod/subthread.php:72 ../../mod/subthread.php:174
-#: ../../mod/tagger.php:53 ../../mod/like.php:254
-msgid "status"
-msgstr ""
-
-#: ../../include/conversation.php:150 ../../include/text.php:1738
-#: ../../mod/tagger.php:55
-msgid "comment"
-msgstr ""
-
-#: ../../include/conversation.php:164 ../../mod/like.php:291
-#, php-format
-msgid "%1$s likes %2$s's %3$s"
-msgstr ""
-
-#: ../../include/conversation.php:167 ../../mod/like.php:293
-#, 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:243 ../../include/text.php:895
-msgid "poked"
-msgstr ""
-
-#: ../../include/conversation.php:261 ../../mod/mood.php:63
-#, php-format
-msgctxt "mood"
-msgid "%1$s is %2$s"
-msgstr ""
-
-#: ../../include/conversation.php:634 ../../include/ItemObject.php:114
-msgid "Select"
-msgstr ""
-
-#: ../../include/conversation.php:635 ../../include/reddav.php:1290
-#: ../../include/apps.php:241 ../../include/ItemObject.php:108
-#: ../../mod/settings.php:578 ../../mod/connedit.php:398
-#: ../../mod/photos.php:1046 ../../mod/group.php:176 ../../mod/admin.php:758
-#: ../../mod/admin.php:888 ../../mod/thing.php:236
-msgid "Delete"
-msgstr ""
-
-#: ../../include/conversation.php:642 ../../include/ItemObject.php:89
-#: ../../mod/photos.php:844
-msgid "Private Message"
+#: ../../include/text.php:321
+msgid "prev"
msgstr ""
-#: ../../include/conversation.php:649 ../../include/ItemObject.php:182
-msgid "Message is verified"
+#: ../../include/text.php:323
+msgid "first"
msgstr ""
-#: ../../include/conversation.php:669
-#, php-format
-msgid "View %s's profile @ %s"
+#: ../../include/text.php:352
+msgid "last"
msgstr ""
-#: ../../include/conversation.php:683
-msgid "Categories:"
+#: ../../include/text.php:355
+msgid "next"
msgstr ""
-#: ../../include/conversation.php:684
-msgid "Filed under:"
+#: ../../include/text.php:367
+msgid "older"
msgstr ""
-#: ../../include/conversation.php:693 ../../include/ItemObject.php:250
-#, php-format
-msgid " from %s"
+#: ../../include/text.php:369
+msgid "newer"
msgstr ""
-#: ../../include/conversation.php:696 ../../include/ItemObject.php:253
-#, php-format
-msgid "last edited: %s"
+#: ../../include/text.php:730
+msgid "No connections"
msgstr ""
-#: ../../include/conversation.php:697 ../../include/ItemObject.php:254
+#: ../../include/text.php:743
#, php-format
-msgid "Expires: %s"
-msgstr ""
-
-#: ../../include/conversation.php:712
-msgid "View in context"
-msgstr ""
-
-#: ../../include/conversation.php:714 ../../include/conversation.php:1130
-#: ../../include/ItemObject.php:294 ../../mod/editblock.php:120
-#: ../../mod/editlayout.php:115 ../../mod/editpost.php:121
-#: ../../mod/editwebpage.php:152 ../../mod/photos.php:977
-#: ../../mod/mail.php:218 ../../mod/mail.php:333
-msgid "Please wait"
-msgstr ""
-
-#: ../../include/conversation.php:841
-msgid "remove"
-msgstr ""
-
-#: ../../include/conversation.php:845
-msgid "Loading..."
-msgstr ""
-
-#: ../../include/conversation.php:846
-msgid "Delete Selected Items"
-msgstr ""
-
-#: ../../include/conversation.php:937
-msgid "View Source"
-msgstr ""
-
-#: ../../include/conversation.php:938
-msgid "Follow Thread"
-msgstr ""
+msgid "%d Connection"
+msgid_plural "%d Connections"
+msgstr[0] ""
+msgstr[1] ""
-#: ../../include/conversation.php:939
-msgid "View Status"
+#: ../../include/text.php:756
+msgid "View Connections"
msgstr ""
-#: ../../include/conversation.php:940 ../../include/nav.php:81
-#: ../../mod/connedit.php:351 ../../mod/connedit.php:465
-msgid "View Profile"
+#: ../../include/text.php:815 ../../include/text.php:829
+#: ../../include/nav.php:156 ../../include/apps.php:142
+#: ../../mod/search.php:30
+msgid "Search"
msgstr ""
-#: ../../include/conversation.php:941
-msgid "View Photos"
+#: ../../include/text.php:817 ../../include/text.php:831
+#: ../../include/widgets.php:186 ../../mod/rbmark.php:28
+#: ../../mod/rbmark.php:98 ../../mod/filer.php:50
+msgid "Save"
msgstr ""
-#: ../../include/conversation.php:942
-msgid "Matrix Activity"
+#: ../../include/text.php:897
+msgid "poke"
msgstr ""
-#: ../../include/conversation.php:943
-msgid "Edit Contact"
+#: ../../include/text.php:897 ../../include/conversation.php:243
+msgid "poked"
msgstr ""
-#: ../../include/conversation.php:944
-msgid "Send PM"
+#: ../../include/text.php:898
+msgid "ping"
msgstr ""
-#: ../../include/conversation.php:945 ../../include/apps.php:140
-msgid "Poke"
+#: ../../include/text.php:898
+msgid "pinged"
msgstr ""
-#: ../../include/conversation.php:1001
-#, php-format
-msgid "%s likes this."
+#: ../../include/text.php:899
+msgid "prod"
msgstr ""
-#: ../../include/conversation.php:1001
-#, php-format
-msgid "%s doesn't like this."
+#: ../../include/text.php:899
+msgid "prodded"
msgstr ""
-#: ../../include/conversation.php:1005
-#, 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:1007
-#, 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:1013
-msgid "and"
+#: ../../include/text.php:900
+msgid "slap"
msgstr ""
-#: ../../include/conversation.php:1016
-#, php-format
-msgid ", and %d other people"
-msgid_plural ", and %d other people"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../../include/conversation.php:1017
-#, php-format
-msgid "%s like this."
+#: ../../include/text.php:900
+msgid "slapped"
msgstr ""
-#: ../../include/conversation.php:1017
-#, php-format
-msgid "%s don't like this."
+#: ../../include/text.php:901
+msgid "finger"
msgstr ""
-#: ../../include/conversation.php:1074
-msgid "Visible to <strong>everybody</strong>"
+#: ../../include/text.php:901
+msgid "fingered"
msgstr ""
-#: ../../include/conversation.php:1075 ../../mod/mail.php:167
-#: ../../mod/mail.php:266
-msgid "Please enter a link URL:"
+#: ../../include/text.php:902
+msgid "rebuff"
msgstr ""
-#: ../../include/conversation.php:1076
-msgid "Please enter a video link/URL:"
+#: ../../include/text.php:902
+msgid "rebuffed"
msgstr ""
-#: ../../include/conversation.php:1077
-msgid "Please enter an audio link/URL:"
+#: ../../include/text.php:911
+msgid "happy"
msgstr ""
-#: ../../include/conversation.php:1078
-msgid "Tag term:"
+#: ../../include/text.php:912
+msgid "sad"
msgstr ""
-#: ../../include/conversation.php:1079 ../../mod/filer.php:49
-msgid "Save to Folder:"
+#: ../../include/text.php:913
+msgid "mellow"
msgstr ""
-#: ../../include/conversation.php:1080
-msgid "Where are you right now?"
+#: ../../include/text.php:914
+msgid "tired"
msgstr ""
-#: ../../include/conversation.php:1081 ../../mod/editpost.php:52
-#: ../../mod/mail.php:168 ../../mod/mail.php:267
-msgid "Expires YYYY-MM-DD HH:MM"
+#: ../../include/text.php:915
+msgid "perky"
msgstr ""
-#: ../../include/conversation.php:1091 ../../include/page_widgets.php:40
-#: ../../include/ItemObject.php:592 ../../mod/editblock.php:141
-#: ../../mod/editlayout.php:135 ../../mod/editpost.php:140
-#: ../../mod/editwebpage.php:174 ../../mod/photos.php:997
-#: ../../mod/webpages.php:124
-msgid "Preview"
+#: ../../include/text.php:916
+msgid "angry"
msgstr ""
-#: ../../include/conversation.php:1105 ../../mod/photos.php:976
-#: ../../mod/layouts.php:113
-msgid "Share"
+#: ../../include/text.php:917
+msgid "stupified"
msgstr ""
-#: ../../include/conversation.php:1107 ../../mod/editwebpage.php:139
-msgid "Page link title"
+#: ../../include/text.php:918
+msgid "puzzled"
msgstr ""
-#: ../../include/conversation.php:1110
-msgid "Post as"
+#: ../../include/text.php:919
+msgid "interested"
msgstr ""
-#: ../../include/conversation.php:1111 ../../mod/editblock.php:112
-#: ../../mod/editlayout.php:107 ../../mod/editpost.php:113
-#: ../../mod/editwebpage.php:144 ../../mod/mail.php:215 ../../mod/mail.php:329
-msgid "Upload photo"
+#: ../../include/text.php:920
+msgid "bitter"
msgstr ""
-#: ../../include/conversation.php:1112
-msgid "upload photo"
+#: ../../include/text.php:921
+msgid "cheerful"
msgstr ""
-#: ../../include/conversation.php:1113 ../../mod/editblock.php:113
-#: ../../mod/editlayout.php:108 ../../mod/editpost.php:114
-#: ../../mod/editwebpage.php:145 ../../mod/mail.php:216 ../../mod/mail.php:330
-msgid "Attach file"
+#: ../../include/text.php:922
+msgid "alive"
msgstr ""
-#: ../../include/conversation.php:1114
-msgid "attach file"
+#: ../../include/text.php:923
+msgid "annoyed"
msgstr ""
-#: ../../include/conversation.php:1115 ../../mod/editblock.php:114
-#: ../../mod/editlayout.php:109 ../../mod/editpost.php:115
-#: ../../mod/editwebpage.php:146 ../../mod/mail.php:217 ../../mod/mail.php:331
-msgid "Insert web link"
+#: ../../include/text.php:924
+msgid "anxious"
msgstr ""
-#: ../../include/conversation.php:1116
-msgid "web link"
+#: ../../include/text.php:925
+msgid "cranky"
msgstr ""
-#: ../../include/conversation.php:1117
-msgid "Insert video link"
+#: ../../include/text.php:926
+msgid "disturbed"
msgstr ""
-#: ../../include/conversation.php:1118
-msgid "video link"
+#: ../../include/text.php:927
+msgid "frustrated"
msgstr ""
-#: ../../include/conversation.php:1119
-msgid "Insert audio link"
+#: ../../include/text.php:928
+msgid "depressed"
msgstr ""
-#: ../../include/conversation.php:1120
-msgid "audio link"
+#: ../../include/text.php:929
+msgid "motivated"
msgstr ""
-#: ../../include/conversation.php:1121 ../../mod/editblock.php:118
-#: ../../mod/editlayout.php:113 ../../mod/editpost.php:119
-#: ../../mod/editwebpage.php:150
-msgid "Set your location"
+#: ../../include/text.php:930
+msgid "relaxed"
msgstr ""
-#: ../../include/conversation.php:1122
-msgid "set location"
+#: ../../include/text.php:931
+msgid "surprised"
msgstr ""
-#: ../../include/conversation.php:1123 ../../mod/editblock.php:119
-#: ../../mod/editlayout.php:114 ../../mod/editpost.php:120
-#: ../../mod/editwebpage.php:151
-msgid "Clear browser location"
+#: ../../include/text.php:1092
+msgid "Monday"
msgstr ""
-#: ../../include/conversation.php:1124
-msgid "clear location"
+#: ../../include/text.php:1092
+msgid "Tuesday"
msgstr ""
-#: ../../include/conversation.php:1126 ../../mod/editblock.php:132
-#: ../../mod/editlayout.php:126 ../../mod/editpost.php:132
-#: ../../mod/editwebpage.php:167
-msgid "Set title"
+#: ../../include/text.php:1092
+msgid "Wednesday"
msgstr ""
-#: ../../include/conversation.php:1129 ../../mod/editblock.php:135
-#: ../../mod/editlayout.php:129 ../../mod/editpost.php:134
-#: ../../mod/editwebpage.php:169
-msgid "Categories (comma-separated list)"
+#: ../../include/text.php:1092
+msgid "Thursday"
msgstr ""
-#: ../../include/conversation.php:1131 ../../mod/editblock.php:121
-#: ../../mod/editlayout.php:116 ../../mod/editpost.php:122
-#: ../../mod/editwebpage.php:153
-msgid "Permission settings"
+#: ../../include/text.php:1092
+msgid "Friday"
msgstr ""
-#: ../../include/conversation.php:1132
-msgid "permissions"
+#: ../../include/text.php:1092
+msgid "Saturday"
msgstr ""
-#: ../../include/conversation.php:1139 ../../mod/editblock.php:129
-#: ../../mod/editlayout.php:123 ../../mod/editpost.php:129
-#: ../../mod/editwebpage.php:162
-msgid "Public post"
+#: ../../include/text.php:1092
+msgid "Sunday"
msgstr ""
-#: ../../include/conversation.php:1141 ../../mod/editblock.php:136
-#: ../../mod/editlayout.php:130 ../../mod/editpost.php:135
-#: ../../mod/editwebpage.php:170
-msgid "Example: bob@example.com, mary@example.com"
+#: ../../include/text.php:1096
+msgid "January"
msgstr ""
-#: ../../include/conversation.php:1154 ../../mod/editblock.php:146
-#: ../../mod/editlayout.php:140 ../../mod/editpost.php:146
-#: ../../mod/editwebpage.php:179 ../../mod/mail.php:222 ../../mod/mail.php:336
-msgid "Set expiration date"
+#: ../../include/text.php:1096
+msgid "February"
msgstr ""
-#: ../../include/conversation.php:1156 ../../include/ItemObject.php:595
-#: ../../mod/editpost.php:148 ../../mod/mail.php:224 ../../mod/mail.php:338
-msgid "Encrypt text"
+#: ../../include/text.php:1096
+msgid "March"
msgstr ""
-#: ../../include/conversation.php:1158 ../../mod/editpost.php:150
-msgid "OK"
+#: ../../include/text.php:1096
+msgid "April"
msgstr ""
-#: ../../include/conversation.php:1159 ../../mod/settings.php:516
-#: ../../mod/settings.php:542 ../../mod/editpost.php:151
-#: ../../mod/fbrowser.php:82 ../../mod/fbrowser.php:117 ../../mod/tagrm.php:11
-#: ../../mod/tagrm.php:94
-msgid "Cancel"
+#: ../../include/text.php:1096
+msgid "May"
msgstr ""
-#: ../../include/conversation.php:1401
-msgid "Discover"
+#: ../../include/text.php:1096
+msgid "June"
msgstr ""
-#: ../../include/conversation.php:1404
-msgid "Imported public streams"
+#: ../../include/text.php:1096
+msgid "July"
msgstr ""
-#: ../../include/conversation.php:1409
-msgid "Commented Order"
+#: ../../include/text.php:1096
+msgid "August"
msgstr ""
-#: ../../include/conversation.php:1412
-msgid "Sort by Comment Date"
+#: ../../include/text.php:1096
+msgid "September"
msgstr ""
-#: ../../include/conversation.php:1416
-msgid "Posted Order"
+#: ../../include/text.php:1096
+msgid "October"
msgstr ""
-#: ../../include/conversation.php:1419
-msgid "Sort by Post Date"
+#: ../../include/text.php:1096
+msgid "November"
msgstr ""
-#: ../../include/conversation.php:1424 ../../include/widgets.php:82
-msgid "Personal"
+#: ../../include/text.php:1096
+msgid "December"
msgstr ""
-#: ../../include/conversation.php:1427
-msgid "Posts that mention or involve you"
+#: ../../include/text.php:1174
+msgid "unknown.???"
msgstr ""
-#: ../../include/conversation.php:1433 ../../mod/connections.php:211
-#: ../../mod/connections.php:224 ../../mod/menu.php:61
-msgid "New"
+#: ../../include/text.php:1175
+msgid "bytes"
msgstr ""
-#: ../../include/conversation.php:1436
-msgid "Activity Stream - by date"
+#: ../../include/text.php:1210
+msgid "remove category"
msgstr ""
-#: ../../include/conversation.php:1442
-msgid "Starred"
+#: ../../include/text.php:1280
+msgid "remove from file"
msgstr ""
-#: ../../include/conversation.php:1445
-msgid "Favourite Posts"
+#: ../../include/text.php:1345 ../../include/text.php:1357
+msgid "Click to open/close"
msgstr ""
-#: ../../include/conversation.php:1452
-msgid "Spam"
+#: ../../include/text.php:1512 ../../mod/events.php:374
+msgid "Link to Source"
msgstr ""
-#: ../../include/conversation.php:1455
-msgid "Posts flagged as SPAM"
+#: ../../include/text.php:1531
+msgid "Select a page layout: "
msgstr ""
-#: ../../include/conversation.php:1488 ../../mod/admin.php:892
-msgid "Channel"
+#: ../../include/text.php:1534 ../../include/text.php:1599
+msgid "default"
msgstr ""
-#: ../../include/conversation.php:1491
-msgid "Status Messages and Posts"
+#: ../../include/text.php:1570
+msgid "Page content type: "
msgstr ""
-#: ../../include/conversation.php:1500
-msgid "About"
+#: ../../include/text.php:1611
+msgid "Select an alternate language"
msgstr ""
-#: ../../include/conversation.php:1503
-msgid "Profile Details"
+#: ../../include/text.php:1732 ../../include/conversation.php:120
+#: ../../mod/subthread.php:72 ../../mod/subthread.php:174
+#: ../../mod/tagger.php:45 ../../mod/like.php:294
+msgid "photo"
msgstr ""
-#: ../../include/conversation.php:1509 ../../include/nav.php:84
-#: ../../include/apps.php:134 ../../mod/fbrowser.php:25
-msgid "Photos"
+#: ../../include/text.php:1735 ../../include/conversation.php:123
+#: ../../mod/tagger.php:49
+msgid "event"
msgstr ""
-#: ../../include/conversation.php:1512 ../../include/photos.php:313
-msgid "Photo Albums"
+#: ../../include/text.php:1738 ../../include/conversation.php:148
+#: ../../mod/subthread.php:72 ../../mod/subthread.php:174
+#: ../../mod/tagger.php:53 ../../mod/like.php:294
+msgid "status"
msgstr ""
-#: ../../include/conversation.php:1518 ../../include/nav.php:85
-#: ../../include/reddav.php:1280 ../../include/apps.php:130
-#: ../../mod/fbrowser.php:114
-msgid "Files"
+#: ../../include/text.php:1740 ../../include/conversation.php:150
+#: ../../mod/tagger.php:55
+msgid "comment"
msgstr ""
-#: ../../include/conversation.php:1521
-msgid "Files and Storage"
+#: ../../include/text.php:1745
+msgid "activity"
msgstr ""
-#: ../../include/conversation.php:1530 ../../include/conversation.php:1533
-msgid "Chatrooms"
+#: ../../include/text.php:2004
+msgid "Design"
msgstr ""
-#: ../../include/conversation.php:1540 ../../include/nav.php:93
-#: ../../include/apps.php:124
-msgid "Bookmarks"
+#: ../../include/text.php:2006
+msgid "Blocks"
msgstr ""
-#: ../../include/conversation.php:1543
-msgid "Saved Bookmarks"
+#: ../../include/text.php:2007
+msgid "Menus"
msgstr ""
-#: ../../include/conversation.php:1551 ../../include/nav.php:95
-#: ../../include/apps.php:131 ../../mod/webpages.php:79
-msgid "Webpages"
+#: ../../include/text.php:2008
+msgid "Layouts"
msgstr ""
-#: ../../include/conversation.php:1554
-msgid "Manage Webpages"
+#: ../../include/text.php:2009
+msgid "Pages"
msgstr ""
#: ../../include/page_widgets.php:6
@@ -555,7 +398,7 @@ msgstr ""
#: ../../include/page_widgets.php:8 ../../include/page_widgets.php:36
#: ../../include/reddav.php:1289 ../../include/apps.php:240
#: ../../include/menu.php:42 ../../include/ItemObject.php:96
-#: ../../mod/settings.php:577 ../../mod/blocks.php:94
+#: ../../mod/settings.php:578 ../../mod/blocks.php:94
#: ../../mod/connections.php:393 ../../mod/editblock.php:111
#: ../../mod/editlayout.php:106 ../../mod/editpost.php:112
#: ../../mod/editwebpage.php:143 ../../mod/thing.php:235
@@ -568,6 +411,14 @@ msgstr ""
msgid "View"
msgstr ""
+#: ../../include/page_widgets.php:40 ../../include/conversation.php:1091
+#: ../../include/ItemObject.php:592 ../../mod/editblock.php:141
+#: ../../mod/editlayout.php:135 ../../mod/editpost.php:140
+#: ../../mod/editwebpage.php:174 ../../mod/photos.php:997
+#: ../../mod/webpages.php:124
+msgid "Preview"
+msgstr ""
+
#: ../../include/page_widgets.php:41 ../../mod/webpages.php:125
msgid "Actions"
msgstr ""
@@ -664,9 +515,9 @@ msgstr ""
#: ../../include/attach.php:243 ../../include/attach.php:283
#: ../../include/attach.php:297 ../../include/attach.php:322
#: ../../include/attach.php:513 ../../include/attach.php:585
-#: ../../include/chat.php:116 ../../include/items.php:3676
+#: ../../include/chat.php:116 ../../include/items.php:3664
#: ../../mod/mood.php:112 ../../mod/mitem.php:73 ../../mod/achievements.php:27
-#: ../../mod/settings.php:492 ../../mod/poke.php:128 ../../mod/api.php:26
+#: ../../mod/settings.php:493 ../../mod/poke.php:128 ../../mod/api.php:26
#: ../../mod/api.php:31 ../../mod/authtest.php:13 ../../mod/profile.php:64
#: ../../mod/profile.php:72 ../../mod/block.php:22 ../../mod/block.php:72
#: ../../mod/profile_photo.php:263 ../../mod/profile_photo.php:276
@@ -676,7 +527,7 @@ msgstr ""
#: ../../mod/channel.php:236 ../../mod/chat.php:90 ../../mod/chat.php:95
#: ../../mod/register.php:71 ../../mod/regmod.php:18 ../../mod/common.php:35
#: ../../mod/network.php:12 ../../mod/connections.php:169
-#: ../../mod/connedit.php:221 ../../mod/delegate.php:6 ../../mod/page.php:30
+#: ../../mod/connedit.php:254 ../../mod/delegate.php:6 ../../mod/page.php:30
#: ../../mod/page.php:80 ../../mod/setup.php:203 ../../mod/editblock.php:34
#: ../../mod/pdledit.php:21 ../../mod/editlayout.php:48
#: ../../mod/editpost.php:13 ../../mod/editwebpage.php:44
@@ -688,10 +539,10 @@ msgstr ""
#: ../../mod/thing.php:249 ../../mod/thing.php:266 ../../mod/thing.php:301
#: ../../mod/invite.php:13 ../../mod/invite.php:104 ../../mod/item.php:179
#: ../../mod/item.php:187 ../../mod/item.php:908 ../../mod/layouts.php:27
-#: ../../mod/layouts.php:39 ../../mod/viewconnections.php:22
-#: ../../mod/viewconnections.php:27 ../../mod/viewsrc.php:12
-#: ../../mod/mail.php:108 ../../mod/manage.php:6 ../../mod/menu.php:44
-#: ../../mod/webpages.php:40 ../../mod/message.php:16
+#: ../../mod/layouts.php:39 ../../mod/like.php:154
+#: ../../mod/viewconnections.php:22 ../../mod/viewconnections.php:27
+#: ../../mod/viewsrc.php:12 ../../mod/mail.php:108 ../../mod/manage.php:6
+#: ../../mod/menu.php:44 ../../mod/webpages.php:40 ../../mod/message.php:16
#: ../../mod/new_channel.php:66 ../../mod/new_channel.php:97
#: ../../mod/notifications.php:66 ../../mod/appman.php:66 ../../index.php:186
#: ../../index.php:361
@@ -715,6 +566,10 @@ msgstr ""
msgid "Photo storage failed."
msgstr ""
+#: ../../include/photos.php:313 ../../include/conversation.php:1515
+msgid "Photo Albums"
+msgstr ""
+
#: ../../include/photos.php:317 ../../mod/photos.php:691
#: ../../mod/photos.php:1193
msgid "Upload New Photos"
@@ -827,302 +682,310 @@ msgstr ""
msgid "database storage failed."
msgstr ""
-#: ../../include/plugin.php:502 ../../include/plugin.php:504
+#: ../../include/plugin.php:504 ../../include/plugin.php:506
msgid "Click here to upgrade."
msgstr ""
-#: ../../include/plugin.php:510
+#: ../../include/plugin.php:512
msgid "This action exceeds the limits set by your subscription plan."
msgstr ""
-#: ../../include/plugin.php:515
+#: ../../include/plugin.php:517
msgid "This action is not available under your subscription plan."
msgstr ""
-#: ../../include/bb2diaspora.php:446 ../../include/event.php:11
+#: ../../include/bb2diaspora.php:463 ../../include/event.php:11
msgid "l F d, Y \\@ g:i A"
msgstr ""
-#: ../../include/bb2diaspora.php:452 ../../include/event.php:20
+#: ../../include/bb2diaspora.php:469 ../../include/event.php:20
msgid "Starts:"
msgstr ""
-#: ../../include/bb2diaspora.php:460 ../../include/event.php:30
+#: ../../include/bb2diaspora.php:477 ../../include/event.php:30
msgid "Finishes:"
msgstr ""
-#: ../../include/bb2diaspora.php:468 ../../include/event.php:40
+#: ../../include/bb2diaspora.php:485 ../../include/event.php:40
#: ../../include/identity.php:726 ../../mod/directory.php:156
#: ../../mod/dirprofile.php:105 ../../mod/events.php:504
msgid "Location:"
msgstr ""
-#: ../../include/nav.php:77 ../../include/nav.php:101 ../../boot.php:1468
+#: ../../include/nav.php:81 ../../include/nav.php:108 ../../boot.php:1492
msgid "Logout"
msgstr ""
-#: ../../include/nav.php:77 ../../include/nav.php:101
+#: ../../include/nav.php:81 ../../include/nav.php:108
msgid "End this session"
msgstr ""
-#: ../../include/nav.php:80 ../../include/nav.php:135
+#: ../../include/nav.php:84 ../../include/nav.php:142
msgid "Home"
msgstr ""
-#: ../../include/nav.php:80
+#: ../../include/nav.php:84
msgid "Your posts and conversations"
msgstr ""
-#: ../../include/nav.php:81
+#: ../../include/nav.php:85 ../../include/conversation.php:940
+#: ../../mod/connedit.php:384 ../../mod/connedit.php:498
+msgid "View Profile"
+msgstr ""
+
+#: ../../include/nav.php:85
msgid "Your profile page"
msgstr ""
-#: ../../include/nav.php:83
+#: ../../include/nav.php:87
msgid "Edit Profiles"
msgstr ""
-#: ../../include/nav.php:83
+#: ../../include/nav.php:87
msgid "Manage/Edit profiles"
msgstr ""
-#: ../../include/nav.php:84
+#: ../../include/nav.php:89 ../../include/identity.php:699
+msgid "Edit Profile"
+msgstr ""
+
+#: ../../include/nav.php:89
+msgid "Edit your profile"
+msgstr ""
+
+#: ../../include/nav.php:91 ../../include/conversation.php:1512
+#: ../../include/apps.php:134 ../../mod/fbrowser.php:25
+msgid "Photos"
+msgstr ""
+
+#: ../../include/nav.php:91
msgid "Your photos"
msgstr ""
-#: ../../include/nav.php:85
+#: ../../include/nav.php:92 ../../include/reddav.php:1280
+#: ../../include/conversation.php:1521 ../../include/apps.php:130
+#: ../../mod/fbrowser.php:114
+msgid "Files"
+msgstr ""
+
+#: ../../include/nav.php:92
msgid "Your files"
msgstr ""
-#: ../../include/nav.php:90 ../../include/apps.php:141
+#: ../../include/nav.php:97 ../../include/apps.php:141
msgid "Chat"
msgstr ""
-#: ../../include/nav.php:90
+#: ../../include/nav.php:97
msgid "Your chatrooms"
msgstr ""
-#: ../../include/nav.php:93
+#: ../../include/nav.php:100 ../../include/conversation.php:1543
+#: ../../include/apps.php:124
+msgid "Bookmarks"
+msgstr ""
+
+#: ../../include/nav.php:100
msgid "Your bookmarks"
msgstr ""
-#: ../../include/nav.php:95
+#: ../../include/nav.php:102 ../../include/conversation.php:1554
+#: ../../include/apps.php:131 ../../mod/webpages.php:79
+msgid "Webpages"
+msgstr ""
+
+#: ../../include/nav.php:102
msgid "Your webpages"
msgstr ""
-#: ../../include/nav.php:99 ../../include/apps.php:126 ../../boot.php:1469
+#: ../../include/nav.php:106 ../../include/apps.php:126 ../../boot.php:1493
msgid "Login"
msgstr ""
-#: ../../include/nav.php:99
+#: ../../include/nav.php:106
msgid "Sign in"
msgstr ""
-#: ../../include/nav.php:116
+#: ../../include/nav.php:123
#, php-format
msgid "%s - click to logout"
msgstr ""
-#: ../../include/nav.php:121
+#: ../../include/nav.php:128
msgid "Click to authenticate to your home hub"
msgstr ""
-#: ../../include/nav.php:135
+#: ../../include/nav.php:142
msgid "Home Page"
msgstr ""
-#: ../../include/nav.php:139 ../../mod/register.php:221 ../../boot.php:1445
+#: ../../include/nav.php:146 ../../mod/register.php:221 ../../boot.php:1469
msgid "Register"
msgstr ""
-#: ../../include/nav.php:139
+#: ../../include/nav.php:146
msgid "Create an account"
msgstr ""
-#: ../../include/nav.php:144 ../../include/apps.php:137 ../../mod/help.php:60
+#: ../../include/nav.php:151 ../../include/apps.php:137 ../../mod/help.php:60
#: ../../mod/help.php:65
msgid "Help"
msgstr ""
-#: ../../include/nav.php:144
+#: ../../include/nav.php:151
msgid "Help and documentation"
msgstr ""
-#: ../../include/nav.php:147 ../../include/widgets.php:79
+#: ../../include/nav.php:154 ../../include/widgets.php:79
#: ../../mod/apps.php:33
msgid "Apps"
msgstr ""
-#: ../../include/nav.php:147
+#: ../../include/nav.php:154
msgid "Applications, utilities, links, games"
msgstr ""
-#: ../../include/nav.php:149 ../../include/text.php:813
-#: ../../include/text.php:827 ../../include/apps.php:142
-#: ../../mod/search.php:29
-msgid "Search"
-msgstr ""
-
-#: ../../include/nav.php:149
+#: ../../include/nav.php:156
msgid "Search site content"
msgstr ""
-#: ../../include/nav.php:152 ../../include/apps.php:136
-#: ../../mod/directory.php:210
+#: ../../include/nav.php:159 ../../include/apps.php:136
+#: ../../mod/directory.php:218
msgid "Directory"
msgstr ""
-#: ../../include/nav.php:152
+#: ../../include/nav.php:159
msgid "Channel Locator"
msgstr ""
-#: ../../include/nav.php:163 ../../include/apps.php:128
+#: ../../include/nav.php:170 ../../include/apps.php:128
msgid "Matrix"
msgstr ""
-#: ../../include/nav.php:163
+#: ../../include/nav.php:170
msgid "Your matrix"
msgstr ""
-#: ../../include/nav.php:164
+#: ../../include/nav.php:171
msgid "Mark all matrix notifications seen"
msgstr ""
-#: ../../include/nav.php:166 ../../include/apps.php:132
+#: ../../include/nav.php:173 ../../include/apps.php:132
msgid "Channel Home"
msgstr ""
-#: ../../include/nav.php:166
+#: ../../include/nav.php:173
msgid "Channel home"
msgstr ""
-#: ../../include/nav.php:167
+#: ../../include/nav.php:174
msgid "Mark all channel notifications seen"
msgstr ""
-#: ../../include/nav.php:170 ../../mod/connections.php:386
+#: ../../include/nav.php:177 ../../mod/connections.php:386
msgid "Connections"
msgstr ""
-#: ../../include/nav.php:173
+#: ../../include/nav.php:180
msgid "Notices"
msgstr ""
-#: ../../include/nav.php:173
+#: ../../include/nav.php:180
msgid "Notifications"
msgstr ""
-#: ../../include/nav.php:174
+#: ../../include/nav.php:181
msgid "See all notifications"
msgstr ""
-#: ../../include/nav.php:175 ../../mod/notifications.php:99
+#: ../../include/nav.php:182 ../../mod/notifications.php:99
msgid "Mark all system notifications seen"
msgstr ""
-#: ../../include/nav.php:177 ../../include/apps.php:138
+#: ../../include/nav.php:184 ../../include/apps.php:138
msgid "Mail"
msgstr ""
-#: ../../include/nav.php:177
+#: ../../include/nav.php:184
msgid "Private mail"
msgstr ""
-#: ../../include/nav.php:178
+#: ../../include/nav.php:185
msgid "See all private messages"
msgstr ""
-#: ../../include/nav.php:179
+#: ../../include/nav.php:186
msgid "Mark all private messages seen"
msgstr ""
-#: ../../include/nav.php:180
+#: ../../include/nav.php:187
msgid "Inbox"
msgstr ""
-#: ../../include/nav.php:181
+#: ../../include/nav.php:188
msgid "Outbox"
msgstr ""
-#: ../../include/nav.php:182 ../../include/widgets.php:536
+#: ../../include/nav.php:189 ../../include/widgets.php:536
msgid "New Message"
msgstr ""
-#: ../../include/nav.php:185 ../../include/apps.php:135
+#: ../../include/nav.php:192 ../../include/apps.php:135
#: ../../mod/events.php:396
msgid "Events"
msgstr ""
-#: ../../include/nav.php:185
+#: ../../include/nav.php:192
msgid "Event Calendar"
msgstr ""
-#: ../../include/nav.php:186
+#: ../../include/nav.php:193
msgid "See all events"
msgstr ""
-#: ../../include/nav.php:187
+#: ../../include/nav.php:194
msgid "Mark all events seen"
msgstr ""
-#: ../../include/nav.php:189 ../../include/apps.php:127
+#: ../../include/nav.php:196 ../../include/apps.php:127
msgid "Channel Select"
msgstr ""
-#: ../../include/nav.php:189
+#: ../../include/nav.php:196
msgid "Manage Your Channels"
msgstr ""
-#: ../../include/nav.php:191 ../../include/apps.php:129
+#: ../../include/nav.php:198 ../../include/apps.php:129
#: ../../include/widgets.php:514 ../../mod/admin.php:978
#: ../../mod/admin.php:1183
msgid "Settings"
msgstr ""
-#: ../../include/nav.php:191
+#: ../../include/nav.php:198
msgid "Account/Channel Settings"
msgstr ""
-#: ../../include/nav.php:199 ../../mod/admin.php:117
+#: ../../include/nav.php:206 ../../mod/admin.php:117
msgid "Admin"
msgstr ""
-#: ../../include/nav.php:199
+#: ../../include/nav.php:206
msgid "Site Setup and Configuration"
msgstr ""
-#: ../../include/nav.php:224
+#: ../../include/nav.php:231
msgid "Nothing new here"
msgstr ""
-#: ../../include/nav.php:228
+#: ../../include/nav.php:235
msgid "Please wait..."
msgstr ""
-#: ../../include/bookmarks.php:42
+#: ../../include/bookmarks.php:35
#, php-format
msgid "%1$s's bookmarks"
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/taxonomy.php:210
msgid "Tags"
msgstr ""
@@ -1175,92 +1038,68 @@ msgstr[1] ""
msgid "Default"
msgstr ""
-#: ../../include/contact_selectors.php:30
-msgid "Unknown | Not categorised"
-msgstr ""
-
-#: ../../include/contact_selectors.php:31
-msgid "Block immediately"
-msgstr ""
-
-#: ../../include/contact_selectors.php:32
-msgid "Shady, spammer, self-marketer"
-msgstr ""
-
-#: ../../include/contact_selectors.php:33
-msgid "Known to me, but no opinion"
-msgstr ""
-
-#: ../../include/contact_selectors.php:34
-msgid "OK, probably harmless"
-msgstr ""
-
-#: ../../include/contact_selectors.php:35
-msgid "Reputable, has my trust"
-msgstr ""
-
-#: ../../include/contact_selectors.php:54
+#: ../../include/contact_selectors.php:56
msgid "Frequently"
msgstr ""
-#: ../../include/contact_selectors.php:55
+#: ../../include/contact_selectors.php:57
msgid "Hourly"
msgstr ""
-#: ../../include/contact_selectors.php:56
+#: ../../include/contact_selectors.php:58
msgid "Twice daily"
msgstr ""
-#: ../../include/contact_selectors.php:57
+#: ../../include/contact_selectors.php:59
msgid "Daily"
msgstr ""
-#: ../../include/contact_selectors.php:58
+#: ../../include/contact_selectors.php:60
msgid "Weekly"
msgstr ""
-#: ../../include/contact_selectors.php:59
+#: ../../include/contact_selectors.php:61
msgid "Monthly"
msgstr ""
-#: ../../include/contact_selectors.php:74
+#: ../../include/contact_selectors.php:76
msgid "Friendica"
msgstr ""
-#: ../../include/contact_selectors.php:75
+#: ../../include/contact_selectors.php:77
msgid "OStatus"
msgstr ""
-#: ../../include/contact_selectors.php:76
+#: ../../include/contact_selectors.php:78
msgid "RSS/Atom"
msgstr ""
-#: ../../include/contact_selectors.php:77 ../../mod/admin.php:754
-#: ../../mod/admin.php:763 ../../boot.php:1471
+#: ../../include/contact_selectors.php:79 ../../mod/admin.php:754
+#: ../../mod/admin.php:763 ../../boot.php:1495
msgid "Email"
msgstr ""
-#: ../../include/contact_selectors.php:78
+#: ../../include/contact_selectors.php:80
msgid "Diaspora"
msgstr ""
-#: ../../include/contact_selectors.php:79
+#: ../../include/contact_selectors.php:81
msgid "Facebook"
msgstr ""
-#: ../../include/contact_selectors.php:80
+#: ../../include/contact_selectors.php:82
msgid "Zot!"
msgstr ""
-#: ../../include/contact_selectors.php:81
+#: ../../include/contact_selectors.php:83
msgid "LinkedIn"
msgstr ""
-#: ../../include/contact_selectors.php:82
+#: ../../include/contact_selectors.php:84
msgid "XMPP/IM"
msgstr ""
-#: ../../include/contact_selectors.php:83
+#: ../../include/contact_selectors.php:85
msgid "MySpace"
msgstr ""
@@ -1292,7 +1131,7 @@ msgid "Examples: Robert Morgenstein, Fishing"
msgstr ""
#: ../../include/contact_widgets.php:26 ../../mod/connections.php:392
-#: ../../mod/directory.php:206 ../../mod/directory.php:211
+#: ../../mod/directory.php:214 ../../mod/directory.php:219
msgid "Find"
msgstr ""
@@ -1321,23 +1160,23 @@ msgstr ""
msgid "Saved Folders"
msgstr ""
-#: ../../include/contact_widgets.php:61 ../../include/contact_widgets.php:95
+#: ../../include/contact_widgets.php:61 ../../include/contact_widgets.php:96
#: ../../include/widgets.php:299
msgid "Everything"
msgstr ""
-#: ../../include/contact_widgets.php:92 ../../include/widgets.php:29
+#: ../../include/contact_widgets.php:93 ../../include/widgets.php:29
msgid "Categories"
msgstr ""
-#: ../../include/contact_widgets.php:125
+#: ../../include/contact_widgets.php:126
#, php-format
msgid "%d connection in common"
msgid_plural "%d connections in common"
msgstr[0] ""
msgstr[1] ""
-#: ../../include/contact_widgets.php:130
+#: ../../include/contact_widgets.php:131
msgid "show more"
msgstr ""
@@ -1345,15 +1184,15 @@ msgstr ""
msgid "This event has been added to your calendar."
msgstr ""
-#: ../../include/zot.php:610
+#: ../../include/zot.php:624
msgid "Invalid data packet"
msgstr ""
-#: ../../include/zot.php:620
+#: ../../include/zot.php:634
msgid "Unable to verify channel signature"
msgstr ""
-#: ../../include/zot.php:817
+#: ../../include/zot.php:831
#, php-format
msgid "Unable to verify site signature for %s"
msgstr ""
@@ -1689,7 +1528,7 @@ msgid "Schedule Outbox"
msgstr ""
#: ../../include/reddav.php:1202 ../../include/apps.php:322
-#: ../../include/apps.php:373 ../../mod/connedit.php:434
+#: ../../include/apps.php:373 ../../mod/connedit.php:467
msgid "Unknown"
msgstr ""
@@ -1703,8 +1542,8 @@ msgstr ""
msgid "%1$s used of %2$s (%3$s&#37;)"
msgstr ""
-#: ../../include/reddav.php:1284 ../../mod/settings.php:517
-#: ../../mod/settings.php:543 ../../mod/admin.php:893
+#: ../../include/reddav.php:1284 ../../mod/settings.php:518
+#: ../../mod/settings.php:544 ../../mod/admin.php:893
msgid "Name"
msgstr ""
@@ -1720,6 +1559,14 @@ msgstr ""
msgid "Last Modified"
msgstr ""
+#: ../../include/reddav.php:1290 ../../include/conversation.php:635
+#: ../../include/apps.php:241 ../../include/ItemObject.php:108
+#: ../../mod/settings.php:579 ../../mod/connedit.php:431
+#: ../../mod/photos.php:1046 ../../mod/group.php:176 ../../mod/admin.php:758
+#: ../../mod/admin.php:888 ../../mod/thing.php:236
+msgid "Delete"
+msgstr ""
+
#: ../../include/reddav.php:1291
msgid "Total"
msgstr ""
@@ -1741,6 +1588,436 @@ msgstr ""
msgid "Upload"
msgstr ""
+#: ../../include/conversation.php:126 ../../mod/like.php:89
+msgid "channel"
+msgstr ""
+
+#: ../../include/conversation.php:164 ../../mod/like.php:331
+#, php-format
+msgid "%1$s likes %2$s's %3$s"
+msgstr ""
+
+#: ../../include/conversation.php:167 ../../mod/like.php:333
+#, 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:634 ../../include/ItemObject.php:114
+msgid "Select"
+msgstr ""
+
+#: ../../include/conversation.php:642 ../../include/ItemObject.php:89
+#: ../../mod/photos.php:844
+msgid "Private Message"
+msgstr ""
+
+#: ../../include/conversation.php:649 ../../include/ItemObject.php:182
+msgid "Message is verified"
+msgstr ""
+
+#: ../../include/conversation.php:669
+#, php-format
+msgid "View %s's profile @ %s"
+msgstr ""
+
+#: ../../include/conversation.php:683
+msgid "Categories:"
+msgstr ""
+
+#: ../../include/conversation.php:684
+msgid "Filed under:"
+msgstr ""
+
+#: ../../include/conversation.php:693 ../../include/ItemObject.php:250
+#, php-format
+msgid " from %s"
+msgstr ""
+
+#: ../../include/conversation.php:696 ../../include/ItemObject.php:253
+#, php-format
+msgid "last edited: %s"
+msgstr ""
+
+#: ../../include/conversation.php:697 ../../include/ItemObject.php:254
+#, php-format
+msgid "Expires: %s"
+msgstr ""
+
+#: ../../include/conversation.php:712
+msgid "View in context"
+msgstr ""
+
+#: ../../include/conversation.php:714 ../../include/conversation.php:1130
+#: ../../include/ItemObject.php:294 ../../mod/editblock.php:120
+#: ../../mod/editlayout.php:115 ../../mod/editpost.php:121
+#: ../../mod/editwebpage.php:152 ../../mod/photos.php:977
+#: ../../mod/mail.php:231 ../../mod/mail.php:346
+msgid "Please wait"
+msgstr ""
+
+#: ../../include/conversation.php:841
+msgid "remove"
+msgstr ""
+
+#: ../../include/conversation.php:845
+msgid "Loading..."
+msgstr ""
+
+#: ../../include/conversation.php:846
+msgid "Delete Selected Items"
+msgstr ""
+
+#: ../../include/conversation.php:937
+msgid "View Source"
+msgstr ""
+
+#: ../../include/conversation.php:938
+msgid "Follow Thread"
+msgstr ""
+
+#: ../../include/conversation.php:939
+msgid "View Status"
+msgstr ""
+
+#: ../../include/conversation.php:941
+msgid "View Photos"
+msgstr ""
+
+#: ../../include/conversation.php:942
+msgid "Matrix Activity"
+msgstr ""
+
+#: ../../include/conversation.php:943
+msgid "Edit Contact"
+msgstr ""
+
+#: ../../include/conversation.php:944
+msgid "Send PM"
+msgstr ""
+
+#: ../../include/conversation.php:945 ../../include/apps.php:140
+msgid "Poke"
+msgstr ""
+
+#: ../../include/conversation.php:1001
+#, php-format
+msgid "%s likes this."
+msgstr ""
+
+#: ../../include/conversation.php:1001
+#, php-format
+msgid "%s doesn't like this."
+msgstr ""
+
+#: ../../include/conversation.php:1005
+#, 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:1007
+#, 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:1013
+msgid "and"
+msgstr ""
+
+#: ../../include/conversation.php:1016
+#, php-format
+msgid ", and %d other people"
+msgid_plural ", and %d other people"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../../include/conversation.php:1017
+#, php-format
+msgid "%s like this."
+msgstr ""
+
+#: ../../include/conversation.php:1017
+#, php-format
+msgid "%s don't like this."
+msgstr ""
+
+#: ../../include/conversation.php:1074
+msgid "Visible to <strong>everybody</strong>"
+msgstr ""
+
+#: ../../include/conversation.php:1075 ../../mod/mail.php:167
+#: ../../mod/mail.php:279
+msgid "Please enter a link URL:"
+msgstr ""
+
+#: ../../include/conversation.php:1076
+msgid "Please enter a video link/URL:"
+msgstr ""
+
+#: ../../include/conversation.php:1077
+msgid "Please enter an audio link/URL:"
+msgstr ""
+
+#: ../../include/conversation.php:1078
+msgid "Tag term:"
+msgstr ""
+
+#: ../../include/conversation.php:1079 ../../mod/filer.php:49
+msgid "Save to Folder:"
+msgstr ""
+
+#: ../../include/conversation.php:1080
+msgid "Where are you right now?"
+msgstr ""
+
+#: ../../include/conversation.php:1081 ../../mod/editpost.php:52
+#: ../../mod/mail.php:168 ../../mod/mail.php:280
+msgid "Expires YYYY-MM-DD HH:MM"
+msgstr ""
+
+#: ../../include/conversation.php:1105 ../../mod/photos.php:976
+#: ../../mod/layouts.php:113
+msgid "Share"
+msgstr ""
+
+#: ../../include/conversation.php:1107 ../../mod/editwebpage.php:139
+msgid "Page link title"
+msgstr ""
+
+#: ../../include/conversation.php:1110
+msgid "Post as"
+msgstr ""
+
+#: ../../include/conversation.php:1111 ../../mod/editblock.php:112
+#: ../../mod/editlayout.php:107 ../../mod/editpost.php:113
+#: ../../mod/editwebpage.php:144 ../../mod/mail.php:228 ../../mod/mail.php:342
+msgid "Upload photo"
+msgstr ""
+
+#: ../../include/conversation.php:1112
+msgid "upload photo"
+msgstr ""
+
+#: ../../include/conversation.php:1113 ../../mod/editblock.php:113
+#: ../../mod/editlayout.php:108 ../../mod/editpost.php:114
+#: ../../mod/editwebpage.php:145 ../../mod/mail.php:229 ../../mod/mail.php:343
+msgid "Attach file"
+msgstr ""
+
+#: ../../include/conversation.php:1114
+msgid "attach file"
+msgstr ""
+
+#: ../../include/conversation.php:1115 ../../mod/editblock.php:114
+#: ../../mod/editlayout.php:109 ../../mod/editpost.php:115
+#: ../../mod/editwebpage.php:146 ../../mod/mail.php:230 ../../mod/mail.php:344
+msgid "Insert web link"
+msgstr ""
+
+#: ../../include/conversation.php:1116
+msgid "web link"
+msgstr ""
+
+#: ../../include/conversation.php:1117
+msgid "Insert video link"
+msgstr ""
+
+#: ../../include/conversation.php:1118
+msgid "video link"
+msgstr ""
+
+#: ../../include/conversation.php:1119
+msgid "Insert audio link"
+msgstr ""
+
+#: ../../include/conversation.php:1120
+msgid "audio link"
+msgstr ""
+
+#: ../../include/conversation.php:1121 ../../mod/editblock.php:118
+#: ../../mod/editlayout.php:113 ../../mod/editpost.php:119
+#: ../../mod/editwebpage.php:150
+msgid "Set your location"
+msgstr ""
+
+#: ../../include/conversation.php:1122
+msgid "set location"
+msgstr ""
+
+#: ../../include/conversation.php:1123 ../../mod/editblock.php:119
+#: ../../mod/editlayout.php:114 ../../mod/editpost.php:120
+#: ../../mod/editwebpage.php:151
+msgid "Clear browser location"
+msgstr ""
+
+#: ../../include/conversation.php:1124
+msgid "clear location"
+msgstr ""
+
+#: ../../include/conversation.php:1126 ../../mod/editblock.php:132
+#: ../../mod/editlayout.php:126 ../../mod/editpost.php:132
+#: ../../mod/editwebpage.php:167
+msgid "Set title"
+msgstr ""
+
+#: ../../include/conversation.php:1129 ../../mod/editblock.php:135
+#: ../../mod/editlayout.php:129 ../../mod/editpost.php:134
+#: ../../mod/editwebpage.php:169
+msgid "Categories (comma-separated list)"
+msgstr ""
+
+#: ../../include/conversation.php:1131 ../../mod/editblock.php:121
+#: ../../mod/editlayout.php:116 ../../mod/editpost.php:122
+#: ../../mod/editwebpage.php:153
+msgid "Permission settings"
+msgstr ""
+
+#: ../../include/conversation.php:1132
+msgid "permissions"
+msgstr ""
+
+#: ../../include/conversation.php:1139 ../../mod/editblock.php:129
+#: ../../mod/editlayout.php:123 ../../mod/editpost.php:129
+#: ../../mod/editwebpage.php:162
+msgid "Public post"
+msgstr ""
+
+#: ../../include/conversation.php:1141 ../../mod/editblock.php:136
+#: ../../mod/editlayout.php:130 ../../mod/editpost.php:135
+#: ../../mod/editwebpage.php:170
+msgid "Example: bob@example.com, mary@example.com"
+msgstr ""
+
+#: ../../include/conversation.php:1154 ../../mod/editblock.php:146
+#: ../../mod/editlayout.php:140 ../../mod/editpost.php:146
+#: ../../mod/editwebpage.php:179 ../../mod/mail.php:235 ../../mod/mail.php:349
+msgid "Set expiration date"
+msgstr ""
+
+#: ../../include/conversation.php:1156 ../../include/ItemObject.php:595
+#: ../../mod/editpost.php:148 ../../mod/mail.php:237 ../../mod/mail.php:351
+msgid "Encrypt text"
+msgstr ""
+
+#: ../../include/conversation.php:1158 ../../mod/editpost.php:150
+msgid "OK"
+msgstr ""
+
+#: ../../include/conversation.php:1159 ../../mod/settings.php:517
+#: ../../mod/settings.php:543 ../../mod/editpost.php:151
+#: ../../mod/fbrowser.php:82 ../../mod/fbrowser.php:117 ../../mod/tagrm.php:11
+#: ../../mod/tagrm.php:94
+msgid "Cancel"
+msgstr ""
+
+#: ../../include/conversation.php:1401
+msgid "Discover"
+msgstr ""
+
+#: ../../include/conversation.php:1404
+msgid "Imported public streams"
+msgstr ""
+
+#: ../../include/conversation.php:1409
+msgid "Commented Order"
+msgstr ""
+
+#: ../../include/conversation.php:1412
+msgid "Sort by Comment Date"
+msgstr ""
+
+#: ../../include/conversation.php:1416
+msgid "Posted Order"
+msgstr ""
+
+#: ../../include/conversation.php:1419
+msgid "Sort by Post Date"
+msgstr ""
+
+#: ../../include/conversation.php:1424 ../../include/widgets.php:82
+msgid "Personal"
+msgstr ""
+
+#: ../../include/conversation.php:1427
+msgid "Posts that mention or involve you"
+msgstr ""
+
+#: ../../include/conversation.php:1433 ../../mod/connections.php:211
+#: ../../mod/connections.php:224 ../../mod/menu.php:61
+msgid "New"
+msgstr ""
+
+#: ../../include/conversation.php:1436
+msgid "Activity Stream - by date"
+msgstr ""
+
+#: ../../include/conversation.php:1442
+msgid "Starred"
+msgstr ""
+
+#: ../../include/conversation.php:1445
+msgid "Favourite Posts"
+msgstr ""
+
+#: ../../include/conversation.php:1452
+msgid "Spam"
+msgstr ""
+
+#: ../../include/conversation.php:1455
+msgid "Posts flagged as SPAM"
+msgstr ""
+
+#: ../../include/conversation.php:1491 ../../mod/admin.php:892
+msgid "Channel"
+msgstr ""
+
+#: ../../include/conversation.php:1494
+msgid "Status Messages and Posts"
+msgstr ""
+
+#: ../../include/conversation.php:1503
+msgid "About"
+msgstr ""
+
+#: ../../include/conversation.php:1506
+msgid "Profile Details"
+msgstr ""
+
+#: ../../include/conversation.php:1524
+msgid "Files and Storage"
+msgstr ""
+
+#: ../../include/conversation.php:1533 ../../include/conversation.php:1536
+msgid "Chatrooms"
+msgstr ""
+
+#: ../../include/conversation.php:1546
+msgid "Saved Bookmarks"
+msgstr ""
+
+#: ../../include/conversation.php:1557
+msgid "Manage Webpages"
+msgstr ""
+
#: ../../include/features.php:23
msgid "General Features"
msgstr ""
@@ -1987,6 +2264,26 @@ msgstr ""
msgid "Cannot connect to yourself."
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/group.php:25
msgid ""
"A deleted group with this name was revived. Existing item permissions "
@@ -1994,39 +2291,39 @@ msgid ""
"not what you intended, please create another group with a different name."
msgstr ""
-#: ../../include/group.php:223
+#: ../../include/group.php:234
msgid "Default privacy group for new contacts"
msgstr ""
-#: ../../include/group.php:242 ../../mod/admin.php:763
+#: ../../include/group.php:253 ../../mod/admin.php:763
msgid "All Channels"
msgstr ""
-#: ../../include/group.php:264
+#: ../../include/group.php:275
msgid "edit"
msgstr ""
-#: ../../include/group.php:285
+#: ../../include/group.php:296
msgid "Collections"
msgstr ""
-#: ../../include/group.php:286
+#: ../../include/group.php:297
msgid "Edit collection"
msgstr ""
-#: ../../include/group.php:287
+#: ../../include/group.php:298
msgid "Create a new collection"
msgstr ""
-#: ../../include/group.php:288
+#: ../../include/group.php:299
msgid "Channels not in any collection"
msgstr ""
-#: ../../include/group.php:290 ../../include/widgets.php:266
+#: ../../include/group.php:301 ../../include/widgets.php:266
msgid "add"
msgstr ""
-#: ../../include/identity.php:30 ../../mod/item.php:1280
+#: ../../include/identity.php:30 ../../mod/item.php:1289
msgid "Unable to obtain identity information from database"
msgstr ""
@@ -2064,7 +2361,7 @@ msgid "Default Profile"
msgstr ""
#: ../../include/identity.php:342 ../../include/widgets.php:400
-#: ../../include/profile_selectors.php:42 ../../mod/connedit.php:431
+#: ../../include/profile_selectors.php:42 ../../mod/connedit.php:464
msgid "Friends"
msgstr ""
@@ -2102,10 +2399,6 @@ msgstr ""
msgid "Create New Profile"
msgstr ""
-#: ../../include/identity.php:699
-msgid "Edit Profile"
-msgstr ""
-
#: ../../include/identity.php:710 ../../mod/profiles.php:624
msgid "Profile Image"
msgstr ""
@@ -2176,7 +2469,7 @@ msgstr ""
msgid "Profile"
msgstr ""
-#: ../../include/identity.php:950 ../../mod/settings.php:935
+#: ../../include/identity.php:950 ../../mod/settings.php:936
msgid "Full Name:"
msgstr ""
@@ -2285,319 +2578,6 @@ msgstr ""
msgid "view full size"
msgstr ""
-#: ../../include/text.php:320
-msgid "prev"
-msgstr ""
-
-#: ../../include/text.php:322
-msgid "first"
-msgstr ""
-
-#: ../../include/text.php:351
-msgid "last"
-msgstr ""
-
-#: ../../include/text.php:354
-msgid "next"
-msgstr ""
-
-#: ../../include/text.php:366
-msgid "older"
-msgstr ""
-
-#: ../../include/text.php:368
-msgid "newer"
-msgstr ""
-
-#: ../../include/text.php:729
-msgid "No connections"
-msgstr ""
-
-#: ../../include/text.php:742
-#, php-format
-msgid "%d Connection"
-msgid_plural "%d Connections"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../../include/text.php:754
-msgid "View Connections"
-msgstr ""
-
-#: ../../include/text.php:815 ../../include/text.php:829
-#: ../../include/widgets.php:186 ../../mod/rbmark.php:28
-#: ../../mod/rbmark.php:98 ../../mod/filer.php:50
-msgid "Save"
-msgstr ""
-
-#: ../../include/text.php:895
-msgid "poke"
-msgstr ""
-
-#: ../../include/text.php:896
-msgid "ping"
-msgstr ""
-
-#: ../../include/text.php:896
-msgid "pinged"
-msgstr ""
-
-#: ../../include/text.php:897
-msgid "prod"
-msgstr ""
-
-#: ../../include/text.php:897
-msgid "prodded"
-msgstr ""
-
-#: ../../include/text.php:898
-msgid "slap"
-msgstr ""
-
-#: ../../include/text.php:898
-msgid "slapped"
-msgstr ""
-
-#: ../../include/text.php:899
-msgid "finger"
-msgstr ""
-
-#: ../../include/text.php:899
-msgid "fingered"
-msgstr ""
-
-#: ../../include/text.php:900
-msgid "rebuff"
-msgstr ""
-
-#: ../../include/text.php:900
-msgid "rebuffed"
-msgstr ""
-
-#: ../../include/text.php:909
-msgid "happy"
-msgstr ""
-
-#: ../../include/text.php:910
-msgid "sad"
-msgstr ""
-
-#: ../../include/text.php:911
-msgid "mellow"
-msgstr ""
-
-#: ../../include/text.php:912
-msgid "tired"
-msgstr ""
-
-#: ../../include/text.php:913
-msgid "perky"
-msgstr ""
-
-#: ../../include/text.php:914
-msgid "angry"
-msgstr ""
-
-#: ../../include/text.php:915
-msgid "stupified"
-msgstr ""
-
-#: ../../include/text.php:916
-msgid "puzzled"
-msgstr ""
-
-#: ../../include/text.php:917
-msgid "interested"
-msgstr ""
-
-#: ../../include/text.php:918
-msgid "bitter"
-msgstr ""
-
-#: ../../include/text.php:919
-msgid "cheerful"
-msgstr ""
-
-#: ../../include/text.php:920
-msgid "alive"
-msgstr ""
-
-#: ../../include/text.php:921
-msgid "annoyed"
-msgstr ""
-
-#: ../../include/text.php:922
-msgid "anxious"
-msgstr ""
-
-#: ../../include/text.php:923
-msgid "cranky"
-msgstr ""
-
-#: ../../include/text.php:924
-msgid "disturbed"
-msgstr ""
-
-#: ../../include/text.php:925
-msgid "frustrated"
-msgstr ""
-
-#: ../../include/text.php:926
-msgid "depressed"
-msgstr ""
-
-#: ../../include/text.php:927
-msgid "motivated"
-msgstr ""
-
-#: ../../include/text.php:928
-msgid "relaxed"
-msgstr ""
-
-#: ../../include/text.php:929
-msgid "surprised"
-msgstr ""
-
-#: ../../include/text.php:1090
-msgid "Monday"
-msgstr ""
-
-#: ../../include/text.php:1090
-msgid "Tuesday"
-msgstr ""
-
-#: ../../include/text.php:1090
-msgid "Wednesday"
-msgstr ""
-
-#: ../../include/text.php:1090
-msgid "Thursday"
-msgstr ""
-
-#: ../../include/text.php:1090
-msgid "Friday"
-msgstr ""
-
-#: ../../include/text.php:1090
-msgid "Saturday"
-msgstr ""
-
-#: ../../include/text.php:1090
-msgid "Sunday"
-msgstr ""
-
-#: ../../include/text.php:1094
-msgid "January"
-msgstr ""
-
-#: ../../include/text.php:1094
-msgid "February"
-msgstr ""
-
-#: ../../include/text.php:1094
-msgid "March"
-msgstr ""
-
-#: ../../include/text.php:1094
-msgid "April"
-msgstr ""
-
-#: ../../include/text.php:1094
-msgid "May"
-msgstr ""
-
-#: ../../include/text.php:1094
-msgid "June"
-msgstr ""
-
-#: ../../include/text.php:1094
-msgid "July"
-msgstr ""
-
-#: ../../include/text.php:1094
-msgid "August"
-msgstr ""
-
-#: ../../include/text.php:1094
-msgid "September"
-msgstr ""
-
-#: ../../include/text.php:1094
-msgid "October"
-msgstr ""
-
-#: ../../include/text.php:1094
-msgid "November"
-msgstr ""
-
-#: ../../include/text.php:1094
-msgid "December"
-msgstr ""
-
-#: ../../include/text.php:1172
-msgid "unknown.???"
-msgstr ""
-
-#: ../../include/text.php:1173
-msgid "bytes"
-msgstr ""
-
-#: ../../include/text.php:1208
-msgid "remove category"
-msgstr ""
-
-#: ../../include/text.php:1278
-msgid "remove from file"
-msgstr ""
-
-#: ../../include/text.php:1343 ../../include/text.php:1355
-msgid "Click to open/close"
-msgstr ""
-
-#: ../../include/text.php:1510 ../../mod/events.php:374
-msgid "Link to Source"
-msgstr ""
-
-#: ../../include/text.php:1529
-msgid "Select a page layout: "
-msgstr ""
-
-#: ../../include/text.php:1532 ../../include/text.php:1597
-msgid "default"
-msgstr ""
-
-#: ../../include/text.php:1568
-msgid "Page content type: "
-msgstr ""
-
-#: ../../include/text.php:1609
-msgid "Select an alternate language"
-msgstr ""
-
-#: ../../include/text.php:1743
-msgid "activity"
-msgstr ""
-
-#: ../../include/text.php:2002
-msgid "Design"
-msgstr ""
-
-#: ../../include/text.php:2004
-msgid "Blocks"
-msgstr ""
-
-#: ../../include/text.php:2005
-msgid "Menus"
-msgstr ""
-
-#: ../../include/text.php:2006
-msgid "Layouts"
-msgstr ""
-
-#: ../../include/text.php:2007
-msgid "Pages"
-msgstr ""
-
#: ../../include/apps.php:123
msgid "Site Admin"
msgstr ""
@@ -2619,7 +2599,7 @@ msgid "Suggest"
msgstr ""
#: ../../include/apps.php:233 ../../mod/settings.php:79
-#: ../../mod/settings.php:541
+#: ../../mod/settings.php:542
msgid "Update"
msgstr ""
@@ -2631,34 +2611,34 @@ msgstr ""
msgid "Purchase"
msgstr ""
-#: ../../include/bbcode.php:128 ../../include/bbcode.php:654
-#: ../../include/bbcode.php:657 ../../include/bbcode.php:662
-#: ../../include/bbcode.php:665 ../../include/bbcode.php:668
-#: ../../include/bbcode.php:671 ../../include/bbcode.php:676
-#: ../../include/bbcode.php:679 ../../include/bbcode.php:684
-#: ../../include/bbcode.php:687 ../../include/bbcode.php:690
-#: ../../include/bbcode.php:693
+#: ../../include/bbcode.php:112 ../../include/bbcode.php:638
+#: ../../include/bbcode.php:641 ../../include/bbcode.php:646
+#: ../../include/bbcode.php:649 ../../include/bbcode.php:652
+#: ../../include/bbcode.php:655 ../../include/bbcode.php:660
+#: ../../include/bbcode.php:663 ../../include/bbcode.php:668
+#: ../../include/bbcode.php:671 ../../include/bbcode.php:674
+#: ../../include/bbcode.php:677
msgid "Image/photo"
msgstr ""
-#: ../../include/bbcode.php:163 ../../include/bbcode.php:704
+#: ../../include/bbcode.php:147 ../../include/bbcode.php:688
msgid "Encrypted content"
msgstr ""
-#: ../../include/bbcode.php:179
+#: ../../include/bbcode.php:163
msgid "QR code"
msgstr ""
-#: ../../include/bbcode.php:228
+#: ../../include/bbcode.php:212
#, php-format
msgid "%1$s wrote the following %2$s %3$s"
msgstr ""
-#: ../../include/bbcode.php:230
+#: ../../include/bbcode.php:214
msgid "post"
msgstr ""
-#: ../../include/bbcode.php:622 ../../include/bbcode.php:642
+#: ../../include/bbcode.php:606 ../../include/bbcode.php:626
msgid "$1 wrote:"
msgstr ""
@@ -2735,11 +2715,11 @@ msgstr ""
msgid "Refresh"
msgstr ""
-#: ../../include/widgets.php:398 ../../mod/connedit.php:428
+#: ../../include/widgets.php:398 ../../mod/connedit.php:461
msgid "Me"
msgstr ""
-#: ../../include/widgets.php:399 ../../mod/connedit.php:430
+#: ../../include/widgets.php:399 ../../mod/connedit.php:463
msgid "Best Friends"
msgstr ""
@@ -2747,11 +2727,11 @@ msgstr ""
msgid "Co-workers"
msgstr ""
-#: ../../include/widgets.php:402 ../../mod/connedit.php:432
+#: ../../include/widgets.php:402 ../../mod/connedit.php:465
msgid "Former Friends"
msgstr ""
-#: ../../include/widgets.php:403 ../../mod/connedit.php:433
+#: ../../include/widgets.php:403 ../../mod/connedit.php:466
msgid "Acquaintances"
msgstr ""
@@ -2923,11 +2903,11 @@ msgid "Comment"
msgstr ""
#: ../../include/ItemObject.php:583 ../../mod/mood.php:135
-#: ../../mod/settings.php:515 ../../mod/settings.php:627
-#: ../../mod/settings.php:655 ../../mod/settings.php:679
-#: ../../mod/settings.php:749 ../../mod/settings.php:927
+#: ../../mod/settings.php:516 ../../mod/settings.php:628
+#: ../../mod/settings.php:656 ../../mod/settings.php:680
+#: ../../mod/settings.php:750 ../../mod/settings.php:928
#: ../../mod/poke.php:166 ../../mod/profiles.php:515 ../../mod/chat.php:177
-#: ../../mod/chat.php:211 ../../mod/connect.php:92 ../../mod/connedit.php:476
+#: ../../mod/chat.php:211 ../../mod/connect.php:92 ../../mod/connedit.php:509
#: ../../mod/setup.php:307 ../../mod/setup.php:350 ../../mod/pdledit.php:58
#: ../../mod/photos.php:563 ../../mod/photos.php:668 ../../mod/photos.php:956
#: ../../mod/photos.php:996 ../../mod/photos.php:1083
@@ -2937,8 +2917,8 @@ msgstr ""
#: ../../mod/admin.php:751 ../../mod/admin.php:886 ../../mod/admin.php:1019
#: ../../mod/admin.php:1218 ../../mod/admin.php:1305 ../../mod/thing.php:286
#: ../../mod/thing.php:329 ../../mod/import.php:393 ../../mod/invite.php:156
-#: ../../mod/mail.php:219 ../../mod/mail.php:332 ../../mod/appman.php:99
-#: ../../view/theme/apw/php/config.php:256
+#: ../../mod/mail.php:232 ../../mod/mail.php:345 ../../mod/appman.php:99
+#: ../../mod/poll.php:68 ../../view/theme/apw/php/config.php:256
#: ../../view/theme/blogga/php/config.php:67
#: ../../view/theme/blogga/view/theme/blog/config.php:67
#: ../../view/theme/redbasic/php/config.php:99
@@ -3334,50 +3314,50 @@ msgstr ""
msgid "Logged out."
msgstr ""
-#: ../../include/auth.php:209
+#: ../../include/auth.php:236
msgid "Failed authentication"
msgstr ""
-#: ../../include/auth.php:224 ../../mod/openid.php:188
+#: ../../include/auth.php:251 ../../mod/openid.php:188
msgid "Login failed."
msgstr ""
-#: ../../include/items.php:302 ../../mod/profperm.php:23
-#: ../../mod/subthread.php:49 ../../mod/group.php:68 ../../mod/like.php:202
+#: ../../include/items.php:288 ../../mod/profperm.php:23
+#: ../../mod/subthread.php:49 ../../mod/group.php:68 ../../mod/like.php:242
#: ../../index.php:360
msgid "Permission denied"
msgstr ""
-#: ../../include/items.php:826
+#: ../../include/items.php:812
msgid "(Unknown)"
msgstr ""
-#: ../../include/items.php:3614 ../../mod/home.php:67 ../../mod/display.php:32
+#: ../../include/items.php:3602 ../../mod/home.php:67 ../../mod/display.php:32
#: ../../mod/filestorage.php:18 ../../mod/admin.php:159
#: ../../mod/admin.php:923 ../../mod/admin.php:1126 ../../mod/thing.php:78
#: ../../mod/viewsrc.php:18
msgid "Item not found."
msgstr ""
-#: ../../include/items.php:4047 ../../mod/group.php:38 ../../mod/group.php:140
+#: ../../include/items.php:4035 ../../mod/group.php:38 ../../mod/group.php:140
msgid "Collection not found."
msgstr ""
-#: ../../include/items.php:4062
+#: ../../include/items.php:4050
msgid "Collection is empty."
msgstr ""
-#: ../../include/items.php:4069
+#: ../../include/items.php:4057
#, php-format
msgid "Collection: %s"
msgstr ""
-#: ../../include/items.php:4080
+#: ../../include/items.php:4068
#, php-format
msgid "Connection: %s"
msgstr ""
-#: ../../include/items.php:4083
+#: ../../include/items.php:4071
msgid "Connection not found."
msgstr ""
@@ -3414,7 +3394,7 @@ msgid "Can post on my channel page (\"wall\")"
msgstr ""
#: ../../include/permissions.php:23
-msgid "Can comment on my posts"
+msgid "Can comment on or like my posts"
msgstr ""
#: ../../include/permissions.php:24
@@ -3426,38 +3406,42 @@ msgid "Can post photos to my photo albums"
msgstr ""
#: ../../include/permissions.php:26
+msgid "Can like/dislike stuff"
+msgstr ""
+
+#: ../../include/permissions.php:28
msgid "Can forward to all my channel contacts via post @mentions"
msgstr ""
-#: ../../include/permissions.php:26
+#: ../../include/permissions.php:28
msgid "Advanced - useful for creating group forum channels"
msgstr ""
-#: ../../include/permissions.php:27
+#: ../../include/permissions.php:29
msgid "Can chat with me (when available)"
msgstr ""
-#: ../../include/permissions.php:28
+#: ../../include/permissions.php:30
msgid "Can write to my \"public\" file storage"
msgstr ""
-#: ../../include/permissions.php:29
+#: ../../include/permissions.php:31
msgid "Can edit my \"public\" pages"
msgstr ""
-#: ../../include/permissions.php:31
+#: ../../include/permissions.php:33
msgid "Can source my \"public\" posts in derived channels"
msgstr ""
-#: ../../include/permissions.php:31
+#: ../../include/permissions.php:33
msgid "Somewhat advanced - very useful in open communities"
msgstr ""
-#: ../../include/permissions.php:33
+#: ../../include/permissions.php:35
msgid "Can administer my channel resources"
msgstr ""
-#: ../../include/permissions.php:33
+#: ../../include/permissions.php:35
msgid "Extremely advanced. Leave this alone unless you know what you are doing"
msgstr ""
@@ -3534,7 +3518,7 @@ msgstr ""
msgid "Menu Item Permissions"
msgstr ""
-#: ../../mod/mitem.php:134 ../../mod/mitem.php:177 ../../mod/settings.php:960
+#: ../../mod/mitem.php:134 ../../mod/mitem.php:177 ../../mod/settings.php:961
msgid "(click to open/close)"
msgstr ""
@@ -3614,438 +3598,438 @@ msgstr ""
msgid "Empty passwords are not allowed. Password unchanged."
msgstr ""
-#: ../../mod/settings.php:212
+#: ../../mod/settings.php:213
msgid "Password changed."
msgstr ""
-#: ../../mod/settings.php:214
+#: ../../mod/settings.php:215
msgid "Password update failed. Please try again."
msgstr ""
-#: ../../mod/settings.php:228
+#: ../../mod/settings.php:229
msgid "Not valid email."
msgstr ""
-#: ../../mod/settings.php:231
+#: ../../mod/settings.php:232
msgid "Protected email address. Cannot change to that email."
msgstr ""
-#: ../../mod/settings.php:240
+#: ../../mod/settings.php:241
msgid "System failure storing new email. Please try again."
msgstr ""
-#: ../../mod/settings.php:443
+#: ../../mod/settings.php:444
msgid "Settings updated."
msgstr ""
-#: ../../mod/settings.php:514 ../../mod/settings.php:540
-#: ../../mod/settings.php:576
+#: ../../mod/settings.php:515 ../../mod/settings.php:541
+#: ../../mod/settings.php:577
msgid "Add application"
msgstr ""
-#: ../../mod/settings.php:517
+#: ../../mod/settings.php:518
msgid "Name of application"
msgstr ""
-#: ../../mod/settings.php:518 ../../mod/settings.php:544
+#: ../../mod/settings.php:519 ../../mod/settings.php:545
msgid "Consumer Key"
msgstr ""
-#: ../../mod/settings.php:518 ../../mod/settings.php:519
+#: ../../mod/settings.php:519 ../../mod/settings.php:520
msgid "Automatically generated - change if desired. Max length 20"
msgstr ""
-#: ../../mod/settings.php:519 ../../mod/settings.php:545
+#: ../../mod/settings.php:520 ../../mod/settings.php:546
msgid "Consumer Secret"
msgstr ""
-#: ../../mod/settings.php:520 ../../mod/settings.php:546
+#: ../../mod/settings.php:521 ../../mod/settings.php:547
msgid "Redirect"
msgstr ""
-#: ../../mod/settings.php:520
+#: ../../mod/settings.php:521
msgid ""
"Redirect URI - leave blank unless your application specifically requires this"
msgstr ""
-#: ../../mod/settings.php:521 ../../mod/settings.php:547
+#: ../../mod/settings.php:522 ../../mod/settings.php:548
msgid "Icon url"
msgstr ""
-#: ../../mod/settings.php:521
+#: ../../mod/settings.php:522
msgid "Optional"
msgstr ""
-#: ../../mod/settings.php:532
+#: ../../mod/settings.php:533
msgid "You can't edit this application."
msgstr ""
-#: ../../mod/settings.php:575
+#: ../../mod/settings.php:576
msgid "Connected Apps"
msgstr ""
-#: ../../mod/settings.php:579
+#: ../../mod/settings.php:580
msgid "Client key starts with"
msgstr ""
-#: ../../mod/settings.php:580
+#: ../../mod/settings.php:581
msgid "No name"
msgstr ""
-#: ../../mod/settings.php:581
+#: ../../mod/settings.php:582
msgid "Remove authorization"
msgstr ""
-#: ../../mod/settings.php:592
+#: ../../mod/settings.php:593
msgid "No feature settings configured"
msgstr ""
-#: ../../mod/settings.php:600
+#: ../../mod/settings.php:601
msgid "Feature Settings"
msgstr ""
-#: ../../mod/settings.php:623
+#: ../../mod/settings.php:624
msgid "Account Settings"
msgstr ""
-#: ../../mod/settings.php:624
+#: ../../mod/settings.php:625
msgid "Password Settings"
msgstr ""
-#: ../../mod/settings.php:625
+#: ../../mod/settings.php:626
msgid "New Password:"
msgstr ""
-#: ../../mod/settings.php:626
+#: ../../mod/settings.php:627
msgid "Confirm:"
msgstr ""
-#: ../../mod/settings.php:626
+#: ../../mod/settings.php:627
msgid "Leave password fields blank unless changing"
msgstr ""
-#: ../../mod/settings.php:628 ../../mod/settings.php:936
+#: ../../mod/settings.php:629 ../../mod/settings.php:937
msgid "Email Address:"
msgstr ""
-#: ../../mod/settings.php:629
+#: ../../mod/settings.php:630
msgid "Remove Account"
msgstr ""
-#: ../../mod/settings.php:630 ../../mod/settings.php:999
+#: ../../mod/settings.php:631 ../../mod/settings.php:1000
msgid "Warning: This action is permanent and cannot be reversed."
msgstr ""
-#: ../../mod/settings.php:646
+#: ../../mod/settings.php:647
msgid "Off"
msgstr ""
-#: ../../mod/settings.php:646
+#: ../../mod/settings.php:647
msgid "On"
msgstr ""
-#: ../../mod/settings.php:653
+#: ../../mod/settings.php:654
msgid "Additional Features"
msgstr ""
-#: ../../mod/settings.php:678
+#: ../../mod/settings.php:679
msgid "Connector Settings"
msgstr ""
-#: ../../mod/settings.php:708 ../../mod/admin.php:390
+#: ../../mod/settings.php:709 ../../mod/admin.php:390
msgid "No special theme for mobile devices"
msgstr ""
-#: ../../mod/settings.php:717
+#: ../../mod/settings.php:718
#, php-format
msgid "%s - (Experimental)"
msgstr ""
-#: ../../mod/settings.php:747
+#: ../../mod/settings.php:748
msgid "Display Settings"
msgstr ""
-#: ../../mod/settings.php:753
+#: ../../mod/settings.php:754
msgid "Display Theme:"
msgstr ""
-#: ../../mod/settings.php:754
+#: ../../mod/settings.php:755
msgid "Mobile Theme:"
msgstr ""
-#: ../../mod/settings.php:755
+#: ../../mod/settings.php:756
msgid "Update browser every xx seconds"
msgstr ""
-#: ../../mod/settings.php:755
+#: ../../mod/settings.php:756
msgid "Minimum of 10 seconds, no maximum"
msgstr ""
-#: ../../mod/settings.php:756
+#: ../../mod/settings.php:757
msgid "Maximum number of conversations to load at any time:"
msgstr ""
-#: ../../mod/settings.php:756
+#: ../../mod/settings.php:757
msgid "Maximum of 100 items"
msgstr ""
-#: ../../mod/settings.php:757
+#: ../../mod/settings.php:758
msgid "Don't show emoticons"
msgstr ""
-#: ../../mod/settings.php:758
+#: ../../mod/settings.php:759
msgid "System Page Layout Editor - (advanced)"
msgstr ""
-#: ../../mod/settings.php:793
+#: ../../mod/settings.php:794
msgid "Nobody except yourself"
msgstr ""
-#: ../../mod/settings.php:794
+#: ../../mod/settings.php:795
msgid "Only those you specifically allow"
msgstr ""
-#: ../../mod/settings.php:795
+#: ../../mod/settings.php:796
msgid "Approved connections"
msgstr ""
-#: ../../mod/settings.php:796
+#: ../../mod/settings.php:797
msgid "Any connections"
msgstr ""
-#: ../../mod/settings.php:797
+#: ../../mod/settings.php:798
msgid "Anybody on this website"
msgstr ""
-#: ../../mod/settings.php:798
+#: ../../mod/settings.php:799
msgid "Anybody in this network"
msgstr ""
-#: ../../mod/settings.php:799
+#: ../../mod/settings.php:800
msgid "Anybody authenticated"
msgstr ""
-#: ../../mod/settings.php:800
+#: ../../mod/settings.php:801
msgid "Anybody on the internet"
msgstr ""
-#: ../../mod/settings.php:877
+#: ../../mod/settings.php:878
msgid "Publish your default profile in the network directory"
msgstr ""
-#: ../../mod/settings.php:877 ../../mod/settings.php:882
-#: ../../mod/settings.php:953 ../../mod/api.php:106 ../../mod/profiles.php:493
+#: ../../mod/settings.php:878 ../../mod/settings.php:883
+#: ../../mod/settings.php:954 ../../mod/api.php:106 ../../mod/profiles.php:493
#: ../../mod/admin.php:420
msgid "No"
msgstr ""
-#: ../../mod/settings.php:877 ../../mod/settings.php:882
-#: ../../mod/settings.php:953 ../../mod/api.php:105 ../../mod/profiles.php:492
+#: ../../mod/settings.php:878 ../../mod/settings.php:883
+#: ../../mod/settings.php:954 ../../mod/api.php:105 ../../mod/profiles.php:492
#: ../../mod/admin.php:422
msgid "Yes"
msgstr ""
-#: ../../mod/settings.php:882
+#: ../../mod/settings.php:883
msgid "Allow us to suggest you as a potential friend to new members?"
msgstr ""
-#: ../../mod/settings.php:886 ../../mod/profile_photo.php:365
+#: ../../mod/settings.php:887 ../../mod/profile_photo.php:365
msgid "or"
msgstr ""
-#: ../../mod/settings.php:891
+#: ../../mod/settings.php:892
msgid "Your channel address is"
msgstr ""
-#: ../../mod/settings.php:925
+#: ../../mod/settings.php:926
msgid "Channel Settings"
msgstr ""
-#: ../../mod/settings.php:934
+#: ../../mod/settings.php:935
msgid "Basic Settings"
msgstr ""
-#: ../../mod/settings.php:937
+#: ../../mod/settings.php:938
msgid "Your Timezone:"
msgstr ""
-#: ../../mod/settings.php:938
+#: ../../mod/settings.php:939
msgid "Default Post Location:"
msgstr ""
-#: ../../mod/settings.php:938
+#: ../../mod/settings.php:939
msgid "Geographical location to display on your posts"
msgstr ""
-#: ../../mod/settings.php:939
+#: ../../mod/settings.php:940
msgid "Use Browser Location:"
msgstr ""
-#: ../../mod/settings.php:941
+#: ../../mod/settings.php:942
msgid "Adult Content"
msgstr ""
-#: ../../mod/settings.php:941
+#: ../../mod/settings.php:942
msgid ""
"This channel frequently or regularly publishes adult content. (Please tag "
"any adult material and/or nudity with #NSFW)"
msgstr ""
-#: ../../mod/settings.php:943
+#: ../../mod/settings.php:944
msgid "Security and Privacy Settings"
msgstr ""
-#: ../../mod/settings.php:945
+#: ../../mod/settings.php:946
msgid "Hide my online presence"
msgstr ""
-#: ../../mod/settings.php:945
+#: ../../mod/settings.php:946
msgid "Prevents displaying in your profile that you are online"
msgstr ""
-#: ../../mod/settings.php:947
+#: ../../mod/settings.php:948
msgid "Simple Privacy Settings:"
msgstr ""
-#: ../../mod/settings.php:948
+#: ../../mod/settings.php:949
msgid ""
"Very Public - <em>extremely permissive (should be used with caution)</em>"
msgstr ""
-#: ../../mod/settings.php:949
+#: ../../mod/settings.php:950
msgid ""
"Typical - <em>default public, privacy when desired (similar to social "
"network permissions but with improved privacy)</em>"
msgstr ""
-#: ../../mod/settings.php:950
+#: ../../mod/settings.php:951
msgid "Private - <em>default private, never open or public</em>"
msgstr ""
-#: ../../mod/settings.php:951
+#: ../../mod/settings.php:952
msgid "Blocked - <em>default blocked to/from everybody</em>"
msgstr ""
-#: ../../mod/settings.php:953
+#: ../../mod/settings.php:954
msgid "Allow others to tag your posts"
msgstr ""
-#: ../../mod/settings.php:953
+#: ../../mod/settings.php:954
msgid ""
"Often used by the community to retro-actively flag inappropriate content"
msgstr ""
-#: ../../mod/settings.php:955
+#: ../../mod/settings.php:956
msgid "Advanced Privacy Settings"
msgstr ""
-#: ../../mod/settings.php:957
+#: ../../mod/settings.php:958
msgid "Expire other channel content after this many days"
msgstr ""
-#: ../../mod/settings.php:957
+#: ../../mod/settings.php:958
msgid "0 or blank prevents expiration"
msgstr ""
-#: ../../mod/settings.php:958
+#: ../../mod/settings.php:959
msgid "Maximum Friend Requests/Day:"
msgstr ""
-#: ../../mod/settings.php:958
+#: ../../mod/settings.php:959
msgid "May reduce spam activity"
msgstr ""
-#: ../../mod/settings.php:959
+#: ../../mod/settings.php:960
msgid "Default Post Permissions"
msgstr ""
-#: ../../mod/settings.php:971
+#: ../../mod/settings.php:972
msgid "Maximum private messages per day from unknown people:"
msgstr ""
-#: ../../mod/settings.php:971
+#: ../../mod/settings.php:972
msgid "Useful to reduce spamming"
msgstr ""
-#: ../../mod/settings.php:974
+#: ../../mod/settings.php:975
msgid "Notification Settings"
msgstr ""
-#: ../../mod/settings.php:975
+#: ../../mod/settings.php:976
msgid "By default post a status message when:"
msgstr ""
-#: ../../mod/settings.php:976
+#: ../../mod/settings.php:977
msgid "accepting a friend request"
msgstr ""
-#: ../../mod/settings.php:977
+#: ../../mod/settings.php:978
msgid "joining a forum/community"
msgstr ""
-#: ../../mod/settings.php:978
+#: ../../mod/settings.php:979
msgid "making an <em>interesting</em> profile change"
msgstr ""
-#: ../../mod/settings.php:979
+#: ../../mod/settings.php:980
msgid "Send a notification email when:"
msgstr ""
-#: ../../mod/settings.php:980
+#: ../../mod/settings.php:981
msgid "You receive a connection request"
msgstr ""
-#: ../../mod/settings.php:981
+#: ../../mod/settings.php:982
msgid "Your connections are confirmed"
msgstr ""
-#: ../../mod/settings.php:982
+#: ../../mod/settings.php:983
msgid "Someone writes on your profile wall"
msgstr ""
-#: ../../mod/settings.php:983
+#: ../../mod/settings.php:984
msgid "Someone writes a followup comment"
msgstr ""
-#: ../../mod/settings.php:984
+#: ../../mod/settings.php:985
msgid "You receive a private message"
msgstr ""
-#: ../../mod/settings.php:985
+#: ../../mod/settings.php:986
msgid "You receive a friend suggestion"
msgstr ""
-#: ../../mod/settings.php:986
+#: ../../mod/settings.php:987
msgid "You are tagged in a post"
msgstr ""
-#: ../../mod/settings.php:987
+#: ../../mod/settings.php:988
msgid "You are poked/prodded/etc. in a post"
msgstr ""
-#: ../../mod/settings.php:990
+#: ../../mod/settings.php:991
msgid "Advanced Account/Page Type Settings"
msgstr ""
-#: ../../mod/settings.php:991
+#: ../../mod/settings.php:992
msgid "Change the behaviour of this account for special situations"
msgstr ""
-#: ../../mod/settings.php:994
+#: ../../mod/settings.php:995
msgid ""
"Please enable expert mode (in <a href=\"settings/features\">Settings > "
"Additional features</a>) to adjust!"
msgstr ""
-#: ../../mod/settings.php:995
+#: ../../mod/settings.php:996
msgid "Miscellaneous Settings"
msgstr ""
-#: ../../mod/settings.php:997
+#: ../../mod/settings.php:998
msgid "Personal menu to display in your channel pages"
msgstr ""
-#: ../../mod/settings.php:998
+#: ../../mod/settings.php:999
msgid "Remove this channel"
msgstr ""
@@ -4662,35 +4646,41 @@ msgstr ""
msgid "Please login."
msgstr ""
-#: ../../mod/cloud.php:115
+#: ../../mod/cloud.php:126
msgid "Red Matrix - Guests: Username: {your email address}, Password: +++"
msgstr ""
-#: ../../mod/removeme.php:49
+#: ../../mod/removeme.php:29
+msgid ""
+"Channel removals are not allowed within 48 hours of changing the account "
+"password."
+msgstr ""
+
+#: ../../mod/removeme.php:57
msgid "Remove This Channel"
msgstr ""
-#: ../../mod/removeme.php:50
+#: ../../mod/removeme.php:58
msgid ""
"This will completely remove this channel from the network. Once this has "
"been done it is not recoverable."
msgstr ""
-#: ../../mod/removeme.php:51
+#: ../../mod/removeme.php:59
msgid "Please enter your password for verification:"
msgstr ""
-#: ../../mod/removeme.php:52
+#: ../../mod/removeme.php:60
msgid "Remove this channel and all its clones from the network"
msgstr ""
-#: ../../mod/removeme.php:52
+#: ../../mod/removeme.php:60
msgid ""
"By default only the instance of the channel located on this hub will be "
"removed from the network"
msgstr ""
-#: ../../mod/removeme.php:53
+#: ../../mod/removeme.php:61
msgid "Remove Channel"
msgstr ""
@@ -4720,15 +4710,15 @@ msgstr ""
msgid "Authentication failed."
msgstr ""
-#: ../../mod/rmagic.php:78
+#: ../../mod/rmagic.php:82
msgid "Remote Authentication"
msgstr ""
-#: ../../mod/rmagic.php:79
+#: ../../mod/rmagic.php:83
msgid "Enter your channel address (e.g. channel@example.com)"
msgstr ""
-#: ../../mod/rmagic.php:80
+#: ../../mod/rmagic.php:84
msgid "Authenticate"
msgstr ""
@@ -4807,11 +4797,11 @@ msgstr ""
msgid "Could not locate selected profile."
msgstr ""
-#: ../../mod/connections.php:94 ../../mod/connedit.php:131
+#: ../../mod/connections.php:94 ../../mod/connedit.php:132
msgid "Connection updated."
msgstr ""
-#: ../../mod/connections.php:96 ../../mod/connedit.php:133
+#: ../../mod/connections.php:96 ../../mod/connedit.php:134
msgid "Failed to update connection record."
msgstr ""
@@ -4835,10 +4825,6 @@ msgstr ""
msgid "All"
msgstr ""
-#: ../../mod/connections.php:240 ../../mod/connections.php:320
-msgid "Unconnected"
-msgstr ""
-
#: ../../mod/connections.php:270
msgid "Suggest new connections"
msgstr ""
@@ -4879,10 +4865,6 @@ msgstr ""
msgid "Only show hidden connections"
msgstr ""
-#: ../../mod/connections.php:323
-msgid "Only show one-way connections"
-msgstr ""
-
#: ../../mod/connections.php:368
#, php-format
msgid "%1$s [%2$s]"
@@ -4904,310 +4886,314 @@ msgstr ""
msgid "Edit post"
msgstr ""
-#: ../../mod/connedit.php:243
+#: ../../mod/connedit.php:181
+msgid "is now connected to"
+msgstr ""
+
+#: ../../mod/connedit.php:276
msgid "Could not access address book record."
msgstr ""
-#: ../../mod/connedit.php:257
+#: ../../mod/connedit.php:290
msgid "Refresh failed - channel is currently unavailable."
msgstr ""
-#: ../../mod/connedit.php:264
+#: ../../mod/connedit.php:297
msgid "Channel has been unblocked"
msgstr ""
-#: ../../mod/connedit.php:265
+#: ../../mod/connedit.php:298
msgid "Channel has been blocked"
msgstr ""
-#: ../../mod/connedit.php:269 ../../mod/connedit.php:281
-#: ../../mod/connedit.php:293 ../../mod/connedit.php:305
-#: ../../mod/connedit.php:320
+#: ../../mod/connedit.php:302 ../../mod/connedit.php:314
+#: ../../mod/connedit.php:326 ../../mod/connedit.php:338
+#: ../../mod/connedit.php:353
msgid "Unable to set address book parameters."
msgstr ""
-#: ../../mod/connedit.php:276
+#: ../../mod/connedit.php:309
msgid "Channel has been unignored"
msgstr ""
-#: ../../mod/connedit.php:277
+#: ../../mod/connedit.php:310
msgid "Channel has been ignored"
msgstr ""
-#: ../../mod/connedit.php:288
+#: ../../mod/connedit.php:321
msgid "Channel has been unarchived"
msgstr ""
-#: ../../mod/connedit.php:289
+#: ../../mod/connedit.php:322
msgid "Channel has been archived"
msgstr ""
-#: ../../mod/connedit.php:300
+#: ../../mod/connedit.php:333
msgid "Channel has been unhidden"
msgstr ""
-#: ../../mod/connedit.php:301
+#: ../../mod/connedit.php:334
msgid "Channel has been hidden"
msgstr ""
-#: ../../mod/connedit.php:315
+#: ../../mod/connedit.php:348
msgid "Channel has been approved"
msgstr ""
-#: ../../mod/connedit.php:316
+#: ../../mod/connedit.php:349
msgid "Channel has been unapproved"
msgstr ""
-#: ../../mod/connedit.php:334
+#: ../../mod/connedit.php:367
msgid "Connection has been removed."
msgstr ""
-#: ../../mod/connedit.php:354
+#: ../../mod/connedit.php:387
#, php-format
msgid "View %s's profile"
msgstr ""
-#: ../../mod/connedit.php:358
+#: ../../mod/connedit.php:391
msgid "Refresh Permissions"
msgstr ""
-#: ../../mod/connedit.php:361
+#: ../../mod/connedit.php:394
msgid "Fetch updated permissions"
msgstr ""
-#: ../../mod/connedit.php:365
+#: ../../mod/connedit.php:398
msgid "Recent Activity"
msgstr ""
-#: ../../mod/connedit.php:368
+#: ../../mod/connedit.php:401
msgid "View recent posts and comments"
msgstr ""
-#: ../../mod/connedit.php:372 ../../mod/connedit.php:515
+#: ../../mod/connedit.php:405 ../../mod/connedit.php:548
#: ../../mod/admin.php:760
msgid "Unblock"
msgstr ""
-#: ../../mod/connedit.php:372 ../../mod/connedit.php:515
+#: ../../mod/connedit.php:405 ../../mod/connedit.php:548
#: ../../mod/admin.php:759
msgid "Block"
msgstr ""
-#: ../../mod/connedit.php:375
+#: ../../mod/connedit.php:408
msgid "Block or Unblock this connection"
msgstr ""
-#: ../../mod/connedit.php:379 ../../mod/connedit.php:516
+#: ../../mod/connedit.php:412 ../../mod/connedit.php:549
msgid "Unignore"
msgstr ""
-#: ../../mod/connedit.php:379 ../../mod/connedit.php:516
+#: ../../mod/connedit.php:412 ../../mod/connedit.php:549
#: ../../mod/notifications.php:51
msgid "Ignore"
msgstr ""
-#: ../../mod/connedit.php:382
+#: ../../mod/connedit.php:415
msgid "Ignore or Unignore this connection"
msgstr ""
-#: ../../mod/connedit.php:385
+#: ../../mod/connedit.php:418
msgid "Unarchive"
msgstr ""
-#: ../../mod/connedit.php:385
+#: ../../mod/connedit.php:418
msgid "Archive"
msgstr ""
-#: ../../mod/connedit.php:388
+#: ../../mod/connedit.php:421
msgid "Archive or Unarchive this connection"
msgstr ""
-#: ../../mod/connedit.php:391
+#: ../../mod/connedit.php:424
msgid "Unhide"
msgstr ""
-#: ../../mod/connedit.php:391
+#: ../../mod/connedit.php:424
msgid "Hide"
msgstr ""
-#: ../../mod/connedit.php:394
+#: ../../mod/connedit.php:427
msgid "Hide or Unhide this connection"
msgstr ""
-#: ../../mod/connedit.php:401
+#: ../../mod/connedit.php:434
msgid "Delete this connection"
msgstr ""
-#: ../../mod/connedit.php:444 ../../mod/connedit.php:473
+#: ../../mod/connedit.php:477 ../../mod/connedit.php:506
msgid "Approve this connection"
msgstr ""
-#: ../../mod/connedit.php:444
+#: ../../mod/connedit.php:477
msgid "Accept connection to allow communication"
msgstr ""
-#: ../../mod/connedit.php:460
+#: ../../mod/connedit.php:493
msgid "Automatic Permissions Settings"
msgstr ""
-#: ../../mod/connedit.php:460
+#: ../../mod/connedit.php:493
#, php-format
msgid "Connections: settings for %s"
msgstr ""
-#: ../../mod/connedit.php:464
+#: ../../mod/connedit.php:497
msgid ""
"When receiving a channel introduction, any permissions provided here will be "
"applied to the new connection automatically and the introduction approved. "
"Leave this page if you do not wish to use this feature."
msgstr ""
-#: ../../mod/connedit.php:466
+#: ../../mod/connedit.php:499
msgid "Slide to adjust your degree of friendship"
msgstr ""
-#: ../../mod/connedit.php:472
+#: ../../mod/connedit.php:505
msgid "inherited"
msgstr ""
-#: ../../mod/connedit.php:474
+#: ../../mod/connedit.php:507
msgid "Connection has no individual permissions!"
msgstr ""
-#: ../../mod/connedit.php:475
+#: ../../mod/connedit.php:508
msgid ""
"This may be appropriate based on your <a href=\"settings\">privacy settings</"
"a>, though you may wish to review the \"Advanced Permissions\"."
msgstr ""
-#: ../../mod/connedit.php:477
+#: ../../mod/connedit.php:510
msgid "Profile Visibility"
msgstr ""
-#: ../../mod/connedit.php:478
+#: ../../mod/connedit.php:511
#, php-format
msgid ""
"Please choose the profile you would like to display to %s when viewing your "
"profile securely."
msgstr ""
-#: ../../mod/connedit.php:479
+#: ../../mod/connedit.php:512
msgid "Contact Information / Notes"
msgstr ""
-#: ../../mod/connedit.php:480
+#: ../../mod/connedit.php:513
msgid "Edit contact notes"
msgstr ""
-#: ../../mod/connedit.php:482
+#: ../../mod/connedit.php:515
msgid "Their Settings"
msgstr ""
-#: ../../mod/connedit.php:483
+#: ../../mod/connedit.php:516
msgid "My Settings"
msgstr ""
-#: ../../mod/connedit.php:485
+#: ../../mod/connedit.php:518
msgid "Clear/Disable Automatic Permissions"
msgstr ""
-#: ../../mod/connedit.php:486
+#: ../../mod/connedit.php:519
msgid "Forum Members"
msgstr ""
-#: ../../mod/connedit.php:487
+#: ../../mod/connedit.php:520
msgid "Soapbox"
msgstr ""
-#: ../../mod/connedit.php:488
+#: ../../mod/connedit.php:521
msgid "Full Sharing (typical social network permissions)"
msgstr ""
-#: ../../mod/connedit.php:489
+#: ../../mod/connedit.php:522
msgid "Cautious Sharing "
msgstr ""
-#: ../../mod/connedit.php:490
+#: ../../mod/connedit.php:523
msgid "Follow Only"
msgstr ""
-#: ../../mod/connedit.php:491
+#: ../../mod/connedit.php:524
msgid "Individual Permissions"
msgstr ""
-#: ../../mod/connedit.php:492
+#: ../../mod/connedit.php:525
msgid ""
"Some permissions may be inherited from your channel <a href=\"settings"
"\">privacy settings</a>, which have higher priority than individual "
"settings. Changing those inherited settings on this page will have no effect."
msgstr ""
-#: ../../mod/connedit.php:493
+#: ../../mod/connedit.php:526
msgid "Advanced Permissions"
msgstr ""
-#: ../../mod/connedit.php:494
+#: ../../mod/connedit.php:527
msgid "Simple Permissions (select one and submit)"
msgstr ""
-#: ../../mod/connedit.php:498
+#: ../../mod/connedit.php:531
#, php-format
msgid "Visit %s's profile - %s"
msgstr ""
-#: ../../mod/connedit.php:499
+#: ../../mod/connedit.php:532
msgid "Block/Unblock contact"
msgstr ""
-#: ../../mod/connedit.php:500
+#: ../../mod/connedit.php:533
msgid "Ignore contact"
msgstr ""
-#: ../../mod/connedit.php:501
+#: ../../mod/connedit.php:534
msgid "Repair URL settings"
msgstr ""
-#: ../../mod/connedit.php:502
+#: ../../mod/connedit.php:535
msgid "View conversations"
msgstr ""
-#: ../../mod/connedit.php:504
+#: ../../mod/connedit.php:537
msgid "Delete contact"
msgstr ""
-#: ../../mod/connedit.php:507
+#: ../../mod/connedit.php:540
msgid "Last update:"
msgstr ""
-#: ../../mod/connedit.php:509
+#: ../../mod/connedit.php:542
msgid "Update public posts"
msgstr ""
-#: ../../mod/connedit.php:511
+#: ../../mod/connedit.php:544
msgid "Update now"
msgstr ""
-#: ../../mod/connedit.php:517
+#: ../../mod/connedit.php:550
msgid "Currently blocked"
msgstr ""
-#: ../../mod/connedit.php:518
+#: ../../mod/connedit.php:551
msgid "Currently ignored"
msgstr ""
-#: ../../mod/connedit.php:519
+#: ../../mod/connedit.php:552
msgid "Currently archived"
msgstr ""
-#: ../../mod/connedit.php:520
+#: ../../mod/connedit.php:553
msgid "Currently pending"
msgstr ""
-#: ../../mod/connedit.php:521
+#: ../../mod/connedit.php:554
msgid "Hide this contact from others"
msgstr ""
-#: ../../mod/connedit.php:521
+#: ../../mod/connedit.php:554
msgid ""
"Replies/likes to your public posts <strong>may</strong> still be visible"
msgstr ""
@@ -5261,19 +5247,19 @@ msgstr ""
msgid "Gender: "
msgstr ""
-#: ../../mod/directory.php:207
+#: ../../mod/directory.php:215
msgid "Finding:"
msgstr ""
-#: ../../mod/directory.php:215
+#: ../../mod/directory.php:222
msgid "next page"
msgstr ""
-#: ../../mod/directory.php:215
+#: ../../mod/directory.php:222
msgid "previous page"
msgstr ""
-#: ../../mod/directory.php:222
+#: ../../mod/directory.php:231
msgid "No entries (some entries may be hidden)."
msgstr ""
@@ -5646,7 +5632,7 @@ msgstr ""
#: ../../mod/setup.php:572
msgid ""
-"If your certificate is not recognised, members of other sites (who may "
+"If your certificate is not recognized, members of other sites (who may "
"themselves have valid certificates) will get a warning message on their own "
"site complaining about security issues."
msgstr ""
@@ -5800,7 +5786,7 @@ msgstr ""
#: ../../mod/siteinfo.php:98
msgid ""
"This is a hub of the Red Matrix - a global cooperative network of "
-"decentralised privacy enhanced websites."
+"decentralized privacy enhanced websites."
msgstr ""
#: ../../mod/siteinfo.php:101
@@ -6198,7 +6184,7 @@ msgstr ""
msgid "All Connected Channels"
msgstr ""
-#: ../../mod/group.php:231
+#: ../../mod/group.php:233
msgid "Click on a channel to add or remove."
msgstr ""
@@ -6990,14 +6976,14 @@ msgstr ""
msgid "Enter email addresses, one per line:"
msgstr ""
-#: ../../mod/invite.php:143 ../../mod/mail.php:212 ../../mod/mail.php:325
+#: ../../mod/invite.php:143 ../../mod/mail.php:225 ../../mod/mail.php:338
msgid "Your message:"
msgstr ""
#: ../../mod/invite.php:144
msgid ""
"You are cordially invited to join me and some other close friends on the Red "
-"Matrix - a revolutionary new decentralised communication and information "
+"Matrix - a revolutionary new decentralized communication and information "
"tool."
msgstr ""
@@ -7042,12 +7028,12 @@ msgstr ""
msgid "System error. Post not saved."
msgstr ""
-#: ../../mod/item.php:1285
+#: ../../mod/item.php:1294
#, php-format
msgid "You have reached your limit of %1$.0f top level posts."
msgstr ""
-#: ../../mod/item.php:1291
+#: ../../mod/item.php:1300
#, php-format
msgid "You have reached your limit of %1$.0f webpages."
msgstr ""
@@ -7065,10 +7051,44 @@ msgstr ""
msgid "Layout Name"
msgstr ""
-#: ../../mod/like.php:97
+#: ../../mod/like.php:15
+msgid "Like/Dislike"
+msgstr ""
+
+#: ../../mod/like.php:20
+msgid "This action is restricted to members."
+msgstr ""
+
+#: ../../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/like.php:77 ../../mod/like.php:104 ../../mod/like.php:142
+msgid "Invalid request."
+msgstr ""
+
+#: ../../mod/like.php:119
msgid "thing"
msgstr ""
+#: ../../mod/like.php:165
+msgid "Channel unavailable."
+msgstr ""
+
+#: ../../mod/like.php:204
+msgid "Previous action reversed."
+msgstr ""
+
+#: ../../mod/like.php:417
+msgid "Action completed."
+msgstr ""
+
+#: ../../mod/like.php:418
+msgid "Thank you."
+msgstr ""
+
#: ../../mod/lockview.php:30 ../../mod/lockview.php:36
msgid "Remote privacy information not available."
msgstr ""
@@ -7081,12 +7101,12 @@ msgstr ""
msgid "No connections."
msgstr ""
-#: ../../mod/viewconnections.php:70
+#: ../../mod/viewconnections.php:71
#, php-format
msgid "Visit %s's profile [%s]"
msgstr ""
-#: ../../mod/viewconnections.php:85
+#: ../../mod/viewconnections.php:86
msgid "View Connnections"
msgstr ""
@@ -7114,7 +7134,7 @@ msgid ""
"Password reset failed."
msgstr ""
-#: ../../mod/lostpass.php:85 ../../boot.php:1479
+#: ../../mod/lostpass.php:85 ../../boot.php:1503
msgid "Password Reset"
msgstr ""
@@ -7203,49 +7223,49 @@ msgstr ""
msgid "Message recalled."
msgstr ""
-#: ../../mod/mail.php:202
+#: ../../mod/mail.php:215
msgid "Send Private Message"
msgstr ""
-#: ../../mod/mail.php:203 ../../mod/mail.php:320
+#: ../../mod/mail.php:216 ../../mod/mail.php:333
msgid "To:"
msgstr ""
-#: ../../mod/mail.php:208 ../../mod/mail.php:322
+#: ../../mod/mail.php:221 ../../mod/mail.php:335
msgid "Subject:"
msgstr ""
-#: ../../mod/mail.php:246
+#: ../../mod/mail.php:259
msgid "Message not found."
msgstr ""
-#: ../../mod/mail.php:289 ../../mod/message.php:72
+#: ../../mod/mail.php:302 ../../mod/message.php:72
msgid "Delete message"
msgstr ""
-#: ../../mod/mail.php:290
+#: ../../mod/mail.php:303
msgid "Recall message"
msgstr ""
-#: ../../mod/mail.php:292
+#: ../../mod/mail.php:305
msgid "Message has been recalled."
msgstr ""
-#: ../../mod/mail.php:309
+#: ../../mod/mail.php:322
msgid "Private Conversation"
msgstr ""
-#: ../../mod/mail.php:313
+#: ../../mod/mail.php:326
msgid "Delete conversation"
msgstr ""
-#: ../../mod/mail.php:315
+#: ../../mod/mail.php:328
msgid ""
"No secure communications available. You <strong>may</strong> be able to "
"respond from the sender's profile page."
msgstr ""
-#: ../../mod/mail.php:319
+#: ../../mod/mail.php:332
msgid "Send Reply"
msgstr ""
@@ -7507,6 +7527,14 @@ msgstr ""
msgid "Location (URL) to purchase app"
msgstr ""
+#: ../../mod/poll.php:64
+msgid "Poll"
+msgstr ""
+
+#: ../../mod/poll.php:69
+msgid "View Results"
+msgstr ""
+
#: ../../view/theme/apw/php/config.php:202
#: ../../view/theme/apw/php/config.php:236
msgid "Schema Default"
@@ -7677,35 +7705,35 @@ msgid "Narrow navbar"
msgstr ""
#: ../../view/theme/redbasic/php/config.php:105
-msgid "Navigation bar background colour"
+msgid "Navigation bar background color"
msgstr ""
#: ../../view/theme/redbasic/php/config.php:106
-msgid "Navigation bar gradient top colour"
+msgid "Navigation bar gradient top color"
msgstr ""
#: ../../view/theme/redbasic/php/config.php:107
-msgid "Navigation bar gradient bottom colour"
+msgid "Navigation bar gradient bottom color"
msgstr ""
#: ../../view/theme/redbasic/php/config.php:108
-msgid "Navigation active button gradient top colour"
+msgid "Navigation active button gradient top color"
msgstr ""
#: ../../view/theme/redbasic/php/config.php:109
-msgid "Navigation active button gradient bottom colour"
+msgid "Navigation active button gradient bottom color"
msgstr ""
#: ../../view/theme/redbasic/php/config.php:110
-msgid "Navigation bar border colour "
+msgid "Navigation bar border color "
msgstr ""
#: ../../view/theme/redbasic/php/config.php:111
-msgid "Navigation bar icon colour "
+msgid "Navigation bar icon color "
msgstr ""
#: ../../view/theme/redbasic/php/config.php:112
-msgid "Navigation bar active icon colour "
+msgid "Navigation bar active icon color "
msgstr ""
#: ../../view/theme/redbasic/php/config.php:113
@@ -7713,11 +7741,11 @@ msgid "link colour"
msgstr ""
#: ../../view/theme/redbasic/php/config.php:114
-msgid "Set font-colour for banner"
+msgid "Set font-color for banner"
msgstr ""
#: ../../view/theme/redbasic/php/config.php:115
-msgid "Set the background colour"
+msgid "Set the background color"
msgstr ""
#: ../../view/theme/redbasic/php/config.php:116
@@ -7725,15 +7753,15 @@ msgid "Set the background image"
msgstr ""
#: ../../view/theme/redbasic/php/config.php:117
-msgid "Set the background colour of items"
+msgid "Set the background color of items"
msgstr ""
#: ../../view/theme/redbasic/php/config.php:118
-msgid "Set the background colour of comments"
+msgid "Set the background color of comments"
msgstr ""
#: ../../view/theme/redbasic/php/config.php:119
-msgid "Set the border colour of comments"
+msgid "Set the border color of comments"
msgstr ""
#: ../../view/theme/redbasic/php/config.php:120
@@ -7741,11 +7769,11 @@ msgid "Set the indent for comments"
msgstr ""
#: ../../view/theme/redbasic/php/config.php:121
-msgid "Set the basic colour for item icons"
+msgid "Set the basic color for item icons"
msgstr ""
#: ../../view/theme/redbasic/php/config.php:122
-msgid "Set the hover colour for item icons"
+msgid "Set the hover color for item icons"
msgstr ""
#: ../../view/theme/redbasic/php/config.php:123
@@ -7753,7 +7781,7 @@ msgid "Set font-size for the entire application"
msgstr ""
#: ../../view/theme/redbasic/php/config.php:125
-msgid "Set font-colour for posts and comments"
+msgid "Set font-color for posts and comments"
msgstr ""
#: ../../view/theme/redbasic/php/config.php:126
@@ -7792,41 +7820,41 @@ msgstr ""
msgid "Are you a clean desk or a messy desk person?"
msgstr ""
-#: ../../boot.php:1277
+#: ../../boot.php:1291
#, php-format
msgid "Update %s failed. See error logs."
msgstr ""
-#: ../../boot.php:1280
+#: ../../boot.php:1294
#, php-format
msgid "Update Error at %s"
msgstr ""
-#: ../../boot.php:1444
+#: ../../boot.php:1468
msgid ""
"Create an account to access services and applications within the Red Matrix"
msgstr ""
-#: ../../boot.php:1472
+#: ../../boot.php:1496
msgid "Password"
msgstr ""
-#: ../../boot.php:1473
+#: ../../boot.php:1497
msgid "Remember me"
msgstr ""
-#: ../../boot.php:1478
+#: ../../boot.php:1502
msgid "Forgot your password?"
msgstr ""
-#: ../../boot.php:1543
+#: ../../boot.php:1567
msgid "permission denied"
msgstr ""
-#: ../../boot.php:1544
+#: ../../boot.php:1568
msgid "Got Zot?"
msgstr ""
-#: ../../boot.php:1974
+#: ../../boot.php:1998
msgid "toggle mobile"
msgstr ""
diff --git a/util/shredder/shredder b/util/shredder/shredder
index 1586746e0..ac84f0541 100755
--- a/util/shredder/shredder
+++ b/util/shredder/shredder
@@ -203,18 +203,18 @@ main () {
return $FO_rval
;;
-# statuses_update)
-# [[ "$fcli_status" == "" ]] && show_statuses_update 1
-# FO_statuses_update 'json' "$fcli_status" "$fcli_in_reply_to_status_id"
-# JS_Parsed=$(echo "$FO_ret" | tokenize | parse)
-# echo "$JS_Parsed" | js "user" "name" ,
-# echo -n " - "
-# echo "$JS_Parsed" | js "created_at"
-# echo "$JS_Parsed" | js "text"
-# echo ""
-# echo "------------------------------------------------------------------------------"
-# return $FO_rval
-# ;;
+ statuses_update)
+ [[ "$fcli_status" == "" ]] && show_statuses_update 1
+ FO_statuses_update 'json' "$fcli_status" "$fcli_in_reply_to_status_id"
+ JS_Parsed=$(echo "$FO_ret" | tokenize | parse)
+ echo "$JS_Parsed" | js "user" "name" ,
+ echo -n " - "
+ echo "$JS_Parsed" | js "created_at"
+ echo "$JS_Parsed" | js "text"
+ echo ""
+ echo "------------------------------------------------------------------------------"
+ return $FO_rval
+ ;;
*)