From 9d4399c7402f5fdc23efb1bda6bf84583ffe6fde Mon Sep 17 00:00:00 2001
From: Antonio Gallo <tonicucoz@gmail.com>
Date: Tue, 16 Oct 2012 05:40:07 +0000
Subject: fixed typos (lammi issues) and improved i18n

---
 h-source/Application/Include/languages.php         |  4 +-
 .../Application/Views/Desktop/Notebooks/form.php   |  2 +-
 .../Application/Views/Desktop/Notebooks/page.php   |  2 +-
 .../Application/Views/Desktop/suggest_dialog.php   |  4 +-
 .../Application/Views/Mobile/Notebooks/page.php    |  2 +-
 h-source/config.xml                                | 60 ++++++++--------------
 6 files changed, 29 insertions(+), 45 deletions(-)

diff --git a/h-source/Application/Include/languages.php b/h-source/Application/Include/languages.php
index 3bd481b..5b3dc62 100644
--- a/h-source/Application/Include/languages.php
+++ b/h-source/Application/Include/languages.php
@@ -413,8 +413,10 @@ class Lang
 				/*0352*/"HECI Controller" => "Controller HECI",
 				/*0353*/"device type"	=>	"tipo di dispositivo",
 				/*0354*/"Thanks for your contribution!"	=>	"Grazie per il tuo contributo!",
-				/*0355*/"does the device prevent the installation of wifi cards not-approved by the vendor?"	=> "il dispositivo impedisce l'installazione di schede wifi non approvate dal rivenditore/distributore?",
+				/*0355*/"does the device prevent installing wifi cards not-approved by the vendor?"	=> "il dispositivo impedisce l'installazione di schede wifi non approvate dal rivenditore/distributore?",
 				/*0356*/"see the details inside the description entry"	=>	"guarda i dettagli all'interno del campo descrizione",
