=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/resources/i18n_global.properties' --- dhis-2/dhis-services/dhis-service-core/src/main/resources/i18n_global.properties 2015-09-18 12:51:09 +0000 +++ dhis-2/dhis-services/dhis-service-core/src/main/resources/i18n_global.properties 2015-09-26 16:08:33 +0000 @@ -122,7 +122,6 @@ previous=Previous online_notification=You are online offline_notification=You are offline, data will be stored locally -ajax_login_failed=Login failed, check your username and password and try again need_to_sync_notification=There is data stored locally, please upload to server uploading_data_notification=Uploading locally stored data to the server sync_now=Upload @@ -180,7 +179,6 @@ create=Create cant_read_the_words_try_another_one=Can't read the words? Try another one restore=Restore -new_password=New password restore_account=Restore account account_recovery=Account recovery recover=Recover @@ -193,18 +191,6 @@ code_in_use=The code is already in use. Please choose a different code short_name_in_use=The short name is already in use. Please choose a different short name unsupported_browser=Please upgrade your browser. Internet Explorer version 8 and earlier is not supported. -data_element_or_type_null_or_empty=Data element or type not defined -value_length_greater_than_max_length=Value is greater than max length -comment_length_greater_than_max_length=Comment is greater than max length -value_not_numeric=Value is not numeric -value_not_unit_interval=Value is not a unit interval -value_not_percentage=Value is not a percentage -value_not_integer=Value is not an integer -value_not_positive_integer=Value is not a positive integer -value_not_negative_integer=Value is not a negative integer -value_not_bool=Value is not a boolean -value_not_true_only=Value is not true -value_not_valid_date=Value is not a valid date email_not_configured_for_system=Email is not configured for the system no_user_credentials=No user credentials user_does_not_have_valid_email=User does not have a valid email @@ -514,9 +500,6 @@ intro_user_message_settings=Customize the system with user specific settings for message email and sms notification. light_blue=Light Blue green=Green -myanmar=Myanmar -india=India -vietnam=Vietnam settings_updated=Settings were updated dashboard=Dashboard messages=Messages @@ -670,7 +653,6 @@ warning=Warning success=Success waiting=Please wait -expression_not_well_formed=Expression is not well formed invalid_identifiers_in_expression=Invalid identifiers in expression filter_not_evaluating_to_true_or_false=Filter is not evaluating to true or false locate_by_code=Locate by code === added file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-cache-cleaner/i18n/i18n_app_es.properties' --- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-cache-cleaner/i18n/i18n_app_es.properties 1970-01-01 00:00:00 +0000 +++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-cache-cleaner/i18n/i18n_app_es.properties 2015-09-26 16:08:33 +0000 @@ -0,0 +1,25 @@ +home=Home +dhis2=DHIS 2 +dhis2_home=DHIS 2 Home +profile=Perfil +applications=Apps +more_applications=More apps +search_apps=Search apps +settings=Configuraci\u00F3n +account=Account +log_out=Log out +about_dhis2=About DHIS 2 +session_storage=Session Storage +local_storage=Local Storage +indexed_db=IndexedDB +clearing_dhis2_browser_cache=DHIS 2 browser cache cleaner +clears_local_cache=This clears selected items from your browser cache +proceed_cleaning=Are your sure you want to proceed with the cleaning? +cache_cleared=Browser cache is cleared. +nothing_to_clear=Browser cache is empty. Nothing to clear. +clearing_cache=Clearing cache +proceed=Proceed +select_all=Select all +unselect_all=Unselect all +cancel=Cancel +clear=Clear === modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/i18n/i18n_app.properties' --- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/i18n/i18n_app.properties 2015-09-21 15:01:55 +0000 +++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/i18n/i18n_app.properties 2015-09-26 16:08:33 +0000 @@ -9,7 +9,6 @@ no_registered_event=There are no registered events. event_registration_error=Error in event registration validation_error=Validation Error -validation_warnings=Validation Warnings help=Help click_for_action=Click for more actions details=Details @@ -35,8 +34,7 @@ int_required=Value must be a number string_required=Value must be a text date_required=Value must be date -option_required=Value must be selected from drop-down -bool_required=Value must be a +bool_required=Value must be true/false. option_required=Option is required. Please select one. ok=Ok find=Find @@ -112,8 +110,6 @@ center_map=Center map set_coordinate=Set coordinate point_and_click_for_coordinate=Point and click for coordinate -loading_tree=Loading orgunit tree -loading_metadata=Loading meta-data profile=Profile applications=Apps more_applications=More apps === modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-reports/i18n/i18n_app.properties' --- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-reports/i18n/i18n_app.properties 2015-09-18 19:32:32 +0000 +++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-reports/i18n/i18n_app.properties 2015-09-26 16:08:33 +0000 @@ -143,9 +143,6 @@ plugin_config=Plugin config default_=Default aggregation_type=Aggregation type -count=Count -sum=Sum -by_data_element=By data element relative_periods=Relative periods start_end_dates=Start-end dates top=Top === modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-visualizer/i18n/i18n_app.properties' --- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-visualizer/i18n/i18n_app.properties 2015-09-11 00:58:01 +0000 +++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-visualizer/i18n/i18n_app.properties 2015-09-26 16:08:33 +0000 @@ -135,9 +135,6 @@ plugin_config=Plugin config default_=Default aggregation_type=Aggregation type -count=Count -sum=Sum -by_data_element=By data element relative_periods=Relative periods start_end_dates=Start-end dates top=Top === modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/i18n/i18n_app.properties' --- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/i18n/i18n_app.properties 2015-05-13 15:44:45 +0000 +++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/i18n/i18n_app.properties 2015-09-26 16:08:33 +0000 @@ -97,7 +97,6 @@ organisation_units_assigned=organisation units assigned applying_organisation_units_relations=Applying organisation units relations assigning=Assigning -no=no creating_map=Creating map.. current_selection_no_data=The current selection returned no data creating_choropleth=Creating choropleth.. @@ -275,11 +274,9 @@ total_distance=Total distance symbol_layer=Facility layer set_thematic_map_date_type=Set thematic map date type -manage_favorites=Manage favorites tools=Tools layers=Layers edit_layer=Edit layer -clear=Clear search=Search labels=Labels show_hide_feature_labels=Show / Hide feature labels @@ -413,7 +410,6 @@ you_do_not_have_access_to_all_items_in_this_favorite=You do not have access to all items in this favorite initializing=Initializing created_by=Created by -created_by=Created by clear_map=Clear map manage_favorites=Manage favorites yes=Yes === modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/i18n/i18n_app.properties' --- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/i18n/i18n_app.properties 2015-09-24 13:34:47 +0000 +++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/i18n/i18n_app.properties 2015-09-26 16:08:33 +0000 @@ -24,7 +24,6 @@ not_yet_enrolled_report=Not yet enrolled. Reporting not possible no_data_report=No record exists for reporting empty_notes=Empty notes list. -empty=Empty event=Event no_event_is_yet_created=No event is available for data entry. Please create one. event_creation=Please create one from below @@ -55,8 +54,7 @@ bool_required=Value must be a boolean filter=Filter search=Search -_search=search -advanced_search=Advanced search +_search=search search_for=Search for type_your_search_criteria_here=Type your search criteria here search_input_required=Please specify a search criteria @@ -84,9 +82,7 @@ change_location=Manage location details_history=Details/history history=History -complete=Complete terminate=Terminate -completed=Completed terminated=Terminated delete=Delete remove=Remove @@ -96,7 +92,6 @@ add_note=Add note search_note=Search notes add_new_note_here=Add new note here -skipped=Skipped skip=Skip unskip=Schedule back complete=Complete @@ -109,7 +104,6 @@ created_by=Registered by date=Date _date=date -add_new=Add new event_name=Event name new_event=New event create_new_event=Create new event @@ -127,7 +121,6 @@ dashboard=Dashboard home=Home back=Back -profile=Profile enrollment=Enrollment enrolling_orgunit=Enrolling orgunit delete_enrollment=Delete enrollment @@ -264,7 +257,6 @@ current=Current new=New add_new=Add new -register_new=Register new registration=Registration registration_date=Registration date register=Register @@ -280,7 +272,6 @@ validation_error=Validation Error validation_warnings=Validation Warnings dashboard_layout_saved=Dashboard layout saved as default. -dashboard_layout_not_saved=Error in saving dashboard layout saved as default. event_orgunit_name=Organisation unit category=Category entity_type=Entity type === modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/i18n/i18n_app.properties' --- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/i18n/i18n_app.properties 2015-09-10 20:26:24 +0000 +++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/i18n/i18n_app.properties 2015-09-26 16:08:33 +0000 @@ -21,7 +21,6 @@ all_indicator_groups=All indicator groups available=Available selected=Selected -periods=Periods months=Months last_month=Last month last_12_months=Last 12 months @@ -49,7 +48,6 @@ show_hide_chart_settings=Show/hide chart settings update=Update data_table=Data table -favorites=Favorites manage_favorites=Manage favorites save_favorite=Save favorite sort_by=Sort by @@ -66,7 +64,6 @@ save=Save create_chart_before_saving=Please create a chart before saving overwrite=Overwrite -download=Download no_svg_format=No SVG format image_png=Image hide_data_table=Hide data table @@ -126,7 +123,6 @@ show_data=Show series data share=Share interpretation=interpretation -write_your_interpretation=Write a comment, question or interpretation interpretation_was_shared=Interpretation was shared save_load_favorite_before_sharing=Please save or load a favorite before sharing create_chart_before_datatable=Please create a chart before showing the datatable === modified file 'dhis-2/dhis-web/dhis-web-dataentry/src/main/resources/org/hisp/dhis/de/i18n_module.properties' --- dhis-2/dhis-web/dhis-web-dataentry/src/main/resources/org/hisp/dhis/de/i18n_module.properties 2015-09-18 09:31:57 +0000 +++ dhis-2/dhis-web/dhis-web-dataentry/src/main/resources/org/hisp/dhis/de/i18n_module.properties 2015-09-26 16:08:33 +0000 @@ -46,7 +46,6 @@ the_following_values_are_outliers=The following values are considered as outliers (min-max or std dev), please correct the_following_fields_require_comment=The following input fields require a comment, please enter the_following_values_violate_rules=The following values violate validation rules -value=Value operator=Operator no_organisationunit_selected=No Organisation Unit Selected no_period_selected=No Period Selected @@ -62,7 +61,6 @@ register_complete_dataset_success=Registered complete data set register_complete_dataset_failed=Register complete data set failed undo_register_complete_dataset_success=Undo register complete data set success -datavalue_history=Data value history enter_digits=Enter digit only. value_is_too_long=Value is too long field_unallowed_save_zero=This element does not permit 0 values. The original value will not be affected. === modified file 'dhis-2/dhis-web/dhis-web-importexport/src/main/resources/org/hisp/dhis/importexport/i18n_module.properties' --- dhis-2/dhis-web/dhis-web-importexport/src/main/resources/org/hisp/dhis/importexport/i18n_module.properties 2015-06-05 12:56:34 +0000 +++ dhis-2/dhis-web/dhis-web-importexport/src/main/resources/org/hisp/dhis/importexport/i18n_module.properties 2015-09-26 16:08:33 +0000 @@ -4,17 +4,11 @@ period_type=Period Type export=Export action=Action -import=Import -preview=Preview from=From to=To period=Period selected_data_elements=Selected data elements available_data_elements=Available data elements -move_selected=Move selected -move_all=Move all -remove_selected=Remove selected -remove_all=Remove all indicators=Indicators datavalues=Data values available_datasets=Available data sets @@ -26,24 +20,20 @@ dhis14_import=DHIS 1.4 Import organisation_units=Organisation units periods=Periods -import=Import importing=Importing... done=Done compare=Compare -configuration=Configuration source=Source object_type=Object type del=Del up=Up specify_file=Please specify a file data_sets=Data sets -include_datavalues=Include Data Values file=File elements=Elements data=Data import_preview=Import Preview select_none=Select none -element=Element unique=Unique matching=Matching preview=Preview @@ -53,11 +43,6 @@ indicator_group=Indicator group dataset=Data set organisationunit=Organisation unit -data_export=DXF Data Value Export -datavalue_export=Data Export -metadata_export=DXF Metadata Export -data_export=Data Export -metadata_export=Metadata Export data_element_groups=Data element groups indicator_groups=Indicator groups organisation_unit=Organisation unit @@ -106,12 +91,10 @@ status=Status data_type=Data type validation_rules=Validation rules -saved=Saved last_updated=Last updated validation_rule=Validation rule operator=Operator data_elements=Data elements -data_dictionary=Data dictionary data_value=Data Value data_value_daily=Daily Data Value dhis14_file_configuration=DHIS 1.4 File Configuration @@ -146,7 +129,6 @@ importing_data_set_source_associations=Importing data set source associations importing_dataset_data_entry_form_association=Importing data set data entry form associations importing_organisation_units=Importing organisation units -importing_organisation_unit_relationships=Importing organisation unit relationships importing_organisation_unit_groups=Importing organisation unit groups importing_organisation_unit_group_members=Importing organisation unit group members importing_organisation_unit_group_sets=Importing organisation unit group sets @@ -225,7 +207,6 @@ url=Url table_name=Table name mode=Mode -regression=Regression reporting_month=Reporting month last_3_months=Last 3 months last_6_months=Last 6 months @@ -384,83 +365,59 @@ selected_charts=Selected Charts available_constants=Available Constants selected_constants=Selected Constants - available_dataDictionaries=Available Data Dictionaries selected_dataDictionaries=Selected Data Dictionaries - available_dataElementGroupSets=Available Data Element Group Sets selected_dataElementGroupSets=Selected Data Element Group Sets - available_dataElementGroups=Available Data Element Groups selected_dataElementGroups=Selected Data Element Groups - documents=Documents available_documents=Available Documents selected_documents=Selected Documents - available_indicatorGroupSets=Available Indicator Group Sets selected_indicatorGroupSets=Selected Indicator Group Sets - available_indicatorGroups=Available Indicator Groups selected_indicatorGroups=Selected Indicator Groups - indicator_types=Indicator types available_indicatorTypes=Available Indicator Types selected_indicatorTypes=Selected Indicator Types - map_legend_sets=Map legend sets available_mapLegendSets=Available Map Legend Sets selected_mapLegendSets=Selected Map Legend Sets - maps=Maps available_maps=Available Maps selected_maps=Selected Maps - option_sets=Option sets available_optionSets=Available Option Sets selected_optionSets=Selected Option Sets - available_organisationUnitGroupSets=Available Organisation Unit Group Sets selected_organisationUnitGroupSets=Selected Organisation Unit Group Sets - available_organisationUnitGroups=Available Organisation Unit Groups selected_organisationUnitGroups=Selected Organisation Unit Groups - available_organisationUnitLevels=Available Organisation Unit Levels selected_organisationUnitLevels=Selected Organisation Unit Levels - available_organisationUnits=Available Organisation Units selected_organisationUnits=Selected Organisation Units - available_reportTables=Available Report Tables selected_reportTables=Selected Report Tables - available_reports=Available Reports selected_reports=Selected Reports - sql_views=SQL views available_sqlViews=Available SQL Views selected_sqlViews=Selected SQL Views - available_userGroups=Available User Groups selected_userGroups=Selected User Groups - available_userRoles=Available User Roles selected_userRoles=Selected User Roles - available_users=Available Users selected_users=Selected Users - validation_rule_groups=Validation rule groups available_validationRuleGroups=Available Validation Rule Groups selected_validationRuleGroups=Selected Validation Rule Groups - available_validationRules=Available Validation Rules selected_validationRules=Selected Validation Rules - select_all_values=Select All Values deselect_all_values=Deselect All Values - inclusion=Inclusion include_selected=Selected organisation unit include_children=Include children of organisation unit === 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 2015-08-19 05:26:31 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/resources/org/hisp/dhis/dataadmin/i18n_module.properties 2015-09-26 16:08:33 +0000 @@ -1,6 +1,4 @@ remove_all=Remove All Locks -done=Done -loading=Loading, please wait optional=Optional data_administration=Data Administration period_type=Period Type @@ -23,9 +21,6 @@ cache_statistics=Cache Statistics second_level_cache_statistics=Second Level Cache Statistics region_name=Region name -put_count=Put count -hit_count=Hit count -miss_count=Miss count mem_count=Mem count disk_count=Disk count mem_size=Mem size @@ -110,9 +105,6 @@ 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 -org_unit_group_does_not_exist=Organisation unit group does not exist expression_not_well_formed=Expression is not well formed invalid_indicator_denominators=Invalid indicator denominators invalid_indicator_numerators=Invalid indicator numerators @@ -293,7 +285,6 @@ refresh=Refresh aggregation_period_types=Aggregation period types running=active -done=done resource_tables=Resource tables data_mart=Data mart analytics_tables=Analytics tables @@ -319,8 +310,7 @@ option_set_management=Option set management add_option_set=Add option set options=Options -option=Option -add_option=Add option +option=Option edit_option_set=Edit option set number_of_members=The number of members object_not_deleted_associated_by_objects=Object not deleted because it is associated by objects of type === 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 2015-09-09 09:01:21 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/resources/org/hisp/dhis/dd/i18n_module.properties 2015-09-26 16:08:33 +0000 @@ -7,8 +7,6 @@ create_new_data_element_category=Create new data element category selected_categories=Selected categories available_categories=Available categories -category=Category -category_option=Category Option data_element_category_management=Data element category management data_element_category_combo_management=Data element category combination management create_new_data_element_category_combo=Create new data element category combination @@ -19,7 +17,6 @@ edit_data_element_category_combo=Edit data element category combination category_combination=Category Combination data_element_category_combo_details=Data element category combo details -category_combo=Combination of categories data_element_category=Data Element Category data_element_category_combo=Data Element Category Combination select=Select @@ -37,7 +34,6 @@ available_data_elements=Available data elements create_new_indicator=Create new indicator create_new_indicator_group=Create new indicator group -available_indicators=Available indicators create_new_indicator_type=Create new indicator type factor=Factor data_element_management=Data element management @@ -57,15 +53,12 @@ edit_denominator=Edit denominator confirm_delete_data_element=Are you sure you want to delete this data element? confirm_delete_data_element_group=Are you sure you want to delete this data element group? -confirm_delete_indicator=Are you sure you want to delete this indicator? 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? 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 -saving_indicator_failed=Saving the indicator failed with the following message adding_indicator_group_failed=Adding the indicator group failed with the following message 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 @@ -150,7 +143,6 @@ intro_concept=Create, modify, view and delete concepts. A concept can be used by a category. available_data_element_group_sets=Available data element group sets selected_data_element_group_sets=Selected data element group sets -concept_name=Concept name available_groups=Available Groups selected_groups=Selected Groups assign_groups_for_dataelement=Assign Groups for Data Element === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/resources/org/hisp/dhis/oum/i18n_module.properties' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/resources/org/hisp/dhis/oum/i18n_module.properties 2015-06-11 08:41:01 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/resources/org/hisp/dhis/oum/i18n_module.properties 2015-09-26 16:08:33 +0000 @@ -7,7 +7,6 @@ not_selected=Not selected confirm=Confirm select_the_new_parent_org_unit_for_the_one_to_move=Select the new parent organisation unit for the one to move -not_selected_moved_to_root_position=Not selected, moved to root position reset=Reset org_unit=Organisation Unit org_unit_group=Organisation Unit Group @@ -38,7 +37,6 @@ org_unit_group_set_management=Organisation unit group set management org_unit_group_set=Organisation Unit Group Set saving_the_org_unit_group_set_failed=Saving the organisation unit group set failed with the following message -create_new_org_unit_group_set=Create new organisation unit group set compulsory=Compulsory data_dimension=Data Dimension exclusive=Exclusive @@ -80,7 +78,6 @@ org_unit_search_management=Organisation unit search criteria=Criteria options=Options -all=All search=Search organisation_units=organisation units found=Found === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/resources/org/hisp/dhis/trackedentity/i18n_module.properties' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/resources/org/hisp/dhis/trackedentity/i18n_module.properties 2015-09-25 17:51:47 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/resources/org/hisp/dhis/trackedentity/i18n_module.properties 2015-09-26 16:08:33 +0000 @@ -35,7 +35,6 @@ name_in_use=Name is in use short_name_in_use=Short name in use code_in_use=Code is in use -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 @@ -146,14 +145,12 @@ configuration=Configuration row=Row duplicate=Duplicate -dataelement_group=Data Element Group option_combo=Option combination case_aggregation_query_builder_detail=Aggregation query builder details create_new_aggregation_query_builder=Create new aggregation query builder condition_detail=Condition details edit_aggregation_query_builder=Edit aggregation query builder program_properties=Program properties -orgunit=Organisation unit validation_criteria_details=Validation criteria details program_attribute_details=Program attribute details select_program=Select program @@ -161,7 +158,6 @@ add_multi_program_validation_rule=Add multi-program validation rule program_validation_rule_details=Program validation rule details view_validation_rules=View validation rules -tracked_entity_attribute_group_sort_order=Tracked entity attribute group sort order scheduled_days_from_start=Scheduled days from start success_delete_program_attribute_option=Deleted program attribute option successfully validation_criteria_management=Validation criteria management @@ -244,13 +240,11 @@ create_new_program_stage_section = Create new program stage section update_program_stage_section = Update program stage section section_management = Section management -sort_order = Sort order program_stage_section_sort_order = Program stage section sort order add_selected = Add selected add_all = Add all available_attributes = Available attributes select_attributes = Select attributes -attributes = Attributes displayed_in_list = Display in list report_date_description = Description of report date reminder_message_template = Reminder message templates @@ -451,7 +445,6 @@ relationship = Relationship select_at_least_one_scope=Select at least one scope for local id scheduling_of_events = Scheduling of events -show_advanced_options = Show advanced options tracker_associate = Tracker associate view_validation_criteria = View validation criteria define_registration_form= Define registration form @@ -504,11 +497,8 @@ program_variables = Program variables custom_standard_interval = Custom standard interval period_type = Period type -create_new_program_rule = Create new program rule -program_rule_details = Program rule details source_fields = Source fields expression_evaluate_the_source_fields = Expression - evaluate the source fields -add_source_field = Add source field actions_that_is_executed_when_expression_is_true = Actions that is executed when expression is true display_text = Display text shows_a_key_data_box = Shows a key data box @@ -520,7 +510,6 @@ program_rule_management = Program rule management create_new_program_rule = Create new program rule program_rule_details = Program rule details -confirm_delete_program_rule = Are you sure you want to delete program rule? source_program_stage = Source program stage source_dataElement = Source DataElement variable_name = Variable name === 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 2015-09-09 20:18:52 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module.properties 2015-09-26 16:08:33 +0000 @@ -274,7 +274,6 @@ F_LOCALE_DELETE=Delete Locale F_TRACKED_ENTITY_INSTANCE_REMINDER_MANAGEMENT=Manage Tracked Entity Instance Reminders F_TRACKED_ENTITY_MANAGEMENT=Manage Tracked Entities -F_TRACKED_ENTITY_ADD=Add Tracked Entities F_TRACKED_ENTITY_UPDATE=Update Tracked Entities F_VALIDATIONRULEGROUP_ADD=Add Validation Rule Groups F_SQLVIEW_ADD=Add SQL View === modified file 'dhis-2/dhis-web/dhis-web-reporting/src/main/resources/org/hisp/dhis/reporting/i18n_module.properties' --- dhis-2/dhis-web/dhis-web-reporting/src/main/resources/org/hisp/dhis/reporting/i18n_module.properties 2015-08-30 14:21:41 +0000 +++ dhis-2/dhis-web/dhis-web-reporting/src/main/resources/org/hisp/dhis/reporting/i18n_module.properties 2015-09-26 16:08:33 +0000 @@ -2,7 +2,6 @@ please_select_period= Please select a period please_select_group_set=Please select a group set reporting_unit= Reporting unit -reporting_period= Reporting period report_period= Report period select_data_set= Please select a data set select_period=Please select a period @@ -16,9 +15,7 @@ create_report_table= Create report table available_indicators= Available indicators select_indicatorgroup_all= Select indicator group / View all -select_dataelementgroup_all= Select data element group / View all selected_indicators= Selected indicators -selected_dataelements= Selected data elements select_organisationunit_level_all=Select organsation unit level / View all select_option_view_all=Select option / View all level= Level @@ -33,8 +30,6 @@ periods= Periods relative_periods= Relative periods reporting_month= Reporting month -months_this_year=Months this year -quarters_this_year=Quarters this year this_year=This year reporting_sixmonth=Reporting six-month last_2_sixmonths=Last 2 six-months @@ -86,7 +81,6 @@ parent_organisation_unit= Parent organisation unit available_dataelements= Available data elements select_dataelementgroup_all= Select data element group / View all -select_category_combo= Select category combination selected_dataelements= Selected data elements dataelements= Data elements report_table_parameters= Report table parameters @@ -101,8 +95,6 @@ dimension= Dimension pivot_table= Pivot Table indicator_group= Indicator group -start_date= Start date -end_date= End date period_type= Period type organisation_unit_level= Organisation unit level select_period_type= Select period type @@ -167,7 +159,6 @@ organisation_unit_report=Organisation Unit Report select_group_set=Select group set orgunit_distribution=Organisation unit distribution report -get_report=Get report get_chart=Get chart group_set=Group set select_org_unit=Select organisation unit @@ -198,7 +189,6 @@ last_6_bimonths=Last 6 bimonths reporting_quarter=Reporting quarter include_organisation_unit_group_sets=Include org unit group sets param -reporting_period=Reporting period last_5_years=Last 5 years last_12_months=Last 12 months last_4_quarters=Last 4 quarters === modified file 'dhis-2/dhis-web/dhis-web-sms/src/main/resources/org/hisp/dhis/sms/i18n_module.properties' --- dhis-2/dhis-web/dhis-web-sms/src/main/resources/org/hisp/dhis/sms/i18n_module.properties 2013-09-04 14:04:01 +0000 +++ dhis-2/dhis-web/dhis-web-sms/src/main/resources/org/hisp/dhis/sms/i18n_module.properties 2015-09-26 16:08:33 +0000 @@ -52,9 +52,6 @@ gender=Gender organisation_unit=Organisation Unit beneficiary_registration=Beneficiary Registration -full_name=FullName -male=Male -female=Female transgender=Transgender is_empty=Empty Field beneficiary_enrollment=Beneficiary Enrollment === 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 2015-09-17 08:13:56 +0000 +++ dhis-2/dhis-web/dhis-web-validationrule/src/main/resources/org/hisp/dhis/validationrule/i18n_module.properties 2015-09-26 16:08:33 +0000 @@ -40,7 +40,6 @@ edit_validation_rule= Edit validation rule validation_rule= Validation Rule run_validation= Run validation -validation_alerts= Validation alerts value= Value data_element= Data element organisation_unit= Organisation unit @@ -74,7 +73,6 @@ all_validation_rules= All validation rules validation_alerts= Validation alerts validation_passed_successfully= Validation passed successfully -outlier_analysis=Outlier Analysis from_date=From date to_date=To date std_dev=Standard Deviation