← Back to team overview

dhis2-devs team mailing list archive

[Branch ~dhis2-devs-core/dhis2/trunk] Rev 6071: Cleaned data dictionary module

 

------------------------------------------------------------
revno: 6071
committer: Lars Helge Overland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Tue 2012-02-21 15:48:08 +0100
message:
  Cleaned data dictionary module
modified:
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/resources/org/hisp/dhis/dataadmin/i18n_module.properties
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/resources/org/hisp/dhis/dd/i18n_module.properties
  dhis-2/dhis-web/dhis-web-validationrule/src/main/resources/org/hisp/dhis/validationrule/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-dataadmin/src/main/resources/org/hisp/dhis/dataadmin/i18n_module.properties'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/resources/org/hisp/dhis/dataadmin/i18n_module.properties	2012-02-16 13:44:24 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/resources/org/hisp/dhis/dataadmin/i18n_module.properties	2012-02-21 14:48:08 +0000
@@ -1,18 +1,8 @@
-apply_lock_on_all=Apply Locks On All
 remove_all=Remove All Locks
-data_locking_form=Data Locking Form
-data_locking=Data Locking
-locked_datasets=Locked Data Sets
-unlocked_datasets=Unlocked Data Sets
-organisation_units_lock=Organisation Units [ Black=Unassigned ][ Orange=Assigned,Unlocked ][ Green=Assigned,Locked ]
 done=Done
-noaction=Please Select Only Assigned or Locked Organisation Unit.
 loading=Loading, please wait
 data_administration=Data Administration
 period_type=Period Type
-available_periods=Available Periods
-select_period_type_all=Select period type / All
-select_period_all=Select period / All
 select_options=Please select at least one option
 performing_maintenance=Performing maintenance
 maintenance_performed=Maintenance performed
@@ -20,10 +10,7 @@
 resource_tables_generated=Resource tables generated
 maintenance=Maintenance
 resource_table=Resource Table
-clear_data_mart_aggregated_datavalues=Clear data mart (aggregated datavalues)
-clear_data_mart_aggregated_indicatorvalues=Clear data mart (aggregated indicatorvalues)
 clear_dataset_completeness=Clear dataset completeness
-clear_hierarchy_history=Clear hierarchy history
 clear_zero_values=Clear zero values
 group_set_structure=Organisation unit groupset structure normalized
 organisation_unit_structure=Organisation unit structure
@@ -31,7 +18,6 @@
 generate_resource_tables=Generate tables
 perform_maintenance=Perform maintenance
 prune_periods=Prune periods
-system_administration=System Administration
 cache_statistics=Cache Statistics
 second_level_cache_statistics=Second Level Cache Statistics
 region_name=Region name
@@ -66,10 +52,6 @@
 browse_by=Browse by
 select_mode=Select mode
 select_parent_organisation_unit=Select parent organisation unit
-search_results_for=Search results for
-request_returned_in=Request returned in
-query_took=Query took
-number_of_queries_executed=Number of queries executed
 no_data_found=No data found
 browse=Browse
 select_period_type=Select Period Type
@@ -77,7 +59,6 @@
 data_elements_without_data_set=Data elements without a data set
 data_elements_without_groups=Data elements without groups
 data_sets_not_assigned_to_organisation_units=Data sets not assigned to organisation units
-indicators_with_blank_formulas=Indicators with blank formulas
 indicators_with_identical_formulas=Indicators with identical formulas
 indicators_without_groups=Indicators without groups
 organisation_units_with_cyclic_references=Organisation units with cyclic references
@@ -86,18 +67,13 @@
 organisation_units_violating_compulsory_group_sets=Organisation units violating compulsory group sets
 organisation_units_violation_exclusive_group_sets=Organisation units violating exclusive group sets
 organisation_unit_groups_without_group_sets=Organisation unit groups without group sets
