Index: tools/i18n/extract.php
===================================================================
--- tools/i18n/extract.php	(revision 43005)
+++ tools/i18n/extract.php	(working copy)
@@ -174,8 +174,13 @@
 				$text = str_replace( array( "\r\n", "\n" ), ' ', $text );;
 				$text = trim( preg_replace( '%^(/\*|//)%', '', preg_replace( '%\*/$%', '', $text ) ) );
 				if ( 0 === stripos( $text, $this->comment_prefix ) ) {
+				  if ( $in_func ) {
+					$func_comment = $text;
+				  } else {
 					$latest_comment = $text;
+				  }
 				}
+				continue;
 			}
 			if ( !$in_func ) continue;
 			if ( '(' == $token ) {
Index: tools/i18n/t/ExtractTest.php
===================================================================
--- tools/i18n/t/ExtractTest.php	(revision 43005)
+++ tools/i18n/t/ExtractTest.php	(working copy)
@@ -224,4 +224,58 @@
 			$this->extractor->find_function_calls( array('f'), '<?php /* Translators: let your ears fly! */ f( "baba" ); ' )
 		);
 	}
+
+	/**
+	 * @group comment
+	 */
+	function test_find_function_calls_with_inline_c_style_comment() {
+		$this->assertEquals( array( array(
+				'name' => '__', 'args' => array( 'on' ), 'line' => 2,
+			) ),
+			$this->extractor->find_function_calls( array( '__' ),
+				"<?php
+				__( // unrelated comment
+				'on' );"
+			)
+		);
+		$this->assertEquals( array( array(
+				'name' => '_n', 'args' => array( '1 thought', '%d thoughts' ), 'line' => 2,
+			) ),
+			$this->extractor->find_function_calls( array( '_n' ),
+				"<?php
+				_n( // unrelated comment
+				'1 thought',
+				'%d thoughts'
+				 );"
+			)
+		);
+	}
+
+	/**
+	 * @group comment
+	 */
+	function test_find_function_calls_with_inline_c_style_translator_comment() {
+		$this->assertEquals( array( array(
+			'name' => '__', 'args' => array( 'on' ), 'line' => 2,
+			'comment' => "translators: I'd hate for you to miss helpful comments",
+		) ),
+			$this->extractor->find_function_calls( array( '__' ),
+				"<?php
+				__( // translators: I'd hate for you to miss helpful comments
+				'on' );"
+			)
+		);
+		$this->assertEquals( array( array(
+			'name' => '_n', 'args' => array( '1 thought', '%d thoughts' ), 'line' => 2,
+			'comment' => "translators: I'd hate for you to miss helpful comments",
+		) ),
+			$this->extractor->find_function_calls( array( '_n' ),
+				"<?php
+				_n( // translators: I'd hate for you to miss helpful comments
+				'1 thought',
+				'%d thoughts'
+				 );"
+			)
+		);
+	}
 }