Index: trunk/buddypress.org/public_html/wp-content/themes/bbpress-org/header-front.php
===================================================================
--- trunk/buddypress.org/public_html/wp-content/themes/bbpress-org/header-front.php	(revision 1858)
+++ trunk/buddypress.org/public_html/wp-content/themes/bbpress-org/header-front.php	(working copy)
@@ -1,9 +1,9 @@
 <?php if ( is_front_page() ) : ?>
 	<div id="headline"><div id="headline-inner">
 		<h2 class="graphic home"><?php bloginfo( 'description' ); ?></h2>
-		<p>bbPress is forum software with a twist from the creators of WordPress. Easily setup discussion forums inside your WordPress.org powered site.</p>
+		<p><?php _e( 'bbPress is forum software with a twist from the creators of WordPress. Easily setup discussion forums inside your WordPress.org powered site.', 'bbporg' ); ?></p>
 		<div>
-			<a href="//bbpress.org/download/" id="big-demo-button" class="button">Download bbPress &rarr;</a>
+			<a href="//bbpress.org/download/" id="big-demo-button" class="button"><?php _e( 'Download bbPress &rarr;', 'bbporg' ); ?></a>
 			<img src="<?php echo get_stylesheet_directory_uri(); ?>/images/screenshots.png?v=5" alt="Screenshots">
 		</div>
 	</div></div>
@@ -12,19 +12,35 @@
 	<div id="showcase"><div id="showcase-inner">
 		<div class="feature">
 			<h3><?php _e( 'Simple Setup', 'bbporg' ); ?></h3>
-			<p><a href="//bbpress.org/about/simple/"><img src="<?php echo get_stylesheet_directory_uri(); ?>/images/feature_forums.gif" alt="" width="78" height="58"></a>Easy to setup.<br /> Easy to moderate.<br /> Fast, and clean.</p>
+			<p>
+				<a href="//bbpress.org/about/simple/"><img src="<?php echo get_stylesheet_directory_uri(); ?>/images/feature_forums.gif" alt="" width="78" height="58"></a>
+				<?php _e( 'Easy to setup.', 'bbporg' ); ?><br />
+				<?php _e( 'Easy to moderate.', 'bbporg' ); ?><br />
+				<?php _e( 'Fast, and clean.', 'bbporg' ); ?>
+			</p>
 		</div>
 		<div class="feature">
 			<h3><?php _e( 'Fully Integrated', 'bbporg' ); ?></h3>
-			<p><a href="//bbpress.org/about/integration/"><img src="<?php echo get_stylesheet_directory_uri(); ?>/images/feature_integration.gif" alt="" width="78" height="58"></a>One central account.<br /> One unified admin area.<br /> One click install.</p>
+			<p>
+				<a href="//bbpress.org/about/integration/"><img src="<?php echo get_stylesheet_directory_uri(); ?>/images/feature_integration.gif" alt="" width="78" height="58"></a>
+				<?php _e( 'One central account.', 'bbporg' ); ?><br />
+				<?php _e( 'One unified admin area.', 'bbporg' ); ?><br />
+				<?php _e( 'One click install.', 'bbporg' ); ?>
+			</p>
 		</div>
 		<div class="feature" style="margin:0;">
 			<h3><?php _e( 'Single Installation', 'bbporg' ); ?></h3>
-			<p><a href="//bbpress.org/about/installation/"><img src="<?php echo get_stylesheet_directory_uri(); ?>/images/feature_installation.gif" alt="" width="78" height="58"></a>Simple step-by-step installation walks you through your options.</p>
+			<p>
+				<a href="//bbpress.org/about/installation/"><img src="<?php echo get_stylesheet_directory_uri(); ?>/images/feature_installation.gif" alt="" width="78" height="58"></a>
+				<?php _e( 'Simple step-by-step installation walks you through your options.', 'bbporg' ); ?>
+			</p>
 		</div>
 		<div class="feature">
 			<h3><?php _e( 'Multisite Forums', 'bbporg' ); ?></h3>
