From 9d8d784c1606f916583988214b2d659da155db65 Mon Sep 17 00:00:00 2001
From: mindfaucet <tyler@mindfaucet.com>
Date: Sun, 29 Nov 2009 17:16:29 -0700
Subject: [PATCH] More options styling/cleanup. Finished options pages
 Internationalization edits.

---
 options/archivesearchoptions.php |  8 +++----
 options/buyprintoptions.php      | 12 +++++-----
 options/customheaderoptions.php  |  8 +++----
 options/generaloptions.php       | 18 +++++++--------
 options/indexoptions.php         | 10 ++++-----
 options/membersoptions.php       | 10 ++++-----
 options/menubaroptions.php       | 14 ++++++------
 options/postoptions.php          | 38 ++++++++++++++++----------------
 options/themestyle.php           | 20 ++++++++---------
 9 files changed, 70 insertions(+), 68 deletions(-)

diff --git a/options/archivesearchoptions.php b/options/archivesearchoptions.php
index a4ec982..d10ce80 100644
--- a/options/archivesearchoptions.php
+++ b/options/archivesearchoptions.php
@@ -8,7 +8,7 @@
 			<table class="widefat">
 				<thead>
 					<tr>
-						<th colspan="3">Archive &amp; Search Results</th>
+						<th colspan="3"><?php _e('Archive & Search Results','comicpress'); ?></th>
 					</tr>
 				</thead>
 				<tr class="alternate">
@@ -20,7 +20,7 @@
 						</div>
 					</th>
 					<td>
-						<?php _e('Would you like to have users see the <b>full content</b> or just an <b>excerpt</b> when viewing the archives?','comicpress'); ?>
+						<?php _e('Would you like to have users see the full content or just an excerpt when viewing the archives?','comicpress'); ?>
 					</td>
 				</tr>
 				<tr>
@@ -32,7 +32,7 @@
 						</div>
 					</th>
 					<td>
-						<?php _e('Would you like to have users see the <b>full content</b> or just an <b>excerpt</b> when searching?','comicpress'); ?>
+						<?php _e('Would you like to have users see the full content or just an excerpt when searching?','comicpress'); ?>
 					</td>
 				</tr>
 				<tr class="alternate">
@@ -44,7 +44,7 @@
 						</select>
 					</th>
 					<td>
-						<?php _e('Sets the display order of your archives. <b>Newest to Oldest</b> will display your posts starting with the most recent. <b>Oldest to Newest</b> will start with the first entry in the category, tag, or date range (e.g., Selecting May 20XX will start with May 1, not May 31st.)','comicpress'); ?>
+						<?php _e('Sets the display order of your archives. Newest to Oldest will display your posts starting with the most recent. Oldest to Newest will start with the first entry in the category, tag, or date range (e.g., Selecting May 20XX will start with May 1, not May 31st.)','comicpress'); ?>
 					</td>
 				</tr>
 				<tr>
diff --git a/options/buyprintoptions.php b/options/buyprintoptions.php
index 3e32d0f..0721cb9 100644
--- a/options/buyprintoptions.php
+++ b/options/buyprintoptions.php
@@ -29,11 +29,13 @@
 					<td>
 						<span style="color: #d54e21;"><?php _e('* This must be correct, the form needs some place to go.','comicpress'); ?></span><br />
 						<?php _e('The URL address to which you associated the buy print template.','comicpress'); ?><br />
-						<?php _e('Examples:','comicpress'); ?><br />
-						http://yourdomain.com/?p=233<br />
-						http://yourdomain.com/shop/<br />
-						/?p=233<br />
-						/shop/
+						<em>
+							<?php _e('Examples:','comicpress'); ?>			
+							"http://yourdomain.com/?p=233",
+							"http://yourdomain.com/shop/",
+							"/?p=233",
+							"/shop/".
+						</em>					
 					</td>
 				</tr>
 				<tr>
diff --git a/options/customheaderoptions.php b/options/customheaderoptions.php
index 429f757..6363502 100644
--- a/options/customheaderoptions.php
+++ b/options/customheaderoptions.php
@@ -8,7 +8,7 @@
 		<table class="widefat">
 			<thead>
 				<tr>
-					<th colspan="3">Custom Header</th>
+					<th colspan="3"><?php _e('Custom Header','comicpress'); ?></th>
 				</tr>
 			</thead>
 			<tr class="alternate">
@@ -17,7 +17,7 @@
 					<input id="enable_custom_image_header" name="enable_custom_image_header" type="checkbox" value="1" <?php checked(true, $comicpress_options['enable_custom_image_header']); ?> />
 				</td>
 				<td>
-					<?php _e('Adds Custom Header option under Dashboard -> Appearance.  Allows you to add your own header image and customize or hide the default text.','comicpress'); ?>
+					<?php _e('Adds Custom Header option under Dashboard -> Appearance. Allows you to add your own header image and customize or hide the default text.','comicpress'); ?>
 				</td>
 			</tr>
 			<tr>
@@ -26,7 +26,7 @@
 					<input type="text" size="5" name="custom_image_header_width" id="custom_image_header_width" value="<?php echo $comicpress_options['custom_image_header_width']; ?>" /><br />
 				</td>
 				<td>
-					<?php _e('Sets the <b>width</b> of the image you want to use for Custom Header.  Defaults widths are <b>780px</b> or <b>980px</b> depending on the layout. Refer to the width of the layout you chose and any custom changes you have made to site width in the CSS.','comicpress'); ?>
+					<?php _e('Sets the width of the image you want to use for Custom Header. Defaults widths are 780px or 980px depending on the layout. Refer to the width of the layout you chose and any custom changes you have made to site width in the CSS.','comicpress'); ?>
 				</td>
 			</tr>
 			<tr class="alternate">
@@ -35,7 +35,7 @@
 					<input type="text" size="5" name="custom_image_header_height" id="custom_image_header_height" value="<?php echo $comicpress_options['custom_image_header_height']; ?>" />
 				</td>
 				<td>
-					<?php _e('Sets the <b>height</b> of the image you want to use for Custom Header.  Recommended maximum height is <b>120px</b>, but if your logo/image demands it you can set it higher.','comicpress'); ?>
+					<?php _e('Sets the height of the image you want to use for Custom Header. Recommended maximum height is 120px, but if your logo/image demands it you can set it higher.','comicpress'); ?>
 				</td>
 			</tr>
 		</table>
diff --git a/options/generaloptions.php b/options/generaloptions.php
index 05280f8..83b1117 100644
--- a/options/generaloptions.php
+++ b/options/generaloptions.php
@@ -12,7 +12,7 @@
 					</tr>
 				</thead>
 				<tr class="alternate">
-					<th scope="row"><label for="disable_page_restraints"><?php _e('Disable page restraints?','comicpress'); ?></label></th>
+					<th scope="row"><label for="disable_page_restraints"><?php _e('Disable page restraints','comicpress'); ?></label></th>
 					<td>
 						<input id="disable_page_restraints" name="disable_page_restraints" type="checkbox" value="1" <?php checked(true, $comicpress_options['disable_page_restraints']); ?> />
 					</td>
@@ -21,7 +21,7 @@
 					</td>
 				</tr>
 				<tr>
-					<th scope="row"><label for="rascal_says"><?php _e('Enable Rascal the ComicPress Mascot?','comicpress'); ?></label></th>
+					<th scope="row"><label for="rascal_says"><?php _e('Enable Rascal the ComicPress Mascot','comicpress'); ?></label></th>
 					<td>
 						<input id="rascal_says" name="rascal_says" type="checkbox" value="1" <?php checked(true, $comicpress_options['rascal_says']); ?> />
 					</td>
@@ -30,7 +30,7 @@
 					</td>
 				</tr>
 				<tr class="alternate">
-					<th scope="row"><label for="disable_comment_note"><?php _e('Disable the comment notes?','comicpress'); ?></label></th>
+					<th scope="row"><label for="disable_comment_note"><?php _e('Disable the comment notes','comicpress'); ?></label></th>
 					<td>
 						<input id="disable_comment_note" name="disable_comment_note" type="checkbox" value="1" <?php checked(true, $comicpress_options['disable_comment_note']); ?> />
 					</td>
@@ -39,7 +39,7 @@
 					</td>
 				</tr>
 				<tr>
-					<th scope="row"><label for="disable_blogheader"><?php _e('Disable blog header?','comicpress'); ?></label></th>
+					<th scope="row"><label for="disable_blogheader"><?php _e('Disable blog header','comicpress'); ?></label></th>
 					<td>
 						<input id="disable_blogheader" name="disable_blogheader" type="checkbox" value="1" <?php checked(true, $comicpress_options['disable_blogheader']); ?> />		
 					</td>
@@ -56,7 +56,7 @@
 					</tr>
 				</thead>
 				<tr class="alternate">
