Ticket #5777: 5777.02.patch

src/bp-activity/bp-activity-admin.php

@@ -903 +903 @@
                         <?php if ( !empty( $_REQUEST['aid'] ) ) : ?>
                                 <?php printf( __( 'Activity related to ID #%s', 'buddypress' ), number_format_i18n( (int) $_REQUEST['aid'] ) ); ?>
                         <?php else : ?>
-                                <?php _x( 'Activity', 'Admin SWA page', 'buddypress' ); ?>
+                                <?php _ex( 'Activity', 'Admin SWA page', 'buddypress' ); ?>
                         <?php endif; ?>
 
                         <?php if ( !empty( $_REQUEST['s'] ) ) : ?>

src/bp-messages/bp-messages-template.php

@@ -826 +826 @@
 
         <select name="message-type-select" id="message-type-select">
                 <option value=""></option>
-                <option value="read"><?php _x('Read', 'Message dropdown filter', 'buddypress') ?></option>
-                <option value="unread"><?php _x('Unread', 'Message dropdown filter', 'buddypress') ?></option>
-                <option value="all"><?php _x('All', 'Message dropdown filter', 'buddypress') ?></option>
+                <option value="read"><?php _ex('Read', 'Message dropdown filter', 'buddypress') ?></option>
+                <option value="unread"><?php _ex('Unread', 'Message dropdown filter', 'buddypress') ?></option>
+                <option value="all"><?php _ex('All', 'Message dropdown filter', 'buddypress') ?></option>
         </select> &nbsp;
 
         <?php if ( ! bp_is_current_action( 'sentbox' ) && bp_is_current_action( 'notices' ) ) : ?>
 
-                <a href="#" id="mark_as_read"><?php _x('Mark as Read', 'Message management markup', 'buddypress') ?></a> &nbsp;
-                <a href="#" id="mark_as_unread"><?php _x('Mark as Unread', 'Message management markup', 'buddypress') ?></a> &nbsp;
+                <a href="#" id="mark_as_read"><?php _ex('Mark as Read', 'Message management markup', 'buddypress') ?></a> &nbsp;
+                <a href="#" id="mark_as_unread"><?php _ex('Mark as Unread', 'Message management markup', 'buddypress') ?></a> &nbsp;
 
         <?php endif; ?>
 

src/bp-notifications/bp-notifications-template.php

@@ -792 +792 @@
                 // Start the output buffer
                 ob_start(); ?>
 
-                <a href="<?php bp_the_notification_mark_unread_url(); ?>" class="mark-unread primary"><?php _x( 'Unread',  'Notification screen action', 'buddypress' ); ?></a>
+                <a href="<?php bp_the_notification_mark_unread_url(); ?>" class="mark-unread primary"><?php _ex( 'Unread',  'Notification screen action', 'buddypress' ); ?></a>
 
                 <?php $retval = ob_get_clean();