Index: tools/i18n/makepot.php
===================================================================
--- tools/i18n/makepot.php	(revision 35824)
+++ tools/i18n/makepot.php	(working copy)
@@ -53,7 +53,18 @@
 		'comments_number_link' => array('string', 'singular', 'plural'),
 	);
 
-	var $ms_files = array( 'ms-.*', '.*/ms-.*', '.*/my-.*', 'wp-activate\.php', 'wp-signup\.php', 'wp-admin/network\.php', 'wp-admin/includes/ms\.php', 'wp-admin/network/.*\.php', 'wp-admin/includes/class-wp-ms.*' );
+	var $ms_files = array(
+		'ms-.*',
+		'.*/ms-.*',
+		'.*/my-.*',
+		'wp-admin/includes/class-wp-ms.*',
+		'wp-admin/includes/ms\.php',
+		'wp-admin/includes/network\.php',
+		'wp-admin/network/.*\.php',
+		'wp-admin/network\.php',
+		'wp-activate\.php',
+		'wp-signup\.php',
+	);
 
 	var $temp_files = array();
 
@@ -280,7 +291,14 @@
 		$result = $this->wp_generic( $dir, array(
 			'project' => 'wp-admin', 'output' => $output,
 			'includes' => array( 'wp-admin/.*' ),
-			'excludes' => array( 'wp-admin/includes/continents-cities\.php', 'wp-admin/network/.*', 'wp-admin/network.php' ),
+			'excludes' => array(
+				'wp-admin/includes/class-wp-ms.*',
+				'wp-admin/includes/continents-cities\.php',
+				'wp-admin/includes/ms\.php',
+				'wp-admin/includes/network\.php',
+				'wp-admin/network/.*',
+				'wp-admin/network\.php'
+			),
 			'default_output' => 'wordpress-admin.pot',
 		) );
 		if ( ! $result ) {
@@ -334,7 +352,13 @@
 
 		$result = $this->wp_generic( $dir, array(
 			'project' => 'wp-network-admin', 'output' => $output,
-			'includes' => array( 'wp-admin/network/.*', 'wp-admin/network.php' ),
+			'includes' => array(
+				'wp-admin/includes/class-wp-ms.*',
+				'wp-admin/includes/ms\.php',
+				'wp-admin/includes/network\.php',
+				'wp-admin/network/.*',
+				'wp-admin/network\.php'
+			),
 			'excludes' => array(),
 			'default_output' => 'wordpress-admin-network.pot',
 		) );