diff --git a/admin/options.php b/admin/options.php
index 5ceacf2..963f284 100644
--- a/admin/options.php
+++ b/admin/options.php
@@ -32,7 +32,7 @@ if ($user->isAdmin()) {
 	<!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>gelato :: options</title>
+		<title>gelato :: <?=__("options")?></title>
 		<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 		<meta name="generator" content="gelato cms <?php echo version();?>" />
 		<link rel="shortcut icon" href="<?php echo $conf->urlGelato;?>/images/favicon.ico" />
@@ -55,34 +55,34 @@ if ($user->isAdmin()) {
 	</head>
 	
 	<body>
-		<div id="div-process" style="display:none;">Processing request...</div>
+		<div id="div-process" style="display:none;"><?=__("Processing request...")?></div>
 		<div id="cont">
 			<div id="head">
-				<h1><a href="<?php echo $conf->urlGelato;?>/" title="gelato :: home">gelato cms</a></h1>
+				<h1><a href="<?php echo $conf->urlGelato;?>/" title="gelato :: <?=__("home")?>">gelato cms</a></h1>
 				<ul id="nav">
-					<li><a href="<?php echo $conf->urlGelato;?>/" title="Take me to the tumblelog">Back to the Tumblelog</a></li>
+					<li><a href="<?php echo $conf->urlGelato;?>/" title="<?=__("Take me to the tumblelog")?>"><?=__("Back to the Tumblelog")?></a></li>
 			  	</ul>
 			</div>
 			<div id="main">				
 				
 				<div class="box">
 					<ul class="menu manage">
-					<h3>Tumblelog options</h3>
-					<li><a href="index.php">Post</a></li>
-					<li><a href="admin.php">Users</a></li>
-					<li><a href="settings.php">Settings</a></li>
-					<li class="selected"><a>Options</a></li>
+					<h3><?=__("Tumblelog options")?></h3>
+					<li><a href="index.php"><?=__("Post")?></a></li>
+					<li><a href="admin.php"><?=__("Users")?></a></li>
+					<li><a href="settings.php"><?=__("Settings")?></a></li>
+					<li class="selected"><a><?=__("Options")?></a></li>
 					</ul>
 					<p>&nbsp;</p>
 <?php
 					if (isset($_GET["modified"])) {
 						if ($_GET["modified"]=="true") {
-							echo "<div class=\"exito\" id=\"divMessages\">The configuration has been modified successfully.</div>";
+							echo "<div class=\"exito\" id=\"divMessages\">".__("The configuration has been modified successfully.")."</div>";
 						}
 					}					
 					if (isset($_GET["error"])) {
 						if ($_GET["error"]==1) {
-							echo "<div class=\"error\" id=\"divMessages\"><strong>Error on the database server: </strong>".$_GET["des"]."</div>";
+							echo "<div class=\"error\" id=\"divMessages\"><strong>".__("Error on the database server: ")."</strong>".$_GET["des"]."</div>";
 						}
 					}
 ?>
@@ -91,22 +91,22 @@ if ($user->isAdmin()) {
 						<form action="options.php" method="post" id="options_form" autocomplete="off" class="newpost">							
 							<fieldset>								
 								<ul>																	
-									<li><label for="rich_text">Rich text editor:</label>
+									<li><label for="rich_text"><?=__("Rich text editor:")?></label>
 										<select name="rich_text" id="rich_text">										
-											<option value="1" <?php if($conf->richText) echo "selected"; ?>>Active</option>
-											<option value="0" <?php if(!$conf->richText) echo "selected"; ?>>Deactive</option>
+											<option value="1" <?php if($conf->richText) echo "selected"; ?>><?=__("Active")?></option>
+											<option value="0" <?php if(!$conf->richText) echo "selected"; ?>><?=__("Deactive")?></option>
 										</select>
 									</li>
 									<li><label for="rich_text">URL friendly:</label>
 										<select name="url_friendly" id="url_friendly">
-											<option value="1" <?php if($conf->urlFriendly) echo "selected"; ?>>Active</option>
-											<option value="0" <?php if(!$conf->urlFriendly) echo "selected"; ?>>Deactive</option>
+											<option value="1" <?php if($conf->urlFriendly) echo "selected"; ?>><?=__("Active")?></option>
+											<option value="0" <?php if(!$conf->urlFriendly) echo "selected"; ?>><?=__("Deactive")?></option>
 										</select>
 									</li>
 								</ul>
 							</fieldset>
 							<p>
-								<input type="submit" name="btnsubmit" id="btnsubmit" value="Modify" class="submit"/>
+								<input type="submit" name="btnsubmit" id="btnsubmit" value="<?=__("Modify")?>" class="submit"/>
 							</p>
 						</form>	
 								
diff --git a/admin/settings.php b/admin/settings.php
index e6aaa6a..1b73e0f 100644
--- a/admin/settings.php
+++ b/admin/settings.php
@@ -32,7 +32,7 @@ if ($user->isAdmin()) {
 	<!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>gelato :: settings</title>
+		<title>gelato :: <?=__("settings")?></title>
 		<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 		<meta name="generator" content="gelato cms <?php echo version();?>" />
 		<link rel="shortcut icon" href="<?php echo $conf->urlGelato;?>/images/favicon.ico" />
@@ -55,34 +55,34 @@ if ($user->isAdmin()) {
 	</head>
 	
 	<body>
-		<div id="div-process" style="display:none;">Processing request...</div>
+		<div id="div-process" style="display:none;"><?=__("Processing request...")?></div>
 		<div id="cont">
 			<div id="head">
-				<h1><a href="<?php echo $conf->urlGelato;?>/" title="gelato :: home">gelato cms</a></h1>
+				<h1><a href="<?php echo $conf->urlGelato;?>/" title="gelato :: <?=__("home")?>">gelato cms</a></h1>
 				<ul id="nav">
-					<li><a href="<?php echo $conf->urlGelato;?>/" title="Take me to the tumblelog">Back to the Tumblelog</a></li>
+					<li><a href="<?php echo $conf->urlGelato;?>/" title="<?=__("Take me to the tumblelog")?>"><?=__("Back to the Tumblelog")?></a></li>
 			  	</ul>
 			</div>
 			<div id="main">				
 				
 				<div class="box">
 					<ul class="menu manage">
-					<h3>Tumblelog configuration</h3>
-					<li><a href="index.php">Post</a></li>
-					<li><a href="admin.php">Users</a></li>
-					<li><a href="options.php">Options</a></li>
-					<li class="selected"><a>Settings</a></li>
+					<h3><?=__("Tumblelog configuration")?></h3>
+					<li><a href="index.php"><?=__("Post")?></a></li>
+					<li><a href="admin.php"><?=__("Users")?></a></li>
+					<li><a href="options.php"><?=__("Options")?></a></li>
+					<li class="selected"><a><?=__("Settings")?></a></li>
 					</ul>
 					<p>&nbsp;</p>
 <?php
 					if (isset($_GET["modified"])) {
 						if ($_GET["modified"]=="true") {
-							echo "<div class=\"exito\" id=\"divMessages\">The configuration has been modified successfully.</div>";
+							echo "<div class=\"exito\" id=\"divMessages\">".__("The configuration has been modified successfully.")."</div>";
 						}
 					}					
 					if (isset($_GET["error"])) {
 						if ($_GET["error"]==1) {
-							echo "<div class=\"error\" id=\"divMessages\"><strong>Error on the database server: </strong>".$_GET["des"]."</div>";
+							echo "<div class=\"error\" id=\"divMessages\"><strong>".__("Error on the database server: ")."</strong>".$_GET["des"]."</div>";
 						}
 					}
 ?>
@@ -91,20 +91,20 @@ if ($user->isAdmin()) {
 						<form action="settings.php" method="post" id="settings_form" autocomplete="off" class="newpost">							
 							<fieldset>								
 								<ul>							
-									<li><label for="title">Title:</label>
+									<li><label for="title"><?=__("Title:")?></label>
 										<input type="text" name="title" id="title" value="<?php echo $conf->title;?>" class="txt"/></li>
-									<li><label for="description">Description:</label>
+									<li><label for="description"><?=__("Description:")?></label>
 										<input type="text" name="description" id="description" value="<?php echo $conf->description;?>" class="txt"/></li>
-									<li><label for="url_installation">Installation URL</label>
+									<li><label for="url_installation"><?=__("Installation URL")?></label>
 										<input type="text" name="url_installation" id="url_installation" value="<?php echo $conf->urlGelato;?>" class="txt"/></li>
-									<li><label for="posts_limit">Post limit:</label>
+									<li><label for="posts_limit"><?=__("Post limit:")?></label>
 										<input type="text" name="posts_limit" id="posts_limit" value="<?php echo $conf->postLimit;?>" class="txt"/></li>
-									<li><label for="lang">Language:</label>
+									<li><label for="lang"><?=__("Language:")?></label>
 										<select id="lang" name="lang">
 											<option value="en" selected="selected">english</option>
 										</select>
 									</li>
-									<li><label for="template">Template:</label>
+									<li><label for="template"><?=__("Template:"?></label>
 										<select id="template" name="template">
 <?php
 										$themes = getThemes();
@@ -119,7 +119,7 @@ if ($user->isAdmin()) {
 								</ul>
 							</fieldset>
 							<p>
-								<input type="submit" name="btnsubmit" id="btnsubmit" value="Modify" class="submit"/>
+								<input type="submit" name="btnsubmit" id="btnsubmit" value="<?=__("Modify")?>" class="submit"/>
 							</p>
 						</form>	
 								
diff --git a/admin/user.php b/admin/user.php
index 2bea1da..1bc83c3 100644
--- a/admin/user.php
+++ b/admin/user.php
@@ -53,7 +53,7 @@ if ($user->isAdmin()) {
 	<!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>gelato :: add user</title>
+		<title>gelato :: <?php echo __("add user")?></title>
 		<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 		<meta name="generator" content="gelato cms <?php echo version();?>" />
 		<link rel="shortcut icon" href="<?php echo $conf->urlGelato;?>/images/favicon.ico" />
@@ -65,22 +65,22 @@ if ($user->isAdmin()) {
 	</head>
 	
 	<body>
-		<div id="div-process" style="display:none;">Processing request...</div>
+		<div id="div-process" style="display:none;"><?=__("Processing request...");?></div>
 		<div id="cont">
 			<div id="head">
-				<h1><a href="<?php echo $conf->urlGelato;?>/" title="gelato :: home">gelato cms</a></h1>
+				<h1><a href="<?php echo $conf->urlGelato;?>/" title="gelato :: <?=__("home")?>">gelato cms</a></h1>
 				<ul id="nav">
-					<li><a href="<?php echo $conf->urlGelato;?>/" title="Take me to the tumblelog">Back to the Tumblelog</a></li>
+					<li><a href="<?php echo $conf->urlGelato;?>/" title="<?=__("Take me to the tumblelog")?>"><?=__("Back to the Tumblelog")?></a></li>
 			  	</ul>
 			</div>
 			<div id="main">				
 				
 				<div class="box">
 					<ul class="menu manage">
-					<h3>Start session</h3>
-					<li><a href="index.php">Post</a></li>
-					<li><a href="admin.php">Users</a></li>
-					<li class="selected"><a><?php echo ($isEdition) ? "Edit" : "Add"; ?></a></li>
+					<h3><?=__("Start session")?></h3>
+					<li><a href="index.php"><?=__("Post")?></a></li>
+					<li><a href="admin.php"><?=__("Users")?></a></li>
+					<li class="selected"><a><?php echo ($isEdition) ? __("Edit") : __("Add"); ?></a></li>
 					</ul>
 				
 					<div class="tabla">
@@ -96,7 +96,7 @@ if ($user->isAdmin()) {
 							}
 ?>
 							<li>
-								<label for="login">user:</label>
+								<label for="login"><?=__("user:")?></label>
 									<input class="txt" name="login" id="login" type="text" autocomplete="off" value="<?php echo isset($register["login"])?$register["login"]:"";?>" />
 <?php
 							if (!$isEdition) {
@@ -112,31 +112,31 @@ if ($user->isAdmin()) {
 								<div id="target" style="display:none;"></div>
 							</li>
 							<li>
-								<label for="pass">password:</label>
+								<label for="pass"><?=__("password:")?></label>
 									<input class="txt" name="password" id="password" type="password" />
 							</li>
 							<li>
-								<label for="repass">retype password:</label>
+								<label for="repass"><?=__("retype password:")?></label>
 									<input class="txt" name="repass" id="repass" type="password" />
 							</li>
 							<li>
-								<label for="name">name:</label>
+								<label for="name"><?=__("name:")?></label>
 									<input class="txt" name="name" id="name" type="text" value="<?php echo isset($register["name"])?$register["name"]:"";?>" />
 							</li>
 							<li>
-								<label for="email">e-mail:</label>
+								<label for="email"><?=__("e-mail:")?></label>
 									<input class="txt" name="email" id="email" type="text" value="<?php echo isset($register["email"])?$register["email"]:"";?>" />
 							</li>
 							<li>
-								<label for="website">website:</label>
+								<label for="website"><?=__("website:")?></label>
 									<input class="txt" name="website" id="website" type="text" value="<?php echo isset($register["website"])?$register["website"]:"";?>" />
 							</li>								
 							<li>
-								<label for="about">about:</label><br />
+								<label for="about"><?=__("about:")?></label><br />
 									<textarea rows="5" cols="50" name="about" id="about" tabindex="7"><?php echo isset($register["about"])?$register["about"]:"";?></textarea>									
 							</li>								
 							<li>
-								<input name="btnAdd" type="submit" value="<?php echo ($isEdition) ? "Modify" : "Add"; ?> user" />
+								<input name="btnAdd" type="submit" value="<?php echo ($isEdition) ? __("Modify") : __("Add"); ?> user" />
 							</li>
 						</ul>
 						</fieldset>