-			<p><a href="//bbpress.org/about/multisite/"><img src="<?php echo get_stylesheet_directory_uri(); ?>/images/feature_blogs.gif" alt="" width="78" height="58"></a>Divide your site into sections. Allow your users to create content.</p>
+			<p>
+				<a href="//bbpress.org/about/multisite/"><img src="<?php echo get_stylesheet_directory_uri(); ?>/images/feature_blogs.gif" alt="" width="78" height="58"></a>
+				<?php _e( 'Divide your site into sections. Allow your users to create content.', 'bbporg' ); ?>
+			</p>
 		</div>
 	</div></div>
 	<hr class="hidden" />
Index: trunk/buddypress.org/public_html/wp-content/themes/bbpress-org/page-plugins.php
===================================================================
--- trunk/buddypress.org/public_html/wp-content/themes/bbpress-org/page-plugins.php	(revision 1858)
+++ trunk/buddypress.org/public_html/wp-content/themes/bbpress-org/page-plugins.php	(working copy)
@@ -12,7 +12,7 @@
 				<div class="bbp-pagination">
 					<div class="bbp-pagination-count">
 
-						<?php printf( 'Viewing %1$s to %2$s (%3$s)', number_format_i18n( $from_num ), number_format_i18n( $to_num ), number_format_i18n( $plugins->info['results'] ) ); ?>
+						<?php printf( __( 'Viewing %1$s to %2$s (%3$s)', 'bbporg' ), number_format_i18n( $from_num ), number_format_i18n( $to_num ), number_format_i18n( $plugins->info['results'] ) ); ?>
 
 					</div>
 
@@ -47,13 +47,13 @@
 				?>
 
 				<div class="single-plugin">
-					<h3 class="plugin-title"><a href="<?php echo esc_url( 'https://wordpress.org/extend/plugins/' . $plugin->slug ); ?>/" title="Plugin Information"><?php echo esc_html( $plugin->name ); ?></a></h3>
+					<h3 class="plugin-title"><a href="<?php echo esc_url( 'https://wordpress.org/plugins/' . $plugin->slug ); ?>/" title="<?php esc_attr_e( 'Plugin Information', 'bbporg' ); ?>"><?php echo esc_html( $plugin->name ); ?></a></h3>
 
 					<div class="plugin-meta">
-						<?php if ( !empty( $plugin->version  ) ) : ?><div>Version: <?php echo esc_html( $plugin->version ); ?></div><?php if ( !empty( $plugin->requires ) ) : ?><?php endif; ?><?php endif; ?>
-						<?php if ( !empty( $plugin->requires ) ) : ?><div>Requires: <?php echo esc_html( $plugin->requires ); ?></div><?php if ( !empty( $plugin->tested ) ) : ?><?php endif; ?><?php endif; ?>
-						<?php if ( !empty( $plugin->tested   ) ) : ?><div>Compatible up to: <?php echo esc_html( $plugin->tested ); ?></div><?php endif; ?>
-						<div>Rating: <?php echo $plugin->rating_html; // raw html - do not escape ?></div>
+						<?php if ( !empty( $plugin->version  ) ) : ?><div><?php _e( 'Version:', 'bbporg' ); ?> <?php echo esc_html( $plugin->version ); ?></div><?php if ( !empty( $plugin->requires ) ) : ?><?php endif; ?><?php endif; ?>
+						<?php if ( !empty( $plugin->requires ) ) : ?><div><?php _e( 'Requires:', 'bbporg' ); ?> <?php echo esc_html( $plugin->requires ); ?></div><?php if ( !empty( $plugin->tested ) ) : ?><?php endif; ?><?php endif; ?>
+						<?php if ( !empty( $plugin->tested   ) ) : ?><div><?php _e( 'Compatible up to:', 'bbporg' ); ?> <?php echo esc_html( $plugin->tested ); ?></div><?php endif; ?>
+						<div><?php _e( 'Rating:', 'bbporg' ); ?> <?php echo $plugin->rating_html; // raw html - do not escape ?></div>
 					</div>
 
 					<p class="plugin-description" style="font-size: 12px">
@@ -67,7 +67,7 @@
 				<div class="bbp-pagination">
 					<div class="bbp-pagination-count">
 
-						<?php printf( 'Viewing %1$s to %2$s (%3$s)', number_format_i18n( $from_num ), number_format_i18n( $to_num ), number_format_i18n( $plugins->info['results'] ) ); ?>
+						<?php printf( __( 'Viewing %1$s to %2$s (%3$s)', 'bbporg' ), number_format_i18n( $from_num ), number_format_i18n( $to_num ), number_format_i18n( $plugins->info['results'] ) ); ?>
 
 					</div>
 
