diff --git a/admin/views/add-user.php b/admin/views/add-user.php
index a68ed49f..827b2acb 100644
--- a/admin/views/add-user.php
+++ b/admin/views/add-user.php
@@ -35,4 +35,4 @@
 
     <input type="submit" class="btn btn-blue" value="<?php $Language->p('Add') ?>" name="add-user">
     <a href="<?php echo HTML_PATH_ADMIN_ROOT.'users' ?>" class="btn"><?php $Language->p('Cancel') ?></a>
-</form>
+</form>
\ No newline at end of file
diff --git a/admin/views/dashboard.php b/admin/views/dashboard.php
index 04e2503f..5573e4ca 100644
--- a/admin/views/dashboard.php
+++ b/admin/views/dashboard.php
@@ -26,14 +26,14 @@
 		<?php if($_newPosts || $_newPages) { ?>
 		<div class="dashboardBox">
 			<div class="content contentGreen">
-				<div class="bigContent">Database regenerated</div>
-				<div class="littleContent">New posts and pages synchronized.</div>
+				<div class="bigContent"><?php $Language->p('database-regenerated') ?></div>
+				<div class="littleContent"><?php $Language->p('new-posts-and-pages-synchronized') ?></div>
 				<i class="iconContent fa fa-pie-chart"></i>
 			</div>
 		</div>
 		<?php } ?>
 		<div class="dashboardBox">
-			<h2>Notifications</h2>
+			<h2><?php $Language->p('notifications') ?></h2>
 			<div class="content">
 				<nav class="nav">
 				<ul>
@@ -52,4 +52,4 @@
 
 	</div>
 
-</div>
+</div>
\ No newline at end of file
diff --git a/admin/views/edit-page.php b/admin/views/edit-page.php
index 6a2a1537..a760c7a9 100644
--- a/admin/views/edit-page.php
+++ b/admin/views/edit-page.php
@@ -123,4 +123,4 @@ $(document).ready(function()
 
 });
 
-</script>
+</script>
\ No newline at end of file
diff --git a/admin/views/edit-post.php b/admin/views/edit-post.php
index 19e312a6..3af9d7f4 100644
--- a/admin/views/edit-post.php
+++ b/admin/views/edit-post.php
@@ -20,7 +20,7 @@
     }
     else
     {
-        echo '<p class="advOptions">Enable more features at <a href="'.HTML_PATH_ADMIN_ROOT.'settings#advanced">Settings->Advanced->Writting Settings</a></p>';
+        echo '<p class="advOptions">'.$Language->p('Enable more features at').'<a href="'.HTML_PATH_ADMIN_ROOT.'settings#advanced">'.$Language->p('settings-advanced-writting-settings').'</a></p>';
         echo '<div id="jsadvancedOptions" style="display:none">';
     }
 ?>
@@ -75,4 +75,4 @@ $(document).ready(function()
 
 });
 
-</script>
+</script>
\ No newline at end of file
diff --git a/admin/views/edit-user.php b/admin/views/edit-user.php
index b1135f48..c597ea8b 100644
--- a/admin/views/edit-user.php
+++ b/admin/views/edit-user.php
@@ -1,10 +1,10 @@
-<h2 class="title"><i class="fa fa-user"></i> Edit User</h2>
+<h2 class="title"><i class="fa fa-user"></i> <?php $Language->p('Edit user') ?></h2>
 
 <nav class="navbar nav-pills sublinks" data-tools="tabs" data-active="#profile">
     <ul>
-        <li><a href="#profile">Profile</a></li>
-        <li><a href="#email">Email</a></li>
-        <li><a href="#password">Password</a></li>
+        <li><a href="#profile"><?php $Language->p('Profile') ?></a></li>
+        <li><a href="#email"><?php $Language->p('Email') ?></a></li>
+        <li><a href="#password"><?php $Language->p('Password') ?></a></li>
     </ul>
 </nav>
 
@@ -17,12 +17,12 @@
     <input type="hidden" name="username" value="<?php echo $_user['username'] ?>">
 
     <label>
-        First name
+        <?php $Language->p('First name') ?>
         <input type="text" name="firstName" class="width-50" value="<?php echo $_user['firstName'] ?>">
     </label>
 
     <label>
-        Last name
+        <?php $Language->p('Last name') ?>
         <input type="text" name="lastName" class="width-50" value="<?php echo $_user['lastName'] ?>">
     </label>
 
