diff --git a/lang/en_US.ini b/lang/en_US.ini
index e4e8f8c..783184b 100644
--- a/lang/en_US.ini
+++ b/lang/en_US.ini
@@ -252,7 +252,7 @@ Page="Page"
 of="of"
 Edit_post="Edit"
 View_post="View"
-Posts_by="Posts by"
+Posts_by="Post by"
 Pages="Pages"
 Menu="Menu"
 Popular="Popular"
diff --git a/lang/id_ID.ini b/lang/id_ID.ini
index 82b5cbc..9f2e801 100644
--- a/lang/id_ID.ini
+++ b/lang/id_ID.ini
@@ -252,7 +252,7 @@ Page="Halaman"
 of="Dari"
 Edit_post="Ubah"
 View_post="Lihat"
-Posts_by="Posts by"
+Posts_by="Postingan oleh"
 Pages="Halaman"
 Menu="Menu"
 Popular="Populer"
diff --git a/themes/blog/layout.html.php b/themes/blog/layout.html.php
index 77a6340..d27aa26 100644
--- a/themes/blog/layout.html.php
+++ b/themes/blog/layout.html.php
@@ -90,7 +90,7 @@
             <div class="secondary col-md-4 col-sm-12 col-xs-12">
                 <aside class="aside section">
                     <div class="section-inner">
-                        <h2 class="heading">About</h2>
+                        <h2 class="heading"><?php echo i18n("About");?></h2>
                         <div class="content">
                          <?php echo blog_description();?>                                  
                         </div><!--//content-->  
@@ -100,15 +100,15 @@
                     <div class="section-inner">
                         <!-- Tab nav -->
                         <ul class="nav nav-tabs" role="tablist">
-                            <li role="presentation" class="active"><a href="#recent-posts" aria-controls="recent-posts" role="tab" data-toggle="tab">Recent Posts</a></li>
+                            <li role="presentation" class="active"><a href="#recent-posts" aria-controls="recent-posts" role="tab" data-toggle="tab"><?php echo i18n("Recent_posts");?></a></li>
                             <?php if (config('views.counter') === 'true') :?>
-                            <li role="presentation"><a href="#popular-posts" aria-controls="popular-posts" role="tab" data-toggle="tab">Popular Posts</a></li>
+                            <li role="presentation"><a href="#popular-posts" aria-controls="popular-posts" role="tab" data-toggle="tab"><?php echo i18n("Popular_posts");?></a></li>
                             <?php endif;?>
                         </ul>
                         <!-- Tab content -->
                         <div class="tab-content">
                             <div role="tabpanel" class="tab-pane active" id="recent-posts">
-                                <h2 class="hide">Recent Posts</h2>
+                                <h2 class="hide"><?php echo i18n("Recent_Posts");?></h2>
                                 <?php $lists = recent_posts(true);?>
                                 <?php $char = 60;?>
                                 <?php foreach ($lists as $l):?>
@@ -117,14 +117,14 @@
                                         <h3 class="title"><a href="<?php echo $l->url;?>"><?php echo $recentTitle;?></a></h3>
                                         <div class="content">
                                         <p><?php echo shorten($l->body, 75); ?>...</p>
-                                        <a class="more-link" href="<?php echo $l->url;?>"><i class="fa fa-link"></i> Read more</a>
+                                        <a class="more-link" href="<?php echo $l->url;?>"><i class="fa fa-link"></i> <?php echo i18n("read_more");?></a>
                                         </div><!--//content-->
                                     </div>
                                 <?php endforeach;?>
                             </div>
                             <?php if (config('views.counter') === 'true') :?>
                             <div role="tabpanel" class="tab-pane" id="popular-posts">
-                                <h2 class="hide">Popular Posts</h2>
+                                <h2 class="hide"><?php echo i18n("Popular_posts");?></h2>
                                 <?php $lists = popular_posts(true);?>
                                 <?php $char = 60;?>
                                 <?php foreach ($lists as $l):?>
@@ -133,7 +133,7 @@
                                         <h3 class="title"><a href="<?php echo $l->url;?>"><?php echo $recentTitle;?></a></h3>
                                         <div class="content">
                                         <p><?php echo shorten($l->body, 75); ?>...</p>
-                                        <a class="more-link" href="<?php echo $l->url;?>"><i class="fa fa-link"></i> Read more</a>
+                                        <a class="more-link" href="<?php echo $l->url;?>"><i class="fa fa-link"></i> <?php echo i18n("read_more");?></a>
                                         </div><!--//content-->
                                     </div>
                                 <?php endforeach;?>
@@ -145,7 +145,7 @@
                 <?php if (disqus()): ?>
                 <aside class="comments aside section">
                     <div class="section-inner">
-                        <h2 class="heading">Comments</h2>
+                        <h2 class="heading"><?php echo i18n("Comments");?></h2>
                         <div class="content">
                             <?php echo recent_comments() ?>
                             <style>.dsq-widget-list {padding:0;}li.dsq-widget-item {color:#434343;border-bottom: 1px dotted #d9d9d9;margin: 0 0 10px;padding-bottom: 10px;font-size:14px;}li.dsq-widget-item:last-child{border-bottom:none;margin-bottom:0;}a.dsq-widget-user {font-weight:normal;}img.dsq-widget-avatar {margin-right:10px; }.dsq-widget-comment {display:block;padding-top:5px;}.dsq-widget-comment p {display:block;margin:0;padding:0!important;font-size:14px!important;}p.dsq-widget-meta {padding-top:5px!important;margin:0;font-size:14px!important;}#dsq-combo-widget.grey #dsq-combo-content .dsq-combo-box {background: transparent;}#dsq-combo-widget.grey #dsq-combo-tabs li {background: #DDDDDD;}</style>
@@ -155,7 +155,7 @@
                 <?php endif; ?>
                 <aside class="archive aside section">
                     <div class="section-inner">
-                        <h2 class="heading">Archive</h2>
+                        <h2 class="heading"><?php echo i18n("Archives");?></h2>
                         <div class="content">
                             <?php echo archive_list();?>
                         </div><!--//content-->
diff --git a/themes/blog/main.html.php b/themes/blog/main.html.php
index 1355d8b..ffefce6 100644
--- a/themes/blog/main.html.php
+++ b/themes/blog/main.html.php
@@ -59,13 +59,13 @@
                         <h2 class="title" itemprop="headline"><a href="<?php echo $p->url;?>"><?php echo $p->title;?></a></h2>
                     <?php } ?>
                     <p class="meta">