Index: trunk/buddypress.org/public_html/wp-content/themes/bbpress-org/sidebar.php
===================================================================
--- trunk/buddypress.org/public_html/wp-content/themes/bbpress-org/sidebar.php	(revision 1858)
+++ trunk/buddypress.org/public_html/wp-content/themes/bbpress-org/sidebar.php	(working copy)
@@ -17,8 +17,8 @@
 			<div>
 				<h3><?php _e( 'Forum Feeds', 'bbporg'); ?></h3>
 				<ul>
-					<li><a class="feed" href="<?php bbp_forum_permalink(); ?>feed/" title="Forum Posts">Recent Posts</a></li>
-					<li><a class="feed" href="<?php bbp_forum_permalink(); ?>feed/?type=topic" title="Forum Topics">Recent Topics</a></li>
+					<li><a class="feed" href="<?php bbp_forum_permalink(); ?>feed/" title="<?php esc_attr_e( 'Forum Posts', 'bbporg' ); ?>"><?php _e( 'Recent Posts', 'bbporg'); ?></a></li>
+					<li><a class="feed" href="<?php bbp_forum_permalink(); ?>feed/?type=topic" title="<?php esc_attr_e( 'Forum Topics', 'bbporg' ); ?>"><?php _e( 'Recent Topics', 'bbporg'); ?></a></li>
 				</ul>
 			</div>
 
@@ -79,8 +79,8 @@
 			<div>
 				<h3><?php _e( 'Feeds', 'bbporg'); ?></h3>
 				<ul>
-					<li><a class="feed" href="<?php bbp_forums_url(); ?>feed/" title="All Recent Posts">All Recent Posts</a></li>
-					<li><a class="feed" href="<?php bbp_topics_url(); ?>feed/" title="All Recent Topics">All Recent Topics</a></li>
+					<li><a class="feed" href="<?php bbp_forums_url(); ?>feed/" title="<?php esc_attr_e( 'All Recent Posts', 'bbporg' ); ?>"><?php _e( 'All Recent Posts', 'bbporg'); ?></a></li>
+					<li><a class="feed" href="<?php bbp_topics_url(); ?>feed/" title="<?php esc_attr_e( 'All Recent Topics', 'bbporg' ); ?>"><?php _e( 'All Recent Topics', 'bbporg'); ?></a></li>
 				</ul>
 			</div>
 
@@ -95,8 +95,8 @@
 
 		<div class="feature">
 			<h3><?php _e('bbPress Complete', 'bbporg'); ?></h3>
-			<p><a href="https://www.packtpub.com/web-development/bbpress-complete" title="bbPress Complete"><img width="225" alt="" src="<?php echo get_stylesheet_directory_uri(); ?>/images/bbpress-packt.jpg"/></a></p>
-			<p class="book-description">A step-by-step guide to creating, managing, and growing a community around your WordPress website.</p>
+			<p><a href="https://www.packtpub.com/web-development/bbpress-complete" title="<?php esc_attr_e( 'bbPress Complete', 'bbporg' ); ?>"><img width="225" alt="" src="<?php echo get_stylesheet_directory_uri(); ?>/images/bbpress-packt.jpg"/></a></p>
+			<p class="book-description"><?php _e('A step-by-step guide to creating, managing, and growing a community around your WordPress website.', 'bbporg'); ?></p>
 		</div>
 
 	<?php elseif ( is_page( array( 'plugins', 116247 ) ) ) : ?>
@@ -106,7 +106,7 @@
 		<div>
 			<h3><?php _e( 'Legacy', 'bbporg'); ?></h3>
 			<ul>
-				<li><a href="<?php echo get_permalink( 116247 ); ?>" title="Legacy Plugins">Plugins for bbPress 1.1</a></li>
+				<li><a href="<?php echo get_permalink( 116247 ); ?>" title="="<?php esc_attr_e( 'Legacy Plugins', 'bbporg' ); ?>"><?php _e( 'Plugins for bbPress 1.1', 'bbporg'); ?></a></li>
 			</ul>
 		</div>