From 88c77083e679ad06c58721df6d5766b1492f4c43 Mon Sep 17 00:00:00 2001 From: friendica Date: Mon, 30 Apr 2012 17:17:19 -0700 Subject: [PATCH] rev update --- boot.php | 2 +- util/messages.po | 863 +++++++++++++++++++++++++++-------------------- 2 files changed, 503 insertions(+), 362 deletions(-) diff --git a/boot.php b/boot.php index 016adfd44..55cac73ac 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.1327' ); +define ( 'FRIENDICA_VERSION', '2.3.1328' ); define ( 'DFRN_PROTOCOL_VERSION', '2.23' ); define ( 'DB_UPDATE_VERSION', 1140 ); diff --git a/util/messages.po b/util/messages.po index 535283b0b..535f1de8b 100644 --- a/util/messages.po +++ b/util/messages.po @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: 2.3.1327\n" +"Project-Id-Version: 2.3.1328\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-04-29 10:00-0700\n" +"POT-Creation-Date: 2012-04-30 10:00-0700\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -55,7 +55,7 @@ msgstr "" #: ../../mod/profiles.php:7 ../../mod/profiles.php:365 #: ../../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:484 ../../include/items.php:3171 +#: ../../addon/facebook/facebook.php:485 ../../include/items.php:3187 #: ../../index.php:309 msgid "Permission denied." msgstr "" @@ -86,7 +86,7 @@ msgid "Return to contact editor" msgstr "" #: ../../mod/crepair.php:148 ../../mod/settings.php:539 -#: ../../mod/settings.php:565 ../../mod/admin.php:575 ../../mod/admin.php:584 +#: ../../mod/settings.php:565 ../../mod/admin.php:638 ../../mod/admin.php:647 msgid "Name" msgstr "" @@ -127,15 +127,15 @@ msgstr "" #: ../../mod/photos.php:1193 ../../mod/photos.php:1233 #: ../../mod/photos.php:1273 ../../mod/photos.php:1304 #: ../../mod/install.php:251 ../../mod/install.php:289 -#: ../../mod/localtime.php:45 ../../mod/contacts.php:318 +#: ../../mod/localtime.php:45 ../../mod/contacts.php:322 #: ../../mod/settings.php:537 ../../mod/settings.php:683 #: ../../mod/settings.php:744 ../../mod/settings.php:935 -#: ../../mod/manage.php:109 ../../mod/group.php:85 ../../mod/admin.php:393 -#: ../../mod/admin.php:572 ../../mod/admin.php:708 ../../mod/admin.php:907 -#: ../../mod/admin.php:995 ../../mod/profiles.php:534 ../../mod/invite.php:119 -#: ../../addon/facebook/facebook.php:574 ../../addon/yourls/yourls.php:76 -#: ../../addon/ljpost/ljpost.php:93 ../../addon/nsfw/nsfw.php:57 -#: ../../addon/planets/planets.php:158 +#: ../../mod/manage.php:109 ../../mod/group.php:85 ../../mod/admin.php:400 +#: ../../mod/admin.php:635 ../../mod/admin.php:771 ../../mod/admin.php:970 +#: ../../mod/admin.php:1057 ../../mod/profiles.php:534 +#: ../../mod/invite.php:119 ../../addon/facebook/facebook.php:575 +#: ../../addon/yourls/yourls.php:76 ../../addon/ljpost/ljpost.php:93 +#: ../../addon/nsfw/nsfw.php:57 ../../addon/planets/planets.php:158 #: ../../addon/uhremotestorage/uhremotestorage.php:89 #: ../../addon/randplace/randplace.php:177 ../../addon/dwpost/dwpost.php:93 #: ../../addon/drpost/drpost.php:110 ../../addon/geonames/geonames.php:187 @@ -220,7 +220,7 @@ msgid "link to source" msgstr "" #: ../../mod/events.php:296 ../../view/theme/diabook/theme.php:255 -#: ../../include/nav.php:52 ../../boot.php:1487 +#: ../../include/nav.php:52 ../../boot.php:1493 msgid "Events" msgstr "" @@ -270,7 +270,7 @@ msgid "Description:" msgstr "" #: ../../mod/events.php:395 ../../include/event.php:37 -#: ../../include/bb2diaspora.php:260 ../../boot.php:1089 +#: ../../include/bb2diaspora.php:260 ../../boot.php:1092 msgid "Location:" msgstr "" @@ -279,7 +279,7 @@ msgid "Share this event" msgstr "" #: ../../mod/tagrm.php:11 ../../mod/tagrm.php:94 -#: ../../mod/dfrn_request.php:817 ../../mod/settings.php:538 +#: ../../mod/dfrn_request.php:818 ../../mod/settings.php:538 #: ../../mod/settings.php:564 ../../addon/js_upload/js_upload.php:45 msgid "Cancel" msgstr "" @@ -323,7 +323,7 @@ msgid "" "and/or create new posts for you?" msgstr "" -#: ../../mod/api.php:105 ../../mod/dfrn_request.php:805 +#: ../../mod/api.php:105 ../../mod/dfrn_request.php:806 #: ../../mod/settings.php:849 ../../mod/settings.php:855 #: ../../mod/settings.php:863 ../../mod/settings.php:867 #: ../../mod/settings.php:872 ../../mod/settings.php:878 @@ -334,7 +334,7 @@ msgstr "" msgid "Yes" msgstr "" -#: ../../mod/api.php:106 ../../mod/dfrn_request.php:806 +#: ../../mod/api.php:106 ../../mod/dfrn_request.php:807 #: ../../mod/settings.php:849 ../../mod/settings.php:855 #: ../../mod/settings.php:863 ../../mod/settings.php:867 #: ../../mod/settings.php:872 ../../mod/settings.php:878 @@ -345,7 +345,7 @@ msgstr "" msgid "No" msgstr "" -#: ../../mod/photos.php:43 +#: ../../mod/photos.php:43 ../../boot.php:1487 msgid "Photo Albums" msgstr "" @@ -426,7 +426,7 @@ msgid "Image upload failed." msgstr "" #: ../../mod/photos.php:759 ../../mod/community.php:16 -#: ../../mod/dfrn_request.php:731 ../../mod/viewcontacts.php:17 +#: ../../mod/dfrn_request.php:732 ../../mod/viewcontacts.php:17 #: ../../mod/display.php:7 ../../mod/search.php:71 ../../mod/directory.php:29 msgid "Public access denied." msgstr "" @@ -545,7 +545,7 @@ msgstr "" #: ../../mod/photos.php:1232 ../../mod/photos.php:1272 #: ../../mod/photos.php:1303 ../../include/conversation.php:554 -#: ../../boot.php:503 +#: ../../boot.php:506 msgid "Comment" msgstr "" @@ -555,7 +555,7 @@ msgid "Preview" msgstr "" #: ../../mod/photos.php:1331 ../../mod/settings.php:600 -#: ../../mod/settings.php:681 ../../mod/group.php:168 ../../mod/admin.php:579 +#: ../../mod/settings.php:681 ../../mod/group.php:168 ../../mod/admin.php:642 #: ../../include/conversation.php:318 ../../include/conversation.php:584 msgid "Delete" msgstr "" @@ -803,75 +803,75 @@ msgstr "" msgid "Confirm" msgstr "" -#: ../../mod/dfrn_request.php:688 ../../include/items.php:2691 +#: ../../mod/dfrn_request.php:688 ../../include/items.php:2707 msgid "[Name Withheld]" msgstr "" -#: ../../mod/dfrn_request.php:780 +#: ../../mod/dfrn_request.php:781 msgid "" "Please enter your 'Identity Address' from one of the following supported " "communications networks:" msgstr "" -#: ../../mod/dfrn_request.php:796 +#: ../../mod/dfrn_request.php:797 msgid "Connect as an email follower (Coming soon)" msgstr "" -#: ../../mod/dfrn_request.php:798 +#: ../../mod/dfrn_request.php:799 msgid "" "If you are not yet a member of the free social web, follow this link to find a public Friendica site " "and join us today." msgstr "" -#: ../../mod/dfrn_request.php:801 +#: ../../mod/dfrn_request.php:802 msgid "Friend/Connection Request" msgstr "" -#: ../../mod/dfrn_request.php:802 +#: ../../mod/dfrn_request.php:803 msgid "" "Examples: jojo@demo.friendica.com, http://demo.friendica.com/profile/jojo, " "testuser@identi.ca" msgstr "" -#: ../../mod/dfrn_request.php:803 +#: ../../mod/dfrn_request.php:804 msgid "Please answer the following:" msgstr "" -#: ../../mod/dfrn_request.php:804 +#: ../../mod/dfrn_request.php:805 #, php-format msgid "Does %s know you?" msgstr "" -#: ../../mod/dfrn_request.php:807 +#: ../../mod/dfrn_request.php:808 msgid "Add a personal note:" msgstr "" -#: ../../mod/dfrn_request.php:809 ../../include/contact_selectors.php:76 +#: ../../mod/dfrn_request.php:810 ../../include/contact_selectors.php:76 msgid "Friendica" msgstr "" -#: ../../mod/dfrn_request.php:810 +#: ../../mod/dfrn_request.php:811 msgid "StatusNet/Federated Social Web" msgstr "" -#: ../../mod/dfrn_request.php:811 ../../mod/settings.php:634 +#: ../../mod/dfrn_request.php:812 ../../mod/settings.php:634 #: ../../include/contact_selectors.php:80 msgid "Diaspora" msgstr "" -#: ../../mod/dfrn_request.php:812 +#: ../../mod/dfrn_request.php:813 #, php-format msgid "" " - please do not use this form. Instead, enter %s into your Diaspora search " "bar." msgstr "" -#: ../../mod/dfrn_request.php:813 +#: ../../mod/dfrn_request.php:814 msgid "Your Identity Address:" msgstr "" -#: ../../mod/dfrn_request.php:816 +#: ../../mod/dfrn_request.php:817 msgid "Submit Request" msgstr "" @@ -1166,7 +1166,7 @@ msgid "is interested in:" msgstr "" #: ../../mod/match.php:58 ../../mod/suggest.php:59 -#: ../../include/contact_widgets.php:9 ../../boot.php:1033 +#: ../../include/contact_widgets.php:9 ../../boot.php:1036 msgid "Connect" msgstr "" @@ -1197,8 +1197,8 @@ msgid "Discard" msgstr "" #: ../../mod/notifications.php:51 ../../mod/notifications.php:160 -#: ../../mod/notifications.php:206 ../../mod/contacts.php:295 -#: ../../mod/contacts.php:344 +#: ../../mod/notifications.php:206 ../../mod/contacts.php:296 +#: ../../mod/contacts.php:348 msgid "Ignore" msgstr "" @@ -1210,7 +1210,7 @@ msgstr "" msgid "Network" msgstr "" -#: ../../mod/notifications.php:85 ../../mod/network.php:182 +#: ../../mod/notifications.php:85 ../../mod/network.php:184 msgid "Personal" msgstr "" @@ -1250,7 +1250,7 @@ msgid "suggested by %s" msgstr "" #: ../../mod/notifications.php:153 ../../mod/notifications.php:200 -#: ../../mod/contacts.php:350 +#: ../../mod/contacts.php:354 msgid "Hide this contact from others" msgstr "" @@ -1263,7 +1263,7 @@ msgid "if applicable" msgstr "" #: ../../mod/notifications.php:157 ../../mod/notifications.php:204 -#: ../../mod/admin.php:577 +#: ../../mod/admin.php:640 msgid "Approve" msgstr "" @@ -1463,168 +1463,212 @@ msgstr[1] "" msgid "View all contacts" msgstr "" -#: ../../mod/contacts.php:290 ../../mod/contacts.php:343 -#: ../../mod/admin.php:581 +#: ../../mod/contacts.php:290 ../../mod/contacts.php:347 +#: ../../mod/admin.php:644 msgid "Unblock" msgstr "" -#: ../../mod/contacts.php:290 ../../mod/contacts.php:343 -#: ../../mod/admin.php:580 +#: ../../mod/contacts.php:290 ../../mod/contacts.php:347 +#: ../../mod/admin.php:643 msgid "Block" msgstr "" -#: ../../mod/contacts.php:295 ../../mod/contacts.php:344 +#: ../../mod/contacts.php:293 +msgid "Toggle Blocked status" +msgstr "" + +#: ../../mod/contacts.php:296 ../../mod/contacts.php:348 msgid "Unignore" msgstr "" -#: ../../mod/contacts.php:301 +#: ../../mod/contacts.php:299 +msgid "Toggle Ignored status" +msgstr "" + +#: ../../mod/contacts.php:303 msgid "Unarchive" msgstr "" -#: ../../mod/contacts.php:301 +#: ../../mod/contacts.php:303 msgid "Archive" msgstr "" #: ../../mod/contacts.php:306 +msgid "Toggle Archive status" +msgstr "" + +#: ../../mod/contacts.php:309 msgid "Repair" msgstr "" -#: ../../mod/contacts.php:316 -msgid "Contact Editor" -msgstr "" - -#: ../../mod/contacts.php:319 -msgid "Profile Visibility" +#: ../../mod/contacts.php:312 +msgid "Advanced Contact Settings" msgstr "" #: ../../mod/contacts.php:320 +msgid "Contact Editor" +msgstr "" + +#: ../../mod/contacts.php:323 +msgid "Profile Visibility" +msgstr "" + +#: ../../mod/contacts.php:324 #, php-format msgid "" "Please choose the profile you would like to display to %s when viewing your " "profile securely." msgstr "" -#: ../../mod/contacts.php:321 +#: ../../mod/contacts.php:325 msgid "Contact Information / Notes" msgstr "" -#: ../../mod/contacts.php:322 +#: ../../mod/contacts.php:326 msgid "Edit contact notes" msgstr "" -#: ../../mod/contacts.php:327 ../../mod/contacts.php:511 +#: ../../mod/contacts.php:331 ../../mod/contacts.php:522 #: ../../mod/viewcontacts.php:62 ../../mod/nogroup.php:40 #, php-format msgid "Visit %s's profile [%s]" msgstr "" -#: ../../mod/contacts.php:328 +#: ../../mod/contacts.php:332 msgid "Block/Unblock contact" msgstr "" -#: ../../mod/contacts.php:329 +#: ../../mod/contacts.php:333 msgid "Ignore contact" msgstr "" -#: ../../mod/contacts.php:330 +#: ../../mod/contacts.php:334 msgid "Repair URL settings" msgstr "" -#: ../../mod/contacts.php:331 +#: ../../mod/contacts.php:335 msgid "View conversations" msgstr "" -#: ../../mod/contacts.php:333 +#: ../../mod/contacts.php:337 msgid "Delete contact" msgstr "" -#: ../../mod/contacts.php:337 +#: ../../mod/contacts.php:341 msgid "Last update:" msgstr "" -#: ../../mod/contacts.php:338 +#: ../../mod/contacts.php:342 msgid "Update public posts" msgstr "" -#: ../../mod/contacts.php:340 ../../mod/admin.php:1053 +#: ../../mod/contacts.php:344 ../../mod/admin.php:1115 msgid "Update now" msgstr "" -#: ../../mod/contacts.php:347 +#: ../../mod/contacts.php:351 msgid "Currently blocked" msgstr "" -#: ../../mod/contacts.php:348 +#: ../../mod/contacts.php:352 msgid "Currently ignored" msgstr "" -#: ../../mod/contacts.php:349 +#: ../../mod/contacts.php:353 msgid "Currently archived" msgstr "" -#: ../../mod/contacts.php:350 +#: ../../mod/contacts.php:354 msgid "" "Replies/likes to your public posts may still be visible" msgstr "" -#: ../../mod/contacts.php:403 +#: ../../mod/contacts.php:407 msgid "Suggestions" msgstr "" -#: ../../mod/contacts.php:408 ../../mod/group.php:191 +#: ../../mod/contacts.php:410 +msgid "Suggest potential friends" +msgstr "" + +#: ../../mod/contacts.php:413 ../../mod/group.php:191 msgid "All Contacts" msgstr "" -#: ../../mod/contacts.php:413 -msgid "Unblocked" +#: ../../mod/contacts.php:416 +msgid "Show all contacts" msgstr "" #: ../../mod/contacts.php:419 +msgid "Unblocked" +msgstr "" + +#: ../../mod/contacts.php:422 +msgid "Only show unblocked contacts" +msgstr "" + +#: ../../mod/contacts.php:426 msgid "Blocked" msgstr "" -#: ../../mod/contacts.php:425 +#: ../../mod/contacts.php:429 +msgid "Only show blocked contacts" +msgstr "" + +#: ../../mod/contacts.php:433 msgid "Ignored" msgstr "" -#: ../../mod/contacts.php:431 +#: ../../mod/contacts.php:436 +msgid "Only show ignored contacts" +msgstr "" + +#: ../../mod/contacts.php:440 msgid "Archived" msgstr "" -#: ../../mod/contacts.php:437 +#: ../../mod/contacts.php:443 +msgid "Only show archived contacts" +msgstr "" + +#: ../../mod/contacts.php:447 msgid "Hidden" msgstr "" -#: ../../mod/contacts.php:487 +#: ../../mod/contacts.php:450 +msgid "Only show hidden contacts" +msgstr "" + +#: ../../mod/contacts.php:498 msgid "Mutual Friendship" msgstr "" -#: ../../mod/contacts.php:491 +#: ../../mod/contacts.php:502 msgid "is a fan of yours" msgstr "" -#: ../../mod/contacts.php:495 +#: ../../mod/contacts.php:506 msgid "you are a fan of" msgstr "" -#: ../../mod/contacts.php:512 ../../mod/nogroup.php:41 +#: ../../mod/contacts.php:523 ../../mod/nogroup.php:41 msgid "Edit contact" msgstr "" -#: ../../mod/contacts.php:533 ../../view/theme/diabook/theme.php:253 +#: ../../mod/contacts.php:544 ../../view/theme/diabook/theme.php:253 #: ../../include/nav.php:139 msgid "Contacts" msgstr "" -#: ../../mod/contacts.php:537 +#: ../../mod/contacts.php:548 msgid "Search your contacts" msgstr "" -#: ../../mod/contacts.php:538 ../../mod/directory.php:57 +#: ../../mod/contacts.php:549 ../../mod/directory.php:57 msgid "Finding: " msgstr "" -#: ../../mod/contacts.php:539 ../../mod/directory.php:59 +#: ../../mod/contacts.php:550 ../../mod/directory.php:59 #: ../../include/contact_widgets.php:33 msgid "Find" msgstr "" @@ -1644,11 +1688,11 @@ msgstr "" #: ../../mod/lostpass.php:45 ../../mod/lostpass.php:107 #: ../../mod/register.php:388 ../../mod/register.php:442 -#: ../../mod/regmod.php:54 ../../mod/dfrn_confirm.php:732 -#: ../../addon/facebook/facebook.php:650 -#: ../../addon/facebook/facebook.php:1139 -#: ../../addon/testdrive/testdrive.php:58 ../../include/items.php:2700 -#: ../../boot.php:683 +#: ../../mod/regmod.php:54 ../../mod/dfrn_confirm.php:756 +#: ../../addon/facebook/facebook.php:658 +#: ../../addon/facebook/facebook.php:1148 +#: ../../addon/testdrive/testdrive.php:58 ../../include/items.php:2716 +#: ../../boot.php:686 msgid "Administrator" msgstr "" @@ -1658,7 +1702,7 @@ msgid "" "Password reset failed." msgstr "" -#: ../../mod/lostpass.php:83 ../../boot.php:815 +#: ../../mod/lostpass.php:83 ../../boot.php:818 msgid "Password Reset" msgstr "" @@ -1730,7 +1774,7 @@ msgstr "" msgid "Remove account" msgstr "" -#: ../../mod/settings.php:88 ../../mod/admin.php:667 ../../mod/admin.php:872 +#: ../../mod/settings.php:88 ../../mod/admin.php:730 ../../mod/admin.php:935 #: ../../addon/mathjax/mathjax.php:36 ../../include/nav.php:137 msgid "Settings" msgstr "" @@ -1740,7 +1784,6 @@ msgid "Missing some important data!" msgstr "" #: ../../mod/settings.php:134 ../../mod/settings.php:563 -#: ../../mod/admin.php:97 msgid "Update" msgstr "" @@ -1784,7 +1827,7 @@ msgstr "" msgid " Cannot change to that email." msgstr "" -#: ../../mod/settings.php:466 ../../addon/facebook/facebook.php:469 +#: ../../mod/settings.php:466 ../../addon/facebook/facebook.php:470 #: ../../addon/impressum/impressum.php:77 #: ../../addon/openstreetmap/openstreetmap.php:80 #: ../../addon/mathjax/mathjax.php:66 ../../addon/piwik/piwik.php:105 @@ -1958,7 +2001,7 @@ msgstr "" msgid "Don't show emoticons" msgstr "" -#: ../../mod/settings.php:816 ../../mod/admin.php:173 ../../mod/admin.php:553 +#: ../../mod/settings.php:816 ../../mod/admin.php:180 ../../mod/admin.php:616 msgid "Normal Account" msgstr "" @@ -1966,7 +2009,7 @@ msgstr "" msgid "This account is a normal personal profile" msgstr "" -#: ../../mod/settings.php:820 ../../mod/admin.php:174 ../../mod/admin.php:554 +#: ../../mod/settings.php:820 ../../mod/admin.php:181 ../../mod/admin.php:617 msgid "Soapbox Account" msgstr "" @@ -1974,7 +2017,7 @@ msgstr "" msgid "Automatically approve all connection/friend requests as read-only fans" msgstr "" -#: ../../mod/settings.php:824 ../../mod/admin.php:175 ../../mod/admin.php:555 +#: ../../mod/settings.php:824 ../../mod/admin.php:182 ../../mod/admin.php:618 msgid "Community/Celebrity Account" msgstr "" @@ -1982,7 +2025,7 @@ msgstr "" msgid "Automatically approve all connection/friend requests as read-write fans" msgstr "" -#: ../../mod/settings.php:828 ../../mod/admin.php:176 ../../mod/admin.php:556 +#: ../../mod/settings.php:828 ../../mod/admin.php:183 ../../mod/admin.php:619 msgid "Automatic Friend Account" msgstr "" @@ -2228,23 +2271,47 @@ msgstr "" msgid "Commented Order" msgstr "" -#: ../../mod/network.php:176 +#: ../../mod/network.php:174 +msgid "Sort by Comment Date" +msgstr "" + +#: ../../mod/network.php:177 msgid "Posted Order" msgstr "" +#: ../../mod/network.php:180 +msgid "Sort by Post Date" +msgstr "" + #: ../../mod/network.php:187 +msgid "Posts that mention or involve you" +msgstr "" + +#: ../../mod/network.php:190 msgid "New" msgstr "" -#: ../../mod/network.php:192 +#: ../../mod/network.php:193 +msgid "Activity Stream - by date" +msgstr "" + +#: ../../mod/network.php:196 msgid "Starred" msgstr "" -#: ../../mod/network.php:197 +#: ../../mod/network.php:199 +msgid "Favourite Posts" +msgstr "" + +#: ../../mod/network.php:202 msgid "Shared Links" msgstr "" -#: ../../mod/network.php:274 +#: ../../mod/network.php:205 +msgid "Interesting Links" +msgstr "" + +#: ../../mod/network.php:281 #, php-format msgid "Warning: This group contains %s member from an insecure network." msgid_plural "" @@ -2252,40 +2319,40 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: ../../mod/network.php:277 +#: ../../mod/network.php:284 msgid "Private messages to this group are at risk of public disclosure." msgstr "" -#: ../../mod/network.php:322 +#: ../../mod/network.php:329 msgid "No such group" msgstr "" -#: ../../mod/network.php:333 +#: ../../mod/network.php:340 msgid "Group is empty" msgstr "" -#: ../../mod/network.php:337 +#: ../../mod/network.php:344 msgid "Group: " msgstr "" -#: ../../mod/network.php:347 +#: ../../mod/network.php:354 msgid "Contact: " msgstr "" -#: ../../mod/network.php:349 +#: ../../mod/network.php:356 msgid "Private messages to this person are at risk of public disclosure." msgstr "" -#: ../../mod/network.php:354 +#: ../../mod/network.php:361 msgid "Invalid contact." msgstr "" -#: ../../mod/notes.php:44 ../../boot.php:1492 +#: ../../mod/notes.php:44 ../../boot.php:1499 msgid "Personal Notes" msgstr "" #: ../../mod/notes.php:63 ../../mod/filer.php:30 -#: ../../addon/facebook/facebook.php:717 +#: ../../addon/facebook/facebook.php:726 #: ../../addon/privacy_image_cache/privacy_image_cache.php:147 #: ../../include/text.php:652 msgid "Save" @@ -2531,7 +2598,7 @@ msgstr "" #: ../../mod/profperm.php:103 ../../view/theme/diabook/theme.php:252 #: ../../include/profile_advanced.php:7 ../../include/profile_advanced.php:74 -#: ../../include/nav.php:50 ../../boot.php:1474 +#: ../../include/nav.php:50 ../../boot.php:1478 msgid "Profile" msgstr "" @@ -2680,7 +2747,7 @@ msgstr "" msgid "Your invitation ID: " msgstr "" -#: ../../mod/register.php:553 ../../mod/admin.php:394 +#: ../../mod/register.php:553 ../../mod/admin.php:401 msgid "Registration" msgstr "" @@ -2703,7 +2770,7 @@ msgstr "" msgid "Choose a nickname: " msgstr "" -#: ../../mod/register.php:567 ../../include/nav.php:81 ../../boot.php:781 +#: ../../mod/register.php:567 ../../include/nav.php:81 ../../boot.php:784 msgid "Register" msgstr "" @@ -2712,7 +2779,7 @@ msgid "People Search" msgstr "" #: ../../mod/like.php:127 ../../mod/tagger.php:70 -#: ../../addon/facebook/facebook.php:1533 +#: ../../addon/facebook/facebook.php:1542 #: ../../addon/communityhome/communityhome.php:158 #: ../../addon/communityhome/communityhome.php:167 #: ../../view/theme/diabook/theme.php:102 @@ -2722,7 +2789,7 @@ msgstr "" msgid "status" msgstr "" -#: ../../mod/like.php:144 ../../addon/facebook/facebook.php:1537 +#: ../../mod/like.php:144 ../../addon/facebook/facebook.php:1546 #: ../../addon/communityhome/communityhome.php:172 #: ../../view/theme/diabook/theme.php:116 ../../include/diaspora.php:1670 #: ../../include/conversation.php:65 @@ -2735,9 +2802,9 @@ msgstr "" msgid "%1$s doesn't like %2$s's %3$s" msgstr "" -#: ../../mod/notice.php:15 ../../mod/viewsrc.php:15 ../../mod/admin.php:149 -#: ../../mod/admin.php:616 ../../mod/admin.php:815 ../../mod/display.php:37 -#: ../../mod/display.php:142 ../../include/items.php:3083 +#: ../../mod/notice.php:15 ../../mod/viewsrc.php:15 ../../mod/admin.php:156 +#: ../../mod/admin.php:679 ../../mod/admin.php:878 ../../mod/display.php:37 +#: ../../mod/display.php:142 ../../include/items.php:3099 msgid "Item not found." msgstr "" @@ -2746,7 +2813,7 @@ msgid "Access denied." msgstr "" #: ../../mod/fbrowser.php:23 ../../view/theme/diabook/theme.php:254 -#: ../../include/nav.php:51 ../../boot.php:1479 +#: ../../include/nav.php:51 ../../boot.php:1484 msgid "Photos" msgstr "" @@ -2967,492 +3034,545 @@ msgstr "" msgid "Theme settings updated." msgstr "" -#: ../../mod/admin.php:93 ../../mod/admin.php:392 +#: ../../mod/admin.php:96 ../../mod/admin.php:399 msgid "Site" msgstr "" -#: ../../mod/admin.php:94 ../../mod/admin.php:571 ../../mod/admin.php:583 +#: ../../mod/admin.php:97 ../../mod/admin.php:634 ../../mod/admin.php:646 msgid "Users" msgstr "" -#: ../../mod/admin.php:95 ../../mod/admin.php:665 ../../mod/admin.php:707 +#: ../../mod/admin.php:98 ../../mod/admin.php:728 ../../mod/admin.php:770 msgid "Plugins" msgstr "" -#: ../../mod/admin.php:96 ../../mod/admin.php:870 ../../mod/admin.php:906 +#: ../../mod/admin.php:99 ../../mod/admin.php:933 ../../mod/admin.php:969 msgid "Themes" msgstr "" -#: ../../mod/admin.php:111 ../../mod/admin.php:994 +#: ../../mod/admin.php:100 +msgid "DB updates" +msgstr "" + +#: ../../mod/admin.php:101 +msgid "Software Update" +msgstr "" + +#: ../../mod/admin.php:115 ../../mod/admin.php:1056 msgid "Logs" msgstr "" -#: ../../mod/admin.php:116 +#: ../../mod/admin.php:120 msgid "User registrations waiting for confirmation" msgstr "" -#: ../../mod/admin.php:188 ../../mod/admin.php:391 ../../mod/admin.php:570 -#: ../../mod/admin.php:664 ../../mod/admin.php:706 ../../mod/admin.php:869 -#: ../../mod/admin.php:905 ../../mod/admin.php:993 +#: ../../mod/admin.php:195 ../../mod/admin.php:398 ../../mod/admin.php:633 +#: ../../mod/admin.php:727 ../../mod/admin.php:769 ../../mod/admin.php:932 +#: ../../mod/admin.php:968 ../../mod/admin.php:1055 msgid "Administration" msgstr "" -#: ../../mod/admin.php:189 +#: ../../mod/admin.php:196 msgid "Summary" msgstr "" -#: ../../mod/admin.php:190 +#: ../../mod/admin.php:197 msgid "Registered users" msgstr "" -#: ../../mod/admin.php:192 +#: ../../mod/admin.php:199 msgid "Pending registrations" msgstr "" -#: ../../mod/admin.php:193 +#: ../../mod/admin.php:200 msgid "Version" msgstr "" -#: ../../mod/admin.php:195 +#: ../../mod/admin.php:202 msgid "Active plugins" msgstr "" -#: ../../mod/admin.php:330 +#: ../../mod/admin.php:337 msgid "Site settings updated." msgstr "" -#: ../../mod/admin.php:378 +#: ../../mod/admin.php:385 msgid "Closed" msgstr "" -#: ../../mod/admin.php:379 +#: ../../mod/admin.php:386 msgid "Requires approval" msgstr "" -#: ../../mod/admin.php:380 +#: ../../mod/admin.php:387 msgid "Open" msgstr "" -#: ../../mod/admin.php:384 +#: ../../mod/admin.php:391 msgid "No SSL policy, links will track page SSL state" msgstr "" -#: ../../mod/admin.php:385 +#: ../../mod/admin.php:392 msgid "Force all links to use SSL" msgstr "" -#: ../../mod/admin.php:386 +#: ../../mod/admin.php:393 msgid "Self-signed certificate, use SSL for local links only (discouraged)" msgstr "" -#: ../../mod/admin.php:395 +#: ../../mod/admin.php:402 msgid "File upload" msgstr "" -#: ../../mod/admin.php:396 +#: ../../mod/admin.php:403 msgid "Policies" msgstr "" -#: ../../mod/admin.php:397 +#: ../../mod/admin.php:404 msgid "Advanced" msgstr "" -#: ../../mod/admin.php:401 ../../addon/statusnet/statusnet.php:544 +#: ../../mod/admin.php:408 ../../addon/statusnet/statusnet.php:544 msgid "Site name" msgstr "" -#: ../../mod/admin.php:402 +#: ../../mod/admin.php:409 msgid "Banner/Logo" msgstr "" -#: ../../mod/admin.php:403 +#: ../../mod/admin.php:410 msgid "System language" msgstr "" -#: ../../mod/admin.php:404 +#: ../../mod/admin.php:411 msgid "System theme" msgstr "" -#: ../../mod/admin.php:404 +#: ../../mod/admin.php:411 msgid "" "Default system theme - may be over-ridden by user profiles - change theme settings" msgstr "" -#: ../../mod/admin.php:405 +#: ../../mod/admin.php:412 msgid "SSL link policy" msgstr "" -#: ../../mod/admin.php:405 +#: ../../mod/admin.php:412 msgid "Determines whether generated links should be forced to use SSL" msgstr "" -#: ../../mod/admin.php:406 +#: ../../mod/admin.php:413 msgid "Maximum image size" msgstr "" -#: ../../mod/admin.php:406 +#: ../../mod/admin.php:413 msgid "" "Maximum size in bytes of uploaded images. Default is 0, which means no " "limits." msgstr "" -#: ../../mod/admin.php:408 +#: ../../mod/admin.php:415 msgid "Register policy" msgstr "" -#: ../../mod/admin.php:409 +#: ../../mod/admin.php:416 msgid "Register text" msgstr "" -#: ../../mod/admin.php:409 +#: ../../mod/admin.php:416 msgid "Will be displayed prominently on the registration page." msgstr "" -#: ../../mod/admin.php:410 +#: ../../mod/admin.php:417 msgid "Accounts abandoned after x days" msgstr "" -#: ../../mod/admin.php:410 +#: ../../mod/admin.php:417 msgid "" "Will not waste system resources polling external sites for abandonded " "accounts. Enter 0 for no time limit." msgstr "" -#: ../../mod/admin.php:411 +#: ../../mod/admin.php:418 msgid "Allowed friend domains" msgstr "" -#: ../../mod/admin.php:411 +#: ../../mod/admin.php:418 msgid "" "Comma separated list of domains which are allowed to establish friendships " "with this site. Wildcards are accepted. Empty to allow any domains" msgstr "" -#: ../../mod/admin.php:412 +#: ../../mod/admin.php:419 msgid "Allowed email domains" msgstr "" -#: ../../mod/admin.php:412 +#: ../../mod/admin.php:419 msgid "" "Comma separated list of domains which are allowed in email addresses for " "registrations to this site. Wildcards are accepted. Empty to allow any " "domains" msgstr "" -#: ../../mod/admin.php:413 +#: ../../mod/admin.php:420 msgid "Block public" msgstr "" -#: ../../mod/admin.php:413 +#: ../../mod/admin.php:420 msgid "" "Check to block public access to all otherwise public personal pages on this " "site unless you are currently logged in." msgstr "" -#: ../../mod/admin.php:414 +#: ../../mod/admin.php:421 msgid "Force publish" msgstr "" -#: ../../mod/admin.php:414 +#: ../../mod/admin.php:421 msgid "" "Check to force all profiles on this site to be listed in the site directory." msgstr "" -#: ../../mod/admin.php:415 +#: ../../mod/admin.php:422 msgid "Global directory update URL" msgstr "" -#: ../../mod/admin.php:415 +#: ../../mod/admin.php:422 msgid "" "URL to update the global directory. If this is not set, the global directory " "is completely unavailable to the application." msgstr "" -#: ../../mod/admin.php:417 +#: ../../mod/admin.php:424 msgid "Block multiple registrations" msgstr "" -#: ../../mod/admin.php:417 +#: ../../mod/admin.php:424 msgid "Disallow users to register additional accounts for use as pages." msgstr "" -#: ../../mod/admin.php:418 +#: ../../mod/admin.php:425 msgid "OpenID support" msgstr "" -#: ../../mod/admin.php:418 +#: ../../mod/admin.php:425 msgid "OpenID support for registration and logins." msgstr "" -#: ../../mod/admin.php:419 +#: ../../mod/admin.php:426 msgid "Fullname check" msgstr "" -#: ../../mod/admin.php:419 +#: ../../mod/admin.php:426 msgid "" "Force users to register with a space between firstname and lastname in Full " "name, as an antispam measure" msgstr "" -#: ../../mod/admin.php:420 +#: ../../mod/admin.php:427 msgid "UTF-8 Regular expressions" msgstr "" -#: ../../mod/admin.php:420 +#: ../../mod/admin.php:427 msgid "Use PHP UTF8 regular expressions" msgstr "" -#: ../../mod/admin.php:421 +#: ../../mod/admin.php:428 msgid "Show Community Page" msgstr "" -#: ../../mod/admin.php:421 +#: ../../mod/admin.php:428 msgid "" "Display a Community page showing all recent public postings on this site." msgstr "" -#: ../../mod/admin.php:422 +#: ../../mod/admin.php:429 msgid "Enable OStatus support" msgstr "" -#: ../../mod/admin.php:422 +#: ../../mod/admin.php:429 msgid "" "Provide built-in OStatus (identi.ca, status.net, etc.) compatibility. All " "communications in OStatus are public, so privacy warnings will be " "occasionally displayed." msgstr "" -#: ../../mod/admin.php:423 +#: ../../mod/admin.php:430 msgid "Enable Diaspora support" msgstr "" -#: ../../mod/admin.php:423 +#: ../../mod/admin.php:430 msgid "Provide built-in Diaspora network compatibility." msgstr "" -#: ../../mod/admin.php:424 +#: ../../mod/admin.php:431 msgid "Only allow Friendica contacts" msgstr "" -#: ../../mod/admin.php:424 +#: ../../mod/admin.php:431 msgid "" "All contacts must use Friendica protocols. All other built-in communication " "protocols disabled." msgstr "" -#: ../../mod/admin.php:425 +#: ../../mod/admin.php:432 msgid "Verify SSL" msgstr "" -#: ../../mod/admin.php:425 +#: ../../mod/admin.php:432 msgid "" "If you wish, you can turn on strict certificate checking. This will mean you " "cannot connect (at all) to self-signed SSL sites." msgstr "" -#: ../../mod/admin.php:426 +#: ../../mod/admin.php:433 msgid "Proxy user" msgstr "" -#: ../../mod/admin.php:427 +#: ../../mod/admin.php:434 msgid "Proxy URL" msgstr "" -#: ../../mod/admin.php:428 +#: ../../mod/admin.php:435 msgid "Network timeout" msgstr "" -#: ../../mod/admin.php:428 +#: ../../mod/admin.php:435 msgid "Value is in seconds. Set to 0 for unlimited (not recommended)." msgstr "" -#: ../../mod/admin.php:429 +#: ../../mod/admin.php:436 msgid "Delivery interval" msgstr "" -#: ../../mod/admin.php:429 +#: ../../mod/admin.php:436 msgid "" "Delay background delivery processes by this many seconds to reduce system " "load. Recommend: 4-5 for shared hosts, 2-3 for virtual private servers. 0-1 " "for large dedicated servers." msgstr "" -#: ../../mod/admin.php:455 +#: ../../mod/admin.php:451 +msgid "Update has been marked successful" +msgstr "" + +#: ../../mod/admin.php:461 +#, php-format +msgid "Executing %s failed. Check system logs." +msgstr "" + +#: ../../mod/admin.php:464 +#, php-format +msgid "Update %s was successfully applied." +msgstr "" + +#: ../../mod/admin.php:468 +#, php-format +msgid "Update %s did not return a status. Unknown if it succeeded." +msgstr "" + +#: ../../mod/admin.php:471 +#, php-format +msgid "Update function %s could not be found." +msgstr "" + +#: ../../mod/admin.php:486 +msgid "No failed updates." +msgstr "" + +#: ../../mod/admin.php:490 +msgid "Failed Updates" +msgstr "" + +#: ../../mod/admin.php:491 +msgid "" +"This does not include updates prior to 1139, which did not return a status." +msgstr "" + +#: ../../mod/admin.php:492 +msgid "Mark success (if update was manually applied)" +msgstr "" + +#: ../../mod/admin.php:493 +msgid "Attempt to execute this update step automatically" +msgstr "" + +#: ../../mod/admin.php:518 #, php-format msgid "%s user blocked/unblocked" msgid_plural "%s users blocked/unblocked" msgstr[0] "" msgstr[1] "" -#: ../../mod/admin.php:462 +#: ../../mod/admin.php:525 #, php-format msgid "%s user deleted" msgid_plural "%s users deleted" msgstr[0] "" msgstr[1] "" -#: ../../mod/admin.php:501 +#: ../../mod/admin.php:564 #, php-format msgid "User '%s' deleted" msgstr "" -#: ../../mod/admin.php:509 +#: ../../mod/admin.php:572 #, php-format msgid "User '%s' unblocked" msgstr "" -#: ../../mod/admin.php:509 +#: ../../mod/admin.php:572 #, php-format msgid "User '%s' blocked" msgstr "" -#: ../../mod/admin.php:573 +#: ../../mod/admin.php:636 msgid "select all" msgstr "" -#: ../../mod/admin.php:574 +#: ../../mod/admin.php:637 msgid "User registrations waiting for confirm" msgstr "" -#: ../../mod/admin.php:575 +#: ../../mod/admin.php:638 msgid "Request date" msgstr "" -#: ../../mod/admin.php:575 ../../mod/admin.php:584 +#: ../../mod/admin.php:638 ../../mod/admin.php:647 #: ../../include/contact_selectors.php:79 msgid "Email" msgstr "" -#: ../../mod/admin.php:576 +#: ../../mod/admin.php:639 msgid "No registrations." msgstr "" -#: ../../mod/admin.php:578 +#: ../../mod/admin.php:641 msgid "Deny" msgstr "" -#: ../../mod/admin.php:584 +#: ../../mod/admin.php:647 msgid "Register date" msgstr "" -#: ../../mod/admin.php:584 +#: ../../mod/admin.php:647 msgid "Last login" msgstr "" -#: ../../mod/admin.php:584 +#: ../../mod/admin.php:647 msgid "Last item" msgstr "" -#: ../../mod/admin.php:584 +#: ../../mod/admin.php:647 msgid "Account" msgstr "" -#: ../../mod/admin.php:586 +#: ../../mod/admin.php:649 msgid "" "Selected users will be deleted!\\n\\nEverything these users had posted on " "this site will be permanently deleted!\\n\\nAre you sure?" msgstr "" -#: ../../mod/admin.php:587 +#: ../../mod/admin.php:650 msgid "" "The user {0} will be deleted!\\n\\nEverything this user has posted on this " "site will be permanently deleted!\\n\\nAre you sure?" msgstr "" -#: ../../mod/admin.php:628 +#: ../../mod/admin.php:691 #, php-format msgid "Plugin %s disabled." msgstr "" -#: ../../mod/admin.php:632 +#: ../../mod/admin.php:695 #, php-format msgid "Plugin %s enabled." msgstr "" -#: ../../mod/admin.php:642 ../../mod/admin.php:840 +#: ../../mod/admin.php:705 ../../mod/admin.php:903 msgid "Disable" msgstr "" -#: ../../mod/admin.php:644 ../../mod/admin.php:842 +#: ../../mod/admin.php:707 ../../mod/admin.php:905 msgid "Enable" msgstr "" -#: ../../mod/admin.php:666 ../../mod/admin.php:871 +#: ../../mod/admin.php:729 ../../mod/admin.php:934 msgid "Toggle" msgstr "" -#: ../../mod/admin.php:674 ../../mod/admin.php:881 +#: ../../mod/admin.php:737 ../../mod/admin.php:944 msgid "Author: " msgstr "" -#: ../../mod/admin.php:675 ../../mod/admin.php:882 +#: ../../mod/admin.php:738 ../../mod/admin.php:945 msgid "Maintainer: " msgstr "" -#: ../../mod/admin.php:804 +#: ../../mod/admin.php:867 msgid "No themes found." msgstr "" -#: ../../mod/admin.php:863 +#: ../../mod/admin.php:926 msgid "Screenshot" msgstr "" -#: ../../mod/admin.php:911 +#: ../../mod/admin.php:974 msgid "[Experimental]" msgstr "" -#: ../../mod/admin.php:912 +#: ../../mod/admin.php:975 msgid "[Unsupported]" msgstr "" -#: ../../mod/admin.php:939 +#: ../../mod/admin.php:1002 msgid "Log settings updated." msgstr "" -#: ../../mod/admin.php:996 +#: ../../mod/admin.php:1058 msgid "Clear" msgstr "" -#: ../../mod/admin.php:1002 +#: ../../mod/admin.php:1064 msgid "Debugging" msgstr "" -#: ../../mod/admin.php:1003 +#: ../../mod/admin.php:1065 msgid "Log file" msgstr "" -#: ../../mod/admin.php:1003 +#: ../../mod/admin.php:1065 msgid "" "Must be writable by web server. Relative to your Friendica top-level " "directory." msgstr "" -#: ../../mod/admin.php:1004 +#: ../../mod/admin.php:1066 msgid "Log level" msgstr "" -#: ../../mod/admin.php:1054 +#: ../../mod/admin.php:1116 msgid "Close" msgstr "" -#: ../../mod/admin.php:1060 +#: ../../mod/admin.php:1122 msgid "FTP Host" msgstr "" -#: ../../mod/admin.php:1061 +#: ../../mod/admin.php:1123 msgid "FTP Path" msgstr "" -#: ../../mod/admin.php:1062 +#: ../../mod/admin.php:1124 msgid "FTP User" msgstr "" -#: ../../mod/admin.php:1063 +#: ../../mod/admin.php:1125 msgid "FTP Password" msgstr "" -#: ../../mod/profile.php:21 ../../boot.php:946 +#: ../../mod/profile.php:21 ../../boot.php:949 msgid "Requested profile is not available." msgstr "" @@ -3855,23 +3975,23 @@ msgstr "" msgid "Edit/Manage Profiles" msgstr "" -#: ../../mod/profiles.php:621 ../../boot.php:1055 +#: ../../mod/profiles.php:621 ../../boot.php:1058 msgid "Change profile photo" msgstr "" -#: ../../mod/profiles.php:622 ../../boot.php:1056 +#: ../../mod/profiles.php:622 ../../boot.php:1059 msgid "Create New Profile" msgstr "" -#: ../../mod/profiles.php:633 ../../boot.php:1066 +#: ../../mod/profiles.php:633 ../../boot.php:1069 msgid "Profile Image" msgstr "" -#: ../../mod/profiles.php:635 ../../boot.php:1069 +#: ../../mod/profiles.php:635 ../../boot.php:1072 msgid "visible to everybody" msgstr "" -#: ../../mod/profiles.php:636 ../../boot.php:1070 +#: ../../mod/profiles.php:636 ../../boot.php:1073 msgid "Edit visibility" msgstr "" @@ -4077,118 +4197,123 @@ msgstr "" msgid "Unable to set contact photo." msgstr "" -#: ../../mod/dfrn_confirm.php:477 ../../include/diaspora.php:507 +#: ../../mod/dfrn_confirm.php:488 +#, php-format +msgid "%1$s welcomes new member %2$s" +msgstr "" + +#: ../../mod/dfrn_confirm.php:498 ../../include/diaspora.php:507 #: ../../include/conversation.php:101 #, php-format msgid "%1$s is now friends with %2$s" msgstr "" -#: ../../mod/dfrn_confirm.php:548 +#: ../../mod/dfrn_confirm.php:572 #, php-format msgid "No user record found for '%s' " msgstr "" -#: ../../mod/dfrn_confirm.php:558 +#: ../../mod/dfrn_confirm.php:582 msgid "Our site encryption key is apparently messed up." msgstr "" -#: ../../mod/dfrn_confirm.php:569 +#: ../../mod/dfrn_confirm.php:593 msgid "Empty site URL was provided or URL could not be decrypted by us." msgstr "" -#: ../../mod/dfrn_confirm.php:590 +#: ../../mod/dfrn_confirm.php:614 msgid "Contact record was not found for you on our site." msgstr "" -#: ../../mod/dfrn_confirm.php:604 +#: ../../mod/dfrn_confirm.php:628 #, php-format msgid "Site public key not available in contact record for URL %s." msgstr "" -#: ../../mod/dfrn_confirm.php:624 +#: ../../mod/dfrn_confirm.php:648 msgid "" "The ID provided by your system is a duplicate on our system. It should work " "if you try again." msgstr "" -#: ../../mod/dfrn_confirm.php:635 +#: ../../mod/dfrn_confirm.php:659 msgid "Unable to set your contact credentials on our system." msgstr "" -#: ../../mod/dfrn_confirm.php:700 +#: ../../mod/dfrn_confirm.php:724 msgid "Unable to update your contact profile details on our system" msgstr "" -#: ../../mod/dfrn_confirm.php:730 +#: ../../mod/dfrn_confirm.php:754 #, php-format msgid "Connection accepted at %s" msgstr "" -#: ../../addon/facebook/facebook.php:490 +#: ../../addon/facebook/facebook.php:491 msgid "Facebook disabled" msgstr "" -#: ../../addon/facebook/facebook.php:495 +#: ../../addon/facebook/facebook.php:496 msgid "Updating contacts" msgstr "" -#: ../../addon/facebook/facebook.php:515 +#: ../../addon/facebook/facebook.php:516 msgid "Facebook API key is missing." msgstr "" -#: ../../addon/facebook/facebook.php:522 +#: ../../addon/facebook/facebook.php:523 msgid "Facebook Connect" msgstr "" -#: ../../addon/facebook/facebook.php:528 +#: ../../addon/facebook/facebook.php:529 msgid "Install Facebook connector for this account." msgstr "" -#: ../../addon/facebook/facebook.php:535 +#: ../../addon/facebook/facebook.php:536 msgid "Remove Facebook connector" msgstr "" -#: ../../addon/facebook/facebook.php:540 +#: ../../addon/facebook/facebook.php:541 msgid "" "Re-authenticate [This is necessary whenever your Facebook password is " "changed.]" msgstr "" -#: ../../addon/facebook/facebook.php:547 +#: ../../addon/facebook/facebook.php:548 msgid "Post to Facebook by default" msgstr "" -#: ../../addon/facebook/facebook.php:551 +#: ../../addon/facebook/facebook.php:552 msgid "Link all your Facebook friends and conversations on this website" msgstr "" -#: ../../addon/facebook/facebook.php:553 +#: ../../addon/facebook/facebook.php:554 msgid "" "Facebook conversations consist of your profile wall and your friend " "stream." msgstr "" -#: ../../addon/facebook/facebook.php:554 +#: ../../addon/facebook/facebook.php:555 msgid "On this website, your Facebook friend stream is only visible to you." msgstr "" -#: ../../addon/facebook/facebook.php:555 +#: ../../addon/facebook/facebook.php:556 msgid "" "The following settings determine the privacy of your Facebook profile wall " "on this website." msgstr "" -#: ../../addon/facebook/facebook.php:559 +#: ../../addon/facebook/facebook.php:560 msgid "" "On this website your Facebook profile wall conversations will only be " "visible to you" msgstr "" -#: ../../addon/facebook/facebook.php:564 +#: ../../addon/facebook/facebook.php:565 msgid "Do not import your Facebook profile wall conversations" msgstr "" -#: ../../addon/facebook/facebook.php:566 +#: ../../addon/facebook/facebook.php:567 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 " @@ -4196,120 +4321,120 @@ msgid "" "who may see the conversations." msgstr "" -#: ../../addon/facebook/facebook.php:571 +#: ../../addon/facebook/facebook.php:572 msgid "Comma separated applications to ignore" msgstr "" -#: ../../addon/facebook/facebook.php:648 +#: ../../addon/facebook/facebook.php:656 msgid "Problems with Facebook Real-Time Updates" msgstr "" -#: ../../addon/facebook/facebook.php:675 +#: ../../addon/facebook/facebook.php:684 #: ../../include/contact_selectors.php:81 msgid "Facebook" msgstr "" -#: ../../addon/facebook/facebook.php:676 +#: ../../addon/facebook/facebook.php:685 msgid "Facebook Connector Settings" msgstr "" -#: ../../addon/facebook/facebook.php:691 +#: ../../addon/facebook/facebook.php:700 msgid "Facebook API Key" msgstr "" -#: ../../addon/facebook/facebook.php:701 +#: ../../addon/facebook/facebook.php:710 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.

