diff -ru jillij/404.php jillij-nl/404.php
--- jillij/404.php	2007-09-04 14:54:24.000000000 +0200
+++ jillij-nl/404.php	2007-12-23 16:51:39.000000000 +0100
@@ -2,10 +2,10 @@
 
 	<div id="content" class="narrowcolumn">
 
-		<h2 class="center"><?php _e('Error 404 - Not Found'); ?></h2>
+		<h2 class="center"><?php _ej('Error 404 - Not Found'); ?></h2>
 
 	</div>
 
 <?php get_sidebar(); ?>
 
-<?php get_footer(); ?>
\ No newline at end of file
+<?php get_footer(); ?>
diff -ru jillij/aplus.php jillij-nl/aplus.php
--- jillij/aplus.php	2007-09-04 14:52:22.000000000 +0200
+++ jillij-nl/aplus.php	2007-12-23 16:52:42.000000000 +0100
@@ -75,7 +75,7 @@
 				$num_found++;
 				$link = '<a href="'.get_category_link($category->cat_ID).'" ';
 				if (empty($category->category_description)) {
-					$link .= 'title="'. sprintf(__("View all posts filed under %s"), wp_specialchars($category->cat_name)) . '"';
+					$link .= 'title="'. sprintf(__j("View all posts filed under %s"), wp_specialchars($category->cat_name)) . '"';
 				} else {
 					$link .= 'title="' . strip_tags(apply_filters('category_description',$category->category_description,$category)) . '"';
 				}
@@ -95,7 +95,7 @@
 		if (!$num_found && !$child_of){
 			$before = '<li>';
 			$after = '</li>';
-			echo $before . __("No categories") . $after . "\n";
+			echo $before . __j("No categories") . $after . "\n";
 			return;
 		}
 		if ($child_of && $num_found && $recurse) {
@@ -266,7 +266,7 @@
 		if (!isset($r['depth'])) $r['depth'] = 0;
 		if (!isset($r['show_date'])) $r['show_date'] = '';
 		if (!isset($r['child_of'])) $r['child_of'] = 0;
-		if ( !isset($r['title_li']) ) $r['title_li'] = __('Pages');
+		if ( !isset($r['title_li']) ) $r['title_li'] = __j('Pages');
 
 
 		// Query pages.
@@ -465,4 +465,4 @@
 		return $tod;
 	}
 }
-?>
\ No newline at end of file
+?>
diff -ru jillij/archive.php jillij-nl/archive.php
--- jillij/archive.php	2007-09-04 14:54:34.000000000 +0200
+++ jillij-nl/archive.php	2007-12-23 16:52:46.000000000 +0100
@@ -8,52 +8,52 @@
 <?php /* If this is a category archive */ if (is_category()) { ?>
 
 	<?php if (function_exists('lang_picker_respect_more')) : ?>
-		<h2 class="pagetitle"><?php printf(__('Archive for the &#8216;%1$s&#8217; Category'), lang_picker_respect_more(single_cat_title('',false))); ?></h2>
+		<h2 class="pagetitle"><?php printf(__j('Archive for the &#8216;%1$s&#8217; Category'), lang_picker_respect_more(single_cat_title('',false))); ?></h2>
 	<?php else : ?>
-		<h2 class="pagetitle"><?php printf(__('Archive for the &#8216;%1$s&#8217; Category'), single_cat_title('',false)); ?></h2>
+		<h2 class="pagetitle"><?php printf(__j('Archive for the &#8216;%1$s&#8217; Category'), single_cat_title('',false)); ?></h2>
 	<?php endif; ?>
 
  	  <?php /* If this is a daily archive */ } elseif (is_day()) { ?>
-		<h2 class="pagetitle"><?php printf(__('Archive for %1$s'), get_the_time(__('F jS, Y'))); ?></h2>
+		<h2 class="pagetitle"><?php printf(__j('Archive for %1$s'), get_the_time(__j('F jS, Y'))); ?></h2>
 
 	 <?php /* If this is a monthly archive */ } elseif (is_month()) { ?>
-		<h2 class="pagetitle"><?php printf(__('Archive for %1$s'), get_the_time(__('F, Y'))); ?></h2>
+		<h2 class="pagetitle"><?php printf(__j('Archive for %1$s'), get_the_time(__j('F, Y'))); ?></h2>
 
 		<?php /* If this is a yearly archive */ } elseif (is_year()) { ?>
-		<h2 class="pagetitle"><?php printf(__('Archive for %1$s'), get_the_time('Y')); ?></h2>
+		<h2 class="pagetitle"><?php printf(__j('Archive for %1$s'), get_the_time('Y')); ?></h2>
 
 	  <?php /* If this is a search */ } elseif (is_search()) { ?>
-		<h2 class="pagetitle"><?php _e('Search Results'); ?></h2>
+		<h2 class="pagetitle"><?php _ej('Search Results'); ?></h2>
 
 	  <?php /* If this is an author archive */ } elseif (is_author()) { ?>
-		<h2 class="pagetitle"><?php _e('Author Archive'); ?></h2>
+		<h2 class="pagetitle"><?php _ej('Author Archive'); ?></h2>
 
 		<?php /* If this is a paged archive */ } elseif (isset($_GET['paged']) && !empty($_GET['paged'])) { ?>
-		<h2 class="pagetitle"><?php _e('Blog Archives'); ?></h2>
+		<h2 class="pagetitle"><?php _ej('Blog Archives'); ?></h2>
 
 		<?php } ?>
 
 
 		<div class="navigation">
 			<?php if (function_exists('gengo_previous_post_link')) : ?>
-					<div class="alignleft"><?php gengo_next_posts_link(__('&laquo; Previous Entries')) ?></div>
-					<div class="alignright"><?php gengo_previous_posts_link(__('Next Entries &raquo;')) ?></div>
+					<div class="alignleft"><?php gengo_next_posts_link(__j('&laquo; Previous Entries')) ?></div>
+					<div class="alignright"><?php gengo_previous_posts_link(__j('Next Entries &raquo;')) ?></div>
 			<?php else : ?>
-					<div class="alignleft"><?php next_posts_link(__('&laquo; Previous Entries')) ?></div>
-					<div class="alignright"><?php previous_posts_link(__('Next Entries &raquo;')) ?></div>
+					<div class="alignleft"><?php next_posts_link(__j('&laquo; Previous Entries')) ?></div>
+					<div class="alignright"><?php previous_posts_link(__j('Next Entries &raquo;')) ?></div>
 			<?php endif; ?>
 		</div>
 
 		<?php while (have_posts()) : the_post(); ?>
 		<div class="post">
-			<h3 id="post-<?php the_ID(); ?>"><a href="<?php the_permalink() ?>" rel="bookmark" title="<?php printf(__('Permanent Link to %1$s'), the_title('', '', false)); ?>"><?php the_title(); ?></a></h3>
-			<small><?php the_time(__('l, F jS, Y')) ?></small>
+			<h3 id="post-<?php the_ID(); ?>"><a href="<?php the_permalink() ?>" rel="bookmark" title="<?php printf(__j('Permanent Link to %1$s'), the_title('', '', false)); ?>"><?php the_title(); ?></a></h3>
+			<small><?php the_time(__j('l, F jS, Y')) ?></small>
 
 				<div class="entry">
-					<?php the_content(__('(more...)')) ?>
+					<?php the_content(__j('(more...)')) ?>
 				</div>
 
