improved i18n

6 files changed, 29 insertions, 29 deletions

diff --git a/h-source/Application/Views/Meet/contributions.php b/h-source/Application/Views/Meet/contributions.php
index 1ebbf30..2f38987 100644
--- a/h-source/Application/Views/Meet/contributions.php
+++ b/h-source/Application/Views/Meet/contributions.php
@@ -23,11 +23,11 @@
 	<div id="left">
 	
 		<div class="position_tree_box">
-			<a href="<?php echo $this->baseUrl."/home/index/$lang";?>">Home</a> &raquo; <a href="<?php echo $this->baseUrl."/meet/user/$lang/$meet_username";?>">meet <b><?php echo $meet_username;?></b></a> &raquo; contributions
+			<a href="<?php echo $this->baseUrl."/home/index/$lang";?>">Home</a> &raquo; <a href="<?php echo $this->baseUrl."/meet/user/$lang/$meet_username";?>"><?php echo gtext("meet");?> <b><?php echo $meet_username;?></b></a> &raquo; <?php echo gtext("contributions");?>
 		</div>
 		
 		<div class="contrib_explain_box">
-			contributions of <?php echo $meet_username;?>
+			<?php echo gtext("contributions of");?> <?php echo $meet_username;?>
 		</div>
 		
 		<div class="external_users_contrib">
diff --git a/h-source/Application/Views/Meet/meet.php b/h-source/Application/Views/Meet/meet.php
index 82b3d90..e52ef2a 100644
--- a/h-source/Application/Views/Meet/meet.php
+++ b/h-source/Application/Views/Meet/meet.php
@@ -23,7 +23,7 @@
 	<div id="left">
 	
 		<div class="position_tree_box">
-			<a href="<?php echo $this->baseUrl."/home/index/$lang";?>">Home</a> &raquo; meet <b><?php echo $meet_username;?></b>
+			<a href="<?php echo $this->baseUrl."/home/index/$lang";?>">Home</a> &raquo; <?php echo gtext("meet");?> <b><?php echo $meet_username;?></b>
 		</div>
 		
 		<?php if ($ismoderator) { ?>
@@ -50,7 +50,7 @@
 		<?php } ?>
 		
 		<div class="meet_contrib_link">
