Index: buddypress.org/public_html/wp-content/themes/buddypress-org/footer.php
===================================================================
--- buddypress.org/public_html/wp-content/themes/buddypress-org/footer.php	(revision 5726)
+++ buddypress.org/public_html/wp-content/themes/buddypress-org/footer.php	(working copy)
@@ -5,20 +5,20 @@
 		<div id="footer">
 			<div class="links">
 				<p>
-					See also:
-					<a href="https://wordpress.org"><?php _e( 'WordPress.org', 'bporg'); ?></a> &bull;
-					<a href="https://bbpress.org"><?php _e( 'bbPress.org', 'bporg'); ?></a> &bull;
-					<a href="https://buddypress.org"><?php _e( 'BuddyPress.org', 'bporg'); ?></a> &bull;
+					<?php _e( 'See also:', 'bporg' ); ?>
+					<a href="https://wordpress.org"><?php _e( 'WordPress.org', 'bporg' ); ?></a> &bull;
+					<a href="https://bbpress.org"><?php _e( 'bbPress.org', 'bporg' ); ?></a> &bull;
+					<a href="https://buddypress.org"><?php _e( 'BuddyPress.org', 'bporg' ); ?></a> &bull;
 					<a href="https://ma.tt"><?php _e( 'Matt', 'bporg' ); ?></a> &bull;
-					<a href="<?php bloginfo( 'rss2_url' ); ?>" title="<?php _e( 'RSS Feed for Articles', 'bporg' ); ?>"><?php _e( 'Blog RSS', 'bporg' ); ?></a>
+					<a href="<?php bloginfo( 'rss2_url' ); ?>"><?php _e( 'Blog RSS', 'bporg' ); ?></a>
 				</p>
 			</div>
 			<div class="details">
 				<p>
-					<a href="https://twitter.com/buddypressdev" class="twitter"><?php _e( 'Follow BuddyPress on Twitter', 'bporg'); ?></a> &bull;
-					<a href="https://buddypress.org/about/gpl/"><?php _e('GPL', 'bporg'); ?></a> &bull;
-					<a href="https://buddypress.org/contact/"><?php _e('Contact Us', 'bporg'); ?></a> &bull;
-					<a href="https://buddypress.org/terms/"><?php _e('Terms of Service', 'bporg'); ?></a>
+					<a href="https://twitter.com/buddypressdev" class="twitter"><?php _e( 'Follow BuddyPress on Twitter', 'bporg' ); ?></a> &bull;
+					<a href="https://buddypress.org/about/gpl/"><?php _e( 'GPL', 'bporg' ); ?></a> &bull;
+					<a href="https://buddypress.org/contact/"><?php _e( 'Contact Us', 'bporg' ); ?></a> &bull;
+					<a href="https://buddypress.org/terms/"><?php _e( 'Terms of Service', 'bporg' ); ?></a>
 				</p>
 			</div>
 		</div>
Index: buddypress.org/public_html/wp-content/themes/buddypress-org/header-front.php
===================================================================
--- buddypress.org/public_html/wp-content/themes/buddypress-org/header-front.php	(revision 5726)
+++ buddypress.org/public_html/wp-content/themes/buddypress-org/header-front.php	(working copy)
@@ -2,9 +2,9 @@
 
 	<div id="headline"><div id="headline-inner">
 		<h2 class="graphic home"><?php bloginfo( 'description' ); ?></h2>
-		<p>BuddyPress helps you build any type of community website using WordPress, with member profiles, activity streams, user groups, messaging, and more.</p>
+		<p><?php _e( 'BuddyPress helps you build any kind of community website using WordPress, with member profiles, activity streams, user groups, messaging, and more.', 'bporg' ); ?></p>
 		<div>
