dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 2869
committer: Tran Chau <tran.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Fri 2011-02-18 11:29:49 +0700
message:
  Remove duplicated keys into property file into dhis-web-maintenance-patient module.
modified:
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/resources/org/hisp/dhis/patient/i18n_module.properties
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/updateProgramForm.vm
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/viewDataEntryForm.vm


--
lp:dhis2
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk

Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/resources/org/hisp/dhis/patient/i18n_module.properties'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/resources/org/hisp/dhis/patient/i18n_module.properties	2011-02-16 02:55:58 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/resources/org/hisp/dhis/patient/i18n_module.properties	2011-02-18 04:29:49 +0000
@@ -16,7 +16,6 @@
 remove_mapping = Remove Mapping
 aggregate_domain = Aggregate Domain
 is_equal_to_patient_domain = Is Equal to Beneficiary Domain
-mapping_area = Mapping Area
 please_select_a_group_from_above = Please select a group from above
 group = Group
 selected_aggregate_data_element = Selected Aggregate Data Element
@@ -63,17 +62,17 @@
 relationship_type_details = Relationship Type Details
 a_is_to_b = A is to B
 b_is_to_a = B is to A
-update_relationshiop_type = Update Relationship Type
+update_relationship_type = Update Relationship Type
 add_new_relationship_type = Add new Relationship Type
 please_specify_the_a_side_of_the_relationship_type = Please specify the A side of the relationship type
 please_specify_the_b_side_of_the_relationship_type = Please specify the B side of the relationship type
 relationship_type_management = Relationship Type Management
 relationship_already_exists = Relationship already exists
 list_all_patients = List All Beneficiaries
-specfiy_birth_date_or_age = Please specify either date of birth or age
+specify_birth_date_or_age = Please specify either date of birth or age
 or = OR
 age = Age
-specfiy_name_s = Please specify name(s)
+specify_name_s = Please specify name(s)
 estimated = Estimated
 age_must_integer = Age must be integer
 saving_value_failed_status_code = Saving value failed with status code 
@@ -91,7 +90,6 @@
 please_specify_a_valid_enrollment_date = Please specify a valid program enrollment date
 please_specify_date_of_incident = Please specify date of incident
 please_specify_a_valid_date_of_incident = Please specify a valid date of incident
-program_enrollment_failed = Program Enrollment Failed
 date_of_incident = Date of Incident
 date_of_enrollment = Date of Enrollment
 date_selector = Date Selector
@@ -117,14 +115,12 @@
 value_must_positive = Value must be a positive number
 invalid_min_max_days = Invalid Min/Max days combination
 members_in_the_selected_house_hold = Members in the selected Household
-hide_details = Hide Details
 house_hold = Household
 household_enrollment = Household Enrollment
 update_enrollment = Update Enrollment
 empty_search_result = Empty Search Result
 please_search_here = Please Search Here
 paitents_and_programs = Beneficiaries and Programs
-program = Program
 please_select_program = Please select a program
 select_program = Select Program
 program_stage_management = Program Stage Management
@@ -146,7 +142,6 @@
 program_stage_count = Number of stages in program
 please_specify_min_day = Please specify the min. day
 please_specify_max_day = Please specify the max. day
-value_must_integer = Value must be Integer !
 program_stages_in_program = Program Stages in Program
 stage_in_program = Visit stage in Program
 adding_program_stage_failed = Adding Program Stage Failed
@@ -214,7 +209,6 @@
 patient_identifier_s = Beneficiary Identifier(s)
 requried = Required
 demographics = Demographics
-age = Age
 gender = Gender
 male = Male
 female = Female
@@ -231,7 +225,6 @@
 house = House
 deceased = Deceased
 check_if_this_person_is_deceased = Check if this person is deceased
-or = OR
 id = Id
 add = Add
 edit_profile = Edit Profile
@@ -242,19 +235,15 @@
 specify_date_of_birth = Please specify a date of birth
 please_enter_a_valid_birth_date = Please enter a valid date of birth
 specify_identifier = Please specify a valid Identifier.
-specify_name_s = Please specify name(s)
 enter_a_valid_identifier = Please enter a valid Identifier
 patient_management = Beneficiary Management
 address_management = Address Management
 household_management = Household Management
-patient_management = Beneficiary Management
 program_management = Program Management
-program_stage_management = Program Stage Management
 please_select_item_from_menu = Please select an item from the menu
 everything_is_ok = Everything is OK
 patient = Beneficiary
 patient_attribute = Beneficiary Attribute
-relationship_type = Relationship Type
 program = Program
 case_aggregation_mapping = Beneficiary Aggregation QueryBuilder
 dataelement_group = Dataelement Group
