Index: trunk/wp-content/plugins/xpressme/include/custom_functions.php
===================================================================
--- trunk/wp-content/plugins/xpressme/include/custom_functions.php	(revision 139)
+++ trunk/wp-content/plugins/xpressme/include/custom_functions.php	(revision 140)
@@ -243,3 +243,46 @@
 }
 
+function is_xpress_contributor()
+{
+	global $current_user;
+	get_currentuserinfo();
+	if ($current_user->user_level > 3)
+		return true;
+	else
+		return false;
+}
+
+function xpress_post_new_link($link_title,$display = true)
+{
+	$output = '<a href="'. get_xpress_url() . '/wp-admin/post-new.php' . '">' . $link_title . '</a>';
+	if ($display) 
+		echo $output;
+	else
+		return $output;
+}
+
+function xpress_conditional_title($display = true)
+{
+	$output = __('Main', 'xpress');
+	if (is_category())
+		$output = sprintf(__('Archive for the &#8216;%s&#8217; Category', 'xpress'), single_cat_title('', false));
+	if (is_tag())
+		$output = sprintf(__('Posts Tagged &#8216;%s&#8217;', 'xpress'), single_tag_title('', false) );
+	if (is_day())
+		$output = sprintf(_c('Archive for %s|Daily archive page', 'xpress'), get_the_time(__('F jS, Y', 'xpress')));
+	if (is_month())
+		$output = sprintf(_c('Archive for %s|Monthly archive page', 'xpress'), get_the_time(__('F, Y', 'xpress')));
+	if (is_year())
+		$output = sprintf(_c('Archive for %s|Yearly archive page', 'xpress'), get_the_time(__('Y', 'xpress')));
+	if (is_author())
+		$output = get_author_name( get_query_var('author')); __('Author Archive', 'xpress');
+	if (is_search())
+		$output = __('Search Results', 'xpress');
+		
+	if ($display) 
+		echo $output;
+	else
+		return $output;
+}
+
 ?>
Index: trunk/wp-content/plugins/xpressme/include/xpress_common_functions.php
===================================================================
--- trunk/wp-content/plugins/xpressme/include/xpress_common_functions.php	(revision 139)
+++ trunk/wp-content/plugins/xpressme/include/xpress_common_functions.php	(revision 140)
@@ -66,4 +66,17 @@
 	return $prefix;
 }
+function get_xoops_url()
+{
+	global $xoops_config;
+	$ret =$xoops_config->xoops_url ;
+	return $ret;
+}
+
+function get_xpress_url()
+{
+	global $xoops_config;
+	$ret =$xoops_config->module_url ;
+	return $ret;
+}
 
 function get_xpress_modid()
Index: trunk/wp-content/plugins/xpressme/language/xpressme-ja.po
===================================================================
--- trunk/wp-content/plugins/xpressme/language/xpressme-ja.po	(revision 139)
+++ trunk/wp-content/plugins/xpressme/language/xpressme-ja.po	(revision 140)
@@ -3,5 +3,5 @@
 "Project-Id-Version: XPressME Plugin\n"
 "POT-Creation-Date: \n"
-"PO-Revision-Date: 2009-03-17 10:45+0900\n"
+"PO-Revision-Date: 2009-03-25 00:47+0900\n"
 "Last-Translator: toemon <toychee@toemon.com>\n"
 "Language-Team: \n"
Index: trunk/wp-content/themes/xpress_default/archive.php
===================================================================
--- trunk/wp-content/themes/xpress_default/archive.php	(revision 139)
+++ 	(revision )
@@ -1,105 +1,0 @@
-<?php get_header(); ?>
-
-       <div id="xpress_wrap">
-	   
-	<?php if(xpress_is_theme_sidebar_disp()) : ?>
-	   
-		<div id="xpress_content" class="narrowcolumn">
-		
-	<?php else : ?>
-	
-		<div id="xpress_content" class="narrowcolumn_nonside">
-		
-	<?php endif; ?>
-
-    <div id="xpress_header">
-    	<div id="xpress_headerimg">
-    		<h1><a href="<?php echo get_option('home'); ?>/"><?php bloginfo('name'); ?></a></h1>
-    		<div class="description"><?php bloginfo('description'); ?></div>
-    	</div>
-    </div>
-
-		<?php if (have_posts()) : ?>
-
-      <?php if(function_exists('is_tag')) : ?>
- 	  <?php $post = $posts[0]; // Hack. Set $post so that the_date() works. ?>
- 	  <?php /* If this is a category archive */ if (is_category()) { ?>
-		<p class="xpress_pagetitle"><?php printf(__('Archive for the &#8216;%s&#8217; Category', 'xpress'), single_cat_title('', false)); ?></p>
- 	  <?php /* If this is a tag archive */ } elseif( is_tag() ) { ?>
-		<p class="xpress_pagetitle"><?php printf(__('Posts Tagged &#8216;%s&#8217;', 'xpress'), single_tag_title('', false) ); ?></p>
- 	  <?php /* If this is a daily archive */ } elseif (is_day()) { ?>
-		<p class="xpress_pagetitle"><?php printf(_c('Archive for %s|Daily archive page', 'xpress'), get_the_time(__('F jS, Y', 'xpress'))); ?></p>
- 	  <?php /* If this is a monthly archive */ } elseif (is_month()) { ?>
-		<p class="xpress_pagetitle"><?php printf(_c('Archive for %s|Monthly archive page', 'xpress'), get_the_time(__('F, Y', 'xpress'))); ?></p>
- 	  <?php /* If this is a yearly archive */ } elseif (is_year()) { ?>
-		<p class="xpress_pagetitle"><?php printf(_c('Archive for %s|Yearly archive page', 'xpress'), get_the_time(__('Y', 'xpress'))); ?></p>
-	  <?php /* If this is an author archive */ } elseif (is_author()) { ?>
-		<p class="xpress_pagetitle"><?php echo get_author_name( get_query_var('author')); _e('Author Archive', 'xpress'); ?></p>
- 	  <?php /* If this is a paged archive */ } elseif (isset($_GET['paged']) && !empty($_GET['paged'])) { ?>
-		<p class="xpress_pagetitle"><?php _e('Blog Archives', 'xpress'); ?></p>
- 	  <?php } ?>
- 	  <?php else : ?>
-		 <?php $post = $posts[0]; // Hack. Set $post so that the_date() works. ?>
-<?php /* If this is a category archive */ if (is_category()) { ?>				
-		<p class="xpress_pagetitle">Archive for the '<?php echo single_cat_title(); ?>' Category</p>
-		
- 	  <?php /* If this is a daily archive */ } elseif (is_day()) { ?>
-		<p class="xpress_pagetitle">Archive for <?php the_time('F jS, Y'); ?></p>
-		
-	 <?php /* If this is a monthly archive */ } elseif (is_month()) { ?>
-		<p class="xpress_pagetitle">Archive for <?php the_time('F, Y'); ?></p>
-
-		<?php /* If this is a yearly archive */ } elseif (is_year()) { ?>
-		<p class="xpress_pagetitle">Archive for <?php the_time('Y'); ?></p>
-		
-	  <?php /* If this is a search */ } elseif (is_search()) { ?>
-		<p class="xpress_pagetitle">Search Results</p>
-		
-	  <?php /* If this is an author archive */ } elseif (is_author()) { ?>
-		<p class="xpress_pagetitle">Author Archive</p>
-
-		<?php /* If this is a paged archive */ } elseif (isset($_GET['paged']) && !empty($_GET['paged'])) { ?>
-		<p class="xpress_pagetitle">Blog Archives</p>
-
-		<?php } ?>
-	  <?php endif; ?>
-
-
-		<?php while (have_posts()) : the_post(); ?>
-		<div class="post">
-				<?php if (function_exists('hotDates')) { hotDates(); }?>
-				<h2 id="post-<?php the_ID(); ?>"><a href="<?php the_permalink() ?>" rel="bookmark" <?php if(function_exists('the_title_attribute')) : ?>title="<?php printf(__('Permanent Link to %s', 'xpress'), the_title_attribute('echo=0')); ?>"<?php endif; ?>><?php the_title(); ?></a></h2>
-				<small><?php the_time(__('l, F jS, Y', 'xpress')) ?></small>
-
-				<div class="entry">
-					<?php the_content() ?>
-				</div>
-
-				<p class="postmetadata"><?php if(function_exists('the_tags')) : ?><?php the_tags(__('Tags:', 'xpress'), ', ', '<br />'); ?><?php endif; ?> <?php printf(__('Posted in %s', 'xpress'), get_the_category_list(', ')); ?> | <?php edit_post_link(__('Edit', 'xpress'), '', ' | '); ?>  <?php comments_popup_link(__('No Comments &#187;', 'xpress'), __('1 Comment &#187;', 'xpress'), __('% Comments &#187;', 'xpress'), '', __('Comments Closed', 'xpress') ); ?></p>
-
-			</div>
-
-		<?php endwhile; ?>
-		<?php if(function_exists('wp_pagenavi')) : ?>
-			<div class="xpress_pagenavi">
-				<?php wp_pagenavi(); ?>
-			</div>
-		<?php else : ?>
-			<div class="xpress_navigation">
-				<div class="alignleft"><?php next_posts_link(__('&laquo; Older Entries', 'xpress')) ?></div>
-				<div class="alignright"><?php previous_posts_link(__('Newer Entries &raquo;', 'xpress')) ?></div>
-			</div>
-		<?php endif; ?>
-	<?php else : ?>
-
-		<p class="center"><?php _e('Not Found', 'xpress'); ?></p>
-		<?php include (get_template_directory() . '/searchform.php'); ?>
-
-	<?php endif; ?>
-
-	</div>
-       </div>
-
-<?php get_sidebar(); ?>
-
-<?php get_footer(); ?>
Index: trunk/wp-content/themes/xpress_default/footer.php
===================================================================
--- trunk/wp-content/themes/xpress_default/footer.php	(revision 139)
+++ trunk/wp-content/themes/xpress_default/footer.php	(revision 140)
@@ -1,10 +1,9 @@
-<hr />
 <div id="xpress_footer">