@@ -31,22 +31,22 @@
     {
 ?>
     <label for="role">
-        Role
+        <?php $Language->p('Role') ?>
         <select name="role" class="width-50">
         <?php
-            $htmlOptions = array('admin'=>'Administrator', 'editor'=>'Editor');
+            $htmlOptions = array('admin'=>$Language->get('Administrator'), 'editor'=>$Language->get('Editor'));
             foreach($htmlOptions as $value=>$text) {
                 echo '<option value="'.$value.'"'.( ($_user['role']===$value)?' selected="selected"':'').'>'.$text.'</option>';
             }
         ?>
         </select>
-        <div class="forms-desc">You can choose the user's privilege. The editor role only can write pages and posts.</div>
+        <div class="forms-desc"><?php $Language->p('you-can-choose-the-users-privilege') ?></div>
     </label>
 <?php
     }
 ?>
     <input type="submit" class="btn btn-blue" value="Save" name="user-profile">
-    <a href="<?php echo HTML_PATH_ADMIN_ROOT.'users' ?>" class="btn">Cancel</a>
+    <a href="<?php echo HTML_PATH_ADMIN_ROOT.'users' ?>" class="btn"><?php $Language->p('Cancel') ?></a>
 </form>
 </div>
 
@@ -59,13 +59,13 @@
     <input type="hidden" name="username" value="<?php echo $_user['username'] ?>">
 
     <label>
-        Email
+        <?php $Language->p('Email') ?>
         <input type="text" name="email" class="width-50" value="<?php echo $_user['email'] ?>">
-        <div class="forms-desc">Email will not be publicly displayed. Recommended for recovery password and notifications.</div>
+        <div class="forms-desc"><?php $Language->p('email-will-not-be-publicly-displayed') ?></div>
     </label>
 
     <input type="submit" class="btn btn-blue" value="Save" name="user-email">
-    <a href="<?php echo HTML_PATH_ADMIN_ROOT.'users' ?>" class="btn">Cancel</a>
+    <a href="<?php echo HTML_PATH_ADMIN_ROOT.'users' ?>" class="btn"><?php $Language->p('Cancel') ?></a>
 </form>
 </div>
 
@@ -78,16 +78,16 @@
     <input type="hidden" name="username" value="<?php echo $_user['username'] ?>">
 
     <label>
-        New Password
+        <?php $Language->p('New password') ?>
         <input type="password" name="password" class="width-50">
     </label>
 
     <label>
-        Confirm the new Password
+        <?php $Language->p('Confirm password') ?>
         <input type="password" name="confirm-password" class="width-50">
     </label>
 
     <input type="submit" class="btn btn-blue" value="Save" name="user-password">
-    <a href="<?php echo HTML_PATH_ADMIN_ROOT.'users' ?>" class="btn">Cancel</a>
+    <a href="<?php echo HTML_PATH_ADMIN_ROOT.'users' ?>" class="btn"><?php $Language->p('Cancel') ?></a>
 </form>
-</div>
+</div>
\ No newline at end of file
diff --git a/admin/views/login.php b/admin/views/login.php
index a8fa4153..f94592db 100644
--- a/admin/views/login.php
+++ b/admin/views/login.php
@@ -1,13 +1,13 @@
-<h2 class="title">Login</h2>
+<h2 class="title"><?php $Language->p('Login') ?></h2>
 
 <form method="post" action="<?php echo HTML_PATH_ADMIN_ROOT.'login' ?>" class="forms" autocomplete="off">
     <label>
-        <input type="text" name="username" placeholder="Username" class="width-100" autocomplete="off">
+        <input type="text" name="username" placeholder="<?php $Language->p('Username') ?>" class="width-100" autocomplete="off">
     </label>
     <label>
-        <input type="password" name="password" placeholder="Password" class="width-100" autocomplete="off">
+        <input type="password" name="password" placeholder="<?php $Language->p('Password') ?>" class="width-100" autocomplete="off">
     </label>
     <p>
-        <button class="btn btn-blue width-100">Log in</button>
+        <button class="btn btn-blue width-100"><?php $Language->p('Login') ?></button>
     </p>
