Index: bp-blogs/bp-blogs-templatetags.php
===================================================================
--- bp-blogs/bp-blogs-templatetags.php	(Revision 549)
+++ bp-blogs/bp-blogs-templatetags.php	(Arbeitskopie)
@@ -220,9 +220,13 @@
 	return $posts_template->the_post();
 }
 
-function bp_post_title() {
+function bp_post_title( $echo = true ) {
 	global $posts_template;
-	echo $posts_template->post->post_title;
+	
+	if ( $echo == true )
+		echo $posts_template->post->post_title;
+	else
+		return $posts_template->post->post_title;
 }
 
 function bp_post_permalink() {
@@ -248,13 +252,16 @@
 	echo $posts_template->post->post_status;	
 }
 
-function bp_post_date( $date_format = null ) {
+function bp_post_date( $date_format = null, $echo = true ) {
 	global $posts_template;
 	
 	if ( !$date_format )
 		$date_format = get_option('date_format');
 		
-	echo mysql2date( $date_format, $posts_template->post->post_date );
+	if ( $echo == true )
+		echo mysql2date( $date_format, $posts_template->post->post_date );
+	else
+		return mysql2date( $date_format, $posts_template->post->post_date );
 }
 
 function bp_post_comment_count() {
@@ -299,9 +306,13 @@
 	echo '</a>';
 }
 
-function bp_post_author() {
+function bp_post_author( $echo = true ) {
 	global $posts_template;
-	echo bp_core_get_userlink( $posts_template->post->post_author );	
+	
+	if( $echo == true)
+		echo bp_core_get_userlink( $posts_template->post->post_author );
+	else
+		return bp_core_get_userlink( $posts_template->post->post_author );
 }
 
 function bp_post_id() {
@@ -309,9 +320,13 @@
 	echo $posts_template->post->ID;	
 }
 
-function bp_post_category( $separator = '', $parents='', $post_id = false ) {
+function bp_post_category( $separator = '', $parents='', $post_id = false, $echo = true ) {
 	global $posts_template;
-	echo get_the_category_list($separator, $parents, $posts_template->post->ID );	
+	
+	if ( $echo == true )
+		echo get_the_category_list($separator, $parents, $posts_template->post->ID );
+	else
+		return get_the_category_list($separator, $parents, $posts_template->post->ID );
 }
 
 function bp_post_tags( $before = '', $sep = ', ', $after = '' ) {
@@ -555,19 +570,31 @@
 	echo $comments_template->comment->comment_ID;
 }
 
-function bp_comment_post_permalink() {
+function bp_comment_post_permalink( $echo = true ) {
 	global $comments_template;
-	echo bp_post_get_permalink( $comments_template->comment->post, $comments_template->comment->blog_id ) . '#comment-' . $comments_template->comment->comment_ID;
+	
+	if ( $echo == true )
+		echo bp_post_get_permalink( $comments_template->comment->post, $comments_template->comment->blog_id ) . '#comment-' . $comments_template->comment->comment_ID;
+	else
+		return bp_post_get_permalink( $comments_template->comment->post, $comments_template->comment->blog_id ) . '#comment-' . $comments_template->comment->comment_ID;
 }
 
-function bp_comment_post_title() {
+function bp_comment_post_title( $echo = true ) {
 	global $comments_template;
-	echo $comments_template->comment->post->post_title;
+	
+	if ( $echo == true )
+		echo $comments_template->comment->post->post_title;
+	else
+		return $comments_template->comment->post->post_title;
 }
 
-function bp_comment_author() {
-	global $comments_template;	
-	echo bp_core_get_userlink( $comments_template->comment->user_id );
+function bp_comment_author( $echo = true ) {
+	global $comments_template;
+	
+	if ( $echo == true )
+		echo bp_core_get_userlink( $comments_template->comment->user_id );
+	else
+		return bp_core_get_userlink( $comments_template->comment->user_id );
 }
 
 function bp_comment_content() {
@@ -578,23 +605,34 @@
 	echo $content;
 }
 
-function bp_comment_date( $date_format = null ) {
+function bp_comment_date( $date_format = null, $echo = true ) {
 	global $comments_template;
 	
 	if ( !$date_format )
 		$date_format = get_option('date_format');
 		
-	echo mysql2date( $date_format, $comments_template->comment->post->post_date );
+	if ( $echo == true )
+		echo mysql2date( $date_format, $comments_template->comment->post->post_date );
+	else 
+		return mysql2date( $date_format, $comments_template->comment->post->post_date );
 }
 
-function bp_comment_blog_permalink() {
+function bp_comment_blog_permalink( $echo = true ) {
 	global $comments_template;
-	echo get_blog_option( $comments_template->comment->blog_id, 'siteurl' );
+	
+	if ( $echo == true )
+		echo get_blog_option( $comments_template->comment->blog_id, 'siteurl' );
+	else
+		return get_blog_option( $comments_template->comment->blog_id, 'siteurl' );
 }
 
-function bp_comment_blog_name() {
+function bp_comment_blog_name( $echo = true ) {
 	global $comments_template;
-	echo get_blog_option( $comments_template->comment->blog_id, 'blogname' );
+	
+	if ( $echo == true )
+		echo get_blog_option( $comments_template->comment->blog_id, 'blogname' );
+	else
+		return get_blog_option( $comments_template->comment->blog_id, 'blogname' );
 }
 
 
Index: buddypress-theme/buddypress-member/blogs/create.php
===================================================================
--- buddypress-theme/buddypress-member/blogs/create.php	(Revision 549)
+++ buddypress-theme/buddypress-member/blogs/create.php	(Arbeitskopie)
@@ -12,7 +12,7 @@
 	<?php else: ?>
 
 		<div id="message" class="info">
-			<p>Blog registration is currently disabled</p>
+			<p><?php _e("Blog registration is currently disabled", "buddypress"); ?></p>
 		</div>
 
 	<?php endif; ?>
Index: buddypress-theme/buddypress-member/blogs/recent-comments.php
===================================================================
--- buddypress-theme/buddypress-member/blogs/recent-comments.php	(Revision 549)
+++ buddypress-theme/buddypress-member/blogs/recent-comments.php	(Arbeitskopie)
@@ -2,16 +2,16 @@
 </div>
 
 <div id="content">
-	<h2>Recent Comments</h2>
+	<h2><?php _e("Recent Comments", "buddypress"); ?></h2>
 	<?php do_action( 'template_notices' ) // (error/success feedback) ?>
 
 	<?php if ( bp_has_comments() ) : ?>
 		<ul id="comment-list">
 		<?php while ( bp_comments() ) : bp_the_comment(); ?>
 			<li id="comment-<?php bp_comment_id() ?>">
-				<span class="small">On <?php bp_comment_date('F jS, Y') ?> <?php bp_comment_author() ?> said:</span>
+				<span class="small"><?php printf(__('On %1$s %2$s said:', 'buddypress'), bp_comment_date(__('F jS, Y', 'buddypress'), false), bp_comment_author(false)); ?></span>
 				<p><?php bp_comment_content() ?></p>
-				<span class="small">Commented on the post <a href="<?php bp_comment_post_permalink() ?>"><?php bp_comment_post_title() ?></a> on the blog <a href="<?php bp_comment_blog_permalink() ?>"><?php bp_comment_blog_name() ?></a>.</span>
+				<span class="small"><?php printf(__('Commented on the post <a href="%1$s">%2$s</a> on the blog <a href="%3$s">%4$s</a>.', 'buddypress'), bp_comment_post_permalink(false), bp_comment_post_title(false), bp_comment_blog_permalink(false), bp_comment_blog_name(false)); ?></span>
 			</li>
 		<?php endwhile; ?>
 		</ul>
Index: buddypress-theme/buddypress-member/blogs/recent-posts.php
===================================================================
--- buddypress-theme/buddypress-member/blogs/recent-posts.php	(Revision 549)
+++ buddypress-theme/buddypress-member/blogs/recent-posts.php	(Arbeitskopie)
@@ -2,16 +2,16 @@
 </div>
 
 <div id="content">
-	<h2>Recent Posts</h2>
+	<h2><?php _e("Recent Posts", "buddypress"); ?></h2>
 	<?php do_action( 'template_notices' ) // (error/success feedback) ?>
 
 	<?php if ( bp_has_posts() ) : ?>
 		<?php while ( bp_posts() ) : bp_the_post(); ?>
 			<div class="post" id="post-<?php bp_post_id(); ?>">
-				<h2><a href="<?php bp_post_permalink() ?>" rel="bookmark" title="Permanent Link to <?php bp_post_title(); ?>"><?php bp_post_title(); ?></a></h2>
-				<p class="date"><?php bp_post_date('F jS, Y') ?> <em>in <?php bp_post_category(', ') ?> by <?php bp_post_author() ?></em></p>
-				<?php bp_post_content('Read the rest of this entry &raquo;'); ?>
-				<p class="postmetadata"><?php bp_post_tags('<span class="tags">', ', ', '</span>'); ?>  <span class="comments"><?php bp_post_comments('No Comments', '1 Comment', '% Comments'); ?></span></p>
+				<h2><a href="<?php bp_post_permalink() ?>" rel="bookmark" title="<?php printf(__('Permanent Link to %s', 'buddypress'), bp_post_title(false)); ?>"><?php bp_post_title(); ?></a></h2>
+				<p class="date"><?php printf(__('%1$s <em>in %2$s by %3$s</em>', 'buddypress'), bp_post_date(__('F jS, Y', 'buddypress'), false), bp_post_category(', ', '', null, false), bp_post_author(false)); ?></p>
+				<?php bp_post_content(__('Read the rest of this entry &raquo;')); ?>
+				<p class="postmetadata"><?php bp_post_tags('<span class="tags">', ', ', '</span>'); ?>  <span class="comments"><?php bp_post_comments(__('No Comments'), __('1 Comment'), __('% Comments')); ?></span></p>
 				<hr />
 			</div>
 			<?php endwhile; ?>