-                        <span class="date" itemprop="datePublished"><?php echo format_date($p->date) ?></span> - Posted in 
-                        <span itemprop="articleSection"><?php echo $p->category;?></span> by 
+                        <span class="date" itemprop="datePublished"><?php echo format_date($p->date) ?></span> - <?php echo i18n("Posted_in");?> 
+                        <span itemprop="articleSection"><?php echo $p->category;?></span> <?php echo i18n("by");?> 
                         <span class="author" itemprop="author"><a href="<?php echo $p->authorUrl;?>"><?php echo $p->authorName;?></a></span>
                         <?php if (disqus_count()) { ?> 
-                            with <span><i class="fa fa-comments"></i> <a href="<?php echo $p->url ?>#disqus_thread"> comments</a></span>
+                            - <span><i class="fa fa-comments"></i> <a href="<?php echo $p->url ?>#disqus_thread"> <?php echo i18n("Comments");?></a></span>
                         <?php } elseif (facebook()) { ?> 
-                            with <i class="fa fa-comments"></i> <a href="<?php echo $p->url ?>#comments"><span><fb:comments-count href=<?php echo $p->url ?>></fb:comments-count> comments</span></a>
+                            - <i class="fa fa-comments"></i> <a href="<?php echo $p->url ?>#comments"><span><fb:comments-count href=<?php echo $p->url ?>></fb:comments-count> <?php echo i18n("Comments");?></span></a>
                         <?php } ?>
 						<?php if (login()) { echo ' - <span><a href="'. $p->url .'/edit?destination=post">Edit</a></span>'; } ?>
                     </p>
diff --git a/themes/blog/post.html.php b/themes/blog/post.html.php
index 829ac4e..e24d3c1 100644
--- a/themes/blog/post.html.php
+++ b/themes/blog/post.html.php
@@ -34,8 +34,8 @@
 						<h1 class="title" itemprop="headline"><?php echo $p->title;?></h1>
 					<?php } ?>
                     <p class="meta">
-                        <span class="date" itemprop="datePublished"><?php echo format_date($p->date) ?></span> - Posted in 
-                        <span itemprop="articleSection"><?php echo $p->category;?></span> by 
+                        <span class="date" itemprop="datePublished"><?php echo format_date($p->date) ?></span> - <?php echo i18n("Posted_in");?> 
+                        <span itemprop="articleSection"><?php echo $p->category;?></span> <?php echo i18n("by");?> 
                         <span itemprop="author"><a href="<?php echo $p->authorUrl;?>"><?php echo $p->authorName;?></a></span>
                     </p>
                 </div>
@@ -45,9 +45,9 @@
                 <div style="margin-top:30px;position:relative;">
                     <span class="tags"><i class="fa fa-tags"></i> <?php echo $p->tag;?></span> 
                     <?php if (disqus_count()) { ?>
-                        <span><i class="fa fa-comments"></i> <a href="<?php echo $p->url ?>#disqus_thread"> comments</a></span>
+                        <span><i class="fa fa-comments"></i> <a href="<?php echo $p->url ?>#disqus_thread"> <?php echo i18n("Comments");?></a></span>
                     <?php } elseif (facebook()) { ?>
-                        <i class="fa fa-comments"></i> <a href="<?php echo $p->url ?>#comments"><span><fb:comments-count href=<?php echo $p->url ?>></fb:comments-count> comments</span></a>
+                        <i class="fa fa-comments"></i> <a href="<?php echo $p->url ?>#comments"><span><fb:comments-count href=<?php echo $p->url ?>></fb:comments-count> <?php echo i18n("Comments");?></span></a>
                     <?php } ?>
                     <span class="share pull-right">
                         <a target="_blank" class="first" href="https://www.facebook.com/sharer.php?u=<?php echo $p->url ?>&t=<?php echo $p->title ?>"><i class="fa fa-facebook"></i></a> 
@@ -58,10 +58,10 @@
                 <div style="margin-top:30px;position:relative;">
                     <hr>
                     <?php if (!empty($next)): ?>
-                        <span class="newer"><a href="<?php echo($next['url']); ?>" rel="next"><i class="fa fa-long-arrow-left"></i> Next Post</a></span>
+                        <span class="newer"><a href="<?php echo($next['url']); ?>" rel="next"><i class="fa fa-long-arrow-left"></i> <?php echo i18n("Next");?></a></span>
                     <?php endif; ?>
                     <?php if (!empty($prev)): ?>
-                        <span class="older pull-right"><a href="<?php echo($prev['url']); ?>" rel="prev">Previous Post <i class="fa fa-long-arrow-right"></i></a></span>
+                        <span class="older pull-right"><a href="<?php echo($prev['url']); ?>" rel="prev"><?php echo i18n("Prev");?> <i class="fa fa-long-arrow-right"></i></a></span>
                     <?php endif; ?>
                     <div style="clear:both;"></div>
                 </div>
