aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMario Vavti <mario@mariovavti.com>2015-10-31 12:04:20 +0100
committerMario Vavti <mario@mariovavti.com>2015-10-31 12:04:20 +0100
commitd6d96e8c89918740f3fae5757124d2c9b58a3a81 (patch)
treeac62743174b10d678d92a39244ad676d11a714d5
parent5920a96da7f71b45b7d386d27da2c130e3ddb23f (diff)
parent2b34dd73736f2d24e0554a95bfd79352fc2068f7 (diff)
downloadvolse-hubzilla-d6d96e8c89918740f3fae5757124d2c9b58a3a81.tar.gz
volse-hubzilla-d6d96e8c89918740f3fae5757124d2c9b58a3a81.tar.bz2
volse-hubzilla-d6d96e8c89918740f3fae5757124d2c9b58a3a81.zip
Merge branch 'master' of https://github.com/redmatrix/hubzilla
-rw-r--r--doc/hidden_configs.bb10
-rwxr-xr-xinclude/items.php1
-rw-r--r--mod/fhublocs.php70
-rw-r--r--util/hmessages.po1148
-rw-r--r--version.inc2
5 files changed, 671 insertions, 560 deletions
diff --git a/doc/hidden_configs.bb b/doc/hidden_configs.bb
index 76213851c..dc9780aad 100644
--- a/doc/hidden_configs.bb
+++ b/doc/hidden_configs.bb
@@ -133,7 +133,15 @@ This document assumes you're an administrator.
How long to cache photos, in seconds. Default is 86400 (1 day).
Longer time increases performance, but it also means it takes longer for changed permissions to apply.
[b]system > poco_rating_enable[/b]
- Distributed reputation reporting and data collection may be disabled. If your site does not participate in distributed reputation you will also not be able to make use of the data from your connections on other sites. By default and in the absence of any setting it is enabled. Individual members can opt out by restricting who can see their connections or by not providing any reputation information for their connections.
+ Distributed reputation reporting and data collection may be disabled. If your site does not participate in distributed reputation you will also not be able to make use of the data from your connections on other sites. By default and in the absence of any setting it is enabled. Individual members can opt out by restricting who can see their connections or by not providing any reputation information for their connections.
+
+[b]Directory config[/b]
+ [b]directory > safemode[/b]
+ 0 or 1.
+ [b]directory > globaldir[/b]
+ 0 or 1. Default 0. If you visit the directory on a site you'll just see the members of that site by default. You have to go through an extra step to see the people in the rest of the network; and by doing so there's a clear delineation that these people *aren't* members of that site but of a larger network.
+ [b]directory > pubforums[/b]
+ 0 or 1. Public forums *should* be default 0.
#include doc/macros/main_footer.bb;
diff --git a/include/items.php b/include/items.php
index ce8e2b9b0..4d8fce60f 100755
--- a/include/items.php
+++ b/include/items.php
@@ -3455,6 +3455,7 @@ function post_is_importable($item,$abook) {
$text = prepare_text($item['body'],$item['mimetype']);
$text = html2plain($text);
+
$lang = null;
if((strpos($abook['abook_incl'],'lang=') !== false) || (strpos($abook['abook_excl'],'lang=') !== false)) {
diff --git a/mod/fhublocs.php b/mod/fhublocs.php
new file mode 100644
index 000000000..d2f15b728
--- /dev/null
+++ b/mod/fhublocs.php
@@ -0,0 +1,70 @@
+<?php
+
+require_once('include/zot.php');
+require_once('include/crypto.php');
+
+/* fix missing or damaged hublocs */
+
+function fhublocs_content(&$a) {
+
+ if(! is_site_admin())
+ return;
+
+ $o = '';
+
+ $r = q("select * from channel where channel_removed = 0");
+
+ if($r) {
+ foreach($r as $rr) {
+ $primary_address = '';
+ $x = zot_get_hublocs($rr['channel_hash']);
+ if($x) {
+ $o .= 'Hubloc exists for ' . $rr['channel_name'] . EOL;
+ continue;
+ }
+ $y = q("select xchan_addr from xchan where xchan_hash = '%s' limit 1",
+ dbesc($rr['channel_hash'])
+ );
+ if($y)
+ $primary_address = $y[0]['xchan_addr'];
+
+ $hub_address = $rr['channel']['channel_address'] . '@' . get_app()->get_hostname();
+
+
+ $primary = (($hub_address === $primary_address) ? 1 : 0);
+ if(! $y)
+ $primary = 1;
+
+ $m = q("delete from hubloc where hubloc_hash = '%s' and hubloc_url = '%s' ",
+ dbesc($rr['channel_hash']),
+ dbesc(z_root())
+ );
+
+ // Create a verified hub location pointing to this site.
+
+ $h = q("insert into hubloc ( hubloc_guid, hubloc_guid_sig, hubloc_hash, hubloc_addr, hubloc_primary, hubloc_url, hubloc_url_sig, hubloc_host, hubloc_callback, hubloc_sitekey, hubloc_network )
+ values ( '%s', '%s', '%s', '%s', %d, '%s', '%s', '%s', '%s', '%s', '%s' )",
+ dbesc($rr['channel_guid']),
+ dbesc($rr['channel_guid_sig']),
+ dbesc($rr['channel_hash']),
+ dbesc($rr['channel_address'] . '@' . get_app()->get_hostname()),
+ intval($primary),
+ dbesc(z_root()),
+ dbesc(base64url_encode(rsa_sign(z_root(),$rr['channel_prvkey']))),
+ dbesc(get_app()->get_hostname()),
+ dbesc(z_root() . '/post'),
+ dbesc(get_config('system','pubkey')),
+ dbesc('zot')
+ );
+
+ if($h)
+ $o . 'local hubloc created for ' . $rr['channel_name'] . EOL;
+ else
+ $o .= 'DB update failed for ' . $rr['channel_name'] . EOL;
+
+ }
+
+ return $o;
+
+ }
+} \ No newline at end of file
diff --git a/util/hmessages.po b/util/hmessages.po
index 40152108c..75f5a8bc0 100644
--- a/util/hmessages.po
+++ b/util/hmessages.po
@@ -6,9 +6,9 @@
#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: 2015-10-23.1194\n"
+"Project-Id-Version: 2015-10-29.1200\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-10-23 00:03-0700\n"
+"POT-Creation-Date: 2015-10-30 00:03-0700\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,32 +17,6 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../../include/bb2diaspora.php:388
-msgid "Attachments:"
-msgstr ""
-
-#: ../../include/bb2diaspora.php:474 ../../include/event.php:22
-msgid "l F d, Y \\@ g:i A"
-msgstr ""
-
-#: ../../include/bb2diaspora.php:476
-msgid "$Projectname event notification:"
-msgstr ""
-
-#: ../../include/bb2diaspora.php:480 ../../include/event.php:30
-msgid "Starts:"
-msgstr ""
-
-#: ../../include/bb2diaspora.php:488 ../../include/event.php:40
-msgid "Finishes:"
-msgstr ""
-
-#: ../../include/bb2diaspora.php:496 ../../include/event.php:50
-#: ../../include/identity.php:1016 ../../mod/directory.php:302
-#: ../../mod/events.php:701
-msgid "Location:"
-msgstr ""
-
#: ../../include/Import/import_diaspora.php:17
msgid "No username found in import file."
msgstr ""
@@ -60,7 +34,7 @@ msgstr ""
msgid "parent"
msgstr ""
-#: ../../include/RedDAV/RedBrowser.php:131 ../../include/text.php:2509
+#: ../../include/RedDAV/RedBrowser.php:131 ../../include/text.php:2529
msgid "Collection"
msgstr ""
@@ -86,12 +60,12 @@ msgstr ""
#: ../../include/RedDAV/RedBrowser.php:164 ../../include/apps.php:360
#: ../../include/apps.php:415 ../../include/conversation.php:1023
-#: ../../mod/photos.php:756 ../../mod/photos.php:1195
+#: ../../mod/photos.php:759 ../../mod/photos.php:1198
msgid "Unknown"
msgstr ""
#: ../../include/RedDAV/RedBrowser.php:226 ../../include/apps.php:135
-#: ../../include/conversation.php:1613 ../../include/nav.php:93
+#: ../../include/conversation.php:1620 ../../include/nav.php:93
#: ../../mod/fbrowser.php:114
msgid "Files"
msgstr ""
@@ -112,8 +86,8 @@ msgid "Create"
msgstr ""
#: ../../include/RedDAV/RedBrowser.php:231
-#: ../../include/RedDAV/RedBrowser.php:305 ../../mod/photos.php:781
-#: ../../mod/photos.php:1314 ../../mod/profile_photo.php:450
+#: ../../include/RedDAV/RedBrowser.php:305 ../../mod/photos.php:784
+#: ../../mod/photos.php:1317 ../../mod/profile_photo.php:450
msgid "Upload"
msgstr ""
@@ -139,7 +113,7 @@ msgstr ""
#: ../../include/page_widgets.php:8 ../../include/page_widgets.php:36
#: ../../include/apps.php:259 ../../include/ItemObject.php:100
#: ../../mod/layouts.php:183 ../../mod/editblock.php:135
-#: ../../mod/editpost.php:113 ../../mod/menu.php:108
+#: ../../mod/editpost.php:112 ../../mod/menu.php:108
#: ../../mod/webpages.php:181 ../../mod/blocks.php:153 ../../mod/thing.php:257
#: ../../mod/settings.php:645 ../../mod/connections.php:235
#: ../../mod/connections.php:248 ../../mod/connections.php:267
@@ -149,7 +123,7 @@ msgstr ""
#: ../../include/RedDAV/RedBrowser.php:241 ../../include/apps.php:260
#: ../../include/ItemObject.php:120 ../../include/conversation.php:657
-#: ../../mod/connedit.php:546 ../../mod/photos.php:1126
+#: ../../mod/connedit.php:546 ../../mod/photos.php:1129
#: ../../mod/editblock.php:181 ../../mod/admin.php:783 ../../mod/admin.php:942
#: ../../mod/webpages.php:183 ../../mod/blocks.php:155 ../../mod/thing.php:258
#: ../../mod/settings.php:646 ../../mod/editlayout.php:179
@@ -324,31 +298,31 @@ msgstr ""
msgid "Room not found."
msgstr ""
-#: ../../include/chat.php:133 ../../include/items.php:4376
-#: ../../include/photos.php:26 ../../include/attach.php:137
-#: ../../include/attach.php:185 ../../include/attach.php:248
-#: ../../include/attach.php:262 ../../include/attach.php:269
-#: ../../include/attach.php:334 ../../include/attach.php:348
-#: ../../include/attach.php:355 ../../include/attach.php:433
-#: ../../include/attach.php:875 ../../include/attach.php:946
-#: ../../include/attach.php:1098 ../../mod/achievements.php:30
+#: ../../include/chat.php:133 ../../include/items.php:4377
+#: ../../include/photos.php:29 ../../include/attach.php:140
+#: ../../include/attach.php:188 ../../include/attach.php:251
+#: ../../include/attach.php:265 ../../include/attach.php:272
+#: ../../include/attach.php:337 ../../include/attach.php:351
+#: ../../include/attach.php:358 ../../include/attach.php:436
+#: ../../include/attach.php:884 ../../include/attach.php:955
+#: ../../include/attach.php:1107 ../../mod/achievements.php:30
#: ../../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/photos.php:70 ../../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 ../../mod/poke.php:133
-#: ../../mod/network.php:12 ../../mod/chat.php:94 ../../mod/chat.php:99
-#: ../../mod/rate.php:111 ../../mod/mail.php:118 ../../mod/editblock.php:65
+#: ../../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
+#: ../../mod/poke.php:133 ../../mod/network.php:12 ../../mod/chat.php:94
+#: ../../mod/chat.php:99 ../../mod/rate.php:111 ../../mod/mail.php:118
+#: ../../mod/photos.php:70 ../../mod/editblock.php:65
#: ../../mod/editpost.php:13 ../../mod/appman.php:66 ../../mod/profile.php:64
#: ../../mod/profile.php:72 ../../mod/menu.php:74 ../../mod/page.php:31
#: ../../mod/page.php:86 ../../mod/new_channel.php:68
#: ../../mod/new_channel.php:99 ../../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:1002
+#: ../../mod/item.php:205 ../../mod/item.php:213 ../../mod/item.php:1004
#: ../../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
@@ -592,131 +566,139 @@ msgid ""
msgstr ""
#: ../../include/features.php:61
-msgid "Enable voting tools"
+msgid "Enable Voting Tools"
msgstr ""
#: ../../include/features.php:61
msgid "Provide a class of post which others can vote on"
msgstr ""
-#: ../../include/features.php:67
-msgid "Network and Stream Filtering"
+#: ../../include/features.php:62
+msgid "Delayed Posting"
+msgstr ""
+
+#: ../../include/features.php:62
+msgid "Allow posts to be published at a later date"
msgstr ""
#: ../../include/features.php:68
+msgid "Network and Stream Filtering"
+msgstr ""
+
+#: ../../include/features.php:69
msgid "Search by Date"
msgstr ""
-#: ../../include/features.php:68
+#: ../../include/features.php:69
msgid "Ability to select posts by date ranges"
msgstr ""
-#: ../../include/features.php:69
+#: ../../include/features.php:70
msgid "Collections Filter"
msgstr ""
-#: ../../include/features.php:69
+#: ../../include/features.php:70
msgid "Enable widget to display Network posts only from selected collections"
msgstr ""
-#: ../../include/features.php:70 ../../include/widgets.php:273
+#: ../../include/features.php:71 ../../include/widgets.php:273
msgid "Saved Searches"
msgstr ""
-#: ../../include/features.php:70
+#: ../../include/features.php:71
msgid "Save search terms for re-use"
msgstr ""
-#: ../../include/features.php:71
+#: ../../include/features.php:72
msgid "Network Personal Tab"
msgstr ""
-#: ../../include/features.php:71
+#: ../../include/features.php:72
msgid "Enable tab to display only Network posts that you've interacted on"
msgstr ""
-#: ../../include/features.php:72
+#: ../../include/features.php:73
msgid "Network New Tab"
msgstr ""
-#: ../../include/features.php:72
+#: ../../include/features.php:73
msgid "Enable tab to display all new Network activity"
msgstr ""
-#: ../../include/features.php:73
+#: ../../include/features.php:74
msgid "Affinity Tool"
msgstr ""
-#: ../../include/features.php:73
+#: ../../include/features.php:74
msgid "Filter stream activity by depth of relationships"
msgstr ""
-#: ../../include/features.php:74
+#: ../../include/features.php:75
msgid "Connection Filtering"
msgstr ""
-#: ../../include/features.php:74
+#: ../../include/features.php:75
msgid "Filter incoming posts from connections based on keywords/content"
msgstr ""
-#: ../../include/features.php:75
+#: ../../include/features.php:76
msgid "Suggest Channels"
msgstr ""
-#: ../../include/features.php:75
+#: ../../include/features.php:76
msgid "Show channel suggestions"
msgstr ""
-#: ../../include/features.php:80
+#: ../../include/features.php:81
msgid "Post/Comment Tools"
msgstr ""
-#: ../../include/features.php:81
+#: ../../include/features.php:82
msgid "Tagging"
msgstr ""
-#: ../../include/features.php:81
+#: ../../include/features.php:82
msgid "Ability to tag existing posts"
msgstr ""
-#: ../../include/features.php:82
+#: ../../include/features.php:83
msgid "Post Categories"
msgstr ""
-#: ../../include/features.php:82
+#: ../../include/features.php:83
msgid "Add categories to your posts"
msgstr ""
-#: ../../include/features.php:83 ../../include/contact_widgets.php:57
+#: ../../include/features.php:84 ../../include/contact_widgets.php:57
#: ../../include/widgets.php:303
msgid "Saved Folders"
msgstr ""
-#: ../../include/features.php:83
+#: ../../include/features.php:84
msgid "Ability to file posts under folders"
msgstr ""
-#: ../../include/features.php:84
+#: ../../include/features.php:85
msgid "Dislike Posts"
msgstr ""
-#: ../../include/features.php:84
+#: ../../include/features.php:85
msgid "Ability to dislike posts/comments"
msgstr ""
-#: ../../include/features.php:85
+#: ../../include/features.php:86
msgid "Star Posts"
msgstr ""
-#: ../../include/features.php:85
+#: ../../include/features.php:86
msgid "Ability to mark special posts with a star indicator"
msgstr ""
-#: ../../include/features.php:86
+#: ../../include/features.php:87
msgid "Tag Cloud"
msgstr ""
-#: ../../include/features.php:86
+#: ../../include/features.php:87
msgid "Provide a personal tag cloud on your channel page"
msgstr ""
@@ -729,7 +711,7 @@ msgid "Delete this item?"
msgstr ""
#: ../../include/js_strings.php:6 ../../include/ItemObject.php:681
-#: ../../mod/photos.php:1044 ../../mod/photos.php:1162
+#: ../../mod/photos.php:1047 ../../mod/photos.php:1165
msgid "Comment"
msgstr ""
@@ -785,7 +767,7 @@ msgstr ""
msgid "Rate This Channel (this is public)"
msgstr ""
-#: ../../include/js_strings.php:20 ../../mod/connedit.php:666
+#: ../../include/js_strings.php:20 ../../mod/connedit.php:684
#: ../../mod/rate.php:157
msgid "Rating"
msgstr ""
@@ -796,17 +778,17 @@ msgstr ""
#: ../../include/js_strings.php:22 ../../include/ItemObject.php:682
#: ../../mod/fsuggest.php:108 ../../mod/mitem.php:231
-#: ../../mod/connedit.php:687 ../../mod/mood.php:135 ../../mod/pconfig.php:108
-#: ../../mod/photos.php:634 ../../mod/photos.php:1005
-#: ../../mod/photos.php:1045 ../../mod/photos.php:1163
+#: ../../mod/connedit.php:705 ../../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/mail.php:371
-#: ../../mod/admin.php:411 ../../mod/admin.php:776 ../../mod/admin.php:940
-#: ../../mod/admin.php:1072 ../../mod/admin.php:1266 ../../mod/admin.php:1351
-#: ../../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/thing.php:359 ../../mod/invite.php:142 ../../mod/settings.php:583
+#: ../../mod/photos.php:637 ../../mod/photos.php:1008
+#: ../../mod/photos.php:1048 ../../mod/photos.php:1166 ../../mod/admin.php:411
+#: ../../mod/admin.php:776 ../../mod/admin.php:940 ../../mod/admin.php:1072
+#: ../../mod/admin.php:1266 ../../mod/admin.php:1351 ../../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/thing.php:359
+#: ../../mod/invite.php:142 ../../mod/settings.php:583
#: ../../mod/settings.php:695 ../../mod/settings.php:723
#: ../../mod/settings.php:746 ../../mod/settings.php:831
#: ../../mod/settings.php:1020 ../../mod/xchan.php:11 ../../mod/group.php:81
@@ -897,19 +879,19 @@ msgstr ""
msgid "timeago.numbers"
msgstr ""
-#: ../../include/js_strings.php:44 ../../include/text.php:1144
+#: ../../include/js_strings.php:44 ../../include/text.php:1153
msgid "January"
msgstr ""
-#: ../../include/js_strings.php:45 ../../include/text.php:1144
+#: ../../include/js_strings.php:45 ../../include/text.php:1153
msgid "February"
msgstr ""
-#: ../../include/js_strings.php:46 ../../include/text.php:1144
+#: ../../include/js_strings.php:46 ../../include/text.php:1153
msgid "March"
msgstr ""
-#: ../../include/js_strings.php:47 ../../include/text.php:1144
+#: ../../include/js_strings.php:47 ../../include/text.php:1153
msgid "April"
msgstr ""
@@ -918,31 +900,31 @@ msgctxt "long"
msgid "May"
msgstr ""
-#: ../../include/js_strings.php:49 ../../include/text.php:1144
+#: ../../include/js_strings.php:49 ../../include/text.php:1153
msgid "June"
msgstr ""
-#: ../../include/js_strings.php:50 ../../include/text.php:1144
+#: ../../include/js_strings.php:50 ../../include/text.php:1153
msgid "July"
msgstr ""
-#: ../../include/js_strings.php:51 ../../include/text.php:1144
+#: ../../include/js_strings.php:51 ../../include/text.php:1153
msgid "August"
msgstr ""
-#: ../../include/js_strings.php:52 ../../include/text.php:1144
+#: ../../include/js_strings.php:52 ../../include/text.php:1153
msgid "September"
msgstr ""
-#: ../../include/js_strings.php:53 ../../include/text.php:1144
+#: ../../include/js_strings.php:53 ../../include/text.php:1153
msgid "October"
msgstr ""
-#: ../../include/js_strings.php:54 ../../include/text.php:1144
+#: ../../include/js_strings.php:54 ../../include/text.php:1153
msgid "November"
msgstr ""
-#: ../../include/js_strings.php:55 ../../include/text.php:1144
+#: ../../include/js_strings.php:55 ../../include/text.php:1153
msgid "December"
msgstr ""
@@ -995,31 +977,31 @@ msgstr ""
msgid "Dec"
msgstr ""
-#: ../../include/js_strings.php:68 ../../include/text.php:1140
+#: ../../include/js_strings.php:68 ../../include/text.php:1149
msgid "Sunday"
msgstr ""
-#: ../../include/js_strings.php:69 ../../include/text.php:1140
+#: ../../include/js_strings.php:69 ../../include/text.php:1149
msgid "Monday"
msgstr ""
-#: ../../include/js_strings.php:70 ../../include/text.php:1140
+#: ../../include/js_strings.php:70 ../../include/text.php:1149
msgid "Tuesday"
msgstr ""
-#: ../../include/js_strings.php:71 ../../include/text.php:1140
+#: ../../include/js_strings.php:71 ../../include/text.php:1149
msgid "Wednesday"
msgstr ""
-#: ../../include/js_strings.php:72 ../../include/text.php:1140
+#: ../../include/js_strings.php:72 ../../include/text.php:1149
msgid "Thursday"
msgstr ""
-#: ../../include/js_strings.php:73 ../../include/text.php:1140
+#: ../../include/js_strings.php:73 ../../include/text.php:1149
msgid "Friday"
msgstr ""
-#: ../../include/js_strings.php:74 ../../include/text.php:1140
+#: ../../include/js_strings.php:74 ../../include/text.php:1149
msgid "Saturday"
msgstr ""
@@ -1234,36 +1216,36 @@ msgstr ""
msgid "Visible to specific connections."
msgstr ""
-#: ../../include/items.php:4297 ../../mod/display.php:36
+#: ../../include/items.php:4298 ../../mod/display.php:36
#: ../../mod/filestorage.php:27 ../../mod/admin.php:127
#: ../../mod/admin.php:979 ../../mod/admin.php:1179 ../../mod/thing.php:86
#: ../../mod/viewsrc.php:20
msgid "Item not found."
msgstr ""
-#: ../../include/items.php:4806 ../../mod/group.php:38 ../../mod/group.php:137
+#: ../../include/items.php:4807 ../../mod/group.php:38 ../../mod/group.php:137
msgid "Collection not found."
msgstr ""
-#: ../../include/items.php:4822
+#: ../../include/items.php:4823
msgid "Collection is empty."
msgstr ""
-#: ../../include/items.php:4829
+#: ../../include/items.php:4830
#, php-format
msgid "Collection: %s"
msgstr ""
-#: ../../include/items.php:4839 ../../mod/connedit.php:657
+#: ../../include/items.php:4840 ../../mod/connedit.php:673
#, php-format
msgid "Connection: %s"
msgstr ""
-#: ../../include/items.php:4841
+#: ../../include/items.php:4842
msgid "Connection not found."
msgstr ""
-#: ../../include/api.php:1321
+#: ../../include/api.php:1324
msgid "Public Timeline"
msgstr ""
@@ -1314,15 +1296,14 @@ msgstr ""
msgid "Don't show"
msgstr ""
-#: ../../include/acl_selectors.php:247 ../../mod/photos.php:628
-#: ../../mod/photos.php:998 ../../mod/filestorage.php:147
-#: ../../mod/chat.php:211 ../../mod/events.php:708 ../../mod/thing.php:310
-#: ../../mod/thing.php:356
+#: ../../include/acl_selectors.php:247 ../../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:369
-#: ../../mod/photos.php:1215
+#: ../../mod/photos.php:1218
msgid "Close"
msgstr ""
@@ -1339,28 +1320,28 @@ msgstr ""
msgid "Cloned channel not found. Import failed."
msgstr ""
-#: ../../include/photos.php:109
+#: ../../include/photos.php:112
#, php-format
msgid "Image exceeds website size limit of %lu bytes"
msgstr ""
-#: ../../include/photos.php:116
+#: ../../include/photos.php:119
msgid "Image file is empty."
msgstr ""
-#: ../../include/photos.php:143 ../../mod/profile_photo.php:222
+#: ../../include/photos.php:146 ../../mod/profile_photo.php:222
msgid "Unable to process image"
msgstr ""
-#: ../../include/photos.php:232
+#: ../../include/photos.php:257
msgid "Photo storage failed."
msgstr ""
-#: ../../include/photos.php:452 ../../include/conversation.php:1609
+#: ../../include/photos.php:483 ../../include/conversation.php:1616
msgid "Photo Albums"
msgstr ""
-#: ../../include/photos.php:456
+#: ../../include/photos.php:487
msgid "Upload New Photos"
msgstr ""
@@ -1383,8 +1364,8 @@ msgid "View"
msgstr ""
#: ../../include/page_widgets.php:40 ../../include/ItemObject.php:691
-#: ../../include/conversation.php:1160 ../../mod/photos.php:1046
-#: ../../mod/editblock.php:171 ../../mod/editpost.php:150
+#: ../../include/conversation.php:1160 ../../mod/photos.php:1049
+#: ../../mod/editblock.php:171 ../../mod/editpost.php:149
#: ../../mod/events.php:707 ../../mod/webpages.php:188
#: ../../mod/editwebpage.php:212
msgid "Preview"
@@ -1412,8 +1393,8 @@ msgstr ""
msgid "Edited"
msgstr ""
-#: ../../include/photo/photo_driver.php:705 ../../mod/photos.php:94
-#: ../../mod/photos.php:696 ../../mod/profile_photo.php:146
+#: ../../include/photo/photo_driver.php:708 ../../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"
msgstr ""
@@ -1671,11 +1652,29 @@ msgstr ""
msgid "Embedding disabled"
msgstr ""
+#: ../../include/event.php:22 ../../include/bb2diaspora.php:468
+msgid "l F d, Y \\@ g:i A"
+msgstr ""
+
+#: ../../include/event.php:30 ../../include/bb2diaspora.php:474
+msgid "Starts:"
+msgstr ""
+
+#: ../../include/event.php:40 ../../include/bb2diaspora.php:482
+msgid "Finishes:"
+msgstr ""
+
+#: ../../include/event.php:50 ../../include/identity.php:1016
+#: ../../include/bb2diaspora.php:490 ../../mod/directory.php:302
+#: ../../mod/events.php:701
+msgid "Location:"
+msgstr ""
+
#: ../../include/event.php:766
msgid "This event has been added to your calendar."
msgstr ""
-#: ../../include/event.php:896 ../../include/text.php:1846
+#: ../../include/event.php:896 ../../include/text.php:1866
#: ../../include/conversation.php:123 ../../mod/like.php:363
#: ../../mod/tagger.php:47 ../../mod/events.php:245
msgid "event"
@@ -1705,7 +1704,7 @@ msgstr ""
msgid "Site Admin"
msgstr ""
-#: ../../include/apps.php:129 ../../include/conversation.php:1639
+#: ../../include/apps.php:129 ../../include/conversation.php:1646
#: ../../include/nav.php:103
msgid "Bookmarks"
msgstr ""
@@ -1732,7 +1731,7 @@ msgstr ""
msgid "Settings"
msgstr ""
-#: ../../include/apps.php:136 ../../include/conversation.php:1649
+#: ../../include/apps.php:136 ../../include/conversation.php:1656
#: ../../include/nav.php:107 ../../mod/webpages.php:178
msgid "Webpages"
msgstr ""
@@ -1746,7 +1745,7 @@ msgstr ""
msgid "Profile"
msgstr ""
-#: ../../include/apps.php:139 ../../include/conversation.php:1606
+#: ../../include/apps.php:139 ../../include/conversation.php:1613
#: ../../include/nav.php:92 ../../mod/fbrowser.php:25
msgid "Photos"
msgstr ""
@@ -1783,7 +1782,7 @@ msgstr ""
#: ../../include/apps.php:147 ../../include/text.php:857
#: ../../include/text.php:869 ../../include/nav.php:159
-#: ../../mod/search.php:38
+#: ../../mod/search.php:40
msgid "Search"
msgstr ""
@@ -1833,6 +1832,68 @@ msgstr ""
msgid "Purchase"
msgstr ""
+#: ../../include/attach.php:246 ../../include/attach.php:332
+msgid "Item was not found."
+msgstr ""
+
+#: ../../include/attach.php:496
+msgid "No source file."
+msgstr ""
+
+#: ../../include/attach.php:514
+msgid "Cannot locate file to replace"
+msgstr ""
+
+#: ../../include/attach.php:532
+msgid "Cannot locate file to revise/update"
+msgstr ""
+
+#: ../../include/attach.php:667
+#, php-format
+msgid "File exceeds size limit of %d"
+msgstr ""
+
+#: ../../include/attach.php:681
+#, php-format
+msgid "You have reached your limit of %1$.0f Mbytes attachment storage."
+msgstr ""
+
+#: ../../include/attach.php:837
+msgid "File upload failed. Possible system limit or action terminated."
+msgstr ""
+
+#: ../../include/attach.php:850
+msgid "Stored file could not be verified. Upload failed."
+msgstr ""
+
+#: ../../include/attach.php:898 ../../include/attach.php:914
+msgid "Path not available."
+msgstr ""
+
+#: ../../include/attach.php:960 ../../include/attach.php:1112
+msgid "Empty pathname"
+msgstr ""
+
+#: ../../include/attach.php:986
+msgid "duplicate filename or path"
+msgstr ""
+
+#: ../../include/attach.php:1008
+msgid "Path not found."
+msgstr ""
+
+#: ../../include/attach.php:1066
+msgid "mkdir failed."
+msgstr ""
+
+#: ../../include/attach.php:1070
+msgid "database storage failed."
+msgstr ""
+
+#: ../../include/attach.php:1118
+msgid "Empty path"
+msgstr ""
+
#: ../../include/auth.php:131
msgid "Logged out."
msgstr ""
@@ -2060,22 +2121,22 @@ msgid "I abstain"
msgstr ""
#: ../../include/ItemObject.php:175 ../../include/ItemObject.php:187
-#: ../../include/conversation.php:1681 ../../mod/photos.php:1079
-#: ../../mod/photos.php:1091
+#: ../../include/conversation.php:1688 ../../mod/photos.php:1082
+#: ../../mod/photos.php:1094
msgid "View all"
msgstr ""
#: ../../include/ItemObject.php:179 ../../include/identity.php:1276
-#: ../../include/taxonomy.php:403 ../../include/conversation.php:1705
-#: ../../mod/photos.php:1083
+#: ../../include/taxonomy.php:403 ../../include/conversation.php:1712
+#: ../../mod/photos.php:1086
msgctxt "noun"
msgid "Like"
msgid_plural "Likes"
msgstr[0] ""
msgstr[1] ""
-#: ../../include/ItemObject.php:184 ../../include/conversation.php:1708
-#: ../../mod/photos.php:1088
+#: ../../include/ItemObject.php:184 ../../include/conversation.php:1715
+#: ../../mod/photos.php:1091
msgctxt "noun"
msgid "Dislike"
msgid_plural "Dislikes"
@@ -2110,7 +2171,7 @@ msgstr ""
msgid "Add Tag"
msgstr ""
-#: ../../include/ItemObject.php:254 ../../mod/photos.php:1023
+#: ../../include/ItemObject.php:254 ../../mod/photos.php:1026
msgid "I like this (toggle)"
msgstr ""
@@ -2118,7 +2179,7 @@ msgstr ""
msgid "like"
msgstr ""
-#: ../../include/ItemObject.php:255 ../../mod/photos.php:1024
+#: ../../include/ItemObject.php:255 ../../mod/photos.php:1027
msgid "I don't like this (toggle)"
msgstr ""
@@ -2193,54 +2254,54 @@ msgstr ""
msgid "Mark all seen"
msgstr ""
-#: ../../include/ItemObject.php:363 ../../mod/photos.php:1209
+#: ../../include/ItemObject.php:363 ../../mod/photos.php:1212
msgctxt "noun"
msgid "Likes"
msgstr ""
-#: ../../include/ItemObject.php:364 ../../mod/photos.php:1210
+#: ../../include/ItemObject.php:364 ../../mod/photos.php:1213
msgctxt "noun"
msgid "Dislikes"
msgstr ""
#: ../../include/ItemObject.php:374 ../../include/conversation.php:739
-#: ../../include/conversation.php:1214 ../../mod/photos.php:1026
-#: ../../mod/editblock.php:150 ../../mod/editpost.php:130
+#: ../../include/conversation.php:1218 ../../mod/photos.php:1029
+#: ../../mod/editblock.php:150 ../../mod/editpost.php:129
#: ../../mod/editlayout.php:148 ../../mod/editwebpage.php:190
msgid "Please wait"
msgstr ""
-#: ../../include/ItemObject.php:679 ../../mod/photos.php:1042
-#: ../../mod/photos.php:1160
+#: ../../include/ItemObject.php:679 ../../mod/photos.php:1045
+#: ../../mod/photos.php:1163
msgid "This is you"
msgstr ""
-#: ../../include/ItemObject.php:683 ../../include/conversation.php:1186
-#: ../../mod/editblock.php:136 ../../mod/editpost.php:114
+#: ../../include/ItemObject.php:683 ../../include/conversation.php:1190
+#: ../../mod/editblock.php:136 ../../mod/editpost.php:113
#: ../../mod/editlayout.php:135 ../../mod/editwebpage.php:177
msgid "Bold"
msgstr ""
-#: ../../include/ItemObject.php:684 ../../include/conversation.php:1187
-#: ../../mod/editblock.php:137 ../../mod/editpost.php:115
+#: ../../include/ItemObject.php:684 ../../include/conversation.php:1191
+#: ../../mod/editblock.php:137 ../../mod/editpost.php:114
#: ../../mod/editlayout.php:136 ../../mod/editwebpage.php:178
msgid "Italic"
msgstr ""
-#: ../../include/ItemObject.php:685 ../../include/conversation.php:1188
-#: ../../mod/editblock.php:138 ../../mod/editpost.php:116
+#: ../../include/ItemObject.php:685 ../../include/conversation.php:1192
+#: ../../mod/editblock.php:138 ../../mod/editpost.php:115
#: ../../mod/editlayout.php:137 ../../mod/editwebpage.php:179
msgid "Underline"
msgstr ""
-#: ../../include/ItemObject.php:686 ../../include/conversation.php:1189
-#: ../../mod/editblock.php:139 ../../mod/editpost.php:117
+#: ../../include/ItemObject.php:686 ../../include/conversation.php:1193
+#: ../../mod/editblock.php:139 ../../mod/editpost.php:116
#: ../../mod/editlayout.php:138 ../../mod/editwebpage.php:180
msgid "Quote"
msgstr ""
-#: ../../include/ItemObject.php:687 ../../include/conversation.php:1190
-#: ../../mod/editblock.php:140 ../../mod/editpost.php:118
+#: ../../include/ItemObject.php:687 ../../include/conversation.php:1194
+#: ../../mod/editblock.php:140 ../../mod/editpost.php:117
#: ../../mod/editlayout.php:139 ../../mod/editwebpage.php:181
msgid "Code"
msgstr ""
@@ -2257,8 +2318,8 @@ msgstr ""
msgid "Video"
msgstr ""
-#: ../../include/ItemObject.php:694 ../../include/conversation.php:1241
-#: ../../mod/mail.php:247 ../../mod/mail.php:376 ../../mod/editpost.php:158
+#: ../../include/ItemObject.php:694 ../../include/conversation.php:1248
+#: ../../mod/mail.php:247 ../../mod/mail.php:376 ../../mod/editpost.php:157
msgid "Encrypt text"
msgstr ""
@@ -2308,228 +2369,228 @@ msgstr ""
msgid "Save"
msgstr ""
-#: ../../include/text.php:933
+#: ../../include/text.php:942
msgid "poke"
msgstr ""
-#: ../../include/text.php:933 ../../include/conversation.php:243
+#: ../../include/text.php:942 ../../include/conversation.php:243
msgid "poked"
msgstr ""
-#: ../../include/text.php:934
+#: ../../include/text.php:943
msgid "ping"
msgstr ""
-#: ../../include/text.php:934
+#: ../../include/text.php:943
msgid "pinged"
msgstr ""
-#: ../../include/text.php:935
+#: ../../include/text.php:944
msgid "prod"
msgstr ""
-#: ../../include/text.php:935
+#: ../../include/text.php:944
msgid "prodded"
msgstr ""
-#: ../../include/text.php:936
+#: ../../include/text.php:945
msgid "slap"
msgstr ""
-#: ../../include/text.php:936
+#: ../../include/text.php:945
msgid "slapped"
msgstr ""
-#: ../../include/text.php:937
+#: ../../include/text.php:946
msgid "finger"
msgstr ""
-#: ../../include/text.php:937
+#: ../../include/text.php:946
msgid "fingered"
msgstr ""
-#: ../../include/text.php:938
+#: ../../include/text.php:947
msgid "rebuff"
msgstr ""
-#: ../../include/text.php:938
+#: ../../include/text.php:947
msgid "rebuffed"
msgstr ""
-#: ../../include/text.php:948
+#: ../../include/text.php:957
msgid "happy"
msgstr ""
-#: ../../include/text.php:949
+#: ../../include/text.php:958
msgid "sad"
msgstr ""
-#: ../../include/text.php:950
+#: ../../include/text.php:959
msgid "mellow"
msgstr ""
-#: ../../include/text.php:951
+#: ../../include/text.php:960
msgid "tired"
msgstr ""
-#: ../../include/text.php:952
+#: ../../include/text.php:961
msgid "perky"
msgstr ""
-#: ../../include/text.php:953
+#: ../../include/text.php:962
msgid "angry"
msgstr ""
-#: ../../include/text.php:954
+#: ../../include/text.php:963
msgid "stupified"
msgstr ""
-#: ../../include/text.php:955
+#: ../../include/text.php:964
msgid "puzzled"
msgstr ""
-#: ../../include/text.php:956
+#: ../../include/text.php:965
msgid "interested"
msgstr ""
-#: ../../include/text.php:957
+#: ../../include/text.php:966
msgid "bitter"
msgstr ""
-#: ../../include/text.php:958
+#: ../../include/text.php:967
msgid "cheerful"
msgstr ""
-#: ../../include/text.php:959
+#: ../../include/text.php:968
msgid "alive"
msgstr ""
-#: ../../include/text.php:960
+#: ../../include/text.php:969
msgid "annoyed"
msgstr ""
-#: ../../include/text.php:961
+#: ../../include/text.php:970
msgid "anxious"
msgstr ""
-#: ../../include/text.php:962
+#: ../../include/text.php:971
msgid "cranky"
msgstr ""
-#: ../../include/text.php:963
+#: ../../include/text.php:972
msgid "disturbed"
msgstr ""
-#: ../../include/text.php:964
+#: ../../include/text.php:973
msgid "frustrated"
msgstr ""
-#: ../../include/text.php:965
+#: ../../include/text.php:974
msgid "depressed"
msgstr ""
-#: ../../include/text.php:966
+#: ../../include/text.php:975
msgid "motivated"
msgstr ""
-#: ../../include/text.php:967
+#: ../../include/text.php:976
msgid "relaxed"
msgstr ""
-#: ../../include/text.php:968
+#: ../../include/text.php:977
msgid "surprised"
msgstr ""
-#: ../../include/text.php:1144
+#: ../../include/text.php:1153
msgid "May"
msgstr ""
-#: ../../include/text.php:1221 ../../include/text.php:1225
+#: ../../include/text.php:1230 ../../include/text.php:1234
msgid "Unknown Attachment"
msgstr ""
-#: ../../include/text.php:1227
+#: ../../include/text.php:1236
msgid "Attachment"
msgstr ""
-#: ../../include/text.php:1227
+#: ../../include/text.php:1236
msgid "Size Unknown"
msgstr ""
-#: ../../include/text.php:1263
+#: ../../include/text.php:1272
msgid "remove category"
msgstr ""
-#: ../../include/text.php:1340
+#: ../../include/text.php:1349
msgid "remove from file"
msgstr ""
-#: ../../include/text.php:1441 ../../include/text.php:1452
+#: ../../include/text.php:1461 ../../include/text.php:1472
msgid "Click to open/close"
msgstr ""
-#: ../../include/text.php:1620 ../../mod/events.php:497
+#: ../../include/text.php:1640 ../../mod/events.php:497
msgid "Link to Source"
msgstr ""
-#: ../../include/text.php:1641 ../../include/text.php:1712
+#: ../../include/text.php:1661 ../../include/text.php:1732
msgid "default"
msgstr ""
-#: ../../include/text.php:1649
+#: ../../include/text.php:1669
msgid "Page layout"
msgstr ""
-#: ../../include/text.php:1649
+#: ../../include/text.php:1669
msgid "You can create your own with the layouts tool"
msgstr ""
-#: ../../include/text.php:1690
+#: ../../include/text.php:1710
msgid "Page content type"
msgstr ""
-#: ../../include/text.php:1724
+#: ../../include/text.php:1744
msgid "Select an alternate language"
msgstr ""
-#: ../../include/text.php:1843 ../../include/conversation.php:120
+#: ../../include/text.php:1863 ../../include/conversation.php:120
#: ../../mod/like.php:361 ../../mod/tagger.php:43 ../../mod/subthread.php:72
#: ../../mod/subthread.php:172
msgid "photo"
msgstr ""
-#: ../../include/text.php:1849 ../../include/conversation.php:148
+#: ../../include/text.php:1869 ../../include/conversation.php:148
#: ../../mod/like.php:361 ../../mod/subthread.php:72
#: ../../mod/subthread.php:172
msgid "status"
msgstr ""
-#: ../../include/text.php:1851 ../../include/conversation.php:150
+#: ../../include/text.php:1871 ../../include/conversation.php:150
#: ../../mod/tagger.php:53
msgid "comment"
msgstr ""
-#: ../../include/text.php:1856
+#: ../../include/text.php:1876
msgid "activity"
msgstr ""
-#: ../../include/text.php:2151
+#: ../../include/text.php:2171
msgid "Design Tools"
msgstr ""
-#: ../../include/text.php:2154 ../../mod/blocks.php:147
+#: ../../include/text.php:2174 ../../mod/blocks.php:147
msgid "Blocks"
msgstr ""
-#: ../../include/text.php:2155 ../../mod/menu.php:103
+#: ../../include/text.php:2175 ../../mod/menu.php:103
msgid "Menus"
msgstr ""
-#: ../../include/text.php:2156 ../../mod/layouts.php:174
+#: ../../include/text.php:2176 ../../mod/layouts.php:174
msgid "Layouts"
msgstr ""
-#: ../../include/text.php:2157
+#: ../../include/text.php:2177
msgid "Pages"
msgstr ""
@@ -3087,6 +3148,14 @@ msgstr ""
msgid "Like this thing"
msgstr ""
+#: ../../include/bb2diaspora.php:382
+msgid "Attachments:"
+msgstr ""
+
+#: ../../include/bb2diaspora.php:470
+msgid "$Projectname event notification:"
+msgstr ""
+
#: ../../include/taxonomy.php:229 ../../include/taxonomy.php:250
msgid "Tags"
msgstr ""
@@ -3119,68 +3188,6 @@ msgstr ""
msgid "dislikes"
msgstr ""
-#: ../../include/attach.php:243 ../../include/attach.php:329
-msgid "Item was not found."
-msgstr ""
-
-#: ../../include/attach.php:493
-msgid "No source file."
-msgstr ""
-
-#: ../../include/attach.php:511
-msgid "Cannot locate file to replace"
-msgstr ""
-
-#: ../../include/attach.php:529
-msgid "Cannot locate file to revise/update"
-msgstr ""
-
-#: ../../include/attach.php:664
-#, php-format
-msgid "File exceeds size limit of %d"
-msgstr ""
-
-#: ../../include/attach.php:678
-#, php-format
-msgid "You have reached your limit of %1$.0f Mbytes attachment storage."
-msgstr ""
-
-#: ../../include/attach.php:828
-msgid "File upload failed. Possible system limit or action terminated."
-msgstr ""
-
-#: ../../include/attach.php:841
-msgid "Stored file could not be verified. Upload failed."
-msgstr ""
-
-#: ../../include/attach.php:889 ../../include/attach.php:905
-msgid "Path not available."
-msgstr ""
-
-#: ../../include/attach.php:951 ../../include/attach.php:1103
-msgid "Empty pathname"
-msgstr ""
-
-#: ../../include/attach.php:977
-msgid "duplicate filename or path"
-msgstr ""
-
-#: ../../include/attach.php:999
-msgid "Path not found."
-msgstr ""
-
-#: ../../include/attach.php:1057
-msgid "mkdir failed."
-msgstr ""
-
-#: ../../include/attach.php:1061
-msgid "database storage failed."
-msgstr ""
-
-#: ../../include/attach.php:1109
-msgid "Empty path"
-msgstr ""
-
#: ../../include/conversation.php:126 ../../mod/like.php:113
msgid "channel"
msgstr ""
@@ -3211,42 +3218,42 @@ msgctxt "mood"
msgid "%1$s is %2$s"
msgstr ""
-#: ../../include/conversation.php:574 ../../mod/photos.php:1060
+#: ../../include/conversation.php:574 ../../mod/photos.php:1063
msgctxt "title"
msgid "Likes"
msgstr ""
-#: ../../include/conversation.php:574 ../../mod/photos.php:1060
+#: ../../include/conversation.php:574 ../../mod/photos.php:1063
msgctxt "title"
msgid "Dislikes"
msgstr ""
-#: ../../include/conversation.php:575 ../../mod/photos.php:1061
+#: ../../include/conversation.php:575 ../../mod/photos.php:1064
msgctxt "title"
msgid "Agree"
msgstr ""
-#: ../../include/conversation.php:575 ../../mod/photos.php:1061
+#: ../../include/conversation.php:575 ../../mod/photos.php:1064
msgctxt "title"
msgid "Disagree"
msgstr ""
-#: ../../include/conversation.php:575 ../../mod/photos.php:1061
+#: ../../include/conversation.php:575 ../../mod/photos.php:1064
msgctxt "title"
msgid "Abstain"
msgstr ""
-#: ../../include/conversation.php:576 ../../mod/photos.php:1062
+#: ../../include/conversation.php:576 ../../mod/photos.php:1065
msgctxt "title"
msgid "Attending"
msgstr ""
-#: ../../include/conversation.php:576 ../../mod/photos.php:1062
+#: ../../include/conversation.php:576 ../../mod/photos.php:1065
msgctxt "title"
msgid "Not attending"
msgstr ""
-#: ../../include/conversation.php:576 ../../mod/photos.php:1062
+#: ../../include/conversation.php:576 ../../mod/photos.php:1065
msgctxt "title"
msgid "Might attend"
msgstr ""
@@ -3392,269 +3399,273 @@ msgstr ""
msgid "Expires YYYY-MM-DD HH:MM"
msgstr ""
-#: ../../include/conversation.php:1179 ../../mod/photos.php:1025
-#: ../../mod/layouts.php:184 ../../mod/webpages.php:182
+#: ../../include/conversation.php:1183 ../../mod/layouts.php:184
+#: ../../mod/photos.php:1028 ../../mod/webpages.php:182
#: ../../mod/blocks.php:154
msgid "Share"
msgstr ""
-#: ../../include/conversation.php:1181
+#: ../../include/conversation.php:1185
msgid "Page link name"
msgstr ""
-#: ../../include/conversation.php:1184
+#: ../../include/conversation.php:1188
msgid "Post as"
msgstr ""
-#: ../../include/conversation.php:1191 ../../mod/editblock.php:142
-#: ../../mod/editpost.php:119 ../../mod/editlayout.php:140
+#: ../../include/conversation.php:1195 ../../mod/editblock.php:142
+#: ../../mod/editpost.php:118 ../../mod/editlayout.php:140
#: ../../mod/editwebpage.php:182
msgid "Upload photo"
msgstr ""
-#: ../../include/conversation.php:1192
+#: ../../include/conversation.php:1196
msgid "upload photo"
msgstr ""
-#: ../../include/conversation.php:1193 ../../mod/mail.php:240
+#: ../../include/conversation.php:1197 ../../mod/mail.php:240
#: ../../mod/mail.php:369 ../../mod/editblock.php:143
-#: ../../mod/editpost.php:120 ../../mod/editlayout.php:141
+#: ../../mod/editpost.php:119 ../../mod/editlayout.php:141
#: ../../mod/editwebpage.php:183
msgid "Attach file"
msgstr ""
-#: ../../include/conversation.php:1194
+#: ../../include/conversation.php:1198
msgid "attach file"
msgstr ""
-#: ../../include/conversation.php:1195 ../../mod/mail.php:241
+#: ../../include/conversation.php:1199 ../../mod/mail.php:241
#: ../../mod/mail.php:370 ../../mod/editblock.php:144
-#: ../../mod/editpost.php:121 ../../mod/editlayout.php:142
+#: ../../mod/editpost.php:120 ../../mod/editlayout.php:142
#: ../../mod/editwebpage.php:184
msgid "Insert web link"
msgstr ""
-#: ../../include/conversation.php:1196
+#: ../../include/conversation.php:1200
msgid "web link"
msgstr ""
-#: ../../include/conversation.php:1197
+#: ../../include/conversation.php:1201
msgid "Insert video link"
msgstr ""
-#: ../../include/conversation.php:1198
+#: ../../include/conversation.php:1202
msgid "video link"
msgstr ""
-#: ../../include/conversation.php:1199
+#: ../../include/conversation.php:1203
msgid "Insert audio link"
msgstr ""
-#: ../../include/conversation.php:1200
+#: ../../include/conversation.php:1204
msgid "audio link"
msgstr ""
-#: ../../include/conversation.php:1201 ../../mod/editblock.php:148
-#: ../../mod/editpost.php:125 ../../mod/editlayout.php:146
+#: ../../include/conversation.php:1205 ../../mod/editblock.php:148
+#: ../../mod/editpost.php:124 ../../mod/editlayout.php:146
#: ../../mod/editwebpage.php:188
msgid "Set your location"
msgstr ""
-#: ../../include/conversation.php:1202
+#: ../../include/conversation.php:1206
msgid "set location"
msgstr ""
-#: ../../include/conversation.php:1203 ../../mod/editpost.php:127
+#: ../../include/conversation.php:1207 ../../mod/editpost.php:126
msgid "Toggle voting"
msgstr ""
-#: ../../include/conversation.php:1206 ../../mod/editblock.php:149
-#: ../../mod/editpost.php:126 ../../mod/editlayout.php:147
+#: ../../include/conversation.php:1210 ../../mod/editblock.php:149
+#: ../../mod/editpost.php:125 ../../mod/editlayout.php:147
#: ../../mod/editwebpage.php:189
msgid "Clear browser location"
msgstr ""
-#: ../../include/conversation.php:1207
+#: ../../include/conversation.php:1211
msgid "clear location"
msgstr ""
-#: ../../include/conversation.php:1209 ../../mod/editblock.php:162
-#: ../../mod/editpost.php:142 ../../mod/editwebpage.php:205
+#: ../../include/conversation.php:1213 ../../mod/editblock.php:162
+#: ../../mod/editpost.php:141 ../../mod/editwebpage.php:205
msgid "Title (optional)"
msgstr ""
-#: ../../include/conversation.php:1213 ../../mod/editblock.php:165
-#: ../../mod/editpost.php:144 ../../mod/editlayout.php:163
+#: ../../include/conversation.php:1217 ../../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:1215 ../../mod/editblock.php:151
-#: ../../mod/editpost.php:131 ../../mod/editlayout.php:149
+#: ../../include/conversation.php:1219 ../../mod/editblock.php:151
+#: ../../mod/editpost.php:130 ../../mod/editlayout.php:149
#: ../../mod/editwebpage.php:191
msgid "Permission settings"
msgstr ""
-#: ../../include/conversation.php:1216
+#: ../../include/conversation.php:1220
msgid "permissions"
msgstr ""
-#: ../../include/conversation.php:1224 ../../mod/editblock.php:159
-#: ../../mod/editpost.php:139 ../../mod/editlayout.php:156
+#: ../../include/conversation.php:1228 ../../mod/editblock.php:159
+#: ../../mod/editpost.php:138 ../../mod/editlayout.php:156
#: ../../mod/editwebpage.php:200
msgid "Public post"
msgstr ""
-#: ../../include/conversation.php:1226 ../../mod/editblock.php:166
-#: ../../mod/editpost.php:145 ../../mod/editlayout.php:164
+#: ../../include/conversation.php:1230 ../../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:1239 ../../mod/mail.php:245
+#: ../../include/conversation.php:1243 ../../mod/mail.php:245
#: ../../mod/mail.php:374 ../../mod/editblock.php:176
-#: ../../mod/editpost.php:156 ../../mod/editlayout.php:173
+#: ../../mod/editpost.php:155 ../../mod/editlayout.php:173
#: ../../mod/editwebpage.php:217
msgid "Set expiration date"
msgstr ""
-#: ../../include/conversation.php:1243 ../../mod/editpost.php:160
+#: ../../include/conversation.php:1246
+msgid "Set publish date"
+msgstr ""
+
+#: ../../include/conversation.php:1250 ../../mod/editpost.php:159
#: ../../mod/events.php:691
msgid "OK"
msgstr ""
-#: ../../include/conversation.php:1244 ../../mod/fbrowser.php:82
-#: ../../mod/fbrowser.php:117 ../../mod/editpost.php:161
+#: ../../include/conversation.php:1251 ../../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:584 ../../mod/settings.php:610
msgid "Cancel"
msgstr ""
-#: ../../include/conversation.php:1487
+#: ../../include/conversation.php:1494
msgid "Discover"
msgstr ""
-#: ../../include/conversation.php:1490
+#: ../../include/conversation.php:1497
msgid "Imported public streams"
msgstr ""
-#: ../../include/conversation.php:1495
+#: ../../include/conversation.php:1502
msgid "Commented Order"
msgstr ""
-#: ../../include/conversation.php:1498
+#: ../../include/conversation.php:1505
msgid "Sort by Comment Date"
msgstr ""
-#: ../../include/conversation.php:1502
+#: ../../include/conversation.php:1509
msgid "Posted Order"
msgstr ""
-#: ../../include/conversation.php:1505
+#: ../../include/conversation.php:1512
msgid "Sort by Post Date"
msgstr ""
-#: ../../include/conversation.php:1510 ../../include/widgets.php:94
+#: ../../include/conversation.php:1517 ../../include/widgets.php:94
msgid "Personal"
msgstr ""
-#: ../../include/conversation.php:1513
+#: ../../include/conversation.php:1520
msgid "Posts that mention or involve you"
msgstr ""
-#: ../../include/conversation.php:1519 ../../mod/menu.php:112
+#: ../../include/conversation.php:1526 ../../mod/menu.php:112
#: ../../mod/connections.php:72 ../../mod/connections.php:82
msgid "New"
msgstr ""
-#: ../../include/conversation.php:1522
+#: ../../include/conversation.php:1529
msgid "Activity Stream - by date"
msgstr ""
-#: ../../include/conversation.php:1528
+#: ../../include/conversation.php:1535
msgid "Starred"
msgstr ""
-#: ../../include/conversation.php:1531
+#: ../../include/conversation.php:1538
msgid "Favourite Posts"
msgstr ""
-#: ../../include/conversation.php:1538
+#: ../../include/conversation.php:1545
msgid "Spam"
msgstr ""
-#: ../../include/conversation.php:1541
+#: ../../include/conversation.php:1548
msgid "Posts flagged as SPAM"
msgstr ""
-#: ../../include/conversation.php:1585 ../../mod/admin.php:947
+#: ../../include/conversation.php:1592 ../../mod/admin.php:947
msgid "Channel"
msgstr ""
-#: ../../include/conversation.php:1588
+#: ../../include/conversation.php:1595
msgid "Status Messages and Posts"
msgstr ""
-#: ../../include/conversation.php:1597
+#: ../../include/conversation.php:1604
msgid "About"
msgstr ""
-#: ../../include/conversation.php:1600
+#: ../../include/conversation.php:1607
msgid "Profile Details"
msgstr ""
-#: ../../include/conversation.php:1616
+#: ../../include/conversation.php:1623
msgid "Files and Storage"
msgstr ""
-#: ../../include/conversation.php:1626 ../../include/conversation.php:1629
+#: ../../include/conversation.php:1633 ../../include/conversation.php:1636
msgid "Chatrooms"
msgstr ""
-#: ../../include/conversation.php:1642
+#: ../../include/conversation.php:1649
msgid "Saved Bookmarks"
msgstr ""
-#: ../../include/conversation.php:1652
+#: ../../include/conversation.php:1659
msgid "Manage Webpages"
msgstr ""
-#: ../../include/conversation.php:1711
+#: ../../include/conversation.php:1718
msgctxt "noun"
msgid "Attending"
msgid_plural "Attending"
msgstr[0] ""
msgstr[1] ""
-#: ../../include/conversation.php:1714
+#: ../../include/conversation.php:1721
msgctxt "noun"
msgid "Not Attending"
msgid_plural "Not Attending"
msgstr[0] ""
msgstr[1] ""
-#: ../../include/conversation.php:1717
+#: ../../include/conversation.php:1724
msgctxt "noun"
msgid "Undecided"
msgid_plural "Undecided"
msgstr[0] ""
msgstr[1] ""
-#: ../../include/conversation.php:1720
+#: ../../include/conversation.php:1727
msgctxt "noun"
msgid "Agree"
msgid_plural "Agrees"
msgstr[0] ""
msgstr[1] ""
-#: ../../include/conversation.php:1723
+#: ../../include/conversation.php:1730
msgctxt "noun"
msgid "Disagree"
msgid_plural "Disagrees"
msgstr[0] ""
msgstr[1] ""
-#: ../../include/conversation.php:1726
+#: ../../include/conversation.php:1733
msgctxt "noun"
msgid "Abstain"
msgid_plural "Abstains"
@@ -3768,7 +3779,7 @@ msgstr ""
msgid "Export channel"
msgstr ""
-#: ../../include/widgets.php:529 ../../mod/connedit.php:657
+#: ../../include/widgets.php:529 ../../mod/connedit.php:673
msgid "Connection Default Permissions"
msgstr ""
@@ -4116,8 +4127,8 @@ msgstr ""
#: ../../include/dir_fns.php:130 ../../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:658 ../../mod/photos.php:625
-#: ../../mod/filestorage.php:151 ../../mod/filestorage.php:159
+#: ../../mod/connedit.php:674 ../../mod/filestorage.php:151
+#: ../../mod/filestorage.php:159 ../../mod/photos.php:626
#: ../../mod/admin.php:386 ../../mod/menu.php:96 ../../mod/menu.php:153
#: ../../mod/settings.php:574 ../../mod/api.php:106
#: ../../view/theme/redbasic/php/config.php:104
@@ -4128,8 +4139,8 @@ msgstr ""
#: ../../include/dir_fns.php:128 ../../include/dir_fns.php:129
#: ../../include/dir_fns.php:130 ../../mod/removeme.php:60
#: ../../mod/mitem.php:154 ../../mod/mitem.php:155 ../../mod/mitem.php:228
-#: ../../mod/mitem.php:229 ../../mod/photos.php:625
-#: ../../mod/filestorage.php:151 ../../mod/filestorage.php:159
+#: ../../mod/mitem.php:229 ../../mod/filestorage.php:151
+#: ../../mod/filestorage.php:159 ../../mod/photos.php:626
#: ../../mod/admin.php:388 ../../mod/menu.php:96 ../../mod/menu.php:153
#: ../../mod/settings.php:574 ../../mod/api.php:105
#: ../../view/theme/redbasic/php/config.php:104
@@ -4166,8 +4177,8 @@ msgstr ""
msgid "Suggest a friend for %s"
msgstr ""
-#: ../../mod/directory.php:59 ../../mod/display.php:13
-#: ../../mod/photos.php:489 ../../mod/search.php:13 ../../mod/ratings.php:82
+#: ../../mod/directory.php:59 ../../mod/display.php:13 ../../mod/search.php:13
+#: ../../mod/photos.php:490 ../../mod/ratings.php:82
#: ../../mod/viewconnections.php:17
msgid "Public access denied."
msgstr ""
@@ -4852,107 +4863,116 @@ msgstr ""
msgid "Set Affinity & Profile"
msgstr ""
-#: ../../mod/connedit.php:658
+#: ../../mod/connedit.php:669
+msgid "none"
+msgstr ""
+
+#: ../../mod/connedit.php:674
msgid "Apply these permissions automatically"
msgstr ""
-#: ../../mod/connedit.php:660
-msgid "This connection's address is"
+#: ../../mod/connedit.php:676
+msgid "This connection's primary address is"
+msgstr ""
+
+#: ../../mod/connedit.php:677
+msgid "Available locations:"
msgstr ""
-#: ../../mod/connedit.php:663
+#: ../../mod/connedit.php:681
msgid ""
"The permissions indicated on this page will be applied to all new "
"connections."
msgstr ""
-#: ../../mod/connedit.php:665
+#: ../../mod/connedit.php:683
msgid "Slide to adjust your degree of friendship"
msgstr ""
-#: ../../mod/connedit.php:667
+#: ../../mod/connedit.php:685
msgid "Slide to adjust your rating"
msgstr ""
-#: ../../mod/connedit.php:668 ../../mod/connedit.php:673
+#: ../../mod/connedit.php:686 ../../mod/connedit.php:691
msgid "Optionally explain your rating"
msgstr ""
-#: ../../mod/connedit.php:670
+#: ../../mod/connedit.php:688
msgid "Custom Filter"
msgstr ""
-#: ../../mod/connedit.php:671
+#: ../../mod/connedit.php:689
msgid "Only import posts with this text"
msgstr ""
-#: ../../mod/connedit.php:671 ../../mod/connedit.php:672
+#: ../../mod/connedit.php:689 ../../mod/connedit.php:690
msgid ""
-"words one per line or #tags or /patterns/, leave blank to import all posts"
+"words one per line or #tags or /patterns/ or lang=xx, leave blank to import "
+"all posts"
msgstr ""
-#: ../../mod/connedit.php:672
+#: ../../mod/connedit.php:690
msgid "Do not import posts with this text"
msgstr ""
-#: ../../mod/connedit.php:674
+#: ../../mod/connedit.php:692
msgid "This information is public!"
msgstr ""
-#: ../../mod/connedit.php:679
+#: ../../mod/connedit.php:697
msgid "Connection Pending Approval"
msgstr ""
-#: ../../mod/connedit.php:680
+#: ../../mod/connedit.php:698
msgid "Connection Request"
msgstr ""
-#: ../../mod/connedit.php:681
+#: ../../mod/connedit.php:699
#, php-format
msgid ""
"(%s) would like to connect with you. Please approve this connection to allow "
"communication."
msgstr ""
-#: ../../mod/connedit.php:682 ../../mod/admin.php:781
+#: ../../mod/connedit.php:700 ../../mod/admin.php:781
msgid "Approve"
msgstr ""
-#: ../../mod/connedit.php:683
+#: ../../mod/connedit.php:701
msgid "Approve Later"
msgstr ""
-#: ../../mod/connedit.php:686
+#: ../../mod/connedit.php:704
msgid "inherited"
msgstr ""
-#: ../../mod/connedit.php:688
+#: ../../mod/connedit.php:706
#, php-format
msgid ""
"Please choose the profile you would like to display to %s when viewing your "
"profile securely."
msgstr ""
-#: ../../mod/connedit.php:690
+#: ../../mod/connedit.php:708
msgid "Their Settings"
msgstr ""
-#: ../../mod/connedit.php:691
+#: ../../mod/connedit.php:709
msgid "My Settings"
msgstr ""
-#: ../../mod/connedit.php:693
+#: ../../mod/connedit.php:711
msgid "Individual Permissions"
msgstr ""
-#: ../../mod/connedit.php:694
+#: ../../mod/connedit.php:712
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:695
+#: ../../mod/connedit.php:713
msgid ""
"Some permissions may be inherited from your channel's <a href=\"settings"
"\"><strong>privacy settings</strong></a>, which have higher priority than "
@@ -4960,7 +4980,7 @@ msgid ""
"any impact unless the inherited setting changes."
msgstr ""
-#: ../../mod/connedit.php:696
+#: ../../mod/connedit.php:714
msgid "Last update:"
msgstr ""
@@ -4987,165 +5007,6 @@ msgid ""
"to correctly use this feature."
msgstr ""
-#: ../../mod/photos.php:79
-msgid "Page owner information could not be retrieved."
-msgstr ""
-
-#: ../../mod/photos.php:100
-msgid "Album not found."
-msgstr ""
-
-#: ../../mod/photos.php:127
-msgid "Delete Album"
-msgstr ""
-
-#: ../../mod/photos.php:171 ../../mod/photos.php:1006
-msgid "Delete Photo"
-msgstr ""
-
-#: ../../mod/photos.php:500
-msgid "No photos selected"
-msgstr ""
-
-#: ../../mod/photos.php:549
-msgid "Access to this item is restricted."
-msgstr ""
-
-#: ../../mod/photos.php:588
-#, php-format
-msgid "%1$.2f MB of %2$.2f MB photo storage used."
-msgstr ""
-
-#: ../../mod/photos.php:591
-#, php-format
-msgid "%1$.2f MB photo storage used."
-msgstr ""
-
-#: ../../mod/photos.php:619
-msgid "Upload Photos"
-msgstr ""
-
-#: ../../mod/photos.php:623
-msgid "Enter an album name"
-msgstr ""
-
-#: ../../mod/photos.php:624
-msgid "or select an existing album (doubleclick)"
-msgstr ""
-
-#: ../../mod/photos.php:625
-msgid "Create a status post for this upload"
-msgstr ""
-
-#: ../../mod/photos.php:652
-msgid "Album name could not be decoded"
-msgstr ""
-
-#: ../../mod/photos.php:696 ../../mod/photos.php:1233
-#: ../../mod/photos.php:1250
-msgid "Contact Photos"
-msgstr ""
-
-#: ../../mod/photos.php:724
-msgid "Show Newest First"
-msgstr ""
-
-#: ../../mod/photos.php:726
-msgid "Show Oldest First"
-msgstr ""
-
-#: ../../mod/photos.php:750 ../../mod/photos.php:1283
-msgid "View Photo"
-msgstr ""
-
-#: ../../mod/photos.php:779
-msgid "Edit Album"
-msgstr ""
-
-#: ../../mod/photos.php:824
-msgid "Permission denied. Access to this item may be restricted."
-msgstr ""
-
-#: ../../mod/photos.php:826
-msgid "Photo not available"
-msgstr ""
-
-#: ../../mod/photos.php:884
-msgid "Use as profile photo"
-msgstr ""
-
-#: ../../mod/photos.php:891
-msgid "Private Photo"
-msgstr ""
-
-#: ../../mod/photos.php:902 ../../mod/events.php:528
-msgid "Previous"
-msgstr ""
-
-#: ../../mod/photos.php:906
-msgid "View Full Size"
-msgstr ""
-
-#: ../../mod/photos.php:911 ../../mod/events.php:529 ../../mod/setup.php:285
-msgid "Next"
-msgstr ""
-
-#: ../../mod/photos.php:951 ../../mod/tagrm.php:133
-msgid "Remove"
-msgstr ""
-
-#: ../../mod/photos.php:985
-msgid "Edit photo"
-msgstr ""
-
-#: ../../mod/photos.php:987
-msgid "Rotate CW (right)"
-msgstr ""
-
-#: ../../mod/photos.php:988
-msgid "Rotate CCW (left)"
-msgstr ""
-
-#: ../../mod/photos.php:991
-msgid "Enter a new album name"
-msgstr ""
-
-#: ../../mod/photos.php:992
-msgid "or select an existing one (doubleclick)"
-msgstr ""
-
-#: ../../mod/photos.php:995
-msgid "Caption"
-msgstr ""
-
-#: ../../mod/photos.php:997
-msgid "Add a Tag"
-msgstr ""
-
-#: ../../mod/photos.php:1001
-msgid "Example: @bob, @Barbara_Jensen, @jim@example.com"
-msgstr ""
-
-#: ../../mod/photos.php:1004
-msgid "Flag as adult in album view"
-msgstr ""
-
-#: ../../mod/photos.php:1196
-msgid "In This Photo:"
-msgstr ""
-
-#: ../../mod/photos.php:1201
-msgid "Map"
-msgstr ""
-
-#: ../../mod/photos.php:1289
-msgid "View Album"
-msgstr ""
-
-#: ../../mod/photos.php:1312
-msgid "Recent Photos"
-msgstr ""
-
#: ../../mod/filestorage.php:82
msgid "Permission Denied."
msgstr ""
@@ -5308,12 +5169,12 @@ msgstr ""
msgid "%1$s's Chatrooms"
msgstr ""
-#: ../../mod/search.php:209
+#: ../../mod/search.php:211
#, php-format
msgid "Items tagged with: %s"
msgstr ""
-#: ../../mod/search.php:211
+#: ../../mod/search.php:213
#, php-format
msgid "Search results for: %s"
msgstr ""
@@ -5422,6 +5283,173 @@ msgstr ""
msgid "Your message for %s (%s):"
msgstr ""
+#: ../../mod/photos.php:79
+msgid "Page owner information could not be retrieved."
+msgstr ""
+
+#: ../../mod/photos.php:100
+msgid "Album not found."
+msgstr ""
+
+#: ../../mod/photos.php:127
+msgid "Delete Album"
+msgstr ""
+
+#: ../../mod/photos.php:171 ../../mod/photos.php:1009
+msgid "Delete Photo"
+msgstr ""
+
+#: ../../mod/photos.php:501
+msgid "No photos selected"
+msgstr ""
+
+#: ../../mod/photos.php:550
+msgid "Access to this item is restricted."
+msgstr ""
+
+#: ../../mod/photos.php:589
+#, php-format
+msgid "%1$.2f MB of %2$.2f MB photo storage used."
+msgstr ""
+
+#: ../../mod/photos.php:592
+#, php-format
+msgid "%1$.2f MB photo storage used."
+msgstr ""
+
+#: ../../mod/photos.php:620
+msgid "Upload Photos"
+msgstr ""
+
+#: ../../mod/photos.php:624
+msgid "Enter an album name"
+msgstr ""
+
+#: ../../mod/photos.php:625
+msgid "or select an existing album (doubleclick)"
+msgstr ""
+
+#: ../../mod/photos.php:626
+msgid "Create a status post for this upload"
+msgstr ""
+
+#: ../../mod/photos.php:627
+msgid "Caption (optional):"
+msgstr ""
+
+#: ../../mod/photos.php:628
+msgid "Description (optional):"
+msgstr ""
+
+#: ../../mod/photos.php:655
+msgid "Album name could not be decoded"
+msgstr ""
+
+#: ../../mod/photos.php:699 ../../mod/photos.php:1236
+#: ../../mod/photos.php:1253
+msgid "Contact Photos"
+msgstr ""
+
+#: ../../mod/photos.php:727
+msgid "Show Newest First"
+msgstr ""
+
+#: ../../mod/photos.php:729
+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 ""
+
+#: ../../mod/photos.php:829
+msgid "Photo not available"
+msgstr ""
+
+#: ../../mod/photos.php:887
+msgid "Use as profile photo"
+msgstr ""
+
+#: ../../mod/photos.php:894
+msgid "Private Photo"
+msgstr ""
+
+#: ../../mod/photos.php:905 ../../mod/events.php:528
+msgid "Previous"
+msgstr ""
+
+#: ../../mod/photos.php:909
+msgid "View Full Size"
+msgstr ""
+
+#: ../../mod/photos.php:914 ../../mod/events.php:529 ../../mod/setup.php:285
+msgid "Next"
+msgstr ""
+
+#: ../../mod/photos.php:954 ../../mod/tagrm.php:133
+msgid "Remove"
+msgstr ""
+
+#: ../../mod/photos.php:988
+msgid "Edit photo"
+msgstr ""
+
+#: ../../mod/photos.php:990
+msgid "Rotate CW (right)"
+msgstr ""
+
+#: ../../mod/photos.php:991
+msgid "Rotate CCW (left)"
+msgstr ""
+
+#: ../../mod/photos.php:994
+msgid "Enter a new album name"
+msgstr ""
+
+#: ../../mod/photos.php:995
+msgid "or select an existing one (doubleclick)"
+msgstr ""
+
+#: ../../mod/photos.php:998
+msgid "Caption"
+msgstr ""
+
+#: ../../mod/photos.php:1000
+msgid "Add a Tag"
+msgstr ""
+
+#: ../../mod/photos.php:1004
+msgid "Example: @bob, @Barbara_Jensen, @jim@example.com"
+msgstr ""
+
+#: ../../mod/photos.php:1007
+msgid "Flag as adult in album view"
+msgstr ""
+
+#: ../../mod/photos.php:1199
+msgid "In This Photo:"
+msgstr ""
+
+#: ../../mod/photos.php:1204
+msgid "Map"
+msgstr ""
+
+#: ../../mod/photos.php:1292
+msgid "View Album"
+msgstr ""
+
+#: ../../mod/photos.php:1315
+msgid "Recent Photos"
+msgstr ""
+
#: ../../mod/dreport.php:23
msgid "Invalid message"
msgstr ""
@@ -5489,17 +5517,17 @@ msgstr ""
msgid "Delete block?"
msgstr ""
-#: ../../mod/editblock.php:145 ../../mod/editpost.php:122
+#: ../../mod/editblock.php:145 ../../mod/editpost.php:121
#: ../../mod/editlayout.php:143 ../../mod/editwebpage.php:185
msgid "Insert YouTube video"
msgstr ""
-#: ../../mod/editblock.php:146 ../../mod/editpost.php:123
+#: ../../mod/editblock.php:146 ../../mod/editpost.php:122
#: ../../mod/editlayout.php:144 ../../mod/editwebpage.php:186
msgid "Insert Vorbis [.ogg] video"
msgstr ""
-#: ../../mod/editblock.php:147 ../../mod/editpost.php:124
+#: ../../mod/editblock.php:147 ../../mod/editpost.php:123
#: ../../mod/editlayout.php:145 ../../mod/editwebpage.php:187
msgid "Insert Vorbis [.ogg] audio"
msgstr ""
@@ -5520,7 +5548,7 @@ msgstr ""
msgid "Delete item?"
msgstr ""
-#: ../../mod/editpost.php:165 ../../mod/rpost.php:128
+#: ../../mod/editpost.php:164 ../../mod/rpost.php:128
msgid "Edit post"
msgstr ""
@@ -6869,20 +6897,20 @@ msgstr ""
msgid "Executable content type not permitted to this channel."
msgstr ""
-#: ../../mod/item.php:906
+#: ../../mod/item.php:908
msgid "System error. Post not saved."
msgstr ""
-#: ../../mod/item.php:1173
+#: ../../mod/item.php:1175
msgid "Unable to obtain post information from database."
msgstr ""
-#: ../../mod/item.php:1180
+#: ../../mod/item.php:1182
#, php-format
msgid "You have reached your limit of %1$.0f top level posts."
msgstr ""
-#: ../../mod/item.php:1187
+#: ../../mod/item.php:1189
#, php-format
msgid "You have reached your limit of %1$.0f webpages."
msgstr ""
@@ -9024,6 +9052,10 @@ msgstr ""
msgid "Use this form to import existing posts and content from an export file."
msgstr ""
+#: ../../mod/wholikesme.php:13
+msgid "Who likes me?"
+msgstr ""
+
#: ../../view/theme/redbasic/php/config.php:82
msgid "Focus (Hubzilla default)"
msgstr ""
diff --git a/version.inc b/version.inc
index 89cc96160..9b4db518b 100644
--- a/version.inc
+++ b/version.inc
@@ -1 +1 @@
-2015-10-29.1200
+2015-10-30.1201