-no_violations=No violations
-view_violations=View violations
 data_integrity_checks_performed=Data integrity checks performed
 data_elements_assigned_to_period_types_with_different_period_types=Data elements assigned to data sets with different period types
-select_a_period_type=Please select a period type
-select_a_period=Please select a period
 data_element_group_set_structure=Data element group set structure
 indicator_group_set_structure=Indicator group set structure
 organisation_unit_group_set_structure=Organisation unit group set structure
 period=Period
 value=Value
-no_values=No values found
 found=Found
 values=values
 data_element=Data element
@@ -123,7 +99,7 @@
 intro_sql_view=Create SQL database views. These views will typically use the resource tables to provide convenient views for third-party tools.
 intro_constant=Create constants which can be included in expressions of indicator and validation rules.
 intro_attribute=Create and update dynamic attributes. Attributes can be used for data elements, indicators, organisation units and users.
-intro_option_set = Create option sets which can be included in data elements and produce drop-down lists in data entry forms.
+intro_option_set=Create option sets which can be included in data elements and produce drop-down lists in data entry forms.
 expression_is_empty=Expression is empty
 dataelement_id_not_numeric=Data element identifier must be a number
 category_option_combo_id_not_numeric=Category option combo identifier must be a number
@@ -178,36 +154,17 @@
 pruning=Pruning
 pruning_done=Pruning done
 browser=Data browser
-number_of_results=Number of results
-drilldown_export=Export
 drilldown_choose_period_type=Please choose a period type
-drilldown_formdate_invalid=Please enter a valid From date
 drilldown_enddate_invalid=Please enter a valid End date
-drilldown_fromdate_is_later_than_todate=From date is later than End date
 drilldown_select_browse_mode=Please select a browser mode
-drilldown_data_set=Data Set
-drilldown_data_element=Data Element
-drilldown_data_element_group=Data Element Group
-drilldown_orgunit=Organisation Unit
-drilldown_orgunit_group=Organisation Unit Group
 drilldown_select_org_unit=Please select an organization unit
 browse_data_at_this_level=Browse data at this level only
-browse_data_at_descendant_levels=Browse data at all descendant levels
 view_data_at_descendant_levels=Summary drill down
 view_data_at_this_level=View raw data at this level
 click_on_this_orgunit=Click on this organisation unit
-counts_of_aggregated_values=Total data elements entered
-export_to=Export to
-export_results_for=Export results for
 earliest=earliest
 latest=latest
 available_dataset=Available data sets
-select_all_at_level=Select all at level
-unselect_all_at_level=Unselect all at level
-unselect_all=Unselect all
-select_all=Select all
-select_all_in_group=Select all in group
-unselect_all_in_group=Unselect all in group
 loading=Loading
 level_must_be_int=Level must be a number
 not_choose_dataset=Please select a data set
@@ -229,57 +186,16 @@
 sql_view_table_name=Sql view table with name
 is_created=is created
 sql_view_table_is_not_created_yet=Please execute query to create View table before viewing
-regenerate_resource_tables_viewers=Regenerate Resource & View tables
-regenerating_resource_tables_and_views=Preparing for regenerating Resource and View tables
-view_data_sql_view=View data from Sql view table
-data_elements_violating_compulsory_group_sets=Data elements violating compulsory group sets
-indicators_violating_compulsory_group_sets=Indicators violating compulsory group sets
 data_elements_violating_exclusive_group_sets=Data elements violating exclusive group sets
 indicators_violating_exclusive_group_sets=Indicators violating exclusive group sets
 view_data_for=View data for
 failed_to_create_view_table_for=Failed to create view table for
-available_datasets=Available data sets
-type_of_selection=Selection type
-selected_orgunits=Selected organisation units
-locking_mode=Locking mode
-field=Fields
-alias=Alias (AS)
 show=Show
 sort=Sort
