mirror of https://github.com/friendica/friendica
bugfixes: private photo embeds and search for strings with %
This commit is contained in:
friendica
parent
2eafa9a475
commit
419cf91aae
2
boot.php
2
boot.php
|
|
@ -9,7 +9,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.1357' );
|
define ( 'FRIENDICA_VERSION', '3.0.1358' );
|
||||||
define ( 'DFRN_PROTOCOL_VERSION', '2.23' );
|
define ( 'DFRN_PROTOCOL_VERSION', '2.23' );
|
||||||
define ( 'DB_UPDATE_VERSION', 1144 );
|
define ( 'DB_UPDATE_VERSION', 1144 );
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -2931,7 +2931,7 @@ function fix_private_photos($s,$uid, $item = null, $cid = 0) {
|
||||||
$a = get_app();
|
$a = get_app();
|
||||||
|
|
||||||
logger('fix_private_photos', LOGGER_DEBUG);
|
logger('fix_private_photos', LOGGER_DEBUG);
|
||||||
$site = substr($a->get_baseurl(),strpos($a->get_baseurl,'://'));
|
$site = substr($a->get_baseurl(),strpos($a->get_baseurl(),'://'));
|
||||||
|
|
||||||
if(preg_match("/\[img\](.*?)\[\/img\]/is",$s,$matches)) {
|
if(preg_match("/\[img\](.*?)\[\/img\]/is",$s,$matches)) {
|
||||||
$image = $matches[1];
|
$image = $matches[1];
|
||||||
|
|
|
||||||
|
|
@ -110,9 +110,9 @@ function search_content(&$a) {
|
||||||
return $o;
|
return $o;
|
||||||
|
|
||||||
if($tag)
|
if($tag)
|
||||||
$sql_extra = sprintf(" AND `item`.`tag` REGEXP '%s' ", dbesc('\\]' . preg_quote($search) . '\\['));
|
$sql_extra = sprintf(" AND `item`.`tag` REGEXP '%s' ", dbesc('\\]' . protect_sprintf(preg_quote($search)) . '\\['));
|
||||||
else
|
else
|
||||||
$sql_extra = sprintf(" AND `item`.`body` REGEXP '%s' ", dbesc(preg_quote($search)));
|
$sql_extra = sprintf(" AND `item`.`body` REGEXP '%s' ", dbesc(protect_sprintf(preg_quote($search))));
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
|
||||||
294
util/messages.po
294
util/messages.po
|
|
@ -6,9 +6,9 @@
|
||||||
#, fuzzy
|
#, fuzzy
|
||||||
msgid ""
|
msgid ""
|
||||||
msgstr ""
|
msgstr ""
|
||||||
"Project-Id-Version: 3.0.1357\n"
|
"Project-Id-Version: 3.0.1358\n"
|
||||||
"Report-Msgid-Bugs-To: \n"
|
"Report-Msgid-Bugs-To: \n"
|
||||||
"POT-Creation-Date: 2012-05-28 10:00-0700\n"
|
"POT-Creation-Date: 2012-05-29 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"
|
||||||
|
|
@ -39,8 +39,8 @@ msgstr ""
|
||||||
#: ../../mod/api.php:31 ../../mod/photos.php:130 ../../mod/photos.php:920
|
#: ../../mod/api.php:31 ../../mod/photos.php:130 ../../mod/photos.php:920
|
||||||
#: ../../mod/editpost.php:10 ../../mod/install.php:151
|
#: ../../mod/editpost.php:10 ../../mod/install.php:151
|
||||||
#: ../../mod/notifications.php:66 ../../mod/contacts.php:125
|
#: ../../mod/notifications.php:66 ../../mod/contacts.php:125
|
||||||
#: ../../mod/settings.php:105 ../../mod/settings.php:536
|
#: ../../mod/settings.php:106 ../../mod/settings.php:537
|
||||||
#: ../../mod/settings.php:541 ../../mod/manage.php:86 ../../mod/network.php:6
|
#: ../../mod/settings.php:542 ../../mod/manage.php:86 ../../mod/network.php:6
|
||||||
#: ../../mod/notes.php:20 ../../mod/wallmessage.php:9
|
#: ../../mod/notes.php:20 ../../mod/wallmessage.php:9
|
||||||
#: ../../mod/wallmessage.php:33 ../../mod/wallmessage.php:79
|
#: ../../mod/wallmessage.php:33 ../../mod/wallmessage.php:79
|
||||||
#: ../../mod/wallmessage.php:103 ../../mod/attach.php:33
|
#: ../../mod/wallmessage.php:103 ../../mod/attach.php:33
|
||||||
|
|
@ -55,7 +55,7 @@ msgstr ""
|
||||||
#: ../../mod/profiles.php:374 ../../mod/delegate.php:6
|
#: ../../mod/profiles.php:374 ../../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:503
|
#: ../../mod/dfrn_confirm.php:53 ../../addon/facebook/facebook.php:503
|
||||||
#: ../../include/items.php:3286 ../../index.php:306
|
#: ../../include/items.php:3293 ../../index.php:306
|
||||||
msgid "Permission denied."
|
msgid "Permission denied."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
@ -84,8 +84,8 @@ msgstr ""
|
||||||
msgid "Return to contact editor"
|
msgid "Return to contact editor"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: ../../mod/crepair.php:148 ../../mod/settings.php:556
|
#: ../../mod/crepair.php:148 ../../mod/settings.php:557
|
||||||
#: ../../mod/settings.php:582 ../../mod/admin.php:656 ../../mod/admin.php:665
|
#: ../../mod/settings.php:583 ../../mod/admin.php:656 ../../mod/admin.php:665
|
||||||
msgid "Name"
|
msgid "Name"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
@ -127,8 +127,8 @@ msgstr ""
|
||||||
#: ../../mod/photos.php:1336 ../../mod/photos.php:1367
|
#: ../../mod/photos.php:1336 ../../mod/photos.php:1367
|
||||||
#: ../../mod/install.php:245 ../../mod/install.php:283
|
#: ../../mod/install.php:245 ../../mod/install.php:283
|
||||||
#: ../../mod/localtime.php:45 ../../mod/contacts.php:322
|
#: ../../mod/localtime.php:45 ../../mod/contacts.php:322
|
||||||
#: ../../mod/settings.php:554 ../../mod/settings.php:700
|
#: ../../mod/settings.php:555 ../../mod/settings.php:701
|
||||||
#: ../../mod/settings.php:761 ../../mod/settings.php:965
|
#: ../../mod/settings.php:762 ../../mod/settings.php:970
|
||||||
#: ../../mod/manage.php:109 ../../mod/group.php:85 ../../mod/admin.php:417
|
#: ../../mod/manage.php:109 ../../mod/group.php:85 ../../mod/admin.php:417
|
||||||
#: ../../mod/admin.php:653 ../../mod/admin.php:789 ../../mod/admin.php:988
|
#: ../../mod/admin.php:653 ../../mod/admin.php:789 ../../mod/admin.php:988
|
||||||
#: ../../mod/admin.php:1075 ../../mod/profiles.php:543
|
#: ../../mod/admin.php:1075 ../../mod/profiles.php:543
|
||||||
|
|
@ -280,8 +280,8 @@ msgid "Share this event"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: ../../mod/tagrm.php:11 ../../mod/tagrm.php:94
|
#: ../../mod/tagrm.php:11 ../../mod/tagrm.php:94
|
||||||
#: ../../mod/dfrn_request.php:826 ../../mod/settings.php:555
|
#: ../../mod/dfrn_request.php:826 ../../mod/settings.php:556
|
||||||
#: ../../mod/settings.php:581 ../../addon/js_upload/js_upload.php:45
|
#: ../../mod/settings.php:582 ../../addon/js_upload/js_upload.php:45
|
||||||
msgid "Cancel"
|
msgid "Cancel"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
@ -325,24 +325,26 @@ msgid ""
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: ../../mod/api.php:105 ../../mod/dfrn_request.php:814
|
#: ../../mod/api.php:105 ../../mod/dfrn_request.php:814
|
||||||
#: ../../mod/settings.php:876 ../../mod/settings.php:882
|
#: ../../mod/settings.php:880 ../../mod/settings.php:886
|
||||||
#: ../../mod/settings.php:890 ../../mod/settings.php:894
|
#: ../../mod/settings.php:894 ../../mod/settings.php:898
|
||||||
#: ../../mod/settings.php:899 ../../mod/settings.php:905
|
#: ../../mod/settings.php:903 ../../mod/settings.php:909
|
||||||
#: ../../mod/settings.php:911 ../../mod/settings.php:917
|
#: ../../mod/settings.php:915 ../../mod/settings.php:921
|
||||||
#: ../../mod/settings.php:953 ../../mod/settings.php:954
|
#: ../../mod/settings.php:957 ../../mod/settings.php:958
|
||||||
#: ../../mod/settings.php:955 ../../mod/settings.php:956
|
#: ../../mod/settings.php:959 ../../mod/settings.php:960
|
||||||
#: ../../mod/register.php:511 ../../mod/profiles.php:520
|
#: ../../mod/settings.php:961 ../../mod/register.php:511
|
||||||
|
#: ../../mod/profiles.php:520
|
||||||
msgid "Yes"
|
msgid "Yes"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: ../../mod/api.php:106 ../../mod/dfrn_request.php:815
|
#: ../../mod/api.php:106 ../../mod/dfrn_request.php:815
|
||||||
#: ../../mod/settings.php:876 ../../mod/settings.php:882
|
#: ../../mod/settings.php:880 ../../mod/settings.php:886
|
||||||
#: ../../mod/settings.php:890 ../../mod/settings.php:894
|
#: ../../mod/settings.php:894 ../../mod/settings.php:898
|
||||||
#: ../../mod/settings.php:899 ../../mod/settings.php:905
|
#: ../../mod/settings.php:903 ../../mod/settings.php:909
|
||||||
#: ../../mod/settings.php:911 ../../mod/settings.php:917
|
#: ../../mod/settings.php:915 ../../mod/settings.php:921
|
||||||
#: ../../mod/settings.php:953 ../../mod/settings.php:954
|
#: ../../mod/settings.php:957 ../../mod/settings.php:958
|
||||||
#: ../../mod/settings.php:955 ../../mod/settings.php:956
|
#: ../../mod/settings.php:959 ../../mod/settings.php:960
|
||||||
#: ../../mod/register.php:512 ../../mod/profiles.php:521
|
#: ../../mod/settings.php:961 ../../mod/register.php:512
|
||||||
|
#: ../../mod/profiles.php:521
|
||||||
msgid "No"
|
msgid "No"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
@ -560,8 +562,8 @@ msgstr ""
|
||||||
msgid "Preview"
|
msgid "Preview"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: ../../mod/photos.php:1394 ../../mod/settings.php:617
|
#: ../../mod/photos.php:1394 ../../mod/settings.php:618
|
||||||
#: ../../mod/settings.php:698 ../../mod/group.php:168 ../../mod/admin.php:660
|
#: ../../mod/settings.php:699 ../../mod/group.php:168 ../../mod/admin.php:660
|
||||||
#: ../../include/conversation.php:322 ../../include/conversation.php:588
|
#: ../../include/conversation.php:322 ../../include/conversation.php:588
|
||||||
msgid "Delete"
|
msgid "Delete"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
@ -631,7 +633,7 @@ msgstr ""
|
||||||
msgid "Post to Email"
|
msgid "Post to Email"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: ../../mod/editpost.php:95 ../../mod/settings.php:616
|
#: ../../mod/editpost.php:95 ../../mod/settings.php:617
|
||||||
#: ../../include/conversation.php:575
|
#: ../../include/conversation.php:575
|
||||||
msgid "Edit"
|
msgid "Edit"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
@ -861,7 +863,7 @@ msgstr ""
|
||||||
msgid "StatusNet/Federated Social Web"
|
msgid "StatusNet/Federated Social Web"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: ../../mod/dfrn_request.php:820 ../../mod/settings.php:651
|
#: ../../mod/dfrn_request.php:820 ../../mod/settings.php:652
|
||||||
#: ../../include/contact_selectors.php:80
|
#: ../../include/contact_selectors.php:80
|
||||||
msgid "Diaspora"
|
msgid "Diaspora"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
@ -1796,35 +1798,35 @@ msgstr ""
|
||||||
msgid "Settings"
|
msgid "Settings"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: ../../mod/settings.php:132
|
#: ../../mod/settings.php:133
|
||||||
msgid "Missing some important data!"
|
msgid "Missing some important data!"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: ../../mod/settings.php:135 ../../mod/settings.php:580
|
#: ../../mod/settings.php:136 ../../mod/settings.php:581
|
||||||
msgid "Update"
|
msgid "Update"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: ../../mod/settings.php:240
|
#: ../../mod/settings.php:241
|
||||||
msgid "Failed to connect with email account using the settings provided."
|
msgid "Failed to connect with email account using the settings provided."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: ../../mod/settings.php:245
|
#: ../../mod/settings.php:246
|
||||||
msgid "Email settings updated."
|
msgid "Email settings updated."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: ../../mod/settings.php:304
|
#: ../../mod/settings.php:305
|
||||||
msgid "Passwords do not match. Password unchanged."
|
msgid "Passwords do not match. Password unchanged."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: ../../mod/settings.php:309
|
#: ../../mod/settings.php:310
|
||||||
msgid "Empty passwords are not allowed. Password unchanged."
|
msgid "Empty passwords are not allowed. Password unchanged."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: ../../mod/settings.php:320
|
#: ../../mod/settings.php:321
|
||||||
msgid "Password changed."
|
msgid "Password changed."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: ../../mod/settings.php:322
|
#: ../../mod/settings.php:323
|
||||||
msgid "Password update failed. Please try again."
|
msgid "Password update failed. Please try again."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
@ -1844,15 +1846,15 @@ msgstr ""
|
||||||
msgid " Cannot change to that email."
|
msgid " Cannot change to that email."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: ../../mod/settings.php:449
|
#: ../../mod/settings.php:450
|
||||||
msgid "Private forum has no privacy permissions. Using default privacy group."
|
msgid "Private forum has no privacy permissions. Using default privacy group."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: ../../mod/settings.php:453
|
#: ../../mod/settings.php:454
|
||||||
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:483 ../../addon/facebook/facebook.php:488
|
#: ../../mod/settings.php:484 ../../addon/facebook/facebook.php:488
|
||||||
#: ../../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
|
||||||
|
|
@ -1860,417 +1862,421 @@ msgstr ""
|
||||||
msgid "Settings updated."
|
msgid "Settings updated."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: ../../mod/settings.php:553 ../../mod/settings.php:579
|
#: ../../mod/settings.php:554 ../../mod/settings.php:580
|
||||||
#: ../../mod/settings.php:615
|
#: ../../mod/settings.php:616
|
||||||
msgid "Add application"
|
msgid "Add application"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: ../../mod/settings.php:557 ../../mod/settings.php:583
|
#: ../../mod/settings.php:558 ../../mod/settings.php:584
|
||||||
#: ../../addon/statusnet/statusnet.php:555
|
#: ../../addon/statusnet/statusnet.php:555
|
||||||
msgid "Consumer Key"
|
msgid "Consumer Key"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: ../../mod/settings.php:558 ../../mod/settings.php:584
|
#: ../../mod/settings.php:559 ../../mod/settings.php:585
|
||||||
#: ../../addon/statusnet/statusnet.php:554
|
#: ../../addon/statusnet/statusnet.php:554
|
||||||
msgid "Consumer Secret"
|
msgid "Consumer Secret"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: ../../mod/settings.php:559 ../../mod/settings.php:585
|
#: ../../mod/settings.php:560 ../../mod/settings.php:586
|
||||||
msgid "Redirect"
|
msgid "Redirect"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: ../../mod/settings.php:560 ../../mod/settings.php:586
|
#: ../../mod/settings.php:561 ../../mod/settings.php:587
|
||||||
msgid "Icon url"
|
msgid "Icon url"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: ../../mod/settings.php:571
|
#: ../../mod/settings.php:572
|
||||||
msgid "You can't edit this application."
|
msgid "You can't edit this application."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: ../../mod/settings.php:614
|
#: ../../mod/settings.php:615
|
||||||
msgid "Connected Apps"
|
msgid "Connected Apps"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: ../../mod/settings.php:618
|
#: ../../mod/settings.php:619
|
||||||
msgid "Client key starts with"
|
msgid "Client key starts with"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: ../../mod/settings.php:619
|
#: ../../mod/settings.php:620
|
||||||
msgid "No name"
|
msgid "No name"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: ../../mod/settings.php:620
|
#: ../../mod/settings.php:621
|
||||||
msgid "Remove authorization"
|
msgid "Remove authorization"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: ../../mod/settings.php:631
|
#: ../../mod/settings.php:632
|
||||||
msgid "No Plugin settings configured"
|
msgid "No Plugin settings configured"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: ../../mod/settings.php:639 ../../addon/widgets/widgets.php:123
|
#: ../../mod/settings.php:640 ../../addon/widgets/widgets.php:123
|
||||||
msgid "Plugin Settings"
|
msgid "Plugin Settings"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: ../../mod/settings.php:651 ../../mod/settings.php:652
|
#: ../../mod/settings.php:652 ../../mod/settings.php:653
|
||||||
#, php-format
|
#, php-format
|
||||||
msgid "Built-in support for %s connectivity is %s"
|
msgid "Built-in support for %s connectivity is %s"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: ../../mod/settings.php:651 ../../mod/settings.php:652
|
#: ../../mod/settings.php:652 ../../mod/settings.php:653
|
||||||
msgid "enabled"
|
msgid "enabled"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: ../../mod/settings.php:651 ../../mod/settings.php:652
|
#: ../../mod/settings.php:652 ../../mod/settings.php:653
|
||||||
msgid "disabled"
|
msgid "disabled"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: ../../mod/settings.php:652
|
#: ../../mod/settings.php:653
|
||||||
msgid "StatusNet"
|
msgid "StatusNet"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: ../../mod/settings.php:682
|
#: ../../mod/settings.php:683
|
||||||
msgid "Connector Settings"
|
msgid "Connector Settings"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: ../../mod/settings.php:687
|
#: ../../mod/settings.php:688
|
||||||
msgid "Email/Mailbox Setup"
|
msgid "Email/Mailbox Setup"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: ../../mod/settings.php:688
|
#: ../../mod/settings.php:689
|
||||||
msgid ""
|
msgid ""
|
||||||
"If you wish to communicate with email contacts using this service "
|
"If you wish to communicate with email contacts using this service "
|
||||||
"(optional), please specify how to connect to your mailbox."
|
"(optional), please specify how to connect to your mailbox."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: ../../mod/settings.php:689
|
#: ../../mod/settings.php:690
|
||||||
msgid "Last successful email check:"
|
msgid "Last successful email check:"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: ../../mod/settings.php:690
|
#: ../../mod/settings.php:691
|
||||||
msgid "Email access is disabled on this site."
|
msgid "Email access is disabled on this site."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: ../../mod/settings.php:691
|
#: ../../mod/settings.php:692
|
||||||
msgid "IMAP server name:"
|
msgid "IMAP server name:"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: ../../mod/settings.php:692
|
#: ../../mod/settings.php:693
|
||||||
msgid "IMAP port:"
|
msgid "IMAP port:"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: ../../mod/settings.php:693
|
#: ../../mod/settings.php:694
|
||||||
msgid "Security:"
|
msgid "Security:"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: ../../mod/settings.php:693 ../../mod/settings.php:698
|
#: ../../mod/settings.php:694 ../../mod/settings.php:699
|
||||||
msgid "None"
|
msgid "None"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: ../../mod/settings.php:694
|
#: ../../mod/settings.php:695
|
||||||
msgid "Email login name:"
|
msgid "Email login name:"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: ../../mod/settings.php:695
|
#: ../../mod/settings.php:696
|
||||||
msgid "Email password:"
|
msgid "Email password:"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: ../../mod/settings.php:696
|
#: ../../mod/settings.php:697
|
||||||
msgid "Reply-to address:"
|
msgid "Reply-to address:"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: ../../mod/settings.php:697
|
#: ../../mod/settings.php:698
|
||||||
msgid "Send public posts to all email contacts:"
|
msgid "Send public posts to all email contacts:"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: ../../mod/settings.php:698
|
#: ../../mod/settings.php:699
|
||||||
msgid "Action after import:"
|
msgid "Action after import:"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: ../../mod/settings.php:698
|
#: ../../mod/settings.php:699
|
||||||
msgid "Mark as seen"
|
msgid "Mark as seen"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: ../../mod/settings.php:698
|
#: ../../mod/settings.php:699
|
||||||
msgid "Move to folder"
|
msgid "Move to folder"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: ../../mod/settings.php:699
|
#: ../../mod/settings.php:700
|
||||||
msgid "Move to folder:"
|
msgid "Move to folder:"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: ../../mod/settings.php:759
|
#: ../../mod/settings.php:760
|
||||||
msgid "Display Settings"
|
msgid "Display Settings"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: ../../mod/settings.php:765
|
#: ../../mod/settings.php:766
|
||||||
msgid "Display Theme:"
|
msgid "Display Theme:"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: ../../mod/settings.php:766
|
#: ../../mod/settings.php:767
|
||||||
msgid "Update browser every xx seconds"
|
msgid "Update browser every xx seconds"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: ../../mod/settings.php:766
|
#: ../../mod/settings.php:767
|
||||||
msgid "Minimum of 10 seconds, no maximum"
|
msgid "Minimum of 10 seconds, no maximum"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: ../../mod/settings.php:767
|
#: ../../mod/settings.php:768
|
||||||
msgid "Number of items to display on the network page:"
|
msgid "Number of items to display on the network page:"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: ../../mod/settings.php:767
|
#: ../../mod/settings.php:768
|
||||||
msgid "Maximum of 100 items"
|
msgid "Maximum of 100 items"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: ../../mod/settings.php:768
|
#: ../../mod/settings.php:769
|
||||||
msgid "Don't show emoticons"
|
msgid "Don't show emoticons"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: ../../mod/settings.php:836 ../../mod/admin.php:180 ../../mod/admin.php:634
|
#: ../../mod/settings.php:840 ../../mod/admin.php:180 ../../mod/admin.php:634
|
||||||
msgid "Normal Account"
|
msgid "Normal Account"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: ../../mod/settings.php:837
|
#: ../../mod/settings.php:841
|
||||||
msgid "This account is a normal personal profile"
|
msgid "This account is a normal personal profile"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: ../../mod/settings.php:840 ../../mod/admin.php:181 ../../mod/admin.php:635
|
#: ../../mod/settings.php:844 ../../mod/admin.php:181 ../../mod/admin.php:635
|
||||||
msgid "Soapbox Account"
|
msgid "Soapbox Account"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: ../../mod/settings.php:841
|
#: ../../mod/settings.php:845
|
||||||
msgid "Automatically approve all connection/friend requests as read-only fans"
|
msgid "Automatically approve all connection/friend requests as read-only fans"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: ../../mod/settings.php:844 ../../mod/admin.php:182 ../../mod/admin.php:636
|
#: ../../mod/settings.php:848 ../../mod/admin.php:182 ../../mod/admin.php:636
|
||||||
msgid "Community/Celebrity Account"
|
msgid "Community/Celebrity Account"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: ../../mod/settings.php:845
|
#: ../../mod/settings.php:849
|
||||||
msgid "Automatically approve all connection/friend requests as read-write fans"
|
msgid "Automatically approve all connection/friend requests as read-write fans"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: ../../mod/settings.php:848 ../../mod/admin.php:183 ../../mod/admin.php:637
|
#: ../../mod/settings.php:852 ../../mod/admin.php:183 ../../mod/admin.php:637
|
||||||
msgid "Automatic Friend Account"
|
msgid "Automatic Friend Account"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: ../../mod/settings.php:849
|
#: ../../mod/settings.php:853
|
||||||
msgid "Automatically approve all connection/friend requests as friends"
|
msgid "Automatically approve all connection/friend requests as friends"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: ../../mod/settings.php:852
|
#: ../../mod/settings.php:856
|
||||||
msgid "Private Forum"
|
msgid "Private Forum"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: ../../mod/settings.php:853
|
#: ../../mod/settings.php:857
|
||||||
msgid "Private forum - approved members only [Experimental]"
|
msgid "Private forum - approved members only [Experimental]"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: ../../mod/settings.php:866
|
#: ../../mod/settings.php:870
|
||||||
msgid "OpenID:"
|
msgid "OpenID:"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: ../../mod/settings.php:866
|
#: ../../mod/settings.php:870
|
||||||
msgid "(Optional) Allow this OpenID to login to this account."
|
msgid "(Optional) Allow this OpenID to login to this account."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: ../../mod/settings.php:876
|
#: ../../mod/settings.php:880
|
||||||
msgid "Publish your default profile in your local site directory?"
|
msgid "Publish your default profile in your local site directory?"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: ../../mod/settings.php:882
|
#: ../../mod/settings.php:886
|
||||||
msgid "Publish your default profile in the global social directory?"
|
msgid "Publish your default profile in the global social directory?"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: ../../mod/settings.php:890
|
#: ../../mod/settings.php:894
|
||||||
msgid "Hide your contact/friend list from viewers of your default profile?"
|
msgid "Hide your contact/friend list from viewers of your default profile?"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: ../../mod/settings.php:894
|
#: ../../mod/settings.php:898
|
||||||
msgid "Hide your profile details from unknown viewers?"
|
msgid "Hide your profile details from unknown viewers?"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: ../../mod/settings.php:899
|
#: ../../mod/settings.php:903
|
||||||
msgid "Allow friends to post to your profile page?"
|
msgid "Allow friends to post to your profile page?"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: ../../mod/settings.php:905
|
#: ../../mod/settings.php:909
|
||||||
msgid "Allow friends to tag your posts?"
|
msgid "Allow friends to tag your posts?"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: ../../mod/settings.php:911
|
#: ../../mod/settings.php:915
|
||||||
msgid "Allow us to suggest you as a potential friend to new members?"
|
msgid "Allow us to suggest you as a potential friend to new members?"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: ../../mod/settings.php:917
|
#: ../../mod/settings.php:921
|
||||||
msgid "Permit unknown people to send you private mail?"
|
msgid "Permit unknown people to send you private mail?"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: ../../mod/settings.php:928
|
#: ../../mod/settings.php:932
|
||||||
msgid "Profile is <strong>not published</strong>."
|
msgid "Profile is <strong>not published</strong>."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: ../../mod/settings.php:934 ../../mod/profile_photo.php:211
|
#: ../../mod/settings.php:938 ../../mod/profile_photo.php:211
|
||||||
msgid "or"
|
msgid "or"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: ../../mod/settings.php:939
|
#: ../../mod/settings.php:943
|
||||||
msgid "Your Identity Address is"
|
msgid "Your Identity Address is"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: ../../mod/settings.php:950
|
#: ../../mod/settings.php:954
|
||||||
msgid "Automatically expire posts after this many days:"
|
msgid "Automatically expire posts after this many days:"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: ../../mod/settings.php:950
|
#: ../../mod/settings.php:954
|
||||||
msgid "If empty, posts will not expire. Expired posts will be deleted"
|
msgid "If empty, posts will not expire. Expired posts will be deleted"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: ../../mod/settings.php:951
|
#: ../../mod/settings.php:955
|
||||||
msgid "Advanced expiration settings"
|
msgid "Advanced expiration settings"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: ../../mod/settings.php:952
|
#: ../../mod/settings.php:956
|
||||||
msgid "Advanced Expiration"
|
msgid "Advanced Expiration"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: ../../mod/settings.php:953
|
#: ../../mod/settings.php:957
|
||||||
msgid "Expire posts:"
|
msgid "Expire posts:"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: ../../mod/settings.php:954
|
#: ../../mod/settings.php:958
|
||||||
msgid "Expire personal notes:"
|
msgid "Expire personal notes:"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: ../../mod/settings.php:955
|
#: ../../mod/settings.php:959
|
||||||
msgid "Expire starred posts:"
|
msgid "Expire starred posts:"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: ../../mod/settings.php:956
|
#: ../../mod/settings.php:960
|
||||||
msgid "Expire photos:"
|
msgid "Expire photos:"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: ../../mod/settings.php:963
|
#: ../../mod/settings.php:961
|
||||||
|
msgid "Only expire posts by others:"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
|
#: ../../mod/settings.php:968
|
||||||
msgid "Account Settings"
|
msgid "Account Settings"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: ../../mod/settings.php:971
|
#: ../../mod/settings.php:976
|
||||||
msgid "Password Settings"
|
msgid "Password Settings"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: ../../mod/settings.php:972
|
#: ../../mod/settings.php:977
|
||||||
msgid "New Password:"
|
msgid "New Password:"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: ../../mod/settings.php:973
|
#: ../../mod/settings.php:978
|
||||||
msgid "Confirm:"
|
msgid "Confirm:"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: ../../mod/settings.php:973
|
#: ../../mod/settings.php:978
|
||||||
msgid "Leave password fields blank unless changing"
|
msgid "Leave password fields blank unless changing"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: ../../mod/settings.php:977
|
#: ../../mod/settings.php:982
|
||||||
msgid "Basic Settings"
|
msgid "Basic Settings"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: ../../mod/settings.php:978 ../../include/profile_advanced.php:15
|
#: ../../mod/settings.php:983 ../../include/profile_advanced.php:15
|
||||||
msgid "Full Name:"
|
msgid "Full Name:"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: ../../mod/settings.php:979
|
#: ../../mod/settings.php:984
|
||||||
msgid "Email Address:"
|
msgid "Email Address:"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: ../../mod/settings.php:980
|
#: ../../mod/settings.php:985
|
||||||
msgid "Your Timezone:"
|
msgid "Your Timezone:"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: ../../mod/settings.php:981
|
#: ../../mod/settings.php:986
|
||||||
msgid "Default Post Location:"
|
msgid "Default Post Location:"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: ../../mod/settings.php:982
|
#: ../../mod/settings.php:987
|
||||||
msgid "Use Browser Location:"
|
msgid "Use Browser Location:"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: ../../mod/settings.php:985
|
#: ../../mod/settings.php:990
|
||||||
msgid "Security and Privacy Settings"
|
msgid "Security and Privacy Settings"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: ../../mod/settings.php:987
|
#: ../../mod/settings.php:992
|
||||||
msgid "Maximum Friend Requests/Day:"
|
msgid "Maximum Friend Requests/Day:"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: ../../mod/settings.php:987 ../../mod/settings.php:1006
|
#: ../../mod/settings.php:992 ../../mod/settings.php:1011
|
||||||
msgid "(to prevent spam abuse)"
|
msgid "(to prevent spam abuse)"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: ../../mod/settings.php:988
|
#: ../../mod/settings.php:993
|
||||||
msgid "Default Post Permissions"
|
msgid "Default Post Permissions"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: ../../mod/settings.php:989
|
#: ../../mod/settings.php:994
|
||||||
msgid "(click to open/close)"
|
msgid "(click to open/close)"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: ../../mod/settings.php:1006
|
#: ../../mod/settings.php:1011
|
||||||
msgid "Maximum private messages per day from unknown people:"
|
msgid "Maximum private messages per day from unknown people:"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: ../../mod/settings.php:1009
|
#: ../../mod/settings.php:1014
|
||||||
msgid "Notification Settings"
|
msgid "Notification Settings"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: ../../mod/settings.php:1010
|
#: ../../mod/settings.php:1015
|
||||||
msgid "By default post a status message when:"
|
msgid "By default post a status message when:"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: ../../mod/settings.php:1011
|
#: ../../mod/settings.php:1016
|
||||||
msgid "accepting a friend request"
|
msgid "accepting a friend request"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: ../../mod/settings.php:1012
|
#: ../../mod/settings.php:1017
|
||||||
msgid "joining a forum/community"
|
msgid "joining a forum/community"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: ../../mod/settings.php:1013
|
#: ../../mod/settings.php:1018
|
||||||
msgid "making an <em>interesting</em> profile change"
|
msgid "making an <em>interesting</em> profile change"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: ../../mod/settings.php:1014
|
#: ../../mod/settings.php:1019
|
||||||
msgid "Send a notification email when:"
|
msgid "Send a notification email when:"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: ../../mod/settings.php:1015
|
#: ../../mod/settings.php:1020
|
||||||
msgid "You receive an introduction"
|
msgid "You receive an introduction"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: ../../mod/settings.php:1016
|
#: ../../mod/settings.php:1021
|
||||||
msgid "Your introductions are confirmed"
|
msgid "Your introductions are confirmed"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: ../../mod/settings.php:1017
|
#: ../../mod/settings.php:1022
|
||||||
msgid "Someone writes on your profile wall"
|
msgid "Someone writes on your profile wall"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: ../../mod/settings.php:1018
|
#: ../../mod/settings.php:1023
|
||||||
msgid "Someone writes a followup comment"
|
msgid "Someone writes a followup comment"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: ../../mod/settings.php:1019
|
#: ../../mod/settings.php:1024
|
||||||
msgid "You receive a private message"
|
msgid "You receive a private message"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: ../../mod/settings.php:1020
|
#: ../../mod/settings.php:1025
|
||||||
msgid "You receive a friend suggestion"
|
msgid "You receive a friend suggestion"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: ../../mod/settings.php:1021
|
#: ../../mod/settings.php:1026
|
||||||
msgid "You are tagged in a post"
|
msgid "You are tagged in a post"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: ../../mod/settings.php:1024
|
#: ../../mod/settings.php:1029
|
||||||
msgid "Advanced Page Settings"
|
msgid "Advanced Page Settings"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
@ -2841,7 +2847,7 @@ msgstr ""
|
||||||
|
|
||||||
#: ../../mod/notice.php:15 ../../mod/viewsrc.php:15 ../../mod/admin.php:156
|
#: ../../mod/notice.php:15 ../../mod/viewsrc.php:15 ../../mod/admin.php:156
|
||||||
#: ../../mod/admin.php:697 ../../mod/admin.php:896 ../../mod/display.php:37
|
#: ../../mod/admin.php:697 ../../mod/admin.php:896 ../../mod/display.php:37
|
||||||
#: ../../mod/display.php:142 ../../include/items.php:3168
|
#: ../../mod/display.php:142 ../../include/items.php:3175
|
||||||
msgid "Item not found."
|
msgid "Item not found."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue