dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 6072
committer: Lars Helge Overland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Tue 2012-02-21 16:14:22 +0100
message:
  Cleaned patient module. Done for now
modified:
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/src/main/resources/org/hisp/dhis/mobile/i18n_module.properties
  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-settings/src/main/resources/org/hisp/dhis/settings/i18n_module.properties
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module.properties


--
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-mobile/src/main/resources/org/hisp/dhis/mobile/i18n_module.properties'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/src/main/resources/org/hisp/dhis/mobile/i18n_module.properties	2011-12-24 06:44:12 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/src/main/resources/org/hisp/dhis/mobile/i18n_module.properties	2012-02-21 15:14:22 +0000
@@ -10,7 +10,6 @@
 selected_patient_attributes=Selected Patient Attributes
 intro_mobile_dataset=Define and sort the data sets which are available for facility reporting on the mobile client.
 mobile_dataset=Dataset for Mobile
-available_for_mobile_reporting=Available for Mobile Reporting
 available_datasets=Available DataSets
 mobile_configuration=Mobile Configuration
 sms_service_configuration=SMS Service Configuration

=== 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	2012-02-15 06:47:14 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/resources/org/hisp/dhis/patient/i18n_module.properties	2012-02-21 15:14:22 +0000
@@ -1,39 +1,16 @@
-available_patient_attributes=Available Beneficiary Attributes
-selected_patient_attributes=Selected Beneficiary Attributes
 groupBy=Group By
-filters=Filters
-any=Any
 equal_to=Equal
 greater_than=Greater Than
 greater_than_or_equal_to=Greater Than or Equal
 less_than=Less Than
 less_than_or_equal_to=Less Than or Equal
 in_between=In Between
-mapping_area=Mapping Area
-save_mapping=Save Mapping
-remove_mapping=Remove Mapping
-aggregate_domain=Aggregate Domain
 is_equal_to_patient_domain=Is Equal to Beneficiary Domain
-please_select_a_group_from_above=Please select a group from above
 group=Group
-selected_aggregate_data_element=Selected Aggregate Data Element
-aggregate_data_elements=Aggregate Data Elements
-patient_data_elements=Beneficiary Data Elements
-invalid_date=Incorrect format for date value
-format_date=The correct format should be
 duplicate_names=Name is already in use
-removing_relationship_failed=Removing Relationship failed
-back_to_search=Back to Search
-do_you_want_to_make_this_one_a_representative=Do you want to make this one a representative?
-do_you_want_to_remove_this_one_from_being_representative=Do you want to remove this one from being representative?
 hide_details=Hide Details
-removing_representative_failed=Removing representative failed
-saving_representative_failed=Saving representative failed
-adding_relationship_failed=Adding relationship failed
 please_select=Please Select
-patients_and_programs=Beneficiaries and Programs
 is=is
-please_select_relationship_type=Please select relationship type
 confirm_delete_relationship_type=Are you sure you want to delete relationship type?
 relationship_type=Relationship Type
 relationship_type_details=Relationship type details
@@ -41,21 +18,11 @@
 b_is_to_a=B is to A
 edit_relationship_type=Edit relationship type
 create_new_relationship_type=Create 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
 or=or
 age_month=Age(months)
-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
-saving_value_failed_error_code=Saving value failed with error code
 value_must_integer=Value must be an integer
-searching_patient_failed=Searching Beneficiary failed
-program_enrollment_failed=Program Enrollment Failed
 program_stage=Program Stage
-date_selector=Date Selector
 close=Close
 edit_patient_attribute=Edit beneficiary attribute
 attribute=Attribute
@@ -64,38 +31,20 @@
 confirm_delete_patient_attribute=Are you sure you want to delete beneficiary attribute?
 patient_attribute_management=Beneficiary attribute management
 name_in_use=Name in use
-please_select_village=Please Select a village from the tree
-no_matching_found=No matching found
-choose_this_patient=Choose this Beneficiary
 program_stage_sort_order=Program Stage Sort Order
 sort=Sort
 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
-house_hold=Household
-household_enrollment=Household Enrollment
-patients_and_programs=Beneficiaries and Programs
 please_select_program=Please select a program
 select_program=Select Program
 program_stage_management=Program stage management
 view_program_stages=View program stages
-select_all_in_group=Select all in group
-unselect_all_in_group=Unselect all in group
-unselect_all_at_level=Unselect all at level
-select_all_at_level=Select all at level
 assign_program_to_orgunits=Assign program to organisation units	
 assign_program_to_orgunits_for_registering=Assign program to organisation units for registering
 programs=Programs