-			<p class="postmetadata"><?php _e('Posted in'); echo ' '; the_category(', '); ?> <strong>|</strong> <?php edit_post_link(__('Edit'),'','<strong>|</strong>'); ?>  <?php comments_popup_link(__('No Comments &#187;'), __('1 Comment &#187;'), __('% Comments &#187;'), '', __('Comments Off')); ?></p>
+			<p class="postmetadata"><?php _ej('Posted in'); echo ' '; the_category(', '); ?> <strong>|</strong> <?php edit_post_link(__j('Edit'),'','<strong>|</strong>'); ?>  <?php comments_popup_link(__j('No Comments &#187;'), __j('1 Comment &#187;'), __j('% Comments &#187;'), '', __j('Comments Off')); ?></p>
 
 			</div>
 
@@ -61,17 +61,17 @@
 
 		<div class="navigation">
 			<?php if (function_exists('gengo_previous_post_link')) : ?>
-					<div class="alignleft"><?php gengo_next_posts_link(__('&laquo; Previous Entries')) ?></div>
-					<div class="alignright"><?php gengo_previous_posts_link(__('Next Entries &raquo;')) ?></div>
+					<div class="alignleft"><?php gengo_next_posts_link(__j('&laquo; Previous Entries')) ?></div>
+					<div class="alignright"><?php gengo_previous_posts_link(__j('Next Entries &raquo;')) ?></div>
 			<?php else : ?>
-					<div class="alignleft"><?php next_posts_link(__('&laquo; Previous Entries')) ?></div>
-					<div class="alignright"><?php previous_posts_link(__('Next Entries &raquo;')) ?></div>
+					<div class="alignleft"><?php next_posts_link(__j('&laquo; Previous Entries')) ?></div>
+					<div class="alignright"><?php previous_posts_link(__j('Next Entries &raquo;')) ?></div>
 			<?php endif; ?>
 		</div>
 
 	<?php else : ?>
 
-		<h2 class="center"><?php _e('Not Found'); ?></h2>
+		<h2 class="center"><?php _ej('Not Found'); ?></h2>
 		<?php include (TEMPLATEPATH . '/searchform.php'); ?>
 
 	<?php endif; ?>
@@ -80,4 +80,4 @@
 
 <?php get_sidebar(); ?>
 
-<?php get_footer(); ?>
\ No newline at end of file
+<?php get_footer(); ?>
diff -ru jillij/archives.php jillij-nl/archives.php
--- jillij/archives.php	2007-09-04 14:54:40.000000000 +0200
+++ jillij-nl/archives.php	2007-12-23 16:51:49.000000000 +0100
@@ -11,12 +11,12 @@
 
 <?php include (TEMPLATEPATH . '/searchform.php'); ?>
 
-	<h2><?php _e('Archives by Month:'); ?></h2>
+	<h2><?php _ej('Archives by Month:'); ?></h2>
   <ul>
     <?php wp_get_archives('type=monthly'); ?>
   </ul>
 
-	<h2><?php _e('Archives by Subject:'); ?></h2>
+	<h2><?php _ej('Archives by Subject:'); ?></h2>
   <ul>
      <?php wp_list_cats(); ?>
   </ul>
diff -ru jillij/attachment.php jillij-nl/attachment.php
--- jillij/attachment.php	2007-09-04 14:54:48.000000000 +0200
+++ jillij-nl/attachment.php	2007-12-23 16:52:51.000000000 +0100
@@ -15,38 +15,38 @@
 			<div class="entrytext">
 				<p class="<?php echo $classname; ?>"><?php echo $attachment_link; ?><br /><?php echo basename($post->guid); ?></p>
 
-				<?php the_content('<p class="serif">' . __('Read the rest of this entry &raquo;') . '</p>'); ?>
+				<?php the_content('<p class="serif">' . __j('Read the rest of this entry &raquo;') . '</p>'); ?>
 		<?php if (function_exists('gengo_link_pages')) : ?>
-				<?php gengo_link_pages('<p><strong>' . __('Pages:') . '</strong> ', '</p>', 'number'); ?>
+				<?php gengo_link_pages('<p><strong>' . __j('Pages:') . '</strong> ', '</p>', 'number'); ?>
 		<?php else : ?>
-				<?php link_pages('<p><strong>' . __('Pages:') . '</strong> ', '</p>', 'number'); ?>
+				<?php link_pages('<p><strong>' . __j('Pages:') . '</strong> ', '</p>', 'number'); ?>
 		<?php endif; ?>
 
 				<p class="postmetadata alt">
 					<small>
-					<?php printf(__('This entry was posted on %1$s at %2$s and is filed under %3$s. You can follow any responses to this entry through the <a href="%4$s">RSS 2.0</a> feed.'), get_the_time(__('l, F jS, Y')), get_the_time(__('g:i a')), get_the_category_list(', '), get_bloginfo_rss('comments_rss2_url')); ?>
+					<?php printf(__j('This entry was posted on %1$s at %2$s and is filed under %3$s. You can follow any responses to this entry through the <a href="%4$s">RSS 2.0</a> feed.'), get_the_time(__j('l, F jS, Y')), get_the_time(__j('g:i a')), get_the_category_list(', '), get_bloginfo_rss('comments_rss2_url')); ?>
 
 						<?php if (('open' == $post-> comment_status) && ('open' == $post->ping_status)) {
 							// Both Comments and Pings are open
-							printf(__('You can <a href="#respond">leave a response</a>, or <a href="%1$s">trackback</a> from your own site. '), trackback_url(false));
+							printf(__j('You can <a href="#respond">leave a response</a>, or <a href="%1$s">trackback</a> from your own site. '), trackback_url(false));
 						?>
 
 						<?php } elseif (!('open' == $post-> comment_status) && ('open' == $post->ping_status)) {
 							// Only Pings are Open
-							printf(__('Responses are currently closed, but you can <a href="%1$s">trackback</a> from your own site.'), trackback_url(false));
+							printf(__j('Responses are currently closed, but you can <a href="%1$s">trackback</a> from your own site.'), trackback_url(false));
 						?>
 
 						<?php } elseif (('open' == $post-> comment_status) && !('open' == $post->ping_status)) {
 							// Comments are open, Pings are not
-							_e('You can skip to the end and leave a response. Pinging is currently not allowed.');
+							_ej('You can skip to the end and leave a response. Pinging is currently not allowed.');
 						?>
 
 						<?php } elseif (!('open' == $post-> comment_status) && !('open' == $post->ping_status)) {
 							// Neither Comments, nor Pings are open
-							_e('Both comments and pings are currently closed.');
+							_ej('Both comments and pings are currently closed.');
 						?>
 
-						<?php } edit_post_link(__('Edit this entry.'),'',''); ?>
+						<?php } edit_post_link(__j('Edit this entry.'),'',''); ?>
 
 					</small>
 				</p>
@@ -58,7 +58,7 @@
 
 	<?php endwhile; else: ?>
 
-		<p><?php _e('Sorry, no attachments matched your criteria.'); ?></p>
+		<p><?php _ej('Sorry, no attachments matched your criteria.'); ?></p>
 
 <?php endif; ?>
 
diff -ru jillij/comments-popup.php jillij-nl/comments-popup.php
--- jillij/comments-popup.php	2007-09-04 14:52:22.000000000 +0200
+++ jillij-nl/comments-popup.php	2007-12-23 16:52:54.000000000 +0100
@@ -6,7 +6,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
-	<title><?php echo get_settings('blogname'); ?> - <?php printf(__('Comments on %1$s'), the_title('','',false)); ?></title>
+	<title><?php echo get_settings('blogname'); ?> - <?php printf(__j('Comments on %1$s'), the_title('','',false)); ?></title>
 
 	<meta http-equiv="Content-Type" content="<?php bloginfo('html_type'); ?>; charset=<?php echo get_settings('blog_charset'); ?>" />
 	<style type="text/css" media="screen">
