aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHaakon Meland Eriksen <haakon.eriksen@far.no>2015-11-14 08:32:37 +0100
committerHaakon Meland Eriksen <haakon.eriksen@far.no>2015-11-14 08:32:37 +0100
commit6bdde985ce76fe768046cbb0d368c382925b027d (patch)
tree133bcec2650f68ba3be894cbf55596696ee8b2e9
parent9d6a4c1d0530f727aa41c940f826a2d621babe0b (diff)
parentdba38821bc5f3ad9b3a8f4f614d651e98f0b5ec5 (diff)
downloadvolse-hubzilla-6bdde985ce76fe768046cbb0d368c382925b027d.tar.gz
volse-hubzilla-6bdde985ce76fe768046cbb0d368c382925b027d.tar.bz2
volse-hubzilla-6bdde985ce76fe768046cbb0d368c382925b027d.zip
Merge remote-tracking branch 'upstream/master'
-rw-r--r--include/enotify.php3
-rw-r--r--mod/siteinfo.php4
-rw-r--r--util/hmessages.po1067
-rw-r--r--version.inc2
4 files changed, 543 insertions, 533 deletions
diff --git a/include/enotify.php b/include/enotify.php
index bbddcdd14..c9b6e0463 100644
--- a/include/enotify.php
+++ b/include/enotify.php
@@ -152,6 +152,8 @@ function notification($params) {
// $private = $p[0]['item_private'];
$parent_id = $p[0]['id'];
+ $parent_item = $p[0];
+
//$possess_desc = str_replace('<!item_type!>',$possess_desc);
// "a post"
@@ -358,6 +360,7 @@ function notification($params) {
$datarray['uid'] = $recip['channel_id'];
$datarray['link'] = $itemlink;
$datarray['parent'] = $parent_mid;
+ $datarray['parent_item'] = $parent_item;
$datarray['type'] = $params['type'];
$datarray['verb'] = $params['verb'];
$datarray['otype'] = $params['otype'];
diff --git a/mod/siteinfo.php b/mod/siteinfo.php
index 2fffccc73..231427290 100644
--- a/mod/siteinfo.php
+++ b/mod/siteinfo.php
@@ -81,8 +81,8 @@ function siteinfo_init(&$a) {
'commit' => $commit,
'url' => z_root(),
'plugins' => $visible_plugins,
- 'register_policy' => $register_policy[$a->config['system']['register_policy']],
- 'directory_mode' => $directory_mode[$a->config['system']['directory_mode']],
+ 'register_policy' => $register_policy[get_config('system','register_policy')],
+ 'directory_mode' => $directory_mode[get_config('system','directory_mode')],
'language' => get_config('system','language'),
'rss_connections' => get_config('system','feed_contacts'),
'expiration' => $site_expire,
diff --git a/util/hmessages.po b/util/hmessages.po
index fc2f8c014..7bcb498f9 100644
--- a/util/hmessages.po
+++ b/util/hmessages.po
@@ -6,9 +6,9 @@
#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: 2015-11-05.1207\n"
+"Project-Id-Version: 2015-11-13.1215\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-11-06 00:02-0800\n"
+"POT-Creation-Date: 2015-11-13 00:03-0800\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,13 +17,13 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../../include/conversation.php:120 ../../include/text.php:1863
+#: ../../include/conversation.php:120 ../../include/text.php:1873
#: ../../mod/like.php:361 ../../mod/tagger.php:43 ../../mod/subthread.php:77
msgid "photo"
msgstr ""
#: ../../include/conversation.php:123 ../../include/event.php:896
-#: ../../include/text.php:1866 ../../mod/like.php:363 ../../mod/tagger.php:47
+#: ../../include/text.php:1876 ../../mod/like.php:363 ../../mod/tagger.php:47
#: ../../mod/events.php:245
msgid "event"
msgstr ""
@@ -32,12 +32,12 @@ msgstr ""
msgid "channel"
msgstr ""
-#: ../../include/conversation.php:148 ../../include/text.php:1869
+#: ../../include/conversation.php:148 ../../include/text.php:1879
#: ../../mod/like.php:361 ../../mod/subthread.php:77
msgid "status"
msgstr ""
-#: ../../include/conversation.php:150 ../../include/text.php:1871
+#: ../../include/conversation.php:150 ../../include/text.php:1881
#: ../../mod/tagger.php:53
msgid "comment"
msgstr ""
@@ -62,7 +62,7 @@ msgstr ""
msgid "%1$s poked %2$s"
msgstr ""
-#: ../../include/conversation.php:243 ../../include/text.php:942
+#: ../../include/conversation.php:243 ../../include/text.php:946
msgid "poked"
msgstr ""
@@ -118,7 +118,7 @@ msgstr ""
#: ../../include/conversation.php:657 ../../include/RedDAV/RedBrowser.php:241
#: ../../include/apps.php:260 ../../include/ItemObject.php:120
-#: ../../mod/connedit.php:546 ../../mod/photos.php:1129
+#: ../../mod/connedit.php:551 ../../mod/photos.php:1129
#: ../../mod/editblock.php:181 ../../mod/admin.php:808 ../../mod/admin.php:967
#: ../../mod/webpages.php:183 ../../mod/blocks.php:155 ../../mod/thing.php:258
#: ../../mod/settings.php:647 ../../mod/editlayout.php:179
@@ -170,7 +170,7 @@ msgstr ""
msgid "View in context"
msgstr ""
-#: ../../include/conversation.php:739 ../../include/conversation.php:1221
+#: ../../include/conversation.php:739 ../../include/conversation.php:1226
#: ../../include/ItemObject.php:375 ../../mod/photos.php:1029
#: ../../mod/editblock.php:150 ../../mod/editpost.php:129
#: ../../mod/editlayout.php:148 ../../mod/editwebpage.php:190
@@ -206,7 +206,7 @@ msgid "View Status"
msgstr ""
#: ../../include/conversation.php:949 ../../include/nav.php:86
-#: ../../mod/connedit.php:493
+#: ../../mod/connedit.php:498
msgid "View Profile"
msgstr ""
@@ -219,8 +219,8 @@ msgid "Activity/Posts"
msgstr ""
#: ../../include/conversation.php:952 ../../include/Contact.php:101
-#: ../../include/identity.php:965 ../../include/widgets.php:136
-#: ../../include/widgets.php:174 ../../mod/directory.php:316
+#: ../../include/identity.php:952 ../../include/widgets.php:136
+#: ../../include/widgets.php:174 ../../mod/directory.php:318
#: ../../mod/match.php:64 ../../mod/suggest.php:52
msgid "Connect"
msgstr ""
@@ -239,7 +239,8 @@ msgstr ""
#: ../../include/conversation.php:1026 ../../include/RedDAV/RedBrowser.php:164
#: ../../include/apps.php:360 ../../include/apps.php:415
-#: ../../mod/photos.php:759 ../../mod/photos.php:1198
+#: ../../include/widgets.php:1281 ../../mod/photos.php:759
+#: ../../mod/photos.php:1198
msgid "Unknown"
msgstr ""
@@ -288,41 +289,41 @@ msgstr ""
msgid "%s don't like this."
msgstr ""
-#: ../../include/conversation.php:1148
+#: ../../include/conversation.php:1153
msgid "Visible to <strong>everybody</strong>"
msgstr ""
-#: ../../include/conversation.php:1149 ../../mod/mail.php:194
+#: ../../include/conversation.php:1154 ../../mod/mail.php:194
#: ../../mod/mail.php:308
msgid "Please enter a link URL:"
msgstr ""
-#: ../../include/conversation.php:1150
+#: ../../include/conversation.php:1155
msgid "Please enter a video link/URL:"
msgstr ""
-#: ../../include/conversation.php:1151
+#: ../../include/conversation.php:1156
msgid "Please enter an audio link/URL:"
msgstr ""
-#: ../../include/conversation.php:1152
+#: ../../include/conversation.php:1157
msgid "Tag term:"
msgstr ""
-#: ../../include/conversation.php:1153 ../../mod/filer.php:48
+#: ../../include/conversation.php:1158 ../../mod/filer.php:48
msgid "Save to Folder:"
msgstr ""
-#: ../../include/conversation.php:1154
+#: ../../include/conversation.php:1159
msgid "Where are you right now?"
msgstr ""
-#: ../../include/conversation.php:1155 ../../mod/editpost.php:54
+#: ../../include/conversation.php:1160 ../../mod/editpost.php:54
#: ../../mod/mail.php:195 ../../mod/mail.php:309
msgid "Expires YYYY-MM-DD HH:MM"
msgstr ""
-#: ../../include/conversation.php:1163 ../../include/page_widgets.php:40
+#: ../../include/conversation.php:1168 ../../include/page_widgets.php:40
#: ../../include/ItemObject.php:692 ../../mod/photos.php:1049
#: ../../mod/editblock.php:171 ../../mod/editpost.php:149
#: ../../mod/events.php:707 ../../mod/webpages.php:188
@@ -330,302 +331,302 @@ msgstr ""
msgid "Preview"
msgstr ""
-#: ../../include/conversation.php:1186 ../../mod/layouts.php:184
+#: ../../include/conversation.php:1191 ../../mod/layouts.php:184
#: ../../mod/photos.php:1028 ../../mod/webpages.php:182
#: ../../mod/blocks.php:154
msgid "Share"
msgstr ""
-#: ../../include/conversation.php:1188
+#: ../../include/conversation.php:1193
msgid "Page link name"
msgstr ""
-#: ../../include/conversation.php:1191
+#: ../../include/conversation.php:1196
msgid "Post as"
msgstr ""
-#: ../../include/conversation.php:1193 ../../include/ItemObject.php:684
+#: ../../include/conversation.php:1198 ../../include/ItemObject.php:684
#: ../../mod/editblock.php:136 ../../mod/editpost.php:113
#: ../../mod/editlayout.php:135 ../../mod/editwebpage.php:177
msgid "Bold"
msgstr ""
-#: ../../include/conversation.php:1194 ../../include/ItemObject.php:685
+#: ../../include/conversation.php:1199 ../../include/ItemObject.php:685
#: ../../mod/editblock.php:137 ../../mod/editpost.php:114
#: ../../mod/editlayout.php:136 ../../mod/editwebpage.php:178
msgid "Italic"
msgstr ""
-#: ../../include/conversation.php:1195 ../../include/ItemObject.php:686
+#: ../../include/conversation.php:1200 ../../include/ItemObject.php:686
#: ../../mod/editblock.php:138 ../../mod/editpost.php:115
#: ../../mod/editlayout.php:137 ../../mod/editwebpage.php:179
msgid "Underline"
msgstr ""
-#: ../../include/conversation.php:1196 ../../include/ItemObject.php:687
+#: ../../include/conversation.php:1201 ../../include/ItemObject.php:687
#: ../../mod/editblock.php:139 ../../mod/editpost.php:116
#: ../../mod/editlayout.php:138 ../../mod/editwebpage.php:180
msgid "Quote"
msgstr ""
-#: ../../include/conversation.php:1197 ../../include/ItemObject.php:688
+#: ../../include/conversation.php:1202 ../../include/ItemObject.php:688
#: ../../mod/editblock.php:140 ../../mod/editpost.php:117
#: ../../mod/editlayout.php:139 ../../mod/editwebpage.php:181
msgid "Code"
msgstr ""
-#: ../../include/conversation.php:1198 ../../mod/editblock.php:142
+#: ../../include/conversation.php:1203 ../../mod/editblock.php:142
#: ../../mod/editpost.php:118 ../../mod/editlayout.php:140
#: ../../mod/editwebpage.php:182
msgid "Upload photo"
msgstr ""
-#: ../../include/conversation.php:1199
+#: ../../include/conversation.php:1204
msgid "upload photo"
msgstr ""
-#: ../../include/conversation.php:1200 ../../mod/editblock.php:143
+#: ../../include/conversation.php:1205 ../../mod/editblock.php:143
#: ../../mod/editpost.php:119 ../../mod/mail.php:240 ../../mod/mail.php:369
#: ../../mod/editlayout.php:141 ../../mod/editwebpage.php:183
msgid "Attach file"
msgstr ""
-#: ../../include/conversation.php:1201
+#: ../../include/conversation.php:1206
msgid "attach file"
msgstr ""
-#: ../../include/conversation.php:1202 ../../mod/editblock.php:144
+#: ../../include/conversation.php:1207 ../../mod/editblock.php:144
#: ../../mod/editpost.php:120 ../../mod/mail.php:241 ../../mod/mail.php:370
#: ../../mod/editlayout.php:142 ../../mod/editwebpage.php:184
msgid "Insert web link"
msgstr ""
-#: ../../include/conversation.php:1203
+#: ../../include/conversation.php:1208
msgid "web link"
msgstr ""
-#: ../../include/conversation.php:1204
+#: ../../include/conversation.php:1209
msgid "Insert video link"
msgstr ""
-#: ../../include/conversation.php:1205
+#: ../../include/conversation.php:1210
msgid "video link"
msgstr ""
-#: ../../include/conversation.php:1206
+#: ../../include/conversation.php:1211
msgid "Insert audio link"
msgstr ""
-#: ../../include/conversation.php:1207
+#: ../../include/conversation.php:1212
msgid "audio link"
msgstr ""
-#: ../../include/conversation.php:1208 ../../mod/editblock.php:148
+#: ../../include/conversation.php:1213 ../../mod/editblock.php:148
#: ../../mod/editpost.php:124 ../../mod/editlayout.php:146
#: ../../mod/editwebpage.php:188
msgid "Set your location"
msgstr ""
-#: ../../include/conversation.php:1209
+#: ../../include/conversation.php:1214
msgid "set location"
msgstr ""
-#: ../../include/conversation.php:1210 ../../mod/editpost.php:126
+#: ../../include/conversation.php:1215 ../../mod/editpost.php:126
msgid "Toggle voting"
msgstr ""
-#: ../../include/conversation.php:1213 ../../mod/editblock.php:149
+#: ../../include/conversation.php:1218 ../../mod/editblock.php:149
#: ../../mod/editpost.php:125 ../../mod/editlayout.php:147
#: ../../mod/editwebpage.php:189
msgid "Clear browser location"
msgstr ""
-#: ../../include/conversation.php:1214
+#: ../../include/conversation.php:1219
msgid "clear location"
msgstr ""
-#: ../../include/conversation.php:1216 ../../mod/editblock.php:162
+#: ../../include/conversation.php:1221 ../../mod/editblock.php:162
#: ../../mod/editpost.php:141 ../../mod/editwebpage.php:205
msgid "Title (optional)"
msgstr ""
-#: ../../include/conversation.php:1220 ../../mod/editblock.php:165
+#: ../../include/conversation.php:1225 ../../mod/editblock.php:165
#: ../../mod/editpost.php:143 ../../mod/editlayout.php:163
#: ../../mod/editwebpage.php:207
msgid "Categories (optional, comma-separated list)"
msgstr ""
-#: ../../include/conversation.php:1222 ../../mod/editblock.php:151
+#: ../../include/conversation.php:1227 ../../mod/editblock.php:151
#: ../../mod/editpost.php:130 ../../mod/editlayout.php:149
#: ../../mod/editwebpage.php:191
msgid "Permission settings"
msgstr ""
-#: ../../include/conversation.php:1223
+#: ../../include/conversation.php:1228
msgid "permissions"
msgstr ""
-#: ../../include/conversation.php:1231 ../../mod/editblock.php:159
+#: ../../include/conversation.php:1236 ../../mod/editblock.php:159
#: ../../mod/editpost.php:138 ../../mod/editlayout.php:156
#: ../../mod/editwebpage.php:200
msgid "Public post"
msgstr ""
-#: ../../include/conversation.php:1233 ../../mod/editblock.php:166
+#: ../../include/conversation.php:1238 ../../mod/editblock.php:166
#: ../../mod/editpost.php:144 ../../mod/editlayout.php:164
#: ../../mod/editwebpage.php:208
msgid "Example: bob@example.com, mary@example.com"
msgstr ""
-#: ../../include/conversation.php:1246 ../../mod/editblock.php:176
+#: ../../include/conversation.php:1251 ../../mod/editblock.php:176
#: ../../mod/editpost.php:155 ../../mod/mail.php:245 ../../mod/mail.php:374
#: ../../mod/editlayout.php:173 ../../mod/editwebpage.php:217
msgid "Set expiration date"
msgstr ""
-#: ../../include/conversation.php:1249
+#: ../../include/conversation.php:1254
msgid "Set publish date"
msgstr ""
-#: ../../include/conversation.php:1251 ../../include/ItemObject.php:695
+#: ../../include/conversation.php:1256 ../../include/ItemObject.php:695
#: ../../mod/editpost.php:157 ../../mod/mail.php:247 ../../mod/mail.php:376
msgid "Encrypt text"
msgstr ""
-#: ../../include/conversation.php:1253 ../../mod/editpost.php:159
+#: ../../include/conversation.php:1258 ../../mod/editpost.php:159
#: ../../mod/events.php:691
msgid "OK"
msgstr ""
-#: ../../include/conversation.php:1254 ../../mod/fbrowser.php:82
+#: ../../include/conversation.php:1259 ../../mod/fbrowser.php:82
#: ../../mod/fbrowser.php:117 ../../mod/editpost.php:160
#: ../../mod/events.php:690 ../../mod/tagrm.php:11 ../../mod/tagrm.php:134
#: ../../mod/settings.php:585 ../../mod/settings.php:611
msgid "Cancel"
msgstr ""
-#: ../../include/conversation.php:1497
+#: ../../include/conversation.php:1502
msgid "Discover"
msgstr ""
-#: ../../include/conversation.php:1500
+#: ../../include/conversation.php:1505
msgid "Imported public streams"
msgstr ""
-#: ../../include/conversation.php:1505
+#: ../../include/conversation.php:1510
msgid "Commented Order"
msgstr ""
-#: ../../include/conversation.php:1508
+#: ../../include/conversation.php:1513
msgid "Sort by Comment Date"
msgstr ""
-#: ../../include/conversation.php:1512
+#: ../../include/conversation.php:1517
msgid "Posted Order"
msgstr ""
-#: ../../include/conversation.php:1515
+#: ../../include/conversation.php:1520
msgid "Sort by Post Date"
msgstr ""
-#: ../../include/conversation.php:1520 ../../include/widgets.php:94
+#: ../../include/conversation.php:1525 ../../include/widgets.php:94
msgid "Personal"
msgstr ""
-#: ../../include/conversation.php:1523
+#: ../../include/conversation.php:1528
msgid "Posts that mention or involve you"
msgstr ""
-#: ../../include/conversation.php:1529 ../../mod/menu.php:112
+#: ../../include/conversation.php:1534 ../../mod/menu.php:112
#: ../../mod/connections.php:72 ../../mod/connections.php:82
msgid "New"
msgstr ""
-#: ../../include/conversation.php:1532
+#: ../../include/conversation.php:1537
msgid "Activity Stream - by date"
msgstr ""
-#: ../../include/conversation.php:1538
+#: ../../include/conversation.php:1543
msgid "Starred"
msgstr ""
-#: ../../include/conversation.php:1541
+#: ../../include/conversation.php:1546
msgid "Favourite Posts"
msgstr ""
-#: ../../include/conversation.php:1548
+#: ../../include/conversation.php:1553
msgid "Spam"
msgstr ""
-#: ../../include/conversation.php:1551
+#: ../../include/conversation.php:1556
msgid "Posts flagged as SPAM"
msgstr ""
-#: ../../include/conversation.php:1595 ../../mod/admin.php:972
+#: ../../include/conversation.php:1600 ../../mod/admin.php:972
msgid "Channel"
msgstr ""
-#: ../../include/conversation.php:1598
+#: ../../include/conversation.php:1603
msgid "Status Messages and Posts"
msgstr ""
-#: ../../include/conversation.php:1607
+#: ../../include/conversation.php:1612
msgid "About"
msgstr ""
-#: ../../include/conversation.php:1610
+#: ../../include/conversation.php:1615
msgid "Profile Details"
msgstr ""
-#: ../../include/conversation.php:1616 ../../include/apps.php:139
+#: ../../include/conversation.php:1621 ../../include/apps.php:139
#: ../../include/nav.php:92 ../../mod/fbrowser.php:25
msgid "Photos"
msgstr ""
-#: ../../include/conversation.php:1619 ../../include/photos.php:483
+#: ../../include/conversation.php:1624 ../../include/photos.php:483
msgid "Photo Albums"
msgstr ""
-#: ../../include/conversation.php:1623 ../../include/RedDAV/RedBrowser.php:226
+#: ../../include/conversation.php:1628 ../../include/RedDAV/RedBrowser.php:226
#: ../../include/apps.php:135 ../../include/nav.php:93
#: ../../mod/fbrowser.php:114
msgid "Files"
msgstr ""
-#: ../../include/conversation.php:1626
+#: ../../include/conversation.php:1631
msgid "Files and Storage"
msgstr ""
-#: ../../include/conversation.php:1636 ../../include/conversation.php:1639
+#: ../../include/conversation.php:1641 ../../include/conversation.php:1644
msgid "Chatrooms"
msgstr ""
-#: ../../include/conversation.php:1649 ../../include/apps.php:129
+#: ../../include/conversation.php:1654 ../../include/apps.php:129
#: ../../include/nav.php:103
msgid "Bookmarks"
msgstr ""
-#: ../../include/conversation.php:1652
+#: ../../include/conversation.php:1657
msgid "Saved Bookmarks"
msgstr ""
-#: ../../include/conversation.php:1659 ../../include/apps.php:136
+#: ../../include/conversation.php:1664 ../../include/apps.php:136
#: ../../include/nav.php:107 ../../mod/webpages.php:178
msgid "Webpages"
msgstr ""
-#: ../../include/conversation.php:1662
+#: ../../include/conversation.php:1667
msgid "Manage Webpages"
msgstr ""
-#: ../../include/conversation.php:1691 ../../include/ItemObject.php:175
+#: ../../include/conversation.php:1696 ../../include/ItemObject.php:175
#: ../../include/ItemObject.php:187 ../../mod/photos.php:1082
#: ../../mod/photos.php:1094
msgid "View all"
msgstr ""
-#: ../../include/conversation.php:1715 ../../include/ItemObject.php:179
-#: ../../include/identity.php:1276 ../../include/taxonomy.php:403
+#: ../../include/conversation.php:1720 ../../include/ItemObject.php:179
+#: ../../include/identity.php:1263 ../../include/taxonomy.php:403
#: ../../mod/photos.php:1086
msgctxt "noun"
msgid "Like"
@@ -633,7 +634,7 @@ msgid_plural "Likes"
msgstr[0] ""
msgstr[1] ""
-#: ../../include/conversation.php:1718 ../../include/ItemObject.php:184
+#: ../../include/conversation.php:1723 ../../include/ItemObject.php:184
#: ../../mod/photos.php:1091
msgctxt "noun"
msgid "Dislike"
@@ -641,42 +642,42 @@ msgid_plural "Dislikes"
msgstr[0] ""
msgstr[1] ""
-#: ../../include/conversation.php:1721
+#: ../../include/conversation.php:1726
msgctxt "noun"
msgid "Attending"
msgid_plural "Attending"
msgstr[0] ""
msgstr[1] ""
-#: ../../include/conversation.php:1724
+#: ../../include/conversation.php:1729
msgctxt "noun"
msgid "Not Attending"
msgid_plural "Not Attending"
msgstr[0] ""
msgstr[1] ""
-#: ../../include/conversation.php:1727
+#: ../../include/conversation.php:1732
msgctxt "noun"
msgid "Undecided"
msgid_plural "Undecided"
msgstr[0] ""
msgstr[1] ""
-#: ../../include/conversation.php:1730
+#: ../../include/conversation.php:1735
msgctxt "noun"
msgid "Agree"
msgid_plural "Agrees"
msgstr[0] ""
msgstr[1] ""
-#: ../../include/conversation.php:1733
+#: ../../include/conversation.php:1738
msgctxt "noun"
msgid "Disagree"
msgid_plural "Disagrees"
msgstr[0] ""
msgstr[1] ""
-#: ../../include/conversation.php:1736
+#: ../../include/conversation.php:1741
msgctxt "noun"
msgid "Abstain"
msgid_plural "Abstains"
@@ -691,7 +692,7 @@ msgstr ""
msgid "Unable to create a unique channel address. Import failed."
msgstr ""
-#: ../../include/Import/import_diaspora.php:143 ../../mod/import.php:486
+#: ../../include/Import/import_diaspora.php:143 ../../mod/import.php:487
msgid "Import completed."
msgstr ""
@@ -700,7 +701,7 @@ msgstr ""
msgid "parent"
msgstr ""
-#: ../../include/RedDAV/RedBrowser.php:131 ../../include/text.php:2529
+#: ../../include/RedDAV/RedBrowser.php:131 ../../include/text.php:2539
msgid "Collection"
msgstr ""
@@ -740,8 +741,9 @@ msgid "Create"
msgstr ""
#: ../../include/RedDAV/RedBrowser.php:231
-#: ../../include/RedDAV/RedBrowser.php:305 ../../mod/photos.php:784
-#: ../../mod/photos.php:1317 ../../mod/profile_photo.php:450
+#: ../../include/RedDAV/RedBrowser.php:305 ../../include/widgets.php:1293
+#: ../../mod/photos.php:784 ../../mod/photos.php:1317
+#: ../../mod/profile_photo.php:450
msgid "Upload"
msgstr ""
@@ -755,7 +757,7 @@ msgstr ""
msgid "Type"
msgstr ""
-#: ../../include/RedDAV/RedBrowser.php:237 ../../include/text.php:1236
+#: ../../include/RedDAV/RedBrowser.php:237 ../../include/text.php:1240
#: ../../mod/sharedwithme.php:97
msgid "Size"
msgstr ""
@@ -954,7 +956,7 @@ msgstr ""
#: ../../mod/fsuggest.php:78 ../../mod/authtest.php:13
#: ../../mod/bookmarks.php:48 ../../mod/block.php:22 ../../mod/block.php:72
#: ../../mod/id.php:71 ../../mod/like.php:177 ../../mod/common.php:35
-#: ../../mod/mitem.php:111 ../../mod/connedit.php:347 ../../mod/mood.php:112
+#: ../../mod/mitem.php:111 ../../mod/connedit.php:352 ../../mod/mood.php:112
#: ../../mod/filestorage.php:18 ../../mod/filestorage.php:73
#: ../../mod/filestorage.php:88 ../../mod/filestorage.php:115
#: ../../mod/layouts.php:69 ../../mod/layouts.php:76 ../../mod/layouts.php:87
@@ -967,7 +969,7 @@ msgstr ""
#: ../../mod/notifications.php:66 ../../mod/pdledit.php:21
#: ../../mod/events.php:256 ../../mod/profile_photo.php:338
#: ../../mod/profile_photo.php:351 ../../mod/item.php:205
-#: ../../mod/item.php:213 ../../mod/item.php:1004 ../../mod/message.php:16
+#: ../../mod/item.php:213 ../../mod/item.php:1006 ../../mod/message.php:16
#: ../../mod/webpages.php:69 ../../mod/register.php:72 ../../mod/blocks.php:69
#: ../../mod/blocks.php:76 ../../mod/service_limits.php:7
#: ../../mod/sources.php:66 ../../mod/regmod.php:17 ../../mod/channel.php:100
@@ -1004,7 +1006,7 @@ msgstr ""
msgid "Required"
msgstr ""
-#: ../../include/datetime.php:262 ../../boot.php:2312
+#: ../../include/datetime.php:262 ../../boot.php:2287
msgid "never"
msgstr ""
@@ -1412,7 +1414,7 @@ msgstr ""
msgid "Rate This Channel (this is public)"
msgstr ""
-#: ../../include/js_strings.php:20 ../../mod/connedit.php:685
+#: ../../include/js_strings.php:20 ../../mod/connedit.php:694
#: ../../mod/rate.php:157
msgid "Rating"
msgstr ""
@@ -1423,7 +1425,7 @@ msgstr ""
#: ../../include/js_strings.php:22 ../../include/ItemObject.php:683
#: ../../mod/fsuggest.php:108 ../../mod/mitem.php:231
-#: ../../mod/connedit.php:706 ../../mod/mood.php:135 ../../mod/pconfig.php:108
+#: ../../mod/connedit.php:715 ../../mod/mood.php:135 ../../mod/pconfig.php:108
#: ../../mod/filestorage.php:156 ../../mod/poke.php:171 ../../mod/chat.php:184
#: ../../mod/chat.php:213 ../../mod/rate.php:168 ../../mod/photos.php:637
#: ../../mod/photos.php:1008 ../../mod/photos.php:1048
@@ -1431,7 +1433,7 @@ msgstr ""
#: ../../mod/admin.php:965 ../../mod/admin.php:1097 ../../mod/admin.php:1291
#: ../../mod/admin.php:1376 ../../mod/appman.php:99 ../../mod/pdledit.php:58
#: ../../mod/events.php:534 ../../mod/events.php:710 ../../mod/sources.php:104
-#: ../../mod/sources.php:138 ../../mod/import.php:517 ../../mod/thing.php:313
+#: ../../mod/sources.php:138 ../../mod/import.php:527 ../../mod/thing.php:313
#: ../../mod/thing.php:359 ../../mod/invite.php:142 ../../mod/mail.php:371
#: ../../mod/settings.php:584 ../../mod/settings.php:696
#: ../../mod/settings.php:724 ../../mod/settings.php:747
@@ -1524,19 +1526,19 @@ msgstr ""
msgid "timeago.numbers"
msgstr ""
-#: ../../include/js_strings.php:44 ../../include/text.php:1153
+#: ../../include/js_strings.php:44 ../../include/text.php:1157
msgid "January"
msgstr ""
-#: ../../include/js_strings.php:45 ../../include/text.php:1153
+#: ../../include/js_strings.php:45 ../../include/text.php:1157
msgid "February"
msgstr ""
-#: ../../include/js_strings.php:46 ../../include/text.php:1153
+#: ../../include/js_strings.php:46 ../../include/text.php:1157
msgid "March"
msgstr ""
-#: ../../include/js_strings.php:47 ../../include/text.php:1153
+#: ../../include/js_strings.php:47 ../../include/text.php:1157
msgid "April"
msgstr ""
@@ -1545,31 +1547,31 @@ msgctxt "long"
msgid "May"
msgstr ""
-#: ../../include/js_strings.php:49 ../../include/text.php:1153
+#: ../../include/js_strings.php:49 ../../include/text.php:1157
msgid "June"
msgstr ""
-#: ../../include/js_strings.php:50 ../../include/text.php:1153
+#: ../../include/js_strings.php:50 ../../include/text.php:1157
msgid "July"
msgstr ""
-#: ../../include/js_strings.php:51 ../../include/text.php:1153
+#: ../../include/js_strings.php:51 ../../include/text.php:1157
msgid "August"
msgstr ""
-#: ../../include/js_strings.php:52 ../../include/text.php:1153
+#: ../../include/js_strings.php:52 ../../include/text.php:1157
msgid "September"
msgstr ""
-#: ../../include/js_strings.php:53 ../../include/text.php:1153
+#: ../../include/js_strings.php:53 ../../include/text.php:1157
msgid "October"
msgstr ""
-#: ../../include/js_strings.php:54 ../../include/text.php:1153
+#: ../../include/js_strings.php:54 ../../include/text.php:1157
msgid "November"
msgstr ""
-#: ../../include/js_strings.php:55 ../../include/text.php:1153
+#: ../../include/js_strings.php:55 ../../include/text.php:1157
msgid "December"
msgstr ""
@@ -1622,31 +1624,31 @@ msgstr ""
msgid "Dec"
msgstr ""
-#: ../../include/js_strings.php:68 ../../include/text.php:1149
+#: ../../include/js_strings.php:68 ../../include/text.php:1153
msgid "Sunday"
msgstr ""
-#: ../../include/js_strings.php:69 ../../include/text.php:1149
+#: ../../include/js_strings.php:69 ../../include/text.php:1153
msgid "Monday"
msgstr ""
-#: ../../include/js_strings.php:70 ../../include/text.php:1149
+#: ../../include/js_strings.php:70 ../../include/text.php:1153
msgid "Tuesday"
msgstr ""
-#: ../../include/js_strings.php:71 ../../include/text.php:1149
+#: ../../include/js_strings.php:71 ../../include/text.php:1153
msgid "Wednesday"
msgstr ""
-#: ../../include/js_strings.php:72 ../../include/text.php:1149
+#: ../../include/js_strings.php:72 ../../include/text.php:1153
msgid "Thursday"
msgstr ""
-#: ../../include/js_strings.php:73 ../../include/text.php:1149
+#: ../../include/js_strings.php:73 ../../include/text.php:1153
msgid "Friday"
msgstr ""
-#: ../../include/js_strings.php:74 ../../include/text.php:1149
+#: ../../include/js_strings.php:74 ../../include/text.php:1153
msgid "Saturday"
msgstr ""
@@ -1741,7 +1743,7 @@ msgstr ""
#: ../../include/contact_selectors.php:79 ../../mod/id.php:15
#: ../../mod/id.php:16 ../../mod/admin.php:804 ../../mod/admin.php:813
-#: ../../boot.php:1505
+#: ../../boot.php:1486
msgid "Email"
msgstr ""
@@ -1810,10 +1812,10 @@ msgstr ""
msgid "Cannot locate DNS info for database server '%s'"
msgstr ""
-#: ../../include/items.php:423 ../../mod/like.php:280 ../../mod/dreport.php:6
-#: ../../mod/dreport.php:45 ../../mod/subthread.php:52 ../../mod/group.php:68
-#: ../../mod/profperm.php:23 ../../mod/import_items.php:114
-#: ../../index.php:360
+#: ../../include/items.php:423 ../../mod/like.php:280
+#: ../../mod/subthread.php:52 ../../mod/dreport.php:6 ../../mod/dreport.php:45
+#: ../../mod/group.php:68 ../../mod/profperm.php:23
+#: ../../mod/import_items.php:114 ../../index.php:360
msgid "Permission denied"
msgstr ""
@@ -1874,7 +1876,7 @@ msgstr ""
msgid "Collection: %s"
msgstr ""
-#: ../../include/items.php:4853 ../../mod/connedit.php:674
+#: ../../include/items.php:4853 ../../mod/connedit.php:683
#, php-format
msgid "Connection: %s"
msgstr ""
@@ -1883,33 +1885,33 @@ msgstr ""
msgid "Connection not found."
msgstr ""
-#: ../../include/network.php:635
+#: ../../include/network.php:613
msgid "view full size"
msgstr ""
-#: ../../include/network.php:1613 ../../include/enotify.php:57
+#: ../../include/network.php:1591 ../../include/enotify.php:57
msgid "$Projectname Notification"
msgstr ""
-#: ../../include/network.php:1614 ../../include/enotify.php:58
+#: ../../include/network.php:1592 ../../include/enotify.php:58
msgid "$projectname"
msgstr ""
-#: ../../include/network.php:1616 ../../include/enotify.php:60
+#: ../../include/network.php:1594 ../../include/enotify.php:60
msgid "Thank You,"
msgstr ""
-#: ../../include/network.php:1618 ../../include/enotify.php:62
+#: ../../include/network.php:1596 ../../include/enotify.php:62
#, php-format
msgid "%s Administrator"
msgstr ""
-#: ../../include/network.php:1660 ../../include/account.php:316
+#: ../../include/network.php:1638 ../../include/account.php:316
#: ../../include/account.php:343 ../../include/account.php:403
msgid "Administrator"
msgstr ""
-#: ../../include/network.php:1674
+#: ../../include/network.php:1652
msgid "No Subject"
msgstr ""
@@ -1918,25 +1920,29 @@ msgstr ""
msgid "%1$s's bookmarks"
msgstr ""
-#: ../../include/acl_selectors.php:239
+#: ../../include/acl_selectors.php:240
msgid "Visible to your default audience"
msgstr ""
-#: ../../include/acl_selectors.php:240
+#: ../../include/acl_selectors.php:241
msgid "Show"
msgstr ""
-#: ../../include/acl_selectors.php:241
+#: ../../include/acl_selectors.php:242
msgid "Don't show"
msgstr ""
-#: ../../include/acl_selectors.php:247 ../../mod/filestorage.php:147
+#: ../../include/acl_selectors.php:247
+msgid "Other networks and post services"
+msgstr ""
+
+#: ../../include/acl_selectors.php:249 ../../mod/filestorage.php:147
#: ../../mod/chat.php:211 ../../mod/photos.php:631 ../../mod/photos.php:1001
#: ../../mod/events.php:708 ../../mod/thing.php:310 ../../mod/thing.php:356
msgid "Permissions"
msgstr ""
-#: ../../include/acl_selectors.php:248 ../../include/ItemObject.php:370
+#: ../../include/acl_selectors.php:250 ../../include/ItemObject.php:370
#: ../../mod/photos.php:1218
msgid "Close"
msgstr ""
@@ -1950,7 +1956,7 @@ msgstr ""
msgid "Channel clone failed. Import failed."
msgstr ""
-#: ../../include/import.php:80 ../../mod/import.php:138
+#: ../../include/import.php:80 ../../mod/import.php:139
msgid "Cloned channel not found. Import failed."
msgstr ""
@@ -2015,7 +2021,7 @@ msgstr ""
msgid "Edited"
msgstr ""
-#: ../../include/photo/photo_driver.php:708 ../../mod/photos.php:94
+#: ../../include/photo/photo_driver.php:719 ../../mod/photos.php:94
#: ../../mod/photos.php:699 ../../mod/profile_photo.php:146
#: ../../mod/profile_photo.php:236 ../../mod/profile_photo.php:376
msgid "Profile Photos"
@@ -2169,7 +2175,7 @@ msgstr ""
#: ../../include/profile_selectors.php:80 ../../include/identity.php:390
#: ../../include/identity.php:391 ../../include/identity.php:398
-#: ../../include/widgets.php:429 ../../mod/connedit.php:568
+#: ../../include/widgets.php:429 ../../mod/connedit.php:573
#: ../../mod/settings.php:338 ../../mod/settings.php:342
#: ../../mod/settings.php:343 ../../mod/settings.php:346
#: ../../mod/settings.php:357
@@ -2286,8 +2292,8 @@ msgstr ""
msgid "Finishes:"
msgstr ""
-#: ../../include/event.php:50 ../../include/identity.php:1016
-#: ../../include/bb2diaspora.php:493 ../../mod/directory.php:302
+#: ../../include/event.php:50 ../../include/identity.php:1003
+#: ../../include/bb2diaspora.php:493 ../../mod/directory.php:304
#: ../../mod/events.php:701
msgid "Location:"
msgstr ""
@@ -2324,7 +2330,7 @@ msgstr ""
msgid "Address Book"
msgstr ""
-#: ../../include/apps.php:131 ../../include/nav.php:111 ../../boot.php:1503
+#: ../../include/apps.php:131 ../../include/nav.php:111 ../../boot.php:1484
msgid "Login"
msgstr ""
@@ -2346,8 +2352,8 @@ msgstr ""
msgid "Channel Home"
msgstr ""
-#: ../../include/apps.php:138 ../../include/identity.php:1250
-#: ../../include/identity.php:1367 ../../mod/profperm.php:112
+#: ../../include/apps.php:138 ../../include/identity.php:1237
+#: ../../include/identity.php:1354 ../../mod/profperm.php:112
msgid "Profile"
msgstr ""
@@ -2377,8 +2383,8 @@ msgstr ""
msgid "Chat"
msgstr ""
-#: ../../include/apps.php:147 ../../include/text.php:857
-#: ../../include/text.php:869 ../../include/nav.php:159
+#: ../../include/apps.php:147 ../../include/text.php:859
+#: ../../include/text.php:871 ../../include/nav.php:159
#: ../../mod/search.php:40
msgid "Search"
msgstr ""
@@ -2429,16 +2435,8 @@ msgstr ""
msgid "Purchase"
msgstr ""
-#: ../../include/auth.php:131
-msgid "Logged out."
-msgstr ""
-
-#: ../../include/auth.php:272
-msgid "Failed authentication"
-msgstr ""
-
-#: ../../include/auth.php:286 ../../mod/openid.php:189
-msgid "Login failed."
+#: ../../include/api.php:1300
+msgid "Public Timeline"
msgstr ""
#: ../../include/enotify.php:96
@@ -2779,8 +2777,16 @@ msgstr ""
msgid "invalid target signature"
msgstr ""
-#: ../../include/api.php:1389
-msgid "Public Timeline"
+#: ../../include/auth.php:132
+msgid "Logged out."
+msgstr ""
+
+#: ../../include/auth.php:273
+msgid "Failed authentication"
+msgstr ""
+
+#: ../../include/auth.php:287 ../../mod/openid.php:189
+msgid "Login failed."
msgstr ""
#: ../../include/bbcode.php:123 ../../include/bbcode.php:794
@@ -2983,12 +2989,12 @@ msgstr ""
msgid "Examples: Robert Morgenstein, Fishing"
msgstr ""
-#: ../../include/contact_widgets.php:26 ../../mod/directory.php:379
-#: ../../mod/directory.php:384 ../../mod/connections.php:266
+#: ../../include/contact_widgets.php:26 ../../mod/directory.php:381
+#: ../../mod/directory.php:386 ../../mod/connections.php:266
msgid "Find"
msgstr ""
-#: ../../include/contact_widgets.php:27 ../../mod/directory.php:383
+#: ../../include/contact_widgets.php:27 ../../mod/directory.php:385
#: ../../mod/suggest.php:60
msgid "Channel Suggestions"
msgstr ""
@@ -3131,192 +3137,192 @@ msgstr ""
msgid "Requested profile is not available."
msgstr ""
-#: ../../include/identity.php:978 ../../mod/profiles.php:774
+#: ../../include/identity.php:965 ../../mod/profiles.php:774
msgid "Change profile photo"
msgstr ""
-#: ../../include/identity.php:984
+#: ../../include/identity.php:971
msgid "Profiles"
msgstr ""
-#: ../../include/identity.php:984
+#: ../../include/identity.php:971
msgid "Manage/edit profiles"
msgstr ""
-#: ../../include/identity.php:985 ../../mod/profiles.php:775
+#: ../../include/identity.php:972 ../../mod/profiles.php:775
msgid "Create New Profile"
msgstr ""
-#: ../../include/identity.php:988 ../../include/nav.php:90
+#: ../../include/identity.php:975 ../../include/nav.php:90
msgid "Edit Profile"
msgstr ""
-#: ../../include/identity.php:1000 ../../mod/profiles.php:786
+#: ../../include/identity.php:987 ../../mod/profiles.php:786
msgid "Profile Image"
msgstr ""
-#: ../../include/identity.php:1003
+#: ../../include/identity.php:990
msgid "visible to everybody"
msgstr ""
-#: ../../include/identity.php:1004 ../../mod/profiles.php:669
+#: ../../include/identity.php:991 ../../mod/profiles.php:669
#: ../../mod/profiles.php:790
msgid "Edit visibility"
msgstr ""
-#: ../../include/identity.php:1020 ../../include/identity.php:1260
+#: ../../include/identity.php:1007 ../../include/identity.php:1247
msgid "Gender:"
msgstr ""
-#: ../../include/identity.php:1021 ../../include/identity.php:1304
+#: ../../include/identity.php:1008 ../../include/identity.php:1291
msgid "Status:"
msgstr ""
-#: ../../include/identity.php:1022 ../../include/identity.php:1315
+#: ../../include/identity.php:1009 ../../include/identity.php:1302
msgid "Homepage:"
msgstr ""
-#: ../../include/identity.php:1023
+#: ../../include/identity.php:1010
msgid "Online Now"
msgstr ""
-#: ../../include/identity.php:1107 ../../include/identity.php:1185
+#: ../../include/identity.php:1094 ../../include/identity.php:1172
#: ../../mod/ping.php:318
msgid "g A l F d"
msgstr ""
-#: ../../include/identity.php:1108 ../../include/identity.php:1186
+#: ../../include/identity.php:1095 ../../include/identity.php:1173
msgid "F d"
msgstr ""
-#: ../../include/identity.php:1153 ../../include/identity.php:1225
+#: ../../include/identity.php:1140 ../../include/identity.php:1212
#: ../../mod/ping.php:341
msgid "[today]"
msgstr ""
-#: ../../include/identity.php:1164
+#: ../../include/identity.php:1151
msgid "Birthday Reminders"
msgstr ""
-#: ../../include/identity.php:1165
+#: ../../include/identity.php:1152
msgid "Birthdays this week:"
msgstr ""
-#: ../../include/identity.php:1218
+#: ../../include/identity.php:1205
msgid "[No description]"
msgstr ""
-#: ../../include/identity.php:1236
+#: ../../include/identity.php:1223
msgid "Event Reminders"
msgstr ""
-#: ../../include/identity.php:1237
+#: ../../include/identity.php:1224
msgid "Events this week:"
msgstr ""
-#: ../../include/identity.php:1258 ../../mod/settings.php:1027
+#: ../../include/identity.php:1245 ../../mod/settings.php:1027
msgid "Full Name:"
msgstr ""
-#: ../../include/identity.php:1265
+#: ../../include/identity.php:1252
msgid "Like this channel"
msgstr ""
-#: ../../include/identity.php:1289
+#: ../../include/identity.php:1276
msgid "j F, Y"
msgstr ""
-#: ../../include/identity.php:1290
+#: ../../include/identity.php:1277
msgid "j F"
msgstr ""
-#: ../../include/identity.php:1297
+#: ../../include/identity.php:1284
msgid "Birthday:"
msgstr ""
-#: ../../include/identity.php:1301 ../../mod/directory.php:297
+#: ../../include/identity.php:1288 ../../mod/directory.php:299
msgid "Age:"
msgstr ""
-#: ../../include/identity.php:1310
+#: ../../include/identity.php:1297
#, php-format
msgid "for %1$d %2$s"
msgstr ""
-#: ../../include/identity.php:1313 ../../mod/profiles.php:691
+#: ../../include/identity.php:1300 ../../mod/profiles.php:691
msgid "Sexual Preference:"
msgstr ""
-#: ../../include/identity.php:1317 ../../mod/directory.php:313
+#: ../../include/identity.php:1304 ../../mod/directory.php:315
#: ../../mod/profiles.php:693
msgid "Hometown:"
msgstr ""
-#: ../../include/identity.php:1319
+#: ../../include/identity.php:1306
msgid "Tags:"
msgstr ""
-#: ../../include/identity.php:1321 ../../mod/profiles.php:694
+#: ../../include/identity.php:1308 ../../mod/profiles.php:694
msgid "Political Views:"
msgstr ""
-#: ../../include/identity.php:1323
+#: ../../include/identity.php:1310
msgid "Religion:"
msgstr ""
-#: ../../include/identity.php:1325 ../../mod/directory.php:315
+#: ../../include/identity.php:1312 ../../mod/directory.php:317
msgid "About:"
msgstr ""
-#: ../../include/identity.php:1327
+#: ../../include/identity.php:1314
msgid "Hobbies/Interests:"
msgstr ""
-#: ../../include/identity.php:1329 ../../mod/profiles.php:697
+#: ../../include/identity.php:1316 ../../mod/profiles.php:697
msgid "Likes:"
msgstr ""
-#: ../../include/identity.php:1331 ../../mod/profiles.php:698
+#: ../../include/identity.php:1318 ../../mod/profiles.php:698
msgid "Dislikes:"
msgstr ""
-#: ../../include/identity.php:1333
+#: ../../include/identity.php:1320
msgid "Contact information and Social Networks:"
msgstr ""
-#: ../../include/identity.php:1335
+#: ../../include/identity.php:1322
msgid "My other channels:"
msgstr ""
-#: ../../include/identity.php:1337
+#: ../../include/identity.php:1324
msgid "Musical interests:"
msgstr ""
-#: ../../include/identity.php:1339
+#: ../../include/identity.php:1326
msgid "Books, literature:"
msgstr ""
-#: ../../include/identity.php:1341
+#: ../../include/identity.php:1328
msgid "Television:"
msgstr ""
-#: ../../include/identity.php:1343
+#: ../../include/identity.php:1330
msgid "Film/dance/culture/entertainment:"
msgstr ""
-#: ../../include/identity.php:1345
+#: ../../include/identity.php:1332
msgid "Love/Romance:"
msgstr ""
-#: ../../include/identity.php:1347
+#: ../../include/identity.php:1334
msgid "Work/employment:"
msgstr ""
-#: ../../include/identity.php:1349
+#: ../../include/identity.php:1336
msgid "School/education:"
msgstr ""
-#: ../../include/identity.php:1369
+#: ../../include/identity.php:1356
msgid "Like this thing"
msgstr ""
@@ -3472,8 +3478,8 @@ msgstr ""
msgid "Notes"
msgstr ""
-#: ../../include/widgets.php:191 ../../include/text.php:858
-#: ../../include/text.php:870 ../../mod/filer.php:49 ../../mod/admin.php:1436
+#: ../../include/widgets.php:191 ../../include/text.php:860
+#: ../../include/text.php:872 ../../mod/filer.php:49 ../../mod/admin.php:1436
#: ../../mod/admin.php:1456 ../../mod/rbmark.php:28 ../../mod/rbmark.php:100
msgid "Save"
msgstr ""
@@ -3486,19 +3492,19 @@ msgstr ""
msgid "Archives"
msgstr ""
-#: ../../include/widgets.php:427 ../../mod/connedit.php:566
+#: ../../include/widgets.php:427 ../../mod/connedit.php:571
msgid "Me"
msgstr ""
-#: ../../include/widgets.php:428 ../../mod/connedit.php:567
+#: ../../include/widgets.php:428 ../../mod/connedit.php:572
msgid "Family"
msgstr ""
-#: ../../include/widgets.php:430 ../../mod/connedit.php:569
+#: ../../include/widgets.php:430 ../../mod/connedit.php:574
msgid "Acquaintances"
msgstr ""
-#: ../../include/widgets.php:431 ../../mod/connedit.php:570
+#: ../../include/widgets.php:431 ../../mod/connedit.php:575
#: ../../mod/connections.php:88 ../../mod/connections.php:103
msgid "All"
msgstr ""
@@ -3535,7 +3541,7 @@ msgstr ""
msgid "Export channel"
msgstr ""
-#: ../../include/widgets.php:529 ../../mod/connedit.php:674
+#: ../../include/widgets.php:529 ../../mod/connedit.php:683
msgid "Connection Default Permissions"
msgstr ""
@@ -3690,246 +3696,255 @@ msgstr ""
msgid "User registrations waiting for confirmation"
msgstr ""
-#: ../../include/text.php:391
-msgid "prev"
+#: ../../include/widgets.php:1275 ../../mod/photos.php:753
+#: ../../mod/photos.php:1286
+msgid "View Photo"
+msgstr ""
+
+#: ../../include/widgets.php:1291 ../../mod/photos.php:782
+msgid "Edit Album"
msgstr ""
#: ../../include/text.php:393
+msgid "prev"
+msgstr ""
+
+#: ../../include/text.php:395
msgid "first"
msgstr ""
-#: ../../include/text.php:422
+#: ../../include/text.php:424
msgid "last"
msgstr ""
-#: ../../include/text.php:425
+#: ../../include/text.php:427
msgid "next"
msgstr ""
-#: ../../include/text.php:435
+#: ../../include/text.php:437
msgid "older"
msgstr ""
-#: ../../include/text.php:437
+#: ../../include/text.php:439
msgid "newer"
msgstr ""
-#: ../../include/text.php:775
+#: ../../include/text.php:777
msgid "No connections"
msgstr ""
-#: ../../include/text.php:787
+#: ../../include/text.php:789
#, php-format
msgid "%d Connection"
msgid_plural "%d Connections"
msgstr[0] ""
msgstr[1] ""
-#: ../../include/text.php:800 ../../mod/viewconnections.php:101
+#: ../../include/text.php:802 ../../mod/viewconnections.php:101
msgid "View Connections"
msgstr ""
-#: ../../include/text.php:942
+#: ../../include/text.php:946
msgid "poke"
msgstr ""
-#: ../../include/text.php:943
+#: ../../include/text.php:947
msgid "ping"
msgstr ""
-#: ../../include/text.php:943
+#: ../../include/text.php:947
msgid "pinged"
msgstr ""
-#: ../../include/text.php:944
+#: ../../include/text.php:948
msgid "prod"
msgstr ""
-#: ../../include/text.php:944
+#: ../../include/text.php:948
msgid "prodded"
msgstr ""
-#: ../../include/text.php:945
+#: ../../include/text.php:949
msgid "slap"
msgstr ""
-#: ../../include/text.php:945
+#: ../../include/text.php:949
msgid "slapped"
msgstr ""
-#: ../../include/text.php:946
+#: ../../include/text.php:950
msgid "finger"
msgstr ""
-#: ../../include/text.php:946
+#: ../../include/text.php:950
msgid "fingered"
msgstr ""
-#: ../../include/text.php:947
+#: ../../include/text.php:951
msgid "rebuff"
msgstr ""
-#: ../../include/text.php:947
+#: ../../include/text.php:951
msgid "rebuffed"
msgstr ""
-#: ../../include/text.php:957
+#: ../../include/text.php:961
msgid "happy"
msgstr ""
-#: ../../include/text.php:958
+#: ../../include/text.php:962
msgid "sad"
msgstr ""
-#: ../../include/text.php:959
+#: ../../include/text.php:963
msgid "mellow"
msgstr ""
-#: ../../include/text.php:960
+#: ../../include/text.php:964
msgid "tired"
msgstr ""
-#: ../../include/text.php:961
+#: ../../include/text.php:965
msgid "perky"
msgstr ""
-#: ../../include/text.php:962
+#: ../../include/text.php:966
msgid "angry"
msgstr ""
-#: ../../include/text.php:963
+#: ../../include/text.php:967
msgid "stupified"
msgstr ""
-#: ../../include/text.php:964
+#: ../../include/text.php:968
msgid "puzzled"
msgstr ""
-#: ../../include/text.php:965
+#: ../../include/text.php:969
msgid "interested"
msgstr ""
-#: ../../include/text.php:966
+#: ../../include/text.php:970
msgid "bitter"
msgstr ""
-#: ../../include/text.php:967
+#: ../../include/text.php:971
msgid "cheerful"
msgstr ""
-#: ../../include/text.php:968
+#: ../../include/text.php:972
msgid "alive"
msgstr ""
-#: ../../include/text.php:969
+#: ../../include/text.php:973
msgid "annoyed"
msgstr ""
-#: ../../include/text.php:970
+#: ../../include/text.php:974
msgid "anxious"
msgstr ""
-#: ../../include/text.php:971
+#: ../../include/text.php:975
msgid "cranky"
msgstr ""
-#: ../../include/text.php:972
+#: ../../include/text.php:976
msgid "disturbed"
msgstr ""
-#: ../../include/text.php:973
+#: ../../include/text.php:977
msgid "frustrated"
msgstr ""
-#: ../../include/text.php:974
+#: ../../include/text.php:978
msgid "depressed"
msgstr ""
-#: ../../include/text.php:975
+#: ../../include/text.php:979
msgid "motivated"
msgstr ""
-#: ../../include/text.php:976
+#: ../../include/text.php:980
msgid "relaxed"
msgstr ""
-#: ../../include/text.php:977
+#: ../../include/text.php:981
msgid "surprised"
msgstr ""
-#: ../../include/text.php:1153
+#: ../../include/text.php:1157
msgid "May"
msgstr ""
-#: ../../include/text.php:1230 ../../include/text.php:1234
+#: ../../include/text.php:1234 ../../include/text.php:1238
msgid "Unknown Attachment"
msgstr ""
-#: ../../include/text.php:1236
+#: ../../include/text.php:1240
msgid "unknown"
msgstr ""
-#: ../../include/text.php:1272
+#: ../../include/text.php:1276
msgid "remove category"
msgstr ""
-#: ../../include/text.php:1349
+#: ../../include/text.php:1353
msgid "remove from file"
msgstr ""
-#: ../../include/text.php:1461 ../../include/text.php:1472
+#: ../../include/text.php:1465 ../../include/text.php:1476
msgid "Click to open/close"
msgstr ""
-#: ../../include/text.php:1640 ../../mod/events.php:497
+#: ../../include/text.php:1649 ../../mod/events.php:497
msgid "Link to Source"
msgstr ""
-#: ../../include/text.php:1661 ../../include/text.php:1732
+#: ../../include/text.php:1670 ../../include/text.php:1742
msgid "default"
msgstr ""
-#: ../../include/text.php:1669
+#: ../../include/text.php:1678
msgid "Page layout"
msgstr ""
-#: ../../include/text.php:1669
+#: ../../include/text.php:1678
msgid "You can create your own with the layouts tool"
msgstr ""
-#: ../../include/text.php:1710
+#: ../../include/text.php:1720
msgid "Page content type"
msgstr ""
-#: ../../include/text.php:1744
+#: ../../include/text.php:1754
msgid "Select an alternate language"
msgstr ""
-#: ../../include/text.php:1876
+#: ../../include/text.php:1886
msgid "activity"
msgstr ""
-#: ../../include/text.php:2171
+#: ../../include/text.php:2181
msgid "Design Tools"
msgstr ""
-#: ../../include/text.php:2174 ../../mod/blocks.php:147
+#: ../../include/text.php:2184 ../../mod/blocks.php:147
msgid "Blocks"
msgstr ""
-#: ../../include/text.php:2175 ../../mod/menu.php:103
+#: ../../include/text.php:2185 ../../mod/menu.php:103
msgid "Menus"
msgstr ""
-#: ../../include/text.php:2176 ../../mod/layouts.php:174
+#: ../../include/text.php:2186 ../../mod/layouts.php:174
msgid "Layouts"
msgstr ""
-#: ../../include/text.php:2177
+#: ../../include/text.php:2187
msgid "Pages"
msgstr ""
-#: ../../include/nav.php:82 ../../include/nav.php:114 ../../boot.php:1502
+#: ../../include/nav.php:82 ../../include/nav.php:114 ../../boot.php:1483
msgid "Logout"
msgstr ""
@@ -4002,7 +4017,7 @@ msgstr ""
msgid "Home Page"
msgstr ""
-#: ../../include/nav.php:149 ../../mod/register.php:224 ../../boot.php:1479
+#: ../../include/nav.php:149 ../../mod/register.php:224 ../../boot.php:1460
msgid "Register"
msgstr ""
@@ -4106,44 +4121,44 @@ msgstr ""
msgid "Please wait..."
msgstr ""
-#: ../../include/dir_fns.php:126
+#: ../../include/dir_fns.php:139
msgid "Directory Options"
msgstr ""
-#: ../../include/dir_fns.php:128
+#: ../../include/dir_fns.php:141
msgid "Safe Mode"
msgstr ""
-#: ../../include/dir_fns.php:128 ../../include/dir_fns.php:129
-#: ../../include/dir_fns.php:130 ../../mod/removeme.php:60
+#: ../../include/dir_fns.php:141 ../../include/dir_fns.php:142
+#: ../../include/dir_fns.php:143 ../../mod/removeme.php:60
#: ../../mod/mitem.php:154 ../../mod/mitem.php:155 ../../mod/mitem.php:228
-#: ../../mod/mitem.php:229 ../../mod/connedit.php:630
-#: ../../mod/connedit.php:675 ../../mod/filestorage.php:151
+#: ../../mod/mitem.php:229 ../../mod/connedit.php:635
+#: ../../mod/connedit.php:684 ../../mod/filestorage.php:151
#: ../../mod/filestorage.php:159 ../../mod/photos.php:626
#: ../../mod/admin.php:409 ../../mod/menu.php:96 ../../mod/menu.php:153
#: ../../mod/settings.php:575 ../../mod/api.php:106
#: ../../view/theme/redbasic/php/config.php:104
-#: ../../view/theme/redbasic/php/config.php:129 ../../boot.php:1507
+#: ../../view/theme/redbasic/php/config.php:129 ../../boot.php:1488
msgid "No"
msgstr ""
-#: ../../include/dir_fns.php:128 ../../include/dir_fns.php:129
-#: ../../include/dir_fns.php:130 ../../mod/removeme.php:60
+#: ../../include/dir_fns.php:141 ../../include/dir_fns.php:142
+#: ../../include/dir_fns.php:143 ../../mod/removeme.php:60
#: ../../mod/mitem.php:154 ../../mod/mitem.php:155 ../../mod/mitem.php:228
#: ../../mod/mitem.php:229 ../../mod/filestorage.php:151
#: ../../mod/filestorage.php:159 ../../mod/photos.php:626
#: ../../mod/admin.php:411 ../../mod/menu.php:96 ../../mod/menu.php:153
#: ../../mod/settings.php:575 ../../mod/api.php:105
#: ../../view/theme/redbasic/php/config.php:104
-#: ../../view/theme/redbasic/php/config.php:129 ../../boot.php:1507
+#: ../../view/theme/redbasic/php/config.php:129 ../../boot.php:1488
msgid "Yes"
msgstr ""
-#: ../../include/dir_fns.php:129
+#: ../../include/dir_fns.php:142
msgid "Public Forums Only"
msgstr ""
-#: ../../include/dir_fns.php:130
+#: ../../include/dir_fns.php:143
msgid "This Website Only"
msgstr ""
@@ -4174,86 +4189,86 @@ msgstr ""
msgid "Public access denied."
msgstr ""
-#: ../../mod/directory.php:234
+#: ../../mod/directory.php:236
#, php-format
msgid "%d rating"
msgid_plural "%d ratings"
msgstr[0] ""
msgstr[1] ""
-#: ../../mod/directory.php:245
+#: ../../mod/directory.php:247
msgid "Gender: "
msgstr ""
-#: ../../mod/directory.php:247
+#: ../../mod/directory.php:249
msgid "Status: "
msgstr ""
-#: ../../mod/directory.php:249
+#: ../../mod/directory.php:251
msgid "Homepage: "
msgstr ""
-#: ../../mod/directory.php:308 ../../mod/events.php:699
+#: ../../mod/directory.php:310 ../../mod/events.php:699
msgid "Description:"
msgstr ""
-#: ../../mod/directory.php:317
+#: ../../mod/directory.php:319
msgid "Public Forum:"
msgstr ""
-#: ../../mod/directory.php:320
+#: ../../mod/directory.php:322
msgid "Keywords: "
msgstr ""
-#: ../../mod/directory.php:323
+#: ../../mod/directory.php:325
msgid "Don't suggest"
msgstr ""
-#: ../../mod/directory.php:325
+#: ../../mod/directory.php:327
msgid "Common connections:"
msgstr ""
-#: ../../mod/directory.php:374
+#: ../../mod/directory.php:376
msgid "Global Directory"
msgstr ""
-#: ../../mod/directory.php:374
+#: ../../mod/directory.php:376
msgid "Local Directory"
msgstr ""
-#: ../../mod/directory.php:380
+#: ../../mod/directory.php:382
msgid "Finding:"
msgstr ""
-#: ../../mod/directory.php:385
+#: ../../mod/directory.php:387
msgid "next page"
msgstr ""
-#: ../../mod/directory.php:385
+#: ../../mod/directory.php:387
msgid "previous page"
msgstr ""
-#: ../../mod/directory.php:386
+#: ../../mod/directory.php:388
msgid "Sort options"
msgstr ""
-#: ../../mod/directory.php:387
+#: ../../mod/directory.php:389
msgid "Alphabetic"
msgstr ""
-#: ../../mod/directory.php:388
+#: ../../mod/directory.php:390
msgid "Reverse Alphabetic"
msgstr ""
-#: ../../mod/directory.php:389
+#: ../../mod/directory.php:391
msgid "Newest to Oldest"
msgstr ""
-#: ../../mod/directory.php:390
+#: ../../mod/directory.php:392
msgid "Oldest to Newest"
msgstr ""
-#: ../../mod/directory.php:407
+#: ../../mod/directory.php:409
msgid "No entries (some entries may be hidden)."
msgstr ""
@@ -4714,256 +4729,256 @@ msgstr ""
msgid "Could not locate selected profile."
msgstr ""
-#: ../../mod/connedit.php:218
+#: ../../mod/connedit.php:223
msgid "Connection updated."
msgstr ""
-#: ../../mod/connedit.php:220
+#: ../../mod/connedit.php:225
msgid "Failed to update connection record."
msgstr ""
-#: ../../mod/connedit.php:267
+#: ../../mod/connedit.php:272
msgid "is now connected to"
msgstr ""
-#: ../../mod/connedit.php:390
+#: ../../mod/connedit.php:395
msgid "Could not access address book record."
msgstr ""
-#: ../../mod/connedit.php:404
+#: ../../mod/connedit.php:409
msgid "Refresh failed - channel is currently unavailable."
msgstr ""
-#: ../../mod/connedit.php:413 ../../mod/connedit.php:422
-#: ../../mod/connedit.php:431 ../../mod/connedit.php:440
-#: ../../mod/connedit.php:453
+#: ../../mod/connedit.php:418 ../../mod/connedit.php:427
+#: ../../mod/connedit.php:436 ../../mod/connedit.php:445
+#: ../../mod/connedit.php:458
msgid "Unable to set address book parameters."
msgstr ""
-#: ../../mod/connedit.php:477
+#: ../../mod/connedit.php:482
msgid "Connection has been removed."
msgstr ""
-#: ../../mod/connedit.php:496
+#: ../../mod/connedit.php:501
#, php-format
msgid "View %s's profile"
msgstr ""
-#: ../../mod/connedit.php:500
+#: ../../mod/connedit.php:505
msgid "Refresh Permissions"
msgstr ""
-#: ../../mod/connedit.php:503
+#: ../../mod/connedit.php:508
msgid "Fetch updated permissions"
msgstr ""
-#: ../../mod/connedit.php:507
+#: ../../mod/connedit.php:512
msgid "Recent Activity"
msgstr ""
-#: ../../mod/connedit.php:510
+#: ../../mod/connedit.php:515
msgid "View recent posts and comments"
msgstr ""
-#: ../../mod/connedit.php:514 ../../mod/admin.php:810
+#: ../../mod/connedit.php:519 ../../mod/admin.php:810
msgid "Unblock"
msgstr ""
-#: ../../mod/connedit.php:514 ../../mod/admin.php:809
+#: ../../mod/connedit.php:519 ../../mod/admin.php:809
msgid "Block"
msgstr ""
-#: ../../mod/connedit.php:517
+#: ../../mod/connedit.php:522
msgid "Block (or Unblock) all communications with this connection"
msgstr ""
-#: ../../mod/connedit.php:518
+#: ../../mod/connedit.php:523
msgid "This connection is blocked!"
msgstr ""
-#: ../../mod/connedit.php:522
+#: ../../mod/connedit.php:527
msgid "Unignore"
msgstr ""
-#: ../../mod/connedit.php:522 ../../mod/notifications.php:51
+#: ../../mod/connedit.php:527 ../../mod/notifications.php:51
msgid "Ignore"
msgstr ""
-#: ../../mod/connedit.php:525
+#: ../../mod/connedit.php:530
msgid "Ignore (or Unignore) all inbound communications from this connection"
msgstr ""
-#: ../../mod/connedit.php:526
+#: ../../mod/connedit.php:531
msgid "This connection is ignored!"
msgstr ""
-#: ../../mod/connedit.php:530
+#: ../../mod/connedit.php:535
msgid "Unarchive"
msgstr ""
-#: ../../mod/connedit.php:530
+#: ../../mod/connedit.php:535
msgid "Archive"
msgstr ""
-#: ../../mod/connedit.php:533
+#: ../../mod/connedit.php:538
msgid ""
"Archive (or Unarchive) this connection - mark channel dead but keep content"
msgstr ""
-#: ../../mod/connedit.php:534
+#: ../../mod/connedit.php:539
msgid "This connection is archived!"
msgstr ""
-#: ../../mod/connedit.php:538
+#: ../../mod/connedit.php:543
msgid "Unhide"
msgstr ""
-#: ../../mod/connedit.php:538
+#: ../../mod/connedit.php:543
msgid "Hide"
msgstr ""
-#: ../../mod/connedit.php:541
+#: ../../mod/connedit.php:546
msgid "Hide or Unhide this connection from your other connections"
msgstr ""
-#: ../../mod/connedit.php:542
+#: ../../mod/connedit.php:547
msgid "This connection is hidden!"
msgstr ""
-#: ../../mod/connedit.php:549
+#: ../../mod/connedit.php:554
msgid "Delete this connection"
msgstr ""
-#: ../../mod/connedit.php:630
+#: ../../mod/connedit.php:635
msgid "Approve this connection"
msgstr ""
-#: ../../mod/connedit.php:630
+#: ../../mod/connedit.php:635
msgid "Accept connection to allow communication"
msgstr ""
-#: ../../mod/connedit.php:635
+#: ../../mod/connedit.php:640
msgid "Set Affinity"
msgstr ""
-#: ../../mod/connedit.php:638
+#: ../../mod/connedit.php:643
msgid "Set Profile"
msgstr ""
-#: ../../mod/connedit.php:641
+#: ../../mod/connedit.php:646
msgid "Set Affinity & Profile"
msgstr ""
-#: ../../mod/connedit.php:670
+#: ../../mod/connedit.php:679
msgid "none"
msgstr ""
-#: ../../mod/connedit.php:675
+#: ../../mod/connedit.php:684
msgid "Apply these permissions automatically"
msgstr ""
-#: ../../mod/connedit.php:677
+#: ../../mod/connedit.php:686
msgid "This connection's primary address is"
msgstr ""
-#: ../../mod/connedit.php:678
+#: ../../mod/connedit.php:687
msgid "Available locations:"
msgstr ""
-#: ../../mod/connedit.php:682
+#: ../../mod/connedit.php:691
msgid ""
"The permissions indicated on this page will be applied to all new "
"connections."
msgstr ""
-#: ../../mod/connedit.php:684
+#: ../../mod/connedit.php:693
msgid "Slide to adjust your degree of friendship"
msgstr ""
-#: ../../mod/connedit.php:686
+#: ../../mod/connedit.php:695
msgid "Slide to adjust your rating"
msgstr ""
-#: ../../mod/connedit.php:687 ../../mod/connedit.php:692
+#: ../../mod/connedit.php:696 ../../mod/connedit.php:701
msgid "Optionally explain your rating"
msgstr ""
-#: ../../mod/connedit.php:689
+#: ../../mod/connedit.php:698
msgid "Custom Filter"
msgstr ""
-#: ../../mod/connedit.php:690
+#: ../../mod/connedit.php:699
msgid "Only import posts with this text"
msgstr ""
-#: ../../mod/connedit.php:690 ../../mod/connedit.php:691
+#: ../../mod/connedit.php:699 ../../mod/connedit.php:700
msgid ""
"words one per line or #tags or /patterns/ or lang=xx, leave blank to import "
"all posts"
msgstr ""
-#: ../../mod/connedit.php:691
+#: ../../mod/connedit.php:700
msgid "Do not import posts with this text"
msgstr ""
-#: ../../mod/connedit.php:693
+#: ../../mod/connedit.php:702
msgid "This information is public!"
msgstr ""
-#: ../../mod/connedit.php:698
+#: ../../mod/connedit.php:707
msgid "Connection Pending Approval"
msgstr ""
-#: ../../mod/connedit.php:699
+#: ../../mod/connedit.php:708
msgid "Connection Request"
msgstr ""
-#: ../../mod/connedit.php:700
+#: ../../mod/connedit.php:709
#, php-format
msgid ""
"(%s) would like to connect with you. Please approve this connection to allow "
"communication."
msgstr ""
-#: ../../mod/connedit.php:701 ../../mod/admin.php:806
+#: ../../mod/connedit.php:710 ../../mod/admin.php:806
msgid "Approve"
msgstr ""
-#: ../../mod/connedit.php:702
+#: ../../mod/connedit.php:711
msgid "Approve Later"
msgstr ""
-#: ../../mod/connedit.php:705
+#: ../../mod/connedit.php:714
msgid "inherited"
msgstr ""
-#: ../../mod/connedit.php:707
+#: ../../mod/connedit.php:716
#, php-format
msgid ""
"Please choose the profile you would like to display to %s when viewing your "
"profile securely."
msgstr ""
-#: ../../mod/connedit.php:709
+#: ../../mod/connedit.php:718
msgid "Their Settings"
msgstr ""
-#: ../../mod/connedit.php:710
+#: ../../mod/connedit.php:719
msgid "My Settings"
msgstr ""
-#: ../../mod/connedit.php:712
+#: ../../mod/connedit.php:721
msgid "Individual Permissions"
msgstr ""
-#: ../../mod/connedit.php:713
+#: ../../mod/connedit.php:722
msgid ""
"Some permissions may be inherited from your channel's <a href=\"settings"
"\"><strong>privacy settings</strong></a>, which have higher priority than "
"individual settings. You can <strong>not</strong> change those settings here."
msgstr ""
-#: ../../mod/connedit.php:714
+#: ../../mod/connedit.php:723
msgid ""
"Some permissions may be inherited from your channel's <a href=\"settings"
"\"><strong>privacy settings</strong></a>, which have higher priority than "
@@ -4971,7 +4986,7 @@ msgid ""
"any impact unless the inherited setting changes."
msgstr ""
-#: ../../mod/connedit.php:715
+#: ../../mod/connedit.php:724
msgid "Last update:"
msgstr ""
@@ -5262,14 +5277,6 @@ msgstr ""
msgid "Show Oldest First"
msgstr ""
-#: ../../mod/photos.php:753 ../../mod/photos.php:1286
-msgid "View Photo"
-msgstr ""
-
-#: ../../mod/photos.php:782
-msgid "Edit Album"
-msgstr ""
-
#: ../../mod/photos.php:827
msgid "Permission denied. Access to this item may be restricted."
msgstr ""
@@ -5354,63 +5361,6 @@ msgstr ""
msgid "Recent Photos"
msgstr ""
-#: ../../mod/dreport.php:23
-msgid "Invalid message"
-msgstr ""
-
-#: ../../mod/dreport.php:55
-msgid "no results"
-msgstr ""
-
-#: ../../mod/dreport.php:60
-#, php-format
-msgid "Delivery report for %1$s"
-msgstr ""
-
-#: ../../mod/dreport.php:74
-msgid "channel sync processed"
-msgstr ""
-
-#: ../../mod/dreport.php:78
-msgid "queued"
-msgstr ""
-
-#: ../../mod/dreport.php:82
-msgid "posted"
-msgstr ""
-
-#: ../../mod/dreport.php:86
-msgid "accepted for delivery"
-msgstr ""
-
-#: ../../mod/dreport.php:90
-msgid "updated"
-msgstr ""
-
-#: ../../mod/dreport.php:93
-msgid "update ignored"
-msgstr ""
-
-#: ../../mod/dreport.php:96
-msgid "permission denied"
-msgstr ""
-
-#: ../../mod/dreport.php:100
-msgid "recipient not found"
-msgstr ""
-
-#: ../../mod/dreport.php:103
-msgid "mail recalled"
-msgstr ""
-
-#: ../../mod/dreport.php:106
-msgid "duplicate mail received"
-msgstr ""
-
-#: ../../mod/dreport.php:109
-msgid "mail delivered"
-msgstr ""
-
#: ../../mod/editblock.php:78 ../../mod/editblock.php:94
#: ../../mod/editpost.php:20 ../../mod/editlayout.php:76
#: ../../mod/editwebpage.php:77
@@ -6482,7 +6432,7 @@ msgid ""
"Password reset failed."
msgstr ""
-#: ../../mod/lostpass.php:86 ../../boot.php:1511
+#: ../../mod/lostpass.php:86 ../../boot.php:1492
msgid "Password Reset"
msgstr ""
@@ -6814,20 +6764,20 @@ msgstr ""
msgid "Executable content type not permitted to this channel."
msgstr ""
-#: ../../mod/item.php:908
+#: ../../mod/item.php:910
msgid "System error. Post not saved."
msgstr ""
-#: ../../mod/item.php:1175
+#: ../../mod/item.php:1177
msgid "Unable to obtain post information from database."
msgstr ""
-#: ../../mod/item.php:1182
+#: ../../mod/item.php:1184
#, php-format
msgid "You have reached your limit of %1$.0f top level posts."
msgstr ""
-#: ../../mod/item.php:1189
+#: ../../mod/item.php:1191
#, php-format
msgid "You have reached your limit of %1$.0f webpages."
msgstr ""
@@ -7115,126 +7065,68 @@ msgstr ""
msgid "Insufficient permissions. Request redirected to profile page."
msgstr ""
-#: ../../mod/siteinfo.php:111
-#, php-format
-msgid "Version %s"
-msgstr ""
-
-#: ../../mod/siteinfo.php:132
-msgid "Installed plugins/addons/apps:"
-msgstr ""
-
-#: ../../mod/siteinfo.php:145
-msgid "No installed plugins/addons/apps"
-msgstr ""
-
-#: ../../mod/siteinfo.php:158
-msgid ""
-"This is a hub of $Projectname - a global cooperative network of "
-"decentralized privacy enhanced websites."
-msgstr ""
-
-#: ../../mod/siteinfo.php:160
-msgid "Tag: "
-msgstr ""
-
-#: ../../mod/siteinfo.php:162
-msgid "Last background fetch: "
-msgstr ""
-
-#: ../../mod/siteinfo.php:164
-msgid "Current load average: "
-msgstr ""
-
-#: ../../mod/siteinfo.php:167
-msgid "Running at web location"
-msgstr ""
-
-#: ../../mod/siteinfo.php:168
-msgid ""
-"Please visit <a href=\"http://hubzilla.org\">hubzilla.org</a> to learn more "
-"about $Projectname."
-msgstr ""
-
-#: ../../mod/siteinfo.php:169
-msgid "Bug reports and issues: please visit"
-msgstr ""
-
-#: ../../mod/siteinfo.php:171
-msgid "$projectname issues"
-msgstr ""
-
-#: ../../mod/siteinfo.php:172
-msgid ""
-"Suggestions, praise, etc. - please email \"redmatrix\" at librelist - dot com"
-msgstr ""
-
-#: ../../mod/siteinfo.php:174
-msgid "Site Administrators"
-msgstr ""
-
-#: ../../mod/import.php:27
+#: ../../mod/import.php:28
#, php-format
msgid "Your service plan only allows %d channels."
msgstr ""
-#: ../../mod/import.php:65 ../../mod/import_items.php:38
+#: ../../mod/import.php:66 ../../mod/import_items.php:38
msgid "Nothing to import."
msgstr ""
-#: ../../mod/import.php:89 ../../mod/import_items.php:62
+#: ../../mod/import.php:90 ../../mod/import_items.php:62
msgid "Unable to download data from old server"
msgstr ""
-#: ../../mod/import.php:95 ../../mod/import_items.php:68
+#: ../../mod/import.php:96 ../../mod/import_items.php:68
msgid "Imported file is empty."
msgstr ""
-#: ../../mod/import.php:115 ../../mod/import_items.php:82
+#: ../../mod/import.php:116 ../../mod/import_items.php:82
#, php-format
msgid "Warning: Database versions differ by %1$d updates."
msgstr ""
-#: ../../mod/import.php:148
+#: ../../mod/import.php:149
msgid "No channel. Import failed."
msgstr ""
-#: ../../mod/import.php:499
+#: ../../mod/import.php:509
msgid "You must be logged in to use this feature."
msgstr ""
-#: ../../mod/import.php:504
+#: ../../mod/import.php:514
msgid "Import Channel"
msgstr ""
-#: ../../mod/import.php:505
+#: ../../mod/import.php:515
msgid ""
"Use this form to import an existing channel from a different server/hub. You "
"may retrieve the channel identity from the old server/hub via the network or "
"provide an export file."
msgstr ""
-#: ../../mod/import.php:506 ../../mod/import_items.php:121
+#: ../../mod/import.php:516 ../../mod/import_items.php:121
msgid "File to Upload"
msgstr ""
-#: ../../mod/import.php:507
+#: ../../mod/import.php:517
msgid "Or provide the old server/hub details"
msgstr ""
-#: ../../mod/import.php:508
+#: ../../mod/import.php:518
msgid "Your old identity address (xyz@example.com)"
msgstr ""
-#: ../../mod/import.php:509
+#: ../../mod/import.php:519
msgid "Your old login email address"
msgstr ""
-#: ../../mod/import.php:510
+#: ../../mod/import.php:520
msgid "Your old login password"
msgstr ""
-#: ../../mod/import.php:511
+#: ../../mod/import.php:521
msgid ""
"For either option, please choose whether to make this hub your new primary "
"address, or whether your old location should continue this role. You will be "
@@ -7242,21 +7134,78 @@ msgid ""
"location for files, photos, and media."
msgstr ""
-#: ../../mod/import.php:512
+#: ../../mod/import.php:522
msgid "Make this hub my primary location"
msgstr ""
-#: ../../mod/import.php:513
+#: ../../mod/import.php:523
msgid ""
"Import existing posts if possible (experimental - limited by available memory"
msgstr ""
-#: ../../mod/import.php:514
+#: ../../mod/import.php:524
msgid ""
"This process may take several minutes to complete. Please submit the form "
"only once and leave this page open until finished."
msgstr ""
+#: ../../mod/dreport.php:23
+msgid "Invalid message"
+msgstr ""
+
+#: ../../mod/dreport.php:55
+msgid "no results"
+msgstr ""
+
+#: ../../mod/dreport.php:60
+#, php-format
+msgid "Delivery report for %1$s"
+msgstr ""
+
+#: ../../mod/dreport.php:74
+msgid "channel sync processed"
+msgstr ""
+
+#: ../../mod/dreport.php:78
+msgid "queued"
+msgstr ""
+
+#: ../../mod/dreport.php:82
+msgid "posted"
+msgstr ""
+
+#: ../../mod/dreport.php:86
+msgid "accepted for delivery"
+msgstr ""
+
+#: ../../mod/dreport.php:90
+msgid "updated"
+msgstr ""
+
+#: ../../mod/dreport.php:93
+msgid "update ignored"
+msgstr ""
+
+#: ../../mod/dreport.php:96
+msgid "permission denied"
+msgstr ""
+
+#: ../../mod/dreport.php:100
+msgid "recipient not found"
+msgstr ""
+
+#: ../../mod/dreport.php:103
+msgid "mail recalled"
+msgstr ""
+
+#: ../../mod/dreport.php:106
+msgid "duplicate mail received"
+msgstr ""
+
+#: ../../mod/dreport.php:109
+msgid "mail delivered"
+msgstr ""
+
#: ../../mod/thing.php:111
msgid "Thing updated"
msgstr ""
@@ -8795,6 +8744,64 @@ msgstr ""
msgid "Remove this file"
msgstr ""
+#: ../../mod/siteinfo.php:111
+#, php-format
+msgid "Version %s"
+msgstr ""
+
+#: ../../mod/siteinfo.php:132
+msgid "Installed plugins/addons/apps:"
+msgstr ""
+
+#: ../../mod/siteinfo.php:145
+msgid "No installed plugins/addons/apps"
+msgstr ""
+
+#: ../../mod/siteinfo.php:158
+msgid ""
+"This is a hub of $Projectname - a global cooperative network of "
+"decentralized privacy enhanced websites."
+msgstr ""
+
+#: ../../mod/siteinfo.php:160
+msgid "Tag: "
+msgstr ""
+
+#: ../../mod/siteinfo.php:162
+msgid "Last background fetch: "
+msgstr ""
+
+#: ../../mod/siteinfo.php:164
+msgid "Current load average: "
+msgstr ""
+
+#: ../../mod/siteinfo.php:167
+msgid "Running at web location"
+msgstr ""
+
+#: ../../mod/siteinfo.php:168
+msgid ""
+"Please visit <a href=\"http://hubzilla.org\">hubzilla.org</a> to learn more "
+"about $Projectname."
+msgstr ""
+
+#: ../../mod/siteinfo.php:169
+msgid "Bug reports and issues: please visit"
+msgstr ""
+
+#: ../../mod/siteinfo.php:171
+msgid "$projectname issues"
+msgstr ""
+
+#: ../../mod/siteinfo.php:172
+msgid ""
+"Suggestions, praise, etc. - please email \"redmatrix\" at librelist - dot com"
+msgstr ""
+
+#: ../../mod/siteinfo.php:174
+msgid "Site Administrators"
+msgstr ""
+
#: ../../mod/suggest.php:35
msgid ""
"No suggestions available. If this is a new site, please try again in 24 "
@@ -9234,51 +9241,51 @@ msgstr ""
msgid "Set size of followup author photos"
msgstr ""
-#: ../../boot.php:1308
+#: ../../boot.php:1289
#, php-format
msgid "Update %s failed. See error logs."
msgstr ""
-#: ../../boot.php:1311
+#: ../../boot.php:1292
#, php-format
msgid "Update Error at %s"
msgstr ""
-#: ../../boot.php:1478
+#: ../../boot.php:1459
msgid ""
"Create an account to access services and applications within the Hubzilla"
msgstr ""
-#: ../../boot.php:1506
+#: ../../boot.php:1487
msgid "Password"
msgstr ""
-#: ../../boot.php:1507
+#: ../../boot.php:1488
msgid "Remember me"
msgstr ""
-#: ../../boot.php:1510
+#: ../../boot.php:1491
msgid "Forgot your password?"
msgstr ""
-#: ../../boot.php:2136
+#: ../../boot.php:2111
msgid "toggle mobile"
msgstr ""
-#: ../../boot.php:2271
+#: ../../boot.php:2246
msgid "Website SSL certificate is not valid. Please correct."
msgstr ""
-#: ../../boot.php:2274
+#: ../../boot.php:2249
#, php-format
msgid "[hubzilla] Website SSL error for %s"
msgstr ""
-#: ../../boot.php:2311
+#: ../../boot.php:2286
msgid "Cron/Scheduled tasks not running."
msgstr ""
-#: ../../boot.php:2315
+#: ../../boot.php:2290
#, php-format
msgid "[hubzilla] Cron tasks not running on %s"
msgstr ""
diff --git a/version.inc b/version.inc
index 938250e5c..1c628f631 100644
--- a/version.inc
+++ b/version.inc
@@ -1 +1 @@
-2015-11-12.1214
+2015-11-13.1215