Ticket #32277: 32277.diff
File 32277.diff, 5.3 KB (added by , 10 years ago) |
---|
-
wp-admin/about.php
37 37 <?php _e( 'Credits' ); ?> 38 38 </a><a href="freedoms.php" class="nav-tab"> 39 39 <?php _e( 'Freedoms' ); ?> 40 </a><a href="contribute.php" class="nav-tab"> 41 <?php _e( 'Contribute' ); ?> 40 42 </a> 41 43 </h2> 42 44 45 <<<<<<< .mine 46 <div class="changelog headline-feature"> 47 <h2><?php _e( 'Introducing Twenty Fifteen' ); ?></h2> 48 <div class="featured-image"> 49 <img src="//s.w.org/images/core/4.1/theme.png?0" /> 50 </div> 51 ======= 43 52 <div class="headline-feature feature-video"> 44 53 <embed type="application/x-shockwave-flash" src="https://v0.wordpress.com/player.swf?v=1.04" width="1000" height="560" wmode="direct" seamlesstabbing="true" allowfullscreen="true" allowscriptaccess="always" overstretch="true" flashvars="guid=e9kH4FzP&isDynamicSeeking=true"></embed> 45 54 </div> 55 >>>>>>> .r32419 46 56 57 <<<<<<< .mine 58 <div class="feature-section"> 59 <div class="col"> 60 <h3><?php _e( 'Our newest default theme, Twenty Fifteen, is a blog-focused theme designed for clarity.' ); ?></h3> 61 <p><?php printf( __( 'Twenty Fifteen has flawless language support, with help from <a href="%s">Google’s Noto font family</a>.' ), 'https://www.google.com/get/noto/' ); ?></p> 62 <p><?php _e( 'The straightforward typography is readable on any screen size.' ); ?></p> 63 <p><?php _e( 'Your content always takes center stage, whether viewed on a phone, tablet, laptop, or desktop computer.' ); ?></p> 64 </div> 65 <div class="col"> 66 <img class="" src="//s.w.org/images/core/4.1/mobile.png?0" /> 67 </div> 68 ======= 47 69 <hr /> 48 70 49 71 <div class="feature-section two-col"> … … 55 77 <p class="pressthis-bookmarklet-demo"> 56 78 <a class="pressthis-bookmarklet" onclick="return false;" href="<?php echo htmlspecialchars( get_shortcut_link() ); ?>"><span><?php _e( 'Press This' ); ?></span></a> 57 79 </p> 80 >>>>>>> .r32419 58 81 </div> 59 82 60 83 <div class="col"> … … 62 85 </div> 63 86 </div> 64 87 88 <<<<<<< .mine 89 <hr /> 90 91 <div class="changelog headline-feature dfw"> 92 <h2><?php _e( 'Distraction-free writing' ); ?></h2> 93 <div class="feature-section"> 94 <div class="dfw-container"> 95 <img src="//s.w.org/images/core/4.1/focus.png?0" class="base-image" /> 96 <img src="//s.w.org/images/core/4.1/focus1.png?0" class="overlay-image fade-in" /> 97 <img src="//s.w.org/images/core/4.1/focus2.png?0" class="overlay-image fade-in" /> 98 <img src="//s.w.org/images/core/4.1/focus3.png?0" class="overlay-image from-left" /> 99 </div> 100 <h3><em><?php _e( 'Just write.' ); ?></em></h3> 101 <p><?php _e( 'Sometimes, you just need to concentrate on putting your thoughts into words. Try turning on <strong>distraction-free writing mode</strong>. When you start typing, all the distractions will fade away, letting you focus solely on your writing. All your editing tools instantly return when you need them.' ); ?></p> 102 ======= 65 103 <div class="feature-section two-col"> 66 104 <div class="col"> 67 105 <img src="//s.w.org/images/core/4.2/unicode.png" /> … … 73 111 /* translators: 1: heart emoji, 2: frog face emoji, 3, monkey emoji, 4: pizza emoji, 5: Emoji Codex link */ 74 112 printf( __( 'Don’t use any of those characters? You can still have fun — emoji are now available in WordPress! Get creative and decorate your content with %1$s, %2$s, %3$s, %4$s, and all the many other <a href="%5$s">emoji</a>.' ), '💙', '🐸', '🐒', '🍕', __( 'https://codex.wordpress.org/Emoji' ) ); 75 113 ?></p> 114 >>>>>>> .r32419 76 115 </div> 77 116 </div> 78 117 -
wp-admin/credits.php
93 93 <?php _e( 'Credits' ); ?> 94 94 </a><a href="freedoms.php" class="nav-tab"> 95 95 <?php _e( 'Freedoms' ); ?> 96 </a><a href="contribute.php" class="nav-tab"> 97 <?php _e( 'Contribute' ); ?> 96 98 </a> 97 99 </h2> 98 100 -
wp-admin/freedoms.php
30 30 <?php _e( 'Credits' ); ?> 31 31 </a><a href="freedoms.php" class="nav-tab nav-tab-active"> 32 32 <?php _e( 'Freedoms' ); ?> 33 </a><a href="contribute.php" class="nav-tab"> 34 <?php _e( 'Contribute' ); ?> 33 35 </a> 34 36 </h2> 35 37 -
wp-includes/comment-template.php
1423 1423 ); 1424 1424 1425 1425 $link = sprintf( "<a class='comment-reply-link' href='%s' onclick='%s' aria-label='%s'>%s</a>", 1426 esc_url( add_query_arg( 'replytocom', $comment->comment_ID ) ) . "#" . $args['respond_id'],1426 esc_url( add_query_arg( 'replytocom', $comment->comment_ID, get_permalink( $post->ID ) ) ) . "#" . $args['respond_id'], 1427 1427 $onclick, 1428 1428 esc_attr( sprintf( $args['reply_to_text'], $comment->comment_author ) ), 1429 1429 $args['reply_text'] -
wp-includes/user.php
85 85 $user = new WP_Error('', ''); 86 86 } 87 87 88 status_header( 403 ); 88 89 return $user; 89 90 } 90 91