-	<p>
+	<div class="xpress_rss">
 		<?php printf(__('%1$s and %2$s.', 'xpress'), '<a href="' . get_bloginfo('rss2_url') . '">' . __('Entries (RSS)', 'xpress') . '</a>', '<a href="' . get_bloginfo('comments_rss2_url') . '">' . __('Comments (RSS)', 'xpress') . '</a>'); ?>
+	</div>
 		<!-- <?php printf(__('%d queries. %s seconds.', 'xpress'), get_num_queries(), timer_stop(0, 3)); ?> -->
-	</p>
 	<!-- If you'd like to support WordPress, having the "powered by" link somewhere on your blog is the best way; it's our only promotion or advertising. -->
-		<div id="xpress_credit"><?php echo xpress_credit(). ' (' . xpress_convert_time() . ')'; ?></div>
+		<div class="xpress_credit"><?php echo xpress_credit(). ' (' . xpress_convert_time() . ')'; ?></div>
 </div>
 </div>
Index: trunk/wp-content/themes/xpress_default/index.php
===================================================================
--- trunk/wp-content/themes/xpress_default/index.php	(revision 139)
+++ trunk/wp-content/themes/xpress_default/index.php	(revision 140)
@@ -1,74 +1,86 @@
 <?php get_header(); ?>
+<div id="xpress_wrap">
+<?php
+	if(xpress_is_theme_sidebar_disp()) {
+		echo '<div id="xpress_content" class="narrowcolumn">';	
+	} else {
+		echo '<div id="xpress_content" class="narrowcolumn_nonside">';
+	}	
+?>
+		<div class="xpress-header-bar">
+			<div class="xpress-header-title">
+				<a href="<?php echo get_option('home'); ?>/"><?php bloginfo('name'); ?></a>
+			</div>
+			<div class="xpress-conditional-title">
+				&nbsp;( <?php xpress_conditional_title();?> )
+			</div>
+			<div class="xpress-description">
+				<?php bloginfo('description'); ?>
+			</div>
+			<div class="xpress-operation-link">
+				<a href="<?php echo get_option('home'); ?>/"><?php _e('Mein Page','xpress')?></a> 
+				<?php if(is_xpress_contributor()) { echo ' | ' ; xpress_post_new_link(__('Post New','xpress')); }?>
+			</div>
+		</div>
+		<hr class="xpress-border">
+		<?php if (have_posts()) : ?>
+			<div class="xpress-navi-bar">
+				<?php if(function_exists('wp_pagenavi')) : ?>			
+					<div class="xpress_pagenavi"><?php wp_pagenavi(); ?></div>
+				<?php else : ?>
+					<div class="xpress-next-posts-link"><?php next_posts_link(__('&laquo; Older Entries', 'xpress')) ?></div>
+					<div class="xpress-previous-posts-link">&nbsp;<?php previous_posts_link(__('Newer Entries &raquo;', 'xpress')) ?></div>
+				<?php endif; ?>
+			</div>
+				
+			<?php while (have_posts()) : the_post(); ?>
 
-       <div id="xpress_wrap">
-	   
-	<?php if(xpress_is_theme_sidebar_disp()) : ?>
-	   
-		<div id="xpress_content" class="narrowcolumn">
-		
-	<?php else : ?>
-	
-		<div id="xpress_content" class="narrowcolumn_nonside">
-		
-	<?php endif; ?>
-
-    <div id="xpress_header">
-    	<div id="xpress_headerimg">
-    		<h1><a href="<?php echo get_option('home'); ?>/"><?php bloginfo('name'); ?></a></h1>
-    		<div class="description"><?php bloginfo('description'); ?></div>
-    	</div>
-    </div>
-
-	<?php if (have_posts()) : ?>
-
-		<?php while (have_posts()) : the_post(); ?>
-
-			<div class="post" id="post-<?php the_ID(); ?>">
-				<?php if (function_exists('hotDates')) { hotDates(); }?>
-				<h2><a href="<?php the_permalink() ?>" rel="bookmark" <?php if(function_exists('the_title_attribute')) : ?> title=' <?php printf(__('Permanent Link to %s', 'xpress'), the_title_attribute('echo=0')); ?>'<?php endif; ?>><?php the_title(); ?></a></h2>
-				<small><?php the_time(__('F jS, Y', 'xpress')) ?> <!-- by <?php the_author() ?> --></small>
-
-				<div class="entry">
-					<?php xpress_the_content(__('Read the rest of this entry &raquo;') ); ?>
+				<div class="xpress-post" id="post-<?php the_ID(); ?>">
+					<div class ="xpress-post-header">
+						<?php if (function_exists('hotDates')) { hotDates(); }?>
+						<div class ="xpress-post-title">
+							<h2><a href="<?php the_permalink() ?>" rel="bookmark" title="<?php printf(__('Permanent Link to %s', 'xpress'), the_title_attribute('echo=0')); ?>"><?php the_title(); ?></a></h2>
+						</div>
+					</div>
+					<div class="xpress-post-entry">
+						<?php xpress_the_content(__('Read the rest of this entry &raquo;') ); ?>
+					</div>
+					<div class ="xpress-post-footer">
+					<?php
+						the_time('Y/m/d l');
+						echo ' - ';
+						the_author_posts_link();
+						echo ' (' . xpress_post_views_count($post->ID,__('Views :%d', 'xpress'),false) . ')'; 
+						echo ' | ';
+						// echo the_tags(__('Tags:', 'xpress') . ' ', ', ', ' | ');
+						printf(__('Posted in %s', 'xpress'), get_the_category_list(', '));
+						echo ' | ';
+						edit_post_link(__('Edit', 'xpress'), '', ' | ');
+						comments_popup_link(__('No Comments &#187;', 'xpress'), __('1 Comment &#187;', 'xpress'), __('% Comments &#187;', 'xpress'), '', __('Comments Closed', 'xpress') );
+					?>
+					</div>
 				</div>
 
