=== modified file 'dhis-2/dhis-web/dhis-web-light/src/main/resources/org/hisp/dhis/light/i18n_module.properties' --- dhis-2/dhis-web/dhis-web-light/src/main/resources/org/hisp/dhis/light/i18n_module.properties 2012-01-22 19:37:21 +0000 +++ dhis-2/dhis-web/dhis-web-light/src/main/resources/org/hisp/dhis/light/i18n_module.properties 2012-02-21 14:12:02 +0000 @@ -23,27 +23,21 @@ dataset_is_complete=DataSet is complete settings=Settings language=Interface Language -db_language=Database Language - -# validation messages is_invalid_boolean=is not a valid boolean is_invalid_date=is not a valid date (yyyy-MM-dd) is_invalid_number=is not a valid number is_invalid_integer=is not a valid integer is_invalid_positive_integer=is not a valid positive integer is_invalid_negative_integer=is not a valid negative integer - warnings_and_errors=Warnings and errors validation_rule_violation_warnings=Validation Rule Violation Warnings minmax_violation_warnings=Min/Max Violation Warnings type_violation_errors=Type Violation Errors - messages=Messages conversations=Conversations subject=Subject reply=Reply -write_feedback=Write feedback form_complete=Form complete completed=Completed saved_section=Saved Section -sections=Sections +sections=Sections \ No newline at end of file === modified file 'dhis-2/dhis-web/dhis-web-portal/src/main/resources/org/hisp/dhis/wp/i18n_module.properties' --- dhis-2/dhis-web/dhis-web-portal/src/main/resources/org/hisp/dhis/wp/i18n_module.properties 2011-12-24 06:06:32 +0000 +++ dhis-2/dhis-web/dhis-web-portal/src/main/resources/org/hisp/dhis/wp/i18n_module.properties 2012-02-21 14:12:02 +0000 @@ -1,8 +1,5 @@ hisp_homepage=HISP Homepage -dhis2_wiki=DHIS 2 Wiki -dhis2_issue_tracking=DHIS 2 Issue Tracking welcome_to_dhis2=Welcome to DHIS 2 get_help_here=Get help here -loading=Loading proceed=Proceed in_memory_notification=The database is currently running in-memory. This is useful for testing purposes but might happen because your database configuration was not detected by the application. Please make sure this is intentional. Your data will be destroyed when the application shuts down. === 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 2012-02-20 10:20:01 +0000 +++ dhis-2/dhis-web/dhis-web-reporting/src/main/resources/org/hisp/dhis/reporting/i18n_module.properties 2012-02-21 14:12:02 +0000 @@ -1,19 +1,10 @@ please_select_org_unit= Please select an organisation unit -please_select_dataset= Please select a dataset please_select_period= Please select a period please_select_group_set=Please select a group set -refresh_datamart= Refresh datamart -error_in_input_parameters= Not all required parameters are selected! -aggregation_mode= Aggregation mode reporting_unit= Reporting unit reporting_period= Reporting period report_period= Report period report_parameters -error_startDate=You must enter a valid start date! -error_endDate=You must enter a valid start date! -error_organisationUnitId=You must select an organisation unit! -error_dataSetId= You must select a data set! -error_after= End date must be after start date! select_data_set= Please select a data set select_period=Please select a period select_organisation_unit=Please select an organisation unit @@ -23,7 +14,6 @@ add_all= Add all add=Add create_report_table= Create report table -manage_report_table= Manage report table available_indicators= Available indicators select_indicatorgroup_all= Select indicator group / View all select_dataelementgroup_all= Select data element group / View all @@ -31,14 +21,12 @@ selected_dataelements= Selected data elements available_organisationunits= Available organisation units select_organisationunit_level_all=Select organsation unit level / View all -select_period_type_all=Select period type / View all level= Level available_organisationunits= Available organisation units selected_organisationunits= Selected organisation units available_periods= Available periods selected_periods= Selected periods add_children= Add children -create_and_save= Create and Save create= Create indicators= Indicators organisation_units= Organisation units @@ -55,183 +43,68 @@ crosstab_dimensions= Crosstab dimensions confirm_delete_table= Are you sure you want to remove table? operations= Operations -report_table_management= Report table management -creating_table= Creating table... done= Done -table_name= Table name crosstab_indicators= Crosstab indicators crosstab_periods= Crosstab periods crosstab_organisation_units= Crosstab organisation units -cannot_crosstab_all_dimensions= You cannot crosstabulate all dimensions -cannot_crosstab_no_dimensions= Please select at least one dimension must_select_at_least_one_indictor_data_element_data_set=Please select at least one indicator, data element or data set -must_select_at_least_one_indicator=Please select at least one indicator -must_select_at_least_one_dataelement=Please select at least one data element -must_select_at_least_one_dataset=Please select at least one dataset must_select_at_least_one_unit= Please select at least one organisation unit must_select_at_least_one_period= Please select at least one period -target_line_value_must_be_provided=Target line value must be provided when target lines are enabled. -target_line_value_must_be_number=Target line value must be a number. cannot_include_more_organisation_unit_regression=Cannot include more that one organisation unit with regression cannot_select_orgunit_and_parent_orgunit_param= Cannot select both current and parent organisation unit parameter must_enter_name= Please enter a name specify_name= Please specify a name -specify_title= Please specify a title -select_file= Select file -select_report_table= Select report table name_in_use= The name is already in use -title_in_use= The title is already in use design=Design home= Home directory= Directory -select_table= Select table create_new_report= Create new report create_report= Create report standard_report= Standard Report -file_upload_failed= File upload failed confirm_remove_report= Are you sure you will delete the report? -confirm_delete_chart= Are you sure you want to remove chart? -report_management= Report management report= Report completed= completed -no_process_running= No process running -aggregating_data= Aggregating data -creating_report_datasource= Creating report datasource -process_done= Process done -generate_datasource_and_view_report= Generate datasource and view report -view_report_based_on_existing_datasource= View report based on existing datasource remove_report= Remove report -data_completeness= Data Completeness -view_data_completeness= View data completeness submit= Submit -generate_pdf= Generate PDF -data_completeness_report= Data Completeness Report edit_report= Edit report processing= Processing indicators_data_elements_data_sets=Indicators / data elements / data sets -set_configuration= Please set the configuration in order for the report module to work properly -home_explanation= Home refers to the absolute path to the BIRT viewer web application on the server -directory_explanation= Directory refers to the part of the URL coming after the server part pointing to the BIRT viewer web application dataset= Dataset organisation_unit= Organisation unit select_dataset_all= Select dataset / View all -data_completeness_configuration= Data Completeness Configuration -offset_days= Offset days -weekly= Weekly monthly= Monthly quarterly= Quarterly -six_monthly= Six-Monthly yearly= Yearly -two_yearly= Two-Yearly -generate_workbook= Generate Workbook -importing_report_tables= Importing report tables -completeness_configuration_explanation= Number of days refers to the maximum number of days after the end of the reporting month before the data must be submitted omit_report_table_explanation= If selecting no report table, the user is responsible for providing the data source -reporting_deadline= Reporting deadline -nr_of_days= Number of days -select_report_table_none= Select report table / none dataset_completeness= Dataset Completeness -export_dataset_completeness= Export dataset completeness -available_datasets= Available data sets -selected_datasets= Selected data sets report_parameters= Report parameters 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 -create_indicator_report_table= Create indicator report table -create_dataelement_report_table= Create data element report table dataelements= Data elements -datasets= Data sets -parent_organisationunit= Parent organisation unit report_table_parameters= Report table parameters -so_far_this_year= So far this year -so_far_this_financial_year= So far this financial year months_this_year= Months this year quarters_this_year= Quarters this year -selected_report_tables= Selected report tables -available_report_tables= Available report tables add_report_table=Add Report Table add_dataelement_dimension_table=Add Dataelement Dimension Table -preview= Preview generate= Generate -print= Print process_completed= Process completed -process_started=Process started -process_failed=Process failed - See log for details -please_wait= Please wait view= View chart= Chart -view_chart=View chart -create_chart= Create chart -chart_dimension= Chart dimension -add_period_chart= Add period chart -add_organisation_unit_chart= Add organisation unit chart -add_indicator_chart=Add indicator chart -period_by_indicator_chart=Period by indicator chart -period_by_dataelement_chart=Period by data element chart -period_by_completeness_chart=Period by completeness chart -indicator_by_period_chart= Indicator by period chart -dataelement_by_period_chart= Data element by period chart -completeness_by_period_chart= Completeness by period chart -indicator_by_organisation_unit_chart= Indicator by organisation unit chart -dataelement_by_organisation_unit_chart= Data element by organisation unit chart -completeness_by_organisation_unit_chart= Completeness by organisation unit chart -create_indicator_by_period_chart= Create indicator by period chart -create_dataelement_by_period_chart= Create data element by period chart -create_completeness_by_period_chart= Create completeness by period chart -create_indicator_by_organisation_unit_chart= Create indicator by organisation unit chart -create_dataelement_by_organisation_unit_chart= Create data element by organisation unit chart -create_completeness_by_organisation_unit_chart= Create completeness by organisation unit chart dimension= Dimension -category_option_combos= Category Option Combinations -hide_legend= Hide legend -vertical_category_labels= Vertical category labels -horizontal_plot_orientation= Horizontal plot orientation -chart_type= Chart type -bar_chart= Bar chart -bar3d_chart= Bar 3D chart -line_chart= Line chart -line3d_chart= Line 3D chart -pie_chart= Pie chart -pie3d_chart= Pie 3D chart -chart_size= Chart size -normal= Normal -wide= Wide -tall= Tall -title= Title -hide_subtitle= Hide subtitle -value_y_available_indicators= Value (Y) - Available indicators -value_y_selected_indicators= Value (Y) - Selected indicators -value_y_available_dataelements= Value (Y) - Available data elements -value_y_available_datasets= Value (Y) - Available datasets -value_y_selected_dataelements= Value (Y) - Selected data elements -value_y_selected_datasets= Value (Y) - Selected datasets -category_x_available_organisationunits= Category (X) - Available organisation units -category_x_selected_organisationunits= Category (X) - Selected organisation units -category_x_available_periods= Category (X) - Available periods -category_x_selected_periods= Category (X) - Selected periods -filter_available_organisationunits= Filter - Available organisation units -filter_available_periods= Filter - Available periods pivot_table= Pivot Table indicator_group= Indicator group -dataelement_group= Data element 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 -select_level= Select level org_units= Org units get_data= Get data pivot= Pivot data= Data -include_regression_line= Include regression line -include_regression= Include regression -include_target_line= Include target line -target_line_value= Target line value -target_line_label= Target line label select=Select criteria=Criteria this_indicator_and_periods=This indicator and periods @@ -242,67 +115,36 @@ use_data_for_selected_unit_only=Use data for selected unit only add_to_dashboard=Add to dashboard confirm_add_to_dashboard=Are you sure want to add this report to the dashboard? -select_organisation_unit_level=Select organisation unit level resource=Resource -specify_url=Please specify a URL view_report=View report create_new_resource=Create new resource external_url=External URL upload_file=Upload file file=File url=URL -export_to_csv=Export to CSV -export_to_excel=Export to Excel -export_to_html=Export to HTML -display_report_table=Display report table display=Display -column_name=Column name -display_name=Display name visible=Visible column=Column -click_and_drag=Click and drag confirm_add_report_table_to_dashboard=Are you sure you want to add this report table to dashboard? -tally_sheet_generator=Tally Sheet Generator -tally_sheet_step1=Step 1: Choose one Facility -tally_sheet_step2=Step 2: continue=Continue display_facility_name=Display Facility Name use_a3_format=Use A3 format tally_sheet_name=Tally Sheet Name data_element=Data element -tally_rows=Tally rows -type_tally_sheet_name=Please type a desired name of the tally sheet -calculate_tally_rows=Calculate tally rows -select_none=Clear all -tally_sheet=Tally Sheet -edit_tally_rows=(Optional) Edit tally row numbers manually clear=Clear next=Next prev=Prev -prev_year = Prev year -next_year = Next year +prev_year=Prev year +next_year=Next year none=None facility=Facility month=Month year=Year -total=Total -select_dimension=Select dimension -tally_sheet_report=Tally Sheet report -data_completeness_report=Data Completeness Report -configuration=Configuration method=Method -get_updated_data=Get updated aggregated data -use_existing_data=Use existing aggregated data generate_before_export=Please generate table before exporting based_on_registration=Based on complete data set registrations based_on_compulsory=Based on compulsory data elements based_on_ratio=Based on number of registered data values -deleting_existing_aggregated_data= Deleting existing aggregated data -crosstabulating_data= Crosstabulating data -exporting_data_for_data_elements= Exporting data for data elements -exporting_data_for_calculated_data_elements=Exporting data for calculated data elements -exporting_data_for_indicators= Exporting data for indicators -export_process_done= Export process done report_table_process_started=Report table process started report_table_process_done=Report table process done report_table_process_failed=Report table process failed - See log for details @@ -314,23 +156,11 @@ intro_dataset_report=View data set reports. These reports are based on data entry screens and will produce a report with aggregated data. intro_resource=View and add resources. These resources can be uploaded documents or URLs on the web. intro_tally_sheet_generator=Generate tally sheets, which can be printed and used to collect data in the field. -intro_chart=View and add charts. Charts are based on indicators and either organisation units or periods. intro_pivot_table=Browse pivot tables, which can be pivoted on any of the indicator, organisation unit and period dimensions. intro_report_table=Add and generate report tables. Report tables are customizable database tables which can be used as basis for reports. intro_reporting_rate_summary=Browse the reporting rates of data sets by organisation unit and period based on various criteria for submission. intro_orgunit_distribution_report=Browse the organisation unit distribution report based on the organisation unit group sets and its groups. orgunit_distribution_report=Organisation Unit Distribution Report -create_period_by_indicator_chart=Create period by indicator chart -create_period_by_dataelement_chart=Create period by data element chart -create_period_by_completeness_chart=Create period by completeness chart -value_x_selected_indicators=Value (X) - Selected indicators -value_x_available_indicators=Value (X) - Available indicators -value_x_selected_dataelements=Value (X) - Selected data elements -value_x_selected_datasets=Value (X) - Selected datasets -value_x_available_dataelements=Value (X) - Available data elements -value_x_available_datasets=Value (X) - Available datasets -category_y_selected_periods=Value (Y) - Selected periods -category_y_available_periods=Value (Y) - Available periods get_current_design=Get current design organisation_unit_report=Organisation Unit Report select_group_set=Select group set @@ -345,7 +175,6 @@ get_report_as_pdf=Download as PDF get_report_as_jasper=Download as Report get_report_as_jrxml=Download as JRXML -user_organisation_unit=Include current user organisation unit select_category_combo=Select category combination sort_order=Sort order none=None @@ -362,30 +191,7 @@ toggle_fixed_organisation_units=Toggle fixed organisation units group=Group groups=Groups -available_charts=Available charts -available_reports=Available reports -group_members=Group members -number_of_members=Number of members -chart_groups=Chart groups -report_groups=Report groups -report_table_groups=Report table groups -chart_group_management=Chart group management -report_group_management=Report group management -report_table_group_management=Report table group management -create_new_chart_group=Create a new chart group -create_new_report_group=Create a new report group -create_new_report_table_group=Create a new report table group -edit_chart_group=Edit existing chart group -edit_report_group=Edit existing report group -edit_report_table_group=Edit existing report table group -intro_chart_groups=Create, modify, view and delete chart groups. Groups are used for improved analysis. -intro_report_groups=Create, modify, view and delete report groups. Groups are used for improved analysis. -intro_report_table_groups=Create, modify, view and delete report table groups. Groups are used for improved analysis. -confirm_delete=Are you sure you want to delete this object ? -stacked_bar_chart=Stacked bar chart -stacked_bar3d_chart=Stacked 3D bar chart -domain_axis_label_x=Domain axis label (x) -range_axis_label_y=Range axis label (y) +confirm_delete=Are you sure you want to delete this object? leaf_parent_organisation_unit=Leaf organisation units reporting_bimonth=Reporting bimonth reporting_quarter=Reporting quarter @@ -395,16 +201,12 @@ last_12_months=Last 12 months last_4_quarters=Last 4 quarters reporting_rate_summary=Reporting Rate Summary -last_month=Last month -last_quarter=Last quarter -last_six_month=Last six-month -last_2_sixmonths=Last 2 six-months available_organisation_unit_groups=Available organisation unit groups selected_organisation_unit_groups=Selected organisation unit groups -data_mart = Data Mart -data_mart_management = Data mart management -start_date = Start date -end_date = End date -start_export = Start export -period_types = Period types -include_cumulative = Include cumulative \ No newline at end of file +data_mart=Data Mart +data_mart_management=Data mart management +start_date=Start date +end_date=End date +start_export=Start export +period_types=Period types +include_cumulative=Include cumulative \ No newline at end of file === modified file 'dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/addTableForm.vm' --- dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/addTableForm.vm 2012-02-20 10:20:01 +0000 +++ dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/addTableForm.vm 2012-02-21 14:12:02 +0000 @@ -328,7 +328,7 @@ -Toggle fixed organisation units  +$i18n.getString( "toggle_fixed_organisation_units" )  -Toggle fixed periods  +$i18n.getString( "toggle_fixed_periods" )