WordPress.org
Get WordPress

Make WordPress Core

Changeset 10774


Ignore:
Timestamp:
03/13/2009 03:53:39 AM (15 years ago)
Author:
ryan
Message:

gettext comments. Props nbachiyski. see #9112

Location:
trunk
Files:
18 edited

Legend:

Unmodified
Added
Removed

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

    r10720 r10774  
    870870
    871871    $data = '';
    872     $message = sprintf( __('Draft Saved at %s.'), date_i18n( __('g:i:s a') ) );
     872    /* translators: draft saved date format, see http://php.net/date */
     873    $draft_saved_date_format = __('g:i:s a');
     874    $message = sprintf( __('Draft Saved at %s.'), date_i18n( $draft_saved_date_format ) );
    873875
    874876    $supplemental = array();
    … …  
    12011203            $time = '';
    12021204        } else {
     1205            /* translators: date format in table columns, see http://php.net/date */
    12031206            $time = mysql2date(__('Y/m/d'), $post->post_date);
    12041207        }

  • trunk/wp-admin/edit-attachment-rows.php

    r10150 r10774  
    172172        if ( $left )
    173173            echo '<strong>';
    174         comments_number("<a href='edit-comments.php?p=$id' title='$pending_phrase' class='post-com-count'><span class='comment-count'>" . __('0') . '</span></a>', "<a href='edit-comments.php?p=$id' title='$pending_phrase' class='post-com-count'><span class='comment-count'>" . __('1') . '</span></a>', "<a href='edit-comments.php?p=$id' title='$pending_phrase' class='post-com-count'><span class='comment-count'>" . __('%') . '</span></a>');
     174        comments_number("<a href='edit-comments.php?p=$id' title='$pending_phrase' class='post-com-count'><span class='comment-count'>" . /* translators: comment count link */ _x('0', 'comment count') . '</span></a>', "<a href='edit-comments.php?p=$id' title='$pending_phrase' class='post-com-count'><span class='comment-count'>" . /* translators: comment count link */ _x('1', 'comment count') . '</span></a>', "<a href='edit-comments.php?p=$id' title='$pending_phrase' class='post-com-count'><span class='comment-count'>" . /* translators: comment count link: % will be substituted by comment count */ _x('%', 'comment count') . '</span></a>');
    175175        if ( $left )
    176176            echo '</strong>';

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

    r10457 r10774  
    185185<table class="editform" style="width: 100%;" cellspacing="2" cellpadding="5">
    186186    <tr>
    187         <th style="width: 20%;" scope="row"><label for="link_rel"><?php _e('rel:') ?></label></th>
     187        <th style="width: 20%;" scope="row"><label for="link_rel"><?php /* translators: xfn: http://gmpg.org/xfn/ */ _e('rel:') ?></label></th>
    188188        <td style="width: 80%;"><input type="text" name="link_rel" id="link_rel" size="50" value="<?php echo ( isset( $link->link_rel ) ? $link->link_rel : ''); ?>" /></td>
    189189    </tr>
    … …  
    192192            <table cellpadding="3" cellspacing="5" class="form-table">
    193193                <tr>
    194                     <th scope="row"> <?php _e('identity') ?> </th>
    195                     <td><fieldset><legend class="hidden"> <?php _e('identity') ?> </legend>
     194                    <th scope="row"> <?php /* translators: xfn: http://gmpg.org/xfn/ */ _e('identity') ?> </th>
     195                    <td><fieldset><legend class="hidden"> <?php /* translators: xfn: http://gmpg.org/xfn/ */ _e('identity') ?> </legend>
    196196                        <label for="me">
    197197                        <input type="checkbox" name="identity" value="me" id="me" <?php xfn_check('identity', 'me'); ?> />
    … …  
    200200                </tr>
    201201                <tr>
    202                     <th scope="row"> <?php _e('friendship') ?> </th>
    203                     <td><fieldset><legend class="hidden"> <?php _e('friendship') ?> </legend>
     202                    <th scope="row"> <?php /* translators: xfn: http://gmpg.org/xfn/ */ _e('friendship') ?> </th>
     203                    <td><fieldset><legend class="hidden"> <?php /* translators: xfn: http://gmpg.org/xfn/ */ _e('friendship') ?> </legend>
    204204                        <label for="contact">
    205                         <input class="valinp" type="radio" name="friendship" value="contact" id="contact" <?php xfn_check('friendship', 'contact', 'radio'); ?> /> <?php _e('contact') ?></label>
     205                        <input class="valinp" type="radio" name="friendship" value="contact" id="contact" <?php xfn_check('friendship', 'contact', 'radio'); ?> /> <?php /* translators: xfn: http://gmpg.org/xfn/ */ _e('contact') ?></label>
    206206                        <label for="acquaintance">
    207                         <input class="valinp" type="radio" name="friendship" value="acquaintance" id="acquaintance" <?php xfn_check('friendship', 'acquaintance', 'radio'); ?> />  <?php _e('acquaintance') ?></label>
     207                        <input class="valinp" type="radio" name="friendship" value="acquaintance" id="acquaintance" <?php xfn_check('friendship', 'acquaintance', 'radio'); ?> />  <?php /* translators: xfn: http://gmpg.org/xfn/ */ _e('acquaintance') ?></label>
    208208                        <label for="friend">
    209                         <input class="valinp" type="radio" name="friendship" value="friend" id="friend" <?php xfn_check('friendship', 'friend', 'radio'); ?> /> <?php _e('friend') ?></label>
     209                        <input class="valinp" type="radio" name="friendship" value="friend" id="friend" <?php xfn_check('friendship', 'friend', 'radio'); ?> /> <?php /* translators: xfn: http://gmpg.org/xfn/ */ _e('friend') ?></label>
    210210                        <label for="friendship">
    211                         <input name="friendship" type="radio" class="valinp" value="" id="friendship" <?php xfn_check('friendship', '', 'radio'); ?> /> <?php _e('none') ?></label>
    212                     </fieldset></td>
    213                 </tr>
    214                 <tr>
    215                     <th scope="row"> <?php _e('physical') ?> </th>
    216                     <td><fieldset><legend class="hidden"> <?php _e('physical') ?> </legend>
     211                        <input name="friendship" type="radio" class="valinp" value="" id="friendship" <?php xfn_check('friendship', '', 'radio'); ?> /> <?php /* translators: xfn: http://gmpg.org/xfn/ */ _e('none') ?></label>
     212                    </fieldset></td>
     213                </tr>
     214                <tr>
     215                    <th scope="row"> <?php /* translators: xfn: http://gmpg.org/xfn/ */ _e('physical') ?> </th>
     216                    <td><fieldset><legend class="hidden"> <?php /* translators: xfn: http://gmpg.org/xfn/ */ _e('physical') ?> </legend>
    217217                        <label for="met">
    218218                        <input class="valinp" type="checkbox" name="physical" value="met" id="met" <?php xfn_check('physical', 'met'); ?> />
    219                         <?php _e('met') ?></label>
    220                     </fieldset></td>
    221                 </tr>
    222                 <tr>
    223                     <th scope="row"> <?php _e('professional') ?> </th>
    224                     <td><fieldset><legend class="hidden"> <?php _e('professional') ?> </legend>
     219                        <?php /* translators: xfn: http://gmpg.org/xfn/ */ _e('met') ?></label>
     220                    </fieldset></td>
     221                </tr>
     222                <tr>
     223                    <th scope="row"> <?php /* translators: xfn: http://gmpg.org/xfn/ */ _e('professional') ?> </th>
     224                    <td><fieldset><legend class="hidden"> <?php /* translators: xfn: http://gmpg.org/xfn/ */ _e('professional') ?> </legend>
    225225                        <label for="co-worker">
    226226                        <input class="valinp" type="checkbox" name="professional" value="co-worker" id="co-worker" <?php xfn_check('professional', 'co-worker'); ?> />
    227                         <?php _e('co-worker') ?></label>
     227                        <?php /* translators: xfn: http://gmpg.org/xfn/ */ _e('co-worker') ?></label>
    228228                        <label for="colleague">
    229229                        <input class="valinp" type="checkbox" name="professional" value="colleague" id="colleague" <?php xfn_check('professional', 'colleague'); ?> />
    230                         <?php _e('colleague') ?></label>
    231                     </fieldset></td>
    232                 </tr>
    233                 <tr>
    234                     <th scope="row"> <?php _e('geographical') ?> </th>
    235                     <td><fieldset><legend class="hidden"> <?php _e('geographical') ?> </legend>
     230                        <?php /* translators: xfn: http://gmpg.org/xfn/ */ _e('colleague') ?></label>
     231                    </fieldset></td>
     232                </tr>
     233                <tr>
     234                    <th scope="row"> <?php /* translators: xfn: http://gmpg.org/xfn/ */ _e('geographical') ?> </th>
     235                    <td><fieldset><legend class="hidden"> <?php /* translators: xfn: http://gmpg.org/xfn/ */ _e('geographical') ?> </legend>
    236236                        <label for="co-resident">
    237237                        <input class="valinp" type="radio" name="geographical" value="co-resident" id="co-resident" <?php xfn_check('geographical', 'co-resident', 'radio'); ?> />
    238                         <?php _e('co-resident') ?></label>
     238                        <?php /* translators: xfn: http://gmpg.org/xfn/ */ _e('co-resident') ?></label>
    239239                        <label for="neighbor">
    240240                        <input class="valinp" type="radio" name="geographical" value="neighbor" id="neighbor" <?php xfn_check('geographical', 'neighbor', 'radio'); ?> />
    241                         <?php _e('neighbor') ?></label>
     241                        <?php /* translators: xfn: http://gmpg.org/xfn/ */ _e('neighbor') ?></label>
    242242                        <label for="geographical">
    243243                        <input class="valinp" type="radio" name="geographical" value="" id="geographical" <?php xfn_check('geographical', '', 'radio'); ?> />
    244                         <?php _e('none') ?></label>
    245                     </fieldset></td>
    246                 </tr>
    247                 <tr>
    248                     <th scope="row"> <?php _e('family') ?> </th>
    249                     <td><fieldset><legend class="hidden"> <?php _e('family') ?> </legend>
     244                        <?php /* translators: xfn: http://gmpg.org/xfn/ */ _e('none') ?></label>
     245                    </fieldset></td>
     246                </tr>
     247                <tr>
     248                    <th scope="row"> <?php /* translators: xfn: http://gmpg.org/xfn/ */ _e('family') ?> </th>
     249                    <td><fieldset><legend class="hidden"> <?php /* translators: xfn: http://gmpg.org/xfn/ */ _e('family') ?> </legend>
    250250                        <label for="child">
    251251                        <input class="valinp" type="radio" name="family" value="child" id="child" <?php xfn_check('family', 'child', 'radio'); ?>  />
    252                         <?php _e('child') ?></label>
     252                        <?php /* translators: xfn: http://gmpg.org/xfn/ */ _e('child') ?></label>
    253253                        <label for="kin">
    254254                        <input class="valinp" type="radio" name="family" value="kin" id="kin" <?php xfn_check('family', 'kin', 'radio'); ?>  />
    255                         <?php _e('kin') ?></label>
     255                        <?php /* translators: xfn: http://gmpg.org/xfn/ */ _e('kin') ?></label>
    256256                        <label for="parent">
    257257                        <input class="valinp" type="radio" name="family" value="parent" id="parent" <?php xfn_check('family', 'parent', 'radio'); ?> />
    258                         <?php _e('parent') ?></label>
     258                        <?php /* translators: xfn: http://gmpg.org/xfn/ */ _e('parent') ?></label>
    259259                        <label for="sibling">
    260260                        <input class="valinp" type="radio" name="family" value="sibling" id="sibling" <?php xfn_check('family', 'sibling', 'radio'); ?> />
    261                         <?php _e('sibling') ?></label>
     261                        <?php /* translators: xfn: http://gmpg.org/xfn/ */ _e('sibling') ?></label>
    262262                        <label for="spouse">
    263263                        <input class="valinp" type="radio" name="family" value="spouse" id="spouse" <?php xfn_check('family', 'spouse', 'radio'); ?> />
    264                         <?php _e('spouse') ?></label>
     264                        <?php /* translators: xfn: http://gmpg.org/xfn/ */ _e('spouse') ?></label>
    265265                        <label for="family">
    266266                        <input class="valinp" type="radio" name="family" value="" id="family" <?php xfn_check('family', '', 'radio'); ?> />
    267                         <?php _e('none') ?></label>
    268                     </fieldset></td>
    269                 </tr>
    270                 <tr>
    271                     <th scope="row"> <?php _e('romantic') ?> </th>
    272                     <td><fieldset><legend class="hidden"> <?php _e('romantic') ?> </legend>
     267                        <?php /* translators: xfn: http://gmpg.org/xfn/ */ _e('none') ?></label>
     268                    </fieldset></td>
     269                </tr>
     270                <tr>
     271                    <th scope="row"> <?php /* translators: xfn: http://gmpg.org/xfn/ */ _e('romantic') ?> </th>
     272                    <td><fieldset><legend class="hidden"> <?php /* translators: xfn: http://gmpg.org/xfn/ */ _e('romantic') ?> </legend>
    273273                        <label for="muse">
    274274                        <input class="valinp" type="checkbox" name="romantic" value="muse" id="muse" <?php xfn_check('romantic', 'muse'); ?> />
    275                         <?php _e('muse') ?></label>
     275                        <?php /* translators: xfn: http://gmpg.org/xfn/ */ _e('muse') ?></label>
    276276                        <label for="crush">
    277277                        <input class="valinp" type="checkbox" name="romantic" value="crush" id="crush" <?php xfn_check('romantic', 'crush'); ?> />
    278                         <?php _e('crush') ?></label>
     278                        <?php /* translators: xfn: http://gmpg.org/xfn/ */ _e('crush') ?></label>
    279279                        <label for="date">
    280280                        <input class="valinp" type="checkbox" name="romantic" value="date" id="date" <?php xfn_check('romantic', 'date'); ?> />
    281                         <?php _e('date') ?></label>
     281                        <?php /* translators: xfn: http://gmpg.org/xfn/ */ _e('date') ?></label>
    282282                        <label for="romantic">
    283283                        <input class="valinp" type="checkbox" name="romantic" value="sweetheart" id="romantic" <?php xfn_check('romantic', 'sweetheart'); ?> />
    284                         <?php _e('sweetheart') ?></label>
     284                        <?php /* translators: xfn: http://gmpg.org/xfn/ */ _e('sweetheart') ?></label>
    285285                    </fieldset></td>
    286286                </tr>

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

    r10680 r10774  
    7676
    7777$post_stati  = array(   //  array( adj, noun )
    78         'publish' => array(__('Published|page'), __('Published pages'), _n_noop('Published <span class="count">(%s)</span>|page', 'Published <span class="count">(%s)</span>')),
    79         'future' => array(__('Scheduled|page'), __('Scheduled pages'), _n_noop('Scheduled <span class="count">(%s)</span>|page', 'Scheduled <span class="count">(%s)</span>')),
    80         'pending' => array(__('Pending Review|page'), __('Pending pages'), _n_noop('Pending Review <span class="count">(%s)</span>|page', 'Pending Review <span class="count">(%s)</span>')),
    81         'draft' => array(__('Draft|page'), _c('Drafts|manage posts header'), _n_noop('Draft <span class="count">(%s)</span>|page', 'Drafts <span class="count">(%s)</span>')),
    82         'private' => array(__('Private|page'), __('Private pages'), _n_noop('Private <span class="count">(%s)</span>|page', 'Private <span class="count">(%s)</span>'))
     78        'publish' => array(_x('Published', 'page'), __('Published pages'), _nx_noop('Published <span class="count">(%s)</span>', 'Published <span class="count">(%s)</span>', 'page')),
     79        'future' => array(_x('Scheduled', 'page'), __('Scheduled pages'), _nx_noop('Scheduled <span class="count">(%s)</span>', 'Scheduled <span class="count">(%s)</span>', 'page')),
     80        'pending' => array(_x('Pending Review', 'page'), __('Pending pages'), _n_noop('Pending Review <span class="count">(%s)</span>', 'Pending Review <span class="count">(%s)</span>', 'page')),
     81        'draft' => array(_x('Draft', 'page'), _x('Drafts', 'manage posts header'), _nx_noop('Draft <span class="count">(%s)</span>', 'Drafts <span class="count">(%s)</span>', 'page')),
     82        'private' => array(_x('Private', 'page'), __('Private pages'), _nx_noop('Private <span class="count">(%s)</span>', 'Private <span class="count">(%s)</span>', 'page'))
    8383    );
    8484
    … …  
    161161        $class = ' class="current"';
    162162
    163     $status_links[] = "<li><a href='edit-pages.php?post_status=$status'$class>" . sprintf( _nc( $label[2][0], $label[2][1], $num_posts->$status ), number_format_i18n( $num_posts->$status ) ) . '</a>';
     163    $status_links[] = "<li><a href='edit-pages.php?post_status=$status'$class>" . sprintf( _nx( $label[2][0], $label[2][1], $num_posts->$status, $label[2][2] ), number_format_i18n( $num_posts->$status ) ) . '</a>';
    164164}
    165165echo implode( " |</li>\n", $status_links ) . '</li>';

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

    r10748 r10774  
    744744function image_align_input_fields($post, $checked='') {
    745745
    746     $alignments = array('none' => 'None', 'left' => 'Left', 'center' => 'Center', 'right' => 'Right');
     746    $alignments = array('none' => __('None'), 'left' => __('Left'), 'center' => __('Center'), 'right' => __('Right'));
    747747    if ( !array_key_exists($checked, $alignments) )
    748748        $checked = 'none';
    … …  
    753753        $out[] = "<input type='radio' name='attachments[{$post->ID}][align]' id='image-align-{$name}-{$post->ID}' value='$name'".
    754754            ( $checked == $name ? " checked='checked'" : "" ) .
    755             " /><label for='image-align-{$name}-{$post->ID}' class='align image-align-{$name}-label'>" . __($label) . "</label>";
     755            " /><label for='image-align-{$name}-{$post->ID}' class='align image-align-{$name}-label'>" . $label . "</label>";
    756756    }
    757757    return join("\n", $out);

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

    r10767 r10774  
    788788    $q['cat'] = isset($q['cat']) ? (int) $q['cat'] : 0;
    789789    $post_stati  = array(   //  array( adj, noun )
    790                 'publish' => array(__('Published'), __('Published posts'), _n_noop('Published <span class="count">(%s)</span>', 'Published <span class="count">(%s)</span>')),
    791                 'future' => array(__('Scheduled'), __('Scheduled posts'), _n_noop('Scheduled <span class="count">(%s)</span>', 'Scheduled <span class="count">(%s)</span>')),
    792                 'pending' => array(__('Pending Review'), __('Pending posts'), _n_noop('Pending Review <span class="count">(%s)</span>', 'Pending Review <span class="count">(%s)</span>')),
    793                 'draft' => array(__('Draft'), _x('Drafts', 'manage posts header'), _n_noop('Draft <span class="count">(%s)</span>', 'Drafts <span class="count">(%s)</span>')),
    794                 'private' => array(__('Private'), __('Private posts'), _n_noop('Private <span class="count">(%s)</span>', 'Private <span class="count">(%s)</span>')),
     790                'publish' => array(_x('Published', 'post'), __('Published posts'), _n_noop('Published <span class="count">(%s)</span>', 'Published <span class="count">(%s)</span>')),
     791                'future' => array(_x('Scheduled', 'post'), __('Scheduled posts'), _n_noop('Scheduled <span class="count">(%s)</span>', 'Scheduled <span class="count">(%s)</span>')),
     792                'pending' => array(_x('Pending Review', 'post'), __('Pending posts'), _n_noop('Pending Review <span class="count">(%s)</span>', 'Pending Review <span class="count">(%s)</span>')),
     793                'draft' => array(_x('Draft', 'post'), _x('Drafts', 'manage posts header'), _n_noop('Draft <span class="count">(%s)</span>', 'Drafts <span class="count">(%s)</span>')),
     794                'private' => array(_x('Private', 'post'), __('Private posts'), _n_noop('Private <span class="count">(%s)</span>', 'Private <span class="count">(%s)</span>')),
    795795            );
    796796

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

    r10768 r10774  
    217217    'posts_per_page' => 10,
    218218    'what_to_show' => 'posts',
     219    /* translators: default date format, see http://php.net/date */
    219220    'date_format' => __('F j, Y'),
     221    /* translators: default time format, see http://php.net/date */
    220222    'time_format' => __('g:i a'),
     223    /* translators: links last updated date format, see http://php.net/date */
    221224    'links_updated_date_format' => __('F j, Y g:i a'),
    222225    'links_recently_updated_prepend' => '<em>',

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

    r10767 r10774  
    14971497            if ( $pending_comments )
    14981498                echo '<strong>';
    1499                 comments_number("<a href='edit-comments.php?p=$post->ID' title='$pending_phrase' class='post-com-count'><span class='comment-count'>" . __('0') . '</span></a>', "<a href='edit-comments.php?p=$post->ID' title='$pending_phrase' class='post-com-count'><span class='comment-count'>" . __('1') . '</span></a>', "<a href='edit-comments.php?p=$post->ID' title='$pending_phrase' class='post-com-count'><span class='comment-count'>" . __('%') . '</span></a>');
     1499                comments_number("<a href='edit-comments.php?p=$post->ID' title='$pending_phrase' class='post-com-count'><span class='comment-count'>" . /* translators: comment count link */ _x('0', 'comment count') . '</span></a>', "<a href='edit-comments.php?p=$post->ID' title='$pending_phrase' class='post-com-count'><span class='comment-count'>" . /* translators: comment count link */ _x('1', 'comment count') . '</span></a>', "<a href='edit-comments.php?p=$post->ID' title='$pending_phrase' class='post-com-count'><span class='comment-count'>" . /* translators: comment count link: % will be substituted by comment count */ _x('%', 'comment count') . '</span></a>');
    15001500                if ( $pending_comments )
    15011501                echo '</strong>';
    … …  
    16611661        if ( $left )
    16621662            echo '<strong>';
    1663         comments_number("<a href='edit-comments.php?p=$id' title='$pending_phrase' class='post-com-count'><span class='comment-count'>" . __('0') . '</span></a>', "<a href='edit-comments.php?p=$id' title='$pending_phrase' class='post-com-count'><span class='comment-count'>" . __('1') . '</span></a>', "<a href='edit-comments.php?p=$id' title='$pending_phrase' class='post-com-count'><span class='comment-count'>" . __('%') . '</span></a>');
     1663        comments_number("<a href='edit-comments.php?p=$id' title='$pending_phrase' class='post-com-count'><span class='comment-count'>" . /* translators: comment count link */ _x('0', 'comment count') . '</span></a>', "<a href='edit-comments.php?p=$id' title='$pending_phrase' class='post-com-count'><span class='comment-count'>" . /* translators: comment count link */ _x('1', 'comment count') . '</span></a>', "<a href='edit-comments.php?p=$id' title='$pending_phrase' class='post-com-count'><span class='comment-count'>" . /* translators: comment count link: % will be substituted by comment count */ _x('%', 'comment count') . '</span></a>');
    16641664        if ( $left )
    16651665            echo '</strong>';
    … …  
    21842184                    if ( $pending_comments )
    21852185                        echo '<strong>';
    2186                     comments_number("<a href='edit-comments.php?p=$post->ID' title='$pending_phrase' class='post-com-count'><span class='comment-count'>" . __('0') . '</span></a>', "<a href='edit-comments.php?p=$post->ID' title='$pending_phrase' class='post-com-count'><span class='comment-count'>" . __('1') . '</span></a>', "<a href='edit-comments.php?p=$post->ID' title='$pending_phrase' class='post-com-count'><span class='comment-count'>" . __('%') . '</span></a>');
     2186                    comments_number("<a href='edit-comments.php?p=$post->ID' title='$pending_phrase' class='post-com-count'><span class='comment-count'>" . /* translators: comment count link */ _x('0', 'comment count') . '</span></a>', "<a href='edit-comments.php?p=$post->ID' title='$pending_phrase' class='post-com-count'><span class='comment-count'>" . /* translators: comment count link */ _x('1', 'comment count') . '</span></a>', "<a href='edit-comments.php?p=$post->ID' title='$pending_phrase' class='post-com-count'><span class='comment-count'>" . /* translators: comment count link: % will be substituted by comment count */ _x('%', 'comment count') . '</span></a>');
    21872187                    if ( $pending_comments )
    21882188                        echo '</strong>';

  • trunk/wp-admin/install.php

    r10574 r10774  
    5252    if ( ! is_null( $error ) ) {
    5353?>
    54 <p><strong><?php _e('ERROR'); ?></strong>: <?php echo $error; ?></p>
     54<p><?php printf( __('<strong>ERROR</strong>: %s'), $error); ?></p>
    5555<?php } ?>
    5656<form id="setup" method="post" action="install.php?step=2">

  • trunk/wp-admin/load-scripts.php

    r10476 r10774  
    1414 */
    1515function _c() {}
     16
     17/**
     18 * @ignore
     19 */
     20function _x() {}
     21
    1622
    1723/**

  • trunk/wp-admin/load-styles.php

    r10476 r10774  
    1414 */
    1515function _c() {}
     16
     17/**
     18 * @ignore
     19 */
     20function _x() {}
     21
    1622
    1723/**

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

    r10741 r10774  
    985985            LIMIT 1");
    986986
     987    /* translators: Calendar caption: 1: month name, 2: 4-digit year */
     988    $calendar_caption = _x('%1$s %2$s', 'calendar caption');
    987989    echo '<table id="wp-calendar" summary="' . __('Calendar') . '">
    988     <caption>' . sprintf(_c('%1$s %2$s|Used as a calendar caption'), $wp_locale->get_month($thismonth), date('Y', $unixmonth)) . '</caption>
     990    <caption>' . sprintf($calendar_caption, $wp_locale->get_month($thismonth), date('Y', $unixmonth)) . '</caption>
    989991    <thead>
    990992    <tr>';
    … …  
    14131415function feed_links( $args ) {
    14141416    $defaults = array(
    1415         'seperator' => _c('&raquo;|Seperator character for feed titles in theme head'),
     1417        /* translators: Separator between blog name and feed type in feed links */
     1418        'separator'   => _x('&raquo;', 'feed link'),
    14161419        'feedtitle' => __('%s Feed'),
    14171420        'comstitle' => __('%s Comments Feed'),
    … …  
    14331436function feed_links_extra( $args ) {
    14341437    $defaults = array(
    1435         'seperator'   => _c('&raquo;|Seperator character for feed titles in theme head'),
     1438        /* translators: Separator between blog name and feed type in feed links */
     1439        'separator'   => _x('&raquo;', 'feed link'),
     1440        /* translators: 1: blog name, 2: separator(raquo), 3: post title */
    14361441        'singletitle' => __('%1$s %2$s %3$s Comments Feed'),
     1442        /* translators: 1: blog name, 2: separator(raquo), 3: category name */
    14371443        'cattitle'    => __('%1$s %2$s %3$s Category Feed'),
     1444        /* translators: 1: blog name, 2: separator(raquo), 3: tag name */
    14381445        'tagtitle'    => __('%1$s %2$s %3$s Tag Feed'),
     1446        /* translators: 1: blog name, 2: separator(raquo), 3: author name  */
    14391447        'authortitle' => __('%1$s %2$s Posts by %3$s Feed'),
     1448        /* translators: 1: blog name, 2: separator(raquo), 3: search phrase */
    14401449        'searchtitle' => __('%1$s %2$s Search Results for &quot;%3$s&quot; Feed'),
    14411450    );
    … …  
    14471456
    14481457        if ( comments_open() || pings_open() || $post->comment_count > 0 ) {
    1449             $title = attribute_escape(sprintf( $args['singletitle'], get_bloginfo('name'), $args['seperator'], wp_specialchars( get_the_title() ) ));
     1458            $title = attribute_escape(sprintf( $args['singletitle'], get_bloginfo('name'), $args['separator'], wp_specialchars( get_the_title() ) ));
    14501459            $href = get_post_comments_feed_link( $post->ID );
    14511460        }
    … …  
    14531462        $cat_id = intval( get_query_var('cat') );
    14541463
    1455         $title = attribute_escape(sprintf( $args['cattitle'], get_bloginfo('name'), $args['seperator'], get_cat_name( $cat_id ) ));
     1464        $title = attribute_escape(sprintf( $args['cattitle'], get_bloginfo('name'), $args['separator'], get_cat_name( $cat_id ) ));
    14561465        $href = get_category_feed_link( $cat_id );
    14571466    } elseif ( is_tag() ) {
    … …  
    14591468        $tag = get_tag( $tag_id );
    14601469
    1461         $title = attribute_escape(sprintf( $args['tagtitle'], get_bloginfo('name'), $args['seperator'], $tag->name ));
     1470        $title = attribute_escape(sprintf( $args['tagtitle'], get_bloginfo('name'), $args['separator'], $tag->name ));
    14621471        $href = get_tag_feed_link( $tag_id );
    14631472    } elseif ( is_author() ) {
    14641473        $author_id = intval( get_query_var('author') );
    14651474
    1466         $title = attribute_escape(sprintf( $args['authortitle'], get_bloginfo('name'), $args['seperator'], get_author_name( $author_id ) ));
     1475        $title = attribute_escape(sprintf( $args['authortitle'], get_bloginfo('name'), $args['separator'], get_author_name( $author_id ) ));
    14671476        $href = get_author_feed_link( $author_id );
    14681477    } elseif ( is_search() ) {
    1469         $title = attribute_escape(sprintf( $args['searchtitle'], get_bloginfo('name'), $args['seperator'], get_search_query() ));
     1478        $title = attribute_escape(sprintf( $args['searchtitle'], get_bloginfo('name'), $args['separator'], get_search_query() ));
    14701479        $href = get_search_feed_link();
    14711480    }

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

    r10767 r10774  
    151151media:{
    152152desc:"' . mce_escape( __('Insert / edit embedded media') ) . '",
    153 delta_width:"' . mce_escape( _c('0| Extra width for the media popup in pixels') ) . '",
    154 delta_height:"' . mce_escape( _c('0| Extra height for the media popup in pixels') ) . '",
     153delta_width:"' . /* translators: Extra width for the media popup in pixels */ mce_escape( _x('0', 'media popup width') ) . '",
     154delta_height:"' . /* translators: Extra height for the media popup in pixels */ mce_escape( _x('0', 'media popup height') ) . '",
    155155edit:"' . mce_escape( __('Edit embedded media') ) . '"
    156156},
    … …  
    214214redo_desc:"' . mce_escape( __('Redo') ) . ' (Ctrl+Y)",
    215215link_desc:"' . mce_escape( __('Insert/edit link') ) . ' (Alt+Shift+A)",
    216 link_delta_width:"' . mce_escape( _c('0| Extra width for the link popup in pixels') ) . '",
    217 link_delta_height:"' . mce_escape( _c('0| Extra height for the link popup in pixels') ) . '",
     216link_delta_width:"' . /* translators: Extra width for the link popup in pixels */ mce_escape( _x('0', 'link popup width') ) . '",
     217link_delta_height:"' . /* translators: Extra height for the link popup in pixels */ mce_escape( _x('0', 'link popup height') ) . '",
    218218unlink_desc:"' . mce_escape( __('Unlink') ) . ' (Alt+Shift+S)",
    219219image_desc:"' . mce_escape( __('Insert/edit image') ) . ' (Alt+Shift+M)",
    220 image_delta_width:"' . mce_escape( _c('0| Extra width for the image popup in pixels') ) . '",
    221 image_delta_height:"' . mce_escape( _c('0| Extra height for the image popup in pixels') ) . '",
     220image_delta_width:"' . /* translators: Extra width for the image popup in pixels */ mce_escape( _x('0', 'image popup width') ) . '",
     221image_delta_height:"' . /* translators: Extra height for the image popup in pixels */ mce_escape( _x('0', 'image popup height') ) . '",
    222222cleanup_desc:"' . mce_escape( __('Cleanup messy code') ) . '",
    223223code_desc:"' . mce_escape( __('Edit HTML Source') ) . '",
    … …  
    243243toolbar_focus:"' . mce_escape( __('Jump to tool buttons - Alt+Q, Jump to editor - Alt-Z, Jump to element path - Alt-X') ) . '",
    244244more_colors:"' . mce_escape( __('More colors') ) . '",
    245 colorpicker_delta_width:"' . mce_escape( _c('0| Extra width for the colorpicker popup in pixels') ) . '",
    246 colorpicker_delta_height:"' . mce_escape( _c('0| Extra height for the colorpicker popup in pixels') ) . '"
     245colorpicker_delta_width:"' . /* translators: Extra width for the colorpicker popup in pixels */ mce_escape( _x('0', 'colorpicker popup width') ) . '",
     246colorpicker_delta_height:"' . /* translators: Extra height for the colorpicker popup in pixels */ mce_escape( _x('0', 'colorpicker popup height') ) . '"
    247247});
    248248

  • trunk/wp-includes/l10n.php

    r10767 r10774  
    223223 * @param $single Single form to be i18ned
    224224 * @param $plural Plural form to be i18ned
    225  * @param $number Not used, here for compatibility with _n, optional
    226  * @param $domain Not used, here for compatibility with _n, optional
    227225 * @return array array($single, $plural)
    228226 */
    229 function _n_noop( $single, $plural, $number = 1, $domain = 'default' ) {
     227function _n_noop( $single, $plural ) {
    230228    return array( $single, $plural );
    231229}
     230
     231/**
     232 * Register plural strings with context in POT file, but don't translate them.
     233 *
     234 * @see _n_noop()
     235 */
     236function _nx_noop( $single, $plural, $context ) {
     237    return array( $single, $plural, $context );
     238}
     239
    232240
    233241/**

  • trunk/wp-includes/locale.php

    r8782 r10774  
    179179        // See http://php.net/number_format
    180180
    181         $trans = _c('number_format_decimals|$decimals argument for http://php.net/number_format, default is 0');
     181        /* translators: $decimals argument for http://php.net/number_format, default is 0 */
     182        $trans = __('number_format_decimals');
    182183        $this->number_format['decimals'] = ('number_format_decimals' == $trans) ? 0 : $trans;
    183184
    184         $trans = _c('number_format_decimal_point|$dec_point argument for http://php.net/number_format, default is .');
     185        /* translators: $dec_point argument for http://php.net/number_format, default is . */
     186        $trans = __('number_format_decimal_point');
    185187        $this->number_format['decimal_point'] = ('number_format_decimal_point' == $trans) ? '.' : $trans;
    186188
    187         $trans = _c('number_format_thousands_sep|$thousands_sep argument for http://php.net/number_format, default is ,');
     189        /* translators: $thousands_sep argument for http://php.net/number_format, default is , */
     190        $trans = __('number_format_thousands_sep');
    188191        $this->number_format['thousands_sep'] = ('number_format_thousands_sep' == $trans) ? ',' : $trans;
    189192

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

    r10520 r10774  
    11941194        return false;
    11951195
    1196     $datef = _c( 'j F, Y @ G:i|revision date format');
    1197     $autosavef = __( '%s [Autosave]' );
    1198     $currentf  = __( '%s [Current Revision]' );
     1196    /* translators: revision date format, see http://php.net/date */
     1197    $datef = _x( 'j F, Y @ G:i', 'revision date format');
     1198    /* translators: 1: date */
     1199    $autosavef = __( '%1$s [Autosave]' );
     1200    /* translators: 1: date */
     1201    $currentf  = __( '%1$s [Current Revision]' );
    11991202
    12001203    $date = date_i18n( $datef, strtotime( $revision->post_modified_gmt . ' +0000' ) );
    … …  
    12611264    }
    12621265
    1263     $titlef = _c( '%1$s by %2$s|post revision 1:datetime, 2:name' );
     1266    /* translators: post revision: 1: when, 2: author name */
     1267    $titlef = _x( '%1$s by %2$s', 'post revision' );
    12641268
    12651269    if ( $parent )

  • trunk/wp-includes/script-loader.php

    r10745 r10774  
    232232            'short' => __('Very weak'),
    233233            'bad' => __('Weak'),
    234             'good' => _c('Medium|password strength'),
     234            /* translators: password strength */
     235            'good' => _x('Medium', 'password strength'),
    235236            'strong' => __('Strong'),
    236237            'l10n_print_after' => 'try{convertEntities(pwsL10n);}catch(e){};'

  • trunk/wp-includes/widgets.php

    r10764 r10774  
    14471447            <ul id="recentcomments"><?php
    14481448            if ( $comments ) : foreach ( (array) $comments as $comment) :
    1449             echo  '<li class="recentcomments">' . sprintf(__('%1$s on %2$s'), get_comment_author_link(), '<a href="' . clean_url( get_comment_link($comment->comment_ID) ) . '">' . get_the_title($comment->comment_post_ID) . '</a>') . '</li>';
     1449            echo  '<li class="recentcomments">' . /* translators: comments widget: 1: comment author, 2: post link */ sprintf(_x('%1$s on %2$s', 'widgets'), get_comment_author_link(), '<a href="' . clean_url( get_comment_link($comment->comment_ID) ) . '">' . get_the_title($comment->comment_post_ID) . '</a>') . '</li>';
    14501450            endforeach; endif;?></ul>
    14511451        <?php echo $after_widget; ?>
Note: See TracChangeset for help on using the changeset viewer.