Changeset 391

Timestamp:

10/12/2008 08:19:04 PM (16 years ago)

Author:

apeatling

Message:

Added the 'buddypress' textdomain

Location:

trunk

Files:

• bp-activity.php (modified) (2 diffs)
• bp-activity/bp-activity-templatetags.php (modified) (2 diffs)
• bp-activity/bp-activity-widgets.php (modified) (3 diffs)
• bp-blogs.php (modified) (7 diffs)
• bp-blogs/bp-blogs-templatetags.php (modified) (9 diffs)
• bp-blogs/bp-blogs-widgets.php (modified) (4 diffs)
• bp-core.php (modified) (8 diffs)
• bp-core/admin-mods/bp-core-account-tab.php (modified) (11 diffs)
• bp-core/admin-mods/bp-core-homebase-dashboard.php (modified) (1 diff)
• bp-core/bp-core-adminbar.php (modified) (6 diffs)
• bp-core/bp-core-ajax.php (modified) (2 diffs)
• bp-core/bp-core-avatars.php (modified) (14 diffs)
• bp-core/bp-core-classes.php (modified) (1 diff)
• bp-core/bp-core-templatetags.php (modified) (6 diffs)
• bp-core/bp-core-widgets.php (modified) (10 diffs)
• bp-core/homebase-creation/bp-core-homebase-functions.php (modified) (7 diffs)
• bp-core/homebase-creation/bp-core-homebase-tab.php (modified) (2 diffs)
• bp-friends.php (modified) (5 diffs)
• bp-friends/bp-friends-ajax.php (modified) (4 diffs)
• bp-friends/bp-friends-templatetags.php (modified) (5 diffs)
• bp-groups.php (modified) (20 diffs)
• bp-groups/bp-groups-ajax.php (modified) (6 diffs)
• bp-groups/bp-groups-templatetags.php (modified) (15 diffs)
• bp-groups/bp-groups-widgets.php (modified) (5 diffs)
• bp-messages.php (modified) (28 diffs)
• bp-messages/bp-messages-ajax.php (modified) (5 diffs)
• bp-messages/bp-messages-classes.php (modified) (1 diff)
• bp-messages/bp-messages-templatetags.php (modified) (3 diffs)
• bp-wire.php (modified) (3 diffs)
• bp-wire/bp-wire-templatetags.php (modified) (3 diffs)
• bp-xprofile.php (modified) (16 diffs)
• bp-xprofile/bp-xprofile-admin.php (modified) (7 diffs)
• bp-xprofile/bp-xprofile-classes.php (modified) (20 diffs)
• bp-xprofile/bp-xprofile-signup.php (modified) (7 diffs)
• bp-xprofile/bp-xprofile-templatetags.php (modified) (1 diff)

trunk/bp-activity.php

@@ -145 +145 @@
     
     /* Add 'Activity' to the main navigation */
-    bp_core_add_nav_item( __('Activity'), $bp['activity']['slug'] );
+    bp_core_add_nav_item( __('Activity', 'buddypress'), $bp['activity']['slug'] );
     bp_core_add_nav_default( $bp['activity']['slug'], 'bp_activity_screen_my_activity', 'just-me' );
         
@@ -151 +151 @@
     
     /* Add the subnav items to the activity nav item */