-</form>
+</form>
\ No newline at end of file
diff --git a/admin/views/manage-pages.php b/admin/views/manage-pages.php
index 968d53e2..22c18e12 100644
--- a/admin/views/manage-pages.php
+++ b/admin/views/manage-pages.php
@@ -1,12 +1,12 @@
-<h2 class="title"><i class="fa fa-file-text-o"></i> Manage Pages</h2>
+<h2 class="title"><i class="fa fa-file-text-o"></i> <?php $Language->p('Manage pages') ?></h2>
 
 <?php makeNavbar('manage'); ?>
 
 <table class="table-bordered table-stripped">
 	<thead>
 		<tr>
-			<th>Title</th>
-			<th>Parent</th>
+			<th><?php $Language->p('Title') ?></th>
+			<th><?php $Language->p('Parent') ?></th>
 		</tr>
 	</thead>
 	<tbody>
@@ -24,7 +24,7 @@
 				}
 
 				echo '<tr>';
-				echo '<td>'.($Page->parentKey()?NO_PARENT_CHAR:'').'<a href="'.HTML_PATH_ADMIN_ROOT.'edit-page/'.$Page->key().'">'.($Page->published()?'':'[DRAFT] ').($Page->title()?$Page->title():'[Empty title] ').'</a></td>';
+				echo '<td>'.($Page->parentKey()?NO_PARENT_CHAR:'').'<a href="'.HTML_PATH_ADMIN_ROOT.'edit-page/'.$Page->key().'">'.($Page->published()?'':'['.$Language->g('Draft').'] ').($Page->title()?$Page->title():'['.$Language->g('Empty title').'] ').'</a></td>';
 				echo '<td>'.$parentTitle.'</td>';
 				echo '</tr>';
 			}
@@ -32,4 +32,4 @@
 
 	?>
 	</tbody>
-</table>
+</table>
\ No newline at end of file
diff --git a/admin/views/manage-posts.php b/admin/views/manage-posts.php
index fd2ddab6..708ea430 100644
--- a/admin/views/manage-posts.php
+++ b/admin/views/manage-posts.php
@@ -1,13 +1,13 @@
-<h2 class="title"><i class="fa fa-file-text-o"></i> Manage Posts</h2>
+<h2 class="title"><i class="fa fa-file-text-o"></i> <?php $Language->p('Manage posts') ?></h2>
 
 <?php makeNavbar('manage'); ?>
 
 <table class="table-bordered table-stripped">
 	<thead>
 		<tr>
-			<th>Title</th>
-			<th>Published date</th>
-			<th>Modified date</th>
+			<th><?php $Language->p('Title') ?></th>
+			<th><?php $Language->p('Published date') ?></th>
+			<th><?php $Language->p('Modified date') ?></th>
 		</tr>
 	</thead>
 	<tbody>
@@ -16,7 +16,7 @@
 		foreach($posts as $Post)
 		{
 			echo '<tr>';
-			echo '<td><a href="'.HTML_PATH_ADMIN_ROOT.'edit-post/'.$Post->key().'">'.($Post->published()?'':'[DRAFT] ').($Post->title()?$Post->title():'[Empty title] ').'</a></td>';
+			echo '<td><a href="'.HTML_PATH_ADMIN_ROOT.'edit-post/'.$Post->key().'">'.($Post->published()?'':'['.$Language->g('Draft').'] ').($Post->title()?$Post->title():'['.$Language->g('Empty title').'] ').'</a></td>';
 			echo '<td>'.$Post->dateCreated().'</td>';
 			echo '<td>'.$Post->timeago().'</td>';
 			echo '</tr>';
@@ -24,4 +24,4 @@
 
 	?>
 	</tbody>
-</table>
+</table>
\ No newline at end of file
diff --git a/admin/views/new-page.php b/admin/views/new-page.php
index 1b7028b8..32f4eb0c 100644
--- a/admin/views/new-page.php
+++ b/admin/views/new-page.php
@@ -1,4 +1,4 @@
-<h2 class="title"><i class="fa fa-pencil"></i> New page</h2>
+<h2 class="title"><i class="fa fa-pencil"></i> <?php $Language->p('New page') ?></h2>
 
 <form method="post" action="" class="forms">
 
@@ -18,7 +18,7 @@
     }
     else
     {
-        echo '<p class="advOptions">'.$Language->p('Enable more features at').'<a href="'.HTML_PATH_ADMIN_ROOT.'settings#advanced">'.$Language->p('settings-advanced-writting-settings').'</a></p>';
+        echo '<p class="advOptions">'.$Language->g('Enable more features at').'<a href="'.HTML_PATH_ADMIN_ROOT.'settings#advanced">'.$Language->g('settings-advanced-writting-settings').'</a></p>';
         echo '<div id="jsadvancedOptions" style="display:none">';
     }
 ?>