-					<th scope="row"><label for="enable_numbered_pagination"><?php _e('Enable numbered pagination?','comicpress'); ?></label></th>
+					<th scope="row"><label for="enable_numbered_pagination"><?php _e('Enable numbered pagination','comicpress'); ?></label></th>
 					<td>
 						<input id="enable_numbered_pagination" name="enable_numbered_pagination" type="checkbox" value="1" <?php checked(true, $comicpress_options['enable_numbered_pagination']); ?> />
 					</td>
@@ -65,7 +65,7 @@
 					</td>
 				</tr>
 				<tr>
-					<th scope="row"><label for="comic_clicks_next"><?php _e('Click comic to go next?','comicpress'); ?></label></th>
+					<th scope="row"><label for="comic_clicks_next"><?php _e('Click comic to go next','comicpress'); ?></label></th>
 					<td>
 						<input id="comic_clicks_next" name="comic_clicks_next" type="checkbox" value="1" <?php checked(true, $comicpress_options['comic_clicks_next']); ?> />
 					</td>
@@ -74,7 +74,7 @@
 					</td>
 				</tr>
 				<tr class="alternate">
-					<th scope="row"><label for="disable_default_comic_nav"><?php _e('Disable the default comic post navigation?','comicpress'); ?></label></th>
+					<th scope="row"><label for="disable_default_comic_nav"><?php _e('Disable the default comic post navigation','comicpress'); ?></label></th>
 					<td>
 						<input id="disable_default_comic_nav" name="disable_default_comic_nav" type="checkbox" value="1" <?php checked(true, $comicpress_options['disable_default_comic_nav']); ?> />
 					</td>
@@ -126,7 +126,7 @@
 					</td>
 				</tr>
 				<tr>
-					<th scope="row"><label for="disable_lrsidebars_frontpage"><?php _e('Disable home page sidebars?','comicpress'); ?></label></th>
+					<th scope="row"><label for="disable_lrsidebars_frontpage"><?php _e('Disable home page sidebars','comicpress'); ?></label></th>
 					<td>
 						<input id="disable_lrsidebars_frontpage" name="disable_lrsidebars_frontpage" type="checkbox" value="1" <?php checked(true, $comicpress_options['disable_lrsidebars_frontpage']); ?> />
 					</td>
@@ -143,7 +143,7 @@
 					</tr>
 				</thead>
 				<tr class="alternate">
-					<th scope="row"><label for="disable_footer_text"><?php _e('Disable the default text in the footer?','comicpress'); ?></label></th>
+					<th scope="row"><label for="disable_footer_text"><?php _e('Disable the default text in the footer','comicpress'); ?></label></th>
 					<td>
 						<input id="disable_footer_text" name="disable_footer_text" type="checkbox" value="1" <?php checked(true, $comicpress_options['disable_footer_text']); ?> />
 					</td>
diff --git a/options/indexoptions.php b/options/indexoptions.php
index b96bdbe..4eebba8 100644
--- a/options/indexoptions.php
+++ b/options/indexoptions.php
@@ -8,11 +8,11 @@
 			<table class="widefat">
 				<thead>
 					<tr>
-						<th colspan="3">Blog</th>
+						<th colspan="3"><?php _e('Blog','comicpress'); ?></th>
 					</tr>
 				</thead>
 				<tr class="alternate">
-					<th scope="row"><label for="disable_blog_frontpage"><?php _e('Disable the blog on the Home page?','comicpress'); ?></label></th>
+					<th scope="row"><label for="disable_blog_frontpage"><?php _e('Disable the blog on the Home page','comicpress'); ?></label></th>
 					<td>
 						<input id="disable_blog_frontpage" name="disable_blog_frontpage" type="checkbox" value="1" <?php checked(true, $comicpress_options['disable_blog_frontpage']); ?> />					
 					</td>
@@ -29,7 +29,7 @@
 					</tr>
 				</thead>
 				<tr class="alternate">
-					<th scope="row"><label for="disable_comic_frontpage"><?php _e('Disable comic on Home page?','comicpress'); ?></label></th>
+					<th scope="row"><label for="disable_comic_frontpage"><?php _e('Disable comic on Home page','comicpress'); ?></label></th>
 					<td>
 						<input id="disable_comic_frontpage" name="disable_comic_frontpage" type="checkbox" value="1" <?php checked(true, $comicpress_options['disable_comic_frontpage']); ?> />					
 					</td>