-    bp_core_add_subnav_item( $bp['activity']['slug'], 'just-me', __('Just Me'), $activity_link, 'bp_activity_screen_my_activity' );
-    bp_core_add_subnav_item( $bp['activity']['slug'], 'my-friends', __('My Friends'), $activity_link, 'bp_activity_screen_friends_activity' );
+    bp_core_add_subnav_item( $bp['activity']['slug'], 'just-me', __('Just Me', 'buddypress'), $activity_link, 'bp_activity_screen_my_activity' );
+    bp_core_add_subnav_item( $bp['activity']['slug'], 'my-friends', __('My Friends', 'buddypress'), $activity_link, 'bp_activity_screen_friends_activity' );
     
     if ( $bp['current_component'] == $bp['activity']['slug'] ) {
         if ( bp_is_home() ) {
-            $bp['bp_options_title'] = __('My Activity');
+            $bp['bp_options_title'] = __('My Activity', 'buddypress');
         } else {
             $bp['bp_options_avatar'] = bp_core_get_avatar( $bp['current_userid'], 1 );

trunk/bp-activity/bp-activity-templatetags.php

@@ -149 +149 @@
     /* Switch 'their/your' and 'Name/You' depending on whether the user is logged in or not and viewing their profile */
     if ( $is_home ) {
-        $content[0] = str_replace( __('their'), __('your'), $content[0] );
-        $content[0] = str_replace( $full_name, __('You'), $content[0] );        
+        $content[0] = str_replace( __('their', 'buddypress'), __('your', 'buddypress'), $content[0] );
+        $content[0] = str_replace( $full_name, __('You', 'buddypress'), $content[0] );      
     }
     
@@ -160 +160 @@
 
 function bp_activity_insert_time_since( $content, $date ) {
-    return sprintf( $content, '  ' . bp_core_time_since( strtotime( $date ) ) . ' ' . __('ago') );
+    return sprintf( $content, '  ' . bp_core_time_since( strtotime( $date ) ) . ' ' . __('ago', 'buddypress') );
 }
 

trunk/bp-activity/bp-activity-widgets.php

@@ -9 +9 @@
 
         /* Site Wide Activity Widget */
-        register_sidebar_widget( __('Site Wide Activity'), 'bp_activity_widget_sitewide_activity');
-        register_widget_control( __('Site Wide Activity'), 'bp_activity_widget_sitewide_activity_control' );
+        register_sidebar_widget( __('Site Wide Activity', 'buddypress'), 'bp_activity_widget_sitewide_activity');
+        register_widget_control( __('Site Wide Activity', 'buddypress'), 'bp_activity_widget_sitewide_activity_control' );
         
     }
@@ -41 +41 @@
         <?php else: ?>
             <div class="widget-error">
-                <?php _e('There has been no recent site activity.') ?>
+                <?php _e('There has been no recent site activity.', 'buddypress') ?>
             </div>
         <?php endif; ?>
@@ -66 +66 @@
     $max_items = attribute_escape( $options['max_items'] );
 ?>
-        <p><label for="bp-activity-widget-sitewide-items-max"><?php _e('Max Number of Items:'); ?> <input class="widefat" id="bp-activity-widget-sitewide-items-max" name="bp-activity-widget-sitewide-items-max" type="text" value="<?php echo $max_items; ?>" style="width: 30%" /></label></p>
+        <p><label for="bp-activity-widget-sitewide-items-max"><?php _e('Max Number of Items:', 'buddypress'); ?> <input class="widefat" id="bp-activity-widget-sitewide-items-max" name="bp-activity-widget-sitewide-items-max" type="text" value="<?php echo $max_items; ?>" style="width: 30%" /></label></p>
         <input type="hidden" id="bp-activity-widget-sitewide-submit" name="bp-activity-widget-sitewide-submit" value="1" />
 <?php

trunk/bp-blogs.php

@@ -77 +77 @@
 
     if ( $wpdb->blogid == $bp['current_homebase_id'] ) {
-        add_menu_page( __("Blogs"), __("Blogs"), 10, 'bp-blogs/admin-tabs/bp-blogs-tab.php' );
-        add_submenu_page( 'bp-blogs/admin-tabs/bp-blogs-tab.php', __("My Blogs"), __("My Blogs"), 10, 'bp-blogs/admin-tabs/bp-blogs-tab.php' );
-        add_submenu_page( 'bp-blogs/admin-tabs/bp-blogs-tab.php', __('Recent Posts'), __('Recent Posts'), 10, 'bp-blogs/admin-tabs/bp-blogs-posts-tab.php' );       
-        add_submenu_page( 'bp-blogs/admin-tabs/bp-blogs-tab.php', __('Recent Comments'), __('Recent Comments'), 10, 'bp-blogs/admin-tabs/bp-blogs-comments-tab.php' );      
+        add_menu_page( __("Blogs", 'buddypress'), __("Blogs", 'buddypress'), 10, 'bp-blogs/admin-tabs/bp-blogs-tab.php' );
+        add_submenu_page( 'bp-blogs/admin-tabs/bp-blogs-tab.php', __("My Blogs", 'buddypress'), __("My Blogs", 'buddypress'), 10, 'bp-blogs/admin-tabs/bp-blogs-tab.php' );
+        add_submenu_page( 'bp-blogs/admin-tabs/bp-blogs-tab.php', __('Recent Posts', 'buddypress'), __('Recent Posts', 'buddypress'), 10, 'bp-blogs/admin-tabs/bp-blogs-posts-tab.php' );       
+        add_submenu_page( 'bp-blogs/admin-tabs/bp-blogs-tab.php', __('Recent Comments', 'buddypress'), __('Recent Comments', 'buddypress'), 10, 'bp-blogs/admin-tabs/bp-blogs-comments-tab.php' );      
     }
 
@@ -129 +129 @@
     
     /* Add 'Blogs' to the main navigation */
-    bp_core_add_nav_item( __('Blogs'), $bp['blogs']['slug'] );
+    bp_core_add_nav_item( __('Blogs', 'buddypress'), $bp['blogs']['slug'] );
     bp_core_add_nav_default( $bp['blogs']['slug'], 'bp_blogs_screen_my_blogs', 'my-blogs' );
     
@@ -135 +135 @@
     
     /* Add the subnav items to the blogs nav item */
-    bp_core_add_subnav_item( $bp['blogs']['slug'], 'my-blogs', __('My Blogs'), $blogs_link, 'bp_blogs_screen_my_blogs' );
-    bp_core_add_subnav_item( $bp['blogs']['slug'], 'recent-posts', __('Recent Posts'), $blogs_link, 'bp_blogs_screen_recent_posts' );
-    bp_core_add_subnav_item( $bp['blogs']['slug'], 'recent-comments', __('Recent Comments'), $blogs_link, 'bp_blogs_screen_recent_comments' );
-    bp_core_add_subnav_item( $bp['blogs']['slug'], 'create-a-blog', __('Create a Blog'), $blogs_link, 'bp_blogs_screen_create_a_blog' );
+    bp_core_add_subnav_item( $bp['blogs']['slug'], 'my-blogs', __('My Blogs', 'buddypress'), $blogs_link, 'bp_blogs_screen_my_blogs' );
+    bp_core_add_subnav_item( $bp['blogs']['slug'], 'recent-posts', __('Recent Posts', 'buddypress'), $blogs_link, 'bp_blogs_screen_recent_posts' );
+    bp_core_add_subnav_item( $bp['blogs']['slug'], 'recent-comments', __('Recent Comments', 'buddypress'), $blogs_link, 'bp_blogs_screen_recent_comments' );
+    bp_core_add_subnav_item( $bp['blogs']['slug'], 'create-a-blog', __('Create a Blog', 'buddypress'), $blogs_link, 'bp_blogs_screen_create_a_blog' );
     
     /* Set up the component options navigation for Blog */
@@ -144 +144 @@
         if ( bp_is_home() ) {
             if ( function_exists('xprofile_setup_nav') ) {
-                $bp['bp_options_title'] = __('My Blogs'); 
+                $bp['bp_options_title'] = __('My Blogs', 'buddypress'); 
             }
         } else {
@@ -212 +212 @@
                 return false;
                 
-            return bp_core_get_userlink($blog->user_id) . ' ' . __('created a new blog:') . ' <a href="' . get_blog_option( $blog->blog_id, 'siteurl' ) . '">' . get_blog_option( $blog->blog_id, 'blogname' ) . '</a> <span class="time-since">%s</span>';     
+            return bp_core_get_userlink($blog->user_id) . ' ' . __('created a new blog:', 'buddypress') . ' <a href="' . get_blog_option( $blog->blog_id, 'siteurl' ) . '">' . get_blog_option( $blog->blog_id, 'blogname' ) . '</a> <span class="time-since">%s</span>';       
         break;
         case 'new_blog_post':
@@ -225 +225 @@
                 return false;
 
-            $content = bp_core_get_userlink($post->post_author) . ' ' . __('wrote a new blog post') . ' <a href="' . bp_post_get_permalink( $post, $post->blog_id ) . '">' . $post->post_title . '</a> <span class="time-since">%s</span>';     
+            $content = bp_core_get_userlink($post->post_author) . ' ' . __('wrote a new blog post', 'buddypress') . ' <a href="' . bp_post_get_permalink( $post, $post->blog_id ) . '">' . $post->post_title . '</a> <span class="time-since">%s</span>';       
             $content .= '<blockquote>' . bp_create_excerpt($post->post_content) . '</blockquote>';
             return $content;
@@ -240 +240 @@
 
             $comment = BP_Blogs_Comment::fetch_comment_content($comment);
-            $content = bp_core_get_userlink($comment->user_id) . ' ' . __('commented on the blog post ') . ' <a href="' . bp_post_get_permalink( $comment->post, $comment->blog_id ) . '#comment-' . $comment->comment_ID . '">' . $comment->post->post_title . '</a> <span class="time-since">%s</span>';      
+            $content = bp_core_get_userlink($comment->user_id) . ' ' . __('commented on the blog post ', 'buddypress') . ' <a href="' . bp_post_get_permalink( $comment->post, $comment->blog_id ) . '#comment-' . $comment->comment_ID . '">' . $comment->post->post_title . '</a> <span class="time-since">%s</span>';        
             $content .= '<blockquote>' . bp_create_excerpt($comment->comment_content) . '</blockquote>';
             return $content;

trunk/bp-blogs/bp-blogs-templatetags.php

@@ -275 +275 @@
     if ( !empty($posts_template->postpost_password) ) { // if there's a password
         if ( !isset($_COOKIE['wp-postpass_' . COOKIEHASH]) || $_COOKIE['wp-postpass_' . COOKIEHASH] != $posts_template->postpost_password ) {  // and it doesn't match the cookie
-            echo __('Enter your password to view comments');
+            echo __('Enter your password to view comments', 'buddypress');
             return;
         }
@@ -295 +295 @@
     echo apply_filters( 'comments_popup_link_attributes', '' );
 
-    echo ' title="' . sprintf( __('Comment on %s'), $title ) . '">';
+    echo ' title="' . sprintf( __('Comment on %s', 'buddypress'), $title ) . '">';
     comments_number( $zero, $one, $more, $number );
     echo '</a>';
@@ -635 +635 @@
 
         if ( $errors->get_error_code() ) {
-            echo "<p>" . __('There was a problem, please correct the form below and try again.') . "</p>";
+            echo "<p>" . __('There was a problem, please correct the form below and try again.', 'buddypress') . "</p>";
         }
         ?>
-        <p><?php printf(__("By filling out the form below, you can <strong>add a blog to your account</strong>. There is no limit to the number of blogs you can have, so create to your heart's content, but blog responsibly."), $current_user->display_name) ?></p>
-
-        <p><?php _e("If you&#8217;re not going to use a great blog domain, leave it for a new user. Now have at it!") ?></p>
+        <p><?php printf(__("By filling out the form below, you can <strong>add a blog to your account</strong>. There is no limit to the number of blogs you can have, so create to your heart's content, but blog responsibly.", 'buddypress'), $current_user->display_name) ?></p>
+
+        <p><?php _e("If you&#8217;re not going to use a great blog domain, leave it for a new user. Now have at it!", 'buddypress') ?></p>
 
         <form id="setupform" method="post" action="<?php echo $bp['loggedin_domain'] . $bp['blogs']['slug'] . '/create-a-blog' ?>">
@@ -648 +648 @@
             <?php bp_blogs_signup_blog($blogname, $blog_title, $errors); ?>
             <p>
-                <input id="submit" type="submit" name="submit" class="submit" value="<?php _e('Create Blog &raquo;') ?>" />
+                <input id="submit" type="submit" name="submit" class="submit" value="<?php _e('Create Blog &raquo;', 'buddypress') ?>" />
             </p>
         </form>
@@ -660 +660 @@
     // Blog name
     if( constant( "VHOST" ) == 'no' )
-        echo '<label for="blogname">' . __('Blog Name:') . '</label>';
+        echo '<label for="blogname">' . __('Blog Name:', 'buddypress') . '</label>';
     else
-        echo '<label for="blogname">' . __('Blog Domain:') . '</label>';
+        echo '<label for="blogname">' . __('Blog Domain:', 'buddypress') . '</label>';
 
     if ( $errmsg = $errors->get_error_message('blogname') ) { ?>
@@ -674 +674 @@
     }
     if ( !is_user_logged_in() ) {
-        print '(<strong>' . __( 'Your address will be ' );
+        print '(<strong>' . __( 'Your address will be ' , 'buddypress');
         if( constant( "VHOST" ) == 'no' ) {
-            print $current_site->domain . $current_site->path . __( 'blogname' );
+            print $current_site->domain . $current_site->path . __( 'blogname' , 'buddypress');
         } else {
-            print __( 'domain.' ) . $current_site->domain . $current_site->path;
-        }
-        echo '.</strong> ' . __( 'Must be at least 4 characters, letters and numbers only. It cannot be changed so choose carefully!)' ) . '</p>';
+            print __( 'domain.' , 'buddypress') . $current_site->domain . $current_site->path;
+        }
+        echo '.</strong> ' . __( 'Must be at least 4 characters, letters and numbers only. It cannot be changed so choose carefully!)' , 'buddypress') . '</p>';
     }
 
     // Blog Title
     ?>
-    <label for="blog_title"><?php _e('Blog Title:') ?></label>  
+    <label for="blog_title"><?php _e('Blog Title:', 'buddypress') ?></label>    
     <?php if ( $errmsg = $errors->get_error_message('blog_title') ) { ?>
         <p class="error"><?php echo $errmsg ?></p>
@@ -693 +693 @@
 
     <p>
-        <label for="blog_public_on"><?php _e('Privacy:') ?></label>
-        <?php _e('I would like my blog to appear in search engines like Google and Technorati, and in public listings around this site.'); ?> 
+        <label for="blog_public_on"><?php _e('Privacy:', 'buddypress') ?></label>
+        <?php _e('I would like my blog to appear in search engines like Google and Technorati, and in public listings around this site.', 'buddypress'); ?> 
         <div style="clear:both;"></div>
         <label class="checkbox" for="blog_public_on">
             <input type="radio" id="blog_public_on" name="blog_public" value="1" <?php if( !isset( $_POST['blog_public'] ) || $_POST['blog_public'] == '1' ) { ?>checked="checked"<?php } ?> />
-            <strong><?php _e( 'Yes' ); ?></strong>
+            <strong><?php _e( 'Yes' , 'buddypress'); ?></strong>
         </label>
         <label class="checkbox" for="blog_public_off">
             <input type="radio" id="blog_public_off" name="blog_public" value="0" <?php if( isset( $_POST['blog_public'] ) && $_POST['blog_public'] == '0' ) { ?>checked="checked"<?php } ?> />
-            <strong><?php _e( 'No' ); ?></strong>
+            <strong><?php _e( 'No' , 'buddypress'); ?></strong>
         </label>
     </p>
@@ -753 +753 @@
 function bp_blogs_confirm_blog_signup( $domain, $path, $blog_title, $user_name, $user_email = '', $meta = '' ) {
     ?>
-    <p><?php _e('Congratulations! You have successfully registered a new blog.') ?></p>
+    <p><?php _e('Congratulations! You have successfully registered a new blog.', 'buddypress') ?></p>
     <p>
-        <?php printf(__('<a href="http://%1$s">http://%2$s</a> is your new blog.  <a href="%3$s">Login</a> as "%4$s" using your existing password.'), $domain.$path, $domain.$path, "http://" . $domain.$path . "wp-login.php", $user_name) ?>
+        <?php printf(__('<a href="http://%1$s">http://%2$s</a> is your new blog.  <a href="%3$s">Login</a> as "%4$s" using your existing password.', 'buddypress'), $domain.$path, $domain.$path, "http://" . $domain.$path . "wp-login.php", $user_name) ?>
     </p>
     <?php
@@ -765 +765 @@
     
     if ( bp_is_home() ) {
-        echo '<a href="' . $bp['loggedin_domain'] . $bp['blogs']['slug'] . '/create-a-blog">' . __('Create a Blog') . '</a>';
+        echo '<a href="' . $bp['loggedin_domain'] . $bp['blogs']['slug'] . '/create-a-blog">' . __('Create a Blog', 'buddypress') . '</a>';
     }
 }

trunk/bp-blogs/bp-blogs-widgets.php

@@ -9 +9 @@
 
         /* Latest Posts Widget */
-        register_sidebar_widget( __('Recent Blog Posts'), 'bp_blogs_widget_recent_posts');
-        register_widget_control( __('Recent Blog Posts'), 'bp_blogs_widget_recent_posts_control' );
+        register_sidebar_widget( __('Recent Blog Posts', 'buddypress'), 'bp_blogs_widget_recent_posts');
+        register_widget_control( __('Recent Blog Posts', 'buddypress'), 'bp_blogs_widget_recent_posts_control' );
         
     }
@@ -35 +35 @@
         <?php if ( $posts ) : ?>
             <div class="item-options" id="recent-posts-options">
-                <?php _e("Site Wide") ?>
+                <?php _e("Site Wide", 'buddypress') ?>
             </div>
             <ul id="recent-posts" class="item-list">
@@ -57 +57 @@
         <?php else: ?>
             <div class="widget-error">
-                <?php _e('There are no recent blog posts, why not write one?') ?>
+                <?php _e('There are no recent blog posts, why not write one?', 'buddypress') ?>
             </div>
         <?php endif; ?>
@@ -82 +82 @@
     $max_posts = attribute_escape( $options['max_posts'] );
 ?>
-        <p><label for="bp-blogs-widget-recent-posts-max"><?php _e('Max Number of Posts:'); ?> <input class="widefat" id="bp-blogs-widget-recent-posts-max" name="bp-blogs-widget-recent-posts-max" type="text" value="<?php echo $max_posts; ?>" style="width: 30%" /></label></p>
+        <p><label for="bp-blogs-widget-recent-posts-max"><?php _e('Max Number of Posts:', 'buddypress'); ?> <input class="widefat" id="bp-blogs-widget-recent-posts-max" name="bp-blogs-widget-recent-posts-max" type="text" value="<?php echo $max_posts; ?>" style="width: 30%" /></label></p>
         <input type="hidden" id="bp-blogs-widget-recent-posts-submit" name="bp-blogs-widget-recent-posts-submit" value="1" />
 <?php

trunk/bp-core.php

@@ -158 +158 @@
     global $menu;
     
-    $account_settings_tab = add_menu_page( __('Account'), __('Account'), 10, 'bp-core/admin-mods/bp-core-account-tab.php' );
+    $account_settings_tab = add_menu_page( __('Account', 'buddypress'), __('Account', 'buddypress'), 10, 'bp-core/admin-mods/bp-core-account-tab.php' );
 }
 add_action( 'admin_menu', 'bp_core_add_settings_tab' );
@@ -425 +425 @@
     if ( count($list) < count($options) ) :
 ?>
-    <li id="all-my-blogs-tab" class="wp-no-js-hidden"><a href="#" class="blog-picker-toggle"><?php _e( 'All my blogs' ); ?></a></li>
+    <li id="all-my-blogs-tab" class="wp-no-js-hidden"><a href="#" class="blog-picker-toggle"><?php _e( 'All my blogs' , 'buddypress'); ?></a></li>
 
     </ul>
@@ -431 +431 @@
     <form id="all-my-blogs" action="" method="get" style="display: none">
         <p>
-            <?php printf( __( 'Choose a blog: %s' ), $select ); ?>
-
-            <input type="submit" class="button" value="<?php _e( 'Go' ); ?>" />
-            <a href="#" class="blog-picker-toggle"><?php _e( 'Cancel' ); ?></a>
+            <?php printf( __( 'Choose a blog: %s' , 'buddypress'), $select ); ?>
+
+            <input type="submit" class="button" value="<?php _e( 'Go' , 'buddypress'); ?>" />
+            <a href="#" class="blog-picker-toggle"><?php _e( 'Cancel' , 'buddypress'); ?></a>
         </p>
     </form>
@@ -800 +800 @@
     
     if ( !$just_date ) {
-        $date .= __('at') . date( ' g:iA', $time );
+        $date .= __('at', 'buddypress') . date( ' g:iA', $time );
     }
     
@@ -900 +900 @@
     // Make sure we have an uploads dir
     if ( ! wp_mkdir_p( $dir ) ) {
-        $message = sprintf( __( 'Unable to create directory %s. Is its parent directory writable by the server?' ), $dir );
+        $message = sprintf( __( 'Unable to create directory %s. Is its parent directory writable by the server?' , 'buddypress'), $dir );
         return array( 'error' => $message );
     }
@@ -968 +968 @@
     // array of time period chunks
     $chunks = array(
-    array( 60 * 60 * 24 * 365 , __('year') ),
-    array( 60 * 60 * 24 * 30 , __('month') ),
-    array( 60 * 60 * 24 * 7, __('week') ),
-    array( 60 * 60 * 24 , __('day') ),
-    array( 60 * 60 , __('hour') ),
-    array( 60 , __('minute') ),
-    array( 1, __('second') )
+    array( 60 * 60 * 24 * 365 , __('year', 'buddypress') ),
+    array( 60 * 60 * 24 * 30 , __('month', 'buddypress') ),
+    array( 60 * 60 * 24 * 7, __('week', 'buddypress') ),
+    array( 60 * 60 * 24 , __('day', 'buddypress') ),
+    array( 60 * 60 , __('hour', 'buddypress') ),
+    array( 60 , __('minute', 'buddypress') ),
+    array( 1, __('second', 'buddypress') )
     );
 
@@ -1009 +1009 @@
         $name2 = $chunks[$i + 1][1];
         
-        if ( $name2 == __('second') ) return $output;
+        if ( $name2 == __('second', 'buddypress') ) return $output;
     
         if ( ( $count2 = floor( ( $since - ( $seconds * $count ) ) / $seconds2 ) ) != 0 ) {
@@ -1058 +1058 @@
 function bp_core_get_last_activity( $last_activity_date, $before, $after ) {
     if ( !$last_activity_date || $last_activity_date == '' ) {
-        $last_active = __('not recently active');
+        $last_active = __('not recently active', 'buddypress');
     } else {
         $last_active = $before;

trunk/bp-core/admin-mods/bp-core-account-tab.php

@@ -3 +3 @@
 $is_profile_page = true;
 
-$title = $is_profile_page? __('Profile') : __('Edit User');
+$title = $is_profile_page? __('Profile', 'buddypress') : __('Edit User', 'buddypress');
 if ( current_user_can('edit_users') && !$is_profile_page )
     $submenu_file = 'users.php';
@@ -21 +21 @@
         $user_id = $current_user->ID;
     } else {
-        wp_die(__('Invalid user ID.'));
+        wp_die(__('Invalid user ID.', 'buddypress'));
     }
 
@@ -42 +42 @@
 
 if ( !current_user_can('edit_user', $user_id) )
-    wp_die(__('You do not have permission to edit this user.'));
+    wp_die(__('You do not have permission to edit this user.', 'buddypress'));
 
 if ( $is_profile_page ) {
@@ -64 +64 @@
 
 if ( !current_user_can('edit_user', $user_id) )
-        wp_die(__('You do not have permission to edit this user.'));
+        wp_die(__('You do not have permission to edit this user.', 'buddypress'));
 
 ?>
@@ -70 +70 @@
 <?php if ( isset($_GET['updated']) ) : ?>
 <div id="message" class="updated fade">
-    <p><strong><?php _e('User updated.') ?></strong></p>
+    <p><strong><?php _e('User updated.', 'buddypress') ?></strong></p>
     <?php if ( $wp_http_referer && !$is_profile_page ) : ?>
-    <p><a href="users.php"><?php _e('&laquo; Back to Authors and Users'); ?></a></p>
+    <p><a href="users.php"><?php _e('&laquo; Back to Authors and Users', 'buddypress'); ?></a></p>
     <?php endif; ?>
 </div>
@@ -88 +88 @@
 
 <div class="wrap" id="profile-page">
-<h2><?php $is_profile_page? _e('Account Settings') : _e('Edit User Account Settings'); ?></h2>
+<h2><?php $is_profile_page? _e('Account Settings', 'buddypress') : _e('Edit User Account Settings', 'buddypress'); ?></h2>
 
 <form name="profile" id="your-profile" action="admin.php?page=bp-core/admin-mods/bp-core-account-tab.php" method="post">
@@ -101 +101 @@
 </p>
 
-<h3><?php _e('Personal Options'); ?></h3>
+<h3><?php _e('Personal Options', 'buddypress'); ?></h3>
 
 <table class="form-table">
 <?php if ( rich_edit_exists() ) : // don't bother showing the option if the editor has been removed ?>
     <tr>
-        <th scope="row"><?php _e('Visual Editor')?></th>
-        <td><label for="rich_editing"><input name="rich_editing" type="checkbox" id="rich_editing" value="true" <?php checked('true', $profileuser->rich_editing); ?> /> <?php _e('Use the visual editor when writing'); ?></label></td>
+        <th scope="row"><?php _e('Visual Editor', 'buddypress')?></th>
+        <td><label for="rich_editing"><input name="rich_editing" type="checkbox" id="rich_editing" value="true" <?php checked('true', $profileuser->rich_editing); ?> /> <?php _e('Use the visual editor when writing', 'buddypress'); ?></label></td>
     </tr>
 <?php endif; ?>
 <tr>
-<th scope="row"><?php _e('Admin Color Scheme')?></th>
-<td><fieldset><legend class="hidden"><?php _e('Admin Color Scheme')?></legend>
+<th scope="row"><?php _e('Admin Color Scheme', 'buddypress')?></th>
+<td><fieldset><legend class="hidden"><?php _e('Admin Color Scheme', 'buddypress')?></legend>
 <?php
 $current_color = get_user_option('admin_color', $user_id);
@@ -135 +135 @@
 </table>
 
-<h3><?php $is_profile_page? _e('Your Account Details') : _e('User Account Details'); ?></h3>
+<h3><?php $is_profile_page? _e('Your Account Details', 'buddypress') : _e('User Account Details', 'buddypress'); ?></h3>
 
 <table class="form-table">
 <tr>
-    <th><label for="email">* <?php _e('Account Email') ?></label></th>
-    <td><input type="text" name="email" id="email" value="<?php echo $profileuser->user_email ?>" /> (<?php _e('Required'); ?>)</td>
+    <th><label for="email">* <?php _e('Account Email', 'buddypress') ?></label></th>
+    <td><input type="text" name="email" id="email" value="<?php echo $profileuser->user_email ?>" /> (<?php _e('Required', 'buddypress'); ?>)</td>
 </tr>
 <?php
@@ -147 +147 @@
 ?>
 <tr>
-    <th><label for="pass1"><?php _e('New Password'); ?></label></th>
-    <td><input type="password" name="pass1" id="pass1" size="16" value="" /> <?php _e("If you would like to change the password type a new one. Otherwise leave this blank."); ?><br />
-        <input type="password" name="pass2" id="pass2" size="16" value="" /> <?php _e("Type your new password again."); ?><br />
+    <th><label for="pass1"><?php _e('New Password', 'buddypress'); ?></label></th>
+    <td><input type="password" name="pass1" id="pass1" size="16" value="" /> <?php _e("If you would like to change the password type a new one. Otherwise leave this blank.", 'buddypress'); ?><br />
+        <input type="password" name="pass2" id="pass2" size="16" value="" /> <?php _e("Type your new password again.", 'buddypress'); ?><br />
         <?php if ( $is_profile_page ): ?>
-        <p><strong><?php _e('Password Strength'); ?></strong></p>
-        <div id="pass-strength-result"><?php _e('Too short'); ?></div> <?php _e('Hint: Use upper and lower case characters, numbers and symbols like !"?$%^&amp;( in your password.'); ?>
+        <p><strong><?php _e('Password Strength', 'buddypress'); ?></strong></p>
+        <div id="pass-strength-result"><?php _e('Too short', 'buddypress'); ?></div> <?php _e('Hint: Use upper and lower case characters, numbers and symbols like !"?$%^&amp;( in your password.', 'buddypress'); ?>
         <?php endif; ?>
     </td>
@@ -171 +171 @@
     <table width="99%" style="border: none;" cellspacing="2" cellpadding="3" class="editform">
         <tr>
-            <th scope="row"><?php _e('Additional Capabilities') ?></th>
+            <th scope="row"><?php _e('Additional Capabilities', 'buddypress') ?></th>
             <td><?php
             $output = '';
@@ -189 +189 @@
     <input type="hidden" name="action" value="update" />
     <input type="hidden" name="user_id" id="user_id" value="<?php echo $user_id; ?>" />
-    <input type="submit" value="<?php $is_profile_page? _e('Update Profile') : _e('Update User') ?>" name="submit" />
+    <input type="submit" value="<?php $is_profile_page? _e('Update Profile', 'buddypress') : _e('Update User', 'buddypress') ?>" name="submit" />
  </p>
 </form>

trunk/bp-core/admin-mods/bp-core-homebase-dashboard.php

@@ -31 +31 @@
 
                 <div id="message" class="info">
-                    <p><?php bp_you_or_name() ?> <?php _e('made any posts yet!'); ?></p>
+                    <p><?php bp_you_or_name() ?> <?php _e('made any posts yet!', 'buddypress'); ?></p>
                 </div>
 

trunk/bp-core/bp-core-adminbar.php

@@ -14 +14 @@
             bp_core_get_avatar( $bp['loggedin_userid'], 1 );
         
-        echo __('My Account') . '</a>';
+        echo __('My Account', 'buddypress') . '</a>';
         echo '<ul>';
         
@@ -32 +32 @@
             echo '</li>';
         }
-        echo '<li><a id="logout" href="' . site_url() . '/wp-login.php?action=logout">' . __('Log Out') . '</a></li>';
+        echo '<li><a id="logout" href="' . site_url() . '/wp-login.php?action=logout">' . __('Log Out', 'buddypress') . '</a></li>';
         echo '</ul>';
         echo '</li>';
@@ -42 +42 @@
 
             echo '<li><a href="' . $bp['loggedin_domain'] . $bp['blogs']['slug'] . '/my-blogs">';
-            _e('My Blogs');
+            _e('My Blogs', 'buddypress');
             echo '</a>';
 
@@ -54 +54 @@
                     
                     echo '<ul>';
-                    echo '<li><a href="' . $blog['siteurl']  . '/wp-admin/">' . __('Dashboard') . '</a></li>';
-                    echo '<li><a href="' . $blog['siteurl']  . '/wp-admin/post-new.php">' . __('New Post') . '</a></li>';
-                    echo '<li><a href="' . $blog['siteurl']  . '/wp-admin/post-new.php">' . __('Manage Posts') . '</a></li>';
-                    echo '<li><a href="' . $blog['siteurl']  . '/wp-admin/themes.php">' . __('Switch Theme') . '</a></li>';                 
-                    echo '<li><a href="' . $blog['siteurl']  . '/wp-admin/edit-comments.php">' . __('Manage Comments') . '</a></li>';                   
+                    echo '<li><a href="' . $blog['siteurl']  . '/wp-admin/">' . __('Dashboard', 'buddypress') . '</a></li>';
+                    echo '<li><a href="' . $blog['siteurl']  . '/wp-admin/post-new.php">' . __('New Post', 'buddypress') . '</a></li>';
+                    echo '<li><a href="' . $blog['siteurl']  . '/wp-admin/post-new.php">' . __('Manage Posts', 'buddypress') . '</a></li>';
+                    echo '<li><a href="' . $blog['siteurl']  . '/wp-admin/themes.php">' . __('Switch Theme', 'buddypress') . '</a></li>';                   
+                    echo '<li><a href="' . $blog['siteurl']  . '/wp-admin/edit-comments.php">' . __('Manage Comments', 'buddypress') . '</a></li>';                 
                     echo '</ul>';
                     
@@ -65 +65 @@
             } else {
                 echo '<li>';
-                echo '<a href="' . $bp['loggedin_domain'] . $bp['blogs']['slug'] . '/create-a-blog">' . __('Create a Blog!') . '</a>';
+                echo '<a href="' . $bp['loggedin_domain'] . $bp['blogs']['slug'] . '/create-a-blog">' . __('Create a Blog!', 'buddypress') . '</a>';
                 echo '</li>';
             }
@@ -81 +81 @@
                     /* This is a blog, render a menu with links to all authors */
                     echo '<li><a href="/">';
-                    _e('Blog Authors');
+                    _e('Blog Authors', 'buddypress');
                     echo '</a>';
                 

trunk/bp-core/bp-core-ajax.php

@@ -42 +42 @@
                             <?php 
                             if ( $_POST['filter'] == 'newest-members') {
-                                echo bp_core_get_last_activity( $user->user_registered, __('registered '), __(' ago') );
+                                echo bp_core_get_last_activity( $user->user_registered, __('registered ', 'buddypress'), __(' ago', 'buddypress') );
                             } else if ( $_POST['filter'] == 'recently-active-members') {
-                                echo bp_core_get_last_activity( get_usermeta( $user->user_id, 'last_activity' ), __('active '), __(' ago') );
+                                echo bp_core_get_last_activity( get_usermeta( $user->user_id, 'last_activity' ), __('active ', 'buddypress'), __(' ago', 'buddypress') );
                             } else if ( $_POST['filter'] == 'popular-members') {
                                 if ( get_usermeta( $user->user_id, 'total_friend_count' ) == 1 )
-                                    echo get_usermeta( $user->user_id, 'total_friend_count' ) . __(' friend');
+                                    echo get_usermeta( $user->user_id, 'total_friend_count' ) . __(' friend', 'buddypress');
                                 else
-                                    echo get_usermeta( $user->user_id, 'total_friend_count' ) . __(' friends');
+                                    echo get_usermeta( $user->user_id, 'total_friend_count' ) . __(' friends', 'buddypress');
                             }
                             ?>
@@ -59 +59 @@
         }
     } else {
-        echo "-1[[SPLIT]]<li>" . __("No members matched the current filter.");
+        echo "-1[[SPLIT]]<li>" . __("No members matched the current filter.", 'buddypress');
     }
 }