-			<a href="<?php bloginfo( 'url' ); ?>/download/" id="big-demo-button" class="button">Download BuddyPress &rarr;</a>
+			<a href="<?php bloginfo( 'url' ); ?>/download/" id="big-demo-button" class="button"><?php _e( 'Download BuddyPress &rarr;', 'bporg' ); ?></a>
 			<img src="<?php echo get_stylesheet_directory_uri(); ?>/images/screenshots.png?v=6" srcset="<?php echo get_stylesheet_directory_uri(); ?>/images/screenshots.png?v=6 1x, <?php echo get_stylesheet_directory_uri(); ?>/images/screenshots-2x.png?v=6 2x" alt="Screenshots">
 		</div>
 	</div></div>
@@ -12,36 +12,60 @@
 
 	<div id="showcase"><div id="showcase-inner">
 		<div class="feature">
-			<h3><?php _e( 'Profiles', 'bborg' ); ?></h3>
-			<p><a href="//buddypress.org/about/profiles/"><img src="<?php echo get_stylesheet_directory_uri(); ?>/images/feature_profiles.gif" alt="" width="78" height="58"></a>Custom profile fields.<br /> Visibility levels.<br /> Common field types.</p>
+			<h3><?php _e( 'Profiles', 'bporg' ); ?></h3>
+			<p>
+				<a href="//buddypress.org/about/profiles/"><img src="<?php echo get_stylesheet_directory_uri(); ?>/images/feature_profiles.gif" alt="" width="78" height="58"></a>
+				<?php _e( 'Custom profile fields.<br /> Visibility levels.<br /> Common field types.', 'bporg' ); ?>
+			</p>
 		</div>
 		<div class="feature">
-			<h3><?php _e( 'Settings', 'bborg' ); ?></h3>
-			<p><a href="//buddypress.org/about/settings/"><img src="<?php echo get_stylesheet_directory_uri(); ?>/images/feature_settings.gif" alt="" width="78" height="58"></a>Manage account settings.<br /> Email notifications.<br /> Email and Password.</p>
+			<h3><?php _e( 'Settings', 'bporg' ); ?></h3>
+			<p>
+				<a href="//buddypress.org/about/settings/"><img src="<?php echo get_stylesheet_directory_uri(); ?>/images/feature_settings.gif" alt="" width="78" height="58"></a>
+				<?php _e( 'Manage account settings.<br /> Email notifications.<br /> Email and Password.', 'bporg' ); ?>
+			</p>
 		</div>
 		<div class="feature">
-			<h3><?php _e( 'Groups', 'bborg' ); ?></h3>
-			<p><a href="//buddypress.org/about/groups/"><img src="<?php echo get_stylesheet_directory_uri(); ?>/images/feature_groups.gif" alt="" width="78" height="58"></a>Extensible user groups. Allow your users to create micro-communities.</p>
+			<h3><?php _e( 'Groups', 'bporg' ); ?></h3>
+			<p>
+				<a href="//buddypress.org/about/groups/"><img src="<?php echo get_stylesheet_directory_uri(); ?>/images/feature_groups.gif" alt="" width="78" height="58"></a>
+				<?php _e( 'Extensible user groups. Allow your users to create micro-communities.', 'bporg' ); ?>
+			</p>
 		</div>
 		<div class="feature" style="margin:0;">
-			<h3><?php _e( 'Activity Streams', 'bborg' ); ?></h3>
-			<p><a href="//buddypress.org/about/activity/"><img src="<?php echo get_stylesheet_directory_uri(); ?>/images/feature_activity.gif" alt="" width="78" height="58"></a>For members and groups. Sitewide directory and single threads.</p>
+			<h3><?php _e( 'Activity Streams', 'bporg' ); ?></h3>
+			<p>
+				<a href="//buddypress.org/about/activity/"><img src="<?php echo get_stylesheet_directory_uri(); ?>/images/feature_activity.gif" alt="" width="78" height="58"></a>
+				<?php _e( 'For members and groups. Sitewide directory and single threads.', 'bporg' ); ?>
+			</p>
 		</div>
 		<div class="feature">
