keith/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

sidebar photo album list not visible to anybody if user['hidewall'] set

Browse source
This commit is contained in:
friendica 2012-06-24 16:51:39 -07:00
parent 7f3813e9b0
commit 9528beac34
3 changed files with 115 additions and 96 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
boot.php
View file

@ -10,7 +10,7 @@ require_once('include/nav.php');
require_once('include/cache.php'); require_once('include/cache.php');
define ( 'FRIENDICA_PLATFORM', 'Friendica'); define ( 'FRIENDICA_PLATFORM', 'Friendica');
define ( 'FRIENDICA_VERSION', '3.0.1383' ); define ( 'FRIENDICA_VERSION', '3.0.1384' );
define ( 'DFRN_PROTOCOL_VERSION', '2.23' ); define ( 'DFRN_PROTOCOL_VERSION', '2.23' );
define ( 'DB_UPDATE_VERSION', 1149 ); define ( 'DB_UPDATE_VERSION', 1149 );

6
mod/photos.php
View file

@ -38,8 +38,10 @@ function photos_init(&$a) {
$o .= '<div class="fn">' . $a->data['user']['username'] . '</div>'; $o .= '<div class="fn">' . $a->data['user']['username'] . '</div>';
$o .= '<div id="profile-photo-wrapper"><img class="photo" style="width: 175px; height: 175px;" src="' . $a->get_cached_avatar_image($a->get_baseurl() . '/photo/profile/' . $a->data['user']['uid'] . '.jpg') . '" alt="' . $a->data['user']['username'] . '" /></div>'; $o .= '<div id="profile-photo-wrapper"><img class="photo" style="width: 175px; height: 175px;" src="' . $a->get_cached_avatar_image($a->get_baseurl() . '/photo/profile/' . $a->data['user']['uid'] . '.jpg') . '" alt="' . $a->data['user']['username'] . '" /></div>';
$o .= '</div>'; $o .= '</div>';
if(! intval($a->data['user']['hidewall'])) { $albums_visible = ((intval($a->data['user']['hidewall']) && (! local_user()) && (! remote_user())) ? false : true);
if($albums_visible) {
$o .= '<div id="side-bar-photos-albums" class="widget">'; $o .= '<div id="side-bar-photos-albums" class="widget">';
$o .= '<h3>' . '<a href="' . $a->get_baseurl() . '/photos/' . $a->data['user']['nickname'] . '">' . t('Photo Albums') . '</a></h3>'; $o .= '<h3>' . '<a href="' . $a->get_baseurl() . '/photos/' . $a->data['user']['nickname'] . '">' . t('Photo Albums') . '</a></h3>';

203
util/messages.po
View file

@ -6,9 +6,9 @@
#, fuzzy #, fuzzy
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: 3.0.1383\n" "Project-Id-Version: 3.0.1384\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2012-06-23 10:00-0700\n" "POT-Creation-Date: 2012-06-24 10:00-0700\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"
@ -54,8 +54,8 @@ msgstr ""
#: ../../mod/follow.php:9 ../../mod/display.php:138 ../../mod/profiles.php:7 #: ../../mod/follow.php:9 ../../mod/display.php:138 ../../mod/profiles.php:7
#: ../../mod/profiles.php:385 ../../mod/delegate.php:6 #: ../../mod/profiles.php:385 ../../mod/delegate.php:6
#: ../../mod/suggest.php:28 ../../mod/invite.php:13 ../../mod/invite.php:81 #: ../../mod/suggest.php:28 ../../mod/invite.php:13 ../../mod/invite.php:81
#: ../../mod/dfrn_confirm.php:53 ../../addon/facebook/facebook.php:507 #: ../../mod/dfrn_confirm.php:53 ../../addon/facebook/facebook.php:508
#: ../../addon/dav/layout.fnk.php:353 ../../include/items.php:3407 #: ../../addon/dav/layout.fnk.php:353 ../../include/items.php:3411
#: ../../index.php:309 #: ../../index.php:309
msgid "Permission denied." msgid "Permission denied."
msgstr "" msgstr ""
@ -133,7 +133,8 @@ msgstr ""
#: ../../mod/group.php:85 ../../mod/message.php:216 ../../mod/message.php:410 #: ../../mod/group.php:85 ../../mod/message.php:216 ../../mod/message.php:410
#: ../../mod/admin.php:420 ../../mod/admin.php:656 ../../mod/admin.php:792 #: ../../mod/admin.php:420 ../../mod/admin.php:656 ../../mod/admin.php:792
#: ../../mod/admin.php:991 ../../mod/admin.php:1078 ../../mod/profiles.php:554 #: ../../mod/admin.php:991 ../../mod/admin.php:1078 ../../mod/profiles.php:554
#: ../../mod/invite.php:119 ../../addon/facebook/facebook.php:609 #: ../../mod/invite.php:119 ../../addon/fromgplus/fromgplus.php:40
#: ../../addon/facebook/facebook.php:610
#: ../../addon/snautofollow/snautofollow.php:64 #: ../../addon/snautofollow/snautofollow.php:64
#: ../../addon/yourls/yourls.php:76 ../../addon/ljpost/ljpost.php:93 #: ../../addon/yourls/yourls.php:76 ../../addon/ljpost/ljpost.php:93
#: ../../addon/nsfw/nsfw.php:57 ../../addon/page/page.php:164 #: ../../addon/nsfw/nsfw.php:57 ../../addon/page/page.php:164
@ -156,11 +157,11 @@ msgstr ""
#: ../../addon/statusnet/statusnet.php:318 #: ../../addon/statusnet/statusnet.php:318
#: ../../addon/statusnet/statusnet.php:325 #: ../../addon/statusnet/statusnet.php:325
#: ../../addon/statusnet/statusnet.php:353 #: ../../addon/statusnet/statusnet.php:353
#: ../../addon/statusnet/statusnet.php:561 ../../addon/tumblr/tumblr.php:90 #: ../../addon/statusnet/statusnet.php:567 ../../addon/tumblr/tumblr.php:90
#: ../../addon/numfriends/numfriends.php:85 ../../addon/gnot/gnot.php:88 #: ../../addon/numfriends/numfriends.php:85 ../../addon/gnot/gnot.php:88
#: ../../addon/wppost/wppost.php:110 ../../addon/showmore/showmore.php:48 #: ../../addon/wppost/wppost.php:110 ../../addon/showmore/showmore.php:48
#: ../../addon/piwik/piwik.php:89 ../../addon/twitter/twitter.php:180 #: ../../addon/piwik/piwik.php:89 ../../addon/twitter/twitter.php:180
#: ../../addon/twitter/twitter.php:209 ../../addon/twitter/twitter.php:381 #: ../../addon/twitter/twitter.php:209 ../../addon/twitter/twitter.php:387
#: ../../addon/irc/irc.php:55 ../../addon/blogger/blogger.php:102 #: ../../addon/irc/irc.php:55 ../../addon/blogger/blogger.php:102
#: ../../addon/posterous/posterous.php:103 #: ../../addon/posterous/posterous.php:103
#: ../../view/theme/cleanzero/config.php:80 #: ../../view/theme/cleanzero/config.php:80
@ -278,7 +279,7 @@ msgid "Description:"
msgstr "" msgstr ""
#: ../../mod/events.php:423 ../../include/event.php:37 #: ../../mod/events.php:423 ../../include/event.php:37
#: ../../include/bb2diaspora.php:311 ../../boot.php:1126 #: ../../include/bb2diaspora.php:355 ../../boot.php:1126
msgid "Location:" msgid "Location:"
msgstr "" msgstr ""
@ -385,8 +386,8 @@ msgstr ""
#: ../../mod/profile_photo.php:176 ../../mod/profile_photo.php:254 #: ../../mod/profile_photo.php:176 ../../mod/profile_photo.php:254
#: ../../mod/profile_photo.php:263 #: ../../mod/profile_photo.php:263
#: ../../addon/communityhome/communityhome.php:111 #: ../../addon/communityhome/communityhome.php:111
#: ../../view/theme/diabook/theme.php:599 ../../include/user.php:298 #: ../../view/theme/diabook/theme.php:599 ../../include/user.php:304
#: ../../include/user.php:305 ../../include/user.php:312 #: ../../include/user.php:311 ../../include/user.php:318
msgid "Profile Photos" msgid "Profile Photos"
msgstr "" msgstr ""
@ -409,7 +410,7 @@ msgstr ""
#: ../../mod/photos.php:589 ../../mod/like.php:185 ../../mod/tagger.php:70 #: ../../mod/photos.php:589 ../../mod/like.php:185 ../../mod/tagger.php:70
#: ../../addon/communityhome/communityhome.php:163 #: ../../addon/communityhome/communityhome.php:163
#: ../../view/theme/diabook/theme.php:570 ../../include/text.php:1316 #: ../../view/theme/diabook/theme.php:570 ../../include/text.php:1316
#: ../../include/diaspora.php:1709 ../../include/conversation.php:53 #: ../../include/diaspora.php:1710 ../../include/conversation.php:53
#: ../../include/conversation.php:126 #: ../../include/conversation.php:126
msgid "photo" msgid "photo"
msgstr "" msgstr ""
@ -826,7 +827,7 @@ msgstr ""
msgid "Confirm" msgid "Confirm"
msgstr "" msgstr ""
#: ../../mod/dfrn_request.php:715 ../../include/items.php:2801 #: ../../mod/dfrn_request.php:715 ../../include/items.php:2805
msgid "[Name Withheld]" msgid "[Name Withheld]"
msgstr "" msgstr ""
@ -1152,7 +1153,7 @@ msgid ""
msgstr "" msgstr ""
#: ../../mod/localtime.php:12 ../../include/event.php:11 #: ../../mod/localtime.php:12 ../../include/event.php:11
#: ../../include/bb2diaspora.php:289 #: ../../include/bb2diaspora.php:333
msgid "l F d, Y \\@ g:i A" msgid "l F d, Y \\@ g:i A"
msgstr "" msgstr ""
@ -1725,10 +1726,10 @@ msgstr ""
#: ../../mod/lostpass.php:45 ../../mod/lostpass.php:107 #: ../../mod/lostpass.php:45 ../../mod/lostpass.php:107
#: ../../mod/register.php:90 ../../mod/register.php:144 #: ../../mod/register.php:90 ../../mod/register.php:144
#: ../../mod/regmod.php:54 ../../mod/dfrn_confirm.php:752 #: ../../mod/regmod.php:54 ../../mod/dfrn_confirm.php:752
#: ../../addon/facebook/facebook.php:692 #: ../../addon/facebook/facebook.php:693
#: ../../addon/facebook/facebook.php:1182 #: ../../addon/facebook/facebook.php:1183
#: ../../addon/public_server/public_server.php:62 #: ../../addon/public_server/public_server.php:62
#: ../../addon/testdrive/testdrive.php:67 ../../include/items.php:2810 #: ../../addon/testdrive/testdrive.php:67 ../../include/items.php:2814
#: ../../boot.php:720 #: ../../boot.php:720
msgid "Administrator" msgid "Administrator"
msgstr "" msgstr ""
@ -1874,11 +1875,11 @@ msgstr ""
msgid "Private forum has no privacy permissions and no default privacy group." msgid "Private forum has no privacy permissions and no default privacy group."
msgstr "" msgstr ""
#: ../../mod/settings.php:484 ../../addon/facebook/facebook.php:492 #: ../../mod/settings.php:484 ../../addon/facebook/facebook.php:493
#: ../../addon/impressum/impressum.php:77 #: ../../addon/impressum/impressum.php:77
#: ../../addon/openstreetmap/openstreetmap.php:80 #: ../../addon/openstreetmap/openstreetmap.php:80
#: ../../addon/mathjax/mathjax.php:66 ../../addon/piwik/piwik.php:105 #: ../../addon/mathjax/mathjax.php:66 ../../addon/piwik/piwik.php:105
#: ../../addon/twitter/twitter.php:376 #: ../../addon/twitter/twitter.php:382
msgid "Settings updated." msgid "Settings updated."
msgstr "" msgstr ""
@ -1888,12 +1889,12 @@ msgid "Add application"
msgstr "" msgstr ""
#: ../../mod/settings.php:558 ../../mod/settings.php:584 #: ../../mod/settings.php:558 ../../mod/settings.php:584
#: ../../addon/statusnet/statusnet.php:555 #: ../../addon/statusnet/statusnet.php:561
msgid "Consumer Key" msgid "Consumer Key"
msgstr "" msgstr ""
#: ../../mod/settings.php:559 ../../mod/settings.php:585 #: ../../mod/settings.php:559 ../../mod/settings.php:585
#: ../../addon/statusnet/statusnet.php:554 #: ../../addon/statusnet/statusnet.php:560
msgid "Consumer Secret" msgid "Consumer Secret"
msgstr "" msgstr ""
@ -2419,8 +2420,8 @@ msgid "Personal Notes"
msgstr "" msgstr ""
#: ../../mod/notes.php:63 ../../mod/filer.php:30 #: ../../mod/notes.php:63 ../../mod/filer.php:30
#: ../../addon/facebook/facebook.php:760 #: ../../addon/facebook/facebook.php:761
#: ../../addon/privacy_image_cache/privacy_image_cache.php:185 #: ../../addon/privacy_image_cache/privacy_image_cache.php:187
#: ../../addon/dav/layout.fnk.php:384 ../../include/text.php:652 #: ../../addon/dav/layout.fnk.php:384 ../../include/text.php:652
msgid "Save" msgid "Save"
msgstr "" msgstr ""
@ -2778,19 +2779,19 @@ msgid "People Search"
msgstr "" msgstr ""
#: ../../mod/like.php:185 ../../mod/like.php:260 ../../mod/tagger.php:70 #: ../../mod/like.php:185 ../../mod/like.php:260 ../../mod/tagger.php:70
#: ../../addon/facebook/facebook.php:1576 #: ../../addon/facebook/facebook.php:1577
#: ../../addon/communityhome/communityhome.php:158 #: ../../addon/communityhome/communityhome.php:158
#: ../../addon/communityhome/communityhome.php:167 #: ../../addon/communityhome/communityhome.php:167
#: ../../view/theme/diabook/theme.php:565 #: ../../view/theme/diabook/theme.php:565
#: ../../view/theme/diabook/theme.php:574 ../../include/diaspora.php:1709 #: ../../view/theme/diabook/theme.php:574 ../../include/diaspora.php:1710
#: ../../include/conversation.php:48 ../../include/conversation.php:57 #: ../../include/conversation.php:48 ../../include/conversation.php:57
#: ../../include/conversation.php:121 ../../include/conversation.php:130 #: ../../include/conversation.php:121 ../../include/conversation.php:130
msgid "status" msgid "status"
msgstr "" msgstr ""
#: ../../mod/like.php:202 ../../addon/facebook/facebook.php:1580 #: ../../mod/like.php:202 ../../addon/facebook/facebook.php:1581
#: ../../addon/communityhome/communityhome.php:172 #: ../../addon/communityhome/communityhome.php:172
#: ../../view/theme/diabook/theme.php:579 ../../include/diaspora.php:1725 #: ../../view/theme/diabook/theme.php:579 ../../include/diaspora.php:1726
#: ../../include/conversation.php:65 #: ../../include/conversation.php:65
#, php-format #, php-format
msgid "%1$s likes %2$s's %3$s" msgid "%1$s likes %2$s's %3$s"
@ -2803,7 +2804,7 @@ msgstr ""
#: ../../mod/notice.php:15 ../../mod/viewsrc.php:15 ../../mod/admin.php:159 #: ../../mod/notice.php:15 ../../mod/viewsrc.php:15 ../../mod/admin.php:159
#: ../../mod/admin.php:700 ../../mod/admin.php:899 ../../mod/display.php:37 #: ../../mod/admin.php:700 ../../mod/admin.php:899 ../../mod/display.php:37
#: ../../mod/display.php:142 ../../include/items.php:3254 #: ../../mod/display.php:142 ../../include/items.php:3258
msgid "Item not found." msgid "Item not found."
msgstr "" msgstr ""
@ -3155,7 +3156,7 @@ msgstr ""
msgid "Advanced" msgid "Advanced"
msgstr "" msgstr ""
#: ../../mod/admin.php:428 ../../addon/statusnet/statusnet.php:552 #: ../../mod/admin.php:428 ../../addon/statusnet/statusnet.php:558
msgid "Site name" msgid "Site name"
msgstr "" msgstr ""
@ -4264,83 +4265,99 @@ msgstr ""
msgid "%1$s has joined %2$s" msgid "%1$s has joined %2$s"
msgstr "" msgstr ""
#: ../../addon/facebook/facebook.php:513 #: ../../addon/fromgplus/fromgplus.php:29
msgid "Google+ Import Settings"
msgstr ""
#: ../../addon/fromgplus/fromgplus.php:32
msgid "Enable Google+ Import"
msgstr ""
#: ../../addon/fromgplus/fromgplus.php:35
msgid "Google Account ID"
msgstr ""
#: ../../addon/fromgplus/fromgplus.php:55
msgid "Google+ Import Settings saved."
msgstr ""
#: ../../addon/facebook/facebook.php:514
msgid "Facebook disabled" msgid "Facebook disabled"
msgstr "" msgstr ""
#: ../../addon/facebook/facebook.php:518 #: ../../addon/facebook/facebook.php:519
msgid "Updating contacts" msgid "Updating contacts"
msgstr "" msgstr ""
#: ../../addon/facebook/facebook.php:541 #: ../../addon/facebook/facebook.php:542
msgid "Facebook API key is missing." msgid "Facebook API key is missing."
msgstr "" msgstr ""
#: ../../addon/facebook/facebook.php:548 #: ../../addon/facebook/facebook.php:549
msgid "Facebook Connect" msgid "Facebook Connect"
msgstr "" msgstr ""
#: ../../addon/facebook/facebook.php:554 #: ../../addon/facebook/facebook.php:555
msgid "Install Facebook connector for this account." msgid "Install Facebook connector for this account."
msgstr "" msgstr ""
#: ../../addon/facebook/facebook.php:561 #: ../../addon/facebook/facebook.php:562
msgid "Remove Facebook connector" msgid "Remove Facebook connector"
msgstr "" msgstr ""
#: ../../addon/facebook/facebook.php:566 #: ../../addon/facebook/facebook.php:567
msgid "" msgid ""
"Re-authenticate [This is necessary whenever your Facebook password is " "Re-authenticate [This is necessary whenever your Facebook password is "
"changed.]" "changed.]"
msgstr "" msgstr ""
#: ../../addon/facebook/facebook.php:573 #: ../../addon/facebook/facebook.php:574
msgid "Post to Facebook by default" msgid "Post to Facebook by default"
msgstr "" msgstr ""
#: ../../addon/facebook/facebook.php:579 #: ../../addon/facebook/facebook.php:580
msgid "" msgid ""
"Facebook friend linking has been disabled on this site. The following " "Facebook friend linking has been disabled on this site. The following "
"settings will have no effect." "settings will have no effect."
msgstr "" msgstr ""
#: ../../addon/facebook/facebook.php:583 #: ../../addon/facebook/facebook.php:584
msgid "" msgid ""
"Facebook friend linking has been disabled on this site. If you disable it, " "Facebook friend linking has been disabled on this site. If you disable it, "
"you will be unable to re-enable it." "you will be unable to re-enable it."
msgstr "" msgstr ""
#: ../../addon/facebook/facebook.php:586 #: ../../addon/facebook/facebook.php:587
msgid "Link all your Facebook friends and conversations on this website" msgid "Link all your Facebook friends and conversations on this website"
msgstr "" msgstr ""
#: ../../addon/facebook/facebook.php:588 #: ../../addon/facebook/facebook.php:589
msgid "" msgid ""
"Facebook conversations consist of your <em>profile wall</em> and your friend " "Facebook conversations consist of your <em>profile wall</em> and your friend "
"<em>stream</em>." "<em>stream</em>."
msgstr "" msgstr ""
#: ../../addon/facebook/facebook.php:589 #: ../../addon/facebook/facebook.php:590
msgid "On this website, your Facebook friend stream is only visible to you." msgid "On this website, your Facebook friend stream is only visible to you."
msgstr "" msgstr ""
#: ../../addon/facebook/facebook.php:590 #: ../../addon/facebook/facebook.php:591
msgid "" msgid ""
"The following settings determine the privacy of your Facebook profile wall " "The following settings determine the privacy of your Facebook profile wall "
"on this website." "on this website."
msgstr "" msgstr ""
#: ../../addon/facebook/facebook.php:594 #: ../../addon/facebook/facebook.php:595
msgid "" msgid ""
"On this website your Facebook profile wall conversations will only be " "On this website your Facebook profile wall conversations will only be "
"visible to you" "visible to you"
msgstr "" msgstr ""
#: ../../addon/facebook/facebook.php:599 #: ../../addon/facebook/facebook.php:600
msgid "Do not import your Facebook profile wall conversations" msgid "Do not import your Facebook profile wall conversations"
msgstr "" msgstr ""
#: ../../addon/facebook/facebook.php:601 #: ../../addon/facebook/facebook.php:602
msgid "" msgid ""
"If you choose to link conversations and leave both of these boxes unchecked, " "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 " "your Facebook profile wall will be merged with your profile wall on this "
@ -4348,120 +4365,120 @@ msgid ""
"who may see the conversations." "who may see the conversations."
msgstr "" msgstr ""
#: ../../addon/facebook/facebook.php:606 #: ../../addon/facebook/facebook.php:607
msgid "Comma separated applications to ignore" msgid "Comma separated applications to ignore"
msgstr "" msgstr ""
#: ../../addon/facebook/facebook.php:690 #: ../../addon/facebook/facebook.php:691
msgid "Problems with Facebook Real-Time Updates" msgid "Problems with Facebook Real-Time Updates"
msgstr "" msgstr ""
#: ../../addon/facebook/facebook.php:718 #: ../../addon/facebook/facebook.php:719
#: ../../include/contact_selectors.php:81 #: ../../include/contact_selectors.php:81
msgid "Facebook" msgid "Facebook"
msgstr "" msgstr ""
#: ../../addon/facebook/facebook.php:719 #: ../../addon/facebook/facebook.php:720
msgid "Facebook Connector Settings" msgid "Facebook Connector Settings"
msgstr "" msgstr ""
#: ../../addon/facebook/facebook.php:734 #: ../../addon/facebook/facebook.php:735
msgid "Facebook API Key" msgid "Facebook API Key"
msgstr "" msgstr ""
#: ../../addon/facebook/facebook.php:744 #: ../../addon/facebook/facebook.php:745
msgid "" msgid ""
"Error: it appears that you have specified the App-ID and -Secret in your ." "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 " "htconfig.php file. As long as they are specified there, they cannot be set "
"using this form.<br><br>" "using this form.<br><br>"
msgstr "" msgstr ""
#: ../../addon/facebook/facebook.php:749 #: ../../addon/facebook/facebook.php:750
msgid "" msgid ""
"Error: the given API Key seems to be incorrect (the application access token " "Error: the given API Key seems to be incorrect (the application access token "
"could not be retrieved)." "could not be retrieved)."
msgstr "" msgstr ""
#: ../../addon/facebook/facebook.php:751 #: ../../addon/facebook/facebook.php:752
msgid "The given API Key seems to work correctly." msgid "The given API Key seems to work correctly."
msgstr "" msgstr ""
#: ../../addon/facebook/facebook.php:753 #: ../../addon/facebook/facebook.php:754
msgid "" msgid ""
"The correctness of the API Key could not be detected. Somthing strange's " "The correctness of the API Key could not be detected. Somthing strange's "
"going on." "going on."
msgstr "" msgstr ""
#: ../../addon/facebook/facebook.php:756 #: ../../addon/facebook/facebook.php:757
msgid "App-ID / API-Key" msgid "App-ID / API-Key"
msgstr "" msgstr ""
#: ../../addon/facebook/facebook.php:757 #: ../../addon/facebook/facebook.php:758
msgid "Application secret" msgid "Application secret"
msgstr "" msgstr ""
#: ../../addon/facebook/facebook.php:758 #: ../../addon/facebook/facebook.php:759
#, php-format #, php-format
msgid "Polling Interval in minutes (minimum %1$s minutes)" msgid "Polling Interval in minutes (minimum %1$s minutes)"
msgstr "" msgstr ""
#: ../../addon/facebook/facebook.php:759 #: ../../addon/facebook/facebook.php:760
msgid "" msgid ""
"Synchronize comments (no comments on Facebook are missed, at the cost of " "Synchronize comments (no comments on Facebook are missed, at the cost of "
"increased system load)" "increased system load)"
msgstr "" msgstr ""
#: ../../addon/facebook/facebook.php:763 #: ../../addon/facebook/facebook.php:764
msgid "Real-Time Updates" msgid "Real-Time Updates"
msgstr "" msgstr ""
#: ../../addon/facebook/facebook.php:767 #: ../../addon/facebook/facebook.php:768
msgid "Real-Time Updates are activated." msgid "Real-Time Updates are activated."
msgstr "" msgstr ""
#: ../../addon/facebook/facebook.php:768 #: ../../addon/facebook/facebook.php:769
msgid "Deactivate Real-Time Updates" msgid "Deactivate Real-Time Updates"
msgstr "" msgstr ""
#: ../../addon/facebook/facebook.php:770 #: ../../addon/facebook/facebook.php:771
msgid "Real-Time Updates not activated." msgid "Real-Time Updates not activated."
msgstr "" msgstr ""
#: ../../addon/facebook/facebook.php:770 #: ../../addon/facebook/facebook.php:771
msgid "Activate Real-Time Updates" msgid "Activate Real-Time Updates"
msgstr "" msgstr ""
#: ../../addon/facebook/facebook.php:789 ../../addon/dav/layout.fnk.php:360 #: ../../addon/facebook/facebook.php:790 ../../addon/dav/layout.fnk.php:360
msgid "The new values have been saved." msgid "The new values have been saved."
msgstr "" msgstr ""
#: ../../addon/facebook/facebook.php:813 #: ../../addon/facebook/facebook.php:814
msgid "Post to Facebook" msgid "Post to Facebook"
msgstr "" msgstr ""
#: ../../addon/facebook/facebook.php:911 #: ../../addon/facebook/facebook.php:912
msgid "" msgid ""
"Post to Facebook cancelled because of multi-network access permission " "Post to Facebook cancelled because of multi-network access permission "
"conflict." "conflict."
msgstr "" msgstr ""
#: ../../addon/facebook/facebook.php:1131 #: ../../addon/facebook/facebook.php:1132
msgid "View on Friendica" msgid "View on Friendica"
msgstr "" msgstr ""
#: ../../addon/facebook/facebook.php:1164 #: ../../addon/facebook/facebook.php:1165
msgid "Facebook post failed. Queued for retry." msgid "Facebook post failed. Queued for retry."
msgstr "" msgstr ""
#: ../../addon/facebook/facebook.php:1204 #: ../../addon/facebook/facebook.php:1205
msgid "Your Facebook connection became invalid. Please Re-authenticate." msgid "Your Facebook connection became invalid. Please Re-authenticate."
msgstr "" msgstr ""
#: ../../addon/facebook/facebook.php:1205 #: ../../addon/facebook/facebook.php:1206
msgid "Facebook connection became invalid" msgid "Facebook connection became invalid"
msgstr "" msgstr ""
#: ../../addon/facebook/facebook.php:1206 #: ../../addon/facebook/facebook.php:1207
#, php-format #, php-format
msgid "" msgid ""
"Hi %1$s,\n" "Hi %1$s,\n"
@ -4483,23 +4500,23 @@ msgstr ""
msgid "Automatically follow any StatusNet followers/mentioners" msgid "Automatically follow any StatusNet followers/mentioners"
msgstr "" msgstr ""
#: ../../addon/privacy_image_cache/privacy_image_cache.php:182 #: ../../addon/privacy_image_cache/privacy_image_cache.php:184
msgid "Lifetime of the cache (in hours)" msgid "Lifetime of the cache (in hours)"
msgstr "" msgstr ""
#: ../../addon/privacy_image_cache/privacy_image_cache.php:187 #: ../../addon/privacy_image_cache/privacy_image_cache.php:189
msgid "Cache Statistics" msgid "Cache Statistics"
msgstr "" msgstr ""
#: ../../addon/privacy_image_cache/privacy_image_cache.php:190 #: ../../addon/privacy_image_cache/privacy_image_cache.php:192
msgid "Number of items" msgid "Number of items"
msgstr "" msgstr ""
#: ../../addon/privacy_image_cache/privacy_image_cache.php:192 #: ../../addon/privacy_image_cache/privacy_image_cache.php:194
msgid "Size of the cache" msgid "Size of the cache"
msgstr "" msgstr ""
#: ../../addon/privacy_image_cache/privacy_image_cache.php:194 #: ../../addon/privacy_image_cache/privacy_image_cache.php:196
msgid "Delete the whole cache" msgid "Delete the whole cache"
msgstr "" msgstr ""
@ -5034,7 +5051,7 @@ msgstr ""
msgid "Post to Drupal by default" msgid "Post to Drupal by default"
msgstr "" msgstr ""
#: ../../addon/drpost/drpost.php:184 ../../addon/wppost/wppost.php:199 #: ../../addon/drpost/drpost.php:184 ../../addon/wppost/wppost.php:201
#: ../../addon/blogger/blogger.php:172 ../../addon/posterous/posterous.php:189 #: ../../addon/blogger/blogger.php:172 ../../addon/posterous/posterous.php:189
msgid "Post from Friendica" msgid "Post from Friendica"
msgstr "" msgstr ""
@ -5551,7 +5568,7 @@ msgstr ""
msgid "Clear OAuth configuration" msgid "Clear OAuth configuration"
msgstr "" msgstr ""
#: ../../addon/statusnet/statusnet.php:553 #: ../../addon/statusnet/statusnet.php:559
msgid "API URL" msgid "API URL"
msgstr "" msgstr ""
@ -5650,7 +5667,7 @@ msgstr ""
msgid "Provide a backlink to the Friendica post" msgid "Provide a backlink to the Friendica post"
msgstr "" msgstr ""
#: ../../addon/wppost/wppost.php:205 #: ../../addon/wppost/wppost.php:207
msgid "Read the original post and comment stream on Friendica" msgid "Read the original post and comment stream on Friendica"
msgstr "" msgstr ""
@ -5768,11 +5785,11 @@ msgstr ""
msgid "Send linked #-tags and @-names to Twitter" msgid "Send linked #-tags and @-names to Twitter"
msgstr "" msgstr ""
#: ../../addon/twitter/twitter.php:383 #: ../../addon/twitter/twitter.php:389
msgid "Consumer key" msgid "Consumer key"
msgstr "" msgstr ""
#: ../../addon/twitter/twitter.php:384 #: ../../addon/twitter/twitter.php:390
msgid "Consumer secret" msgid "Consumer secret"
msgstr "" msgstr ""
@ -6370,7 +6387,7 @@ msgstr ""
msgid "Sex Addict" msgid "Sex Addict"
msgstr "" msgstr ""
#: ../../include/profile_selectors.php:42 ../../include/user.php:272 #: ../../include/profile_selectors.php:42 ../../include/user.php:278
msgid "Friends" msgid "Friends"
msgstr "" msgstr ""
@ -6458,11 +6475,11 @@ msgstr ""
msgid "Ask me" msgid "Ask me"
msgstr "" msgstr ""
#: ../../include/event.php:17 ../../include/bb2diaspora.php:295 #: ../../include/event.php:17 ../../include/bb2diaspora.php:339
msgid "Starts:" msgid "Starts:"
msgstr "" msgstr ""
#: ../../include/event.php:27 ../../include/bb2diaspora.php:303 #: ../../include/event.php:27 ../../include/bb2diaspora.php:347
msgid "Finishes:" msgid "Finishes:"
msgstr "" msgstr ""
@ -6606,7 +6623,7 @@ msgstr ""
msgid "Click to open/close" msgid "Click to open/close"
msgstr "" msgstr ""
#: ../../include/text.php:1096 ../../include/user.php:230 #: ../../include/text.php:1096 ../../include/user.php:236
msgid "default" msgid "default"
msgstr "" msgstr ""
@ -6634,11 +6651,11 @@ msgstr ""
msgid "Sharing notification from Diaspora network" msgid "Sharing notification from Diaspora network"
msgstr "" msgstr ""
#: ../../include/diaspora.php:2084 #: ../../include/diaspora.php:2085
msgid "Attachments:" msgid "Attachments:"
msgstr "" msgstr ""
#: ../../include/network.php:827 #: ../../include/network.php:839
msgid "view full size" msgid "view full size"
msgstr "" msgstr ""
@ -7188,15 +7205,15 @@ msgstr ""
msgid "following" msgid "following"
msgstr "" msgstr ""
#: ../../include/items.php:2808 #: ../../include/items.php:2812
msgid "A new person is sharing with you at " msgid "A new person is sharing with you at "
msgstr "" msgstr ""
#: ../../include/items.php:2808 #: ../../include/items.php:2812
msgid "You have a new follower at " msgid "You have a new follower at "
msgstr "" msgstr ""
#: ../../include/items.php:3472 #: ../../include/items.php:3476
msgid "Archives" msgid "Archives"
msgstr "" msgstr ""
@ -7246,7 +7263,7 @@ msgid ""
"must also begin with a letter." "must also begin with a letter."
msgstr "" msgstr ""
#: ../../include/user.php:127 ../../include/user.php:219 #: ../../include/user.php:127 ../../include/user.php:225
msgid "Nickname is already registered. Please choose another." msgid "Nickname is already registered. Please choose another."
msgstr "" msgstr ""
@ -7260,11 +7277,11 @@ msgstr ""
msgid "SERIOUS ERROR: Generation of security keys failed." msgid "SERIOUS ERROR: Generation of security keys failed."
msgstr "" msgstr ""
#: ../../include/user.php:205 #: ../../include/user.php:211
msgid "An error occurred during registration. Please try again." msgid "An error occurred during registration. Please try again."
msgstr "" msgstr ""
#: ../../include/user.php:240 #: ../../include/user.php:246
msgid "An error occurred creating your default profile. Please try again." msgid "An error occurred creating your default profile. Please try again."
msgstr "" msgstr ""