@@ -75,13 +75,13 @@
                 <?php $char = 30; $total = count($tags); $i = 1; if ($total >= 1) { ?>
                     <div class="related related-posts" style="margin-top:30px;position:relative;">
                         <hr>
-                        <h2 class="heading">Related Posts</h2>
+                        <h2 class="heading"><?php echo i18n("Related_posts");?></h2>
                         <?php foreach ($tags as $t):?>
                             <div class="item col-md-4">
                                 <?php if (strlen(strip_tags($t->title)) > $char) { $relatedTitle = shorten($t->title, $char) . '...';} else {$relatedTitle = $t->title;}?>
                                 <h3 class="title"><a href="<?php echo $t->url;?>"><?php echo $relatedTitle;?></a></h3>
                                 <div class="content">
-                                    <p><?php echo shorten($t->body, 60); ?>... <a class="more-link" href="<?php echo $t->url;?>">more</a></p>
+                                    <p><?php echo shorten($t->body, 60); ?>... <a class="more-link" href="<?php echo $t->url;?>"><?php echo i18n("read_more");?></a></p>
                                 </div><!--//content-->
                             </div>
                             <?php if ($i++ >= config('related.count')) break; ?>
diff --git a/themes/blog/profile.html.php b/themes/blog/profile.html.php
index 049d5a4..d05b574 100644
--- a/themes/blog/profile.html.php
+++ b/themes/blog/profile.html.php
@@ -10,13 +10,13 @@
                 <div class="desc text-left" itemprop="description">                                    
                     <?php echo $about; ?>
                 </div><!--//desc-->
-                <h3>Posts by this author</h3>
+                <h3><?php echo i18n("Post_by_author");?></h3>
                 <?php if (!empty($posts)) { ?>
                     <ul class="post-list">
                         <?php foreach ($posts as $p): ?>
                             <li class="item">
-                                <span><a href="<?php echo $p->url ?>"><?php echo $p->title ?></a></span> on
-                                <span><?php echo format_date($p->date) ?></span> - Posted in <span><?php echo $p->category ?></span>
+                                <span><a href="<?php echo $p->url ?>"><?php echo $p->title ?></a></span> -
+                                <span><?php echo format_date($p->date) ?></span> - <?php echo i18n("Posted_in");?> <span><?php echo $p->category ?></span>
                             </li>
                         <?php endforeach; ?>
                     </ul>
diff --git a/themes/clean/main.html.php b/themes/clean/main.html.php
index 92dd948..030e780 100644
--- a/themes/clean/main.html.php
+++ b/themes/clean/main.html.php
@@ -30,13 +30,13 @@
                 <h2 class="title-index" itemprop="name"><a href="<?php echo $p->url ?>"><?php echo $p->title ?></a></h2>
             <?php } ?>
             <div class="date">
-                <span itemprop="datePublished"><?php echo format_date($p->date) ?></span> - Posted in
-                <span itemprop="articleSection"><?php echo $p->category ?></span> by
+                <span itemprop="datePublished"><?php echo format_date($p->date) ?></span> - <?php echo i18n("Posted_in");?>
+                <span itemprop="articleSection"><?php echo $p->category ?></span> <?php echo i18n("by");?>
                 <span itemprop="author"><a href="<?php echo $p->authorUrl ?>"><?php echo $p->authorName; ?></a></span>
                 <?php if (disqus_count()) { ?> - 
-                    <span><a href="<?php echo $p->url ?>#disqus_thread">Comments</a></span>
+                    <span><a href="<?php echo $p->url ?>#disqus_thread"><?php echo i18n("Comments");?></a></span>
                 <?php } elseif (facebook()) { ?> -
-                    <a href="<?php echo $p->url ?>#comments"><span><fb:comments-count href=<?php echo $p->url ?>></fb:comments-count> Comments</span></a>
+                    <a href="<?php echo $p->url ?>#comments"><span><fb:comments-count href=<?php echo $p->url ?>></fb:comments-count> <?php echo i18n("Comments");?></span></a>
                 <?php } ?>
 				<?php if (login()) { echo ' - <span><a href="'. $p->url .'/edit?destination=post">Edit</a></span>'; } ?>
             </div>
@@ -71,11 +71,11 @@
 <?php if (!empty($pagination['prev']) || !empty($pagination['next'])): ?>
     <div class="pager">
         <?php if (!empty($pagination['prev'])): ?>
-            <span><a href="?page=<?php echo $page - 1 ?>" class="pagination-arrow newer" rel="prev">Newer</a></span>
+            <span><a href="?page=<?php echo $page - 1 ?>" class="pagination-arrow newer" rel="prev"><?php echo i18n('Newer'); ?></a></span>
         <?php endif; ?>
          <span class="page-number"><?php echo $pagination['pagenum']; ?></span>
         <?php if (!empty($pagination['next'])): ?>
-            <span><a href="?page=<?php echo $page + 1 ?>" class="pagination-arrow older" rel="next">Older</a></span>
+            <span><a href="?page=<?php echo $page + 1 ?>" class="pagination-arrow older" rel="next"><?php echo i18n('Older'); ?></a></span>
         <?php endif; ?>
     </div>
 <?php endif; ?>
diff --git a/themes/clean/post.html.php b/themes/clean/post.html.php
index 8064d42..7d2721f 100644
--- a/themes/clean/post.html.php
+++ b/themes/clean/post.html.php
@@ -13,8 +13,8 @@
         <?php } ?>
         <div class="date">
             <span itemprop="datePublished"><a href="<?php echo $p->archive ?>" title="Show all posts made on this month"><?php echo format_date($p->date) ?></a></span>
-            - Posted in
-            <span itemprop="articleSection"><?php echo $p->category ?></span> by
+            - <?php echo i18n('Posted_in'); ?>
+            <span itemprop="articleSection"><?php echo $p->category ?></span> <?php echo i18n('by'); ?>
             <span itemprop="author"><a href="<?php echo $p->authorUrl ?>"><?php echo $p->authorName; ?></a></span> -
             <span><a href="<?php echo $p->url ?>" rel="permalink">Permalink</a></span>
         </div>
@@ -41,12 +41,12 @@
         <div class="post-body" itemprop="articleBody">
             <?php echo $p->body; ?>
         </div>
-        <div class="tags"><strong>Tags:</strong> <?php echo $p->tag;?></div>
+        <div class="tags"><strong><?php echo i18n('Tags'); ?>:</strong> <?php echo $p->tag;?></div>
     </div>
     <div class="separator">&rarr;</div>
     <div class="share-box">
         <div class="author-info">
-            <h4>By <strong><?php echo $author->name ?></strong></h4>
+            <h4><?php echo i18n('Posts_by'); ?> <strong><?php echo $author->name ?></strong></h4>
             <?php echo $author->about ?>
         </div>
         <div class="share">
@@ -58,7 +58,7 @@
         </div>
     </div>
     <div class="related">
-        <h4>Related posts</h4>
+        <h4><?php echo i18n('Related_posts'); ?></h4>
         <?php echo get_related($p->related)?>
     </div>
     <div id="comments" class="comments border">
