improved i18n

28 files changed, 61 insertions, 1081 deletions

diff --git a/h-source/Application/Controllers/BluetoothController.php b/h-source/Application/Controllers/BluetoothController.php
index 5d701e9..36751e8 100644
--- a/h-source/Application/Controllers/BluetoothController.php
+++ b/h-source/Application/Controllers/BluetoothController.php
@@ -66,6 +66,9 @@ class BluetoothController extends GenericController
 		$data['intefaceOptions'] = $interfaceOptions;
 		$data['worksOptions'] = $worksOptions;
 		$data['worksField'] = $worksField;
+
+		$data['notFoundString'] = "No bluetooth devices found";
+		
 		$this->append($data);
 	}
 	
diff --git a/h-source/Application/Controllers/EthernetcardsController.php b/h-source/Application/Controllers/EthernetcardsController.php
index 74e733c..6df8c4f 100644
--- a/h-source/Application/Controllers/EthernetcardsController.php
+++ b/h-source/Application/Controllers/EthernetcardsController.php
@@ -66,6 +66,9 @@ class EthernetcardsController extends GenericController
 		$data['intefaceOptions'] = $interfaceOptions;
 		$data['worksOptions'] = $worksOptions;
 		$data['worksField'] = $worksField;
+
+		$data['notFoundString'] = "No ethernet devices found";
+		
 		$this->append($data);
 	}
 	
diff --git a/h-source/Application/Controllers/FingerprintreadersController.php b/h-source/Application/Controllers/FingerprintreadersController.php
index 1ea22c4..deba3f4 100644
--- a/h-source/Application/Controllers/FingerprintreadersController.php
+++ b/h-source/Application/Controllers/FingerprintreadersController.php
@@ -66,6 +66,9 @@ class FingerprintreadersController extends GenericController
 		$data['intefaceOptions'] = $interfaceOptions;
 		$data['worksOptions'] = $worksOptions;
 		$data['worksField'] = $worksField;
+
+		$data['notFoundString'] = "No fingerprint readers found";
+		
 		$this->append($data);
 	}
 	
diff --git a/h-source/Application/Controllers/ModemsController.php b/h-source/Application/Controllers/ModemsController.php
index 35d555c..6917555 100644
--- a/h-source/Application/Controllers/ModemsController.php
+++ b/h-source/Application/Controllers/ModemsController.php
@@ -66,6 +66,9 @@ class ModemsController extends GenericController
 		$data['intefaceOptions'] = $interfaceOptions;
 		$data['worksOptions'] = $worksOptions;
 		$data['worksField'] = $worksField;
+
+		$data['notFoundString'] = "No modems found";
+
 		$this->append($data);
 	}
 	
diff --git a/h-source/Application/Controllers/PrintersController.php b/h-source/Application/Controllers/PrintersController.php
index 3e59702..3ff195b 100644
--- a/h-source/Application/Controllers/PrintersController.php
+++ b/h-source/Application/Controllers/PrintersController.php
@@ -87,6 +87,9 @@ class PrintersController extends GenericController
 		$data['intefaceOptions'] = Printer::$interface;
 		$data['worksOptions'] = Printer::$compatibility;
 		$data['worksField'] = 'compatibility';
+
+		$data['notFoundString'] = "No printers found";
+		
 		$this->append($data);
 	}
 	
diff --git a/h-source/Application/Controllers/ScannersController.php b/h-source/Application/Controllers/ScannersController.php
index c913cf7..1cbfd09 100644
--- a/h-source/Application/Controllers/ScannersController.php
+++ b/h-source/Application/Controllers/ScannersController.php
@@ -62,6 +62,9 @@ class ScannersController extends GenericController
 		$data['intefaceOptions'] = Printer::$interface;
 		$data['worksOptions'] = Printer::$compatibility;
 		$data['worksField'] = 'compatibility';
+
+		$data['notFoundString'] = "No scanners found";
+		
 		$this->append($data);
 	}
 	
diff --git a/h-source/Application/Controllers/SdcardreadersController.php b/h-source/Application/Controllers/SdcardreadersController.php
index c3f580a..d619b26 100644
--- a/h-source/Application/Controllers/SdcardreadersController.php
+++ b/h-source/Application/Controllers/SdcardreadersController.php
@@ -66,6 +66,9 @@ class SdcardreadersController extends GenericController
 		$data['intefaceOptions'] = $interfaceOptions;
 		$data['worksOptions'] = $worksOptions;
 		$data['worksField'] = $worksField;
+
+		$data['notFoundString'] = "No SD card readers found";
+		
 		$this->append($data);
 	}
 	
diff --git a/h-source/Application/Controllers/SoundcardsController.php b/h-source/Application/Controllers/SoundcardsController.php
index b032aaa..dcbce1a 100644
--- a/h-source/Application/Controllers/SoundcardsController.php
+++ b/h-source/Application/Controllers/SoundcardsController.php
@@ -62,6 +62,9 @@ class SoundcardsController extends GenericController
 		$data['intefaceOptions'] = Soundcards::$interface;
 		$data['worksOptions'] = Soundcards::$audioSelect;
 		$data['worksField'] = 'sound_card_works';
+
+		$data['notFoundString'] = "No sound cards found";
+		
 		$this->append($data);
 	}
 	
diff --git a/h-source/Application/Controllers/ThreegcardsController.php b/h-source/Application/Controllers/ThreegcardsController.php
index dbd1315..1681158 100644
--- a/h-source/Application/Controllers/ThreegcardsController.php
+++ b/h-source/Application/Controllers/ThreegcardsController.php
@@ -62,6 +62,9 @@ class ThreegcardsController extends GenericController
 		$data['intefaceOptions'] = Wifi::$interface;
 		$data['worksOptions'] = Wifi::$wifiSelect;
 		$data['worksField'] = 'wifi_works';
+
+		$data['notFoundString'] = "No 3G cards found";
+		
 		$this->append($data);
 	}
 	
diff --git a/h-source/Application/Controllers/VideocardsController.php b/h-source/Application/Controllers/VideocardsController.php
index f165713..0d2272a 100644
--- a/h-source/Application/Controllers/VideocardsController.php
+++ b/h-source/Application/Controllers/VideocardsController.php
@@ -62,6 +62,9 @@ class VideocardsController extends GenericController
 		$data['intefaceOptions'] = Videocard::$interface;
 		$data['worksOptions'] = Videocard::$videoSelect;
 		$data['worksField'] = 'video_card_works';
+
+		$data['notFoundString'] = "No video cards found";
+		
 		$this->append($data);
 	}
 	
diff --git a/h-source/Application/Controllers/WebcamsController.php b/h-source/Application/Controllers/WebcamsController.php
index e68e318..6d51d3d 100644
--- a/h-source/Application/Controllers/WebcamsController.php
+++ b/h-source/Application/Controllers/WebcamsController.php
@@ -62,6 +62,9 @@ class WebcamsController extends GenericController
 		$data['intefaceOptions'] = Webcams::$interface;
 		$data['worksOptions'] = Webcams::$select;
 		$data['worksField'] = 'webcam_works';
+
+		$data['notFoundString'] = "No webcams found";
+		
 		$this->append($data);
 	}
 	
diff --git a/h-source/Application/Controllers/WifiController.php b/h-source/Application/Controllers/WifiController.php
index fe86922..b2bcd73 100644
--- a/h-source/Application/Controllers/WifiController.php
+++ b/h-source/Application/Controllers/WifiController.php
@@ -62,6 +62,9 @@ class WifiController extends GenericController
 		$data['intefaceOptions'] = Wifi::$interface;
 		$data['worksOptions'] = Wifi::$wifiSelect;
 		$data['worksField'] = 'wifi_works';
+
+		$data['notFoundString'] = "No wifi cards found";
+		
 		$this->append($data);
 	}
 	
