Ticket #4059: Kubrick-l10n-part2.diff

attachment.php

@@ -13 +13 @@
 <?php $_post = &get_post($post->ID); $classname = ($_post->iconsize[0] <= 128 ? 'small' : '') . 'attachment'; // This lets us style narrow icons specially ?>
 
                 <div class="post" id="post-<?php the_ID(); ?>">
-                        <h2><a href="<?php echo get_permalink($post->post_parent); ?>" rev="attachment"><?php echo get_the_title($post->post_parent); ?></a> &raquo; <a href="<?php echo get_permalink() ?>" rel="bookmark" title="Permanent Link: <?php the_title(); ?>"><?php the_title(); ?></a></h2>
+                        <h2><a href="<?php echo get_permalink($post->post_parent); ?>" rev="attachment"><?php echo get_the_title($post->post_parent); ?></a> &raquo; <a href="<?php echo get_permalink() ?>" rel="bookmark" title="<?php printf(__('Permanent Link: %s', 'kubrick'), the_title('', '', false)); ?>"><?php the_title(); ?></a></h2>
 
                         <div class="entry">
                                 <p class="<?php echo $classname; ?>"><?php echo $attachment_link; ?><br /><?php echo basename($post->guid); ?></p>
@@ -25 +25 @@
                                 <p class="postmetadata alt">
                                         <small>
                                                 <?php printf(__('This entry was posted on %s at %s and is filed under %s.', 'kubrick'), get_the_time(__('l, F jS, Y', 'kubrick')), get_the_time(), get_the_category_list(', '));?>
-                                                <?php printf(__('You can follow any responses to this entry through the %s feed.', 'kubrick'), '<a href="' . comments_rss('') . '">' . __('RSS 2.0', 'kubrick') . '</a>'); ?>
+                                                <?php printf(__('You can follow any responses to this entry through the <a href="%s">RSS 2.0</a> feed.', 'kubrick'), comments_rss('')); ?>
 
                                                 <?php if (('open' == $post-> comment_status) && ('open' == $post->ping_status)) {
                                                         // Both Comments and Pings are open

comments.php

@@ -27 +27 @@
         <?php foreach ($comments as $comment) : ?>
 
                 <li <?php echo $oddcomment; ?>id="comment-<?php comment_ID() ?>">
-                        <cite><?php comment_author_link() ?></cite> <?php _e('Says:', 'kubrick'); ?>
+                        <?php printf(__('<cite>%s</cite> Says:', 'kubrick'), comment_author_link()); ?>
                         <?php if ($comment->comment_approved == '0') : ?>
                         <em><?php _e('Your comment is awaiting moderation.', 'kubrick'); ?></em>
                         <?php endif; ?>

functions.php

@@ -137 +137 @@
                 }
                 add_action('admin_head', 'kubrick_theme_page_head');
         }
