Index: wp-includes/post-template.php =================================================================== --- wp-includes/post-template.php (revision 4163) +++ wp-includes/post-template.php (working copy) @@ -330,7 +330,7 @@ return "guid}\" title=\"{$_post->post_title}\" >{$innerHTML}"; } else { - $p .= __('Missing attachment'); + $p .= __('Missing Attachment'); } return $p; } Index: wp-includes/classes.php =================================================================== --- wp-includes/classes.php (revision 4163) +++ wp-includes/classes.php (working copy) @@ -25,9 +25,9 @@ $cnt++; } } - echo "

$cnt comment"; - if ($cnt != 1 ) echo "s"; - echo " moved to the moderation queue.

\n"; + echo "

"; + printf(__('%d comment(s) moved to the moderation queue.'), $cnt); + echo "

\n"; } // End function move_spam function find_spam() { @@ -56,7 +56,7 @@ $numfound = count($counters[found]); $numqueue = $counters[in_queue]; - $body = '

' . sprintf(__('Suspected spam comments: %s'), $numfound) . '

'; + $body = '

' . sprintf(__('Suspected spam comments: %s'), "$numfound") . '

'; if ( count($counters[found]) > 0 ) { $id_list = implode( ',', $counters[found] ); Index: wp-includes/functions.php =================================================================== --- wp-includes/functions.php (revision 4163) +++ wp-includes/functions.php (working copy) @@ -947,7 +947,7 @@ $ifp = @ fopen($new_file, 'wb'); if ( ! $ifp ) - return array('error' => "Could not write file $new_file."); + return array('error' => sprintf(__('Could not write file %s'), $new_file)); $success = @ fwrite($ifp, $bits); fclose($ifp); @@ -1091,7 +1091,7 @@ } } - return __('Are you sure you want to do this'); + return __('Are you sure you want to do this?'); } function wp_nonce_ays($action) { Index: wp-includes/bookmark-template.php =================================================================== --- wp-includes/bookmark-template.php (revision 4163) +++ wp-includes/bookmark-template.php (working copy) @@ -271,8 +271,11 @@ $title = $desc; if ( $show_updated ) - if ( '00' != substr($bookmark->link_updated_f, 0, 2) ) - $title .= ' (Last updated ' . date(get_option('links_updated_date_format'), $bookmark->link_updated_f + (get_option('gmt_offset') * 3600)) . ')'; + if ( '00' != substr($bookmark->link_updated_f, 0, 2) ) { + $title .= ' '; + $title .= sprintf(__('Last updated: %s'), date(get_option('links_updated_date_format'), $bookmark->link_updated_f + (get_option('gmt_offset') * 3600))); + $title .= ')'; + } if ( '' != $title ) $title = ' title="' . $title . '"'; @@ -348,4 +351,4 @@ echo $output; } -?> \ No newline at end of file +?> Index: wp-admin/options-privacy.php =================================================================== --- wp-admin/options-privacy.php (revision 4163) +++ wp-admin/options-privacy.php (working copy) @@ -16,10 +16,10 @@ /> - +
/> - + Index: wp-admin/import/livejournal.php =================================================================== --- wp-admin/import/livejournal.php (revision 4163) +++ wp-admin/import/livejournal.php (working copy) @@ -164,5 +164,5 @@ $livejournal_import = new LJ_Import(); -register_importer('livejournal', 'LiveJournal', __('Import posts from LiveJournal'), array ($livejournal_import, 'dispatch')); +register_importer('livejournal', __('LiveJournal'), __('Import posts from LiveJournal'), array ($livejournal_import, 'dispatch')); ?> Index: wp-admin/import/dotclear.php =================================================================== --- wp-admin/import/dotclear.php (revision 4163) +++ wp-admin/import/dotclear.php (working copy) @@ -632,15 +632,15 @@ echo '

'.__('Preserving Authors').'

'; echo '

'.__('Secondly, we have attempted to preserve post authors. If you are the only author or contributor to your blog, then you are safe. In most cases, we are successful in this preservation endeavor. However, if we cannot ascertain the name of the writer due to discrepancies between database tables, we assign it to you, the administrative user.').'

'; echo '

'.__('Textile').'

'; - echo '

'.__('Also, since you\'re coming from Dotclear, you probably have been using Textile to format your comments and posts. If this is the case, we recommend downloading and installing Textile for WordPress. Trust me... You\'ll want it.').'

'; + echo '

'.__('Also, since you\'re coming from Dotclear, you probably have been using Textile to format your comments and posts. If this is the case, we recommend downloading and installing Textile for WordPress. Trust me... You\'ll want it.').'

'; echo '

'.__('WordPress Resources').'

'; echo '

'.__('Finally, there are numerous WordPress resources around the internet. Some of them are:').'

'; echo ''; - echo '

'.sprintf(__('That\'s it! What are you waiting for? Go login!'), '/wp-login.php').'

'; + echo '

'.sprintf(__('That\'s it! What are you waiting for? Go login!'), '../wp-login.php').'

