WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Complete Twenty Ten 1.1 merge. 

git-svn-id: http://svn.automattic.com/wordpress/branches/3.0@16630 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
nacin 2010-11-30 20:38:12 +00:00
parent c051fdc952
commit 40e98405c1
4 changed files with 70 additions and 288 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

139
wp-content/themes/twentyten/languages/twentyten.pot
View File

@ -1,4 +1,4 @@
# Translation of the WordPress theme Twenty Ten 1.2-RC1 by the WordPress team.
# Translation of the WordPress theme Twenty Ten 1.1 by the WordPress team.
# Copyright (C) 2010 the WordPress team
# This file is distributed under the same license as the Twenty Ten package.
# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
@ -6,9 +6,9 @@
#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: Twenty Ten 1.2-RC1\n"
"Project-Id-Version: Twenty Ten 1.1\n"
"Report-Msgid-Bugs-To: http://wordpress.org/tag/twentyten\n"
"POT-Creation-Date: 2010-11-06 00:21+0000\n"
"POT-Creation-Date: 2010-07-14 16:21+0000\n"
"PO-Revision-Date: 2010-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@ -46,12 +46,61 @@ msgstr ""
msgid "Blog Archives"
msgstr ""
#: attachment.php:18
#, php-format
msgid "Return to %s"
msgstr ""
#. translators: %s - title of parent post
#: attachment.php:20
#, php-format
msgid "<span class=\"meta-nav\">&larr;</span> %s"
msgstr ""
#: attachment.php:29
#, php-format
msgid "<span class=\"%1$s\">By</span> %2$s"
msgstr ""
#: attachment.php:33 functions.php:451
#, php-format
msgid "View all posts by %s"
msgstr ""
#: attachment.php:40
#, php-format
msgid "<span class=\"%1$s\">Published</span> %2$s"
msgstr ""
#: attachment.php:50
#, php-format
msgid "Full size is %s pixels"
msgstr ""
#: attachment.php:53
msgid "Link to full-size image"
msgstr ""
#: attachment.php:60 attachment.php:107 loop.php:95 loop.php:118 loop.php:160
#: onecolumn-page.php:27 page.php:32 single.php:53
msgid "Edit"
msgstr ""
#: attachment.php:100 functions.php:241 loop.php:110 loop.php:138
msgid "Continue reading <span class=\"meta-nav\">&rarr;</span>"
msgstr ""
#: attachment.php:101 loop.php:139 onecolumn-page.php:26 page.php:31
#: single.php:31
msgid "Pages:"
msgstr ""
#: author.php:27
#, php-format
msgid "Author Archives: %s"
msgstr ""
#: author.php:37 loop-single.php:43
#: author.php:37 single.php:40
#, php-format
msgid "About %s"
msgstr ""
@ -85,7 +134,7 @@ msgstr ""
msgid "Comments are closed."
msgstr ""
#. #-#-#-#-# twentyten.pot (Twenty Ten 1.2-RC1) #-#-#-#-#
#. #-#-#-#-# twentyten.pot (Twenty Ten 1.1) #-#-#-#-#
#. Theme URI of the plugin/theme
#: footer.php:33
msgid "http://wordpress.org/"
@ -144,10 +193,6 @@ msgstr ""
msgid "Sunset"
msgstr ""
#: functions.php:241 loop-attachment.php:103 loop.php:110 loop.php:138
msgid "Continue reading <span class=\"meta-nav\">&rarr;</span>"
msgstr ""
#: functions.php:308
#, php-format
msgid "%s <span class=\"says\">says:</span>"
@ -226,11 +271,6 @@ msgid ""
"span> %3$s"
msgstr ""
#: functions.php:451 loop-attachment.php:36
#, php-format
msgid "View all posts by %s"
msgstr ""
#: functions.php:468
#, php-format
msgid ""
@ -261,60 +301,6 @@ msgstr ""
msgid "Skip to content"
msgstr ""
#: loop-attachment.php:21
#, php-format
msgid "Return to %s"
msgstr ""
#. translators: %s - title of parent post
#: loop-attachment.php:23
#, php-format
msgid "<span class=\"meta-nav\">&larr;</span> %s"
msgstr ""
#: loop-attachment.php:32
#, php-format
msgid "<span class=\"%1$s\">By</span> %2$s"
msgstr ""
#: loop-attachment.php:43
#, php-format
msgid "<span class=\"%1$s\">Published</span> %2$s"
msgstr ""
#: loop-attachment.php:53
#, php-format
msgid "Full size is %s pixels"
msgstr ""
#: loop-attachment.php:56
msgid "Link to full-size image"
msgstr ""
#: loop-attachment.php:63 loop-attachment.php:110 loop-page.php:30
#: loop-single.php:56 loop.php:95 loop.php:118 loop.php:160
msgid "Edit"
msgstr ""
#: loop-attachment.php:104 loop-page.php:29 loop-single.php:34 loop.php:139
msgid "Pages:"
msgstr ""
#: loop-single.php:21 loop-single.php:61
msgctxt "Previous post link"
msgid "&larr;"
msgstr ""
#: loop-single.php:22 loop-single.php:62
msgctxt "Next post link"
msgid "&rarr;"
msgstr ""
#: loop-single.php:47
#, php-format
msgid "View all posts by %s <span class=\"meta-nav\">&rarr;</span>"
msgstr ""
#: loop.php:25 loop.php:173
msgid "<span class=\"meta-nav\">&larr;</span> Older posts"
msgstr ""
@ -402,6 +388,21 @@ msgstr ""
msgid "Meta"
msgstr ""
#: single.php:18 single.php:58
msgctxt "Previous post link"
msgid "&larr;"
msgstr ""
#: single.php:19 single.php:59
msgctxt "Next post link"
msgid "&rarr;"
msgstr ""
#: single.php:44
#, php-format
msgid "View all posts by %s <span class=\"meta-nav\">&rarr;</span>"
msgstr ""
#: tag.php:16
#, php-format
msgid "Tag Archives: %s"
@ -431,5 +432,5 @@ msgstr ""
msgid ""
"black, blue, white, two-columns, fixed-width, custom-header, custom-"
"background, threaded-comments, sticky-post, translation-ready, microformats, "
"rtl-language-support, editor-style, custom-menu"
"rtl-language-support, editor-style"
msgstr ""