diff --git a/themes/clean/profile.html.php b/themes/clean/profile.html.php
index 08581bb..63c0238 100644
--- a/themes/clean/profile.html.php
+++ b/themes/clean/profile.html.php
@@ -8,13 +8,13 @@
         <div class="bio" itemprop="description"><?php echo $about ?></div>
     </div>
 </div>
-<h2 class="post-index">Posts by this author</h2>
+<h2 class="post-index"><?php echo i18n("Post_by_author");?></h2>
 <?php if (!empty($posts)) { ?>
     <ul class="post-list">
         <?php foreach ($posts as $p): ?>
             <li class="item">
-                <span><a href="<?php echo $p->url ?>"><?php echo $p->title ?></a></span> on
-                <span><?php echo format_date($p->date) ?></span> - Posted in <span><?php echo $p->category; ?></span>
+                <span><a href="<?php echo $p->url ?>"><?php echo $p->title ?></a></span> -
+                <span><?php echo format_date($p->date) ?></span> - <?php echo i18n("Posted_in");?> <span><?php echo $p->category; ?></span>
             </li>
         <?php endforeach; ?>
     </ul>
diff --git a/themes/logs/layout.html.php b/themes/logs/layout.html.php
index f8bcd39..43300b0 100644
--- a/themes/logs/layout.html.php
+++ b/themes/logs/layout.html.php
@@ -45,30 +45,30 @@
             </section>
             <aside id="sidebar">
                 <div class="about">
-                    <h3>About</h3>
+                    <h3><?php echo i18n('About');?></h3>
                     <p><?php echo blog_description() ?></p>
                 </div>
                 <div class="social">
-                    <h3>Follow</h3>
+                    <h3><?php echo i18n('Follow');?></h3>
                     <?php echo social() ?>
                 </div>
                 <div class="recent">
-                    <h3>Recent Posts</h3>
+                    <h3><?php echo i18n('Recent_posts');?></h3>
                     <?php echo recent_posts() ?>
                 </div>
                 <?php if(config('views.counter') === 'true') :?>
                 <div class="popular">
-                    <h3>Popular Posts</h3>
+                    <h3><?php echo i18n('Popular_posts');?></h3>
                     <?php echo popular_posts() ?>
                 </div>
                 <?php endif;?>
                 <div class="archive">
-                    <h3>Archive</h3>
+                    <h3><?php echo i18n('Archives');?></h3>
                     <?php echo archive_list() ?>
                 </div>
                 <?php if (disqus()): ?>
                     <div class="comments">
-                        <h3>Comments</h3>                    
+                        <h3><?php echo i18n('Comments');?></h3>                    
                         <?php echo recent_comments() ?>
                         <style>li.dsq-widget-item {border-bottom: 1px solid #ebebeb;margin:0;margin-bottom:10px;padding:0;padding-bottom:10px;}a.dsq-widget-user {font-weight:normal;}img.dsq-widget-avatar {margin-right:10px; }.dsq-widget-comment {display:block;padding-top:5px;}.dsq-widget-comment p {display:block;margin:0;}p.dsq-widget-meta {padding-top:5px;margin:0;}#dsq-combo-widget.grey #dsq-combo-content .dsq-combo-box {background: transparent;}#dsq-combo-widget.grey #dsq-combo-tabs li {background: none repeat scroll 0 0 #DDDDDD;}</style>
                     </div>
diff --git a/themes/logs/main.html.php b/themes/logs/main.html.php
index cd8645c..8e0fea5 100644
--- a/themes/logs/main.html.php
+++ b/themes/logs/main.html.php
@@ -21,13 +21,13 @@
                 <h2 class="title-index" itemprop="name"><a href="<?php echo $p->url ?>"><?php echo $p->title ?></a></h2>
             <?php } ?>
             <div class="date">
-                <span itemprop="datePublished"><?php echo format_date($p->date) ?></span> - Posted in
-                <span itemprop="articleSection"><?php echo $p->category ?></span> by
+                <span itemprop="datePublished"><?php echo format_date($p->date) ?></span> - <?php echo i18n('Posted_in');?>
+                <span itemprop="articleSection"><?php echo $p->category ?></span> <?php echo i18n('by');?>
                 <span itemprop="author"><a href="<?php echo $p->authorUrl ?>"><?php echo $p->authorName; ?></a></span>
                 <?php if (disqus_count()) { ?> - 
-                    <span><a href="<?php echo $p->url ?>#disqus_thread">Comments</a></span>
+                    <span><a href="<?php echo $p->url ?>#disqus_thread"><?php echo i18n('Comments');?></a></span>
                 <?php } elseif (facebook()) { ?> - 
-                    <a href="<?php echo $p->url ?>#comments"><span><fb:comments-count href=<?php echo $p->url ?>></fb:comments-count> Comments</span></a>
+                    <a href="<?php echo $p->url ?>#comments"><span><fb:comments-count href=<?php echo $p->url ?>></fb:comments-count> <?php echo i18n('Comments');?></span></a>
                 <?php } ?>
 				<?php if (login()) { echo ' - <span><a href="'. $p->url .'/edit?destination=post">Edit</a></span>'; } ?>
             </div>
@@ -62,11 +62,11 @@
 <?php if (!empty($pagination['prev']) || !empty($pagination['next'])): ?>
     <div class="pager">
         <?php if (!empty($pagination['prev'])): ?>
-            <span class="newer" ><a href="?page=<?php echo $page - 1 ?>" rel="prev">&laquo; Newer</a></span>
+            <span class="newer" ><a href="?page=<?php echo $page - 1 ?>" rel="prev">&laquo; <?php echo i18n('Newer');?></a></span>
         <?php endif; ?>
         <span class="page-number"><?php echo $pagination['pagenum'];?></span>
         <?php if (!empty($pagination['next'])): ?>
-            <span class="older"><a href="?page=<?php echo $page + 1 ?>" rel="next">Older  &raquo;</a></span>
+            <span class="older"><a href="?page=<?php echo $page + 1 ?>" rel="next"><?php echo i18n('Older');?>  &raquo;</a></span>
         <?php endif; ?>
     </div>
 <?php endif; ?>
diff --git a/themes/logs/post.html.php b/themes/logs/post.html.php
index e651293..8271fac 100644
--- a/themes/logs/post.html.php
+++ b/themes/logs/post.html.php
@@ -13,8 +13,8 @@
             <?php } ?>
         <div class="date">
             <span itemprop="datePublished"><a href="<?php echo $p->archive ?>" title="Show all posts made on this month"><?php echo format_date($p->date) ?></a></span>