@@ -38,7 +38,7 @@
 					</td>
 				</tr>
 				<tr>
-					<th scope="row"><label for="disable_comic_blog_frontpage"><?php _e('Disable the comic blog on Home page?','comicpress'); ?></label></th>
+					<th scope="row"><label for="disable_comic_blog_frontpage"><?php _e('Disable the comic blog on Home page','comicpress'); ?></label></th>
 					<td>
 						<input id="disable_comic_blog_frontpage" name="disable_comic_blog_frontpage" type="checkbox" value="1" <?php checked(true, $comicpress_options['disable_comic_blog_frontpage']); ?> />					
 					</td>
@@ -47,7 +47,7 @@
 					</td>
 				</tr>
 				<tr class="alternate">
-					<th scope="row"><label for="disable_comic_blog_single"><?php _e('Disable the comic blog on the single pages?','comicpress'); ?></lable></th>
+					<th scope="row"><label for="disable_comic_blog_single"><?php _e('Disable the comic blog on the single pages','comicpress'); ?></lable></th>
 					<td>
 						<input id="disable_comic_blog_single" name="disable_comic_blog_single" type="checkbox" value="1" <?php checked(true, $comicpress_options['disable_comic_blog_single']); ?> />					
 					</td>
diff --git a/options/membersoptions.php b/options/membersoptions.php
index 96d90e6..09cd679 100644
--- a/options/membersoptions.php
+++ b/options/membersoptions.php
@@ -26,11 +26,11 @@
 				</tr>
 				<tr>
 					<td colspan="2">
-						<p>USAGE: Edit the user with <b>Dashboard -> Users -> Authors & Users</b> and flag the user you want to be a member with the option at the bottom.</p>
-						<p>Inside posts, add [members] content you only want members to see [/members]</p>
-						<p>When setting a 'members' category, you *cannot* use an existing comic category, uncategorized, or blog category!</p>
-						<p>You MUST create a whole new category and called it "members", then you select that category here and create a page called "Members" or something equivelant and associate the Member's Only template to it.</p>
-						<p>This will make it so that that category is only seen as blogposts inside that area and not anywhere else on the site unless the user has the members flag.</p>
+						<p><?php _e('USAGE: Edit the user with <em>Dashboard -> Users -> Authors & Users</em> and flag the user you want to be a member with the option at the bottom.','comicpress'); ?></p>
+						<p><?php _e('Inside posts, add [members] content you only want members to see [/members]','comicpress'); ?></p>
+						<p><?php _e('When setting a \'members\' category, you *cannot* use an existing comic category, uncategorized, or blog category!','comicpress'); ?></p>
+						<p><?php _e('You MUST create a whole new category and called it "members", then you select that category here and create a page called "Members" or something equivelant and associate the Member\'s Only template to it.','comicpress'); ?></p>
+						<p><?php _e('This will make it so that that category is only seen as blogposts inside that area and not anywhere else on the site unless the user has the members flag.','comicpress'); ?></p>
 					</td>
 				</tr>
 			</table>
diff --git a/options/menubaroptions.php b/options/menubaroptions.php
index 802b18c..dd3fc8a 100644
--- a/options/menubaroptions.php
+++ b/options/menubaroptions.php
@@ -8,11 +8,11 @@
 			<table class="widefat">
 				<thead>
 					<tr>
-						<th colspan="3">Menubar</th>
+						<th colspan="3"><?php _e('Menubar','comicpress'); ?></th>
 					</tr>
 				</thead>
 				<tr class="alternate">
-					<th scope="row"><label for="disable_default_menubar"><?php _e('Disable default Menubar?','comicpress'); ?></label></th>
+					<th scope="row"><label for="disable_default_menubar"><?php _e('Disable default Menubar','comicpress'); ?></label></th>
 					<td>
 						<input id="disable_default_menubar" name="disable_default_menubar" type="checkbox" value="1" <?php checked(true, $comicpress_options['disable_default_menubar']); ?> />
 					</td>
@@ -21,7 +21,7 @@
 					</td>
 				</tr>		
 				<tr>
-					<th scope="row"><label for="enable_search_in_menubar"><?php _e('Enable Search Form?','comicpress'); ?></label></th>
+					<th scope="row"><label for="enable_search_in_menubar"><?php _e('Enable Search Form','comicpress'); ?></label></th>
 					<td>
 						<input id="enable_search_in_menubar" name="enable_search_in_menubar" type="checkbox" value="1" <?php checked(true, $comicpress_options['enable_search_in_menubar']); ?> />
 					</td>
