![(please configure the [header_logo] section in trac.ini)](/chrome/site/your_project_logo.png){kind=logo}
Changeset 8705
- Timestamp:
- 07/27/2014 05:48:17 PM (12 years ago)
- Location:
- trunk/src
- Files:
-
- 17 edited
-
bp-activity/bp-activity-admin.php (modified) (3 diffs)
-
bp-activity/bp-activity-loader.php (modified) (13 diffs)
-
bp-core/bp-core-admin.php (modified) (1 diff)
-
bp-core/bp-core-loader.php (modified) (2 diffs)
-
bp-core/bp-core-template.php (modified) (1 diff)
-
bp-friends/bp-friends-loader.php (modified) (5 diffs)
-
bp-friends/bp-friends-screens.php (modified) (3 diffs)
-
bp-groups/bp-groups-admin.php (modified) (1 diff)
-
bp-groups/bp-groups-loader.php (modified) (16 diffs)
-
bp-groups/bp-groups-screens.php (modified) (6 diffs)
-
bp-members/bp-members-loader.php (modified) (2 diffs)
-
bp-messages/bp-messages-template.php (modified) (1 diff)
-
bp-notifications/bp-notifications-loader.php (modified) (5 diffs)
-
bp-notifications/bp-notifications-template.php (modified) (1 diff)
-
bp-templates/bp-legacy/buddypress/members/single/groups/invites.php (modified) (1 diff)
-
bp-xprofile/bp-xprofile-admin.php (modified) (2 diffs)
-
bp-xprofile/bp-xprofile-loader.php (modified) (14 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/bp-activity/bp-activity-admin.php
r8654 r8705 30 30 // Add our screen 31 31 $hook = add_menu_page( 32 _ _( 'Activity', 'buddypress' ),33 _ _( 'Activity', 'buddypress' ),32 _x( 'Activity', 'Admin Dashbord SWA page title', 'buddypress' ), 33 _x( 'Activity', 'Admin Dashbord SWA menu', 'buddypress' ), 34 34 'bp_moderate', 35 35 'bp-activity', … … 904 904 <?php printf( __( 'Activity related to ID #%s', 'buddypress' ), number_format_i18n( (int) $_REQUEST['aid'] ) ); ?> 905 905 <?php else : ?> 906 <?php _ e( 'Activity', 'buddypress' ); ?>906 <?php _x( 'Activity', 'Admin SWA page', 'buddypress' ); ?> 907 907 <?php endif; ?> 908 908 … … 1239 1239 return array( 1240 1240 'cb' => '<input name type="checkbox" />', 1241 'author' => _ _( 'Author', 'buddypress' ),1242 'comment' => _ _( 'Activity', 'buddypress' ),1243 'action' => _ _( 'Action', 'buddypress' ),1244 'response' => _ _( 'In Response To', 'buddypress' ),1241 'author' => _x('Author', 'Admin SWA column header', 'buddypress' ), 1242 'comment' => _x( 'Activity', 'Admin SWA column header', 'buddypress' ), 1243 'action' => _x( 'Action', 'Admin SWA column header', 'buddypress' ), 1244 'response' => _x( 'In Response To', 'Admin SWA column header', 'buddypress' ), 1245 1245 ); 1246 1246 } -
trunk/src/bp-activity/bp-activity-loader.php
r8662 r8705 137 137 // Add 'Activity' to the main navigation 138 138 $main_nav = array( 139 'name' => _ _( 'Activity', 'buddypress' ),139 'name' => _x( 'Activity', 'Profile activity screen nav', 'buddypress' ), 140 140 'slug' => $this->slug, 141 141 'position' => 10, … … 163 163 // Add the subnav items to the activity nav item if we are using a theme that supports this 164 164 $sub_nav[] = array( 165 'name' => _ _( 'Personal', 'buddypress' ),165 'name' => _x( 'Personal', 'Profile activity screen sub nav', 'buddypress' ), 166 166 'slug' => 'just-me', 167 167 'parent_url' => $activity_link, … … 174 174 if ( bp_activity_do_mentions() ) { 175 175 $sub_nav[] = array( 176 'name' => _ _( 'Mentions', 'buddypress' ),176 'name' => _x( 'Mentions', 'Profile activity screen sub nav', 'buddypress' ), 177 177 'slug' => 'mentions', 178 178 'parent_url' => $activity_link, … … 186 186 // Favorite activity items 187 187 $sub_nav[] = array( 188 'name' => _ _( 'Favorites', 'buddypress' ),188 'name' => _x( 'Favorites', 'Profile activity screen sub nav', 'buddypress' ), 189 189 'slug' => 'favorites', 190 190 'parent_url' => $activity_link, … … 198 198 if ( bp_is_active( 'friends' ) ) { 199 199 $sub_nav[] = array( 200 'name' => _ _( 'Friends', 'buddypress' ),200 'name' => _x( 'Friends', 'Profile activity screen sub nav', 'buddypress' ), 201 201 'slug' => bp_get_friends_slug(), 202 202 'parent_url' => $activity_link, … … 211 211 if ( bp_is_active( 'groups' ) ) { 212 212 $sub_nav[] = array( 213 'name' => _ _( 'Groups', 'buddypress' ),213 'name' => _x( 'Groups', 'Profile activity screen sub nav', 'buddypress' ), 214 214 'slug' => bp_get_groups_slug(), 215 215 'parent_url' => $activity_link, … … 256 256 $count = bp_get_total_mention_count_for_user( bp_loggedin_user_id() ); 257 257 if ( !empty( $count ) ) { 258 $title = sprintf( _ _( 'Mentions <span class="count">%s</span>', 'buddypress' ), number_format_i18n( $count ) );258 $title = sprintf( _x( 'Mentions <span class="count">%s</span>', 'Toolbar Mention logged in user', 'buddypress' ), number_format_i18n( $count ) ); 259 259 } else { 260 $title = _ _( 'Mentions', 'buddypress' );260 $title = _x( 'Mentions', 'Toolbar Mention logged in user', 'buddypress' ); 261 261 } 262 262 } … … 266 266 'parent' => $bp->my_account_menu_id, 267 267 'id' => 'my-account-' . $this->id, 268 'title' => _ _( 'Activity', 'buddypress' ),268 'title' => _x( 'Activity', 'My Account Activity sub nav', 'buddypress' ), 269 269 'href' => trailingslashit( $activity_link ) 270 270 ); … … 274 274 'parent' => 'my-account-' . $this->id, 275 275 'id' => 'my-account-' . $this->id . '-personal', 276 'title' => _ _( 'Personal', 'buddypress' ),276 'title' => _x( 'Personal', 'My Account Activity sub nav', 'buddypress' ), 277 277 'href' => trailingslashit( $activity_link ) 278 278 ); … … 292 292 'parent' => 'my-account-' . $this->id, 293 293 'id' => 'my-account-' . $this->id . '-favorites', 294 'title' => _ _( 'Favorites', 'buddypress' ),294 'title' => _x( 'Favorites', 'My Account Activity sub nav', 'buddypress' ), 295 295 'href' => trailingslashit( $activity_link . 'favorites' ) 296 296 ); … … 301 301 'parent' => 'my-account-' . $this->id, 302 302 'id' => 'my-account-' . $this->id . '-friends', 303 'title' => _ _( 'Friends', 'buddypress' ),303 'title' => _x( 'Friends', 'My Account Activity sub nav', 'buddypress' ), 304 304 'href' => trailingslashit( $activity_link . bp_get_friends_slug() ) 305 305 ); … … 311 311 'parent' => 'my-account-' . $this->id, 312 312 'id' => 'my-account-' . $this->id . '-groups', 313 'title' => _ _( 'Groups', 'buddypress' ),313 'title' => _x( 'Groups', 'My Account Activity sub nav', 'buddypress' ), 314 314 'href' => trailingslashit( $activity_link . bp_get_groups_slug() ) 315 315 ); … … 335 335 if ( bp_is_activity_component() ) { 336 336 if ( bp_is_my_profile() ) { 337 $bp->bp_options_title = _ _( 'My Activity', 'buddypress' );337 $bp->bp_options_title = _x( 'My Activity', 'Page and <title>', 'buddypress' ); 338 338 } else { 339 339 $bp->bp_options_avatar = bp_core_fetch_avatar( array( -
trunk/src/bp-core/bp-core-admin.php
r8677 r8705 335 335 336 336 // Add the main section 337 add_settings_section( 'bp_xprofile', __( 'Profile Settings', 'buddypress' ), 'bp_admin_setting_callback_xprofile_section', 'buddypress');337 add_settings_section( 'bp_xprofile', _x( 'Profile Settings', 'BuddyPress setting tab', 'buddypress' ), 'bp_admin_setting_callback_xprofile_section', 'buddypress' ); 338 338 339 339 $avatar_setting = 'bp_xprofile'; -
trunk/src/bp-core/bp-core-loader.php
r8610 r8705 231 231 // Add 'Profile' to the main navigation 232 232 $main_nav = array( 233 'name' => _ _( 'Profile', 'buddypress' ),233 'name' => _x( 'Profile', 'Main navigation', 'buddypress' ), 234 234 'slug' => $bp->core->profile->slug, 235 235 'position' => 20, … … 242 242 // Add the subnav items to the profile 243 243 $sub_nav[] = array( 244 'name' => _ _( 'View', 'buddypress' ),244 'name' => _x( 'View', 'Profile sub nav', 'buddypress' ), 245 245 'slug' => 'public', 246 246 'parent_url' => $profile_link, -
trunk/src/bp-core/bp-core-template.php
r8700 r8705 378 378 379 379 if ( bp_is_active( 'xprofile' ) ) { 380 $options['members'] = _ _( 'Members', 'buddypress' );380 $options['members'] = _x( 'Members', 'search form', 'buddypress' ); 381 381 } 382 382 383 383 if ( bp_is_active( 'groups' ) ) { 384 $options['groups'] = _ _( 'Groups','buddypress' );384 $options['groups'] = _x( 'Groups', 'search form', 'buddypress' ); 385 385 } 386 386 387 387 if ( bp_is_active( 'blogs' ) && is_multisite() ) { 388 $options['blogs'] = _ _( 'Blogs','buddypress' );388 $options['blogs'] = _x( 'Blogs', 'search form', 'buddypress' ); 389 389 } 390 390 391 391 if ( bp_is_active( 'forums' ) && bp_forums_is_installed_correctly() && bp_forums_has_directory() ) { 392 $options['forums'] = _ _( 'Forums','buddypress' );393 } 394 395 $options['posts'] = _ _( 'Posts', 'buddypress' );392 $options['forums'] = _x( 'Forums', 'search form', 'buddypress' ); 393 } 394 395 $options['posts'] = _x( 'Posts', 'search form', 'buddypress' ); 396 396 397 397 // Eventually this won't be needed and a page will be built to integrate all search results. 398 $selection_box = '<label for="search-which" class="accessibly-hidden">' . _ _( 'Search these:', 'buddypress' ) . '</label>';398 $selection_box = '<label for="search-which" class="accessibly-hidden">' . _x( 'Search these:', 'search form', 'buddypress' ) . '</label>'; 399 399 $selection_box .= '<select name="search-which" id="search-which" style="width: auto">'; 400 400 -
trunk/src/bp-friends/bp-friends-loader.php
r8223 r8705 22 22 parent::start( 23 23 'friends', 24 _ _( 'Friend Connections', 'buddypress' ),24 _x( 'Friend Connections', 'Friends screen page <title>', 'buddypress' ), 25 25 buddypress()->plugin_dir, 26 26 array( … … 138 138 // Add the subnav items to the friends nav item 139 139 $sub_nav[] = array( 140 'name' => _ _( 'Friendships', 'buddypress' ),140 'name' => _x( 'Friendships', 'Friends screen sub nav', 'buddypress' ), 141 141 'slug' => 'my-friends', 142 142 'parent_url' => $friends_link, … … 148 148 149 149 $sub_nav[] = array( 150 'name' => _ _( 'Requests','buddypress' ),150 'name' => _x( 'Requests', 'Friends screen sub nav', 'buddypress' ), 151 151 'slug' => 'requests', 152 152 'parent_url' => $friends_link, … … 183 183 $count = count( friends_get_friendship_request_user_ids( bp_loggedin_user_id() ) ); 184 184 if ( !empty( $count ) ) { 185 $title = sprintf( _ _( 'Friends <span class="count">%s</span>','buddypress' ), number_format_i18n( $count ) );186 $pending = sprintf( _ _( 'Pending Requests <span class="count">%s</span>', 'buddypress' ), number_format_i18n( $count ) );185 $title = sprintf( _x( 'Friends <span class="count">%s</span>', 'My Account Friends menu', 'buddypress' ), number_format_i18n( $count ) ); 186 $pending = sprintf( _x( 'Pending Requests <span class="count">%s</span>', 'My Account Friends menu sub nav', 'buddypress' ), number_format_i18n( $count ) ); 187 187 } else { 188 $title = _ _( 'Friends','buddypress' );189 $pending = _ _( 'No Pending Requests', 'buddypress' );188 $title = _x( 'Friends', 'My Account Friends menu', 'buddypress' ); 189 $pending = _x( 'No Pending Requests','My Account Friends menu sub nav', 'buddypress' ); 190 190 } 191 191 … … 198 198 ); 199 199 200 // My Groups200 // My Friends 201 201 $wp_admin_nav[] = array( 202 202 'parent' => 'my-account-' . $this->id, 203 203 'id' => 'my-account-' . $this->id . '-friendships', 204 'title' => _ _( 'Friendships', 'buddypress' ),204 'title' => _x( 'Friendships', 'My Account Friends menu sub nav', 'buddypress' ), 205 205 'href' => trailingslashit( $friends_link ) 206 206 ); -
trunk/src/bp-friends/bp-friends-screens.php
r7619 r8705 83 83 <tr> 84 84 <th class="icon"></th> 85 <th class="title"><?php _e ( 'Friends', 'buddypress' ) ?></th>85 <th class="title"><?php _ex( 'Friends', 'Friend settings on notification settings page', 'buddypress' ) ?></th> 86 86 <th class="yes"><?php _e( 'Yes', 'buddypress' ) ?></th> 87 87 <th class="no"><?php _e( 'No', 'buddypress' )?></th> … … 92 92 <tr id="friends-notification-settings-request"> 93 93 <td></td> 94 <td><?php _e ( 'A member sends you a friendship request', 'buddypress' ) ?></td>94 <td><?php _ex( 'A member sends you a friendship request', 'Friend settings on notification settings page', 'buddypress' ) ?></td> 95 95 <td class="yes"><input type="radio" name="notifications[notification_friends_friendship_request]" value="yes" <?php checked( $send_requests, 'yes', true ) ?>/></td> 96 96 <td class="no"><input type="radio" name="notifications[notification_friends_friendship_request]" value="no" <?php checked( $send_requests, 'no', true ) ?>/></td> … … 98 98 <tr id="friends-notification-settings-accepted"> 99 99 <td></td> 100 <td><?php _e ( 'A member accepts your friendship request', 'buddypress' ) ?></td>100 <td><?php _ex( 'A member accepts your friendship request', 'Friend settings on notification settings page', 'buddypress' ) ?></td> 101 101 <td class="yes"><input type="radio" name="notifications[notification_friends_friendship_accepted]" value="yes" <?php checked( $accept_requests, 'yes', true ) ?>/></td> 102 102 <td class="no"><input type="radio" name="notifications[notification_friends_friendship_accepted]" value="no" <?php checked( $accept_requests, 'no', true ) ?>/></td> -
trunk/src/bp-groups/bp-groups-admin.php
r8681 r8705 30 30 // Add our screen 31 31 $hook = add_menu_page( 32 _ _( 'Groups', 'buddypress' ),33 _ _( 'Groups', 'buddypress' ),32 _x( 'Groups', 'Admin Groups page title', 'buddypress' ), 33 _x( 'Groups', 'Admin Groups menu', 'buddypress' ), 34 34 'bp_moderate', 35 35 'bp-groups', -
trunk/src/bp-groups/bp-groups-loader.php
r8677 r8705 81 81 parent::start( 82 82 'groups', 83 _ _( 'User Groups', 'buddypress' ),83 _x( 'User Groups', 'Group screen page <title>', 'buddypress' ), 84 84 buddypress()->plugin_dir, 85 85 array( … … 149 149 'directory_title' => _x( 'Groups', 'component directory title', 'buddypress' ), 150 150 'notification_callback' => 'groups_format_notifications', 151 'search_string' => _ _( 'Search Groups...', 'buddypress' ),151 'search_string' => _x( 'Search Groups...', 'Component directory search', 'buddypress' ), 152 152 'global_tables' => $global_tables, 153 153 'meta_tables' => $meta_tables, … … 244 244 $this->group_creation_steps = apply_filters( 'groups_create_group_steps', array( 245 245 'group-details' => array( 246 'name' => _ _( 'Details','buddypress' ),246 'name' => _x( 'Details', 'Group screen nav', 'buddypress' ), 247 247 'position' => 0 248 248 ), 249 249 'group-settings' => array( 250 'name' => _ _( 'Settings', 'buddypress' ),250 'name' => _x( 'Settings', 'Group screen nav', 'buddypress' ), 251 251 'position' => 10 252 252 ) … … 256 256 if ( ! (int) buddypress()->site_options['bp-disable-avatar-uploads'] ) { 257 257 $this->group_creation_steps['group-avatar'] = array( 258 'name' => _ _( 'Profile Photo','buddypress' ),258 'name' => _x( 'Profile Photo', 'Group screen nav', 'buddypress' ), 259 259 'position' => 20 260 260 ); … … 264 264 if ( bp_is_active( 'friends' ) ) { 265 265 $this->group_creation_steps['group-invites'] = array( 266 'name' => _ _( 'Invites', 'buddypress' ),266 'name' => _x( 'Invites', 'Group screen nav', 'buddypress' ), 267 267 'position' => 30 268 268 ); … … 331 331 $count = bp_get_total_group_count_for_user(); 332 332 $class = ( 0 === $count ) ? 'no-count' : 'count'; 333 $nav_name = sprintf( _ _( 'Groups <span class="%s">%s</span>', 'buddypress' ), esc_attr( $class ), number_format_i18n( $count ) );333 $nav_name = sprintf( _x( 'Groups <span class="%s">%s</span>', 'Group screen nav with counter', 'buddypress' ), esc_attr( $class ), number_format_i18n( $count ) ); 334 334 } else { 335 $nav_name = _ _( 'Groups', 'buddypress' );335 $nav_name = _x( 'Groups', 'Group screen nav without counter', 'buddypress' ); 336 336 } 337 337 … … 402 402 // Add the "Home" subnav item, as this will always be present 403 403 $sub_nav[] = array( 404 'name' => _x( 'Home', 'Group homenavigation title', 'buddypress' ),404 'name' => _x( 'Home', 'Group screen navigation title', 'buddypress' ), 405 405 'slug' => 'home', 406 406 'parent_url' => $group_link, … … 422 422 423 423 $sub_nav[] = array( 424 'name' => _ _( 'Request Membership', 'buddypress' ),424 'name' => _x( 'Request Membership','Group screen nav', 'buddypress' ), 425 425 'slug' => 'request-membership', 426 426 'parent_url' => $group_link, … … 434 434 if ( $this->current_group->enable_forum && bp_is_active( 'forums' ) ) { 435 435 $sub_nav[] = array( 436 'name' => _ _( 'Forum', 'buddypress' ),436 'name' => _x( 'Forum', 'My Group screen nav', 'buddypress' ), 437 437 'slug' => 'forum', 438 438 'parent_url' => $group_link, … … 446 446 447 447 $sub_nav[] = array( 448 'name' => sprintf( _ _( 'Members <span>%s</span>', 'buddypress' ), number_format( $this->current_group->total_member_count ) ),448 'name' => sprintf( _x( 'Members <span>%s</span>', 'My Group screen nav', 'buddypress' ), number_format( $this->current_group->total_member_count ) ), 449 449 'slug' => 'members', 450 450 'parent_url' => $group_link, … … 459 459 if ( bp_is_active( 'friends' ) && bp_groups_user_can_send_invites() ) { 460 460 $sub_nav[] = array( 461 'name' => _ _( 'Send Invites', 'buddypress' ),461 'name' => _x( 'Send Invites', 'My Group screen nav', 'buddypress' ), 462 462 'slug' => 'send-invites', 463 463 'parent_url' => $group_link, … … 474 474 if ( bp_is_item_admin() ) { 475 475 $sub_nav[] = array( 476 'name' => _ _( 'Admin', 'buddypress' ),476 'name' => _x( 'Admin', 'My Group screen nav', 'buddypress' ), 477 477 'slug' => 'admin', 478 478 'parent_url' => $group_link, … … 511 511 // Pending group invites 512 512 $count = groups_get_invite_count_for_user(); 513 $title = _ _( 'Groups','buddypress' );514 $pending = _ _( 'No Pending Invites', 'buddypress' );513 $title = _x( 'Groups', 'My Account Groups', 'buddypress' ); 514 $pending = _x( 'No Pending Invites', 'My Account Groups sub nav', 'buddypress' ); 515 515 516 516 if ( !empty( $count['total'] ) ) { 517 $title = sprintf( _ _( 'Groups <span class="count">%s</span>','buddypress' ), $count );518 $pending = sprintf( _ _( 'Pending Invites <span class="count">%s</span>', 'buddypress' ), $count );517 $title = sprintf( _x( 'Groups <span class="count">%s</span>', 'My Account Groups nav', 'buddypress' ), $count ); 518 $pending = sprintf( _x( 'Pending Invites <span class="count">%s</span>', 'My Account Groups sub nav', 'buddypress' ), $count ); 519 519 } 520 520 … … 531 531 'parent' => 'my-account-' . $this->id, 532 532 'id' => 'my-account-' . $this->id . '-memberships', 533 'title' => _ _( 'Memberships', 'buddypress' ),533 'title' => _x( 'Memberships', 'My Account Groups sub nav', 'buddypress' ), 534 534 'href' => trailingslashit( $groups_link ) 535 535 ); … … 548 548 'parent' => 'my-account-' . $this->id, 549 549 'id' => 'my-account-' . $this->id . '-create', 550 'title' => _ _( 'Create a Group', 'buddypress' ),550 'title' => _x( 'Create a Group', 'My Account Groups sub nav', 'buddypress' ), 551 551 'href' => trailingslashit( bp_get_groups_directory_permalink() . 'create' ) 552 552 ); … … 566 566 567 567 if ( bp_is_my_profile() && !bp_is_single_item() ) { 568 $bp->bp_options_title = _ _( 'Memberships', 'buddypress' );568 $bp->bp_options_title = _x( 'Memberships', 'My Groups page <title>', 'buddypress' ); 569 569 570 570 } else if ( !bp_is_my_profile() && !bp_is_single_item() ) { -
trunk/src/bp-groups/bp-groups-screens.php
r8682 r8705 934 934 <tr> 935 935 <th class="icon"></th> 936 <th class="title"><?php _e ( 'Groups', 'buddypress' ) ?></th>936 <th class="title"><?php _ex( 'Groups', 'Group settings on notification settings page', 'buddypress' ) ?></th> 937 937 <th class="yes"><?php _e( 'Yes', 'buddypress' ) ?></th> 938 938 <th class="no"><?php _e( 'No', 'buddypress' )?></th> … … 943 943 <tr id="groups-notification-settings-invitation"> 944 944 <td></td> 945 <td><?php _e ( 'A member invites you to join a group','buddypress' ) ?></td>945 <td><?php _ex( 'A member invites you to join a group', 'group settings on notification settings page','buddypress' ) ?></td> 946 946 <td class="yes"><input type="radio" name="notifications[notification_groups_invite]" value="yes" <?php checked( $group_invite, 'yes', true ) ?>/></td> 947 947 <td class="no"><input type="radio" name="notifications[notification_groups_invite]" value="no" <?php checked( $group_invite, 'no', true ) ?>/></td> … … 949 949 <tr id="groups-notification-settings-info-updated"> 950 950 <td></td> 951 <td><?php _e ( 'Group information is updated', 'buddypress' ) ?></td>951 <td><?php _ex( 'Group information is updated', 'group settings on notification settings page', 'buddypress' ) ?></td> 952 952 <td class="yes"><input type="radio" name="notifications[notification_groups_group_updated]" value="yes" <?php checked( $group_update, 'yes', true ) ?>/></td> 953 953 <td class="no"><input type="radio" name="notifications[notification_groups_group_updated]" value="no" <?php checked( $group_update, 'no', true ) ?>/></td> … … 955 955 <tr id="groups-notification-settings-promoted"> 956 956 <td></td> 957 <td><?php _e ( 'You are promoted to a group administrator or moderator', 'buddypress' ) ?></td>957 <td><?php _ex( 'You are promoted to a group administrator or moderator', 'group settings on notification settings page', 'buddypress' ) ?></td> 958 958 <td class="yes"><input type="radio" name="notifications[notification_groups_admin_promotion]" value="yes" <?php checked( $group_promo, 'yes', true ) ?>/></td> 959 959 <td class="no"><input type="radio" name="notifications[notification_groups_admin_promotion]" value="no" <?php checked( $group_promo, 'no', true ) ?>/></td> … … 961 961 <tr id="groups-notification-settings-request"> 962 962 <td></td> 963 <td><?php _e ( 'A member requests to join a private group for which you are an admin', 'buddypress' ) ?></td>963 <td><?php _ex( 'A member requests to join a private group for which you are an admin', 'group settings on notification settings page', 'buddypress' ) ?></td> 964 964 <td class="yes"><input type="radio" name="notifications[notification_groups_membership_request]" value="yes" <?php checked( $group_request, 'yes', true ) ?>/></td> 965 965 <td class="no"><input type="radio" name="notifications[notification_groups_membership_request]" value="no" <?php checked( $group_request, 'no', true ) ?>/></td> … … 1120 1120 public function create_dummy_post() { 1121 1121 1122 $title = _ _( 'Groups', 'buddypress' );1122 $title = _x( 'Groups', 'Group creation page', 'buddypress' ); 1123 1123 1124 1124 bp_theme_compat_reset_post( array( -
trunk/src/bp-members/bp-members-loader.php
r8660 r8705 218 218 // Setup the main navigation 219 219 $main_nav = array( 220 'name' => _ _( 'Profile', 'buddypress' ),220 'name' => _x( 'Profile', 'Member profile main navigation', 'buddypress' ), 221 221 'slug' => $bp->profile->slug, 222 222 'position' => 20, … … 232 232 // Setup the subnav items for the member profile 233 233 $sub_nav[] = array( 234 'name' => _ _( 'View', 'buddypress' ),234 'name' => _x( 'View', 'Member profile view', 'buddypress' ), 235 235 'slug' => 'public', 236 236 'parent_url' => $profile_link, -
trunk/src/bp-messages/bp-messages-template.php
r8692 r8705 827 827 <select name="message-type-select" id="message-type-select"> 828 828 <option value=""></option> 829 <option value="read"><?php _ e('Read', 'buddypress') ?></option>830 <option value="unread"><?php _ e('Unread', 'buddypress') ?></option>831 <option value="all"><?php _ e('All', 'buddypress') ?></option>829 <option value="read"><?php _x('Read', 'Message dropdown filter', 'buddypress') ?></option> 830 <option value="unread"><?php _x('Unread', 'Message dropdown filter', 'buddypress') ?></option> 831 <option value="all"><?php _x('All', 'Message dropdown filter', 'buddypress') ?></option> 832 832 </select> 833 833 834 834 <?php if ( ! bp_is_current_action( 'sentbox' ) && bp_is_current_action( 'notices' ) ) : ?> 835 835 836 <a href="#" id="mark_as_read"><?php _ e('Mark as Read', 'buddypress') ?></a> 837 <a href="#" id="mark_as_unread"><?php _ e('Mark as Unread', 'buddypress') ?></a> 836 <a href="#" id="mark_as_read"><?php _x('Mark as Read', 'Message management markup', 'buddypress') ?></a> 837 <a href="#" id="mark_as_unread"><?php _x('Mark as Unread', 'Message management markup', 'buddypress') ?></a> 838 838 839 839 <?php endif; ?> -
trunk/src/bp-notifications/bp-notifications-loader.php
r8568 r8705 24 24 parent::start( 25 25 'notifications', 26 _ _( 'Notifications', 'buddypress' ),26 _x( 'Notifications', 'Page <title>', 'buddypress' ), 27 27 buddypress()->plugin_dir, 28 28 array( … … 108 108 $count = bp_notifications_get_unread_notification_count( bp_displayed_user_id() ); 109 109 $class = ( 0 === $count ) ? 'no-count' : 'count'; 110 $nav_name = sprintf( _ _( 'Notifications <span class="%s">%s</span>', 'buddypress' ), esc_attr( $class ), number_format_i18n( $count ) );110 $nav_name = sprintf( _x( 'Notifications <span class="%s">%s</span>', 'Profile screen nav', 'buddypress' ), esc_attr( $class ), number_format_i18n( $count ) ); 111 111 } else { 112 $nav_name = _ _( 'Notifications', 'buddypress' );112 $nav_name = _x( 'Notifications', 'Profile screen nav', 'buddypress' ); 113 113 } 114 114 … … 137 137 // Add the subnav items to the notifications nav item 138 138 $sub_nav[] = array( 139 'name' => _ _( 'Unread', 'buddypress' ),139 'name' => _x( 'Unread', 'Notification screen nav', 'buddypress' ), 140 140 'slug' => 'unread', 141 141 'parent_url' => $notifications_link, … … 148 148 149 149 $sub_nav[] = array( 150 'name' => _ _( 'Read','buddypress' ),150 'name' => _x( 'Read', 'Notification screen nav', 'buddypress' ), 151 151 'slug' => 'read', 152 152 'parent_url' => $notifications_link, … … 182 182 $count = bp_notifications_get_unread_notification_count( bp_loggedin_user_id() ); 183 183 if ( ! empty( $count ) ) { 184 $title = sprintf( _ _( 'Notifications <span class="count">%s</span>', 'buddypress' ), number_format_i18n( $count ) );185 $unread = sprintf( _ _( 'Unread <span class="count">%s</span>','buddypress' ), number_format_i18n( $count ) );184 $title = sprintf( _x( 'Notifications <span class="count">%s</span>', 'My Account Notification pending', 'buddypress' ), number_format_i18n( $count ) ); 185 $unread = sprintf( _x( 'Unread <span class="count">%s</span>', 'My Account Notification pending', 'buddypress' ), number_format_i18n( $count ) ); 186 186 } else { 187 $title = _ _( 'Notifications', 'buddypress' );188 $unread = _ _( 'Unread','buddypress' );187 $title = _x( 'Notifications', 'My Account Notification', 'buddypress' ); 188 $unread = _x( 'Unread', 'My Account Notification sub nav', 'buddypress' ); 189 189 } 190 190 -
trunk/src/bp-notifications/bp-notifications-template.php
r8667 r8705 793 793 ob_start(); ?> 794 794 795 <a href="<?php bp_the_notification_mark_unread_url(); ?>" class="mark-unread primary"><?php _ e( 'Unread', 'buddypress' ); ?></a>795 <a href="<?php bp_the_notification_mark_unread_url(); ?>" class="mark-unread primary"><?php _x( 'Unread', 'Notification screen action', 'buddypress' ); ?></a> 796 796 797 797 <?php $retval = ob_get_clean(); -
trunk/src/bp-templates/bp-legacy/buddypress/members/single/groups/invites.php
r7658 r8705 12 12 </div> 13 13 14 <h4><a href="<?php bp_group_permalink(); ?>"><?php bp_group_name(); ?></a><span class="small"> - <?php printf( _n ( '1 member', '%d members', bp_get_group_total_members( false ), 'buddypress' ), bp_get_group_total_members( false ) ); ?></span></h4>14 <h4><a href="<?php bp_group_permalink(); ?>"><?php bp_group_name(); ?></a><span class="small"> - <?php printf( _nx( '1 member', '%d members', bp_get_group_total_members( false ),'Group member count', 'buddypress' ), bp_get_group_total_members( false ) ); ?></span></h4> 15 15 16 16 <p class="desc"> -
trunk/src/bp-xprofile/bp-xprofile-admin.php
r8677 r8705 25 25 return false; 26 26 27 add_users_page( _ _( 'Profile Fields', 'buddypress' ), __( 'Profile Fields', 'buddypress' ), 'manage_options', 'bp-profile-setup', 'xprofile_admin' );27 add_users_page( _x( 'Profile Fields', 'xProfile admin page title', 'buddypress' ), _x( 'Profile Fields', 'Admin Users menu', 'buddypress' ), 'manage_options', 'bp-profile-setup', 'xprofile_admin' ); 28 28 } 29 29 add_action( bp_core_admin_hook(), 'xprofile_add_admin_menu' ); … … 69 69 70 70 <h2> 71 <?php _e ( 'Profile Fields', 'buddypress'); ?>71 <?php _ex( 'Profile Fields', 'Settings page header', 'buddypress'); ?> 72 72 <a id="add_group" class="add-new-h2" href="users.php?page=bp-profile-setup&mode=add_group"><?php _e( 'Add New Field Group', 'buddypress' ); ?></a> 73 73 </h2> -
trunk/src/bp-xprofile/bp-xprofile-loader.php
r8677 r8705 39 39 parent::start( 40 40 'xprofile', 41 _ _( 'Extended Profiles', 'buddypress' ),41 _x( 'Extended Profiles', 'Component page <title>', 'buddypress' ), 42 42 buddypress()->plugin_dir, 43 43 array( … … 111 111 'public' => array( 112 112 'id' => 'public', 113 'label' => _ _( 'Everyone', 'buddypress' )113 'label' => _x( 'Everyone', 'Visibility level setting', 'buddypress' ) 114 114 ), 115 115 'adminsonly' => array( 116 116 'id' => 'adminsonly', 117 'label' => _ _( 'Only Me', 'buddypress' )117 'label' => _x( 'Only Me', 'Visibility level setting', 'buddypress' ) 118 118 ), 119 119 'loggedin' => array( 120 120 'id' => 'loggedin', 121 'label' => _ _( 'All Members', 'buddypress' )121 'label' => _x( 'All Members', 'Visibility level setting', 'buddypress' ) 122 122 ) 123 123 ); … … 126 126 $this->visibility_levels['friends'] = array( 127 127 'id' => 'friends', 128 'label' => _ _( 'My Friends', 'buddypress' )128 'label' => _x( 'My Friends', 'Visibility level setting', 'buddypress' ) 129 129 ); 130 130 } … … 166 166 // Add 'Profile' to the main navigation 167 167 $main_nav = array( 168 'name' => _ _( 'Profile', 'buddypress' ),168 'name' => _x( 'Profile', 'Profile header menu', 'buddypress' ), 169 169 'slug' => $this->slug, 170 170 'position' => 20, … … 187 187 // Add the subnav items to the profile 188 188 $sub_nav[] = array( 189 'name' => _ _( 'View', 'buddypress' ),189 'name' => _x( 'Profile', 'Profile header menu', 'buddypress' ), 190 190 'slug' => 'public', 191 191 'parent_url' => $profile_link, … … 197 197 // Edit Profile 198 198 $sub_nav[] = array( 199 'name' => _ _( 'Edit', 'buddypress' ),199 'name' => _x( 'Edit','Profile header sub menu', 'buddypress' ), 200 200 'slug' => 'edit', 201 201 'parent_url' => $profile_link, … … 209 209 if ( buddypress()->avatar->show_avatars ) { 210 210 $sub_nav[] = array( 211 'name' => _ _( 'Change Profile Photo', 'buddypress' ),211 'name' => _x( 'Change Profile Photo', 'Profile header sub menu', 'buddypress' ), 212 212 'slug' => 'change-avatar', 213 213 'parent_url' => $profile_link, … … 252 252 253 253 bp_core_new_subnav_item( array( 254 'name' => _ _( 'Profile', 'buddypress' ),254 'name' => _x( 'Profile', 'Profile settings sub nav', 'buddypress' ), 255 255 'slug' => 'profile', 256 256 'parent_url' => trailingslashit( $user_domain . $settings_slug ), … … 281 281 'parent' => $bp->my_account_menu_id, 282 282 'id' => 'my-account-' . $this->id, 283 'title' => _ _( 'Profile', 'buddypress' ),283 'title' => _x( 'Profile', 'My Account Profile', 'buddypress' ), 284 284 'href' => trailingslashit( $profile_link ) 285 285 ); … … 289 289 'parent' => 'my-account-' . $this->id, 290 290 'id' => 'my-account-' . $this->id . '-public', 291 'title' => _ _( 'View', 'buddypress' ),291 'title' => _x( 'View', 'My Account Profile sub nav', 'buddypress' ), 292 292 'href' => trailingslashit( $profile_link . 'public' ) 293 293 ); … … 297 297 'parent' => 'my-account-' . $this->id, 298 298 'id' => 'my-account-' . $this->id . '-edit', 299 'title' => _ _( 'Edit', 'buddypress' ),299 'title' => _x( 'Edit', 'My Account Profile sub nav', 'buddypress' ), 300 300 'href' => trailingslashit( $profile_link . 'edit' ) 301 301 ); … … 306 306 'parent' => 'my-account-' . $this->id, 307 307 'id' => 'my-account-' . $this->id . '-change-avatar', 308 'title' => _ _( 'Change Profile Photo', 'buddypress' ),308 'title' => _x( 'Change Profile Photo', 'My Account Profile sub nav', 'buddypress' ), 309 309 'href' => trailingslashit( $profile_link . 'change-avatar' ) 310 310 ); … … 333 333 if ( bp_is_profile_component() ) { 334 334 if ( bp_is_my_profile() ) { 335 $bp->bp_options_title = _ _( 'My Profile', 'buddypress' );335 $bp->bp_options_title = _x( 'My Profile', 'Page title', 'buddypress' ); 336 336 } else { 337 337 $bp->bp_options_avatar = bp_core_fetch_avatar( array( 338 338 'item_id' => bp_displayed_user_id(), 339 339 'type' => 'thumb', 340 'alt' => sprintf( _ _( 'Profile picture of %s', 'buddypress' ), bp_get_displayed_user_fullname() )340 'alt' => sprintf( _x( 'Profile picture of %s', 'Avatar alt', 'buddypress' ), bp_get_displayed_user_fullname() ) 341 341 ) ); 342 342 $bp->bp_options_title = bp_get_displayed_user_fullname(); … … 363 363 'parent' => 'my-account-' . buddypress()->settings->id, 364 364 'id' => 'my-account-' . buddypress()->settings->id . '-profile', 365 'title' => _ _( 'Profile', 'buddypress' ),365 'title' => _x( 'Profile', 'My Account Settings sub nav', 'buddypress' ), 366 366 'href' => trailingslashit( $settings_link . 'profile' ) 367 367 );
Note:
See TracChangeset
for help on using the changeset viewer.