@@ -19,12 +19,12 @@
 
 <h1 id="header"><a href="" title="<?php echo get_settings('blogname'); ?>"><?php echo get_settings('blogname'); ?></a></h1>
 
-<h2 id="comments"><?php _e('Comments'); ?></h2>
+<h2 id="comments"><?php _ej('Comments'); ?></h2>
 
-<p><a href="<?php echo get_settings('siteurl'); ?>/wp-commentsrss2.php?p=<?php echo $post->ID; ?>"><?php _e('<abbr title="Really Simple Syndication">RSS</abbr> feed for comments on this post.'); ?></a></p>
+<p><a href="<?php echo get_settings('siteurl'); ?>/wp-commentsrss2.php?p=<?php echo $post->ID; ?>"><?php _ej('<abbr title="Really Simple Syndication">RSS</abbr> feed for comments on this post.'); ?></a></p>
 
 <?php if ('open' == $post->ping_status) { ?>
-<p><?php printf(__('The <acronym title="Uniform Resource Identifier">URI</acronym> to TrackBack this entry is: <em>%1$s</em>'), trackback_url()); ?></p>
+<p><?php printf(__j('The <acronym title="Uniform Resource Identifier">URI</acronym> to TrackBack this entry is: <em>%1$s</em>'), trackback_url()); ?></p>
 <?php } ?>
 
 <?php
@@ -43,55 +43,55 @@
 <?php foreach ($comments as $comment) { ?>
 	<li id="comment-<?php comment_ID() ?>">
 	<?php comment_text() ?>
-	<p><cite><?php printf('%1$s by %2$s &#8212; %3$s @ <a href="#comment-%4$s">%5$s</a>', comment_type(__('Comment'), __('Trackback'), __('Pingback')),  comment_author_link(), comment_date(), comment_ID(), comment_time()) ?></cite></p>
+	<p><cite><?php printf('%1$s by %2$s &#8212; %3$s @ <a href="#comment-%4$s">%5$s</a>', comment_type(__j('Comment'), __j('Trackback'), __j('Pingback')),  comment_author_link(), comment_date(), comment_ID(), comment_time()) ?></cite></p>
 	</li>
 
 <?php } // end for each comment ?>
 </ol>
 <?php } else { // this is displayed if there are no comments so far ?>
-	<p><?php _e('No comments yet.'); ?></p>
+	<p><?php _ej('No comments yet.'); ?></p>
 <?php } ?>
 
 <?php if ('open' == $post->comment_status) { ?>
-<h2><?php _e('Leave a comment'); ?></h2>
-<p><?php printf(__('Line and paragraph breaks automatic, e-mail address never displayed, <acronym title="Hypertext Markup Language">HTML</acronym> allowed: <code>%1$s</code>'), allowed_tags()); ?></p>
+<h2><?php _ej('Leave a comment'); ?></h2>
+<p><?php printf(__j('Line and paragraph breaks automatic, e-mail address never displayed, <acronym title="Hypertext Markup Language">HTML</acronym> allowed: <code>%1$s</code>'), allowed_tags()); ?></p>
 
 <form action="<?php echo get_settings('siteurl'); ?>/wp-comments-post.php" method="post" id="commentform">
 	<p>
 	  <input type="text" name="author" id="author" class="textarea" value="<?php echo $comment_author; ?>" size="28" tabindex="1" />
-		<label for="author"><?php _e('Name'); ?></label>
+		<label for="author"><?php _ej('Name'); ?></label>
 	<input type="hidden" name="comment_post_ID" value="<?php echo $id; ?>" />
 	<input type="hidden" name="redirect_to" value="<?php echo wp_specialchars($_SERVER["REQUEST_URI"]); ?>" />
 	</p>
 
 	<p>
 	  <input type="text" name="email" id="email" value="<?php echo $comment_author_email; ?>" size="28" tabindex="2" />
-		<label for="email"><?php _e('E-mail'); ?></label>
+		<label for="email"><?php _ej('E-mail'); ?></label>
 	</p>
 
 	<p>
 	  <input type="text" name="url" id="url" value="<?php echo $comment_author_url; ?>" size="28" tabindex="3" />
-		<label for="url"><?php _e('<acronym title="Uniform Resource Identifier">URI</acronym>'); ?></label>
+		<label for="url"><?php _ej('<acronym title="Uniform Resource Identifier">URI</acronym>'); ?></label>
 	</p>
 
 	<p>
-		<label for="comment"><?php _e('Your Comment'); ?></label>
+		<label for="comment"><?php _ej('Your Comment'); ?></label>
 	<br />
 	  <textarea name="comment" id="comment" cols="70" rows="4" tabindex="4"></textarea>
 	</p>
 
 	<p>
-		<input name="submit" type="submit" tabindex="5" value="<?php _e("Say It!"); ?>" />
+		<input name="submit" type="submit" tabindex="5" value="<?php _ej("Say It!"); ?>" />
 	</p>
 	<?php do_action('comment_form', $post->ID); ?>
 </form>
 <?php } else { // comments are closed ?>
-<p><?php _e('Sorry, the comment form is closed at this time.'); ?></p>
+<p><?php _ej('Sorry, the comment form is closed at this time.'); ?></p>
 <?php }
 } // end password check
 ?>
 
-<div><strong><a href="javascript:window.close()"><?php _e('Close this window.'); ?></a></strong></div>
+<div><strong><a href="javascript:window.close()"><?php _ej('Close this window.'); ?></a></strong></div>
 
 <?php // if you delete this the sky will fall on your head
 }
@@ -99,7 +99,7 @@
 
 <!-- // this is just the end of the motor - don't touch that line either :) -->
 <?php //} ?> 
-<p class="credit"><?php timer_stop(1); ?> <?php printf(__('<cite>Powered by <a href="http://wordpress.org" title="%1$s"><strong>Wordpress</strong></a></cite>'), __('Powered by WordPress, state-of-the-art semantic personal publishing platform.')); ?></p>
+<p class="credit"><?php timer_stop(1); ?> <?php printf(__j('<cite>Powered by <a href="http://wordpress.org" title="%1$s"><strong>Wordpress</strong></a></cite>'), __j('Powered by WordPress, state-of-the-art semantic personal publishing platform.')); ?></p>
 <?php // Seen at http://www.mijnkopthee.nl/log2/archive/2003/05/28/esc(18) ?>
 <script type="text/javascript">
 <!--
diff -ru jillij/comments.php jillij-nl/comments.php
--- jillij/comments.php	2007-09-04 14:52:22.000000000 +0200
+++ jillij-nl/comments.php	2007-12-23 16:52:57.000000000 +0100
@@ -1,12 +1,12 @@
 <?php // Do not delete these lines
 	if ('comments.php' == basename($_SERVER['SCRIPT_FILENAME']))