-selected_programs=Selected Programs
-available_programs=Available Programs
-manage_household_enrollment=Manage Household Enrollment
 no_of_dataelements=Number of DataElements to be collected
-program_stage_count=Number of stages in program
-program_stages_in_program=Program Stages in Program
 stage_in_program=Visit stage in Program
 adding_program_stage_failed=Adding Program Stage Failed
-data_elements_in_program_stage=DataElements in Program Stage
-please_specify_a_valid_stage=Please specify a valid program stage order
 updating_program_stage_failed=Updating Program Stage Failed
 confirm_delete_prorgam_stage=Are you sure you want to delete this program stage?
 available_data_elements=Available Data Elements
@@ -109,59 +58,12 @@
 edit_program=Edit program
 confirm_delete_prorgam=Are you sure you want to delete this program ?
 create_new_program=Create new program
-number_of_days=Duration of Program (no. of days)
-please_specify_a_name=Please specify a name
-please_specify_a_description=Please specify a description
-please_specify_number_of_days=Please specify number of days (Program duration)
 search=Search
-remove_member_s=Remove Member(s)
-add_member_s=Add Member(s)
-search_for_new_members=Search for new members
-house_hold_members=Household Members
-available_members=Available Members
-selected_members=Selected Members
-house_hold_members_management=Household Members Management
-house_hold_details=HouseHold Details
-specify_search_criteria=Please specify your search criteria
-no_matching_found=No matching found
-updating_house_hold_failed=Updating Household Failed
-adding_house_hold_failed=Adding Household Failed
-please_specify_an_address=Please specify an address for the house
-please_specify_a_landmark=Please specify a landmark for the house
-please_select_a_registering_unit=Please select a registering Unit first!
-no_of_house_hold_members=Number of HouseHold Members
-confirm_delete_house_hold=Are you sure you want to delete HouseHold?
-update_household=Update Household
-manage_membership=Manage Household Membership
-manage_members=Manage Household Members
-house_number=Household Number
-add_new_household=Add New Household
 select=Select
-registering_unit=Registering Unit
 organisation_unit=OrganisationUnit
-search_result_matching_the_search_criteria=Result matching the search criteria:
-please_select_a_registering_unit_to_proceeed=Please select a Registration/Organization Unit to proceed.
-requried=Required
-demographics=Demographics
-address=Address
-address1=Address 1
-address2=Address 2
-city_village=City/Village
-state_province=State/Province
-country=Country
-region=Region
-postal_code=Postal Code
-land_mark=Land Mark
-house=House
-deceased=Deceased
-check_if_this_person_is_deceased=Check if this person is deceased
 id=Id
 add=Add
-edit_profile=Edit profile
-address_management=Address Management
-household_management=Household Management
 program_management=Program management
-please_select_item_from_menu=Please select an item from the menu
 everything_is_ok=Everything is OK
 patient_attribute=Beneficiary Attribute
 program=Program
@@ -172,11 +74,8 @@
 dataelement=Data Element
 case_attributes=Beneficiary Attributes
 operator=Operator
-and_or=And/Or
 dataentryform_management_for_program_stage=Data entry form management for Program stage
-select_method=Select method
 choose_existing_dataentry=Choose existing data entry form
-choose_dataentry=Data entry form
 dataentryform_details=Data entry form details
 blood_group=Blood group
 attribute_options=Attribute options
@@ -190,22 +89,13 @@
 selectedAttribute=Selected attributes
 patient_attribute_group_deltails=Beneficiary attribute group details
 patient_attribute_group=Beneficiary Attribute Group
-please_specify_attributes=Please specify attributes for group
-patient_attribute_group_association=Beneficiary Attribute Group Association
 edit_patient_attribute_group=Edit beneficiary attribute group
 create_new_patient_attribute_group=Create new beneficiary attribute group
-patient_attributes=Beneficiary Attributes
-identifier_format=Identifier Format
 patient_identifier_type_management=Beneficiary identifier type management
 patient_identifier_type=Beneficiary Identifier Type
 create_new_patient_identifier_type=Create new beneficiary identifier type
 edit_patient_identifier_type=Edit beneficiary identifier type
 delete_successfull=Deleted successfully
