Index: functions.php
===================================================================
--- functions.php	(revision 13334)
+++ functions.php	(working copy)
@@ -1823,7 +1823,7 @@
 	$tables = $wpdb->get_col('SHOW TABLES');
 	$wpdb->suppress_errors( $suppress );
 
-	$wp_tables = $wpdb->tables( 'all', true );
+	$wp_tables = $wpdb->tables( 'all' );
 	// Loop over the WP tables.  If none exist, then scratch install is allowed.
 	// If one or more exist, suggest table repair since we got here because the options
 	// table could not be accessed.
@@ -1834,7 +1834,10 @@
 			if ( defined('WP_REPAIRING') )
 				return true;
 			// Die with a DB error.
-			$wpdb->error = __('One or more database tables are unavailable.  The database may need to be <a href="maint/repair.php?referrer=is_blog_installed">repaired</a>.');
+			if ( function_exists( '__' ) )
+				$wpdb->error = __('One or more database tables are unavailable. The database may need to be <a href="maint/repair.php?referrer=is_blog_installed">repaired</a>.');
+			else
+				$wpdb->error = /*WP_I18N_DEAD_DB*/'One or more database tables are unavailable. The database may need to be <a href="maint/repair.php?referrer=is_blog_installed">repaired</a>.'/*/WP_I18N_DEAD_DB*/;
 			dead_db();
 		}
 	}
Index: load.php
===================================================================
--- load.php	(revision 13334)
+++ load.php	(working copy)
@@ -382,7 +382,7 @@
 function wp_not_installed() {
 	if ( is_multisite() ) {
 		if ( ! is_blog_installed() && ! defined( 'WP_INSTALLING' ) )
-			wp_die( __( 'The blog you have requested is not installed properly. Please contact the system administrator.' ) );
+			wp_die( /*WP_I18N_MS_NOT_INSTALLED*/'The blog you have requested is not installed properly. Please contact the system administrator.'/*/WP_I18N_MS_NOT_INSTALLED*/ );
 	} elseif ( ! is_blog_installed() && false === strpos( $_SERVER['PHP_SELF'], 'install.php' ) && !defined( 'WP_INSTALLING' ) ) {
 		if ( defined( 'WP_SITEURL' ) )
 			$link = WP_SITEURL . '/wp-admin/install.php';
Index: ms-load.php
===================================================================
--- ms-load.php	(revision 13334)
+++ ms-load.php	(working copy)
@@ -180,6 +180,7 @@
  *
  * Used when blog does not exist. Checks for a missing $wpdb->site table as well.
  *
+ * @todo We don't have i18n here
  * @access private
  * @since 3.0.0
  */
Index: ms-settings.php
===================================================================
--- ms-settings.php	(revision 13334)
+++ ms-settings.php	(working copy)
@@ -110,8 +110,9 @@
 	if ( defined( 'WP_INSTALLING' ) ) {
 		$current_blog->blog_id = $blog_id = 1;
     } else {
-		$msg = ! $wpdb->get_var( "SHOW TABLES LIKE '$wpdb->site'" ) ? ' ' . __( 'Database tables are missing.' ) : '';
-		wp_die( __( 'No blog by that name on this system.' ) . $msg );
+		// No i18n yet.
+		$msg = ! $wpdb->get_var( "SHOW TABLES LIKE '$wpdb->site'" ) ? ' ' . /*WP_I18N_NO_MS_TABLES*/'Database tables are missing.'/*/WP_I18N_NO_MS_TABLES*/ : '';
+		wp_die( /*WP_I18N_NO_BLOG*/'No blog by that name on this system.'/*/WP_I18N_NO_BLOG*/ . $msg );
     }
 }