From 442d41291a5fb8cc5cc24c060ad5055aab641699 Mon Sep 17 00:00:00 2001 From: dd32 Date: Sun, 11 Apr 2010 10:41:54 +0000 Subject: [PATCH] Tweak new strings for better typography. Props demetris. Fixes #12962 git-svn-id: http://svn.automattic.com/wordpress/trunk@14070 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-activate.php | 4 +- wp-admin/custom-background.php | 2 +- wp-admin/edit-tag-form.php | 2 +- wp-admin/import/mt.php | 2 +- wp-admin/ms-edit.php | 2 +- wp-admin/ms-options.php | 12 ++--- wp-admin/ms-sites.php | 24 +++++----- wp-admin/ms-themes.php | 2 +- wp-admin/ms-upgrade-network.php | 12 ++--- wp-admin/my-sites.php | 6 +-- wp-admin/network.php | 22 ++++----- wp-admin/options-discussion.php | 4 +- wp-admin/options.php | 2 +- wp-admin/update-core.php | 10 ++-- wp-includes/author-template.php | 2 +- wp-includes/comment-template.php | 2 +- wp-includes/formatting.php | 2 +- wp-includes/general-template.php | 2 +- wp-includes/ms-functions.php | 12 ++--- wp-includes/ms-load.php | 4 +- wp-includes/ms-settings.php | 2 +- wp-includes/pluggable.php | 12 ++--- wp-mail.php | 2 +- wp-signup.php | 80 ++++++++++++++++---------------- 24 files changed, 113 insertions(+), 113 deletions(-) diff --git a/wp-activate.php b/wp-activate.php index 90021038a..5225ec9ec 100644 --- a/wp-activate.php +++ b/wp-activate.php @@ -64,9 +64,9 @@ get_header();

