From cfbffea85e50667c6c82742d30a38ff7842f61a8 Mon Sep 17 00:00:00 2001
From: wpmuguru <wpmuguru@1a063a9b-81f0-0310-95a4-ce76da25c4cd>
Date: Mon, 1 Feb 2010 20:01:14 +0000
Subject: [PATCH] minor fixes to populate_options(), UI tweaks, see #11644

git-svn-id: http://svn.automattic.com/wordpress/trunk@12920 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-admin/includes/ms.php     | 3 ++-
 wp-admin/includes/schema.php | 6 ++++--
 wp-admin/menu.php            | 6 ++++--
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/wp-admin/includes/ms.php b/wp-admin/includes/ms.php
index 966e5d9fad..4ed3d9d85f 100644
--- a/wp-admin/includes/ms.php
+++ b/wp-admin/includes/ms.php
@@ -767,7 +767,8 @@ function choose_primary_blog() {
 	?>
 	<table class="form-table">
 	<tr>
-		<th scope="row"><?php _e('Primary Blog'); ?></th>
+	<?php /* translators: My sites label */ ?>
+		<th scope="row"><?php _e('Primary Site'); ?></th>
 		<td>
 		<?php
 		$all_blogs = get_blogs_of_user( $current_user->ID );
diff --git a/wp-admin/includes/schema.php b/wp-admin/includes/schema.php
index 93ff523f8f..6fcec06d7a 100644
--- a/wp-admin/includes/schema.php
+++ b/wp-admin/includes/schema.php
@@ -180,7 +180,7 @@ CREATE TABLE $wpdb->usermeta (
  * @uses $wp_db_version
  */
 function populate_options() {
-	global $wpdb, $wp_db_version;
+	global $wpdb, $wp_db_version, $current_site;
 
 	$guessurl = wp_guess_url();
 
@@ -196,7 +196,8 @@ function populate_options() {
 	$options = array(
 	'siteurl' => $guessurl,
 	'blogname' => __('My Blog'),
-	'blogdescription' => __('Just another WordPress weblog'),
+	/* translators: blog tagline */
+	'blogdescription' => __('Just another WordPress site'),
 	'users_can_register' => 0,
 	'admin_email' => 'you@example.com',
 	'start_of_week' => 1,
@@ -319,6 +320,7 @@ function populate_options() {
 
 	// 3.0 multisite
 	if ( is_multisite() ) {
+		/* translators: blog tagline */
 		$options[ 'blogdescription' ] = sprintf(__('Just another %s site'), $current_site->site_name );
 		$options[ 'permalink_structure' ] = '/%year%/%monthnum%/%day%/%postname%/';
 	}
diff --git a/wp-admin/menu.php b/wp-admin/menu.php
index 90cb20ff23..05be67ea4f 100644
--- a/wp-admin/menu.php
+++ b/wp-admin/menu.php
@@ -33,9 +33,11 @@ if ( is_multisite() ) {
 
 if ( is_multisite() && is_super_admin() ) {
 	$menu[1] = array( '', 'read', 'separator0', '', 'wp-menu-separator' );
-	$menu[2] = array(__('Site Admin'), '10', 'ms-admin.php', '', 'menu-top menu-top-first', 'menu-site', 'div');
+	/* translators: Network menu item */
+	$menu[2] = array(__('Network'), '10', 'ms-admin.php', '', 'menu-top menu-top-first', 'menu-site', 'div');
 	$submenu[ 'ms-admin.php' ][1] = array( __('Admin'), 'super_admin', 'ms-admin.php' );
-	$submenu[ 'ms-admin.php' ][5] = array( __('Blogs'), 'super_admin', 'ms-sites.php' );
+	/* translators: Sites menu item */
+	$submenu[ 'ms-admin.php' ][5] = array( __('Sites'), 'super_admin', 'ms-sites.php' );
 	$submenu[ 'ms-admin.php' ][10] = array( __('Users'), 'super_admin', 'ms-users.php' );
 	$submenu[ 'ms-admin.php' ][20] = array( __('Themes'), 'super_admin', 'ms-themes.php' );
 	$submenu[ 'ms-admin.php' ][25] = array( __('Options'), 'super_admin', 'ms-options.php' );