-criteria_and=Criteria AND
-criteria_or=Criteria OR
-group_by=Group by
-generate_query=Generate query
-add_new_field=Add new field
-show_advance=Show design tool
-hide_advance=Hide design tool
-select_resourcetables=Select resource table
-select_properties=Select property
-select_sorttypes=Select sort type
-ascending=Ascending
-descending=Descending
-properties_welformed=Only letters, numbers, ssterisk(*), commas (, ), and space characters are only allowed
-syntax_error_parameter_required=Syntax is incorrect - Parameter required (or missing the brackets)
-cannot_remove_any_more=Cannot remove any more
 lock=Lock
 locked=Locked
 unlock=Unlock
-unlocked=Unlocked
-period_not_selected=Select Avaliable Period
-dataset_not_selected=Select Avaliable data sets
-select_all_at_level_saved=Lock All at Level Saved
-unselect_all_at_level_saved=Unlock All at Level Saved
-select_all_in_group_saved=Lock All at Group Saved
-unselect_all_in_group_saved=Unlock All at Group Saved
-information_successfully_locked=Data Successfully Locked
-information_successfully_unlocked=Data Successfully Unlocked
-organisation_unit_not_selected=Please select an organisation unit
-header_field=Field No.
 append=Append
-resourcetable_at_position=Resource table at the position
-unselected_yet=unselected yet
-view_tables_created=The view tables are created
-there_is_no_view_created=There is no View table created
 organisation_unit_groups=Organisation unit groups
 users=Users
 remove_values_success=Removed values successfully
@@ -287,31 +203,14 @@
 earliest_date_used_if_no_date_selected=Earliest date will be used if no date is selected
 latest_date_used_if_no_date_selected=Latest date will be used if no date is selected
 generate_values_success=Generated values successfully
-lock_all_at_level=Lock all at level
-unlock_all_at_level=Unlock all at level
-lock_all_in_group=Lock all in group
-unlock_all_in_group=Unlock all in group
-process_started=Checking...
-sqlview_process_canceled_interrupted=WARNING: This query could retrieve a large amount of data from database.\n\nDo you want to save it...?
-selected_periods=Selected Periods
-selected_datasets=Selected Datasets
-child_tree=Child Tree
-navigation=Navigation
 start=Start
-file_name=File name
-font_size=Font size
-page_layout=Page layout
-export_pdf=Export PDF
-landscape=Landscape
-portrait=Portrait
 data_set_list=Data Set list
 data_element_group_list=Data Element Group list
 orgunit_group_list=Organisation Unit Group list
 patient_data_archive=Beneficiary Data Archive
 intro__patient_data_archive=Archive beneficiary data which is not currently relevant to your system in order to improve performance. Data can also be unarchived.
 pruning_interrupted=You must choose the organisation unit has parent to prune. Please try again!
-sqlquery_is_not_allowed=Not allowance to query in the special tables !
-drill_down_real_values=Data entered
+sqlquery_is_not_allowed=Not allowance to query in the special tables!
 sections_with_invalid_category_combinations=Sections with invalid category combinations
 confirm_delete_sqlview=Do you want to delete this sql view object ?
 clear_data_mart=Clear data mart
@@ -322,7 +221,6 @@
 get_report_as_csv=Download as CSV
 get_report_as_pdf=Download as PDF
 data_element_structure=Data element structure
-organisation_not_selected=There is no organization unit selected
 constant=Constant
 constant_management=Constant Management
 create_new_constant=Add Constant
@@ -338,10 +236,6 @@
 dynamic_attributes=Dynamic Attributes
 attribute=Attribute
 attribute_management=Attribute Management
-attribute_option=Attribute Option
-attribute_option_management=Attribute Option Management
-confirm_delete_attribute=Do you want to delete this attribute?
-confirm_delete_attribute_option=Do you want to delete this attribute option?
 value_type=Value Type
 mandatory=Mandatory
 indicator=Indicator
@@ -352,11 +246,7 @@
 negative_integer=Negative Integer
 create_new_attribute=Add Attribute
 edit_attribute=Edit Attribute