@@ -264,10 +253,8 @@
 case_attributes = Case Attributes
 operator = Operator
 and_or = And/Or
-select = Select
 dataentryform_management_for_program_stage = Data entry form management for Program stage
 select_method = Select method
-design_dataentry = Design data entry form
 choose_existing_dataentry = Choose existing data entry form
 choose_dataentry = Data entry form
 dataentryform_details = Data entry form details
@@ -276,9 +263,7 @@
 add_more_option = Add Option
 remove_option = Remove Option
 mandatory  = Mandatory
-update_relationship_type = Update Relationship Type
 patient_attribute_group_management = Beneficiary Attribute Group Management
-required = Required
 move_selected = Move selected items
 remove_selected = Remove selected items
 availableAttribute = Available attributes
@@ -347,7 +332,6 @@
 validation_criteria = Validation Criteria
 update_validation_criteria = Update validation criteria
 add_validation_criteria = Add validation criteria
-define_program_associations = Define program associations
 intro_patient = Create, modify and search for Benificiaries. Any type of data can be registered for a Beneficiary by including attributes.
 intro_patient_attribute = Create, modify and view Beneficiary attributes. An attribute can be used to register extra information for a Beneficiary.
 intro_patient_attribute_group = Create, modify and view Beneficiary attribute groups. Groups makes it more convenient to add attributes to a Beneficiary.
@@ -384,7 +368,6 @@
 available_criteria = Available criteria
 selected_criteria = Selected criteria
 programstage_dataelement_validation = Programstage Dataelement Validation
-dataentryform_management_for_program_stage = Data Entry Form Form ProgramStage
 field_is_required = This field is reqiured
 number_of_attribute = Number of attributes
 confirm_delete_patientIdentifierType = Are you sure you want to delete identifier type ?
@@ -394,8 +377,7 @@
 confirm_delete_validation_criteria = Are you sure you want to delete validation criteria ?
 specify_dataelememt = Please specify a data elemement.
 processing = Processing ...
-done = Done
-dataentryform_management_for_program_stage	= Data entry form management for program stage
+done = Done	
 optioncombo	= Option Combo
 view_as	= View as
 dataelement_of_orther_program_stage	= Data element of other program tage
@@ -465,8 +447,6 @@
 death_date = Death date
 is_dead = isDead
 search_result = Search result
-no_max_days_alowed_input_data = Maximum number of days allowed to input data
-no_min_days_alowed_input_data = Minimum number of days allowed to input data
 criteria_details = Criteria Details
 program_attribute_details = Program Attribute Details 
 date_invalid = The date is invalid

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/updateProgramForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/updateProgramForm.vm	2011-01-20 15:25:13 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/updateProgramForm.vm	2011-02-18 04:29:49 +0000
@@ -52,13 +52,13 @@
 	  </tr>
   
 	  <tr>
-		<td><label>$i18n.getString( "no_min_days_alowed_input_data" ) <em title="$i18n.getString( "required" )" class="required">*</em></label></td>
+		<td><label>$i18n.getString( "no_min_days_allowed_input_data" ) <em title="$i18n.getString( "required" )" class="required">*</em></label></td>
 		<td><input type="text" id="minDaysAllowedInputData" name="minDaysAllowedInputData" value="$!program.minDaysAllowedInputData" style="width:30em" class="{validate:{required:true,number:true}}"></td>
 		<td></td>
 	  </tr>	
 	
 	  <tr>
-		<td><label>$i18n.getString( "no_max_days_alowed_input_data" ) <em title="$i18n.getString( "required" )" class="required">*</em></label></td>
+		<td><label>$i18n.getString( "no_max_days_allowed_input_data" ) <em title="$i18n.getString( "required" )" class="required">*</em></label></td>
 		<td><input type="text" id="maxDaysAllowedInputData" name="maxDaysAllowedInputData" value="$!program.maxDaysAllowedInputData" style="width:30em" class="{validate:{required:true,number:true}}"></td>
 		<td></td>
 	  </tr>		  

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/viewDataEntryForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/viewDataEntryForm.vm	2011-01-21 02:26:00 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/viewDataEntryForm.vm	2011-02-18 04:29:49 +0000
@@ -91,7 +91,7 @@
 	</table>  
 	<table width="100%">      
 		<tr>
-			<th>$i18n.getString( "design_dataentry" )</th>
+			<th>$i18n.getString( "design_dataentry_form" )</th>
 		</tr>
 		<tr>
 			<td>$editorManager.create( "designTextarea", "100%", "400" )</td>