diff options
| -rw-r--r-- | boot.php | 2 | ||||
| -rw-r--r-- | include/expire.php | 6 | ||||
| -rw-r--r-- | util/messages.po | 242 |
3 files changed, 157 insertions, 93 deletions
@@ -9,7 +9,7 @@ require_once('include/nav.php'); require_once('include/cache.php'); define ( 'FRIENDICA_PLATFORM', 'Friendica'); -define ( 'FRIENDICA_VERSION', '2.3.1335' ); +define ( 'FRIENDICA_VERSION', '2.3.1336' ); define ( 'DFRN_PROTOCOL_VERSION', '2.23' ); define ( 'DB_UPDATE_VERSION', 1143 ); diff --git a/include/expire.php b/include/expire.php index 5fa0ec758..755cd2494 100644 --- a/include/expire.php +++ b/include/expire.php @@ -32,7 +32,11 @@ function expire_run($argv, $argc){ // physically remove anything that has been deleted for more than two months $r = q("delete from item where deleted = 1 and changed < UTC_TIMESTAMP() - INTERVAL 60 DAY"); - q("optimize table item"); + + // make this optional as it could have a performance impact on large sites + + if(intval(get_config('system','optimize_items'))) + q("optimize table item"); logger('expire: start'); diff --git a/util/messages.po b/util/messages.po index 9e9ecc4d1..e6376310b 100644 --- a/util/messages.po +++ b/util/messages.po @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: 2.3.1335\n" +"Project-Id-Version: 2.3.1336\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-05-07 10:00-0700\n" +"POT-Creation-Date: 2012-05-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" @@ -158,9 +158,8 @@ msgstr "" #: ../../addon/irc/irc.php:55 ../../addon/blogger/blogger.php:102 #: ../../addon/posterous/posterous.php:90 #: ../../view/theme/cleanzero/config.php:80 -#: ../../view/theme/diabook/theme.php:607 -#: ../../view/theme/diabook/theme.php:642 -#: ../../view/theme/diabook/config.php:107 +#: ../../view/theme/diabook/theme.php:683 +#: ../../view/theme/diabook/config.php:190 #: ../../view/theme/quattro/config.php:52 ../../view/theme/dispy/config.php:70 #: ../../include/conversation.php:555 msgid "Submit" @@ -220,7 +219,7 @@ msgstr "" msgid "link to source" msgstr "" -#: ../../mod/events.php:324 ../../view/theme/diabook/theme.php:66 +#: ../../mod/events.php:324 ../../view/theme/diabook/theme.php:127 #: ../../include/nav.php:52 ../../boot.php:1493 msgid "Events" msgstr "" @@ -353,7 +352,7 @@ msgstr "" #: ../../mod/photos.php:51 ../../mod/photos.php:151 ../../mod/photos.php:879 #: ../../mod/photos.php:950 ../../mod/photos.php:965 ../../mod/photos.php:1382 #: ../../mod/photos.php:1394 ../../addon/communityhome/communityhome.php:110 -#: ../../view/theme/diabook/theme.php:522 +#: ../../view/theme/diabook/theme.php:526 msgid "Contact Photos" msgstr "" @@ -376,7 +375,7 @@ 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/theme.php:523 +#: ../../view/theme/diabook/theme.php:527 msgid "Profile Photos" msgstr "" @@ -398,7 +397,7 @@ msgstr "" #: ../../mod/photos.php:528 ../../mod/like.php:127 ../../mod/tagger.php:70 #: ../../addon/communityhome/communityhome.php:163 -#: ../../view/theme/diabook/theme.php:494 ../../include/text.php:1305 +#: ../../view/theme/diabook/theme.php:498 ../../include/text.php:1305 #: ../../include/diaspora.php:1654 ../../include/conversation.php:53 #: ../../include/conversation.php:126 msgid "photo" @@ -533,8 +532,8 @@ msgid "Share" msgstr "" #: ../../mod/photos.php:1214 ../../mod/editpost.php:104 -#: ../../mod/wallmessage.php:145 ../../mod/message.php:199 -#: ../../mod/message.php:391 ../../include/conversation.php:361 +#: ../../mod/wallmessage.php:145 ../../mod/message.php:206 +#: ../../mod/message.php:398 ../../include/conversation.php:361 #: ../../include/conversation.php:706 ../../include/conversation.php:983 msgid "Please wait" msgstr "" @@ -573,7 +572,7 @@ msgstr "" msgid "Not available." msgstr "" -#: ../../mod/community.php:30 ../../view/theme/diabook/theme.php:68 +#: ../../mod/community.php:30 ../../view/theme/diabook/theme.php:129 #: ../../include/nav.php:101 msgid "Community" msgstr "" @@ -632,7 +631,7 @@ msgid "Edit" msgstr "" #: ../../mod/editpost.php:96 ../../mod/wallmessage.php:143 -#: ../../mod/message.php:197 ../../mod/message.php:389 +#: ../../mod/message.php:204 ../../mod/message.php:396 #: ../../include/conversation.php:965 msgid "Upload photo" msgstr "" @@ -642,7 +641,7 @@ msgid "Attach file" msgstr "" #: ../../mod/editpost.php:98 ../../mod/wallmessage.php:144 -#: ../../mod/message.php:198 ../../mod/message.php:390 +#: ../../mod/message.php:205 ../../mod/message.php:397 #: ../../include/conversation.php:969 msgid "Insert web link" msgstr "" @@ -768,7 +767,7 @@ msgstr "" msgid "Invalid profile URL." msgstr "" -#: ../../mod/dfrn_request.php:476 ../../mod/follow.php:20 +#: ../../mod/dfrn_request.php:476 ../../mod/follow.php:23 msgid "Disallowed profile URL." msgstr "" @@ -1215,7 +1214,7 @@ msgstr "" msgid "Personal" msgstr "" -#: ../../mod/notifications.php:90 ../../view/theme/diabook/theme.php:62 +#: ../../mod/notifications.php:90 ../../view/theme/diabook/theme.php:123 #: ../../include/nav.php:77 ../../include/nav.php:115 msgid "Home" msgstr "" @@ -1656,7 +1655,7 @@ msgstr "" msgid "Edit contact" msgstr "" -#: ../../mod/contacts.php:544 ../../view/theme/diabook/theme.php:64 +#: ../../mod/contacts.php:544 ../../view/theme/diabook/theme.php:125 #: ../../include/nav.php:139 msgid "Contacts" msgstr "" @@ -1776,7 +1775,8 @@ msgid "Remove account" msgstr "" #: ../../mod/settings.php:88 ../../mod/admin.php:735 ../../mod/admin.php:940 -#: ../../addon/mathjax/mathjax.php:36 ../../include/nav.php:137 +#: ../../addon/mathjax/mathjax.php:36 ../../view/theme/diabook/theme.php:700 +#: ../../include/nav.php:137 msgid "Settings" msgstr "" @@ -2397,7 +2397,7 @@ msgstr "" msgid "Please enter a link URL:" msgstr "" -#: ../../mod/wallmessage.php:131 ../../mod/message.php:188 +#: ../../mod/wallmessage.php:131 ../../mod/message.php:195 msgid "Send Private Message" msgstr "" @@ -2408,18 +2408,18 @@ msgid "" "your site allow private mail from unknown senders." msgstr "" -#: ../../mod/wallmessage.php:133 ../../mod/message.php:189 -#: ../../mod/message.php:381 +#: ../../mod/wallmessage.php:133 ../../mod/message.php:196 +#: ../../mod/message.php:388 msgid "To:" msgstr "" -#: ../../mod/wallmessage.php:134 ../../mod/message.php:190 -#: ../../mod/message.php:382 +#: ../../mod/wallmessage.php:134 ../../mod/message.php:197 +#: ../../mod/message.php:389 msgid "Subject:" msgstr "" -#: ../../mod/wallmessage.php:140 ../../mod/message.php:194 -#: ../../mod/message.php:385 ../../mod/invite.php:113 +#: ../../mod/wallmessage.php:140 ../../mod/message.php:201 +#: ../../mod/message.php:392 ../../mod/invite.php:113 msgid "Your message:" msgstr "" @@ -2601,7 +2601,7 @@ msgstr "" msgid "Profile Visibility Editor" msgstr "" -#: ../../mod/profperm.php:103 ../../view/theme/diabook/theme.php:63 +#: ../../mod/profperm.php:103 ../../view/theme/diabook/theme.php:124 #: ../../include/profile_advanced.php:7 ../../include/profile_advanced.php:74 #: ../../include/nav.php:50 ../../boot.php:1478 msgid "Profile" @@ -2787,8 +2787,8 @@ msgstr "" #: ../../addon/facebook/facebook.php:1564 #: ../../addon/communityhome/communityhome.php:158 #: ../../addon/communityhome/communityhome.php:167 -#: ../../view/theme/diabook/theme.php:489 -#: ../../view/theme/diabook/theme.php:498 ../../include/diaspora.php:1654 +#: ../../view/theme/diabook/theme.php:493 +#: ../../view/theme/diabook/theme.php:502 ../../include/diaspora.php:1654 #: ../../include/conversation.php:48 ../../include/conversation.php:57 #: ../../include/conversation.php:121 ../../include/conversation.php:130 msgid "status" @@ -2796,7 +2796,7 @@ msgstr "" #: ../../mod/like.php:144 ../../addon/facebook/facebook.php:1568 #: ../../addon/communityhome/communityhome.php:172 -#: ../../view/theme/diabook/theme.php:503 ../../include/diaspora.php:1670 +#: ../../view/theme/diabook/theme.php:507 ../../include/diaspora.php:1670 #: ../../include/conversation.php:65 #, php-format msgid "%1$s likes %2$s's %3$s" @@ -2817,7 +2817,7 @@ msgstr "" msgid "Access denied." msgstr "" -#: ../../mod/fbrowser.php:23 ../../view/theme/diabook/theme.php:65 +#: ../../mod/fbrowser.php:23 ../../view/theme/diabook/theme.php:126 #: ../../include/nav.php:51 ../../boot.php:1484 msgid "Photos" msgstr "" @@ -2974,55 +2974,55 @@ msgstr "" msgid "Conversation removed." msgstr "" -#: ../../mod/message.php:230 +#: ../../mod/message.php:237 msgid "No messages." msgstr "" -#: ../../mod/message.php:237 +#: ../../mod/message.php:244 #, php-format msgid "Unknown sender - %s" msgstr "" -#: ../../mod/message.php:240 +#: ../../mod/message.php:247 #, php-format msgid "You and %s" msgstr "" -#: ../../mod/message.php:243 +#: ../../mod/message.php:250 #, php-format msgid "%s and You" msgstr "" -#: ../../mod/message.php:253 ../../mod/message.php:374 +#: ../../mod/message.php:260 ../../mod/message.php:381 msgid "Delete conversation" msgstr "" -#: ../../mod/message.php:256 +#: ../../mod/message.php:263 msgid "D, d M Y - g:i A" msgstr "" -#: ../../mod/message.php:258 +#: ../../mod/message.php:265 #, php-format msgid "%d message" msgid_plural "%d messages" msgstr[0] "" msgstr[1] "" -#: ../../mod/message.php:293 +#: ../../mod/message.php:300 msgid "Message not available." msgstr "" -#: ../../mod/message.php:358 +#: ../../mod/message.php:365 msgid "Delete message" msgstr "" -#: ../../mod/message.php:376 +#: ../../mod/message.php:383 msgid "" "No secure communications available. You <strong>may</strong> be able to " "respond from the sender's profile page." msgstr "" -#: ../../mod/message.php:380 +#: ../../mod/message.php:387 msgid "Send Reply" msgstr "" @@ -3577,7 +3577,7 @@ msgstr "" msgid "Log level" msgstr "" -#: ../../mod/admin.php:1121 ../../view/theme/diabook/theme.php:652 +#: ../../mod/admin.php:1121 msgid "Close" msgstr "" @@ -3672,48 +3672,58 @@ msgstr "" msgid "Login failed." msgstr "" -#: ../../mod/follow.php:27 +#: ../../mod/follow.php:30 msgid "Connect URL missing." msgstr "" -#: ../../mod/follow.php:47 +#: ../../mod/follow.php:56 msgid "" "This site is not configured to allow communications with other networks." msgstr "" -#: ../../mod/follow.php:48 ../../mod/follow.php:63 +#: ../../mod/follow.php:57 ../../mod/follow.php:72 msgid "No compatible communication protocols or feeds were discovered." msgstr "" -#: ../../mod/follow.php:61 +#: ../../mod/follow.php:70 msgid "The profile address specified does not provide adequate information." msgstr "" -#: ../../mod/follow.php:65 +#: ../../mod/follow.php:74 msgid "An author or name was not found." msgstr "" -#: ../../mod/follow.php:67 +#: ../../mod/follow.php:76 msgid "No browser URL could be matched to this address." msgstr "" -#: ../../mod/follow.php:74 +#: ../../mod/follow.php:78 +msgid "" +"Unable to match @-style Identity Address with a known protocol or email " +"contact." +msgstr "" + +#: ../../mod/follow.php:79 +msgid "Use mailto: in front of address to force email check." +msgstr "" + +#: ../../mod/follow.php:85 msgid "" "The profile address specified belongs to a network which has been disabled " "on this site." msgstr "" -#: ../../mod/follow.php:79 +#: ../../mod/follow.php:90 msgid "" "Limited profile. This person will be unable to receive direct/personal " "notifications from you." msgstr "" -#: ../../mod/follow.php:149 +#: ../../mod/follow.php:160 msgid "Unable to retrieve contact information." msgstr "" -#: ../../mod/follow.php:195 +#: ../../mod/follow.php:206 msgid "following" msgstr "" @@ -4063,7 +4073,7 @@ msgstr "" msgid "No entries." msgstr "" -#: ../../mod/suggest.php:38 ../../view/theme/diabook/theme.php:550 +#: ../../mod/suggest.php:38 ../../view/theme/diabook/theme.php:554 #: ../../include/contact_widgets.php:34 msgid "Friend Suggestions" msgstr "" @@ -4083,7 +4093,7 @@ msgstr "" msgid "%s [%s]" msgstr "" -#: ../../mod/directory.php:47 ../../view/theme/diabook/theme.php:548 +#: ../../mod/directory.php:47 ../../view/theme/diabook/theme.php:552 msgid "Global Directory" msgstr "" @@ -4668,7 +4678,7 @@ msgid "Latest likes" msgstr "" #: ../../addon/communityhome/communityhome.php:155 -#: ../../view/theme/diabook/theme.php:486 ../../include/text.php:1303 +#: ../../view/theme/diabook/theme.php:490 ../../include/text.php:1303 #: ../../include/conversation.php:45 ../../include/conversation.php:118 msgid "event" msgstr "" @@ -5564,7 +5574,7 @@ msgid "Post to Posterous by default" msgstr "" #: ../../view/theme/cleanzero/config.php:82 -#: ../../view/theme/diabook/config.php:109 +#: ../../view/theme/diabook/config.php:192 #: ../../view/theme/quattro/config.php:54 ../../view/theme/dispy/config.php:72 msgid "Theme settings" msgstr "" @@ -5574,7 +5584,7 @@ msgid "Set resize level for images in posts and comments (width and height)" msgstr "" #: ../../view/theme/cleanzero/config.php:84 -#: ../../view/theme/diabook/config.php:110 +#: ../../view/theme/diabook/config.php:193 #: ../../view/theme/dispy/config.php:73 msgid "Set font-size for posts and comments" msgstr "" @@ -5588,118 +5598,168 @@ msgstr "" msgid "Color scheme" msgstr "" -#: ../../view/theme/diabook/theme.php:62 ../../include/nav.php:49 +#: ../../view/theme/diabook/theme.php:123 ../../include/nav.php:49 #: ../../include/nav.php:115 msgid "Your posts and conversations" msgstr "" -#: ../../view/theme/diabook/theme.php:63 ../../include/nav.php:50 +#: ../../view/theme/diabook/theme.php:124 ../../include/nav.php:50 msgid "Your profile page" msgstr "" -#: ../../view/theme/diabook/theme.php:64 +#: ../../view/theme/diabook/theme.php:125 msgid "Your contacts" msgstr "" -#: ../../view/theme/diabook/theme.php:65 ../../include/nav.php:51 +#: ../../view/theme/diabook/theme.php:126 ../../include/nav.php:51 msgid "Your photos" msgstr "" -#: ../../view/theme/diabook/theme.php:66 ../../include/nav.php:52 +#: ../../view/theme/diabook/theme.php:127 ../../include/nav.php:52 msgid "Your events" msgstr "" -#: ../../view/theme/diabook/theme.php:67 ../../include/nav.php:53 +#: ../../view/theme/diabook/theme.php:128 ../../include/nav.php:53 msgid "Personal notes" msgstr "" -#: ../../view/theme/diabook/theme.php:67 ../../include/nav.php:53 +#: ../../view/theme/diabook/theme.php:128 ../../include/nav.php:53 msgid "Your personal photos" msgstr "" -#: ../../view/theme/diabook/theme.php:69 -#: ../../view/theme/diabook/theme.php:567 +#: ../../view/theme/diabook/theme.php:130 +#: ../../view/theme/diabook/theme.php:571 msgid "Community Pages" msgstr "" -#: ../../view/theme/diabook/theme.php:414 +#: ../../view/theme/diabook/theme.php:418 msgid "Community Profiles" msgstr "" -#: ../../view/theme/diabook/theme.php:435 +#: ../../view/theme/diabook/theme.php:439 msgid "Last users" msgstr "" -#: ../../view/theme/diabook/theme.php:464 +#: ../../view/theme/diabook/theme.php:468 msgid "Last likes" msgstr "" -#: ../../view/theme/diabook/theme.php:509 +#: ../../view/theme/diabook/theme.php:513 msgid "Last photos" msgstr "" -#: ../../view/theme/diabook/theme.php:546 +#: ../../view/theme/diabook/theme.php:550 msgid "Find Friends" msgstr "" -#: ../../view/theme/diabook/theme.php:547 +#: ../../view/theme/diabook/theme.php:551 msgid "Local Directory" msgstr "" -#: ../../view/theme/diabook/theme.php:549 ../../include/contact_widgets.php:35 +#: ../../view/theme/diabook/theme.php:553 ../../include/contact_widgets.php:35 msgid "Similar Interests" msgstr "" -#: ../../view/theme/diabook/theme.php:551 ../../include/contact_widgets.php:37 +#: ../../view/theme/diabook/theme.php:555 ../../include/contact_widgets.php:37 msgid "Invite Friends" msgstr "" -#: ../../view/theme/diabook/theme.php:602 +#: ../../view/theme/diabook/theme.php:606 msgid "Earth Layers" msgstr "" -#: ../../view/theme/diabook/theme.php:608 -#: ../../view/theme/diabook/config.php:115 +#: ../../view/theme/diabook/theme.php:611 +#: ../../view/theme/diabook/config.php:198 msgid "Set zoomfactor for Earth Layer" msgstr "" -#: ../../view/theme/diabook/theme.php:609 -#: ../../view/theme/diabook/config.php:116 +#: ../../view/theme/diabook/theme.php:612 +#: ../../view/theme/diabook/config.php:199 msgid "Set longitude (X) for Earth Layer" msgstr "" -#: ../../view/theme/diabook/theme.php:610 -#: ../../view/theme/diabook/config.php:117 +#: ../../view/theme/diabook/theme.php:613 +#: ../../view/theme/diabook/config.php:200 msgid "Set latitude (Y) for Earth Layer" msgstr "" -#: ../../view/theme/diabook/theme.php:625 +#: ../../view/theme/diabook/theme.php:626 msgid "Help or @NewHere ?" msgstr "" -#: ../../view/theme/diabook/theme.php:632 +#: ../../view/theme/diabook/theme.php:633 msgid "Connect Services" msgstr "" -#: ../../view/theme/diabook/theme.php:639 +#: ../../view/theme/diabook/theme.php:640 msgid "Last Tweets" msgstr "" #: ../../view/theme/diabook/theme.php:643 -#: ../../view/theme/diabook/config.php:114 +#: ../../view/theme/diabook/config.php:197 msgid "Set twitter search term" msgstr "" -#: ../../view/theme/diabook/config.php:111 +#: ../../view/theme/diabook/theme.php:673 +#: ../../view/theme/diabook/config.php:201 +msgid "Show \"Cummunity Pages\" at right-hand coloumn?" +msgstr "" + +#: ../../view/theme/diabook/theme.php:674 +#: ../../view/theme/diabook/config.php:202 +msgid "Show \"Earth Layers\" at right-hand coloumn?" +msgstr "" + +#: ../../view/theme/diabook/theme.php:675 +#: ../../view/theme/diabook/config.php:203 +msgid "Show \"Cummunity Profiles\" at right-hand coloumn?" +msgstr "" + +#: ../../view/theme/diabook/theme.php:676 +#: ../../view/theme/diabook/config.php:204 +msgid "Show \"Help or @NewHere\" at right-hand coloumn?" +msgstr "" + +#: ../../view/theme/diabook/theme.php:677 +#: ../../view/theme/diabook/config.php:205 +msgid "Show \"Connect Services\" at right-hand coloumn?" +msgstr "" + +#: ../../view/theme/diabook/theme.php:678 +#: ../../view/theme/diabook/config.php:206 +msgid "Show \"Find Friends\" at right-hand coloumn?" +msgstr "" + +#: ../../view/theme/diabook/theme.php:679 +#: ../../view/theme/diabook/config.php:207 +msgid "Show \"Last Tweets\" at right-hand coloumn?" +msgstr "" + +#: ../../view/theme/diabook/theme.php:680 +#: ../../view/theme/diabook/config.php:208 +msgid "Show \"Last Users\" at right-hand coloumn?" +msgstr "" + +#: ../../view/theme/diabook/theme.php:681 +#: ../../view/theme/diabook/config.php:209 +msgid "Show \"Last Photos\" at right-hand coloumn?" +msgstr "" + +#: ../../view/theme/diabook/theme.php:682 +#: ../../view/theme/diabook/config.php:210 +msgid "Show \"Last Likes\" at right-hand coloumn?" +msgstr "" + +#: ../../view/theme/diabook/config.php:194 #: ../../view/theme/dispy/config.php:74 msgid "Set line-height for posts and comments" msgstr "" -#: ../../view/theme/diabook/config.php:112 +#: ../../view/theme/diabook/config.php:195 msgid "Set resolution for middle column" msgstr "" -#: ../../view/theme/diabook/config.php:113 +#: ../../view/theme/diabook/config.php:196 msgid "Set color scheme" msgstr "" @@ -6108,11 +6168,11 @@ msgstr "" msgid "Finishes:" msgstr "" -#: ../../include/delivery.php:445 ../../include/notifier.php:652 +#: ../../include/delivery.php:452 ../../include/notifier.php:652 msgid "(no subject)" msgstr "" -#: ../../include/delivery.php:452 ../../include/enotify.php:23 +#: ../../include/delivery.php:459 ../../include/enotify.php:23 #: ../../include/notifier.php:659 msgid "noreply" msgstr "" @@ -6586,7 +6646,7 @@ msgstr "" msgid "%1$d %2$s ago" msgstr "" -#: ../../include/onepoll.php:402 +#: ../../include/onepoll.php:406 msgid "From: " msgstr "" |