diff options
| author | Antonio Gallo <tonicucoz@gmail.com> | 2011-08-22 06:50:30 +0000 | 
|---|---|---|
| committer | Antonio Gallo <tonicucoz@gmail.com> | 2011-08-22 06:50:30 +0000 | 
| commit | 1b2aa2f98ba320a7623676c1640f792b70f1fa16 (patch) | |
| tree | bd6fc7a906c35719970da2dfe5e7bdceb7461439 | |
| parent | 0721f5e55bf8ae501e15880f9ae243a58eadd00b (diff) | |
improved i18n
| -rw-r--r-- | h-source/Application/Controllers/GenericController.php | 4 | ||||
| -rw-r--r-- | h-source/Application/Include/languages.php | 65 | ||||
| -rw-r--r-- | h-source/Application/Views/Download/index.php | 2 | ||||
| -rw-r--r-- | h-source/Application/Views/Hardware/left.php | 24 | ||||
| -rw-r--r-- | h-source/Application/Views/Help/index.php | 2 | ||||
| -rw-r--r-- | h-source/Application/Views/Help/index_de.php | 2 | ||||
| -rw-r--r-- | h-source/Application/Views/Help/index_es.php | 2 | ||||
| -rw-r--r-- | h-source/Application/Views/Help/index_fr.php | 2 | ||||
| -rw-r--r-- | h-source/Application/Views/Help/index_it.php | 2 | ||||
| -rw-r--r-- | h-source/Application/Views/Issues/view.php | 2 | ||||
| -rw-r--r-- | h-source/Application/Views/Issues/viewall.php | 2 | ||||
| -rw-r--r-- | h-source/Application/Views/News/index.php | 2 | ||||
| -rw-r--r-- | h-source/Application/Views/header.php | 2 | ||||
| -rw-r--r-- | h-source/Application/Views/top_left.php | 4 | 
14 files changed, 72 insertions, 45 deletions
diff --git a/h-source/Application/Controllers/GenericController.php b/h-source/Application/Controllers/GenericController.php index 4ac197c..c2e6517 100644 --- a/h-source/Application/Controllers/GenericController.php +++ b/h-source/Application/Controllers/GenericController.php @@ -432,7 +432,7 @@ class GenericController extends BaseController  		Params::$nullQueryValue = 'undef'; -		$data['tree'] = $this->controller; +		$data['tree'] = plural($this->controller);  		$this->mod->aWhere(array("deleted"=>"no","cleared"=>"no")); @@ -834,7 +834,7 @@ class GenericController extends BaseController  	protected function getSpecHardLink()  	{ -		return "<a href='".$this->baseUrl.'/'.$this->controller.'/catalogue/'.$this->lang.$this->viewStatus."'>".$this->controller."</a>"; +		return "<a href='".$this->baseUrl.'/'.$this->controller.'/catalogue/'.$this->lang.$this->viewStatus."'>".plural($this->controller)."</a>";  	}  	protected function goToLoginForm() diff --git a/h-source/Application/Include/languages.php b/h-source/Application/Include/languages.php index 8621f7e..a7264f2 100644 --- a/h-source/Application/Include/languages.php +++ b/h-source/Application/Include/languages.php @@ -264,6 +264,25 @@ 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", +				/*0220*/"Wifi cards"	=>	"Schede wifi", +				/*0221*/"Video cards"	=>	"Schede video", +				/*0222*/"Printers and multifunction"	=>	"Stampanti e multifunzione", +				/*0223*/"Scanners"	=>	"Scanner", +				/*0224*/"3G cards"	=>	"Schede 3G", +				/*0225*/"Sound cards"	=>	"Schede audio", +				/*0226*/"Webcams"	=>	"Webcam", +				/*0227*/"Bluetooth devices"	=>	"Dispositivi bluetooth", +				/*0228*/"TV/Video/FM acquisition cards"	=>	"Schede di acquisizione TV/Video/FM", +				/*0229*/"Fingerprint readers"	=>	"Lettori di impronte digitali", +				/*0230*/"Ethernet cards"	=>	"Schede ethernet", +				/*0231*/"Hardware"	=>	"Hardware", +				/*0232*/"Issues"	=>	"Questioni", +				/*0233*/"Search"	=>	"Cerca", +				/*0234*/"News"	=>	"Notizie", +				/*0235*/"Download"	=>	"Scarica", +				/*0236*/"Help"	=>	"Aiuto", +				/*0237*/"List of"	=>	"Lista di",  			),  		'es'	=>	array  			( @@ -892,19 +911,21 @@ class Lang  			'bluetooth'		=>	'bluetooth device',  			'acquisitioncards'		=>	'acquisition card',  			'fingerprintreaders'		=>	'fingerprint reader', +			'ethernetcards'		=>	'ethernet card',  		),  		'it'	=>	array(  			'notebooks'		=>	'notebook', -			'wifi'			=>	'wifi card', -			'videocards'	=>	'video card', -			'printers'		=>	'printer', +			'wifi'			=>	'scheda wifi', +			'videocards'	=>	'scheda video', +			'printers'		=>	'stampante',  			'scanners'		=>	'scanner', -			'threegcards'	=>	'3G-card', -			'soundcards'	=>	'soundcard', +			'threegcards'	=>	'scheda 3G', +			'soundcards'	=>	'scheda audio',  			'webcams'		=>	'webcam', -			'bluetooth'		=>	'bluetooth device', -			'acquisitioncards'		=>	'acquisition card', -			'fingerprintreaders'		=>	'fingerprint reader', +			'bluetooth'		=>	'dispositivo bluetooth', +			'acquisitioncards'		=>	'scheda di acquisizione', +			'fingerprintreaders'		=>	'lettore di impronte digitali', +			'ethernetcards'		=>	'scheda ethernet',  		),  		'es'	=>	array(  			'notebooks'		=>	'notebook', @@ -918,6 +939,7 @@ class Lang  			'bluetooth'		=>	'bluetooth device',  			'acquisitioncards'		=>	'acquisition card',  			'fingerprintreaders'		=>	'fingerprint reader', +			'ethernetcards'		=>	'ethernet card',  		),  		'fr'	=>	array(  			'notebooks'		=>	'notebook', @@ -931,6 +953,7 @@ class Lang  			'bluetooth'		=>	'bluetooth device',  			'acquisitioncards'		=>	'acquisition card',  			'fingerprintreaders'		=>	'fingerprint reader', +			'ethernetcards'		=>	'ethernet card',  		),  	); @@ -947,19 +970,21 @@ class Lang  			'bluetooth'		=>	'bluetooth devices',  			'acquisitioncards'		=>	'acquisition cards',  			'fingerprintreaders'		=>	'fingerprint readers', +			'ethernetcards'		=>	'ethernet cards',  		),  		'it'	=>	array( -			'notebooks'		=>	'notebooks', -			'wifi'			=>	'wifi cards', -			'videocards'	=>	'video cards', -			'printers'		=>	'printers', -			'scanners'		=>	'scanners', -			'threegcards'	=>	'3G-cards', -			'soundcards'	=>	'soundcards', -			'webcams'		=>	'webcams', -			'bluetooth'		=>	'bluetooth devices', -			'acquisitioncards'		=>	'acquisition cards', -			'fingerprintreaders'		=>	'fingerprint readers', +			'notebooks'		=>	'notebook', +			'wifi'			=>	'schede wifi', +			'videocards'	=>	'schede video', +			'printers'		=>	'stampanti', +			'scanners'		=>	'scanner', +			'threegcards'	=>	'schede 3G', +			'soundcards'	=>	'schede audio', +			'webcams'		=>	'webcam', +			'bluetooth'		=>	'dispositivi bluetooth', +			'acquisitioncards'		=>	'schede di acquisizione', +			'fingerprintreaders'		=>	'lettori di impronte digitali', +			'ethernetcards'		=>	'schede ethernet',  		),  		'es'	=>	array(  			'notebooks'		=>	'notebooks', @@ -973,6 +998,7 @@ class Lang  			'bluetooth'		=>	'bluetooth devices',  			'acquisitioncards'		=>	'acquisition cards',  			'fingerprintreaders'		=>	'fingerprint readers', +			'ethernetcards'		=>	'ethernet cards',  		),  		'fr'	=>	array(  			'notebooks'		=>	'notebooks', @@ -986,6 +1012,7 @@ class Lang  			'bluetooth'		=>	'bluetooth devices',  			'acquisitioncards'		=>	'acquisition cards',  			'fingerprintreaders'		=>	'fingerprint readers', +			'ethernetcards'		=>	'ethernet cards',  		),  	); diff --git a/h-source/Application/Views/Download/index.php b/h-source/Application/Views/Download/index.php index 11d53c2..de4d434 100644 --- a/h-source/Application/Views/Download/index.php +++ b/h-source/Application/Views/Download/index.php @@ -23,7 +23,7 @@  	<div id="left">  		<div class="position_tree_box"> -			<a href="<?php echo $this->baseUrl."/home/index/$lang";?>">Home</a> » download +			<a href="<?php echo $this->baseUrl."/home/index/$lang";?>">Home</a> » <?php echo gtext("Download");?>  		</div>  		<div class="credits_external_box"> diff --git a/h-source/Application/Views/Hardware/left.php b/h-source/Application/Views/Hardware/left.php index 21fa3ec..275898d 100644 --- a/h-source/Application/Views/Hardware/left.php +++ b/h-source/Application/Views/Hardware/left.php @@ -27,50 +27,50 @@  		</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;?>">Notebooks</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"> -			<img align="middle" class="hardware_element_image" src="<?php echo $this->baseUrl;?>/Public/Img/H2O/network-wireless.png"><a class="hardware_element_link" href="<?php echo $this->baseUrl?>/wifi/catalogue/<?php echo $lang;?>">Wifi cards</a> +			<img align="middle" class="hardware_element_image" src="<?php echo $this->baseUrl;?>/Public/Img/H2O/network-wireless.png"><a class="hardware_element_link" href="<?php echo $this->baseUrl?>/wifi/catalogue/<?php echo $lang;?>"><?php echo gtext("Wifi cards");?></a>  		</div>  		<div class="hardware_element"> -			<img align="middle" class="hardware_element_image" src="<?php echo $this->baseUrl;?>/Public/Img/Crystal/1282042718_hardware.png"><a class="hardware_element_link" href="<?php echo $this->baseUrl?>/videocards/catalogue/<?php echo $lang;?>">Video cards</a> +			<img align="middle" class="hardware_element_image" src="<?php echo $this->baseUrl;?>/Public/Img/Crystal/1282042718_hardware.png"><a class="hardware_element_link" href="<?php echo $this->baseUrl?>/videocards/catalogue/<?php echo $lang;?>"><?php echo gtext("Video cards");?></a>  		</div>  		<div class="hardware_element"> -			<img align="middle" class="hardware_element_image" src="<?php echo $this->baseUrl;?>/Public/Img/H2O/printer.png"><a class="hardware_element_link" href="<?php echo $this->baseUrl?>/printers/catalogue/<?php echo $lang;?>">Printers and multifunction</a> +			<img align="middle" class="hardware_element_image" src="<?php echo $this->baseUrl;?>/Public/Img/H2O/printer.png"><a class="hardware_element_link" href="<?php echo $this->baseUrl?>/printers/catalogue/<?php echo $lang;?>"><?php echo gtext("Printers and multifunction");?></a>  		</div>  		<div class="hardware_element"> -			<img align="middle" class="hardware_element_image" src="<?php echo $this->baseUrl;?>/Public/Img/H2O/scanner.png"><a class="hardware_element_link" href="<?php echo $this->baseUrl?>/scanners/catalogue/<?php echo $lang;?>">Scanners</a> +			<img align="middle" class="hardware_element_image" src="<?php echo $this->baseUrl;?>/Public/Img/H2O/scanner.png"><a class="hardware_element_link" href="<?php echo $this->baseUrl?>/scanners/catalogue/<?php echo $lang;?>"><?php echo gtext("Scanners");?></a>  		</div>  		<div class="hardware_element"> -			<img align="middle" class="hardware_element_image" src="<?php echo $this->baseUrl;?>/Public/Img/Crystal/usb.png"><a class="hardware_element_link" href="<?php echo $this->baseUrl?>/threegcards/catalogue/<?php echo $lang;?>">3G cards</a> +			<img align="middle" class="hardware_element_image" src="<?php echo $this->baseUrl;?>/Public/Img/Crystal/usb.png"><a class="hardware_element_link" href="<?php echo $this->baseUrl?>/threegcards/catalogue/<?php echo $lang;?>"><?php echo gtext("3G cards");?></a>  		</div>  		<div class="hardware_element"> -			<img align="middle" class="hardware_element_image" src="<?php echo $this->baseUrl;?>/Public/Img/H2O/audio-card.png"><a class="hardware_element_link" href="<?php echo $this->baseUrl?>/soundcards/catalogue/<?php echo $lang;?>">Sound cards</a> +			<img align="middle" class="hardware_element_image" src="<?php echo $this->baseUrl;?>/Public/Img/H2O/audio-card.png"><a class="hardware_element_link" href="<?php echo $this->baseUrl?>/soundcards/catalogue/<?php echo $lang;?>"><?php echo gtext("Sound cards");?></a>  		</div>  		<div class="hardware_element"> -			<img align="middle" class="hardware_element_image" src="<?php echo $this->baseUrl;?>/Public/Img/H2O/camera-web.png"><a class="hardware_element_link" href="<?php echo $this->baseUrl?>/webcams/catalogue/<?php echo $lang;?>">Webcams</a> +			<img align="middle" class="hardware_element_image" src="<?php echo $this->baseUrl;?>/Public/Img/H2O/camera-web.png"><a class="hardware_element_link" href="<?php echo $this->baseUrl?>/webcams/catalogue/<?php echo $lang;?>"><?php echo gtext("Webcams");?></a>  		</div>  		<div class="hardware_element"> -			<img align="middle" class="hardware_element_image" src="<?php echo $this->baseUrl;?>/Public/Img/H2O/preferences-system-bluetooth.png"><a class="hardware_element_link" href="<?php echo $this->baseUrl?>/bluetooth/catalogue/<?php echo $lang;?>">Bluetooth devices</a> +			<img align="middle" class="hardware_element_image" src="<?php echo $this->baseUrl;?>/Public/Img/H2O/preferences-system-bluetooth.png"><a class="hardware_element_link" href="<?php echo $this->baseUrl?>/bluetooth/catalogue/<?php echo $lang;?>"><?php echo gtext("Bluetooth devices");?></a>  		</div>  		<div class="hardware_element"> -			<img align="middle" class="hardware_element_image" src="<?php echo $this->baseUrl;?>/Public/Img/Crystal/cam_mount.png"><a class="hardware_element_link" href="<?php echo $this->baseUrl?>/acquisitioncards/catalogue/<?php echo $lang;?>">TV/Video/FM acquisition cards</a> +			<img align="middle" class="hardware_element_image" src="<?php echo $this->baseUrl;?>/Public/Img/Crystal/cam_mount.png"><a class="hardware_element_link" href="<?php echo $this->baseUrl?>/acquisitioncards/catalogue/<?php echo $lang;?>"><?php echo gtext("TV/Video/FM acquisition cards");?></a>  		</div>  		<div class="hardware_element"> -			<img align="middle" class="hardware_element_image" src="<?php echo $this->baseUrl;?>/Public/Img/fingerprint_icon.png"><a class="hardware_element_link" href="<?php echo $this->baseUrl?>/fingerprintreaders/catalogue/<?php echo $lang;?>">Fingerprint readers</a> +			<img align="middle" class="hardware_element_image" src="<?php echo $this->baseUrl;?>/Public/Img/fingerprint_icon.png"><a class="hardware_element_link" href="<?php echo $this->baseUrl?>/fingerprintreaders/catalogue/<?php echo $lang;?>"><?php echo gtext("Fingerprint readers");?></a>  		</div>  		<div class="hardware_element"> -			<img align="middle" class="hardware_element_image" src="<?php echo $this->baseUrl;?>/Public/Img/H2O/network-wired.png"><a class="hardware_element_link" href="<?php echo $this->baseUrl?>/ethernetcards/catalogue/<?php echo $lang;?>">Ethernet cards</a> +			<img align="middle" class="hardware_element_image" src="<?php echo $this->baseUrl;?>/Public/Img/H2O/network-wired.png"><a class="hardware_element_link" href="<?php echo $this->baseUrl?>/ethernetcards/catalogue/<?php echo $lang;?>"><?php echo gtext("Ethernet cards");?></a>  		</div>  	</div>
\ No newline at end of file diff --git a/h-source/Application/Views/Help/index.php b/h-source/Application/Views/Help/index.php index afd012c..c61909d 100644 --- a/h-source/Application/Views/Help/index.php +++ b/h-source/Application/Views/Help/index.php @@ -24,7 +24,7 @@  <div class="help_external_box">  	<div class="position_tree_box"> -			<a href="<?php echo $this->baseUrl."/home/index/$lang";?>">Home</a> » help +			<a href="<?php echo $this->baseUrl."/home/index/$lang";?>">Home</a> » <?php echo gtext("Help");?>  	</div>  	<div class="help_tables_of_contents"> diff --git a/h-source/Application/Views/Help/index_de.php b/h-source/Application/Views/Help/index_de.php index a9737d9..cd4290f 100644 --- a/h-source/Application/Views/Help/index_de.php +++ b/h-source/Application/Views/Help/index_de.php @@ -24,7 +24,7 @@  <div class="help_external_box">  	<div class="position_tree_box"> -			<a href="<?php echo $this->baseUrl."/home/index/$lang";?>">Startseite</a> » Hilfe +			<a href="<?php echo $this->baseUrl."/home/index/$lang";?>">Startseite</a> » <?php echo gtext("Help");?>  	</div>  	<div class="help_tables_of_contents"> diff --git a/h-source/Application/Views/Help/index_es.php b/h-source/Application/Views/Help/index_es.php index 9b3cf7d..136d0bf 100644 --- a/h-source/Application/Views/Help/index_es.php +++ b/h-source/Application/Views/Help/index_es.php @@ -24,7 +24,7 @@  <div class="help_external_box">  	<div class="position_tree_box"> -			<a href="<?php echo $this->baseUrl."/home/index/$lang";?>">Inicio</a> » help +			<a href="<?php echo $this->baseUrl."/home/index/$lang";?>">Inicio</a> » <?php echo gtext("Help");?>  	</div>  	<div class="help_tables_of_contents"> diff --git a/h-source/Application/Views/Help/index_fr.php b/h-source/Application/Views/Help/index_fr.php index b4e2016..a09f445 100644 --- a/h-source/Application/Views/Help/index_fr.php +++ b/h-source/Application/Views/Help/index_fr.php @@ -24,7 +24,7 @@  <div class="help_external_box">  	<div class="position_tree_box"> -			<a href="<?php echo $this->baseUrl."/home/index/$lang";?>">Home</a> » help +			<a href="<?php echo $this->baseUrl."/home/index/$lang";?>">Home</a> » <?php echo gtext("Help");?>  	</div>  	<div class="help_tables_of_contents"> diff --git a/h-source/Application/Views/Help/index_it.php b/h-source/Application/Views/Help/index_it.php index 0b921ef..eaadcbf 100644 --- a/h-source/Application/Views/Help/index_it.php +++ b/h-source/Application/Views/Help/index_it.php @@ -24,7 +24,7 @@  <div class="help_external_box">  	<div class="position_tree_box"> -			<a href="<?php echo $this->baseUrl."/home/index/$lang";?>">Home</a> » help +			<a href="<?php echo $this->baseUrl."/home/index/$lang";?>">Home</a> » <?php echo gtext("Help");?>  	</div>  	<div class="help_tables_of_contents"> diff --git a/h-source/Application/Views/Issues/view.php b/h-source/Application/Views/Issues/view.php index bcd0265..20344b8 100644 --- a/h-source/Application/Views/Issues/view.php +++ b/h-source/Application/Views/Issues/view.php @@ -33,7 +33,7 @@  	<div id="left">  		<div class="position_tree_box"> -			<a href="<?php echo $this->baseUrl."/home/index/$lang";?>">Home</a> » <a href="<?php echo $this->baseUrl."/issues/viewall/$lang".$this->viewStatus;?>">issues</a> » <?php echo $id_issue;?> +			<a href="<?php echo $this->baseUrl."/home/index/$lang";?>">Home</a> » <a href="<?php echo $this->baseUrl."/issues/viewall/$lang".$this->viewStatus;?>"><?php echo gtext("Issues");?></a> » <?php echo $id_issue;?>  		</div>  		<?php foreach ($table as $row) { ?> diff --git a/h-source/Application/Views/Issues/viewall.php b/h-source/Application/Views/Issues/viewall.php index e31a7f3..1705670 100644 --- a/h-source/Application/Views/Issues/viewall.php +++ b/h-source/Application/Views/Issues/viewall.php @@ -33,7 +33,7 @@  	<div id="left">  		<div class="position_tree_box"> -			<a href="<?php echo $this->baseUrl."/home/index/$lang";?>">Home</a> » issues +			<a href="<?php echo $this->baseUrl."/home/index/$lang";?>">Home</a> » <?php echo gtext("Issues");?>  		</div>  		<div class="issues_external_box"> diff --git a/h-source/Application/Views/News/index.php b/h-source/Application/Views/News/index.php index 98ea357..f46aaae 100644 --- a/h-source/Application/Views/News/index.php +++ b/h-source/Application/Views/News/index.php @@ -23,7 +23,7 @@  	<div id="left">  		<div class="position_tree_box"> -			<a href="<?php echo $this->baseUrl."/home/index/$lang";?>">Home</a> » news +			<a href="<?php echo $this->baseUrl."/home/index/$lang";?>">Home</a> » <?php echo gtext("News");?>  		</div>  		<div class="news_external_box"> diff --git a/h-source/Application/Views/header.php b/h-source/Application/Views/header.php index c70ba59..8d5e681 100644 --- a/h-source/Application/Views/header.php +++ b/h-source/Application/Views/header.php @@ -83,7 +83,7 @@ $currPos = $querySanitized ? $this->controller."/".$this->action : 'home/index';  <div id="top_menu_external">  	<div id="top_menu">  		<ul> -			<li<?php echo $tm['home']; ?>><a href="<?php echo $this->baseUrl."/home/index/$lang";?>">Home</a></li><li<?php echo $tm['hardware']; ?>><a href="<?php echo $this->baseUrl."/hardware/catalogue/$lang";?>">Hardware</a></li><li<?php echo $tm['issues']; ?>><a href="<?php echo $this->baseUrl."/issues/viewall/$lang/1/$token";?>">Issues</a></li><li<?php echo $tm['search']; ?>><a href="<?php echo $this->baseUrl."/search/form/$lang";?>">Search</a></li><li<?php echo $tm['news']; ?>><a href="<?php echo $this->baseUrl."/news/index/$lang";?>">News</a></li><li<?php echo $tm['download']; ?>><a href="<?php echo $this->baseUrl."/download/index/$lang";?>">Download</a></li><li<?php echo $tm['help']; ?>><a href="<?php echo $this->baseUrl."/help/index/$lang";?>">Help</a></li><li<?php echo $tm['wiki']; ?>><a href="<?php echo $this->baseUrl."/wiki/page/$lang/Main-Page";?>">Wiki</a></li> +			<li<?php echo $tm['home']; ?>><a href="<?php echo $this->baseUrl."/home/index/$lang";?>">Home</a></li><li<?php echo $tm['hardware']; ?>><a href="<?php echo $this->baseUrl."/hardware/catalogue/$lang";?>"><?php echo gtext("Hardware");?></a></li><li<?php echo $tm['issues']; ?>><a href="<?php echo $this->baseUrl."/issues/viewall/$lang/1/$token";?>"><?php echo gtext("Issues");?></a></li><li<?php echo $tm['search']; ?>><a href="<?php echo $this->baseUrl."/search/form/$lang";?>"><?php echo gtext("Search");?></a></li><li<?php echo $tm['news']; ?>><a href="<?php echo $this->baseUrl."/news/index/$lang";?>"><?php echo gtext("News");?></a></li><li<?php echo $tm['download']; ?>><a href="<?php echo $this->baseUrl."/download/index/$lang";?>"><?php echo gtext("Download");?></a></li><li<?php echo $tm['help']; ?>><a href="<?php echo $this->baseUrl."/help/index/$lang";?>"><?php echo gtext("Help");?></a></li><li<?php echo $tm['wiki']; ?>><a href="<?php echo $this->baseUrl."/wiki/page/$lang/Main-Page";?>">Wiki</a></li>  		</ul>  	</div>  </div> diff --git a/h-source/Application/Views/top_left.php b/h-source/Application/Views/top_left.php index 08674c8..94701cb 100644 --- a/h-source/Application/Views/top_left.php +++ b/h-source/Application/Views/top_left.php @@ -71,7 +71,7 @@  			<?php } ?>  			<div class="notebook_view_title"> -				Specifications of the <?php echo singular($this->controller);?> <b><?php echo $ne_name;?></b> +				<?php echo singular($this->controller);?> <b><?php echo $ne_name;?></b>  			</div>  			<div class="notebook_insert_link"> @@ -106,7 +106,7 @@  		<?php } else if (strcmp($this->action,'catalogue') === 0) { ?>  			<div class="notebook_view_title"> -				List of <b><?php echo plural($this->controller);?></b> in the archive +				<?php echo gtext("List of");?> <b><?php echo plural($this->controller);?></b>  			</div>  			<div class="notebook_insert_link">  | 