-create_new_attribute_option=Add Attribute Option
-edit_attribute_option=Edit Attribute Option
 assigned_to=Assigned to
-available_attribute_options=Available Attribute Options
-selected_attribute_options=Selected Attribute Options
 attribute_sort_order=Attribute sort order
 data_element_does_not_exist=Data element does not exist
 category_option_combo_does_not_exist=Category option combo does not exist

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/resources/org/hisp/dhis/dd/i18n_module.properties'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/resources/org/hisp/dhis/dd/i18n_module.properties	2012-02-06 02:56:02 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/resources/org/hisp/dhis/dd/i18n_module.properties	2012-02-21 14:48:08 +0000
@@ -3,54 +3,22 @@
 no_option_assigned=Use of category with an empty option is not allowed!
 number_of_category_options=Number of category options
 number_of_categories=Number of categories
-table_layout_for=Table layout for
-nr=No.
-table_col_name=Table column name
-col_order=Column Order
-sort_optioncombos=Sort Option-combinations
 sort=Sort
-select_categorycombo=Please select category combo
-existing_list=Existing list
-new_option_combinations=New option combinations
-please_select_category_combo=Please select category combo
-available_category_option_combo_list=Available data element category option combos
-derived_option_combinations=Derived option combinations
-selected_option_combination=Selected option combinations
-available_option_combination=Available option combinations
 create_new_data_element_category=Create new data element category
-create_new_multidimensional_data_element=Create new multidimensional data element
-multidimensional_data_element=Multidimensional data element
-multidimensional_data_element_management=Multidimensional data element management
-selected_option_combinations=Selected category option combinations
-selected_options=Selected options
-available_option_combinations=Available category option combinations
-available_options=Available options
 selected_categories=Selected categories
 available_categories=Available categories
-data_element_dimensions=Data element dimensions
 category=Category
 category_option=Category Option
-category_option_combination=Category Option Combination
-data_element_category_option_management=Data element category options management
 data_element_category_management=Data element category management
-data_element_category_option_combo_management=Data element category option combination management
 data_element_category_combo_management=Data element category combination management
 create_new_data_element_category_combo=Create new data element category combination
-create_new_data_element_category_option=Create new data element category option
-create_new_data_element_category_option_comb=Create new data element category option combination
 confirm_delete_data_element_category_option=Are you sure you want to delete this data element category option?
 confirm_delete_data_element_category=Are you sure you want to delete this data element category?
 confirm_delete_data_element_category_combo=Are you sure you want to delete this data element category combo?
 edit_data_element_category=Edit data element category
 edit_data_element_category_combo=Edit data element category combination
-edit_data_element_category_option=Edit data element category option
-duplicate_name=Duplicate name
 category_combination=Category Combination
-data_element_category_details=Data element category details
-data_element_category_option_details=Data element category option details
 data_element_category_combo_details=Data element category combo details
-duplicate_names=Name already exists
-create_new_data_element_category_option_combo=Create new data element category option combination
 category_combo=Combination of categories
 data_element_category=Data Element Category
 data_element_category_combo=Data Element Category Combination
@@ -59,9 +27,6 @@
 data_element_group=Data Element Group
 data_element_groups=Data Element Groups
 list_of_data_elements=Data elements
-list_of_calculated_data_elements=Calculated data elements
-select_from_data_elements=Select from data elements
-select_from_calculated_data_elements=Select from calculated data elements
 indicator=Indicator
 indicator_group=Indicator Group
 indicator_groups=Indicator Groups
@@ -71,7 +36,6 @@
 create_new_data_element_group=Create new data element group
 group_members=Group members
 available_data_elements=Available data elements
-filters=Filters
 create_new_indicator=Create new indicator
 create_new_indicator_group=Create new indicator group
 available_indicators=Available indicators
@@ -81,8 +45,6 @@
 data_element_group_management=Data element group management
 number_of_members=Number of members
 export=Export