-		die (__('Please do not load this page directly. Thanks!'));
+		die (__j('Please do not load this page directly. Thanks!'));
 
         if (!empty($post->post_password)) { // if there's a password
             if ($_COOKIE['wp-postpass_' . COOKIEHASH] != $post->post_password) {  // and it doesn't match the cookie
 				?>
 
-				<p class="nocomments"><?php _e('This post is password protected. Enter the password to view comments.'); ?><p>
+				<p class="nocomments"><?php _ej('This post is password protected. Enter the password to view comments.'); ?><p>
 
 				<?php
 				return;
@@ -20,20 +20,20 @@
 <!-- You can start editing here. -->
 
 <?php if ($comments) : ?>
-	<h3 id="comments"><?php printf(__('%1$s to &#8220; %2$s &#8221;'), comments_number(__('No Responses'), __('One Response'), __('% Responses')), the_title('', '', false)); ?></h3>
+	<h3 id="comments"><?php printf(__j('%1$s to &#8220; %2$s &#8221;'), comments_number(__j('No Responses'), __j('One Response'), __j('% Responses')), the_title('', '', false)); ?></h3>
 
 	<ol class="commentlist">
 
 	<?php foreach ($comments as $comment) : ?>
 
 		<li class="<?php echo $oddcomment; ?>" id="comment-<?php comment_ID() ?>">
-			<cite><?php printf(__('%1$s Says:'), comment_author_link()); ?></cite>
+			<cite><?php printf(__j('%1$s Says:'), comment_author_link()); ?></cite>
 			<?php if ($comment->comment_approved == '0') : ?>
-			<em><?php _e('Your comment is awaiting moderation.'); ?></em>
+			<em><?php _ej('Your comment is awaiting moderation.'); ?></em>
 			<?php endif; ?>
 			<br />
 
-			<small class="commentmetadata"><a href="#comment-<?php comment_ID() ?>" title=""><?php printf(__('%1$s at %2$s '), comment_date(__('F jS, Y')), comment_time(__('g:i a'))); ?></a> <?php edit_comment_link(__('Edit'),'',''); ?></small>
+			<small class="commentmetadata"><a href="#comment-<?php comment_ID() ?>" title=""><?php printf(__j('%1$s at %2$s '), comment_date(__j('F jS, Y')), comment_time(__j('g:i a'))); ?></a> <?php edit_comment_link(__j('Edit'),'',''); ?></small>
 
 			<?php comment_text() ?>
 
@@ -55,7 +55,7 @@
 
 	 <?php else : // comments are closed ?>
 		<!-- If comments are closed. -->
-		<p class="nocomments"><?php _e('Comments are closed.'); ?></p>
+		<p class="nocomments"><?php _ej('Comments are closed.'); ?></p>
 
 	<?php endif; ?>
 <?php endif; ?>
@@ -63,38 +63,38 @@
 
 <?php if ('open' == $post->comment_status) : ?>
 
-<h3 id="respond"><?php _e('Leave a Reply'); ?></h3>
+<h3 id="respond"><?php _ej('Leave a Reply'); ?></h3>
 
 <?php if ( get_option('comment_registration') && !$user_ID ) : ?>
 $redirect_url = get_option('siteurl').'/wp-login.php?redirect_to='.get_permalink();
-<p><?php printf(__('You must be <a href="%1$s">logged in</a> to post a comment.'), $redirect_url); ?></p>
+<p><?php printf(__j('You must be <a href="%1$s">logged in</a> to post a comment.'), $redirect_url); ?></p>
 <?php else : ?>
 
 <form action="<?php echo get_option('siteurl'); ?>/wp-comments-post.php" method="post" id="commentform">
 
 <?php if ( $user_ID ) : ?>
 
-<p><?php printf(__('Logged in as <a href="%1$s">%2$s</a>.'), get_option('siteurl') . '/wp-admin/profile.php', $user_identity); ?>&nbsp;
-<a href="<?php echo get_option('siteurl'); ?>/wp-login.php?action=logout" title="<?php _e('Log out of this account') ?>"><?php _e('Logout &raquo;'); ?></a></p>
+<p><?php printf(__j('Logged in as <a href="%1$s">%2$s</a>.'), get_option('siteurl') . '/wp-admin/profile.php', $user_identity); ?>&nbsp;
+<a href="<?php echo get_option('siteurl'); ?>/wp-login.php?action=logout" title="<?php _ej('Log out of this account') ?>"><?php _ej('Logout &raquo;'); ?></a></p>
 
 <?php else : ?>
 
 <p><input type="text" name="author" id="author" value="<?php echo $comment_author; ?>" size="22" tabindex="1" />
-<label for="author"><small><?php if ($req) _e('Name (required)'); else _e('Name'); ?></small></label></p>
+<label for="author"><small><?php if ($req) _ej('Name (required)'); else _ej('Name'); ?></small></label></p>
 
 <p><input type="text" name="email" id="email" value="<?php echo $comment_author_email; ?>" size="22" tabindex="2" />
-<label for="email"><small><?php if ($req) _e('Mail (will not be published) (required)'); else _e('Mail (will not be published)'); ?></small></label></p>
+<label for="email"><small><?php if ($req) _ej('Mail (will not be published) (required)'); else _ej('Mail (will not be published)'); ?></small></label></p>
 
 <p><input type="text" name="url" id="url" value="<?php echo $comment_author_url; ?>" size="22" tabindex="3" />
-<label for="url"><small><?php _e('Website'); ?></small></label></p>
+<label for="url"><small><?php _ej('Website'); ?></small></label></p>
 
 <?php endif; ?>
 
-<!--<p><small><?php printf(__('<strong>XHTML:</strong> You can use these tags: <code>%1$s</code>'), allowed_tags()); ?></small></p>-->
+<!--<p><small><?php printf(__j('<strong>XHTML:</strong> You can use these tags: <code>%1$s</code>'), allowed_tags()); ?></small></p>-->
 
 <p><textarea name="comment" id="comment" cols="100%" rows="10" tabindex="4"></textarea></p>
 
-<p><input name="submit" type="submit" id="submit" tabindex="5" value="<?php _e('Submit Comment'); ?>" />
+<p><input name="submit" type="submit" id="submit" tabindex="5" value="<?php _ej('Submit Comment'); ?>" />
 <input type="hidden" name="comment_post_ID" value="<?php echo $id; ?>" />
 </p>
 <?php do_action('comment_form', $post->ID); ?>
diff -ru jillij/footer.php jillij-nl/footer.php
--- jillij/footer.php	2007-09-04 14:52:22.000000000 +0200
+++ jillij-nl/footer.php	2007-12-23 16:53:00.000000000 +0100
@@ -1,9 +1,9 @@
 <div id="footer">
 	<p>
-		<?php printf(__('%1$s is proudly powered by <a href="http://wordpress.org">WordPress</a>'), get_bloginfo('name')); ?>
+		<?php printf(__j('%1$s is proudly powered by <a href="http://wordpress.org">WordPress</a>'), get_bloginfo('name')); ?>
 		<br />
-		<?php printf(__('<a href="feed:%1$s">Entries (RSS)</a> and <a href="feed:%2$s">Comments (RSS)</a>.'), get_bloginfo('rss2_url'), get_bloginfo('comments_rss2_url')); ?>
-		<!-- <?php printf(__('%1$s queries.'), get_num_queries()); ?> <?php printf(__('%1$s seconds.'), timer_stop(1)); ?> -->
+		<?php printf(__j('<a href="feed:%1$s">Entries (RSS)</a> and <a href="feed:%2$s">Comments (RSS)</a>.'), get_bloginfo('rss2_url'), get_bloginfo('comments_rss2_url')); ?>
+		<!-- <?php printf(__j('%1$s queries.'), get_num_queries()); ?> <?php printf(__j('%1$s seconds.'), timer_stop(1)); ?> -->
 		Template : <a href="http://www.jillij.com/">Jillij</a>
 	</p>
 </div>
diff -ru jillij/functions.php jillij-nl/functions.php
--- jillij/functions.php	2007-09-04 14:52:26.000000000 +0200
+++ jillij-nl/functions.php	2007-12-23 17:12:22.000000000 +0100
@@ -8,10 +8,18 @@
         	'after_title' => '',
     	));
 