" msgstr "" -#: ../../addon/facebook/facebook.php:706 +#: ../../addon/facebook/facebook.php:715 msgid "" "Error: the given API Key seems to be incorrect (the application access token " "could not be retrieved)." msgstr "" -#: ../../addon/facebook/facebook.php:708 +#: ../../addon/facebook/facebook.php:717 msgid "The given API Key seems to work correctly." msgstr "" -#: ../../addon/facebook/facebook.php:710 +#: ../../addon/facebook/facebook.php:719 msgid "" "The correctness of the API Key could not be detected. Somthing strange's " "going on." msgstr "" -#: ../../addon/facebook/facebook.php:713 +#: ../../addon/facebook/facebook.php:722 msgid "App-ID / API-Key" msgstr "" -#: ../../addon/facebook/facebook.php:714 +#: ../../addon/facebook/facebook.php:723 msgid "Application secret" msgstr "" -#: ../../addon/facebook/facebook.php:715 +#: ../../addon/facebook/facebook.php:724 #, php-format msgid "Polling Interval in minutes (minimum %1$s minutes)" msgstr "" -#: ../../addon/facebook/facebook.php:716 +#: ../../addon/facebook/facebook.php:725 msgid "" "Synchronize comments (no comments on Facebook are missed, at the cost of " "increased system load)" msgstr "" -#: ../../addon/facebook/facebook.php:720 +#: ../../addon/facebook/facebook.php:729 msgid "Real-Time Updates" msgstr "" -#: ../../addon/facebook/facebook.php:724 +#: ../../addon/facebook/facebook.php:733 msgid "Real-Time Updates are activated." msgstr "" -#: ../../addon/facebook/facebook.php:725 +#: ../../addon/facebook/facebook.php:734 msgid "Deactivate Real-Time Updates" msgstr "" -#: ../../addon/facebook/facebook.php:727 +#: ../../addon/facebook/facebook.php:736 msgid "Real-Time Updates not activated." msgstr "" -#: ../../addon/facebook/facebook.php:727 +#: ../../addon/facebook/facebook.php:736 msgid "Activate Real-Time Updates" msgstr "" -#: ../../addon/facebook/facebook.php:746 +#: ../../addon/facebook/facebook.php:755 msgid "The new values have been saved." msgstr "" -#: ../../addon/facebook/facebook.php:770 +#: ../../addon/facebook/facebook.php:779 msgid "Post to Facebook" msgstr "" -#: ../../addon/facebook/facebook.php:868 +#: ../../addon/facebook/facebook.php:877 msgid "" "Post to Facebook cancelled because of multi-network access permission " "conflict." msgstr "" -#: ../../addon/facebook/facebook.php:1088 +#: ../../addon/facebook/facebook.php:1097 msgid "View on Friendica" msgstr "" -#: ../../addon/facebook/facebook.php:1121 +#: ../../addon/facebook/facebook.php:1130 msgid "Facebook post failed. Queued for retry." msgstr "" -#: ../../addon/facebook/facebook.php:1161 +#: ../../addon/facebook/facebook.php:1170 msgid "Your Facebook connection became invalid. Please Re-authenticate." msgstr "" -#: ../../addon/facebook/facebook.php:1162 +#: ../../addon/facebook/facebook.php:1171 msgid "Facebook connection became invalid" msgstr "" -#: ../../addon/facebook/facebook.php:1163 +#: ../../addon/facebook/facebook.php:1172 #, php-format msgid "" "Hi %1$s,\n" @@ -4472,7 +4597,7 @@ msgstr "" #: ../../addon/communityhome/communityhome.php:34 #: ../../addon/communityhome/twillingham/communityhome.php:28 #: ../../addon/communityhome/twillingham/communityhome.php:34 -#: ../../include/nav.php:64 ../../boot.php:802 +#: ../../include/nav.php:64 ../../boot.php:805 msgid "Login" msgstr "" @@ -5214,7 +5339,7 @@ msgid "Show More Settings saved." msgstr "" #: ../../addon/showmore/showmore.php:87 ../../include/conversation.php:466 -#: ../../boot.php:504 +#: ../../boot.php:507 msgid "show more" msgstr "" @@ -5518,7 +5643,7 @@ msgstr "" msgid "Set colour scheme" msgstr "" -#: ../../include/profile_advanced.php:17 ../../boot.php:1091 +#: ../../include/profile_advanced.php:17 ../../boot.php:1094 msgid "Gender:" msgstr "" @@ -5539,11 +5664,11 @@ msgstr "" msgid "Age:" msgstr "" -#: ../../include/profile_advanced.php:37 ../../boot.php:1094 +#: ../../include/profile_advanced.php:37 ../../boot.php:1097 msgid "Status:" msgstr "" -#: ../../include/profile_advanced.php:45 ../../boot.php:1096 +#: ../../include/profile_advanced.php:45 ../../boot.php:1099 msgid "Homepage:" msgstr "" @@ -5723,179 +5848,179 @@ msgstr "" msgid "Undecided" msgstr "" -#: ../../include/profile_selectors.php:19 +#: ../../include/profile_selectors.php:21 msgid "Males" msgstr "" -#: ../../include/profile_selectors.php:19 +#: ../../include/profile_selectors.php:21 msgid "Females" msgstr "" -#: ../../include/profile_selectors.php:19 +#: ../../include/profile_selectors.php:21 msgid "Gay" msgstr "" -#: ../../include/profile_selectors.php:19 +#: ../../include/profile_selectors.php:21 msgid "Lesbian" msgstr "" -#: ../../include/profile_selectors.php:19 +#: ../../include/profile_selectors.php:21 msgid "No Preference" msgstr "" -#: ../../include/profile_selectors.php:19 +#: ../../include/profile_selectors.php:21 msgid "Bisexual" msgstr "" -#: ../../include/profile_selectors.php:19 +#: ../../include/profile_selectors.php:21 msgid "Autosexual" msgstr "" -#: ../../include/profile_selectors.php:19 +#: ../../include/profile_selectors.php:21 msgid "Abstinent" msgstr "" -#: ../../include/profile_selectors.php:19 +#: ../../include/profile_selectors.php:21 msgid "Virgin" msgstr "" -#: ../../include/profile_selectors.php:19 +#: ../../include/profile_selectors.php:21 msgid "Deviant" msgstr "" -#: ../../include/profile_selectors.php:19 +#: ../../include/profile_selectors.php:21 msgid "Fetish" msgstr "" -#: ../../include/profile_selectors.php:19 +#: ../../include/profile_selectors.php:21 msgid "Oodles" msgstr "" -#: ../../include/profile_selectors.php:19 +#: ../../include/profile_selectors.php:21 msgid "Nonsexual" msgstr "" -#: ../../include/profile_selectors.php:33 +#: ../../include/profile_selectors.php:37 msgid "Single" msgstr "" -#: ../../include/profile_selectors.php:33 +#: ../../include/profile_selectors.php:37 msgid "Lonely" msgstr "" -#: ../../include/profile_selectors.php:33 +#: ../../include/profile_selectors.php:37 msgid "Available" msgstr "" -#: ../../include/profile_selectors.php:33 +#: ../../include/profile_selectors.php:37 msgid "Unavailable" msgstr "" -#: ../../include/profile_selectors.php:33 +#: ../../include/profile_selectors.php:37 msgid "Has crush" msgstr "" -#: ../../include/profile_selectors.php:33 +#: ../../include/profile_selectors.php:37 msgid "Infatuated" msgstr "" -#: ../../include/profile_selectors.php:33 +#: ../../include/profile_selectors.php:37 msgid "Dating" msgstr "" -#: ../../include/profile_selectors.php:33 +#: ../../include/profile_selectors.php:37 msgid "Unfaithful" msgstr "" -#: ../../include/profile_selectors.php:33 +#: ../../include/profile_selectors.php:37 msgid "Sex Addict" msgstr "" -#: ../../include/profile_selectors.php:33 +#: ../../include/profile_selectors.php:37 msgid "Friends" msgstr "" -#: ../../include/profile_selectors.php:33 +#: ../../include/profile_selectors.php:37 msgid "Friends/Benefits" msgstr "" -#: ../../include/profile_selectors.php:33 +#: ../../include/profile_selectors.php:37 msgid "Casual" msgstr "" -#: ../../include/profile_selectors.php:33 +#: ../../include/profile_selectors.php:37 msgid "Engaged" msgstr "" -#: ../../include/profile_selectors.php:33 +#: ../../include/profile_selectors.php:37 msgid "Married" msgstr "" -#: ../../include/profile_selectors.php:33 +#: ../../include/profile_selectors.php:37 msgid "Imaginarily married" msgstr "" -#: ../../include/profile_selectors.php:33 +#: ../../include/profile_selectors.php:37 msgid "Partners" msgstr "" -#: ../../include/profile_selectors.php:33 +#: ../../include/profile_selectors.php:37 msgid "Cohabiting" msgstr "" -#: ../../include/profile_selectors.php:33 +#: ../../include/profile_selectors.php:37 msgid "Common law" msgstr "" -#: ../../include/profile_selectors.php:33 +#: ../../include/profile_selectors.php:37 msgid "Happy" msgstr "" -#: ../../include/profile_selectors.php:33 +#: ../../include/profile_selectors.php:37 msgid "Not looking" msgstr "" -#: ../../include/profile_selectors.php:33 +#: ../../include/profile_selectors.php:37 msgid "Swinger" msgstr "" -#: ../../include/profile_selectors.php:33 +#: ../../include/profile_selectors.php:37 msgid "Betrayed" msgstr "" -#: ../../include/profile_selectors.php:33 +#: ../../include/profile_selectors.php:37 msgid "Separated" msgstr "" -#: ../../include/profile_selectors.php:33 +#: ../../include/profile_selectors.php:37 msgid "Unstable" msgstr "" -#: ../../include/profile_selectors.php:33 +#: ../../include/profile_selectors.php:37 msgid "Divorced" msgstr "" -#: ../../include/profile_selectors.php:33 +#: ../../include/profile_selectors.php:37 msgid "Imaginarily divorced" msgstr "" -#: ../../include/profile_selectors.php:33 +#: ../../include/profile_selectors.php:37 msgid "Widowed" msgstr "" -#: ../../include/profile_selectors.php:33 +#: ../../include/profile_selectors.php:37 msgid "Uncertain" msgstr "" -#: ../../include/profile_selectors.php:33 +#: ../../include/profile_selectors.php:37 msgid "It's complicated" msgstr "" -#: ../../include/profile_selectors.php:33 +#: ../../include/profile_selectors.php:37 msgid "Don't care" msgstr "" -#: ../../include/profile_selectors.php:33 +#: ../../include/profile_selectors.php:37 msgid "Ask me" msgstr "" @@ -6127,7 +6252,7 @@ msgstr "" msgid "Contacts not in any group" msgstr "" -#: ../../include/nav.php:46 ../../boot.php:801 +#: ../../include/nav.php:46 ../../boot.php:804 msgid "Logout" msgstr "" @@ -6135,7 +6260,7 @@ msgstr "" msgid "End this session" msgstr "" -#: ../../include/nav.php:49 ../../boot.php:1469 +#: ../../include/nav.php:49 ../../boot.php:1472 msgid "Status" msgstr "" @@ -6215,11 +6340,11 @@ msgstr "" msgid "Manage other pages" msgstr "" -#: ../../include/nav.php:138 ../../boot.php:1049 +#: ../../include/nav.php:138 ../../boot.php:1052 msgid "Profiles" msgstr "" -#: ../../include/nav.php:138 ../../boot.php:1049 +#: ../../include/nav.php:138 ../../boot.php:1052 msgid "Manage/edit profiles" msgstr "" @@ -6606,11 +6731,11 @@ msgstr "" msgid "Please visit %s to approve or reject the suggestion." msgstr "" -#: ../../include/items.php:2698 +#: ../../include/items.php:2714 msgid "A new person is sharing with you at " msgstr "" -#: ../../include/items.php:2698 +#: ../../include/items.php:2714 msgid "You have a new follower at " msgstr "" @@ -6894,80 +7019,96 @@ msgstr "" msgid "permissions" msgstr "" -#: ../../boot.php:502 +#: ../../boot.php:505 msgid "Delete this item?" msgstr "" -#: ../../boot.php:505 +#: ../../boot.php:508 msgid "show fewer" msgstr "" -#: ../../boot.php:678 +#: ../../boot.php:681 #, php-format msgid "Update %s failed. See error logs." msgstr "" -#: ../../boot.php:680 +#: ../../boot.php:683 #, php-format msgid "Update Error at %s" msgstr "" -#: ../../boot.php:780 +#: ../../boot.php:783 msgid "Create a New Account" msgstr "" -#: ../../boot.php:804 +#: ../../boot.php:807 msgid "Nickname or Email address: " msgstr "" -#: ../../boot.php:805 +#: ../../boot.php:808 msgid "Password: " msgstr "" -#: ../../boot.php:808 +#: ../../boot.php:811 msgid "Or login using OpenID: " msgstr "" -#: ../../boot.php:814 +#: ../../boot.php:817 msgid "Forgot your password?" msgstr "" -#: ../../boot.php:981 +#: ../../boot.php:984 msgid "Edit profile" msgstr "" -#: ../../boot.php:1041 +#: ../../boot.php:1044 msgid "Message" msgstr "" -#: ../../boot.php:1157 ../../boot.php:1233 +#: ../../boot.php:1160 ../../boot.php:1236 msgid "g A l F d" msgstr "" -#: ../../boot.php:1158 ../../boot.php:1234 +#: ../../boot.php:1161 ../../boot.php:1237 msgid "F d" msgstr "" -#: ../../boot.php:1203 ../../boot.php:1274 +#: ../../boot.php:1206 ../../boot.php:1277 msgid "[today]" msgstr "" -#: ../../boot.php:1215 +#: ../../boot.php:1218 msgid "Birthday Reminders" msgstr "" -#: ../../boot.php:1216 +#: ../../boot.php:1219 msgid "Birthdays this week:" msgstr "" -#: ../../boot.php:1267 +#: ../../boot.php:1270 msgid "[No description]" msgstr "" -#: ../../boot.php:1285 +#: ../../boot.php:1288 msgid "Event Reminders" msgstr "" -#: ../../boot.php:1286 +#: ../../boot.php:1289 msgid "Events this week:" msgstr "" + +#: ../../boot.php:1475 +msgid "Status Messages and Posts" +msgstr "" + +#: ../../boot.php:1481 +msgid "Profile Details" +msgstr "" + +#: ../../boot.php:1496 +msgid "Events and Calendar" +msgstr "" + +#: ../../boot.php:1502 +msgid "Only You Can See This" +msgstr ""