-				<p class="postmetadata"><!-- Post author start -->
-				<!-- Post author end -->
-				<?php
-					if(function_exists('the_tags'))
-						echo the_tags(__('Tags:', 'xpress') . ' ', ', ', '<br />');
-					printf(__('Posted in %s', 'xpress'), get_the_category_list(', '));
-					echo ' | ';
-					edit_post_link(__('Edit', 'xpress'), '', ' | ');
-					comments_popup_link(__('No Comments &#187;', 'xpress'), __('1 Comment &#187;', 'xpress'), __('% Comments &#187;', 'xpress'), '', __('Comments Closed', 'xpress') );
-				?>
-				</p>
-				<?php xpress_post_views_count($post->ID,__('Views :%d', 'xpress'),true) ?>
+			<?php endwhile; ?>
+				
+			<div class="xpress-navi-bar">
+				<?php if(function_exists('wp_pagenavi')) : ?>			
+					<div class="xpress_pagenavi"><?php wp_pagenavi(); ?></div>
+				<?php else : ?>
+					<div class="xpress-next-posts-link"><?php next_posts_link(__('&laquo; Older Entries', 'xpress')) ?></div>
+					<div class="xpress-previous-posts-link">&nbsp;<?php previous_posts_link(__('Newer Entries &raquo;', 'xpress')) ?></div>
+				<?php endif; ?>
+			</div>
+				
+		<?php else : ?>
 
-				</div>
+			<h2 class="center"><?php _e('Not Found', 'xpress'); ?></h2>
+			<p class="center"><?php _e('Sorry, but you are looking for something that isn&#8217;t here.', 'xpress'); ?></p>
+			<?php include (get_template_directory() . "/searchform.php"); ?>
 
-		<?php endwhile; ?>
-		<?php if(function_exists('wp_pagenavi')) : ?>
-			<div class="xpress_pagenavi">
-				<?php wp_pagenavi(); ?>
-			</div>
-		<?php else : ?>
-			<div class="xpress_index_navigation">
-				<div class="alignleft"><?php next_posts_link(__('&laquo; Older Entries', 'xpress')) ?></div>
-				<div class="alignright"><?php previous_posts_link(__('Newer Entries &raquo;', 'xpress')) ?></div>
-			</div>
 		<?php endif; ?>
-	<?php else : ?>
-
-		<h2 class="center"><?php _e('Not Found', 'xpress'); ?></h2>
-		<p class="center"><?php _e('Sorry, but you are looking for something that isn&#8217;t here.', 'xpress'); ?></p>
-		<?php include (get_template_directory() . "/searchform.php"); ?>
-
-	<?php endif; ?>
-
 	</div>
-       </div>
-
-<?php get_sidebar(); ?>
-
+</div>
+<?php if(xpress_is_theme_sidebar_disp()) get_sidebar(); ?>
+<hr class="xpress-border">
 <?php get_footer(); ?>
Index: trunk/wp-content/themes/xpress_default/ja.po
===================================================================
--- trunk/wp-content/themes/xpress_default/ja.po	(revision 139)
+++ trunk/wp-content/themes/xpress_default/ja.po	(revision 140)
@@ -18,5 +18,5 @@
 "Report-Msgid-Bugs-To: wp-polyglots@lists.automattic.com\n"
 "POT-Creation-Date: 2008-08-15 21:16+0900\n"
-"PO-Revision-Date: 2009-03-25 00:23+0900\n"
+"PO-Revision-Date: 2009-03-29 01:21+0900\n"
 "Last-Translator: toemon <toychee@toemon.com>\n"
 "Language-Team: toemon <info@toemon.com>\n"
@@ -36,61 +36,337 @@
 msgstr "エラー 404 - 見つかりませんでした"
 