-father=Father
-mother=Mother
-guardian=Guardian
-child_contact_type=Child contact type
-child_contact_name=Child contact name
 warning_delete_patient_attribute_option=This option has relationship with BeneficiaryAttributeValue. You must not delete it.
 success_delete_patient_attribute_option=Delete beneficiary attribute option successfully.
 error_delete_patient_attribute_option=Can not find Beneficiary attribute option to delete.
@@ -214,12 +104,6 @@
 identifier_type=Identifier type
 combo=Predefined value
 related=Related
-no_result=No result
-error_connect_to_server=Error connect to server
-please_enter_value=Please enter value
-please_select_search_type=Please select search type
-please_select_identifier_type=Please select Identifier type
-please_select_attribute_type=Please select Attribute type
 validation_criteria=Validation Criteria
 edit_validation_criteria=Edit validation criteria
 create_validation_criteria=Create validation criteria
@@ -234,26 +118,16 @@
 intro_import_data=Import information of patients automatically from an Excel template file into the beneficiary database.
 intro_patient_organisation_unit_registration=Define the organisation units which should be allowed to register beneficiaries.
 intro_configuration=Set the Excel XML template file used for automatically importing beneficiary data.
-add_dependent=Add dependent
 inheritable=Inheritable
-other_details=Other Details
 patient_attribute_details=Beneficiary attribute details
 search_result=Search result
 criteria=Criteria
 operator_less_then=<
 operator_equal_to==
 operator_greater_then=>
-program_is_invalid=Program is invalid
-validation_associations=Validation association
-define_validation_associations=Define validation associations
-define_validationDE_associations=Define validation Data Element Associations
-validationDE_associations=Validation Data Element Associations
 left_side=Left side
 right_side=Right side
 validation=Validation
-available_criteria=Available criteria
-selected_criteria=Selected criteria
-programstage_dataelement_validation=Program Stage Data Element Validation
 field_is_required=This field is required
 number_of_attribute=Number of attributes
 confirm_delete_patientIdentifierType=Are you sure you want to delete identifier type ?
@@ -264,10 +138,7 @@
 specify_dataelememt=Please specify a data element
 processing=Processing
 done=Done
-optioncombo=Option combo
-view_as=View as
 dataelement_of_orther_program_stage=Data element of other program stage
-short_name=Short name
 load_existed_form=Load existing form
 design_dataentry_form=Design data entry form
 dataelement_is_inserted=This data element is inserted into form
@@ -280,66 +151,39 @@
 program_attribute_management=Program attribute management
 create_new_program_attribute=Create new program attribute
 edit_program_attribute=Edit program attribute
-program_infor=Program information
 import=Import
 import_data=Import Data
-import_file=Import file
-upload=Upload
 configuration=Configuration
-patient_xml_template_file=Beneficiary XML template file
-not_save_patient=Beneficiaries not saved
 row=Row
-reason=Reason
-patient_name_is_null=The name of beneficiary is missing
-birthday_is_null=Birthday is missing
 duplicate=Duplicate
-excel_file=Excel file.
-upload_file_null=Upload file is missing
-file_type_not_supported=File type is not supported
 dataelement_group=Data Element Group
 option_combo=Option combo
 case_aggregation_condition=Beneficiary Aggregation Query Builder
 case_aggregation_condition_detail=Beneficiary aggregation query builder details
 create_new_case_aggregation_condition=Create new beneficiary aggregation query builder
-case_attributes_and_properties=Case Attributes and Properties
 condition=Condition
 condition_detail=Condition details
 edit_case_aggregation_condition=Edit beneficiary aggregation query builder
 enrolldate_minus_incidentdate=Date of Enrollment - Date of Incident
 program_properties=Program properties
-not_enough_mandatory_identifier=Not enough data for the mandatory identifier(s)
-not_enough_madatory_attribute=Not enough data for the mandatory attribute(s)
-get_data_error=Get data error
-hierachy_orgunit=Hierarchy organisation unit
-similar_patients=Similar patients
 orgunit=Organisation unit
 validation_criteria_details=Validation criteria details
 program_attribute_details=Program attribute details
 patient_organisation_unit_registration=Beneficiary Organisation Unit Registration
 select_program=Select program
-fill_fields_in_programstage_dataelement_validation=Fill all fields in validation form
-define_single_dataelement_validation=Define Single Data Element Validation
 add_single_program_validation=Add Single Program Validation
 add_multi_program_validation=Add Multi Program Validation
-edit_single_program_validation=Edit single program validation
-edit_multi_program_validation=Edit multi program validation
 program_validation_details=Program Validation Details
 program_validation_management=Program validation managenent
 create_new_single_validation=Create new single validation
 create_new_multi_validation=Create new multi validation
