<!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" />
<title>[25658] trunk/src/wp-admin/includes: More string cleanups.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { 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 #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#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>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://core.trac.wordpress.org/changeset/25658">25658</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2013-10-02 18:50:45 +0000 (Wed, 02 Oct 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>More string cleanups.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadminincludesclasswpupgraderphp">trunk/src/wp-admin/includes/class-wp-upgrader.php</a></li>
<li><a href="#trunksrcwpadminincludesupdatecorephp">trunk/src/wp-admin/includes/update-core.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpadminincludesclasswpupgraderphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/includes/class-wp-upgrader.php (25657 => 25658)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/includes/class-wp-upgrader.php 2013-10-02 17:48:55 UTC (rev 25657)
+++ trunk/src/wp-admin/includes/class-wp-upgrader.php 2013-10-02 18:50:45 UTC (rev 25658)
</span><span class="lines">@@ -1089,13 +1089,13 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function upgrade_strings() {
</span><del>- $this->strings['starting_upgrade'] = __( 'Some of your language files need updating. Sit tight for a few more seconds while we update them as well.' );
- $this->strings['up_to_date'] = __( 'The language is up to date.' ); // We need to silently skip this case
</del><ins>+ $this->strings['starting_upgrade'] = __( 'Some of your translations need updating. Sit tight for a few more seconds while we update them as well.' );
+ $this->strings['up_to_date'] = __( 'The translation is up to date.' ); // We need to silently skip this case
</ins><span class="cx"> $this->strings['no_package'] = __( 'Update package not available.' );
</span><del>- $this->strings['downloading_package'] = __( 'Downloading language update from <span class="code">%s</span>…' );
</del><ins>+ $this->strings['downloading_package'] = __( 'Downloading translation from <span class="code">%s</span>…' );
</ins><span class="cx"> $this->strings['unpack_package'] = __( 'Unpacking the update…' );
</span><del>- $this->strings['process_failed'] = __( 'Language update failed.' );
- $this->strings['process_success'] = __( 'Language updated successfully.' );
</del><ins>+ $this->strings['process_failed'] = __( 'Translation update failed.' );
+ $this->strings['process_success'] = __( 'Translation updated successfully.' );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function upgrade( $update = false ) {
</span><span class="lines">@@ -1597,23 +1597,23 @@
</span><span class="cx"> case 'theme':
</span><span class="cx"> $theme = wp_get_theme( $item );
</span><span class="cx"> $item_name = $theme->Get( 'Name' );
</span><del>- $skin->feedback( __( 'Updating Theme: %s' ), $item_name );
</del><ins>+ $skin->feedback( __( 'Updating theme: %s' ), $item_name );
</ins><span class="cx"> break;
</span><span class="cx"> case 'plugin':
</span><span class="cx"> $plugin_data = get_plugin_data( $context . '/' . $item );
</span><span class="cx"> $item_name = $plugin_data['Name'];
</span><del>- $skin->feedback( __( 'Updating Plugin: %s' ), $item_name );
</del><ins>+ $skin->feedback( __( 'Updating plugin: %s' ), $item_name );
</ins><span class="cx"> break;
</span><span class="cx"> case 'language':
</span><span class="cx"> if ( 'theme' == $item->type ) {
</span><span class="cx"> $theme = wp_get_theme( $item->slug );
</span><span class="cx"> $skin->feedback( sprintf(
</span><del>- __( 'Updating the %1$s language files for the %2$s Theme' ),
</del><ins>+ __( 'Updating the %1$s translation for the %2$s theme' ),
</ins><span class="cx"> $item->language,
</span><span class="cx"> $theme->Get( 'Name' )
</span><span class="cx"> ) );
</span><span class="cx"> $item_name = sprintf(
</span><del>- __( '%1$s translation for the %2$s Theme' ),
</del><ins>+ __( '%1$s translation for the %2$s theme' ),
</ins><span class="cx"> $item->language,
</span><span class="cx"> $theme->Get( 'Name' )
</span><span class="cx"> );
</span><span class="lines">@@ -1621,12 +1621,12 @@
</span><span class="cx"> $plugin_data = get_plugins( '/' . $item->slug );
</span><span class="cx"> $plugin_data = array_shift( $plugin_data );
</span><span class="cx"> $skin->feedback( sprintf(
</span><del>- __( 'Updating the %1$s language files for the %2$s Plugin' ),
</del><ins>+ __( 'Updating the %1$s translation for the %2$s plugin' ),
</ins><span class="cx"> $item->language,
</span><span class="cx"> $plugin_data['Name']
</span><span class="cx"> ) );
</span><span class="cx"> $item_name = sprintf(
</span><del>- __( '%1$s translation for the %2$s Plugin' ),
</del><ins>+ __( '%1$s translation for the %2$s plugin' ),
</ins><span class="cx"> $item->language,
</span><span class="cx"> $plugin_data['Name']
</span><span class="cx"> );
</span></span></pre></div>
<a id="trunksrcwpadminincludesupdatecorephp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/includes/update-core.php (25657 => 25658)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/includes/update-core.php 2013-10-02 17:48:55 UTC (rev 25657)
+++ trunk/src/wp-admin/includes/update-core.php 2013-10-02 18:50:45 UTC (rev 25658)
</span><span class="lines">@@ -742,7 +742,7 @@
</span><span class="cx">
</span><span class="cx"> // If we don't have enough free space, it isn't worth trying again
</span><span class="cx"> if ( $total_size >= disk_free_space( ABSPATH ) )
</span><del>- $result = new WP_Error( 'disk_full', __( "There isn't enough free disk space to complete the upgrade." ), $to );
</del><ins>+ $result = new WP_Error( 'disk_full', __( 'There is not enough free disk space to complete the update.' ), $to );
</ins><span class="cx"> else
</span><span class="cx"> $result = _copy_dir( $from . $distro, $to, $skip );
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>