-#: xpress_default/archive.php:27
-#, php-format
-msgid "Archive for the &#8216;%s&#8217; Category"
-msgstr "&#8216;%s&#8217; カテゴリーのアーカイブ"
-
-#: xpress_default/archive.php:29
-#, php-format
-msgid "Posts Tagged &#8216;%s&#8217;"
-msgstr "&#8216;%s&#8217; タグのついている投稿"
-
-#: xpress_default/archive.php:31
-#, php-format
-msgid "Archive for %s|Daily archive page"
-msgstr "%s のアーカイブ|日別アーカイブのページ"
-
-#: xpress_default/archive.php:31
+#: xpress_default/archives.php:20
+msgid "Archives by Month:"
+msgstr "月別のアーカイブ:"
+
+#: xpress_default/archives.php:25
+msgid "Archives by Subject:"
+msgstr "カテゴリー別アーカイブ:"
+
+#: xpress_default/comments-popup.php:9
+#, php-format
+msgid "%1$s - Comments on %2$s"
+msgstr "%1$s - %2$s へのコメント"
+
+#: xpress_default/comments-popup.php:22
+msgid "Comments"
+msgstr "コメント"
+
+#: xpress_default/comments-popup.php:24
+msgid "<abbr title=\"Really Simple Syndication\">RSS</abbr> feed for comments on this post."
+msgstr "このコメント欄の <abbr title=\"Really Simple Syndication\">RSS</abbr> フィード"
+
+#: xpress_default/comments-popup.php:27
+#, php-format
+msgid "The <abbr title=\"Universal Resource Locator\">URL</abbr> to TrackBack this entry is: <em>%s</em>"
+msgstr "この投稿へのトラックバック <acronym title=\"Universal Resource Locator\">URL</acronym>: <em>%s</em>"
+
+#: xpress_default/comments-popup.php:45
+msgid "Comment"
+msgstr "コメント"
+
+#: xpress_default/comments-popup.php:45
+msgid "Trackback"
+msgstr "トラックバック"
+
+#: xpress_default/comments-popup.php:45
+msgid "Pingback"
+msgstr "ピンバック"
+
+#: xpress_default/comments-popup.php:45
+#, php-format
+msgid "by %1$s &#8212; %2$s @ <a href=\"#comment-%3$s\">%4$s</a>"
+msgstr "&#8212; %2$s @ <a href=\"#comment-%3$s\">%4$s</a>: %1$s より"
+
+#: xpress_default/comments-popup.php:51
+msgid "No comments yet."
+msgstr "コメントはまだありません。"
+
+#: xpress_default/comments-popup.php:55
+msgid "Leave a comment"
+msgstr "コメントをどうぞ"
+
+#: xpress_default/comments-popup.php:56
+#, php-format
+msgid "Line and paragraph breaks automatic, e-mail address never displayed, <acronym title=\"Hypertext Markup Language\">HTML</acronym> allowed: <code>%s</code>"
+msgstr "改行と段落タグは自動で挿入されます。メールアドレスは表示されません。利用可能な <acronym title=\"Hypertext Markup Language\">HTML</acronym> タグ: <code>%s</code>"
+
+#: xpress_default/comments-popup.php:60
+#, php-format
+msgid "Logged in as <a href=\"%1$s\">%2$s</a>. <a href=\"%3$s\" title=\"Log out of this account\">Log out &raquo;</a>"
+msgstr "<a href=\"%1$s\">%2$s</a> としてログイン中。<a href=\"%3$s\" title=\"このアカウントからログアウトする\">ログアウト &raquo;</a>"
+
+#: xpress_default/comments-popup.php:64
+#: xpress_default/comments.php:95
+msgid "Name"
+msgstr "お名前"
+
+#: xpress_default/comments-popup.php:71
+msgid "E-mail"
+msgstr "メールアドレス"
+
+#: xpress_default/comments-popup.php:76
+msgid "<abbr title=\"Universal Resource Locator\">URL</abbr>"
+msgstr "<abbr title=\"Universal Resource Locator\">URL</abbr>"
+
+#: xpress_default/comments-popup.php:81
+msgid "Your Comment"
+msgstr "コメント"
+
+#: xpress_default/comments-popup.php:87
+msgid "Say It!"
+msgstr "送信する !"
+
+#: xpress_default/comments-popup.php:92
+msgid "Sorry, the comment form is closed at this time."
+msgstr "コメントフォームは現在閉鎖中です。"
+
+#: xpress_default/comments-popup.php:97
+msgid "Close this window."
+msgstr "このウインドウを閉じる。"
+
+#: xpress_default/comments-popup.php:105
+#, php-format
+msgid "Powered by <a href=\"%s\" title=\"Powered by WordPress, state-of-the-art semantic personal publishing platform\"><strong>WordPress</strong></a>"
+msgstr "Powered by <a href=\"%s\" title=\"Powered by WordPress, state-of-the-art semantic personal publishing platform\"><strong>WordPress</strong></a>"
+
+#: xpress_default/comments.php:9
+msgid "This post is password protected. Enter the password to view comments."
+msgstr "この投稿はパスワードで保護されています。コメントを閲覧するにはパスワードを入力してください。"
+
+#: xpress_default/comments.php:23
+msgid "No Responses"
+msgstr "コメント / トラックバックはありません"
+
+#: xpress_default/comments.php:23
+msgid "One Response"
+msgstr "コメント / トラックバック 1 件"
+
+#: xpress_default/comments.php:23
+msgid "% Responses"
+msgstr "コメント / トラックバック % 件"
+
+#: xpress_default/comments.php:23
+#, php-format
+msgid "to &#8220;%s&#8221;"
+msgstr "<!-- to &#8220;%s&#8221; -->"
+
+#: xpress_default/comments.php:39
+#, php-format
+msgid "<cite>%s</cite> Says:"
+msgstr "<cite>%s</cite> より: "
+
+#: xpress_default/comments.php:41
+msgid "Your comment is awaiting moderation."
+msgstr "コメントは管理者の承認待ちです。"
+
 #: xpress_default/comments.php:45
-#: xpress_default/index.php:29
+#, php-format
+msgid "%1$s at %2$s"
+msgstr "%1$s %2$s"
+
+#: xpress_default/comments.php:45
 #: xpress_default/single.php:22
 msgid "F jS, Y"
 msgstr "Y 年 n 月 j 日"
 
-#: xpress_default/archive.php:33
-#, php-format
-msgid "Archive for %s|Monthly archive page"
-msgstr "%s のアーカイブ|月別アーカイブのページ"
-
-#: xpress_default/archive.php:33
-#: xpress_default/sidebar.php:27
-msgid "F, Y"
-msgstr "Y 年 n 月"
-
-#: xpress_default/archive.php:35
-#, php-format
-msgid "Archive for %s|Yearly archive page"
-msgstr "%s のアーカイブ|年別アーカイブのページ"
-
-#: xpress_default/archive.php:35
-msgid "Y"
-msgstr "Y 年"
-
-#: xpress_default/archive.php:37
-msgid "Author Archive"
-msgstr "投稿者のアーカイブ"
-
-#: xpress_default/archive.php:39
-msgid "Blog Archives"
-msgstr "ブログアーカイブ"
-
-#: xpress_default/archive.php:71
-#: xpress_default/index.php:28
-#: xpress_default/search.php:36
-#, php-format
-msgid "Permanent Link to %s"
-msgstr "%s のパーマリンク"
-
-#: xpress_default/archive.php:72
+#: xpress_default/comments.php:45
+msgid "edit"
+msgstr "編集"
+
+#: xpress_default/comments.php:67
+msgid "Comments are closed."
+msgstr "コメントは受け付けていません。"
+
+#: xpress_default/comments.php:75
+msgid "Leave a Reply"
+msgstr "コメントをどうぞ"
+
+#: xpress_default/comments.php:83
+#, php-format
+msgid "You must be <a href=\"%s\">logged in</a> to post a comment."
+msgstr "コメントを投稿するには<a href=\"%s\">ログイン</a>してください。"
+
+#: xpress_default/comments.php:90
+#, php-format
+msgid "Logged in as <a href=\"%1$s\">%2$s</a>."
+msgstr "<a href=\"%1$s\">%2$s</a> としてログイン中。"
+
+#: xpress_default/comments.php:90
+msgid "Log out of this account"
+msgstr "このアカウントからログアウト"
+
+#: xpress_default/comments.php:90
+msgid "Log out &raquo;"
+msgstr "ログアウト &raquo;"
+
+#: xpress_default/comments.php:95
+#: xpress_default/comments.php:98
+msgid "(required)"
+msgstr " (必須)"
+
+#: xpress_default/comments.php:98
+msgid "Mail (will not be published)"
+msgstr "メールアドレス (公開されません)"
+
+#: xpress_default/comments.php:101
+msgid "Website"
+msgstr "ウェブサイト"
+
+#: xpress_default/comments.php:105
+#, php-format
+msgid "<strong>XHTML:</strong> You can use these tags: <code>%s</code>"
+msgstr "<strong>XHTML:</strong> 次のタグを使用できます: <code>%s</code>"
+
+#: xpress_default/comments.php:109
+msgid "Submit Comment"
+msgstr "コメント送信"
+
+#: xpress_default/footer.php:3
+#, php-format
+msgid "%1$s and %2$s."
+msgstr "%1$s と %2$s"
+
+#: xpress_default/footer.php:3
+msgid "Entries (RSS)"
+msgstr "投稿 (RSS)"
+
+#: xpress_default/footer.php:3
+msgid "Comments (RSS)"
+msgstr "コメント (RSS)"
+
+#: xpress_default/footer.php:5
+#, php-format
+msgid "%d queries. %s seconds."
+msgstr "%d 個のクエリと %s 秒を要しました。"
+
+#: xpress_default/functions.php:149
+msgid "Customize Header"
+msgstr "ヘッダーのカスタマイズ"
+
+#: xpress_default/functions.php:149
+#: xpress_default/functions.php:363
+msgid "Header Image and Color"
+msgstr "ヘッダーの背景と文字の色"
+
+#: xpress_default/functions.php:162
+msgid "Close Color Picker"
+msgstr "カラーピッカーを閉じる"
+
+#: xpress_default/functions.php:359
+msgid "Options saved."
+msgstr "設定を保存しました。"
+
+#: xpress_default/functions.php:376
+#: xpress_default/functions.php:383
+msgid "Save"
+msgstr "保存"
+
+#: xpress_default/functions.php:377
+msgid "Font Color:"
+msgstr "フォントの色:"
+
+#: xpress_default/functions.php:377
+#, php-format
+msgid "Any CSS color (%s or %s or %s)"
+msgstr "CSS 色指定 (%s 、%s もしくは %s)"
+
+#: xpress_default/functions.php:378
+msgid "Upper Color:"
+msgstr "グラデーション上側の色:"
+
+#: xpress_default/functions.php:378
+#: xpress_default/functions.php:379
+#, php-format
+msgid "HEX only (%s or %s)"
+msgstr "16 進数のみ (%s もしくは %s)"
+
+#: xpress_default/functions.php:379
+msgid "Lower Color:"
+msgstr "グラデーション下側の色:"
+
+#: xpress_default/functions.php:381
+msgid "Toggle Text"
+msgstr "テキスト表示の切替え"
+
+#: xpress_default/functions.php:382
+msgid "Use Defaults"
+msgstr "デフォルト設定に戻す"
+
+#: xpress_default/functions.php:391
+msgid "Font Color"
+msgstr "フォントの色"
+
+#: xpress_default/functions.php:392
+msgid "Upper Color"
+msgstr "グラデーション上側の色"
+
+#: xpress_default/functions.php:393
+msgid "Lower Color"
+msgstr "グラデーション下側の色"
+
+#: xpress_default/functions.php:394
+msgid "Revert"
+msgstr "取り消し"
+
+#: xpress_default/functions.php:395
+msgid "Advanced"
+msgstr "詳細"
+
+#: xpress_default/functions.php:402
+msgid "Update Header &raquo;"
+msgstr "ヘッダーを更新 &raquo;"
+
+#: xpress_default/functions.php:408
+msgid "Font Color (CSS):"
+msgstr "フォントの色 (CSS):"
+
+#: xpress_default/functions.php:409
+msgid "Upper Color (HEX):"
+msgstr "グラデーション上側の色 (16 進数):"
+
+#: xpress_default/functions.php:410
+msgid "Lower Color (HEX):"
+msgstr "グラデーション下側の色 (16 進数):"
+
+#: xpress_default/functions.php:411
+msgid "Select Default Colors"
+msgstr "デフォルト設定に戻す"
+
+#: xpress_default/functions.php:412
+msgid "Toggle Text Display"
+msgstr "テキスト表示の切替え"
+
+#: xpress_default/header.php:9
+msgid "&raquo; Blog Archive"
+msgstr "&raquo; ブログアーカイブ"
+
+#: xpress_default/header.php:14
+#, php-format
+msgid "%s RSS Feed"
+msgstr "%s RSS フィード"
+
+#: xpress_default/header.php:15
+#, php-format
+msgid "%s Atom Feed"
+msgstr "%s Atom フィード"
+
+#: xpress_default/image.php:13
+#: xpress_default/index.php:46
+#: xpress_default/single.php:25
+msgid "Read the rest of this entry &raquo;"
+msgstr "この投稿の続きを読む &raquo;"
+
+#: xpress_default/image.php:15
+#: xpress_default/page.php:29
+#: xpress_default/single.php:27
+msgid "Pages:"
+msgstr "ページ:"
+
+#: xpress_default/image.php:25
+#, php-format
+msgid "This entry was posted on %1$s at %2$s and is filed under %3$s."
+msgstr "この投稿は %1$s %2$s に %3$s カテゴリーに公開されました。"
+
 #: xpress_default/image.php:25
 #: xpress_default/sidebar.php:24