116
wp-content/themes/twentyten/loop-attachment.php
View File

@ -1,116 +0,0 @@
<?php
/**
* The loop that displays an attachment.
*
* The loop displays the posts and the post content. See
* http://codex.wordpress.org/The_Loop to understand it and
* http://codex.wordpress.org/Template_Tags to understand
* the tags used in it.
*
* This can be overridden in child themes with loop-attachment.php.
*
* @package WordPress
* @subpackage Twenty_Ten
* @since Twenty Ten 1.2
*/
?>
<?php if ( have_posts() ) while ( have_posts() ) : the_post(); ?>
<?php if ( ! empty( $post->post_parent ) ) : ?>
<p class="page-title"><a href="<?php echo get_permalink( $post->post_parent ); ?>" title="<?php esc_attr( printf( __( 'Return to %s', 'twentyten' ), get_the_title( $post->post_parent ) ) ); ?>" rel="gallery"><?php
/* translators: %s - title of parent post */
printf( __( '<span class="meta-nav">&larr;</span> %s', 'twentyten' ), get_the_title( $post->post_parent ) );
?></a></p>
<?php endif; ?>
<div id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
<h2 class="entry-title"><?php the_title(); ?></h2>
<div class="entry-meta">
<?php
printf(__('<span class="%1$s">By</span> %2$s', 'twentyten'),
'meta-prep meta-prep-author',
sprintf( '<span class="author vcard"><a class="url fn n" href="%1$s" title="%2$s">%3$s</a></span>',
get_author_posts_url( get_the_author_meta( 'ID' ) ),
sprintf( esc_attr__( 'View all posts by %s', 'twentyten' ), get_the_author() ),
get_the_author()
)
);
?>
<span class="meta-sep">|</span>
<?php
printf( __('<span class="%1$s">Published</span> %2$s', 'twentyten'),
'meta-prep meta-prep-entry-date',
sprintf( '<span class="entry-date"><abbr class="published" title="%1$s">%2$s</abbr></span>',
esc_attr( get_the_time() ),
get_the_date()
)
);
if ( wp_attachment_is_image() ) {
echo ' <span class="meta-sep">|</span> ';
$metadata = wp_get_attachment_metadata();
printf( __( 'Full size is %s pixels', 'twentyten'),
sprintf( '<a href="%1$s" title="%2$s">%3$s &times; %4$s</a>',
wp_get_attachment_url(),
esc_attr( __('Link to full-size image', 'twentyten') ),
$metadata['width'],
$metadata['height']
)
);
}
?>
<?php edit_post_link( __( 'Edit', 'twentyten' ), '<span class="meta-sep">|</span> <span class="edit-link">', '</span>' ); ?>
</div><!-- .entry-meta -->
<div class="entry-content">
<div class="entry-attachment">
<?php if ( wp_attachment_is_image() ) :
$attachments = array_values( get_children( array( 'post_parent' => $post->post_parent, 'post_status' => 'inherit', 'post_type' => 'attachment', 'post_mime_type' => 'image', 'order' => 'ASC', 'orderby' => 'menu_order ID' ) ) );
foreach ( $attachments as $k => $attachment ) {
if ( $attachment->ID == $post->ID )
break;
}
$k++;
// If there is more than 1 image attachment in a gallery
if ( count( $attachments ) > 1 ) {
if ( isset( $attachments[ $k ] ) )
// get the URL of the next image attachment
$next_attachment_url = get_attachment_link( $attachments[ $k ]->ID );
else
// or get the URL of the first image attachment
$next_attachment_url = get_attachment_link( $attachments[ 0 ]->ID );
} else {
// or, if there's only 1 image attachment, get the URL of the image
$next_attachment_url = wp_get_attachment_url();
}
?>
<p class="attachment"><a href="<?php echo $next_attachment_url; ?>" title="<?php echo esc_attr( get_the_title() ); ?>" rel="attachment"><?php
$attachment_size = apply_filters( 'twentyten_attachment_size', 900 );
echo wp_get_attachment_image( $post->ID, array( $attachment_size, 9999 ) ); // filterable image width with, essentially, no limit for image height.
?></a></p>
<div id="nav-below" class="navigation">
<div class="nav-previous"><?php previous_image_link( false ); ?></div>
<div class="nav-next"><?php next_image_link( false ); ?></div>
</div><!-- #nav-below -->
<?php else : ?>
<a href="<?php echo wp_get_attachment_url(); ?>" title="<?php echo esc_attr( get_the_title() ); ?>" rel="attachment"><?php echo basename( get_permalink() ); ?></a>
<?php endif; ?>
</div><!-- .entry-attachment -->
<div class="entry-caption"><?php if ( !empty( $post->post_excerpt ) ) the_excerpt(); ?></div>
<?php the_content( __( 'Continue reading <span class="meta-nav">&rarr;</span>', 'twentyten' ) ); ?>
<?php wp_link_pages( array( 'before' => '<div class="page-link">' . __( 'Pages:', 'twentyten' ), 'after' => '</div>' ) ); ?>
</div><!-- .entry-content -->
<div class="entry-utility">
<?php twentyten_posted_in(); ?>
<?php edit_post_link( __( 'Edit', 'twentyten' ), ' <span class="edit-link">', '</span>' ); ?>
</div><!-- .entry-utility -->
</div><!-- #post-## -->
<?php comments_template(); ?>
<?php endwhile; // end of the loop. ?>