-			<h3><?php _e( 'Notifications', 'bborg' ); ?></h3>
-			<p><a href="//buddypress.org/about/notifications/"><img src="<?php echo get_stylesheet_directory_uri(); ?>/images/feature_notifications.gif" alt="" width="78" height="58"></a>Get notified.<br /> Smart read/unread.<br /> Fully integrated.</p>
+			<h3><?php _e( 'Notifications', 'bporg' ); ?></h3>
+			<p>
+				<a href="//buddypress.org/about/notifications/"><img src="<?php echo get_stylesheet_directory_uri(); ?>/images/feature_notifications.gif" alt="" width="78" height="58"></a>
+				<?php _e( 'Get notified.<br /> Smart read/unread.<br /> Fully integrated.', 'bporg' ); ?>
+			</p>
 		</div>
 		<div class="feature">
-			<h3><?php _e( 'Friendships', 'bborg' ); ?></h3>
-			<p><a href="//buddypress.org/about/friends/"><img src="<?php echo get_stylesheet_directory_uri(); ?>/images/feature_friends.gif" alt="" width="78" height="58"></a>Friendship connections.<br /> It's always about<br /> who you know!</p>
+			<h3><?php _e( 'Friendships', 'bporg' ); ?></h3>
+			<p>
+				<a href="//buddypress.org/about/friends/"><img src="<?php echo get_stylesheet_directory_uri(); ?>/images/feature_friends.gif" alt="" width="78" height="58"></a>
+				<?php _e( "Friendship connections.<br /> It's always about<br /> who you know!", 'bporg' ); ?>
+			</p>
 		</div>
 		<div class="feature">
-			<h3><?php _e( 'Private Messaging', 'bborg' ); ?></h3>
-			<p><a href="//buddypress.org/about/private-messaging/"><img src="<?php echo get_stylesheet_directory_uri(); ?>/images/feature_pms.gif" alt="" width="78" height="58"></a>Private conversations, with several members at one time.</p>
+			<h3><?php _e( 'Private Messaging', 'bporg' ); ?></h3>
+			<p>
+				<a href="//buddypress.org/about/private-messaging/"><img src="<?php echo get_stylesheet_directory_uri(); ?>/images/feature_pms.gif" alt="" width="78" height="58"></a>
+				<?php _e( 'Private conversations, with several members at one time.', 'bporg' ); ?>
+			</p>
 		</div>
 		<div class="feature" style="margin:0;">
-			<h3><?php _e( '...and more!', 'bborg' ); ?></h3>
-			<p><a href="//buddypress.org/about/more/"><img src="<?php echo get_stylesheet_directory_uri(); ?>/images/feature_more.gif" alt="" width="78" height="58"></a>Extend BuddyPress with hundreds of third party components.</p>
+			<h3><?php _e( '...and more!', 'bporg' ); ?></h3>
+			<p>
+				<a href="//buddypress.org/about/more/"><img src="<?php echo get_stylesheet_directory_uri(); ?>/images/feature_more.gif" alt="" width="78" height="58"></a>
+				<?php _e( 'Extend BuddyPress with hundreds of third party components.', 'bporg' ); ?>
+			</p>
 		</div>
 	</div></div>
 
Index: buddypress.org/public_html/wp-content/themes/buddypress-org/page-plugins.php
===================================================================
--- buddypress.org/public_html/wp-content/themes/buddypress-org/page-plugins.php	(revision 5726)
+++ buddypress.org/public_html/wp-content/themes/buddypress-org/page-plugins.php	(working copy)
@@ -12,7 +12,14 @@
 				<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
+							/* translators: 1: starting number of plugins, 2: ending number, 3: total number */
+							printf( __( 'Viewing %1$s to %2$s (%3$s)', 'bporg' ),
+								number_format_i18n( $from_num ),
+								number_format_i18n( $to_num ),
+								number_format_i18n( $plugins->info['results'] )
+							);
+						?>
 
 					</div>
 
@@ -40,7 +47,7 @@
 
 						$plugin_author_id = 0;
 
