improved i18n

6 files changed, 32 insertions, 19 deletions

diff --git a/h-source/Application/Controllers/GenericController.php b/h-source/Application/Controllers/GenericController.php
index c2e6517..5cc81a5 100644
--- a/h-source/Application/Controllers/GenericController.php
+++ b/h-source/Application/Controllers/GenericController.php
@@ -73,7 +73,7 @@ class GenericController extends BaseController
 		$data['notice'] = null;
 		$data['submission_response'] = 'error';
 		
-		$data['tree'] = $this->getSpecHardLink() . " &raquo;  " . " <span class='last_tree_element'>insert</span>";
+		$data['tree'] = $this->getSpecHardLink() . " &raquo;  " . " <span class='last_tree_element'>".gtext("Insert")."</span>";
 		
 		$this->s['registered']->checkStatus();
 		
@@ -249,7 +249,7 @@ class GenericController extends BaseController
 					$name = encodeUrl($ne_name);
 					$data['name'] = $name;
 					$data['ne_name'] = $ne_name;
-					$data['tree'] = $this->getSpecHardLink() . " &raquo;  " . $this->getViewLink($clean['id_hard'],$ne_name) . " &raquo; <span class='last_tree_element'>edit</span>";
+					$data['tree'] = $this->getSpecHardLink() . " &raquo;  " . $this->getViewLink($clean['id_hard'],$ne_name) . " &raquo; <span class='last_tree_element'>".gtext("Edit")."</span>";
 
 					if (isset($_POST['updateAction']))
 					{
@@ -563,7 +563,7 @@ class GenericController extends BaseController
 		$data['id'] = $clean['id'];
 		$data['ne_name'] = $this->m['HardwareModel']->getTheModelName($clean['id']);
 		$data['name'] = encodeUrl($data['ne_name']);
-		$data['tree'] = $this->getSpecHardLink() . " &raquo;  " . $this->getViewLink($clean['id'],$data['ne_name'])." &raquo; <span class='last_tree_element'>history</span>";
+		$data['tree'] = $this->getSpecHardLink() . " &raquo;  " . $this->getViewLink($clean['id'],$data['ne_name'])." &raquo; <span class='last_tree_element'>".gtext("History")."</span>";
 		
 		$data['title'] = 'history - '.Website::$generalName;
 
@@ -628,7 +628,7 @@ class GenericController extends BaseController
 			
 			$data['ne_name'] = $this->m['HardwareModel']->getTheModelName($data['id_hard']);
 			$data['name'] = encodeUrl($data['ne_name']);
-			$data['tree'] = $this->getSpecHardLink() . " &raquo;  " . $this->getViewLink($data['id_hard'],$data['ne_name'])." &raquo; " . $this->getHistoryLink($data['id_hard']) . " &raquo; <span class='last_tree_element'>revision</span>";
+			$data['tree'] = $this->getSpecHardLink() . " &raquo;  " . $this->getViewLink($data['id_hard'],$data['ne_name'])." &raquo; " . $this->getHistoryLink($data['id_hard']) . " &raquo; <span class='last_tree_element'>".gtext("Revision")."</span>";
 			
 			$data['updated_by'] = $data['table'][0]['revisions']['updated_by'];
 			$data['update_date'] = $data['table'][0]['revisions']['update_date'];
@@ -652,7 +652,7 @@ class GenericController extends BaseController
 		$data['id_hard'] = $clean['id_hard'];
 		$ne_name = $this->m['HardwareModel']->getTheModelName((int)$data['id_hard']);
 		$data['name'] = encodeUrl($ne_name);
-		$data['tree'] = $this->getSpecHardLink() . " &raquo;  " . $this->getViewLink($data['id_hard'],$ne_name)." &raquo; " . $this->getHistoryLink($clean['id_hard']) . " &raquo; <span class='last_tree_element'>differences</span>";
+		$data['tree'] = $this->getSpecHardLink() . " &raquo;  " . $this->getViewLink($data['id_hard'],$ne_name)." &raquo; " . $this->getHistoryLink($clean['id_hard']) . " &raquo; <span class='last_tree_element'>".gtext("Differences")."</span>";
 
 		$data['isDeleted'] = $this->m['HardwareModel']->isDeleted($clean['id_hard']);
 		$data['showDiff'] = false;
@@ -783,7 +783,7 @@ class GenericController extends BaseController
 		$data['id_hard'] = $clean['id_hard'];
 		$data['ne_name'] = $this->m['HardwareModel']->getTheModelName($clean['id_hard']);
 		$data['name'] = encodeUrl($data['ne_name']);
-		$data['tree'] = $this->getSpecHardLink() . " &raquo;  " . $this->getViewLink($clean['id_hard'],$data['ne_name'])." &raquo; <span class='last_tree_element'>talk</span>";
+		$data['tree'] = $this->getSpecHardLink() . " &raquo;  " . $this->getViewLink($clean['id_hard'],$data['ne_name'])." &raquo; <span class='last_tree_element'>".gtext("Talk")."</span>";
 
 		$data['isDeleted'] = $this->m['HardwareModel']->isDeleted($clean['id_hard']);
 
@@ -829,7 +829,7 @@ class GenericController extends BaseController
 
 	protected function getHistoryLink($id)
 	{
-		return "<a href='".$this->baseUrl.'/'.$this->controller.'/history/'.$this->lang.'/'.$id.'/'.$this->viewStatus."'>history</a>";
+		return "<a href='".$this->baseUrl.'/'.$this->controller.'/history/'.$this->lang.'/'.$id.'/'.$this->viewStatus."'>".gtext("History")."</a>";
 	}
 
 	protected function getSpecHardLink()
diff --git a/h-source/Application/Include/languages.php b/h-source/Application/Include/languages.php
index 721af28..a49a015 100644
--- a/h-source/Application/Include/languages.php
+++ b/h-source/Application/Include/languages.php
@@ -241,7 +241,7 @@ class Lang
 				/*0193*/"This device page has been hidden"	=>	"La pagina di questo dispositivo è stata nascosta",
 				/*0194*/"restore the device page"	=>	"ripristina la pagina",
 				/*0195*/"hide the device page"	=>	"nascondi la pagina",
-				/*0196*/"Download the xml file of all the <b>scanners</b> in the database" =>	"Scarica il file xml di tutte le <b>scanner</b> presenti nel database",
+				/*0196*/"Download the xml file of all the <b>scanners</b> in the database" =>	"Scarica il file xml di tutti gli <b>scanner</b> presenti nel database",
 				/*0197*/"Special pages for administrators"	=>	"Pagine speciali per gli amministratori",
 				/*0198*/"Special pages for moderators"	=>	"Pagine speciali per i moderatori",
 				/*0199*/"see the page"	=>	"guarda la pagina",
@@ -264,7 +264,7 @@ class Lang
 				/*0216*/"works with 3D acceleration"	=>	"funziona con accelerazione 3D",
 				/*0217*/"works, but without 3D acceleration"	=>	"funziona, ma senza accelerazione 3D",
 				/*0218*/"it does not work"	=>	"non funziona",
-				/*0219*/"Notebooks, netbooks, Tablet PC"	=>	"Notebooks, netbooks, Tablet PC",
+				/*0219*/"Notebooks, netbooks, tablet PC"	=>	"Notebooks, netbooks, tablet PC",
 				/*0220*/"Wifi cards"	=>	"Schede wifi",
 				/*0221*/"Video cards"	=>	"Schede video",
 				/*0222*/"Printers and multifunction"	=>	"Stampanti e multifunzione",
@@ -283,6 +283,19 @@ class Lang
 				/*0235*/"Download"	=>	"Scarica",
 				/*0236*/"Help"	=>	"Aiuto",
 				/*0237*/"List of"	=>	"Lista di",
+				/*0238*/"talk messages"	=>	"messaggi",
+				/*0239*/"History"	=>	"Revisioni",
+				/*0240*/"Revision"	=>	"Revisione",
+				/*0241*/"This is an old revision of this page, as edited by"	=>	"Questa è una vecchia revisione della pagina, così come è stata modificata da",
+				/*0242*/"It may differ significantly from the"	=>	"Può differire significativamente dalla",
+				/*0243*/"Differences between the revision of"	=>	"Differenze tra la revisione del",
+				/*0244*/"created by"	=>	"creata da",
+				/*0245*/"and the revision of"	=>	"e la revisione del",
+				/*0246*/"<b>Notice</b>: the text in <del>red</del> has been deleted from the previous revision, the text in <ins>green</ins> has been added in this revision and the text in <span class='gray_text_notice'>gray</span> has not been changed."	=>	"<b>Nota</b>: il testo in <del>rosso</del> è stato cancellato dalla revisione precedente, il testo in <ins>verde</ins> è stato aggiunto in questa revisione e il testo in <span class='gray_text_notice'>grigio</span> non è stato cambiato",
+				/*0247*/"Insert"	=>	"Inserisci",
+				/*0248*/"Edit"	=>	"Modifica",
+				/*0249*/"Talk page"	=>	"Pagina di discussione",
+				/*0250*/"Download the xml file of all the <b>ethernet cards</b> in the database"	=>	"Scarica il file xml di tutte le <b>schede ethernet</b> presenti nel database",
 			),
 		'es'	=>	array
 			(
diff --git a/h-source/Application/Views/Hardware/left.php b/h-source/Application/Views/Hardware/left.php
index 275898d..5390303 100644
--- a/h-source/Application/Views/Hardware/left.php
+++ b/h-source/Application/Views/Hardware/left.php
@@ -27,7 +27,7 @@
 		</div>
 	
 		<div class="hardware_element">
-			<img align="middle" class="hardware_element_image" src="<?php echo $this->baseUrl;?>/Public/Img/H2O/computer-laptop.png"><a class="hardware_element_link" href="<?php echo $this->baseUrl?>/notebooks/catalogue/<?php echo $lang;?>"><?php echo gtext("Notebooks, netbooks, Tablet PC");?></a>
+			<img align="middle" class="hardware_element_image" src="<?php echo $this->baseUrl;?>/Public/Img/H2O/computer-laptop.png"><a class="hardware_element_link" href="<?php echo $this->baseUrl?>/notebooks/catalogue/<?php echo $lang;?>"><?php echo gtext("Notebooks, netbooks, tablet PC");?></a>
 		</div>
 		
 		<div class="hardware_element">
diff --git a/h-source/Application/Views/differences.php b/h-source/Application/Views/differences.php
index b3bb292..c634d19 100644
--- a/h-source/Application/Views/differences.php
+++ b/h-source/Application/Views/differences.php
@@ -25,7 +25,7 @@
 		<?php if (!$isDeleted) { ?>
 		
 			<div class="diff_color_notice">
-				<b>Notice</b>: the text in <del>red</del> has been deleted from the previous revision, the text in <ins>green</ins> has been added in this revision and the text in <span class="gray_text_notice">gray</span> has not been changed.
+				<?php echo gtext("<b>Notice</b>: the text in <del>red</del> has been deleted from the previous revision, the text in <ins>green</ins> has been added in this revision and the text in <span class='gray_text_notice'>gray</span> has not been changed.");?>
 			</div>
 
 			<?php foreach ($diffArray as $label => $text) { ?>
diff --git a/h-source/Application/Views/page.php b/h-source/Application/Views/page.php
index 6fe3c2f..082357f 100644
--- a/h-source/Application/Views/page.php
+++ b/h-source/Application/Views/page.php
@@ -33,7 +33,7 @@
 			<!--if revision-->
 			<?php if (strcmp($this->action,'revision') === 0) { ?>
 			<div class="revision_alert">
-				This is an old revision of this page, as edited by <b><?php echo getLinkToUser($u->getUser($updated_by));?></b> at <b><?php echo smartDate($update_date); ?></b>. It may differ significantly from the <a href="<?php echo $this->baseUrl."/".$this->controller."/view/$lang/$id_hard/".$name.$this->viewStatus;?>">current revision</a>.
+				<?php echo gtext("This is an old revision of this page, as edited by");?> <b><?php echo getLinkToUser($u->getUser($updated_by));?></b> <?php echo gtext('at');?> <b><?php echo smartDate($update_date); ?></b>. <?php echo gtext("It may differ significantly from the");?> <a href="<?php echo $this->baseUrl."/".$this->controller."/view/$lang/$id_hard/".$name.$this->viewStatus;?>"><?php echo gtext("Current revision");?></a>.
 			</div>
 			<?php } ?>
 			
diff --git a/h-source/Application/Views/top_left.php b/h-source/Application/Views/top_left.php
index 94701cb..ee735e6 100644
--- a/h-source/Application/Views/top_left.php
+++ b/h-source/Application/Views/top_left.php
@@ -99,7 +99,7 @@
 
 			<?php if (!$isDeleted) { ?>
 			<div class="talk_numb_ext">
-				<a href="<?php echo $this->baseUrl."/".$this->controller."/talk/$lang/$id_hard/$token".$this->viewStatus;?>">talk messages: <?php echo $talk_number;?></a>
+				<a href="<?php echo $this->baseUrl."/".$this->controller."/talk/$lang/$id_hard/$token".$this->viewStatus;?>"><?php echo gtext("talk messages");?>: <?php echo $talk_number;?></a>
 			</div>
 			<?php } ?>
 		
@@ -116,7 +116,7 @@
 		<?php } else if (strcmp($this->action,'history') === 0) { ?>
 		
 			<div class="notebook_view_title">
-				History of the <?php echo singular($this->controller).' <b>'.$ne_name.'</b>';?>
+				<?php echo gtext("History");?> - <?php echo singular($this->controller).' <b>'.$ne_name.'</b>';?>
 			</div>
 			
 			<div class="notebook_insert_link">
@@ -127,7 +127,7 @@
 
 			<?php if ($showDiff === true) { ?>
 			<div class="notebook_view_title">
-				Differences between the revision of <b><?php echo smartDate($update_new);?></b>, created by <b><?php echo getLinkToUser($u->getUser($updated_by));?></b>, and the revision of <b><?php echo smartDate($update_old);?></b>
+				<?php echo gtext("Differences between the revision of");?> <b><?php echo smartDate($update_new);?></b>, <?php echo gtext("created by");?> <b><?php echo getLinkToUser($u->getUser($updated_by));?></b>, <?php echo gtext("and the revision of");?> <b><?php echo smartDate($update_old);?></b>
 			</div>
 			<?php } ?>
 		
@@ -148,7 +148,7 @@
 		<?php } else if (strcmp($this->action,'revision') === 0) { ?>
 
 			<div class="notebook_view_title">
-				Revision of the <?php echo singular($this->controller).' <b>'.$ne_name.'</b>';?>
+				<?php echo gtext("Revision");?> - <?php echo singular($this->controller).' <b>'.$ne_name.'</b>';?>
 			</div>
 			
 			<div class="notebook_insert_link">
@@ -158,7 +158,7 @@
 		<?php } else if (strcmp($this->action,'insert') === 0) { ?>
 
 			<div class="notebook_view_title">
-				Insert a new <?php echo singular($this->controller);?>
+				<?php echo gtext("Insert");?> - <?php echo singular($this->controller);?>
 			</div>
 		
 			<div class="notebook_insert_link">
@@ -168,7 +168,7 @@
 		<?php } else if (strcmp($this->action,'update') === 0) { ?>
 
 			<div class="notebook_view_title">
-				Edit the <?php echo singular($this->controller).' <b>'.$ne_name.'</b>';?>
+				<?php echo gtext("Edit");?> - <?php echo singular($this->controller).' <b>'.$ne_name.'</b>';?>
 			</div>
 			
 			<div class="notebook_insert_link">
@@ -178,7 +178,7 @@
 		<?php } else if (strcmp($this->action,'talk') === 0) { ?>
 
 			<div class="notebook_view_title">
-				Talk page of the <?php echo singular($this->controller).' <b>'.$ne_name.'</b>';?>
+				<?php echo gtext("Talk page");?> - <?php echo singular($this->controller).' <b>'.$ne_name.'</b>';?>
 			</div>
 			
 			<div class="notebook_insert_link">