=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/org/hisp/dhis/caseentry/i18n_module.properties'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/org/hisp/dhis/caseentry/i18n_module.properties	2012-07-24 07:37:03 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/org/hisp/dhis/caseentry/i18n_module.properties	2012-07-25 08:44:46 +0000
@@ -66,7 +66,7 @@
 complete=Complete
 case_aggregation_form=Person aggregation form
 dataset_list=Dataset List
-multiple_name_based=Multiple Name-based
+multiple_individual_records=Multiple Individual records
 intro_case_aggregation=Generate routine data values from patient data by month (or other intervals if desired) and organisation unit.
 from=From
 to=To
@@ -92,7 +92,7 @@
 violate_validation=Violate validation
 common_info=Common information
 dob_type=DOB type
-intro_multiple_name_based_data_entry=Enter data for multiple program stages and persons for a program. The entry screen gives an overview of the stage status.
+intro_multiple_individual_records=Enter data for multiple program stages and persons for a program. The entry screen gives an overview of the stage status.
 in=In
 is_null=is null
 data_value=datavalue
@@ -242,8 +242,6 @@
 of=of
 show_all_items=Show all items
 see_history_plan=See history / plan
-name_based_data_entry=Name-based data entry
-multiple_name_based_data_entry=Multiple name-based data entry
 use_data_from_level=Use data from level(s)
 saved = Saved
 save_selected_values = Save selected values

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/dataEntryMenu.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/dataEntryMenu.vm	2012-07-21 14:59:13 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/dataEntryMenu.vm	2012-07-25 08:44:46 +0000
@@ -2,7 +2,7 @@
 <a href="index.action"><h2>$i18n.getString( "data_entry" )&nbsp;</h2></a>
 
 <ul>
-	<li><a href="multipledataEntrySelect.action">$i18n.getString( "multiple_name_based" )&nbsp;</a></li>
+	<li><a href="multipledataEntrySelect.action">$i18n.getString( "multiple_individual_records" )&nbsp;</a></li>
 	<li><a href="anonymousRegistration.action">$i18n.getString( "anonymous_events" )</a></li>
 	<li><a href="singleEventSelect.action">$i18n.getString( "single_event_with_registration" )</a></li>
 </ul>

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/index.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/index.vm	2012-07-25 04:05:41 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/index.vm	2012-07-25 08:44:46 +0000
@@ -3,7 +3,7 @@
 
 <ul class="introList">
 	#introListImgItem( "patient.action" "patient" "patient" )
-	#introListImgItem( "multipledataEntrySelect.action" "multiple_name_based_data_entry" "dataentry" )
+	#introListImgItem( "multipledataEntrySelect.action" "multiple_individual_records" "dataentry" )
 	#introListImgItem( "anonymousRegistration.action" "anonymous_events" "dataentry" )
 	#introListImgItem( "singleEventSelect.action" "single_event_with_registration" "dataentry" )
     #introListImgItem( "reportSelect.action" "program_summary" "summaryreport" )

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/menu.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/menu.vm	2012-07-25 03:05:04 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/menu.vm	2012-07-25 08:44:46 +0000
@@ -6,7 +6,7 @@
 
 <h2>$i18n.getString( "data_entry" )&nbsp;</h2>
 <ul>
-	<li><a href="multipledataEntrySelect.action">$i18n.getString( "multiple_name_based" )&nbsp;</a></li>
+	<li><a href="multipledataEntrySelect.action">$i18n.getString( "multiple_individual_records" )&nbsp;</a></li>
 	<li><a href="anonymousRegistration.action">$i18n.getString( "anonymous_events" )</a></li>
 	<li><a href="singleEventSelect.action">$i18n.getString( "single_event_with_registration" )</a></li>
 </ul>

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/multiDataEntrySelect.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/multiDataEntrySelect.vm	2012-07-18 03:52:21 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/multiDataEntrySelect.vm	2012-07-25 08:44:46 +0000
@@ -1,4 +1,4 @@
-<h3>$i18n.getString( "multiple_name_based" ) #openHelp('multi_name_based_data_entry')</h3>
+<h3>$i18n.getString( "multiple_individual_records" ) #openHelp('multi_name_based_data_entry')</h3>
 
 <h4 id='programName' name='programName'></h4>
 <input type="button" id='btnBack' name='btnBack' style='width: 150px;display:none;' value="$i18n.getString( 'back' )" onclick="backButtonOnClick();"/>