'; } function db_form() @@ -743,5 +743,5 @@ } $dc_import = new Dotclear_Import(); -register_importer('dotclear', 'Dotclear', __('Import posts from a Dotclear Blog'), array ($dc_import, 'dispatch')); +register_importer('dotclear', __('Dotclear'), __('Import posts from a Dotclear Blog'), array ($dc_import, 'dispatch')); ?> Index: wp-admin/import/mt.php =================================================================== --- wp-admin/import/mt.php (revision 4163) +++ wp-admin/import/mt.php (working copy) @@ -32,7 +32,7 @@ global $wpdb, $testing; $users = $wpdb->get_results("SELECT * FROM $wpdb->users ORDER BY ID"); ?>
or map to existing '; + echo '
  • '.__('Current author:').' '.$author.'
    '.sprintf(__('Create user %1$s or map to existing'), '
    '); $this->users_form($j); echo '
    • '; } - echo ''.'
    '; + echo ''.'
    '; echo ''; echo ''; @@ -163,7 +163,7 @@ $file = wp_import_handle_upload(); if ( isset($file['error']) ) { $this->header(); - echo '

    Sorry, there has been an error.

    '; + echo '

    '.__('Sorry, there has been an error').'.

    '; echo '

    ' . $file['error'] . '

    '; $this->footer(); return; @@ -334,7 +334,7 @@ } } if ( $num_comments ) - printf(__(' (%s comments)'), $num_comments); + printf(' '.__('(%s comments)'), $num_comments); // Finally the pings // fix the double newline on the first one @@ -382,7 +382,7 @@ } } if ( $num_pings ) - printf(__(' (%s pings)'), $num_pings); + printf(' '.__('(%s pings)'), $num_pings); echo ""; } @@ -430,5 +430,5 @@ $mt_import = new MT_Import(); -register_importer('mt', 'Movable Type and Typepad', __('Imports posts and comments from your Movable Type or Typepad blog'), array ($mt_import, 'dispatch')); +register_importer('mt', __('Movable Type and Typepad'), __('Imports posts and comments from your Movable Type or Typepad blog'), array ($mt_import, 'dispatch')); ?> Index: wp-admin/import/blogger.php =================================================================== --- wp-admin/import/blogger.php (revision 4163) +++ wp-admin/import/blogger.php (working copy) @@ -341,7 +341,7 @@ $form = "
    "; $form.= $body; $form.= "
    "; - $output.= '

    '.sprintf('%s in progress, please wait...', $blog_opt)."

    \n"; + $output.= '

    '.sprintf(__('%s in progress, please wait...'), $blog_opt)."

    \n"; } else { $output.= "

    $blog_opt

    \n"; } @@ -420,7 +420,7 @@ $user_email = $wpdb->escape($post_author_email); $user_password = substr(md5(uniqid(microtime())), 0, 6); $result = wp_create_user( $user_login, $user_password, $user_email ); - $status.= sprintf('Registered user %s.', $user_login); + $status.= sprintf(__('Registered user %s.'), $user_login); $this->import['blogs'][$_GET['blog']]['newusers'][] = $user_login; } $userdata = get_userdatabylogin( $post_author_name ); @@ -509,7 +509,7 @@ } } $status = sprintf(__('%s post(s) parsed, %s skipped...'), $postcount, $skippedpostcount).' '. - sprintf(__('%s comment(s) parsed, %s skipped...'), $commentcoun, $skippedcommentcount).' '. + sprintf(__('%s comment(s) parsed, %s skipped...'), $commentcount, $skippedcommentcount).' '. ' '.__('Done').''; $import = $this->import; $import['blogs'][$_GET['blog']]['archives']["$url"] = $status; @@ -546,7 +546,7 @@ $response = $this->get_blogger("http://www.blogger.com/blog-publishing.g?blogID={$_GET['blog']}&publishMode={$optary['backup']['publishMode']}", $headers); sleep(2); if ( $response['code'] >= 400 ) - wp_die('

    Error restoring publishMode.

    Please tell the devs.

    ' . addslashes(print_r($response, 1)) ); + wp_die('

    '.__('Error restoring publishMode').'

    '.__('Please tell the devs.').'

    ' . addslashes(print_r($response, 1)) ); } } if ( $optary['backup'] != $optary['modify'] ) { @@ -662,6 +662,6 @@ $blogger_import = new Blogger_Import(); -register_importer('blogger', 'Blogger and Blogspot', __('Import posts and comments from your Blogger account'), array ($blogger_import, 'start')); +register_importer('blogger', __('Blogger and Blogspot'), __('Import posts and comments from your Blogger account'), array ($blogger_import, 'start')); ?> Index: wp-admin/import/blogware.php =================================================================== --- wp-admin/import/blogware.php (revision 4163) +++ wp-admin/import/blogware.php (working copy) @@ -188,5 +188,5 @@ $blogware_import = new BW_Import(); -register_importer('blogware', 'Blogware', __('Import posts from Blogware'), array ($blogware_import, 'dispatch')); +register_importer('blogware', __('Blogware'), __('Import posts from Blogware'), array ($blogware_import, 'dispatch')); ?> Index: wp-admin/import/textpattern.php =================================================================== --- wp-admin/import/textpattern.php (revision 4163) +++ wp-admin/import/textpattern.php (working copy) @@ -555,12 +555,12 @@ echo '

    '.__('Preserving Authors').'

    '; echo '

    '.__('Secondly, we have attempted to preserve post authors. If you are the only author or contributor to your blog, then you are safe. In most cases, we are successful in this preservation endeavor. However, if we cannot ascertain the name of the writer due to discrepancies between database tables, we assign it to you, the administrative user.').'

    '; echo '

    '.__('Textile').'

    '; - echo '

    '.__('Also, since you\'re coming from Textpattern, you probably have been using Textile to format your comments and posts. If this is the case, we recommend downloading and installing Textile for WordPress. Trust me... You\'ll want it.').'

    '; + echo '

    '.__('Also, since you\'re coming from Textpattern, you probably have been using Textile to format your comments and posts. If this is the case, we recommend downloading and installing Textile for WordPress. Trust me... You\'ll want it.').'

    '; echo '

    '.__('WordPress Resources').'

    '; echo '

    '.__('Finally, there are numerous WordPress resources around the internet. Some of them are:').'

    '; echo ''; echo '

    '.sprintf(__('That\'s it! What are you waiting for? Go login!'), '/wp-login.php').'

    '; @@ -659,5 +659,5 @@ } $txp_import = new Textpattern_Import(); -register_importer('textpattern', 'Textpattern', __('Import posts from a Textpattern Blog'), array ($txp_import, 'dispatch')); +register_importer('textpattern', __('Textpattern'), __('Import posts from a Textpattern Blog'), array ($txp_import, 'dispatch')); ?> Index: wp-admin/import/greymatter.php =================================================================== --- wp-admin/import/greymatter.php (revision 4163) +++ wp-admin/import/greymatter.php (working copy) @@ -16,44 +16,44 @@ function greet() { $this->header(); ?> -

    This is a basic GreyMatter to WordPress import script.

    -

    What it does:

    +

    +

    -

    What it does not:

    +

     

    -

    Second step: GreyMatter details:

    +

    - + - + - + - +
    Path to GM files:
    Path to GM entries:

    This importer will search for files 00000001.cgi to 000-whatever.cgi,
    so you need to enter the number of the last GM post here.
    (if you don't know that number, just log into your FTP and look it out
    in the entries' folder)
    so you need to enter the number of the last GM post here.
    (if you don't know that number, just log into your FTP and look it out
    in the entries' folder)") ?>
    Last entry's number:

    -

    When you're ready, click OK to start importing:

    +

     

    header(); ?> -

    The importer is running...

    +

     

    -

    Completed Greymatter import !

    +

    footer(); } @@ -308,5 +309,5 @@ $gm_import = new GM_Import(); -register_importer('greymatter', 'Greymatter', __('Import posts and comments from your Greymatter blog'), array ($gm_import, 'dispatch')); +register_importer('greymatter', __('Greymatter'), __('Import posts and comments from your Greymatter blog'), array ($gm_import, 'dispatch')); ?> Index: wp-admin/import/rss.php =================================================================== --- wp-admin/import/rss.php (revision 4163) +++ wp-admin/import/rss.php (working copy) @@ -168,5 +168,5 @@ $rss_import = new RSS_Import(); -register_importer('rss', 'RSS', __('Import posts from an RSS feed'), array ($rss_import, 'dispatch')); +register_importer('rss', __('RSS'), __('Import posts from an RSS feed'), array ($rss_import, 'dispatch')); ?> Index: wp-admin/import/wordpress.php =================================================================== --- wp-admin/import/wordpress.php (revision 4163) +++ wp-admin/import/wordpress.php (working copy) @@ -148,7 +148,7 @@ $j = -1; foreach ($authors as $author) { ++ $j; - echo '
  • Current author: '.$author.'
    '.'Create user
    or map to existing '; + echo '
  • '.__('Current author:').' '.$author.'
    '.sprintf(__('Create user %1$s or map to existing'), '
    '); $this->users_form($j); echo '
    • '; } @@ -163,7 +163,7 @@ $file = wp_import_handle_upload(); if ( isset($file['error']) ) { $this->header(); - echo '

    Sorry, there has been an error.

    '; + echo '

    '.__('Sorry, there has been an error.').'

    '; echo '

    ' . $file['error'] . '

    '; $this->footer(); return; @@ -248,7 +248,7 @@ } } } if ( $num_comments ) - printf(__(' (%s comments)'), $num_comments); + printf(' '.__('(%s comments)'), $num_comments); // Now for post meta preg_match_all('|(.*?)|is', $post, $postmeta); @@ -266,7 +266,7 @@ wp_import_cleanup($this->id); - echo '

    '.sprintf(__('All done. Have fun!'), get_option('home')).'

    '; + echo '

    '.sprintf(__('All done.').' '.__('Have fun!').'', get_option('home')).'

    '; } function import() { Index: wp-admin/edit.php =================================================================== --- wp-admin/edit.php (revision 4163) +++ wp-admin/edit.php (working copy) @@ -115,7 +115,7 @@
    - +