WordPress.org
Get WordPress

Make WordPress Core

Changeset 12789


Ignore:
Timestamp:
01/21/2010 09:37:43 PM (15 years ago)
Author:
ryan
Message:

i18n fixes. Props nbachiyski. fixes #11954

Location:
trunk
Files:
43 edited

Legend:

Unmodified
Added
Removed

  • trunk/wp-admin/admin-ajax.php

    r12736 r12789  
    2929            die('-1');
    3030
    31         $message = sprintf( __('<strong>ALERT: You are logged out!</strong> Could not save draft. <a href="%s" target="blank">Please log in again.</a>'), wp_login_url() );
     31        $message = sprintf( __('<strong>ALERT: You are logged out!</strong> Could not save draft. <a href="%s" target="_blank">Please log in again.</a>'), wp_login_url() );
    3232            $x = new WP_Ajax_Response( array(
    3333                'what' => 'autosave',
    … …  
    920920    /* translators: draft saved date format, see http://php.net/date */
    921921    $draft_saved_date_format = __('g:i:s a');
    922     $message = sprintf( __('Draft Saved at %s.'), date_i18n( $draft_saved_date_format ) );
     922    $message = sprintf( __('Draft saved at %s.'), date_i18n( $draft_saved_date_format ) );
    923923
    924924    $supplemental = array();

  • trunk/wp-admin/comment.php

    r12402 r12789  
    133133</table>
    134134
    135 <p><?php _e('Are you sure you want to do that?'); ?></p>
     135<p><?php _e('Are you sure you want to do this?'); ?></p>
    136136
    137137<form action='comment.php' method='get'>

  • trunk/wp-admin/edit-comments.php

    r12715 r12789  
    178178//, number_format_i18n($num_comments->spam) ), "<span class='spam-comment-count'>" . number_format_i18n($num_comments->spam) . "</span>")
    179179$stati = array(
    180         'all' => _n_noop('All', 'All'), // singular not used
     180        'all' => _nx_noop('All', 'All', 'comments'), // singular not used
    181181        'moderated' => _n_noop('Pending <span class="count">(<span class="pending-count">%s</span>)</span>', 'Pending <span class="count">(<span class="pending-count">%s</span>)</span>'),
    182182        'approved' => _n_noop('Approved', 'Approved'), // singular not used

  • trunk/wp-admin/edit-form-advanced.php

    r12751 r12789  
    2828    __('Custom field deleted.'),
    2929    __('Post updated.'),
     30    /* translators: %s: date and time of the revision */
    3031    isset($_GET['revision']) ? sprintf( __('Post restored to revision from %s'), wp_post_revision_title( (int) $_GET['revision'], false ) ) : false,
    3132    sprintf( __('Post published. <a href="%s">View post</a>'), get_permalink($post_ID) ),
    3233    __('Post saved.'),
    3334    sprintf( __('Post submitted. <a target="_blank" href="%s">Preview post</a>'), add_query_arg( 'preview', 'true', get_permalink($post_ID) ) ),
    34     // translators: Publish box date format, see http://php.net/date - Same as in meta-boxes.php
    35     sprintf( __('Post scheduled for: <b>%1$s</b>. <a target="_blank" href="%2$s">Preview post</a>'), date_i18n( __( 'M j, Y @ G:i' ), strtotime( $post->post_date ) ), get_permalink($post_ID) ),
     35    sprintf( __('Post scheduled for: <strong>%1$s</strong>. <a target="_blank" href="%2$s">Preview post</a>'),
     36        // translators: Publish box date format, see http://php.net/date
     37        date_i18n( __( 'M j, Y @ G:i' ), strtotime( $post->post_date ) ), get_permalink($post_ID) ),
    3638    sprintf( __('Post draft updated. <a target="_blank" href="%s">Preview post</a>'), add_query_arg( 'preview', 'true', get_permalink($post_ID) ) )
    3739);
    … …  
    4547    sprintf( __('Page published. <a href="%s">View page</a>'), get_permalink($post_ID) ),
    4648    sprintf( __('Page submitted. <a target="_blank" href="%s">Preview page</a>'), add_query_arg( 'preview', 'true', get_permalink($post_ID) ) ),
    47     // translators: Publish box date format, see http://php.net/date - Same as in meta-boxes.php
    48     sprintf( __('Page scheduled for: <b>%1$s</b>. <a target="_blank" href="%2$s">Preview page</a>'), date_i18n( __( 'M j, Y @ G:i' ), strtotime( $post->post_date ) ), get_permalink($post_ID) ),
     49    sprintf( __('Page scheduled for: <strong>%1$s</strong>. <a target="_blank" href="%2$s">Preview page</a>'), date_i18n( __( 'M j, Y @ G:i' ), strtotime( $post->post_date ) ), get_permalink($post_ID) ),
    4950    sprintf( __('Page draft updated. <a target="_blank" href="%s">Preview page</a>'), add_query_arg( 'preview', 'true', get_permalink($post_ID) ) )
    5051);
    … …  
    7677        foreach ( _wp_post_revision_fields() as $autosave_field => $_autosave_field ) {
    7778            if ( normalize_whitespace( $autosave->$autosave_field ) != normalize_whitespace( $post->$autosave_field ) ) {
    78                 $notice = sprintf( __( 'There is an autosave of this post that is more recent than the version below.  <a href="%s">View the autosave</a>.' ), get_edit_post_link( $autosave->ID ) );
     79                $notice = sprintf( __( 'There is an autosave of this post that is more recent than the version below.  <a href="%s">View the autosave</a>' ), get_edit_post_link( $autosave->ID ) );
    7980                break;
    8081            }

  • trunk/wp-admin/edit.php

    r12783 r12789  
    172172<?php
    173173if ( isset($_GET['posted']) && $_GET['posted'] ) : $_GET['posted'] = (int) $_GET['posted']; ?>
    174 <div id="message" class="updated"><p><strong><?php _e('This has been saved.'); ?></strong> <a href="<?php echo get_permalink( $_GET['posted'] ); ?>"><?php _e('View post'); ?></a> | <a href="<?php echo get_edit_post_link( $_GET['posted'] ); ?>"><?php _e('Edit post'); ?></a></p></div>
     174<div id="message" class="updated"><p><strong><?php _e('This has been saved.'); ?></strong> <a href="<?php echo get_permalink( $_GET['posted'] ); ?>"><?php _e('View Post'); ?></a> | <a href="<?php echo get_edit_post_link( $_GET['posted'] ); ?>"><?php _e('Edit Post'); ?></a></p></div>
    175175<?php $_SERVER['REQUEST_URI'] = remove_query_arg(array('posted'), $_SERVER['REQUEST_URI']);
    176176endif; ?>

  • trunk/wp-admin/import/blogger.php

    r12752 r12789  
    660660        }
    661661
    662         $directions = __('All posts were imported with the current user as author. Use this form to move each Blogger user&#8217;s posts to a different WordPress user. You may <a href="users.php">add users</a> and then return to this page and complete the user mapping. This form may be used as many times as you like until you activate the &#8220;Restart&#8221; function below.');
     662        $directions = sprintf( __('All posts were imported with the current user as author. Use this form to move each Blogger user&#8217;s posts to a different WordPress user. You may <a href="%s">add users</a> and then return to this page and complete the user mapping. This form may be used as many times as you like until you activate the &#8220;Restart&#8221; function below.'), 'users.php' );
    663663        $heading = __('Author mapping');
    664664        $blogtitle = "{$blog['title']} ({$blog['host']})";

  • trunk/wp-admin/import/greymatter.php

    r12513 r12789  
    4343<li><?php _e('Parse gm-counter.cgi, gm-banlist.cgi, gm-cplog.cgi (you can make a CP log hack if you really feel like it, but I question the need of a CP log).') ?></li>
    4444<li><?php _e('Import gm-templates.') ?></li>
    45 <li><?php _e("Doesn't keep entries on top.")?></li>
     45<li><?php _e("Doesn&#8217;t keep entries on top.")?></li>
    4646</ul>
    4747<p>&nbsp;</p>

  • trunk/wp-admin/import/livejournal.php

    r12533 r12789  
    491491        update_option( 'ljapi_highest_id', $highest_id );
    492492
    493         echo '<p>' . __( ' Comment metadata downloaded successfully, proceeding with comment bodies...' ) . '</p>';
     493        echo '<p>' . __( 'Comment metadata downloaded successfully, proceeding with comment bodies...' ) . '</p>';
    494494
    495495        return true;

  • trunk/wp-admin/import/mt.php

    r12513 r12789  
    6060        $users = $wpdb->get_results("SELECT * FROM $wpdb->users ORDER BY ID");
    6161?><select name="userselect[<?php echo $n; ?>]">
    62     <option value="#NONE#"><?php _e('- Select -') ?></option>
     62    <option value="#NONE#"><?php _e('&mdash; Select &mdash;') ?></option>
    6363    <?php
    6464
    … …  
    270270            if ( 1 < strlen($post->post_keywords) ) {
    271271                // Keywords exist.
    272                 printf(__('<br />Adding tags <i>%s</i>...'), stripslashes($post->post_keywords));
     272                printf('<br />'.__('Adding tags <em>%s</em>...'), stripslashes($post->post_keywords));
    273273                wp_add_post_tags($post_id, $post->post_keywords);
    274274            }

  • trunk/wp-admin/import/rss.php

    r12104 r12789  
    140140                if (0 != count($categories))
    141141                    wp_create_categories($categories, $post_id);
    142                 _e('Done !');
     142                _e('Done!');
    143143            }
    144144            echo '</li>';

  • trunk/wp-admin/includes/class-wp-upgrader.php

    r12752 r12789  
    4444        $this->strings['bad_request'] = __('Invalid Data provided.');
    4545        $this->strings['fs_unavailable'] = __('Could not access filesystem.');
    46         $this->strings['fs_error'] = __('Filesystem error');
     46        $this->strings['fs_error'] = __('Filesystem error.');
    4747        $this->strings['fs_no_root_dir'] = __('Unable to locate WordPress Root directory.');
    4848        $this->strings['fs_no_content_dir'] = __('Unable to locate WordPress Content directory (wp-content).');
    … …  
    5555        $this->strings['folder_exists'] = __('Destination folder already exists.');
    5656        $this->strings['mkdir_failed'] = __('Could not create directory.');
    57         $this->strings['bad_package'] = __('Incompatible Archive');
     57        $this->strings['bad_package'] = __('Incompatible Archive.');
    5858
    5959        $this->strings['maintenance_start'] = __('Enabling Maintenance mode&#8230;');
    … …  
    469469        foreach ( $plugins as $plugin ) {
    470470
    471             $this->show_before = sprintf( '<h4>' . __('Updating plugin %1$d of %2$d...') . '</h4>', $i, $all );
     471            $this->show_before = sprintf( '<h4>' . __('Updating plugin %1$d of %2$d&#8230;') . '</h4>', $i, $all );
    472472            $i++;
    473473

  • trunk/wp-admin/includes/dashboard.php

    r12783 r12789  
    583583
    584584            <div class="dashboard-comment-wrap">
    585             <h4 class="comment-meta"><?php printf( __( 'From %1$s on %2$s%3$s' ), '<cite class="comment-author">' . get_comment_author_link() . '</cite>', $comment_post_link.' '.$comment_link, ' <span class="approve">' . __( '[Pending]' ) . '</span>' ); ?></h4>
     585            <h4 class="comment-meta">
     586                <?php printf( /* translators: 1: comment author, 2: post link, 3: notification if the comment is pending */__( 'From %1$s on %2$s%3$s' ),
     587                    '<cite class="comment-author">' . get_comment_author_link() . '</cite>', $comment_post_link.' '.$comment_link, ' <span class="approve">' . __( '[Pending]' ) . '</span>' ); ?>
     588            </h4>
    586589
    587590            <?php

  • trunk/wp-admin/includes/file.php

    r12752 r12789  
    453453    //WARNING: The file is not automatically deleted, The script must unlink() the file.
    454454    if ( ! $url )
    455         return new WP_Error('http_no_url', __('Invalid URL Provided'));
     455        return new WP_Error('http_no_url', __('Invalid URL Provided.'));
    456456
    457457    $tmpfname = wp_tempnam($url);
    458458    if ( ! $tmpfname )
    459         return new WP_Error('http_no_file', __('Could not create Temporary file'));
     459        return new WP_Error('http_no_file', __('Could not create Temporary file.'));
    460460
    461461    $handle = @fopen($tmpfname, 'wb');
    462462    if ( ! $handle )
    463         return new WP_Error('http_no_file', __('Could not create Temporary file'));
     463        return new WP_Error('http_no_file', __('Could not create Temporary file.'));
    464464
    465465    $response = wp_remote_get($url, array('timeout' => 300));
    … …  
    513513    // Is the archive valid?
    514514    if ( false == ($archive_files = $archive->extract(PCLZIP_OPT_EXTRACT_AS_STRING)) )
    515         return new WP_Error('incompatible_archive', __('Incompatible archive'), $archive->errorInfo(true));
     515        return new WP_Error('incompatible_archive', __('Incompatible Archive.'), $archive->errorInfo(true));
    516516
    517517    if ( 0 == count($archive_files) )
    518         return new WP_Error('empty_archive', __('Empty archive'));
     518        return new WP_Error('empty_archive', __('Empty archive.'));
    519519
    520520    $path = explode('/', untrailingslashit($to));
    … …  
    525525                $tmppath = implode('/', array_slice($path, 0, $i) );
    526526                if ( ! $fs->mkdir($tmppath, FS_CHMOD_DIR) )
    527                     return new WP_Error('mkdir_failed', __('Could not create directory'), $tmppath);
     527                    return new WP_Error('mkdir_failed', __('Could not create directory.'), $tmppath);
    528528            }
    529529            break; //Exit main for loop
    … …  
    543543                    $tmppath = $to . implode('/', array_slice($path, 0, $i) );
    544544                    if ( ! $fs->is_dir($tmppath) && ! $fs->mkdir($tmppath, FS_CHMOD_DIR) )
    545                         return new WP_Error('mkdir_failed', __('Could not create directory'), $tmppath);
     545                        return new WP_Error('mkdir_failed', __('Could not create directory.'), $tmppath);
    546546                }
    547547                break; //Exit main for loop
    … …  
    552552        if ( ! $file['folder'] ) {
    553553            if ( !$fs->put_contents( $to . $file['filename'], $file['content'], FS_CHMOD_FILE) )
    554                 return new WP_Error('copy_failed', __('Could not copy file'), $to . $file['filename']);
     554                return new WP_Error('copy_failed', __('Could not copy file.'), $to . $file['filename']);
    555555        }
    556556    }
    … …  
    582582                $wp_filesystem->chmod($to . $filename, 0644);
    583583                if ( ! $wp_filesystem->copy($from . $filename, $to . $filename, true) )
    584                     return new WP_Error('copy_failed', __('Could not copy file'), $to . $filename);
     584                    return new WP_Error('copy_failed', __('Could not copy file.'), $to . $filename);
    585585            }
    586586            $wp_filesystem->chmod($to . $filename, FS_CHMOD_FILE);
    … …  
    588588            if ( !$wp_filesystem->is_dir($to . $filename) ) {
    589589                if ( !$wp_filesystem->mkdir($to . $filename, FS_CHMOD_DIR) )
    590                     return new WP_Error('mkdir_failed', __('Could not create directory'), $to . $filename);
     590                    return new WP_Error('mkdir_failed', __('Could not create directory.'), $to . $filename);
    591591            }
    592592            $result = copy_dir($from . $filename, $to . $filename);

  • trunk/wp-admin/includes/image-edit.php

    r12733 r12789  
    100100
    101101        if ( !defined('IMAGE_EDIT_OVERWRITE') || !IMAGE_EDIT_OVERWRITE )
    102             _e(' Previously edited copies of the image will not be deleted.');
     102            echo ' '.__('Previously edited copies of the image will not be deleted.');
    103103
    104104        ?></p>
    … …  
    119119        <div class="imgedit-help">
    120120        <p><?php _e('The image can be cropped by clicking on it and dragging to select the desired part. While dragging the dimensions of the selection are displayed below.'); ?></p>
    121         <strong><?php _e('Keyboard shortcuts'); ?></strong>
     121        <strong><?php _e('Keyboard Shortcuts'); ?></strong>
    122122        <ul>
    123123        <li><?php _e('Arrow: move by 10px'); ?></li>

  • trunk/wp-admin/includes/media.php

    r12733 r12789  
    820820
    821821        // get a list of the actual pixel dimensions of each possible intermediate version of this image
    822         $size_names = array('thumbnail' => __('Thumbnail'), 'medium' => __('Medium'), 'large' => __('Large'), 'full' => __('Full size'));
     822        $size_names = array('thumbnail' => __('Thumbnail'), 'medium' => __('Medium'), 'large' => __('Large'), 'full' => __('Full Size'));
    823823
    824824        if ( empty($check) )
    … …  
    849849            // only show the dimensions if that choice is available
    850850            if ( $enabled )
    851                 $html .= " <label for='{$css_id}' class='help'>" . sprintf( __("(%d&nbsp;&times;&nbsp;%d)"), $downsize[1], $downsize[2] ). "</label>";
     851                $html .= " <label for='{$css_id}' class='help'>" . sprintf( "(%d&nbsp;&times;&nbsp;%d)", $downsize[1], $downsize[2] ). "</label>";
    852852
    853853            $html .= '</div>';
    … …  
    913913        $form_fields['image_alt'] = array(
    914914            'value' => $alt,
    915             'label' => __('Alternate text'),
     915            'label' => __('Alternate Text'),
    916916            'helps' => __('Alt text for the image, e.g. &#8220;The Mona Lisa&#8221;')
    917917        );
    … …  
    12011201    if ( gd_edit_image_support( $post->post_mime_type ) ) {
    12021202        $nonce = wp_create_nonce( "image_editor-$post->ID" );
    1203         $image_edit_button = "<input type='button' id='imgedit-open-btn-$post->ID' onclick='imageEdit.open( $post->ID, \"$nonce\" )' class='button' value='" . esc_attr__( 'Edit image' ) . "' /> <img src='images/wpspin_light.gif' class='imgedit-wait-spin' alt='' />";
     1203        $image_edit_button = "<input type='button' id='imgedit-open-btn-$post->ID' onclick='imageEdit.open( $post->ID, \"$nonce\" )' class='button' value='" . esc_attr__( 'Edit Image' ) . "' /> <img src='images/wpspin_light.gif' class='imgedit-wait-spin' alt='' />";
    12041204    }
    12051205
    … …  
    17731773    <td class="field">
    17741774        <select id="columns" name="columns">
    1775             <option value="2"><?php _e('2'); ?></option>
    1776             <option value="3" selected="selected"><?php _e('3'); ?></option>
    1777             <option value="4"><?php _e('4'); ?></option>
    1778             <option value="5"><?php _e('5'); ?></option>
    1779             <option value="6"><?php _e('6'); ?></option>
    1780             <option value="7"><?php _e('7'); ?></option>
    1781             <option value="8"><?php _e('8'); ?></option>
    1782             <option value="9"><?php _e('9'); ?></option>
     1775            <option value="2">2</option>
     1776            <option value="3" selected="selected">3</option>
     1777            <option value="4">4</option>
     1778            <option value="5">5</option>
     1779            <option value="6">6</option>
     1780            <option value="7">7</option>
     1781            <option value="8">8</option>
     1782            <option value="9">9</option>
    17831783        </select>
    17841784    </td>

  • trunk/wp-admin/includes/meta-boxes.php

    r12680 r12789  
    379379<p class="meta-options">
    380380    <label for="comment_status" class="selectit"><input name="comment_status" type="checkbox" id="comment_status" value="open" <?php checked($post->comment_status, 'open'); ?> /><?php _e('Allow Comments.') ?></label><br />
    381     <label for="ping_status" class="selectit"><input name="ping_status" type="checkbox" id="ping_status" value="open" <?php checked($post->ping_status, 'open'); ?> /><?php printf( __('Allow <a href="%s" target="_blank">trackbacks and pingbacks</a> on this page.'),_x('http://codex.wordpress.org/Introduction_to_Blogging#Managing_Comments','Url to codex article on Managing Comments')); ?></label>
     381    <label for="ping_status" class="selectit"><input name="ping_status" type="checkbox" id="ping_status" value="open" <?php checked($post->ping_status, 'open'); ?> /><?php printf( __('Allow <a href="%s" target="_blank">trackbacks and pingbacks</a> on this page.'),__('http://codex.wordpress.org/Introduction_to_Blogging#Managing_Comments')); ?></label>
    382382</p>
    383383<?php
    … …  
    617617<p><label for="link_target_blank" class="selectit">
    618618<input id="link_target_blank" type="radio" name="link_target" value="_blank" <?php echo ( isset( $link->link_target ) && ($link->link_target == '_blank') ? 'checked="checked"' : ''); ?> />
    619 <?php _e('<code>_blank</code> - new window or tab.'); ?></label></p>
     619<?php _e('<code>_blank</code> &mdash; new window or tab.'); ?></label></p>
    620620<p><label for="link_target_top" class="selectit">
    621621<input id="link_target_top" type="radio" name="link_target" value="_top" <?php echo ( isset( $link->link_target ) && ($link->link_target == '_top') ? 'checked="checked"' : ''); ?> />
    622 <?php _e('<code>_top</code> - current window or tab, with no frames.'); ?></label></p>
     622<?php _e('<code>_top</code> &mdash; current window or tab, with no frames.'); ?></label></p>
    623623<p><label for="link_target_none" class="selectit">
    624624<input id="link_target_none" type="radio" name="link_target" value="" <?php echo ( isset( $link->link_target ) && ($link->link_target == '') ? 'checked="checked"' : ''); ?> />
    625 <?php _e('<code>_none</code> - same window or tab.'); ?></label></p>
     625<?php _e('<code>_none</code> &mdash; same window or tab.'); ?></label></p>
    626626</fieldset>
    627627<p><?php _e('Choose the target frame for your link.'); ?></p>

  • trunk/wp-admin/includes/plugin-install.php

    r12752 r12789  
    216216?>
    217217    <h4><?php _e('Install a plugin in .zip format') ?></h4>
    218     <p class="install-help"><?php _e('If you have a plugin in a .zip format, You may install it by uploading it here.') ?></p>
     218    <p class="install-help"><?php _e('If you have a plugin in a .zip format, you may install it by uploading it here.') ?></p>
    219219    <form method="post" enctype="multipart/form-data" action="<?php echo admin_url('update.php?action=upload-plugin') ?>">
    220220        <?php wp_nonce_field( 'plugin-upload') ?>
    … …  
    504504        </p>
    505505        <?php endif; ?>
    506         <h2 class="mainheader"><?php _e('FYI') ?></h2>
     506        <h2 class="mainheader"><?php /* translators: For Your Information */ _e('FYI') ?></h2>
    507507        <ul>
    508508<?php if ( ! empty($api->version) ) : ?>

  • trunk/wp-admin/includes/plugin.php

    r12752 r12789  
    437437
    438438    if ( is_wp_error($wp_filesystem->errors) && $wp_filesystem->errors->get_error_code() )
    439         return new WP_Error('fs_error', __('Filesystem error'), $wp_filesystem->errors);
     439        return new WP_Error('fs_error', __('Filesystem error.'), $wp_filesystem->errors);
    440440
    441441    //Get the base plugin folder
    … …  
    465465
    466466    if ( ! empty($errors) )
    467         return new WP_Error('could_not_remove_plugin', sprintf(__('Could not fully remove the plugin(s) %s'), implode(', ', $errors)) );
     467        return new WP_Error('could_not_remove_plugin', sprintf(__('Could not fully remove the plugin(s) %s.'), implode(', ', $errors)) );
    468468
    469469    // Force refresh of plugin update information

  • trunk/wp-admin/includes/template.php

    r12783 r12789  
    10641064            $users_opt = array('include' => $authors, 'name' => 'post_author', 'class'=> 'authors', 'multi' => 1, 'echo' => 0);
    10651065            if ( $bulk )
    1066                 $users_opt['show_option_none'] = __('- No Change -');
     1066                $users_opt['show_option_none'] = __('&mdash; No Change &mdash;');
    10671067            $authors_dropdown  = '<label>';
    10681068            $authors_dropdown .= '<span class="title">' . __( 'Author' ) . '</span>';
    … …  
    11251125    $dropdown_args = array('selected' => $post->post_parent, 'name' => 'post_parent', 'show_option_none' => __('Main Page (no parent)'), 'option_none_value' => 0, 'sort_column'=> 'menu_order, post_title');
    11261126    if ( $bulk )
    1127         $dropdown_args['show_option_no_change'] =  __('- No Change -');
     1127        $dropdown_args['show_option_no_change'] =  __('&mdash; No Change &mdash;');
    11281128    $dropdown_args = apply_filters('quick_edit_dropdown_pages_args', $dropdown_args);
    11291129    wp_dropdown_pages($dropdown_args);
    … …  
    11441144            <select name="page_template">
    11451145<?php   if ( $bulk ) : ?>
    1146                 <option value="-1"><?php _e('- No Change -'); ?></option>
     1146                <option value="-1"><?php _e('&mdash; No Change &mdash;'); ?></option>
    11471147<?php   endif; // $bulk ?>
    11481148                <option value="default"><?php _e( 'Default Template' ); ?></option>
    … …  
    11661166            <span class="title"><?php _e( 'Comments' ); ?></span>
    11671167            <select name="comment_status">
    1168                 <option value=""><?php _e('- No Change -'); ?></option>
     1168                <option value=""><?php _e('&mdash; No Change &mdash;'); ?></option>
    11691169                <option value="open"><?php _e('Allow'); ?></option>
    11701170                <option value="closed"><?php _e('Do not allow'); ?></option>
    … …  
    11751175            <span class="title"><?php _e( 'Pings' ); ?></span>
    11761176            <select name="ping_status">
    1177                 <option value=""><?php _e('- No Change -'); ?></option>
     1177                <option value=""><?php _e('&mdash; No Change &mdash;'); ?></option>
    11781178                <option value="open"><?php _e('Allow'); ?></option>
    11791179                <option value="closed"><?php _e('Do not allow'); ?></option>
    … …  
    12041204                <select name="_status">
    12051205<?php if ( $bulk ) : ?>
    1206                     <option value="-1"><?php _e('- No Change -'); ?></option>
     1206                    <option value="-1"><?php _e('&mdash; No Change &mdash;'); ?></option>
    12071207<?php endif; // $bulk ?>
    12081208                <?php if ( $can_publish ) : // Contributors only get "Unpublished" and "Pending Review" ?>
    … …  
    12251225                <span class="title"><?php _e( 'Sticky' ); ?></span>
    12261226                <select name="sticky">
    1227                     <option value="-1"><?php _e( '- No Change -' ); ?></option>
     1227                    <option value="-1"><?php _e( '&mdash; No Change &mdash;' ); ?></option>
    12281228                    <option value="sticky"><?php _e( 'Sticky' ); ?></option>
    12291229                    <option value="unsticky"><?php _e( 'Not Sticky' ); ?></option>
    … …  
    19651965                break;
    19661966            case 'email':
    1967                 $r .= "<td $attributes><a href='mailto:$email' title='" . sprintf( __('e-mail: %s' ), $email ) . "'>$email</a></td>";
     1967                $r .= "<td $attributes><a href='mailto:$email' title='" . sprintf( __('E-mail: %s' ), $email ) . "'>$email</a></td>";
    19681968                break;
    19691969            case 'role':
    … …  
    21472147                echo "<td $attributes>";
    21482148                echo '<div id="submitted-on">';
    2149                 printf( __( '<a href="%1$s">%2$s at %3$s</a>' ), $comment_url, get_comment_date( __('Y/m/d') ), get_comment_date( __( 'g:ia' ) ) );
     2149                /* translators: 2: comment date, 3: comment time */
     2150                printf( __( '<a href="%1$s">%2$s at %3$s</a>' ), $comment_url,
     2151                    /* translators: comment date format. See http://php.net/date */ get_comment_date( __('Y/m/d') ),
     2152                    /* translators: comment time format. See http://php.net/date */ get_comment_date( get_option( 'time_format' ) ) );
    21502153
    21512154                if ( $comment->comment_parent ) {
    … …  
    21532156                    $parent_link = esc_url( get_comment_link( $comment->comment_parent ) );
    21542157                    $name = apply_filters( 'get_comment_author', $parent->comment_author ); // there's no API function for this
    2155                     printf( __( ' | In reply to <a href="%1$s">%2$s</a>.' ), $parent_link, $name );
     2158                    printf( ' | '.__( 'In reply to <a href="%1$s">%2$s</a>.' ), $parent_link, $name );
    21562159                }
    21572160
    … …  
    25452548        natcasesort($keys);
    25462549?>
    2547 <p><strong><?php _e( 'Add new custom field:' ) ?></strong></p>
     2550<p><strong><?php _e( 'Add New Custom Field:' ) ?></strong></p>
    25482551<table id="newmeta">
    25492552<thead>
    … …  
    25592562<?php if ( $keys ) { ?>
    25602563<select id="metakeyselect" name="metakeyselect" tabindex="7">
    2561 <option value="#NONE#"><?php _e( '- Select -' ); ?></option>
     2564<option value="#NONE#"><?php _e( '&mdash; Select &mdash;' ); ?></option>
    25622565<?php
    25632566

  • trunk/wp-admin/includes/theme.php

    r12755 r12789  
    8080
    8181    if ( is_wp_error($wp_filesystem->errors) && $wp_filesystem->errors->get_error_code() )
    82         return new WP_Error('fs_error', __('Filesystem error'), $wp_filesystem->errors);
     82        return new WP_Error('fs_error', __('Filesystem error.'), $wp_filesystem->errors);
    8383
    8484    //Get the base plugin folder
    … …  
    9595
    9696    if ( ! $deleted )
    97         return new WP_Error('could_not_remove_theme', sprintf(__('Could not fully remove the theme %s'), $template) );
     97        return new WP_Error('could_not_remove_theme', sprintf(__('Could not fully remove the theme %s.'), $template) );
    9898
    9999    // Force refresh of theme update information

  • trunk/wp-admin/link-manager.php

    r12546 r12789  
    7373<div class="wrap nosubsub">
    7474<?php screen_icon(); ?>
    75 <h2><?php echo esc_html( $title ); ?> <a href="link-add.php" class="button add-new-h2"><?php esc_html_e('Add New'); ?></a> <?php
     75<h2><?php echo esc_html( $title ); ?> <a href="link-add.php" class="button add-new-h2"><?php esc_html_x('Add New', 'link'); ?></a> <?php
    7676if ( isset($_GET['s']) && $_GET['s'] )
    7777    printf( '<span class="subtitle">' . __('Search results for &#8220;%s&#8221;') . '</span>', esc_html( stripslashes($_GET['s']) ) ); ?>

  • trunk/wp-admin/maint/repair.php

    r12788 r12789  
    2020
    2121if ( !defined('WP_ALLOW_REPAIR') ) {
    22     _e("<p>To allow use of this page to automatically repair database problems, please add the following line to your wp-config.php file.  Once this line is added to your config, reload this page.</p><code>define('WP_ALLOW_REPAIR', true);</code>");
     22    echo '<p>'.__('To allow use of this page to automatically repair database problems, please add the following line to your wp-config.php file.  Once this line is added to your config, reload this page.')."</p><code>define('WP_ALLOW_REPAIR', true);</code>";
    2323} elseif ( isset($_GET['repair']) ) {
    2424    $problems = array();
    … …  
    6767
    6868    if ( !empty($problems) ) {
    69         printf(__('<p>Some database problems could not be repaired. Please copy-and-paste the following list of errors to the <a href="%s">WordPress support forums</a> to get additional assistance.</p>'), 'http://wordpress.org/support/forum/3');
     69        printf('<p>'.__('Some database problems could not be repaired. Please copy-and-paste the following list of errors to the <a href="%s">WordPress support forums</a> to get additional assistance.').'</p>', 'http://wordpress.org/support/forum/3');
    7070        $problem_output = array();
    7171        foreach ( $problems as $table => $problem )
    … …  
    7373        echo '<textarea name="errors" id="errors" rows="20" cols="60">' . format_to_edit(implode("\n", $problem_output)) . '</textarea>';
    7474    } else {
    75         _e("<p>Repairs complete.  Please remove the following line from wp-config.php to prevent this page from being used by unauthorized users.</p><code>define('WP_ALLOW_REPAIR', true);</code>");
     75        echo '<p>'.__('Repairs complete.  Please remove the following line from wp-config.php to prevent this page from being used by unauthorized users.')."</p><code>define('WP_ALLOW_REPAIR', true);</code>";
    7676    }
    7777} else {

  • trunk/wp-admin/menu.php

    r12786 r12789  
    6666    $submenu['link-manager.php'][5] = array( __('Edit'), 'manage_links', 'link-manager.php' );
    6767    /* translators: add new links */
    68     $submenu['link-manager.php'][10] = array( _x('Add New', 'links'), 'manage_links', 'link-add.php' );
     68    $submenu['link-manager.php'][10] = array( _x('Add New', 'link'), 'manage_links', 'link-add.php' );
    6969    $submenu['link-manager.php'][15] = array( __('Link Categories'), 'manage_categories', 'edit-link-categories.php' );
    7070
    … …  
    105105    $submenu['themes.php'][5]  = array(__('Themes'), 'switch_themes', 'themes.php');
    106106    if ( !is_multisite() )
    107         $submenu['themes.php'][10] = array(__('Editor'), 'edit_themes', 'theme-editor.php');
     107        $submenu['themes.php'][10] = array(_x('Editor', 'theme editor'), 'edit_themes', 'theme-editor.php');
    108108    $submenu['themes.php'][15] = array(__('Add New Themes'), 'install_themes', 'theme-install.php');
    109109
    … …  
    120120        $submenu['plugins.php'][10] = array(_x('Add New', 'plugin'), 'install_plugins', 'plugin-install.php');
    121121        if ( !is_multisite() )
    122             $submenu['plugins.php'][15] = array( __('Editor'), 'edit_plugins', 'plugin-editor.php' );
     122            $submenu['plugins.php'][15] = array( _x('Editor', 'plugin editor'), 'edit_plugins', 'plugin-editor.php' );
    123123}
    124124
    … …  
    147147
    148148$menu[80] = array( __('Settings'), 'manage_options', 'options-general.php', '', 'menu-top', 'menu-settings', 'div' );
    149     $submenu['options-general.php'][10] = array(__('General'), 'manage_options', 'options-general.php');
     149    $submenu['options-general.php'][10] = array(_x('General', 'settings screen'), 'manage_options', 'options-general.php');
    150150    $submenu['options-general.php'][15] = array(__('Writing'), 'manage_options', 'options-writing.php');
    151151    $submenu['options-general.php'][20] = array(__('Reading'), 'manage_options', 'options-reading.php');

  • trunk/wp-admin/options-discussion.php

    r12712 r12789  
    159159<tr valign="top">
    160160<th scope="row"><?php _e('Avatar Display') ?></th>
    161 <td><fieldset><legend class="screen-reader-text"><span><?php _e('Avatar display') ?></span></legend>
     161<td><fieldset><legend class="screen-reader-text"><span><?php _e('Avatar Display') ?></span></legend>
    162162<?php
    163163    $yesorno = array(0 => __("Don&#8217;t show Avatars"), 1 => __('Show Avatars'));
    … …  
    174174
    175175<?php
    176 $ratings = array( 'G' => __('G &#8212; Suitable for all audiences'), 'PG' => __('PG &#8212; Possibly offensive, usually for audiences 13 and above'), 'R' => __('R &#8212; Intended for adult audiences above 17'), 'X' => __('X &#8212; Even more mature than above'));
     176$ratings = array(
     177    /* translators: Content suitability rating: http://bit.ly/89QxZA */
     178    'G' => __('G &#8212; Suitable for all audiences'),
     179    /* translators: Content suitability rating: http://bit.ly/89QxZA */
     180    'PG' => __('PG &#8212; Possibly offensive, usually for audiences 13 and above'),
     181    /* translators: Content suitability rating: http://bit.ly/89QxZA */
     182    'R' => __('R &#8212; Intended for adult audiences above 17'),
     183    /* translators: Content suitability rating: http://bit.ly/89QxZA */
     184    'X' => __('X &#8212; Even more mature than above')
     185);
    177186foreach ($ratings as $key => $rating) :
    178187    $selected = (get_option('avatar_rating') == $key) ? 'checked="checked"' : '';

  • trunk/wp-admin/options-permalink.php

    r12758 r12789  
    219219<table class="form-table">
    220220    <tr>
    221         <th><label for="category_base"><?php _e('Category base'); ?></label></th>
     221        <th><label for="category_base"><?php /* translators: prefix for category permalinks */ _e('Category base'); ?></label></th>
    222222        <td><?php if ( is_multisite() && !is_subdomain_install() && $current_site->domain.$current_site->path == $current_blog->domain.$current_blog->path ) { echo "/blog"; $category_base = str_replace( "/blog", "", $category_base ); }?> <input name="category_base" id="category_base" type="text" value="<?php echo esc_attr( $category_base ); ?>" class="regular-text code" /></td>
    223223    </tr>

  • trunk/wp-admin/options-reading.php

    r12657 r12789  
    4242    </p>
    4343<ul>
    44     <li><?php printf("<label for='page_on_front'>" . __('Front page: %s') . "</label>", wp_dropdown_pages( array( 'name' => 'page_on_front', 'echo' => 0, 'show_option_none' => __('- Select -'), 'selected' => get_option('page_on_front')  ) ) ); ?></li>
    45     <li><?php printf("<label for='page_for_posts'>". __('Posts page: %s') . "</label>", wp_dropdown_pages( array( 'name' => 'page_for_posts','echo' => 0, 'show_option_none' => __('- Select -'), 'selected' => get_option('page_for_posts') ) ) ); ?></li>
     44    <li><?php printf("<label for='page_on_front'>" . __('Front page: %s') . "</label>", wp_dropdown_pages( array( 'name' => 'page_on_front', 'echo' => 0, 'show_option_none' => __('&mdash; Select &mdash;'), 'selected' => get_option('page_on_front')  ) ) ); ?></li>
     45    <li><?php printf("<label for='page_for_posts'>". __('Posts page: %s') . "</label>", wp_dropdown_pages( array( 'name' => 'page_for_posts','echo' => 0, 'show_option_none' => __('&mdash; Select &mdash;'), 'selected' => get_option('page_for_posts') ) ) ); ?></li>
    4646</ul>
    4747<?php if ( 'page' == get_option('show_on_front') && get_option('page_for_posts') == get_option('page_on_front') ) : ?>

  • trunk/wp-admin/options.php

    r12753 r12789  
    6666
    6767    if ( !isset( $whitelist_options[ $option_page ] ) )
    68         wp_die( __( 'Error! Options page not found.' ) );
     68        wp_die( __( 'Error: options page not found.' ) );
    6969
    7070    if ( 'options' == $option_page ) {

  • trunk/wp-admin/plugins.php

    r12753 r12789  
    184184                        <?php
    185185                        foreach ( $plugin_info as $plugin )
    186                             echo '<li>', sprintf(__('<strong>%s</strong> by <em>%s</em>'), $plugin['Name'], $plugin['Author']), '</li>';
     186                            /* translators: 1: plugin name, 2: plugin author */
     187                            echo '<li>', sprintf(__('<strong>%1$s</strong> by <em>%2$s</em>'), $plugin['Name'], $plugin['Author']), '</li>';
    187188                        ?>
    188189                    </ul>

  • trunk/wp-admin/press-this.php

    r12752 r12789  
    532532    <div class="posting">
    533533        <?php if ( isset($posted) && intval($posted) ) { $post_ID = intval($posted); ?>
    534         <div id="message" class="updated"><p><strong><?php _e('Your post has been saved.'); ?></strong> <a onclick="window.opener.location.replace(this.href); window.close();" href="<?php echo get_permalink( $post_ID); ?>"><?php _e('View post'); ?></a> | <a href="<?php echo get_edit_post_link( $post_ID ); ?>" onclick="window.opener.location.replace(this.href); window.close();"><?php _e('Edit post'); ?></a> | <a href="#" onclick="window.close();"><?php _e('Close Window'); ?></a></p></div>
     534        <div id="message" class="updated"><p><strong><?php _e('Your post has been saved.'); ?></strong> <a onclick="window.opener.location.replace(this.href); window.close();" href="<?php echo get_permalink( $post_ID); ?>"><?php _e('View post'); ?></a> | <a href="<?php echo get_edit_post_link( $post_ID ); ?>" onclick="window.opener.location.replace(this.href); window.close();"><?php _e('Edit Post'); ?></a> | <a href="#" onclick="window.close();"><?php _e('Close Window'); ?></a></p></div>
    535535        <?php } ?>
    536536

  • trunk/wp-admin/themes.php

    r12755 r12789  
    127127            printf( '<p><strong>' . __('There is a new version of %1$s available. <a href="%2$s" class="thickbox" title="%1$s">View version %3$s Details</a> <em>automatic upgrade unavailable for this theme</em>.') . '</strong></p>', $theme_name, $details_url, $update['new_version']);
    128128        else
    129             printf( '<p><strong>' . __('There is a new version of %1$s available. <a href="%2$s" class="thickbox" title="%1$s">View version %3$s Details</a> or <a href="%4$s" %5$s >upgrade automatically</a>.') . '</strong></p>', $theme_name, $details_url, $update['new_version'], $update_url, $update_onclick );
     129            printf( '<p><strong>' . __('There is a new version of %1$s available. <a href="%2$s" class="thickbox" title="%1$s">View version %3$s Details</a> or <a href="%4$s" %5$s>upgrade automatically</a>.') . '</strong></p>', $theme_name, $details_url, $update['new_version'], $update_url, $update_onclick );
    130130    }
    131131}

  • trunk/wp-admin/update.php

    r12752 r12789  
    157157        require_once('admin-header.php');
    158158
    159         $title = sprintf( __('Installing theme: %s'), $api->name . ' ' . $api->version );
     159        $title = sprintf( __('Installing Theme: %s'), $api->name . ' ' . $api->version );
    160160        $nonce = 'install-theme_' . $theme;
    161161        $url = 'update.php?action=install-theme&theme=' . $theme;

  • trunk/wp-admin/user-edit.php

    r12752 r12789  
    233233
    234234<tr>
    235     <th><label for="first_name"><?php _e('First name') ?></label></th>
     235    <th><label for="first_name"><?php _e('First Name') ?></label></th>
    236236    <td><input type="text" name="first_name" id="first_name" value="<?php echo esc_attr($profileuser->first_name) ?>" class="regular-text" /></td>
    237237</tr>
    238238
    239239<tr>
    240     <th><label for="last_name"><?php _e('Last name') ?></label></th>
     240    <th><label for="last_name"><?php _e('Last Name') ?></label></th>
    241241    <td><input type="text" name="last_name" id="last_name" value="<?php echo esc_attr($profileuser->last_name) ?>" class="regular-text" /></td>
    242242</tr>

  • trunk/wp-admin/user-new.php

    r12778 r12789  
    209209<?php if ( apply_filters('show_password_fields', true) ) : ?>
    210210    <tr class="form-field form-required">
    211         <th scope="row"><label for="pass1"><?php _e('Password'); ?> <span class="description"><?php _e('(twice, required)'); ?></span></label></th>
     211        <th scope="row"><label for="pass1"><?php _e('Password'); ?> <span class="description"><?php /* translators: password input field */_e('(twice, required)'); ?></span></label></th>
    212212        <td><input name="pass1" type="password" id="pass1" autocomplete="off" />
    213213        <br />

  • trunk/wp-admin/widgets.php

    r12728 r12789  
    288288            $selected = '';
    289289            echo "\t\t<select name='{$sbname}_position'>\n";
    290             echo "\t\t<option value=''>" . __('-- select --') . "</option>\n";
     290            echo "\t\t<option value=''>" . __('&mdash; Select &mdash;') . "</option>\n";
    291291            for ( $i = 1; $i <= $j; $i++ ) {
    292292                if ( in_array($widget_id, $sidebars_widgets[$sbname], true) )

  • trunk/wp-includes/comment-template.php

    r12680 r12789  
    963963
    964964    if ( post_password_required() ) {
    965         echo __('Enter your password to view comments');
     965        echo __('Enter your password to view comments.');
    966966        return;
    967967    }
    … …  
    12831283<?php endif; ?>
    12841284
    1285         <div class="comment-meta commentmetadata"><a href="<?php echo htmlspecialchars( get_comment_link( $comment->comment_ID ) ) ?>"><?php printf(__('%1$s at %2$s'), get_comment_date(),  get_comment_time()) ?></a><?php edit_comment_link(__('(Edit)'),'&nbsp;&nbsp;','') ?></div>
     1285        <div class="comment-meta commentmetadata"><a href="<?php echo htmlspecialchars( get_comment_link( $comment->comment_ID ) ) ?>">
     1286            <?php
     1287                /* translators: 1: date, 2: time */
     1288                printf( __('%1$s at %2$s'), get_comment_date(),  get_comment_time()) ?></a><?php edit_comment_link(__('(Edit)'),'&nbsp;&nbsp;','' );
     1289            ?>
     1290        </div>
    12861291
    12871292        <?php comment_text() ?>

  • trunk/wp-includes/default-widgets.php

    r12733 r12789  
    407407        <textarea class="widefat" rows="16" cols="20" id="<?php echo $this->get_field_id('text'); ?>" name="<?php echo $this->get_field_name('text'); ?>"><?php echo $text; ?></textarea>
    408408
    409         <p><input id="<?php echo $this->get_field_id('filter'); ?>" name="<?php echo $this->get_field_name('filter'); ?>" type="checkbox" <?php checked(isset($instance['filter']) ? $instance['filter'] : 0); ?> />&nbsp;<label for="<?php echo $this->get_field_id('filter'); ?>"><?php _e('Automatically add paragraphs.'); ?></label></p>
     409        <p><input id="<?php echo $this->get_field_id('filter'); ?>" name="<?php echo $this->get_field_name('filter'); ?>" type="checkbox" <?php checked(isset($instance['filter']) ? $instance['filter'] : 0); ?> />&nbsp;<label for="<?php echo $this->get_field_id('filter'); ?>"><?php _e('Automatically add paragraphs'); ?></label></p>
    410410<?php
    411411    }

  • trunk/wp-includes/feed-atom-comments.php

    r12598 r12789  
    1717    <title type="text"><?php
    1818        if ( is_singular() )
    19             printf(ent2ncr(__('Comments on: %s')), get_the_title_rss());
     19            printf(ent2ncr(__('Comments on %s')), get_the_title_rss());
    2020        elseif ( is_search() )
    2121            printf(ent2ncr(__('Comments for %1$s searching on %2$s')), get_bloginfo_rss( 'name' ), esc_attr(get_search_query()));

  • trunk/wp-includes/formatting.php

    r12733 r12789  
    17711771            $mins = 1;
    17721772        }
     1773        /* translators: min=minute */
    17731774        $since = sprintf(_n('%s min', '%s mins', $mins), $mins);
    17741775    } else if (($diff <= 86400) && ($diff > 3600)) {

  • trunk/wp-includes/functions.php

    r12741 r12789  
    16421642    $hook = 'do_feed_' . $feed;
    16431643    if ( !has_action($hook) ) {
    1644         $message = sprintf( __( 'ERROR: %s is not a valid feed template' ), esc_html($feed));
     1644        $message = sprintf( __( 'ERROR: %s is not a valid feed template.' ), esc_html($feed));
    16451645        wp_die($message);
    16461646    }

  • trunk/wp-includes/js/tinymce/langs/wp-langs.php

    r11245 r12789  
    4040},
    4141contextmenu:{
    42 align:"' . mce_escape( __('Alignment') ) . '",
    43 left:"' . mce_escape( __('Left') ) . '",
    44 center:"' . mce_escape( __('Center') ) . '",
    45 right:"' . mce_escape( __('Right') ) . '",
    46 full:"' . mce_escape( __('Full') ) . '"
     42align:"' . mce_escape( /* translators: alignment */ __('Alignment') ) . '",
     43left:"' . mce_escape( /* translators: alignment */ __('Left') ) . '",
     44center:"' . mce_escape( /* translators: alignment */ __('Center') ) . '",
     45right:"' . mce_escape( /* translators: alignment */ __('Right') ) . '",
     46full:"' . mce_escape( /* translators: alignment */ __('Full') ) . '"
    4747},
    4848insertdatetime:{
    49 date_fmt:"' . mce_escape( __('%Y-%m-%d') ) . '",
    50 time_fmt:"' . mce_escape( __('%H:%M:%S') ) . '",
     49date_fmt:"' . mce_escape( /* translators: year, month, date */ __('%Y-%m-%d') ) . '",
     50time_fmt:"' . mce_escape( /* translators: hours, minutes, seconds */ __('%H:%M:%S') ) . '",
    5151insertdate_desc:"' . mce_escape( __('Insert date') ) . '",
    5252inserttime_desc:"' . mce_escape( __('Insert time') ) . '",
    … …  
    176176},
    177177pagebreak:{
    178 desc:"' . mce_escape( __('Insert page break.') ) . '"
     178desc:"' . mce_escape( __('Insert Page Break') ) . '"
    179179}}});
    180180
    … …  
    203203underline_desc:"' . mce_escape( __('Underline') ) . '",
    204204striketrough_desc:"' . mce_escape( __('Strikethrough') ) . ' (Alt+Shift+D)",
    205 justifyleft_desc:"' . mce_escape( __('Align left') ) . ' (Alt+Shift+L)",
    206 justifycenter_desc:"' . mce_escape( __('Align center') ) . ' (Alt+Shift+C)",
    207 justifyright_desc:"' . mce_escape( __('Align right') ) . ' (Alt+Shift+R)",
    208 justifyfull_desc:"' . mce_escape( __('Align full') ) . ' (Alt+Shift+J)",
     205justifyleft_desc:"' . mce_escape( __('Align Left') ) . ' (Alt+Shift+L)",
     206justifycenter_desc:"' . mce_escape( __('Align Center') ) . ' (Alt+Shift+C)",
     207justifyright_desc:"' . mce_escape( __('Align Right') ) . ' (Alt+Shift+R)",
     208justifyfull_desc:"' . mce_escape( __('Align Full') ) . ' (Alt+Shift+J)",
    209209bullist_desc:"' . mce_escape( __('Unordered list') ) . ' (Alt+Shift+U)",
    210210numlist_desc:"' . mce_escape( __('Ordered list') ) . ' (Alt+Shift+O)",
    … …  
    337337starttime:"' . mce_escape( __('Start time') ) . '",
    338338endtime:"' . mce_escape( __('End time') ) . '",
    339 href:"' . mce_escape( __('Href') ) . '",
     339href:"' . mce_escape( __('href') ) . '",
    340340qtsrcchokespeed:"' . mce_escape( __('Choke speed') ) . '",
    341341target:"' . mce_escape( __('Target') ) . '",
    … …  
    405405tinyMCE.addI18n("' . $language . '.wordpress",{
    406406wp_adv_desc:"' . mce_escape( __('Show/Hide Kitchen Sink') )  . ' (Alt+Shift+Z)",
    407 wp_more_desc:"' . mce_escape( __('Insert More tag') ) . ' (Alt+Shift+T)",
     407wp_more_desc:"' . mce_escape( __('Insert More Tag') ) . ' (Alt+Shift+T)",
    408408wp_page_desc:"' . mce_escape( __('Insert Page break') ) . ' (Alt+Shift+P)",
    409409wp_help_desc:"' . mce_escape( __('Help') ) . ' (Alt+Shift+H)",

  • trunk/wp-includes/js/tinymce/wp-mce-help.php

    r11182 r12789  
    211211        if ( ! tinymce.isWebKit )
    212212            document.write("<tr><th>b</th><td><?php _e('Bold') ?></td><th>i</th><td><?php _e('Italic') ?></td></tr>"+
    213             "<tr><th>u</th><td><?php _e('Underline') ?></td><th>1</th><td><?php _e('Header 1') ?></td></tr>"+
    214             "<tr><th>2</th><td><?php _e('Header 2') ?></td><th>3</th><td><?php _e('Header 3') ?></td></tr>"+
    215             "<tr><th>4</th><td><?php _e('Header 4') ?></td><th>5</th><td><?php _e('Header 5') ?></td></tr>"+
    216             "<tr><th>6</th><td><?php _e('Header 6') ?></td><th>9</th><td><?php _e('Address') ?></td></tr>")
     213            "<tr><th>u</th><td><?php _e('Underline') ?></td><th>1</th><td><?php _e('Heading 1') ?></td></tr>"+
     214            "<tr><th>2</th><td><?php _e('Heading 2') ?></td><th>3</th><td><?php _e('Heading 3') ?></td></tr>"+
     215            "<tr><th>4</th><td><?php _e('Heading 4') ?></td><th>5</th><td><?php _e('Heading 5') ?></td></tr>"+
     216            "<tr><th>6</th><td><?php _e('Heading 6') ?></td><th>9</th><td><?php _e('Address') ?></td></tr>")
    217217        </script>
    218218    </table>

  • trunk/wp-includes/link-template.php

    r12783 r12789  
    608608        $link = __('Edit This');
    609609
    610     $link = '<a href="' . get_edit_tag_link( $tag->term_id ) . '" title="' . __( 'Edit tag' ) . '">' . $link . '</a>';
     610    $link = '<a href="' . get_edit_tag_link( $tag->term_id ) . '" title="' . __( 'Edit Tag' ) . '">' . $link . '</a>';
    611611    echo $before . apply_filters( 'edit_tag_link', $link, $tag->term_id ) . $after;
    612612}
    … …  
    713713        $link = __('Edit This');
    714714
    715     $link = '<a class="post-edit-link" href="' . $url . '" title="' . esc_attr( __( 'Edit post' ) ) . '">' . $link . '</a>';
     715    $link = '<a class="post-edit-link" href="' . $url . '" title="' . esc_attr( __( 'Edit Post' ) ) . '">' . $link . '</a>';
    716716    echo $before . apply_filters( 'edit_post_link', $link, $post->ID ) . $after;
    717717}
    … …  
    842842        $link = __('Edit This');
    843843
    844     $link = '<a href="' . get_edit_bookmark_link( $link ) . '" title="' . __( 'Edit link' ) . '">' . $link . '</a>';
     844    $link = '<a href="' . get_edit_bookmark_link( $link ) . '" title="' . __( 'Edit Link' ) . '">' . $link . '</a>';
    845845    echo $before . apply_filters( 'edit_bookmark_link', $link, $bookmark->link_id ) . $after;
    846846}

  • trunk/wp-includes/locale.php

    r10774 r12789  
    106106    function init() {
    107107        // The Weekdays
    108         $this->weekday[0] = __('Sunday');
    109         $this->weekday[1] = __('Monday');
    110         $this->weekday[2] = __('Tuesday');
    111         $this->weekday[3] = __('Wednesday');
    112         $this->weekday[4] = __('Thursday');
    113         $this->weekday[5] = __('Friday');
    114         $this->weekday[6] = __('Saturday');
     108        $this->weekday[0] = /* translators: weekday */ __('Sunday');
     109        $this->weekday[1] = /* translators: weekday */ __('Monday');
     110        $this->weekday[2] = /* translators: weekday */ __('Tuesday');
     111        $this->weekday[3] = /* translators: weekday */ __('Wednesday');
     112        $this->weekday[4] = /* translators: weekday */ __('Thursday');
     113        $this->weekday[5] = /* translators: weekday */ __('Friday');
     114        $this->weekday[6] = /* translators: weekday */ __('Saturday');
    115115
    116116        // The first letter of each day.  The _%day%_initial suffix is a hack to make
    117117        // sure the day initials are unique.
    118         $this->weekday_initial[__('Sunday')]    = __('S_Sunday_initial');
    119         $this->weekday_initial[__('Monday')]    = __('M_Monday_initial');
    120         $this->weekday_initial[__('Tuesday')]   = __('T_Tuesday_initial');
    121         $this->weekday_initial[__('Wednesday')] = __('W_Wednesday_initial');
    122         $this->weekday_initial[__('Thursday')]  = __('T_Thursday_initial');
    123         $this->weekday_initial[__('Friday')]    = __('F_Friday_initial');
    124         $this->weekday_initial[__('Saturday')]  = __('S_Saturday_initial');
     118        $this->weekday_initial[__('Sunday')]    = /* translators: one-letter abbreviation of the weekday */ __('S_Sunday_initial');
     119        $this->weekday_initial[__('Monday')]    = /* translators: one-letter abbreviation of the weekday */ __('M_Monday_initial');
     120        $this->weekday_initial[__('Tuesday')]   = /* translators: one-letter abbreviation of the weekday */ __('T_Tuesday_initial');
     121        $this->weekday_initial[__('Wednesday')] = /* translators: one-letter abbreviation of the weekday */ __('W_Wednesday_initial');
     122        $this->weekday_initial[__('Thursday')]  = /* translators: one-letter abbreviation of the weekday */ __('T_Thursday_initial');
     123        $this->weekday_initial[__('Friday')]    = /* translators: one-letter abbreviation of the weekday */ __('F_Friday_initial');
     124        $this->weekday_initial[__('Saturday')]  = /* translators: one-letter abbreviation of the weekday */ __('S_Saturday_initial');
    125125
    126126        foreach ($this->weekday_initial as $weekday_ => $weekday_initial_) {
    … …  
    128128        }
    129129
    130         // Abbreviations for each day.
    131         $this->weekday_abbrev[__('Sunday')]    = __('Sun');
    132         $this->weekday_abbrev[__('Monday')]    = __('Mon');
    133         $this->weekday_abbrev[__('Tuesday')]   = __('Tue');
    134         $this->weekday_abbrev[__('Wednesday')] = __('Wed');
    135         $this->weekday_abbrev[__('Thursday')]  = __('Thu');
    136         $this->weekday_abbrev[__('Friday')]    = __('Fri');
    137         $this->weekday_abbrev[__('Saturday')]  = __('Sat');
     130        // Abbreviations for each day.     
     131        $this->weekday_abbrev[__('Sunday')]    = /* translators: three-letter abbreviation of the weekday */ __('Sun');
     132        $this->weekday_abbrev[__('Monday')]    = /* translators: three-letter abbreviation of the weekday */ __('Mon');
     133        $this->weekday_abbrev[__('Tuesday')]   = /* translators: three-letter abbreviation of the weekday */ __('Tue');
     134        $this->weekday_abbrev[__('Wednesday')] = /* translators: three-letter abbreviation of the weekday */ __('Wed');
     135        $this->weekday_abbrev[__('Thursday')]  = /* translators: three-letter abbreviation of the weekday */ __('Thu');
     136        $this->weekday_abbrev[__('Friday')]    = /* translators: three-letter abbreviation of the weekday */ __('Fri');
     137        $this->weekday_abbrev[__('Saturday')]  = /* translators: three-letter abbreviation of the weekday */ __('Sat');
    138138
    139139        // The Months
    140         $this->month['01'] = __('January');
    141         $this->month['02'] = __('February');
    142         $this->month['03'] = __('March');
    143         $this->month['04'] = __('April');
    144         $this->month['05'] = __('May');
    145         $this->month['06'] = __('June');
    146         $this->month['07'] = __('July');
    147         $this->month['08'] = __('August');
    148         $this->month['09'] = __('September');
    149         $this->month['10'] = __('October');
    150         $this->month['11'] = __('November');
    151         $this->month['12'] = __('December');
     140        $this->month['01'] = /* translators: month name */ __('January');
     141        $this->month['02'] = /* translators: month name */ __('February');
     142        $this->month['03'] = /* translators: month name */ __('March');
     143        $this->month['04'] = /* translators: month name */ __('April');
     144        $this->month['05'] = /* translators: month name */ __('May');
     145        $this->month['06'] = /* translators: month name */ __('June');
     146        $this->month['07'] = /* translators: month name */ __('July');
     147        $this->month['08'] = /* translators: month name */ __('August');
     148        $this->month['09'] = /* translators: month name */ __('September');
     149        $this->month['10'] = /* translators: month name */ __('October');
     150        $this->month['11'] = /* translators: month name */ __('November');
     151        $this->month['12'] = /* translators: month name */ __('December');
    152152
    153153        // Abbreviations for each month. Uses the same hack as above to get around the
    154154        // 'May' duplication.
    155         $this->month_abbrev[__('January')] = __('Jan_January_abbreviation');
    156         $this->month_abbrev[__('February')] = __('Feb_February_abbreviation');
    157         $this->month_abbrev[__('March')] = __('Mar_March_abbreviation');
    158         $this->month_abbrev[__('April')] = __('Apr_April_abbreviation');
    159         $this->month_abbrev[__('May')] = __('May_May_abbreviation');
    160         $this->month_abbrev[__('June')] = __('Jun_June_abbreviation');
    161         $this->month_abbrev[__('July')] = __('Jul_July_abbreviation');
    162         $this->month_abbrev[__('August')] = __('Aug_August_abbreviation');
    163         $this->month_abbrev[__('September')] = __('Sep_September_abbreviation');
    164         $this->month_abbrev[__('October')] = __('Oct_October_abbreviation');
    165         $this->month_abbrev[__('November')] = __('Nov_November_abbreviation');
    166         $this->month_abbrev[__('December')] = __('Dec_December_abbreviation');
     155        $this->month_abbrev[__('January')] = /* translators: three-letter abbreviation of the month */ __('Jan_January_abbreviation');
     156        $this->month_abbrev[__('February')] = /* translators: three-letter abbreviation of the month */ __('Feb_February_abbreviation');
     157        $this->month_abbrev[__('March')] = /* translators: three-letter abbreviation of the month */ __('Mar_March_abbreviation');
     158        $this->month_abbrev[__('April')] = /* translators: three-letter abbreviation of the month */ __('Apr_April_abbreviation');
     159        $this->month_abbrev[__('May')] = /* translators: three-letter abbreviation of the month */ __('May_May_abbreviation');
     160        $this->month_abbrev[__('June')] = /* translators: three-letter abbreviation of the month */ __('Jun_June_abbreviation');
     161        $this->month_abbrev[__('July')] = /* translators: three-letter abbreviation of the month */ __('Jul_July_abbreviation');
     162        $this->month_abbrev[__('August')] = /* translators: three-letter abbreviation of the month */ __('Aug_August_abbreviation');
     163        $this->month_abbrev[__('September')] = /* translators: three-letter abbreviation of the month */ __('Sep_September_abbreviation');
     164        $this->month_abbrev[__('October')] = /* translators: three-letter abbreviation of the month */ __('Oct_October_abbreviation');
     165        $this->month_abbrev[__('November')] = /* translators: three-letter abbreviation of the month */ __('Nov_November_abbreviation');
     166        $this->month_abbrev[__('December')] = /* translators: three-letter abbreviation of the month */ __('Dec_December_abbreviation');
    167167
    168168        foreach ($this->month_abbrev as $month_ => $month_abbrev_) {
Note: See TracChangeset for help on using the changeset viewer.