-            - Posted in
-            <span itemprop="articleSection"><?php echo $p->category ?></span> by
+            - <?php echo i18n('Posted_in');?>
+            <span itemprop="articleSection"><?php echo $p->category ?></span> <?php echo i18n('by');?>
             <span itemprop="author"><a href="<?php echo $p->authorUrl ?>"><?php echo $p->authorName; ?></a></span> -
             <span><a href="<?php echo $p->url ?>" rel="permalink">Permalink</a></span>
         </div>
@@ -41,12 +41,12 @@
         <div class="post-body" itemprop="articleBody">
             <?php echo $p->body; ?>
         </div>
-        <div class="tags"><strong>Tags:</strong> <?php echo $p->tag;?></div>
+        <div class="tags"><strong><?php echo i18n('Tags');?></strong> <?php echo $p->tag;?></div>
     </div>
     <div class="separator">&rarr;</div>
     <div class="share-box">
         <div class="author-info">
-            <h4>By <strong><?php echo $author->name ?></strong></h4>
+            <h4><?php echo i18n('Posts_by');?> <strong><?php echo $author->name ?></strong></h4>
             <?php echo $author->about ?>
         </div>
                 <div class="share">
@@ -58,7 +58,7 @@
         </div>
     </div>
     <div class="related">
-        <h4>Related posts</h4>
+        <h4><?php echo i18n('Related_posts');?></h4>
         <?php echo get_related($p->related)?>
     </div>
     <div id="comments" class="comments border">
diff --git a/themes/logs/profile.html.php b/themes/logs/profile.html.php
index 58e681a..30310e5 100644
--- a/themes/logs/profile.html.php
+++ b/themes/logs/profile.html.php
@@ -8,24 +8,24 @@
         <div class="bio" itemprop="description"><?php echo $about ?></div>
     </div>
 </div>
-<h2 class="post-index">Posts by this author</h2>
+<h2 class="post-index"><?php echo i18n('Post_by_author');?></h2>
 <?php if (!empty($posts)) { ?>
     <ul class="post-list">
         <?php foreach ($posts as $p): ?>
             <li class="item">
-                <span><a href="<?php echo $p->url ?>"><?php echo $p->title ?></a></span> on
-                <span><?php echo format_date($p->date) ?></span> - Posted in <span><?php echo $p->category; ?></span>
+                <span><a href="<?php echo $p->url ?>"><?php echo $p->title ?></a></span> <?php echo i18n('by');?>
+                <span><?php echo format_date($p->date) ?></span> - <?php echo i18n('Posted_in');?> <span><?php echo $p->category; ?></span>
             </li>
         <?php endforeach; ?>
     </ul>
     <?php if (!empty($pagination['prev']) || !empty($pagination['next'])): ?>
         <div class="pager">
             <?php if (!empty($pagination['prev'])): ?>
-                <span class="newer" ><a href="?page=<?php echo $page - 1 ?>" rel="prev">&laquo; Newer</a></span>
+                <span class="newer" ><a href="?page=<?php echo $page - 1 ?>" rel="prev">&laquo; <?php echo i18n('Newer');?></a></span>
             <?php endif; ?>
             <span class="page-number"><?php echo $pagination['pagenum'];?></span>
             <?php if (!empty($pagination['next'])): ?>
-                <span class="older"><a href="?page=<?php echo $page + 1 ?>" rel="next">Older  &raquo;</a></span>
+                <span class="older"><a href="?page=<?php echo $page + 1 ?>" rel="next"><?php echo i18n('Older');?>  &raquo;</a></span>
             <?php endif; ?>
         </div>
     <?php endif; ?>
diff --git a/themes/readable/main.html.php b/themes/readable/main.html.php
index 5e4cca8..4950bb3 100644
--- a/themes/readable/main.html.php
+++ b/themes/readable/main.html.php
@@ -21,13 +21,13 @@
                 <h2 class="title-index" itemprop="name"><a href="<?php echo $p->url ?>"><?php echo $p->title ?></a></h2>
             <?php } ?>
             <div class="date">
-                <span itemprop="datePublished"><?php echo format_date($p->date) ?></span> - Posted in
-                <span itemprop="articleSection"><?php echo $p->category ?></span> by
+                <span itemprop="datePublished"><?php echo format_date($p->date) ?></span> - <?php echo i18n('Posted_in');?>
+                <span itemprop="articleSection"><?php echo $p->category ?></span> <?php echo i18n('by');?>
                 <span itemprop="author"><a href="<?php echo $p->authorUrl ?>"><?php echo $p->authorName; ?></a></span>
                 <?php if (disqus_count()) { ?> - 
-                    <span><a href="<?php echo $p->url ?>#disqus_thread">Comments</a></span>
+                    <span><a href="<?php echo $p->url ?>#disqus_thread"><?php echo i18n('Comments');?></a></span>
                 <?php } elseif (facebook()) { ?> -
-                    <a href="<?php echo $p->url ?>#comments"><span><fb:comments-count href=<?php echo $p->url ?>></fb:comments-count> Comments</span></a>
+                    <a href="<?php echo $p->url ?>#comments"><span><fb:comments-count href=<?php echo $p->url ?>></fb:comments-count> <?php echo i18n('Comments');?></span></a>
                 <?php } ?>
 				<?php if (login()) { echo ' - <span><a href="'. $p->url .'/edit?destination=post">Edit</a></span>'; } ?>
             </div>
@@ -62,10 +62,10 @@
 <?php if (!empty($pagination['prev']) || !empty($pagination['next'])): ?>
     <div class="pager">
         <?php if (!empty($pagination['prev'])): ?>
-            <span><a href="?page=<?php echo $page - 1 ?>" class="pagination-arrow newer" rel="prev">Newer</a></span>
+            <span><a href="?page=<?php echo $page - 1 ?>" class="pagination-arrow newer" rel="prev"><?php echo i18n('Newer');?></a></span>
         <?php endif; ?>
         <?php if (!empty($pagination['next'])): ?>