-        add_theme_page('Customize Header', 'Header Image and Color', 'edit_themes', basename(__FILE__), 'kubrick_theme_page');
+        add_theme_page(__('Customize Header', 'kubrick'), __('Header Image and Color', 'kubrick'), 'edit_themes', basename(__FILE__), 'kubrick_theme_page');
 }
 
 function kubrick_theme_page_head() {
@@ -347 +347 @@
 }
 
 function kubrick_theme_page() {
-        if ( $_REQUEST['saved'] ) echo '<div id="message" class="updated fade"><p><strong>Options saved.</strong></p></div>';
+        if ( $_REQUEST['saved'] ) echo '<div id="message" class="updated fade"><p><strong>' . __('Options saved.', 'kubrick') . '</strong></p></div>';
 ?>
 <div class='wrap'>
         <div id="kubrick-header">
-                <h2>Header Image and Color</h2>
+                <h2><?php _e('Header Image and Color', 'kubrick') ?></h2>
                 <div id="headwrap">
                         <div id="header">
                                 <div id="headerimg">
@@ -364 +364 @@
                 <div id="nonJsForm">
                         <form method="post" action="">
                                 <div class="zerosize"><input type="submit" name="defaultsubmit" value="Save" /></div>
-                                <label for="njfontcolor">Font Color:</label><input type="text" name="njfontcolor" id="njfontcolor" value="<?php echo kubrick_header_color(); ?>" /> Any CSS color (<code>red</code> or <code>#FF0000</code> or <code>rgb(255, 0, 0)</code>)<br />
-                                <label for="njuppercolor">Upper Color:</label><input type="text" name="njuppercolor" id="njuppercolor" value="#<?php echo kubrick_upper_color(); ?>" /> HEX only (<code>#FF0000</code> or <code>#F00</code>)<br />
-                                <label for="njlowercolor">Lower Color:</label><input type="text" name="njlowercolor" id="njlowercolor" value="#<?php echo kubrick_lower_color(); ?>" /> HEX only (<code>#FF0000</code> or <code>#F00</code>)<br />
+                                <label for="njfontcolor"><?php _e('Font Color:', 'kubrick') ?></label><input type="text" name="njfontcolor" id="njfontcolor" value="<?php echo kubrick_header_color(); ?>" /> <?php printf(__('Any CSS color (%s, %s or %s)', 'kubrick'), '<code>red</code>', '<code>#FF0000</code>', '<code>rgb(255, 0, 0)</code>') ?><br />
+                                <label for="njuppercolor"><?php _e('Upper Color:', 'kubrick') ?></label><input type="text" name="njuppercolor" id="njuppercolor" value="#<?php echo kubrick_upper_color(); ?>" /> <?php printf (__('HEX only (%s or %s)', 'kubrick'), '<code>#FF0000</code>', '<code>#F00</code>') ?><br />
+                                <label for="njlowercolor"><?php _e('Lower Color:', 'kubrick') ?></label><input type="text" name="njlowercolor" id="njlowercolor" value="#<?php echo kubrick_lower_color(); ?>" /> <?php printf (__('HEX only (%s or %s)', 'kubrick'), '<code>#FF0000</code>', '<code>#F00</code>') ?><br />
                                 <input type="hidden" name="hi" id="hi" value="<?php echo kubrick_header_image(); ?>" />
-                                <input type="submit" name="toggledisplay" id="toggledisplay" value="Toggle Text" />
-                                <input type="submit" name="defaults" value="Use Defaults" />
-                                <input type="submit" class="defbutton" name="submitform" value="&nbsp;&nbsp;Save&nbsp;&nbsp;" />
+                                <input type="submit" name="toggledisplay" id="toggledisplay" value="<?php _e('Toggle Text', 'kubrick') ?>" />
+                                <input type="submit" name="defaults" value="<?php _e('Use Defaults', 'kubrick') ?>" />
+                                <input type="submit" class="defbutton" name="submitform" value="&nbsp;&nbsp;<?php _e('Save', 'kubrick') ?>&nbsp;&nbsp;" />
                                 <input type="hidden" name="action" value="save" />
                                 <input type="hidden" name="njform" value="true" />
                         </form>
                 </div>
                 <div id="jsForm">
                         <form style="display:inline;" method="post" name="hicolor" id="hicolor" action="<?php echo $_SERVER['REQUEST_URI']; ?>">
-                                <input type="button" onclick="tgt=document.getElementById('fontcolor');colorSelect(tgt,'pick1');return false;" name="pick1" id="pick1" value="Font Color"></input>
-                                <input type="button" onclick="tgt=document.getElementById('uppercolor');colorSelect(tgt,'pick2');return false;" name="pick2" id="pick2" value="Upper Color"></input>
-                                <input type="button" onclick="tgt=document.getElementById('lowercolor');colorSelect(tgt,'pick3');return false;" name="pick3" id="pick3" value="Lower Color"></input>
-                                <input type="button" name="revert" value="Revert" onclick="kRevert()" />
-                                <input type="button" value="Advanced" onclick="toggleAdvanced()" />
+                                <input type="button" onclick="tgt=document.getElementById('fontcolor');colorSelect(tgt,'pick1');return false;" name="pick1" id="pick1" value="<?php _e('Font Color', 'kubrick') ?>"></input>
+                                <input type="button" onclick="tgt=document.getElementById('uppercolor');colorSelect(tgt,'pick2');return false;" name="pick2" id="pick2" value="<?php _e('Upper Color', 'kubrick') ?>"></input>
+                                <input type="button" onclick="tgt=document.getElementById('lowercolor');colorSelect(tgt,'pick3');return false;" name="pick3" id="pick3" value="<?php _e('Lower Color', 'kubrick') ?>"></input>
+                                <input type="button" name="revert" value="<?php _e('Revert', 'kubrick') ?>" onclick="kRevert()" />
+                                <input type="button" value="<?php _e('Advanced', 'kubrick') ?>" onclick="toggleAdvanced()" />
                                 <input type="hidden" name="action" value="save" />
                                 <input type="hidden" name="fontdisplay" id="fontdisplay" value="<?php echo kubrick_header_display(); ?>" />
                                 <input type="hidden" name="fontcolor" id="fontcolor" value="<?php echo kubrick_header_color(); ?>" />
                                 <input type="hidden" name="uppercolor" id="uppercolor" value="<?php echo kubrick_upper_color(); ?>" />
                                 <input type="hidden" name="lowercolor" id="lowercolor" value="<?php echo kubrick_lower_color(); ?>" />
                                 <input type="hidden" name="headerimage" id="headerimage" value="<?php echo kubrick_header_image(); ?>" />
-                                <p class="submit"><input type="submit" name="submitform" class="defbutton" value="<?php _e('Update Header &raquo;'); ?>" onclick="cp.hidePopup('prettyplease')" /></p>
+                                <p class="submit"><input type="submit" name="submitform" class="defbutton" value="<?php _e('Update Header &raquo;', 'kubrick'); ?>" onclick="cp.hidePopup('prettyplease')" /></p>
                         </form>
                         <div id="colorPickerDiv" style="z-index: 100;background:#eee;border:1px solid #ccc;position:absolute;visibility:hidden;"> </div>
                         <div id="advanced">
                                 <form id="jsAdvanced" style="display:none;" action="">
-                                        <label for="advfontcolor">Font Color (CSS): </label><input type="text" id="advfontcolor" onchange="advUpdate(this.value, 'fontcolor')" value="<?php echo kubrick_header_color(); ?>" /><br />
-                                        <label for="advuppercolor">Upper Color (HEX): </label><input type="text" id="advuppercolor" onchange="advUpdate(this.value, 'uppercolor')" value="#<?php echo kubrick_upper_color(); ?>" /><br />
-                                        <label for="advlowercolor">Lower Color (HEX): </label><input type="text" id="advlowercolor" onchange="advUpdate(this.value, 'lowercolor')" value="#<?php echo kubrick_lower_color(); ?>" /><br />
-                                        <input type="button" name="default" value="Select Default Colors" onclick="kDefaults()" /><br />
-                                        <input type="button" onclick="toggleDisplay();return false;" name="pick" id="pick" value="Toggle Text Display"></input><br />
+                                        <label for="advfontcolor"><?php _e('Font Color (CSS):', 'kubrick') ?></label><input type="text" id="advfontcolor" onchange="advUpdate(this.value, 'fontcolor')" value="<?php echo kubrick_header_color(); ?>" /><br />
+                                        <label for="advuppercolor"><?php _e('Upper Color (HEX):', 'kubrick') ?></label><input type="text" id="advuppercolor" onchange="advUpdate(this.value, 'uppercolor')" value="#<?php echo kubrick_upper_color(); ?>" /><br />
+                                        <label for="advlowercolor"><?php _e('Lower Color (HEX):', 'kubrick') ?></label><input type="text" id="advlowercolor" onchange="advUpdate(this.value, 'lowercolor')" value="#<?php echo kubrick_lower_color(); ?>" /><br />
+                                        <input type="button" name="default" value="<?php _e('Select Default Colors', 'kubrick') ?>" onclick="kDefaults()" /><br />
+                                        <input type="button" onclick="toggleDisplay();return false;" name="pick" id="pick" value="<?php _e('Toggle Text Display', 'kubrick') ?>"></input><br />
                                 </form>
                         </div>
                 </div>

page.php

@@ -6 +6 @@
                 <div class="post" id="post-<?php the_ID(); ?>">
                 <h2><?php the_title(); ?></h2>
                         <div class="entry">
-                                <?php the_content('<p class="serif">' . __('Read the rest of this page', 'kubrick') . ' &raquo;</p>'); ?>
+                                <?php the_content('<p class="serif">' . __('Read the rest of this page &raquo;', 'kubrick') . '</p>'); ?>
 
-                                <?php wp_link_pages(array('before' => '<p><strong>' . __('Pages', 'kubrick') . ':</strong> ', 'after' => '</p>', 'next_or_number' => 'number')); ?>
+                                <?php wp_link_pages(array('before' => '<p><strong>' . __('Pages:', 'kubrick') . '</strong> ', 'after' => '</p>', 'next_or_number' => 'number')); ?>
 
                         </div>
                 </div>
@@ -19 +19 @@
 
 <?php get_sidebar(); ?>
 
-<?php get_footer(); ?>
- 檔案末沒有 newline 字元
+<?php get_footer(); ?>

sidebar.php

@@ -21 +21 @@
                         <p><?php printf(__('You are currently browsing the archives for the &#39;%s&#39; category.', 'kubrick'), single_cat_title('', false)); ?></p>
 
                         <?php /* If this is a yearly archive */ } elseif (is_day()) { ?>
-                        <p><?php printf(__('You are currently browsing the <a href="%s">%s</a> weblog archives
-                        for the day %s.', 'kubrick'), get_bloginfo('url'), get_bloginfo('name'), get_the_time(__('l, F jS, Y', 'kubrick'))); ?></p>
+                        <p><?php printf(__('You are currently browsing the <a href="%s">%s</a> weblog archives for the day %s.', 'kubrick'), get_bloginfo('url'), get_bloginfo('name'), get_the_time(__('l, F jS, Y', 'kubrick'))); ?></p>
 
                         <?php /* If this is a monthly archive */ } elseif (is_month()) { ?>
-                        <p><?php printf(__('You are currently browsing the <a href="%s">%s</a> weblog archives
-                        for the month %s.', 'kubrick'), get_bloginfo('url'), get_bloginfo('name'), get_the_time(__('F, Y', 'kubrick'))); ?></p>
+                        <p><?php printf(__('You are currently browsing the <a href="%s">%s</a> weblog archives for the month %s.', 'kubrick'), get_bloginfo('url'), get_bloginfo('name'), get_the_time(__('F, Y', 'kubrick'))); ?></p>
 
                         <?php /* If this is a yearly archive */ } elseif (is_year()) { ?>
-                        <p><?php printf(__('You are currently browsing the <a href="%s">%s</a> weblog archives
-                        for the year %s.', 'kubrick'), get_bloginfo('url'), get_bloginfo('name'), get_the_time(__('Y', 'kubrick'))); ?></p>
+                        <p><?php printf(__('You are currently browsing the <a href="%s">%s</a> weblog archives for the year %s.', 'kubrick'), get_bloginfo('url'), get_bloginfo('name'), get_the_time(__('Y', 'kubrick'))); ?></p>
 
                         <?php /* If this is a monthly archive */ } elseif (is_search()) { ?>
-                        <p><?php printf(__('You have searched the <a href="%s">%s</a> weblog archives
-                        for <strong>&#39;%s&#39;</strong>. If you are unable to find anything in these search results, you can try one of these links.', 'kubrick'), get_bloginfo('url'), get_bloginfo('name'), the_search_query()); ?></p>
+                        <p><?php printf(__('You have searched the <a href="%s">%s</a> weblog archives for <strong>&#39;%s&#39;</strong>. If you are unable to find anything in these search results, you can try one of these links.', 'kubrick'), get_bloginfo('url'), get_bloginfo('name'), the_search_query()); ?></p>
 
                         <?php /* If this is a monthly archive */ } elseif (isset($_GET['paged']) && !empty($_GET['paged'])) { ?>
                         <p><?php printf(__('You are currently browsing the <a href="%s">%s</a> weblog archives.', 'kubrick'), get_bloginfo('url'), get_bloginfo('name')); ?></p>