=== added file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/org/hisp/dhis/caseentry/i18n_module_en_GB.properties'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/org/hisp/dhis/caseentry/i18n_module_en_GB.properties	1970-01-01 00:00:00 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/org/hisp/dhis/caseentry/i18n_module_en_GB.properties	2013-03-29 11:54:14 +0000
@@ -0,0 +1,476 @@
+#Resource generated by I18n Resource Editor
+#Mon Dec 17 19:37:45 GMT 2012
+start_date=Start date
+violate_validation=Violating validation
+format_date=Format date
+have_to_be_greater_or_equals_to=have to be greater or equals to
+confirmation=Confirmation
+system_identifier=System generated identifier
+identifiers=Identifiers
+post_comment=Post comment
+transgender=Trans-gender
+show_hide_event_flow=Show/Hide event flow
+add_all=Add all
+enter_age_in_years=Enter age in years
+generate_patient_chart=Generate patient chart
+no_sms_service_available=No Sms service available
+reschedule_and_set_status=Reschedule and set status
+unenrollment=Un-enrollment
+patient_details=Person details
+percent_incomplete=Percent Incomplete
+complete_confirm_message=Are you sure this event is completed?
+search_by_program=Search by program
+no_patients_found=No patients found
+registration_date=Date of registration
+aggregate_details=Aggregate details
+other_facility=Private facility
+regular_program=Regular program
+after_or_equals_to_current_date=After or equals to current date
+percent_completed=Percent Completed
+duplicate_warning=We found some persons who have the same information. You can choose to continue creating this person or choose one of existing persons.
+person_aggregation=Person Aggregation
+date_of_birth=Date of birth
+report_generation_failed=Report generation failed
+comment_added=Comment added
+intro_statistical_program=Statistical reports on program performance, e.g. drop-out rates, how many completed every month/year - counts/percentages etc
+the_date_is_not_valid=The date is not valid
+intro_single_event_with_registration=The data to register is defined by a single event with registration program
+enroll_for=Enroll for
+create=Create
+percent_Scheduled=Percent scheduled
+program_enrollment=Program enrollment
+yes_and_attribute=Yes and inherit attribute
+patient_dashboard=Person dashboard
+please_select_partner=Please select relationship partner
+run_validation=Run validation
+please_choose_representative_for_this_under_age_patient=Please choose representative for this under age person
+scheduled_overdue_incomplete=Scheduled/Overdue/Incomplete
+overdue_scheduled=Overdue/Scheduled
+intro_activity_plan=View the visit schedule to get an overview of outstanding, pending and completed visits.
+value=Value
+patient_attributes=Person attributes
+seach_available_patient=Search available person
+use_data_from_level=Use data from level(s)
+child_representative=Child's representative
+report=Report
+create_new_patient=Continue register this person
+provided_elsewhere=Provided elsewhere
+patient_identifiers=Person identifiers
+relationship_management=Relationship management
+program_summary=Program Summary
+manual_person_aggregation=Manual Person Aggregation
+register_event=Register event
+please_select_relationship_type=Please select a relationship type
+color_quick_help=Color quick help
+patient_system_id=System generated ID
+add_selected=Add selected
+specify_data_element=Please specify a data element
+report_date=Report date
+xls=XLS
+female=Female
+is_dead=Is dead
+visitor=Visitor
+list_all_patients=List All Persons
+program_management=Program management
+please_verify_birthday=Please verify the birthday
+lastName=Last name
+invalid_date=Invalid date
+value_must_negative_integer=Value must be a negative integer
+hierachy_orgunit=Hierarchy organisation unit
+send_message=Send message
+em_no_orgunits=Please select an organisation unit
+status=Status
+anonymous_events=Single Event Without Registration
+search_by=Search by
+before_or_equals_to_current_date=Before or equals to current date
+verified=Verified
+patient_registered=Person registered
+to=To
+unsuccessful_validation=The data entry screen has validation errors, please correct these before proceeding
+no_aggregate_date_values_are_added_or_update_in_other_facilities=No aggregage data values are added or updated in other facilities
+value_must_integer=Value must be an integer
+age=Age
+value_must_number=Value must be an number
+failed_to_get_events=Failed to get events. Please generate resource tables before.
+full_name=Full name
+reports=Reports
+search_result=Search result
+registering_unit=Registering unit
+date_of_edit=Date of edit
+stages_open_but_no_data_entered=Stage is overdue and incomplete
+registrationDate=Date of registration
+events=events
+search_patients=Search persons
+multiple_individual_records_management=Multiple individual records management
+birthDate=Date of birth
+manage_favorites=Manage favorites
+assign_relationship=Assign relationship
+left_value=Left value
+comments_and_sms_message=Comments and messages
+show_details=Show details
+manage_relationship=Relationship management
+show_hide_content=Show/Hide content
+find_and_add_person=Find/Add Person
+incomplete=Incomplete
+add_new_person=Add new person
+is_null=is null
+create_new_event=Create new event
+program_reports=Program reports
+relationship_already_exists=Relationship already exists
+show_all=Show all
+identifier_and_attribute=Identifier/Attribute
+manual_person_aggregation_form=Manual person aggregation
+complete_and_add_new_event=Complete & Add new
+village=Village
+use_calendar=Use calendar
+download=Download
+get_report_as_pdf=Download as PDF 
+single_event_with_registration=Single Event With Registration
+from_to=(from-to)
+tracking_history=Tracking history
+patient_chart_management=Patient chart management
+completed=Completed
+favorites=Favorites
+specfiy_birth_date_or_age=Specify birth date or age
+specify_search_criteria=Please specify search criteria
+sent_message_success=Sent message successfully
+no_records=No records
+value_is_valid=Value is valid
+search_in_all_facilities=Search in all facilities
+show_hide_more=Show/Hide more ...
+orgunit=Organisation unit
+back_to_relationship=Back to relationship
+false=No
+after_due_date=After due date
+saving_value_failed_status_code=Saving value failed with status code
+identifier_duplicate=Person identifier duplicate
+value_must_positive_integer=Value must be a positive integer
+back_to_event_list=Back to event list
+remove_empty_events_success=Removed empty events successfully
+add_patient_and_add_new=Add person and Add new
+add_dependent=Add dependent
+options=Options
+rename_favorite=Rename favorite
+male=Male
+multiple_individual_records=Multiple Individual Records
+true_value=true
+export_xls=Export XLS
+program_unenrollment_management=Program un-enrollment management
+last_updated=Last updated
+show_filter=Advanced filtering
+no_value=Please select
+sms_reminder_list=SMS reminder list
+days=days
+date_less_incident=The date is less than date of incident
+no_program_available_for_enrollment=No program is available for enrollment
+one_day=1 day
+should=should
+intro_find_and_add_person=Create, modify and search for persons. Any type of data can be registered for a person through attributes.
+delete_favorite=Delete favorite
+save_success=Saved successfully
+no_result_found=No result found
+approximated=Approximated
+right_value=Right value
+intro_activity_planning=Visit Schedule provides for the user at a facility or in an area a list of upcoming visits to better plan for daily/weekly activities.
+syntax_error_in_search_value=Syntax error is in search value
+intro_anonymous_events=Register single events without registration. The data to register is defined by a single event without registration program.
+aggregate=Aggregate
+program_tracking=Program Tracking
+on=On
+please_select_relationshipType=Please select relationship type
+firstName=First name
+order_by_report_date=Order by report date
+of=of
+representative=Representative
+select_sorting_attribute=Select a specified attribute / all
+select_value=Select value
+intro_manual_person_aggregation=Generate routine data values from patient data by month (or other intervals if desired) and organisation unit.
+order_by_orgunit=Order by organisation unit
+relationships=Relationships
+completed_date=Completed date
+declared=Declared
+dob_type=DOB type
+please_enter_report_date=Please enter report date
+nr=No
+select_relationship=Select relationship
+no=No
+entry=Entry
+loading=Loading
+selected_boundary=Selected (boundary)
+first_name=First name
+please_choose_relationshipType_for_this_under_age_patient=Please choose relationship type for this under age person
+program=Program
+no_message=No message
+et_no_dataelement=Please select at least one data element
+show_events_since=Show events since
+saved=Saved
+updated=Updated
+update_patient=Edit profile
+one_month=1 month
+one_week=1 week
+data_value=data value
+program_stage=Program stage
+before_current_date=Before current date
+search=Search
+program_summary_report=Program summary report
+overdue=Overdue
+edit_this_patient=Edit profile of this person
+activity_plan=Visit Schedule
+relationship_for=Relationship for
+after_or_equals_to_due_date=After or equals to due date
+please_select_a_patient_for_setting_relationship=Please select a person for setting relationship
+please_select_criteria=Please select criteria
+select=Select
+before_due_date=Before due date
+orgunit_groups=Groups
+validation_result=Validation Result
+enrolled_for=Enrolled for
+fixed_attributes=Fixed attributes
+program_unenrollment=Program un-enrollment
+adding_new_relationship_for=Adding new relationship for
+month=Month
+program_stages_history_plan=Program stages history/plan
+please_select_village=Please select village
+active_programs=Active programs
+false_value=false
+update=Update
+show_events_up_to=Show events up to
+available_data_elements=Available data elements
+back_to_search=Back to search
+data_entry_form=Data entry form
+location=Location
+show_hide_columns=Show / Hide columns
+registered_by_orgunit=Registered by facility
+set_complete_status=Set complete status
+delete_object=Delete
+scheduled_for=Scheduled for
+generate=Generate
+clear_filter=Clear filter
+has_guardian=Has guardian/caretaker
+confirm_delete_patient=Are you sure you permanently want to delete this person and all related data?
+please_select_to_date_greater_or_equals_to_from_date=Please select to-date later or equal to from-date
+due_date=Due date
+list_all_events=List all events
+remove_empty_events=Remove empty events  
+change_location=Change location
+middle_name=Middle name
+please_enter_a_valid_full_name=Please enter a valid full name
+available_identifier_types=Available identifier types
+no_duplicate_found=No duplicate person found
+three_days=3 days
+level=Level
+enrol_success=Person enrolled successfully
+deleting=Deleting
+operation=Operation
+successful_validation=The data entry screen successfully passed validation
+statistical_program_report=Statistical program report
+total_result=Total number of results
+children_only=Children Only
+data_entered_and_uncompleted_stages=Stage is incomplete but has registered data
+date=Date
+no_aggregate_date_values_are_added_or_update_in_all_facilities=No aggregage data values are added or updated in all facilities
+search_result_matching_the_search_criteria=Result matches the search criteria
+data=Data
+patient=Person
+comfirm_delete_event=All data values in an event will be deleted when the event is deleted. Are you sure you want to delete the event ?
+on_date=on
+see_history_plan=See history / plan
+no_phone_number=No phone number
+dateOfEnrollmentDescription=Date of enrollment description
+scheduled_in_future=Scheduled in future
+please_select_a_program=Please select a program
+how_to_search_tabular_report=Quotes (") match phrases. Text values support %%, %\=, \=% and \=. Numeric values support >\=, >, <\=, <, \= and \!\= operators.
+intro_program_tracking=Support the work practices around tracking persons within a health program that have not shown up for a scheduled visit.
+validation_rule=Validation rule
+before_or_equals_to_due_date=Before or equals to due date
+events_completed=Events completed
+desc=DESC
+attribute=Attribute
+renaming=Renaming
+guardian=Guardian/caretaker
+dynamic_attributes=Dynamic attributes
+stages_skipped=Stages is skipped
+unenrol_success=Person un-enrolled successfully
+create_event_success=Create event successfully.
+confirm_remove_empty_events=Are you sure you want to remove empty events?
+is_not_valid=is not valid
+last_name=Last name
+data_element=Data element
+check_duplicate=Check duplicate
+em_no_program_stage=Please select a program stage
+date_of_incident=Date of incident
+in=in
+delete_current_event=Deleted current event
+move_to_dashboard_of=Move to dashboard of
+show_hide_settings=Show/hide settings
+show_data_entry=Show data entry
+completed_stages=Stage is completed
+intro_tabular_report=Interactive reporting tool for person data with dynamic filters for each person attribute and data element. 
+day=Day
+year=Year
+remove_selected_data_elements=Please remove selected data elements to select other program stage. Do you want to remove them?
+anonymous_events_management=Single event without registration management
+coming_stages=Stage is scheduled in future
+tabular_report=Tabular Report
+set_as_representative_and_copy_attributes_for_the_person=Set as representative and copy attributes for the person
+add_person_successfully=Add person successfully
+identifier=Identifier
+management=Management
+reschedule=Re-schedule
+date_invalid=The date is invalid
+saving_value_failed_error_code=Saving value failed with error code
+gender=Gender
+are_you_sure=Are you sure?
+save_selected_values=Save selected values
+age_year=Age (years)
+identifier_type=Person identifier type
+other_details=Other details
+enroll_program=Enroll into program
+et_no_data=No data returned from server
+stage=Stage
+no_compulsary_data_elements=No compulsory data elements
+rightSide=Right side
+you_have_active_filters=You have active filters
+specify_a_date=Please specify a date
+asc=ASC
+update_this_patient=Update this person
+added=Added
+skipped=Skipped
+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.
+relationship_type=Relationship type
+please_select_a_representative=Please select a representative
+demographics=Demographics
+data_entry_screen=Data entry screen
+include_parent_orgunits_starting_from_level=Include parent organisation units starting from (level)
+save_all=Save all
+clear=Clear
+remove_this_event=Remove this event
+comments=Comments
+please_enter_a_valid_birth_date=Please enter a valid date of birth
+address=Address
+selected_identifier_types=Selected identifier types
+enrolled_in_program=Enrolled in programs
+please_choose_a_valid_start_end_date=Please choose a valid start and end date combination
+due_date_from_to=Due date (from-to)
+data_entry=Data entry
+true=Yes
+from=From
+deathdate=Death date
+show_all_items=Show all items
+case_aggregation_result=Person aggregation result
+search_events_by_dataelements=Search events by data elements
+death_date=Death date
+et_no_programs=Please select a program
+clear_all=Clear all
+registration=Registration
+delete_event_success=Deleted event successfully
+add_and_continue=Add and continue
+on_value=on
+no_patient_enrolled_the_program=No person enrolled the program
+edit_profile=Edit profile
+some_data_element_not_exist=Some data elements not exist 
+is_not_representative=Is not representative?
+save_all_values=Save all values
+before=Before
+leftSide=Left side
+phoneNumber=Mobile phone number
+history_events=History events
+add_new_patient=Register new person
+completed_programs=Completed programs
+the_date_is_scheduled=The date is scheduled
+not_empty=The value must be not empty
+middleName=Middle name
+representative_info=Representative's information
+result_matching_the_search_criteria=Result matching the search criteria
+relationship=Relationship
+unknown=Unknown
+date_less_incident_date=This date is less then the incident date
+event_information=Event information
+search_existing_person=Search existing person
+age_of_patient_must_be_less_or_equals_to_100=Age of person must be less or equal to 100 years
+patient_identifier=Person identifier
+add_new_relationship_for=Add new relationship for
+patient_management=Person management
+specify_a_search_criteria=Please specify your search criteria
+reason=Reason
+choose_this_person=Choose this person
+set_as_representative=Set as representative
+the_relationship_already_exists=The relationship already exists - choose a different relationship or partner
+sort_by=Sort by
+selected_data_elements=Selected data elements
+value_is_invalid=Value is invalid
+dataset_list=Data set list
+deleted=Deleted
+please_select_a_program_stage=Please select a program stage
+et_no_program=Please select one program
+color=Color
+incomplete_confirm_message=Are you sure this event is incomplete?
+show_hierachy_from_level=Show hierarchy from level
+reset=Reset
+dateOfIncidentDescription=Date of incident description
+message=Message
+records_of=Records of
+history=History
+selected_orgunit_no_have_any_child=Selected organisation unit no have any child
+get_report_as_xls=Download as Excel 
+search_value=Search value
+please_specify_an_orgunit=Please specify an organisation unit
+saving=Saving
+V=Verified
+orgunit_provided_service=Organisation unit provided service
+intro_program_summary=View the summary report to get an overview of the services provided for a program.
+what_do_colors_mean=What do colors mean?
+start_date_must_be_less_then_or_equals_to_end_date=Start date must be less than or equal to end date
+the_following_dataelements_are_in_predefined_validate_rules=The following data elements are in pre-define validation rules
+M=M
+enroll=Enroll
+health_worker=Health staff
+date_of_enrollment=Date of enrollment
+error_required_field=Please enter value for all data element in red color
+activity_planning=Visit Schedule
+F=F
+modify_due_date_or_visit_date=Modify due/visit dates
+single_event_with_registration_management=Single event with registration management
+D=Declared
+searching_patient_failed=Searching person failed
+A=Approximated
+sms_message_details=SMS message details
+attributes=Attributes
+confirm_delete_relationship=Are you sure you want to delete relationship?
+percent_overdue=Percent Overdue
+search_by_name_identifier=Search by name or identifier
+complete=Complete
+at=at
+patient_did_not_register_a_phone_number=The person did not register a phone number
+statistical_program=Statistical Program
+tracking=Tracking
+sent_message_to=Sent message to
+save_favorite=Save favorite
+show_activity_list=Show Event List
+selected=Selected
+end_date=End date
+back_to_registration=Back to registration
+after=After
+sender=Sender
+identifiers_and_attributes=Identifiers/Attributes
+please_select=Please select
+after_current_date=After current date
+orgunit_boundary=Organisation unit boundary
+patient_could_not_be_enrolled_due_to_following_enrollment_criteria=The person could not be enrolled due to the following enrollment criteria
+in_range_due_date_plus_or_minus=In range due date +/-
+view_patient_chart=View patient chart
+view=View
+report_unit=Report unit
+list_patients_by_program=List persons by program
+please_select_program_stage=Please select program stage
+patients=persons
+stage_skipped=Stage is skipped
+please_fill_out_only_one_of_these_fields=Please fill only one of these fields
+patient_details_and_history=Person details and history
+Search=Search
+page=Page
+no_comment=No comment
+patient_duplicate=Person duplicate
+duplicated_patient_list=Duplicated patient list
+patient_profile=Person profile
+back_to_main_menu=Back to main menu

=== added file 'dhis-2/dhis-web/dhis-web-importexport/src/main/resources/org/hisp/dhis/importexport/i18n_module_en_GB.properties'
--- dhis-2/dhis-web/dhis-web-importexport/src/main/resources/org/hisp/dhis/importexport/i18n_module_en_GB.properties	1970-01-01 00:00:00 +0000
+++ dhis-2/dhis-web/dhis-web-importexport/src/main/resources/org/hisp/dhis/importexport/i18n_module_en_GB.properties	2013-03-29 11:54:14 +0000
@@ -0,0 +1,302 @@
+#Resource generated by I18n Resource Editor
+#Fri Dec 28 07:34:29 GMT 2012
+DHIS14_xml_import=DHIS 1.4 XML Import
+importing_concepts=Importing concepts
+indicator_group_sets=Indicator group sets
+importing_olap_urls=Importing OLAP URLs
+periods=Periods
+so_far_this_year=So far this year
+indicator_group_set=Indicator group set
+data_dictionary=Data dictionary
+datavalues=Data values
+updates_only=Updates only
+importing_indicator_group_members=Importing indicator group members
+uid=UID
+export_process_done=Export process done
+indicator_group=Indicator group
+data_source=Data source
+xls_metadata_export=XLS Metadata Export
+move_selected=Move selected
+DHIS14_detailed_metadata_export=DHIS 1.4 Detailed Metadata Export
+intro_DHIS14_file_import=Do an import from an Access data file. DHIS 1.4 is the predecessor of DHIS 2.
+DHIS14_file_import=DHIS 1.4 File Import
+intro_DHIS14_metadata_export=Do an export of meta-data or dimensional data describing the facts. DHIS 1.4 is the predecessor of DHIS 2.
+imported_meta_data=Imported meta data
+data_element_group_set=Data element group set
+importing_data_element_category_members=Importing data element category members
+mode=Mode
+hide_legend=Hide legend
+value=Value
+organisation_unit=Organisation unit
+xml=XML
+report=Report
+ignored=Ignored
+yes_empty_database=Yes (empty database)
+discard_all=Discard all
+match_to_existing=Match to existing
+up=Up
+organisation_unit_levels=Organisation unit levels
+vertical_labels=Vertical labels
+last_6_to_9_months=Last 6 to 9 months
+importing_indicator_groups=Importing indicator groups
+password=Password
+specify_file=Please specify a file
+objects=Objects
+data_file_is_not_valid=Data file is not valid
+importing_complete_data_set_registrations=Importing complete data set registrations
+state=Status
+version=Version
+select_enddate=Please select an end date
+DXF=DXF
+status=Status
+process_failed=Process failed - See log for details
+csv=CSV
+data_set_completed_on=Data set completed on
+to=To
+importing_organisation_unit_group_set_members=Importing organisation unit group set members
+file=File
+intro_data_export=Export data values. This is the regular export function which exports data to the DHIS 2 exchange format called DXF.
+do_periods=Crosstab periods
+existing_record_check=Existing record check
+reports=Reports
+intro_xls_metadata_export=Excel Spreadsheet (XLS) is a commonly used spreadsheet file format from Microsoft.
+type=Type
+exporting_data_for_indicators=Exporting data for indicators
+importing_routine_data_values=Importing routine data values
+elements=Elements
+add_route=Add route
+metadata_export=Metadata Export
+skip_check_fast=Skip check (fast)
+DHIS14XML=DHIS 1.4 XML
+intro_export_to_other_systems=Export data and meta data to formats such as PDF, Excel and DHIS 1.4.
+existing_object=Existing object
+dhis14_file_configuration=DHIS 1.4 File Configuration
+importing_data_set_source_associations=Importing data set source associations
+available_datasets=Available Datasets
+importing_on_change_periods=Importing on-change periods
+organisation_units=Organisation units
+exporting_data_for_data_elements=Exporting data for data elements
+formula=Formula
+done=Done
+calculated_data_element=Calculated data element
+horizontal_plot_orientation=Horizontal plot orientation
+organisation_unit_group=Organisation unit group
+no_current_file=No current file
+intro_xml_data_import=Import data values on the DXF XML format which is used for data exchange by DHIS and other software.
+importing_data_element_category_options=Importing data element category options
+data_element_id_scheme=Data element ID scheme
+last_9_to_12_months=Last 9 to 12 months
+error_data_elements_with_different_period_types=There are data elements registered for data sets with different period types, please go to data integrity checks for more information and then correct this before exporting
+importing_data_dictionary_data_elements=Importing data dictionary data elements
+new_and_updates=New and Updates
+do_category_option_combos=Crosstab category option combos
+intro_metadata_export=Export meta data to the DHIS 2 exchange format. Meta meta implies data elements and other objects describing the data.
+importing_indicators=Importing indicators
+select_one_or_more_object_types=Please select one or more object types
+importing_constants=Importing constants
+importing_organisation_unit_groups=Importing organisation unit groups
+include_datavalues=Include data values
+region=Region
+importing_data_set_members=Importing data set members
+report_table=Report table
+last_updated=Last updated
+unique=Unique
+detailed_metadata_export=Detailed Metadata Export
+integration=Integration
+skip_check_matching=Skip check for matching data values
+view_all=View all
+selected_datasets=Selected Datasets
+intro_csv_data_import=Import data values on the CSV format which is used for data exchange by DHIS and other third-party software.
+reporting_month=Reporting month
+importing_aggregated_data_values=Importing aggregated data values
+no_conflicts_found=No conflicts found
+importing_organisation_unit_relationships=Importing organisation unit relationships
+route=Route
+period=Period
+dxf2=DXF2
+intro_detailed_metadata_export=Do a detailed meta data export of data elements and indicators to the DHIS 2 exchange format.
+importing_data_element_group_members=Importing data element group members
+indicators=Indicators
+selected_indicators=Selected Indicators
+regression=Regression
+set_configuration=Please set the configuration in order for the import to work properly
+entity=Entity
+import_preview=Import Preview
+new_only=New only
+new_object=New object
+chart=Chart
+property=Property
+importing_data_element_groups=Importing data element groups
+check_safe_recommended=Check (safe + recommended)
+meta_data_import=Meta-Data Import
+importing_data_values=Importing data values
+match=Match
+saved=Saved
+name=Name
+updated=Updated
+hide_advanced_options=Hide advanced options
+disable=Disable
+aggregated_data=Aggregated data
+data_element_group_sets=Data element group sets
+discard_update=Discard update
+intro_DHIS14_xml_import=Do an import from an XML based format. DHIS 1.4 is the predecessor of DHIS 2.
+intro_import=This is the regular import function which imports data from the DHIS 2 exchange format called DXF.
+select=Select
+DHIS14_metadata_export=DHIS 1.4 Metadata Export
+datavalue=Data Value
+dataelement=Data element
+dataset=Dataset
+unique_constraint_violations=Unique constraint violations
+import_analysis=Import analysis
+del=Del
+available_data_elements=Available Data Elements
+xml_data_import=XML Data Import
+enable=Enable
+strategy=Strategy
+geo_code=Geocode
+importing_organisation_unit_group_sets=Importing organistaion unit group sets
+last_6_months=Last 6 months
+code=Code
+DHIS14FILE=DHIS 1.4 File
+new_no_updates=New ( No Updates )
+DHIS14_data_export=DHIS 1.4 Data Export
+level=Level
+design=Design
+analysis=Analysis
+no_import_process_running=No import process running
+importing_indicator_types=Importing indicator types
+table_name=Table name
+generate_data=Generate data
+import_process_failed=Import process failed - See log for details
+XLS=XLS
+csv_data_import=CSV Data Import
+import_summary=Import summary
+configuration=Configuration
+non_existing_data_element_identifiers=Non-existing data element identifiers
+period_type=Period Type
+discard_selected=Discard selected
+validation_rule=Validation rule
+last_3_to_6_months=Last 3 to 6 months
+conflicts=Conflicts
+importing_organisation_units=Importing organisation units
+preview=Preview
+importing_data_dictionary_indicators=Importing data dictionary indicators
+data_element=Data element
+process_completed=Process completed
+matching=Matching
+file_type_not_allowed=File type not allowed
+organisation_unit_groups=Organisation unit groups
+count=Count
+intro_dhis14_import=Import data from DHIS 1.4 installations. DHIS 1.4 is the predecessor of DHIS 2.
+show_advanced_options=Show advanced options
+export=Export
+current_import_file=Current import file
+identifier=Identifier
+importing_dataset_data_entry_form_association=Importing data set data entry form associations
+validation_rules=Validation rules
+importing_data_element_categories=Importing data element categories
+data_element_groups=Data element groups
+url=Url
+importing_organisation_unit_structures=Importing organisation unit structures
+select_none=Select none
+size=Size
+organisation_unit_with_children=Organisation unit with children
+dhis14_import=DHIS 1.4 import
+levels=Levels
+move_all=Move all
+remove_all=Remove all
+last_12_months=Last 12 months
+importing_organisation_unit_group_members=Importing organisation unit group members
+data_element_group=Data element group
+data_sets=Data sets
+data_dictionaries=Data dictionaries
+integration_configuration=Integration Configuration
+last_3_months=Last 3 months
+organisation_unit_group_sets=Organisation unit group sets
+imported=Imported
+select_organisation_unit=Please select at least one organisation unit
+clear=Clear
+importing_calculated_data_elements=Importing calculated data elements
+indicator=Indicator
+organisation_unit_level=Organisation unit level
+export_as_xml=Export as XML
+use_existing_data=Use existing data
+no_item_to_match=Sorry, there is no any selected item to match
+process_started=Process started
+user_name=Username
+individual_months_this_year=Individual months this year
+data_export=Data Export
+from=From
+discard=Discard
+report_tables=Report tables
+importing_periods=Importing periods
+importing_meta_data=Importing meta data
+remove_selected=Remove selected
+importing_data_set_organisation_unit_associations=Importing data set organisation unit associations
+export_as_csv=Export as CSV
+last_12_individual_months=Last 12 individual months
+importing_data_dictionaries=Importing data dictionaries
+last_updated_leave_blank_for_all=Last updated (Leave blank for all)
+compare=Compare
+importing_data_element_category_combos=Importing data element category combos
+dxf2_metadata_export=MetaData Export
+charts=Charts
+pdf_metadata_export=PDF Metadata Export
+intro_dhis14_file_configuration=Set the configuration for the DHIS 1.4 file import process, such as the location of the data file.
+organisationunit=Organisation unit
+organisation_unit_group_set=Organisation unit group set
+intro_DHIS14_data_export=Do an export of data values or facts. DHIS 1.4 is the predecessor of DHIS 2.
+importing_organisation_unit_hierarchy=Importing organisation unit hierarchy
+importing_organisation_unit_levels=Importing organisation unit levels
+importing_data_elements=Importing data elements
+dimension=Dimension
+import=Import
+importing_semi_permanent_data_values=Importing semi-permanent data values
+skip=Skip
+import_count=Import count
+importing_data_element_category_combo_members=Importing data element category combo members
+selected_data_elements=Selected Data Elements
+import_process_done=Import successful
+import_process_not_initialized=Import process not initialized
+importing_validation_rules=Importing validation rules
+more_options=More options
+accept_incoming_records=Accept incoming records
+importing_data_element_category_option_combos=Importing data element category option combos
+importing_previewed_data=Importing previewed data
+importing_aggregated_indicator_values=Importing aggregated indicator values
+import_all=Import all
+factor=Factor
+importing_data_sets=Importing data sets
+importing_report_tables=Importing report tables
+intro_DHIS14_detailed_metadata_export=Do an export of an detailed selection of meta-data. DHIS 1.4 is the predecessor of DHIS 2.
+routine_data_contains_values_out_of_range=Routine data values out of range (2^31) exist
+operator=Operator
+importing_previewed_meta_data=Importing previewed meta data
+semi_permanent_data_contains_values_out_of_range=Semi-permanent data value out of range (2^31) exist
+select_datasets=Please select at least one dataset
+element=Element
+regular_data=Regular data
+PDF=PDF
+compare_to_existing=Compare to existing
+indicator_groups=Indicator groups
+source=Source
+intro_pdf_metadata_export=Portable Document Format (PDF) is a commonly used file format for document exchange.
+select_startdate=Please select a start date
+action=Action
+available_indicators=Available Indicators
+create_new_route=Create new route
+individual_quarters_this_year=Individual quarters this year
+existing_objects=Existing objects
+no_data_values_found=No data values found
+data_import=Data Import
+export_to_other_systems=Export to other systems
+org_unit_id_scheme=Org unit ID scheme
+data_file=Datafile
+importing=Importing...
+do_indicators=Do indicators
+import_process_started=Import process started
+organisation_unit_only=Organisation unit only
+data_type=Data typemain
+dxf2_metadata_import=MetaData Import
+data_elements=Data elements
+dry_run=Dry run

=== added file 'dhis-2/dhis-web/dhis-web-mapping/src/main/resources/org/hisp/dhis/mapping/i18n_module_en_GB.properties'
--- dhis-2/dhis-web/dhis-web-mapping/src/main/resources/org/hisp/dhis/mapping/i18n_module_en_GB.properties	1970-01-01 00:00:00 +0000
+++ dhis-2/dhis-web/dhis-web-mapping/src/main/resources/org/hisp/dhis/mapping/i18n_module_en_GB.properties	2013-03-29 11:54:14 +0000
@@ -0,0 +1,306 @@
+#Resource generated by I18n Resource Editor
+#Fri Mar 15 22:05:38 GMT 2013
+start_date=Start date
+auto_assign=Auto-assign
+removed=removed
+description=Description
+level_is_higher_that_boundary_level=Level is higher than boundary level
+predefined_legend_sets=Predefined legend sets
+low_point_size=Low point size
+please_select_a_legend=Please select a legend
+total_distance=Total distance
+cursor_position=Cursor position
+feature_filter=Feature filter
+dhis_dashboard=DHIS dashboard
+indicator_group=Indicator group
+tools=Tools
+component_init_not_complete=Component init not complete
+saving_current_thematic_map_selection=Saving current thematic map selection.
+assign_all=Assign all
+group=Group
+map_source_file=Map source file
+polygon_layer=Polygon layer
+must_be_between_-90_and_90=must be between -90 and 90
+highlight_color=Highlight color
+please_select_a_map_view=Please select a map view
+base_coordinate=Base coordinate
+there_is_already_a_map_view_called=There is already a map view called
+register_new_legend_set=Register new legend set
+relocate=Relocate
+please_select_at_least_one_indicator=Please select at least one indicator
+register_map_favorite=Register current map as a favorite
+high_color=High color
+italic=Italic
+image_resolution=Resolution
+comma_separated_values=Comma separated values
+boundary_layer=Boundary layer
+fill_opacity=Fill opacity
+layer=Layer
+please_select_a_legend_set=Please select a legend set
+a_legend_set_called=A legend set called
+export_excel=Export spreadsheet
+image_format=Image format
+status=Status
+cancelled=cancelled
+filter=Filter
+point_layer=Point layer
+image_export=Image export
+groups=Groups
+is_saved_as_map_source=is saved as map source
+baselayer_form_is_not_complete=Base layer form is not complete
+assignment=Assignment
+type=Type
+dashboard_map_view=Dashboard map view
+layers=Layers
+ajax_request_failed=Ajax request failed
+dataelements=Data elements
+map_layers=Map layers
+new_overlay=New overlay
+overlay=overlay
+manage_favorites=Manage favorites
+parent_orgunit=Parent orgunit
+equal_intervals=Equal intervals
+new_baselayer=New base layer
+map_legend_polygon=Polygon legend
+baselayers=Base layers
+delete_map=Delete map
+assign_to_dataelement=Assign to data elements
+predefined=Predefined
+legend=Legend
+organisation_units=Organisation units
+legend_symbolizer=Symbolizer
+return_to_DHIS_2_dashboard=Return to DHIS2 dashboard
+register_new_wms_overlay=Register new WMS overlay
+image=Image
+show_hide_labels=Show/hide feature labels
+apply=Apply
+favorites=Favorites
+was_deleted=was deleted
+legend_options=Legend options
+export_map_as_image=Export map as image
+data_options=Data options
+add=Add
+contact_person=Contact person
+bounds=Bounds
+error_while_retrieving_data=Error while retrieving data
+facility_layer=Facility layer
+has_no_orgunits=has no organisation units
+medium=Medium
+image_quality=Image quality
+zoom_out=Zoom out
+administrator_settings=Administrator settings
+system=System
+please_enter_map_title=Please enter a map title
+aggregating_map_values=Aggregating map values..
+assign_indicators_to_legend_set=Assign indicators to legend set
+automatic=Automatic
+locate_features=Locate features
+show=Show
+centroid_layer=Symbol layer
+stroke_color=Stroke color
+assigned=assigned
+delete_favorite=Delete favorite
+max=max
+please_select_at_least_one_legend=Please select at least one legend
+link_legend_set_to_indicator=Link legend set to indicator
+exit_gis=Exit GIS
+width=Width
+method=Method
+map=Map
+period=Period
+creating_choropleth=Creating choropleth..
+file_overlays=File overlays
+indicators=Indicators
+edit=Edit
+was_saved_as_base_coordinate=was saved as base coordinate
+form_is_not_complete=Form is not complete
+register_maps=Register maps
+bold_=Bold
+favorite_map_views=Favorite map views
+no=no
+loading=Loading..
+geoserver_shapefiles=Geoserver shapefiles
+date_type=Date type
+queryable=Queryable
+saved=saved
+name=Name
+updated=updated
+zoom_in=Zoom in
+search=Search
+email=Email
+overlays_=Overlays
+loading_geojson=Loading geojson..
+thematic_map_form_is_not_complete=Thematic map form is not complete
+please_render_map_first=Please render the thematic map first
+overview_map=Overview map
+added_to_dashboard=added to dashboard
+select=Select
+fill_color=Fill color
+start_value=Start value
+dataelement=Data element
+fixed_intervals=Fixed intervals
+please_select_an_overlay=Please select an overlay
+overlay_form_is_not_complete=Overlay form is not complete
+show_hide_feature_labels=Show / Hide feature labels
+equal_group_count=Equal group count
+close=Close
+thematic_layer=Thematic layer
+classes=Classes
+help=Get help with GIS
+update=Update
+baselayer=Base layer
+no_values_found=No values found
+save_coordinate=Save coordinate
+high_point_size=High point size
+code=Code
+phone_number=Phone number
+start_end_dates=Start-end dates
+thematic_map=Thematic map
+groupset=Group set
+include_values=Include values
+auto_assignment=Auto assignment
+there_is_already_a_map_called=There is already a map called
+no_feature_selected=No feature selected
+overlays=overlays
+is_already_in_use=is already in use
+level=Level
+is_already_assigned=is already assigned
+register=Register
+export_image=Export image
+refreshed=refreshed
+overlay_=Overlay
+all_relations_for_the_map=All relations for the map
+wms_overlays=WMS overlays
+include_legend=Include legend
+mapvaluetype=Map value type
+set_thematic_map_date_type=Set thematic map date type
+period_type=Period type
+max_size=Max size
+the_view=The view
+characters=characters
+applying_organisation_units_relations=Applying organisation units relations
+must_be_a_number=must be a number
+please_expand_layer_panel=Please expand the layer panel you want to print
+preview=Preview
+dataelement_group=Data el. group
+creating_map=Creating map..
+export_thematic_map_to_png=Export thematic map to PNG
+legend_type=Legend type
+text_filter=Text filter
+favorite=Favorite
+no_features_rendered=No features rendered
+organisation_units_assigned=organisation units assigned
+export=Export
+end_value=End value
+new_map_view=New map view
+database=database
+url=URL
+legendset=Legend set
+please_select_a_baselayer=Please select a base layer
+name_column=Name column
+boundary=Boundary
+assign_organisation_units_to_map=Assign organisation units to map
+min_size=Min size
+register_map=Register map
+no_coordinates_found=No coordinates found
+administrator=Administrator
+error=Error
+assign_dataelements_to_legend_set=Assign data elements to legend set
+remove_all=Remove all
+please_select_map=Please select a map
+saved_as_date_type=saved as date type
+refresh=Refresh
+added=added
+was_registered=was registered
+zoom=Zoom
+legends=Legends
+api_key=API key
+admin_panels=Admin panels
+optional=Optional
+clear=Clear
+new_legend=New legend
+indicator=Indicator
+organisation_unit_level=Organisation unit level
+low_color=Low color
+address=Address
+map_legend_point=Point legend
+longitude_x=Longitude (x)
+error_while_saving_data=Error while saving data
+infrastructural_data=Infrastructural data
+new_legend_set=New legend set
+select_point_level=Select point level
+select_a_value=Select a value..
+remove_relation=Remove relation
+delete_baselayer=Delete base layer
+delete_map_view=Delete map view
+cancel=Cancel
+measure_distance=Measure distance
+remove_selected=Remove selected
+labels=Labels
+in_the_map=map
+resize=Resize
+show_information_sheet=Show information sheet
+overlapping_legends_are_not_allowed=Overlapping legends are not allowed
+add_to_dashboard=Add to dashboard
+hide=Hide
+zoom_to_visible_extent=Zoom to visible extent
+register_new_vector_overlay=Register new vector overlay
+create_predefined_legend_sets=Create predefined legend sets
+delete_legend=Delete legend
+applied=applied
+is_already_selected=is already selected
+selected_relations_removed=Selected relations removed
+latitude_y=Latitude (y)
+automatic_legend_sets=Automatic legend sets
+large=Large
+height=Height
+select_new_location_on_map=Please select the new location on the map..
+was_updated=was updated
+stroke_width=Stroke width
+title=Title
+deleted=deleted
+select_organisation_unit_level=Select organisation unit level
+save=Save
+color=Color
+already_exists=already exists
+please_select_least_one_organisation_unit_in_the_list=Please select at least one organisation unit in the list
+display_name=Display name
+export_map_as_excel=Export map as Excel spreadsheet
+history=History
+parent_organisation_unit=Parent organisation unit
+and=and
+symbol_layer=Facility layer
+setup=Setup
+font_size=Font size
+map_view_form_is_not_complete=Map view form is not complete
+assigning=Assigning
+delete=Delete
+open_which_layer=Open in which layer?
+groupsets=Group sets
+opacity=Opacity
+feature_data=Feature data
+map_source=Map source
+edit_layer=Edit layer
+delete_overlay=Delete overlay
+fixed_periods=Fixed periods
+new=New
+assign_organisation_unit=Assign organisation unit
+error_while_deleting_relation_map_and_oranisation_unit=Error while deleting relation between map and organisation unit
+selected=selected
+end_date=End date
+current_selection_no_data=The current selection returned no data
+register_new_legend=Register new legend
+remove_all_relations=Remove all relations
+organisationunit_search=Organisation unit search
+view=View
+assigned_to=assigned to
+showhide=Show / hide
+toggle=Toggle
+registered=registered
+delete_legend_set=Delete legend set
+the_source_file=The source file
+assign_to_indicator=Assign to indicators
+geojson_file=GeoJSON file
+must_be_between_-180_and_180=must be between -180 and 180
+assign=Assign
+select_outer_boundary=Select outer boundary

=== added file 'dhis-2/dhis-web/dhis-web-visualizer/src/main/resources/org/hisp/dhis/visualizer/i18n_module_en_GB.properties'
--- dhis-2/dhis-web/dhis-web-visualizer/src/main/resources/org/hisp/dhis/visualizer/i18n_module_en_GB.properties	1970-01-01 00:00:00 +0000
+++ dhis-2/dhis-web/dhis-web-visualizer/src/main/resources/org/hisp/dhis/visualizer/i18n_module_en_GB.properties	2013-03-29 11:54:14 +0000
@@ -0,0 +1,140 @@
+#Resource generated by I18n Resource Editor
+#Wed Mar 13 10:21:17 GMT 2013
+no_svg_format=No SVG format
+none=[ None ]
+base_line_value=Base line value
+last_two_six_month=Last two 6 months
+user_orgunit=User organisation unit
+example_chart=Example chart
+wm_multiple_filter_ind_de_ds=Multiple indicators/data elements/data sets selected as filter.
+saving=Saving
+no_data=No data
+wm_multiple_filter_period=Multiple periods selected as filter.
+rename_favorite=Rename favorite
+last_4_quarters=Last 4 quarters
+trend_line=Show trend line
+et_no_data=No data returned from server
+et_no_orgunits=No organisation units selected
+selected_attribute=Selected attribute
+stacked_column_chart=Stacked column chart
+png_only=For the PNG version only
+et_svg_browser=SVG not supported by browser
+interpretation_was_shared=Interpretation was shared
+hide_data_table=Hide data table
+write_your_interpretation=Write a comment, question or interpretation
+title=DHIS 2 Data Visualizer
+wm_stacked_chart=stacked charts
+organisation_unit=Organisation unit
+available_attribute=Available attribute 
+em_no_orgunits=Please select at least one organisation unit.
+em_svg_browser=Please use Chrome, Firefox, Opera or Safari to export images.
+data=Data
+renaming=Renaming
+user_orgunit_children=User organisation unit children
+last_year=Last year
+quarters=Quarters
+pie_chart=Pie chart
+save=Save
+wm_first_filter_used=The first one is being used.
+area_chart=Area chart
+filter=Filter
+base=Base
+line_chart=Line chart
+et_no_periods=No periods selected
+wm_not_applicable=not applicable for
+last_updated=Last updated
+update=Update
+rename=Rename
+target_line_label=Target line label
+dataset=Data set
+groups_replace_orgunits=Note\: Groups will replace the selected organisation units
+value=Value
+image_png=Image (PNG)
+range_axis_label=Range axis (Y) label
+data_element=Data element
+save_favorite=Save favorite
+last_six_month=Last 6 months
+stacked_bar_chart=Stacked bar chart
+show_data=Show series data
+column_chart=Column chart
+interpretation=interpretation
+selected=Selected
+create_chart_before_saving=Please create a chart before saving
+are_you_sure=Are you sure?
+wm_trendline_deactivated=Trend line deactivated
+wm_multiple_filter_groups=Multiple organisation unit groups selected as filter.
+et_no_indicators_dataelements_datasets=No data units selected
+et_invalid_uid=Invalid uid
+system=System
+wm_targetline_deactivated=Target line deactivated
+favorite_no_orgunits=Favorite has no organisation units
+wm_required_categories=at least two categories required
+wm_multiple_filter_orgunit=Multiple organisation units selected as filter.
+em_line_area_categories=Please select at least two categories for line and area charts.
+trend=Trend
+data_table=Data table
+target=Target
+select_type=Select type
+relative_periods=Relative periods
+et_invalid_dimension_setup=Invalid dimension setup
+period=Period
+select_all_children=Select all children
+series=Series
+em_no_periods=Please select at least one relative or fixed period.
+bar_chart=Bar chart
+target_line_value=Target line value
+domain_axis_label=Domain axis (X) label
+name=Name
+datasets=Data sets
+select_group=Select group
+em_invalid_uid=Please provide a valid chart uid.
+loading=Loading...
+hide_legend=Hide chart legend
+indicators=Indicators
+chart_options=Chart options
+wm_baseline_deactivated=Base line deactivated
+available=Available
+em_invalid_dimension_setup=Please select series/category/filter dimensions.
+et_line_area_categories=Not enough categories selected
+years=Years
+create_chart_before_datatable=Please create a chart before showing the datatable
+last_5_years=Last 5 years
+name_already_in_use=* Name already in use
+indicator=Indicator
+manage_favorites=Manage favorites
+periods=Periods
+last_12_months=Last 12 months
+save_load_favorite_before_sharing=Please save or load a favorite before sharing
+sort_by=Sort by
+base_line_label=Base line label
+overwrite=Overwrite
+chart_type=Chart type
+download=Download
+em_no_indicators_dataelements_datasets=Please select at least one indicator, data element or data set.
+deleting=Deleting
+hide_subtitle=Hide chart subtitle
+em_no_data=Please ensure that there is data stored in the database and that data mart has been run properly. 
+last_quarter=Last quarter
+group_sets=Group sets
+last_3_months=Last 3 months
+months=Months
+organisation_unit_groups=Organisation unit groups
+system_favorite_overwrite_not_allowed=* You are not allowed to overwrite a system favorite
+last_month=Last month
+all_indicator_groups=[  All indicator groups ]
+this_year=This year
+six_months=Six months
+wm_pie_chart=pie charts
+favorites=Favorites
+delete_favorite=Delete favorite
+em_no_orgunitgroups=Please add at least one organisation unit group.
+delete_object=Delete
+organisation_units=Organisation units
+cancel=Cancel
+share=Share
+reporting_rates=Reporting rates
+category=Category
+et_no_orgunitgroups=No organisation unit groups found
+show_hide_chart_settings=Show/hide chart settings
+fixed_periods=Fixed periods
+data_elements=Data elements