diff options
| author | friendica <info@friendica.com> | 2013-12-20 01:39:42 -0800 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2013-12-20 01:39:42 -0800 |
| commit | a084a3fa47879f00a535501f14f32c3ff55f7d29 (patch) | |
| tree | a4dd3caa2833ced598f362b1fdac4ace37088342 | |
| parent | 916f3e9afc0dcf7f4255bac917ed6236595c7e07 (diff) | |
| download | volse-hubzilla-a084a3fa47879f00a535501f14f32c3ff55f7d29.tar.gz volse-hubzilla-a084a3fa47879f00a535501f14f32c3ff55f7d29.tar.bz2 volse-hubzilla-a084a3fa47879f00a535501f14f32c3ff55f7d29.zip | |
comanchify mod_search - we've got three modules left to Comanchify: admin, directory and message - each of which introduces "interesting challenges"
| -rw-r--r-- | mod/search.php | 124 | ||||
| -rw-r--r-- | util/messages.po | 2130 | ||||
| -rw-r--r-- | version.inc | 2 | ||||
| -rw-r--r-- | view/pdl/mod_search.pdl | 3 |
4 files changed, 1060 insertions, 1199 deletions
diff --git a/mod/search.php b/mod/search.php index 2b31002fa..32c8ca38e 100644 --- a/mod/search.php +++ b/mod/search.php @@ -1,76 +1,8 @@ <?php -function search_saved_searches() { - - if(! feature_enabled(local_user(),'savedsearch')) - return ''; - - $o = ''; - - $r = q("select `tid`,`term` from `term` WHERE `uid` = %d and type = %d", - intval(local_user()), - intval(TERM_SAVEDSEARCH) - ); - - if(count($r)) { - $o .= '<div id="saved-search-list" class="widget">'; - $o .= '<h3>' . t('Saved Searches') . '</h3>' . "\r\n"; - $o .= '<ul id="saved-search-ul">' . "\r\n"; - foreach($r as $rr) { - $o .= '<li class="saved-search-li clear"><a href="search/?f=&remove=1&search=' . rawurlencode($rr['term']) . '" title="' . t('Remove term') . '" onclick="return confirmDelete();"><i class="icon-remove drop-icons"></i></a> <a href="search/?f=&search=' . $rr['term'] . '" class="savedsearchterm" >' . htmlspecialchars($rr['term'], ENT_COMPAT,'UTF-8') . '</a></li>' . "\r\n"; - } - $o .= '</ul><div class="clear"></div></div>' . "\r\n"; - } - - return $o; - -} - - function search_init(&$a) { - - $search = ((x($_GET,'search')) ? trim(rawurldecode($_GET['search'])) : ''); - - if(local_user()) { - if(x($_GET,'save') && $search) { - $r = q("select `tid` from `term` where `uid` = %d and `type` = %d and `term` = '%s' limit 1", - intval(local_user()), - intval(TERM_SAVEDSEARCH), - dbesc($search) - ); - if(! count($r)) { - q("insert into `term` ( `uid`,`type`,`term` ) values ( %d, %d, '%s') ", - intval(local_user()), - intval(TERM_SAVEDSEARCH), - dbesc($search) - ); - } - } - if(x($_GET,'remove') && $search) { - q("delete from `term` where `uid` = %d and `type` = %d and `term` = '%s' limit 1", - intval(local_user()), - intval(TERM_SAVEDSEARCH), - dbesc($search) - ); - } - - $a->page['aside'] .= search_saved_searches(); - - } - else { - unset($_SESSION['theme']); - unset($_SESSION['mobile_theme']); - } - - - -} - - - -function search_post(&$a) { - if(x($_POST,'search')) - $a->data['search'] = $_POST['search']; + if(x($_REQUEST,'search')) + $a->data['search'] = $_REQUEST['search']; } @@ -133,10 +65,7 @@ function search_content(&$a,$update = 0, $load = false) { ); } else { - if (get_config('system','use_fulltext_engine')) - $sql_extra = sprintf(" AND MATCH (`item`.`body`) AGAINST ('".'"%s"'."' in boolean mode) ", dbesc(protect_sprintf($search))); - else - $sql_extra = sprintf(" AND `item`.`body` REGEXP '%s' ", dbesc(protect_sprintf(preg_quote($search)))); + $sql_extra = sprintf(" AND `item`.`body` REGEXP '%s' ", dbesc(protect_sprintf(preg_quote($search)))); } // Here is the way permissions work in the search module... @@ -144,9 +73,6 @@ function search_content(&$a,$update = 0, $load = false) { // OR your own posts if you are a logged in member // No items will be shown if the member has a blocked profile wall. - - - if((! $update) && (! $load)) { // This is ugly, but we can't pass the profile_uid through the session to the ajax updater, @@ -223,54 +149,12 @@ function search_content(&$a,$update = 0, $load = false) { } if($r) { - -// $parents_str = ids_to_querystr($r,'item_id'); - -// $items = q("SELECT `item`.*, `item`.`id` AS `item_id` -// FROM `item` -// WHERE item_restrict = 0 -// $sql_extra and parent in ( $parents_str ) " -// ); - xchan_query($r); $items = fetch_post_tags($r,true); -// $items = conv_sort($items,'created'); - } else { $items = array(); } -//logger('mod_search: items ' . count($items)); - -// $r = q("SELECT distinct(`item`.`mid`), `item`.*, `item`.`id` AS `item_id`, -// `contact`.`name`, `contact`.`photo`, `contact`.`url`, `contact`.`alias`, `contact`.`rel`, -// `contact`.`network`, `contact`.`thumb`, `contact`.`self`, `contact`.`writable`, -// `contact`.`id` AS `cid`, `contact`.`uid` AS `contact-uid`, -// `user`.`nickname` -// FROM `item` LEFT JOIN `contact` ON `contact`.`id` = `item`.`contact-id` -// LEFT JOIN `user` ON `user`.`uid` = `item`.`uid` -// WHERE `item`.`visible` = 1 AND `item`.`deleted` = 0 and `item`.`moderated` = 0 -// AND (( `item`.`allow_cid` = '' AND `item`.`allow_gid` = '' AND `item`.`deny_cid` = '' AND `item`.`deny_gid` = '' AND `item`.`private` = 0 AND `user`.`hidewall` = 0 ) -// OR `item`.`uid` = %d ) -// AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0 -// $sql_extra -// group by `item`.`mid` -// ORDER BY `received` DESC LIMIT %d , %d ", -// intval(local_user()), -// intval($a->pager['start']), -// intval($a->pager['itemspage']) - -// ); - - -// $a = fetch_post_tags($a,true); - -// if(! $items) {// -// info( t('No results.') . EOL); -// return $o; -// } - - if($tag) $o .= '<h2>Items tagged with: ' . htmlspecialchars($search, ENT_COMPAT,'UTF-8') . '</h2>'; else @@ -278,8 +162,6 @@ function search_content(&$a,$update = 0, $load = false) { $o .= conversation($a,$items,'search',$update,'client'); -// $o .= alt_pager($a,count($r)); - return $o; } diff --git a/util/messages.po b/util/messages.po index db21568c7..96a8b76f1 100644 --- a/util/messages.po +++ b/util/messages.po @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: 2013-12-13.526\n" +"Project-Id-Version: 2013-12-20.532\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-12-13 00:04-0800\n" +"POT-Creation-Date: 2013-12-20 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" @@ -81,6 +81,10 @@ msgstr "" msgid "Safe Mode" msgstr "" +#: ../../include/api.php:973 +msgid "Public Timeline" +msgstr "" + #: ../../include/enotify.php:40 msgid "Red Matrix Notification" msgstr "" @@ -152,9 +156,9 @@ msgstr "" msgid "%1$s, %2$s commented on an item/conversation you have been following." msgstr "" -#: ../../include/enotify.php:171 ../../include/enotify.php:190 -#: ../../include/enotify.php:216 ../../include/enotify.php:235 -#: ../../include/enotify.php:249 +#: ../../include/enotify.php:171 ../../include/enotify.php:187 +#: ../../include/enotify.php:213 ../../include/enotify.php:232 +#: ../../include/enotify.php:246 #, php-format msgid "Please visit %s to view and/or reply to the conversation." msgstr "" @@ -174,119 +178,119 @@ msgstr "" msgid "%1$s, %2$s posted to [zrl=%3$s]your wall[/zrl]" msgstr "" -#: ../../include/enotify.php:209 +#: ../../include/enotify.php:206 #, php-format msgid "[Red:Notify] %s tagged you" msgstr "" -#: ../../include/enotify.php:210 +#: ../../include/enotify.php:207 #, php-format msgid "%1$s, %2$s tagged you at %3$s" msgstr "" -#: ../../include/enotify.php:211 +#: ../../include/enotify.php:208 #, php-format msgid "%1$s, %2$s [zrl=%3$s]tagged you[/zrl]." msgstr "" -#: ../../include/enotify.php:224 +#: ../../include/enotify.php:221 #, php-format msgid "[Red:Notify] %1$s poked you" msgstr "" -#: ../../include/enotify.php:225 +#: ../../include/enotify.php:222 #, php-format msgid "%1$s, %2$s poked you at %3$s" msgstr "" -#: ../../include/enotify.php:226 +#: ../../include/enotify.php:223 #, php-format msgid "%1$s, %2$s [zrl=%2$s]poked you[/zrl]." msgstr "" -#: ../../include/enotify.php:242 +#: ../../include/enotify.php:239 #, php-format msgid "[Red:Notify] %s tagged your post" msgstr "" -#: ../../include/enotify.php:243 +#: ../../include/enotify.php:240 #, php-format msgid "%1$s, %2$s tagged your post at %3$s" msgstr "" -#: ../../include/enotify.php:244 +#: ../../include/enotify.php:241 #, php-format msgid "%1$s, %2$s tagged [zrl=%3$s]your post[/zrl]" msgstr "" -#: ../../include/enotify.php:256 +#: ../../include/enotify.php:253 msgid "[Red:Notify] Introduction received" msgstr "" -#: ../../include/enotify.php:257 +#: ../../include/enotify.php:254 #, php-format msgid "%1$s, you've received an introduction from '%2$s' at %3$s" msgstr "" -#: ../../include/enotify.php:258 +#: ../../include/enotify.php:255 #, php-format msgid "%1$s, you've received [zrl=%2$s]an introduction[/zrl] from %3$s." msgstr "" -#: ../../include/enotify.php:262 ../../include/enotify.php:281 +#: ../../include/enotify.php:259 ../../include/enotify.php:278 #, php-format msgid "You may visit their profile at %s" msgstr "" -#: ../../include/enotify.php:264 +#: ../../include/enotify.php:261 #, php-format msgid "Please visit %s to approve or reject the introduction." msgstr "" -#: ../../include/enotify.php:271 +#: ../../include/enotify.php:268 msgid "[Red:Notify] Friend suggestion received" msgstr "" -#: ../../include/enotify.php:272 +#: ../../include/enotify.php:269 #, php-format msgid "%1$s, you've received a friend suggestion from '%2$s' at %3$s" msgstr "" -#: ../../include/enotify.php:273 +#: ../../include/enotify.php:270 #, php-format msgid "" "%1$s, you've received [zrl=%2$s]a friend suggestion[/zrl] for %3$s from %4$s." msgstr "" -#: ../../include/enotify.php:279 +#: ../../include/enotify.php:276 msgid "Name:" msgstr "" -#: ../../include/enotify.php:280 +#: ../../include/enotify.php:277 msgid "Photo:" msgstr "" -#: ../../include/enotify.php:283 +#: ../../include/enotify.php:280 #, php-format msgid "Please visit %s to approve or reject the suggestion." msgstr "" -#: ../../include/ItemObject.php:88 ../../mod/photos.php:963 +#: ../../include/ItemObject.php:88 ../../mod/photos.php:959 msgid "Private Message" msgstr "" #: ../../include/ItemObject.php:95 ../../include/page_widgets.php:8 -#: ../../mod/webpages.php:118 ../../mod/settings.php:671 ../../mod/menu.php:55 -#: ../../mod/layouts.php:102 ../../mod/editlayout.php:100 +#: ../../mod/webpages.php:118 ../../mod/menu.php:55 ../../mod/layouts.php:102 +#: ../../mod/settings.php:569 ../../mod/editlayout.php:100 #: ../../mod/editwebpage.php:143 ../../mod/blocks.php:93 #: ../../mod/editpost.php:97 ../../mod/editblock.php:114 msgid "Edit" msgstr "" #: ../../include/ItemObject.php:107 ../../include/conversation.php:632 -#: ../../mod/settings.php:672 ../../mod/admin.php:693 ../../mod/group.php:182 -#: ../../mod/photos.php:1141 ../../mod/connections.php:378 -#: ../../mod/filestorage.php:82 +#: ../../mod/connedit.php:356 ../../mod/admin.php:693 ../../mod/group.php:176 +#: ../../mod/photos.php:1137 ../../mod/filestorage.php:82 +#: ../../mod/settings.php:570 msgid "Delete" msgstr "" @@ -322,7 +326,7 @@ msgstr "" msgid "add tag" msgstr "" -#: ../../include/ItemObject.php:174 ../../mod/photos.php:1069 +#: ../../include/ItemObject.php:174 ../../mod/photos.php:1065 msgid "I like this (toggle)" msgstr "" @@ -330,7 +334,7 @@ msgstr "" msgid "like" msgstr "" -#: ../../include/ItemObject.php:175 ../../mod/photos.php:1070 +#: ../../include/ItemObject.php:175 ../../mod/photos.php:1066 msgid "I don't like this (toggle)" msgstr "" @@ -378,8 +382,8 @@ msgid "last edited: %s" msgstr "" #: ../../include/ItemObject.php:246 ../../include/conversation.php:706 -#: ../../include/conversation.php:1116 ../../mod/photos.php:1072 -#: ../../mod/message.php:332 ../../mod/message.php:484 +#: ../../include/conversation.php:1116 ../../mod/photos.php:1068 +#: ../../mod/message.php:309 ../../mod/message.php:460 #: ../../mod/editlayout.php:109 ../../mod/editwebpage.php:152 #: ../../mod/editpost.php:106 ../../mod/editblock.php:123 msgid "Please wait" @@ -393,35 +397,35 @@ msgstr[0] "" msgstr[1] "" #: ../../include/ItemObject.php:268 ../../include/js_strings.php:7 -#: ../../include/contact_widgets.php:124 +#: ../../include/contact_widgets.php:125 msgid "show more" msgstr "" -#: ../../include/ItemObject.php:527 ../../mod/photos.php:1088 -#: ../../mod/photos.php:1175 +#: ../../include/ItemObject.php:527 ../../mod/photos.php:1084 +#: ../../mod/photos.php:1171 msgid "This is you" msgstr "" #: ../../include/ItemObject.php:529 ../../include/js_strings.php:6 -#: ../../mod/photos.php:1090 ../../mod/photos.php:1177 +#: ../../mod/photos.php:1086 ../../mod/photos.php:1173 msgid "Comment" msgstr "" #: ../../include/ItemObject.php:530 ../../mod/events.php:470 -#: ../../mod/thing.php:190 ../../mod/invite.php:154 ../../mod/setup.php:302 -#: ../../mod/setup.php:345 ../../mod/settings.php:609 -#: ../../mod/settings.php:721 ../../mod/settings.php:749 -#: ../../mod/settings.php:773 ../../mod/settings.php:844 -#: ../../mod/settings.php:1005 ../../mod/connect.php:96 -#: ../../mod/sources.php:83 ../../mod/sources.php:110 ../../mod/admin.php:420 +#: ../../mod/thing.php:190 ../../mod/invite.php:154 ../../mod/connedit.php:434 +#: ../../mod/setup.php:302 ../../mod/setup.php:345 ../../mod/connect.php:96 +#: ../../mod/sources.php:97 ../../mod/sources.php:131 ../../mod/admin.php:420 #: ../../mod/admin.php:686 ../../mod/admin.php:826 ../../mod/admin.php:1025 -#: ../../mod/admin.php:1112 ../../mod/group.php:87 ../../mod/photos.php:685 -#: ../../mod/photos.php:790 ../../mod/photos.php:1051 -#: ../../mod/photos.php:1091 ../../mod/photos.php:1178 -#: ../../mod/message.php:333 ../../mod/message.php:483 -#: ../../mod/profiles.php:518 ../../mod/connections.php:456 -#: ../../mod/import.php:387 ../../mod/poke.php:166 ../../mod/fsuggest.php:108 -#: ../../mod/mood.php:137 ../../view/theme/redbasic/php/config.php:85 +#: ../../mod/admin.php:1112 ../../mod/group.php:81 ../../mod/photos.php:681 +#: ../../mod/photos.php:786 ../../mod/photos.php:1047 +#: ../../mod/photos.php:1087 ../../mod/photos.php:1174 +#: ../../mod/message.php:310 ../../mod/message.php:459 +#: ../../mod/profiles.php:518 ../../mod/import.php:387 +#: ../../mod/settings.php:507 ../../mod/settings.php:619 +#: ../../mod/settings.php:647 ../../mod/settings.php:671 +#: ../../mod/settings.php:742 ../../mod/settings.php:903 +#: ../../mod/poke.php:166 ../../mod/fsuggest.php:108 ../../mod/mood.php:137 +#: ../../view/theme/redbasic/php/config.php:85 #: ../../view/theme/apw/php/config.php:231 #: ../../view/theme/blogga/view/theme/blog/config.php:67 #: ../../view/theme/blogga/php/config.php:67 @@ -461,154 +465,188 @@ msgid "Video" msgstr "" #: ../../include/ItemObject.php:539 ../../include/conversation.php:1079 -#: ../../mod/webpages.php:122 ../../mod/photos.php:1092 +#: ../../mod/webpages.php:122 ../../mod/photos.php:1088 #: ../../mod/editlayout.php:129 ../../mod/editwebpage.php:176 #: ../../mod/editpost.php:126 ../../mod/editblock.php:144 msgid "Preview" msgstr "" #: ../../include/ItemObject.php:542 ../../include/conversation.php:1143 -#: ../../mod/message.php:338 ../../mod/message.php:489 +#: ../../mod/message.php:315 ../../mod/message.php:465 #: ../../mod/editpost.php:134 msgid "Encrypt text" msgstr "" -#: ../../include/Contact.php:87 ../../include/widgets.php:96 -#: ../../include/widgets.php:136 ../../include/identity.php:613 -#: ../../mod/match.php:62 ../../mod/suggest.php:58 ../../mod/directory.php:199 +#: ../../include/Contact.php:104 ../../include/widgets.php:112 +#: ../../include/widgets.php:152 ../../include/identity.php:613 +#: ../../mod/match.php:62 ../../mod/suggest.php:51 ../../mod/directory.php:197 msgid "Connect" msgstr "" -#: ../../include/Contact.php:103 +#: ../../include/Contact.php:120 msgid "New window" msgstr "" -#: ../../include/Contact.php:104 +#: ../../include/Contact.php:121 msgid "Open the selected location in a different window or browser tab" msgstr "" -#: ../../include/widgets.php:5 -msgid "Displays a full channel profile" -msgstr "" - -#: ../../include/widgets.php:6 -msgid "Tag cloud of webpage categories" -msgstr "" - -#: ../../include/widgets.php:7 -msgid "List and filter by collection" -msgstr "" - -#: ../../include/widgets.php:8 -msgid "Show a couple of channel suggestion" -msgstr "" - -#: ../../include/widgets.php:9 -msgid "Provide a channel follow form" -msgstr "" - -#: ../../include/widgets.php:39 ../../include/contact_widgets.php:86 +#: ../../include/widgets.php:26 ../../include/contact_widgets.php:87 msgid "Categories" msgstr "" -#: ../../include/widgets.php:98 ../../mod/suggest.php:60 +#: ../../include/widgets.php:114 ../../mod/suggest.php:53 msgid "Ignore/Hide" msgstr "" -#: ../../include/widgets.php:104 ../../mod/connections.php:583 +#: ../../include/widgets.php:120 ../../mod/connections.php:236 msgid "Suggestions" msgstr "" -#: ../../include/widgets.php:105 +#: ../../include/widgets.php:121 msgid "See more..." msgstr "" -#: ../../include/widgets.php:127 +#: ../../include/widgets.php:143 #, php-format msgid "You have %1$.0f of %2$.0f allowed connections." msgstr "" -#: ../../include/widgets.php:133 +#: ../../include/widgets.php:149 msgid "Add New Connection" msgstr "" -#: ../../include/widgets.php:134 +#: ../../include/widgets.php:150 msgid "Enter the channel address" msgstr "" -#: ../../include/widgets.php:135 +#: ../../include/widgets.php:151 msgid "Example: bob@example.com, http://example.com/barbara" msgstr "" -#: ../../include/widgets.php:152 +#: ../../include/widgets.php:168 msgid "Notes" msgstr "" -#: ../../include/widgets.php:154 ../../include/text.php:738 +#: ../../include/widgets.php:170 ../../include/text.php:738 #: ../../include/text.php:752 ../../mod/filer.php:36 msgid "Save" msgstr "" -#: ../../include/widgets.php:224 ../../mod/search.php:20 +#: ../../include/widgets.php:240 ../../mod/search.php:20 msgid "Remove term" msgstr "" -#: ../../include/widgets.php:233 ../../include/features.php:48 +#: ../../include/widgets.php:249 ../../include/features.php:48 #: ../../mod/search.php:17 msgid "Saved Searches" msgstr "" -#: ../../include/widgets.php:234 ../../include/group.php:290 +#: ../../include/widgets.php:250 ../../include/group.php:290 msgid "add" msgstr "" -#: ../../include/widgets.php:264 ../../include/features.php:62 -#: ../../include/contact_widgets.php:52 +#: ../../include/widgets.php:280 ../../include/features.php:62 +#: ../../include/contact_widgets.php:53 msgid "Saved Folders" msgstr "" -#: ../../include/widgets.php:267 ../../include/contact_widgets.php:55 -#: ../../include/contact_widgets.php:89 +#: ../../include/widgets.php:283 ../../include/contact_widgets.php:56 +#: ../../include/contact_widgets.php:90 msgid "Everything" msgstr "" -#: ../../include/widgets.php:299 ../../include/items.php:3550 +#: ../../include/widgets.php:315 ../../include/items.php:3558 msgid "Archives" msgstr "" -#: ../../include/widgets.php:351 +#: ../../include/widgets.php:367 msgid "Refresh" msgstr "" -#: ../../include/widgets.php:352 ../../mod/connections.php:408 +#: ../../include/widgets.php:368 ../../mod/connedit.php:386 msgid "Me" msgstr "" -#: ../../include/widgets.php:353 ../../mod/connections.php:410 +#: ../../include/widgets.php:369 ../../mod/connedit.php:388 msgid "Best Friends" msgstr "" -#: ../../include/widgets.php:354 ../../include/profile_selectors.php:42 -#: ../../include/identity.php:298 ../../mod/connections.php:411 +#: ../../include/widgets.php:370 ../../include/profile_selectors.php:42 +#: ../../include/identity.php:298 ../../mod/connedit.php:389 msgid "Friends" msgstr "" -#: ../../include/widgets.php:355 +#: ../../include/widgets.php:371 msgid "Co-workers" msgstr "" -#: ../../include/widgets.php:356 ../../mod/connections.php:412 +#: ../../include/widgets.php:372 ../../mod/connedit.php:390 msgid "Former Friends" msgstr "" -#: ../../include/widgets.php:357 ../../mod/connections.php:413 +#: ../../include/widgets.php:373 ../../mod/connedit.php:391 msgid "Acquaintances" msgstr "" -#: ../../include/widgets.php:358 +#: ../../include/widgets.php:374 msgid "Everybody" msgstr "" +#: ../../include/widgets.php:406 +msgid "Account settings" +msgstr "" + +#: ../../include/widgets.php:412 +msgid "Channel settings" +msgstr "" + +#: ../../include/widgets.php:418 +msgid "Additional features" +msgstr "" + +#: ../../include/widgets.php:424 +msgid "Feature settings" +msgstr "" + +#: ../../include/widgets.php:430 +msgid "Display settings" +msgstr "" + +#: ../../include/widgets.php:436 +msgid "Connected apps" +msgstr "" + +#: ../../include/widgets.php:442 +msgid "Export channel" +msgstr "" + +#: ../../include/widgets.php:454 +msgid "Automatic Permissions (Advanced)" +msgstr "" + +#: ../../include/widgets.php:464 +msgid "Premium Channel Settings" +msgstr "" + +#: ../../include/widgets.php:473 ../../include/features.php:39 +#: ../../mod/sources.php:81 +msgid "Channel Sources" +msgstr "" + +#: ../../include/widgets.php:484 ../../include/nav.php:177 +#: ../../mod/admin.php:785 ../../mod/admin.php:990 +msgid "Settings" +msgstr "" + +#: ../../include/widgets.php:501 +msgid "Check Mail" +msgstr "" + +#: ../../include/widgets.php:506 ../../include/nav.php:168 +msgid "New Message" +msgstr "" + #: ../../include/contact_selectors.php:30 msgid "Unknown | Not categorised" msgstr "" @@ -670,7 +708,7 @@ msgid "RSS/Atom" msgstr "" #: ../../include/contact_selectors.php:77 ../../mod/admin.php:689 -#: ../../mod/admin.php:698 ../../boot.php:1442 +#: ../../mod/admin.php:698 ../../boot.php:1418 msgid "Email" msgstr "" @@ -790,7 +828,7 @@ msgstr "" #: ../../include/event.php:40 ../../include/identity.php:664 #: ../../include/bb2diaspora.php:455 ../../mod/events.php:463 -#: ../../mod/directory.php:174 +#: ../../mod/directory.php:172 msgid "Location:" msgstr "" @@ -845,7 +883,7 @@ msgstr "" msgid "Passwords do not match" msgstr "" -#: ../../include/js_strings.php:11 ../../mod/photos.php:45 +#: ../../include/js_strings.php:11 ../../mod/photos.php:39 msgid "everybody" msgstr "" @@ -947,16 +985,12 @@ msgid "Stored post could not be verified." msgstr "" #: ../../include/photo/photo_driver.php:609 ../../include/photos.php:51 -#: ../../mod/photos.php:97 ../../mod/photos.php:775 ../../mod/photos.php:797 +#: ../../mod/photos.php:91 ../../mod/photos.php:771 ../../mod/photos.php:793 #: ../../mod/profile_photo.php:78 ../../mod/profile_photo.php:225 #: ../../mod/profile_photo.php:336 msgid "Profile Photos" msgstr "" -#: ../../include/api.php:972 -msgid "Public Timeline" -msgstr "" - #: ../../include/network.php:640 msgid "view full size" msgstr "" @@ -1077,11 +1111,6 @@ msgstr "" msgid "Allow previewing posts and comments before publishing them" msgstr "" -#: ../../include/features.php:39 ../../mod/settings.php:120 -#: ../../mod/sources.php:67 -msgid "Channel Sources" -msgstr "" - #: ../../include/features.php:39 msgid "Automatically import channel content from other channels or feeds" msgstr "" @@ -1220,27 +1249,28 @@ 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:3429 ../../mod/common.php:35 +#: ../../include/items.php:3437 ../../mod/common.php:35 #: ../../mod/events.php:140 ../../mod/invite.php:13 ../../mod/invite.php:102 -#: ../../mod/allfriends.php:10 ../../mod/webpages.php:40 ../../mod/api.php:26 +#: ../../mod/connedit.php:179 ../../mod/webpages.php:40 ../../mod/api.php:26 #: ../../mod/api.php:31 ../../mod/page.php:30 ../../mod/page.php:80 -#: ../../mod/setup.php:200 ../../mod/settings.php:586 -#: ../../mod/viewconnections.php:22 ../../mod/viewconnections.php:27 -#: ../../mod/delegate.php:6 ../../mod/sources.php:48 ../../mod/mitem.php:73 -#: ../../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:12 +#: ../../mod/setup.php:200 ../../mod/viewconnections.php:22 +#: ../../mod/viewconnections.php:27 ../../mod/delegate.php:6 +#: ../../mod/sources.php:62 ../../mod/mitem.php:73 ../../mod/group.php:9 +#: ../../mod/photos.php:68 ../../mod/photos.php:650 ../../mod/viewsrc.php:12 +#: ../../mod/menu.php:40 ../../mod/message.php:185 +#: ../../mod/connections.php:167 ../../mod/layouts.php:27 +#: ../../mod/layouts.php:42 ../../mod/network.php:12 #: ../../mod/profiles.php:152 ../../mod/profiles.php:465 #: ../../mod/new_channel.php:66 ../../mod/new_channel.php:97 -#: ../../mod/connections.php:201 ../../mod/filestorage.php:26 -#: ../../mod/manage.php:6 ../../mod/editlayout.php:48 +#: ../../mod/filestorage.php:26 ../../mod/manage.php:6 +#: ../../mod/settings.php:484 ../../mod/editlayout.php:48 #: ../../mod/profile_photo.php:187 ../../mod/profile_photo.php:200 #: ../../mod/editwebpage.php:44 ../../mod/editwebpage.php:83 #: ../../mod/notifications.php:66 ../../mod/blocks.php:29 #: ../../mod/blocks.php:44 ../../mod/editpost.php:13 ../../mod/poke.php:128 #: ../../mod/channel.php:86 ../../mod/fsuggest.php:78 #: ../../mod/editblock.php:48 ../../mod/item.php:181 ../../mod/item.php:189 -#: ../../mod/suggest.php:33 ../../mod/register.php:68 ../../mod/regmod.php:18 +#: ../../mod/suggest.php:26 ../../mod/register.php:68 ../../mod/regmod.php:18 #: ../../mod/authtest.php:13 ../../mod/mood.php:114 ../../index.php:178 #: ../../index.php:346 msgid "Permission denied." @@ -1263,12 +1293,12 @@ msgstr "" msgid "Photo storage failed." msgstr "" -#: ../../include/photos.php:288 ../../include/conversation.php:1457 +#: ../../include/photos.php:296 ../../include/conversation.php:1457 msgid "Photo Albums" msgstr "" -#: ../../include/photos.php:292 ../../mod/photos.php:813 -#: ../../mod/photos.php:1287 +#: ../../include/photos.php:300 ../../mod/photos.php:809 +#: ../../mod/photos.php:1283 msgid "Upload New Photos" msgstr "" @@ -1571,7 +1601,7 @@ msgstr "" msgid "Unable to verify site signature for %s" msgstr "" -#: ../../include/nav.php:72 ../../include/nav.php:87 ../../boot.php:1439 +#: ../../include/nav.php:72 ../../include/nav.php:87 ../../boot.php:1415 msgid "Logout" msgstr "" @@ -1588,7 +1618,7 @@ msgid "Your posts and conversations" msgstr "" #: ../../include/nav.php:76 ../../include/conversation.php:929 -#: ../../mod/connections.php:331 ../../mod/connections.php:445 +#: ../../mod/connedit.php:309 ../../mod/connedit.php:423 msgid "View Profile" msgstr "" @@ -1613,7 +1643,7 @@ msgstr "" msgid "Your photos" msgstr "" -#: ../../include/nav.php:85 ../../boot.php:1440 +#: ../../include/nav.php:85 ../../boot.php:1416 msgid "Login" msgstr "" @@ -1634,7 +1664,7 @@ msgstr "" msgid "Home Page" msgstr "" -#: ../../include/nav.php:125 ../../mod/register.php:195 ../../boot.php:1416 +#: ../../include/nav.php:125 ../../mod/register.php:195 ../../boot.php:1392 msgid "Register" msgstr "" @@ -1642,7 +1672,7 @@ msgstr "" msgid "Create an account" msgstr "" -#: ../../include/nav.php:130 ../../mod/help.php:45 ../../mod/help.php:49 +#: ../../include/nav.php:130 ../../mod/help.php:60 ../../mod/help.php:64 msgid "Help" msgstr "" @@ -1667,7 +1697,7 @@ msgstr "" msgid "Search site content" msgstr "" -#: ../../include/nav.php:138 ../../mod/directory.php:228 +#: ../../include/nav.php:138 ../../mod/directory.php:226 msgid "Directory" msgstr "" @@ -1703,7 +1733,7 @@ msgstr "" msgid "Intros" msgstr "" -#: ../../include/nav.php:156 ../../mod/connections.php:589 +#: ../../include/nav.php:156 ../../mod/connections.php:242 msgid "New Connections" msgstr "" @@ -1747,10 +1777,6 @@ msgstr "" msgid "Outbox" msgstr "" -#: ../../include/nav.php:168 ../../mod/message.php:24 -msgid "New Message" -msgstr "" - #: ../../include/nav.php:171 ../../include/conversation.php:1465 #: ../../mod/events.php:354 msgid "Events" @@ -1776,16 +1802,11 @@ msgstr "" msgid "Manage Your Channels" msgstr "" -#: ../../include/nav.php:177 ../../mod/settings.php:131 -#: ../../mod/admin.php:785 ../../mod/admin.php:990 -msgid "Settings" -msgstr "" - #: ../../include/nav.php:177 msgid "Account/Channel Settings" msgstr "" -#: ../../include/nav.php:179 ../../mod/connections.php:694 +#: ../../include/nav.php:179 ../../mod/connections.php:349 msgid "Connections" msgstr "" @@ -2060,8 +2081,8 @@ msgstr "" msgid "Visible to <strong>everybody</strong>" msgstr "" -#: ../../include/conversation.php:1063 ../../mod/message.php:281 -#: ../../mod/message.php:417 +#: ../../include/conversation.php:1063 ../../mod/message.php:258 +#: ../../mod/message.php:393 msgid "Please enter a link URL:" msgstr "" @@ -2085,12 +2106,12 @@ msgstr "" msgid "Where are you right now?" msgstr "" -#: ../../include/conversation.php:1069 ../../mod/message.php:282 -#: ../../mod/message.php:418 ../../mod/editpost.php:52 +#: ../../include/conversation.php:1069 ../../mod/message.php:259 +#: ../../mod/message.php:394 ../../mod/editpost.php:52 msgid "Expires YYYY-MM-DD HH:MM" msgstr "" -#: ../../include/conversation.php:1093 ../../mod/photos.php:1071 +#: ../../include/conversation.php:1093 ../../mod/photos.php:1067 msgid "Share" msgstr "" @@ -2098,8 +2119,8 @@ msgstr "" msgid "Page link title" msgstr "" -#: ../../include/conversation.php:1097 ../../mod/message.php:329 -#: ../../mod/message.php:480 ../../mod/editlayout.php:101 +#: ../../include/conversation.php:1097 ../../mod/message.php:306 +#: ../../mod/message.php:456 ../../mod/editlayout.php:101 #: ../../mod/editwebpage.php:144 ../../mod/editpost.php:98 #: ../../mod/editblock.php:115 msgid "Upload photo" @@ -2109,8 +2130,8 @@ msgstr "" msgid "upload photo" msgstr "" -#: ../../include/conversation.php:1099 ../../mod/message.php:330 -#: ../../mod/message.php:481 ../../mod/editlayout.php:102 +#: ../../include/conversation.php:1099 ../../mod/message.php:307 +#: ../../mod/message.php:457 ../../mod/editlayout.php:102 #: ../../mod/editwebpage.php:145 ../../mod/editpost.php:99 #: ../../mod/editblock.php:116 msgid "Attach file" @@ -2120,8 +2141,8 @@ msgstr "" msgid "attach file" msgstr "" -#: ../../include/conversation.php:1101 ../../mod/message.php:331 -#: ../../mod/message.php:482 ../../mod/editlayout.php:103 +#: ../../include/conversation.php:1101 ../../mod/message.php:308 +#: ../../mod/message.php:458 ../../mod/editlayout.php:103 #: ../../mod/editwebpage.php:146 ../../mod/editpost.php:100 #: ../../mod/editblock.php:117 msgid "Insert web link" @@ -2201,8 +2222,8 @@ msgstr "" msgid "Example: bob@example.com, mary@example.com" msgstr "" -#: ../../include/conversation.php:1141 ../../mod/message.php:336 -#: ../../mod/message.php:487 ../../mod/editlayout.php:134 +#: ../../include/conversation.php:1141 ../../mod/message.php:313 +#: ../../mod/message.php:463 ../../mod/editlayout.php:134 #: ../../mod/editwebpage.php:181 ../../mod/editpost.php:132 #: ../../mod/editblock.php:149 msgid "Set expiration date" @@ -2233,7 +2254,7 @@ msgid "Posts that mention or involve you" msgstr "" #: ../../include/conversation.php:1387 ../../mod/menu.php:57 -#: ../../mod/connections.php:556 +#: ../../mod/connections.php:209 msgid "New" msgstr "" @@ -2320,12 +2341,12 @@ msgstr "" msgid "Examples: Robert Morgenstein, Fishing" msgstr "" -#: ../../include/contact_widgets.php:24 ../../mod/connections.php:700 -#: ../../mod/directory.php:224 ../../mod/directory.php:229 +#: ../../include/contact_widgets.php:24 ../../mod/connections.php:355 +#: ../../mod/directory.php:222 ../../mod/directory.php:227 msgid "Find" msgstr "" -#: ../../include/contact_widgets.php:25 ../../mod/suggest.php:66 +#: ../../include/contact_widgets.php:25 ../../mod/suggest.php:59 msgid "Channel Suggestions" msgstr "" @@ -2337,7 +2358,7 @@ msgstr "" msgid "Invite Friends" msgstr "" -#: ../../include/contact_widgets.php:119 +#: ../../include/contact_widgets.php:120 #, php-format msgid "%d connection in common" msgid_plural "%d connections in common" @@ -2861,17 +2882,17 @@ msgid "Edit visibility" msgstr "" #: ../../include/identity.php:666 ../../include/identity.php:891 -#: ../../mod/directory.php:176 +#: ../../mod/directory.php:174 msgid "Gender:" msgstr "" #: ../../include/identity.php:667 ../../include/identity.php:911 -#: ../../mod/directory.php:178 +#: ../../mod/directory.php:176 msgid "Status:" msgstr "" #: ../../include/identity.php:668 ../../include/identity.php:922 -#: ../../mod/directory.php:180 +#: ../../mod/directory.php:178 msgid "Homepage:" msgstr "" @@ -2914,7 +2935,7 @@ msgstr "" msgid "Profile" msgstr "" -#: ../../include/identity.php:889 ../../mod/settings.php:1013 +#: ../../include/identity.php:889 ../../mod/settings.php:911 msgid "Full Name:" msgstr "" @@ -2959,7 +2980,7 @@ msgstr "" msgid "Religion:" msgstr "" -#: ../../include/identity.php:932 ../../mod/directory.php:182 +#: ../../include/identity.php:932 ../../mod/directory.php:180 msgid "About:" msgstr "" @@ -3025,36 +3046,36 @@ msgid "" "form has been opened for too long (>3 hours) before submitting it." msgstr "" -#: ../../include/items.php:201 ../../mod/like.php:55 ../../mod/group.php:74 +#: ../../include/items.php:201 ../../mod/like.php:55 ../../mod/group.php:68 #: ../../mod/profperm.php:19 ../../index.php:345 msgid "Permission denied" msgstr "" -#: ../../include/items.php:3367 ../../mod/admin.php:150 +#: ../../include/items.php:3375 ../../mod/admin.php:150 #: ../../mod/admin.php:730 ../../mod/admin.php:933 ../../mod/viewsrc.php:18 -#: ../../mod/home.php:64 ../../mod/display.php:32 +#: ../../mod/home.php:63 ../../mod/display.php:32 msgid "Item not found." msgstr "" -#: ../../include/items.php:3718 ../../mod/group.php:44 ../../mod/group.php:146 +#: ../../include/items.php:3726 ../../mod/group.php:38 ../../mod/group.php:140 msgid "Collection not found." msgstr "" -#: ../../include/items.php:3733 +#: ../../include/items.php:3741 msgid "Collection is empty." msgstr "" -#: ../../include/items.php:3740 +#: ../../include/items.php:3748 #, php-format msgid "Collection: %s" msgstr "" -#: ../../include/items.php:3751 +#: ../../include/items.php:3759 #, php-format msgid "Connection: %s" msgstr "" -#: ../../include/items.php:3754 +#: ../../include/items.php:3762 msgid "Connection not found." msgstr "" @@ -3221,8 +3242,8 @@ msgstr "" msgid "Enter email addresses, one per line:" msgstr "" -#: ../../mod/invite.php:141 ../../mod/message.php:326 -#: ../../mod/message.php:476 +#: ../../mod/invite.php:141 ../../mod/message.php:303 +#: ../../mod/message.php:452 msgid "Your message:" msgstr "" @@ -3258,13 +3279,328 @@ msgid "" "com" msgstr "" -#: ../../mod/allfriends.php:35 +#: ../../mod/connedit.php:49 ../../mod/connections.php:37 +msgid "Could not access contact record." +msgstr "" + +#: ../../mod/connedit.php:63 ../../mod/connections.php:51 +msgid "Could not locate selected profile." +msgstr "" + +#: ../../mod/connedit.php:104 ../../mod/connections.php:92 +msgid "Connection updated." +msgstr "" + +#: ../../mod/connedit.php:106 ../../mod/connections.php:94 +msgid "Failed to update connection record." +msgstr "" + +#: ../../mod/connedit.php:201 +msgid "Could not access address book record." +msgstr "" + +#: ../../mod/connedit.php:215 +msgid "Refresh failed - channel is currently unavailable." +msgstr "" + +#: ../../mod/connedit.php:222 +msgid "Channel has been unblocked" +msgstr "" + +#: ../../mod/connedit.php:223 +msgid "Channel has been blocked" +msgstr "" + +#: ../../mod/connedit.php:227 ../../mod/connedit.php:239 +#: ../../mod/connedit.php:251 ../../mod/connedit.php:263 +#: ../../mod/connedit.php:278 +msgid "Unable to set address book parameters." +msgstr "" + +#: ../../mod/connedit.php:234 +msgid "Channel has been unignored" +msgstr "" + +#: ../../mod/connedit.php:235 +msgid "Channel has been ignored" +msgstr "" + +#: ../../mod/connedit.php:246 +msgid "Channel has been unarchived" +msgstr "" + +#: ../../mod/connedit.php:247 +msgid "Channel has been archived" +msgstr "" + +#: ../../mod/connedit.php:258 +msgid "Channel has been unhidden" +msgstr "" + +#: ../../mod/connedit.php:259 +msgid "Channel has been hidden" +msgstr "" + +#: ../../mod/connedit.php:273 +msgid "Channel has been approved" +msgstr "" + +#: ../../mod/connedit.php:274 +msgid "Channel has been unapproved" +msgstr "" + +#: ../../mod/connedit.php:292 +msgid "Contact has been removed." +msgstr "" + +#: ../../mod/connedit.php:312 #, php-format -msgid "Friends of %s" +msgid "View %s's profile" +msgstr "" + +#: ../../mod/connedit.php:316 +msgid "Refresh Permissions" +msgstr "" + +#: ../../mod/connedit.php:319 +msgid "Fetch updated permissions" +msgstr "" + +#: ../../mod/connedit.php:323 +msgid "Recent Activity" +msgstr "" + +#: ../../mod/connedit.php:326 +msgid "View recent posts and comments" +msgstr "" + +#: ../../mod/connedit.php:330 ../../mod/connedit.php:472 +#: ../../mod/admin.php:695 +msgid "Unblock" +msgstr "" + +#: ../../mod/connedit.php:330 ../../mod/connedit.php:472 +#: ../../mod/admin.php:694 +msgid "Block" +msgstr "" + +#: ../../mod/connedit.php:333 +msgid "Block or Unblock this connection" +msgstr "" + +#: ../../mod/connedit.php:337 ../../mod/connedit.php:473 +msgid "Unignore" +msgstr "" + +#: ../../mod/connedit.php:337 ../../mod/connedit.php:473 +#: ../../mod/notifications.php:51 +msgid "Ignore" +msgstr "" + +#: ../../mod/connedit.php:340 +msgid "Ignore or Unignore this connection" +msgstr "" + +#: ../../mod/connedit.php:343 +msgid "Unarchive" +msgstr "" + +#: ../../mod/connedit.php:343 +msgid "Archive" +msgstr "" + +#: ../../mod/connedit.php:346 +msgid "Archive or Unarchive this connection" +msgstr "" + +#: ../../mod/connedit.php:349 +msgid "Unhide" +msgstr "" + +#: ../../mod/connedit.php:349 +msgid "Hide" +msgstr "" + +#: ../../mod/connedit.php:352 +msgid "Hide or Unhide this connection" +msgstr "" + +#: ../../mod/connedit.php:359 +msgid "Delete this connection" +msgstr "" + +#: ../../mod/connedit.php:392 +msgid "Unknown" +msgstr "" + +#: ../../mod/connedit.php:402 ../../mod/connedit.php:431 +msgid "Approve this connection" +msgstr "" + +#: ../../mod/connedit.php:402 +msgid "Accept connection to allow communication" +msgstr "" + +#: ../../mod/connedit.php:418 +msgid "Automatic Permissions Settings" +msgstr "" + +#: ../../mod/connedit.php:418 +#, php-format +msgid "Connections: settings for %s" +msgstr "" + +#: ../../mod/connedit.php:422 +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/connedit.php:424 +msgid "Slide to adjust your degree of friendship" +msgstr "" + +#: ../../mod/connedit.php:430 +msgid "inherited" +msgstr "" + +#: ../../mod/connedit.php:432 +msgid "Connection has no individual permissions!" +msgstr "" + +#: ../../mod/connedit.php:433 +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/connedit.php:435 +msgid "Profile Visibility" +msgstr "" + +#: ../../mod/connedit.php:436 +#, php-format +msgid "" +"Please choose the profile you would like to display to %s when viewing your " +"profile securely." +msgstr "" + +#: ../../mod/connedit.php:437 +msgid "Contact Information / Notes" +msgstr "" + +#: ../../mod/connedit.php:438 +msgid "Edit contact notes" +msgstr "" + +#: ../../mod/connedit.php:440 +msgid "Their Settings" +msgstr "" + +#: ../../mod/connedit.php:441 +msgid "My Settings" +msgstr "" + +#: ../../mod/connedit.php:443 +msgid "Forum Members" +msgstr "" + +#: ../../mod/connedit.php:444 +msgid "Soapbox" +msgstr "" + +#: ../../mod/connedit.php:445 +msgid "Full Sharing" +msgstr "" + +#: ../../mod/connedit.php:446 +msgid "Cautious Sharing" +msgstr "" + +#: ../../mod/connedit.php:447 +msgid "Follow Only" +msgstr "" + +#: ../../mod/connedit.php:448 +msgid "Individual Permissions" +msgstr "" + +#: ../../mod/connedit.php:449 +msgid "" +"Some permissions may be inherited from your channel <a href=\"settings" +"\">privacy settings</a>, which have higher priority. Changing those " +"inherited settings on this page will have no effect." +msgstr "" + +#: ../../mod/connedit.php:450 +msgid "Advanced Permissions" +msgstr "" + +#: ../../mod/connedit.php:451 +msgid "Quick Links" +msgstr "" + +#: ../../mod/connedit.php:455 +#, php-format +msgid "Visit %s's profile - %s" +msgstr "" + +#: ../../mod/connedit.php:456 +msgid "Block/Unblock contact" +msgstr "" + +#: ../../mod/connedit.php:457 +msgid "Ignore contact" +msgstr "" + +#: ../../mod/connedit.php:458 +msgid "Repair URL settings" +msgstr "" + +#: ../../mod/connedit.php:459 +msgid "View conversations" +msgstr "" + +#: ../../mod/connedit.php:461 +msgid "Delete contact" +msgstr "" + +#: ../../mod/connedit.php:464 +msgid "Last update:" +msgstr "" + +#: ../../mod/connedit.php:466 +msgid "Update public posts" +msgstr "" + +#: ../../mod/connedit.php:468 +msgid "Update now" msgstr "" -#: ../../mod/allfriends.php:41 -msgid "No friends to display." +#: ../../mod/connedit.php:474 +msgid "Currently blocked" +msgstr "" + +#: ../../mod/connedit.php:475 +msgid "Currently ignored" +msgstr "" + +#: ../../mod/connedit.php:476 +msgid "Currently archived" +msgstr "" + +#: ../../mod/connedit.php:477 +msgid "Currently pending" +msgstr "" + +#: ../../mod/connedit.php:478 +msgid "Hide this contact from others" +msgstr "" + +#: ../../mod/connedit.php:478 +msgid "" +"Replies/likes to your public posts <strong>may</strong> still be visible" msgstr "" #: ../../mod/webpages.php:121 ../../mod/layouts.php:105 @@ -3290,13 +3626,13 @@ msgid "" "and/or create new posts for you?" msgstr "" -#: ../../mod/api.php:105 ../../mod/settings.php:967 ../../mod/settings.php:972 -#: ../../mod/profiles.php:495 +#: ../../mod/api.php:105 ../../mod/profiles.php:495 ../../mod/settings.php:865 +#: ../../mod/settings.php:870 msgid "Yes" msgstr "" -#: ../../mod/api.php:106 ../../mod/settings.php:967 ../../mod/settings.php:972 -#: ../../mod/profiles.php:496 +#: ../../mod/api.php:106 ../../mod/profiles.php:496 ../../mod/settings.php:865 +#: ../../mod/settings.php:870 msgid "No" msgstr "" @@ -3312,12 +3648,12 @@ msgstr "" msgid "Invalid item." msgstr "" -#: ../../mod/page.php:47 ../../mod/chanview.php:78 ../../mod/home.php:51 +#: ../../mod/page.php:47 ../../mod/chanview.php:77 ../../mod/home.php:50 #: ../../mod/wall_upload.php:35 msgid "Channel not found." msgstr "" -#: ../../mod/page.php:83 ../../mod/help.php:56 ../../mod/display.php:100 +#: ../../mod/page.php:83 ../../mod/help.php:71 ../../mod/display.php:100 #: ../../index.php:229 msgid "Page not found." msgstr "" @@ -3354,7 +3690,7 @@ msgid "" "phpmyadmin or mysql." msgstr "" -#: ../../mod/setup.php:188 ../../mod/setup.php:255 ../../mod/setup.php:584 +#: ../../mod/setup.php:188 ../../mod/setup.php:255 ../../mod/setup.php:586 msgid "Please see the file \"install/INSTALL.txt\"." msgstr "" @@ -3651,11 +3987,11 @@ msgstr "" msgid "Errors encountered creating database tables." msgstr "" -#: ../../mod/setup.php:582 +#: ../../mod/setup.php:584 msgid "<h1>What next</h1>" msgstr "" -#: ../../mod/setup.php:583 +#: ../../mod/setup.php:585 msgid "" "IMPORTANT: You will need to [manually] setup a scheduled task for the poller." msgstr "" @@ -3675,7 +4011,7 @@ msgstr "" msgid "[Embedded content - reload page to view]" msgstr "" -#: ../../mod/chanview.php:98 +#: ../../mod/chanview.php:97 msgid "toggle full screen mode" msgstr "" @@ -3684,430 +4020,9 @@ msgstr "" msgid "%1$s tagged %2$s's %3$s with %4$s" msgstr "" -#: ../../mod/settings.php:53 -msgid "Account settings" -msgstr "" - -#: ../../mod/settings.php:59 -msgid "Channel settings" -msgstr "" - -#: ../../mod/settings.php:65 -msgid "Additional features" -msgstr "" - -#: ../../mod/settings.php:71 -msgid "Feature settings" -msgstr "" - -#: ../../mod/settings.php:77 -msgid "Display settings" -msgstr "" - -#: ../../mod/settings.php:83 -msgid "Connected apps" -msgstr "" - -#: ../../mod/settings.php:89 -msgid "Export channel" -msgstr "" - -#: ../../mod/settings.php:101 -msgid "Automatic Permissions (Advanced)" -msgstr "" - -#: ../../mod/settings.php:111 -msgid "Premium Channel Settings" -msgstr "" - -#: ../../mod/settings.php:173 -msgid "Name is required" -msgstr "" - -#: ../../mod/settings.php:177 -msgid "Key and Secret are required" -msgstr "" - -#: ../../mod/settings.php:181 ../../mod/settings.php:635 -msgid "Update" -msgstr "" - -#: ../../mod/settings.php:294 -msgid "Passwords do not match. Password unchanged." -msgstr "" - -#: ../../mod/settings.php:298 -msgid "Empty passwords are not allowed. Password unchanged." -msgstr "" - -#: ../../mod/settings.php:311 -msgid "Password changed." -msgstr "" - -#: ../../mod/settings.php:313 -msgid "Password update failed. Please try again." -msgstr "" - -#: ../../mod/settings.php:327 -msgid "Not valid email." -msgstr "" - -#: ../../mod/settings.php:330 -msgid "Protected email address. Cannot change to that email." -msgstr "" - -#: ../../mod/settings.php:339 -msgid "System failure storing new email. Please try again." -msgstr "" - -#: ../../mod/settings.php:537 -msgid "Settings updated." -msgstr "" - -#: ../../mod/settings.php:608 ../../mod/settings.php:634 -#: ../../mod/settings.php:670 -msgid "Add application" -msgstr "" - -#: ../../mod/settings.php:610 ../../mod/settings.php:636 -#: ../../mod/tagrm.php:11 ../../mod/tagrm.php:94 ../../mod/fbrowser.php:82 -#: ../../mod/fbrowser.php:117 -msgid "Cancel" -msgstr "" - -#: ../../mod/settings.php:611 ../../mod/settings.php:637 -#: ../../mod/admin.php:689 -msgid "Name" -msgstr "" - -#: ../../mod/settings.php:611 -msgid "Name of application" -msgstr "" - -#: ../../mod/settings.php:612 ../../mod/settings.php:638 -msgid "Consumer Key" -msgstr "" - -#: ../../mod/settings.php:612 ../../mod/settings.php:613 -msgid "Automatically generated - change if desired. Max length 20" -msgstr "" - -#: ../../mod/settings.php:613 ../../mod/settings.php:639 -msgid "Consumer Secret" -msgstr "" - -#: ../../mod/settings.php:614 ../../mod/settings.php:640 -msgid "Redirect" -msgstr "" - -#: ../../mod/settings.php:614 -msgid "" -"Redirect URI - leave blank unless your application specifically requires this" -msgstr "" - -#: ../../mod/settings.php:615 ../../mod/settings.php:641 -msgid "Icon url" -msgstr "" - -#: ../../mod/settings.php:615 -msgid "Optional" -msgstr "" - -#: ../../mod/settings.php:626 -msgid "You can't edit this application." -msgstr "" - -#: ../../mod/settings.php:669 -msgid "Connected Apps" -msgstr "" - -#: ../../mod/settings.php:673 -msgid "Client key starts with" -msgstr "" - -#: ../../mod/settings.php:674 -msgid "No name" -msgstr "" - -#: ../../mod/settings.php:675 -msgid "Remove authorization" -msgstr "" - -#: ../../mod/settings.php:686 -msgid "No feature settings configured" -msgstr "" - -#: ../../mod/settings.php:694 -msgid "Feature Settings" -msgstr "" - -#: ../../mod/settings.php:717 -msgid "Account Settings" -msgstr "" - -#: ../../mod/settings.php:718 -msgid "Password Settings" -msgstr "" - -#: ../../mod/settings.php:719 -msgid "New Password:" -msgstr "" - -#: ../../mod/settings.php:720 -msgid "Confirm:" -msgstr "" - -#: ../../mod/settings.php:720 -msgid "Leave password fields blank unless changing" -msgstr "" - -#: ../../mod/settings.php:722 ../../mod/settings.php:1014 -msgid "Email Address:" -msgstr "" - -#: ../../mod/settings.php:723 -msgid "Remove Account" -msgstr "" - -#: ../../mod/settings.php:724 -msgid "Warning: This action is permanent and cannot be reversed." -msgstr "" - -#: ../../mod/settings.php:740 -msgid "Off" -msgstr "" - -#: ../../mod/settings.php:740 -msgid "On" -msgstr "" - -#: ../../mod/settings.php:747 -msgid "Additional Features" -msgstr "" - -#: ../../mod/settings.php:772 -msgid "Connector Settings" -msgstr "" - -#: ../../mod/settings.php:802 ../../mod/admin.php:371 -msgid "No special theme for mobile devices" -msgstr "" - -#: ../../mod/settings.php:842 -msgid "Display Settings" -msgstr "" - -#: ../../mod/settings.php:848 -msgid "Display Theme:" -msgstr "" - -#: ../../mod/settings.php:849 -msgid "Mobile Theme:" -msgstr "" - -#: ../../mod/settings.php:850 -msgid "Update browser every xx seconds" -msgstr "" - -#: ../../mod/settings.php:850 -msgid "Minimum of 10 seconds, no maximum" -msgstr "" - -#: ../../mod/settings.php:851 -msgid "Maximum number of conversations to load at any time:" -msgstr "" - -#: ../../mod/settings.php:851 -msgid "Maximum of 100 items" -msgstr "" - -#: ../../mod/settings.php:852 -msgid "Don't show emoticons" -msgstr "" - -#: ../../mod/settings.php:888 -msgid "Nobody except yourself" -msgstr "" - -#: ../../mod/settings.php:889 -msgid "Only those you specifically allow" -msgstr "" - -#: ../../mod/settings.php:890 -msgid "Anybody in your address book" -msgstr "" - -#: ../../mod/settings.php:891 -msgid "Anybody on this website" -msgstr "" - -#: ../../mod/settings.php:892 -msgid "Anybody in this network" -msgstr "" - -#: ../../mod/settings.php:893 -msgid "Anybody on the internet" -msgstr "" - -#: ../../mod/settings.php:967 -msgid "Publish your default profile in the network directory" -msgstr "" - -#: ../../mod/settings.php:972 -msgid "Allow us to suggest you as a potential friend to new members?" -msgstr "" - -#: ../../mod/settings.php:976 ../../mod/profile_photo.php:288 -msgid "or" -msgstr "" - -#: ../../mod/settings.php:981 -msgid "Your channel address is" -msgstr "" - -#: ../../mod/settings.php:1003 -msgid "Channel Settings" -msgstr "" - -#: ../../mod/settings.php:1012 -msgid "Basic Settings" -msgstr "" - -#: ../../mod/settings.php:1015 -msgid "Your Timezone:" -msgstr "" - -#: ../../mod/settings.php:1016 -msgid "Default Post Location:" -msgstr "" - -#: ../../mod/settings.php:1017 -msgid "Use Browser Location:" -msgstr "" - -#: ../../mod/settings.php:1019 -msgid "Adult Content" -msgstr "" - -#: ../../mod/settings.php:1019 -msgid "This channel publishes adult content." -msgstr "" - -#: ../../mod/settings.php:1021 -msgid "Security and Privacy Settings" -msgstr "" - -#: ../../mod/settings.php:1023 -msgid "Quick Privacy Settings:" -msgstr "" - -#: ../../mod/settings.php:1024 -msgid "Very Public - extremely permissive" -msgstr "" - -#: ../../mod/settings.php:1025 -msgid "Typical - default public, privacy when desired" -msgstr "" - -#: ../../mod/settings.php:1026 -msgid "Private - default private, rarely open or public" -msgstr "" - -#: ../../mod/settings.php:1027 -msgid "Blocked - default blocked to/from everybody" -msgstr "" - -#: ../../mod/settings.php:1030 -msgid "Maximum Friend Requests/Day:" -msgstr "" - -#: ../../mod/settings.php:1030 -msgid "May reduce spam activity" -msgstr "" - -#: ../../mod/settings.php:1031 -msgid "Default Post Permissions" -msgstr "" - -#: ../../mod/settings.php:1032 ../../mod/mitem.php:137 ../../mod/mitem.php:180 -msgid "(click to open/close)" -msgstr "" - -#: ../../mod/settings.php:1043 -msgid "Maximum private messages per day from unknown people:" -msgstr "" - -#: ../../mod/settings.php:1043 -msgid "Useful to reduce spamming" -msgstr "" - -#: ../../mod/settings.php:1046 -msgid "Notification Settings" -msgstr "" - -#: ../../mod/settings.php:1047 -msgid "By default post a status message when:" -msgstr "" - -#: ../../mod/settings.php:1048 -msgid "accepting a friend request" -msgstr "" - -#: ../../mod/settings.php:1049 -msgid "joining a forum/community" -msgstr "" - -#: ../../mod/settings.php:1050 -msgid "making an <em>interesting</em> profile change" -msgstr "" - -#: ../../mod/settings.php:1051 -msgid "Send a notification email when:" -msgstr "" - -#: ../../mod/settings.php:1052 -msgid "You receive an introduction" -msgstr "" - -#: ../../mod/settings.php:1053 -msgid "Your introductions are confirmed" -msgstr "" - -#: ../../mod/settings.php:1054 -msgid "Someone writes on your profile wall" -msgstr "" - -#: ../../mod/settings.php:1055 -msgid "Someone writes a followup comment" -msgstr "" - -#: ../../mod/settings.php:1056 -msgid "You receive a private message" -msgstr "" - -#: ../../mod/settings.php:1057 -msgid "You receive a friend suggestion" -msgstr "" - -#: ../../mod/settings.php:1058 -msgid "You are tagged in a post" -msgstr "" - -#: ../../mod/settings.php:1059 -msgid "You are poked/prodded/etc. in a post" -msgstr "" - -#: ../../mod/settings.php:1062 -msgid "Advanced Account/Page Type Settings" -msgstr "" - -#: ../../mod/settings.php:1063 -msgid "Change the behaviour of this account for special situations" -msgstr "" - #: ../../mod/viewconnections.php:17 ../../mod/search.php:80 -#: ../../mod/photos.php:576 ../../mod/display.php:9 ../../mod/community.php:18 -#: ../../mod/directory.php:33 +#: ../../mod/photos.php:570 ../../mod/display.php:9 ../../mod/community.php:18 +#: ../../mod/directory.php:31 msgid "Public access denied." msgstr "" @@ -4124,6 +4039,12 @@ msgstr "" msgid "View Connnections" msgstr "" +#: ../../mod/tagrm.php:11 ../../mod/tagrm.php:94 ../../mod/settings.php:508 +#: ../../mod/settings.php:534 ../../mod/fbrowser.php:82 +#: ../../mod/fbrowser.php:117 +msgid "Cancel" +msgstr "" + #: ../../mod/tagrm.php:41 msgid "Tag removed" msgstr "" @@ -4218,58 +4139,62 @@ msgstr "" msgid "No entries." msgstr "" -#: ../../mod/sources.php:27 +#: ../../mod/sources.php:28 +msgid "Failed to create source. No channel selected." +msgstr "" + +#: ../../mod/sources.php:41 msgid "Source created." msgstr "" -#: ../../mod/sources.php:39 +#: ../../mod/sources.php:53 msgid "Source updated." msgstr "" -#: ../../mod/sources.php:68 +#: ../../mod/sources.php:82 msgid "Manage remote sources of content for your channel." msgstr "" -#: ../../mod/sources.php:69 ../../mod/sources.php:79 +#: ../../mod/sources.php:83 ../../mod/sources.php:93 msgid "New Source" msgstr "" -#: ../../mod/sources.php:80 ../../mod/sources.php:106 +#: ../../mod/sources.php:94 ../../mod/sources.php:126 msgid "" "Import all or selected content from the following channel into this channel " "and distribute it according to your channel settings." msgstr "" -#: ../../mod/sources.php:81 ../../mod/sources.php:107 +#: ../../mod/sources.php:95 ../../mod/sources.php:127 msgid "Only import content with these words (one per line)" msgstr "" -#: ../../mod/sources.php:81 ../../mod/sources.php:107 +#: ../../mod/sources.php:95 ../../mod/sources.php:127 msgid "Leave blank to import all public content" msgstr "" -#: ../../mod/sources.php:82 ../../mod/sources.php:109 +#: ../../mod/sources.php:96 ../../mod/sources.php:130 #: ../../mod/new_channel.php:110 msgid "Channel Name" msgstr "" -#: ../../mod/sources.php:96 ../../mod/sources.php:122 +#: ../../mod/sources.php:116 ../../mod/sources.php:143 msgid "Source not found." msgstr "" -#: ../../mod/sources.php:103 +#: ../../mod/sources.php:123 msgid "Edit Source" msgstr "" -#: ../../mod/sources.php:104 +#: ../../mod/sources.php:124 msgid "Delete Source" msgstr "" -#: ../../mod/sources.php:130 +#: ../../mod/sources.php:151 msgid "Source removed" msgstr "" -#: ../../mod/sources.php:132 +#: ../../mod/sources.php:153 msgid "Unable to remove source." msgstr "" @@ -4347,6 +4272,10 @@ msgstr "" msgid "Site settings updated." msgstr "" +#: ../../mod/admin.php:371 ../../mod/settings.php:700 +msgid "No special theme for mobile devices" +msgstr "" + #: ../../mod/admin.php:373 msgid "No special theme for accessibility" msgstr "" @@ -4680,6 +4609,11 @@ msgstr "" msgid "Request date" msgstr "" +#: ../../mod/admin.php:689 ../../mod/settings.php:509 +#: ../../mod/settings.php:535 +msgid "Name" +msgstr "" + #: ../../mod/admin.php:690 msgid "No registrations." msgstr "" @@ -4692,16 +4626,6 @@ msgstr "" msgid "Deny" msgstr "" -#: ../../mod/admin.php:694 ../../mod/connections.php:352 -#: ../../mod/connections.php:494 -msgid "Block" -msgstr "" - -#: ../../mod/admin.php:695 ../../mod/connections.php:352 -#: ../../mod/connections.php:494 -msgid "Unblock" -msgstr "" - #: ../../mod/admin.php:698 msgid "Register date" msgstr "" @@ -4869,6 +4793,10 @@ msgstr "" msgid "Menu Item Permissions" msgstr "" +#: ../../mod/mitem.php:137 ../../mod/mitem.php:180 ../../mod/settings.php:930 +msgid "(click to open/close)" +msgstr "" + #: ../../mod/mitem.php:139 ../../mod/mitem.php:183 msgid "Link text" msgstr "" @@ -4917,187 +4845,187 @@ msgstr "" msgid "Modify" msgstr "" -#: ../../mod/group.php:26 +#: ../../mod/group.php:20 msgid "Collection created." msgstr "" -#: ../../mod/group.php:32 +#: ../../mod/group.php:26 msgid "Could not create collection." msgstr "" -#: ../../mod/group.php:60 +#: ../../mod/group.php:54 msgid "Collection updated." msgstr "" -#: ../../mod/group.php:92 +#: ../../mod/group.php:86 msgid "Create a collection of channels." msgstr "" -#: ../../mod/group.php:93 ../../mod/group.php:189 +#: ../../mod/group.php:87 ../../mod/group.php:183 msgid "Collection Name: " msgstr "" -#: ../../mod/group.php:95 ../../mod/group.php:192 +#: ../../mod/group.php:89 ../../mod/group.php:186 msgid "Members are visible to other channels" msgstr "" -#: ../../mod/group.php:113 +#: ../../mod/group.php:107 msgid "Collection removed." msgstr "" -#: ../../mod/group.php:115 +#: ../../mod/group.php:109 msgid "Unable to remove collection." msgstr "" -#: ../../mod/group.php:188 +#: ../../mod/group.php:182 msgid "Collection Editor" msgstr "" -#: ../../mod/group.php:202 +#: ../../mod/group.php:196 msgid "Members" msgstr "" -#: ../../mod/group.php:204 +#: ../../mod/group.php:198 msgid "All Connected Channels" msgstr "" -#: ../../mod/group.php:237 +#: ../../mod/group.php:231 msgid "Click on a channel to add or remove." msgstr "" -#: ../../mod/photos.php:83 +#: ../../mod/photos.php:77 msgid "Page owner information could not be retrieved." msgstr "" -#: ../../mod/photos.php:103 +#: ../../mod/photos.php:97 msgid "Album not found." msgstr "" -#: ../../mod/photos.php:125 ../../mod/photos.php:791 +#: ../../mod/photos.php:119 ../../mod/photos.php:787 msgid "Delete Album" msgstr "" -#: ../../mod/photos.php:165 ../../mod/photos.php:1052 +#: ../../mod/photos.php:159 ../../mod/photos.php:1048 msgid "Delete Photo" msgstr "" -#: ../../mod/photos.php:510 +#: ../../mod/photos.php:504 #, php-format msgid "%1$s was tagged in %2$s by %3$s" msgstr "" -#: ../../mod/photos.php:510 +#: ../../mod/photos.php:504 msgid "a photo" msgstr "" -#: ../../mod/photos.php:586 +#: ../../mod/photos.php:580 msgid "No photos selected" msgstr "" -#: ../../mod/photos.php:631 +#: ../../mod/photos.php:627 msgid "Access to this item is restricted." msgstr "" -#: ../../mod/photos.php:696 +#: ../../mod/photos.php:692 #, php-format msgid "You have used %1$.2f Mbytes of %2$.2f Mbytes photo storage." msgstr "" -#: ../../mod/photos.php:699 +#: ../../mod/photos.php:695 #, php-format msgid "You have used %1$.2f Mbytes of photo storage." msgstr "" -#: ../../mod/photos.php:718 +#: ../../mod/photos.php:714 msgid "Upload Photos" msgstr "" -#: ../../mod/photos.php:722 ../../mod/photos.php:786 +#: ../../mod/photos.php:718 ../../mod/photos.php:782 msgid "New album name: " msgstr "" -#: ../../mod/photos.php:723 +#: ../../mod/photos.php:719 msgid "or existing album name: " msgstr "" -#: ../../mod/photos.php:724 +#: ../../mod/photos.php:720 msgid "Do not show a status post for this upload" msgstr "" -#: ../../mod/photos.php:726 ../../mod/photos.php:1047 +#: ../../mod/photos.php:722 ../../mod/photos.php:1043 msgid "Permissions" msgstr "" -#: ../../mod/photos.php:775 ../../mod/photos.php:797 ../../mod/photos.php:1223 -#: ../../mod/photos.php:1238 +#: ../../mod/photos.php:771 ../../mod/photos.php:793 ../../mod/photos.php:1219 +#: ../../mod/photos.php:1234 msgid "Contact Photos" msgstr "" -#: ../../mod/photos.php:801 +#: ../../mod/photos.php:797 msgid "Edit Album" msgstr "" -#: ../../mod/photos.php:807 +#: ../../mod/photos.php:803 msgid "Show Newest First" msgstr "" -#: ../../mod/photos.php:809 +#: ../../mod/photos.php:805 msgid "Show Oldest First" msgstr "" -#: ../../mod/photos.php:853 ../../mod/photos.php:1270 +#: ../../mod/photos.php:849 ../../mod/photos.php:1266 msgid "View Photo" msgstr "" -#: ../../mod/photos.php:897 +#: ../../mod/photos.php:893 msgid "Permission denied. Access to this item may be restricted." msgstr "" -#: ../../mod/photos.php:899 +#: ../../mod/photos.php:895 msgid "Photo not available" msgstr "" -#: ../../mod/photos.php:957 +#: ../../mod/photos.php:953 msgid "Use as profile photo" msgstr "" -#: ../../mod/photos.php:981 +#: ../../mod/photos.php:977 msgid "View Full Size" msgstr "" -#: ../../mod/photos.php:1035 +#: ../../mod/photos.php:1031 msgid "Edit photo" msgstr "" -#: ../../mod/photos.php:1037 +#: ../../mod/photos.php:1033 msgid "Rotate CW (right)" msgstr "" -#: ../../mod/photos.php:1038 +#: ../../mod/photos.php:1034 msgid "Rotate CCW (left)" msgstr "" -#: ../../mod/photos.php:1040 +#: ../../mod/photos.php:1036 msgid "New album name" msgstr "" -#: ../../mod/photos.php:1043 +#: ../../mod/photos.php:1039 msgid "Caption" msgstr "" -#: ../../mod/photos.php:1045 +#: ../../mod/photos.php:1041 msgid "Add a Tag" msgstr "" -#: ../../mod/photos.php:1049 +#: ../../mod/photos.php:1045 msgid "Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping" msgstr "" -#: ../../mod/photos.php:1276 +#: ../../mod/photos.php:1272 msgid "View Album" msgstr "" -#: ../../mod/photos.php:1285 +#: ../../mod/photos.php:1281 msgid "Recent Photos" msgstr "" @@ -5193,101 +5121,174 @@ msgstr "" msgid "Add or remove entries to this menu" msgstr "" -#: ../../mod/home.php:76 +#: ../../mod/home.php:89 #, php-format msgid "Welcome to %s" msgstr "" -#: ../../mod/message.php:19 -msgid "Check Mail" -msgstr "" - -#: ../../mod/message.php:56 +#: ../../mod/message.php:33 msgid "Unable to lookup recipient." msgstr "" -#: ../../mod/message.php:64 +#: ../../mod/message.php:41 msgid "Unable to communicate with requested channel." msgstr "" -#: ../../mod/message.php:71 +#: ../../mod/message.php:48 msgid "Cannot verify requested channel." msgstr "" -#: ../../mod/message.php:97 +#: ../../mod/message.php:74 msgid "Selected channel has private message restrictions. Send failed." msgstr "" -#: ../../mod/message.php:223 +#: ../../mod/message.php:200 msgid "Messages" msgstr "" -#: ../../mod/message.php:234 +#: ../../mod/message.php:211 msgid "Message deleted." msgstr "" -#: ../../mod/message.php:241 +#: ../../mod/message.php:218 msgid "Conversation removed." msgstr "" -#: ../../mod/message.php:258 +#: ../../mod/message.php:235 msgid "Message recalled." msgstr "" -#: ../../mod/message.php:316 +#: ../../mod/message.php:293 msgid "Send Private Message" msgstr "" -#: ../../mod/message.php:317 ../../mod/message.php:471 +#: ../../mod/message.php:294 ../../mod/message.php:447 msgid "To:" msgstr "" -#: ../../mod/message.php:322 ../../mod/message.php:473 +#: ../../mod/message.php:299 ../../mod/message.php:449 msgid "Subject:" msgstr "" -#: ../../mod/message.php:359 +#: ../../mod/message.php:336 msgid "No messages." msgstr "" -#: ../../mod/message.php:375 ../../mod/message.php:440 +#: ../../mod/message.php:352 ../../mod/message.php:416 msgid "Delete message" msgstr "" -#: ../../mod/message.php:377 +#: ../../mod/message.php:354 msgid "D, d M Y - g:i A" msgstr "" -#: ../../mod/message.php:396 +#: ../../mod/message.php:373 msgid "Message not found." msgstr "" -#: ../../mod/message.php:441 +#: ../../mod/message.php:417 msgid "Recall message" msgstr "" -#: ../../mod/message.php:443 +#: ../../mod/message.php:419 msgid "Message has been recalled." msgstr "" -#: ../../mod/message.php:460 +#: ../../mod/message.php:436 msgid "Private Conversation" msgstr "" -#: ../../mod/message.php:464 +#: ../../mod/message.php:440 msgid "Delete conversation" msgstr "" -#: ../../mod/message.php:466 +#: ../../mod/message.php:442 msgid "" "No secure communications available. You <strong>may</strong> be able to " "respond from the sender's profile page." msgstr "" -#: ../../mod/message.php:470 +#: ../../mod/message.php:446 msgid "Send Reply" msgstr "" +#: ../../mod/connections.php:189 ../../mod/connections.php:261 +msgid "Blocked" +msgstr "" + +#: ../../mod/connections.php:194 ../../mod/connections.php:268 +msgid "Ignored" +msgstr "" + +#: ../../mod/connections.php:199 ../../mod/connections.php:282 +msgid "Hidden" +msgstr "" + +#: ../../mod/connections.php:204 ../../mod/connections.php:275 +msgid "Archived" +msgstr "" + +#: ../../mod/connections.php:215 +msgid "All" +msgstr "" + +#: ../../mod/connections.php:239 +msgid "Suggest new connections" +msgstr "" + +#: ../../mod/connections.php:245 +msgid "Show pending (new) connections" +msgstr "" + +#: ../../mod/connections.php:248 +msgid "All Connections" +msgstr "" + +#: ../../mod/connections.php:251 +msgid "Show all connections" +msgstr "" + +#: ../../mod/connections.php:254 +msgid "Unblocked" +msgstr "" + +#: ../../mod/connections.php:257 +msgid "Only show unblocked connections" +msgstr "" + +#: ../../mod/connections.php:264 +msgid "Only show blocked connections" +msgstr "" + +#: ../../mod/connections.php:271 +msgid "Only show ignored connections" +msgstr "" + +#: ../../mod/connections.php:278 +msgid "Only show archived connections" +msgstr "" + +#: ../../mod/connections.php:285 +msgid "Only show hidden connections" +msgstr "" + +#: ../../mod/connections.php:329 +#, php-format +msgid "%1$s [%2$s]" +msgstr "" + +#: ../../mod/connections.php:330 +msgid "Edit contact" +msgstr "" + +#: ../../mod/connections.php:353 +msgid "Search your connections" +msgstr "" + +#: ../../mod/connections.php:354 +msgid "Finding: " +msgstr "" + #: ../../mod/layouts.php:52 msgid "Layout Help" msgstr "" @@ -5300,11 +5301,11 @@ msgstr "" msgid "Layout Name" msgstr "" -#: ../../mod/help.php:41 +#: ../../mod/help.php:43 ../../mod/help.php:49 ../../mod/help.php:55 msgid "Help:" msgstr "" -#: ../../mod/help.php:53 ../../index.php:226 +#: ../../mod/help.php:68 ../../index.php:226 msgid "Not Found" msgstr "" @@ -5344,6 +5345,10 @@ msgstr "" msgid "Invalid connection." msgstr "" +#: ../../mod/follow.php:25 +msgid "Channel added." +msgstr "" + #: ../../mod/post.php:222 msgid "" "Remote authentication blocked. You are logged into this site locally. Please " @@ -5367,7 +5372,7 @@ msgstr "" msgid "Visible to:" msgstr "" -#: ../../mod/magic.php:63 +#: ../../mod/magic.php:70 msgid "Hub not found." msgstr "" @@ -5607,7 +5612,7 @@ msgid "" "be visible to anybody using the internet." msgstr "" -#: ../../mod/profiles.php:573 ../../mod/directory.php:161 +#: ../../mod/profiles.php:573 ../../mod/directory.php:159 msgid "Age: " msgstr "" @@ -5648,626 +5653,597 @@ msgid "" "Or <a href=\"import\">import an existing channel</a> from another location" msgstr "" -#: ../../mod/connections.php:71 -msgid "Could not access contact record." -msgstr "" - -#: ../../mod/connections.php:85 -msgid "Could not locate selected profile." -msgstr "" - -#: ../../mod/connections.php:126 -msgid "Connection updated." +#: ../../mod/filestorage.php:35 +msgid "Permission Denied." msgstr "" -#: ../../mod/connections.php:128 -msgid "Failed to update connection record." +#: ../../mod/filestorage.php:42 +msgid "Permission denied. VS." msgstr "" -#: ../../mod/connections.php:223 -msgid "Could not access address book record." +#: ../../mod/filestorage.php:79 +msgid "Download" msgstr "" -#: ../../mod/connections.php:237 -msgid "Refresh failed - channel is currently unavailable." +#: ../../mod/filestorage.php:84 +msgid "Used: " msgstr "" -#: ../../mod/connections.php:244 -msgid "Channel has been unblocked" +#: ../../mod/filestorage.php:86 +msgid "Limit: " msgstr "" -#: ../../mod/connections.php:245 -msgid "Channel has been blocked" +#: ../../mod/lostpass.php:15 +msgid "No valid account found." msgstr "" -#: ../../mod/connections.php:249 ../../mod/connections.php:261 -#: ../../mod/connections.php:273 ../../mod/connections.php:285 -#: ../../mod/connections.php:300 -msgid "Unable to set address book parameters." +#: ../../mod/lostpass.php:29 +msgid "Password reset request issued. Check your email." msgstr "" -#: ../../mod/connections.php:256 -msgid "Channel has been unignored" +#: ../../mod/lostpass.php:35 ../../mod/lostpass.php:102 +#, php-format +msgid "Site Member (%s)" msgstr "" -#: ../../mod/connections.php:257 -msgid "Channel has been ignored" +#: ../../mod/lostpass.php:40 +#, php-format +msgid "Password reset requested at %s" msgstr "" -#: ../../mod/connections.php:268 -msgid "Channel has been unarchived" +#: ../../mod/lostpass.php:63 +msgid "" +"Request could not be verified. (You may have previously submitted it.) " +"Password reset failed." msgstr "" -#: ../../mod/connections.php:269 -msgid "Channel has been archived" +#: ../../mod/lostpass.php:85 ../../boot.php:1426 +msgid "Password Reset" msgstr "" -#: ../../mod/connections.php:280 -msgid "Channel has been unhidden" +#: ../../mod/lostpass.php:86 +msgid "Your password has been reset as requested." msgstr "" -#: ../../mod/connections.php:281 -msgid "Channel has been hidden" +#: ../../mod/lostpass.php:87 +msgid "Your new password is" msgstr "" -#: ../../mod/connections.php:295 -msgid "Channel has been approved" +#: ../../mod/lostpass.php:88 +msgid "Save or copy your new password - and then" msgstr "" -#: ../../mod/connections.php:296 -msgid "Channel has been unapproved" +#: ../../mod/lostpass.php:89 +msgid "click here to login" msgstr "" -#: ../../mod/connections.php:314 -msgid "Contact has been removed." +#: ../../mod/lostpass.php:90 +msgid "" +"Your password may be changed from the <em>Settings</em> page after " +"successful login." msgstr "" -#: ../../mod/connections.php:334 +#: ../../mod/lostpass.php:107 #, php-format -msgid "View %s's profile" -msgstr "" - -#: ../../mod/connections.php:338 -msgid "Refresh Permissions" +msgid "Your password has changed at %s" msgstr "" -#: ../../mod/connections.php:341 -msgid "Fetch updated permissions" +#: ../../mod/lostpass.php:122 +msgid "Forgot your Password?" msgstr "" -#: ../../mod/connections.php:345 -msgid "Recent Activity" +#: ../../mod/lostpass.php:123 +msgid "" +"Enter your email address and submit to have your password reset. Then check " +"your email for further instructions." msgstr "" -#: ../../mod/connections.php:348 -msgid "View recent posts and comments" +#: ../../mod/lostpass.php:124 +msgid "Email Address" msgstr "" -#: ../../mod/connections.php:355 -msgid "Block or Unblock this connection" +#: ../../mod/lostpass.php:125 +msgid "Reset" msgstr "" -#: ../../mod/connections.php:359 ../../mod/connections.php:495 -msgid "Unignore" +#: ../../mod/import.php:36 +msgid "Nothing to import." msgstr "" -#: ../../mod/connections.php:359 ../../mod/connections.php:495 -#: ../../mod/notifications.php:51 -msgid "Ignore" +#: ../../mod/import.php:58 +msgid "Unable to download data from old server" msgstr "" -#: ../../mod/connections.php:362 -msgid "Ignore or Unignore this connection" +#: ../../mod/import.php:64 +msgid "Imported file is empty." msgstr "" -#: ../../mod/connections.php:365 -msgid "Unarchive" +#: ../../mod/import.php:88 +msgid "" +"Cannot create a duplicate channel identifier on this system. Import failed." msgstr "" -#: ../../mod/connections.php:365 -msgid "Archive" +#: ../../mod/import.php:106 +msgid "Channel clone failed. Import failed." msgstr "" -#: ../../mod/connections.php:368 -msgid "Archive or Unarchive this connection" +#: ../../mod/import.php:116 +msgid "Cloned channel not found. Import failed." msgstr "" -#: ../../mod/connections.php:371 -msgid "Unhide" +#: ../../mod/import.php:358 +msgid "Import completed." msgstr "" -#: ../../mod/connections.php:371 -msgid "Hide" +#: ../../mod/import.php:371 +msgid "You must be logged in to use this feature." msgstr "" -#: ../../mod/connections.php:374 -msgid "Hide or Unhide this connection" +#: ../../mod/import.php:376 +msgid "Import Channel" msgstr "" -#: ../../mod/connections.php:381 -msgid "Delete this connection" +#: ../../mod/import.php:377 +msgid "" +"Use this form to import an existing channel from a different server/hub. You " +"may retrieve the channel identity from the old server/hub via the network or " +"provide an export file. Only identity and connections/relationships will be " +"imported. Importation of content is not yet available." msgstr "" -#: ../../mod/connections.php:414 -msgid "Unknown" +#: ../../mod/import.php:378 +msgid "File to Upload" msgstr "" -#: ../../mod/connections.php:424 ../../mod/connections.php:453 -msgid "Approve this connection" +#: ../../mod/import.php:379 +msgid "Or provide the old server/hub details" msgstr "" -#: ../../mod/connections.php:424 -msgid "Accept connection to allow communication" +#: ../../mod/import.php:380 +msgid "Your old identity address (xyz@example.com)" msgstr "" -#: ../../mod/connections.php:440 -msgid "Automatic Permissions Settings" +#: ../../mod/import.php:381 +msgid "Your old login email address" msgstr "" -#: ../../mod/connections.php:440 -#, php-format -msgid "Connections: settings for %s" +#: ../../mod/import.php:382 +msgid "Your old login password" msgstr "" -#: ../../mod/connections.php:444 +#: ../../mod/import.php:383 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." +"For either option, please choose whether to make this hub your new primary " +"address, or whether your old location should continue this role. You will be " +"able to post from either location, but only one can be marked as the primary " +"location for files, photos, and media." msgstr "" -#: ../../mod/connections.php:446 -msgid "Slide to adjust your degree of friendship" +#: ../../mod/import.php:384 +msgid "Make this hub my primary location" msgstr "" -#: ../../mod/connections.php:452 -msgid "inherited" +#: ../../mod/manage.php:63 +#, php-format +msgid "You have created %1$.0f of %2$.0f allowed channels." msgstr "" -#: ../../mod/connections.php:454 -msgid "Connection has no individual permissions!" +#: ../../mod/manage.php:71 +msgid "Create a new channel" msgstr "" -#: ../../mod/connections.php:455 -msgid "" -"This may be appropriate based on your <a href=\"settings\">privacy settings</" -"a>, though you may wish to review the \"Advanced Permissions\"." +#: ../../mod/manage.php:76 +msgid "Channel Manager" msgstr "" -#: ../../mod/connections.php:457 -msgid "Profile Visibility" +#: ../../mod/manage.php:77 +msgid "Current Channel" msgstr "" -#: ../../mod/connections.php:458 -#, php-format -msgid "" -"Please choose the profile you would like to display to %s when viewing your " -"profile securely." +#: ../../mod/manage.php:79 +msgid "Attach to one of your channels by selecting it." msgstr "" -#: ../../mod/connections.php:459 -msgid "Contact Information / Notes" +#: ../../mod/manage.php:80 +msgid "Default Channel" msgstr "" -#: ../../mod/connections.php:460 -msgid "Edit contact notes" +#: ../../mod/manage.php:81 +msgid "Make Default" msgstr "" -#: ../../mod/connections.php:462 -msgid "Their Settings" +#: ../../mod/vote.php:97 +msgid "Total votes" msgstr "" -#: ../../mod/connections.php:463 -msgid "My Settings" +#: ../../mod/vote.php:98 +msgid "Average Rating" msgstr "" -#: ../../mod/connections.php:465 -msgid "Forum Members" +#: ../../mod/match.php:16 +msgid "Profile Match" msgstr "" -#: ../../mod/connections.php:466 -msgid "Soapbox" +#: ../../mod/match.php:24 +msgid "No keywords to match. Please add keywords to your default profile." msgstr "" -#: ../../mod/connections.php:467 -msgid "Full Sharing" +#: ../../mod/match.php:61 +msgid "is interested in:" msgstr "" -#: ../../mod/connections.php:468 -msgid "Cautious Sharing" +#: ../../mod/match.php:69 +msgid "No matches" msgstr "" -#: ../../mod/connections.php:469 -msgid "Follow Only" +#: ../../mod/zfinger.php:23 +msgid "invalid target signature" msgstr "" -#: ../../mod/connections.php:470 -msgid "Individual Permissions" +#: ../../mod/settings.php:71 +msgid "Name is required" msgstr "" -#: ../../mod/connections.php:471 -msgid "" -"Some permissions may be inherited from your channel <a href=\"settings" -"\">privacy settings</a>, which have higher priority. Changing those " -"inherited settings on this page will have no effect." +#: ../../mod/settings.php:75 +msgid "Key and Secret are required" msgstr "" -#: ../../mod/connections.php:472 -msgid "Advanced Permissions" +#: ../../mod/settings.php:79 ../../mod/settings.php:533 +msgid "Update" msgstr "" -#: ../../mod/connections.php:473 -msgid "Quick Links" +#: ../../mod/settings.php:192 +msgid "Passwords do not match. Password unchanged." msgstr "" -#: ../../mod/connections.php:477 -#, php-format -msgid "Visit %s's profile - %s" +#: ../../mod/settings.php:196 +msgid "Empty passwords are not allowed. Password unchanged." msgstr "" -#: ../../mod/connections.php:478 -msgid "Block/Unblock contact" +#: ../../mod/settings.php:209 +msgid "Password changed." msgstr "" -#: ../../mod/connections.php:479 -msgid "Ignore contact" +#: ../../mod/settings.php:211 +msgid "Password update failed. Please try again." msgstr "" -#: ../../mod/connections.php:480 -msgid "Repair URL settings" +#: ../../mod/settings.php:225 +msgid "Not valid email." msgstr "" -#: ../../mod/connections.php:481 -msgid "View conversations" +#: ../../mod/settings.php:228 +msgid "Protected email address. Cannot change to that email." msgstr "" -#: ../../mod/connections.php:483 -msgid "Delete contact" +#: ../../mod/settings.php:237 +msgid "System failure storing new email. Please try again." msgstr "" -#: ../../mod/connections.php:486 -msgid "Last update:" +#: ../../mod/settings.php:435 +msgid "Settings updated." msgstr "" -#: ../../mod/connections.php:488 -msgid "Update public posts" +#: ../../mod/settings.php:506 ../../mod/settings.php:532 +#: ../../mod/settings.php:568 +msgid "Add application" msgstr "" -#: ../../mod/connections.php:490 -msgid "Update now" +#: ../../mod/settings.php:509 +msgid "Name of application" msgstr "" -#: ../../mod/connections.php:496 -msgid "Currently blocked" +#: ../../mod/settings.php:510 ../../mod/settings.php:536 +msgid "Consumer Key" msgstr "" -#: ../../mod/connections.php:497 -msgid "Currently ignored" +#: ../../mod/settings.php:510 ../../mod/settings.php:511 +msgid "Automatically generated - change if desired. Max length 20" msgstr "" -#: ../../mod/connections.php:498 -msgid "Currently archived" +#: ../../mod/settings.php:511 ../../mod/settings.php:537 +msgid "Consumer Secret" msgstr "" -#: ../../mod/connections.php:499 -msgid "Currently pending" +#: ../../mod/settings.php:512 ../../mod/settings.php:538 +msgid "Redirect" msgstr "" -#: ../../mod/connections.php:500 -msgid "Hide this contact from others" +#: ../../mod/settings.php:512 +msgid "" +"Redirect URI - leave blank unless your application specifically requires this" msgstr "" -#: ../../mod/connections.php:500 -msgid "" -"Replies/likes to your public posts <strong>may</strong> still be visible" +#: ../../mod/settings.php:513 ../../mod/settings.php:539 +msgid "Icon url" msgstr "" -#: ../../mod/connections.php:536 ../../mod/connections.php:608 -msgid "Blocked" +#: ../../mod/settings.php:513 +msgid "Optional" msgstr "" -#: ../../mod/connections.php:541 ../../mod/connections.php:615 -msgid "Ignored" +#: ../../mod/settings.php:524 +msgid "You can't edit this application." msgstr "" -#: ../../mod/connections.php:546 ../../mod/connections.php:629 -msgid "Hidden" +#: ../../mod/settings.php:567 +msgid "Connected Apps" msgstr "" -#: ../../mod/connections.php:551 ../../mod/connections.php:622 -msgid "Archived" +#: ../../mod/settings.php:571 +msgid "Client key starts with" msgstr "" -#: ../../mod/connections.php:562 -msgid "All" +#: ../../mod/settings.php:572 +msgid "No name" msgstr "" -#: ../../mod/connections.php:586 -msgid "Suggest new connections" +#: ../../mod/settings.php:573 +msgid "Remove authorization" msgstr "" -#: ../../mod/connections.php:592 -msgid "Show pending (new) connections" +#: ../../mod/settings.php:584 +msgid "No feature settings configured" msgstr "" -#: ../../mod/connections.php:595 -msgid "All Connections" +#: ../../mod/settings.php:592 +msgid "Feature Settings" msgstr "" -#: ../../mod/connections.php:598 -msgid "Show all connections" +#: ../../mod/settings.php:615 +msgid "Account Settings" msgstr "" -#: ../../mod/connections.php:601 -msgid "Unblocked" +#: ../../mod/settings.php:616 +msgid "Password Settings" msgstr "" -#: ../../mod/connections.php:604 -msgid "Only show unblocked connections" +#: ../../mod/settings.php:617 +msgid "New Password:" msgstr "" -#: ../../mod/connections.php:611 -msgid "Only show blocked connections" +#: ../../mod/settings.php:618 +msgid "Confirm:" msgstr "" -#: ../../mod/connections.php:618 -msgid "Only show ignored connections" +#: ../../mod/settings.php:618 +msgid "Leave password fields blank unless changing" msgstr "" -#: ../../mod/connections.php:625 -msgid "Only show archived connections" +#: ../../mod/settings.php:620 ../../mod/settings.php:912 +msgid "Email Address:" msgstr "" -#: ../../mod/connections.php:632 -msgid "Only show hidden connections" +#: ../../mod/settings.php:621 +msgid "Remove Account" msgstr "" -#: ../../mod/connections.php:674 -#, php-format -msgid "%1$s [%2$s]" +#: ../../mod/settings.php:622 +msgid "Warning: This action is permanent and cannot be reversed." msgstr "" -#: ../../mod/connections.php:675 -msgid "Edit contact" +#: ../../mod/settings.php:638 +msgid "Off" msgstr "" -#: ../../mod/connections.php:698 -msgid "Search your connections" +#: ../../mod/settings.php:638 +msgid "On" msgstr "" -#: ../../mod/connections.php:699 -msgid "Finding: " +#: ../../mod/settings.php:645 +msgid "Additional Features" msgstr "" -#: ../../mod/filestorage.php:35 -msgid "Permission Denied." +#: ../../mod/settings.php:670 +msgid "Connector Settings" msgstr "" -#: ../../mod/filestorage.php:42 -msgid "Permission denied. VS." +#: ../../mod/settings.php:740 +msgid "Display Settings" msgstr "" -#: ../../mod/filestorage.php:79 -msgid "Download" +#: ../../mod/settings.php:746 +msgid "Display Theme:" msgstr "" -#: ../../mod/filestorage.php:84 -msgid "Used: " +#: ../../mod/settings.php:747 +msgid "Mobile Theme:" msgstr "" -#: ../../mod/filestorage.php:86 -msgid "Limit: " +#: ../../mod/settings.php:748 +msgid "Update browser every xx seconds" msgstr "" -#: ../../mod/lostpass.php:15 -msgid "No valid account found." +#: ../../mod/settings.php:748 +msgid "Minimum of 10 seconds, no maximum" msgstr "" -#: ../../mod/lostpass.php:29 -msgid "Password reset request issued. Check your email." +#: ../../mod/settings.php:749 +msgid "Maximum number of conversations to load at any time:" msgstr "" -#: ../../mod/lostpass.php:35 ../../mod/lostpass.php:102 -#, php-format -msgid "Site Member (%s)" +#: ../../mod/settings.php:749 +msgid "Maximum of 100 items" msgstr "" -#: ../../mod/lostpass.php:40 -#, php-format -msgid "Password reset requested at %s" +#: ../../mod/settings.php:750 +msgid "Don't show emoticons" msgstr "" -#: ../../mod/lostpass.php:63 -msgid "" -"Request could not be verified. (You may have previously submitted it.) " -"Password reset failed." +#: ../../mod/settings.php:786 +msgid "Nobody except yourself" msgstr "" -#: ../../mod/lostpass.php:85 ../../boot.php:1450 -msgid "Password Reset" +#: ../../mod/settings.php:787 +msgid "Only those you specifically allow" msgstr "" -#: ../../mod/lostpass.php:86 -msgid "Your password has been reset as requested." +#: ../../mod/settings.php:788 +msgid "Anybody in your address book" msgstr "" -#: ../../mod/lostpass.php:87 -msgid "Your new password is" +#: ../../mod/settings.php:789 +msgid "Anybody on this website" msgstr "" -#: ../../mod/lostpass.php:88 -msgid "Save or copy your new password - and then" +#: ../../mod/settings.php:790 +msgid "Anybody in this network" msgstr "" -#: ../../mod/lostpass.php:89 -msgid "click here to login" +#: ../../mod/settings.php:791 +msgid "Anybody on the internet" msgstr "" -#: ../../mod/lostpass.php:90 -msgid "" -"Your password may be changed from the <em>Settings</em> page after " -"successful login." +#: ../../mod/settings.php:865 +msgid "Publish your default profile in the network directory" msgstr "" -#: ../../mod/lostpass.php:107 -#, php-format -msgid "Your password has changed at %s" +#: ../../mod/settings.php:870 +msgid "Allow us to suggest you as a potential friend to new members?" msgstr "" -#: ../../mod/lostpass.php:122 -msgid "Forgot your Password?" +#: ../../mod/settings.php:874 ../../mod/profile_photo.php:288 +msgid "or" msgstr "" -#: ../../mod/lostpass.php:123 -msgid "" -"Enter your email address and submit to have your password reset. Then check " -"your email for further instructions." +#: ../../mod/settings.php:879 +msgid "Your channel address is" msgstr "" -#: ../../mod/lostpass.php:124 -msgid "Email Address" +#: ../../mod/settings.php:901 +msgid "Channel Settings" msgstr "" -#: ../../mod/lostpass.php:125 -msgid "Reset" +#: ../../mod/settings.php:910 +msgid "Basic Settings" msgstr "" -#: ../../mod/import.php:36 -msgid "Nothing to import." +#: ../../mod/settings.php:913 +msgid "Your Timezone:" msgstr "" -#: ../../mod/import.php:58 -msgid "Unable to download data from old server" +#: ../../mod/settings.php:914 +msgid "Default Post Location:" msgstr "" -#: ../../mod/import.php:64 -msgid "Imported file is empty." +#: ../../mod/settings.php:915 +msgid "Use Browser Location:" msgstr "" -#: ../../mod/import.php:88 -msgid "" -"Cannot create a duplicate channel identifier on this system. Import failed." +#: ../../mod/settings.php:917 +msgid "Adult Content" msgstr "" -#: ../../mod/import.php:106 -msgid "Channel clone failed. Import failed." +#: ../../mod/settings.php:917 +msgid "This channel publishes adult content." msgstr "" -#: ../../mod/import.php:116 -msgid "Cloned channel not found. Import failed." +#: ../../mod/settings.php:919 +msgid "Security and Privacy Settings" msgstr "" -#: ../../mod/import.php:358 -msgid "Import completed." +#: ../../mod/settings.php:921 +msgid "Quick Privacy Settings:" msgstr "" -#: ../../mod/import.php:371 -msgid "You must be logged in to use this feature." +#: ../../mod/settings.php:922 +msgid "Very Public - extremely permissive" msgstr "" -#: ../../mod/import.php:376 -msgid "Import Channel" +#: ../../mod/settings.php:923 +msgid "Typical - default public, privacy when desired" msgstr "" -#: ../../mod/import.php:377 -msgid "" -"Use this form to import an existing channel from a different server/hub. You " -"may retrieve the channel identity from the old server/hub via the network or " -"provide an export file. Only identity and connections/relationships will be " -"imported. Importation of content is not yet available." +#: ../../mod/settings.php:924 +msgid "Private - default private, rarely open or public" msgstr "" -#: ../../mod/import.php:378 -msgid "File to Upload" +#: ../../mod/settings.php:925 +msgid "Blocked - default blocked to/from everybody" msgstr "" -#: ../../mod/import.php:379 -msgid "Or provide the old server/hub details" +#: ../../mod/settings.php:928 +msgid "Maximum Friend Requests/Day:" msgstr "" -#: ../../mod/import.php:380 -msgid "Your old identity address (xyz@example.com)" +#: ../../mod/settings.php:928 +msgid "May reduce spam activity" msgstr "" -#: ../../mod/import.php:381 -msgid "Your old login email address" +#: ../../mod/settings.php:929 +msgid "Default Post Permissions" msgstr "" -#: ../../mod/import.php:382 -msgid "Your old login password" +#: ../../mod/settings.php:941 +msgid "Maximum private messages per day from unknown people:" msgstr "" -#: ../../mod/import.php:383 -msgid "" -"For either option, please choose whether to make this hub your new primary " -"address, or whether your old location should continue this role. You will be " -"able to post from either location, but only one can be marked as the primary " -"location for files, photos, and media." +#: ../../mod/settings.php:941 +msgid "Useful to reduce spamming" msgstr "" -#: ../../mod/import.php:384 -msgid "Make this hub my primary location" +#: ../../mod/settings.php:944 +msgid "Notification Settings" msgstr "" -#: ../../mod/manage.php:63 -#, php-format -msgid "You have created %1$.0f of %2$.0f allowed channels." +#: ../../mod/settings.php:945 +msgid "By default post a status message when:" msgstr "" -#: ../../mod/manage.php:71 -msgid "Create a new channel" +#: ../../mod/settings.php:946 +msgid "accepting a friend request" msgstr "" -#: ../../mod/manage.php:76 -msgid "Channel Manager" +#: ../../mod/settings.php:947 +msgid "joining a forum/community" msgstr "" -#: ../../mod/manage.php:77 -msgid "Current Channel" +#: ../../mod/settings.php:948 +msgid "making an <em>interesting</em> profile change" msgstr "" -#: ../../mod/manage.php:79 -msgid "Attach to one of your channels by selecting it." +#: ../../mod/settings.php:949 +msgid "Send a notification email when:" msgstr "" -#: ../../mod/manage.php:80 -msgid "Default Channel" +#: ../../mod/settings.php:950 +msgid "You receive an introduction" msgstr "" -#: ../../mod/manage.php:81 -msgid "Make Default" +#: ../../mod/settings.php:951 +msgid "Your introductions are confirmed" msgstr "" -#: ../../mod/vote.php:97 -msgid "Total votes" +#: ../../mod/settings.php:952 +msgid "Someone writes on your profile wall" msgstr "" -#: ../../mod/vote.php:98 -msgid "Average Rating" +#: ../../mod/settings.php:953 +msgid "Someone writes a followup comment" msgstr "" -#: ../../mod/match.php:16 -msgid "Profile Match" +#: ../../mod/settings.php:954 +msgid "You receive a private message" msgstr "" -#: ../../mod/match.php:24 -msgid "No keywords to match. Please add keywords to your default profile." +#: ../../mod/settings.php:955 +msgid "You receive a friend suggestion" msgstr "" -#: ../../mod/match.php:61 -msgid "is interested in:" +#: ../../mod/settings.php:956 +msgid "You are tagged in a post" msgstr "" -#: ../../mod/match.php:69 -msgid "No matches" +#: ../../mod/settings.php:957 +msgid "You are poked/prodded/etc. in a post" msgstr "" -#: ../../mod/zfinger.php:23 -msgid "invalid target signature" +#: ../../mod/settings.php:960 +msgid "Advanced Account/Page Type Settings" msgstr "" -#: ../../mod/follow.php:25 -msgid "Channel added." +#: ../../mod/settings.php:961 +msgid "Change the behaviour of this account for special situations" msgstr "" #: ../../mod/editlayout.php:36 ../../mod/editwebpage.php:32 @@ -6537,50 +6513,50 @@ msgstr "" msgid "You have reached your limit of %1$.0f webpages." msgstr "" -#: ../../mod/siteinfo.php:51 +#: ../../mod/siteinfo.php:57 #, php-format msgid "Version %s" msgstr "" -#: ../../mod/siteinfo.php:65 +#: ../../mod/siteinfo.php:76 msgid "Installed plugins/addons/apps:" msgstr "" -#: ../../mod/siteinfo.php:78 +#: ../../mod/siteinfo.php:89 msgid "No installed plugins/addons/apps" msgstr "" -#: ../../mod/siteinfo.php:81 +#: ../../mod/siteinfo.php:92 msgid "Red" msgstr "" -#: ../../mod/siteinfo.php:82 +#: ../../mod/siteinfo.php:93 msgid "" "This is a hub of the Red Matrix - a global cooperative network of " "decentralised privacy enhanced websites." msgstr "" -#: ../../mod/siteinfo.php:84 +#: ../../mod/siteinfo.php:96 msgid "Running at web location" msgstr "" -#: ../../mod/siteinfo.php:85 +#: ../../mod/siteinfo.php:97 msgid "" "Please visit <a href=\"http://getzot.com\">GetZot.com</a> to learn more " "about the Red Matrix." msgstr "" -#: ../../mod/siteinfo.php:86 +#: ../../mod/siteinfo.php:98 msgid "Bug reports and issues: please visit" msgstr "" -#: ../../mod/siteinfo.php:89 +#: ../../mod/siteinfo.php:101 msgid "" "Suggestions, praise, donations, etc. - please email \"redmatrix\" at " "librelist - dot com" msgstr "" -#: ../../mod/suggest.php:42 +#: ../../mod/suggest.php:35 msgid "" "No suggestions available. If this is a new site, please try again in 24 " "hours." @@ -6709,23 +6685,23 @@ msgstr "" msgid "Remove My Account" msgstr "" -#: ../../mod/directory.php:164 +#: ../../mod/directory.php:162 msgid "Gender: " msgstr "" -#: ../../mod/directory.php:225 +#: ../../mod/directory.php:223 msgid "Finding:" msgstr "" -#: ../../mod/directory.php:233 +#: ../../mod/directory.php:231 msgid "next page" msgstr "" -#: ../../mod/directory.php:233 +#: ../../mod/directory.php:231 msgid "previous page" msgstr "" -#: ../../mod/directory.php:240 +#: ../../mod/directory.php:238 msgid "No entries (some entries may be hidden)." msgstr "" @@ -6982,41 +6958,41 @@ msgstr "" msgid "Header image only on profile pages" msgstr "" -#: ../../boot.php:1255 +#: ../../boot.php:1224 #, php-format msgid "Update %s failed. See error logs." msgstr "" -#: ../../boot.php:1258 +#: ../../boot.php:1227 #, php-format msgid "Update Error at %s" msgstr "" -#: ../../boot.php:1415 +#: ../../boot.php:1391 msgid "" "Create an account to access services and applications within the Red Matrix" msgstr "" -#: ../../boot.php:1443 +#: ../../boot.php:1419 msgid "Password" msgstr "" -#: ../../boot.php:1444 +#: ../../boot.php:1420 msgid "Remember me" msgstr "" -#: ../../boot.php:1449 +#: ../../boot.php:1425 msgid "Forgot your password?" msgstr "" -#: ../../boot.php:1514 +#: ../../boot.php:1490 msgid "permission denied" msgstr "" -#: ../../boot.php:1515 +#: ../../boot.php:1491 msgid "Got Zot?" msgstr "" -#: ../../boot.php:1907 +#: ../../boot.php:1887 msgid "toggle mobile" msgstr "" diff --git a/version.inc b/version.inc index 8ba637b20..81076cbc3 100644 --- a/version.inc +++ b/version.inc @@ -1 +1 @@ -2013-12-19.531 +2013-12-20.532 diff --git a/view/pdl/mod_search.pdl b/view/pdl/mod_search.pdl new file mode 100644 index 000000000..7de4a270f --- /dev/null +++ b/view/pdl/mod_search.pdl @@ -0,0 +1,3 @@ +[region=aside] +[widget=savedsearch][/widget] +[/region] |