trunk/bp-core/bp-core-avatars.php

@@ -77 +77 @@
     <?php if ( !isset($_POST['slick_avatars_action']) && !isset($_GET['slick_avatars_action']) ) { ?>
     <div class="wrap">
-        <h2><?php _e('Your Avatar') ?></h2>
+        <h2><?php _e('Your Avatar', 'buddypress') ?></h2>
         
         <?php if ( $message ) { ?>
@@ -86 +86 @@
         <?php } ?>
 
-        <p><?php _e('Your avatar will be used on your profile and throughout the site.') ?></p>
-        <p><?php _e('Click below to select a JPG, GIF or PNG format photo from your computer and then click \'Upload Photo\' to proceed.') ?></p>
+        <p><?php _e('Your avatar will be used on your profile and throughout the site.', 'buddypress') ?></p>
+        <p><?php _e('Click below to select a JPG, GIF or PNG format photo from your computer and then click \'Upload Photo\' to proceed.', 'buddypress') ?></p>
         
         <?php
@@ -100 +100 @@
         $str = bp_core_get_avatar( get_current_user_id(), 1 );
         if ( strlen($str) ) {
-            echo '<h3>' . __('This is your current avatar') . '</h3>';
+            echo '<h3>' . __('This is your current avatar', 'buddypress') . '</h3>';
             echo '<span class="crop-img avatar">' . bp_core_get_avatar(get_current_user_id(), 1) . '</span>';
             echo '<span class="crop-img avatar">' . bp_core_get_avatar(get_current_user_id(), 2) . '</span>';
@@ -111 +111 @@
     
         echo '<div class="wrap"><h2>';
-        _e('Your Avatar');
+        _e('Your Avatar', 'buddypress');
         echo '</h2>';
         
@@ -120 +120 @@
         // Set friendly error feedback.
         $uploadErrors = array(
-                0 => __("There is no error, the file uploaded with success"), 
-                1 => __("The uploaded file exceeds the upload_max_filesize directive in php.ini"), 
-                2 => __("The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form"),
-                3 => __("The uploaded file was only partially uploaded"),
-                4 => __("No file was uploaded"),
-                6 => __("Missing a temporary folder")
+                0 => __("There is no error, the file uploaded with success", 'buddypress'), 
+                1 => __("The uploaded file exceeds the upload_max_filesize directive in php.ini", 'buddypress'), 
+                2 => __("The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form", 'buddypress'),
+                3 => __("The uploaded file was only partially uploaded", 'buddypress'),
+                4 => __("No file was uploaded", 'buddypress'),
+                6 => __("Missing a temporary folder", 'buddypress')
         );
 
@@ -171 +171 @@
         // Store details to the DB and we're done
         echo '<div class="wrap"><h2>';
-        _e('Your Avatar');
+        _e('Your Avatar', 'buddypress');
         echo '</h2>';
         
-        echo '<p>' . __('Your new avatar was successfully created!') . '</p>';
+        echo '<p>' . __('Your new avatar was successfully created!', 'buddypress') . '</p>';
         
         bp_core_avatar_save($result);
@@ -191 +191 @@
         
         unset($_GET['slick_avatars_action']);
-        $message = __('Avatar successfully removed.');
+        $message = __('Avatar successfully removed.', 'buddypress');
         bp_core_avatar_admin($message);
         
@@ -278 +278 @@
     
     echo '<div id="avatar_v1">';
-    echo '<h3>' . __('Main Avatar') . '</h3>';
-    echo '<p>' . __('Please select the area of your photo you would like to use for your avatar') . '(' . CORE_AVATAR_V1_W . 'px x ' . CORE_AVATAR_V1_H . 'px).</p>';
+    echo '<h3>' . __('Main Avatar', 'buddypress') . '</h3>';
+    echo '<p>' . __('Please select the area of your photo you would like to use for your avatar', 'buddypress') . '(' . CORE_AVATAR_V1_W . 'px x ' . CORE_AVATAR_V1_H . 'px).</p>';
     
     // Canvas
@@ -285 +285 @@
     
     // Preview
-    echo '<p class="crop-preview"><strong>' . __('Crop Preview') . '</strong></p>';
+    echo '<p class="crop-preview"><strong>' . __('Crop Preview', 'buddypress') . '</strong></p>';
     echo '<div id="crop-preview-v1" class="crop-preview"></div>';
     
@@ -299 +299 @@
     if (CORE_AVATAR_V2_W !== false && CORE_AVATAR_V2_H !== false) {
         // Continue button (v1 => v2)
-        echo '<p class="submit"><input type="button" name="avatar_continue" value="' . __('Crop &amp; Continue') . '" onclick="cropAndContinue();" /></p>';
+        echo '<p class="submit"><input type="button" name="avatar_continue" value="' . __('Crop &amp; Continue', 'buddypress') . '" onclick="cropAndContinue();" /></p>';
         echo '</div>';
         
         echo '<div id="avatar_v2" style="display: none">';
-        echo '<h3>' . __('Alternate Avatar') . '</h3>';
-        echo '<p>' . __('Please select the area of your photo you would like to use for an alternate version') . '(' . CORE_AVATAR_V2_W . 'px x ' . CORE_AVATAR_V2_H . 'px).</p>';
+        echo '<h3>' . __('Alternate Avatar', 'buddypress') . '</h3>';
+        echo '<p>' . __('Please select the area of your photo you would like to use for an alternate version', 'buddypress') . '(' . CORE_AVATAR_V2_W . 'px x ' . CORE_AVATAR_V2_H . 'px).</p>';
         
         // Canvas
@@ -310 +310 @@
 
         // Preview
-        echo '<p class="crop-preview"><strong>' . __('Crop Preview') . '</strong></p>';
+        echo '<p class="crop-preview"><strong>' . __('Crop Preview', 'buddypress') . '</strong></p>';
         echo '<div id="crop-preview-v2" class="crop-preview"></div>';
 
@@ -322 +322 @@
         
         // Final button to process everything
-        echo '<p class="submit"><input type="submit" name="save" value="' . __('Crop &amp; Save') . '" /></p>';
+        echo '<p class="submit"><input type="submit" name="save" value="' . __('Crop &amp; Save', 'buddypress') . '" /></p>';
         echo '</div>';
     } else {
@@ -329 +329 @@
         
         // Final button to process everything
-        echo '<p class="submit"><input type="submit" name="save" value="' . __('Crop &amp; Save') . '" /></p>';
+        echo '<p class="submit"><input type="submit" name="save" value="' . __('Crop &amp; Save', 'buddypress') . '" /></p>';
     }
     
@@ -458 +458 @@
 function bp_core_ap_die( $msg ) {
     echo '<p><strong>' . $msg . '</strong></p>';
-    echo '<p><a href="' . get_option('home') .'/wp-admin/admin.php?page=bp-xprofile.php">' . __('Try Again') . '</a></p>';
+    echo '<p><a href="' . get_option('home') .'/wp-admin/admin.php?page=bp-xprofile.php">' . __('Try Again', 'buddypress') . '</a></p>';
     echo '</div>';
     exit;

trunk/bp-core/bp-core-classes.php

@@ -61 +61 @@
         $this->fullname = bp_core_get_userlink( $this->id, true );
         $this->email = bp_core_get_user_email( $this->id );
-        $this->last_active = bp_core_get_last_activity( get_usermeta( $this->id, 'last_activity' ), __('active '), __(' ago') );
+        $this->last_active = bp_core_get_last_activity( get_usermeta( $this->id, 'last_activity' ), __('active ', 'buddypress'), __(' ago', 'buddypress') );
         
         if ( function_exists('xprofile_install') ) {

trunk/bp-core/bp-core-templatetags.php

@@ -172 +172 @@
     
     if ( $bp['bp_options_title'] == '' )
-        $bp['bp_options_title'] = __('Options');
+        $bp['bp_options_title'] = __('Options', 'buddypress');
     
     echo $bp['bp_options_title'];
@@ -210 +210 @@
     
     if ( !$just_date ) {
-        $date .= __('at') . date( ' g:iA', $time );
+        $date .= __('at', 'buddypress') . date( ' g:iA', $time );
     }
     
@@ -219 +219 @@
     global $bp;
     
-    $my = __('my');
+    $my = __('my', 'buddypress');
     
     if ( $capitalize )
@@ -240 +240 @@
     global $bp;
     
-    $you = __('you haven\'t');
+    $you = __('you haven\'t', 'buddypress');
     
     if ( $capitalize )
@@ -261 +261 @@
     global $bp;
     
-    $your = __('your');
+    $your = __('your', 'buddypress');
     
     if ( $capitalize )
@@ -282 +282 @@
     global $bp;
     
-    $your = __('your');
-    $their = __('their');
+    $your = __('your', 'buddypress');
+    $their = __('their', 'buddypress');
     
     if ( $capitalize )

trunk/bp-core/bp-core-widgets.php

@@ -9 +9 @@
         
         /* Site welcome widget */
-        register_sidebar_widget( __('Welcome'), 'bp_core_widget_welcome');
-        register_widget_control( __('Welcome'), 'bp_core_widget_welcome_control' );
+        register_sidebar_widget( __('Welcome', 'buddypress'), 'bp_core_widget_welcome');
+        register_widget_control( __('Welcome', 'buddypress'), 'bp_core_widget_welcome_control' );
         
         /* Site members widget */
-        register_sidebar_widget( __('Members'), 'bp_core_widget_members');
-        register_widget_control( __('Members'), 'bp_core_widget_members_control' );
+        register_sidebar_widget( __('Members', 'buddypress'), 'bp_core_widget_members');
+        register_widget_control( __('Members', 'buddypress'), 'bp_core_widget_members_control' );
         
         /* Include the javascript needed for activated widgets only */
@@ -26 +26 @@
     
     /* Widgets that can be enabled anywhere */
-    register_sidebar_widget( __('Who\'s Online'), 'bp_core_widget_whos_online');
-    register_widget_control( __('Who\'s Online'), 'bp_core_widget_whos_online_control' );   
+    register_sidebar_widget( __('Who\'s Online', 'buddypress'), 'bp_core_widget_whos_online');
+    register_widget_control( __('Who\'s Online', 'buddypress'), 'bp_core_widget_whos_online_control' ); 
 
 }
@@ -49 +49 @@
     <p><?php echo $options['text'] ?></p>
 
-    <p class="create-account"><a href="<?php echo site_url() ?>/wp-signup.php" title="<?php _e('Create Account') ?>"><img src="<?php echo get_template_directory_uri() ?>/images/create_account_button.gif" alt="<?php _e('Create Account') ?>" /></a></p>
+    <p class="create-account"><a href="<?php echo site_url() ?>/wp-signup.php" title="<?php _e('Create Account', 'buddypress') ?>"><img src="<?php echo get_template_directory_uri() ?>/images/create_account_button.gif" alt="<?php _e('Create Account', 'buddypress') ?>" /></a></p>
 
     <?php echo $after_widget; ?>
@@ -73 +73 @@
     $text = attribute_escape( $options['text'] );
 ?>
-        <p><label for="bp-widget-welcome-title"><?php _e('Title:'); ?> <input class="widefat" id="bp-widget-welcome-title" name="bp-widget-welcome-title" type="text" value="<?php echo $title; ?>" /></label></p>
+        <p><label for="bp-widget-welcome-title"><?php _e('Title:', 'buddypress'); ?> <input class="widefat" id="bp-widget-welcome-title" name="bp-widget-welcome-title" type="text" value="<?php echo $title; ?>" /></label></p>
         <p>
-            <label for="bp-widget-welcome-text"><?php _e( 'Welcome Text:' ); ?>
+            <label for="bp-widget-welcome-text"><?php _e( 'Welcome Text:' , 'buddypress'); ?>
                 <textarea id="bp-widget-welcome-text" name="bp-widget-welcome-text" class="widefat" style="height: 100px"><?php echo $text; ?></textarea>
             </label>
@@ -101 +101 @@
         <div class="item-options" id="members-list-options">
             <img id="ajax-loader-members" src="<?php echo $bp['core']['image_base'] ?>/ajax-loader.gif" height="7" alt="Loading" style="display: none;" /> &nbsp;
-            <a href="<?php echo site_url() . '/members' ?>" id="newest-members" class="selected"><?php _e("Newest") ?></a> | 
-            <a href="<?php echo site_url() . '/members' ?>" id="recently-active-members"><?php _e("Active") ?></a> | 
-            <a href="<?php echo site_url() . '/members' ?>" id="popular-members"><?php _e("Popular") ?></a>
+            <a href="<?php echo site_url() . '/members' ?>" id="newest-members" class="selected"><?php _e("Newest", 'buddypress') ?></a> | 
+            <a href="<?php echo site_url() . '/members' ?>" id="recently-active-members"><?php _e("Active", 'buddypress') ?></a> | 
+            <a href="<?php echo site_url() . '/members' ?>" id="popular-members"><?php _e("Popular", 'buddypress') ?></a>
         </div>
         <ul id="members-list" class="item-list">
@@ -115 +115 @@
                     <div class="item">
                         <div class="item-title"><?php echo bp_core_get_userlink( $user->user_id ) ?></div>
-                        <div class="item-meta"><span class="activity"><?php echo bp_core_get_last_activity( $user->user_registered, __('registered '), __(' ago') ) ?></span></div>
+                        <div class="item-meta"><span class="activity"><?php echo bp_core_get_last_activity( $user->user_registered, __('registered ', 'buddypress'), __(' ago', 'buddypress') ) ?></span></div>
                     </div>
                 </li>
@@ -131 +131 @@
     <?php else: ?>
         <div class="widget-error">
-            <?php _e('No one has signed up yet!') ?>
+            <?php _e('No one has signed up yet!', 'buddypress') ?>
         </div>
     <?php endif; ?>
@@ -155 +155 @@
     $max_members = attribute_escape( $options['max_members'] );
 ?>
-        <p><label for="bp-core-widget-members-max"><?php _e('Max Members to show:'); ?> <input class="widefat" id="bp-core-widget-members-max" name="bp-core-widget-members-max" type="text" value="<?php echo $max_members; ?>" style="width: 30%" /></label></p>
+        <p><label for="bp-core-widget-members-max"><?php _e('Max Members to show:', 'buddypress'); ?> <input class="widefat" id="bp-core-widget-members-max" name="bp-core-widget-members-max" type="text" value="<?php echo $max_members; ?>" style="width: 30%" /></label></p>
         <input type="hidden" id="bp-core-widget-members-submit" name="bp-core-widget-members-submit" value="1" />
 <?php
@@ -195 +195 @@
     <?php else: ?>
         <div class="widget-error">
-            <?php _e('There are no users currently online.') ?>
+            <?php _e('There are no users currently online.', 'buddypress') ?>
         </div>
     <?php endif; ?>
@@ -219 +219 @@
     $max_members = attribute_escape( $options['max_members'] );
 ?>
-        <p><label for="bp-widget-whos-online-max-members"><?php _e('Maximum number of members to show:'); ?><br /><input class="widefat" id="bp-widget-whos-online-max-members" name="bp-widget-whos-online-max-members" type="text" value="<?php echo $max_members; ?>" style="width: 30%" /></label></p>
+        <p><label for="bp-widget-whos-online-max-members"><?php _e('Maximum number of members to show:', 'buddypress'); ?><br /><input class="widefat" id="bp-widget-whos-online-max-members" name="bp-widget-whos-online-max-members" type="text" value="<?php echo $max_members; ?>" style="width: 30%" /></label></p>
         <input type="hidden" id="bp-widget-whos-online-submit" name="bp-widget-whos-online-submit" value="1" />
 <?php

trunk/bp-core/homebase-creation/bp-core-homebase-functions.php

@@ -7 +7 @@
         ?>
         <div id="update-nag">
-            <p><a href="admin.php?page=bp-core/homebase-creation/bp-core-homebase-tab.php"><?php _e('Create a Home Base!') ?></a><br />
-            <?php _e('Create your home base and start using all the new social networking features') ?></p>
+            <p><a href="admin.php?page=bp-core/homebase-creation/bp-core-homebase-tab.php"><?php _e('Create a Home Base!', 'buddypress') ?></a><br />
+            <?php _e('Create your home base and start using all the new social networking features', 'buddypress') ?></p>
         </div>
         <?php
@@ -17 +17 @@
 function bp_core_add_createhomebase_tab() {
     if ( !bp_core_user_has_home() ) {
-        add_menu_page( __('Create Home Base'), __('Create Home Base'), 1, 'bp-core/homebase-creation/bp-core-homebase-tab.php');
+        add_menu_page( __('Create Home Base', 'buddypress'), __('Create Home Base', 'buddypress'), 1, 'bp-core/homebase-creation/bp-core-homebase-tab.php');
     }
 }
@@ -27 +27 @@
     if ( ( is_site_admin() && $bp['current_userid'] != $bp['loggedin_userid'] ) && ( $wpdb->blogid == $bp['current_homebase_id'] ) ) { ?>
         <div id="update-nag">
-            <p><strong><?php _e('Administrator Notice:') ?></strong> <?php _e('This is a user home base, not a blog.') ?></p>
+            <p><strong><?php _e('Administrator Notice:', 'buddypress') ?></strong> <?php _e('This is a user home base, not a blog.', 'buddypress') ?></p>
         </div>  
     <?php   
@@ -58 +58 @@
 
     if ( $errors->get_error_code() ) {
-        echo "<p>" . __('There was a problem, please correct the form below and try again.') . "</p>";
+        echo "<p>" . __('There was a problem, please correct the form below and try again.', 'buddypress') . "</p>";
     }
     ?>
     
     <div class="wrap">
-        <p><h2><?php _e('Create Your Home Base') ?></h2></p>
+        <p><h2><?php _e('Create Your Home Base', 'buddypress') ?></h2></p>
         <div>
-            <h3><?php _e('What\'s a home base and how do I make one?') ?></h3>
-            <p><?php _e('Your home base will be where you and other members go to view your profile, groups, friends and more.') ?></p>
-            <p><?php _e('Creating a home base is easy, all you have to do is fill in the form below. Once your home base is created, you can start using all the new features. Any existing blogs will be linked with your home base.') ?></p>
+            <h3><?php _e('What\'s a home base and how do I make one?', 'buddypress') ?></h3>
+            <p><?php _e('Your home base will be where you and other members go to view your profile, groups, friends and more.', 'buddypress') ?></p>
+            <p><?php _e('Creating a home base is easy, all you have to do is fill in the form below. Once your home base is created, you can start using all the new features. Any existing blogs will be linked with your home base.', 'buddypress') ?></p>
 
             <form id="setupform" method="post" action="admin.php?page=bp-core/homebase-creation/bp-core-homebase-tab.php">
@@ -75 +75 @@
                 <?php do_action( 'signup_extra_fields', $errors ); ?>
                 <p>
-                    <input id="submit" type="submit" name="submit" value="<?php _e('Create Home Base &raquo;') ?>" /></p>
+                    <input id="submit" type="submit" name="submit" value="<?php _e('Create Home Base &raquo;', 'buddypress') ?>" /></p>
             </form>
         </div>
@@ -88 +88 @@
     <tbody>
         <tr>
-            <th scope="row"><?php _e('Username') ?></th>
+            <th scope="row"><?php _e('Username', 'buddypress') ?></th>
             <td>
             <?php
@@ -112 +112 @@
     ?>
     <?php if ( !function_exists('xprofile_install') ) { ?>
-        <label for="blog_title"><?php _e('Full Name:') ?></label>   
+        <label for="blog_title"><?php _e('Full Name:', 'buddypress') ?></label> 
         <?php if ( $errmsg = $errors->get_error_message('blog_title') ) { ?>
             <p class="error"><?php echo $errmsg ?></p>

trunk/bp-core/homebase-creation/bp-core-homebase-tab.php

@@ -21 +21 @@
 $current_user = wp_get_current_user();
 if( $active_signup == "none" ) {
-    _e( "Registration has been disabled." );
+    _e( "Registration has been disabled." , 'buddypress');
 } else {
     if( $active_signup == 'blog' && !is_user_logged_in() )
@@ -45 +45 @@
                     bp_core_homebase_signup_form($newblogname);
                 } elseif( is_user_logged_in() == false && ( $active_signup == 'blog' ) ) {
-                    _e( "I'm sorry. We're not accepting new registrations at this time." );
+                    _e( "I'm sorry. We're not accepting new registrations at this time." , 'buddypress');
                 } else {
-                    _e( "You're logged in already. No need to register again!" );
+                    _e( "You're logged in already. No need to register again!" , 'buddypress');
                 }
             }

trunk/bp-friends.php

@@ -93 +93 @@
     
     /* Add 'Friends' to the main navigation */
-    bp_core_add_nav_item( __('Friends'), $bp['friends']['slug'] );
+    bp_core_add_nav_item( __('Friends', 'buddypress'), $bp['friends']['slug'] );
     bp_core_add_nav_default( $bp['friends']['slug'], 'friends_screen_my_friends', 'my-friends' );
     
@@ -99 +99 @@
     
     /* Add the subnav items to the friends nav item */
-    bp_core_add_subnav_item( $bp['friends']['slug'], 'my-friends', __('My Friends'), $friends_link, 'friends_screen_my_friends' );
-    bp_core_add_subnav_item( $bp['friends']['slug'], 'requests', __('Requests'), $friends_link, 'friends_screen_requests' );
-    bp_core_add_subnav_item( $bp['friends']['slug'], 'friend-finder', __('Friend Finder'), $friends_link, 'friends_screen_friend_finder' );
-    bp_core_add_subnav_item( $bp['friends']['slug'], 'invite-friend', __('Invite Friends'), $friends_link, 'friends_screen_invite_friends' );
+    bp_core_add_subnav_item( $bp['friends']['slug'], 'my-friends', __('My Friends', 'buddypress'), $friends_link, 'friends_screen_my_friends' );
+    bp_core_add_subnav_item( $bp['friends']['slug'], 'requests', __('Requests', 'buddypress'), $friends_link, 'friends_screen_requests' );
+    bp_core_add_subnav_item( $bp['friends']['slug'], 'friend-finder', __('Friend Finder', 'buddypress'), $friends_link, 'friends_screen_friend_finder' );
+    bp_core_add_subnav_item( $bp['friends']['slug'], 'invite-friend', __('Invite Friends', 'buddypress'), $friends_link, 'friends_screen_invite_friends' );
     
     if ( $bp['current_component'] == $bp['friends']['slug'] ) {
         if ( bp_is_home() ) {
-            $bp['bp_options_title'] = __('My Friends');
+            $bp['bp_options_title'] = __('My Friends', 'buddypress');
         } else {
             $bp['bp_options_avatar'] = bp_core_get_avatar( $bp['current_userid'], 1 );
@@ -127 +127 @@
         
         if ( friends_accept_friendship( $bp['action_variables'][1] ) ) {
-            $bp['message'] = __('Friendship accepted');
+            $bp['message'] = __('Friendship accepted', 'buddypress');
             $bp['message_type'] = 'success';
         } else {
-            $bp['message'] = __('Friendship could not be accepted');
+            $bp['message'] = __('Friendship could not be accepted', 'buddypress');
             $bp['message_type'] = 'error';                  
         }
@@ -138 +138 @@
         
         if ( friends_reject_friendship( $bp['action_variables'][1] ) ) {
-            $bp['message'] = __('Friendship rejected');
+            $bp['message'] = __('Friendship rejected', 'buddypress');
             $bp['message_type'] = 'success';
         } else {
-            $bp['message'] = __('Friendship could not be rejected');
+            $bp['message'] = __('Friendship could not be rejected', 'buddypress');
             $bp['message_type'] = 'error';              
         }
@@ -198 +198 @@
             
             if ( $for_secondary_user ) {
-                return bp_core_get_userlink( $friendship->initiator_user_id ) . ' ' . __('and') . ' ' . bp_core_get_userlink($friendship->friend_user_id, false, false, true) . ' ' . __('are now friends') . '. <span class="time-since">%s</span>';               
+                return bp_core_get_userlink( $friendship->initiator_user_id ) . ' ' . __('and', 'buddypress') . ' ' . bp_core_get_userlink($friendship->friend_user_id, false, false, true) . ' ' . __('are now friends', 'buddypress') . '. <span class="time-since">%s</span>';               
             } else {
-                return bp_core_get_userlink( $friendship->friend_user_id ) . ' ' . __('and') . ' ' . bp_core_get_userlink($friendship->initiator_user_id) . ' ' . __('are now friends') . '. <span class="time-since">%s</span>';                               
+                return bp_core_get_userlink( $friendship->friend_user_id ) . ' ' . __('and', 'buddypress') . ' ' . bp_core_get_userlink($friendship->initiator_user_id) . ' ' . __('are now friends', 'buddypress') . '. <span class="time-since">%s</span>';                               
             }
 

trunk/bp-friends/bp-friends-ajax.php

@@ -56 +56 @@
     } else {
         $result['message'] = '<img src="' . $bp['friends']['image_base'] . '/warning.gif" alt="Warning" /> &nbsp;' . $result['message'];
-        echo "-1[[SPLIT]]" . __("No friends matched your search.");
+        echo "-1[[SPLIT]]" . __("No friends matched your search.", 'buddypress');
     }
 }
@@ -79 +79 @@
 
     if ( $_POST['finder-search-box'] == "" ) {
-        echo "-1[[SPLIT]]" . __("Please enter something to search for.");
+        echo "-1[[SPLIT]]" . __("Please enter something to search for.", 'buddypress');
         return;
     }
@@ -118 +118 @@
     } else {
         $result['message'] = '<img src="' . $bp['friends']['image_base'] . '/warning.gif" alt="Warning" /> &nbsp;' . $result['message'];
-        echo "-1[[SPLIT]]" . __("No site users matched your search.");
+        echo "-1[[SPLIT]]" . __("No site users matched your search.", 'buddypress');
     }
 }
@@ -134 +134 @@
     if ( BP_Friends_Friendship::check_is_friend( $bp['loggedin_userid'], $_POST['fid'] ) == 'is_friend' ) {
         if ( !friends_remove_friend( $bp['loggedin_userid'], $bp['current_userid'] ) ) {
-            echo __("Friendship could not be canceled.");
+            echo __("Friendship could not be canceled.", 'buddypress');
         } else {
             friends_update_friend_totals( $bp['loggedin_userid'], $bp['current_userid'], 'remove' );
-            echo __('Add Friend');
+            echo __('Add Friend', 'buddypress');
         }
     } else if ( BP_Friends_Friendship::check_is_friend( $bp['loggedin_userid'], $_POST['fid'] ) == 'not_friends' ) {
         if ( !friends_add_friend( $bp['loggedin_userid'], $_POST['fid'] ) ) {
-            echo __("Friendship could not be requested.");
+            echo __("Friendship could not be requested.", 'buddypress');
         } else {
-            echo __('Friendship Requested');
+            echo __('Friendship Requested', 'buddypress');
         }
     } else {
-        echo __('Request Pending');
+        echo __('Request Pending', 'buddypress');
     }
     

trunk/bp-friends/bp-friends-templatetags.php

@@ -242 +242 @@
     
     if ( $friends_template->friendship->date_created != "0000-00-00 00:00:00" ) {
-        echo __('requested') . ' ' . bp_core_time_since( strtotime( $friends_template->friendship->date_created ) ) . ' ' . __('ago');
+        echo __('requested', 'buddypress') . ' ' . bp_core_time_since( strtotime( $friends_template->friendship->date_created ) ) . ' ' . __('ago', 'buddypress');
     }
 }
@@ -268 +268 @@
     if ( $bp['current_action'] == 'my-friends' || !$bp['current_action'] ) {
         $action = $bp['current_domain'] . $bp['friends']['slug'] . '/my-friends/search/';
-        $label = __('Filter Friends');
+        $label = __('Filter Friends', 'buddypress');
         $type = 'friend';
     } else {
         $action = $bp['current_domain'] . $bp['friends']['slug'] . '/friend-finder/search/';
-        $label = __('Find Friends');
+        $label = __('Find Friends', 'buddypress');
         $type = 'finder';
         $value = $bp['action_variables'][1];
@@ -326 +326 @@
         echo '<div class="friendship-button" id="friendship-button-' . $potential_friend_id . '">';
         if ( $friend_status == 'pending' ) {
-            _e('Friendship Requested');
+            _e('Friendship Requested', 'buddypress');
         } else if ( $friend_status == 'is_friend') {
-            echo '<a href="' . $bp['loggedin_domain'] . $bp['friends']['slug'] . '/remove-friend/' . $potential_friend_id . '" title="' . __('Cancel Friendship') . '" id="friend-' . $potential_friend_id . '" rel="remove" class="remove">' . __('Cancel Friendship') . '</a>';
+            echo '<a href="' . $bp['loggedin_domain'] . $bp['friends']['slug'] . '/remove-friend/' . $potential_friend_id . '" title="' . __('Cancel Friendship', 'buddypress') . '" id="friend-' . $potential_friend_id . '" rel="remove" class="remove">' . __('Cancel Friendship', 'buddypress') . '</a>';
         } else {
-            echo '<a href="' . $bp['loggedin_domain'] . $bp['friends']['slug'] . '/add-friend/' . $potential_friend_id . '" title="' . __('Add Friend') . '" id="friend-' . $potential_friend_id . '" rel="add">' . __('Add Friend') . '</a>';
+            echo '<a href="' . $bp['loggedin_domain'] . $bp['friends']['slug'] . '/add-friend/' . $potential_friend_id . '" title="' . __('Add Friend', 'buddypress') . '" id="friend-' . $potential_friend_id . '" rel="add">' . __('Add Friend', 'buddypress') . '</a>';
         }
         echo '</div>';
@@ -345 +345 @@
 ?>  
     <div class="info-group">
-        <h4><?php bp_my_or_name() ?> <?php _e('Friends') ?> (<?php echo BP_Friends_Friendship::total_friend_count() ?>)  <a href="<?php echo $bp['current_domain'] . $bp['friends']['slug'] ?>"><?php _e('See All') ?> &raquo;</a></h4>
+        <h4><?php bp_my_or_name() ?> <?php _e('Friends', 'buddypress') ?> (<?php echo BP_Friends_Friendship::total_friend_count() ?>)  <a href="<?php echo $bp['current_domain'] . $bp['friends']['slug'] ?>"><?php _e('See All', 'buddypress') ?> &raquo;</a></h4>
         
         <?php if ( $friend_ids ) { ?>
@@ -358 +358 @@
         <?php } else { ?>
             <div id="message" class="info">
-                <p><?php bp_you_or_name() ?> <?php _e('added any friend connections yet.') ?></p>
+                <p><?php bp_you_or_name() ?> <?php _e('added any friend connections yet.', 'buddypress') ?></p>
             </div>
         <?php } ?>

trunk/bp-groups.php

@@ -164 +164 @@
 
     /* Add 'Groups' to the main navigation */
-    bp_core_add_nav_item( __('Groups'), $bp['groups']['slug'] );
+    bp_core_add_nav_item( __('Groups', 'buddypress'), $bp['groups']['slug'] );
     bp_core_add_nav_default( $bp['groups']['slug'], 'groups_screen_my_groups', 'my-groups' );
         
@@ -170 +170 @@
     
     /* Add the subnav items to the groups nav item */
-    bp_core_add_subnav_item( $bp['groups']['slug'], 'my-groups', __('My Groups'), $groups_link, 'groups_screen_my_groups' );
-    bp_core_add_subnav_item( $bp['groups']['slug'], 'group-finder', __('Group Finder'), $groups_link, 'groups_screen_group_finder' );
-    bp_core_add_subnav_item( $bp['groups']['slug'], 'create', __('Create a Group'), $groups_link, 'groups_screen_create_group' );
-    bp_core_add_subnav_item( $bp['groups']['slug'], 'invites', __('Invites'), $groups_link, 'groups_screen_group_invites' );
+    bp_core_add_subnav_item( $bp['groups']['slug'], 'my-groups', __('My Groups', 'buddypress'), $groups_link, 'groups_screen_my_groups' );
+    bp_core_add_subnav_item( $bp['groups']['slug'], 'group-finder', __('Group Finder', 'buddypress'), $groups_link, 'groups_screen_group_finder' );
+    bp_core_add_subnav_item( $bp['groups']['slug'], 'create', __('Create a Group', 'buddypress'), $groups_link, 'groups_screen_create_group' );
+    bp_core_add_subnav_item( $bp['groups']['slug'], 'invites', __('Invites', 'buddypress'), $groups_link, 'groups_screen_group_invites' );
     
     if ( $bp['current_component'] == $bp['groups']['slug'] ) {
@@ -179 +179 @@
         if ( bp_is_home() && !$is_single_group ) {
             
-            $bp['bp_options_title'] = __('My Groups');
+            $bp['bp_options_title'] = __('My Groups', 'buddypress');
             
         } else if ( !bp_is_home() && !$is_single_group ) {
@@ -208 +208 @@
             bp_core_add_nav_default( $bp['groups']['slug'], 'groups_screen_group_home', 'home' );
             
-            bp_core_add_subnav_item( $bp['groups']['slug'], 'home', __('Home'), $group_link, 'groups_screen_group_home', 'group-home' );
-            bp_core_add_subnav_item( $bp['groups']['slug'], 'forum', __('Forum'), $group_link , 'groups_screen_group_forum', 'group-forum');
+            bp_core_add_subnav_item( $bp['groups']['slug'], 'home', __('Home', 'buddypress'), $group_link, 'groups_screen_group_home', 'group-home' );
+            bp_core_add_subnav_item( $bp['groups']['slug'], 'forum', __('Forum', 'buddypress'), $group_link , 'groups_screen_group_forum', 'group-forum');
             
             if ( function_exists('bp_wire_install') ) {
-                bp_core_add_subnav_item( $bp['groups']['slug'], 'wire', __('Wire'), $group_link, 'groups_screen_group_wire', 'group-wire' );
+                bp_core_add_subnav_item( $bp['groups']['slug'], 'wire', __('Wire', 'buddypress'), $group_link, 'groups_screen_group_wire', 'group-wire' );
             }
             
             if ( function_exists('bp_gallery_install') ) {
-                bp_core_add_subnav_item( $bp['groups']['slug'], 'photos', __('Photos'), $group_link, 'groups_screen_group_photos', 'group-photos' );
+                bp_core_add_subnav_item( $bp['groups']['slug'], 'photos', __('Photos', 'buddypress'), $group_link, 'groups_screen_group_photos', 'group-photos' );
             }
             
-            bp_core_add_subnav_item( $bp['groups']['slug'], 'members', __('Members'), $group_link, 'groups_screen_group_members', 'group-members' );
+            bp_core_add_subnav_item( $bp['groups']['slug'], 'members', __('Members', 'buddypress'), $group_link, 'groups_screen_group_members', 'group-members' );
             
             if ( is_user_logged_in() && groups_is_user_member( $bp['loggedin_userid'], $group_obj->id ) ) {
-                bp_core_add_subnav_item( $bp['groups']['slug'], 'send-invites', __('Send Invites'), $group_link, 'groups_screen_group_invite', 'group-invite' );
-                bp_core_add_subnav_item( $bp['groups']['slug'], 'leave-group', __('Leave Group'), $group_link, 'groups_screen_group_leave', 'group-leave' );
+                bp_core_add_subnav_item( $bp['groups']['slug'], 'send-invites', __('Send Invites', 'buddypress'), $group_link, 'groups_screen_group_invite', 'group-invite' );
+                bp_core_add_subnav_item( $bp['groups']['slug'], 'leave-group', __('Leave Group', 'buddypress'), $group_link, 'groups_screen_group_leave', 'group-leave' );
             }
         }
@@ -279 +279 @@
 
         if ( $member->save() ) {
-            $bp['message'] = __('Group invite accepted');
+            $bp['message'] = __('Group invite accepted', 'buddypress');
             $bp['message_type'] = 'success';
         } else {
-            $bp['message'] = __('Group invite could not be accepted');
+            $bp['message'] = __('Group invite could not be accepted', 'buddypress');
             $bp['message_type'] = 'error';                  
         }
@@ -288 +288 @@
     } else if ( isset($bp['action_variables']) && in_array( 'reject', $bp['action_variables'] ) && is_numeric($bp['action_variables'][1]) ) {
         if ( BP_Groups_Member::delete( $bp['loggedin_userid'], $bp['action_variables'][1] ) ) {
-            $bp['message'] = __('Group invite rejected');
+            $bp['message'] = __('Group invite rejected', 'buddypress');
             $bp['message_type'] = 'success';
         } else {
-            $bp['message'] = __('Group invite could not be rejected');
+            $bp['message'] = __('Group invite could not be rejected', 'buddypress');
             $bp['message_type'] = 'error';              
         }
@@ -326 +326 @@
         } else {
             if ( !$group_obj_id = &groups_manage_group( $create_group_step, $_COOKIE['group_obj_id'] ) ) {
-                $bp['message'] = __('There was an error saving group details. Please try again.');
+                $bp['message'] = __('There was an error saving group details. Please try again.', 'buddypress');
                 $bp['message_type'] = 'error';
         
@@ -373 +373 @@
                 bp_catch_uri( 'groups/group-home' );
             } else {
-                $bp['message'] = __('Wire message successfully posted.');
+                $bp['message'] = __('Wire message successfully posted.', 'buddypress');
                 $bp['message_type'] = 'success';
 
@@ -390 +390 @@
                 bp_catch_uri( 'groups/group-home' );
             } else {
-                $bp['message'] = __('Wire message successfully deleted.');
+                $bp['message'] = __('Wire message successfully deleted.', 'buddypress');
                 $bp['message_type'] = 'success';
 
@@ -438 +438 @@
             groups_send_invites($group_obj);
             
-            $bp['message'] = __('Group invites sent.');
+            $bp['message'] = __('Group invites sent.', 'buddypress');
             $bp['message_type'] = 'success';
             
@@ -458 +458 @@
             // remove the user from the group.
             if ( !groups_leave_group( $group_obj->id ) ) {
-                $bp['message'] = __('There was an error leaving the group. Please try again.');
+                $bp['message'] = __('There was an error leaving the group. Please try again.', 'buddypress');
                 $bp['message_type'] = 'error';                                      
             } else {
-                $bp['message'] = __('You left the group successfully.');
+                $bp['message'] = __('You left the group successfully.', 'buddypress');
                 $bp['message_type'] = 'success';    
             }
@@ -490 +490 @@
     if ( !BP_Groups_Member::check_is_member( $bp['loggedin_userid'], $group_obj->id ) ) {
         if ( !groups_join_group($group_obj->id) ) {
-            $bp['message'] = __('There was an error joining the group. Please try again.');
+            $bp['message'] = __('There was an error joining the group. Please try again.', 'buddypress');
             $bp['message_type'] = 'error';
         } else {
-            $bp['message'] = __('You joined the group!');
+            $bp['message'] = __('You joined the group!', 'buddypress');
             $bp['message_type'] = 'success';    
         }
@@ -540 +540 @@
                 return false;
                 
-            return bp_core_get_userlink($bp['current_userid']) . ' ' . __('joined the group') . ' ' . '<a href="' . $bp['current_domain'] . $bp['groups']['slug'] . '/' . $group->slug . '">' . $group->name . '</a>. <span class="time-since">%s</span>';
+            return bp_core_get_userlink($bp['current_userid']) . ' ' . __('joined the group', 'buddypress') . ' ' . '<a href="' . $bp['current_domain'] . $bp['groups']['slug'] . '/' . $group->slug . '">' . $group->name . '</a>. <span class="time-since">%s</span>';
         break;
         case 'created_group':
@@ -548 +548 @@
                 return false;
                 
-            return bp_core_get_userlink($bp['current_userid']) . ' ' . __('created the group') . ' ' . '<a href="' . $bp['current_domain'] . $bp['groups']['slug'] . '/' . $group->slug . '">' . $group->name . '</a>. <span class="time-since">%s</span>';
+            return bp_core_get_userlink($bp['current_userid']) . ' ' . __('created the group', 'buddypress') . ' ' . '<a href="' . $bp['current_domain'] . $bp['groups']['slug'] . '/' . $group->slug . '">' . $group->name . '</a>. <span class="time-since">%s</span>';
         break;
         case 'new_wire_post':
@@ -557 +557 @@
                 return false;       
                     
-            $content = bp_core_get_userlink($bp['current_userid']) . ' ' . __('wrote on the wire of the group') . ' ' . '<a href="' . $bp['current_domain'] . $bp['groups']['slug'] . '/' . $group->slug . '">' . $group->name . '</a>: <span class="time-since">%s</span>';            
+            $content = bp_core_get_userlink($bp['current_userid']) . ' ' . __('wrote on the wire of the group', 'buddypress') . ' ' . '<a href="' . $bp['current_domain'] . $bp['groups']['slug'] . '/' . $group->slug . '">' . $group->name . '</a>: <span class="time-since">%s</span>';          
             $content .= '<blockquote>' . bp_create_excerpt($wire_post->content) . '</blockquote>';
             return $content;
@@ -617 +617 @@
     // Set friendly error feedback.
     $uploadErrors = array(
-            0 => __("There is no error, the file uploaded with success"), 
-            1 => __("The uploaded file exceeds the upload_max_filesize directive in php.ini"), 
-            2 => __("The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form"),
-            3 => __("The uploaded file was only partially uploaded"),
-            4 => __("No file was uploaded"),
-            6 => __("Missing a temporary folder")
+            0 => __("There is no error, the file uploaded with success", 'buddypress'), 
+            1 => __("The uploaded file exceeds the upload_max_filesize directive in php.ini", 'buddypress'), 
+            2 => __("The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form", 'buddypress'),
+            3 => __("The uploaded file was only partially uploaded", 'buddypress'),
+            4 => __("No file was uploaded", 'buddypress'),
+            6 => __("Missing a temporary folder", 'buddypress')
     );
 
     if ( !bp_core_check_avatar_upload($file) ) {
         $avatar_error = true;
-        $avatar_error_msg = __('Your group avatar upload failed, please try again. Error was: ' . $uploadErrors[$file['file']['error']] );
+        $avatar_error_msg = __('Your group avatar upload failed, please try again. Error was: ' . $uploadErrors[$file['file']['error']] , 'buddypress');
     }
 
@@ -633 +633 @@
         $avatar_error = true;
         $avatar_size = size_format(1024 * CORE_MAX_FILE_SIZE);
-        $avatar_error_msg = __('The file you uploaded is too big. Please upload a file under') . size_format(1024 * CORE_MAX_FILE_SIZE);
+        $avatar_error_msg = __('The file you uploaded is too big. Please upload a file under', 'buddypress') . size_format(1024 * CORE_MAX_FILE_SIZE);
     }
     
     else if ( !bp_core_check_avatar_type($file) ) {
         $avatar_error = true;
-        $avatar_error_msg = __('Please upload only JPG, GIF or PNG photos.');       
+        $avatar_error_msg = __('Please upload only JPG, GIF or PNG photos.', 'buddypress');     
     }
 
@@ -644 +644 @@
     else if ( !$original = bp_core_handle_avatar_upload($file) ) {
         $avatar_error = true;
-        $avatar_error_msg = __('Upload Failed! Your photo dimensions are likely too big.');                     
+        $avatar_error_msg = __('Upload Failed! Your photo dimensions are likely too big.', 'buddypress');                       
     }
 
     else if ( !bp_core_check_avatar_dimensions($original) ) {
         $avatar_error = true;
-        $avatar_error_msg = sprintf( __('The image you upload must have dimensions of %d x %d pixels or larger.'), CORE_CROPPING_CANVAS_MAX, CORE_CROPPING_CANVAS_MAX );
+        $avatar_error_msg = sprintf( __('The image you upload must have dimensions of %d x %d pixels or larger.', 'buddypress'), CORE_CROPPING_CANVAS_MAX, CORE_CROPPING_CANVAS_MAX );
     }
     
@@ -722 +722 @@
                     $admin = new BP_Groups_Member( $bp['loggedin_userid'], $group->id );
                     $admin->is_admin = 1;
-                    $admin->user_title = __('Group Admin');
+                    $admin->user_title = __('Group Admin', 'buddypress');
                     $admin->date_modified = time();
                     $admin->inviter_id = 0;
@@ -897 +897 @@
         $message .= "Reject the invite: " . $invited_user->user_url . $bp['groups']['slug'] . "/invites/reject/" . $group_obj->id . "\n";
 
-        wp_mail( $invited_user->email, __("New Group Invitation:") . $group_obj->name, $message, "From: noreply@" . $_SERVER[ 'HTTP_HOST' ]  );
+        wp_mail( $invited_user->email, __("New Group Invitation:", 'buddypress') . $group_obj->name, $message, "From: noreply@" . $_SERVER[ 'HTTP_HOST' ]  );
     }
 

trunk/bp-groups/bp-groups-ajax.php

@@ -95 +95 @@
                 <h4>
                     <a href="<?php bp_group_permalink( $group ) ?>"><?php echo $group->name ?></a>
-                    <span class="small"> - <?php echo $group->total_member_count . ' ' . __('members') ?></span>
+                    <span class="small"> - <?php echo $group->total_member_count . ' ' . __('members', 'buddypress') ?></span>
                 </h4>
                 <p class="desc"><?php echo bp_create_excerpt( $group->description, 20 ) ?></p>
@@ -104 +104 @@
     } else {
         $result['message'] = '<img src="' . $bp['groups']['image_base'] . '/warning.gif" alt="Warning" /> &nbsp;' . $result['message'];
-        echo "-1[[SPLIT]]" . __("No groups matched your search.");
+        echo "-1[[SPLIT]]" . __("No groups matched your search.", 'buddypress');
     }
 }
@@ -151 +151 @@
                 <h4>
                     <a href="<?php bp_group_permalink( $group ) ?>"><?php echo $group->name ?></a>
-                    <span class="small"> - <?php echo $group->total_member_count . ' ' . __('members') ?></span>
+                    <span class="small"> - <?php echo $group->total_member_count . ' ' . __('members', 'buddypress') ?></span>
                 </h4>
                 <p class="desc"><?php echo bp_create_excerpt( $group->description, 20 ) ?></p>
@@ -160 +160 @@
     } else {
         $result['message'] = '<img src="' . $bp['groups']['image_base'] . '/warning.gif" alt="Warning" /> &nbsp;' . $result['message'];
-        echo "-1[[SPLIT]]" . __("No groups matched your search.");
+        echo "-1[[SPLIT]]" . __("No groups matched your search.", 'buddypress');
     }
 }