@@ -99,6 +375,127 @@
 msgstr "Y 年 n 月 j 日 l"
 
-#: xpress_default/archive.php:78
-#: xpress_default/index.php:39
+#: xpress_default/image.php:27
+#: xpress_default/single.php:38
+#, php-format
+msgid "You can follow any responses to this entry through the <a href='%s'>RSS 2.0</a> feed."
+msgstr "この投稿へのコメントは <a href='%s'>RSS 2.0</a> フィードで購読することができます。"
+
+#: xpress_default/image.php:31
+#: xpress_default/single.php:45
+#, php-format
+msgid "You can <a href=\"#respond\">leave a response</a>, or <a href=\"%s\" rel=\"trackback\">trackback</a> from your own site."
+msgstr "<a href=\"#respond\">コメントを残すか</a>、ご自分のサイトから<a href=\"%s\" rel=\"trackback\">トラックバック</a>することができます。"
+
+#: xpress_default/image.php:35
+#: xpress_default/single.php:49
+#, php-format
+msgid "Responses are currently closed, but you can <a href=\"%s\" rel=\"trackback\">trackback</a> from your own site."
+msgstr "現在コメントは受け付けておりませんが、ご自分のサイトから<a href=\"%s\" rel=\"trackback\">トラックバック</a>を送ることはできます。"
+
+#: xpress_default/image.php:39
+#: xpress_default/single.php:53
+msgid "You can skip to the end and leave a response. Pinging is currently not allowed."
+msgstr "このページの一番下でコメントを残すことができます。トラックバック / ピンバックは現在受け付けていません。"
+
+#: xpress_default/image.php:43
+#: xpress_default/single.php:57
+msgid "Both comments and pings are currently closed."
+msgstr "現在コメント、トラックバックともに受け付けておりません。"
+
+#: xpress_default/image.php:45
+#: xpress_default/page.php:34
+msgid "Edit this entry."
+msgstr "この投稿を編集する。"
+
+#: xpress_default/image.php:58
+#: xpress_default/single.php:71
+msgid "Sorry, no posts matched your criteria."
+msgstr "該当する投稿は見つかりませんでした。"
+
+#: xpress_default/index.php:21
+msgid "Mein Page"
+msgstr "メインページ"
+
+#: xpress_default/index.php:22
+msgid "Post New"
+msgstr "新規投稿"
+
+#: xpress_default/index.php:31
+#: xpress_default/index.php:70
+#: xpress_default/search.php:27
+#: xpress_default/search.php:45
+msgid "&laquo; Older Entries"
+msgstr "&laquo; 前ページへ"
+
+#: xpress_default/index.php:32
+#: xpress_default/index.php:71
+#: xpress_default/search.php:28
+#: xpress_default/search.php:46
+msgid "Newer Entries &raquo;"
+msgstr "次ページへ &raquo;"
+
+#: xpress_default/index.php:42
+#: xpress_default/search.php:36
+#, php-format
+msgid "Permanent Link to %s"
+msgstr "%s のパーマリンク"
+
+#: xpress_default/index.php:53
+#, php-format
+msgid "Views :%d"
+msgstr "閲覧 :%d"
+
+#: xpress_default/index.php:56
+#: xpress_default/search.php:39
+#: xpress_default/single.php:28
+#, php-format
+msgid "Posted in %s"
+msgstr "カテゴリー: %s"
+
+#: xpress_default/index.php:58
+#: xpress_default/search.php:39
+msgid "Edit"
+msgstr "編集"
+
+#: xpress_default/index.php:59
+#: xpress_default/search.php:39
+msgid "No Comments &#187;"
+msgstr "コメントはまだありません &#187;"
+
+#: xpress_default/index.php:59
+#: xpress_default/search.php:39
+msgid "1 Comment &#187;"
+msgstr "1 件のコメント &#187;"
+
+#: xpress_default/index.php:59
+#: xpress_default/search.php:39
+msgid "% Comments &#187;"
+msgstr "% 件のコメント &#187;"
+
+#: xpress_default/index.php:59
+#: xpress_default/search.php:39
+msgid "Comments Closed"
+msgstr "コメントは受け付けていません。"
+
+#: xpress_default/index.php:77
+msgid "Not Found"
+msgstr "見つかりませんでした。"
+
+#: xpress_default/index.php:78
+msgid "Sorry, but you are looking for something that isn&#8217;t here."
+msgstr "お探しの物はここにはありません。"
+
+#: xpress_default/links.php:18
+msgid "Links:"
+msgstr "リンク:"
+
+#: xpress_default/page.php:27
+msgid "Read the rest of this page &raquo;"
+msgstr "このページの続きを読む &raquo;"
+
+#: xpress_default/search.php:24
+msgid "Search Results"
+msgstr "検索結果"
+
 #: xpress_default/search.php:39
 #: xpress_default/single.php:28