diff --git a/h-source/Application/Include/hardware.php b/h-source/Application/Include/hardware.php
index 4a651f6..c3827ad 100644
--- a/h-source/Application/Include/hardware.php
+++ b/h-source/Application/Include/hardware.php
@@ -32,6 +32,9 @@ class Hardware
 	public static $translations = array(
 		"amd64"		=>	'x86-64/amd64',
 		"PC-Card"	=>	'PCMCIA/PC-Card',
+		"works_with_3D"		=>	"works with 3D acceleration",
+		"works_without_3D"	=>	"works, but without 3D acceleration",
+		"does_not_work"		=>	"it does not work",
 	);
 
 	public static $regExpressions = array(
diff --git a/h-source/Application/Include/languages.php b/h-source/Application/Include/languages.php
index ecd7318..abdd0f2 100644
--- a/h-source/Application/Include/languages.php
+++ b/h-source/Application/Include/languages.php
@@ -342,6 +342,7 @@ class Lang
 				/*0294*/"alphabetically desc"	=>	"alfabeticamente decresc",
 				/*0295*/"undef"	=>	"tutti",
 				/*0296*/"All"	=>	"Tutti",
+				/*0297*/"inkjet"	=>	"getto d'inchiostro",
 			),
 		'es'	=>	array
 			(
diff --git a/h-source/Application/Views/Bluetooth/catalogue.php b/h-source/Application/Views/Bluetooth/catalogue.php
deleted file mode 100644
index e63f337..0000000
--- a/h-source/Application/Views/Bluetooth/catalogue.php
+++ /dev/null
@@ -1,89 +0,0 @@
-<?php if (!defined('EG')) die('Direct access not allowed!'); ?>
-
-<?php
-// h-source, a web software to build a community of people that want to share their hardware information.
-// Copyright (C) 2010  Antonio Gallo (h-source-copyright.txt)
-//
-// This file is part of h-source
-//
-// h-source is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-// 
-// h-source is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-// 
-// You should have received a copy of the GNU General Public License
-// along with h-source.  If not, see <http://www.gnu.org/licenses/>.
-?>
-
-		<div class="viewall_popup_menu_box_external">
-			<div class="viewall_popup_menu_box">
-				<?php echo $popup;?>
-			</div>
-			<div class="viewall_popup_menu_status">
-				<div class="viewall_popup_menu_status_item"><?php echo betterVendor($this->viewArgs['vendor'])?></div>
-				<div class="viewall_popup_menu_status_item"><?php echo $this->viewArgs['comm_year']?></div>
-				<div class="viewall_popup_menu_status_item"><?php echo $this->viewArgs['bluetooth_works']?></div>
-				<div class="viewall_popup_menu_status_item"><?php echo $this->viewArgs['interface']?></div>
-				<div class="viewall_popup_menu_status_item"><?php echo $this->viewArgs['sort-by']?></div>
-			</div>
-		</div>
-		
-		<!--if no notebooks found-->
-		<?php if (strcmp($recordNumber,0) === 0) { ?>
-		<div class="viewall_no_items_found">
-			<?php echo gtext("No bluetooth devices found");?>..
-		</div>
-		<?php } ?>
-		
-		<!--loop-->
-		<?php foreach ($table as $item) {?>
-		<div class="model_viewall">
-
-			<div class="notebook_model">
-				<img align="top" class="catalogue_item_icon" src="<?php echo Hardware::getIconFromType($item['hardware']['type']);?>"> <span class="span_model_name"><?php echo gtext("model");?>: <b><?php echo $item['hardware']['model'];?></b></span>
-			</div>
-
-			<?php if ( strcmp($item['hardware']['other_names'],'') !== 0 ) { ?>
-			<div class="notebook_vendor">
-				<div class="inner_label"><?php echo gtext("possible other names of the device");?>:</div>
-				<div class="inner_value"><?php echo nl2br($item['hardware']['other_names']);?></div>
-			</div>
-			<?php } ?>
-			
-			<div class="notebook_vendor">
-				<div class="inner_label"><?php echo gtext("vendor");?>:</div>
-				<div class="inner_value"><?php echo betterVendor($item['hardware']['vendor']);?></div>
-			</div>
-			
-			<div class="notebook_vendor">
-				<div class="inner_label"><?php echo gtext("year of commercialization");?>:</div>
-				<div class="inner_value"><b><?php echo $item['hardware']['comm_year'];?></b></div>
-			</div>
-			
-			<div class="notebook_vendor">
-				<div class="inner_label"><?php echo gtext("interface");?>:</div>
-				<div class="inner_value"><b><?php echo $item['hardware']['interface'];?></b></div>
-			</div>
-			
-			<div class="notebook_kernel">
-				<div class="inner_label"><?php echo gtext("does it work with free software?");?></div>
-				<div class="inner_value"><b><?php echo $item['hardware']['bluetooth_works'];?></b></div>
-			</div>
-			
-			<div class="notebook_view_link">
-				<a href="<?php echo $this->baseUrl."/".$this->controller."/view/$lang/".$item['hardware']['id_hard'].'/'.encodeUrl($item['hardware']['model']).$this->viewStatus;?>"><?php echo gtext("view the other specifications");?>..</a>
-			</div>
-			
-		</div>
-		<?php } ?>
-		
-		<?php if (strcmp($recordNumber,0) !== 0) { ?>
-		<div class="history_page_list">
-			<?php echo gtext("page list");?>: <?php echo $pageList;?>
-		</div>
-		<?php } ?>
\ No newline at end of file
diff --git a/h-source/Application/Views/Ethernetcards/catalogue.php b/h-source/Application/Views/Ethernetcards/catalogue.php
deleted file mode 100644
index 09cad9a..0000000
--- a/h-source/Application/Views/Ethernetcards/catalogue.php
+++ /dev/null
@@ -1,89 +0,0 @@
-<?php if (!defined('EG')) die('Direct access not allowed!'); ?>
-
-<?php
-// h-source, a web software to build a community of people that want to share their hardware information.
-// Copyright (C) 2010  Antonio Gallo (h-source-copyright.txt)
-//
-// This file is part of h-source
-//
-// h-source is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-// 
-// h-source is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-// 
-// You should have received a copy of the GNU General Public License
-// along with h-source.  If not, see <http://www.gnu.org/licenses/>.
-?>
-
-		<div class="viewall_popup_menu_box_external">
-			<div class="viewall_popup_menu_box">
-				<?php echo $popup;?>
-			</div>
-			<div class="viewall_popup_menu_status">
-				<div class="viewall_popup_menu_status_item"><?php echo betterVendor($this->viewArgs['vendor'])?></div>
-				<div class="viewall_popup_menu_status_item"><?php echo $this->viewArgs['comm_year']?></div>
-				<div class="viewall_popup_menu_status_item"><?php echo $this->viewArgs['ethernet_card_works']?></div>
-				<div class="viewall_popup_menu_status_item"><?php echo $this->viewArgs['interface']?></div>
-				<div class="viewall_popup_menu_status_item"><?php echo $this->viewArgs['sort-by']?></div>
-			</div>
-		</div>
-		
-		<!--if no notebooks found-->
-		<?php if (strcmp($recordNumber,0) === 0) { ?>
-		<div class="viewall_no_items_found">
-			<?php echo gtext("No ethernet devices found");?>..
-		</div>
-		<?php } ?>
-		
-		<!--loop-->
-		<?php foreach ($table as $item) {?>
-		<div class="model_viewall">
-
-			<div class="notebook_model">
-				<img align="top" class="catalogue_item_icon" src="<?php echo Hardware::getIconFromType($item['hardware']['type']);?>"> <span class="span_model_name"><?php echo gtext("model");?>: <b><?php echo $item['hardware']['model'];?></b></span>
-			</div>
-
-			<?php if ( strcmp($item['hardware']['other_names'],'') !== 0 ) { ?>
-			<div class="notebook_vendor">
-				<div class="inner_label"><?php echo gtext("possible other names of the device");?>:</div>
-				<div class="inner_value"><?php echo nl2br($item['hardware']['other_names']);?></div>
-			</div>
-			<?php } ?>
-			
-			<div class="notebook_vendor">
-				<div class="inner_label"><?php echo gtext("vendor");?>:</div>
-				<div class="inner_value"><?php echo betterVendor($item['hardware']['vendor']);?></div>
-			</div>
-			
-			<div class="notebook_vendor">
-				<div class="inner_label"><?php echo gtext("year of commercialization");?>:</div>
-				<div class="inner_value"><b><?php echo $item['hardware']['comm_year'];?></b></div>
-			</div>
-			
-			<div class="notebook_vendor">
-				<div class="inner_label"><?php echo gtext("interface");?>:</div>
-				<div class="inner_value"><b><?php echo $item['hardware']['interface'];?></b></div>
-			</div>
-			
-			<div class="notebook_kernel">
-				<div class="inner_label"><?php echo gtext("does it work with free software?");?></div>
-				<div class="inner_value"><b><?php echo $item['hardware']['ethernet_card_works'];?></b></div>
-			</div>
-			
-			<div class="notebook_view_link">
-				<a href="<?php echo $this->baseUrl."/".$this->controller."/view/$lang/".$item['hardware']['id_hard'].'/'.encodeUrl($item['hardware']['model']).$this->viewStatus;?>"><?php echo gtext("view the other specifications");?>..</a>
-			</div>
-			
-		</div>
-		<?php } ?>
-		
-		<?php if (strcmp($recordNumber,0) !== 0) { ?>
-		<div class="history_page_list">
-			<?php echo gtext("page list");?>: <?php echo $pageList;?>
-		</div>
-		<?php } ?>
\ No newline at end of file
diff --git a/h-source/Application/Views/Fingerprintreaders/catalogue.php b/h-source/Application/Views/Fingerprintreaders/catalogue.php
deleted file mode 100644
index 537caf6..0000000
--- a/h-source/Application/Views/Fingerprintreaders/catalogue.php
+++ /dev/null
@@ -1,89 +0,0 @@
-<?php if (!defined('EG')) die('Direct access not allowed!'); ?>
-
-<?php
-// h-source, a web software to build a community of people that want to share their hardware information.
-// Copyright (C) 2010  Antonio Gallo (h-source-copyright.txt)
-//
-// This file is part of h-source
-//
-// h-source is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-// 
-// h-source is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-// 
-// You should have received a copy of the GNU General Public License
-// along with h-source.  If not, see <http://www.gnu.org/licenses/>.
-?>
-
-		<div class="viewall_popup_menu_box_external">
-			<div class="viewall_popup_menu_box">
-				<?php echo $popup;?>
-			</div>
-			<div class="viewall_popup_menu_status">
-				<div class="viewall_popup_menu_status_item"><?php echo betterVendor($this->viewArgs['vendor'])?></div>
-				<div class="viewall_popup_menu_status_item"><?php echo $this->viewArgs['comm_year']?></div>
-				<div class="viewall_popup_menu_status_item"><?php echo $this->viewArgs['fingerprint_works']?></div>
-				<div class="viewall_popup_menu_status_item"><?php echo $this->viewArgs['interface']?></div>
-				<div class="viewall_popup_menu_status_item"><?php echo $this->viewArgs['sort-by']?></div>
-			</div>
-		</div>
-		
-		<!--if no notebooks found-->
-		<?php if (strcmp($recordNumber,0) === 0) { ?>
-		<div class="viewall_no_items_found">
-			<?php echo gtext("No fingerprint readers found");?>..
-		</div>
-		<?php } ?>
-		
-		<!--loop-->
-		<?php foreach ($table as $item) {?>
-		<div class="model_viewall">
-
-			<div class="notebook_model">
-				<img align="top" class="catalogue_item_icon" src="<?php echo Hardware::getIconFromType($item['hardware']['type']);?>"> <span class="span_model_name"><?php echo gtext("model");?>: <b><?php echo $item['hardware']['model'];?></b></span>
-			</div>
-
-			<?php if ( strcmp($item['hardware']['other_names'],'') !== 0 ) { ?>
-			<div class="notebook_vendor">
-				<div class="inner_label"><?php echo gtext("possible other names of the device");?>:</div>
-				<div class="inner_value"><?php echo nl2br($item['hardware']['other_names']);?></div>
-			</div>
-			<?php } ?>
-			
-			<div class="notebook_vendor">
-				<div class="inner_label"><?php echo gtext("vendor");?>:</div>
-				<div class="inner_value"><?php echo betterVendor($item['hardware']['vendor']);?></div>
-			</div>
-			
-			<div class="notebook_vendor">
-				<div class="inner_label"><?php echo gtext("year of commercialization");?>:</div>
-				<div class="inner_value"><b><?php echo $item['hardware']['comm_year'];?></b></div>
-			</div>
-			
-			<div class="notebook_vendor">
-				<div class="inner_label"><?php echo gtext("interface");?>:</div>
-				<div class="inner_value"><b><?php echo $item['hardware']['interface'];?></b></div>
-			</div>
-			
-			<div class="notebook_kernel">
-				<div class="inner_label"><?php echo gtext("does it work with free software?");?></div>
-				<div class="inner_value"><b><?php echo $item['hardware']['fingerprint_works'];?></b></div>
-			</div>
-			
-			<div class="notebook_view_link">
-				<a href="<?php echo $this->baseUrl."/".$this->controller."/view/$lang/".$item['hardware']['id_hard'].'/'.encodeUrl($item['hardware']['model']).$this->viewStatus;?>"><?php echo gtext("view the other specifications");?>..</a>
-			</div>
-			
-		</div>
-		<?php } ?>
-		
-		<?php if (strcmp($recordNumber,0) !== 0) { ?>
-		<div class="history_page_list">
-			<?php echo gtext("page list");?>: <?php echo $pageList;?>
-		</div>
-		<?php } ?>
\ No newline at end of file
diff --git a/h-source/Application/Views/Modems/catalogue.php b/h-source/Application/Views/Modems/catalogue.php
deleted file mode 100644
index 9ac0e44..0000000
--- a/h-source/Application/Views/Modems/catalogue.php
+++ /dev/null
@@ -1,89 +0,0 @@
-<?php if (!defined('EG')) die('Direct access not allowed!'); ?>
-
-<?php
-// h-source, a web software to build a community of people that want to share their hardware information.
-// Copyright (C) 2010  Antonio Gallo (h-source-copyright.txt)
-//
-// This file is part of h-source
-//
-// h-source is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-// 
-// h-source is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-// 
-// You should have received a copy of the GNU General Public License
-// along with h-source.  If not, see <http://www.gnu.org/licenses/>.
-?>
-
-		<div class="viewall_popup_menu_box_external">
-			<div class="viewall_popup_menu_box">
-				<?php echo $popup;?>
-			</div>
-			<div class="viewall_popup_menu_status">
-				<div class="viewall_popup_menu_status_item"><?php echo betterVendor($this->viewArgs['vendor'])?></div>
-				<div class="viewall_popup_menu_status_item"><?php echo $this->viewArgs['comm_year']?></div>
-				<div class="viewall_popup_menu_status_item"><?php echo $this->viewArgs['compatibility']?></div>
-				<div class="viewall_popup_menu_status_item"><?php echo $this->viewArgs['interface']?></div>
-				<div class="viewall_popup_menu_status_item"><?php echo $this->viewArgs['sort-by']?></div>
-			</div>
-		</div>
-		
-		<!--if no notebooks found-->
-		<?php if (strcmp($recordNumber,0) === 0) { ?>
-		<div class="viewall_no_items_found">
-			<?php echo gtext("No modems found");?>..
-		</div>
-		<?php } ?>
-		
-		<!--loop-->
-		<?php foreach ($table as $item) {?>
-		<div class="model_viewall">
-
-			<div class="notebook_model">
-				<img align="top" class="catalogue_item_icon" src="<?php echo Hardware::getIconFromType($item['hardware']['type']);?>"> <span class="span_model_name"><?php echo gtext("model");?>: <b><?php echo $item['hardware']['model'];?></b></span>
-			</div>
-
-			<?php if ( strcmp($item['hardware']['other_names'],'') !== 0 ) { ?>
-			<div class="notebook_vendor">
-				<div class="inner_label"><?php echo gtext("possible other names of the device");?>:</div>
-				<div class="inner_value"><?php echo nl2br($item['hardware']['other_names']);?></div>
-			</div>
-			<?php } ?>
-			
-			<div class="notebook_vendor">
-				<div class="inner_label"><?php echo gtext("vendor");?>:</div>
-				<div class="inner_value"><?php echo betterVendor($item['hardware']['vendor']);?></div>
-			</div>
-			
-			<div class="notebook_vendor">
-				<div class="inner_label"><?php echo gtext("year of commercialization");?>:</div>
-				<div class="inner_value"><b><?php echo $item['hardware']['comm_year'];?></b></div>
-			</div>
-			
-			<div class="notebook_vendor">
-				<div class="inner_label"><?php echo gtext("interface");?>:</div>
-				<div class="inner_value"><b><?php echo $item['hardware']['interface'];?></b></div>
-			</div>
-			
-			<div class="notebook_kernel">
-				<div class="inner_label"><?php echo gtext("does it work with free software?");?></div>
-				<div class="inner_value"><b><?php echo $item['hardware']['compatibility'];?></b></div>
-			</div>
-			
-			<div class="notebook_view_link">
-				<a href="<?php echo $this->baseUrl."/".$this->controller."/view/$lang/".$item['hardware']['id_hard'].'/'.encodeUrl($item['hardware']['model']).$this->viewStatus;?>"><?php echo gtext("view the other specifications");?>..</a>
-			</div>
-			
-		</div>
-		<?php } ?>
-		
-		<?php if (strcmp($recordNumber,0) !== 0) { ?>
-		<div class="history_page_list">
-			<?php echo gtext("page list");?>: <?php echo $pageList;?>
-		</div>
-		<?php } ?>
\ No newline at end of file
diff --git a/h-source/Application/Views/Printers/catalogue.php b/h-source/Application/Views/Printers/catalogue.php
deleted file mode 100644
index bb24e35..0000000
--- a/h-source/Application/Views/Printers/catalogue.php
+++ /dev/null
@@ -1,94 +0,0 @@
-<?php if (!defined('EG')) die('Direct access not allowed!'); ?>
-
-<?php
-// h-source, a web software to build a community of people that want to share their hardware information.
-// Copyright (C) 2010  Antonio Gallo (h-source-copyright.txt)
-//
-// This file is part of h-source
-//
-// h-source is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-// 
-// h-source is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-// 
-// You should have received a copy of the GNU General Public License
-// along with h-source.  If not, see <http://www.gnu.org/licenses/>.
-?>
-
-		<div class="viewall_popup_menu_box_external">
-			<div class="viewall_popup_menu_box">
-				<?php echo $popup;?>
-			</div>
-			<div class="viewall_popup_menu_status">
-				<div class="viewall_popup_menu_status_item"><?php echo betterVendor($this->viewArgs['vendor']);?></div>
-				<div class="viewall_popup_menu_status_item"><?php echo $this->viewArgs['compatibility'];?></div>
-				<div class="viewall_popup_menu_status_item"><?php echo $this->viewArgs['comm_year'];?></div>
-				<div class="viewall_popup_menu_status_item"><?php echo $this->viewArgs['interface'];?></div>
-				<div class="viewall_popup_menu_status_item"><?php echo $this->viewArgs['sort-by'];?></div>
-			</div>
-		</div>
-		
-		<!--if no notebooks found-->
-		<?php if (strcmp($recordNumber,0) === 0) { ?>
-		<div class="viewall_no_items_found">
-			<?php echo gtext("No printers found");?>..
-		</div>
-		<?php } ?>
-		
-		<!--loop-->
-		<?php foreach ($table as $item) {?>
-		<div class="model_viewall">
-
-			<div class="notebook_model">
-				<img align="top" class="catalogue_item_icon" src="<?php echo Hardware::getIconFromType($item['hardware']['type']);?>"> <span class="span_model_name"><?php echo gtext("model");?>: <b><?php echo $item['hardware']['model'];?></b></span>
-			</div>
-
-			<?php if ( strcmp($item['hardware']['other_names'],'') !== 0 ) { ?>
-			<div class="notebook_vendor">
-				<div class="inner_label"><?php echo gtext("possible other names of the device");?>:</div>
-				<div class="inner_value"><?php echo nl2br($item['hardware']['other_names']);?></div>
-			</div>
-			<?php } ?>
-
-			<div class="notebook_vendor">
-				<div class="inner_label"><?php echo gtext("vendor");?>:</div>
-				<div class="inner_value"><?php echo betterVendor($item['hardware']['vendor']);?></div>
-			</div>
-			
-			<div class="notebook_vendor">
-				<div class="inner_label"><?php echo gtext("year of commercialization");?>:</div>
-				<div class="inner_value"><b><?php echo $item['hardware']['comm_year'];?></b></div>
-			</div>
-			
-			<div class="notebook_vendor">
-				<div class="inner_label"><?php echo gtext("interface");?>:</div>
-				<div class="inner_value"><b><?php echo $item['hardware']['interface'];?></b></div>
-			</div>
-			
-			<div class="notebook_compatibility">
-				<div class="inner_label"><?php echo gtext("compatibility with free software");?>:</div>
-				<div class="inner_value"><?php echo $item['hardware']['compatibility'];?></div>
-			</div>
-
-			<div class="notebook_kernel">
-				<div class="inner_label"><?php echo gtext("does it adopt any techniques to track users?");?></div>
-				<div class="inner_value"><b><?php echo $item['hardware']['it_tracks_users'];?></b></div>
-			</div>
-			
-			<div class="notebook_view_link">
-				<a href="<?php echo $this->baseUrl."/".$this->controller."/view/$lang/".$item['hardware']['id_hard'].'/'.encodeUrl($item['hardware']['model']).$this->viewStatus;?>"><?php echo gtext("view the other specifications");?>..</a>
-			</div>
-			
-		</div>
-		<?php } ?>
-		
-		<?php if (strcmp($recordNumber,0) !== 0) { ?>
-		<div class="history_page_list">
-			<?php echo gtext("page list");?>: <?php echo $pageList;?>
-		</div>
-		<?php } ?>
\ No newline at end of file
diff --git a/h-source/Application/Views/Scanners/catalogue.php b/h-source/Application/Views/Scanners/catalogue.php
deleted file mode 100644
index 549c5c9..0000000
--- a/h-source/Application/Views/Scanners/catalogue.php
+++ /dev/null
@@ -1,89 +0,0 @@
-<?php if (!defined('EG')) die('Direct access not allowed!'); ?>
-
-<?php
-// h-source, a web software to build a community of people that want to share their hardware information.
-// Copyright (C) 2010  Antonio Gallo (h-source-copyright.txt)
-//
-// This file is part of h-source
-//
-// h-source is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-// 
-// h-source is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-// 
-// You should have received a copy of the GNU General Public License
-// along with h-source.  If not, see <http://www.gnu.org/licenses/>.
-?>
-
-		<div class="viewall_popup_menu_box_external">
-			<div class="viewall_popup_menu_box">
-				<?php echo $popup;?>
-			</div>
-			<div class="viewall_popup_menu_status">
-				<div class="viewall_popup_menu_status_item"><?php echo betterVendor($this->viewArgs['vendor'])?></div>
-				<div class="viewall_popup_menu_status_item"><?php echo $this->viewArgs['compatibility']?></div>
-				<div class="viewall_popup_menu_status_item"><?php echo $this->viewArgs['comm_year']?></div>
-				<div class="viewall_popup_menu_status_item"><?php echo $this->viewArgs['interface']?></div>
-				<div class="viewall_popup_menu_status_item"><?php echo $this->viewArgs['sort-by']?></div>
-			</div>
-		</div>
-		
-		<!--if no notebooks found-->
-		<?php if (strcmp($recordNumber,0) === 0) { ?>
-		<div class="viewall_no_items_found">
-			<?php echo gtext("No scanners found");?>...
-		</div>
-		<?php } ?>
-		
-		<!--loop-->
-		<?php foreach ($table as $item) {?>
-		<div class="model_viewall">
-
-			<div class="notebook_model">
-				<img align="top" class="catalogue_item_icon" src="<?php echo Hardware::getIconFromType($item['hardware']['type']);?>"> <span class="span_model_name"><?php echo gtext("model");?>: <b><?php echo $item['hardware']['model'];?></b></span>
-			</div>
-
-			<?php if ( strcmp($item['hardware']['other_names'],'') !== 0 ) { ?>
-			<div class="notebook_vendor">
-				<div class="inner_label"><?php echo gtext("possible other names of the device");?>:</div>
-				<div class="inner_value"><?php echo nl2br($item['hardware']['other_names']);?></div>
-			</div>
-			<?php } ?>
-			
-			<div class="notebook_vendor">
-				<div class="inner_label"><?php echo gtext("vendor");?>:</div>
-				<div class="inner_value"><?php echo betterVendor($item['hardware']['vendor']);?></div>
-			</div>
-			
-			<div class="notebook_vendor">
-				<div class="inner_label"><?php echo gtext("year of commercialization");?>:</div>
-				<div class="inner_value"><b><?php echo $item['hardware']['comm_year'];?></b></div>
-			</div>
-			
-			<div class="notebook_vendor">
-				<div class="inner_label"><?php echo gtext("interface");?>:</div>
-				<div class="inner_value"><b><?php echo $item['hardware']['interface'];?></b></div>
-			</div>
-			
-			<div class="notebook_compatibility">
-				<div class="inner_label"><?php echo gtext("compatibility with free software");?>:</div>
-				<div class="inner_value"><?php echo $item['hardware']['compatibility'];?></div>
-			</div>
-			
-			<div class="notebook_view_link">
-				<a href="<?php echo $this->baseUrl."/".$this->controller."/view/$lang/".$item['hardware']['id_hard'].'/'.encodeUrl($item['hardware']['model']).$this->viewStatus;?>"><?php echo gtext("view the other specifications");?>..</a>
-			</div>
-			
-		</div>
-		<?php } ?>
-		
-		<?php if (strcmp($recordNumber,0) !== 0) { ?>
-		<div class="history_page_list">
-			<?php echo gtext("page list");?>: <?php echo $pageList;?>
-		</div>
-		<?php } ?>
\ No newline at end of file
diff --git a/h-source/Application/Views/Sdcardreaders/catalogue.php b/h-source/Application/Views/Sdcardreaders/catalogue.php
deleted file mode 100644
index 90aae04..0000000
--- a/h-source/Application/Views/Sdcardreaders/catalogue.php
+++ /dev/null
@@ -1,89 +0,0 @@
-<?php if (!defined('EG')) die('Direct access not allowed!'); ?>
-
-<?php
-// h-source, a web software to build a community of people that want to share their hardware information.
-// Copyright (C) 2010  Antonio Gallo (h-source-copyright.txt)
-//
-// This file is part of h-source
-//
-// h-source is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-// 
-// h-source is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-// 
-// You should have received a copy of the GNU General Public License
-// along with h-source.  If not, see <http://www.gnu.org/licenses/>.
-?>
-
-		<div class="viewall_popup_menu_box_external">
-			<div class="viewall_popup_menu_box">
-				<?php echo $popup;?>
-			</div>
-			<div class="viewall_popup_menu_status">
-				<div class="viewall_popup_menu_status_item"><?php echo betterVendor($this->viewArgs['vendor'])?></div>
-				<div class="viewall_popup_menu_status_item"><?php echo $this->viewArgs['comm_year']?></div>
-				<div class="viewall_popup_menu_status_item"><?php echo $this->viewArgs['sd_card_works']?></div>
-				<div class="viewall_popup_menu_status_item"><?php echo $this->viewArgs['interface']?></div>
-				<div class="viewall_popup_menu_status_item"><?php echo $this->viewArgs['sort-by']?></div>
-			</div>
-		</div>
-		
-		<!--if no notebooks found-->
-		<?php if (strcmp($recordNumber,0) === 0) { ?>
-		<div class="viewall_no_items_found">
-			<?php echo gtext("No SD card readers found");?>..
-		</div>
-		<?php } ?>
-		
-		<!--loop-->
-		<?php foreach ($table as $item) {?>
-		<div class="model_viewall">
-
-			<div class="notebook_model">
-				<img align="top" class="catalogue_item_icon" src="<?php echo Hardware::getIconFromType($item['hardware']['type']);?>"> <span class="span_model_name"><?php echo gtext("model");?>: <b><?php echo $item['hardware']['model'];?></b></span>
-			</div>
-
-			<?php if ( strcmp($item['hardware']['other_names'],'') !== 0 ) { ?>
-			<div class="notebook_vendor">
-				<div class="inner_label"><?php echo gtext("possible other names of the device");?>:</div>
-				<div class="inner_value"><?php echo nl2br($item['hardware']['other_names']);?></div>
-			</div>
-			<?php } ?>
-			
-			<div class="notebook_vendor">
-				<div class="inner_label"><?php echo gtext("vendor");?>:</div>
-				<div class="inner_value"><?php echo betterVendor($item['hardware']['vendor']);?></div>
-			</div>
-			
-			<div class="notebook_vendor">
-				<div class="inner_label"><?php echo gtext("year of commercialization");?>:</div>
-				<div class="inner_value"><b><?php echo $item['hardware']['comm_year'];?></b></div>
-			</div>
-			
-			<div class="notebook_vendor">
-				<div class="inner_label"><?php echo gtext("interface");?>:</div>
-				<div class="inner_value"><b><?php echo $item['hardware']['interface'];?></b></div>
-			</div>
-			
-			<div class="notebook_kernel">
-				<div class="inner_label"><?php echo gtext("does it work with free software?");?></div>
-				<div class="inner_value"><b><?php echo $item['hardware']['sd_card_works'];?></b></div>
-			</div>
-			
-			<div class="notebook_view_link">
-				<a href="<?php echo $this->baseUrl."/".$this->controller."/view/$lang/".$item['hardware']['id_hard'].'/'.encodeUrl($item['hardware']['model']).$this->viewStatus;?>"><?php echo gtext("view the other specifications");?>..</a>
-			</div>
-			
-		</div>
-		<?php } ?>
-		
-		<?php if (strcmp($recordNumber,0) !== 0) { ?>
-		<div class="history_page_list">
-			<?php echo gtext("page list");?>: <?php echo $pageList;?>
-		</div>
-		<?php } ?>
\ No newline at end of file
diff --git a/h-source/Application/Views/Soundcards/catalogue.php b/h-source/Application/Views/Soundcards/catalogue.php
deleted file mode 100644
index e4b265b..0000000
--- a/h-source/Application/Views/Soundcards/catalogue.php
+++ /dev/null
@@ -1,89 +0,0 @@
-<?php if (!defined('EG')) die('Direct access not allowed!'); ?>
-
-<?php
-// h-source, a web software to build a community of people that want to share their hardware information.
-// Copyright (C) 2010  Antonio Gallo (h-source-copyright.txt)
-//
-// This file is part of h-source
-//
-// h-source is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-// 
-// h-source is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-// 
-// You should have received a copy of the GNU General Public License
-// along with h-source.  If not, see <http://www.gnu.org/licenses/>.
-?>
-
-		<div class="viewall_popup_menu_box_external">
-			<div class="viewall_popup_menu_box">
-				<?php echo $popup;?>
-			</div>
-			<div class="viewall_popup_menu_status">
-				<div class="viewall_popup_menu_status_item"><?php echo betterVendor($this->viewArgs['vendor'])?></div>
-				<div class="viewall_popup_menu_status_item"><?php echo $this->viewArgs['comm_year']?></div>
-				<div class="viewall_popup_menu_status_item"><?php echo $this->viewArgs['sound_card_works']?></div>
-				<div class="viewall_popup_menu_status_item"><?php echo $this->viewArgs['interface']?></div>
-				<div class="viewall_popup_menu_status_item"><?php echo $this->viewArgs['sort-by']?></div>
-			</div>
-		</div>
-		
-		<!--if no notebooks found-->
-		<?php if (strcmp($recordNumber,0) === 0) { ?>
-		<div class="viewall_no_items_found">
-			<?php echo gtext("No sound cards found");?>..
-		</div>
-		<?php } ?>
-		
-		<!--loop-->
-		<?php foreach ($table as $item) {?>
-		<div class="model_viewall">
-
-			<div class="notebook_model">
-				<img align="top" class="catalogue_item_icon" src="<?php echo Hardware::getIconFromType($item['hardware']['type']);?>"> <span class="span_model_name"><?php echo gtext("model");?>: <b><?php echo $item['hardware']['model'];?></b></span>
-			</div>
-
-			<?php if ( strcmp($item['hardware']['other_names'],'') !== 0 ) { ?>
-			<div class="notebook_vendor">
-				<div class="inner_label"><?php echo gtext("possible other names of the device");?>:</div>
-				<div class="inner_value"><?php echo nl2br($item['hardware']['other_names']);?></div>
-			</div>
-			<?php } ?>
-			
-			<div class="notebook_vendor">
-				<div class="inner_label"><?php echo gtext("vendor");?>:</div>
-				<div class="inner_value"><?php echo betterVendor($item['hardware']['vendor']);?></div>
-			</div>
-			
-			<div class="notebook_vendor">
-				<div class="inner_label"><?php echo gtext("year of commercialization");?>:</div>
-				<div class="inner_value"><b><?php echo $item['hardware']['comm_year'];?></b></div>
-			</div>
-			
-			<div class="notebook_vendor">
-				<div class="inner_label"><?php echo gtext("interface");?>:</div>
-				<div class="inner_value"><b><?php echo $item['hardware']['interface'];?></b></div>
-			</div>
-			
-			<div class="notebook_kernel">
-				<div class="inner_label"><?php echo gtext("does it work with free software?");?></div>
-				<div class="inner_value"><b><?php echo $item['hardware']['sound_card_works'];?></b></div>
-			</div>
-			
-			<div class="notebook_view_link">
-				<a href="<?php echo $this->baseUrl."/".$this->controller."/view/$lang/".$item['hardware']['id_hard'].'/'.encodeUrl($item['hardware']['model']).$this->viewStatus;?>"><?php echo gtext("view the other specifications");?>..</a>
-			</div>
-			
-		</div>
-		<?php } ?>
-		
-		<?php if (strcmp($recordNumber,0) !== 0) { ?>
-		<div class="history_page_list">
-			<?php echo gtext("page list");?>: <?php echo $pageList;?>
-		</div>
-		<?php } ?>
\ No newline at end of file
diff --git a/h-source/Application/Views/Threegcards/catalogue.php b/h-source/Application/Views/Threegcards/catalogue.php
deleted file mode 100644
index 6b17e55..0000000
--- a/h-source/Application/Views/Threegcards/catalogue.php
+++ /dev/null
@@ -1,89 +0,0 @@
-<?php if (!defined('EG')) die('Direct access not allowed!'); ?>
-
-<?php
-// h-source, a web software to build a community of people that want to share their hardware information.
-// Copyright (C) 2010  Antonio Gallo (h-source-copyright.txt)
-//
-// This file is part of h-source
-//
-// h-source is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-// 
-// h-source is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-// 
-// You should have received a copy of the GNU General Public License
-// along with h-source.  If not, see <http://www.gnu.org/licenses/>.
-?>
-
-		<div class="viewall_popup_menu_box_external">
-			<div class="viewall_popup_menu_box">
-				<?php echo $popup;?>
-			</div>
-			<div class="viewall_popup_menu_status">
-				<div class="viewall_popup_menu_status_item"><?php echo betterVendor($this->viewArgs['vendor']);?></div>
-				<div class="viewall_popup_menu_status_item"><?php echo $this->viewArgs['comm_year']?></div>
-				<div class="viewall_popup_menu_status_item"><?php echo $this->viewArgs['wifi_works']?></div>
-				<div class="viewall_popup_menu_status_item"><?php echo translate($this->viewArgs['interface'])?></div>
-				<div class="viewall_popup_menu_status_item"><?php echo $this->viewArgs['sort-by']?></div>
-			</div>
-		</div>
-		
-		<!--if no notebooks found-->
-		<?php if (strcmp($recordNumber,0) === 0) { ?>
-		<div class="viewall_no_items_found">
-			<?php echo gtext("No 3G cards found");?>..
-		</div>
-		<?php } ?>
-		
-		<!--loop-->
-		<?php foreach ($table as $item) {?>
-		<div class="model_viewall">
-
-			<div class="notebook_model">
-				<img align="top" class="catalogue_item_icon" src="<?php echo Hardware::getIconFromType($item['hardware']['type']);?>"> <span class="span_model_name"><?php echo gtext("model");?>: <b><?php echo $item['hardware']['model'];?></b></span>
-			</div>
-
-			<?php if ( strcmp($item['hardware']['other_names'],'') !== 0 ) { ?>
-			<div class="notebook_vendor">
-				<div class="inner_label"><?php echo gtext("possible other names of the device");?>:</div>
-				<div class="inner_value"><?php echo nl2br($item['hardware']['other_names']);?></div>
-			</div>
-			<?php } ?>
-			
-			<div class="notebook_vendor">
-				<div class="inner_label"><?php echo gtext("vendor");?>:</div>
-				<div class="inner_value"><?php echo betterVendor($item['hardware']['vendor']);?></div>
-			</div>
-			
-			<div class="notebook_vendor">
-				<div class="inner_label"><?php echo gtext("year of commercialization");?>:</div>
-				<div class="inner_value"><b><?php echo $item['hardware']['comm_year'];?></b></div>
-			</div>
-			
-			<div class="notebook_vendor">
-				<div class="inner_label"><?php echo gtext("interface");?>:</div>
-				<div class="inner_value"><b><?php echo translate($item['hardware']['interface']);?></b></div>
-			</div>
-			
-			<div class="notebook_kernel">
-				<div class="inner_label"><?php echo gtext("does it work with free software?");?></div>
-				<div class="inner_value"><b><?php echo $item['hardware']['wifi_works'];?></b></div>
-			</div>
-			
-			<div class="notebook_view_link">
-				<a href="<?php echo $this->baseUrl."/".$this->controller."/view/$lang/".$item['hardware']['id_hard'].'/'.encodeUrl($item['hardware']['model']).$this->viewStatus;?>"><?php echo gtext("view the other specifications");?>..</a>
-			</div>
-			
-		</div>
-		<?php } ?>
-		
-		<?php if (strcmp($recordNumber,0) !== 0) { ?>
-		<div class="history_page_list">
-			<?php echo gtext("page list");?>: <?php echo $pageList;?>
-		</div>
-		<?php } ?>
\ No newline at end of file
diff --git a/h-source/Application/Views/Videocards/catalogue.php b/h-source/Application/Views/Videocards/catalogue.php
deleted file mode 100644
index 155c30b..0000000
--- a/h-source/Application/Views/Videocards/catalogue.php
+++ /dev/null
@@ -1,89 +0,0 @@
-<?php if (!defined('EG')) die('Direct access not allowed!'); ?>
-
-<?php
-// h-source, a web software to build a community of people that want to share their hardware information.
-// Copyright (C) 2010  Antonio Gallo (h-source-copyright.txt)
-//
-// This file is part of h-source
-//
-// h-source is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-// 
-// h-source is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-// 
-// You should have received a copy of the GNU General Public License
-// along with h-source.  If not, see <http://www.gnu.org/licenses/>.
-?>
-
-		<div class="viewall_popup_menu_box_external">
-			<div class="viewall_popup_menu_box">
-				<?php echo $popup;?>
-			</div>
-			<div class="viewall_popup_menu_status">
-				<div class="viewall_popup_menu_status_item"><?php echo betterVendor($this->viewArgs['vendor']);?></div>
-				<div class="viewall_popup_menu_status_item"><?php echo $this->viewArgs['comm_year']?></div>
-				<div class="viewall_popup_menu_status_item"><?php echo $this->viewArgs['video_card_works']?></div>
-				<div class="viewall_popup_menu_status_item"><?php echo $this->viewArgs['interface']?></div>
-				<div class="viewall_popup_menu_status_item"><?php echo $this->viewArgs['sort-by']?></div>
-			</div>
-		</div>
-		
-		<!--if no notebooks found-->
-		<?php if (strcmp($recordNumber,0) === 0) { ?>
-		<div class="viewall_no_items_found">
-			<?php echo gtext("No video cards found");?>..
-		</div>
-		<?php } ?>
-		
-		<!--loop-->
-		<?php foreach ($table as $item) {?>
-		<div class="model_viewall">
-
-			<div class="notebook_model">
-				<img align="top" class="catalogue_item_icon" src="<?php echo Hardware::getIconFromType($item['hardware']['type']);?>"> <span class="span_model_name"><?php echo gtext("model");?>: <b><?php echo $item['hardware']['model'];?></b></span>
-			</div>
-
-			<?php if ( strcmp($item['hardware']['other_names'],'') !== 0 ) { ?>
-			<div class="notebook_vendor">
-				<div class="inner_label"><?php echo gtext("possible other names of the device");?>:</div>
-				<div class="inner_value"><?php echo nl2br($item['hardware']['other_names']);?></div>
-			</div>
-			<?php } ?>
-			
-			<div class="notebook_vendor">
-				<div class="inner_label"><?php echo gtext("vendor");?>:</div>
-				<div class="inner_value"><?php echo betterVendor($item['hardware']['vendor']);?></div>
-			</div>
-			
-			<div class="notebook_vendor">
-				<div class="inner_label"><?php echo gtext("year of commercialization");?>:</div>
-				<div class="inner_value"><b><?php echo $item['hardware']['comm_year'];?></b></div>
-			</div>
-			
-			<div class="notebook_vendor">
-				<div class="inner_label"><?php echo gtext("interface");?>:</div>
-				<div class="inner_value"><b><?php echo $item['hardware']['interface'];?></b></div>
-			</div>
-			
-			<div class="notebook_kernel">
-				<div class="inner_label"><?php echo gtext("how does it work with free software?");?></div>
-				<div class="inner_value"><b><?php echo Videocard::$videoReverse[$item['hardware']['video_card_works']];?></b></div>
-			</div>
-			
-			<div class="notebook_view_link">
-				<a href="<?php echo $this->baseUrl."/".$this->controller."/view/$lang/".$item['hardware']['id_hard'].'/'.encodeUrl($item['hardware']['model']).$this->viewStatus;?>"><?php echo gtext("view the other specifications");?>..</a>
-			</div>
-			
-		</div>
-		<?php } ?>
-		
-		<?php if (strcmp($recordNumber,0) !== 0) { ?>
-		<div class="history_page_list">
-			<?php echo gtext("page list");?>: <?php echo $pageList;?>
-		</div>
-		<?php } ?>
\ No newline at end of file
diff --git a/h-source/Application/Views/Webcams/catalogue.php b/h-source/Application/Views/Webcams/catalogue.php
deleted file mode 100644
index 5294f46..0000000
--- a/h-source/Application/Views/Webcams/catalogue.php
+++ /dev/null
@@ -1,89 +0,0 @@
-<?php if (!defined('EG')) die('Direct access not allowed!'); ?>
-
-<?php
-// h-source, a web software to build a community of people that want to share their hardware information.
-// Copyright (C) 2010  Antonio Gallo (h-source-copyright.txt)
-//
-// This file is part of h-source
-//
-// h-source is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-// 
-// h-source is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-// 
-// You should have received a copy of the GNU General Public License
-// along with h-source.  If not, see <http://www.gnu.org/licenses/>.
-?>
-
-		<div class="viewall_popup_menu_box_external">
-			<div class="viewall_popup_menu_box">
-				<?php echo $popup;?>
-			</div>
-			<div class="viewall_popup_menu_status">
-				<div class="viewall_popup_menu_status_item"><?php echo betterVendor($this->viewArgs['vendor'])?></div>
-				<div class="viewall_popup_menu_status_item"><?php echo $this->viewArgs['comm_year']?></div>
-				<div class="viewall_popup_menu_status_item"><?php echo $this->viewArgs['webcam_works']?></div>
-				<div class="viewall_popup_menu_status_item"><?php echo $this->viewArgs['interface']?></div>
-				<div class="viewall_popup_menu_status_item"><?php echo $this->viewArgs['sort-by']?></div>
-			</div>
-		</div>
-		
-		<!--if no notebooks found-->
-		<?php if (strcmp($recordNumber,0) === 0) { ?>
-		<div class="viewall_no_items_found">
-			<?php echo gtext("No webcams found");?>..
-		</div>
-		<?php } ?>
-		
-		<!--loop-->
-		<?php foreach ($table as $item) {?>
-		<div class="model_viewall">
-
-			<div class="notebook_model">
-				<img align="top" class="catalogue_item_icon" src="<?php echo Hardware::getIconFromType($item['hardware']['type']);?>"> <span class="span_model_name"><?php echo gtext("model");?>: <b><?php echo $item['hardware']['model'];?></b></span>
-			</div>
-
-			<?php if ( strcmp($item['hardware']['other_names'],'') !== 0 ) { ?>
-			<div class="notebook_vendor">
-				<div class="inner_label"><?php echo gtext("possible other names of the device");?>:</div>
-				<div class="inner_value"><?php echo nl2br($item['hardware']['other_names']);?></div>
-			</div>
-			<?php } ?>
-			
-			<div class="notebook_vendor">
-				<div class="inner_label"><?php echo gtext("vendor");?>:</div>
-				<div class="inner_value"><?php echo betterVendor($item['hardware']['vendor']);?></div>
-			</div>
-			
-			<div class="notebook_vendor">
-				<div class="inner_label"><?php echo gtext("year of commercialization");?>:</div>
-				<div class="inner_value"><b><?php echo $item['hardware']['comm_year'];?></b></div>
-			</div>
-			
-			<div class="notebook_vendor">
-				<div class="inner_label"><?php echo gtext("interface");?>:</div>
-				<div class="inner_value"><b><?php echo $item['hardware']['interface'];?></b></div>
-			</div>
-			
-			<div class="notebook_kernel">
-				<div class="inner_label"><?php echo gtext("does it work with free software?");?></div>
-				<div class="inner_value"><b><?php echo $item['hardware']['webcam_works'];?></b></div>
-			</div>
-			
-			<div class="notebook_view_link">
-				<a href="<?php echo $this->baseUrl."/".$this->controller."/view/$lang/".$item['hardware']['id_hard'].'/'.encodeUrl($item['hardware']['model']).$this->viewStatus;?>"><?php echo gtext("view the other specifications");?>..</a>
-			</div>
-			
-		</div>
-		<?php } ?>
-		
-		<?php if (strcmp($recordNumber,0) !== 0) { ?>
-		<div class="history_page_list">
-			<?php echo gtext("page list");?>: <?php echo $pageList;?>
-		</div>
-		<?php } ?>
\ No newline at end of file
diff --git a/h-source/Application/Views/Wifi/catalogue.php b/h-source/Application/Views/Wifi/catalogue.php
deleted file mode 100644
index 3ea9380..0000000
--- a/h-source/Application/Views/Wifi/catalogue.php
+++ /dev/null
@@ -1,89 +0,0 @@
-<?php if (!defined('EG')) die('Direct access not allowed!'); ?>
-
-<?php
-// h-source, a web software to build a community of people that want to share their hardware information.
-// Copyright (C) 2010  Antonio Gallo (h-source-copyright.txt)
-//
-// This file is part of h-source
-//
-// h-source is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-// 
-// h-source is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-// 
-// You should have received a copy of the GNU General Public License
-// along with h-source.  If not, see <http://www.gnu.org/licenses/>.
-?>
-
-		<div class="viewall_popup_menu_box_external">
-			<div class="viewall_popup_menu_box">
-				<?php echo $popup;?>
-			</div>
-			<div class="viewall_popup_menu_status">
-				<div class="viewall_popup_menu_status_item"><?php echo betterVendor($this->viewArgs['vendor']);?></div>
-				<div class="viewall_popup_menu_status_item"><?php echo $this->viewArgs['comm_year']?></div>
-				<div class="viewall_popup_menu_status_item"><?php echo $this->viewArgs['wifi_works']?></div>
-				<div class="viewall_popup_menu_status_item"><?php echo translate($this->viewArgs['interface'])?></div>
-				<div class="viewall_popup_menu_status_item"><?php echo $this->viewArgs['sort-by']?></div>
-			</div>
-		</div>
-		
-		<!--if no notebooks found-->
-		<?php if (strcmp($recordNumber,0) === 0) { ?>
-		<div class="viewall_no_items_found">
-			<?php echo gtext("No wifi cards found");?>..
-		</div>
-		<?php } ?>
-		
-		<!--loop-->
-		<?php foreach ($table as $item) {?>
-		<div class="model_viewall">
-
-			<div class="notebook_model">
-				<img align="top" class="catalogue_item_icon" src="<?php echo Hardware::getIconFromType($item['hardware']['type']);?>"> <span class="span_model_name"><?php echo gtext("model");?>: <b><?php echo $item['hardware']['model'];?></b></span>
-			</div>
-
-			<?php if ( strcmp($item['hardware']['other_names'],'') !== 0 ) { ?>
-			<div class="notebook_vendor">
-				<div class="inner_label"><?php echo gtext("possible other names of the device");?>:</div>
-				<div class="inner_value"><?php echo nl2br($item['hardware']['other_names']);?></div>
-			</div>
-			<?php } ?>
-			
-			<div class="notebook_vendor">
-				<div class="inner_label"><?php echo gtext("vendor");?>:</div>
-				<div class="inner_value"><?php echo betterVendor($item['hardware']['vendor']);?></div>
-			</div>
-			
-			<div class="notebook_vendor">
-				<div class="inner_label"><?php echo gtext("year of commercialization");?>:</div>
-				<div class="inner_value"><b><?php echo $item['hardware']['comm_year'];?></b></div>
-			</div>
-			
-			<div class="notebook_vendor">
-				<div class="inner_label"><?php echo gtext("interface");?>:</div>
-				<div class="inner_value"><b><?php echo translate($item['hardware']['interface']);?></b></div>
-			</div>
-			
-			<div class="notebook_kernel">
-				<div class="inner_label"><?php echo gtext("does it work with free software?");?></div>
-				<div class="inner_value"><b><?php echo $item['hardware']['wifi_works'];?></b></div>
-			</div>
-			
-			<div class="notebook_view_link">
-				<a href="<?php echo $this->baseUrl."/".$this->controller."/view/$lang/".$item['hardware']['id_hard'].'/'.encodeUrl($item['hardware']['model']).$this->viewStatus;?>"><?php echo gtext("view the other specifications");?>..</a>
-			</div>
-			
-		</div>
-		<?php } ?>
-		
-		<?php if (strcmp($recordNumber,0) !== 0) { ?>
-		<div class="history_page_list">
-			<?php echo gtext("page list");?>: <?php echo $pageList;?>
-		</div>
-		<?php } ?>
\ No newline at end of file
diff --git a/h-source/Application/Views/Acquisitioncards/catalogue.php b/h-source/Application/Views/catalogue.php
index 23ce477..ca0d735 100644
--- a/h-source/Application/Views/Acquisitioncards/catalogue.php
+++ b/h-source/Application/Views/catalogue.php
@@ -67,9 +67,22 @@
 			</div>
 			
 			<div class="notebook_kernel">
+				<?php if (strcmp($this->controller,'printers') === 0 or strcmp($this->controller,'scanners') === 0) { ?>
+				<div class="inner_label"><?php echo gtext("compatibility with free software");?></div>
+				<?php } else if (strcmp($this->controller,'videocards') === 0 ) { ?>
+				<div class="inner_label"><?php echo gtext("how does it work with free software?");?></div>
+				<?php } else { ?>
 				<div class="inner_label"><?php echo gtext("does it work with free software?");?></div>
-				<div class="inner_value"><b><?php echo gtext($item['hardware'][$worksField]);?></b></div>
+				<?php } ?>
+				<div class="inner_value"><b><?php echo gtext(translate($item['hardware'][$worksField]));?></b></div>
 			</div>
+
+			<?php if (strcmp($this->controller,'printers') === 0 ) { ?>
+			<div class="notebook_kernel">
+				<div class="inner_label"><?php echo gtext("does it adopt any techniques to track users?");?></div>
+				<div class="inner_value"><b><?php echo gtext($item['hardware']['it_tracks_users']);?></b></div>
+			</div>
+			<?php } ?>
 			
 			<div class="notebook_view_link">
 				<a href="<?php echo $this->baseUrl."/".$this->controller."/view/$lang/".$item['hardware']['id_hard'].'/'.encodeUrl($item['hardware']['model']).$this->viewStatus;?>"><?php echo gtext("view the other specifications");?>..</a>
diff --git a/h-source/Application/Views/page.php b/h-source/Application/Views/page.php
index 0cf4e34..704e019 100644
--- a/h-source/Application/Views/page.php
+++ b/h-source/Application/Views/page.php
@@ -63,7 +63,7 @@
 			<?php if (strcmp($this->controller,'printers') === 0 ) { ?>
 			<div class="notebook_vendor">
 				<div class="inner_label"><?php echo gtext("subtype");?> (laser, inkjet, ..):</div>
-				<div class="inner_value"><b><?php echo $item[$tableName]['subtype'];?></b></div>
+				<div class="inner_value"><b><?php echo gtext($item[$tableName]['subtype']);?></b></div>
 			</div>
 			<?php } ?>
 			
@@ -74,12 +74,12 @@
 			
 			<div class="notebook_vendor">
 				<div class="inner_label"><?php echo gtext("year of commercialization");?>:</div>
-				<div class="inner_value"><b><?php echo $item[$tableName]['comm_year'];?></b></div>
+				<div class="inner_value"><b><?php echo gtext($item[$tableName]['comm_year']);?></b></div>
 			</div>
 
 			<div class="notebook_vendor">
 				<div class="inner_label"><?php echo gtext("interface");?>:</div>
-				<div class="inner_value"><b><?php echo translate($item[$tableName]['interface']);?></b></div>
+				<div class="inner_value"><b><?php echo gtext(translate($item[$tableName]['interface']));?></b></div>
 			</div>
 			
 			<div class="model_tested_on">
@@ -97,17 +97,17 @@
 				<?php if (strcmp($this->controller,'videocards') === 0 ) { ?>
 				
 					<div class="inner_label"><?php echo gtext("how does it work with free software?");?></div>
-					<div class="inner_value"><b><?php echo gtext(Videocard::$videoReverse[$item[$tableName][$worksField]]);?></b></div>
+					<div class="inner_value"><b><?php echo gtext(translate($item[$tableName][$worksField]));?></b></div>
 					
 				<?php } else if (strcmp($this->controller,'printers') === 0 ) { ?>
 				
 					<div class="inner_label"><?php echo gtext("compatibility with free software");?>:</div>
-					<div class="inner_value"><b><?php echo gtext($item[$tableName]['compatibility']);?></b> <a class="open_help_window" target="blank" title="compatibility help page" href="<?php echo $this->baseUrl."/help/index/$lang#printer-compatibility";?>"><img class="top_left_images_help" src="<?php echo $this->baseUrl;?>/Public/Img/Acun/help_hint.png"></a></div>
+					<div class="inner_value"><b><?php echo gtext(translate($item[$tableName]['compatibility']));?></b> <a class="open_help_window" target="blank" title="compatibility help page" href="<?php echo $this->baseUrl."/help/index/$lang#printer-compatibility";?>"><img class="top_left_images_help" src="<?php echo $this->baseUrl;?>/Public/Img/Acun/help_hint.png"></a></div>
 					
 				<?php } else if (strcmp($this->controller,'scanners') === 0 ) { ?>
 				
 					<div class="inner_label"><?php echo gtext("compatibility with free software");?>:</div>
-					<div class="inner_value"><b><?php echo gtext($item[$tableName]['compatibility']);?></b> <a class="open_help_window" target="blank" title="compatibility help page" href="<?php echo $this->baseUrl."/help/index/$lang#scanner-compatibility";?>"><img class="top_left_images_help" src="<?php echo $this->baseUrl;?>/Public/Img/Acun/help_hint.png"></a></div>
+					<div class="inner_value"><b><?php echo gtext(translate($item[$tableName]['compatibility']));?></b> <a class="open_help_window" target="blank" title="compatibility help page" href="<?php echo $this->baseUrl."/help/index/$lang#scanner-compatibility";?>"><img class="top_left_images_help" src="<?php echo $this->baseUrl;?>/Public/Img/Acun/help_hint.png"></a></div>
 					
 				<?php } else { ?>
 				
@@ -121,7 +121,7 @@
 			<?php if (strcmp($this->controller,'printers') === 0 ) { ?>
 			<div class="notebook_kernel">
 				<div class="inner_label"><?php echo gtext("does it adopt any techniques to track users?");?><div class="box_module_label"><?php echo $tracksHelpLabel;?></div></div>
-				<div class="inner_value"><b><?php echo $item[$tableName]['it_tracks_users'];?></b></div>
+				<div class="inner_value"><b><?php echo gtext($item[$tableName]['it_tracks_users']);?></b></div>
 			</div>
 			<?php } ?>