@@ -205 +205 @@
                             <?php 
                             if ( $_POST['filter'] == 'newest-groups') {
-                                echo bp_core_get_last_activity( $group->date_created, __('created '), __(' ago') );
+                                echo bp_core_get_last_activity( $group->date_created, __('created ', 'buddypress'), __(' ago', 'buddypress') );
                             } else if ( $_POST['filter'] == 'recently-active-groups') {
-                                echo bp_core_get_last_activity( groups_get_groupmeta( $group->id, 'last_activity' ), __('active '), __(' ago') );
+                                echo bp_core_get_last_activity( groups_get_groupmeta( $group->id, 'last_activity' ), __('active ', 'buddypress'), __(' ago', 'buddypress') );
                             } else if ( $_POST['filter'] == 'popular-groups') {
                                 if ( $group->total_member_count == 1 )
-                                    echo $group->total_member_count . __(' member');
+                                    echo $group->total_member_count . __(' member', 'buddypress');
                                 else
-                                    echo $group->total_member_count . __(' members');
+                                    echo $group->total_member_count . __(' members', 'buddypress');
                             }
                             ?>
@@ -222 +222 @@
         }
     } else {
-        echo "-1[[SPLIT]]<li>" . __("No groups matched the current filter.");
+        echo "-1[[SPLIT]]<li>" . __("No groups matched the current filter.", 'buddypress');
     }
 }