domain . $signup->path == '' ) { - printf(__('

Your account has been activated. You may now login to the site using your chosen username of "%2$s". Please check your email inbox at %3$s for your password and login instructions. If you do not receive an email, please check your junk or spam folder. If you still do not receive an email within an hour, you can reset your password.

'), network_site_url('wp-login.php', 'login'), $signup->user_login, $signup->user_email, network_site_url('wp-login.php?action=lostpassword', 'login')); + printf(__('

Your account has been activated. You may now login to the site using your chosen username of “%2$s”. Please check your email inbox at %3$s for your password and login instructions. If you do not receive an email, please check your junk or spam folder. If you still do not receive an email within an hour, you can reset your password.

'), network_site_url('wp-login.php', 'login'), $signup->user_login, $signup->user_email, network_site_url('wp-login.php?action=lostpassword', 'login')); } else { - printf(__('

Your site at %2$s is active. You may now login to your site using your chosen username of "%3$s". Please check your email inbox at %4$s for your password and login instructions. If you do not receive an email, please check your junk or spam folder. If you still do not receive an email within an hour, you can reset your password.

'), 'http://' . $signup->domain, $signup->domain, $signup->user_login, $signup->user_email, network_site_url('wp-login.php?action=lostpassword')); + printf(__('

Your site at %2$s is active. You may now log in to your site using your chosen username of “%3$s”. Please check your email inbox at %4$s for your password and login instructions. If you do not receive an email, please check your junk or spam folder. If you still do not receive an email within an hour, you can reset your password.

'), 'http://' . $signup->domain, $signup->domain, $signup->user_login, $signup->user_email, network_site_url('wp-login.php?action=lostpassword')); } } else { ?> diff --git a/wp-admin/custom-background.php b/wp-admin/custom-background.php index 3084ef1f4..941cdd480 100644 --- a/wp-admin/custom-background.php +++ b/wp-admin/custom-background.php @@ -246,7 +246,7 @@ class Custom_Background {

-

+

diff --git a/wp-admin/edit-tag-form.php b/wp-admin/edit-tag-form.php index 366bb2f6b..89b2c16ec 100644 --- a/wp-admin/edit-tag-form.php +++ b/wp-admin/edit-tag-form.php @@ -11,7 +11,7 @@ if ( !defined('ABSPATH') ) die('-1'); if ( empty($tag_ID) ) { ?> -

+

header(); ?>
-

mt-export.txt in your /wp-content/ directory and then click "Import mt-export.txt"'); ?>

+

mt-export.txt in your /wp-content/ directory and then click “Import mt-export.txt”.' ); ?>

diff --git a/wp-admin/ms-edit.php b/wp-admin/ms-edit.php index c49e18aab..fcf7ce5d9 100644 --- a/wp-admin/ms-edit.php +++ b/wp-admin/ms-edit.php @@ -147,7 +147,7 @@ switch ( $_GET['action'] ) { wp_die( __( 'You do not have permission to access this page.' ) ); if ( is_array( $_POST['blog'] ) == false ) - wp_die( __( "Can't create an empty site." ) ); + wp_die( __( 'Can’t create an empty site.' ) ); $blog = $_POST['blog']; $domain = ''; if ( ! preg_match( '/(--)/', $blog['domain'] ) && preg_match( '|^([a-zA-Z0-9-])+$|', $blog['domain'] ) ) diff --git a/wp-admin/ms-options.php b/wp-admin/ms-options.php index cd6ab9d6e..3bd5acf1c 100644 --- a/wp-admin/ms-options.php +++ b/wp-admin/ms-options.php @@ -74,7 +74,7 @@ if (isset($_GET['updated'])) {
- New users are added to this site as the user role defined below if they don't have a site. Leave blank for the main site. Users with the subscriber role on old site will be moved to the new site if changed. The new site will be created if it does not exist." ); ?> + New users are added to this site as the user role defined below if they don’t have a site. Leave blank for the main site. Users with the subscriber role on old site will be moved to the new site if changed. The new site will be created if it does not exist.' ); ?> @@ -85,7 +85,7 @@ if (isset($_GET['updated'])) { ?>
- + @@ -113,7 +113,7 @@ if (isset($_GET['updated'])) {

' . __( 'If registration is disabled, please set NOBLOGREDIRECT in wp-config.php to a url you will redirect visitors to if they visit a non-existent site.' ) . '

'; + echo '

' . __( 'If registration is disabled, please set NOBLOGREDIRECT in wp-config.php to a URL you will redirect visitors to if they visit a non-existent site.' ) . '

'; } ?> @@ -152,7 +152,7 @@ if (isset($_GET['updated'])) { $limited_email_domains = str_replace( ' ', "\n", $limited_email_domains ); ?>
- + @@ -161,7 +161,7 @@ if (isset($_GET['updated'])) {
- + @@ -234,7 +234,7 @@ if (isset($_GET['updated'])) {


- + diff --git a/wp-admin/ms-sites.php b/wp-admin/ms-sites.php index a620badf2..7ecfe35f3 100644 --- a/wp-admin/ms-sites.php +++ b/wp-admin/ms-sites.php @@ -128,10 +128,10 @@ switch ( $action ) { $checked_fields = array( 'public' => __( 'Public' ) ); else $checked_fields = array( - 'public' => __('Public'), - 'archived' => __('Archived'), - 'spam' => __('Spam'), - 'deleted' => __('Deleted'), + 'public' => __( 'Public' ), + 'archived' => __( 'Archived' ), + 'spam' => __( 'Spam' ), + 'deleted' => __( 'Deleted' ), ); $checked_fields['mature'] = __( 'Mature' ); foreach ( $checked_fields as $field_key => $field_label ) { @@ -274,7 +274,7 @@ switch ( $action ) {

-

+

@@ -551,21 +551,21 @@ switch ( $action ) { $actions['backend'] = "" . __( 'Backend' ) . ''; if ( $current_site->blog_id != $blog['blog_id'] ) { if ( get_blog_status( $blog['blog_id'], 'deleted' ) == '1' ) - $actions['activate'] = '' . __( 'Activate' ) . ''; + $actions['activate'] = '' . __( 'Activate' ) . ''; else - $actions['deactivate'] = '' . __( 'Deactivate' ) . ''; + $actions['deactivate'] = '' . __( 'Deactivate' ) . ''; if ( get_blog_status( $blog['blog_id'], 'archived' ) == '1' ) - $actions['unarchive'] = '' . __( 'Unarchive' ) . ''; + $actions['unarchive'] = '' . __( 'Unarchive' ) . ''; else - $actions['archive'] = '' . __( 'Archive' ) . ''; + $actions['archive'] = '' . __( 'Archive' ) . ''; if ( get_blog_status( $blog['blog_id'], 'spam' ) == '1' ) - $actions['unspam'] = '' . __( 'Not Spam' ) . ''; + $actions['unspam'] = '' . __( 'Not Spam' ) . ''; else - $actions['spam'] = '' . __( 'Spam' ) . ''; + $actions['spam'] = '' . __( 'Spam' ) . ''; - $actions['delete'] = '' . __( 'Delete' ) . ''; + $actions['delete'] = '' . __( 'Delete' ) . ''; } $actions['visit'] = "" . __( 'Visit' ) . ''; diff --git a/wp-admin/ms-themes.php b/wp-admin/ms-themes.php index 51aa3588d..61fa51c8e 100644 --- a/wp-admin/ms-themes.php +++ b/wp-admin/ms-themes.php @@ -29,7 +29,7 @@ $allowed_themes = get_site_allowed_themes();

-

+

diff --git a/wp-admin/ms-upgrade-network.php b/wp-admin/ms-upgrade-network.php index 19c361183..6a4e1ea15 100644 --- a/wp-admin/ms-upgrade-network.php +++ b/wp-admin/ms-upgrade-network.php @@ -10,20 +10,20 @@ require_once('admin.php'); if ( !is_multisite() ) - wp_die( __('Multisite support is not enabled.') ); + wp_die( __( 'Multisite support is not enabled.' ) ); require_once( ABSPATH . WPINC . '/http.php' ); -$title = __('Update Network'); +$title = __( 'Update Network' ); $parent_file = 'ms-admin.php'; require_once('admin-header.php'); if ( ! current_user_can( 'manage_network' ) ) - wp_die( __('You do not have permission to access this page.') ); + wp_die( __( 'You do not have permission to access this page.' ) ); echo '
'; screen_icon(); -echo '

'.__('Update Network').'

'; +echo '

' . __( 'Update Network' ) . '

'; $action = isset($_GET['action']) ? $_GET['action'] : 'show'; @@ -54,7 +54,7 @@ switch ( $action ) { } } echo ""; - ?>

+ ?>