WordPress.org
Get WordPress

Make WordPress Core

Changeset 42827


Ignore:
Timestamp:
03/11/2018 04:43:59 PM (7 years ago)
Author:
SergeyBiryukov
Message:

I18N: Use the actual placeholder instead of a number in translator comments if the corresponding string does not use numbered placeholders.

Add missing translator comments in WP_Theme_Install_List_Table and wp_notify_postauthor().
Add missing commas in some translator comments.

Fixes #43523.

Location:
trunk/src
Files:
38 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/wp-admin/admin-header.php

    r42343 r42827  
    3636
    3737if ( is_network_admin() ) {
    38     /* translators: Network admin screen title. 1: Network name */
     38    /* translators: Network admin screen title. %s: Network name */
    3939    $admin_title = sprintf( __( 'Network Admin: %s' ), esc_html( get_network()->site_name ) );
    4040} elseif ( is_user_admin() ) {
    41     /* translators: User dashboard screen title. 1: Network name */
     41    /* translators: User dashboard screen title. %s: Network name */
    4242    $admin_title = sprintf( __( 'User Dashboard: %s' ), esc_html( get_network()->site_name ) );
    4343} else {
    … …  
    4646
    4747if ( $admin_title == $title ) {
    48     /* translators: Admin screen title. 1: Admin screen name */
    49     $admin_title = sprintf( __( '%1$s — WordPress' ), $title );
     48    /* translators: Admin screen title. %s: Admin screen name */
     49    $admin_title = sprintf( __( '%s — WordPress' ), $title );
    5050} else {
    5151    /* translators: Admin screen title. 1: Admin screen name, 2: Network or site name */

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

    r42719 r42827  
    147147    $draft_or_post_title = wp_html_excerpt( _draft_or_post_title( $post_id ), 50, '…' );
    148148    if ( $comments_count->moderated > 0 ) {
    149         /* translators: 1: comments count 2: post title */
     149        /* translators: 1: comments count, 2: post title */
    150150        $title = sprintf(
    151151            __( 'Comments (%1$s) on “%2$s”' ),

  • trunk/src/wp-admin/includes/class-bulk-upgrader-skin.php

    r42343 r42827  
    4242        /* translators: 1: Title of an update, 2: Error message */
    4343        $this->upgrader->strings['skin_update_failed_error'] = __( 'An error occurred while updating %1$s: %2$s' );
    44         /* translators: 1: Title of an update */
    45         $this->upgrader->strings['skin_update_failed'] = __( 'The update of %1$s failed.' );
    46         /* translators: 1: Title of an update */
    47         $this->upgrader->strings['skin_update_successful'] = __( '%1$s updated successfully.' );
     44        /* translators: %s: Title of an update */
     45        $this->upgrader->strings['skin_update_failed'] = __( 'The update of %s failed.' );
     46        /* translators: %s: Title of an update */
     47        $this->upgrader->strings['skin_update_successful'] = __( '%s updated successfully.' );
    4848        $this->upgrader->strings['skin_upgrade_end']       = __( 'All updates have been completed.' );
    4949    }

  • trunk/src/wp-admin/includes/class-language-pack-upgrader.php

    r42786 r42827  
    338338            return new WP_Error(
    339339                'incompatible_archive_pomo', $this->strings['incompatible_archive'],
    340                 /* translators: 1: .po 2: .mo */
     340                /* translators: 1: .po, 2: .mo */
    341341                sprintf(
    342342                    __( 'The language pack is missing either the %1$s or %2$s files.' ),

  • trunk/src/wp-admin/includes/class-wp-plugin-install-list-table.php

    r42631 r42827  
    505505                    case 'install':
    506506                        if ( $status['url'] ) {
    507                             /* translators: 1: Plugin name and version. */
    508                             $action_links[] = '<a class="install-now button" data-slug="' . esc_attr( $plugin['slug'] ) . '" href="' . esc_url( $status['url'] ) . '" aria-label="' . esc_attr( sprintf( __( 'Install %s now' ), $name ) ) . '" data-name="' . esc_attr( $name ) . '">' . __( 'Install Now' ) . '</a>';
     507                            $action_links[] = sprintf(
     508                                '<a class="install-now button" data-slug="%s" href="%s" aria-label="%s" data-name="%s">%s</a>',
     509                                esc_attr( $plugin['slug'] ),
     510                                esc_url( $status['url'] ),
     511                                /* translators: %s: plugin name and version */
     512                                esc_attr( sprintf( __( 'Install %s now' ), $name ) ),
     513                                esc_attr( $name ),
     514                                __( 'Install Now' )
     515                            );
    509516                        }
    510517                        break;
    … …  
    512519                    case 'update_available':
    513520                        if ( $status['url'] ) {
    514                             /* translators: 1: Plugin name and version */
    515                             $action_links[] = '<a class="update-now button aria-button-if-js" data-plugin="' . esc_attr( $status['file'] ) . '" data-slug="' . esc_attr( $plugin['slug'] ) . '" href="' . esc_url( $status['url'] ) . '" aria-label="' . esc_attr( sprintf( __( 'Update %s now' ), $name ) ) . '" data-name="' . esc_attr( $name ) . '">' . __( 'Update Now' ) . '</a>';
     521                            $action_links[] = sprintf(
     522                                '<a class="update-now button aria-button-if-js" data-plugin="%s" data-slug="%s" href="%s" aria-label="%s" data-name="%s">%s</a>',
     523                                esc_attr( $status['file'] ),
     524                                esc_attr( $plugin['slug'] ),
     525                                esc_url( $status['url'] ),
     526                                /* translators: %s: plugin name and version */
     527                                esc_attr( sprintf( __( 'Update %s now' ), $name ) ),
     528                                esc_attr( $name ),
     529                                __( 'Update Now' )
     530                            );
    516531                        }
    517532                        break;
    … …  
    520535                    case 'newer_installed':
    521536                        if ( is_plugin_active( $status['file'] ) ) {
    522                             $action_links[] = '<button type="button" class="button button-disabled" disabled="disabled">' . _x( 'Active', 'plugin' ) . '</button>';
     537                            $action_links[] = sprintf(
     538                                '<button type="button" class="button button-disabled" disabled="disabled">%s</button>',
     539                                _x( 'Active', 'plugin' )
     540                            );
    523541                        } elseif ( current_user_can( 'activate_plugin', $status['file'] ) ) {
    524542                            $button_text = __( 'Activate' );
    525                             /* translators: %s: Plugin name */
     543                            /* translators: %s: plugin name */
    526544                            $button_label = _x( 'Activate %s', 'plugin' );
    527545                            $activate_url = add_query_arg(
    … …  
    535553                            if ( is_network_admin() ) {
    536554                                $button_text = __( 'Network Activate' );
    537                                 /* translators: %s: Plugin name */
     555                                /* translators: %s: plugin name */
    538556                                $button_label = _x( 'Network Activate %s', 'plugin' );
    539557                                $activate_url = add_query_arg( array( 'networkwide' => 1 ), $activate_url );
    … …  
    547565                            );
    548566                        } else {
    549                             $action_links[] = '<button type="button" class="button button-disabled" disabled="disabled">' . _x( 'Installed', 'plugin' ) . '</button>';
     567                            $action_links[] = sprintf(
     568                                '<button type="button" class="button button-disabled" disabled="disabled">%s</button>',
     569                                _x( 'Installed', 'plugin' )
     570                            );
    550571                        }
    551572                        break;
    … …  
    558579            );
    559580
    560             /* translators: 1: Plugin name and version. */
    561             $action_links[] = '<a href="' . esc_url( $details_link ) . '" class="thickbox open-plugin-details-modal" aria-label="' . esc_attr( sprintf( __( 'More information about %s' ), $name ) ) . '" data-title="' . esc_attr( $name ) . '">' . __( 'More Details' ) . '</a>';
     581            $action_links[] = sprintf(
     582                '<a href="%s" class="thickbox open-plugin-details-modal" aria-label="%s" data-title="%s">%s</a>',
     583                esc_url( $details_link ),
     584                /* translators: %s: plugin name and version */
     585                esc_attr( sprintf( __( 'More information about %s' ), $name ) ),
     586                esc_attr( $name ),
     587                __( 'More Details' )
     588            );
    562589
    563590            if ( ! empty( $plugin['icons']['svg'] ) ) {

  • trunk/src/wp-admin/includes/class-wp-theme-install-list-table.php

    r42343 r42827  
    265265        $author = wp_kses( $theme->author, $themes_allowedtags );
    266266
     267        /* translators: %s: theme name */
    267268        $preview_title = sprintf( __( 'Preview &#8220;%s&#8221;' ), $name );
    268269        $preview_url   = add_query_arg(
    … …  
    293294        switch ( $status ) {
    294295            case 'update_available':
    295                 $actions[] = '<a class="install-now" href="' . esc_url( wp_nonce_url( $update_url, 'upgrade-theme_' . $theme->slug ) ) . '" title="' . esc_attr( sprintf( __( 'Update to version %s' ), $theme->version ) ) . '">' . __( 'Update' ) . '</a>';
     296                $actions[] = sprintf(
     297                    '<a class="install-now" href="%s" title="%s">%s</a>',
     298                    esc_url( wp_nonce_url( $update_url, 'upgrade-theme_' . $theme->slug ) ),
     299                    /* translators: %s: theme version */
     300                    esc_attr( sprintf( __( 'Update to version %s' ), $theme->version ) ),
     301                    __( 'Update' )
     302                );
    296303                break;
    297304            case 'newer_installed':
    298305            case 'latest_installed':
    299                 $actions[] = '<span class="install-now" title="' . esc_attr__( 'This theme is already installed and is up to date' ) . '">' . _x( 'Installed', 'theme' ) . '</span>';
     306                $actions[] = sprintf(
     307                    '<span class="install-now" title="%s">%s</span>',
     308                    esc_attr__( 'This theme is already installed and is up to date' ),
     309                    _x( 'Installed', 'theme' )
     310                );
    300311                break;
    301312            case 'install':
    302313            default:
    303                 $actions[] = '<a class="install-now" href="' . esc_url( wp_nonce_url( $install_url, 'install-theme_' . $theme->slug ) ) . '" title="' . esc_attr( sprintf( __( 'Install %s' ), $name ) ) . '">' . __( 'Install Now' ) . '</a>';
    304                 break;
    305         }
    306 
    307         $actions[] = '<a class="install-theme-preview" href="' . esc_url( $preview_url ) . '" title="' . esc_attr( sprintf( __( 'Preview %s' ), $name ) ) . '">' . __( 'Preview' ) . '</a>';
     314                $actions[] = sprintf(
     315                    '<a class="install-now" href="%s" title="%s">%s</a>',
     316                    esc_url( wp_nonce_url( $install_url, 'install-theme_' . $theme->slug ) ),
     317                    /* translators: %s: theme name */
     318                    esc_attr( sprintf( __( 'Install %s' ), $name ) ),
     319                    __( 'Install Now' )
     320                );
     321                break;
     322        }
     323
     324        $actions[] = sprintf(
     325            '<a class="install-theme-preview" href="%s" title="%s">%s</a>',
     326            esc_url( $preview_url ),
     327            /* translators: %s: theme name */
     328            esc_attr( sprintf( __( 'Preview %s' ), $name ) ),
     329            __( 'Preview' )
     330        );
    308331
    309332        /**
    … …  
    324347
    325348        <h3><?php echo $name; ?></h3>
    326         <div class="theme-author"><?php printf( __( 'By %s' ), $author ); ?></div>
     349        <div class="theme-author"><?php
     350            /* translators: %s: theme author */
     351            printf( __( 'By %s' ), $author );
     352        ?></div>
    327353
    328354        <div class="action-links">
    … …  
    422448        switch ( $status ) {
    423449            case 'update_available':
    424                 echo '<a class="theme-install button button-primary" href="' . esc_url( wp_nonce_url( $update_url, 'upgrade-theme_' . $theme->slug ) ) . '" title="' . esc_attr( sprintf( __( 'Update to version %s' ), $theme->version ) ) . '">' . __( 'Update' ) . '</a>';
     450                printf(
     451                    '<a class="theme-install button button-primary" href="%s" title="%s">%s</a>',
     452                    esc_url( wp_nonce_url( $update_url, 'upgrade-theme_' . $theme->slug ) ),
     453                    /* translators: %s: theme version */
     454                    esc_attr( sprintf( __( 'Update to version %s' ), $theme->version ) ),
     455                    __( 'Update' )
     456                );
    425457                break;
    426458            case 'newer_installed':
    427459            case 'latest_installed':
    428                 echo '<span class="theme-install" title="' . esc_attr__( 'This theme is already installed and is up to date' ) . '">' . _x( 'Installed', 'theme' ) . '</span>';
     460                printf(
     461                    '<span class="theme-install" title="%s">%s</span>',
     462                    esc_attr__( 'This theme is already installed and is up to date' ),
     463                    _x( 'Installed', 'theme' )
     464                );
    429465                break;
    430466            case 'install':
    431467            default:
    432                 echo '<a class="theme-install button button-primary" href="' . esc_url( wp_nonce_url( $install_url, 'install-theme_' . $theme->slug ) ) . '">' . __( 'Install' ) . '</a>';
     468                printf(
     469                    '<a class="theme-install button button-primary" href="%s">%s</a>',
     470                    esc_url( wp_nonce_url( $install_url, 'install-theme_' . $theme->slug ) ),
     471                    __( 'Install' )
     472                );
    433473                break;
    434474        }
    435475            ?>
    436476            <h3 class="theme-name"><?php echo $name; ?></h3>
    437             <span class="theme-by"><?php printf( __( 'By %s' ), $author ); ?></span>
     477            <span class="theme-by"><?php
     478                /* translators: %s: theme author */
     479                printf( __( 'By %s' ), $author );
     480            ?></span>
    438481            <?php if ( isset( $theme->screenshot_url ) ) : ?>
    439482                <img class="theme-screenshot" src="<?php echo esc_url( $theme->screenshot_url ); ?>" alt="" />

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

    r42759 r42827  
    349349
    350350        if ( ! empty( $meta['year'] ) ) {
    351             /* translators: Audio file track information. 1: Year of audio track release */
     351            /* translators: Audio file track information. %d: Year of audio track release */
    352352            $content .= ' ' . sprintf( __( 'Released: %d.' ), $meta['year'] );
    353353        }
    … …  
    359359                $content .= ' ' . sprintf( __( 'Track %1$s of %2$s.' ), number_format_i18n( $track_number[0] ), number_format_i18n( $track_number[1] ) );
    360360            } else {
    361                 /* translators: Audio file track information. 1: Audio track number */
    362                 $content .= ' ' . sprintf( __( 'Track %1$s.' ), number_format_i18n( $track_number[0] ) );
     361                /* translators: Audio file track information. %s: Audio track number */
     362                $content .= ' ' . sprintf( __( 'Track %s.' ), number_format_i18n( $track_number[0] ) );
    363363            }
    364364        }
    365365
    366366        if ( ! empty( $meta['genre'] ) ) {
    367             /* translators: Audio file genre information. 1: Audio genre name */
     367            /* translators: Audio file genre information. %s: Audio genre name */
    368368            $content .= ' ' . sprintf( __( 'Genre: %s.' ), $meta['genre'] );
    369369        }

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

    r42674 r42827  
    199199if ( 0 != $post->ID ) {
    200200    if ( 'future' == $post->post_status ) { // scheduled for publishing at a future date
    201         /* translators: Post date information. 1: Date on which the post is currently scheduled to be published */
    202         $stamp = __( 'Scheduled for: <b>%1$s</b>' );
     201        /* translators: Post date information. %s: Date on which the post is currently scheduled to be published */
     202        $stamp = __( 'Scheduled for: <b>%s</b>' );
    203203    } elseif ( 'publish' == $post->post_status || 'private' == $post->post_status ) { // already published
    204         /* translators: Post date information. 1: Date on which the post was published */
    205         $stamp = __( 'Published on: <b>%1$s</b>' );
     204        /* translators: Post date information. %s: Date on which the post was published */
     205        $stamp = __( 'Published on: <b>%s</b>' );
    206206    } elseif ( '0000-00-00 00:00:00' == $post->post_date_gmt ) { // draft, 1 or more saves, no date specified
    207207        $stamp = __( 'Publish <b>immediately</b>' );
    208208    } elseif ( time() < strtotime( $post->post_date_gmt . ' +0000' ) ) { // draft, 1 or more saves, future date specified
    209         /* translators: Post date information. 1: Date on which the post is to be published */
    210         $stamp = __( 'Schedule for: <b>%1$s</b>' );
     209        /* translators: Post date information. %s: Date on which the post is to be published */
     210        $stamp = __( 'Schedule for: <b>%s</b>' );
    211211    } else { // draft, 1 or more saves, date specified
    212         /* translators: Post date information. 1: Date on which the post is to be published */
    213         $stamp = __( 'Publish on: <b>%1$s</b>' );
     212        /* translators: Post date information. %s: Date on which the post is to be published */
     213        $stamp = __( 'Publish on: <b>%s</b>' );
    214214    }
    215215    $date = date_i18n( $datef, strtotime( $post->post_date ) );
    … …  
    223223<div class="misc-pub-section misc-pub-revisions">
    224224    <?php
    225         /* translators: Post revisions heading. 1: The number of available revisions */
     225        /* translators: Post revisions heading. %s: The number of available revisions */
    226226        printf( __( 'Revisions: %s' ), '<b>' . number_format_i18n( $args['args']['revisions_count'] ) . '</b>' );
    227227    ?>

  • trunk/src/wp-admin/includes/ms.php

    r42343 r42827  
    3333    $file_size = filesize( $file['tmp_name'] );
    3434    if ( $space_left < $file_size ) {
    35         /* translators: 1: Required disk space in kilobytes */
    36         $file['error'] = sprintf( __( 'Not enough space to upload. %1$s KB needed.' ), number_format( ( $file_size - $space_left ) / KB_IN_BYTES ) );
     35        /* translators: %s: required disk space in kilobytes */
     36        $file['error'] = sprintf( __( 'Not enough space to upload. %s KB needed.' ), number_format( ( $file_size - $space_left ) / KB_IN_BYTES ) );
    3737    }
    3838
    3939    if ( $file_size > ( KB_IN_BYTES * get_site_option( 'fileupload_maxk', 1500 ) ) ) {
    40         /* translators: 1: Maximum allowed file size in kilobytes */
    41         $file['error'] = sprintf( __( 'This file is too big. Files must be less than %1$s KB in size.' ), get_site_option( 'fileupload_maxk', 1500 ) );
     40        /* translators: %s: maximum allowed file size in kilobytes */
     41        $file['error'] = sprintf( __( 'This file is too big. Files must be less than %s KB in size.' ), get_site_option( 'fileupload_maxk', 1500 ) );
    4242    }
    4343

  • trunk/src/wp-admin/includes/network.php

    r42343 r42827  
    265265        <?php
    266266        printf(
    267             /* translators: 1: site url 2: host name 3. www */
     267            /* translators: 1: site url, 2: host name, 3: www */
    268268            __( 'We recommend you change your siteurl to %1$s before enabling the network feature. It will still be possible to visit your site using the %3$s prefix with an address like %2$s but any links will not have the %3$s prefix.' ),
    269269            '<code>' . substr( $hostname, 4 ) . '</code>',
    … …  
    297297                <?php
    298298                    printf(
    299                         /* translators: 1: localhost 2: localhost.localdomain */
     299                        /* translators: 1: localhost, 2: localhost.localdomain */
    300300                        __( 'Because you are using %1$s, the sites in your WordPress network must use sub-directories. Consider using %2$s if you wish to use sub-domains.' ),
    301301                        '<code>localhost</code>',
    … …  
    437437            echo '<strong>' . __( 'Caution:' ) . '</strong> ';
    438438            printf(
    439                 /* translators: 1: wp-config.php 2: .htaccess */
     439                /* translators: 1: wp-config.php, 2: .htaccess */
    440440                __( 'We recommend you back up your existing %1$s and %2$s files.' ),
    441441                '<code>wp-config.php</code>',
    … …  
    445445            echo '<strong>' . __( 'Caution:' ) . '</strong> ';
    446446            printf(
    447                 /* translators: 1: wp-config.php 2: web.config */
     447                /* translators: 1: wp-config.php, 2: web.config */
    448448                __( 'We recommend you back up your existing %1$s and %2$s files.' ),
    449449                '<code>wp-config.php</code>',
    … …  
    453453            echo '<strong>' . __( 'Caution:' ) . '</strong> ';
    454454            printf(
    455                 /* translators: 1: wp-config.php */
     455                /* translators: %s: wp-config.php */
    456456                __( 'We recommend you back up your existing %s file.' ),
    457457                '<code>wp-config.php</code>'
    … …  
    467467            <?php
    468468            printf(
    469                 /* translators: 1: wp-config.php 2: location of wp-config file, 3: translated version of "That's all, stop editing! Happy blogging." */
     469                /* translators: 1: wp-config.php, 2: location of wp-config file, 3: translated version of "That's all, stop editing! Happy blogging." */
    470470                __( 'Add the following to your %1$s file in %2$s <strong>above</strong> the line reading %3$s:' ),
    471471                '<code>wp-config.php</code>',
    … …  
    524524    if ( 1 == $num_keys_salts ) {
    525525        printf(
    526             /* translators: 1: wp-config.php */
     526            /* translators: %s: wp-config.php */
    527527            __( 'This unique authentication key is also missing from your %s file.' ),
    528528            '<code>wp-config.php</code>'
    … …  
    530530    } else {
    531531        printf(
    532             /* translators: 1: wp-config.php */
     532            /* translators: %s: wp-config.php */
    533533            __( 'These unique authentication keys are also missing from your %s file.' ),
    534534            '<code>wp-config.php</code>'
    … …  
    599599            echo '<li><p>';
    600600            printf(
    601                 /* translators: 1: a filename like .htaccess. 2: a file path. */
     601                /* translators: 1: a filename like .htaccess, 2: a file path */
    602602                __( 'Add the following to your %1$s file in %2$s, <strong>replacing</strong> other WordPress rules:' ),
    603603                '<code>web.config</code>',
    … …  
    641641        echo '<li><p>';
    642642        printf(
    643             /* translators: 1: a filename like .htaccess. 2: a file path. */
     643            /* translators: 1: a filename like .htaccess, 2: a file path */
    644644            __( 'Add the following to your %1$s file in %2$s, <strong>replacing</strong> other WordPress rules:' ),
    645645            '<code>.htaccess</code>',

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

    r42676 r42827  
    22032203            'convert_to_screen(), add_meta_box()',
    22042204            sprintf(
    2205                 /* translators: 1: wp-admin/includes/template.php 2: add_meta_box() 3: add_meta_boxes */
     2205                /* translators: 1: wp-admin/includes/template.php, 2: add_meta_box(), 3: add_meta_boxes */
    22062206                __( 'Likely direct inclusion of %1$s in order to use %2$s. This is very wrong. Hook the %2$s call into the %3$s action instead.' ),
    22072207                '<code>wp-admin/includes/template.php</code>',
    … …  
    22862286
    22872287    if ( $r['number'] ) {
    2288         /* translators: 1: The rating, 2: The number of ratings */
     2288        /* translators: 1: the rating, 2: the number of ratings */
    22892289        $format = _n( '%1$s rating based on %2$s rating', '%1$s rating based on %2$s ratings', $r['number'] );
    22902290        $title  = sprintf( $format, number_format_i18n( $rating, 1 ), number_format_i18n( $r['number'] ) );
    22912291    } else {
    2292         /* translators: 1: The rating */
     2292        /* translators: %s: the rating */
    22932293        $title = sprintf( __( '%s rating' ), number_format_i18n( $rating, 1 ) );
    22942294    }

  • trunk/src/wp-admin/includes/user.php

    r42761 r42827  
    557557    $roles = get_editable_roles();
    558558    $role  = $roles[ $_REQUEST['role'] ];
    559     /* translators: 1: Site name, 2: site URL, 3: role */
     559    /* translators: 1: site name, 2: site URL, 3: role */
    560560    return sprintf(
    561561        __(

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

    r42343 r42827  
    6666        echo '<h2 class="screen-reader-text">' . __( 'Check secret keys' ) . '</h2>';
    6767
    68         // Translators: 1: wp-config.php; 2: Secret key service URL.
     68        /* translators: 1: wp-config.php, 2: secret key service URL */
    6969        echo '<p>' . sprintf( __( 'While you are editing your %1$s file, take a moment to make sure you have all 8 keys and that they are unique. You can generate these using the <a href="%2$s">WordPress.org secret key service</a>.' ), '<code>wp-config.php</code>', 'https://api.wordpress.org/secret-key/1.1/salt/' ) . '</p>';
    7070    }

  • trunk/src/wp-admin/network/settings.php

    r42606 r42827  
    208208                    if ( is_subdomain_install() ) {
    209209                        echo '<p class="description">';
    210                         /* translators: 1: NOBLOGREDIRECT 2: wp-config.php */
     210                        /* translators: 1: NOBLOGREDIRECT, 2: wp-config.php */
    211211                        printf(
    212212                            __( 'If registration is disabled, please set %1$s in %2$s to a URL you will redirect visitors to if they visit a non-existent site.' ),

  • trunk/src/wp-admin/plugins.php

    r42343 r42827  
    464464        echo '<div id="message" class="error"><p>';
    465465        printf(
    466             /* translators: 1: plugin file 2: error message */
     466            /* translators: 1: plugin file, 2: error message */
    467467            __( 'The plugin %1$s has been <strong>deactivated</strong> due to an error: %2$s' ),
    468468            '<code>' . esc_html( $plugin_file ) . '</code>',

  • trunk/src/wp-admin/revision.php

    r42795 r42827  
    8989        $post_edit_link = get_edit_post_link();
    9090        $post_title     = '<a href="' . $post_edit_link . '">' . _draft_or_post_title() . '</a>';
    91         /* translators: 1: Post title */
    92         $h1             = sprintf( __( 'Compare Revisions of &#8220;%1$s&#8221;' ), $post_title );
     91        /* translators: %s: post title */
     92        $h1             = sprintf( __( 'Compare Revisions of &#8220;%s&#8221;' ), $post_title );
    9393        $return_to_post = '<a href="' . $post_edit_link . '">' . __( '&larr; Return to editor' ) . '</a>';
    9494        $title          = __( 'Revisions' );

  • trunk/src/wp-admin/setup-config.php

    r42672 r42827  
    6060    wp_die(
    6161        '<p>' . sprintf(
    62             /* translators: 1: wp-config.php 2: install.php */
     62            /* translators: 1: wp-config.php, 2: install.php */
    6363            __( 'The file %1$s already exists. If you need to reset any of the configuration items in this file, please delete it first. You may try <a href="%2$s">installing now</a>.' ),
    6464            '<code>wp-config.php</code>',
    … …  
    7272    wp_die(
    7373        '<p>' . sprintf(
    74             /* translators: 1: wp-config.php 2: install.php */
     74            /* translators: 1: wp-config.php, 2: install.php */
    7575            __( 'The file %1$s already exists one level above your WordPress installation. If you need to reset any of the configuration items in this file, please delete it first. You may try <a href="%2$s">installing now</a>.' ),
    7676            '<code>wp-config.php</code>',

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

    r42688 r42827  
    676676            <p class="description">
    677677                <?php
    678                 /* translators: 1: User's display name. */
     678                /* translators: %s: user's display name */
    679679                printf( __( 'Log %s out of all locations.' ), $profileuser->display_name );
    680680                ?>

  • trunk/src/wp-includes/class-wp-customize-nav-menus.php

    r42630 r42827  
    948948
    949949            $data = array(
    950                 /* translators: %1$s is the post type name and %2$s is the error message. */
     950                /* translators: 1: post type name, 2: error message */
    951951                'message' => sprintf( __( '%1$s could not be created: %2$s' ), $singular_name, $error->get_error_message() ),
    952952            );
    … …  
    982982                            <span class="screen-reader-text">
    983983                            <?php
    984                                 /* translators: 1: Title of a menu item, 2: Type of a menu item */
     984                                /* translators: 1: title of a menu item, 2: type of a menu item */
    985985                                printf( __( 'Add to menu: %1$s (%2$s)' ), '{{ data.title || wp.customize.Menus.data.l10n.untitled }}', '{{ data.type_label }}' );
    986986                            ?>

  • trunk/src/wp-includes/class-wp-http-curl.php

    r42746 r42827  
    191191                return new WP_Error(
    192192                    'http_request_failed', sprintf(
    193                         /* translators: 1: fopen() 2: file name */
     193                        /* translators: 1: fopen(), 2: file name */
    194194                        __( 'Could not open handle for %1$s to %2$s.' ),
    195195                        'fopen()',

  • trunk/src/wp-includes/class-wp-http-streams.php

    r42746 r42827  
    251251                return new WP_Error(
    252252                    'http_request_failed', sprintf(
    253                         /* translators: 1: fopen() 2: file name */
     253                        /* translators: 1: fopen(), 2: file name */
    254254                        __( 'Could not open handle for %1$s to %2$s.' ),
    255255                        'fopen()',

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

    r42815 r42827  
    15411541
    15421542    if ( false === $more ) {
    1543         /* translators: 1: Number of comments 2: post title */
     1543        /* translators: 1: number of comments, 2: post title */
    15441544        $more = _n( '%1$s Comment<span class="screen-reader-text"> on %2$s</span>', '%1$s Comments<span class="screen-reader-text"> on %2$s</span>', $number );
    15451545        $more = sprintf( $more, number_format_i18n( $number ), $title );
    … …  
    16301630        'respond_id'    => 'respond',
    16311631        'reply_text'    => __( 'Reply' ),
    1632         /* translators: Comment reply button text. 1: Comment author name */
     1632        /* translators: Comment reply button text. %s: Comment author name */
    16331633        'reply_to_text' => __( 'Reply to %s' ),
    16341634        'login_text'    => __( 'Log in to Reply' ),

  • trunk/src/wp-includes/customize/class-wp-customize-nav-menu-item-control.php

    r42343 r42827  
    135135                <p class="link-to-original">
    136136                    <?php
    137                         /* translators: Nav menu item original title. 1: Original title */
     137                        /* translators: Nav menu item original title. %s: Original title */
    138138                        printf( __( 'Original: %s' ), '<a class="original-link" href="{{ data.url }}">{{ data.original_title }}</a>' );
    139139                    ?>

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

    r42343 r42827  
    3131    <?php
    3232    if ( is_singular() ) {
    33         /* translators: Comments feed title. 1: Post title */
     33        /* translators: Comments feed title. %s: Post title */
    3434        printf( ent2ncr( __( 'Comments on %s' ) ), get_the_title_rss() );
    3535    } elseif ( is_search() ) {
    … …  
    3737        printf( ent2ncr( __( 'Comments for %1$s searching on %2$s' ) ), get_bloginfo_rss( 'name' ), get_search_query() );
    3838    } else {
    39         /* translators: Comments feed title. 1: Site name */
     39        /* translators: Comments feed title. %s: Site name */
    4040        printf( ent2ncr( __( 'Comments for %s' ) ), get_wp_title_rss() );
    4141    }
    … …  
    8888            printf( ent2ncr( __( 'Comment on %1$s by %2$s' ) ), $title, get_comment_author_rss() );
    8989        } else {
    90             /* translators: Comment author title. 1: Comment author name */
     90            /* translators: Comment author title. %s: Comment author name */
    9191            printf( ent2ncr( __( 'By: %s' ) ), get_comment_author_rss() );
    9292        }

  • trunk/src/wp-includes/feed-rss2-comments.php

    r42343 r42827  
    3636    <?php
    3737    if ( is_singular() ) {
    38         /* translators: Comments feed title. 1: Post title */
     38        /* translators: Comments feed title. %s: Post title */
    3939        printf( ent2ncr( __( 'Comments on: %s' ) ), get_the_title_rss() );
    4040    } elseif ( is_search() ) {
    … …  
    4242        printf( ent2ncr( __( 'Comments for %1$s searching on %2$s' ) ), get_bloginfo_rss( 'name' ), get_search_query() );
    4343    } else {
    44         /* translators: Comments feed title. 1: Site name */
     44        /* translators: Comments feed title. %s: Site name */
    4545        printf( ent2ncr( __( 'Comments for %s' ) ), get_wp_title_rss() );
    4646    }
    … …  
    9191                    printf( ent2ncr( __( 'Comment on %1$s by %2$s' ) ), $title, get_comment_author_rss() );
    9292                } else {
    93                     /* translators: Comment author title. 1: Comment author name */
     93                    /* translators: Comment author title. %s: Comment author name */
    9494                    printf( ent2ncr( __( 'By: %s' ) ), get_comment_author_rss() );
    9595                }

  • trunk/src/wp-includes/formatting.php

    r42821 r42827  
    35593559            $mins = 1;
    35603560        }
    3561         /* translators: Time difference between two dates, in minutes (min=minute). 1: Number of minutes */
     3561        /* translators: Time difference between two dates, in minutes (min=minute). %s: Number of minutes */
    35623562        $since = sprintf( _n( '%s min', '%s mins', $mins ), $mins );
    35633563    } elseif ( $diff < DAY_IN_SECONDS && $diff >= HOUR_IN_SECONDS ) {
    … …  
    35663566            $hours = 1;
    35673567        }
    3568         /* translators: Time difference between two dates, in hours. 1: Number of hours */
     3568        /* translators: Time difference between two dates, in hours. %s: Number of hours */
    35693569        $since = sprintf( _n( '%s hour', '%s hours', $hours ), $hours );
    35703570    } elseif ( $diff < WEEK_IN_SECONDS && $diff >= DAY_IN_SECONDS ) {
    … …  
    35733573            $days = 1;
    35743574        }
    3575         /* translators: Time difference between two dates, in days. 1: Number of days */
     3575        /* translators: Time difference between two dates, in days. %s: Number of days */
    35763576        $since = sprintf( _n( '%s day', '%s days', $days ), $days );
    35773577    } elseif ( $diff < MONTH_IN_SECONDS && $diff >= WEEK_IN_SECONDS ) {
    … …  
    35803580            $weeks = 1;
    35813581        }
    3582         /* translators: Time difference between two dates, in weeks. 1: Number of weeks */
     3582        /* translators: Time difference between two dates, in weeks. %s: Number of weeks */
    35833583        $since = sprintf( _n( '%s week', '%s weeks', $weeks ), $weeks );
    35843584    } elseif ( $diff < YEAR_IN_SECONDS && $diff >= MONTH_IN_SECONDS ) {
    … …  
    35873587            $months = 1;
    35883588        }
    3589         /* translators: Time difference between two dates, in months. 1: Number of months */
     3589        /* translators: Time difference between two dates, in months. %s: Number of months */
    35903590        $since = sprintf( _n( '%s month', '%s months', $months ), $months );
    35913591    } elseif ( $diff >= YEAR_IN_SECONDS ) {
    … …  
    35943594            $years = 1;
    35953595        }
    3596         /* translators: Time difference between two dates, in years. 1: Number of years */
     3596        /* translators: Time difference between two dates, in years. %s: Number of years */
    35973597        $since = sprintf( _n( '%s year', '%s years', $years ), $years );
    35983598    }

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

    r42765 r42827  
    14911491function get_the_archive_title() {
    14921492    if ( is_category() ) {
    1493         /* translators: Category archive title. 1: Category name */
     1493        /* translators: Category archive title. %s: Category name */
    14941494        $title = sprintf( __( 'Category: %s' ), single_cat_title( '', false ) );
    14951495    } elseif ( is_tag() ) {
    1496         /* translators: Tag archive title. 1: Tag name */
     1496        /* translators: Tag archive title. %s: Tag name */
    14971497        $title = sprintf( __( 'Tag: %s' ), single_tag_title( '', false ) );
    14981498    } elseif ( is_author() ) {
    1499         /* translators: Author archive title. 1: Author name */
     1499        /* translators: Author archive title. %s: Author name */
    15001500        $title = sprintf( __( 'Author: %s' ), '<span class="vcard">' . get_the_author() . '</span>' );
    15011501    } elseif ( is_year() ) {
    1502         /* translators: Yearly archive title. 1: Year */
     1502        /* translators: Yearly archive title. %s: Year */
    15031503        $title = sprintf( __( 'Year: %s' ), get_the_date( _x( 'Y', 'yearly archives date format' ) ) );
    15041504    } elseif ( is_month() ) {
    1505         /* translators: Monthly archive title. 1: Month name and year */
     1505        /* translators: Monthly archive title. %s: Month name and year */
    15061506        $title = sprintf( __( 'Month: %s' ), get_the_date( _x( 'F Y', 'monthly archives date format' ) ) );
    15071507    } elseif ( is_day() ) {
    1508         /* translators: Daily archive title. 1: Date */
     1508        /* translators: Daily archive title. %s: Date */
    15091509        $title = sprintf( __( 'Day: %s' ), get_the_date( _x( 'F j, Y', 'daily archives date format' ) ) );
    15101510    } elseif ( is_tax( 'post_format' ) ) {
    … …  
    15291529        }
    15301530    } elseif ( is_post_type_archive() ) {
    1531         /* translators: Post type archive title. 1: Post type name */
     1531        /* translators: Post type archive title. %s: Post type name */
    15321532        $title = sprintf( __( 'Archives: %s' ), post_type_archive_title( '', false ) );
    15331533    } elseif ( is_tax() ) {
    … …  
    21412141            // any posts today?
    21422142            $date_format = date( _x( 'F j, Y', 'daily archives date format' ), strtotime( "{$thisyear}-{$thismonth}-{$day}" ) );
    2143             /* translators: Post calendar label. 1: Date */
     2143            /* translators: Post calendar label. %s: Date */
    21442144            $label            = sprintf( __( 'Posts published on %s' ), $date_format );
    21452145            $calendar_output .= sprintf(

  • trunk/src/wp-includes/load.php

    r42787 r42827  
    488488        wp_load_translations_early();
    489489        wp_die(
    490             /* translators: 1: $table_prefix 2: wp-config.php */
     490            /* translators: 1: $table_prefix, 2: wp-config.php */
    491491            sprintf(
    492492                __( '<strong>ERROR</strong>: %1$s in %2$s can only contain numbers, letters, and underscores.' ),

  • trunk/src/wp-includes/ms-functions.php

    r42678 r42827  
    21622162
    21632163    if ( strlen( $upload['bits'] ) > ( KB_IN_BYTES * get_site_option( 'fileupload_maxk', 1500 ) ) ) {
    2164         return sprintf( __( 'This file is too big. Files must be less than %d KB in size.' ) . '<br />', get_site_option( 'fileupload_maxk', 1500 ) );
     2164        /* translators: %s: maximum allowed file size in kilobytes */
     2165        return sprintf( __( 'This file is too big. Files must be less than %s KB in size.' ) . '<br />', get_site_option( 'fileupload_maxk', 1500 ) );
    21652166    }
    21662167

  • trunk/src/wp-includes/pluggable.php

    r42710 r42827  
    15241524        switch ( $comment->comment_type ) {
    15251525            case 'trackback':
    1526                 /* translators: 1: Post title */
     1526                /* translators: %s: post title */
    15271527                $notify_message = sprintf( __( 'New trackback on your post "%s"' ), $post->post_title ) . "\r\n";
    1528                 /* translators: 1: Trackback/pingback website name, 2: website IP address, 3: website hostname */
     1528                /* translators: 1: trackback/pingback website name, 2: website IP address, 3: website hostname */
    15291529                $notify_message .= sprintf( __( 'Website: %1$s (IP address: %2$s, %3$s)' ), $comment->comment_author, $comment->comment_author_IP, $comment_author_domain ) . "\r\n";
     1530                /* translators: %s: trackback/pingback/comment author URL */
    15301531                $notify_message .= sprintf( __( 'URL: %s' ), $comment->comment_author_url ) . "\r\n";
     1532                /* translators: %s: comment text */
    15311533                $notify_message .= sprintf( __( 'Comment: %s' ), "\r\n" . $comment_content ) . "\r\n\r\n";
    15321534                $notify_message .= __( 'You can see all trackbacks on this post here:' ) . "\r\n";
    … …  
    15351537                break;
    15361538            case 'pingback':
    1537                 /* translators: 1: Post title */
     1539                /* translators: %s: post title */
    15381540                $notify_message = sprintf( __( 'New pingback on your post "%s"' ), $post->post_title ) . "\r\n";
    1539                 /* translators: 1: Trackback/pingback website name, 2: website IP address, 3: website hostname */
     1541                /* translators: 1: trackback/pingback website name, 2: website IP address, 3: website hostname */
    15401542                $notify_message .= sprintf( __( 'Website: %1$s (IP address: %2$s, %3$s)' ), $comment->comment_author, $comment->comment_author_IP, $comment_author_domain ) . "\r\n";
     1543                /* translators: %s: trackback/pingback/comment author URL */
    15411544                $notify_message .= sprintf( __( 'URL: %s' ), $comment->comment_author_url ) . "\r\n";
     1545                /* translators: %s: comment text */
    15421546                $notify_message .= sprintf( __( 'Comment: %s' ), "\r\n" . $comment_content ) . "\r\n\r\n";
    15431547                $notify_message .= __( 'You can see all pingbacks on this post here:' ) . "\r\n";
    … …  
    15461550                break;
    15471551            default: // Comments
     1552                /* translators: %s: post title */
    15481553                $notify_message = sprintf( __( 'New comment on your post "%s"' ), $post->post_title ) . "\r\n";
    15491554                /* translators: 1: comment author, 2: comment author's IP address, 3: comment author's hostname */
    15501555                $notify_message .= sprintf( __( 'Author: %1$s (IP address: %2$s, %3$s)' ), $comment->comment_author, $comment->comment_author_IP, $comment_author_domain ) . "\r\n";
     1556                /* translators: %s: comment author email */
    15511557                $notify_message .= sprintf( __( 'Email: %s' ), $comment->comment_author_email ) . "\r\n";
     1558                /* translators: %s: trackback/pingback/comment author URL */
    15521559                $notify_message .= sprintf( __( 'URL: %s' ), $comment->comment_author_url ) . "\r\n";
     1560                /* translators: %s: comment text */
    15531561                $notify_message .= sprintf( __( 'Comment: %s' ), "\r\n" . $comment_content ) . "\r\n\r\n";
    15541562                $notify_message .= __( 'You can see all comments on this post here:' ) . "\r\n";
    … …  
    15621570        if ( user_can( $post->post_author, 'edit_comment', $comment->comment_ID ) ) {
    15631571            if ( EMPTY_TRASH_DAYS ) {
     1572                /* translators: Comment moderation. %s: Comment action URL */
    15641573                $notify_message .= sprintf( __( 'Trash it: %s' ), admin_url( "comment.php?action=trash&c={$comment->comment_ID}#wpbody-content" ) ) . "\r\n";
    15651574            } else {
     1575                /* translators: Comment moderation. %s: Comment action URL */
    15661576                $notify_message .= sprintf( __( 'Delete it: %s' ), admin_url( "comment.php?action=delete&c={$comment->comment_ID}#wpbody-content" ) ) . "\r\n";
    15671577            }
     1578            /* translators: Comment moderation. %s: Comment action URL */
    15681579            $notify_message .= sprintf( __( 'Spam it: %s' ), admin_url( "comment.php?action=spam&c={$comment->comment_ID}#wpbody-content" ) ) . "\r\n";
    15691580        }
    … …  
    16881699        switch ( $comment->comment_type ) {
    16891700            case 'trackback':
    1690                 /* translators: 1: Post title */
     1701                /* translators: %s: post title */
    16911702                $notify_message  = sprintf( __( 'A new trackback on the post "%s" is waiting for your approval' ), $post->post_title ) . "\r\n";
    16921703                $notify_message .= get_permalink( $comment->comment_post_ID ) . "\r\n\r\n";
    1693                 /* translators: 1: Trackback/pingback website name, 2: website IP address, 3: website hostname */
     1704                /* translators: 1: trackback/pingback website name, 2: website IP address, 3: website hostname */
    16941705                $notify_message .= sprintf( __( 'Website: %1$s (IP address: %2$s, %3$s)' ), $comment->comment_author, $comment->comment_author_IP, $comment_author_domain ) . "\r\n";
    1695                 /* translators: 1: Trackback/pingback/comment author URL */
     1706                /* translators: %s: trackback/pingback/comment author URL */
    16961707                $notify_message .= sprintf( __( 'URL: %s' ), $comment->comment_author_url ) . "\r\n";
    16971708                $notify_message .= __( 'Trackback excerpt: ' ) . "\r\n" . $comment_content . "\r\n\r\n";
    16981709                break;
    16991710            case 'pingback':
    1700                 /* translators: 1: Post title */
     1711                /* translators: %s: post title */
    17011712                $notify_message  = sprintf( __( 'A new pingback on the post "%s" is waiting for your approval' ), $post->post_title ) . "\r\n";
    17021713                $notify_message .= get_permalink( $comment->comment_post_ID ) . "\r\n\r\n";
    1703                 /* translators: 1: Trackback/pingback website name, 2: website IP address, 3: website hostname */
     1714                /* translators: 1: trackback/pingback website name, 2: website IP address, 3: website hostname */
    17041715                $notify_message .= sprintf( __( 'Website: %1$s (IP address: %2$s, %3$s)' ), $comment->comment_author, $comment->comment_author_IP, $comment_author_domain ) . "\r\n";
    1705                 /* translators: 1: Trackback/pingback/comment author URL */
     1716                /* translators: %s: trackback/pingback/comment author URL */
    17061717                $notify_message .= sprintf( __( 'URL: %s' ), $comment->comment_author_url ) . "\r\n";
    17071718                $notify_message .= __( 'Pingback excerpt: ' ) . "\r\n" . $comment_content . "\r\n\r\n";
    17081719                break;
    17091720            default: // Comments
    1710                 /* translators: 1: Post title */
     1721                /* translators: %s: post title */
    17111722                $notify_message  = sprintf( __( 'A new comment on the post "%s" is waiting for your approval' ), $post->post_title ) . "\r\n";
    17121723                $notify_message .= get_permalink( $comment->comment_post_ID ) . "\r\n\r\n";
    1713                 /* translators: 1: Comment author name, 2: comment author's IP address, 3: comment author's hostname */
     1724                /* translators: 1: comment author name, 2: comment author's IP address, 3: comment author's hostname */
    17141725                $notify_message .= sprintf( __( 'Author: %1$s (IP address: %2$s, %3$s)' ), $comment->comment_author, $comment->comment_author_IP, $comment_author_domain ) . "\r\n";
    1715                 /* translators: 1: Comment author URL */
     1726                /* translators: %s: comment author email */
    17161727                $notify_message .= sprintf( __( 'Email: %s' ), $comment->comment_author_email ) . "\r\n";
    1717                 /* translators: 1: Trackback/pingback/comment author URL */
     1728                /* translators: %s: trackback/pingback/comment author URL */
    17181729                $notify_message .= sprintf( __( 'URL: %s' ), $comment->comment_author_url ) . "\r\n";
    1719                 /* translators: 1: Comment text */
     1730                /* translators: %s: comment text */
    17201731                $notify_message .= sprintf( __( 'Comment: %s' ), "\r\n" . $comment_content ) . "\r\n\r\n";
    17211732                break;
    17221733        }
    17231734
    1724         /* translators: Comment moderation. 1: Comment action URL */
     1735        /* translators: Comment moderation. %s: Comment action URL */
    17251736        $notify_message .= sprintf( __( 'Approve it: %s' ), admin_url( "comment.php?action=approve&c={$comment_id}#wpbody-content" ) ) . "\r\n";
    17261737
    17271738        if ( EMPTY_TRASH_DAYS ) {
    1728             /* translators: Comment moderation. 1: Comment action URL */
     1739            /* translators: Comment moderation. %s: Comment action URL */
    17291740            $notify_message .= sprintf( __( 'Trash it: %s' ), admin_url( "comment.php?action=trash&c={$comment_id}#wpbody-content" ) ) . "\r\n";
    17301741        } else {
    1731             /* translators: Comment moderation. 1: Comment action URL */
     1742            /* translators: Comment moderation. %s: Comment action URL */
    17321743            $notify_message .= sprintf( __( 'Delete it: %s' ), admin_url( "comment.php?action=delete&c={$comment_id}#wpbody-content" ) ) . "\r\n";
    17331744        }
    17341745
    1735         /* translators: Comment moderation. 1: Comment action URL */
     1746        /* translators: Comment moderation. %s: Comment action URL */
    17361747        $notify_message .= sprintf( __( 'Spam it: %s' ), admin_url( "comment.php?action=spam&c={$comment_id}#wpbody-content" ) ) . "\r\n";
    17371748
    1738         /* translators: Comment moderation. 1: Number of comments awaiting approval */
     1749        /* translators: Comment moderation. %s: Number of comments awaiting approval */
    17391750        $notify_message .= sprintf(
    17401751            _n(

  • trunk/src/wp-includes/taxonomy.php

    r42755 r42827  
    28502850            $slug = wp_unique_term_slug( $slug, (object) $args );
    28512851        } else {
    2852             /* translators: 1: Taxonomy term slug */
     2852            /* translators: %s: taxonomy term slug */
    28532853            return new WP_Error( 'duplicate_term_slug', sprintf( __( 'The slug &#8220;%s&#8221; is already in use by another term.' ), $slug ) );
    28542854        }

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

    r42816 r42827  
    25382538            // Can be called in functions.php but must happen before wp_loaded, i.e. not in header.php.
    25392539            if ( did_action( 'wp_loaded' ) ) {
    2540                 /* translators: 1: Theme support 2: hook name */
     2540                /* translators: 1: title-tag, 2: wp_loaded */
    25412541                _doing_it_wrong(
    25422542                    "add_theme_support( 'title-tag' )", sprintf(

  • trunk/src/wp-includes/update.php

    r42653 r42827  
    666666    $titles          = array();
    667667    if ( $counts['wordpress'] ) {
    668         /* translators: 1: Number of updates available to WordPress */
     668        /* translators: %d: number of updates available to WordPress */
    669669        $titles['wordpress'] = sprintf( __( '%d WordPress Update' ), $counts['wordpress'] );
    670670    }
    671671    if ( $counts['plugins'] ) {
    672         /* translators: 1: Number of updates available to plugins */
     672        /* translators: %d: number of updates available to plugins */
    673673        $titles['plugins'] = sprintf( _n( '%d Plugin Update', '%d Plugin Updates', $counts['plugins'] ), $counts['plugins'] );
    674674    }
    675675    if ( $counts['themes'] ) {
    676         /* translators: 1: Number of updates available to themes */
     676        /* translators: %d: number of updates available to themes */
    677677        $titles['themes'] = sprintf( _n( '%d Theme Update', '%d Theme Updates', $counts['themes'] ), $counts['themes'] );
    678678    }

  • trunk/src/wp-includes/user.php

    r42791 r42827  
    19531953            $pass_change_email = array(
    19541954                'to'      => $user['user_email'],
    1955                 /* translators: User password change notification email subject. 1: Site name */
     1955                /* translators: User password change notification email subject. %s: Site name */
    19561956                'subject' => __( '[%s] Notice of Password Change' ),
    19571957                'message' => $pass_change_text,
    … …  
    20102010            $email_change_email = array(
    20112011                'to'      => $user['user_email'],
    2012                 /* translators: User email change notification email subject. 1: Site name */
     2012                /* translators: User email change notification email subject. %s: Site name */
    20132013                'subject' => __( '[%s] Notice of Email Change' ),
    20142014                'message' => $email_change_text,

  • trunk/src/wp-includes/widgets/class-wp-widget-media-image.php

    r42533 r42827  
    349349                    <p class="hidden" id="{{ describedById }}">
    350350                    <?php
    351                         /* translators: placeholder is image filename */
     351                        /* translators: %s: image filename */
    352352                        echo sprintf( __( 'Current image: %s' ), '{{ data.currentFilename }}' );
    353353                    ?>

  • trunk/src/wp-includes/wp-db.php

    r42789 r42827  
    16491649
    16501650            $message .= '<p>' . sprintf(
    1651                 /* translators: 1: wp-config.php. 2: database host */
     1651                /* translators: 1: wp-config.php, 2: database host */
    16521652                __( 'This either means that the username and password information in your %1$s file is incorrect or we can&#8217;t contact the database server at %2$s. This could mean your host&#8217;s database server is down.' ),
    16531653                '<code>wp-config.php</code>',

  • trunk/src/wp-links-opml.php

    r42343 r42827  
    3030        <title>
    3131        <?php
    32             /* translators: 1: Site name */
     32            /* translators: %s: site name */
    3333            printf( __( 'Links for %s' ), esc_attr( get_bloginfo( 'name', 'display' ) ) );
    3434        ?>

  • trunk/src/wp-login.php

    r42791 r42827  
    955955            } elseif ( isset( $_POST['testcookie'] ) && empty( $_COOKIE[ TEST_COOKIE ] ) ) {
    956956                // If cookies are disabled we can't log in even with a valid user+pass
    957                 /* translators: 1: Browser cookie documentation URL */
     957                /* translators: %s: Browser cookie documentation URL */
    958958                $user = new WP_Error(
    959959                    'test_cookie', sprintf(
Note: See TracChangeset for help on using the changeset viewer.