+function __j($str) {
+	return __($str,'jillij');
+}
+
+function _ej($str) {
+	return _e($str,'jillij');
+}
+
 function widget_jillij_search() {
 ?>
 
-			<li class="LargeMenu"><?php _e('Search'); ?>
+			<li class="LargeMenu"><?php _ej('Search'); ?>
 						<ul>
 							<li><?php include (TEMPLATEPATH . "/searchform.php"); ?>
 							</li>
@@ -24,7 +32,7 @@
 function widget_jillij_calendar() {
 ?>
 
-			<li class="LargeMenu"><?php _e('Archives'); ?>
+			<li class="LargeMenu"><?php _ej('Archives'); ?>
 				<ul>
 					<li>
 					<?php get_calendar(); ?>
@@ -41,7 +49,7 @@
 		$options = get_option('widget_categories');
 		$c = $options['count'] ? '1' : '0';
 		$h = $options['hierarchical'] ? '1' : '0';
-		$title = empty($options['title']) ? __('Categories') : $options['title'];
+		$title = empty($options['title']) ? __j('Categories') : $options['title'];
 ?>
 			<li><?php echo $title; ?>
 				<ul>
@@ -67,7 +75,7 @@
 
 		// These lines generate our output. Widgets can be very complex
 		// but as you can see here, they can also be very, very simple.
-		echo '<li class="LargeMenu">'.$before_title .__('Search'). $after_title.'<ul><li>';
+		echo '<li class="LargeMenu">'.$before_title .__j('Search'). $after_title.'<ul><li>';
 		$url_parts = parse_url(get_bloginfo('home'));
 		echo '<form id="searchform" action="http://www.google.com/search" method="get" onsubmit="this.q.value=\'site:'.$url_parts['host'].' \'+this.rawq.value"><input name="rawq" size="20" /><input type="hidden" name="q" value="" /><input value="'.$buttontext.'" name="submit" type="submit" /></form>';
 		echo '</li></ul>'.$after_widget;
@@ -191,17 +199,17 @@
 		$title = attribute_escape( $options[$number]['title'] );
 
 		?>
-			<p><?php _e( 'Title :' ); ?> <input type="text" value="<?php echo $title; ?>" name="multi-pages-title-<?php echo $number; ?>" id="multi-pages-title-<?php echo $number; ?>" style="width: 180px;" /><br />
-			<small><?php _e( 'Optional.' ); ?></small></p>
-			<p><?php _e( 'Headpage:' ); ?> <input type="text" value="<?php echo $headpage; ?>" name="multi-pages-headpage-<?php echo $number; ?>" id="multi-pages-headpage-<?php echo $number; ?>" style="width: 180px;" /><br />
-			<small><?php _e( 'Page IDs, separated by commas.' ); ?></small></p>
-			<p><?php _e( 'Exclude:' ); ?> <input type="text" value="<?php echo $exclude; ?>" name="multi-pages-exclude-<?php echo $number; ?>" id="multi-pages-exclude-<?php echo $number; ?>" style="width: 180px;" /><br />
-			<small><?php _e( 'Page IDs, separated by commas.' ); ?></small></p>
-			<p><?php _e( 'Sort by:' ); ?>
+			<p><?php _ej( 'Title :' ); ?> <input type="text" value="<?php echo $title; ?>" name="multi-pages-title-<?php echo $number; ?>" id="multi-pages-title-<?php echo $number; ?>" style="width: 180px;" /><br />
+			<small><?php _ej( 'Optional.' ); ?></small></p>
+			<p><?php _ej( 'Headpage:' ); ?> <input type="text" value="<?php echo $headpage; ?>" name="multi-pages-headpage-<?php echo $number; ?>" id="multi-pages-headpage-<?php echo $number; ?>" style="width: 180px;" /><br />
+			<small><?php _ej( 'Page IDs, separated by commas.' ); ?></small></p>
+			<p><?php _ej( 'Exclude:' ); ?> <input type="text" value="<?php echo $exclude; ?>" name="multi-pages-exclude-<?php echo $number; ?>" id="multi-pages-exclude-<?php echo $number; ?>" style="width: 180px;" /><br />
+			<small><?php _ej( 'Page IDs, separated by commas.' ); ?></small></p>
+			<p><?php _ej( 'Sort by:' ); ?>
 				<select name="multi-pages-sortby-<?php echo $number; ?>" id="multi-pages-sortby-<?php echo $number; ?>">
-					<option value="post_title"<?php selected( $options[$number]['sortby'], 'post_title' ); ?>><?php _e('Page title'); ?></option>
-					<option value="menu_order"<?php selected( $options[$number]['sortby'], 'menu_order' ); ?>><?php _e('Page order'); ?></option>
-					<option value="ID"<?php selected( $options[$number]['sortby'], 'ID' ); ?>><?php _e( 'Page ID' ); ?></option>
+					<option value="post_title"<?php selected( $options[$number]['sortby'], 'post_title' ); ?>><?php _ej('Page title'); ?></option>
+					<option value="menu_order"<?php selected( $options[$number]['sortby'], 'menu_order' ); ?>><?php _ej('Page order'); ?></option>
+					<option value="ID"<?php selected( $options[$number]['sortby'], 'ID' ); ?>><?php _ej( 'Page ID' ); ?></option>
 				</select></p>
 			<input type="hidden" id="multi-pages-submit-<?php echo $number; ?>" name="multi-pages-submit-<?php echo $number; ?>" value="1" />
 		<?php
@@ -227,12 +235,12 @@
 	?>
 		<div class="wrap">
 			<form method="POST">
-				<h2><?php _e('Multi-pages Widgets'); ?></h2>
-				<p style="line-height: 30px;"><?php _e('How many multi-pages widgets would you like?'); ?>
+				<h2><?php _ej('Multi-pages Widgets'); ?></h2>
+				<p style="line-height: 30px;"><?php _ej('How many multi-pages widgets would you like?'); ?>
 				<select id="multi-pages-number" name="multi-pages-number" value="<?php echo $options['number']; ?>">
 	<?php for ( $i = 1; $i < 10; ++$i ) echo "<option value='$i' ".($options['number']==$i ? "selected='selected'" : '').">$i</option>"; ?>
 				</select>
-				<span class="submit"><input type="submit" name="multi-pages-number-submit" id="multi-pages-number-submit" value="<?php echo attribute_escape(__('Save')); ?>" /></span></p>
+				<span class="submit"><input type="submit" name="multi-pages-number-submit" id="multi-pages-number-submit" value="<?php echo attribute_escape(__j('Save')); ?>" /></span></p>
 			</form>
 		</div>
 	<?php
@@ -246,7 +254,7 @@
 		$dims = array('width' => 460, 'height' => 350);
 		$class = array('classname' => 'widget_multi_pages');
 		for ($i = 1; $i <= 9; $i++) {
-			$name = sprintf(__('Multi-pages %d'), $i);
+			$name = sprintf(__j('Multi-pages %d'), $i);
 			$id = "multi-pages-$i"; // Never never never translate an id
 			wp_register_sidebar_widget($id, $name, $i <= $number ? 'wp_widget_multi_pages' : /* unregister */ '', $class, $i);
 			wp_register_widget_control($id, $name, $i <= $number ? 'wp_widget_multi_pages_control' : /* unregister */ '', $dims, $i);
@@ -265,13 +273,13 @@
 		$dims150 = array('height' => 150, 'width' => 300);
 
 		$class['classname'] = 'widget_calendar';
-		wp_register_sidebar_widget('calendar', __('Calendar'), 'widget_jillij_calendar', $class);
+		wp_register_sidebar_widget('calendar', __j('Calendar'), 'widget_jillij_calendar', $class);
 
 		$class['classname'] = 'widget_search';
-		wp_register_sidebar_widget('search', __('Search'), 'widget_jillij_search', $class);
+		wp_register_sidebar_widget('search', __j('Search'), 'widget_jillij_search', $class);
 
 		$class['classname'] = 'widget_categories';
-		wp_register_sidebar_widget('categories', __('Categories'), 'widget_jillij_categories', $class);
+		wp_register_sidebar_widget('categories', __j('Categories'), 'widget_jillij_categories', $class);
 
 		widget_text_register_jillij();
 		wp_widget_multi_pages_register();
@@ -279,7 +287,7 @@
 	}
     else
     	{
-    	register_sidebar_widget(__('Search'), 'widget_jillij_search');
+    	register_sidebar_widget(__j('Search'), 'widget_jillij_search');
     	register_sidebar_widget('Calendar', 'widget_jillij_calendar');
 		register_sidebar_widget('Categories', 'widget_jillij_categories');
 		if ( function_exists('widget_subpagehierarchy') )
@@ -358,4 +366,4 @@
 if ( function_exists('add_custom_image_header') ) {
 	add_custom_image_header('jillij_header_style', 'jillij_admin_header_style');
 }
-?>
\ No newline at end of file
+?>
diff -ru jillij/header.php jillij-nl/header.php
--- jillij/header.php	2007-09-04 14:52:22.000000000 +0200
+++ jillij-nl/header.php	2007-12-23 16:53:06.000000000 +0100
@@ -1,12 +1,13 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
+<?php load_theme_textdomain('jillij'); ?>
 
 <head profile="http://gmpg.org/xfn/11">
 <meta http-equiv="Content-Type" content="<?php bloginfo('html_type'); ?>; charset=<?php bloginfo('charset'); ?>" />
 
 	<title><?php bloginfo('name');
 		if ( is_single() )
-			_e('&raquo; Blog Archive');
+			_ej('&raquo; Blog Archive');
 		wp_title();
 	?></title>
 
@@ -58,4 +59,4 @@
 			<div class="description"><?php bloginfo('description'); ?></div>
 		<?php endif; ?>
 	</div>
-</div>
\ No newline at end of file
+</div>
diff -ru jillij/index.php jillij-nl/index.php
--- jillij/index.php	2007-09-05 20:58:10.000000000 +0200
+++ jillij-nl/index.php	2007-12-23 16:53:09.000000000 +0100
@@ -7,7 +7,7 @@
 		<?php if (is_home() & (!isset($_GET['a']) | $_GET['a']!='phpwebgallery') & function_exists('Photon_random_image_bare')) { ?>
 					<div class="titrePage"><a href="<?php echo PHOTON_GALTITLE; ?>"><?php echo PHOTON_GALTITLE; ?></a></div>
 					<hr/>
-					<h2><?php echo __("Random pictures","photon") ?></h2>
+					<h2><?php echo __j("Random pictures","photon") ?></h2>
 					<?php echo Photon_random_image_bare(PHOTON_NUMBERPICT); ?>
 					<div class="titrePage"><a href="<?php echo get_settings('home'); ?>">Blog</a></div>
 					<hr/>
@@ -19,17 +19,17 @@
 		<?php while (have_posts()) : the_post(); ?>
 
 			<div class="post">
-				<h2 id="post-<?php the_ID(); ?>"><a href="<?php the_permalink() ?>" rel="bookmark" title="<?php printf(__('Permanent Link to %1$s'), the_title()); ?>"><?php the_title(); ?></a></h2>
-				<small><?php the_time(__('F jS, Y')) ?></small>
+				<h2 id="post-<?php the_ID(); ?>"><a href="<?php the_permalink() ?>" rel="bookmark" title="<?php printf(__j('Permanent Link to %1$s'), the_title()); ?>"><?php the_title(); ?></a></h2>
+				<small><?php the_time(__j('F jS, Y')) ?></small>
 				<!-- Alternate version, with author:
-				<small><?php printf(__('%1$s by %2$s'), get_the_time(__('F jS, Y')), the_author('', false)) ?></small>
+				<small><?php printf(__j('%1$s by %2$s'), get_the_time(__j('F jS, Y')), the_author('', false)) ?></small>
 				-->
 
 				<div class="entry">
-					<?php the_content(__('Read the rest of this entry &raquo;')); ?>
+					<?php the_content(__j('Read the rest of this entry &raquo;')); ?>
 				</div>
 
-				<p class="postmetadata"><?php _e('Posted in'); echo ' '; the_category(', ') ?> <strong>|</strong> <?php edit_post_link(__('Edit'),'','<strong>|</strong>'); ?>  <?php comments_popup_link(__('No Comments &#187;'), __('1 Comment &#187;'), __('% Comments &#187;'), '', __('Comments Off')); ?></p>
+				<p class="postmetadata"><?php _ej('Posted in'); echo ' '; the_category(', ') ?> <strong>|</strong> <?php edit_post_link(__j('Edit'),'','<strong>|</strong>'); ?>  <?php comments_popup_link(__j('No Comments &#187;'), __j('1 Comment &#187;'), __j('% Comments &#187;'), '', __j('Comments Off')); ?></p>
 
 				<!--
 				<?php trackback_rdf(); ?>
@@ -40,17 +40,17 @@
 
 		<div class="navigation">
 			<?php if (function_exists('gengo_previous_post_link')) : ?>
-					<div class="alignleft"><?php gengo_next_posts_link(__('&laquo; Previous Entries')) ?></div>
-					<div class="alignright"><?php gengo_previous_posts_link(__('Next Entries &raquo;')) ?></div>
+					<div class="alignleft"><?php gengo_next_posts_link(__j('&laquo; Previous Entries')) ?></div>
+					<div class="alignright"><?php gengo_previous_posts_link(__j('Next Entries &raquo;')) ?></div>
 			<?php else : ?>
-					<div class="alignleft"><?php next_posts_link(__('&laquo; Previous Entries')) ?></div>
-					<div class="alignright"><?php previous_posts_link(__('Next Entries &raquo;')) ?></div>
+					<div class="alignleft"><?php next_posts_link(__j('&laquo; Previous Entries')) ?></div>
+					<div class="alignright"><?php previous_posts_link(__j('Next Entries &raquo;')) ?></div>
 			<?php endif; ?>
 		</div>
 	<?php else : ?>
 
-		<h2 class="center"><?php _e('Not Found'); ?></h2>
-		<p class="center"><?php _e('Sorry, but you are looking for something that isn&#8217;t here.'); ?></p>
+		<h2 class="center"><?php _ej('Not Found'); ?></h2>
+		<p class="center"><?php _ej('Sorry, but you are looking for something that isn&#8217;t here.'); ?></p>
 		<?php include (TEMPLATEPATH . "/searchform.php"); ?>
 
 	<?php endif; ?>
diff -ru jillij/links.php jillij-nl/links.php
--- jillij/links.php	2007-09-04 14:55:12.000000000 +0200
+++ jillij-nl/links.php	2007-12-23 16:53:12.000000000 +0100
@@ -8,7 +8,7 @@
 
 <div id="content" class="widecolumn">
 
-<h2><?php _e("Links"); ?>:</h2>
+<h2><?php _ej("Links"); ?>:</h2>
 <ul>
 <?php get_links_list(); ?>
 </ul>
Only in jillij-nl: nl_NL.mo
Only in jillij-nl: nl_NL.po
diff -ru jillij/page.php jillij-nl/page.php
--- jillij/page.php	2007-09-04 14:55:20.000000000 +0200
+++ jillij-nl/page.php	2007-12-23 16:53:15.000000000 +0100
@@ -6,18 +6,18 @@
 		<div class="post" id="post-<?php the_ID(); ?>">
 		<h2><?php the_title(); ?></h2>
 			<div class="entrytext">
-				<?php the_content('<p class="serif">' . __('Read the rest of this page &raquo;') . '</p>'); ?>
+				<?php the_content('<p class="serif">' . __j('Read the rest of this page &raquo;') . '</p>'); ?>
 			<?php if (function_exists('gengo_link_pages')) : ?>
-					<?php gengo_link_pages('<p><strong>' . __('Pages:') . '</strong> ', '</p>', 'number'); ?>
+					<?php gengo_link_pages('<p><strong>' . __j('Pages:') . '</strong> ', '</p>', 'number'); ?>
 			<?php else : ?>
-					<?php link_pages('<p><strong>' . __('Pages:') . '</strong> ', '</p>', 'number'); ?>
+					<?php link_pages('<p><strong>' . __j('Pages:') . '</strong> ', '</p>', 'number'); ?>
 			<?php endif; ?>
 			</div>
 		</div>
 	  <?php endwhile; endif; ?>
-	<?php edit_post_link(__('Edit this entry.'), '<p>', '</p>'); ?>
+	<?php edit_post_link(__j('Edit this entry.'), '<p>', '</p>'); ?>
 	</div>
 
 <?php get_sidebar(); ?>
 
-<?php get_footer(); ?>
\ No newline at end of file
+<?php get_footer(); ?>
diff -ru jillij/photontemplate.php jillij-nl/photontemplate.php
--- jillij/photontemplate.php	2007-09-04 14:55:26.000000000 +0200
+++ jillij-nl/photontemplate.php	2007-12-23 16:53:18.000000000 +0100
@@ -6,7 +6,7 @@
 		<?php if (is_home() & (!isset($_GET['a']) | $_GET['a']!='phpwebgallery') & function_exists('Photon_random_image_bare')) { ?>
 					<div class="titrePage"><a href="<?php echo PHOTON_GALTITLE; ?>"><?php echo PHOTON_GALTITLE; ?></a></div>
 					<hr/>
-					<h2><?php echo __("Random pictures","photon") ?></h2>
+					<h2><?php echo __j("Random pictures","photon") ?></h2>
 					<?php echo Photon_random_image_bare(PHOTON_NUMBERPICT); ?>
 					<div class="titrePage"><a href="<?php echo get_settings('home'); ?>">Blog</a></div>
 					<hr/>
diff -ru jillij/search.php jillij-nl/search.php
--- jillij/search.php	2007-09-04 14:55:36.000000000 +0200
+++ jillij-nl/search.php	2007-12-23 16:51:18.000000000 +0100
@@ -4,15 +4,15 @@
 
 	<?php if (have_posts()) : ?>
 
-		<h2 class="pagetitle"><?php _e('Search Results'); ?></h2>
+		<h2 class="pagetitle"><?php _ej('Search Results'); ?></h2>
 
 		<div class="navigation">
 			<?php if (function_exists('gengo_previous_post_link')) : ?>
-					<div class="alignleft"><?php gengo_next_posts_link(__('&laquo; Previous Entries')) ?></div>
-					<div class="alignright"><?php gengo_previous_posts_link(__('Next Entries &raquo;')) ?></div>
+					<div class="alignleft"><?php gengo_next_posts_link(__j('&laquo; Previous Entries')) ?></div>
+					<div class="alignright"><?php gengo_previous_posts_link(__j('Next Entries &raquo;')) ?></div>
 			<?php else : ?>
-					<div class="alignleft"><?php next_posts_link(__('&laquo; Previous Entries')) ?></div>
-					<div class="alignright"><?php previous_posts_link(__('Next Entries &raquo;')) ?></div>
+					<div class="alignleft"><?php next_posts_link(__j('&laquo; Previous Entries')) ?></div>
+					<div class="alignright"><?php previous_posts_link(__j('Next Entries &raquo;')) ?></div>
 			<?php endif; ?>
 		</div>
 
@@ -20,12 +20,12 @@
 		<?php while (have_posts()) : the_post(); ?>
 
 			<div class="post">
-				<h3 id="post-<?php the_ID(); ?>"><a href="<?php the_permalink() ?>" rel="bookmark" title="<?php _e('Permanent Link to'); the_title(); ?>"><?php the_title(); ?></a></h3>
-				<small><?php the_time(__('l, F jS, Y')) ?></small>
+				<h3 id="post-<?php the_ID(); ?>"><a href="<?php the_permalink() ?>" rel="bookmark" title="<?php _ej('Permanent Link to'); the_title(); ?>"><?php the_title(); ?></a></h3>
+				<small><?php the_time(__j('l, F jS, Y')) ?></small>
 
 
 
-				<p class="postmetadata"><?php _e('Posted in'); echo ' '; the_category(', ') ?> <strong>|</strong> <?php edit_post_link(__('Edit'),'','<strong>|</strong>'); ?>  <?php comments_popup_link(__('No Comments &#187;'), __('1 Comment &#187;'), __('% Comments &#187;'), '', __('Comments Off')); ?></p>
+				<p class="postmetadata"><?php _ej('Posted in'); echo ' '; the_category(', ') ?> <strong>|</strong> <?php edit_post_link(__j('Edit'),'','<strong>|</strong>'); ?>  <?php comments_popup_link(__j('No Comments &#187;'), __j('1 Comment &#187;'), __j('% Comments &#187;'), '', __j('Comments Off')); ?></p>
 
 
 			</div>
@@ -34,17 +34,17 @@
 
 		<div class="navigation">
 			<?php if (function_exists('gengo_previous_post_link')) : ?>
-					<div class="alignleft"><?php gengo_next_posts_link(__('&laquo; Previous Entries')) ?></div>
-					<div class="alignright"><?php gengo_previous_posts_link(__('Next Entries &raquo;')) ?></div>
+					<div class="alignleft"><?php gengo_next_posts_link(__j('&laquo; Previous Entries')) ?></div>
+					<div class="alignright"><?php gengo_previous_posts_link(__j('Next Entries &raquo;')) ?></div>
 			<?php else : ?>
-					<div class="alignleft"><?php next_posts_link(__('&laquo; Previous Entries')) ?></div>
-					<div class="alignright"><?php previous_posts_link(__('Next Entries &raquo;')) ?></div>
+					<div class="alignleft"><?php next_posts_link(__j('&laquo; Previous Entries')) ?></div>
+					<div class="alignright"><?php previous_posts_link(__j('Next Entries &raquo;')) ?></div>
 			<?php endif; ?>
 		</div>
 
 	<?php else : ?>
 
-		<h2 class="center"><?php _e('No posts found. Try a different search?') ?></h2>
+		<h2 class="center"><?php _ej('No posts found. Try a different search?') ?></h2>
 		<?php include (TEMPLATEPATH . '/searchform.php'); ?>
 
 	<?php endif; ?>
@@ -53,4 +53,4 @@
 
 <?php get_sidebar(); ?>
 
-<?php get_footer(); ?>
\ No newline at end of file
+<?php get_footer(); ?>
diff -ru jillij/searchform.php jillij-nl/searchform.php
--- jillij/searchform.php	2007-09-04 14:52:30.000000000 +0200
+++ jillij-nl/searchform.php	2007-12-23 16:52:25.000000000 +0100
@@ -1,5 +1,5 @@
 <form method="get" id="searchform" action="<?php bloginfo('home'); ?>/">
 <div><input type="text" value="<?php echo wp_specialchars($s, 1); ?>" name="s" id="s" />
-<input type="submit" id="searchsubmit" value="<?php _e('Search'); ?>" />
+<input type="submit" id="searchsubmit" value="<?php _ej('Search'); ?>" />
 </div>
 </form>
diff -ru jillij/sidebar.php jillij-nl/sidebar.php
--- jillij/sidebar.php	2007-09-04 14:52:30.000000000 +0200
+++ jillij-nl/sidebar.php	2007-12-23 16:53:26.000000000 +0100
@@ -3,9 +3,9 @@
 				<?php if ( !function_exists('dynamic_sidebar')
         || !dynamic_sidebar() ) : ?>
 
-			<?php wp_list_pages('title_li='.__('Pages') ); ?>
+			<?php wp_list_pages('title_li='.__j('Pages') ); ?>
 
-			<li class="LargeMenu"><?php _e('Archives'); ?>
+			<li class="LargeMenu"><?php _ej('Archives'); ?>
 				<ul>
 					<li>
 					<?php get_calendar(); ?>
@@ -13,7 +13,7 @@
 				</ul>
 			</li>
 
-			<?php wp_list_categories('title_li='.__('Categories').'&show_count=1&orderby=name&hierarchical=1' ); ?>
+			<?php wp_list_categories('title_li='.__j('Categories').'&show_count=1&orderby=name&hierarchical=1' ); ?>
 
 			<?php
 			if (get_bloginfo('version')<'2.1')
@@ -22,7 +22,7 @@
 				}
 			else
 				{
-				wp_list_bookmarks('title_li='.__('Bookmarks').'');
+				wp_list_bookmarks('title_li='.__j('Bookmarks').'');
 				}
 			?>
 
@@ -32,19 +32,19 @@
 				}
 			?>
 
-			<li><?php _e('Meta'); ?>
+			<li><?php _ej('Meta'); ?>
 				<ul>
 					<?php wp_register(); ?>
 					<li><?php wp_loginout(); ?></li>
-					<li><a href="http://validator.w3.org/check/referer" title="<?php _e('This page validates as XHTML 1.0 Transitional'); ?>"><?php _e('Valid <abbr title="eXtensible HyperText Markup Language">XHTML</abbr>'); ?></a></li>
-					<li><a href="http://gmpg.org/xfn/"><?php _e('<abbr title="XHTML Friends Network">XFN</abbr>'); ?></a></li>
+					<li><a href="http://validator.w3.org/check/referer" title="<?php _ej('This page validates as XHTML 1.0 Transitional'); ?>"><?php _ej('Valid <abbr title="eXtensible HyperText Markup Language">XHTML</abbr>'); ?></a></li>
+					<li><a href="http://gmpg.org/xfn/"><?php _ej('<abbr title="XHTML Friends Network">XFN</abbr>'); ?></a></li>
 					<?php wp_meta(); ?>
 				</ul>
 			</li>
 
 
 
-			<li class="LargeMenu"><?php _e('Search'); ?>
+			<li class="LargeMenu"><?php _ej('Search'); ?>
 				<ul>
 					<li><?php include (TEMPLATEPATH . "/searchform.php"); ?>
 					</li>
@@ -53,7 +53,7 @@
 
 			<?php if (function_exists('gengo_list_languages'))
 				{
-				echo '<li>'.__('Languages', GENGO_DOMAIN).'<ul>';
+				echo '<li>'.__j('Languages', GENGO_DOMAIN).'<ul>';
 				echo gengo_list_languages();
 				echo '</ul></li>';
 				}
@@ -62,4 +62,4 @@
 			<?php endif; ?>
 		</ul>
 
-</div>
\ No newline at end of file
+</div>
diff -ru jillij/single.php jillij-nl/single.php
--- jillij/single.php	2007-09-04 14:53:50.000000000 +0200
+++ jillij-nl/single.php	2007-12-23 16:53:29.000000000 +0100
@@ -5,42 +5,42 @@
   <?php if (have_posts()) : while (have_posts()) : the_post(); ?>
 
 		<div class="navigation">
-			<div class="alignleft"><?php previous_post_link( __('&laquo; %link')) ?></div>
-			<div class="alignright"><?php next_post_link(__('%link &raquo;')) ?></div>
+			<div class="alignleft"><?php previous_post_link( __j('&laquo; %link')) ?></div>
+			<div class="alignright"><?php next_post_link(__j('%link &raquo;')) ?></div>
 		</div>
 
 		<div class="post" id="post-<?php the_ID(); ?>">
-			<h2><a href="<?php echo get_permalink() ?>" rel="bookmark" title="<?php _e('Permanent Link:'); ?> <?php the_title(); ?>"><?php the_title(); ?></a></h2>
+			<h2><a href="<?php echo get_permalink() ?>" rel="bookmark" title="<?php _ej('Permanent Link:'); ?> <?php the_title(); ?>"><?php the_title(); ?></a></h2>
 
 			<div class="entrytext">
-				<?php the_content('<p class="serif">'.__('Read the rest of this entry &raquo;').'</p>'); ?>
+				<?php the_content('<p class="serif">'.__j('Read the rest of this entry &raquo;').'</p>'); ?>
 				<?php if (function_exists('gengo_link_pages')) : ?>
-					<?php gengo_link_pages('<p><strong>'.__('Pages:').'</strong> ', '</p>', 'number'); ?>
+					<?php gengo_link_pages('<p><strong>'.__j('Pages:').'</strong> ', '</p>', 'number'); ?>
 				<?php else : ?>
-					<?php link_pages('<p><strong>'.__('Pages:').'</strong> ', '</p>', 'number'); ?>
+					<?php link_pages('<p><strong>'.__j('Pages:').'</strong> ', '</p>', 'number'); ?>
 				<?php endif; ?>
 
 				<p class="postmetadata alt">
 					<small>
-					<?php printf(__('This entry was posted on %1$s at %2$s and is filed under %3$s. You can follow any responses to this entry through the <a href="%4$s">RSS 2.0</a> feed.'), get_the_time(__('l, F jS, Y')), get_the_time(__('g:i a')), get_the_category_list(', '), get_bloginfo_rss('comments_rss2_url')); ?>
+					<?php printf(__j('This entry was posted on %1$s at %2$s and is filed under %3$s. You can follow any responses to this entry through the <a href="%4$s">RSS 2.0</a> feed.'), get_the_time(__j('l, F jS, Y')), get_the_time(__j('g:i a')), get_the_category_list(', '), get_bloginfo_rss('comments_rss2_url')); ?>
 
 						<?php if (('open' == $post-> comment_status) && ('open' == $post->ping_status)) {
 							// Both Comments and Pings are open
-							printf(__('You can <a href="#respond">leave a response</a>, or <a href="%1$s">trackback</a> from your own site. '), trackback_url(false));
+							printf(__j('You can <a href="#respond">leave a response</a>, or <a href="%1$s">trackback</a> from your own site. '), trackback_url(false));
 						?>
 						<?php } elseif (!('open' == $post-> comment_status) && ('open' == $post->ping_status)) {
 							// Only Pings are Open
-							printf(__('Responses are currently closed, but you can <a href="%1$s">trackback</a> from your own site.'), trackback_url(false));
+							printf(__j('Responses are currently closed, but you can <a href="%1$s">trackback</a> from your own site.'), trackback_url(false));
 						?>
 						<?php } elseif (('open' == $post-> comment_status) && !('open' == $post->ping_status)) {
 							// Comments are open, Pings are not
-							_e('You can skip to the end and leave a response. Pinging is currently not allowed.');
+							_ej('You can skip to the end and leave a response. Pinging is currently not allowed.');
 						?>
 						<?php } elseif (!('open' == $post-> comment_status) && !('open' == $post->ping_status)) {
 							// Neither Comments, nor Pings are open
-							_e('Both comments and pings are currently closed.');
+							_ej('Both comments and pings are currently closed.');
 						?>
-					<?php } edit_post_link(__('Edit this entry.'),'',''); ?>
+					<?php } edit_post_link(__j('Edit this entry.'),'',''); ?>
 
 					</small>
 				</p>
@@ -52,7 +52,7 @@
 
 	<?php endwhile; else: ?>
 
-		<p><?php _e('Sorry, no posts matched your criteria.'); ?></p>
+		<p><?php _ej('Sorry, no posts matched your criteria.'); ?></p>
 
 <?php endif; ?>