<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<title>[12100] trunk/wp-admin: Fix some login typos.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/12100">12100</a></dd>
<dt>Author</dt> <dd>westi</dd>
<dt>Date</dt> <dd>2009-10-25 09:28:20 +0000 (Sun, 25 Oct 2009)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fix some login typos. Fixes <a href="http://trac.wordpress.org/ticket/11031">#11031</a> props filosofo.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminimportdotclearphp">trunk/wp-admin/import/dotclear.php</a></li>
<li><a href="#trunkwpadminimportgreymatterphp">trunk/wp-admin/import/greymatter.php</a></li>
<li><a href="#trunkwpadminimportlivejournalphp">trunk/wp-admin/import/livejournal.php</a></li>
<li><a href="#trunkwpadminimporttextpatternphp">trunk/wp-admin/import/textpattern.php</a></li>
<li><a href="#trunkwpadminincludesexportphp">trunk/wp-admin/includes/export.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminimportdotclearphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/import/dotclear.php (12099 => 12100)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/import/dotclear.php 2009-10-24 15:58:41 UTC (rev 12099)
+++ trunk/wp-admin/import/dotclear.php 2009-10-25 09:28:20 UTC (rev 12100)
</span><span class="lines">@@ -604,7 +604,7 @@
</span><span class="cx"> {
</span><span class="cx"> echo '<p>'.__('Welcome to WordPress. We hope (and expect!) that you will find this platform incredibly rewarding! As a new WordPress user coming from DotClear, there are some things that we would like to point out. Hopefully, they will help your transition go as smoothly as possible.').'</p>';
</span><span class="cx"> echo '<h3>'.__('Users').'</h3>';
</span><del>- echo '<p>'.sprintf(__('You have already setup WordPress and have been assigned an administrative login and password. Forget it. You didn&#8217;t have that login in DotClear, why should you have it here? Instead we have taken care to import all of your users into our system. Unfortunately there is one downside. Because both WordPress and DotClear uses a strong encryption hash with passwords, it is impossible to decrypt it and we are forced to assign temporary passwords to all your users. <strong>Every user has the same username, but their passwords are reset to password123.</strong> So <a href="%1$s">Login</a> and change it.'), '/wp-login.php').'</p>';
</del><ins>+ echo '<p>'.sprintf(__('You have already setup WordPress and have been assigned an administrative login and password. Forget it. You didn&#8217;t have that login in DotClear, why should you have it here? Instead we have taken care to import all of your users into our system. Unfortunately there is one downside. Because both WordPress and DotClear uses a strong encryption hash with passwords, it is impossible to decrypt it and we are forced to assign temporary passwords to all your users. <strong>Every user has the same username, but their passwords are reset to password123.</strong> So <a href="%1$s">Log in</a> and change it.'), '/wp-login.php').'</p>';
</ins><span class="cx"> echo '<h3>'.__('Preserving Authors').'</h3>';
</span><span class="cx"> echo '<p>'.__('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.').'</p>';
</span><span class="cx"> echo '<h3>'.__('Textile').'</h3>';
</span><span class="lines">@@ -616,7 +616,7 @@
</span><span class="cx"> echo '<li>'.__('<a href="http://wordpress.org/support/">The WordPress support forums</a>').'</li>';
</span><span class="cx"> echo '<li>'.__('<a href="http://codex.wordpress.org">The Codex (In other words, the WordPress Bible)</a>').'</li>';
</span><span class="cx"> echo '</ul>';
</span><del>- echo '<p>'.sprintf(__('That&#8217;s it! What are you waiting for? Go <a href="%1$s">login</a>!'), '../wp-login.php').'</p>';
</del><ins>+ echo '<p>'.sprintf(__('That&#8217;s it! What are you waiting for? Go <a href="%1$s">log in</a>!'), '../wp-login.php').'</p>';
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function db_form()
</span></span></pre></div>
<a id="trunkwpadminimportgreymatterphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/import/greymatter.php (12099 => 12100)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/import/greymatter.php 2009-10-24 15:58:41 UTC (rev 12099)
+++ trunk/wp-admin/import/greymatter.php 2009-10-25 09:28:20 UTC (rev 12100)
</span><span class="lines">@@ -63,7 +63,7 @@
</span><span class="cx"> <tr>
</span><span class="cx"> <td><label for="lastentry"><?php _e('Last entry&#8217;s number:') ?></label></td>
</span><span class="cx"> <td><input type="text" name="lastentry" id="lastentry" value="00000001" /><br />
</span><del>- <?php _e('This importer will search for files 00000001.cgi to 000-whatever.cgi,<br />so you need to enter the number of the last GM post here.<br />(if you don&#8217;t know that number, just log into your FTP and look it out<br />in the entries&#8217; folder)') ?></td>
</del><ins>+ <?php _e('This importer will search for files 00000001.cgi to 000-whatever.cgi,<br />so you need to enter the number of the last GM post here.<br />(if you don&#8217;t know that number, just log in to your FTP and look it out<br />in the entries&#8217; folder)') ?></td>
</ins><span class="cx"> </tr>
</span><span class="cx"> </table>
</span><span class="cx"> <p class="submit"><input type="submit" name="submit" class="button" value="<?php esc_attr_e('Start Importing') ?>" /></p>
</span></span></pre></div>
<a id="trunkwpadminimportlivejournalphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/import/livejournal.php (12099 => 12100)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/import/livejournal.php 2009-10-24 15:58:41 UTC (rev 12099)
+++ trunk/wp-admin/import/livejournal.php 2009-10-25 09:28:20 UTC (rev 12100)
</span><span class="lines">@@ -724,7 +724,7 @@
</span><span class="cx"> $this->protected_password = get_option( 'ljapi_protected_password' );
</span><span class="cx"> }
</span><span class="cx">
</span><del>- // Login to confirm the details are correct
</del><ins>+ // Log in to confirm the details are correct
</ins><span class="cx"> if ( empty( $this->username ) || empty( $this->password ) ) {
</span><span class="cx"> ?>
</span><span class="cx"> <p><?php _e( 'Please enter your LiveJournal username <em>and</em> password so we can download your posts and comments.' ) ?></p>
</span></span></pre></div>
<a id="trunkwpadminimporttextpatternphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/import/textpattern.php (12099 => 12100)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/import/textpattern.php 2009-10-24 15:58:41 UTC (rev 12099)
+++ trunk/wp-admin/import/textpattern.php 2009-10-25 09:28:20 UTC (rev 12100)
</span><span class="lines">@@ -582,7 +582,7 @@
</span><span class="cx"> {
</span><span class="cx"> echo '<p>'.__('Welcome to WordPress. We hope (and expect!) that you will find this platform incredibly rewarding! As a new WordPress user coming from Textpattern, there are some things that we would like to point out. Hopefully, they will help your transition go as smoothly as possible.').'</p>';
</span><span class="cx"> echo '<h3>'.__('Users').'</h3>';
</span><del>- echo '<p>'.sprintf(__('You have already setup WordPress and have been assigned an administrative login and password. Forget it. You didn&#8217;t have that login in Textpattern, why should you have it here? Instead we have taken care to import all of your users into our system. Unfortunately there is one downside. Because both WordPress and Textpattern uses a strong encryption hash with passwords, it is impossible to decrypt it and we are forced to assign temporary passwords to all your users. <strong>Every user has the same username, but their passwords are reset to password123.</strong> So <a href="%1$s">Login</a> and change it.'), get_bloginfo( 'wpurl' ) . '/wp-login.php').'</p>';
</del><ins>+ echo '<p>'.sprintf(__('You have already setup WordPress and have been assigned an administrative login and password. Forget it. You didn&#8217;t have that login in Textpattern, why should you have it here? Instead we have taken care to import all of your users into our system. Unfortunately there is one downside. Because both WordPress and Textpattern uses a strong encryption hash with passwords, it is impossible to decrypt it and we are forced to assign temporary passwords to all your users. <strong>Every user has the same username, but their passwords are reset to password123.</strong> So <a href="%1$s">log in</a> and change it.'), get_bloginfo( 'wpurl' ) . '/wp-login.php').'</p>';
</ins><span class="cx"> echo '<h3>'.__('Preserving Authors').'</h3>';
</span><span class="cx"> echo '<p>'.__('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.').'</p>';
</span><span class="cx"> echo '<h3>'.__('Textile').'</h3>';
</span><span class="lines">@@ -594,7 +594,7 @@
</span><span class="cx"> echo '<li>'.__('<a href="http://wordpress.org/support/">The WordPress support forums</a>').'</li>';
</span><span class="cx"> echo '<li>'.__('<a href="http://codex.wordpress.org">The Codex (In other words, the WordPress Bible)</a>').'</li>';
</span><span class="cx"> echo '</ul>';
</span><del>- echo '<p>'.sprintf(__('That&#8217;s it! What are you waiting for? Go <a href="%1$s">login</a>!'), get_bloginfo( 'wpurl' ) . '/wp-login.php').'</p>';
</del><ins>+ echo '<p>'.sprintf(__('That&#8217;s it! What are you waiting for? Go <a href="%1$s">log in</a>!'), get_bloginfo( 'wpurl' ) . '/wp-login.php').'</p>';
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function db_form()
</span></span></pre></div>
<a id="trunkwpadminincludesexportphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/export.php (12099 => 12100)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/export.php 2009-10-24 15:58:41 UTC (rev 12099)
+++ trunk/wp-admin/includes/export.php 2009-10-25 09:28:20 UTC (rev 12100)
</span><span class="lines">@@ -221,7 +221,7 @@
</span><span class="cx"> <!-- This file is not intended to serve as a complete backup of your blog. -->
</span><span class="cx">
</span><span class="cx"> <!-- To import this information into a WordPress blog follow these steps. -->
</span><del>-<!-- 1. Log into that blog as an administrator. -->
</del><ins>+<!-- 1. Log in to that blog as an administrator. -->
</ins><span class="cx"> <!-- 2. Go to Tools: Import in the blog's admin panels (or Manage: Import in older versions of WordPress). -->
</span><span class="cx"> <!-- 3. Choose "WordPress" from the list. -->
</span><span class="cx"> <!-- 4. Upload this file using the form provided on that page. -->
</span></span></pre>
</div>
</div>
</body>
</html>