diff --git a/wp-content/themes/thematic/404.php b/wp-content/themes/thematic/404.php
index b0fea04f7e9ff0263b07553e3c7656cfd042627e..127ea6022cd3267a791ed856eb352e1b52b55d40 100644
--- a/wp-content/themes/thematic/404.php
+++ b/wp-content/themes/thematic/404.php
@@ -1,51 +1,65 @@
 <?php
+/**
+ * Error 404 Page Template
+ *
+ * Displays a "Not Found" message and a search form when a 404 Error is encountered.
+ *
+ * @package Thematic
+ * @subpackage Templates
+ *
+ * @link http://codex.wordpress.org/Creating_an_Error_404_Page Codex: Create a 404 Page
+ */
 
-    @header("HTTP/1.1 404 Not found", true, 404);
-
-    // calling the header.php
-    get_header();
-
-    // action hook for placing content above #container
-    thematic_abovecontainer();
+	// calling the header.php
+	get_header();
 
+	// action hook for placing content above #container
+	thematic_abovecontainer();
 ?>
 
 		<div id="container">
-		
-			<?php thematic_abovecontent(); ?>
-		
-			<div id="content">
-			
-				<?php thematic_abovepost(); ?>
-		
+
+			<?php 
+				// action hook for placing content above #content
+				thematic_abovecontent();
+
+				// filter for manipulating the element that wraps the content 
+				echo apply_filters( 'thematic_open_id_content', '<div id="content">' . "\n\n" );
+
+				// action hook for placing content above #post
+				thematic_abovepost(); 
+			?>
+
 				<div id="post-0" class="post error404">
-				
+
 				<?php
-		
-    	            // action hook for the 404 content
-    	            thematic_404()
-		
+		    		// action hook for placing the 404 content
+    	        	thematic_404()
     	        ?>
-				
+
 				</div><!-- .post -->
-				
-				<?php thematic_belowpost(); ?>
-		
+
+				<?php 
+					// action hook for placing content below #post
+					thematic_belowpost(); 
+				?>
+
 			</div><!-- #content -->
-			
-			<?php thematic_belowcontent(); ?> 
-			
+
+			<?php 
+				// action hook for placing content below #content
+				thematic_belowcontent(); 
+			?> 
+
 		</div><!-- #container -->
     
 <?php
+	// action hook for placing content below #container
+	thematic_belowcontainer();
 
-    // action hook for placing content below #container
-    thematic_belowcontainer();
-
-    // calling the standard sidebar 
-    thematic_sidebar();
-
-    // calling footer.php
-    get_footer();
+	// calling the standard sidebar 
+	thematic_sidebar();
 
+	// calling footer.php
+	get_footer();
 ?>
\ No newline at end of file
diff --git a/wp-content/themes/thematic/archive.php b/wp-content/themes/thematic/archive.php
index 6845053fadc9c50515da84eb95a57b31562804e5..a0aab7ce751a7ef7f3e9270345e1fdb9acef92f8 100644
--- a/wp-content/themes/thematic/archive.php
+++ b/wp-content/themes/thematic/archive.php
@@ -1,54 +1,67 @@
 <?php
+/**
+ * Archive Template 
+ *
+ * Displays an Archive index of post-type items. Other more specific archive templates 
+ * may override the display of this template for example the category.php.
+ *
+ * @package Thematic
+ * @subpackage Templates
+ *
+ * @link http://codex.wordpress.org/Template_Hierarchy Codex: Template Hierarchy
+ */
 
-    // calling the header.php
-    get_header();
-
-    // action hook for placing content above #container
-    thematic_abovecontainer();
+	// calling the header.php
+	get_header();
 
+	// action hook for placing content above #container
+	thematic_abovecontainer();
 ?>
 
 		<div id="container">
-		
-		    <?php thematic_abovecontent(); ?>
-		
-		    <div id="content">
-		
-		        <?php 
-		
-		        the_post();
-		
-		        // displays the page title
-		        thematic_page_title();
-		
-		        rewind_posts();
-		
-		        // create the navigation above the content
-		        thematic_navigation_above();
-		
-		        // action hook creating the archive loop
-		        thematic_archiveloop();
-		
-		        // create the navigation below the content
-		        thematic_navigation_below();
-		
-		        ?>
-		
+
+		<?php 
+			// action hook for placing content above #content
+			thematic_abovecontent();
+
+			// filter for manipulating the element that wraps the content 
+			echo apply_filters( 'thematic_open_id_content', '<div id="content">' . "\n\n" ); 
+
+			// displays the page title
+			thematic_page_title();
+
+			// create the navigation above the content
+			thematic_navigation_above();
+
+        	// action hook for placing content above the archive loop
+        	thematic_above_archiveloop();
+
+			// action hook creating the archive loop
+			thematic_archiveloop();
+
+        	// action hook for placing content below the archive loop
+        	thematic_below_archiveloop();
+
+			// create the navigation below the content
+			thematic_navigation_below();
+		?>
+
 		    </div><!-- #content -->
-		    
-		    <?php thematic_belowcontent(); ?> 
-		    
+
+			<?php 
+				// action hook for placing content below #content
+		    	thematic_belowcontent(); 
+		    ?> 
+
 		</div><!-- #container -->
 
 <?php 
+	// action hook for placing content below #container
+	thematic_belowcontainer();
 
-    // action hook for placing content below #container
-    thematic_belowcontainer();
-
-    // calling the standard sidebar 
-    thematic_sidebar();
-    
-    // calling footer.php
-    get_footer();
+	// calling the standard sidebar 
+	thematic_sidebar();
 
+	// calling footer.php
+	get_footer();
 ?>
\ No newline at end of file
diff --git a/wp-content/themes/thematic/archives.php b/wp-content/themes/thematic/archives.php
index e7ff2dec3e229745f22ae144cb825aba0186342e..ac15f29abcb12dd15ba07eaa5daa1c425c83ecf5 100644
--- a/wp-content/themes/thematic/archives.php
+++ b/wp-content/themes/thematic/archives.php
@@ -1,95 +1,26 @@
 <?php
-/*
-Template Name: Archives Page
-*/
-?>
-<?php
-
-    // calling the header.php
-    get_header();
-
-    // action hook for placing content above #container
-    thematic_abovecontainer();
-
-?>	
-		<div id="container">
-		
-			<?php thematic_abovecontent(); ?>
-		
-			<div id="content">
-	
-	            <?php 
-	            
-	            the_post();
-	            
-	            thematic_abovepost();
-	            
-	            ?>
-	
-				<div id="post-<?php the_ID();
-					echo '" ';
-					if (!(THEMATIC_COMPATIBLE_POST_CLASS)) {
-						post_class();
-						echo '>';
-					} else {
-						echo 'class="';
-						thematic_post_class();
-						echo '">';
-					}
-	                
-	                // creating the post header
-	                thematic_postheader();
-	                
-	                ?>
-	                
-					<div class="entry-content">
-	                
-	                    <?php 
-	                    
-	                    the_content();
-	
-	                    // action hook for the 404 content
-	                    thematic_archives();
-	
-	                    edit_post_link(__('Edit', 'thematic'),'<span class="edit-link">','</span>');
-	                    
-	                    ?>
-	
-					</div><!-- .entry-content -->
-				</div><!-- #post -->
-	
-	        <?php
-	        
-	        thematic_belowpost();
-	        
-	        // calling the comments template
-	        	// calling the comments template
-        		if (THEMATIC_COMPATIBLE_COMMENT_HANDLING) {
-       				if ( get_post_custom_values('comments') ) {
-						// Add a key/value of "comments" to enable comments on pages!
-	        			thematic_comments_template();
-        			}
-        		} else {
-       				thematic_comments_template();
-        		}
-	        
-	        ?>
-	
-			</div><!-- #content -->
-			
-			<?php thematic_belowcontent(); ?> 
-			
-		</div><!-- #container -->
+/**
+ * Template Name: Deprecated Archives Template
+ *
+ * This tamplate has bben deprecated for proper template namespacing
+ * This file is going away.
+ * 
+ * If you wish to use Thematic's Archives page template, please set 
+ * your Page Attributes: Template to use the template named "Archives"
+ * on the WP-Admin Edit Page screen.
+ *
+ * @package Thematic
+ * @subpackage Templates
+ *
+ * @link http://codex.wordpress.org/Template_Hierarchy Codex: Template Hierarchy
+ * @deprecated 1.0
+ */
 
-<?php 
+	// Providing deprecated file notice to be seen when WP_DEBUG is true
+	_deprecated_file( sprintf( __( 'The template %s', 'thematic' ) . ':', basename(__FILE__) ), '1.0', 'template-page-archives.php' );
 
-    // action hook for placing content below #container
-    thematic_belowcontainer();
 
-    // calling the standard sidebar 
-    thematic_sidebar();
-    
-    // calling footer.php
-    get_footer();
+	// calling the header.php
+	get_template_part( 'template-page' , 'archives' );
 
 ?>
\ No newline at end of file
diff --git a/wp-content/themes/thematic/attachment.php b/wp-content/themes/thematic/attachment.php
index f9e2491e8a7e2f53ba9f419487b8b99d8873fc38..7c5bd85b7ae890f0bcb52f4bc5dbc9c51b9a7b69 100644
--- a/wp-content/themes/thematic/attachment.php
+++ b/wp-content/themes/thematic/attachment.php
@@ -1,91 +1,102 @@
 <?php
+/**
+ * Attachments Template
+ *
+ * Displays singular WordPress Media Library items.
+ *
+ * @package Thematic
+ * @subpackage Templates
+ *
+ * @link http://codex.wordpress.org/Using_Image_and_File_Attachments Codex:Using Attachments
+ */
 
-    // calling the header.php
-    get_header();
-
-    // action hook for placing content above #container
-    thematic_abovecontainer();
+	// calling the header.php
+	get_header();
 
+	// action hook for placing content above #container
+	thematic_abovecontainer();
 ?>
 
 		<div id="container">
-		
-			<?php thematic_abovecontent(); ?>
-		
-			<div id="content">
-	
-	            <?php
-	            
-	            the_post();
-	            
-	            // displays the page title
+
+			<?php
+				// action hook for placing content above #content
+				thematic_abovecontent();
+
+				// filter for manipulating the element that wraps the content 
+				echo apply_filters( 'thematic_open_id_content', '<div id="content">' . "\n\n" );
+
+	            // start the loop
+	            while ( have_posts() ) : the_post();
+
+	        	// displays the page title
 				thematic_page_title();
-				
+
+				// action hook for placing content above #post
 				thematic_abovepost();
-	            
-	            ?>
-	            
-				<div id="post-<?php the_ID();
-					echo '" ';
-					if (!(THEMATIC_COMPATIBLE_POST_CLASS)) {
-						post_class();
-						echo '>';
+			?>
+
+				<?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 '">';
+					    echo 'class="';
+					    thematic_post_class();
+					    echo '">';
 					}
-	                
-	                // creating the post header
-	                thematic_postheader();
-	                
-	                ?>
-	                
+
+	            	// creating the post header
+	            	thematic_postheader();
+	            ?>
+
 					<div class="entry-content">
-						<div class="entry-attachment"><?php the_attachment_link($post->post_ID, true) ?></div>
-	                    
+
+						<div class="entry-attachment"><?php the_attachment_link( $post->ID, true ) ?></div>
+
 	                        <?php 
-	                        
-	                        the_content(more_text());
-	
-	                        wp_link_pages('before=<div class="page-link">' .__('Pages:', 'thematic') . '&after=</div>');
-	                        
+	                        	the_content( thematic_more_text() );
+
+	                        	wp_link_pages( 'before=<div class="page-link">' . __( 'Pages:', 'thematic' ) . '&after=</div>' );
 	                        ?>
-	                        
+
 					</div><!-- .entry-content -->
-	                
+
 					<?php
-	                
-	                // creating the post footer
-	                thematic_postfooter();
-	                
+	                	// creating the post footer
+	                	thematic_postfooter();
 	                ?>
-	                
+
 				</div><!-- #post -->
-	
+
 	            <?php
-	            
-	            thematic_belowpost();
-	            
-	            comments_template();
-	            
+					// action hook for placing contentbelow #post
+					thematic_belowpost();
+					
+       				// action hook for calling the comments_template
+					thematic_comments_template();
+					
+					// end loop
+        			endwhile;
 	            ?>
-	
+
 			</div><!-- #content -->
-			
-			<?php thematic_belowcontent(); ?> 
-			
+
+			<?php 
+				// action hook for placing content below #content
+				thematic_belowcontent();
+			?>		
 		</div><!-- #container -->
 
 <?php 
+	// action hook for placing content below #container
+	thematic_belowcontainer();
 
-    // action hook for placing content below #container
-    thematic_belowcontainer();
-
-    // calling the standard sidebar 
-    thematic_sidebar();
-
-    // calling footer.php
-    get_footer();
+	// calling the standard sidebar 
+	thematic_sidebar();
 
+	// calling footer.php
+	get_footer();
 ?>
\ No newline at end of file
diff --git a/wp-content/themes/thematic/author.php b/wp-content/themes/thematic/author.php
index 8ffefe308ae6877a9405877b80d65321734e44f5..fe976b42157729f751a24cfce7ed7fa5e327d596 100644
--- a/wp-content/themes/thematic/author.php
+++ b/wp-content/themes/thematic/author.php
@@ -1,93 +1,112 @@
 <?php
-    // calling the theme options
-    global $options, $blog_id;
-    foreach ($options as $value) {
-        if (get_option( $value['id'] ) === FALSE) { 
-            $$value['id'] = $value['std']; 
-        } else {
-        	if (THEMATIC_MB) 
-			{
-            	$$value['id'] = get_blog_option($blog_id, $value['id'] );
-			}
-			else
-			{
-            	$$value['id'] = get_option( $value['id'] );
-  			}
-        }
-    }
-
-    // calling the header.php
-    get_header();
-
-    // action hook for placing content above #container
-    thematic_abovecontainer();
+/**
+ * Author Template
+ *
+ * Displays an archive index of posts by a singular Author. 
+ * It can display a micrformatted vCard for Author if option is selcted in the default Theme Options.
+ *
+ * @package Thematic
+ * @subpackage Templates
+ *
+ * @link http://codex.wordpress.org/Author_Templates Codex:Author Templates
+ */
 
+	// calling the header.php
+	get_header();
+
+	// action hook for placing content above #container
+	thematic_abovecontainer();
 ?>
 
 		<div id="container">
-		
-			<?php thematic_abovecontent(); ?>
-		
-			<div id="content">
-		
-    	        <?php
-    	    
-    	        the_post();
-		
-    	        // displays the page title
-    	        thematic_page_title();		
-    	        
-    	        // create the navigation above the content
-    	        thematic_navigation_above();
-		
-    	        /* if display author bio is selected */ 
-    	        if($thm_authorinfo == 'true' & !is_paged()) { ?>
-    	        
+
+			<?php
+				// action hook for placing content above #content
+				thematic_abovecontent();
+
+				echo apply_filters( 'thematic_open_id_content', '<div id="content">' . "\n\n" );
+			?>
+
+    	    	<?php
+    	    		// displays the page title
+    	    		thematic_page_title();		
+
+    	    		// create the navigation above the content
+    	    		thematic_navigation_above();
+
+    	    		// display microformatted vCard if selected in Theme Options and display only on the first page of the archive's pagination  
+    	    		if ( thematic_get_theme_opt( 'author_info' ) == 1 & !is_paged() ) :
+
+						// setup the first post to acess the Author's metadata
+						the_post();
+				?>
+
     	            <div id="author-info" class="vcard">
-    	                <h2 class="entry-title"><?php echo $authordata->first_name; ?> <?php echo $authordata->last_name; ?></h2> 
-    				
-    	                <?php 
-    	            
-    	                // display the author's avatar
-    	                thematic_author_info_avatar();
     	            
+    	                <h2 class="entry-title"><?php the_author_meta( 'first_name' ); ?> <?php the_author_meta( 'last_name' ); ?></h2> 
+
+    	                <?php
+    	               		// display the author's avatar
+    	               		thematic_author_info_avatar();
     	                ?>
-    	            
+
     	                <div class="author-bio note">
-    	                    <?php
-    	                
-    	                    if ( !(''== $authordata->user_description) ) : echo apply_filters('archive_meta', $authordata->user_description); endif; ?>
-    	                
-    	                </div>  			
+
+    	                    <?php    	                    		
+    	                    	// Display Author's discription if it exists
+    	                    	if ( get_the_author_meta( 'user_description' ) )
+    	                    		// Filterable use the_author_user_description *or* get_the_author_user_description
+    	                    		the_author_meta( 'user_description' );
+    	                    ?>
+
+    	                </div>
+
     				<div id="author-email">
-    	                <a class="email" title="<?php echo antispambot($authordata->user_email); ?>" href="mailto:<?php echo antispambot($authordata->user_email); ?>"><?php _e('Email ', 'thematic') ?><span class="fn n"><span class="given-name"><?php echo $authordata->first_name; ?></span> <span class="family-name"><?php echo $authordata->last_name; ?></span></span></a>
-    	                <a class="url"  style="display:none;" href="<?php bloginfo( 'url' ) ?>/"><?php bloginfo('name') ?></a>   
+    				
+    	                <a class="email" title="<?php echo antispambot( get_the_author_meta( 'user_email' ) ); ?>" href="mailto:<?php echo antispambot( get_the_author_meta( 'user_email' ) ); ?>">
+    	                	<?php _e( 'Email ', 'thematic' ) ?>
+    	                	<span class="fn n">
+    	                		<span class="given-name"><?php the_author_meta( 'first_name' ); ?></span> 
+    	                		<span class="family-name"><?php the_author_meta( 'last_name' ); ?></span>
+    	                	</span>
+    	                </a>
+    	                
+    	                <a class="url"  style="display:none;" href="<?php echo home_url() ?>/"><?php bloginfo('name') ?></a>
+    	                 
     	            </div>
+
 				</div><!-- #author-info -->
-    	        <?php 
-    	        }
-				
-    	        // action hook creating the author loop
-    	        thematic_authorloop();
-		
-    	        // create the navigation below the content
-				thematic_navigation_below(); ?>
-		
-			</div><!-- #content -->
-			
-			<?php thematic_belowcontent(); ?> 
-			
-		</div><!-- #container -->
 
-<?php 
+				<?php
+					//end microformmatted vCard
+					endif;
+					// Return to the beginning of the loop
+					rewind_posts();
+				?>
+
+				<?php
+    	        	// action hook creating the author loop
+    	        	thematic_authorloop();
 
-    // action hook for placing content below #container
-    thematic_belowcontainer();
+    	        	// create the navigation below the content
+					thematic_navigation_below();
+				?>
+
+			</div><!-- #content -->
 
-    // calling the standard sidebar 
-    thematic_sidebar();
+			<?php
+				// action hook for placing content below #content
+				thematic_belowcontent();
+			?> 
+		</div><!-- #container -->
+
+<?php
+	// action hook for placing content below #container
+	thematic_belowcontainer();
 
-    // calling footer.php
-    get_footer();
+	// calling the standard sidebar 
+	thematic_sidebar();
 
+	// calling footer.php
+	get_footer();
 ?>
\ No newline at end of file
diff --git a/wp-content/themes/thematic/category.php b/wp-content/themes/thematic/category.php
index dbbf8424c5bc6e1296924b2fb2f3088c9fe1fc6e..8a375c5f664141f541717995a236bf3a14d859e2 100644
--- a/wp-content/themes/thematic/category.php
+++ b/wp-content/themes/thematic/category.php
@@ -1,56 +1,65 @@
 <?php
+/**
+ * Category Template
+ *
+ * Displays an archive index of posts assigned to a Category. 
+ *
+ * @package Thematic
+ * @subpackage Templates
+ *
+ * @link http://codex.wordpress.org/Category_Templates Codex: Category Templates
+ */
 
-    // calling the header.php
-    get_header();
-
-    // action hook for placing content above #container
-    thematic_abovecontainer();
+	// calling the header.php
+	get_header();
 
+	// action hook for placing content above #container
+	thematic_abovecontainer();
 ?>
 
 		<div id="container">
-		
-			<?php thematic_abovecontent(); ?>
-		
-			<div id="content">
-	
-	            <?php
-	        
-	            // displays the page title
-	            thematic_page_title();
-	
-	            // create the navigation above the content
-	            thematic_navigation_above();
-				
-	            // action hook for placing content above the category loop
-	            thematic_above_categoryloop();			
-	
-	            // action hook creating the category loop
-	            thematic_categoryloop();
-	
-	            // action hook for placing content below the category loop
-	            thematic_below_categoryloop();			
-	
-	            // create the navigation below the content
-	            thematic_navigation_below();
-	            
-	            ?>
-	
-			</div><!-- #content -->
-			
-			<?php thematic_belowcontent(); ?> 
-			
-		</div><!-- #container -->
 
-<?php 
+			<?php
+				// action hook for placing content above #content
+				thematic_abovecontent();
+
+				// filter for manipulating the element that wraps the content 
+				echo apply_filters( 'thematic_open_id_content', '<div id="content">' . "\n\n" );
+
+				// displays the page title
+	        	thematic_page_title();
+
+	        	// create the navigation above the content
+	        	thematic_navigation_above();
+
+	        	// action hook for placing content above the category loop
+	        	thematic_above_categoryloop();			
 
-    // action hook for placing content below #container
-    thematic_belowcontainer();
+	        	// action hook creating the category loop
+	        	thematic_categoryloop();
 
-    // calling the standard sidebar 
-    thematic_sidebar();
+	        	// action hook for placing content below the category loop
+	        	thematic_below_categoryloop();			
+
+	        	// create the navigation below the content
+	        	thematic_navigation_below();
+	        ?>
+
+			</div><!-- #content -->
+
+			<?php
+				// action hook for placing content below #content
+				thematic_belowcontent();
+			?>
+		</div><!-- #container -->
+
+<?php
+	// action hook for placing content below #container
+	thematic_belowcontainer();
 
-    // calling footer.php
-    get_footer();
+	// calling the standard sidebar 
+	thematic_sidebar();
 
+	// calling footer.php
+	get_footer();
 ?>
\ No newline at end of file
diff --git a/wp-content/themes/thematic/comments.php b/wp-content/themes/thematic/comments.php
index e5cdabea9e8cabf7a18de5e23976abb1fb8f0acc..0d4008fcb78a308bf11d3b85920159474434a460 100644
--- a/wp-content/themes/thematic/comments.php
+++ b/wp-content/themes/thematic/comments.php
@@ -1,141 +1,224 @@
-<?php thematic_abovecomments() ?>
-			<div id="comments">
 <?php
-	$req = get_option('require_name_email'); // Checks if fields are required.
-	if ( 'comments.php' == basename($_SERVER['SCRIPT_FILENAME']) )
-		die ( 'Please do not load this page directly. Thanks!' );
-	if ( ! empty($post->post_password) ) :
-		if ( $_COOKIE['wp-postpass_' . COOKIEHASH] != $post->post_password ) :
+/**
+ * Comments Template
+ *
+ * Lists the comments and displays the comments form. 
+ * 
+ * @package Thematic
+ * @subpackage Templates
+ *
+ * @todo chase the invalid counts & pagination for comments/trackbacks
+ * @todo remove the THEMATIC_COMPATIBLE_COMMENT_FORM condition to a legacy function for template berevity
+ */
 ?>
-				<div class="nopassword"><?php _e('This post is password protected. Enter the password to view any comments.', 'thematic') ?></div>
-			</div><!-- .comments -->
-<?php
-		return;
-	endif;
-endif;
-?>
-
-<?php if ( have_comments() ) : ?>
-
-<?php /* numbers of pings and comments */
-$ping_count = $comment_count = 0;
-foreach ( $comments as $comment )
-	get_comment_type() == "comment" ? ++$comment_count : ++$ping_count;
-?>
-
-<?php if ( ! empty($comments_by_type['comment']) ) : ?>
-
-<?php thematic_abovecommentslist() ?>
-
-				<div id="comments-list" class="comments">
-					<h3><?php printf($comment_count > 1 ? __(thematic_multiplecomments_text(), 'thematic') : __(thematic_singlecomment_text(), 'thematic'), $comment_count) ?></h3>
+				<?php
+					// action hook for inserting content above #comments
+					thematic_abovecomments() 
+				?>
 				
-					<ol>
-<?php wp_list_comments(list_comments_arg()); ?>
-					</ol>
-
-        			<div id="comments-nav-below" class="comment-navigation">
-        			     <div class="paginated-comments-links"><?php paginate_comments_links(); ?></div>
-                    </div>
+				<div id="comments">
+	
+				<?php 
+					// Disable direct access to the comments script
+					if ( 'comments.php' == basename( $_SERVER['SCRIPT_FILENAME'] ) )
+					    die ( __('Please do not load this page directly.', 'thematic')  );
 					
-				</div><!-- #comments-list .comments -->
-
-<?php thematic_belowcommentslist() ?>			
-
-<?php endif; /* if ( $comment_count ) */ ?>
-
-<?php if ( ! empty($comments_by_type['pings']) ) : ?>
-
-<?php thematic_abovetrackbackslist() ?>
-
-				<div id="trackbacks-list" class="comments">
-					<h3><?php printf($ping_count > 1 ? __('<span>%d</span> Trackbacks', 'thematic') : __('<span>One</span> Trackback', 'thematic'), $ping_count) ?></h3>
+					// Set required varible from options
+					$req = get_option('require_name_email');
 					
-					<ol>
-<?php wp_list_comments('type=pings&callback=thematic_pings'); ?>
-					</ol>				
+					// Check post password and cookies
+					if ( post_password_required() ) :
+				?>
+	
+					<div class="nopassword"><?php _e('This post is password protected. Enter the password to view any comments.', 'thematic') ?></div>
+				
+				</div><!-- #comments -->
+	
+				<?php 
+						return;
+					endif; 
+				
+				?>
+	
+				<?php if ( have_comments() ) : ?>
+	
+					<?php
+						// Collect the comments and pings
+						$thematic_comments = $wp_query->comments_by_type['comment'];
+						$thematic_pings = $wp_query->comments_by_type['pings'];
+						
+						// Calculate the total number of each
+						$thematic_comment_count = count( $thematic_comments );
+						$thematic_ping_count = count( $thematic_pings );
+						
+						// Get the page count for each
+						$thematic_comment_pages = get_comment_pages_count( $thematic_comments );
+						$thematic_ping_pages = get_comment_pages_count( $thematic_pings );
+						
+						// Determine which is the greater pagination number between the two (comment,ping) paginations
+						$thematic_max_response_pages = ( $thematic_ping_pages > $thematic_comment_pages ) ? $thematic_ping_pages : $thematic_comment_pages;
+						
+						// Reset the query var to use our calculation for the maximum page (newest/oldest)
+						if ( $overridden_cpage )
+							set_query_var( 'cpage', 'newest' == get_option('default_comments_page') ? $thematic_comment_pages : 1 );
+					?>
 					
-				</div><!-- #trackbacks-list .comments -->			
-
-<?php thematic_belowtrackbackslist() ?>				
-
-<?php endif /* if ( $ping_count ) */ ?>
-<?php endif /* if ( $comments ) */ ?>
-
-<?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>
+					<?php if ( ! empty( $comments_by_type['comment'] ) ) : ?>
+							
+					<?php
+						// action hook for inserting content above #comments-list
+						thematic_abovecommentslist() ;
+					?>
 
-<?php else : ?>
-					<div class="formcontainer">	
+						<?php if ( get_query_var('cpage') <= $thematic_comment_pages )  : ?>
 					
-<?php 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>
+					<div id="comments-list-wrapper" class="comments">
+
+						<h3><?php printf( $thematic_comment_count > 1 ? __( thematic_multiplecomments_text(), 'thematic' ) : __( thematic_singlecomment_text(), 'thematic' ), $thematic_comment_count ) ?></h3>
+	
+						<ol id="comments-list" >
+							<?php wp_list_comments( thematic_list_comments_arg() ); ?>
+						</ol>
+										
+					</div><!-- #comments-list-wrapper .comments -->
+					
+						<?php endif; ?>
+						
+					<?php 
+						// action hook for inserting content below #comments-list
+						thematic_belowcommentslist() 
+					?>
+					
+					<?php endif; ?>
+					
+					<div id="comments-nav-below" class="comment-navigation">
+	        		
+	        			<div class="paginated-comments-links"><?php paginate_comments_links( 'total=' . $thematic_max_response_pages ); ?></div>
+	                
+	                </div>	
+	                	                  
+					<?php if ( ! empty( $comments_by_type['pings'] ) ) : ?>
+	
+					<?php 
+						// action hook for inserting content above #trackbacks-list-wrapper
+						thematic_abovetrackbackslist();
+					?>
+						
+						<?php if ( get_query_var('cpage') <= $thematic_ping_pages ) : ?>
+						
+					<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>
+	
+						<ul id="trackbacks-list">
+							<?php wp_list_comments( 'type=pings&callback=thematic_pings' ); ?>
+						</ul>				
+	
+					</div><!-- #pings-list-wrapper .pings -->			
+						
+						<?php endif; ?>
+						
+					<?php
+						// action hook for inserting content below #trackbacks-list
+						thematic_belowtrackbackslist();
+					?>
+									
+					<?php endif; ?>
+
+				<?php endif; ?>
 							
-                  <?php do_action('comment_form', $post->ID); ?>
-                  
-							<div class="form-submit"><input id="submit" name="submit" type="submit" value="<?php _e(thematic_commentbutton_text(), 'thematic') ?>" tabindex="7" /><input type="hidden" name="comment_post_ID" value="<?php echo $id; ?>" /></div>
-
-                            <?php comment_id_fields(); ?>    
-
-						</form><!-- #commentform -->
+			<?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>
 						
-<?php thematic_belowcommentsform() ?>
+						<?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 -->
 						
-					</div><!-- .formcontainer -->
-<?php endif /* if ( get_option('comment_registration') && !$user_ID ) */ ?>
-
-				</div><!-- #respond -->
-<?php
-		} else {
-			comment_form(thematic_comment_form_args());
-		}
-	endif /* if ( 'open' == $post->comment_status ) */ ?>
-
-			</div><!-- #comments -->
-<?php thematic_belowcomments() ?>
\ No newline at end of file
+						<?php
+								} else {
+								
+									comment_form( thematic_comment_form_args() );
+									
+								}
+							endif /* if ( 'open' == $post->comment_status ) */ 
+						?>
+	
+				</div><!-- #comments -->
+				
+				<?php
+					// action hook for inserting content below #comments
+					thematic_belowcomments()
+				?>
\ No newline at end of file
diff --git a/wp-content/themes/thematic/footer.php b/wp-content/themes/thematic/footer.php
index 1413138014ebe9bb40661b8b0d491dcc12a72d26..40f4ca6d9a52cca8bb236806b71791ba0ccca1cb 100644
--- a/wp-content/themes/thematic/footer.php
+++ b/wp-content/themes/thematic/footer.php
@@ -1,44 +1,54 @@
-
-    </div><!-- #main -->
-    
-    <?php
-    
-    // action hook for placing content above the footer
-    thematic_abovefooter();
-    
-    ?>    
-
-	<div id="footer">
-    
-        <?php
-        
-        // action hook creating the footer 
-        thematic_footer();
-        
-        ?>
-        
-	</div><!-- #footer -->
+<?php
+/**
+ * Footer Template
+ *
+ * This template closes #main div and displays the #footer div.
+ * 
+ * Thematic Action Hooks: thematic_abovefooter thematic_belowfooter thematic_after
+ * Thematic Filters: thematic_close_wrapper can be used to remove the closing of the #wrapper div
+ * 
+ * @package Thematic
+ * @subpackage Templates
+ */
+?>
+		<?php // action hook for placing content above the closing of the #main div
+			thematic_abovemainclose();
+		?>
+		
+		</div><!-- #main -->
+    	
+    	<?php
+			// action hook for placing content above the footer
+			thematic_abovefooter();
+		
+			// Filter provided for altering output of the footer opening element
+    		echo ( apply_filters( 'thematic_open_footer', '<div id="footer">' ) );
+    	?>	
+        	
+        	<?php
+        		// action hook creating the footer 
+        		thematic_footer();
+        	?>
+        	
+		<?php
+			// Filter provided for altering output of the footer closing element
+    		echo ( apply_filters( 'thematic_close_footer', '</div><!-- #footer -->' . "\n" ) );
+   
+   			// action hook for placing content below the footer
+			thematic_belowfooter();
+    	?>
+    	
+	<?php
+		// Filter provided for altering output of wrapping element follows the body tag  
+    	if ( apply_filters( 'thematic_close_wrapper', true ) ) 
+    		echo ( '</div><!-- #wrapper .hfeed -->' . "\n" );
 	
-    <?php
-    
-    // action hook for placing content below the footer
-    thematic_belowfooter();
-    
-    if (apply_filters('thematic_close_wrapper', true)) {
-    	echo '</div><!-- #wrapper .hfeed -->';
-    }
-    
-    ?>  
-
-<?php 
+		// calling WordPress' footer action hook
+		wp_footer();
 
-// calling WordPress' footer action hook
-wp_footer();
-
-// action hook for placing content before closing the BODY tag
-thematic_after(); 
-
-?>
+		// action hook for placing content before closing the BODY tag
+		thematic_after(); 
+	?>
 
 </body>
 </html>
\ No newline at end of file
diff --git a/wp-content/themes/thematic/functions.php b/wp-content/themes/thematic/functions.php
index 237c2640d97044a8d58ce491922490f78ff65f37..da408174d533837abf605d63a54dfdbf796aa7f0 100644
--- a/wp-content/themes/thematic/functions.php
+++ b/wp-content/themes/thematic/functions.php
@@ -1,148 +1,264 @@
 <?php
-
-// Getting Theme and Child Theme Data
-// Credits: Joern Kretzschmar
-
-$themeData = get_theme_data(TEMPLATEPATH . '/style.css');
-$thm_version = trim($themeData['Version']);
-if(!$thm_version)
-    $thm_version = "unknown";
-
-$ct=get_theme_data(STYLESHEETPATH . '/style.css');
-$templateversion = trim($ct['Version']);
-if(!$templateversion)
-    $templateversion = "unknown";
-
-// set theme constants
-define('THEMENAME', $themeData['Title']);
-define('THEMEAUTHOR', $themeData['Author']);
-define('THEMEURI', $themeData['URI']);
-define('THEMATICVERSION', $thm_version);
-
-// set child theme constants
-define('TEMPLATENAME', $ct['Title']);
-define('TEMPLATEAUTHOR', $ct['Author']);
-define('TEMPLATEURI', $ct['URI']);
-define('TEMPLATEVERSION', $templateversion);
-
-
-// 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')) {	
-	if (function_exists('comment_form')) {
-		define('THEMATIC_COMPATIBLE_FEEDLINKS', false); // WordPress 3.0
-	} else {
-		define('THEMATIC_COMPATIBLE_FEEDLINKS', true); // below WordPress 3.0
-	}
+/**
+ * Theme Functions
+ *
+ * This file is used by WordPress to initialize the theme.
+ * Thematic is designed to be used as a theme framework and this file should not be modified.
+ * You should use a Child Theme to make your customizations. A sample child theme is provided
+ * as an example in root directory of this theme. You can move it into the wp-content/themes to
+ * enable activation of the child theme. <br>
+ *
+ * Reference:  {@link http://codex.wordpress.org/Child_Themes Codex: Child Themes}
+ * 
+ * @package Thematic
+ * @subpackage ThemeInit
+ */
+
+
+/**
+ * Registers action hook: thematic_init 
+ * 
+ * @since Thematic 1.0
+ */
+function thematic_init() {
+	do_action('thematic_init');
 }
 
-// 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);
-}
-// which comment form should be used
-if (!defined('THEMATIC_COMPATIBLE_COMMENT_FORM')) {
-	if (function_exists('comment_form')) {
-		define('THEMATIC_COMPATIBLE_COMMENT_FORM', false); // WordPress 3.0
-	} else {
-		define('THEMATIC_COMPATIBLE_COMMENT_FORM', true); // below WordPress 3.0
+/**
+ * thematic_theme_setup & childtheme_override_theme_setup
+ *
+ * Override: childtheme_override_theme_setup
+ *
+ * @since Thematic 1.0
+ */
+if ( function_exists('childtheme_override_theme_setup') ) {
+	/**
+	 * @ignore
+	 */
+	function thematic_theme_setup() {
+		childtheme_override_theme_setup();
 	}
-}
-
-// Check for WordPress mu or WordPress 3.0
-define('THEMATIC_MB', function_exists('get_blog_option'));
-
-// Create the feedlinks
-if (!(THEMATIC_COMPATIBLE_FEEDLINKS)) {
-	add_theme_support( 'automatic-feed-links' );
-}
-
-// Check for WordPress 2.9 add_theme_support()
-if ( apply_filters( 'thematic_post_thumbs', TRUE) ) {
-	if ( function_exists( 'add_theme_support' ) )
-	add_theme_support( 'post-thumbnails' );
-}
+} else {
+	/**
+	 * thematic_theme_setup
+	 *
+	 * @todo review for impact of deprecations on child themes & fix comment blocks?
+	 * @since Thematic 1.0?
+	 */
+	function thematic_theme_setup() {
+		global $content_width;
+
+		/**
+		 * Set the content width based on the theme's design and stylesheet.
+		 *
+		 * Used to set the width of images and content. Should be equal to the width the theme
+		 * is designed for, generally via the style.css stylesheet.
+		 *
+		 * @since Thematic 1.0
+		 */
+		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 ); 
+
+		// Check for MultiSite
+		define( 'THEMATIC_MB', is_multisite()  );
+
+		// Create the feedlinks
+		if ( !( THEMATIC_COMPATIBLE_FEEDLINKS ) )
+ 			add_theme_support( 'automatic-feed-links' );
+ 
+		if ( apply_filters( 'thematic_post_thumbs', true ) )
+			add_theme_support( 'post-thumbnails' );
+ 
+		add_theme_support( 'thematic_superfish' );
 
-// Load jQuery
-wp_enqueue_script('jquery');
+		// Path constants
+		define( 'THEMATIC_LIB',  get_template_directory() .  '/library' );
 
-// Path constants
-define('THEMELIB', TEMPLATEPATH . '/library');
+		// Create Theme Options Page
+		require_once ( THEMATIC_LIB . '/extensions/theme-options.php' );
+		
+		// Load legacy functions
+		require_once ( THEMATIC_LIB . '/legacy/deprecated.php' );
 
-// Create Theme Options Page
-require_once(THEMELIB . '/extensions/theme-options.php');
+		// Load widgets
+		require_once ( THEMATIC_LIB . '/extensions/widgets.php' );
 
-// Load legacy functions
-require_once(THEMELIB . '/legacy/deprecated.php');
+		// Load custom header extensions
+		require_once ( THEMATIC_LIB . '/extensions/header-extensions.php' );
 
-// Load widgets
-require_once(THEMELIB . '/extensions/widgets.php');
+		// Load custom content filters
+		require_once ( THEMATIC_LIB . '/extensions/content-extensions.php' );
 
-// Load custom header extensions
-require_once(THEMELIB . '/extensions/header-extensions.php');
+		// Load custom Comments filters
+		require_once ( THEMATIC_LIB . '/extensions/comments-extensions.php' );
 
-// Load custom content filters
-require_once(THEMELIB . '/extensions/content-extensions.php');
+		// Load custom discussion filters
+		require_once ( THEMATIC_LIB . '/extensions/discussion-extensions.php' );
 
-// Load custom Comments filters
-require_once(THEMELIB . '/extensions/comments-extensions.php');
- 
-// Load custom discussion filters
-require_once(THEMELIB . '/extensions/discussion-extensions.php');
+		// Load custom Widgets
+		require_once ( THEMATIC_LIB . '/extensions/widgets-extensions.php' );
 
-// Load custom Widgets
-require_once(THEMELIB . '/extensions/widgets-extensions.php');
+		// Load the Comments Template functions and callbacks
+		require_once ( THEMATIC_LIB . '/extensions/discussion.php' );
 
-// Load the Comments Template functions and callbacks
-require_once(THEMELIB . '/extensions/discussion.php');
+		// Load custom sidebar hooks
+		require_once ( THEMATIC_LIB . '/extensions/sidebar-extensions.php' );
 
-// Load custom sidebar hooks
-require_once(THEMELIB . '/extensions/sidebar-extensions.php');
+		// Load custom footer hooks
+		require_once ( THEMATIC_LIB . '/extensions/footer-extensions.php' );
 
-// Load custom footer hooks
-require_once(THEMELIB . '/extensions/footer-extensions.php');
+		// Add Dynamic Contextual Semantic Classes
+		require_once ( THEMATIC_LIB . '/extensions/dynamic-classes.php' );
 
-// Add Dynamic Contextual Semantic Classes
-require_once(THEMELIB . '/extensions/dynamic-classes.php');
+		// Need a little help from our helper functions
+		require_once ( THEMATIC_LIB . '/extensions/helpers.php' );
 
-// Need a little help from our helper functions
-require_once(THEMELIB . '/extensions/helpers.php');
+		// Load shortcodes
+		require_once ( THEMATIC_LIB . '/extensions/shortcodes.php' );
 
-// Load shortcodes
-require_once(THEMELIB . '/extensions/shortcodes.php');
+		// Adds filters for the description/meta content in archive templates
+		add_filter( 'archive_meta', 'wptexturize' );
+		add_filter( 'archive_meta', 'convert_smilies' );
+		add_filter( 'archive_meta', 'convert_chars' );
+		add_filter( 'archive_meta', 'wpautop' );
 
-// Adds filters for the description/meta content in archives.php
-add_filter( 'archive_meta', 'wptexturize' );
-add_filter( 'archive_meta', 'convert_smilies' );
-add_filter( 'archive_meta', 'convert_chars' );
-add_filter( 'archive_meta', 'wpautop' );
+		// Remove the WordPress Generator - via http://blog.ftwr.co.uk/archives/2007/10/06/improving-the-wordpress-generator/
+		function thematic_remove_generators() {
+ 			return '';
+ 		}
+ 		if ( apply_filters( 'thematic_hide_generators', true ) )
+ 			add_filter( 'the_generator', 'thematic_remove_generators' );
+ 
+		// Translate, if applicable
+		load_theme_textdomain( 'thematic', THEMATIC_LIB . '/languages' );
 
-// Remove the WordPress Generator - via http://blog.ftwr.co.uk/archives/2007/10/06/improving-the-wordpress-generator/
-function thematic_remove_generators() { return ''; }
-if (apply_filters('thematic_hide_generators', TRUE)) {  
-    add_filter('the_generator','thematic_remove_generators');
+		$locale = get_locale();
+		$locale_file = THEMATIC_LIB . "/languages/$locale.php";
+		if ( is_readable($locale_file) )
+			require_once ($locale_file);
+	}
 }
 
-// Translate, if applicable
-load_theme_textdomain('thematic', THEMELIB . '/languages');
+add_action('after_setup_theme', 'thematic_theme_setup', 10);
 
-$locale = get_locale();
-$locale_file = THEMELIB . "/languages/$locale.php";
-if ( is_readable($locale_file) )
-	require_once($locale_file);
 
+/**
+ * Registers action hook: thematic_child_init
+ * 
+ * @since Thematic 1.0
+ */
+function thematic_child_init() {
+	do_action('thematic_child_init');
+}
 
-?>
\ No newline at end of file
+add_action('after_setup_theme', 'thematic_child_init', 20);
+
+
+if ( function_exists('childtheme_override_init_navmenu') )  {
+	/**
+	 * @ignore
+	 */
+	 function thematic_init_navmenu() {
+    	childtheme_override_init_navmenu();
+    }
+} else {
+	/**
+	 * Register primary nav menu
+	 * 
+	 * Override: childtheme_override_init_navmenu
+	 * Filter: thematic_primary_menu_id
+	 * Filter: thematic_primary_menu_name
+	 */
+    function thematic_init_navmenu() {
+		register_nav_menu( apply_filters('thematic_primary_menu_id', 'primary-menu'), apply_filters('thematic_primary_menu_name', __( 'Primary Menu', 'thematic' ) ) );
+	}
+}
+add_action('init', 'thematic_init_navmenu');
\ No newline at end of file
diff --git a/wp-content/themes/thematic/header.php b/wp-content/themes/thematic/header.php
index 4ebe82b249f7219c811ef22fb4a575f7e6a91cc9..ea9081d4e1374743e97d20eddcd934676f9321b3 100644
--- a/wp-content/themes/thematic/header.php
+++ b/wp-content/themes/thematic/header.php
@@ -1,84 +1,91 @@
 <?php
-
-    // Creating the doctype
-    thematic_create_doctype();
-    echo " ";
-    language_attributes();
-    echo ">\n";
-    
-    // Creating the head profile
-    thematic_head_profile();
-
-    // Creating the doc title
-    thematic_doctitle();
-    
-    // Creating the content type
-    thematic_create_contenttype();
-    
-    // Creating the description
-    thematic_show_description();
-    
-    // Creating the robots tags
-    thematic_show_robots();
-    
-    // Creating the canonical URL
-    thematic_canonical_url();
-    
-    // Loading the stylesheet
-    thematic_create_stylesheet();
-
+/**
+ * Header Template
+ *
+ * This template calls a series of functions that output the head tag of the document.
+ * The body and div #main elements are opened at the end of this file. 
+ * 
+ * @package Thematic
+ * @subpackage Templates
+ */
+ 
+	// Create doctype
+	thematic_create_doctype();
+	echo " ";
+	language_attributes();
+	echo ">\n";
+	
+	// Opens the head tag 
+	thematic_head_profile();
+	
+	// Create the meta content type
+	thematic_create_contenttype();
+	
+	// Create the title tag 
+	thematic_doctitle();
+	
+	// Create the meta description
+	thematic_show_description();
+	
+	// Create the tag <meta name="robots"  
+	thematic_show_robots();
+	
+	// Constant defined true by default 
 	if (THEMATIC_COMPATIBLE_FEEDLINKS) {    
-    	// Creating the internal RSS links
-    	thematic_show_rss();
-    
-    	// Creating the comments RSS links
-    	thematic_show_commentsrss();
-   	}
-    
-    // Creating the pingback adress
-    thematic_show_pingback();
-    
-    // Enables comment threading
-    thematic_show_commentreply();
-
-    // Calling WordPress' header action hook
-    wp_head();
-    
+		// Creating the internal RSS links
+		thematic_show_rss();
+	
+		// Create comments RSS links
+		thematic_show_commentsrss();
+	}
+	
+	// Create pingback adress
+	thematic_show_pingback();
+	
+	/* The function wp_head() loads Thematic's stylesheet and scripts.
+	 * Calling wp_head() is required to provide plugins and child themes
+	 * the ability to insert markup within the <head> tag.
+	 */
+	wp_head();
 ?>
-
 </head>
 
 <?php 
+	// Create the body element and dynamic body classes
+	thematic_body();
+
+	// Action hook to place content before opening #wrapper
+	thematic_before(); 
+?>
+	<?php
+		// Filter provided for removing output of wrapping element follows the body tag
+		if ( apply_filters( 'thematic_open_wrapper', true ) ) 
+  		  echo ( '<div id="wrapper" class="hfeed">' );
 
-thematic_body();
+		// Action hook for placing content above the theme header
+		thematic_aboveheader(); 
+	?>
 
-// action hook for placing content before opening #wrapper
-thematic_before(); 
 
-if (apply_filters('thematic_open_wrapper', true)) {
-	echo '<div id="wrapper" class="hfeed">';
-}
-    
-    // action hook for placing content above the theme header
-    thematic_aboveheader(); 
-    
-    ?>   
+		<?php
+			// Filter provided for altering output of the header opening element
+			echo ( apply_filters( 'thematic_open_header',  '<div id="header">' ) );
+    	?>
 
-    <div id="header">
-    
-        <?php 
-        
-        // action hook creating the theme header
-        thematic_header();
-        
-        ?>
 
-	</div><!-- #header-->
-    <?php
-    
-    // action hook for placing content below the theme header
-    thematic_belowheader();
-    
-    ?>   
-    <div id="main">
-    
\ No newline at end of file
+        	<?php 
+				// Action hook creating the theme header
+				thematic_header();
+       		?>
+       		
+    	<?php  	
+    		// Filter provided for altering output of the header closing element
+			echo ( apply_filters( 'thematic_close_header', '</div><!-- #header-->' ) );
+		?>
+		        
+    	<?php
+			// Action hook for placing content below the theme header
+			thematic_belowheader();
+    	?>
+    	
+	<div id="main">
diff --git a/wp-content/themes/thematic/index.php b/wp-content/themes/thematic/index.php
index e01cfb3defe0180d37098d838a7cb6ddc6b24011..1f0494087a9e21111ad6d8d3434ba35ecd1e6852 100644
--- a/wp-content/themes/thematic/index.php
+++ b/wp-content/themes/thematic/index.php
@@ -1,22 +1,35 @@
 <?php
+/**
+ * Index Template
+ *
+ * This file is required by WordPress to recoginze Thematic as a valid theme.
+ * It is also the default template WordPress will use to display your web site,
+ * when no other applicable templates are present in this theme's root directory
+ * that apply to the query made to the site.
+ * 
+ * WP Codex Reference: http://codex.wordpress.org/Template_Hierarchy
+ *
+ * @package Thematic
+ * @subpackage Templates
+ */
 
-    // calling the header.php
-    get_header();
-
-    // action hook for placing content above #container
-    thematic_abovecontainer();
-
+	// calling the header.php
+	get_header();
+	
+	// action hook for placing content above #container
+	thematic_abovecontainer();
 ?>
 
 		<div id="container">
-	
-			<?php thematic_abovecontent(); ?>
-	
-			<div id="content">
 
-				<?php 
-            	
-            	// create the navigation above the content
+			<?php
+		    	// action hook for placing content above #content
+				thematic_abovecontent();
+				
+				// filter for manipulating the element that wraps the content 
+				echo apply_filters( 'thematic_open_id_content', '<div id="content">' . "\n\n" );
+				
+				// create the navigation above the content
             	thematic_navigation_above();
 				
             	// calling the widget area 'index-top'
@@ -36,24 +49,23 @@
 				
             	// create the navigation below the content
             	thematic_navigation_below();
-            	
-            	?>
-				
-			</div><!-- #content -->
-		
-			<?php thematic_belowcontent(); ?> 
-		
-		</div><!-- #container -->
-
-<?php 
+            ?>
 
-    // action hook for placing content below #container
-    thematic_belowcontainer();
-
-    // calling the standard sidebar 
-    thematic_sidebar();
-    
-    // calling footer.php
-    get_footer();
+			</div><!-- #content -->
 
+			<?php
+				// action hook for placing content below #content
+				thematic_belowcontent();
+			?>
+		</div><!-- #container -->
+		
+<?php
+	// action hook for placing content below #container
+	thematic_belowcontainer();
+	
+	// calling the standard sidebar 
+	thematic_sidebar();
+	
+	// calling footer.php
+	get_footer();
 ?>
\ No newline at end of file
diff --git a/wp-content/themes/thematic/library/extensions/comments-extensions.php b/wp-content/themes/thematic/library/extensions/comments-extensions.php
index 2bc3864a85326edfb9ea0ea929fd725fbbc153cd..90e2dfc1d4ccb413a037c2ab4a4a5bcb8bd22367 100644
--- a/wp-content/themes/thematic/library/extensions/comments-extensions.php
+++ b/wp-content/themes/thematic/library/extensions/comments-extensions.php
@@ -1,133 +1,211 @@
 <?php
-
-
-// Located in comments.php
-// Just before #comments
+/**
+ * Comments Extensions
+ *
+ * @package ThematicCoreLibrary
+ * @subpackage CommentsExtensions
+ */
+
+/**
+ * Action Hook: thematic_abovecomments
+ * 
+ * Located in comments.php
+ * Just before #comments
+ */
 function thematic_abovecomments() {
     do_action('thematic_abovecomments');
 }
 
-
-// Located in comments.php
-// Just before #comments-list
+/**
+ * Action Hook: thematic_abovecommentslist
+ * 
+ * Located in comments.php
+ * Just before #comments-list
+ */
 function thematic_abovecommentslist() {
     do_action('thematic_abovecommentslist');
 }
 
-
-// Located in comments.php
-// Just after #comments-list
+/**
+ * Action Hook: thematic_belowcommentslist
+ * 
+ * Located in comments.php
+ * Just after #comments-list
+ */
 function thematic_belowcommentslist() {
     do_action('thematic_belowcommentslist');
 }
 
-
-// Located in comments.php
-// Just before #trackbacks-list
+/**
+ * Action Hook: thematic_abovetrackbackslist
+ * 
+ * Located in comments.php
+ * Just before #trackbacks-list
+ */
 function thematic_abovetrackbackslist() {
     do_action('thematic_abovetrackbackslist');
 }
 
-
-// Located in comments.php
-// Just after #trackbacks-list
+/**
+ * Action Hook: thematic_belowtrackbackslist
+ * 
+ * Located in comments.php
+ * Just after #trackbacks-list
+ */
 function thematic_belowtrackbackslist() {
     do_action('thematic_belowtrackbackslist');
 }
 
-
-// Located in comments.php
-// Just before the comments form
+/**
+ * Action Hook: thematic_abovecommentsform
+ * 
+ * Located in comments.php
+ * Just before the comments form
+ */
 function thematic_abovecommentsform() {
     do_action('thematic_abovecommentsform');
 }
 
-
-// Adds the Subscribe to comments button
+/**
+ * Provides Plugin Compatibility: Subscribe to Comments
+ *
+ * Adds the subscribe to comments button.
+ *
+ * @link http://wordpress.org/extend/plugins/subscribe-to-comments/ Subscribe to Comments Plugin Page
+ */
 function thematic_show_subscription_checkbox() {
     if(function_exists('show_subscription_checkbox')) { show_subscription_checkbox(); }
 }
 add_action('comment_form', 'thematic_show_subscription_checkbox', 98);
 
-
-// Located in comments.php
-// Just after the comments form
+/**
+ * Action Hook: thematic_belowcommentsform
+ * 
+ * Located in comments.php
+ * Just after the comments form
+ */
 function thematic_belowcommentsform() {
     do_action('thematic_belowcommentsform');
 }
 
-
-// Adds the Subscribe without commenting button
+/**
+ * Provides Plugin Compatibility: Subscribe to Comments
+ *
+ * Adds the subscribe without commenting button
+ *
+ * @link http://wordpress.org/extend/plugins/subscribe-to-comments/ Subscribe to Comments Plugin Page
+ */
 function thematic_show_manual_subscription_form() {
     if(function_exists('show_manual_subscription_form')) { show_manual_subscription_form(); }
 }
 add_action('thematic_belowcommentsform', 'thematic_show_manual_subscription_form', 5);
 
-
-// Located in comments.php
-// Just after #comments
+/**
+ * Action Hook: thematic_belowcomments
+ * 
+ * Located in comments.php
+ * Just after #comments
+ */
 function thematic_belowcomments() {
     do_action('thematic_belowcomments');
 }
 
-// Located in comments.php
-// Creates the standard text for one comment
+/**
+ * Filter: thematic_singlecomment_text
+ *
+ * Creates the standard text for one comment
+ * Located in comments.php
+ */
 function thematic_singlecomment_text() {
     $content = __('<span>One</span> Comment', 'thematic');
     return apply_filters( 'thematic_singlecomment_text', $content );
 }
 
-// Located in comments.php
-// Creates the standard text for more than one comment
+/**
+ * Filter: thematic_multiplecomments_text
+ *
+ * Creates the standard text for more than one comment
+ * Located in comments.php
+ */
 function thematic_multiplecomments_text() {
-    $content = __('<span>%d</span> Comments', 'thematic');
+    $content = '<span>%d</span> ' . __('Comments', 'thematic');
     return apply_filters( 'thematic_multiplecomments_text', $content );
 }
 
-// creates the list comments arguments
-function list_comments_arg() {
+
+/**
+ * Filter: list_comments_arg
+ * 
+ * Creates the list comments arguments
+ */
+function thematic_list_comments_arg() {
 	$content = 'type=comment&callback=thematic_comments';
 	return apply_filters('list_comments_arg', $content);
 }
 
-// Located in comments.php
-// Creates the standard text 'Post a Comment'
+
+/**
+ * Filter: thematic_postcomment_text
+ * 
+ * Creates the standard text 'Post a Comment'
+ * Located in comments.php
+ */
 function thematic_postcomment_text() {
     $content = __('Post a Comment', 'thematic');
     return apply_filters( 'thematic_postcomment_text', $content );
 }
 
-// Located in comments.php
-// Creates the standard text 'Post a Reply to %s'
+/**
+ * Filter: thematic_postreply_text
+ * 
+ * Creates the standard text 'Post a Reply to %s'
+ * Located in comments.php
+ */
 function thematic_postreply_text() {
     $content = __('Post a Reply to %s', 'thematic');
     return apply_filters( 'thematic_postreply_text', $content );
 }
 
-// Located in comments.php
-// Creates the standard text 'Comment' for the text box
+/**
+ * Filter: thematic_commentbox_text
+ * 
+ * Creates the standard text 'Comment' for the text box
+ * Located in comments.php
+ */
 function thematic_commentbox_text() {
     $content = __('Comment', 'thematic');
     return apply_filters( 'thematic_commentbox_text', $content );
 }
 
-
-// Located in comments-extensions.php
-// Creates the standard text 'Cancel reply'
+/**
+ * Filter: thematic_cancelreply_text function.
+ * 
+ * Creates the standard text 'Cancel reply'
+ * Located in comments-extensions.php
+ */
 function thematic_cancelreply_text() {
     $content = __('Cancel reply', 'thematic');
     return apply_filters( 'thematic_cancelreply_text', $content );
 }
 
-// Located in comments.php
-// Creates the standard text 'Post Comment' for the send button
+/**
+ * Filter: thematic_commentbutton_text
+ * 
+ * Creates the standard text 'Post Comment' for the send button
+ * Located in comments.php
+ */
 function thematic_commentbutton_text() {
-    $content = __('Post Comment', 'thematic');
+    $content = esc_attr( __('Post Comment', 'thematic') );
     return apply_filters( 'thematic_commentbutton_text', $content );
 }
 
-// Located in comments.php
-// Creates the standard arguments for comment_form()
+/**
+ * Function: thematic_comment_form_args
+ * Filter: comment_form_default_fields
+ * 
+ * Creates the standard arguments for comment_form()
+ * Located in comments.php
+ */
 function thematic_comment_form_args( $post_id = null ) {
 	global $user_identity, $id;
 	
@@ -153,7 +231,7 @@ function thematic_comment_form_args( $post_id = null ) {
 		'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>',
+		'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>',
 
@@ -169,7 +247,9 @@ function thematic_comment_form_args( $post_id = null ) {
 	return apply_filters( 'thematic_comment_form_args', $args );	
 }
 
-// Produces an avatar image with the hCard-compliant photo class
+/**
+ * Produces an avatar image with the hCard-compliant photo class
+ */
 function thematic_commenter_link() {
 	$commenter = get_comment_author_link();
 	if ( ereg( '<a[^>]* class=[^>]+>', $commenter ) ) {
@@ -181,20 +261,45 @@ function thematic_commenter_link() {
 	$avatar_size = apply_filters( 'avatar_size', '80' ); // Available filter: avatar_size
 	$avatar = str_replace( "class='avatar", "class='photo avatar", get_avatar( $avatar_email, $avatar_size ) );
 	echo $avatar . ' <span class="fn n">' . $commenter . '</span>';
-} // end thematic_commenter_link
-
+} 
 
-// A hook for the standard comments template
+/**
+ * ActionHook: thematic_comments_template
+ */
 function thematic_comments_template() {
 	do_action('thematic_comments_template');
-} // end thematic_comments
-
+}
 
-	// The standard comments template is injected into thematic_comments_template() by default
-	function thematic_include_comments() {
+/**
+ *  Outputs the standard comments template
+ */
+function thematic_include_comments() {
+	// Checking for defined constant to enable conditional comment display for Pages
+    if ( THEMATIC_COMPATIBLE_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);	    	
+	// WordPress standard comment handling is the default if constant is not set
+	} else {
 		comments_template('', true);
-	} // end thematic_include_comments
-	
-	add_action('thematic_comments_template','thematic_include_comments',5);
-	
-	
\ No newline at end of file
+	}
+}
+
+add_action('thematic_comments_template','thematic_include_comments', 5);
+
+function thematic_get_comment_link( $link , $comment, $args ) {
+	global  $wp_rewrite; 
+
+	$args['type'] = 'comment';
+	$args['page'] = 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 ) );
+
+	return $link; 
+}
+add_filter( 'get_comment_link', 'thematic_get_comment_link', 10, 3 );
+
+?>
\ No newline at end of file
diff --git a/wp-content/themes/thematic/library/extensions/content-extensions.php b/wp-content/themes/thematic/library/extensions/content-extensions.php
index 28e3c7a912dc69784d00baef62b5ef2a755dd477..779ccaf42173db27363adf9cb9b44bb92508f195 100644
--- a/wp-content/themes/thematic/library/extensions/content-extensions.php
+++ b/wp-content/themes/thematic/library/extensions/content-extensions.php
@@ -1,191 +1,327 @@
 <?php
-
-// Located in 404.php, archive.php, archives.php, attachement.php, author.php, category.php index.php, 
-// links.php, page.php, search.php, single.php, tag.php
-// Just between #main and #container
+/**
+ * Content Extensions
+ *
+ * @package ThematicCoreLibrary
+ * @subpackage ContentExtensions
+ * @todo revisit docblock desciptions & tags
+ */
+ 
+
+/**
+ * Register action hook: thematic_abovecontainer
+ * 
+ * Located in 404.php, archive.php, archives.php, attachement.php, author.php, category.php index.php, 
+ * links.php, page.php, search.php, single.php, tag.php
+ * Just between #main and #container
+ */
 function thematic_abovecontainer() {
     do_action('thematic_abovecontainer');
 } // end thematic_abovecontainer
 
 
-// Located in 404.php, archive.php, archives.php, attachement.php, author.php, category.php index.php, 
-// links.php, page.php, search.php, single.php, tag.php
-// Just between #main and #container
+/**
+ * Register action hook: thematic_abovecontent
+ *
+ * Located in 404.php, archive.php, archives.php, attachement.php, author.php, category.php index.php,
+ * links.php, page.php, search.php, single.php, tag.php
+ * Just between #main and #container
+ */
 function thematic_abovecontent() {
     do_action('thematic_abovecontent');
 } // end thematic_abovecontent
 
 
-// Located in 404.php, archive.php, archives.php, attachement.php, author.php, category.php index.php, 
-// links.php, page.php, search.php, single.php, tag.php
-// Just between #main and #container
+/**
+ * Register action hook: thematic_abovepost 
+ *
+ * Located in 404.php, archives.php, attachment.php, links.php, page.php, search.php and template-page-fullwidth.php
+ * Just above #post
+ */
 function thematic_abovepost() {
     do_action('thematic_abovepost');
 } // end thematic_abovepost
 
 
-// Located in archives.php
-// Just after the content
+/**
+ * Register action hook: thematic_archives 
+ *
+ * Located in archives.php
+ * Just after the content
+ */
 function thematic_archives() {
 	do_action('thematic_archives');
 } // end thematic_archives
 
 
-// Located in archive.php, author.php, category.php, index.php, search.php, single.php, tag.php
-// Just before the content
+/**
+ * Register action hook: thematic_navigation_above 
+ *
+ * Located in archive.php, author.php, category.php, index.php, search.php, single.php, tag.php
+ * Just before the content
+ */
 function thematic_navigation_above() {
 	do_action('thematic_navigation_above');
 } // end thematic_navigation_above
 
 
-// Located in archive.php, author.php, category.php, index.php, search.php, single.php, tag.php
-// Just after the content
+/**
+ * Register action hook: thematic_navigation_below 
+ *
+ * Located in archive.php, author.php, category.php, index.php, search.php, single.php, tag.php
+ * Just after the content
+ */
 function thematic_navigation_below() {
 	do_action('thematic_navigation_below');
 } // end thematic_navigation_below
 
 
-// Located in index.php 
-// Just before the loop
+/**
+ * Register action hook: thematic_above_indexloop 
+ *
+ * Located in index.php 
+ * Just before the loop
+ */
 function thematic_above_indexloop() {
     do_action('thematic_above_indexloop');
 } // end thematic_above_indexloop
 
 
-// Located in archive.php
-// The Loop
+/**
+ * Register action hook: thematic_above_archiveloop 
+ *
+ * Located in archive.php 
+ * Just before the loop
+ */
+function thematic_above_archiveloop() {
+    do_action('thematic_above_archiveloop');
+} // end thematic_above_archiveloop
+
+
+/**
+ * Register action hook: thematic_archiveloop 
+ *
+ * Located in archive.php
+ * The Loop used on archive pages
+ */
 function thematic_archiveloop() {
 	do_action('thematic_archiveloop');
 } // end thematic_archiveloop
 
 
-// Located in author.php
-// The Loop
+/**
+ * Register action hook: thematic_authorloop 
+ *
+ * Located in author.pgp
+ * The Loop used on author pages
+ */
 function thematic_authorloop() {
 	do_action('thematic_authorloop');
 } // end thematic_authorloop
 
 
-// Located in category.php
-// The Loop
+/**
+ * Register action hook: thematic_categoryloop 
+ *
+ * Located in category.php
+ * The Loop used on category pages
+ */
 function thematic_categoryloop() {
 	do_action('thematic_categoryloop');
 } // end thematic_categoryloop
 
 
-// Located in index.php
-// The Loop
+/**
+ * Register action hook: thematic_indexloop 
+ *
+ * Located in index.php
+ * The default loop
+ */
 function thematic_indexloop() {
 	do_action('thematic_indexloop');
 } // end thematic_indexloop
 
 
-// Located in search.php
-// The Loop
+/**
+ * Register action hook: thematic_searchloop 
+ *
+ * Located in search.php
+ * The loop used on search result pages
+ */
 function thematic_searchloop() {
 	do_action('thematic_searchloop');
 } // end thematic_searchloop
 
 
-// Located in single.php
-// The Post
+/**
+ * Register action hook: thematic_singlepost 
+ *
+ * Located in single.php
+ * The Loop on single pages
+ */
 function thematic_singlepost() {
 	do_action('thematic_singlepost');
 } //end thematic_singlepost
 
 
-// Located in tag.php
-// The Loop
+/**
+ * Register action hook: thematic_tagloop 
+ *
+ * Located in tag.php
+ * The Loop on tag archive pages
+ */
 function thematic_tagloop() {
 	do_action('thematic_tagloop');
 } // end thematic_tagloop
 
 
-// Located in index.php 
-// Just after the loop
+/**
+ * Register action hook: thematic_below_indexloop 
+ *
+ * Located in index.php
+ * Just after the loop
+ */
 function thematic_below_indexloop() {
     do_action('thematic_below_indexloop');
 } // end thematic_below_indexloop
 
 
-// Located in category.php 
-// Just before the loop
+/**
+ * Register action hook: thematic_below_archiveloop 
+ *
+ * Located in archive.php
+ * Just after the loop
+ */
+function thematic_below_archiveloop() {
+    do_action('thematic_below_archiveloop');
+} // end thematic_below_archiveloop
+
+
+/**
+ * Register action hook: thematic_above_categoryloop 
+ *
+ * Located in category.php
+ * Just before the loop
+ */
 function thematic_above_categoryloop() {
     do_action('thematic_above_categoryloop');
 } // end thematic_above_categoryloop
 
 
-// Located in category.php 
-// Just after the loop
+/**
+ * Register action hook: thematic_below_categoryloop 
+ *
+ * Located in category.php
+ * Just after the loop
+ */
 function thematic_below_categoryloop() {
     do_action('thematic_below_categoryloop');
 } // end thematic_below_categoryloop
 
 
-// Located in search.php 
-// Just before the loop
+/**
+ * Register action hook: thematic_above_searchloop 
+ *
+ * Located in search.php
+ * Just before the loop
+ */
 function thematic_above_searchloop() {
     do_action('thematic_above_searchloop');
 } // end thematic_above_searchloop
 
 
-// Located in search.php 
-// Just after the loop
+/**
+ * Register action hook: thematic_below_searchloop 
+ *
+ * Located in search.php
+ * Just after the loop
+ */
 function thematic_below_searchloop() {
     do_action('thematic_below_searchloop');
 } // end thematic_below_searchloop
 
 
-// Located in tag.php 
-// Just before the loop
+/**
+ * Register action hook: thematic_above_tagloop 
+ *
+ * Located in tag.php
+ * Just before the loop
+ */
 function thematic_above_tagloop() {
     do_action('thematic_above_tagloop');
 } // end thematic_above_tagloop
 
 
-// Located in tag.php 
-// Just after the loop
+/**
+ * Register action hook: thematic_init 
+ *
+ * Located in tag.php
+ * Just after the loop
+ */
 function thematic_below_tagloop() {
     do_action('thematic_below_tagloop');
 } // end thematic_below_tagloop
 
 
-// Located in 404.php, archive.php, archives.php, attachement.php, author.php, category.php index.php, 
-// links.php, page.php, search.php, single.php, tag.php
-// Just below #content
+/**
+ * Register action hook: thematic_belowpost 
+ *
+ * Located in 404.php, archives.php, attachment.php, links.php, page.php, search.php and template-page-fullwidth.php
+ * Just below #post
+ */
 function thematic_belowpost() {
     do_action('thematic_belowpost');
 } // end thematic_belowpost
 
 
-// Located in 404.php, archive.php, archives.php, attachement.php, author.php, category.php index.php, 
-// links.php, page.php, search.php, single.php, tag.php
-// Just below #content
+/**
+ * Register action hook: thematic_belowcontent 
+ *
+ * Located in 404.php, archive.php, archives.php, attachement.php, author.php, category.php index.php, 
+ * links.php, page.php, search.php, single.php, tag.php
+ * Just below #content
+ */
 function thematic_belowcontent() {
     do_action('thematic_belowcontent');
 } // end thematic_belowcontent
 
 
-// Located in 404.php, archive.php, archives.php, attachement.php, author.php, category.php index.php, 
-// links.php, page.php, search.php, single.php, tag.php
-// Just below #container
+/**
+ * Register action hook: thematic_belowcontainer 
+ *
+ * Located in 404.php, archive.php, archives.php, attachement.php, author.php, category.php index.php,
+ * links.php, page.php, search.php, single.php, tag.php
+ * Just below #container
+ */
 function thematic_belowcontainer() {
     do_action('thematic_belowcontainer');
 } // end thematic_belowcontainer
 
 
-// Filter the page title
-// located in archive.php, attachement.php, author.php, category.php, search.php, tag.php
 if (function_exists('childtheme_override_page_title'))  {
+	/**
+	 * @ignore
+	 */
 	function thematic_page_title() {
 		childtheme_override_page_title();
 	}
 } else {
+	/**
+	 * Create the page title.
+	 * 
+	 * Echoes the title of the webpage for specific queries. The markup is conditionally set using template tags.
+	 * Located in templates: archive.php, attachement.php, author.php, category.php, search.php, tag.php
+	 * 
+	 * Override: childtheme_override_page_title <br>
+	 * Filter: thematic_page_title 
+	 * 
+	 * @todo review and remove possiblity for displaying an empty div for archive-meta
+	 */
 	function thematic_page_title() {
 		
 		global $post;
 		
-		$content = '';
+		$content = "\t\t\t\t";
 		if (is_attachment()) {
 				$content .= '<h2 class="page-title"><a href="';
 				$content .= apply_filters('the_permalink',get_permalink($post->post_parent));
@@ -194,9 +330,9 @@ if (function_exists('childtheme_override_page_title'))  {
 				$content .= '</a></h2>';
 		} elseif (is_author()) {
 				$content .= '<h1 class="page-title author">';
-				$author = get_the_author_meta( 'display_name' );
-				$content .= __('Author Archives: ', 'thematic');
-				$content .= '<span>';
+				$author = get_the_author_meta( 'display_name', $post->post_author );
+				$content .= __('Author Archives:', 'thematic');
+				$content .= ' <span>';
 				$content .= $author;
 				$content .= '</span></h1>';
 		} elseif (is_category()) {
@@ -205,31 +341,39 @@ if (function_exists('childtheme_override_page_title'))  {
 				$content .= ' <span>';
 				$content .= single_cat_title('', FALSE);
 				$content .= '</span></h1>' . "\n";
-				$content .= '<div class="archive-meta">';
+				$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 .= esc_html(stripslashes($_GET['s']));
+				$content .= get_search_query();
 				$content .= '</span></h1>';
 		} elseif (is_tag()) {
 				$content .= '<h1 class="page-title">';
 				$content .= __('Tag Archives:', 'thematic');
 				$content .= ' <span>';
-				$content .= __(thematic_tag_query());
+				$content .= ( single_tag_title( '', false ));
 				$content .= '</span></h1>';
 		} elseif (is_tax()) {
 			    global $taxonomy;
 				$content .= '<h1 class="page-title">';
 				$tax = get_taxonomy($taxonomy);
-				$content .= $tax->labels->name . ' ';
+				$content .= $tax->labels->singular_name . ' ';
 				$content .= __('Archives:', 'thematic');
 				$content .= ' <span>';
 				$content .= thematic_get_term_name();
 				$content .= '</span></h1>';
-		}	elseif (is_day()) {
+ 		} 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>';	
+		} elseif (is_day()) {
 				$content .= '<h1 class="page-title">';
 				$content .= sprintf(__('Daily Archives: <span>%s</span>', 'thematic'), get_the_time(get_option('date_format')));
 				$content .= '</h1>';
@@ -241,10 +385,6 @@ if (function_exists('childtheme_override_page_title'))  {
 				$content .= '<h1 class="page-title">';
 				$content .= sprintf(__('Yearly Archives: <span>%s</span>', 'thematic'), get_the_time('Y'));
 				$content .= '</h1>';
-		} elseif (isset($_GET['paged']) && !empty($_GET['paged'])) {
-				$content .= '<h1 class="page-title">';
-				$content .= __('Blog Archives', 'thematic');
-				$content .= '</h1>';
 		}
 		$content .= "\n";
 		echo apply_filters('thematic_page_title', $content);
@@ -252,34 +392,46 @@ if (function_exists('childtheme_override_page_title'))  {
 }
 
 
-// Action to create the above navigation
 if (function_exists('childtheme_override_nav_above'))  {
+	/**
+	 * @ignore
+	 */
 	function thematic_nav_above() {
 		childtheme_override_nav_above();
 	}
 } else {
+	/**
+	 * Create the above navigation
+	 * 
+	 * Includes compatibility with WP-PageNavi plugin
+	 * 
+	 * Override: childtheme_override_nav_above <br>
+	 * 
+	 * @link http://wordpress.org/extend/plugins/wp-pagenavi/ WP-PageNavi Plugin Page
+	 */
 	function thematic_nav_above() {
-		if (is_single()) { ?>
-
+		if (is_single()) { 
+		?>
 				<div id="nav-above" class="navigation">
+				
 					<div class="nav-previous"><?php thematic_previous_post_link() ?></div>
+					
 					<div class="nav-next"><?php thematic_next_post_link() ?></div>
+					
 				</div>
-
-<?php
-		} else { ?>
-
+		<?php } else { ?>
 				<div id="nav-above" class="navigation">
-               		<?php if(function_exists('wp_pagenavi')) { ?>
+               		<?php if ( function_exists( 'wp_pagenavi' ) ) { ?>
                 	<?php wp_pagenavi(); ?>
-					<?php } else { ?>  
-					<div class="nav-previous"><?php next_posts_link(__('<span class="meta-nav">&laquo;</span> Older posts', 'thematic')) ?></div>
-					<div class="nav-next"><?php previous_posts_link(__('Newer posts <span class="meta-nav">&raquo;</span>', 'thematic')) ?></div>
+					<?php } else { ?>
+					  
+					<div class="nav-previous"><?php next_posts_link(__( '<span class="meta-nav">&laquo;</span> Older posts', 'thematic') ) ?></div>
+					
+					<div class="nav-next"><?php previous_posts_link(__( 'Newer posts <span class="meta-nav">&raquo;</span>', 'thematic') ) ?></div>
 					<?php } ?>
 					
 				</div>	
-	
-<?php
+		<?php
 		}
 	}
 } // end nav_above
@@ -287,37 +439,56 @@ if (function_exists('childtheme_override_nav_above'))  {
 add_action('thematic_navigation_above', 'thematic_nav_above', 2);
 
 
-// The Archive Loop
 if (function_exists('childtheme_override_archive_loop'))  {
+	/**
+	 * @ignore
+	 */
 	function thematic_archive_loop() {
 		childtheme_override_archive_loop();
 	}
 } else {
+	/**
+	 * The Archive loop
+	 * 
+	 * Located in archive.php
+	 * 
+	 * Override: childtheme_override_archive_loop
+	 */
 	function thematic_archive_loop() {
 		while ( have_posts() ) : the_post(); 
-		
-				thematic_abovepost(); ?>
 
-				<div id="post-<?php the_ID();
-					echo '" ';
-					if (!(THEMATIC_COMPATIBLE_POST_CLASS)) {
-						post_class();
-						echo '>';
+				// action hook for insterting 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 '">';
+					    echo 'class="';
+					    thematic_post_class();
+					    echo '">';
 					}
-     				thematic_postheader(); ?>
+
+	            	// creating the post header
+	            	thematic_postheader();
+	            ?>
+					
 					<div class="entry-content">
-<?php thematic_content(); ?>
+						
+						<?php thematic_content(); ?>
 
 					</div><!-- .entry-content -->
+					
 					<?php thematic_postfooter(); ?>
+					
 				</div><!-- #post -->
 
 			<?php 
-			
+				// action hook for insterting content below #post
 				thematic_belowpost();
 		
 		endwhile;
@@ -327,38 +498,57 @@ if (function_exists('childtheme_override_archive_loop'))  {
 add_action('thematic_archiveloop', 'thematic_archive_loop');
 
 
-// The Author Loop
 if (function_exists('childtheme_override_author_loop'))  {
+	/**
+	 * @ignore
+	 */
 	function thematic_author_loop() {
 		childtheme_override_author_loop();
 	}
 } else {
+	/**
+	 * The Author loop
+	 * 
+	 * Located in author.php
+	 * 
+	 * Override: childtheme_override_author_loop
+	 */
 	function thematic_author_loop() {
 		rewind_posts();
-		while (have_posts()) : the_post(); 
-		
-				thematic_abovepost(); ?>
+		while ( have_posts() ) : the_post(); 
+
+				// action hook for insterting content above #post
+				thematic_abovepost();
+				?>
 
-				<div id="post-<?php the_ID();
-					echo '" ';
-					if (!(THEMATIC_COMPATIBLE_POST_CLASS)) {
-						post_class();
-						echo '>';
+				<?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 '">';
+					    echo 'class="';
+					    thematic_post_class();
+					    echo '">';
 					}
-     				thematic_postheader(); ?>
-					<div class="entry-content ">
-<?php thematic_content(); ?>
+
+	            	// creating the post header
+	            	thematic_postheader();
+	            ?>
+     				
+					<div class="entry-content">
+					
+						<?php thematic_content(); ?>
 
 					</div><!-- .entry-content -->
+					
 					<?php thematic_postfooter(); ?>
+					
 				</div><!-- #post -->
 
 			<?php 
-		
+				// action hook for insterting content below #post
 				thematic_belowpost();
 		
 		endwhile;
@@ -368,37 +558,56 @@ if (function_exists('childtheme_override_author_loop'))  {
 add_action('thematic_authorloop', 'thematic_author_loop');
 
 
-// The Category Loop
 if (function_exists('childtheme_override_category_loop'))  {
+	/**
+	 * @ignore
+	 */
 	function thematic_category_loop() {
 		childtheme_override_category_loop();
 	}
 } else {
+	/**
+	 * The Category loop
+	 * 
+	 * Located in category.php
+	 * 
+	 * Override: childtheme_override_category_loop
+	 */
 	function thematic_category_loop() {
-		while (have_posts()) : the_post(); 
-		
-				thematic_abovepost(); ?>
+		while ( have_posts() ) : the_post(); 
+
+				// action hook for insterting content above #post
+				thematic_abovepost();
+				?>
 	
-				<div id="post-<?php the_ID();
-					echo '" ';
-					if (!(THEMATIC_COMPATIBLE_POST_CLASS)) {
-						post_class();
-						echo '>';
+				<?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 '">';
+					    echo 'class="';
+					    thematic_post_class();
+					    echo '">';
 					}
-     				thematic_postheader(); ?>
+
+	            	// creating the post header
+	            	thematic_postheader();
+	            ?>
+     			
 					<div class="entry-content">
-<?php thematic_content(); ?>
+						
+						<?php thematic_content(); ?>
 	
 					</div><!-- .entry-content -->
+					
 					<?php thematic_postfooter(); ?>
+					
 				</div><!-- #post -->
 
 			<?php 
-		
+				// action hook for insterting content below #post
 				thematic_belowpost();
 		
 		endwhile;
@@ -408,63 +617,67 @@ if (function_exists('childtheme_override_category_loop'))  {
 add_action('thematic_categoryloop', 'thematic_category_loop');
 
 
-// The Index Loop
 if (function_exists('childtheme_override_index_loop'))  {
+	/**
+	 * @ignore
+	 */
 	function thematic_index_loop() {
 		childtheme_override_index_loop();
 	}
 } else {
+	/**
+	 * The Index loop
+	 * 
+	 * Located in index.php
+	 * 
+	 * Override: childtheme_override_index_loop
+	 */
 	function thematic_index_loop() {
 		
-		global $options, $blog_id;
-		
-		foreach ($options as $value) {
-		    if (get_option( $value['id'] ) === FALSE) { 
-		        $$value['id'] = $value['std']; 
-		    } else {
-		    	if (THEMATIC_MB) 
-		    	{
-		        	$$value['id'] = get_option($blog_id,  $value['id'] );
-		    	}
-		    	else
-		    	{
-		        	$$value['id'] = get_option( $value['id'] );
-		    	}
-		    }
-		}
-		
-		/* Count the number of posts so we can insert a widgetized area */ $count = 1;
+		// Count the number of posts so we can insert a widgetized area
+		$count = 1;
 		while ( have_posts() ) : the_post();
-		
-				thematic_abovepost(); ?>
 
-				<div id="post-<?php the_ID();
-					echo '" ';
-					if (!(THEMATIC_COMPATIBLE_POST_CLASS)) {
-						post_class();
-						echo '>';
+				// action hook for insterting 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 '">';
+					    echo 'class="';
+					    thematic_post_class();
+					    echo '">';
 					}
-     				thematic_postheader(); ?>
+
+	            	// creating the post header
+	            	thematic_postheader();
+	            ?>
+     				
 					<div class="entry-content">
-<?php thematic_content(); ?>
+					
+						<?php thematic_content(); ?>
 
-					<?php wp_link_pages('before=<div class="page-link">' .__('Pages:', 'thematic') . '&after=</div>') ?>
+						<?php wp_link_pages('before=<div class="page-link">' . __('Pages:', 'thematic') . '&after=</div>') ?>
+					
 					</div><!-- .entry-content -->
+					
 					<?php thematic_postfooter(); ?>
+					
 				</div><!-- #post -->
 
 			<?php 
-				
+				// action hook for insterting content below #post
 				thematic_belowpost();
 				
 				comments_template();
 
-				if ($count==$thm_insert_position) {
-						get_sidebar('index-insert');
+				if ( $count == thematic_get_theme_opt( 'index_insert' ) ) {
+					get_sidebar('index-insert');
 				}
 				$count = $count + 1;
 		endwhile;
@@ -474,36 +687,56 @@ if (function_exists('childtheme_override_index_loop'))  {
 add_action('thematic_indexloop', 'thematic_index_loop');
 
 
-// The Single Post
 if (function_exists('childtheme_override_single_post'))  {
+	/**
+	 * @ignore
+	 */
 	function thematic_single_post() {
 		childtheme_override_single_post();
 	}
 } else {
+	/**
+	 * The Single post loop
+	 * 
+	 * Located in single.php
+	 * 
+	 * Override: childtheme_override_single_post
+	 */
 	function thematic_single_post() { 
-		
-				thematic_abovepost(); ?>
+
+				// action hook for insterting content above #post
+				thematic_abovepost();
+				?>
 			
-				<div id="post-<?php the_ID();
-					echo '" ';
-					if (!(THEMATIC_COMPATIBLE_POST_CLASS)) {
-						post_class();
-						echo '>';
+				<?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 '">';
+					    echo 'class="';
+					    thematic_post_class();
+					    echo '">';
 					}
-     				thematic_postheader(); ?>
+
+	            	// creating the post header
+	            	thematic_postheader();
+	            ?>
+     				
 					<div class="entry-content">
-<?php thematic_content(); ?>
+					
+						<?php thematic_content(); ?>
 
-						<?php wp_link_pages('before=<div class="page-link">' .__('Pages:', 'thematic') . '&after=</div>') ?>
+						<?php wp_link_pages('before=<div class="page-link">' . __('Pages:', 'thematic') . '&after=</div>') ?>
+						
 					</div><!-- .entry-content -->
+					
 					<?php thematic_postfooter(); ?>
+					
 				</div><!-- #post -->
 		<?php
-
+			// action hook for insterting content below #post
 			thematic_belowpost();
 	}
 } // end single_post
@@ -511,37 +744,56 @@ if (function_exists('childtheme_override_single_post'))  {
 add_action('thematic_singlepost', 'thematic_single_post');
 
 
-// The Search Loop
 if (function_exists('childtheme_override_search_loop'))  {
+	/**
+	 * @ignore
+	 */
 	function thematic_search_loop() {
 		childtheme_override_search_loop();
 	}
 } else {
+	/**
+	 * The Search loop
+	 * 
+	 * Located in search.php
+	 * 
+	 * Override: childtheme_override_search_loop
+	 */
 	function thematic_search_loop() {
 		while ( have_posts() ) : the_post(); 
-		
-				thematic_abovepost(); ?>
 
-				<div id="post-<?php the_ID();
-					echo '" ';
-					if (!(THEMATIC_COMPATIBLE_POST_CLASS)) {
-						post_class();
-						echo '>';
+				// action hook for insterting 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 '">';
+					    echo 'class="';
+					    thematic_post_class();
+					    echo '">';
 					}
-     				thematic_postheader(); ?>
+
+	            	// creating the post header
+	            	thematic_postheader();
+	            ?>
+     				
 					<div class="entry-content">
-<?php thematic_content(); ?>
+					
+						<?php thematic_content(); ?>
 
 					</div><!-- .entry-content -->
+					
 					<?php thematic_postfooter(); ?>
+					
 				</div><!-- #post -->
 
 			<?php 
-		
+				// action hook for insterting content below #post
 				thematic_belowpost();
 		
 		endwhile;
@@ -551,37 +803,56 @@ if (function_exists('childtheme_override_search_loop'))  {
 add_action('thematic_searchloop', 'thematic_search_loop');
 
 
-// The Tag Loop
 if (function_exists('childtheme_override_tag_loop'))  {
+	/**
+	 * @ignore
+	 */
 	function thematic_tag_loop() {
 		childtheme_override_tag_loop();
 	}
 } else {
+	/**
+	 * The Tag loop
+	 * 
+	 * Located in tag.php
+	 * 
+	 * Override: childtheme_override_tag_loop
+	 */
 	function thematic_tag_loop() {
-		while (have_posts()) : the_post(); 
-		
-				thematic_abovepost(); ?>
+		while ( have_posts() ) : the_post(); 
 
-				<div id="post-<?php the_ID();
-					echo '" ';
-					if (!(THEMATIC_COMPATIBLE_POST_CLASS)) {
-						post_class();
-						echo '>';
+				// action hook for insterting 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 '">';
+					    echo 'class="';
+					    thematic_post_class();
+					    echo '">';
 					}
-     				thematic_postheader(); ?>
+
+	            	// creating the post header
+	            	thematic_postheader();
+	            ?>
+     				
 					<div class="entry-content">
-<?php thematic_content() ?>
+					
+						<?php thematic_content(); ?>
 
 					</div><!-- .entry-content -->
+					
 					<?php thematic_postfooter(); ?>
+					
 				</div><!-- #post -->
 
 			<?php 
-		
+				// action hook for insterting content below #post
 				thematic_belowpost();
 		
 		endwhile;
@@ -591,7 +862,11 @@ if (function_exists('childtheme_override_tag_loop'))  {
 add_action('thematic_tagloop', 'thematic_tag_loop');
 
 
-// Filter to create the time url title displayed in Post Header
+/**
+ * Filter: thematic_time_title
+ * 
+ * Create the time url title displayed in the post header
+ */
 function thematic_time_title() {
 
 	$time_title = 'Y-m-d\TH:i:sO';
@@ -603,7 +878,11 @@ function thematic_time_title() {
 } // end time_title
 
 
-// Filter to create the time displayed in Post Header
+/**
+ * Filter: thematic_time_display
+ * 
+ * Create the time displayed in the post header
+ */
 function thematic_time_display() {
 
 	$time_display = get_option('date_format');
@@ -615,12 +894,20 @@ function thematic_time_display() {
 } // end time_display
 
 
-// Information in Post Header
 if (function_exists('childtheme_override_postheader'))  {
+	/**
+	 * @ignore
+	 */
 	function thematic_postheader() {
 		childtheme_override_postheader();
 	}
 } else {
+	/**
+	 * Create the post header
+	 * 
+	 * Override: childtheme_override_postheader <br>
+	 * Filter: thematic_postheader
+	 */
 	function thematic_postheader() {
  	   
  	   global $post;
@@ -636,17 +923,25 @@ if (function_exists('childtheme_override_postheader'))  {
 }  // end postheader
 
 
-// Create the post edit link
 if (function_exists('childtheme_override_postheader_posteditlink'))  {
+	/**
+	 * @ignore
+	 */
 	function thematic_postheader_posteditlink() {
 		return childtheme_override_postheader_posteditlink(); 
 	}
 } else {
+	/**
+	 * Create the post edit link
+	 * 
+	 * Override: childtheme_override_postheader_posteditlink <br>
+	 * Filter: thematic_postheader_posteditlink
+	 */
 	function thematic_postheader_posteditlink() {
     	
     	global $id;
     
-		$posteditlink = '<a href="' . get_bloginfo('wpurl') . '/wp-admin/post.php?action=edit&amp;post=' . $id;
+		$posteditlink = '<a href="' . site_url() . '/wp-admin/post.php?action=edit&amp;post=' . $id;
 		$posteditlink .= '" title="' . __('Edit post', 'thematic') .'">';
 		$posteditlink .= __('Edit', 'thematic') . '</a>';
 		
@@ -656,20 +951,29 @@ if (function_exists('childtheme_override_postheader_posteditlink'))  {
 } // end postheader_posteditlink
 
 
-// Create post title
 if (function_exists('childtheme_override_postheader_posttitle'))  {
+	/**
+	 * @ignore
+	 */
 	function thematic_postheader_posttitle() {
 		return childtheme_override_postheader_posttitle();
 	}
 } else {
+	/**
+	 * Create the post title
+	 * 
+	 * Override: childtheme_override_postheader_posttitle <br>
+	 * Filter: thematic_postheader_posttitle
+	 */
 	function thematic_postheader_posttitle() {
-
+		
+		$posttitle = "\n\n\t\t\t\t\t";
 	    if (is_single() || is_page()) {
-	        $posttitle = '<h1 class="entry-title">' . get_the_title() . "</h1>\n";
+	        $posttitle .= '<h1 class="entry-title">' . get_the_title() . "</h1>\n";
 	    } elseif (is_404()) {    
-	        $posttitle = '<h1 class="entry-title">' . __('Not Found', 'thematic') . "</h1>\n";
+	        $posttitle .= '<h1 class="entry-title">' . __('Not Found', 'thematic') . "</h1>\n";
 	    } else {
-	        $posttitle = '<h2 class="entry-title"><a href="';
+	        $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');
@@ -684,22 +988,31 @@ if (function_exists('childtheme_override_postheader_posttitle'))  {
 } // end postheader_posttitle
 
 
-// Create post meta
 if (function_exists('childtheme_override_postheader_postmeta'))  {
+	/**
+	 * @ignore
+	 */
 	function thematic_postheader_postmeta() {
 		return childtheme_override_postheader_postmeta();
 	}
 } else {
+	/**
+	 * Create the post meta
+	 * 
+	 * Override: childtheme_override_postheader_postmeta <br>
+	 * Filter: thematic_postheader_postmeta
+	 */
 	function thematic_postheader_postmeta() {
-
-	    $postmeta = '<div class="entry-meta">';
-	    $postmeta .= thematic_postmeta_authorlink();
-	    $postmeta .= '<span class="meta-sep meta-sep-entry-date"> | </span>';
-	    $postmeta .= thematic_postmeta_entrydate();
+		
+		$postmeta  = "\n\t\t\t\t\t";
+	    $postmeta .= '<div class="entry-meta">' . "\n\n";
+	    $postmeta .= "\t" . thematic_postmeta_authorlink() . "\n\n";
+	    $postmeta .= "\t" . '<span class="meta-sep meta-sep-entry-date"> | </span>'. "\n\n";
+	    $postmeta .= "\t" . thematic_postmeta_entrydate() . "\n\n";
 	    
-	    $postmeta .= thematic_postmeta_editlink();
+	    $postmeta .= "\t" . thematic_postmeta_editlink() . "\n\n";
 	                   
-	    $postmeta .= "</div><!-- .entry-meta -->\n";
+	    $postmeta .= '</div><!-- .entry-meta -->' . "\n";
 	    
 	    return apply_filters('thematic_postheader_postmeta',$postmeta); 
 	
@@ -707,35 +1020,59 @@ if (function_exists('childtheme_override_postheader_postmeta'))  {
 } // end postheader_postmeta
 
 
-// Create author link for post meta
 if (function_exists('childtheme_override_postmeta_authorlink'))  {
+	/**
+	 * @ignore
+	 */
 	function thematic_postmeta_authorlink() {
 		return childtheme_override_postmeta_authorlink();
 	}
 } else {
+	/**
+	 * Create the author link for post meta
+	 * 
+	 * Override: childtheme_override_postmeta_authorlink <br>
+	 * Filter: thematic_post_meta_authorlink
+	 */
 	function thematic_postmeta_authorlink() {
-	    
-	    global $authordata;
+		global $authordata;
 	
-	    $authorlink = '<span class="meta-prep meta-prep-author">' . __('By ', 'thematic') . '</span>';
-	    $authorlink .= '<span class="author vcard">'. '<a class="url fn n" href="';
-	    $authorlink .= get_author_posts_url($authordata->ID, $authordata->user_nicename);
-	    $authorlink .= '" title="' . __('View all posts by ', 'thematic') . get_the_author_meta( 'display_name' ) . '">';
-	    $authorlink .= get_the_author_meta( 'display_name' );
-	    $authorlink .= '</a></span>';
+	    $author_open = '<span class="meta-prep meta-prep-author">' . __('By ', 'thematic') . '</span>';
+	    $author_close = '</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_credit = $author_open . $author_info . $author_close ;
 	    
-	    return apply_filters('thematic_post_meta_authorlink', $authorlink);
+	    return apply_filters('thematic_post_meta_authorlink', $author_credit);
 	   
 	}
-} // end postmeta_authorlink()
+} // end postmeta_authorlink
 
 
-// Create entry date for post meta
 if (function_exists('childtheme_override_postmeta_entrydate'))  {
+	/**
+	 * @ignore
+	 */
 	function thematic_postmeta_entrydate() {
 		return childtheme_override_postmeta_entrydate();
 	}
 } else {
+	/**
+	 * Create entry date for post meta
+	 * 
+	 * Override: childtheme_override_postmeta_entrydate <br>
+	 * Filter: thematic_post_meta_entrydate
+	 */ 
 	function thematic_postmeta_entrydate() {
 	
 	    $entrydate = '<span class="meta-prep meta-prep-entry-date">' . __('Published: ', 'thematic') . '</span>';
@@ -747,20 +1084,28 @@ if (function_exists('childtheme_override_postmeta_entrydate'))  {
 	    return apply_filters('thematic_post_meta_entrydate', $entrydate);
 	   
 	}
-} // end postmeta_entrydate()
+} // end postmeta_entrydate
 
 
-// Create edit link for post meta
 if (function_exists('childtheme_override_postmeta_editlink'))  {
+	/**
+	 * @ignore
+	 */
 	function thematic_postmeta_editlink() {
 		return childtheme_override_postmeta_editlink();
 	}
 } else {
+	/**
+	 * Create edit link for post meta
+	 * 
+	 * Override: childtheme_override_postmeta_editlink <br>
+	 * Filter: thematic_post_meta_editlink
+	 */
 	function thematic_postmeta_editlink() {
     
 	    // Display edit link
 	    if (current_user_can('edit_posts')) {
-	        $editlink = ' <span class="meta-sep meta-sep-edit">|</span> ' . '<span class="edit">' . thematic_postheader_posteditlink() . '</span>';
+	        $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);
 	    }               
 	}
@@ -769,10 +1114,21 @@ if (function_exists('childtheme_override_postmeta_editlink'))  {
 
 // Sets up the post content 
 if (function_exists('childtheme_override_content_init'))  {
+	/**
+	 * @ignore
+	 */
 	function thematic_content_init() {
 		childtheme_override_content_init();
 	}
 } else {
+	/**
+	 * Set up the post content to use excerpt or full posts
+	 * 
+	 * Uses conditional template tags to decide whether posts should be displayed using excerpts or the full content
+	 * 
+	 * Override: childtheme_override_content_init <br>
+	 * Filter: thematic_content
+	 */
 	function thematic_content_init() {
 		global $thematic_content_length;
 		
@@ -798,20 +1154,36 @@ if (function_exists('childtheme_override_content_init'))  {
 		$thematic_content_length = apply_filters('thematic_content', $content);
 		
 	}
-	add_action('thematic_abovepost','thematic_content_init');
-}
+} // end content_init
+
+add_action('thematic_abovepost','thematic_content_init');
+
 
-// Creates the post content 
 if (function_exists('childtheme_override_content'))  {
+	/**
+	 * @ignore
+	 */
 	function thematic_content() {
 		childtheme_override_content();
 	}
 } else {
+	/**
+	 * Create the post content
+	 *
+	 * Detects whether to use the full length or excerpt of a post and displays it. Post thumbnails are included on
+	 * excerpt posts.
+	 * 
+	 * Override: childtheme_override_content <br>
+	 * Filter: thematic_post_thumbs <br>
+	 * Filter: thematic_post_thumb_size <br>
+	 * Filter: thematic_post_thumb_attr <br>
+	 * Filter: thematic_post 
+	 */
 	function thematic_content() {
 		global $thematic_content_length;
 	
 		if ( strtolower($thematic_content_length) == 'full' ) {
-			$post = get_the_content(more_text());
+			$post = get_the_content( thematic_more_text() );
 			$post = apply_filters('the_content', $post);
 			$post = str_replace(']]>', ']]&gt;', $post);
 		} elseif ( strtolower($thematic_content_length) == 'excerpt') {
@@ -828,7 +1200,7 @@ if (function_exists('childtheme_override_content'))  {
 			}
 		} elseif ( strtolower($thematic_content_length) == 'none') {
 		} else {
-			$post = get_the_content(more_text());
+			$post = get_the_content( thematic_more_text() );
 			$post = apply_filters('the_content', $post);
 			$post = str_replace(']]>', ']]&gt;', $post);
 		}
@@ -837,164 +1209,253 @@ if (function_exists('childtheme_override_content'))  {
 } // end content
 
 
-// Functions that hook into thematic_archives()
-
-		// Open .archives-page
-		
-		if (function_exists('childtheme_override_archivesopen'))  {
-			function thematic_archivesopen() {
-				childtheme_override_archivesopen();
-			}
-		} else {
-			function thematic_archivesopen() { ?>
-				
-				<ul id="archives-page" class="xoxo">
-		<?php }
-		} // end archivesopen
+if (function_exists('childtheme_override_archivesopen'))  {
+	/**
+	 * @ignore
+	 */
+	function thematic_archivesopen() {
+		childtheme_override_archivesopen();
+	}
+} else {
+	/**
+	 * Open the list of archived posts in the page template Archives Page
+	 * 
+	 * Override: childtheme_override_archivesopen
+	 */
+	function thematic_archivesopen() { ?>
 		
-		add_action('thematic_archives', 'thematic_archivesopen', 1);
+		<ul id="archives-page" class="xoxo">
+<?php }
+} // end archivesopen
 
-
-		// Display the Category Archives
-		if (function_exists('childtheme_override_category_archives'))  {
-			function thematic_category_archives() {
-				childtheme_override_category_archives();
-			}
-		} else {
-			function thematic_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') ?> 
-							</ul>
-						</li>
-		<?php }
-		} // end category_archives
-		
-		add_action('thematic_archives', 'thematic_category_archives', 3);
+add_action('thematic_archives', 'thematic_archivesopen', 1);
 
 
-		// Display the Monthly Archives
-		if (function_exists('childtheme_override_monthly_archives'))  {
-			function thematic_monthly_archives() {
-				childtheme_override_monthly_archives();
-			}
-		} else {
-			function thematic_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') ?>
-							</ul>
-						</li>
-		<?php }
-		} // end monthly_archives
-		
-		add_action('thematic_archives', 'thematic_monthly_archives', 5);
-
-
-		// Close .archives-page
-		if (function_exists('childtheme_override_archivesclose'))  {
-			function thematic_archivesclose() {
-				childtheme_override_archivesclose();
-			}
-		} else {
-			function thematic_archivesclose() { ?>
-				</ul>
-		<?php }
-		} // end _archivesclose
-		
-		add_action('thematic_archives', 'thematic_archivesclose', 9);
+if (function_exists('childtheme_override_category_archives'))  {
+	/**
+	 * @ignore
+	 */
+	function thematic_category_archives() {
+		childtheme_override_category_archives();
+	}
+} else {
+	/**
+	 * Display category archives 
+	 * 
+	 * Added to the archive list on the page template Archives Page
+	 * 
+	 * Override: childtheme_override_category_archives
+	 */
+	function thematic_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') ?> 
+					</ul>
+				</li>
+<?php }
+} // end category_archives
+
+add_action('thematic_archives', 'thematic_category_archives', 3);
+
+
+if (function_exists('childtheme_override_monthly_archives'))  {
+	/**
+	 * @ignore
+	 */
+	function thematic_monthly_archives() {
+		childtheme_override_monthly_archives();
+	}
+} else {
+	/**
+	 * Display monthly archives 
+	 * 
+	 * Added to the archive list on the page template Archives Page
+	 * 
+	 * Override: childtheme_override_monthly_archives
+	 */
+	function thematic_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') ?>
+					</ul>
+				</li>
+<?php }
+} // end monthly_archives
+
+add_action('thematic_archives', 'thematic_monthly_archives', 5);
+
+
+ if (function_exists('childtheme_override_archivesclose'))  {
+	/**
+	 * @ignore
+	 */
+	function thematic_archivesclose() {
+		childtheme_override_archivesclose();
+	}
+} else {
+	/**
+	 * Close the archive list used in the page template Archives Page
+	 * 
+	 * Override: childtheme_override_archivesclose
+	 */
+	function thematic_archivesclose() { ?>
+		</ul>
+<?php }
+} // end _archivesclose
+
+add_action('thematic_archives', 'thematic_archivesclose', 9);
 		
-// End of functions that hook into thematic_archives()
 
-
-// Action hook called in 404.php
+/**
+ * Register action hook: thematic_404 
+ *
+ * Located in 404.php
+ */
 function thematic_404() {
 	do_action('thematic_404');
 } // end thematic_404
 
 
-	// 404 content injected into thematic_404
-	if (function_exists('childtheme_override_404_content'))  {
-		function thematic_404_content() {
-			childtheme_override_404_content();
-		}
-	} else {
-		function thematic_404_content() { ?>
-   			<?php thematic_postheader(); ?>
-   			
-				<div class="entry-content">
-					<p><?php _e('Apologies, but we were unable to find what you were looking for. Perhaps  searching will help.', 'thematic') ?></p>
-				</div><!-- .entry-content -->
-				
-				<form id="error404-searchform" method="get" action="<?php bloginfo('url') ?>/">
-					<div>
-						<input id="error404-s" name="s" type="text" value="<?php echo esc_html(stripslashes(get_query_var('s'))) ?>" size="40" />
-						<input id="error404-searchsubmit" name="searchsubmit" type="submit" value="<?php _e('Find', 'thematic') ?>" />
-					</div>
-				</form>
-	<?php }
-	} // end 404_content
-	
-	add_action('thematic_404','thematic_404_content');
-
-
-// creates the $more_link_text for the_content
-function more_text() {
-	$content = ''.__('Read More <span class="meta-nav">&raquo;</span>', 'thematic').'';
+if ( function_exists('childtheme_override_404_content') )  {
+	/**
+	 * @ignore
+	 */
+	function thematic_404_content() {
+		childtheme_override_404_content();
+	}
+} else {
+	/**
+	 * Create the content for the 404 Error page
+	 * 
+	 * Located in 404.php
+	 * Override: childtheme_override_404_content
+	 */
+	function thematic_404_content() { ?>
+  			<?php thematic_postheader(); ?>
+  			
+			<div class="entry-content">
+				<p><?php _e( 'Apologies, but we were unable to find what you were looking for. Perhaps searching will help.', 'thematic' ) ?></p>
+			</div><!-- .entry-content -->
+			
+			<form id="error404-searchform" method="get" action="<?php echo home_url(); ?>/">
+				<div>
+					<input id="error404-s" name="s" type="text" value="<?php the_search_query(); ?>" size="40" />
+					<input id="error404-searchsubmit" name="searchsubmit" type="submit" value="<?php esc_attr_e( 'Find', 'thematic' ); ?>" />
+				</div>
+			</form>
+<?php }
+} // end 404_content
+
+add_action( 'thematic_404','thematic_404_content' );
+
+
+/**
+ * Create the $more_link_text for the_content
+ * 
+ * Used on posts that are divided using the more tag in post editor
+ * 
+ * Filter: more_text
+ *
+ */
+function thematic_more_text() {
+	$content = sprintf ( __('Read More %s', 'thematic'),  '<span class="meta-nav">&raquo;</span>' ) ;
 	return apply_filters('more_text', $content);
-} // end more_text
+} // end thematic_more_text
 
 
-// creates the $more_link_text for the_content
-function list_bookmarks_args() {
+/**
+ * Create the arguments for wp_list_bookmarks in links.php
+ * 
+ * Filter: list_bookmarks_args
+ *
+ */
+function thematic_list_bookmarks_args() {
 	$content = 'title_before=<h2>&title_after=</h2>';
 	return apply_filters('list_bookmarks_args', $content);
-} // end list_bookmarks_args
+} // end thematic_list_bookmarks_args
 
 
-// Information in Post Footer
 if (function_exists('childtheme_override_postfooter'))  {
+	/**
+	 * @ignore
+	 */
 	function thematic_postfooter() {
 		childtheme_override_postfooter();
 	}
 } else {
+	/**
+	 * Create the post footer
+	 * 
+	 * Override: childtheme_override_postfooter <br>
+	 * Filter: thematic_postfooter
+	 */
 	function thematic_postfooter() {
+	    	    
+	    $post_type = get_post_type();
+	    $post_type_obj = get_post_type_object($post_type);
 	    
-	    global $id, $post;
-	    
-	    if ($post->post_type == 'page' && current_user_can('edit_posts')) { /* For logged-in "page" search results */
+		// Check for "Page" post-type and logged in user to show edit link
+	    if ( $post_type == 'page' && current_user_can('edit_posts') ) {
 	        $postfooter = '<div class="entry-utility">' . thematic_postfooter_posteditlink();
-	        $postfooter .= "</div><!-- .entry-utility -->\n";    
-	    } elseif ($post->post_type == 'page') { /* For logged-out "page" search results */
+	        $postfooter .= "</div><!-- .entry-utility -->\n";
+	    // Display nothing for logged out users on a "Page" post-type 
+	    } elseif ( $post_type == 'page' ) {
 	        $postfooter = '';
+	    // For post-types other than "Pages" press on
 	    } else {
-	        if (is_single()) {
-	            $postfooter = '<div class="entry-utility">' . thematic_postfooter_postcategory() . thematic_postfooter_posttags() . thematic_postfooter_postconnect();
-	        } else {
-	            $postfooter = '<div class="entry-utility">' . thematic_postfooter_postcategory() . thematic_postfooter_posttags() . thematic_postfooter_postcomments();
+	    	$postfooter = '<div class="entry-utility">';
+	        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') . '. ';
+	        	}
+	        	$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>. ';
+	    			if ( post_type_supports( $post_type, 'comments') ) {
+	            		$postfooter .= thematic_postfooter_postconnect();
+	            	}
+	        } elseif ( post_type_supports( $post_type, 'comments') ) {
+	        	$postfooter .= thematic_postfooter_posttax();
+	            $postfooter .= thematic_postfooter_postcomments();
 	        }
-	        $postfooter .= "</div><!-- .entry-utility -->\n";    
+	       	// Display edit link
+	    	if (current_user_can('edit_posts')) {
+	    		if ( !is_single() && post_type_supports( $post_type, 'comments') ) {
+	        		$postfooter .= "\n\n\t\t\t\t\t\t" . '<span class="meta-sep meta-sep-edit">|</span> ';
+	        	} 
+	        	$postfooter .= ' ' . thematic_postfooter_posteditlink();
+	    	}   
+	    	$postfooter .= "\n\n\t\t\t\t\t</div><!-- .entry-utility -->\n";    
 	    }
-	    
 	    // Put it on the screen
 	    echo apply_filters( 'thematic_postfooter', $postfooter ); // Filter to override default post footer
     }
 } // end postfooter
 
 
-// Create the post edit link
 if (function_exists('childtheme_override_postfooter_posteditlink'))  {
+	/**
+	 * @ignore
+	 */
 	function thematic_postfooter_posteditlink() {
 		return childtheme_override_postfooter_posteditlink();
 	}
 } else {
+	/**
+	 * Create the post edit link for the post footer
+	 * 
+	 * Override: childtheme_override_postfooter_posteditlink <br>
+	 * Filter: thematic_postfooter_posteditlink
+	 */
 	function thematic_postfooter_posteditlink() {
 
 	    global $id;
 	    
-	    $posteditlink = '<span class="edit"><a href="' . get_bloginfo('wpurl') . '/wp-admin/post.php?action=edit&amp;post=' . $id;
+	    $posteditlink = "\n\n\t\t\t\t\t\t" . '<span class="edit"><a href="' . site_url() . '/wp-admin/post.php?action=edit&amp;post=' . $id;
 	    $posteditlink .= '" title="' . __('Edit post', 'thematic') .'">';
 	    $posteditlink .= __('Edit', 'thematic') . '</a></span>';
 	    return apply_filters('thematic_postfooter_posteditlink',$posteditlink); 
@@ -1003,46 +1464,157 @@ if (function_exists('childtheme_override_postfooter_posteditlink'))  {
 } // end postfooter_posteditlink
 
 
-// Create post category
+if (function_exists('childtheme_override_postfooter_posttax'))  {
+	/**
+	 * @ignore
+	 */
+	function thematic_postfooter_posttax() {
+		return childtheme_override_postfooter_posttax();
+	}
+} else {
+	/**
+	 * Create the taxonomy list for the post footer
+	 * 
+	 * Lists categories, tags, and custom taxonomies
+	 * 
+	 * Override: childtheme_override_postfooter_posttax <br>
+	 * Filter: thematic_postfooter_posttax
+	 */
+	function thematic_postfooter_posttax() {		
+		
+		$post_type_tax = get_post_taxonomies();
+		$post_tax_list = ''; 
+		
+		if ( isset($post_type_tax) && $post_type_tax ) { 
+	    	foreach ( $post_type_tax as $tax  )   {
+	    		if ($tax  == 'category') {
+	    			$post_tax_list .= thematic_postfooter_postcategory();
+	    		} elseif ($tax  == 'post_tag') {
+	    			$post_tax_list .= thematic_postfooter_posttags();
+	    		} else {
+	    			$post_tax_list .= thematic_postfooter_postterms($tax);
+	    		}
+	    	}
+	    }
+		return apply_filters('thematic_postfooter_posttax',$post_tax_list); // Filter for default post terms	
+	}
+}
+
+
+if (function_exists('childtheme_override_postfooter_postterms'))  {
+	/**
+	 * @ignore
+	 */
+	function thematic_postfooter_postterms($tax) {
+		return childtheme_override_postfooter_postterms($tax);
+	}
+} else {
+	/**
+	 * Create the list of custom taxonomy terms for post footer
+	 *
+	 * Override: childtheme_override_postfooter_postterms($tax) <br>
+	 * Filter: thematic_postfooter_postterms
+	 * 
+	 * @param string $tax The taxonomy that the terms will be fetched from
+	 */
+	function thematic_postfooter_postterms($tax) {
+		global $post;
+		
+		if ($tax == 'post_format') return;
+		$tax_terms = '';	
+		$tax_obj = get_taxonomy($tax);
+		
+		if ( wp_get_object_terms($post->ID, $tax) ) {
+			$term_list = get_the_term_list( 0, $tax, '' , ', ', '' );		
+			$tax_terms = '<span class="' . $tax . '-links">';
+			
+			if ( strpos( $term_list, ',' ) ) {
+				$tax_terms .= $tax_obj->labels->name . ': ';
+			} else {
+				$tax_terms .= $tax_obj->labels->singular_name . ': ';
+			}
+			
+			$tax_terms .= $term_list;
+
+			if ( is_single() ) { 
+		 		$tax_terms .= '. ';
+		 		$tax_terms .= '</span>';
+			} else {
+				$tax_terms .= '</span>' . "\n\n\t\t\t\t\t\t" . '<span class="meta-sep meta-sep-tag-links">|</span> ';
+			}
+			
+		}
+		
+		return apply_filters('thematic_postfooter_postterms', $tax_terms ); // Filter for custom taxonomy terms
+	}
+}
+
+
 if (function_exists('childtheme_override_postfooter_postcategory'))  {
+	/**
+	 * @ignore
+	 */
 	function thematic_postfooter_postcategory() {
 		return childtheme_override_postfooter_postcategory();
 	}
 } else {
+	/**
+	 * Create the category list for post footer
+	 * 
+	 * Override: childtheme_override_postfooter_postcategory <br>
+	 * Filter: thematic_postfooter_postcategory
+	 */
 	function thematic_postfooter_postcategory() {
     
-	    $postcategory = '<span class="cat-links">';
+	    $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(', ');
 	        $postcategory .= '</span>';
+	        $posttags = get_the_tags();
+			if ( !$posttags ) {
+				$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> <span class="meta-sep meta-sep-tag-links">|</span>';
+	        $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> <span class="meta-sep meta-sep-tag-links">|</span>';
+	        $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); 
 	    
 	}
 }  // end postfooter_postcategory
 
-// Create post tags
+
 if (function_exists('childtheme_override_postfooter_posttags'))  {
+	/**
+	 * @ignore
+	 */
 	function thematic_postfooter_posttags() {
 		return childtheme_override_postfooter_posttags();
 	}
 } else {
+	/**
+	 * Create the tags list for post footer
+	 * 
+	 * Override: childtheme_override_postfooter_posttags <br>
+	 * Filter: thematic_postfooter_posttags
+	 */
 	function thematic_postfooter_posttags() {
 
-	    if (is_single()) {
-	        $tagtext = __(' and tagged', 'thematic');
-	        $posttags = get_the_tag_list("<span class=\"tag-links\"> $tagtext ",', ','</span>');
+	    if ( is_single() && !is_object_in_taxonomy( get_post_type(), 'category' ) ) {
+	        $tagtext = __(' This entry is tagged', 'thematic');
+	        $posttags = get_the_tag_list("<span class=\"tag-links\"> $tagtext ",', ','</span>. ');
+	    } elseif ( is_single() ) {
+	    	$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> <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');
-	        $posttags = get_the_tag_list("<span class=\"tag-links\"> $tagtext ",', ','</span> <span class="meta-sep meta-sep-comments-link">|</span>');
+	        $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); 
 	
@@ -1050,64 +1622,69 @@ if (function_exists('childtheme_override_postfooter_posttags'))  {
 } // end postfooter_posttags
 
 
-// Create comments link and edit link
 if (function_exists('childtheme_override_postfooter_postcomments'))  {
+	/**
+	 * @ignore
+	 */
 	function thematic_postfooter_postcomments() {
 		return childtheme_override_postfooter_postcomments();
 	}
 } else {
+	/**
+	 * Create the comments link for the post footer on archive pages
+	 * 
+	 * Override: childtheme_override_postfooter_postcomments <br>
+	 * Filter: thematic_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() . __(' Comments', 'thematic') . '</a></span>';
+				$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() . __(' Comment', 'thematic') . '</a></span>';
+	            $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>';
 	        }
 	    } else {
 	        $postcomments = ' <span class="comments-link comments-closed-link">' . __('Comments closed', 'thematic') .'</span>';
-	    }
-	    // Display edit link
-	    if (current_user_can('edit_posts')) {
-	        $postcomments .= ' <span class="meta-sep meta-sep-edit">|</span> ' . thematic_postfooter_posteditlink();
-	    }               
+	    }            
 	    return apply_filters('thematic_postfooter_postcomments',$postcomments); 
-	    
 	}
 } // end postfooter_postcomments
 
 
-// Create permalink, comments link, and RSS on single posts
 if (function_exists('childtheme_override_postfooter_postconnect'))  {
+	/**
+	 * @ignore
+	 */
 	function thematic_postfooter_postconnect() {
 		return childtheme_override_postfooter_postconnect();
 	}
 } else {
+	/**
+	 * Create the comments link for the post footer on single posts
+	 * 
+	 * Override: childtheme_override_postfooter_postconnect <br>
+	 * Filter: thematic_postfooter_postconnect
+	 */
 	function thematic_postfooter_postconnect() {
     
-	    $postconnect = __('. Bookmark the ', 'thematic') . '<a href="' . apply_filters('the_permalink', get_permalink()) . '" title="' . __('Permalink to ', 'thematic') . the_title_attribute('echo=0') . '">';
-	    $postconnect .= __('permalink', 'thematic') . '</a>.';
 	    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 = ' <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>.';
 	    } elseif (!(comments_open()) && (pings_open())) { /* Only trackbacks are open */
-	        $postconnect .= __(' Comments are closed, but you can leave a trackback: ', 'thematic');
+	        $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>.';
 	    } elseif ((comments_open()) && !(pings_open())) { /* Only comments open */
-	        $postconnect .= __(' Trackbacks are closed, but you can ', 'thematic');
+	        $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>.';
 	    } elseif (!(comments_open()) && !(pings_open())) { /* Comments and trackbacks closed */
-	        $postconnect .= __(' Both comments and trackbacks are currently closed.', 'thematic');
-	    }
-	    // Display edit link on single posts
-	    if (current_user_can('edit_posts')) {
-	        $postconnect .= ' ' . thematic_postfooter_posteditlink();
+	        $postconnect = __(' Both comments and trackbacks are currently closed.', 'thematic');
 	    }
 	    return apply_filters('thematic_postfooter_postconnect',$postconnect); 
 	}
@@ -1116,10 +1693,22 @@ if (function_exists('childtheme_override_postfooter_postconnect'))  {
 
 // Action to create the below navigation
 if (function_exists('childtheme_override_nav_below'))  {
+	/**
+	 * @ignore
+	 */
 	function thematic_nav_below() {
 		childtheme_override_nav_below();
 	}
 } else {
+	/**
+	 * Create the below navigation
+	 * 
+	 * Provides compatibility with WP-PageNavi plugin
+	 * 
+	 * Override: childtheme_override_nav_below
+	 * 
+	 * @link http://wordpress.org/extend/plugins/wp-pagenavi/ WP-PageNavi Plugin Page
+	 */
 	function thematic_nav_below() {
 		if (is_single()) { ?>
 
@@ -1148,46 +1737,79 @@ if (function_exists('childtheme_override_nav_below'))  {
 add_action('thematic_navigation_below', 'thematic_nav_below', 2);
 
 
-// Creates the previous_post_link
 if (function_exists('childtheme_override_previous_post_link'))  {
+	/**
+	 * @ignore
+	 */
 	function thematic_previous_post_link() {
 		childtheme_override_previous_post_link();
 	}
 } else {
+	/**
+	 * Create the previous post link on single pages
+	 * 
+	 * Override: childtheme_override_previous_post_link
+	 * Filter: thematic_previous_post_link_args
+	 */
 	function thematic_previous_post_link() {
-		$args = array ('format'              => '%link',
-									 'link'                => '<span class="meta-nav">&laquo;</span> %title',
-									 'in_same_cat'         => FALSE,
-									 'excluded_categories' => '');
+	
+		$args = array ( 
+			'format'              => '%link',
+			'link'                => '<span class="meta-nav">&laquo;</span> %title',
+			'in_same_cat'         => FALSE,
+			'excluded_categories' => ''
+		);
+						
 		$args = apply_filters('thematic_previous_post_link_args', $args );
+		
 		previous_post_link($args['format'], $args['link'], $args['in_same_cat'], $args['excluded_categories']);
 	}
 } // end previous_post_link
 
 
-// Creates the next_post_link
 if (function_exists('childtheme_override_next_post_link'))  {
+	/**
+	 * @ignore
+	 */
 	function thematic_next_post_link() {
 		childtheme_override_next_post_link();
 	}
 } else {
+	/**
+	 * Create the next post link on single pages
+	 * 
+	 * Override: childtheme_override_next_post_link
+	 * Filter: thematic_next_post_link_args
+	 */
 	function thematic_next_post_link() {
-		$args = array ('format'              => '%link',
-									 'link'                => '%title <span class="meta-nav">&raquo;</span>',
-									 'in_same_cat'         => FALSE,
-									 'excluded_categories' => '');
+		$args = array (
+			'format' => '%link',
+			'link' => '%title <span class="meta-nav">&raquo;</span>',
+			'in_same_cat' => FALSE,
+			'excluded_categories' => ''
+		);
+		
 		$args = apply_filters('thematic_next_post_link_args', $args );
 		next_post_link($args['format'], $args['link'], $args['in_same_cat'], $args['excluded_categories']);
 	}
 } // end next_post_link
 
 
-// Produces an avatar image with the hCard-compliant photo class for author info
 if (function_exists('childtheme_override_author_info_avatar'))  {
+	/**
+	 * @ignore
+	 */
 	function thematic_author_info_avatar() {
 		childtheme_override_author_info_avatar();
 	}
 } else {
+	/**
+	 * Create an avatar image for the author info
+	 * 
+	 * Includes the hCard-compliant photo class on the image. Located in author.php
+	 * 
+	 * Override: childtheme_override_author_info_avatar
+	 */
 	function thematic_author_info_avatar() {
     
 	    global $wp_query; $curauth = $wp_query->get_queried_object();
@@ -1199,12 +1821,21 @@ if (function_exists('childtheme_override_author_info_avatar'))  {
 } // end author_info_avatar
 
 
-// For category lists on category archives: Returns other categories except the current one (redundant)
 if (function_exists('childtheme_override_cats_meow'))  {
+	/**
+	 * @ignore
+	 */
 	function thematic_cats_meow() {
 		return childtheme_override_cats_meow();
 	}
 } else {
+	/**
+	 * Create a category list with all categories except the current one
+	 * 
+	 * Used in post footer on category archives (redundant)
+	 * 
+	 * Override: childtheme_override_cats_meow
+	 */
 	function thematic_cats_meow($glue) {
 		$current_cat = single_cat_title( '', false );
 		$separator = "\n";
@@ -1223,12 +1854,21 @@ if (function_exists('childtheme_override_cats_meow'))  {
 } // end cats_meow
 
 
-// For tag lists on tag archives: Returns other tags except the current one (redundant)
 if (function_exists('childtheme_override_tag_ur_it'))  {
+	/**
+	 * @ignore
+	 */
 	function thematic_tag_ur_it() {
 		return childtheme_override_tag_ur_it();
 	}
 } else {
+	/**
+	 * Create a tag list with all tags except the current one
+	 * 
+	 * Used in post footer on tag archives (redundant)
+	 * 
+	 * Override: childtheme_override_tag_ur_it
+	 */
 	function thematic_tag_ur_it($glue) {
 		$current_tag = single_tag_title( '', '',  false );
 		$separator = "\n";
@@ -1242,7 +1882,7 @@ if (function_exists('childtheme_override_tag_ur_it'))  {
 		if ( empty($tags) )
 			return false;
 		
-		return trim(join( $glue, $tags ));
+		return trim( join( $glue, $tags ) );
 	}
 } // end thematic_tag_ur_it
 
diff --git a/wp-content/themes/thematic/library/extensions/discussion-extensions.php b/wp-content/themes/thematic/library/extensions/discussion-extensions.php
index 2c101f822e022d99f58e98397cb9d32107124c88..696a260dbdc855ea2d0639e8f67217b92a8441b4 100644
--- a/wp-content/themes/thematic/library/extensions/discussion-extensions.php
+++ b/wp-content/themes/thematic/library/extensions/discussion-extensions.php
@@ -1,13 +1,27 @@
 <?php
-
-// Located in discussion.php
-// after comment-author
+/**
+ * Discussion Extensions
+ *
+ * @package ThematicCoreLibrary
+ * @subpackage DiscussionExtensions
+ */
+ 
 if (function_exists('childtheme_override_commentmeta'))  {
+	/**
+	 * @ignore
+	 */
 	function thematic_commentmeta() {
 		childtheme_override_commentmeta();
 	}
 } else {
-	// Creates comment meta
+	/**
+	 * Create comment meta
+	 * 
+	 * Located in discussion.php
+	 * 
+	 * Override: childtheme_override_commentmeta <br>
+	 * Filter: thematic_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' ),
@@ -18,7 +32,7 @@ if (function_exists('childtheme_override_commentmeta'))  {
 		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>',
 						get_edit_comment_link(),
-						__( 'Edit comment' ),
+						__( 'Edit comment' , 'thematic' ),
 						__( 'Edit', 'thematic' ) );
 			}
 		
@@ -29,16 +43,22 @@ if (function_exists('childtheme_override_commentmeta'))  {
 	} // end thematic_commentmeta
 }
 
-
-// Located in discussion.php
-// At the beginning of li#comment-[id]. Note that this is *per comment*.
+/**
+ * Register action hook: thematic_abovecomment
+ * 
+ * Located in discussion.php, at the beginning of the li#comment-[id] element.
+ * Note that this is *per comment*
+ */
 function thematic_abovecomment() {
 	do_action('thematic_abovecomment');
 }
 
-
-// Located in discussion.php
-// Just after the comment reply link. Note that this is *per comment*.
+/**
+ * Register action hook: thematic_belowcomment
+ * 
+ * Located discussion.php, just after the comment reply link.
+ * Note that this is *per comment*:
+ */
 function thematic_belowcomment() {
 	do_action('thematic_belowcomment');
 }
diff --git a/wp-content/themes/thematic/library/extensions/discussion.php b/wp-content/themes/thematic/library/extensions/discussion.php
index 4a1deb3c8817c93284afb6df342b14307a8ebc7b..8a0606759e0bd3f18b2378a2adce92fcdcab2814 100644
--- a/wp-content/themes/thematic/library/extensions/discussion.php
+++ b/wp-content/themes/thematic/library/extensions/discussion.php
@@ -1,46 +1,104 @@
 <?php
-
-// Custom callback to list comments in the Thematic style
+/**
+ * Discussion
+ *
+ * @package ThematicCoreLibrary
+ * @subpackage Discussion
+ */
+ 
+/**
+ * Custom callback function to list comments in the Thematic style. 
+ * 
+ * If you want to use your own comments callback for wp_list_comments, filter list_comments_arg
+ *
+ * @param object $comment 
+ * @param array $args 
+ * @param int $depth 
+ */
 function thematic_comments($comment, $args, $depth) {
     $GLOBALS['comment'] = $comment;
 	$GLOBALS['comment_depth'] = $depth;
-    ?>
-    	<li id="comment-<?php comment_ID() ?>" class="<?php thematic_comment_class() ?>">
-    		<?php thematic_abovecomment() ?>
+?>
+    
+       	<li id="comment-<?php comment_ID() ?>" <?php comment_class() ?>>
+    	
+    		<?php 
+    			// action hook for inserting content above #comment
+    			thematic_abovecomment();
+    		?>
+    		
     		<div class="comment-author vcard"><?php thematic_commenter_link() ?></div>
-    		<?php thematic_commentmeta(TRUE); ?>
-    <?php if ($comment->comment_approved == '0') _e("\t\t\t\t\t<span class='unapproved'>Your comment is awaiting moderation.</span>\n", 'thematic') ?>
+    		
+    			<?php thematic_commentmeta(TRUE); ?>
+    		
+    			<?php  
+    				if ( $comment->comment_approved == '0' ) {
+    					echo "\t\t\t\t\t" . '<span class="unapproved">';
+    					_e( 'Your comment is awaiting moderation', 'thematic' );
+    					echo ".</span>\n";
+    				}
+    			?>
+    			
             <div class="comment-content">
+            
         		<?php comment_text() ?>
+        		
     		</div>
+    		
 			<?php // echo the comment reply link with help from Justin Tadlock http://justintadlock.com/ and Will Norris http://willnorris.com/
-				if($args['type'] == 'all' || get_comment_type() == 'comment') :
-					comment_reply_link(array_merge($args, array(
-						'reply_text' => __('Reply','thematic'), 
-						'login_text' => __('Log in to reply.','thematic'),
-						'depth' => $depth,
-						'before' => '<div class="comment-reply-link">', 
-						'after' => '</div>'
+				
+				if( $args['type'] == 'all' || get_comment_type() == 'comment' ) :
+					comment_reply_link( array_merge( $args, array(
+						'reply_text' => __( 'Reply','thematic' ), 
+						'login_text' => __( 'Log in to reply.','thematic' ),
+						'depth'      => $depth,
+						'before'     => '<div class="comment-reply-link">', 
+						'after'      => '</div>'
 					)));
 				endif;
 			?>
-			<?php thematic_belowcomment() ?>
+			
+			<?php
+				// action hook for inserting content above #comment
+				thematic_belowcomment() 
+			?>
+
 <?php }
 
-// Custom callback to list pings in the Thematic style
+/**
+ * Custom callback to list pings in the Thematic style
+ *
+ * @param object $comment 
+ * @param array $args 
+ * @param int $depth 
+ */
 function thematic_pings($comment, $args, $depth) {
-       $GLOBALS['comment'] = $comment;
-        ?>
-    		<li id="comment-<?php comment_ID() ?>" class="<?php thematic_comment_class() ?>">
+	$GLOBALS['comment'] = $comment;
+	?>
+
+    		<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'),
     					get_comment_author_link(),
     					get_comment_date(),
     					get_comment_time() );
-    					edit_comment_link(__('Edit', 'thematic'), ' <span class="meta-sep">|</span> <span class="edit-link">', '</span>'); ?></div>
-    <?php if ($comment->comment_approved == '0') _e('\t\t\t\t\t<span class="unapproved">Your trackback is awaiting moderation.</span>\n', 'thematic') ?>
-            <div class="comment-content">
-    			<?php comment_text() ?>
-			</div>
+    					edit_comment_link(__('Edit', 'thematic'), ' <span class="meta-sep">|</span>' . "\n\n\t\t\t\t\t\t" . '<span class="edit-link">', '</span>'); ?>
+    			</div>
+    			
+    			<?php 
+    				if ($comment->comment_approved == '0') {
+    				echo "\t\t\t\t\t" . '<span class="unapproved">';
+    					_e( 'Your trackback is awaiting moderation', 'thematic' );
+    					
+    				echo ".</span>\n";
+    				}
+    			?>
+    			
+            	<div class="comment-content">
+            	
+    				<?php comment_text() ?>
+    				
+				</div>
+				
+
 <?php }
 
-?>
\ No newline at end of file
diff --git a/wp-content/themes/thematic/library/extensions/dynamic-classes.php b/wp-content/themes/thematic/library/extensions/dynamic-classes.php
index 94ffb63d59f08212fe2b569a5e9b489803ea9b37..f11626e88af6b6a4b7d6c859da2b026748ff3c2f 100644
--- a/wp-content/themes/thematic/library/extensions/dynamic-classes.php
+++ b/wp-content/themes/thematic/library/extensions/dynamic-classes.php
@@ -1,19 +1,32 @@
 <?php
-
-if (function_exists('childtheme_override_body'))  {
-	function thematic_body() {
+/**
+ * Dynamic Classes
+ *
+ * @package ThematicCoreLibrary
+ * @subpackage DynamicClasses
+ */
+ 
+if ( function_exists( 'childtheme_override_body' ) )  {
+	/**
+	 * @ignore
+	 */function thematic_body() {
 		childtheme_override_body();
 	}
 } else {
-	function thematic_body() {
+	/**
+	 * @ignore
+	 */function thematic_body() {
 		thematic_bodyopen();
 	}
 }
 
+/**
+ * thematic_bodyopen function
+ */
 function thematic_bodyopen() {
-    if (apply_filters('thematic_show_bodyclass',TRUE)) { 
+    if ( apply_filters( 'thematic_show_bodyclass',TRUE ) ) { 
         // Creating the body class
-    	if (!(THEMATIC_COMPATIBLE_BODY_CLASS)) { 
+    	if ( ! ( THEMATIC_COMPATIBLE_BODY_CLASS ) ) { 
     		echo '<body ';
     		body_class();
     		echo '>' . "\n\n";
@@ -27,33 +40,39 @@ function thematic_bodyopen() {
     }
 }
 
-if (function_exists('childtheme_override_body_class'))  {
-	function thematic_body_class() {
+if ( function_exists( 'childtheme_override_body_class' ) )  {
+	/**
+	 * @ignore
+	 */function thematic_body_class() {
 		childtheme_override_body_class();
 	}
 } else {
-	// Generates semantic classes for BODY element
+	/**
+	 * Generates semantic classes for BODY element
+	 *
+	 * @param bool $print (default: true)
+	 */
 	function thematic_body_class( $print = true ) {
 		global $wp_query, $current_user, $blog_id, $post, $taxonomy;
 	    
 	    $c = array();
 	
-		if (apply_filters('thematic_show_bc_wordpress', TRUE)) {
+		if ( apply_filters('thematic_show_bc_wordpress', TRUE ) ) {
 	        // It's surely a WordPress blog, right?
 	        $c[] = 'wordpress';
 	    }
 	    
-	    if (apply_filters('thematic_show_bc_blogid', TRUE)) {
+	    if ( apply_filters( 'thematic_show_bc_blogid', TRUE) ) {
 	    	// Applies the blog id to BODY element .. blog-id1 for WordPress < 3.0
 	    	$c[] = 'blogid-' . $blog_id;
 	    }
 	
-		if (apply_filters('thematic_show_bc_datetime', TRUE)) {
+		if ( apply_filters( 'thematic_show_bc_datetime', TRUE) ) {
 	        // Applies the time- and date-based classes (below) to BODY element
 	        thematic_date_classes( time(), $c );
 	    }
 	
-	    if (apply_filters('thematic_show_bc_contenttype', TRUE)) {
+	    if ( apply_filters( 'thematic_show_bc_contenttype', TRUE ) ) {
 	        // Generic semantic classes for what type of content is displayed
 	        is_front_page()  ? $c[] = 'home'       : null; // For the front page, if set
 	        is_home()        ? $c[] = 'blog'       : null; // For the blog posts page, if set
@@ -65,7 +84,7 @@ if (function_exists('childtheme_override_body_class'))  {
 	        is_404()         ? $c[] = 'four04'     : null; // CSS does not allow a digit as first character
 	    }
 	
-	    if (apply_filters('thematic_show_bc_singular', TRUE)) {
+	    if ( apply_filters( 'thematic_show_bc_singular', TRUE) ) {
 	        // Special classes for BODY element when a singular post
 	        if ( is_singular() ) {
 	            $c[] = 'singular';
@@ -75,7 +94,7 @@ if (function_exists('childtheme_override_body_class'))  {
 	    }
 	
 		// 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();
 	
@@ -100,11 +119,11 @@ if (function_exists('childtheme_override_body_class'))  {
 					$c[] = 's-tag-' . $tag->slug;
 
 			// Adds taxonomy classes for each term on single posts
-			$single_post_type = get_post_type_object(get_post_type($post->ID));
+			$single_post_type = get_post_type_object( get_post_type( $post->ID ) );
 			
 			// Check for post types without taxonomy inclusion
-			if ( isset($single_post_type->taxonomy) ) {
-			    if ( $tax = get_the_terms($post->ID, get_post_taxonomies() )) {
+			if ( isset( $single_post_type->taxonomy ) ) {
+			    if ( $tax = get_the_terms( $post->ID, get_post_taxonomies() ) ) {
 			    	foreach ( $tax as $term )   { 
 			    		// Remove tags and categories from results
 			    		if  ( $term->taxonomy != 'post_tag' )	{
@@ -125,22 +144,22 @@ if (function_exists('childtheme_override_body_class'))  {
 			}
 	
 			// Adds author class for the post author
-			$c[] = 's-author-' . sanitize_title_with_dashes(strtolower(get_the_author_meta('user_nicename', $post->post_author)));
+			$c[] = 's-author-' . sanitize_title_with_dashes( strtolower( get_the_author_meta( 'user_nicename', $post->post_author ) ) );
 			rewind_posts();
 			
 			// For posts with excerpts
-			if (has_excerpt())
+			if ( has_excerpt() )
 				$c[] = 's-has-excerpt';
 				
 			// For posts with comments open or closed
-			if (comments_open()) {
+			if ( comments_open() ) {
 				$c[] = 's-comments-open';		
 			} else {
 				$c[] = 's-comments-closed';
 			}
 		
 			// For posts with pings open or closed
-			if (pings_open()) {
+			if ( pings_open() ) {
 				$c[] = 's-pings-open';
 			} else {
 				$c[] = 's-pings-closed';
@@ -151,27 +170,27 @@ if (function_exists('childtheme_override_body_class'))  {
 				$c[] = 's-protected';
 		
 			// For sticky posts
-			if (is_sticky())
+			if ( is_sticky() )
 			   $c[] = 's-sticky';		
 			
 		}
 	
 		// Author name classes for BODY on author archives
-		elseif ( is_author() && apply_filters('thematic_show_bc_authorarchives', TRUE)) {
+		elseif ( is_author() && apply_filters( 'thematic_show_bc_authorarchives', TRUE ) ) {
 			$author = $wp_query->get_queried_object();
 			$c[] = 'author';
 			$c[] = 'author-' . $author->user_nicename;
 		}
 	
 		// Category name classes for BODY on category archvies
-		elseif ( is_category() && apply_filters('thematic_show_bc_categoryarchives', TRUE)) {
+		elseif ( is_category() && apply_filters( 'thematic_show_bc_categoryarchives', TRUE ) ) {
 			$cat = $wp_query->get_queried_object();
 			$c[] = 'category';
 			$c[] = 'category-' . $cat->slug;
 		}
 	
 		// Tag name classes for BODY on tag archives
-		elseif ( is_tag() && apply_filters('thematic_show_bc_tagarchives', TRUE)) {
+		elseif ( is_tag() && apply_filters('thematic_show_bc_tagarchives', TRUE ) ) {
 			$tags = $wp_query->get_queried_object();
 			$c[] = 'tag';
 			$c[] = 'tag-' . $tags->slug;
@@ -179,16 +198,16 @@ if (function_exists('childtheme_override_body_class'))  {
 		
 		// Taxonomy name classes for BODY on tag archives
 		
-		elseif ( is_tax() && apply_filters('thematic_show_bc_taxonomyarchives', TRUE)) {
+		elseif ( is_tax() && apply_filters( 'thematic_show_bc_taxonomyarchives', TRUE) ) {
 			$c[] = 'taxonomy';
 			$c[] = 'tax-' . $taxonomy;
 			$c[] = $taxonomy . '-' . strtolower(thematic_get_term_name());
 		}
 	
 		// Page author for BODY on 'pages'
-		elseif ( is_page() && apply_filters('thematic_show_bc_pages', TRUE)) {
+		elseif ( is_page() && apply_filters( 'thematic_show_bc_pages', TRUE ) ) {
 			$pageID = $wp_query->post->ID;
-			$page_children = wp_list_pages("child_of=$pageID&echo=0");
+			$page_children = wp_list_pages( "child_of=$pageID&echo=0" );
 			the_post();
 	
 	        // Adds post slug class, prefixed by 'slug-'
@@ -196,7 +215,7 @@ if (function_exists('childtheme_override_body_class'))  {
 	
 			$c[] = 'page pageid-' . $pageID;
 			
-			$c[] = 'page-author-' . sanitize_title_with_dashes(strtolower(get_the_author_meta('user_nicename', $post->post_author)));
+			$c[] = 'page-author-' . sanitize_title_with_dashes( strtolower( get_the_author_meta( 'user_nicename', $post->post_author) ) );
 			
 			// Checks to see if the page has children and/or is a child page; props to Adam
 			if ( $page_children )
@@ -205,18 +224,18 @@ if (function_exists('childtheme_override_body_class'))  {
 				$c[] = 'page-child parent-pageid-' . $wp_query->post->post_parent;
 				
 			// For pages with excerpts
-			if (has_excerpt())
+			if ( has_excerpt() )
 				$c[] = 'page-has-excerpt';
 				
 			// For pages with comments open or closed
-			if (comments_open()) {
+			if ( comments_open() ) {
 				$c[] = 'page-comments-open';		
 			} else {
 				$c[] = 'page-comments-closed';
 			}
 		
 			// For pages with pings open or closed
-			if (pings_open()) {
+			if ( pings_open() ) {
 				$c[] = 'page-pings-open';
 			} else {
 				$c[] = 'page-pings-closed';
@@ -233,7 +252,7 @@ if (function_exists('childtheme_override_body_class'))  {
 		}
 	
 		// Search classes for results or no results
-		elseif ( is_search() && apply_filters('thematic_show_bc_search', TRUE)) {
+		elseif ( is_search() && apply_filters( 'thematic_show_bc_search', TRUE ) ) {
 			the_post();
 			if ( $wp_query->found_posts > 0 ) {
 				$c[] = 'search-results';
@@ -243,20 +262,20 @@ if (function_exists('childtheme_override_body_class'))  {
 			rewind_posts();
 		}
 	
-		if (apply_filters('thematic_show_bc_loggedin', TRUE)) {
+		if ( apply_filters( 'thematic_show_bc_loggedin', TRUE ) ) {
 	        // For when a visitor is logged in while browsing
 	        if ( $current_user->ID )
 	            $c[] = 'loggedin';
 	    }
 	
 	 // Paged classes; for page x > 1 classes of index and all post types etc.
-		if (apply_filters('thematic_show_bc_pagex', TRUE)) {
-			if ( (( ( $page = $wp_query->get('paged') ) || ( $page = $wp_query->get('page') ) ) && $page > 1 ) ) {
+		if ( isset( $post ) && apply_filters( 'thematic_show_bc_pagex', TRUE ) ) {
+			if ( ( ( ( $page = $wp_query->get( 'paged' ) ) || ( $page = $wp_query->get('page') ) ) && $page > 1 ) ) {
 				// Thanks to Prentiss Riddle, twitter.com/pzriddle, for the security fix below. 
-				$page = intval($page); // Ensures that an integer (not some dangerous script) is passed for the variable
+				$page = intval( $page ); // Ensures that an integer (not some dangerous script) is passed for the variable
  					$c[] = 'paged-' . $page;
- 				if (thematic_is_custom_post_type()) {
- 							$c[] = str_replace('_','-',$post->post_type) . '-paged-' . $page;
+ 				if ( thematic_is_custom_post_type() ) {
+ 							$c[] = str_replace( '_','-',$post->post_type ) . '-paged-' . $page;
  					} elseif ( is_single() && $post->post_type=="post"  ) {
 				        $c[] = 'single-paged-' . $page;
 					} elseif ( is_page() ) {
@@ -275,9 +294,9 @@ if (function_exists('childtheme_override_body_class'))  {
 				        $c[] = 'search-paged-' . $page;
  				} 
  			// Paged classes; for page x = 1	For all post types
- 			} elseif (strpos($post->post_content, '<!--nextpage-->') )  { 
- 				if (thematic_is_custom_post_type()) {
-				    	$c[] = str_replace('_','-',$post->post_type) . '-paged-1';
+ 			} elseif ( strpos( $post->post_content, '<!--nextpage-->') )  { 
+ 				if ( thematic_is_custom_post_type() ) {
+				    	$c[] = str_replace( '_','-',$post->post_type ) . '-paged-1';
  				    } elseif (is_page()) {
 				    	$c[] = 'page-paged-1';
  				    } elseif (is_single())  {
@@ -297,18 +316,21 @@ if (function_exists('childtheme_override_body_class'))  {
 
 // Add browser CSS class to the end (queuing through priority) of the body classes 
 
-if (!(THEMATIC_COMPATIBLE_BODY_CLASS) ) {
-	add_filter('body_class', 'browser_class_names', 20);
+if ( ! ( THEMATIC_COMPATIBLE_BODY_CLASS ) ) {
+	add_filter( 'body_class', 'thematic_browser_class_names', 20 );
 	}
 	
-if (apply_filters('thematic_show_bc_browser', TRUE) ) {
-	add_filter('thematic_body_class', 'browser_class_names', 20); 
+if ( apply_filters( 'thematic_show_bc_browser', TRUE ) ) {
+	add_filter( 'thematic_body_class', 'thematic_browser_class_names', 20 ); 
 	}
 
 
 
 
-function browser_class_names($classes) {
+/**
+ * thematic_browser_class_names function.
+ */
+function thematic_browser_class_names($classes) {
 	// add 'class-name' to the $classes array
 	// $classes[] = 'class-name';
 	$browser = $_SERVER[ 'HTTP_USER_AGENT' ];
@@ -330,41 +352,64 @@ function browser_class_names($classes) {
 	// Checks browsers in this order: Chrome, Safari, Opera, MSIE, FF
 	if ( preg_match( "/Chrome/", $browser ) ) {
 		$classes[] = 'chrome';
-	
-		preg_match( "/Chrome\/(\d.\d)/si", $browser, $matches);
-		$ch_version = 'ch' . str_replace( '.', '-', $matches[1] );      
+		
+		if ( ( current_theme_supports( 'minorbrowserversion_all' )) || ( current_theme_supports( 'minorbrowserversion_ch' ) ) ) {
+			preg_match( "/Chrome\/(\d+.\d+)/si", $browser, $matches );
+			$ch_version = 'ch' . str_replace( '.', '-', $matches[1] );
+		} else {
+			preg_match( "/Chrome\/(\d+)/si", $browser, $matches );
+			$ch_version = 'ch' . $matches[1];
+		}      
 		$classes[] = $ch_version;
 	
 	} elseif ( preg_match( "/Safari/", $browser ) ) {
 		$classes[] = 'safari';
 				
-		preg_match( "/Version\/(\d.\d)/si", $browser, $matches);
-		$sf_version = 'sf' . str_replace( '.', '-', $matches[1] );      
+		if ( ( current_theme_supports( 'minorbrowserversion_all' )) || ( current_theme_supports( 'minorbrowserversion_sf' ) ) ) {
+			preg_match( "/Version\/(\d+.\d+)/si", $browser, $matches );
+			$sf_version = 'sf' . str_replace( '.', '-', $matches[1] );
+		} else {
+			preg_match( "/Version\/(\d+)/si", $browser, $matches );
+			$sf_version = 'sf' . $matches[1];
+			
+		}     
 		$classes[] = $sf_version;
 				
 	} elseif ( preg_match( "/Opera/", $browser ) ) {
 		$classes[] = 'opera';
 				
-		preg_match( "/Opera\/(\d.\d)/si", $browser, $matches);
-		$op_version = 'op' . str_replace( '.', '-', $matches[1] );      
+		if ( ( current_theme_supports( 'minorbrowserversion_all' ) ) || ( current_theme_supports( 'minorbrowserversion_op' ) ) ) {
+			preg_match( "/Version\/(\d+.\d+)/si", $browser, $matches );
+			$op_version = 'op' . str_replace( '.', '-', $matches[1] );      
+		} else {
+			preg_match( "/Version\/(\d+)/si", $browser, $matches );
+			$op_version = 'op' . $matches[1];      			
+		}
 		$classes[] = $op_version;
 				
 	} elseif ( preg_match( "/MSIE/", $browser ) ) {
 		$classes[] = 'msie';
-				
-		if( preg_match( "/MSIE 6.0/", $browser ) ) {
-			$classes[] = 'ie6';
-		} elseif ( preg_match( "/MSIE 7.0/", $browser ) ){
-			$classes[] = 'ie7';
-		} elseif ( preg_match( "/MSIE 8.0/", $browser ) ){
-			$classes[] = 'ie8';
+		
+		if ( ( current_theme_supports( 'minorbrowserversion_all' )) || ( current_theme_supports( 'minorbrowserversion_ie' ) ) ) {
+			preg_match( "/MSIE (\d+.\d+)/si", $browser, $matches );
+			$ie_version = 'ie' . str_replace( '.', '-', $matches[1] );
+		} else {
+			preg_match( "/MSIE (\d+)/si", $browser, $matches );
+			$ie_version = 'ie' . $matches[1];
+			
 		}
+		$classes[] = $ie_version;
 				
 	} elseif ( preg_match( "/Firefox/", $browser ) && preg_match( "/Gecko/", $browser ) ) {
 			$classes[] = 'firefox';
 				
-			preg_match( "/Firefox\/(\d)/si", $browser, $matches);
-			$ff_version = 'ff' . str_replace( '.', '-', $matches[1] );      
+			if ( ( current_theme_supports( 'minorbrowserversion_all' ) ) || ( current_theme_supports( 'minorbrowserversion_ff' ) ) ) {
+				preg_match( "/Firefox\/(\d+.\d+)/si", $browser, $matches );
+				$ff_version = 'ff' . str_replace( '.', '-', $matches[1] );
+			} else {
+				preg_match( "/Firefox\/(\d+)/si", $browser, $matches );
+				$ff_version = 'ff' . $matches[1];
+			}      
 			$classes[] = $ff_version;
 				
 	} else {
@@ -376,38 +421,42 @@ function browser_class_names($classes) {
 
 	
 if (function_exists('childtheme_override_post_class'))  {
-	function thematic_post_class() {
+	/**
+	 * @ignore
+	 */function thematic_post_class() {
 		childtheme_override_post_class();
 	}
 } else {
-	// Generates semantic classes for each post DIV element
+	/**
+	 * Generates semantic classes for each post DIV element
+	 */
 	function thematic_post_class( $print = true ) {
 		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]
-		$c = array( 'hentry', "p$thematic_post_alt", str_replace('_','-',$post->post_type), $post->post_status );
+		$c = array( 'hentry', "p$thematic_post_alt", str_replace( '_', '-', $post->post_type) , $post->post_status );
 	
 		// Author for the post queried
-		$c[] = 'author-' . sanitize_title_with_dashes(strtolower(get_the_author_meta('user_login')));
+		$c[] = 'author-' . sanitize_title_with_dashes( strtolower( get_the_author_meta( 'user_login' ) ) );
 	
 		// Category for the post queried
-		foreach ( (array) get_the_category() as $cat )
+		foreach ( ( array ) get_the_category() as $cat )
 			$c[] = 'category-' . $cat->slug;
 		
 		// Tags for the post queried; if not tagged, use .untagged
 		if ( get_the_tags() == null ) {
 			$c[] = 'untagged';
 		} else {
-			foreach ( (array) get_the_tags() as $tag )
+			foreach ( ( array ) get_the_tags() as $tag )
 				$c[] = 'tag-' . $tag->slug;
 		}
 		
 		if (function_exists('get_post_type_object')) {
 			// Taxonomies and terms for the post queried
-			$single_post_type = get_post_type_object(get_post_type($post->ID));
+			$single_post_type = get_post_type_object( get_post_type( $post->ID ) );
 			// Check for post types without taxonomy inclusion
 			if ( isset($single_post_type->taxonomy) ) {
-				foreach ( (array) get_the_terms( $post->ID, get_post_taxonomies() )  as $term  )   {
+				foreach ( ( array ) get_the_terms( $post->ID, get_post_taxonomies() )  as $term  )   {
 					// Remove tags and categories from results
 					if  ( $term->taxonomy != 'category' )	{
 						if  ( $term->taxonomy != 'post_tag' )   { 
@@ -426,7 +475,7 @@ if (function_exists('childtheme_override_post_class'))  {
 		// For posts displayed as excerpts
 		if ($thematic_content_length == 'excerpt') {
 			$c[] = 'is-excerpt';
-			if ( has_excerpt() && !preg_match('/<!--more(.*?)?-->/', $post->post_content) ) {
+			if ( has_excerpt() && !preg_match( '/<!--more(.*?)?-->/', $post->post_content ) ) {
 				// For wp-admin Write Page generated excerpts
 				$c[] = 'custom-excerpt';
 			} else {
@@ -440,7 +489,7 @@ if (function_exists('childtheme_override_post_class'))  {
 			$c[] = 'has-excerpt';
 			
 		//	For posts using more tag
-		if ( preg_match('/<!--more(.*?)?-->/', $post->post_content) ) {	
+		if ( preg_match( '/<!--more(.*?)?-->/', $post->post_content ) ) {	
 			if ( !is_single() ) {
 				$c[] = 'wp-teaser';
 			} elseif ( is_single() ) {
@@ -488,60 +537,45 @@ if (function_exists('childtheme_override_post_class'))  {
 	}
 }
 
-// Define the num val for 'alt' classes (in post DIV and comment LI)
+/**
+ * Define the num val for 'alt' classes (in post DIV and comment LI)
+ * 
+ * @var int  (default value: 1)
+ */
 $thematic_post_alt = 1;
 
-if (function_exists('childtheme_override_comment_class'))  {
-	function thematic_comment_class() {
-		childtheme_override_comment_class();
-	}
-} else {
-	// Generates semantic classes for each comment LI element
-	function thematic_comment_class( $print = true ) {
-		global $comment, $post, $thematic_comment_alt, $comment_depth, $comment_thread_alt;
-	
-		// Collects the comment type (comment, trackback),
-		$c = array( $comment->comment_type );
-	
-		// Counts trackbacks (t[n]) or comments (c[n])
-		if ( $comment->comment_type == 'comment' ) {
-			$c[] = "c$thematic_comment_alt";
-		} else {
-			$c[] = "t$thematic_comment_alt";
-		}
-	
-		// If the comment author has an id (registered), then print the log in name
-		if ( $comment->user_id > 0 ) {
-			$user = get_userdata($comment->user_id);
-			// For all registered users, 'byuser'; to specificy the registered user, 'commentauthor+[log in name]'
-			$c[] = 'byuser comment-author-' . sanitize_title_with_dashes(strtolower( $user->user_login ));
-			// For comment authors who are the author of the post
-			if ( $comment->user_id === $post->post_author )
-				$c[] = 'bypostauthor';
-		}
-	
-		// If it's the other to the every, then add 'alt' class; collects time- and date-based classes
-		thematic_date_classes( mysql2date( 'U', $comment->comment_date ), $c, 'c-' );
-		if ( ++$thematic_comment_alt % 2 )
-			$c[] = 'alt';
-	
-		// Comment depth
-		$c[] = "depth-$comment_depth";
-	
-		// Separates classes with a single space, collates classes for comment LI
-		$c = join( ' ', apply_filters( 'comment_class', $c ) ); // Available filter: comment_class
-	
-		// Tada again!
-		return $print ? print($c) : $c;
-	}
+
+
+/** 
+ * Adds classes to commment li's using the WordPress comment_class filter
+ *
+ * @since 1.0
+ */
+function thematic_add_comment_class($classes) {
+    global $comment, $post;
+
+    // Add time and date based classes
+    thematic_date_classes( mysql2date( 'U', $comment->comment_date ), $classes, 'thm-c-' );
+
+    // Do not duplicate values
+    return array_unique( $classes );
 }
 
-// Generates time- and date-based classes for BODY, post DIVs, and comment LIs; relative to GMT (UTC)
-if (function_exists('childtheme_override_date_classes'))  {
+add_filter( 'comment_class', 'thematic_add_comment_class', 20 );
+
+
+
+if ( function_exists( 'childtheme_override_date_classes' ) )  {
+	/**
+	 * @ignore
+	 */
 	function thematic_date_classes() {
 		childtheme_override_date_classes();
 	}
 } else {
+	/**
+	 * Generates time and date based classes relative to GMT (UTC)
+	 */
 	function thematic_date_classes( $t, &$c, $p = '' ) {
 		$t = $t + ( get_option('gmt_offset') * 3600 );
 		$c[] = $p . 'y' . gmdate( 'Y', $t ); // Year
@@ -552,4 +586,5 @@ if (function_exists('childtheme_override_date_classes'))  {
 }
 
 // Remember: Thematic, like The Sandbox, is for play.
+
 ?>
\ No newline at end of file
diff --git a/wp-content/themes/thematic/library/extensions/footer-extensions.php b/wp-content/themes/thematic/library/extensions/footer-extensions.php
index c76d3bf853e1fcac25034a053420a32d95dfcb63..7c417ce339bc34652e533734bfb9ec4515071e9e 100644
--- a/wp-content/themes/thematic/library/extensions/footer-extensions.php
+++ b/wp-content/themes/thematic/library/extensions/footer-extensions.php
@@ -1,102 +1,168 @@
 <?php
+/**
+ * Footer Extensions
+ *
+ * @package ThematicCoreLibrary
+ * @subpackage FooterExtensions
+ */
+ 
+/**
+ * Register action hook: thematic_abovemainclose
+ * 
+ * Located in footer.php, just before the closing of the main div
+ */
+function thematic_abovemainclose() {
+    do_action('thematic_abovemainclose');
+} // end thematic_belowmainsidebar
 
 
-// Located in footer.php
-// Just before the footer div
+/**
+ * Register action hook: thematic_abovefooter
+ * 
+ * Located in footer.php, just before the footer div
+ */
 function thematic_abovefooter() {
     do_action('thematic_abovefooter');
 } // end thematic_abovefooter
 
-// Located in footer.php
-// Just after the footer div
+
+/**
+ * Register action hook: thematic_footer
+ * 
+ * Located in footer.php, inside the footer div
+ */
 function thematic_footer() {
     do_action('thematic_footer');
 } // end thematic_footer
 
 
-// located in footer.php
-// the footer text can now be filtered and controlled from your own functions.php
+/**
+ * Filter: thematic_footertext
+ * 
+ * The footertext is now set in theme options. This function is obsolete. 
+ */
 function thematic_footertext($thm_footertext) {
     $thm_footertext = apply_filters('thematic_footertext', $thm_footertext);
     return $thm_footertext;
 } // end thematic_footertext
 
 
-// Located in footer.php
-// Just after the footer div
+/**
+ * Register action hook: thematic_belowfooter
+ * 
+ * Located in footer.php, just after the footer div
+ */
 function thematic_belowfooter() {
     do_action('thematic_belowfooter');
 } // end thematic_belowfooter
 
 
-// Located in footer.php 
-// Just before the closing body tag, after everything else.
+/**
+ * Register action hook: thematic_after
+ * 
+ * Located in footer.php, just before the closing body tag, after everything else.
+ */
 function thematic_after() {
     do_action('thematic_after');
 } // end thematic_after
 
 
-// Functions that hook into thematic_footer()
-	
-	if (function_exists('childtheme_override_subsidiaries'))  {
-		function thematic_subsidiaries() {
-			childtheme_override_subsidiaries();
-		}
-	} else {
-    	function thematic_subsidiaries() {
-       	 widget_area_subsidiaries();
-    	}
-    	add_action('thematic_footer', 'thematic_subsidiaries', 10);
-    }
-    
-	if (function_exists('childtheme_override_siteinfoopen'))  {
-		function thematic_siteinfoopen() {
-			childtheme_override_siteinfoopen();
-		}
-	} else {
-	    function thematic_siteinfoopen() { ?>
-    
-        <div id="siteinfo">        
+if (function_exists('childtheme_override_subsidiaries'))  {
+	/**
+	 * @ignore
+	 */
+	function thematic_subsidiaries() {
+		childtheme_override_subsidiaries();
+	}
+} else {
+	/**
+	 * Create the subsidiary widgets areas in footer
+	 * 
+	 * Override: childtheme_override_subsidiaries
+	 */
+	function thematic_subsidiaries() {
+	      	
+		// action hook for placing content above the subsidiary widget areas
+		thematic_abovesubasides();
+		
+		// action hook for creating the subsidiary widget areas
+		thematic_widget_area_subsidiaries();
+		
+		// action hook for placing content below subsidiary widget areas
+		thematic_belowsubasides();
+   	}
+}
 
-    	<?php
-    	}
-    	add_action('thematic_footer', 'thematic_siteinfoopen', 20);
-    }
-    
-	if (function_exists('childtheme_override_siteinfo'))  {
-		function thematic_siteinfo() {
-			childtheme_override_siteinfo();
-		}
-	} else {
-	    function thematic_siteinfo() {
-        	global $options, $blog_id;
-			foreach ($options as $value) {
-        		if (get_option( $value['id'] ) === FALSE) { 
-            		$$value['id'] = $value['std']; 
-        		} else {
-        			if (THEMATIC_MB) {
-            			$$value['id'] = get_blog_option( $blog_id, $value['id'] );
-					} else {
-            			$$value['id'] = get_option( $value['id'] );
-  					}
-        		}
-			}
-        	/* footer text set in theme options */
-        	echo do_shortcode(__(stripslashes(thematic_footertext($thm_footertext)), 'thematic'));
-        }
-    	add_action('thematic_footer', 'thematic_siteinfo', 30);
-    }
-    
-	if (function_exists('childtheme_override_siteinfoclose'))  {
-		function thematic_siteinfoclose() {
-			childtheme_override_siteinfoclose();
-		}
-	} else {
-	    function thematic_siteinfoclose() { ?>
-    
-		</div><!-- #siteinfo -->
+add_action('thematic_footer', 'thematic_subsidiaries', 10);
+
+
+if (function_exists('childtheme_override_siteinfoopen'))  {
+	/**
+	 * @ignore
+	 */
+	function thematic_siteinfoopen() {
+		childtheme_override_siteinfoopen();
+	}
+} else {
+	/**
+	 * Open the #siteinfo div
+	 * 
+	 * Override: childtheme_override_siteinfoopen
+	 */
+	function thematic_siteinfoopen() {
+    ?>
     
-    	<?php
-    	}
-    	add_action('thematic_footer', 'thematic_siteinfoclose', 40);
-	}
\ No newline at end of file
+	<div id="siteinfo">        
+
+   	<?php
+   	}
+}
+
+add_action('thematic_footer', 'thematic_siteinfoopen', 20);
+  
+ 
+if (function_exists('childtheme_override_siteinfo'))  {
+	/**
+	 * @ignore
+	 */
+	function thematic_siteinfo() {
+		childtheme_override_siteinfo();
+	}
+} else {
+	/**
+	 * Display the footer text from theme options within the #siteinfo div
+	 * 
+	 * Override: childtheme_override_siteinfo
+	 */
+	function thematic_siteinfo() {
+		// footer text set in theme options
+		echo "\t\t" . do_shortcode( thematic_get_theme_opt( 'footer_txt' ) ) . "\n";
+	}
+}
+
+add_action('thematic_footer', 'thematic_siteinfo', 30);
+
+   
+if (function_exists('childtheme_override_siteinfoclose'))  {
+	/**
+	 * @ignore
+	 */
+	function thematic_siteinfoclose() {
+		childtheme_override_siteinfoclose();
+	}
+} else {
+	/**
+	 * Close the #siteinfo div
+	 * 
+	 * Override: childtheme_override_siteinfoclose
+	 */
+	function thematic_siteinfoclose() {
+    ?>
+
+	</div><!-- #siteinfo -->
+	
+   	<?php
+   	}
+}
+
+add_action('thematic_footer', 'thematic_siteinfoclose', 40);
\ No newline at end of file
diff --git a/wp-content/themes/thematic/library/extensions/header-extensions.php b/wp-content/themes/thematic/library/extensions/header-extensions.php
index c9c73c9c87eacdda2b39e85e9b388ab3919c3f12..5e9a4734cc0c04ab4ea914eb413a86581ce835eb 100644
--- a/wp-content/themes/thematic/library/extensions/header-extensions.php
+++ b/wp-content/themes/thematic/library/extensions/header-extensions.php
@@ -1,351 +1,439 @@
 <?php
-
-// Creates the DOCTYPE section
+/**
+ * Header Extensions
+ *
+ * @package ThematicCoreLibrary
+ * @subpackage HeaderExtensions
+ */
+  
+
+/**
+ * Display the DOCTYPE
+ * 
+ * Filter: thematic_create_doctype
+ */
 function thematic_create_doctype() {
     $content = '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">' . "\n";
     $content .= '<html xmlns="http://www.w3.org/1999/xhtml"';
-    echo apply_filters('thematic_create_doctype', $content);
-} // end thematic_create_doctype
+    echo apply_filters( 'thematic_create_doctype', $content );
+}
 
 
-// Creates the HEAD Profile
+/**
+ * Display the HEAD profile
+ * 
+ * Filter: thematic_head_profile
+ */
 function thematic_head_profile() {
     $content = '<head profile="http://gmpg.org/xfn/11">' . "\n";
-    echo apply_filters('thematic_head_profile', $content);
-} // end thematic_head_profile
+    echo apply_filters('thematic_head_profile', $content );
+}
 
 
-// Get the page number adapted from http://efficienttips.com/wordpress-seo-title-description-tag/
-function pageGetPageNo() {
-    if (get_query_var('paged')) {
-        print ' | Page ' . get_query_var('paged');
-    }
-} // end pageGetPageNo
+/**
+ * Display the META content-type
+ * 
+ * Filter: thematic_create_contenttype
+ */
+function thematic_create_contenttype() {
+    $content = "<meta http-equiv=\"Content-Type\" content=\"";
+    $content .= get_bloginfo('html_type'); 
+    $content .= "; charset=";
+    $content .= get_bloginfo('charset');
+    $content .= "\" />";
+    $content .= "\n";
+    echo apply_filters('thematic_create_contenttype', $content);
+}
 
 
-// Located in header.php 
-// Creates the content of the Title tag
-// Credits: Tarski Theme
-if (function_exists('childtheme_override_doctitle'))  {
-    function thematic_doctitle() {
+if ( function_exists('childtheme_override_doctitle') )  {
+	/**
+	 * @ignore
+	 */
+	 function thematic_doctitle() {
     	childtheme_override_doctitle();
     }
 } else {
+	/**
+	 * Display the content of the title tag
+	 * 
+	 * Override: childtheme_override_doctitle
+	 * Filter: thematic_doctitle_separator
+	 *
+	 */
 	function thematic_doctitle() {
-		$site_name = get_bloginfo('name');
-	    $separator = '|';
-	        	
-	    if ( is_single() ) {
-	      $content = single_post_title('', FALSE);
-	    }
-	    elseif ( is_home() || is_front_page() ) { 
-	      $content = get_bloginfo('description');
-	    }
-	    elseif ( is_page() ) { 
-	      $content = single_post_title('', FALSE); 
-	    }
-	    elseif ( is_search() ) { 
-	      $content = __('Search Results for:', 'thematic'); 
-	      $content .= ' ' . esc_html(stripslashes(get_search_query()));
-	    }
-	    elseif ( is_category() ) {
-	      $content = __('Category Archives:', 'thematic');
-	      $content .= ' ' . single_cat_title("", false);;
-	    }
-	    elseif ( is_tag() ) { 
-	      $content = __('Tag Archives:', 'thematic');
-	      $content .= ' ' . thematic_tag_query();
-	    }
-	    elseif ( is_404() ) { 
-	      $content = __('Not Found', 'thematic'); 
-	    }
-	    else { 
-	      $content = get_bloginfo('description');
-	    }
-	
-	    if (get_query_var('paged')) {
-	      $content .= ' ' .$separator. ' ';
-	      $content .= 'Page';
-	      $content .= ' ';
-	      $content .= get_query_var('paged');
-	    }
-	
-	    if($content) {
-	      if ( is_home() || is_front_page() ) {
-	          $elements = array(
-	            'site_name' => $site_name,
-	            'separator' => $separator,
-	            'content' => $content
-	          );
-	      }
-	      else {
-	          $elements = array(
-	            'content' => $content
-	          );
-	      }  
-	    } else {
-	      $elements = array(
-	        'site_name' => $site_name
-	      );
-	    }
-	
-	    // Filters should return an array
-	    $elements = apply_filters('thematic_doctitle', $elements);
-		
-	    // But if they don't, it won't try to implode
-	    if(is_array($elements)) {
-	      $doctitle = implode(' ', $elements);
-	    }
-	    else {
-	      $doctitle = $elements;
-	    }
-	    
-	    $doctitle = "\t" . "<title>" . $doctitle . "</title>" . "\n\n";
-	    
-	    echo $doctitle;
+        $separator = apply_filters('thematic_doctitle_separator', '|');
+        $doctitle = '<title>' . wp_title( $separator, false, 'right' ) . '</title>' . "\n";
+        echo $doctitle;
 	} // end thematic_doctitle
 }
 
-// Creates the content-type section
-function thematic_create_contenttype() {
-    $content  = "\t";
-    $content .= "<meta http-equiv=\"Content-Type\" content=\"";
-    $content .= get_bloginfo('html_type'); 
-    $content .= "; charset=";
-    $content .= get_bloginfo('charset');
-    $content .= "\" />";
-    $content .= "\n\n";
-    echo apply_filters('thematic_create_contenttype', $content);
-} // end thematic_create_contenttype
+	
+/**
+ * Filters wp_title returning the doctitle contents
+ * Located in header.php Credits: Tarski Theme
+ * 
+ * Override: childtheme_override_doctitle
+ * Filter: thematic_doctitle_separator
+ * Filter: thematic_doctitle
+ *
+ * @since 1.0.2
+ */
+function thematic_wptitle( $wp_doctitle, $separator, $sep_location ) { 
+	// return original string if on feed or if a seo plugin is being used
+    if ( is_feed() || !thematic_seo() )
+    	return $wp_doctitle;
+   	// otherwise...	
+   	$site_name = get_bloginfo('name' , 'display');
+        	
+    if ( is_single() ) {
+      $content = single_post_title('', FALSE);
+    }
+    elseif ( is_home() || is_front_page() ) { 
+      $content = get_bloginfo('description', 'display');
+    }
+    elseif ( is_page() ) { 
+      $content = single_post_title('', FALSE); 
+    }
+    elseif ( is_search() ) { 
+      $content = __('Search Results for:', 'thematic'); 
+      $content .= ' ' . get_search_query();
+    }
+    elseif ( is_category() ) {
+      $content = __('Category Archives:', 'thematic');
+      $content .= ' ' . single_cat_title('', FALSE);;
+    }
+    elseif ( is_tag() ) { 
+      $content = __('Tag Archives:', 'thematic');
+      $content .= ' ' . thematic_tag_query();
+    }
+    elseif ( is_404() ) { 
+      $content = __('Not Found', 'thematic'); 
+    }
+    else { 
+      $content = get_bloginfo('description', 'display');
+    }
+    
+    if ( get_query_var('paged') ) {
+      $content .= ' ' .$separator. ' ';
+      $content .= 'Page';
+      $content .= ' ';
+      $content .= get_query_var('paged');
+    }
+    
+    if($content) {
+      if ( is_home() || is_front_page() ) {
+          $elements = array(
+            'site_name' => $site_name,
+            'separator' => $separator,
+            'content' 	=> $content
+          );
+      }
+      else {
+          $elements = array(
+            'content' => $content
+          );
+      }  
+    } else {
+      $elements = array(
+        'site_name' => $site_name
+      );
+    }
+    
+    // Filters should return an array
+    $elements = apply_filters('thematic_doctitle', $elements);
+       
+    // But if they don't, it won't try to implode
+    if( is_array($elements) ) {
+        $thematic_doctitle = implode(' ', $elements);
+    } else {
+   	    $thematic_doctitle = $elements;
+    }
+   	
+    return $thematic_doctitle;
+}
+
+add_filter( 'wp_title', 'thematic_wptitle', 10, 3);
+
 
-// The master switch for SEO functions
+/**
+ * Switch Thematic's SEO functions on or off
+ * 
+ * Provides compatibility with SEO plugins: All in One SEO Pack, HeadSpace, 
+ * Platinum SEO Pack, wpSEO and Yoast SEO. Default: ON
+ * 
+ * Filter: thematic_seo
+ */
 function thematic_seo() {
-		$content = TRUE;
-		return apply_filters('thematic_seo', $content);
+	if ( class_exists('All_in_One_SEO_Pack') || class_exists('HeadSpace_Plugin') || class_exists('Platinum_SEO_Pack') || class_exists('wpSEO') || defined('WPSEO_VERSION') ) {
+		$content = FALSE;
+	} else {
+		$content = true;
+	}
+		return apply_filters( 'thematic_seo', $content );
 }
 
-// Creates the canonical URL
-function thematic_canonical_url() {
-		if (thematic_seo()) {
-    		if ( is_singular() ) {
-        		$canonical_url = "\t";
-        		$canonical_url .= '<link rel="canonical" href="' . get_permalink() . '" />';
-        		$canonical_url .= "\n\n";        
-        		echo apply_filters('thematic_canonical_url', $canonical_url);
-				}
-    }
-} // end thematic_canonical_url
-
 
-// switch use of thematic_the_excerpt() - default: ON
+/**
+ * Switch use of thematic_the_excerpt() in the meta-tag description
+ * 
+ * Default: ON
+ * 
+ * Filter: thematic_use_excerpt
+ */
 function thematic_use_excerpt() {
     $display = TRUE;
     $display = apply_filters('thematic_use_excerpt', $display);
     return $display;
-} // end thematic_use_excerpt
+}
 
 
-// switch use of thematic_the_excerpt() - default: OFF
+/**
+ * Switch use of thematic_use_autoexcerpt() in the meta-tag description
+ * 
+ * Default: OFF
+ * 
+ * Filter: thematic_use_autoexcerpt
+ */
 function thematic_use_autoexcerpt() {
     $display = FALSE;
     $display = apply_filters('thematic_use_autoexcerpt', $display);
     return $display;
-} // end thematic_use_autoexcerpt
+}
 
 
-// Creates the meta-tag description
+/**
+ * Display the meta-tag description
+ * 
+ * This can be switched on or off using thematic_show_description
+ * 
+ * Filter: thematic_create_description
+ */
 function thematic_create_description() {
-		$content = '';
-		if (thematic_seo()) {
-    		if (is_single() || is_page() ) {
-      		  if ( have_posts() ) {
-          		  while ( have_posts() ) {
-            		    the_post();
-										if (thematic_the_excerpt() == "") {
-                    		if (thematic_use_autoexcerpt()) {
-                        		$content ="\t";
-														$content .= "<meta name=\"description\" content=\"";
-                        		$content .= thematic_excerpt_rss();
-                        		$content .= "\" />";
-                        		$content .= "\n\n";
-                    		}
-                		} else {
-                    		if (thematic_use_excerpt()) {
-                        		$content ="\t";
-                        		$content .= "<meta name=\"description\" content=\"";
-                        		$content .= thematic_the_excerpt();
-                        		$content .= "\" />";
-                        		$content .= "\n\n";
-                    		}
-                		}
-            		}
-        		}
-    		} elseif ( is_home() || is_front_page() ) {
-        		$content ="\t";
-        		$content .= "<meta name=\"description\" content=\"";
-        		$content .= get_bloginfo('description');
-        		$content .= "\" />";
-        		$content .= "\n\n";
-    		}
-    		echo apply_filters ('thematic_create_description', $content);
-		}
+	$content = '';
+	if ( thematic_seo() ) {
+    	if ( is_single() || is_page() ) {
+      		if ( have_posts() ) {
+          		while ( have_posts() ) {
+            		the_post();
+					if ( thematic_the_excerpt() == "" ) {
+                        if ( thematic_use_autoexcerpt() ) {
+					    	$content = '<meta name="description" content="';
+                    		$content .= thematic_excerpt_rss();
+                    		$content .= '" />';
+                    		$content .= "\n";
+                        }
+                	} else {
+                        if ( thematic_use_excerpt() ) {
+                    		$content = '<meta name="description" content="';
+                    		$content .= thematic_the_excerpt();
+                    		$content .= '" />';
+                    		$content .= "\n";
+                        }
+                	}
+            	}
+        	}
+        } elseif ( is_home() || is_front_page() ) {
+    		$content = '<meta name="description" content="';
+    		$content .= get_bloginfo( 'description', 'display' );
+    		$content .= '" />';
+    		$content .= "\n";
+        }
+        echo apply_filters ('thematic_create_description', $content);
+	}
 } // end thematic_create_description
 
 
-// meta-tag description is switchable using a filter
+/**
+ * Switch creating the meta-tag description
+ * 
+ * Default: ON
+ * 
+ * Filter: thematic_show_description
+ */
 function thematic_show_description() {
     $display = TRUE;
     $display = apply_filters('thematic_show_description', $display);
-    if ($display) {
+    if ( $display ) {
         thematic_create_description();
     }
 } // end thematic_show_description
 
 
-// create meta-tag robots
+/**
+ * Create the robots meta-tag
+ * 
+ * This can be switched on or off using thematic_show_robots
+ * 
+ * Filter: thematic_create_robots
+ */
 function thematic_create_robots() {
         global $paged;
-		if (thematic_seo()) {
-    		$content = "\t";
-    		if((is_home() && ($paged < 2 )) || is_front_page() || is_single() || is_page() || is_attachment()) {
-				$content .= "<meta name=\"robots\" content=\"index,follow\" />";
-    		} elseif (is_search()) {
-        		$content .= "<meta name=\"robots\" content=\"noindex,nofollow\" />";
+		if ( thematic_seo() ) {
+    		if ( ( is_home() && ( $paged < 2 ) ) || is_front_page() || is_single() || is_page() || is_attachment() ) {
+				$content = '<meta name="robots" content="index,follow" />';
+    		} elseif ( is_search() ) {
+        		$content = '<meta name="robots" content="noindex,nofollow" />';
     		} else {	
-        		$content .= "<meta name=\"robots\" content=\"noindex,follow\" />";
+        		$content = '<meta name="robots" content="noindex,follow" />';
     		}
-    		$content .= "\n\n";
-    		if (get_option('blog_public')) {
+    		$content .= "\n";
+    		if ( get_option('blog_public') ) {
     				echo apply_filters('thematic_create_robots', $content);
     		}
 		}
 } // end thematic_create_robots
 
 
-// meta-tag robots is switchable using a filter
+/**
+ * Switch creating the robots meta-tag
+ * 
+ * Default: ON
+ * 
+ * Filter: thematic_show_robots
+ */
 function thematic_show_robots() {
     $display = TRUE;
     $display = apply_filters('thematic_show_robots', $display);
-    if ($display) {
+    if ( $display ) {
         thematic_create_robots();
     }
 } // end thematic_show_robots
 
-
-// Located in header.php
-// creates link to style.css
-function thematic_create_stylesheet() {
-    $content = "\t";
-    $content .= "<link rel=\"stylesheet\" type=\"text/css\" href=\"";
-    $content .= get_bloginfo('stylesheet_url');
-    $content .= "\" />";
-    $content .= "\n\n";
-    echo apply_filters('thematic_create_stylesheet', $content);
-}
-
-
-// rss usage is switchable using a filter
+/**
+ * Display links to RSS feed
+ * 
+ * This can be switched on or off using thematic_show_rss. Default: ON
+ * 
+ * Filter: thematic_show_rss
+ * Filter: thematic_rss
+ */
 function thematic_show_rss() {
     $display = TRUE;
     $display = apply_filters('thematic_show_rss', $display);
     if ($display) {
-        $content = "\t";
-        $content .= "<link rel=\"alternate\" type=\"application/rss+xml\" href=\"";
-        $content .= get_bloginfo('rss2_url');
-        $content .= "\" title=\"";
-        $content .= esc_html(get_bloginfo('name'));
-        $content .= " " . __('Posts RSS feed', 'thematic');
-        $content .= "\" />";
+        $content = '<link rel="alternate" type="application/rss+xml" href="';
+        $content .= get_feed_link('rss2_url');
+        $content .= '" title="';
+        $content .= esc_attr( get_bloginfo('name', 'display') );
+        $content .= ' ' . __('Posts RSS feed', 'thematic');
+        $content .= '" />';
         $content .= "\n";
         echo apply_filters('thematic_rss', $content);
     }
-} // end thematic_show_rss
+}
 
 
-// comments rss usage is switchable using a filter
+/**
+ * Display links to RSS feed for comments
+ * 
+ * This can be switched on or off using thematic_show_commentsrss. Default: ON
+ * 
+ * Filter: thematic_show_commentsrss
+ * Filter: thematic_commentsrss
+ */
 function thematic_show_commentsrss() {
     $display = TRUE;
     $display = apply_filters('thematic_show_commentsrss', $display);
     if ($display) {
-        $content = "\t";
-        $content .= "<link rel=\"alternate\" type=\"application/rss+xml\" href=\"";
-        $content .= get_bloginfo('comments_rss2_url');
-        $content .= "\" title=\"";
-        $content .= esc_html(get_bloginfo('name'));
-        $content .= " " . __('Comments RSS feed', 'thematic');
-        $content .= "\" />";
-        $content .= "\n\n";
+        $content = '<link rel="alternate" type="application/rss+xml" href="';
+        $content .= get_feed_link( 'comments_rss2_url' );
+        $content .= '" title="';
+        $content .= esc_attr( get_bloginfo('name') );
+        $content .= ' ' . __('Comments RSS feed', 'thematic');
+        $content .= '" />';
+        $content .= "\n";
         echo apply_filters('thematic_commentsrss', $content);
     }
-} // end thematic_show_commentsrss
+}
 
 
-// pingback usage is switchable using a filter
+/**
+ * Display pingback link
+ * 
+ * This can be switched on or off using thematic_show_pingback. Default: ON
+ * 
+ * Filter: thematic_show_pingback
+ * Filter: thematic_pingback_url
+ */
 function thematic_show_pingback() {
     $display = TRUE;
     $display = apply_filters('thematic_show_pingback', $display);
     if ($display) {
-        $content = "\t";
-        $content .= "<link rel=\"pingback\" href=\"";
+        $content = '<link rel="pingback" href="';
         $content .= get_bloginfo('pingback_url');
-        $content .= "\" />";
-        $content .= "\n\n";
+        $content .= '" />';
+        $content .= "\n";
         echo apply_filters('thematic_pingback_url',$content);
     }
-} // end thematic_show_pingback
-
+}
 
-// comment reply usage is switchable using a filter
-function thematic_show_commentreply() {
-    $display = TRUE;
-    $display = apply_filters('thematic_show_commentreply', $display);
-    if ($display)
-        if ( is_singular() ) 
-            wp_enqueue_script( 'comment-reply' ); // support for comment threading
-} // end thematic_show_commentreply
+/**
+ * Add the default stylesheet to the head of the document.
+ * 
+ * Register and enqueue Thematic style.css
+ * 
+ * @todo check WP versions > 3.3 for addiytion of wp_enqueue_styles
+ */
+function thematic_create_stylesheet() {
+	wp_enqueue_style( 'thematic_style', get_stylesheet_uri() );
+}
 
+add_action('wp_enqueue_scripts','thematic_create_stylesheet');
 
-// Load scripts for the jquery Superfish plugin http://users.tpg.com.au/j_birch/plugins/superfish/#examples
-if (function_exists('childtheme_override_head_scripts'))  {
+if ( function_exists('childtheme_override_head_scripts') )  {
+    /**
+     * @ignore
+     */
     function thematic_head_scripts() {
     	childtheme_override_head_scripts();
     }
 } else {
+    /**
+     * Adds comment reply and navigation menu scripts to the head of the document.
+     *
+     * Child themes should use wp_dequeue_scripts to remove individual scripts.
+     * Larger changes can be made using the override.
+     *
+     * Override: childtheme_override_head_scripts <br>
+     *
+     * For Reference: {@link http://users.tpg.com.au/j_birch/plugins/superfish/#getting-started Superfish Jquery Plugin}
+     *
+     * @since 1.0
+     */
     function thematic_head_scripts() {
-	    $scriptdir_start = "\t";
-	    $scriptdir_start .= '<script type="text/javascript" src="';
-	    $scriptdir_start .= get_bloginfo('template_directory');
-	    $scriptdir_start .= '/library/scripts/';
-	    
-	    $scriptdir_end = '"></script>';
-	    
-	    $scripts = "\n";
-	    $scripts .= $scriptdir_start . 'hoverIntent.js' . $scriptdir_end . "\n";
-	    $scripts .= $scriptdir_start . 'superfish.js' . $scriptdir_end . "\n";
-	    $scripts .= $scriptdir_start . 'supersubs.js' . $scriptdir_end . "\n";
-	    $dropdown_options = $scriptdir_start . 'thematic-dropdowns.js' . $scriptdir_end . "\n";
-	    
-	    $scripts = $scripts . apply_filters('thematic_dropdown_options', $dropdown_options);
-	
-	    	$scripts .= "\n";
-	    	$scripts .= "\t";
-	    	$scripts .= '<script type="text/javascript">' . "\n";
-	    	$scripts .= "\t\t" . '/*<![CDATA[*/' . "\n";
-	    	$scripts .= "\t\t" . 'jQuery.noConflict();' . "\n";
-	    	$scripts .= "\t\t" . '/*]]>*/' . "\n";
-	    	$scripts .= "\t";
-	    	$scripts .= '</script>' . "\n";
-	
-	    // Print filtered scripts
-	    print apply_filters('thematic_head_scripts', $scripts);
-	}
-
-	if (apply_filters('thematic_use_superfish', TRUE)) {
-		add_action('wp_head','thematic_head_scripts');
-	}
-}
-
-// Create the default arguments for wp_page_menu()
+    	
+    	// load comment reply script on posts and pages when option is set and check for deprecated filter
+    	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') ) {
+			$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' ));
+     	
+     	}
+ 	}
+ }
+
+add_action('wp_enqueue_scripts','thematic_head_scripts');
+
+
+/**
+ * Return the default arguments for wp_page_menu()
+ * 
+ * This is used as fallback when the user has not created a custom nav menu in wordpress admin
+ * 
+ * Filter: thematic_page_menu_args
+ *
+ * @return array
+ */
 function thematic_page_menu_args() {
 	$args = array (
 		'sort_column' => 'menu_order',
@@ -357,12 +445,18 @@ function thematic_page_menu_args() {
 		'link_before' => '',
 		'link_after'  => ''
 	);
-	return $args;
+	return apply_filters('thematic_page_menu_args', $args);
 }
-add_filter('wp_page_menu_args','thematic_page_menu_args');
 
 
-// Create the default arguments for wp_page_menu()
+/**
+ * Return the default arguments for wp_nav_menu
+ * 
+ * Filter: thematic_primary_menu_id <br>
+ * Filter: thematic_nav_menu_args
+ *
+ * @return array
+ */
 function thematic_nav_menu_args() {
 	$args = array (
 		'theme_location'	=> apply_filters('thematic_primary_menu_id', 'primary-menu'),
@@ -383,141 +477,191 @@ function thematic_nav_menu_args() {
 	return apply_filters('thematic_nav_menu_args', $args);
 }
 
-if (function_exists('childtheme_override_init_navmenu'))  {
-    function thematic_init_navmenu() {
-    	childtheme_override_init_navmenu();
-    }
-} else {
-    function thematic_init_navmenu() {
-    	if (function_exists( 'register_nav_menu' )) {
-    		register_nav_menu( apply_filters('thematic_primary_menu_id', 'primary-menu'), apply_filters('thematic_primary_menu_name', __( 'Primary Menu', 'thematic' ) ) );
-		}
-	}
-}
-add_action('init', 'thematic_init_navmenu');
 
-// Add ID and CLASS attributes to the first <ul> occurence in wp_page_menu
+/**
+ * Switch adding superfish css class to wp_page_menu
+ * 
+ * This adds a css class of "sf-menu" to the first <ul> of wp_page_menu. Default: ON
+ * Switchable using included filter.
+ * 
+ * Filter: thematic_use_superfish
+ *
+ * @param string
+ * @return string
+ */
 function thematic_add_menuclass($ulclass) {
-	if (apply_filters('thematic_use_superfish', TRUE)) {
-		return preg_replace('/<ul>/', '<ul class="sf-menu">', $ulclass, 1);
+	if ( apply_filters( 'thematic_use_superfish', TRUE ) ) {
+		return preg_replace( '/<ul>/', '<ul class="sf-menu">', $ulclass, 1 );
 	} else {
 		return $ulclass;
 	}
-} // end thematic_add_menuclass
+}
 
-// Just after the opening body tag, before anything else.
+
+/**
+ * Register action hook: thematic_before
+ * 
+ * Located in header.php, just after the opening body tag, before anything else.
+ */
 function thematic_before() {
-    do_action('thematic_before');
-} // end thematic_before
+    do_action( 'thematic_before' );
+}
 
 
-// Just before the header div
+/**
+ * Register action hook: thematic_abovefooter
+ * 
+ * Located in header.php, inside the header div
+ */
 function thematic_aboveheader() {
-    do_action('thematic_aboveheader');
-} // end thematic_aboveheader
+    do_action( 'thematic_aboveheader' );
+}
 
 
-// Used to hook in the HTML and PHP that creates the content of div id="header">
+/**
+ * Register action hook: thematic_abovefooter
+ * 
+ * Located in header.php, inside the header div
+ */
 function thematic_header() {
-    do_action('thematic_header');
-} // end thematic_header
-
+    do_action( 'thematic_header' );
+}
 
-// Functions that hook into thematic_header()
 
-	// Open #branding
-	// In the header div
-	if (function_exists('childtheme_override_brandingopen'))  {
-	    function thematic_brandingopen() {
-	    	childtheme_override_brandingopen();
-	    }
-	} else {
-		function thematic_brandingopen() {
-			echo "<div id=\"branding\">\n";
+if ( function_exists( 'childtheme_override_brandingopen' ) )  {
+	/**
+	 * @ignore
+	 */
+	function thematic_brandingopen() {
+		childtheme_override_brandingopen();
 		}
-	    add_action('thematic_header','thematic_brandingopen',1);
-	}	
-	
-	// Create the blog title
-	// In the header div
-	if (function_exists('childtheme_override_blogtitle'))  {
-	    function thematic_blogtitle() {
-	    	childtheme_override_blogtitle();
-	    }
-	} else {
-	    function thematic_blogtitle() { ?>
-	    		
-	    		<div id="blog-title"><span><a href="<?php bloginfo('url') ?>/" title="<?php bloginfo('name') ?>" rel="home"><?php bloginfo('name') ?></a></span></div>
-	    		
-	    <?php }
-	    add_action('thematic_header','thematic_blogtitle',3);
-	}
-	
-	// Create the blog description
-	// In the header div
-	if (function_exists('childtheme_override_blogdescription'))  {
-	    function thematic_blogdescription() {
-	    	childtheme_override_blogdescription();
-	    }
-	} else {
-	    function thematic_blogdescription() {
-	    	$blogdesc = '"blog-description">' . get_bloginfo('description');
-			if (is_home() || is_front_page()) { 
-	        	echo "\t\t<h1 id=$blogdesc</h1>\n\n";
-	        } else {	
-	        	echo "\t\t<div id=$blogdesc</div>\n\n";
-	        }
-	    }
-	    add_action('thematic_header','thematic_blogdescription',5);
-	}
-	
-	// Close #branding
-	// In the header div
-	if (function_exists('childtheme_override_brandingclose'))  {
-	    function thematic_brandingclose() {
-	    	childtheme_override_brandingclose();
-	    }
 	} else {
-	    function thematic_brandingclose() {
-	    	echo "\t\t</div><!--  #branding -->\n";
-	    }
-	    add_action('thematic_header','thematic_brandingclose',7);
-	}
-	
-	// Create #access
-	// In the header div
-	if (function_exists('childtheme_override_access'))  {
-	    function thematic_access() {
-	    	childtheme_override_access();
-	    }
-	} else {
-	    function thematic_access() { ?>
-	    
-	    <div id="access">
-	    		
-	    	<div class="skip-link"><a href="#content" title="<?php _e('Skip navigation to the content', 'thematic'); ?>"><?php _e('Skip to content', 'thematic'); ?></a></div><!-- .skip-link -->
-	    		
-	    	<?php 
-	    		
-	    	if ((function_exists("has_nav_menu")) && (has_nav_menu(apply_filters('thematic_primary_menu_id', 'primary-menu')))) {
-	    		echo  wp_nav_menu(thematic_nav_menu_args());
-    		} else {
-    			echo  thematic_add_menuclass(wp_page_menu(thematic_page_menu_args()));	
-    		}
-    		
-	    	?>
-	        
-		</div><!-- #access -->
-		
-		<?php }
-	}
+	/**
+	 * Display the opening of the #branding div
+	 * 
+	 * Override: childtheme_override_brandingopen
+	 */
+    function thematic_brandingopen() {
+    	echo "\t<div id=\"branding\">\n";
+    }
+}
 
-    add_action('thematic_header','thematic_access',9);
+add_action( 'thematic_header','thematic_brandingopen',1 );
+
+
+if ( function_exists( 'childtheme_override_blogtitle' ) )  {
+	/**
+	 * @ignore
+	 */
+    function thematic_blogtitle() {
+    	childtheme_override_blogtitle();
+    }
+} else {
+    /**
+     * Display the blog title within the #branding div
+     * 
+     * Override: childtheme_override_blogtitle
+     */    
+    function thematic_blogtitle() { 
+    ?>
+    
+    	<div id="blog-title"><span><a href="<?php echo home_url() ?>/" title="<?php bloginfo('name') ?>" rel="home"><?php bloginfo('name') ?></a></span></div>
     
-// End of functions that hook into thematic_header()
+    <?php 
+    }
+}
 
-		
-// Just after the header div
+add_action('thematic_header','thematic_blogtitle',3);
+
+
+if ( function_exists('childtheme_override_blogdescription') )  {
+	/**
+	 * @ignore
+	 */
+    function thematic_blogdescription() {
+    	childtheme_override_blogdescription();
+    }
+} else {
+    /**
+     * Display the blog description within the #branding div
+     * 
+     * Override: childtheme_override_blogdescription
+     */
+    function thematic_blogdescription() {
+    	$blogdesc = '"blog-description">' . get_bloginfo('description', 'display');
+    	if ( is_home() || is_front_page() ) { 
+        	echo "\t<h1 id=$blogdesc</h1>\n\n";
+        } else {	
+        	echo "\t<div id=$blogdesc</div>\n\n";
+        }
+    }
+}
+
+add_action('thematic_header','thematic_blogdescription',5);
+
+
+if ( function_exists('childtheme_override_brandingclose') )  {
+	/**
+	 * @ignore
+	 */
+	 function thematic_brandingclose() {
+    	childtheme_override_brandingclose();
+    }
+} else {
+    /**
+     * Display the closing of the #branding div
+     * 
+     * Override: childtheme_override_brandingclose
+     */    
+    function thematic_brandingclose() {
+    	echo "\t\t</div><!--  #branding -->\n";
+    }
+}
+
+add_action('thematic_header','thematic_brandingclose',7);
+
+
+if ( function_exists('childtheme_override_access') )  {
+    /**
+	 * @ignore
+	 */
+	 function thematic_access() {
+    	childtheme_override_access();
+    }
+} else {
+    /**
+     * Display the #access div
+     * 
+     * Override: childtheme_override_access
+     */    
+    function thematic_access() { 
+    ?>
+    
+    <div id="access">
+    
+    	<div class="skip-link"><a href="#content" title="<?php esc_attr_e( 'Skip navigation to the content', 'thematic' ); ?>"><?php _e('Skip to content', 'thematic'); ?></a></div><!-- .skip-link -->
+    	
+    	<?php 
+    	if ( ( function_exists("has_nav_menu") ) && ( has_nav_menu( apply_filters('thematic_primary_menu_id', 'primary-menu') ) ) ) {
+    	    echo  wp_nav_menu(thematic_nav_menu_args());
+    	} else {
+    	    echo  thematic_add_menuclass(wp_page_menu(thematic_page_menu_args()));	
+    	}
+    	?>
+    	
+    </div><!-- #access -->
+    <?php 
+    }
+}
+
+add_action('thematic_header','thematic_access',9);
+
+
+/**
+ * Register action hook: thematic_belowheader
+ * 
+ * Located in header.php, just after the header div
+ */
 function thematic_belowheader() {
     do_action('thematic_belowheader');
 } // end thematic_belowheader
diff --git a/wp-content/themes/thematic/library/extensions/helpers.php b/wp-content/themes/thematic/library/extensions/helpers.php
index b0f27aa9fbc4b9e139abc62d98ab9730d1c9fe0d..1bcb577802efe7c380780d62dc5ea79c90ce32b5 100644
--- a/wp-content/themes/thematic/library/extensions/helpers.php
+++ b/wp-content/themes/thematic/library/extensions/helpers.php
@@ -1,7 +1,19 @@
 <?php
-
-// create bullet-proof excerpt for meta name="description"
-
+/**
+ * Helper Functions
+ *
+ * @package ThematicCoreLibrary
+ * @subpackage Helpers
+ */
+ 
+ 
+
+/**
+ * Create bullet-proof excerpt for meta name="description"
+ * 
+ * @param mixed $text
+ * @return $text
+ */
 function thematic_trim_excerpt($text) {
 	if ( '' == $text ) {
 		$text = get_the_content('');
@@ -22,13 +34,20 @@ function thematic_trim_excerpt($text) {
 	return $text;
 }
 
-function thematic_the_excerpt($deprecated = '') {
+
+/**
+ * thematic_the_excerpt function.
+ * 
+ * @param string $deprecated (default: '')
+ * @return $output
+ */
+function thematic_the_excerpt( $deprecated = '' ) {
 	global $post;
 	$output = '';
-	$output = strip_tags($post->post_excerpt);
-	$output = str_replace('"', '\'', $output);
+	$output = strip_tags( $post->post_excerpt );
+	$output = str_replace( '"', '\'', $output );
 	if ( post_password_required($post) ) {
-		$output = __('There is no excerpt because this is a protected post.');
+		$output = __( 'There is no excerpt because this is a protected post.', 'thematic');
 		return $output;
 	}
 
@@ -36,26 +55,33 @@ function thematic_the_excerpt($deprecated = '') {
 	
 }
 
+
+/**
+ * thematic_excerpt_rss function.
+ *
+ * @return $output
+ */
 function thematic_excerpt_rss() {
 	global $post;
 	$output = '';
-	$output = strip_tags($post->post_excerpt);
-	if ( post_password_required($post) ) {
-		$output = __('There is no excerpt because this is a protected post.');
+	$output = strip_tags( $post->post_excerpt );
+	if ( post_password_required( $post ) ) {
+		$output = __( 'There is no excerpt because this is a protected post.', 'thematic' );
 		return $output;
 }
 
-	return apply_filters('thematic_excerpt_rss', $output);
+	return apply_filters( 'thematic_excerpt_rss', $output );
 
 }
 
-add_filter('thematic_excerpt_rss', 'thematic_trim_excerpt');
+add_filter( 'thematic_excerpt_rss', 'thematic_trim_excerpt' );
 
-// create nice multi_tag_title
-// Credits: Martin Kopischke for providing this code
 
+/**
+ * Create nice multi_tag_title
+ */
 function thematic_tag_query() {
-	$nice_tag_query = get_query_var('tag'); // tags in current query
+	$nice_tag_query = get_query_var( 'tag' ); // tags in current query
 	$nice_tag_query = str_replace(' ', '+', $nice_tag_query); // get_query_var returns ' ' for AND, replace by +
 	$tag_slugs = preg_split('%[,+]%', $nice_tag_query, -1, PREG_SPLIT_NO_EMPTY); // create array of tag slugs
 	$tag_ops = preg_split('%[^,+]*%', $nice_tag_query, -1, PREG_SPLIT_NO_EMPTY); // create array of operators
@@ -66,32 +92,48 @@ function thematic_tag_query() {
 	foreach ($tag_slugs as $tag_slug) { 
 		$tag = get_term_by('slug', $tag_slug ,'post_tag');
 		// prettify tag operator, if any
-		if ($tag_ops[$tag_ops_counter] == ',') {
+		if ( isset($tag_ops[$tag_ops_counter])  &&  $tag_ops[$tag_ops_counter] == ',') {
 			$tag_ops[$tag_ops_counter] = ', ';
-		} elseif ($tag_ops[$tag_ops_counter] == '+') {
+		} elseif ( isset( $tag_ops[$tag_ops_counter])  &&  $tag_ops[$tag_ops_counter] == '+') {
 			$tag_ops[$tag_ops_counter] = ' + ';
 		}
 		// concatenate display name and prettified operators
-		$nice_tag_query = $nice_tag_query.$tag->name.$tag_ops[$tag_ops_counter];
-		$tag_ops_counter += 1;
+		if ( isset( $tag_ops[$tag_ops_counter] ) ) {
+			$nice_tag_query = $nice_tag_query.$tag->name.$tag_ops[$tag_ops_counter];
+			$tag_ops_counter += 1;
+		} else {
+			$nice_tag_query = $nice_tag_query.$tag->name;
+			$tag_ops_counter += 1;
+		}
 	}
-	 return $nice_tag_query;
+	return $nice_tag_query;
 }
 
+
+/**
+ * Gets the term name of the current post
+ *
+ * @todo deprcate when thematic_body_class becomes a filter of body_class
+ * @return $term->name
+ */
 function thematic_get_term_name() {
-	// Credits: Justin Tadlock Theme Hybrid
 	$term = get_term_by( 'slug', get_query_var( 'term' ), get_query_var( 'taxonomy' ) ); 
 	return $term->name;
 }
 
+
+/**
+ * Check to see if the current post is a custom post type
+ * 
+ * @return bool
+ */
 function thematic_is_custom_post_type() {
 	global $post; 
-	if ($post->post_type !== "post") {
-		if ($post->post_type !== "page") {
-			return true;
-		}
-	}
-	return false;
-}
+
+	if ( !in_array(  $post->post_type , get_post_types( array( '_builtin' => true ) ) ) ) {
+		return true;
+ 	}
+ 	return false;
+ }
 
 ?>
\ No newline at end of file
diff --git a/wp-content/themes/thematic/library/extensions/shortcodes.php b/wp-content/themes/thematic/library/extensions/shortcodes.php
index 0802cf1f65fd04de2467aed0ce6601cb2b5b53fb..f42dc9c05712401b754bf41b5ae370b25d45b2f7 100644
--- a/wp-content/themes/thematic/library/extensions/shortcodes.php
+++ b/wp-content/themes/thematic/library/extensions/shortcodes.php
@@ -1,82 +1,146 @@
 <?php
-
-function thmfooter_wp_link() {
+/**
+ * Shortcodes
+ *
+ * A set of shortcodes that get registered with the 
+ * WordPress {@link http://codex.wordpress.org/Shortcode_API ShortCode API}.
+ *
+ * These can be used display information such as attributitive links 
+ * for the framework, the active child theme, and more.
+ *
+ * @package ThematicCoreLibrary
+ * @subpackage Shortcodes
+ */
+
+
+/**
+ * Display link to WP.org.
+ */
+function thematic_shortcode_wp_link() {
     return '<a class="wp-link" href="http://WordPress.org/" title="WordPress" rel="generator">WordPress</a>';
 }
-add_shortcode('wp-link', 'thmfooter_wp_link');		  
+add_shortcode('wp-link', 'thematic_shortcode_wp_link');		  
+
 		  
-function thmfooter_theme_link() {
-    $themelink = '<a class="theme-link" href="http://themeshaper.com/thematic/" title="Thematic Theme Framework" rel="designer">Thematic Theme Framework</a>';
+/**
+ * Display link to Thematic.
+ */
+function thematic_shortcode_framework_link() {
+    $themelink = '<a class="theme-link" href="http://thematictheme.com" title="Thematic Theme Framework" rel="home">Thematic Theme Framework</a>';
     return apply_filters('thematic_theme_link',$themelink);
 }
-add_shortcode('theme-link', 'thmfooter_theme_link');	
+add_shortcode('theme-link', 'thematic_shortcode_framework_link');	
 
-function thmfooter_login_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($redirect) . '">' . __('Logout','thematic') . '</a>';
+    $link = '<a href="' . wp_logout_url() . '">' . __('Logout','thematic') . '</a>';
     return apply_filters('loginout', $link);
 }
-add_shortcode('loginout-link', 'thmfooter_login_link');		  	  
+add_shortcode('loginout-link', 'thematic_shortcode_login_link');		  	  
+
 
-function thmfooter_blog_title() {
-	return '<span class="blog-title">' . get_bloginfo('name') . '</span>';
+/**
+ * Display the site title.
+ */
+function thematic_shortcode_blog_title() {
+	return '<span class="blog-title">' . get_bloginfo('name', 'display') . '</span>';
 }
-add_shortcode('blog-title', 'thmfooter_blog_title');
+add_shortcode('blog-title', 'thematic_shortcode_blog_title');
 
-function thmfooter_blog_link() {
-	return '<a href="' . site_url('/') . '" title="' . get_option('blogname') . '" >' . get_option('blogname') . "</a>";
+
+/**
+ * Display the site title with a link to the site.
+ */
+function thematic_shortcode_blog_link() {
+	return '<a href="' . site_url('/') . '" title="' . esc_attr( get_bloginfo('name', 'display') ) . '" >' . get_bloginfo('name', 'display') . "</a>";
 }
-add_shortcode('blog-link', 'thmfooter_blog_link');
+add_shortcode('blog-link', 'thematic_shortcode_blog_link');
+
 
-function thmfooter_year() {   
+/**
+ * Display the current year.
+ */
+function thematic_shortcode_year() {   
     return '<span class="the-year">' . date('Y') . '</span>';
 }
-add_shortcode('the-year', 'thmfooter_year');
+add_shortcode('the-year', 'thematic_shortcode_year');
 
-// Providing information about Thematic
 
-function theme_name() {
-    return THEMENAME;
+/**
+ * Display the name of the parent theme.
+ */
+function thematic_shortcode_theme_name() {
+    return THEMATIC_THEMENAME;
 }
-add_shortcode('theme-name', 'theme_name');
+add_shortcode('theme-name', 'thematic_shortcode_theme_name');
 
-function theme_author() {
-    return THEMEAUTHOR;
-}
-add_shortcode('theme-author', 'theme_author');
 
-function theme_uri() {
-    return THEMEURI;
+/**
+ * Display the name of the parent theme author.
+ */
+function thematic_shortcode_theme_author() {
+    return THEMATIC_THEMEAUTHOR;
 }
-add_shortcode('theme-uri', 'theme_uri');
+add_shortcode('theme-author', 'thematic_shortcode_theme_author');
 
-function theme_version() {
-    return THEMATICVERSION;
+
+/**
+ * Display the URI of the parent theme.
+ */
+function thematic_shortcode_theme_uri() {
+    return THEMATIC_THEMEURI;
 }
-add_shortcode('theme-version', 'theme_version');
+add_shortcode('theme-uri', 'thematic_shortcode_theme_uri');
 
-// Providing information about the child theme
 
-function child_name() {
-    return TEMPLATENAME;
+/**
+ * Display the version no. of the parent theme.
+ */
+function thematic_shortcode_theme_version() {
+    return THEMATIC_VERSION;
 }
-add_shortcode('child-name', 'child_name');
+add_shortcode('theme-version', 'thematic_shortcode_theme_version');
+
 
-function child_author() {
-    return TEMPLATEAUTHOR;
+
+/**
+ * Display the name of the child theme.
+ */
+function thematic_shortcode_child_name() {
+    return THEMATIC_TEMPLATENAME;
 }
-add_shortcode('child-author', 'child_author');
+add_shortcode('child-name', 'thematic_shortcode_child_name');
+
 
-function child_uri() {
-    return TEMPLATEURI;
+/**
+ * Display the name of the child theme author.
+ */
+function thematic_shortcode_child_author() {
+    return THEMATIC_TEMPLATEAUTHOR;
 }
-add_shortcode('child-uri', 'child_uri');
+add_shortcode('child-author', 'thematic_shortcode_child_author');
 
-function child_version() {
-    return TEMPLATEVERSION;
+
+/**
+ * Display the URI of the child theme.
+ */
+function thematic_shortcode_child_uri() {
+    return THEMATIC_TEMPLATEURI;
 }
-add_shortcode('child-version', 'child_version');
+add_shortcode('child-uri', 'thematic_shortcode_child_uri');
+
 
-?>
\ No newline at end of file
+/**
+ * Display the version no. of the child theme.
+ * 
+ */
+function thematic_shortcode_child_version() {
+    return THEMATIC_TEMPLATEVERSION;
+}
+add_shortcode('child-version', 'thematic_shortcode_child_version');
diff --git a/wp-content/themes/thematic/library/extensions/sidebar-extensions.php b/wp-content/themes/thematic/library/extensions/sidebar-extensions.php
index a66bd4421d02d76438e861f7b2b391adb7eae1fa..978520abc7803867f25a193c349941566a61e021 100644
--- a/wp-content/themes/thematic/library/extensions/sidebar-extensions.php
+++ b/wp-content/themes/thematic/library/extensions/sidebar-extensions.php
@@ -1,299 +1,528 @@
 <?php
 
-
-// Filter to create the sidebar
+/**
+ * Sidebars Extensions
+ *
+ * @package ThematicCoreLibrary
+ * @subpackage SidebarExtensions
+ */
+
+
+/**
+ * Get the standard sidebar
+ *
+ * This includes the primary and secondary widget areas. 
+ * The sidebar can be switched on or off using thematic_sidebar. <br>
+ * Default: ON <br>
+ * 
+ * Filter: thematic_sidebar
+ */
 function thematic_sidebar() {
-
-  $show = TRUE;
-
-	// Filters should return Boolean 
+	$show = TRUE;
 	$show = apply_filters('thematic_sidebar', $show);
 	
-	if ($show) {
-    get_sidebar();}
+	if ($show)
+    	get_sidebar();
 	
 	return;
 } // end thematic_sidebar
 
 
-// Main Aside Hooks
-
-
-	// Located in sidebar.php 
-	// Just before the main asides (commonly used as sidebars)
-	function thematic_abovemainasides() {
-	    do_action('thematic_abovemainasides');
-	} // end thematic_abovemainasides
-
-
-	// Located in sidebar.php 
-	// regular hook for primary asides
-	function widget_area_primary_aside() {
-	    do_action('widget_area_primary_aside');
-	} // end widget_area_primary_aside
-	
-	
-	// Located in sidebar.php 
-	// Between the main asides (commonly used as sidebars)
-	function thematic_betweenmainasides() {
-	    do_action('thematic_betweenmainasides');
-	} // end thematic_betweenmainasides
-
-
-	// Located in sidebar.php 
-	// regular hook for primary asides
-	function widget_area_secondary_aside() {
-	    do_action('widget_area_secondary_aside');
-	} // end widget_area_secondary_aside
-	
-	
-	// Located in sidebar.php 
-	// after the main asides (commonly used as sidebars)
-	function thematic_belowmainasides() {
-	    do_action('thematic_belowmainasides');
-	} // end thematic_belowmainasides
-	
-
-// Index Aside Hooks
-
-	
-	// Located in sidebar-index-top.php
-	function thematic_aboveindextop() {
-		do_action('thematic_aboveindextop');
-	} // end thematic_aboveindextop
-	
-
-	// Located in sidebar-index-top.php
-	function widget_area_index_top() {
-		do_action('widget_area_index_top');
-	} // end widget_area_index_top
-	
-	
-	// Located in sidebar-index-top.php
-	function thematic_belowindextop() {
-		do_action('thematic_belowindextop');
-	} // end thematic_belowindextop
-	
-	
-	// Located in sidebar-index-insert.php
-	function thematic_aboveindexinsert() {
-		do_action('thematic_aboveindexinsert');
-	} // end thematic_aboveindexinsert
-	
-	// ocated in sidebar-index-insert.php
-	function widget_area_index_insert() {
-		do_action('widget_area_index_insert');
-	} // end widget_area_index_insert
-	
-	
-	// Located in sidebar-index-insert.php
-	function thematic_belowindexinsert() {
-		do_action('thematic_belowindexinsert');
-	} // end thematic_belowindexinsert	
-	
-
-	// Located in sidebar-index-bottom.php
-	function thematic_aboveindexbottom() {
-		do_action('thematic_aboveindexbottom');
-	} // end thematic_aboveindexbottom
-	
-	// Located in sidebar-index-bottom.php
-	function widget_area_index_bottom() {
-		do_action('widget_area_index_bottom');
-	} // end widget_area_index_bottom
-	
-	
-	// Located in sidebar-index-bottom.php
-	function thematic_belowindexbottom() {
-		do_action('thematic_belowindexbottom');
-	} // end thematic_belowindexbottom	
-	
-	
-// Single Post Asides
-
-
-	// Located in sidebar-single-top.php
-	function thematic_abovesingletop() {
-		do_action('thematic_abovesingletop');
-	} // end thematic_abovesingletop
-
-
-	// Located in sidebar-single-top.php
-	function widget_area_single_top() {
-		do_action('widget_area_single_top');
-	} // end thematic_abovesingletop
-	
-	
-	// Located in sidebar-single-top.php
-	function thematic_belowsingletop() {
-		do_action('thematic_belowsingletop');
-	} // end thematic_belowsingletop
-	
-	
-	// Located in sidebar-single-insert.php
-	function thematic_abovesingleinsert() {
-		do_action('thematic_abovesingleinsert');
-	} // end thematic_abovesingleinsert
-	
-	
-	// Located in sidebar-single-insert.php
-	function widget_area_single_insert() {
-		do_action('widget_area_single_insert');
-	} // end thematic_abovesingleinsert
-	
-	
-	// Located in sidebar-single-insert.php
-	function thematic_belowsingleinsert() {
-		do_action('thematic_belowsingleinsert');
-	} // end thematic_belowsingleinsert	
-	
-
-	// Located in sidebar-single-bottom.php
-	function thematic_abovesinglebottom() {
-		do_action('thematic_abovesinglebottom');
-	} // end thematic_abovesinglebottom
-	
-
-	// Located in sidebar-single-bottom.php
-	function widget_area_single_bottom() {
-		do_action('widget_area_single_bottom');
-	} // end widget_area_single_bottom
-	
-	
-	// Located in sidebar-single-bottom.php
-	function thematic_belowsinglebottom() {
-		do_action('thematic_belowsinglebottom');
-	} // end thematic_belowsinglebottom	
-	
-
-
-// Page Aside Hooks
-
-
-	// Located in sidebar-page-top.php
-	function thematic_abovepagetop() {
-		do_action('thematic_abovepagetop');
-	} // end thematic_abovepagetop
-
-
-	// Located in sidebar-page-top.php
-	function widget_area_page_top() {
-		do_action('widget_area_page_top');
-	} // end widget_area_page_top
-	
-	
-	// Located in sidebar-page-top.php
-	function thematic_belowpagetop() {
-		do_action('thematic_belowpagetop');
-	} // end thematic_belowpagetop
-
-
-	// Located in sidebar-page-bottom.php
-	function thematic_abovepagebottom() {
-		do_action('thematic_abovepagebottom');
-	} // end thematic_abovepagebottom
-
-
-	// Located in sidebar-page-bottom.php
-	function widget_area_page_bottom() {
-		do_action('widget_area_page_bottom');
-	} // end widget_area_page_bottom
-
-	
-	// Located in sidebar-page-bottom.php
-	function thematic_belowpagebottom() {
-		do_action('thematic_belowpagebottom');
-	} // end thematic_belowpagebottom	
-
-
-
-// Subsidiary Aside Hooks
-	
-
-	// Located in sidebar-subsidiary.php
-	function thematic_abovesubasides() {
-		do_action('thematic_abovesubasides');
-	} // end thematic_abovesubasides
-	
-
-	// Located in sidebar-subsidiary.php
-	function thematic_belowsubasides() {
-		do_action('thematic_belowsubasides');
-	} // end thematic_belowsubasides
-    
-    function thematic_subsidiaryopen() {
-        if ( is_active_sidebar('1st-subsidiary-aside') || is_active_sidebar('2nd-subsidiary-aside') || is_active_sidebar('3rd-subsidiary-aside') ) { // one of the subsidiary asides has a widget ?>
-            
-            <div id="subsidiary">
-            
-        <?php
-        }
+/* 
+ * Main Aside Hooks
+ */
+
+
+/**
+ * Register action hook: thematic_abovemainasides 
+ *
+ * Located in sidebar.php
+ * Just before the main asides (commonly used as sidebars)
+ */
+function thematic_abovemainasides() {
+    do_action('thematic_abovemainasides');
+}
+
+
+/**
+ * Register action hook: widget_area_primary_aside 
+ *
+ * Located in sidebar.php
+ * Regular hook for primary widget area
+ */
+function thematic_widget_area_primary_aside() {
+    do_action('widget_area_primary_aside');
+}
+
+
+/**
+ * Register action hook: thematic_betweenmainasides 
+ *
+ * Located in sidebar.php
+ * Between the main asides (commonly used as sidebars)
+ */
+function thematic_betweenmainasides() {
+    do_action('thematic_betweenmainasides');
+}
+
+
+/**
+ * Register action hook: widget_area_secondary_aside 
+ *
+ * Located in sidebar.php
+ * Regular hook for secondary widget area
+ */
+function thematic_widget_area_secondary_aside() {
+    do_action('widget_area_secondary_aside');
+}
+
+
+/**
+ * Register action hook: thematic_belowmainasides 
+ *
+ * Located in sidebar.php
+ * Just after the main asides (commonly used as sidebars)
+ */
+function thematic_belowmainasides() {
+    do_action('thematic_belowmainasides');
+}
+
+
+/*
+ * Index Aside Hooks
+ */
+
+
+/*	
+ * Register action hook: thematic_aboveindextop 
+ *
+ * Located in sidebar-index-top.php
+ * Just above the 'index.top' widget area
+ */
+function thematic_aboveindextop() {
+	do_action('thematic_aboveindextop');
+}
+
+
+/**
+ * Register action hook: widget_area_index_top
+ *
+ * Located in sidebar.php
+ * Regular hook for the 'index.top' widget area
+ */
+function thematic_widget_area_index_top() {
+    do_action('widget_area_index_top');
+}
+
+	
+/**
+ * Register action hook: thematic_belowindextop 
+ *
+ * Located in sidebar-index-top.php
+ * Just below the 'index.top' widget area
+ */
+function thematic_belowindextop() {
+    do_action('thematic_belowindextop');
+}
+
+
+/**
+ * Register action hook: thematic_aboveindexinsert 
+ *
+ * Located in sidebar-index-insert.php
+ * Just before the 'index-insert' widget area
+ */
+function thematic_aboveindexinsert() {
+    do_action('thematic_aboveindexinsert');
+}
+
+
+/**
+ * Register action hook: widget_area_index_insert
+ * 
+ * Located in sidebar-index-insert.php
+ * Regular hook for the 'index-insert' widget area
+ */
+function thematic_widget_area_index_insert() {
+	do_action('widget_area_index_insert');
+}
+	
+	
+/**
+ * Register action hook: thematic_belowindexinsert 
+ *
+ * Located in sidebar-index-insert.php
+ * Just after the 'index-insert' widget area
+ */
+function thematic_belowindexinsert() {
+    do_action('thematic_belowindexinsert');
+}	
+
+
+/**
+ * Register action hook: thematic_aboveindexbottom 
+ *
+ * Located in sidebar-index-bottom.php
+ * Just above the 'index-bottom' widget area
+ */
+function thematic_aboveindexbottom() {
+    do_action('thematic_aboveindexbottom');
+}
+	
+
+/**
+ * Register action hook: widget_area_index_bottom 
+ *
+ * Located in sidebar-index-bottom.php
+ * Regular hook for the 'index-bottom' widget area
+ */	
+function thematic_widget_area_index_bottom() {
+    do_action('widget_area_index_bottom');
+}
+	
+	
+/**
+ * Register action hook: thematic_belowindexbottom 
+ *
+ * Located in sidebar-index-bottom.php
+ * Just below the 'index-bottom' widget area
+ */	function thematic_belowindexbottom() {
+    do_action('thematic_belowindexbottom');
+}
+	
+	
+/*
+ * Single Post Asides
+ */
+
+
+/**
+ * Register action hook: thematic_abovesingletop 
+ *
+ * Located in sidebar-single-top.php
+ * Just above the 'single-top' widget area
+ */
+function thematic_abovesingletop() {
+    do_action('thematic_abovesingletop');
+}
+
+
+/**
+ * Register action hook: widget_area_single_top 
+ *
+ * Located in sidebar-single-top.php
+ * Regular hook for the 'single-top' widget area
+ */
+function thematic_widget_area_single_top() {
+    do_action('widget_area_single_top');
+}
+
+
+/**
+ * Register action hook: thematic_belowsingletop 
+ *
+ * Located in sidebar-single-top.php
+ * Just below the 'single-top' widget area
+ */
+function thematic_belowsingletop() {
+    do_action('thematic_belowsingletop');
+}
+	
+	
+/**
+ * Register action hook: thematic_abovesingleinsert 
+ *
+ * Located in sidebar-single-insert.php
+ * Just above the 'single-insert' widget area
+ */
+function thematic_abovesingleinsert() {
+    do_action('thematic_abovesingleinsert');
+}
+
+
+/**
+ * Register action hook: widget_area_single_insert 
+ *
+ * Located in sidebar-single-insert.php
+ * Regular hook for the 'single-insert' widget area
+ */
+function thematic_widget_area_single_insert() {
+    do_action('widget_area_single_insert');
+}
+
+
+/**
+ * Register action hook: thematic_belowsingleinsert 
+ *
+ * Located in sidebar-single-insert.php
+ * Just below the 'single-insert' widget area
+ */
+function thematic_belowsingleinsert() {
+    do_action('thematic_belowsingleinsert');
+}
+
+
+/**
+ * Register action hook: thematic_abovesinglebottom 
+ *
+ * Located in sidebar-single-bottom.php
+ * Just above the 'single-bottom' widget area
+ */
+function thematic_abovesinglebottom() {
+    do_action('thematic_abovesinglebottom');
+}
+
+
+/**
+ * Register action hook: widget_area_single_bottom 
+ *
+ * Located in sidebar-single-bottom.php
+ * Regular hook for the 'single-bottom' widget area
+ */
+function thematic_widget_area_single_bottom() {
+    do_action('widget_area_single_bottom');
+}
+
+
+/**
+ * Register action hook: thematic_belowsinglebottom 
+ *
+ * Located in sidebar-single-bottom.php
+ * Just below the 'single-bottom' widget area
+ */
+function thematic_belowsinglebottom() {
+    do_action('thematic_belowsinglebottom');
+}
+
+
+/*
+ * Page Aside Hooks
+ */
+
+
+/**
+ * Register action hook: thematic_abovepagetop 
+ *
+ * Located in sidebar-page-top.php
+ * Just above the 'page-top' widget area
+ */
+function thematic_abovepagetop() {
+    do_action('thematic_abovepagetop');
+}
+
+
+/**
+ * Register action hook: widget_area_page_top 
+ *
+ * Located in sidebar-page-top.php
+ * Regular hook for the 'page-top' widget area
+ */
+function thematic_widget_area_page_top() {
+    do_action('widget_area_page_top');
+}
+
+
+/**
+ * Register action hook: thematic_belowpagetop 
+ *
+ * Located in sidebar-page-top.php
+ * Just below the 'page-top' widget area
+ */
+function thematic_belowpagetop() {
+    do_action('thematic_belowpagetop');
+} // end thematic_belowpagetop
+
+
+/**
+ * Register action hook: thematic_abovepagebottom 
+ *
+ * Located in sidebar-page-bottom.php
+ * Just above the 'page-bottom' widget area
+ */
+function thematic_abovepagebottom() {
+    do_action('thematic_abovepagebottom');
+} // end thematic_abovepagebottom
+
+
+/**
+ * Register action hook: widget_area_page_bottom 
+ *
+ * Located in sidebar-page-bottom.php
+ * Regular hook for the 'page-bottom' widget area
+ */
+function thematic_widget_area_page_bottom() {
+    do_action('widget_area_page_bottom');
+} // end widget_area_page_bottom
+
+
+/**
+ * Register action hook: thematic_belowpagebottom 
+ *
+ * Located in sidebar-page-bottom.php
+ * Just below the 'page-bottom' widget area
+ */
+function thematic_belowpagebottom() {
+    do_action('thematic_belowpagebottom');
+} // end thematic_belowpagebottom	
+
+
+/*
+ * Subsidiary Aside Hooks
+ */
+
+
+/**
+ * Register action hook: thematic_abovesubasides 
+ *
+ * Located in sidebar-subsidiary.php
+ * Just above the subsidiary widget areas
+ */
+function thematic_abovesubasides() {
+    do_action('thematic_abovesubasides');
+}
+
+
+/**
+ * Register action hook: thematic_belowsubasides 
+ *
+ * Located in sidebar-subsidiary.php
+ * Just below the subsidiary widget areas
+ */
+function thematic_belowsubasides() {
+    do_action('thematic_belowsubasides');
+}
+
+
+/**
+ * Open the #subsidiary div
+ * 
+ * Will only display if there is a widget in one of the subsidiary asides
+ */
+function thematic_subsidiaryopen() {
+    if ( is_active_sidebar('1st-subsidiary-aside') || is_active_sidebar('2nd-subsidiary-aside') || is_active_sidebar('3rd-subsidiary-aside') ) { // one of the subsidiary asides has a widget ?>
+        
+        <div id="subsidiary">
+        
+    <?php
     }
-    add_action('widget_area_subsidiaries', 'thematic_subsidiaryopen', 10);
-	
-
-	// Located in sidebar-subsidiary.php
-	function thematic_before_first_sub() {
-		do_action('thematic_before_first_sub');
-	} // end thematic_before_first_sub
-    
-    function add_before_first_sub() {
-        if ( is_active_sidebar('1st-subsidiary-aside') || is_active_sidebar('2nd-subsidiary-aside') || is_active_sidebar('3rd-subsidiary-aside') ) { // one of the subsidiary asides has a widget
-            thematic_before_first_sub();
-        }
+}
+add_action('widget_area_subsidiaries', 'thematic_subsidiaryopen', 10);
+
+
+/**
+ * Register action hook: thematic_before_first_sub 
+ *
+ * Is only available if there is a widget in one of the subsidiary asides
+ */
+function thematic_before_first_sub() {
+    do_action('thematic_before_first_sub');
+}
+
+
+/**
+ * Add the thematic_before_first_sub hook within the #subsidiary div
+ *
+ * Will only add the hook if there is a widget in one of the subsidiary asides
+ */
+function thematic_add_before_first_sub() {
+    if ( is_active_sidebar('1st-subsidiary-aside') || is_active_sidebar('2nd-subsidiary-aside') || is_active_sidebar('3rd-subsidiary-aside') ) { // one of the subsidiary asides has a widget
+        thematic_before_first_sub();
     }
-    add_action('widget_area_subsidiaries', 'add_before_first_sub',20);
-
-	// Located in sidebar-subsidiary.php
-	function widget_area_subsidiaries() {
-		do_action('widget_area_subsidiaries');
-	} // end widget_area_1st_subsidiary_aside
-
-	// Located in sidebar-subsidiary.php
-	function thematic_between_firstsecond_sub() {
-		do_action('thematic_between_firstsecond_sub');
-	} // end thematic_between_firstsecond_sub
-    
-    function add_between_firstsecond_sub() {
-        if ( is_active_sidebar('1st-subsidiary-aside') || is_active_sidebar('2nd-subsidiary-aside') || is_active_sidebar('3rd-subsidiary-aside') ) { // one of the subsidiary asides has a widget
-            thematic_between_firstsecond_sub();
-        }
+}
+add_action('widget_area_subsidiaries', 'thematic_add_before_first_sub',20);
+
+	
+/**
+ * Register action hook: widget_area_subsidiaries 
+ *
+ * Located in sidebar-subsidiary.php
+ * Regular hook for the subsidiary widget areas
+ */
+function thematic_widget_area_subsidiaries() {
+    do_action('widget_area_subsidiaries');
+}
+
+
+/**
+ * Register action hook: thematic_between_firstsecond_sub 
+ *
+ * Is only available if there is a widget in one of the subsidiary asides
+ */
+function thematic_between_firstsecond_sub() {
+    do_action('thematic_between_firstsecond_sub');
+}
+
+
+/**
+ * Add the thematic_between_firstsecond_sub hook within the #subsidiary div
+ *
+ * Will only add the hook if there is a widget in one of the subsidiary asides
+ */
+function thematic_add_between_firstsecond_sub() {
+    if ( is_active_sidebar('1st-subsidiary-aside') || is_active_sidebar('2nd-subsidiary-aside') || is_active_sidebar('3rd-subsidiary-aside') ) { // one of the subsidiary asides has a widget
+        thematic_between_firstsecond_sub();
     }
-    add_action('widget_area_subsidiaries', 'add_between_firstsecond_sub',40);
-
-
-	// Located in sidebar-subsidiary.php
-	function thematic_between_secondthird_sub() {
-		do_action('thematic_between_secondthird_sub');
-	} // end thematic_between_secondthird_sub
-    
-    function add_between_secondthird_sub() {
-        if ( is_active_sidebar('1st-subsidiary-aside') || is_active_sidebar('2nd-subsidiary-aside') || is_active_sidebar('3rd-subsidiary-aside') ) { // one of the subsidiary asides has a widget
-            thematic_between_secondthird_sub();
-        }
+}
+add_action('widget_area_subsidiaries', 'thematic_add_between_firstsecond_sub',40);
+
+
+/**
+ * Register action hook: thematic_between_secondthird_sub 
+ *
+ * Is only available if there is a widget in one of the subsidiary asides
+ */
+function thematic_between_secondthird_sub() {
+    do_action('thematic_between_secondthird_sub');
+}
+
+
+/**
+ * Add the thematic_between_secondthird_sub hook within the #subsidiary div
+ *
+ * Will only add the hook if there is a widget in one of the subsidiary asides
+ */
+function thematic_add_between_secondthird_sub() {
+    if ( is_active_sidebar('1st-subsidiary-aside') || is_active_sidebar('2nd-subsidiary-aside') || is_active_sidebar('3rd-subsidiary-aside') ) { // one of the subsidiary asides has a widget
+        thematic_between_secondthird_sub();
     }
-    add_action('widget_area_subsidiaries', 'add_between_secondthird_sub',60);
-	
-	
-	// Located in sidebar-subsidiary.php
-	function thematic_after_third_sub() {
-		do_action('thematic_after_third_sub');
-	} // end thematic_after_third_sub	
-
-    
-    function add_after_third_sub() {
-        if ( is_active_sidebar('1st-subsidiary-aside') || is_active_sidebar('2nd-subsidiary-aside') || is_active_sidebar('3rd-subsidiary-aside') ) { // one of the subsidiary asides has a widget
-            thematic_after_third_sub();
-        }
+}
+add_action('widget_area_subsidiaries', 'thematic_add_between_secondthird_sub',60);
+
+
+/**
+ * Register action hook: thematic_after_third_sub 
+ *
+ * Is only available if there is a widget in one of the subsidiary asides
+ */
+function thematic_after_third_sub() {
+    do_action('thematic_after_third_sub');
+}	
+
+
+/**
+ * Add the thematic_after_third_sub hook within the #subsidiary div
+ *
+ * Will only add the hook if there is a widget in one of the subsidiary asides
+ */
+function thematic_add_after_third_sub() {
+    if ( is_active_sidebar('1st-subsidiary-aside') || is_active_sidebar('2nd-subsidiary-aside') || is_active_sidebar('3rd-subsidiary-aside') ) { // one of the subsidiary asides has a widget
+        thematic_after_third_sub();
     }
-    add_action('widget_area_subsidiaries', 'add_after_third_sub',80);
-    
-    function thematic_subsidiaryclose() {
-        if ( is_active_sidebar('1st-subsidiary-aside') || is_active_sidebar('2nd-subsidiary-aside') || is_active_sidebar('3rd-subsidiary-aside') ) { // one of the subsidiary asides has a widget ?>
-            
-            </div><!-- #subsidiary -->
-            
-        <?php
-        }
+}
+add_action('widget_area_subsidiaries', 'thematic_add_after_third_sub',80);
+
+
+/**
+ * Close the #subsidiary div
+ * 
+ * Will only display if there is a widget in one of the subsidiary asides
+ */
+function thematic_subsidiaryclose() {
+    if ( is_active_sidebar('1st-subsidiary-aside') || is_active_sidebar('2nd-subsidiary-aside') || is_active_sidebar('3rd-subsidiary-aside') ) { // one of the subsidiary asides has a widget ?>
+        
+        </div><!-- #subsidiary -->
+        
+    <?php
     }
-    add_action('widget_area_subsidiaries', 'thematic_subsidiaryclose', 200);
\ No newline at end of file
+}
+add_action('widget_area_subsidiaries', 'thematic_subsidiaryclose', 200);
\ No newline at end of file
diff --git a/wp-content/themes/thematic/library/extensions/theme-options.php b/wp-content/themes/thematic/library/extensions/theme-options.php
index 52b62dc40347fcd60cb5127b40e66427027af358..f03acc92ab82b1ab18219f65a190fe41811643f5 100644
--- a/wp-content/themes/thematic/library/extensions/theme-options.php
+++ b/wp-content/themes/thematic/library/extensions/theme-options.php
@@ -1,313 +1,393 @@
 <?php
+/**
+ * Thematic Theme Options
+ *
+ * An improved theme options page using the WP Settings API
+ * Child themes can use the WP settings api and the filters provided here to 
+ * customize their child theme's options and settings validation. <br>
+ *
+ * For Reference: {@link http://codex.wordpress.org/Creating_an_Archive_Index Codex-Creating an Archive Index}
+ *
+ * @package ThematicCoreLibrary
+ * @subpackage ThemeOptions
+ */
+ 
+/**
+ * Sets default options in database if not pre-existent.
+ * Registers with WP settings API, adds a main section with three settings fields.
+ * 
+ * Override: childtheme_override_opt_init
+ *
+ * @since Thematic 1.0
+ */
+if (function_exists('childtheme_override_opt_init')) {
+	function thematic_opt_init() {
+		childtheme_override_opt_init();
+	}
+} else {
+	function thematic_opt_init() {
 
-// Theme options adapted from "A Theme Tip For WordPress Theme Authors"
-// http://literalbarrage.org/blog/archives/2007/05/03/a-theme-tip-for-wordpress-theme-authors/
-
-$themename = "Thematic";
-$shortname = "thm";
-
-// Create theme options
-
-$options = array (
-
-				array(	"name" => __('Index Insert Position','thematic'),
-						"desc" => __('The widgetized Index Insert will follow after this post number.','thematic'),
-						"id" => $shortname."_insert_position",
-						"std" => "2",
-						"type" => "text"),
+		// Retrieve current options from database	
+		$current_options = thematic_get_wp_opt('thematic_theme_opt');
+		$legacy_options = thematic_convert_legacy_opt();
+		
+		// If no current settings exist
+		if ( false === $current_options )  {
+			// Check for legacy options
+			if ( false !== ( $legacy_options ) )  {
+				// Theme upgrade: Convert legacy to current format and add to database 
+				add_option( 'thematic_theme_opt', $legacy_options );
+			} else {
+				// Fresh theme installation: Add default settings to database
+				add_option( 'thematic_theme_opt', thematic_default_opt() );
+			}
+		}
 
-				array(	"name" => __('Info on Author Page','thematic'),
-						"desc" => __("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.",'thematic'),
-						"id" => $shortname."_authorinfo",
-						"std" => false,
-						"type" => "checkbox"),
+		register_setting ('thematic_opt_group', 'thematic_theme_opt', 'thematic_validate_opt');
+		
+		add_settings_section ('thematic_opt_section_main', '', 'thematic_do_opt_section_main', 'thematic_theme_opt');
+	
+		add_settings_field ('thematic_insert_opt', __('Index Insert Position', 'thematic')	, 'thematic_do_insert_opt'	, 'thematic_theme_opt', 'thematic_opt_section_main');
+		add_settings_field ('thematic_auth_opt',   __('Info on Author Page'	, 'thematic')	, 'thematic_do_auth_opt'	, 'thematic_theme_opt', 'thematic_opt_section_main');
+		add_settings_field ('thematic_footer_opt', __('Text in Footer'	, 'thematic')		, 'thematic_do_footer_opt'	, 'thematic_theme_opt', 'thematic_opt_section_main');
+		
+		// Show checkbox option for removing old options from database
+		if ( isset( $legacy_options ) && false !== $legacy_options ) {
+			add_settings_field ('thematic_legacy_opt', __('Remove Legacy Options'	, 'thematic'), 'thematic_do_legacy_opt'	, 'thematic_theme_opt', 'thematic_opt_section_main');
+		} 
+	
+	}
+}
 
-				array(	"name" => __('Text in Footer','thematic'),
-						"desc" => __("You can use the following shortcodes in your footer text: [wp-link] [theme-link] [loginout-link] [blog-title] [blog-link] [the-year]",'thematic'),
-						"id" => $shortname."_footertext",
-						"std" => __("Powered by [wp-link]. Built on the [theme-link].", 'thematic'),
-						"type" => "textarea",
-						"options" => array(	"rows" => "5",
-											"cols" => "94") ),
+add_action ('admin_init', 'thematic_opt_init');
 
-		);
+	
+/**
+ * A wrapper for get_option that provides WP multi site compatibility.
+ *
+ * Returns an option's value from wp_otions table in database
+ * or returns false if no value is found for that row 
+ *
+ * @since Thematic 1.0
+ */
+function thematic_get_wp_opt( $option_name, $default = false ) {
+	global $blog_id;
+	
+	if (THEMATIC_MB) {
+		$opt = get_blog_option( $blog_id, $option_name, $default );
+	} else {
+		$opt = get_option( $option_name, $default );
+	}
+	
+	return $opt;
+}
 
-function mytheme_add_admin() {
 
-    global $themename, $shortname, $options, $blog_id;
-    
-    $page ='';
-
-	if (isset($_GET["page"]) && !empty($_GET["page"])) $page = $_GET["page"];
+/**
+ * Returns or echoes a theme option value by its key
+ * or returns false if no value is found
+ *
+ * @uses thematic_get_wp_opt()
+ * @since Thematic 1.0
+ */
+function thematic_get_theme_opt( $opt_key, $echo = false ) {
 	
-    if ( $page == basename(__FILE__) ) {
-    	
-    	$action = '';
-    	
-    	if (isset($_REQUEST["action"]) && !empty($_REQUEST["action"])) $action = $_REQUEST["action"];
-    	
-        if ( 'save' == $action ) {
-
-			check_admin_referer('thematic-theme-options');
-    
-                foreach ($options as $value) {
-					
-                	if (THEMATIC_MB) 
-					{
-						if (isset($_REQUEST[ $value['id'] ])) {
-							update_blog_option( $blog_id, $value['id'], $_REQUEST[ $value['id'] ] );
-						} else {
-							update_blog_option( $blog_id, $value['id'], $value['std'] );
-						}
-					} 
-					
-					else 
-					
-					{
-						if (isset($_REQUEST[ $value['id'] ])) {
-							update_option( $value['id'], $_REQUEST[ $value['id'] ] );
-						} else {
-							update_option( $value['id'], $value['std'] );
-						}
-					}
-					
-				}			
+	$theme_opt = thematic_get_wp_opt( 'thematic_theme_opt' );
 	
-                header("Location: themes.php?page=theme-options.php&saved=true");
-                die;
-
-        } else if( 'reset' == $action ) {
-
-			check_admin_referer('thematic-reset');
-
-            foreach ($options as $value) {
-				if (THEMATIC_MB) 
-				{
-					delete_blog_option( $blog_id, $value['id'] );
-				} 
-					
-				else 
-					
-				{
-					delete_option( $value['id'] );
-				}
-			}
+	if ( isset( $theme_opt[$opt_key] ) ) {
+		if ( false === $echo ) {
+			return $theme_opt[$opt_key] ;
+		} else { 
+			echo $theme_opt[$opt_key];
+		}
+	} else {
+		return false;
+	}
+}
 
-            header("Location: themes.php?page=theme-options.php&reset=true");
-            die;
 
-        } else if ( 'resetwidgets' == $action ) {
-			check_admin_referer('thematic-reset-widgets');
-            update_option('sidebars_widgets',NULL);
-            header("Location: themes.php?page=theme-options.php&resetwidgets=true");
-            die;
-        } 
-    }
+/**
+ * Retrieves legacy Thematic options from database
+ * Returns theme as a sanitized array or false
+ *
+ * @uses thematic_theme_convert_legacy_opt
+ * 
+ * @since Thematic 1.0
+ */
+function thematic_convert_legacy_opt() {
+    $thm_insert_position = thematic_get_wp_opt( 'thm_insert_position' );
+    $thm_authorinfo = thematic_get_wp_opt( 'thm_authorinfo' );
+    $thm_footertext = thematic_get_wp_opt( 'thm_footertext' );
+    
+    // Return false if no options found
+    if ( false === $thm_insert_position && false === $thm_authorinfo && false === $thm_footertext )
+    	return false; 
+    	
+    // Return a sanitized array from legacy options if found
+    $legacy_sanitized_opt = array(
+    		'index_insert' 	=> intval( $thm_insert_position ),
+    		'author_info'  	=> ( $thm_authorinfo == "true" ) ? 1 : 0,
+    		'footer_txt' 	=> wp_kses_post( $thm_footertext ),
+    		'del_legacy_opt'=> 0
+    	);
+
+    return apply_filters( 'thematic_theme_convert_legacy_opt', $legacy_sanitized_opt );
+}
 
-    add_theme_page($themename." Options", "Thematic Options", 'edit_themes', basename(__FILE__), 'mytheme_admin');
+/**
+ * Returns default theme options.
+ *
+ * Filter: thematic_theme_default_opt
+ * 
+ * @since Thematic 1.0
+ *
+ */
+function thematic_default_opt() {
+	$thematic_default_opt = array(
+		'index_insert' 	=> 2,
+		'author_info'  	=> 0, // 0 = not checked 1 = checked
+		'footer_txt' 	=> 'Powered by [wp-link]. Built on the [theme-link].',
+		'del_legacy_opt'=> 0  // 0 = not checked 1 = check
+	);
+
+	return apply_filters( 'thematic_theme_default_opt', $thematic_default_opt );
+}	
 
+	
+/**
+ * Adds the theme option page as an admin menu item, 
+ * and queues the contextual help on theme options page load
+ *
+ * Filter: thematic_theme_add_opt_page
+ * The filter provides the ability for child themes to customize or remove and add 
+ * their own options page and queue contextual help in one function
+ * 
+ * @since Thematic 1.0
+ */
+ 
+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 = apply_filters ('thematic_theme_add_opt_page', $thematic_opt_page );
+	
+	if ( ! $thematic_opt_page ) {
+		return;
+	}
+	
+	add_action( "load-$thematic_opt_page", 'thematic_opt_page_help' );
 }
 
-function mytheme_admin() {
+add_action( 'admin_menu', 'thematic_opt_add_page' );
+
+
+/**
+ * Generates the help texts and help sidebar items for the options screen
+ *
+ * Filter: thematic_theme_opt_help_txt <br>
+ * Filter: thematic_theme_opt_help_sidebar <br>
+ * Override: childtheme_override_opt_page_help <br>
+ * 
+ * @since Thematic 1.0 
+ * @todo remove conditional compatibilty  WP version > 3.3 and remove fallback to 3.2
+ */
+if (function_exists('childtheme_override_opt_page_help')) {
+	function thematic_opt_page_help() {
+		childtheme_override_opt_page_help();
+	}
+} else {
+	function thematic_opt_page_help() {	
+		
+		$screen = get_current_screen();
+		
+		$sidebar  = '<p><strong>' . __( 'For more information:', 'thematic') . '</strong></p>';
+		$sidebar .= '<a href="http://thematictheme.com">ThematicTheme.com</a></p>';
+		$sidebar .= '<p><strong>' . __('For support:', 'thematic') . '</strong></p>';
+		$sidebar .= '<a href="http://thematictheme.com/forums/"> Thematic ';
+		$sidebar .= __('forums', 'thematic' ) . '</a></p>';
+		
+		$sidebar = apply_filters ( 'thematic_theme_opt_help_sidebar', $sidebar );
+		
+		$help =  '<p>' . __('The options below are enabled by the Thematic Theme framework and/or a child theme.', 'thematic') .' ';
+		$help .= __('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.', 'thematic') . '</p>';
+		
+		$help = apply_filters ( 'thematic_theme_opt_help_txt', $help );
+	
+        if ( method_exists( $screen, 'add_help_tab' ) ) {
+        	// WordPress 3.3
+			$screen->add_help_tab( array( 'title' => __( 'Overview', 'thematic' ), 'id' => 'theme-opt-help', 'content' => $help, ) );
+			$screen->set_help_sidebar( $sidebar );
+                        
+			} else {
+             	thematic_legacy_help();
+           	}
+        }
+}
 
-    global $themename, $shortname, $options;
+/**
+ * Adds a settings section to display legacy help text and theme links
+ *
+ * @since Thematic 1.0
+ * @todo remove Legacy help when two point relases of WP have occurred after 3.3
+ */
+function thematic_legacy_help() {
+        add_settings_section ('thematic_opt_help_section', '', 'thematic_do_legacy_help_section', 'thematic_opt_page');
+}
 
-    if (isset($_REQUEST["saved"]) && !empty($_REQUEST["saved"])) echo '<div id="message" class="updated fade"><p><strong>'.$themename.' '.__('settings saved.','thematic').'</strong></p></div>';
-    if (isset($_REQUEST["reset"]) && !empty($_REQUEST["reset"])) echo '<div id="message" class="updated fade"><p><strong>'.$themename.' '.__('settings reset.','thematic').'</strong></p></div>';
-    if (isset($_REQUEST["resetwidgets"]) && !empty($_REQUEST["resetwidgets"])) echo '<div id="message" class="updated fade"><p><strong>'.$themename.' '.__('widgets reset.','thematic').'</strong></p></div>';
-    
-?>
-<div class="wrap">
-<?php if ( function_exists('screen_icon') ) screen_icon(); ?>
-<h2><?php echo $themename; ?> Options</h2>
 
-<form method="post" action="">
+/**
+ * Renders the legacy help text and theme links
+ * 
+ * @since Thematic 1.0
+ * @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>') ;
+}
 
-	<?php wp_nonce_field('thematic-theme-options'); ?>
 
-	<table class="form-table">
+/**
+ * Renders the them options page
+ *
+ * @since Thematic 1.0 
+ */
+function thematic_do_opt_page() { ?>
 
-<?php foreach ($options as $value) { 
+ <div class="wrap">
+	<?php screen_icon(); ?>
+	<h2><?php printf( __( '%s Theme Options', 'thematic' ), get_current_theme() ); ?></h2>
+	<?php settings_errors(); ?>
 	
-	switch ( $value['type'] ) {
-		case 'text':
-		?>
-		<tr valign="top"> 
-			<th scope="row"><label for="<?php echo $value['id']; ?>"><?php echo __($value['name'],'thematic'); ?></label></th>
-			<td>
-				<input name="<?php echo $value['id']; ?>" id="<?php echo $value['id']; ?>" type="<?php echo $value['type']; ?>" value="<?php if (THEMATIC_MB) {if ( get_blog_option( $blog_id, $value['id'] ) != "") { echo get_blog_option( $blogid, $value['id'] ); } else { echo $value['std']; }} else {if ( get_option( $value['id'] ) != "") { echo get_option( $value['id'] ); } else { echo $value['std']; }} ?>" />
-				<?php echo __($value['desc'],'thematic'); ?>
-
-			</td>
-		</tr>
+	<form action="options.php" method="post" >
 		<?php
-		break;
-		
-		case 'select':
-		?>
-		<tr valign="top">
-			<th scope="row"><label for="<?php echo $value['id']; ?>"><?php echo __($value['name'],'thematic'); ?></label></th>
-			<td>
-				<select name="<?php echo $value['id']; ?>" id="<?php echo $value['id']; ?>">
-					<?php foreach ($value['options'] as $option) { ?>
-						<option<?php if(THEMATIC_MB){ if ( get_blog_option($blog_id, $value['id']) == $option) { echo ' selected="selected"'; } elseif (!get_option($value['id']) && $value['std'] == $option) { echo ' selected="selected"'; }} else { if ( get_option( $value['id'] ) == $option) { echo ' selected="selected"'; } elseif (!get_option($value['id']) && $value['std'] == $option) { echo ' selected="selected"'; }} ?>><?php echo $option; ?></option>
-					<?php } ?>
-				</select>
-			</td>
-		</tr>
-		<?php
-		break;
-		
-		case 'textarea':
-		$ta_options = $value['options'];
+			settings_fields( 'thematic_opt_group' );
+			do_settings_sections( 'thematic_theme_opt' );
+			submit_button();			
 		?>
-		<tr valign="top"> 
-			<th scope="row"><label for="<?php echo $value['id']; ?>"><?php echo __($value['name'],'thematic'); ?></label></th>
-			<td><textarea name="<?php echo $value['id']; ?>" id="<?php echo $value['id']; ?>" cols="<?php echo $ta_options['cols']; ?>" rows="<?php echo $ta_options['rows']; ?>"><?php
-				if (THEMATIC_MB)
-				{
-					if( get_blog_option($blog_id, $value['id']) != "") 
-					{
-						echo __(stripslashes(get_blog_option($blog_id, $value['id'])),'thematic');
-					}
-					else
-					{
-						echo __($value['std'],'thematic');
-					}
-				} 
-				else
-				{ 
-					if( get_option($value['id']) != "") 
-					{
-						echo __(stripslashes(get_option($value['id'])),'thematic');
-					}
-					else
-					{
-						echo __($value['std'],'thematic');
-					}
-				}
-				
-				?></textarea><br /><?php echo __($value['desc'],'thematic'); ?></td>
-		</tr>
-		<?php
-		break;
+	</form>
+ 
+ </div>
+ 
+<?php 
+}
 
-		case 'radio':
-		?>
-		<tr valign="top"> 
-			<th scope="row"><?php echo __($value['name'],'thematic'); ?></th>
-			<td>
-				<?php
-				
-				foreach ($value['options'] as $key=>$option)
-				{
-					if (THEMATIC_MB)
-					{
-						$radio_setting = get_blog_option($blog_id, $value['id']);						
-					}
-					else
-					{
-						$radio_setting = get_option($value['id']);						
-					}
-					if($radio_setting != '')
-					{
-						if (THEMATIC_MB)
-						{
-							if ($key == get_blog_option($blog_id, $value['id']) ) 
-							{
-								$checked = "checked=\"checked\"";
-							}
-							else
-							{
-								$checked = "";
-							}
-						}
-						else
-						{
-							if ($key == get_option($value['id']) ) 
-							{
-								$checked = "checked=\"checked\"";
-							}
-							else
-							{
-								$checked = "";
-							}
-						}
-					}
-					else
-					{
-						if($key == $value['std'])
-						{
-							$checked = "checked=\"checked\"";
-						}
-						else
-						{
-							$checked = "";
-						}
-					}
-				?>
-				<input type="radio" name="<?php echo $value['id']; ?>" id="<?php echo $value['id'] . $key; ?>" value="<?php echo $key; ?>" <?php echo $checked; ?> /><label for="<?php echo $value['id'] . $key; ?>"><?php echo $option; ?></label><br />
-				<?php 
-				} ?>
-			</td>
-		</tr>
-		<?php
-		break;
-		
-		case 'checkbox':
-		?>
-		<tr valign="top"> 
-			<th scope="row"><?php echo __($value['name'],'thematic'); ?></th>
-			<td>
-				<?php
-					if(get_option($value['id'])){
-						$checked = "checked=\"checked\"";
-					}else{
-						$checked = "";
-					}
-				?>
-				<input type="checkbox" name="<?php echo $value['id']; ?>" id="<?php echo $value['id']; ?>" value="true" <?php echo $checked; ?> />
-				<label for="<?php echo $value['id']; ?>"><?php echo __($value['desc'],'thematic'); ?></label>
-			</td>
-		</tr>
-		<?php
-		break;
 
-		default:
+/**
+ * Renders the "Main" settings section. This is left blank in Theamatic and outputs nothing
+ *
+ * Filter: thematic_theme_opt_section_main
+ *
+ * @since Thematic 1.0
+ */
+function thematic_do_opt_section_main() {
+	$thematic_opt_section_main = '';
+	echo ( apply_filters( 'thematic_theme_opt_section_main' , $thematic_opt_section_main ) );
+}
 
-		break;
-	}
+
+/**
+ * Renders Index Insert elements
+ *
+ * @since Thematic 1.0
+ */
+function thematic_do_insert_opt() { 
+?>
+	<input type="text" maxlength="4" size="4" value="<?php esc_attr_e( (thematic_get_theme_opt('index_insert') ) ) ;  ?>" id="thm_insert_position" name="thematic_theme_opt[index_insert]">
+	<label for="thm_insert_position"><?php _e('The Index Insert widget area will appear after this post number. Entering nothing or 0 will disable this feature.','thematic'); ?></label>
+<?php 
 }
+
+
+/**
+ * Renders Author Info elements
+ *
+ * @since Thematic 1.0
+ */
+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>
+<?php
+}
+
 
-	</table>
-
-	<p class="submit">
-		<input class="button-primary" name="save" type="submit" value="<?php _e('Save changes','thematic'); ?>" />    
-		<input type="hidden" name="action" value="save" />
-	</p>
-</form>
-<form method="post" action="">
-	<?php wp_nonce_field('thematic-reset'); ?>
-	<p class="submit">
-		<input class="button-secondary" name="reset" type="submit" value="<?php _e('Reset','thematic'); ?>" />
-		<input type="hidden" name="action" value="reset" />
-	</p>
-</form>
-<form method="post" action="">
-	<?php wp_nonce_field('thematic-reset-widgets'); ?>
-	<p class="submit">
-		<input class="button-secondary" name="reset_widgets" type="submit" value="<?php _e('Reset Widgets','thematic'); ?>" />
-		<input type="hidden" name="action" value="resetwidgets" />
-	</p>
-</form>
-
-<p><?php _e('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.', 'thematic'); ?></p>
-</div>
+/**
+ * Renders Footer Text elements
+ *
+ * @since Thematic 1.0
+ */
+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]
 <?php
 }
 
-add_action('admin_menu' , 'mytheme_add_admin'); 
 
+/**
+ * Renders Leagcy Options elements
+ *
+ * @since Thematic 1.0
+ */
+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
+}
 
-?>
\ No newline at end of file
+
+/**
+ * Validates theme options form post data.
+ * Provides error reporting for invalid input.
+ *
+ * Override: childtheme_override_validate_opt <br>
+ * Filter: thematic_theme_opt_validation
+ * 
+ * @since Thematic 1.0 
+ */
+if (function_exists('childtheme_override_validate_opt')) {
+	function thematic_thematic_validate_opt() {
+		childtheme_override_validate_opt();
+	}
+} else {
+ 	function thematic_validate_opt($input){
+ 	   $output = thematic_get_wp_opt( 'thematic_theme_opt', thematic_default_opt() );	
+ 	   
+ 	   // Index Insert position must be a non-negative number
+ 	   if ( !is_numeric( $input['index_insert'] ) || $input['index_insert'] < 0 )  {
+ 	   		add_settings_error(
+ 	   		'thematic_theme_opt',
+ 	   		'thematic_insert_opt',
+ 	   		__('The index insert position value must be a number equal to or greater than zero. This setting has been reverted to the previous value.', 'thematic' ),
+ 	   		'error'
+ 	   		);
+ 	   } else {
+ 	   	// A sanitize numeric value to ensure a whole number
+ 	   	$output['index_insert'] = intval( $input['index_insert'] );
+ 	   }
+ 	   
+ 	   // Author Info CheckBox value either 1(yes) or 0(no)
+ 	   	$output['author_info'] =  ( $input['author_info'] == 0 ? 0 : 1 );
+ 	 
+ 	   // Footer Text sanitized allowing HTML and WP shortcodes
+ 	   if ( isset( $input['footer_txt'] ) ) {
+ 	   	$output['footer_txt'] = wp_kses_post( $input['footer_txt'] ) ;	
+ 	   }
+ 	   
+ 	   // Remove Legacy Options CheckBox value either 1(yes) or 0(no)
+ 	   $output['del_legacy_opt'] = ( $input['del_legacy_opt'] == 0 ? 0 : 1 );
+ 	   
+ 	   if ( 1 == $output['del_legacy_opt'] ) {
+ 	   	
+ 	   	// Remove options if the choice is yes
+ 	   	delete_option('thm_insert_position');
+ 	   	delete_option('thm_authorinfo');
+ 	   	delete_option('thm_footertext');
+ 	   	
+ 	   	// Reset checkbox value to unchecked in case a legacy set of options is ever saved to database again
+ 	   	$output['del_legacy_opt'] = 0;
+ 	   }
+ 	   	
+ 	   return apply_filters( 'thematic_theme_opt_validation', $output, $input );
+ 	}
+} 
diff --git a/wp-content/themes/thematic/library/extensions/widgets-extensions.php b/wp-content/themes/thematic/library/extensions/widgets-extensions.php
index 44e8d7ec1fe05e3bb5ae8036e6169a4feb08350f..026f0167f548e4b321a043ed8fec5d93df230da3 100644
--- a/wp-content/themes/thematic/library/extensions/widgets-extensions.php
+++ b/wp-content/themes/thematic/library/extensions/widgets-extensions.php
@@ -1,38 +1,68 @@
 <?php
 
+/**
+ * Widgets Extensions
+ *
+ * @package ThematicCoreLibrary
+ * @subpackage WidgetsExtensions
+ */
+
+
+/**
+ * Displays a filterable Search Form
+ *
+ * This function is called from the searchform.php template. 
+ * That template is called by the WP function get_search_form()
+ *
+ * Filter: search_field_value Controls the input element's size attribute <br>
+ * Filter: thematic_search_submit Controls the form's "submit" input element <br>
+ * Filters: thematic_search_form Controls the entire from output just before display <br>
+ *
+ * @see Thematic_Widget_Search
+ * @link http://codex.wordpress.org/Function_Reference/get_search_form Codex: get_search_form()
+ */
 function thematic_search_form() {
-				$search_form_length = apply_filters('thematic_search_form_length', '32');
-				$search_form = "\n" . "\t";
-				$search_form .= '<form id="searchform" method="get" action="' . get_bloginfo('url') .'/">';
-				$search_form .= "\n" . "\t" . "\t";
-				$search_form .= '<div>';
-				$search_form .= "\n" . "\t" . "\t". "\t";
-				if (is_search()) {
-						$search_form .= '<input id="s" name="s" type="text" value="' . esc_html(stripslashes($_GET['s'])) .'" size="' . $search_form_length . '" tabindex="1" />';
-				} else {
-						$value = __('To search, type and hit enter', 'thematic');
-						$value = apply_filters('search_field_value',$value);
-						$search_form .= '<input id="s" name="s" type="text" value="' . $value . '" onfocus="if (this.value == \'' . $value . '\') {this.value = \'\';}" onblur="if (this.value == \'\') {this.value = \'' . $value . '\';}" size="'. $search_form_length .'" tabindex="1" />';
-				}
-				$search_form .= "\n" . "\t" . "\t". "\t";
-
-				$search_submit = '<input id="searchsubmit" name="searchsubmit" type="submit" value="' . __('Search', 'thematic') . '" tabindex="2" />';
-
-				$search_form .= apply_filters('thematic_search_submit', $search_submit);
-
-				$search_form .= "\n" . "\t" . "\t";
-				$search_form .= '</div>';
-
-				$search_form .= "\n" . "\t";
-				$search_form .= '</form>';
-
-				echo apply_filters('thematic_search_form', $search_form);
-
+	$search_form_length = apply_filters('thematic_search_form_length', '32');
+	$search_form  = "\n\t\t\t\t\t\t";
+	$search_form .= '<form id="searchform" method="get" action="' . home_url() .'/">';
+	$search_form .= "\n\n\t\t\t\t\t\t\t";
+	$search_form .= '<div>';
+	$search_form .= "\n\t\t\t\t\t\t\t\t";
+	if (is_search()) {
+	    	$search_form .= '<input id="s" name="s" type="text" value="' . esc_html ( stripslashes( $_GET['s'] ) ) .'" size="' . $search_form_length . '" tabindex="1" />';
+	} else {
+	    	$value = __( 'To search, type and hit enter', 'thematic' );
+	    	$value = apply_filters( 'search_field_value',$value );
+	    	$search_form .= '<input id="s" name="s" type="text" value="' . $value . '" onfocus="if (this.value == \'' . $value . '\') {this.value = \'\';}" onblur="if (this.value == \'\') {this.value = \'' . $value . '\';}" size="'. $search_form_length .'" tabindex="1" />';
+	}
+	$search_form .= "\n\n\t\t\t\t\t\t\t\t";
+	
+	$search_submit = '<input id="searchsubmit" name="searchsubmit" type="submit" value="' . __('Search', 'thematic') . '" tabindex="2" />';
+	
+	$search_form .= apply_filters('thematic_search_submit', $search_submit);
+	
+	$search_form .= "\n\t\t\t\t\t\t\t";
+	$search_form .= '</div>';
+	
+	$search_form .= "\n\n\t\t\t\t\t\t";
+	$search_form .= '</form>' . "\n\n\t\t\t\t\t";
+	
+	echo apply_filters('thematic_search_form', $search_form);
 }
 
-function thematic_widgets_array()
-{
-	// Define array for the widgetized areas
+/**
+ * Defines the array for creating and displaying the widgetized areas
+ * in the WP-Admin and front-end of the site.
+ * 
+ * Filter: thematic_widgetized_areas
+ *
+ * @uses thematic_before_widget()
+ * @uses thematic_after_widget()
+ * @uses thematic_before_title()
+ * @uses thematic_after_title()
+ * @return array
+ */
+function thematic_widgets_array() {
 	$thematic_widgetized_areas = array(
 		'Primary Aside' => array(
 			'admin_menu_order' => 100,
@@ -235,48 +265,28 @@ function thematic_widgets_array()
 	
 }
 
+/**
+ * Registers Widget Areas(Sidebars) and pre-sets default widgets
+ *
+ * @uses thematic_presetwidgets
+ * @todo consider deprecating the widgets directory search this seems to have never been used
+ */
 function thematic_widgets_init() {
 
 	$thematic_widgetized_areas = thematic_widgets_array();
+	foreach ( $thematic_widgetized_areas as $key => $value ) {
+		register_sidebar( $thematic_widgetized_areas[$key]['args'] );
+	}  
 	
-	if ( !function_exists('register_sidebars') )
-			return;
-
-	foreach ($thematic_widgetized_areas as $key => $value) {
-		register_sidebar($thematic_widgetized_areas[$key]['args']);
-	}
-	  
-    // we will check for a Thematic widgets directory and and add and activate additional widgets
-    // Thanks to Joern Kretzschmar
-	  $widgets_dir = @ dir(ABSPATH . '/wp-content/themes/' . get_template() . '/widgets');
-	  if ($widgets_dir)	{
-		  while(($widgetFile = $widgets_dir->read()) !== false) {
-			 if (!preg_match('|^\.+$|', $widgetFile) && preg_match('|\.php$|', $widgetFile))
-				  include(ABSPATH . '/wp-content/themes/' . get_template() . '/widgets/' . $widgetFile);
-		  }
-	  }
-
-	  // we will check for the child themes widgets directory and add and activate additional widgets
-    // Thanks to Joern Kretzschmar 
-	  $widgets_dir = @ dir(ABSPATH . '/wp-content/themes/' . get_stylesheet() . '/widgets');
-	  if ((TEMPLATENAME != THEMENAME) && ($widgets_dir)) {
-		  while(($widgetFile = $widgets_dir->read()) !== false) {
-			 if (!preg_match('|^\.+$|', $widgetFile) && preg_match('|\.php$|', $widgetFile))
-				  include(ABSPATH . '/wp-content/themes/' . get_stylesheet() . '/widgets/' . $widgetFile);
-		  }
-	  }   
-
 	// Remove WP default Widgets
 	// WP 2.8 function using $widget_class
-	
-    unregister_widget('WP_Widget_Meta');
-    unregister_widget('WP_Widget_Search');
+    unregister_widget( 'WP_Widget_Meta' );
+    unregister_widget( 'WP_Widget_Search' );
 
 	// Finished intializing Widgets plugin, now let's load the thematic default widgets
-	
-	register_widget('THM_Widget_Search');
-	register_widget('THM_Widget_Meta');
-	register_widget('THM_Widget_RSSlinks');
+	register_widget( 'Thematic_Widget_Search' );
+	register_widget( 'Thematic_Widget_Meta' );
+	register_widget( 'Thematic_Widget_RSSlinks' );
 
 	// Pre-set Widgets
 	$preset_widgets = array (
@@ -291,20 +301,28 @@ function thematic_widgets_init() {
 
 }
 
-// Runs our code at the end to check that everything needed has loaded
 add_action( 'widgets_init', 'thematic_widgets_init' );
 
-// Action hook for initializing the preset widgets
+/**
+ * Registers action hook.
+ *
+ * Action Hook: thematic_presetwidgets
+ */
 function thematic_presetwidgets() {
 	do_action( 'thematic_presetwidgets' );
 }
 
-// Initialize the preset widgets
-if (function_exists('childtheme_override_init_presetwidgets'))  {
+if ( function_exists( 'childtheme_override_init_presetwidgets') )  {
+    /**
+     * @ignore
+     */
     function thematic_init_presetwidgets() {
     	childtheme_override_init_presetwidgets();
     }
 } else {
+	/**
+	 * Sets the "pre-set" widgets in options table
+	 */
 	function thematic_init_presetwidgets() {
 		update_option( 'widget_search', array( 2 => array( 'title' => '' ), '_multiwidget' => 1 ) );
 		update_option( 'widget_pages', array( 2 => array( 'title' => ''), '_multiwidget' => 1 ) );
@@ -315,185 +333,305 @@ if (function_exists('childtheme_override_init_presetwidgets'))  {
 		update_option( 'widget_meta', array( 2 => array( 'title' => ''), '_multiwidget' => 1 ) );
 	}
 }
+
 add_action( 'thematic_presetwidgets', 'thematic_init_presetwidgets' );
 
-// We connect the relevant functions to the action hooks
+/**
+ * Add wigitized area functions to specific action hooks.
+ *
+ * @uses thematic_widgets_array to get function names and action hooks.
+ */
 function thematic_connect_functions() {
 
 	$thematic_widgetized_areas = thematic_widgets_array();
 
-	foreach ($thematic_widgetized_areas as $key => $value) {
-		if (!has_action($thematic_widgetized_areas[$key]['action_hook'], $thematic_widgetized_areas[$key]['function'])) {
-			add_action($thematic_widgetized_areas[$key]['action_hook'], $thematic_widgetized_areas[$key]['function'], $thematic_widgetized_areas[$key]['priority']);	
-		}
+	foreach ( $thematic_widgetized_areas as $key => $value ) {
+		if ( !has_action( $thematic_widgetized_areas[$key]['action_hook'], $thematic_widgetized_areas[$key]['function'] ) )
+			add_action( $thematic_widgetized_areas[$key]['action_hook'], $thematic_widgetized_areas[$key]['function'], $thematic_widgetized_areas[$key]['priority'] );	
 	}
 
 }
-add_action('template_redirect', 'thematic_connect_functions');
 
-// We sort our array of widgetized areas to get a nice list display under wp-admin
+add_action( 'wp_head', 'thematic_connect_functions');
+
+
+/**
+ * Filters the order in which the Widget Areas (Sidebars) will be listed in the WP-Admin/Widgets
+ * 
+ * It sorts the array generated by thematic_widgetized_areas() by [admin_menu_order]
+ * allowing for child themes to filter thematic_widgetized_areas to control
+ * the sidebar list order in the WP-Admin/Widgets.
+ * 
+ * @see thematic_widgetized_areas
+ * @param array
+ * @return array
+ */
 function thematic_sort_widgetized_areas($content) {
 	asort($content);
 	return $content;
 }
 add_filter('thematic_widgetized_areas', 'thematic_sort_widgetized_areas', 100);
 
-// We start our functions for the widgetized areas here
 
-// Define the Primary Aside 
-function thematic_primary_aside() {
-	if (is_active_sidebar('primary-aside')) {
-		echo thematic_before_widget_area('primary-aside');
-		dynamic_sidebar('primary-aside');
-		echo thematic_after_widget_area('primary-aside');
+/**
+ * Displays the Primary Aside
+ * 
+ * @uses thematic_before_widget_area
+ * @uses thematic_after_widget_area
+ */
+function thematic_primary_aside() {	
+	global $wp_customize;
+	$args =	array(	
+			'before_title' 	=> thematic_before_title(),
+			'after_title' 	=> thematic_after_title()
+			);
+			
+	if ( is_active_sidebar( 'primary-aside' ) ) { 
+		echo thematic_before_widget_area( 'primary-aside' );
+		dynamic_sidebar( 'primary-aside' );
+		echo thematic_after_widget_area( 'primary-aside' );
+	// WordPress 3.4
+	} elseif ( method_exists ( $wp_customize,'is_preview' ) && $wp_customize->is_preview()  ){ 
+		echo thematic_before_widget_area( 'primary-aside' );
+		the_widget('Thematic_Widget_Search', null , $args);
+		the_widget('WP_Widget_Pages', null , $args);
+		the_widget('WP_Widget_Categories', null , $args);
+		the_widget('WP_Widget_Archives', null, $args);
+		echo thematic_after_widget_area( 'primary-aside' );
 	}
 }
 
-// Define the Secondary Aside
+/**
+ * Displays the Secondary Aside 
+ *
+ * @uses thematic_before_widget_area
+ * @uses thematic_after_widget_area
+ */
 function thematic_secondary_aside() {
-	if (is_active_sidebar('secondary-aside')) {
-		echo thematic_before_widget_area('secondary-aside');
-		dynamic_sidebar('secondary-aside');
-		echo thematic_after_widget_area('secondary-aside');
+	global $wp_customize;
+	$args =	array(	
+			'before_title' 	=> thematic_before_title(),
+			'after_title' 	=> thematic_after_title()
+			);
+				
+	if ( is_active_sidebar( 'secondary-aside' ) ) {
+		echo thematic_before_widget_area( 'secondary-aside' );
+		dynamic_sidebar( 'secondary-aside' );
+		echo thematic_after_widget_area( 'secondary-aside' );
+	// WordPress 3.4
+	} elseif ( method_exists ( $wp_customize,'is_preview' ) && $wp_customize->is_preview()  ){ 
+		echo thematic_before_widget_area( 'secondary-aside' );
+		the_widget('Thematic_Widget_RSS', null, $args);
+		the_widget('Thematic_Widget_Meta', null, $args); 
+		echo thematic_after_widget_area( 'secondary-aside' );
 	}
 }
 
-// Define the 1st Subsidiary Aside
+/**
+ * Displays the 2nd Subsidiary Aside
+ *
+ * @uses thematic_before_widget_area
+ * @uses thematic_after_widget_area
+ */
 function thematic_1st_subsidiary_aside() {
-	if (is_active_sidebar('1st-subsidiary-aside')) {
-		echo thematic_before_widget_area('1st-subsidiary-aside');
-		dynamic_sidebar('1st-subsidiary-aside');
-		echo thematic_after_widget_area('1st-subsidiary-aside');
+	if ( is_active_sidebar( '1st-subsidiary-aside' ) ) {
+		echo thematic_before_widget_area( '1st-subsidiary-aside' );
+		dynamic_sidebar( '1st-subsidiary-aside' );
+		echo thematic_after_widget_area( '1st-subsidiary-aside' );
 	}
 }
 
-// Define the 2nd Subsidiary Aside
+/**
+ * Displays the 2nd Subsidiary Aside
+ *
+ * @uses thematic_before_widget_area
+ * @uses thematic_after_widget_area
+ */
 function thematic_2nd_subsidiary_aside() {
-	if (is_active_sidebar('2nd-subsidiary-aside')) {
-		echo thematic_before_widget_area('2nd-subsidiary-aside');
-		dynamic_sidebar('2nd-subsidiary-aside');
-		echo thematic_after_widget_area('2nd-subsidiary-aside');
+	if ( is_active_sidebar( '2nd-subsidiary-aside' ) ) {
+		echo thematic_before_widget_area('2nd-subsidiary-aside' );
+		dynamic_sidebar( '2nd-subsidiary-aside' );
+		echo thematic_after_widget_area( '2nd-subsidiary-aside' );
 	}
 }
 
-// Define the 3rd Subsidiary Aside
+/**
+ * Displays the 3rd Subsidiary Aside
+ *
+ * @uses thematic_before_widget_area
+ * @uses thematic_after_widget_area
+ */
 function thematic_3rd_subsidiary_aside() {
-	if (is_active_sidebar('3rd-subsidiary-aside')) {
-		echo thematic_before_widget_area('3rd-subsidiary-aside');
-		dynamic_sidebar('3rd-subsidiary-aside');
-		echo thematic_after_widget_area('3rd-subsidiary-aside');
+	if ( is_active_sidebar( '3rd-subsidiary-aside' ) ) {
+		echo thematic_before_widget_area('3rd-subsidiary-aside' );
+		dynamic_sidebar( '3rd-subsidiary-aside' );
+		echo thematic_after_widget_area( '3rd-subsidiary-aside' );
 	}
 }
 
-// Define the Index Top
+/**
+ * Displays the Index Top
+ *
+ * @uses thematic_before_widget_area
+ * @uses thematic_after_widget_area
+ */
 function thematic_index_top() {
-	if (is_active_sidebar('index-top')) {
-		echo thematic_before_widget_area('index-top');
+	if ( is_active_sidebar( 'index-top' ) ) {
+		echo thematic_before_widget_area( 'index-top' );
 		dynamic_sidebar('index-top');
-		echo thematic_after_widget_area('index-top');
+		echo thematic_after_widget_area( 'index-top' );
 	}
 }
 
-// Define the Index Insert
+/**
+ * Displays the Index Insert
+ *
+ * @uses thematic_before_widget_area
+ * @uses thematic_after_widget_area
+ */
 function thematic_index_insert() {
-	if (is_active_sidebar('index-insert')) {
-		echo thematic_before_widget_area('index-insert');
-		dynamic_sidebar('index-insert');
-		echo thematic_after_widget_area('index-insert');
+	if ( is_active_sidebar( 'index-insert' ) ) {
+		echo thematic_before_widget_area( 'index-insert' );
+		dynamic_sidebar( 'index-insert' );
+		echo thematic_after_widget_area( 'index-insert' );
 	}
 }
 
-// Define the Index Bottom
+/**
+ * Displays the Index Bottom
+ *
+ * @uses thematic_before_widget_area
+ * @uses thematic_after_widget_area
+ */
 function thematic_index_bottom() {
-	if (is_active_sidebar('index-bottom')) {
-		echo thematic_before_widget_area('index-bottom');
-		dynamic_sidebar('index-bottom');
-		echo thematic_after_widget_area('index-bottom');
+	if ( is_active_sidebar( 'index-bottom' ) ) {
+		echo thematic_before_widget_area( 'index-bottom' );
+		dynamic_sidebar( 'index-bottom' );
+		echo thematic_after_widget_area( 'index-bottom' );
 	}
 }
 
-// Define the Single Top
+/**
+ * Displays the Single Top
+ *
+ * @uses thematic_before_widget_area
+ * @uses thematic_after_widget_area
+ */
 function thematic_single_top() {
-	if (is_active_sidebar('single-top')) {
-		echo thematic_before_widget_area('single-top');
-		dynamic_sidebar('single-top');
-		echo thematic_after_widget_area('single-top');
+	if ( is_active_sidebar( 'single-top' ) ) {
+		echo thematic_before_widget_area( 'single-top' );
+		dynamic_sidebar( 'single-top' );
+		echo thematic_after_widget_area( 'single-top' );
 	}
 }
 
-// Define the Single Insert
+/**
+ * Displays the Single Insert
+ *
+ * @uses thematic_before_widget_area
+ * @uses thematic_after_widget_area
+ */
 function thematic_single_insert() {
-	if (is_active_sidebar('single-insert')) {
-		echo thematic_before_widget_area('single-insert');
-		dynamic_sidebar('single-insert');
-		echo thematic_after_widget_area('single-insert');
+	if ( is_active_sidebar( 'single-insert' ) ) {
+		echo thematic_before_widget_area( 'single-insert' );
+		dynamic_sidebar( 'single-insert' );
+		echo thematic_after_widget_area( 'single-insert' );
 	}
 }
 
-// Define the Single Bottom
+/**
+ * Displays the Single Bottom
+ *
+ * @uses thematic_before_widget_area
+ * @uses thematic_after_widget_area
+ */
 function thematic_single_bottom() {
-	if (is_active_sidebar('single-bottom')) {
-		echo thematic_before_widget_area('single-bottom');
-		dynamic_sidebar('single-bottom');
-		echo thematic_after_widget_area('single-bottom');
+	if ( is_active_sidebar( 'single-bottom' ) ) {
+		echo thematic_before_widget_area( 'single-bottom' );
+		dynamic_sidebar( 'single-bottom' );
+		echo thematic_after_widget_area( 'single-bottom' );
 	}
 }
 
-// Define the Page Top
+/**
+ * Displays the Page Top
+ *
+ * @uses thematic_before_widget_area
+ * @uses thematic_after_widget_area
+ */
 function thematic_page_top() {
-	if (is_active_sidebar('page-top')) {
-		echo thematic_before_widget_area('page-top');
-		dynamic_sidebar('page-top');
-		echo thematic_after_widget_area('page-top');
+	if ( is_active_sidebar( 'page-top' ) ) {
+		echo thematic_before_widget_area( 'page-top' );
+		dynamic_sidebar( 'page-top' );
+		echo thematic_after_widget_area( 'page-top' );
 	}
 }
 
-// Define the Page Bottom
+/**
+ * Displays the Page Bottom
+ *
+ * @uses thematic_before_widget_area
+ * @uses thematic_after_widget_area
+ */
 function thematic_page_bottom() {
-	if (is_active_sidebar('page-bottom')) {
-		echo thematic_before_widget_area('page-bottom');
-		dynamic_sidebar('page-bottom');
-		echo thematic_after_widget_area('page-bottom');
+	if ( is_active_sidebar( 'page-bottom' ) ) {
+		echo thematic_before_widget_area( 'page-bottom' );
+		dynamic_sidebar( 'page-bottom' );
+		echo thematic_after_widget_area( 'page-bottom' );
 	}
 }
 
-// this function returns the opening CSS markup for the widget area 
+/**
+ * Returns the opening CSS markup before the widget area
+ *
+ * Filter: thematic_before_widget_area
+ * 
+ * @param $hook determines the markup specific to the widget area
+ * @return string 
+ */
 function thematic_before_widget_area($hook) {
-	$content =  "\n";
-	if ($hook == 'primary-aside') {
-		$content .= '<div id="primary" class="aside main-aside">' . "\n";
-	} elseif ($hook == 'secondary-aside') {
-		$content .= '<div id="secondary" class="aside main-aside">' . "\n";
-	} elseif ($hook == '1st-subsidiary-aside') {
-		$content .= '<div id="first" class="aside sub-aside">' . "\n";
-	} elseif ($hook == '2nd-subsidiary-aside') {
-		$content .= '<div id="second" class="aside sub-aside">' . "\n";
-	} elseif ($hook == '3rd-subsidiary-aside') {
-		$content .= '<div id="third" class="aside sub-aside">' . "\n";
+	$content =  "\n\t\t";
+	if ( $hook == 'primary-aside' ) {
+		$content .= '<div id="primary" class="aside main-aside">' . "\n\n";
+	} elseif ( $hook == 'secondary-aside' ) {
+		$content .= '<div id="secondary" class="aside main-aside">' . "\n\n";
+	} elseif ( $hook == '1st-subsidiary-aside' ) {
+		$content .= '<div id="first" class="aside sub-aside">' . "\n\n";
+	} elseif ( $hook == '2nd-subsidiary-aside' ) {
+		$content .= '<div id="second" class="aside sub-aside">' . "\n\n";
+	} elseif ( $hook == '3rd-subsidiary-aside' ) {
+		$content .= '<div id="third" class="aside sub-aside">' . "\n\n";
 	} else {
 		$content .= '<div id="' . $hook . '" class="aside">' ."\n";
 	}
-	$content .= "\t" . '<ul class="xoxo">' . "\n";
-	return apply_filters('thematic_before_widget_area', $content);
+	$content .= "\t\t\t" . '<ul class="xoxo">' . "\n\n\t\t\t\t";
+	return apply_filters( 'thematic_before_widget_area', $content, $hook );
 }
 
-// this function returns the clossing CSS markup for the widget area
+/**
+ * Returns the closing CSS markup before the widget area
+ *
+ * Filter: thematic_after_widget_area
+ * 
+ * @param $hook determines the markup specific to the widget area
+ * @return string 
+ */
 function thematic_after_widget_area($hook) {
-	$content = "\n" . "\t" . '</ul>' ."\n";
-	if ($hook == 'primary-aside') {
-		$content .= '</div><!-- #primary .aside -->' ."\n";
-	} elseif ($hook == 'secondary-aside') {
-		$content .= '</div><!-- #secondary .aside -->' ."\n";
-	} elseif ($hook == '1st-subsidiary-aside') {
-		$content .= '</div><!-- #first .aside -->' ."\n";
-	} elseif ($hook == '2nd-subsidiary-aside') {
-		$content .= '</div><!-- #second .aside -->' ."\n";
-	} elseif ($hook == '3rd-subsidiary-aside') {
-		$content .= '</div><!-- #third .aside -->' ."\n";
+	$content = "\n\t\t\t\t" . '</ul>' ."\n\n\t\t";
+	if ( $hook == 'primary-aside' ) {
+		$content .= '</div><!-- #primary .aside -->' ."\n\n";
+	} elseif ( $hook == 'secondary-aside' ) {
+		$content .= '</div><!-- #secondary .aside -->' ."\n\n";
+	} elseif ( $hook == '1st-subsidiary-aside' ) {
+		$content .= '</div><!-- #first .aside -->' ."\n\n";
+	} elseif ( $hook == '2nd-subsidiary-aside' ) {
+		$content .= '</div><!-- #second .aside -->' ."\n\n";
+	} elseif ( $hook == '3rd-subsidiary-aside' ) {
+		$content .= '</div><!-- #third .aside -->' ."\n\n";
 	} else {
-		$content .= '</div><!-- #' . $hook . ' .aside -->' ."\n";
+		$content .= '</div><!-- #' . $hook . ' .aside -->' ."\n\n";
 	} 
-	return apply_filters('thematic_after_widget_area', $content);
+	return apply_filters( 'thematic_after_widget_area', $content, $hook );
 }
 
 ?>
\ No newline at end of file
diff --git a/wp-content/themes/thematic/library/extensions/widgets.php b/wp-content/themes/thematic/library/extensions/widgets.php
index 1f422f0f6e68226bbad75d0fc2c9fcd2bd4db7fb..9b84aa90e43de39383b0c7a2912cf7f46ab2c0f2 100644
--- a/wp-content/themes/thematic/library/extensions/widgets.php
+++ b/wp-content/themes/thematic/library/extensions/widgets.php
@@ -1,39 +1,58 @@
 <?php
+/**
+ * Widgets
+ *
+ * @package ThematicCoreLibrary
+ * @subpackage Widgets
+ */
 
 
-// CSS markup before the widget
+/**
+ * Markup before the widget
+ */
 function thematic_before_widget() {
 	$content = '<li id="%1$s" class="widgetcontainer %2$s">';
 	return apply_filters('thematic_before_widget', $content);
 }
 
-// CSS markup after the widget
+
+/**
+ * Markup after the widget
+ */
 function thematic_after_widget() {
 	$content = '</li>';
 	return apply_filters('thematic_after_widget', $content);
 }
 
-// CSS markup before the widget title
+
+
+/**
+ * Markup before the widget title
+ */
 function thematic_before_title() {
 	$content = "<h3 class=\"widgettitle\">";
 	return apply_filters('thematic_before_title', $content);
 }
 
-// CSS markup after the widget title
+
+/**
+ * Markup after the widget title
+ */
 function thematic_after_title() {
 	$content = "</h3>\n";
 	return apply_filters('thematic_after_title', $content);
 }
 
+
 /**
  * Search widget class
  *
  * @since 0.9.6.3
  */
-class THM_Widget_Search extends WP_Widget {
+class Thematic_Widget_Search extends WP_Widget {
 
-	function THM_Widget_Search() {
-		$widget_ops = array('classname' => 'widget_search', 'description' => __( "A search form for your blog") );
+	function Thematic_Widget_Search() {
+		$widget_ops = array('classname' => 'widget_search', 'description' => __( 'A search form for your blog', 'thematic') );
 		$this->WP_Widget('search', __('Search', 'thematic'), $widget_ops);
 	}
 
@@ -55,7 +74,7 @@ class THM_Widget_Search extends WP_Widget {
 		$instance = wp_parse_args( (array) $instance, array( 'title' => '') );
 		$title = $instance['title'];
 ?>
-		<p><label for="<?php echo $this->get_field_id('title'); ?>"><?php _e('Title:'); ?> <input class="widefat" id="<?php echo $this->get_field_id('title'); ?>" name="<?php echo $this->get_field_name('title'); ?>" type="text" value="<?php echo esc_attr($title); ?>" /></label></p>
+		<p><label for="<?php echo $this->get_field_id('title'); ?>"><?php _e('Title:', 'thematic'); ?> <input class="widefat" id="<?php echo $this->get_field_id('title'); ?>" name="<?php echo $this->get_field_name('title'); ?>" type="text" value="<?php echo esc_attr($title); ?>" /></label></p>
 <?php
 	}
 
@@ -75,9 +94,9 @@ class THM_Widget_Search extends WP_Widget {
  *
  * @since 0.9.6.3
  */
-class THM_Widget_Meta extends WP_Widget {
+class Thematic_Widget_Meta extends WP_Widget {
 
-	function THM_Widget_Meta() {
+	function Thematic_Widget_Meta() {
 		$widget_ops = array('classname' => 'widget_meta', 'description' => __( "Log in/out and admin", 'thematic') );
 		$this->WP_Widget('meta', __('Meta', 'thematic'), $widget_ops);
 	}
@@ -110,7 +129,7 @@ class THM_Widget_Meta extends WP_Widget {
 		$instance = wp_parse_args( (array) $instance, array( 'title' => '' ) );
 		$title = strip_tags($instance['title']);
 ?>
-			<p><label for="<?php echo $this->get_field_id('title'); ?>"><?php _e('Title:'); ?></label> <input class="widefat" id="<?php echo $this->get_field_id('title'); ?>" name="<?php echo $this->get_field_name('title'); ?>" type="text" value="<?php echo esc_attr($title); ?>" /></p>
+			<p><label for="<?php echo $this->get_field_id('title'); ?>"><?php _e('Title:', 'thematic'); ?></label> <input class="widefat" id="<?php echo $this->get_field_id('title'); ?>" name="<?php echo $this->get_field_name('title'); ?>" type="text" value="<?php echo esc_attr($title); ?>" /></p>
 <?php
 	}
 }
@@ -120,9 +139,9 @@ class THM_Widget_Meta extends WP_Widget {
  *
  * @since 0.9.6.3
  */
-class THM_Widget_RSSlinks extends WP_Widget {
+class Thematic_Widget_RSSlinks extends WP_Widget {
 
-	function THM_Widget_RSSlinks() {
+	function Thematic_Widget_RSSlinks() {
 		$widget_ops = array( 'description' => __('Links to your posts and comments feed', 'thematic') );
 		$this->WP_Widget( 'rss-links', __('RSS Links', 'thematic'), $widget_ops);
 	}
@@ -135,8 +154,8 @@ class THM_Widget_RSSlinks extends WP_Widget {
 			echo $before_title . $title . $after_title;
 ?>
 			<ul>
-				<li><a href="<?php bloginfo('rss2_url') ?>" title="<?php echo esc_html(get_bloginfo('name')) ?> <?php _e('Posts RSS feed', 'thematic'); ?>" rel="alternate nofollow" type="application/rss+xml"><?php _e('All posts', 'thematic') ?></a></li>
-				<li><a href="<?php bloginfo('comments_rss2_url') ?>" title="<?php echo esc_html(get_bloginfo('name')) ?> <?php _e('Comments RSS feed', 'thematic'); ?>" rel="alternate nofollow" type="application/rss+xml"><?php _e('All comments', 'thematic') ?></a></li>
+				<li><a href="<?php bloginfo('rss2_url') ?>" title="<?php echo esc_attr( get_bloginfo('name', 'display') ) ?> <?php _e('Posts RSS feed', 'thematic'); ?>" rel="alternate nofollow" type="application/rss+xml"><?php _e('All posts', 'thematic') ?></a></li>
+				<li><a href="<?php bloginfo('comments_rss2_url') ?>" title="<?php echo esc_attr( get_bloginfo('name', 'display') ) ?> <?php esc_attr_e('Comments RSS feed', 'thematic'); ?>" rel="alternate nofollow" type="application/rss+xml"><?php _e('All comments', 'thematic') ?></a></li>
 			</ul>
 <?php
 		echo $after_widget;
@@ -153,27 +172,9 @@ class THM_Widget_RSSlinks extends WP_Widget {
 		$instance = wp_parse_args( (array) $instance, array( 'title' => '' ) );
 		$title = strip_tags($instance['title']);
 ?>
-			<p><label for="<?php echo $this->get_field_id('title'); ?>"><?php _e('Title:'); ?></label> <input class="widefat" id="<?php echo $this->get_field_id('title'); ?>" name="<?php echo $this->get_field_name('title'); ?>" type="text" value="<?php echo esc_attr($title); ?>" /></p>
+			<p><label for="<?php echo $this->get_field_id('title'); ?>"><?php _e('Title:', 'thematic'); ?></label> <input class="widefat" id="<?php echo $this->get_field_id('title'); ?>" name="<?php echo $this->get_field_name('title'); ?>" type="text" value="<?php echo esc_attr($title); ?>" /></p>
 <?php
 	}
 }
 
-
-// Widget: RSS links; element controls for customizing text within Widget plugin
-function widget_thematic_rsslinks_control() {
-	$options = $newoptions = get_option('widget_thematic_rsslinks');
-	if ( $_POST["rsslinks-submit"] ) {
-		$newoptions['title'] = strip_tags(stripslashes($_POST["rsslinks-title"]));
-	}
-	if ( $options != $newoptions ) {
-		$options = $newoptions;
-		update_option('widget_thematic_rsslinks', $options);
-	}
-	$title = htmlspecialchars($options['title'], ENT_QUOTES);
-?>
-			<p><label for="rsslinks-title"><?php _e('Title:'); ?> <input style="width: 250px;" id="rsslinks-title" name="rsslinks-title" type="text" value="<?php echo $title; ?>" /></label></p>
-			<input type="hidden" id="rsslinks-submit" name="rsslinks-submit" value="1" />
-<?php
-}
-
 ?>
\ No newline at end of file
diff --git a/wp-content/themes/thematic/library/languages/da_DK.po b/wp-content/themes/thematic/library/languages/da_DK.po
index 0124fea03d2918def6a93110abac78a5f5475786..b415b74057d86de03644d4712e454769793b758d 100644
--- a/wp-content/themes/thematic/library/languages/da_DK.po
+++ b/wp-content/themes/thematic/library/languages/da_DK.po
@@ -1,481 +1,521 @@
+# Danske oversættelse af Thematic
+# Copyright 2010 Ask Hjorth Larsen m.fl.
+#
+# (Anders Jenbo?)
+# Ask Hjorth Larsen, 2010.
+#
+# Konventioner
+#
+# author page -> forfatterside
+#
+# trackback -> trackback.  I hvertfald indtil jeg finder ud af hvad det er
+#
+# comment -> kommentar
+# post -> indlæg
+# footer -> sidefod.  Kan måske referere til signaturtekstområdet ... ændres?
 msgid ""
 msgstr ""
-"Project-Id-Version: thematic dansk\n"
+"Project-Id-Version: Thematic\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-15 11:44+0100\n"
-"PO-Revision-Date: \n"
-"Last-Translator: Christian Loiborg <kontakt@loi-b.dk>\n"
-"Language-Team: Christian Loiborg <kontakt@loi-b.dk>\n"
+"POT-Creation-Date: 2010-02-18 20:58+0100\n"
+"PO-Revision-Date: 2010-12-26 14:55+0100\n"
+"Last-Translator: Ask Hjorth Larsen <asklarsen@gmail.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: Danish\n"
-"X-Poedit-Country: DENMARK\n"
 "X-Poedit-SourceCharset: utf-8\n"
-"X-Poedit-Basepath: dk_DA.po\n"
+"X-Poedit-KeywordsList: __;_e\n"
+"X-Poedit-Basepath: .\n"
+"X-Poedit-SearchPath-0: c:\\xampp\\htdocs\\development\\wp-content\\themes\\thematic\n"
 
-#: D:\Web\Wordpress\dev\wp-content\themes\thematic/404.php:10
-msgid "Apologies, but we were unable to find what you were looking for. Perhaps  searching will help."
-msgstr "Beklager, men det var ikke muligt at finde det du ledte efter"
-
-#: D:\Web\Wordpress\dev\wp-content\themes\thematic/404.php:15
-#: D:\Web\Wordpress\dev\wp-content\themes\thematic/search.php:58
-msgid "Find"
-msgstr "S&oslash;g"
-
-#: D:\Web\Wordpress\dev\wp-content\themes\thematic/archive.php:16
-#, php-format
-msgid "Daily Archives: <span>%s</span>"
-msgstr "Daglige arkiver: <span>%s</span>"
-
-#: D:\Web\Wordpress\dev\wp-content\themes\thematic/archive.php:18
-#, php-format
-msgid "Monthly Archives: <span>%s</span>"
-msgstr "Månedlige arkiver: <span>%s</span>"
-
-#: D:\Web\Wordpress\dev\wp-content\themes\thematic/archive.php:20
-#, php-format
-msgid "Yearly Archives: <span>%s</span>"
-msgstr "&Aring;rlige arkiver: <span>%s</span>"
-
-#: D:\Web\Wordpress\dev\wp-content\themes\thematic/archive.php:22
-msgid "Blog Archives"
-msgstr "Blogarkiv"
-
-#: D:\Web\Wordpress\dev\wp-content\themes\thematic/archive.php:31
-#: D:\Web\Wordpress\dev\wp-content\themes\thematic/archive.php:53
-#: D:\Web\Wordpress\dev\wp-content\themes\thematic/author.php:21
-#: D:\Web\Wordpress\dev\wp-content\themes\thematic/author.php:57
-#: D:\Web\Wordpress\dev\wp-content\themes\thematic/category.php:20
-#: D:\Web\Wordpress\dev\wp-content\themes\thematic/category.php:42
-#: D:\Web\Wordpress\dev\wp-content\themes\thematic/index.php:17
-#: D:\Web\Wordpress\dev\wp-content\themes\thematic/index.php:49
-#: D:\Web\Wordpress\dev\wp-content\themes\thematic/search.php:21
-#: D:\Web\Wordpress\dev\wp-content\themes\thematic/search.php:43
-msgid "<span class=\"meta-nav\">&laquo;</span> Older posts"
-msgstr "<span class=\"meta-nav\">&laquo;</span> &AElig;ldre indl&aelig;g"
-
-#: D:\Web\Wordpress\dev\wp-content\themes\thematic/archive.php:32
-#: D:\Web\Wordpress\dev\wp-content\themes\thematic/archive.php:54
-#: D:\Web\Wordpress\dev\wp-content\themes\thematic/author.php:22
-#: D:\Web\Wordpress\dev\wp-content\themes\thematic/author.php:58
-#: D:\Web\Wordpress\dev\wp-content\themes\thematic/category.php:21
-#: D:\Web\Wordpress\dev\wp-content\themes\thematic/category.php:43
-#: D:\Web\Wordpress\dev\wp-content\themes\thematic/index.php:18
-#: D:\Web\Wordpress\dev\wp-content\themes\thematic/index.php:50
-#: D:\Web\Wordpress\dev\wp-content\themes\thematic/search.php:22
-#: D:\Web\Wordpress\dev\wp-content\themes\thematic/search.php:44
-msgid "Newer posts <span class=\"meta-nav\">&raquo;</span>"
-msgstr "Nyere indl&aelig;g <span class=\"meta-nav\">&raquo;</span>"
-
-#: D:\Web\Wordpress\dev\wp-content\themes\thematic/archive.php:41
-#: D:\Web\Wordpress\dev\wp-content\themes\thematic/attachment.php:20
-#: D:\Web\Wordpress\dev\wp-content\themes\thematic/author.php:45
-#: D:\Web\Wordpress\dev\wp-content\themes\thematic/category.php:30
-#: D:\Web\Wordpress\dev\wp-content\themes\thematic/index.php:30
-#: D:\Web\Wordpress\dev\wp-content\themes\thematic/search.php:31
-msgid "Read More <span class=\"meta-nav\">&raquo;</span>"
-msgstr "L&aelig;s mere <span class=\"meta-nav\">&raquo;</span>"
-
-#: D:\Web\Wordpress\dev\wp-content\themes\thematic/archives.php:20
-msgid "Archives by Category"
-msgstr "Arkiv efter kategori"
-
-#: D:\Web\Wordpress\dev\wp-content\themes\thematic/archives.php:26
-msgid "Archives by Month"
-msgstr "Arkiv efter måned"
-
-#: D:\Web\Wordpress\dev\wp-content\themes\thematic/archives.php:32
-#: D:\Web\Wordpress\dev\wp-content\themes\thematic/links.php:20
-#: D:\Web\Wordpress\dev\wp-content\themes\thematic/page.php:16
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/archives.php:42
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/links.php:53
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/page.php:40
 msgid "Edit"
-msgstr "Redig&eacute;r"
+msgstr "Rediger"
 
-#: D:\Web\Wordpress\dev\wp-content\themes\thematic/attachment.php:22
-#: D:\Web\Wordpress\dev\wp-content\themes\thematic/index.php:32
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/attachment.php:39
 msgid "Pages:"
 msgstr "Sider:"
 
-#: D:\Web\Wordpress\dev\wp-content\themes\thematic/author.php:15
-msgid "Author Archives: "
-msgstr "Forfatterarkiv:"
-
-#: D:\Web\Wordpress\dev\wp-content\themes\thematic/author.php:34
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/author.php:53
 msgid "Email "
-msgstr "E-mail"
+msgstr "E-mail "
 
-#: D:\Web\Wordpress\dev\wp-content\themes\thematic/category.php:13
-msgid "Category Archives:"
-msgstr "Kategori-arkiv:"
-
-#: D:\Web\Wordpress\dev\wp-content\themes\thematic/comments.php:10
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/comments.php:10
 msgid "This post is password protected. Enter the password to view any comments."
-msgstr "Dette indl&aelig;g er beskyttet med et password. Skriv passwordet for at se kommentarer."
+msgstr "Dette indlæg er beskyttet med adgangskode. Indtast adgangskoden for at se kommentarer."
 
-#: D:\Web\Wordpress\dev\wp-content\themes\thematic/comments.php:31
-#, php-format
-msgid "<span>%d</span> Comments"
-msgstr "<span>%d</span> kommentarer"
-
-#: D:\Web\Wordpress\dev\wp-content\themes\thematic/comments.php:31
-msgid "<span>One</span> Comment"
-msgstr "<span>&Eacute;n</span> kommentar"
-
-#: D:\Web\Wordpress\dev\wp-content\themes\thematic/comments.php:52
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/comments.php:52
 #, php-format
 msgid "<span>%d</span> Trackbacks"
 msgstr "<span>%d</span> trackbacks"
 
-#: D:\Web\Wordpress\dev\wp-content\themes\thematic/comments.php:52
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/comments.php:52
 msgid "<span>One</span> Trackback"
-msgstr "<span>&Eacute;n </span> trackback"
-
-#: D:\Web\Wordpress\dev\wp-content\themes\thematic/comments.php:67
-msgid "Post a Comment"
-msgstr "Skriv en kommentar"
-
-#: D:\Web\Wordpress\dev\wp-content\themes\thematic/comments.php:67
-#, php-format
-msgid "Post a Reply to %s"
-msgstr "Skriv en kommentar til %s"
+msgstr "<span>Et</span> trackback"
 
-#: D:\Web\Wordpress\dev\wp-content\themes\thematic/comments.php:72
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/comments.php:72
 #, php-format
 msgid "You must be <a href=\"%s\" title=\"Log in\">logged in</a> to post a comment."
-msgstr "Du skal v&aelig;re <a href=\"%s\" title=\"Log in\">logget ind</a> for at kunne kommentere."
+msgstr "Du skal være <a href=\"%s\" title=\"Log ind\">logget ind</a> for at skrive en kommentar."
 
-#: D:\Web\Wordpress\dev\wp-content\themes\thematic/comments.php:83
+#: c:\xampp\htdocs\development\wp-content\themes\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\">Logget ind som <a href=\"%1$s\" title=\"Logget ind som %2$s\">%2$s</a>.</span> <span class=\"logout\"><a href=\"%3$s\" title=\"Log ud af denne bruger\">Log ud?</a></span>"
+msgstr "<span class=\"loggedin\">Logget ind som <a href=\"%1$s\" title=\"Logget ind som %2$s\">%2$s</a>.</span> <span class=\"logout\"><a href=\"%3$s\" title=\"Log denne konto ud\">Log ud?</a></span>"
 
-#: D:\Web\Wordpress\dev\wp-content\themes\thematic/comments.php:90
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/comments.php:90
 msgid "Your email is <em>never</em> published nor shared."
-msgstr "Din e-mail bliver <em>ikke</em> offentliggjort eller delt med andre."
+msgstr "Din e-mail vil <em>aldrig</em> blive vist eller delt med andre."
 
-#: D:\Web\Wordpress\dev\wp-content\themes\thematic/comments.php:90
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/comments.php:90
 msgid "Required fields are marked <span class=\"required\">*</span>"
 msgstr "Obligatoriske felter er markeret med <span class=\"required\">*</span>"
 
-#: D:\Web\Wordpress\dev\wp-content\themes\thematic/comments.php:93
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/comments.php:93
 msgid "Name"
 msgstr "Navn"
 
-#: D:\Web\Wordpress\dev\wp-content\themes\thematic/comments.php:93
-#: D:\Web\Wordpress\dev\wp-content\themes\thematic/comments.php:98
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/comments.php:93
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/comments.php:98
 msgid "<span class=\"required\">*</span>"
 msgstr "<span class=\"required\">*</span>"
 
-#: D:\Web\Wordpress\dev\wp-content\themes\thematic/comments.php:98
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/comments.php:98
 msgid "Email"
 msgstr "E-mail"
 
-#: D:\Web\Wordpress\dev\wp-content\themes\thematic/comments.php:103
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/comments.php:103
 msgid "Website"
-msgstr "Hjemmeside"
-
-#: D:\Web\Wordpress\dev\wp-content\themes\thematic/comments.php:110
-msgid "Comment"
-msgstr "Kommentar"
+msgstr "Website"
 
-#: D:\Web\Wordpress\dev\wp-content\themes\thematic/comments.php:115
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/comments.php:115
 msgid "You may use these <abbr title=\"HyperText Markup Language\">HTML</abbr> tags and attributes:"
-msgstr "Du kan anvende disse <abbr title=\"HyperText Markup Language\">HTML</abbr> tegn og koder:"
+msgstr "Du kan bruge disse <abbr title=\"HyperText Markup Language\">HTML</abbr>-mærker og -attributter:"
 
-#: D:\Web\Wordpress\dev\wp-content\themes\thematic/comments.php:120
-msgid "Post Comment"
-msgstr "Send kommentar"
-
-#: D:\Web\Wordpress\dev\wp-content\themes\thematic/page.php:14
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/page.php:38
 msgid "Pages: "
-msgstr "Sider:"
-
-#: D:\Web\Wordpress\dev\wp-content\themes\thematic/search.php:15
-msgid "Search Results for:"
-msgstr "Resultater for s&oslash;gningen"
+msgstr "Sider: "
 
-#: D:\Web\Wordpress\dev\wp-content\themes\thematic/search.php:51
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/search.php:41
 msgid "Nothing Found"
 msgstr "Intet fundet"
 
-#: D:\Web\Wordpress\dev\wp-content\themes\thematic/search.php:53
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/search.php:43
 msgid "Sorry, but nothing matched your search criteria. Please try again with some different keywords."
-msgstr "Beklager, intet matchede dine s&oslash;gekriterier. Pr&oslash;v venligst igen med nogle andre n&oslash;gleord."
+msgstr "Beklager, men dine søgeord gav ingen resultater. Prøv venligst igen med nogle andre nøgleord."
 
-#: D:\Web\Wordpress\dev\wp-content\themes\thematic/sidebar.php:6
-#: D:\Web\Wordpress\dev\wp-content\themes\thematic/sidebar.php:10
-msgid "Search"
-msgstr "S&oslash;g"
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/search.php:48
+msgid "Find"
+msgstr "Find"
 
-#: D:\Web\Wordpress\dev\wp-content\themes\thematic/sidebar.php:16
-msgid "Pages"
-msgstr "Sider"
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/comments-extensions.php:76
+msgid "<span>One</span> Comment"
+msgstr "<span>En</span> kommentar"
 
-#: D:\Web\Wordpress\dev\wp-content\themes\thematic/sidebar.php:23
-msgid "Categories"
-msgstr "Kategorier"
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/comments-extensions.php:83
+#, php-format
+msgid "<span>%d</span> Comments"
+msgstr "<span>%d</span> kommentarer"
 
-#: D:\Web\Wordpress\dev\wp-content\themes\thematic/sidebar.php:31
-msgid "Archives"
-msgstr "Arkiv"
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/comments-extensions.php:96
+msgid "Post a Comment"
+msgstr "Skriv en kommentar"
 
-#: D:\Web\Wordpress\dev\wp-content\themes\thematic/sidebar.php:50
-msgid "RSS Feeds"
-msgstr "RSS-feeds"
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/comments-extensions.php:103
+#, php-format
+msgid "Post a Reply to %s"
+msgstr "Skriv et svar til %s"
 
-#: D:\Web\Wordpress\dev\wp-content\themes\thematic/sidebar.php:52
-#: D:\Web\Wordpress\dev\wp-content\themes\thematic/library/extensions/hooks-filters.php:390
-msgid "Posts RSS feed"
-msgstr "RSS-feeds for indl&aelig;g"
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/comments-extensions.php:110
+msgid "Comment"
+msgstr "Kommentar"
 
-#: D:\Web\Wordpress\dev\wp-content\themes\thematic/sidebar.php:52
-msgid "All posts"
-msgstr "Alle indl&aelig;g"
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/comments-extensions.php:117
+msgid "Post Comment"
+msgstr "Skriv kommentar"
 
-#: D:\Web\Wordpress\dev\wp-content\themes\thematic/sidebar.php:53
-#: D:\Web\Wordpress\dev\wp-content\themes\thematic/library/extensions/hooks-filters.php:408
-msgid "Comments RSS feed"
-msgstr "RSS-feeds for kommentarer"
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/content-extensions.php:147
+msgid "Author Archives: "
+msgstr "Forfatterarkiver: "
 
-#: D:\Web\Wordpress\dev\wp-content\themes\thematic/sidebar.php:53
-msgid "All comments"
-msgstr "Alle kommentarer"
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/content-extensions.php:153
+msgid "Category Archives:"
+msgstr "Kategoriarkiver:"
 
-#: D:\Web\Wordpress\dev\wp-content\themes\thematic/sidebar.php:58
-msgid "Meta"
-msgstr "Meta"
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/content-extensions.php:162
+msgid "Search Results for:"
+msgstr "Søgeresultater for:"
 
-#: D:\Web\Wordpress\dev\wp-content\themes\thematic/tag.php:13
-#: D:\Web\Wordpress\dev\wp-content\themes\thematic/library/extensions/hooks-filters.php:207
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/content-extensions.php:168
 msgid "Tag Archives:"
-msgstr "Tag-arkiv:"
+msgstr "Mærkearkiver:"
 
-#: D:\Web\Wordpress\dev\wp-content\themes\thematic/library/extensions/discussion.php:10
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/content-extensions.php:174
 #, 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 "Skrevet d. %1$s kl. %2$s <span class=\"meta-sep\">|</span> <a href=\"%3$s\" title=\"Permanent link til denne kommentar\">Permalink</a>"
-
-#: D:\Web\Wordpress\dev\wp-content\themes\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'>Din kommentar afventer godkendelse.</span>\n"
-
-#: D:\Web\Wordpress\dev\wp-content\themes\thematic/library/extensions/discussion.php:22
-msgid "Reply"
-msgstr "Svar"
+msgid "Daily Archives: <span>%s</span>"
+msgstr "Daglige arkiver: <span>%s</span>"
 
-#: D:\Web\Wordpress\dev\wp-content\themes\thematic/library/extensions/discussion.php:23
-msgid "Log in to reply."
-msgstr "Du skal logge ind for at kunne svare."
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/content-extensions.php:178
+#, php-format
+msgid "Monthly Archives: <span>%s</span>"
+msgstr "Månedlige arkiver: <span>%s</span>"
 
-#: D:\Web\Wordpress\dev\wp-content\themes\thematic/library/extensions/discussion.php:37
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/content-extensions.php:182
 #, php-format
-msgid "By %1$s on %2$s at %3$s"
-msgstr "Af %1$s d. %2$s kl. %3$s"
+msgid "Yearly Archives: <span>%s</span>"
+msgstr "Årlige arkiver: <span>%s</span>"
 
-#: D:\Web\Wordpress\dev\wp-content\themes\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\">Din trackback afventer godkendelse.</span>\\n"
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/content-extensions.php:186
+msgid "Blog Archives"
+msgstr "Blogarkiver"
 
-#: D:\Web\Wordpress\dev\wp-content\themes\thematic/library/extensions/helpers.php:31
-#: D:\Web\Wordpress\dev\wp-content\themes\thematic/library/extensions/helpers.php:44
-msgid "There is no excerpt because this is a protected post."
-msgstr "Der findes intet uddrag da dette er et beskyttet indl&aelig;g."
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/content-extensions.php:209
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/content-extensions.php:725
+msgid "<span class=\"meta-nav\">&laquo;</span> Older posts"
+msgstr "<span class=\"meta-nav\">&laquo;</span> Ældre indlæg"
 
-#: D:\Web\Wordpress\dev\wp-content\themes\thematic/library/extensions/hooks-filters.php:61
-msgid "Skip navigation to the content"
-msgstr "Skip navigation, videre til indholdet"
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/content-extensions.php:210
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/content-extensions.php:726
+msgid "Newer posts <span class=\"meta-nav\">&raquo;</span>"
+msgstr "Nyere indlæg <span class=\"meta-nav\">&raquo;</span>"
 
-#: D:\Web\Wordpress\dev\wp-content\themes\thematic/library/extensions/hooks-filters.php:61
-msgid "Skip to content"
-msgstr "Videre til indholdet"
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/content-extensions.php:394
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/content-extensions.php:618
+msgid "Edit post"
+msgstr "Rediger indlæg"
 
-#: D:\Web\Wordpress\dev\wp-content\themes\thematic/library/extensions/hooks-filters.php:211
-#: D:\Web\Wordpress\dev\wp-content\themes\thematic/library/extensions/hooks-filters.php:497
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/content-extensions.php:406
 msgid "Not Found"
-msgstr "Intet fundet"
+msgstr "Ikke fundet"
 
-#: D:\Web\Wordpress\dev\wp-content\themes\thematic/library/extensions/hooks-filters.php:489
-#: D:\Web\Wordpress\dev\wp-content\themes\thematic/library/extensions/hooks-filters.php:544
-msgid "Edit post"
-msgstr "Redig&eacute;r indl&aelig;g"
-
-#: D:\Web\Wordpress\dev\wp-content\themes\thematic/library/extensions/hooks-filters.php:502
-#: D:\Web\Wordpress\dev\wp-content\themes\thematic/library/extensions/hooks-filters.php:597
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/content-extensions.php:411
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/content-extensions.php:686
 msgid "Permalink to "
-msgstr "Permalink til"
+msgstr "Permalink til "
 
-#: D:\Web\Wordpress\dev\wp-content\themes\thematic/library/extensions/hooks-filters.php:511
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/content-extensions.php:441
 msgid "By "
-msgstr "Af"
+msgstr "Af "
 
-#: D:\Web\Wordpress\dev\wp-content\themes\thematic/library/extensions/hooks-filters.php:513
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/content-extensions.php:444
 msgid "View all posts by "
-msgstr "Se alle indl&aelig;g af"
+msgstr "Vis alle indlæg af "
 
-#: D:\Web\Wordpress\dev\wp-content\themes\thematic/library/extensions/hooks-filters.php:516
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/content-extensions.php:455
 msgid "Published: "
-msgstr "Udgivet:"
+msgstr "Udgivet: "
 
-#: D:\Web\Wordpress\dev\wp-content\themes\thematic/library/extensions/hooks-filters.php:551
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/content-extensions.php:523
+msgid "Archives by Category"
+msgstr "Arkiver efter kategori"
+
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/content-extensions.php:534
+msgid "Archives by Month"
+msgstr "Arkiver efter måned"
+
+#: c:\xampp\htdocs\development\wp-content\themes\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 "Beklager, men vi kunne ikke finde det, du ledte efter. Måske vil en søgning kunne hjælpe."
+
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/content-extensions.php:578
+msgid "Read More <span class=\"meta-nav\">&raquo;</span>"
+msgstr "Læs mere <span class=\"meta-nav\">&raquo;</span>"
+
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/content-extensions.php:629
 msgid "This entry was posted in "
-msgstr "Dette indl&aelig;g var udgivet i:"
+msgstr "Dette indlæg blev sendt til "
 
-#: D:\Web\Wordpress\dev\wp-content\themes\thematic/library/extensions/hooks-filters.php:554
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/content-extensions.php:632
 msgid "Also posted in "
-msgstr "Ogs&aring; udgivet i:"
+msgstr "Også sendt til "
 
-#: D:\Web\Wordpress\dev\wp-content\themes\thematic/library/extensions/hooks-filters.php:557
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/content-extensions.php:635
 msgid "Posted in "
-msgstr "Udgivet i"
+msgstr "Sendt til "
 
-#: D:\Web\Wordpress\dev\wp-content\themes\thematic/library/extensions/hooks-filters.php:564
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/content-extensions.php:646
 msgid " and tagged"
-msgstr "og tagget"
+msgstr " og mærket"
 
-#: D:\Web\Wordpress\dev\wp-content\themes\thematic/library/extensions/hooks-filters.php:567
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/content-extensions.php:649
 msgid " Also tagged "
-msgstr "Ogs&aring; tagget"
+msgstr " Også mærket "
 
-#: D:\Web\Wordpress\dev\wp-content\themes\thematic/library/extensions/hooks-filters.php:569
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/content-extensions.php:651
 msgid "Tagged"
-msgstr "Tagget"
+msgstr "Mærket"
 
-#: D:\Web\Wordpress\dev\wp-content\themes\thematic/library/extensions/hooks-filters.php:578
-#: D:\Web\Wordpress\dev\wp-content\themes\thematic/library/extensions/hooks-filters.php:581
-#: D:\Web\Wordpress\dev\wp-content\themes\thematic/library/extensions/hooks-filters.php:584
+# Bemærk at 'Comment on <something>' -> 'Kommentér <noget>'
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/content-extensions.php:663
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/content-extensions.php:666
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/content-extensions.php:669
 msgid "Comment on "
-msgstr "Komment&eacute;r"
+msgstr "Kommentér "
 
-#: D:\Web\Wordpress\dev\wp-content\themes\thematic/library/extensions/hooks-filters.php:579
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/content-extensions.php:664
 msgid " Comments"
-msgstr "Kommentarer"
+msgstr " Kommentarer"
 
-#: D:\Web\Wordpress\dev\wp-content\themes\thematic/library/extensions/hooks-filters.php:582
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/content-extensions.php:667
 msgid " Comment"
-msgstr "Kommentar"
+msgstr " Kommentar"
 
-#: D:\Web\Wordpress\dev\wp-content\themes\thematic/library/extensions/hooks-filters.php:585
+# leave ~ skriv
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/content-extensions.php:670
 msgid "Leave a comment"
-msgstr "Komment&eacute;r"
+msgstr "Skriv en kommentar"
 
-#: D:\Web\Wordpress\dev\wp-content\themes\thematic/library/extensions/hooks-filters.php:588
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/content-extensions.php:673
 msgid "Comments closed"
-msgstr "Der er lukket for kommentarer"
+msgstr "Kommentarer lukket"
 
-#: D:\Web\Wordpress\dev\wp-content\themes\thematic/library/extensions/hooks-filters.php:597
+# bruger ubestemt på dansk -- dette ødelægger næppe noget
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/content-extensions.php:686
 msgid ". Bookmark the "
-msgstr ". tilf&oslash;j som bogm&aelig;rke"
+msgstr ". Bogmærk "
 
-#: D:\Web\Wordpress\dev\wp-content\themes\thematic/library/extensions/hooks-filters.php:598
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/content-extensions.php:687
 msgid "permalink"
 msgstr "permalink"
 
-#: D:\Web\Wordpress\dev\wp-content\themes\thematic/library/extensions/hooks-filters.php:600
-#: D:\Web\Wordpress\dev\wp-content\themes\thematic/library/extensions/hooks-filters.php:608
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/content-extensions.php:689
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/content-extensions.php:697
 msgid "Post a comment"
 msgstr "Skriv en kommentar"
 
-#: D:\Web\Wordpress\dev\wp-content\themes\thematic/library/extensions/hooks-filters.php:601
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/content-extensions.php:690
 msgid " or leave a trackback: "
-msgstr "eller efterlad en trackback:"
+msgstr " eller efterlad en trackback: "
 
-#: D:\Web\Wordpress\dev\wp-content\themes\thematic/library/extensions/hooks-filters.php:602
-#: D:\Web\Wordpress\dev\wp-content\themes\thematic/library/extensions/hooks-filters.php:605
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/content-extensions.php:691
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/content-extensions.php:694
 msgid "Trackback URL for your post"
-msgstr "Trackback link for dit indl&aelig;g"
+msgstr "Trackback-adresse til dit indlæg"
 
-#: D:\Web\Wordpress\dev\wp-content\themes\thematic/library/extensions/hooks-filters.php:602
-#: D:\Web\Wordpress\dev\wp-content\themes\thematic/library/extensions/hooks-filters.php:605
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/content-extensions.php:691
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/content-extensions.php:694
 msgid "Trackback URL"
-msgstr "Trackback link"
+msgstr "Trackback-adresse"
 
-#: D:\Web\Wordpress\dev\wp-content\themes\thematic/library/extensions/hooks-filters.php:604
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/content-extensions.php:693
 msgid " Comments are closed, but you can leave a trackback: "
-msgstr "Der er lukket for kommentarer, men du kan efterlade en trackback"
+msgstr " Der er lukket for kommentarer, men du kan efterlade et trackback: "
 
-#: D:\Web\Wordpress\dev\wp-content\themes\thematic/library/extensions/hooks-filters.php:607
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/content-extensions.php:696
 msgid " Trackbacks are closed, but you can "
-msgstr "Der er lukket for trackbacks, men du kan"
+msgstr " Der er lukket for trackbacks, men du kan "
 
-#: D:\Web\Wordpress\dev\wp-content\themes\thematic/library/extensions/hooks-filters.php:608
+# Bemærk.  Lader til at være fortsat fra " Trackbacks are closed, but you can "
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/content-extensions.php:697
 msgid "post a comment"
 msgstr "skrive en kommentar"
 
-#: D:\Web\Wordpress\dev\wp-content\themes\thematic/library/extensions/hooks-filters.php:610
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/content-extensions.php:699
 msgid " Both comments and trackbacks are currently closed."
-msgstr "Der er lukket for kommentarer og trackbacks."
+msgstr " Der er nu lukket for både kommentarer og trackbacks."
+
+# Ikke sikker, kan nogen (Anders?) tjekke at dette er meningsfuldt?
+# Tror det begynder i stil med "Skrevet 17/7 14:23..."
+#: c:\xampp\htdocs\development\wp-content\themes\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 "Skrevet %1$s kl. %2$s <span class=\"meta-sep\">|</span> <a href=\"%3$s\" title=\"Permalink til denne kommentar\">Permalink</a>"
+
+#: c:\xampp\htdocs\development\wp-content\themes\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'>Din kommentar afventer godkendelse fra moderator.</span>\n"
+
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/discussion.php:22
+msgid "Reply"
+msgstr "Svar"
+
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/discussion.php:23
+msgid "Log in to reply."
+msgstr "Log ind for at svare."
 
-#: D:\Web\Wordpress\dev\wp-content\themes\thematic/library/extensions/shortcodes.php:16
+# navn, dato, tid - velsagtens
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/discussion.php:37
+#, php-format
+msgid "By %1$s on %2$s at %3$s"
+msgstr "Af %1$s, %2$s kl. %3$s"
+
+#: c:\xampp\htdocs\development\wp-content\themes\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\">Din trackback afventer godkendelse fra moderator.</span>\\n"
+
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/header-extensions.php:251
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/widgets.php:77
+msgid "Posts RSS feed"
+msgstr "RSS-kilde for indlæg"
+
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/header-extensions.php:269
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/widgets.php:78
+msgid "Comments RSS feed"
+msgstr "RSS-kilde for kommentarer"
+
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/header-extensions.php:401
+msgid "Skip navigation to the content"
+msgstr "Hop til indholdet"
+
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/header-extensions.php:401
+msgid "Skip to content"
+msgstr "Hop til indhold"
+
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/helpers.php:31
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/helpers.php:44
+msgid "There is no excerpt because this is a protected post."
+msgstr "Der er intet uddrag, da dette er et beskyttet indlæg."
+
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/shortcodes.php:16
 msgid "Login"
 msgstr "Log ind"
 
-#: D:\Web\Wordpress\dev\wp-content\themes\thematic/library/extensions/shortcodes.php:18
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/shortcodes.php:18
 msgid "Logout"
-msgstr "Logout"
+msgstr "Log af"
 
-#: D:\Web\Wordpress\dev\wp-content\themes\thematic/library/extensions/theme-options.php:13
+# ???
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/theme-options.php:13
 msgid "Index Insert Position"
-msgstr "Index Insert Position"
+msgstr "Position af indeksindsættelse"
 
-#: D:\Web\Wordpress\dev\wp-content\themes\thematic/library/extensions/theme-options.php:14
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/theme-options.php:14
 msgid "The widgetized Index Insert will follow after this post number."
-msgstr "Det widgetbaserede Index Insert vil f&oslash;lge efter dette indl&aelig;g"
+msgstr "Kontrollen for indeksindsættelse (Index Insert) vil følge efter dette antal indlæg."
 
-#: D:\Web\Wordpress\dev\wp-content\themes\thematic/library/extensions/theme-options.php:19
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/theme-options.php:19
 msgid "Info on Author Page"
-msgstr "Information p&aring; forfatterens side"
+msgstr "Side til information om forfatter"
 
-#: D:\Web\Wordpress\dev\wp-content\themes\thematic/library/extensions/theme-options.php:20
+#: c:\xampp\htdocs\development\wp-content\themes\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 "Vis et <a href=\"http://microformats.org/wiki/hcard\" target=\"_blank\">mikroformatteret vCard</a>—med forfatterens avatar, biografi og e-mail—p&aring; forfatterens side."
+msgstr "Vis et <a href=\"http://microformats.org/wiki/hcard\" target=\"_blank\">mikroformateret vCard</a> — med forfatterens profilbillede, biografi og e-mail — på forfattersiden."
 
-#: D:\Web\Wordpress\dev\wp-content\themes\thematic/library/extensions/theme-options.php:25
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/theme-options.php:25
 msgid "Text in Footer"
 msgstr "Tekst i sidefod"
 
-#: D:\Web\Wordpress\dev\wp-content\themes\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] [the-year]"
-msgstr "Du kan anvende disse forkortede koder i sidefodens tekst: [wp-link] [theme-link] [loginout-link] [blog-title] [the-year]"
+#: c:\xampp\htdocs\development\wp-content\themes\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 "Du kan bruge følgende forkortelseskoder i din sidefodstekst: [wp-link] [theme-link] [loginout-link] [blog-title] [blog-link] [the-year]"
 
-#: D:\Web\Wordpress\dev\wp-content\themes\thematic/library/extensions/theme-options.php:28
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/theme-options.php:28
 msgid "Powered by [wp-link]. Built on the [theme-link]."
-msgstr "Drevet af [wp-link]. Bygget p&aring; [theme-link]."
+msgstr "Kører på [wp-link]. Bygget med [theme-link]."
 
-#: D:\Web\Wordpress\dev\wp-content\themes\thematic/library/extensions/theme-options.php:76
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/theme-options.php:75
 msgid "settings saved."
-msgstr "indstillinger gemt"
+msgstr "indstillinger gemt."
 
-#: D:\Web\Wordpress\dev\wp-content\themes\thematic/library/extensions/theme-options.php:77
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/theme-options.php:76
 msgid "settings reset."
-msgstr "indstillinger nulstillet"
+msgstr "indstillinger nulstillet."
 
-#: D:\Web\Wordpress\dev\wp-content\themes\thematic/library/extensions/theme-options.php:78
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/theme-options.php:77
 msgid "widgets reset."
-msgstr "widgets nulstillet"
+msgstr "kontroller nulstillet."
 
-#: D:\Web\Wordpress\dev\wp-content\themes\thematic/library/extensions/theme-options.php:191
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/theme-options.php:190
 msgid "Save changes"
-msgstr "Gem &aelig;ndringer"
+msgstr "Gem ændringer"
 
-#: D:\Web\Wordpress\dev\wp-content\themes\thematic/library/extensions/theme-options.php:197
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/theme-options.php:196
 msgid "Reset"
 msgstr "Nulstil"
 
-#: D:\Web\Wordpress\dev\wp-content\themes\thematic/library/extensions/theme-options.php:203
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/theme-options.php:202
 msgid "Reset Widgets"
-msgstr "Nulstil widgets"
+msgstr "Nulstil kontroller"
 
-#: D:\Web\Wordpress\dev\wp-content\themes\thematic/library/extensions/theme-options.php:208
+#: c:\xampp\htdocs\development\wp-content\themes\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 "For mere information om dette tema bes&oslash;g da <a href=\"http://themeshaper.com\">ThemeShaper</a>. Bes&oslash;g venligst <a href=\"http://themeshaper.com/forums/\">ThemeShaper's forum</a> hvis du har sp&oslash;rgsm&aring;l ang&aring;ende Thematic."
+msgstr "Besøg <a href=\"http://themeshaper.com\">ThemeShaper</a> for at få yderligere oplysninger om dette tema. Besøg <a href=\"http://themeshaper.com/forums/\">ThemeShapers forum</a> hvis du har spørgsmål om Thematic."
+
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/widgets-extensions.php:12
+msgid "To search, type and hit enter"
+msgstr "Skriv og tryk enter for at søge"
+
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/widgets-extensions.php:18
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/widgets-extensions.php:281
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/widgets.php:43
+msgid "Search"
+msgstr "Søg"
+
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/widgets-extensions.php:43
+msgid "The primary widget area, most often used as a sidebar."
+msgstr "Det primære kontrolområde, der oftest bruges som en sidebjælke."
+
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/widgets-extensions.php:58
+msgid "The secondary widget area, most often used as a sidebar."
+msgstr "Det sekundære kontrolområde, der oftest bruges som en sidebjælke."
 
-#: D:\Web\Wordpress\dev\wp-content\themes\thematic/library/extensions/widgets.php:55
-#: D:\Web\Wordpress\dev\wp-content\themes\thematic/library/extensions/widgets.php:245
-#: D:\Web\Wordpress\dev\wp-content\themes\thematic/library/extensions/widgets.php:246
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/widgets-extensions.php:73
+msgid "The 1st widget area in the footer."
+msgstr "Det første kontrolområde i sidefoden."
+
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/widgets-extensions.php:88
+msgid "The 2nd widget area in the footer."
+msgstr "Det andet kontrolområde i sidefoden."
+
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/widgets-extensions.php:103
+msgid "The 3rd widget area in the footer."
+msgstr "Det tredje kontrolområde i sidefoden."
+
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/widgets-extensions.php:118
+msgid "The top widget area displayed on the index page."
+msgstr "Det øverste kontrolområde, der vises på indekssiden."
+
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/widgets-extensions.php:133
+msgid "The widget area inserted after x posts on the index page."
+msgstr "Kontrolområdet, der indsætes efter x indlæg på indekssiden."
+
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/widgets-extensions.php:148
+msgid "The bottom widget area displayed on the index page."
+msgstr "Det nederste kontrolområde, der vises på indekssiden."
+
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/widgets-extensions.php:163
+msgid "The top widget area displayed on a single post."
+msgstr "Det øverste kontrolområde, der vises på et enkelt indlæg."
+
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/widgets-extensions.php:178
+msgid "The widget area inserted between the post and the comments on a single post."
+msgstr "Kontrolområdet, der indsættes mellem et indlæg og dets kommentarer."
+
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/widgets-extensions.php:193
+msgid "The bottom widget area displayed on a single post."
+msgstr "Det nederste kontrolområde, der vises på et enkelt indlæg."
+
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/widgets-extensions.php:208
+msgid "The top widget area displayed on a page."
+msgstr "Det øverste kontrolområde, der vises på en side."
+
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/widgets-extensions.php:223
+msgid "The bottom widget area displayed on a page."
+msgstr "Det nederste kontrolområde, der vises på en side."
+
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/widgets-extensions.php:283
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/widgets.php:55
+msgid "Meta"
+msgstr "Meta"
+
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/widgets-extensions.php:285
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/widgets-extensions.php:286
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/widgets.php:72
 msgid "RSS Links"
 msgstr "RSS-links"
 
-#: D:\Web\Wordpress\dev\wp-content\themes\thematic/library/extensions/widgets.php:79
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/widgets.php:77
+msgid "All posts"
+msgstr "Alle indlæg"
+
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/widgets.php:78
+msgid "All comments"
+msgstr "Alle kommentarer"
+
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/widgets.php:96
 msgid "Title:"
 msgstr "Titel:"
 
diff --git a/wp-content/themes/thematic/library/languages/de_DE.mo b/wp-content/themes/thematic/library/languages/de_DE.mo
index 477861561efe3796b1ce73982fec288daa808dd1..38d2d23a4d43e35f791fe558d63bff9f3ac53889 100644
Binary files a/wp-content/themes/thematic/library/languages/de_DE.mo and b/wp-content/themes/thematic/library/languages/de_DE.mo differ
diff --git a/wp-content/themes/thematic/library/languages/de_DE.po b/wp-content/themes/thematic/library/languages/de_DE.po
index 116f6d12593f98e9790ee66091329cbae596ad56..774a9fa9ed686dc8b3f1861f10a5c7d218284500 100644
--- a/wp-content/themes/thematic/library/languages/de_DE.po
+++ b/wp-content/themes/thematic/library/languages/de_DE.po
@@ -1,15 +1,17 @@
 # kubrick theme pot file.
 # Copyright (C) 2007 WordPress
 # This file is distributed under the same license as the kubrick theme package.
+# Chris <chris@thematictheme.com>, 2012.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: Thematic\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-18 20:58+0100\n"
-"PO-Revision-Date: 2010-02-18 21:12+0100\n"
-"Last-Translator: Chris Gossmann <chris.gossmann@googlemail.com>\n"
-"Language-Team: \n"
+"POT-Creation-Date: \n"
+"PO-Revision-Date: 2012-06-02 18:18+0100\n"
+"Last-Translator: Chris <chris@thematictheme.com>\n"
+"Language-Team: Deutsch <>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -18,506 +20,689 @@ msgstr ""
 "X-Poedit-SourceCharset: utf-8\n"
 "X-Poedit-KeywordsList: __;_e\n"
 "X-Poedit-Basepath: .\n"
+"Plural-Forms: nplurals=2; plural=(n!=1);\n"
 "X-Poedit-SearchPath-0: .\n"
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/archives.php:42
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/links.php:53
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/page.php:40
+#: 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 "Bearbeiten"
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/attachment.php:39
+#: attachment.php:62
+#: library/extensions/content-extensions.php:666
+#: library/extensions/content-extensions.php:732
 msgid "Pages:"
 msgstr "Seiten:"
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/author.php:53
+#: author.php:67
 msgid "Email "
 msgstr "E-Mail "
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/comments.php:10
+#: comments.php:33
 msgid "This post is password protected. Enter the password to view any comments."
 msgstr "Dieser Beitrag ist passwortgesch&uuml;tzt. Bitte geben Sie das Passwort ein, um Kommentare lesen zu k&ouml;nnen."
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/comments.php:52
-#, php-format
-msgid "<span>%d</span> Trackbacks"
-msgstr "<span>%d</span> Trackbacks"
-
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/comments.php:52
+#: comments.php:111
 msgid "<span>One</span> Trackback"
 msgstr "<span>Ein</span> Trackback"
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/comments.php:72
+#: 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 "Sie m&uuml;ssen <a href=\"%s\" title=\"Anmelden\">angemeldet</a> sein, um kommentieren zu k&ouml;nnen."
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/comments.php:83
+#: 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\">Angemeldet als <a href=\"%1$s\">%2$s</a>.</span> <span class=\"logout\"><a href=\"%3$s\">Abmelden?</a></span>"
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/comments.php:90
+#: comments.php:164
+#: library/extensions/comments-extensions.php:233
 msgid "Your email is <em>never</em> published nor shared."
-msgstr "Ihre E-Mail wird <em>niemals</em> veröffentlicht oder verteilt."
+msgstr "Ihre E-Mail wird <em>niemals</em> ver&ouml;ffentlicht oder verteilt."
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/comments.php:90
+#: comments.php:164
+#: library/extensions/comments-extensions.php:233
 msgid "Required fields are marked <span class=\"required\">*</span>"
-msgstr "Benötigte Felder sind mit <span class=\"required\">*</span> markiert"
+msgstr "Erforderliche Felder sind mit <span class=\"required\">*</span> markiert"
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/comments.php:93
+#: comments.php:167
+#: library/extensions/comments-extensions.php:224
 msgid "Name"
 msgstr "Name"
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/comments.php:93
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/comments.php:98
+#: 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>"
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/comments.php:98
+#: comments.php:172
+#: library/extensions/comments-extensions.php:225
 msgid "Email"
 msgstr "E-Mail"
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/comments.php:103
+#: comments.php:177
+#: library/extensions/comments-extensions.php:226
 msgid "Website"
 msgstr "Website"
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/comments.php:115
+#: 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 kannst diese <abbr title=\"HyperText Markup Language\">HTML</abbr> Tags und Attribute verwenden:"
+msgstr "Sie k&oumlnnen folgende <abbr title=\"HyperText Markup Language\">HTML</abbr> Tags und Attribute verwenden:"
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/page.php:38
+#: page.php:58
+#: template-page-fullwidth.php:59
 msgid "Pages: "
 msgstr "Seiten: "
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/search.php:41
+#: search.php:56
 msgid "Nothing Found"
 msgstr "Nichts gefunden"
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/search.php:43
+#: search.php:60
 msgid "Sorry, but nothing matched your search criteria. Please try again with some different keywords."
-msgstr "Entschuldigung, aber Nichts passt auf Ihre Suchkriterien. Bitte versuchen Sie es noch einmal mit anderen Schlüsselwörtern."
+msgstr "Entschuldigung, aber wir haben nichts gefunden. Bitte versuchen Sie es mit anderen Schlüsselwörtern."
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/search.php:48
+#: library/extensions/content-extensions.php:1346
+#: search.php:70
 msgid "Find"
 msgstr "Suchen"
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/comments-extensions.php:76
+#: library/extensions/comments-extensions.php:120
 msgid "<span>One</span> Comment"
 msgstr "<span>Ein</span> Kommentar"
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/comments-extensions.php:83
-#, php-format
-msgid "<span>%d</span> Comments"
-msgstr "<span>%d</span> Kommentare"
-
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/comments-extensions.php:96
+#: library/extensions/comments-extensions.php:154
 msgid "Post a Comment"
-msgstr "Ihr Kommentar"
+msgstr "Einen Kommentar abgeben"
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/comments-extensions.php:103
+#: library/extensions/comments-extensions.php:165
 #, php-format
 msgid "Post a Reply to %s"
-msgstr "Schreibe eine Antwort an %s"
+msgstr "Schreiben Sie eine Antwort an %s"
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/comments-extensions.php:110
+#: library/extensions/comments-extensions.php:176
 msgid "Comment"
 msgstr "Kommentar"
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/comments-extensions.php:117
+# @ thematic
+#: library/extensions/comments-extensions.php:187
+msgid "Cancel reply"
+msgstr "Antwort abbrechen"
+
+#: library/extensions/comments-extensions.php:198
 msgid "Post Comment"
 msgstr "Absenden"
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/content-extensions.php:147
-msgid "Author Archives: "
-msgstr "Autorenarchiv: "
-
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/content-extensions.php:153
+#: library/extensions/content-extensions.php:340
+#: library/extensions/header-extensions.php:84
 msgid "Category Archives:"
 msgstr "Kategorien-Archiv:"
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/content-extensions.php:162
+#: library/extensions/content-extensions.php:349
+#: library/extensions/header-extensions.php:80
 msgid "Search Results for:"
 msgstr "Suchergebnisse für:"
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/content-extensions.php:168
+#: library/extensions/content-extensions.php:355
+#: library/extensions/header-extensions.php:88
 msgid "Tag Archives:"
 msgstr "Tag-Archiv:"
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/content-extensions.php:174
+#: library/extensions/content-extensions.php:364
+#: library/extensions/content-extensions.php:373
+msgid "Archives:"
+msgstr "Archive:"
+
+#: library/extensions/content-extensions.php:379
 #, php-format
 msgid "Daily Archives: <span>%s</span>"
-msgstr "Tägliches Archiv: <span>%s</span>"
+msgstr "T&auml;gliche Archive: <span>%s</span>"
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/content-extensions.php:178
+#: library/extensions/content-extensions.php:383
 #, php-format
 msgid "Monthly Archives: <span>%s</span>"
-msgstr "Monatliches Archiv: <span>%s</span>"
+msgstr "Monatliche Archive: <span>%s</span>"
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/content-extensions.php:182
+#: library/extensions/content-extensions.php:387
 #, php-format
 msgid "Yearly Archives: <span>%s</span>"
-msgstr "Jährliches Archiv: <span>%s</span>"
-
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/content-extensions.php:186
-msgid "Blog Archives"
-msgstr "Blog-Archiv"
+msgstr "J&auml;hrliche Archive: <span>%s</span>"
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/content-extensions.php:209
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/content-extensions.php:725
+#: library/extensions/content-extensions.php:429
+#: library/extensions/content-extensions.php:1728
 msgid "<span class=\"meta-nav\">&laquo;</span> Older posts"
-msgstr "<span class=\"meta-nav\">&laquo;</span> Ältere Beiträge"
+msgstr "<span class=\"meta-nav\">&laquo;</span> &Auml;ltere Beitr&aumlge"
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/content-extensions.php:210
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/content-extensions.php:726
+#: library/extensions/content-extensions.php:431
+#: library/extensions/content-extensions.php:1729
 msgid "Newer posts <span class=\"meta-nav\">&raquo;</span>"
-msgstr "Neuere Beiträge <span class=\"meta-nav\">&raquo;</span>"
+msgstr "Neuere Beitr&aumlge <span class=\"meta-nav\">&raquo;</span>"
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/content-extensions.php:394
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/content-extensions.php:618
+#: library/extensions/content-extensions.php:946
+#: library/extensions/content-extensions.php:1460
 msgid "Edit post"
 msgstr "Bearbeiten"
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/content-extensions.php:406
+#: library/extensions/content-extensions.php:975
+#: library/extensions/header-extensions.php:92
 msgid "Not Found"
 msgstr "Nicht gefunden"
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/content-extensions.php:411
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/content-extensions.php:686
+#: library/extensions/content-extensions.php:980
+#: library/extensions/content-extensions.php:1413
+#: library/extensions/content-extensions.php:1417
 msgid "Permalink to "
 msgstr "Permanent-Link zu "
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/content-extensions.php:441
+#: library/extensions/content-extensions.php:1041
 msgid "By "
 msgstr "Von "
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/content-extensions.php:444
+#: library/extensions/content-extensions.php:1051
 msgid "View all posts by "
-msgstr "Alle Beiträge zeigen von "
+msgstr "Alle Beitr&auml;ge zeigen von "
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/content-extensions.php:455
+#: library/extensions/content-extensions.php:1079
 msgid "Published: "
-msgstr "Veröffentlicht am: "
+msgstr "Ver&ouml;ffentlicht am: "
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/content-extensions.php:523
+#: library/extensions/content-extensions.php:1252
 msgid "Archives by Category"
-msgstr "Archive nach Monat"
+msgstr "Archive nach Kategorie"
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/content-extensions.php:534
+#: library/extensions/content-extensions.php:1280
 msgid "Archives by Month"
 msgstr "Archive nach Monat"
 
-#: c:\xampp\htdocs\development\wp-content\themes\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 "Es tut uns Leid, aber wir konnten nicht finden, was Sie gewünscht haben. Vielleicht hilft eine Suche."
+# @ thematic
+#: library/extensions/content-extensions.php:1413
+msgid "Browse the "
+msgstr "Durchsuche "
+
+#: library/extensions/content-extensions.php:1413
+msgid " Archive"
+msgstr " Archive"
+
+#: library/extensions/content-extensions.php:1414
+msgid " archive"
+msgstr " Archive"
+
+#: library/extensions/content-extensions.php:1417
+msgid "Bookmark the "
+msgstr "Lesezeichen: "
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/content-extensions.php:578
-msgid "Read More <span class=\"meta-nav\">&raquo;</span>"
-msgstr "Mehr lesen <span class=\"meta-nav\">&raquo;</span>"
+#: library/extensions/content-extensions.php:1418
+msgid "permalink"
+msgstr "Permalink"
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/content-extensions.php:629
+#: library/extensions/content-extensions.php:1572
 msgid "This entry was posted in "
-msgstr "Dieser Eintrag wurde veröffentlicht in "
+msgstr "Dieser Eintrag wurde ver&ouml;ffentlicht in "
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/content-extensions.php:632
+#: library/extensions/content-extensions.php:1580
 msgid "Also posted in "
-msgstr "Ver&ouml;ffentlicht in "
+msgstr "Ebenfalls ver&ouml;ffentlicht in "
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/content-extensions.php:635
+#: library/extensions/content-extensions.php:1583
 msgid "Posted in "
 msgstr "Ver&ouml;ffentlicht in "
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/content-extensions.php:646
+#: library/extensions/content-extensions.php:1609
+msgid " This entry is tagged"
+msgstr " Dieser Eintrag wurde ver&ouml;ffentlicht in "
+
+#: library/extensions/content-extensions.php:1612
 msgid " and tagged"
 msgstr " und getagged "
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/content-extensions.php:649
+#: library/extensions/content-extensions.php:1615
 msgid " Also tagged "
 msgstr " Auch getagged "
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/content-extensions.php:651
+#: library/extensions/content-extensions.php:1617
 msgid "Tagged"
 msgstr "Getagged"
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/content-extensions.php:663
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/content-extensions.php:666
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/content-extensions.php:669
+#: library/extensions/content-extensions.php:1644
+#: library/extensions/content-extensions.php:1647
+#: library/extensions/content-extensions.php:1650
 msgid "Comment on "
 msgstr "Kommentar"
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/content-extensions.php:664
-msgid " Comments"
-msgstr " Kommentare"
-
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/content-extensions.php:667
-msgid " Comment"
-msgstr " Kommentar"
-
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/content-extensions.php:670
+#: library/extensions/content-extensions.php:1651
 msgid "Leave a comment"
 msgstr "Kommentieren"
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/content-extensions.php:673
+#: library/extensions/content-extensions.php:1654
 msgid "Comments closed"
 msgstr "Kommentare geschlossen"
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/content-extensions.php:686
-msgid ". Bookmark the "
-msgstr ". Bookmarken: "
-
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/content-extensions.php:687
-msgid "permalink"
-msgstr "Permanent-Link"
-
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/content-extensions.php:689
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/content-extensions.php:697
+#: library/extensions/content-extensions.php:1678
+#: library/extensions/content-extensions.php:1686
 msgid "Post a comment"
 msgstr "Kommentieren"
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/content-extensions.php:690
+#: library/extensions/content-extensions.php:1679
 msgid " or leave a trackback: "
 msgstr " oder ein Trackback hinterlassen: "
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/content-extensions.php:691
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/content-extensions.php:694
+#: library/extensions/content-extensions.php:1680
+#: library/extensions/content-extensions.php:1683
 msgid "Trackback URL for your post"
 msgstr "Trackback-URL für Ihren Beitrag"
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/content-extensions.php:691
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/content-extensions.php:694
+#: library/extensions/content-extensions.php:1680
+#: library/extensions/content-extensions.php:1683
 msgid "Trackback URL"
 msgstr "Trackback-URL"
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/content-extensions.php:693
+#: library/extensions/content-extensions.php:1682
 msgid " Comments are closed, but you can leave a trackback: "
-msgstr " Kommentare sind geschlossen, aber Sie können ein Trackback hinterlassen: "
+msgstr " Kommentare sind geschlossen, aber Sie k&ouml;nnen ein Trackback hinterlassen: "
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/content-extensions.php:696
+#: library/extensions/content-extensions.php:1685
 msgid " Trackbacks are closed, but you can "
-msgstr " Trackbacks sind geschlossen, aber sie können "
+msgstr " Trackbacks sind geschlossen, aber sie k&ouml;nnen "
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/content-extensions.php:697
+#: library/extensions/content-extensions.php:1686
 msgid "post a comment"
 msgstr "Kommentieren"
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/content-extensions.php:699
+#: library/extensions/content-extensions.php:1688
 msgid " Both comments and trackbacks are currently closed."
 msgstr " Momentan ist weder das Kommentieren noch das Setzen eines Trackbacks m&ouml;glich."
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/discussion.php:10
+#: 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 "Erstellt am %1$s um %2$s <span class=\"meta-sep\">|</span> <a href=\"%3$s\">Permanent-Link</a>"
+msgstr "Erstellt am %1$s um %2$s <span class=\"meta-sep\">|</span> <a href=\"%3$s\" title=\"Permalink zu diesem Kommentar\">Permanent-Link</a>"
 
-#: c:\xampp\htdocs\development\wp-content\themes\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'>Ihr Kommentar wartet auf Freischaltung.</span>\n"
+#: library/extensions/discussion-extensions.php:35
+msgid "Edit comment"
+msgstr "Kommentar bearbeiten"
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/discussion.php:22
+#: library/extensions/discussion.php:52
 msgid "Reply"
 msgstr "Antworten"
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/discussion.php:23
+#: library/extensions/discussion.php:53
 msgid "Log in to reply."
-msgstr "Sie müssen eingeloggt sein, um antworten zu können."
+msgstr "Sie müssen eingeloggt sein, um antworten zu k&ouml;nnen."
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/discussion.php:37
+#: library/extensions/discussion.php:80
 #, php-format
 msgid "By %1$s on %2$s at %3$s"
 msgstr "Von %1$s am %2$s um %3$s"
 
-#: c:\xampp\htdocs\development\wp-content\themes\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\">Ihr Trackback wartet auf Freischaltung.</span>\\n"
-
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/header-extensions.php:251
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/widgets.php:77
+#: library/extensions/header-extensions.php:302
+#: library/extensions/widgets.php:157
 msgid "Posts RSS feed"
-msgstr "RSS-Feed der Beiträge"
+msgstr "RSS-Feed der Beitr&auml;ge"
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/header-extensions.php:269
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/widgets.php:78
+#: library/extensions/header-extensions.php:326
+#: library/extensions/widgets.php:158
 msgid "Comments RSS feed"
 msgstr "RSS-Feed der Kommentare"
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/header-extensions.php:401
+# @ thematic
+#: functions.php:253
+msgid "Primary Menu"
+msgstr "Prim&auml;res Men&uml"
+
+#: library/extensions/header-extensions.php:625
 msgid "Skip navigation to the content"
 msgstr "Navigation zu Inhalt überspringen"
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/header-extensions.php:401
+#: library/extensions/header-extensions.php:625
 msgid "Skip to content"
-msgstr "Zu Inhalt springen"
+msgstr "Zum Inhalt springen"
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/helpers.php:31
-#: c:\xampp\htdocs\development\wp-content\themes\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 "Es existiert kein Auszug, da dieser Beitrag geschützt ist."
+msgstr "Es existiert kein Auszug, da dieser Beitrag gesch&uuml;tzt ist."
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/shortcodes.php:16
+#: library/extensions/shortcodes.php:40
 msgid "Login"
 msgstr "Anmelden"
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/shortcodes.php:18
+#: library/extensions/shortcodes.php:42
 msgid "Logout"
-msgstr "Abmelden &raquo;"
+msgstr "Abmelden"
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/theme-options.php:13
+#: library/extensions/theme-options.php:50
 msgid "Index Insert Position"
-msgstr "Index Position zum Einfügen"
-
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/theme-options.php:14
-msgid "The widgetized Index Insert will follow after this post number."
-msgstr "The widgetized Index Insert erfolgt nach dem Beitrag Nummer (wie angegeben). "
+msgstr "Index Position zum Einf&uuml;gen"
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/theme-options.php:19
+#: library/extensions/theme-options.php:51
 msgid "Info on Author Page"
 msgstr "Info auf der Autorenseite"
 
-#: c:\xampp\htdocs\development\wp-content\themes\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 "Zeige eine <a href=\"http://microformats.org/wiki/hcard\" target=\"_blank\">vCard</a>—mit dem Avatar, Bio und E-Mail Adresse auf der Seite des Autors an."
-
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/theme-options.php:25
+#: library/extensions/theme-options.php:52
 msgid "Text in Footer"
 msgstr "Text im Footer"
 
-#: c:\xampp\htdocs\development\wp-content\themes\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 "Sie können die folgenden Shortcodes verwenden: [wp-link] [theme-link] [loginout-link] [blog-title] [the-year]"
-
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/theme-options.php:28
-msgid "Powered by [wp-link]. Built on the [theme-link]."
-msgstr "Angetrieben von [wp-link]. Darstellung basiert auf [theme-link]."
-
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/theme-options.php:75
-msgid "settings saved."
-msgstr "Einstellungen gespeichert."
-
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/theme-options.php:76
-msgid "settings reset."
-msgstr "Einstellungen zur&uuml;ckgesetzt"
-
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/theme-options.php:77
-msgid "widgets reset."
-msgstr "Widgets zur&uuml;ckgesetzt"
-
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/theme-options.php:190
-msgid "Save changes"
-msgstr "Änderungen speichern"
-
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/theme-options.php:196
-msgid "Reset"
-msgstr "Zur&uuml;cksetzen"
-
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/theme-options.php:202
-msgid "Reset Widgets"
-msgstr "Widgets zur&uuml;cksetzen"
-
-#: c:\xampp\htdocs\development\wp-content\themes\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 "Um mehr Information über dieses Thema zu erhalten, <a href=\"http://themeshaper.com\">besuchen Sie ThemeShaper</a>. Bitte besuchen Sie die <a href=\"http://themeshaper.com/forums/\">ThemeShaper Foren</a> falls Sie irgendwelche Fragen zu Thematic haben."
-
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/widgets-extensions.php:12
+#: library/extensions/widgets-extensions.php:34
 msgid "To search, type and hit enter"
 msgstr "Suchtext eingeben"
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/widgets-extensions.php:18
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/widgets-extensions.php:281
-#: c:\xampp\htdocs\development\wp-content\themes\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 "Suchen"
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/widgets-extensions.php:43
+#: library/extensions/widgets-extensions.php:72
 msgid "The primary widget area, most often used as a sidebar."
-msgstr "Der primäre Widget Bereich, hauptsächlich als Sidebar verwendet."
+msgstr "Der prim&auml;re Widget Bereich, haupts&auml;chlich als Sidebar verwendet."
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/widgets-extensions.php:58
+#: library/extensions/widgets-extensions.php:87
 msgid "The secondary widget area, most often used as a sidebar."
-msgstr "Der sekundäre Widget Bereich, hauptsächlich als Sidebar verwendet."
+msgstr "Der sekund&auml;re Widget Bereich, haupts&auml;chlich als Sidebar verwendet."
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/widgets-extensions.php:73
+#: library/extensions/widgets-extensions.php:102
 msgid "The 1st widget area in the footer."
 msgstr "Der erste Widget Bereich im Footer."
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/widgets-extensions.php:88
+#: library/extensions/widgets-extensions.php:117
 msgid "The 2nd widget area in the footer."
 msgstr "Der zweite Widget Bereich im Footer."
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/widgets-extensions.php:103
+#: library/extensions/widgets-extensions.php:132
 msgid "The 3rd widget area in the footer."
 msgstr "Der dritte Widget Bereich im Footer."
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/widgets-extensions.php:118
+#: library/extensions/widgets-extensions.php:147
 msgid "The top widget area displayed on the index page."
 msgstr "Der Widget Bereich oberhalb des Contents der Index Seite."
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/widgets-extensions.php:133
+#: library/extensions/widgets-extensions.php:162
 msgid "The widget area inserted after x posts on the index page."
 msgstr "Der eingeschobene Widget Bereich auf der Index Seite."
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/widgets-extensions.php:148
+#: library/extensions/widgets-extensions.php:177
 msgid "The bottom widget area displayed on the index page."
 msgstr "Der Widget Bereich unterhalb des Contents der Index Seite."
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/widgets-extensions.php:163
+#: library/extensions/widgets-extensions.php:192
 msgid "The top widget area displayed on a single post."
-msgstr "Der Widget Bereich oberhalb des COntents einer Single Post."
+msgstr "Der Widget Bereich oberhalb des Contents einer Single Post."
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/widgets-extensions.php:178
+#: library/extensions/widgets-extensions.php:207
 msgid "The widget area inserted between the post and the comments on a single post."
 msgstr "Der eingeschobene Widget Bereich einer Single Post."
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/widgets-extensions.php:193
+#: library/extensions/widgets-extensions.php:222
 msgid "The bottom widget area displayed on a single post."
 msgstr "Der Widget Bereich unterhalb des Contents einer Single Post."
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/widgets-extensions.php:208
+#: library/extensions/widgets-extensions.php:237
 msgid "The top widget area displayed on a page."
 msgstr "Der Widget Bereich oberhalb des Contents einer Page."
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/widgets-extensions.php:223
+#: library/extensions/widgets-extensions.php:252
 msgid "The bottom widget area displayed on a page."
 msgstr "Der Widget Bereich unterhalb des Contents einer Page."
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/widgets-extensions.php:283
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/widgets.php:55
+# @ thematic
+#: library/extensions/widgets.php:55
+msgid "A search form for your blog"
+msgstr "Eine Such Form für Ihren Blog"
+
+#: library/extensions/widgets.php:77
+#: library/extensions/widgets.php:132
+#: library/extensions/widgets.php:175
+msgid "Title:"
+msgstr "Titel:"
+
+# @ thematic
+#: library/extensions/widgets.php:100
+msgid "Log in/out and admin"
+msgstr "An-/Abmelden und Adminbereich"
+
+#: library/extensions/widgets.php:101
+#: library/extensions/widgets.php:106
 msgid "Meta"
 msgstr "Meta"
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/widgets-extensions.php:285
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/widgets-extensions.php:286
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/widgets.php:72
+# @ thematic
+#: library/extensions/widgets.php:145
+msgid "Links to your posts and comments feed"
+msgstr "Links zu den Feeds Ihrer Beitr&auml;ge und Kommentare"
+
+#: library/extensions/widgets.php:146
+#: library/extensions/widgets.php:151
 msgid "RSS Links"
 msgstr "RSS-Links:"
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/widgets.php:77
+#: library/extensions/widgets.php:157
 msgid "All posts"
-msgstr "Alle Beiträge"
+msgstr "Alle Beitr&auml;ge"
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/widgets.php:78
+#: library/extensions/widgets.php:158
 msgid "All comments"
 msgstr "Alle Kommentare"
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/widgets.php:96
-msgid "Title:"
-msgstr "Titel:"
+# @ thematic
+#: archives.php:20
+#: template-page-blog.php:22
+#, php-format
+msgid "The template %s"
+msgstr "Das Template %s"
+
+# @ thematic
+#: comments.php:24
+msgid "Please do not load this page directly."
+msgstr "Bitte versuchen Sie nicht, diese Seite direkt zu laden."
+
+#: comments.php:111
+msgid "Trackbacks"
+msgstr "Trackbacks"
+
+#: library/extensions/comments-extensions.php:131
+msgid "Comments"
+msgstr "Kommentare"
+
+#: library/extensions/content-extensions.php:334
+msgid "Author Archives:"
+msgstr "Autorenarchive:"
+
+#: library/extensions/content-extensions.php:1340
+msgid "Apologies, but we were unable to find what you were looking for. Perhaps searching will help."
+msgstr "Es tut uns leid, aber die Seite konnte nicht gefunden werden. Vielleicht hilft eine Suche."
+
+# @ thematic
+#: library/extensions/content-extensions.php:1364
+#, php-format
+msgid "Read More %s"
+msgstr "Lesen SIe mehr %s"
+
+#: library/extensions/content-extensions.php:1645
+msgid "Responses"
+msgstr "Antworten"
+
+#: library/extensions/content-extensions.php:1648
+msgid "Response"
+msgstr "Antwort"
+
+#: library/extensions/discussion.php:37
+msgid "Your comment is awaiting moderation"
+msgstr "Ihr Kommentar wartet auf Freischaltung."
+
+#: library/extensions/discussion.php:90
+msgid "Your trackback is awaiting moderation"
+msgstr "Ihr Trackback wartet auf Freischaltung."
+
+# @ thematic
+#: library/extensions/theme-options.php:56
+msgid "Remove Legacy Options"
+msgstr "Legacy Optionen entfernen"
+
+# @ thematic
+#: library/extensions/theme-options.php:204
+msgid "For more information:"
+msgstr "F&uuml;r mehr Informationen:"
+
+# @ thematic
+#: library/extensions/theme-options.php:206
+msgid "For support:"
+msgstr "F&uuml;r Support:"
+
+# @ thematic
+#: library/extensions/theme-options.php:208
+msgid "forums"
+msgstr "Foren"
+
+# @ thematic
+#: library/extensions/theme-options.php:212
+msgid "The options below are enabled by the Thematic Theme framework and/or a child theme."
+msgstr "Die folgenden Optionen werden vom Thematic Theme Framework und / oder einem Child Theme freigeschaltet."
+
+# @ 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 "Neue Optionen k&ouml;nnen mit einem Child Theme hinzugef&uuml;gt werden. Ebenfalls k&ouml;nnen die Default Optionen entfernt werden. Diese Information kann auch über ein Child Theme ge&auml;ndert werden."
+
+# @ thematic
+#: library/extensions/theme-options.php:219
+msgid "Overview"
+msgstr "&Uuml;bersicht"
+
+#: 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 "Um mehr Information &uuml;ber dieses Theme zu erhalten, <a href=\"http://thematictheme.com\">besuchen Sie ThematicTheme.com</a>. Bitte besuchen Sie die <a href=\"http://thematictheme.com/forums/\">ThematicTheme.com Foren</a> falls Sie Fragen zu Thematic haben."
+
+# @ thematic
+#: library/extensions/theme-options.php:262
+#, php-format
+msgid "%s Theme Options"
+msgstr "%s Theme Optionen"
+
+#: library/extensions/theme-options.php:276
+msgid "Save Changes"
+msgstr "&Aumlnderungen speichern"
+
+# @ 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 "Der Widget Bereich Index Insert erscheint nach dem angebenen Beitrag. Keine Eingabe oder eine 0 schalten dieses Feature ab."
+
+# @ thematic
+#: library/extensions/theme-options.php:324
+msgid "Display a"
+msgstr "Zeige eine"
+
+# @ thematic
+#: library/extensions/theme-options.php:324
+msgid "with the author's avatar, bio and email on the author page."
+msgstr "mit dem Avatar, einer Info und der Email auf der Seite des Authors an."
+
+# @ thematic
+#: library/extensions/theme-options.php:337
+msgid "You can use HTML and shortcodes in your footer text. Shortcode examples"
+msgstr "Sie k&ouml;nnen HTML und Shortcodes im Footer Text verwenden. Shortcode Beispiele"
+
+# @ 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 Theme Optionen wurden auf ein verbessertes Format &uuml;bertragen. Sie k&ouml;nnen jetzt die alten Optionen aus der Datenbank entfernen."
+
+# @ 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 "Die Position für den Index Insert Bereich muss ein numerischer Wert gleich oder gr&ouml;&szlig;er 0 sein. Der urspr&uuml;ngliche Wert wurde wiederhergestellt."
+
+# @ thematic
+#: template-page-blog.php:22
+#, php-format
+msgid "You can include a %s in a childtheme"
+msgstr "Sie können ein %s in ein Child Theme einf&uuml;gen."
+
+#~ msgid "<span>%d</span> Trackbacks"
+#~ msgstr "<span>%d</span> Trackbacks"
+
+#~ msgid "<span>%d</span> Comments"
+#~ msgstr "<span>%d</span> Kommentare"
+
+#~ msgid "Blog Archives"
+#~ msgstr "Blog-Archiv"
+
+#~ msgid "Read More <span class=\"meta-nav\">&raquo;</span>"
+#~ msgstr "Mehr lesen <span class=\"meta-nav\">&raquo;</span>"
+
+#~ msgid "The widgetized Index Insert will follow after this post number."
+#~ msgstr ""
+#~ "The widgetized Index Insert erfolgt nach dem Beitrag Nummer (wie "
+#~ "angegeben). "
+
+#~ 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 ""
+#~ "Zeige eine <a href=\"http://microformats.org/wiki/hcard\" target=\"_blank"
+#~ "\">vCard</a>—mit dem Avatar, Bio und E-Mail Adresse auf der Seite des "
+#~ "Autors an."
+
+#~ msgid ""
+#~ "You can use the following shortcodes in your footer text: [wp-link] "
+#~ "[theme-link] [loginout-link] [blog-title] [blog-link] [the-year]"
+#~ msgstr ""
+#~ "Sie können die folgenden Shortcodes verwenden: [wp-link] [theme-link] "
+#~ "[loginout-link] [blog-title] [the-year]"
+
+#~ msgid "Powered by [wp-link]. Built on the [theme-link]."
+#~ msgstr "Angetrieben von [wp-link]. Darstellung basiert auf [theme-link]."
+
+#~ msgid "settings saved."
+#~ msgstr "Einstellungen gespeichert."
+
+#~ msgid "settings reset."
+#~ msgstr "Einstellungen zur&uuml;ckgesetzt"
+
+#~ msgid "widgets reset."
+#~ msgstr "Widgets zur&uuml;ckgesetzt"
+
+#~ msgid "Reset"
+#~ msgstr "Zur&uuml;cksetzen"
+
+#~ msgid "Reset Widgets"
+#~ msgstr "Widgets zur&uuml;cksetzen"
 
 #~ msgid "definitions created."
 #~ msgstr "Definitionen erstellt."
+
 #~ msgid "failed to create directory:"
 #~ msgstr "Erstellen des Verzeichnisses fehlgeschlagen:"
+
 #~ msgid "failed to create the file:"
 #~ msgstr "Erstellen der Datei fehlgeschlagen:"
+
 #~ msgid "Create Definitions"
 #~ msgstr "Erstelle Definitionen"
+
 #~ msgid "Pages"
 #~ msgstr "Seiten"
+
 #~ msgid "Categories"
 #~ msgstr "Kategorien"
-#~ msgid "Archives"
-#~ msgstr "Archive"
+
 #~ msgid "RSS Feeds"
 #~ msgstr "RSS-Feeds"
+
 #~ msgid ""
 #~ "Enter the HTML text that will appear in the bottom of your footer. Feel "
 #~ "free to remove or change any links. <strong>Hint:</strong> <a href="
@@ -528,6 +713,7 @@ msgstr "Titel:"
 #~ "Links können geändert oder entfernt werden. <strong>Hinweis:</strong> <a "
 #~ "href=\"http://www.w3schools.com/HTML/html_links.asp\" target=\"_blank"
 #~ "\">Syntax eines Links</a>."
+
 #~ msgid ""
 #~ "<span id=\"generator-link\">Powered by <a href=\"http://WordPress.org/\" "
 #~ "title=\"WordPress\" rel=\"generator\">WordPress</a></span><span class="
@@ -541,60 +727,85 @@ msgstr "Titel:"
 #~ "basiert auf dem <a href=\"http://themeshaper.com/thematic-for-wordpress\" "
 #~ "title=\"Thematic Theme Framework\" rel=\"designer\">Thematic Theme "
 #~ "Framework</a>.</span>"
+
 #~ msgid "Blog Index"
 #~ msgstr "Blog-Index"
+
 #~ msgid "Blog Buttons"
 #~ msgstr "Blog Buttons"
+
 #~ msgid "Page"
 #~ msgstr "Seite"
+
 #~ msgid "Error 404 - Not Found"
 #~ msgstr "Fehler 404 - Nicht gefunden"
+
 #~ msgid "Archive for the &#8216;%s&#8217; Category"
 #~ msgstr "Archiv f&uuml;r die Kategorie &#8222;%s&#8220;"
+
 #~ msgid "Posts Tagged &#8216;%s&#8217;"
 #~ msgstr "Artikel-Schlagworte: &#8222;%s&#8220;"
+
 #~ msgid "Archive for %s|Daily archive page"
 #~ msgstr "Archiv f&uuml;r %s"
+
 #~ msgid "F jS, Y"
 #~ msgstr "j. F Y"
+
 #~ msgid "Archive for %s|Monthly archive page"
 #~ msgstr "Archiv f&uuml;r %s"
+
 #~ msgid "F, Y"
 #~ msgstr "F Y"
+
 #~ msgid "Archive for %s|Yearly archive page"
 #~ msgstr "Archiv f&uuml;r %s"
+
 #~ msgid "Y"
 #~ msgstr "Y"
+
 #~ msgid "&laquo; Older Entries"
 #~ msgstr "&laquo; &Auml;ltere Eintr&auml;ge"
+
 #~ msgid "Newer Entries &raquo;"
 #~ msgstr "Neuere Eintr&auml;ge &raquo;"
+
 #~ msgid "l, F jS, Y"
 #~ msgstr "l, j. F Y"
+
 #~ msgid "Tags:"
 #~ msgstr "Schlagworte:"
+
 #~ msgid "No Comments &#187;"
 #~ msgstr "Keine Kommentare &#187;"
+
 #~ msgid "1 Comment &#187;"
 #~ msgstr "1 Kommentar &#187;"
+
 #~ msgid "% Comments &#187;"
 #~ msgstr "% Kommentare &#187;"
+
 #~ msgid "Archives by Subject:"
 #~ msgstr "Archive nach Thema:"
+
 #~ msgid "Permanent Link: %s"
 #~ msgstr "Permanent-Link: %s"
+
 #~ msgid "Read the rest of this entry &raquo;"
 #~ msgstr "Diesen Beitrag weiterlesen &raquo;"
+
 #~ msgid "This entry was posted %1$s on %2$s at %3$s and is filed under %4$s."
 #~ msgstr ""
 #~ "Dieser Beitrag wurde vor %1$s am %2$s um %3$s Uhr ver&ouml;ffentlicht und "
 #~ "unter %4$s gespeichert."
+
 #~ msgid ""
 #~ "You can follow any responses to this entry through the <a href='%s'>RSS "
 #~ "2.0</a> feed."
 #~ msgstr ""
-#~ "Sie k&ouml;nnen Kommentare zu diesem Eintrag &uuml;ber den <a href='%"
-#~ "s'>RSS-2.0</a>-Feed verfolgen."
+#~ "Sie k&ouml;nnen Kommentare zu diesem Eintrag &uuml;ber den <a "
+#~ "href='%s'>RSS-2.0</a>-Feed verfolgen."
+
 #~ msgid ""
 #~ "You can <a href=\"#respond\">leave a response</a>, or <a href=\"%s\" rel="
 #~ "\"trackback\">trackback</a> from your own site."
@@ -602,76 +813,99 @@ msgstr "Titel:"
 #~ "Sie k&ouml;nnen einen <a href=\"#respond\">Kommentar hinterlassen</a> "
 #~ "oder einen <a href=\"%s\" rel=\"trackback\">Trackback</a> von Ihrer "
 #~ "Website hierher setzen."
+
 #~ msgid ""
 #~ "Responses are currently closed, but you can <a href=\"%s\" rel=\"trackback"
 #~ "\">trackback</a> from your own site."
 #~ msgstr ""
 #~ "Kommentare sind momentan deaktiviert, aber Sie k&ouml;nnen einen <a href="
 #~ "\"%s\" rel=\"trackback\">Trackback</a> von Ihrer Website hierher setzen."
+
 #~ msgid ""
 #~ "You can skip to the end and leave a response. Pinging is currently not "
 #~ "allowed."
 #~ msgstr ""
 #~ "Sie k&ouml;nnen einen <a href=\"#respond\">Kommentar hinterlassen</a>, "
 #~ "Pingbacks/Trackbacks sind momentan deaktiviert."
+
 #~ msgid "Edit this entry."
 #~ msgstr "Diesen Eintrag bearbeiten"
+
 #~ msgid "Sorry, no attachments matched your criteria."
 #~ msgstr ""
 #~ "Leider wurden keine Anh&auml;nge gefunden, die Ihren Kriterien "
 #~ "entsprechen."
+
 #~ msgid "No Responses"
 #~ msgstr "Keine Kommentare"
+
 #~ msgid "One Response"
 #~ msgstr "1 Kommentar"
-#~ msgid "% Responses"
-#~ msgstr "% Kommentare"
+
 #~ msgid "to &#8220;%s&#8221;"
 #~ msgstr "zu &#8222;%s&#8220;"
+
 #~ msgid "<cite>%s</cite> Says:"
 #~ msgstr "<cite>%s</cite> sagt:"
+
 #~ msgid "edit"
 #~ msgstr "bearbeiten"
+
 #~ msgid "Comments are closed."
 #~ msgstr "Kommentieren ist momentan nicht m&ouml;glich."
+
 #~ msgid "Leave a Reply"
 #~ msgstr "Kommentieren"
+
 #~ msgid "Logged in as <a href=\"%1$s\">%2$s</a>."
 #~ msgstr "Angemeldet als <a href=\"%1$s\">%2$s</a>."
+
 #~ msgid "Log out of this account"
 #~ msgstr "Jetzt abmelden"
+
 #~ msgid "Log out &raquo;"
 #~ msgstr "Abmelden &raquo;"
+
 #~ msgid "(required)"
 #~ msgstr "(ben&ouml;tigt)"
+
 #~ msgid "Mail (will not be published)"
 #~ msgstr "E-Mail (wird nicht ver&ouml;ffentlicht)"
+
 #~ msgid "<strong>XHTML:</strong> You can use these tags: <code>%s</code>"
 #~ msgstr ""
-#~ "<strong>XHTML:</strong> Sie k&ouml;nnen folgende Elemente nutzen: <code>%"
-#~ "s</code>"
+#~ "<strong>XHTML:</strong> Sie k&ouml;nnen folgende Elemente nutzen: <code>"
+#~ "%s</code>"
+
 #~ msgid "Submit Comment"
 #~ msgstr "Kommentar senden"
+
 #~ msgid "%1$s - Comments on %2$s"
 #~ msgstr "%1$s - Kommentare zu %2$s"
+
 #~ msgid ""
 #~ "<abbr title=\"Really Simple Syndication\">RSS</abbr> feed for comments on "
 #~ "this post."
 #~ msgstr ""
 #~ "<abbr title=\"Really Simple Syndication\">RSS</abbr>-Feed f&uuml;r "
 #~ "Kommentare zu diesem Artikel."
+
 #~ msgid ""
 #~ "The <abbr title=\"Universal Resource Locator\">URL</abbr> to TrackBack "
 #~ "this entry is: <em>%s</em>"
 #~ msgstr ""
 #~ "Die Trackback-<abbr title=\"Universal Resource Locator\">URL</abbr> zu "
 #~ "diesem Artikel ist: <em>%s</em>"
+
 #~ msgid "Pingback"
 #~ msgstr "Pingback"
+
 #~ msgid "by %1$s &#8212; %2$s @ <a href=\"#comment-%3$s\">%4$s</a>"
 #~ msgstr "von %1$s &#8212; %2$s um <a href=\"#comment-%3$s\">%4$s Uhr</a>"
+
 #~ msgid "No comments yet."
 #~ msgstr "Noch keine Kommentare."
+
 #~ msgid ""
 #~ "Line and paragraph breaks automatic, e-mail address never displayed, "
 #~ "<acronym title=\"Hypertext Markup Language\">HTML</acronym> allowed: "
@@ -680,110 +914,153 @@ msgstr "Titel:"
 #~ "Zeilen- und Absatzumbr&uuml;che werden automatisch eingef&uuml;gt, Ihre E-"
 #~ "Mail wird nicht angezeigt.Erlaubtes <acronym title=\"Hypertext Markup "
 #~ "Language\">HTML</acronym>:"
+
 #~ msgid "<abbr title=\"Universal Resource Locator\">URL</abbr>"
 #~ msgstr "<abbr title=\"Universal Resource Locator\">URL</abbr>"
+
 #~ msgid "Say It!"
 #~ msgstr "Senden"
+
 #~ msgid "Sorry, the comment form is closed at this time."
 #~ msgstr "Kommentieren ist momentan leider nicht m&ouml;glich."
+
 #~ msgid "Close this window."
 #~ msgstr "Fenster schlie&szlig;en."
+
 #~ msgid ""
 #~ "Powered by <a href=\"%s\" title=\"Powered by WordPress, state-of-the-art "
 #~ "semantic personal publishing platform\"><strong>WordPress</strong></a>"
 #~ msgstr ""
 #~ "<a href=\"%s\" title=\"WordPress, die f&uuml;hrende Weblog-Anwendung"
 #~ "\"><strong>WordPress</strong></a>"
+
 #~ msgid "%1$s is proudly powered by %2$s"
 #~ msgstr "%1$s l&auml;uft mit %2$s"
+
 #~ msgid "%1$s and %2$s."
 #~ msgstr "%1$s und %2$s."
+
 #~ msgid "Entries (RSS)"
 #~ msgstr "Beitr&auml;ge (RSS)"
+
 #~ msgid "%d queries. %s seconds."
 #~ msgstr "%d Abfragen. %s Sekunden."
+
 #~ msgid "Customize Header"
 #~ msgstr "Kopfbereich anpassen"
+
 #~ msgid "Header Image and Color"
 #~ msgstr "Hintergrundbild und -farbe"
+
 #~ msgid "Close Color Picker"
 #~ msgstr "Farbw&auml;hler schlie&szlig;en"
+
 #~ msgid "Save"
 #~ msgstr "Speichern"
+
 #~ msgid "Font Color:"
 #~ msgstr "Schriftfarbe:"
+
 #~ msgid "Any CSS color (%s or %s or %s)"
 #~ msgstr "Eine beliebige CSS-Farbe (%s oder %s oder %s)"
+
 #~ msgid "Upper Color:"
 #~ msgstr "Farbe f&uuml;r oben:"
+
 #~ msgid "HEX only (%s or %s)"
 #~ msgstr "Nur HEX (%s oder %s)"
+
 #~ msgid "Lower Color:"
 #~ msgstr "Farbe f&uuml;r unten:"
+
 #~ msgid "Toggle Text"
 #~ msgstr "Text umschalten"
+
 #~ msgid "Use Defaults"
 #~ msgstr "Standard verwenden"
+
 #~ msgid "Font Color"
 #~ msgstr "Schriftfarbe"
+
 #~ msgid "Upper Color"
 #~ msgstr "Farbe f&uuml;r oben"
+
 #~ msgid "Lower Color"
 #~ msgstr "Farbe f&uuml;r unten"
+
 #~ msgid "Advanced"
 #~ msgstr "Erweitert"
+
 #~ msgid "Update Header &raquo;"
 #~ msgstr "Kopfbereich aktualisieren &raquo;"
+
 #~ msgid "Font Color (CSS):"
 #~ msgstr "Schriftfarbe (CSS):"
+
 #~ msgid "Upper Color (HEX):"
 #~ msgstr "Farbe f&uuml;r oben (HEX):"
+
 #~ msgid "Lower Color (HEX):"
 #~ msgstr "Farbe f&uuml;r unten (HEX):"
+
 #~ msgid "Select Default Colors"
 #~ msgstr "Standardfarben ausw&auml;hlen"
+
 #~ msgid "Toggle Text Display"
 #~ msgstr "Textanzeige aktivieren/deaktivieren"
+
 #~ msgid "&raquo; Blog Archive"
 #~ msgstr "&raquo; Blogarchiv"
+
 #~ msgid "This entry was posted on %1$s at %2$s and is filed under %3$s."
 #~ msgstr ""
 #~ "Dieser Beitrag wurde am %1$s um %2$s Uhr veröffentlicht und unter %3$s "
 #~ "gespeichert."
+
 #~ msgid "Sorry, no posts matched your criteria."
 #~ msgstr ""
 #~ "Leider wurden keine Artikel gefunden, die Ihren Kriterien entsprechen."
+
 #~ msgid "Sorry, but you are looking for something that isn&#8217;t here."
 #~ msgstr "Es konnten leider keine passenden Inhalte gefunden werden."
+
 #~ msgid "Read the rest of this page &raquo;"
 #~ msgstr "Diesen Seite weiterlesen &raquo;"
+
 #~ msgid "Search for:"
 #~ msgstr "Suchen nach:"
+
 #~ msgid "No posts found. Try a different search?"
 #~ msgstr ""
 #~ "Ihre Suche ergab keine Treffer. M&ouml;chten Sie eine neue Suche starten?"
+
 #~ msgid "Author"
 #~ msgstr "Autor"
+
 #~ msgid "You are currently browsing the archives for the %s category."
 #~ msgstr "Sie sind momentan im Archiv der Kategorie %s."
+
 #~ msgid ""
 #~ "You are currently browsing the <a href=\"%1$s/\">%2$s</a> blog archives "
 #~ "for the day %3$s."
 #~ msgstr ""
-#~ "Sie sind momentan im Blogarchiv f&uuml;r den %3$s von <a href=\"%1$s/\">%2"
-#~ "$s</a>."
+#~ "Sie sind momentan im Blogarchiv f&uuml;r den %3$s von <a href=\"%1$s/\">"
+#~ "%2$s</a>."
+
 #~ msgid ""
 #~ "You are currently browsing the <a href=\"%1$s/\">%2$s</a> blog archives "
 #~ "for %3$s."
 #~ msgstr ""
 #~ "Sie sind momentan im Blogarchiv f&uuml;r %3$s von <a href=\"%1$s/\">%2$s</"
 #~ "a>."
+
 #~ msgid ""
 #~ "You are currently browsing the <a href=\"%1$s/\">%2$s</a> blog archives "
 #~ "for the year %3$s."
 #~ msgstr ""
 #~ "Sie sind momentan im Blogarchiv f&uuml;r das Jahr %3$s von <a href=\"%1$s/"
 #~ "\">%2$s</a>."
+
 #~ msgid ""
 #~ "You have searched the <a href=\"%1$s/\">%2$s</a> blog archives for "
 #~ "<strong>&#8216;%3$s&#8217;</strong>. If you are unable to find anything "
@@ -793,31 +1070,38 @@ msgstr "Titel:"
 #~ "<strong>&#8222;%3$s&#8220;</strong> gesucht. Falls Sie in den "
 #~ "Suchergebnissen nicht f&uuml;ndig werden, helfen Ihnen m&ouml;"
 #~ "glicherweise die folgenden Links."
+
 #~ msgid ""
 #~ "You are currently browsing the <a href=\"%1$s/\">%2$s</a> blog archives."
 #~ msgstr "Sie sind momentan im Blogarchiv von <a href=\"%1$s/\">%2$s</a>."
+
 #~ msgid "This page validates as XHTML 1.0 Transitional"
 #~ msgstr "Diese Seite ist valides XHTML 1.0 Transitional"
+
 #~ msgid "XHTML Friends Network"
 #~ msgstr "XHTML Friends Network"
+
 #~ msgid "XFN"
 #~ msgstr "XFN"
+
 #~ msgid ""
 #~ "Powered by WordPress, state-of-the-art semantic personal publishing "
 #~ "platform."
 #~ msgstr "L&auml;uft mit WordPress, der f&uuml;hrenden Weblog-Anwendung."
+
 #~ msgid "Edit this entry"
 #~ msgstr "Diesen Eintrag bearbeiten"
+
 #~ msgid ""
 #~ "Powered by <a href=\"%s\" title=\"Powered by WordPress, state-of-the-art "
 #~ "semantic personal publishing platform\"><strong>Wordpress</strong></a>"
 #~ msgstr ""
 #~ "<a href=\"%s\" title=\"WordPress, die f&uuml;hrende Weblog-Anwendung"
 #~ "\"><strong>WordPress</strong></a>"
+
 #~ msgid ""
 #~ "Logged in as <a href=\"%1$s\">%2$s</a>. <a href=\"%3$s\" title=\"Log out "
 #~ "of this account\">Logout &raquo;</a>"
 #~ msgstr ""
 #~ "Angemeldet als <a href=\"%1$s\">%2$s</a>. <a href=\"%3$s\">Abmelden "
 #~ "&raquo;</a>"
-
diff --git a/wp-content/themes/thematic/library/languages/es_ES.mo b/wp-content/themes/thematic/library/languages/es_ES.mo
index d540a442d2f6a8be15caf0dba2b509cc429453e6..ac3cc76cc41ce5235949a3308048834157b0f73e 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 d62fd88a24a63551dd1868a42ec6fb10f6476326..dbfdc894ffc8a24fff85e084709d4323e2992a0f 100644
--- a/wp-content/themes/thematic/library/languages/es_ES.po
+++ b/wp-content/themes/thematic/library/languages/es_ES.po
@@ -2,10 +2,10 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Thematic en Español\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-18 20:58+0100\n"
-"PO-Revision-Date: 2010-03-16 14:43+0100\n"
-"Last-Translator: José Pardilla <info@josepardilla.com>\n"
-"Language-Team: Moskis <info@josepardilla.com>\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"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -16,485 +16,533 @@ msgstr ""
 "X-Poedit-Basepath: ..\\..\\\n"
 "X-Poedit-SearchPath-0: ..\\..\n"
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/archives.php:42
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/links.php:53
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/page.php:40
+#: 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"
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/attachment.php:39
+#: c:\users\Chris\Desktop\thematic/attachment.php:49
 msgid "Pages:"
 msgstr "Páginas:"
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/author.php:53
+#: c:\users\Chris\Desktop\thematic/author.php:61
 msgid "Email "
 msgstr "Email"
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/comments.php:10
+#: c:\users\Chris\Desktop\thematic/comments.php:10
 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:\xampp\htdocs\development\wp-content\themes\thematic/comments.php:52
+#: c:\users\Chris\Desktop\thematic/comments.php:52
 #, php-format
 msgid "<span>%d</span> Trackbacks"
 msgstr "<span>%d</span> Trackbacks"
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/comments.php:52
+#: c:\users\Chris\Desktop\thematic/comments.php:52
 msgid "<span>One</span> Trackback"
 msgstr "<span>Un</span> Trackback"
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/comments.php:72
+#: 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:\xampp\htdocs\development\wp-content\themes\thematic/comments.php:83
+#: 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:\xampp\htdocs\development\wp-content\themes\thematic/comments.php:90
+#: 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:\xampp\htdocs\development\wp-content\themes\thematic/comments.php:90
+#: 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:\xampp\htdocs\development\wp-content\themes\thematic/comments.php:93
+#: c:\users\Chris\Desktop\thematic/comments.php:95
 msgid "Name"
 msgstr "Nombre"
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/comments.php:93
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/comments.php:98
+#: 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:\xampp\htdocs\development\wp-content\themes\thematic/comments.php:98
+#: c:\users\Chris\Desktop\thematic/comments.php:100
 msgid "Email"
 msgstr "Email"
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/comments.php:103
+#: c:\users\Chris\Desktop\thematic/comments.php:105
 msgid "Website"
 msgstr "Sitio Web"
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/comments.php:115
+#: 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:\xampp\htdocs\development\wp-content\themes\thematic/page.php:38
+#: c:\users\Chris\Desktop\thematic/page.php:48
 msgid "Pages: "
 msgstr "Páginas: "
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/search.php:41
+#: c:\users\Chris\Desktop\thematic/search.php:44
 msgid "Nothing Found"
 msgstr "No se ha encontrado nada"
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/search.php:43
+#: 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."
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/search.php:48
+#: c:\users\Chris\Desktop\thematic/search.php:51
 msgid "Find"
 msgstr "Buscar"
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/comments-extensions.php:76
+#: c:\users\Chris\Desktop\thematic/library/extensions/comments-extensions.php:76
 msgid "<span>One</span> Comment"
 msgstr "<span>Un</span> Comentario"
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/comments-extensions.php:83
+#: c:\users\Chris\Desktop\thematic/library/extensions/comments-extensions.php:83
 #, php-format
 msgid "<span>%d</span> Comments"
 msgstr "<span>%d</span>  Comentarios"
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/comments-extensions.php:96
+#: c:\users\Chris\Desktop\thematic/library/extensions/comments-extensions.php:96
 msgid "Post a Comment"
 msgstr "Publicar un Comentario"
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/comments-extensions.php:103
+#: c:\users\Chris\Desktop\thematic/library/extensions/comments-extensions.php:103
 #, php-format
 msgid "Post a Reply to %s"
 msgstr "Publica una respuesta para %s"
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/comments-extensions.php:110
+#: c:\users\Chris\Desktop\thematic/library/extensions/comments-extensions.php:110
 msgid "Comment"
 msgstr "Comentario"
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/comments-extensions.php:117
+#: c:\users\Chris\Desktop\thematic/library/extensions/comments-extensions.php:118
+msgid "Cancel reply"
+msgstr "Cancelar respuesta"
+
+#: c:\users\Chris\Desktop\thematic/library/extensions/comments-extensions.php:125
 msgid "Post Comment"
 msgstr "Publicar Comentario"
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/content-extensions.php:147
+#: c:\users\Chris\Desktop\thematic/library/extensions/content-extensions.php:212
 msgid "Author Archives: "
 msgstr "Archivos del autor: "
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/content-extensions.php:153
+#: c:\users\Chris\Desktop\thematic/library/extensions/content-extensions.php:218
 msgid "Category Archives:"
 msgstr "Categoría:"
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/content-extensions.php:162
+#: c:\users\Chris\Desktop\thematic/library/extensions/content-extensions.php:227
 msgid "Search Results for:"
 msgstr "Resultados de la búsqueda:"
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/content-extensions.php:168
+#: c:\users\Chris\Desktop\thematic/library/extensions/content-extensions.php:233
 msgid "Tag Archives:"
 msgstr "Etiqueta:"
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/content-extensions.php:174
+#: c:\users\Chris\Desktop\thematic/library/extensions/content-extensions.php:242
+#: c:\users\Chris\Desktop\thematic/library/extensions/content-extensions.php:250
+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:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/content-extensions.php:178
+#: 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:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/content-extensions.php:182
+#: 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:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/content-extensions.php:186
+#: c:\users\Chris\Desktop\thematic/library/extensions/content-extensions.php:268
 msgid "Blog Archives"
 msgstr "Archivos del blog"
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/content-extensions.php:209
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/content-extensions.php:725
+#: 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\">&laquo;</span> Older posts"
 msgstr "<span class=\"meta-nav\">&laquo;</span> Entradas anteriores"
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/content-extensions.php:210
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/content-extensions.php:726
+#: 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\">&raquo;</span>"
 msgstr "Entradas posteriores <span class=\"meta-nav\">&raquo;</span>"
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/content-extensions.php:394
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/content-extensions.php:618
+#: c:\users\Chris\Desktop\thematic/library/extensions/content-extensions.php:672
+#: c:\users\Chris\Desktop\thematic/library/extensions/content-extensions.php:1041
 msgid "Edit post"
 msgstr "Editar entrada"
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/content-extensions.php:406
+#: c:\users\Chris\Desktop\thematic/library/extensions/content-extensions.php:692
 msgid "Not Found"
 msgstr "No Encontrado"
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/content-extensions.php:411
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/content-extensions.php:686
+#: 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 "
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/content-extensions.php:441
+#: c:\users\Chris\Desktop\thematic/library/extensions/content-extensions.php:742
 msgid "By "
 msgstr "Por "
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/content-extensions.php:444
+#: c:\users\Chris\Desktop\thematic/library/extensions/content-extensions.php:745
 msgid "View all posts by "
 msgstr "Ver todas las entradas escritas por "
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/content-extensions.php:455
+#: c:\users\Chris\Desktop\thematic/library/extensions/content-extensions.php:763
 msgid "Published: "
 msgstr "Publicado: "
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/content-extensions.php:523
+#: c:\users\Chris\Desktop\thematic/library/extensions/content-extensions.php:888
 msgid "Archives by Category"
 msgstr "Archivos por Categoría"
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/content-extensions.php:534
+#: c:\users\Chris\Desktop\thematic/library/extensions/content-extensions.php:907
 msgid "Archives by Month"
 msgstr "Archivos por Mes"
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/content-extensions.php:562
+#: 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."
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/content-extensions.php:578
+#: c:\users\Chris\Desktop\thematic/library/extensions/content-extensions.php:967
 msgid "Read More <span class=\"meta-nav\">&raquo;</span>"
 msgstr "Leer Más <span class=\"meta-nav\">&raquo;</span>"
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/content-extensions.php:629
+#: c:\users\Chris\Desktop\thematic/library/extensions/content-extensions.php:1001
+msgid "Browse the "
+msgstr "Navegar por el"
+
+#: c:\users\Chris\Desktop\thematic/library/extensions/content-extensions.php:1001
+msgid " Archive"
+msgstr "Archivo:"
+
+#: c:\users\Chris\Desktop\thematic/library/extensions/content-extensions.php:1002
+msgid " archive"
+msgstr "archivo"
+
+#: c:\users\Chris\Desktop\thematic/library/extensions/content-extensions.php:1006
+msgid "Bookmark the "
+msgstr "Guarda el "
+
+#: c:\users\Chris\Desktop\thematic/library/extensions/content-extensions.php:1007
+msgid "permalink"
+msgstr "enlace permanente"
+
+#: c:\users\Chris\Desktop\thematic/library/extensions/content-extensions.php:1123
 msgid "This entry was posted in "
 msgstr "Esta entrada fue publicada en "
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/content-extensions.php:632
+#: c:\users\Chris\Desktop\thematic/library/extensions/content-extensions.php:1131
 msgid "Also posted in "
 msgstr "También publicada en "
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/content-extensions.php:635
+#: c:\users\Chris\Desktop\thematic/library/extensions/content-extensions.php:1134
 msgid "Posted in "
 msgstr "Entrada publicada en "
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/content-extensions.php:646
+#: c:\users\Chris\Desktop\thematic/library/extensions/content-extensions.php:1152
+msgid " This entry is tagged"
+msgstr " Esta entrada está etiquetada con"
+
+#: c:\users\Chris\Desktop\thematic/library/extensions/content-extensions.php:1155
 msgid " and tagged"
 msgstr " y clasificada en"
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/content-extensions.php:649
+#: c:\users\Chris\Desktop\thematic/library/extensions/content-extensions.php:1158
 msgid " Also tagged "
 msgstr " También etiquetada con "
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/content-extensions.php:651
+#: c:\users\Chris\Desktop\thematic/library/extensions/content-extensions.php:1160
 msgid "Tagged"
 msgstr "Etiquetas:"
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/content-extensions.php:663
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/content-extensions.php:666
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/content-extensions.php:669
+#: 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:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/content-extensions.php:664
+#: c:\users\Chris\Desktop\thematic/library/extensions/content-extensions.php:1180
 msgid " Comments"
 msgstr " Comentarios"
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/content-extensions.php:667
+#: c:\users\Chris\Desktop\thematic/library/extensions/content-extensions.php:1183
 msgid " Comment"
 msgstr " Comentario"
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/content-extensions.php:670
+#: c:\users\Chris\Desktop\thematic/library/extensions/content-extensions.php:1186
 msgid "Leave a comment"
 msgstr "Dejar un comentario"
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/content-extensions.php:673
+#: c:\users\Chris\Desktop\thematic/library/extensions/content-extensions.php:1189
 msgid "Comments closed"
 msgstr "Comentarios cerrados"
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/content-extensions.php:686
-msgid ". Bookmark the "
-msgstr ". Guarda el "
-
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/content-extensions.php:687
-msgid "permalink"
-msgstr "enlace permanente"
-
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/content-extensions.php:689
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/content-extensions.php:697
+#: c:\users\Chris\Desktop\thematic/library/extensions/content-extensions.php:1205
+#: c:\users\Chris\Desktop\thematic/library/extensions/content-extensions.php:1213
 msgid "Post a comment"
 msgstr "Publica un comentario"
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/content-extensions.php:690
+#: c:\users\Chris\Desktop\thematic/library/extensions/content-extensions.php:1206
 msgid " or leave a trackback: "
 msgstr " o deja un trackback: "
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/content-extensions.php:691
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/content-extensions.php:694
+#: c:\users\Chris\Desktop\thematic/library/extensions/content-extensions.php:1207
+#: c:\users\Chris\Desktop\thematic/library/extensions/content-extensions.php:1210
 msgid "Trackback URL for your post"
 msgstr "URL del Trackback para tu entrada"
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/content-extensions.php:691
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/content-extensions.php:694
+#: c:\users\Chris\Desktop\thematic/library/extensions/content-extensions.php:1207
+#: c:\users\Chris\Desktop\thematic/library/extensions/content-extensions.php:1210
 msgid "Trackback URL"
 msgstr "URL del Trackback"
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/content-extensions.php:693
+#: 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: "
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/content-extensions.php:696
+#: 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 "
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/content-extensions.php:697
+#: c:\users\Chris\Desktop\thematic/library/extensions/content-extensions.php:1213
 msgid "post a comment"
 msgstr "publicar un comentario"
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/content-extensions.php:699
+#: 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."
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/discussion.php:10
+#: 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\">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>"
+
+#: c:\users\Chris\Desktop\thematic/library/extensions/discussion-extensions.php:21
+msgid "Edit comment"
+msgstr "Editar comentario"
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/discussion.php:15
+#: 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"
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/discussion.php:22
+#: c:\users\Chris\Desktop\thematic/library/extensions/discussion.php:19
 msgid "Reply"
 msgstr "Respuesta"
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/discussion.php:23
+#: c:\users\Chris\Desktop\thematic/library/extensions/discussion.php:20
 msgid "Log in to reply."
 msgstr "Inicia sesión para responder."
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/discussion.php:37
+#: c:\users\Chris\Desktop\thematic/library/extensions/discussion.php:35
 #, php-format
 msgid "By %1$s on %2$s at %3$s"
 msgstr "Por %1$s el %2$s a las %3$s"
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/discussion.php:42
+#: 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"
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/header-extensions.php:251
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/widgets.php:77
+#: c:\users\Chris\Desktop\thematic/library/extensions/header-extensions.php:262
+#: c:\users\Chris\Desktop\thematic/library/extensions/widgets.php:138
 msgid "Posts RSS feed"
 msgstr "Canal RSS de entradas"
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/header-extensions.php:269
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/widgets.php:78
+#: c:\users\Chris\Desktop\thematic/library/extensions/header-extensions.php:280
+#: c:\users\Chris\Desktop\thematic/library/extensions/widgets.php:139
 msgid "Comments RSS feed"
 msgstr "Canal RSS de comentarios"
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/header-extensions.php:401
+#: 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
 msgid "Skip navigation to the content"
 msgstr "Saltar la navegación al contenido"
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/header-extensions.php:401
+#: c:\users\Chris\Desktop\thematic/library/extensions/header-extensions.php:467
 msgid "Skip to content"
 msgstr "Saltar al contenido"
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/helpers.php:31
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/helpers.php:44
+#: c:\users\Chris\Desktop\thematic/library/extensions/helpers.php:31
+#: c:\users\Chris\Desktop\thematic/library/extensions/helpers.php:44
 msgid "There is no excerpt because this is a protected post."
 msgstr "No hay ningún extracto porque esta entrada esta protegida."
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/shortcodes.php:16
+#: c:\users\Chris\Desktop\thematic/library/extensions/shortcodes.php:16
 msgid "Login"
 msgstr "Iniciar Sesión"
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/shortcodes.php:18
+#: c:\users\Chris\Desktop\thematic/library/extensions/shortcodes.php:18
 msgid "Logout"
 msgstr "Cerrar Sesión"
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/theme-options.php:13
+#: c:\users\Chris\Desktop\thematic/library/extensions/theme-options.php:13
 msgid "Index Insert Position"
 msgstr "Widget incrustado de la Portada"
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/theme-options.php:14
+#: 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:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/theme-options.php:19
+#: c:\users\Chris\Desktop\thematic/library/extensions/theme-options.php:19
 msgid "Info on Author Page"
 msgstr "Info en Página de Autor"
 
-#: c:\xampp\htdocs\development\wp-content\themes\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: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:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/theme-options.php:25
+#: c:\users\Chris\Desktop\thematic/library/extensions/theme-options.php:25
 msgid "Text in Footer"
 msgstr "Texto en Pie de Página"
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/theme-options.php:26
+#: 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:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/theme-options.php:28
+#: 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:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/theme-options.php:75
+#: c:\users\Chris\Desktop\thematic/library/extensions/theme-options.php:115
 msgid "settings saved."
-msgstr "- opciones guardadas."
+msgstr "opciones guardadas."
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/theme-options.php:76
+#: c:\users\Chris\Desktop\thematic/library/extensions/theme-options.php:116
 msgid "settings reset."
-msgstr "- opciones originales reestablecidas."
+msgstr "opciones originales reestablecidas."
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/theme-options.php:77
+#: c:\users\Chris\Desktop\thematic/library/extensions/theme-options.php:117
 msgid "widgets reset."
-msgstr "- widgets originales reestablecidos."
+msgstr "widgets originales reestablecidos."
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/theme-options.php:190
+#: c:\users\Chris\Desktop\thematic/library/extensions/theme-options.php:286
 msgid "Save changes"
 msgstr "Guardar cambios"
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/theme-options.php:196
+#: c:\users\Chris\Desktop\thematic/library/extensions/theme-options.php:293
 msgid "Reset"
 msgstr "Reestablecer"
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/theme-options.php:202
+#: c:\users\Chris\Desktop\thematic/library/extensions/theme-options.php:300
 msgid "Reset Widgets"
 msgstr "Reestablecer Widgets"
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/theme-options.php:207
+#: 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:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/widgets-extensions.php:12
+#: c:\users\Chris\Desktop\thematic/library/extensions/widgets-extensions.php:13
 msgid "To search, type and hit enter"
 msgstr "Para buscar, escribe y pulsa enter"
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/widgets-extensions.php:18
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/widgets-extensions.php:281
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/widgets.php:43
+#: 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
 msgid "Search"
 msgstr "Buscar"
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/widgets-extensions.php:43
+#: c:\users\Chris\Desktop\thematic/library/extensions/widgets-extensions.php:42
 msgid "The primary widget area, most often used as a sidebar."
 msgstr "El area de widgets principal, generalmente usada como barra lateral."
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/widgets-extensions.php:58
+#: c:\users\Chris\Desktop\thematic/library/extensions/widgets-extensions.php:57
 msgid "The secondary widget area, most often used as a sidebar."
 msgstr "El area de widgets secundaria, generalmente usada como barra lateral secundaria."
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/widgets-extensions.php:73
+#: c:\users\Chris\Desktop\thematic/library/extensions/widgets-extensions.php:72
 msgid "The 1st widget area in the footer."
 msgstr "La primera &aacute;rea de widgets del pie de p&aacute;gina."
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/widgets-extensions.php:88
+#: c:\users\Chris\Desktop\thematic/library/extensions/widgets-extensions.php:87
 msgid "The 2nd widget area in the footer."
 msgstr "La segunda &aacute;rea de widgets del pie de p&aacute;gina."
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/widgets-extensions.php:103
+#: c:\users\Chris\Desktop\thematic/library/extensions/widgets-extensions.php:102
 msgid "The 3rd widget area in the footer."
 msgstr "La tercera &aacute;rea de widgets del pie de p&aacute;gina."
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/widgets-extensions.php:118
+#: c:\users\Chris\Desktop\thematic/library/extensions/widgets-extensions.php:117
 msgid "The top widget area displayed on the index page."
 msgstr "El &aacute;rea de widgets superior mostrada en la portada."
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/widgets-extensions.php:133
+#: c:\users\Chris\Desktop\thematic/library/extensions/widgets-extensions.php:132
 msgid "The widget area inserted after x posts on the index page."
 msgstr "El &aacute;rea de widgets insertada después de X entradas en la portada."
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/widgets-extensions.php:148
+#: c:\users\Chris\Desktop\thematic/library/extensions/widgets-extensions.php:147
 msgid "The bottom widget area displayed on the index page."
 msgstr "El &aacute;rea de widgets inferior mostrada en la portada."
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/widgets-extensions.php:163
+#: c:\users\Chris\Desktop\thematic/library/extensions/widgets-extensions.php:162
 msgid "The top widget area displayed on a single post."
 msgstr "El &aacute;rea de widgets superior mostrada en una entrada."
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/widgets-extensions.php:178
+#: c:\users\Chris\Desktop\thematic/library/extensions/widgets-extensions.php:177
 msgid "The widget area inserted between the post and the comments on a single post."
 msgstr "El &aacute;rea de widgets insertada entre una entrada y sus comentarios."
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/widgets-extensions.php:193
+#: c:\users\Chris\Desktop\thematic/library/extensions/widgets-extensions.php:192
 msgid "The bottom widget area displayed on a single post."
 msgstr "El &aacute;rea de widgets inferior mostrada en una entrada."
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/widgets-extensions.php:208
+#: c:\users\Chris\Desktop\thematic/library/extensions/widgets-extensions.php:207
 msgid "The top widget area displayed on a page."
 msgstr "El &aacute;rea de widgets superior mostrada en una p&aacute;gina."
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/widgets-extensions.php:223
+#: c:\users\Chris\Desktop\thematic/library/extensions/widgets-extensions.php:222
 msgid "The bottom widget area displayed on a page."
 msgstr "El &aacute;rea de widgets inferior mostrada en una p&aacute;gina."
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/widgets-extensions.php:283
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/widgets.php:55
+#: c:\users\Chris\Desktop\thematic/library/extensions/widgets.php:36
+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
+msgid "Title:"
+msgstr "Título:"
+
+#: c:\users\Chris\Desktop\thematic/library/extensions/widgets.php:81
+msgid "Log in/out and admin"
+msgstr "Log in/out y admin"
+
+#: c:\users\Chris\Desktop\thematic/library/extensions/widgets.php:82
+#: c:\users\Chris\Desktop\thematic/library/extensions/widgets.php:87
 msgid "Meta"
 msgstr "Meta"
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/widgets-extensions.php:285
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/widgets-extensions.php:286
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/widgets.php:72
+#: c:\users\Chris\Desktop\thematic/library/extensions/widgets.php:126
+msgid "Links to your posts and comments feed"
+msgstr "Enlace a tu fuente 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
 msgid "RSS Links"
 msgstr "Enlaces RSS"
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/widgets.php:77
+#: c:\users\Chris\Desktop\thematic/library/extensions/widgets.php:138
 msgid "All posts"
 msgstr "Todas las entradas"
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/widgets.php:78
+#: c:\users\Chris\Desktop\thematic/library/extensions/widgets.php:139
 msgid "All comments"
 msgstr "Todos los comentarios"
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/widgets.php:96
-msgid "Title:"
-msgstr "Título:"
-
diff --git a/wp-content/themes/thematic/library/languages/fa_IR.mo b/wp-content/themes/thematic/library/languages/fa_IR.mo
new file mode 100644
index 0000000000000000000000000000000000000000..6a9c681db6eeb6dca7e26ca965768388f285a559
Binary files /dev/null and b/wp-content/themes/thematic/library/languages/fa_IR.mo differ
diff --git a/wp-content/themes/thematic/library/languages/fa_IR.po b/wp-content/themes/thematic/library/languages/fa_IR.po
new file mode 100644
index 0000000000000000000000000000000000000000..2e96d61d067225669a36f573449302d7c8f0ed89
--- /dev/null
+++ b/wp-content/themes/thematic/library/languages/fa_IR.po
@@ -0,0 +1,501 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: Thematic 0.9.7.7\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-02-18 20:58+0100\n"
+"PO-Revision-Date: \n"
+"Last-Translator: Tafreevar.Com <tafreevar.weblog@gmail.com>\n"
+"Language-Team: Tafreevar.Com <tafreevar.weblog@gmail.com>\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;_ngettext:1,2\n"
+"X-Poedit-Basepath: .\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Poedit-Language: Persian\n"
+"X-Poedit-Country: IRAN, ISLAMIC REPUBLIC OF\n"
+"X-Poedit-SearchPath-0: c:\\xampp\\htdocs\\development\\wp-content\\themes\\thematic\n"
+
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/archives.php:42
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/links.php:53
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/page.php:40
+msgid "Edit"
+msgstr "ويرايش"
+
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/attachment.php:39
+msgid "Pages:"
+msgstr "برگه‌ها:"
+
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/author.php:53
+msgid "Email "
+msgstr "رايانامه "
+
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/comments.php:10
+msgid "This post is password protected. Enter the password to view any comments."
+msgstr "اين مطلب رمزدار است. رمز را وارد كنيد تا ديدگاه‌ها را مشاهده نماييد."
+
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/comments.php:52
+#, php-format
+msgid "<span>%d</span> Trackbacks"
+msgstr "<span>%d</span> بازتاب"
+
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/comments.php:52
+msgid "<span>One</span> Trackback"
+msgstr "<span>يك</span> بازتاب"
+
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/comments.php:72
+#, php-format
+msgid "You must be <a href=\"%s\" title=\"Log in\">logged in</a> to post a comment."
+msgstr "شما بايد <a href=\"%s\" title=\"ورود\">وارد شويد</a> تا ديدگاه خود را بنويسيد."
+
+#: c:\xampp\htdocs\development\wp-content\themes\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\">شما با نام <a href=\"%1$s\" title=\"واردشده با نام %2$s\">%2$s</a>وارد شده‌ايد.</span> <span class=\"logout\"><a href=\"%3$s\" title=\"خارج شويد\">مي‌خواهيد خارج شويد؟</a></span>"
+
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/comments.php:90
+msgid "Your email is <em>never</em> published nor shared."
+msgstr "ايميل شما <em>هرگز</em> منتشر نشده يا به ديگران داده نخواهد شد."
+
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/comments.php:90
+msgid "Required fields are marked <span class=\"required\">*</span>"
+msgstr "قسمت‌هاي ضروري با علامت <span class=\"required\">*</span> مشخص شده‌اند"
+
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/comments.php:93
+msgid "Name"
+msgstr "نام"
+
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/comments.php:93
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/comments.php:98
+msgid "<span class=\"required\">*</span>"
+msgstr "<span class=\"required\">*</span>"
+
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/comments.php:98
+msgid "Email"
+msgstr "رايانامه"
+
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/comments.php:103
+msgid "Website"
+msgstr "وب‌سايت"
+
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/comments.php:115
+msgid "You may use these <abbr title=\"HyperText Markup Language\">HTML</abbr> tags and attributes:"
+msgstr "شما مي‌توانيد از اين كدهاي  <abbr title=\"زبان نشانه‌گذاري ابرمتن\">HTML</abbr> استفاده كنيد: "
+
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/page.php:38
+msgid "Pages: "
+msgstr "برگه‌ها: "
+
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/search.php:41
+msgid "Nothing Found"
+msgstr "چيزي يافت نشد"
+
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/search.php:43
+msgid "Sorry, but nothing matched your search criteria. Please try again with some different keywords."
+msgstr "متأسفانه عبارت مورد جستجوي شما پيدا نشد. لطفاً جستجوي خود را با كليدواژه‌هاي ديگري تكرار كنيد."
+
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/search.php:48
+msgid "Find"
+msgstr "پيدا كن"
+
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/comments-extensions.php:76
+msgid "<span>One</span> Comment"
+msgstr "<span>يك</span> ديدگاه"
+
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/comments-extensions.php:83
+#, php-format
+msgid "<span>%d</span> Comments"
+msgstr "<span>%d</span> ديدگاه"
+
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/comments-extensions.php:96
+msgid "Post a Comment"
+msgstr "ارسال ديدگاه"
+
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/comments-extensions.php:103
+#, php-format
+msgid "Post a Reply to %s"
+msgstr "پاسخ به ديدگاه %s"
+
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/comments-extensions.php:110
+msgid "Comment"
+msgstr "ديدگاه"
+
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/comments-extensions.php:117
+msgid "Post Comment"
+msgstr "ارسال ديدگاه"
+
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/content-extensions.php:147
+msgid "Author Archives: "
+msgstr "بايگاني نويسندگان: "
+
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/content-extensions.php:153
+msgid "Category Archives:"
+msgstr "بايگاني موضوعات:"
+
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/content-extensions.php:162
+msgid "Search Results for:"
+msgstr "نتايج جستجوي:"
+
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/content-extensions.php:168
+msgid "Tag Archives:"
+msgstr "بايگاني برچسب‌ها:"
+
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/content-extensions.php:174
+#, php-format
+msgid "Daily Archives: <span>%s</span>"
+msgstr "بايگاني روزانه: <span>%s</span>"
+
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/content-extensions.php:178
+#, php-format
+msgid "Monthly Archives: <span>%s</span>"
+msgstr "بايگاني ماهانه: <span>%s</span>"
+
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/content-extensions.php:182
+#, php-format
+msgid "Yearly Archives: <span>%s</span>"
+msgstr "بايگاني سالانه: <span>%s</span>"
+
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/content-extensions.php:186
+msgid "Blog Archives"
+msgstr "بايگاني‌ها"
+
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/content-extensions.php:209
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/content-extensions.php:725
+msgid "<span class=\"meta-nav\">&laquo;</span> Older posts"
+msgstr "<span class=\"meta-nav\">&laquo;</span> مطالب پيشين"
+
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/content-extensions.php:210
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/content-extensions.php:726
+msgid "Newer posts <span class=\"meta-nav\">&raquo;</span>"
+msgstr "مطالب تازه <span class=\"meta-nav\">&raquo;</span>"
+
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/content-extensions.php:394
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/content-extensions.php:618
+msgid "Edit post"
+msgstr "ويرايش مطلب"
+
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/content-extensions.php:406
+msgid "Not Found"
+msgstr "يافت نشد"
+
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/content-extensions.php:411
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/content-extensions.php:686
+msgid "Permalink to "
+msgstr "پيوند يكتا به "
+
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/content-extensions.php:441
+msgid "By "
+msgstr "نويسنده: "
+
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/content-extensions.php:444
+msgid "View all posts by "
+msgstr "مشاهده تمام مطالب "
+
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/content-extensions.php:455
+msgid "Published: "
+msgstr "انتشار: "
+
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/content-extensions.php:523
+msgid "Archives by Category"
+msgstr "بايگاني موضوعي"
+
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/content-extensions.php:534
+msgid "Archives by Month"
+msgstr "بايگاني ماهانه"
+
+#: c:\xampp\htdocs\development\wp-content\themes\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 "متأسفانه آنچه مي‌خواستيد پيدا نشد. ممكن است با جستجو پيدا شود."
+
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/content-extensions.php:578
+msgid "Read More <span class=\"meta-nav\">&raquo;</span>"
+msgstr "ادامه مطلب <span class=\"meta-nav\">&laquo;</span>"
+
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/content-extensions.php:629
+msgid "This entry was posted in "
+msgstr "موضوع: "
+
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/content-extensions.php:632
+msgid "Also posted in "
+msgstr "و نيز: "
+
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/content-extensions.php:635
+msgid "Posted in "
+msgstr "موضوع: "
+
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/content-extensions.php:646
+msgid " and tagged"
+msgstr " برچسب‌ها:"
+
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/content-extensions.php:649
+msgid " Also tagged "
+msgstr "و نيز: "
+
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/content-extensions.php:651
+msgid "Tagged"
+msgstr "برچسب‌ها:"
+
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/content-extensions.php:663
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/content-extensions.php:666
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/content-extensions.php:669
+msgid "Comment on "
+msgstr "ارسال ديدگاه درباره "
+
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/content-extensions.php:664
+msgid " Comments"
+msgstr " ديدگاه"
+
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/content-extensions.php:667
+msgid " Comment"
+msgstr " ديدگاه"
+
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/content-extensions.php:670
+msgid "Leave a comment"
+msgstr "ارسال ديدگاه"
+
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/content-extensions.php:673
+msgid "Comments closed"
+msgstr "بخش ديدگاه‌ها مسدود است."
+
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/content-extensions.php:686
+msgid ". Bookmark the "
+msgstr ". علامت‌گذاري: "
+
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/content-extensions.php:687
+msgid "permalink"
+msgstr "پيوند جاودان"
+
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/content-extensions.php:689
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/content-extensions.php:697
+msgid "Post a comment"
+msgstr "ارسال ديدگاه"
+
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/content-extensions.php:690
+msgid " or leave a trackback: "
+msgstr " يا بازتاب: "
+
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/content-extensions.php:691
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/content-extensions.php:694
+msgid "Trackback URL for your post"
+msgstr "پيوند بازتاب"
+
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/content-extensions.php:691
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/content-extensions.php:694
+msgid "Trackback URL"
+msgstr "پيوند بازتاب"
+
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/content-extensions.php:693
+msgid " Comments are closed, but you can leave a trackback: "
+msgstr " بخش ديدگاه‌ها مسدود است اما مي‌توانيد بازتاب بدهيد: "
+
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/content-extensions.php:696
+msgid " Trackbacks are closed, but you can "
+msgstr " بازتاب مسدود است اما مي‌توانيد "
+
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/content-extensions.php:697
+msgid "post a comment"
+msgstr "ارسال ديدگاه"
+
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/content-extensions.php:699
+msgid " Both comments and trackbacks are currently closed."
+msgstr " بخش بازتاب و ديدگاه در حال حاضر مسدود است."
+
+#: c:\xampp\htdocs\development\wp-content\themes\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 "ارسال‌شده در تاريخ %1$s و ساعت %2$s <span class=\"meta-sep\">|</span> <a href=\"%3$s\" title=\"پيوند جاودان اين ديدگاه\">پيوند جاودان</a>"
+
+#: c:\xampp\htdocs\development\wp-content\themes\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'>ديدگاه شما در صف بررسي است.</span>\n"
+
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/discussion.php:22
+msgid "Reply"
+msgstr "پاسخ"
+
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/discussion.php:23
+msgid "Log in to reply."
+msgstr "براي پاسخ دادن بايد وارد شويد."
+
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/discussion.php:37
+#, php-format
+msgid "By %1$s on %2$s at %3$s"
+msgstr "توسط %1$s در تاريخ %2$s ساعت %3$s"
+
+#: c:\xampp\htdocs\development\wp-content\themes\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\">ديدگاه شما در صف بررسي است.</span>\\n"
+
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/header-extensions.php:251
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/widgets.php:77
+msgid "Posts RSS feed"
+msgstr "خوراك RSS مطالب"
+
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/header-extensions.php:269
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/widgets.php:78
+msgid "Comments RSS feed"
+msgstr "خوراك RSS ديدگاه‌ها"
+
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/header-extensions.php:401
+msgid "Skip navigation to the content"
+msgstr "اصل مطلب"
+
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/header-extensions.php:401
+msgid "Skip to content"
+msgstr "اصل مطلب"
+
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/helpers.php:31
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/helpers.php:44
+msgid "There is no excerpt because this is a protected post."
+msgstr "اين مطلب چكيده ندارد چون رمزدار است."
+
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/shortcodes.php:16
+msgid "Login"
+msgstr "ورود"
+
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/shortcodes.php:18
+msgid "Logout"
+msgstr "خروج"
+
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/theme-options.php:13
+msgid "Index Insert Position"
+msgstr "محل درج ويجت مياني"
+
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/theme-options.php:14
+msgid "The widgetized Index Insert will follow after this post number."
+msgstr "ويجت مياني صفحه اصلي بايد پس از اين تعداد مطلب قرار گيرد."
+
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/theme-options.php:19
+msgid "Info on Author Page"
+msgstr "اطلاعات صفحه نويسنده"
+
+#: c:\xampp\htdocs\development\wp-content\themes\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 "يك <a href=\"http://microformats.org/wiki/hcard\" target=\"_blank\">vCard ميكروفرمت</a> —حاوي آواتار، بيوگرافي و ايميل نويسنده— در صفحه نويسنده نمايش بده."
+
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/theme-options.php:25
+msgid "Text in Footer"
+msgstr "متن پانويس"
+
+#: c:\xampp\htdocs\development\wp-content\themes\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 "شما مي‌توانيد از اين كدهاي كوتاه‌شده در متن پانويس استفاده كنيد:  [wp-link] [theme-link] [loginout-link] [blog-title] [blog-link] [the-year]"
+
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/theme-options.php:28
+msgid "Powered by [wp-link]. Built on the [theme-link]."
+msgstr "قدرت گرفته از [wp-link]. ساخته‌شده بر اساس پوسته [theme-link]."
+
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/theme-options.php:75
+msgid "settings saved."
+msgstr "تنظيمات ذخيره شد."
+
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/theme-options.php:76
+msgid "settings reset."
+msgstr "تنظيمات به حالت اوليه بازگردانده شد."
+
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/theme-options.php:77
+msgid "widgets reset."
+msgstr "ويجت‌ها به حالت اوليه بازگردانده شد."
+
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/theme-options.php:190
+msgid "Save changes"
+msgstr "ذخيره تغييرات"
+
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/theme-options.php:196
+msgid "Reset"
+msgstr "بازگرداني به حالت اوليه"
+
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/theme-options.php:202
+msgid "Reset Widgets"
+msgstr "بازگرداني ويجت‌ها به حالت اوليه"
+
+#: c:\xampp\htdocs\development\wp-content\themes\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 "براي كسب اطلاعات بيشتر درباره اين پوسته به <a href=\"http://themeshaper.com\">ThemeShaper</a> مراجعه كنيد. لطفاً اگر سؤالي در مورد Thematic داريد به <a href=\"http://themeshaper.com/forums/\">انجمن‌هاي ThemeShaper</a> مراجعه نماييد."
+
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/widgets-extensions.php:12
+msgid "To search, type and hit enter"
+msgstr "جستجو در سايت"
+
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/widgets-extensions.php:18
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/widgets-extensions.php:281
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/widgets.php:43
+msgid "Search"
+msgstr "جستجو"
+
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/widgets-extensions.php:43
+msgid "The primary widget area, most often used as a sidebar."
+msgstr "ناحيه ويجت اصلي كه معمولاً بعنوان ستون كناري استفاده مي‌شود."
+
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/widgets-extensions.php:58
+msgid "The secondary widget area, most often used as a sidebar."
+msgstr "ناحيه ويجت فرعي كه معمولاً بعنوان ستون كناري استفاده مي‌شود."
+
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/widgets-extensions.php:73
+msgid "The 1st widget area in the footer."
+msgstr "اولين ناحيه ويجت در پانويس"
+
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/widgets-extensions.php:88
+msgid "The 2nd widget area in the footer."
+msgstr "دومين ناحيه ويجت در پانويس"
+
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/widgets-extensions.php:103
+msgid "The 3rd widget area in the footer."
+msgstr "سومين ناحيه ويجت در پانويس"
+
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/widgets-extensions.php:118
+msgid "The top widget area displayed on the index page."
+msgstr "ناحيه ويجت بالايي كه در بالاي صفحه اصلي نمايش داده مي‌شود"
+
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/widgets-extensions.php:133
+msgid "The widget area inserted after x posts on the index page."
+msgstr "ناحيه ويجت مياني كه پس از تعداد مشخصي از مطالب در صفحه اصلي درج مي‌شود"
+
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/widgets-extensions.php:148
+msgid "The bottom widget area displayed on the index page."
+msgstr "ناحيه ويجت پاييني كه در پايين صفحه اصلي نمايش داده مي‌شود"
+
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/widgets-extensions.php:163
+msgid "The top widget area displayed on a single post."
+msgstr "ناحيه ويجت بالايي كه در بالاي صفحه جداگانه‌‌ي هر مطلب نمايش داده مي‌شود"
+
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/widgets-extensions.php:178
+msgid "The widget area inserted between the post and the comments on a single post."
+msgstr "ناحيه ويجتي كه در صفحه جداگانه‌‌ي هر مطلب، بين متن مطلب و ديدگاه‌ها نمايش داده مي‌شود"
+
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/widgets-extensions.php:193
+msgid "The bottom widget area displayed on a single post."
+msgstr "ناحيه ويجت پاييني كه در پايين صفحه جداگانه‌‌ي هر مطلب نمايش داده مي‌شود"
+
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/widgets-extensions.php:208
+msgid "The top widget area displayed on a page."
+msgstr "ناحيه ويجت بالايي كه در بالاي هر برگه نمايش داده مي‌شود"
+
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/widgets-extensions.php:223
+msgid "The bottom widget area displayed on a page."
+msgstr "ناحيه ويجت پاييني كه در پايين هر برگه نمايش داده مي‌شود"
+
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/widgets-extensions.php:283
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/widgets.php:55
+msgid "Meta"
+msgstr "متا"
+
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/widgets-extensions.php:285
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/widgets-extensions.php:286
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/widgets.php:72
+msgid "RSS Links"
+msgstr "پيوندهاي RSS"
+
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/widgets.php:77
+msgid "All posts"
+msgstr "همه مطالب"
+
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/widgets.php:78
+msgid "All comments"
+msgstr "همه ديدگاه‌ها"
+
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/widgets.php:96
+msgid "Title:"
+msgstr "عنوان:"
+
diff --git a/wp-content/themes/thematic/library/languages/fr_FR.mo b/wp-content/themes/thematic/library/languages/fr_FR.mo
index 485307c15a0686359dc86b57bca1c8c0aad08f78..13f98193bb6dd77275b155e387d81795fd91ebbc 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 9684f667cc2a91da3948a07a90e2f309c2cc99c8..558fa67f84b1a92cf9112a8657e5bce5aa2fee12 100644
--- a/wp-content/themes/thematic/library/languages/fr_FR.po
+++ b/wp-content/themes/thematic/library/languages/fr_FR.po
@@ -2,9 +2,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Thematic\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-18 20:58+0100\n"
+"POT-Creation-Date: \n"
 "PO-Revision-Date: \n"
-"Last-Translator: Florent Dupont <codecode@chokebore.net>\n"
+"Last-Translator: Kathy <helgatheviking@gmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -15,507 +15,645 @@ msgstr ""
 "X-Poedit-KeywordsList: __;_e;_c\n"
 "X-Poedit-Basepath: .\n"
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/archives.php:42
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/links.php:53
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/page.php:40
+#: 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"
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/attachment.php:39
+#: attachment.php:62
+#: library/extensions/content-extensions.php:666
+#: library/extensions/content-extensions.php:732
 msgid "Pages:"
 msgstr "Pages&nbsp;:"
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/author.php:53
+#: author.php:67
 msgid "Email "
 msgstr "E-mail"
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/comments.php:10
+#: 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."
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/comments.php:52
-#, php-format
-msgid "<span>%d</span> Trackbacks"
-msgstr "<span>%d</span> trackbacks"
-
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/comments.php:52
+#: comments.php:111
 msgid "<span>One</span> Trackback"
 msgstr "<span>Un</span> trackback"
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/comments.php:72
+#: 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."
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/comments.php:83
+#: 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&nbsp;?</a></span>"
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/comments.php:90
+#: 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é."
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/comments.php:90
+#: 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>"
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/comments.php:93
+#: comments.php:167
+#: library/extensions/comments-extensions.php:224
 msgid "Name"
 msgstr "Nom"
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/comments.php:93
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/comments.php:98
+#: 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>"
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/comments.php:98
+#: comments.php:172
+#: library/extensions/comments-extensions.php:225
 msgid "Email"
 msgstr "E-mail"
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/comments.php:103
+#: comments.php:177
+#: library/extensions/comments-extensions.php:226
 msgid "Website"
 msgstr "Site web"
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/comments.php:115
+#: 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>&nbsp;:"
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/page.php:38
+#: page.php:58
+#: template-page-fullwidth.php:59
 msgid "Pages: "
 msgstr "Pages&nbsp;:"
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/search.php:41
+#: search.php:56
 msgid "Nothing Found"
 msgstr "Aucun résultat"
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/search.php:43
+#: 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."
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/search.php:48
+#: library/extensions/content-extensions.php:1346
+#: search.php:70
 msgid "Find"
 msgstr "Trouver"
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/comments-extensions.php:76
+#: library/extensions/comments-extensions.php:120
 msgid "<span>One</span> Comment"
 msgstr "<span>Un</span> commentaire"
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/comments-extensions.php:83
-#, php-format
-msgid "<span>%d</span> Comments"
-msgstr "<span>%d</span> commentaires"
-
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/comments-extensions.php:96
+#: library/extensions/comments-extensions.php:154
 msgid "Post a Comment"
 msgstr "Laisser un commentaire"
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/comments-extensions.php:103
+#: library/extensions/comments-extensions.php:165
 #, php-format
 msgid "Post a Reply to %s"
 msgstr "Répondre à %s"
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/comments-extensions.php:110
+#: library/extensions/comments-extensions.php:176
 msgid "Comment"
 msgstr "Commentaire"
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/comments-extensions.php:117
+# @ thematic
+#: library/extensions/comments-extensions.php:187
+msgid "Cancel reply"
+msgstr "Annuler Réponse"
+
+#: library/extensions/comments-extensions.php:198
 msgid "Post Comment"
 msgstr "Valider le commentaire"
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/content-extensions.php:147
-msgid "Author Archives: "
-msgstr "Archives par auteur&nbsp;: "
-
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/content-extensions.php:153
+#: library/extensions/content-extensions.php:340
+#: library/extensions/header-extensions.php:84
 msgid "Category Archives:"
 msgstr "Archives par catégorie&nbsp;:"
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/content-extensions.php:162
+#: library/extensions/content-extensions.php:349
+#: library/extensions/header-extensions.php:80
 msgid "Search Results for:"
 msgstr "Résultats de la recherche pour&nbsp;:"
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/content-extensions.php:168
+#: library/extensions/content-extensions.php:355
+#: library/extensions/header-extensions.php:88
 msgid "Tag Archives:"
 msgstr "Archives par tag&nbsp;:"
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/content-extensions.php:174
+#: library/extensions/content-extensions.php:364
+#: library/extensions/content-extensions.php:373
+#, fuzzy
+msgid "Archives:"
+msgstr "Archives"
+
+#: library/extensions/content-extensions.php:379
 #, php-format
 msgid "Daily Archives: <span>%s</span>"
 msgstr "Archives par jour&nbsp;: <span>%s</span>"
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/content-extensions.php:178
+#: library/extensions/content-extensions.php:383
 #, php-format
 msgid "Monthly Archives: <span>%s</span>"
 msgstr "Archives par mois&nbsp;: <span>%s</span>"
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/content-extensions.php:182
+#: library/extensions/content-extensions.php:387
 #, php-format
 msgid "Yearly Archives: <span>%s</span>"
 msgstr "Archives par année&nbsp;: <span>%s</span>"
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/content-extensions.php:186
-msgid "Blog Archives"
-msgstr "Archives du blog"
-
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/content-extensions.php:209
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/content-extensions.php:725
+#: library/extensions/content-extensions.php:429
+#: library/extensions/content-extensions.php:1728
 msgid "<span class=\"meta-nav\">&laquo;</span> Older posts"
 msgstr "<span class=\"meta-nav\">&laquo;</span> Articles plus anciens"
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/content-extensions.php:210
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/content-extensions.php:726
+#: library/extensions/content-extensions.php:431
+#: library/extensions/content-extensions.php:1729
 msgid "Newer posts <span class=\"meta-nav\">&raquo;</span>"
 msgstr "Articles plus récents <span class=\"meta-nav\">&raquo;</span>"
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/content-extensions.php:394
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/content-extensions.php:618
+#: library/extensions/content-extensions.php:946
+#: library/extensions/content-extensions.php:1460
 msgid "Edit post"
 msgstr "Modifier cet article"
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/content-extensions.php:406
+#: library/extensions/content-extensions.php:975
+#: library/extensions/header-extensions.php:92
 msgid "Not Found"
 msgstr "Introuvable"
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/content-extensions.php:411
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/content-extensions.php:686
+#: library/extensions/content-extensions.php:980
+#: library/extensions/content-extensions.php:1413
+#: library/extensions/content-extensions.php:1417
 msgid "Permalink to "
 msgstr "Permalien vers "
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/content-extensions.php:441
+#: library/extensions/content-extensions.php:1041
 msgid "By "
 msgstr "Par "
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/content-extensions.php:444
+#: library/extensions/content-extensions.php:1051
 msgid "View all posts by "
 msgstr "Voir tous les articles par "
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/content-extensions.php:455
+#: library/extensions/content-extensions.php:1079
 msgid "Published: "
 msgstr "Publié&nbsp;: "
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/content-extensions.php:523
+#: library/extensions/content-extensions.php:1252
 msgid "Archives by Category"
 msgstr "Archives par catégorie"
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/content-extensions.php:534
+#: library/extensions/content-extensions.php:1280
 msgid "Archives by Month"
 msgstr "Archives par mois"
 
-#: c:\xampp\htdocs\development\wp-content\themes\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 "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:1413
+msgid "Browse the "
+msgstr "Parcourir le"
+
+#: library/extensions/content-extensions.php:1413
+#, fuzzy
+msgid " Archive"
+msgstr "Archives"
+
+#: library/extensions/content-extensions.php:1414
+#, fuzzy
+msgid " archive"
+msgstr "Archives"
+
+#: library/extensions/content-extensions.php:1417
+msgid "Bookmark the "
+msgstr "Bookmarker le "
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/content-extensions.php:578
-msgid "Read More <span class=\"meta-nav\">&raquo;</span>"
-msgstr "Lire le reste de cet article <span class=\"meta-nav\">&raquo;</span>"
+#: library/extensions/content-extensions.php:1418
+msgid "permalink"
+msgstr "permalien"
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/content-extensions.php:629
+#: library/extensions/content-extensions.php:1572
 msgid "This entry was posted in "
 msgstr "Cet article a été publié dans "
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/content-extensions.php:632
+#: library/extensions/content-extensions.php:1580
 msgid "Also posted in "
 msgstr "Également publié dans "
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/content-extensions.php:635
+#: library/extensions/content-extensions.php:1583
 msgid "Posted in "
 msgstr "Publié dans "
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/content-extensions.php:646
+#: library/extensions/content-extensions.php:1609
+#, fuzzy
+msgid " This entry is tagged"
+msgstr "Cet article a été publié dans "
+
+#: library/extensions/content-extensions.php:1612
 msgid " and tagged"
 msgstr " avec les mots-clefs&nbsp;:"
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/content-extensions.php:649
+#: library/extensions/content-extensions.php:1615
 msgid " Also tagged "
 msgstr " Autres mots-clefs&nbsp;: "
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/content-extensions.php:651
+#: library/extensions/content-extensions.php:1617
 msgid "Tagged"
 msgstr "Mots-clefs&nbsp;:"
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/content-extensions.php:663
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/content-extensions.php:666
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/content-extensions.php:669
+#: library/extensions/content-extensions.php:1644
+#: library/extensions/content-extensions.php:1647
+#: library/extensions/content-extensions.php:1650
 msgid "Comment on "
 msgstr "Commentaire sur "
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/content-extensions.php:664
-msgid " Comments"
-msgstr " commentaires"
-
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/content-extensions.php:667
-msgid " Comment"
-msgstr " commentaire"
-
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/content-extensions.php:670
+#: library/extensions/content-extensions.php:1651
 msgid "Leave a comment"
 msgstr "Laisser un commentaire"
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/content-extensions.php:673
+#: library/extensions/content-extensions.php:1654
 msgid "Comments closed"
 msgstr "Commentaires fermés"
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/content-extensions.php:686
-msgid ". Bookmark the "
-msgstr ". Bookmarker le "
-
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/content-extensions.php:687
-msgid "permalink"
-msgstr "permalien"
-
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/content-extensions.php:689
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/content-extensions.php:697
+#: library/extensions/content-extensions.php:1678
+#: library/extensions/content-extensions.php:1686
 msgid "Post a comment"
 msgstr "Laisser un commentaire"
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/content-extensions.php:690
+#: library/extensions/content-extensions.php:1679
 msgid " or leave a trackback: "
 msgstr " ou faire un trackback&nbsp;: "
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/content-extensions.php:691
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/content-extensions.php:694
+#: library/extensions/content-extensions.php:1680
+#: library/extensions/content-extensions.php:1683
 msgid "Trackback URL for your post"
 msgstr "URL de trackback pour votre article"
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/content-extensions.php:691
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/content-extensions.php:694
+#: library/extensions/content-extensions.php:1680
+#: library/extensions/content-extensions.php:1683
 msgid "Trackback URL"
 msgstr "URL de trackback"
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/content-extensions.php:693
+#: 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&nbsp;: "
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/content-extensions.php:696
+#: library/extensions/content-extensions.php:1685
 msgid " Trackbacks are closed, but you can "
 msgstr " Les trackbacks sont fermés, mais vous pouvez "
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/content-extensions.php:697
+#: library/extensions/content-extensions.php:1686
 msgid "post a comment"
 msgstr "laisser un commentaire"
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/content-extensions.php:699
+#: library/extensions/content-extensions.php:1688
 msgid " Both comments and trackbacks are currently closed."
 msgstr " Les commentaires et les trackbacks sont fermés."
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/discussion.php:10
+#: 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>"
 
-#: c:\xampp\htdocs\development\wp-content\themes\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'>Votre commentaire est en attente de modération.</span>\n"
+#: library/extensions/discussion-extensions.php:35
+msgid "Edit comment"
+msgstr "Modifier commentaire"
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/discussion.php:22
+#: library/extensions/discussion.php:52
 msgid "Reply"
 msgstr "Répondre"
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/discussion.php:23
+#: library/extensions/discussion.php:53
 msgid "Log in to reply."
 msgstr "Connectez-vous pour répondre."
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/discussion.php:37
+#: library/extensions/discussion.php:80
 #, php-format
 msgid "By %1$s on %2$s at %3$s"
 msgstr "Par %1$s le %2$s à %3$s"
 
-#: c:\xampp\htdocs\development\wp-content\themes\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\">Votre trackback est en attente de modération.</span>\\n"
-
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/header-extensions.php:251
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/widgets.php:77
+#: library/extensions/header-extensions.php:302
+#: library/extensions/widgets.php:157
 msgid "Posts RSS feed"
 msgstr "Flux RSS des articles"
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/header-extensions.php:269
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/widgets.php:78
+#: library/extensions/header-extensions.php:326
+#: library/extensions/widgets.php:158
 msgid "Comments RSS feed"
 msgstr "Flux RSS des commentaires"
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/header-extensions.php:401
+# @ thematic
+#: functions.php:253
+msgid "Primary Menu"
+msgstr "Menu Primaire"
+
+#: library/extensions/header-extensions.php:625
 msgid "Skip navigation to the content"
 msgstr "Passer la navigation"
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/header-extensions.php:401
+#: library/extensions/header-extensions.php:625
 msgid "Skip to content"
 msgstr "Aller au contenu"
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/helpers.php:31
-#: c:\xampp\htdocs\development\wp-content\themes\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 "Il n'y a pas d'extrait car l'article est protégé."
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/shortcodes.php:16
+#: library/extensions/shortcodes.php:40
 msgid "Login"
 msgstr "Connexion"
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/shortcodes.php:18
+#: library/extensions/shortcodes.php:42
 msgid "Logout"
 msgstr "Déconnexion"
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/theme-options.php:13
+#: library/extensions/theme-options.php:50
 msgid "Index Insert Position"
 msgstr "Position du bloc inséré en page d'accueil"
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/theme-options.php:14
-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."
-
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/theme-options.php:19
+#: library/extensions/theme-options.php:51
 msgid "Info on Author Page"
 msgstr "Page Info sur l'auteur"
 
-#: c:\xampp\htdocs\development\wp-content\themes\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 "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\"."
-
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/theme-options.php:25
+#: library/extensions/theme-options.php:52
 msgid "Text in Footer"
 msgstr "Texte du pied de page"
 
-# Unsure about translation of "shortcode". Using "code".
-#: c:\xampp\htdocs\development\wp-content\themes\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 "Vous pouvez utilisez les codes suivants dans votre texte de pied de page&nbsp;: [wp-link] [theme-link] [loginout-link] [blog-title] [blog-link] [the-year]"
-
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/theme-options.php:28
-msgid "Powered by [wp-link]. Built on the [theme-link]."
-msgstr "Propulsé par [wp-link]. Construit avec [theme-link]."
-
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/theme-options.php:75
-msgid "settings saved."
-msgstr "&nbsp;: paramètres enregistrés."
-
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/theme-options.php:76
-msgid "settings reset."
-msgstr "&nbsp;: paramètres réinitialisés."
-
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/theme-options.php:77
-msgid "widgets reset."
-msgstr "&nbsp;: widgets réinitialisés."
-
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/theme-options.php:190
-msgid "Save changes"
-msgstr "Enregistrer les modifications"
-
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/theme-options.php:196
-msgid "Reset"
-msgstr "Réinitialiser"
-
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/theme-options.php:202
-msgid "Reset Widgets"
-msgstr "Réinitialiser les widgets"
-
-#: c:\xampp\htdocs\development\wp-content\themes\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 "Pour plus d'informations sur ce thème, <a href=\"http://themeshaper.com\">rendez-vous sur ThemeShaper</a>. Connectez-vous aux <a href=\"http://themeshaper.com/forums/\">forums ThemeShaper</a> si vous avez des questions à propos de Thematic."
-
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/widgets-extensions.php:12
+#: library/extensions/widgets-extensions.php:34
 msgid "To search, type and hit enter"
 msgstr "Entrez votre requête"
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/widgets-extensions.php:18
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/widgets-extensions.php:281
-#: c:\xampp\htdocs\development\wp-content\themes\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 "Recherche"
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/widgets-extensions.php:43
+#: 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."
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/widgets-extensions.php:58
+#: 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."
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/widgets-extensions.php:73
+#: 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."
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/widgets-extensions.php:88
+#: 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."
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/widgets-extensions.php:103
+#: 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."
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/widgets-extensions.php:118
+#: 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."
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/widgets-extensions.php:133
+#: 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."
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/widgets-extensions.php:148
+#: 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."
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/widgets-extensions.php:163
+#: 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."
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/widgets-extensions.php:178
+#: 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."
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/widgets-extensions.php:193
+#: 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."
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/widgets-extensions.php:208
+#: 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."
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/widgets-extensions.php:223
+#: 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."
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/widgets-extensions.php:283
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/widgets.php:55
+# @ 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:175
+msgid "Title:"
+msgstr "Titre&nbsp;:"
+
+# @ thematic
+#: library/extensions/widgets.php:100
+msgid "Log in/out and admin"
+msgstr "Se Connecter/Déconnecter et admin"
+
+#: library/extensions/widgets.php:101
+#: library/extensions/widgets.php:106
 msgid "Meta"
 msgstr "Méta"
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/widgets-extensions.php:285
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/widgets-extensions.php:286
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/widgets.php:72
+# @ thematic
+#: library/extensions/widgets.php:145
+msgid "Links to your posts and comments feed"
+msgstr "Liens vers vos fluxes des articles et commentaires"
+
+#: library/extensions/widgets.php:146
+#: library/extensions/widgets.php:151
 msgid "RSS Links"
 msgstr "Liens RSS"
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/widgets.php:77
+#: library/extensions/widgets.php:157
 msgid "All posts"
 msgstr "Tous les articles"
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/widgets.php:78
+#: library/extensions/widgets.php:158
 msgid "All comments"
 msgstr "Tous les commentaires"
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/widgets.php:96
-msgid "Title:"
-msgstr "Titre&nbsp;:"
+# @ 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"
 
-#~ msgid "definitions created."
-#~ msgstr "&nbsp;: fichier de définitions créé."
-#~ msgid "failed to create directory:"
-#~ msgstr "n'a pas pu créer le répertoire&nbsp;:"
-#~ msgid "failed to create the file:"
-#~ msgstr "n'a pas pu créer le fichier&nbsp;:"
-#~ msgid "Create Definitions"
-#~ msgstr "Créer le fichier de définitions"
-#~ msgid "Pages"
-#~ msgstr "Pages"
-#~ msgid "Categories"
-#~ msgstr "Catégories"
-#~ msgid "Archives"
-#~ msgstr "Archives"
-#~ msgid "RSS Feeds"
-#~ msgstr "Flux RSS"
-#~ msgid "Site Meta"
-#~ msgstr "Méta du site"
-#~ msgid "Blog Index"
-#~ msgstr "Index du blog"
+#: library/extensions/content-extensions.php:334
+#, fuzzy
+msgid "Author Archives:"
+msgstr "Archives par auteur&nbsp;: "
+
+#: 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/extensions/discussion.php:37
+msgid "Your comment is awaiting moderation"
+msgstr "Votre commentaire est en attente de modération"
+
+#: library/extensions/discussion.php:90
+msgid "Your trackback is awaiting moderation"
+msgstr "Votre trackback est en attente de modération"
+
+# @ thematic
+#: library/extensions/theme-options.php:56
+msgid "Remove Legacy Options"
+msgstr "Supprimer les Options Anciens "
+
+# @ thematic
+#: library/extensions/theme-options.php:204
+msgid "For more information:"
+msgstr "Pour plus de renseignements"
+
+# @ thematic
+#: library/extensions/theme-options.php:206
+msgid "For support:"
+msgstr "Pour l'assistance:"
+
+# @ thematic
+#: library/extensions/theme-options.php:208
+msgid "forums"
+msgstr "forums"
+
+# @ 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."
+
+# @ 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."
+
+# @ thematic
+#: library/extensions/theme-options.php:219
+msgid "Overview"
+msgstr "Vue d'ensemble"
+
+#: 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."
+
+# @ thematic
+#: library/extensions/theme-options.php:262
+#, php-format
+msgid "%s Theme Options"
+msgstr "%s Options du Thème"
+
+#: library/extensions/theme-options.php:276
+#, fuzzy
+msgid "Save Changes"
+msgstr "Enregistrer les modifications"
 
+# @ 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&nbsp;: [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."
+
+# @ 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."
+
+# @ 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\">&raquo;</span>"
+#~ msgstr ""
+#~ "Lire le reste de cet article <span class=\"meta-nav\">&raquo;</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\"."
diff --git a/wp-content/themes/thematic/library/languages/he_IL.mo b/wp-content/themes/thematic/library/languages/he_IL.mo
new file mode 100644
index 0000000000000000000000000000000000000000..e0ba45a98490505e4c095ea2f7359ca34752ad56
Binary files /dev/null and b/wp-content/themes/thematic/library/languages/he_IL.mo differ
diff --git a/wp-content/themes/thematic/library/languages/he_IL.po b/wp-content/themes/thematic/library/languages/he_IL.po
new file mode 100644
index 0000000000000000000000000000000000000000..d84869c965bbfbf84e6c6414e32439d5379d3af7
--- /dev/null
+++ b/wp-content/themes/thematic/library/languages/he_IL.po
@@ -0,0 +1,561 @@
+# Translation of Thematic 1.0.3 in Hebrew
+# This file is distributed under the same license as the Thematic 1.0.3 package.
+msgid ""
+msgstr ""
+"PO-Revision-Date: 2012-06-25 15:46:54+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"
+
+#: 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 "לערוך"
+
+#: attachment.php:62 library/extensions/content-extensions.php:666
+#: library/extensions/content-extensions.php:732
+msgid "Pages:"
+msgstr "עמודים:"
+
+#: author.php:67
+msgid "Email "
+msgstr "אימייל"
+
+#: comments.php:33
+msgid "This post is password protected. Enter the password to view any comments."
+msgstr "הפוסט הזה מוגן בססמא. הכנס ססמא כדי לראות תגובות."
+
+#: comments.php:111
+msgid "<span>One</span> Trackback"
+msgstr "<span>One</span> Trackback"
+
+#: 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 "כדי להגיב אתה צריך להיות <a href=\"%s\" title=\"Log in\">מחובר</a> ."
+
+#: 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\">מחובר כ -  <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\">להתנתק?</a></span>"
+
+#: comments.php:164 library/extensions/comments-extensions.php:233
+msgid "Your email is <em>never</em> published nor shared."
+msgstr "האמייל שלך <em>לעולם לא</em> יפורסם, יושכר או ימכר."
+
+#: comments.php:164 library/extensions/comments-extensions.php:233
+msgid "Required fields are marked <span class=\"required\">*</span>"
+msgstr "שדות חובה מסומנים ב<span class=\"required\">*</span>"
+
+#: comments.php:167 library/extensions/comments-extensions.php:224
+msgid "Name"
+msgstr "שם"
+
+#: comments.php:167 comments.php:172
+#: library/extensions/comments-extensions.php:224
+#: library/extensions/comments-extensions.php:225
+msgid "<span class=\"required\">*</span>"
+msgstr ""
+
+#: comments.php:172 library/extensions/comments-extensions.php:225
+msgid "Email"
+msgstr "אימייל"
+
+#: comments.php:177 library/extensions/comments-extensions.php:226
+msgid "Website"
+msgstr "אתר"
+
+#: 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 "ניתן להשתמש בטאגי <abbr title=\"HyperText Markup Language\">HTML</abbr> הבאים:"
+
+#: page.php:58 template-page-fullwidth.php:59
+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 "מתנצלים, לא נמצא שומדבר שתואם את החיפוש שלך. בבקשה נסה שוב עם מלים אחרות."
+
+#: library/extensions/content-extensions.php:1346 search.php:70
+msgid "Find"
+msgstr "מצא"
+
+#: library/extensions/comments-extensions.php:120
+msgid "<span>One</span> Comment"
+msgstr "תגובה <span>אחת</span>"
+
+#: library/extensions/comments-extensions.php:154
+msgid "Post a Comment"
+msgstr "השאר תגובה"
+
+#: library/extensions/comments-extensions.php:165
+msgid "Post a Reply to %s"
+msgstr "השב ל%s"
+
+#: library/extensions/comments-extensions.php:176
+msgid "Comment"
+msgstr "תגובה"
+
+#: library/extensions/comments-extensions.php:187
+msgid "Cancel reply"
+msgstr ""
+
+#: library/extensions/comments-extensions.php:198
+msgid "Post Comment"
+msgstr "השאר תגובה"
+
+#: library/extensions/content-extensions.php:340
+#: library/extensions/header-extensions.php:84
+msgid "Category Archives:"
+msgstr "ארכיון הקטגוריות:"
+
+#: library/extensions/content-extensions.php:349
+#: library/extensions/header-extensions.php:80
+msgid "Search Results for:"
+msgstr "תוצאות חיפוש עבור:"
+
+#: library/extensions/content-extensions.php:355
+#: library/extensions/header-extensions.php:88
+msgid "Tag Archives:"
+msgstr "ארכיון הטאגים:"
+
+#: library/extensions/content-extensions.php:364
+#: library/extensions/content-extensions.php:373
+msgid "Archives:"
+msgstr ""
+
+#: library/extensions/content-extensions.php:379
+msgid "Daily Archives: <span>%s</span>"
+msgstr "ארכיון יומי: <span<%s</span>"
+
+#: library/extensions/content-extensions.php:383
+msgid "Monthly Archives: <span>%s</span>"
+msgstr "ארכיון חודשי: <span<%s</span>"
+
+#: library/extensions/content-extensions.php:387
+msgid "Yearly Archives: <span>%s</span>"
+msgstr "ארכיון שנתי: <span<%s</span>"
+
+#: library/extensions/content-extensions.php:429
+#: library/extensions/content-extensions.php:1728
+msgid "<span class=\"meta-nav\">&laquo;</span> Older posts"
+msgstr "<span class=\"meta-nav\">&laquo;</span> פוסטים ישנים"
+
+#: library/extensions/content-extensions.php:431
+#: library/extensions/content-extensions.php:1729
+msgid "Newer posts <span class=\"meta-nav\">&raquo;</span>"
+msgstr "פוסטים חדשים <span class=\"meta-nav\">&raquo;</span>"
+
+#: library/extensions/content-extensions.php:946
+#: library/extensions/content-extensions.php:1460
+msgid "Edit post"
+msgstr "ערוך פוסט"
+
+#: library/extensions/content-extensions.php:975
+#: library/extensions/header-extensions.php:92
+msgid "Not Found"
+msgstr "לא נמצא"
+
+#: library/extensions/content-extensions.php:980
+#: library/extensions/content-extensions.php:1413
+#: library/extensions/content-extensions.php:1417
+msgid "Permalink to "
+msgstr "קישור ל - "
+
+#: library/extensions/content-extensions.php:1041
+msgid "By "
+msgstr "על ידי"
+
+#: library/extensions/content-extensions.php:1051
+msgid "View all posts by "
+msgstr "צפה בכל הפוסטים של"
+
+#: library/extensions/content-extensions.php:1079
+msgid "Published: "
+msgstr "פורסם:"
+
+#: library/extensions/content-extensions.php:1252
+msgid "Archives by Category"
+msgstr "ארכיון לפי כטקגוריות:"
+
+#: library/extensions/content-extensions.php:1280
+msgid "Archives by Month"
+msgstr "ארכיון לפי שנה"
+
+#: library/extensions/content-extensions.php:1413
+msgid "Browse the "
+msgstr ""
+
+#: library/extensions/content-extensions.php:1413
+msgid " Archive"
+msgstr ""
+
+#: library/extensions/content-extensions.php:1414
+msgid " archive"
+msgstr ""
+
+#: library/extensions/content-extensions.php:1417
+msgid "Bookmark the "
+msgstr ""
+
+#: library/extensions/content-extensions.php:1418
+msgid "permalink"
+msgstr "קישור"
+
+#: library/extensions/content-extensions.php:1572
+msgid "This entry was posted in "
+msgstr "פורסם ב - "
+
+#: library/extensions/content-extensions.php:1580
+msgid "Also posted in "
+msgstr "פוסטים נוספים ב - "
+
+#: library/extensions/content-extensions.php:1583
+msgid "Posted in "
+msgstr "פורסם ב - "
+
+#: library/extensions/content-extensions.php:1609
+msgid " This entry is tagged"
+msgstr ""
+
+#: library/extensions/content-extensions.php:1612
+msgid " and tagged"
+msgstr "ומתוייג"
+
+#: library/extensions/content-extensions.php:1615
+msgid " Also tagged "
+msgstr "גם מתוייג"
+
+#: library/extensions/content-extensions.php:1617
+msgid "Tagged"
+msgstr "מתוייג"
+
+#: library/extensions/content-extensions.php:1644
+#: library/extensions/content-extensions.php:1647
+#: library/extensions/content-extensions.php:1650
+msgid "Comment on "
+msgstr "הגב על "
+
+#: library/extensions/content-extensions.php:1651
+msgid "Leave a comment"
+msgstr "השאר תגובה"
+
+#: library/extensions/content-extensions.php:1654
+msgid "Comments closed"
+msgstr "תגובות סגורות"
+
+#: library/extensions/content-extensions.php:1678
+#: library/extensions/content-extensions.php:1686
+msgid "Post a comment"
+msgstr "השאר תגובה"
+
+#: library/extensions/content-extensions.php:1679
+msgid " or leave a trackback: "
+msgstr "או השאר טראקבאק"
+
+#: library/extensions/content-extensions.php:1680
+#: library/extensions/content-extensions.php:1683
+msgid "Trackback URL for your post"
+msgstr "קישור טראקבאק לפוסט שלך"
+
+#: library/extensions/content-extensions.php:1680
+#: library/extensions/content-extensions.php:1683
+msgid "Trackback URL"
+msgstr "קישור טראקבאק"
+
+#: library/extensions/content-extensions.php:1682
+msgid " Comments are closed, but you can leave a trackback: "
+msgstr "תגובות סגורות, ניתן להשאיר טראקבאק ב:"
+
+#: library/extensions/content-extensions.php:1685
+msgid " Trackbacks are closed, but you can "
+msgstr "טראקבאק סגורים, אך ניתן"
+
+#: library/extensions/content-extensions.php:1686
+msgid "post a comment"
+msgstr "השאר תגובה"
+
+#: library/extensions/content-extensions.php:1688
+msgid " Both comments and trackbacks are currently closed."
+msgstr "תגובות וטראקבאקים סגורים כרגע."
+
+#: 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 "פורסם %1$st ב - %2$s <span class=\"meta-sep\">|</span> <a href=\"%3$s\" title=\"Permalink to this comment\">קישור</a>"
+
+#: library/extensions/discussion-extensions.php:35
+msgid "Edit comment"
+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
+msgid "By %1$s on %2$s at %3$s"
+msgstr "על ידי %1$st על %2$s ב - %3$s"
+
+#: library/extensions/header-extensions.php:302
+#: library/extensions/widgets.php:157
+msgid "Posts RSS feed"
+msgstr "פוסטים רסס פיד"
+
+#: library/extensions/header-extensions.php:326
+#: library/extensions/widgets.php:158
+msgid "Comments RSS feed"
+msgstr "תגובות רסס פיד"
+
+#: functions.php:253
+msgid "Primary Menu"
+msgstr ""
+
+#: library/extensions/header-extensions.php:625
+msgid "Skip navigation to the content"
+msgstr "דלג על סרגל הניווט לתוכן"
+
+#: library/extensions/header-extensions.php:625
+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/shortcodes.php:40
+msgid "Login"
+msgstr "התחבר"
+
+#: library/extensions/shortcodes.php:42
+msgid "Logout"
+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/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:72
+msgid "The primary widget area, most often used as a sidebar."
+msgstr "אזור ווידג'ט ראשוני, לרוב משמש כסייד-בר"
+
+#: library/extensions/widgets-extensions.php:87
+msgid "The secondary widget area, most often used as a sidebar."
+msgstr "אזור ווידג'ט שניוני, לרוב משמש כסייד-בר"
+
+#: library/extensions/widgets-extensions.php:102
+msgid "The 1st widget area in the footer."
+msgstr "אזור ווידג'ט ראשון בפוטר"
+
+#: library/extensions/widgets-extensions.php:117
+msgid "The 2nd widget area in the footer."
+msgstr "אזור ווידג'ט שני בפוטר"
+
+#: library/extensions/widgets-extensions.php:132
+msgid "The 3rd widget area in the footer."
+msgstr "אזור ווידג'ט שלישי בפוטר"
+
+#: library/extensions/widgets-extensions.php:147
+msgid "The top widget area displayed on the index page."
+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:177
+msgid "The bottom widget area displayed on the index page."
+msgstr "אזור ווידג'ט תחתון מוצג בעמוד אינדקס"
+
+#: library/extensions/widgets-extensions.php:192
+msgid "The top widget area displayed on a single post."
+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:222
+msgid "The bottom widget area displayed on a single post."
+msgstr "אזור ווידג'ט תחתון המוצג בפוסט יחיד"
+
+#: library/extensions/widgets-extensions.php:237
+msgid "The top widget area displayed on a page."
+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 "לינקים רסס"
+
+#: library/extensions/widgets.php:157
+msgid "All posts"
+msgstr "כל הפוסטים"
+
+#: library/extensions/widgets.php:158
+msgid "All comments"
+msgstr "כל התגובות"
+
+#: archives.php:20 template-page-blog.php:22
+msgid "The template %s"
+msgstr ""
+
+#: comments.php:24
+msgid "Please do not load this page directly."
+msgstr ""
+
+#: comments.php:111
+msgid "Trackbacks"
+msgstr ""
+
+#: library/extensions/comments-extensions.php:131
+msgid "Comments"
+msgstr ""
+
+#: library/extensions/content-extensions.php:334
+msgid "Author Archives:"
+msgstr ""
+
+#: library/extensions/content-extensions.php:1340
+msgid "Apologies, but we were unable to find what you were looking for. Perhaps searching will help."
+msgstr ""
+
+#: library/extensions/content-extensions.php:1364
+msgid "Read More %s"
+msgstr ""
+
+#: library/extensions/content-extensions.php:1645
+msgid "Responses"
+msgstr ""
+
+#: library/extensions/content-extensions.php:1648
+msgid "Response"
+msgstr ""
+
+#: library/extensions/discussion.php:37
+msgid "Your comment is awaiting moderation"
+msgstr ""
+
+#: library/extensions/discussion.php:90
+msgid "Your trackback is awaiting moderation"
+msgstr ""
+
+#: library/extensions/theme-options.php:56
+msgid "Remove Legacy Options"
+msgstr ""
+
+#: library/extensions/theme-options.php:204
+msgid "For more information:"
+msgstr ""
+
+#: library/extensions/theme-options.php:206
+msgid "For support:"
+msgstr ""
+
+#: library/extensions/theme-options.php:208
+msgid "forums"
+msgstr ""
+
+#: library/extensions/theme-options.php:212
+msgid "The options below are enabled by the Thematic Theme framework and/or a child theme."
+msgstr ""
+
+#: 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 ""
+
+#: library/extensions/theme-options.php:219
+msgid "Overview"
+msgstr ""
+
+#: 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 ""
+
+#: library/extensions/theme-options.php:262
+msgid "%s Theme Options"
+msgstr ""
+
+#: library/extensions/theme-options.php:276
+msgid "Save Changes"
+msgstr ""
+
+#: 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 ""
+
+#: library/extensions/theme-options.php:324
+msgid "Display a"
+msgstr ""
+
+#: library/extensions/theme-options.php:324
+msgid "with the author's avatar, bio and email on the author page."
+msgstr ""
+
+#: library/extensions/theme-options.php:337
+msgid "You can use HTML and shortcodes in your footer text. Shortcode examples"
+msgstr ""
+
+#: 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 ""
+
+#: 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 ""
+
+#: template-page-blog.php:22
+msgid "You can include a %s in a childtheme"
+msgstr ""
\ No newline at end of file
diff --git a/wp-content/themes/thematic/library/languages/is_IS.mo b/wp-content/themes/thematic/library/languages/is_IS.mo
new file mode 100644
index 0000000000000000000000000000000000000000..f4cfc2068f8aa44a1f467fd4ddf4f94295ded8b6
Binary files /dev/null and b/wp-content/themes/thematic/library/languages/is_IS.mo differ
diff --git a/wp-content/themes/thematic/library/languages/is_IS.po b/wp-content/themes/thematic/library/languages/is_IS.po
new file mode 100644
index 0000000000000000000000000000000000000000..db6ee6f599fa615640ce270b6cdcf4ddc28ef019
--- /dev/null
+++ b/wp-content/themes/thematic/library/languages/is_IS.po
@@ -0,0 +1,480 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: Thematic Icelandic\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-03-15 11:44+0100\n"
+"PO-Revision-Date: \n"
+"Last-Translator: Stefán Vignir Skarphéðinsson <stebbiv@gmail.com>\n"
+"Language-Team: Stefán Vignir Skarphéðinsson <stebbiv+thematic@gmail.com>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Poedit-Language: Icelandic\n"
+"X-Poedit-Country: ICELAND\n"
+"X-Poedit-KeywordsList: _e;__\n"
+
+#: D:\Web\Wordpress\dev\wp-content\themes\thematic/404.php:10
+msgid "Apologies, but we were unable to find what you were looking for. Perhaps  searching will help."
+msgstr "Því miður gátum við ekki fundið það sem þú varst að leita. Ef til vill gæti gengið betur að nota leitina."
+
+#: D:\Web\Wordpress\dev\wp-content\themes\thematic/404.php:15
+#: D:\Web\Wordpress\dev\wp-content\themes\thematic/search.php:58
+msgid "Find"
+msgstr "Finna"
+
+#: D:\Web\Wordpress\dev\wp-content\themes\thematic/archive.php:16
+#, php-format
+msgid "Daily Archives: <span>%s</span>"
+msgstr "Dagleg söfn: <span>%s</span>"
+
+#: D:\Web\Wordpress\dev\wp-content\themes\thematic/archive.php:18
+#, php-format
+msgid "Monthly Archives: <span>%s</span>"
+msgstr "Mánaðarleg söfn: <span>%s</span>"
+
+#: D:\Web\Wordpress\dev\wp-content\themes\thematic/archive.php:20
+#, php-format
+msgid "Yearly Archives: <span>%s</span>"
+msgstr "Áleg söfn: <span>%s</span>"
+
+#: D:\Web\Wordpress\dev\wp-content\themes\thematic/archive.php:22
+msgid "Blog Archives"
+msgstr "Söfn"
+
+#: D:\Web\Wordpress\dev\wp-content\themes\thematic/archive.php:31
+#: D:\Web\Wordpress\dev\wp-content\themes\thematic/archive.php:53
+#: D:\Web\Wordpress\dev\wp-content\themes\thematic/author.php:21
+#: D:\Web\Wordpress\dev\wp-content\themes\thematic/author.php:57
+#: D:\Web\Wordpress\dev\wp-content\themes\thematic/category.php:20
+#: D:\Web\Wordpress\dev\wp-content\themes\thematic/category.php:42
+#: D:\Web\Wordpress\dev\wp-content\themes\thematic/index.php:17
+#: D:\Web\Wordpress\dev\wp-content\themes\thematic/index.php:49
+#: D:\Web\Wordpress\dev\wp-content\themes\thematic/search.php:21
+#: D:\Web\Wordpress\dev\wp-content\themes\thematic/search.php:43
+msgid "<span class=\"meta-nav\">&laquo;</span> Older posts"
+msgstr "<span class=\"meta-nav\">&laquo;</span> Eldri færslur"
+
+#: D:\Web\Wordpress\dev\wp-content\themes\thematic/archive.php:32
+#: D:\Web\Wordpress\dev\wp-content\themes\thematic/archive.php:54
+#: D:\Web\Wordpress\dev\wp-content\themes\thematic/author.php:22
+#: D:\Web\Wordpress\dev\wp-content\themes\thematic/author.php:58
+#: D:\Web\Wordpress\dev\wp-content\themes\thematic/category.php:21
+#: D:\Web\Wordpress\dev\wp-content\themes\thematic/category.php:43
+#: D:\Web\Wordpress\dev\wp-content\themes\thematic/index.php:18
+#: D:\Web\Wordpress\dev\wp-content\themes\thematic/index.php:50
+#: D:\Web\Wordpress\dev\wp-content\themes\thematic/search.php:22
+#: D:\Web\Wordpress\dev\wp-content\themes\thematic/search.php:44
+msgid "Newer posts <span class=\"meta-nav\">&raquo;</span>"
+msgstr "Nýrri færslur <span class=\"meta-nav\">&raquo;</span>"
+
+#: D:\Web\Wordpress\dev\wp-content\themes\thematic/archive.php:41
+#: D:\Web\Wordpress\dev\wp-content\themes\thematic/attachment.php:20
+#: D:\Web\Wordpress\dev\wp-content\themes\thematic/author.php:45
+#: D:\Web\Wordpress\dev\wp-content\themes\thematic/category.php:30
+#: D:\Web\Wordpress\dev\wp-content\themes\thematic/index.php:30
+#: D:\Web\Wordpress\dev\wp-content\themes\thematic/search.php:31
+msgid "Read More <span class=\"meta-nav\">&raquo;</span>"
+msgstr "Lesa meira <span class=\"meta-nav\">&raquo;</span>"
+
+#: D:\Web\Wordpress\dev\wp-content\themes\thematic/archives.php:20
+msgid "Archives by Category"
+msgstr "Söfn eftir efnisflokkum"
+
+#: D:\Web\Wordpress\dev\wp-content\themes\thematic/archives.php:26
+msgid "Archives by Month"
+msgstr "Söfn eftir mánuðum"
+
+#: D:\Web\Wordpress\dev\wp-content\themes\thematic/archives.php:32
+#: D:\Web\Wordpress\dev\wp-content\themes\thematic/links.php:20
+#: D:\Web\Wordpress\dev\wp-content\themes\thematic/page.php:16
+msgid "Edit"
+msgstr "Breyta"
+
+#: D:\Web\Wordpress\dev\wp-content\themes\thematic/attachment.php:22
+#: D:\Web\Wordpress\dev\wp-content\themes\thematic/index.php:32
+msgid "Pages:"
+msgstr "Síður:"
+
+#: D:\Web\Wordpress\dev\wp-content\themes\thematic/author.php:15
+msgid "Author Archives: "
+msgstr "Söfn eftir höfundi: "
+
+#: D:\Web\Wordpress\dev\wp-content\themes\thematic/author.php:34
+msgid "Email "
+msgstr "Tölvupóstur"
+
+#: D:\Web\Wordpress\dev\wp-content\themes\thematic/category.php:13
+msgid "Category Archives:"
+msgstr "Söfn eftir flokkum:"
+
+#: D:\Web\Wordpress\dev\wp-content\themes\thematic/comments.php:10
+msgid "This post is password protected. Enter the password to view any comments."
+msgstr "Þessi færsla er læst með lykilorði. Skrifaðu lykilorðið til að sjá athugasemdir."
+
+#: D:\Web\Wordpress\dev\wp-content\themes\thematic/comments.php:31
+#, php-format
+msgid "<span>%d</span> Comments"
+msgstr "<span>%d</span> athugasemdir"
+
+#: D:\Web\Wordpress\dev\wp-content\themes\thematic/comments.php:31
+msgid "<span>One</span> Comment"
+msgstr "<span>Ein</span> athugasemd"
+
+#: D:\Web\Wordpress\dev\wp-content\themes\thematic/comments.php:52
+#, php-format
+msgid "<span>%d</span> Trackbacks"
+msgstr "<span>%d</span> bakvísanir"
+
+#: D:\Web\Wordpress\dev\wp-content\themes\thematic/comments.php:52
+msgid "<span>One</span> Trackback"
+msgstr "<span>Ein</span> bakvísun"
+
+#: D:\Web\Wordpress\dev\wp-content\themes\thematic/comments.php:67
+msgid "Post a Comment"
+msgstr "Skrifa athugasemd"
+
+#: D:\Web\Wordpress\dev\wp-content\themes\thematic/comments.php:67
+#, php-format
+msgid "Post a Reply to %s"
+msgstr "Skrifa svar við %s"
+
+#: D:\Web\Wordpress\dev\wp-content\themes\thematic/comments.php:72
+#, php-format
+msgid "You must be <a href=\"%s\" title=\"Log in\">logged in</a> to post a comment."
+msgstr "Þú þarft að <a href=\"%s\" title=\"Skrá inn\">skráð þig inn</a> til að skrifa athugasemdir."
+
+#: D:\Web\Wordpress\dev\wp-content\themes\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\">Skráð inn sem <a href=\"%1$s\" title=\"Skráð inn sem %2$s\">%2$s</a>.</span> <span class=\"logout\"><a href=\"%3$s\" title=\"Skrá mig út\">Skrá út?</a></span>"
+
+#: D:\Web\Wordpress\dev\wp-content\themes\thematic/comments.php:90
+msgid "Your email is <em>never</em> published nor shared."
+msgstr "Tölvupóstfangið þitt er <em>aldrei</em> gefið upp eða deilt með öðrum."
+
+#: D:\Web\Wordpress\dev\wp-content\themes\thematic/comments.php:90
+msgid "Required fields are marked <span class=\"required\">*</span>"
+msgstr "Nauðsynlegir reitir eru merktir <span class=\"required\">*</span>"
+
+#: D:\Web\Wordpress\dev\wp-content\themes\thematic/comments.php:93
+msgid "Name"
+msgstr "Nafn"
+
+#: D:\Web\Wordpress\dev\wp-content\themes\thematic/comments.php:93
+#: D:\Web\Wordpress\dev\wp-content\themes\thematic/comments.php:98
+msgid "<span class=\"required\">*</span>"
+msgstr "<span class=\"required\">*</span>"
+
+#: D:\Web\Wordpress\dev\wp-content\themes\thematic/comments.php:98
+msgid "Email"
+msgstr "Tölvupóstfang"
+
+#: D:\Web\Wordpress\dev\wp-content\themes\thematic/comments.php:103
+msgid "Website"
+msgstr "Vefsíða"
+
+#: D:\Web\Wordpress\dev\wp-content\themes\thematic/comments.php:110
+msgid "Comment"
+msgstr "Athugasemd"
+
+#: D:\Web\Wordpress\dev\wp-content\themes\thematic/comments.php:115
+msgid "You may use these <abbr title=\"HyperText Markup Language\">HTML</abbr> tags and attributes:"
+msgstr "Þú mátt nota þessi <abbr title=\"HyperText Markup Language\">HTML</abbr>-tögg og eigindi:"
+
+#: D:\Web\Wordpress\dev\wp-content\themes\thematic/comments.php:120
+msgid "Post Comment"
+msgstr "Skrifa athugasemd"
+
+#: D:\Web\Wordpress\dev\wp-content\themes\thematic/page.php:14
+msgid "Pages: "
+msgstr "Síður:"
+
+#: D:\Web\Wordpress\dev\wp-content\themes\thematic/search.php:15
+msgid "Search Results for:"
+msgstr "Leitarniðurstöður fyrir:"
+
+#: D:\Web\Wordpress\dev\wp-content\themes\thematic/search.php:51
+msgid "Nothing Found"
+msgstr "Ekkert fannst"
+
+#: D:\Web\Wordpress\dev\wp-content\themes\thematic/search.php:53
+msgid "Sorry, but nothing matched your search criteria. Please try again with some different keywords."
+msgstr "Því miður var ekki hægt að finna það sem þó óskaðir eftir. Reyndu aftur með öðrum leitarorðum."
+
+#: D:\Web\Wordpress\dev\wp-content\themes\thematic/sidebar.php:6
+#: D:\Web\Wordpress\dev\wp-content\themes\thematic/sidebar.php:10
+msgid "Search"
+msgstr "Leita"
+
+#: D:\Web\Wordpress\dev\wp-content\themes\thematic/sidebar.php:16
+msgid "Pages"
+msgstr "Síður"
+
+#: D:\Web\Wordpress\dev\wp-content\themes\thematic/sidebar.php:23
+msgid "Categories"
+msgstr "Efnisflokkar"
+
+#: D:\Web\Wordpress\dev\wp-content\themes\thematic/sidebar.php:31
+msgid "Archives"
+msgstr "Söfn"
+
+#: D:\Web\Wordpress\dev\wp-content\themes\thematic/sidebar.php:50
+msgid "RSS Feeds"
+msgstr "RSS-straumar"
+
+#: D:\Web\Wordpress\dev\wp-content\themes\thematic/sidebar.php:52
+#: D:\Web\Wordpress\dev\wp-content\themes\thematic/library/extensions/hooks-filters.php:390
+msgid "Posts RSS feed"
+msgstr "RSS-straumar fyrir færslur"
+
+#: D:\Web\Wordpress\dev\wp-content\themes\thematic/sidebar.php:52
+msgid "All posts"
+msgstr "Allar færslur"
+
+#: D:\Web\Wordpress\dev\wp-content\themes\thematic/sidebar.php:53
+#: D:\Web\Wordpress\dev\wp-content\themes\thematic/library/extensions/hooks-filters.php:408
+msgid "Comments RSS feed"
+msgstr "RSS-straumar fyrir athugasemdir"
+
+#: D:\Web\Wordpress\dev\wp-content\themes\thematic/sidebar.php:53
+msgid "All comments"
+msgstr "Allar athugasemdir"
+
+#: D:\Web\Wordpress\dev\wp-content\themes\thematic/sidebar.php:58
+msgid "Meta"
+msgstr "Meta"
+
+#: D:\Web\Wordpress\dev\wp-content\themes\thematic/tag.php:13
+#: D:\Web\Wordpress\dev\wp-content\themes\thematic/library/extensions/hooks-filters.php:207
+msgid "Tag Archives:"
+msgstr "Söfn fyrir stikkorð:"
+
+#: D:\Web\Wordpress\dev\wp-content\themes\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 "Sent inn %1$s kl. %2$s <span class=\"meta-sep\">|</span> <a href=\"%3$s\" title=\"Fastur hlekkur á þessa athugasemd\">Fastur hlekkur</a>"
+
+#: D:\Web\Wordpress\dev\wp-content\themes\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'>Athugasemdin þín bíður eftir að vera yfirfarin.</span>\n"
+
+#: D:\Web\Wordpress\dev\wp-content\themes\thematic/library/extensions/discussion.php:22
+msgid "Reply"
+msgstr "Svara"
+
+#: D:\Web\Wordpress\dev\wp-content\themes\thematic/library/extensions/discussion.php:23
+msgid "Log in to reply."
+msgstr "Skráðu þig inn til að svara."
+
+#: D:\Web\Wordpress\dev\wp-content\themes\thematic/library/extensions/discussion.php:37
+#, php-format
+msgid "By %1$s on %2$s at %3$s"
+msgstr "Eftir %1$s þann %2$s kl. %3$s"
+
+#: D:\Web\Wordpress\dev\wp-content\themes\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\">Bakvísunin þín bíður eftir að vera yfirfarin.</span>\\n"
+
+#: D:\Web\Wordpress\dev\wp-content\themes\thematic/library/extensions/helpers.php:31
+#: D:\Web\Wordpress\dev\wp-content\themes\thematic/library/extensions/helpers.php:44
+msgid "There is no excerpt because this is a protected post."
+msgstr "Það er engin tilvitnun því þessi færsla er varin."
+
+#: D:\Web\Wordpress\dev\wp-content\themes\thematic/library/extensions/hooks-filters.php:61
+msgid "Skip navigation to the content"
+msgstr "Sleppa leiðarkerfi að efni"
+
+#: D:\Web\Wordpress\dev\wp-content\themes\thematic/library/extensions/hooks-filters.php:61
+msgid "Skip to content"
+msgstr "Fara beint í efni"
+
+#: D:\Web\Wordpress\dev\wp-content\themes\thematic/library/extensions/hooks-filters.php:211
+#: D:\Web\Wordpress\dev\wp-content\themes\thematic/library/extensions/hooks-filters.php:497
+msgid "Not Found"
+msgstr "Ekkert fannst"
+
+#: D:\Web\Wordpress\dev\wp-content\themes\thematic/library/extensions/hooks-filters.php:489
+#: D:\Web\Wordpress\dev\wp-content\themes\thematic/library/extensions/hooks-filters.php:544
+msgid "Edit post"
+msgstr "Breyta færslu"
+
+#: D:\Web\Wordpress\dev\wp-content\themes\thematic/library/extensions/hooks-filters.php:502
+#: D:\Web\Wordpress\dev\wp-content\themes\thematic/library/extensions/hooks-filters.php:597
+msgid "Permalink to "
+msgstr "Fastur hlekkur í "
+
+#: D:\Web\Wordpress\dev\wp-content\themes\thematic/library/extensions/hooks-filters.php:511
+msgid "By "
+msgstr "Eftir "
+
+#: D:\Web\Wordpress\dev\wp-content\themes\thematic/library/extensions/hooks-filters.php:513
+msgid "View all posts by "
+msgstr "Sjá allar færslur eftir "
+
+#: D:\Web\Wordpress\dev\wp-content\themes\thematic/library/extensions/hooks-filters.php:516
+msgid "Published: "
+msgstr "Birt: "
+
+#: D:\Web\Wordpress\dev\wp-content\themes\thematic/library/extensions/hooks-filters.php:551
+msgid "This entry was posted in "
+msgstr "Þessi færsla var færð inn undir "
+
+#: D:\Web\Wordpress\dev\wp-content\themes\thematic/library/extensions/hooks-filters.php:554
+msgid "Also posted in "
+msgstr "Einnig fært undir "
+
+#: D:\Web\Wordpress\dev\wp-content\themes\thematic/library/extensions/hooks-filters.php:557
+msgid "Posted in "
+msgstr "Fært undir "
+
+#: D:\Web\Wordpress\dev\wp-content\themes\thematic/library/extensions/hooks-filters.php:564
+msgid " and tagged"
+msgstr " og merkt"
+
+#: D:\Web\Wordpress\dev\wp-content\themes\thematic/library/extensions/hooks-filters.php:567
+msgid " Also tagged "
+msgstr " Einnig mekt "
+
+#: D:\Web\Wordpress\dev\wp-content\themes\thematic/library/extensions/hooks-filters.php:569
+msgid "Tagged"
+msgstr "Merkt sem"
+
+#: D:\Web\Wordpress\dev\wp-content\themes\thematic/library/extensions/hooks-filters.php:578
+#: D:\Web\Wordpress\dev\wp-content\themes\thematic/library/extensions/hooks-filters.php:581
+#: D:\Web\Wordpress\dev\wp-content\themes\thematic/library/extensions/hooks-filters.php:584
+msgid "Comment on "
+msgstr "Athugasemdir við "
+
+#: D:\Web\Wordpress\dev\wp-content\themes\thematic/library/extensions/hooks-filters.php:579
+msgid " Comments"
+msgstr " athugasemdir"
+
+#: D:\Web\Wordpress\dev\wp-content\themes\thematic/library/extensions/hooks-filters.php:582
+msgid " Comment"
+msgstr " athugasemd"
+
+#: D:\Web\Wordpress\dev\wp-content\themes\thematic/library/extensions/hooks-filters.php:585
+msgid "Leave a comment"
+msgstr "Skikja eftir svar"
+
+#: D:\Web\Wordpress\dev\wp-content\themes\thematic/library/extensions/hooks-filters.php:588
+msgid "Comments closed"
+msgstr "Lokað er fyrir athugasemdir"
+
+#: D:\Web\Wordpress\dev\wp-content\themes\thematic/library/extensions/hooks-filters.php:597
+msgid ". Bookmark the "
+msgstr ". Bókamerkja  "
+
+#: D:\Web\Wordpress\dev\wp-content\themes\thematic/library/extensions/hooks-filters.php:598
+msgid "permalink"
+msgstr "fastur hlekkur"
+
+#: D:\Web\Wordpress\dev\wp-content\themes\thematic/library/extensions/hooks-filters.php:600
+#: D:\Web\Wordpress\dev\wp-content\themes\thematic/library/extensions/hooks-filters.php:608
+msgid "Post a comment"
+msgstr "Skrifaðu athugasemd"
+
+#: D:\Web\Wordpress\dev\wp-content\themes\thematic/library/extensions/hooks-filters.php:601
+msgid " or leave a trackback: "
+msgstr " eða skildu eftir bakvísun: "
+
+#: D:\Web\Wordpress\dev\wp-content\themes\thematic/library/extensions/hooks-filters.php:602
+#: D:\Web\Wordpress\dev\wp-content\themes\thematic/library/extensions/hooks-filters.php:605
+msgid "Trackback URL for your post"
+msgstr "Slóð fyrir bakvísanir við færsluna þína"
+
+#: D:\Web\Wordpress\dev\wp-content\themes\thematic/library/extensions/hooks-filters.php:602
+#: D:\Web\Wordpress\dev\wp-content\themes\thematic/library/extensions/hooks-filters.php:605
+msgid "Trackback URL"
+msgstr "Slóð fyrir bakvísun"
+
+#: D:\Web\Wordpress\dev\wp-content\themes\thematic/library/extensions/hooks-filters.php:604
+msgid " Comments are closed, but you can leave a trackback: "
+msgstr " Lokað er fyrir athugasemdir en þú getur skilið eftir bakvísun: "
+
+#: D:\Web\Wordpress\dev\wp-content\themes\thematic/library/extensions/hooks-filters.php:607
+msgid " Trackbacks are closed, but you can "
+msgstr " Lokað er fyrir bakvísanir en þú getur "
+
+#: D:\Web\Wordpress\dev\wp-content\themes\thematic/library/extensions/hooks-filters.php:608
+msgid "post a comment"
+msgstr "skrifað athugasemd"
+
+#: D:\Web\Wordpress\dev\wp-content\themes\thematic/library/extensions/hooks-filters.php:610
+msgid " Both comments and trackbacks are currently closed."
+msgstr " Bæði er lokað fyrir athugasemdir og bakvísanir."
+
+#: D:\Web\Wordpress\dev\wp-content\themes\thematic/library/extensions/shortcodes.php:16
+msgid "Login"
+msgstr "Skrá inn"
+
+#: D:\Web\Wordpress\dev\wp-content\themes\thematic/library/extensions/shortcodes.php:18
+msgid "Logout"
+msgstr "Skrá út"
+
+#: D:\Web\Wordpress\dev\wp-content\themes\thematic/library/extensions/theme-options.php:13
+msgid "Index Insert Position"
+msgstr "Staðsetning fyrir innsetningu"
+
+#: D:\Web\Wordpress\dev\wp-content\themes\thematic/library/extensions/theme-options.php:14
+msgid "The widgetized Index Insert will follow after this post number."
+msgstr "Íhlutur fyrir efnisyfirlit kemur inn eftir þessa færslu."
+
+#: D:\Web\Wordpress\dev\wp-content\themes\thematic/library/extensions/theme-options.php:19
+msgid "Info on Author Page"
+msgstr "Síða fyrir upplýsingar um höfund."
+
+#: D:\Web\Wordpress\dev\wp-content\themes\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 "Sýna vCard-færslu í <a href=\"http://microformats.org/wiki/hcard\" target=\"_blank\">örsniði</a> með mynd af höfundi, öðrum upplýsingum og tölvupóstfangi á upplýsingasíðu hans."
+
+#: D:\Web\Wordpress\dev\wp-content\themes\thematic/library/extensions/theme-options.php:25
+msgid "Text in Footer"
+msgstr "Texti í fæti"
+
+#: D:\Web\Wordpress\dev\wp-content\themes\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] [the-year]"
+msgstr "Þú getur notað eftirfarandi stuttkóða þeim texta sem kemur fram í fætinum: [wp-link] [theme-link] [loginout-link] [blog-title] [the-year]"
+
+#: D:\Web\Wordpress\dev\wp-content\themes\thematic/library/extensions/theme-options.php:28
+msgid "Powered by [wp-link]. Built on the [theme-link]."
+msgstr "Gengur fyrir [wp-link]. Byggt á [theme-link]."
+
+#: D:\Web\Wordpress\dev\wp-content\themes\thematic/library/extensions/theme-options.php:76
+msgid "settings saved."
+msgstr "stillingar vistaðar."
+
+#: D:\Web\Wordpress\dev\wp-content\themes\thematic/library/extensions/theme-options.php:77
+msgid "settings reset."
+msgstr "núllstilla grunnstillingar."
+
+#: D:\Web\Wordpress\dev\wp-content\themes\thematic/library/extensions/theme-options.php:78
+msgid "widgets reset."
+msgstr "núllstilla aukahluti."
+
+#: D:\Web\Wordpress\dev\wp-content\themes\thematic/library/extensions/theme-options.php:191
+msgid "Save changes"
+msgstr "Vista breytingar"
+
+#: D:\Web\Wordpress\dev\wp-content\themes\thematic/library/extensions/theme-options.php:197
+msgid "Reset"
+msgstr "Núllstilla"
+
+#: D:\Web\Wordpress\dev\wp-content\themes\thematic/library/extensions/theme-options.php:203
+msgid "Reset Widgets"
+msgstr "Núllstilla aukahluti"
+
+#: D:\Web\Wordpress\dev\wp-content\themes\thematic/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 "Fyrir frekari upplýsingar um þessa þemu er hægt að heimsækja <a href=\"http://themeshaper.com\">vefsíðu ThemeShaper</a>. Skoðaðu <a href=\"http://themeshaper.com/forums/\">umræðuborð ThemeShaper</a> ef þú hefur spurningar varðandi Thematic."
+
+#: D:\Web\Wordpress\dev\wp-content\themes\thematic/library/extensions/widgets.php:55
+#: D:\Web\Wordpress\dev\wp-content\themes\thematic/library/extensions/widgets.php:245
+#: D:\Web\Wordpress\dev\wp-content\themes\thematic/library/extensions/widgets.php:246
+msgid "RSS Links"
+msgstr "RSS-hlekkir"
+
+#: D:\Web\Wordpress\dev\wp-content\themes\thematic/library/extensions/widgets.php:79
+msgid "Title:"
+msgstr "Titill:"
+
diff --git a/wp-content/themes/thematic/library/languages/lt.mo b/wp-content/themes/thematic/library/languages/lt.mo
new file mode 100644
index 0000000000000000000000000000000000000000..4deec299e1720781317dac2d5251bf4dc0d82974
Binary files /dev/null and b/wp-content/themes/thematic/library/languages/lt.mo differ
diff --git a/wp-content/themes/thematic/library/languages/lt.po b/wp-content/themes/thematic/library/languages/lt.po
new file mode 100644
index 0000000000000000000000000000000000000000..002eda77e8da22838dc9c033f0406f3b05019535
--- /dev/null
+++ b/wp-content/themes/thematic/library/languages/lt.po
@@ -0,0 +1,561 @@
+# Translation of Thematic 1.0.3 in Lithuanian
+# This file is distributed under the same license as the Thematic 1.0.3 package.
+msgid ""
+msgstr ""
+"PO-Revision-Date: 2012-06-25 15:46:26+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%100<10 || n%100>=20) ? 1 : 2);\n"
+"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 "Taisyti"
+
+#: attachment.php:62 library/extensions/content-extensions.php:666
+#: library/extensions/content-extensions.php:732
+msgid "Pages:"
+msgstr "Puslapiai:"
+
+#: author.php:67
+msgid "Email "
+msgstr "El. paštas"
+
+#: comments.php:33
+msgid "This post is password protected. Enter the password to view any comments."
+msgstr "Šis įrašas apsaugotas slaptažodžiu. Įveskite slaptažodį, jei norite pamatyti komentarus."
+
+#: comments.php:111
+msgid "<span>One</span> Trackback"
+msgstr "<span>Vienas</span> atsiliepimas"
+
+#: 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 "Jei norite palikti komentarą, turite <a href=\"%s\">prisijungti</a>."
+
+#: 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\">Prisijungta kaip <a href=\"%1$s\" title=\"Prisijungta kaip %2$s\">%2$s</a>.</span> <span class=\"logout\"><a href=\"%3$s\" title=\"Atsijungti\">Norite atsijungti?</a></span>"
+
+#: comments.php:164 library/extensions/comments-extensions.php:233
+msgid "Your email is <em>never</em> published nor shared."
+msgstr "Jūsų el. pašto adresas <em>niekada</em> nebus viešinamas ar perduotas tretiesiems asmenims."
+
+#: comments.php:164 library/extensions/comments-extensions.php:233
+msgid "Required fields are marked <span class=\"required\">*</span>"
+msgstr "Būtini laukai pažymėti <span class=\"required\">*</span>"
+
+#: comments.php:167 library/extensions/comments-extensions.php:224
+msgid "Name"
+msgstr "Vardas"
+
+#: 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 "El. paštas"
+
+#: comments.php:177 library/extensions/comments-extensions.php:226
+msgid "Website"
+msgstr "Svetainė"
+
+#: 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 "Galite naudoti šias <abbr xml:lang=\"en\" title=\"HyperText Markup Language\">HTML</abbr> žymes ir atributus:"
+
+#: page.php:58 template-page-fullwidth.php:59
+msgid "Pages: "
+msgstr "Puslapiai: "
+
+#: search.php:56
+msgid "Nothing Found"
+msgstr "Nieko nerasta"
+
+#: search.php:60
+msgid "Sorry, but nothing matched your search criteria. Please try again with some different keywords."
+msgstr "Deja, nepavyko rasti atitikmenų nurodytiems paieškos kriterijams. Bandykite įvesti kitus reikšminius žodžius."
+
+#: library/extensions/content-extensions.php:1346 search.php:70
+msgid "Find"
+msgstr "Ieškoti"
+
+#: library/extensions/comments-extensions.php:120
+msgid "<span>One</span> Comment"
+msgstr "<span>Vienas</span> komentaras"
+
+#: library/extensions/comments-extensions.php:154
+msgid "Post a Comment"
+msgstr "Palikti komentarą"
+
+#: library/extensions/comments-extensions.php:165
+msgid "Post a Reply to %s"
+msgstr "Atsakyti į „%s“"
+
+#: library/extensions/comments-extensions.php:176
+msgid "Comment"
+msgstr "Komentaras"
+
+#: library/extensions/comments-extensions.php:187
+msgid "Cancel reply"
+msgstr ""
+
+#: library/extensions/comments-extensions.php:198
+msgid "Post Comment"
+msgstr "Skelbti komentarą"
+
+#: library/extensions/content-extensions.php:340
+#: library/extensions/header-extensions.php:84
+msgid "Category Archives:"
+msgstr "Kategorijos archyvas:"
+
+#: library/extensions/content-extensions.php:349
+#: library/extensions/header-extensions.php:80
+msgid "Search Results for:"
+msgstr "Vykdyta paieška:"
+
+#: library/extensions/content-extensions.php:355
+#: library/extensions/header-extensions.php:88
+msgid "Tag Archives:"
+msgstr "Žymos archyvas:"
+
+#: library/extensions/content-extensions.php:364
+#: library/extensions/content-extensions.php:373
+msgid "Archives:"
+msgstr ""
+
+#: library/extensions/content-extensions.php:379
+msgid "Daily Archives: <span>%s</span>"
+msgstr "Dienos archyvas: <span>%s</span>"
+
+#: library/extensions/content-extensions.php:383
+msgid "Monthly Archives: <span>%s</span>"
+msgstr "Mėnesio archyvas: <span>%s</span>"
+
+#: library/extensions/content-extensions.php:387
+msgid "Yearly Archives: <span>%s</span>"
+msgstr "Metų archyvas: <span>%s</span>"
+
+#: library/extensions/content-extensions.php:429
+#: library/extensions/content-extensions.php:1728
+msgid "<span class=\"meta-nav\">&laquo;</span> Older posts"
+msgstr "<span class=\"meta-nav\">&laquo;</span> Senesni įrašai"
+
+#: library/extensions/content-extensions.php:431
+#: library/extensions/content-extensions.php:1729
+msgid "Newer posts <span class=\"meta-nav\">&raquo;</span>"
+msgstr "Naujesni įrašai <span class=\"meta-nav\">&raquo;</span>"
+
+#: library/extensions/content-extensions.php:946
+#: library/extensions/content-extensions.php:1460
+msgid "Edit post"
+msgstr "Taisyti įrašą"
+
+#: library/extensions/content-extensions.php:975
+#: library/extensions/header-extensions.php:92
+msgid "Not Found"
+msgstr "Nerasta"
+
+#: library/extensions/content-extensions.php:980
+#: library/extensions/content-extensions.php:1413
+#: library/extensions/content-extensions.php:1417
+msgid "Permalink to "
+msgstr "Nuolatinė nuoroda: "
+
+#: library/extensions/content-extensions.php:1041
+msgid "By "
+msgstr "Parašė "
+
+#: library/extensions/content-extensions.php:1051
+msgid "View all posts by "
+msgstr "Peržiūrėti visus įrašus, kuriuos patalpino "
+
+#: library/extensions/content-extensions.php:1079
+msgid "Published: "
+msgstr "Paskelbtas: "
+
+#: library/extensions/content-extensions.php:1252
+msgid "Archives by Category"
+msgstr "Archyvas pagal kategoriją"
+
+#: library/extensions/content-extensions.php:1280
+msgid "Archives by Month"
+msgstr "Archyvas pagal mėnesį"
+
+#: library/extensions/content-extensions.php:1413
+msgid "Browse the "
+msgstr ""
+
+#: library/extensions/content-extensions.php:1413
+msgid " Archive"
+msgstr ""
+
+#: library/extensions/content-extensions.php:1414
+msgid " archive"
+msgstr ""
+
+#: library/extensions/content-extensions.php:1417
+msgid "Bookmark the "
+msgstr ""
+
+#: library/extensions/content-extensions.php:1418
+msgid "permalink"
+msgstr "nuolatinė nuoroda"
+
+#: library/extensions/content-extensions.php:1572
+msgid "This entry was posted in "
+msgstr "Įrašas paskelbtas kategorijoje "
+
+#: library/extensions/content-extensions.php:1580
+msgid "Also posted in "
+msgstr "Taip pat paskelbtas kategorijoje "
+
+#: library/extensions/content-extensions.php:1583
+msgid "Posted in "
+msgstr "Paskelbtas kategorijoje "
+
+#: library/extensions/content-extensions.php:1609
+msgid " This entry is tagged"
+msgstr ""
+
+#: library/extensions/content-extensions.php:1612
+msgid " and tagged"
+msgstr " ir pažymėtas"
+
+#: library/extensions/content-extensions.php:1615
+msgid " Also tagged "
+msgstr " Taip pat pažymėtas "
+
+#: library/extensions/content-extensions.php:1617
+msgid "Tagged"
+msgstr "Pažymėtas"
+
+#: library/extensions/content-extensions.php:1644
+#: library/extensions/content-extensions.php:1647
+#: library/extensions/content-extensions.php:1650
+msgid "Comment on "
+msgstr "Komentuoti "
+
+#: library/extensions/content-extensions.php:1651
+msgid "Leave a comment"
+msgstr "Palikti komentarą"
+
+#: library/extensions/content-extensions.php:1654
+msgid "Comments closed"
+msgstr "Komentuoti neleidžiama"
+
+#: library/extensions/content-extensions.php:1678
+#: library/extensions/content-extensions.php:1686
+msgid "Post a comment"
+msgstr "Palikti komentarą"
+
+#: library/extensions/content-extensions.php:1679
+msgid " or leave a trackback: "
+msgstr " arba atsiliepti: "
+
+#: library/extensions/content-extensions.php:1680
+#: library/extensions/content-extensions.php:1683
+msgid "Trackback URL for your post"
+msgstr ""
+
+#: library/extensions/content-extensions.php:1680
+#: library/extensions/content-extensions.php:1683
+msgid "Trackback URL"
+msgstr ""
+
+#: library/extensions/content-extensions.php:1682
+msgid " Comments are closed, but you can leave a trackback: "
+msgstr ""
+
+#: library/extensions/content-extensions.php:1685
+msgid " Trackbacks are closed, but you can "
+msgstr ""
+
+#: library/extensions/content-extensions.php:1686
+msgid "post a comment"
+msgstr ""
+
+#: library/extensions/content-extensions.php:1688
+msgid " Both comments and trackbacks are currently closed."
+msgstr ""
+
+#: 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 "Komentaras paliktas %1$s %2$s <span class=\"meta-sep\">|</span> <a href=\"%3$s\" title=\"Komentaro nuoroda\">Nuoroda</a>"
+
+#: library/extensions/discussion-extensions.php:35
+msgid "Edit comment"
+msgstr ""
+
+#: library/extensions/discussion.php:52
+msgid "Reply"
+msgstr "Atsakyti"
+
+#: library/extensions/discussion.php:53
+msgid "Log in to reply."
+msgstr "Kad galėtumėte atsakyti, turite prisijungti"
+
+#: library/extensions/discussion.php:80
+msgid "By %1$s on %2$s at %3$s"
+msgstr "%2$s %3$s parašė %1$s"
+
+#: library/extensions/header-extensions.php:302
+#: library/extensions/widgets.php:157
+msgid "Posts RSS feed"
+msgstr "Įrašų RSS"
+
+#: library/extensions/header-extensions.php:326
+#: library/extensions/widgets.php:158
+msgid "Comments RSS feed"
+msgstr "Komentarų RSS"
+
+#: functions.php:253
+msgid "Primary Menu"
+msgstr ""
+
+#: library/extensions/header-extensions.php:625
+msgid "Skip navigation to the content"
+msgstr "Šokti į turinį, praleidžiant navigaciją"
+
+#: library/extensions/header-extensions.php:625
+msgid "Skip to content"
+msgstr "Šokti į turinį"
+
+#: library/extensions/helpers.php:50 library/extensions/helpers.php:69
+msgid "There is no excerpt because this is a protected post."
+msgstr "Šis įrašas apsaugotas, todėl jo santrauka nepateikiama."
+
+#: library/extensions/shortcodes.php:40
+msgid "Login"
+msgstr "Prisijungti"
+
+#: library/extensions/shortcodes.php:42
+msgid "Logout"
+msgstr "Atsijungti"
+
+#: 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 "Tekstas poraštėje"
+
+#: library/extensions/widgets-extensions.php:34
+msgid "To search, type and hit enter"
+msgstr "Įveskite norimą rasti frazę"
+
+#: library/extensions/widgets-extensions.php:40
+#: library/extensions/widgets.php:56 library/extensions/widgets.php:61
+msgid "Search"
+msgstr "Ieškoti"
+
+#: library/extensions/widgets-extensions.php:72
+msgid "The primary widget area, most often used as a sidebar."
+msgstr ""
+
+#: library/extensions/widgets-extensions.php:87
+msgid "The secondary widget area, most often used as a sidebar."
+msgstr ""
+
+#: library/extensions/widgets-extensions.php:102
+msgid "The 1st widget area in the footer."
+msgstr ""
+
+#: library/extensions/widgets-extensions.php:117
+msgid "The 2nd widget area in the footer."
+msgstr ""
+
+#: library/extensions/widgets-extensions.php:132
+msgid "The 3rd widget area in the footer."
+msgstr ""
+
+#: library/extensions/widgets-extensions.php:147
+msgid "The top widget area displayed on the index page."
+msgstr ""
+
+#: library/extensions/widgets-extensions.php:162
+msgid "The widget area inserted after x posts on the index page."
+msgstr ""
+
+#: library/extensions/widgets-extensions.php:177
+msgid "The bottom widget area displayed on the index page."
+msgstr ""
+
+#: library/extensions/widgets-extensions.php:192
+msgid "The top widget area displayed on a single post."
+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:222
+msgid "The bottom widget area displayed on a single post."
+msgstr ""
+
+#: library/extensions/widgets-extensions.php:237
+msgid "The top widget area displayed on a page."
+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 "Pavadinimas:"
+
+#: 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 "Meta"
+
+#: 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 saitai"
+
+#: library/extensions/widgets.php:157
+msgid "All posts"
+msgstr "Visi įrašai"
+
+#: library/extensions/widgets.php:158
+msgid "All comments"
+msgstr "Visi komentarai"
+
+#: archives.php:20 template-page-blog.php:22
+msgid "The template %s"
+msgstr ""
+
+#: comments.php:24
+msgid "Please do not load this page directly."
+msgstr ""
+
+#: comments.php:111
+msgid "Trackbacks"
+msgstr ""
+
+#: library/extensions/comments-extensions.php:131
+msgid "Comments"
+msgstr ""
+
+#: library/extensions/content-extensions.php:334
+msgid "Author Archives:"
+msgstr ""
+
+#: library/extensions/content-extensions.php:1340
+msgid "Apologies, but we were unable to find what you were looking for. Perhaps searching will help."
+msgstr ""
+
+#: library/extensions/content-extensions.php:1364
+msgid "Read More %s"
+msgstr ""
+
+#: library/extensions/content-extensions.php:1645
+msgid "Responses"
+msgstr ""
+
+#: library/extensions/content-extensions.php:1648
+msgid "Response"
+msgstr ""
+
+#: library/extensions/discussion.php:37
+msgid "Your comment is awaiting moderation"
+msgstr ""
+
+#: library/extensions/discussion.php:90
+msgid "Your trackback is awaiting moderation"
+msgstr ""
+
+#: library/extensions/theme-options.php:56
+msgid "Remove Legacy Options"
+msgstr ""
+
+#: library/extensions/theme-options.php:204
+msgid "For more information:"
+msgstr ""
+
+#: library/extensions/theme-options.php:206
+msgid "For support:"
+msgstr ""
+
+#: library/extensions/theme-options.php:208
+msgid "forums"
+msgstr ""
+
+#: library/extensions/theme-options.php:212
+msgid "The options below are enabled by the Thematic Theme framework and/or a child theme."
+msgstr ""
+
+#: 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 ""
+
+#: library/extensions/theme-options.php:219
+msgid "Overview"
+msgstr ""
+
+#: 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 ""
+
+#: library/extensions/theme-options.php:262
+msgid "%s Theme Options"
+msgstr ""
+
+#: library/extensions/theme-options.php:276
+msgid "Save Changes"
+msgstr ""
+
+#: 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 ""
+
+#: library/extensions/theme-options.php:324
+msgid "Display a"
+msgstr ""
+
+#: library/extensions/theme-options.php:324
+msgid "with the author's avatar, bio and email on the author page."
+msgstr ""
+
+#: library/extensions/theme-options.php:337
+msgid "You can use HTML and shortcodes in your footer text. Shortcode examples"
+msgstr ""
+
+#: 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 ""
+
+#: 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 ""
+
+#: template-page-blog.php:22
+msgid "You can include a %s in a childtheme"
+msgstr ""
\ No newline at end of file
diff --git a/wp-content/themes/thematic/library/languages/pl_PL.po b/wp-content/themes/thematic/library/languages/pl_PL.po
index fef39bf5a6b9b354be337c49c4ea36f4c14fed55..c0954a083376a405ab7fcb22029ac21aca846a68 100644
--- a/wp-content/themes/thematic/library/languages/pl_PL.po
+++ b/wp-content/themes/thematic/library/languages/pl_PL.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: pol\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-24 16:45+0100\n"
+"POT-Creation-Date: 2011-04-27 15:18+0100\n"
 "PO-Revision-Date: \n"
 "Last-Translator: Mariusz Jamro <mariusz.jamro@gmail.com>\n"
 "Language-Team:  <mariusz.jamro@gmail.com>\n"
@@ -10,489 +10,559 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: c:\xampp\htdocs\wupperpiraten\wp-content\themes\thematic/404.php:10
-msgid "Apologies, but we were unable to find what you were looking for. Perhaps  searching will help."
-msgstr "Przykro nam, ale nie znaleziono strony której szukałeś. Spróbuj skorzystać z wyszukiwarki."
-
-#: c:\xampp\htdocs\wupperpiraten\wp-content\themes\thematic/404.php:15
-#: c:\xampp\htdocs\wupperpiraten\wp-content\themes\thematic/search.php:58
-msgid "Find"
-msgstr "Szukaj"
-
-#: c:\xampp\htdocs\wupperpiraten\wp-content\themes\thematic/archive.php:16
-#, php-format
-msgid "Daily Archives: <span>%s</span>"
-msgstr "Archiwum dzienne: <span>%s</span>"
-
-#: c:\xampp\htdocs\wupperpiraten\wp-content\themes\thematic/archive.php:18
-#, php-format
-msgid "Monthly Archives: <span>%s</span>"
-msgstr "Archiwum miesięczne: <span>%s</span>"
-
-#: c:\xampp\htdocs\wupperpiraten\wp-content\themes\thematic/archive.php:20
-#, php-format
-msgid "Yearly Archives: <span>%s</span>"
-msgstr "Archiwum roczne: <span>%s</span>"
-
-#: c:\xampp\htdocs\wupperpiraten\wp-content\themes\thematic/archive.php:22
-msgid "Blog Archives"
-msgstr "Archiwum"
-
-#: c:\xampp\htdocs\wupperpiraten\wp-content\themes\thematic/archive.php:31
-#: c:\xampp\htdocs\wupperpiraten\wp-content\themes\thematic/archive.php:53
-#: c:\xampp\htdocs\wupperpiraten\wp-content\themes\thematic/author.php:21
-#: c:\xampp\htdocs\wupperpiraten\wp-content\themes\thematic/author.php:56
-#: c:\xampp\htdocs\wupperpiraten\wp-content\themes\thematic/category.php:20
-#: c:\xampp\htdocs\wupperpiraten\wp-content\themes\thematic/category.php:42
-#: c:\xampp\htdocs\wupperpiraten\wp-content\themes\thematic/index.php:17
-#: c:\xampp\htdocs\wupperpiraten\wp-content\themes\thematic/index.php:49
-#: c:\xampp\htdocs\wupperpiraten\wp-content\themes\thematic/search.php:21
-#: c:\xampp\htdocs\wupperpiraten\wp-content\themes\thematic/search.php:43
-msgid "<span class=\"meta-nav\">&laquo;</span> Older posts"
-msgstr "<span class=\"meta-nav\">&laquo;</span> Starsze wpisy"
-
-#: c:\xampp\htdocs\wupperpiraten\wp-content\themes\thematic/archive.php:32
-#: c:\xampp\htdocs\wupperpiraten\wp-content\themes\thematic/archive.php:54
-#: c:\xampp\htdocs\wupperpiraten\wp-content\themes\thematic/author.php:22
-#: c:\xampp\htdocs\wupperpiraten\wp-content\themes\thematic/author.php:57
-#: c:\xampp\htdocs\wupperpiraten\wp-content\themes\thematic/category.php:21
-#: c:\xampp\htdocs\wupperpiraten\wp-content\themes\thematic/category.php:43
-#: c:\xampp\htdocs\wupperpiraten\wp-content\themes\thematic/index.php:18
-#: c:\xampp\htdocs\wupperpiraten\wp-content\themes\thematic/index.php:50
-#: c:\xampp\htdocs\wupperpiraten\wp-content\themes\thematic/search.php:22
-#: c:\xampp\htdocs\wupperpiraten\wp-content\themes\thematic/search.php:44
-msgid "Newer posts <span class=\"meta-nav\">&raquo;</span>"
-msgstr "Nowsze wpisy <span class=\"meta-nav\">&raquo;</span>"
-
-#: c:\xampp\htdocs\wupperpiraten\wp-content\themes\thematic/archive.php:41
-#: c:\xampp\htdocs\wupperpiraten\wp-content\themes\thematic/attachment.php:20
-#: c:\xampp\htdocs\wupperpiraten\wp-content\themes\thematic/author.php:44
-#: c:\xampp\htdocs\wupperpiraten\wp-content\themes\thematic/category.php:30
-#: c:\xampp\htdocs\wupperpiraten\wp-content\themes\thematic/index.php:30
-#: c:\xampp\htdocs\wupperpiraten\wp-content\themes\thematic/search.php:31
-msgid "Read More <span class=\"meta-nav\">&raquo;</span>"
-msgstr "Czytaj dalej <span class=\"meta-nav\">&raquo;</span>"
-
-#: c:\xampp\htdocs\wupperpiraten\wp-content\themes\thematic/archives.php:20
-msgid "Archives by Category"
-msgstr "Archiwum wg. Kategorii"
-
-#: c:\xampp\htdocs\wupperpiraten\wp-content\themes\thematic/archives.php:26
-msgid "Archives by Month"
-msgstr "Archiwum wg. Miesiąca"
-
-#: c:\xampp\htdocs\wupperpiraten\wp-content\themes\thematic/archives.php:32
-#: c:\xampp\htdocs\wupperpiraten\wp-content\themes\thematic/comments-legacy.php:39
-#: c:\xampp\htdocs\wupperpiraten\wp-content\themes\thematic/comments-legacy.php:65
-#: c:\xampp\htdocs\wupperpiraten\wp-content\themes\thematic/links.php:20
-#: c:\xampp\htdocs\wupperpiraten\wp-content\themes\thematic/page.php:16
+#: 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 "Edytuj"
 
-#: c:\xampp\htdocs\wupperpiraten\wp-content\themes\thematic/attachment.php:22
-#: c:\xampp\htdocs\wupperpiraten\wp-content\themes\thematic/index.php:32
+#: c:\users\Chris\Desktop\thematic/attachment.php:49
 msgid "Pages:"
 msgstr "Strony:"
 
-#: c:\xampp\htdocs\wupperpiraten\wp-content\themes\thematic/author.php:15
-msgid "Author Archives: "
-msgstr "Archiwum Autora: "
-
-#: c:\xampp\htdocs\wupperpiraten\wp-content\themes\thematic/author.php:33
+#: c:\users\Chris\Desktop\thematic/author.php:61
 msgid "Email "
 msgstr "Email "
 
-#: c:\xampp\htdocs\wupperpiraten\wp-content\themes\thematic/category.php:13
-msgid "Category Archives:"
-msgstr "Archiwum Kategorii:"
-
-#: c:\xampp\htdocs\wupperpiraten\wp-content\themes\thematic/comments-legacy.php:9
-#: c:\xampp\htdocs\wupperpiraten\wp-content\themes\thematic/comments.php:9
+#: c:\users\Chris\Desktop\thematic/comments.php:10
 msgid "This post is password protected. Enter the password to view any comments."
 msgstr "Ten wpis jest chroniony hasłem. Proszę podaj hasło aby przeglądać komentarze."
 
-#: c:\xampp\htdocs\wupperpiraten\wp-content\themes\thematic/comments-legacy.php:28
-#: c:\xampp\htdocs\wupperpiraten\wp-content\themes\thematic/comments.php:28
-#, php-format
-msgid "<span>%d</span> Comments"
-msgstr "<span>%d</span> Komentarze"
-
-#: c:\xampp\htdocs\wupperpiraten\wp-content\themes\thematic/comments-legacy.php:28
-#: c:\xampp\htdocs\wupperpiraten\wp-content\themes\thematic/comments.php:28
-msgid "<span>One</span> Comment"
-msgstr "<span>Jeden</span> Komentarz"
-
-#: c:\xampp\htdocs\wupperpiraten\wp-content\themes\thematic/comments-legacy.php:35
-#, 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 "Opublikowano %1$s at %2$s <span class=\"meta-sep\">|</span> <a href=\"%3$s\" title=\"Permalink do tego komentarza\">Permalink</a>"
-
-#: c:\xampp\htdocs\wupperpiraten\wp-content\themes\thematic/comments-legacy.php:40
-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'>Twój komentarz oczekuje na moderacje.</span>\n"
-
-#: c:\xampp\htdocs\wupperpiraten\wp-content\themes\thematic/comments-legacy.php:54
-#: c:\xampp\htdocs\wupperpiraten\wp-content\themes\thematic/comments.php:46
+#: c:\users\Chris\Desktop\thematic/comments.php:52
 #, php-format
 msgid "<span>%d</span> Trackbacks"
 msgstr "<span>%d</span> Trackback'i"
 
-#: c:\xampp\htdocs\wupperpiraten\wp-content\themes\thematic/comments-legacy.php:54
-#: c:\xampp\htdocs\wupperpiraten\wp-content\themes\thematic/comments.php:46
+#: c:\users\Chris\Desktop\thematic/comments.php:52
 msgid "<span>One</span> Trackback"
 msgstr "<span>Jeden</span> Trackback"
 
-#: c:\xampp\htdocs\wupperpiraten\wp-content\themes\thematic/comments-legacy.php:61
-#, php-format
-msgid "By %1$s on %2$s at %3$s"
-msgstr "Autor %1$s  %2$s o %3$s"
-
-#: c:\xampp\htdocs\wupperpiraten\wp-content\themes\thematic/comments-legacy.php:66
-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\">Twój trackback oczekuje na moderacje.</span>\\n"
-
-#: c:\xampp\htdocs\wupperpiraten\wp-content\themes\thematic/comments-legacy.php:79
-#: c:\xampp\htdocs\wupperpiraten\wp-content\themes\thematic/comments.php:60
-msgid "Post a Comment"
-msgstr "Skomentuj"
-
-#: c:\xampp\htdocs\wupperpiraten\wp-content\themes\thematic/comments-legacy.php:82
-#: c:\xampp\htdocs\wupperpiraten\wp-content\themes\thematic/comments.php:65
+#: 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 "Musisz być <a href=\"%s\" title=\"Log in\">zalogowany</a> aby dodać komentarz."
 
-#: c:\xampp\htdocs\wupperpiraten\wp-content\themes\thematic/comments-legacy.php:90
-#: c:\xampp\htdocs\wupperpiraten\wp-content\themes\thematic/comments.php:73
+#: 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 "<span class=\"loggedin\">Zalogowany jako <a href=\"%1$s\" title=\"Logged in as %2$s\">%2$s</a>.</span> <span class=\"logout\"><a href=\"%3$s\" title=\"Wyloguj się.\">Wylogować?</a></span>"
 
-#: c:\xampp\htdocs\wupperpiraten\wp-content\themes\thematic/comments-legacy.php:97
-#: c:\xampp\htdocs\wupperpiraten\wp-content\themes\thematic/comments.php:80
+#: c:\users\Chris\Desktop\thematic/comments.php:92
 msgid "Your email is <em>never</em> published nor shared."
 msgstr "Twój adres email <em>nie zostanie</em> opublikowany i nie będzie rozpowszechniany."
 
-#: c:\xampp\htdocs\wupperpiraten\wp-content\themes\thematic/comments-legacy.php:97
-#: c:\xampp\htdocs\wupperpiraten\wp-content\themes\thematic/comments.php:80
+#: c:\users\Chris\Desktop\thematic/comments.php:92
 msgid "Required fields are marked <span class=\"required\">*</span>"
 msgstr "Wymagane pola są oznaczone <span class=\"required\">*</span>"
 
-#: c:\xampp\htdocs\wupperpiraten\wp-content\themes\thematic/comments-legacy.php:100
-#: c:\xampp\htdocs\wupperpiraten\wp-content\themes\thematic/comments.php:83
+#: c:\users\Chris\Desktop\thematic/comments.php:95
 msgid "Name"
 msgstr "Imię"
 
-#: c:\xampp\htdocs\wupperpiraten\wp-content\themes\thematic/comments-legacy.php:100
-#: c:\xampp\htdocs\wupperpiraten\wp-content\themes\thematic/comments-legacy.php:105
-#: c:\xampp\htdocs\wupperpiraten\wp-content\themes\thematic/comments.php:83
-#: c:\xampp\htdocs\wupperpiraten\wp-content\themes\thematic/comments.php:88
+#: 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:\xampp\htdocs\wupperpiraten\wp-content\themes\thematic/comments-legacy.php:105
-#: c:\xampp\htdocs\wupperpiraten\wp-content\themes\thematic/comments.php:88
+#: c:\users\Chris\Desktop\thematic/comments.php:100
 msgid "Email"
 msgstr "Email"
 
-#: c:\xampp\htdocs\wupperpiraten\wp-content\themes\thematic/comments-legacy.php:110
-#: c:\xampp\htdocs\wupperpiraten\wp-content\themes\thematic/comments.php:93
+#: c:\users\Chris\Desktop\thematic/comments.php:105
 msgid "Website"
 msgstr "Strona"
 
-#: c:\xampp\htdocs\wupperpiraten\wp-content\themes\thematic/comments-legacy.php:117
-#: c:\xampp\htdocs\wupperpiraten\wp-content\themes\thematic/comments.php:100
-msgid "Comment"
-msgstr "Komentarz"
-
-#: c:\xampp\htdocs\wupperpiraten\wp-content\themes\thematic/comments-legacy.php:123
-#: c:\xampp\htdocs\wupperpiraten\wp-content\themes\thematic/comments.php:108
-msgid "Post Comment"
-msgstr "Skomentuj"
-
-#: c:\xampp\htdocs\wupperpiraten\wp-content\themes\thematic/comments.php:60
-#, php-format
-msgid "Post a Reply to %s"
-msgstr "Napisz odpowiedź na %s."
-
-#: c:\xampp\htdocs\wupperpiraten\wp-content\themes\thematic/header.php:29
-msgid "Posts RSS feed"
-msgstr "Kanał RSS wpisów"
+#: c:\users\Chris\Desktop\thematic/comments.php:117
+msgid "You may use these <abbr title=\"HyperText Markup Language\">HTML</abbr> tags and attributes:"
+msgstr "Możesz używać następujących tagów i znaczników <abbr title=\"HyperText Markup Language\">HTML</abbr>:"
 
-#: c:\xampp\htdocs\wupperpiraten\wp-content\themes\thematic/header.php:30
-msgid "Comments RSS feed"
-msgstr "Kanał RSS komentarzy"
-
-#: c:\xampp\htdocs\wupperpiraten\wp-content\themes\thematic/header.php:53
-msgid "Skip navigation to the content"
-msgstr "Skocz do treści strony"
-
-#: c:\xampp\htdocs\wupperpiraten\wp-content\themes\thematic/header.php:53
-msgid "Skip to content"
-msgstr "Skocz do treści"
-
-#: c:\xampp\htdocs\wupperpiraten\wp-content\themes\thematic/page.php:14
+#: c:\users\Chris\Desktop\thematic/page.php:48
 msgid "Pages: "
 msgstr "Strony: "
 
-#: c:\xampp\htdocs\wupperpiraten\wp-content\themes\thematic/search.php:15
-msgid "Search Results for:"
-msgstr "Wyniki wyszukiwania:"
-
-#: c:\xampp\htdocs\wupperpiraten\wp-content\themes\thematic/search.php:51
+#: c:\users\Chris\Desktop\thematic/search.php:44
 msgid "Nothing Found"
 msgstr "Nic nie znaleziono"
 
-#: c:\xampp\htdocs\wupperpiraten\wp-content\themes\thematic/search.php:53
+#: c:\users\Chris\Desktop\thematic/search.php:46
 msgid "Sorry, but nothing matched your search criteria. Please try again with some different keywords."
 msgstr "Przykro nam, ale nie znaleziono nic pasującego do Twoich kryteriów wyszukiwania. Proszę spróbuj z innymi słowami kluczowymi."
 
-#: c:\xampp\htdocs\wupperpiraten\wp-content\themes\thematic/sidebar.php:5
-#: c:\xampp\htdocs\wupperpiraten\wp-content\themes\thematic/sidebar.php:9
-msgid "Search"
+#: c:\users\Chris\Desktop\thematic/search.php:51
+msgid "Find"
 msgstr "Szukaj"
 
-#: c:\xampp\htdocs\wupperpiraten\wp-content\themes\thematic/sidebar.php:15
-msgid "Pages"
-msgstr "Strony"
+#: c:\users\Chris\Desktop\thematic/library/extensions/comments-extensions.php:76
+msgid "<span>One</span> Comment"
+msgstr "<span>Jeden</span> Komentarz"
+
+#: c:\users\Chris\Desktop\thematic/library/extensions/comments-extensions.php:83
+#, php-format
+msgid "<span>%d</span> Comments"
+msgstr "<span>%d</span> Komentarze"
 
-#: c:\xampp\htdocs\wupperpiraten\wp-content\themes\thematic/sidebar.php:22
-msgid "Categories"
-msgstr "Kategorie"
+#: c:\users\Chris\Desktop\thematic/library/extensions/comments-extensions.php:96
+msgid "Post a Comment"
+msgstr "Skomentuj"
 
-#: c:\xampp\htdocs\wupperpiraten\wp-content\themes\thematic/sidebar.php:30
-msgid "Archives"
-msgstr "Archiwa"
+#: c:\users\Chris\Desktop\thematic/library/extensions/comments-extensions.php:103
+#, php-format
+msgid "Post a Reply to %s"
+msgstr "Napisz odpowiedź na %s."
 
-#: c:\xampp\htdocs\wupperpiraten\wp-content\themes\thematic/sidebar.php:47
-msgid "RSS Feeds"
-msgstr "Kanał RSS"
+#: c:\users\Chris\Desktop\thematic/library/extensions/comments-extensions.php:110
+msgid "Comment"
+msgstr "Komentarz"
 
-#: c:\xampp\htdocs\wupperpiraten\wp-content\themes\thematic/sidebar.php:49
-msgid "All posts"
-msgstr "Wszystkie wpisy"
+#: c:\users\Chris\Desktop\thematic/library/extensions/comments-extensions.php:118
+msgid "Cancel reply"
+msgstr "Anuluj odpowiedź"
 
-#: c:\xampp\htdocs\wupperpiraten\wp-content\themes\thematic/sidebar.php:50
-msgid "All comments"
-msgstr "Wszystkie komentarze"
+#: c:\users\Chris\Desktop\thematic/library/extensions/comments-extensions.php:125
+msgid "Post Comment"
+msgstr "Skomentuj"
 
-#: c:\xampp\htdocs\wupperpiraten\wp-content\themes\thematic/sidebar.php:55
-msgid "Meta"
-msgstr "Meta"
+#: c:\users\Chris\Desktop\thematic/library/extensions/content-extensions.php:212
+msgid "Author Archives: "
+msgstr "Archiwum Autora: "
 
-#: c:\xampp\htdocs\wupperpiraten\wp-content\themes\thematic/tag.php:13
+#: c:\users\Chris\Desktop\thematic/library/extensions/content-extensions.php:218
+msgid "Category Archives:"
+msgstr "Archiwum Kategorii:"
+
+#: c:\users\Chris\Desktop\thematic/library/extensions/content-extensions.php:227
+msgid "Search Results for:"
+msgstr "Wyniki wyszukiwania:"
+
+#: c:\users\Chris\Desktop\thematic/library/extensions/content-extensions.php:233
 msgid "Tag Archives:"
 msgstr "Archiwum Tagów:"
 
-#: c:\xampp\htdocs\wupperpiraten\wp-content\themes\thematic/library/extensions/discussion.php:22
-msgid "Reply"
-msgstr "Odpowiedź"
+#: c:\users\Chris\Desktop\thematic/library/extensions/content-extensions.php:242
+#: c:\users\Chris\Desktop\thematic/library/extensions/content-extensions.php:250
+msgid "Archives:"
+msgstr "Archiwa:"
 
-#: c:\xampp\htdocs\wupperpiraten\wp-content\themes\thematic/library/extensions/discussion.php:23
-msgid "Log in to reply."
-msgstr "Zaloguj się aby odpowiedzieć."
+#: c:\users\Chris\Desktop\thematic/library/extensions/content-extensions.php:256
+#, php-format
+msgid "Daily Archives: <span>%s</span>"
+msgstr "Archiwum dzienne: <span>%s</span>"
+
+#: c:\users\Chris\Desktop\thematic/library/extensions/content-extensions.php:260
+#, php-format
+msgid "Monthly Archives: <span>%s</span>"
+msgstr "Archiwum miesięczne: <span>%s</span>"
+
+#: c:\users\Chris\Desktop\thematic/library/extensions/content-extensions.php:264
+#, php-format
+msgid "Yearly Archives: <span>%s</span>"
+msgstr "Archiwum roczne: <span>%s</span>"
+
+#: c:\users\Chris\Desktop\thematic/library/extensions/content-extensions.php:268
+msgid "Blog Archives"
+msgstr "Archiwum blogu"
 
-#: c:\xampp\htdocs\wupperpiraten\wp-content\themes\thematic/library/extensions/hooks-filters.php:37
+#: 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\">&laquo;</span> Older posts"
+msgstr "<span class=\"meta-nav\">&laquo;</span> Starsze wpisy"
+
+#: 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\">&raquo;</span>"
+msgstr "Nowsze wpisy <span class=\"meta-nav\">&raquo;</span>"
+
+#: c:\users\Chris\Desktop\thematic/library/extensions/content-extensions.php:672
+#: c:\users\Chris\Desktop\thematic/library/extensions/content-extensions.php:1041
+msgid "Edit post"
+msgstr "Edytuj wpis"
+
+#: c:\users\Chris\Desktop\thematic/library/extensions/content-extensions.php:692
 msgid "Not Found"
 msgstr "Nie Znaleziono"
 
-#: c:\xampp\htdocs\wupperpiraten\wp-content\themes\thematic/library/extensions/hooks-filters.php:42
-#: c:\xampp\htdocs\wupperpiraten\wp-content\themes\thematic/library/extensions/hooks-filters.php:126
+#: 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 "Permalink do "
 
-#: c:\xampp\htdocs\wupperpiraten\wp-content\themes\thematic/library/extensions/hooks-filters.php:50
+#: c:\users\Chris\Desktop\thematic/library/extensions/content-extensions.php:742
 msgid "By "
 msgstr "Przez "
 
-#: c:\xampp\htdocs\wupperpiraten\wp-content\themes\thematic/library/extensions/hooks-filters.php:52
+#: c:\users\Chris\Desktop\thematic/library/extensions/content-extensions.php:745
 msgid "View all posts by "
 msgstr "Zobacz wszystkie wpisy "
 
-#: c:\xampp\htdocs\wupperpiraten\wp-content\themes\thematic/library/extensions/hooks-filters.php:76
-msgid "Edit post"
-msgstr "Edytuj wpis"
+#: c:\users\Chris\Desktop\thematic/library/extensions/content-extensions.php:763
+msgid "Published: "
+msgstr "Opublikowano: "
+
+#: c:\users\Chris\Desktop\thematic/library/extensions/content-extensions.php:888
+msgid "Archives by Category"
+msgstr "Archiwum wg. Kategorii"
+
+#: c:\users\Chris\Desktop\thematic/library/extensions/content-extensions.php:907
+msgid "Archives by Month"
+msgstr "Archiwum wg. Miesiąca"
+
+#: 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 "Przykro nam, ale nie znaleziono strony której szukałeś. Spróbuj skorzystać z wyszukiwarki."
+
+#: c:\users\Chris\Desktop\thematic/library/extensions/content-extensions.php:967
+msgid "Read More <span class=\"meta-nav\">&raquo;</span>"
+msgstr "Czytaj dalej <span class=\"meta-nav\">&raquo;</span>"
+
+#: c:\users\Chris\Desktop\thematic/library/extensions/content-extensions.php:1001
+msgid "Browse the "
+msgstr "Przeglądaj "
+
+#: c:\users\Chris\Desktop\thematic/library/extensions/content-extensions.php:1001
+msgid " Archive"
+msgstr " Archiwum"
+
+#: c:\users\Chris\Desktop\thematic/library/extensions/content-extensions.php:1002
+msgid " archive"
+msgstr " archiwizuj"
+
+#: c:\users\Chris\Desktop\thematic/library/extensions/content-extensions.php:1006
+msgid "Bookmark the "
+msgstr "Dodaj do zakładek "
 
-#: c:\xampp\htdocs\wupperpiraten\wp-content\themes\thematic/library/extensions/hooks-filters.php:83
+#: c:\users\Chris\Desktop\thematic/library/extensions/content-extensions.php:1007
+msgid "permalink"
+msgstr "permalink"
+
+#: c:\users\Chris\Desktop\thematic/library/extensions/content-extensions.php:1123
 msgid "This entry was posted in "
 msgstr "Ten wpis umieszczono w kategorii "
 
-#: c:\xampp\htdocs\wupperpiraten\wp-content\themes\thematic/library/extensions/hooks-filters.php:86
+#: c:\users\Chris\Desktop\thematic/library/extensions/content-extensions.php:1131
 msgid "Also posted in "
 msgstr "Opublikowano również w "
 
-#: c:\xampp\htdocs\wupperpiraten\wp-content\themes\thematic/library/extensions/hooks-filters.php:89
+#: c:\users\Chris\Desktop\thematic/library/extensions/content-extensions.php:1134
 msgid "Posted in "
 msgstr "Opublikowano w "
 
-#: c:\xampp\htdocs\wupperpiraten\wp-content\themes\thematic/library/extensions/hooks-filters.php:95
+#: c:\users\Chris\Desktop\thematic/library/extensions/content-extensions.php:1152
+msgid " This entry is tagged"
+msgstr " Ten wpis umieszczono w kategorii"
+
+#: c:\users\Chris\Desktop\thematic/library/extensions/content-extensions.php:1155
 msgid " and tagged"
 msgstr "i otagowano jako"
 
-#: c:\xampp\htdocs\wupperpiraten\wp-content\themes\thematic/library/extensions/hooks-filters.php:98
+#: c:\users\Chris\Desktop\thematic/library/extensions/content-extensions.php:1158
 msgid " Also tagged "
 msgstr "Również otagowano "
 
-#: c:\xampp\htdocs\wupperpiraten\wp-content\themes\thematic/library/extensions/hooks-filters.php:100
+#: c:\users\Chris\Desktop\thematic/library/extensions/content-extensions.php:1160
 msgid "Tagged"
 msgstr "Otagowano jako"
 
-#: c:\xampp\htdocs\wupperpiraten\wp-content\themes\thematic/library/extensions/hooks-filters.php:108
-#: c:\xampp\htdocs\wupperpiraten\wp-content\themes\thematic/library/extensions/hooks-filters.php:111
-#: c:\xampp\htdocs\wupperpiraten\wp-content\themes\thematic/library/extensions/hooks-filters.php:114
+#: 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 "Komentarze do "
 
-#: c:\xampp\htdocs\wupperpiraten\wp-content\themes\thematic/library/extensions/hooks-filters.php:109
+#: c:\users\Chris\Desktop\thematic/library/extensions/content-extensions.php:1180
 msgid " Comments"
 msgstr " Komentarze"
 
-#: c:\xampp\htdocs\wupperpiraten\wp-content\themes\thematic/library/extensions/hooks-filters.php:112
+#: c:\users\Chris\Desktop\thematic/library/extensions/content-extensions.php:1183
 msgid " Comment"
 msgstr " Komentarz"
 
-#: c:\xampp\htdocs\wupperpiraten\wp-content\themes\thematic/library/extensions/hooks-filters.php:115
+#: c:\users\Chris\Desktop\thematic/library/extensions/content-extensions.php:1186
 msgid "Leave a comment"
 msgstr "Skomentuj"
 
-#: c:\xampp\htdocs\wupperpiraten\wp-content\themes\thematic/library/extensions/hooks-filters.php:118
+#: c:\users\Chris\Desktop\thematic/library/extensions/content-extensions.php:1189
 msgid "Comments closed"
 msgstr "Komentowanie zostało zablokowane"
 
-#: c:\xampp\htdocs\wupperpiraten\wp-content\themes\thematic/library/extensions/hooks-filters.php:126
-msgid ". Bookmark the "
-msgstr ". Możesz dodać go do zakładek "
-
-#: c:\xampp\htdocs\wupperpiraten\wp-content\themes\thematic/library/extensions/hooks-filters.php:127
-msgid "permalink"
-msgstr "permalink"
-
-#: c:\xampp\htdocs\wupperpiraten\wp-content\themes\thematic/library/extensions/hooks-filters.php:129
-#: c:\xampp\htdocs\wupperpiraten\wp-content\themes\thematic/library/extensions/hooks-filters.php:137
+#: c:\users\Chris\Desktop\thematic/library/extensions/content-extensions.php:1205
+#: c:\users\Chris\Desktop\thematic/library/extensions/content-extensions.php:1213
 msgid "Post a comment"
 msgstr "Dodaj komentarz"
 
-#: c:\xampp\htdocs\wupperpiraten\wp-content\themes\thematic/library/extensions/hooks-filters.php:130
+#: c:\users\Chris\Desktop\thematic/library/extensions/content-extensions.php:1206
 msgid " or leave a trackback: "
 msgstr " lub dodaj odpowiedź (trackback): "
 
-#: c:\xampp\htdocs\wupperpiraten\wp-content\themes\thematic/library/extensions/hooks-filters.php:131
-#: c:\xampp\htdocs\wupperpiraten\wp-content\themes\thematic/library/extensions/hooks-filters.php:134
+#: c:\users\Chris\Desktop\thematic/library/extensions/content-extensions.php:1207
+#: c:\users\Chris\Desktop\thematic/library/extensions/content-extensions.php:1210
 msgid "Trackback URL for your post"
 msgstr "Adres URL Trackback'u do tego wpisu"
 
-#: c:\xampp\htdocs\wupperpiraten\wp-content\themes\thematic/library/extensions/hooks-filters.php:131
-#: c:\xampp\htdocs\wupperpiraten\wp-content\themes\thematic/library/extensions/hooks-filters.php:134
+#: c:\users\Chris\Desktop\thematic/library/extensions/content-extensions.php:1207
+#: c:\users\Chris\Desktop\thematic/library/extensions/content-extensions.php:1210
 msgid "Trackback URL"
 msgstr "Trackback URL"
 
-#: c:\xampp\htdocs\wupperpiraten\wp-content\themes\thematic/library/extensions/hooks-filters.php:133
+#: c:\users\Chris\Desktop\thematic/library/extensions/content-extensions.php:1209
 msgid " Comments are closed, but you can leave a trackback: "
 msgstr "Komentowanie zostało zablokowane, ale możesz dodać odpowiedź (trackback): "
 
-#: c:\xampp\htdocs\wupperpiraten\wp-content\themes\thematic/library/extensions/hooks-filters.php:136
+#: c:\users\Chris\Desktop\thematic/library/extensions/content-extensions.php:1212
 msgid " Trackbacks are closed, but you can "
 msgstr " Dodawanie odpowiedzi Trackback do tego wpisu zostało zablokowane, ale możesz "
 
-#: c:\xampp\htdocs\wupperpiraten\wp-content\themes\thematic/library/extensions/hooks-filters.php:137
+#: c:\users\Chris\Desktop\thematic/library/extensions/content-extensions.php:1213
 msgid "post a comment"
 msgstr "dodać komentarz"
 
-#: c:\xampp\htdocs\wupperpiraten\wp-content\themes\thematic/library/extensions/hooks-filters.php:139
+#: c:\users\Chris\Desktop\thematic/library/extensions/content-extensions.php:1215
 msgid " Both comments and trackbacks are currently closed."
 msgstr "Komentarze i odpowiedzi (trackback) zostały zablokowane."
 
-#: c:\xampp\htdocs\wupperpiraten\wp-content\themes\thematic/library/extensions/theme-options.php:13
-#: c:\xampp\htdocs\wupperpiraten\wp-content\themes\thematic\library\extensions/theme-options.php:13
+#: 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 "Opublikowano %1$s at %2$s <span class=\"meta-sep\">|</span> <a href=\"%3$s\" title=\"Permalink do tego komentarza\">Permalink</a>"
+
+#: c:\users\Chris\Desktop\thematic/library/extensions/discussion-extensions.php:21
+msgid "Edit comment"
+msgstr "Edytuj komentarz"
+
+#: 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'>Twój komentarz oczekuje na moderacje.</span>\n"
+
+#: c:\users\Chris\Desktop\thematic/library/extensions/discussion.php:19
+msgid "Reply"
+msgstr "Odpowiedź"
+
+#: c:\users\Chris\Desktop\thematic/library/extensions/discussion.php:20
+msgid "Log in to reply."
+msgstr "Zaloguj się aby odpowiedzieć."
+
+#: c:\users\Chris\Desktop\thematic/library/extensions/discussion.php:35
+#, php-format
+msgid "By %1$s on %2$s at %3$s"
+msgstr "Autor %1$s  %2$s o %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\">Twój trackback oczekuje na moderacje.</span>\\n"
+
+#: c:\users\Chris\Desktop\thematic/library/extensions/header-extensions.php:262
+#: c:\users\Chris\Desktop\thematic/library/extensions/widgets.php:138
+msgid "Posts RSS feed"
+msgstr "Kanał RSS wpisów"
+
+#: c:\users\Chris\Desktop\thematic/library/extensions/header-extensions.php:280
+#: c:\users\Chris\Desktop\thematic/library/extensions/widgets.php:139
+msgid "Comments RSS feed"
+msgstr "Kanał RSS komentarzy"
+
+#: c:\users\Chris\Desktop\thematic/library/extensions/header-extensions.php:357
+msgid "Primary Menu"
+msgstr "Menu główne"
+
+#: c:\users\Chris\Desktop\thematic/library/extensions/header-extensions.php:467
+msgid "Skip navigation to the content"
+msgstr "Skocz do treści strony"
+
+#: c:\users\Chris\Desktop\thematic/library/extensions/header-extensions.php:467
+msgid "Skip to content"
+msgstr "Skocz do treści"
+
+#: c:\users\Chris\Desktop\thematic/library/extensions/helpers.php:31
+#: c:\users\Chris\Desktop\thematic/library/extensions/helpers.php:44
+msgid "There is no excerpt because this is a protected post."
+msgstr "Skrót postu nie jest dostępny, ponieważ post został oznaczony jako chroniony."
+
+#: c:\users\Chris\Desktop\thematic/library/extensions/shortcodes.php:16
+msgid "Login"
+msgstr "Zaloguj się"
+
+#: c:\users\Chris\Desktop\thematic/library/extensions/shortcodes.php:18
+msgid "Logout"
+msgstr "Wyloguj się"
+
+#: c:\users\Chris\Desktop\thematic/library/extensions/theme-options.php:13
 msgid "Index Insert Position"
 msgstr "Pozycja wstawienia indeksu"
 
-#: c:\xampp\htdocs\wupperpiraten\wp-content\themes\thematic/library/extensions/theme-options.php:14
-#: c:\xampp\htdocs\wupperpiraten\wp-content\themes\thematic\library\extensions/theme-options.php:14
+#: c:\users\Chris\Desktop\thematic/library/extensions/theme-options.php:14
 msgid "The widgetized Index Insert will follow after this post number."
 msgstr "Pozycja wstawienia indeksu pojawi się po tym numerze postu."
 
-#: c:\xampp\htdocs\wupperpiraten\wp-content\themes\thematic/library/extensions/theme-options.php:19
-#: c:\xampp\htdocs\wupperpiraten\wp-content\themes\thematic\library\extensions/theme-options.php:19
+#: c:\users\Chris\Desktop\thematic/library/extensions/theme-options.php:19
 msgid "Info on Author Page"
 msgstr "Informacja na stronie autora."
 
-#: c:\xampp\htdocs\wupperpiraten\wp-content\themes\thematic/library/extensions/theme-options.php:20
-#: c:\xampp\htdocs\wupperpiraten\wp-content\themes\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 "Pokaż <a href=\"http://microformats.org/wiki/hcard\" target=\"_blank\">microsformatowany vCard</a>—z awatarem autora, krótką notką i emailem - na stronie autora."
+#: 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 "Pokaż na stronie autora <a href=\"http://microformats.org/wiki/hcard\" target=\"_blank\">microsformatowany vCard</a> z awatarem, krótką notką i emailem."
 
-#: c:\xampp\htdocs\wupperpiraten\wp-content\themes\thematic/library/extensions/theme-options.php:26
-#: c:\xampp\htdocs\wupperpiraten\wp-content\themes\thematic\library\extensions/theme-options.php:26
+#: c:\users\Chris\Desktop\thematic/library/extensions/theme-options.php:25
 msgid "Text in Footer"
 msgstr "Tekst stopki."
 
-#: c:\xampp\htdocs\wupperpiraten\wp-content\themes\thematic/library/extensions/theme-options.php:27
-#: c:\xampp\htdocs\wupperpiraten\wp-content\themes\thematic\library\extensions/theme-options.php:27
-msgid "Enter the HTML text that will appear in the bottom of your footer. Feel free to remove or change any links. <strong>Hint:</strong> <a href=\"http://www.w3schools.com/HTML/html_links.asp\" target=\"_blank\">how to write a link</a>."
-msgstr "Wpisz kod HTML tekstu, któy pojawi się na dole twojej stopki. Możesz dowolnie modyfikować i zmieniać dowolne linki."
+#: 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 "Możesz używać następujących tagów w tekście stopki: [wp-link] [theme-link] [loginout-link] [blog-title] [blog-link] [the-year]"
 
-#: c:\xampp\htdocs\wupperpiraten\wp-content\themes\thematic/library/extensions/theme-options.php:77
-#: c:\xampp\htdocs\wupperpiraten\wp-content\themes\thematic\library\extensions/theme-options.php:77
+#: c:\users\Chris\Desktop\thematic/library/extensions/theme-options.php:28
+msgid "Powered by [wp-link]. Built on the [theme-link]."
+msgstr "Oparte na [wp-link] i szablonie [theme-link]."
+
+#: c:\users\Chris\Desktop\thematic/library/extensions/theme-options.php:115
 msgid "settings saved."
 msgstr "ustawienia zapisane."
 
-#: c:\xampp\htdocs\wupperpiraten\wp-content\themes\thematic/library/extensions/theme-options.php:78
-#: c:\xampp\htdocs\wupperpiraten\wp-content\themes\thematic\library\extensions/theme-options.php:78
+#: c:\users\Chris\Desktop\thematic/library/extensions/theme-options.php:116
 msgid "settings reset."
 msgstr "reset ustawień."
 
-#: c:\xampp\htdocs\wupperpiraten\wp-content\themes\thematic/library/extensions/theme-options.php:79
-#: c:\xampp\htdocs\wupperpiraten\wp-content\themes\thematic\library\extensions/theme-options.php:79
+#: c:\users\Chris\Desktop\thematic/library/extensions/theme-options.php:117
 msgid "widgets reset."
 msgstr "reset widgetów."
 
-#: c:\xampp\htdocs\wupperpiraten\wp-content\themes\thematic/library/extensions/theme-options.php:195
-#: c:\xampp\htdocs\wupperpiraten\wp-content\themes\thematic\library\extensions/theme-options.php:195
+#: c:\users\Chris\Desktop\thematic/library/extensions/theme-options.php:286
 msgid "Save changes"
 msgstr "Zapisz zmiany"
 
-#: c:\xampp\htdocs\wupperpiraten\wp-content\themes\thematic/library/extensions/theme-options.php:201
-#: c:\xampp\htdocs\wupperpiraten\wp-content\themes\thematic\library\extensions/theme-options.php:201
+#: c:\users\Chris\Desktop\thematic/library/extensions/theme-options.php:293
 msgid "Reset"
 msgstr "Reset"
 
-#: c:\xampp\htdocs\wupperpiraten\wp-content\themes\thematic/library/extensions/theme-options.php:207
-#: c:\xampp\htdocs\wupperpiraten\wp-content\themes\thematic\library\extensions/theme-options.php:207
+#: c:\users\Chris\Desktop\thematic/library/extensions/theme-options.php:300
 msgid "Reset Widgets"
-msgstr "Zresetuj Widgety"
+msgstr "Reset Widgetów"
 
-#: c:\xampp\htdocs\wupperpiraten\wp-content\themes\thematic/library/extensions/theme-options.php:212
-#: c:\xampp\htdocs\wupperpiraten\wp-content\themes\thematic\library\extensions/theme-options.php:212
+#: 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 "Więcej informacji na temat tego szablonu na stronie, <a href=\"http://themeshaper.com\">ThemeShaper</a>. Odwiedź <a href=\"http://themeshaper.com/forums/\">Forum ThemeShaper</a> jeśli masz jakiekolwiek pytania do Thematic."
 
-#: c:\xampp\htdocs\wupperpiraten\wp-content\themes\thematic/library/extensions/widgets.php:55
-#: c:\xampp\htdocs\wupperpiraten\wp-content\themes\thematic/library/extensions/widgets.php:246
-#: c:\xampp\htdocs\wupperpiraten\wp-content\themes\thematic/library/extensions/widgets.php:247
-#: c:\xampp\htdocs\wupperpiraten\wp-content\themes\thematic\library\extensions/widgets.php:55
-#: c:\xampp\htdocs\wupperpiraten\wp-content\themes\thematic\library\extensions/widgets.php:246
-#: c:\xampp\htdocs\wupperpiraten\wp-content\themes\thematic\library\extensions/widgets.php:247
-msgid "RSS Links"
-msgstr "Linki RSS"
+#: c:\users\Chris\Desktop\thematic/library/extensions/widgets-extensions.php:13
+msgid "To search, type and hit enter"
+msgstr "Wpisz poszukiwaną frazę i wciśnij 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
+msgid "Search"
+msgstr "Szukaj"
+
+#: c:\users\Chris\Desktop\thematic/library/extensions/widgets-extensions.php:42
+msgid "The primary widget area, most often used as a sidebar."
+msgstr "Główny obszar widgetów, najczęsciej wyświetlany w kolumnie bocznej."
+
+#: c:\users\Chris\Desktop\thematic/library/extensions/widgets-extensions.php:57
+msgid "The secondary widget area, most often used as a sidebar."
+msgstr "Pomocniczy obszar widgetów, najczęsciej wyświetlany w kolumnie bocznej."
+
+#: c:\users\Chris\Desktop\thematic/library/extensions/widgets-extensions.php:72
+msgid "The 1st widget area in the footer."
+msgstr "Pierwszy obszar widgetów w stopce."
 
-#: c:\xampp\htdocs\wupperpiraten\wp-content\themes\thematic/library/extensions/widgets.php:79
-#: c:\xampp\htdocs\wupperpiraten\wp-content\themes\thematic/widgets/widget_blog_buttons.php:35
-#: c:\xampp\htdocs\wupperpiraten\wp-content\themes\thematic\library\extensions/widgets.php:79
+#: c:\users\Chris\Desktop\thematic/library/extensions/widgets-extensions.php:87
+msgid "The 2nd widget area in the footer."
+msgstr "Drugi obszar widgetów w stopce."
+
+#: c:\users\Chris\Desktop\thematic/library/extensions/widgets-extensions.php:102
+msgid "The 3rd widget area in the footer."
+msgstr "Trzeci obszar widgetów w stopce."
+
+#: c:\users\Chris\Desktop\thematic/library/extensions/widgets-extensions.php:117
+msgid "The top widget area displayed on the index page."
+msgstr "Obszar widgetów wyświetlany na górze strony głównej."
+
+#: c:\users\Chris\Desktop\thematic/library/extensions/widgets-extensions.php:132
+msgid "The widget area inserted after x posts on the index page."
+msgstr "Obszar widgetów wyświetlany po x postach na stronie głównej"
+
+#: c:\users\Chris\Desktop\thematic/library/extensions/widgets-extensions.php:147
+msgid "The bottom widget area displayed on the index page."
+msgstr "Obszar widgetów wyświetlany na dole strony głównej."
+
+#: c:\users\Chris\Desktop\thematic/library/extensions/widgets-extensions.php:162
+msgid "The top widget area displayed on a single post."
+msgstr "Obszar widgetów wyświetlany na górze strony z postem."
+
+#: c:\users\Chris\Desktop\thematic/library/extensions/widgets-extensions.php:177
+msgid "The widget area inserted between the post and the comments on a single post."
+msgstr "Obszar widgetów wyświetlany na stronie postu pomiędzy treścą a komentarzami."
+
+#: c:\users\Chris\Desktop\thematic/library/extensions/widgets-extensions.php:192
+msgid "The bottom widget area displayed on a single post."
+msgstr "Obszar widgetów wyświetlany na dole strony z postem."
+
+#: c:\users\Chris\Desktop\thematic/library/extensions/widgets-extensions.php:207
+msgid "The top widget area displayed on a page."
+msgstr "Obszar widgetów wyświetlany na górze strony"
+
+#: c:\users\Chris\Desktop\thematic/library/extensions/widgets-extensions.php:222
+msgid "The bottom widget area displayed on a page."
+msgstr "Obszar widgetów wyświetlany na dole strony."
+
+#: c:\users\Chris\Desktop\thematic/library/extensions/widgets.php:36
+msgid "A search form for your blog"
+msgstr "Formularz wyszukiwania dla twojego blogu"
+
+#: 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
 msgid "Title:"
 msgstr "Tytuł:"
 
-#: c:\xampp\htdocs\wupperpiraten\wp-content\themes\thematic/library/extensions/widgets.php:241
-#: c:\xampp\htdocs\wupperpiraten\wp-content\themes\thematic\library\extensions/widgets.php:241
-msgid "Blog Index"
-msgstr "Blog Index"
+#: c:\users\Chris\Desktop\thematic/library/extensions/widgets.php:81
+msgid "Log in/out and admin"
+msgstr "Zaloguj/wyloguj się z panel administracyjnego"
+
+#: c:\users\Chris\Desktop\thematic/library/extensions/widgets.php:82
+#: c:\users\Chris\Desktop\thematic/library/extensions/widgets.php:87
+msgid "Meta"
+msgstr "Meta"
+
+#: c:\users\Chris\Desktop\thematic/library/extensions/widgets.php:126
+msgid "Links to your posts and comments feed"
+msgstr "Linki do twoich postów i komentarzy"
 
-#: c:\xampp\htdocs\wupperpiraten\wp-content\themes\thematic/widgets/widget_blog_buttons.php:41
-#: c:\xampp\htdocs\wupperpiraten\wp-content\themes\thematic/widgets/widget_blog_buttons.php:44
-#: c:\xampp\htdocs\wupperpiraten\wp-content\themes\thematic/widgets/widget_blog_buttons.php:45
-msgid "Blog Buttons"
-msgstr "Przyciski Bloga"
+#: c:\users\Chris\Desktop\thematic/library/extensions/widgets.php:127
+#: c:\users\Chris\Desktop\thematic/library/extensions/widgets.php:132
+msgid "RSS Links"
+msgstr "Linki RSS"
+
+#: c:\users\Chris\Desktop\thematic/library/extensions/widgets.php:138
+msgid "All posts"
+msgstr "Wszystkie wpisy"
+
+#: c:\users\Chris\Desktop\thematic/library/extensions/widgets.php:139
+msgid "All comments"
+msgstr "Wszystkie komentarze"
+
+#~ msgid "Pages"
+#~ msgstr "Strony"
+
+#~ msgid "Categories"
+#~ msgstr "Kategorie"
+
+#~ msgid "RSS Feeds"
+#~ msgstr "Kanał RSS"
+
+#~ msgid ""
+#~ "Enter the HTML text that will appear in the bottom of your footer. Feel "
+#~ "free to remove or change any links. <strong>Hint:</strong> <a href="
+#~ "\"http://www.w3schools.com/HTML/html_links.asp\" target=\"_blank\">how to "
+#~ "write a link</a>."
+#~ msgstr ""
+#~ "Wpisz kod HTML tekstu, któy pojawi się na dole twojej stopki. Możesz "
+#~ "dowolnie modyfikować i zmieniać dowolne linki."
+
+#~ msgid "Blog Index"
+#~ msgstr "Blog Index"
+
+#~ msgid "Blog Buttons"
+#~ msgstr "Przyciski Bloga"
 
 #~ msgid "Site Meta"
 #~ msgstr "Meta Strony"
-
diff --git a/wp-content/themes/thematic/library/languages/pt_BR.mo b/wp-content/themes/thematic/library/languages/pt_BR.mo
index ca41fd31ae6ae31f3b61ba91ee8faba61bfbfd96..5d8a8cd264a99a47339721fb4ed7e25ae7bd74c7 100644
Binary files a/wp-content/themes/thematic/library/languages/pt_BR.mo and b/wp-content/themes/thematic/library/languages/pt_BR.mo differ
diff --git a/wp-content/themes/thematic/library/languages/pt_BR.po b/wp-content/themes/thematic/library/languages/pt_BR.po
index c446328afdb8c8ec26cc06216585b45c87801397..c6d4876b4728a954ed8d0efe5140e6a4b70b065e 100644
--- a/wp-content/themes/thematic/library/languages/pt_BR.po
+++ b/wp-content/themes/thematic/library/languages/pt_BR.po
@@ -1,763 +1,500 @@
-# 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"
+"Project-Id-Version: Thematic em portugu�s\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-05-22 18:56-0300\n"
-"PO-Revision-Date: 2010-01-24 16:43-0500\n"
-"Last-Translator: Fernanda Thiesen <fernanda@sementeria.com>\n"
-"Language-Team: \n"
+"POT-Creation-Date: 2010-02-18 20:58+0100\n"
+"PO-Revision-Date: \n"
+"Last-Translator: Eduardo Zulian <eduardozulian@gmail.com>\n"
+"Language-Team: WordPress Brasil <felipecoelhokussik@gmail.com, eduardozulian@gmail.com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Poedit-Language: Portuguese\n"
-"X-Poedit-Country: BRAZIL\n"
 "X-Poedit-SourceCharset: utf-8\n"
 "X-Poedit-KeywordsList: __;_e\n"
-"X-Poedit-Basepath: F:\\Downloads\\thematic.0.9\\thematic\n"
-"X-Poedit-SearchPath-0: .\n"
-
-#: 404.php:10
-msgid "Apologies, but we were unable to find what you were looking for. Perhaps  searching will help."
-msgstr "Desculpe, não estamos conseguindo encontrar o que você procura. Talvez usar o 'pesquisar' ajude."
-
-#: 404.php:15
-#: search.php:58
-msgid "Find"
-msgstr "Encontrar"
-
-#: archive.php:16
-#, php-format
-msgid "Daily Archives: <span>%s</span>"
-msgstr "Arqvs. por dia: <span>%s</span>"
-
-#: archive.php:18
-#, php-format
-msgid "Monthly Archives: <span>%s</span>"
-msgstr "Arqvs. por mês: <span>%s</span>"
-
-#: archive.php:20
-#, php-format
-msgid "Yearly Archives: <span>%s</span>"
-msgstr "Arqvs. por ano: <span>%s</span>"
-
-#: archive.php:22
-msgid "Blog Archives"
-msgstr "Blog-arqvs"
-
-#: archive.php:31
-#: archive.php:53
-#: author.php:21
-#: author.php:57
-#: category.php:20
-#: category.php:42
-#: index.php:17
-#: index.php:49
-#: search.php:21
-#: search.php:43
-msgid "<span class=\"meta-nav\">&laquo;</span> Older posts"
-msgstr "<span class=\"meta-nav\">&laquo;</span> Posts mais antigos"
-
-#: archive.php:32
-#: archive.php:54
-#: author.php:22
-#: author.php:58
-#: category.php:21
-#: category.php:43
-#: index.php:18
-#: index.php:50
-#: search.php:22
-#: search.php:44
-msgid "Newer posts <span class=\"meta-nav\">&raquo;</span>"
-msgstr "Posts mais recentes <span class=\"meta-nav\">&raquo;</span>"
-
-#: archive.php:41
-#: attachment.php:20
-#: author.php:45
-#: category.php:30
-#: index.php:30
-#: search.php:31
-msgid "Read More <span class=\"meta-nav\">&raquo;</span>"
-msgstr "Leia Mais <span class=\"meta-nav\">&raquo;</span>"
-
-#: archives.php:20
-msgid "Archives by Category"
-msgstr "Arqvs. por Categoria"
-
-#: archives.php:26
-msgid "Archives by Month"
-msgstr "Arqvs. por Mês"
+"X-Poedit-Basepath: .\n"
+"X-Poedit-Language: Portuguese\n"
+"X-Poedit-Country: BRAZIL\n"
+"X-Poedit-SearchPath-0: c:\\xampp\\htdocs\\development\\wp-content\\themes\\thematic\n"
 
-#: archives.php:32
-#: links.php:20
-#: page.php:16
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/archives.php:42
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/links.php:53
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/page.php:40
 msgid "Edit"
 msgstr "Editar"
 
-#: attachment.php:22
-#: index.php:32
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/attachment.php:39
 msgid "Pages:"
-msgstr "Páginas:"
+msgstr "P�ginas:"
 
-#: author.php:15
-msgid "Author Archives: "
-msgstr "Arqvs. por autor: "
-
-#: author.php:34
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/author.php:53
 msgid "Email "
-msgstr "Email "
-
-#: category.php:13
-msgid "Category Archives:"
-msgstr "Arqvs. por Categoria:"
+msgstr "Email"
 
-#: comments.php:10
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/comments.php:10
 msgid "This post is password protected. Enter the password to view any comments."
-msgstr "Esse post é protegido por senha. Digite a senha para ver os comentários."
+msgstr "Este post � protegido por senha. Digite a senha pra ver os coment�rios."
 
-#: comments.php:31
-#, php-format
-msgid "<span>%d</span> Comments"
-msgstr "<span>%d</span> Comentários"
-
-#: comments.php:31
-msgid "<span>One</span> Comment"
-msgstr "<span>Um</span> Comentário"
-
-#: comments.php:52
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/comments.php:52
 #, php-format
 msgid "<span>%d</span> Trackbacks"
-msgstr "<span>%d</span> Trackbacks"
+msgstr "<span>%d</span> trackbacks"
 
-#: comments.php:52
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/comments.php:52
 msgid "<span>One</span> Trackback"
-msgstr "<span>Um</span> Trackback"
-
-#: comments.php:67
-msgid "Post a Comment"
-msgstr "Comentar"
+msgstr "<span>Um</span> trackback"
 
-#: comments.php:67
-#, php-format
-msgid "Post a Reply to %s"
-msgstr "Postar uma resposta para %s"
-
-#: comments.php:72
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/comments.php:72
 #, php-format
 msgid "You must be <a href=\"%s\" title=\"Log in\">logged in</a> to post a comment."
-msgstr "Você precisa <a href=\"%s\" title=\"Log in\">estar logado</a> para comentar."
+msgstr "Voc� deve estar <a href=\"%s\" title=\"Fazer login\">logado</a> pra postar coment�rios."
 
-#: comments.php:83
+#: c:\xampp\htdocs\development\wp-content\themes\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\">Logado como <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\">Sair?</a></span>"
+msgstr "<span class=\"loggedin\">Logado como <a href=\"%1$s\" title=\"Logado como %2$s\">%2$s</a>.</span> <span class=\"logout\"><a href=\"%3$s\" title=\"Fazer logout desta conta\">Logout?</a></span>"
 
-#: comments.php:90
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/comments.php:90
 msgid "Your email is <em>never</em> published nor shared."
-msgstr "Seu email <em>nunca</em> será publicado ou distribuído."
+msgstr "Seu email <em>nunca</em> vai ser compartilhado."
 
-#: comments.php:90
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/comments.php:90
 msgid "Required fields are marked <span class=\"required\">*</span>"
-msgstr "Campos obrigatórios estão marcados com <span class=\"required\">*</span>"
+msgstr "Campos obrigat�rios s�o marcados com <span class=\"required\">*</span>"
 
-#: comments.php:93
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/comments.php:93
 msgid "Name"
 msgstr "Nome"
 
-#: comments.php:93
-#: comments.php:98
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/comments.php:93
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/comments.php:98
 msgid "<span class=\"required\">*</span>"
 msgstr "<span class=\"required\">*</span>"
 
-#: comments.php:98
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/comments.php:98
 msgid "Email"
 msgstr "Email"
 
-#: comments.php:103
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/comments.php:103
 msgid "Website"
-msgstr "Website"
-
-#: comments.php:110
-msgid "Comment"
-msgstr "Comentário"
+msgstr "Site"
 
-#: comments.php:120
-msgid "Post Comment"
-msgstr "Comentar"
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/comments.php:115
+msgid "You may use these <abbr title=\"HyperText Markup Language\">HTML</abbr> tags and attributes:"
+msgstr "Voc� pode usar estas tags <abbr title=\"HyperText Markup Language\">HTML</abbr>:"
 
-#: page.php:14
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/page.php:38
 msgid "Pages: "
-msgstr "Páginas:"
-
-#: search.php:15
-msgid "Search Results for:"
-msgstr "Pesquisar por:"
+msgstr "P�ginas:"
 
-#: search.php:51
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/search.php:41
 msgid "Nothing Found"
 msgstr "Nada encontrado"
 
-#: search.php:53
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/search.php:43
 msgid "Sorry, but nothing matched your search criteria. Please try again with some different keywords."
-msgstr "Desculpe, mas não foi encontrado nenhum resultado de acordo com os seus critérios de pesquisa. Tente novamente com palavras chave diferentes."
+msgstr "Perd�o, mas n�o achamos nada. Tente outra vez com palavras diferentes."
 
-#: sidebar.php:6
-#: sidebar.php:10
-msgid "Search"
-msgstr "Pesquisar"
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/search.php:48
+msgid "Find"
+msgstr "Procurar"
 
-#: sidebar.php:16
-msgid "Pages"
-msgstr "Páginas"
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/comments-extensions.php:76
+msgid "<span>One</span> Comment"
+msgstr "<span>Um</span> coment�rio"
 
-#: sidebar.php:23
-msgid "Categories"
-msgstr "Categorias"
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/comments-extensions.php:83
+#, php-format
+msgid "<span>%d</span> Comments"
+msgstr "<span>%d</span> coment�rios"
 
-#: sidebar.php:31
-msgid "Archives"
-msgstr "Arquivos"
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/comments-extensions.php:96
+msgid "Post a Comment"
+msgstr "Postar um coment�rio"
 
-#: sidebar.php:50
-msgid "RSS Feeds"
-msgstr "Feeds RSS"
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/comments-extensions.php:103
+#, php-format
+msgid "Post a Reply to %s"
+msgstr "Postar uma resposta a %s"
 
-#: sidebar.php:52
-#: library/extensions/hooks-filters.php:391
-msgid "Posts RSS feed"
-msgstr "RSS Feed dos posts"
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/comments-extensions.php:110
+msgid "Comment"
+msgstr "Coment�rio"
 
-#: sidebar.php:52
-msgid "All posts"
-msgstr "Todos os posts"
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/comments-extensions.php:117
+msgid "Post Comment"
+msgstr "Postar coment�rio"
 
-#: sidebar.php:53
-#: library/extensions/hooks-filters.php:409
-msgid "Comments RSS feed"
-msgstr "RSS Feed dos comentários"
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/content-extensions.php:147
+msgid "Author Archives: "
+msgstr "Arquivos do autor: "
 
-#: sidebar.php:53
-msgid "All comments"
-msgstr "Todos os comentários"
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/content-extensions.php:153
+msgid "Category Archives:"
+msgstr "Arquivos da categoria:"
 
-#: sidebar.php:58
-msgid "Meta"
-msgstr "Meta"
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/content-extensions.php:162
+msgid "Search Results for:"
+msgstr "Resultados da busca por:"
 
-#: tag.php:13
-#: library/extensions/hooks-filters.php:207
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/content-extensions.php:168
 msgid "Tag Archives:"
-msgstr "Arqvs. por tag:"
+msgstr "Arquivos da tag:"
 
-#: library/extensions/discussion.php:10
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/content-extensions.php:174
 #, 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 em %2$s <span class=\"meta-sep\">|</span> <a href=\"%3$s\" title=\"Permalink para este comentário\">Permalink</a>"
-
-#: 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'>Seu comentário está aguardando ação de um moderador.</span>\n"
-
-#: library/extensions/discussion.php:22
-msgid "Reply"
-msgstr "Responder"
-
-#: library/extensions/discussion.php:23
-msgid "Log in to reply."
-msgstr "Faça login para responder."
+msgid "Daily Archives: <span>%s</span>"
+msgstr "Arquivos do dia: <span>%s</span>"
 
-#: library/extensions/discussion.php:37
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/content-extensions.php:178
 #, php-format
-msgid "By %1$s on %2$s at %3$s"
-msgstr "Por %1$s em %2$s às %3$s"
-
-#: 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\">Seu trackback está aguardando ação de um moderador.</span>\\n"
+msgid "Monthly Archives: <span>%s</span>"
+msgstr "Arquivos do m�s: <span>%s</span>"
 
-#: library/extensions/helpers.php:31
-#: library/extensions/helpers.php:44
-msgid "There is no excerpt because this is a protected post."
-msgstr "Não há sumário porque esse post é protegido."
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/content-extensions.php:182
+#, php-format
+msgid "Yearly Archives: <span>%s</span>"
+msgstr "Arquivos do ano: <span>%s</span>"
 
-#: library/extensions/hooks-filters.php:61
-msgid "Skip navigation to the content"
-msgstr "Ir direto para o conteúdo"
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/content-extensions.php:186
+msgid "Blog Archives"
+msgstr "Arquivos"
 
-#: library/extensions/hooks-filters.php:61
-msgid "Skip to content"
-msgstr "Ir direto"
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/content-extensions.php:209
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/content-extensions.php:725
+msgid "<span class=\"meta-nav\">&laquo;</span> Older posts"
+msgstr "<span class=\"meta-nav\">&laquo;</span> Mais antigos"
 
-#: library/extensions/hooks-filters.php:211
-#: library/extensions/hooks-filters.php:498
-msgid "Not Found"
-msgstr "Não encontrado"
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/content-extensions.php:210
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/content-extensions.php:726
+msgid "Newer posts <span class=\"meta-nav\">&raquo;</span>"
+msgstr "Mais recentes <span class=\"meta-nav\">&raquo;</span>"
 
-#: library/extensions/hooks-filters.php:490
-#: library/extensions/hooks-filters.php:545
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/content-extensions.php:394
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/content-extensions.php:618
 msgid "Edit post"
 msgstr "Editar post"
 
-#: library/extensions/hooks-filters.php:503
-#: library/extensions/hooks-filters.php:598
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/content-extensions.php:406
+msgid "Not Found"
+msgstr "N�o encontrado"
+
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/content-extensions.php:411
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/content-extensions.php:686
 msgid "Permalink to "
 msgstr "Permalink para "
 
-#: library/extensions/hooks-filters.php:512
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/content-extensions.php:441
 msgid "By "
 msgstr "Por "
 
-#: library/extensions/hooks-filters.php:514
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/content-extensions.php:444
 msgid "View all posts by "
 msgstr "Ver todos os posts de"
 
-#: library/extensions/hooks-filters.php:517
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/content-extensions.php:455
 msgid "Published: "
-msgstr "Publicado:"
+msgstr "Publicado: "
+
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/content-extensions.php:523
+msgid "Archives by Category"
+msgstr "Arquivos por categoria"
 
-#: library/extensions/hooks-filters.php:552
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/content-extensions.php:534
+msgid "Archives by Month"
+msgstr "Arquivos por m�s"
+
+#: c:\xampp\htdocs\development\wp-content\themes\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 "Mil perd�es, mas n�o conseguimos encontrar o que voc� procurava. Talvez a busca ajude."
+
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/content-extensions.php:578
+msgid "Read More <span class=\"meta-nav\">&raquo;</span>"
+msgstr "Ler mais <span class=\"meta-nav\">&raquo;</span>"
+
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/content-extensions.php:629
 msgid "This entry was posted in "
-msgstr "Este post foi publicado em"
+msgstr "Isto foi postado em "
 
-#: library/extensions/hooks-filters.php:555
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/content-extensions.php:632
 msgid "Also posted in "
-msgstr "Também publicado em"
+msgstr "Tamb�m postado em "
 
-#: library/extensions/hooks-filters.php:558
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/content-extensions.php:635
 msgid "Posted in "
-msgstr "Publicado em "
+msgstr "Postado em "
 
-#: library/extensions/hooks-filters.php:565
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/content-extensions.php:646
 msgid " and tagged"
-msgstr " e tags"
+msgstr " e com as tags"
 
-#: library/extensions/hooks-filters.php:568
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/content-extensions.php:649
 msgid " Also tagged "
-msgstr " Também com tags"
+msgstr " Tamb�m com as tags "
 
-#: library/extensions/hooks-filters.php:570
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/content-extensions.php:651
 msgid "Tagged"
-msgstr "Tagged"
+msgstr "Com as tags"
 
-#: library/extensions/hooks-filters.php:579
-#: library/extensions/hooks-filters.php:582
-#: library/extensions/hooks-filters.php:585
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/content-extensions.php:663
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/content-extensions.php:666
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/content-extensions.php:669
 msgid "Comment on "
-msgstr "Comentar em"
+msgstr "Coment�rios em"
 
-#: library/extensions/hooks-filters.php:580
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/content-extensions.php:664
 msgid " Comments"
-msgstr " Comentários"
+msgstr " Coment�rios"
 
-#: library/extensions/hooks-filters.php:583
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/content-extensions.php:667
 msgid " Comment"
-msgstr " Comentário"
+msgstr " Coment�rio"
 
-#: library/extensions/hooks-filters.php:586
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/content-extensions.php:670
 msgid "Leave a comment"
-msgstr "Deixe um comentário"
+msgstr "Comentar"
 
-#: library/extensions/hooks-filters.php:589
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/content-extensions.php:673
 msgid "Comments closed"
-msgstr "Fechado para comentários"
+msgstr "Coment�rios fechados"
 
-#: library/extensions/hooks-filters.php:598
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/content-extensions.php:686
 msgid ". Bookmark the "
-msgstr ". Bookmark o "
+msgstr ". Salvar o "
 
-#: library/extensions/hooks-filters.php:599
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/content-extensions.php:687
 msgid "permalink"
 msgstr "permalink"
 
-#: library/extensions/hooks-filters.php:601
-#: library/extensions/hooks-filters.php:609
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/content-extensions.php:689
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/content-extensions.php:697
 msgid "Post a comment"
-msgstr "Comentar"
+msgstr "Deixar um coment�rio"
 
-#: library/extensions/hooks-filters.php:602
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/content-extensions.php:690
 msgid " or leave a trackback: "
-msgstr " ou deixar um trackback:"
+msgstr " ou enviar um trackback: "
 
-#: library/extensions/hooks-filters.php:603
-#: library/extensions/hooks-filters.php:606
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/content-extensions.php:691
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/content-extensions.php:694
 msgid "Trackback URL for your post"
-msgstr "Trackback do seu post"
+msgstr "URL pra trackback do seu post"
 
-#: library/extensions/hooks-filters.php:603
-#: library/extensions/hooks-filters.php:606
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/content-extensions.php:691
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/content-extensions.php:694
 msgid "Trackback URL"
-msgstr "Trackback URL"
+msgstr "URL pra trackback"
 
-#: library/extensions/hooks-filters.php:605
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/content-extensions.php:693
 msgid " Comments are closed, but you can leave a trackback: "
-msgstr "Este conteúdo está fechado para comentários, mas você pode deixar um trackback:"
+msgstr " Coment�rios est�o fechados, mas voc� pode enviar um trackback:"
 
-#: library/extensions/hooks-filters.php:608
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/content-extensions.php:696
 msgid " Trackbacks are closed, but you can "
-msgstr "Este conteúdo está fechado ara trackbacks, mas você pode"
+msgstr " Trackbacks est�o fechados, mas voc� pode"
 
-#: library/extensions/hooks-filters.php:609
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/content-extensions.php:697
 msgid "post a comment"
-msgstr "postar um comentário"
+msgstr "deixar um coment�rio"
 
-#: library/extensions/hooks-filters.php:611
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/content-extensions.php:699
 msgid " Both comments and trackbacks are currently closed."
-msgstr " Fechado para comentários e trackbacks no momento."
+msgstr " Coment�rios e trackbacks est�o fechados no momento."
 
-#: library/extensions/shortcodes.php:16
+#: c:\xampp\htdocs\development\wp-content\themes\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 "Postado %1$s �s %2$s <span class=\"meta-sep\">|</span> <a href=\"%3$s\" title=\"Permalink pra este coment�rio\">Permalink</a>"
+
+#: c:\xampp\htdocs\development\wp-content\themes\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'>Seu coment�rio est� aguardando modera��o.</span>\n"
+
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/discussion.php:22
+msgid "Reply"
+msgstr "Responder."
+
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/discussion.php:23
+msgid "Log in to reply."
+msgstr "Fa�a login pra responder."
+
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/discussion.php:37
+#, php-format
+msgid "By %1$s on %2$s at %3$s"
+msgstr "Por %1$s em %2$s �s %3$s"
+
+#: c:\xampp\htdocs\development\wp-content\themes\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\">Seu trackback est� aguardando modera��o.</span>\\n"
+
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/header-extensions.php:251
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/widgets.php:77
+msgid "Posts RSS feed"
+msgstr "Feed RSS dos posts"
+
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/header-extensions.php:269
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/widgets.php:78
+msgid "Comments RSS feed"
+msgstr "Feed RSS dos coment�rios"
+
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/header-extensions.php:401
+msgid "Skip navigation to the content"
+msgstr "Pular a navega��o pro conte�do"
+
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/header-extensions.php:401
+msgid "Skip to content"
+msgstr "Pular pro conte�do"
+
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/helpers.php:31
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/helpers.php:44
+msgid "There is no excerpt because this is a protected post."
+msgstr "N�o h� um resumo pois este � um post protegido."
+
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/shortcodes.php:16
 msgid "Login"
 msgstr "Login"
 
-#: library/extensions/shortcodes.php:18
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/shortcodes.php:18
 msgid "Logout"
-msgstr "Sair"
+msgstr "Logout"
 
-#: library/extensions/theme-options.php:13
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/theme-options.php:13
 msgid "Index Insert Position"
-msgstr "Posição de inserção no índice"
+msgstr "Posi��o pra inserir no index"
 
-#: library/extensions/theme-options.php:14
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/theme-options.php:14
 msgid "The widgetized Index Insert will follow after this post number."
-msgstr "A inserção widgetized no índice virá após este número de post."
+msgstr "A �rea Index vai aparece depois desse n�mero de posts."
 
-#: library/extensions/theme-options.php:19
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/theme-options.php:19
 msgid "Info on Author Page"
-msgstr "Informação na Página do Autor"
+msgstr "Info na p�gina de autor"
 
-#: 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 "Exibir um <a href=\"http://microformats.org/wiki/hcard\" target=\"_blank\">vCard microformatado</a>—com avatar do autor, bio e email--na página do autor."
+#: c:\xampp\htdocs\development\wp-content\themes\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 um <a href=\"http://microformats.org/wiki/hcard\" target=\"_blank\">vCard microformatado</a>�com o avatar, bio e email do autor�na p�gina de autor."
 
-#: library/extensions/theme-options.php:26
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/theme-options.php:25
 msgid "Text in Footer"
-msgstr "Texto no Rodapé"
+msgstr "Texto do rodap�"
 
-#: library/extensions/theme-options.php:27
-msgid "Enter the text that will appear in the bottom of your footer. You can use these shortcodes: [wp-link] [theme-link] [loginout-link] [blog-title] [the-year]"
-msgstr "Digite o texto que irá aparecer no fim do rodapé. Você pode usar estes atalhos: [wp-link] [theme-link] [loginout-link] [blog-title] [the-year]"
+#: c:\xampp\htdocs\development\wp-content\themes\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 "Voc� pode usar os seguintes shortcodes no texto do rodap�: [wp-link] [theme-link] [loginout-link] [blog-title] [blog-link] [the-year]"
 
-#: library/extensions/theme-options.php:29
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/theme-options.php:28
 msgid "Powered by [wp-link]. Built on the [theme-link]."
-msgstr "Produzido por [wp-link]. Construído no [theme-link]."
+msgstr "Movido a [wp-link]. Feito com [theme-link]."
 
-#: library/extensions/theme-options.php:77
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/theme-options.php:75
 msgid "settings saved."
-msgstr "preferências salvas."
+msgstr "configura��es salvas."
 
-#: library/extensions/theme-options.php:78
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/theme-options.php:76
 msgid "settings reset."
-msgstr "zerar preferências."
+msgstr "configura��es redefinidas."
 
-#: library/extensions/theme-options.php:79
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/theme-options.php:77
 msgid "widgets reset."
-msgstr "zerar widgets."
+msgstr "widgets redefinidos."
 
-#: library/extensions/theme-options.php:195
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/theme-options.php:190
 msgid "Save changes"
-msgstr "Salvar modificações"
+msgstr "Salvar mudan�as"
 
-#: library/extensions/theme-options.php:201
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/theme-options.php:196
 msgid "Reset"
-msgstr "Zerar"
+msgstr "Redefinir"
 
-#: library/extensions/theme-options.php:207
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/theme-options.php:202
 msgid "Reset Widgets"
-msgstr "Zerar Widgets"
+msgstr "Redefinir widgets"
 
-#: library/extensions/theme-options.php:212
+#: c:\xampp\htdocs\development\wp-content\themes\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 "Para maiores informações sobre este tema, visite <a href=\"http://themeshaper.com\" rel=\"nofollow\">ThemeShaper</a>. Por favor viste os <a href=\"http://themeshaper.com/forums/\" rel=\"nofollow\">Fóruns do ThemeShaper</a> se você tiver dúvidas sobre Thematic."
+msgstr "Pra mais informa��es sobre este tema, <a href=\"http://themeshaper.com\">visite ThemeShaper</a>. Visite os <a href=\"http://themeshaper.com/forums/\">ThemeShaper Forums</a> se voc� tiver perguntas sobre a Thematic."
+
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/widgets-extensions.php:12
+msgid "To search, type and hit enter"
+msgstr "Pra buscar, digite e aperte enter"
+
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/widgets-extensions.php:18
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/widgets-extensions.php:281
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/widgets.php:43
+msgid "Search"
+msgstr "Pesquisa"
+
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/widgets-extensions.php:43
+msgid "The primary widget area, most often used as a sidebar."
+msgstr "A �rea prim�ria, geralmente usada como lateral."
+
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/widgets-extensions.php:58
+msgid "The secondary widget area, most often used as a sidebar."
+msgstr "A �rea secund�ria, geralmente usada como lateral."
+
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/widgets-extensions.php:73
+msgid "The 1st widget area in the footer."
+msgstr "A primeira �rea de widgets no rodap�."
 
-#: library/extensions/widgets.php:55
-#: library/extensions/widgets.php:245
-#: library/extensions/widgets.php:246
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/widgets-extensions.php:88
+msgid "The 2nd widget area in the footer."
+msgstr "A segunda �rea de widgets no rodap�."
+
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/widgets-extensions.php:103
+msgid "The 3rd widget area in the footer."
+msgstr "A terceira �rea de widgets no rodap�."
+
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/widgets-extensions.php:118
+msgid "The top widget area displayed on the index page."
+msgstr "A �rea que aparece no topo do index."
+
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/widgets-extensions.php:133
+msgid "The widget area inserted after x posts on the index page."
+msgstr "A �rea que aparece depois de x posts no index."
+
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/widgets-extensions.php:148
+msgid "The bottom widget area displayed on the index page."
+msgstr "A �rea que aparece na base do index."
+
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/widgets-extensions.php:163
+msgid "The top widget area displayed on a single post."
+msgstr "A �rea que aparece no topo das p�ginas de post."
+
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/widgets-extensions.php:178
+msgid "The widget area inserted between the post and the comments on a single post."
+msgstr "A �rea que fica entre o post e os coment�rios na p�gina do post."
+
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/widgets-extensions.php:193
+msgid "The bottom widget area displayed on a single post."
+msgstr "A �rea que aparece na base das p�ginas de post."
+
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/widgets-extensions.php:208
+msgid "The top widget area displayed on a page."
+msgstr "A �rea que aparece no topo das p�ginas."
+
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/widgets-extensions.php:223
+msgid "The bottom widget area displayed on a page."
+msgstr "A �rea que aparece na base das p�ginas."
+
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/widgets-extensions.php:283
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/widgets.php:55
+msgid "Meta"
+msgstr "Meta"
+
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/widgets-extensions.php:285
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/widgets-extensions.php:286
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/widgets.php:72
 msgid "RSS Links"
 msgstr "Links RSS"
 
-#: library/extensions/widgets.php:79
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/widgets.php:77
+msgid "All posts"
+msgstr "Todos os posts"
+
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/widgets.php:78
+msgid "All comments"
+msgstr "Todos os coment�rios"
+
+#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/widgets.php:96
 msgid "Title:"
-msgstr "Título:"
-
-#~ msgid "Blog Index"
-#~ msgstr "Índice"
-#~ msgid "Error 404 - Not Found"
-#~ msgstr "Fehler 404 - Nicht gefunden"
-#~ msgid "Archive for the &#8216;%s&#8217; Category"
-#~ msgstr "Archiv f&uuml;r die Kategorie &#8222;%s&#8220;"
-#~ msgid "Posts Tagged &#8216;%s&#8217;"
-#~ msgstr "Artikel-Schlagworte: &#8222;%s&#8220;"
-#~ msgid "Archive for %s|Daily archive page"
-#~ msgstr "Archiv f&uuml;r %s"
-#~ msgid "F jS, Y"
-#~ msgstr "j. F Y"
-#~ msgid "Archive for %s|Monthly archive page"
-#~ msgstr "Archiv f&uuml;r %s"
-#~ msgid "F, Y"
-#~ msgstr "F Y"
-#~ msgid "Archive for %s|Yearly archive page"
-#~ msgstr "Archiv f&uuml;r %s"
-#~ msgid "Y"
-#~ msgstr "Y"
-#~ msgid "&laquo; Older Entries"
-#~ msgstr "&laquo; &Auml;ltere Eintr&auml;ge"
-#~ msgid "Newer Entries &raquo;"
-#~ msgstr "Neuere Eintr&auml;ge &raquo;"
-#~ msgid "l, F jS, Y"
-#~ msgstr "l, j. F Y"
-#~ msgid "Tags:"
-#~ msgstr "Schlagworte:"
-#~ msgid "No Comments &#187;"
-#~ msgstr "Keine Kommentare &#187;"
-#~ msgid "1 Comment &#187;"
-#~ msgstr "1 Kommentar &#187;"
-#~ msgid "% Comments &#187;"
-#~ msgstr "% Kommentare &#187;"
-#~ msgid "Archives by Subject:"
-#~ msgstr "Archive nach Thema:"
-#~ msgid "Permanent Link: %s"
-#~ msgstr "Permanent-Link: %s"
-#~ msgid "Read the rest of this entry &raquo;"
-#~ msgstr "Diesen Beitrag weiterlesen &raquo;"
-#~ msgid "This entry was posted %1$s on %2$s at %3$s and is filed under %4$s."
-#~ msgstr ""
-#~ "Dieser Beitrag wurde vor %1$s am %2$s um %3$s Uhr ver&ouml;ffentlicht und "
-#~ "unter %4$s gespeichert."
-#~ msgid ""
-#~ "You can follow any responses to this entry through the <a href='%s'>RSS "
-#~ "2.0</a> feed."
-#~ msgstr ""
-#~ "Sie k&ouml;nnen Kommentare zu diesem Eintrag &uuml;ber den <a href='%"
-#~ "s'>RSS-2.0</a>-Feed verfolgen."
-#~ msgid ""
-#~ "You can <a href=\"#respond\">leave a response</a>, or <a href=\"%s\" rel="
-#~ "\"trackback\">trackback</a> from your own site."
-#~ msgstr ""
-#~ "Sie k&ouml;nnen einen <a href=\"#respond\">Kommentar hinterlassen</a> "
-#~ "oder einen <a href=\"%s\" rel=\"trackback\">Trackback</a> von Ihrer "
-#~ "Website hierher setzen."
-#~ msgid ""
-#~ "Responses are currently closed, but you can <a href=\"%s\" rel=\"trackback"
-#~ "\">trackback</a> from your own site."
-#~ msgstr ""
-#~ "Kommentare sind momentan deaktiviert, aber Sie k&ouml;nnen einen <a href="
-#~ "\"%s\" rel=\"trackback\">Trackback</a> von Ihrer Website hierher setzen."
-#~ msgid ""
-#~ "You can skip to the end and leave a response. Pinging is currently not "
-#~ "allowed."
-#~ msgstr ""
-#~ "Sie k&ouml;nnen einen <a href=\"#respond\">Kommentar hinterlassen</a>, "
-#~ "Pingbacks/Trackbacks sind momentan deaktiviert."
-#~ msgid "Edit this entry."
-#~ msgstr "Diesen Eintrag bearbeiten"
-#~ msgid "Sorry, no attachments matched your criteria."
-#~ msgstr ""
-#~ "Leider wurden keine Anh&auml;nge gefunden, die Ihren Kriterien "
-#~ "entsprechen."
-#~ msgid "No Responses"
-#~ msgstr "Keine Kommentare"
-#~ msgid "One Response"
-#~ msgstr "1 Kommentar"
-#~ msgid "% Responses"
-#~ msgstr "% Kommentare"
-#~ msgid "to &#8220;%s&#8221;"
-#~ msgstr "zu &#8222;%s&#8220;"
-#~ msgid "<cite>%s</cite> Says:"
-#~ msgstr "<cite>%s</cite> sagt:"
-#~ msgid "edit"
-#~ msgstr "bearbeiten"
-#~ msgid "Comments are closed."
-#~ msgstr "Kommentieren ist momentan nicht m&ouml;glich."
-#~ msgid "Leave a Reply"
-#~ msgstr "Kommentieren"
-#~ msgid "Logged in as <a href=\"%1$s\">%2$s</a>."
-#~ msgstr "Angemeldet als <a href=\"%1$s\">%2$s</a>."
-#~ msgid "Log out of this account"
-#~ msgstr "Jetzt abmelden"
-#~ msgid "Log out &raquo;"
-#~ msgstr "Abmelden &raquo;"
-#~ msgid "(required)"
-#~ msgstr "(ben&ouml;tigt)"
-#~ msgid "Mail (will not be published)"
-#~ msgstr "E-Mail (wird nicht ver&ouml;ffentlicht)"
-#~ msgid "<strong>XHTML:</strong> You can use these tags: <code>%s</code>"
-#~ msgstr ""
-#~ "<strong>XHTML:</strong> Sie k&ouml;nnen folgende Elemente nutzen: <code>%"
-#~ "s</code>"
-#~ msgid "Submit Comment"
-#~ msgstr "Kommentar senden"
-#~ msgid "%1$s - Comments on %2$s"
-#~ msgstr "%1$s - Kommentare zu %2$s"
-#~ msgid ""
-#~ "<abbr title=\"Really Simple Syndication\">RSS</abbr> feed for comments on "
-#~ "this post."
-#~ msgstr ""
-#~ "<abbr title=\"Really Simple Syndication\">RSS</abbr>-Feed f&uuml;r "
-#~ "Kommentare zu diesem Artikel."
-#~ msgid ""
-#~ "The <abbr title=\"Universal Resource Locator\">URL</abbr> to TrackBack "
-#~ "this entry is: <em>%s</em>"
-#~ msgstr ""
-#~ "Die Trackback-<abbr title=\"Universal Resource Locator\">URL</abbr> zu "
-#~ "diesem Artikel ist: <em>%s</em>"
-#~ msgid "Pingback"
-#~ msgstr "Pingback"
-#~ msgid "by %1$s &#8212; %2$s @ <a href=\"#comment-%3$s\">%4$s</a>"
-#~ msgstr "von %1$s &#8212; %2$s um <a href=\"#comment-%3$s\">%4$s Uhr</a>"
-#~ msgid "No comments yet."
-#~ msgstr "Noch keine Kommentare."
-#~ msgid ""
-#~ "Line and paragraph breaks automatic, e-mail address never displayed, "
-#~ "<acronym title=\"Hypertext Markup Language\">HTML</acronym> allowed: "
-#~ "<code>%s</code>"
-#~ msgstr ""
-#~ "Zeilen- und Absatzumbr&uuml;che werden automatisch eingef&uuml;gt, Ihre E-"
-#~ "Mail wird nicht angezeigt.Erlaubtes <acronym title=\"Hypertext Markup "
-#~ "Language\">HTML</acronym>:"
-#~ msgid "<abbr title=\"Universal Resource Locator\">URL</abbr>"
-#~ msgstr "<abbr title=\"Universal Resource Locator\">URL</abbr>"
-#~ msgid "Say It!"
-#~ msgstr "Senden"
-#~ msgid "Sorry, the comment form is closed at this time."
-#~ msgstr "Kommentieren ist momentan leider nicht m&ouml;glich."
-#~ msgid "Close this window."
-#~ msgstr "Fenster schlie&szlig;en."
-#~ msgid ""
-#~ "Powered by <a href=\"%s\" title=\"Powered by WordPress, state-of-the-art "
-#~ "semantic personal publishing platform\"><strong>WordPress</strong></a>"
-#~ msgstr ""
-#~ "<a href=\"%s\" title=\"WordPress, die f&uuml;hrende Weblog-Anwendung"
-#~ "\"><strong>WordPress</strong></a>"
-#~ msgid "%1$s is proudly powered by %2$s"
-#~ msgstr "%1$s l&auml;uft mit %2$s"
-#~ msgid "%1$s and %2$s."
-#~ msgstr "%1$s und %2$s."
-#~ msgid "Entries (RSS)"
-#~ msgstr "Beitr&auml;ge (RSS)"
-#~ msgid "%d queries. %s seconds."
-#~ msgstr "%d Abfragen. %s Sekunden."
-#~ msgid "Customize Header"
-#~ msgstr "Kopfbereich anpassen"
-#~ msgid "Header Image and Color"
-#~ msgstr "Hintergrundbild und -farbe"
-#~ msgid "Close Color Picker"
-#~ msgstr "Farbw&auml;hler schlie&szlig;en"
-#~ msgid "Save"
-#~ msgstr "Speichern"
-#~ msgid "Font Color:"
-#~ msgstr "Schriftfarbe:"
-#~ msgid "Any CSS color (%s or %s or %s)"
-#~ msgstr "Eine beliebige CSS-Farbe (%s oder %s oder %s)"
-#~ msgid "Upper Color:"
-#~ msgstr "Farbe f&uuml;r oben:"
-#~ msgid "HEX only (%s or %s)"
-#~ msgstr "Nur HEX (%s oder %s)"
-#~ msgid "Lower Color:"
-#~ msgstr "Farbe f&uuml;r unten:"
-#~ msgid "Toggle Text"
-#~ msgstr "Text umschalten"
-#~ msgid "Use Defaults"
-#~ msgstr "Standard verwenden"
-#~ msgid "Font Color"
-#~ msgstr "Schriftfarbe"
-#~ msgid "Upper Color"
-#~ msgstr "Farbe f&uuml;r oben"
-#~ msgid "Lower Color"
-#~ msgstr "Farbe f&uuml;r unten"
-#~ msgid "Advanced"
-#~ msgstr "Erweitert"
-#~ msgid "Update Header &raquo;"
-#~ msgstr "Kopfbereich aktualisieren &raquo;"
-#~ msgid "Font Color (CSS):"
-#~ msgstr "Schriftfarbe (CSS):"
-#~ msgid "Upper Color (HEX):"
-#~ msgstr "Farbe f&uuml;r oben (HEX):"
-#~ msgid "Lower Color (HEX):"
-#~ msgstr "Farbe f&uuml;r unten (HEX):"
-#~ msgid "Select Default Colors"
-#~ msgstr "Standardfarben ausw&auml;hlen"
-#~ msgid "Toggle Text Display"
-#~ msgstr "Textanzeige aktivieren/deaktivieren"
-#~ msgid "&raquo; Blog Archive"
-#~ msgstr "&raquo; Blogarchiv"
-#~ msgid "This entry was posted on %1$s at %2$s and is filed under %3$s."
-#~ msgstr ""
-#~ "Dieser Beitrag wurde am %1$s um %2$s Uhr veröffentlicht und unter %3$s "
-#~ "gespeichert."
-#~ msgid "Sorry, no posts matched your criteria."
-#~ msgstr ""
-#~ "Leider wurden keine Artikel gefunden, die Ihren Kriterien entsprechen."
-#~ msgid "Sorry, but you are looking for something that isn&#8217;t here."
-#~ msgstr "Es konnten leider keine passenden Inhalte gefunden werden."
-#~ msgid "Read the rest of this page &raquo;"
-#~ msgstr "Diesen Seite weiterlesen &raquo;"
-#~ msgid "Search for:"
-#~ msgstr "Suchen nach:"
-#~ msgid "No posts found. Try a different search?"
-#~ msgstr ""
-#~ "Ihre Suche ergab keine Treffer. M&ouml;chten Sie eine neue Suche starten?"
-#~ msgid "Author"
-#~ msgstr "Autor"
-#~ msgid "You are currently browsing the archives for the %s category."
-#~ msgstr "Sie sind momentan im Archiv der Kategorie %s."
-#~ msgid ""
-#~ "You are currently browsing the <a href=\"%1$s/\">%2$s</a> blog archives "
-#~ "for the day %3$s."
-#~ msgstr ""
-#~ "Sie sind momentan im Blogarchiv f&uuml;r den %3$s von <a href=\"%1$s/\">%2"
-#~ "$s</a>."
-#~ msgid ""
-#~ "You are currently browsing the <a href=\"%1$s/\">%2$s</a> blog archives "
-#~ "for %3$s."
-#~ msgstr ""
-#~ "Sie sind momentan im Blogarchiv f&uuml;r %3$s von <a href=\"%1$s/\">%2$s</"
-#~ "a>."
-#~ msgid ""
-#~ "You are currently browsing the <a href=\"%1$s/\">%2$s</a> blog archives "
-#~ "for the year %3$s."
-#~ msgstr ""
-#~ "Sie sind momentan im Blogarchiv f&uuml;r das Jahr %3$s von <a href=\"%1$s/"
-#~ "\">%2$s</a>."
-#~ msgid ""
-#~ "You have searched the <a href=\"%1$s/\">%2$s</a> blog archives for "
-#~ "<strong>&#8216;%3$s&#8217;</strong>. If you are unable to find anything "
-#~ "in these search results, you can try one of these links."
-#~ msgstr ""
-#~ "Sie haben im Blogarchiv von <a href=\"%1$s/\">%2$s</a> nach "
-#~ "<strong>&#8222;%3$s&#8220;</strong> gesucht. Falls Sie in den "
-#~ "Suchergebnissen nicht f&uuml;ndig werden, helfen Ihnen m&ouml;"
-#~ "glicherweise die folgenden Links."
-#~ msgid ""
-#~ "You are currently browsing the <a href=\"%1$s/\">%2$s</a> blog archives."
-#~ msgstr "Sie sind momentan im Blogarchiv von <a href=\"%1$s/\">%2$s</a>."
-#~ msgid "This page validates as XHTML 1.0 Transitional"
-#~ msgstr "Diese Seite ist valides XHTML 1.0 Transitional"
-#~ msgid ""
-#~ "Valid <abbr title=\"eXtensible HyperText Markup Language\">XHTML</abbr>"
-#~ msgstr ""
-#~ "Valides <abbr title=\"eXtensible HyperText Markup Language\">XHTML</abbr>"
-#~ msgid "XHTML Friends Network"
-#~ msgstr "XHTML Friends Network"
-#~ msgid "XFN"
-#~ msgstr "XFN"
-#~ msgid ""
-#~ "Powered by WordPress, state-of-the-art semantic personal publishing "
-#~ "platform."
-#~ msgstr "L&auml;uft mit WordPress, der f&uuml;hrenden Weblog-Anwendung."
-#~ msgid "Edit this entry"
-#~ msgstr "Diesen Eintrag bearbeiten"
-#~ msgid ""
-#~ "Powered by <a href=\"%s\" title=\"Powered by WordPress, state-of-the-art "
-#~ "semantic personal publishing platform\"><strong>Wordpress</strong></a>"
-#~ msgstr ""
-#~ "<a href=\"%s\" title=\"WordPress, die f&uuml;hrende Weblog-Anwendung"
-#~ "\"><strong>WordPress</strong></a>"
-#~ msgid ""
-#~ "Logged in as <a href=\"%1$s\">%2$s</a>. <a href=\"%3$s\" title=\"Log out "
-#~ "of this account\">Logout &raquo;</a>"
-#~ msgstr ""
-#~ "Angemeldet als <a href=\"%1$s\">%2$s</a>. <a href=\"%3$s\">Abmelden "
-#~ "&raquo;</a>"
+msgstr "T�tulo:"
 
diff --git a/wp-content/themes/thematic/library/languages/sv_SE.mo b/wp-content/themes/thematic/library/languages/sv_SE.mo
index 32e1c8c8c93a49ac77e6ad2ad69abdc8501faba7..ee304834418f1221250408ae91037455103cf53d 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 237b8242049c60c05029a619b6865f6bb45009c2..f71e62572a1ee72447bcf1a6bbbaebd71672476b 100644
--- a/wp-content/themes/thematic/library/languages/sv_SE.po
+++ b/wp-content/themes/thematic/library/languages/sv_SE.po
@@ -1,481 +1,561 @@
+# Translation of Thematic 1.0.3 in Swedish
+# This file is distributed under the same license as the Thematic 1.0.3 package.
 msgid ""
 msgstr ""
-"Project-Id-Version: thematic swedish\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-15 11:44+0100\n"
-"PO-Revision-Date: \n"
-"Last-Translator: Chris Gossmann <chris.gossmann@googlemail.com>\n"
-"Language-Team: Björn Syse <bjorn@syse.se>\n"
+"PO-Revision-Date: 2012-06-25 15:44:12+0000\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Poedit-Language: Swedish\n"
-"X-Poedit-Country: Sweden\n"
-"X-Poedit-SourceCharset: utf-8\n"
-"X-Poedit-Basepath: sv_SE.po\n"
-
-#: D:\Web\Wordpress\dev\wp-content\themes\thematic/404.php:10
-msgid "Apologies, but we were unable to find what you were looking for. Perhaps  searching will help."
-msgstr "Beklagar, men vi kunde inte hitta vad du letar efter. Prova att s&ouml;ka."
-
-#: D:\Web\Wordpress\dev\wp-content\themes\thematic/404.php:15
-#: D:\Web\Wordpress\dev\wp-content\themes\thematic/search.php:58
-msgid "Find"
-msgstr "Sök"
-
-#: D:\Web\Wordpress\dev\wp-content\themes\thematic/archive.php:16
-#, php-format
-msgid "Daily Archives: <span>%s</span>"
-msgstr "Arkiv (dagligen): <span>%s</span>"
-
-#: D:\Web\Wordpress\dev\wp-content\themes\thematic/archive.php:18
-#, php-format
-msgid "Monthly Archives: <span>%s</span>"
-msgstr "Månatliga arkiv: <span>%s</span>"
-
-#: D:\Web\Wordpress\dev\wp-content\themes\thematic/archive.php:20
-#, php-format
-msgid "Yearly Archives: <span>%s</span>"
-msgstr "Arkiv (&aring;rligen): <span>%s</span>"
-
-#: D:\Web\Wordpress\dev\wp-content\themes\thematic/archive.php:22
-msgid "Blog Archives"
-msgstr "Bloggarkiv"
-
-#: D:\Web\Wordpress\dev\wp-content\themes\thematic/archive.php:31
-#: D:\Web\Wordpress\dev\wp-content\themes\thematic/archive.php:53
-#: D:\Web\Wordpress\dev\wp-content\themes\thematic/author.php:21
-#: D:\Web\Wordpress\dev\wp-content\themes\thematic/author.php:57
-#: D:\Web\Wordpress\dev\wp-content\themes\thematic/category.php:20
-#: D:\Web\Wordpress\dev\wp-content\themes\thematic/category.php:42
-#: D:\Web\Wordpress\dev\wp-content\themes\thematic/index.php:17
-#: D:\Web\Wordpress\dev\wp-content\themes\thematic/index.php:49
-#: D:\Web\Wordpress\dev\wp-content\themes\thematic/search.php:21
-#: D:\Web\Wordpress\dev\wp-content\themes\thematic/search.php:43
-msgid "<span class=\"meta-nav\">&laquo;</span> Older posts"
-msgstr "<span class=\"meta-nav\">&laquo;</span> &Auml;ldre inl&auml;gg"
-
-#: D:\Web\Wordpress\dev\wp-content\themes\thematic/archive.php:32
-#: D:\Web\Wordpress\dev\wp-content\themes\thematic/archive.php:54
-#: D:\Web\Wordpress\dev\wp-content\themes\thematic/author.php:22
-#: D:\Web\Wordpress\dev\wp-content\themes\thematic/author.php:58
-#: D:\Web\Wordpress\dev\wp-content\themes\thematic/category.php:21
-#: D:\Web\Wordpress\dev\wp-content\themes\thematic/category.php:43
-#: D:\Web\Wordpress\dev\wp-content\themes\thematic/index.php:18
-#: D:\Web\Wordpress\dev\wp-content\themes\thematic/index.php:50
-#: D:\Web\Wordpress\dev\wp-content\themes\thematic/search.php:22
-#: D:\Web\Wordpress\dev\wp-content\themes\thematic/search.php:44
-msgid "Newer posts <span class=\"meta-nav\">&raquo;</span>"
-msgstr "Senare inl&auml;gg <span class=\"meta-nav\">&raquo;</span>"
-
-#: D:\Web\Wordpress\dev\wp-content\themes\thematic/archive.php:41
-#: D:\Web\Wordpress\dev\wp-content\themes\thematic/attachment.php:20
-#: D:\Web\Wordpress\dev\wp-content\themes\thematic/author.php:45
-#: D:\Web\Wordpress\dev\wp-content\themes\thematic/category.php:30
-#: D:\Web\Wordpress\dev\wp-content\themes\thematic/index.php:30
-#: D:\Web\Wordpress\dev\wp-content\themes\thematic/search.php:31
-msgid "Read More <span class=\"meta-nav\">&raquo;</span>"
-msgstr "L&auml;s vidare <span class=\"meta-nav\">&raquo;</span>"
-
-#: D:\Web\Wordpress\dev\wp-content\themes\thematic/archives.php:20
-msgid "Archives by Category"
-msgstr "Arkiv per kategori"
-
-#: D:\Web\Wordpress\dev\wp-content\themes\thematic/archives.php:26
-msgid "Archives by Month"
-msgstr "Arkiv per m&aring;nad"
-
-#: D:\Web\Wordpress\dev\wp-content\themes\thematic/archives.php:32
-#: D:\Web\Wordpress\dev\wp-content\themes\thematic/links.php:20
-#: D:\Web\Wordpress\dev\wp-content\themes\thematic/page.php:16
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"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"
 
-#: D:\Web\Wordpress\dev\wp-content\themes\thematic/attachment.php:22
-#: D:\Web\Wordpress\dev\wp-content\themes\thematic/index.php:32
+#: attachment.php:62 library/extensions/content-extensions.php:666
+#: library/extensions/content-extensions.php:732
 msgid "Pages:"
 msgstr "Sidor:"
 
-#: D:\Web\Wordpress\dev\wp-content\themes\thematic/author.php:15
-msgid "Author Archives: "
-msgstr "F&ouml;rfattararkiv:"
-
-#: D:\Web\Wordpress\dev\wp-content\themes\thematic/author.php:34
+#: author.php:67
 msgid "Email "
 msgstr "Epost"
 
-#: D:\Web\Wordpress\dev\wp-content\themes\thematic/category.php:13
-msgid "Category Archives:"
-msgstr "Kategori-arkiv:"
-
-#: D:\Web\Wordpress\dev\wp-content\themes\thematic/comments.php:10
+#: comments.php:33
 msgid "This post is password protected. Enter the password to view any comments."
-msgstr "Detta inl&auml;gg &auml;r l&ouml;senordsskyddat. Skriv in l&ouml;senordet för att se kommentarer."
-
-#: D:\Web\Wordpress\dev\wp-content\themes\thematic/comments.php:31
-#, php-format
-msgid "<span>%d</span> Comments"
-msgstr "<span>%d</span> kommentarer"
-
-#: D:\Web\Wordpress\dev\wp-content\themes\thematic/comments.php:31
-msgid "<span>One</span> Comment"
-msgstr "<span>En</span> kommentar"
+msgstr "Detta inl&auml;gg &auml;r l&ouml;senordsskyddat. Skriv in l&ouml;senordet f&ouml;r att se kommentarer."
 
-#: D:\Web\Wordpress\dev\wp-content\themes\thematic/comments.php:52
-#, php-format
-msgid "<span>%d</span> Trackbacks"
-msgstr "<span>%d</span> trackbacks"
-
-#: D:\Web\Wordpress\dev\wp-content\themes\thematic/comments.php:52
+#: comments.php:111
 msgid "<span>One</span> Trackback"
 msgstr "<span>En</span> trackback"
 
-#: D:\Web\Wordpress\dev\wp-content\themes\thematic/comments.php:67
-msgid "Post a Comment"
-msgstr "Skriv en kommentar"
-
-#: D:\Web\Wordpress\dev\wp-content\themes\thematic/comments.php:67
-#, php-format
-msgid "Post a Reply to %s"
-msgstr "Skriv ett svar till %s"
-
-#: D:\Web\Wordpress\dev\wp-content\themes\thematic/comments.php:72
-#, php-format
+#: 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&aring;ste vara <a href=\"%s\" title=\"Logga in\">inloggad</a> f&ouml;r att skriva en kommentar."
 
-#: D:\Web\Wordpress\dev\wp-content\themes\thematic/comments.php:83
-#, php-format
+#: 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&aring;n det h&auml;r kontot\">Logga ut?</a></span>"
 
-#: D:\Web\Wordpress\dev\wp-content\themes\thematic/comments.php:90
+#: 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>"
 
-#: D:\Web\Wordpress\dev\wp-content\themes\thematic/comments.php:90
+#: comments.php:164 library/extensions/comments-extensions.php:233
 msgid "Required fields are marked <span class=\"required\">*</span>"
 msgstr "Obligatoriska f&auml;lt &auml;r markerade med <span class=\"required\">*</span>"
 
-#: D:\Web\Wordpress\dev\wp-content\themes\thematic/comments.php:93
+#: comments.php:167 library/extensions/comments-extensions.php:224
 msgid "Name"
 msgstr "Namn"
 
-#: D:\Web\Wordpress\dev\wp-content\themes\thematic/comments.php:93
-#: D:\Web\Wordpress\dev\wp-content\themes\thematic/comments.php:98
+#: 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>"
 
-#: D:\Web\Wordpress\dev\wp-content\themes\thematic/comments.php:98
+#: comments.php:172 library/extensions/comments-extensions.php:225
 msgid "Email"
 msgstr "Epost"
 
-#: D:\Web\Wordpress\dev\wp-content\themes\thematic/comments.php:103
+#: comments.php:177 library/extensions/comments-extensions.php:226
 msgid "Website"
 msgstr "Website"
 
-#: D:\Web\Wordpress\dev\wp-content\themes\thematic/comments.php:110
-msgid "Comment"
-msgstr "Kommentar"
-
-#: D:\Web\Wordpress\dev\wp-content\themes\thematic/comments.php:115
+#: 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&auml;nda dessa <abbr title=\"HyperText Markup Language\">HTML</abbr>-taggar och attribut:"
 
-#: D:\Web\Wordpress\dev\wp-content\themes\thematic/comments.php:120
-msgid "Post Comment"
-msgstr "Lämna kommentar"
-
-#: D:\Web\Wordpress\dev\wp-content\themes\thematic/page.php:14
+#: page.php:58 template-page-fullwidth.php:59
 msgid "Pages: "
 msgstr "Sidor:"
 
-#: D:\Web\Wordpress\dev\wp-content\themes\thematic/search.php:15
-msgid "Search Results for:"
-msgstr "S&ouml;k i resultaten efter:"
-
-#: D:\Web\Wordpress\dev\wp-content\themes\thematic/search.php:51
+#: search.php:56
 msgid "Nothing Found"
 msgstr "Inga tr&auml;ffar"
 
-#: D:\Web\Wordpress\dev\wp-content\themes\thematic/search.php:53
+#: search.php:60
 msgid "Sorry, but nothing matched your search criteria. Please try again with some different keywords."
 msgstr "Tyv&auml;rr, men ingenting matchar ditt s&ouml;kkriterie. F&ouml;rs&ouml;k med en annan s&ouml;kstr&auml;ng."
 
-#: D:\Web\Wordpress\dev\wp-content\themes\thematic/sidebar.php:6
-#: D:\Web\Wordpress\dev\wp-content\themes\thematic/sidebar.php:10
-msgid "Search"
+#: library/extensions/content-extensions.php:1346 search.php:70
+msgid "Find"
 msgstr "S&ouml;k"
 
-#: D:\Web\Wordpress\dev\wp-content\themes\thematic/sidebar.php:16
-msgid "Pages"
-msgstr "Sidor"
-
-#: D:\Web\Wordpress\dev\wp-content\themes\thematic/sidebar.php:23
-msgid "Categories"
-msgstr "Kategorier"
+#: library/extensions/comments-extensions.php:120
+msgid "<span>One</span> Comment"
+msgstr "<span>En</span> kommentar"
 
-#: D:\Web\Wordpress\dev\wp-content\themes\thematic/sidebar.php:31
-msgid "Archives"
-msgstr "Arkiv"
+#: library/extensions/comments-extensions.php:154
+msgid "Post a Comment"
+msgstr "Skriv en kommentar"
 
-#: D:\Web\Wordpress\dev\wp-content\themes\thematic/sidebar.php:50
-msgid "RSS Feeds"
-msgstr "RSS-fl&ouml;den"
+#: library/extensions/comments-extensions.php:165
+msgid "Post a Reply to %s"
+msgstr "Skriv ett svar till %s"
 
-#: D:\Web\Wordpress\dev\wp-content\themes\thematic/sidebar.php:52
-#: D:\Web\Wordpress\dev\wp-content\themes\thematic/library/extensions/hooks-filters.php:390
-msgid "Posts RSS feed"
-msgstr "RSS-fl&ouml;de (inl&auml;gg)"
+#: library/extensions/comments-extensions.php:176
+msgid "Comment"
+msgstr "Kommentar"
 
-#: D:\Web\Wordpress\dev\wp-content\themes\thematic/sidebar.php:52
-msgid "All posts"
-msgstr "Alla inl&auml;gg"
+#: library/extensions/comments-extensions.php:187
+msgid "Cancel reply"
+msgstr "Avbryt svar"
 
-#: D:\Web\Wordpress\dev\wp-content\themes\thematic/sidebar.php:53
-#: D:\Web\Wordpress\dev\wp-content\themes\thematic/library/extensions/hooks-filters.php:408
-msgid "Comments RSS feed"
-msgstr "RSS-fl&ouml;de (kommentarer)"
+#: library/extensions/comments-extensions.php:198
+msgid "Post Comment"
+msgstr "L&auml;mna kommentar"
 
-#: D:\Web\Wordpress\dev\wp-content\themes\thematic/sidebar.php:53
-msgid "All comments"
-msgstr "Alla kommentarer"
+#: library/extensions/content-extensions.php:340
+#: library/extensions/header-extensions.php:84
+msgid "Category Archives:"
+msgstr "Kategori-arkiv:"
 
-#: D:\Web\Wordpress\dev\wp-content\themes\thematic/sidebar.php:58
-msgid "Meta"
-msgstr "Meta"
+#: library/extensions/content-extensions.php:349
+#: library/extensions/header-extensions.php:80
+msgid "Search Results for:"
+msgstr "S&ouml;k i resultaten efter:"
 
-#: D:\Web\Wordpress\dev\wp-content\themes\thematic/tag.php:13
-#: D:\Web\Wordpress\dev\wp-content\themes\thematic/library/extensions/hooks-filters.php:207
+#: library/extensions/content-extensions.php:355
+#: library/extensions/header-extensions.php:88
 msgid "Tag Archives:"
 msgstr "Tag-arkiv:"
 
-#: D:\Web\Wordpress\dev\wp-content\themes\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 "Skrivet %1$s klockan %2$s <span class=\"meta-sep\">|</span> <a href=\"%3$s\" title=\"Permalink till denna kommentar\">Permalink</a>"
-
-#: D:\Web\Wordpress\dev\wp-content\themes\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'>Din kommentar v&auml;ntar på att bli godk&auml;nd.</span>\n"
-
-#: D:\Web\Wordpress\dev\wp-content\themes\thematic/library/extensions/discussion.php:22
-msgid "Reply"
-msgstr "Svar"
+#: library/extensions/content-extensions.php:364
+#: library/extensions/content-extensions.php:373
+msgid "Archives:"
+msgstr "Arkiv:"
 
-#: D:\Web\Wordpress\dev\wp-content\themes\thematic/library/extensions/discussion.php:23
-msgid "Log in to reply."
-msgstr "Logga in f&ouml;r att svara."
+#: library/extensions/content-extensions.php:379
+msgid "Daily Archives: <span>%s</span>"
+msgstr "Arkiv (dagligen): <span>%s</span>"
 
-#: D:\Web\Wordpress\dev\wp-content\themes\thematic/library/extensions/discussion.php:37
-#, php-format
-msgid "By %1$s on %2$s at %3$s"
-msgstr "Av %1$s on %2$s at %3$s"
+#: library/extensions/content-extensions.php:383
+msgid "Monthly Archives: <span>%s</span>"
+msgstr "Arkiv (m&aring;nadsvis): <span>%s</span>"
 
-#: D:\Web\Wordpress\dev\wp-content\themes\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\">Din trackback v&auml;ntar på att bli godk&auml;nd.</span>\\n"
+#: library/extensions/content-extensions.php:387
+msgid "Yearly Archives: <span>%s</span>"
+msgstr "Arkiv (&aring;rligen): <span>%s</span>"
 
-#: D:\Web\Wordpress\dev\wp-content\themes\thematic/library/extensions/helpers.php:31
-#: D:\Web\Wordpress\dev\wp-content\themes\thematic/library/extensions/helpers.php:44
-msgid "There is no excerpt because this is a protected post."
-msgstr "Det finns inget utdrag f&ouml;r detta &auml;r ett skyddat inl&auml;gg."
+#: library/extensions/content-extensions.php:429
+#: library/extensions/content-extensions.php:1728
+msgid "<span class=\"meta-nav\">&laquo;</span> Older posts"
+msgstr "<span class=\"meta-nav\">&laquo;</span> &Auml;ldre inl&auml;gg"
 
-#: D:\Web\Wordpress\dev\wp-content\themes\thematic/library/extensions/hooks-filters.php:61
-msgid "Skip navigation to the content"
-msgstr "Skippa navigation, vidare till inneh&aring;ll"
+#: library/extensions/content-extensions.php:431
+#: library/extensions/content-extensions.php:1729
+msgid "Newer posts <span class=\"meta-nav\">&raquo;</span>"
+msgstr "Senare inl&auml;gg <span class=\"meta-nav\">&raquo;</span>"
 
-#: D:\Web\Wordpress\dev\wp-content\themes\thematic/library/extensions/hooks-filters.php:61
-msgid "Skip to content"
-msgstr "Vidare till inneh&aring;ll"
+#: library/extensions/content-extensions.php:946
+#: library/extensions/content-extensions.php:1460
+msgid "Edit post"
+msgstr "Redigera inl&auml;gg"
 
-#: D:\Web\Wordpress\dev\wp-content\themes\thematic/library/extensions/hooks-filters.php:211
-#: D:\Web\Wordpress\dev\wp-content\themes\thematic/library/extensions/hooks-filters.php:497
+#: library/extensions/content-extensions.php:975
+#: library/extensions/header-extensions.php:92
 msgid "Not Found"
 msgstr "Inte hittat"
 
-#: D:\Web\Wordpress\dev\wp-content\themes\thematic/library/extensions/hooks-filters.php:489
-#: D:\Web\Wordpress\dev\wp-content\themes\thematic/library/extensions/hooks-filters.php:544
-msgid "Edit post"
-msgstr "Redigera inl&auml;gg"
-
-#: D:\Web\Wordpress\dev\wp-content\themes\thematic/library/extensions/hooks-filters.php:502
-#: D:\Web\Wordpress\dev\wp-content\themes\thematic/library/extensions/hooks-filters.php:597
+#: library/extensions/content-extensions.php:980
+#: library/extensions/content-extensions.php:1413
+#: library/extensions/content-extensions.php:1417
 msgid "Permalink to "
 msgstr "Permalink till "
 
-#: D:\Web\Wordpress\dev\wp-content\themes\thematic/library/extensions/hooks-filters.php:511
+#: library/extensions/content-extensions.php:1041
 msgid "By "
 msgstr "Av "
 
-#: D:\Web\Wordpress\dev\wp-content\themes\thematic/library/extensions/hooks-filters.php:513
+#: library/extensions/content-extensions.php:1051
 msgid "View all posts by "
-msgstr "Se alla inl&auml;gg av"
+msgstr "Se alla inl&auml;gg av&nbsp;"
 
-#: D:\Web\Wordpress\dev\wp-content\themes\thematic/library/extensions/hooks-filters.php:516
+#: library/extensions/content-extensions.php:1079
 msgid "Published: "
 msgstr "Publicerad: "
 
-#: D:\Web\Wordpress\dev\wp-content\themes\thematic/library/extensions/hooks-filters.php:551
+#: library/extensions/content-extensions.php:1252
+msgid "Archives by Category"
+msgstr "Arkiv per kategori"
+
+#: library/extensions/content-extensions.php:1280
+msgid "Archives by Month"
+msgstr "Arkiv per m&aring;nad"
+
+#: library/extensions/content-extensions.php:1413
+msgid "Browse the "
+msgstr "Bl&auml;ddra i "
+
+#: library/extensions/content-extensions.php:1413
+msgid " Archive"
+msgstr "arkivet"
+
+#: library/extensions/content-extensions.php:1414
+msgid " archive"
+msgstr " arkiv"
+
+#: library/extensions/content-extensions.php:1417
+msgid "Bookmark the "
+msgstr "Bokm&auml;rk "
+
+#: library/extensions/content-extensions.php:1418
+msgid "permalink"
+msgstr "permal&auml;nk"
+
+#: library/extensions/content-extensions.php:1572
 msgid "This entry was posted in "
 msgstr "Detta inl&auml;gg &auml;r publicerat i "
 
-#: D:\Web\Wordpress\dev\wp-content\themes\thematic/library/extensions/hooks-filters.php:554
+#: library/extensions/content-extensions.php:1580
 msgid "Also posted in "
 msgstr "Ocks&aring; publicerat i"
 
-#: D:\Web\Wordpress\dev\wp-content\themes\thematic/library/extensions/hooks-filters.php:557
+#: library/extensions/content-extensions.php:1583
 msgid "Posted in "
 msgstr "Publicerat i "
 
-#: D:\Web\Wordpress\dev\wp-content\themes\thematic/library/extensions/hooks-filters.php:564
+#: library/extensions/content-extensions.php:1609
+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"
 
-#: D:\Web\Wordpress\dev\wp-content\themes\thematic/library/extensions/hooks-filters.php:567
+#: library/extensions/content-extensions.php:1615
 msgid " Also tagged "
 msgstr " Ocks&aring; taggat "
 
-#: D:\Web\Wordpress\dev\wp-content\themes\thematic/library/extensions/hooks-filters.php:569
+#: library/extensions/content-extensions.php:1617
 msgid "Tagged"
 msgstr "Taggat"
 
-#: D:\Web\Wordpress\dev\wp-content\themes\thematic/library/extensions/hooks-filters.php:578
-#: D:\Web\Wordpress\dev\wp-content\themes\thematic/library/extensions/hooks-filters.php:581
-#: D:\Web\Wordpress\dev\wp-content\themes\thematic/library/extensions/hooks-filters.php:584
+#: library/extensions/content-extensions.php:1644
+#: library/extensions/content-extensions.php:1647
+#: library/extensions/content-extensions.php:1650
 msgid "Comment on "
-msgstr "Kommenterat p&aring;"
-
-#: D:\Web\Wordpress\dev\wp-content\themes\thematic/library/extensions/hooks-filters.php:579
-msgid " Comments"
-msgstr " Kommentarer"
-
-#: D:\Web\Wordpress\dev\wp-content\themes\thematic/library/extensions/hooks-filters.php:582
-msgid " Comment"
-msgstr " Kommentar"
+msgstr "Kommenterat p&aring;&nbsp;"
 
-#: D:\Web\Wordpress\dev\wp-content\themes\thematic/library/extensions/hooks-filters.php:585
+#: library/extensions/content-extensions.php:1651
 msgid "Leave a comment"
 msgstr "L&auml;mna en kommentar"
 
-#: D:\Web\Wordpress\dev\wp-content\themes\thematic/library/extensions/hooks-filters.php:588
+#: library/extensions/content-extensions.php:1654
 msgid "Comments closed"
 msgstr "St&auml;ngt f&ouml;r kommentarer"
 
-#: D:\Web\Wordpress\dev\wp-content\themes\thematic/library/extensions/hooks-filters.php:597
-msgid ". Bookmark the "
-msgstr ". Bokm&auml;rk "
-
-#: D:\Web\Wordpress\dev\wp-content\themes\thematic/library/extensions/hooks-filters.php:598
-msgid "permalink"
-msgstr "permalink"
-
-#: D:\Web\Wordpress\dev\wp-content\themes\thematic/library/extensions/hooks-filters.php:600
-#: D:\Web\Wordpress\dev\wp-content\themes\thematic/library/extensions/hooks-filters.php:608
+#: library/extensions/content-extensions.php:1678
+#: library/extensions/content-extensions.php:1686
 msgid "Post a comment"
 msgstr "Skriv en kommentar"
 
-#: D:\Web\Wordpress\dev\wp-content\themes\thematic/library/extensions/hooks-filters.php:601
+#: library/extensions/content-extensions.php:1679
 msgid " or leave a trackback: "
-msgstr " eller l&auml;mna en trackback: "
+msgstr "&nbsp;eller l&auml;mna en trackback: "
 
-#: D:\Web\Wordpress\dev\wp-content\themes\thematic/library/extensions/hooks-filters.php:602
-#: D:\Web\Wordpress\dev\wp-content\themes\thematic/library/extensions/hooks-filters.php:605
+#: library/extensions/content-extensions.php:1680
+#: library/extensions/content-extensions.php:1683
 msgid "Trackback URL for your post"
 msgstr "Trackback URL f&ouml;r ditt inl&auml;gg"
 
-#: D:\Web\Wordpress\dev\wp-content\themes\thematic/library/extensions/hooks-filters.php:602
-#: D:\Web\Wordpress\dev\wp-content\themes\thematic/library/extensions/hooks-filters.php:605
+#: library/extensions/content-extensions.php:1680
+#: library/extensions/content-extensions.php:1683
 msgid "Trackback URL"
 msgstr "Trackback URL"
 
-#: D:\Web\Wordpress\dev\wp-content\themes\thematic/library/extensions/hooks-filters.php:604
+#: library/extensions/content-extensions.php:1682
 msgid " Comments are closed, but you can leave a trackback: "
-msgstr "St&auml;ngt f&ouml;r kommentarer, men du kan l&auml;mna trackback:"
+msgstr "&nbsp;St&auml;ngt f&ouml;r kommentarer, men du kan l&auml;mna trackback:"
 
-#: D:\Web\Wordpress\dev\wp-content\themes\thematic/library/extensions/hooks-filters.php:607
+#: library/extensions/content-extensions.php:1685
 msgid " Trackbacks are closed, but you can "
-msgstr "St&auml;ngt f&ouml;r trackbacks, men du kan"
+msgstr "&nbsp;St&auml;ngt f&ouml;r trackbacks, men du kan"
 
-#: D:\Web\Wordpress\dev\wp-content\themes\thematic/library/extensions/hooks-filters.php:608
+#: library/extensions/content-extensions.php:1686
 msgid "post a comment"
 msgstr "l&auml;mna en kommentar"
 
-#: D:\Web\Wordpress\dev\wp-content\themes\thematic/library/extensions/hooks-filters.php:610
+#: library/extensions/content-extensions.php:1688
 msgid " Both comments and trackbacks are currently closed."
 msgstr " St&auml;ngt f&ouml;r kommentarer och trackbacks."
 
-#: D:\Web\Wordpress\dev\wp-content\themes\thematic/library/extensions/shortcodes.php:16
+#: 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>"
+
+#: library/extensions/discussion-extensions.php:35
+msgid "Edit comment"
+msgstr "Redigera kommentar"
+
+#: library/extensions/discussion.php:52
+msgid "Reply"
+msgstr "Svar"
+
+#: library/extensions/discussion.php:53
+msgid "Log in to reply."
+msgstr "Logga in f&ouml;r att svara."
+
+#: library/extensions/discussion.php:80
+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/widgets.php:157
+msgid "Posts RSS feed"
+msgstr "RSS-fl&ouml;de (inl&auml;gg)"
+
+#: library/extensions/header-extensions.php:326
+#: library/extensions/widgets.php:158
+msgid "Comments RSS feed"
+msgstr "RSS-fl&ouml;de (kommentarer)"
+
+#: functions.php:253
+msgid "Primary Menu"
+msgstr "Prim&auml;r meny"
+
+#: library/extensions/header-extensions.php:625
+msgid "Skip navigation to the content"
+msgstr "Skippa navigation, vidare till inneh&aring;ll"
+
+#: library/extensions/header-extensions.php:625
+msgid "Skip to content"
+msgstr "Vidare till inneh&aring;ll"
+
+#: library/extensions/helpers.php:50 library/extensions/helpers.php:69
+msgid "There is no excerpt because this is a protected post."
+msgstr "Det finns inget utdrag f&ouml;r detta &auml;r ett skyddat inl&auml;gg."
+
+#: library/extensions/shortcodes.php:40
 msgid "Login"
 msgstr "Logga in"
 
-#: D:\Web\Wordpress\dev\wp-content\themes\thematic/library/extensions/shortcodes.php:18
+#: library/extensions/shortcodes.php:42
 msgid "Logout"
 msgstr "Logga ut"
 
-#: D:\Web\Wordpress\dev\wp-content\themes\thematic/library/extensions/theme-options.php:13
+#: library/extensions/theme-options.php:50
 msgid "Index Insert Position"
-msgstr "Index Insert Position"
+msgstr "Position f&ouml;r Index Insert"
 
-#: D:\Web\Wordpress\dev\wp-content\themes\thematic/library/extensions/theme-options.php:14
-msgid "The widgetized Index Insert will follow after this post number."
-msgstr "Det widgetbaserade Index kommer f&ouml;lja efter detta antal inl&auml;gg."
-
-#: D:\Web\Wordpress\dev\wp-content\themes\thematic/library/extensions/theme-options.php:19
+#: library/extensions/theme-options.php:51
 msgid "Info on Author Page"
-msgstr "Information på F&ouml;rfattarsidan"
-
-#: D:\Web\Wordpress\dev\wp-content\themes\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 "Visa ett <a href=\"http://microformats.org/wiki/hcard\" target=\"_blank\">mikroformaterat vCard</a> — med f&ouml;rfattarens avatar, biografi och epost — p&aring; f&ouml;rfattarsidan."
+msgstr "Information p&aring; F&ouml;rfattarsidan"
 
-#: D:\Web\Wordpress\dev\wp-content\themes\thematic/library/extensions/theme-options.php:25
+#: library/extensions/theme-options.php:52
 msgid "Text in Footer"
-msgstr "Text i Sidfot"
+msgstr "Sidfotstext"
 
-#: D:\Web\Wordpress\dev\wp-content\themes\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] [the-year]"
-msgstr "Du kan anv&auml;nda f&ouml;ljande kortkoder i sidfotens text: [wp-link] [theme-link] [loginout-link] [blog-title] [the-year]"
+#: library/extensions/widgets-extensions.php:34
+msgid "To search, type and hit enter"
+msgstr "F&ouml;r att s&ouml;ka, skriv och tryck enter"
 
-#: D:\Web\Wordpress\dev\wp-content\themes\thematic/library/extensions/theme-options.php:28
-msgid "Powered by [wp-link]. Built on the [theme-link]."
-msgstr "Powered by [wp-link]. Built on the [theme-link]."
+#: library/extensions/widgets-extensions.php:40
+#: library/extensions/widgets.php:56 library/extensions/widgets.php:61
+msgid "Search"
+msgstr "S&ouml;k"
 
-#: D:\Web\Wordpress\dev\wp-content\themes\thematic/library/extensions/theme-options.php:76
-msgid "settings saved."
-msgstr "inst&auml;llningar sparade."
+#: library/extensions/widgets-extensions.php:72
+msgid "The primary widget area, most often used as a sidebar."
+msgstr "Det prim&auml;ra widgetf&auml;ltet, oftast anv&auml;nd som sidopanel."
 
-#: D:\Web\Wordpress\dev\wp-content\themes\thematic/library/extensions/theme-options.php:77
-msgid "settings reset."
-msgstr "inst&auml;llningar &aring;terst&auml;llda."
+#: library/extensions/widgets-extensions.php:87
+msgid "The secondary widget area, most often used as a sidebar."
+msgstr "Det sekund&auml;ra widgetf&auml;ltet, oftast anv&auml;nd som sidopanel."
 
-#: D:\Web\Wordpress\dev\wp-content\themes\thematic/library/extensions/theme-options.php:78
-msgid "widgets reset."
-msgstr "widgets &aring;terst&auml;llda."
+#: library/extensions/widgets-extensions.php:102
+msgid "The 1st widget area in the footer."
+msgstr "Det 1a widgetf&auml;ltet i sidfoten"
 
-#: D:\Web\Wordpress\dev\wp-content\themes\thematic/library/extensions/theme-options.php:191
-msgid "Save changes"
-msgstr "Spara &auml;ndringar"
+#: library/extensions/widgets-extensions.php:117
+msgid "The 2nd widget area in the footer."
+msgstr "Det 2a widgetf&auml;ltet i sidfoten"
 
-#: D:\Web\Wordpress\dev\wp-content\themes\thematic/library/extensions/theme-options.php:197
-msgid "Reset"
-msgstr "&Aring;terst&auml;ll"
+#: library/extensions/widgets-extensions.php:132
+msgid "The 3rd widget area in the footer."
+msgstr "Det 3e widgetf&auml;ltet i sidfoten"
 
-#: D:\Web\Wordpress\dev\wp-content\themes\thematic/library/extensions/theme-options.php:203
-msgid "Reset Widgets"
-msgstr "&Aring;terst&auml;ll Widgets"
+#: library/extensions/widgets-extensions.php:147
+msgid "The top widget area displayed on the index page."
+msgstr "Det &ouml;vre widgetf&auml;ltet p&aring; index-sidan."
 
-#: D:\Web\Wordpress\dev\wp-content\themes\thematic/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 "F&ouml;r mer information om detta tema, <a href=\"http://themeshaper.com\">bes&ouml;k ThemeShaper</a>. V&auml;nligen bes&ouml;k <a href=\"http://themeshaper.com/forums/\">ThemeShaper-forumet</a> om du har n&aring;gra fr&aring;gor om Thematic."
+#: library/extensions/widgets-extensions.php:162
+msgid "The widget area inserted after x posts on the index page."
+msgstr "Widgetf&auml;ltet som placeras efter x antal inl&auml;gg p&aring; index-sidan."
 
-#: D:\Web\Wordpress\dev\wp-content\themes\thematic/library/extensions/widgets.php:55
-#: D:\Web\Wordpress\dev\wp-content\themes\thematic/library/extensions/widgets.php:245
-#: D:\Web\Wordpress\dev\wp-content\themes\thematic/library/extensions/widgets.php:246
-msgid "RSS Links"
-msgstr "RSS-l&auml;nkar"
+#: library/extensions/widgets-extensions.php:177
+msgid "The bottom widget area displayed on the index page."
+msgstr "Det undre widgetf&auml;ltet p&aring; index-sidan."
+
+#: library/extensions/widgets-extensions.php:192
+msgid "The top widget area displayed on a single post."
+msgstr "Det &ouml;vre widgetf&auml;ltet p&aring; singel-inl&auml;ggssidan."
+
+#: library/extensions/widgets-extensions.php:207
+msgid "The widget area inserted between the post and the comments on a single post."
+msgstr "Widgetf&auml;ltet som placeras mellan inlägget och kommentarerna på singel inläggs-sidan."
+
+#: library/extensions/widgets-extensions.php:222
+msgid "The bottom widget area displayed on a single post."
+msgstr "Det undre widgetf&auml;ltet p&aring; singel-inl&auml;ggssidan."
+
+#: library/extensions/widgets-extensions.php:237
+msgid "The top widget area displayed on a page."
+msgstr "Det &ouml;vre widgetf&auml;ltet p&aring; en Sida"
 
-#: D:\Web\Wordpress\dev\wp-content\themes\thematic/library/extensions/widgets.php:79
+#: library/extensions/widgets-extensions.php:252
+msgid "The bottom widget area displayed on a page."
+msgstr "Det undre widgetf&auml;ltet p&aring; en Sida"
+
+#: library/extensions/widgets.php:55
+msgid "A search form for your blog"
+msgstr "Ett s&ouml;kformul&auml;r f&ouml;r din blogg"
+
+#: library/extensions/widgets.php:77 library/extensions/widgets.php:132
+#: library/extensions/widgets.php:175
 msgid "Title:"
 msgstr "Titel:"
 
+#: library/extensions/widgets.php:100
+msgid "Log in/out and admin"
+msgstr "Logga in/ut och admin"
+
+#: library/extensions/widgets.php:101 library/extensions/widgets.php:106
+msgid "Meta"
+msgstr "Meta"
+
+#: library/extensions/widgets.php:145
+msgid "Links to your posts and comments feed"
+msgstr "L&auml;nkar till inl&auml;ggs- och kommentarsfl&ouml;de"
+
+#: library/extensions/widgets.php:146 library/extensions/widgets.php:151
+msgid "RSS Links"
+msgstr "RSS-l&auml;nkar"
+
+#: library/extensions/widgets.php:157
+msgid "All posts"
+msgstr "Alla inl&auml;gg"
+
+#: library/extensions/widgets.php:158
+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&auml;r filen direkt, tack."
+
+#: comments.php:111
+msgid "Trackbacks"
+msgstr "Trackbackar"
+
+#: 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&auml;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&auml;ntar p&aring; att bli godk&auml;nd."
+
+#: library/extensions/discussion.php:90
+msgid "Your trackback is awaiting moderation"
+msgstr "Din trackback v&auml;ntar p&aring; att bli godk&auml;nd."
+
+#: library/extensions/theme-options.php:56
+msgid "Remove Legacy Options"
+msgstr "Ta bort f&ouml;r&aring;ldrade inst&auml;llningar"
+
+#: library/extensions/theme-options.php:204
+msgid "For more information:"
+msgstr "F&ouml;r mer information:"
+
+#: library/extensions/theme-options.php:206
+msgid "For support:"
+msgstr "F&ouml;r support:"
+
+#: library/extensions/theme-options.php:208
+msgid "forums"
+msgstr "forum"
+
+#: library/extensions/theme-options.php:212
+msgid "The options below are enabled by the Thematic Theme framework and/or a child theme."
+msgstr "Inst&auml;llningarna nedan &auml;r aktiverade av temat Thematic och/eller ett barntema."
+
+#: 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&auml;llningar kan l&auml;ggas till och standardinst&auml;llningarna kan tas bort genom att skapa ett barntema. Den h&auml;r hj&auml;lptexten kan ocks&aring; anpassas i ett barntema."
+
+#: library/extensions/theme-options.php:219
+msgid "Overview"
+msgstr "&Ouml;verblick"
+
+#: 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&ouml;r mer information om detta tema, <a href=\"http://thematictheme.com\">bes&ouml;k ThemeTheme.com</a>. V&auml;nligen bes&ouml;k <a href=\"http://thematictheme.com/forums/\">ThematicTheme-forumet</a> om du har n&aring;gra fr&aring;gor om Thematic."
+
+#: library/extensions/theme-options.php:262
+msgid "%s Theme Options"
+msgstr "%s Temainst&auml;llningar"
+
+#: library/extensions/theme-options.php:276
+msgid "Save Changes"
+msgstr "Spara ändringar"
+
+#: 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&auml;ltet f&ouml;r Index Insert kommer att s&auml;ttas in efter s&aring; h&auml;r m&aring;nga inl&auml;gg. Om du l&auml;mnar f&auml;ltet tomt eller skriver 0 avaktiveras widgetf&auml;ltet."
+
+#: library/extensions/theme-options.php:324
+msgid "Display a"
+msgstr "Visa ett"
+
+#: library/extensions/theme-options.php:324
+msgid "with the author's avatar, bio and email on the author page."
+msgstr "med f&ouml;rfattarens avatar, presentation och email p&aring; f&ouml;rfattarsidan."
+
+#: library/extensions/theme-options.php:337
+msgid "You can use HTML and shortcodes in your footer text. Shortcode examples"
+msgstr "Du kan anv&auml;nda HTML och shortcodes i din sidfotstext. Exempel p&aring; shortcodes"
+
+#: 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&auml;llningarna f&ouml;r %s  har uppgraderats till ett f&ouml;rb&auml;ttrat format. Ta bort de f&ouml;r&aring;ldrade inst&auml;llningarna fr&aring;n databasen."
+
+#: 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&auml;rdet p&aring; index insert-inst&auml;llningen m&aring;ste vara en siffra som &auml;r st&ouml;rre &auml;n eller lika med noll. Denna inst&auml;llning har &aring;terst&auml;llts till det f&ouml;reg&aring;ende v&auml;rdet."
+
+#: 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
diff --git a/wp-content/themes/thematic/library/languages/thematic.mo b/wp-content/themes/thematic/library/languages/thematic.mo
index b662b9acff3c2901156db840dab09d46b52049e5..f7380bf39b99bd8c6bd4d3ffe1a4bff703591a90 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 3598d21418a18ffef744f50e7c88f20edc2bb535..9abedc4011a97529f204597f1f80882639794997 100644
--- a/wp-content/themes/thematic/library/languages/thematic.pot
+++ b/wp-content/themes/thematic/library/languages/thematic.pot
@@ -1,498 +1,734 @@
-msgid ""
-msgstr ""
-"Project-Id-Version: Thematic\n"
+"Project-Id-Version: Thematic v1.0.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-18 20:58+0100\n"
-"PO-Revision-Date: \n"
-"Last-Translator: Chris Gossmann <chris.gossmann@googlemail.com>\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"
 "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\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-SearchPath-0: c:\\xampp\\htdocs\\development\\wp-content\\themes\\thematic\n"
-
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/archives.php:42
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/links.php:53
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/page.php:40
+"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"
 msgstr ""
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/attachment.php:39
+#: attachment.php:62
+#: library/extensions/content-extensions.php:666
+#: library/extensions/content-extensions.php:732
+#@ thematic
 msgid "Pages:"
 msgstr ""
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/author.php:53
+#: author.php:67
+#@ thematic
 msgid "Email "
 msgstr ""
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/comments.php:10
+#: comments.php:33
+#@ thematic
 msgid "This post is password protected. Enter the password to view any comments."
 msgstr ""
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/comments.php:52
-#, php-format
-msgid "<span>%d</span> Trackbacks"
-msgstr ""
-
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/comments.php:52
+#: comments.php:111
+#@ thematic
 msgid "<span>One</span> Trackback"
 msgstr ""
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/comments.php:72
+#: 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."
 msgstr ""
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/comments.php:83
+#: 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>"
 msgstr ""
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/comments.php:90
+#: comments.php:164
+#: library/extensions/comments-extensions.php:233
+#@ thematic
 msgid "Your email is <em>never</em> published nor shared."
 msgstr ""
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/comments.php:90
+#: comments.php:164
+#: library/extensions/comments-extensions.php:233
+#@ thematic
 msgid "Required fields are marked <span class=\"required\">*</span>"
 msgstr ""
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/comments.php:93
+#: comments.php:167
+#: library/extensions/comments-extensions.php:224
+#@ thematic
 msgid "Name"
 msgstr ""
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/comments.php:93
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/comments.php:98
+#: comments.php:167
+#: comments.php:172
+#: library/extensions/comments-extensions.php:224
+#: library/extensions/comments-extensions.php:225
+#@ thematic
 msgid "<span class=\"required\">*</span>"
 msgstr ""
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/comments.php:98
+#: comments.php:172
+#: library/extensions/comments-extensions.php:225
+#@ thematic
 msgid "Email"
 msgstr ""
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/comments.php:103
+#: comments.php:177
+#: library/extensions/comments-extensions.php:226
+#@ thematic
 msgid "Website"
 msgstr ""
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/comments.php:115
+#: 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:"
 msgstr ""
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/page.php:38
+#: page.php:58
+#: template-page-fullwidth.php:59
+#@ thematic
 msgid "Pages: "
 msgstr ""
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/search.php:41
+#: search.php:56
+#@ thematic
 msgid "Nothing Found"
 msgstr ""
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/search.php:43
+#: search.php:60
+#@ thematic
 msgid "Sorry, but nothing matched your search criteria. Please try again with some different keywords."
 msgstr ""
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/search.php:48
+#: library/extensions/content-extensions.php:1346
+#: search.php:70
+#@ thematic
 msgid "Find"
 msgstr ""
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/comments-extensions.php:76
+#: library/extensions/comments-extensions.php:120
+#@ thematic
 msgid "<span>One</span> Comment"
 msgstr ""
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/comments-extensions.php:83
-#, php-format
-msgid "<span>%d</span> Comments"
-msgstr ""
-
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/comments-extensions.php:96
+#: library/extensions/comments-extensions.php:154
+#@ thematic
 msgid "Post a Comment"
 msgstr ""
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/comments-extensions.php:103
+#: library/extensions/comments-extensions.php:165
 #, php-format
+#@ thematic
 msgid "Post a Reply to %s"
 msgstr ""
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/comments-extensions.php:110
+#: library/extensions/comments-extensions.php:176
+#@ thematic
 msgid "Comment"
 msgstr ""
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/comments-extensions.php:117
-msgid "Post Comment"
+#: library/extensions/comments-extensions.php:187
+#@ thematic
+msgid "Cancel reply"
 msgstr ""
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/content-extensions.php:147
-msgid "Author Archives: "
+#: library/extensions/comments-extensions.php:198
+#@ thematic
+msgid "Post Comment"
 msgstr ""
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/content-extensions.php:153
+#: library/extensions/content-extensions.php:340
+#: library/extensions/header-extensions.php:84
+#@ thematic
 msgid "Category Archives:"
 msgstr ""
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/content-extensions.php:162
+#: library/extensions/content-extensions.php:349
+#: library/extensions/header-extensions.php:80
+#@ thematic
 msgid "Search Results for:"
 msgstr ""
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/content-extensions.php:168
+#: library/extensions/content-extensions.php:355
+#: library/extensions/header-extensions.php:88
+#@ thematic
 msgid "Tag Archives:"
 msgstr ""
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/content-extensions.php:174
+#: library/extensions/content-extensions.php:364
+#: library/extensions/content-extensions.php:373
+#@ thematic
+msgid "Archives:"
+msgstr ""
+
+#: library/extensions/content-extensions.php:379
 #, php-format
+#@ thematic
 msgid "Daily Archives: <span>%s</span>"
 msgstr ""
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/content-extensions.php:178
+#: library/extensions/content-extensions.php:383
 #, php-format
+#@ thematic
 msgid "Monthly Archives: <span>%s</span>"
 msgstr ""
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/content-extensions.php:182
+#: library/extensions/content-extensions.php:387
 #, php-format
+#@ thematic
 msgid "Yearly Archives: <span>%s</span>"
 msgstr ""
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/content-extensions.php:186
-msgid "Blog Archives"
-msgstr ""
-
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/content-extensions.php:209
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/content-extensions.php:725
+#: library/extensions/content-extensions.php:429
+#: library/extensions/content-extensions.php:1728
+#@ thematic
 msgid "<span class=\"meta-nav\">&laquo;</span> Older posts"
 msgstr ""
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/content-extensions.php:210
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/content-extensions.php:726
+#: library/extensions/content-extensions.php:431
+#: library/extensions/content-extensions.php:1729
+#@ thematic
 msgid "Newer posts <span class=\"meta-nav\">&raquo;</span>"
 msgstr ""
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/content-extensions.php:394
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/content-extensions.php:618
+#: library/extensions/content-extensions.php:946
+#: library/extensions/content-extensions.php:1460
+#@ thematic
 msgid "Edit post"
 msgstr ""
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/content-extensions.php:406
+#: library/extensions/content-extensions.php:975
+#: library/extensions/header-extensions.php:92
+#@ thematic
 msgid "Not Found"
 msgstr ""
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/content-extensions.php:411
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/content-extensions.php:686
+#: library/extensions/content-extensions.php:980
+#: library/extensions/content-extensions.php:1413
+#: library/extensions/content-extensions.php:1417
+#@ thematic
 msgid "Permalink to "
 msgstr ""
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/content-extensions.php:441
+#: library/extensions/content-extensions.php:1041
+#@ thematic
 msgid "By "
 msgstr ""
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/content-extensions.php:444
+#: library/extensions/content-extensions.php:1051
+#@ thematic
 msgid "View all posts by "
 msgstr ""
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/content-extensions.php:455
+#: library/extensions/content-extensions.php:1079
+#@ thematic
 msgid "Published: "
 msgstr ""
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/content-extensions.php:523
+#: library/extensions/content-extensions.php:1252
+#@ thematic
 msgid "Archives by Category"
 msgstr ""
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/content-extensions.php:534
+#: library/extensions/content-extensions.php:1280
+#@ thematic
 msgid "Archives by Month"
 msgstr ""
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/content-extensions.php:562
-msgid "Apologies, but we were unable to find what you were looking for. Perhaps  searching will help."
+#: library/extensions/content-extensions.php:1413
+#@ thematic
+msgid "Browse the "
+msgstr ""
+
+#: library/extensions/content-extensions.php:1413
+#@ thematic
+msgid " Archive"
 msgstr ""
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/content-extensions.php:578
-msgid "Read More <span class=\"meta-nav\">&raquo;</span>"
+#: library/extensions/content-extensions.php:1414
+#@ thematic
+msgid " archive"
 msgstr ""
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/content-extensions.php:629
+#: library/extensions/content-extensions.php:1417
+#@ thematic
+msgid "Bookmark the "
+msgstr ""
+
+#: library/extensions/content-extensions.php:1418
+#@ thematic
+msgid "permalink"
+msgstr ""
+
+#: library/extensions/content-extensions.php:1572
+#@ thematic
 msgid "This entry was posted in "
 msgstr ""
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/content-extensions.php:632
+#: library/extensions/content-extensions.php:1580
+#@ thematic
 msgid "Also posted in "
 msgstr ""
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/content-extensions.php:635
+#: library/extensions/content-extensions.php:1583
+#@ thematic
 msgid "Posted in "
 msgstr ""
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/content-extensions.php:646
+#: library/extensions/content-extensions.php:1609
+#@ thematic
+msgid " This entry is tagged"
+msgstr ""
+
+#: library/extensions/content-extensions.php:1612
+#@ thematic
 msgid " and tagged"
 msgstr ""
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/content-extensions.php:649
+#: library/extensions/content-extensions.php:1615
+#@ thematic
 msgid " Also tagged "
 msgstr ""
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/content-extensions.php:651
+#: library/extensions/content-extensions.php:1617
+#@ thematic
 msgid "Tagged"
 msgstr ""
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/content-extensions.php:663
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/content-extensions.php:666
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/content-extensions.php:669
+#: library/extensions/content-extensions.php:1644
+#: library/extensions/content-extensions.php:1647
+#: library/extensions/content-extensions.php:1650
+#@ thematic
 msgid "Comment on "
 msgstr ""
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/content-extensions.php:664
-msgid " Comments"
-msgstr ""
-
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/content-extensions.php:667
-msgid " Comment"
-msgstr ""
-
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/content-extensions.php:670
+#: library/extensions/content-extensions.php:1651
+#@ thematic
 msgid "Leave a comment"
 msgstr ""
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/content-extensions.php:673
+#: library/extensions/content-extensions.php:1654
+#@ thematic
 msgid "Comments closed"
 msgstr ""
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/content-extensions.php:686
-msgid ". Bookmark the "
-msgstr ""
-
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/content-extensions.php:687
-msgid "permalink"
-msgstr ""
-
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/content-extensions.php:689
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/content-extensions.php:697
+#: library/extensions/content-extensions.php:1678
+#: library/extensions/content-extensions.php:1686
+#@ thematic
 msgid "Post a comment"
 msgstr ""
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/content-extensions.php:690
+#: library/extensions/content-extensions.php:1679
+#@ thematic
 msgid " or leave a trackback: "
 msgstr ""
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/content-extensions.php:691
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/content-extensions.php:694
+#: library/extensions/content-extensions.php:1680
+#: library/extensions/content-extensions.php:1683
+#@ thematic
 msgid "Trackback URL for your post"
 msgstr ""
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/content-extensions.php:691
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/content-extensions.php:694
+#: library/extensions/content-extensions.php:1680
+#: library/extensions/content-extensions.php:1683
+#@ thematic
 msgid "Trackback URL"
 msgstr ""
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/content-extensions.php:693
+#: library/extensions/content-extensions.php:1682
+#@ thematic
 msgid " Comments are closed, but you can leave a trackback: "
 msgstr ""
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/content-extensions.php:696
+#: library/extensions/content-extensions.php:1685
+#@ thematic
 msgid " Trackbacks are closed, but you can "
 msgstr ""
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/content-extensions.php:697
+#: library/extensions/content-extensions.php:1686
+#@ thematic
 msgid "post a comment"
 msgstr ""
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/content-extensions.php:699
+#: library/extensions/content-extensions.php:1688
+#@ thematic
 msgid " Both comments and trackbacks are currently closed."
 msgstr ""
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/discussion.php:10
+#: 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>"
 msgstr ""
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/discussion.php:15
-msgid "\t\t\t\t\t<span class='unapproved'>Your comment is awaiting moderation.</span>\n"
+#: library/extensions/discussion-extensions.php:35
+#@ thematic
+msgid "Edit comment"
 msgstr ""
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/discussion.php:22
+#: library/extensions/discussion.php:52
+#@ thematic
 msgid "Reply"
 msgstr ""
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/discussion.php:23
+#: library/extensions/discussion.php:53
+#@ thematic
 msgid "Log in to reply."
 msgstr ""
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/discussion.php:37
+#: library/extensions/discussion.php:80
 #, php-format
+#@ thematic
 msgid "By %1$s on %2$s at %3$s"
 msgstr ""
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/discussion.php:42
-msgid "\\t\\t\\t\\t\\t<span class=\"unapproved\">Your trackback is awaiting moderation.</span>\\n"
-msgstr ""
-
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/header-extensions.php:251
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/widgets.php:77
+#: library/extensions/header-extensions.php:302
+#: library/extensions/widgets.php:157
+#@ thematic
 msgid "Posts RSS feed"
 msgstr ""
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/header-extensions.php:269
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/widgets.php:78
+#: library/extensions/header-extensions.php:326
+#: library/extensions/widgets.php:158
+#@ thematic
 msgid "Comments RSS feed"
 msgstr ""
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/header-extensions.php:401
+#: functions.php:253
+#@ thematic
+msgid "Primary Menu"
+msgstr ""
+
+#: library/extensions/header-extensions.php:625
+#@ thematic
 msgid "Skip navigation to the content"
 msgstr ""
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/header-extensions.php:401
+#: library/extensions/header-extensions.php:625
+#@ thematic
 msgid "Skip to content"
 msgstr ""
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/helpers.php:31
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/helpers.php:44
+#: library/extensions/helpers.php:50
+#: library/extensions/helpers.php:69
+#@ thematic
 msgid "There is no excerpt because this is a protected post."
 msgstr ""
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/shortcodes.php:16
+#: library/extensions/shortcodes.php:40
+#@ thematic
 msgid "Login"
 msgstr ""
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/shortcodes.php:18
+#: library/extensions/shortcodes.php:42
+#@ thematic
 msgid "Logout"
 msgstr ""
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/theme-options.php:13
+#: library/extensions/theme-options.php:50
+#@ thematic
 msgid "Index Insert Position"
 msgstr ""
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/theme-options.php:14
-msgid "The widgetized Index Insert will follow after this post number."
+#: library/extensions/theme-options.php:51
+#@ thematic
+msgid "Info on Author Page"
 msgstr ""
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/theme-options.php:19
-msgid "Info on Author Page"
+#: library/extensions/theme-options.php:52
+#@ thematic
+msgid "Text in Footer"
 msgstr ""
 
-#: c:\xampp\htdocs\development\wp-content\themes\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."
+#: library/extensions/widgets-extensions.php:34
+#@ thematic
+msgid "To search, type and hit enter"
 msgstr ""
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/theme-options.php:25
-msgid "Text in Footer"
+#: library/extensions/widgets-extensions.php:40
+#: library/extensions/widgets.php:56
+#: library/extensions/widgets.php:61
+#@ thematic
+msgid "Search"
 msgstr ""
 
-#: c:\xampp\htdocs\development\wp-content\themes\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]"
+#: library/extensions/widgets-extensions.php:72
+#@ thematic
+msgid "The primary widget area, most often used as a sidebar."
 msgstr ""
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/theme-options.php:28
-msgid "Powered by [wp-link]. Built on the [theme-link]."
+#: library/extensions/widgets-extensions.php:87
+#@ thematic
+msgid "The secondary widget area, most often used as a sidebar."
 msgstr ""
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/theme-options.php:75
-msgid "settings saved."
+#: library/extensions/widgets-extensions.php:102
+#@ thematic
+msgid "The 1st widget area in the footer."
 msgstr ""
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/theme-options.php:76
-msgid "settings reset."
+#: library/extensions/widgets-extensions.php:117
+#@ thematic
+msgid "The 2nd widget area in the footer."
 msgstr ""
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/theme-options.php:77
-msgid "widgets reset."
+#: library/extensions/widgets-extensions.php:132
+#@ thematic
+msgid "The 3rd widget area in the footer."
 msgstr ""
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/theme-options.php:190
-msgid "Save changes"
+#: library/extensions/widgets-extensions.php:147
+#@ thematic
+msgid "The top widget area displayed on the index page."
 msgstr ""
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/theme-options.php:196
-msgid "Reset"
+#: library/extensions/widgets-extensions.php:162
+#@ thematic
+msgid "The widget area inserted after x posts on the index page."
 msgstr ""
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/theme-options.php:202
-msgid "Reset Widgets"
+#: library/extensions/widgets-extensions.php:177
+#@ thematic
+msgid "The bottom widget area displayed on the index page."
 msgstr ""
 
-#: c:\xampp\htdocs\development\wp-content\themes\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."
+#: library/extensions/widgets-extensions.php:192
+#@ thematic
+msgid "The top widget area displayed on a single post."
 msgstr ""
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/widgets-extensions.php:12
-msgid "To search, type and hit enter"
+#: library/extensions/widgets-extensions.php:207
+#@ thematic
+msgid "The widget area inserted between the post and the comments on a single post."
 msgstr ""
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/widgets-extensions.php:18
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/widgets-extensions.php:281
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/widgets.php:43
-msgid "Search"
+#: library/extensions/widgets-extensions.php:222
+#@ thematic
+msgid "The bottom widget area displayed on a single post."
 msgstr ""
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/widgets-extensions.php:43
-msgid "The primary widget area, most often used as a sidebar."
+#: library/extensions/widgets-extensions.php:237
+#@ thematic
+msgid "The top widget area displayed on a page."
 msgstr ""
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/widgets-extensions.php:58
-msgid "The secondary widget area, most often used as a sidebar."
+#: library/extensions/widgets-extensions.php:252
+#@ thematic
+msgid "The bottom widget area displayed on a page."
 msgstr ""
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/widgets-extensions.php:73
-msgid "The 1st widget area in the footer."
+#: library/extensions/widgets.php:55
+#@ thematic
+msgid "A search form for your blog"
 msgstr ""
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/widgets-extensions.php:88
-msgid "The 2nd widget area in the footer."
+#: library/extensions/widgets.php:77
+#: library/extensions/widgets.php:132
+#: library/extensions/widgets.php:175
+#@ thematic
+msgid "Title:"
 msgstr ""
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/widgets-extensions.php:103
-msgid "The 3rd widget area in the footer."
+#: library/extensions/widgets.php:100
+#@ thematic
+msgid "Log in/out and admin"
 msgstr ""
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/widgets-extensions.php:118
-msgid "The top widget area displayed on the index page."
+#: library/extensions/widgets.php:101
+#: library/extensions/widgets.php:106
+#@ thematic
+msgid "Meta"
 msgstr ""
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/widgets-extensions.php:133
-msgid "The widget area inserted after x posts on the index page."
+#: library/extensions/widgets.php:145
+#@ thematic
+msgid "Links to your posts and comments feed"
 msgstr ""
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/widgets-extensions.php:148
-msgid "The bottom widget area displayed on the index page."
+#: library/extensions/widgets.php:146
+#: library/extensions/widgets.php:151
+#@ thematic
+msgid "RSS Links"
 msgstr ""
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/widgets-extensions.php:163
-msgid "The top widget area displayed on a single post."
+#: library/extensions/widgets.php:157
+#@ thematic
+msgid "All posts"
 msgstr ""
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/widgets-extensions.php:178
-msgid "The widget area inserted between the post and the comments on a single post."
+#: library/extensions/widgets.php:158
+#@ thematic
+msgid "All comments"
 msgstr ""
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/widgets-extensions.php:193
-msgid "The bottom widget area displayed on a single post."
+#: archives.php:20
+#: template-page-blog.php:22
+#, php-format
+#@ thematic
+msgid "The template %s"
 msgstr ""
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/widgets-extensions.php:208
-msgid "The top widget area displayed on a page."
+#: comments.php:24
+#@ thematic
+msgid "Please do not load this page directly."
 msgstr ""
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/widgets-extensions.php:223
-msgid "The bottom widget area displayed on a page."
+#: comments.php:111
+#@ thematic
+msgid "Trackbacks"
 msgstr ""
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/widgets-extensions.php:283
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/widgets.php:55
-msgid "Meta"
+#: library/extensions/comments-extensions.php:131
+#@ thematic
+msgid "Comments"
 msgstr ""
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/widgets-extensions.php:285
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/widgets-extensions.php:286
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/widgets.php:72
-msgid "RSS Links"
+#: library/extensions/content-extensions.php:334
+#@ thematic
+msgid "Author Archives:"
 msgstr ""
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/widgets.php:77
-msgid "All posts"
+#: 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 ""
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/widgets.php:78
-msgid "All comments"
+#: library/extensions/content-extensions.php:1364
+#, php-format
+#@ thematic
+msgid "Read More %s"
 msgstr ""
 
-#: c:\xampp\htdocs\development\wp-content\themes\thematic/library/extensions/widgets.php:96
-msgid "Title:"
+#: 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:"
+msgstr ""
+
+#: library/extensions/theme-options.php:206
+#@ thematic
+msgid "For support:"
+msgstr ""
+
+#: library/extensions/theme-options.php:208
+#@ thematic
+msgid "forums"
+msgstr ""
+
+#: library/extensions/theme-options.php:212
+#@ thematic
+msgid "The options below are enabled by the Thematic Theme framework and/or a child theme."
+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."
+msgstr ""
+
+#: library/extensions/theme-options.php:219
+#@ thematic
+msgid "Overview"
+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."
+msgstr ""
+
+#: library/extensions/theme-options.php:262
+#, php-format
+#@ thematic
+msgid "%s Theme Options"
+msgstr ""
+
+#: library/extensions/theme-options.php:276
+#@ thematic
+msgid "Save Changes"
+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."
+msgstr ""
+
+#: library/extensions/theme-options.php:324
+#@ thematic
+msgid "Display a"
+msgstr ""
+
+#: library/extensions/theme-options.php:324
+#@ thematic
+msgid "with the author's avatar, bio and email on the author page."
+msgstr ""
+
+#: library/extensions/theme-options.php:337
+#@ thematic
+msgid "You can use HTML and shortcodes in your footer text. Shortcode examples"
+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."
+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."
+msgstr ""
+
+#: template-page-blog.php:22
+#, php-format
+#@ thematic
+msgid "You can include a %s in a childtheme"
 msgstr ""
 
diff --git a/wp-content/themes/thematic/library/languages/tr_TR.mo b/wp-content/themes/thematic/library/languages/tr_TR.mo
new file mode 100644
index 0000000000000000000000000000000000000000..b927ab5dbaf3120a5da773e16f015546981a44a2
Binary files /dev/null and b/wp-content/themes/thematic/library/languages/tr_TR.mo differ
diff --git a/wp-content/themes/thematic/library/languages/tr_TR.po b/wp-content/themes/thematic/library/languages/tr_TR.po
new file mode 100644
index 0000000000000000000000000000000000000000..817bce80d12becfd81267a22547297cb1596727a
--- /dev/null
+++ b/wp-content/themes/thematic/library/languages/tr_TR.po
@@ -0,0 +1,561 @@
+# Translation of Thematic 1.0.3 in Turkish
+# This file is distributed under the same license as the Thematic 1.0.3 package.
+msgid ""
+msgstr ""
+"PO-Revision-Date: 2012-06-25 15:46:44+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"
+
+#: 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 "Düzenle"
+
+#: attachment.php:62 library/extensions/content-extensions.php:666
+#: library/extensions/content-extensions.php:732
+msgid "Pages:"
+msgstr "Sayfalar:"
+
+#: author.php:67
+msgid "Email "
+msgstr "E-posta"
+
+#: comments.php:33
+msgid "This post is password protected. Enter the password to view any comments."
+msgstr "Bu yazı parola korumalıdır. Yorumları görmek için parolanızı giriniz. "
+
+#: comments.php:111
+msgid "<span>One</span> Trackback"
+msgstr "<span>1</span> Gerilink"
+
+#: 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 "Yorum yapabilmek için <a href=\"%s\" title=\"giriş\">giriş</a> yapmalısınız."
+
+#: 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\"><a href=\"%1$s\" title=\"Logged in as %2$s\">%2$s</a> olarak giriş yapıldı.</span> <span class=\"logout\"><a href=\"%3$s\" title=\"Sortir d'aquest compte\" >buradan çıkabilirsiniz.</a></span>"
+
+#: comments.php:164 library/extensions/comments-extensions.php:233
+msgid "Your email is <em>never</em> published nor shared."
+msgstr "E-posta adresiniz <em>hiçbir şekilde</em> yayınlanmayacak ya da paylaşılmayacaktır. "
+
+#: comments.php:164 library/extensions/comments-extensions.php:233
+msgid "Required fields are marked <span class=\"required\">*</span>"
+msgstr "Doldurulması gerekli alanlar <span class=\"gerekli\">*</span> olarak işaretlenmiştir."
+
+#: comments.php:167 library/extensions/comments-extensions.php:224
+msgid "Name"
+msgstr "İsim"
+
+#: 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=\"gerekli\">*</span>"
+
+#: comments.php:172 library/extensions/comments-extensions.php:225
+msgid "Email"
+msgstr "E-posta"
+
+#: comments.php:177 library/extensions/comments-extensions.php:226
+msgid "Website"
+msgstr "Websitesi"
+
+#: 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 ""
+
+#: page.php:58 template-page-fullwidth.php:59
+msgid "Pages: "
+msgstr "Sayfalar: "
+
+#: search.php:56
+msgid "Nothing Found"
+msgstr "Sonuç Bulunamadı"
+
+#: search.php:60
+msgid "Sorry, but nothing matched your search criteria. Please try again with some different keywords."
+msgstr "Üzgünüm fakat yaptığınız aramaya ilişkin bir sonuç bulunamadı. Farklı bir kelime ile arama yapınız. "
+
+#: library/extensions/content-extensions.php:1346 search.php:70
+msgid "Find"
+msgstr "Bul"
+
+#: library/extensions/comments-extensions.php:120
+msgid "<span>One</span> Comment"
+msgstr "<span>1</span> Yorum"
+
+#: library/extensions/comments-extensions.php:154
+msgid "Post a Comment"
+msgstr "Yorumlarınızı Alalım"
+
+#: library/extensions/comments-extensions.php:165
+msgid "Post a Reply to %s"
+msgstr "%s için yorum yapın"
+
+#: library/extensions/comments-extensions.php:176
+msgid "Comment"
+msgstr "Yorum Alanı"
+
+#: library/extensions/comments-extensions.php:187
+msgid "Cancel reply"
+msgstr ""
+
+#: library/extensions/comments-extensions.php:198
+msgid "Post Comment"
+msgstr "Yorumu Gönder"
+
+#: library/extensions/content-extensions.php:340
+#: library/extensions/header-extensions.php:84
+msgid "Category Archives:"
+msgstr "Konu Arşivleri:"
+
+#: library/extensions/content-extensions.php:349
+#: library/extensions/header-extensions.php:80
+msgid "Search Results for:"
+msgstr "Arama Sonuçları:"
+
+#: library/extensions/content-extensions.php:355
+#: library/extensions/header-extensions.php:88
+msgid "Tag Archives:"
+msgstr "Etiket Arşivleri:"
+
+#: library/extensions/content-extensions.php:364
+#: library/extensions/content-extensions.php:373
+msgid "Archives:"
+msgstr ""
+
+#: library/extensions/content-extensions.php:379
+msgid "Daily Archives: <span>%s</span>"
+msgstr "Günlük Arşivler: <span>%s</span>"
+
+#: library/extensions/content-extensions.php:383
+msgid "Monthly Archives: <span>%s</span>"
+msgstr "Aylık Arşivler: <span>%s</span>"
+
+#: library/extensions/content-extensions.php:387
+msgid "Yearly Archives: <span>%s</span>"
+msgstr "Yılıkl Arşivi: <span>%s</span>"
+
+#: library/extensions/content-extensions.php:429
+#: library/extensions/content-extensions.php:1728
+msgid "<span class=\"meta-nav\">&laquo;</span> Older posts"
+msgstr "<span class=\"meta-nav\">&laquo;</span> Eski Yazılar"
+
+#: library/extensions/content-extensions.php:431
+#: library/extensions/content-extensions.php:1729
+msgid "Newer posts <span class=\"meta-nav\">&raquo;</span>"
+msgstr "Yeni yazılar <span class=\"meta-nav\">&raquo;</span>"
+
+#: library/extensions/content-extensions.php:946
+#: library/extensions/content-extensions.php:1460
+msgid "Edit post"
+msgstr "Düzenle"
+
+#: library/extensions/content-extensions.php:975
+#: library/extensions/header-extensions.php:92
+msgid "Not Found"
+msgstr "Bulunamadı"
+
+#: library/extensions/content-extensions.php:980
+#: library/extensions/content-extensions.php:1413
+#: library/extensions/content-extensions.php:1417
+msgid "Permalink to "
+msgstr "Yazının linki "
+
+#: library/extensions/content-extensions.php:1041
+msgid "By "
+msgstr "Yazan: "
+
+#: library/extensions/content-extensions.php:1051
+msgid "View all posts by "
+msgstr "Tüm yazılarını görün "
+
+#: library/extensions/content-extensions.php:1079
+msgid "Published: "
+msgstr "Yayınlandı: "
+
+#: library/extensions/content-extensions.php:1252
+msgid "Archives by Category"
+msgstr "Konuya göre arşivler"
+
+#: library/extensions/content-extensions.php:1280
+msgid "Archives by Month"
+msgstr "Aya göre arşivler"
+
+#: library/extensions/content-extensions.php:1413
+msgid "Browse the "
+msgstr ""
+
+#: library/extensions/content-extensions.php:1413
+msgid " Archive"
+msgstr ""
+
+#: library/extensions/content-extensions.php:1414
+msgid " archive"
+msgstr ""
+
+#: library/extensions/content-extensions.php:1417
+msgid "Bookmark the "
+msgstr ""
+
+#: library/extensions/content-extensions.php:1418
+msgid "permalink"
+msgstr "kalıcı bağlantı"
+
+#: library/extensions/content-extensions.php:1572
+msgid "This entry was posted in "
+msgstr "Bu yazı gönderildi"
+
+#: library/extensions/content-extensions.php:1580
+msgid "Also posted in "
+msgstr "aynı zamanda"
+
+#: library/extensions/content-extensions.php:1583
+msgid "Posted in "
+msgstr "Gönderildi"
+
+#: library/extensions/content-extensions.php:1609
+msgid " This entry is tagged"
+msgstr ""
+
+#: library/extensions/content-extensions.php:1612
+msgid " and tagged"
+msgstr "etiketlendi"
+
+#: library/extensions/content-extensions.php:1615
+msgid " Also tagged "
+msgstr "etiketlendi"
+
+#: library/extensions/content-extensions.php:1617
+msgid "Tagged"
+msgstr "Etiketler"
+
+#: library/extensions/content-extensions.php:1644
+#: library/extensions/content-extensions.php:1647
+#: library/extensions/content-extensions.php:1650
+msgid "Comment on "
+msgstr "Yorum yap "
+
+#: library/extensions/content-extensions.php:1651
+msgid "Leave a comment"
+msgstr "bir yorum bırakın"
+
+#: library/extensions/content-extensions.php:1654
+msgid "Comments closed"
+msgstr "Yorumlar kapalıdır"
+
+#: library/extensions/content-extensions.php:1678
+#: library/extensions/content-extensions.php:1686
+msgid "Post a comment"
+msgstr "Yorum gönderin."
+
+#: library/extensions/content-extensions.php:1679
+msgid " or leave a trackback: "
+msgstr "veya geri link bırakın: "
+
+#: library/extensions/content-extensions.php:1680
+#: library/extensions/content-extensions.php:1683
+msgid "Trackback URL for your post"
+msgstr "Yazının geri bildirim linki"
+
+#: library/extensions/content-extensions.php:1680
+#: library/extensions/content-extensions.php:1683
+msgid "Trackback URL"
+msgstr "Geri bildirim linki "
+
+#: library/extensions/content-extensions.php:1682
+msgid " Comments are closed, but you can leave a trackback: "
+msgstr "Yorumlar kapalıdır ama isterseniz geri bildirimde bulunabilirsiniz:"
+
+#: library/extensions/content-extensions.php:1685
+msgid " Trackbacks are closed, but you can "
+msgstr "Geri bildirimler şu an kapalı ama arzu ederseniz"
+
+#: library/extensions/content-extensions.php:1686
+msgid "post a comment"
+msgstr "yorum gönderebilir"
+
+#: library/extensions/content-extensions.php:1688
+msgid " Both comments and trackbacks are currently closed."
+msgstr "Hem yorumlar hem de geri bildirimler şu an kapalıdır."
+
+#: 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 "%1$s %2$s'de gönderildi <span class=\"meta-sep\">|</span> <a href=\"%3$s\" title=\"Bu yorumun linki\">Yorum linki</a>"
+
+#: library/extensions/discussion-extensions.php:35
+msgid "Edit comment"
+msgstr ""
+
+#: library/extensions/discussion.php:52
+msgid "Reply"
+msgstr "Cevapla"
+
+#: library/extensions/discussion.php:53
+msgid "Log in to reply."
+msgstr "Cevaplamak için giriş yapın"
+
+#: library/extensions/discussion.php:80
+msgid "By %1$s on %2$s at %3$s"
+msgstr "%1$s tarafından %2$s tarihinde %3$s'de"
+
+#: library/extensions/header-extensions.php:302
+#: library/extensions/widgets.php:157
+msgid "Posts RSS feed"
+msgstr "Yazılar RSS"
+
+#: library/extensions/header-extensions.php:326
+#: library/extensions/widgets.php:158
+msgid "Comments RSS feed"
+msgstr "Yorumlar RSS"
+
+#: functions.php:253
+msgid "Primary Menu"
+msgstr ""
+
+#: library/extensions/header-extensions.php:625
+msgid "Skip navigation to the content"
+msgstr "İçeriğe geçiş yapın"
+
+#: library/extensions/header-extensions.php:625
+msgid "Skip to content"
+msgstr "İçeriğe geçin"
+
+#: library/extensions/helpers.php:50 library/extensions/helpers.php:69
+msgid "There is no excerpt because this is a protected post."
+msgstr "Herhangi bir özet bulunmuyor çünkü bu korumalı bir yazı."
+
+#: library/extensions/shortcodes.php:40
+msgid "Login"
+msgstr "Giriş"
+
+#: library/extensions/shortcodes.php:42
+msgid "Logout"
+msgstr "Çıkış"
+
+#: library/extensions/theme-options.php:50
+msgid "Index Insert Position"
+msgstr "Index Insert Konumu"
+
+#: library/extensions/theme-options.php:51
+msgid "Info on Author Page"
+msgstr "Yazar sayfası bilgileri"
+
+#: library/extensions/theme-options.php:52
+msgid "Text in Footer"
+msgstr "Footer alanı metni"
+
+#: 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 "Arama"
+
+#: library/extensions/widgets-extensions.php:72
+msgid "The primary widget area, most often used as a sidebar."
+msgstr ""
+
+#: library/extensions/widgets-extensions.php:87
+msgid "The secondary widget area, most often used as a sidebar."
+msgstr ""
+
+#: library/extensions/widgets-extensions.php:102
+msgid "The 1st widget area in the footer."
+msgstr ""
+
+#: library/extensions/widgets-extensions.php:117
+msgid "The 2nd widget area in the footer."
+msgstr ""
+
+#: library/extensions/widgets-extensions.php:132
+msgid "The 3rd widget area in the footer."
+msgstr ""
+
+#: library/extensions/widgets-extensions.php:147
+msgid "The top widget area displayed on the index page."
+msgstr ""
+
+#: library/extensions/widgets-extensions.php:162
+msgid "The widget area inserted after x posts on the index page."
+msgstr ""
+
+#: library/extensions/widgets-extensions.php:177
+msgid "The bottom widget area displayed on the index page."
+msgstr ""
+
+#: library/extensions/widgets-extensions.php:192
+msgid "The top widget area displayed on a single post."
+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:222
+msgid "The bottom widget area displayed on a single post."
+msgstr ""
+
+#: library/extensions/widgets-extensions.php:237
+msgid "The top widget area displayed on a page."
+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 "Başlık:"
+
+#: 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 "Bilgi"
+
+#: 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 Linkleri"
+
+#: library/extensions/widgets.php:157
+msgid "All posts"
+msgstr "Tüm Yazılar"
+
+#: library/extensions/widgets.php:158
+msgid "All comments"
+msgstr "Tüm Yorumlar"
+
+#: archives.php:20 template-page-blog.php:22
+msgid "The template %s"
+msgstr ""
+
+#: comments.php:24
+msgid "Please do not load this page directly."
+msgstr ""
+
+#: comments.php:111
+msgid "Trackbacks"
+msgstr ""
+
+#: library/extensions/comments-extensions.php:131
+msgid "Comments"
+msgstr ""
+
+#: library/extensions/content-extensions.php:334
+msgid "Author Archives:"
+msgstr ""
+
+#: library/extensions/content-extensions.php:1340
+msgid "Apologies, but we were unable to find what you were looking for. Perhaps searching will help."
+msgstr ""
+
+#: library/extensions/content-extensions.php:1364
+msgid "Read More %s"
+msgstr ""
+
+#: library/extensions/content-extensions.php:1645
+msgid "Responses"
+msgstr ""
+
+#: library/extensions/content-extensions.php:1648
+msgid "Response"
+msgstr ""
+
+#: library/extensions/discussion.php:37
+msgid "Your comment is awaiting moderation"
+msgstr ""
+
+#: library/extensions/discussion.php:90
+msgid "Your trackback is awaiting moderation"
+msgstr ""
+
+#: library/extensions/theme-options.php:56
+msgid "Remove Legacy Options"
+msgstr ""
+
+#: library/extensions/theme-options.php:204
+msgid "For more information:"
+msgstr ""
+
+#: library/extensions/theme-options.php:206
+msgid "For support:"
+msgstr ""
+
+#: library/extensions/theme-options.php:208
+msgid "forums"
+msgstr ""
+
+#: library/extensions/theme-options.php:212
+msgid "The options below are enabled by the Thematic Theme framework and/or a child theme."
+msgstr ""
+
+#: 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 ""
+
+#: library/extensions/theme-options.php:219
+msgid "Overview"
+msgstr ""
+
+#: 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 ""
+
+#: library/extensions/theme-options.php:262
+msgid "%s Theme Options"
+msgstr ""
+
+#: library/extensions/theme-options.php:276
+msgid "Save Changes"
+msgstr ""
+
+#: 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 ""
+
+#: library/extensions/theme-options.php:324
+msgid "Display a"
+msgstr ""
+
+#: library/extensions/theme-options.php:324
+msgid "with the author's avatar, bio and email on the author page."
+msgstr ""
+
+#: library/extensions/theme-options.php:337
+msgid "You can use HTML and shortcodes in your footer text. Shortcode examples"
+msgstr ""
+
+#: 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 ""
+
+#: 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 ""
+
+#: template-page-blog.php:22
+msgid "You can include a %s in a childtheme"
+msgstr ""
\ No newline at end of file
diff --git a/wp-content/themes/thematic/library/layouts/2c-l-fixed.css b/wp-content/themes/thematic/library/layouts/2c-l-fixed.css
index 89553b48b938816e7f55a4eb87b72eba371f489d..cbf1bf9810e7f012f66476259551b8008c643383 100644
--- a/wp-content/themes/thematic/library/layouts/2c-l-fixed.css
+++ b/wp-content/themes/thematic/library/layouts/2c-l-fixed.css
@@ -38,7 +38,7 @@ body {
     margin: 0 0 0 320px;
 }
 .hentry {
-    width:620px;
+    width: auto;
 }
 .main-aside {
     width:300px;
diff --git a/wp-content/themes/thematic/library/legacy/deprecated.php b/wp-content/themes/thematic/library/legacy/deprecated.php
index 807945df5f938f12e04a558af13561a204d954c6..df81a8b931ed5d6f3e3ee2114691ef5f0944ea2b 100644
--- a/wp-content/themes/thematic/library/legacy/deprecated.php
+++ b/wp-content/themes/thematic/library/legacy/deprecated.php
@@ -1,5 +1,10 @@
 <?php
-
+/**
+ * Deprecated Functions
+ *
+ * @package ThematicLegacy
+ */
+ 
 /**
  * Function for handling the bloginfo / get_bloginfo data using our own 'cache'.
  *
@@ -10,11 +15,8 @@
  * @since 0.9.6
  * @deprecated 0.9.6.1
  */
-
 function thm_bloginfo($command = '', $echo = FALSE) {
-
 	_deprecated_function( __FUNCTION__, '0.9.6.1', 'bloginfo() or get_bloginfo()' );
-
     if ($echo) {
 	   bloginfo($command);
     } else {
@@ -32,14 +34,279 @@ function thm_bloginfo($command = '', $echo = FALSE) {
  * @since 0.9.6
  * @deprecated 0.9.7.3
  */
+function is_sidebar_active( $index ){
+	_deprecated_function( __FUNCTION__, '0.9.7.3', 'is_active_sidebar()' );
+	return is_active_sidebar( $index );
+}
 
 
-function is_sidebar_active( $index ){
+/**
+ * Switch adding the comment-reply script 
+ * 
+ * Removed in favor of hooking into wp_enqueue_scripts over calling directly in header.php
+ * Note that in 1.0 the comment reply script is still enqueued by default.
+ * Use wp_dequeue_script('comment-reply') to remove the script instead of using the filter: thematic_show_commentreply.
+ *
+ * @deprecated 1.0
+ */
+function thematic_show_commentreply() {
+	_deprecated_function( __FUNCTION__, '1.0' );
+    $display = TRUE;
+    $display = apply_filters('thematic_show_commentreply', $display);
+    if ($display)
+        if ( is_singular() ) 
+            wp_enqueue_script('comment-reply'); 
+}
 
-	_deprecated_function( __FUNCTION__, '0.9.7.3', 'is_active_sidebar()' );
 
-	return is_active_sidebar( $index );
+/**
+ * Get the page number for title tag
+ *
+ * This has been integrated into thematic_doctitle()
+ *
+ * @deprecated 1.0
+ */
+function pageGetPageNo() {
+	_deprecated_function( __FUNCTION__, '1.0' );
+    if ( get_query_var('paged') )
+        print ' | Page ' . get_query_var('paged');
+}
+
+
+if ( function_exists( 'childtheme_override_comment_class' ) )  {
+	_deprecated_function('childtheme_override_comment_class', '1.0', 'comment_class()' );
+	/**
+ 	 * @ignore
+ 	 */
+ 	function thematic_comment_class() {
+		childtheme_override_comment_class();
+	}
+} else {
+	/**
+	 * Generates semantic classes for each comment LI element
+	 * 
+	 * Removed due to duplication of the core WordPress comment_class()
+	 * 
+ 	 * @deprecated 1.0
+	 */
+	function thematic_comment_class( $print = true ) {
+		_deprecated_function( __FUNCTION__, '1.0', 'comment_class()' );
+
+		global $comment, $post, $thematic_comment_alt, $comment_depth, $comment_thread_alt;
+
+		// Collects the comment type (comment, trackback),
+		$c = array( $comment->comment_type );
+
+		// Counts trackbacks (t[n]) or comments (c[n])
+		if ( $comment->comment_type == 'comment' ) {
+			$c[] = "c$thematic_comment_alt";
+		} else {
+			$c[] = "t$thematic_comment_alt";
+		}
+
+		// If the comment author has an id (registered), then print the log in name
+		if ( $comment->user_id > 0 ) {
+			$user = get_userdata($comment->user_id);
+			// For all registered users, 'byuser'; to specificy the registered user, 'commentauthor+[log in name]'
+			$c[] = 'byuser comment-author-' . sanitize_title_with_dashes(strtolower( $user->user_login ));
+			// For comment authors who are the author of the post
+			if ( $comment->user_id === $post->post_author )
+				$c[] = 'bypostauthor';
+		}
+
+		// If it's the other to the every, then add 'alt' class; collects time- and date-based classes
+		thematic_date_classes( mysql2date( 'U', $comment->comment_date ), $c, 'c-' );
+		if ( ++$thematic_comment_alt % 2 )
+			$c[] = 'alt';
 
+		// Comment depth
+		$c[] = "depth-$comment_depth";
+
+		// Separates classes with a single space, collates classes for comment LI
+		$c = join( ' ', apply_filters( 'comment_class', $c ) ); // Available filter: comment_class
+
+		// Tada again!
+		return $print ? print($c) : $c;
+	}
+}
+
+/**
+ * Generates the Thematic "Read more" text for excerpts 
+ * 
+ * Removed for namespacing
+ *
+ * @deprecated 1.0
+ */
+function more_text() {
+	_deprecated_function( __FUNCTION__, '1.0', 'thematic_more_text()');
+	thematic_more_text();
+}
+
+/**
+ * Filter: list_comments_arg
+ * 
+ * Removed for namespacing
+ *
+ * @deprecated 1.0
+ */
+function list_comments_arg() {
+	_deprecated_function( __FUNCTION__, '1.0', 'thematic_list_comments_arg()');
+	thematic_list_comments_arg();
+}
+
+/**
+ * Create the arguments for wp_list_bookmarks in links.php
+ * 
+ * Removed for namespacing
+ *
+ * @deprecated 1.0
+ */
+function list_bookmarks_args() {
+	_deprecated_function( __FUNCTION__, '1.0', 'thematic_list_bookmarks_args()' );
+	thematic_list_bookmarks_args();
+}
+
+
+/**
+ * Register action hook: widget_area_primary_aside
+ * 
+ * Removed for namespacing
+ *
+ * @deprecated 1.0
+ */
+function widget_area_primary_aside() {
+	_deprecated_function( __FUNCTION__, '1.0', 'thematic_widget_area_primary_aside()' );
+	thematic_widget_area_primary_aside();
+}
+
+
+/**
+ * Register action hook: widget_area_secondary_aside 
+ *
+ * Removed for namespacing
+ *
+ * @deprecated 1.0
+ */
+function widget_area_secondary_aside() {
+	_deprecated_function( __FUNCTION__, '1.0', 'thematic_widget_area_secondary_aside()' );
+    thematic_widget_area_secondary_aside();
+}
+
+
+/**
+ * Register action hook: widget_area_index_top
+ *
+ * Removed for namespacing
+ *
+ * @deprecated 1.0
+ */
+function widget_area_index_top() {
+	_deprecated_function( __FUNCTION__, '1.0', 'thematic_widget_area_index_top()' );
+    thematic_widget_area_index_top();
+}
+
+
+/**
+ * Register action hook: widget_area_index_insert
+ *
+ * Removed for namespacing
+ *
+ * @deprecated 1.0
+ */
+function widget_area_index_insert() {
+	_deprecated_function( __FUNCTION__, '1.0', 'thematic_widget_area_index_insert()' );
+	thematic_widget_area_index_insert();
+}
+
+
+/**
+ * Register action hook: widget_area_index_bottom 
+ *
+ * Removed for namespacing
+ *
+ * @deprecated 1.0
+ */	
+function widget_area_index_bottom() {
+	_deprecated_function( __FUNCTION__, '1.0', 'thematic_widget_area_index_bottom()' );
+    thematic_widget_area_index_bottom();
+}
+
+
+/**
+ * Register action hook: widget_area_single_top 
+ *
+ * Removed for namespacing
+ *
+ * @deprecated 1.0
+ */
+function widget_area_single_top() {
+	_deprecated_function( __FUNCTION__, '1.0', 'thematic_widget_area_single_top()' );
+    thematic_widget_area_single_top();
+}
+
+
+/**
+ * Register action hook: widget_area_single_insert 
+ *
+ * Removed for namespacing
+ *
+ * @deprecated 1.0
+ */
+function widget_area_single_insert() {
+	_deprecated_function( __FUNCTION__, '1.0', 'thematic_widget_area_single_insert()' );
+    thematic_widget_area_single_insert();
+}
+
+
+/**
+ * Register action hook: widget_area_single_bottom 
+ *
+ * Removed for namespacing
+ *
+ * @deprecated 1.0
+ */
+function widget_area_single_bottom() {
+	_deprecated_function( __FUNCTION__, '1.0', 'thematic_widget_area_single_bottom()' );
+    thematic_widget_area_single_bottom();
+}
+
+
+/**
+ * Register action hook: widget_area_page_top 
+ *
+ * Removed for namespacing
+ *
+ * @deprecated 1.0	 
+ */
+function widget_area_page_top() {
+	_deprecated_function( __FUNCTION__, '1.0', 'thematic_widget_area_page_top()' );
+	thematic_widget_area_page_top();
+}
+	
+	
+/**
+ * Register action hook: widget_area_page_bottom 
+ *
+ * Removed for namespacing
+ *
+ * @deprecated 1.0	 
+ */
+function widget_area_page_bottom() {
+	_deprecated_function( __FUNCTION__, '1.0', 'thematic_widget_page_bottom()' );
+	thematic_widget_page_bottom();
+}
+
+
+/**
+ * Register action hook: widget_area_subsidiaries
+ * 
+ * Removed for namespacing
+ *
+ * @deprecated 1.0
+ */
+ function widget_area_subsidiaries() {
+	_deprecated_function( __FUNCTION__, '1.0', 'thematic_widget_area_subsidiaries()' );
+	thematic_widget_area_subsidiaries();
 }
 
 ?>
\ No newline at end of file
diff --git a/wp-content/themes/thematic/library/styles/default.css b/wp-content/themes/thematic/library/styles/default.css
index fef33222ff7f93d4ec7ffe4b7a5069acc93e804e..8eb863f018e7413321fbadd1245e251ae41e3271 100644
--- a/wp-content/themes/thematic/library/styles/default.css
+++ b/wp-content/themes/thematic/library/styles/default.css
@@ -37,10 +37,13 @@ th, td {
 hr {
     background-color:#ccc;
     border:0;
-    color:#ccc;
     height:1px;
     margin-bottom:22px;
 }
+.ie7 hr {
+	background-color:transparent;
+	color:#ccc;
+}
 a:link {
     color:#004B91;
 }
@@ -82,7 +85,6 @@ a:hover {
     font-style:italic;
 }
 
-
 /* =Menu
 -------------------------------------------------------------- */
 
@@ -98,101 +100,101 @@ a:hover {
 }
 /*** ESSENTIAL STYLES ***/
 .sf-menu, .sf-menu * {
-	margin:			0;
-	padding:		0;
-	list-style:		none;
+	margin:0;
+	padding:0;
+	list-style:none;
 }
 .sf-menu {
-	line-height:	1.0;
+	line-height:1.0;
 }
 .sf-menu ul {
-	position:		absolute;
-	top:			-999em;
-	width:			10em; /* left offset of submenus need to match (see below) */
+	position:absolute;
+	top:-999em;
+	width:10em; /* left offset of submenus need to match (see below) */
 }
 .sf-menu ul li {
-	width:			100%;
+	width:100%;
 }
 .sf-menu li:hover {
-	visibility:		inherit; /* fixes IE7 'sticky bug' */
+	visibility:inherit; /* fixes IE7 'sticky bug' */
 }
 .sf-menu li {
-	float:			left;
-	position:		relative;
+	float:left;
+	position:relative;
 }
 .sf-menu a {
-	display:		block;
-	position:		relative;
+	display:block;
+	position:relative;
 }
 .sf-menu li:hover ul,
 .sf-menu li.sfHover ul {
-	left:			0;
-	top:			2.5em; /* match top ul list item height */
-	z-index:		99;
+	left:0;
+	top:2.5em; /* match top ul list item height */
+	z-index:99;
 }
 ul.sf-menu li:hover li ul,
 ul.sf-menu li.sfHover li ul {
-	top:			-999em;
+	top:-999em;
 }
 ul.sf-menu li li:hover ul,
 ul.sf-menu li li.sfHover ul {
-	left:			10em; /* match ul width */
-	top:			0;
+	left:10em; /* match ul width */
+	top:0;
 }
 ul.sf-menu li li:hover li ul,
 ul.sf-menu li li.sfHover li ul {
-	top:			-999em;
+	top:-999em;
 }
 ul.sf-menu li li li:hover ul,
 ul.sf-menu li li li.sfHover ul {
-	left:			10em; /* match ul width */
-	top:			0;
+	left:10em; /* match ul width */
+	top:0;
 }
 
 /*** THEMATIC SKIN ***/
 .sf-menu {
-    border-right:1px solid #ccc;
 	float:left;
-}
-.ie6 .sf-menu {
-	margin-bottom: -1px;
+	margin-left:1px;
 }
 .sf-menu a {
-	border-left:1px solid #ccc;
-	border-top:1px solid #ccc;
-	border-bottom:1px solid #ccc;
+  	border-color:#CCCCCC;
+    border-style:solid;
+    border-width:1px;
 	padding:9px 13px;
 	text-decoration:none;
+	margin-left:-1px;
 }
-.windows .sf-menu a {
-	font-size: 12px;
-	padding:9px 13px 10px;
+.ie7 .sf-menu a {
+	width:100%;
 }
+.sf-menu .current-menu-item a,
+.sf-menu .current-menu-parent a,
+.sf-menu .current-menu-ancestor a,
+.sf-menu .current-post-ancestor a,
 .sf-menu .current_page_item a,
 .sf-menu .current_page_ancestor a,
 .sf-menu .current_page_parent a {
     border-bottom-color:#fff;
 }
 .sf-menu a, .sf-menu a:visited  { /* visited pseudo selector so IE6 applies text colour*/
-	color:			#666;
+	color:#666;
 }
 .sf-menu li {
-	background:		#fff;
+	background:#fff;
 }
 .sf-menu li li {
-	background:		#fff;
+	background:#fff;
 }
 .sf-menu li li li {
-	background:		#9AAEDB;
+	background:#9AAEDB;
 }
 .sf-menu li:hover, .sf-menu li.sfHover,
 .sf-menu a:focus, .sf-menu a:hover, .sf-menu a:active {
-    background:     #fafafa;
-	outline:		0;
+    background:#fafafa;
+	outline: 0;
     border-bottom-color:#ccc;
 }
 .sf-menu ul {
-    border-right:1px solid #ccc;
     border-bottom:1px solid #ccc;
 }
 .sf-menu li:hover ul,
@@ -210,7 +212,6 @@ ul.sf-menu li li li.sfHover ul {
     color: #FF4B33;
 }
 
-
 /* =Content
 -------------------------------------------------------------- */
 
@@ -274,7 +275,7 @@ ul.sf-menu li li li.sfHover ul {
 }
 .entry-meta .author {
 }
-.entry-meta .n {
+.entry-meta .n, .entry-meta .nickname {
     font-size:11px;
     font-style:normal;
     letter-spacing:0.05em;
@@ -340,11 +341,12 @@ ul.sf-menu li li li.sfHover ul {
 .entry-utility a:hover {
     color: #FF4B33;
 }
-.edit-link {
+.page .edit-link {
 	clear:both;
 	display:block;
 }
 .page-link {
+	clear:both;
     font-size:13px;
     font-weight:bold;
     line-height:18px;
@@ -374,43 +376,6 @@ li.content-column {
     margin-right:20px;
     width:45%;
 }
-.gallery {
-	display: block;
-	clear: both;
-	overflow: hidden;
-	margin: 0 auto;
-    padding:0 0 22px 0;
-	}
-.gallery .gallery-row {
-	display: block;
-	clear: both;
-	overflow: hidden;
-	margin: 0;
-	}
-.gallery .gallery-item {
-	overflow: hidden;
-	float: left;
-	margin: 0;
-	text-align: center;
-	list-style: none;
-	padding: 0;
-	}
-.gallery .gallery-item img, .gallery .gallery-item img.thumbnail {
-	max-width: 89%;
-	height: auto;
-	padding: 1%;
-	margin: 0 auto;
-	border: none !important;
-	}
-.gallery-caption {
-	margin-left: 0;
-	}
-.wp-caption-text,
-.gallery-caption {
-    color:#666;
-    font-size:13px;
-    line-height:18px;
-}
 #author-info {
     margin:0 0 44px 0;
     overflow:hidden;
@@ -511,19 +476,28 @@ li.content-column {
     padding:0 0 18px 0;
 }
 #comments-list {
-    padding:0 0 18px 0;
+    border:1px solid #ccc;
+    border-bottom:none;
+    margin:0 0 18px;
+}
+#comments-list h3 {
+	padding-bottom: 0;
 }
-#comments-list ol,
+#comments-list,
 #comments-list ul {
     list-style:none;
-    margin:0;
 }
+#comments-list ul,
 #comments-list ol {
-    border:1px solid #ccc;
-    border-bottom:none;
-    margin:0 0 18px 0;
+    padding-bottom: 18px;
+}
+#comments-list ul ul,
+#comments-list ol ol,
+#comments-list ul ul ul,
+#comments-list ol ol ol {
+    padding-bottom:0;
 }
-#comments-list li {
+#comments-list .comment {
     background:#fafafa;
     border-bottom:1px solid #ccc;
     padding:18px 1.5em 0 1.5em;
@@ -535,7 +509,7 @@ li.content-column {
 #comments-list li.bypostauthor {
     background:#FFFFCC;
 }
-#comments-list ul li {
+#comments-list ul .comment {
     border:1px solid #ccc;
     margin:0 0 18px 0;
 }
@@ -580,7 +554,7 @@ li.content-column {
 }
 .comment-navigation {
     font-weight:bold;
-    padding:0 0 18px 0;
+	padding: 18px 0 24px;
     margin-right:0.5em;
 }
 .comment-navigation a {
@@ -699,14 +673,18 @@ li.content-column {
     font-size:12px;
     line-height:18px;
 }
+.aside .current-menu-item a,
 .aside .current_page_item a {
     color: #FF4B33;
 }
-.aside .current_page_item .page_item a {
+.aside .current-menu-item .menu-item a,
+.aside .current_page_item .menu-item a {
     color:#666;
 }
-.aside .current_page_item .page_item a:hover,
-.aside .current_page_item .page_item a:active {
+.aside .current-menu-item .menu-item a:hover,
+.aside .current-menu-item .menu-item a:active,
+.aside .current_page_item .menu-item a:hover,
+.aside .current_page_item .menu-item a:active {
     color: #FF4B33;
 }
 .aside {
@@ -842,54 +820,4 @@ li.content-column {
 #siteinfo a:active,
 #siteinfo a:hover {
     color: #FF4B33;
-}
-
-
-/* =PageNavi
--------------------------------------------------------------- */
-
-/* Using !important to override PageNavi CSS */
-
-.wp-pagenavi {
-    margin:0 0 0 -.5em;
-    padding:0.5em 0;    
-}
-.wp-pagenavi a, .wp-pagenavi a:link, .wp-pagenavi span {
-    border:1px solid #ccc !important;
-    color:#666!important;
-    font-style:normal;
-    margin:0 .375em !important;
-    padding:0.5em 0.25em !important;
-}
-.wp-pagenavi a:visited {
-    border:1px solid #ccc !important;
-    color:#666 !important;
-}
-.wp-pagenavi a:hover {
-    border:1px solid #ccc !important;
-    color:#FF4B33 !important;
-}
-.wp-pagenavi a:active {
-    border:1px solid #ccc !important;
-    color:#FF4B33 !important;
-}
-.wp-pagenavi span.pages {
-    border:none !important;
-    color:#666 !important;
-    margin:0 !important;
-    padding:0 !important;
-}
-.wp-pagenavi span.current {
-    border:none !important;
-    color:#666 !important;
-    font-weight:normal !important;
-    margin:0 !important;
-    padding:0 !important;
-}
-.wp-pagenavi span.extend {
-    background-color:#FFFFFF;
-    border:1px solid #000000;
-    color:#000000;
-    margin:2px;
-    padding:2px 4px;
-}
+}
\ No newline at end of file
diff --git a/wp-content/themes/thematic/library/styles/images.css b/wp-content/themes/thematic/library/styles/images.css
index 040d73efd31d359fb11f81e4a5d8ab89d21318c0..51eb64a804141301608c0e789d350c725ceeeb09 100644
--- a/wp-content/themes/thematic/library/styles/images.css
+++ b/wp-content/themes/thematic/library/styles/images.css
@@ -36,6 +36,7 @@ img.aligncenter {
 	border:1px solid #ccc;
 	text-align: center;
 	margin-bottom:18px;
+	max-width: 96%;
 	padding:9px 5px 0;
 }
 .wp-caption img {
@@ -47,22 +48,53 @@ img.aligncenter {
 	margin: 0;
 	padding:18px 5px;
 }
+.gallery {
+	display: block;
+	clear: both;
+	overflow: hidden;
+	margin: 0 auto;
+    padding:0 0 22px 0;
+	}
+.gallery-row {
+	display: block;
+	clear: both;
+	overflow: hidden;
+	margin: 0;
+	}
+.gallery-item {
+	overflow: hidden;
+	float: left;
+	margin: 0;
+	text-align: center;
+	list-style: none;
+	}
 .gallery-icon {
-	border: 1px solid #ccc;
 	margin: 0 5px;
-	padding-top: 6px;
 }
-.gallery img {
-    margin:0;
+#content .gallery img {
+    border: 1px solid #ccc;
+	margin:0;
+	padding: 6px;
 }
+.gallery-item img, .gallery-item img.thumbnail {
+	margin: 0 auto;
+	}
 .gallery-caption {
 	padding:6px 6px 0;
 }
+.wp-caption-text,
+.gallery-caption {
+    color:#666;
+    font-size:13px;
+    line-height:18px;
+}
 .wp-smiley { /* Prevent the smileys from breaking line-height */
 	max-height:12px;
 	margin:0 !important;
 }
 
+
+
 /*
 
 Adapt the following for use in your Child Themes when using
diff --git a/wp-content/themes/thematic/library/styles/menu.css b/wp-content/themes/thematic/library/styles/menu.css
new file mode 100644
index 0000000000000000000000000000000000000000..954640078b1af9111a3d0860c69fe6e4903db7ec
--- /dev/null
+++ b/wp-content/themes/thematic/library/styles/menu.css
@@ -0,0 +1,126 @@
+/* =Menu
+-------------------------------------------------------------- */
+
+.skip-link {
+    display:none;
+}
+#access {
+    border-bottom:1px solid #ccc;
+    height:32px;
+    font-size:13px;
+    overflow:visible;
+    z-index:100;
+}
+/*** ESSENTIAL STYLES ***/
+.sf-menu, .sf-menu * {
+	margin:			0;
+	padding:		0;
+	list-style:		none;
+}
+.sf-menu {
+	line-height:	1.0;
+}
+.sf-menu ul {
+	position:		absolute;
+	top:			-999em;
+	width:			10em; /* left offset of submenus need to match (see below) */
+}
+.sf-menu ul li {
+	width:			100%;
+}
+.sf-menu li:hover {
+	visibility:		inherit; /* fixes IE7 'sticky bug' */
+}
+.sf-menu li {
+	float:			left;
+	position:		relative;
+}
+.sf-menu a {
+	display:		block;
+	position:		relative;
+}
+.sf-menu li:hover ul,
+.sf-menu li.sfHover ul {
+	left:			0;
+	top:			2.5em; /* match top ul list item height */
+	z-index:		99;
+}
+ul.sf-menu li:hover li ul,
+ul.sf-menu li.sfHover li ul {
+	top:			-999em;
+}
+ul.sf-menu li li:hover ul,
+ul.sf-menu li li.sfHover ul {
+	left:			10em; /* match ul width */
+	top:			0;
+}
+ul.sf-menu li li:hover li ul,
+ul.sf-menu li li.sfHover li ul {
+	top:			-999em;
+}
+ul.sf-menu li li li:hover ul,
+ul.sf-menu li li li.sfHover ul {
+	left:			10em; /* match ul width */
+	top:			0;
+}
+
+/*** THEMATIC SKIN ***/
+.sf-menu {
+    border-right:1px solid #ccc;
+	float:left;
+}
+.ie6 .sf-menu {
+	margin-bottom: -1px;
+}
+.sf-menu a {
+	border-left:1px solid #ccc;
+	border-top:1px solid #ccc;
+	border-bottom:1px solid #ccc;
+	padding:9px 13px;
+	text-decoration:none;
+}
+.windows .sf-menu a {
+	font-size: 12px;
+	padding:9px 13px 10px;
+}
+.sf-menu .current_page_item a,
+.sf-menu .current_page_ancestor a,
+.sf-menu .current_page_parent a {
+    border-bottom-color:#fff;
+}
+.sf-menu a, .sf-menu a:visited  { /* visited pseudo selector so IE6 applies text colour*/
+	color:			#666;
+}
+.sf-menu li {
+	background:		#fff;
+}
+.sf-menu li li {
+	background:		#fff;
+}
+.sf-menu li li li {
+	background:		#9AAEDB;
+}
+.sf-menu li:hover, .sf-menu li.sfHover,
+.sf-menu a:focus, .sf-menu a:hover, .sf-menu a:active {
+    background:     #fafafa;
+	outline:		0;
+    border-bottom-color:#ccc;
+}
+.sf-menu ul {
+    border-right:1px solid #ccc;
+    border-bottom:1px solid #ccc;
+}
+.sf-menu li:hover ul,
+.sf-menu li.sfHover ul {
+	top:32px; /* overriding essential styles */
+}
+.sf-menu ul ul {
+    margin-top:0;
+}
+.sf-menu ul a {
+    background:#fafafa;
+	border-bottom:none;
+}
+.sf-menu ul a:hover {
+    color: #FF4B33;
+}
\ No newline at end of file
diff --git a/wp-content/themes/thematic/library/styles/plugins.css b/wp-content/themes/thematic/library/styles/plugins.css
index 2e9405d8153230a30bfabb8675294aac961cc4e1..59dfeb9dd9a659d1ad95556a26ca86c0af8a1f10 100644
--- a/wp-content/themes/thematic/library/styles/plugins.css
+++ b/wp-content/themes/thematic/library/styles/plugins.css
@@ -14,7 +14,42 @@
 /* =PageNavi
 -------------------------------------------------------------- */
 
-/* I'm not overriding PageNavi anymore, it's too much of a mess.
+/* Make sure to uncheck 'Use pagenavi-css.css' in the page-navi styles */
+
+.wp-pagenavi {
+    padding:0.5em 0;    
+}
+.wp-pagenavi a, .wp-pagenavi a:link, .wp-pagenavi span {
+    border:1px solid #ccc;
+    color:#666;
+    font-style:normal;
+    margin:0 .375em;
+    padding:0.5em 0.5em;
+}
+.wp-pagenavi a:visited {
+    border:1px solid #ccc;
+    color:#666;
+}
+.wp-pagenavi a:hover {
+    border:1px solid #ccc;
+    color:#FF4B33;
+}
+.wp-pagenavi a:active {
+    border:1px solid #ccc;
+    color:#FF4B33;
+}
+.wp-pagenavi span.pages {
+    border:none;
+    color:#666;
+    margin:0;
+    padding:0;
+}
+.wp-pagenavi span.current {
+    color:#000;
+}
+.wp-pagenavi span.extend {
+    color:#000;
+}
 
 /* =WordPress Stats
 -------------------------------------------------------------- */
diff --git a/wp-content/themes/thematic/links.php b/wp-content/themes/thematic/links.php
index 741c62a5a32d74f9541dbbe32d394f9a1dedaa56..0dd498019a8f8a73e510803814369d9a1ceb7e93 100644
--- a/wp-content/themes/thematic/links.php
+++ b/wp-content/themes/thematic/links.php
@@ -1,35 +1,40 @@
 <?php
-/*
-Template Name: Links Page
-*/
-?>
-<?php
-
-    // calling the header.php
-    get_header();
-
-    // action hook for placing content above #container
-    thematic_abovecontainer();
+/**
+ * Template Name: Links Page
+ *
+ * …
+ * 
+ * @package Thematic
+ * @subpackage Templates
+ */
 
+	// calling the header.php
+	get_header();
+	
+	// action hook for placing content above #container
+	thematic_abovecontainer();
 ?>
 
 		<div id="container">
 		
-			<?php thematic_abovecontent(); ?>
-		
-			<div id="content">
-		
-    	        <?php
-    	        
-    	        the_post();
-    	        
-    	        thematic_abovepost();
-    	        
-    	        ?>
+			<?php
+				// action hook for placing content above #content
+				thematic_abovecontent();
+
+				// filter for manipulating the element that wraps the content 
+				echo apply_filters( 'thematic_open_id_content', '<div id="content">' . "\n\n" );
+			
+	            // start the loop
+	            while ( have_posts() ) : the_post();
+
+				// action hook for placing content above #post
+    	    	thematic_abovepost();
+    	    ?>
     	        
-				<div id="post-<?php the_ID();
-					echo '" ';
-					if (!(THEMATIC_COMPATIBLE_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 {
@@ -37,63 +42,47 @@ Template Name: Links Page
 						thematic_post_class();
 						echo '">';
 					}
-	                
-    	            // creating the post header
-    	            thematic_postheader();
-    	            
-    	            ?>
+	            	    
+    	        	// creating the post header
+    	        	thematic_postheader();
+    	        ?>
     	            
 					<div class="entry-content">
     	            
-    	                <?php
-    	                
-    	                the_content();
-    	                
-    	                ?>
+    	                <?php the_content(); ?>
 		
 						<ul id="links-page" class="xoxo">
     	                
-    	                    <?php
-    	                    
-    	                    wp_list_bookmarks(list_bookmarks_args());
-    	                    
-    	                    ?>
+    	                    <?php wp_list_bookmarks( thematic_list_bookmarks_args() ); ?>
     	                    
 						</ul>
     	                
-    	                <?php
-    	                
-    	                edit_post_link(__('Edit', 'thematic'),'<span class="edit-link">','</span>');
-    	                
-    	                ?>
+    	                <?php edit_post_link( __( 'Edit', 'thematic' ),'<span class="edit-link">','</span>' ); ?>
 		
 					</div><!-- .entry-content -->
+					
 				</div><!-- #post -->
 		
     	        <?php 
-    	        
-    	        thematic_belowpost();
-    	    
-	        	// calling the comments template
-        		if (THEMATIC_COMPATIBLE_COMMENT_HANDLING) {
-       				if ( get_post_custom_values('comments') ) {
-						// Add a key/value of "comments" to enable comments on pages!
-	        			thematic_comments_template();
-        			}
-        		} else {
-       				thematic_comments_template();
-        		}
+					// action hook for placing contentbelow #post
+    	        	thematic_belowpost();
     	    
+       				// action hook for calling the comments_template
+        			thematic_comments_template();
+        			
+        			// end loop
+        			endwhile;
     	        ?>
 		
 			</div><!-- #content -->
 			
-			<?php thematic_belowcontent(); ?> 
-			
+			<?php 
+				// action hook for placing content below #content
+				thematic_belowcontent(); 
+			?> 
 		</div><!-- #container -->
 
 <?php 
-
     // action hook for placing content below #container
     thematic_belowcontainer();
 
@@ -102,5 +91,4 @@ Template Name: Links Page
     
     // calling footer.php
     get_footer();
-
 ?>
\ No newline at end of file
diff --git a/wp-content/themes/thematic/page.php b/wp-content/themes/thematic/page.php
index f29abd800306e2dc43b03c46a23e4cdab8fc77ac..b1c1fce146a7261ca64d8030c35c64f8ece567d9 100644
--- a/wp-content/themes/thematic/page.php
+++ b/wp-content/themes/thematic/page.php
@@ -1,33 +1,43 @@
 <?php
-
+/**
+ * Page Template
+ *
+ * …
+ * 
+ * @package Thematic
+ * @subpackage Templates
+ */
+ 
     // calling the header.php
     get_header();
 
     // action hook for placing content above #container
     thematic_abovecontainer();
-
 ?>
 
 		<div id="container">
 		
-			<?php thematic_abovecontent(); ?>
-		
-			<div id="content">
-	
-	            <?php
-	        
-	            // calling the widget area 'page-top'
+			<?php
+				// action hook for placing content above #content
+				thematic_abovecontent();
+
+				// filter for manipulating the element that wraps the content 
+				echo apply_filters( 'thematic_open_id_content', '<div id="content">' . "\n" );
+			
+				// calling the widget area 'page-top'
 	            get_sidebar('page-top');
 	
-	            the_post();
-	            
+	            // start the loop
+	            while ( have_posts() ) : the_post();
+
+				// action hook for placing content above #post
 	            thematic_abovepost();
-	        
-	            ?>
-	            
-				<div id="post-<?php the_ID();
-					echo '" ';
-					if (!(THEMATIC_COMPATIBLE_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 {
@@ -38,49 +48,46 @@
 	                
 	                // creating the post header
 	                thematic_postheader();
-	                
-	                ?>
+				?>
 	                
 					<div class="entry-content">
 	
-	                    <?php
-	                    
-	                    the_content();
+						<?php
+	                    	the_content();
 	                    
-	                    wp_link_pages("\t\t\t\t\t<div class='page-link'>".__('Pages: ', 'thematic'), "</div>\n", 'number');
+	                    	wp_link_pages( "\t\t\t\t\t<div class='page-link'>" . __( 'Pages: ', 'thematic' ), "</div>\n", 'number' );
 	                    
-	                    edit_post_link(__('Edit', 'thematic'),'<span class="edit-link">','</span>') ?>
-	
+	                    	edit_post_link( __( 'Edit', 'thematic' ), "\n\t\t\t\t\t\t" . '<span class="edit-link">' , '</span>' . "\n" );
+	                    ?>
+
 					</div><!-- .entry-content -->
+					
 				</div><!-- #post -->
 	
-	        <?php
-	        
-	        thematic_belowpost();
-	        
-	        // calling the comments template
-       		if (THEMATIC_COMPATIBLE_COMMENT_HANDLING) {
-				if ( get_post_custom_values('comments') ) {
-					// Add a key/value of "comments" to enable comments on pages!
-					thematic_comments_template();
-				}
-			} else {
-				thematic_comments_template();
-			}
-	        
-	        // calling the widget area 'page-bottom'
-	        get_sidebar('page-bottom');
+			<?php
+				// action hook for inserting content below #post
+	        	thematic_belowpost();
+	        		        
+       			// action hook for calling the comments_template
+       			thematic_comments_template();
+        		
+	        	// end loop
+        		endwhile;
 	        
+	        	// calling the widget area 'page-bottom'
+	        	get_sidebar( 'page-bottom' );
 	        ?>
 	
 			</div><!-- #content -->
 			
-			<?php thematic_belowcontent(); ?> 
+			<?php 
+				// action hook for placing content below #content
+				thematic_belowcontent(); 
+			?> 
 			
 		</div><!-- #container -->
 
 <?php 
-
     // action hook for placing content below #container
     thematic_belowcontainer();
 
@@ -89,5 +96,4 @@
     
     // calling footer.php
     get_footer();
-
 ?>
\ No newline at end of file
diff --git a/wp-content/themes/thematic/readme.html b/wp-content/themes/thematic/readme.html
index d6db9c47939dc0e5f46744c2f68ff953cfb28c56..a54e6303a72044365dbf234692f5fdadbe23a185 100644
--- a/wp-content/themes/thematic/readme.html
+++ b/wp-content/themes/thematic/readme.html
@@ -110,13 +110,13 @@ iframe {
 <li><h3>Secondary Aside</h3>
 <p>Located immediately after the Primary Aside in the markup. Typically used as a sidebar. By default it contains <em>Links</em>, <em>RSS Feeds</em> and <em>Meta</em> widgets. Use the widgets panel under <code>Design</code> to add your own widgets and override the default.</p></li>
 <li><h3>Subsidiary Asides</h3>
-<p>Located in the footer. Empty of widgets by default, they will not apear in the theme markup until you add a widget.</p></li>
+<p>Located in the footer. Empty of widgets by default, they will not appear in the theme markup until you add a widget.</p></li>
 <li><h3>Index Asides</h3>
-<p>Located in the content area of the index, or blog page. Empty of widgets by default, they will not apear in the theme markup until you add a widget. The location of the <em>Index Insert</em>, which appears between posts, is controlled from the theme options page. The default position sets it to appear after the second post.</p></li>
+<p>Located in the content area of the index, or blog page. Empty of widgets by default, they will not appear in the theme markup until you add a widget. The location of the <em>Index Insert</em>, which appears between posts, is controlled from the theme options page. The default position sets it to appear after the second post.</p></li>
 <li><h3>Single Asides</h3>
-<p>Located in the content area of single post pages. Empty of widgets by default, they will not apear in the theme markup until you add a widget.</p></li>
+<p>Located in the content area of single post pages. Empty of widgets by default, they will not appear in the theme markup until you add a widget.</p></li>
 <li><h3>Page Asides</h3>
-<p>Located in the content area of static pages. Empty of widgets by default, they will not apear in the theme markup until you add a widget.</p></li>
+<p>Located in the content area of static pages. Empty of widgets by default, they will not appear in the theme markup until you add a widget.</p></li>
 </ul>
 
 <h2>Theme Options</h2>
@@ -126,7 +126,7 @@ iframe {
 <p>The <em>Text in Footer</em> option lets you insert your own <abbr>HTML</abbr> text into the footer of the theme. The default setting links to WordPress and the Thematic project page.</p>
 
 <h2>Dynamic Contextual Body Classes</h2>
-<p>Thematic makes use of the dynamic contextual class functions developed by Scott Wallick and Andy Skelton for <a href="http://www.plaintxt.org/themes/sandbox/">The Sandbox</a>. These functions make Thematic almost endlessley customizable through <abbr title="Cascading Stylesheets">CSS</abbr> alone.</p>
+<p>Thematic makes use of the dynamic contextual class functions developed by Scott Wallick and Andy Skelton for <a href="http://www.plaintxt.org/themes/sandbox/">The Sandbox</a>. These functions make Thematic almost endlessly customizable through <abbr title="Cascading Stylesheets">CSS</abbr> alone.</p>
 <p>To really see how these classes work, where they appear and how you can use them, I recommend the Firefox extension, <a href="http://www.getfirebug.com/">Firebug</a>.</p>
 
 <h2>Thematic Child Themes</h2>        
@@ -142,11 +142,6 @@ iframe {
         <li><a href="http://patdryburgh.net/junction/">Junction</a></li>
         <li><a href="http://www.themelab.com/2008/08/30/monochromatic-a-thematic-child-theme/">Monochromatic</a></li>
         <li><a href="http://www.ideetransfer.de/blog/2008/01/29/the-theme/">Ideetransfer</a></li>
-    </ul>
-</div>
-<div class="content-column">
-    <h3>Commercial Child Themes</h3>
-    <ul>
         <li><a href="http://themeshaper.com/acamas-theme-clarity-elegance-power/">Acamas</a></li>
         <li><a href="http://themeshaper.com/travailler-professional-wordpress-cms-theme/">Travailler</a></li>
     </ul>
@@ -154,12 +149,12 @@ iframe {
 
 <h2>Theme Support</h2>
 <p>If you have a question, problem or concern with Thematic you can <a href="http://themeshaper.com/contact/">contact Ian Stewart</a>. Better yet, I recommend posting to the <a href="http://themeshaper.com/forums/" title="ThemeShaper Forums">ThemeShaper Forums</a> after looking there for an answer.</p>
-<iframe id="ts-forums" src="http://themeshaper.com/forums/"></iframe>
+<iframe id="ts-forums" src="http://thematictheme.com/forums/"></iframe>
 <p>The latest Thematic version, updates and bug fixes are always available at the <a href="http://code.google.com/p/thematic/">Thematic Project on Google Code</a>.</p>
 
 <h2>Credit and Inspiration</h2>
-<p>Thematic is a fork of the hugely succesful and amazing <a href="http://www.plaintxt.org/themes/sandbox/">Sandbox theme for WordPress</a> and inherits the bulk of that code base. I owe a huge debt of gratitude to Scott Wallick and Andy Skelton, not only for their work on The Sandbox but for their ongoing help with, and support of, my efforts. Thank you, Scott and Andy.</p>
-<p>In addition, Thematic has been inspired by and uses techinques from the following people and projects.</p>
+<p>Thematic is a fork of the hugely successful and amazing <a href="http://www.plaintxt.org/themes/sandbox/">Sandbox theme for WordPress</a> and inherits the bulk of that code base. I owe a huge debt of gratitude to Scott Wallick and Andy Skelton, not only for their work on The Sandbox but for their ongoing help with, and support of, my efforts. Thank you, Scott and Andy.</p>
+<p>In addition, Thematic has been inspired by and uses techniques from the following people and projects.</p>
 <ul>
     <li><a href="http://code.google.com/p/blueprintcss/">Blueprint</a></li>
     <li><a href="http://blog.kaizeku.com/">Avice (Chaoskaizer) De’véreux</a></li>
@@ -174,7 +169,7 @@ iframe {
 
 <h2>Copyright &amp; License</h2>
 <p>Thematic is copyright <a href="http://themeshaper.com/">Ian Stewart</a> and released, like WordPress, under <a href="http://www.gnu.org/licenses/old-licenses/gpl-2.0.html">GNU General Public License, version 2 (GPL)</a>.
-<p>Thematic has a credit link in the footer template. You may remove or edit this link without cost or concern—although it sure is appreciated if you link back to <a href="http://themeshaper.com/">ThemeShaper</a>, or the <a href="http://themeshaper.com/thematic-for-wordpress/">Thematic project</a>, in some way.</p>
+<p>Thematic has a credit link in the footer template. You may remove or edit this link without cost or concern—although it sure is appreciated if you link back to the <a href="http://thematictheme.com/">Thematic project</a>, in some way.</p>
 
 <p><em class="thankyou">Thank you</em>.</p>
 
diff --git a/wp-content/themes/thematic/readme.txt b/wp-content/themes/thematic/readme.txt
new file mode 100644
index 0000000000000000000000000000000000000000..b63caf071be2b327dde06637cf1b11ea2393e3f2
--- /dev/null
+++ b/wp-content/themes/thematic/readme.txt
@@ -0,0 +1,377 @@
+=== Thematic ===
+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
+
+The ultimate in SEO-ready themes, Thematic is a highly extensible, WordPress Theme Framework featuring 13 widget-ready areas, &amp; a whole lot more.
+
+== Description ==
+
+Thematic is a free, open-source, highly extensible, search-engine optimized WordPress Theme Framework featuring 13 widget-ready areas, grid-based layout samples, styling for popular plugins, and a whole community behind it. It's perfect for beginner bloggers and WordPress development professionals.
+
+Features:
+
+* Perfect to use as-is or as a blank WordPress theme for development
+* Fully Search-Engine Optimized
+* Extra widget-ready areas (13 in total) and more possible in your Child Theme
+* Free and commercially supported Child Themes are available for upgrading the theme
+* Includes a sample WordPress Child Theme for rapid development
+* A wiki-editable guide to Thematic Customization
+* Ready for WordPress plugins like Subscribe to Comments, WP-PageNavi, and Comment-license
+* Fully compatible with All-In-One SEO and Platinum SEO plugins
+* Multiple, easy to implement, bulletproof layout options for 2, or 3 column designs
+* Modular CSS with pre-packaged resets and basic typography
+* Dynamic post and body classes make it a hyper-canvas for CSS artists
+* Editable footer text to remove the theme credit without harming the theme
+* Options for multi-author blogs
+
+== Changelog ==
+= 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
+* Fixed: The <code>thematic_theme_setup()</code> framework and child theme data that feed the Constants and shortcodes generated from constants
+* Removed: Constants for namespacing changes as follows
+* Removed: THEMENAME
+* Added: THEMATIC_THEMENAME
+* Removed: THEMEAUTHOR
+* Added: THEMATIC_THEMEAUTHOR
+* Removed: THEMEURI
+* Added: THEMATIC_THEMEURI
+* Removed: THEMATICVERSION
+* Added: THEMATIC_VERSION
+* Removed: TEMPLATEAUTHOR
+* Added: THEMATIC_TEMPLATEAUTHOR
+* Removed: TEMPLATEURI
+* Added: THEMATIC_TEMPLATEURI
+* Removed: TEMPLATEVERSION
+* Added: THEMATIC_TEMPLATEVERSION
+* Removed: THEMELIB 
+* Added:THEMATIC_LIB
+= 1.0.2 =
+* Updated: German language files
+* Updated: Swedish language files
+* Updated: thematic.pot is in sync again
+* Updated: WordPress backwards compatibility limited to WP 3.2
+* Changed: <code>thematic_doctitle()</code> to echo a value generated by wp_title()
+* Added:   <code>thematic_wptitle()</code> to filter wp_title()
+* Changed: <code>thematic_secondary_aside()</code> and <code>thematic_primary_aside()</code> to display default sidebar contents when viewed in the live theme preview.
+* Added Filters: <code>thematic_open_header thematic_close_header thematic_open_footer thematic_close_footer</code>
+* Updated locales: sv_SE fr_FR
+* Added locales: lt, tr_TR, he_IL
+= 1.0 =
+* Moved: conditional comment handling from page templates to <code>thematic_include_comments()</code>
+* Fixed: many templates misuse of the <code>the_post()</code> 
+* Moved: thematic_init_navmenu() to functions.php for adherence to theme review guidelines
+* Added: <code>thematic_get_comment_link()</code> to filter <code>get_comment_link()</code>
+* Changed: default.css for comment threading abnomalities  
+* Added: html attributes for #comments-list and #pings-list in comments.php
+* Added: <code>thematic_add_comment_class()</code> to filter <code>comment_class()</code>
+* Deprecated: <code>childtheme_override_comment_class()</code> and <code>thematic_comment_class()</code>
+* Changed: <code>thematic_post_footer()</code> "Comments" to " Responses"
+* Fixed: Pagination of pings and comments when threaded.
+* Changed: All of the functions in shortcodes.php to namspace with <code>thematic_*</code>
+* Changed: <code>thematic_page_title()</code> to remove 'Blog Archives' 
+* Removed: <code>widget_thematic_rsslinks_control()</code>
+* Changed: Namespacing of classes from <code>THM_*</code> to <code>Thematic_*</code>
+* Changed: Namespacing of functions from <code>widget_area_*()</code> to <code>thematic_widget_area_*()</code>
+* Added: <code>thematic_list_bookmarks_args(), thematic_list_comments_arg(), thematic_more_text()</code> 
+* Deprecated: <code>widget_area_*()</code> functions <code>list_bookmarks_args(), list_comments_arg(), pageGetPageNo(), more_text()</code>
+* Changed: <code>thematic_commentbutton_text()</code> to return escaped content
+* Moved: enqueue of comment reply script to <code>thematic_head_scripts()</code>
+* Deprecated: <code>thematic_show_commentreply()</code>
+* Replaced: <code>get_bloginfo(*)</code> for Theme Review required functions
+* Moved: <code>thematic_create_contenttype()</code> within header.php for Theme Review compliance
+* Removed: <code>wp_register_*</code> because <code>wp_enqueue_*</code> registers * when the src param is set for <code>_scripts</code> and <code>_styles</code>
+* Moved: Function <code>thematic_head_scripts</code> to header.php
+* Changed: the action hook for <code>thematic_head_scripts()</code> and <code>thematic_create_stylesheet()</code> to <code>wp_enqueue_scripts</code>
+* Changed: Function <code>thematic_head_scripts</code> to <code>wp_enqueue_script</code>.
+* Fixed: Valid CSS support for ie7 in default.css for hr color
+* Depecated: archives.php template for proper template namespacing please use the newly added tempate-page-archives.php
+* Deprecated: template-page-blog.php in favor of home.php
+* Fixed: CSS to comply with WP theme unit tests: images, clearing floats, etc.
+* Changed: default.css moved .gallery styles into images.css 
+* Added: Action hook thematic_abovemainclose
+* Added: Check for <code>current_theme_supports('thematic_support_post_type_author_link')</code> in <code>thematic_postmeta_authorlink</code>
+* Added: Pretty Permalink support for custom post type archives in <code>thematic_postfooter</code>
+* Added: WP Nav Menu compatibility to default sylesheet
+* Fixed: 2c-l-fixed.css .hentry width bug
+* Added: docblocks to all templates
+* Fixed: Override childtheme_override_theme_setup
+* Added: Function thematic_opt_init()
+* Added: Function thematic_get_wp_opt()
+* Added: Override: childtheme_override_opt_init()
+* Added: Function thematic_get_theme_opt()
+* Added: Function thematic_convert_legacy_opt()
+* Added: Filter thematic_theme_convert_legacy_opt
+* Added: Function thematic_default_opt()
+* Added: Filter thematic_theme_default_opt
+* Added: Function thematic_opt_add_page()
+* Added: Filter thematic_theme_add_opt_page
+* Added: Function thematic_opt_page_help()
+* Added: Filter thematic_theme_opt_help_sidebar
+* Added: Filter thematic_theme_opt_help_txt
+* Added: Function thematic_legacy_help()
+* Added: Override childtheme_override_opt_page_help
+* Added: Function thematic_do_legacy_help_section()
+* Added: Function thematic_do_opt_page()
+* Added: Function thematic_do_opt_section_main()
+* Added: Filter thematic_theme_opt_section_main
+* Added: Function thematic_do_insert_opt()
+* Added: Function thematic_do_auth_opt()
+* Added: Function thematic_do_footer_opt()
+* Added: Function thematic_do_legacy_opt()
+* Added: Function thematic_validate_opt()
+* Added: Override childtheme_override_validate_opt
+* Added: Filter thematic_theme_opt_validation
+* Changed Template author.php to use new thematic_get_theme_opt()
+* Changed Function thematic_index_loop() to use new thematic_get_theme_opt()
+* Changed Function thematic_siteinfo() to use new thematic_get_theme_opt()
+* Removed: Global $options array
+* Removed: Function mytheme_add_admin()
+* Removed: Function mytheme_admin()
+* FIXED: <code>thematic_tag_query()</code>.
+* REMOVED: <code>thematic_canonical_url()</code> (no longer needed).
+* Added: Add <code>add_theme_support('minorbrowserversion_ff')</code> to display major and minor Firefox version in the body class.
+* Added: Add <code>add_theme_support('minorbrowserversion_ie')</code> to display major and minor IE version in the body class.
+* Added: Add <code>add_theme_support('minorbrowserversion_op')</code> to display major and minor Opera version in the body class.
+* Added: Add <code>add_theme_support('minorbrowserversion_sf')</code> to display major and minor Safari version in the body class.
+* Added: Add <code>add_theme_support('minorbrowserversion_all')</code> to display major and minor version for all browsers in the body class.
+* Added: Add <code>add_theme_support('minorbrowserversion_ch')</code> to display major and minor Chrome version in the body class.
+* Changed: By default only the major browser version will be used in the body class.
+* Added: Filter <code>thematic_doctitle_separator</code>.
+* Fixed: Thematic Options is working again. 
+* Changed: Filter <code>thematic_dropdown_options</code>.
+* Removed: Variable <code>thematic_use_superfish</code>. 
+* Changed: Function <code>thematic_create_stylesheet</code> to <code>wp_enqueue_style</code>.
+* Removed: filter <code>thematic_create_stylesheet</code>.
+* Added: New hook <code>thematic_child_init</code> used for <code>remove_theme_support</code>.
+* Added: <code>add_theme_support('thematic_superfish')</code>
+* Changed: Started to clean up the functions.php.
+* Fixed: Missing text domain.
+* Fixed: thematic_page_title() Tag archive display name of queried tag
+* Changed: thematic_page_title() now supports for custom post type archives
+* Changed: thematic_postfooter(), thematic_postfooter_postcategory(), thematic_postfooter_posttags() , thematic_postfooter_postcomments(), function thematic_postfooter_postconnect() to provide support for custom post types and custom taxonomies.
+* Added: thematic_postfooter_posttax() providing a looping structure for post taxonomies
+* Added: New override childtheme_override_postfooter_posttax() 
+* Added: New filter thematic_postfooter_posttax
+* Added: thematic_postfooter_postterms($tax) for assembling the term list for individual taxonomies
+* Added: New override childtheme_override_postfooter_postterms($tax) 
+* Added: New filter thematic_postfooter_postterms
+* Added: New filter thematic_open_id_content. Defaults to: <code>'<div id="content">' . "\n"</code>.
+* Added: $content_width defines the max image width.
+* Added: Farsi language files. Credits: Ehsan
+* Added: The action hooks <code>thematic_above_archiveloop</code> and <code>thematic_below_archivloop</code>. Credits: Kathy
+* Added: Automatic support for All in One SEO Pack, HeadSpace Plugin, Platinum SEO Pack, wpSEO, and WordPress SEO.
+* Added: Icelandic language files. Credits: Stef\E1n Vignir Skarph\E9\F0insson
+* Changed: Removed changelog.html in favor of the new readme.txt.
+* Fixed: <code>childtheme_menu_args</code> in Thematic Sample Childtheme (the value for echo is FALSE).
+* Fixed: An E_NOTICE in dynamic_classes.php (occured while displaying a 404 page). Credits: markauk
+* Fixed: childtheme_override_content_init() is now working.
+* Fixed: Updated Brazilian Portuguese language files. Credits: Eduardo Zulian.
+* Fixed: Removed sidebar-subsidiary.php. Code is created using action hooks.
+* Fixed: The override part of some more functions.
+* Fixed: Set Thematic filter thematic_page_menu_args for thematic_page_menu_args().
+* Fixed: Removed thematic_page_menu_args() filter of wp_page_menu_args.
+* Fixed: Reinstated thematic_nav_menu filter.
+* Fixed: Undefined variable $redirect in thmfooter_login_link() from shortcodes.php.
+* Fixed: The override part of a few functions creating the header missed the add_action part.
+= 0.9.7.7 =
+* Fixed: search.php call to undefined function blog_info().
+* Fixed: Theme Review Images Test via CSS.
+= 0.9.7.6 =
+* Fixed: "Constant * already defined" notices when defining constants in a child themes.
+* Fixed: "Undefined variable" $id, $aria_req notices when using default comment_form().
+* Fixed: "Undefined constant assumed get_post_type_object" notice in thematic_post_class.
+= 0.9.7.5 =
+* Added: The constant THEMATIC_COMPATIBLE_FEEDLINKS which defaults to false. In this case the WordPress functions add_theme_support( 'automatic-feed-links' ) is used. If you set it to TRUE, Thematic will use its own functionality. This is a requirement by the Theme Review Team.
+* Added: New function thematic_body() to header.php defined in dynamic-classes.php 
+* Added: New function childtheme_override_body() defined in dynamic-classes.php
+* Added: New function thematic_body_open() defined in dynamic-classes.php
+* Added: Added Estonian language files. Credits: Peeter Marvet
+* Added: Thematic's browser / OS class to WorpPress' body_class(). Menu will now display properly with the Test Data.
+* Added: the constant THEMATIC_COMPATIBLE_COMMENT_FORM which defaults to false. In this case the WordPress function comment_form() is used. If you set it to TRUE, Thematic will use its own functionality. This is a requirement by the Theme Review Team. 
+* Added: Added: Thematic's browser / OS class to WorpPress' body_class(). Menu will now display properly with the Test Data.
+* Added: the constant THEMATIC_COMPATIBLE_POST_CLASS which defaults to false. In this case the WordPress function post_class() is used. If you set it to TRUE, Thematic will use its own function thematic_post_class(). This is a requirement by the Theme Review Team.
+* Added: the constant THEMATIC_COMPATIBLE_BODY_CLASS which defaults to false. In this case the WordPress function body_class() is used. If you set it to TRUE, Thematic will use its own function thematic_body_class(). This is a requirement by the Theme Review Team.
+* Added: Better SSL support by replacing bloginfo('siteurl') & get_bloginfo('siteurl') with site_url()
+* Changed: the filter body_class to thematic_body_class.
+* Fixed: Finnish language files. Credits: Peeter Marvet
+* Fixed: Trailing slashes in the search forms of search.php and thematic_404()
+* Fixed: childtheme_override_access().
+* Fixed: the closing > for the post_class part.
+* Fixed behaviour of thematic_show_bodyclass. The body tag will now be created, if a filter returns false.
+* Fixed: Removed add_theme_support('menu') according to Andrew Nacin.
+* Fixed: Comment handling for archives.php, links.php and page.php can be made compatible with old handling controlled by a key/value of "comments".
+* Wrapped some WP 3.0 function calls. Thematic still supports WP 2.9.x.
+= 0.9.7.4 =
+* Added: Filter thematic_post_thumb_size in thematic_content()
+* Added: Filter thematic_post_thumb_attr in thematic_content()
+* Added: Filter thematic_post_thumbs Default TRUE in thematic_content()
+* Added: Post Thumbnails to thematic_content() excerpts
+* Added: add_theme_support( 'post-thumbnails' ) as required by WP Theme Dev Checklist
+* Added: Post and Body classes for custom post types
+* Added: Helper function thematic_is_custom_post_type()
+* Added: Czech language files Credits: JanJan Fertek
+* Added: Filter thematic_show_bc_taxonomyarchives Default True
+* Added: Post and Body classes for custom taxonomies
+* Added: Custom taxonomy support for archives in thematic_page_title()
+* Added: Helper function thematic_get_term_name() for retrieving custom taxonomy name Credit Justin Tadlock 
+* Added: CDATA encoding to JavaScript
+* Added: Blog template page-blog.php  
+* Added: Page template page-fullwidth.php and relative styles in thematic>library>layouts *.css files for full width content
+* Fixed: Clearing Floats issues in compliance with Theme_Unit_Test WordPress Theme Review Guidelines
+* Fixed: Conditional display of comment-edit anchor tag and meta separator
+* Fixed: Trailing slash in thematic_search_form()
+* Fixed: Missing Dutch nl_NL.po
+* Added add_theme_support( 'automatic-feed-links' ).
+* Removed the deprecated function call get_the_author().
+* Renamed template files page-... to template-page-... according to <a href="http://codex.wordpress.org/Theme_Review#Custom_Template_Naming_Conventions">4.5.4 Custom Template Naming Conventions</a> and adjusted the CSS files.
+* Updated: PT lang files Thanks to: Bernardo Maciel
+* Updated: Dutch translation props: Fili
+= 0.9.7.3 =
+* Fixed: Changed trackback_url() to get_trackback_url().
+* Fixed: Displaying WordPress Galleries is fixed.
+* Fixed: Cleaned up theme-options.php.
+* Fixed: Cleaned up comments-extensions.php.
+* Fixed: Removed the custom field check to display the comments template for page.php, archives.php and links.php.
+* Fixed: Deprecated is_sidebar_active() in favor of is_active_sidebar().
+* Fixed: Cleaned up the deprecated function calls
+* Fixed: duplicate key in thematic_nav_menu_args().
+* Fixed: The deprecated function uses WordPress' functionality for reporting.
+= 0.9.7.2 =
+* Added: Fallback to wp_page_menu if theme location has no menu
+* Added: thematic_init_navmenu registers the theme location for our menu. Override: childtheme_override_init_navmenu
+* Added: thematic_primary_menu_name filters the menu name 'Primary Menu'.
+* Added: thematic_primary_menu_id filters the  menu id 'primary-menu'.
+* Added: The main menu uses the menu id 'primary-menu' and the menu name 'Primary Menu'.
+* Fixed: Changed add_theme_support( 'nav-menus' ) to add_theme_support( 'menus' ).
+* Fixed: a bug that prevents the 'Reset Widgets'.
+= 0.9.7.1 =
+* Fixed: Potential security issue in theme-options.php.
+= 0.9.7 =
+* Added: new function: thematic_init_presetwidgets() to initialize the preset widgets. Override function: childtheme_override_init_presetwidgets()
+* Added: new function: thematic_content_init() to set up new post classes.
+* Added: childtheme_override_content_init() overrides thematic_content_init
+* Added: new post classes: is-full is-excerpt custom-excerpt auto-excerpt wp-teaser has-more wp-more has-teaser
+* Added: new filter thematic_get_excerpt to thematic_content()
+* Added: filter to customize the length ofthematic_search_form() in widgets-extensions.php. Credits: Aaron Jorbin
+* Added: childtheme_override_doctitle() overrides thematic_doctitle
+* Added: childtheme_override_head_scripts() overrides thematic_head_scripts
+* Added: childtheme_override_brandingopen() overrides thematic_brandingopen
+* Added: childtheme_override_blogtitle() overrides thematic_blogtitle
+* Added: childtheme_override_blogdescription() overrides thematic_blogdescription            
+* Added: childtheme_override_brandingclose() overrides thematic_brandingclose
+* Added: childtheme_override_access() overrides thematic_access
+* Added: childtheme_override_subsidiaries() overrides thematic_subsidiaries
+* Added: childtheme_override_siteinfoopen() overrides thematic_siteinfoopen()
+* Added: childtheme_override_siteinfo() overrides thematic_siteinfo()
+* Added: childtheme_override_siteinfoclose() overrides thematic_siteinfoclose()
+* Added: New action hooks thematic_abovecomment and thematic_belowcomment Credits: heaven.
+* Added: childtheme_override_commentmeta overrides thematic_commentmeta()
+* Added: new filter thematic_commentmeta() to discussion.php. Credits: heaven
+* Added: childtheme_override_body_class() overrides thematic_body_class()
+* Added: childtheme_override_post_class() overrides thematic_post_class()
+* Added: childtheme_override_comment_class() overrides thematic_archive_loop()
+* Added: childtheme_override_author_loop() overrides thematic_comment_class()
+* Added: childtheme_override_date_classes() overrides thematic_date_classes()
+* Added: Finnish language files. Credits: Mikito Takada
+* Added: new filter thematic_open_wrapper to the header.php. This filter defaults to true.
+* Added: new filter thematic_close_wrapper to the footer.php. This filter defaults to true.
+* Added: childtheme_override_page_title() overrides thematic_page_title()
+* Added: childtheme_override_nav_above() overrides thematic_nav_above()
+* Added: childtheme_override_archive_loop() overrides thematic_archive_loop()
+* Added: childtheme_override_author_loop() overrides thematic_author_loop()
+* Added: childtheme_override_category_loop() overrides thematic_category_loop()
+* Added: childtheme_override_index_loop() overrides thematic_index_loop()
+* Added: childtheme_override_single_post() overrides thematic_single_post()
+* Added: childtheme_override_search_loop() overrides thematic_search_loop()
+* Added: childtheme_override_tag_loop() overrides thematic_tag_loop()
+* Added: childtheme_override_postheader() overrides thematic_postheader()
+* Added: childtheme_override_postheader_posteditlink() overrides thematic_postheader_posteditlink()
+* Added: childtheme_override_postheader_posttitle() overrides thematic_postheader_posttitle()
+* Added: childtheme_override_postheader_postmeta() overrides thematic_postheader_postmeta()
+* Added: childtheme_override_postmeta_authorlink() overrides thematic_postmeta_authorlink()
+* Added: childtheme_override_postmeta_entrydate() overrides thematic_postmeta_entrydate()
+* Added: childtheme_override_postmeta_editlink() overrides thematic_postmeta_editlink()
+* Added: childtheme_override_content() overrides thematic_content()
+* Added: childtheme_override_archivesopen() overrides thematic_archivesopen()
+* Added: childtheme_override_category_archives() overrides thematic_category_archives()
+* Added: childtheme_override_monthly_archives() overrides thematic_monthly_archives()
+* Added: childtheme_override_archivesclose() overrides thematic_archivesclose()
+* Added: childtheme_override_404_content() overrides thematic_404_content()
+* Added: childtheme_override_postfooter() overrides thematic_postfooter()
+* Added: childtheme_override_postfooter_posteditlink() overrides thematic_postfooter_posteditlink()
+* Added: childtheme_override_postfooter_postcategory() overrides thematic_postfooter_postcategory()
+* Added: childtheme_override_postfooter_posttags() overrides thematic_postfooter_posttags()
+* Added: childtheme_override_postfooter_postcomments() overrides thematic_postfooter_postcomments()
+* Added: childtheme_override_postfooter_postconnect() overrides thematic_postfooter_postconnect()
+* Added: childtheme_override_nav_below() overrides thematic_nav_below()
+* Added: childtheme_override_previous_post_link() overrides thematic_previous_post_link()
+* Added: childtheme_override_next_post_link() overrides thematic_next_post_link()
+* Added: childtheme_override_author_info_avatar() overrides thematic_author_info_avatar()
+* Added: childtheme_override_cats_meow() overrides thematic_cats_meow()
+* Added: childtheme_override_tag_ur_it() overrides thematic_tag_ur_it()
+* Added: Support for wp_nav_menu().
+* Added: New filter thematic_menu_type to switch between wp_page_menu() and wp_nav_menu(). Defaults to wp_page_menu().
+* Added: New filter thematic_nav_menu_args to filter the arguments for wp_nav_menu().
+* Added: New filter thematic_page_menu_args to filter the arguments for wp_page_menu().
+* Added: New filter thematic_use_superfish to prevent the use of Superfish for the menu.
+* Added: New filter thematic_show_bc_blogid to prevent the BODY class blogid-n. 
+* Added: New BODY class blogid-n.
+* Added: New action hooks thematic_abovepost and thematic_belowpost.
+* Added: New action hooks thematic_abovecontent and thematic_belowcontent.
+* Added: Theme options support WordPress mu and WordPress 3.0 Multi-User option.
+* Fixed: The UL Class sf-menu will be created only for the wp_page_menu() in the header.
+* Fixed: Changed #trackbacks-list .comment-content to left:-10000px; in default.css. Fixes a glitch with the 'Many Tackbacks' post (WordPress Test Data).
+* Fixed: Changed $version to $thm_version to prevent a collision with WP E-Commerce.
+* Fixed: Widget areas can now be moved based on a conditional tag.
+* Fixed: Removed thematic_before_widget() and thematic_after_widget() from Search Widget
+* Fixed: Upgraded the Thematic widgets to the new API. Thematic now requires WordPress 2.8.x or above.
+* Updated: Norwegian language files updated. Credits: peter.holme.
+* Updated: Norwegian language files updated. Credits: Thomas Misund.
+= 0.9.6.2 =
+* Fixed: a bug in widgets-extensions.php not loading the preset widgets after switching themes.
+* Fixed: a bug in page.php not loading thematic_comments_template()
+* Fixed: missing gettext in comments-extensions.php
+= 0.9.6.1 =
+* Added: thematic_abovecontainer()
+* Added: thematic_belowcontainer()
+* Added: Thematic prevents the creation of the WordPress Generator. This can be filtered using a filter for thematic_hide_generators. Return TRUE and the WordPress Generator will be created.
+* Added: The standard text 'One Comment' can be filtered using thematic_singlecomment_text.
+* Added: The standard text 'n Comments' can be filtered using thematic_multiplecomments_text.
+* Added: The standard text 'Post a Comment' can be filtered using thematic_postcomment_text.
+* Added: The standard text 'Post a Reply to %s' can be filtered using thematic_postreply_text.
+* Added: The standard text 'Comment' for the text box can be filtered using thematic_commentbox_text.
+* Added: The standard text 'Post Comment' for the send button can be filtered using thematic_commentbutton_text.
+* Added: Split up thematic_postheader() and thematic_postfooter() into sub-functions. With these new functions it is easier to rearrange the displayed data.
+* Added: thematic_postheader_posttitle()
+* Added: thematic_postheader_postmeta()
+* Added: thematic_postmeta_authorlink()
+* Added: thematic_postmeta_entrydate()
+* Added: thematic_postmeta_editlink()
+* Added: thematic_postfooter()
+* Added: thematic_postfooter_posteditlink()
+* Added: thematic_postfooter_postcategory()
+* Added: thematic_postfooter_posttags()
+* Added: thematic_postfooter_postconnect()
+* Added: thematic_postfooter_postcomments()
+* Added: thematic_show_bodyclass (master switch)
+* Added: thematic_show_bc_wordpress
+* Added: thematic_show_bc_datetime
+* Added: thematic_show_bc_contenttype
+* Added: thematic_show_bc_singular
+* Added: thematic_show_bc_singlepost
+* Added: thematic_show_bc_authorarchives
+* Added: thematic_show_bc_categoryarchives
+* Added: thematic_show_bc_tagarchives
+* Added: thematic_show_bc_pages
+* Added: thematic_show_bc_search
+* Added: thematic_show_bc_loggedin
+* Added: thematic_show_bc_browser
+* Added: thematic_head_profile.
+* Added: Complete rewrite of the widget areas: 
+* 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().
diff --git a/wp-content/themes/thematic/search.php b/wp-content/themes/thematic/search.php
index 7115844d25bee0190b082b10401a8cc50ee3d4d2..2168ad00f90f9bac846bd6b1b369ab1baadf5b0a 100644
--- a/wp-content/themes/thematic/search.php
+++ b/wp-content/themes/thematic/search.php
@@ -1,4 +1,12 @@
 <?php
+/**
+ * Search Template
+ *
+ * …
+ * 
+ * @package Thematic
+ * @subpackage Templates
+ */
 
     // calling the header.php
     get_header();
@@ -10,13 +18,14 @@
 
 		<div id="container">
 		
-			<?php thematic_abovecontent(); ?>
+			<?php 
+	            // action hook for inserting contentabove #content
+				thematic_abovecontent();
 		
-			<div id="content">
-	
-	            <?php 
-	            
-	            if (have_posts()) {
+				// filter for manipulating the element that wraps the content 
+				echo apply_filters( 'thematic_open_id_content', '<div id="content">' . "\n\n" );
+							
+				if (have_posts()) {
 	
 	                // displays the page title
 	                thematic_page_title();
@@ -37,40 +46,50 @@
 	                thematic_navigation_below();
 	
 	            } else {
-	            	
+	            
+	            	// action hook for inserting content above #post
 	           		thematic_abovepost();
-	                
-	                ?>
-	
+	           ?>
+
 				<div id="post-0" class="post noresults">
-					<h1 class="entry-title"><?php _e('Nothing Found', 'thematic') ?></h1>
+					
+					<h1 class="entry-title"><?php _e( 'Nothing Found', 'thematic' ) ?></h1>
+					
 					<div class="entry-content">
-						<p><?php _e('Sorry, but nothing matched your search criteria. Please try again with some different keywords.', 'thematic') ?></p>
+						
+						<p><?php _e( 'Sorry, but nothing matched your search criteria. Please try again with some different keywords.', 'thematic' ) ?></p>
+					
 					</div><!-- .entry-content -->
-					<form id="noresults-searchform" method="get" action="<?php bloginfo('url') ?>/">
+					
+					<form id="noresults-searchform" method="get" action="<?php echo home_url() ?>/">
+						
 						<div>
-							<input id="noresults-s" name="s" type="text" value="<?php echo esc_html(stripslashes($_GET['s'])) ?>" size="40" />
-							<input id="noresults-searchsubmit" name="searchsubmit" type="submit" value="<?php _e('Find', 'thematic') ?>" />
+							
+							<input id="noresults-s" name="s" type="text" value="<?php the_search_query();  ?>" size="40" />
+							
+							<input id="noresults-searchsubmit" name="searchsubmit" type="submit" value="<?php esc_attr_e( 'Find', 'thematic' ) ?>" />
+						
 						</div>
+					
 					</form>
+				
 				</div><!-- #post -->
 	
 	            <?php
-	            
+	            	// action hook for inserting content below #post
 	            	thematic_belowpost();
-	            
 	            }
-	            
 	            ?>
-	
+	            
 			</div><!-- #content -->
 			
-			<?php thematic_belowcontent(); ?> 
-			
+			<?php 
+				// action hook for inserting content below #content
+				thematic_belowcontent(); 
+			?> 
 		</div><!-- #container -->
 
 <?php 
-
     // action hook for placing content below #container
     thematic_belowcontainer();
 
@@ -79,5 +98,4 @@
     
     // calling footer.php
     get_footer();
-
 ?>
\ No newline at end of file
diff --git a/wp-content/themes/thematic/searchform.php b/wp-content/themes/thematic/searchform.php
index f61d23b644bee972d127bbb21cc8a340ea123cad..070601d87675c8d3f8dd4af114f8156fa92060dd 100644
--- a/wp-content/themes/thematic/searchform.php
+++ b/wp-content/themes/thematic/searchform.php
@@ -1,6 +1,13 @@
 <?php
+/**
+ * Search Form Template
+ *
+ * …
+ * 
+ * @package Thematic
+ * @subpackage Templates
+ */
     
     // calls the search form
 	thematic_search_form();
-    
 ?>
\ No newline at end of file
diff --git a/wp-content/themes/thematic/sidebar-index-bottom.php b/wp-content/themes/thematic/sidebar-index-bottom.php
index 3879659cc74c5bbd2196751fed0411e82a38dd6f..dc10a04926883223336a7f4cfe43bf165c957c3a 100644
--- a/wp-content/themes/thematic/sidebar-index-bottom.php
+++ b/wp-content/themes/thematic/sidebar-index-bottom.php
@@ -1,12 +1,19 @@
 <?php 
-
+/**
+ * Sidebar Index Bottom Template
+ *
+ * …
+ * 
+ * @package Thematic
+ * @subpackage Templates
+ */
+ 
     // action hook for placing content above the 'index-bottom' widget area
     thematic_aboveindexbottom();
 
     // action hook creating the 'index-bottom' widget area
-    widget_area_index_bottom();
+    thematic_widget_area_index_bottom();
 
     // action hook for placing content below the 'index-bottom' widget area
     thematic_belowindexbottom();
-    
 ?>
\ No newline at end of file
diff --git a/wp-content/themes/thematic/sidebar-index-insert.php b/wp-content/themes/thematic/sidebar-index-insert.php
index 331abdf475003c6a59befa143038e65af8d7c883..d85d9029c79bb82610027da4e905dae029e62fef 100644
--- a/wp-content/themes/thematic/sidebar-index-insert.php
+++ b/wp-content/themes/thematic/sidebar-index-insert.php
@@ -1,12 +1,19 @@
 <?php 
-
+/**
+ * Sidebar Index Insert Template
+ *
+ * …
+ * 
+ * @package Thematic
+ * @subpackage Templates
+ */
+ 
     // action hook for placing content above the 'index-insert' widget area
     thematic_aboveindexinsert();
 
     // action hook creating the 'index-insert' widget area
-    widget_area_index_insert();
+    thematic_widget_area_index_insert();
 
     // action hook for placing content below the 'index-insert' widget area
     thematic_belowindexinsert();
-    
 ?>
\ No newline at end of file
diff --git a/wp-content/themes/thematic/sidebar-index-top.php b/wp-content/themes/thematic/sidebar-index-top.php
index 018823195b2ff89238ba767f0805575dc2a3639b..9d70d4675cbbb9b6bd0beb0e57a4f6b7d556b782 100644
--- a/wp-content/themes/thematic/sidebar-index-top.php
+++ b/wp-content/themes/thematic/sidebar-index-top.php
@@ -1,12 +1,19 @@
 <?php
+/**
+ * Sidebar Index Top Template
+ *
+ * …
+ * 
+ * @package Thematic
+ * @subpackage Templates
+ */
 
     // action hook for placing content above the 'index-top' widget area
     thematic_aboveindextop();
 
     // action hook for creating the 'index-top' widget area
-    widget_area_index_top();
+    thematic_widget_area_index_top();
 
     // action hook for placing content below the 'index-top' widget area
     thematic_belowindextop();
-    
-?>
\ No newline at end of file
+?>  
\ No newline at end of file
diff --git a/wp-content/themes/thematic/sidebar-page-bottom.php b/wp-content/themes/thematic/sidebar-page-bottom.php
index 566ca5ce8b585601dfe3637e1b2e3e853a979108..4a37fd58943d152bcc72ac9780034e20ea51a73e 100644
--- a/wp-content/themes/thematic/sidebar-page-bottom.php
+++ b/wp-content/themes/thematic/sidebar-page-bottom.php
@@ -1,12 +1,19 @@
 <?php
+/**
+ * Sidebar Page Bottom Template
+ *
+ * …
+ * 
+ * @package Thematic
+ * @subpackage Templates
+ */
 
     // action hook for placing content above the 'page-bottom' widget area
     thematic_abovepagebottom();
 
     // action hook for creating the 'page-bottom' widget area
-    widget_area_page_bottom();
+    thematic_widget_area_page_bottom();
 
     // action hook for placing content below the 'page-bottom' widget area
     thematic_belowpagebottom();
-
 ?>
\ No newline at end of file
diff --git a/wp-content/themes/thematic/sidebar-page-top.php b/wp-content/themes/thematic/sidebar-page-top.php
index 96cfc78d1ed68628d4f94773e3f423c196239c0c..63f36aaf3ba3611a13f4cd22874a9dcc1613cfec 100644
--- a/wp-content/themes/thematic/sidebar-page-top.php
+++ b/wp-content/themes/thematic/sidebar-page-top.php
@@ -1,12 +1,19 @@
 <?php
+/**
+ * Sidebar Page Top Template
+ *
+ * …
+ * 
+ * @package Thematic
+ * @subpackage Templates
+ */
 
     // action hook for placing content above the 'page-top' widget area
     thematic_abovepagetop();
 
     // action hook for creating the 'page-top' widget area
-    widget_area_page_top();
+    thematic_widget_area_page_top();
 
     // action hook for placing content below the 'page-top' widget area
     thematic_belowpagetop();
-    
 ?>
\ No newline at end of file
diff --git a/wp-content/themes/thematic/sidebar-single-bottom.php b/wp-content/themes/thematic/sidebar-single-bottom.php
index deda1bcbc0e74ec36de4edb4f5c480dcaac99e13..c5194ee19c02d89e2d5414c425f0dd44bea1c05d 100644
--- a/wp-content/themes/thematic/sidebar-single-bottom.php
+++ b/wp-content/themes/thematic/sidebar-single-bottom.php
@@ -1,12 +1,19 @@
 <?php
+/**
+ * Sidebar Single Bottom Template
+ *
+ * …
+ * 
+ * @package Thematic
+ * @subpackage Templates
+ */
 
     // action hook for placing content above the 'single-bottom' widget area
     thematic_abovesinglebottom();
 
     // action hook for creating the 'single-bottom' widget area
-    widget_area_single_bottom();
+    thematic_widget_area_single_bottom();
 
     // action hook for placing content below the 'single-bottom' widget area
     thematic_belowsinglebottom();
-    
-?>
\ No newline at end of file
+?>
diff --git a/wp-content/themes/thematic/sidebar-single-insert.php b/wp-content/themes/thematic/sidebar-single-insert.php
index 3c54683ab6f20a0267eed2b7b576d21b7c664c48..89986f36b539e9061a71570c0937a1994cff6cee 100644
--- a/wp-content/themes/thematic/sidebar-single-insert.php
+++ b/wp-content/themes/thematic/sidebar-single-insert.php
@@ -1,12 +1,19 @@
 <?php
-    
+/**
+ * Sidebar Single Insert Template
+ *
+ * …
+ * 
+ * @package Thematic
+ * @subpackage Templates
+ */
+   
     // action hook for placing content above the 'single-insert' widget area
     thematic_abovesingleinsert();
 
     // action hook for creating the 'single-insert' widget area
-    widget_area_single_insert();
+    thematic_widget_area_single_insert();
 
     // action hook for placing content below the 'single-insert' widget area
-    thematic_belowsingleinsert();
-    
+    thematic_belowsingleinsert(); 
 ?>
\ No newline at end of file
diff --git a/wp-content/themes/thematic/sidebar-single-top.php b/wp-content/themes/thematic/sidebar-single-top.php
index 7673a2c98593040f24c5dafef87c74fc178a902b..2a1d32bec418535d6c2a4ccc5a81bd2258b5938f 100644
--- a/wp-content/themes/thematic/sidebar-single-top.php
+++ b/wp-content/themes/thematic/sidebar-single-top.php
@@ -1,12 +1,19 @@
 <?php
+/**
+ * Sidebar Single Top Template
+ *
+ * …
+ * 
+ * @package Thematic
+ * @subpackage Templates
+ */
 
     // action hook for placing content above the 'single-top' widget area
     thematic_abovesingletop();
 
     // action hook for creating the 'single-top' widget area
-    widget_area_single_top();
+    thematic_widget_area_single_top();
 
     // action hook for placing content below the 'single-top' widget area
-    thematic_belowsingletop();
-    
+    thematic_belowsingletop(); 
 ?>
\ No newline at end of file
diff --git a/wp-content/themes/thematic/sidebar.php b/wp-content/themes/thematic/sidebar.php
index c62770f59b12fbe4efc9758c79f1738783fdd31b..a2495b13331a09b0d462ac750916fd116e2ce6d9 100644
--- a/wp-content/themes/thematic/sidebar.php
+++ b/wp-content/themes/thematic/sidebar.php
@@ -1,18 +1,25 @@
 <?php 
+/**
+ * Main Sidebar Template
+ *
+ * …
+ * 
+ * @package Thematic
+ * @subpackage Templates
+ */
 
     // action hook for placing content above the main asides
     thematic_abovemainasides();
 
     // action hook creating the primary aside
-    widget_area_primary_aside();	
+    thematic_widget_area_primary_aside();	
 	
     // action hook for placing content between primary and secondary aside
     thematic_betweenmainasides();
 
     // action hook creating the secondary aside
-    widget_area_secondary_aside();		
+    thematic_widget_area_secondary_aside();		
 	
     // action hook for placing content below the main asides
     thematic_belowmainasides(); 
-    
 ?>
\ No newline at end of file
diff --git a/wp-content/themes/thematic/single.php b/wp-content/themes/thematic/single.php
index 25464d189525c3f68f055966b385994df06dd392..c5ea83c8aa17b001959a1a8ca6327379521a9b94 100644
--- a/wp-content/themes/thematic/single.php
+++ b/wp-content/themes/thematic/single.php
@@ -1,22 +1,31 @@
 <?php
+/**
+ * Single Post Template
+ *
+ * …
+ * 
+ * @package Thematic
+ * @subpackage Templates
+ */
 
     // calling the header.php
     get_header();
 
     // action hook for placing content above #container
     thematic_abovecontainer();
-
 ?>
 
 		<div id="container">
 			
-			<?php thematic_abovecontent(); ?>
-			
-			<div id="content">
-		
-    	        <?php 
-    	        
-    	        the_post();
+			<?php
+				// action hook for placing content above #content
+				thematic_abovecontent();
+						
+				// filter for manipulating the element that wraps the content 
+				echo apply_filters( 'thematic_open_id_content', '<div id="content">' . "\n\n" );
+							
+	            // start the loop
+	            while ( have_posts() ) : the_post();
     	        
     	        // create the navigation above the content
 				thematic_navigation_above();
@@ -33,22 +42,25 @@
     	        // create the navigation below the content
 				thematic_navigation_below();
 		
-    	        // calling the comments template
+       			// action hook for calling the comments_template
     	        thematic_comments_template();
+    	        
+    	        // end the loop
+        		endwhile;
 		
     	        // calling the widget area 'single-bottom'
     	        get_sidebar('single-bottom');
-    	        
-    	        ?>
+			?>
 		
 			</div><!-- #content -->
 			
-			<?php thematic_belowcontent(); ?> 
-			
+			<?php
+				// action hook for placing content below #content
+				thematic_belowcontent();
+			?> 
 		</div><!-- #container -->
 		
 <?php 
-
     // action hook for placing content below #container
     thematic_belowcontainer();
 
@@ -57,5 +69,4 @@
     
     // calling footer.php
     get_footer();
-
 ?>
\ No newline at end of file
diff --git a/wp-content/themes/thematic/style.css b/wp-content/themes/thematic/style.css
index bd30fdcd605751b6374859f5ee9130d2b9a23fd1..abe6e2336e7a1c0246c61a44996f0e42b24099a7 100644
--- a/wp-content/themes/thematic/style.css
+++ b/wp-content/themes/thematic/style.css
@@ -1,16 +1,19 @@
 /*
 THEME NAME: Thematic
-THEME URI: http://themeshaper.com/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, &amp; a whole lot more. Perfect for any blog and <strong><em>the</em></strong> starting point for theme development.
-VERSION: 0.9.7.7
+VERSION: 1.0.2.1
 AUTHOR: <a href="http://themeshaper.com/">Ian Stewart</a> &amp; <a href="http://thematic4you.com/">Chris Go&szlig;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
+License: GNU General Public License v2.0
+License URI: http://www.gnu.org/licenses/gpl-2.0.html
+
 .
 The Thematic Theme is copyright Ian Stewart http://themeshaper.com/
 This work, like WordPress, is released under GNU General Public License, version 2 (GPL).
-http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
 .
+
 */
 
 /* Reset browser defaults */
@@ -73,6 +76,7 @@ img.aligncenter {
 .wp-caption {
 	text-align: center;
 	margin-bottom:18px;
+	max-width: 96%;
 }
 .wp-caption img {
 	margin: 0;
diff --git a/wp-content/themes/thematic/tag.php b/wp-content/themes/thematic/tag.php
index deb174315b9c32e2f86d6d6c74d84eccab6b728b..cccb00eceb695f81abebec6af661ac2fdf520bb1 100644
--- a/wp-content/themes/thematic/tag.php
+++ b/wp-content/themes/thematic/tag.php
@@ -1,22 +1,31 @@
 <?php
+/**
+ * Tag Archive Template
+ *
+ * …
+ * 
+ * @package Thematic
+ * @subpackage Templates
+ */
+
 
     // calling the header.php
     get_header();
 
     // action hook for placing content above #container
     thematic_abovecontainer();
-
 ?>
 
 		<div id="container">
 		
-			<?php thematic_abovecontent(); ?>
-		
-			<div id="content">
-	
-	            <?php
-	        
-	            // displays the page title
+			<?php
+				// action hook for placing content above #content
+				thematic_abovecontent();
+
+				// filter for manipulating the element that wraps the content 
+				echo apply_filters( 'thematic_open_id_content', '<div id="content">' . "\n\n" );
+			
+				// displays the page title
 	            thematic_page_title();
 	
 	            // create the navigation above the content
@@ -33,17 +42,18 @@
 	
 	            // create the navigation below the content
 	            thematic_navigation_below();
-	            
-	            ?>
+			?>
 	
 			</div><!-- #content -->
 			
-			<?php thematic_belowcontent(); ?> 
-			
+			<?php 
+				// action hook for placing content below #content
+				thematic_belowcontent();
+			?>
+						
 		</div><!-- #container -->
 	
 <?php 
-
     // action hook for placing content below #container
     thematic_belowcontainer();
 
@@ -52,5 +62,4 @@
     
     // calling footer.php
     get_footer();
-
 ?>
\ No newline at end of file
diff --git a/wp-content/themes/thematic/template-page-archives.php b/wp-content/themes/thematic/template-page-archives.php
new file mode 100644
index 0000000000000000000000000000000000000000..974bdae50af2cc5bd1271add20b34313ba484872
--- /dev/null
+++ b/wp-content/themes/thematic/template-page-archives.php
@@ -0,0 +1,96 @@
+<?php
+/**
+ * Template Name: Archives Page
+ *
+ * This is a custom Page template for displaying an index of Archives.
+ * It will display the page content above an unordered list of the different 
+ * post-type archives nested with an unordered list of thier post-type items.
+ *
+ * @package Thematic
+ * @subpackage Templates
+ *
+ * @link http://codex.wordpress.org/Creating_an_Archive_Index Codex: Creating an Archives Index
+ */
+
+	// calling the header.php
+	get_header();
+
+	// action hook for placing content above #container
+	thematic_abovecontainer();
+?>
+
+		<div id="container">
+
+			<?php
+				// action hook for placing content above #content
+				thematic_abovecontent();
+
+				// filter for manipulating the element that wraps the content 
+				echo apply_filters( 'thematic_open_id_content', '<div id="content">' . "\n\n" );
+
+				// start the loop to get the page content
+				the_post();
+				
+				// 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 '">';
+					}
+
+	            	// creating the post header
+	            	thematic_postheader();
+	            ?>
+
+					<div class="entry-content">
+
+	                    <?php 
+	                    	// displays the "Page" content 
+	                    	the_content();
+
+	                    	// action hook for displaying a list of archive links
+	                    	thematic_archives();
+
+	                    	edit_post_link( __( 'Edit', 'thematic' ),'<span class="edit-link">','</span>' );
+	                    ?>
+
+					</div><!-- .entry-content -->
+
+				</div><!-- #post -->
+
+	        <?php
+	       		// action hook for placing contentbelow #post
+	       		thematic_belowpost();
+
+       			// action hook for calling the comments_template
+       			thematic_comments_template();
+	        ?>
+
+			</div><!-- #content -->
+
+			<?php 
+				// action hook for placing content below #content
+				thematic_belowcontent();
+			?> 
+
+		</div><!-- #container -->
+
+<?php 
+	// action hook for placing content below #container
+	thematic_belowcontainer();
+
+	// calling the standard sidebar 
+	thematic_sidebar();
+
+	// calling footer.php
+	get_footer();
+?>
\ No newline at end of file
diff --git a/wp-content/themes/thematic/template-page-blog.php b/wp-content/themes/thematic/template-page-blog.php
index cc422870a6a5367471d3f522034325aebe0b5207..3c71e8a0a1515f560331e5a64de53700bb894922 100644
--- a/wp-content/themes/thematic/template-page-blog.php
+++ b/wp-content/themes/thematic/template-page-blog.php
@@ -1,71 +1,85 @@
-<?php
-/**
- * Template Name: Blog
- *
- * This template allows you to display the latest posts on any page of the site.
- *
- */
-
-    // calling the header.php
-    get_header();
-
-    // action hook for placing content above #container
-    thematic_abovecontainer();
-
-?>
-
-		<div id="container">
-	
-			<?php thematic_abovecontent(); ?>
-	
-			<div id="content">
-            
-            <?php
-			$wp_query = new WP_Query();
-			$wp_query->query( array( 'posts_per_page' => get_option( 'posts_per_page' ), 'paged' => $paged ) );
-			$more = 0;
-			?>
-
-				<?php 
-            	
-            	// create the navigation above the content
-            	thematic_navigation_above();
-				
-            	// calling the widget area 'index-top'
-            	get_sidebar('index-top');
-				
-            	// action hook for placing content above the index loop
-            	thematic_above_indexloop();
-				
-            	// action hook creating the index loop
-            	thematic_indexloop();
-				
-            	// action hook for placing content below the index loop
-            	thematic_below_indexloop();
-				
-            	// calling the widget area 'index-bottom'
-            	get_sidebar('index-bottom');
-				
-            	// create the navigation below the content
-            	thematic_navigation_below();
-            	
-            	?>
-				
-			</div><!-- #content -->
-		
-			<?php thematic_belowcontent(); ?> 
-		
-		</div><!-- #container -->
-
-<?php 
-
-    // action hook for placing content below #container
-    thematic_belowcontainer();
-
-    // calling the standard sidebar 
-    thematic_sidebar();
-    
-    // calling footer.php
-    get_footer();
-
+<?php
+/**
+ * Template Name: Deprecated Blog Template
+ *
+ * This template is here for Backwards compatibility with child themes that use it.
+ * This file will be removed in a future version of thematic. <br>
+ *
+ * This was originally intended to allow you to display the latest posts on any page of the site.<br>
+ *
+ * The recommended way to do this by setting the "Front Page" and "Posts Page" options 
+ * in WP-Admin/Settings/Reading. If those options are set the index.php will be used
+ * to display the blog page.
+ *
+ * If you desire a different template for your blog page, create a home.php in a child theme.
+ *
+ * @package Thematic
+ * @subpackage Templates
+ * @deprecated 1.0
+ */
+
+	// Providing deprecated file notice to be seen when WP_DEBUG is true
+	_deprecated_file( sprintf( __( 'The template %s', 'thematic' ) . ':', basename(__FILE__) ), 'Thematic 1.0', null, sprintf( __( 'You can include a %s in a childtheme', 'thematic' ) . '.', 'home.php' ) );
+
+    // calling the header.php
+    get_header();
+
+    // action hook for placing content above #container
+    thematic_abovecontainer();
+?>
+
+		<div id="container">
+	
+			<?php 
+				// action hook for inserting content above #content
+				thematic_abovecontent();
+	    	
+				// filter for manipulating the element that wraps the content 
+				echo apply_filters( 'thematic_open_id_content', '<div id="content">' . "\n\n" );
+	    		
+	    		$wp_query = new WP_Query();
+	    		$wp_query->query( array( 'posts_per_page' => get_option( 'posts_per_page' ), 'paged' => $paged ) );
+	    		$more = 0;
+			?>
+
+				<?php 
+	            	// create the navigation above the content
+	            	thematic_navigation_above();
+					
+	            	// calling the widget area 'index-top'
+	            	get_sidebar('index-top');
+					
+	            	// action hook for placing content above the index loop
+	            	thematic_above_indexloop();
+					
+	            	// action hook creating the index loop
+	            	thematic_indexloop();
+					
+	            	// action hook for placing content below the index loop
+	            	thematic_below_indexloop();
+					
+	            	// calling the widget area 'index-bottom'
+	            	get_sidebar('index-bottom');
+					
+	            	// create the navigation below the content
+	            	thematic_navigation_below();
+            	?>
+				
+			</div><!-- #content -->
+		
+			<?php 
+				// action hook for inserting content below #content
+				thematic_belowcontent(); 
+			?> 		
+		</div><!-- #container -->
+
+<?php 
+    // action hook for placing content below #container
+    thematic_belowcontainer();
+
+    // calling the standard sidebar 
+    thematic_sidebar();
+    
+    // calling footer.php
+    get_footer();
 ?>
\ No newline at end of file
diff --git a/wp-content/themes/thematic/template-page-fullwidth.php b/wp-content/themes/thematic/template-page-fullwidth.php
index 689181d713519e84db7db05fc592df48a6339e1a..44d8b2094cb1367eeda6b4c4c5ddf0d962b43d75 100644
--- a/wp-content/themes/thematic/template-page-fullwidth.php
+++ b/wp-content/themes/thematic/template-page-fullwidth.php
@@ -1,91 +1,96 @@
-<?php
-/**
- * Template Name: Full Width
- *
- * This Full Width template removes the primary and secondary asides so that content
- * can be displayed the entire width of the #content area.
- *
- */
-
-
-    // calling the header.php
-    get_header();
-
-    // action hook for placing content above #container
-    thematic_abovecontainer();
-
-?>
-
-		<div id="container">
-		
-			<?php thematic_abovecontent(); ?>
-		
-			<div id="content">
-	
-	            <?php
-	        
-	            // calling the widget area 'page-top'
-	            get_sidebar('page-top');
-	
-	            the_post();
-	            
-	            thematic_abovepost();
-	        
-	            ?>
-	            
-				<div id="post-<?php the_ID();
-					echo '" ';
-					if (!(THEMATIC_COMPATIBLE_POST_CLASS)) {
-						post_class();
-						echo '>';
-					} else {
-						echo 'class="';
-						thematic_post_class();
-						echo '">';
-					}
-	                
-	                // creating the post header
-	                thematic_postheader();
-	                
-	                ?>
-	                
-					<div class="entry-content">
-	
-	                    <?php
-	                    
-	                    the_content();
-	                    
-	                    wp_link_pages("\t\t\t\t\t<div class='page-link'>".__('Pages: ', 'thematic'), "</div>\n", 'number');
-	                    
-	                    edit_post_link(__('Edit', 'thematic'),'<span class="edit-link">','</span>') ?>
-	
-					</div>
-				</div><!-- .post -->
-	
-	        <?php
-	        
-	        thematic_belowpost();
-	        
-	        // calling the comments template
-	        thematic_comments_template();
-	        
-	        // calling the widget area 'page-bottom'
-	        get_sidebar('page-bottom');
-	        
-	        ?>
-	
-			</div><!-- #content -->
-			
-			<?php thematic_belowcontent(); ?> 
-			
-		</div><!-- #container -->
-
-<?php 
-
-    // action hook for placing content below #container
-    thematic_belowcontainer();
-    
-    // calling footer.php
-    get_footer();
-
+<?php
+/**
+ * Template Name: Full Width
+ *
+ * This Full Width template removes the primary and secondary asides so that content
+ * can be displayed the entire width of the #content area.
+ * 
+ * @package Thematic
+ * @subpackage Templates
+ */
+
+    // calling the header.php
+    get_header();
+
+    // action hook for placing content above #container
+    thematic_abovecontainer();
+?>
+
+		<div id="container">
+		
+			<?php
+				// action hook for inserting content above #content
+				thematic_abovecontent();		
+	    	
+				// filter for manipulating the element that wraps the content 
+				echo apply_filters( 'thematic_open_id_content', '<div id="content">' . "\n\n" );
+			
+				// calling the widget area 'page-top'
+	            get_sidebar('page-top');
+	
+	            // start the loop
+	            while ( have_posts() ) : the_post();
+	            
+	            // action hook for inserting 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 '">';
+					}
+
+	            	// creating the post header
+	            	thematic_postheader();
+	            ?>
+	                
+					<div class="entry-content">
+	
+	                    <?php
+	                    	the_content();
+	                    
+	                    	wp_link_pages( "\t\t\t\t\t<div class='page-link'>" . __( 'Pages: ', 'thematic' ), "</div>\n", 'number' );
+	                    
+	                    	edit_post_link( __( 'Edit', 'thematic' ), '<span class="edit-link">','</span>' );
+	                    ?>
+	
+					</div>
+					
+				</div><!-- .post -->
+	
+			<?php
+				// calls the do_action for inserting content below #post
+	        	thematic_belowpost();
+	        		        
+	        	// action hook for calling the comments_template
+       			thematic_comments_template();
+        		
+	        	// end loop
+        		endwhile;
+	        
+	        	// calling the widget area 'page-bottom'
+	        	get_sidebar( 'page-bottom' );
+	        ?>
+	
+			</div><!-- #content -->
+			
+			<?php 
+				// action hook for inserting content below #content
+				thematic_belowcontent(); 
+			?> 
+		</div><!-- #container -->
+
+<?php 
+    // action hook for placing content below #container
+    thematic_belowcontainer();
+    
+    // calling footer.php
+    get_footer();
 ?>
\ No newline at end of file
diff --git a/wp-content/themes/thematic/thematicsamplechildtheme/functions.php b/wp-content/themes/thematic/thematicsamplechildtheme/functions.php
index 6dc0472ed66f502965fa53f68f35a5bd845d2070..d5287a736b5c585b0683d0682e293bf5b6935c73 100644
--- a/wp-content/themes/thematic/thematicsamplechildtheme/functions.php
+++ b/wp-content/themes/thematic/thematicsamplechildtheme/functions.php
@@ -1,12 +1,35 @@
 <?php
+/**
+ * Custom Child Theme Functions
+ *
+ * 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.
+ *
+ * More ideas can be found in the community documentation for Thematic
+ * @link http://docs.thematictheme.com
+ *
+ * @package ThematicSampleChildTheme
+ * @subpackage ThemeInit
+ */
 
+
+// Unleash the power of Thematic's dynamic classes
+// 
+// define('THEMATIC_COMPATIBLE_BODY_CLASS', true);
+// define('THEMATIC_COMPATIBLE_POST_CLASS', true);
+
+// Unleash the power of Thematic's comment form
 //
-//  Custom Child Theme Functions
+// define('THEMATIC_COMPATIBLE_COMMENT_FORM', true);
+
+// Unleash the power of Thematic's feed link functions
 //
+// define('THEMATIC_COMPATIBLE_FEEDLINKS', true);
 
-// I've included a "commented out" sample function below that'll add a home link to your menu
-// More ideas can be found on "A Guide To Customizing The Thematic Theme Framework" 
-// http://themeshaper.com/thematic-for-wordpress/guide-customizing-thematic-theme-framework/
 
 // Adds a home link to your menu
 // http://codex.wordpress.org/Template_Tags/wp_page_menu
@@ -15,23 +38,8 @@
 //        'show_home' => 'Home',
 //        'sort_column' => 'menu_order',
 //        'menu_class' => 'menu',
-//        'echo' => true
+//        'echo' => false
 //    );
 //	return $args;
 //}
 //add_filter('wp_page_menu_args','childtheme_menu_args');
-
-// Unleash the power of Thematic's dynamic classes
-// 
-// define('THEMATIC_COMPATIBLE_BODY_CLASS', true);
-// define('THEMATIC_COMPATIBLE_POST_CLASS', true);
-
-// 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);
-
-?>
\ 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 917eb789f8be93e90253e799964604bedeec5bac..47a7af91a4171f2310f884b6e2d1ae9447954d4b 100644
--- a/wp-content/themes/thematic/thematicsamplechildtheme/style.css
+++ b/wp-content/themes/thematic/thematicsamplechildtheme/style.css
@@ -1,15 +1,20 @@
 /*   
 Theme Name: A Thematic Child Theme
-Theme URI: 
+Theme URI: http://thematictheme.com/
 Description: Use this theme to start your Thematic Child Theme development.
 Author: Ian Stewart
 Author URI: http://themeshaper.com/
 Template: thematic
 Version: 1.0
-Tags: Thematic
+Tags: white, three-columns, two-columns, fixed-width, theme-options, left-sidebar, right-sidebar, threaded-comments, sticky-post, microformats
+License: GNU General Public License v2.0
+License URI: http://www.gnu.org/licenses/gpl-2.0.html
+
 .
-Thematic is © Ian Stewart http://themeshaper.com/
+The Thematic Theme is copyright Ian Stewart http://themeshaper.com/
+This work, like WordPress, is released under GNU General Public License, version 2 (GPL).
 .
+
 */
 
 /* Reset browser defaults */