-select_import_file=Select import file
-import_all=Import all
 import=Import
 indicator_management=Indicator management
 indicator_group_management=Indicator group management
@@ -92,9 +54,6 @@
 edit_indicator=Edit indicator
 edit_indicator_group=Edit indicator group
 edit_indicator_type=Edit indicator type
-denominator_text=Denominator text
-numerator_text=Numerator text
-filter_by_group_view_all=Filter by group/view all
 edit_numerator=Edit numerator
 edit_denominator=Edit denominator
 confirm_delete_data_element=Are you sure you want to delete this data element?
@@ -103,21 +62,11 @@
 confirm_delete_indicator_group=Are you sure you want to delete this indicator group?
 confirm_delete_indicator_type=Are you sure you want to delete this indicator type?
 confirm_delete_data_dictionary=Are you sure you want to delete this data dictionary?
-specify_name=Please specify a name
-specify_short_name=Please specify a short name
-specify_integer_factor=Please specify an integer factor
-Failed_to_query_by_example=Failed to query by example
 name_in_use=The name is already in use. Please choose a different name
 alternative_name_in_use=The alternative name is already in use. Please choose a different alternative name
 code_in_use=The data element code is already in use. Please choose a different data element code
 short_name_in_use=The short name is already in use. Please choose a different short name
-cde_must_be_number=Calculated Data Element must have type Number
-cde_must_have_data_elements=Calculated Data Element must contain at least two data elements
-cde_data_elements_must_be_numbers=Data Elements in a Calculated Data Element must have type Number
-everything_is_ok=Everything is ok
-choose_indicator_type=Please choose an indicator type
-adding_data_element_failed=Adding the data element failed with the following message
-saving_data_element_failed=Saving the data element failed with the following message
+everything_is_ok=Everything is OK
 adding_data_element_group_failed=Adding the data element group failed with the following message
 saving_data_element_group_failed=Saving the data element group failed with the following message
 adding_indicator_failed=Adding the indicator failed with the following message
@@ -126,7 +75,6 @@
 saving_indicator_group_failed=Saving the indicator group failed with the following message
 adding_indicator_type_failed=Adding the indicator type failed with the following message
 saving_indicator_type_failed=Saving the indicator type failed with the following message
-different_aggregation_operators=Not allowed to use data elements with different aggregation operators
 left_brackets=Left brackets
 right_brackets=Right brackets
 multiply=Multiply
@@ -134,17 +82,11 @@
 plus=Plus
 minus=Minus
 no_of_days=Number of days
-data_dictionary_intro=Please select an item from the menu.
 calculated=Calculated
-saved=Saved
-select_dataelementgroup=Select Data Element Group
-all_dataelements=All Data Elements
 available_dataelements=Available Data Elements
 selected_dataelements=Selected Data Elements
 add_selected=Add selected
-add_all=Add all
 remove_all=Remove all
-delete_icon=Delete icon
 create_new_data_dictionary=Create new data dictionary
 region=Region
 data_dictionary_management=Data dictionary management
@@ -152,116 +94,22 @@
 updating_datadictionary_failed=Updating data dictionary failed
 edit_data_dictionary=Edit data dictionary
 select_data_dictionary=Select data dictionary
-identifying_and_definitional_atts=Identifying and Definitional Attributes
-relational_and_representational_atts=Relational and Representational Attributes
-administrative_atts=Administrative Attributes
-version=Version
-context=Context
-status=Status
-status_date=Status date
-mnemonic=Mnemonic
-synonyms=Synonymns
-hononyms=Hononyms
-keywords=Keywords
-representational_form=Representational form
-representational_layout=Representational layout
-minimum_size=Minimum size
-maximum_size=Maximum size
-data_domain=Data domain
-validation_rules=Validation rules
-formula=Formula
-related_data_references=Related data references
-guide_for_use=Guide for use
-collection_methods=Collection methods
-responsible_authority=Responsible authority
-update_rules=Update rules
-access_authority=Access authority
-update_frequency=Update frequency
-location=Location
-reporting_methods=Reporting methods
-version_status=Version status
-previous_version_references=Previous version references
-source_document=Source document
-source_organisation=Source organisation
 current=Current
