improved i18n - part 2

3 files changed, 31 insertions, 12 deletions

diff --git a/h-source/Application/Include/languages.php b/h-source/Application/Include/languages.php
index 99cfd6f..4d83edd 100644
--- a/h-source/Application/Include/languages.php
+++ b/h-source/Application/Include/languages.php
@@ -103,6 +103,19 @@ class Lang
 				"does it have a free bios?"	=>	"ha il bios libero?",
 				"does the webcam work?"	=>	"funziona la webcam?",
 				"Current revision"	=>	"Revisione corrente",
+				"Hello"	=>	"Ciao",
+				"Your"	=>	"il ",
+				"control panel"	=>	"pannello di controllo",
+				"Create new account"	=>	"Crea un account",
+				"Request new password"	=> "Richiedi nuova password",
+				"website statistics"	=>	"statistiche del sito",
+				"hardware in the database"	=>	"hardware nel database",
+				"users logged"	=>	"utenti loggati",
+				"Watch your public profile"	=>	"Guarda il tuo profilo pubblico",
+				"Edit your profile"	=>	"Modifica il tuo profilo",
+				"Change your e-mail address"	=>	"Cambia il tuo indirizzo e-mail",
+				"Change your password"	=>	"Cambia la tua password",
+				"Delete your account"	=>	"Chiudi il tuo account",
 			),
 		'es'	=>	array
 			(
@@ -168,6 +181,12 @@ class Lang
 				"No wifi cards found"		=>	"No se encontró ninguna tarjeta de red inalámbrica",
 				"does it work with free software?"	=>	"¿funciona con software libre?",
 				"differences in the entry"		=>	"diferencias en el campo",
+				"No 3G cards found"			=>	"No se encontró ninguna tarjeta 3G",
+				"Please specify in the below description entry the Internet Service Provider (ISP) and the country where the service is provided"	=>	"Por favor especifique en el campo de descripción inferior el Proveedor de Internet (ISP) y el país donde se provee el servicio",
+				"webcam model"	=>	"modelo de cámara web",
+				"does it have a free bios?"	=>	"¿tiene bios libre?",
+				"does the webcam work?"	=>	"¿funciona la cámara web?",
+				"Current revision"	=>	"Revisión actual",
 			),
 		'fr'	=>	array
 			(
diff --git a/h-source/Application/Views/My/panel.php b/h-source/Application/Views/My/panel.php
index b5cc35e..1f4b9fe 100644
--- a/h-source/Application/Views/My/panel.php
+++ b/h-source/Application/Views/My/panel.php
@@ -39,11 +39,11 @@
 		<?php } ?>
 		
 		<ul class='panelApplicationList'>
-			<li><a href="<?php echo Url::getRoot('meet/user/'.$lang.'/'.$username);?>">Watch your public profile</a></li>
-			<li><a href="<?php echo Url::getRoot('my/profile/'.$lang.'/'.$token);?>">Edit your profile</a></li>
-			<li><a href="<?php echo Url::getRoot('my/email/'.$lang.'/'.$token);?>">Change the e-mail address</a></li>
-			<li><a href="<?php echo Url::getRoot('my/password/'.$lang.'/'.$token);?>">Change the password</a></li>
-			<li><a href="<?php echo Url::getRoot('my/goodbye/'.$lang.'/'.$token);?>">Delete your account</a></li>
+			<li><a href="<?php echo Url::getRoot('meet/user/'.$lang.'/'.$username);?>"><?php echo gtext("Watch your public profile");?></a></li>
+			<li><a href="<?php echo Url::getRoot('my/profile/'.$lang.'/'.$token);?>"><?php echo gtext("Edit your profile");?></a></li>
+			<li><a href="<?php echo Url::getRoot('my/email/'.$lang.'/'.$token);?>"><?php echo gtext("Change your e-mail address");?></a></li>
+			<li><a href="<?php echo Url::getRoot('my/password/'.$lang.'/'.$token);?>"><?php echo gtext("Change your password");?></a></li>
+			<li><a href="<?php echo Url::getRoot('my/goodbye/'.$lang.'/'.$token);?>"><?php echo gtext("Delete your account");?></a></li>
 		</ul>
 		
 	</div>
\ No newline at end of file
diff --git a/h-source/Application/Views/right.php b/h-source/Application/Views/right.php
index 52839cf..c0b1b68 100644
--- a/h-source/Application/Views/right.php
+++ b/h-source/Application/Views/right.php
@@ -33,10 +33,10 @@
 			<?php if ($islogged === 'yes') { ?>
 				<div class="login_box_logged">
 					<div class="who_you_are_and_logout">
-						Hello <b><?php echo $username; ?></b> (<a href="<?php echo $this->baseUrl?>/users/logout">logout</a>)
+						<?php echo gtext("Hello");?> <b><?php echo $username; ?></b> (<a href="<?php echo $this->baseUrl?>/users/logout">logout</a>)
 					</div>
 					<div class="your_panel_link">
-						your <a href="<?php echo $this->baseUrl."/my/home/$lang";?>">control panel</a>
+						<?php echo gtext("Your");?> <a href="<?php echo $this->baseUrl."/my/home/$lang";?>"><?php echo gtext("control panel");?></a>
 					</div>
 				</div>				
 			<?php } else { ?>
@@ -71,11 +71,11 @@
 			</form>
 			
 			<div class="manage_account_link_box">
-				<a href="<?php echo $this->baseUrl."/users/add/$lang";?>">Create new account</a>
+				<a href="<?php echo $this->baseUrl."/users/add/$lang";?>"><?php echo gtext("Create new account");?></a>
 			</div>
 			
 			<div class="manage_account_link_box">
-				<a href="<?php echo $this->baseUrl."/users/forgot/$lang";?>">Request new password</a>
+				<a href="<?php echo $this->baseUrl."/users/forgot/$lang";?>"><?php echo gtext("Request new password");?></a>
 			</div>
 			
 			<?php } ?>
@@ -92,11 +92,11 @@
 		
 		<div class="statistics_ext_box">
 			<div class="statistics_int_title">
-				website statistics:
+				<?php echo gtext("website statistics");?>:
 			</div>
 			
 			<div class="statistics_hard_title">
-				hardware in the database:
+				<?php echo gtext("hardware in the database");?>:
 			</div>
 			
 			<table width="100%">
@@ -109,7 +109,7 @@
 			</table>
 			
 			<div class="statistics_hard_title">
-				users logged: <span class="user_logged"><?php echo $numbLogged;?></span>
+				<?php echo gtext("users logged");?>: <span class="user_logged"><?php echo $numbLogged;?></span>
 			</div>
 		</div>