@@ -29,7 +29,7 @@
         <?php $Language->p('Parent') ?>
         <select id="jsparent" name="parent" class="width-50">
         <?php
-            $htmlOptions[NO_PARENT_CHAR] = '('.$Language->p('No parent').')';
+            $htmlOptions[NO_PARENT_CHAR] = '('.$Language->g('No parent').')';
             $htmlOptions += $dbPages->parentKeyList();
             foreach($htmlOptions as $value=>$text) {
                 echo '<option value="'.$value.'">'.$text.'</option>';
diff --git a/admin/views/new-post.php b/admin/views/new-post.php
index ceeb1399..1affbed5 100644
--- a/admin/views/new-post.php
+++ b/admin/views/new-post.php
@@ -1,4 +1,4 @@
-<h2 class="title"><i class="fa fa-pencil"></i> New post</h2>
+<h2 class="title"><i class="fa fa-pencil"></i> <?php $Language->p('New post') ?></h2>
 
 <form method="post" action="" class="forms">
 
@@ -18,7 +18,7 @@
     }
     else
     {
-        echo '<p class="advOptions">'.$Language->p('Enable more features at').'<a href="'.HTML_PATH_ADMIN_ROOT.'settings#advanced">'.$Language->p('settings-advanced-writting-settings').'</a></p>';
+        echo '<p class="advOptions">'.$Language->g('Enable more features at').'<a href="'.HTML_PATH_ADMIN_ROOT.'settings#advanced">'.$Language->g('settings-advanced-writting-settings').'</a></p>';
         echo '<div id="jsadvancedOptions" style="display:none">';
     }
 ?>
diff --git a/admin/views/plugins.php b/admin/views/plugins.php
index 5d29d6a5..3c0bb1e9 100644
--- a/admin/views/plugins.php
+++ b/admin/views/plugins.php
@@ -1,4 +1,4 @@
-<h2 class="title"><i class="fa fa-rocket"></i> Plugins</h2>
+<h2 class="title"><i class="fa fa-rocket"></i> <?php $Language->p('Plugins') ?></h2>
 
 <?php
 	foreach($plugins['all'] as $Plugin)
@@ -9,12 +9,12 @@
 		echo '<p>'.$Plugin->description().'</p>';
 
 		if($Plugin->installed()) {
-			echo '<a href="'.HTML_PATH_ADMIN_ROOT.'uninstall-plugin/'.$Plugin->className().'" class="btn btn-red btn-small">Uninstall plugin</a>';
+			echo '<a href="'.HTML_PATH_ADMIN_ROOT.'uninstall-plugin/'.$Plugin->className().'" class="btn btn-red btn-small">'.$Language->g('Uninstall plugin').'</a>';
 		}
 		else {
-			echo '<a href="'.HTML_PATH_ADMIN_ROOT.'install-plugin/'.$Plugin->className().'" class="btn btn-blue btn-small">Install plugin</a>';
+			echo '<a href="'.HTML_PATH_ADMIN_ROOT.'install-plugin/'.$Plugin->className().'" class="btn btn-blue btn-small">'.$Language->g('Install plugin').'</a>';
 		}
 
 		echo '</div>';
 	}
-?>
+?>
\ No newline at end of file
diff --git a/admin/views/settings.php b/admin/views/settings.php
index 5f8af6f5..20eb534f 100644
--- a/admin/views/settings.php
+++ b/admin/views/settings.php
@@ -1,11 +1,11 @@
-<h2 class="title"><i class="fa fa-cogs"></i> Settings</h2>
+<h2 class="title"><i class="fa fa-cogs"></i> <?php $Language->p('Settings') ?></h2>
 
 <nav class="navbar nav-pills sublinks" data-tools="tabs" data-active="#general">
     <ul>
-        <li class="active"><a href="#general">General</a></li>
-        <li><a href="#advanced">Advanced</a></li>
-        <li><a href="#regional">Regional</a></li>
-        <li><a href="#about">About</a></li>
+        <li class="active"><a href="#general"><?php $Language->p('General') ?></a></li>
+        <li><a href="#advanced"><?php $Language->p('Advanced') ?></a></li>
+        <li><a href="#regional"><?php $Language->p('Regional') ?></a></li>
+        <li><a href="#about"><?php $Language->p('About') ?></a></li>
     </ul>
 </nav>
 