@@ -30,7 +30,7 @@
 					</td>
 				</tr>		
 				<tr class="alternate">
-					<th scope="row"><label for="enable_rss_in_menubar"><?php _e('Enable RSS Link?','comicpress'); ?></label></th>
+					<th scope="row"><label for="enable_rss_in_menubar"><?php _e('Enable RSS Link','comicpress'); ?></label></th>
 					<td>
 						<input id="enable_rss_in_menubar" name="enable_rss_in_menubar" type="checkbox" value="1" <?php checked(true, $comicpress_options['enable_rss_in_menubar']); ?> />
 					</td>
@@ -48,16 +48,16 @@
 					</td>
 				</tr>		
 				<tr class="alternate">
-					<th scope="row"><label for="contact_in_menubar"><?php _e('Enable Contact/custom links?','comicpress'); ?></label></th>
+					<th scope="row"><label for="contact_in_menubar"><?php _e('Enable Contact/custom links','comicpress'); ?></label></th>
 					<td>
 						<input id="contact_in_menubar" name="contact_in_menubar" type="checkbox" value="1" <?php checked(true, $comicpress_options['contact_in_menubar']); ?> />
 					</td>
 					<td>
-					<?php _e('Adds a <b>Contact</b> button to the Menubar associated with your admin email. You can also create a links category called <i>Menubar</i> and whatever links you add to that will appear in the Menubar.','comicpress'); ?>
+					<?php _e('Adds a Contact button to the Menubar associated with your admin email.  You can also create a links category called <i>Menubar</i> and whatever links you add to that will appear in the Menubar.','comicpress'); ?>
 					</td>
 				</tr>		
 				<tr>
-					<th scope="row"><label for="disable_dynamic_menubar_links"><?php _e('Disable auto-generated WordPress links?','comicpress'); ?></label></th>
+					<th scope="row"><label for="disable_dynamic_menubar_links"><?php _e('Disable auto-generated WordPress links','comicpress'); ?></label></th>
 					<td>
 						<input id="disable_dynamic_menubar_links" name="disable_dynamic_menubar_links" type="checkbox" value="1" <?php checked(true, $comicpress_options['disable_dynamic_menubar_links']); ?> />
 					</td>
diff --git a/options/postoptions.php b/options/postoptions.php
index 1564194..986da9b 100644
--- a/options/postoptions.php
+++ b/options/postoptions.php
@@ -8,11 +8,11 @@
 			<table class="widefat">
 				<thead>
 					<tr>
-						<th colspan="3">Post</th>
+						<th colspan="3"><?php _e('Post','comicpress'); ?></th>
 					</tr>
 				</thead>
 				<tr class="alternate">
-					<th scope="row"><label for="transcript_in_posts"><?php _e('Show transcript in post area?','comicpress'); ?></label></th>
+					<th scope="row"><label for="transcript_in_posts"><?php _e('Show transcript in post area','comicpress'); ?></label></th>
 					<td>
 						<input id="transcript_in_posts" name="transcript_in_posts" type="checkbox" value="1" <?php checked(true, $comicpress_options['transcript_in_posts']); ?> />					
 					</td>
@@ -21,7 +21,7 @@
 					</td>
 				</tr>
 				<tr>
-					<th scope="row"><label for="enable_related_comics"><?php _e('Put Related Comics in comic posts?','comicpress'); ?></label></th>
+					<th scope="row"><label for="enable_related_comics"><?php _e('Put Related Comics in comic posts','comicpress'); ?></label></th>
 					<td>
 						<input id="enable_related_comics" name="enable_related_comics" type="checkbox" value="1" <?php checked(true, $comicpress_options['enable_related_comics']); ?> />					
 					</td>
@@ -30,7 +30,7 @@
 					</td>
 				</tr>
 				<tr class="alternate">
-					<th scope="row"><label for="enable_related_posts"><?php _e('Put Related Posts in blog posts?','comicpress'); ?></label></th>
+					<th scope="row"><label for="enable_related_posts"><?php _e('Put Related Posts in blog posts','comicpress'); ?></label></th>
 					<td>
 						<input id="enable_related_posts" name="enable_related_posts" type="checkbox" value="1" <?php checked(true, $comicpress_options['enable_related_posts']); ?> />					
 					</td>
@@ -39,7 +39,7 @@
 					</td>
 				</tr>
 				<tr>