-			<u>Public profile of <?php echo $meet_username;?></u>. See all <a href="<?php echo $this->baseUrl."/meet/contributions/$lang/$meet_username";?>"><b><?php echo $meet_username;?></b> contributions</a>
+			<u><?php echo gtext("Public profile of");?> <?php echo $meet_username;?></u>. <?php echo gtext("See all the contributions of");?> <a href="<?php echo $this->baseUrl."/meet/contributions/$lang/$meet_username";?>"> <b><?php echo $meet_username;?></b></a>
 		</div>
 	
 		<?php foreach ($table as $item) {?>
@@ -62,49 +62,49 @@
 			
 			<?php if (strcmp($item['profile']['website'],'') !== 0) { ?>
 			<div class="meet_item">
-				<div class="meet_item_inner">My website:</div> <?php echo vitalizeUrl($item['profile']['website']);?>
+				<div class="meet_item_inner"><?php echo gtext("My website");?>:</div> <?php echo vitalizeUrl($item['profile']['website']);?>
 			</div>
 			<?php } ?>
 			
 			<?php if (strcmp($item['profile']['real_name'],'') !== 0) { ?>
 			<div class="meet_item">
-				<div class="meet_item_inner">My real name is:</div> <?php echo $item['profile']['real_name'];?>
+				<div class="meet_item_inner"><?php echo gtext("My real name");?>:</div> <?php echo $item['profile']['real_name'];?>
 			</div>
 			<?php } ?>
 
 			<?php if (strcmp($item['profile']['publish_mail'],'yes') === 0) { ?>
 			<div class="meet_item">
-				<div class="meet_item_inner">My e-mail address:</div> <?php echo $item['regusers']['e_mail'];?>
+				<div class="meet_item_inner"><?php echo gtext("My e-mail address");?>:</div> <?php echo $item['regusers']['e_mail'];?>
 			</div>
 			<?php } ?>
 			
 			<?php if (strcmp($item['profile']['where_you_are'],'') !== 0) { ?>
 			<div class="meet_item">
-				<div class="meet_item_inner">I'm from:</div> <?php echo $item['profile']['where_you_are'];?>
+				<div class="meet_item_inner"><?php echo gtext("I'm from");?>:</div> <?php echo $item['profile']['where_you_are'];?>
 			</div>
 			<?php } ?>
 			
 			<?php if (strcmp($item['profile']['birth_date'],'') !== 0) { ?>
 			<div class="meet_item">
-				<div class="meet_item_inner">Birthdate:</div> <?php echo $item['profile']['birth_date'];?>
+				<div class="meet_item_inner"><?php echo gtext("Birthdate");?>:</div> <?php echo $item['profile']['birth_date'];?>
 			</div>
 			<?php } ?>
 
 			<?php if (strcmp($item['profile']['fav_distro'],'') !== 0) { ?>
 			<div class="meet_item">
-				<div class="meet_item_inner">My favourite distro is:</div> <?php echo $item['profile']['fav_distro'];?>
+				<div class="meet_item_inner"><?php echo gtext("My favourite distribution");?>:</div> <?php echo $item['profile']['fav_distro'];?>
 			</div>
 			<?php } ?>
 
 			<?php if (strcmp($item['profile']['projects'],'') !== 0) { ?>
 			<div class="meet_item">
-				<div class="meet_item_inner">Projects I'm working on:</div> <div><?php echo nl2br($item['profile']['projects']);?></div>
+				<div class="meet_item_inner"><?php echo gtext("Free software projects I'm working on");?>:</div> <div><?php echo nl2br($item['profile']['projects']);?></div>
 			</div>
 			<?php } ?>
 			
 			<?php if (strcmp($item['profile']['description'],'') !== 0) { ?>
 			<div class="meet_item">
-				<div class="meet_item_inner">My description:</div> <div><?php echo nl2br($item['profile']['description']);?></div>
+				<div class="meet_item_inner"><?php echo gtext("My description");?>:</div> <div><?php echo nl2br($item['profile']['description']);?></div>
 			</div>
 			<?php } ?>
 			
diff --git a/h-source/Application/Views/My/panel.php b/h-source/Application/Views/My/panel.php
index 1f4b9fe..30e4d24 100644
--- a/h-source/Application/Views/My/panel.php
+++ b/h-source/Application/Views/My/panel.php
@@ -23,7 +23,7 @@
 	<div id="left">
 		
 		<div class="position_tree_box">
-			<a href="<?php echo $this->baseUrl."/home/index/$lang";?>">Home</a> &raquo; panel
+			<a href="<?php echo $this->baseUrl."/home/index/$lang";?>">Home</a> &raquo; <?php echo gtext("control panel");?>
 		</div>
 		
 		<?php if ($isBlocked) { ?>
@@ -34,7 +34,7 @@
 		
 		<?php if ($ismoderator) { ?>
 		<div class="moderator_panel_link">
-			watch all the <a href="<?php echo Url::getRoot('moderators/actions/'.$lang);?>">moderators' actions</a>
+			<?php echo gtext("watch all the");?> <a href="<?php echo Url::getRoot('moderators/actions/'.$lang);?>"><?php echo gtext("actions carried out by moderators");?></a>
 		</div>
 		<?php } ?>
 		
diff --git a/h-source/Application/Views/Users/add.php b/h-source/Application/Views/Users/add.php
index 10edcd1..3e8de61 100755
--- a/h-source/Application/Views/Users/add.php
+++ b/h-source/Application/Views/Users/add.php
@@ -23,11 +23,11 @@
 	<div id="left">
 		
 		<div class="position_tree_box">
-			<a href="<?php echo $this->baseUrl."/home/index/$lang";?>">Home</a> &raquo; create account
+			<a href="<?php echo $this->baseUrl."/home/index/$lang";?>">Home</a> &raquo; <?php echo gtext("create new account");?>
 		</div>
 		
 		<div class="new_account_title">
-			Create new account
+			<?php echo gtext("create new account");?>
 		</div>
 		
 		<?php echo $notice;?>
@@ -35,22 +35,22 @@
 		<form  class='formClass' action='<?php echo $this->baseUrl."/users/add/$lang";?>' method='POST'>
 		
 			<div class='formEntry'>
-				<span class='entryLabel'>choose the username (characters allowed: a-z A-Z 0-9):</span>
+				<span class='entryLabel'><?php echo gtext("choose the username");?> (<?php echo gtext("characters allowed");?>: a-z A-Z 0-9):</span>
 				<?php echo Html_Form::input('username',$values['username']);?>
 			</div>
 			
 			<div class='formEntry'>
-				<span class='entryLabel'>your e-mail address (necessary to confirm the registration):</span>
+				<span class='entryLabel'><?php echo gtext("your e-mail address");?> (<?php echo gtext("necessary to confirm the registration");?>):</span>
 				<?php echo Html_Form::input('e_mail',$values['e_mail']);?>
 			</div>
 			
 			<div class='formEntry'>
-				<span class='entryLabel'>choose the password (characters allowed: a-z A-Z 0-9 - _ !):</span>
+				<span class='entryLabel'><?php echo gtext("choose the password");?> (<?php echo gtext("characters allowed");?>: a-z A-Z 0-9 - _ !):</span>
 				<?php echo Html_Form::password('password',$values['password']);?>
 			</div>
 			
 			<div class='formEntry'>
-				<span class='entryLabel'>confirm your password:</span>
+				<span class='entryLabel'><?php echo gtext("confirm the password");?>:</span>
 				<?php echo Html_Form::password('confirmation',$values['confirmation']);?>
 			</div>
 			
@@ -59,12 +59,12 @@
 			</div>
 			
 			<div class='formEntry'>
-				<span class='entryLabel'>write the code above:</span>
+				<span class='entryLabel'><?php echo gtext("write the code above");?>:</span>
 				<input type="input" name="captcha" value="">
 			</div>
 			
 			<div class='inputEntry'>
-				<input id='insertAction' type='submit' name='insertAction' value='create account'>
+				<input id='insertAction' type='submit' name='insertAction' value='<?php echo gtext("create new account");?>'>
 			</div>
 			
 		</form>
diff --git a/h-source/Application/Views/Users/forgot.php b/h-source/Application/Views/Users/forgot.php
index e97be47..ad9e046 100644
--- a/h-source/Application/Views/Users/forgot.php
+++ b/h-source/Application/Views/Users/forgot.php
@@ -23,11 +23,11 @@
 	<div id="left">
 	
 		<div class="position_tree_box">
-			<a href="<?php echo $this->baseUrl."/home/index/$lang";?>">Home</a> &raquo; request new password
+			<a href="<?php echo $this->baseUrl."/home/index/$lang";?>">Home</a> &raquo; <?php echo gtext("request new password");?>
 		</div>
 		
 		<div class="new_account_title">
-			Request new password
+			<?php echo gtext("request new password");?>
 		</div>
 		
 		<?php echo $notice;?>
@@ -35,7 +35,7 @@
 		<form  class='formClass' action='<?php echo $this->currPage."/$lang";?>' method='POST'>
 		
 			<div class='formEntry'>
-				<span class='entryLabel'>write your username:</span>
+				<span class='entryLabel'><?php echo gtext("write your username");?>:</span>
 				<input type="input" name="username" value="">
 			</div>
 			
@@ -44,12 +44,12 @@
 			</div>
 			
 			<div class='formEntry'>
-				<span class='entryLabel'>write the code above:</span>
+				<span class='entryLabel'><?php echo gtext("write the code above");?>:</span>
 				<input type="input" name="captcha" value="">
 			</div>
 			
 			<div class='inputEntry'>
-				<input id='insertAction' type='submit' name='forgotAction' value='send e-mail'>
+				<input id='insertAction' type='submit' name='forgotAction' value='<?php echo gtext("request new password");?>'>
 			</div>
 			
 		</form>
diff --git a/h-source/Application/Views/right.php b/h-source/Application/Views/right.php
index c0b1b68..f81ca1d 100644
--- a/h-source/Application/Views/right.php
+++ b/h-source/Application/Views/right.php
@@ -71,11 +71,11 @@
 			</form>
 			
 			<div class="manage_account_link_box">
-				<a href="<?php echo $this->baseUrl."/users/add/$lang";?>"><?php echo gtext("Create new account");?></a>
+				<a href="<?php echo $this->baseUrl."/users/add/$lang";?>"><?php echo gtext("create new account");?></a>
 			</div>
 			
 			<div class="manage_account_link_box">
-				<a href="<?php echo $this->baseUrl."/users/forgot/$lang";?>"><?php echo gtext("Request new password");?></a>
+				<a href="<?php echo $this->baseUrl."/users/forgot/$lang";?>"><?php echo gtext("request new password");?></a>
 			</div>
 			
 			<?php } ?>