aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2012-04-08 16:19:45 -0700
committerfriendica <info@friendica.com>2012-04-08 16:19:45 -0700
commit977625a53b77c4944fc294fa670aae15c068b94b (patch)
treeb6898058a77925062bbcc82afcebb8e870c5d906
parent5c0446975516f2b52b6cf51618e0b75af56de71b (diff)
downloadvolse-hubzilla-977625a53b77c4944fc294fa670aae15c068b94b.tar.gz
volse-hubzilla-977625a53b77c4944fc294fa670aae15c068b94b.tar.bz2
volse-hubzilla-977625a53b77c4944fc294fa670aae15c068b94b.zip
fix to wall_upload photos default permissions to use cid rather than uid.
-rw-r--r--boot.php2
-rw-r--r--mod/item.php2
-rw-r--r--mod/wall_attach.php5
-rw-r--r--mod/wall_upload.php8
-rw-r--r--util/messages.po590
5 files changed, 319 insertions, 288 deletions
diff --git a/boot.php b/boot.php
index b1c378d34..1815d37e2 100644
--- a/boot.php
+++ b/boot.php
@@ -9,7 +9,7 @@ require_once('include/nav.php');
require_once('include/cache.php');
define ( 'FRIENDICA_PLATFORM', 'Friendica');
-define ( 'FRIENDICA_VERSION', '2.3.1305' );
+define ( 'FRIENDICA_VERSION', '2.3.1306' );
define ( 'DFRN_PROTOCOL_VERSION', '2.23' );
define ( 'DB_UPDATE_VERSION', 1137 );
diff --git a/mod/item.php b/mod/item.php
index 72e63865b..82fb0bf72 100644
--- a/mod/item.php
+++ b/mod/item.php
@@ -351,7 +351,7 @@ function item_post(&$a) {
$image_uri = substr($image_uri,0, strpos($image_uri,'-'));
if(! strlen($image_uri))
continue;
- $srch = '<' . intval($profile_uid) . '>';
+ $srch = '<' . intval($contact_record['id']) . '>';
$r = q("SELECT `id` FROM `photo` WHERE `allow_cid` = '%s' AND `allow_gid` = '' AND `deny_cid` = '' AND `deny_gid` = ''
AND `resource-id` = '%s' AND `uid` = %d LIMIT 1",
dbesc($srch),
diff --git a/mod/wall_attach.php b/mod/wall_attach.php
index ecf475291..bee7c29dc 100644
--- a/mod/wall_attach.php
+++ b/mod/wall_attach.php
@@ -7,7 +7,7 @@ function wall_attach_post(&$a) {
if($a->argc > 1) {
$nick = $a->argv[1];
- $r = q("SELECT * FROM `user` WHERE `nickname` = '%s' AND `blocked` = 0 LIMIT 1",
+ $r = q("SELECT `user`.*, `contact`.`id` FROM `user` LEFT JOIN `contact` on `user`.`uid` = `contact`.`uid` WHERE `user`.`nickname` = '%s' AND `user`.`blocked` = 0 and `contact`.`self` = 1 LIMIT 1",
dbesc($nick)
);
if(! count($r))
@@ -21,6 +21,7 @@ function wall_attach_post(&$a) {
$visitor = 0;
$page_owner_uid = $r[0]['uid'];
+ $page_owner_cid = $r[0]['id'];
$page_owner_nick = $r[0]['nickname'];
$community_page = (($r[0]['page-flags'] == PAGE_COMMUNITY) ? true : false);
@@ -73,7 +74,7 @@ function wall_attach_post(&$a) {
dbesc($filedata),
dbesc($created),
dbesc($created),
- dbesc('<' . $page_owner_uid . '>'),
+ dbesc('<' . $page_owner_cid . '>'),
dbesc(''),
dbesc(''),
dbesc('')
diff --git a/mod/wall_upload.php b/mod/wall_upload.php
index 64f174a78..f341cc9cd 100644
--- a/mod/wall_upload.php
+++ b/mod/wall_upload.php
@@ -6,7 +6,7 @@ function wall_upload_post(&$a) {
if($a->argc > 1) {
$nick = $a->argv[1];
- $r = q("SELECT * FROM `user` WHERE `nickname` = '%s' AND `blocked` = 0 LIMIT 1",
+ $r = q("SELECT `user`.*, `contact`.`id` FROM `user` LEFT JOIN `contact` on `user`.`uid` = `contact`.`uid` WHERE `user`.`nickname` = '%s' AND `user`.`blocked` = 0 and `contact`.`self` = 1 LIMIT 1",
dbesc($nick)
);
if(! count($r))
@@ -16,10 +16,13 @@ function wall_upload_post(&$a) {
else
return;
+
+
$can_post = false;
$visitor = 0;
$page_owner_uid = $r[0]['uid'];
+ $default_cid = $r[0]['id'];
$page_owner_nick = $r[0]['nickname'];
$community_page = (($r[0]['page-flags'] == PAGE_COMMUNITY) ? true : false);
@@ -34,6 +37,7 @@ function wall_upload_post(&$a) {
if(count($r)) {
$can_post = true;
$visitor = remote_user();
+ $default_cid = $visitor;
}
}
}
@@ -76,7 +80,7 @@ function wall_upload_post(&$a) {
$smallest = 0;
- $defperm = '<' . $page_owner_uid . '>';
+ $defperm = '<' . $default_cid . '>';
$r = $ph->store($page_owner_uid, $visitor, $hash, $filename, t('Wall Photos'), 0, 0, $defperm);
diff --git a/util/messages.po b/util/messages.po
index f68d1541b..2749281a9 100644
--- a/util/messages.po
+++ b/util/messages.po
@@ -6,9 +6,9 @@
#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: 2.3.1305\n"
+"Project-Id-Version: 2.3.1306\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-04-07 10:00-0700\n"
+"POT-Creation-Date: 2012-04-08 10:00-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"
@@ -54,8 +54,8 @@ msgstr ""
#: ../../mod/display.php:138 ../../mod/profiles.php:7
#: ../../mod/profiles.php:232 ../../mod/delegate.php:6
#: ../../mod/suggest.php:28 ../../mod/invite.php:13 ../../mod/invite.php:81
-#: ../../mod/dfrn_confirm.php:53 ../../addon/facebook/facebook.php:456
-#: ../../include/items.php:3118 ../../index.php:294
+#: ../../mod/dfrn_confirm.php:53 ../../addon/facebook/facebook.php:460
+#: ../../include/items.php:3118 ../../index.php:306
msgid "Permission denied."
msgstr ""
@@ -132,12 +132,12 @@ msgstr ""
#: ../../mod/manage.php:109 ../../mod/group.php:85 ../../mod/admin.php:357
#: ../../mod/admin.php:525 ../../mod/admin.php:654 ../../mod/admin.php:826
#: ../../mod/admin.php:906 ../../mod/profiles.php:390 ../../mod/invite.php:119
-#: ../../addon/facebook/facebook.php:547 ../../addon/yourls/yourls.php:76
+#: ../../addon/facebook/facebook.php:551 ../../addon/yourls/yourls.php:76
#: ../../addon/ljpost/ljpost.php:93 ../../addon/nsfw/nsfw.php:57
#: ../../addon/uhremotestorage/uhremotestorage.php:89
#: ../../addon/randplace/randplace.php:179 ../../addon/dwpost/dwpost.php:93
#: ../../addon/drpost/drpost.php:110 ../../addon/geonames/geonames.php:187
-#: ../../addon/oembed.old/oembed.php:41 ../../addon/impressum/impressum.php:69
+#: ../../addon/oembed.old/oembed.php:41 ../../addon/impressum/impressum.php:80
#: ../../addon/blockem/blockem.php:57 ../../addon/qcomment/qcomment.php:61
#: ../../addon/openstreetmap/openstreetmap.php:70
#: ../../addon/editplain/editplain.php:84 ../../addon/blackout/blackout.php:94
@@ -147,11 +147,11 @@ msgstr ""
#: ../../addon/statusnet/statusnet.php:318
#: ../../addon/statusnet/statusnet.php:325
#: ../../addon/statusnet/statusnet.php:353
-#: ../../addon/statusnet/statusnet.php:547 ../../addon/tumblr/tumblr.php:90
+#: ../../addon/statusnet/statusnet.php:553 ../../addon/tumblr/tumblr.php:90
#: ../../addon/numfriends/numfriends.php:85 ../../addon/gnot/gnot.php:88
#: ../../addon/wppost/wppost.php:102 ../../addon/showmore/showmore.php:48
#: ../../addon/piwik/piwik.php:89 ../../addon/twitter/twitter.php:180
-#: ../../addon/twitter/twitter.php:209 ../../addon/twitter/twitter.php:369
+#: ../../addon/twitter/twitter.php:209 ../../addon/twitter/twitter.php:375
#: ../../addon/posterous/posterous.php:90
#: ../../view/theme/quattro/config.php:21 ../../include/conversation.php:555
msgid "Submit"
@@ -211,11 +211,11 @@ msgstr ""
msgid "link to source"
msgstr ""
-#: ../../mod/events.php:296 ../../view/theme/diabook-red/theme.php:240
-#: ../../view/theme/diabook-blue/theme.php:240
-#: ../../view/theme/diabook/theme.php:248
-#: ../../view/theme/diabook-aerith/theme.php:240 ../../include/nav.php:52
-#: ../../boot.php:1421
+#: ../../mod/events.php:296 ../../view/theme/diabook-red/theme.php:244
+#: ../../view/theme/diabook-blue/theme.php:244
+#: ../../view/theme/diabook/theme.php:251
+#: ../../view/theme/diabook-aerith/theme.php:245 ../../include/nav.php:52
+#: ../../boot.php:1422
msgid "Events"
msgstr ""
@@ -265,7 +265,7 @@ msgid "Description:"
msgstr ""
#: ../../mod/events.php:395 ../../include/event.php:37
-#: ../../include/bb2diaspora.php:260 ../../boot.php:1042
+#: ../../include/bb2diaspora.php:260 ../../boot.php:1043
msgid "Location:"
msgstr ""
@@ -347,10 +347,10 @@ msgstr ""
#: ../../mod/photos.php:51 ../../mod/photos.php:151 ../../mod/photos.php:880
#: ../../mod/photos.php:951 ../../mod/photos.php:966 ../../mod/photos.php:1383
#: ../../mod/photos.php:1395 ../../addon/communityhome/communityhome.php:110
-#: ../../view/theme/diabook-red/theme.php:110
-#: ../../view/theme/diabook-blue/theme.php:110
-#: ../../view/theme/diabook/theme.php:114
-#: ../../view/theme/diabook-aerith/theme.php:110
+#: ../../view/theme/diabook-red/theme.php:114
+#: ../../view/theme/diabook-blue/theme.php:114
+#: ../../view/theme/diabook/theme.php:117
+#: ../../view/theme/diabook-aerith/theme.php:115
msgid "Contact Photos"
msgstr ""
@@ -373,10 +373,10 @@ msgstr ""
#: ../../mod/profile_photo.php:74 ../../mod/profile_photo.php:174
#: ../../mod/profile_photo.php:252 ../../mod/profile_photo.php:261
#: ../../addon/communityhome/communityhome.php:111
-#: ../../view/theme/diabook-red/theme.php:111
-#: ../../view/theme/diabook-blue/theme.php:111
-#: ../../view/theme/diabook/theme.php:115
-#: ../../view/theme/diabook-aerith/theme.php:111
+#: ../../view/theme/diabook-red/theme.php:115
+#: ../../view/theme/diabook-blue/theme.php:115
+#: ../../view/theme/diabook/theme.php:118
+#: ../../view/theme/diabook-aerith/theme.php:116
msgid "Profile Photos"
msgstr ""
@@ -398,10 +398,10 @@ msgstr ""
#: ../../mod/photos.php:529 ../../mod/like.php:127 ../../mod/tagger.php:70
#: ../../addon/communityhome/communityhome.php:163
-#: ../../view/theme/diabook-red/theme.php:82
-#: ../../view/theme/diabook-blue/theme.php:82
-#: ../../view/theme/diabook/theme.php:86
-#: ../../view/theme/diabook-aerith/theme.php:82 ../../include/text.php:1297
+#: ../../view/theme/diabook-red/theme.php:86
+#: ../../view/theme/diabook-blue/theme.php:86
+#: ../../view/theme/diabook/theme.php:89
+#: ../../view/theme/diabook-aerith/theme.php:87 ../../include/text.php:1297
#: ../../include/diaspora.php:1654 ../../include/conversation.php:53
#: ../../include/conversation.php:126
msgid "photo"
@@ -576,11 +576,10 @@ msgstr ""
msgid "Not available."
msgstr ""
-#: ../../mod/community.php:30 ../../addon/pages/pages.php:75
-#: ../../view/theme/diabook-red/theme.php:242
-#: ../../view/theme/diabook-blue/theme.php:242
-#: ../../view/theme/diabook/theme.php:250
-#: ../../view/theme/diabook-aerith/theme.php:242 ../../include/nav.php:101
+#: ../../mod/community.php:30 ../../view/theme/diabook-red/theme.php:246
+#: ../../view/theme/diabook-blue/theme.php:246
+#: ../../view/theme/diabook/theme.php:253
+#: ../../view/theme/diabook-aerith/theme.php:247 ../../include/nav.php:101
msgid "Community"
msgstr ""
@@ -1165,7 +1164,7 @@ msgid "is interested in:"
msgstr ""
#: ../../mod/match.php:58 ../../mod/suggest.php:59
-#: ../../include/contact_widgets.php:9 ../../boot.php:986
+#: ../../include/contact_widgets.php:9 ../../boot.php:987
msgid "Connect"
msgstr ""
@@ -1213,10 +1212,10 @@ msgstr ""
msgid "Personal"
msgstr ""
-#: ../../mod/notifications.php:90 ../../view/theme/diabook-red/theme.php:236
-#: ../../view/theme/diabook-blue/theme.php:236
-#: ../../view/theme/diabook/theme.php:244
-#: ../../view/theme/diabook-aerith/theme.php:236 ../../include/nav.php:77
+#: ../../mod/notifications.php:90 ../../view/theme/diabook-red/theme.php:240
+#: ../../view/theme/diabook-blue/theme.php:240
+#: ../../view/theme/diabook/theme.php:247
+#: ../../view/theme/diabook-aerith/theme.php:241 ../../include/nav.php:77
#: ../../include/nav.php:115
msgid "Home"
msgstr ""
@@ -1594,10 +1593,10 @@ msgstr ""
msgid "Edit contact"
msgstr ""
-#: ../../mod/contacts.php:523 ../../view/theme/diabook-red/theme.php:238
-#: ../../view/theme/diabook-blue/theme.php:238
-#: ../../view/theme/diabook/theme.php:246
-#: ../../view/theme/diabook-aerith/theme.php:238 ../../include/nav.php:139
+#: ../../mod/contacts.php:523 ../../view/theme/diabook-red/theme.php:242
+#: ../../view/theme/diabook-blue/theme.php:242
+#: ../../view/theme/diabook/theme.php:249
+#: ../../view/theme/diabook-aerith/theme.php:243 ../../include/nav.php:139
msgid "Contacts"
msgstr ""
@@ -1630,8 +1629,8 @@ msgstr ""
#: ../../mod/lostpass.php:45 ../../mod/lostpass.php:107
#: ../../mod/register.php:392 ../../mod/register.php:446
#: ../../mod/regmod.php:54 ../../mod/dfrn_confirm.php:732
-#: ../../addon/facebook/facebook.php:617
-#: ../../addon/facebook/facebook.php:1069 ../../include/items.php:2658
+#: ../../addon/facebook/facebook.php:621
+#: ../../addon/facebook/facebook.php:1073 ../../include/items.php:2658
msgid "Administrator"
msgstr ""
@@ -1733,52 +1732,52 @@ msgstr ""
msgid " Cannot change to that email."
msgstr ""
-#: ../../mod/settings.php:420 ../../addon/facebook/facebook.php:445
-#: ../../addon/impressum/impressum.php:64
+#: ../../mod/settings.php:420 ../../addon/facebook/facebook.php:449
+#: ../../addon/impressum/impressum.php:75
#: ../../addon/openstreetmap/openstreetmap.php:80
-#: ../../addon/piwik/piwik.php:105 ../../addon/twitter/twitter.php:364
+#: ../../addon/piwik/piwik.php:105 ../../addon/twitter/twitter.php:370
msgid "Settings updated."
msgstr ""
-#: ../../mod/settings.php:484 ../../view/theme/diabook-red/theme.php:284
-#: ../../view/theme/diabook-blue/theme.php:283
-#: ../../view/theme/diabook/theme.php:293
-#: ../../view/theme/diabook-aerith/theme.php:283 ../../include/nav.php:137
+#: ../../mod/settings.php:484 ../../view/theme/diabook-red/theme.php:288
+#: ../../view/theme/diabook-blue/theme.php:287
+#: ../../view/theme/diabook/theme.php:298
+#: ../../view/theme/diabook-aerith/theme.php:288 ../../include/nav.php:137
msgid "Account settings"
msgstr ""
-#: ../../mod/settings.php:489 ../../view/theme/diabook-red/theme.php:289
-#: ../../view/theme/diabook-blue/theme.php:288
-#: ../../view/theme/diabook/theme.php:298
-#: ../../view/theme/diabook-aerith/theme.php:288
+#: ../../mod/settings.php:489 ../../view/theme/diabook-red/theme.php:293
+#: ../../view/theme/diabook-blue/theme.php:292
+#: ../../view/theme/diabook/theme.php:303
+#: ../../view/theme/diabook-aerith/theme.php:293
msgid "Display settings"
msgstr ""
-#: ../../mod/settings.php:495 ../../view/theme/diabook-red/theme.php:298
-#: ../../view/theme/diabook-blue/theme.php:297
-#: ../../view/theme/diabook/theme.php:307
-#: ../../view/theme/diabook-aerith/theme.php:297
-msgid "Connector settings"
-msgstr ""
-
-#: ../../mod/settings.php:500 ../../view/theme/diabook-red/theme.php:303
-#: ../../view/theme/diabook-blue/theme.php:302
+#: ../../mod/settings.php:495 ../../view/theme/diabook-red/theme.php:302
+#: ../../view/theme/diabook-blue/theme.php:301
#: ../../view/theme/diabook/theme.php:312
#: ../../view/theme/diabook-aerith/theme.php:302
-msgid "Plugin settings"
+msgid "Connector settings"
msgstr ""
-#: ../../mod/settings.php:505 ../../view/theme/diabook-red/theme.php:308
-#: ../../view/theme/diabook-blue/theme.php:307
+#: ../../mod/settings.php:500 ../../view/theme/diabook-red/theme.php:307
+#: ../../view/theme/diabook-blue/theme.php:306
#: ../../view/theme/diabook/theme.php:317
#: ../../view/theme/diabook-aerith/theme.php:307
-msgid "Connections"
+msgid "Plugin settings"
msgstr ""
-#: ../../mod/settings.php:510 ../../view/theme/diabook-red/theme.php:313
-#: ../../view/theme/diabook-blue/theme.php:312
+#: ../../mod/settings.php:505 ../../view/theme/diabook-red/theme.php:312
+#: ../../view/theme/diabook-blue/theme.php:311
#: ../../view/theme/diabook/theme.php:322
#: ../../view/theme/diabook-aerith/theme.php:312
+msgid "Connections"
+msgstr ""
+
+#: ../../mod/settings.php:510 ../../view/theme/diabook-red/theme.php:317
+#: ../../view/theme/diabook-blue/theme.php:316
+#: ../../view/theme/diabook/theme.php:327
+#: ../../view/theme/diabook-aerith/theme.php:317
msgid "Export personal data"
msgstr ""
@@ -1788,12 +1787,12 @@ msgid "Add application"
msgstr ""
#: ../../mod/settings.php:532 ../../mod/settings.php:559
-#: ../../addon/statusnet/statusnet.php:541
+#: ../../addon/statusnet/statusnet.php:547
msgid "Consumer Key"
msgstr ""
#: ../../mod/settings.php:533 ../../mod/settings.php:560
-#: ../../addon/statusnet/statusnet.php:540
+#: ../../addon/statusnet/statusnet.php:546
msgid "Consumer Secret"
msgstr ""
@@ -2258,12 +2257,12 @@ msgstr ""
msgid "Invalid contact."
msgstr ""
-#: ../../mod/notes.php:44 ../../boot.php:1426
+#: ../../mod/notes.php:44 ../../boot.php:1427
msgid "Personal Notes"
msgstr ""
#: ../../mod/notes.php:63 ../../mod/filer.php:30
-#: ../../addon/facebook/facebook.php:673 ../../include/text.php:652
+#: ../../addon/facebook/facebook.php:677 ../../include/text.php:652
msgid "Save"
msgstr ""
@@ -2465,7 +2464,7 @@ msgstr ""
msgid "Group name changed."
msgstr ""
-#: ../../mod/group.php:72 ../../mod/profperm.php:19 ../../index.php:293
+#: ../../mod/group.php:72 ../../mod/profperm.php:19 ../../index.php:305
msgid "Permission denied"
msgstr ""
@@ -2505,12 +2504,12 @@ msgstr ""
msgid "Profile Visibility Editor"
msgstr ""
-#: ../../mod/profperm.php:103 ../../view/theme/diabook-red/theme.php:237
-#: ../../view/theme/diabook-blue/theme.php:237
-#: ../../view/theme/diabook/theme.php:245
-#: ../../view/theme/diabook-aerith/theme.php:237
+#: ../../mod/profperm.php:103 ../../view/theme/diabook-red/theme.php:241
+#: ../../view/theme/diabook-blue/theme.php:241
+#: ../../view/theme/diabook/theme.php:248
+#: ../../view/theme/diabook-aerith/theme.php:242
#: ../../include/profile_advanced.php:7 ../../include/profile_advanced.php:76
-#: ../../include/nav.php:50 ../../boot.php:1408
+#: ../../include/nav.php:50 ../../boot.php:1409
msgid "Profile"
msgstr ""
@@ -2691,28 +2690,28 @@ msgid "People Search"
msgstr ""
#: ../../mod/like.php:127 ../../mod/tagger.php:70
-#: ../../addon/facebook/facebook.php:1440
+#: ../../addon/facebook/facebook.php:1546
#: ../../addon/communityhome/communityhome.php:158
#: ../../addon/communityhome/communityhome.php:167
-#: ../../view/theme/diabook-red/theme.php:77
-#: ../../view/theme/diabook-red/theme.php:86
-#: ../../view/theme/diabook-blue/theme.php:77
-#: ../../view/theme/diabook-blue/theme.php:86
-#: ../../view/theme/diabook/theme.php:81 ../../view/theme/diabook/theme.php:90
-#: ../../view/theme/diabook-aerith/theme.php:77
-#: ../../view/theme/diabook-aerith/theme.php:86
+#: ../../view/theme/diabook-red/theme.php:81
+#: ../../view/theme/diabook-red/theme.php:90
+#: ../../view/theme/diabook-blue/theme.php:81
+#: ../../view/theme/diabook-blue/theme.php:90
+#: ../../view/theme/diabook/theme.php:84 ../../view/theme/diabook/theme.php:93
+#: ../../view/theme/diabook-aerith/theme.php:82
+#: ../../view/theme/diabook-aerith/theme.php:91
#: ../../include/diaspora.php:1654 ../../include/conversation.php:48
#: ../../include/conversation.php:57 ../../include/conversation.php:121
#: ../../include/conversation.php:130
msgid "status"
msgstr ""
-#: ../../mod/like.php:144 ../../addon/facebook/facebook.php:1444
+#: ../../mod/like.php:144 ../../addon/facebook/facebook.php:1550
#: ../../addon/communityhome/communityhome.php:172
-#: ../../view/theme/diabook-red/theme.php:91
-#: ../../view/theme/diabook-blue/theme.php:91
-#: ../../view/theme/diabook/theme.php:95
-#: ../../view/theme/diabook-aerith/theme.php:91
+#: ../../view/theme/diabook-red/theme.php:95
+#: ../../view/theme/diabook-blue/theme.php:95
+#: ../../view/theme/diabook/theme.php:98
+#: ../../view/theme/diabook-aerith/theme.php:96
#: ../../include/diaspora.php:1670 ../../include/conversation.php:65
#, php-format
msgid "%1$s likes %2$s's %3$s"
@@ -3032,7 +3031,7 @@ msgstr ""
msgid "Advanced"
msgstr ""
-#: ../../mod/admin.php:365 ../../addon/statusnet/statusnet.php:538
+#: ../../mod/admin.php:365 ../../addon/statusnet/statusnet.php:544
msgid "Site name"
msgstr ""
@@ -3758,30 +3757,30 @@ msgstr ""
msgid "Age: "
msgstr ""
-#: ../../mod/profiles.php:476 ../../view/theme/diabook-red/theme.php:294
-#: ../../view/theme/diabook-blue/theme.php:293
-#: ../../view/theme/diabook/theme.php:303
-#: ../../view/theme/diabook-aerith/theme.php:293
+#: ../../mod/profiles.php:476 ../../view/theme/diabook-red/theme.php:298
+#: ../../view/theme/diabook-blue/theme.php:297
+#: ../../view/theme/diabook/theme.php:308
+#: ../../view/theme/diabook-aerith/theme.php:298
msgid "Edit/Manage Profiles"
msgstr ""
-#: ../../mod/profiles.php:477 ../../boot.php:1008
+#: ../../mod/profiles.php:477 ../../boot.php:1009
msgid "Change profile photo"
msgstr ""
-#: ../../mod/profiles.php:478 ../../boot.php:1009
+#: ../../mod/profiles.php:478 ../../boot.php:1010
msgid "Create New Profile"
msgstr ""
-#: ../../mod/profiles.php:489 ../../boot.php:1019
+#: ../../mod/profiles.php:489 ../../boot.php:1020
msgid "Profile Image"
msgstr ""
-#: ../../mod/profiles.php:491 ../../boot.php:1022
+#: ../../mod/profiles.php:491 ../../boot.php:1023
msgid "visible to everybody"
msgstr ""
-#: ../../mod/profiles.php:492 ../../boot.php:1023
+#: ../../mod/profiles.php:492 ../../boot.php:1024
msgid "Edit visibility"
msgstr ""
@@ -3833,10 +3832,10 @@ msgstr ""
msgid "No entries."
msgstr ""
-#: ../../mod/suggest.php:38 ../../view/theme/diabook-red/theme.php:146
-#: ../../view/theme/diabook-blue/theme.php:146
-#: ../../view/theme/diabook/theme.php:150
-#: ../../view/theme/diabook-aerith/theme.php:146
+#: ../../mod/suggest.php:38 ../../view/theme/diabook-red/theme.php:150
+#: ../../view/theme/diabook-blue/theme.php:150
+#: ../../view/theme/diabook/theme.php:153
+#: ../../view/theme/diabook-aerith/theme.php:151
#: ../../include/contact_widgets.php:33
msgid "Friend Suggestions"
msgstr ""
@@ -3851,10 +3850,10 @@ msgstr ""
msgid "Ignore/Hide"
msgstr ""
-#: ../../mod/directory.php:47 ../../view/theme/diabook-red/theme.php:144
-#: ../../view/theme/diabook-blue/theme.php:144
-#: ../../view/theme/diabook/theme.php:148
-#: ../../view/theme/diabook-aerith/theme.php:144
+#: ../../mod/directory.php:47 ../../view/theme/diabook-red/theme.php:148
+#: ../../view/theme/diabook-blue/theme.php:148
+#: ../../view/theme/diabook/theme.php:151
+#: ../../view/theme/diabook-aerith/theme.php:149
msgid "Global Directory"
msgstr ""
@@ -4040,71 +4039,71 @@ msgstr ""
msgid "Connection accepted at %s"
msgstr ""
-#: ../../addon/facebook/facebook.php:462
+#: ../../addon/facebook/facebook.php:466
msgid "Facebook disabled"
msgstr ""
-#: ../../addon/facebook/facebook.php:467
+#: ../../addon/facebook/facebook.php:471
msgid "Updating contacts"
msgstr ""
-#: ../../addon/facebook/facebook.php:488
+#: ../../addon/facebook/facebook.php:492
msgid "Facebook API key is missing."
msgstr ""
-#: ../../addon/facebook/facebook.php:495
+#: ../../addon/facebook/facebook.php:499
msgid "Facebook Connect"
msgstr ""
-#: ../../addon/facebook/facebook.php:501
+#: ../../addon/facebook/facebook.php:505
msgid "Install Facebook connector for this account."
msgstr ""
-#: ../../addon/facebook/facebook.php:508
+#: ../../addon/facebook/facebook.php:512
msgid "Remove Facebook connector"
msgstr ""
-#: ../../addon/facebook/facebook.php:513
+#: ../../addon/facebook/facebook.php:517
msgid ""
"Re-authenticate [This is necessary whenever your Facebook password is "
"changed.]"
msgstr ""
-#: ../../addon/facebook/facebook.php:520
+#: ../../addon/facebook/facebook.php:524
msgid "Post to Facebook by default"
msgstr ""
-#: ../../addon/facebook/facebook.php:524
+#: ../../addon/facebook/facebook.php:528
msgid "Link all your Facebook friends and conversations on this website"
msgstr ""
-#: ../../addon/facebook/facebook.php:526
+#: ../../addon/facebook/facebook.php:530
msgid ""
"Facebook conversations consist of your <em>profile wall</em> and your friend "
"<em>stream</em>."
msgstr ""
-#: ../../addon/facebook/facebook.php:527
+#: ../../addon/facebook/facebook.php:531
msgid "On this website, your Facebook friend stream is only visible to you."
msgstr ""
-#: ../../addon/facebook/facebook.php:528
+#: ../../addon/facebook/facebook.php:532
msgid ""
"The following settings determine the privacy of your Facebook profile wall "
"on this website."
msgstr ""
-#: ../../addon/facebook/facebook.php:532
+#: ../../addon/facebook/facebook.php:536
msgid ""
"On this website your Facebook profile wall conversations will only be "
"visible to you"
msgstr ""
-#: ../../addon/facebook/facebook.php:537
+#: ../../addon/facebook/facebook.php:541
msgid "Do not import your Facebook profile wall conversations"
msgstr ""
-#: ../../addon/facebook/facebook.php:539
+#: ../../addon/facebook/facebook.php:543
msgid ""
"If you choose to link conversations and leave both of these boxes unchecked, "
"your Facebook profile wall will be merged with your profile wall on this "
@@ -4112,114 +4111,114 @@ msgid ""
"who may see the conversations."
msgstr ""
-#: ../../addon/facebook/facebook.php:544
+#: ../../addon/facebook/facebook.php:548
msgid "Comma separated applications to ignore"
msgstr ""
-#: ../../addon/facebook/facebook.php:615
+#: ../../addon/facebook/facebook.php:619
msgid "Problems with Facebook Real-Time Updates"
msgstr ""
-#: ../../addon/facebook/facebook.php:639
+#: ../../addon/facebook/facebook.php:643
#: ../../include/contact_selectors.php:81
msgid "Facebook"
msgstr ""
-#: ../../addon/facebook/facebook.php:640
+#: ../../addon/facebook/facebook.php:644
msgid "Facebook Connector Settings"
msgstr ""
-#: ../../addon/facebook/facebook.php:649
+#: ../../addon/facebook/facebook.php:653
msgid "Facebook API Key"
msgstr ""
-#: ../../addon/facebook/facebook.php:658
+#: ../../addon/facebook/facebook.php:662
msgid ""
"Error: it appears that you have specified the App-ID and -Secret in your ."
"htconfig.php file. As long as they are specified there, they cannot be set "
"using this form.<br><br>"
msgstr ""
-#: ../../addon/facebook/facebook.php:663
+#: ../../addon/facebook/facebook.php:667
msgid ""
"Error: the given API Key seems to be incorrect (the application access token "
"could not be retrieved)."
msgstr ""
-#: ../../addon/facebook/facebook.php:665
+#: ../../addon/facebook/facebook.php:669
msgid "The given API Key seems to work correctly."
msgstr ""
-#: ../../addon/facebook/facebook.php:667
+#: ../../addon/facebook/facebook.php:671
msgid ""
"The correctness of the API Key could not be detected. Somthing strange's "
"going on."
msgstr ""
-#: ../../addon/facebook/facebook.php:670
+#: ../../addon/facebook/facebook.php:674
msgid "App-ID / API-Key"
msgstr ""
-#: ../../addon/facebook/facebook.php:671
+#: ../../addon/facebook/facebook.php:675
msgid "Application secret"
msgstr ""
-#: ../../addon/facebook/facebook.php:672
+#: ../../addon/facebook/facebook.php:676
#, php-format
msgid "Polling Interval (min. %1$s minutes)"
msgstr ""
-#: ../../addon/facebook/facebook.php:676
+#: ../../addon/facebook/facebook.php:680
msgid "Real-Time Updates"
msgstr ""
-#: ../../addon/facebook/facebook.php:680
+#: ../../addon/facebook/facebook.php:684
msgid "Real-Time Updates are activated."
msgstr ""
-#: ../../addon/facebook/facebook.php:681
+#: ../../addon/facebook/facebook.php:685
msgid "Deactivate Real-Time Updates"
msgstr ""
-#: ../../addon/facebook/facebook.php:683
+#: ../../addon/facebook/facebook.php:687
msgid "Real-Time Updates not activated."
msgstr ""
-#: ../../addon/facebook/facebook.php:683
+#: ../../addon/facebook/facebook.php:687
msgid "Activate Real-Time Updates"
msgstr ""
-#: ../../addon/facebook/facebook.php:697
+#: ../../addon/facebook/facebook.php:701
msgid "The new values have been saved."
msgstr ""
-#: ../../addon/facebook/facebook.php:716
+#: ../../addon/facebook/facebook.php:720
msgid "Post to Facebook"
msgstr ""
-#: ../../addon/facebook/facebook.php:808
+#: ../../addon/facebook/facebook.php:812
msgid ""
"Post to Facebook cancelled because of multi-network access permission "
"conflict."
msgstr ""
-#: ../../addon/facebook/facebook.php:1026
+#: ../../addon/facebook/facebook.php:1030
msgid "View on Friendica"
msgstr ""
-#: ../../addon/facebook/facebook.php:1051
+#: ../../addon/facebook/facebook.php:1055
msgid "Facebook post failed. Queued for retry."
msgstr ""
-#: ../../addon/facebook/facebook.php:1087
+#: ../../addon/facebook/facebook.php:1091
msgid "Your Facebook connection became invalid. Please Re-authenticate."
msgstr ""
-#: ../../addon/facebook/facebook.php:1088
+#: ../../addon/facebook/facebook.php:1092
msgid "Facebook connection became invalid"
msgstr ""
-#: ../../addon/facebook/facebook.php:1089
+#: ../../addon/facebook/facebook.php:1093
#, php-format
msgid ""
"Hi %1$s,\n"
@@ -4229,11 +4228,6 @@ msgid ""
"connection again, you have to %3$sre-authenticate the Facebook-connector%4$s."
msgstr ""
-#: ../../addon/facebook/facebook.php:1214
-#: ../../addon/facebook/facebook.php:1223 ../../include/bb2diaspora.php:102
-msgid "link"
-msgstr ""
-
#: ../../addon/widgets/widget_like.php:58
#, php-format
msgid "%d person likes this"
@@ -4383,10 +4377,10 @@ msgid "Latest likes"
msgstr ""
#: ../../addon/communityhome/communityhome.php:155
-#: ../../view/theme/diabook-red/theme.php:74
-#: ../../view/theme/diabook-blue/theme.php:74
-#: ../../view/theme/diabook/theme.php:78
-#: ../../view/theme/diabook-aerith/theme.php:74 ../../include/text.php:1295
+#: ../../view/theme/diabook-red/theme.php:78
+#: ../../view/theme/diabook-blue/theme.php:78
+#: ../../view/theme/diabook/theme.php:81
+#: ../../view/theme/diabook-aerith/theme.php:79 ../../include/text.php:1295
#: ../../include/conversation.php:45 ../../include/conversation.php:118
msgid "event"
msgstr ""
@@ -4594,41 +4588,69 @@ msgstr ""
msgid "URL to embed:"
msgstr ""
-#: ../../addon/impressum/impressum.php:25
+#: ../../addon/impressum/impressum.php:34
msgid "Impressum"
msgstr ""
-#: ../../addon/impressum/impressum.php:38
-#: ../../addon/impressum/impressum.php:40
-#: ../../addon/impressum/impressum.php:70
+#: ../../addon/impressum/impressum.php:47
+#: ../../addon/impressum/impressum.php:49
+#: ../../addon/impressum/impressum.php:81
msgid "Site Owner"
msgstr ""
-#: ../../addon/impressum/impressum.php:38
-#: ../../addon/impressum/impressum.php:74
+#: ../../addon/impressum/impressum.php:47
+#: ../../addon/impressum/impressum.php:85
msgid "Email Address"
msgstr ""
-#: ../../addon/impressum/impressum.php:43
-#: ../../addon/impressum/impressum.php:72
+#: ../../addon/impressum/impressum.php:52
+#: ../../addon/impressum/impressum.php:83
msgid "Postal Address"
msgstr ""
-#: ../../addon/impressum/impressum.php:49
+#: ../../addon/impressum/impressum.php:58
msgid ""
"The impressum addon needs to be configured!<br />Please add at least the "
"<tt>owner</tt> variable to your config file. For other variables please "
"refer to the README file of the addon."
msgstr ""
-#: ../../addon/impressum/impressum.php:71
+#: ../../addon/impressum/impressum.php:81
+msgid "The page operators name."
+msgstr ""
+
+#: ../../addon/impressum/impressum.php:82
msgid "Site Owners Profile"
msgstr ""
-#: ../../addon/impressum/impressum.php:73
+#: ../../addon/impressum/impressum.php:82
+msgid "Profile address of the operator."
+msgstr ""
+
+#: ../../addon/impressum/impressum.php:83
+msgid "How to contact the operator via snail mail."
+msgstr ""
+
+#: ../../addon/impressum/impressum.php:84
msgid "Notes"
msgstr ""
+#: ../../addon/impressum/impressum.php:84
+msgid "Additional notes that are displayed beneath the contact information."
+msgstr ""
+
+#: ../../addon/impressum/impressum.php:85
+msgid "How to contact the operator via email. (will be displayed obfuscated)"
+msgstr ""
+
+#: ../../addon/impressum/impressum.php:86
+msgid "Footer note"
+msgstr ""
+
+#: ../../addon/impressum/impressum.php:86
+msgid "Text for the footer."
+msgstr ""
+
#: ../../addon/buglink/buglink.php:15
msgid "Report Bug"
msgstr ""
@@ -4879,7 +4901,7 @@ msgstr ""
msgid "Clear OAuth configuration"
msgstr ""
-#: ../../addon/statusnet/statusnet.php:539
+#: ../../addon/statusnet/statusnet.php:545
msgid "API URL"
msgstr ""
@@ -4982,11 +5004,11 @@ msgstr ""
msgid "Cutting posts after how much characters"
msgstr ""
-#: ../../addon/showmore/showmore.php:64
+#: ../../addon/showmore/showmore.php:65
msgid "Show More Settings saved."
msgstr ""
-#: ../../addon/showmore/showmore.php:86 ../../include/conversation.php:466
+#: ../../addon/showmore/showmore.php:87 ../../include/conversation.php:466
#: ../../boot.php:495
msgid "show more"
msgstr ""
@@ -5089,11 +5111,11 @@ msgstr ""
msgid "Send #tag links to Twitter"
msgstr ""
-#: ../../addon/twitter/twitter.php:371
+#: ../../addon/twitter/twitter.php:377
msgid "Consumer key"
msgstr ""
-#: ../../addon/twitter/twitter.php:372
+#: ../../addon/twitter/twitter.php:378
msgid "Consumer secret"
msgstr ""
@@ -5129,159 +5151,159 @@ msgstr ""
msgid "Post to Posterous by default"
msgstr ""
-#: ../../view/theme/diabook-red/theme.php:23
-#: ../../view/theme/diabook-blue/theme.php:23
-#: ../../view/theme/diabook/theme.php:27
-#: ../../view/theme/dispy-dark/theme.php:116
-#: ../../view/theme/diabook-aerith/theme.php:23
+#: ../../view/theme/diabook-red/theme.php:27
+#: ../../view/theme/diabook-blue/theme.php:27
+#: ../../view/theme/diabook/theme.php:30
+#: ../../view/theme/dispy-dark/theme.php:120
+#: ../../view/theme/diabook-aerith/theme.php:28
msgid "Last users"
msgstr ""
-#: ../../view/theme/diabook-red/theme.php:52
-#: ../../view/theme/diabook-blue/theme.php:52
-#: ../../view/theme/diabook/theme.php:56
-#: ../../view/theme/diabook-aerith/theme.php:52
+#: ../../view/theme/diabook-red/theme.php:56
+#: ../../view/theme/diabook-blue/theme.php:56
+#: ../../view/theme/diabook/theme.php:59
+#: ../../view/theme/diabook-aerith/theme.php:57
msgid "Last likes"
msgstr ""
-#: ../../view/theme/diabook-red/theme.php:97
-#: ../../view/theme/diabook-blue/theme.php:97
-#: ../../view/theme/diabook/theme.php:101
-#: ../../view/theme/diabook-aerith/theme.php:97
+#: ../../view/theme/diabook-red/theme.php:101
+#: ../../view/theme/diabook-blue/theme.php:101
+#: ../../view/theme/diabook/theme.php:104
+#: ../../view/theme/diabook-aerith/theme.php:102
msgid "Last photos"
msgstr ""
-#: ../../view/theme/diabook-red/theme.php:142
-#: ../../view/theme/diabook-blue/theme.php:142
-#: ../../view/theme/diabook/theme.php:146
-#: ../../view/theme/diabook-aerith/theme.php:142
+#: ../../view/theme/diabook-red/theme.php:146
+#: ../../view/theme/diabook-blue/theme.php:146
+#: ../../view/theme/diabook/theme.php:149
+#: ../../view/theme/diabook-aerith/theme.php:147
msgid "Find Friends"
msgstr ""
-#: ../../view/theme/diabook-red/theme.php:143
-#: ../../view/theme/diabook-blue/theme.php:143
-#: ../../view/theme/diabook/theme.php:147
-#: ../../view/theme/diabook-aerith/theme.php:143
+#: ../../view/theme/diabook-red/theme.php:147
+#: ../../view/theme/diabook-blue/theme.php:147
+#: ../../view/theme/diabook/theme.php:150
+#: ../../view/theme/diabook-aerith/theme.php:148
msgid "Local Directory"
msgstr ""
-#: ../../view/theme/diabook-red/theme.php:145
-#: ../../view/theme/diabook-blue/theme.php:145
-#: ../../view/theme/diabook/theme.php:149
-#: ../../view/theme/diabook-aerith/theme.php:145
+#: ../../view/theme/diabook-red/theme.php:149
+#: ../../view/theme/diabook-blue/theme.php:149
+#: ../../view/theme/diabook/theme.php:152
+#: ../../view/theme/diabook-aerith/theme.php:150
#: ../../include/contact_widgets.php:34
msgid "Similar Interests"
msgstr ""
-#: ../../view/theme/diabook-red/theme.php:147
-#: ../../view/theme/diabook-blue/theme.php:147
-#: ../../view/theme/diabook/theme.php:151
-#: ../../view/theme/diabook-aerith/theme.php:147
+#: ../../view/theme/diabook-red/theme.php:151
+#: ../../view/theme/diabook-blue/theme.php:151
+#: ../../view/theme/diabook/theme.php:154
+#: ../../view/theme/diabook-aerith/theme.php:152
#: ../../include/contact_widgets.php:35
msgid "Invite Friends"
msgstr ""
-#: ../../view/theme/diabook-red/theme.php:162
-#: ../../view/theme/diabook-red/theme.php:243
-#: ../../view/theme/diabook-blue/theme.php:162
-#: ../../view/theme/diabook-blue/theme.php:243
-#: ../../view/theme/diabook/theme.php:167
-#: ../../view/theme/diabook/theme.php:251
-#: ../../view/theme/diabook-aerith/theme.php:162
-#: ../../view/theme/diabook-aerith/theme.php:243
+#: ../../view/theme/diabook-red/theme.php:166
+#: ../../view/theme/diabook-red/theme.php:247
+#: ../../view/theme/diabook-blue/theme.php:166
+#: ../../view/theme/diabook-blue/theme.php:247
+#: ../../view/theme/diabook/theme.php:170
+#: ../../view/theme/diabook/theme.php:254
+#: ../../view/theme/diabook-aerith/theme.php:167
+#: ../../view/theme/diabook-aerith/theme.php:248
msgid "Community Pages"
msgstr ""
-#: ../../view/theme/diabook-red/theme.php:195
-#: ../../view/theme/diabook-blue/theme.php:195
-#: ../../view/theme/diabook/theme.php:200
-#: ../../view/theme/diabook-aerith/theme.php:195
+#: ../../view/theme/diabook-red/theme.php:199
+#: ../../view/theme/diabook-blue/theme.php:199
+#: ../../view/theme/diabook/theme.php:203
+#: ../../view/theme/diabook-aerith/theme.php:200
msgid "Help or @NewHere ?"
msgstr ""
-#: ../../view/theme/diabook-red/theme.php:201
-#: ../../view/theme/diabook-blue/theme.php:201
-#: ../../view/theme/diabook/theme.php:206
-#: ../../view/theme/diabook-aerith/theme.php:201
+#: ../../view/theme/diabook-red/theme.php:205
+#: ../../view/theme/diabook-blue/theme.php:205
+#: ../../view/theme/diabook/theme.php:209
+#: ../../view/theme/diabook-aerith/theme.php:206
msgid "Connect Services"
msgstr ""
-#: ../../view/theme/diabook-red/theme.php:207
-#: ../../view/theme/diabook-blue/theme.php:207
-#: ../../view/theme/diabook/theme.php:212
-#: ../../view/theme/diabook-aerith/theme.php:207
+#: ../../view/theme/diabook-red/theme.php:211
+#: ../../view/theme/diabook-blue/theme.php:211
+#: ../../view/theme/diabook/theme.php:215
+#: ../../view/theme/diabook-aerith/theme.php:212
msgid "PostIt to Friendica"
msgstr ""
-#: ../../view/theme/diabook-red/theme.php:207
-#: ../../view/theme/diabook-blue/theme.php:207
-#: ../../view/theme/diabook/theme.php:212
-#: ../../view/theme/diabook-aerith/theme.php:207
+#: ../../view/theme/diabook-red/theme.php:211
+#: ../../view/theme/diabook-blue/theme.php:211
+#: ../../view/theme/diabook/theme.php:215
+#: ../../view/theme/diabook-aerith/theme.php:212
msgid "Post to Friendica"
msgstr ""
-#: ../../view/theme/diabook-red/theme.php:208
-#: ../../view/theme/diabook-blue/theme.php:208
-#: ../../view/theme/diabook/theme.php:213
-#: ../../view/theme/diabook-aerith/theme.php:208
+#: ../../view/theme/diabook-red/theme.php:212
+#: ../../view/theme/diabook-blue/theme.php:212
+#: ../../view/theme/diabook/theme.php:216
+#: ../../view/theme/diabook-aerith/theme.php:213
msgid " from anywhere by bookmarking this Link."
msgstr ""
-#: ../../view/theme/diabook-red/theme.php:236
-#: ../../view/theme/diabook-blue/theme.php:236
-#: ../../view/theme/diabook/theme.php:244
-#: ../../view/theme/diabook-aerith/theme.php:236 ../../include/nav.php:49
+#: ../../view/theme/diabook-red/theme.php:240
+#: ../../view/theme/diabook-blue/theme.php:240
+#: ../../view/theme/diabook/theme.php:247
+#: ../../view/theme/diabook-aerith/theme.php:241 ../../include/nav.php:49
#: ../../include/nav.php:115
msgid "Your posts and conversations"
msgstr ""
-#: ../../view/theme/diabook-red/theme.php:237
-#: ../../view/theme/diabook-blue/theme.php:237
-#: ../../view/theme/diabook/theme.php:245
-#: ../../view/theme/diabook-aerith/theme.php:237 ../../include/nav.php:50
+#: ../../view/theme/diabook-red/theme.php:241
+#: ../../view/theme/diabook-blue/theme.php:241
+#: ../../view/theme/diabook/theme.php:248
+#: ../../view/theme/diabook-aerith/theme.php:242 ../../include/nav.php:50
msgid "Your profile page"
msgstr ""
-#: ../../view/theme/diabook-red/theme.php:238
-#: ../../view/theme/diabook-blue/theme.php:238
-#: ../../view/theme/diabook/theme.php:246
-#: ../../view/theme/diabook-aerith/theme.php:238
+#: ../../view/theme/diabook-red/theme.php:242
+#: ../../view/theme/diabook-blue/theme.php:242
+#: ../../view/theme/diabook/theme.php:249
+#: ../../view/theme/diabook-aerith/theme.php:243
msgid "Your contacts"
msgstr ""
-#: ../../view/theme/diabook-red/theme.php:239
-#: ../../view/theme/diabook-blue/theme.php:239
-#: ../../view/theme/diabook/theme.php:247
-#: ../../view/theme/diabook-aerith/theme.php:239 ../../include/nav.php:51
-#: ../../boot.php:1413
+#: ../../view/theme/diabook-red/theme.php:243
+#: ../../view/theme/diabook-blue/theme.php:243
+#: ../../view/theme/diabook/theme.php:250
+#: ../../view/theme/diabook-aerith/theme.php:244 ../../include/nav.php:51
+#: ../../boot.php:1414
msgid "Photos"
msgstr ""
-#: ../../view/theme/diabook-red/theme.php:239
-#: ../../view/theme/diabook-blue/theme.php:239
-#: ../../view/theme/diabook/theme.php:247
-#: ../../view/theme/diabook-aerith/theme.php:239 ../../include/nav.php:51
+#: ../../view/theme/diabook-red/theme.php:243
+#: ../../view/theme/diabook-blue/theme.php:243
+#: ../../view/theme/diabook/theme.php:250
+#: ../../view/theme/diabook-aerith/theme.php:244 ../../include/nav.php:51
msgid "Your photos"
msgstr ""
-#: ../../view/theme/diabook-red/theme.php:240
-#: ../../view/theme/diabook-blue/theme.php:240
-#: ../../view/theme/diabook/theme.php:248
-#: ../../view/theme/diabook-aerith/theme.php:240 ../../include/nav.php:52
+#: ../../view/theme/diabook-red/theme.php:244
+#: ../../view/theme/diabook-blue/theme.php:244
+#: ../../view/theme/diabook/theme.php:251
+#: ../../view/theme/diabook-aerith/theme.php:245 ../../include/nav.php:52
msgid "Your events"
msgstr ""
-#: ../../view/theme/diabook-red/theme.php:241
-#: ../../view/theme/diabook-blue/theme.php:241
-#: ../../view/theme/diabook/theme.php:249
-#: ../../view/theme/diabook-aerith/theme.php:241 ../../include/nav.php:53
+#: ../../view/theme/diabook-red/theme.php:245
+#: ../../view/theme/diabook-blue/theme.php:245
+#: ../../view/theme/diabook/theme.php:252
+#: ../../view/theme/diabook-aerith/theme.php:246 ../../include/nav.php:53
msgid "Personal notes"
msgstr ""
-#: ../../view/theme/diabook-red/theme.php:241
-#: ../../view/theme/diabook-blue/theme.php:241
-#: ../../view/theme/diabook/theme.php:249
-#: ../../view/theme/diabook-aerith/theme.php:241 ../../include/nav.php:53
+#: ../../view/theme/diabook-red/theme.php:245
+#: ../../view/theme/diabook-blue/theme.php:245
+#: ../../view/theme/diabook/theme.php:252
+#: ../../view/theme/diabook-aerith/theme.php:246 ../../include/nav.php:53
msgid "Your personal photos"
msgstr ""
@@ -5305,7 +5327,7 @@ msgstr ""
msgid "Color scheme"
msgstr ""
-#: ../../include/profile_advanced.php:17 ../../boot.php:1044
+#: ../../include/profile_advanced.php:17 ../../boot.php:1045
msgid "Gender:"
msgstr ""
@@ -5326,11 +5348,11 @@ msgstr ""
msgid "Age:"
msgstr ""
-#: ../../include/profile_advanced.php:37 ../../boot.php:1047
+#: ../../include/profile_advanced.php:37 ../../boot.php:1048
msgid "Status:"
msgstr ""
-#: ../../include/profile_advanced.php:45 ../../boot.php:1049
+#: ../../include/profile_advanced.php:45 ../../boot.php:1050
msgid "Homepage:"
msgstr ""
@@ -5898,7 +5920,7 @@ msgstr ""
msgid "End this session"
msgstr ""
-#: ../../include/nav.php:49 ../../boot.php:1403
+#: ../../include/nav.php:49 ../../boot.php:1404
msgid "Status"
msgstr ""
@@ -5978,11 +6000,11 @@ msgstr ""
msgid "Manage other pages"
msgstr ""
-#: ../../include/nav.php:138 ../../boot.php:1002
+#: ../../include/nav.php:138 ../../boot.php:1003
msgid "Profiles"
msgstr ""
-#: ../../include/nav.php:138 ../../boot.php:1002
+#: ../../include/nav.php:138 ../../boot.php:1003
msgid "Manage/edit profiles"
msgstr ""
@@ -6144,7 +6166,7 @@ msgstr ""
msgid "%1$d %2$s ago"
msgstr ""
-#: ../../include/poller.php:533
+#: ../../include/poller.php:543
msgid "From: "
msgstr ""
@@ -6152,7 +6174,7 @@ msgstr ""
msgid "$1 wrote:"
msgstr ""
-#: ../../include/bbcode.php:237 ../../include/bbcode.php:303
+#: ../../include/bbcode.php:238 ../../include/bbcode.php:304
msgid "Image/photo"
msgstr ""
@@ -6378,6 +6400,10 @@ msgstr ""
msgid "image/photo"
msgstr ""
+#: ../../include/bb2diaspora.php:102
+msgid "link"
+msgstr ""
+
#: ../../include/security.php:21
msgid "Welcome "
msgstr ""
@@ -6636,42 +6662,42 @@ msgstr ""
msgid "Forgot your password?"
msgstr ""
-#: ../../boot.php:935
+#: ../../boot.php:936
msgid "Edit profile"
msgstr ""
-#: ../../boot.php:994
+#: ../../boot.php:995
msgid "Message"
msgstr ""
-#: ../../boot.php:1109 ../../boot.php:1180
+#: ../../boot.php:1110 ../../boot.php:1181
msgid "g A l F d"
msgstr ""
-#: ../../boot.php:1110 ../../boot.php:1181
+#: ../../boot.php:1111 ../../boot.php:1182
msgid "F d"
msgstr ""
-#: ../../boot.php:1135
+#: ../../boot.php:1136
msgid "Birthday Reminders"
msgstr ""
-#: ../../boot.php:1136
+#: ../../boot.php:1137
msgid "Birthdays this week:"
msgstr ""
-#: ../../boot.php:1159 ../../boot.php:1223
+#: ../../boot.php:1160 ../../boot.php:1224
msgid "[today]"
msgstr ""
-#: ../../boot.php:1204
+#: ../../boot.php:1205
msgid "Event Reminders"
msgstr ""
-#: ../../boot.php:1205
+#: ../../boot.php:1206
msgid "Events this week:"
msgstr ""
-#: ../../boot.php:1217
+#: ../../boot.php:1218
msgid "[No description]"
msgstr ""