+				/*0357*/"Thanks for helping the h-node project and the free software movement!"	=>	"Grazie per aver aiutato il progetto h-node e il movimento del software libero!",
+				/*0357*/"You have just inserted a new notebook into the database. Can you please insert its devices separately too? Thanks!"	=>	"Hai appena inserito un nuovo portatile. Potresti gentilmente inserire separatamente anche i suoi dispositivi?",
 			),
 		'es'	=>	array
 			(
diff --git a/h-source/Application/Views/Desktop/Notebooks/form.php b/h-source/Application/Views/Desktop/Notebooks/form.php
index 6106d1d..cbf78bc 100644
--- a/h-source/Application/Views/Desktop/Notebooks/form.php
+++ b/h-source/Application/Views/Desktop/Notebooks/form.php
@@ -71,7 +71,7 @@
 				</div>
 				
 				<div class="form_entry">
-					<div class="entry_label"><?php echo gtext("does the device prevent the installation of wifi cards not-approved by the vendor?");?><?php echo $preventWifiLabel;?></div>
+					<div class="entry_label"><?php echo gtext("does the device prevent installing wifi cards not-approved by the vendor?");?><?php echo $preventWifiLabel;?></div>
 					<?php echo Html_Form::select('prevent_wifi',$values['prevent_wifi'],Notebooks::$preventWifiSelect,"select_entry");?>
 				</div>
 				
diff --git a/h-source/Application/Views/Desktop/Notebooks/page.php b/h-source/Application/Views/Desktop/Notebooks/page.php
index 0981a3a..3dede4e 100644
--- a/h-source/Application/Views/Desktop/Notebooks/page.php
+++ b/h-source/Application/Views/Desktop/Notebooks/page.php
@@ -70,7 +70,7 @@
 				</div>
 				
 				<div class="notebook_vendor">
-					<div class="inner_label"><?php echo gtext("does the device prevent the installation of wifi cards not-approved by the vendor?");?></div>
+					<div class="inner_label"><?php echo gtext("does the device prevent installing wifi cards not-approved by the vendor?");?></div>
 					<div class="inner_value"><b><?php echo translate_and_gtext($item[$tableName]['prevent_wifi']);?></b> <?php if (strcmp($item[$tableName]['prevent_wifi'],'yes') === 0) echo "<span class='no_bold'>(".gtext("see the details inside the description entry").")</span>";?></div>
 				</div>
 				
diff --git a/h-source/Application/Views/Desktop/suggest_dialog.php b/h-source/Application/Views/Desktop/suggest_dialog.php
index 0122dee..3e9ad14 100644
--- a/h-source/Application/Views/Desktop/suggest_dialog.php
+++ b/h-source/Application/Views/Desktop/suggest_dialog.php
@@ -38,6 +38,6 @@
 </script>
 
 <div id="suggest_dialog" title="Insert new hardware">
-	<p>Thanks for helping the h-node project and the free software movement!</p>
-	<p>You have just inserted a new notebook in the database.. can you please insert its devices separately too? Thanks!</p>
+	<p><?php echo gtext("Thanks for helping the h-node project and the free software movement!");?></p>
+	<p><?php echo gtext("You have just inserted a new notebook into the database. Can you please insert its devices separately too? Thanks!");?></p>
 </div>
\ No newline at end of file
diff --git a/h-source/Application/Views/Mobile/Notebooks/page.php b/h-source/Application/Views/Mobile/Notebooks/page.php
index 124d5b4..c7cafef 100644
--- a/h-source/Application/Views/Mobile/Notebooks/page.php
+++ b/h-source/Application/Views/Mobile/Notebooks/page.php
@@ -69,7 +69,7 @@
 				</div>
 
 				<div class="ui-grid-a main_content_element">
-					<div class="ui-block-a"><?php echo gtext("does the device prevent the installation of wifi cards not-approved by the vendor?");?></div>
+					<div class="ui-block-a"><?php echo gtext("does the device prevent installing wifi cards not-approved by the vendor?");?></div>
 					<div class="ui-block-b"><b><?php echo translate_and_gtext($item[$tableName]['prevent_wifi']);?></b> <?php if (strcmp($item[$tableName]['prevent_wifi'],'yes') === 0) echo "<span class='no_bold'>(".gtext("see the details inside the description entry").")</span>";?></div>
 				</div>
 				
diff --git a/h-source/config.xml b/h-source/config.xml
index a7d9e81..6f4f3c7 100644
--- a/h-source/config.xml
+++ b/h-source/config.xml
@@ -33,7 +33,7 @@
 				<mod>
 					<type>TopLink</type>
 					<text>Βοήθεια</text>
-					<href><![CDATA[http://h-source/help/page/gr/Help]]></href>
+					<href><![CDATA[http://h-node.org/help/page/gr/Help]]></href>
 				</mod>
 			</gr>
 		</help_page_link>
@@ -42,35 +42,35 @@
 				<mod>
 					<type>TopLink</type>
 					<text>FAQ</text>
-					<href><![CDATA[http://h-source/faq/page/en/FAQ]]></href>
+					<href><![CDATA[http://h-node.org/faq/page/en/FAQ]]></href>
 				</mod>
 			</en>
 			<it>
 				<mod>
 					<type>TopLink</type>
 					<text>FAQ</text>
-					<href><![CDATA[http://h-source/faq/page/it/FAQ]]></href>
+					<href><![CDATA[http://h-node.org/faq/page/it/FAQ]]></href>
 				</mod>
 			</it>
 			<es>
 				<mod>
 					<type>TopLink</type>
 					<text>FAQ</text>
-					<href><![CDATA[http://h-source/faq/page/es/FAQ]]></href>
+					<href><![CDATA[http://h-node.org/faq/page/es/FAQ]]></href>
 				</mod>
 			</es>
 			<fr>
 				<mod>
 					<type>TopLink</type>
 					<text>FAQ</text>
-					<href><![CDATA[http://h-source/faq/page/fr/FAQ]]></href>
+					<href><![CDATA[http://h-node.org/faq/page/fr/FAQ]]></href>
 				</mod>
 			</fr>
 			<gr>
 				<mod>
 					<type>TopLink</type>
 					<text>FAQ</text>
-					<href><![CDATA[http://h-source/faq/page/gr/FAQ]]></href>
+					<href><![CDATA[http://h-node.org/faq/page/gr/FAQ]]></href>
 				</mod>
 			</gr>
 		</faq_link>
@@ -626,65 +626,59 @@
 					<en>
 						<mod>
 							<type>raw</type>
-							<text><![CDATA[ <a target="_blank" href="http://www.h-node.org/wiki/page/en/discover-your-hardware#The%20model%20name%20of%20your%20notebook" target="_blank">learn how to find it</a> ]]></text>
+							<text><![CDATA[ <a target="_blank" href="http://www.h-node.org/help/page/en/discover-your-hardware#The%20model%20name%20of%20your%20notebook" target="_blank">learn how to find it</a> ]]></text>
 						</mod>
 					</en>
 					<it>
 						<mod>
 							<type>raw</type>
-							<text><![CDATA[ <a target="_blank" href="http://www.h-node.org/wiki/page/en/Scopri-il-tuo-hardware#Il%20modello%20del%20tuo%20notebook" target="_blank">scopri come individuarlo</a> ]]></text>
+							<text><![CDATA[ <a target="_blank" href="http://www.h-node.org/help/page/en/Scopri-il-tuo-hardware#Il%20modello%20del%20tuo%20notebook" target="_blank">scopri come individuarlo</a> ]]></text>
 						</mod>
 					</it>
 					<es>
 						<mod>
 							<type>raw</type>
-							<text><![CDATA[ <a target="_blank" href="http://www.h-node.org/wiki/page/en/Descubra-su-hardware#El%20modelo%20de%20su%20computador%20port%C3%A1til" target="_blank">aprenda como encontrarlo</a> ]]></text>
+							<text><![CDATA[ <a target="_blank" href="http://www.h-node.org/help/page/en/Descubra-su-hardware#El%20modelo%20de%20su%20computador%20port%C3%A1til" target="_blank">aprenda como encontrarlo</a> ]]></text>
 						</mod>
 					</es>
-					<fr>
-						<mod>
-							<type>raw</type>
-							<text><![CDATA[ <a target="_blank" href="http://www.h-node.org/help/index/fr#discover-hardware" target="_blank">apprenez à le trouver</a> ]]></text>
-						</mod>
-					</fr>
-					<de>
-						<mod>
-							<type>raw</type>
-							<text><![CDATA[ <a target="_blank" href="http://www.h-node.org/help/index/de#discover-hardware" target="_blank">Wie kann man das herausfinden?</a> ]]></text>
-						</mod>
-					</de>
 				</model_name_entry_help_label>
 				<description_entry_help_label>
 					<en>
 						<mod>
 							<type>raw</type>
-							<text><![CDATA[ <a target="_blank" href="http://www.h-node.org/help/index/en#wiki-syntax">discover all the wiki tags</a> ]]></text>
+							<text><![CDATA[ <a target="_blank" href="http://h-node.org/help/page/en/wiki-tutorial">discover all the wiki tags</a> ]]></text>
 						</mod>
 					</en>
 					<it>
 						<mod>
 							<type>raw</type>
-							<text><![CDATA[ <a target="_blank" href="http://www.h-node.org/help/index/it#wiki-syntax">scopri tutti i tag della wiki</a> ]]></text>
+							<text><![CDATA[ <a target="_blank" href="http://h-node.org/help/page/it/wiki-tutorial">scopri tutti i tag della wiki</a> ]]></text>
 						</mod>
 					</it>
 					<es>
 						<mod>
 							<type>raw</type>
-							<text><![CDATA[ <a target="_blank" href="http://www.h-node.org/help/index/es#wiki-syntax">mostrar todas las etiquetas del wiki</a> ]]></text>
+							<text><![CDATA[ <a target="_blank" href="http://h-node.org/help/page/es/wiki-tutorial">mostrar todas las etiquetas del wiki</a> ]]></text>
 						</mod>
 					</es>
 					<fr>
 						<mod>
 							<type>raw</type>
-							<text><![CDATA[ <a target="_blank" href="http://www.h-node.org/help/index/fr#wiki-syntax">voir tous les tags wiki</a> ]]></text>
+							<text><![CDATA[ <a target="_blank" href="http://h-node.org/help/page/fr/wiki-tutorial">voir tous les tags wiki</a> ]]></text>
 						</mod>
 					</fr>
 					<de>
 						<mod>
 							<type>raw</type>
-							<text><![CDATA[ <a target="_blank" href="http://www.h-node.org/help/index/de#wiki-syntax">Wiki-Elemente</a> ]]></text>
+							<text><![CDATA[ <a target="_blank" href="http://h-node.org/help/page/de/wiki-tutorial">Wiki-Elemente</a> ]]></text>
 						</mod>
 					</de>
+					<gr>
+						<mod>
+							<type>raw</type>
+							<text><![CDATA[ <a target="_blank" href="http://h-node.org/help/page/gr/wiki-tutorial">Wiki-Elemente</a> ]]></text>
+						</mod>
+					</gr>
 				</description_entry_help_label>
 			</form>
 		</all>
@@ -782,18 +776,6 @@
 							<text><![CDATA[ <a target="_blank" href="http://www.h-node.org/wiki/page/en/Descubra-su-hardware#El%20c%C3%B3digo%20VendorID:ProductID%20de%20su%20dispositivo" target="blank">aprenda como encontrarlo</a> ]]></text>
 						</mod>
 					</es>
-					<fr>
-						<mod>
-							<type>raw</type>
-							<text><![CDATA[ <a target="_blank" href="http://www.h-node.org/help/index/fr#vendoridproductid" target="blank">apprenez à le trouver</a> ]]></text>
-						</mod>
-					</fr>
-					<de>
-						<mod>
-							<type>raw</type>
-							<text><![CDATA[ <a target="_blank" href="http://www.h-node.org/help/index/de#vendoridproductid" target="blank">Wie kann man das herausfinden?</a> ]]></text>
-						</mod>
-					</de>
 				</vendorid_productid_label>
 			</form>
 		</not_notebook>
@@ -809,7 +791,7 @@
 					<it>
 						<mod>
 							<type>raw</type>
-							<text><![CDATA[ <a target="_blank" href="http://h-node.org/wiki/page/en/guidelines-on-how-to-compile-a-hardware-device-page#Does%20the%20device%20prevent%20the%20installation%20of%20wifi%20cards%20not-approved%20by%20the%20vendor?" target="_blank">guida su come scegliere questo campo</a> ]]></text>
+							<text><![CDATA[ <a target="_blank" href="http://h-node.org/wiki/page/it/guidelines-on-how-to-compile-a-hardware-device-page#Does%20the%20device%20prevent%20the%20installation%20of%20wifi%20cards%20not-approved%20by%20the%20vendor?" target="_blank">guida su come scegliere questo campo</a> ]]></text>
 						</mod>
 					</it>
 				</prevent_wifi_label>
-- 
cgit v1.2.3