-past=Past
-alphabetic=Alphabetic
-alphanumeric=Alphanumeric
-numeric=Numeric
-quantitative=Quantitative value
-specify_alternative_name=Please specify alternative name
-specify_dos_name=Please specify dos name
-specify_long_name=Please specify long name
-specify_code=Please specify code
-specify_data_dictionary=Please specify data dictionary
-specify_data_element_type=Please specify data element type
-specify_mnemonic=Please specify mnemonic
-specify_version=Please specify version
-specify_description=Please specify description
-specify_keywords=Please specify keywords
-specify_responsible_authority=Please specify responsible authority
-specify_location=Please specify location
-specify_reporting_methods=Please specify reporting methods
-specify_version_status=Please specify status
-specify_indicator_type=Please specify indicator type
-specify_integer_factor=Please specify integer factor
-specify_integer_minimum_size=Please specify integer for minimum size
-specify_integer_maximum_size=Please specify integer number for maximum size
-specify_numerator=Please specify numerator
-specify_numerator_description=Please specify numerator description
-specify_numerator_agg_operator=Please specify numerator aggregation operator
-specify_denominator=Please specify denominator
-specify_denominator_description=Please specify denominator description
-specify_denominator_agg_operator=Please specify denominator aggregation operator
-specify_formula=Please specify formula
-specify_value=Please specify value
-data_element_type=Data element type
-data_element_concept=Data element concept
 date=Date
-identification=Identification
-data_type=Data type
-edit_formula=Edit formula
-formula_description=Formula description
-textual_description=Textual description
-data_element_indicator_group=Data Element and Indicator Group
 selected_data_elements=Selected data elements
 selected_indicators=Selected indicators
 available_indicators=Available indicators
-select_data_element_type=Select data element type
 item_deleted_successfully=Item Deleted Successfully
-this_item_cannot_be_deleted=This item can not be deleted.
-unable_to_delete_value_is_registered_for_this_item=unable to delete as DataValue is registered for this Item
 value=Value
-period=Period
-indicator_name=Indicator name
-current_indicator_value=Current indicator value
-period_id=Period ID
-description_validation=Please Letters, numbers, spaces or some special chars like .,-,(,),% only, Check the Description value
-range_of_description=Please enter a value between 4 and 150 alphanumeric characters long
 confirm_delete_indicator=Do you want to delete indicator?
 adding_indicator_failed=Adding indicator failed
 saving_indicator_failed=Saving indicator failed
 translation_translate=Translate
-confirm_delete_target=Do you want to delete target?
-adding_target_failed=Adding target failed
-saving_target_failed=Saving target failed
-target_management=Target management
-specify_indicator=Specify indicator
-specify_organisationunits=Specify organisation unit
-create_new_target=Create new target
-edit_target=Edit target
-select_organisation_unit=Please select organisation unit
-select_period=Please select period
 select_indicator=Please select indicator
-could_not_save=Could not save
 object_not_deleted_associated_by_objects=Object not deleted because it is associated by objects of type
 hide_warning=Hide warning
-please_enter_name=Please enter name !
-group_ready_exist=Group ready exist
-select_dataelement_group=Please select data element group !
 update_dataelement_group_members=Update Data Element Group Member
 update_success=Update Success
-update_error=Update Error
 member_of=Member of
 data_element_group_editor=Data Element Group Editor
 move_up=Move up
@@ -270,11 +118,7 @@
 move_to_bottom=Move to bottom
 indicator_sort_order=Indicator sort order
 data_element_sort_order=Data element sort order
