diff options
author | friendica <info@friendica.com> | 2013-11-22 11:52:38 -0800 |
---|---|---|
committer | friendica <info@friendica.com> | 2013-11-22 11:52:38 -0800 |
commit | 34f8b215114f1041094784c9f931d185b78b0ec2 (patch) | |
tree | 0485c28fd259279226e50162be972306f0a368a3 | |
parent | f6b43a0a7bc96e199fad8ad65e0aa63bd9a04f8b (diff) | |
download | volse-hubzilla-34f8b215114f1041094784c9f931d185b78b0ec2.tar.gz volse-hubzilla-34f8b215114f1041094784c9f931d185b78b0ec2.tar.bz2 volse-hubzilla-34f8b215114f1041094784c9f931d185b78b0ec2.zip |
init_groups_visitor() was still using old array of id output (not the newer array of hash which we need for permission queries)
-rw-r--r-- | include/security.php | 4 | ||||
-rw-r--r-- | util/messages.po | 796 | ||||
-rw-r--r-- | version.inc | 2 | ||||
-rw-r--r-- | view/php/theme_init.php | 3 |
4 files changed, 402 insertions, 403 deletions
diff --git a/include/security.php b/include/security.php index 1181e6bf2..296fa450f 100644 --- a/include/security.php +++ b/include/security.php @@ -386,12 +386,12 @@ function check_form_security_token_ForbiddenOnErr($typename = '', $formname = 'f if(! function_exists('init_groups_visitor')) { function init_groups_visitor($contact_id) { $groups = array(); - $r = q("SELECT gid FROM group_member WHERE xchan = '%s' ", + $r = q("SELECT hash FROM `group` left join group_member on group.id = group_member.gid WHERE xchan = '%s' ", dbesc($contact_id) ); if(count($r)) { foreach($r as $rr) - $groups[] = $rr['gid']; + $groups[] = $rr['hash']; } return $groups; }} diff --git a/util/messages.po b/util/messages.po index d53d35f3a..958d9e046 100644 --- a/util/messages.po +++ b/util/messages.po @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: 2013-11-15.498\n" +"Project-Id-Version: 2013-11-22.505\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-11-15 00:03-0800\n" +"POT-Creation-Date: 2013-11-22 00:02-0800\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -61,6 +61,10 @@ msgstr "" msgid "Red Matrix Notification" msgstr "" +#: ../../include/enotify.php:37 +msgid "redmatrix" +msgstr "" + #: ../../include/enotify.php:39 msgid "Thank You," msgstr "" @@ -82,7 +86,7 @@ msgstr "" #: ../../include/enotify.php:82 #, php-format -msgid "%1$s sent you a new private message at %2$s." +msgid "%1$s, %2$s sent you a new private message at %3$s." msgstr "" #: ../../include/enotify.php:83 @@ -153,7 +157,7 @@ msgstr "" #: ../../include/enotify.php:201 #, php-format -msgid "%1$s tagged you at %2$s" +msgid "%1$s, %2$s tagged you at %3$s" msgstr "" #: ../../include/enotify.php:202 @@ -168,7 +172,7 @@ msgstr "" #: ../../include/enotify.php:215 #, php-format -msgid "%1$s poked you at %2$s" +msgid "%1$s, %2$s poked you at %3$s" msgstr "" #: ../../include/enotify.php:216 @@ -247,7 +251,7 @@ msgid "Private Message" msgstr "" #: ../../include/ItemObject.php:95 ../../include/page_widgets.php:8 -#: ../../mod/webpages.php:101 ../../mod/settings.php:712 ../../mod/menu.php:55 +#: ../../mod/webpages.php:101 ../../mod/settings.php:713 ../../mod/menu.php:55 #: ../../mod/layouts.php:102 ../../mod/editlayout.php:100 #: ../../mod/editwebpage.php:119 ../../mod/blocks.php:93 #: ../../mod/editpost.php:97 ../../mod/editblock.php:114 @@ -255,8 +259,8 @@ msgid "Edit" msgstr "" #: ../../include/ItemObject.php:107 ../../include/conversation.php:628 -#: ../../mod/settings.php:713 ../../mod/admin.php:677 ../../mod/group.php:182 -#: ../../mod/photos.php:1130 ../../mod/connections.php:354 +#: ../../mod/settings.php:714 ../../mod/admin.php:686 ../../mod/group.php:182 +#: ../../mod/photos.php:1130 ../../mod/connections.php:374 #: ../../mod/filestorage.php:82 msgid "Delete" msgstr "" @@ -380,20 +384,20 @@ msgstr "" #: ../../include/ItemObject.php:530 ../../mod/events.php:458 #: ../../mod/thing.php:190 ../../mod/invite.php:154 ../../mod/setup.php:302 -#: ../../mod/setup.php:345 ../../mod/settings.php:650 -#: ../../mod/settings.php:762 ../../mod/settings.php:790 -#: ../../mod/settings.php:814 ../../mod/settings.php:885 -#: ../../mod/settings.php:1053 ../../mod/connect.php:96 +#: ../../mod/setup.php:345 ../../mod/settings.php:651 +#: ../../mod/settings.php:763 ../../mod/settings.php:791 +#: ../../mod/settings.php:815 ../../mod/settings.php:886 +#: ../../mod/settings.php:1054 ../../mod/connect.php:96 #: ../../mod/sources.php:83 ../../mod/sources.php:110 ../../mod/admin.php:418 -#: ../../mod/admin.php:670 ../../mod/admin.php:810 ../../mod/admin.php:1009 -#: ../../mod/admin.php:1096 ../../mod/group.php:87 ../../mod/photos.php:685 +#: ../../mod/admin.php:679 ../../mod/admin.php:819 ../../mod/admin.php:1018 +#: ../../mod/admin.php:1105 ../../mod/group.php:87 ../../mod/photos.php:685 #: ../../mod/photos.php:779 ../../mod/photos.php:1040 #: ../../mod/photos.php:1080 ../../mod/photos.php:1167 #: ../../mod/message.php:333 ../../mod/message.php:515 -#: ../../mod/connections.php:432 ../../mod/profiles.php:529 +#: ../../mod/connections.php:452 ../../mod/profiles.php:529 #: ../../mod/import.php:385 ../../mod/crepair.php:166 ../../mod/poke.php:166 #: ../../mod/fsuggest.php:108 ../../mod/mood.php:137 -#: ../../view/theme/redbasic/php/config.php:79 +#: ../../view/theme/redbasic/php/config.php:85 #: ../../view/theme/apw/php/config.php:231 msgid "Submit" msgstr "" @@ -445,7 +449,7 @@ msgstr "" #: ../../include/Contact.php:87 ../../include/contact_widgets.php:23 #: ../../mod/match.php:58 ../../mod/suggest.php:56 ../../mod/directory.php:198 -#: ../../boot.php:1745 +#: ../../boot.php:1741 msgid "Connect" msgstr "" @@ -466,8 +470,8 @@ msgid "View Status" msgstr "" #: ../../include/Contact.php:526 ../../include/nav.php:76 -#: ../../include/conversation.php:925 ../../mod/connections.php:307 -#: ../../mod/connections.php:421 +#: ../../include/conversation.php:925 ../../mod/connections.php:327 +#: ../../mod/connections.php:441 msgid "View Profile" msgstr "" @@ -547,8 +551,8 @@ msgstr "" msgid "RSS/Atom" msgstr "" -#: ../../include/contact_selectors.php:77 ../../mod/admin.php:673 -#: ../../mod/admin.php:682 ../../boot.php:1465 +#: ../../include/contact_selectors.php:77 ../../mod/admin.php:682 +#: ../../mod/admin.php:691 ../../boot.php:1461 msgid "Email" msgstr "" @@ -667,7 +671,7 @@ msgid "Finishes:" msgstr "" #: ../../include/event.php:40 ../../include/bb2diaspora.php:455 -#: ../../mod/events.php:450 ../../mod/directory.php:173 ../../boot.php:1795 +#: ../../mod/events.php:450 ../../mod/directory.php:173 ../../boot.php:1791 msgid "Location:" msgstr "" @@ -827,14 +831,6 @@ msgstr "" msgid "Post/Comment Tools" msgstr "" -#: ../../include/features.php:56 -msgid "Multiple Deletion" -msgstr "" - -#: ../../include/features.php:56 -msgid "Select and delete multiple posts/comments at once" -msgstr "" - #: ../../include/features.php:57 msgid "Edit Sent Posts" msgstr "" @@ -1059,12 +1055,12 @@ msgstr "" msgid "Profile" msgstr "" -#: ../../include/profile_advanced.php:15 ../../mod/settings.php:1061 +#: ../../include/profile_advanced.php:15 ../../mod/settings.php:1062 msgid "Full Name:" msgstr "" #: ../../include/profile_advanced.php:17 ../../mod/directory.php:175 -#: ../../boot.php:1797 +#: ../../boot.php:1793 msgid "Gender:" msgstr "" @@ -1085,7 +1081,7 @@ msgid "Age:" msgstr "" #: ../../include/profile_advanced.php:37 ../../mod/directory.php:177 -#: ../../boot.php:1798 +#: ../../boot.php:1794 msgid "Status:" msgstr "" @@ -1099,7 +1095,7 @@ msgid "Sexual Preference:" msgstr "" #: ../../include/profile_advanced.php:48 ../../mod/directory.php:179 -#: ../../boot.php:1799 +#: ../../boot.php:1795 msgid "Homepage:" msgstr "" @@ -1503,7 +1499,7 @@ msgstr "" msgid "Pages" msgstr "" -#: ../../include/identity.php:14 ../../mod/item.php:1131 +#: ../../include/identity.php:14 ../../mod/item.php:1123 msgid "Unable to obtain identity information from database" msgstr "" @@ -1537,7 +1533,7 @@ msgid "Default Profile" msgstr "" #: ../../include/identity.php:245 ../../include/profile_selectors.php:42 -#: ../../mod/network.php:387 ../../mod/connections.php:387 +#: ../../mod/network.php:387 ../../mod/connections.php:407 msgid "Friends" msgstr "" @@ -1585,17 +1581,17 @@ msgstr "" #: ../../include/attach.php:204 ../../include/attach.php:237 #: ../../include/attach.php:251 ../../include/attach.php:272 #: ../../include/attach.php:464 ../../include/attach.php:539 -#: ../../include/items.php:3572 ../../mod/common.php:43 +#: ../../include/items.php:3582 ../../mod/common.php:43 #: ../../mod/events.php:134 ../../mod/invite.php:13 ../../mod/invite.php:102 #: ../../mod/allfriends.php:10 ../../mod/webpages.php:40 ../../mod/api.php:26 #: ../../mod/api.php:31 ../../mod/lastpost.php:93 ../../mod/page.php:30 -#: ../../mod/page.php:80 ../../mod/setup.php:200 ../../mod/settings.php:627 +#: ../../mod/page.php:80 ../../mod/setup.php:200 ../../mod/settings.php:628 #: ../../mod/viewconnections.php:33 ../../mod/viewconnections.php:38 #: ../../mod/delegate.php:6 ../../mod/sources.php:48 ../../mod/mitem.php:92 #: ../../mod/group.php:15 ../../mod/photos.php:74 ../../mod/photos.php:654 #: ../../mod/viewsrc.php:12 ../../mod/menu.php:40 ../../mod/message.php:208 #: ../../mod/layouts.php:27 ../../mod/layouts.php:42 ../../mod/network.php:7 -#: ../../mod/intro.php:50 ../../mod/connections.php:177 +#: ../../mod/intro.php:50 ../../mod/connections.php:197 #: ../../mod/profiles.php:163 ../../mod/profiles.php:476 #: ../../mod/new_channel.php:66 ../../mod/new_channel.php:97 #: ../../mod/filestorage.php:26 ../../mod/manage.php:6 @@ -1606,7 +1602,7 @@ msgstr "" #: ../../mod/blocks.php:29 ../../mod/blocks.php:44 ../../mod/editpost.php:13 #: ../../mod/poke.php:128 ../../mod/channel.php:123 ../../mod/fsuggest.php:78 #: ../../mod/editblock.php:48 ../../mod/item.php:173 ../../mod/item.php:181 -#: ../../mod/suggest.php:32 ../../mod/register.php:60 ../../mod/regmod.php:18 +#: ../../mod/suggest.php:32 ../../mod/register.php:68 ../../mod/regmod.php:18 #: ../../mod/mood.php:114 ../../index.php:178 ../../index.php:340 msgid "Permission denied." msgstr "" @@ -1628,7 +1624,7 @@ msgstr "" msgid "Photo storage failed." msgstr "" -#: ../../include/photos.php:288 ../../boot.php:2246 +#: ../../include/photos.php:288 ../../boot.php:2242 msgid "Photo Albums" msgstr "" @@ -1923,20 +1919,20 @@ msgstr "" msgid "database storage failed." msgstr "" -#: ../../include/zot.php:426 +#: ../../include/zot.php:438 msgid "Invalid data packet" msgstr "" -#: ../../include/zot.php:436 +#: ../../include/zot.php:448 msgid "Unable to verify channel signature" msgstr "" -#: ../../include/zot.php:582 +#: ../../include/zot.php:594 #, php-format msgid "Unable to verify site signature for %s" msgstr "" -#: ../../include/nav.php:72 ../../include/nav.php:87 ../../boot.php:1462 +#: ../../include/nav.php:72 ../../include/nav.php:87 ../../boot.php:1458 msgid "Logout" msgstr "" @@ -1964,7 +1960,7 @@ msgstr "" msgid "Manage/Edit Profiles" msgstr "" -#: ../../include/nav.php:79 ../../mod/fbrowser.php:25 ../../boot.php:2243 +#: ../../include/nav.php:79 ../../mod/fbrowser.php:25 ../../boot.php:2239 msgid "Photos" msgstr "" @@ -1972,7 +1968,7 @@ msgstr "" msgid "Your photos" msgstr "" -#: ../../include/nav.php:85 ../../boot.php:1463 +#: ../../include/nav.php:85 ../../boot.php:1459 msgid "Login" msgstr "" @@ -1993,7 +1989,7 @@ msgstr "" msgid "Home Page" msgstr "" -#: ../../include/nav.php:125 ../../mod/register.php:187 ../../boot.php:1439 +#: ../../include/nav.php:125 ../../mod/register.php:195 ../../boot.php:1435 msgid "Register" msgstr "" @@ -2001,7 +1997,7 @@ msgstr "" msgid "Create an account" msgstr "" -#: ../../include/nav.php:130 ../../mod/help.php:34 +#: ../../include/nav.php:130 ../../mod/help.php:45 ../../mod/help.php:49 msgid "Help" msgstr "" @@ -2065,7 +2061,7 @@ msgstr "" msgid "Intros" msgstr "" -#: ../../include/nav.php:158 ../../mod/connections.php:565 +#: ../../include/nav.php:158 ../../mod/connections.php:585 msgid "New Connections" msgstr "" @@ -2117,7 +2113,7 @@ msgstr "" msgid "New Message" msgstr "" -#: ../../include/nav.php:174 ../../mod/events.php:348 ../../boot.php:2254 +#: ../../include/nav.php:174 ../../mod/events.php:348 ../../boot.php:2250 msgid "Events" msgstr "" @@ -2142,7 +2138,7 @@ msgid "Manage Your Channels" msgstr "" #: ../../include/nav.php:180 ../../mod/settings.php:131 -#: ../../mod/admin.php:769 ../../mod/admin.php:974 +#: ../../mod/admin.php:778 ../../mod/admin.php:983 msgid "Settings" msgstr "" @@ -2150,7 +2146,7 @@ msgstr "" msgid "Account/Channel Settings" msgstr "" -#: ../../include/nav.php:182 ../../mod/connections.php:671 +#: ../../include/nav.php:182 ../../mod/connections.php:691 msgid "Connections" msgstr "" @@ -2282,7 +2278,7 @@ msgstr "" msgid "Examples: Robert Morgenstein, Fishing" msgstr "" -#: ../../include/contact_widgets.php:48 ../../mod/connections.php:677 +#: ../../include/contact_widgets.php:48 ../../mod/connections.php:697 #: ../../mod/directory.php:221 ../../mod/directory.php:226 msgid "Find" msgstr "" @@ -2474,7 +2470,7 @@ msgstr "" msgid "This action is not available under your subscription plan." msgstr "" -#: ../../include/comanche.php:35 ../../view/theme/redbasic/php/config.php:56 +#: ../../include/comanche.php:35 ../../view/theme/redbasic/php/config.php:62 #: ../../view/theme/apw/php/config.php:176 msgid "Default" msgstr "" @@ -2763,25 +2759,25 @@ msgstr "" msgid "Permission denied" msgstr "" -#: ../../include/items.php:3521 ../../mod/admin.php:150 -#: ../../mod/admin.php:714 ../../mod/admin.php:917 ../../mod/viewsrc.php:18 +#: ../../include/items.php:3531 ../../mod/admin.php:150 +#: ../../mod/admin.php:723 ../../mod/admin.php:926 ../../mod/viewsrc.php:18 #: ../../mod/home.php:64 ../../mod/display.php:32 msgid "Item not found." msgstr "" -#: ../../include/items.php:3693 +#: ../../include/items.php:3703 msgid "Archives" msgstr "" -#: ../../include/items.php:3854 ../../mod/group.php:44 ../../mod/group.php:146 +#: ../../include/items.php:3869 ../../mod/group.php:44 ../../mod/group.php:146 msgid "Collection not found." msgstr "" -#: ../../include/items.php:3870 ../../mod/network.php:469 +#: ../../include/items.php:3885 ../../mod/network.php:469 msgid "Group is empty" msgstr "" -#: ../../include/items.php:3886 +#: ../../include/items.php:3901 msgid "Connection not found." msgstr "" @@ -3024,7 +3020,7 @@ msgstr "" #: ../../mod/webpages.php:8 ../../mod/connect.php:13 ../../mod/layouts.php:8 #: ../../mod/filestorage.php:8 ../../mod/blocks.php:10 ../../mod/profile.php:8 -#: ../../boot.php:1644 +#: ../../boot.php:1640 msgid "Requested profile is not available." msgstr "" @@ -3051,17 +3047,17 @@ msgid "" "and/or create new posts for you?" msgstr "" -#: ../../mod/api.php:105 ../../mod/settings.php:1008 -#: ../../mod/settings.php:1013 ../../mod/settings.php:1036 -#: ../../mod/settings.php:1038 ../../mod/settings.php:1039 -#: ../../mod/settings.php:1040 ../../mod/profiles.php:506 +#: ../../mod/api.php:105 ../../mod/settings.php:1009 +#: ../../mod/settings.php:1014 ../../mod/settings.php:1037 +#: ../../mod/settings.php:1039 ../../mod/settings.php:1040 +#: ../../mod/settings.php:1041 ../../mod/profiles.php:506 msgid "Yes" msgstr "" -#: ../../mod/api.php:106 ../../mod/settings.php:1008 -#: ../../mod/settings.php:1013 ../../mod/settings.php:1036 -#: ../../mod/settings.php:1038 ../../mod/settings.php:1039 -#: ../../mod/settings.php:1040 ../../mod/profiles.php:507 +#: ../../mod/api.php:106 ../../mod/settings.php:1009 +#: ../../mod/settings.php:1014 ../../mod/settings.php:1037 +#: ../../mod/settings.php:1039 ../../mod/settings.php:1040 +#: ../../mod/settings.php:1041 ../../mod/profiles.php:507 msgid "No" msgstr "" @@ -3082,11 +3078,11 @@ msgid "Invalid item." msgstr "" #: ../../mod/page.php:47 ../../mod/chanview.php:78 ../../mod/home.php:51 -#: ../../mod/magic.php:77 ../../mod/wall_upload.php:35 +#: ../../mod/magic.php:95 ../../mod/wall_upload.php:35 msgid "Channel not found." msgstr "" -#: ../../mod/page.php:83 ../../mod/help.php:41 ../../mod/display.php:92 +#: ../../mod/page.php:83 ../../mod/help.php:56 ../../mod/display.php:92 #: ../../index.php:229 msgid "Page not found." msgstr "" @@ -3429,7 +3425,7 @@ msgid "" "IMPORTANT: You will need to [manually] setup a scheduled task for the poller." msgstr "" -#: ../../mod/rpost.php:83 ../../mod/editpost.php:42 +#: ../../mod/rpost.php:84 ../../mod/editpost.php:42 msgid "Edit post" msgstr "" @@ -3497,7 +3493,7 @@ msgstr "" msgid "Key and Secret are required" msgstr "" -#: ../../mod/settings.php:179 ../../mod/settings.php:676 +#: ../../mod/settings.php:179 ../../mod/settings.php:677 msgid "Update" msgstr "" @@ -3529,380 +3525,380 @@ msgstr "" msgid "System failure storing new email. Please try again." msgstr "" -#: ../../mod/settings.php:578 +#: ../../mod/settings.php:579 msgid "Settings updated." msgstr "" -#: ../../mod/settings.php:649 ../../mod/settings.php:675 -#: ../../mod/settings.php:711 +#: ../../mod/settings.php:650 ../../mod/settings.php:676 +#: ../../mod/settings.php:712 msgid "Add application" msgstr "" -#: ../../mod/settings.php:651 ../../mod/settings.php:677 +#: ../../mod/settings.php:652 ../../mod/settings.php:678 #: ../../mod/tagrm.php:11 ../../mod/tagrm.php:94 ../../mod/fbrowser.php:82 #: ../../mod/fbrowser.php:117 msgid "Cancel" msgstr "" -#: ../../mod/settings.php:652 ../../mod/settings.php:678 -#: ../../mod/admin.php:673 ../../mod/crepair.php:148 +#: ../../mod/settings.php:653 ../../mod/settings.php:679 +#: ../../mod/admin.php:682 ../../mod/crepair.php:148 msgid "Name" msgstr "" -#: ../../mod/settings.php:652 +#: ../../mod/settings.php:653 msgid "Name of application" msgstr "" -#: ../../mod/settings.php:653 ../../mod/settings.php:679 +#: ../../mod/settings.php:654 ../../mod/settings.php:680 msgid "Consumer Key" msgstr "" -#: ../../mod/settings.php:653 ../../mod/settings.php:654 +#: ../../mod/settings.php:654 ../../mod/settings.php:655 msgid "Automatically generated - change if desired. Max length 20" msgstr "" -#: ../../mod/settings.php:654 ../../mod/settings.php:680 +#: ../../mod/settings.php:655 ../../mod/settings.php:681 msgid "Consumer Secret" msgstr "" -#: ../../mod/settings.php:655 ../../mod/settings.php:681 +#: ../../mod/settings.php:656 ../../mod/settings.php:682 msgid "Redirect" msgstr "" -#: ../../mod/settings.php:655 +#: ../../mod/settings.php:656 msgid "" "Redirect URI - leave blank unless your application specifically requires this" msgstr "" -#: ../../mod/settings.php:656 ../../mod/settings.php:682 +#: ../../mod/settings.php:657 ../../mod/settings.php:683 msgid "Icon url" msgstr "" -#: ../../mod/settings.php:656 +#: ../../mod/settings.php:657 msgid "Optional" msgstr "" -#: ../../mod/settings.php:667 +#: ../../mod/settings.php:668 msgid "You can't edit this application." msgstr "" -#: ../../mod/settings.php:710 +#: ../../mod/settings.php:711 msgid "Connected Apps" msgstr "" -#: ../../mod/settings.php:714 +#: ../../mod/settings.php:715 msgid "Client key starts with" msgstr "" -#: ../../mod/settings.php:715 +#: ../../mod/settings.php:716 msgid "No name" msgstr "" -#: ../../mod/settings.php:716 +#: ../../mod/settings.php:717 msgid "Remove authorization" msgstr "" -#: ../../mod/settings.php:727 +#: ../../mod/settings.php:728 msgid "No feature settings configured" msgstr "" -#: ../../mod/settings.php:735 +#: ../../mod/settings.php:736 msgid "Feature Settings" msgstr "" -#: ../../mod/settings.php:758 +#: ../../mod/settings.php:759 msgid "Account Settings" msgstr "" -#: ../../mod/settings.php:759 +#: ../../mod/settings.php:760 msgid "Password Settings" msgstr "" -#: ../../mod/settings.php:760 +#: ../../mod/settings.php:761 msgid "New Password:" msgstr "" -#: ../../mod/settings.php:761 +#: ../../mod/settings.php:762 msgid "Confirm:" msgstr "" -#: ../../mod/settings.php:761 +#: ../../mod/settings.php:762 msgid "Leave password fields blank unless changing" msgstr "" -#: ../../mod/settings.php:763 ../../mod/settings.php:1062 +#: ../../mod/settings.php:764 ../../mod/settings.php:1063 msgid "Email Address:" msgstr "" -#: ../../mod/settings.php:764 +#: ../../mod/settings.php:765 msgid "Remove Account" msgstr "" -#: ../../mod/settings.php:765 +#: ../../mod/settings.php:766 msgid "Warning: This action is permanent and cannot be reversed." msgstr "" -#: ../../mod/settings.php:781 +#: ../../mod/settings.php:782 msgid "Off" msgstr "" -#: ../../mod/settings.php:781 +#: ../../mod/settings.php:782 msgid "On" msgstr "" -#: ../../mod/settings.php:788 +#: ../../mod/settings.php:789 msgid "Additional Features" msgstr "" -#: ../../mod/settings.php:813 +#: ../../mod/settings.php:814 msgid "Connector Settings" msgstr "" -#: ../../mod/settings.php:843 ../../mod/admin.php:369 +#: ../../mod/settings.php:844 ../../mod/admin.php:369 msgid "No special theme for mobile devices" msgstr "" -#: ../../mod/settings.php:883 +#: ../../mod/settings.php:884 msgid "Display Settings" msgstr "" -#: ../../mod/settings.php:889 +#: ../../mod/settings.php:890 msgid "Display Theme:" msgstr "" -#: ../../mod/settings.php:890 +#: ../../mod/settings.php:891 msgid "Mobile Theme:" msgstr "" -#: ../../mod/settings.php:891 +#: ../../mod/settings.php:892 msgid "Update browser every xx seconds" msgstr "" -#: ../../mod/settings.php:891 +#: ../../mod/settings.php:892 msgid "Minimum of 10 seconds, no maximum" msgstr "" -#: ../../mod/settings.php:892 +#: ../../mod/settings.php:893 msgid "Maximum number of conversations to load at any time:" msgstr "" -#: ../../mod/settings.php:892 +#: ../../mod/settings.php:893 msgid "Maximum of 100 items" msgstr "" -#: ../../mod/settings.php:893 +#: ../../mod/settings.php:894 msgid "Don't show emoticons" msgstr "" -#: ../../mod/settings.php:929 +#: ../../mod/settings.php:930 msgid "Nobody except yourself" msgstr "" -#: ../../mod/settings.php:930 +#: ../../mod/settings.php:931 msgid "Only those you specifically allow" msgstr "" -#: ../../mod/settings.php:931 +#: ../../mod/settings.php:932 msgid "Anybody in your address book" msgstr "" -#: ../../mod/settings.php:932 +#: ../../mod/settings.php:933 msgid "Anybody on this website" msgstr "" -#: ../../mod/settings.php:933 +#: ../../mod/settings.php:934 msgid "Anybody in this network" msgstr "" -#: ../../mod/settings.php:934 +#: ../../mod/settings.php:935 msgid "Anybody on the internet" msgstr "" -#: ../../mod/settings.php:1008 +#: ../../mod/settings.php:1009 msgid "Publish your default profile in the network directory" msgstr "" -#: ../../mod/settings.php:1013 +#: ../../mod/settings.php:1014 msgid "Allow us to suggest you as a potential friend to new members?" msgstr "" -#: ../../mod/settings.php:1017 ../../mod/profile_photo.php:298 +#: ../../mod/settings.php:1018 ../../mod/profile_photo.php:298 msgid "or" msgstr "" -#: ../../mod/settings.php:1022 +#: ../../mod/settings.php:1023 msgid "Your channel address is" msgstr "" -#: ../../mod/settings.php:1033 +#: ../../mod/settings.php:1034 msgid "Automatically expire posts after this many days:" msgstr "" -#: ../../mod/settings.php:1033 +#: ../../mod/settings.php:1034 msgid "If empty, posts will not expire. Expired posts will be deleted" msgstr "" -#: ../../mod/settings.php:1034 +#: ../../mod/settings.php:1035 msgid "Advanced expiration settings" msgstr "" -#: ../../mod/settings.php:1035 +#: ../../mod/settings.php:1036 msgid "Advanced Expiration" msgstr "" -#: ../../mod/settings.php:1036 +#: ../../mod/settings.php:1037 msgid "Expire posts:" msgstr "" -#: ../../mod/settings.php:1038 +#: ../../mod/settings.php:1039 msgid "Expire starred posts:" msgstr "" -#: ../../mod/settings.php:1039 +#: ../../mod/settings.php:1040 msgid "Expire photos:" msgstr "" -#: ../../mod/settings.php:1040 +#: ../../mod/settings.php:1041 msgid "Only expire posts by others:" msgstr "" -#: ../../mod/settings.php:1051 +#: ../../mod/settings.php:1052 msgid "Channel Settings" msgstr "" -#: ../../mod/settings.php:1060 +#: ../../mod/settings.php:1061 msgid "Basic Settings" msgstr "" -#: ../../mod/settings.php:1063 +#: ../../mod/settings.php:1064 msgid "Your Timezone:" msgstr "" -#: ../../mod/settings.php:1064 +#: ../../mod/settings.php:1065 msgid "Default Post Location:" msgstr "" -#: ../../mod/settings.php:1065 +#: ../../mod/settings.php:1066 msgid "Use Browser Location:" msgstr "" -#: ../../mod/settings.php:1067 +#: ../../mod/settings.php:1068 msgid "Adult Content" msgstr "" -#: ../../mod/settings.php:1067 +#: ../../mod/settings.php:1068 msgid "This channel publishes adult content." msgstr "" -#: ../../mod/settings.php:1069 +#: ../../mod/settings.php:1070 msgid "Security and Privacy Settings" msgstr "" -#: ../../mod/settings.php:1071 +#: ../../mod/settings.php:1072 msgid "Quick Privacy Settings:" msgstr "" -#: ../../mod/settings.php:1072 +#: ../../mod/settings.php:1073 msgid "Very Public - extremely permissive" msgstr "" -#: ../../mod/settings.php:1073 +#: ../../mod/settings.php:1074 msgid "Typical - default public, privacy when desired" msgstr "" -#: ../../mod/settings.php:1074 +#: ../../mod/settings.php:1075 msgid "Private - default private, rarely open or public" msgstr "" -#: ../../mod/settings.php:1075 +#: ../../mod/settings.php:1076 msgid "Blocked - default blocked to/from everybody" msgstr "" -#: ../../mod/settings.php:1078 +#: ../../mod/settings.php:1079 msgid "Maximum Friend Requests/Day:" msgstr "" -#: ../../mod/settings.php:1078 +#: ../../mod/settings.php:1079 msgid "May reduce spam activity" msgstr "" -#: ../../mod/settings.php:1079 +#: ../../mod/settings.php:1080 msgid "Default Post Permissions" msgstr "" -#: ../../mod/settings.php:1080 +#: ../../mod/settings.php:1081 msgid "(click to open/close)" msgstr "" -#: ../../mod/settings.php:1093 +#: ../../mod/settings.php:1094 msgid "Maximum private messages per day from unknown people:" msgstr "" -#: ../../mod/settings.php:1093 +#: ../../mod/settings.php:1094 msgid "Useful to reduce spamming" msgstr "" -#: ../../mod/settings.php:1096 +#: ../../mod/settings.php:1097 msgid "Notification Settings" msgstr "" -#: ../../mod/settings.php:1097 +#: ../../mod/settings.php:1098 msgid "By default post a status message when:" msgstr "" -#: ../../mod/settings.php:1098 +#: ../../mod/settings.php:1099 msgid "accepting a friend request" msgstr "" -#: ../../mod/settings.php:1099 +#: ../../mod/settings.php:1100 msgid "joining a forum/community" msgstr "" -#: ../../mod/settings.php:1100 +#: ../../mod/settings.php:1101 msgid "making an <em>interesting</em> profile change" msgstr "" -#: ../../mod/settings.php:1101 +#: ../../mod/settings.php:1102 msgid "Send a notification email when:" msgstr "" -#: ../../mod/settings.php:1102 +#: ../../mod/settings.php:1103 msgid "You receive an introduction" msgstr "" -#: ../../mod/settings.php:1103 +#: ../../mod/settings.php:1104 msgid "Your introductions are confirmed" msgstr "" -#: ../../mod/settings.php:1104 +#: ../../mod/settings.php:1105 msgid "Someone writes on your profile wall" msgstr "" -#: ../../mod/settings.php:1105 +#: ../../mod/settings.php:1106 msgid "Someone writes a followup comment" msgstr "" -#: ../../mod/settings.php:1106 +#: ../../mod/settings.php:1107 msgid "You receive a private message" msgstr "" -#: ../../mod/settings.php:1107 +#: ../../mod/settings.php:1108 msgid "You receive a friend suggestion" msgstr "" -#: ../../mod/settings.php:1108 +#: ../../mod/settings.php:1109 msgid "You are tagged in a post" msgstr "" -#: ../../mod/settings.php:1109 +#: ../../mod/settings.php:1110 msgid "You are poked/prodded/etc. in a post" msgstr "" -#: ../../mod/settings.php:1112 +#: ../../mod/settings.php:1113 msgid "Advanced Account/Page Type Settings" msgstr "" -#: ../../mod/settings.php:1113 +#: ../../mod/settings.php:1114 msgid "Change the behaviour of this account for special situations" msgstr "" @@ -4082,15 +4078,15 @@ msgstr "" msgid "Site" msgstr "" -#: ../../mod/admin.php:88 ../../mod/admin.php:669 ../../mod/admin.php:681 +#: ../../mod/admin.php:88 ../../mod/admin.php:678 ../../mod/admin.php:690 msgid "Users" msgstr "" -#: ../../mod/admin.php:89 ../../mod/admin.php:767 ../../mod/admin.php:809 +#: ../../mod/admin.php:89 ../../mod/admin.php:776 ../../mod/admin.php:818 msgid "Plugins" msgstr "" -#: ../../mod/admin.php:90 ../../mod/admin.php:972 ../../mod/admin.php:1008 +#: ../../mod/admin.php:90 ../../mod/admin.php:981 ../../mod/admin.php:1017 msgid "Themes" msgstr "" @@ -4102,7 +4098,7 @@ msgstr "" msgid "DB updates" msgstr "" -#: ../../mod/admin.php:106 ../../mod/admin.php:113 ../../mod/admin.php:1095 +#: ../../mod/admin.php:106 ../../mod/admin.php:113 ../../mod/admin.php:1104 msgid "Logs" msgstr "" @@ -4119,8 +4115,8 @@ msgid "Message queues" msgstr "" #: ../../mod/admin.php:193 ../../mod/admin.php:416 ../../mod/admin.php:474 -#: ../../mod/admin.php:668 ../../mod/admin.php:766 ../../mod/admin.php:808 -#: ../../mod/admin.php:971 ../../mod/admin.php:1007 ../../mod/admin.php:1094 +#: ../../mod/admin.php:677 ../../mod/admin.php:775 ../../mod/admin.php:817 +#: ../../mod/admin.php:980 ../../mod/admin.php:1016 ../../mod/admin.php:1103 msgid "Administration" msgstr "" @@ -4180,7 +4176,7 @@ msgstr "" msgid "Tiered Access" msgstr "" -#: ../../mod/admin.php:419 ../../mod/register.php:172 +#: ../../mod/admin.php:419 ../../mod/register.php:180 msgid "Registration" msgstr "" @@ -4458,149 +4454,137 @@ msgstr "" msgid "User '%s' blocked" msgstr "" -#: ../../mod/admin.php:650 -msgid "Normal Account" -msgstr "" - -#: ../../mod/admin.php:651 -msgid "Soapbox Account" -msgstr "" - -#: ../../mod/admin.php:652 -msgid "Community/Celebrity Account" -msgstr "" - -#: ../../mod/admin.php:653 -msgid "Automatic Friend Account" -msgstr "" - -#: ../../mod/admin.php:671 +#: ../../mod/admin.php:680 msgid "select all" msgstr "" -#: ../../mod/admin.php:672 +#: ../../mod/admin.php:681 msgid "User registrations waiting for confirm" msgstr "" -#: ../../mod/admin.php:673 +#: ../../mod/admin.php:682 msgid "Request date" msgstr "" -#: ../../mod/admin.php:674 +#: ../../mod/admin.php:683 msgid "No registrations." msgstr "" -#: ../../mod/admin.php:675 ../../mod/intro.php:11 ../../mod/intro.php:98 +#: ../../mod/admin.php:684 ../../mod/intro.php:11 ../../mod/intro.php:98 #: ../../mod/notifications.php:159 ../../mod/notifications.php:206 msgid "Approve" msgstr "" -#: ../../mod/admin.php:676 +#: ../../mod/admin.php:685 msgid "Deny" msgstr "" -#: ../../mod/admin.php:678 ../../mod/intro.php:14 ../../mod/intro.php:99 -#: ../../mod/connections.php:328 ../../mod/connections.php:470 +#: ../../mod/admin.php:687 ../../mod/intro.php:14 ../../mod/intro.php:99 +#: ../../mod/connections.php:348 ../../mod/connections.php:490 msgid "Block" msgstr "" -#: ../../mod/admin.php:679 ../../mod/connections.php:328 -#: ../../mod/connections.php:470 +#: ../../mod/admin.php:688 ../../mod/connections.php:348 +#: ../../mod/connections.php:490 msgid "Unblock" msgstr "" -#: ../../mod/admin.php:682 +#: ../../mod/admin.php:691 msgid "Register date" msgstr "" -#: ../../mod/admin.php:682 +#: ../../mod/admin.php:691 msgid "Last login" msgstr "" -#: ../../mod/admin.php:682 +#: ../../mod/admin.php:691 +msgid "Expires" +msgstr "" + +#: ../../mod/admin.php:691 msgid "Service Class" msgstr "" -#: ../../mod/admin.php:684 +#: ../../mod/admin.php:693 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:685 +#: ../../mod/admin.php:694 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:726 +#: ../../mod/admin.php:735 #, php-format msgid "Plugin %s disabled." msgstr "" -#: ../../mod/admin.php:730 +#: ../../mod/admin.php:739 #, php-format msgid "Plugin %s enabled." msgstr "" -#: ../../mod/admin.php:740 ../../mod/admin.php:942 +#: ../../mod/admin.php:749 ../../mod/admin.php:951 msgid "Disable" msgstr "" -#: ../../mod/admin.php:742 ../../mod/admin.php:944 +#: ../../mod/admin.php:751 ../../mod/admin.php:953 msgid "Enable" msgstr "" -#: ../../mod/admin.php:768 ../../mod/admin.php:973 +#: ../../mod/admin.php:777 ../../mod/admin.php:982 msgid "Toggle" msgstr "" -#: ../../mod/admin.php:776 ../../mod/admin.php:983 +#: ../../mod/admin.php:785 ../../mod/admin.php:992 msgid "Author: " msgstr "" -#: ../../mod/admin.php:777 ../../mod/admin.php:984 +#: ../../mod/admin.php:786 ../../mod/admin.php:993 msgid "Maintainer: " msgstr "" -#: ../../mod/admin.php:906 +#: ../../mod/admin.php:915 msgid "No themes found." msgstr "" -#: ../../mod/admin.php:965 +#: ../../mod/admin.php:974 msgid "Screenshot" msgstr "" -#: ../../mod/admin.php:1013 +#: ../../mod/admin.php:1022 msgid "[Experimental]" msgstr "" -#: ../../mod/admin.php:1014 +#: ../../mod/admin.php:1023 msgid "[Unsupported]" msgstr "" -#: ../../mod/admin.php:1041 +#: ../../mod/admin.php:1050 msgid "Log settings updated." msgstr "" -#: ../../mod/admin.php:1097 +#: ../../mod/admin.php:1106 msgid "Clear" msgstr "" -#: ../../mod/admin.php:1103 +#: ../../mod/admin.php:1112 msgid "Debugging" msgstr "" -#: ../../mod/admin.php:1104 +#: ../../mod/admin.php:1113 msgid "Log file" msgstr "" -#: ../../mod/admin.php:1104 +#: ../../mod/admin.php:1113 msgid "" "Must be writable by web server. Relative to your Red top-level directory." msgstr "" -#: ../../mod/admin.php:1105 +#: ../../mod/admin.php:1114 msgid "Log level" msgstr "" @@ -4908,11 +4892,11 @@ msgstr "" msgid "added your channel" msgstr "" -#: ../../mod/ping.php:230 ../../boot.php:1862 ../../boot.php:1942 +#: ../../mod/ping.php:230 ../../boot.php:1858 ../../boot.php:1938 msgid "g A l F d" msgstr "" -#: ../../mod/ping.php:252 ../../boot.php:1908 ../../boot.php:1983 +#: ../../mod/ping.php:252 ../../boot.php:1904 ../../boot.php:1979 msgid "[today]" msgstr "" @@ -4949,7 +4933,7 @@ msgid "Drop" msgstr "" #: ../../mod/menu.php:57 ../../mod/network.php:321 -#: ../../mod/connections.php:532 +#: ../../mod/connections.php:552 msgid "New" msgstr "" @@ -5116,11 +5100,11 @@ msgstr "" msgid "Layout Name" msgstr "" -#: ../../mod/help.php:30 +#: ../../mod/help.php:41 msgid "Help:" msgstr "" -#: ../../mod/help.php:38 ../../index.php:226 +#: ../../mod/help.php:53 ../../index.php:226 msgid "Not Found" msgstr "" @@ -5188,11 +5172,11 @@ msgstr "" msgid "Refresh" msgstr "" -#: ../../mod/network.php:385 ../../mod/connections.php:384 +#: ../../mod/network.php:385 ../../mod/connections.php:404 msgid "Me" msgstr "" -#: ../../mod/network.php:386 ../../mod/connections.php:386 +#: ../../mod/network.php:386 ../../mod/connections.php:406 msgid "Best Friends" msgstr "" @@ -5200,11 +5184,11 @@ msgstr "" msgid "Co-workers" msgstr "" -#: ../../mod/network.php:389 ../../mod/connections.php:388 +#: ../../mod/network.php:389 ../../mod/connections.php:408 msgid "Former Friends" msgstr "" -#: ../../mod/network.php:390 ../../mod/connections.php:389 +#: ../../mod/network.php:390 ../../mod/connections.php:409 msgid "Acquaintances" msgstr "" @@ -5229,7 +5213,7 @@ msgid "Invalid connection." msgstr "" #: ../../mod/intro.php:17 ../../mod/intro.php:100 -#: ../../mod/connections.php:335 ../../mod/connections.php:471 +#: ../../mod/connections.php:355 ../../mod/connections.php:491 #: ../../mod/notifications.php:51 ../../mod/notifications.php:162 #: ../../mod/notifications.php:208 msgid "Ignore" @@ -5255,7 +5239,7 @@ msgstr "" msgid "System error. Please try again later." msgstr "" -#: ../../mod/intro.php:95 ../../mod/connections.php:476 +#: ../../mod/intro.php:95 ../../mod/connections.php:496 #: ../../mod/notifications.php:155 ../../mod/notifications.php:202 msgid "Hide this contact from others" msgstr "" @@ -5287,373 +5271,373 @@ msgstr "" msgid "Failed to update connection record." msgstr "" -#: ../../mod/connections.php:199 +#: ../../mod/connections.php:219 msgid "Could not access address book record." msgstr "" -#: ../../mod/connections.php:213 +#: ../../mod/connections.php:233 msgid "Refresh failed - channel is currently unavailable." msgstr "" -#: ../../mod/connections.php:220 +#: ../../mod/connections.php:240 msgid "Channel has been unblocked" msgstr "" -#: ../../mod/connections.php:221 +#: ../../mod/connections.php:241 msgid "Channel has been blocked" msgstr "" -#: ../../mod/connections.php:225 ../../mod/connections.php:237 -#: ../../mod/connections.php:249 ../../mod/connections.php:261 -#: ../../mod/connections.php:276 +#: ../../mod/connections.php:245 ../../mod/connections.php:257 +#: ../../mod/connections.php:269 ../../mod/connections.php:281 +#: ../../mod/connections.php:296 msgid "Unable to set address book parameters." msgstr "" -#: ../../mod/connections.php:232 +#: ../../mod/connections.php:252 msgid "Channel has been unignored" msgstr "" -#: ../../mod/connections.php:233 +#: ../../mod/connections.php:253 msgid "Channel has been ignored" msgstr "" -#: ../../mod/connections.php:244 +#: ../../mod/connections.php:264 msgid "Channel has been unarchived" msgstr "" -#: ../../mod/connections.php:245 +#: ../../mod/connections.php:265 msgid "Channel has been archived" msgstr "" -#: ../../mod/connections.php:256 +#: ../../mod/connections.php:276 msgid "Channel has been unhidden" msgstr "" -#: ../../mod/connections.php:257 +#: ../../mod/connections.php:277 msgid "Channel has been hidden" msgstr "" -#: ../../mod/connections.php:271 +#: ../../mod/connections.php:291 msgid "Channel has been approved" msgstr "" -#: ../../mod/connections.php:272 +#: ../../mod/connections.php:292 msgid "Channel has been unapproved" msgstr "" -#: ../../mod/connections.php:290 +#: ../../mod/connections.php:310 msgid "Contact has been removed." msgstr "" -#: ../../mod/connections.php:310 +#: ../../mod/connections.php:330 #, php-format msgid "View %s's profile" msgstr "" -#: ../../mod/connections.php:314 +#: ../../mod/connections.php:334 msgid "Refresh Permissions" msgstr "" -#: ../../mod/connections.php:317 +#: ../../mod/connections.php:337 msgid "Fetch updated permissions" msgstr "" -#: ../../mod/connections.php:321 +#: ../../mod/connections.php:341 msgid "Recent Activity" msgstr "" -#: ../../mod/connections.php:324 +#: ../../mod/connections.php:344 msgid "View recent posts and comments" msgstr "" -#: ../../mod/connections.php:331 +#: ../../mod/connections.php:351 msgid "Block or Unblock this connection" msgstr "" -#: ../../mod/connections.php:335 ../../mod/connections.php:471 +#: ../../mod/connections.php:355 ../../mod/connections.php:491 msgid "Unignore" msgstr "" -#: ../../mod/connections.php:338 +#: ../../mod/connections.php:358 msgid "Ignore or Unignore this connection" msgstr "" -#: ../../mod/connections.php:341 +#: ../../mod/connections.php:361 msgid "Unarchive" msgstr "" -#: ../../mod/connections.php:341 +#: ../../mod/connections.php:361 msgid "Archive" msgstr "" -#: ../../mod/connections.php:344 +#: ../../mod/connections.php:364 msgid "Archive or Unarchive this connection" msgstr "" -#: ../../mod/connections.php:347 +#: ../../mod/connections.php:367 msgid "Unhide" msgstr "" -#: ../../mod/connections.php:347 +#: ../../mod/connections.php:367 msgid "Hide" msgstr "" -#: ../../mod/connections.php:350 +#: ../../mod/connections.php:370 msgid "Hide or Unhide this connection" msgstr "" -#: ../../mod/connections.php:357 +#: ../../mod/connections.php:377 msgid "Delete this connection" msgstr "" -#: ../../mod/connections.php:390 +#: ../../mod/connections.php:410 msgid "Unknown" msgstr "" -#: ../../mod/connections.php:400 ../../mod/connections.php:429 +#: ../../mod/connections.php:420 ../../mod/connections.php:449 msgid "Approve this connection" msgstr "" -#: ../../mod/connections.php:400 +#: ../../mod/connections.php:420 msgid "Accept connection to allow communication" msgstr "" -#: ../../mod/connections.php:416 +#: ../../mod/connections.php:436 msgid "Automatic Permissions Settings" msgstr "" -#: ../../mod/connections.php:416 +#: ../../mod/connections.php:436 #, php-format msgid "Connections: settings for %s" msgstr "" -#: ../../mod/connections.php:420 +#: ../../mod/connections.php:440 msgid "" "When receiving a channel introduction, any permissions provided here will be " "applied to the new connection automatically and the introduction approved. " "Leave this page if you do not wish to use this feature." msgstr "" -#: ../../mod/connections.php:422 +#: ../../mod/connections.php:442 msgid "Slide to adjust your degree of friendship" msgstr "" -#: ../../mod/connections.php:428 +#: ../../mod/connections.php:448 msgid "inherited" msgstr "" -#: ../../mod/connections.php:430 +#: ../../mod/connections.php:450 msgid "Connection has no individual permissions!" msgstr "" -#: ../../mod/connections.php:431 +#: ../../mod/connections.php:451 msgid "" "This may be appropriate based on your <a href=\"settings\">privacy settings</" "a>, though you may wish to review the \"Advanced Permissions\"." msgstr "" -#: ../../mod/connections.php:433 +#: ../../mod/connections.php:453 msgid "Profile Visibility" msgstr "" -#: ../../mod/connections.php:434 +#: ../../mod/connections.php:454 #, php-format msgid "" "Please choose the profile you would like to display to %s when viewing your " "profile securely." msgstr "" -#: ../../mod/connections.php:435 +#: ../../mod/connections.php:455 msgid "Contact Information / Notes" msgstr "" -#: ../../mod/connections.php:436 +#: ../../mod/connections.php:456 msgid "Edit contact notes" msgstr "" -#: ../../mod/connections.php:438 +#: ../../mod/connections.php:458 msgid "Their Settings" msgstr "" -#: ../../mod/connections.php:439 +#: ../../mod/connections.php:459 msgid "My Settings" msgstr "" -#: ../../mod/connections.php:441 +#: ../../mod/connections.php:461 msgid "Forum Members" msgstr "" -#: ../../mod/connections.php:442 +#: ../../mod/connections.php:462 msgid "Soapbox" msgstr "" -#: ../../mod/connections.php:443 +#: ../../mod/connections.php:463 msgid "Full Sharing" msgstr "" -#: ../../mod/connections.php:444 +#: ../../mod/connections.php:464 msgid "Cautious Sharing" msgstr "" -#: ../../mod/connections.php:445 +#: ../../mod/connections.php:465 msgid "Follow Only" msgstr "" -#: ../../mod/connections.php:446 +#: ../../mod/connections.php:466 msgid "Individual Permissions" msgstr "" -#: ../../mod/connections.php:447 +#: ../../mod/connections.php:467 msgid "" "Some permissions may be inherited from your <a href=\"settings\">privacy " "settings</a>, which have higher priority. Changing those on this page will " "have no effect." msgstr "" -#: ../../mod/connections.php:448 +#: ../../mod/connections.php:468 msgid "Advanced Permissions" msgstr "" -#: ../../mod/connections.php:449 +#: ../../mod/connections.php:469 msgid "Quick Links" msgstr "" -#: ../../mod/connections.php:453 +#: ../../mod/connections.php:473 #, php-format msgid "Visit %s's profile - %s" msgstr "" -#: ../../mod/connections.php:454 +#: ../../mod/connections.php:474 msgid "Block/Unblock contact" msgstr "" -#: ../../mod/connections.php:455 +#: ../../mod/connections.php:475 msgid "Ignore contact" msgstr "" -#: ../../mod/connections.php:456 +#: ../../mod/connections.php:476 msgid "Repair URL settings" msgstr "" -#: ../../mod/connections.php:457 +#: ../../mod/connections.php:477 msgid "View conversations" msgstr "" -#: ../../mod/connections.php:459 +#: ../../mod/connections.php:479 msgid "Delete contact" msgstr "" -#: ../../mod/connections.php:462 +#: ../../mod/connections.php:482 msgid "Last update:" msgstr "" -#: ../../mod/connections.php:464 +#: ../../mod/connections.php:484 msgid "Update public posts" msgstr "" -#: ../../mod/connections.php:466 +#: ../../mod/connections.php:486 msgid "Update now" msgstr "" -#: ../../mod/connections.php:472 +#: ../../mod/connections.php:492 msgid "Currently blocked" msgstr "" -#: ../../mod/connections.php:473 +#: ../../mod/connections.php:493 msgid "Currently ignored" msgstr "" -#: ../../mod/connections.php:474 +#: ../../mod/connections.php:494 msgid "Currently archived" msgstr "" -#: ../../mod/connections.php:475 +#: ../../mod/connections.php:495 msgid "Currently pending" msgstr "" -#: ../../mod/connections.php:476 +#: ../../mod/connections.php:496 msgid "" "Replies/likes to your public posts <strong>may</strong> still be visible" msgstr "" -#: ../../mod/connections.php:512 ../../mod/connections.php:584 +#: ../../mod/connections.php:532 ../../mod/connections.php:604 msgid "Blocked" msgstr "" -#: ../../mod/connections.php:517 ../../mod/connections.php:591 +#: ../../mod/connections.php:537 ../../mod/connections.php:611 msgid "Ignored" msgstr "" -#: ../../mod/connections.php:522 ../../mod/connections.php:605 +#: ../../mod/connections.php:542 ../../mod/connections.php:625 msgid "Hidden" msgstr "" -#: ../../mod/connections.php:527 ../../mod/connections.php:598 +#: ../../mod/connections.php:547 ../../mod/connections.php:618 msgid "Archived" msgstr "" -#: ../../mod/connections.php:538 +#: ../../mod/connections.php:558 msgid "All" msgstr "" -#: ../../mod/connections.php:559 +#: ../../mod/connections.php:579 msgid "Suggestions" msgstr "" -#: ../../mod/connections.php:562 +#: ../../mod/connections.php:582 msgid "Suggest new connections" msgstr "" -#: ../../mod/connections.php:568 +#: ../../mod/connections.php:588 msgid "Show pending (new) connections" msgstr "" -#: ../../mod/connections.php:571 +#: ../../mod/connections.php:591 msgid "All Connections" msgstr "" -#: ../../mod/connections.php:574 +#: ../../mod/connections.php:594 msgid "Show all connections" msgstr "" -#: ../../mod/connections.php:577 +#: ../../mod/connections.php:597 msgid "Unblocked" msgstr "" -#: ../../mod/connections.php:580 +#: ../../mod/connections.php:600 msgid "Only show unblocked connections" msgstr "" -#: ../../mod/connections.php:587 +#: ../../mod/connections.php:607 msgid "Only show blocked connections" msgstr "" -#: ../../mod/connections.php:594 +#: ../../mod/connections.php:614 msgid "Only show ignored connections" msgstr "" -#: ../../mod/connections.php:601 +#: ../../mod/connections.php:621 msgid "Only show archived connections" msgstr "" -#: ../../mod/connections.php:608 +#: ../../mod/connections.php:628 msgid "Only show hidden connections" msgstr "" -#: ../../mod/connections.php:650 +#: ../../mod/connections.php:670 #, php-format msgid "%1$s [%2$s]" msgstr "" -#: ../../mod/connections.php:651 ../../mod/nogroup.php:41 +#: ../../mod/connections.php:671 ../../mod/nogroup.php:41 msgid "Edit contact" msgstr "" -#: ../../mod/connections.php:675 +#: ../../mod/connections.php:695 msgid "Search your connections" msgstr "" -#: ../../mod/connections.php:676 +#: ../../mod/connections.php:696 msgid "Finding: " msgstr "" @@ -5913,23 +5897,23 @@ msgstr "" msgid "Edit/Manage Profiles" msgstr "" -#: ../../mod/profiles.php:624 ../../boot.php:1759 +#: ../../mod/profiles.php:624 ../../boot.php:1755 msgid "Change profile photo" msgstr "" -#: ../../mod/profiles.php:625 ../../boot.php:1766 +#: ../../mod/profiles.php:625 ../../boot.php:1762 msgid "Create New Profile" msgstr "" -#: ../../mod/profiles.php:636 ../../boot.php:1780 +#: ../../mod/profiles.php:636 ../../boot.php:1776 msgid "Profile Image" msgstr "" -#: ../../mod/profiles.php:639 ../../boot.php:1783 +#: ../../mod/profiles.php:639 ../../boot.php:1779 msgid "visible to everybody" msgstr "" -#: ../../mod/profiles.php:640 ../../boot.php:1784 +#: ../../mod/profiles.php:640 ../../boot.php:1780 msgid "Edit visibility" msgstr "" @@ -6010,7 +5994,7 @@ msgid "" "Password reset failed." msgstr "" -#: ../../mod/lostpass.php:85 ../../boot.php:1473 +#: ../../mod/lostpass.php:85 ../../boot.php:1469 msgid "Password Reset" msgstr "" @@ -6552,7 +6536,7 @@ msgstr "" msgid "Make this post private" msgstr "" -#: ../../mod/wall_upload.php:41 ../../mod/item.php:1057 +#: ../../mod/wall_upload.php:41 ../../mod/item.php:1049 msgid "Wall Photos" msgstr "" @@ -6633,12 +6617,12 @@ msgstr "" msgid "System error. Post not saved." msgstr "" -#: ../../mod/item.php:1136 +#: ../../mod/item.php:1128 #, php-format msgid "You have reached your limit of %1$.0f top level posts." msgstr "" -#: ../../mod/item.php:1142 +#: ../../mod/item.php:1134 #, php-format msgid "You have reached your limit of %1$.0f webpages." msgstr "" @@ -6721,69 +6705,69 @@ msgstr "" msgid "Registration Policy" msgstr "" -#: ../../mod/register.php:35 +#: ../../mod/register.php:43 msgid "Maximum daily site registrations exceeded. Please try again tomorrow." msgstr "" -#: ../../mod/register.php:41 +#: ../../mod/register.php:49 msgid "" "Please indicate acceptance of the Terms of Service. Registration failed." msgstr "" -#: ../../mod/register.php:69 +#: ../../mod/register.php:77 msgid "Passwords do not match." msgstr "" -#: ../../mod/register.php:97 +#: ../../mod/register.php:105 msgid "" "Registration successful. Please check your email for validation instructions." msgstr "" -#: ../../mod/register.php:103 +#: ../../mod/register.php:111 msgid "Your registration is pending approval by the site owner." msgstr "" -#: ../../mod/register.php:106 +#: ../../mod/register.php:114 msgid "Your registration can not be processed." msgstr "" -#: ../../mod/register.php:141 +#: ../../mod/register.php:149 msgid "" "This site has exceeded the number of allowed daily account registrations. " "Please try again tomorrow." msgstr "" -#: ../../mod/register.php:152 +#: ../../mod/register.php:160 msgid "Terms of Service" msgstr "" -#: ../../mod/register.php:158 +#: ../../mod/register.php:166 #, php-format msgid "I accept the %s for this website" msgstr "" -#: ../../mod/register.php:160 +#: ../../mod/register.php:168 #, php-format msgid "I am over 13 years of age and accept the %s for this website" msgstr "" -#: ../../mod/register.php:175 +#: ../../mod/register.php:183 msgid "Membership on this site is by invitation only." msgstr "" -#: ../../mod/register.php:176 +#: ../../mod/register.php:184 msgid "Please enter your invitation code" msgstr "" -#: ../../mod/register.php:179 +#: ../../mod/register.php:187 msgid "Your email address" msgstr "" -#: ../../mod/register.php:180 +#: ../../mod/register.php:188 msgid "Choose a password" msgstr "" -#: ../../mod/register.php:181 +#: ../../mod/register.php:189 msgid "Please re-enter your password" msgstr "" @@ -6791,13 +6775,13 @@ msgstr "" msgid "Please login." msgstr "" -#: ../../mod/post.php:114 +#: ../../mod/post.php:119 msgid "" "Remote authentication blocked. You are logged into this site locally. Please " "logout and retry." msgstr "" -#: ../../mod/post.php:127 +#: ../../mod/post.php:132 #, php-format msgid "Welcome %s. Remote authentication successful." msgstr "" @@ -6858,94 +6842,106 @@ msgstr "" msgid "Set your current mood and tell your friends" msgstr "" -#: ../../view/theme/redbasic/php/config.php:68 +#: ../../view/theme/redbasic/php/config.php:74 msgid "Scheme Default" msgstr "" -#: ../../view/theme/redbasic/php/config.php:69 +#: ../../view/theme/redbasic/php/config.php:75 msgid "red" msgstr "" -#: ../../view/theme/redbasic/php/config.php:70 +#: ../../view/theme/redbasic/php/config.php:76 msgid "black" msgstr "" -#: ../../view/theme/redbasic/php/config.php:71 +#: ../../view/theme/redbasic/php/config.php:77 msgid "silver" msgstr "" -#: ../../view/theme/redbasic/php/config.php:82 +#: ../../view/theme/redbasic/php/config.php:88 #: ../../view/theme/apw/php/config.php:234 msgid "Theme settings" msgstr "" -#: ../../view/theme/redbasic/php/config.php:83 +#: ../../view/theme/redbasic/php/config.php:89 #: ../../view/theme/apw/php/config.php:235 msgid "Set scheme" msgstr "" -#: ../../view/theme/redbasic/php/config.php:84 +#: ../../view/theme/redbasic/php/config.php:90 msgid "Navigation bar colour" msgstr "" -#: ../../view/theme/redbasic/php/config.php:85 +#: ../../view/theme/redbasic/php/config.php:91 msgid "Set font-colour for banner" msgstr "" -#: ../../view/theme/redbasic/php/config.php:86 +#: ../../view/theme/redbasic/php/config.php:92 msgid "Set the background colour" msgstr "" -#: ../../view/theme/redbasic/php/config.php:87 +#: ../../view/theme/redbasic/php/config.php:93 msgid "Set the background image" msgstr "" -#: ../../view/theme/redbasic/php/config.php:88 +#: ../../view/theme/redbasic/php/config.php:94 msgid "Set the background colour of items" msgstr "" -#: ../../view/theme/redbasic/php/config.php:89 +#: ../../view/theme/redbasic/php/config.php:95 msgid "Set the opacity of items" msgstr "" -#: ../../view/theme/redbasic/php/config.php:90 +#: ../../view/theme/redbasic/php/config.php:96 msgid "Set the basic colour for item icons" msgstr "" -#: ../../view/theme/redbasic/php/config.php:91 +#: ../../view/theme/redbasic/php/config.php:97 msgid "Set the hover colour for item icons" msgstr "" -#: ../../view/theme/redbasic/php/config.php:92 +#: ../../view/theme/redbasic/php/config.php:98 +msgid "Set font-size for the entire application" +msgstr "" + +#: ../../view/theme/redbasic/php/config.php:99 #: ../../view/theme/apw/php/config.php:236 msgid "Set font-size for posts and comments" msgstr "" -#: ../../view/theme/redbasic/php/config.php:93 +#: ../../view/theme/redbasic/php/config.php:100 msgid "Set font-colour for posts and comments" msgstr "" -#: ../../view/theme/redbasic/php/config.php:94 +#: ../../view/theme/redbasic/php/config.php:101 msgid "Set radius of corners" msgstr "" -#: ../../view/theme/redbasic/php/config.php:95 +#: ../../view/theme/redbasic/php/config.php:102 msgid "Set shadow depth of photos" msgstr "" -#: ../../view/theme/redbasic/php/config.php:96 +#: ../../view/theme/redbasic/php/config.php:103 msgid "Set maximum width of conversation regions" msgstr "" -#: ../../view/theme/redbasic/php/config.php:97 +#: ../../view/theme/redbasic/php/config.php:104 msgid "Set minimum opacity of nav bar - to hide it" msgstr "" -#: ../../view/theme/redbasic/php/config.php:98 +#: ../../view/theme/redbasic/php/config.php:105 +msgid "Set size of conversation author photo" +msgstr "" + +#: ../../view/theme/redbasic/php/config.php:106 +msgid "Set size of followup author photos" +msgstr "" + +#: ../../view/theme/redbasic/php/config.php:107 msgid "Sloppy photo albums" msgstr "" -#: ../../view/theme/redbasic/php/config.php:98 +#: ../../view/theme/redbasic/php/config.php:107 msgid "Are you a clean desk or a messy desk person?" msgstr "" @@ -7074,113 +7070,113 @@ msgstr "" msgid "Right offset of the aside element" msgstr "" -#: ../../boot.php:1278 +#: ../../boot.php:1274 #, php-format msgid "Update %s failed. See error logs." msgstr "" -#: ../../boot.php:1281 +#: ../../boot.php:1277 #, php-format msgid "Update Error at %s" msgstr "" -#: ../../boot.php:1438 +#: ../../boot.php:1434 msgid "" "Create an account to access services and applications within the Red Matrix" msgstr "" -#: ../../boot.php:1466 +#: ../../boot.php:1462 msgid "Password" msgstr "" -#: ../../boot.php:1467 +#: ../../boot.php:1463 msgid "Remember me" msgstr "" -#: ../../boot.php:1472 +#: ../../boot.php:1468 msgid "Forgot your password?" msgstr "" -#: ../../boot.php:1537 +#: ../../boot.php:1533 msgid "permission denied" msgstr "" -#: ../../boot.php:1538 +#: ../../boot.php:1534 msgid "Got Zot?" msgstr "" -#: ../../boot.php:1597 +#: ../../boot.php:1593 msgid "Requested channel is not available." msgstr "" -#: ../../boot.php:1609 +#: ../../boot.php:1605 msgid " Sorry, you don't have the permission to view this profile. " msgstr "" -#: ../../boot.php:1765 +#: ../../boot.php:1761 msgid "Profiles" msgstr "" -#: ../../boot.php:1765 +#: ../../boot.php:1761 msgid "Manage/edit profiles" msgstr "" -#: ../../boot.php:1769 +#: ../../boot.php:1765 msgid "Edit Profile" msgstr "" -#: ../../boot.php:1863 ../../boot.php:1943 +#: ../../boot.php:1859 ../../boot.php:1939 msgid "F d" msgstr "" -#: ../../boot.php:1920 +#: ../../boot.php:1916 msgid "Birthday Reminders" msgstr "" -#: ../../boot.php:1921 +#: ../../boot.php:1917 msgid "Birthdays this week:" msgstr "" -#: ../../boot.php:1976 +#: ../../boot.php:1972 msgid "[No description]" msgstr "" -#: ../../boot.php:1994 +#: ../../boot.php:1990 msgid "Event Reminders" msgstr "" -#: ../../boot.php:1995 +#: ../../boot.php:1991 msgid "Events this week:" msgstr "" -#: ../../boot.php:2229 +#: ../../boot.php:2225 msgid "Channel" msgstr "" -#: ../../boot.php:2232 +#: ../../boot.php:2228 msgid "Status Messages and Posts" msgstr "" -#: ../../boot.php:2236 +#: ../../boot.php:2232 msgid "About" msgstr "" -#: ../../boot.php:2239 +#: ../../boot.php:2235 msgid "Profile Details" msgstr "" -#: ../../boot.php:2257 +#: ../../boot.php:2253 msgid "Events and Calendar" msgstr "" -#: ../../boot.php:2262 +#: ../../boot.php:2258 msgid "Webpages" msgstr "" -#: ../../boot.php:2265 +#: ../../boot.php:2261 msgid "Manage Webpages" msgstr "" -#: ../../boot.php:2547 +#: ../../boot.php:2545 msgid "toggle mobile" msgstr "" diff --git a/version.inc b/version.inc index 3e026cef2..9c9570aa4 100644 --- a/version.inc +++ b/version.inc @@ -1 +1 @@ -2013-11-21.504 +2013-11-22.505 diff --git a/view/php/theme_init.php b/view/php/theme_init.php index 1fefa110e..69d99893a 100644 --- a/view/php/theme_init.php +++ b/view/php/theme_init.php @@ -42,6 +42,9 @@ head_add_js('library/colorbox/jquery.colorbox-min.js'); /** * Those who require this feature will know what to do with it. * Those who don't, won't. + * Eventually this functionality needs to be provided by a module + * such that permissions can be enforced. At the moment it's + * more of a proof of concept; but sufficient for our immediate needs. */ $channel = get_app()->get_channel(); |