trunk/bp-groups/bp-groups-templatetags.php

@@ -141 +141 @@
 function bp_group_type() {
     global $groups_template;
-    echo ucwords($groups_template->group->status) . ' ' . __('Group');  
+    echo ucwords($groups_template->group->status) . ' ' . __('Group', 'buddypress');    
 }
 
@@ -205 +205 @@
     
     if ( $groups_template->group->is_public ) {
-        _e('Public');
+        _e('Public', 'buddypress');
     } else {
-        _e('Private');
+        _e('Private', 'buddypress');
     }
 }
@@ -219 +219 @@
     
     if ( $groups_template->group->is_invitation_only ) {
-        _e('Invitation Only');
+        _e('Invitation Only', 'buddypress');
     } else {
-        _e('Open');
+        _e('Open', 'buddypress');
     }
 }
@@ -280 +280 @@
     if ( $bp['current_action'] == 'my-groups' || !$bp['current_action'] ) {
         $action = $bp['loggedin_domain'] . $bp['groups']['slug'] . '/my-groups/search/';
-        $label = __('Filter Groups');
+        $label = __('Filter Groups', 'buddypress');
         $type = 'group';
     } else {
         $action = $bp['loggedin_domain'] . $bp['groups']['slug'] . '/group-finder/search/';
-        $label = __('Find a Group');
+        $label = __('Find a Group', 'buddypress');
         $type = 'groupfinder';
         $value = $bp['action_variables'][1];
@@ -323 +323 @@
     global $bp, $create_group_step, $completed_to_step;
 ?>
-    <li<?php if ( $create_group_step == '1' ) : ?> class="current"<?php endif; ?>><a href="<?php echo $bp['current_domain'] . $bp['groups']['slug'] ?>/create/step/1">1. <?php _e('Group Details') ?></a></li>
-    <li<?php if ( $create_group_step == '2' ) : ?> class="current"<?php endif; ?>><?php if ( $completed_to_step > 0 ) { ?><a href="<?php echo $bp['current_domain'] . $bp['groups']['slug'] ?>/create/step/2">2. <?php _e('Group Settings') ?></a><?php } else { ?><span>2. <?php _e('Group Settings') ?></span><?php } ?></li>
-    <li<?php if ( $create_group_step == '3' ) : ?> class="current"<?php endif; ?>><?php if ( $completed_to_step > 1 ) { ?><a href="<?php echo $bp['current_domain'] . $bp['groups']['slug'] ?>/create/step/3">3. <?php _e('Group Avatar') ?></a><?php } else { ?><span>3. <?php _e('Group Avatar') ?></span><?php } ?></li>
-    <li<?php if ( $create_group_step == '4' ) : ?> class="current"<?php endif; ?>><?php if ( $completed_to_step > 2 ) { ?><a href="<?php echo $bp['current_domain'] . $bp['groups']['slug'] ?>/create/step/4">4. <?php _e('Invite Members') ?></a><?php } else { ?><span>4. <?php _e('Invite Members') ?></span><?php } ?></li>
+    <li<?php if ( $create_group_step == '1' ) : ?> class="current"<?php endif; ?>><a href="<?php echo $bp['current_domain'] . $bp['groups']['slug'] ?>/create/step/1">1. <?php _e('Group Details', 'buddypress') ?></a></li>
+    <li<?php if ( $create_group_step == '2' ) : ?> class="current"<?php endif; ?>><?php if ( $completed_to_step > 0 ) { ?><a href="<?php echo $bp['current_domain'] . $bp['groups']['slug'] ?>/create/step/2">2. <?php _e('Group Settings', 'buddypress') ?></a><?php } else { ?><span>2. <?php _e('Group Settings', 'buddypress') ?></span><?php } ?></li>
+    <li<?php if ( $create_group_step == '3' ) : ?> class="current"<?php endif; ?>><?php if ( $completed_to_step > 1 ) { ?><a href="<?php echo $bp['current_domain'] . $bp['groups']['slug'] ?>/create/step/3">3. <?php _e('Group Avatar', 'buddypress') ?></a><?php } else { ?><span>3. <?php _e('Group Avatar', 'buddypress') ?></span><?php } ?></li>
+    <li<?php if ( $create_group_step == '4' ) : ?> class="current"<?php endif; ?>><?php if ( $completed_to_step > 2 ) { ?><a href="<?php echo $bp['current_domain'] . $bp['groups']['slug'] ?>/create/step/4">4. <?php _e('Invite Members', 'buddypress') ?></a><?php } else { ?><span>4. <?php _e('Invite Members', 'buddypress') ?></span><?php } ?></li>
 <?php
 }
@@ -335 +335 @@
     switch( $create_group_step ) {
         case '1':
-            echo '<span>&mdash; ' . __('Group Details') . '</span>';
+            echo '<span>&mdash; ' . __('Group Details', 'buddypress') . '</span>';
         break;
         
         case '2':
-            echo '<span>&mdash; ' . __('Group Settings') . '</span>';       
+            echo '<span>&mdash; ' . __('Group Settings', 'buddypress') . '</span>';     
         break;
         
         case '3':
-            echo '<span>&mdash; ' . __('Group Avatar') . '</span>';
+            echo '<span>&mdash; ' . __('Group Avatar', 'buddypress') . '</span>';
         break;
         
         case '4':
-            echo '<span>&mdash; ' . __('Invite Members') . '</span>';
+            echo '<span>&mdash; ' . __('Invite Members', 'buddypress') . '</span>';
         break;
     }
