diff --git a/boot.php b/boot.php index b8a61c796a..03edef6635 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.1324' ); +define ( 'FRIENDICA_VERSION', '2.3.1325' ); define ( 'DFRN_PROTOCOL_VERSION', '2.23' ); define ( 'DB_UPDATE_VERSION', 1138 ); diff --git a/util/messages.po b/util/messages.po index 4eba4b75b7..8a1c4030e3 100644 --- a/util/messages.po +++ b/util/messages.po @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: 2.3.1324\n" +"Project-Id-Version: 2.3.1325\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-04-26 10:00-0700\n" +"POT-Creation-Date: 2012-04-27 10:00-0700\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -39,8 +39,8 @@ msgstr "" #: ../../mod/api.php:31 ../../mod/photos.php:130 ../../mod/photos.php:865 #: ../../mod/editpost.php:10 ../../mod/install.php:171 #: ../../mod/notifications.php:66 ../../mod/contacts.php:125 -#: ../../mod/settings.php:99 ../../mod/settings.php:514 -#: ../../mod/settings.php:519 ../../mod/manage.php:86 ../../mod/network.php:6 +#: ../../mod/settings.php:104 ../../mod/settings.php:519 +#: ../../mod/settings.php:524 ../../mod/manage.php:86 ../../mod/network.php:6 #: ../../mod/notes.php:20 ../../mod/wallmessage.php:9 #: ../../mod/wallmessage.php:33 ../../mod/wallmessage.php:79 #: ../../mod/wallmessage.php:103 ../../mod/attach.php:33 @@ -85,8 +85,8 @@ msgstr "" msgid "Return to contact editor" msgstr "" -#: ../../mod/crepair.php:148 ../../mod/settings.php:534 -#: ../../mod/settings.php:560 ../../mod/admin.php:573 ../../mod/admin.php:582 +#: ../../mod/crepair.php:148 ../../mod/settings.php:539 +#: ../../mod/settings.php:565 ../../mod/admin.php:573 ../../mod/admin.php:582 msgid "Name" msgstr "" @@ -128,8 +128,8 @@ msgstr "" #: ../../mod/photos.php:1273 ../../mod/photos.php:1304 #: ../../mod/install.php:251 ../../mod/install.php:289 #: ../../mod/localtime.php:45 ../../mod/contacts.php:296 -#: ../../mod/settings.php:532 ../../mod/settings.php:678 -#: ../../mod/settings.php:739 ../../mod/settings.php:930 +#: ../../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:392 #: ../../mod/admin.php:570 ../../mod/admin.php:706 ../../mod/admin.php:905 #: ../../mod/admin.php:993 ../../mod/profiles.php:498 ../../mod/invite.php:119 @@ -158,8 +158,10 @@ msgstr "" #: ../../addon/twitter/twitter.php:209 ../../addon/twitter/twitter.php:375 #: ../../addon/irc/irc.php:55 ../../addon/blogger/blogger.php:102 #: ../../addon/posterous/posterous.php:90 +#: ../../view/theme/cleanzero/config.php:71 #: ../../view/theme/diabook/config.php:91 -#: ../../view/theme/quattro/config.php:52 ../../include/conversation.php:555 +#: ../../view/theme/quattro/config.php:52 ../../view/theme/dispy/config.php:70 +#: ../../include/conversation.php:555 msgid "Submit" msgstr "" @@ -217,7 +219,7 @@ msgstr "" msgid "link to source" msgstr "" -#: ../../mod/events.php:296 ../../view/theme/diabook/theme.php:250 +#: ../../mod/events.php:296 ../../view/theme/diabook/theme.php:255 #: ../../include/nav.php:52 ../../boot.php:1481 msgid "Events" msgstr "" @@ -277,8 +279,8 @@ msgid "Share this event" msgstr "" #: ../../mod/tagrm.php:11 ../../mod/tagrm.php:94 -#: ../../mod/dfrn_request.php:812 ../../mod/settings.php:533 -#: ../../mod/settings.php:559 ../../addon/js_upload/js_upload.php:45 +#: ../../mod/dfrn_request.php:812 ../../mod/settings.php:538 +#: ../../mod/settings.php:564 ../../addon/js_upload/js_upload.php:45 msgid "Cancel" msgstr "" @@ -322,23 +324,23 @@ msgid "" msgstr "" #: ../../mod/api.php:105 ../../mod/dfrn_request.php:800 -#: ../../mod/settings.php:844 ../../mod/settings.php:850 -#: ../../mod/settings.php:858 ../../mod/settings.php:862 -#: ../../mod/settings.php:867 ../../mod/settings.php:873 -#: ../../mod/settings.php:879 ../../mod/settings.php:885 -#: ../../mod/settings.php:921 ../../mod/settings.php:922 -#: ../../mod/settings.php:923 ../../mod/settings.php:924 +#: ../../mod/settings.php:849 ../../mod/settings.php:855 +#: ../../mod/settings.php:863 ../../mod/settings.php:867 +#: ../../mod/settings.php:872 ../../mod/settings.php:878 +#: ../../mod/settings.php:884 ../../mod/settings.php:890 +#: ../../mod/settings.php:926 ../../mod/settings.php:927 +#: ../../mod/settings.php:928 ../../mod/settings.php:929 #: ../../mod/register.php:532 ../../mod/profiles.php:475 msgid "Yes" msgstr "" #: ../../mod/api.php:106 ../../mod/dfrn_request.php:801 -#: ../../mod/settings.php:844 ../../mod/settings.php:850 -#: ../../mod/settings.php:858 ../../mod/settings.php:862 -#: ../../mod/settings.php:867 ../../mod/settings.php:873 -#: ../../mod/settings.php:879 ../../mod/settings.php:885 -#: ../../mod/settings.php:921 ../../mod/settings.php:922 -#: ../../mod/settings.php:923 ../../mod/settings.php:924 +#: ../../mod/settings.php:849 ../../mod/settings.php:855 +#: ../../mod/settings.php:863 ../../mod/settings.php:867 +#: ../../mod/settings.php:872 ../../mod/settings.php:878 +#: ../../mod/settings.php:884 ../../mod/settings.php:890 +#: ../../mod/settings.php:926 ../../mod/settings.php:927 +#: ../../mod/settings.php:928 ../../mod/settings.php:929 #: ../../mod/register.php:533 ../../mod/profiles.php:476 msgid "No" msgstr "" @@ -350,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:130 +#: ../../view/theme/diabook/theme.php:135 msgid "Contact Photos" msgstr "" @@ -373,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:131 +#: ../../view/theme/diabook/theme.php:136 msgid "Profile Photos" msgstr "" @@ -395,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:102 ../../include/text.php:1304 +#: ../../view/theme/diabook/theme.php:107 ../../include/text.php:1304 #: ../../include/diaspora.php:1654 ../../include/conversation.php:53 #: ../../include/conversation.php:126 msgid "photo" @@ -525,14 +527,14 @@ msgstr "" msgid "I don't like this (toggle)" msgstr "" -#: ../../mod/photos.php:1213 ../../include/conversation.php:956 +#: ../../mod/photos.php:1213 ../../include/conversation.php:964 msgid "Share" msgstr "" #: ../../mod/photos.php:1214 ../../mod/editpost.php:104 #: ../../mod/wallmessage.php:145 ../../mod/message.php:188 #: ../../mod/message.php:380 ../../include/conversation.php:361 -#: ../../include/conversation.php:698 ../../include/conversation.php:975 +#: ../../include/conversation.php:706 ../../include/conversation.php:983 msgid "Please wait" msgstr "" @@ -548,13 +550,13 @@ msgid "Comment" msgstr "" #: ../../mod/photos.php:1234 ../../mod/editpost.php:125 -#: ../../include/conversation.php:556 ../../include/conversation.php:993 +#: ../../include/conversation.php:564 ../../include/conversation.php:1001 msgid "Preview" msgstr "" -#: ../../mod/photos.php:1331 ../../mod/settings.php:595 -#: ../../mod/settings.php:676 ../../mod/group.php:168 ../../mod/admin.php:577 -#: ../../include/conversation.php:318 ../../include/conversation.php:576 +#: ../../mod/photos.php:1331 ../../mod/settings.php:600 +#: ../../mod/settings.php:681 ../../mod/group.php:168 ../../mod/admin.php:577 +#: ../../include/conversation.php:318 ../../include/conversation.php:584 msgid "Delete" msgstr "" @@ -570,7 +572,7 @@ msgstr "" msgid "Not available." msgstr "" -#: ../../mod/community.php:30 ../../view/theme/diabook/theme.php:252 +#: ../../mod/community.php:30 ../../view/theme/diabook/theme.php:257 #: ../../include/nav.php:101 msgid "Community" msgstr "" @@ -619,28 +621,28 @@ msgstr "" msgid "Edit post" msgstr "" -#: ../../mod/editpost.php:80 ../../include/conversation.php:942 +#: ../../mod/editpost.php:80 ../../include/conversation.php:950 msgid "Post to Email" msgstr "" -#: ../../mod/editpost.php:95 ../../mod/settings.php:594 -#: ../../include/conversation.php:563 +#: ../../mod/editpost.php:95 ../../mod/settings.php:599 +#: ../../include/conversation.php:571 msgid "Edit" msgstr "" #: ../../mod/editpost.php:96 ../../mod/wallmessage.php:143 #: ../../mod/message.php:186 ../../mod/message.php:378 -#: ../../include/conversation.php:957 +#: ../../include/conversation.php:965 msgid "Upload photo" msgstr "" -#: ../../mod/editpost.php:97 ../../include/conversation.php:959 +#: ../../mod/editpost.php:97 ../../include/conversation.php:967 msgid "Attach file" msgstr "" #: ../../mod/editpost.php:98 ../../mod/wallmessage.php:144 #: ../../mod/message.php:187 ../../mod/message.php:379 -#: ../../include/conversation.php:961 +#: ../../include/conversation.php:969 msgid "Insert web link" msgstr "" @@ -656,35 +658,35 @@ msgstr "" msgid "Insert Vorbis [.ogg] audio" msgstr "" -#: ../../mod/editpost.php:102 ../../include/conversation.php:967 +#: ../../mod/editpost.php:102 ../../include/conversation.php:975 msgid "Set your location" msgstr "" -#: ../../mod/editpost.php:103 ../../include/conversation.php:969 +#: ../../mod/editpost.php:103 ../../include/conversation.php:977 msgid "Clear browser location" msgstr "" -#: ../../mod/editpost.php:105 ../../include/conversation.php:976 +#: ../../mod/editpost.php:105 ../../include/conversation.php:984 msgid "Permission settings" msgstr "" -#: ../../mod/editpost.php:113 ../../include/conversation.php:985 +#: ../../mod/editpost.php:113 ../../include/conversation.php:993 msgid "CC: email addresses" msgstr "" -#: ../../mod/editpost.php:114 ../../include/conversation.php:986 +#: ../../mod/editpost.php:114 ../../include/conversation.php:994 msgid "Public post" msgstr "" -#: ../../mod/editpost.php:117 ../../include/conversation.php:972 +#: ../../mod/editpost.php:117 ../../include/conversation.php:980 msgid "Set title" msgstr "" -#: ../../mod/editpost.php:119 ../../include/conversation.php:974 +#: ../../mod/editpost.php:119 ../../include/conversation.php:982 msgid "Categories (comma-separated list)" msgstr "" -#: ../../mod/editpost.php:120 ../../include/conversation.php:988 +#: ../../mod/editpost.php:120 ../../include/conversation.php:996 msgid "Example: bob@example.com, mary@example.com" msgstr "" @@ -853,7 +855,7 @@ msgstr "" msgid "StatusNet/Federated Social Web" msgstr "" -#: ../../mod/dfrn_request.php:806 ../../mod/settings.php:629 +#: ../../mod/dfrn_request.php:806 ../../mod/settings.php:634 #: ../../include/contact_selectors.php:80 msgid "Diaspora" msgstr "" @@ -1212,7 +1214,7 @@ msgstr "" msgid "Personal" msgstr "" -#: ../../mod/notifications.php:90 ../../view/theme/diabook/theme.php:246 +#: ../../mod/notifications.php:90 ../../view/theme/diabook/theme.php:251 #: ../../include/nav.php:77 ../../include/nav.php:115 msgid "Home" msgstr "" @@ -1585,7 +1587,7 @@ msgstr "" msgid "Edit contact" msgstr "" -#: ../../mod/contacts.php:500 ../../view/theme/diabook/theme.php:248 +#: ../../mod/contacts.php:500 ../../view/theme/diabook/theme.php:253 #: ../../include/nav.php:139 msgid "Contacts" msgstr "" @@ -1699,61 +1701,65 @@ msgstr "" msgid "Export personal data" msgstr "" -#: ../../mod/settings.php:83 ../../mod/admin.php:665 ../../mod/admin.php:870 +#: ../../mod/settings.php:80 +msgid "Remove account" +msgstr "" + +#: ../../mod/settings.php:88 ../../mod/admin.php:665 ../../mod/admin.php:870 #: ../../addon/mathjax/mathjax.php:36 ../../include/nav.php:137 msgid "Settings" msgstr "" -#: ../../mod/settings.php:126 +#: ../../mod/settings.php:131 msgid "Missing some important data!" msgstr "" -#: ../../mod/settings.php:129 ../../mod/settings.php:558 +#: ../../mod/settings.php:134 ../../mod/settings.php:563 #: ../../mod/admin.php:97 msgid "Update" msgstr "" -#: ../../mod/settings.php:234 +#: ../../mod/settings.php:239 msgid "Failed to connect with email account using the settings provided." msgstr "" -#: ../../mod/settings.php:239 +#: ../../mod/settings.php:244 msgid "Email settings updated." msgstr "" -#: ../../mod/settings.php:298 +#: ../../mod/settings.php:303 msgid "Passwords do not match. Password unchanged." msgstr "" -#: ../../mod/settings.php:303 +#: ../../mod/settings.php:308 msgid "Empty passwords are not allowed. Password unchanged." msgstr "" -#: ../../mod/settings.php:314 +#: ../../mod/settings.php:319 msgid "Password changed." msgstr "" -#: ../../mod/settings.php:316 +#: ../../mod/settings.php:321 msgid "Password update failed. Please try again." msgstr "" -#: ../../mod/settings.php:379 +#: ../../mod/settings.php:384 msgid " Please use a shorter name." msgstr "" -#: ../../mod/settings.php:381 +#: ../../mod/settings.php:386 msgid " Name too short." msgstr "" -#: ../../mod/settings.php:387 +#: ../../mod/settings.php:392 msgid " Not valid email." msgstr "" -#: ../../mod/settings.php:389 +#: ../../mod/settings.php:394 msgid " Cannot change to that email." msgstr "" -#: ../../mod/settings.php:461 ../../addon/facebook/facebook.php:469 +#: ../../mod/settings.php:466 ../../addon/facebook/facebook.php:469 #: ../../addon/impressum/impressum.php:77 #: ../../addon/openstreetmap/openstreetmap.php:80 #: ../../addon/mathjax/mathjax.php:66 ../../addon/piwik/piwik.php:105 @@ -1761,405 +1767,405 @@ msgstr "" msgid "Settings updated." msgstr "" -#: ../../mod/settings.php:531 ../../mod/settings.php:557 -#: ../../mod/settings.php:593 +#: ../../mod/settings.php:536 ../../mod/settings.php:562 +#: ../../mod/settings.php:598 msgid "Add application" msgstr "" -#: ../../mod/settings.php:535 ../../mod/settings.php:561 +#: ../../mod/settings.php:540 ../../mod/settings.php:566 #: ../../addon/statusnet/statusnet.php:547 msgid "Consumer Key" msgstr "" -#: ../../mod/settings.php:536 ../../mod/settings.php:562 +#: ../../mod/settings.php:541 ../../mod/settings.php:567 #: ../../addon/statusnet/statusnet.php:546 msgid "Consumer Secret" msgstr "" -#: ../../mod/settings.php:537 ../../mod/settings.php:563 +#: ../../mod/settings.php:542 ../../mod/settings.php:568 msgid "Redirect" msgstr "" -#: ../../mod/settings.php:538 ../../mod/settings.php:564 +#: ../../mod/settings.php:543 ../../mod/settings.php:569 msgid "Icon url" msgstr "" -#: ../../mod/settings.php:549 +#: ../../mod/settings.php:554 msgid "You can't edit this application." msgstr "" -#: ../../mod/settings.php:592 +#: ../../mod/settings.php:597 msgid "Connected Apps" msgstr "" -#: ../../mod/settings.php:596 +#: ../../mod/settings.php:601 msgid "Client key starts with" msgstr "" -#: ../../mod/settings.php:597 +#: ../../mod/settings.php:602 msgid "No name" msgstr "" -#: ../../mod/settings.php:598 +#: ../../mod/settings.php:603 msgid "Remove authorization" msgstr "" -#: ../../mod/settings.php:609 +#: ../../mod/settings.php:614 msgid "No Plugin settings configured" msgstr "" -#: ../../mod/settings.php:617 ../../addon/widgets/widgets.php:123 +#: ../../mod/settings.php:622 ../../addon/widgets/widgets.php:123 msgid "Plugin Settings" msgstr "" -#: ../../mod/settings.php:629 ../../mod/settings.php:630 +#: ../../mod/settings.php:634 ../../mod/settings.php:635 #, php-format msgid "Built-in support for %s connectivity is %s" msgstr "" -#: ../../mod/settings.php:629 ../../mod/settings.php:630 +#: ../../mod/settings.php:634 ../../mod/settings.php:635 msgid "enabled" msgstr "" -#: ../../mod/settings.php:629 ../../mod/settings.php:630 +#: ../../mod/settings.php:634 ../../mod/settings.php:635 msgid "disabled" msgstr "" -#: ../../mod/settings.php:630 +#: ../../mod/settings.php:635 msgid "StatusNet" msgstr "" -#: ../../mod/settings.php:660 +#: ../../mod/settings.php:665 msgid "Connector Settings" msgstr "" -#: ../../mod/settings.php:665 +#: ../../mod/settings.php:670 msgid "Email/Mailbox Setup" msgstr "" -#: ../../mod/settings.php:666 +#: ../../mod/settings.php:671 msgid "" "If you wish to communicate with email contacts using this service " "(optional), please specify how to connect to your mailbox." msgstr "" -#: ../../mod/settings.php:667 +#: ../../mod/settings.php:672 msgid "Last successful email check:" msgstr "" -#: ../../mod/settings.php:668 +#: ../../mod/settings.php:673 msgid "Email access is disabled on this site." msgstr "" -#: ../../mod/settings.php:669 +#: ../../mod/settings.php:674 msgid "IMAP server name:" msgstr "" -#: ../../mod/settings.php:670 +#: ../../mod/settings.php:675 msgid "IMAP port:" msgstr "" -#: ../../mod/settings.php:671 +#: ../../mod/settings.php:676 msgid "Security:" msgstr "" -#: ../../mod/settings.php:671 ../../mod/settings.php:676 +#: ../../mod/settings.php:676 ../../mod/settings.php:681 msgid "None" msgstr "" -#: ../../mod/settings.php:672 +#: ../../mod/settings.php:677 msgid "Email login name:" msgstr "" -#: ../../mod/settings.php:673 +#: ../../mod/settings.php:678 msgid "Email password:" msgstr "" -#: ../../mod/settings.php:674 +#: ../../mod/settings.php:679 msgid "Reply-to address:" msgstr "" -#: ../../mod/settings.php:675 +#: ../../mod/settings.php:680 msgid "Send public posts to all email contacts:" msgstr "" -#: ../../mod/settings.php:676 +#: ../../mod/settings.php:681 msgid "Action after import:" msgstr "" -#: ../../mod/settings.php:676 +#: ../../mod/settings.php:681 msgid "Mark as seen" msgstr "" -#: ../../mod/settings.php:676 +#: ../../mod/settings.php:681 msgid "Move to folder" msgstr "" -#: ../../mod/settings.php:677 +#: ../../mod/settings.php:682 msgid "Move to folder:" msgstr "" -#: ../../mod/settings.php:737 +#: ../../mod/settings.php:742 msgid "Display Settings" msgstr "" -#: ../../mod/settings.php:743 +#: ../../mod/settings.php:748 msgid "Display Theme:" msgstr "" -#: ../../mod/settings.php:744 +#: ../../mod/settings.php:749 msgid "Update browser every xx seconds" msgstr "" -#: ../../mod/settings.php:744 +#: ../../mod/settings.php:749 msgid "Minimum of 10 seconds, no maximum" msgstr "" -#: ../../mod/settings.php:745 +#: ../../mod/settings.php:750 msgid "Number of items to display on the network page:" msgstr "" -#: ../../mod/settings.php:745 +#: ../../mod/settings.php:750 msgid "Maximum of 100 items" msgstr "" -#: ../../mod/settings.php:746 +#: ../../mod/settings.php:751 msgid "Don't show emoticons" msgstr "" -#: ../../mod/settings.php:811 ../../mod/admin.php:173 ../../mod/admin.php:551 +#: ../../mod/settings.php:816 ../../mod/admin.php:173 ../../mod/admin.php:551 msgid "Normal Account" msgstr "" -#: ../../mod/settings.php:812 +#: ../../mod/settings.php:817 msgid "This account is a normal personal profile" msgstr "" -#: ../../mod/settings.php:815 ../../mod/admin.php:174 ../../mod/admin.php:552 +#: ../../mod/settings.php:820 ../../mod/admin.php:174 ../../mod/admin.php:552 msgid "Soapbox Account" msgstr "" -#: ../../mod/settings.php:816 +#: ../../mod/settings.php:821 msgid "Automatically approve all connection/friend requests as read-only fans" msgstr "" -#: ../../mod/settings.php:819 ../../mod/admin.php:175 ../../mod/admin.php:553 +#: ../../mod/settings.php:824 ../../mod/admin.php:175 ../../mod/admin.php:553 msgid "Community/Celebrity Account" msgstr "" -#: ../../mod/settings.php:820 +#: ../../mod/settings.php:825 msgid "Automatically approve all connection/friend requests as read-write fans" msgstr "" -#: ../../mod/settings.php:823 ../../mod/admin.php:176 ../../mod/admin.php:554 +#: ../../mod/settings.php:828 ../../mod/admin.php:176 ../../mod/admin.php:554 msgid "Automatic Friend Account" msgstr "" -#: ../../mod/settings.php:824 +#: ../../mod/settings.php:829 msgid "Automatically approve all connection/friend requests as friends" msgstr "" -#: ../../mod/settings.php:834 +#: ../../mod/settings.php:839 msgid "OpenID:" msgstr "" -#: ../../mod/settings.php:834 +#: ../../mod/settings.php:839 msgid "(Optional) Allow this OpenID to login to this account." msgstr "" -#: ../../mod/settings.php:844 +#: ../../mod/settings.php:849 msgid "Publish your default profile in your local site directory?" msgstr "" -#: ../../mod/settings.php:850 +#: ../../mod/settings.php:855 msgid "Publish your default profile in the global social directory?" msgstr "" -#: ../../mod/settings.php:858 +#: ../../mod/settings.php:863 msgid "Hide your contact/friend list from viewers of your default profile?" msgstr "" -#: ../../mod/settings.php:862 +#: ../../mod/settings.php:867 msgid "Hide your profile details from unknown viewers?" msgstr "" -#: ../../mod/settings.php:867 +#: ../../mod/settings.php:872 msgid "Allow friends to post to your profile page?" msgstr "" -#: ../../mod/settings.php:873 +#: ../../mod/settings.php:878 msgid "Allow friends to tag your posts?" msgstr "" -#: ../../mod/settings.php:879 +#: ../../mod/settings.php:884 msgid "Allow us to suggest you as a potential friend to new members?" msgstr "" -#: ../../mod/settings.php:885 +#: ../../mod/settings.php:890 msgid "Permit unknown people to send you private mail?" msgstr "" -#: ../../mod/settings.php:896 +#: ../../mod/settings.php:901 msgid "Profile is not published." msgstr "" -#: ../../mod/settings.php:902 ../../mod/profile_photo.php:211 +#: ../../mod/settings.php:907 ../../mod/profile_photo.php:211 msgid "or" msgstr "" -#: ../../mod/settings.php:907 +#: ../../mod/settings.php:912 msgid "Your Identity Address is" msgstr "" -#: ../../mod/settings.php:918 +#: ../../mod/settings.php:923 msgid "Automatically expire posts after this many days:" msgstr "" -#: ../../mod/settings.php:918 +#: ../../mod/settings.php:923 msgid "If empty, posts will not expire. Expired posts will be deleted" msgstr "" -#: ../../mod/settings.php:919 +#: ../../mod/settings.php:924 msgid "Advanced expiration settings" msgstr "" -#: ../../mod/settings.php:920 +#: ../../mod/settings.php:925 msgid "Advanced Expiration" msgstr "" -#: ../../mod/settings.php:921 +#: ../../mod/settings.php:926 msgid "Expire posts:" msgstr "" -#: ../../mod/settings.php:922 +#: ../../mod/settings.php:927 msgid "Expire personal notes:" msgstr "" -#: ../../mod/settings.php:923 +#: ../../mod/settings.php:928 msgid "Expire starred posts:" msgstr "" -#: ../../mod/settings.php:924 +#: ../../mod/settings.php:929 msgid "Expire photos:" msgstr "" -#: ../../mod/settings.php:928 +#: ../../mod/settings.php:933 msgid "Account Settings" msgstr "" -#: ../../mod/settings.php:937 +#: ../../mod/settings.php:942 msgid "Password Settings" msgstr "" -#: ../../mod/settings.php:938 +#: ../../mod/settings.php:943 msgid "New Password:" msgstr "" -#: ../../mod/settings.php:939 +#: ../../mod/settings.php:944 msgid "Confirm:" msgstr "" -#: ../../mod/settings.php:939 +#: ../../mod/settings.php:944 msgid "Leave password fields blank unless changing" msgstr "" -#: ../../mod/settings.php:943 +#: ../../mod/settings.php:948 msgid "Basic Settings" msgstr "" -#: ../../mod/settings.php:944 ../../include/profile_advanced.php:15 +#: ../../mod/settings.php:949 ../../include/profile_advanced.php:15 msgid "Full Name:" msgstr "" -#: ../../mod/settings.php:945 +#: ../../mod/settings.php:950 msgid "Email Address:" msgstr "" -#: ../../mod/settings.php:946 +#: ../../mod/settings.php:951 msgid "Your Timezone:" msgstr "" -#: ../../mod/settings.php:947 +#: ../../mod/settings.php:952 msgid "Default Post Location:" msgstr "" -#: ../../mod/settings.php:948 +#: ../../mod/settings.php:953 msgid "Use Browser Location:" msgstr "" -#: ../../mod/settings.php:951 +#: ../../mod/settings.php:956 msgid "Security and Privacy Settings" msgstr "" -#: ../../mod/settings.php:953 +#: ../../mod/settings.php:958 msgid "Maximum Friend Requests/Day:" msgstr "" -#: ../../mod/settings.php:953 ../../mod/settings.php:968 +#: ../../mod/settings.php:958 ../../mod/settings.php:973 msgid "(to prevent spam abuse)" msgstr "" -#: ../../mod/settings.php:954 +#: ../../mod/settings.php:959 msgid "Default Post Permissions" msgstr "" -#: ../../mod/settings.php:955 +#: ../../mod/settings.php:960 msgid "(click to open/close)" msgstr "" -#: ../../mod/settings.php:968 +#: ../../mod/settings.php:973 msgid "Maximum private messages per day from unknown people:" msgstr "" -#: ../../mod/settings.php:971 +#: ../../mod/settings.php:976 msgid "Notification Settings" msgstr "" -#: ../../mod/settings.php:972 +#: ../../mod/settings.php:977 msgid "By default post a status message when:" msgstr "" -#: ../../mod/settings.php:973 +#: ../../mod/settings.php:978 msgid "accepting a friend request" msgstr "" -#: ../../mod/settings.php:974 +#: ../../mod/settings.php:979 msgid "making an interesting profile change" msgstr "" -#: ../../mod/settings.php:975 +#: ../../mod/settings.php:980 msgid "Send a notification email when:" msgstr "" -#: ../../mod/settings.php:976 +#: ../../mod/settings.php:981 msgid "You receive an introduction" msgstr "" -#: ../../mod/settings.php:977 +#: ../../mod/settings.php:982 msgid "Your introductions are confirmed" msgstr "" -#: ../../mod/settings.php:978 +#: ../../mod/settings.php:983 msgid "Someone writes on your profile wall" msgstr "" -#: ../../mod/settings.php:979 +#: ../../mod/settings.php:984 msgid "Someone writes a followup comment" msgstr "" -#: ../../mod/settings.php:980 +#: ../../mod/settings.php:985 msgid "You receive a private message" msgstr "" -#: ../../mod/settings.php:981 +#: ../../mod/settings.php:986 msgid "You receive a friend suggestion" msgstr "" -#: ../../mod/settings.php:982 +#: ../../mod/settings.php:987 msgid "You are tagged in a post" msgstr "" -#: ../../mod/settings.php:985 +#: ../../mod/settings.php:990 msgid "Advanced Page Settings" msgstr "" @@ -2290,7 +2296,7 @@ msgid "No recipient." msgstr "" #: ../../mod/wallmessage.php:124 ../../mod/message.php:169 -#: ../../include/conversation.php:910 +#: ../../include/conversation.php:918 msgid "Please enter a link URL:" msgstr "" @@ -2498,7 +2504,7 @@ msgstr "" msgid "Profile Visibility Editor" msgstr "" -#: ../../mod/profperm.php:103 ../../view/theme/diabook/theme.php:247 +#: ../../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:1468 msgid "Profile" @@ -2684,8 +2690,8 @@ msgstr "" #: ../../addon/facebook/facebook.php:1533 #: ../../addon/communityhome/communityhome.php:158 #: ../../addon/communityhome/communityhome.php:167 -#: ../../view/theme/diabook/theme.php:97 -#: ../../view/theme/diabook/theme.php:106 ../../include/diaspora.php:1654 +#: ../../view/theme/diabook/theme.php:102 +#: ../../view/theme/diabook/theme.php:111 ../../include/diaspora.php:1654 #: ../../include/conversation.php:48 ../../include/conversation.php:57 #: ../../include/conversation.php:121 ../../include/conversation.php:130 msgid "status" @@ -2693,7 +2699,7 @@ msgstr "" #: ../../mod/like.php:144 ../../addon/facebook/facebook.php:1537 #: ../../addon/communityhome/communityhome.php:172 -#: ../../view/theme/diabook/theme.php:111 ../../include/diaspora.php:1670 +#: ../../view/theme/diabook/theme.php:116 ../../include/diaspora.php:1670 #: ../../include/conversation.php:65 #, php-format msgid "%1$s likes %2$s's %3$s" @@ -2714,7 +2720,7 @@ msgstr "" msgid "Access denied." msgstr "" -#: ../../mod/fbrowser.php:23 ../../view/theme/diabook/theme.php:249 +#: ../../mod/fbrowser.php:23 ../../view/theme/diabook/theme.php:254 #: ../../include/nav.php:51 ../../boot.php:1473 msgid "Photos" msgstr "" @@ -3819,7 +3825,7 @@ msgstr "" msgid "Edit visibility" msgstr "" -#: ../../mod/filer.php:29 ../../include/conversation.php:914 +#: ../../mod/filer.php:29 ../../include/conversation.php:922 msgid "Save to Folder:" msgstr "" @@ -3867,7 +3873,7 @@ msgstr "" msgid "No entries." msgstr "" -#: ../../mod/suggest.php:38 ../../view/theme/diabook/theme.php:158 +#: ../../mod/suggest.php:38 ../../view/theme/diabook/theme.php:163 #: ../../include/contact_widgets.php:34 msgid "Friend Suggestions" msgstr "" @@ -3882,7 +3888,7 @@ msgstr "" msgid "Ignore/Hide" msgstr "" -#: ../../mod/directory.php:47 ../../view/theme/diabook/theme.php:156 +#: ../../mod/directory.php:47 ../../view/theme/diabook/theme.php:161 msgid "Global Directory" msgstr "" @@ -4440,7 +4446,7 @@ msgid "Latest likes" msgstr "" #: ../../addon/communityhome/communityhome.php:155 -#: ../../view/theme/diabook/theme.php:94 ../../include/text.php:1302 +#: ../../view/theme/diabook/theme.php:99 ../../include/text.php:1302 #: ../../include/conversation.php:45 ../../include/conversation.php:118 msgid "event" msgstr "" @@ -5340,86 +5346,97 @@ msgstr "" msgid "Post to Posterous by default" msgstr "" -#: ../../view/theme/diabook/theme.php:43 +#: ../../view/theme/cleanzero/config.php:73 +#: ../../view/theme/diabook/config.php:93 +#: ../../view/theme/quattro/config.php:54 ../../view/theme/dispy/config.php:72 +msgid "Theme settings" +msgstr "" + +#: ../../view/theme/cleanzero/config.php:74 +msgid "Set resize level for images in posts and comments (width and height)" +msgstr "" + +#: ../../view/theme/cleanzero/config.php:75 +#: ../../view/theme/diabook/config.php:94 ../../view/theme/dispy/config.php:73 +msgid "Set font-size for posts and comments" +msgstr "" + +#: ../../view/theme/cleanzero/config.php:76 +#: ../../view/theme/quattro/config.php:56 +msgid "Color scheme" +msgstr "" + +#: ../../view/theme/diabook/theme.php:48 msgid "Last users" msgstr "" -#: ../../view/theme/diabook/theme.php:72 +#: ../../view/theme/diabook/theme.php:77 msgid "Last likes" msgstr "" -#: ../../view/theme/diabook/theme.php:117 +#: ../../view/theme/diabook/theme.php:122 msgid "Last photos" msgstr "" -#: ../../view/theme/diabook/theme.php:154 +#: ../../view/theme/diabook/theme.php:159 msgid "Find Friends" msgstr "" -#: ../../view/theme/diabook/theme.php:155 +#: ../../view/theme/diabook/theme.php:160 msgid "Local Directory" msgstr "" -#: ../../view/theme/diabook/theme.php:157 ../../include/contact_widgets.php:35 +#: ../../view/theme/diabook/theme.php:162 ../../include/contact_widgets.php:35 msgid "Similar Interests" msgstr "" -#: ../../view/theme/diabook/theme.php:159 ../../include/contact_widgets.php:37 +#: ../../view/theme/diabook/theme.php:164 ../../include/contact_widgets.php:37 msgid "Invite Friends" msgstr "" -#: ../../view/theme/diabook/theme.php:175 -#: ../../view/theme/diabook/theme.php:253 +#: ../../view/theme/diabook/theme.php:180 +#: ../../view/theme/diabook/theme.php:258 msgid "Community Pages" msgstr "" -#: ../../view/theme/diabook/theme.php:208 +#: ../../view/theme/diabook/theme.php:213 msgid "Help or @NewHere ?" msgstr "" -#: ../../view/theme/diabook/theme.php:214 +#: ../../view/theme/diabook/theme.php:219 msgid "Connect Services" msgstr "" -#: ../../view/theme/diabook/theme.php:246 ../../include/nav.php:49 +#: ../../view/theme/diabook/theme.php:251 ../../include/nav.php:49 #: ../../include/nav.php:115 msgid "Your posts and conversations" msgstr "" -#: ../../view/theme/diabook/theme.php:247 ../../include/nav.php:50 +#: ../../view/theme/diabook/theme.php:252 ../../include/nav.php:50 msgid "Your profile page" msgstr "" -#: ../../view/theme/diabook/theme.php:248 +#: ../../view/theme/diabook/theme.php:253 msgid "Your contacts" msgstr "" -#: ../../view/theme/diabook/theme.php:249 ../../include/nav.php:51 +#: ../../view/theme/diabook/theme.php:254 ../../include/nav.php:51 msgid "Your photos" msgstr "" -#: ../../view/theme/diabook/theme.php:250 ../../include/nav.php:52 +#: ../../view/theme/diabook/theme.php:255 ../../include/nav.php:52 msgid "Your events" msgstr "" -#: ../../view/theme/diabook/theme.php:251 ../../include/nav.php:53 +#: ../../view/theme/diabook/theme.php:256 ../../include/nav.php:53 msgid "Personal notes" msgstr "" -#: ../../view/theme/diabook/theme.php:251 ../../include/nav.php:53 +#: ../../view/theme/diabook/theme.php:256 ../../include/nav.php:53 msgid "Your personal photos" msgstr "" -#: ../../view/theme/diabook/config.php:93 -#: ../../view/theme/quattro/config.php:54 -msgid "Theme settings" -msgstr "" - -#: ../../view/theme/diabook/config.php:94 -msgid "Set font-size for posts and comments" -msgstr "" - -#: ../../view/theme/diabook/config.php:95 +#: ../../view/theme/diabook/config.php:95 ../../view/theme/dispy/config.php:74 msgid "Set line-height for posts and comments" msgstr "" @@ -5443,8 +5460,8 @@ msgstr "" msgid "Center" msgstr "" -#: ../../view/theme/quattro/config.php:56 -msgid "Color scheme" +#: ../../view/theme/dispy/config.php:75 +msgid "Set colour scheme" msgstr "" #: ../../include/profile_advanced.php:17 ../../boot.php:1085 @@ -6574,30 +6591,30 @@ msgstr "" msgid "stopped following" msgstr "" -#: ../../include/Contact.php:188 ../../include/conversation.php:809 +#: ../../include/Contact.php:188 ../../include/conversation.php:817 msgid "View Status" msgstr "" -#: ../../include/Contact.php:189 ../../include/conversation.php:810 +#: ../../include/Contact.php:189 ../../include/conversation.php:818 msgid "View Profile" msgstr "" -#: ../../include/Contact.php:190 ../../include/conversation.php:811 +#: ../../include/Contact.php:190 ../../include/conversation.php:819 msgid "View Photos" msgstr "" #: ../../include/Contact.php:191 ../../include/Contact.php:204 -#: ../../include/conversation.php:812 +#: ../../include/conversation.php:820 msgid "Network Posts" msgstr "" #: ../../include/Contact.php:192 ../../include/Contact.php:204 -#: ../../include/conversation.php:813 +#: ../../include/conversation.php:821 msgid "Edit Contact" msgstr "" #: ../../include/Contact.php:193 ../../include/Contact.php:204 -#: ../../include/conversation.php:814 +#: ../../include/conversation.php:822 msgid "Send PM" msgstr "" @@ -6610,17 +6627,17 @@ msgstr "" msgid "%1$s marked %2$s's %3$s as favorite" msgstr "" -#: ../../include/conversation.php:317 ../../include/conversation.php:575 +#: ../../include/conversation.php:317 ../../include/conversation.php:583 msgid "Select" msgstr "" -#: ../../include/conversation.php:334 ../../include/conversation.php:668 -#: ../../include/conversation.php:669 +#: ../../include/conversation.php:334 ../../include/conversation.php:676 +#: ../../include/conversation.php:677 #, php-format msgid "View %s's profile @ %s" msgstr "" -#: ../../include/conversation.php:344 ../../include/conversation.php:680 +#: ../../include/conversation.php:344 ../../include/conversation.php:688 #, php-format msgid "%s from %s" msgstr "" @@ -6652,142 +6669,174 @@ msgstr "" msgid "share" msgstr "" -#: ../../include/conversation.php:588 +#: ../../include/conversation.php:556 +msgid "Bold" +msgstr "" + +#: ../../include/conversation.php:557 +msgid "Italic" +msgstr "" + +#: ../../include/conversation.php:558 +msgid "Underline" +msgstr "" + +#: ../../include/conversation.php:559 +msgid "Quote" +msgstr "" + +#: ../../include/conversation.php:560 +msgid "Code" +msgstr "" + +#: ../../include/conversation.php:561 +msgid "Image" +msgstr "" + +#: ../../include/conversation.php:562 +msgid "Link" +msgstr "" + +#: ../../include/conversation.php:563 +msgid "Video" +msgstr "" + +#: ../../include/conversation.php:596 msgid "add star" msgstr "" -#: ../../include/conversation.php:589 +#: ../../include/conversation.php:597 msgid "remove star" msgstr "" -#: ../../include/conversation.php:590 +#: ../../include/conversation.php:598 msgid "toggle star status" msgstr "" -#: ../../include/conversation.php:593 +#: ../../include/conversation.php:601 msgid "starred" msgstr "" -#: ../../include/conversation.php:594 +#: ../../include/conversation.php:602 msgid "add tag" msgstr "" -#: ../../include/conversation.php:598 +#: ../../include/conversation.php:606 msgid "save to folder" msgstr "" -#: ../../include/conversation.php:670 +#: ../../include/conversation.php:678 msgid "to" msgstr "" -#: ../../include/conversation.php:671 +#: ../../include/conversation.php:679 msgid "Wall-to-Wall" msgstr "" -#: ../../include/conversation.php:672 +#: ../../include/conversation.php:680 msgid "via Wall-To-Wall:" msgstr "" -#: ../../include/conversation.php:717 +#: ../../include/conversation.php:725 msgid "Delete Selected Items" msgstr "" -#: ../../include/conversation.php:868 +#: ../../include/conversation.php:876 #, php-format msgid "%s likes this." msgstr "" -#: ../../include/conversation.php:868 +#: ../../include/conversation.php:876 #, php-format msgid "%s doesn't like this." msgstr "" -#: ../../include/conversation.php:872 +#: ../../include/conversation.php:880 #, php-format msgid "%2$d people like this." msgstr "" -#: ../../include/conversation.php:874 +#: ../../include/conversation.php:882 #, php-format msgid "%2$d people don't like this." msgstr "" -#: ../../include/conversation.php:880 +#: ../../include/conversation.php:888 msgid "and" msgstr "" -#: ../../include/conversation.php:883 +#: ../../include/conversation.php:891 #, php-format msgid ", and %d other people" msgstr "" -#: ../../include/conversation.php:884 +#: ../../include/conversation.php:892 #, php-format msgid "%s like this." msgstr "" -#: ../../include/conversation.php:884 +#: ../../include/conversation.php:892 #, php-format msgid "%s don't like this." msgstr "" -#: ../../include/conversation.php:909 +#: ../../include/conversation.php:917 msgid "Visible to everybody" msgstr "" -#: ../../include/conversation.php:911 +#: ../../include/conversation.php:919 msgid "Please enter a video link/URL:" msgstr "" -#: ../../include/conversation.php:912 +#: ../../include/conversation.php:920 msgid "Please enter an audio link/URL:" msgstr "" -#: ../../include/conversation.php:913 +#: ../../include/conversation.php:921 msgid "Tag term:" msgstr "" -#: ../../include/conversation.php:915 +#: ../../include/conversation.php:923 msgid "Where are you right now?" msgstr "" -#: ../../include/conversation.php:958 +#: ../../include/conversation.php:966 msgid "upload photo" msgstr "" -#: ../../include/conversation.php:960 +#: ../../include/conversation.php:968 msgid "attach file" msgstr "" -#: ../../include/conversation.php:962 +#: ../../include/conversation.php:970 msgid "web link" msgstr "" -#: ../../include/conversation.php:963 +#: ../../include/conversation.php:971 msgid "Insert video link" msgstr "" -#: ../../include/conversation.php:964 +#: ../../include/conversation.php:972 msgid "video link" msgstr "" -#: ../../include/conversation.php:965 +#: ../../include/conversation.php:973 msgid "Insert audio link" msgstr "" -#: ../../include/conversation.php:966 +#: ../../include/conversation.php:974 msgid "audio link" msgstr "" -#: ../../include/conversation.php:968 +#: ../../include/conversation.php:976 msgid "set location" msgstr "" -#: ../../include/conversation.php:970 +#: ../../include/conversation.php:978 msgid "clear location" msgstr "" -#: ../../include/conversation.php:977 +#: ../../include/conversation.php:985 msgid "permissions" msgstr ""