-save_success=Save successfully
-configuration_xml_file_null=Configuration of folder where contains xml file is null
-there_is_no_defination_xml_file_in_user_home=There is no any definition related XML file in the user home
-patient_attribute_group_sort_order=Beneficiary Attribute Group Sort Order
 beneficiary_attribute_group_sort_order=Beneficiary Attribute Group Sort Order
 min_days_from_start=Mininum number of days from start
-warning_delete_program_attribute_option=This option has relationship with ProgramAttributeValue. You must not delete it.
 success_delete_program_attribute_option=Delete program attribute option successfully.
 validation_criteria_management=Validation criteria management
 aggregation_data_element=Aggregation data element
 aggregation_expression=Aggregation expression
 aggregation_data_element_in_use=Aggregation data element is in use
-add_more_option_to_search=Add more option to search
 delete_program_data_entry_confirm=Do you want to delete program data entry ?
 patient_chart_management=Beneficiary chart management
 create_new_patient_chart=Create new beneficiary Chart
@@ -383,23 +227,23 @@
 irregular_encounter=Irregular encounter
 date_of_birth=Date of Birth
 anonymous=Anonymous
-edit_program_validation = Edit program validation 
-age = Age
-birthDate = Birthdate
-assign_validation_for_programs = Assign validation for programs
-validation_for_date_data_elements = Validation for date date elements
-before_current_date = Before current date
-before_or_equals_to_current_date = Before or equals to current date
-after_current_date = After current date
-after_or_equals_to_current_date = After or equals to current date
-before_due_date = Before due date
-before_or_equals_to_due_date = Before or equals to due date
-after_due_date = After due date
-after_or_equals_to_due_date = After or equals to due date
-in_range_due_date = In range Due date
-data_element = Data element
-condition = Condition
-no_date_data_element_in_selected_program_stage = No data elements with date-type in the selected program stage
-shown_on_reports = Shown on reports 
-hide_provided_other_facility = Hide provided other facility
-suggested_values = Suggested values
\ No newline at end of file
+edit_program_validation=Edit program validation 
+age=Age
+birthDate=Birthdate
+assign_validation_for_programs=Assign validation for programs
+validation_for_date_data_elements=Validation for date date elements
+before_current_date=Before current date
+before_or_equals_to_current_date=Before or equals to current date
+after_current_date=After current date
+after_or_equals_to_current_date=After or equals to current date
+before_due_date=Before due date
+before_or_equals_to_due_date=Before or equals to due date
+after_due_date=After due date
+after_or_equals_to_due_date=After or equals to due date
+in_range_due_date=In range Due date
+data_element=Data element
+condition=Condition
+no_date_data_element_in_selected_program_stage=No data elements with date-type in the selected program stage
+shown_on_reports=Shown on reports 
+hide_provided_other_facility=Hide provided other facility
+suggested_values=Suggested values
\ No newline at end of file

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/resources/org/hisp/dhis/settings/i18n_module.properties'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/resources/org/hisp/dhis/settings/i18n_module.properties	2012-01-22 04:20:13 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/resources/org/hisp/dhis/settings/i18n_module.properties	2012-02-21 15:14:22 +0000
@@ -1,6 +1,4 @@
-save_zero_values=Save zero values for sum aggregated dataelements
 omit_indicators_zero_numerator_data_mart=Omit indicator values with zero numerator value in data mart
-alternativename=Alternative name
 db_language=Database Language
 language=Interface Language
 dashboard_charts_to_display=Dashboard Charts to Display
@@ -12,28 +10,13 @@
 host_name=Host name
 username=User name
 password=Password
-shortname=Short name
-custom=Custom
 user_settings=User settings
 application_title=Application title
-top_background_color=Top background colour
-left_background_color=Left background colour
-title_color=Title text colour
-active_menu_element_color=Active menu element colour
-background_color_in_menu=Background colour in menu
-menu_element_color=Menu element colour
 dhis-web-maintenance-settings=Settings
 settings=Settings
-color_scheme=Colour Scheme
-data_dictionary_mode=Data dictionary mode
-regular=Regular
-extended=Extended
 style=Style
-blue=Blue
 light_blue=Light Blue
-openhealth=OpenHealth
 green=Green
-vista=Vista
 flag=Flag
 no_flag=No flag
 ethiopia=Ethiopia
@@ -81,7 +64,6 @@
 macos=Mac OS
 portal=Portal
 start_page=Start page