@@ -360 +360 @@
     <?php switch( $create_group_step ) {
         case '1': ?>
-            <label for="group-name">* <?php _e('Group Name') ?></label>
+            <label for="group-name">* <?php _e('Group Name', 'buddypress') ?></label>
             <input type="text" name="group-name" id="group-name" value="<?php echo ( $group_obj ) ? $group_obj->name : $_POST['group-name']; ?>" />
         
-            <label for="group-desc">* <?php _e('Group Description') ?></label>
+            <label for="group-desc">* <?php _e('Group Description', 'buddypress') ?></label>
             <textarea name="group-desc" id="group-desc"><?php echo ( $group_obj ) ? $group_obj->description : $_POST['group-desc']; ?></textarea>
         
-            <label for="group-news">* <?php _e('Recent News') ?></label>
+            <label for="group-news">* <?php _e('Recent News', 'buddypress') ?></label>
             <textarea name="group-news" id="group-news"><?php echo ( $group_obj ) ? $group_obj->news : $_POST['group-news']; ?></textarea>
             
-            <input type="submit" value="<?php _e('Save and Continue') ?> &raquo;" id="save" name="save" />
+            <input type="submit" value="<?php _e('Save and Continue', 'buddypress') ?> &raquo;" id="save" name="save" />
         <?php break; ?>
         
@@ -375 +375 @@
             <?php if ( $completed_to_step > 0 ) { ?>
                 <div class="checkbox">
-                    <label><input type="checkbox" name="group-show-wire" id="group-show-wire" value="1"<?php if ( $group_obj->enable_wire ) { ?> checked="checked"<?php } ?> /> <?php _e('Enable comment wire') ?></label>
+                    <label><input type="checkbox" name="group-show-wire" id="group-show-wire" value="1"<?php if ( $group_obj->enable_wire ) { ?> checked="checked"<?php } ?> /> <?php _e('Enable comment wire', 'buddypress') ?></label>
                 </div>
                 <div class="checkbox">
-                    <label><input type="checkbox" name="group-show-forum" id="group-show-forum" value="1"<?php if ( $group_obj->enable_forum ) { ?> checked="checked"<?php } ?> /> <?php _e('Enable discussion forum') ?></label>
+                    <label><input type="checkbox" name="group-show-forum" id="group-show-forum" value="1"<?php if ( $group_obj->enable_forum ) { ?> checked="checked"<?php } ?> /> <?php _e('Enable discussion forum', 'buddypress') ?></label>
                 </div>
                 <div class="checkbox with-suboptions">
-                    <label><input type="checkbox" name="group-show-photos" id="group-show-photos" value="1"<?php if ( $group_obj->enable_photos ) { ?> checked="checked"<?php } ?> /> <?php _e('Enable photo gallery') ?></label>
+                    <label><input type="checkbox" name="group-show-photos" id="group-show-photos" value="1"<?php if ( $group_obj->enable_photos ) { ?> checked="checked"<?php } ?> /> <?php _e('Enable photo gallery', 'buddypress') ?></label>
                     <div class="sub-options"<?php if ( !$group_obj->enable_photos ) { ?> style="display: none;"<?php } ?>>
-                        <label><input type="radio" name="group-photos-status" value="all"<?php if ( !$group_obj->photos_admin_only ) { ?> checked="checked"<?php } ?> /> <?php _e('All members can upload photos') ?></label>
-                        <label><input type="radio" name="group-photos-status" value="admins"<?php if ( $group_obj->photos_admin_only ) { ?> checked="checked"<?php } ?> /> <?php _e('Only group admins can upload photos') ?></label>
+                        <label><input type="radio" name="group-photos-status" value="all"<?php if ( !$group_obj->photos_admin_only ) { ?> checked="checked"<?php } ?> /> <?php _e('All members can upload photos', 'buddypress') ?></label>
+                        <label><input type="radio" name="group-photos-status" value="admins"<?php if ( $group_obj->photos_admin_only ) { ?> checked="checked"<?php } ?> /> <?php _e('Only group admins can upload photos', 'buddypress') ?></label>
                     </div>
                 </div>
             
-                <h3><?php _e('Privacy Options'); ?></h3>
+                <h3><?php _e('Privacy Options', 'buddypress'); ?></h3>
             
                 <div class="radio">
-                    <label><input type="radio" name="group-status" value="public"<?php if ( $group_obj->status == 'public' ) { ?> checked="checked"<?php } ?> /> <strong><?php _e('This is an open group') ?></strong><br /><?php _e('This group will be free to join and will appear in group search results.'); ?></label>
-                    <label><input type="radio" name="group-status" value="private"<?php if ( $group_obj->status == 'private' ) { ?> checked="checked"<?php } ?> /> <strong><?php _e('This is a closed group') ?></strong><br /><?php _e('This group will require an invite to join but will still appear in group search results.'); ?></label>
-                    <label><input type="radio" name="group-status" value="hidden"<?php if ( $group_obj->status == 'hidden' ) { ?> checked="checked"<?php } ?> /> <strong><?php _e('This is a hidden group') ?></strong><br /><?php _e('This group will require an invite to join and will only be visible to invited members. It will not appear in search results or on member profiles.'); ?></label>
-                </div>
-
-                <input type="submit" value="<?php _e('Save and Continue') ?> &raquo;" id="save" name="save" />
+                    <label><input type="radio" name="group-status" value="public"<?php if ( $group_obj->status == 'public' ) { ?> checked="checked"<?php } ?> /> <strong><?php _e('This is an open group', 'buddypress') ?></strong><br /><?php _e('This group will be free to join and will appear in group search results.', 'buddypress'); ?></label>
+                    <label><input type="radio" name="group-status" value="private"<?php if ( $group_obj->status == 'private' ) { ?> checked="checked"<?php } ?> /> <strong><?php _e('This is a closed group', 'buddypress') ?></strong><br /><?php _e('This group will require an invite to join but will still appear in group search results.', 'buddypress'); ?></label>
+                    <label><input type="radio" name="group-status" value="hidden"<?php if ( $group_obj->status == 'hidden' ) { ?> checked="checked"<?php } ?> /> <strong><?php _e('This is a hidden group', 'buddypress') ?></strong><br /><?php _e('This group will require an invite to join and will only be visible to invited members. It will not appear in search results or on member profiles.', 'buddypress'); ?></label>
+                </div>
+
+                <input type="submit" value="<?php _e('Save and Continue', 'buddypress') ?> &raquo;" id="save" name="save" />
             <?php } else { ?>
                 <div id="message" class="info">
@@ -415 +415 @@
                 
                 <div class="main-column">
-                    <p><?php _e("Upload an image to use as an avatar for this group. The image will be shown on the main group page, and in search results.") ?></p>
+                    <p><?php _e("Upload an image to use as an avatar for this group. The image will be shown on the main group page, and in search results.", 'buddypress') ?></p>
                     
                     <?php
@@ -426 +426 @@
                     
                     <div id="skip-continue">
-                        <input type="submit" value="<?php _e('Skip') ?> &raquo;" id="skip" name="skip" />
+                        <input type="submit" value="<?php _e('Skip', 'buddypress') ?> &raquo;" id="skip" name="skip" />
                     </div>
                 </div>
@@ -543 +543 @@
         
         <div id="message" class="info">
-            <p><?php _e('Select people to invite from your friends list.'); ?></p>
+            <p><?php _e('Select people to invite from your friends list.', 'buddypress'); ?></p>
         </div>
                 
@@ -561 +561 @@
         </ul>
 
-        <input type="submit" value="<?php _e('Finish &amp; Send Invites') ?> &raquo;" id="save" name="save" />
+        <input type="submit" value="<?php _e('Finish &amp; Send Invites', 'buddypress') ?> &raquo;" id="save" name="save" />
 
     </div>
@@ -577 +577 @@
     
     if ( is_user_logged_in() && !BP_Groups_Member::check_is_member( $bp['loggedin_userid'], $groups_template->group->id ) ) {
-        echo '<a class="join-group" href="' . bp_group_permalink( false, false ) . '/join">' . __('Join Group') . '</a>';
+        echo '<a class="join-group" href="' . bp_group_permalink( false, false ) . '/join">' . __('Join Group', 'buddypress') . '</a>';
     }
 }
@@ -587 +587 @@
 ?>  
     <div class="info-group">
-        <h4><?php bp_my_or_name() ?> <?php _e('Groups') ?> (<?php echo BP_Groups_Member::total_group_count() ?>) <a href="<?php echo $bp['current_domain'] . $bp['groups']['slug'] ?>"><?php _e('See All') ?> &raquo;</a></h4>
+        <h4><?php bp_my_or_name() ?> <?php _e('Groups', 'buddypress') ?> (<?php echo BP_Groups_Member::total_group_count() ?>) <a href="<?php echo $bp['current_domain'] . $bp['groups']['slug'] ?>"><?php _e('See All', 'buddypress') ?> &raquo;</a></h4>
         <?php if ( $group_ids ) { ?>
             <ul class="horiz-gallery">
@@ -600 +600 @@
         <?php } else { ?>
             <div id="message" class="info">
-                <p><?php bp_you_or_name() ?> <?php _e('joined any groups yet.') ?></p>
+                <p><?php bp_you_or_name() ?> <?php _e('joined any groups yet.', 'buddypress') ?></p>
             </div>
         <?php } ?>

trunk/bp-groups/bp-groups-widgets.php

@@ -9 +9 @@
         
         /* Site welcome widget */
-        register_sidebar_widget( __('Groups'), 'groups_widget_groups_list');
-        register_widget_control( __('Groups'), 'groups_widget_groups_list_control' );
+        register_sidebar_widget( __('Groups', 'buddypress'), 'groups_widget_groups_list');
+        register_widget_control( __('Groups', 'buddypress'), 'groups_widget_groups_list_control' );
         
         /* Include the javascript needed for activated widgets only */
@@ -38 +38 @@
         <div class="item-options" id="groups-list-options">
             <img id="ajax-loader-groups" src="<?php echo $bp['groups']['image_base'] ?>/ajax-loader.gif" height="7" alt="Loading" style="display: none;" /> &nbsp;
-            <a href="<?php echo site_url() . '/groups' ?>" id="newest-groups"><?php _e("Newest") ?></a> | 
-            <a href="<?php echo site_url() . '/groups' ?>" id="recently-active-groups"><?php _e("Active") ?></a> | 
-            <a href="<?php echo site_url() . '/groups' ?>" id="popular-groups" class="selected"><?php _e("Popular") ?></a>
+            <a href="<?php echo site_url() . '/groups' ?>" id="newest-groups"><?php _e("Newest", 'buddypress') ?></a> | 
+            <a href="<?php echo site_url() . '/groups' ?>" id="recently-active-groups"><?php _e("Active", 'buddypress') ?></a> | 
+            <a href="<?php echo site_url() . '/groups' ?>" id="popular-groups" class="selected"><?php _e("Popular", 'buddypress') ?></a>
         </div>
         <ul id="groups-list" class="item-list">
@@ -56 +56 @@
                             <?php 
                             if ( $group->total_member_count == 1 )
-                                echo $group->total_member_count . __(' member');
+                                echo $group->total_member_count . __(' member', 'buddypress');
                             else
-                                echo $group->total_member_count . __(' members');
+                                echo $group->total_member_count . __(' members', 'buddypress');
                             ?>
                         </span></div>
@@ -76 +76 @@
     <?php else: ?>
         <div class="widget-error">
-            <?php _e('There are no groups to display.') ?>
+            <?php _e('There are no groups to display.', 'buddypress') ?>
         </div>
     <?php endif; ?>
@@ -100 +100 @@
     $max_groups = attribute_escape( $options['max_groups'] );
 ?>
-        <p><label for="groups-widget-groups-list-max"><?php _e('Maximum number of groups to show:'); ?><br /> <input class="widefat" id="groups-widget-groups-list-max" name="groups-widget-groups-list-max" type="text" value="<?php echo $max_groups; ?>" style="width: 30%" /></label></p>
+        <p><label for="groups-widget-groups-list-max"><?php _e('Maximum number of groups to show:', 'buddypress'); ?><br /> <input class="widefat" id="groups-widget-groups-list-max" name="groups-widget-groups-list-max" type="text" value="<?php echo $max_groups; ?>" style="width: 30%" /></label></p>
         <input type="hidden" id="groups-widget-groups-list-submit" name="groups-widget-groups-list-submit" value="1" />
 <?php

trunk/bp-messages.php

@@ -143 +143 @@
     
     /* Add 'Profile' to the main navigation */
-    bp_core_add_nav_item( __('Messages'), $bp['messages']['slug'], false, false );
+    bp_core_add_nav_item( __('Messages', 'buddypress'), $bp['messages']['slug'], false, false );
     bp_core_add_nav_default( $bp['messages']['slug'], 'messages_screen_inbox', 'inbox' );
     
@@ -149 +149 @@
     
     /* Add the subnav items to the profile */
-    bp_core_add_subnav_item( $bp['messages']['slug'], 'inbox', __('Inbox') . $count_indicator, $messages_link, 'messages_screen_inbox' );
-    bp_core_add_subnav_item( $bp['messages']['slug'], 'sentbox', __('Sent Messages'), $messages_link, 'messages_screen_sentbox' );
-    bp_core_add_subnav_item( $bp['messages']['slug'], 'compose', __('Compose'), $messages_link, 'messages_screen_compose' );
-    bp_core_add_subnav_item( $bp['messages']['slug'], 'notices', __('Notices'), $messages_link, 'messages_screen_notices', false, true, true );
+    bp_core_add_subnav_item( $bp['messages']['slug'], 'inbox', __('Inbox', 'buddypress') . $count_indicator, $messages_link, 'messages_screen_inbox' );
+    bp_core_add_subnav_item( $bp['messages']['slug'], 'sentbox', __('Sent Messages', 'buddypress'), $messages_link, 'messages_screen_sentbox' );
+    bp_core_add_subnav_item( $bp['messages']['slug'], 'compose', __('Compose', 'buddypress'), $messages_link, 'messages_screen_compose' );
+    bp_core_add_subnav_item( $bp['messages']['slug'], 'notices', __('Notices', 'buddypress'), $messages_link, 'messages_screen_notices', false, true, true );
 
     if ( $bp['current_component'] == $bp['messages']['slug'] ) {
         if ( bp_is_home() ) {
-            $bp['bp_options_title'] = __('My Messages');            
+            $bp['bp_options_title'] = __('My Messages', 'buddypress');          
         } else {
             $bp_options_avatar = bp_core_get_avatar( $bp['current_userid'], 1 );
@@ -195 +195 @@
         if ( $bp['action_variables'][0] == 'deactivate' ) {
             if ( !$notice->deactivate() ) {
-                $bp['message'] = __('There was a problem deactivating that notice.');   
+                $bp['message'] = __('There was a problem deactivating that notice.', 'buddypress'); 
             } else {
-                $bp['message'] = __('Notice deactivated.');
+                $bp['message'] = __('Notice deactivated.', 'buddypress');
                 $bp['message_type'] = 'success';
             }
         } else if ( $bp['action_variables'][0] == 'activate' ) {
             if ( !$notice->activate() ) {
-                $bp['message'] = __('There was a problem activating that notice.');
+                $bp['message'] = __('There was a problem activating that notice.', 'buddypress');
             } else {
-                $bp['message'] = __('Notice activated.');
+                $bp['message'] = __('Notice activated.', 'buddypress');
                 $bp['message_type'] = 'success';
             }
         } else if ( $bp['action_variables'][0] == 'delete' ) {
             if ( !$notice->delete() ) {
-                $bp['message'] = __('There was a problem deleting that notice.');
+                $bp['message'] = __('There was a problem deleting that notice.', 'buddypress');
             } else {
-                $bp['message'] = __('Notice deleted.');
+                $bp['message'] = __('Notice deleted.', 'buddypress');
                 $bp['message_type'] = 'success';
             }
@@ -236 +236 @@
     } else {
         $bp['bp_options_nav'][$bp['messages']['slug']]['view'] = array(
-            'name' => __('From: ' . BP_Messages_Thread::get_last_sender($thread_id)),
+            'name' => __('From: ' . BP_Messages_Thread::get_last_sender($thread_id), 'buddypress'),
             'link' => $bp['loggedin_domain'] . $bp['messages']['slug'] . '/'            
         );
@@ -260 +260 @@
         // delete message
         if ( !BP_Messages_Thread::delete($thread_id) ) {
-            $bp['message'] = __('There was an error deleting that message.');
+            $bp['message'] = __('There was an error deleting that message.', 'buddypress');
             add_action( 'template_notices', 'bp_core_render_notice' );
 
@@ -266 +266 @@
             bp_catch_uri( 'messages/index' );
         } else {
-            $bp['message'] = __('Message deleted.');
+            $bp['message'] = __('Message deleted.', 'buddypress');
             $bp['message_type'] = 'success';
             add_action( 'template_notices', 'bp_core_render_notice' );
@@ -291 +291 @@
     } else {
         if ( !BP_Messages_Thread::delete( explode(',', $thread_ids ) ) ) {
-            $message = __('There was an error deleting messages.');
+            $message = __('There was an error deleting messages.', 'buddypress');
             add_action( 'template_notices', 'bp_core_render_notice' );
 
@@ -297 +297 @@
             bp_catch_uri( 'messages/index' );
         } else {
-            $bp['message'] = __('Messages deleted.');
+            $bp['message'] = __('Messages deleted.', 'buddypress');
             $bp['message_type'] = 'success';
             add_action( 'template_notices', 'bp_core_render_notice' );
@@ -355 +355 @@
     
     <div class="wrap">
-        <h2><?php _e('Compose Message') ?></h2>
+        <h2><?php _e('Compose Message', 'buddypress') ?></h2>
         
         <?php
@@ -370 +370 @@
             <p>         
             <div id="titlediv">
-                <h3><?php _e("Send To") ?> <small>(Use username - autocomplete coming soon)</small></h3>
+                <h3><?php _e("Send To", 'buddypress') ?> <small>(Use username - autocomplete coming soon)</small></h3>
                 <div id="titlewrap">
                     <input type="text" name="send_to" id="send_to" value="<?php echo $username; ?>" />
@@ -380 +380 @@
             <p>
             <div id="titlediv">
-                <h3><?php _e("Subject") ?></h3>
+                <h3><?php _e("Subject", 'buddypress') ?></h3>
                 <div id="titlewrap">
                     <input type="text" name="subject" id="subject" value="<?php echo $subject; ?>" />
@@ -389 +389 @@
             <p>
                 <div id="postdivrich" class="postarea">
-                    <h3><?php _e("Message") ?></h3>
+                    <h3><?php _e("Message", 'buddypress') ?></h3>
                     <div id="editorcontainer">
                         <textarea name="content" id="message_content" rows="15" cols="40"><?php echo $content; ?></textarea>
@@ -397 +397 @@
             
             <p class="submit">
-                    <input type="submit" value="<?php _e("Send") ?> &raquo;" name="send" id="send" style="font-weight: bold" />
+                    <input type="submit" value="<?php _e("Send", 'buddypress') ?> &raquo;" name="send" id="send" style="font-weight: bold" />
             </p>
         </div>
@@ -410 +410 @@
 
 function messages_inbox() {
-    messages_box( 'inbox', __('Inbox') );
+    messages_box( 'inbox', __('Inbox', 'buddypress') );
 }
 
 function messages_sentbox() {
-    messages_box( 'sentbox', __('Sent Messages') );
+    messages_box( 'sentbox', __('Sent Messages', 'buddypress') );
 }
 
@@ -520 +520 @@
                 <tr class="alternate">
                 <td colspan="7" style="text-align: center; padding: 15px 0;">
-                    <?php _e('You have no messages in your'); echo ' ' . $display_name . '.'; ?>
+                    <?php _e('You have no messages in your', 'buddypress'); echo ' ' . $display_name . '.'; ?>
                 </td>
                 </tr>
@@ -552 +552 @@
         if ( $recipients == '' ) {
             if ( !$from_ajax ) {
-                messages_write_new( '', $subject, $content, 'error', __('Please enter at least one valid user to send this message to.'), $messages_write_new_action );
+                messages_write_new( '', $subject, $content, 'error', __('Please enter at least one valid user to send this message to.', 'buddypress'), $messages_write_new_action );
             } else {
-                return array('status' => 0, 'message' => __('There was an error sending the reply, please try again.'));
+                return array('status' => 0, 'message' => __('There was an error sending the reply, please try again.', 'buddypress'));
             }
         } else if ( $subject == '' || $content == '' ) {
             if ( !$from_ajax ) {
-                messages_write_new( $to_user, $subject, $content, 'error', __('Please make sure you fill in all the fields.'), $messages_write_new_action );
+                messages_write_new( $to_user, $subject, $content, 'error', __('Please make sure you fill in all the fields.', 'buddypress'), $messages_write_new_action );
             } else {
-                return array('status' => 0, 'message' => __('Please make sure you have typed a message before sending a reply.'));
+                return array('status' => 0, 'message' => __('Please make sure you have typed a message before sending a reply.', 'buddypress'));
             }
         } else {
@@ -584 +584 @@
             if ( !is_null( $pmessage->recipients ) ) {
                 if ( !$pmessage->send() ) {
-                    $message = __('Message could not be sent, please try again.');
+                    $message = __('Message could not be sent, please try again.', 'buddypress');
                     $type = 'error';
             
@@ -597 +597 @@
                         messages_write_new();
                     } else {
-                        messages_box( 'inbox', __('Inbox'), $message, $type );  
+                        messages_box( 'inbox', __('Inbox', 'buddypress'), $message, $type );    
                     }
                 } else {
-                    $message = __('Message sent successfully!') . ' <a href="' . $bp['loggedin_domain'] . $bp['messages']['slug'] . '/view/' . $pmessage->thread_id . '">' . __('View Message') . '</a> &raquo;';
+                    $message = __('Message sent successfully!', 'buddypress') . ' <a href="' . $bp['loggedin_domain'] . $bp['messages']['slug'] . '/view/' . $pmessage->thread_id . '">' . __('View Message', 'buddypress') . '</a> &raquo;';
                     $type = 'success';
                     
@@ -615 +615 @@
                         messages_write_new();
                     } else {
-                        messages_box( 'inbox', __('Inbox'), $message, $type );
+                        messages_box( 'inbox', __('Inbox', 'buddypress'), $message, $type );
                     }
                 }
@@ -622 +622 @@
                 unset($_POST['send-notice']);
             
-                $message = __('Message could not be sent, please try again.');
+                $message = __('Message could not be sent, please try again.', 'buddypress');
                 $type = 'error';
             
@@ -634 +634 @@
                     messages_write_new();
                 } else {
-                    messages_box( 'inbox', __('Inbox'), $message, $type );  
+                    messages_box( 'inbox', __('Inbox', 'buddypress'), $message, $type );    
                 }
             }
@@ -652 +652 @@
         unset($_POST['send-notice']);
         
-        $message = __('Notice could not be sent, please try again.');
+        $message = __('Notice could not be sent, please try again.', 'buddypress');
         $type = 'error';
     
@@ -659 +659 @@
             messages_write_new();
         } else {
-            messages_box( 'inbox', __('Inbox'), $message, $type );  
+            messages_box( 'inbox', __('Inbox', 'buddypress'), $message, $type );    
         }
     } else {
@@ -683 +683 @@
     
     if ( is_array($thread_ids) ) {
-        $message = __('Messages deleted successfully!');
+        $message = __('Messages deleted successfully!', 'buddypress');
         
         for ( $i = 0; $i < count($thread_ids); $i++ ) {
             if ( !$status = BP_Messages_Thread::delete($thread_ids[$i]) ) {
-                $message = __('There was an error when deleting messages. Please try again.');
+                $message = __('There was an error when deleting messages. Please try again.', 'buddypress');
                 $type = 'error';
             }
         }
     } else {
-        $message = __('Message deleted successfully!');
+        $message = __('Message deleted successfully!', 'buddypress');
         
         if ( !$status = BP_Messages_Thread::delete($thread_ids) ) {
-            $message = __('There was an error when deleting that message. Please try again.');
+            $message = __('There was an error when deleting that message. Please try again.', 'buddypress');
             $type = 'error';
         }
@@ -721 +721 @@
     if ( !$thread->has_access ) {
         unset($_GET['mode']);
-        messages_inbox( __('There was an error viewing this message, please try again.'), 'error' );
+        messages_inbox( __('There was an error viewing this message, please try again.', 'buddypress'), 'error' );
     } else {
         if ( $thread->messages ) { ?>
@@ -733 +733 @@
                             <td>
                                 <img src="<?php echo $bp['messages']['image_base'] ?>/email_open.gif" alt="Message" style="vertical-align: top;" /> &nbsp;
-                                <?php _e('Sent between ') ?> <?php echo BP_Messages_Thread::get_recipient_links($thread->recipients) ?> 
-                                <?php _e('and') ?> <?php echo bp_core_get_userlink($userdata->ID) ?>. 
+                                <?php _e('Sent between ', 'buddypress') ?> <?php echo BP_Messages_Thread::get_recipient_links($thread->recipients) ?> 
+                                <?php _e('and', 'buddypress') ?> <?php echo bp_core_get_userlink($userdata->ID) ?>. 
                             </td>
                         </tr>
@@ -768 +768 @@
                                     ?>
                     
-                                    <h3><?php _e("Reply: ") ?></h3>
+                                    <h3><?php _e("Reply: ", 'buddypress') ?></h3>
                                 </div>
                                 <label for="reply"></label>
@@ -779 +779 @@
                             </p>
                             <input type="hidden" id="thread_id" name="thread_id" value="<?php echo $thread->thread_id ?>" />
-                            <input type="hidden" name="subject" id="subject" value="<?php _e('Re: '); echo str_replace( 'Re: ', '', $thread->last_message_subject); ?>" />
+                            <input type="hidden" name="subject" id="subject" value="<?php _e('Re: ', 'buddypress'); echo str_replace( 'Re: ', '', $thread->last_message_subject); ?>" />
                     </div>
                     <?php if ( function_exists('wp_nonce_field') )

trunk/bp-messages/bp-messages-ajax.php

@@ -41 +41 @@
     
     if ( !isset($_POST['thread_ids']) ) {
-        echo "-1|" . __('There was a problem marking messages as unread.');
+        echo "-1|" . __('There was a problem marking messages as unread.', 'buddypress');
     } else {
         $thread_ids = explode( ',', $_POST['thread_ids'] );
@@ -61 +61 @@
     
     if ( !isset($_POST['thread_ids']) ) {
-        echo "-1|" . __('There was a problem marking messages as read.');
+        echo "-1|" . __('There was a problem marking messages as read.', 'buddypress');
     } else {
         $thread_ids = explode( ',', $_POST['thread_ids'] );
@@ -81 +81 @@
     
     if ( !isset($_POST['thread_ids']) ) {
-        echo "-1|" . __('There was a problem deleting messages.');
+        echo "-1|" . __('There was a problem deleting messages.', 'buddypress');
     } else {
         $thread_ids = explode( ',', $_POST['thread_ids'] );
@@ -89 +89 @@
         }
         
-        echo __('Messages deleted.');
+        echo __('Messages deleted.', 'buddypress');
     }
 }
@@ -98 +98 @@
 
     if ( !isset($_POST['notice_id']) ) {
-        echo "-1|" . __('There was a problem closing the notice.');
+        echo "-1|" . __('There was a problem closing the notice.', 'buddypress');
     } else {
         $notice_ids = get_usermeta( $userdata->ID, 'closed_notices' );

trunk/bp-messages/bp-messages-classes.php

@@ -264 +264 @@
     function get_recipient_links($recipients) {
         if ( count($recipients) >= 5 )
-            return count($recipients) . __(' Recipients');
+            return count($recipients) . __(' Recipients', 'buddypress');
             
         for ( $i = 0; $i < count($recipients); $i++ ) {

trunk/bp-messages/bp-messages-templatetags.php

@@ -216 +216 @@
         <select name="message-type-select" id="message-type-select">
             <option value=""></option>
-            <option value="read"><?php _e('Read') ?></option>
-            <option value="unread"><?php _e('Unread') ?></option>
-            <option value="all"><?php _e('All') ?></option>
+            <option value="read"><?php _e('Read', 'buddypress') ?></option>
+            <option value="unread"><?php _e('Unread', 'buddypress') ?></option>
+            <option value="all"><?php _e('All', 'buddypress') ?></option>
         </select> &nbsp;
-        <a href="#" id="mark_as_read"><?php _e('Mark as Read') ?></a> &nbsp;
-        <a href="#" id="mark_as_unread"><?php _e('Mark as Unread') ?></a> &nbsp;
-        <a href="#" id="delete_messages"><?php _e('Delete') ?></a> &nbsp;
+        <a href="#" id="mark_as_read"><?php _e('Mark as Read', 'buddypress') ?></a> &nbsp;
+        <a href="#" id="mark_as_unread"><?php _e('Mark as Unread', 'buddypress') ?></a> &nbsp;
+        <a href="#" id="delete_messages"><?php _e('Delete', 'buddypress') ?></a> &nbsp;
 <?php   
 }
@@ -231 +231 @@
     if ( $messages_template->thread->is_active ) {
         echo "<strong>";
-        _e('Currently Active');
+        _e('Currently Active', 'buddypress');
         echo "</strong>";
     }
@@ -272 +272 @@
     
     if ( $messages_template->thread->is_active == "1" ) {
-        $text = __('Deactivate');
+        $text = __('Deactivate', 'buddypress');
     } else {
-        $text = __('Activate');     
+        $text = __('Activate', 'buddypress');       
     }
     echo $text;

trunk/bp-wire.php

@@ -59 +59 @@
 
     /* Add 'Wire' to the main navigation */
-    bp_core_add_nav_item( __('Wire'), $bp['wire']['slug'] );
+    bp_core_add_nav_item( __('Wire', 'buddypress'), $bp['wire']['slug'] );
     bp_core_add_nav_default( $bp['wire']['slug'], 'bp_wire_screen_latest', 'all-posts' );
 
     /* Add the subnav items to the wire nav */
-    bp_core_add_subnav_item( $bp['wire']['slug'], 'all-posts', __('All Posts'), $bp['loggedin_domain'] . $bp['wire']['slug'] . '/', 'bp_wire_screen_latest' );
+    bp_core_add_subnav_item( $bp['wire']['slug'], 'all-posts', __('All Posts', 'buddypress'), $bp['loggedin_domain'] . $bp['wire']['slug'] . '/', 'bp_wire_screen_latest' );
     
     if ( $bp['current_component'] == $bp['wire']['slug'] ) {
         if ( bp_is_home() ) {
-            $bp['bp_options_title'] = __('My Wire');
+            $bp['bp_options_title'] = __('My Wire', 'buddypress');
         } else {
             $bp['bp_options_avatar'] = bp_core_get_avatar( $bp['current_userid'], 1 );
@@ -91 +91 @@
     
     if ( $wire_post_id = bp_wire_new_post( $bp['current_userid'], $_POST['wire-post-textarea'], $bp['profile']['table_name_wire'] ) ) {
-        $bp['message'] = __('Wire message successfully posted.');
+        $bp['message'] = __('Wire message successfully posted.', 'buddypress');
         $bp['message_type'] = 'success';
 
@@ -115 +115 @@
     
     if ( bp_wire_delete_post( $bp['action_variables'][0], $bp['profile']['table_name_wire'] ) ) {
-        $bp['message'] = __('Wire message successfully deleted.');
+        $bp['message'] = __('Wire message successfully deleted.', 'buddypress');
         $bp['message_type'] = 'success';
         

trunk/bp-wire/bp-wire-templatetags.php

@@ -122 +122 @@
     
     if ( !$message )
-        $empty_message = __("There are currently no wire posts.");
+        $empty_message = __("There are currently no wire posts.", 'buddypress');
     
     if ( !$title )
-        $title = __('Wire');
+        $title = __('Wire', 'buddypress');
     
     /* Pass them as globals, using the same name doesn't work. */
@@ -228 +228 @@
     global $bp;
     
-    echo '<a href="' . $bp['loggedin_domain'] . $bp['profile']['slug'] . '">' . __('You') . '</a>';
+    echo '<a href="' . $bp['loggedin_domain'] . $bp['profile']['slug'] . '">' . __('You', 'buddypress') . '</a>';
 }
 
@@ -248 +248 @@
     if ( ( $wire_posts_template->wire_post->user_id == $bp['loggedin_userid'] ) || $bp['is_item_admin'] ) {
         if ( $bp['current_component'] == 'wire' || $bp['current_component'] == 'profile' ) {
-            echo '<a href="' . $bp['current_domain'] . $bp['wire']['slug'] . '/delete/' . $wire_posts_template->wire_post->id . '">[' . __('Delete') . ']</a>';
+            echo '<a href="' . $bp['current_domain'] . $bp['wire']['slug'] . '/delete/' . $wire_posts_template->wire_post->id . '">[' . __('Delete', 'buddypress') . ']</a>';
         } else {
-            echo '<a href="' . $bp['current_domain'] . $bp[$bp['current_component']]['slug'] . '/' . $uri . '/wire/delete/' . $wire_posts_template->wire_post->id . '">[' . __('Delete') . ']</a>';
+            echo '<a href="' . $bp['current_domain'] . $bp[$bp['current_component']]['slug'] . '/' . $uri . '/wire/delete/' . $wire_posts_template->wire_post->id . '">[' . __('Delete', 'buddypress') . ']</a>';
         }
     }

trunk/bp-xprofile.php

@@ -70 +70 @@
                 id, group_id, parent_id, type, name, description, is_required, field_order, option_order, order_by, is_public, can_delete
               ) VALUES (
-                1, 1, 0, 'textbox', 'First Name', '', 1, 1, 0, '', 1, 0
+                1, 1, 0, 'textbox', '" . __( 'First Name', 'buddypress') . "', '', 1, 1, 0, '', 1, 0
               );";
             
@@ -76 +76 @@
                 id, group_id, parent_id, type, name, description, is_required, field_order, option_order, order_by, is_public, can_delete
               ) VALUES (
-                2, 1, 0, 'textbox', 'Last Name', '', 1, 2, 0, '', 1, 0
+                2, 1, 0, 'textbox', '" . __( 'Last Name', 'buddypress') . "', '', 1, 2, 0, '', 1, 0
               );";
     
@@ -138 +138 @@
     
     if ( $wpdb->blogid == $bp['current_homebase_id'] ) {
-        add_menu_page( __('Profile'), __('Profile'), 1, basename(__FILE__), 'bp_core_avatar_admin' );
-        add_submenu_page( basename(__FILE__), __('Profile › Avatar'), __('Avatar'), 1, basename(__FILE__), 'xprofile_avatar_admin' );        
+        add_menu_page( __('Profile', 'buddypress'), __('Profile', 'buddypress'), 1, basename(__FILE__), 'bp_core_avatar_admin' );
+        add_submenu_page( basename(__FILE__), __('Profile › Avatar', 'buddypress'), __('Avatar', 'buddypress'), 1, basename(__FILE__), 'xprofile_avatar_admin' );        
         
         $groups = BP_XProfile_Group::get_all();
@@ -145 +145 @@
         for ( $i=0; $i < count($groups); $i++ ) {
             if ( $groups[$i]->fields ) {
-                add_submenu_page( basename(__FILE__), __('Profile') . '  &rsaquo; ' . $groups[$i]->name, $groups[$i]->name, 1, "xprofile_" . $groups[$i]->name, "xprofile_edit" );      
+                add_submenu_page( basename(__FILE__), __('Profile', 'buddypress') . '  &rsaquo; ' . $groups[$i]->name, $groups[$i]->name, 1, "xprofile_" . $groups[$i]->name, "xprofile_edit" );        
             }
         }
@@ -154 +154 @@
     
         /* Add the administration tab under the "Site Admin" tab for site administrators */
-        add_submenu_page( 'wpmu-admin.php', __("Profiles"), __("Profiles"), 1, "xprofile_settings", "xprofile_admin" );
+        add_submenu_page( 'wpmu-admin.php', __("Profiles", 'buddypress'), __("Profiles", 'buddypress'), 1, "xprofile_settings", "xprofile_admin" );
     }
 
@@ -175 +175 @@
     
     /* Add 'Profile' to the main navigation */
-    bp_core_add_nav_item( __('Profile'), $bp['profile']['slug'] );
+    bp_core_add_nav_item( __('Profile', 'buddypress'), $bp['profile']['slug'] );
     bp_core_add_nav_default( $bp['profile']['slug'], 'xprofile_screen_display_profile', 'public' );
     
@@ -181 +181 @@
     
     /* Add the subnav items to the profile */
-    bp_core_add_subnav_item( $bp['profile']['slug'], 'public', __('Public'), $profile_link, 'xprofile_screen_display_profile' );
-    bp_core_add_subnav_item( $bp['profile']['slug'], 'edit', __('Edit Profile'), $profile_link, 'xprofile_screen_edit_profile' );
-    bp_core_add_subnav_item( $bp['profile']['slug'], 'change-avatar', __('Change Avatar'), $profile_link, 'xprofile_screen_change_avatar' );
+    bp_core_add_subnav_item( $bp['profile']['slug'], 'public', __('Public', 'buddypress'), $profile_link, 'xprofile_screen_display_profile' );
+    bp_core_add_subnav_item( $bp['profile']['slug'], 'edit', __('Edit Profile', 'buddypress'), $profile_link, 'xprofile_screen_edit_profile' );
+    bp_core_add_subnav_item( $bp['profile']['slug'], 'change-avatar', __('Change Avatar', 'buddypress'), $profile_link, 'xprofile_screen_change_avatar' );
 
     if ( $bp['current_component'] == $bp['profile']['slug'] ) {
         if ( bp_is_home() ) {
-            $bp['bp_options_title'] = __('My Profile');
+            $bp['bp_options_title'] = __('My Profile', 'buddypress');
         } else {
             $bp['bp_options_avatar'] = bp_core_get_avatar( $bp['current_userid'], 1 );
@@ -263 +263 @@
 
             if ( ( $wire_post->item_id == $bp['loggedin_userid'] && $wire_post->user_id == $bp['loggedin_userid'] ) || ( $wire_post->item_id == $bp['current_userid'] && $wire_post->user_id == $bp['current_userid'] ) ) {
-                $content = bp_core_get_userlink($wire_post->user_id) . ' ' . __('wrote on their own wire') . ': <span class="time-since">%s</span>';                
+                $content = bp_core_get_userlink($wire_post->user_id) . ' ' . __('wrote on their own wire', 'buddypress') . ': <span class="time-since">%s</span>';              
             } else if ( ( $wire_post->item_id != $bp['loggedin_userid'] && $wire_post->user_id == $bp['loggedin_userid'] ) || ( $wire_post->item_id != $bp['current_userid'] && $wire_post->user_id == $bp['current_userid'] ) ) {
-                $content = bp_core_get_userlink($wire_post->user_id) . ' ' . __('wrote on ') . bp_core_get_userlink( $wire_post->item_id, false, false, true, true ) . ' wire: <span class="time-since">%s</span>';             
+                $content = bp_core_get_userlink($wire_post->user_id) . ' ' . __('wrote on ', 'buddypress') . bp_core_get_userlink( $wire_post->item_id, false, false, true, true ) . ' wire: <span class="time-since">%s</span>';               
             } 
             
@@ -277 +277 @@
                 return false;
                 
-            return bp_core_get_userlink($bp['current_userid']) . ' ' . __('updated the') . ' "<a href="' . $bp['current_domain'] . $bp['profile']['slug'] . '">' . $profile_group->name . '</a>" ' . __('information on') . ' ' . bp_your_or_their() . ' ' . __('profile') . '. <span class="time-since">%s</span>';
+            return bp_core_get_userlink($bp['current_userid']) . ' ' . __('updated the', 'buddypress') . ' "<a href="' . $bp['current_domain'] . $bp['profile']['slug'] . '">' . $profile_group->name . '</a>" ' . __('information on', 'buddypress') . ' ' . bp_your_or_their() . ' ' . __('profile', 'buddypress') . '. <span class="time-since">%s</span>';
         break;
     }
@@ -309 +309 @@
     <div class="wrap">
         
-        <h2><?php echo $group->name ?> <?php _e("Information") ?></h2>
+        <h2><?php echo $group->name ?> <?php _e("Information", 'buddypress') ?></h2>
         
         <?php
@@ -329 +329 @@
                             
                             // Validate the field.
-                            $field->message = sprintf( __('%s cannot be left blank.'), $field->name );
+                            $field->message = sprintf( __('%s cannot be left blank.', 'buddypress'), $field->name );
                             $errors[] = $field->message . "<br />";
                         } else if ( !$field->is_required && ( $current_field == '' || is_null($current_field) ) ) {
@@ -357 +357 @@
 
                             if( !$profile_data->save() ) {
-                                $field->message = __('There was a problem saving changes to this field, please try again.');
+                                $field->message = __('There was a problem saving changes to this field, please try again.', 'buddypress');
                             } else {
                                 $field->data->value = $profile_data->value;
@@ -370 +370 @@
                 
                 $list_html .= '<p class="submit">
-                                <input type="submit" name="save" id="save" value="'.__('Save Changes &raquo;').'" />
+                                <input type="submit" name="save" id="save" value="'.__('Save Changes &raquo;', 'buddypress').'" />
                                </p>';
 
                 if ( $errors && isset($_POST['save']) ) {
                     $type = 'error';
-                    $message = __('There were problems saving your information. Please fix the following:<br />');
+                    $message = __('There were problems saving your information. Please fix the following:<br />', 'buddypress');
                     
                     for ( $i = 0; $i < count($errors); $i++ ) {
@@ -382 +382 @@
                 } else if ( !$errors && isset($_POST['save'] ) ) {
                     $type = 'success';
-                    $message = __('Changes saved.');
+                    $message = __('Changes saved.', 'buddypress');
                     
                     do_action( 'bp_xprofile_updated_profile', array( 'item_id' => $group->id, 'component_name' => 'profile', 'component_action' => 'updated_profile', 'is_private' => 0 ) );
@@ -390 +390 @@
             else { ?>
                 <div id="message" class="error fade">
-                    <p><?php _e('That group does not exist.'); ?></p>
+                    <p><?php _e('That group does not exist.', 'buddypress'); ?></p>
                 </div>
             <?php
@@ -431 +431 @@
 ?>
     <div class="wrap">
-        <h2><?php _e('Profile Settings'); ?></h2>
+        <h2><?php _e('Profile Settings', 'buddypress'); ?></h2>
         <p>Member profile settings will appear here.</p>
     </div>

trunk/bp-xprofile/bp-xprofile-admin.php

@@ -32 +32 @@
     <div class="wrap">
         
-        <h2><?php _e("Profile Settings") ?></h2>
+        <h2><?php _e("Profile Settings", 'buddypress') ?></h2>
         <br />
         <p><?php _e('Your users will distinguish themselves through their profile page. 
            You must give them profile fields that allow them to describe themselves 
-            in a way that is relevant to the theme of your social network.') ?></p>
-            
-        <p><?php _e('NOTE: Fields in the \'Basic\' group appear on the signup page.'); ?></p>
+            in a way that is relevant to the theme of your social network.', 'buddypress') ?></p>
+            
+        <p><?php _e('NOTE: Fields in the \'Basic\' group appear on the signup page.', 'buddypress'); ?></p>
         
         <?php
@@ -147 +147 @@
             
             if ( !$group->save() ) {
-                $message = __('There was an error saving the group. Please try again');
+                $message = __('There was an error saving the group. Please try again', 'buddypress');
                 $type = 'error';
             } else {
-                $message = __('The group was saved successfully.');
+                $message = __('The group was saved successfully.', 'buddypress');
                 $type = 'success';
             }
@@ -177 +177 @@
     
     if ( !$group->delete() ) {
-        $message = __('There was an error deleting the group. Please try again');
+        $message = __('There was an error deleting the group. Please try again', 'buddypress');
         $type = 'error';
     } else {
-        $message = __('The group was deleted successfully.');
+        $message = __('The group was deleted successfully.', 'buddypress');
         $type = 'success';
     }
@@ -211 +211 @@
             
             if ( !$field->save() ) {
-                $message = __('There was an error saving the field. Please try again');
+                $message = __('There was an error saving the field. Please try again', 'buddypress');
                 $type = 'error';
                 
@@ -217 +217 @@
                 xprofile_admin($message, $type);
             } else {
-                $message = __('The field was saved successfully.');
+                $message = __('The field was saved successfully.', 'buddypress');
                 $type = 'success';
                 
@@ -243 +243 @@
     
     if ( $type == 'field' ) {
-        $type = __('field');
-    } else {
-        $type = __('option');
+        $type = __('field', 'buddypress');
+    } else {
+        $type = __('option', 'buddypress');
     }
     
@@ -251 +251 @@
 
     if ( !$field->delete() ) {
-        $message = sprintf( __('There was an error deleting the %s. Please try again'), $type);
+        $message = sprintf( __('There was an error deleting the %s. Please try again', 'buddypress'), $type);
         $type = 'error';
     } else {
-        $message = sprintf( __('The %s was deleted successfully!'), $type);
+        $message = sprintf( __('The %s was deleted successfully!', 'buddypress'), $type);
         $type = 'success';
     }

trunk/bp-xprofile/bp-xprofile-classes.php

@@ -97 +97 @@
 
         if ( $this->id == null ) {
-            $title = __('Add Group');
+            $title = __('Add Group', 'buddypress');
             $action = "admin.php?page=xprofile_settings&mode=add_group";
         } else {
-            $title = __('Edit Group');
+            $title = __('Edit Group', 'buddypress');
             $action = "admin.php?page=xprofile_settings&mode=edit_group&group_id=" . $this->id;         
         }
@@ -121 +121 @@
                 
                 <div id="titlediv">
-                    <label for="group_name"><?php _e("Group Name") ?></label>
+                    <label for="group_name"><?php _e("Group Name", 'buddypress') ?></label>
                     <div>
                         <input type="text" name="group_name" id="group_name" value="<?php echo $this->name ?>" style="width:50%" />
@@ -164 +164 @@
         // Validate Form
         if ( $_POST['group_name'] == '' ) {
-            $message = __('Please make sure you give the group a name.');
+            $message = __('Please make sure you give the group a name.', 'buddypress');
             return false;
         } else {
@@ -621 +621 @@
         ?>
             <div id="<?php echo $type ?>" class="options-box" style="<?php if ( $this->type != $type ) { ?>display: none;<?php } ?> margin-left: 15px;">
-                <h4><?php _e('Please enter options for this Field:') ?></h4>
+                <h4><?php _e('Please enter options for this Field:', 'buddypress') ?></h4>
                 <p>Order By: 
                     
@@ -640 +640 @@
                             $default_name = '[' . $j . ']';
                     ?>
-                        <p><?php _e('Option') ?> <?php echo $j ?>: 
+                        <p><?php _e('Option', 'buddypress') ?> <?php echo $j ?>: 
                            <input type="text" name="<?php echo $type ?>_option[<?php echo $j ?>]" id="<?php echo $type ?>_option<?php echo $j ?>" value="<?php echo $options[$i]->name ?>" />
                            <input type="<?php echo $default_input ?>" name="isDefault_<?php echo $type ?>_option<?php echo $default_name; ?>" <?php if ( $options[$i]->sort_order == 'CHECKED' ) {?> checked="checked"<?php } ?> " /> Default Value 
@@ -654 +654 @@
                 ?>
                     
-                    <p><?php _e('Option') ?> 1: <input type="text" name="<?php echo $type ?>_option[1]" id="<?php echo $type ?>_option1" />
+                    <p><?php _e('Option', 'buddypress') ?> 1: <input type="text" name="<?php echo $type ?>_option[1]" id="<?php echo $type ?>_option1" />
                     <input type="<?php echo $default_input ?>" name="isDefault_<?php echo $type ?>_option<?php echo $default_name; ?>" id="isDefault_<?php echo $type ?>_option" <?php if ( $options[$i]->sort_order == 'CHECKED' ) {?> checked="checked"<?php } ?>" value="1" /> Default Value
                     <input type="hidden" name="<?php echo $type ?>_option_number" id="<?php echo $type ?>_option_number" value="2" />
@@ -660 +660 @@
                 <?php } // end if ?>
                 <div id="<?php echo $type ?>_more"></div>                   
-                <p><a href="javascript:add_option('<?php echo $type ?>')"><?php _e('Add Another Option') ?></a></p>
+                <p><a href="javascript:add_option('<?php echo $type ?>')"><?php _e('Add Another Option', 'buddypress') ?></a></p>
             </div>
 
@@ -668 +668 @@
     function render_admin_form( $message = '' ) {
         if ( $this->id == null ) {
-            $title = __('Add Field');
+            $title = __('Add Field', 'buddypress');
             $action = "admin.php?page=xprofile_settings&amp;group_id=" . $this->group_id . "&amp;mode=add_field";
         } else {
-            $title = __('Edit Field');
+            $title = __('Edit Field', 'buddypress');
             $action = "admin.php?page=xprofile_settings&amp;mode=edit_field&amp;group_id=" . $this->group_id . "&amp;field_id=" . $this->id;            
             $options = $this->get_children();
@@ -695 +695 @@
             <div id="poststuff">        
                 <div id="titlediv">
-                    <h3><label for="title"><?php _e("Field Title") ?> *</label></h3>
+                    <h3><label for="title"><?php _e("Field Title", 'buddypress') ?> *</label></h3>
                     <div id="titlewrap">
                         <input type="text" name="title" id="title" value="<?php echo $this->name ?>" style="width:50%" />
@@ -702 +702 @@
             
                 <div id="titlediv">
-                    <h3><label for="description"><?php _e("Field Description") ?></label></h3>
+                    <h3><label for="description"><?php _e("Field Description", 'buddypress') ?></label></h3>
                     <div id="titlewrap">
                         <textarea name="description" id="description" rows="8" cols="60" style="border: none; width: 99%;"><?php echo $this->desc ?></textarea>
@@ -709 +709 @@
     
                 <div id="titlediv">
-                    <h3><label for="required"><?php _e("Is This Field Required?") ?> *</label></h3>
+                    <h3><label for="required"><?php _e("Is This Field Required?", 'buddypress') ?> *</label></h3>
                     <select name="required" id="required" style="width: 30%">
                         <option value="0"<?php if ( $this->is_required == '0' ) { ?> selected="selected"<?php } ?>>Not Required</option>
@@ -717 +717 @@
 
                 <div id="titlediv">
-                    <h3><label for="public"><?php _e("Default Field Privacy Settings") ?> *</label></h3>
+                    <h3><label for="public"><?php _e("Default Field Privacy Settings", 'buddypress') ?> *</label></h3>
                     <select name="public" id="public" style="width: 30%">
                         <option value="1"<?php if ( $this->is_public== '1' ) { ?> selected="selected"<?php } ?>>Viewable by everyone</option>
@@ -725 +725 @@
 
                 <div id="titlediv">
-                    <h3><label for="fieldtype"><?php _e("Field Type") ?> *</label></h3>
+                    <h3><label for="fieldtype"><?php _e("Field Type", 'buddypress') ?> *</label></h3>
                     <select name="fieldtype" id="fieldtype" onchange="show_options(this.value)" style="width: 30%">
                         <option value="textbox"<?php if ( $this->type == 'textbox' ) {?> selected="selected"<?php } ?>>Text Box</option>
@@ -740 +740 @@
     
                 <p class="submit">
-                        &nbsp;<input type="submit" value="<?php _e("Save") ?> &raquo;" name="saveField" id="saveField" style="font-weight: bold" />
-                         <?php _e('or') ?> <a href="admin.php?page=xprofile_settings" style="color: red"><?php _e('Cancel') ?></a>
+                        &nbsp;<input type="submit" value="<?php _e("Save", 'buddypress') ?> &raquo;" name="saveField" id="saveField" style="font-weight: bold" />
+                         <?php _e('or', 'buddypress') ?> <a href="admin.php?page=xprofile_settings" style="color: red"><?php _e('Cancel', 'buddypress') ?></a>
                 </p>
             
@@ -792 +792 @@
                                 <form action="<?php echo $action ?>" method="post">
                                     
-                                    <label for="title">* <?php _e("Field Title") ?></label>
+                                    <label for="title">* <?php _e("Field Title", 'buddypress') ?></label>
                                     <div>
                                         <input type="text" name="title" id="title" value="<?php echo $field_data['Name']; ?>" style="width:50%" />
                                     </div>
                                     <p></p>
-                                    <label for="description"><?php _e("Field Description") ?></label>
+                                    <label for="description"><?php _e("Field Description", 'buddypress') ?></label>
                                     <div>
                                         <textarea name="description" id="description" rows="5" cols="60"><?php echo $field_data['Description']; ?></textarea>
                                     </div>
                                     <p></p>
-                                    <label for="required">* <?php _e("Is This Field Required?") ?></label>
+                                    <label for="required">* <?php _e("Is This Field Required?", 'buddypress') ?></label>
                                     <div>
                                         <select name="required" id="required">
@@ -810 +810 @@
                                     </div>
                                     <p></p>
-                                    <label for="fieldtype">* <?php _e("Field Type") ?></label>
+                                    <label for="fieldtype">* <?php _e("Field Type", 'buddypress') ?></label>
                                     <div>
                                         <select name="fieldtype" id="fieldtype" onchange="show_options(this.value)">
@@ -830 +830 @@
                                     
                                     <p class="submit">                                  
-                                      <input type="submit" value="<?php _e("Add") ?> &raquo;" name="saveField" id="saveField<?php echo $counter;?>" class="button" />
+                                      <input type="submit" value="<?php _e("Add", 'buddypress') ?> &raquo;" name="saveField" id="saveField<?php echo $counter;?>" class="button" />
                                       <input type="hidden" name="field_file" value="<?php echo $field_file_path; ?>">
                                     </p>
@@ -842 +842 @@
                 ?></table><?php
             } else {
-                ?><p><?php _e('No prebuilt fields available at this time.') ?></p><?php
+                ?><p><?php _e('No prebuilt fields available at this time.', 'buddypress') ?></p><?php
             }
             @closedir( $prebuilt_fields_dir );
@@ -884 +884 @@
                 $author = wp_kses( trim( $author_name[1] ), $allowed_tags );
             } else {
-                $author = sprintf( '<a href="%1$s" title="%2$s">%3$s</a>', $author_uri, __( 'Visit author homepage' ), 
+                $author = sprintf( '<a href="%1$s" title="%2$s">%3$s</a>', $author_uri, __( 'Visit author homepage' , 'buddypress'), 
                     wp_kses( trim( $author_name[1] ), $allowed_tags ) );
             }
         } else {
-            $author = __('Anonymous');
+            $author = __('Anonymous', 'buddypress');
         }
 
@@ -914 +914 @@
         // Validate Form
         if ( $_POST['title'] == '' || $_POST['required'] == '' || $_POST['fieldtype'] == '' ) {
-            $message = __('Please make sure you fill out all required fields.');
+            $message = __('Please make sure you fill out all required fields.', 'buddypress');
             return false;
         } else if ( empty($_POST['field_file']) && $_POST['fieldtype'] == 'radio' && empty($_POST['radio_option'][1]) ) {
-            $message = __('Radio button field types require at least one option. Please add options below.');   
+            $message = __('Radio button field types require at least one option. Please add options below.', 'buddypress'); 
             return false;
         } else if ( empty($_POST['field_file']) && $_POST['fieldtype'] == 'selectbox' && empty($_POST['selectbox_option'][1]) ) {
-            $message = __('Select box field types require at least one option. Please add options below.'); 
+            $message = __('Select box field types require at least one option. Please add options below.', 'buddypress');   
             return false;   
         } else if ( empty($_POST['field_file']) && $_POST['fieldtype'] == 'multiselectbox' && empty($_POST['multiselectbox_option'][1]) ) {
-            $message = __('Select box field types require at least one option. Please add options below.'); 
+            $message = __('Select box field types require at least one option. Please add options below.', 'buddypress');   
             return false;   
         } else if ( empty($_POST['field_file']) && $_POST['fieldtype'] == 'checkbox' && empty($_POST['checkbox_option'][1]) ) {
-            $message = __('Checkbox field types require at least one option. Please add options below.');   
+            $message = __('Checkbox field types require at least one option. Please add options below.', 'buddypress'); 
             return false;       
         } else {

trunk/bp-xprofile/bp-xprofile-signup.php

@@ -17 +17 @@
     <div id="extraFields">
         <div id="breaker">
-            <h3><?php _e('Additional Information'); ?></h3>
+            <h3><?php _e('Additional Information', 'buddypress'); ?></h3>
             <p><?php _e('Please fill in the following fields to start up your member profile. Fields
-                marked with a star are required.'); ?></p>
+                marked with a star are required.', 'buddypress'); ?></p>
         </div>
             <?php
@@ -43 +43 @@
     ?>
         <div id="breaker">
-            <h3><?php _e('Profile Picture (Avatar)'); ?></h3>
-            <p><?php _e('You can upload an image from your computer to use as an avatar. This avatar will appear on your profile page.'); ?></p>
+            <h3><?php _e('Profile Picture (Avatar)', 'buddypress'); ?></h3>
+            <p><?php _e('You can upload an image from your computer to use as an avatar. This avatar will appear on your profile page.', 'buddypress'); ?></p>
         </div>
             <?php
@@ -96 +96 @@
 
         if ( $active_signup == "none" ) {
-            _e( "Registration has been disabled." );
+            _e( "Registration has been disabled." , 'buddypress');
         } else {
             if ( $active_signup == 'all' || $active_signup == "blog" ) {
@@ -153 +153 @@
                     if ( !bp_core_check_avatar_upload($_FILES) ) {
                         $avatar_error = true;
-                        $avatar_error_msg = __('Your avatar upload failed, please try again.');
+                        $avatar_error_msg = __('Your avatar upload failed, please try again.', 'buddypress');
                     }
 
@@ -159 +159 @@
                         $avatar_error = true;
                         $avatar_size = size_format(1024 * CORE_MAX_FILE_SIZE);
-                        $avatar_error_msg = sprintf( __('The file you uploaded is too big. Please upload a file under %d'), $avatar_size);
+                        $avatar_error_msg = sprintf( __('The file you uploaded is too big. Please upload a file under %d', 'buddypress'), $avatar_size);
                     }
 
                     if ( !bp_core_check_avatar_type($_FILES) ) {
                         $avatar_error = true;
-                        $avatar_error_msg = __('Please upload only JPG, GIF or PNG photos.');       
+                        $avatar_error_msg = __('Please upload only JPG, GIF or PNG photos.', 'buddypress');     
                     }
 
@@ -170 +170 @@
                     if ( !$original = bp_core_handle_avatar_upload($_FILES) ) {
                         $avatar_error = true;
-                        $avatar_error_msg = __('Upload Failed! Your photo dimensions are likely too big.');                     
+                        $avatar_error_msg = __('Upload Failed! Your photo dimensions are likely too big.', 'buddypress');                       
                     }
 
                     if ( !bp_core_check_avatar_dimensions($original) ) {
                         $avatar_error = true;
-                        $avatar_error_msg = sprintf( __('The image you upload must have dimensions of %d x %d pixels or larger.'), CORE_AVATAR_V2_W, CORE_AVATAR_V2_W );
+                        $avatar_error_msg = sprintf( __('The image you upload must have dimensions of %d x %d pixels or larger.', 'buddypress'), CORE_AVATAR_V2_W, CORE_AVATAR_V2_W );
                     }
                     
@@ -241 +241 @@
 
             } else {
-                _e( "Registration has been disabled." );
+                _e( "Registration has been disabled." , 'buddypress');
             }
         }

trunk/bp-xprofile/bp-xprofile-templatetags.php

@@ -341 +341 @@
 
     if ( !$last_updated ) {
-        _e('Profile not recently updated') . '.';
+        _e('Profile not recently updated', 'buddypress') . '.';
     } else {
-        echo __('Profile updated ') . bp_core_time_since( strtotime( $last_updated ) ) . __(' ago'); 
+        echo __('Profile updated ', 'buddypress') . bp_core_time_since( strtotime( $last_updated ) ) . __(' ago', 'buddypress'); 
     }
 }