-						if ( !empty( $plugin->contributors ) ) {
+						if ( ! empty( $plugin->contributors ) ) {
 							$plugin_author    = get_user_by( 'login', key( $plugin->contributors ) );
 							$plugin_author_id = $plugin_author->ID;
 						}
@@ -47,13 +54,19 @@
 				?>
 
 				<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 ); ?>/"><?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:', 'bporg' ); ?> <?php echo esc_html( $plugin->version ); ?></div>
+						<?php endif; ?>
+						<?php if ( ! empty( $plugin->requires ) ) : ?>
+							<div><?php _e( 'Requires:', 'bporg' ); ?> <?php echo esc_html( $plugin->requires ); ?></div>
+						<?php endif; ?>
+						<?php if ( ! empty( $plugin->tested ) ) : ?>
+							<div><?php _e( 'Compatible up to:', 'bporg' ); ?> <?php echo esc_html( $plugin->tested ); ?></div>
+						<?php endif; ?>
+						<div><?php _e( 'Rating:', 'bporg' ); ?> <?php echo $plugin->rating_html; // raw html - do not escape ?></div>
 					</div>
 
 					<p class="plugin-description" style="font-size: 12px">
@@ -67,7 +80,14 @@
 				<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
+							/* translators: 1: starting number of plugins, 2: ending number, 3: total number */
+							printf( __( 'Viewing %1$s to %2$s (%3$s)', 'bporg' ),
+								number_format_i18n( $from_num ),
+								number_format_i18n( $to_num ),
+								number_format_i18n( $plugins->info['results'] )
+							);
+						?>
 
 					</div>
 
Index: buddypress.org/public_html/wp-content/themes/buddypress-org/sidebar.php
===================================================================
--- buddypress.org/public_html/wp-content/themes/buddypress-org/sidebar.php	(revision 5726)
+++ buddypress.org/public_html/wp-content/themes/buddypress-org/sidebar.php	(working copy)
@@ -22,7 +22,7 @@
 		<?php if ( bbp_is_single_forum() || bb_base_topic_search_query( false ) ) : ?>
 
 			<div>
-				<h3><?php _e( 'Forum Info', 'bporg'); ?></h3>
+				<h3><?php _e( 'Forum Info', 'bporg' ); ?></h3>
 				<ul class="forum-info">
 					<?php bb_base_single_forum_description(); ?>
 				</ul>
@@ -31,10 +31,10 @@
 			<?php bb_base_topic_search_form(); ?>
 
 			<div>
-				<h3><?php _e( 'Forum Feeds', 'bporg'); ?></h3>
+				<h3><?php _e( 'Forum Feeds', 'bporg' ); ?></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/"><?php _e( 'Recent Posts', 'bporg' ); ?></a></li>
+					<li><a class="feed" href="<?php bbp_forum_permalink(); ?>feed/?type=topic"><?php _e( 'Recent Topics', 'bporg' ); ?></a></li>
 				</ul>
 			</div>
 
@@ -41,7 +41,7 @@
 		<?php elseif ( bbp_is_single_topic() || bbp_is_topic_edit() || bbp_is_reply_edit() ) : ?>
 
 			<div>
-				<h3><?php _e( 'Topic Info', 'bporg'); ?></h3>
+				<h3><?php _e( 'Topic Info', 'bporg' ); ?></h3>
 				<ul class="topic-info">
 					<?php bb_base_single_topic_description(); ?>
 				</ul>
@@ -74,18 +74,18 @@
 		<?php else : ?>
 
 			<div>
-				<h3><?php _e( 'Forums', 'bporg'); ?></h3>
+				<h3><?php _e( 'Forums', 'bporg' ); ?></h3>
 				<?php echo do_shortcode( '[bbp-forum-index]' ); ?>
 			</div>
 			<hr class="hidden" />
 
 			<div>
-				<h3><?php _e( 'Views', 'bporg'); ?></h3>
+				<h3><?php _e( 'Views', 'bporg' ); ?></h3>
 				<ul>
 
 					<?php foreach ( bbp_get_views() as $view => $args ) : ?>
 