-forum_integration=Forum integration
 no_start_page=No start page
 intro_user_general_settings=Customize the system with user specific settings for locale, style and more.
 intro_user_message_settings=Customize the system with user specific settings for message email and sms notification.
@@ -98,16 +80,12 @@
 email=Email
 message=Message
 disable_dataentry_when_dataset_completed=Disable data entry when data set completed
-max_attempts=Max number of login attempts
-lockout_timeframe=Lockout minutes after max number of login attempts
 data_analysis_factor=Data analysis std dev factor
 auto_save_data_entry_form=Auto-save data entry form
 aggregation_strategy=Aggregation strategy
 real_time=Real-time
 batch=Batch
 days_after_period_timeliness=Days after period end to qualify for timely data submission
-system_identifier=System identifier
-can_be_set_once=can only be set once
 infrastructural_data_elements=Infrastructural data elements
 infrastructural_period_type=Infrastructural period type
 feedback_recipients=Feedback recipients
@@ -115,7 +93,6 @@
 settings_updated=Settings were updated
 message_email_notification=Message email notification
 message_sms_notification=Message sms notification
-completeness_email_notification=Completeness email notification
 completeness_recipients=Completeness notification recipients
 no_completeness_recipients=No completeness recipients
 use_db_locale_no_translation=Use database locale / no translation
\ No newline at end of file

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module.properties'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module.properties	2012-02-17 21:57:34 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module.properties	2012-02-21 15:14:22 +0000
@@ -178,9 +178,7 @@
 
 #-- User module ---------------------------------------------------------------#
 
-reports=Reports
 user_management=User management
-filter_by_username=Filter by username
 username=Username
 fullname=Fullname
 role=Role
@@ -189,56 +187,29 @@
 user_role=User Role
 data_sets=Data sets
 change=Change
-specify_username=Please specify a username
 username_in_use=The username is already used, please specify a different username
-specify_surname=Please specify a surname
-specify_first_name=Please specify a first name
-specify_name=Please specify a name
-specify_description=Please specify a description
 name_in_use=The name is already in use, please specify a different name
 everything_is_ok=Everything is ok
 roles=Roles
 unit=Unit
 selected_roles=Selected roles
 available_roles=Available roles
-select_role=Select role
-deselect_role=Deselect role
 create_new_user=Create new user
 password=Password
 firstName=First name
 edit_user=Update user
-edit_role=Update user role
 confirm_delete_user=Are you sure you want to delete this user?
-generate_new=Generate new
 retype_password=Retype password
 organisation_unit=Organisation unit
-specify_organisationunit=Please specify an organisation unit
-specify_raw_password=Please specify a password
-specify_retype_password=Please confirm the password
-password_un_matched=Password and retyped password don't match
-show_all_users=Show all users
-show_users_by_orgUnit=Show users by organisation unit
 adding_role_failed=Adding role failed
-saving_role_failed=Saving role failed
-adding_user_failed=Adding user failed
-saving_user_failed=Saving user failed
-change_password=Change password
 members=Members
 data_sets=Datasets
-reports=Reports
 user_role_management=User role management
 edit_user_role=Update user role
 create_new_user_role=Create new user role
-filter_by_user_name=Filter by username
-filter_by_role_name=Filter by rolename
-email_is_not_valid=E-mail is not valid
-password_is_not_valid=Password is not valid
-select_all_in_group=Select all in group
-remove_all_in_group=Remove all in group
 organisation_units=Organisation units
 confirm_delete_role=Are you sure you want to remove the user role?
 authorities=Authorities
-excel_reporting=Excel Reporting
 intro_user=Create, modify, view and delete users. A user is associated with user roles and an organisation unit.
 intro_user_by_orgunit=Create, modify, view and delete users which are assigned to a given organisation unit.
 intro_user_role=Create, modify, view and delete user roles. A user role has a set of authorities in the system.
@@ -246,13 +217,10 @@
 user_use_group=There are users used this role
 can_not_remove_last_super_user=Can not remove the last super user.
 can_not_remove_last_super_user_role=Can not remove the last super user role.
-excel_importing=Excel Importing
 delete_current_user=Delete Current User
-number_of_orgunit=Number of organisation units
 user_group=User Group
 intro_user_group=Create user groups for functionality that should work on a group of users, like notifications.
 user_group_management=User group management
-filter_by_name=Filter by name
 edit_user_group=Edit user group
 user_group_details=User group details
 confirm_delete=Confirm delete