From 3d07daf77ff545ab4c67448eb13186b15a95c4c9 Mon Sep 17 00:00:00 2001
From: bradymiller <bradymiller>
Date: Sat, 24 Apr 2010 08:48:53 +0000
Subject: [PATCH] english constant fixes for the translation project

---
 contrib/util/de_identification_upgrade.php               | 14 +++++++-------
 .../de_identification_screen1.php                        | 16 ++++++++--------
 interface/de_identification_forms/find_code_popup.php    | 10 +++++-----
 interface/de_identification_forms/find_drug_popup.php    | 10 +++++-----
 .../de_identification_forms/find_immunization_popup.php  | 10 +++++-----
 .../re_identification_input_screen.php                   |  6 +++---
 interface/language/lang_manage.php                       |  4 ++--
 interface/main/messages/messages.php                     |  2 +-
 library/globals.inc.php                                  |  2 +-
 9 files changed, 37 insertions(+), 37 deletions(-)

diff --git a/contrib/util/de_identification_upgrade.php b/contrib/util/de_identification_upgrade.php
index e6abc6fe2..900d0ed97 100644
--- a/contrib/util/de_identification_upgrade.php
+++ b/contrib/util/de_identification_upgrade.php
@@ -45,7 +45,7 @@ function upgradeFromSqlFile($filename) {
 
   $fd = fopen($fullname, 'r');
   if ($fd == FALSE) {
-    echo xl("ERROR.  Could not open"); echo " ".$fullname."\n";
+    echo xl("Error, unable to open file"); echo " ".$fullname."\n";
     flush();
     break;
   }
@@ -138,9 +138,9 @@ if (!empty($_POST['form_submit'])) {
   }  $login=$sqlconf["login"];   $loginhost=$sqlconf["host"];
   mysql_select_db($sqlconf['dbase']) or die(mysql_error());
   if (mysql_query("GRANT FILE ON *.* TO '$login'@'$loginhost'",$dbh) == FALSE) {
-		echo xl("ERROR when granting file privilege to the OpenEMR user."); echo "\n";
+		echo xl("Error when granting file privilege to the OpenEMR user."); echo "\n";
       echo "<p>".mysql_error()." (#".mysql_errno().")\n";
-		echo xl("ERROR."); echo "\n";
+		echo xl("Error"); echo "\n";
 		break;
 	}
         else
@@ -159,12 +159,12 @@ function form_validate()
 {
  if(document.forms[0].root_user_name.value == "")
  { 
-  alert("<?php echo xl('Enter root Username');?>");
+  alert("<?php echo xl('Enter Database root Username');?>");
   return false;
  }
  /*if(document.forms[0].root_user_pass.value == "")
  { 
-  alert("<?php echo xl('Enter root Password');?>");
+  alert("<?php echo xl('Enter Database root Password');?>");
   return false;
  }*/
  return true;
@@ -190,7 +190,7 @@ else
 		<td><?php xl('Enter Database root Username','e'); ?></td>
 		<td>:</td>
 		<td> <input type='text' size='20' name='root_user_name' id='root_user_name'
-			value= "" title="<?php xl('Enter root username','e'); ?>" /> </td>
+			value= "" title="<?php xl('Enter Database root Username','e'); ?>" /> </td>
 		<td>&nbsp;</td>
 	</tr>
 	<tr valign="top">
@@ -198,7 +198,7 @@ else
 		<td><?php xl('Enter Database root Password','e'); ?></td>
 		<td>:</td>
 		<td><input type='password' size='20' name='root_user_pass' id='root_user_pass'
-			value= "" title="<?php xl('Enter root password','e'); ?>" /> </td>
+			value= "" title="<?php xl('Enter Database root Password','e'); ?>" /> </td>
 		<td>&nbsp;</td>
 	</tr>   
 	<tr><td>&nbsp;</td><td colspan=3 align=center>&nbsp;</td><td>&nbsp;</td></tr>  
diff --git a/interface/de_identification_forms/de_identification_screen1.php b/interface/de_identification_forms/de_identification_screen1.php
index ccda3b956..dec0c8e96 100644
--- a/interface/de_identification_forms/de_identification_screen1.php
+++ b/interface/de_identification_forms/de_identification_screen1.php
@@ -261,8 +261,8 @@ function download_file()
 		<br>
         <?php echo xl('Please upgrade OpenEMR Database to include De Identification procedures, function, tables'); ?>
 	</br></br><a  target="Blank" href="../../contrib/util/de_identification_upgrade.php"><?php echo xl('Click here');?></a>
-	<?php echo xl('to Run de_identification_upgrade.php'); 
-    	echo "</br>";	?>      <br>
+	<?php echo xl('to run'); 
+    	echo " de_identification_upgrade.php</br>";?><br>
 		</td>
 		<td>&nbsp;</td>
 	</tr>    
@@ -508,10 +508,10 @@ function download_file()
 				</td>
 			</tr>
 			<tr> <td class="style1"> 
-				<input type="button" name="add_diagnosis" id = "add_diagnosis" value=<?php echo xl("add diagnosis"); ?> onclick="get_values('diagnosis')">
-				<input type="button" name="remove_diagnosis" id="remove_diagnosis"value=<?php echo xl("remove"); ?> onclick="remove_selected('diagnosis')">&nbsp; </td> <td class="style1"> 
-				<input type="button" name="add_drug" id="add_drug" value=<?php echo xl("add drug"); ?> onclick="get_values('drugs')">
-				<input type="button" name="remove_drug" id="remove_drug" value=<?php echo xl("remove"); ?> onclick="remove_selected('drugs')"> 
+				<input type="button" name="add_diagnosis" id = "add_diagnosis" value=<?php echo xl("Add Diagnosis"); ?> onclick="get_values('diagnosis')">
+				<input type="button" name="remove_diagnosis" id="remove_diagnosis"value=<?php echo xl("Remove"); ?> onclick="remove_selected('diagnosis')">&nbsp; </td> <td class="style1"> 
+				<input type="button" name="add_drug" id="add_drug" value=<?php echo xl("Add Drug"); ?> onclick="get_values('drugs')">
+				<input type="button" name="remove_drug" id="remove_drug" value=<?php echo xl("Remove"); ?> onclick="remove_selected('drugs')"> 
 			</td> </tr>
 		</table>
 		</td>
@@ -527,8 +527,8 @@ function download_file()
 		<span class="text"><?php xl('Select Immunizations','e'); ?></span> <br>
 		<select id="immunization_list" name="immunization_list" size="10" width="300" style="width: 30%">
 		</select> <br>
-		<input type="button" name="add_immunization" id="add_immunization" value=<?php echo xl("add immunization"); ?> onclick="get_values('immunizations')">
-		<input type="button" name="remove_immunization" id="remove_immunization" value=<?php echo xl("remove"); ?> onclick="remove_selected('immunizations')">
+		<input type="button" name="add_immunization" id="add_immunization" value=<?php echo xl("Add Immunization"); ?> onclick="get_values('immunizations')">
+		<input type="button" name="remove_immunization" id="remove_immunization" value=<?php echo xl("Remove"); ?> onclick="remove_selected('immunizations')">
 		<br>
 &nbsp;</td>
 		<td>&nbsp;</td>
diff --git a/interface/de_identification_forms/find_code_popup.php b/interface/de_identification_forms/find_code_popup.php
index 43ed6abfb..e225ee196 100644
--- a/interface/de_identification_forms/find_code_popup.php
+++ b/interface/de_identification_forms/find_code_popup.php
@@ -107,7 +107,7 @@ function check_search_str()
  var search_str = document.getElementById('search_term').value;
  if(search_str.length < 3)
  {
-  alert('<?php echo xl("Search string should have atleast three characters");?>');
+  alert('<?php echo xl("Search string should have at least three characters");?>');
   return false;
  }
  top.restoreSession();
@@ -226,13 +226,13 @@ else {
  </table>
 <center>
 </br>
- <input type='button' id='select_all' value='<?php xl('select all','e'); ?>' onclick="chkbox_select_all(document.select_diagonsis.chkbox);"/>
+ <input type='button' id='select_all' value='<?php xl('Select All','e'); ?>' onclick="chkbox_select_all(document.select_diagonsis.chkbox);"/>
  
- <input type='button' id='unselect_all' value='<?php xl('unselect all','e'); ?>' onclick="chkbox_select_none(document.select_diagonsis.chkbox);"/>
+ <input type='button' id='unselect_all' value='<?php xl('Unselect All','e'); ?>' onclick="chkbox_select_none(document.select_diagonsis.chkbox);"/>
  
- <input type='button' id='submit' value='<?php xl('submit','e'); ?>' onclick="window_submit(document.select_diagonsis.chkbox);"/>
+ <input type='button' id='submit' value='<?php xl('Submit','e'); ?>' onclick="window_submit(document.select_diagonsis.chkbox);"/>
  
- <input type='button' id='cancel' value='<?php xl('cancel','e'); ?>' onclick="window_close();"/>
+ <input type='button' id='cancel' value='<?php xl('Cancel','e'); ?>' onclick="window_close();"/>
  
 </center> 
 <?php } ?>
diff --git a/interface/de_identification_forms/find_drug_popup.php b/interface/de_identification_forms/find_drug_popup.php
index 70eed0d0c..1a2e27967 100644
--- a/interface/de_identification_forms/find_drug_popup.php
+++ b/interface/de_identification_forms/find_drug_popup.php
@@ -108,7 +108,7 @@ function check_search_str()
  var search_str = document.getElementById('search_term').value;
  if(search_str.length < 3)
  {
-  alert('<?php echo xl("Search string should have atleast three characters");?>');
+  alert('<?php echo xl("Search string should have at least three characters");?>');
   return false;
  }
  top.restoreSession();
@@ -189,13 +189,13 @@ function check_search_str()
 </tr>
  </table>
 <center>
- <input type='button' name='select_all' value='<?php xl('select all','e'); ?>' onclick="chkbox_select_all(document.select_drug.chkbox);"/>
+ <input type='button' name='select_all' value='<?php xl('Select All','e'); ?>' onclick="chkbox_select_all(document.select_drug.chkbox);"/>
  
- <input type='button' name='unselect_all' value='<?php xl('unselect all','e'); ?>' onclick="chkbox_select_none(document.select_drug.chkbox);"/>
+ <input type='button' name='unselect_all' value='<?php xl('Unselect All','e'); ?>' onclick="chkbox_select_none(document.select_drug.chkbox);"/>
  
- <input type='button' name='submit' value='<?php xl('submit','e'); ?>' onclick="window_submit(document.select_drug.chkbox);"/>
+ <input type='button' name='submit' value='<?php xl('Submit','e'); ?>' onclick="window_submit(document.select_drug.chkbox);"/>
  
- <input type='button' name='cancel' value='<?php xl('cancel','e'); ?>' onclick="window_close();"/>
+ <input type='button' name='cancel' value='<?php xl('Cancel','e'); ?>' onclick="window_close();"/>
 </center> 
 <?php } ?>
 </form>
diff --git a/interface/de_identification_forms/find_immunization_popup.php b/interface/de_identification_forms/find_immunization_popup.php
index 323713393..8013ef236 100644
--- a/interface/de_identification_forms/find_immunization_popup.php
+++ b/interface/de_identification_forms/find_immunization_popup.php
@@ -105,7 +105,7 @@ function check_search_str()
  var search_str = document.getElementById('search_term').value;
  if(search_str.length < 3)
  {
-  alert('<?php echo xl("Search string should have atleast three characters");?>');
+  alert('<?php echo xl("Search string should have at least three characters");?>');
   return false;
  }
  top.restoreSession();
@@ -182,13 +182,13 @@ function check_search_str()
 </tr>
  </table>
 <center>
- <input type='button' name='select_all' value='<?php xl('select all','e'); ?>' onclick="chkbox_select_all(document.select_immunization.chkbox);"/>
+ <input type='button' name='select_all' value='<?php xl('Select All','e'); ?>' onclick="chkbox_select_all(document.select_immunization.chkbox);"/>
  
- <input type='button' name='select_none' value='<?php xl('unselect all','e'); ?>' onclick="chkbox_select_none(document.select_immunization.chkbox);"/>
+ <input type='button' name='select_none' value='<?php xl('Unselect All','e'); ?>' onclick="chkbox_select_none(document.select_immunization.chkbox);"/>
  
- <input type='button' name='submit' value='<?php xl('submit','e'); ?>' onclick="window_submit(document.select_immunization.chkbox);"/>
+ <input type='button' name='submit' value='<?php xl('Submit','e'); ?>' onclick="window_submit(document.select_immunization.chkbox);"/>
  
- <input type='button' name='cancel' value='<?php xl('cancel','e'); ?>' onclick="window_close();"/>
+ <input type='button' name='cancel' value='<?php xl('Cancel','e'); ?>' onclick="window_close();"/>
  
  </center>
 <?php } ?>