36
wp-content/themes/twentyten/loop-page.php
View File

@ -1,36 +0,0 @@
<?php
/**
* The loop that displays a page.
*
* The loop displays the posts and the post content. See
* http://codex.wordpress.org/The_Loop to understand it and
* http://codex.wordpress.org/Template_Tags to understand
* the tags used in it.
*
* This can be overridden in child themes with loop-page.php.
*
* @package WordPress
* @subpackage Twenty_Ten
* @since Twenty Ten 1.2
*/
?>
<?php if ( have_posts() ) while ( have_posts() ) : the_post(); ?>
<div id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
<?php if ( is_front_page() ) { ?>
<h2 class="entry-title"><?php the_title(); ?></h2>
<?php } else { ?>
<h1 class="entry-title"><?php the_title(); ?></h1>
<?php } ?>
<div class="entry-content">
<?php the_content(); ?>
<?php wp_link_pages( array( 'before' => '<div class="page-link">' . __( 'Pages:', 'twentyten' ), 'after' => '</div>' ) ); ?>
<?php edit_post_link( __( 'Edit', 'twentyten' ), '<span class="edit-link">', '</span>' ); ?>
</div><!-- .entry-content -->
</div><!-- #post-## -->
<?php comments_template( '', true ); ?>
<?php endwhile; // end of the loop. ?>