@@ -16,30 +16,30 @@
 <div id="general">
 <form method="post" action="" class="forms">
     <label>
-    Site title
+    <?php $Language->p('Site title') ?>
     <input type="text" name="title" class="width-50" value="<?php echo $Site->title() ?>">
-    <div class="forms-desc">Use this field to name your site, it will appear at the top of every page of your site.</div>
+    <div class="forms-desc"><?php $Language->p('use-this-field-to-name-your-site') ?></div>
     </label>
 
     <label>
-    Site slogan
+    <?php $Language->p('Site slogan') ?>
     <input type="text" name="slogan" class="width-50" value="<?php echo $Site->slogan() ?>">
-    <div class="forms-desc">Use this field to add a catchy prhase on your site.</div>
+    <div class="forms-desc"><?php $Language->p('use-this-field-to-add-a-catchy-prhase') ?></div>
     </label>
 
     <label>
-    Site description
+    <?php $Language->p('Site description') ?>
     <input type="text" name="description" class="width-50" value="<?php echo $Site->description() ?>">
-    <div class="forms-desc">You can add a site description to provide a short bio or description of your site.</div>
+    <div class="forms-desc"><?php $Language->p('you-can-add-a-site-description-to-provide') ?></div>
     </label>
 
     <label>
-    Footer text
+    <?php $Language->p('Footer text') ?>
     <input type="text" name="footer" class="width-50" value="<?php echo $Site->footer() ?>">
-    <div class="forms-desc">You can add a small text on the bottom of every page. eg: copyright, owner, dates, etc.</div>
+    <div class="forms-desc"><?php $Language->p('you-can-add-a-small-text-on-the-bottom') ?></div>
     </label>
 
-    <input type="submit" class="btn" value="Save" name="form-general">
+    <input type="submit" class="btn" value="<?php $Language->p('Save') ?>" name="form-general">
 </form>
 </div>
 
@@ -47,10 +47,11 @@
 <!-- ===================================== -->
 <!-- Advanced Settings -->
 <!-- ===================================== -->
+
 <div id="advanced">
 <form method="post" action="" class="forms">
     <label for="postsperpage">
-        Posts per page
+        <?php $Language->p('Posts per page') ?>
         <select name="postsperpage" class="width-50">
         <?php
             $htmlOptions = array('1'=>'1','2'=>'2','3'=>'3','4'=>'4','5'=>'5','6'=>'6','7'=>'7','8'=>'8');
@@ -59,46 +60,46 @@
             }
         ?>
         </select>
-        <div class="forms-desc">Number of posts to show per page.</div>
+        <div class="forms-desc"><?php $Language->p('number-of-posts-to-show-per-page') ?></div>
     </label>
 
     <label>
-    Site URL
+    <?php $Language->p('Site URL') ?>
     <input type="text" name="url" class="width-50" value="<?php echo $Site->url() ?>">
-    <div class="forms-desc">The URL of your site.</div>
+    <div class="forms-desc"><?php $Language->p('the-url-of-your-site') ?></div>
     </label>
 
-    <h4>Writting Settings</h4>
+    <h4><?php $Language->p('Writting settings') ?></h4>
 
     <ul class="forms-list">
         <li>
         <input type="checkbox" name="advancedOptions" id="advancedOptions" value="true" <?php echo $Site->advancedOptions()?'checked':'' ?>>
-        <label for="advancedOptions">Advanced options</label>
-        <div class="forms-desc">Add or edit description, tags or modify the friendly URL.</div>
+        <label for="advancedOptions"><?php $Language->p('Advanced options') ?></label>
+        <div class="forms-desc"><?php $Language->p('add-or-edit-description-tags-or') ?></div>
         </li>
     </ul>
 
-    <h4>URL Filters</h4>
+    <h4><?php $Language->p('URL Filters') ?></h4>
 
     <label>
         <div class="input-groups width-50">
-            <span class="input-prepend">Post</span><input type="text" name="uriPost" value="<?php echo $Site->uriFilters('post') ?>">
+            <span class="input-prepend"><?php $Language->p('Posts') ?></span><input type="text" name="uriPost" value="<?php echo $Site->uriFilters('post') ?>">
         </div>
     </label>
 
     <label>
         <div class="input-groups width-50">
