diff --git a/wp-content/themes/thematic/attachment.php b/wp-content/themes/thematic/attachment.php
index 7c5bd85b7ae890f0bcb52f4bc5dbc9c51b9a7b69..799c83ed0996c6fec968aa855d4ef27772ce08b4 100644
--- a/wp-content/themes/thematic/attachment.php
+++ b/wp-content/themes/thematic/attachment.php
@@ -36,17 +36,9 @@
thematic_abovepost();
?>
+ <div id="post-<?php the_ID(); ?>" <?php post_class(); ?> >
+
<?php
- echo '<div id="post-' . get_the_ID() . '" ';
- // Checking for defined constant to enable Thematic's post classes
- if ( !( THEMATIC_COMPATIBLE_POST_CLASS ) ) {
- post_class();
- echo '>';
- } else {
- echo 'class="';
- thematic_post_class();
- echo '">';
- }
// creating the post header
thematic_postheader();
diff --git a/wp-content/themes/thematic/comments.php b/wp-content/themes/thematic/comments.php
index 0d4008fcb78a308bf11d3b85920159474434a460..2012e3367df7a5d723cc230b4dd32ea128640891 100644
--- a/wp-content/themes/thematic/comments.php
+++ b/wp-content/themes/thematic/comments.php
@@ -108,7 +108,7 @@
<div id="pings-list-wrapper" class="pings">
- <h3><?php printf( $thematic_ping_count > 1 ? '<span>%d</span> ' . __( 'Trackbacks', 'thematic' ) : __( '<span>One</span> Trackback', 'thematic' ), $thematic_ping_count ) ?></h3>
+ <h3><?php printf( $thematic_ping_count > 1 ? '<span>%d</span> ' . __( 'Trackbacks', 'thematic' ) : sprintf( _x( '%1$sOne%2$s Trackback', '%1$ and %2$s are <span> tags', 'thematic' ), '<span>', '</span>' ), $thematic_ping_count ) ?></h3>
<ul id="trackbacks-list">
<?php wp_list_comments( 'type=pings&callback=thematic_pings' ); ?>
@@ -129,91 +129,22 @@
<?php
if ( 'open' == $post->comment_status ) :
- if ( !THEMATIC_COMPATIBLE_COMMENT_FORM ) {
- ?>
-
- <div id="respond">
-
- <h3><?php comment_form_title( __( thematic_postcomment_text(), 'thematic' ), __( thematic_postreply_text(), 'thematic' ) ); ?></h3>
-
- <div id="cancel-comment-reply"><?php cancel_comment_reply_link() ?></div>
-
- <?php if ( get_option( 'comment_registration' ) && !$user_ID ) : ?>
- <p id="login-req"><?php printf( __( 'You must be <a href="%s" title="Log in">logged in</a> to post a comment.', 'thematic' ), site_url( '/wp-login.php?redirect_to=' . get_permalink() ) ) ?></p>
+ if ( current_theme_supports( 'thematic_legacy_comment_form' ) ) {
- <?php else : ?>
- <div class="formcontainer">
-
- <?php
- // action hook for inserting content above #commentform
- thematic_abovecommentsform()
- ?>
-
- <form id="commentform" action="<?php echo site_url( '/wp-comments-post.php' ) ?>" method="post">
-
- <?php if ( $user_ID ) : ?>
-
- <p id="login"><?php printf( __( '<span class="loggedin">Logged in as <a href="%1$s" title="Logged in as %2$s">%2$s</a>.</span> <span class="logout"><a href="%3$s" title="Log out of this account">Log out?</a></span>', 'thematic' ),
- site_url( '/wp-admin/profile.php' ),
- esc_html( $user_identity ),
- wp_logout_url( get_permalink() ) ) ?>
- </p>
-
- <?php else : ?>
-
- <p id="comment-notes"><?php _e( 'Your email is <em>never</em> published nor shared.', 'thematic' ) ?> <?php if ( $req ) _e( 'Required fields are marked <span class="required">*</span>', 'thematic' ) ?></p>
-
- <div id="form-section-author" class="form-section">
- <div class="form-label"><label for="author"><?php _e( 'Name', 'thematic' ) ?></label> <?php if ( $req ) _e( '<span class="required">*</span>', 'thematic' ) ?></div>
- <div class="form-input"><input id="author" name="author" type="text" value="<?php echo $comment_author ?>" size="30" maxlength="20" tabindex="3" /></div>
- </div><!-- #form-section-author .form-section -->
-
- <div id="form-section-email" class="form-section">
- <div class="form-label"><label for="email"><?php _e( 'Email', 'thematic' ) ?></label> <?php if ( $req ) _e( '<span class="required">*</span>', 'thematic' ) ?></div>
- <div class="form-input"><input id="email" name="email" type="text" value="<?php echo $comment_author_email ?>" size="30" maxlength="50" tabindex="4" /></div>
- </div><!-- #form-section-email .form-section -->
-
- <div id="form-section-url" class="form-section">
- <div class="form-label"><label for="url"><?php _e( 'Website', 'thematic' ) ?></label></div>
- <div class="form-input"><input id="url" name="url" type="text" value="<?php echo $comment_author_url ?>" size="30" maxlength="50" tabindex="5" /></div>
- </div><!-- #form-section-url .form-section -->
-
- <?php endif /* if ( $user_ID ) */ ?>
-
- <div id="form-section-comment" class="form-section">
- <div class="form-label"><label for="comment"><?php _e( thematic_commentbox_text(), 'thematic' ) ?></label></div>
- <div class="form-textarea"><textarea id="comment" name="comment" cols="45" rows="8" tabindex="6"></textarea></div>
- </div><!-- #form-section-comment .form-section -->
-
- <div id="form-allowed-tags" class="form-section">
- <p><span><?php _e( 'You may use these <abbr title="HyperText Markup Language">HTML</abbr> tags and attributes:', 'thematic' ) ?></span> <code><?php echo allowed_tags(); ?></code></p>
- </div>
-
- <?php do_action( 'comment_form', $post->ID ); ?>
-
- <div class="form-submit"><input id="submit" name="submit" type="submit" value="<?php echo thematic_commentbutton_text(); ?>" tabindex="7" /><input type="hidden" name="comment_post_ID" value="<?php echo $id; ?>" /></div>
-
- <?php comment_id_fields(); ?>
-
- </form><!-- #commentform -->
-
- <?php
- // action hook for inserting content below #commentform
- thematic_belowcommentsform()
- ?>
-
- </div><!-- .formcontainer -->
- <?php endif /* if ( get_option('comment_registration') && !$user_ID ) */ ?>
-
- </div><!-- #respond -->
+ thematic_legacy_comment_form();
+
+ } else {
+
+ // action hook for inserting content above #commentform
+ thematic_abovecommentsform();
- <?php
- } else {
+ comment_form( thematic_comment_form_args() );
+
+ // action hook for inserting content below #commentform
+ thematic_belowcommentsform();
- comment_form( thematic_comment_form_args() );
-
- }
- endif /* if ( 'open' == $post->comment_status ) */
+ }
+ endif /* if ( 'open' == $post->comment_status ) */
?>
</div><!-- #comments -->
diff --git a/wp-content/themes/thematic/footer.php b/wp-content/themes/thematic/footer.php
index 40f4ca6d9a52cca8bb236806b71791ba0ccca1cb..c86c081a03d30adbf6c3b8f368ec5f9e5cde6939 100644
--- a/wp-content/themes/thematic/footer.php
+++ b/wp-content/themes/thematic/footer.php
@@ -43,11 +43,12 @@
if ( apply_filters( 'thematic_close_wrapper', true ) )
echo ( '</div><!-- #wrapper .hfeed -->' . "\n" );
- // calling WordPress' footer action hook
- wp_footer();
// action hook for placing content before closing the BODY tag
thematic_after();
+
+ // calling WordPress' footer action hook
+ wp_footer();
?>
</body>
diff --git a/wp-content/themes/thematic/functions.php b/wp-content/themes/thematic/functions.php
index da408174d533837abf605d63a54dfdbf796aa7f0..45f7546339b4ad6f5681727473a95b4860ecacef 100644
--- a/wp-content/themes/thematic/functions.php
+++ b/wp-content/themes/thematic/functions.php
@@ -59,99 +59,32 @@ if ( function_exists('childtheme_override_theme_setup') ) {
*/
if ( !isset($content_width) )
$content_width = 540;
-
- /**
- * Get Theme and Child Theme Data.
- *
- * Used to get title, version, author, URI of the parent and the child theme.
- * @todo: move wp_get_theme() directly to shortcodes and remove constants
- */
-
- // WordPress 3.4
- if ( function_exists( 'wp_get_theme' ) ) {
- $frameworkData = wp_get_theme( 'thematic' );
- $framework_version = trim( $frameworkData->display('Version', false));
- $framework_title = $frameworkData->display('Name', false);
- $framework_author = $frameworkData->display('Author', false);
- $framework_themeuri = $frameworkData->display('ThemeURI', false);
-
- $childthemeData = wp_get_theme();
- $childtheme_version = trim( $childthemeData->display('Version', false) );
- $childtheme_title = $childthemeData->display('Name', false);
- $childtheme_author = $childthemeData->display('Author', false);
- $childtheme_themeuri = $childthemeData->display('ThemeURI', false);
-
- // WordPress 3.3
- // Credits: Joern Kretzschmar
-
- } else {
- $frameworkData = get_theme_data( get_template_directory() . '/style.css' );
- $framework_version = trim( $frameworkData['Version'] );
- $framework_title = $frameworkData['Title'];
- $framework_author = $frameworkData['Author'];
- $framework_themeuri = $frameworkData['URI'];
-
- $childthemeData = get_theme_data( get_stylesheet_directory() . '/style.css' );
- $childtheme_version = trim( $childthemeData['Version'] );
- $childtheme_title = $childthemeData['Name'];
- $childtheme_author = $childthemeData['Author'];
- $childtheme_themeuri = $childthemeData['URI'];
-
- }
-
-
- if ( !$framework_version )
- $framework_version = "unknown";
-
- if ( !$childtheme_version )
- $childtheme_version = "unknown";
-
- if ( !defined( 'THEMATIC_THEMENAME' ) )
- define( 'THEMATIC_THEMENAME', $framework_title );
-
- if ( !defined('THEMATIC_THEMEAUTHOR') )
- define( 'THEMATIC_THEMEAUTHOR', $framework_author );
-
- if ( !defined( 'THEMATIC_THEMEURI') )
- define( 'THEMATIC_THEMEURI', $framework_themeuri );
-
- if ( !defined( 'THEMATIC_VERSION' ) )
- define( 'THEMATIC_VERSION', $framework_version );
-
- define( 'THEMATIC_TEMPLATENAME', $childtheme_title );
- define( 'THEMATIC_TEMPLATEAUTHOR', $childtheme_author );
- define( 'THEMATIC_TEMPLATEURI', $childtheme_themeuri );
- define( 'THEMATIC_TEMPLATEVERSION', $childtheme_version );
- // set feed links handling
- // If you set this to TRUE, thematic_show_rss() and thematic_show_commentsrss() are used instead of add_theme_support( 'automatic-feed-links' )
- if ( !defined('THEMATIC_COMPATIBLE_FEEDLINKS') )
- define( 'THEMATIC_COMPATIBLE_FEEDLINKS', false );
-
- // set comments handling for pages, archives and links
- // If you set this to TRUE, comments only show up on pages with a key/value of "comments"
- if ( !defined( 'THEMATIC_COMPATIBLE_COMMENT_HANDLING') )
- define( 'THEMATIC_COMPATIBLE_COMMENT_HANDLING', false );
-
- // set body class handling to WP body_class()
- // If you set this to TRUE, Thematic will use thematic_body_class instead
- if ( !defined( 'THEMATIC_COMPATIBLE_BODY_CLASS') )
- define( 'THEMATIC_COMPATIBLE_BODY_CLASS', false );
-
- // set post class handling to WP post_class()
- // If you set this to TRUE, Thematic will use thematic_post_class instead
- if ( !defined( 'THEMATIC_COMPATIBLE_POST_CLASS') )
- define( 'THEMATIC_COMPATIBLE_POST_CLASS', false );
-
- // If you set this to TRUE, Thematic will use it's legacy comment form
- if ( !defined('THEMATIC_COMPATIBLE_COMMENT_FORM') )
- define( 'THEMATIC_COMPATIBLE_COMMENT_FORM', false );
+ // Legacy feed links handling - @to be removed eventually
+ // If you add theme support for thematic_legacy_feedlinks, thematic_show_rss() and thematic_show_commentsrss() are used instead of add_theme_support( 'automatic-feed-links' )
+ if ( defined( 'THEMATIC_COMPATIBLE_FEEDLINKS' ) ) add_theme_support( 'thematic_legacy_feedlinks' );
+
+ // Legacy comments handling for pages, archives and links
+ // If you add_theme_support for thematic_legacy_comment_handling, Thematic will only show comments on pages with a key/value of "comments"
+ if ( defined( 'THEMATIC_COMPATIBLE_COMMENT_HANDLING' ) ) add_theme_support( 'thematic_legacy_comment_handling' );
+
+ // Legacy body class handling - @to be removed eventually
+ // If you add theme support for thematic_legacy_body_class, Thematic will use thematic_body_class instead of body_class()
+ if ( defined( 'THEMATIC_COMPATIBLE_BODY_CLASS' ) ) add_theme_support( 'thematic_legacy_body_class' );
+
+ // Legacy post class handling - @to be removed eventually
+ // If you add theme support for thematic_legacy_post_class, Thematic will use thematic_body_class instead of post_class()
+ if ( defined( 'THEMATIC_COMPATIBLE_POST_CLASS' ) ) add_theme_support( 'thematic_legacy_post_class' );
+
+ // Legacy post class handling - @to be removed eventually
+ // If you add theme support for thematic_legacy_post_class, Thematic will use it's legacy comment form
+ if ( defined( 'THEMATIC_COMPATIBLE_COMMENT_FORM' ) ) add_theme_support( 'thematic_legacy_comment_form' );
// Check for MultiSite
define( 'THEMATIC_MB', is_multisite() );
// Create the feedlinks
- if ( !( THEMATIC_COMPATIBLE_FEEDLINKS ) )
+ if ( ! current_theme_supports( 'thematic_legacy_feedlinks' ) )
add_theme_support( 'automatic-feed-links' );
if ( apply_filters( 'thematic_post_thumbs', true ) )
diff --git a/wp-content/themes/thematic/header.php b/wp-content/themes/thematic/header.php
index ea9081d4e1374743e97d20eddcd934676f9321b3..472c55f71e85bda6af368f8af3232fd82f69ceff 100644
--- a/wp-content/themes/thematic/header.php
+++ b/wp-content/themes/thematic/header.php
@@ -30,8 +30,8 @@
// Create the tag <meta name="robots"
thematic_show_robots();
- // Constant defined true by default
- if (THEMATIC_COMPATIBLE_FEEDLINKS) {
+ // Legacy feedlink handling
+ if ( current_theme_supports( 'thematic_legacy_feedlinks' ) ) {
// Creating the internal RSS links
thematic_show_rss();
diff --git a/wp-content/themes/thematic/library/extensions/comments-extensions.php b/wp-content/themes/thematic/library/extensions/comments-extensions.php
index 90e2dfc1d4ccb413a037c2ab4a4a5bcb8bd22367..1b7209270c62fcb3c0cb1e58df404f6f36815461 100644
--- a/wp-content/themes/thematic/library/extensions/comments-extensions.php
+++ b/wp-content/themes/thematic/library/extensions/comments-extensions.php
@@ -117,7 +117,7 @@ function thematic_belowcomments() {
* Located in comments.php
*/
function thematic_singlecomment_text() {
- $content = __('<span>One</span> Comment', 'thematic');
+ $content = sprintf( _x( '%1$sOne%2$s Comment' , 'One Comment, where %$1s and %$2s are <span> tags', 'thematic' ), '<span>' , '</span>' );
return apply_filters( 'thematic_singlecomment_text', $content );
}
@@ -151,6 +151,7 @@ function thematic_list_comments_arg() {
* Located in comments.php
*/
function thematic_postcomment_text() {
+ /* translators: comment form title */
$content = __('Post a Comment', 'thematic');
return apply_filters( 'thematic_postcomment_text', $content );
}
@@ -162,6 +163,7 @@ function thematic_postcomment_text() {
* Located in comments.php
*/
function thematic_postreply_text() {
+ /* translators: comment reply form title, %s is author of comment */
$content = __('Post a Reply to %s', 'thematic');
return apply_filters( 'thematic_postreply_text', $content );
}
@@ -173,7 +175,8 @@ function thematic_postreply_text() {
* Located in comments.php
*/
function thematic_commentbox_text() {
- $content = __('Comment', 'thematic');
+ /* translators: label for comment form textarea */
+ $content = _x('Comment', 'noun', 'thematic');
return apply_filters( 'thematic_commentbox_text', $content );
}
@@ -195,6 +198,7 @@ function thematic_cancelreply_text() {
* Located in comments.php
*/
function thematic_commentbutton_text() {
+ /* translators: text of comment button */
$content = esc_attr( __('Post Comment', 'thematic') );
return apply_filters( 'thematic_commentbutton_text', $content );
}
@@ -221,8 +225,8 @@ function thematic_comment_form_args( $post_id = null ) {
$aria_req = ( $req ? " aria-required='true'" : '' );
$fields = array(
- 'author' => '<div id="form-section-author" class="form-section"><div class="form-label">' . '<label for="author">' . __( 'Name', 'thematic' ) . '</label> ' . ( $req ? __('<span class="required">*</span>', 'thematic') : '' ) . '</div>' . '<div class="form-input">' . '<input id="author" name="author" type="text" value="' . esc_attr( $commenter['comment_author'] ) . '" size="30"' . ' maxlength="20" tabindex="3"' . $aria_req . ' /></div></div><!-- #form-section-author .form-section -->',
- 'email' => '<div id="form-section-email" class="form-section"><div class="form-label"><label for="email">' . __( 'Email', 'thematic' ) . '</label> ' . ( $req ? __('<span class="required">*</span>', 'thematic') : '' ) . '</div><div class="form-input">' . '<input id="email" name="email" type="text" value="' . esc_attr( $commenter['comment_author_email'] ) . '" size="30" maxlength="50" tabindex="4"' . $aria_req . ' /></div></div><!-- #form-section-email .form-section -->',
+ 'author' => '<div id="form-section-author" class="form-section"><div class="form-label">' . '<label for="author">' . __( 'Name', 'thematic' ) . '</label> ' . ( $req ? '<span class="required">' . _x( '*', 'denotes required field', 'thematic' ) . '</span>' : '' ) . '</div>' . '<div class="form-input">' . '<input id="author" name="author" type="text" value="' . esc_attr( $commenter['comment_author'] ) . '" size="30"' . ' maxlength="20" tabindex="3"' . $aria_req . ' /></div></div><!-- #form-section-author .form-section -->',
+ 'email' => '<div id="form-section-email" class="form-section"><div class="form-label"><label for="email">' . __( 'Email', 'thematic' ) . '</label> ' . ( $req ? '<span class="required">' . _x( '*', 'denotes required field', 'thematic' ) . '</span>' : '' ) . '</div><div class="form-input">' . '<input id="email" name="email" type="text" value="' . esc_attr( $commenter['comment_author_email'] ) . '" size="30" maxlength="50" tabindex="4"' . $aria_req . ' /></div></div><!-- #form-section-email .form-section -->',
'url' => '<div id="form-section-url" class="form-section"><div class="form-label"><label for="url">' . __( 'Website', 'thematic' ) . '</label></div>' . '<div class="form-input"><input id="url" name="url" type="text" value="' . esc_attr( $commenter['comment_author_url'] ) . '" size="30" maxlength="50" tabindex="5" /></div></div><!-- #form-section-url .form-section -->',
);
@@ -230,11 +234,14 @@ function thematic_comment_form_args( $post_id = null ) {
$args = array(
'fields' => apply_filters( 'comment_form_default_fields', $fields ),
'comment_field' => '<div id="form-section-comment" class="form-section"><div class="form-label"><label for="comment">' . __(thematic_commentbox_text(), 'thematic') . '</label></div><div class="form-textarea"><textarea id="comment" name="comment" cols="45" rows="8" tabindex="6" aria-required="true"></textarea></div></div><!-- #form-section-comment .form-section -->',
- 'comment_notes_before' => '<p class="comment-notes">' . __( 'Your email is <em>never</em> published nor shared.', 'thematic' ) . ( $req ? ' ' . __('Required fields are marked <span class="required">*</span>', 'thematic') : '' ) . '</p>',
- 'must_log_in' => '<p id="login-req">' . sprintf( __( 'You must be <a href="%s" title="Log in">logged in</a> to post a comment.', 'thematic' ), wp_login_url( apply_filters( 'the_permalink', get_permalink( $post_id ) ) ) ) . '</p>',
- 'logged_in_as' => '<p id="login">' . sprintf( __('<span class="loggedin">Logged in as <a href="%1$s" title="Logged in as %2$s">%2$s</a>.</span> <span class="logout"><a href="%3$s" title="Log out of this account">Log out?</a></span>', 'thematic'), admin_url( 'profile.php' ), $user_identity, wp_logout_url( apply_filters( 'the_permalink', get_permalink( $post_id ) ) ) ) . '</p>',
- 'comment_notes_after' => '<div id="form-allowed-tags" class="form-section"><p><span>' . __('You may use these <abbr title="HyperText Markup Language">HTML</abbr> tags and attributes:', 'thematic') . '</span> <code>' . allowed_tags() . '</code></p></div>',
+ 'comment_notes_before' => '<p class="comment-notes">' . sprintf( _x( 'Your email is %1$snever%2$s published nor shared.' , '%$1s and %$2s are <em> tags for emphasis on never', 'thematic' ), '<em>' , '</em>' ) . ( $req ? ' ' . sprintf( _x('Required fields are marked %1$s*%2$s', '%$1s and %$2s are <span> tags', 'thematic'), '<span class="required">', '</span>' ) : '' ) . '</p>',
+
+ 'must_log_in' => '<p id="login-req">' . sprintf( __('You must be %1$slogged in%2$s to post a comment.', 'thematic'), sprintf('<a href="%s" title ="%s">', esc_attr( wp_login_url( apply_filters( 'the_permalink', get_permalink() ) ) ), esc_attr__( 'Log in', 'thematic' ) ), '</a>' ). '</p>',
+
+ 'logged_in_as' => '<p id="login"><span class="loggedin">' . sprintf( __('Logged in as %s', 'thematic' ), sprintf( ' <a href="%1$s" title="%2$s">%3$s</a>', admin_url( 'profile.php' ), sprintf( esc_attr__('Logged in as %s', 'thematic'), $user_identity ) , $user_identity ) ) .'</span> <span class="logout">' . sprintf('<a href="%s" title="%s">%s</a>' , esc_attr( wp_logout_url( apply_filters( 'the_permalink', get_permalink( $post_id ) ) ) ), esc_attr__('Log out of this account', 'thematic' ) , __('Log out?', 'thematic' ) ) . '</span></p>',
+
+ 'comment_notes_after' => '<div id="form-allowed-tags" class="form-section"><p><span>' . sprintf( _x('You may use these %1$sHTML%2$s tags and attributes', '%$1s and %$2s are <abbr> tags', 'thematic'), '<abbr title="HyperText Markup Language">', '</abbr>' ) . '</span> <code>' . allowed_tags() . '</code></p></div>',
'id_form' => 'commentform',
'id_submit' => 'submit',
@@ -275,7 +282,7 @@ function thematic_comments_template() {
*/
function thematic_include_comments() {
// Checking for defined constant to enable conditional comment display for Pages
- if ( THEMATIC_COMPATIBLE_COMMENT_HANDLING && is_page() ) {
+ if ( current_theme_supports( 'thematic_legacy_comment_handling' ) && is_page() ) {
// Needs post-meta key/value of "comments" to call comments template on Pages!
if ( get_post_custom_values('comments') )
comments_template('', true);
@@ -292,13 +299,20 @@ function thematic_get_comment_link( $link , $comment, $args ) {
$args['type'] = 'comment';
$args['page'] = get_page_of_comment( $comment->comment_ID, $args );
+
+ if ( $args['per_page'] ) {
+ if ( '' == $args['page'] )
+ $args['page'] = ( !empty($in_comment_loop) ) ? get_query_var('cpage') : get_page_of_comment( $comment->comment_ID, $args );
+
+ if ( $wp_rewrite->using_permalinks() )
+ $link = user_trailingslashit( trailingslashit( get_permalink( $comment->comment_post_ID ) ) . 'comment-page-' . $args['page'], 'comment' );
+ else
+ $link = add_query_arg( 'cpage', $args['page'], get_permalink( $comment->comment_post_ID ) );
+ } else {
+ $link = get_permalink( $comment->comment_post_ID );
+ }
- if ( $wp_rewrite->using_permalinks() )
- $link = user_trailingslashit( trailingslashit( get_permalink( $comment->comment_post_ID ) ) . 'comment-page-' . $args['page'], 'comment' );
- else
- $link = add_query_arg( 'cpage', $args['page'] , get_permalink( $comment->comment_post_ID ) );
-
- return $link;
+ return $link . '#comment-' . $comment->comment_ID;
}
add_filter( 'get_comment_link', 'thematic_get_comment_link', 10, 3 );
diff --git a/wp-content/themes/thematic/library/extensions/content-extensions.php b/wp-content/themes/thematic/library/extensions/content-extensions.php
index 779ccaf42173db27363adf9cb9b44bb92508f195..44d69089bf49035dbdcf04c7cf05a341e2b3ffc0 100644
--- a/wp-content/themes/thematic/library/extensions/content-extensions.php
+++ b/wp-content/themes/thematic/library/extensions/content-extensions.php
@@ -332,29 +332,26 @@ if (function_exists('childtheme_override_page_title')) {
$content .= '<h1 class="page-title author">';
$author = get_the_author_meta( 'display_name', $post->post_author );
$content .= __('Author Archives:', 'thematic');
- $content .= ' <span>';
- $content .= $author;
- $content .= '</span></h1>';
+ $content .= ' <span>' . $author .'</span>';
+ $content .= '</h1>';
} elseif (is_category()) {
$content .= '<h1 class="page-title">';
$content .= __('Category Archives:', 'thematic');
- $content .= ' <span>';
- $content .= single_cat_title('', FALSE);
- $content .= '</span></h1>' . "\n";
+ $content .= ' <span>' . single_cat_title('', FALSE) .'</span>';
+ $content .= '</h1>' . "\n";
$content .= "\n\t\t\t\t" . '<div class="archive-meta">';
if ( !(''== category_description()) ) : $content .= apply_filters('archive_meta', category_description()); endif;
$content .= '</div>';
} elseif (is_search()) {
$content .= '<h1 class="page-title">';
$content .= __('Search Results for:', 'thematic');
- $content .= ' <span id="search-terms">';
- $content .= get_search_query();
- $content .= '</span></h1>';
+ $content .= ' <span id="search-terms">' . get_search_query() .'</span>';
+ $content .= '</h1>';
} elseif (is_tag()) {
$content .= '<h1 class="page-title">';
$content .= __('Tag Archives:', 'thematic');
$content .= ' <span>';
- $content .= ( single_tag_title( '', false ));
+ $content .= single_tag_title( '', false );
$content .= '</span></h1>';
} elseif (is_tax()) {
global $taxonomy;
@@ -362,28 +359,26 @@ if (function_exists('childtheme_override_page_title')) {
$tax = get_taxonomy($taxonomy);
$content .= $tax->labels->singular_name . ' ';
$content .= __('Archives:', 'thematic');
- $content .= ' <span>';
- $content .= thematic_get_term_name();
- $content .= '</span></h1>';
+ $content .= ' <span>' . thematic_get_term_name() .'</span>';
+ $content .= '</h1>';
} elseif (is_post_type_archive()) {
$content .= '<h1 class="page-title">';
$post_type_obj = get_post_type_object( get_post_type() );
$post_type_name = $post_type_obj->labels->singular_name;
$content .= __('Archives:', 'thematic');
- $content .= ' <span>';
- $content .= $post_type_name;
- $content .= '</span></h1>';
+ $content .= ' <span>' . $post_type_name . '</span>';
+ $content .= '</h1>';
} elseif (is_day()) {
$content .= '<h1 class="page-title">';
- $content .= sprintf(__('Daily Archives: <span>%s</span>', 'thematic'), get_the_time(get_option('date_format')));
+ $content .= sprintf( __('Daily Archives: %s', 'thematic'), '<span>' . get_the_time( get_option('date_format') ) ) . '</span>';
$content .= '</h1>';
} elseif (is_month()) {
$content .= '<h1 class="page-title">';
- $content .= sprintf(__('Monthly Archives: <span>%s</span>', 'thematic'), get_the_time('F Y'));
+ $content .= sprintf( __('Monthly Archives: %s', 'thematic') , '<span>' . get_the_time('F Y') ) . '</span>';
$content .= '</h1>';
} elseif (is_year()) {
$content .= '<h1 class="page-title">';
- $content .= sprintf(__('Yearly Archives: <span>%s</span>', 'thematic'), get_the_time('Y'));
+ $content .= sprintf( __('Yearly Archives: %s', 'thematic'), '<span>' . get_the_time('Y') ) . '</span>';
$content .= '</h1>';
}
$content .= "\n";
@@ -391,6 +386,7 @@ if (function_exists('childtheme_override_page_title')) {
}
}
+
if (function_exists('childtheme_override_nav_above')) {
/**
@@ -425,9 +421,10 @@ if (function_exists('childtheme_override_nav_above')) {
<?php wp_pagenavi(); ?>
<?php } else { ?>
- <div class="nav-previous"><?php next_posts_link(__( '<span class="meta-nav">«</span> Older posts', 'thematic') ) ?></div>
+ <div class="nav-previous"><?php next_posts_link(sprintf('<span class="meta-nav">«</span> %s', __('Older posts', 'thematic') ) ) ?></div>
- <div class="nav-next"><?php previous_posts_link(__( 'Newer posts <span class="meta-nav">»</span>', 'thematic') ) ?></div>
+ <div class="nav-next"><?php previous_posts_link(sprintf('%s <span class="meta-nav">»</span>',__( 'Newer posts', 'thematic') ) ) ?></div>
+
<?php } ?>
</div>
@@ -461,17 +458,9 @@ if (function_exists('childtheme_override_archive_loop')) {
thematic_abovepost();
?>
+ <div id="post-<?php the_ID(); ?>" <?php post_class(); ?> >
+
<?php
- echo '<div id="post-' . get_the_ID() . '" ';
- // Checking for defined constant to enable Thematic's post classes
- if ( ! ( THEMATIC_COMPATIBLE_POST_CLASS ) ) {
- post_class();
- echo '>';
- } else {
- echo 'class="';
- thematic_post_class();
- echo '">';
- }
// creating the post header
thematic_postheader();
@@ -521,17 +510,9 @@ if (function_exists('childtheme_override_author_loop')) {
thematic_abovepost();
?>
+ <div id="post-<?php the_ID(); ?>" <?php post_class(); ?> >
+
<?php
- echo '<div id="post-' . get_the_ID() . '" ';
- // Checking for defined constant to enable Thematic's post classes
- if ( ! ( THEMATIC_COMPATIBLE_POST_CLASS ) ) {
- post_class();
- echo '>';
- } else {
- echo 'class="';
- thematic_post_class();
- echo '">';
- }
// creating the post header
thematic_postheader();
@@ -580,17 +561,9 @@ if (function_exists('childtheme_override_category_loop')) {
thematic_abovepost();
?>
+ <div id="post-<?php the_ID(); ?>" <?php post_class(); ?> >
+
<?php
- echo '<div id="post-' . get_the_ID() . '" ';
- // Checking for defined constant to enable Thematic's post classes
- if ( ! ( THEMATIC_COMPATIBLE_POST_CLASS ) ) {
- post_class();
- echo '>';
- } else {
- echo 'class="';
- thematic_post_class();
- echo '">';
- }
// creating the post header
thematic_postheader();
@@ -638,21 +611,13 @@ if (function_exists('childtheme_override_index_loop')) {
$count = 1;
while ( have_posts() ) : the_post();
- // action hook for insterting content above #post
+ // action hook for inserting content above #post
thematic_abovepost();
?>
+ <div id="post-<?php the_ID(); ?>" <?php post_class(); ?> >
+
<?php
- echo '<div id="post-' . get_the_ID() . '" ';
- // Checking for defined constant to enable Thematic's post classes
- if ( ! ( THEMATIC_COMPATIBLE_POST_CLASS ) ) {
- post_class();
- echo '>';
- } else {
- echo 'class="';
- thematic_post_class();
- echo '">';
- }
// creating the post header
thematic_postheader();
@@ -662,7 +627,8 @@ if (function_exists('childtheme_override_index_loop')) {
<?php thematic_content(); ?>
- <?php wp_link_pages('before=<div class="page-link">' . __('Pages:', 'thematic') . '&after=</div>') ?>
+ <?php wp_link_pages(array('before' => sprintf('<div class="page-link">%s', __('Pages:', 'thematic')),
+ 'after' => '</div>')); ?>
</div><!-- .entry-content -->
@@ -708,17 +674,9 @@ if (function_exists('childtheme_override_single_post')) {
thematic_abovepost();
?>
+ <div id="post-<?php the_ID(); ?>" <?php post_class(); ?> >
+
<?php
- echo '<div id="post-' . get_the_ID() . '" ';
- // Checking for defined constant to enable Thematic's post classes
- if ( ! ( THEMATIC_COMPATIBLE_POST_CLASS ) ) {
- post_class();
- echo '>';
- } else {
- echo 'class="';
- thematic_post_class();
- echo '">';
- }
// creating the post header
thematic_postheader();
@@ -728,7 +686,8 @@ if (function_exists('childtheme_override_single_post')) {
<?php thematic_content(); ?>
- <?php wp_link_pages('before=<div class="page-link">' . __('Pages:', 'thematic') . '&after=</div>') ?>
+ <?php wp_link_pages(array('before' => sprintf('<div class="page-link">%s', __('Pages:', 'thematic')),
+ 'after' => '</div>')); ?>
</div><!-- .entry-content -->
@@ -766,17 +725,9 @@ if (function_exists('childtheme_override_search_loop')) {
thematic_abovepost();
?>
+ <div id="post-<?php the_ID(); ?>" <?php post_class(); ?> >
+
<?php
- echo '<div id="post-' . get_the_ID() . '" ';
- // Checking for defined constant to enable Thematic's post classes
- if ( ! ( THEMATIC_COMPATIBLE_POST_CLASS ) ) {
- post_class();
- echo '>';
- } else {
- echo 'class="';
- thematic_post_class();
- echo '">';
- }
// creating the post header
thematic_postheader();
@@ -825,17 +776,9 @@ if (function_exists('childtheme_override_tag_loop')) {
thematic_abovepost();
?>
+ <div id="post-<?php the_ID(); ?>" <?php post_class(); ?> >
+
<?php
- echo '<div id="post-' . get_the_ID() . '" ';
- // Checking for defined constant to enable Thematic's post classes
- if ( ! ( THEMATIC_COMPATIBLE_POST_CLASS ) ) {
- post_class();
- echo '>';
- } else {
- echo 'class="';
- thematic_post_class();
- echo '">';
- }
// creating the post header
thematic_postheader();
@@ -938,14 +881,15 @@ if (function_exists('childtheme_override_postheader_posteditlink')) {
* Filter: thematic_postheader_posteditlink
*/
function thematic_postheader_posteditlink() {
-
- global $id;
-
- $posteditlink = '<a href="' . site_url() . '/wp-admin/post.php?action=edit&post=' . $id;
- $posteditlink .= '" title="' . __('Edit post', 'thematic') .'">';
- $posteditlink .= __('Edit', 'thematic') . '</a>';
+
+ $posteditlink = sprintf( '<a href="%s" title="%s" class="edit">%s</a>' ,
+
+ get_edit_post_link(),
+ esc_attr__('Edit post', 'thematic'),
+ /* translators: post edit link */
+ __('Edit', 'thematic'));
- return apply_filters('thematic_postheader_posteditlink',$posteditlink);
+ return apply_filters('thematic_postheader_posteditlink', $posteditlink);
}
} // end postheader_posteditlink
@@ -973,13 +917,12 @@ if (function_exists('childtheme_override_postheader_posttitle')) {
} elseif (is_404()) {
$posttitle .= '<h1 class="entry-title">' . __('Not Found', 'thematic') . "</h1>\n";
} else {
- $posttitle .= '<h2 class="entry-title"><a href="';
- $posttitle .= apply_filters('the_permalink', get_permalink());
- $posttitle .= '" title="';
- $posttitle .= __('Permalink to ', 'thematic') . the_title_attribute('echo=0');
- $posttitle .= '" rel="bookmark">';
- $posttitle .= get_the_title();
- $posttitle .= "</a></h2>\n";
+ $posttitle .= '<h2 class="entry-title">';
+ $posttitle .= sprintf('<a href="%s" title="%s" rel="bookmark">%s</a>',
+ apply_filters('the_permalink', get_permalink()),
+ sprintf( esc_attr__('Permalink to %s', 'thematic'), the_title_attribute( 'echo=0' ) ),
+ get_the_title());
+ $posttitle .= "</h2>\n";
}
return apply_filters('thematic_postheader_posttitle',$posttitle);
@@ -1032,28 +975,30 @@ if (function_exists('childtheme_override_postmeta_authorlink')) {
* Create the author link for post meta
*
* Override: childtheme_override_postmeta_authorlink <br>
- * Filter: thematic_post_meta_authorlink
+ * Filter: thematic_postmeta_authorlink
*/
function thematic_postmeta_authorlink() {
global $authordata;
- $author_open = '<span class="meta-prep meta-prep-author">' . __('By ', 'thematic') . '</span>';
- $author_close = '</span>';
+ $author_prep = '<span class="meta-prep meta-prep-author">' . __('By', 'thematic') . ' </span>';
if ( thematic_is_custom_post_type() && !current_theme_supports( 'thematic_support_post_type_author_link' ) ) {
$author_info = '<span class="vcard"><span class="fn nickname">';
$author_info .= get_the_author_meta( 'display_name' ) ;
$author_info .= '</span></span>';
} else {
- $author_info = '<span class="author vcard">'. '<a class="url fn n" href="';
- $author_info .= get_author_posts_url( $authordata->ID, $authordata->user_nicename );
- $author_info .= '" title="' . __( 'View all posts by ', 'thematic' ) . get_the_author_meta( 'display_name' ) . '">';
- $author_info .= get_the_author_meta( 'display_name' ) . '</a>';
+ $author_info = '<span class="author vcard">';
+ $author_info .= sprintf('<a class="url fn n" href="%s" title="%s">%s</a>',
+ get_author_posts_url( $authordata->ID, $authordata->user_nicename ),
+ /* translators: author name */
+ sprintf( esc_attr__( 'View all posts by %s', 'thematic' ), get_the_author_meta( 'display_name' ) ),
+ get_the_author_meta( 'display_name' ));
+ $author_info .= '</span>';
}
- $author_credit = $author_open . $author_info . $author_close ;
+ $author_credit = $author_prep . $author_info ;
- return apply_filters('thematic_post_meta_authorlink', $author_credit);
+ return apply_filters('thematic_postmeta_authorlink', $author_credit);
}
} // end postmeta_authorlink
@@ -1071,17 +1016,17 @@ if (function_exists('childtheme_override_postmeta_entrydate')) {
* Create entry date for post meta
*
* Override: childtheme_override_postmeta_entrydate <br>
- * Filter: thematic_post_meta_entrydate
+ * Filter: thematic_postmeta_entrydate
*/
function thematic_postmeta_entrydate() {
- $entrydate = '<span class="meta-prep meta-prep-entry-date">' . __('Published: ', 'thematic') . '</span>';
+ $entrydate = '<span class="meta-prep meta-prep-entry-date">' . __('Published:', 'thematic') . ' </span>';
$entrydate .= '<span class="entry-date"><abbr class="published" title="';
$entrydate .= get_the_time(thematic_time_title()) . '">';
$entrydate .= get_the_time(thematic_time_display());
$entrydate .= '</abbr></span>';
- return apply_filters('thematic_post_meta_entrydate', $entrydate);
+ return apply_filters('thematic_postmeta_entrydate', $entrydate);
}
} // end postmeta_entrydate
@@ -1099,14 +1044,14 @@ if (function_exists('childtheme_override_postmeta_editlink')) {
* Create edit link for post meta
*
* Override: childtheme_override_postmeta_editlink <br>
- * Filter: thematic_post_meta_editlink
+ * Filter: thematic_postmeta_editlink
*/
function thematic_postmeta_editlink() {
// Display edit link
if (current_user_can('edit_posts')) {
- $editlink = '<span class="meta-sep meta-sep-edit">|</span> ' . "\n\n\t\t\t\t\t\t" . '<span class="edit">' . thematic_postheader_posteditlink() . '</span>';
- return apply_filters('thematic_post_meta_editlink', $editlink);
+ $editlink = '<span class="meta-sep meta-sep-edit">|</span> ' . "\n\n\t\t\t\t\t\t" . thematic_postheader_posteditlink();
+ return apply_filters('thematic_postmeta_editlink', $editlink);
}
}
} // end postmeta_editlink
@@ -1193,9 +1138,12 @@ if (function_exists('childtheme_override_content')) {
if ( apply_filters( 'thematic_post_thumbs', TRUE) ) {
$post_title = get_the_title();
$size = apply_filters( 'thematic_post_thumb_size' , array(100,100) );
- $attr = apply_filters( 'thematic_post_thumb_attr', array('title' => 'Permalink to ' . $post_title) );
+ $attr = apply_filters( 'thematic_post_thumb_attr', array('title' => sprintf( esc_attr__('Permalink to %s', 'thematic'), the_title_attribute( 'echo=0' ) ) ) );
if ( has_post_thumbnail() ) {
- $post = '<a class="entry-thumb" href="' . get_permalink() . '" title="Permalink to ' . get_the_title() . '" >' . get_the_post_thumbnail(get_the_ID(), $size, $attr) . '</a>' . $post;
+ $post = sprintf('<a class="entry-thumb" href="%s" title="%s">%s</a>',
+ get_permalink() ,
+ sprintf( esc_attr__('Permalink to %s', 'thematic'), the_title_attribute( 'echo=0' ) ),
+ get_the_post_thumbnail(get_the_ID(), $size, $attr)) . $post;
}
}
} elseif ( strtolower($thematic_content_length) == 'none') {
@@ -1250,7 +1198,10 @@ if (function_exists('childtheme_override_category_archives')) {
<li id="category-archives" class="content-column">
<h2><?php _e('Archives by Category', 'thematic') ?></h2>
<ul>
- <?php wp_list_categories('optioncount=1&feed=RSS&title_li=&show_count=1') ?>
+ <?php wp_list_categories(array('optioncount' => true,
+ 'feed' => 'RSS',
+ 'title_li' => '',
+ 'show_count' => true)); ?>
</ul>
</li>
<?php }
@@ -1278,7 +1229,8 @@ if (function_exists('childtheme_override_monthly_archives')) {
<li id="monthly-archives" class="content-column">
<h2><?php _e('Archives by Month', 'thematic') ?></h2>
<ul>
- <?php wp_get_archives('type=monthly&show_post_count=1') ?>
+ <?php wp_get_archives(array('type' => 'monthly',
+ 'show_post_count' => true )); ?>
</ul>
</li>
<?php }
@@ -1360,7 +1312,8 @@ add_action( 'thematic_404','thematic_404_content' );
*
*/
function thematic_more_text() {
- $content = sprintf ( __('Read More %s', 'thematic'), '<span class="meta-nav">»</span>' ) ;
+ /* translators: %s is right angle brackets */
+ $content = sprintf ( __('Read More %s', 'thematic'), ' <span class="meta-nav">»</span>');
return apply_filters('more_text', $content);
} // end thematic_more_text
@@ -1372,7 +1325,8 @@ function thematic_more_text() {
*
*/
function thematic_list_bookmarks_args() {
- $content = 'title_before=<h2>&title_after=</h2>';
+ $content = array ( 'title_before' => '<h2>',
+ 'title_after' => '</h2>');
return apply_filters('list_bookmarks_args', $content);
} // end thematic_list_bookmarks_args
@@ -1409,12 +1363,18 @@ if (function_exists('childtheme_override_postfooter')) {
if ( is_single() ) {
$post_type_archive_link = ( function_exists( 'get_post_type_archive_link' ) ? get_post_type_archive_link( $post_type ) : home_url( '/?post_type=' . $post_type ) );
if ( thematic_is_custom_post_type() && $post_type_obj->has_archive ) {
- $postfooter .= __('Browse the ', 'thematic') . '<a href="' . $post_type_archive_link . '" title="' . __('Permalink to ', 'thematic') . $post_type_obj->labels->singular_name . __(' Archive', 'thematic') . '">';
- $postfooter .= $post_type_obj->labels->singular_name . '</a>' . __(' archive', 'thematic') . '. ';
+
+ /* translators: %s is custom post type singular name, wrapped in link tags */
+ $postfooter .= sprintf( __( 'Browse the %s archive.', 'thematic' ),
+ /* translators: %s is custom post type singular name */
+ ' <a href="' . $post_type_archive_link . '" title="' . sprintf( esc_attr__( 'Permalink to %s Archive', 'thematic' ), $post_type_obj->labels->singular_name ) . '">' . $post_type_obj->labels->singular_name . '</a>'
+ );
+ $postfooter .= ' ';
+
}
$postfooter .= thematic_postfooter_posttax();
- $postfooter .= __('Bookmark the ', 'thematic') . '<a href="' . apply_filters('the_permalink', get_permalink()) . '" title="' . __('Permalink to ', 'thematic') . the_title_attribute('echo=0') . '">';
- $postfooter .= __('permalink', 'thematic') . '</a>. ';
+ $postfooter .= sprintf( _x('Bookmark the %1$spermalink%2$s.', '1s and 2s are the a href link wrappers, do not reverse them', 'thematic'), sprintf('<a title="%s" href="%s">', sprintf( esc_attr__('Permalink to %s', 'thematic'), the_title_attribute( 'echo=0' ) ), apply_filters('the_permalink', get_permalink())) , '</a>') . ' ';
+
if ( post_type_supports( $post_type, 'comments') ) {
$postfooter .= thematic_postfooter_postconnect();
}
@@ -1453,11 +1413,13 @@ if (function_exists('childtheme_override_postfooter_posteditlink')) {
*/
function thematic_postfooter_posteditlink() {
- global $id;
-
- $posteditlink = "\n\n\t\t\t\t\t\t" . '<span class="edit"><a href="' . site_url() . '/wp-admin/post.php?action=edit&post=' . $id;
- $posteditlink .= '" title="' . __('Edit post', 'thematic') .'">';
- $posteditlink .= __('Edit', 'thematic') . '</a></span>';
+ $posteditlink = sprintf( '<a href="%s" title="%s" class="edit">%s</a>' ,
+ get_edit_post_link(),
+ esc_attr__('Edit post', 'thematic'),
+ /* translators: post edit link */
+ __('Edit', 'thematic'));
+
+
return apply_filters('thematic_postfooter_posteditlink',$posteditlink);
}
@@ -1568,19 +1530,24 @@ if (function_exists('childtheme_override_postfooter_postcategory')) {
$postcategory = "\n\n\t\t\t\t\t\t" . '<span class="cat-links">';
if (is_single()) {
- $postcategory .= __('This entry was posted in ', 'thematic') . get_the_category_list(', ');
+ /* translators: %s is postfooter categories */
+ $postcategory .= sprintf( __('This entry was posted in %s', 'thematic'), get_the_category_list(', ') );
$postcategory .= '</span>';
$posttags = get_the_tags();
if ( !$posttags ) {
$postcategory .= '. ';
+ } else {
+ //$postcategory .= ' ';
}
} elseif ( is_category() && $cats_meow = thematic_cats_meow(', ') ) { /* Returns categories other than the one queried */
- $postcategory .= __('Also posted in ', 'thematic') . $cats_meow;
- $postcategory .= '</span>' . "\n\n\t\t\t\t\t\t" . '<span class="meta-sep meta-sep-tag-links">|</span>';
+ /* translators: %s is postfooter categories */
+ $postcategory .= sprintf( __('Also posted in %s', 'thematic'), $cats_meow );
+ $postcategory .= '</span>' . "\n\n\t\t\t\t\t\t" . '<span class="meta-sep meta-sep-tag-links">|</span> ';
} else {
- $postcategory .= __('Posted in ', 'thematic') . get_the_category_list(', ');
- $postcategory .= '</span>' . "\n\n\t\t\t\t\t\t" . '<span class="meta-sep meta-sep-tag-links">|</span>';
+ /* translators: %s is postfooter categories */
+ $postcategory .= sprintf( __('Posted in %s', 'thematic'), get_the_category_list(', ') );
+ $postcategory .= '</span>' . "\n\n\t\t\t\t\t\t" . '<span class="meta-sep meta-sep-tag-links">|</span> ';
}
return apply_filters('thematic_postfooter_postcategory',$postcategory);
@@ -1605,15 +1572,15 @@ if (function_exists('childtheme_override_postfooter_posttags')) {
function thematic_postfooter_posttags() {
if ( is_single() && !is_object_in_taxonomy( get_post_type(), 'category' ) ) {
- $tagtext = __(' This entry is tagged', 'thematic');
+ $tagtext = __('This entry is tagged', 'thematic') . ' ';
$posttags = get_the_tag_list("<span class=\"tag-links\"> $tagtext ",', ','</span>. ');
} elseif ( is_single() ) {
- $tagtext = __(' and tagged', 'thematic');
+ $tagtext = __('and tagged', 'thematic') . ' ';
$posttags = get_the_tag_list("<span class=\"tag-links\"> $tagtext ",', ','</span>. ');
} elseif ( is_tag() && $tag_ur_it = thematic_tag_ur_it(', ') ) { /* Returns tags other than the one queried */
- $posttags = '<span class="tag-links">' . __(' Also tagged ', 'thematic') . $tag_ur_it . '</span>' . "\n\n\t\t\t\t\t\t" . '<span class="meta-sep meta-sep-comments-link">|</span> ';
+ $posttags = '<span class="tag-links">' . __('Also tagged', 'thematic') . ' ' . $tag_ur_it . '</span>' . "\n\n\t\t\t\t\t\t" . '<span class="meta-sep meta-sep-comments-link">|</span> ';
} else {
- $tagtext = __('Tagged', 'thematic');
+ $tagtext = __('Tagged', 'thematic') . ' ';
$posttags = get_the_tag_list("<span class=\"tag-links\"> $tagtext ",', ','</span>' . "\n\n\t\t\t\t\t\t" . '<span class="meta-sep meta-sep-comments-link">|</span> ');
}
return apply_filters('thematic_postfooter_posttags',$posttags);
@@ -1639,18 +1606,21 @@ if (function_exists('childtheme_override_postfooter_postcomments')) {
function thematic_postfooter_postcomments() {
if (comments_open()) {
$postcommentnumber = get_comments_number();
- if ($postcommentnumber > '1') {
- $postcomments = ' <span class="comments-link"><a href="' . apply_filters('the_permalink', get_permalink()) . '#comments" title="' . __('Comment on ', 'thematic') . the_title_attribute('echo=0') . '">';
- $postcomments .= get_comments_number() . ' ' . __('Responses', 'thematic') . '</a></span>';
- } elseif ($postcommentnumber == '1') {
- $postcomments = ' <span class="comments-link"><a href="' . apply_filters('the_permalink', get_permalink()) . '#comments" title="' . __('Comment on ', 'thematic') . the_title_attribute('echo=0') . '">';
- $postcomments .= get_comments_number() . ' ' . __('Response', 'thematic') . '</a></span>';
- } elseif ($postcommentnumber == '0') {
- $postcomments = ' <span class="comments-link"><a href="' . apply_filters('the_permalink', get_permalink()) . '#comments" title="' . __('Comment on ', 'thematic') . the_title_attribute('echo=0') . '">';
- $postcomments .= __('Leave a comment', 'thematic') . '</a></span>';
+
+ if ($postcommentnumber > '0') {
+ $postcomments = sprintf('<span class="comments-link"><a href="%s" title="%s" rel="bookmark">%s</a></span>',
+ apply_filters('the_permalink', get_permalink()) . '#respond',
+ sprintf( esc_attr__('Comment on %s', 'thematic'), the_title_attribute( 'echo=0' ) ),
+ /* translators: number of comments and trackbacks */
+ sprintf( _n('%s Response', '%s Responses', $postcommentnumber, 'thematic'), number_format_i18n( $postcommentnumber ) ) );
+ } else {
+ $postcomments = sprintf('<span class="comments-link"><a href="%s" title="%s" rel="bookmark">%s</a></span>',
+ apply_filters('the_permalink', get_permalink()) . '#respond',
+ sprintf( esc_attr__('Comment on %s', 'thematic'), the_title_attribute( 'echo=0' ) ),
+ __('Leave a comment', 'thematic'));
}
} else {
- $postcomments = ' <span class="comments-link comments-closed-link">' . __('Comments closed', 'thematic') .'</span>';
+ $postcomments = '<span class="comments-link comments-closed-link">' . __('Comments closed', 'thematic') .'</span>';
}
return apply_filters('thematic_postfooter_postcomments',$postcomments);
}
@@ -1671,20 +1641,28 @@ if (function_exists('childtheme_override_postfooter_postconnect')) {
* Override: childtheme_override_postfooter_postconnect <br>
* Filter: thematic_postfooter_postconnect
*/
- function thematic_postfooter_postconnect() {
+ function thematic_postfooter_postconnect() {
if ((comments_open()) && (pings_open())) { /* Comments are open */
- $postconnect = ' <a class="comment-link" href="#respond" title ="' . __('Post a comment', 'thematic') . '">' . __('Post a comment', 'thematic') . '</a>';
- $postconnect .= __(' or leave a trackback: ', 'thematic');
- $postconnect .= '<a class="trackback-link" href="' . get_trackback_url() . '" title ="' . __('Trackback URL for your post', 'thematic') . '" rel="trackback">' . __('Trackback URL', 'thematic') . '</a>.';
+ $postconnect = sprintf( _x('%1$sPost a comment%2$s or leave a trackback: %3$s', '1s and 2s are the a href link wrappers, do not reverse them. 3s is trackback url.', 'thematic'),
+ sprintf('<a class="comment-link" title="%s" href="#respond">', esc_attr__('Post a comment', 'thematic')),
+ '</a>' ,
+ sprintf('<a class="trackback-link" href="%s" title ="%s" rel="trackback">%s</a>.',
+ get_trackback_url(),
+ esc_attr__('Trackback URL for your post', 'thematic'),
+ __('Trackback URL', 'thematic'))
+ );
} elseif (!(comments_open()) && (pings_open())) { /* Only trackbacks are open */
- $postconnect = __(' Comments are closed, but you can leave a trackback: ', 'thematic');
- $postconnect .= '<a class="trackback-link" href="' . get_trackback_url() . '" title ="' . __('Trackback URL for your post', 'thematic') . '" rel="trackback">' . __('Trackback URL', 'thematic') . '</a>.';
+ $postconnect = sprintf( _x('Comments are closed, but you can leave a trackback: %s', '%s is trackback url, wrapped in link tags', 'thematic'),
+ sprintf('<a class="trackback-link" href="%s" title="%s" rel="trackback">%s</a>.',
+ get_trackback_url(),
+ esc_attr__('Trackback URL for your post', 'thematic'),
+ __('Trackback URL', 'thematic'))
+ );
} elseif ((comments_open()) && !(pings_open())) { /* Only comments open */
- $postconnect = __(' Trackbacks are closed, but you can ', 'thematic');
- $postconnect .= '<a class="comment-link" href="#respond" title ="' . __('Post a comment', 'thematic') . '">' . __('post a comment', 'thematic') . '</a>.';
+ $postconnect = sprintf( __('Trackbacks are closed, but you can %1$spost a comment%2$s.', '1s and 2s are the a href link wrappers, do not reverse them', 'thematic'), sprintf('<a class="comment-link" title="%s" href="#respond">', esc_attr__('Post a comment', 'thematic')), '</a>');
} elseif (!(comments_open()) && !(pings_open())) { /* Comments and trackbacks closed */
- $postconnect = __(' Both comments and trackbacks are currently closed.', 'thematic');
+ $postconnect = __('Both comments and trackbacks are currently closed.', 'thematic');
}
return apply_filters('thematic_postfooter_postconnect',$postconnect);
}
@@ -1724,8 +1702,11 @@ if (function_exists('childtheme_override_nav_below')) {
<?php if(function_exists('wp_pagenavi')) { ?>
<?php wp_pagenavi(); ?>
<?php } else { ?>
- <div class="nav-previous"><?php next_posts_link(__('<span class="meta-nav">«</span> Older posts', 'thematic')) ?></div>
- <div class="nav-next"><?php previous_posts_link(__('Newer posts <span class="meta-nav">»</span>', 'thematic')) ?></div>
+
+ <div class="nav-previous"><?php next_posts_link(sprintf('<span class="meta-nav">«</span> %s', __('Older posts', 'thematic') ) ) ?></div>
+
+ <div class="nav-next"><?php previous_posts_link(sprintf('%s <span class="meta-nav">»</span>',__( 'Newer posts', 'thematic') ) ) ?></div>
+
<?php } ?>
</div>
diff --git a/wp-content/themes/thematic/library/extensions/discussion-extensions.php b/wp-content/themes/thematic/library/extensions/discussion-extensions.php
index 696a260dbdc855ea2d0639e8f67217b92a8441b4..e1bdd1c352ca71ba7c760af7254434112bc90349 100644
--- a/wp-content/themes/thematic/library/extensions/discussion-extensions.php
+++ b/wp-content/themes/thematic/library/extensions/discussion-extensions.php
@@ -24,10 +24,11 @@ if (function_exists('childtheme_override_commentmeta')) {
*/
function thematic_commentmeta($print = TRUE) {
$content = '<div class="comment-meta">' .
- sprintf( __('Posted %1$s at %2$s <span class="meta-sep">|</span> <a href="%3$s" title="Permalink to this comment">Permalink</a>', 'thematic' ),
- get_comment_date(),
- get_comment_time(),
- '#comment-' . get_comment_ID() );
+ sprintf( _x('Posted %s at %s', 'Posted {$date} at {$time}', 'thematic') ,
+ get_comment_date(),
+ get_comment_time() );
+
+ $content .= ' <span class="meta-sep">|</span> ' . sprintf( '<a href="%1$s" title="%2$s">%3$s</a>', '#comment-' . get_comment_ID() , __( 'Permalink to this comment', 'thematic' ), __( 'Permalink', 'thematic' ) );
if ( get_edit_comment_link() ) {
$content .= sprintf(' <span class="meta-sep">|</span><span class="edit-link"> <a class="comment-edit-link" href="%1$s" title="%2$s">%3$s</a></span>',
diff --git a/wp-content/themes/thematic/library/extensions/discussion.php b/wp-content/themes/thematic/library/extensions/discussion.php
index 8a0606759e0bd3f18b2378a2adce92fcdcab2814..c5641b698d378a2378894542e7e6997ecd235efd 100644
--- a/wp-content/themes/thematic/library/extensions/discussion.php
+++ b/wp-content/themes/thematic/library/extensions/discussion.php
@@ -77,7 +77,7 @@ function thematic_pings($comment, $args, $depth) {
?>
<li id="comment-<?php comment_ID() ?>" <?php comment_class() ?>>
- <div class="comment-author"><?php printf(__('By %1$s on %2$s at %3$s', 'thematic'),
+ <div class="comment-author"><?php printf(_x('By %1$s on %2$s at %3$s', 'By {$authorlink} on {$date} at {$time}', 'thematic'),
get_comment_author_link(),
get_comment_date(),
get_comment_time() );
diff --git a/wp-content/themes/thematic/library/extensions/dynamic-classes.php b/wp-content/themes/thematic/library/extensions/dynamic-classes.php
index f11626e88af6b6a4b7d6c859da2b026748ff3c2f..d9da6b6d1e3e0dea9984a34079b302998d7c9eef 100644
--- a/wp-content/themes/thematic/library/extensions/dynamic-classes.php
+++ b/wp-content/themes/thematic/library/extensions/dynamic-classes.php
@@ -26,21 +26,17 @@ if ( function_exists( 'childtheme_override_body' ) ) {
function thematic_bodyopen() {
if ( apply_filters( 'thematic_show_bodyclass',TRUE ) ) {
// Creating the body class
- if ( ! ( THEMATIC_COMPATIBLE_BODY_CLASS ) ) {
- echo '<body ';
- body_class();
- echo '>' . "\n\n";
- } else {
- echo '<body class="';
- thematic_body_class();
- echo '">' . "\n\n";
- }
+ echo '<body ';
+ body_class();
+ echo '>' . "\n\n";
} else {
echo '<body>' . "\n\n";
}
}
+
if ( function_exists( 'childtheme_override_body_class' ) ) {
+ _deprecated_function( 'childtheme_override_body_class', '1.0.1.3','filter body_class()' );
/**
* @ignore
*/function thematic_body_class() {
@@ -52,7 +48,8 @@ if ( function_exists( 'childtheme_override_body_class' ) ) {
*
* @param bool $print (default: true)
*/
- function thematic_body_class( $print = true ) {
+ function thematic_body_class( $c ) {
+ _deprecated_function( 'thematic_body_class', '1.0.1.3', 'filter body_class()' );
global $wp_query, $current_user, $blog_id, $post, $taxonomy;
$c = array();
@@ -92,9 +89,7 @@ if ( function_exists( 'childtheme_override_body_class' ) ) {
$c[] = 'not-singular';
}
}
-
- // Special classes for BODY element when a single post
- if ( is_single() && apply_filters( 'thematic_show_bc_singlepost', TRUE ) ) {
+ if ( is_single() && apply_filters( 'thematic_show_bc_singlepost', TRUE ) ) {
$postID = $wp_query->post->ID;
the_post();
@@ -102,12 +97,15 @@ if ( function_exists( 'childtheme_override_body_class' ) ) {
$c[] = 'slug-' . $wp_query->post->post_name;
// Adds 'single' class and class with the post ID
- $c[] = 'single postid-' . $postID;
+ $c[] = 'single';
+ $c[] = 'postid-' . $postID;
// Adds classes for the month, day, and hour when the post was published
if ( isset( $wp_query->post->post_date ) )
thematic_date_classes( mysql2date( 'U', $wp_query->post->post_date ), $c, 's-' );
+ // Special classes for BODY element when a single post
+
// Adds category classes for each category on single posts
if ( $cats = get_the_category() )
foreach ( $cats as $cat )
@@ -213,7 +211,8 @@ if ( function_exists( 'childtheme_override_body_class' ) ) {
// Adds post slug class, prefixed by 'slug-'
$c[] = 'slug-' . $wp_query->post->post_name;
- $c[] = 'page pageid-' . $pageID;
+ $c[] = 'page';
+ $c[] = 'pageid-' . $pageID;
$c[] = 'page-author-' . sanitize_title_with_dashes( strtolower( get_the_author_meta( 'user_nicename', $post->post_author) ) );
@@ -304,28 +303,21 @@ if ( function_exists( 'childtheme_override_body_class' ) ) {
}
}
}
-
-
- // Separates classes with a single space, collates classes for BODY
- $c = join( ' ', apply_filters( 'thematic_body_class', $c ) ); // Available filter: thematic_body_class
-
+
// And tada!
- return $print ? print($c) : $c;
+ return array_unique(apply_filters( 'thematic_body_class', $c )); // Available filter: thematic_body_class
}
}
-// Add browser CSS class to the end (queuing through priority) of the body classes
+// Add Legacy Body Classes to body_class()
+if ( current_theme_supports ( 'thematic_legacy_body_class' ) ) {
+ add_filter( 'body_class', 'thematic_body_class', 20 );
+}
-if ( ! ( THEMATIC_COMPATIBLE_BODY_CLASS ) ) {
- add_filter( 'body_class', 'thematic_browser_class_names', 20 );
- }
-
+// Add browser CSS class to the end (queuing through priority) of the body classes
if ( apply_filters( 'thematic_show_bc_browser', TRUE ) ) {
- add_filter( 'thematic_body_class', 'thematic_browser_class_names', 20 );
- }
-
-
-
+ add_filter( 'body_class', 'thematic_browser_class_names', 30 );
+}
/**
* thematic_browser_class_names function.
@@ -419,8 +411,9 @@ function thematic_browser_class_names($classes) {
return $classes;
}
-
+
if (function_exists('childtheme_override_post_class')) {
+ _deprecated_function( 'childtheme_override_post_class', '1.0.1.3', 'filter post_class()' );
/**
* @ignore
*/function thematic_post_class() {
@@ -430,7 +423,9 @@ if (function_exists('childtheme_override_post_class')) {
/**
* Generates semantic classes for each post DIV element
*/
- function thematic_post_class( $print = true ) {
+ function thematic_post_class( $c ) {
+ _deprecated_function( 'thematic_post_class', '1.0.1.3', 'filter post_class()' );
+
global $post, $thematic_post_alt, $thematic_content_length, $taxonomy;
// hentry for hAtom compliace, gets 'alt' for every other post DIV, describes the post type and p[n]
@@ -527,15 +522,15 @@ if (function_exists('childtheme_override_post_class')) {
$c[] = 'alt';
// Adds post slug class, prefixed by 'slug-'
- $c[] = 'slug-' . $post->post_name;
-
- // Separates classes with a single space, collates classes for post DIV
- $c = join( ' ', apply_filters( 'post_class', $c ) ); // Available filter: post_class
+ $c[] = 'slug-' . $post->post_name;
// And tada!
- return $print ? print($c) : $c;
+ return array_unique(apply_filters( 'thematic_post_class', $c )); // Available filter: thematic_post_class
}
}
+if ( current_theme_supports ( 'thematic_legacy_post_class' ) ) {
+ add_filter( 'post_class', 'thematic_post_class', 20 );
+}
/**
* Define the num val for 'alt' classes (in post DIV and comment LI)
diff --git a/wp-content/themes/thematic/library/extensions/header-extensions.php b/wp-content/themes/thematic/library/extensions/header-extensions.php
index 5e9a4734cc0c04ab4ea914eb413a86581ce835eb..579e5331ce9ce0a7401e6d1f1ac7586acd97ccd6 100644
--- a/wp-content/themes/thematic/library/extensions/header-extensions.php
+++ b/wp-content/themes/thematic/library/extensions/header-extensions.php
@@ -86,10 +86,10 @@ function thematic_wptitle( $wp_doctitle, $separator, $sep_location ) {
// otherwise...
$site_name = get_bloginfo('name' , 'display');
- if ( is_single() ) {
+ if ( is_single() || ( is_home() && !is_front_page() ) || ( is_page() && !is_front_page() ) ) {
$content = single_post_title('', FALSE);
}
- elseif ( is_home() || is_front_page() ) {
+ elseif ( is_front_page() ) {
$content = get_bloginfo('description', 'display');
}
elseif ( is_page() ) {
@@ -122,7 +122,7 @@ function thematic_wptitle( $wp_doctitle, $separator, $sep_location ) {
}
if($content) {
- if ( is_home() || is_front_page() ) {
+ if ( is_front_page() ) {
$elements = array(
'site_name' => $site_name,
'separator' => $separator,
@@ -313,7 +313,7 @@ function thematic_show_rss() {
$display = apply_filters('thematic_show_rss', $display);
if ($display) {
$content = '<link rel="alternate" type="application/rss+xml" href="';
- $content .= get_feed_link('rss2_url');
+ $content .= get_feed_link( get_default_feed() );
$content .= '" title="';
$content .= esc_attr( get_bloginfo('name', 'display') );
$content .= ' ' . __('Posts RSS feed', 'thematic');
@@ -337,7 +337,7 @@ function thematic_show_commentsrss() {
$display = apply_filters('thematic_show_commentsrss', $display);
if ($display) {
$content = '<link rel="alternate" type="application/rss+xml" href="';
- $content .= get_feed_link( 'comments_rss2_url' );
+ $content .= get_feed_link( 'comments_' . get_default_feed() );
$content .= '" title="';
$content .= esc_attr( get_bloginfo('name') );
$content .= ' ' . __('Comments RSS feed', 'thematic');
@@ -407,16 +407,17 @@ if ( function_exists('childtheme_override_head_scripts') ) {
if ( is_singular() && comments_open() && get_option( 'thread_comments' ) )
has_filter( 'thematic_show_commentreply' ) ? thematic_show_commentreply() : wp_enqueue_script( 'comment-reply' );
- // load jquery and superfish associated plugins when theme support is active and not in admin
- if ( !is_admin() && current_theme_supports('thematic_superfish') ) {
+ // load jquery and superfish associated plugins when theme support is active
+ if ( current_theme_supports('thematic_superfish') ) {
$scriptdir = get_template_directory_uri();
$scriptdir .= '/library/scripts/';
+
wp_enqueue_script('jquery');
- wp_enqueue_script('hoverIntent');
-
- wp_enqueue_script('superfish', $scriptdir . 'superfish.js', array('jquery') );
- wp_enqueue_script('supersubs', $scriptdir . 'supersubs.js', array('jquery'));
- wp_enqueue_script('thematic-dropdowns', apply_filters('thematic_dropdown_options', $scriptdir . 'thematic-dropdowns.js') , array('jquery', 'superfish' ));
+ wp_deregister_script('hoverIntent');
+ wp_enqueue_script('hoverIntent', includes_url('js/hoverIntent.js'), array('jquery'), false, true);
+ wp_enqueue_script('superfish', $scriptdir . 'superfish.js', array('jquery'), '1.4.8', true);
+ wp_enqueue_script('supersubs', $scriptdir . 'supersubs.js', array('jquery'), '0.2b', true);
+ wp_enqueue_script('thematic-dropdowns', apply_filters('thematic_dropdown_options', $scriptdir . 'thematic-dropdowns.js') , array('jquery', 'superfish' ), '1.0', true);
}
}
diff --git a/wp-content/themes/thematic/library/extensions/shortcodes.php b/wp-content/themes/thematic/library/extensions/shortcodes.php
index f42dc9c05712401b754bf41b5ae370b25d45b2f7..7824ccad063a582d2c7b865a95cb43798f1b238b 100644
--- a/wp-content/themes/thematic/library/extensions/shortcodes.php
+++ b/wp-content/themes/thematic/library/extensions/shortcodes.php
@@ -10,6 +10,8 @@
*
* @package ThematicCoreLibrary
* @subpackage Shortcodes
+ *
+ * @TODO: remove all references to deprecated function, get_theme_data()
*/
@@ -36,10 +38,7 @@ add_shortcode('theme-link', 'thematic_shortcode_framework_link');
* Display link to wp-admin of the site.
*/
function thematic_shortcode_login_link() {
- if ( ! is_user_logged_in() )
- $link = '<a href="' . site_url('/wp-login.php') . '">' . __('Login','thematic') . '</a>';
- else
- $link = '<a href="' . wp_logout_url() . '">' . __('Logout','thematic') . '</a>';
+ $link = wp_loginout( get_permalink(), FALSE );
return apply_filters('loginout', $link);
}
add_shortcode('loginout-link', 'thematic_shortcode_login_link');
@@ -76,7 +75,13 @@ add_shortcode('the-year', 'thematic_shortcode_year');
* Display the name of the parent theme.
*/
function thematic_shortcode_theme_name() {
- return THEMATIC_THEMENAME;
+ if ( function_exists( 'wp_get_theme' ) ) {
+ $frameworkData = wp_get_theme( 'thematic' );
+ return $frameworkData->display( 'Name', false );
+ } else {
+ $frameworkData = get_theme_data( get_template_directory() . '/style.css' );
+ return $frameworkData['Title'];
+ }
}
add_shortcode('theme-name', 'thematic_shortcode_theme_name');
@@ -85,7 +90,13 @@ add_shortcode('theme-name', 'thematic_shortcode_theme_name');
* Display the name of the parent theme author.
*/
function thematic_shortcode_theme_author() {
- return THEMATIC_THEMEAUTHOR;
+ if ( function_exists( 'wp_get_theme' ) ) {
+ $frameworkData = wp_get_theme( 'thematic' );
+ return $frameworkData->display( 'Author', false );
+ } else {
+ $frameworkData = get_theme_data( get_template_directory() . '/style.css' );
+ return $frameworkData['Author'];
+ }
}
add_shortcode('theme-author', 'thematic_shortcode_theme_author');
@@ -94,7 +105,13 @@ add_shortcode('theme-author', 'thematic_shortcode_theme_author');
* Display the URI of the parent theme.
*/
function thematic_shortcode_theme_uri() {
- return THEMATIC_THEMEURI;
+ if ( function_exists( 'wp_get_theme' ) ) {
+ $frameworkData = wp_get_theme( 'thematic' );
+ return $frameworkData->display( 'ThemeURI', false );
+ } else {
+ $frameworkData = get_theme_data( get_template_directory() . '/style.css' );
+ return $frameworkData['URI'];
+ }
}
add_shortcode('theme-uri', 'thematic_shortcode_theme_uri');
@@ -103,7 +120,13 @@ add_shortcode('theme-uri', 'thematic_shortcode_theme_uri');
* Display the version no. of the parent theme.
*/
function thematic_shortcode_theme_version() {
- return THEMATIC_VERSION;
+ if ( function_exists( 'wp_get_theme' ) ) {
+ $frameworkData = wp_get_theme( 'thematic' );
+ return trim( $frameworkData->display('Version', false));
+ } else {
+ $frameworkData = get_theme_data( get_template_directory() . '/style.css' );
+ return trim( $frameworkData['Version'] );
+ }
}
add_shortcode('theme-version', 'thematic_shortcode_theme_version');
@@ -113,7 +136,13 @@ add_shortcode('theme-version', 'thematic_shortcode_theme_version');
* Display the name of the child theme.
*/
function thematic_shortcode_child_name() {
- return THEMATIC_TEMPLATENAME;
+ if ( function_exists( 'wp_get_theme' ) ) {
+ $frameworkData = wp_get_theme();
+ return $frameworkData->display( 'Name', false );
+ } else {
+ $frameworkData = get_theme_data( get_stylesheet_directory() . '/style.css' );
+ return $frameworkData['Title'];
+ }
}
add_shortcode('child-name', 'thematic_shortcode_child_name');
@@ -122,7 +151,13 @@ add_shortcode('child-name', 'thematic_shortcode_child_name');
* Display the name of the child theme author.
*/
function thematic_shortcode_child_author() {
- return THEMATIC_TEMPLATEAUTHOR;
+ if ( function_exists( 'wp_get_theme' ) ) {
+ $frameworkData = wp_get_theme();
+ return $frameworkData->display( 'Author', false );
+ } else {
+ $frameworkData = get_theme_data( get_stylesheet_directory() . '/style.css' );
+ return $frameworkData['Author'];
+ }
}
add_shortcode('child-author', 'thematic_shortcode_child_author');
@@ -131,7 +166,13 @@ add_shortcode('child-author', 'thematic_shortcode_child_author');
* Display the URI of the child theme.
*/
function thematic_shortcode_child_uri() {
- return THEMATIC_TEMPLATEURI;
+ if ( function_exists( 'wp_get_theme' ) ) {
+ $frameworkData = wp_get_theme();
+ return $frameworkData->display( 'ThemeURI', false );
+ } else {
+ $frameworkData = get_theme_data( get_stylesheet_directory() . '/style.css' );
+ return $frameworkData['URI'];
+ }
}
add_shortcode('child-uri', 'thematic_shortcode_child_uri');
@@ -141,6 +182,12 @@ add_shortcode('child-uri', 'thematic_shortcode_child_uri');
*
*/
function thematic_shortcode_child_version() {
- return THEMATIC_TEMPLATEVERSION;
+ if ( function_exists( 'wp_get_theme' ) ) {
+ $frameworkData = wp_get_theme();
+ return trim( $frameworkData->display('Version', false));
+ } else {
+ $frameworkData = get_theme_data( get_stylesheet_directory() . '/style.css' );
+ return trim( $frameworkData['Version'] );
+ }
}
add_shortcode('child-version', 'thematic_shortcode_child_version');
diff --git a/wp-content/themes/thematic/library/extensions/theme-options.php b/wp-content/themes/thematic/library/extensions/theme-options.php
index f03acc92ab82b1ab18219f65a190fe41811643f5..c3eea8f81585e6624f8e2beca2ac70fb08b5c720 100644
--- a/wp-content/themes/thematic/library/extensions/theme-options.php
+++ b/wp-content/themes/thematic/library/extensions/theme-options.php
@@ -167,7 +167,7 @@ function thematic_default_opt() {
function thematic_opt_add_page() {
- $thematic_opt_page = add_theme_page ('Theme Options', 'Theme Options', 'edit_theme_options', 'thematic_opt', 'thematic_do_opt_page');
+ $thematic_opt_page = add_theme_page ( __('Theme Options', 'thematic') , __('Theme Options', 'thematic'), 'edit_theme_options', 'thematic_opt', 'thematic_do_opt_page');
$thematic_opt_page = apply_filters ('thematic_theme_add_opt_page', $thematic_opt_page );
if ( ! $thematic_opt_page ) {
@@ -241,20 +241,30 @@ function thematic_legacy_help() {
* @todo remove Legacy help when two point relases of WP have occurred after 3.3
*/
function thematic_do_legacy_help_section() {
- echo ('<p>'. __( 'For more information about this theme, <a href="http://thematictheme.com">visit ThemeTheme.com</a>. Please visit the <a href="http://thematictheme.com/forums/">ThematicTheme.com Forums</a> if you have any questions about Thematic.', 'thematic' ) .'</p>') ;
+ echo '<p>'. sprintf ( _x( 'For more information about this theme, %1$svisit ThematicTheme.com%2$s', '%1$s and %2$s are <a> tags', 'thematic') , '<a href="http://thematictheme.com">', '</a>') . ' ' . sprintf ( _x( 'Please visit the %1$sThematicTheme.com Forums%2$s if you have any questions about Thematic.', '%1$s and %2$s are <a> tags', 'thematic'), '<a href="http://thematictheme.com/forums/">', '</a>' ) .'</p>' ;
}
-
/**
* Renders the them options page
*
- * @since Thematic 1.0
+ * @since Thematic 1.0
+ * @todo: remove get_current_theme()
*/
function thematic_do_opt_page() { ?>
<div class="wrap">
<?php screen_icon(); ?>
- <h2><?php printf( __( '%s Theme Options', 'thematic' ), get_current_theme() ); ?></h2>
+
+ <?php
+ if ( function_exists( 'wp_get_theme' ) ) {
+ $frameworkData = wp_get_theme();
+ $theme = $frameworkData->display( 'Name', false );
+ } else {
+ $theme = get_current_theme();
+ }
+ ?>
+
+ <h2><?php printf( _x( '%s Theme Options', '{$current theme} Theme Options', 'thematic' ), $theme ); ?></h2>
<?php settings_errors(); ?>
<form action="options.php" method="post" >
@@ -305,7 +315,7 @@ function thematic_do_insert_opt() {
function thematic_do_auth_opt() {
?>
<input id="thm_authorinfo" type="checkbox" value="1" name="thematic_theme_opt[author_info]" <?php checked( thematic_get_theme_opt('author_info') , 1 ); ?> />
- <label for="thm_authorinfo"><?php _e('Display a', 'thematic') ?> <a target="_blank" href="http://microformats.org/wiki/hcard">microformatted vCard</a> <?php _e("with the author's avatar, bio and email on the author page.", 'thematic') ?></label>
+ <label for="thm_authorinfo"><?php printf( _x('Display a %1$smicroformatted vCard%2$s with the author\'s avatar, bio and email on the author page.', '%1$s and %2$s are <a> tags', 'thematic' ) , '<a target="_blank" href="http://microformats.org/wiki/hcard">', '</a>' ); ?></label>
<?php
}
@@ -318,7 +328,7 @@ function thematic_do_auth_opt() {
function thematic_do_footer_opt() {
?>
<textarea rows="5" cols="94" id="thm_footertext" name="thematic_theme_opt[footer_txt]"><?php thematic_get_theme_opt('footer_txt', true ); ?></textarea>
- <br><?php _e('You can use HTML and shortcodes in your footer text. Shortcode examples', 'thematic'); ?>: [wp-link] [theme-link] [loginout-link] [blog-title] [blog-link] [the-year]
+ <br><?php printf( _x('You can use HTML and shortcodes in your footer text. Shortcode examples: %s', '%s are shortcode tags', 'thematic'), '[wp-link] [theme-link] [loginout-link] [blog-title] [blog-link] [the-year]' ); ?>
<?php
}
@@ -327,11 +337,22 @@ function thematic_do_footer_opt() {
* Renders Leagcy Options elements
*
* @since Thematic 1.0
+ * @todo: remove get_current_theme()
*/
function thematic_do_legacy_opt() {
?>
<input id="thm_legacy_opt" type="checkbox" value="1" name="thematic_theme_opt[del_legacy_opt]" <?php checked( thematic_get_theme_opt('del_legacy_opt'), 1 ); ?> />
- <label for="thm_legacy_opt"><?php printf( __( '%s Theme Options have been upgraded to an improved format. Remove the legacy options from the database.', 'thematic' ), get_current_theme() ); ?></label>
+
+ <?php
+ if ( function_exists( 'wp_get_theme' ) ) {
+ $frameworkData = wp_get_theme();
+ $theme = $frameworkData->display( 'Name', false );
+ } else {
+ $theme = get_current_theme();
+ }
+ ?>
+
+ <label for="thm_legacy_opt"><?php printf( _x( '%s Theme Options have been upgraded to an improved format. Remove the legacy options from the database.', '{$current theme} Theme Options', 'thematic' ), $theme ); ?></label>
<?php
}
@@ -367,7 +388,9 @@ if (function_exists('childtheme_override_validate_opt')) {
}
// Author Info CheckBox value either 1(yes) or 0(no)
+ if ( isset( $input['author_info'] ) ) {
$output['author_info'] = ( $input['author_info'] == 0 ? 0 : 1 );
+ }
// Footer Text sanitized allowing HTML and WP shortcodes
if ( isset( $input['footer_txt'] ) ) {
@@ -375,7 +398,9 @@ if (function_exists('childtheme_override_validate_opt')) {
}
// Remove Legacy Options CheckBox value either 1(yes) or 0(no)
- $output['del_legacy_opt'] = ( $input['del_legacy_opt'] == 0 ? 0 : 1 );
+ if ( isset( $input['del_legacy_opt'] ) ) {
+ $output['del_legacy_opt'] = ( $input['del_legacy_opt'] == 0 ? 0 : 1 );
+ }
if ( 1 == $output['del_legacy_opt'] ) {
diff --git a/wp-content/themes/thematic/library/extensions/widgets-extensions.php b/wp-content/themes/thematic/library/extensions/widgets-extensions.php
index 026f0167f548e4b321a043ed8fec5d93df230da3..9bf2c9aa25c6b567232b77f06ec0c25ee1dfb7d6 100644
--- a/wp-content/themes/thematic/library/extensions/widgets-extensions.php
+++ b/wp-content/themes/thematic/library/extensions/widgets-extensions.php
@@ -67,7 +67,7 @@ function thematic_widgets_array() {
'Primary Aside' => array(
'admin_menu_order' => 100,
'args' => array (
- 'name' => 'Primary Aside',
+ 'name' => __( 'Primary Aside', 'thematic' ),
'id' => 'primary-aside',
'description' => __('The primary widget area, most often used as a sidebar.', 'thematic'),
'before_widget' => thematic_before_widget(),
@@ -82,7 +82,7 @@ function thematic_widgets_array() {
'Secondary Aside' => array(
'admin_menu_order' => 200,
'args' => array (
- 'name' => 'Secondary Aside',
+ 'name' => __( 'Secondary Aside', 'thematic' ),
'id' => 'secondary-aside',
'description' => __('The secondary widget area, most often used as a sidebar.', 'thematic'),
'before_widget' => thematic_before_widget(),
@@ -97,7 +97,7 @@ function thematic_widgets_array() {
'1st Subsidiary Aside' => array(
'admin_menu_order' => 300,
'args' => array (
- 'name' => '1st Subsidiary Aside',
+ 'name' => __( '1st Subsidiary Aside', 'thematic' ),
'id' => '1st-subsidiary-aside',
'description' => __('The 1st widget area in the footer.', 'thematic'),
'before_widget' => thematic_before_widget(),
@@ -112,7 +112,7 @@ function thematic_widgets_array() {
'2nd Subsidiary Aside' => array(
'admin_menu_order' => 400,
'args' => array (
- 'name' => '2nd Subsidiary Aside',
+ 'name' => __( '2nd Subsidiary Aside', 'thematic' ),
'id' => '2nd-subsidiary-aside',
'description' => __('The 2nd widget area in the footer.', 'thematic'),
'before_widget' => thematic_before_widget(),
@@ -127,7 +127,7 @@ function thematic_widgets_array() {
'3rd Subsidiary Aside' => array(
'admin_menu_order' => 500,
'args' => array (
- 'name' => '3rd Subsidiary Aside',
+ 'name' => __( '3rd Subsidiary Aside', 'thematic' ),
'id' => '3rd-subsidiary-aside',
'description' => __('The 3rd widget area in the footer.', 'thematic'),
'before_widget' => thematic_before_widget(),
@@ -142,7 +142,7 @@ function thematic_widgets_array() {
'Index Top' => array(
'admin_menu_order' => 600,
'args' => array (
- 'name' => 'Index Top',
+ 'name' => __( 'Index Top', 'thematic' ),
'id' => 'index-top',
'description' => __('The top widget area displayed on the index page.', 'thematic'),
'before_widget' => thematic_before_widget(),
@@ -157,7 +157,7 @@ function thematic_widgets_array() {
'Index Insert' => array(
'admin_menu_order' => 700,
'args' => array (
- 'name' => 'Index Insert',
+ 'name' => __( 'Index Insert', 'thematic' ),
'id' => 'index-insert',
'description' => __('The widget area inserted after x posts on the index page.', 'thematic'),
'before_widget' => thematic_before_widget(),
@@ -172,7 +172,7 @@ function thematic_widgets_array() {
'Index Bottom' => array(
'admin_menu_order' => 800,
'args' => array (
- 'name' => 'Index Bottom',
+ 'name' => __( 'Index Bottom', 'thematic' ),
'id' => 'index-bottom',
'description' => __('The bottom widget area displayed on the index page.', 'thematic'),
'before_widget' => thematic_before_widget(),
@@ -187,7 +187,7 @@ function thematic_widgets_array() {
'Single Top' => array(
'admin_menu_order' => 900,
'args' => array (
- 'name' => 'Single Top',
+ 'name' => __( 'Single Top', 'thematic' ),
'id' => 'single-top',
'description' => __('The top widget area displayed on a single post.', 'thematic'),
'before_widget' => thematic_before_widget(),
@@ -202,7 +202,7 @@ function thematic_widgets_array() {
'Single Insert' => array(
'admin_menu_order' => 1000,
'args' => array (
- 'name' => 'Single Insert',
+ 'name' => __( 'Single Insert', 'thematic' ),
'id' => 'single-insert',
'description' => __('The widget area inserted between the post and the comments on a single post.', 'thematic'),
'before_widget' => thematic_before_widget(),
@@ -217,7 +217,7 @@ function thematic_widgets_array() {
'Single Bottom' => array(
'admin_menu_order' => 1100,
'args' => array (
- 'name' => 'Single Bottom',
+ 'name' => __( 'Single Bottom', 'thematic' ),
'id' => 'single-bottom',
'description' => __('The bottom widget area displayed on a single post.', 'thematic'),
'before_widget' => thematic_before_widget(),
@@ -232,7 +232,7 @@ function thematic_widgets_array() {
'Page Top' => array(
'admin_menu_order' => 1200,
'args' => array (
- 'name' => 'Page Top',
+ 'name' => __( 'Page Top', 'thematic' ),
'id' => 'page-top',
'description' => __('The top widget area displayed on a page.', 'thematic'),
'before_widget' => thematic_before_widget(),
@@ -247,7 +247,7 @@ function thematic_widgets_array() {
'Page Bottom' => array(
'admin_menu_order' => 1300,
'args' => array (
- 'name' => 'Page Bottom',
+ 'name' => __( 'Page Bottom', 'thematic' ),
'id' => 'page-bottom',
'description' => __('The bottom widget area displayed on a page.', 'thematic'),
'before_widget' => thematic_before_widget(),
diff --git a/wp-content/themes/thematic/library/languages/ca.mo b/wp-content/themes/thematic/library/languages/ca.mo
index f18c1229ee3a99cc717fd102ac17f79ee01923dc..84d217cf1020ee1d9721417fa32e86aaca69a555 100644
Binary files a/wp-content/themes/thematic/library/languages/ca.mo and b/wp-content/themes/thematic/library/languages/ca.mo differ
diff --git a/wp-content/themes/thematic/library/languages/ca.po b/wp-content/themes/thematic/library/languages/ca.po
index 7d51c4019ee3c3f18fea95855685519b5ab2af68..35d52444871668077d2871c3bea3f09163374315 100644
--- a/wp-content/themes/thematic/library/languages/ca.po
+++ b/wp-content/themes/thematic/library/languages/ca.po
@@ -1,486 +1,679 @@
-# kubrick theme pot file.
-# Copyright (C) 2007 WordPress
-# This file is distributed under the same license as the kubrick theme package.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: Thematic 0.9\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-12 18:30+0100\n"
-"PO-Revision-Date: 2009-11-11 19:30+0100\n"
-"Last-Translator: Manfred Burkardt <manfred@mabuweb.com>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Poedit-Language: Catalan\n"
-"X-Poedit-Country: SPAIN\n"
-"X-Poedit-SourceCharset: utf-8\n"
-"X-Poedit-KeywordsList: __;_e\n"
-"X-Poedit-Basepath: .\n"
-"X-Poedit-SearchPath-0: ../../../thematic\n"
-
-#: ../../../thematicSVN/404.php:10
-msgid "Apologies, but we were unable to find what you were looking for. Perhaps searching will help."
-msgstr "Perdoneu, però no hem trobat el que busqueu. "
-
-#: ../../../thematicSVN/404.php:15
-#: ../../../thematicSVN/search.php:58
-msgid "Find"
-msgstr "Trobar"
-
-#: ../../../thematicSVN/archive.php:16
-#, php-format
-msgid "Daily Archives: <span>%s</span>"
-msgstr "Arxius diarus: <span>%s</span>"
-
-#: ../../../thematicSVN/archive.php:18
-#, php-format
-msgid "Monthly Archives: <span>%s</span>"
-msgstr "Arxius per mes: <span>%s</span>"
-
-#: ../../../thematicSVN/archive.php:20
-#, php-format
-msgid "Yearly Archives: <span>%s</span>"
-msgstr "Arxius per any: <span>%s</span>"
-
-#: ../../../thematicSVN/archive.php:22
-msgid "Blog Archives"
-msgstr "Arxius de bloc"
-
-#: ../../../thematicSVN/archive.php:31
-#: ../../../thematicSVN/archive.php:53
-#: ../../../thematicSVN/author.php:21
-#: ../../../thematicSVN/author.php:57
-#: ../../../thematicSVN/category.php:20
-#: ../../../thematicSVN/category.php:42
-#: ../../../thematicSVN/index.php:17
-#: ../../../thematicSVN/index.php:49
-#: ../../../thematicSVN/search.php:21
-#: ../../../thematicSVN/search.php:43
-msgid "<span class=\"meta-nav\">«</span> Older posts"
-msgstr "<span class=\"meta-nav\">«</span> Entrades anteriors"
-
-#: ../../../thematicSVN/archive.php:32
-#: ../../../thematicSVN/archive.php:54
-#: ../../../thematicSVN/author.php:22
-#: ../../../thematicSVN/author.php:58
-#: ../../../thematicSVN/category.php:21
-#: ../../../thematicSVN/category.php:43
-#: ../../../thematicSVN/index.php:18
-#: ../../../thematicSVN/index.php:50
-#: ../../../thematicSVN/search.php:22
-#: ../../../thematicSVN/search.php:44
-msgid "Newer posts <span class=\"meta-nav\">»</span>"
-msgstr "Entrades recents <span class=\"meta-nav\">»</span>"
-
-#: ../../../thematicSVN/archive.php:41
-#: ../../../thematicSVN/attachment.php:20
-#: ../../../thematicSVN/author.php:45
-#: ../../../thematicSVN/category.php:30
-#: ../../../thematicSVN/index.php:30
-#: ../../../thematicSVN/search.php:31
-msgid "Read More <span class=\"meta-nav\">»</span>"
-msgstr "Llegir Més <span class=\"meta-nav\">»</span>"
-
-#: ../../../thematicSVN/archives.php:20
-msgid "Archives by Category"
-msgstr "Arxius per categoria"
-
-#: ../../../thematicSVN/archives.php:26
-msgid "Archives by Month"
-msgstr "Arxius per Mes"
-
-#: ../../../thematicSVN/archives.php:32
-#: ../../../thematicSVN/links.php:20
-#: ../../../thematicSVN/page.php:16
-msgid "Edit"
-msgstr "Editar"
-
-#: ../../../thematicSVN/attachment.php:22
-#: ../../../thematicSVN/index.php:32
-msgid "Pages:"
-msgstr "Pàgines:"
-
-#: ../../../thematicSVN/author.php:15
-msgid "Author Archives: "
-msgstr "Arxius de l'autor: "
-
-#: ../../../thematicSVN/author.php:34
-msgid "Email "
-msgstr "Email"
-
-#: ../../../thematicSVN/category.php:13
-msgid "Category Archives:"
-msgstr "Arxius per categoria:"
-
-#: ../../../thematicSVN/comments.php:10
-msgid "This post is password protected. Enter the password to view any comments."
-msgstr "Aquesta entrada està protegida per contrasenya. Poseu la contrasenya per veure els comentaris."
-
-#: ../../../thematicSVN/comments.php:31
-#, php-format
-msgid "<span>%d</span> Comments"
-msgstr "<span>%d</span> Comentaris"
-
-#: ../../../thematicSVN/comments.php:31
-msgid "<span>One</span> Comment"
-msgstr "<span>Un</span> Comentari"
-
-#: ../../../thematicSVN/comments.php:52
-#, php-format
-msgid "<span>%d</span> Trackbacks"
-msgstr "<span>%d</span> Trackbacks"
-
-#: ../../../thematicSVN/comments.php:52
-msgid "<span>One</span> Trackback"
-msgstr "<span>Un</span> Trackback"
-
-#: ../../../thematicSVN/comments.php:67
-msgid "Post a Comment"
-msgstr "Publicar un comentari"
-
-#: ../../../thematicSVN/comments.php:67
-#, php-format
-msgid "Post a Reply to %s"
-msgstr "Respongueu a %s"
-
-#: ../../../thematicSVN/comments.php:72
-#, php-format
-msgid "You must be <a href=\"%s\" title=\"Log in\">logged in</a> to post a comment."
-msgstr "Has de <a href=\"%s\" title=\"Logueado\">obrir una sessió</a> per publicar un comentari."
-
-#: ../../../thematicSVN/comments.php:83
-#, php-format
-msgid "<span class=\"loggedin\">Logged in as <a href=\"%1$s\" title=\"Logged in as %2$s\">%2$s</a>.</span> <span class=\"logout\"><a href=\"%3$s\" title=\"Log out of this account\">Log out?</a></span>"
-msgstr "Sessió onert com <a href=\"%1$s\">%2$s</a>.</span> <span class=\"logout\"><a href=\"%3$s\" title=\"Sortir d'aquest compte\" >¿Sortir?</a></span>"
-
-#: ../../../thematicSVN/comments.php:90
-msgid "Your email is <em>never</em> published nor shared."
-msgstr "El teu correu <em>mai</em> serà compartit o publicat."
-
-#: ../../../thematicSVN/comments.php:90
-msgid "Required fields are marked <span class=\"required\">*</span>"
-msgstr "Els camps obligatoris estàn marcats <span class=\"required\">*</span> "
-
-#: ../../../thematicSVN/comments.php:93
-msgid "Name"
-msgstr "Nom"
-
-#: ../../../thematicSVN/comments.php:93
-#: ../../../thematicSVN/comments.php:98
-msgid "<span class=\"required\">*</span>"
-msgstr "<span class=\"required\">*</span>"
-
-#: ../../../thematicSVN/comments.php:98
-msgid "Email"
-msgstr "Email"
-
-#: ../../../thematicSVN/comments.php:103
-msgid "Website"
-msgstr "Website"
-
-#: ../../../thematicSVN/comments.php:110
-msgid "Comment"
-msgstr "Comentari"
-
-#: ../../../thematicSVN/comments.php:120
-msgid "Post Comment"
-msgstr "Publicar comentari"
-
-#: ../../../thematicSVN/page.php:14
-msgid "Pages: "
-msgstr "Pàgines: "
-
-#: ../../../thematicSVN/search.php:15
-msgid "Search Results for:"
-msgstr "Resultats de la cerca:"
-
-#: ../../../thematicSVN/search.php:51
-msgid "Nothing Found"
-msgstr "No s'ha trobat res"
-
-#: ../../../thematicSVN/search.php:53
-msgid "Sorry, but nothing matched your search criteria. Please try again with some different keywords."
-msgstr "Perdoneu, però no s'ha trobat res. Intenteu amb termes diferents."
-
-#: ../../../thematicSVN/sidebar.php:6
-#: ../../../thematicSVN/sidebar.php:10
-msgid "Search"
-msgstr "Cercar"
-
-#: ../../../thematicSVN/sidebar.php:16
-msgid "Pages"
-msgstr "Pàgines"
-
-#: ../../../thematicSVN/sidebar.php:23
-msgid "Categories"
-msgstr "Categories"
-
-#: ../../../thematicSVN/sidebar.php:31
-msgid "Archives"
-msgstr "Arxius"
-
-#: ../../../thematicSVN/sidebar.php:50
-msgid "RSS Feeds"
-msgstr "RSS-Feeds"
-
-#: ../../../thematicSVN/sidebar.php:52
-#: ../../../thematicSVN/library/extensions/hooks-filters.php:391
-msgid "Posts RSS feed"
-msgstr "Publicar Feed de RSS"
-
-#: ../../../thematicSVN/sidebar.php:52
-msgid "All posts"
-msgstr "Totes les entrades"
-
-#: ../../../thematicSVN/sidebar.php:53
-#: ../../../thematicSVN/library/extensions/hooks-filters.php:409
-msgid "Comments RSS feed"
-msgstr "RSS dels comentaris"
-
-#: ../../../thematicSVN/sidebar.php:53
-msgid "All comments"
-msgstr "Tots els comentaris"
-
-#: ../../../thematicSVN/sidebar.php:58
-msgid "Meta"
-msgstr "Info"
-
-#: ../../../thematicSVN/tag.php:13
-#: ../../../thematicSVN/library/extensions/hooks-filters.php:207
-msgid "Tag Archives:"
-msgstr "Arxius de tags"
-
-#: ../../../thematicSVN/library/extensions/discussion.php:10
-#, php-format
-msgid "Posted %1$s at %2$s <span class=\"meta-sep\">|</span> <a href=\"%3$s\" title=\"Permalink to this comment\">Permalink</a>"
-msgstr "Publicat %1$s en %2$s <span class=\"meta-sep\">|</span> <a href=\"%3$s\" title=\"Permalink a este comentario\">Permalink</a>"
-
-#: ../../../thematicSVN/library/extensions/discussion.php:15
-msgid "\t\t\t\t\t<span class='unapproved'>Your comment is awaiting moderation.</span>\n"
-msgstr "\t\t\t\t\t<span class='unapproved'>El vostre comentari està esperant moderació.</span>\n"
-
-#: ../../../thematicSVN/library/extensions/discussion.php:22
-msgid "Reply"
-msgstr "Respondre"
-
-#: ../../../thematicSVN/library/extensions/discussion.php:23
-msgid "Log in to reply."
-msgstr "Obre una sessió per respondre."
-
-#: ../../../thematicSVN/library/extensions/discussion.php:37
-#, php-format
-msgid "By %1$s on %2$s at %3$s"
-msgstr "Per %1$s el %2$s a les %3$s"
-
-#: ../../../thematicSVN/library/extensions/discussion.php:42
-msgid "\\t\\t\\t\\t\\t<span class=\"unapproved\">Your trackback is awaiting moderation.</span>\\n"
-msgstr "\\t\\t\\t\\t\\t<span class=\"unapproved\">El vostre trackback està esperant moderació.</span>\\n"
-
-#: ../../../thematicSVN/library/extensions/helpers.php:31
-#: ../../../thematicSVN/library/extensions/helpers.php:44
-msgid "There is no excerpt because this is a protected post."
-msgstr "No n'hi ha excerpt perquè aquest post està protegit."
-
-#: ../../../thematicSVN/library/extensions/hooks-filters.php:61
-msgid "Skip navigation to the content"
-msgstr "Saltar navegació al contingut"
-
-#: ../../../thematicSVN/library/extensions/hooks-filters.php:61
-msgid "Skip to content"
-msgstr "Saltar al contingut"
-
-#: ../../../thematicSVN/library/extensions/hooks-filters.php:211
-#: ../../../thematicSVN/library/extensions/hooks-filters.php:498
-msgid "Not Found"
-msgstr "No s'ha trobat"
-
-#: ../../../thematicSVN/library/extensions/hooks-filters.php:490
-#: ../../../thematicSVN/library/extensions/hooks-filters.php:545
-msgid "Edit post"
-msgstr "Editar entrada"
-
-#: ../../../thematicSVN/library/extensions/hooks-filters.php:503
-#: ../../../thematicSVN/library/extensions/hooks-filters.php:598
-msgid "Permalink to "
-msgstr "Permalink de"
-
-#: ../../../thematicSVN/library/extensions/hooks-filters.php:512
-msgid "By "
-msgstr "De "
-
-#: ../../../thematicSVN/library/extensions/hooks-filters.php:514
-msgid "View all posts by "
-msgstr "Veure totes les entrades de "
-
-#: ../../../thematicSVN/library/extensions/hooks-filters.php:517
-msgid "Published: "
-msgstr "Publicat: "
-
-#: ../../../thematicSVN/library/extensions/hooks-filters.php:552
-msgid "This entry was posted in "
-msgstr "Aquesta entrada es va publicar en "
-
-#: ../../../thematicSVN/library/extensions/hooks-filters.php:555
-msgid "Also posted in "
-msgstr "També publicat en "
-
-#: ../../../thematicSVN/library/extensions/hooks-filters.php:558
-msgid "Posted in "
-msgstr "Publicat en "
-
-#: ../../../thematicSVN/library/extensions/hooks-filters.php:565
-msgid " and tagged"
-msgstr "i classificat en "
-
-#: ../../../thematicSVN/library/extensions/hooks-filters.php:568
-msgid " Also tagged "
-msgstr "També classificat en "
-
-#: ../../../thematicSVN/library/extensions/hooks-filters.php:570
-msgid "Tagged"
-msgstr "Etiquetes"
-
-#: ../../../thematicSVN/library/extensions/hooks-filters.php:579
-#: ../../../thematicSVN/library/extensions/hooks-filters.php:582
-#: ../../../thematicSVN/library/extensions/hooks-filters.php:585
-msgid "Comment on "
-msgstr "Comentar "
-
-#: ../../../thematicSVN/library/extensions/hooks-filters.php:580
-msgid " Comments"
-msgstr " Comentaris"
-
-#: ../../../thematicSVN/library/extensions/hooks-filters.php:583
-msgid " Comment"
-msgstr " Comentar"
-
-#: ../../../thematicSVN/library/extensions/hooks-filters.php:586
-msgid "Leave a comment"
-msgstr "Deixeu un comentari"
-
-#: ../../../thematicSVN/library/extensions/hooks-filters.php:589
-msgid "Comments closed"
-msgstr "Comentaris tancats"
-
-#: ../../../thematicSVN/library/extensions/hooks-filters.php:598
-msgid ". Bookmark the "
-msgstr ". Bookmark el "
-
-#: ../../../thematicSVN/library/extensions/hooks-filters.php:599
-msgid "permalink"
-msgstr "permalink"
-
-#: ../../../thematicSVN/library/extensions/hooks-filters.php:601
-#: ../../../thematicSVN/library/extensions/hooks-filters.php:609
-msgid "Post a comment"
-msgstr "Publicar un comentari"
-
-#: ../../../thematicSVN/library/extensions/hooks-filters.php:602
-msgid " or leave a trackback: "
-msgstr " o deixar un trackback: "
-
-#: ../../../thematicSVN/library/extensions/hooks-filters.php:603
-#: ../../../thematicSVN/library/extensions/hooks-filters.php:606
-msgid "Trackback URL for your post"
-msgstr "URL del Trackback per la vostra entrada"
-
-#: ../../../thematicSVN/library/extensions/hooks-filters.php:603
-#: ../../../thematicSVN/library/extensions/hooks-filters.php:606
-msgid "Trackback URL"
-msgstr "URL del Trackback"
-
-#: ../../../thematicSVN/library/extensions/hooks-filters.php:605
-msgid " Comments are closed, but you can leave a trackback: "
-msgstr " Els comentarir estàn tancats, però podeu deixar un trackback: "
-
-#: ../../../thematicSVN/library/extensions/hooks-filters.php:608
-msgid " Trackbacks are closed, but you can "
-msgstr " Els trackbacks estàn tancats però podeu "
-
-#: ../../../thematicSVN/library/extensions/hooks-filters.php:609
-msgid "post a comment"
-msgstr "publicar un comentari"
-
-#: ../../../thematicSVN/library/extensions/hooks-filters.php:611
-msgid " Both comments and trackbacks are currently closed."
-msgstr "Tant els comentaris com els trackbacks estàn tancats."
-
-#: ../../../thematicSVN/library/extensions/shortcodes.php:16
-msgid "Login"
-msgstr "Obrir sessió"
-
-#: ../../../thematicSVN/library/extensions/shortcodes.php:18
-msgid "Logout"
-msgstr "Tancar sessió"
-
-#: ../../../thematicSVN/library/extensions/theme-options.php:13
-msgid "Index Insert Position"
-msgstr "Index d'inserció"
-
-#: ../../../thematicSVN/library/extensions/theme-options.php:14
-msgid "The widgetized Index Insert will follow after this post number."
-msgstr "El widget insertat en \"Index insert\" es mostrarà al redera del post amb aquest nombre."
-
-#: ../../../thematicSVN/library/extensions/theme-options.php:19
-msgid "Info on Author Page"
-msgstr "Informació en la pàgina de l'autor"
-
-#: ../../../thematicSVN/library/extensions/theme-options.php:20
-msgid "Display a <a href=\"http://microformats.org/wiki/hcard\" target=\"_blank\">microformatted vCard</a>—with the author's avatar, bio and email—on the author page."
-msgstr "Mostrar una <a href=\"http://microformats.org/wiki/hcard\" target=\"_blank\">vCard amb microformat</a>—amb el avatar de l'autor, el seu bio i el seu email, en la pàgina de l'autor."
-
-#: ../../../thematicSVN/library/extensions/theme-options.php:25
-msgid "Text in Footer"
-msgstr "Text en el Footer (peu)"
-
-#: ../../../thematicSVN/library/extensions/theme-options.php:26
-msgid "You can use the following shortcodes in your footer text: [wp-link] [theme-link] [loginout-link] [blog-title] [the-year]"
-msgstr "Podeu utilitzar els següents \"shortcodes\" en el text del peu: [wp-link] [theme-link] [loginout-link] [blog-title] [the-year]"
-
-#: ../../../thematicSVN/library/extensions/theme-options.php:28
-msgid "Powered by [wp-link]. Built on the [theme-link]."
-msgstr "Powered by [wp-link]. Dissenyat sobre [theme-link]."
-
-#: ../../../thematicSVN/library/extensions/theme-options.php:76
-msgid "settings saved."
-msgstr "opcions guardats."
-
-#: ../../../thematicSVN/library/extensions/theme-options.php:77
-msgid "settings reset."
-msgstr "opcions reiniciats."
-
-#: ../../../thematicSVN/library/extensions/theme-options.php:78
-msgid "widgets reset."
-msgstr "widgets reiniciats."
-
-#: ../../../thematicSVN/library/extensions/theme-options.php:191
-msgid "Save changes"
-msgstr "Guardar canvis"
-
-#: ../../../thematicSVN/library/extensions/theme-options.php:197
-msgid "Reset"
-msgstr "Reiniciar"
-
-#: ../../../thematicSVN/library/extensions/theme-options.php:203
-msgid "Reset Widgets"
-msgstr "Reiniciar Widgets"
-
-#: ../../../thematicSVN/library/extensions/theme-options.php:208
-msgid "For more information about this theme, <a href=\"http://themeshaper.com\">visit ThemeShaper</a>. Please visit the <a href=\"http://themeshaper.com/forums/\">ThemeShaper Forums</a> if you have any questions about Thematic."
-msgstr "Per a més informació sobre aquest tema, <a href=\"http://themeshaper.com\">visita ThemeShaper</a>. Podeu visitar el <a href=\"http://themeshaper.com/forums/\">Forum de ThemeShaper</a> si teniu preguntes sobre Thematic."
-
-#: ../../../thematicSVN/library/extensions/widgets.php:55
-#: ../../../thematicSVN/library/extensions/widgets.php:245
-#: ../../../thematicSVN/library/extensions/widgets.php:246
-msgid "RSS Links"
-msgstr "Enllaç RSS"
-
-#: ../../../thematicSVN/library/extensions/widgets.php:79
-msgid "Title:"
-msgstr "Títol:"
-
-#~ msgid "Blog Index"
-#~ msgstr "Index del bloc"
-
+# Translation of Thematic 1.0.3 in Catalan
+# This file is distributed under the same license as the Thematic 1.0.3 package.
+msgid ""
+msgstr ""
+"PO-Revision-Date: 2012-10-22 09:59:21+0000\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: GlotPress/0.1\n"
+"Project-Id-Version: Thematic 1.0.3\n"
+
+#: archives.php:20 template-page-blog.php:22
+msgid "The template %s"
+msgstr "La plantilla %s"
+
+#: attachment.php:54 library/extensions/content-extensions.php:630
+#: library/extensions/content-extensions.php:689
+msgid "Pages:"
+msgstr "Pàgines:"
+
+#: author.php:67
+msgid "Email "
+msgstr "Email"
+
+#: comments.php:24
+msgid "Please do not load this page directly."
+msgstr "Si us plau, no carreguis aquesta pàgina directament."
+
+#: comments.php:33
+msgid "This post is password protected. Enter the password to view any comments."
+msgstr "Aquesta entrada està protegida per contrasenya. Poseu la contrasenya per veure els comentaris."
+
+#: comments.php:111
+msgid "Trackbacks"
+msgstr "Trackbacks"
+
+#: comments.php:111
+msgctxt "%1$ and %2$s are <span> tags"
+msgid "%1$sOne%2$s Trackback"
+msgstr "%1$sUn%2$s Trackback"
+
+#: functions.php:194
+msgid "Primary Menu"
+msgstr "Menú Principal"
+
+#: library/extensions/comments-extensions.php:120
+msgctxt "One Comment, where %$1s and %$2s are <span> tags"
+msgid "%1$sOne%2$s Comment"
+msgstr "%1$sUn%2$s Comentari"
+
+#: library/extensions/comments-extensions.php:131
+msgid "Comments"
+msgstr "Comentaris"
+
+#: library/extensions/comments-extensions.php:155
+msgid "Post a Comment"
+msgstr "Publicar un comentari"
+
+#: library/extensions/comments-extensions.php:167
+msgid "Post a Reply to %s"
+msgstr "Respondre a %s"
+
+#: library/extensions/comments-extensions.php:179
+msgctxt "noun"
+msgid "Comment"
+msgstr "Comentari"
+
+#: library/extensions/comments-extensions.php:190
+msgid "Cancel reply"
+msgstr "Cancel·lar resposta"
+
+#: library/extensions/comments-extensions.php:202
+msgid "Post Comment"
+msgstr "Publicar comentari"
+
+#: library/extensions/comments-extensions.php:228
+#: library/legacy/deprecated.php:357
+msgid "Name"
+msgstr "Nom"
+
+#: library/extensions/comments-extensions.php:228
+#: library/extensions/comments-extensions.php:229
+msgctxt "denotes required field"
+msgid "*"
+msgstr "*"
+
+#: library/extensions/comments-extensions.php:229
+#: library/legacy/deprecated.php:362
+msgid "Email"
+msgstr "Email"
+
+#: library/extensions/comments-extensions.php:230
+#: library/legacy/deprecated.php:367
+msgid "Website"
+msgstr "Website"
+
+#: library/extensions/comments-extensions.php:238
+#: library/legacy/deprecated.php:354
+msgctxt "%$1s and %$2s are <em> tags for emphasis on never"
+msgid "Your email is %1$snever%2$s published nor shared."
+msgstr "El teu email %1$smai%2$s serà publicat ni compartit."
+
+#: library/extensions/comments-extensions.php:238
+msgctxt "%$1s and %$2s are <span> tags"
+msgid "Required fields are marked %1$s*%2$s"
+msgstr "Els camps obligatoris estan marcats amb un %1$s*%2$s"
+
+#: library/extensions/comments-extensions.php:240
+#: library/legacy/deprecated.php:336
+msgid "You must be %1$slogged in%2$s to post a comment."
+msgstr "Has d'%1$sobrir una sessió%2$s per a escriure un comentari."
+
+#: library/extensions/comments-extensions.php:240
+#: library/legacy/deprecated.php:336
+msgid "Log in"
+msgstr "Obrir sessió"
+
+#: library/extensions/comments-extensions.php:242
+#: library/legacy/deprecated.php:349
+msgid "Logged in as %s"
+msgstr "Sessió oberta com %s"
+
+#: library/extensions/comments-extensions.php:242
+#: library/legacy/deprecated.php:349
+msgid "Log out of this account"
+msgstr "Tancar la sessió"
+
+#: library/extensions/comments-extensions.php:242
+#: library/legacy/deprecated.php:349
+msgid "Log out?"
+msgstr "Tancar la sessió?"
+
+#: library/extensions/comments-extensions.php:244
+#: library/legacy/deprecated.php:379
+msgctxt "%$1s and %$2s are <abbr> tags"
+msgid "You may use these %1$sHTML%2$s tags and attributes"
+msgstr "Pots utilitzar aquestes etiquetes i atributs %1$sHTML%2$s"
+
+#: library/extensions/content-extensions.php:334
+msgid "Author Archives:"
+msgstr "Autor:"
+
+#: library/extensions/content-extensions.php:339
+#: library/extensions/header-extensions.php:103
+msgid "Category Archives:"
+msgstr "Categoria:"
+
+#: library/extensions/content-extensions.php:347
+#: library/extensions/header-extensions.php:99
+msgid "Search Results for:"
+msgstr "Resultats de la cerca:"
+
+#: library/extensions/content-extensions.php:352
+#: library/extensions/header-extensions.php:107
+msgid "Tag Archives:"
+msgstr "Etiqueta:"
+
+#: library/extensions/content-extensions.php:361
+#: library/extensions/content-extensions.php:368
+msgid "Archives:"
+msgstr "Arxius:"
+
+#: library/extensions/content-extensions.php:373
+msgid "Daily Archives: %s"
+msgstr "Dia: %s"
+
+#: library/extensions/content-extensions.php:377
+msgid "Monthly Archives: %s"
+msgstr "Mes: %s"
+
+#: library/extensions/content-extensions.php:381
+msgid "Yearly Archives: %s"
+msgstr "Any: %s"
+
+#: library/extensions/content-extensions.php:424
+#: library/extensions/content-extensions.php:1706
+msgid "Older posts"
+msgstr "Entrades més antigues"
+
+#: library/extensions/content-extensions.php:426
+#: library/extensions/content-extensions.php:1708
+msgid "Newer posts"
+msgstr "Entrades més recents"
+
+#: library/extensions/content-extensions.php:888
+#: library/extensions/content-extensions.php:1418
+msgid "Edit post"
+msgstr "Editar entrada"
+
+#: library/extensions/content-extensions.php:890
+#: library/extensions/content-extensions.php:1420
+#: library/extensions/discussion-extensions.php:37
+#: library/extensions/discussion.php:84 links.php:54 page.php:52
+#: template-page-archives.php:55 template-page-fullwidth.php:53
+msgid "Edit"
+msgstr "Editar"
+
+#: library/extensions/content-extensions.php:918
+#: library/extensions/header-extensions.php:111
+msgid "Not Found"
+msgstr "No s'ha trobat"
+
+#: library/extensions/content-extensions.php:923
+#: library/extensions/content-extensions.php:1141
+#: library/extensions/content-extensions.php:1145
+#: library/extensions/content-extensions.php:1376
+msgid "Permalink to %s"
+msgstr "Enllaç permanent a %s"
+
+#: library/extensions/content-extensions.php:983
+msgid "By"
+msgstr "Per"
+
+#: library/extensions/content-extensions.php:994
+msgid "View all posts by %s"
+msgstr "Veure totes les entrades escrites per %s"
+
+#: library/extensions/content-extensions.php:1023
+msgid "Published:"
+msgstr "Publicat:"
+
+#: library/extensions/content-extensions.php:1199
+msgid "Archives by Category"
+msgstr "Arxius per Categoria"
+
+#: library/extensions/content-extensions.php:1230
+msgid "Archives by Month"
+msgstr "Arxius per Mes"
+
+#: library/extensions/content-extensions.php:1291
+msgid "Apologies, but we were unable to find what you were looking for. Perhaps searching will help."
+msgstr "Disculpa les molèsties, però no hem pogut trobar el que buscaves. El cercador pot ser-te d'ajuda."
+
+#: library/extensions/content-extensions.php:1297 search.php:70
+msgid "Find"
+msgstr "Trobar"
+
+#: library/extensions/content-extensions.php:1316
+msgid "Read More %s"
+msgstr "Llegir més %s"
+
+#: library/extensions/content-extensions.php:1368
+msgid "Browse the %s archive."
+msgstr "Explorar l'arxiu de %s."
+
+#: library/extensions/content-extensions.php:1370
+msgid "Permalink to %s Archive"
+msgstr "Enllaç permanent a l'arxiu de %s"
+
+#: library/extensions/content-extensions.php:1376
+msgctxt "1s and 2s are the a href link wrappers, do not reverse them"
+msgid "Bookmark the %1$spermalink%2$s."
+msgstr "Guardar l'%1$senllaç permanent%2$s."
+
+#: library/extensions/content-extensions.php:1534
+msgid "This entry was posted in %s"
+msgstr "Aquesta entrada va ser publicada en %s"
+
+#: library/extensions/content-extensions.php:1545
+msgid "Also posted in %s"
+msgstr "També publicada en %s"
+
+#: library/extensions/content-extensions.php:1549
+msgid "Posted in %s"
+msgstr "Publicat en %s"
+
+#: library/extensions/content-extensions.php:1575
+msgid "This entry is tagged"
+msgstr "Aquesta entrada està etiquetada com"
+
+#: library/extensions/content-extensions.php:1578
+msgid "and tagged"
+msgstr "i etiquetada com"
+
+#: library/extensions/content-extensions.php:1581
+msgid "Also tagged"
+msgstr "També etiquetada com"
+
+#: library/extensions/content-extensions.php:1583
+msgid "Tagged"
+msgstr "Etiquetes"
+
+#: library/extensions/content-extensions.php:1613
+#: library/extensions/content-extensions.php:1619
+msgid "Comment on %s"
+msgstr "Comentar en %s"
+
+#: library/extensions/content-extensions.php:1615
+msgid "%s Response"
+msgid_plural "%s Responses"
+msgstr[0] "%s Resposta"
+msgstr[1] "%s Respostes"
+
+#: library/extensions/content-extensions.php:1620
+msgid "Leave a comment"
+msgstr "Deixar un comentari"
+
+#: library/extensions/content-extensions.php:1623
+msgid "Comments closed"
+msgstr "Comentaris tancats"
+
+#: library/extensions/content-extensions.php:1647
+msgctxt "1s and 2s are the a href link wrappers, do not reverse them. 3s is trackback url."
+msgid "%1$sPost a comment%2$s or leave a trackback: %3$s"
+msgstr "%1$sAfegeix un comentari%2$s o deixa un trackback: %3$s"
+
+#: library/extensions/content-extensions.php:1648
+#: library/extensions/content-extensions.php:1663
+msgid "Post a comment"
+msgstr "Publicar un comentari"
+
+#: library/extensions/content-extensions.php:1652
+#: library/extensions/content-extensions.php:1659
+msgid "Trackback URL for your post"
+msgstr "URL del Trackback per a la teva entrada"
+
+#: library/extensions/content-extensions.php:1653
+#: library/extensions/content-extensions.php:1660
+msgid "Trackback URL"
+msgstr "URL del Trackback"
+
+#: library/extensions/content-extensions.php:1656
+msgctxt "%s is trackback url, wrapped in link tags"
+msgid "Comments are closed, but you can leave a trackback: %s"
+msgstr "Els comentaris estan tancats, però pots deixar un trackback: %s"
+
+#: library/extensions/content-extensions.php:1663
+msgid "Trackbacks are closed, but you can %1$spost a comment%2$s."
+msgstr "Els trackbacks estan tancats, però pots %1$safegir un comentari%2$s."
+
+#: library/extensions/content-extensions.php:1665
+msgid "Both comments and trackbacks are currently closed."
+msgstr "Tant els comentaris com els trackbacks estan tancats."
+
+#: library/extensions/discussion-extensions.php:27
+msgctxt "Posted {$date} at {$time}"
+msgid "Posted %s at %s"
+msgstr "Escrit el %s a les %s"
+
+#: library/extensions/discussion-extensions.php:31
+msgid "Permalink to this comment"
+msgstr "Enllaç permanent a aquest comentari"
+
+#: library/extensions/discussion-extensions.php:31
+msgid "Permalink"
+msgstr "Enllaç permanent"
+
+#: library/extensions/discussion-extensions.php:36
+msgid "Edit comment"
+msgstr "Editar comentari"
+
+#: library/extensions/discussion.php:37
+msgid "Your comment is awaiting moderation"
+msgstr "El teu comentari està esperant aprovació"
+
+#: library/extensions/discussion.php:52
+msgid "Reply"
+msgstr "Respondre"
+
+#: library/extensions/discussion.php:53
+msgid "Log in to reply."
+msgstr "Obre una sessió per respondre."
+
+#: library/extensions/discussion.php:80
+msgctxt "By {$authorlink} on {$date} at {$time}"
+msgid "By %1$s on %2$s at %3$s"
+msgstr "Per %1$s el %2$s a les %3$s"
+
+#: library/extensions/discussion.php:90
+msgid "Your trackback is awaiting moderation"
+msgstr "El teu trackback està esperant aprovació"
+
+#: library/extensions/header-extensions.php:319
+#: library/extensions/widgets.php:157
+msgid "Posts RSS feed"
+msgstr "Canal RSS d'entrades"
+
+#: library/extensions/header-extensions.php:343
+#: library/extensions/widgets.php:158
+msgid "Comments RSS feed"
+msgstr "Canal RSS de comentaris"
+
+#: library/extensions/header-extensions.php:642
+msgid "Skip navigation to the content"
+msgstr "Saltar la navegació al contingut"
+
+#: library/extensions/header-extensions.php:642
+msgid "Skip to content"
+msgstr "Saltar al contingut"
+
+#: library/extensions/helpers.php:50 library/extensions/helpers.php:69
+msgid "There is no excerpt because this is a protected post."
+msgstr "No hi ha extracte perquè aquesta entrada està protegida."
+
+#: library/extensions/theme-options.php:50
+msgid "Index Insert Position"
+msgstr "Posició de l'àrea inserida en la portada"
+
+#: library/extensions/theme-options.php:51
+msgid "Info on Author Page"
+msgstr "Informació en la pàgina de l'autor"
+
+#: library/extensions/theme-options.php:52
+msgid "Text in Footer"
+msgstr "Text en el Footer (peu)"
+
+#: library/extensions/theme-options.php:56
+msgid "Remove Legacy Options"
+msgstr "Eliminar opcions heretades"
+
+#: library/extensions/theme-options.php:170
+msgid "Theme Options"
+msgstr "Opcions del tema"
+
+#: library/extensions/theme-options.php:202
+msgid "For more information:"
+msgstr "Per a més informació:"
+
+#: library/extensions/theme-options.php:204
+msgid "For support:"
+msgstr "Suport:"
+
+#: library/extensions/theme-options.php:206
+msgid "forums"
+msgstr "fòrums"
+
+#: library/extensions/theme-options.php:210
+msgid "The options below are enabled by the Thematic Theme framework and/or a child theme."
+msgstr "Les següents opcions estan activades per al framework Thematic Theme i/o un sub-tema."
+
+#: library/extensions/theme-options.php:211
+msgid "New options can be added and the default ones removed by creating a child theme. This contextual help can be customized in a child theme also."
+msgstr "Es poden afegir o eliminar opcions creant un sub-tema. Aquesta ajuda contextual també es pot personalitzar des d'un sub-tema."
+
+#: library/extensions/theme-options.php:217
+msgid "Overview"
+msgstr "Resum"
+
+#: library/extensions/theme-options.php:244
+msgctxt "%1$s and %2$s are <a> tags"
+msgid "For more information about this theme, %1$svisit ThematicTheme.com%2$s"
+msgstr "Per a més informació sobre aquest tema, %1$svisita ThematicTheme.com%2$s"
+
+#: library/extensions/theme-options.php:244
+msgctxt "%1$s and %2$s are <a> tags"
+msgid "Please visit the %1$sThematicTheme.com Forums%2$s if you have any questions about Thematic."
+msgstr "Si us plau visita els %1$sFòrums de ThematicTheme.com%2$s si tens preguntes sobre Thematic."
+
+#: library/extensions/theme-options.php:256
+msgctxt "{$current theme} Theme Options"
+msgid "%s Theme Options"
+msgstr "Opcions del tema %s"
+
+#: library/extensions/theme-options.php:294
+msgid "The Index Insert widget area will appear after this post number. Entering nothing or 0 will disable this feature."
+msgstr "L'àrea inserida en la portada apareixerà després d'aquest número d'entrada. Si no escrius res o escrius 0 es desactivarà aquesta característica."
+
+#: library/extensions/theme-options.php:307
+msgctxt "%1$s and %2$s are <a> tags"
+msgid "Display a %1$smicroformatted vCard%2$s with the author's avatar, bio and email on the author page."
+msgstr "Mostrar una %1$svCard amb microformat%2$s amb l'avatar, la biografia i el correu electrònic de l'autor a la seva pàgina."
+
+#: library/extensions/theme-options.php:320
+msgctxt "%s are shortcode tags"
+msgid "You can use HTML and shortcodes in your footer text. Shortcode examples: %s"
+msgstr "Pots utilitzar HTML i etiquetes en el text del peu de pàgina. Exemples d'etiquetes: %s"
+
+#: library/extensions/theme-options.php:333
+msgctxt "{$current theme} Theme Options"
+msgid "%s Theme Options have been upgraded to an improved format. Remove the legacy options from the database."
+msgstr "Les opcions del tema %s s'han actualitzat a un format millorat. Elimina les opcions antigues de la base de dades."
+
+#: library/extensions/theme-options.php:360
+msgid "The index insert position value must be a number equal to or greater than zero. This setting has been reverted to the previous value."
+msgstr "La posició de l'àrea inserida en la portada ha de ser un número igual o més gran que zero. Aquesta opció ha tornat al seu valor anterior."
+
+#: library/extensions/widgets-extensions.php:34
+msgid "To search, type and hit enter"
+msgstr "Per a buscar, escriu i prem enter"
+
+#: library/extensions/widgets-extensions.php:40
+#: library/extensions/widgets.php:56 library/extensions/widgets.php:61
+msgid "Search"
+msgstr "Cercar"
+
+#: library/extensions/widgets-extensions.php:70
+msgid "Primary Aside"
+msgstr "Barra lateral principal"
+
+#: library/extensions/widgets-extensions.php:72
+msgid "The primary widget area, most often used as a sidebar."
+msgstr "L'àrea de widgets principal, generalment utilitzada com a barra lateral."
+
+#: library/extensions/widgets-extensions.php:85
+msgid "Secondary Aside"
+msgstr "Barra lateral secundària"
+
+#: library/extensions/widgets-extensions.php:87
+msgid "The secondary widget area, most often used as a sidebar."
+msgstr "L'àrea de widgets secundària, generalment utilitzada com a barra lateral."
+
+#: library/extensions/widgets-extensions.php:100
+msgid "1st Subsidiary Aside"
+msgstr "1r bloc secundari"
+
+#: library/extensions/widgets-extensions.php:102
+msgid "The 1st widget area in the footer."
+msgstr "La 1a àrea de widgets en el peu de pàgina."
+
+#: library/extensions/widgets-extensions.php:115
+msgid "2nd Subsidiary Aside"
+msgstr "2n bloc secundari"
+
+#: library/extensions/widgets-extensions.php:117
+msgid "The 2nd widget area in the footer."
+msgstr "La 2a àrea de widgets en el peu de pàgina."
+
+#: library/extensions/widgets-extensions.php:130
+msgid "3rd Subsidiary Aside"
+msgstr "3r bloc secundari"
+
+#: library/extensions/widgets-extensions.php:132
+msgid "The 3rd widget area in the footer."
+msgstr "La 3a àrea de widgets en el peu de pàgina."
+
+#: library/extensions/widgets-extensions.php:145
+msgid "Index Top"
+msgstr "Àrea superior de la portada"
+
+#: library/extensions/widgets-extensions.php:147
+msgid "The top widget area displayed on the index page."
+msgstr "L'àrea de widgets superior mostrada en la portada."
+
+#: library/extensions/widgets-extensions.php:160
+msgid "Index Insert"
+msgstr "Àrea inserida en la portada"
+
+#: library/extensions/widgets-extensions.php:162
+msgid "The widget area inserted after x posts on the index page."
+msgstr "L'àrea de widgets insertada després de x entrades en la portada."
+
+#: library/extensions/widgets-extensions.php:175
+msgid "Index Bottom"
+msgstr "Àrea inferior de la portada"
+
+#: library/extensions/widgets-extensions.php:177
+msgid "The bottom widget area displayed on the index page."
+msgstr "L'àrea de widgets inferior mostrada en la portada."
+
+#: library/extensions/widgets-extensions.php:190
+msgid "Single Top"
+msgstr "Àrea superior d'una entrada"
+
+#: library/extensions/widgets-extensions.php:192
+msgid "The top widget area displayed on a single post."
+msgstr "L'àrea de widgets superior mostrada en una entrada."
+
+#: library/extensions/widgets-extensions.php:205
+msgid "Single Insert"
+msgstr "Àrea d'inserció d'una entrada"
+
+#: library/extensions/widgets-extensions.php:207
+msgid "The widget area inserted between the post and the comments on a single post."
+msgstr "L'àrea de widgets inserida entre l'entrada i el seus comentaris en una entrada."
+
+#: library/extensions/widgets-extensions.php:220
+msgid "Single Bottom"
+msgstr "Àrea inferior d'una entrada"
+
+#: library/extensions/widgets-extensions.php:222
+msgid "The bottom widget area displayed on a single post."
+msgstr "L'àrea de widgets inferior mostrada en una entrada."
+
+#: library/extensions/widgets-extensions.php:235
+msgid "Page Top"
+msgstr "Àrea superior d'una pàgina"
+
+#: library/extensions/widgets-extensions.php:237
+msgid "The top widget area displayed on a page."
+msgstr "L'àrea de widgets superior mostrada en una pàgina."
+
+#: library/extensions/widgets-extensions.php:250
+msgid "Page Bottom"
+msgstr "Àrea inferior d'una entrada"
+
+#: library/extensions/widgets-extensions.php:252
+msgid "The bottom widget area displayed on a page."
+msgstr "L'àrea de widgets inferior mostrada en una pàgina."
+
+#: library/extensions/widgets.php:55
+msgid "A search form for your blog"
+msgstr "Un formulari de cerca per al teu blog"
+
+#: library/extensions/widgets.php:77 library/extensions/widgets.php:132
+#: library/extensions/widgets.php:175
+msgid "Title:"
+msgstr "Títol:"
+
+#: library/extensions/widgets.php:100
+msgid "Log in/out and admin"
+msgstr "Iniciar sessió/Tancar sessió i Administració"
+
+#: library/extensions/widgets.php:101 library/extensions/widgets.php:106
+msgid "Meta"
+msgstr "Info"
+
+#: library/extensions/widgets.php:145
+msgid "Links to your posts and comments feed"
+msgstr "Enllaços als teus canals RSS d'entrades i comentaris"
+
+#: library/extensions/widgets.php:146 library/extensions/widgets.php:151
+msgid "RSS Links"
+msgstr "Enllaços RSS"
+
+#: library/extensions/widgets.php:157
+msgid "All posts"
+msgstr "Totes les entrades"
+
+#: library/extensions/widgets.php:158
+msgid "All comments"
+msgstr "Tots els comentaris"
+
+#: library/legacy/deprecated.php:349
+msgid "Logged in as"
+msgstr "Sessió oberta com"
+
+#: library/legacy/deprecated.php:357 library/legacy/deprecated.php:362
+msgid "<span class=\"required\">*</span>"
+msgstr "<span class=\"required\">*</span>"
+
+#: page.php:50 template-page-fullwidth.php:51
+msgid "Pages: "
+msgstr "Pàgines: "
+
+#: search.php:56
+msgid "Nothing Found"
+msgstr "No s'ha trobat res"
+
+#: search.php:60
+msgid "Sorry, but nothing matched your search criteria. Please try again with some different keywords."
+msgstr "Perdoneu, però no s'ha trobat res. Intenteu amb termes diferents."
+
+#: template-page-blog.php:22
+msgid "You can include a %s in a childtheme"
+msgstr "Pots incloure un %s en un sub-tema"
+
+msgid "Thematic"
+msgstr "Thematic"
+
+msgid "http://thematictheme.com"
+msgstr "http://thematictheme.com"
+
+msgid "The ultimate in SEO-ready themes, Thematic is a highly extensible, WordPress Theme Framework featuring 13 widget-ready areas, drop-down menus, grid-based layout samples, plugin integration, shortcodes for your footer, & a whole lot more. Perfect for any blog and <strong><em>the</em></strong> starting point for theme development."
+msgstr "Un dels millors temes optimitzats per a SEO, Thematic és un framework WordPress molt extensible, amb 13 àrees de widgets, menús desplegables, diversos dissenys de reixeta, integració amb extensions, etiquetes per al teu peu de pàgina, i molt més. Ideal per a un bloc i <strong><em>el</em></strong> punt de partida per al desenvolupament de temes."
+
+msgid "<a href=\"http://themeshaper.com/\">Ian Stewart</a> & <a href=\"http://thematic4you.com/\">Chris Goßmann</a>"
+msgstr "<a href=\"http://themeshaper.com/\">Ian Stewart</a> & <a href=\"http://thematic4you.com/\">Chris Goßmann</a>"
+
+msgid "http://themeshaper.com/"
+msgstr "http://themeshaper.com/"
+
+msgid "white, three-columns, two-columns, fixed-width, theme-options, left-sidebar, right-sidebar, threaded-comments, sticky-post, microformats"
+msgstr "white, three-columns, two-columns, fixed-width, theme-options, left-sidebar, right-sidebar, threaded-comments, sticky-post, microformats"
+
+msgid "Deprecated Archives Template"
+msgstr "Plantilla d'Arxius Obsoleta"
+
+msgid "Links Page"
+msgstr "Pàgina d'Enllaços"
+
+msgid "Archives Page"
+msgstr "Pàgina d'Arxius"
+
+msgid "Deprecated Blog Template"
+msgstr "Plantilla de Blog Obsoleta"
+
+msgid "Full Width"
+msgstr "Amplada Completa"
\ No newline at end of file
diff --git a/wp-content/themes/thematic/library/languages/es_ES.mo b/wp-content/themes/thematic/library/languages/es_ES.mo
index ac3cc76cc41ce5235949a3308048834157b0f73e..58989666f8de9e63be0217b724dc4e801ac33c73 100644
Binary files a/wp-content/themes/thematic/library/languages/es_ES.mo and b/wp-content/themes/thematic/library/languages/es_ES.mo differ
diff --git a/wp-content/themes/thematic/library/languages/es_ES.po b/wp-content/themes/thematic/library/languages/es_ES.po
index dbfdc894ffc8a24fff85e084709d4323e2992a0f..18749b17ca68d39ca32870ba9261872ef91b4c10 100644
--- a/wp-content/themes/thematic/library/languages/es_ES.po
+++ b/wp-content/themes/thematic/library/languages/es_ES.po
@@ -1,548 +1,679 @@
+# Translation of Thematic 1.0.3 in Spanish (Spain)
+# This file is distributed under the same license as the Thematic 1.0.3 package.
msgid ""
msgstr ""
-"Project-Id-Version: Thematic en Español\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-04-27 15:18+0100\n"
-"PO-Revision-Date: 2012-01-23 10:09+0100\n"
-"Last-Translator: Jose Pardilla <info@josepardilla.com>\n"
-"Language-Team: Jose Pardilla <info@josepardilla.com>\n"
+"PO-Revision-Date: 2012-10-22 09:59:06+0000\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Poedit-Language: Spanish\n"
-"X-Poedit-Country: SPAIN\n"
-"X-Poedit-SourceCharset: utf-8\n"
-"X-Poedit-KeywordsList: __;_e\n"
-"X-Poedit-Basepath: ..\\..\\\n"
-"X-Poedit-SearchPath-0: ..\\..\n"
-
-#: c:\users\Chris\Desktop\thematic/archives.php:52
-#: c:\users\Chris\Desktop\thematic/links.php:64
-#: c:\users\Chris\Desktop\thematic/page.php:50
-msgid "Edit"
-msgstr "Editar"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: GlotPress/0.1\n"
+"Project-Id-Version: Thematic 1.0.3\n"
-#: c:\users\Chris\Desktop\thematic/attachment.php:49
+#: archives.php:20 template-page-blog.php:22
+msgid "The template %s"
+msgstr "La plantilla %s"
+
+#: attachment.php:54 library/extensions/content-extensions.php:630
+#: library/extensions/content-extensions.php:689
msgid "Pages:"
msgstr "Páginas:"
-#: c:\users\Chris\Desktop\thematic/author.php:61
+#: author.php:67
msgid "Email "
msgstr "Email"
-#: c:\users\Chris\Desktop\thematic/comments.php:10
+#: comments.php:24
+msgid "Please do not load this page directly."
+msgstr "Por favor, no cargues esta página directamente."
+
+#: comments.php:33
msgid "This post is password protected. Enter the password to view any comments."
msgstr "Esta entrada está protegida por contraseña. Intrdouce la contraseña para ver los comentarios."
-#: c:\users\Chris\Desktop\thematic/comments.php:52
-#, php-format
-msgid "<span>%d</span> Trackbacks"
-msgstr "<span>%d</span> Trackbacks"
-
-#: c:\users\Chris\Desktop\thematic/comments.php:52
-msgid "<span>One</span> Trackback"
-msgstr "<span>Un</span> Trackback"
-
-#: c:\users\Chris\Desktop\thematic/comments.php:74
-#, php-format
-msgid "You must be <a href=\"%s\" title=\"Log in\">logged in</a> to post a comment."
-msgstr "Debes <a href=\"%s\" title=\"iniciar sesión\">iniciar sesión</a> para publicar un comentario."
-
-#: c:\users\Chris\Desktop\thematic/comments.php:85
-#, php-format
-msgid "<span class=\"loggedin\">Logged in as <a href=\"%1$s\" title=\"Logged in as %2$s\">%2$s</a>.</span> <span class=\"logout\"><a href=\"%3$s\" title=\"Log out of this account\">Log out?</a></span>"
-msgstr "Sesión iniciada como <a href=\"%1$s\">%2$s</a>.</span> <span class=\"logout\"><a href=\"%3$s\" title=\"Salir de esta cuenta\" >¿Salir?</a></span>"
-
-#: c:\users\Chris\Desktop\thematic/comments.php:92
-msgid "Your email is <em>never</em> published nor shared."
-msgstr "Tu email <em>nunca</em> será publicado o compartido."
-
-#: c:\users\Chris\Desktop\thematic/comments.php:92
-msgid "Required fields are marked <span class=\"required\">*</span>"
-msgstr "Los campos requeridos están marcados con un <span class=\"required\">*</span> "
-
-#: c:\users\Chris\Desktop\thematic/comments.php:95
-msgid "Name"
-msgstr "Nombre"
-
-#: c:\users\Chris\Desktop\thematic/comments.php:95
-#: c:\users\Chris\Desktop\thematic/comments.php:100
-msgid "<span class=\"required\">*</span>"
-msgstr "<span class=\"required\">*</span>"
-
-#: c:\users\Chris\Desktop\thematic/comments.php:100
-msgid "Email"
-msgstr "Email"
-
-#: c:\users\Chris\Desktop\thematic/comments.php:105
-msgid "Website"
-msgstr "Sitio Web"
-
-#: c:\users\Chris\Desktop\thematic/comments.php:117
-msgid "You may use these <abbr title=\"HyperText Markup Language\">HTML</abbr> tags and attributes:"
-msgstr "Puedes usar estas etiquetas y atributos <abbr title=\"HyperText Markup Language\">HTML</abbr>:"
-
-#: c:\users\Chris\Desktop\thematic/page.php:48
-msgid "Pages: "
-msgstr "Páginas: "
-
-#: c:\users\Chris\Desktop\thematic/search.php:44
-msgid "Nothing Found"
-msgstr "No se ha encontrado nada"
+#: comments.php:111
+msgid "Trackbacks"
+msgstr "Trackbacks"
-#: c:\users\Chris\Desktop\thematic/search.php:46
-msgid "Sorry, but nothing matched your search criteria. Please try again with some different keywords."
-msgstr "Lo sentimos pero no se ha encontrado nada. Por favor, inténtalo de nuevo con otros términos."
+#: comments.php:111
+msgctxt "%1$ and %2$s are <span> tags"
+msgid "%1$sOne%2$s Trackback"
+msgstr "%1$sUn%2$s Trackback"
-#: c:\users\Chris\Desktop\thematic/search.php:51
-msgid "Find"
-msgstr "Buscar"
+#: functions.php:194
+msgid "Primary Menu"
+msgstr "Menú Primario"
-#: c:\users\Chris\Desktop\thematic/library/extensions/comments-extensions.php:76
-msgid "<span>One</span> Comment"
-msgstr "<span>Un</span> Comentario"
+#: library/extensions/comments-extensions.php:120
+msgctxt "One Comment, where %$1s and %$2s are <span> tags"
+msgid "%1$sOne%2$s Comment"
+msgstr "%1$sUn%2$s Comentario"
-#: c:\users\Chris\Desktop\thematic/library/extensions/comments-extensions.php:83
-#, php-format
-msgid "<span>%d</span> Comments"
-msgstr "<span>%d</span> Comentarios"
+#: library/extensions/comments-extensions.php:131
+msgid "Comments"
+msgstr "Comentarios"
-#: c:\users\Chris\Desktop\thematic/library/extensions/comments-extensions.php:96
+#: library/extensions/comments-extensions.php:155
msgid "Post a Comment"
msgstr "Publicar un Comentario"
-#: c:\users\Chris\Desktop\thematic/library/extensions/comments-extensions.php:103
-#, php-format
+#: library/extensions/comments-extensions.php:167
msgid "Post a Reply to %s"
msgstr "Publica una respuesta para %s"
-#: c:\users\Chris\Desktop\thematic/library/extensions/comments-extensions.php:110
+#: library/extensions/comments-extensions.php:179
+msgctxt "noun"
msgid "Comment"
msgstr "Comentario"
-#: c:\users\Chris\Desktop\thematic/library/extensions/comments-extensions.php:118
+#: library/extensions/comments-extensions.php:190
msgid "Cancel reply"
msgstr "Cancelar respuesta"
-#: c:\users\Chris\Desktop\thematic/library/extensions/comments-extensions.php:125
+#: library/extensions/comments-extensions.php:202
msgid "Post Comment"
msgstr "Publicar Comentario"
-#: c:\users\Chris\Desktop\thematic/library/extensions/content-extensions.php:212
-msgid "Author Archives: "
-msgstr "Archivos del autor: "
+#: library/extensions/comments-extensions.php:228
+#: library/legacy/deprecated.php:357
+msgid "Name"
+msgstr "Nombre"
+
+#: library/extensions/comments-extensions.php:228
+#: library/extensions/comments-extensions.php:229
+msgctxt "denotes required field"
+msgid "*"
+msgstr "*"
+
+#: library/extensions/comments-extensions.php:229
+#: library/legacy/deprecated.php:362
+msgid "Email"
+msgstr "Email"
+
+#: library/extensions/comments-extensions.php:230
+#: library/legacy/deprecated.php:367
+msgid "Website"
+msgstr "Sitio Web"
-#: c:\users\Chris\Desktop\thematic/library/extensions/content-extensions.php:218
+#: library/extensions/comments-extensions.php:238
+#: library/legacy/deprecated.php:354
+msgctxt "%$1s and %$2s are <em> tags for emphasis on never"
+msgid "Your email is %1$snever%2$s published nor shared."
+msgstr "Tu email %1$snunca%2$s se publicará ni se compartirá."
+
+#: library/extensions/comments-extensions.php:238
+msgctxt "%$1s and %$2s are <span> tags"
+msgid "Required fields are marked %1$s*%2$s"
+msgstr "Los campos obligatorios están marcados con un %1$s*%2$s"
+
+#: library/extensions/comments-extensions.php:240
+#: library/legacy/deprecated.php:336
+msgid "You must be %1$slogged in%2$s to post a comment."
+msgstr "Debes %1$siniciar una sesión%2$s para escribir un comentario."
+
+#: library/extensions/comments-extensions.php:240
+#: library/legacy/deprecated.php:336
+msgid "Log in"
+msgstr "Iniciar sesión"
+
+#: library/extensions/comments-extensions.php:242
+#: library/legacy/deprecated.php:349
+msgid "Logged in as %s"
+msgstr "Sesión iniciada como %s"
+
+#: library/extensions/comments-extensions.php:242
+#: library/legacy/deprecated.php:349
+msgid "Log out of this account"
+msgstr "Cerrar la sesión"
+
+#: library/extensions/comments-extensions.php:242
+#: library/legacy/deprecated.php:349
+msgid "Log out?"
+msgstr "¿Cerrar la sesión?"
+
+#: library/extensions/comments-extensions.php:244
+#: library/legacy/deprecated.php:379
+msgctxt "%$1s and %$2s are <abbr> tags"
+msgid "You may use these %1$sHTML%2$s tags and attributes"
+msgstr "Puedes usar estas etiquetas y atributos %1$sHTML%2$s"
+
+#: library/extensions/content-extensions.php:334
+msgid "Author Archives:"
+msgstr "Autor:"
+
+#: library/extensions/content-extensions.php:339
+#: library/extensions/header-extensions.php:103
msgid "Category Archives:"
msgstr "Categoría:"
-#: c:\users\Chris\Desktop\thematic/library/extensions/content-extensions.php:227
+#: library/extensions/content-extensions.php:347
+#: library/extensions/header-extensions.php:99
msgid "Search Results for:"
msgstr "Resultados de la búsqueda:"
-#: c:\users\Chris\Desktop\thematic/library/extensions/content-extensions.php:233
+#: library/extensions/content-extensions.php:352
+#: library/extensions/header-extensions.php:107
msgid "Tag Archives:"
msgstr "Etiqueta:"
-#: c:\users\Chris\Desktop\thematic/library/extensions/content-extensions.php:242
-#: c:\users\Chris\Desktop\thematic/library/extensions/content-extensions.php:250
+#: library/extensions/content-extensions.php:361
+#: library/extensions/content-extensions.php:368
msgid "Archives:"
msgstr "Archivos:"
-#: c:\users\Chris\Desktop\thematic/library/extensions/content-extensions.php:256
-#, php-format
-msgid "Daily Archives: <span>%s</span>"
-msgstr "Archivos del día: <span>%s</span>"
-
-#: c:\users\Chris\Desktop\thematic/library/extensions/content-extensions.php:260
-#, php-format
-msgid "Monthly Archives: <span>%s</span>"
-msgstr "Archivos del mes: <span>%s</span>"
-
-#: c:\users\Chris\Desktop\thematic/library/extensions/content-extensions.php:264
-#, php-format
-msgid "Yearly Archives: <span>%s</span>"
-msgstr "Archivos del año: <span>%s</span>"
-
-#: c:\users\Chris\Desktop\thematic/library/extensions/content-extensions.php:268
-msgid "Blog Archives"
-msgstr "Archivos del blog"
-
-#: c:\users\Chris\Desktop\thematic/library/extensions/content-extensions.php:298
-#: c:\users\Chris\Desktop\thematic/library/extensions/content-extensions.php:1243
-msgid "<span class=\"meta-nav\">«</span> Older posts"
-msgstr "<span class=\"meta-nav\">«</span> Entradas anteriores"
-
-#: c:\users\Chris\Desktop\thematic/library/extensions/content-extensions.php:299
-#: c:\users\Chris\Desktop\thematic/library/extensions/content-extensions.php:1244
-msgid "Newer posts <span class=\"meta-nav\">»</span>"
-msgstr "Entradas posteriores <span class=\"meta-nav\">»</span>"
-
-#: c:\users\Chris\Desktop\thematic/library/extensions/content-extensions.php:672
-#: c:\users\Chris\Desktop\thematic/library/extensions/content-extensions.php:1041
+#: library/extensions/content-extensions.php:373
+msgid "Daily Archives: %s"
+msgstr "Día: %s"
+
+#: library/extensions/content-extensions.php:377
+msgid "Monthly Archives: %s"
+msgstr "Mes: %s"
+
+#: library/extensions/content-extensions.php:381
+msgid "Yearly Archives: %s"
+msgstr "Año: %s"
+
+#: library/extensions/content-extensions.php:424
+#: library/extensions/content-extensions.php:1706
+msgid "Older posts"
+msgstr "Entradas más antiguas"
+
+#: library/extensions/content-extensions.php:426
+#: library/extensions/content-extensions.php:1708
+msgid "Newer posts"
+msgstr "Entradas más recientes"
+
+#: library/extensions/content-extensions.php:888
+#: library/extensions/content-extensions.php:1418
msgid "Edit post"
msgstr "Editar entrada"
-#: c:\users\Chris\Desktop\thematic/library/extensions/content-extensions.php:692
+#: library/extensions/content-extensions.php:890
+#: library/extensions/content-extensions.php:1420
+#: library/extensions/discussion-extensions.php:37
+#: library/extensions/discussion.php:84 links.php:54 page.php:52
+#: template-page-archives.php:55 template-page-fullwidth.php:53
+msgid "Edit"
+msgstr "Editar"
+
+#: library/extensions/content-extensions.php:918
+#: library/extensions/header-extensions.php:111
msgid "Not Found"
msgstr "No Encontrado"
-#: c:\users\Chris\Desktop\thematic/library/extensions/content-extensions.php:697
-#: c:\users\Chris\Desktop\thematic/library/extensions/content-extensions.php:1001
-#: c:\users\Chris\Desktop\thematic/library/extensions/content-extensions.php:1006
-msgid "Permalink to "
-msgstr "Enlace permanente a "
+#: library/extensions/content-extensions.php:923
+#: library/extensions/content-extensions.php:1141
+#: library/extensions/content-extensions.php:1145
+#: library/extensions/content-extensions.php:1376
+msgid "Permalink to %s"
+msgstr "Enlace permanente a %s"
-#: c:\users\Chris\Desktop\thematic/library/extensions/content-extensions.php:742
-msgid "By "
-msgstr "Por "
+#: library/extensions/content-extensions.php:983
+msgid "By"
+msgstr "Por"
-#: c:\users\Chris\Desktop\thematic/library/extensions/content-extensions.php:745
-msgid "View all posts by "
-msgstr "Ver todas las entradas escritas por "
+#: library/extensions/content-extensions.php:994
+msgid "View all posts by %s"
+msgstr "Ver todas las entradas escritas por %s"
-#: c:\users\Chris\Desktop\thematic/library/extensions/content-extensions.php:763
-msgid "Published: "
-msgstr "Publicado: "
+#: library/extensions/content-extensions.php:1023
+msgid "Published:"
+msgstr "Publicado:"
-#: c:\users\Chris\Desktop\thematic/library/extensions/content-extensions.php:888
+#: library/extensions/content-extensions.php:1199
msgid "Archives by Category"
msgstr "Archivos por Categoría"
-#: c:\users\Chris\Desktop\thematic/library/extensions/content-extensions.php:907
+#: library/extensions/content-extensions.php:1230
msgid "Archives by Month"
msgstr "Archivos por Mes"
-#: c:\users\Chris\Desktop\thematic/library/extensions/content-extensions.php:950
-msgid "Apologies, but we were unable to find what you were looking for. Perhaps searching will help."
-msgstr "Lo sentimos, pero no hemos podido encontrar lo que buscas. Prueba usando la búsqueda."
+#: library/extensions/content-extensions.php:1291
+msgid "Apologies, but we were unable to find what you were looking for. Perhaps searching will help."
+msgstr "Disculpa las molestias, pero no hemos podido encontrar lo que buscabas. El buscador puede serte de ayuda."
-#: c:\users\Chris\Desktop\thematic/library/extensions/content-extensions.php:967
-msgid "Read More <span class=\"meta-nav\">»</span>"
-msgstr "Leer Más <span class=\"meta-nav\">»</span>"
-
-#: c:\users\Chris\Desktop\thematic/library/extensions/content-extensions.php:1001
-msgid "Browse the "
-msgstr "Navegar por el"
+#: library/extensions/content-extensions.php:1297 search.php:70
+msgid "Find"
+msgstr "Buscar"
-#: c:\users\Chris\Desktop\thematic/library/extensions/content-extensions.php:1001
-msgid " Archive"
-msgstr "Archivo:"
+#: library/extensions/content-extensions.php:1316
+msgid "Read More %s"
+msgstr "Leer más %s"
-#: c:\users\Chris\Desktop\thematic/library/extensions/content-extensions.php:1002
-msgid " archive"
-msgstr "archivo"
+#: library/extensions/content-extensions.php:1368
+msgid "Browse the %s archive."
+msgstr "Explorar el archivo de %s."
-#: c:\users\Chris\Desktop\thematic/library/extensions/content-extensions.php:1006
-msgid "Bookmark the "
-msgstr "Guarda el "
+#: library/extensions/content-extensions.php:1370
+msgid "Permalink to %s Archive"
+msgstr "Enlace permanente al archivo de %s"
-#: c:\users\Chris\Desktop\thematic/library/extensions/content-extensions.php:1007
-msgid "permalink"
-msgstr "enlace permanente"
+#: library/extensions/content-extensions.php:1376
+msgctxt "1s and 2s are the a href link wrappers, do not reverse them"
+msgid "Bookmark the %1$spermalink%2$s."
+msgstr "Guardar el %1$senlace permanente%2$s."
-#: c:\users\Chris\Desktop\thematic/library/extensions/content-extensions.php:1123
-msgid "This entry was posted in "
-msgstr "Esta entrada fue publicada en "
+#: library/extensions/content-extensions.php:1534
+msgid "This entry was posted in %s"
+msgstr "Esta entrada fue publicada en %s"
-#: c:\users\Chris\Desktop\thematic/library/extensions/content-extensions.php:1131
-msgid "Also posted in "
-msgstr "También publicada en "
+#: library/extensions/content-extensions.php:1545
+msgid "Also posted in %s"
+msgstr "También publicado en %s"
-#: c:\users\Chris\Desktop\thematic/library/extensions/content-extensions.php:1134
-msgid "Posted in "
-msgstr "Entrada publicada en "
+#: library/extensions/content-extensions.php:1549
+msgid "Posted in %s"
+msgstr "Publicado en %s"
-#: c:\users\Chris\Desktop\thematic/library/extensions/content-extensions.php:1152
-msgid " This entry is tagged"
-msgstr " Esta entrada está etiquetada con"
+#: library/extensions/content-extensions.php:1575
+msgid "This entry is tagged"
+msgstr "Esta entrada está etiquetada como"
-#: c:\users\Chris\Desktop\thematic/library/extensions/content-extensions.php:1155
-msgid " and tagged"
-msgstr " y clasificada en"
+#: library/extensions/content-extensions.php:1578
+msgid "and tagged"
+msgstr "y etiquetada como"
-#: c:\users\Chris\Desktop\thematic/library/extensions/content-extensions.php:1158
-msgid " Also tagged "
-msgstr " También etiquetada con "
+#: library/extensions/content-extensions.php:1581
+msgid "Also tagged"
+msgstr "También etiquetada como"
-#: c:\users\Chris\Desktop\thematic/library/extensions/content-extensions.php:1160
+#: library/extensions/content-extensions.php:1583
msgid "Tagged"
msgstr "Etiquetas:"
-#: c:\users\Chris\Desktop\thematic/library/extensions/content-extensions.php:1179
-#: c:\users\Chris\Desktop\thematic/library/extensions/content-extensions.php:1182
-#: c:\users\Chris\Desktop\thematic/library/extensions/content-extensions.php:1185
-msgid "Comment on "
-msgstr "Comentar en "
-
-#: c:\users\Chris\Desktop\thematic/library/extensions/content-extensions.php:1180
-msgid " Comments"
-msgstr " Comentarios"
+#: library/extensions/content-extensions.php:1613
+#: library/extensions/content-extensions.php:1619
+msgid "Comment on %s"
+msgstr "Comentar en %s"
-#: c:\users\Chris\Desktop\thematic/library/extensions/content-extensions.php:1183
-msgid " Comment"
-msgstr " Comentario"
+#: library/extensions/content-extensions.php:1615
+msgid "%s Response"
+msgid_plural "%s Responses"
+msgstr[0] "%s Respuesta"
+msgstr[1] "%s Respuestas"
-#: c:\users\Chris\Desktop\thematic/library/extensions/content-extensions.php:1186
+#: library/extensions/content-extensions.php:1620
msgid "Leave a comment"
msgstr "Dejar un comentario"
-#: c:\users\Chris\Desktop\thematic/library/extensions/content-extensions.php:1189
+#: library/extensions/content-extensions.php:1623
msgid "Comments closed"
msgstr "Comentarios cerrados"
-#: c:\users\Chris\Desktop\thematic/library/extensions/content-extensions.php:1205
-#: c:\users\Chris\Desktop\thematic/library/extensions/content-extensions.php:1213
+#: library/extensions/content-extensions.php:1647
+msgctxt "1s and 2s are the a href link wrappers, do not reverse them. 3s is trackback url."
+msgid "%1$sPost a comment%2$s or leave a trackback: %3$s"
+msgstr "%1$sAñade un comentario%2$s o deja un trackback: %3$s"
+
+#: library/extensions/content-extensions.php:1648
+#: library/extensions/content-extensions.php:1663
msgid "Post a comment"
msgstr "Publica un comentario"
-#: c:\users\Chris\Desktop\thematic/library/extensions/content-extensions.php:1206
-msgid " or leave a trackback: "
-msgstr " o deja un trackback: "
-
-#: c:\users\Chris\Desktop\thematic/library/extensions/content-extensions.php:1207
-#: c:\users\Chris\Desktop\thematic/library/extensions/content-extensions.php:1210
+#: library/extensions/content-extensions.php:1652
+#: library/extensions/content-extensions.php:1659
msgid "Trackback URL for your post"
msgstr "URL del Trackback para tu entrada"
-#: c:\users\Chris\Desktop\thematic/library/extensions/content-extensions.php:1207
-#: c:\users\Chris\Desktop\thematic/library/extensions/content-extensions.php:1210
+#: library/extensions/content-extensions.php:1653
+#: library/extensions/content-extensions.php:1660
msgid "Trackback URL"
msgstr "URL del Trackback"
-#: c:\users\Chris\Desktop\thematic/library/extensions/content-extensions.php:1209
-msgid " Comments are closed, but you can leave a trackback: "
-msgstr " Los comentarios están cerrados, pero puedes dejar un trackback: "
+#: library/extensions/content-extensions.php:1656
+msgctxt "%s is trackback url, wrapped in link tags"
+msgid "Comments are closed, but you can leave a trackback: %s"
+msgstr "Los comentarios están cerrados, pero puedes dejar un trackback: %s"
+
+#: library/extensions/content-extensions.php:1663
+msgid "Trackbacks are closed, but you can %1$spost a comment%2$s."
+msgstr "Los trackbacks están cerrados, pero puedes %1$sañadir un comentario%2$s."
-#: c:\users\Chris\Desktop\thematic/library/extensions/content-extensions.php:1212
-msgid " Trackbacks are closed, but you can "
-msgstr " Los trackbacks están cerrados, pero puedes "
+#: library/extensions/content-extensions.php:1665
+msgid "Both comments and trackbacks are currently closed."
+msgstr "Tanto los comentarios como los trackbacks están cerrados."
-#: c:\users\Chris\Desktop\thematic/library/extensions/content-extensions.php:1213
-msgid "post a comment"
-msgstr "publicar un comentario"
+#: library/extensions/discussion-extensions.php:27
+msgctxt "Posted {$date} at {$time}"
+msgid "Posted %s at %s"
+msgstr "Escrito el %s a las %s"
-#: c:\users\Chris\Desktop\thematic/library/extensions/content-extensions.php:1215
-msgid " Both comments and trackbacks are currently closed."
-msgstr " Tanto los comentarios como los trackbacks están cerrados."
+#: library/extensions/discussion-extensions.php:31
+msgid "Permalink to this comment"
+msgstr "Enlace permanente a este comentario"
-#: c:\users\Chris\Desktop\thematic/library/extensions/discussion-extensions.php:13
-#, php-format
-msgid "Posted %1$s at %2$s <span class=\"meta-sep\">|</span> <a href=\"%3$s\" title=\"Permalink to this comment\">Permalink</a>"
-msgstr "Publicado: %1$s a las %2$s <span class=\"meta-sep\">|</span> <a href=\"%3$s\" title=\"Enlace permanente a este comentario\">Enlace permanente</a>"
+#: library/extensions/discussion-extensions.php:31
+msgid "Permalink"
+msgstr "Enlace permanente"
-#: c:\users\Chris\Desktop\thematic/library/extensions/discussion-extensions.php:21
+#: library/extensions/discussion-extensions.php:36
msgid "Edit comment"
msgstr "Editar comentario"
-#: c:\users\Chris\Desktop\thematic/library/extensions/discussion.php:12
-msgid "\t\t\t\t\t<span class='unapproved'>Your comment is awaiting moderation.</span>\n"
-msgstr "\t\t\t\t\t<span class='unapproved'>Tu comentario está esperando moderación.</span>\n"
+#: library/extensions/discussion.php:37
+msgid "Your comment is awaiting moderation"
+msgstr "Tu comentario está esperando aprobación"
-#: c:\users\Chris\Desktop\thematic/library/extensions/discussion.php:19
+#: library/extensions/discussion.php:52
msgid "Reply"
msgstr "Respuesta"
-#: c:\users\Chris\Desktop\thematic/library/extensions/discussion.php:20
+#: library/extensions/discussion.php:53
msgid "Log in to reply."
msgstr "Inicia sesión para responder."
-#: c:\users\Chris\Desktop\thematic/library/extensions/discussion.php:35
-#, php-format
+#: library/extensions/discussion.php:80
+msgctxt "By {$authorlink} on {$date} at {$time}"
msgid "By %1$s on %2$s at %3$s"
msgstr "Por %1$s el %2$s a las %3$s"
-#: c:\users\Chris\Desktop\thematic/library/extensions/discussion.php:40
-msgid "\\t\\t\\t\\t\\t<span class=\"unapproved\">Your trackback is awaiting moderation.</span>\\n"
-msgstr "\\t\\t\\t\\t\\t<span class=\"unapproved\">Tu trackback está esperando moderación.</span>\\n"
+#: library/extensions/discussion.php:90
+msgid "Your trackback is awaiting moderation"
+msgstr "Tu trackback está esperando aprobación"
-#: c:\users\Chris\Desktop\thematic/library/extensions/header-extensions.php:262
-#: c:\users\Chris\Desktop\thematic/library/extensions/widgets.php:138
+#: library/extensions/header-extensions.php:319
+#: library/extensions/widgets.php:157
msgid "Posts RSS feed"
msgstr "Canal RSS de entradas"
-#: c:\users\Chris\Desktop\thematic/library/extensions/header-extensions.php:280
-#: c:\users\Chris\Desktop\thematic/library/extensions/widgets.php:139
+#: library/extensions/header-extensions.php:343
+#: library/extensions/widgets.php:158
msgid "Comments RSS feed"
msgstr "Canal RSS de comentarios"
-#: c:\users\Chris\Desktop\thematic/library/extensions/header-extensions.php:357
-msgid "Primary Menu"
-msgstr "Menú Primario"
-
-#: c:\users\Chris\Desktop\thematic/library/extensions/header-extensions.php:467
+#: library/extensions/header-extensions.php:642
msgid "Skip navigation to the content"
msgstr "Saltar la navegación al contenido"
-#: c:\users\Chris\Desktop\thematic/library/extensions/header-extensions.php:467
+#: library/extensions/header-extensions.php:642
msgid "Skip to content"
msgstr "Saltar al contenido"
-#: c:\users\Chris\Desktop\thematic/library/extensions/helpers.php:31
-#: c:\users\Chris\Desktop\thematic/library/extensions/helpers.php:44
+#: library/extensions/helpers.php:50 library/extensions/helpers.php:69
msgid "There is no excerpt because this is a protected post."
msgstr "No hay ningún extracto porque esta entrada esta protegida."
-#: c:\users\Chris\Desktop\thematic/library/extensions/shortcodes.php:16
-msgid "Login"
-msgstr "Iniciar Sesión"
-
-#: c:\users\Chris\Desktop\thematic/library/extensions/shortcodes.php:18
-msgid "Logout"
-msgstr "Cerrar Sesión"
-
-#: c:\users\Chris\Desktop\thematic/library/extensions/theme-options.php:13
+#: library/extensions/theme-options.php:50
msgid "Index Insert Position"
-msgstr "Widget incrustado de la Portada"
+msgstr "Posición del área insertada en la portada"
-#: c:\users\Chris\Desktop\thematic/library/extensions/theme-options.php:14
-msgid "The widgetized Index Insert will follow after this post number."
-msgstr "El widget de la Portada se colocará a partir de esta entrada."
-
-#: c:\users\Chris\Desktop\thematic/library/extensions/theme-options.php:19
+#: library/extensions/theme-options.php:51
msgid "Info on Author Page"
msgstr "Info en Página de Autor"
-#: c:\users\Chris\Desktop\thematic/library/extensions/theme-options.php:20
-msgid "Display a <a href=\"http://microformats.org/wiki/hcard\" target=\"_blank\">microformatted vCard</a> - with the author's avatar, bio and email - on the author page."
-msgstr "Mostrar una <a href=\"http://microformats.org/wiki/hcard\" target=\"_blank\">vCard microformateada</a> - con el avatar, biografía y email del autor- en la página de autor."
-
-#: c:\users\Chris\Desktop\thematic/library/extensions/theme-options.php:25
+#: library/extensions/theme-options.php:52
msgid "Text in Footer"
msgstr "Texto en Pie de Página"
-#: c:\users\Chris\Desktop\thematic/library/extensions/theme-options.php:26
-msgid "You can use the following shortcodes in your footer text: [wp-link] [theme-link] [loginout-link] [blog-title] [blog-link] [the-year]"
-msgstr "Puedes usar estas etiquetas abreviadas en el pie de página: [wp-link] [theme-link] [loginout-link] [blog-title] [blog-link] [the-year]"
-
-#: c:\users\Chris\Desktop\thematic/library/extensions/theme-options.php:28
-msgid "Powered by [wp-link]. Built on the [theme-link]."
-msgstr "Funcionando gracias a [wp-link]. Diseñado con el [theme-link]."
-
-#: c:\users\Chris\Desktop\thematic/library/extensions/theme-options.php:115
-msgid "settings saved."
-msgstr "opciones guardadas."
-
-#: c:\users\Chris\Desktop\thematic/library/extensions/theme-options.php:116
-msgid "settings reset."
-msgstr "opciones originales reestablecidas."
-
-#: c:\users\Chris\Desktop\thematic/library/extensions/theme-options.php:117
-msgid "widgets reset."
-msgstr "widgets originales reestablecidos."
-
-#: c:\users\Chris\Desktop\thematic/library/extensions/theme-options.php:286
-msgid "Save changes"
-msgstr "Guardar cambios"
-
-#: c:\users\Chris\Desktop\thematic/library/extensions/theme-options.php:293
-msgid "Reset"
-msgstr "Reestablecer"
-
-#: c:\users\Chris\Desktop\thematic/library/extensions/theme-options.php:300
-msgid "Reset Widgets"
-msgstr "Reestablecer Widgets"
-
-#: c:\users\Chris\Desktop\thematic/library/extensions/theme-options.php:305
-msgid "For more information about this theme, <a href=\"http://themeshaper.com\">visit ThemeShaper</a>. Please visit the <a href=\"http://themeshaper.com/forums/\">ThemeShaper Forums</a> if you have any questions about Thematic."
-msgstr "Para más información sobre este tema, <a href=\"http://themeshaper.com\">visita ThemeShaper</a>. Puedes visitar el <a href=\"http://themeshaper.com/forums/\">Foro de ThemeShaper</a> si tienes cualquier pregunta acerca de Thematic."
-
-#: c:\users\Chris\Desktop\thematic/library/extensions/widgets-extensions.php:13
+#: library/extensions/theme-options.php:56
+msgid "Remove Legacy Options"
+msgstr "Eliminar opciones heredadas"
+
+#: library/extensions/theme-options.php:170
+msgid "Theme Options"
+msgstr "Opciones del tema"
+
+#: library/extensions/theme-options.php:202
+msgid "For more information:"
+msgstr "Para más información:"
+
+#: library/extensions/theme-options.php:204
+msgid "For support:"
+msgstr "Soporte:"
+
+#: library/extensions/theme-options.php:206
+msgid "forums"
+msgstr "foros"
+
+#: library/extensions/theme-options.php:210
+msgid "The options below are enabled by the Thematic Theme framework and/or a child theme."
+msgstr "Las opciones siguientes están activadas por el framework Thematic Theme y/o un sub-tema."
+
+#: library/extensions/theme-options.php:211
+msgid "New options can be added and the default ones removed by creating a child theme. This contextual help can be customized in a child theme also."
+msgstr "Se pueden añadir o eliminar opciones creando un sub-tema. Esta ayuda contextual también se puede personalizar desde un sub-tema."
+
+#: library/extensions/theme-options.php:217
+msgid "Overview"
+msgstr "Resumen"
+
+#: library/extensions/theme-options.php:244
+msgctxt "%1$s and %2$s are <a> tags"
+msgid "For more information about this theme, %1$svisit ThematicTheme.com%2$s"
+msgstr "Para más información acerca de este tema, %1$svisita ThematicTheme.com%2$s"
+
+#: library/extensions/theme-options.php:244
+msgctxt "%1$s and %2$s are <a> tags"
+msgid "Please visit the %1$sThematicTheme.com Forums%2$s if you have any questions about Thematic."
+msgstr "Por favor, visita los %1$sForos de ThematicTheme.com%2$s si tienes dudas acerca de Thematic."
+
+#: library/extensions/theme-options.php:256
+msgctxt "{$current theme} Theme Options"
+msgid "%s Theme Options"
+msgstr "Opciones del tema %s"
+
+#: library/extensions/theme-options.php:294
+msgid "The Index Insert widget area will appear after this post number. Entering nothing or 0 will disable this feature."
+msgstr "El área insertada en la portada aparecerá después de este número de entrada. Si no escribes nada o escribes 0 se desactivará esta característica."
+
+#: library/extensions/theme-options.php:307
+msgctxt "%1$s and %2$s are <a> tags"
+msgid "Display a %1$smicroformatted vCard%2$s with the author's avatar, bio and email on the author page."
+msgstr "Mostrar una %1$svCard con microformato%2$s con el avatar, la biografía y el correo electrónico del autor en su página."
+
+#: library/extensions/theme-options.php:320
+msgctxt "%s are shortcode tags"
+msgid "You can use HTML and shortcodes in your footer text. Shortcode examples: %s"
+msgstr "Puedes usar HTML y etiquetas en el texto del pie de página. Ejemplos de etiquetas: %s"
+
+#: library/extensions/theme-options.php:333
+msgctxt "{$current theme} Theme Options"
+msgid "%s Theme Options have been upgraded to an improved format. Remove the legacy options from the database."
+msgstr "Las opciones del tema %s se han actualizado a un formato mejorado. Elimina las opciones antiguas de la base de datos."
+
+#: library/extensions/theme-options.php:360
+msgid "The index insert position value must be a number equal to or greater than zero. This setting has been reverted to the previous value."
+msgstr "La posición del área insertada en la portada debe ser un número igual o mayor que cero. Esta opción ha vuelto a su valor anterior."
+
+#: library/extensions/widgets-extensions.php:34
msgid "To search, type and hit enter"
msgstr "Para buscar, escribe y pulsa enter"
-#: c:\users\Chris\Desktop\thematic/library/extensions/widgets-extensions.php:19
-#: c:\users\Chris\Desktop\thematic/library/extensions/widgets.php:37
-#: c:\users\Chris\Desktop\thematic/library/extensions/widgets.php:42
+#: library/extensions/widgets-extensions.php:40
+#: library/extensions/widgets.php:56 library/extensions/widgets.php:61
msgid "Search"
msgstr "Buscar"
-#: c:\users\Chris\Desktop\thematic/library/extensions/widgets-extensions.php:42
+#: library/extensions/widgets-extensions.php:70
+msgid "Primary Aside"
+msgstr "Barra lateral principal"
+
+#: library/extensions/widgets-extensions.php:72
msgid "The primary widget area, most often used as a sidebar."
-msgstr "El area de widgets principal, generalmente usada como barra lateral."
+msgstr "El área de widgets principal, generalmente usada como barra lateral."
+
+#: library/extensions/widgets-extensions.php:85
+msgid "Secondary Aside"
+msgstr "Barra lateral secundaria"
-#: c:\users\Chris\Desktop\thematic/library/extensions/widgets-extensions.php:57
+#: library/extensions/widgets-extensions.php:87
msgid "The secondary widget area, most often used as a sidebar."
-msgstr "El area de widgets secundaria, generalmente usada como barra lateral secundaria."
+msgstr "El área de widgets secundaria, generalmente usada como barra lateral secundaria."
+
+#: library/extensions/widgets-extensions.php:100
+msgid "1st Subsidiary Aside"
+msgstr "1º bloque secundario"
-#: c:\users\Chris\Desktop\thematic/library/extensions/widgets-extensions.php:72
+#: library/extensions/widgets-extensions.php:102
msgid "The 1st widget area in the footer."
-msgstr "La primera área de widgets del pie de página."
+msgstr "La primera área de widgets del pie de página."
-#: c:\users\Chris\Desktop\thematic/library/extensions/widgets-extensions.php:87
+#: library/extensions/widgets-extensions.php:115
+msgid "2nd Subsidiary Aside"
+msgstr "2º bloque secundario"
+
+#: library/extensions/widgets-extensions.php:117
msgid "The 2nd widget area in the footer."
-msgstr "La segunda área de widgets del pie de página."
+msgstr "La segunda área de widgets del pie de página."
+
+#: library/extensions/widgets-extensions.php:130
+msgid "3rd Subsidiary Aside"
+msgstr "3º bloque secundario"
-#: c:\users\Chris\Desktop\thematic/library/extensions/widgets-extensions.php:102
+#: library/extensions/widgets-extensions.php:132
msgid "The 3rd widget area in the footer."
-msgstr "La tercera área de widgets del pie de página."
+msgstr "La tercera área de widgets del pie de página."
-#: c:\users\Chris\Desktop\thematic/library/extensions/widgets-extensions.php:117
+#: library/extensions/widgets-extensions.php:145
+msgid "Index Top"
+msgstr "Área superior de la portada"
+
+#: library/extensions/widgets-extensions.php:147
msgid "The top widget area displayed on the index page."
-msgstr "El área de widgets superior mostrada en la portada."
+msgstr "El área de widgets superior mostrada en la portada."
+
+#: library/extensions/widgets-extensions.php:160
+msgid "Index Insert"
+msgstr "Área insertada en la portada"
-#: c:\users\Chris\Desktop\thematic/library/extensions/widgets-extensions.php:132
+#: library/extensions/widgets-extensions.php:162
msgid "The widget area inserted after x posts on the index page."
-msgstr "El área de widgets insertada después de X entradas en la portada."
+msgstr "El área de widgets insertada después de x entradas en la portada."
-#: c:\users\Chris\Desktop\thematic/library/extensions/widgets-extensions.php:147
+#: library/extensions/widgets-extensions.php:175
+msgid "Index Bottom"
+msgstr "Área inferior de la portada"
+
+#: library/extensions/widgets-extensions.php:177
msgid "The bottom widget area displayed on the index page."
-msgstr "El área de widgets inferior mostrada en la portada."
+msgstr "El área de widgets inferior mostrada en la portada."
+
+#: library/extensions/widgets-extensions.php:190
+msgid "Single Top"
+msgstr "Área superior de una entrada"
-#: c:\users\Chris\Desktop\thematic/library/extensions/widgets-extensions.php:162
+#: library/extensions/widgets-extensions.php:192
msgid "The top widget area displayed on a single post."
-msgstr "El área de widgets superior mostrada en una entrada."
+msgstr "El área de widgets superior mostrada en una entrada."
+
+#: library/extensions/widgets-extensions.php:205
+msgid "Single Insert"
+msgstr "Área de inserción de una entrada"
-#: c:\users\Chris\Desktop\thematic/library/extensions/widgets-extensions.php:177
+#: library/extensions/widgets-extensions.php:207
msgid "The widget area inserted between the post and the comments on a single post."
-msgstr "El área de widgets insertada entre una entrada y sus comentarios."
+msgstr "El área de widgets insertada entre la entrada y sus comentarios en una entrada."
-#: c:\users\Chris\Desktop\thematic/library/extensions/widgets-extensions.php:192
+#: library/extensions/widgets-extensions.php:220
+msgid "Single Bottom"
+msgstr "Área inferior de una entrada"
+
+#: library/extensions/widgets-extensions.php:222
msgid "The bottom widget area displayed on a single post."
-msgstr "El área de widgets inferior mostrada en una entrada."
+msgstr "El área de widgets inferior mostrada en una entrada."
+
+#: library/extensions/widgets-extensions.php:235
+msgid "Page Top"
+msgstr "Área superior de una página"
-#: c:\users\Chris\Desktop\thematic/library/extensions/widgets-extensions.php:207
+#: library/extensions/widgets-extensions.php:237
msgid "The top widget area displayed on a page."
-msgstr "El área de widgets superior mostrada en una página."
+msgstr "El área de widgets superior mostrada en una página."
-#: c:\users\Chris\Desktop\thematic/library/extensions/widgets-extensions.php:222
+#: library/extensions/widgets-extensions.php:250
+msgid "Page Bottom"
+msgstr "Área inferior de una página"
+
+#: library/extensions/widgets-extensions.php:252
msgid "The bottom widget area displayed on a page."
-msgstr "El área de widgets inferior mostrada en una página."
+msgstr "El área de widgets inferior mostrada en una página."
-#: c:\users\Chris\Desktop\thematic/library/extensions/widgets.php:36
+#: library/extensions/widgets.php:55
msgid "A search form for your blog"
msgstr "Un formulario de búsqueda para tu blog"
-#: c:\users\Chris\Desktop\thematic/library/extensions/widgets.php:58
-#: c:\users\Chris\Desktop\thematic/library/extensions/widgets.php:113
-#: c:\users\Chris\Desktop\thematic/library/extensions/widgets.php:156
-#: c:\users\Chris\Desktop\thematic/library/extensions/widgets.php:174
+#: library/extensions/widgets.php:77 library/extensions/widgets.php:132
+#: library/extensions/widgets.php:175
msgid "Title:"
msgstr "Título:"
-#: c:\users\Chris\Desktop\thematic/library/extensions/widgets.php:81
+#: library/extensions/widgets.php:100
msgid "Log in/out and admin"
-msgstr "Log in/out y admin"
+msgstr "Iniciar sesión/Cerrar sesión y Administración"
-#: c:\users\Chris\Desktop\thematic/library/extensions/widgets.php:82
-#: c:\users\Chris\Desktop\thematic/library/extensions/widgets.php:87
+#: library/extensions/widgets.php:101 library/extensions/widgets.php:106
msgid "Meta"
msgstr "Meta"
-#: c:\users\Chris\Desktop\thematic/library/extensions/widgets.php:126
+#: library/extensions/widgets.php:145
msgid "Links to your posts and comments feed"
-msgstr "Enlace a tu fuente RSS de entradas y comentarios"
+msgstr "Enlaces a tus canales RSS de entradas y comentarios"
-#: c:\users\Chris\Desktop\thematic/library/extensions/widgets.php:127
-#: c:\users\Chris\Desktop\thematic/library/extensions/widgets.php:132
+#: library/extensions/widgets.php:146 library/extensions/widgets.php:151
msgid "RSS Links"
msgstr "Enlaces RSS"
-#: c:\users\Chris\Desktop\thematic/library/extensions/widgets.php:138
+#: library/extensions/widgets.php:157
msgid "All posts"
msgstr "Todas las entradas"
-#: c:\users\Chris\Desktop\thematic/library/extensions/widgets.php:139
+#: library/extensions/widgets.php:158
msgid "All comments"
msgstr "Todos los comentarios"
+#: library/legacy/deprecated.php:349
+msgid "Logged in as"
+msgstr "Sesión iniciada como"
+
+#: library/legacy/deprecated.php:357 library/legacy/deprecated.php:362
+msgid "<span class=\"required\">*</span>"
+msgstr "<span class=\"required\">*</span>"
+
+#: page.php:50 template-page-fullwidth.php:51
+msgid "Pages: "
+msgstr "Páginas: "
+
+#: search.php:56
+msgid "Nothing Found"
+msgstr "No se ha encontrado nada"
+
+#: search.php:60
+msgid "Sorry, but nothing matched your search criteria. Please try again with some different keywords."
+msgstr "Lo sentimos pero no se ha encontrado nada. Por favor, inténtalo de nuevo con otros términos."
+
+#: template-page-blog.php:22
+msgid "You can include a %s in a childtheme"
+msgstr "Puedes incluir un %s en un sub-tema"
+
+msgid "Thematic"
+msgstr "Thematic"
+
+msgid "http://thematictheme.com"
+msgstr "http://thematictheme.com"
+
+msgid "The ultimate in SEO-ready themes, Thematic is a highly extensible, WordPress Theme Framework featuring 13 widget-ready areas, drop-down menus, grid-based layout samples, plugin integration, shortcodes for your footer, & a whole lot more. Perfect for any blog and <strong><em>the</em></strong> starting point for theme development."
+msgstr "Uno de los mejores temas optimizados para SEO, Thematic es un framework WordPress muy extensible, con 13 áreas de widgets, menús desplegables, varios diseños de rejilla, integración con extensiones, etiquetas para tu pie de página, y mucho más. Ideal para un blog y <strong><em>el</em></strong> punto de partida para el desarrollo de temas."
+
+msgid "<a href=\"http://themeshaper.com/\">Ian Stewart</a> & <a href=\"http://thematic4you.com/\">Chris Goßmann</a>"
+msgstr "<a href=\"http://themeshaper.com/\">Ian Stewart</a> & <a href=\"http://thematic4you.com/\">Chris Goßmann</a>"
+
+msgid "http://themeshaper.com/"
+msgstr "http://themeshaper.com/"
+
+msgid "white, three-columns, two-columns, fixed-width, theme-options, left-sidebar, right-sidebar, threaded-comments, sticky-post, microformats"
+msgstr "white, three-columns, two-columns, fixed-width, theme-options, left-sidebar, right-sidebar, threaded-comments, sticky-post, microformats"
+
+msgid "Deprecated Archives Template"
+msgstr "Plantilla de Archivos Obsoleta"
+
+msgid "Links Page"
+msgstr "Página de Enlaces"
+
+msgid "Archives Page"
+msgstr "Página de Archivos"
+
+msgid "Deprecated Blog Template"
+msgstr "Plantilla de Blog Obsoleta"
+
+msgid "Full Width"
+msgstr "Ancho Completo"
\ No newline at end of file
diff --git a/wp-content/themes/thematic/library/languages/et.mo b/wp-content/themes/thematic/library/languages/et.mo
index ff0f31f043061217895df0777c2c0e91c7aca62d..6c332deb8797accf650a30519223845e3d568b94 100644
Binary files a/wp-content/themes/thematic/library/languages/et.mo and b/wp-content/themes/thematic/library/languages/et.mo differ
diff --git a/wp-content/themes/thematic/library/languages/et.po b/wp-content/themes/thematic/library/languages/et.po
index 7e773128eb873f83452220cd31aa09b5866b6e6a..9a9bcedb1af4963c77809b1d49544c37e45ee712 100644
--- a/wp-content/themes/thematic/library/languages/et.po
+++ b/wp-content/themes/thematic/library/languages/et.po
@@ -1,511 +1,679 @@
+# Translation of Thematic 1.0.3 in Estonian
+# This file is distributed under the same license as the Thematic 1.0.3 package.
msgid ""
msgstr ""
-"Project-Id-Version: Thematic raamistiku tõlge\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-18 20:58+0100\n"
-"PO-Revision-Date: \n"
-"Last-Translator: Peeter Marvet <pets@tehnokratt.net>\n"
-"Language-Team: Peeter Marvet <pets@tehnokratt.net>\n"
+"PO-Revision-Date: 2012-09-02 09:54:11+0000\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Poedit-SourceCharset: utf-8\n"
-"X-Poedit-KeywordsList: __;_e\n"
-"X-Poedit-Basepath: .\n"
-"X-Poedit-Language: Estonian\n"
-"X-Poedit-Country: ESTONIA\n"
-"X-Poedit-SearchPath-0: ../..\n"
-
-#: /Users/peetermarvet/Sites/localize/thematic/archives.php:42
-#: /Users/peetermarvet/Sites/localize/thematic/links.php:53
-#: /Users/peetermarvet/Sites/localize/thematic/page.php:40
-msgid "Edit"
-msgstr "Muuda"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: GlotPress/0.1\n"
+"Project-Id-Version: Thematic 1.0.3\n"
-#: /Users/peetermarvet/Sites/localize/thematic/attachment.php:39
+#: archives.php:20 template-page-blog.php:22
+msgid "The template %s"
+msgstr "Põhi %s"
+
+#: attachment.php:54 library/extensions/content-extensions.php:630
+#: library/extensions/content-extensions.php:689
msgid "Pages:"
msgstr "Lehed:"
-#: /Users/peetermarvet/Sites/localize/thematic/author.php:53
+#: author.php:67
msgid "Email "
msgstr "E-post "
-#: /Users/peetermarvet/Sites/localize/thematic/comments.php:10
+#: comments.php:24
+msgid "Please do not load this page directly."
+msgstr "Selle lehe poole ei tasu otse pöörduda."
+
+#: comments.php:33
msgid "This post is password protected. Enter the password to view any comments."
msgstr "See postitus on salasõnaga kaitstud. Kommentaaride nägemiseks sisesta salasõna."
-#: /Users/peetermarvet/Sites/localize/thematic/comments.php:52
-#, php-format
-msgid "<span>%d</span> Trackbacks"
-msgstr "<span>%d</span> trackback-viidet"
+#: comments.php:111
+msgid "Trackbacks"
+msgstr "Trackback-viited"
-#: /Users/peetermarvet/Sites/localize/thematic/comments.php:52
-msgid "<span>One</span> Trackback"
-msgstr "<span>Üks</span> trackback-viide"
+#: comments.php:111
+msgctxt "%1$ and %2$s are <span> tags"
+msgid "%1$sOne%2$s Trackback"
+msgstr "%1$sÜks%2$s trackback-viide"
-#: /Users/peetermarvet/Sites/localize/thematic/comments.php:72
-#, php-format
-msgid "You must be <a href=\"%s\" title=\"Log in\">logged in</a> to post a comment."
-msgstr "Kommenteerimiseks tuleb <a href=\"%s\" title=\"Log in\">sisse logida</a>."
+#: functions.php:194
+msgid "Primary Menu"
+msgstr "Põhimenüü"
-#: /Users/peetermarvet/Sites/localize/thematic/comments.php:83
-#, php-format
-msgid "<span class=\"loggedin\">Logged in as <a href=\"%1$s\" title=\"Logged in as %2$s\">%2$s</a>.</span> <span class=\"logout\"><a href=\"%3$s\" title=\"Log out of this account\">Log out?</a></span>"
-msgstr "<span class=\"loggedin\">Oled loginud sisse kasutajana <a href=\"%1$s\" title=\"Oled loginud sisse kasutajana %2$s\">%2$s</a>.</span> <span class=\"logout\"><a href=\"%3$s\" title=\"Logi välja\">Logi välja?</a></span>"
+#: library/extensions/comments-extensions.php:120
+msgctxt "One Comment, where %$1s and %$2s are <span> tags"
+msgid "%1$sOne%2$s Comment"
+msgstr "%1$sÜks%2$s kommentaar"
-#: /Users/peetermarvet/Sites/localize/thematic/comments.php:90
-msgid "Your email is <em>never</em> published nor shared."
-msgstr "Sinu e-posti ei avaldata ega jagata <em>ealeski</em>."
+#: library/extensions/comments-extensions.php:131
+msgid "Comments"
+msgstr "Kommentaarid"
-#: /Users/peetermarvet/Sites/localize/thematic/comments.php:90
-msgid "Required fields are marked <span class=\"required\">*</span>"
-msgstr "Kohustuslikke välju tähistab <span class=\"required\">*</span>"
+#: library/extensions/comments-extensions.php:155
+msgid "Post a Comment"
+msgstr "Lisa kommentaar"
+
+#: library/extensions/comments-extensions.php:167
+msgid "Post a Reply to %s"
+msgstr "Vasta kommentaarile %s"
+
+#: library/extensions/comments-extensions.php:179
+msgctxt "noun"
+msgid "Comment"
+msgstr "Kommentaar"
+
+#: library/extensions/comments-extensions.php:190
+msgid "Cancel reply"
+msgstr "Katkesta vastamine"
+
+#: library/extensions/comments-extensions.php:202
+msgid "Post Comment"
+msgstr "Lisa kommentaar"
-#: /Users/peetermarvet/Sites/localize/thematic/comments.php:93
+#: library/extensions/comments-extensions.php:228
+#: library/legacy/deprecated.php:357
msgid "Name"
msgstr "Nimi"
-#: /Users/peetermarvet/Sites/localize/thematic/comments.php:93
-#: /Users/peetermarvet/Sites/localize/thematic/comments.php:98
-msgid "<span class=\"required\">*</span>"
-msgstr "<span class=\"required\">*</span>"
+#: library/extensions/comments-extensions.php:228
+#: library/extensions/comments-extensions.php:229
+msgctxt "denotes required field"
+msgid "*"
+msgstr "*"
-#: /Users/peetermarvet/Sites/localize/thematic/comments.php:98
+#: library/extensions/comments-extensions.php:229
+#: library/legacy/deprecated.php:362
msgid "Email"
msgstr "E-post"
-#: /Users/peetermarvet/Sites/localize/thematic/comments.php:103
+#: library/extensions/comments-extensions.php:230
+#: library/legacy/deprecated.php:367
msgid "Website"
msgstr "Veebileht"
-#: /Users/peetermarvet/Sites/localize/thematic/comments.php:115
-msgid "You may use these <abbr title=\"HyperText Markup Language\">HTML</abbr> tags and attributes:"
-msgstr "Sa võid kasutada järgmisi <abbr title=\"HyperText Markup Language\">HTML</abbr> silte ja atribuute:"
-
-#: /Users/peetermarvet/Sites/localize/thematic/page.php:38
-msgid "Pages: "
-msgstr "Lehed: "
-
-#: /Users/peetermarvet/Sites/localize/thematic/search.php:41
-msgid "Nothing Found"
-msgstr "Ei leitud"
-
-#: /Users/peetermarvet/Sites/localize/thematic/search.php:43
-msgid "Sorry, but nothing matched your search criteria. Please try again with some different keywords."
-msgstr "Kahjuks ei leidunud midagi sobilikku. Palun proovi mõne teise märksõnaga."
-
-#: /Users/peetermarvet/Sites/localize/thematic/search.php:48
-msgid "Find"
-msgstr "Otsi"
-
-#: /Users/peetermarvet/Sites/localize/thematic/library/extensions/comments-extensions.php:76
-msgid "<span>One</span> Comment"
-msgstr "<span>Üks</span> kommentaar"
+#: library/extensions/comments-extensions.php:238
+#: library/legacy/deprecated.php:354
+msgctxt "%$1s and %$2s are <em> tags for emphasis on never"
+msgid "Your email is %1$snever%2$s published nor shared."
+msgstr "Sinu e-posti ei avaldata ega jagata %1$skunagi%2$s published nor shared."
+
+#: library/extensions/comments-extensions.php:238
+msgctxt "%$1s and %$2s are <span> tags"
+msgid "Required fields are marked %1$s*%2$s"
+msgstr "Kohustuslikke välju tähistab %1$s*%2$s"
+
+#: library/extensions/comments-extensions.php:240
+#: library/legacy/deprecated.php:336
+msgid "You must be %1$slogged in%2$s to post a comment."
+msgstr "Kommenteerimiseks pead olema %1$ssisse loginud%2$s."
+
+#: library/extensions/comments-extensions.php:240
+#: library/legacy/deprecated.php:336
+msgid "Log in"
+msgstr "Logi sisse"
-#: /Users/peetermarvet/Sites/localize/thematic/library/extensions/comments-extensions.php:83
-#, php-format
-msgid "<span>%d</span> Comments"
-msgstr "<span>%d</span> kommentaari"
+#: library/extensions/comments-extensions.php:242
+#: library/legacy/deprecated.php:349
+msgid "Logged in as %s"
+msgstr "Sisse logitud kasutajana %s"
-#: /Users/peetermarvet/Sites/localize/thematic/library/extensions/comments-extensions.php:96
-msgid "Post a Comment"
-msgstr "Lisa kommentaar"
+#: library/extensions/comments-extensions.php:242
+#: library/legacy/deprecated.php:349
+msgid "Log out of this account"
+msgstr "Logi välja"
-#: /Users/peetermarvet/Sites/localize/thematic/library/extensions/comments-extensions.php:103
-#, php-format
-msgid "Post a Reply to %s"
-msgstr "Vasta kommentaarile %s"
+#: library/extensions/comments-extensions.php:242
+#: library/legacy/deprecated.php:349
+msgid "Log out?"
+msgstr "Logid välja?"
-#: /Users/peetermarvet/Sites/localize/thematic/library/extensions/comments-extensions.php:110
-msgid "Comment"
-msgstr "Kommentaar"
-
-#: /Users/peetermarvet/Sites/localize/thematic/library/extensions/comments-extensions.php:117
-msgid "Post Comment"
-msgstr "Lisa kommentaar"
+#: library/extensions/comments-extensions.php:244
+#: library/legacy/deprecated.php:379
+msgctxt "%$1s and %$2s are <abbr> tags"
+msgid "You may use these %1$sHTML%2$s tags and attributes"
+msgstr "Võid kasutada järgmisi %1$sHTML%2$s märgendeid ja atribuute"
-#: /Users/peetermarvet/Sites/localize/thematic/library/extensions/content-extensions.php:147
-msgid "Author Archives: "
-msgstr "Autori arhiiv: "
+#: library/extensions/content-extensions.php:334
+msgid "Author Archives:"
+msgstr "Autori arhiiv:"
-#: /Users/peetermarvet/Sites/localize/thematic/library/extensions/content-extensions.php:153
+#: library/extensions/content-extensions.php:339
+#: library/extensions/header-extensions.php:103
msgid "Category Archives:"
msgstr "Rubriigi arhiiv:"
-#: /Users/peetermarvet/Sites/localize/thematic/library/extensions/content-extensions.php:162
+#: library/extensions/content-extensions.php:347
+#: library/extensions/header-extensions.php:99
msgid "Search Results for:"
msgstr "Tulemused otsingule:"
-#: /Users/peetermarvet/Sites/localize/thematic/library/extensions/content-extensions.php:168
+#: library/extensions/content-extensions.php:352
+#: library/extensions/header-extensions.php:107
msgid "Tag Archives:"
msgstr "Sildi arhiiv:"
-#: /Users/peetermarvet/Sites/localize/thematic/library/extensions/content-extensions.php:174
-#, php-format
-msgid "Daily Archives: <span>%s</span>"
-msgstr "Päeva arhiiv: <span>%s</span>"
-
-#: /Users/peetermarvet/Sites/localize/thematic/library/extensions/content-extensions.php:178
-#, php-format
-msgid "Monthly Archives: <span>%s</span>"
-msgstr "Kuu arhiiv: <span>%s</span>"
-
-#: /Users/peetermarvet/Sites/localize/thematic/library/extensions/content-extensions.php:182
-#, php-format
-msgid "Yearly Archives: <span>%s</span>"
-msgstr "Aasta arhiiv: <span>%s</span>"
-
-#: /Users/peetermarvet/Sites/localize/thematic/library/extensions/content-extensions.php:186
-msgid "Blog Archives"
-msgstr "Ajaveebi arhiiv"
-
-#: /Users/peetermarvet/Sites/localize/thematic/library/extensions/content-extensions.php:209
-#: /Users/peetermarvet/Sites/localize/thematic/library/extensions/content-extensions.php:725
-msgid "<span class=\"meta-nav\">«</span> Older posts"
-msgstr "<span class=\"meta-nav\">«</span> Vanemad postitused"
-
-#: /Users/peetermarvet/Sites/localize/thematic/library/extensions/content-extensions.php:210
-#: /Users/peetermarvet/Sites/localize/thematic/library/extensions/content-extensions.php:726
-msgid "Newer posts <span class=\"meta-nav\">»</span>"
-msgstr "Uuemad postitused <span class=\"meta-nav\">»</span>"
-
-#: /Users/peetermarvet/Sites/localize/thematic/library/extensions/content-extensions.php:394
-#: /Users/peetermarvet/Sites/localize/thematic/library/extensions/content-extensions.php:618
+#: library/extensions/content-extensions.php:361
+#: library/extensions/content-extensions.php:368
+msgid "Archives:"
+msgstr "Arhiiv:"
+
+#: library/extensions/content-extensions.php:373
+msgid "Daily Archives: %s"
+msgstr "Päeva arhiiv: %s"
+
+#: library/extensions/content-extensions.php:377
+msgid "Monthly Archives: %s"
+msgstr "Kuu arhiiv: %s"
+
+#: library/extensions/content-extensions.php:381
+msgid "Yearly Archives: %s"
+msgstr "Aasta arhiiv: %s"
+
+#: library/extensions/content-extensions.php:424
+#: library/extensions/content-extensions.php:1706
+msgid "Older posts"
+msgstr "Vanemad postitused"
+
+#: library/extensions/content-extensions.php:426
+#: library/extensions/content-extensions.php:1708
+msgid "Newer posts"
+msgstr "Uuemad postitused"
+
+#: library/extensions/content-extensions.php:888
+#: library/extensions/content-extensions.php:1418
msgid "Edit post"
msgstr "Muuda postitust"
-#: /Users/peetermarvet/Sites/localize/thematic/library/extensions/content-extensions.php:406
+#: library/extensions/content-extensions.php:890
+#: library/extensions/content-extensions.php:1420
+#: library/extensions/discussion-extensions.php:37
+#: library/extensions/discussion.php:84 links.php:54 page.php:52
+#: template-page-archives.php:55 template-page-fullwidth.php:53
+msgid "Edit"
+msgstr "Muuda"
+
+#: library/extensions/content-extensions.php:918
+#: library/extensions/header-extensions.php:111
msgid "Not Found"
msgstr "Lehte ei leitud (viga 404)"
-#: /Users/peetermarvet/Sites/localize/thematic/library/extensions/content-extensions.php:411
-#: /Users/peetermarvet/Sites/localize/thematic/library/extensions/content-extensions.php:686
-msgid "Permalink to "
-msgstr "Püsiviide "
+#: library/extensions/content-extensions.php:923
+#: library/extensions/content-extensions.php:1141
+#: library/extensions/content-extensions.php:1145
+#: library/extensions/content-extensions.php:1376
+msgid "Permalink to %s"
+msgstr "Püsiviide: %s"
-#: /Users/peetermarvet/Sites/localize/thematic/library/extensions/content-extensions.php:441
-msgid "By "
-msgstr "Autor "
+#: library/extensions/content-extensions.php:983
+msgid "By"
+msgstr "Autor"
-#: /Users/peetermarvet/Sites/localize/thematic/library/extensions/content-extensions.php:444
-msgid "View all posts by "
-msgstr "Näita postitusi mille autoriks on "
+#: library/extensions/content-extensions.php:994
+msgid "View all posts by %s"
+msgstr "Vaata kõiki %s postitusi"
-#: /Users/peetermarvet/Sites/localize/thematic/library/extensions/content-extensions.php:455
-msgid "Published: "
-msgstr "Avaldatud: "
+#: library/extensions/content-extensions.php:1023
+msgid "Published:"
+msgstr "Avaldatud:"
-#: /Users/peetermarvet/Sites/localize/thematic/library/extensions/content-extensions.php:523
+#: library/extensions/content-extensions.php:1199
msgid "Archives by Category"
msgstr "Arhiivid rubriikide kaupa"
-#: /Users/peetermarvet/Sites/localize/thematic/library/extensions/content-extensions.php:534
+#: library/extensions/content-extensions.php:1230
msgid "Archives by Month"
msgstr "Arhiivid kuude kaupa"
-#: /Users/peetermarvet/Sites/localize/thematic/library/extensions/content-extensions.php:562
-msgid "Apologies, but we were unable to find what you were looking for. Perhaps searching will help."
-msgstr "Kahjuks seda lehte ei leitud. Soovitame proovida menüüd või otsingut."
+#: library/extensions/content-extensions.php:1291
+msgid "Apologies, but we were unable to find what you were looking for. Perhaps searching will help."
+msgstr "Soovitud leht ei ole leitav. Vahest aitab otsing?"
-#: /Users/peetermarvet/Sites/localize/thematic/library/extensions/content-extensions.php:578
-msgid "Read More <span class=\"meta-nav\">»</span>"
-msgstr "Loe edasi <span class=\"meta-nav\">»</span>"
+#: library/extensions/content-extensions.php:1297 search.php:70
+msgid "Find"
+msgstr "Otsi"
-#: /Users/peetermarvet/Sites/localize/thematic/library/extensions/content-extensions.php:629
-msgid "This entry was posted in "
-msgstr "See postitus kuulub rubriiki "
+#: library/extensions/content-extensions.php:1316
+msgid "Read More %s"
+msgstr "Loe edasi %s"
-#: /Users/peetermarvet/Sites/localize/thematic/library/extensions/content-extensions.php:632
-msgid "Also posted in "
-msgstr "Samuti postitatud rubriiki "
+#: library/extensions/content-extensions.php:1368
+msgid "Browse the %s archive."
+msgstr "Vaata %s arhiivi."
-#: /Users/peetermarvet/Sites/localize/thematic/library/extensions/content-extensions.php:635
-msgid "Posted in "
-msgstr "Postitatud rubriiki "
+#: library/extensions/content-extensions.php:1370
+msgid "Permalink to %s Archive"
+msgstr "Püsiviide %s arhiivile"
-#: /Users/peetermarvet/Sites/localize/thematic/library/extensions/content-extensions.php:646
-msgid " and tagged"
-msgstr " ja sildistatud"
+#: library/extensions/content-extensions.php:1376
+msgctxt "1s and 2s are the a href link wrappers, do not reverse them"
+msgid "Bookmark the %1$spermalink%2$s."
+msgstr "Talleta %1$spüsiviide%2$s."
-#: /Users/peetermarvet/Sites/localize/thematic/library/extensions/content-extensions.php:649
-msgid " Also tagged "
-msgstr " Lisaks sildistatud "
+#: library/extensions/content-extensions.php:1534
+msgid "This entry was posted in %s"
+msgstr "Postitatud rubriiki %s"
-#: /Users/peetermarvet/Sites/localize/thematic/library/extensions/content-extensions.php:651
+#: library/extensions/content-extensions.php:1545
+msgid "Also posted in %s"
+msgstr "Lisaks postitatud rubriiki %s"
+
+#: library/extensions/content-extensions.php:1549
+msgid "Posted in %s"
+msgstr "Postitatud rubriiki %s"
+
+#: library/extensions/content-extensions.php:1575
+msgid "This entry is tagged"
+msgstr "Postituse märksõnad"
+
+#: library/extensions/content-extensions.php:1578
+msgid "and tagged"
+msgstr "märksõnaga"
+
+#: library/extensions/content-extensions.php:1581
+msgid "Also tagged"
+msgstr "Lisaks märksõna"
+
+#: library/extensions/content-extensions.php:1583
msgid "Tagged"
msgstr "Sildistatud"
-#: /Users/peetermarvet/Sites/localize/thematic/library/extensions/content-extensions.php:663
-#: /Users/peetermarvet/Sites/localize/thematic/library/extensions/content-extensions.php:666
-#: /Users/peetermarvet/Sites/localize/thematic/library/extensions/content-extensions.php:669
-msgid "Comment on "
-msgstr "Kommenteeri "
-
-#: /Users/peetermarvet/Sites/localize/thematic/library/extensions/content-extensions.php:664
-msgid " Comments"
-msgstr " kommentaari"
+#: library/extensions/content-extensions.php:1613
+#: library/extensions/content-extensions.php:1619
+msgid "Comment on %s"
+msgstr "Kommenteeri %s"
-#: /Users/peetermarvet/Sites/localize/thematic/library/extensions/content-extensions.php:667
-msgid " Comment"
-msgstr " kommentaar"
+#: library/extensions/content-extensions.php:1615
+msgid "%s Response"
+msgid_plural "%s Responses"
+msgstr[0] "%s vastus"
+msgstr[1] "%s vastust"
-#: /Users/peetermarvet/Sites/localize/thematic/library/extensions/content-extensions.php:670
+#: library/extensions/content-extensions.php:1620
msgid "Leave a comment"
msgstr "Kommenteeri"
-#: /Users/peetermarvet/Sites/localize/thematic/library/extensions/content-extensions.php:673
+#: library/extensions/content-extensions.php:1623
msgid "Comments closed"
msgstr "Kommenteerimine suletud"
-#: /Users/peetermarvet/Sites/localize/thematic/library/extensions/content-extensions.php:686
-msgid ". Bookmark the "
-msgstr ". Salvesta lemmikutesse "
-
-#: /Users/peetermarvet/Sites/localize/thematic/library/extensions/content-extensions.php:687
-msgid "permalink"
-msgstr "püsiviide"
+#: library/extensions/content-extensions.php:1647
+msgctxt "1s and 2s are the a href link wrappers, do not reverse them. 3s is trackback url."
+msgid "%1$sPost a comment%2$s or leave a trackback: %3$s"
+msgstr "%1$sKommenteeri%2$s või lisa trackback-viide: %3$s"
-#: /Users/peetermarvet/Sites/localize/thematic/library/extensions/content-extensions.php:689
-#: /Users/peetermarvet/Sites/localize/thematic/library/extensions/content-extensions.php:697
+#: library/extensions/content-extensions.php:1648
+#: library/extensions/content-extensions.php:1663
msgid "Post a comment"
msgstr "Postita kommentaar"
-#: /Users/peetermarvet/Sites/localize/thematic/library/extensions/content-extensions.php:690
-msgid " or leave a trackback: "
-msgstr " või jäta trackback-viide: "
-
-#: /Users/peetermarvet/Sites/localize/thematic/library/extensions/content-extensions.php:691
-#: /Users/peetermarvet/Sites/localize/thematic/library/extensions/content-extensions.php:694
+#: library/extensions/content-extensions.php:1652
+#: library/extensions/content-extensions.php:1659
msgid "Trackback URL for your post"
msgstr "Trackback-viite URL Sinu postituse jaoks"
-#: /Users/peetermarvet/Sites/localize/thematic/library/extensions/content-extensions.php:691
-#: /Users/peetermarvet/Sites/localize/thematic/library/extensions/content-extensions.php:694
+#: library/extensions/content-extensions.php:1653
+#: library/extensions/content-extensions.php:1660
msgid "Trackback URL"
msgstr "Trackback-viite URL"
-#: /Users/peetermarvet/Sites/localize/thematic/library/extensions/content-extensions.php:693
-msgid " Comments are closed, but you can leave a trackback: "
-msgstr " Kommentaarid on suletud, aga Sa võid jätta trackback-viite: "
+#: library/extensions/content-extensions.php:1656
+msgctxt "%s is trackback url, wrapped in link tags"
+msgid "Comments are closed, but you can leave a trackback: %s"
+msgstr "Kommenteerimine on suletud, aga võid lisada trackback-viite: %s"
+
+#: library/extensions/content-extensions.php:1663
+msgid "Trackbacks are closed, but you can %1$spost a comment%2$s."
+msgstr "Trackback-viited on keelatud, aga võid %1$sjätta kommentaari%2$s."
-#: /Users/peetermarvet/Sites/localize/thematic/library/extensions/content-extensions.php:696
-msgid " Trackbacks are closed, but you can "
-msgstr " Trackback-viited on suletud, aga Sa võid "
+#: library/extensions/content-extensions.php:1665
+msgid "Both comments and trackbacks are currently closed."
+msgstr "Kommenteerimine ja trackback-viidete lisamine ei ole lubatud."
-#: /Users/peetermarvet/Sites/localize/thematic/library/extensions/content-extensions.php:697
-msgid "post a comment"
-msgstr "postitada kommentaari"
+#: library/extensions/discussion-extensions.php:27
+msgctxt "Posted {$date} at {$time}"
+msgid "Posted %s at %s"
+msgstr "Lisatud %s kell %s"
-#: /Users/peetermarvet/Sites/localize/thematic/library/extensions/content-extensions.php:699
-msgid " Both comments and trackbacks are currently closed."
-msgstr " Kommentaarid ja trackback-viited on suletud."
+#: library/extensions/discussion-extensions.php:31
+msgid "Permalink to this comment"
+msgstr "Püsiviide sellele kommentaarile"
-#: /Users/peetermarvet/Sites/localize/thematic/library/extensions/discussion.php:10
-#, php-format
-msgid "Posted %1$s at %2$s <span class=\"meta-sep\">|</span> <a href=\"%3$s\" title=\"Permalink to this comment\">Permalink</a>"
-msgstr "Postitanud %1$s %2$s <span class=\"meta-sep\">|</span> <a href=\"%3$s\" title=\"Püsiviide kommentaarile\">Püsiviide</a>"
+#: library/extensions/discussion-extensions.php:31
+msgid "Permalink"
+msgstr "Püsiviide"
-#: /Users/peetermarvet/Sites/localize/thematic/library/extensions/discussion.php:15
-msgid "\t\t\t\t\t<span class='unapproved'>Your comment is awaiting moderation.</span>\n"
-msgstr "\t\t\t\t\t<span class='unapproved'>Sinu kommentaar ootab modereerimist.</span>\n"
+#: library/extensions/discussion-extensions.php:36
+msgid "Edit comment"
+msgstr "Muuda kommentaari"
-#: /Users/peetermarvet/Sites/localize/thematic/library/extensions/discussion.php:22
+#: library/extensions/discussion.php:37
+msgid "Your comment is awaiting moderation"
+msgstr "Sinu kommentaar on modereerimisjärjekorras"
+
+#: library/extensions/discussion.php:52
msgid "Reply"
msgstr "Vasta"
-#: /Users/peetermarvet/Sites/localize/thematic/library/extensions/discussion.php:23
+#: library/extensions/discussion.php:53
msgid "Log in to reply."
msgstr "Vastamiseks logi sisse."
-#: /Users/peetermarvet/Sites/localize/thematic/library/extensions/discussion.php:37
-#, php-format
+#: library/extensions/discussion.php:80
+msgctxt "By {$authorlink} on {$date} at {$time}"
msgid "By %1$s on %2$s at %3$s"
-msgstr "%1$s, %2$s kell %3$s"
+msgstr "Kirjutas %1$s %2$s kell %3$s"
-#: /Users/peetermarvet/Sites/localize/thematic/library/extensions/discussion.php:42
-msgid "\\t\\t\\t\\t\\t<span class=\"unapproved\">Your trackback is awaiting moderation.</span>\\n"
-msgstr "\\t\\t\\t\\t\\t<span class=\"unapproved\">Sinu trackback-viide ootab modereerimist.</span>\\n"
+#: library/extensions/discussion.php:90
+msgid "Your trackback is awaiting moderation"
+msgstr "Sinu trackback-viide on modereerimisjärjekorras"
-#: /Users/peetermarvet/Sites/localize/thematic/library/extensions/header-extensions.php:251
-#: /Users/peetermarvet/Sites/localize/thematic/library/extensions/widgets.php:77
+#: library/extensions/header-extensions.php:319
+#: library/extensions/widgets.php:157
msgid "Posts RSS feed"
msgstr "Postituse RSS"
-#: /Users/peetermarvet/Sites/localize/thematic/library/extensions/header-extensions.php:269
-#: /Users/peetermarvet/Sites/localize/thematic/library/extensions/widgets.php:78
+#: library/extensions/header-extensions.php:343
+#: library/extensions/widgets.php:158
msgid "Comments RSS feed"
msgstr "Kommentaaride RSS"
-#: /Users/peetermarvet/Sites/localize/thematic/library/extensions/header-extensions.php:401
+#: library/extensions/header-extensions.php:642
msgid "Skip navigation to the content"
msgstr "Möödu navigatsioonist sisu juurde"
-#: /Users/peetermarvet/Sites/localize/thematic/library/extensions/header-extensions.php:401
+#: library/extensions/header-extensions.php:642
msgid "Skip to content"
msgstr "Siirdu sisu juurde"
-#: /Users/peetermarvet/Sites/localize/thematic/library/extensions/helpers.php:31
-#: /Users/peetermarvet/Sites/localize/thematic/library/extensions/helpers.php:44
+#: library/extensions/helpers.php:50 library/extensions/helpers.php:69
msgid "There is no excerpt because this is a protected post."
msgstr "Kaitstud postituse sisukokkuvõtet ei saa kuvada."
-#: /Users/peetermarvet/Sites/localize/thematic/library/extensions/shortcodes.php:16
-msgid "Login"
-msgstr "Logi sisse"
-
-#: /Users/peetermarvet/Sites/localize/thematic/library/extensions/shortcodes.php:18
-msgid "Logout"
-msgstr "Logi välja"
-
-#: /Users/peetermarvet/Sites/localize/thematic/library/extensions/theme-options.php:13
+#: library/extensions/theme-options.php:50
msgid "Index Insert Position"
msgstr "Indeks-lehe mooduli asukoht"
-#: /Users/peetermarvet/Sites/localize/thematic/library/extensions/theme-options.php:14
-msgid "The widgetized Index Insert will follow after this post number."
-msgstr "Moodul kuvatakse indeks-lehel pärast niimitmendat postitust."
-
-#: /Users/peetermarvet/Sites/localize/thematic/library/extensions/theme-options.php:19
+#: library/extensions/theme-options.php:51
msgid "Info on Author Page"
msgstr "Info autori lehel"
-#: /Users/peetermarvet/Sites/localize/thematic/library/extensions/theme-options.php:20
-msgid "Display a <a href=\"http://microformats.org/wiki/hcard\" target=\"_blank\">microformatted vCard</a>—with the author's avatar, bio and email—on the author page."
-msgstr "Kuva <a href=\"http://microformats.org/wiki/hcard\" target=\"_blank\">mikroformaadis vCard</a>—autori avatari, tutvustuse a e-postiga—autori lehel."
-
-#: /Users/peetermarvet/Sites/localize/thematic/library/extensions/theme-options.php:25
+#: library/extensions/theme-options.php:52
msgid "Text in Footer"
msgstr "Jaluse tekst"
-#: /Users/peetermarvet/Sites/localize/thematic/library/extensions/theme-options.php:26
-msgid "You can use the following shortcodes in your footer text: [wp-link] [theme-link] [loginout-link] [blog-title] [blog-link] [the-year]"
-msgstr "Jaluse tekstis võid kasutada järgmisi lühikoode: [wp-link] [theme-link] [loginout-link] [blog-title] [blog-link] [the-year]"
-
-#: /Users/peetermarvet/Sites/localize/thematic/library/extensions/theme-options.php:28
-msgid "Powered by [wp-link]. Built on the [theme-link]."
-msgstr "Kasutusel [wp-link]. Kujundus [theme-link]."
-
-#: /Users/peetermarvet/Sites/localize/thematic/library/extensions/theme-options.php:75
-msgid "settings saved."
-msgstr "seaded salvestatud."
-
-#: /Users/peetermarvet/Sites/localize/thematic/library/extensions/theme-options.php:76
-msgid "settings reset."
-msgstr "seaded taastatud."
-
-#: /Users/peetermarvet/Sites/localize/thematic/library/extensions/theme-options.php:77
-msgid "widgets reset."
-msgstr "moodulid taastatud."
-
-#: /Users/peetermarvet/Sites/localize/thematic/library/extensions/theme-options.php:190
-msgid "Save changes"
-msgstr "Salvesta muudatused"
-
-#: /Users/peetermarvet/Sites/localize/thematic/library/extensions/theme-options.php:196
-msgid "Reset"
-msgstr "Taasta"
-
-#: /Users/peetermarvet/Sites/localize/thematic/library/extensions/theme-options.php:202
-msgid "Reset Widgets"
-msgstr "Taasta moodulite algolek"
-
-#: /Users/peetermarvet/Sites/localize/thematic/library/extensions/theme-options.php:207
-msgid "For more information about this theme, <a href=\"http://themeshaper.com\">visit ThemeShaper</a>. Please visit the <a href=\"http://themeshaper.com/forums/\">ThemeShaper Forums</a> if you have any questions about Thematic."
-msgstr "Lisainfot selle teema kohta annab <a href=\"http://themeshaper.com\">ThemeShaper</a>, tuge pakub <a href=\"http://themeshaper.com/forums/\">ThemeShaper'i foorum</a>."
-
-#: /Users/peetermarvet/Sites/localize/thematic/library/extensions/widgets-extensions.php:12
+#: library/extensions/theme-options.php:56
+msgid "Remove Legacy Options"
+msgstr "Kustuta iganenud seaded"
+
+#: library/extensions/theme-options.php:170
+msgid "Theme Options"
+msgstr "Teema sätted"
+
+#: library/extensions/theme-options.php:202
+msgid "For more information:"
+msgstr "Lisainfo:"
+
+#: library/extensions/theme-options.php:204
+msgid "For support:"
+msgstr "Tugi:"
+
+#: library/extensions/theme-options.php:206
+msgid "forums"
+msgstr "foorumid"
+
+#: library/extensions/theme-options.php:210
+msgid "The options below are enabled by the Thematic Theme framework and/or a child theme."
+msgstr "Alljärgnevad sätted pärinevad Thematic Theme raamistikust ja/või kasutuselolevast alamteemast (child theme)."
+
+#: library/extensions/theme-options.php:211
+msgid "New options can be added and the default ones removed by creating a child theme. This contextual help can be customized in a child theme also."
+msgstr "Uusi sätteid saab lisada ja olemasolevaid eemaldada luues alamteema (child theme). Ka seda kontekstitundlikku abiteksti saab muuta alamteemaga."
+
+#: library/extensions/theme-options.php:217
+msgid "Overview"
+msgstr "Ülevaade"
+
+#: library/extensions/theme-options.php:244
+msgctxt "%1$s and %2$s are <a> tags"
+msgid "For more information about this theme, %1$svisit ThematicTheme.com%2$s"
+msgstr "Selle teema kohta pakub lisainfot %1$sThematicTheme.com%2$s"
+
+#: library/extensions/theme-options.php:244
+msgctxt "%1$s and %2$s are <a> tags"
+msgid "Please visit the %1$sThematicTheme.com Forums%2$s if you have any questions about Thematic."
+msgstr "Küsimustele leiad vastuse %1$sThematicTheme.com foorumist%2$s."
+
+#: library/extensions/theme-options.php:256
+msgctxt "{$current theme} Theme Options"
+msgid "%s Theme Options"
+msgstr "%s teema sätted"
+
+#: library/extensions/theme-options.php:294
+msgid "The Index Insert widget area will appear after this post number. Entering nothing or 0 will disable this feature."
+msgstr "Index Insert lisatakse pärast niimitmendat postitust. Tühi lahter või 0 keelab selle mooduli."
+
+#: library/extensions/theme-options.php:307
+msgctxt "%1$s and %2$s are <a> tags"
+msgid "Display a %1$smicroformatted vCard%2$s with the author's avatar, bio and email on the author page."
+msgstr "Kuva %1$smikroformaadis vCard%2$s autori avatari, tutvustuse ja e-postiga tema lehel."
+
+#: library/extensions/theme-options.php:320
+msgctxt "%s are shortcode tags"
+msgid "You can use HTML and shortcodes in your footer text. Shortcode examples: %s"
+msgstr "Jaluses saab kasutada HTMLi ja lühikoode, näiteks: %s"
+
+#: library/extensions/theme-options.php:333
+msgctxt "{$current theme} Theme Options"
+msgid "%s Theme Options have been upgraded to an improved format. Remove the legacy options from the database."
+msgstr "%s teema sätted on viidud uuemasse formaati. Kustuta iganenud seaded andmebaasist."
+
+#: library/extensions/theme-options.php:360
+msgid "The index insert position value must be a number equal to or greater than zero. This setting has been reverted to the previous value."
+msgstr "Index Insert mooduli positsiooniks sobib 0 või sellest suurem number. Taastatud sätte eelmine väärtus."
+
+#: library/extensions/widgets-extensions.php:34
msgid "To search, type and hit enter"
msgstr "Sisesta otsisõna ja vajuta enterit"
-#: /Users/peetermarvet/Sites/localize/thematic/library/extensions/widgets-extensions.php:18
-#: /Users/peetermarvet/Sites/localize/thematic/library/extensions/widgets-extensions.php:281
-#: /Users/peetermarvet/Sites/localize/thematic/library/extensions/widgets.php:43
+#: library/extensions/widgets-extensions.php:40
+#: library/extensions/widgets.php:56 library/extensions/widgets.php:61
msgid "Search"
msgstr "Otsi"
-#: /Users/peetermarvet/Sites/localize/thematic/library/extensions/widgets-extensions.php:43
+#: library/extensions/widgets-extensions.php:70
+msgid "Primary Aside"
+msgstr "Primary Aside"
+
+#: library/extensions/widgets-extensions.php:72
msgid "The primary widget area, most often used as a sidebar."
msgstr "Peamine mooduliala (primary widget area), harilikult kasutusel külgpaanina."
-#: /Users/peetermarvet/Sites/localize/thematic/library/extensions/widgets-extensions.php:58
+#: library/extensions/widgets-extensions.php:85
+msgid "Secondary Aside"
+msgstr "Primary Aside"
+
+#: library/extensions/widgets-extensions.php:87
msgid "The secondary widget area, most often used as a sidebar."
msgstr "Täiendav mooduliala (secondary widget area), harilikult kasutusel külgpaanina."
-#: /Users/peetermarvet/Sites/localize/thematic/library/extensions/widgets-extensions.php:73
+#: library/extensions/widgets-extensions.php:100
+msgid "1st Subsidiary Aside"
+msgstr "1st Subsidiary Aside"
+
+#: library/extensions/widgets-extensions.php:102
msgid "The 1st widget area in the footer."
msgstr "Esimene mooduliala jaluses (1st widget area)."
-#: /Users/peetermarvet/Sites/localize/thematic/library/extensions/widgets-extensions.php:88
+#: library/extensions/widgets-extensions.php:115
+msgid "2nd Subsidiary Aside"
+msgstr "2nd Subsidiary Aside"
+
+#: library/extensions/widgets-extensions.php:117
msgid "The 2nd widget area in the footer."
msgstr "Teine mooduliala jaluses (2nd widget area)."
-#: /Users/peetermarvet/Sites/localize/thematic/library/extensions/widgets-extensions.php:103
+#: library/extensions/widgets-extensions.php:130
+msgid "3rd Subsidiary Aside"
+msgstr "3. jalusemoodul"
+
+#: library/extensions/widgets-extensions.php:132
msgid "The 3rd widget area in the footer."
msgstr "Kolmas mooduliala jaluses (3rd widget area)."
-#: /Users/peetermarvet/Sites/localize/thematic/library/extensions/widgets-extensions.php:118
+#: library/extensions/widgets-extensions.php:145
+msgid "Index Top"
+msgstr "Index Top"
+
+#: library/extensions/widgets-extensions.php:147
msgid "The top widget area displayed on the index page."
msgstr "Ülemine moodul indeks-lehel."
-#: /Users/peetermarvet/Sites/localize/thematic/library/extensions/widgets-extensions.php:133
+#: library/extensions/widgets-extensions.php:160
+msgid "Index Insert"
+msgstr "Index Insert"
+
+#: library/extensions/widgets-extensions.php:162
msgid "The widget area inserted after x posts on the index page."
msgstr "Moodul mis lisatakse indeks-lehele pärast x postitust"
-#: /Users/peetermarvet/Sites/localize/thematic/library/extensions/widgets-extensions.php:148
+#: library/extensions/widgets-extensions.php:175
+msgid "Index Bottom"
+msgstr "Index Bottom"
+
+#: library/extensions/widgets-extensions.php:177
msgid "The bottom widget area displayed on the index page."
msgstr "Alumine moodul indeks-lehel"
-#: /Users/peetermarvet/Sites/localize/thematic/library/extensions/widgets-extensions.php:163
+#: library/extensions/widgets-extensions.php:190
+msgid "Single Top"
+msgstr "Single Top"
+
+#: library/extensions/widgets-extensions.php:192
msgid "The top widget area displayed on a single post."
msgstr "Ülemine moodul üksiku postituse lehel"
-#: /Users/peetermarvet/Sites/localize/thematic/library/extensions/widgets-extensions.php:178
+#: library/extensions/widgets-extensions.php:205
+msgid "Single Insert"
+msgstr "Single Insert"
+
+#: library/extensions/widgets-extensions.php:207
msgid "The widget area inserted between the post and the comments on a single post."
msgstr "Moodul mis lisatakse postituse ja kommentaaride vahele üksiku postituse lehel"
-#: /Users/peetermarvet/Sites/localize/thematic/library/extensions/widgets-extensions.php:193
+#: library/extensions/widgets-extensions.php:220
+msgid "Single Bottom"
+msgstr "Single Bottom"
+
+#: library/extensions/widgets-extensions.php:222
msgid "The bottom widget area displayed on a single post."
msgstr "Alumine moodul üksiku postituse lehel"
-#: /Users/peetermarvet/Sites/localize/thematic/library/extensions/widgets-extensions.php:208
+#: library/extensions/widgets-extensions.php:235
+msgid "Page Top"
+msgstr "Page Top"
+
+#: library/extensions/widgets-extensions.php:237
msgid "The top widget area displayed on a page."
msgstr "Ülemine moodul leheküljel."
-#: /Users/peetermarvet/Sites/localize/thematic/library/extensions/widgets-extensions.php:223
+#: library/extensions/widgets-extensions.php:250
+msgid "Page Bottom"
+msgstr "Page Bottom"
+
+#: library/extensions/widgets-extensions.php:252
msgid "The bottom widget area displayed on a page."
msgstr "Alumine moodul leheküljel."
-#: /Users/peetermarvet/Sites/localize/thematic/library/extensions/widgets-extensions.php:283
-#: /Users/peetermarvet/Sites/localize/thematic/library/extensions/widgets.php:55
+#: library/extensions/widgets.php:55
+msgid "A search form for your blog"
+msgstr "Otsinguvorm"
+
+#: library/extensions/widgets.php:77 library/extensions/widgets.php:132
+#: library/extensions/widgets.php:175
+msgid "Title:"
+msgstr "Pealkiri:"
+
+#: library/extensions/widgets.php:100
+msgid "Log in/out and admin"
+msgstr "Sisse/välja logimine ja haldus"
+
+#: library/extensions/widgets.php:101 library/extensions/widgets.php:106
msgid "Meta"
msgstr "Meta"
-#: /Users/peetermarvet/Sites/localize/thematic/library/extensions/widgets-extensions.php:285
-#: /Users/peetermarvet/Sites/localize/thematic/library/extensions/widgets-extensions.php:286
-#: /Users/peetermarvet/Sites/localize/thematic/library/extensions/widgets.php:72
+#: library/extensions/widgets.php:145
+msgid "Links to your posts and comments feed"
+msgstr "Viited postituse ja kommentaride RSSile"
+
+#: library/extensions/widgets.php:146 library/extensions/widgets.php:151
msgid "RSS Links"
msgstr "RSS lingid"
-#: /Users/peetermarvet/Sites/localize/thematic/library/extensions/widgets.php:77
+#: library/extensions/widgets.php:157
msgid "All posts"
msgstr "Kõik postitused"
-#: /Users/peetermarvet/Sites/localize/thematic/library/extensions/widgets.php:78
+#: library/extensions/widgets.php:158
msgid "All comments"
msgstr "Kõik kommentaarid"
-#: /Users/peetermarvet/Sites/localize/thematic/library/extensions/widgets.php:96
-msgid "Title:"
-msgstr "Pealkiri:"
+#: library/legacy/deprecated.php:349
+msgid "Logged in as"
+msgstr "Sisse logitud kasutajana"
+
+#: library/legacy/deprecated.php:357 library/legacy/deprecated.php:362
+msgid "<span class=\"required\">*</span>"
+msgstr "<span class=\"required\">*</span>"
+
+#: page.php:50 template-page-fullwidth.php:51
+msgid "Pages: "
+msgstr "Lehed: "
+
+#: search.php:56
+msgid "Nothing Found"
+msgstr "Ei leitud"
+
+#: search.php:60
+msgid "Sorry, but nothing matched your search criteria. Please try again with some different keywords."
+msgstr "Kahjuks ei leidunud midagi sobilikku. Palun proovi mõne teise märksõnaga."
+
+#: template-page-blog.php:22
+msgid "You can include a %s in a childtheme"
+msgstr "Võid kasutada %s alamteemas (childtheme)"
+
+msgid "Thematic"
+msgstr "Thematic"
+
+msgid "http://thematictheme.com"
+msgstr "http://thematictheme.com"
+
+msgid "The ultimate in SEO-ready themes, Thematic is a highly extensible, WordPress Theme Framework featuring 13 widget-ready areas, drop-down menus, grid-based layout samples, plugin integration, shortcodes for your footer, & a whole lot more. Perfect for any blog and <strong><em>the</em></strong> starting point for theme development."
+msgstr "Thematic on SEO-valmis WordPressi teemaraamistik mis on kergesti laiendatav, 13 mooduli-ala ja menüüde toega, küljendus põhineb võrgustikul... & ja veel palju muud head. Ideaalne aluskiht <strong><em>teema-arenduseks</em></strong>."
+
+msgid "<a href=\"http://themeshaper.com/\">Ian Stewart</a> & <a href=\"http://thematic4you.com/\">Chris Goßmann</a>"
+msgstr "<a href=\"http://themeshaper.com/\">Ian Stewart</a> & <a href=\"http://thematic4you.com/\">Chris Goßmann</a>"
+
+msgid "http://themeshaper.com/"
+msgstr "http://themeshaper.com/"
+
+msgid "white, three-columns, two-columns, fixed-width, theme-options, left-sidebar, right-sidebar, threaded-comments, sticky-post, microformats"
+msgstr "white, three-columns, two-columns, fixed-width, theme-options, left-sidebar, right-sidebar, threaded-comments, sticky-post, microformats"
+
+msgid "Deprecated Archives Template"
+msgstr "Iganenud arhiivide põhi"
-#~ msgid "definitions created."
-#~ msgstr "definitsioonid loodud."
+msgid "Links Page"
+msgstr "Viidete põhi"
-#~ msgid "failed to create directory:"
-#~ msgstr "kataloogi ei õnnestunud luua:"
+msgid "Archives Page"
+msgstr "Arhiivide põhi"
-#~ msgid "failed to create the file:"
-#~ msgstr "faili ei õnnestunud luua:"
+msgid "Deprecated Blog Template"
+msgstr "Iganenud ajaveebi põhi"
-#~ msgid "Create Definitions"
-#~ msgstr "Loo definitsioonid"
+msgid "Full Width"
+msgstr "Täislaiusega põhi"
\ No newline at end of file
diff --git a/wp-content/themes/thematic/library/languages/fr_FR.mo b/wp-content/themes/thematic/library/languages/fr_FR.mo
index 13f98193bb6dd77275b155e387d81795fd91ebbc..d26bf520663aa95622654d5b3e42081d3aa29c30 100644
Binary files a/wp-content/themes/thematic/library/languages/fr_FR.mo and b/wp-content/themes/thematic/library/languages/fr_FR.mo differ
diff --git a/wp-content/themes/thematic/library/languages/fr_FR.po b/wp-content/themes/thematic/library/languages/fr_FR.po
index 558fa67f84b1a92cf9112a8657e5bce5aa2fee12..3b061103ed7ca68987947378377ad849e0356a77 100644
--- a/wp-content/themes/thematic/library/languages/fr_FR.po
+++ b/wp-content/themes/thematic/library/languages/fr_FR.po
@@ -1,34 +1,21 @@
+# Translation of Thematic 1.0.3 in French (France)
+# This file is distributed under the same license as the Thematic 1.0.3 package.
msgid ""
msgstr ""
-"Project-Id-Version: Thematic\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: \n"
-"PO-Revision-Date: \n"
-"Last-Translator: Kathy <helgatheviking@gmail.com>\n"
-"Language-Team: \n"
+"PO-Revision-Date: 2012-09-02 09:53:48+0000\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Poedit-Language: French\n"
-"X-Poedit-Country: FRANCE\n"
-"X-Poedit-SourceCharset: utf-8\n"
-"X-Poedit-KeywordsList: __;_e;_c\n"
-"X-Poedit-Basepath: .\n"
-
-#: library/extensions/content-extensions.php:947
-#: library/extensions/content-extensions.php:1461
-#: library/extensions/discussion-extensions.php:36
-#: library/extensions/discussion.php:84
-#: links.php:60
-#: page.php:60
-#: template-page-archives.php:63
-#: template-page-fullwidth.php:61
-msgid "Edit"
-msgstr "Modifier"
+"Plural-Forms: nplurals=2; plural=n > 1;\n"
+"X-Generator: GlotPress/0.1\n"
+"Project-Id-Version: Thematic 1.0.3\n"
-#: attachment.php:62
-#: library/extensions/content-extensions.php:666
-#: library/extensions/content-extensions.php:732
+#: archives.php:20 template-page-blog.php:22
+msgid "The template %s"
+msgstr "Le modèle %s"
+
+#: attachment.php:54 library/extensions/content-extensions.php:630
+#: library/extensions/content-extensions.php:689
msgid "Pages:"
msgstr "Pages :"
@@ -36,299 +23,337 @@ msgstr "Pages :"
msgid "Email "
msgstr "E-mail"
+#: comments.php:24
+msgid "Please do not load this page directly."
+msgstr "Veuillez ne pas charger cette page directement."
+
#: comments.php:33
msgid "This post is password protected. Enter the password to view any comments."
msgstr "Cet article est protégé par mot de passe. Saisissez votre mot de passe pour lire les commentaires."
#: comments.php:111
-msgid "<span>One</span> Trackback"
-msgstr "<span>Un</span> trackback"
-
-#: comments.php:142
-#: library/extensions/comments-extensions.php:234
-#, php-format
-msgid "You must be <a href=\"%s\" title=\"Log in\">logged in</a> to post a comment."
-msgstr "Vous devez être <a href=\"%s\" title=\"Connexion\">connecté</a> pour laisser un commentaire."
-
-#: comments.php:156
-#: library/extensions/comments-extensions.php:235
-#, php-format
-msgid "<span class=\"loggedin\">Logged in as <a href=\"%1$s\" title=\"Logged in as %2$s\">%2$s</a>.</span> <span class=\"logout\"><a href=\"%3$s\" title=\"Log out of this account\">Log out?</a></span>"
-msgstr "<span class=\"loggedin\">Connecté en tant que <a href=\"%1$s\" title=\"Connecté en tant que %2$s\">%2$s</a>.</span> <span class=\"logout\"><a href=\"%3$s\" title=\"Se déconnecter de ce compte\">Se déconnecter ?</a></span>"
-
-#: comments.php:164
-#: library/extensions/comments-extensions.php:233
-msgid "Your email is <em>never</em> published nor shared."
-msgstr "Votre e-mail ne sera <em>jamais</em> publié ni communiqué."
-
-#: comments.php:164
-#: library/extensions/comments-extensions.php:233
-msgid "Required fields are marked <span class=\"required\">*</span>"
-msgstr "Les champs obligatoires sont indiqués par <span class=\"required\">*</span>"
-
-#: comments.php:167
-#: library/extensions/comments-extensions.php:224
-msgid "Name"
-msgstr "Nom"
-
-#: comments.php:167
-#: comments.php:172
-#: library/extensions/comments-extensions.php:224
-#: library/extensions/comments-extensions.php:225
-msgid "<span class=\"required\">*</span>"
-msgstr "<span class=\"required\">*</span>"
-
-#: comments.php:172
-#: library/extensions/comments-extensions.php:225
-msgid "Email"
-msgstr "E-mail"
-
-#: comments.php:177
-#: library/extensions/comments-extensions.php:226
-msgid "Website"
-msgstr "Site web"
-
-#: comments.php:189
-#: library/extensions/comments-extensions.php:236
-msgid "You may use these <abbr title=\"HyperText Markup Language\">HTML</abbr> tags and attributes:"
-msgstr "Vous pouvez utiliser ces balises et attributs <abbr title=\"HyperText Markup Language\" lang=\"en\">HTML</abbr> :"
-
-#: page.php:58
-#: template-page-fullwidth.php:59
-msgid "Pages: "
-msgstr "Pages :"
-
-#: search.php:56
-msgid "Nothing Found"
-msgstr "Aucun résultat"
+msgid "Trackbacks"
+msgstr "Trackbacks"
-#: search.php:60
-msgid "Sorry, but nothing matched your search criteria. Please try again with some different keywords."
-msgstr "Désolé, mais rien ne correspond à vos critères de recherche. Veuillez réessayer avec d'autres mots-clés."
+#: comments.php:111
+msgctxt "%1$ and %2$s are <span> tags"
+msgid "%1$sOne%2$s Trackback"
+msgstr "%1$sUn%2$s trackback"
-#: library/extensions/content-extensions.php:1346
-#: search.php:70
-msgid "Find"
-msgstr "Trouver"
+#: functions.php:194
+msgid "Primary Menu"
+msgstr "Menu Primaire"
#: library/extensions/comments-extensions.php:120
-msgid "<span>One</span> Comment"
-msgstr "<span>Un</span> commentaire"
+msgctxt "One Comment, where %$1s and %$2s are <span> tags"
+msgid "%1$sOne%2$s Comment"
+msgstr "%1$sUn%2$s commentaire"
+
+#: library/extensions/comments-extensions.php:131
+msgid "Comments"
+msgstr "Commentaires"
-#: library/extensions/comments-extensions.php:154
+#: library/extensions/comments-extensions.php:155
msgid "Post a Comment"
msgstr "Laisser un commentaire"
-#: library/extensions/comments-extensions.php:165
-#, php-format
+#: library/extensions/comments-extensions.php:167
msgid "Post a Reply to %s"
msgstr "Répondre à %s"
-#: library/extensions/comments-extensions.php:176
+#: library/extensions/comments-extensions.php:179
+msgctxt "noun"
msgid "Comment"
msgstr "Commentaire"
-# @ thematic
-#: library/extensions/comments-extensions.php:187
+#: library/extensions/comments-extensions.php:190
msgid "Cancel reply"
-msgstr "Annuler Réponse"
+msgstr "Annuler réponse"
-#: library/extensions/comments-extensions.php:198
+#: library/extensions/comments-extensions.php:202
msgid "Post Comment"
msgstr "Valider le commentaire"
-#: library/extensions/content-extensions.php:340
-#: library/extensions/header-extensions.php:84
+#: library/extensions/comments-extensions.php:228
+#: library/legacy/deprecated.php:357
+msgid "Name"
+msgstr "Nom"
+
+#: library/extensions/comments-extensions.php:228
+#: library/extensions/comments-extensions.php:229
+msgctxt "denotes required field"
+msgid "*"
+msgstr "*"
+
+#: library/extensions/comments-extensions.php:229
+#: library/legacy/deprecated.php:362
+msgid "Email"
+msgstr "E-mail"
+
+#: library/extensions/comments-extensions.php:230
+#: library/legacy/deprecated.php:367
+msgid "Website"
+msgstr "Site web"
+
+#: library/extensions/comments-extensions.php:238
+#: library/legacy/deprecated.php:354
+msgctxt "%$1s and %$2s are <em> tags for emphasis on never"
+msgid "Your email is %1$snever%2$s published nor shared."
+msgstr "Votre e-mail ne sera %1$sjamais%2$s publié ni communiqué."
+
+#: library/extensions/comments-extensions.php:238
+msgctxt "%$1s and %$2s are <span> tags"
+msgid "Required fields are marked %1$s*%2$s"
+msgstr "Les champs obligatoires sont indiqués par %1$s*%2$s"
+
+#: library/extensions/comments-extensions.php:240
+#: library/legacy/deprecated.php:336
+msgid "You must be %1$slogged in%2$s to post a comment."
+msgstr "Vous devez être %1$sconnecté%2$s pour laisser un commentaire."
+
+#: library/extensions/comments-extensions.php:240
+#: library/legacy/deprecated.php:336
+msgid "Log in"
+msgstr "Connexion"
+
+#: library/extensions/comments-extensions.php:242
+#: library/legacy/deprecated.php:349
+msgid "Logged in as %s"
+msgstr "Connecté en tant que %s"
+
+#: library/extensions/comments-extensions.php:242
+#: library/legacy/deprecated.php:349
+msgid "Log out of this account"
+msgstr "Se déconnecter de ce compte"
+
+#: library/extensions/comments-extensions.php:242
+#: library/legacy/deprecated.php:349
+msgid "Log out?"
+msgstr "Se déconnecter ?"
+
+#: library/extensions/comments-extensions.php:244
+#: library/legacy/deprecated.php:379
+msgctxt "%$1s and %$2s are <abbr> tags"
+msgid "You may use these %1$sHTML%2$s tags and attributes"
+msgstr "Vous pouvez utiliser ces balises et attributs %1$sHTML%2$s"
+
+#: library/extensions/content-extensions.php:334
+msgid "Author Archives:"
+msgstr "Archives de l’auteur :"
+
+#: library/extensions/content-extensions.php:339
+#: library/extensions/header-extensions.php:103
msgid "Category Archives:"
-msgstr "Archives par catégorie :"
+msgstr "Archives de la catégorie :"
-#: library/extensions/content-extensions.php:349
-#: library/extensions/header-extensions.php:80
+#: library/extensions/content-extensions.php:347
+#: library/extensions/header-extensions.php:99
msgid "Search Results for:"
-msgstr "Résultats de la recherche pour :"
+msgstr "Résultats de recherche pour :"
-#: library/extensions/content-extensions.php:355
-#: library/extensions/header-extensions.php:88
+#: library/extensions/content-extensions.php:352
+#: library/extensions/header-extensions.php:107
msgid "Tag Archives:"
-msgstr "Archives par tag :"
+msgstr "Archives du mot-clef :"
-#: library/extensions/content-extensions.php:364
-#: library/extensions/content-extensions.php:373
-#, fuzzy
+#: library/extensions/content-extensions.php:361
+#: library/extensions/content-extensions.php:368
msgid "Archives:"
-msgstr "Archives"
-
-#: library/extensions/content-extensions.php:379
-#, php-format
-msgid "Daily Archives: <span>%s</span>"
-msgstr "Archives par jour : <span>%s</span>"
-
-#: library/extensions/content-extensions.php:383
-#, php-format
-msgid "Monthly Archives: <span>%s</span>"
-msgstr "Archives par mois : <span>%s</span>"
-
-#: library/extensions/content-extensions.php:387
-#, php-format
-msgid "Yearly Archives: <span>%s</span>"
-msgstr "Archives par année : <span>%s</span>"
-
-#: library/extensions/content-extensions.php:429
-#: library/extensions/content-extensions.php:1728
-msgid "<span class=\"meta-nav\">«</span> Older posts"
-msgstr "<span class=\"meta-nav\">«</span> Articles plus anciens"
-
-#: library/extensions/content-extensions.php:431
-#: library/extensions/content-extensions.php:1729
-msgid "Newer posts <span class=\"meta-nav\">»</span>"
-msgstr "Articles plus récents <span class=\"meta-nav\">»</span>"
-
-#: library/extensions/content-extensions.php:946
-#: library/extensions/content-extensions.php:1460
+msgstr "Archives :"
+
+#: library/extensions/content-extensions.php:373
+msgid "Daily Archives: %s"
+msgstr "Archives quotidiennes : %s"
+
+#: library/extensions/content-extensions.php:377
+msgid "Monthly Archives: %s"
+msgstr "Archives mensuelles : %s"
+
+#: library/extensions/content-extensions.php:381
+msgid "Yearly Archives: %s"
+msgstr "Archives annuelles : %s"
+
+#: library/extensions/content-extensions.php:424
+#: library/extensions/content-extensions.php:1706
+msgid "Older posts"
+msgstr "Articles plus anciens"
+
+#: library/extensions/content-extensions.php:426
+#: library/extensions/content-extensions.php:1708
+msgid "Newer posts"
+msgstr "Articles plus récents"
+
+#: library/extensions/content-extensions.php:888
+#: library/extensions/content-extensions.php:1418
msgid "Edit post"
msgstr "Modifier cet article"
-#: library/extensions/content-extensions.php:975
-#: library/extensions/header-extensions.php:92
+#: library/extensions/content-extensions.php:890
+#: library/extensions/content-extensions.php:1420
+#: library/extensions/discussion-extensions.php:37
+#: library/extensions/discussion.php:84 links.php:54 page.php:52
+#: template-page-archives.php:55 template-page-fullwidth.php:53
+msgid "Edit"
+msgstr "Modifier"
+
+#: library/extensions/content-extensions.php:918
+#: library/extensions/header-extensions.php:111
msgid "Not Found"
msgstr "Introuvable"
-#: library/extensions/content-extensions.php:980
-#: library/extensions/content-extensions.php:1413
-#: library/extensions/content-extensions.php:1417
-msgid "Permalink to "
-msgstr "Permalien vers "
+#: library/extensions/content-extensions.php:923
+#: library/extensions/content-extensions.php:1141
+#: library/extensions/content-extensions.php:1145
+#: library/extensions/content-extensions.php:1376
+msgid "Permalink to %s"
+msgstr "Permalien vers %s"
-#: library/extensions/content-extensions.php:1041
-msgid "By "
-msgstr "Par "
+#: library/extensions/content-extensions.php:983
+msgid "By"
+msgstr "Par"
-#: library/extensions/content-extensions.php:1051
-msgid "View all posts by "
-msgstr "Voir tous les articles par "
+#: library/extensions/content-extensions.php:994
+msgid "View all posts by %s"
+msgstr "Voir tous les articles par %s"
-#: library/extensions/content-extensions.php:1079
-msgid "Published: "
-msgstr "Publié : "
+#: library/extensions/content-extensions.php:1023
+msgid "Published:"
+msgstr "Publié :"
-#: library/extensions/content-extensions.php:1252
+#: library/extensions/content-extensions.php:1199
msgid "Archives by Category"
msgstr "Archives par catégorie"
-#: library/extensions/content-extensions.php:1280
+#: library/extensions/content-extensions.php:1230
msgid "Archives by Month"
msgstr "Archives par mois"
-# @ thematic
-#: library/extensions/content-extensions.php:1413
-msgid "Browse the "
-msgstr "Parcourir le"
+#: library/extensions/content-extensions.php:1291
+msgid "Apologies, but we were unable to find what you were looking for. Perhaps searching will help."
+msgstr "Désolé, nous n'avons pas pu trouver ce que vous cherchiez. Le moteur de recherche pourra peut-être vous aider."
-#: library/extensions/content-extensions.php:1413
-#, fuzzy
-msgid " Archive"
-msgstr "Archives"
+#: library/extensions/content-extensions.php:1297 search.php:70
+msgid "Find"
+msgstr "Trouver"
-#: library/extensions/content-extensions.php:1414
-#, fuzzy
-msgid " archive"
-msgstr "Archives"
+#: library/extensions/content-extensions.php:1316
+msgid "Read More %s"
+msgstr "Lire la suite %s"
-#: library/extensions/content-extensions.php:1417
-msgid "Bookmark the "
-msgstr "Bookmarker le "
+#: library/extensions/content-extensions.php:1368
+msgid "Browse the %s archive."
+msgstr "Parcourir l'archive %s."
-#: library/extensions/content-extensions.php:1418
-msgid "permalink"
-msgstr "permalien"
+#: library/extensions/content-extensions.php:1370
+msgid "Permalink to %s Archive"
+msgstr "Permalien vers l'archive %s"
-#: library/extensions/content-extensions.php:1572
-msgid "This entry was posted in "
-msgstr "Cet article a été publié dans "
+#: library/extensions/content-extensions.php:1376
+msgctxt "1s and 2s are the a href link wrappers, do not reverse them"
+msgid "Bookmark the %1$spermalink%2$s."
+msgstr "Bookmarker le %1$spermalien%2$s."
-#: library/extensions/content-extensions.php:1580
-msgid "Also posted in "
-msgstr "Également publié dans "
+#: library/extensions/content-extensions.php:1534
+msgid "This entry was posted in %s"
+msgstr "Cet article a été publié dans %s"
-#: library/extensions/content-extensions.php:1583
-msgid "Posted in "
-msgstr "Publié dans "
+#: library/extensions/content-extensions.php:1545
+msgid "Also posted in %s"
+msgstr "Également publié dans %s"
-#: library/extensions/content-extensions.php:1609
-#, fuzzy
-msgid " This entry is tagged"
-msgstr "Cet article a été publié dans "
+#: library/extensions/content-extensions.php:1549
+msgid "Posted in %s"
+msgstr "Publié dans %s"
-#: library/extensions/content-extensions.php:1612
-msgid " and tagged"
-msgstr " avec les mots-clefs :"
+#: library/extensions/content-extensions.php:1575
+msgid "This entry is tagged"
+msgstr "Cet article est marqué avec les mots-clefs"
-#: library/extensions/content-extensions.php:1615
-msgid " Also tagged "
-msgstr " Autres mots-clefs : "
+#: library/extensions/content-extensions.php:1578
+msgid "and tagged"
+msgstr "avec les mots-clefs"
-#: library/extensions/content-extensions.php:1617
+#: library/extensions/content-extensions.php:1581
+msgid "Also tagged"
+msgstr "Autres mots-clefs :"
+
+#: library/extensions/content-extensions.php:1583
msgid "Tagged"
msgstr "Mots-clefs :"
-#: library/extensions/content-extensions.php:1644
-#: library/extensions/content-extensions.php:1647
-#: library/extensions/content-extensions.php:1650
-msgid "Comment on "
-msgstr "Commentaire sur "
+#: library/extensions/content-extensions.php:1613
+#: library/extensions/content-extensions.php:1619
+msgid "Comment on %s"
+msgstr "Commentaire sur %s"
-#: library/extensions/content-extensions.php:1651
+#: library/extensions/content-extensions.php:1615
+msgid "%s Response"
+msgid_plural "%s Responses"
+msgstr[0] "%s réponse"
+msgstr[1] "%s réponses"
+
+#: library/extensions/content-extensions.php:1620
msgid "Leave a comment"
msgstr "Laisser un commentaire"
-#: library/extensions/content-extensions.php:1654
+#: library/extensions/content-extensions.php:1623
msgid "Comments closed"
msgstr "Commentaires fermés"
-#: library/extensions/content-extensions.php:1678
-#: library/extensions/content-extensions.php:1686
+#: library/extensions/content-extensions.php:1647
+msgctxt "1s and 2s are the a href link wrappers, do not reverse them. 3s is trackback url."
+msgid "%1$sPost a comment%2$s or leave a trackback: %3$s"
+msgstr "%1$sLaisser un commentaire%2$s ou faire un trackback : %3$s"
+
+#: library/extensions/content-extensions.php:1648
+#: library/extensions/content-extensions.php:1663
msgid "Post a comment"
msgstr "Laisser un commentaire"
-#: library/extensions/content-extensions.php:1679
-msgid " or leave a trackback: "
-msgstr " ou faire un trackback : "
-
-#: library/extensions/content-extensions.php:1680
-#: library/extensions/content-extensions.php:1683
+#: library/extensions/content-extensions.php:1652
+#: library/extensions/content-extensions.php:1659
msgid "Trackback URL for your post"
msgstr "URL de trackback pour votre article"
-#: library/extensions/content-extensions.php:1680
-#: library/extensions/content-extensions.php:1683
+#: library/extensions/content-extensions.php:1653
+#: library/extensions/content-extensions.php:1660
msgid "Trackback URL"
msgstr "URL de trackback"
-#: library/extensions/content-extensions.php:1682
-msgid " Comments are closed, but you can leave a trackback: "
-msgstr " Les commentaires sont fermés, mais vous pouvez faire un trackback : "
-
-#: library/extensions/content-extensions.php:1685
-msgid " Trackbacks are closed, but you can "
-msgstr " Les trackbacks sont fermés, mais vous pouvez "
+#: library/extensions/content-extensions.php:1656
+msgctxt "%s is trackback url, wrapped in link tags"
+msgid "Comments are closed, but you can leave a trackback: %s"
+msgstr "Les commentaires sont fermés, mais vous pouvez faire un trackback : %s"
-#: library/extensions/content-extensions.php:1686
-msgid "post a comment"
-msgstr "laisser un commentaire"
+#: library/extensions/content-extensions.php:1663
+msgid "Trackbacks are closed, but you can %1$spost a comment%2$s."
+msgstr "Les trackbacks sont fermés, mais vous pouvez %1$slaisser un commentaire%2$s."
-#: library/extensions/content-extensions.php:1688
-msgid " Both comments and trackbacks are currently closed."
-msgstr " Les commentaires et les trackbacks sont fermés."
+#: library/extensions/content-extensions.php:1665
+msgid "Both comments and trackbacks are currently closed."
+msgstr "Les commentaires et les trackbacks sont fermés."
#: library/extensions/discussion-extensions.php:27
-#, php-format
-msgid "Posted %1$s at %2$s <span class=\"meta-sep\">|</span> <a href=\"%3$s\" title=\"Permalink to this comment\">Permalink</a>"
-msgstr "Le %1$s à %2$s <span class=\"meta-sep\">|</span> <a href=\"%3$s\" title=\"Permalien de ce commentaire\">Permalien</a>"
+msgctxt "Posted {$date} at {$time}"
+msgid "Posted %s at %s"
+msgstr "Publié le %s à %s"
-#: library/extensions/discussion-extensions.php:35
+#: library/extensions/discussion-extensions.php:31
+msgid "Permalink to this comment"
+msgstr "Permalien de ce commentaire"
+
+#: library/extensions/discussion-extensions.php:31
+msgid "Permalink"
+msgstr "Permalien"
+
+#: library/extensions/discussion-extensions.php:36
msgid "Edit comment"
msgstr "Modifier commentaire"
+#: library/extensions/discussion.php:37
+msgid "Your comment is awaiting moderation"
+msgstr "Votre commentaire est en attente de modération"
+
#: library/extensions/discussion.php:52
msgid "Reply"
msgstr "Répondre"
@@ -338,46 +363,36 @@ msgid "Log in to reply."
msgstr "Connectez-vous pour répondre."
#: library/extensions/discussion.php:80
-#, php-format
+msgctxt "By {$authorlink} on {$date} at {$time}"
msgid "By %1$s on %2$s at %3$s"
msgstr "Par %1$s le %2$s à %3$s"
-#: library/extensions/header-extensions.php:302
+#: library/extensions/discussion.php:90
+msgid "Your trackback is awaiting moderation"
+msgstr "Votre trackback est en attente de modération"
+
+#: library/extensions/header-extensions.php:319
#: library/extensions/widgets.php:157
msgid "Posts RSS feed"
msgstr "Flux RSS des articles"
-#: library/extensions/header-extensions.php:326
+#: library/extensions/header-extensions.php:343
#: library/extensions/widgets.php:158
msgid "Comments RSS feed"
msgstr "Flux RSS des commentaires"
-# @ thematic
-#: functions.php:253
-msgid "Primary Menu"
-msgstr "Menu Primaire"
-
-#: library/extensions/header-extensions.php:625
+#: library/extensions/header-extensions.php:642
msgid "Skip navigation to the content"
msgstr "Passer la navigation"
-#: library/extensions/header-extensions.php:625
+#: library/extensions/header-extensions.php:642
msgid "Skip to content"
msgstr "Aller au contenu"
-#: library/extensions/helpers.php:50
-#: library/extensions/helpers.php:69
+#: library/extensions/helpers.php:50 library/extensions/helpers.php:69
msgid "There is no excerpt because this is a protected post."
msgstr "Il n'y a pas d'extrait car l'article est protégé."
-#: library/extensions/shortcodes.php:40
-msgid "Login"
-msgstr "Connexion"
-
-#: library/extensions/shortcodes.php:42
-msgid "Logout"
-msgstr "Déconnexion"
-
#: library/extensions/theme-options.php:50
msgid "Index Insert Position"
msgstr "Position du bloc inséré en page d'accueil"
@@ -390,96 +405,211 @@ msgstr "Page Info sur l'auteur"
msgid "Text in Footer"
msgstr "Texte du pied de page"
+#: library/extensions/theme-options.php:56
+msgid "Remove Legacy Options"
+msgstr "Supprimer les anciennes options"
+
+#: library/extensions/theme-options.php:170
+msgid "Theme Options"
+msgstr "Options du thème"
+
+#: library/extensions/theme-options.php:202
+msgid "For more information:"
+msgstr "Pour plus de renseignements :"
+
+#: library/extensions/theme-options.php:204
+msgid "For support:"
+msgstr "Pour obtenir de l'aide :"
+
+#: library/extensions/theme-options.php:206
+msgid "forums"
+msgstr "forums"
+
+#: library/extensions/theme-options.php:210
+msgid "The options below are enabled by the Thematic Theme framework and/or a child theme."
+msgstr "Les options ci-dessous sont activées par le framework Thematic Theme et / ou un thème enfant."
+
+#: library/extensions/theme-options.php:211
+msgid "New options can be added and the default ones removed by creating a child theme. This contextual help can be customized in a child theme also."
+msgstr "De nouvelles options peuvent être ajoutées et les options par défaut annulées par la création d'un thème enfant. Cette aide contextuelle peut aussi être personnalisée dans un thème enfant."
+
+#: library/extensions/theme-options.php:217
+msgid "Overview"
+msgstr "Vue d'ensemble"
+
+#: library/extensions/theme-options.php:244
+msgctxt "%1$s and %2$s are <a> tags"
+msgid "For more information about this theme, %1$svisit ThematicTheme.com%2$s"
+msgstr "Pour plus d'informations sur ce thème, %1$srendez-vous sur ThematicTheme.com%2$s"
+
+#: library/extensions/theme-options.php:244
+msgctxt "%1$s and %2$s are <a> tags"
+msgid "Please visit the %1$sThematicTheme.com Forums%2$s if you have any questions about Thematic."
+msgstr "Connectez-vous aux %1$sforums de ThematicTheme.com%2$s si vous avez des questions à propos de Thematic."
+
+#: library/extensions/theme-options.php:256
+msgctxt "{$current theme} Theme Options"
+msgid "%s Theme Options"
+msgstr "Options du thème %s"
+
+#: library/extensions/theme-options.php:294
+msgid "The Index Insert widget area will appear after this post number. Entering nothing or 0 will disable this feature."
+msgstr "Le bloc widget inséré en page d'accueil apparaîtra après ce numéro d'article. Laisser le champ vide ou saisir 0 pour désactiver cette fonctionnalité."
+
+#: library/extensions/theme-options.php:307
+msgctxt "%1$s and %2$s are <a> tags"
+msgid "Display a %1$smicroformatted vCard%2$s with the author's avatar, bio and email on the author page."
+msgstr "Afficher une %1$svCard microformatée%2$s comportant l'avatar, la biographie et l'e-mail de l'auteur sur la page \"auteur\"."
+
+#: library/extensions/theme-options.php:320
+msgctxt "%s are shortcode tags"
+msgid "You can use HTML and shortcodes in your footer text. Shortcode examples: %s"
+msgstr "Vous pouvez utiliser du HTML et des \"shortcodes\" dans votre texte de pied de page. Exemples de \"shortcodes\": %s"
+
+#: library/extensions/theme-options.php:333
+msgctxt "{$current theme} Theme Options"
+msgid "%s Theme Options have been upgraded to an improved format. Remove the legacy options from the database."
+msgstr "Les options du thème %s ont été mises à niveau vers un format amélioré. Supprimer les anciennes options de la base de données."
+
+#: library/extensions/theme-options.php:360
+msgid "The index insert position value must be a number equal to or greater than zero. This setting has been reverted to the previous value."
+msgstr "La valeur de position du bloc inséré en page d'accueil doit être un nombre supérieur ou égal à zéro. Ce paramètre a été rétabli à la valeur précédente."
+
#: library/extensions/widgets-extensions.php:34
msgid "To search, type and hit enter"
msgstr "Entrez votre requête"
#: library/extensions/widgets-extensions.php:40
-#: library/extensions/widgets.php:56
-#: library/extensions/widgets.php:61
+#: library/extensions/widgets.php:56 library/extensions/widgets.php:61
msgid "Search"
msgstr "Recherche"
+#: library/extensions/widgets-extensions.php:70
+msgid "Primary Aside"
+msgstr "Barre latérale principale"
+
#: library/extensions/widgets-extensions.php:72
msgid "The primary widget area, most often used as a sidebar."
msgstr "La zone de widgets primaire, le plus souvent utilisée comme barre latérale."
+#: library/extensions/widgets-extensions.php:85
+msgid "Secondary Aside"
+msgstr "Barre latérale secondaire"
+
#: library/extensions/widgets-extensions.php:87
msgid "The secondary widget area, most often used as a sidebar."
msgstr "La zone de widgets secondaire, le plus souvent utilisée comme barre latérale."
+#: library/extensions/widgets-extensions.php:100
+msgid "1st Subsidiary Aside"
+msgstr "1er bloc secondaire"
+
#: library/extensions/widgets-extensions.php:102
msgid "The 1st widget area in the footer."
msgstr "La 1ère zone de widgets du pied de page."
+#: library/extensions/widgets-extensions.php:115
+msgid "2nd Subsidiary Aside"
+msgstr "2ème bloc secondaire"
+
#: library/extensions/widgets-extensions.php:117
msgid "The 2nd widget area in the footer."
msgstr "La 2ème zone de widgets du pied de page."
+#: library/extensions/widgets-extensions.php:130
+msgid "3rd Subsidiary Aside"
+msgstr "3ème bloc secondaire"
+
#: library/extensions/widgets-extensions.php:132
msgid "The 3rd widget area in the footer."
msgstr "La 3ème zone de widgets du pied de page."
+#: library/extensions/widgets-extensions.php:145
+msgid "Index Top"
+msgstr "Haut de page d'accueil"
+
#: library/extensions/widgets-extensions.php:147
msgid "The top widget area displayed on the index page."
msgstr "La zone de widgets supérieure affichée sur la page d'accueil."
+#: library/extensions/widgets-extensions.php:160
+msgid "Index Insert"
+msgstr "Insert de page d'accueil"
+
#: library/extensions/widgets-extensions.php:162
msgid "The widget area inserted after x posts on the index page."
msgstr "La zone de widgets insérée après x articles sur la page d'accueil."
+#: library/extensions/widgets-extensions.php:175
+msgid "Index Bottom"
+msgstr "Bas de page d'accueil"
+
#: library/extensions/widgets-extensions.php:177
msgid "The bottom widget area displayed on the index page."
msgstr "La zone de widgets inférieure affichée sur la page d'accueil."
+#: library/extensions/widgets-extensions.php:190
+msgid "Single Top"
+msgstr "Haut d'article"
+
#: library/extensions/widgets-extensions.php:192
msgid "The top widget area displayed on a single post."
msgstr "La zone de widgets supérieure affichée dans un article."
+#: library/extensions/widgets-extensions.php:205
+msgid "Single Insert"
+msgstr "Insert d'article"
+
#: library/extensions/widgets-extensions.php:207
msgid "The widget area inserted between the post and the comments on a single post."
msgstr "La zone de widgets insérée entre l'article et les commentaires dans un article."
+#: library/extensions/widgets-extensions.php:220
+msgid "Single Bottom"
+msgstr "Bas d'article"
+
#: library/extensions/widgets-extensions.php:222
msgid "The bottom widget area displayed on a single post."
msgstr "La zone de widgets inférieure affichée dans un article."
+#: library/extensions/widgets-extensions.php:235
+msgid "Page Top"
+msgstr "Haut de page"
+
#: library/extensions/widgets-extensions.php:237
msgid "The top widget area displayed on a page."
msgstr "La zone de widgets supérieure affichée dans une page."
+#: library/extensions/widgets-extensions.php:250
+msgid "Page Bottom"
+msgstr "Bas de page"
+
#: library/extensions/widgets-extensions.php:252
msgid "The bottom widget area displayed on a page."
msgstr "La zone de widgets inférieure affichée dans une page."
-# @ thematic
#: library/extensions/widgets.php:55
msgid "A search form for your blog"
msgstr "Un formulaire de recherche pour votre blog"
-#: library/extensions/widgets.php:77
-#: library/extensions/widgets.php:132
+#: library/extensions/widgets.php:77 library/extensions/widgets.php:132
#: library/extensions/widgets.php:175
msgid "Title:"
msgstr "Titre :"
-# @ thematic
#: library/extensions/widgets.php:100
msgid "Log in/out and admin"
-msgstr "Se Connecter/Déconnecter et admin"
+msgstr "Connexion/déconnexion et administration"
-#: library/extensions/widgets.php:101
-#: library/extensions/widgets.php:106
+#: library/extensions/widgets.php:101 library/extensions/widgets.php:106
msgid "Meta"
msgstr "Méta"
-# @ thematic
#: library/extensions/widgets.php:145
msgid "Links to your posts and comments feed"
-msgstr "Liens vers vos fluxes des articles et commentaires"
+msgstr "Liens vers vos flux d'articles et de commentaires"
-#: library/extensions/widgets.php:146
-#: library/extensions/widgets.php:151
+#: library/extensions/widgets.php:146 library/extensions/widgets.php:151
msgid "RSS Links"
msgstr "Liens RSS"
@@ -491,169 +621,59 @@ msgstr "Tous les articles"
msgid "All comments"
msgstr "Tous les commentaires"
-# @ thematic
-#: archives.php:20
-#: template-page-blog.php:22
-#, php-format
-msgid "The template %s"
-msgstr "Le modèle %s"
-
-# @ thematic
-#: comments.php:24
-msgid "Please do not load this page directly."
-msgstr "Ne pas charger cette page directement."
-
-#: comments.php:111
-msgid "Trackbacks"
-msgstr "Trackbacks"
-
-#: library/extensions/comments-extensions.php:131
-msgid "Comments"
-msgstr "Commentaires"
+#: library/legacy/deprecated.php:349
+msgid "Logged in as"
+msgstr "Connecté en tant que"
-#: library/extensions/content-extensions.php:334
-#, fuzzy
-msgid "Author Archives:"
-msgstr "Archives par auteur : "
-
-#: library/extensions/content-extensions.php:1340
-#, fuzzy
-msgid "Apologies, but we were unable to find what you were looking for. Perhaps searching will help."
-msgstr "Désolé, nous n'avons pas pu trouver ce que vous cherchiez. Le moteur de recherche pourra peut-être vous aider."
-
-# @ thematic
-#: library/extensions/content-extensions.php:1364
-#, php-format
-msgid "Read More %s"
-msgstr "Lire la suite %s"
-
-# @ thematic
-#: library/extensions/content-extensions.php:1645
-msgid "Responses"
-msgstr "Réponses"
-
-#: library/extensions/content-extensions.php:1648
-msgid "Response"
-msgstr "Réponse"
+#: library/legacy/deprecated.php:357 library/legacy/deprecated.php:362
+msgid "<span class=\"required\">*</span>"
+msgstr "<span class=\"required\">*</span>"
-#: library/extensions/discussion.php:37
-msgid "Your comment is awaiting moderation"
-msgstr "Votre commentaire est en attente de modération"
+#: page.php:50 template-page-fullwidth.php:51
+msgid "Pages: "
+msgstr "Pages :"
-#: library/extensions/discussion.php:90
-msgid "Your trackback is awaiting moderation"
-msgstr "Votre trackback est en attente de modération"
+#: search.php:56
+msgid "Nothing Found"
+msgstr "Aucun résultat"
-# @ thematic
-#: library/extensions/theme-options.php:56
-msgid "Remove Legacy Options"
-msgstr "Supprimer les Options Anciens "
+#: search.php:60
+msgid "Sorry, but nothing matched your search criteria. Please try again with some different keywords."
+msgstr "Désolé, mais rien ne correspond à vos critères de recherche. Veuillez réessayer avec d'autres mots-clefs."
-# @ thematic
-#: library/extensions/theme-options.php:204
-msgid "For more information:"
-msgstr "Pour plus de renseignements"
+#: template-page-blog.php:22
+msgid "You can include a %s in a childtheme"
+msgstr "Vous pouvez inclure un %s dans un thème enfant"
-# @ thematic
-#: library/extensions/theme-options.php:206
-msgid "For support:"
-msgstr "Pour l'assistance:"
+msgid "Thematic"
+msgstr "Thematic"
-# @ thematic
-#: library/extensions/theme-options.php:208
-msgid "forums"
-msgstr "forums"
+msgid "http://thematictheme.com"
+msgstr "http://thematictheme.com"
-# @ thematic
-#: library/extensions/theme-options.php:212
-msgid "The options below are enabled by the Thematic Theme framework and/or a child theme."
-msgstr "Les options ci-dessous sont activées par le cadre Thematic Theme et / ou un thème enfant."
+msgid "The ultimate in SEO-ready themes, Thematic is a highly extensible, WordPress Theme Framework featuring 13 widget-ready areas, drop-down menus, grid-based layout samples, plugin integration, shortcodes for your footer, & a whole lot more. Perfect for any blog and <strong><em>the</em></strong> starting point for theme development."
+msgstr "Le nec plus ultra des thèmes optimisés pour les moteurs de recherche, Thematic est un thème Wordpress de type \"framework\", hautement extensible, comprenant 13 zones de widgets, des menus déroulants, une grille typographique de base, une ouverture aux plugins, des \"shortcodes\" pour le pied de page, et bien d'autres. Idéal pour un blog et <strong><em>le</em></strong> point de départ du développement de thèmes."
-# @ thematic
-#: library/extensions/theme-options.php:213
-msgid "New options can be added and the default ones removed by creating a child theme. This contextual help can be customized in a child theme also."
-msgstr "De nouvelles options peuvent être ajoutés et ceux par défaut éliminé par la création d'un thème enfant. Cette aide contextuelle peut être personnalisé dans un thème enfant aussi."
+msgid "<a href=\"http://themeshaper.com/\">Ian Stewart</a> & <a href=\"http://thematic4you.com/\">Chris Goßmann</a>"
+msgstr "<a href=\"http://themeshaper.com/\">Ian Stewart</a> & <a href=\"http://thematic4you.com/\">Chris Goßmann</a>"
-# @ thematic
-#: library/extensions/theme-options.php:219
-msgid "Overview"
-msgstr "Vue d'ensemble"
+msgid "http://themeshaper.com/"
+msgstr "http://themeshaper.com/"
-#: library/extensions/theme-options.php:247
-msgid "For more information about this theme, <a href=\"http://thematictheme.com\">visit ThemeTheme.com</a>. Please visit the <a href=\"http://thematictheme.com/forums/\">ThematicTheme.com Forums</a> if you have any questions about Thematic."
-msgstr "Pour plus d'informations sur ce thème, <a href=\"http://themeshaper.com\">rendez-vous sur ThematicTheme.com</a>. Connectez-vous aux <a href=\"http://thematictheme.com/forums/\">ThematicTheme Forums</a> si vous avez des questions à propos de Thematic."
+msgid "white, three-columns, two-columns, fixed-width, theme-options, left-sidebar, right-sidebar, threaded-comments, sticky-post, microformats"
+msgstr "blanc, trois-colonnes, deux-colonnes, largeur-fixe, options-de-thème, barre-latérale-gauche, barre latérale-droite, commentaires-imbriqués, article-épinglé, microformats"
-# @ thematic
-#: library/extensions/theme-options.php:262
-#, php-format
-msgid "%s Theme Options"
-msgstr "%s Options du Thème"
+msgid "Deprecated Archives Template"
+msgstr "Modèle déprécié de page \"Archives\""
-#: library/extensions/theme-options.php:276
-#, fuzzy
-msgid "Save Changes"
-msgstr "Enregistrer les modifications"
+msgid "Links Page"
+msgstr "Page \"Liens\""
-# @ thematic
-#: library/extensions/theme-options.php:311
-msgid "The Index Insert widget area will appear after this post number. Entering nothing or 0 will disable this feature."
-msgstr "Le bloc widget inséré en page d'accueil apparaîtra après ce numéro d'article. Saisir rien ou 0 pour désactiver cette fonctionnalité."
-
-# @ thematic
-#: library/extensions/theme-options.php:324
-msgid "Display a"
-msgstr "Afficher un"
-
-# @ thematic
-#: library/extensions/theme-options.php:324
-msgid "with the author's avatar, bio and email on the author page."
-msgstr "avec l'avatar, la biographie et l'e-mail de l'auteur—sur la page \"auteur\"."
-
-# @ thematic
-#: library/extensions/theme-options.php:337
-msgid "You can use HTML and shortcodes in your footer text. Shortcode examples"
-msgstr "Vous pouvez utilisez HTML et les codes suivants dans votre texte de pied de page : [wp-link] [theme-link] [loginout-link] [blog-title] [blog-link] [the-year]"
-
-# @ thematic
-#: library/extensions/theme-options.php:350
-#, php-format
-msgid "%s Theme Options have been upgraded to an improved format. Remove the legacy options from the database."
-msgstr "%s Options du Thème ont été mis à niveau vers un format amélioré. Supprimer les options existantes de la base de données."
+msgid "Archives Page"
+msgstr "Page \"Archives\""
-# @ thematic
-#: library/extensions/theme-options.php:377
-msgid "The index insert position value must be a number equal to or greater than zero. This setting has been reverted to the previous value."
-msgstr "La valeur de position du bloc inséré en page d'accueil doit être un nombre égal ou supérieur à zero. Ce paramètre a été rétablie à la valeur précédente."
+msgid "Deprecated Blog Template"
+msgstr "Modèle déprécié de page \"Blog\""
-# @ thematic
-#: template-page-blog.php:22
-#, php-format
-msgid "You can include a %s in a childtheme"
-msgstr "Vous pouvez inclure un %s dans votre thème enfant"
-
-#~ msgid "<span>%d</span> Trackbacks"
-#~ msgstr "<span>%d</span> trackbacks"
-
-#~ msgid "<span>%d</span> Comments"
-#~ msgstr "<span>%d</span> commentaires"
-
-#~ msgid "Blog Archives"
-#~ msgstr "Archives du blog"
-
-#~ msgid "Read More <span class=\"meta-nav\">»</span>"
-#~ msgstr ""
-#~ "Lire le reste de cet article <span class=\"meta-nav\">»</span>"
-
-#~ msgid "The widgetized Index Insert will follow after this post number."
-#~ msgstr ""
-#~ "Le bloc widget inséré en page d'accueil apparaîtra après ce numéro "
-#~ "d'article."
-
-#~ msgid ""
-#~ "Display a <a href=\"http://microformats.org/wiki/hcard\" target=\"_blank"
-#~ "\">microformatted vCard</a>—with the author's avatar, bio and email—on "
-#~ "the author page."
-#~ msgstr ""
-#~ "Afficher une <a href=\"http://microformats.org/wiki/hcard\" target="
-#~ "\"_blank\">vCard micorformatée</a>—avec l'avatar, la biographie et l'e-"
-#~ "mail de l'auteur—sur la page \"auteur\"."
+msgid "Full Width"
+msgstr "Pleine page"
\ No newline at end of file
diff --git a/wp-content/themes/thematic/library/languages/sr_RS.mo b/wp-content/themes/thematic/library/languages/sr_RS.mo
new file mode 100644
index 0000000000000000000000000000000000000000..c9a7c0e84e6dee5d73c8fe61366fb09afebb4e82
Binary files /dev/null and b/wp-content/themes/thematic/library/languages/sr_RS.mo differ
diff --git a/wp-content/themes/thematic/library/languages/sr_RS.po b/wp-content/themes/thematic/library/languages/sr_RS.po
new file mode 100644
index 0000000000000000000000000000000000000000..50dba1bad25ab904ab9c41512a738f83276ed943
--- /dev/null
+++ b/wp-content/themes/thematic/library/languages/sr_RS.po
@@ -0,0 +1,682 @@
+# Translation of Thematic 1.0.3 in Serbian
+# This file is distributed under the same license as the Thematic 1.0.3 package.
+msgid ""
+msgstr ""
+"PO-Revision-Date: 2012-10-22 10:00:05+0000\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"X-Generator: GlotPress/0.1\n"
+"Project-Id-Version: Thematic 1.0.3\n"
+
+#: archives.php:20 template-page-blog.php:22
+msgid "The template %s"
+msgstr "Темплејт %s"
+
+#: attachment.php:54 library/extensions/content-extensions.php:630
+#: library/extensions/content-extensions.php:689
+msgid "Pages:"
+msgstr "Стране:"
+
+#: author.php:67
+msgid "Email "
+msgstr "Е-пошта"
+
+#: comments.php:24
+msgid "Please do not load this page directly."
+msgstr "Молим Вас да не учитавате ову страницу директно."
+
+#: comments.php:33
+msgid "This post is password protected. Enter the password to view any comments."
+msgstr "Овај чланак је заштићен шифром. Унестите шифру како бисте видели коментаре."
+
+#: comments.php:111
+msgid "Trackbacks"
+msgstr "Трекбекови"
+
+#: comments.php:111
+msgctxt "%1$ and %2$s are <span> tags"
+msgid "%1$sOne%2$s Trackback"
+msgstr "%1$sЈедан%2$s Трекбек"
+
+#: functions.php:194
+msgid "Primary Menu"
+msgstr "Примарни мени"
+
+#: library/extensions/comments-extensions.php:120
+msgctxt "One Comment, where %$1s and %$2s are <span> tags"
+msgid "%1$sOne%2$s Comment"
+msgstr "%1$sЈедан%2$s Коментар"
+
+#: library/extensions/comments-extensions.php:131
+msgid "Comments"
+msgstr "Коментари"
+
+#: library/extensions/comments-extensions.php:155
+msgid "Post a Comment"
+msgstr "Објавите коментар"
+
+#: library/extensions/comments-extensions.php:167
+msgid "Post a Reply to %s"
+msgstr "Одговорите на %s"
+
+#: library/extensions/comments-extensions.php:179
+msgctxt "noun"
+msgid "Comment"
+msgstr "Коментар"
+
+#: library/extensions/comments-extensions.php:190
+msgid "Cancel reply"
+msgstr "Поништите одговор"
+
+#: library/extensions/comments-extensions.php:202
+msgid "Post Comment"
+msgstr "Објавите коментар"
+
+#: library/extensions/comments-extensions.php:228
+#: library/legacy/deprecated.php:357
+msgid "Name"
+msgstr "Име"
+
+#: library/extensions/comments-extensions.php:228
+#: library/extensions/comments-extensions.php:229
+msgctxt "denotes required field"
+msgid "*"
+msgstr "*"
+
+#: library/extensions/comments-extensions.php:229
+#: library/legacy/deprecated.php:362
+msgid "Email"
+msgstr "Е-пошта"
+
+#: library/extensions/comments-extensions.php:230
+#: library/legacy/deprecated.php:367
+msgid "Website"
+msgstr "Вебсајт"
+
+#: library/extensions/comments-extensions.php:238
+#: library/legacy/deprecated.php:354
+msgctxt "%$1s and %$2s are <em> tags for emphasis on never"
+msgid "Your email is %1$snever%2$s published nor shared."
+msgstr "Ваша е-пошта неће %1$sникад%2$s бити објављена или прослеђена наком."
+
+#: library/extensions/comments-extensions.php:238
+msgctxt "%$1s and %$2s are <span> tags"
+msgid "Required fields are marked %1$s*%2$s"
+msgstr "Захтевана поља су обележена %1$s*%2$s"
+
+#: library/extensions/comments-extensions.php:240
+#: library/legacy/deprecated.php:336
+msgid "You must be %1$slogged in%2$s to post a comment."
+msgstr "Морате се %1$пријавити %2$s да бисте оставили коментар"
+
+#: library/extensions/comments-extensions.php:240
+#: library/legacy/deprecated.php:336
+msgid "Log in"
+msgstr "Пријави се"
+
+#: library/extensions/comments-extensions.php:242
+#: library/legacy/deprecated.php:349
+msgid "Logged in as %s"
+msgstr "Пријављен као %s"
+
+#: library/extensions/comments-extensions.php:242
+#: library/legacy/deprecated.php:349
+msgid "Log out of this account"
+msgstr "Изађите из овог налога"
+
+#: library/extensions/comments-extensions.php:242
+#: library/legacy/deprecated.php:349
+msgid "Log out?"
+msgstr "Желите да се одјавите?"
+
+#: library/extensions/comments-extensions.php:244
+#: library/legacy/deprecated.php:379
+msgctxt "%$1s and %$2s are <abbr> tags"
+msgid "You may use these %1$sHTML%2$s tags and attributes"
+msgstr "Можете користити ове %1$sHTML%2$s ознаке и атрибуте"
+
+#: library/extensions/content-extensions.php:334
+msgid "Author Archives:"
+msgstr "Архиве аутора"
+
+#: library/extensions/content-extensions.php:339
+#: library/extensions/header-extensions.php:103
+msgid "Category Archives:"
+msgstr "Архиве категорија"
+
+#: library/extensions/content-extensions.php:347
+#: library/extensions/header-extensions.php:99
+msgid "Search Results for:"
+msgstr "Резултати претраге за:"
+
+#: library/extensions/content-extensions.php:352
+#: library/extensions/header-extensions.php:107
+msgid "Tag Archives:"
+msgstr "Таг архива"
+
+#: library/extensions/content-extensions.php:361
+#: library/extensions/content-extensions.php:368
+msgid "Archives:"
+msgstr "Архиве:"
+
+#: library/extensions/content-extensions.php:373
+msgid "Daily Archives: %s"
+msgstr "Дневни архиви: %s"
+
+#: library/extensions/content-extensions.php:377
+msgid "Monthly Archives: %s"
+msgstr "Месечни архиви: %s"
+
+#: library/extensions/content-extensions.php:381
+msgid "Yearly Archives: %s"
+msgstr "Годишнји архиви: %s"
+
+#: library/extensions/content-extensions.php:424
+#: library/extensions/content-extensions.php:1706
+msgid "Older posts"
+msgstr "Старији чланци"
+
+#: library/extensions/content-extensions.php:426
+#: library/extensions/content-extensions.php:1708
+msgid "Newer posts"
+msgstr "Новији чланци"
+
+#: library/extensions/content-extensions.php:888
+#: library/extensions/content-extensions.php:1418
+msgid "Edit post"
+msgstr "Измена чланка"
+
+#: library/extensions/content-extensions.php:890
+#: library/extensions/content-extensions.php:1420
+#: library/extensions/discussion-extensions.php:37
+#: library/extensions/discussion.php:84 links.php:54 page.php:52
+#: template-page-archives.php:55 template-page-fullwidth.php:53
+msgid "Edit"
+msgstr "Измена"
+
+#: library/extensions/content-extensions.php:918
+#: library/extensions/header-extensions.php:111
+msgid "Not Found"
+msgstr "Ништа није пронађено"
+
+#: library/extensions/content-extensions.php:923
+#: library/extensions/content-extensions.php:1141
+#: library/extensions/content-extensions.php:1145
+#: library/extensions/content-extensions.php:1376
+msgid "Permalink to %s"
+msgstr "Пермалинк на %s"
+
+#: library/extensions/content-extensions.php:983
+msgid "By"
+msgstr "Од "
+
+#: library/extensions/content-extensions.php:994
+msgid "View all posts by %s"
+msgstr "Погледај све чланке од %s"
+
+#: library/extensions/content-extensions.php:1023
+msgid "Published:"
+msgstr "Објављено: "
+
+#: library/extensions/content-extensions.php:1199
+msgid "Archives by Category"
+msgstr "Архиве по категоријама"
+
+#: library/extensions/content-extensions.php:1230
+msgid "Archives by Month"
+msgstr "Архиве по месецу"
+
+#: library/extensions/content-extensions.php:1291
+msgid "Apologies, but we were unable to find what you were looking for. Perhaps searching will help."
+msgstr "Извините, али ми нисмо у могућности да пронађемо оно сте тражили. Можда Вам претрага може помоћи. "
+
+#: library/extensions/content-extensions.php:1297 search.php:70
+msgid "Find"
+msgstr "Пронађи"
+
+#: library/extensions/content-extensions.php:1316
+msgid "Read More %s"
+msgstr "Прочитај више %s"
+
+#: library/extensions/content-extensions.php:1368
+msgid "Browse the %s archive."
+msgstr "Претражи %s архиву."
+
+#: library/extensions/content-extensions.php:1370
+msgid "Permalink to %s Archive"
+msgstr "Пермалинк до %s Архиве"
+
+#: library/extensions/content-extensions.php:1376
+msgctxt "1s and 2s are the a href link wrappers, do not reverse them"
+msgid "Bookmark the %1$spermalink%2$s."
+msgstr "Забележи (bookmark) %1$sпермалинк%2$s."
+
+#: library/extensions/content-extensions.php:1534
+msgid "This entry was posted in %s"
+msgstr "Унос је објављен у %s"
+
+#: library/extensions/content-extensions.php:1545
+msgid "Also posted in %s"
+msgstr "Такође објављено у %s"
+
+#: library/extensions/content-extensions.php:1549
+msgid "Posted in %s"
+msgstr "Објављено у %s"
+
+#: library/extensions/content-extensions.php:1575
+msgid "This entry is tagged"
+msgstr "Унос је означен (tagged)"
+
+#: library/extensions/content-extensions.php:1578
+msgid "and tagged"
+msgstr "и означен (tagged)"
+
+#: library/extensions/content-extensions.php:1581
+msgid "Also tagged"
+msgstr "Такође означен (tagged)"
+
+#: library/extensions/content-extensions.php:1583
+msgid "Tagged"
+msgstr "Oзначен (tagged)"
+
+#: library/extensions/content-extensions.php:1613
+#: library/extensions/content-extensions.php:1619
+msgid "Comment on %s"
+msgstr "Коментар на %s"
+
+#: library/extensions/content-extensions.php:1615
+msgid "%s Response"
+msgid_plural "%s Responses"
+msgstr[0] "%s Одговор"
+msgstr[1] "%s Одговора"
+msgstr[2] "%s Одговора"
+
+#: library/extensions/content-extensions.php:1620
+msgid "Leave a comment"
+msgstr "Остави коментар"
+
+#: library/extensions/content-extensions.php:1623
+msgid "Comments closed"
+msgstr "Коментари су затворени"
+
+#: library/extensions/content-extensions.php:1647
+msgctxt "1s and 2s are the a href link wrappers, do not reverse them. 3s is trackback url."
+msgid "%1$sPost a comment%2$s or leave a trackback: %3$s"
+msgstr "%1$sОбјави коментар%2$s или остави трекбек: %3$s"
+
+#: library/extensions/content-extensions.php:1648
+#: library/extensions/content-extensions.php:1663
+msgid "Post a comment"
+msgstr "Објави коментар"
+
+#: library/extensions/content-extensions.php:1652
+#: library/extensions/content-extensions.php:1659
+msgid "Trackback URL for your post"
+msgstr "Трекбек URL за Ваш чланак"
+
+#: library/extensions/content-extensions.php:1653
+#: library/extensions/content-extensions.php:1660
+msgid "Trackback URL"
+msgstr "Трекбек URL"
+
+#: library/extensions/content-extensions.php:1656
+msgctxt "%s is trackback url, wrapped in link tags"
+msgid "Comments are closed, but you can leave a trackback: %s"
+msgstr "Коментари су затворени, али ви можете оставити трекбек: %s"
+
+#: library/extensions/content-extensions.php:1663
+msgid "Trackbacks are closed, but you can %1$spost a comment%2$s."
+msgstr "Трекбекови су затворени, али можете %1$sобјавити коментар%2$s."
+
+#: library/extensions/content-extensions.php:1665
+msgid "Both comments and trackbacks are currently closed."
+msgstr "И коментари и трекбекови су тренутно затворени"
+
+#: library/extensions/discussion-extensions.php:27
+msgctxt "Posted {$date} at {$time}"
+msgid "Posted %s at %s"
+msgstr "Објављено %s код %s"
+
+#: library/extensions/discussion-extensions.php:31
+msgid "Permalink to this comment"
+msgstr "Пермалинк на овај коментар"
+
+#: library/extensions/discussion-extensions.php:31
+msgid "Permalink"
+msgstr "Пермалинк"
+
+#: library/extensions/discussion-extensions.php:36
+msgid "Edit comment"
+msgstr "Измена коментара"
+
+#: library/extensions/discussion.php:37
+msgid "Your comment is awaiting moderation"
+msgstr "Ваш коменатар чека проверу од стране модератора"
+
+#: library/extensions/discussion.php:52
+msgid "Reply"
+msgstr "Одговор"
+
+#: library/extensions/discussion.php:53
+msgid "Log in to reply."
+msgstr "Пријави се ради одговора"
+
+#: library/extensions/discussion.php:80
+msgctxt "By {$authorlink} on {$date} at {$time}"
+msgid "By %1$s on %2$s at %3$s"
+msgstr "Од %1$s на %2$s код %3$s"
+
+#: library/extensions/discussion.php:90
+msgid "Your trackback is awaiting moderation"
+msgstr "Ваш трекбек чека проверу модератора"
+
+#: library/extensions/header-extensions.php:319
+#: library/extensions/widgets.php:157
+msgid "Posts RSS feed"
+msgstr "RSS feed о чланцима"
+
+#: library/extensions/header-extensions.php:343
+#: library/extensions/widgets.php:158
+msgid "Comments RSS feed"
+msgstr "RSS feed о коментарима"
+
+#: library/extensions/header-extensions.php:642
+msgid "Skip navigation to the content"
+msgstr "Прескочи навигацију до садржаја"
+
+#: library/extensions/header-extensions.php:642
+msgid "Skip to content"
+msgstr "Иди на садржај"
+
+#: library/extensions/helpers.php:50 library/extensions/helpers.php:69
+msgid "There is no excerpt because this is a protected post."
+msgstr "Није могућ приступ, ово је заштићени чланак"
+
+#: library/extensions/theme-options.php:50
+msgid "Index Insert Position"
+msgstr "Индекс Унос Позиција"
+
+#: library/extensions/theme-options.php:51
+msgid "Info on Author Page"
+msgstr "Информације о аутору стране"
+
+#: library/extensions/theme-options.php:52
+msgid "Text in Footer"
+msgstr "Текст у подножју странице (footer)"
+
+#: library/extensions/theme-options.php:56
+msgid "Remove Legacy Options"
+msgstr "Уклони Опције о правима"
+
+#: library/extensions/theme-options.php:170
+msgid "Theme Options"
+msgstr "Опције за тему"
+
+#: library/extensions/theme-options.php:202
+msgid "For more information:"
+msgstr "За више информација:"
+
+#: library/extensions/theme-options.php:204
+msgid "For support:"
+msgstr "За подршку:"
+
+#: library/extensions/theme-options.php:206
+msgid "forums"
+msgstr "форуми"
+
+#: library/extensions/theme-options.php:210
+msgid "The options below are enabled by the Thematic Theme framework and/or a child theme."
+msgstr "Опције испод су омогућене од стране фрејмворка Thematic теме и/или њене child теме."
+
+#: library/extensions/theme-options.php:211
+msgid "New options can be added and the default ones removed by creating a child theme. This contextual help can be customized in a child theme also."
+msgstr "Нове опције се могу додати и оне стандарне постојеће се могу уклонити креирањем једне Thematic теме. Ова контекстуална помоћ се такође може прилагодити у оквиру те Thematic теме."
+
+#: library/extensions/theme-options.php:217
+msgid "Overview"
+msgstr "Oсврт на "
+
+#: library/extensions/theme-options.php:244
+msgctxt "%1$s and %2$s are <a> tags"
+msgid "For more information about this theme, %1$svisit ThematicTheme.com%2$s"
+msgstr "За више информација о овој теми, %1$посетите ThematicTheme.com%2$s"
+
+#: library/extensions/theme-options.php:244
+msgctxt "%1$s and %2$s are <a> tags"
+msgid "Please visit the %1$sThematicTheme.com Forums%2$s if you have any questions about Thematic."
+msgstr "Молимо Вас посетете %1$sThematicTheme.com форуме%2$s уколико имате нека питања о Thematic"
+
+#: library/extensions/theme-options.php:256
+msgctxt "{$current theme} Theme Options"
+msgid "%s Theme Options"
+msgstr "%s Опције теме"
+
+#: library/extensions/theme-options.php:294
+msgid "The Index Insert widget area will appear after this post number. Entering nothing or 0 will disable this feature."
+msgstr "Индекс за унос widget области ће се појавити после овог броја чланка. Не уношењем ничега или 0 ће онемогућити ово својство. "
+
+#: library/extensions/theme-options.php:307
+msgctxt "%1$s and %2$s are <a> tags"
+msgid "Display a %1$smicroformatted vCard%2$s with the author's avatar, bio and email on the author page."
+msgstr "Прикажи %1$smicroformatted vCard%2$s на аватару аутора, био и е-пошту на ауторвој страни"
+
+#: library/extensions/theme-options.php:320
+msgctxt "%s are shortcode tags"
+msgid "You can use HTML and shortcodes in your footer text. Shortcode examples: %s"
+msgstr "Можете користити и кодовне скраћенице у подножју Вашег текста. Примери кодовних скраћеница: %s"
+
+#: library/extensions/theme-options.php:333
+msgctxt "{$current theme} Theme Options"
+msgid "%s Theme Options have been upgraded to an improved format. Remove the legacy options from the database."
+msgstr "%s Опције теме ће бити надограђене у једну унапређену опцију. Уклоните опције о правима из базе података. "
+
+#: library/extensions/theme-options.php:360
+msgid "The index insert position value must be a number equal to or greater than zero. This setting has been reverted to the previous value."
+msgstr "Вредност индекса позиције уноса мора бити број који је једнак или већи од нуле. Ово подешавање ће бити враћено на претходну вредност."
+
+#: library/extensions/widgets-extensions.php:34
+msgid "To search, type and hit enter"
+msgstr "За претрагу, унесите појам и притисните Enter"
+
+#: library/extensions/widgets-extensions.php:40
+#: library/extensions/widgets.php:56 library/extensions/widgets.php:61
+msgid "Search"
+msgstr "Претрага"
+
+#: library/extensions/widgets-extensions.php:70
+msgid "Primary Aside"
+msgstr "Примарни Aside"
+
+#: library/extensions/widgets-extensions.php:72
+msgid "The primary widget area, most often used as a sidebar."
+msgstr "Примарна widget област , се често користи у оквиру Sidebar-а"
+
+#: library/extensions/widgets-extensions.php:85
+msgid "Secondary Aside"
+msgstr "Секундарни Aside"
+
+#: library/extensions/widgets-extensions.php:87
+msgid "The secondary widget area, most often used as a sidebar."
+msgstr "Секундарна widget област, се често користи у оквиру Sidebar-а "
+
+#: library/extensions/widgets-extensions.php:100
+msgid "1st Subsidiary Aside"
+msgstr "1. Помоћни Aside"
+
+#: library/extensions/widgets-extensions.php:102
+msgid "The 1st widget area in the footer."
+msgstr "1. widget област у подножју странице (footer)"
+
+#: library/extensions/widgets-extensions.php:115
+msgid "2nd Subsidiary Aside"
+msgstr "2. Помоћни Aside "
+
+#: library/extensions/widgets-extensions.php:117
+msgid "The 2nd widget area in the footer."
+msgstr "2. widget област у подножју сајта (footer) "
+
+#: library/extensions/widgets-extensions.php:130
+msgid "3rd Subsidiary Aside"
+msgstr "3. Помоћни Aside "
+
+#: library/extensions/widgets-extensions.php:132
+msgid "The 3rd widget area in the footer."
+msgstr "3. widget област у подножју сајта (footer) "
+
+#: library/extensions/widgets-extensions.php:145
+msgid "Index Top"
+msgstr "Индекс Врх"
+
+#: library/extensions/widgets-extensions.php:147
+msgid "The top widget area displayed on the index page."
+msgstr "Горња widget област приказана на index страни"
+
+#: library/extensions/widgets-extensions.php:160
+msgid "Index Insert"
+msgstr "Индекс Унос"
+
+#: library/extensions/widgets-extensions.php:162
+msgid "The widget area inserted after x posts on the index page."
+msgstr "Widget oбласт се убацује након x чланака на index страни."
+
+#: library/extensions/widgets-extensions.php:175
+msgid "Index Bottom"
+msgstr "Индекс При дну"
+
+#: library/extensions/widgets-extensions.php:177
+msgid "The bottom widget area displayed on the index page."
+msgstr "Widget област при дну приказана на index страни"
+
+#: library/extensions/widgets-extensions.php:190
+msgid "Single Top"
+msgstr "Појединачан Врх"
+
+#: library/extensions/widgets-extensions.php:192
+msgid "The top widget area displayed on a single post."
+msgstr "Widget област при врху приказана напојединачном чланку "
+
+#: library/extensions/widgets-extensions.php:205
+msgid "Single Insert"
+msgstr "Појединачан Унос"
+
+#: library/extensions/widgets-extensions.php:207
+msgid "The widget area inserted between the post and the comments on a single post."
+msgstr "Widget област унешена између одређеног чланка и коментара на појединачном чланку."
+
+#: library/extensions/widgets-extensions.php:220
+msgid "Single Bottom"
+msgstr "Сингл При дну"
+
+#: library/extensions/widgets-extensions.php:222
+msgid "The bottom widget area displayed on a single post."
+msgstr "Widget област при дну приказана на појединачном чланку"
+
+#: library/extensions/widgets-extensions.php:235
+msgid "Page Top"
+msgstr "Страна При врху"
+
+#: library/extensions/widgets-extensions.php:237
+msgid "The top widget area displayed on a page."
+msgstr "Widget област при врху приказана на једној страни."
+
+#: library/extensions/widgets-extensions.php:250
+msgid "Page Bottom"
+msgstr "Страна При дну"
+
+#: library/extensions/widgets-extensions.php:252
+msgid "The bottom widget area displayed on a page."
+msgstr "Widget област при дну приказана на једној страни."
+
+#: library/extensions/widgets.php:55
+msgid "A search form for your blog"
+msgstr "Форма за претрагу за Ваш блог"
+
+#: library/extensions/widgets.php:77 library/extensions/widgets.php:132
+#: library/extensions/widgets.php:175
+msgid "Title:"
+msgstr "Наслов:"
+
+#: library/extensions/widgets.php:100
+msgid "Log in/out and admin"
+msgstr "Пријава/Одјава и админ"
+
+#: library/extensions/widgets.php:101 library/extensions/widgets.php:106
+msgid "Meta"
+msgstr "Мета"
+
+#: library/extensions/widgets.php:145
+msgid "Links to your posts and comments feed"
+msgstr "Линкови ка feed-ovima Ваших чланака и коментара"
+
+#: library/extensions/widgets.php:146 library/extensions/widgets.php:151
+msgid "RSS Links"
+msgstr "RSS линкови"
+
+#: library/extensions/widgets.php:157
+msgid "All posts"
+msgstr "Сви чланци"
+
+#: library/extensions/widgets.php:158
+msgid "All comments"
+msgstr "Сви коментари"
+
+#: library/legacy/deprecated.php:349
+msgid "Logged in as"
+msgstr "Пријављен као"
+
+#: library/legacy/deprecated.php:357 library/legacy/deprecated.php:362
+msgid "<span class=\"required\">*</span>"
+msgstr "<span class=\"required\">*</span>"
+
+#: page.php:50 template-page-fullwidth.php:51
+msgid "Pages: "
+msgstr "Стране:"
+
+#: search.php:56
+msgid "Nothing Found"
+msgstr "Ништа није пронађено"
+
+#: search.php:60
+msgid "Sorry, but nothing matched your search criteria. Please try again with some different keywords."
+msgstr "Извините, али ништа није пронађено за Ваш критеријум претраге. Молимо Вас, покушајте поново са различитим кључним речима претраге."
+
+#: template-page-blog.php:22
+msgid "You can include a %s in a childtheme"
+msgstr "Можете укључити %s у child тему"
+
+msgid "Thematic"
+msgstr "Thematic"
+
+msgid "http://thematictheme.com"
+msgstr "http://thematictheme.com"
+
+msgid "The ultimate in SEO-ready themes, Thematic is a highly extensible, WordPress Theme Framework featuring 13 widget-ready areas, drop-down menus, grid-based layout samples, plugin integration, shortcodes for your footer, & a whole lot more. Perfect for any blog and <strong><em>the</em></strong> starting point for theme development."
+msgstr "Ултимативна SEO спремна тема, Thematic је веома проширив, WordPress Theme Framework, са 13 widget спремних области, drop-down менији, семплови layout-a који си засновани на grid-y, пинтеграција додатака (plugin), кодовних скраћеница за Ваше подножје странице, & и још много тога. Одлично за било који блог и као <strong><em>добра</em></strong> полазна основа за развој своје теме."
+
+msgid "<a href=\"http://themeshaper.com/\">Ian Stewart</a> & <a href=\"http://thematic4you.com/\">Chris Goßmann</a>"
+msgstr "<a href=\"http://themeshaper.com/\">Ian Stewart</a> & <a href=\"http://thematic4you.com/\">Chris Goßmann</a>"
+
+msgid "http://themeshaper.com/"
+msgstr "http://themeshaper.com/ "
+
+msgid "white, three-columns, two-columns, fixed-width, theme-options, left-sidebar, right-sidebar, threaded-comments, sticky-post, microformats"
+msgstr ""
+"Бела, са три колоне, две колоне, фиксираним дужинама, опцјама теме, левим sidebar-ом, деним sidebar-ом, threaded коментарима, лепљивим коментарима, microformat-има\n"
+" "
+
+msgid "Deprecated Archives Template"
+msgstr "Темплејт са старим архивама"
+
+msgid "Links Page"
+msgstr "Страна са линковима"
+
+msgid "Archives Page"
+msgstr "Страна са архивама"
+
+msgid "Deprecated Blog Template"
+msgstr "Темплејт са старим чланцима "
+
+msgid "Full Width"
+msgstr "Пуна дужина"
\ No newline at end of file
diff --git a/wp-content/themes/thematic/library/languages/sv_SE.mo b/wp-content/themes/thematic/library/languages/sv_SE.mo
index ee304834418f1221250408ae91037455103cf53d..c77f63fac507679748ba60841b8acd0a47af7e53 100644
Binary files a/wp-content/themes/thematic/library/languages/sv_SE.mo and b/wp-content/themes/thematic/library/languages/sv_SE.mo differ
diff --git a/wp-content/themes/thematic/library/languages/sv_SE.po b/wp-content/themes/thematic/library/languages/sv_SE.po
index f71e62572a1ee72447bcf1a6bbbaebd71672476b..b4dc90304c7c61e2bf90f945314bf2f3113bc6ae 100644
--- a/wp-content/themes/thematic/library/languages/sv_SE.po
+++ b/wp-content/themes/thematic/library/languages/sv_SE.po
@@ -2,7 +2,7 @@
# This file is distributed under the same license as the Thematic 1.0.3 package.
msgid ""
msgstr ""
-"PO-Revision-Date: 2012-06-25 15:44:12+0000\n"
+"PO-Revision-Date: 2012-09-02 09:54:27+0000\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -10,16 +10,12 @@ msgstr ""
"X-Generator: GlotPress/0.1\n"
"Project-Id-Version: Thematic 1.0.3\n"
-#: library/extensions/content-extensions.php:947
-#: library/extensions/content-extensions.php:1461
-#: library/extensions/discussion-extensions.php:36
-#: library/extensions/discussion.php:84 links.php:60 page.php:60
-#: template-page-archives.php:63 template-page-fullwidth.php:61
-msgid "Edit"
-msgstr "Redigera"
+#: archives.php:20 template-page-blog.php:22
+msgid "The template %s"
+msgstr "Temafilen %s"
-#: attachment.php:62 library/extensions/content-extensions.php:666
-#: library/extensions/content-extensions.php:732
+#: attachment.php:54 library/extensions/content-extensions.php:630
+#: library/extensions/content-extensions.php:689
msgid "Pages:"
msgstr "Sidor:"
@@ -27,275 +23,337 @@ msgstr "Sidor:"
msgid "Email "
msgstr "Epost"
+#: comments.php:24
+msgid "Please do not load this page directly."
+msgstr "Ladda inte den här filen direkt, tack."
+
#: comments.php:33
msgid "This post is password protected. Enter the password to view any comments."
msgstr "Detta inlägg är lösenordsskyddat. Skriv in lösenordet för att se kommentarer."
#: comments.php:111
-msgid "<span>One</span> Trackback"
-msgstr "<span>En</span> trackback"
+msgid "Trackbacks"
+msgstr "Trackbackar"
+
+#: comments.php:111
+msgctxt "%1$ and %2$s are <span> tags"
+msgid "%1$sOne%2$s Trackback"
+msgstr "%1$sEn%2$s Trackback"
+
+#: functions.php:194
+msgid "Primary Menu"
+msgstr "Primär meny"
-#: comments.php:142 library/extensions/comments-extensions.php:234
-msgid "You must be <a href=\"%s\" title=\"Log in\">logged in</a> to post a comment."
-msgstr "Du måste vara <a href=\"%s\" title=\"Logga in\">inloggad</a> för att skriva en kommentar."
+#: library/extensions/comments-extensions.php:120
+msgctxt "One Comment, where %$1s and %$2s are <span> tags"
+msgid "%1$sOne%2$s Comment"
+msgstr "%1$sEn%2$s Kommentar"
-#: comments.php:156 library/extensions/comments-extensions.php:235
-msgid "<span class=\"loggedin\">Logged in as <a href=\"%1$s\" title=\"Logged in as %2$s\">%2$s</a>.</span> <span class=\"logout\"><a href=\"%3$s\" title=\"Log out of this account\">Log out?</a></span>"
-msgstr "<span class=\"loggedin\">Inloggad som <a href=\"%1$s\" title=\"Inloggad som %2$s\">%2$s</a>.</span> <span class=\"logout\"><a href=\"%3$s\" title=\"Logga ut ifrån det här kontot\">Logga ut?</a></span>"
+#: library/extensions/comments-extensions.php:131
+msgid "Comments"
+msgstr "Kommentarer"
-#: comments.php:164 library/extensions/comments-extensions.php:233
-msgid "Your email is <em>never</em> published nor shared."
-msgstr "Din epostadress delas eller publiceras <em>aldrig</em>"
+#: library/extensions/comments-extensions.php:155
+msgid "Post a Comment"
+msgstr "Skriv en kommentar"
-#: comments.php:164 library/extensions/comments-extensions.php:233
-msgid "Required fields are marked <span class=\"required\">*</span>"
-msgstr "Obligatoriska fält är markerade med <span class=\"required\">*</span>"
+#: library/extensions/comments-extensions.php:167
+msgid "Post a Reply to %s"
+msgstr "Skriv ett svar till %s"
-#: comments.php:167 library/extensions/comments-extensions.php:224
+#: library/extensions/comments-extensions.php:179
+msgctxt "noun"
+msgid "Comment"
+msgstr "Kommentar"
+
+#: library/extensions/comments-extensions.php:190
+msgid "Cancel reply"
+msgstr "Avbryt svar"
+
+#: library/extensions/comments-extensions.php:202
+msgid "Post Comment"
+msgstr "Lämna kommentar"
+
+#: library/extensions/comments-extensions.php:228
+#: library/legacy/deprecated.php:357
msgid "Name"
msgstr "Namn"
-#: comments.php:167 comments.php:172
-#: library/extensions/comments-extensions.php:224
-#: library/extensions/comments-extensions.php:225
-msgid "<span class=\"required\">*</span>"
-msgstr "<span class=\"required\">*</span>"
+#: library/extensions/comments-extensions.php:228
+#: library/extensions/comments-extensions.php:229
+msgctxt "denotes required field"
+msgid "*"
+msgstr "*"
-#: comments.php:172 library/extensions/comments-extensions.php:225
+#: library/extensions/comments-extensions.php:229
+#: library/legacy/deprecated.php:362
msgid "Email"
msgstr "Epost"
-#: comments.php:177 library/extensions/comments-extensions.php:226
+#: library/extensions/comments-extensions.php:230
+#: library/legacy/deprecated.php:367
msgid "Website"
msgstr "Website"
-#: comments.php:189 library/extensions/comments-extensions.php:236
-msgid "You may use these <abbr title=\"HyperText Markup Language\">HTML</abbr> tags and attributes:"
-msgstr "Du kan använda dessa <abbr title=\"HyperText Markup Language\">HTML</abbr>-taggar och attribut:"
-
-#: page.php:58 template-page-fullwidth.php:59
-msgid "Pages: "
-msgstr "Sidor:"
-
-#: search.php:56
-msgid "Nothing Found"
-msgstr "Inga träffar"
-
-#: search.php:60
-msgid "Sorry, but nothing matched your search criteria. Please try again with some different keywords."
-msgstr "Tyvärr, men ingenting matchar ditt sökkriterie. Försök med en annan söksträng."
-
-#: library/extensions/content-extensions.php:1346 search.php:70
-msgid "Find"
-msgstr "Sök"
+#: library/extensions/comments-extensions.php:238
+#: library/legacy/deprecated.php:354
+msgctxt "%$1s and %$2s are <em> tags for emphasis on never"
+msgid "Your email is %1$snever%2$s published nor shared."
+msgstr "Din epostadress publiceras eller delas %1$saldrig%2$s."
+
+#: library/extensions/comments-extensions.php:238
+msgctxt "%$1s and %$2s are <span> tags"
+msgid "Required fields are marked %1$s*%2$s"
+msgstr "Obligatoriska fält är markerade med %1$s*%2$s"
+
+#: library/extensions/comments-extensions.php:240
+#: library/legacy/deprecated.php:336
+msgid "You must be %1$slogged in%2$s to post a comment."
+msgstr "Du måste vara %1$sinloggad%2$s för att kommentera."
+
+#: library/extensions/comments-extensions.php:240
+#: library/legacy/deprecated.php:336
+msgid "Log in"
+msgstr "Logga in"
-#: library/extensions/comments-extensions.php:120
-msgid "<span>One</span> Comment"
-msgstr "<span>En</span> kommentar"
+#: library/extensions/comments-extensions.php:242
+#: library/legacy/deprecated.php:349
+msgid "Logged in as %s"
+msgstr "Inloggad som %s"
-#: library/extensions/comments-extensions.php:154
-msgid "Post a Comment"
-msgstr "Skriv en kommentar"
+#: library/extensions/comments-extensions.php:242
+#: library/legacy/deprecated.php:349
+msgid "Log out of this account"
+msgstr "Logga ut från det här användarkontot"
-#: library/extensions/comments-extensions.php:165
-msgid "Post a Reply to %s"
-msgstr "Skriv ett svar till %s"
+#: library/extensions/comments-extensions.php:242
+#: library/legacy/deprecated.php:349
+msgid "Log out?"
+msgstr "Logga ut?"
-#: library/extensions/comments-extensions.php:176
-msgid "Comment"
-msgstr "Kommentar"
+#: library/extensions/comments-extensions.php:244
+#: library/legacy/deprecated.php:379
+msgctxt "%$1s and %$2s are <abbr> tags"
+msgid "You may use these %1$sHTML%2$s tags and attributes"
+msgstr "Du kan använda dessa %1$sHTML%2$s taggar och attribut"
-#: library/extensions/comments-extensions.php:187
-msgid "Cancel reply"
-msgstr "Avbryt svar"
-
-#: library/extensions/comments-extensions.php:198
-msgid "Post Comment"
-msgstr "Lämna kommentar"
+#: library/extensions/content-extensions.php:334
+msgid "Author Archives:"
+msgstr "Författararkiv:"
-#: library/extensions/content-extensions.php:340
-#: library/extensions/header-extensions.php:84
+#: library/extensions/content-extensions.php:339
+#: library/extensions/header-extensions.php:103
msgid "Category Archives:"
msgstr "Kategori-arkiv:"
-#: library/extensions/content-extensions.php:349
-#: library/extensions/header-extensions.php:80
+#: library/extensions/content-extensions.php:347
+#: library/extensions/header-extensions.php:99
msgid "Search Results for:"
msgstr "Sök i resultaten efter:"
-#: library/extensions/content-extensions.php:355
-#: library/extensions/header-extensions.php:88
+#: library/extensions/content-extensions.php:352
+#: library/extensions/header-extensions.php:107
msgid "Tag Archives:"
msgstr "Tag-arkiv:"
-#: library/extensions/content-extensions.php:364
-#: library/extensions/content-extensions.php:373
+#: library/extensions/content-extensions.php:361
+#: library/extensions/content-extensions.php:368
msgid "Archives:"
msgstr "Arkiv:"
-#: library/extensions/content-extensions.php:379
-msgid "Daily Archives: <span>%s</span>"
-msgstr "Arkiv (dagligen): <span>%s</span>"
+#: library/extensions/content-extensions.php:373
+msgid "Daily Archives: %s"
+msgstr "Arkiv (dagligen): %s"
-#: library/extensions/content-extensions.php:383
-msgid "Monthly Archives: <span>%s</span>"
-msgstr "Arkiv (månadsvis): <span>%s</span>"
+#: library/extensions/content-extensions.php:377
+msgid "Monthly Archives: %s"
+msgstr "Arkiv (månadsvis): %s"
-#: library/extensions/content-extensions.php:387
-msgid "Yearly Archives: <span>%s</span>"
-msgstr "Arkiv (årligen): <span>%s</span>"
+#: library/extensions/content-extensions.php:381
+msgid "Yearly Archives: %s"
+msgstr "Arkiv (årligen): %s"
-#: library/extensions/content-extensions.php:429
-#: library/extensions/content-extensions.php:1728
-msgid "<span class=\"meta-nav\">«</span> Older posts"
-msgstr "<span class=\"meta-nav\">«</span> Äldre inlägg"
+#: library/extensions/content-extensions.php:424
+#: library/extensions/content-extensions.php:1706
+msgid "Older posts"
+msgstr "Äldre inlägg"
-#: library/extensions/content-extensions.php:431
-#: library/extensions/content-extensions.php:1729
-msgid "Newer posts <span class=\"meta-nav\">»</span>"
-msgstr "Senare inlägg <span class=\"meta-nav\">»</span>"
+#: library/extensions/content-extensions.php:426
+#: library/extensions/content-extensions.php:1708
+msgid "Newer posts"
+msgstr "Nyare inlägg"
-#: library/extensions/content-extensions.php:946
-#: library/extensions/content-extensions.php:1460
+#: library/extensions/content-extensions.php:888
+#: library/extensions/content-extensions.php:1418
msgid "Edit post"
msgstr "Redigera inlägg"
-#: library/extensions/content-extensions.php:975
-#: library/extensions/header-extensions.php:92
+#: library/extensions/content-extensions.php:890
+#: library/extensions/content-extensions.php:1420
+#: library/extensions/discussion-extensions.php:37
+#: library/extensions/discussion.php:84 links.php:54 page.php:52
+#: template-page-archives.php:55 template-page-fullwidth.php:53
+msgid "Edit"
+msgstr "Redigera"
+
+#: library/extensions/content-extensions.php:918
+#: library/extensions/header-extensions.php:111
msgid "Not Found"
msgstr "Inte hittat"
-#: library/extensions/content-extensions.php:980
-#: library/extensions/content-extensions.php:1413
-#: library/extensions/content-extensions.php:1417
-msgid "Permalink to "
-msgstr "Permalink till "
+#: library/extensions/content-extensions.php:923
+#: library/extensions/content-extensions.php:1141
+#: library/extensions/content-extensions.php:1145
+#: library/extensions/content-extensions.php:1376
+msgid "Permalink to %s"
+msgstr "Permalänk till %s"
-#: library/extensions/content-extensions.php:1041
-msgid "By "
-msgstr "Av "
+#: library/extensions/content-extensions.php:983
+msgid "By"
+msgstr "Av"
-#: library/extensions/content-extensions.php:1051
-msgid "View all posts by "
-msgstr "Se alla inlägg av "
+#: library/extensions/content-extensions.php:994
+msgid "View all posts by %s"
+msgstr "Se alla inlägg av %s"
-#: library/extensions/content-extensions.php:1079
-msgid "Published: "
-msgstr "Publicerad: "
+#: library/extensions/content-extensions.php:1023
+msgid "Published:"
+msgstr "Publicerad:"
-#: library/extensions/content-extensions.php:1252
+#: library/extensions/content-extensions.php:1199
msgid "Archives by Category"
msgstr "Arkiv per kategori"
-#: library/extensions/content-extensions.php:1280
+#: library/extensions/content-extensions.php:1230
msgid "Archives by Month"
msgstr "Arkiv per månad"
-#: library/extensions/content-extensions.php:1413
-msgid "Browse the "
-msgstr "Bläddra i "
+#: library/extensions/content-extensions.php:1291
+msgid "Apologies, but we were unable to find what you were looking for. Perhaps searching will help."
+msgstr "Beklagar, men vi kunde inte hitta det du letar efter. Det kanske hjälper att söka."
-#: library/extensions/content-extensions.php:1413
-msgid " Archive"
-msgstr "arkivet"
+#: library/extensions/content-extensions.php:1297 search.php:70
+msgid "Find"
+msgstr "Sök"
-#: library/extensions/content-extensions.php:1414
-msgid " archive"
-msgstr " arkiv"
+#: library/extensions/content-extensions.php:1316
+msgid "Read More %s"
+msgstr "Läs mer %s"
-#: library/extensions/content-extensions.php:1417
-msgid "Bookmark the "
-msgstr "Bokmärk "
+#: library/extensions/content-extensions.php:1368
+msgid "Browse the %s archive."
+msgstr "Bläddra i %s-arkivet."
-#: library/extensions/content-extensions.php:1418
-msgid "permalink"
-msgstr "permalänk"
+#: library/extensions/content-extensions.php:1370
+msgid "Permalink to %s Archive"
+msgstr "Permalänk till %s-arkivet."
-#: library/extensions/content-extensions.php:1572
-msgid "This entry was posted in "
-msgstr "Detta inlägg är publicerat i "
+#: library/extensions/content-extensions.php:1376
+msgctxt "1s and 2s are the a href link wrappers, do not reverse them"
+msgid "Bookmark the %1$spermalink%2$s."
+msgstr "Bokmärk %1$spermalänken%2$s."
-#: library/extensions/content-extensions.php:1580
-msgid "Also posted in "
-msgstr "Också publicerat i"
+#: library/extensions/content-extensions.php:1534
+msgid "This entry was posted in %s"
+msgstr "Detta inlägg är publicerat i %s"
-#: library/extensions/content-extensions.php:1583
-msgid "Posted in "
-msgstr "Publicerat i "
+#: library/extensions/content-extensions.php:1545
+msgid "Also posted in %s"
+msgstr "Också publicerat i %s"
+
+#: library/extensions/content-extensions.php:1549
+msgid "Posted in %s"
+msgstr "Publicerat i %s"
-#: library/extensions/content-extensions.php:1609
-msgid " This entry is tagged"
+#: library/extensions/content-extensions.php:1575
+msgid "This entry is tagged"
msgstr "Det här inlägget är taggat"
-#: library/extensions/content-extensions.php:1612
-msgid " and tagged"
-msgstr " och taggat"
+#: library/extensions/content-extensions.php:1578
+msgid "and tagged"
+msgstr "och taggat"
-#: library/extensions/content-extensions.php:1615
-msgid " Also tagged "
-msgstr " Också taggat "
+#: library/extensions/content-extensions.php:1581
+msgid "Also tagged"
+msgstr "Också taggat"
-#: library/extensions/content-extensions.php:1617
+#: library/extensions/content-extensions.php:1583
msgid "Tagged"
msgstr "Taggat"
-#: library/extensions/content-extensions.php:1644
-#: library/extensions/content-extensions.php:1647
-#: library/extensions/content-extensions.php:1650
-msgid "Comment on "
-msgstr "Kommenterat på "
+#: library/extensions/content-extensions.php:1613
+#: library/extensions/content-extensions.php:1619
+msgid "Comment on %s"
+msgstr "Kommentera %s"
-#: library/extensions/content-extensions.php:1651
+#: library/extensions/content-extensions.php:1615
+msgid "%s Response"
+msgid_plural "%s Responses"
+msgstr[0] "%s Respons"
+msgstr[1] "%s Responser"
+
+#: library/extensions/content-extensions.php:1620
msgid "Leave a comment"
msgstr "Lämna en kommentar"
-#: library/extensions/content-extensions.php:1654
+#: library/extensions/content-extensions.php:1623
msgid "Comments closed"
msgstr "Stängt för kommentarer"
-#: library/extensions/content-extensions.php:1678
-#: library/extensions/content-extensions.php:1686
+#: library/extensions/content-extensions.php:1647
+msgctxt "1s and 2s are the a href link wrappers, do not reverse them. 3s is trackback url."
+msgid "%1$sPost a comment%2$s or leave a trackback: %3$s"
+msgstr "%1$sLämna en kommentar%2$s eller en trackback: %3$s"
+
+#: library/extensions/content-extensions.php:1648
+#: library/extensions/content-extensions.php:1663
msgid "Post a comment"
msgstr "Skriv en kommentar"
-#: library/extensions/content-extensions.php:1679
-msgid " or leave a trackback: "
-msgstr " eller lämna en trackback: "
-
-#: library/extensions/content-extensions.php:1680
-#: library/extensions/content-extensions.php:1683
+#: library/extensions/content-extensions.php:1652
+#: library/extensions/content-extensions.php:1659
msgid "Trackback URL for your post"
msgstr "Trackback URL för ditt inlägg"
-#: library/extensions/content-extensions.php:1680
-#: library/extensions/content-extensions.php:1683
+#: library/extensions/content-extensions.php:1653
+#: library/extensions/content-extensions.php:1660
msgid "Trackback URL"
msgstr "Trackback URL"
-#: library/extensions/content-extensions.php:1682
-msgid " Comments are closed, but you can leave a trackback: "
-msgstr " Stängt för kommentarer, men du kan lämna trackback:"
+#: library/extensions/content-extensions.php:1656
+msgctxt "%s is trackback url, wrapped in link tags"
+msgid "Comments are closed, but you can leave a trackback: %s"
+msgstr "Kommentarer är avstängda, men du kan lämna en trackback: %s"
-#: library/extensions/content-extensions.php:1685
-msgid " Trackbacks are closed, but you can "
-msgstr " Stängt för trackbacks, men du kan"
+#: library/extensions/content-extensions.php:1663
+msgid "Trackbacks are closed, but you can %1$spost a comment%2$s."
+msgstr "Trackbackar är avstängda, men du kan %1$slämna en kommentar%2$s."
-#: library/extensions/content-extensions.php:1686
-msgid "post a comment"
-msgstr "lämna en kommentar"
-
-#: library/extensions/content-extensions.php:1688
-msgid " Both comments and trackbacks are currently closed."
-msgstr " Stängt för kommentarer och trackbacks."
+#: library/extensions/content-extensions.php:1665
+msgid "Both comments and trackbacks are currently closed."
+msgstr "Både kommentarer och trackbackar är avstängda."
#: library/extensions/discussion-extensions.php:27
-msgid "Posted %1$s at %2$s <span class=\"meta-sep\">|</span> <a href=\"%3$s\" title=\"Permalink to this comment\">Permalink</a>"
-msgstr "Skrivet %1$s klockan %2$s <span class=\"meta-sep\">|</span> <a href=\"%3$s\" title=\"Permalink till denna kommentar\">Permalink</a>"
+msgctxt "Posted {$date} at {$time}"
+msgid "Posted %s at %s"
+msgstr "Publicerad %s kl %s"
+
+#: library/extensions/discussion-extensions.php:31
+msgid "Permalink to this comment"
+msgstr "Permalänk till den här kommentaren"
-#: library/extensions/discussion-extensions.php:35
+#: library/extensions/discussion-extensions.php:31
+msgid "Permalink"
+msgstr "Permalänk"
+
+#: library/extensions/discussion-extensions.php:36
msgid "Edit comment"
msgstr "Redigera kommentar"
+#: library/extensions/discussion.php:37
+msgid "Your comment is awaiting moderation"
+msgstr "Din kommentar väntar på att bli godkänd."
+
#: library/extensions/discussion.php:52
msgid "Reply"
msgstr "Svar"
@@ -305,28 +363,29 @@ msgid "Log in to reply."
msgstr "Logga in för att svara."
#: library/extensions/discussion.php:80
+msgctxt "By {$authorlink} on {$date} at {$time}"
msgid "By %1$s on %2$s at %3$s"
msgstr "Av %1$s den %2$s kl %3$s"
-#: library/extensions/header-extensions.php:302
+#: library/extensions/discussion.php:90
+msgid "Your trackback is awaiting moderation"
+msgstr "Din trackback väntar på att bli godkänd."
+
+#: library/extensions/header-extensions.php:319
#: library/extensions/widgets.php:157
msgid "Posts RSS feed"
msgstr "RSS-flöde (inlägg)"
-#: library/extensions/header-extensions.php:326
+#: library/extensions/header-extensions.php:343
#: library/extensions/widgets.php:158
msgid "Comments RSS feed"
msgstr "RSS-flöde (kommentarer)"
-#: functions.php:253
-msgid "Primary Menu"
-msgstr "Primär meny"
-
-#: library/extensions/header-extensions.php:625
+#: library/extensions/header-extensions.php:642
msgid "Skip navigation to the content"
msgstr "Skippa navigation, vidare till innehåll"
-#: library/extensions/header-extensions.php:625
+#: library/extensions/header-extensions.php:642
msgid "Skip to content"
msgstr "Vidare till innehåll"
@@ -334,14 +393,6 @@ msgstr "Vidare till innehåll"
msgid "There is no excerpt because this is a protected post."
msgstr "Det finns inget utdrag för detta är ett skyddat inlägg."
-#: library/extensions/shortcodes.php:40
-msgid "Login"
-msgstr "Logga in"
-
-#: library/extensions/shortcodes.php:42
-msgid "Logout"
-msgstr "Logga ut"
-
#: library/extensions/theme-options.php:50
msgid "Index Insert Position"
msgstr "Position för Index Insert"
@@ -354,6 +405,76 @@ msgstr "Information på Författarsidan"
msgid "Text in Footer"
msgstr "Sidfotstext"
+#: library/extensions/theme-options.php:56
+msgid "Remove Legacy Options"
+msgstr "Ta bort föråldrade inställningar"
+
+#: library/extensions/theme-options.php:170
+msgid "Theme Options"
+msgstr "Temainställningar"
+
+#: library/extensions/theme-options.php:202
+msgid "For more information:"
+msgstr "För mer information:"
+
+#: library/extensions/theme-options.php:204
+msgid "For support:"
+msgstr "För support:"
+
+#: library/extensions/theme-options.php:206
+msgid "forums"
+msgstr "forum"
+
+#: library/extensions/theme-options.php:210
+msgid "The options below are enabled by the Thematic Theme framework and/or a child theme."
+msgstr "Inställningarna nedan är aktiverade av temat Thematic och/eller ett barntema."
+
+#: library/extensions/theme-options.php:211
+msgid "New options can be added and the default ones removed by creating a child theme. This contextual help can be customized in a child theme also."
+msgstr "Nya inställningar kan läggas till och standardinställningarna kan tas bort genom att skapa ett barntema. Den här hjälptexten kan också anpassas i ett barntema."
+
+#: library/extensions/theme-options.php:217
+msgid "Overview"
+msgstr "Överblick"
+
+#: library/extensions/theme-options.php:244
+msgctxt "%1$s and %2$s are <a> tags"
+msgid "For more information about this theme, %1$svisit ThematicTheme.com%2$s"
+msgstr "För mer information om det här temat, %1$sbesök ThematicTheme.com%2$s."
+
+#: library/extensions/theme-options.php:244
+msgctxt "%1$s and %2$s are <a> tags"
+msgid "Please visit the %1$sThematicTheme.com Forums%2$s if you have any questions about Thematic."
+msgstr "Om du har några frågor om Thematic, besök %1$sforumen på ThematicTheme.com%2$s."
+
+#: library/extensions/theme-options.php:256
+msgctxt "{$current theme} Theme Options"
+msgid "%s Theme Options"
+msgstr "%s temainställningar"
+
+#: library/extensions/theme-options.php:294
+msgid "The Index Insert widget area will appear after this post number. Entering nothing or 0 will disable this feature."
+msgstr "Widgetfältet för Index Insert kommer att sättas in efter så här många inlägg. Om du lämnar fältet tomt eller skriver 0 avaktiveras widgetfältet."
+
+#: library/extensions/theme-options.php:307
+msgctxt "%1$s and %2$s are <a> tags"
+msgid "Display a %1$smicroformatted vCard%2$s with the author's avatar, bio and email on the author page."
+msgstr "Visa ett %1$smicroformatterat vCard%2$s med författarens avatar, biografi och epost på författararkivet."
+
+#: library/extensions/theme-options.php:320
+msgctxt "%s are shortcode tags"
+msgid "You can use HTML and shortcodes in your footer text. Shortcode examples: %s"
+msgstr "Du kan använda HTML och kortkoder i din sidfotstext. Exempel på kortkoder: %s"
+
+#: library/extensions/theme-options.php:333
+msgctxt "{$current theme} Theme Options"
+msgid "%s Theme Options have been upgraded to an improved format. Remove the legacy options from the database."
+msgstr "%s temainställningar har uppgraderats till ett förbättrat format. Ta bort de föråldrade inställningarna från databasen."
+
+#: library/extensions/theme-options.php:360
+msgid "The index insert position value must be a number equal to or greater than zero. This setting has been reverted to the previous value."
+msgstr "Värdet på index insert-inställningen måste vara en siffra som är större än eller lika med noll. Denna inställning har återställts till det föregående värdet."
+
#: library/extensions/widgets-extensions.php:34
msgid "To search, type and hit enter"
msgstr "För att söka, skriv och tryck enter"
@@ -363,54 +484,106 @@ msgstr "För att söka, skriv och tryck enter"
msgid "Search"
msgstr "Sök"
+#: library/extensions/widgets-extensions.php:70
+msgid "Primary Aside"
+msgstr "Primär sidopanel"
+
#: library/extensions/widgets-extensions.php:72
msgid "The primary widget area, most often used as a sidebar."
msgstr "Det primära widgetfältet, oftast använd som sidopanel."
+#: library/extensions/widgets-extensions.php:85
+msgid "Secondary Aside"
+msgstr "Sekundär sidopanel"
+
#: library/extensions/widgets-extensions.php:87
msgid "The secondary widget area, most often used as a sidebar."
msgstr "Det sekundära widgetfältet, oftast använd som sidopanel."
+#: library/extensions/widgets-extensions.php:100
+msgid "1st Subsidiary Aside"
+msgstr "1a subsidiär sidopanel"
+
#: library/extensions/widgets-extensions.php:102
msgid "The 1st widget area in the footer."
msgstr "Det 1a widgetfältet i sidfoten"
+#: library/extensions/widgets-extensions.php:115
+msgid "2nd Subsidiary Aside"
+msgstr "2a subsidiär sidopanel"
+
#: library/extensions/widgets-extensions.php:117
msgid "The 2nd widget area in the footer."
msgstr "Det 2a widgetfältet i sidfoten"
+#: library/extensions/widgets-extensions.php:130
+msgid "3rd Subsidiary Aside"
+msgstr "3e subsidiär sidopanel"
+
#: library/extensions/widgets-extensions.php:132
msgid "The 3rd widget area in the footer."
msgstr "Det 3e widgetfältet i sidfoten"
+#: library/extensions/widgets-extensions.php:145
+msgid "Index Top"
+msgstr "Index-topp"
+
#: library/extensions/widgets-extensions.php:147
msgid "The top widget area displayed on the index page."
msgstr "Det övre widgetfältet på index-sidan."
+#: library/extensions/widgets-extensions.php:160
+msgid "Index Insert"
+msgstr "Index-insert"
+
#: library/extensions/widgets-extensions.php:162
msgid "The widget area inserted after x posts on the index page."
msgstr "Widgetfältet som placeras efter x antal inlägg på index-sidan."
+#: library/extensions/widgets-extensions.php:175
+msgid "Index Bottom"
+msgstr "Index-botten"
+
#: library/extensions/widgets-extensions.php:177
msgid "The bottom widget area displayed on the index page."
msgstr "Det undre widgetfältet på index-sidan."
+#: library/extensions/widgets-extensions.php:190
+msgid "Single Top"
+msgstr "Singel-topp"
+
#: library/extensions/widgets-extensions.php:192
msgid "The top widget area displayed on a single post."
msgstr "Det övre widgetfältet på singel-inläggssidan."
+#: library/extensions/widgets-extensions.php:205
+msgid "Single Insert"
+msgstr "Singel-insert"
+
#: library/extensions/widgets-extensions.php:207
msgid "The widget area inserted between the post and the comments on a single post."
msgstr "Widgetfältet som placeras mellan inlägget och kommentarerna på singel inläggs-sidan."
+#: library/extensions/widgets-extensions.php:220
+msgid "Single Bottom"
+msgstr "Singel-botten"
+
#: library/extensions/widgets-extensions.php:222
msgid "The bottom widget area displayed on a single post."
msgstr "Det undre widgetfältet på singel-inläggssidan."
+#: library/extensions/widgets-extensions.php:235
+msgid "Page Top"
+msgstr "Sid-topp"
+
#: library/extensions/widgets-extensions.php:237
msgid "The top widget area displayed on a page."
msgstr "Det övre widgetfältet på en Sida"
+#: library/extensions/widgets-extensions.php:250
+msgid "Page Bottom"
+msgstr "Sid-botten"
+
#: library/extensions/widgets-extensions.php:252
msgid "The bottom widget area displayed on a page."
msgstr "Det undre widgetfältet på en Sida"
@@ -448,114 +621,59 @@ msgstr "Alla inlägg"
msgid "All comments"
msgstr "Alla kommentarer"
-#: archives.php:20 template-page-blog.php:22
-msgid "The template %s"
-msgstr "Temafilen %s"
-
-#: comments.php:24
-msgid "Please do not load this page directly."
-msgstr "Ladda inte den här filen direkt, tack."
-
-#: comments.php:111
-msgid "Trackbacks"
-msgstr "Trackbackar"
+#: library/legacy/deprecated.php:349
+msgid "Logged in as"
+msgstr "Inloggad som"
-#: library/extensions/comments-extensions.php:131
-msgid "Comments"
-msgstr "Kommentarer"
-
-#: library/extensions/content-extensions.php:334
-msgid "Author Archives:"
-msgstr "Författararkiv:"
-
-#: library/extensions/content-extensions.php:1340
-msgid "Apologies, but we were unable to find what you were looking for. Perhaps searching will help."
-msgstr "Beklagar, men vi kunde inte hitta det du letar efter. Det kanske hjälper att söka."
-
-#: library/extensions/content-extensions.php:1364
-msgid "Read More %s"
-msgstr "Läs mer %s"
-
-#: library/extensions/content-extensions.php:1645
-msgid "Responses"
-msgstr "Responser"
-
-#: library/extensions/content-extensions.php:1648
-msgid "Response"
-msgstr "Respons"
-
-#: library/extensions/discussion.php:37
-msgid "Your comment is awaiting moderation"
-msgstr "Din kommentar väntar på att bli godkänd."
-
-#: library/extensions/discussion.php:90
-msgid "Your trackback is awaiting moderation"
-msgstr "Din trackback väntar på att bli godkänd."
-
-#: library/extensions/theme-options.php:56
-msgid "Remove Legacy Options"
-msgstr "Ta bort föråldrade inställningar"
-
-#: library/extensions/theme-options.php:204
-msgid "For more information:"
-msgstr "För mer information:"
+#: library/legacy/deprecated.php:357 library/legacy/deprecated.php:362
+msgid "<span class=\"required\">*</span>"
+msgstr "<span class=\"required\">*</span>"
-#: library/extensions/theme-options.php:206
-msgid "For support:"
-msgstr "För support:"
+#: page.php:50 template-page-fullwidth.php:51
+msgid "Pages: "
+msgstr "Sidor:"
-#: library/extensions/theme-options.php:208
-msgid "forums"
-msgstr "forum"
+#: search.php:56
+msgid "Nothing Found"
+msgstr "Inga träffar"
-#: library/extensions/theme-options.php:212
-msgid "The options below are enabled by the Thematic Theme framework and/or a child theme."
-msgstr "Inställningarna nedan är aktiverade av temat Thematic och/eller ett barntema."
+#: search.php:60
+msgid "Sorry, but nothing matched your search criteria. Please try again with some different keywords."
+msgstr "Tyvärr, men ingenting matchar ditt sökkriterie. Försök med en annan söksträng."
-#: library/extensions/theme-options.php:213
-msgid "New options can be added and the default ones removed by creating a child theme. This contextual help can be customized in a child theme also."
-msgstr "Nya inställningar kan läggas till och standardinställningarna kan tas bort genom att skapa ett barntema. Den här hjälptexten kan också anpassas i ett barntema."
+#: template-page-blog.php:22
+msgid "You can include a %s in a childtheme"
+msgstr "Du kan inkludera en %s-fil i ett barntema."
-#: library/extensions/theme-options.php:219
-msgid "Overview"
-msgstr "Överblick"
+msgid "Thematic"
+msgstr "Thematic"
-#: library/extensions/theme-options.php:247
-msgid "For more information about this theme, <a href=\"http://thematictheme.com\">visit ThemeTheme.com</a>. Please visit the <a href=\"http://thematictheme.com/forums/\">ThematicTheme.com Forums</a> if you have any questions about Thematic."
-msgstr "För mer information om detta tema, <a href=\"http://thematictheme.com\">besök ThemeTheme.com</a>. Vänligen besök <a href=\"http://thematictheme.com/forums/\">ThematicTheme-forumet</a> om du har några frågor om Thematic."
+msgid "http://thematictheme.com"
+msgstr "http://thematictheme.com"
-#: library/extensions/theme-options.php:262
-msgid "%s Theme Options"
-msgstr "%s Temainställningar"
+msgid "The ultimate in SEO-ready themes, Thematic is a highly extensible, WordPress Theme Framework featuring 13 widget-ready areas, drop-down menus, grid-based layout samples, plugin integration, shortcodes for your footer, & a whole lot more. Perfect for any blog and <strong><em>the</em></strong> starting point for theme development."
+msgstr "Thematic, det ultimata SEO-färdiga temat, är ett mycket flexibelt ramverkstema för WordPress med 13 widgetfält, rullgardinsmenyer, grid-baserade exempellayouter, inbyggd stöd för flera populära tillägg, kortkoder för sidfoten & mer. Perfekt för vilken blogg som helst och <strong><em>särskilt</em></strong> som utgångspunkt för temautveckling."
-#: library/extensions/theme-options.php:276
-msgid "Save Changes"
-msgstr "Spara ändringar"
+msgid "<a href=\"http://themeshaper.com/\">Ian Stewart</a> & <a href=\"http://thematic4you.com/\">Chris Goßmann</a>"
+msgstr "<a href=\"http://themeshaper.com/\">Ian Stewart</a> & <a href=\"http://thematic4you.com/\">Chris Goßmann</a>"
-#: library/extensions/theme-options.php:311
-msgid "The Index Insert widget area will appear after this post number. Entering nothing or 0 will disable this feature."
-msgstr "Widgetfältet för Index Insert kommer att sättas in efter så här många inlägg. Om du lämnar fältet tomt eller skriver 0 avaktiveras widgetfältet."
+msgid "http://themeshaper.com/"
+msgstr "http://themeshaper.com/"
-#: library/extensions/theme-options.php:324
-msgid "Display a"
-msgstr "Visa ett"
+msgid "white, three-columns, two-columns, fixed-width, theme-options, left-sidebar, right-sidebar, threaded-comments, sticky-post, microformats"
+msgstr "white, three-columns, two-columns, fixed-width, theme-options, left-sidebar, right-sidebar, threaded-comments, sticky-post, microformats"
-#: library/extensions/theme-options.php:324
-msgid "with the author's avatar, bio and email on the author page."
-msgstr "med författarens avatar, presentation och email på författarsidan."
+msgid "Deprecated Archives Template"
+msgstr "Avrådd sidmall för Arkiv (Deprecated)"
-#: library/extensions/theme-options.php:337
-msgid "You can use HTML and shortcodes in your footer text. Shortcode examples"
-msgstr "Du kan använda HTML och shortcodes i din sidfotstext. Exempel på shortcodes"
+msgid "Links Page"
+msgstr "Länkar"
-#: library/extensions/theme-options.php:350
-msgid "%s Theme Options have been upgraded to an improved format. Remove the legacy options from the database."
-msgstr "Temainställningarna för %s har uppgraderats till ett förbättrat format. Ta bort de föråldrade inställningarna från databasen."
+msgid "Archives Page"
+msgstr "Arkiv"
-#: library/extensions/theme-options.php:377
-msgid "The index insert position value must be a number equal to or greater than zero. This setting has been reverted to the previous value."
-msgstr "Värdet på index insert-inställningen måste vara en siffra som är större än eller lika med noll. Denna inställning har återställts till det föregående värdet."
+msgid "Deprecated Blog Template"
+msgstr "Avrådd sidmall för blogg (Deprecated)"
-#: template-page-blog.php:22
-msgid "You can include a %s in a childtheme"
-msgstr "Du kan inkludera en %s-fil i ett barntema."
\ No newline at end of file
+msgid "Full Width"
+msgstr "Full sidbredd"
\ No newline at end of file
diff --git a/wp-content/themes/thematic/library/languages/thematic.mo b/wp-content/themes/thematic/library/languages/thematic.mo
index f7380bf39b99bd8c6bd4d3ffe1a4bff703591a90..4996981d4480de215251d42da4f467a53aeb9269 100644
Binary files a/wp-content/themes/thematic/library/languages/thematic.mo and b/wp-content/themes/thematic/library/languages/thematic.mo differ
diff --git a/wp-content/themes/thematic/library/languages/thematic.pot b/wp-content/themes/thematic/library/languages/thematic.pot
index 9abedc4011a97529f204597f1f80882639794997..94bfb258ffa9cd7ea9d15f9161413e93ed17ebce 100644
--- a/wp-content/themes/thematic/library/languages/thematic.pot
+++ b/wp-content/themes/thematic/library/languages/thematic.pot
@@ -1,734 +1,737 @@
-"Project-Id-Version: Thematic v1.0.1\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-04-27 15:18+0100\n"
-"PO-Revision-Date: 2012-06-02 12:13:58+0000\n"
-"Last-Translator: Chris Goßmann <chris@thematictheme.com>\n"
-"Language-Team: \n"
+# Copyright (C) 2012 <a href="http://themeshaper.com/">Ian Stewart</a> & <a href="http://thematic4you.com/">Chris Goßmann</a>
+# This file is distributed under the GNU General Public License v2.0.
+msgid ""
+msgstr ""
+"Project-Id-Version: Thematic 1.0.3\n"
+"Report-Msgid-Bugs-To: http://wordpress.org/tags/thematic\n"
+"POT-Creation-Date: 2012-07-29 15:27:33+00:00\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Poedit-Language: \n"
-"X-Poedit-Country: \n"
-"X-Poedit-SourceCharset: utf-8\n"
-"X-Poedit-KeywordsList: __;_e;__ngettext:1,2;_n:1,2;__ngettext_noop:1,2;_n_noop:1,2;_c,_nc:4c,1,2;_x:1,2c;_ex:1,2c;_nx:4c,1,2;_nx_noop:4c,1,2;\n"
-"X-Poedit-Basepath: .\n"
-"X-Poedit-Bookmarks: \n"
-"X-Poedit-SearchPath-0: c:/users/Chris/Desktop/thematic\n"
-"X-Textdomain-Support: yes"
-
-#: library/extensions/content-extensions.php:947
-#: library/extensions/content-extensions.php:1461
-#: library/extensions/discussion-extensions.php:36
-#: library/extensions/discussion.php:84
-#: links.php:60
-#: page.php:60
-#: template-page-archives.php:63
-#: template-page-fullwidth.php:61
-#@ thematic
-msgid "Edit"
+"PO-Revision-Date: 2012-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+
+#: archives.php:20 template-page-blog.php:22
+msgid "The template %s"
msgstr ""
-#: attachment.php:62
-#: library/extensions/content-extensions.php:666
-#: library/extensions/content-extensions.php:732
-#@ thematic
+#: attachment.php:54 library/extensions/content-extensions.php:630
+#: library/extensions/content-extensions.php:689
msgid "Pages:"
msgstr ""
#: author.php:67
-#@ thematic
msgid "Email "
msgstr ""
+#: comments.php:24
+msgid "Please do not load this page directly."
+msgstr ""
+
#: comments.php:33
-#@ thematic
-msgid "This post is password protected. Enter the password to view any comments."
+msgid ""
+"This post is password protected. Enter the password to view any comments."
msgstr ""
#: comments.php:111
-#@ thematic
-msgid "<span>One</span> Trackback"
+msgid "Trackbacks"
msgstr ""
-#: comments.php:142
-#: library/extensions/comments-extensions.php:234
-#, php-format
-#@ thematic
-msgid "You must be <a href=\"%s\" title=\"Log in\">logged in</a> to post a comment."
+#: comments.php:111
+msgctxt "%1$ and %2$s are <span> tags"
+msgid "%1$sOne%2$s Trackback"
msgstr ""
-#: comments.php:156
-#: library/extensions/comments-extensions.php:235
-#, php-format
-#@ thematic
-msgid "<span class=\"loggedin\">Logged in as <a href=\"%1$s\" title=\"Logged in as %2$s\">%2$s</a>.</span> <span class=\"logout\"><a href=\"%3$s\" title=\"Log out of this account\">Log out?</a></span>"
+#: functions.php:194
+msgid "Primary Menu"
msgstr ""
-#: comments.php:164
-#: library/extensions/comments-extensions.php:233
-#@ thematic
-msgid "Your email is <em>never</em> published nor shared."
+#: library/extensions/comments-extensions.php:120
+msgctxt "One Comment, where %$1s and %$2s are <span> tags"
+msgid "%1$sOne%2$s Comment"
msgstr ""
-#: comments.php:164
-#: library/extensions/comments-extensions.php:233
-#@ thematic
-msgid "Required fields are marked <span class=\"required\">*</span>"
+#: library/extensions/comments-extensions.php:131
+msgid "Comments"
msgstr ""
-#: comments.php:167
-#: library/extensions/comments-extensions.php:224
-#@ thematic
-msgid "Name"
+#. translators: comment form title
+#: library/extensions/comments-extensions.php:155
+msgid "Post a Comment"
msgstr ""
-#: comments.php:167
-#: comments.php:172
-#: library/extensions/comments-extensions.php:224
-#: library/extensions/comments-extensions.php:225
-#@ thematic
-msgid "<span class=\"required\">*</span>"
+#. translators: comment reply form title, %s is author of comment
+#: library/extensions/comments-extensions.php:167
+msgid "Post a Reply to %s"
msgstr ""
-#: comments.php:172
-#: library/extensions/comments-extensions.php:225
-#@ thematic
-msgid "Email"
+#. translators: label for comment form textarea
+#: library/extensions/comments-extensions.php:179
+msgctxt "noun"
+msgid "Comment"
msgstr ""
-#: comments.php:177
-#: library/extensions/comments-extensions.php:226
-#@ thematic
-msgid "Website"
+#: library/extensions/comments-extensions.php:190
+msgid "Cancel reply"
msgstr ""
-#: comments.php:189
-#: library/extensions/comments-extensions.php:236
-#@ thematic
-msgid "You may use these <abbr title=\"HyperText Markup Language\">HTML</abbr> tags and attributes:"
+#. translators: text of comment button
+#: library/extensions/comments-extensions.php:202
+msgid "Post Comment"
msgstr ""
-#: page.php:58
-#: template-page-fullwidth.php:59
-#@ thematic
-msgid "Pages: "
+#: library/extensions/comments-extensions.php:228
+#: library/legacy/deprecated.php:357
+msgid "Name"
msgstr ""
-#: search.php:56
-#@ thematic
-msgid "Nothing Found"
+#: library/extensions/comments-extensions.php:228
+#: library/extensions/comments-extensions.php:229
+msgctxt "denotes required field"
+msgid "*"
msgstr ""
-#: search.php:60
-#@ thematic
-msgid "Sorry, but nothing matched your search criteria. Please try again with some different keywords."
+#: library/extensions/comments-extensions.php:229
+#: library/legacy/deprecated.php:362
+msgid "Email"
msgstr ""
-#: library/extensions/content-extensions.php:1346
-#: search.php:70
-#@ thematic
-msgid "Find"
+#: library/extensions/comments-extensions.php:230
+#: library/legacy/deprecated.php:367
+msgid "Website"
msgstr ""
-#: library/extensions/comments-extensions.php:120
-#@ thematic
-msgid "<span>One</span> Comment"
+#: library/extensions/comments-extensions.php:238
+#: library/legacy/deprecated.php:354
+msgctxt "%$1s and %$2s are <em> tags for emphasis on never"
+msgid "Your email is %1$snever%2$s published nor shared."
msgstr ""
-#: library/extensions/comments-extensions.php:154
-#@ thematic
-msgid "Post a Comment"
+#: library/extensions/comments-extensions.php:238
+msgctxt "%$1s and %$2s are <span> tags"
+msgid "Required fields are marked %1$s*%2$s"
msgstr ""
-#: library/extensions/comments-extensions.php:165
-#, php-format
-#@ thematic
-msgid "Post a Reply to %s"
+#: library/extensions/comments-extensions.php:240
+#: library/legacy/deprecated.php:336
+msgid "You must be %1$slogged in%2$s to post a comment."
msgstr ""
-#: library/extensions/comments-extensions.php:176
-#@ thematic
-msgid "Comment"
+#: library/extensions/comments-extensions.php:240
+#: library/legacy/deprecated.php:336
+msgid "Log in"
msgstr ""
-#: library/extensions/comments-extensions.php:187
-#@ thematic
-msgid "Cancel reply"
+#: library/extensions/comments-extensions.php:242
+#: library/legacy/deprecated.php:349
+msgid "Logged in as %s"
msgstr ""
-#: library/extensions/comments-extensions.php:198
-#@ thematic
-msgid "Post Comment"
+#: library/extensions/comments-extensions.php:242
+#: library/legacy/deprecated.php:349
+msgid "Log out of this account"
+msgstr ""
+
+#: library/extensions/comments-extensions.php:242
+#: library/legacy/deprecated.php:349
+msgid "Log out?"
msgstr ""
-#: library/extensions/content-extensions.php:340
-#: library/extensions/header-extensions.php:84
-#@ thematic
+#: library/extensions/comments-extensions.php:244
+#: library/legacy/deprecated.php:379
+msgctxt "%$1s and %$2s are <abbr> tags"
+msgid "You may use these %1$sHTML%2$s tags and attributes"
+msgstr ""
+
+#: library/extensions/content-extensions.php:334
+msgid "Author Archives:"
+msgstr ""
+
+#: library/extensions/content-extensions.php:339
+#: library/extensions/header-extensions.php:103
msgid "Category Archives:"
msgstr ""
-#: library/extensions/content-extensions.php:349
-#: library/extensions/header-extensions.php:80
-#@ thematic
+#: library/extensions/content-extensions.php:347
+#: library/extensions/header-extensions.php:99
msgid "Search Results for:"
msgstr ""
-#: library/extensions/content-extensions.php:355
-#: library/extensions/header-extensions.php:88
-#@ thematic
+#: library/extensions/content-extensions.php:352
+#: library/extensions/header-extensions.php:107
msgid "Tag Archives:"
msgstr ""
-#: library/extensions/content-extensions.php:364
-#: library/extensions/content-extensions.php:373
-#@ thematic
+#: library/extensions/content-extensions.php:361
+#: library/extensions/content-extensions.php:368
msgid "Archives:"
msgstr ""
-#: library/extensions/content-extensions.php:379
-#, php-format
-#@ thematic
-msgid "Daily Archives: <span>%s</span>"
+#: library/extensions/content-extensions.php:373
+msgid "Daily Archives: %s"
msgstr ""
-#: library/extensions/content-extensions.php:383
-#, php-format
-#@ thematic
-msgid "Monthly Archives: <span>%s</span>"
+#: library/extensions/content-extensions.php:377
+msgid "Monthly Archives: %s"
msgstr ""
-#: library/extensions/content-extensions.php:387
-#, php-format
-#@ thematic
-msgid "Yearly Archives: <span>%s</span>"
+#: library/extensions/content-extensions.php:381
+msgid "Yearly Archives: %s"
msgstr ""
-#: library/extensions/content-extensions.php:429
-#: library/extensions/content-extensions.php:1728
-#@ thematic
-msgid "<span class=\"meta-nav\">«</span> Older posts"
+#: library/extensions/content-extensions.php:424
+#: library/extensions/content-extensions.php:1706
+msgid "Older posts"
msgstr ""
-#: library/extensions/content-extensions.php:431
-#: library/extensions/content-extensions.php:1729
-#@ thematic
-msgid "Newer posts <span class=\"meta-nav\">»</span>"
+#: library/extensions/content-extensions.php:426
+#: library/extensions/content-extensions.php:1708
+msgid "Newer posts"
msgstr ""
-#: library/extensions/content-extensions.php:946
-#: library/extensions/content-extensions.php:1460
-#@ thematic
+#: library/extensions/content-extensions.php:888
+#: library/extensions/content-extensions.php:1418
msgid "Edit post"
msgstr ""
-#: library/extensions/content-extensions.php:975
-#: library/extensions/header-extensions.php:92
-#@ thematic
+#. translators: post edit link
+#: library/extensions/content-extensions.php:890
+#: library/extensions/content-extensions.php:1420
+#: library/extensions/discussion-extensions.php:37
+#: library/extensions/discussion.php:84 links.php:54 page.php:52
+#: template-page-archives.php:55 template-page-fullwidth.php:53
+msgid "Edit"
+msgstr ""
+
+#: library/extensions/content-extensions.php:918
+#: library/extensions/header-extensions.php:111
msgid "Not Found"
msgstr ""
-#: library/extensions/content-extensions.php:980
-#: library/extensions/content-extensions.php:1413
-#: library/extensions/content-extensions.php:1417
-#@ thematic
-msgid "Permalink to "
+#: library/extensions/content-extensions.php:923
+#: library/extensions/content-extensions.php:1141
+#: library/extensions/content-extensions.php:1145
+#: library/extensions/content-extensions.php:1376
+msgid "Permalink to %s"
msgstr ""
-#: library/extensions/content-extensions.php:1041
-#@ thematic
-msgid "By "
+#: library/extensions/content-extensions.php:983
+msgid "By"
msgstr ""
-#: library/extensions/content-extensions.php:1051
-#@ thematic
-msgid "View all posts by "
+#. translators: author name
+#: library/extensions/content-extensions.php:994
+msgid "View all posts by %s"
msgstr ""
-#: library/extensions/content-extensions.php:1079
-#@ thematic
-msgid "Published: "
+#: library/extensions/content-extensions.php:1023
+msgid "Published:"
msgstr ""
-#: library/extensions/content-extensions.php:1252
-#@ thematic
+#: library/extensions/content-extensions.php:1199
msgid "Archives by Category"
msgstr ""
-#: library/extensions/content-extensions.php:1280
-#@ thematic
+#: library/extensions/content-extensions.php:1230
msgid "Archives by Month"
msgstr ""
-#: library/extensions/content-extensions.php:1413
-#@ thematic
-msgid "Browse the "
+#: library/extensions/content-extensions.php:1291
+msgid ""
+"Apologies, but we were unable to find what you were looking for. Perhaps "
+"searching will help."
+msgstr ""
+
+#: library/extensions/content-extensions.php:1297 search.php:70
+msgid "Find"
msgstr ""
-#: library/extensions/content-extensions.php:1413
-#@ thematic
-msgid " Archive"
+#. translators: %s is right angle brackets
+#: library/extensions/content-extensions.php:1316
+msgid "Read More %s"
msgstr ""
-#: library/extensions/content-extensions.php:1414
-#@ thematic
-msgid " archive"
+#. translators: %s is custom post type singular name, wrapped in link tags
+#: library/extensions/content-extensions.php:1368
+msgid "Browse the %s archive."
msgstr ""
-#: library/extensions/content-extensions.php:1417
-#@ thematic
-msgid "Bookmark the "
+#. translators: %s is custom post type singular name
+#: library/extensions/content-extensions.php:1370
+msgid "Permalink to %s Archive"
msgstr ""
-#: library/extensions/content-extensions.php:1418
-#@ thematic
-msgid "permalink"
+#: library/extensions/content-extensions.php:1376
+msgctxt "1s and 2s are the a href link wrappers, do not reverse them"
+msgid "Bookmark the %1$spermalink%2$s."
msgstr ""
-#: library/extensions/content-extensions.php:1572
-#@ thematic
-msgid "This entry was posted in "
+#. translators: %s is postfooter categories
+#: library/extensions/content-extensions.php:1534
+msgid "This entry was posted in %s"
msgstr ""
-#: library/extensions/content-extensions.php:1580
-#@ thematic
-msgid "Also posted in "
+#. translators: %s is postfooter categories
+#: library/extensions/content-extensions.php:1545
+msgid "Also posted in %s"
msgstr ""
-#: library/extensions/content-extensions.php:1583
-#@ thematic
-msgid "Posted in "
+#. translators: %s is postfooter categories
+#: library/extensions/content-extensions.php:1549
+msgid "Posted in %s"
msgstr ""
-#: library/extensions/content-extensions.php:1609
-#@ thematic
-msgid " This entry is tagged"
+#: library/extensions/content-extensions.php:1575
+msgid "This entry is tagged"
msgstr ""
-#: library/extensions/content-extensions.php:1612
-#@ thematic
-msgid " and tagged"
+#: library/extensions/content-extensions.php:1578
+msgid "and tagged"
msgstr ""
-#: library/extensions/content-extensions.php:1615
-#@ thematic
-msgid " Also tagged "
+#: library/extensions/content-extensions.php:1581
+msgid "Also tagged"
msgstr ""
-#: library/extensions/content-extensions.php:1617
-#@ thematic
+#: library/extensions/content-extensions.php:1583
msgid "Tagged"
msgstr ""
-#: library/extensions/content-extensions.php:1644
-#: library/extensions/content-extensions.php:1647
-#: library/extensions/content-extensions.php:1650
-#@ thematic
-msgid "Comment on "
+#: library/extensions/content-extensions.php:1613
+#: library/extensions/content-extensions.php:1619
+msgid "Comment on %s"
msgstr ""
-#: library/extensions/content-extensions.php:1651
-#@ thematic
+#. translators: number of comments and trackbacks
+#: library/extensions/content-extensions.php:1615
+msgid "%s Response"
+msgid_plural "%s Responses"
+msgstr[0] ""
+msgstr[1] ""
+
+#: library/extensions/content-extensions.php:1620
msgid "Leave a comment"
msgstr ""
-#: library/extensions/content-extensions.php:1654
-#@ thematic
+#: library/extensions/content-extensions.php:1623
msgid "Comments closed"
msgstr ""
-#: library/extensions/content-extensions.php:1678
-#: library/extensions/content-extensions.php:1686
-#@ thematic
-msgid "Post a comment"
+#: library/extensions/content-extensions.php:1647
+msgctxt ""
+"1s and 2s are the a href link wrappers, do not reverse them. 3s is trackback "
+"url."
+msgid "%1$sPost a comment%2$s or leave a trackback: %3$s"
msgstr ""
-#: library/extensions/content-extensions.php:1679
-#@ thematic
-msgid " or leave a trackback: "
+#: library/extensions/content-extensions.php:1648
+#: library/extensions/content-extensions.php:1663
+msgid "Post a comment"
msgstr ""
-#: library/extensions/content-extensions.php:1680
-#: library/extensions/content-extensions.php:1683
-#@ thematic
+#: library/extensions/content-extensions.php:1652
+#: library/extensions/content-extensions.php:1659
msgid "Trackback URL for your post"
msgstr ""
-#: library/extensions/content-extensions.php:1680
-#: library/extensions/content-extensions.php:1683
-#@ thematic
+#: library/extensions/content-extensions.php:1653
+#: library/extensions/content-extensions.php:1660
msgid "Trackback URL"
msgstr ""
-#: library/extensions/content-extensions.php:1682
-#@ thematic
-msgid " Comments are closed, but you can leave a trackback: "
+#: library/extensions/content-extensions.php:1656
+msgctxt "%s is trackback url, wrapped in link tags"
+msgid "Comments are closed, but you can leave a trackback: %s"
msgstr ""
-#: library/extensions/content-extensions.php:1685
-#@ thematic
-msgid " Trackbacks are closed, but you can "
+#: library/extensions/content-extensions.php:1663
+msgid "Trackbacks are closed, but you can %1$spost a comment%2$s."
msgstr ""
-#: library/extensions/content-extensions.php:1686
-#@ thematic
-msgid "post a comment"
+#: library/extensions/content-extensions.php:1665
+msgid "Both comments and trackbacks are currently closed."
msgstr ""
-#: library/extensions/content-extensions.php:1688
-#@ thematic
-msgid " Both comments and trackbacks are currently closed."
+#: library/extensions/discussion-extensions.php:27
+msgctxt "Posted {$date} at {$time}"
+msgid "Posted %s at %s"
msgstr ""
-#: library/extensions/discussion-extensions.php:27
-#, php-format
-#@ thematic
-msgid "Posted %1$s at %2$s <span class=\"meta-sep\">|</span> <a href=\"%3$s\" title=\"Permalink to this comment\">Permalink</a>"
+#: library/extensions/discussion-extensions.php:31
+msgid "Permalink to this comment"
+msgstr ""
+
+#: library/extensions/discussion-extensions.php:31
+msgid "Permalink"
msgstr ""
-#: library/extensions/discussion-extensions.php:35
-#@ thematic
+#: library/extensions/discussion-extensions.php:36
msgid "Edit comment"
msgstr ""
+#: library/extensions/discussion.php:37
+msgid "Your comment is awaiting moderation"
+msgstr ""
+
#: library/extensions/discussion.php:52
-#@ thematic
msgid "Reply"
msgstr ""
#: library/extensions/discussion.php:53
-#@ thematic
msgid "Log in to reply."
msgstr ""
#: library/extensions/discussion.php:80
-#, php-format
-#@ thematic
+msgctxt "By {$authorlink} on {$date} at {$time}"
msgid "By %1$s on %2$s at %3$s"
msgstr ""
-#: library/extensions/header-extensions.php:302
+#: library/extensions/discussion.php:90
+msgid "Your trackback is awaiting moderation"
+msgstr ""
+
+#: library/extensions/header-extensions.php:319
#: library/extensions/widgets.php:157
-#@ thematic
msgid "Posts RSS feed"
msgstr ""
-#: library/extensions/header-extensions.php:326
+#: library/extensions/header-extensions.php:343
#: library/extensions/widgets.php:158
-#@ thematic
msgid "Comments RSS feed"
msgstr ""
-#: functions.php:253
-#@ thematic
-msgid "Primary Menu"
-msgstr ""
-
-#: library/extensions/header-extensions.php:625
-#@ thematic
+#: library/extensions/header-extensions.php:642
msgid "Skip navigation to the content"
msgstr ""
-#: library/extensions/header-extensions.php:625
-#@ thematic
+#: library/extensions/header-extensions.php:642
msgid "Skip to content"
msgstr ""
-#: library/extensions/helpers.php:50
-#: library/extensions/helpers.php:69
-#@ thematic
+#: library/extensions/helpers.php:50 library/extensions/helpers.php:69
msgid "There is no excerpt because this is a protected post."
msgstr ""
-#: library/extensions/shortcodes.php:40
-#@ thematic
-msgid "Login"
-msgstr ""
-
-#: library/extensions/shortcodes.php:42
-#@ thematic
-msgid "Logout"
-msgstr ""
-
#: library/extensions/theme-options.php:50
-#@ thematic
msgid "Index Insert Position"
msgstr ""
#: library/extensions/theme-options.php:51
-#@ thematic
msgid "Info on Author Page"
msgstr ""
#: library/extensions/theme-options.php:52
-#@ thematic
msgid "Text in Footer"
msgstr ""
+#: library/extensions/theme-options.php:56
+msgid "Remove Legacy Options"
+msgstr ""
+
+#: library/extensions/theme-options.php:170
+msgid "Theme Options"
+msgstr ""
+
+#: library/extensions/theme-options.php:202
+msgid "For more information:"
+msgstr ""
+
+#: library/extensions/theme-options.php:204
+msgid "For support:"
+msgstr ""
+
+#: library/extensions/theme-options.php:206
+msgid "forums"
+msgstr ""
+
+#: library/extensions/theme-options.php:210
+msgid ""
+"The options below are enabled by the Thematic Theme framework and/or a child "
+"theme."
+msgstr ""
+
+#: library/extensions/theme-options.php:211
+msgid ""
+"New options can be added and the default ones removed by creating a child "
+"theme. This contextual help can be customized in a child theme also."
+msgstr ""
+
+#: library/extensions/theme-options.php:217
+msgid "Overview"
+msgstr ""
+
+#: library/extensions/theme-options.php:244
+msgctxt "%1$s and %2$s are <a> tags"
+msgid "For more information about this theme, %1$svisit ThematicTheme.com%2$s"
+msgstr ""
+
+#: library/extensions/theme-options.php:244
+msgctxt "%1$s and %2$s are <a> tags"
+msgid ""
+"Please visit the %1$sThematicTheme.com Forums%2$s if you have any questions "
+"about Thematic."
+msgstr ""
+
+#: library/extensions/theme-options.php:256
+msgctxt "{$current theme} Theme Options"
+msgid "%s Theme Options"
+msgstr ""
+
+#: library/extensions/theme-options.php:294
+msgid ""
+"The Index Insert widget area will appear after this post number. Entering "
+"nothing or 0 will disable this feature."
+msgstr ""
+
+#: library/extensions/theme-options.php:307
+msgctxt "%1$s and %2$s are <a> tags"
+msgid ""
+"Display a %1$smicroformatted vCard%2$s with the author's avatar, bio and "
+"email on the author page."
+msgstr ""
+
+#: library/extensions/theme-options.php:320
+msgctxt "%s are shortcode tags"
+msgid ""
+"You can use HTML and shortcodes in your footer text. Shortcode examples: %s"
+msgstr ""
+
+#: library/extensions/theme-options.php:333
+msgctxt "{$current theme} Theme Options"
+msgid ""
+"%s Theme Options have been upgraded to an improved format. Remove the legacy "
+"options from the database."
+msgstr ""
+
+#: library/extensions/theme-options.php:360
+msgid ""
+"The index insert position value must be a number equal to or greater than "
+"zero. This setting has been reverted to the previous value."
+msgstr ""
+
#: library/extensions/widgets-extensions.php:34
-#@ thematic
msgid "To search, type and hit enter"
msgstr ""
#: library/extensions/widgets-extensions.php:40
-#: library/extensions/widgets.php:56
-#: library/extensions/widgets.php:61
-#@ thematic
+#: library/extensions/widgets.php:56 library/extensions/widgets.php:61
msgid "Search"
msgstr ""
+#: library/extensions/widgets-extensions.php:70
+msgid "Primary Aside"
+msgstr ""
+
#: library/extensions/widgets-extensions.php:72
-#@ thematic
msgid "The primary widget area, most often used as a sidebar."
msgstr ""
+#: library/extensions/widgets-extensions.php:85
+msgid "Secondary Aside"
+msgstr ""
+
#: library/extensions/widgets-extensions.php:87
-#@ thematic
msgid "The secondary widget area, most often used as a sidebar."
msgstr ""
+#: library/extensions/widgets-extensions.php:100
+msgid "1st Subsidiary Aside"
+msgstr ""
+
#: library/extensions/widgets-extensions.php:102
-#@ thematic
msgid "The 1st widget area in the footer."
msgstr ""
+#: library/extensions/widgets-extensions.php:115
+msgid "2nd Subsidiary Aside"
+msgstr ""
+
#: library/extensions/widgets-extensions.php:117
-#@ thematic
msgid "The 2nd widget area in the footer."
msgstr ""
+#: library/extensions/widgets-extensions.php:130
+msgid "3rd Subsidiary Aside"
+msgstr ""
+
#: library/extensions/widgets-extensions.php:132
-#@ thematic
msgid "The 3rd widget area in the footer."
msgstr ""
+#: library/extensions/widgets-extensions.php:145
+msgid "Index Top"
+msgstr ""
+
#: library/extensions/widgets-extensions.php:147
-#@ thematic
msgid "The top widget area displayed on the index page."
msgstr ""
+#: library/extensions/widgets-extensions.php:160
+msgid "Index Insert"
+msgstr ""
+
#: library/extensions/widgets-extensions.php:162
-#@ thematic
msgid "The widget area inserted after x posts on the index page."
msgstr ""
+#: library/extensions/widgets-extensions.php:175
+msgid "Index Bottom"
+msgstr ""
+
#: library/extensions/widgets-extensions.php:177
-#@ thematic
msgid "The bottom widget area displayed on the index page."
msgstr ""
+#: library/extensions/widgets-extensions.php:190
+msgid "Single Top"
+msgstr ""
+
#: library/extensions/widgets-extensions.php:192
-#@ thematic
msgid "The top widget area displayed on a single post."
msgstr ""
+#: library/extensions/widgets-extensions.php:205
+msgid "Single Insert"
+msgstr ""
+
#: library/extensions/widgets-extensions.php:207
-#@ thematic
-msgid "The widget area inserted between the post and the comments on a single post."
+msgid ""
+"The widget area inserted between the post and the comments on a single post."
+msgstr ""
+
+#: library/extensions/widgets-extensions.php:220
+msgid "Single Bottom"
msgstr ""
#: library/extensions/widgets-extensions.php:222
-#@ thematic
msgid "The bottom widget area displayed on a single post."
msgstr ""
+#: library/extensions/widgets-extensions.php:235
+msgid "Page Top"
+msgstr ""
+
#: library/extensions/widgets-extensions.php:237
-#@ thematic
msgid "The top widget area displayed on a page."
msgstr ""
+#: library/extensions/widgets-extensions.php:250
+msgid "Page Bottom"
+msgstr ""
+
#: library/extensions/widgets-extensions.php:252
-#@ thematic
msgid "The bottom widget area displayed on a page."
msgstr ""
#: library/extensions/widgets.php:55
-#@ thematic
msgid "A search form for your blog"
msgstr ""
-#: library/extensions/widgets.php:77
-#: library/extensions/widgets.php:132
+#: library/extensions/widgets.php:77 library/extensions/widgets.php:132
#: library/extensions/widgets.php:175
-#@ thematic
msgid "Title:"
msgstr ""
#: library/extensions/widgets.php:100
-#@ thematic
msgid "Log in/out and admin"
msgstr ""
-#: library/extensions/widgets.php:101
-#: library/extensions/widgets.php:106
-#@ thematic
+#: library/extensions/widgets.php:101 library/extensions/widgets.php:106
msgid "Meta"
msgstr ""
#: library/extensions/widgets.php:145
-#@ thematic
msgid "Links to your posts and comments feed"
msgstr ""
-#: library/extensions/widgets.php:146
-#: library/extensions/widgets.php:151
-#@ thematic
+#: library/extensions/widgets.php:146 library/extensions/widgets.php:151
msgid "RSS Links"
msgstr ""
#: library/extensions/widgets.php:157
-#@ thematic
msgid "All posts"
msgstr ""
#: library/extensions/widgets.php:158
-#@ thematic
msgid "All comments"
msgstr ""
-#: archives.php:20
-#: template-page-blog.php:22
-#, php-format
-#@ thematic
-msgid "The template %s"
+#: library/legacy/deprecated.php:349
+msgid "Logged in as"
msgstr ""
-#: comments.php:24
-#@ thematic
-msgid "Please do not load this page directly."
-msgstr ""
-
-#: comments.php:111
-#@ thematic
-msgid "Trackbacks"
-msgstr ""
-
-#: library/extensions/comments-extensions.php:131
-#@ thematic
-msgid "Comments"
-msgstr ""
-
-#: library/extensions/content-extensions.php:334
-#@ thematic
-msgid "Author Archives:"
-msgstr ""
-
-#: library/extensions/content-extensions.php:1340
-#@ thematic
-msgid "Apologies, but we were unable to find what you were looking for. Perhaps searching will help."
-msgstr ""
-
-#: library/extensions/content-extensions.php:1364
-#, php-format
-#@ thematic
-msgid "Read More %s"
-msgstr ""
-
-#: library/extensions/content-extensions.php:1645
-#@ thematic
-msgid "Responses"
-msgstr ""
-
-#: library/extensions/content-extensions.php:1648
-#@ thematic
-msgid "Response"
-msgstr ""
-
-#: library/extensions/discussion.php:37
-#@ thematic
-msgid "Your comment is awaiting moderation"
-msgstr ""
-
-#: library/extensions/discussion.php:90
-#@ thematic
-msgid "Your trackback is awaiting moderation"
-msgstr ""
-
-#: library/extensions/theme-options.php:56
-#@ thematic
-msgid "Remove Legacy Options"
-msgstr ""
-
-#: library/extensions/theme-options.php:204
-#@ thematic
-msgid "For more information:"
+#: library/legacy/deprecated.php:357 library/legacy/deprecated.php:362
+msgid "<span class=\"required\">*</span>"
msgstr ""
-#: library/extensions/theme-options.php:206
-#@ thematic
-msgid "For support:"
+#: page.php:50 template-page-fullwidth.php:51
+msgid "Pages: "
msgstr ""
-#: library/extensions/theme-options.php:208
-#@ thematic
-msgid "forums"
+#: search.php:56
+msgid "Nothing Found"
msgstr ""
-#: library/extensions/theme-options.php:212
-#@ thematic
-msgid "The options below are enabled by the Thematic Theme framework and/or a child theme."
+#: search.php:60
+msgid ""
+"Sorry, but nothing matched your search criteria. Please try again with some "
+"different keywords."
msgstr ""
-#: library/extensions/theme-options.php:213
-#@ thematic
-msgid "New options can be added and the default ones removed by creating a child theme. This contextual help can be customized in a child theme also."
+#: template-page-blog.php:22
+msgid "You can include a %s in a childtheme"
msgstr ""
-#: library/extensions/theme-options.php:219
-#@ thematic
-msgid "Overview"
+#. Theme Name of the plugin/theme
+msgid "Thematic"
msgstr ""
-#: library/extensions/theme-options.php:247
-#@ thematic
-msgid "For more information about this theme, <a href=\"http://thematictheme.com\">visit ThemeTheme.com</a>. Please visit the <a href=\"http://thematictheme.com/forums/\">ThematicTheme.com Forums</a> if you have any questions about Thematic."
+#. Theme URI of the plugin/theme
+msgid "http://thematictheme.com"
msgstr ""
-#: library/extensions/theme-options.php:262
-#, php-format
-#@ thematic
-msgid "%s Theme Options"
+#. Description of the plugin/theme
+msgid ""
+"The ultimate in SEO-ready themes, Thematic is a highly extensible, WordPress "
+"Theme Framework featuring 13 widget-ready areas, drop-down menus, grid-based "
+"layout samples, plugin integration, shortcodes for your footer, & a "
+"whole lot more. Perfect for any blog and <strong><em>the</em></strong> "
+"starting point for theme development."
msgstr ""
-#: library/extensions/theme-options.php:276
-#@ thematic
-msgid "Save Changes"
+#. Author of the plugin/theme
+msgid ""
+"<a href=\"http://themeshaper.com/\">Ian Stewart</a> & <a href=\"http://"
+"thematic4you.com/\">Chris Goßmann</a>"
msgstr ""
-#: library/extensions/theme-options.php:311
-#@ thematic
-msgid "The Index Insert widget area will appear after this post number. Entering nothing or 0 will disable this feature."
+#. Author URI of the plugin/theme
+msgid "http://themeshaper.com/"
msgstr ""
-#: library/extensions/theme-options.php:324
-#@ thematic
-msgid "Display a"
+#. Tags of the plugin/theme
+msgid ""
+"white, three-columns, two-columns, fixed-width, theme-options, left-sidebar, "
+"right-sidebar, threaded-comments, sticky-post, microformats"
msgstr ""
-#: library/extensions/theme-options.php:324
-#@ thematic
-msgid "with the author's avatar, bio and email on the author page."
+#. Template Name of the plugin/theme
+msgid "Deprecated Archives Template"
msgstr ""
-#: library/extensions/theme-options.php:337
-#@ thematic
-msgid "You can use HTML and shortcodes in your footer text. Shortcode examples"
+#. Template Name of the plugin/theme
+msgid "Links Page"
msgstr ""
-#: library/extensions/theme-options.php:350
-#, php-format
-#@ thematic
-msgid "%s Theme Options have been upgraded to an improved format. Remove the legacy options from the database."
+#. Template Name of the plugin/theme
+msgid "Archives Page"
msgstr ""
-#: library/extensions/theme-options.php:377
-#@ thematic
-msgid "The index insert position value must be a number equal to or greater than zero. This setting has been reverted to the previous value."
+#. Template Name of the plugin/theme
+msgid "Deprecated Blog Template"
msgstr ""
-#: template-page-blog.php:22
-#, php-format
-#@ thematic
-msgid "You can include a %s in a childtheme"
+#. Template Name of the plugin/theme
+msgid "Full Width"
msgstr ""
-
diff --git a/wp-content/themes/thematic/library/languages/zh_CN.mo b/wp-content/themes/thematic/library/languages/zh_CN.mo
new file mode 100644
index 0000000000000000000000000000000000000000..20f47862d42a87612a525ab7031c1068203976df
Binary files /dev/null and b/wp-content/themes/thematic/library/languages/zh_CN.mo differ
diff --git a/wp-content/themes/thematic/library/languages/zh_CN.po b/wp-content/themes/thematic/library/languages/zh_CN.po
new file mode 100644
index 0000000000000000000000000000000000000000..805b7ce00b4766e80952da11803c6ea740aadd2a
--- /dev/null
+++ b/wp-content/themes/thematic/library/languages/zh_CN.po
@@ -0,0 +1,678 @@
+# Translation of Thematic 1.0.3 in Chinese (China)
+# This file is distributed under the same license as the Thematic 1.0.3 package.
+msgid ""
+msgstr ""
+"PO-Revision-Date: 2012-10-22 09:59:38+0000\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: GlotPress/0.1\n"
+"Project-Id-Version: Thematic 1.0.3\n"
+
+#: archives.php:20 template-page-blog.php:22
+msgid "The template %s"
+msgstr "模版%s"
+
+#: attachment.php:54 library/extensions/content-extensions.php:630
+#: library/extensions/content-extensions.php:689
+msgid "Pages:"
+msgstr "页码："
+
+#: author.php:67
+msgid "Email "
+msgstr "电子邮件"
+
+#: comments.php:24
+msgid "Please do not load this page directly."
+msgstr "请勿直接加载本页面。"
+
+#: comments.php:33
+msgid "This post is password protected. Enter the password to view any comments."
+msgstr "输入密码以查看评论。"
+
+#: comments.php:111
+msgid "Trackbacks"
+msgstr "条互链"
+
+#: comments.php:111
+msgctxt "%1$ and %2$s are <span> tags"
+msgid "%1$sOne%2$s Trackback"
+msgstr "%1$s一%2$s条互链"
+
+#: functions.php:194
+msgid "Primary Menu"
+msgstr "主菜单"
+
+#: library/extensions/comments-extensions.php:120
+msgctxt "One Comment, where %$1s and %$2s are <span> tags"
+msgid "%1$sOne%2$s Comment"
+msgstr "%1$s1%2$s条评论"
+
+#: library/extensions/comments-extensions.php:131
+msgid "Comments"
+msgstr "条评论"
+
+#: library/extensions/comments-extensions.php:155
+msgid "Post a Comment"
+msgstr "添加一条评论"
+
+#: library/extensions/comments-extensions.php:167
+msgid "Post a Reply to %s"
+msgstr "回复 %s"
+
+#: library/extensions/comments-extensions.php:179
+msgctxt "noun"
+msgid "Comment"
+msgstr "评论"
+
+#: library/extensions/comments-extensions.php:190
+msgid "Cancel reply"
+msgstr "取消回复"
+
+#: library/extensions/comments-extensions.php:202
+msgid "Post Comment"
+msgstr "添加评论"
+
+#: library/extensions/comments-extensions.php:228
+#: library/legacy/deprecated.php:357
+msgid "Name"
+msgstr "姓名"
+
+#: library/extensions/comments-extensions.php:228
+#: library/extensions/comments-extensions.php:229
+msgctxt "denotes required field"
+msgid "*"
+msgstr "*"
+
+#: library/extensions/comments-extensions.php:229
+#: library/legacy/deprecated.php:362
+msgid "Email"
+msgstr "电子邮件"
+
+#: library/extensions/comments-extensions.php:230
+#: library/legacy/deprecated.php:367
+msgid "Website"
+msgstr "网站"
+
+#: library/extensions/comments-extensions.php:238
+#: library/legacy/deprecated.php:354
+msgctxt "%$1s and %$2s are <em> tags for emphasis on never"
+msgid "Your email is %1$snever%2$s published nor shared."
+msgstr "你的电子邮件%1$s不会%2$s被公开或用作其他用途。"
+
+#: library/extensions/comments-extensions.php:238
+msgctxt "%$1s and %$2s are <span> tags"
+msgid "Required fields are marked %1$s*%2$s"
+msgstr "标记%1$s*%2$s的项为必填项。"
+
+#: library/extensions/comments-extensions.php:240
+#: library/legacy/deprecated.php:336
+msgid "You must be %1$slogged in%2$s to post a comment."
+msgstr "%1$s登录%2$s以添加评论。"
+
+#: library/extensions/comments-extensions.php:240
+#: library/legacy/deprecated.php:336
+msgid "Log in"
+msgstr "登录"
+
+#: library/extensions/comments-extensions.php:242
+#: library/legacy/deprecated.php:349
+msgid "Logged in as %s"
+msgstr "以%s身份登录"
+
+#: library/extensions/comments-extensions.php:242
+#: library/legacy/deprecated.php:349
+msgid "Log out of this account"
+msgstr "注销"
+
+#: library/extensions/comments-extensions.php:242
+#: library/legacy/deprecated.php:349
+msgid "Log out?"
+msgstr "确认注销？"
+
+#: library/extensions/comments-extensions.php:244
+#: library/legacy/deprecated.php:379
+msgctxt "%$1s and %$2s are <abbr> tags"
+msgid "You may use these %1$sHTML%2$s tags and attributes"
+msgstr "你可以使用以下%1$sHTML%2$s标签和属性。"
+
+#: library/extensions/content-extensions.php:334
+msgid "Author Archives:"
+msgstr "按作者分类："
+
+#: library/extensions/content-extensions.php:339
+#: library/extensions/header-extensions.php:103
+msgid "Category Archives:"
+msgstr "按类别分类："
+
+#: library/extensions/content-extensions.php:347
+#: library/extensions/header-extensions.php:99
+msgid "Search Results for:"
+msgstr "搜索结果："
+
+#: library/extensions/content-extensions.php:352
+#: library/extensions/header-extensions.php:107
+msgid "Tag Archives:"
+msgstr "按标签分类："
+
+#: library/extensions/content-extensions.php:361
+#: library/extensions/content-extensions.php:368
+msgid "Archives:"
+msgstr "分类目录："
+
+#: library/extensions/content-extensions.php:373
+msgid "Daily Archives: %s"
+msgstr "按日分类：%s"
+
+#: library/extensions/content-extensions.php:377
+msgid "Monthly Archives: %s"
+msgstr "按月分类：%s"
+
+#: library/extensions/content-extensions.php:381
+msgid "Yearly Archives: %s"
+msgstr "按年分类：%s"
+
+#: library/extensions/content-extensions.php:424
+#: library/extensions/content-extensions.php:1706
+msgid "Older posts"
+msgstr "较老博文"
+
+#: library/extensions/content-extensions.php:426
+#: library/extensions/content-extensions.php:1708
+msgid "Newer posts"
+msgstr "较新博文"
+
+#: library/extensions/content-extensions.php:888
+#: library/extensions/content-extensions.php:1418
+msgid "Edit post"
+msgstr "编辑本文"
+
+#: library/extensions/content-extensions.php:890
+#: library/extensions/content-extensions.php:1420
+#: library/extensions/discussion-extensions.php:37
+#: library/extensions/discussion.php:84 links.php:54 page.php:52
+#: template-page-archives.php:55 template-page-fullwidth.php:53
+msgid "Edit"
+msgstr "编辑"
+
+#: library/extensions/content-extensions.php:918
+#: library/extensions/header-extensions.php:111
+msgid "Not Found"
+msgstr "无结果"
+
+#: library/extensions/content-extensions.php:923
+#: library/extensions/content-extensions.php:1141
+#: library/extensions/content-extensions.php:1145
+#: library/extensions/content-extensions.php:1376
+msgid "Permalink to %s"
+msgstr "%s的永久链接"
+
+#: library/extensions/content-extensions.php:983
+msgid "By"
+msgstr "作者："
+
+#: library/extensions/content-extensions.php:994
+msgid "View all posts by %s"
+msgstr "查看%s发表的文章"
+
+#: library/extensions/content-extensions.php:1023
+msgid "Published:"
+msgstr "发布："
+
+#: library/extensions/content-extensions.php:1199
+msgid "Archives by Category"
+msgstr "类别目录"
+
+#: library/extensions/content-extensions.php:1230
+msgid "Archives by Month"
+msgstr "月份目录"
+
+#: library/extensions/content-extensions.php:1291
+msgid "Apologies, but we were unable to find what you were looking for. Perhaps searching will help."
+msgstr "抱歉，没有找到你所需的结果。建议使用搜索功能。"
+
+#: library/extensions/content-extensions.php:1297 search.php:70
+msgid "Find"
+msgstr "查找"
+
+#: library/extensions/content-extensions.php:1316
+msgid "Read More %s"
+msgstr "继续阅读 %s"
+
+#: library/extensions/content-extensions.php:1368
+msgid "Browse the %s archive."
+msgstr "浏览%s类别"
+
+#: library/extensions/content-extensions.php:1370
+msgid "Permalink to %s Archive"
+msgstr "%s类别目录的永久链接"
+
+#: library/extensions/content-extensions.php:1376
+msgctxt "1s and 2s are the a href link wrappers, do not reverse them"
+msgid "Bookmark the %1$spermalink%2$s."
+msgstr "将该链接%1$s存入书签%2$s。"
+
+#: library/extensions/content-extensions.php:1534
+msgid "This entry was posted in %s"
+msgstr "发布在%s"
+
+#: library/extensions/content-extensions.php:1545
+msgid "Also posted in %s"
+msgstr "同时发布在%s"
+
+#: library/extensions/content-extensions.php:1549
+msgid "Posted in %s"
+msgstr "发布在%s"
+
+#: library/extensions/content-extensions.php:1575
+msgid "This entry is tagged"
+msgstr "条目已有标签"
+
+#: library/extensions/content-extensions.php:1578
+msgid "and tagged"
+msgstr "已有标签"
+
+#: library/extensions/content-extensions.php:1581
+msgid "Also tagged"
+msgstr "已有标签"
+
+#: library/extensions/content-extensions.php:1583
+msgid "Tagged"
+msgstr "已有标签"
+
+#: library/extensions/content-extensions.php:1613
+#: library/extensions/content-extensions.php:1619
+msgid "Comment on %s"
+msgstr "%s的评论"
+
+#: library/extensions/content-extensions.php:1615
+msgid "%s Response"
+msgid_plural "%s Responses"
+msgstr[0] "%s 个回复或互链"
+
+#: library/extensions/content-extensions.php:1620
+msgid "Leave a comment"
+msgstr "发表评论"
+
+#: library/extensions/content-extensions.php:1623
+msgid "Comments closed"
+msgstr "评论已关闭"
+
+#: library/extensions/content-extensions.php:1647
+msgctxt "1s and 2s are the a href link wrappers, do not reverse them. 3s is trackback url."
+msgid "%1$sPost a comment%2$s or leave a trackback: %3$s"
+msgstr "%1$s发表评论%2$s或留个互链：%3$s"
+
+#: library/extensions/content-extensions.php:1648
+#: library/extensions/content-extensions.php:1663
+msgid "Post a comment"
+msgstr "发表评论"
+
+#: library/extensions/content-extensions.php:1652
+#: library/extensions/content-extensions.php:1659
+msgid "Trackback URL for your post"
+msgstr "本文互链地址"
+
+#: library/extensions/content-extensions.php:1653
+#: library/extensions/content-extensions.php:1660
+msgid "Trackback URL"
+msgstr "互链地址"
+
+#: library/extensions/content-extensions.php:1656
+msgctxt "%s is trackback url, wrapped in link tags"
+msgid "Comments are closed, but you can leave a trackback: %s"
+msgstr "评论已关闭，你可以留个互链：%s"
+
+#: library/extensions/content-extensions.php:1663
+msgid "Trackbacks are closed, but you can %1$spost a comment%2$s."
+msgstr "互链已关闭，你可以%1$s发表评论%2$s。"
+
+#: library/extensions/content-extensions.php:1665
+msgid "Both comments and trackbacks are currently closed."
+msgstr "评论和互链已关闭。"
+
+#: library/extensions/discussion-extensions.php:27
+msgctxt "Posted {$date} at {$time}"
+msgid "Posted %s at %s"
+msgstr "发表于%s %s"
+
+#: library/extensions/discussion-extensions.php:31
+msgid "Permalink to this comment"
+msgstr "评论的永久链接"
+
+#: library/extensions/discussion-extensions.php:31
+msgid "Permalink"
+msgstr "永久链接"
+
+#: library/extensions/discussion-extensions.php:36
+msgid "Edit comment"
+msgstr "编辑评论"
+
+#: library/extensions/discussion.php:37
+msgid "Your comment is awaiting moderation"
+msgstr "你的评论正在审核中"
+
+#: library/extensions/discussion.php:52
+msgid "Reply"
+msgstr "回复"
+
+#: library/extensions/discussion.php:53
+msgid "Log in to reply."
+msgstr "登录以发表回复。"
+
+#: library/extensions/discussion.php:80
+msgctxt "By {$authorlink} on {$date} at {$time}"
+msgid "By %1$s on %2$s at %3$s"
+msgstr "由%1$s发表于%2$s %3$s"
+
+#: library/extensions/discussion.php:90
+msgid "Your trackback is awaiting moderation"
+msgstr "你的互链正在等待审核"
+
+#: library/extensions/header-extensions.php:319
+#: library/extensions/widgets.php:157
+msgid "Posts RSS feed"
+msgstr "RSS订阅本文"
+
+#: library/extensions/header-extensions.php:343
+#: library/extensions/widgets.php:158
+msgid "Comments RSS feed"
+msgstr "RSS订阅评论"
+
+#: library/extensions/header-extensions.php:642
+msgid "Skip navigation to the content"
+msgstr "跳过导航"
+
+#: library/extensions/header-extensions.php:642
+msgid "Skip to content"
+msgstr "直接查看正文"
+
+#: library/extensions/helpers.php:50 library/extensions/helpers.php:69
+msgid "There is no excerpt because this is a protected post."
+msgstr "本文受保护，无法提供摘要。"
+
+#: library/extensions/theme-options.php:50
+msgid "Index Insert Position"
+msgstr "目录插入位"
+
+#: library/extensions/theme-options.php:51
+msgid "Info on Author Page"
+msgstr "作者页信息"
+
+#: library/extensions/theme-options.php:52
+msgid "Text in Footer"
+msgstr "页脚文本"
+
+#: library/extensions/theme-options.php:56
+msgid "Remove Legacy Options"
+msgstr "删除旧版设置"
+
+#: library/extensions/theme-options.php:170
+msgid "Theme Options"
+msgstr "主题设置"
+
+#: library/extensions/theme-options.php:202
+msgid "For more information:"
+msgstr "更多信息："
+
+#: library/extensions/theme-options.php:204
+msgid "For support:"
+msgstr "技术支持："
+
+#: library/extensions/theme-options.php:206
+msgid "forums"
+msgstr "讨论版"
+
+#: library/extensions/theme-options.php:210
+msgid "The options below are enabled by the Thematic Theme framework and/or a child theme."
+msgstr "以下设置来自Thematic及其子主题。"
+
+#: library/extensions/theme-options.php:211
+msgid "New options can be added and the default ones removed by creating a child theme. This contextual help can be customized in a child theme also."
+msgstr "建立子主题时，你可以添加新的选项或删除旧的设置项。同时，文本提示也可以进行修改。"
+
+#: library/extensions/theme-options.php:217
+msgid "Overview"
+msgstr "总览"
+
+#: library/extensions/theme-options.php:244
+msgctxt "%1$s and %2$s are <a> tags"
+msgid "For more information about this theme, %1$svisit ThematicTheme.com%2$s"
+msgstr "更多该主题的信息请访问%1$sThematicTheme.com%2$s"
+
+#: library/extensions/theme-options.php:244
+msgctxt "%1$s and %2$s are <a> tags"
+msgid "Please visit the %1$sThematicTheme.com Forums%2$s if you have any questions about Thematic."
+msgstr "咨询及疑问请访问%1$sThematicTheme.com%2$s"
+
+#: library/extensions/theme-options.php:256
+msgctxt "{$current theme} Theme Options"
+msgid "%s Theme Options"
+msgstr "%s主题选项"
+
+#: library/extensions/theme-options.php:294
+msgid "The Index Insert widget area will appear after this post number. Entering nothing or 0 will disable this feature."
+msgstr "目录小工具会在以下楼层后出现。如果不想使用请填0。"
+
+#: library/extensions/theme-options.php:307
+msgctxt "%1$s and %2$s are <a> tags"
+msgid "Display a %1$smicroformatted vCard%2$s with the author's avatar, bio and email on the author page."
+msgstr "显示一张带有头像和电子邮件地址的%1$svCard名片%2$s。"
+
+#: library/extensions/theme-options.php:320
+msgctxt "%s are shortcode tags"
+msgid "You can use HTML and shortcodes in your footer text. Shortcode examples: %s"
+msgstr "你可以在页脚中使用HTML标签和微型标签，如：%s"
+
+#: library/extensions/theme-options.php:333
+msgctxt "{$current theme} Theme Options"
+msgid "%s Theme Options have been upgraded to an improved format. Remove the legacy options from the database."
+msgstr "%s主题选项已更新并采用新的格式。请从数据库中移除旧版选项。"
+
+#: library/extensions/theme-options.php:360
+msgid "The index insert position value must be a number equal to or greater than zero. This setting has been reverted to the previous value."
+msgstr "首页小工具插入楼层应当大于或等于零。已恢复到之前的设置。"
+
+#: library/extensions/widgets-extensions.php:34
+msgid "To search, type and hit enter"
+msgstr "搜索..."
+
+#: library/extensions/widgets-extensions.php:40
+#: library/extensions/widgets.php:56 library/extensions/widgets.php:61
+msgid "Search"
+msgstr "搜索"
+
+#: library/extensions/widgets-extensions.php:70
+msgid "Primary Aside"
+msgstr "主边栏"
+
+#: library/extensions/widgets-extensions.php:72
+msgid "The primary widget area, most often used as a sidebar."
+msgstr "首要小工具区域，通常用作边栏"
+
+#: library/extensions/widgets-extensions.php:85
+msgid "Secondary Aside"
+msgstr "次要边栏"
+
+#: library/extensions/widgets-extensions.php:87
+msgid "The secondary widget area, most often used as a sidebar."
+msgstr "次要小工具区域，通常用作边栏"
+
+#: library/extensions/widgets-extensions.php:100
+msgid "1st Subsidiary Aside"
+msgstr "主要底边栏"
+
+#: library/extensions/widgets-extensions.php:102
+msgid "The 1st widget area in the footer."
+msgstr "页脚的主要小工具区。"
+
+#: library/extensions/widgets-extensions.php:115
+msgid "2nd Subsidiary Aside"
+msgstr "次要底边栏"
+
+#: library/extensions/widgets-extensions.php:117
+msgid "The 2nd widget area in the footer."
+msgstr "页脚的第二小工具区。"
+
+#: library/extensions/widgets-extensions.php:130
+msgid "3rd Subsidiary Aside"
+msgstr "第三底边栏"
+
+#: library/extensions/widgets-extensions.php:132
+msgid "The 3rd widget area in the footer."
+msgstr "页脚的第三小工具区。"
+
+#: library/extensions/widgets-extensions.php:145
+msgid "Index Top"
+msgstr "首页顶部"
+
+#: library/extensions/widgets-extensions.php:147
+msgid "The top widget area displayed on the index page."
+msgstr "首页顶部的小工具区。"
+
+#: library/extensions/widgets-extensions.php:160
+msgid "Index Insert"
+msgstr "首页插入"
+
+#: library/extensions/widgets-extensions.php:162
+msgid "The widget area inserted after x posts on the index page."
+msgstr "首页x楼后插入的小工具区。"
+
+#: library/extensions/widgets-extensions.php:175
+msgid "Index Bottom"
+msgstr "首页底部"
+
+#: library/extensions/widgets-extensions.php:177
+msgid "The bottom widget area displayed on the index page."
+msgstr "首页底部的小工具区。"
+
+#: library/extensions/widgets-extensions.php:190
+msgid "Single Top"
+msgstr "博文顶部"
+
+#: library/extensions/widgets-extensions.php:192
+msgid "The top widget area displayed on a single post."
+msgstr "博文页顶部的小工具区。"
+
+#: library/extensions/widgets-extensions.php:205
+msgid "Single Insert"
+msgstr "博文中部"
+
+#: library/extensions/widgets-extensions.php:207
+msgid "The widget area inserted between the post and the comments on a single post."
+msgstr "博文页正文和评论之间的小工具区。"
+
+#: library/extensions/widgets-extensions.php:220
+msgid "Single Bottom"
+msgstr "博文底部"
+
+#: library/extensions/widgets-extensions.php:222
+msgid "The bottom widget area displayed on a single post."
+msgstr "博文页底部的小工具区。"
+
+#: library/extensions/widgets-extensions.php:235
+msgid "Page Top"
+msgstr "页面顶部"
+
+#: library/extensions/widgets-extensions.php:237
+msgid "The top widget area displayed on a page."
+msgstr "页面顶部的小工具区。"
+
+#: library/extensions/widgets-extensions.php:250
+msgid "Page Bottom"
+msgstr "页面底部"
+
+#: library/extensions/widgets-extensions.php:252
+msgid "The bottom widget area displayed on a page."
+msgstr "页面底部的小工具区。"
+
+#: library/extensions/widgets.php:55
+msgid "A search form for your blog"
+msgstr "站内搜索窗格"
+
+#: library/extensions/widgets.php:77 library/extensions/widgets.php:132
+#: library/extensions/widgets.php:175
+msgid "Title:"
+msgstr "标题："
+
+#: library/extensions/widgets.php:100
+msgid "Log in/out and admin"
+msgstr "登录和后台"
+
+#: library/extensions/widgets.php:101 library/extensions/widgets.php:106
+msgid "Meta"
+msgstr "信息"
+
+#: library/extensions/widgets.php:145
+msgid "Links to your posts and comments feed"
+msgstr "订阅该主题和评论"
+
+#: library/extensions/widgets.php:146 library/extensions/widgets.php:151
+msgid "RSS Links"
+msgstr "RSS链接"
+
+#: library/extensions/widgets.php:157
+msgid "All posts"
+msgstr "所有博文"
+
+#: library/extensions/widgets.php:158
+msgid "All comments"
+msgstr "所有评论"
+
+#: library/legacy/deprecated.php:349
+msgid "Logged in as"
+msgstr "登录身份："
+
+#: library/legacy/deprecated.php:357 library/legacy/deprecated.php:362
+msgid "<span class=\"required\">*</span>"
+msgstr "<span class=\"required\">*</span>"
+
+#: page.php:50 template-page-fullwidth.php:51
+msgid "Pages: "
+msgstr "页码："
+
+#: search.php:56
+msgid "Nothing Found"
+msgstr "没有结果"
+
+#: search.php:60
+msgid "Sorry, but nothing matched your search criteria. Please try again with some different keywords."
+msgstr "很抱歉，没有符合搜索条件的结果。您可以尝试其他关键词。"
+
+#: template-page-blog.php:22
+msgid "You can include a %s in a childtheme"
+msgstr "你可以在子主题中包含%s"
+
+msgid "Thematic"
+msgstr "Thematic"
+
+msgid "http://thematictheme.com"
+msgstr "http://thematictheme.com"
+
+msgid "The ultimate in SEO-ready themes, Thematic is a highly extensible, WordPress Theme Framework featuring 13 widget-ready areas, drop-down menus, grid-based layout samples, plugin integration, shortcodes for your footer, & a whole lot more. Perfect for any blog and <strong><em>the</em></strong> starting point for theme development."
+msgstr "Thematic是一个具备高度扩展性的WordPress主题架构，包含13个小工具区，下拉菜单，基于网格的布局，插件整合，页脚微型代码等多种特色功能，并为搜索引擎做了优化。<strong><em>Thematic适应任何一种博客，同时也是主题开发者的理想平台。</em></strong> "
+
+msgid "<a href=\"http://themeshaper.com/\">Ian Stewart</a> & <a href=\"http://thematic4you.com/\">Chris Goßmann</a>"
+msgstr "<a href=\"http://themeshaper.com/\">Ian Stewart</a> & <a href=\"http://thematic4you.com/\">Chris Goßmann</a>"
+
+msgid "http://themeshaper.com/"
+msgstr "http://themeshaper.com/"
+
+msgid "white, three-columns, two-columns, fixed-width, theme-options, left-sidebar, right-sidebar, threaded-comments, sticky-post, microformats"
+msgstr "white, three-columns, two-columns, fixed-width, theme-options, left-sidebar, right-sidebar, threaded-comments, sticky-post, microformats"
+
+msgid "Deprecated Archives Template"
+msgstr "不兼容的分类目录模版"
+
+msgid "Links Page"
+msgstr "链接页"
+
+msgid "Archives Page"
+msgstr "分类目录页"
+
+msgid "Deprecated Blog Template"
+msgstr "不兼容的博客模版"
+
+msgid "Full Width"
+msgstr "满宽模式"
\ No newline at end of file
diff --git a/wp-content/themes/thematic/library/legacy/deprecated.php b/wp-content/themes/thematic/library/legacy/deprecated.php
index df81a8b931ed5d6f3e3ee2114691ef5f0944ea2b..92c5e2397305725bcec4dc76cd8241d7dd4e5ffe 100644
--- a/wp-content/themes/thematic/library/legacy/deprecated.php
+++ b/wp-content/themes/thematic/library/legacy/deprecated.php
@@ -58,6 +58,14 @@ function thematic_show_commentreply() {
wp_enqueue_script('comment-reply');
}
+/**
+ * thematic_canonical_url is no longer necessary because the functionality has been included in WordPress core since 2.9.0
+ *
+ * @deprecated 1.0
+ */
+function thematic_canonical_url() {
+ _deprecated_function( __FUNCTION__, '1.0' );
+}
/**
* Get the page number for title tag
@@ -309,4 +317,95 @@ function widget_area_page_bottom() {
thematic_widget_area_subsidiaries();
}
+
+/**
+ * Generates the legacy comment form
+ *
+ * We removed the functionality because WordPress supplies its own function comment_form()
+ *
+ * @deprecated 1.0.2.3
+ */
+
+function thematic_legacy_comment_form(){
+
+ _deprecated_function( __FUNCTION__, '1.0.2.3', 'comment_form( thematic_comment_form_args() )' );
+
+ $user = wp_get_current_user();
+
+ $user_ID = ! ( is_wp_error( $user ) ) ? $user->ID : FALSE; ?>
+
+ <div id="respond">
+
+ <h3><?php comment_form_title( thematic_postcomment_text(), thematic_postreply_text() ); ?></h3>
+ <div id="cancel-comment-reply"><?php cancel_comment_reply_link() ?></div>
+
+ <?php if ( get_option( 'comment_registration' ) && !$user_ID ) : ?>
+
+ <p id="login-req"><?php printf( __('You must be %1$slogged in%2$s to post a comment.', 'thematic'), sprintf('<a href="%s" title ="%s">', wp_login_url( apply_filters( 'the_permalink', get_permalink() ) ), esc_attr__( 'Log in', 'thematic' ) ), '</a>' ) ?></p>
+
+ <?php else : ?>
+
+ <div class="formcontainer">
+ <?php
+ // action hook for inserting content above #commentform
+ thematic_abovecommentsform()
+ ?>
+
+ <form id="commentform" action="<?php echo site_url( '/wp-comments-post.php' ) ?>" method="post">
+
+ <?php if ( $user_ID ) : ?>
+ <p id="login"><span class="loggedin"><?php _e('Logged in as', 'thematic' ) . printf( ' <a href="%1$s" title="%2$s">%3$s</a>', admin_url( 'profile.php' ), sprintf( esc_attr__('Logged in as %s', 'thematic'), $user_identity ) , $user_identity ) ;?></span> <span class="logout"><?php printf('<a href="%s" title="%s">%s</a>' , esc_attr( wp_logout_url( apply_filters( 'the_permalink', get_permalink( $post_id ) ) ) ), esc_attr__('Log out of this account', 'thematic' ) , __('Log out?', 'thematic' ) ); ?></span>
+ </p>
+
+ <?php else : ?>
+
+ <p id="comment-notes"><?php printf( _x( 'Your email is %1$snever%2$s published nor shared.' , '%$1s and %$2s are <em> tags for emphasis on never', 'thematic' ), '<em>' , '</em>' ) ?></p>
+
+ <div id="form-section-author" class="form-section">
+ <div class="form-label"><label for="author"><?php _e( 'Name', 'thematic' ) ?></label> <?php if ( $req ) _e( '<span class="required">*</span>', 'thematic' ) ?></div>
+ <div class="form-input"><input id="author" name="author" type="text" value="<?php echo $comment_author ?>" size="30" maxlength="20" tabindex="3" /></div>
+ </div><!-- #form-section-author .form-section -->
+
+ <div id="form-section-email" class="form-section">
+ <div class="form-label"><label for="email"><?php _e( 'Email', 'thematic' ) ?></label> <?php if ( $req ) _e( '<span class="required">*</span>', 'thematic' ) ?></div>
+ <div class="form-input"><input id="email" name="email" type="text" value="<?php echo $comment_author_email ?>" size="30" maxlength="50" tabindex="4" /></div>
+ </div><!-- #form-section-email .form-section -->
+
+ <div id="form-section-url" class="form-section">
+ <div class="form-label"><label for="url"><?php _e( 'Website', 'thematic' ) ?></label></div>
+ <div class="form-input"><input id="url" name="url" type="text" value="<?php echo $comment_author_url ?>" size="30" maxlength="50" tabindex="5" /></div>
+ </div><!-- #form-section-url .form-section -->
+
+ <?php endif /* if ( $user_ID ) */ ?>
+
+ <div id="form-section-comment" class="form-section">
+ <div class="form-label"><label for="comment"><?php _e( thematic_commentbox_text(), 'thematic' ) ?></label></div>
+ <div class="form-textarea"><textarea id="comment" name="comment" cols="45" rows="8" tabindex="6"></textarea></div>
+ </div><!-- #form-section-comment .form-section -->
+
+ <div id="form-allowed-tags" class="form-section">
+ <p><span><?php printf( _x('You may use these %1$sHTML%2$s tags and attributes', '%$1s and %$2s are <abbr> tags', 'thematic'), '<abbr title="HyperText Markup Language">', '</abbr>' ) ?></span> <code><?php echo allowed_tags(); ?></code></p>
+ </div>
+
+ <?php do_action( 'comment_form', $post->ID ); ?>
+
+ <div class="form-submit"><input id="submit" name="submit" type="submit" value="<?php echo thematic_commentbutton_text(); ?>" tabindex="7" /><input type="hidden" name="comment_post_ID" value="<?php echo $id; ?>" /></div>
+
+ <?php comment_id_fields(); ?>
+
+ </form><!-- #commentform -->
+
+ <?php
+ // action hook for inserting content below #commentform
+ thematic_belowcommentsform()
+ ?>
+
+ </div><!-- .formcontainer -->
+ <?php endif /* if ( get_option('comment_registration') && !$user_ID ) */ ?>
+
+ </div><!-- #respond -->
+
+<?php
+}
+
?>
\ No newline at end of file
diff --git a/wp-content/themes/thematic/library/scripts/superfish.js b/wp-content/themes/thematic/library/scripts/superfish.js
index 72a9609944d60ff78c25da5e0e2c851ef0e04369..605d798183fc70c9c22253cf65e678918b77c960 100644
--- a/wp-content/themes/thematic/library/scripts/superfish.js
+++ b/wp-content/themes/thematic/library/scripts/superfish.js
@@ -1 +1 @@
-(function(b){b.fn.superfish=function(k){var g=b.fn.superfish,j=g.c,f=b(['<span class="',j.arrowClass,'"> »</span>'].join("")),i=function(){var c=b(this),l=d(c);clearTimeout(l.sfTimer);c.showSuperfishUl().siblings().hideSuperfishUl()},e=function(){var c=b(this),m=d(c),l=g.op;clearTimeout(m.sfTimer);m.sfTimer=setTimeout(function(){l.retainPath=(b.inArray(c[0],l.$path)>-1);c.hideSuperfishUl();if(l.$path.length&&c.parents(["li.",l.hoverClass].join("")).length<1){i.call(l.$path)}},l.delay)},d=function(c){var l=c.parents(["ul.",j.menuClass,":first"].join(""))[0];g.op=g.o[l.serial];return l},h=function(c){c.addClass(j.anchorClass).append(f.clone())};return this.each(function(){var c=this.serial=g.o.length;var m=b.extend({},g.defaults,k);m.$path=b("li."+m.pathClass,this).slice(0,m.pathLevels).each(function(){b(this).addClass([m.hoverClass,j.bcClass].join(" ")).filter("li:has(ul)").removeClass(m.pathClass)});g.o[c]=g.op=m;b("li:has(ul)",this)[(b.fn.hoverIntent&&!m.disableHI)?"hoverIntent":"hover"](i,e).each(function(){if(m.autoArrows){h(b(">a:first-child",this))}}).not("."+j.bcClass).hideSuperfishUl();var l=b("a",this);l.each(function(n){var o=l.eq(n).parents("li");l.eq(n).focus(function(){i.call(o)}).blur(function(){e.call(o)})});m.onInit.call(this)}).each(function(){var c=[j.menuClass];if(g.op.dropShadows&&!(b.browser.msie&&b.browser.version<7)){c.push(j.shadowClass)}b(this).addClass(c.join(" "))})};var a=b.fn.superfish;a.o=[];a.op={};a.IE7fix=function(){var c=a.op;if(b.browser.msie&&b.browser.version>6&&c.dropShadows&&c.animation.opacity!=undefined){this.toggleClass(a.c.shadowClass+"-off")}};a.c={bcClass:"sf-breadcrumb",menuClass:"sf-js-enabled",anchorClass:"sf-with-ul",arrowClass:"sf-sub-indicator",shadowClass:"sf-shadow"};a.defaults={hoverClass:"sfHover",pathClass:"overideThisToUse",pathLevels:1,delay:800,animation:{opacity:"show"},speed:"normal",autoArrows:true,dropShadows:true,disableHI:false,onInit:function(){},onBeforeShow:function(){},onShow:function(){},onHide:function(){}};b.fn.extend({hideSuperfishUl:function(){var e=a.op,d=(e.retainPath===true)?e.$path:"";e.retainPath=false;var c=b(["li.",e.hoverClass].join(""),this).add(this).not(d).removeClass(e.hoverClass).find(">ul").hide().css("visibility","hidden");e.onHide.call(c);return this},showSuperfishUl:function(){var e=a.op,d=a.c.shadowClass+"-off",c=this.addClass(e.hoverClass).find(">ul:hidden").css("visibility","visible");a.IE7fix.call(c);e.onBeforeShow.call(c);c.animate(e.animation,e.speed,function(){a.IE7fix.call(c);e.onShow.call(c)});return this}})})(jQuery);
\ No newline at end of file
+;(function($){$.fn.superfish=function(op){var sf=$.fn.superfish,c=sf.c,$arrow=$(['<span class="',c.arrowClass,'"> »</span>'].join('')),over=function(){var $$=$(this),menu=getMenu($$);clearTimeout(menu.sfTimer);$$.showSuperfishUl().siblings().hideSuperfishUl()},out=function(){var $$=$(this),menu=getMenu($$),o=sf.op;clearTimeout(menu.sfTimer);menu.sfTimer=setTimeout(function(){o.retainPath=($.inArray($$[0],o.$path)>-1);$$.hideSuperfishUl();if(o.$path.length&&$$.parents(['li.',o.hoverClass].join('')).length<1){over.call(o.$path)}},o.delay)},getMenu=function($menu){var menu=$menu.parents(['ul.',c.menuClass,':first'].join(''))[0];sf.op=sf.o[menu.serial];return menu},addArrow=function($a){$a.addClass(c.anchorClass).append($arrow.clone())};return this.each(function(){var s=this.serial=sf.o.length;var o=$.extend({},sf.defaults,op);o.$path=$('li.'+o.pathClass,this).slice(0,o.pathLevels).each(function(){$(this).addClass([o.hoverClass,c.bcClass].join(' ')).filter('li:has(ul)').removeClass(o.pathClass)});sf.o[s]=sf.op=o;$('li:has(ul)',this)[($.fn.hoverIntent&&!o.disableHI)?'hoverIntent':'hover'](over,out).each(function(){if(o.autoArrows)addArrow($('>a:first-child',this))}).not('.'+c.bcClass).hideSuperfishUl();var $a=$('a',this);$a.each(function(i){var $li=$a.eq(i).parents('li');$a.eq(i).focus(function(){over.call($li)}).blur(function(){out.call($li)})});o.onInit.call(this)}).each(function(){var menuClasses=[c.menuClass];if(sf.op.dropShadows&&!($.browser.msie&&$.browser.version<7))menuClasses.push(c.shadowClass);$(this).addClass(menuClasses.join(' '))})};var sf=$.fn.superfish;sf.o=[];sf.op={};sf.IE7fix=function(){var o=sf.op;if($.browser.msie&&$.browser.version>6&&o.dropShadows&&o.animation.opacity!=undefined)this.toggleClass(sf.c.shadowClass+'-off')};sf.c={bcClass:'sf-breadcrumb',menuClass:'sf-js-enabled',anchorClass:'sf-with-ul',arrowClass:'sf-sub-indicator',shadowClass:'sf-shadow'};sf.defaults={hoverClass:'sfHover',pathClass:'overideThisToUse',pathLevels:1,delay:800,animation:{opacity:'show'},speed:'normal',autoArrows:true,dropShadows:true,disableHI:false,onInit:function(){},onBeforeShow:function(){},onShow:function(){},onHide:function(){}};$.fn.extend({hideSuperfishUl:function(){var o=sf.op,not=(o.retainPath===true)?o.$path:'';o.retainPath=false;var $ul=$(['li.',o.hoverClass].join(''),this).add(this).not(not).removeClass(o.hoverClass).find('>ul').hide().css('visibility','hidden');o.onHide.call($ul);return this},showSuperfishUl:function(){var o=sf.op,sh=sf.c.shadowClass+'-off',$ul=this.addClass(o.hoverClass).find('>ul:hidden').css('visibility','visible');sf.IE7fix.call($ul);o.onBeforeShow.call($ul);$ul.animate(o.animation,o.speed,function(){sf.IE7fix.call($ul);o.onShow.call($ul)});return this}})})(jQuery);
\ No newline at end of file
diff --git a/wp-content/themes/thematic/library/scripts/supersubs.js b/wp-content/themes/thematic/library/scripts/supersubs.js
index ed85e43bf35614b9c13ac94f1674a56b159cca4b..5be81e6b2a40878652cb4c7c5223787521c0e0d7 100644
--- a/wp-content/themes/thematic/library/scripts/supersubs.js
+++ b/wp-content/themes/thematic/library/scripts/supersubs.js
@@ -1 +1 @@
-(function(a){a.fn.supersubs=function(b){var c=a.extend({},a.fn.supersubs.defaults,b);return this.each(function(){var d=a(this);var e=a.meta?a.extend({},c,d.data()):c;var f=a('<li id="menu-fontsize">—</li>').css({padding:0,position:"absolute",top:"-999em",width:"auto"}).appendTo(d).width();a("#menu-fontsize").remove();$ULs=d.find("ul");$ULs.each(function(l){var k=$ULs.eq(l);var j=k.children();var g=j.children("a");var m=j.css("white-space","nowrap").css("float");var h=k.add(j).add(g).css({"float":"none",width:"auto"}).end().end()[0].clientWidth/f;h+=e.extraWidth;if(h>e.maxWidth){h=e.maxWidth}else{if(h<e.minWidth){h=e.minWidth}}h+="em";k.css("width",h);j.css({"float":m,width:"100%","white-space":"normal"}).each(function(){var n=a(">ul",this);var i=n.css("left")!==undefined?"left":"right";n.css(i,h)})})})};a.fn.supersubs.defaults={minWidth:9,maxWidth:25,extraWidth:0}})(jQuery);
\ No newline at end of file
+;(function($){$.fn.supersubs=function(options){var opts=$.extend({},$.fn.supersubs.defaults,options);return this.each(function(){var $$=$(this);var o=$.meta?$.extend({},opts,$$.data()):opts;var fontsize=$('<li id="menu-fontsize">—</li>').css({'padding':0,'position':'absolute','top':'-999em','width':'auto'}).appendTo($$).width();$('#menu-fontsize').remove();$ULs=$$.find('ul');$ULs.each(function(i){var $ul=$ULs.eq(i);var $LIs=$ul.children();var $As=$LIs.children('a');var liFloat=$LIs.css('white-space','nowrap').css('float');var emWidth=$ul.add($LIs).add($As).css({'float':'none','width':'auto'}).end().end()[0].clientWidth/fontsize;emWidth+=o.extraWidth;if(emWidth>o.maxWidth){emWidth=o.maxWidth}else if(emWidth<o.minWidth){emWidth=o.minWidth}emWidth+='em';$ul.css('width',emWidth);$LIs.css({'float':liFloat,'width':'100%','white-space':'normal'}).each(function(){var $childUl=$('>ul',this);var offsetDirection=$childUl.css('left')!==undefined?'left':'right';$childUl.css(offsetDirection,emWidth)})})})};$.fn.supersubs.defaults={minWidth:9,maxWidth:25,extraWidth:0}})(jQuery);
\ No newline at end of file
diff --git a/wp-content/themes/thematic/links.php b/wp-content/themes/thematic/links.php
index 0dd498019a8f8a73e510803814369d9a1ceb7e93..43cbad614228766cfa626b5ae0a6902dc511cabd 100644
--- a/wp-content/themes/thematic/links.php
+++ b/wp-content/themes/thematic/links.php
@@ -30,22 +30,14 @@
// action hook for placing content above #post
thematic_abovepost();
?>
-
- <?php
- echo '<div id="post-' . get_the_ID() . '" ';
- // Checking for defined constant to enable Thematic's post classes
- if ( ! ( THEMATIC_COMPATIBLE_POST_CLASS ) ) {
- post_class();
- echo '>';
- } else {
- echo 'class="';
- thematic_post_class();
- echo '">';
- }
+
+ <div id="post-<?php the_ID(); ?>" <?php post_class(); ?> >
+
+ <?php
- // creating the post header
- thematic_postheader();
- ?>
+ // creating the post header
+ thematic_postheader();
+ ?>
<div class="entry-content">
diff --git a/wp-content/themes/thematic/page.php b/wp-content/themes/thematic/page.php
index b1c1fce146a7261ca64d8030c35c64f8ece567d9..3ca6aa62545dfdcf3143fe8b712c682b5451497a 100644
--- a/wp-content/themes/thematic/page.php
+++ b/wp-content/themes/thematic/page.php
@@ -33,18 +33,10 @@
// action hook for placing content above #post
thematic_abovepost();
?>
-
+
+ <div id="post-<?php the_ID(); ?>" <?php post_class(); ?> >
+
<?php
- echo '<div id="post-' . get_the_ID() . '" ';
- // Checking for defined constant to enable Thematic's post classes
- if ( ! ( THEMATIC_COMPATIBLE_POST_CLASS ) ) {
- post_class();
- echo '>';
- } else {
- echo 'class="';
- thematic_post_class();
- echo '">';
- }
// creating the post header
thematic_postheader();
diff --git a/wp-content/themes/thematic/readme.txt b/wp-content/themes/thematic/readme.txt
index b63caf071be2b327dde06637cf1b11ea2393e3f2..e2095cda037d9b5965b54585401e7cb81b0e85b9 100644
--- a/wp-content/themes/thematic/readme.txt
+++ b/wp-content/themes/thematic/readme.txt
@@ -2,8 +2,8 @@
Contributors: iandstewart, chrisgossmann, emhr
Tags: white, three-columns, two-columns, fixed-width, theme-options, left-sidebar, right-sidebar, threaded-comments, sticky-post, microformats
Requires at least: 3.2
-Tested up to: 3.4
-Stable tag: 1.0.2.1
+Tested up to: 3.4.2
+Stable tag: 1.0.3.2
The ultimate in SEO-ready themes, Thematic is a highly extensible, WordPress Theme Framework featuring 13 widget-ready areas, & a whole lot more.
@@ -28,6 +28,41 @@ Features:
* Options for multi-author blogs
== Changelog ==
+= 1.0.3.2 =
+* Changed: Samplechildtheme custom header styling
+* Fixed: Syntax error in links.php
+= 1.0.3.1 =
+* Updated: Spanish and Catalan localization files
+* Added: Simplified Chinese and Serbian localization files
+* Added: XML configuration file for compatibility with WPML multilingual plugin
+* Fixed: restored missing #comment-id on comment permalinks
+= 1.0.3 =
+* Updated: Swedish, French, Estonian localization files
+* Updated: regeneration of .pot file after major update of localization strings
+* Fixed: adjusted filter for title tags on static front pages
+* Fixed: minor bug in theme options page, props petskratt
+* Updated: sample childtheme includes code to add support for custom background and custom header images
+* Deprecated: thematic_canonical_url(), props rowatt
+* Deprecated: all theme constants
+ - replaced THEMATIC_COMPATIBLE_FEEDLINKS with add_theme_support( 'thematic_legacy_feed_links' )
+ - replaced THEMATIC_COMPATIBLE_COMMENT_HANDLING with add_theme_support( 'thematic_legacy_comment_handling' )
+ - replaced THEMATIC_COMPATIBLE_BODY_CLASS with add_theme_support( 'thematic_legacy_body_class' )
+ - replaced THEMATIC_COMPATIBLE_POST_CLASS with add_theme_support( 'thematic_legacy_post_class' )
+ - replaced THEMATIC_COMPATIBLE_COMMENT_FORM with add_theme_support( 'thematic_legacy_comment_form' )
+ - Removed: THEMATIC_THEMENAME
+ - Removed: THEMATIC_THEMEAUTHOR
+ - Removed: THEMATIC_THEMEURI
+ - Removed: THEMATIC_VERSION
+ - Removed: THEMATIC_TEMPLATEAUTHOR
+ - Removed: THEMATIC_TEMPLATEURI
+ - Removed: THEMATIC_TEMPLATEVERSION
+* Deprecated: thematic_body_class(), modified it to filter body_class() instead
+* Deprecated: thematic_post_class(), modified it to filter post_class() instead
+* Fixed: replaced get_current_theme() with wp_get_theme() for Theme Review Recommendations
+* Updated: superfish/supersubs, load all superfish-related scripts in footer
+= 1.0.2.2 =
+* fixed invalid markup (extra span) in thematic_postmeta_authorlink()
+* fixed broken feed links in thematic_show_rss() and thematic_show_comment_rss()
= 1.0.2.1 =
* Added: $hook argument to <code>apply_filters()</code> in <code>thematic_before_widget_area()</code> and <code>thematicafter_widget_area()</code> to filter attribute id
* Fixed: <code>thematic_wptitle</code> to use <code>!thematic_seo()</code> logic
@@ -375,3 +410,8 @@ Features:
* Fixed: a bug in thematic_page_title() not displaying a correct title in attachement.php
* Fixed: Fixed the widget area 'Index Insert'.
* Fixed: Fixed a bug in thematic_create_robots().
+
+== Upgrade Notice ==
+
+= 1.0.3 =
+Small bugfixes, Major localization optimization. Note: your language files might be out of date. Grab the latest from http://translate.thematictheme.com/projects/thematic-framework
diff --git a/wp-content/themes/thematic/style.css b/wp-content/themes/thematic/style.css
index abe6e2336e7a1c0246c61a44996f0e42b24099a7..5140f2ed468d66072eb4527d044dcdbb12d285fb 100644
--- a/wp-content/themes/thematic/style.css
+++ b/wp-content/themes/thematic/style.css
@@ -2,7 +2,7 @@
THEME NAME: Thematic
THEME URI: http://thematictheme.com
DESCRIPTION: The ultimate in SEO-ready themes, Thematic is a highly extensible, WordPress Theme Framework featuring 13 widget-ready areas, drop-down menus, grid-based layout samples, plugin integration, shortcodes for your footer, & a whole lot more. Perfect for any blog and <strong><em>the</em></strong> starting point for theme development.
-VERSION: 1.0.2.1
+VERSION: 1.0.3.2
AUTHOR: <a href="http://themeshaper.com/">Ian Stewart</a> & <a href="http://thematic4you.com/">Chris Goßmann</a>
AUTHOR URI: http://themeshaper.com/
TAGS: white, three-columns, two-columns, fixed-width, theme-options, left-sidebar, right-sidebar, threaded-comments, sticky-post, microformats
@@ -44,7 +44,7 @@ This work, like WordPress, is released under GNU General Public License, version
When the directory can hunt though css files linked
through @import the styles below will no longer be
- neccesary and will be removed.
+ necessary and will be removed.
Cheers. --Ian Stewart
diff --git a/wp-content/themes/thematic/template-page-archives.php b/wp-content/themes/thematic/template-page-archives.php
index 974bdae50af2cc5bd1271add20b34313ba484872..a77fe33e5894168dd22ef37a6dd1cc8cb4642fc9 100644
--- a/wp-content/themes/thematic/template-page-archives.php
+++ b/wp-content/themes/thematic/template-page-archives.php
@@ -35,17 +35,9 @@
thematic_abovepost();
?>
+ <div id="post-<?php the_ID(); ?>" <?php post_class(); ?> >
+
<?php
- echo '<div id="post-' . get_the_ID() . '" ';
- // Checking for defined constant to enable Thematic's post classes
- if ( ! ( THEMATIC_COMPATIBLE_POST_CLASS ) ) {
- post_class();
- echo '>';
- } else {
- echo 'class="';
- thematic_post_class();
- echo '">';
- }
// creating the post header
thematic_postheader();
diff --git a/wp-content/themes/thematic/template-page-fullwidth.php b/wp-content/themes/thematic/template-page-fullwidth.php
index 44d8b2094cb1367eeda6b4c4c5ddf0d962b43d75..1f2a7ef9e2e37941779d61a647576ab0e9c315c8 100644
--- a/wp-content/themes/thematic/template-page-fullwidth.php
+++ b/wp-content/themes/thematic/template-page-fullwidth.php
@@ -34,18 +34,10 @@
// action hook for inserting content above #post
thematic_abovepost();
?>
-
+
+ <div id="post-<?php the_ID(); ?>" <?php post_class(); ?> >
+
<?php
- echo '<div id="post-' . get_the_ID() . '" ';
- // Checking for defined constant to enable Thematic's post classes
- if ( ! ( THEMATIC_COMPATIBLE_POST_CLASS ) ) {
- post_class();
- echo '>';
- } else {
- echo 'class="';
- thematic_post_class();
- echo '">';
- }
// creating the post header
thematic_postheader();
diff --git a/wp-content/themes/thematic/thematicsamplechildtheme/functions.php b/wp-content/themes/thematic/thematicsamplechildtheme/functions.php
index d5287a736b5c585b0683d0682e293bf5b6935c73..b8eaf09598f59a295dfb112236f8f5a80c67e17b 100644
--- a/wp-content/themes/thematic/thematicsamplechildtheme/functions.php
+++ b/wp-content/themes/thematic/thematicsamplechildtheme/functions.php
@@ -5,9 +5,9 @@
* This file's parent directory can be moved to the wp-content/themes directory
* to allow this Child theme to be activated in the Appearance - Themes section of the WP-Admin.
*
- * Included are a set of constants that can be defined to customize aspects of Thematic's
- * functionality, as well as a sample function that will add a home link to your menu.
- * "Uncomment" or add more to cusomize the functionality of your Child Theme.
+ * Included is a basic theme setup that will add support for custom header images and custom
+ * backgrounds. There are also a set of commented theme supports that can be uncommented if you need
+ * them for backwards compatibility. If you are starting a new theme, these legacy functionality can be deleted.
*
* More ideas can be found in the community documentation for Thematic
* @link http://docs.thematictheme.com
@@ -17,29 +17,185 @@
*/
-// Unleash the power of Thematic's dynamic classes
-//
-// define('THEMATIC_COMPATIBLE_BODY_CLASS', true);
-// define('THEMATIC_COMPATIBLE_POST_CLASS', true);
+/**
+ * Define theme setup
+ */
+function childtheme_setup() {
+
+ /* The Following add_theme_support functions
+ * will enable legacy Thematic Features
+ * if uncommented.
+ */
+
+ // add_theme_support( 'thematic_legacy_feedlinks' );
+ // add_theme_support( 'thematic_legacy_body_class' );
+ // add_theme_support( 'thematic_legacy_post_class' );
+ // add_theme_support( 'thematic_legacy_comment_form' );
+ // add_theme_support( 'thematic_legacy_comment_handling' );
+
+
+ /*
+ * Add support for custom background
+ *
+ * Allow users to specify a custom background image or color.
+ * Requires at least WordPress 3.4
+ *
+ * @link http://codex.wordpress.org/Custom_Backgrounds Custom Backgrounds
+ */
+ add_theme_support( 'custom-background' );
+
+
+ /**
+ * Add support for custom headers
+ *
+ * Customize to match your child theme layout and style.
+ * Requires at least WordPress 3.4
+ *
+ * @link http://codex.wordpress.org/Custom_Headers Custom Headers
+ */
+ add_theme_support( 'custom-header', array(
+ // Header image default
+ 'default-image' => '',
+ // Header text display default
+ 'header-text' => true,
+ // Header text color default
+ 'default-text-color' => '000',
+ // Header image width (in pixels)
+ 'width' => '940',
+ // Header image height (in pixels)
+ 'height' => '235',
+ // Header image random rotation default
+ 'random-default' => false,
+ // Template header style callback
+ 'wp-head-callback' => 'childtheme_header_style',
+ // Admin header style callback
+ 'admin-head-callback' => 'childtheme_admin_header_style'
+ )
+ );
+
+}
+add_action('thematic_child_init', 'childtheme_setup');
-// Unleash the power of Thematic's comment form
-//
-// define('THEMATIC_COMPATIBLE_COMMENT_FORM', true);
-// Unleash the power of Thematic's feed link functions
-//
-// define('THEMATIC_COMPATIBLE_FEEDLINKS', true);
+/**
+ * Custom Image Header Front-End Callback
+ *
+ * Defines the front-end style definitions for
+ * the custom image header.
+ * This style declaration will be output in the <head> of the
+ * document just before the closing </head> tag.
+ * Inline Syles and !important declarations
+ * can be used to override these styles.
+ *
+ * @link http://codex.wordpress.org/Function_Reference/get_header_image get_header_image()
+ * @link http://codex.wordpress.org/Function_Reference/get_header_textcolor get_header_textcolor()
+ */
+function childtheme_header_style() {
+ ?>
+ <style type="text/css">
+ <?php
+ /* Declares the header image from the settings
+ * saved in WP-Admin > Appearance > Header
+ * as the background-image for div#branding.
+ */
+ if ( get_header_image() && HEADER_IMAGE != get_header_image() ) {
+ ?>
+ #branding {
+ background:url('<?php header_image(); ?>') no-repeat 0 100%;
+ margin-bottom:28px;
+ padding:44px 0 <?php echo HEADER_IMAGE_HEIGHT; ?>px 0; /* Bottom padding is the same height as the image */
+ overflow: visible;
+}
+ }
+ <?php if ( 'blank' != get_header_textcolor() ) { ?>
+ #blog-title, #blog-title a {
+ color:#000;
+ }
+ #blog-description {
+ padding-bottom: 22px;
+ }
+ <?php
+ }
+
+ }
+ ?>
+ <?php
+ /* This delcares text color for the Blog title and Description
+ * from the settings saved in WP-Admin > Appearance > Header\
+ * If not set the deafault color is set to #000
+ */
+ if ( get_header_textcolor() ) {
+ ?>
+ #blog-title, #blog-title a, #blog-description {
+ color:#<?php header_textcolor(); ?>;
+ }
+ <?php
+ }
+ /* Removes header text if the
+ * "Do not diplay header text…" setting is saved
+ * in WP-Admin > Appearance > Header
+ */
+ if ( ! display_header_text() ) {
+ ?>
+ #branding {
+ background-position: center bottom;
+ background-repeat: no-repeat;
+ margin-top: 32px;
+ }
+ #blog-title, #blog-title a, #blog-description {
+ display:none;
+ }
+ #branding {
+ height:<?php echo HEADER_IMAGE_HEIGHT; ?>px;
+ width:940px;
+ padding:0;
+ }
+ <?php
+ }
+ ?>
+ </style>
+ <?php
+}
-// Adds a home link to your menu
-// http://codex.wordpress.org/Template_Tags/wp_page_menu
-//function childtheme_menu_args($args) {
-// $args = array(
-// 'show_home' => 'Home',
-// 'sort_column' => 'menu_order',
-// 'menu_class' => 'menu',
-// 'echo' => false
-// );
-// return $args;
-//}
-//add_filter('wp_page_menu_args','childtheme_menu_args');
+/**
+ * Custom Image Header Admin Callback
+ *
+ * Callback to defines the admin (back-end) style
+ * definitions for the custom image header.
+ * Customize the css to match your theme defaults.
+ * The !important declarations override inline admin styles
+ * to better represent a WYSIWYG of the front-end styling
+ * that this child theme is currently designed to display.
+ */
+function childtheme_admin_header_style() {
+ ?>
+ <style type="text/css">
+ #headimg {
+ background-position: left bottom;
+ background-repeat:no-repeat;
+ border:0 !important;
+ height:auto !important;
+ padding:0 0 <?php echo HEADER_IMAGE_HEIGHT + 22; /* change the added integer (22) to match your desired top padding */?>px 0;
+ margin:0 0 28px 0;
+ }
+
+ #headimg h1 {
+ font-family:Arial,sans-serif;
+ font-size:34px;
+ font-weight:bold;
+ line-height:40px;
+ margin:0;
+ }
+ #headimg a {
+ color: #000;
+ text-decoration: none;
+ }
+ #desc{
+ font-family: Georgia;
+ font-size: 13px;
+ font-style: italic;
+ }
+ </style>
+ <?php
+}
\ No newline at end of file
diff --git a/wp-content/themes/thematic/thematicsamplechildtheme/style.css b/wp-content/themes/thematic/thematicsamplechildtheme/style.css
index 47a7af91a4171f2310f884b6e2d1ae9447954d4b..bc73eb4fb163442c809174792d8663e0156d2a64 100644
--- a/wp-content/themes/thematic/thematicsamplechildtheme/style.css
+++ b/wp-content/themes/thematic/thematicsamplechildtheme/style.css
@@ -36,4 +36,5 @@ This work, like WordPress, is released under GNU General Public License, version
/* Prepare theme for plugins */
@import url('../thematic/library/styles/plugins.css');
-
+/* Overriding Thematic's styles for congruity with WP-Admin > Appearance > Header default header text color settings */
+#blog-description { color: #000 }
\ No newline at end of file
diff --git a/wp-content/themes/thematic/wpml-config.xml b/wp-content/themes/thematic/wpml-config.xml
new file mode 100644
index 0000000000000000000000000000000000000000..8f478ece82e97d563e8d739b9cf36429b0ff2d92
--- /dev/null
+++ b/wp-content/themes/thematic/wpml-config.xml
@@ -0,0 +1,7 @@
+<wpml-config>
+ <admin-texts>
+ <key name="thematic_theme_opt">
+ <key name="footer_txt" />
+ </key>
+ </admin-texts>
+</wpml-config>
\ No newline at end of file