=== removed file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/search.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/search.vm	2012-07-10 06:49:04 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/search.vm	1970-01-01 00:00:00 +0000
@@ -1,42 +0,0 @@
-
-<h3>$i18n.getString( "name_based_data_entry" )</h3>
-
-<table>    
-    <tr>
-        <td><label>$i18n.getString( "registering_unit" )</label></td>
-        <td>
-        	<input type="text" readonly="readonly" #if( $organisationUnit ) value="$encoder.htmlEncode( $organisationUnit.name )" #else value="[$i18n.getString( "please_select_village" )]" #end style="min-width:350px">
-        </td>
-        <td>&nbsp;</td>
-        <td>
-        	<input type="button" value="$i18n.getString( "list_all_patients" )" onclick="window.location.href='listAllPatients.action'">
-        </td>        
-    </tr>        
-</table>
-
-<hr style="clear:both">
-
-<form id="searchForm" name="searchForm" action="searchPatient.action" method="post" onsubmit="return validateAdvancedSearch();">
-<table> 
-    <tr>           
-        <td>
-          <select id="searchingAttributeId" name="searchingAttributeId" style="min-width:300px"  #if( $patientAttributes.size() == 0 ) disabled="disabled" #end>
-            <option value="">$i18n.getString( "search_by_name_identifier" )</option>
-                #foreach( $attribute in $patientAttributes )
-                    <option value="$attribute.id" #if( $searchingAttributeId && $attribute.id == $searchingAttributeId ) selected="selected" #end>$encoder.htmlEncode( $attribute.name )</option>
-                #end
-          </select> 
-          <em title="$i18n.getString( "required" )" class="required">*</em></label>
-        </td>       
-        <td>
-        	<input type="text" id="searchText" name="searchText" maxlength="30" style="width:20em"/>
-        </td>        
-        <td>
-        	<input type="submit" value="$i18n.getString( "search" )"/>
-        </td>        
-    </tr>    
-    <tr></tr>        
-</table>
-</form>
-
-<span id="message"></span>

=== removed file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/selectProgram.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/selectProgram.vm	2011-09-01 04:50:41 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/selectProgram.vm	1970-01-01 00:00:00 +0000
@@ -1,47 +0,0 @@
-<h3>$i18n.getString( "name_based_data_entry" )</h3>
-
-<br>
-
-<form id="selectProgramForm" name="selectProgramForm" method="post" action="selectProgram.action">
-<div>
-    <input type="hidden" id="id" name="id" value="$patient.id">
-</div>
-
-<table>
-    <tr>
-        <td>            
-            $encoder.htmlEncode( $patient.firstName )
-        </td>
-        <td>            
-            $encoder.htmlEncode( $patient.middleName )
-        </td>
-        <td>            
-            $encoder.htmlEncode( $patient.lastName )
-        </td>               
-        <td>            
-            $i18n.getString($patient.gender )
-        </td>
-        <td>            
-            $format.formatDate( $patient.birthDate )
-        </td>
-    </tr>
-</table>
-
-<hr style="clear:both">
-
-<table>    
-   <tr>
-        <td><label for="programId">$i18n.getString( "program" )</label></td>
-        <td>
-            <select id="programId" name="programId" style="min-width:350px" onchange="document.getElementById( 'selectProgramForm' ).submit();" #if( $patient.programs.size() == 0 ) disabled="disabled" #end>
-                <option value="null">[$i18n.getString( "select" )]</option>
-                #foreach( $program in $patient.programs )
-                    <option value="$program.id" #if( $programId && $program.id == $programId ) selected="selected" #end>$encoder.htmlEncode( $program.name )</option>
-                #end
-            </select>
-        </td>
-    </tr>      
-</table>
-</form>
-
-<hr style="clear:both">

=== modified file 'dhis-2/dhis-web/dhis-web-commons/src/main/resources/i18n_global.properties'
--- dhis-2/dhis-web/dhis-web-commons/src/main/resources/i18n_global.properties	2012-07-04 01:37:02 +0000
+++ dhis-2/dhis-web/dhis-web-commons/src/main/resources/i18n_global.properties	2012-07-25 08:44:46 +0000
@@ -40,7 +40,7 @@
 dhis-web-maintenance-settings=Settings
 dhis-web-maintenance-patient=Persons and Programs
 dhis-web-maintenance-mobile=Mobile configuration
-dhis-web-caseentry=Name-Based Data Records
+dhis-web-caseentry=Individual Records
 dhis-web-dataentry=Data Entry
 dhis-web-importexport=Import-Export
 dhis-web-validationrule=Data Quality