diff --git a/interface/de_identification_forms/re_identification_input_screen.php b/interface/de_identification_forms/re_identification_input_screen.php
index bfb90d28c..a1ab15d53 100644
--- a/interface/de_identification_forms/re_identification_input_screen.php
+++ b/interface/de_identification_forms/re_identification_input_screen.php
@@ -79,8 +79,8 @@ function download_file()
 		<br>
         <?php echo xl('Please upgrade OpenEMR Database to include De Identification procedures, function, tables'); ?>
 	</br></br><a  target="Blank" href="../../contrib/util/de_identification_upgrade.php"><?php echo xl('Click here');?></a>
-	<?php echo xl('to Run de_identification_upgrade.php'); 
-    	echo "</br>";	?>      <br>
+	<?php echo xl('to run'); 
+    	echo " de_identification_upgrade.php</br>";?><br>
 		</td>
 		<td>&nbsp;</td>
 	</tr>    
@@ -152,7 +152,7 @@ function download_file()
 	</br>
 		<?php xl('Enter the Re Identification code','e'); ?> <input
 	type='text' size='50' name='re_id_code' id='re_id_code'
-	title='<?php xl('enter single Re Identification code','e'); ?>' /> </br>
+	title='<?php xl('Enter the Re Identification code','e'); ?>' /> </br>
 	</br>
 	<Input type="Submit" Name="Submit" Value=<?php echo xl("submit");?>></center>
 		<?php
