=== 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-09-20 07:20:37 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/org/hisp/dhis/caseentry/i18n_module.properties	2012-09-21 01:10:53 +0000
@@ -186,7 +186,7 @@
 duplicated_patient_list=Duplicated patient list
 specfiy_birth_date_or_age=Specify birth date or age
 update_this_patient=Update this person
-advanced_search_patients=Advanced search persons
+search_patients=Search persons
 patient=Person
 confirm_delete_patient=Are you sure you want to delete this person?
 please_enter_a_valid_birth_date=Please enter a valid date of birth
@@ -328,7 +328,7 @@
 are_you_sure=Are you sure?
 loading = Loading
 save_favorite = Save favorite
-search_by_selected_unit = Search by selected unit 
+search_in_all_facilities = Search in all facilities
 identifiers_and_attributes = Identifiers and Attributes
 first_name = First name
 middle_name = Middle name
@@ -354,7 +354,7 @@
 list_all_events = List all events
 search_events_by_dataelements = Search events by data elements
 specify_data_element = Please specify a data element
-advanced_search = Advanced search
+Search = Search
 no_patient_enrolled_the_program = No person enrolled the program
 complete_and_add_new_event = Complete and add new
 no_compulsary_data_elements = No compulsory data elements
@@ -420,7 +420,7 @@
 no_comment = No comment
 please_select_program_stage = Please select program stage
 comment_added = Comment added
-enroll_program = Enroll program
+enroll_program = Enroll into program
 comments_and_sms_message = Comments and messages
 no_message = No message
 program_reports = Program reports

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/activityPlanRecords.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/activityPlanRecords.vm	2012-09-20 04:13:44 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/activityPlanRecords.vm	2012-09-21 01:10:53 +0000
@@ -8,7 +8,7 @@
 		#if($!listAll)
 			$i18n.getString( "list_all_patients" )
 		#else
-			$i18n.getString( "advanced_search_patients" )
+			$i18n.getString( "search_patients" )
 		#end
 		</td>
 	</tr>	

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/anonymousRegistration.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/anonymousRegistration.vm	2012-09-14 13:48:39 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/anonymousRegistration.vm	2012-09-21 01:10:53 +0000
@@ -52,7 +52,7 @@
 					<input type="button" class='large-button' id='removeBtn' value='$i18n.getString( "remove_empty_events" )' onclick="removeEmptyEvents();">
 				</td>
 				<td>
-					<input type="button" class='large-button' id='advancedBtn' value='$i18n.getString( "advanced_search" )' onclick="jQuery('#advanced-search').toggle();">
+					<input type="button" class='large-button' id='advancedBtn' value='$i18n.getString( "search" )' onclick="jQuery('#advanced-search').toggle();">
 				</td>
 			</tr>
 		</table>

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/dataentryRecords.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/dataentryRecords.vm	2012-09-11 09:52:55 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/dataentryRecords.vm	2012-09-21 01:10:53 +0000
@@ -7,7 +7,7 @@
 		#if($!listAll)
 			$i18n.getString( "list_all_patients" )
 		#else
-			$i18n.getString( "advanced_search_patients" )
+			$i18n.getString( "search_patients" )
 		#end
 		</td>
 	</tr>	

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/listPatient.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/listPatient.vm	2012-09-11 09:46:38 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/listPatient.vm	2012-09-21 01:10:53 +0000
@@ -7,7 +7,7 @@
 			#if($!listAll)
 				$i18n.getString( "list_all_patients" )
 			#else
-				$i18n.getString( "advanced_search_patients" )
+				$i18n.getString( "search_patients" )
 			#end
 		</td>
 	</tr>	

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/patientRegistrationList.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/patientRegistrationList.vm	2012-09-11 09:46:38 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/patientRegistrationList.vm	2012-09-21 01:10:53 +0000
@@ -7,7 +7,7 @@
 		#if($!listAll)
 			$i18n.getString( "list_all_patients" )
 		#else
-			$i18n.getString( "advanced_search_patients" )
+			$i18n.getString( "search_patients" )
 		#end
 		</td>
 	</tr>

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/programTrackingRecords.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/programTrackingRecords.vm	2012-09-20 04:13:44 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/programTrackingRecords.vm	2012-09-21 01:10:53 +0000
@@ -8,7 +8,7 @@
 		#if($!listAll)
 			$i18n.getString( "list_all_patients" )
 		#else
-			$i18n.getString( "advanced_search_patients" )
+			$i18n.getString( "search_patients" )
 		#end
 		</td>
 	</tr>	

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/searchPatientCriteria.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/searchPatientCriteria.vm	2012-09-12 09:03:33 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/searchPatientCriteria.vm	2012-09-21 01:10:53 +0000
@@ -14,7 +14,7 @@
 		<td rowspan='2' valign='bottom'>
 			<input type="button" class='large-button' id='listPatientBtn' value="$i18n.getString( 'list_all_patients' )" onclick="javascript:listAllPatient();" disabled >
 			<input type="button" id='addPatientBtn' name='addPatientBtn' class='large-button' value='$i18n.getString( "add_new" )' onclick="showAddPatientForm();" disabled >
-			<input type="button" id='advancedSearchBtn' value='$i18n.getString( "advanced_search" )' onclick="jQuery('#advanced-search').toggle();" #if( $organisationUnit ) #else disabled #end>
+			<input type="button" id='advancedSearchBtn' value='$i18n.getString( "search" )' onclick="jQuery('#advanced-search').toggle();" #if( $organisationUnit ) #else disabled #end>
 		</td>
 	</tr> 
 	<tr id='programAddPatientTR' class='hidden'>

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/singleEventPatient.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/singleEventPatient.vm	2012-08-07 05:43:56 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/singleEventPatient.vm	2012-09-21 01:10:53 +0000
@@ -7,7 +7,7 @@
 		#if($!listAll)
 			$i18n.getString( "list_all_patients" )
 		#else
-			$i18n.getString( "advanced_search_patients" )
+			$i18n.getString( "search_patients" )
 		#end
 		</td>
 	</tr>