-					<th scope="row"><label for="remove_wptexturize"><?php _e('Disable WordPress default content formatting?','comicpress'); ?></label></th>
+					<th scope="row"><label for="remove_wptexturize"><?php _e('Disable WordPress default content formatting','comicpress'); ?></label></th>
 					<td>
 						<input id="remove_wptexturize" name="remove_wptexturize" type="checkbox" value="1" <?php checked(true, $comicpress_options['remove_wptexturize']); ?> />					
 					</td>
@@ -52,11 +52,11 @@
 			<table class="widefat">
 				<thead>
 					<tr>
-						<th colspan="3">Authors/Avatars/Moods</th>
+						<th colspan="3"><?php _e('Authors/Avatars/Moods','comicpress'); ?></th>
 					</tr>
 				</thead>
 				<tr class="alternate">
-					<th scope="row"><label for="split_column_in_two"><?php _e('Two author blog? ','comicpress'); ?></label></th>
+					<th scope="row"><label for="split_column_in_two"><?php _e('Two author blog','comicpress'); ?></label></th>
 					<td>
 						<input id="split_column_in_two" name="split_column_in_two" type="checkbox" value="1" <?php checked(true, $comicpress_options['split_column_in_two']); ?> />					
 					</td>
@@ -66,7 +66,7 @@
 				</tr>
 				<tr>
 					<th scope="row" colspan="2">
-						<label for="author_column_one"><?php _e('Author for column one?','comicpress'); ?></label>
+						<label for="author_column_one"><?php _e('Author for column one','comicpress'); ?></label>
 						<?php
 							$args = array('echo' => '0', 'show' => 'display_name', 'selected' => $comicpress_options['author_column_one']);
 							$selected = wp_dropdown_users($args);
@@ -81,7 +81,7 @@
 				</tr>
 				<tr class="alternate">
 					<th scope="row" colspan="2">
-						<label for="author_column_two"><?php _e('Author for column two?','comicpress'); ?></label>
+						<label for="author_column_two"><?php _e('Author for column two','comicpress'); ?></label>
 						<?php
 							$args = array('echo' => '0', 'show' => 'display_name', 'selected' => $comicpress_options['author_column_two']);
 							$selected = wp_dropdown_users($args);
@@ -94,7 +94,7 @@
 					</td>
 				</tr>
 				<tr>
-					<th scope="row"><label for="enable_comic_post_author_gravatar"><?php _e('Comic post author Gravatar?','comicpress'); ?></label></th>
+					<th scope="row"><label for="enable_comic_post_author_gravatar"><?php _e('Comic post author Gravatar','comicpress'); ?></label></th>
 					<td>
 						<input id="enable_comic_post_author_gravatar" name="enable_comic_post_author_gravatar" type="checkbox" value="1" <?php checked(true, $comicpress_options['enable_comic_post_author_gravatar']); ?> />					
 					</td>
@@ -103,7 +103,7 @@
 					</td>
 				</tr>
 				<tr class="alternate">
-					<th scope="row"><label for="enable_post_author_gravatar"><?php _e('Blog post author Gravatar?','comicpress'); ?></label></th>
+					<th scope="row"><label for="enable_post_author_gravatar"><?php _e('Blog post author Gravatar','comicpress'); ?></label></th>
 					<td>
 						<input id="enable_post_author_gravatar" name="enable_post_author_gravatar" type="checkbox" value="1" <?php checked(true, $comicpress_options['enable_post_author_gravatar']); ?> />					
 					</td>
@@ -168,7 +168,7 @@
 			<table class="widefat">
 				<thead>
 					<tr>
-						<th colspan="3">Calendar</th>
+						<th colspan="3"><?php _e('Calendar','comicpress'); ?></th>
 					</tr>
 				</thead>
 				<?php
@@ -198,7 +198,7 @@
 					</td>
 				</tr>	
 				<tr>
-					<th scope="row"><label for="enable_comic_post_calendar"><?php _e('Add graphic calendar to comic posts?','comicpress'); ?></label></th>
+					<th scope="row"><label for="enable_comic_post_calendar"><?php _e('Add graphic calendar to comic posts','comicpress'); ?></label></th>
 					<td>
 						<input id="enable_comic_post_calendar" name="enable_comic_post_calendar" type="checkbox" value="1" <?php checked(true, $comicpress_options['enable_comic_post_calendar']); ?> />					
 					</td>