diff --git a/interface/language/lang_manage.php b/interface/language/lang_manage.php
index 8e43a2d71..39253bb09 100644
--- a/interface/language/lang_manage.php
+++ b/interface/language/lang_manage.php
@@ -140,12 +140,12 @@ if ($_POST['check'] || $_POST['synchronize']){
 <FORM name="manage_form" METHOD=POST ACTION="?m=manage" onsubmit="return top.restoreSession()">
   <TR>
     <TD><INPUT TYPE="submit" name="check" value="<?php xl('Check','e'); ?>"></TD>
-    <TD class="text"> <?php xl('(Check for Differences of Translations with Custom Language Table)','e'); ?></TD>  
+    <TD class="text">(<?php xl('Check for differences of translations with custom language table.','e'); ?>)</TD>  
   </TR>
   <TR></TR>
   <TR>
     <TD><INPUT TYPE="submit" name="synchronize" value="<?php xl('Synchronize','e'); ?>"></TD>
-    <TD class="text"> <?php xl('(Synchronize Translations with Custom Language Table)','e'); ?></TD>
+    <TD class="text">(<?php xl('Synchronize translations with custom language table.','e'); ?>)</TD>
   </TR>
 </FORM>
 </TABLE>	
diff --git a/interface/main/messages/messages.php b/interface/main/messages/messages.php
index 926037fc0..7be5f8e91 100644
--- a/interface/main/messages/messages.php
+++ b/interface/main/messages/messages.php
@@ -216,7 +216,7 @@ $(document).ready(function(){
     var NewNote = function () {
         top.restoreSession();
       if (document.forms[0].reply_to.value.length == 0) {
-       alert('<?php xl('Please choose a value for Re!', 'e') ?>');
+       alert('<?php xl('Please choose a patient', 'e') ?>');
       }
       else
       {
diff --git a/library/globals.inc.php b/library/globals.inc.php
index 5c6992843..832da22d9 100644
--- a/library/globals.inc.php
+++ b/library/globals.inc.php
@@ -604,7 +604,7 @@ $GLOBALS_METADATA = array(
     ),
 
     'EMAIL_NOTIFICATION_HOUR' => array(
-      xl('EMAIL Notification Hours'),
+      xl('Email Notification Hours'),
       'num',                            // data type
       '50',                             // default
       xl('Number of hours in advance to send email notifications.')
-- 
2.11.4.GIT