-district_health_information_software_2=District Health Information Software 2
-identifying_and_definitional_attributes=Identifying and definitional attributes
-forum=Forum
 indicator_group_editor=Indicator Group Editor
-select_indicator_group=Please select indicator group
 update_indicator_group_member=Update Indicator Member
 factor_cannot_be_zero=Factor cannot be zero
 url=URL
@@ -299,7 +143,6 @@
 available_indicatorgroup=Available Indicator Groups
 selected_indicatorgroup=Selected Indicator Groups
 last_updated=Last updated
-expression_is_empty=Expression is empty
 dataelement_id_not_numeric=Data element identifier must be a number
 category_option_combo_id_not_numeric=Category option combo identifier must be a number
 data_element_does_not_exist=Identifier does not reference a data element
@@ -318,29 +161,21 @@
 intro_indicator_group_set=Create, modify, view and delete indicator group sets. Group sets are used for improved analysis.
 intro_data_dictionary=Create, modify, view and delete data dictionaries. A data dictionary is a set of meta-data.
 intro_concept=Create, modify, view and delete concepts. A concept can be used by a category.
-data_element_group_sets=Data element group sets
 available_data_element_group_sets=Available data element group sets
 selected_data_element_group_sets=Selected data element group sets
-view_all=View all
-mark_value_for_followup=Mark value for follow-up
-unmark_value_for_followup=Unmark value for follow-up
 concept_name=Concept name
-illegal_conceptName=Concept name must 10 or less alphanumeric or '_' characters
-switch_view=Switch View
 available_groups=Available Groups
 selected_groups=Selected Groups
 assign_groups_for_dataelement=Assign Groups for Data Element
 select_dataelement=Please select data element
 option_rename_successfully=Category option renamed successfully
-select_concept=Select concept name
 create_new_concept=Create new concept
 edit_concept=Edit concept
 concept_name=Concept name
 confirm_delete_concept=Are you sure you want to delete this concept?
 adding_concept_failed=Adding concept failed
 saving_concept_failed=Saving concept failed
-regex_add_edit_concept=Enter Alphabet (a-z A-Z), Number (0-9) and Underscore (_) characters only.
-data_element_category_concept=Data Element Category Concept
+regex_add_edit_concept=Enter alphabet (a-z A-Z), number (0-9) and anderscore (_) characters only.
 concept_management=Concept management
 concept=Concept
 selected_name=Selected name

=== modified file 'dhis-2/dhis-web/dhis-web-validationrule/src/main/resources/org/hisp/dhis/validationrule/i18n_module.properties'
--- dhis-2/dhis-web/dhis-web-validationrule/src/main/resources/org/hisp/dhis/validationrule/i18n_module.properties	2011-12-25 18:32:49 +0000
+++ dhis-2/dhis-web/dhis-web-validationrule/src/main/resources/org/hisp/dhis/validationrule/i18n_module.properties	2012-02-21 14:48:08 +0000
@@ -1,16 +1,12 @@
 group_members= Group Members
-filters=Filters
-filter_by_dataset_view_all=Filter by dataset/view all
 available_data_elements=Available data elements
-saving_validation_rule_failed= Saving Validation Rule failed
-validation_name=Validation name
+saving_validation_rule_failed=Saving Validation Rule failed
 operator=Operator
-adding_validation_rule_failed= Adding validation rule failed
+adding_validation_rule_failed=Adding validation rule failed
 validation_failed=Validation failed
 right_side=Right side
 left_side=Left side
-overview=Overview
-left_brackets= Left brackets
+left_brackets=Left brackets
 right_brackets= Right brackets
 multiply=Multiply
 divide= Divide
@@ -33,7 +29,6 @@
 dataelements_right_must_be_type_integers=The data elements on the right side must be of type numbers
 create_new_validation_rule=Create new validation rule
 validate=Validate
-update_validation_rule= Update Validation Rule
 confirm_delete_validation_rule= Are you sure you want to delete the validation rule?
 confirm_delete_validation_rule_group= Are you sure you want to delete the validation rule group?
 edit_left_side= Edit left side