@@ -207,7 +207,7 @@
 					</td>
 				</tr>
 				<tr class="alternate">
-					<th scope="row"><label for="enable_post_calendar"><?php _e('Add graphic calendar to blog posts?','comicpress'); ?></label></th>
+					<th scope="row"><label for="enable_post_calendar"><?php _e('Add graphic calendar to blog posts','comicpress'); ?></label></th>
 					<td>
 						<input id="enable_post_calendar" name="enable_post_calendar" type="checkbox" value="1" <?php checked(true, $comicpress_options['enable_post_calendar']); ?> />					
 					</td>
@@ -220,11 +220,11 @@
 			<table class="widefat">
 				<thead>
 					<tr>
-						<th colspan="3">Tags/Categories</th>
+						<th colspan="3"><?php _e('Tags/Categories','comicpress'); ?></th>
 					</tr>
 				</thead>
 				<tr class="alternate">
-					<th scope="row"><label for="disable_tags_in_posts"><?php _e('Disable display of tags in posts?','comicpress'); ?></label></th>
+					<th scope="row"><label for="disable_tags_in_posts"><?php _e('Disable display of tags in posts','comicpress'); ?></label></th>
 					<td>
 						<input id="disable_tags_in_posts" name="disable_tags_in_posts" type="checkbox" value="1" <?php checked(true, $comicpress_options['disable_tags_in_posts']); ?> />					
 					</td>
@@ -233,7 +233,7 @@
 					</td>
 				</tr>
 				<tr>
-					<th scope="row"><label for="disable_categories_in_posts"><?php _e('Disable display of categories in posts?','comicpress'); ?></label></th>
+					<th scope="row"><label for="disable_categories_in_posts"><?php _e('Disable display of categories in posts','comicpress'); ?></label></th>
 					<td>
 						<input id="disable_categories_in_posts" name="disable_categories_in_posts" type="checkbox" value="1" <?php checked(true, $comicpress_options['disable_categories_in_posts']); ?> />					
 					</td>
@@ -259,7 +259,7 @@
 					</td>
 				</tr>
 				<tr>
-					<th scope="row"><label for="static_blog"><?php _e('Blog loop stays with all the single pages?','comicpress'); ?></label></th>
+					<th scope="row"><label for="static_blog"><?php _e('Blog loop stays with all the single pages','comicpress'); ?></label></th>
 					<td>
 						<input id="static_blog" name="static_blog" type="checkbox" value="1" <?php checked(true, $comicpress_options['static_blog']); ?> />					
 					</td>
@@ -268,7 +268,7 @@
 					</td>
 				</tr>
 				<tr class="alternate">
-					<th scope="row"><label for="disable_page_titles"><?php _e('Disable the titles on pages?','comicpress'); ?></label></th>
+					<th scope="row"><label for="disable_page_titles"><?php _e('Disable the titles on pages','comicpress'); ?></label></th>
 					<td>
 						<input id="disable_page_titles" name="disable_page_titles" type="checkbox" value="1" <?php checked(true, $comicpress_options['disable_page_titles']); ?> />					
 					</td>
diff --git a/options/themestyle.php b/options/themestyle.php
index 3bb387d..ac8c5f2 100644
--- a/options/themestyle.php
+++ b/options/themestyle.php
@@ -23,22 +23,22 @@
 				<tr class="alternate">
 					<th scope="row" style="width:250px"><label for="cp_theme_layout" style="text-align:left"><?php _e('Choose Your Website Layout','comicpress'); ?></label>
 						<select name="cp_theme_layout" id="cp_theme_layout" onchange="showimage(this,'cpthemestyle')">