-            <span><a href="?page=<?php echo $page + 1 ?>" class="pagination-arrow older" rel="next">Older</a></span>
+            <span><a href="?page=<?php echo $page + 1 ?>" class="pagination-arrow older" rel="next"><?php echo i18n('Older');?></a></span>
         <?php endif; ?>
     </div>
 <?php endif; ?>
diff --git a/themes/readable/post.html.php b/themes/readable/post.html.php
index a0d6bbf..7a90be6 100644
--- a/themes/readable/post.html.php
+++ b/themes/readable/post.html.php
@@ -13,8 +13,8 @@
         <?php } ?>
         <div class="date">
             <span itemprop="datePublished"><a href="<?php echo $p->archive ?>" title="Show all posts made on this month"><?php echo format_date($p->date) ?></a></span>
-            - Posted in
-            <span itemprop="articleSection"><?php echo $p->category ?></span> by
+            - <?php echo i18n('Posted_in');?>
+            <span itemprop="articleSection"><?php echo $p->category ?></span> <?php echo i18n('by');?>
             <span itemprop="author"><a href="<?php echo $p->authorUrl ?>"><?php echo $p->authorName; ?></a></span> -
             <span><a href="<?php echo $p->url ?>" rel="permalink">Permalink</a></span>
         </div>
@@ -41,12 +41,12 @@
         <div class="post-body" itemprop="articleBody">
             <?php echo $p->body; ?>
         </div>
-        <div class="tags"><strong>Tags:</strong> <?php echo $p->tag;?></div>
+        <div class="tags"><strong><?php echo i18n('Tags');?>:</strong> <?php echo $p->tag;?></div>
     </div>
     <div class="separator">&rarr;</div>
     <div class="share-box">
         <div class="author-info">
-            <h4>By <strong><?php echo $author->name ?></strong></h4>
+            <h4><?php echo i18n('Posts_by');?> <strong><?php echo $author->name ?></strong></h4>
             <?php echo $author->about ?>
         </div>
         <div class="share">
@@ -56,7 +56,7 @@
         </div>
     </div>
     <div class="related">
-        <h4>Related posts</h4>
+        <h4><?php echo i18n('Related_posts');?></h4>
         <?php echo get_related($p->related)?>
     </div>
     <div id="comments" class="comments border">
diff --git a/themes/readable/profile.html.php b/themes/readable/profile.html.php
index 7347f92..8bbf5bd 100644
--- a/themes/readable/profile.html.php
+++ b/themes/readable/profile.html.php
@@ -8,23 +8,23 @@
         <div class="bio" itemprop="description"><?php echo $about ?></div>
     </div>
 </div>