@@ -41,36 +36,27 @@
 select_operator= Select operator
 left= Left
 right= Right
-side_expression= Side Expression
 textual_expression_description= Textual expression description
 edit_validation_rule= Edit validation rule
 validation_rule= Validation Rule
 run_validation= Run validation
 validation_violations= Validation violations
-validation_results=Validation results
 value= Value
 data_element= Data element
 organisation_unit= Organisation unit
 period= Period
-organisation_unit_only= Organisation unit only
-organisation_unit_with_children= Organisation unit with children
 validation_violations= Validation violations
 source= Source
 done= Done
-generate_pdf=Generate PDF
-generate_workbook=Generate Workbook
 validation=Validation
 data_quality_report=Data quality report
 validation_result_details=Validation result details
 validation_rule_=Validation rule
-expression_is_empty=Expression is empty
 dataelement_id_not_numeric=Data element identifier must be a number
 category_option_combo_id_not_numeric=Category option combo identifier must be a number
 data_element_does_not_exist=Identifier does not reference a data element
 category_option_combo_does_not_exist=Identifier does not reference a category option combo
 expression_not_well_formed=Expression is not well formed
-could_not_save= Could not save
-select_organisation_unit=Select organisation unit
 everything_is_ok=Everything is OK
 validation_rule_group_management=Validation rule group management
 validation_rule_management=Validation rule management
@@ -82,22 +68,15 @@
 validation_violations= Validation violations
 validation_passed_successfully= Validation passed successfully
 outlier_analysis=Outlier Analysis
-choose_outlier_type=Select outlier analysis method
 from_date=From date
 to_date=To date
-select_data_set=Select data set
-select_data_elements=Select data elements
-select_outlier_type=Select outlier analysis method
-min_max=Min-max
 std_dev=Standard Deviation
 max=Max
 min=Min
 values_found=values found
 select_std_dev=Select number of standard deviations
-waiting_for_user_to_choose_dataset=Waiting for user to select a data set
 select_parent_organisation_unit=Select parent organisation unit
 outlier_analysis=Outlier Analysis
-search_result=Search result
 no_values_found=No values found
 intro_validation_rule=Add, modify, view and delete validation rules. Anomalies can be discovered by running validation rules against the data.
 intro_validation_rule_group=Add, modify, view and delete validation rule groups. Provides the ability to group and run validation rules together.
@@ -106,9 +85,7 @@
 intro_minmaxoutlier_analysis=Analyze potential outlier values based on min and max values. Outlier values can be examined and marked for follow-up.
 intro_gap_analysis=Perform analysis of potential missing values, referred to as gaps. Missing values can be entered or marked for follow-up.
 intro_followup_analysis=View or edit data values marked for further follow-up during data entry or analysis.
-view_all=View all
 available_data_elements=Available data elements
-selected_data_elements=Selected data elements
 followup_analysis=Follow-up Analysis
 value_must_be_a_number=Value must be a number
 value_is_lower_than_min_value=Value is lower than minimum value
@@ -124,7 +101,6 @@
 validation_rule_analysis=Validation Rule Analysis
 result=result
 start=Start
-specify_period_type=Please specify a period type
 clear_expression=Clear expression
 periodtype=Period type
 available_data_sets=Available data sets
@@ -133,10 +109,8 @@
 data_source=Data source
 use_captured_data=Use captured data
 use_aggregated_data=Use aggregated data
-aggregate_data_info=Immediate children of the selected organisation unit will be included.
-captured_data_info=All children of the selected organisation unit will be included.
-get_updated_data=Get updated aggregated data
-use_existing_data=Use existing aggregated data
+aggregate_data_info=Immediate children of the selected organisation unit will be included
+captured_data_info=All children of the selected organisation unit will be included
 method=Method
 see_statistics=See statistics
 description_not_null=Please specify a description