-							<option class="level-0" value="standard" <?php if ($comicpress_options['cp_theme_layout'] == 'standard') { ?>selected="selected" <?php } ?>><?php _e('2 Column (Standard)','comicpress'); ?></option>
-							<option class="level-0" value="3c" <?php if ($comicpress_options['cp_theme_layout'] =='3c') { ?>selected="selected" <?php } ?>><?php _e('3 Column ','comicpress'); ?></option>
-							<option class="level-0" value="3c2r" <?php if ($comicpress_options['cp_theme_layout'] =='3c2r') { ?>selected="selected" <?php } ?>><?php _e('3 Column: Sidebars Right','comicpress'); ?></option>
-							<option class="level-0" value="v" <?php if ($comicpress_options['cp_theme_layout'] =='v') { ?>selected="selected" <?php } ?>><?php _e('Single Panel (Vertical)','comicpress'); ?></option>
-							<option class="level-0" value="v3c" <?php if ($comicpress_options['cp_theme_layout'] =='v3c') { ?>selected="selected" <?php } ?>><?php _e('Single Panel (Vertical) 3 Column','comicpress'); ?></option>	
-							<option class="level-0" value="gn" <?php if ($comicpress_options['cp_theme_layout'] =='gn') { ?>selected="selected" <?php } ?>><?php _e('Graphic Novel: Sidebar Left','comicpress'); ?></option>
-							<option class="level-0" value="rgn" <?php if ($comicpress_options['cp_theme_layout'] =='rgn') { ?>selected="selected" <?php } ?>><?php _e('Graphic Novel: Sidebar Right','comicpress'); ?></option>
+							<option class="level-0" value="standard" <?php if ($comicpress_options['cp_theme_layout'] == 'standard') { ?>selected="selected" <?php } ?>><?php _e('2 Column - Standard','comicpress'); ?></option>
+							<option class="level-0" value="v" <?php if ($comicpress_options['cp_theme_layout'] =='v') { ?>selected="selected" <?php } ?>><?php _e('2 Column - Vertical','comicpress'); ?></option>
+							<option class="level-0" value="3c" <?php if ($comicpress_options['cp_theme_layout'] =='3c') { ?>selected="selected" <?php } ?>><?php _e('3 Column - Standard ','comicpress'); ?></option>
+							<option class="level-0" value="3c2r" <?php if ($comicpress_options['cp_theme_layout'] =='3c2r') { ?>selected="selected" <?php } ?>><?php _e('3 Column - Double Right Sidebar','comicpress'); ?></option>							
+							<option class="level-0" value="v3c" <?php if ($comicpress_options['cp_theme_layout'] =='v3c') { ?>selected="selected" <?php } ?>><?php _e('3 Column - Vertical','comicpress'); ?></option>	
+							<option class="level-0" value="gn" <?php if ($comicpress_options['cp_theme_layout'] =='gn') { ?>selected="selected" <?php } ?>><?php _e('Graphic Novel - Left Sidebar','comicpress'); ?></option>
+							<option class="level-0" value="rgn" <?php if ($comicpress_options['cp_theme_layout'] =='rgn') { ?>selected="selected" <?php } ?>><?php _e('Graphic Novel - Right Sidebar','comicpress'); ?></option>
 						</select>
 					</th>
 					<td>
 						<img id="cpthemestyle" src="<?php echo get_template_directory_uri(); ?>/images/options/<?php echo $comicpress_options['cp_theme_layout']; ?>.png" alt="ComicPress Theme Style" />
 					</td>
 					<td style="vertical-align:middle">
-						<i>Comic Strip - 2 Column</i> and <i>Single Panel - 2 Column</i> themes default width: <b>780px</b>.
+						<?php _e('2 column layout default width: <strong>780px</strong>.','comicpress'); ?>
 						<br/><br/>
-						<i>Comic Strip - 3 Column</i>, <i>Single Panel - 3 Column</i>, and <i>Graphic Novel</i> themes default width: <b>980px</b>.
+						<?php _e('3 column layout (<em>includes Graphic Novel</em>) default width: <b>980px</b>.','comicpress'); ?>
 					</td>
 				</tr>
 			</table>
@@ -65,7 +65,7 @@
 		<div id="comicpress-version-title"><a href="http://comicpress.org/">ComicPress 2.9</a></div>
 		<div id="comicpress-version-number">[<?php echo $comicpress_options['comicpress_version']; ?>]</div>
 		<?php _e('Created by','comicpress'); ?> <a href="http://mindfaucet.com/">Tyler Martin</a> <?php _e('with','comicpress'); ?> <a href="http://www.coswellproductions.com/">John Bintz</a><?php _e(',','comicpress'); ?> <a href="http://frumph.net/">Philip M. Hofer</a> <small>(<a href="http://frumph.net/">Frumph</a>)</small> <?php _e('and','comicpress'); ?> <a href="http://www.oycomics.com/">Danny Burleson</a>.<br />
-		<?php _e('If you like the ComicPress theme, please donate.  It will help in creating new versions.','comicpress'); ?>
+		<?php _e('If you like the ComicPress theme, please donate.  It will help in developing new features and versions.','comicpress'); ?>
 		<table style="margin:0 auto;">
 			<tr>
 				<td style="width:200px;">