-<h2 class="post-index">Posts by this author</h2>
+<h2 class="post-index"><?php echo i18n('Post_by_author');?></h2>
 <?php if (!empty($posts)) { ?>
     <ul class="post-list">
         <?php foreach ($posts as $p): ?>
             <li class="item">
-                <span><a href="<?php echo $p->url ?>"><?php echo $p->title ?></a></span> on
-                <span><?php echo format_date($p->date) ?></span> - Posted in <span><?php echo $p->category; ?></span>
+                <span><a href="<?php echo $p->url ?>"><?php echo $p->title ?></a></span> <?php echo i18n('by');?>
+                <span><?php echo format_date($p->date) ?></span> - <?php echo i18n('Posted_in');?> <span><?php echo $p->category; ?></span>
             </li>
         <?php endforeach; ?>
     </ul>
     <?php if (!empty($pagination['prev']) || !empty($pagination['next'])): ?>
         <div class="pager">
             <?php if (!empty($pagination['prev'])): ?>
-                <span><a href="?page=<?php echo $page - 1 ?>" class="pagination-arrow newer" rel="prev">Newer</a></span>
+                <span><a href="?page=<?php echo $page - 1 ?>" class="pagination-arrow newer" rel="prev"><?php echo i18n('Newer');?></a></span>
             <?php endif; ?>
             <?php if (!empty($pagination['next'])): ?>
-                <span><a href="?page=<?php echo $page + 1 ?>" class="pagination-arrow older" rel="next">Older</a></span>
+                <span><a href="?page=<?php echo $page + 1 ?>" class="pagination-arrow older" rel="next"><?php echo i18n('Older');?></a></span>
             <?php endif; ?>
         </div>
     <?php endif; ?>
diff --git a/themes/twentyfifteen/layout.html.php b/themes/twentyfifteen/layout.html.php
index 9caa0fa..d832657 100644
--- a/themes/twentyfifteen/layout.html.php
+++ b/themes/twentyfifteen/layout.html.php
@@ -73,7 +73,7 @@
                     </nav>
 					<?php endif;?>
                     <aside class="widget search">
-                        <form><input type="search" name="search" class="form-control" placeholder="Type to search"></form>
+                        <form><input type="search" name="search" class="form-control" placeholder="<?php echo i18n('Type_to_search');?>"></form>
                     </aside>                            
                     <aside class="widget widget_meta">
                         <h2 class="widget-title"><?php echo i18n("Recent_posts");?></h2>
diff --git a/themes/twentyfifteen/main.html.php b/themes/twentyfifteen/main.html.php
index 9900adb..2aaf209 100644
--- a/themes/twentyfifteen/main.html.php
+++ b/themes/twentyfifteen/main.html.php
@@ -3,10 +3,10 @@
     <header class="page-header"><h1 class="page-title"><?php echo i18n('Category');?>: <?php echo $category->title;?></h1><div class="taxonomy-description"><?php echo $category->body;?></div></header>
 <?php endif;?>
 <?php if (isset($is_tag)):?>
-    <header class="page-header"><h1 class="page-title">Tag: <?php echo $tag->title;?></h1></header>
+    <header class="page-header"><h1 class="page-title"><?php echo i18n('Tags');?>: <?php echo $tag->title;?></h1></header>
 <?php endif;?>
 <?php if (isset($is_archive)):?>
-    <header class="page-header"><h1 class="page-title">Archive: <?php echo $archive->title;?></h1></header>
+    <header class="page-header"><h1 class="page-title"><?php echo i18n('Archives');?>: <?php echo $archive->title;?></h1></header>
 <?php endif;?>
 <?php if (isset($is_search)):?>
     <header class="page-header"><h1 class="page-title">Search: <?php echo $search->title;?></h1></header>
@@ -65,9 +65,9 @@
             <?php echo $p->tag; ?>
         </span>
         <?php if (disqus_count()) { ?>
-            <span class="comments-link"><a href="<?php echo $p->url ?>#disqus_thread"> comments</a></span>
+            <span class="comments-link"><a href="<?php echo $p->url ?>#disqus_thread"> <?php echo i18n('Comments');?></a></span>
         <?php } elseif (facebook()) { ?>
-            <span class="comments-link"><a href="<?php echo $p->url ?>#comments"><span><fb:comments-count href=<?php echo $p->url ?>></fb:comments-count> comments</span></a></span>
+            <span class="comments-link"><a href="<?php echo $p->url ?>#comments"><span><fb:comments-count href=<?php echo $p->url ?>></fb:comments-count> <?php echo i18n('Comments');?></span></a></span>
         <?php } ?>
 		<?php if (login()) { echo '<span class="edit-link"><a href="'. $p->url .'/edit?destination=post">Edit</a></span>'; } ?>
     </footer>
diff --git a/themes/twentyfifteen/post.html.php b/themes/twentyfifteen/post.html.php
index c66d354..b56026c 100644
--- a/themes/twentyfifteen/post.html.php
+++ b/themes/twentyfifteen/post.html.php
@@ -89,10 +89,10 @@
     <h2 class="screen-reader-text">Post navigation</h2>
     <div class="nav-links">
         <?php if (!empty($prev)): ?>
-            <div class="nav-previous"><a style="background-image: url(<?php echo($prev['image']); ?>);<?php if (!empty($prev['image'])):?>color:#fff;<?php endif;?>" rel="prev" href="<?php echo($prev['url']); ?>"><span style="<?php if (!empty($prev['image'])):?>color:#fff;<?php endif;?>" aria-hidden="true" class="meta-nav">Previous</span> <span class="screen-reader-text">Previous post:</span> <span class="post-title"><?php echo($prev['title']); ?></span></a></div>
+            <div class="nav-previous"><a style="background-image: url(<?php echo($prev['image']); ?>);<?php if (!empty($prev['image'])):?>color:#fff;<?php endif;?>" rel="prev" href="<?php echo($prev['url']); ?>"><span style="<?php if (!empty($prev['image'])):?>color:#fff;<?php endif;?>" aria-hidden="true" class="meta-nav"><?php echo i18n('Prev');?></span> <span class="screen-reader-text">Previous post:</span> <span class="post-title"><?php echo($prev['title']); ?></span></a></div>
         <?php endif; ?>
         <?php if (!empty($next)): ?>
-            <div class="nav-next"><a style="background-image: url(<?php echo($next['image']); ?>);<?php if (!empty($next['image'])):?>color:#fff;<?php endif;?>" rel="next" href="<?php echo($next['url']); ?>"><span style="<?php if (!empty($next['image'])):?>color:#fff;<?php endif;?>" aria-hidden="true" class="meta-nav">Next</span> <span class="screen-reader-text">Next post:</span> <span class="post-title"><?php echo($next['title']); ?></span></a></div>
+            <div class="nav-next"><a style="background-image: url(<?php echo($next['image']); ?>);<?php if (!empty($next['image'])):?>color:#fff;<?php endif;?>" rel="next" href="<?php echo($next['url']); ?>"><span style="<?php if (!empty($next['image'])):?>color:#fff;<?php endif;?>" aria-hidden="true" class="meta-nav"><?php echo i18n('Next');?></span> <span class="screen-reader-text">Next post:</span> <span class="post-title"><?php echo($next['title']); ?></span></a></div>
         <?php endif; ?>
     </div>
 </nav>
diff --git a/themes/twentyfifteen/profile.html.php b/themes/twentyfifteen/profile.html.php
index 1b4f9a3..05db32b 100644
--- a/themes/twentyfifteen/profile.html.php
+++ b/themes/twentyfifteen/profile.html.php
@@ -5,12 +5,12 @@
     </header>
     <div class="entry-content">
         <?php echo $about ?>
-        <h2 class="post-index">Posts by this author</h2>
+        <h2 class="post-index"><?php echo i18n('Post_by_author');?></h2>
         <?php if (!empty($posts)) { ?>
             <ul class="post-list">
                 <?php foreach ($posts as $p): ?>
                     <li class="item">
-                        <span><a href="<?php echo $p->url ?>"><?php echo $p->title ?></a></span> on
+                        <span><a href="<?php echo $p->url ?>"><?php echo $p->title ?></a></span> -
                         <span><?php echo format_date($p->date) ?></span> - <?php echo i18n('Posted_in');?> <span><?php echo $p->category; ?></span>
                     </li>
                 <?php endforeach; ?>
diff --git a/themes/twentysixteen/layout.html.php b/themes/twentysixteen/layout.html.php
index 52d9441..7fe9c60 100644
--- a/themes/twentysixteen/layout.html.php
+++ b/themes/twentysixteen/layout.html.php
@@ -87,14 +87,14 @@
                     
                     <?php if (config('views.counter') === 'true') :?>
                     <section id="popular-posts" class="widget widget_popular_entries">        
-                        <h2 class="widget-title">Popular Posts</h2>
+                        <h2 class="widget-title"><?php echo i18n('Popular_posts');?></h2>
                         <?php echo popular_posts();?>
                     </section>
                     <?php endif;?>
 
                     <?php if (disqus()): ?>
                     <section id="recent-comments" class="widget widget_recent_comments">
-                        <h2 class="widget-title">Recent Comments</h2>
+                        <h2 class="widget-title"><?php echo i18n('Comments');?></h2>
                         <script src="//<?php echo config('disqus.shortname');?>.disqus.com/recent_comments_widget.js?num_items=5&amp;hide_avatars=0&amp;avatar_size=48&amp;excerpt_length=200&amp;hide_mods=0" type="text/javascript"></script><style>li.dsq-widget-item {padding-top:15px;} img.dsq-widget-avatar {margin-right:5px;} .dsq-widget-list {margin-left:0;}</style>
                     </section>
                     <?php endif;?>
diff --git a/themes/twentysixteen/main.html.php b/themes/twentysixteen/main.html.php
index b47aab7..97767b8 100644
--- a/themes/twentysixteen/main.html.php
+++ b/themes/twentysixteen/main.html.php
@@ -55,9 +55,9 @@
         <span class="cat-links"><span class="screen-reader-text"><?php echo i18n('Category');?> </span><?php echo $p->category;?></span>
         <span class="tags-links"><span class="screen-reader-text">Tags </span><?php echo $p->tag;?></span>
         <?php if (disqus_count()) { ?>
-            <span class="comments-link"><a href="<?php echo $p->url ?>#disqus_thread"> comments</a></span>
+            <span class="comments-link"><a href="<?php echo $p->url ?>#disqus_thread"> <?php echo i18n('Comments');?></a></span>
         <?php } elseif (facebook()) { ?>
-            <span class="comments-link"><a href="<?php echo $p->url ?>#comments"><span><fb:comments-count href=<?php echo $p->url ?>></fb:comments-count> comments</span></a></span>
+            <span class="comments-link"><a href="<?php echo $p->url ?>#comments"><span><fb:comments-count href=<?php echo $p->url ?>></fb:comments-count> <?php echo i18n('Comments');?></span></a></span>
         <?php } ?>
         <?php if (login()) { echo '<span class="edit-link"><a href="'. $p->url .'/edit?destination=post">Edit</a></span>'; } ?>
     </footer><!-- .entry-footer -->
diff --git a/themes/twentysixteen/post.html.php b/themes/twentysixteen/post.html.php
index 96f244d..6674bb9 100644
--- a/themes/twentysixteen/post.html.php
+++ b/themes/twentysixteen/post.html.php
@@ -62,9 +62,9 @@
         <span class="tags-links"><span class="screen-reader-text">Tags </span><?php echo $p->tag;?></span>
 
         <?php if (disqus_count()) { ?>
-            <span class="comments-link"><a href="<?php echo $p->url ?>#disqus_thread"> comments</a></span>
+            <span class="comments-link"><a href="<?php echo $p->url ?>#disqus_thread"> <?php echo i18n('Comments');?></a></span>
         <?php } elseif (facebook()) { ?>
-            <span class="comments-link"><a href="<?php echo $p->url ?>#comments"><span><fb:comments-count href=<?php echo $p->url ?>></fb:comments-count> comments</span></a></span>
+            <span class="comments-link"><a href="<?php echo $p->url ?>#comments"><span><fb:comments-count href=<?php echo $p->url ?>></fb:comments-count> <?php echo i18n('Comments');?></span></a></span>
         <?php } ?>
 
     </footer><!-- .entry-footer -->
@@ -82,7 +82,7 @@
     <?php if (facebook() || disqus()): ?>
         <div class="comments-area" id="comments">
         
-            <h2 class="comments-title">Comments on “<?php echo $p->title;?>”</h2>
+            <h2 class="comments-title"><?php echo i18n('Comments');?> “<?php echo $p->title;?>”</h2>
             
             <?php if (facebook()): ?>
                 <div class="fb-comments" data-href="<?php echo $p->url ?>" data-numposts="<?php echo config('fb.num') ?>" data-colorscheme="<?php echo config('fb.color') ?>"></div>
@@ -99,10 +99,10 @@
     <h2 class="screen-reader-text">Post navigation</h2>
     <div class="nav-links">
         <?php if (!empty($prev)): ?>
-            <div class="nav-previous"><a rel="prev" href="<?php echo($prev['url']); ?>"><span aria-hidden="true" class="meta-nav">Previous</span> <span class="screen-reader-text">Previous post:</span> <span class="post-title"><?php echo($prev['title']); ?></span></a></div>
+            <div class="nav-previous"><a rel="prev" href="<?php echo($prev['url']); ?>"><span aria-hidden="true" class="meta-nav"><?php echo i18n('Prev');?></span> <span class="screen-reader-text">Previous post:</span> <span class="post-title"><?php echo($prev['title']); ?></span></a></div>
         <?php endif;?>
         <?php if (!empty($next)): ?>
-            <div class="nav-next"><a rel="next" href="<?php echo($next['url']); ?>"><span aria-hidden="true" class="meta-nav">Next</span> <span class="screen-reader-text">Next post:</span> <span class="post-title"><?php echo($next['title']); ?></span></a></div>
+            <div class="nav-next"><a rel="next" href="<?php echo($next['url']); ?>"><span aria-hidden="true" class="meta-nav"><?php echo i18n('Next');?></span> <span class="screen-reader-text">Next post:</span> <span class="post-title"><?php echo($next['title']); ?></span></a></div>
         <?php endif;?>
     </div>
 </nav>
\ No newline at end of file
diff --git a/themes/twentysixteen/profile.html.php b/themes/twentysixteen/profile.html.php
index 6ddd24c..352c2f5 100644
--- a/themes/twentysixteen/profile.html.php
+++ b/themes/twentysixteen/profile.html.php
@@ -5,13 +5,13 @@
     </header>
     <div class="entry-content">
         <?php echo $about ?>
-        <h2 class="post-index">Posts by this author</h2>
+        <h2 class="post-index"><?php echo i18n('Post_by_author');?></h2>
         <?php if (!empty($posts)) { ?>
             <ul class="post-list">
                 <?php foreach ($posts as $p): ?>
                     <li class="item">
-                        <span><a href="<?php echo $p->url ?>"><?php echo $p->title ?></a></span> on
-                        <span><?php echo format_date($p->date) ?></span> - Posted in <span class="tags-links"><?php echo $p->category; ?></span>
+                        <span><a href="<?php echo $p->url ?>"><?php echo $p->title ?></a></span> -
+                        <span><?php echo format_date($p->date) ?></span> - <?php echo i18n('Posted_in');?> <span class="tags-links"><?php echo $p->category; ?></span>
                     </li>
                 <?php endforeach; ?>
             </ul>