67
wp-content/themes/twentyten/loop-single.php
View File

@ -1,67 +0,0 @@
<?php
/**
* The loop that displays a single post.
*
* The loop displays the posts and the post content. See
* http://codex.wordpress.org/The_Loop to understand it and
* http://codex.wordpress.org/Template_Tags to understand
* the tags used in it.
*
* This can be overridden in child themes with loop-single.php.
*
* @package WordPress
* @subpackage Twenty_Ten
* @since Twenty Ten 1.2
*/
?>
<?php if ( have_posts() ) while ( have_posts() ) : the_post(); ?>
<div id="nav-above" class="navigation">
<div class="nav-previous"><?php previous_post_link( '%link', '<span class="meta-nav">' . _x( '&larr;', 'Previous post link', 'twentyten' ) . '</span> %title' ); ?></div>
<div class="nav-next"><?php next_post_link( '%link', '%title <span class="meta-nav">' . _x( '&rarr;', 'Next post link', 'twentyten' ) . '</span>' ); ?></div>
</div><!-- #nav-above -->
<div id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
<h1 class="entry-title"><?php the_title(); ?></h1>
<div class="entry-meta">
<?php twentyten_posted_on(); ?>
</div><!-- .entry-meta -->
<div class="entry-content">
<?php the_content(); ?>
<?php wp_link_pages( array( 'before' => '<div class="page-link">' . __( 'Pages:', 'twentyten' ), 'after' => '</div>' ) ); ?>
</div><!-- .entry-content -->
<?php if ( get_the_author_meta( 'description' ) ) : // If a user has filled out their description, show a bio on their entries ?>
<div id="entry-author-info">
<div id="author-avatar">
<?php echo get_avatar( get_the_author_meta( 'user_email' ), apply_filters( 'twentyten_author_bio_avatar_size', 60 ) ); ?>
</div><!-- #author-avatar -->
<div id="author-description">
<h2><?php printf( esc_attr__( 'About %s', 'twentyten' ), get_the_author() ); ?></h2>
<?php the_author_meta( 'description' ); ?>
<div id="author-link">
<a href="<?php echo get_author_posts_url( get_the_author_meta( 'ID' ) ); ?>">
<?php printf( __( 'View all posts by %s <span class="meta-nav">&rarr;</span>', 'twentyten' ), get_the_author() ); ?>
</a>
</div><!-- #author-link -->
</div><!-- #author-description -->
</div><!-- #entry-author-info -->
<?php endif; ?>
<div class="entry-utility">
<?php twentyten_posted_in(); ?>
<?php edit_post_link( __( 'Edit', 'twentyten' ), '<span class="edit-link">', '</span>' ); ?>
</div><!-- .entry-utility -->
</div><!-- #post-## -->
<div id="nav-below" class="navigation">
<div class="nav-previous"><?php previous_post_link( '%link', '<span class="meta-nav">' . _x( '&larr;', 'Previous post link', 'twentyten' ) . '</span> %title' ); ?></div>
<div class="nav-next"><?php next_post_link( '%link', '%title <span class="meta-nav">' . _x( '&rarr;', 'Next post link', 'twentyten' ) . '</span>' ); ?></div>
</div><!-- #nav-below -->
<?php comments_template( '', true ); ?>
<?php endwhile; // end of the loop. ?>