-            <span class="input-prepend">Page</span><input type="text" name="uriPage" value="<?php echo $Site->uriFilters('page') ?>">
+            <span class="input-prepend"><?php $Language->p('Pages') ?></span><input type="text" name="uriPage" value="<?php echo $Site->uriFilters('page') ?>">
         </div>
     </label>
 
     <label>
         <div class="input-groups width-50">
-            <span class="input-prepend">Tag</span><input type="text" name="uriTag" value="<?php echo $Site->uriFilters('tag') ?>">
+            <span class="input-prepend"><?php $Language->p('Tags') ?></span><input type="text" name="uriTag" value="<?php echo $Site->uriFilters('tag') ?>">
         </div>
     </label>
 
-    <input type="submit" class="btn" value="Save" name="form-advanced">
+    <input type="submit" class="btn" value="<?php $Language->p('Save') ?>" name="form-advanced">
 </form>
 </div>
 
@@ -110,7 +111,7 @@
 <div id="regional">
 <form method="post" action="" class="forms" name="form-regional">
     <label for="jslanguage">
-        Language
+        <?php $Language->p('Language') ?>
         <select id="jslanguage" name="language" class="width-50">
         <?php
             $htmlOptions = $Language->getLanguageList();
@@ -119,11 +120,11 @@
             }
         ?>
         </select>
-        <div class="forms-desc">Select your site's language.</div>
+        <div class="forms-desc"><?php $Language->p('select-your-sites-language') ?></div>
     </label>
 
     <label for="jstimezone">
-        Timezone
+        <?php $Language->p('Timezone') ?>
         <select id="jstimezone" name="timezone" class="width-50">
         <?php
             $htmlOptions = Date::timezoneList();
@@ -132,16 +133,16 @@
             }
         ?>
         </select>
-        <div class="forms-desc">Select a timezone for a correct date/time display on your site.</div>
+        <div class="forms-desc"><?php $Language->p('select-a-timezone-for-a-correct') ?></div>
     </label>
 
     <label>
-        Locale
+        <?php $Language->p('Locale') ?>
         <input id="jslocale" type="text" name="locale" class="width-50" value="<?php echo $Site->locale() ?>">
-        <div class="forms-desc">You can use this field to define a set of parameters related to the languege, country and special preferences.</div>
+        <div class="forms-desc"><?php $Language->p('you-can-use-this-field-to-define-a-set-of') ?></div>
     </label>
 
-    <input type="submit" class="btn" value="Save" name="form-regional">
+    <input type="submit" class="btn" value="<?php $Language->p('Save') ?>" name="form-regional">
 </form>
 </div>
 
@@ -164,4 +165,4 @@ $(document).ready(function() {
 
 <div id="about">
     <p><i class="fa fa-pencil-square-o"></i> Bludit version <?php echo BLUDIT_VERSION.' ('.BLUDIT_RELEASE_DATE.')' ?></p>
-</div>
+</div>
\ No newline at end of file
diff --git a/admin/views/users.php b/admin/views/users.php
index ec95f00f..6f9a4ac9 100644
--- a/admin/views/users.php
+++ b/admin/views/users.php
@@ -1,16 +1,16 @@
-<h2 class="title"><i class="fa fa-users"></i> Users</h2>
+<h2 class="title"><i class="fa fa-users"></i> <?php $Language->p('Users') ?></h2>
 
 <?php makeNavbar('users'); ?>
 
 <table class="table-bordered table-stripped">
 	<thead>
 		<tr>
-			<th>Username</th>
-			<th>First Name</th>
-			<th>Last Name</th>
-			<th>Role</th>
-			<th>Email</th>
-			<th>Registered</th>
+			<th><?php $Language->p('Username') ?></th>
+			<th><?php $Language->p('First name') ?></th>
+			<th><?php $Language->p('Last name') ?></th>
+			<th><?php $Language->p('Role') ?></th>
+			<th><?php $Language->p('Email') ?></th>
+			<th><?php $Language->p('Registered') ?></th>
 		</tr>
 	</thead>
 	<tbody>
@@ -29,4 +29,4 @@
 		}
 	?>
 	</tbody>
-</table>
+</table>
\ No newline at end of file
diff --git a/kernel/dblanguage.class.php b/kernel/dblanguage.class.php
index fe543424..ffd48963 100644
--- a/kernel/dblanguage.class.php
+++ b/kernel/dblanguage.class.php
@@ -46,9 +46,9 @@ class dbLanguage extends dbJSON
 	}
 
 	// Return the translation, if the translation does'n exist then return the English translation.