-						<li><a class="bbp-view-title" href="<?php bbp_view_url( $view ); ?>" title="<?php bbp_view_title( $view ); ?>"><?php bbp_view_title( $view ); ?></a></li>
+						<li><a class="bbp-view-title" href="<?php bbp_view_url( $view ); ?>"><?php bbp_view_title( $view ); ?></a></li>
 
 					<?php endforeach; ?>
 
@@ -93,15 +93,15 @@
 			</div>
 
 			<div>
-				<h3><?php _e( 'Feeds', 'bporg'); ?></h3>
+				<h3><?php _e( 'Feeds', 'bporg' ); ?></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/"><?php _e( 'All Recent Posts', 'bporg' ); ?></a></li>
+					<li><a class="feed" href="<?php bbp_topics_url(); ?>feed/"><?php _e( 'All Recent Topics', 'bporg' ); ?></a></li>
 				</ul>
 			</div>
 
 			<div>
-				<h3><?php _e( 'Tags', 'bporg'); ?></h3>
+				<h3><?php _e( 'Tags', 'bporg' ); ?></h3>
 				<?php echo do_shortcode( '[bbp-topic-tags]' ); ?>
 			</div>
 
@@ -111,8 +111,8 @@
 
 		<div class="feature">
 			<h3><?php _e( 'Theme Development', 'bporg' ); ?></h3>
-			<p><a href="https://www.packtpub.com/web-development/buddypress-theme-development" title="BuddyPress Theme Development"><img width="225" alt="A book by: Tammie Lister" src="<?php echo get_stylesheet_directory_uri(); ?>/images/buddypress-packt.jpg"/></a></p>
-			<p class="book-description">An in-depth guide to designing, developing, and testing your very own custom BuddyPress theme.</p>
+			<p><a href="https://www.packtpub.com/web-development/buddypress-theme-development"><img width="225" alt="<?php esc_attr_e( 'BuddyPress Theme Development. A book by Tammie Lister', 'bporg' ); ?>" src="<?php echo get_stylesheet_directory_uri(); ?>/images/buddypress-packt.jpg"/></a></p>
+			<p class="book-description"><?php _e( 'An in-depth guide to designing, developing, and testing your very own custom BuddyPress theme.', 'bporg' ); ?></p>
 		</div>
 
 	<?php elseif ( is_page( array( 'plugins' ) ) ) : ?>
@@ -120,9 +120,9 @@
 		<?php bb_base_plugin_search_form(); ?>
 
 		<div>
-			<h3><?php _e( 'Legacy', 'bporg'); ?></h3>
+			<h3><?php _e( 'Legacy', 'bporg' ); ?></h3>
 			<ul>
-				<li><a href="https://buddypress.org/support/forum/plugin-forums/" title="Plugin Forums">Legacy Plugin Forums</a></li>
+				<li><a href="https://buddypress.org/support/forum/plugin-forums/"><?php _e( 'Legacy Plugin Forums', 'bporg' ); ?></a></li>
 			</ul>
 		</div>
 
@@ -129,7 +129,7 @@
 	<?php elseif ( ( ! is_page( 'login' ) && ! is_page( 'register' ) && ! is_page( 'lost-password' ) ) || is_home() || is_singular( 'post' ) || is_archive() ) : ?>
 
 		<div>
-			<h3><?php _e( 'Categories', 'bporg'); ?></h3>
+			<h3><?php _e( 'Categories', 'bporg' ); ?></h3>
 			<ul>
 				<?php wp_list_categories( array( 'title_li' => false ) ); ?>
 			</ul>
@@ -136,7 +136,7 @@
 		</div>
 
 		<div>
-			<h3><?php _e( 'Tags', 'bporg'); ?></h3>
+			<h3><?php _e( 'Tags', 'bporg' ); ?></h3>
 			<?php wp_tag_cloud(); ?>
 		</div>