@@ -109,448 +506,4 @@
 msgstr "タグ:"
 
-#: xpress_default/archive.php:78
-#: xpress_default/index.php:40
-#: xpress_default/search.php:39
-#: xpress_default/single.php:28
-#, php-format
-msgid "Posted in %s"
-msgstr "カテゴリー: %s"
-
-#: xpress_default/archive.php:78
-#: xpress_default/index.php:42
-#: xpress_default/search.php:39
-msgid "Edit"
-msgstr "編集"
-
-#: xpress_default/archive.php:78
-#: xpress_default/index.php:43
-#: xpress_default/search.php:39
-msgid "No Comments &#187;"
-msgstr "コメントはまだありません &#187;"
-
-#: xpress_default/archive.php:78
-#: xpress_default/index.php:43
-#: xpress_default/search.php:39
-msgid "1 Comment &#187;"
-msgstr "1 件のコメント &#187;"
-
-#: xpress_default/archive.php:78
-#: xpress_default/index.php:43
-#: xpress_default/search.php:39
-msgid "% Comments &#187;"
-msgstr "% 件のコメント &#187;"
-
-#: xpress_default/archive.php:78
-#: xpress_default/index.php:43
-#: xpress_default/search.php:39
-msgid "Comments Closed"
-msgstr "コメントは受け付けていません。"
-
-#: xpress_default/archive.php:89
-#: xpress_default/index.php:57
-#: xpress_default/search.php:27
-#: xpress_default/search.php:45
-msgid "&laquo; Older Entries"
-msgstr "&laquo; 前ページへ"
-
-#: xpress_default/archive.php:90
-#: xpress_default/index.php:58
-#: xpress_default/search.php:28
-#: xpress_default/search.php:46
-msgid "Newer Entries &raquo;"
-msgstr "次ページへ &raquo;"
-
-#: xpress_default/archive.php:95
-#: xpress_default/index.php:63
-msgid "Not Found"
-msgstr "見つかりませんでした。"
-
-#: xpress_default/archives.php:20
-msgid "Archives by Month:"
-msgstr "月別のアーカイブ:"
-
-#: xpress_default/archives.php:25
-msgid "Archives by Subject:"
-msgstr "カテゴリー別アーカイブ:"
-
-#: xpress_default/comments-popup.php:9
-#, php-format
-msgid "%1$s - Comments on %2$s"
-msgstr "%1$s - %2$s へのコメント"
-
-#: xpress_default/comments-popup.php:22
-msgid "Comments"
-msgstr "コメント"
-
-#: xpress_default/comments-popup.php:24
-msgid "<abbr title=\"Really Simple Syndication\">RSS</abbr> feed for comments on this post."
-msgstr "このコメント欄の <abbr title=\"Really Simple Syndication\">RSS</abbr> フィード"
-
-#: xpress_default/comments-popup.php:27
-#, php-format
-msgid "The <abbr title=\"Universal Resource Locator\">URL</abbr> to TrackBack this entry is: <em>%s</em>"
-msgstr "この投稿へのトラックバック <acronym title=\"Universal Resource Locator\">URL</acronym>: <em>%s</em>"
-
-#: xpress_default/comments-popup.php:45
-msgid "Comment"
-msgstr "コメント"
-
-#: xpress_default/comments-popup.php:45
-msgid "Trackback"
-msgstr "トラックバック"
-
-#: xpress_default/comments-popup.php:45
-msgid "Pingback"
-msgstr "ピンバック"
-
-#: xpress_default/comments-popup.php:45
-#, php-format
-msgid "by %1$s &#8212; %2$s @ <a href=\"#comment-%3$s\">%4$s</a>"
-msgstr "&#8212; %2$s @ <a href=\"#comment-%3$s\">%4$s</a>: %1$s より"
-
-#: xpress_default/comments-popup.php:51
-msgid "No comments yet."
-msgstr "コメントはまだありません。"
-
-#: xpress_default/comments-popup.php:55
-msgid "Leave a comment"
-msgstr "コメントをどうぞ"
-
-#: xpress_default/comments-popup.php:56
-#, php-format
-msgid "Line and paragraph breaks automatic, e-mail address never displayed, <acronym title=\"Hypertext Markup Language\">HTML</acronym> allowed: <code>%s</code>"
-msgstr "改行と段落タグは自動で挿入されます。メールアドレスは表示されません。利用可能な <acronym title=\"Hypertext Markup Language\">HTML</acronym> タグ: <code>%s</code>"
-
-#: xpress_default/comments-popup.php:60
-#, php-format
-msgid "Logged in as <a href=\"%1$s\">%2$s</a>. <a href=\"%3$s\" title=\"Log out of this account\">Log out &raquo;</a>"
-msgstr "<a href=\"%1$s\">%2$s</a> としてログイン中。<a href=\"%3$s\" title=\"このアカウントからログアウトする\">ログアウト &raquo;</a>"
-
-#: xpress_default/comments-popup.php:64
-#: xpress_default/comments.php:95
-msgid "Name"
-msgstr "お名前"
-
-#: xpress_default/comments-popup.php:71
-msgid "E-mail"
-msgstr "メールアドレス"
-
-#: xpress_default/comments-popup.php:76
-msgid "<abbr title=\"Universal Resource Locator\">URL</abbr>"
-msgstr "<abbr title=\"Universal Resource Locator\">URL</abbr>"
-
-#: xpress_default/comments-popup.php:81
-msgid "Your Comment"
-msgstr "コメント"
-
-#: xpress_default/comments-popup.php:87
-msgid "Say It!"
-msgstr "送信する !"
-
-#: xpress_default/comments-popup.php:92
-msgid "Sorry, the comment form is closed at this time."
-msgstr "コメントフォームは現在閉鎖中です。"
-
-#: xpress_default/comments-popup.php:97
-msgid "Close this window."
-msgstr "このウインドウを閉じる。"
-
-#: xpress_default/comments-popup.php:105
-#, php-format
-msgid "Powered by <a href=\"%s\" title=\"Powered by WordPress, state-of-the-art semantic personal publishing platform\"><strong>WordPress</strong></a>"
-msgstr "Powered by <a href=\"%s\" title=\"Powered by WordPress, state-of-the-art semantic personal publishing platform\"><strong>WordPress</strong></a>"
-
-#: xpress_default/comments.php:9
-msgid "This post is password protected. Enter the password to view comments."
-msgstr "この投稿はパスワードで保護されています。コメントを閲覧するにはパスワードを入力してください。"
-
-#: xpress_default/comments.php:23
-msgid "No Responses"
-msgstr "コメント / トラックバックはありません"
-
-#: xpress_default/comments.php:23
-msgid "One Response"
-msgstr "コメント / トラックバック 1 件"
-
-#: xpress_default/comments.php:23
-msgid "% Responses"
-msgstr "コメント / トラックバック % 件"
-
-#: xpress_default/comments.php:23
-#, php-format
-msgid "to &#8220;%s&#8221;"
-msgstr "<!-- to &#8220;%s&#8221; -->"
-
-#: xpress_default/comments.php:39
-#, php-format
-msgid "<cite>%s</cite> Says:"
-msgstr "<cite>%s</cite> より: "
-
-#: xpress_default/comments.php:41
-msgid "Your comment is awaiting moderation."
-msgstr "コメントは管理者の承認待ちです。"
-
-#: xpress_default/comments.php:45
-#, php-format
-msgid "%1$s at %2$s"
-msgstr "%1$s %2$s"
-
-#: xpress_default/comments.php:45
-msgid "edit"
-msgstr "編集"
-
-#: xpress_default/comments.php:67
-msgid "Comments are closed."
-msgstr "コメントは受け付けていません。"
-
-#: xpress_default/comments.php:75
-msgid "Leave a Reply"
-msgstr "コメントをどうぞ"
-
-#: xpress_default/comments.php:83
-#, php-format
-msgid "You must be <a href=\"%s\">logged in</a> to post a comment."
-msgstr "コメントを投稿するには<a href=\"%s\">ログイン</a>してください。"
-
-#: xpress_default/comments.php:90
-#, php-format
-msgid "Logged in as <a href=\"%1$s\">%2$s</a>."
-msgstr "<a href=\"%1$s\">%2$s</a> としてログイン中。"
-
-#: xpress_default/comments.php:90
-msgid "Log out of this account"
-msgstr "このアカウントからログアウト"
-
-#: xpress_default/comments.php:90
-msgid "Log out &raquo;"
-msgstr "ログアウト &raquo;"
-
-#: xpress_default/comments.php:95
-#: xpress_default/comments.php:98
-msgid "(required)"
-msgstr " (必須)"
-
-#: xpress_default/comments.php:98
-msgid "Mail (will not be published)"
-msgstr "メールアドレス (公開されません)"
-
-#: xpress_default/comments.php:101
-msgid "Website"
-msgstr "ウェブサイト"
-
-#: xpress_default/comments.php:105
-#, php-format
-msgid "<strong>XHTML:</strong> You can use these tags: <code>%s</code>"
-msgstr "<strong>XHTML:</strong> 次のタグを使用できます: <code>%s</code>"
-
-#: xpress_default/comments.php:109
-msgid "Submit Comment"
-msgstr "コメント送信"
-
-#: xpress_default/footer.php:4
-#, php-format
-msgid "%1$s and %2$s."
-msgstr "%1$s と %2$s"
-
-#: xpress_default/footer.php:4
-msgid "Entries (RSS)"
-msgstr "投稿 (RSS)"
-
-#: xpress_default/footer.php:4
-msgid "Comments (RSS)"
-msgstr "コメント (RSS)"
-
-#: xpress_default/footer.php:5
-#, php-format
-msgid "%d queries. %s seconds."
-msgstr "%d 個のクエリと %s 秒を要しました。"
-
-#: xpress_default/functions.php:149
-msgid "Customize Header"
-msgstr "ヘッダーのカスタマイズ"
-
-#: xpress_default/functions.php:149
-#: xpress_default/functions.php:363
-msgid "Header Image and Color"
-msgstr "ヘッダーの背景と文字の色"
-
-#: xpress_default/functions.php:162
-msgid "Close Color Picker"
-msgstr "カラーピッカーを閉じる"
-
-#: xpress_default/functions.php:359
-msgid "Options saved."
-msgstr "設定を保存しました。"
-
-#: xpress_default/functions.php:376
-#: xpress_default/functions.php:383
-msgid "Save"
-msgstr "保存"
-
-#: xpress_default/functions.php:377
-msgid "Font Color:"
-msgstr "フォントの色:"
-
-#: xpress_default/functions.php:377
-#, php-format
-msgid "Any CSS color (%s or %s or %s)"
-msgstr "CSS 色指定 (%s 、%s もしくは %s)"
-
-#: xpress_default/functions.php:378
-msgid "Upper Color:"
-msgstr "グラデーション上側の色:"
-
-#: xpress_default/functions.php:378
-#: xpress_default/functions.php:379
-#, php-format
-msgid "HEX only (%s or %s)"
-msgstr "16 進数のみ (%s もしくは %s)"
-
-#: xpress_default/functions.php:379
-msgid "Lower Color:"
-msgstr "グラデーション下側の色:"
-
-#: xpress_default/functions.php:381
-msgid "Toggle Text"
-msgstr "テキスト表示の切替え"
-
-#: xpress_default/functions.php:382
-msgid "Use Defaults"
-msgstr "デフォルト設定に戻す"
-
-#: xpress_default/functions.php:391
-msgid "Font Color"
-msgstr "フォントの色"
-
-#: xpress_default/functions.php:392
-msgid "Upper Color"
-msgstr "グラデーション上側の色"
-
-#: xpress_default/functions.php:393
-msgid "Lower Color"
-msgstr "グラデーション下側の色"
-
-#: xpress_default/functions.php:394
-msgid "Revert"
-msgstr "取り消し"
-
-#: xpress_default/functions.php:395
-msgid "Advanced"
-msgstr "詳細"
-
-#: xpress_default/functions.php:402
-msgid "Update Header &raquo;"
-msgstr "ヘッダーを更新 &raquo;"
-
-#: xpress_default/functions.php:408
-msgid "Font Color (CSS):"
-msgstr "フォントの色 (CSS):"
-
-#: xpress_default/functions.php:409
-msgid "Upper Color (HEX):"
-msgstr "グラデーション上側の色 (16 進数):"
-
-#: xpress_default/functions.php:410
-msgid "Lower Color (HEX):"
-msgstr "グラデーション下側の色 (16 進数):"
-
-#: xpress_default/functions.php:411
-msgid "Select Default Colors"
-msgstr "デフォルト設定に戻す"
-
-#: xpress_default/functions.php:412
-msgid "Toggle Text Display"
-msgstr "テキスト表示の切替え"
-
-#: xpress_default/header.php:9
-msgid "&raquo; Blog Archive"
-msgstr "&raquo; ブログアーカイブ"
-
-#: xpress_default/header.php:14
-#, php-format
-msgid "%s RSS Feed"
-msgstr "%s RSS フィード"
-
-#: xpress_default/header.php:15
-#, php-format
-msgid "%s Atom Feed"
-msgstr "%s Atom フィード"
-
-#: xpress_default/image.php:13
-#: xpress_default/index.php:32
-#: xpress_default/single.php:25
-msgid "Read the rest of this entry &raquo;"
-msgstr "この投稿の続きを読む &raquo;"
-
-#: xpress_default/image.php:15
-#: xpress_default/page.php:29
-#: xpress_default/single.php:27
-msgid "Pages:"
-msgstr "ページ:"
-
-#: xpress_default/image.php:25
-#, php-format
-msgid "This entry was posted on %1$s at %2$s and is filed under %3$s."
-msgstr "この投稿は %1$s %2$s に %3$s カテゴリーに公開されました。"
-
-#: xpress_default/image.php:27
-#: xpress_default/single.php:38
-#, php-format
-msgid "You can follow any responses to this entry through the <a href='%s'>RSS 2.0</a> feed."
-msgstr "この投稿へのコメントは <a href='%s'>RSS 2.0</a> フィードで購読することができます。"
-
-#: xpress_default/image.php:31
-#: xpress_default/single.php:45
-#, php-format
-msgid "You can <a href=\"#respond\">leave a response</a>, or <a href=\"%s\" rel=\"trackback\">trackback</a> from your own site."
-msgstr "<a href=\"#respond\">コメントを残すか</a>、ご自分のサイトから<a href=\"%s\" rel=\"trackback\">トラックバック</a>することができます。"
-
-#: xpress_default/image.php:35
-#: xpress_default/single.php:49
-#, php-format
-msgid "Responses are currently closed, but you can <a href=\"%s\" rel=\"trackback\">trackback</a> from your own site."
-msgstr "現在コメントは受け付けておりませんが、ご自分のサイトから<a href=\"%s\" rel=\"trackback\">トラックバック</a>を送ることはできます。"
-
-#: xpress_default/image.php:39
-#: xpress_default/single.php:53
-msgid "You can skip to the end and leave a response. Pinging is currently not allowed."
-msgstr "このページの一番下でコメントを残すことができます。トラックバック / ピンバックは現在受け付けていません。"
-
-#: xpress_default/image.php:43
-#: xpress_default/single.php:57
-msgid "Both comments and pings are currently closed."
-msgstr "現在コメント、トラックバックともに受け付けておりません。"
-
-#: xpress_default/image.php:45
-#: xpress_default/page.php:34
-msgid "Edit this entry."
-msgstr "この投稿を編集する。"
-
-#: xpress_default/image.php:58
-#: xpress_default/single.php:71
-msgid "Sorry, no posts matched your criteria."
-msgstr "該当する投稿は見つかりませんでした。"
-
-#: xpress_default/index.php:46
-#, php-format
-msgid "Views :%d"
-msgstr "閲覧 :%d"
-
-#: xpress_default/index.php:64
-msgid "Sorry, but you are looking for something that isn&#8217;t here."
-msgstr "お探しの物はここにはありません。"
-
-#: xpress_default/links.php:18
-msgid "Links:"
-msgstr "リンク:"
-
-#: xpress_default/page.php:27
-msgid "Read the rest of this page &raquo;"
-msgstr "このページの続きを読む &raquo;"
-
-#: xpress_default/search.php:24
-msgid "Search Results"
-msgstr "検索結果"
-
 #: xpress_default/search.php:51
 msgid "No posts found. Try a different search?"