-	public function get($text)
+	public function get($string)
 	{
-		$key = Text::lowercase($text);
+		$key = Text::lowercase($string);
 		$key = Text::replace(' ', '-', $key);
 
 		if(isset($this->db[$key]))
@@ -58,10 +58,20 @@ class dbLanguage extends dbJSON
 		return $this->en_US[$key];
 	}
 
-	// Print the translation.
-	public function p($text)
+	public function g($string)
 	{
-		echo $this->get($text);
+		return $this->get($string);
+	}
+
+	public function print($string)
+	{
+		echo $this->get($string);
+	}
+
+	// Print the translation.
+	public function p($string)
+	{
+		$this->print($string);
 	}
 
 	public function add($array)
@@ -69,4 +79,4 @@ class dbLanguage extends dbJSON
 		$this->db[] = $array;
 	}
 
-}
+}
\ No newline at end of file
diff --git a/languages/en_US.json b/languages/en_US.json
index ce936f9a..323cbfba 100644
--- a/languages/en_US.json
+++ b/languages/en_US.json
@@ -16,7 +16,7 @@
     "dashboard": "Dashboard",
     "role": "Role",
     "posts": "Posts",
-    "Users": "Users",
+    "users": "Users",
     "administrator": "Administrator",
     "add": "Add",
     "cancel": "Cancel",
@@ -25,10 +25,7 @@
     "no-parent": "No parent",
     "edit-page": "Edit page",
     "edit-post": "Edit post",
-    "you-can-choose-the-users-privilege": "You can choose the user's privilege. The editor role only can write pages and posts.",
-    "email-will-not-be-publicly-displayed": "Email will not be publicly displayed. Recommended for recovery password and notifications.",
     "add-a-new-user": "Add a new user",
-    "html-markdown-code-supported": "HTML and Markdown code supported.",
     "parent": "Parent",
     "friendly-url": "Friendly URL",
     "description": "Description",
@@ -37,15 +34,36 @@
     "save": "Save",
     "draft": "Draft",
     "delete": "Delete",
+    "registered": "Registered",
+    "Notifications": "notifications",
+    "profile": "Profile",
+    "email": "Email",
+    "edit-user": "Edit user",
+    "publish-now": "Publish now",
+    "first-name": "First name",
+    "last-name": "Last name",
+    "manage-pages": "Manage pages",
     "advanced-options": "Advanced options",
+    "database-regenerated": "Database regenerated",
+    "html-markdown-code-supported": "HTML and Markdown code supported.",
     "enable-more-features-at": "Enable more features at",
     "settings-advanced-writting-settings": "Settings->Advanced->Writting Settings",
-    "publish-now": "Publish now",
-    "delete": "Delete",
-    "delete": "Delete",
-    "delete": "Delete",
-    "delete": "Delete",
-    "delete": "Delete",
-    "delete": "Delete"
-
+    "new-posts-and-pages-synchronized": "New posts and pages synchronized.",
+    "you-can-choose-the-users-privilege": "You can choose the user's privilege. The editor role only can write pages and posts.",
+    "email-will-not-be-publicly-displayed": "Email will not be publicly displayed. Recommended for recovery password and notifications.",
+    "use-this-field-to-name-your-site": "Use this field to name your site, it will appear at the top of every page of your site.",
+    "use-this-field-to-add-a-catchy-prhase": "Use this field to add a catchy prhase on your site.",
+    "you-can-add-a-site-description-to-provide": "You can add a site description to provide a short bio or description of your site.",
+    "you-can-add-a-small-text-on-the-bottom": "You can add a small text on the bottom of every page. eg: copyright, owner, dates, etc.",
+    "number-of-posts-to-show-per-page": "Number of posts to show per page.",
+    "the-url-of-your-site": "The URL of your site.",
+    "add-or-edit-description-tags-or": "Add or edit description, tags or modify the friendly URL.",
+    "select-your-sites-language": "Select your site's language.",
+    "select-a-timezone-for-a-correct": "Select a timezone for a correct date/time display on your site.",
+    "you-can-use-this-field-to-define-a-set-of": "You can use this field to define a set of parameters related to the languege, country and special preferences.",
+    "email": "Email",
+    "email": "Email",
+    "email": "Email",
+    "email": "Email",
+    "email": "Email"
 }
\ No newline at end of file