@@ -584,4 +537,8 @@
 msgid "You are currently browsing the <a href=\"%1$s/\">%2$s</a> blog archives for %3$s."
 msgstr "<a href=\"%1$s/\">%2$s</a> の %3$s のアーカイブを閲覧中です。"
+
+#: xpress_default/sidebar.php:27
+msgid "F, Y"
+msgstr "Y 年 n 月"
 
 #: xpress_default/sidebar.php:30
Index: trunk/wp-content/themes/xpress_default/style.css
===================================================================
--- trunk/wp-content/themes/xpress_default/style.css	(revision 139)
+++ trunk/wp-content/themes/xpress_default/style.css	(revision 140)
@@ -1,19 +1,74 @@
 /*
-Theme Name: XPress Default Themes
-Theme URI: http://xoops-fan.com/
-Description: The theme for XPress series
-Version: 0.5
-Author: KURO
-Author URI: http://xoops-fan.com/
-Tags: XPressME,XPressEUC,KURO
+Theme Name: XPressME Default Themes
+Theme URI: http://trac.xpressme.info/XPressME
+Description: The theme for XPressME series
+Version: 2.0
+Author: toemon
+Author URI: http://www.toemon.com
+Tags: XPressME,toemon
 
 */
 
-
-
+.xpress-header-title {
+	float: left;
+	margin-bottom: 20px;
+
+	font-size: 16px;
+}
+.xpress-conditional-title {
+	font-size: 14px;
+	margin-bottom: 20px;
+
+}
+
+.xpress-description {
+	clear: both;
+	font-size: 12px;
+	float: left;
+}
+
+.xpress-operation-link {
+	font-size: 12px;
+	text-align: right;
+}
+
+.xpress-border {
+	clear: both;
+display: block;
+}
+
+.xpress-navi-bar {
+	clear: both;
+	display: block;
+	}
+	
+.xpress_pagenavi {
+	display: block;
+	margin: 0 auto;
+	padding: 5px 0;
+	text-align: center;
+}
+.xpress-next-posts-link {
+	float: left;
+
+}
+.xpress-previous-posts-link{
+	text-align: right;
+}
+
+.xpress-post-entry {
+	clear: both;
+	padding-left: 20px;
+
+}
+.xpress-post-footer{
+	text-align: right;
+	font-size: 0.8em;
+
+}
 /* Begin Typography & Colors */
 
-#xpress_content {
-	font-size: 1.0em
+.xpress_content {
+	font-size: 1.0em;
 	}
 
@@ -33,6 +88,6 @@
 #xpress_page .alt {
 	background-color: #f8f8f8;
-	border-top: 1px solid #ddd;
-	border-bottom: 1px solid #ddd;
+	border-top: 1px solid #000;
+	border-bottom: 1px solid #000;
 	}
 
@@ -49,5 +104,5 @@
 #xpress_page h1,
 #xpress_page h2 {
-	font-size: 1.5em;
+	font-size: 1.4em;
 	}
 
@@ -142,12 +197,4 @@
 }	
 
-#xpress_credit {
-	font-size: 0.9em;
-	color: darkgray;
-}
-#xpress_credit a {
-	font-size: 0.9em;
-	color: darkgray;
-}	
 /* End Typography & Colors */
 
@@ -192,17 +239,17 @@
 	}	
 	
-.post hr {
-	display: block;
-	}
-	
-#xpress_content .post {
+	
+.xpress-post {
 	width: 100%;
-	margin: 0 0 20px;
+	margin: 5px 0 10px;
 	padding-top:20px;
 	clear: both;
 	}	
 	
-.post h2 {
-	margin: 0;
+.xpress-post h2 {
+	margin: 0;
+	}
+.xpress-post hr {
+	display: block;
 	}
 
@@ -250,5 +297,5 @@
 
 #xpress_footer {
-	padding-top: 40px;
+	padding-top: 0px;
 	margin: 0 auto;
 	width: 100%;
@@ -258,14 +305,28 @@
 #xpress_footer p {
 	margin: 0;
-	padding: 20px 0;
-	text-align: center;
-	}
-	
-#xpress_credit {
-	margin: 0;
-	padding: 0;
-	text-align: center;
-	}
-	
+	padding: 0px 0;
+	text-align: center;
+	}
+	
+.xpress_rss {
+	margin: 0;
+	padding: 0;
+	text-align: right;
+	}
+
+
+.xpress_credit {
+	margin: 0;
+	padding: 0;
+	text-align: center;
+	font-size: 0.9em;
+	color: #BDBDBD;
+	}
+	
+.xpress_credit a {
+	font-size: 0.9em;
+	color: #BDBDBD;
+}	
+
 .dateblock{
 	margin:-12px 0 0 -5px!important;
@@ -567,7 +628,4 @@
 	}
 
-#xpress_page hr {
-	display: none;
-	}
 
 #xpress_page a img {
@@ -587,10 +645,5 @@
 	}
 	
-.xpress_pagenavi {
-	display: block;
-	margin: 0 auto;
-	padding: 5px 0;
-	text-align: center;
-	}
+
 /* End Various Tags & Classes*/