← Back to team overview

dhis2-devs team mailing list archive

[Branch ~dhis2-devs-core/dhis2/trunk] Rev 4196: Fixed deletion handler for ReportTableGroup. And finished the common GUI for ChartGroup, ReportGr...

 

------------------------------------------------------------
revno: 4196
committer: Hieu <hieu.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Fri 2011-07-22 14:14:57 +0700
message:
  Fixed deletion handler for ReportTableGroup. And finished the common GUI for ChartGroup, ReportGroup and ReportTableGroup.
added:
  dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/icons/groups.png
  dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/viewGroups.vm
modified:
  dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/deletion/DeletionHandler.java
  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_vi_VN.properties
  dhis-2/dhis-web/dhis-web-reporting/src/main/resources/struts.xml
  dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/addReportTableGroupForm.vm
  dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/index.vm
  dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/javascript/updateChartGroupForm.js
  dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/javascript/updateReportGroupForm.js
  dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/javascript/updateReportTableGroupForm.js
  dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/menu.vm
  dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/reportTableGroup.vm
  dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/updateReportTableGroupForm.vm


--
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-support/dhis-support-system/src/main/java/org/hisp/dhis/system/deletion/DeletionHandler.java'
--- dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/deletion/DeletionHandler.java	2011-07-21 09:11:58 +0000
+++ dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/deletion/DeletionHandler.java	2011-07-22 07:14:57 +0000
@@ -80,6 +80,7 @@
 import org.hisp.dhis.report.Report;
 import org.hisp.dhis.report.ReportGroup;
 import org.hisp.dhis.reporttable.ReportTable;
+import org.hisp.dhis.reporttable.ReportTableGroup;
 import org.hisp.dhis.user.User;
 import org.hisp.dhis.user.UserAuthorityGroup;
 import org.hisp.dhis.user.UserCredentials;
@@ -391,11 +392,11 @@
         return true;
     }
 
-    public void deleteReportTableGroup( ReportTable group )
+    public void deleteReportTableGroup( ReportTableGroup group )
     {
     }
 
-    public boolean allowReportTableGroup( ReportTable group )
+    public boolean allowReportTableGroup( ReportTableGroup group )
     {
         return true;
     }

=== added file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/icons/groups.png'
Binary files dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/icons/groups.png	1970-01-01 00:00:00 +0000 and dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/icons/groups.png	2011-07-22 07:14:57 +0000 differ
=== 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	2011-07-07 13:29:56 +0000
+++ dhis-2/dhis-web/dhis-web-reporting/src/main/resources/org/hisp/dhis/reporting/i18n_module.properties	2011-07-22 07:14:57 +0000
@@ -357,4 +357,26 @@
 available_dataset_completeness_percentages = Available data set completeness percentages
 selected_dataset_completeness_percentages = Selected data set completeness percentages
 toggle_fixed_periods = Toggle fixed periods
-toggle_fixed_organisation_units = Toggle fixed organisation units
\ No newline at end of file
+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 ?
\ No newline at end of file

=== modified file 'dhis-2/dhis-web/dhis-web-reporting/src/main/resources/org/hisp/dhis/reporting/i18n_module_vi_VN.properties'
--- dhis-2/dhis-web/dhis-web-reporting/src/main/resources/org/hisp/dhis/reporting/i18n_module_vi_VN.properties	2011-02-22 08:41:34 +0000
+++ dhis-2/dhis-web/dhis-web-reporting/src/main/resources/org/hisp/dhis/reporting/i18n_module_vi_VN.properties	2011-07-22 07:14:57 +0000
@@ -1,156 +1,156 @@
-yearly=M\u1ED9t n\u0103m
+yearly=M\u1ed9t n\u0103m
 year=N\u0103m
-wide=R\u1ED9ng
-weekly=H\u00E0ng tu\u1EA7n
-visible=Hi\u1EC3n th\u1ECB
-view_standard_report=Xem b\u00E1o c\u00E1o c\u01A1 b\u1EA3n
-view_report_based_on_existing_datasource=Xem b\u00E1o c\u00E1o v\u1EDBi ngu\u1ED3n d\u1EEF li\u1EC7u \u0111ang c\u00F3
-view_report=Xem b\u00E1o c\u00E1o
-view_dataset_report=Xem b\u00E1o c\u00E1o t\u1EADp h\u1EE3p d\u1EEF li\u1EC7u
-view_data_completeness=Xem s\u1EF1 ho\u00E0n ch\u1EC9nh d\u1EEF li\u1EC7u
-view_chart=Xem bi\u1EC3u \u0111\u1ED3
+wide=R\u1ed9ng
+weekly=H\u00e0ng tu\u1ea7n
+visible=Hi\u1ec3n th\u1ecb
+view_standard_report=Xem b\u00e1o c\u00e1o c\u01a1 b\u1ea3n
+view_report_based_on_existing_datasource=Xem b\u00e1o c\u00e1o v\u1edbi ngu\u1ed3n d\u1eef li\u1ec7u \u0111ang c\u00f3
+view_report=Xem b\u00e1o c\u00e1o
+view_dataset_report=Xem b\u00e1o c\u00e1o t\u1eadp h\u1ee3p d\u1eef li\u1ec7u
+view_data_completeness=Xem s\u1ef1 ho\u00e0n ch\u1ec9nh d\u1eef li\u1ec7u
+view_chart=Xem bi\u1ec3u \u0111\u1ed3
 view=Xem
-vertical_category_labels=C\u00E1c ti\u00EAu \u0111\u1EC1 ph\u00E2n lo\u1EA1i h\u00E0ng d\u1ECDc
-value_y_selected_indicators=Gi\u00E1 tr\u1ECB (Y) - C\u00E1c ch\u1EC9 s\u1ED1 \u0111\u01B0\u1EE3c ch\u1ECDn
-value_y_available_indicators=Gi\u00E1 tr\u1ECB (X) - C\u00E1c ch\u1EC9 s\u1ED1 c\u00F3 s\u1EB5n
-value_x_selected_indicators=Gi\u00E1 tr\u1ECB (X) - C\u00E1c ch\u1EC9 s\u1ED1 \u0111\u01B0\u1EE3c ch\u1ECDn
-value_x_available_indicators=Gi\u00E1 tr\u1ECB (X) - C\u00E1c ch\u1EC9 s\u1ED1 c\u00F3 s\u1EB5n
-use_existing_data=D\u00F9ng d\u1EEF li\u1EC7u \u0111\u00E3 t\u1ED5ng h\u1EE3p l\u1EA7n tr\u01B0\u1EDBc
-use_data_for=D\u00F9ng d\u1EEF li\u1EC7u cho
-use_a3_format=D\u00F9ng m\u1EABu A3
-url=\u0110\u01B0\u1EDDng d\u1EABn URL
-upload_file=N\u1EA1p l\u00EAn m\u1ED9t t\u1EADp tin
-type_tally_sheet_name=H\u00E3y nh\u1EADp v\u00E0o t\u00EAn c\u1EE7a b\u1EA3ng ki\u1EC3m \u0111\u1EBFm
+vertical_category_labels=C\u00e1c ti\u00eau \u0111\u1ec1 ph\u00e2n lo\u1ea1i h\u00e0ng d\u1ecdc
+value_y_selected_indicators=Gi\u00e1 tr\u1ecb (Y) - C\u00e1c ch\u1ec9 s\u1ed1 \u0111\u01b0\u1ee3c ch\u1ecdn
+value_y_available_indicators=Gi\u00e1 tr\u1ecb (X) - C\u00e1c ch\u1ec9 s\u1ed1 c\u00f3 s\u1eb5n
+value_x_selected_indicators=Gi\u00e1 tr\u1ecb (X) - C\u00e1c ch\u1ec9 s\u1ed1 \u0111\u01b0\u1ee3c ch\u1ecdn
+value_x_available_indicators=Gi\u00e1 tr\u1ecb (X) - C\u00e1c ch\u1ec9 s\u1ed1 c\u00f3 s\u1eb5n
+use_existing_data=D\u00f9ng d\u1eef li\u1ec7u \u0111\u00e3 t\u1ed5ng h\u1ee3p l\u1ea7n tr\u01b0\u1edbc
+use_data_for=D\u00f9ng d\u1eef li\u1ec7u cho
+use_a3_format=D\u00f9ng m\u1eabu A3
+url=\u0110\u01b0\u1eddng d\u1eabn URL
+upload_file=N\u1ea1p l\u00ean m\u1ed9t t\u1eadp tin
+type_tally_sheet_name=H\u00e3y nh\u1eadp v\u00e0o t\u00ean c\u1ee7a b\u1ea3ng ki\u1ec3m \u0111\u1ebfm
 type_tally_sheet_name=
-two_yearly=M\u1ED7i 2 n\u0103m
+two_yearly=M\u1ed7i 2 n\u0103m
 two_yearly=Hai n\u0103m
-total=T\u1ED5ng
-title_in_use=Ti\u00EAu \u0111\u1EC1 n\u00E0y \u0111\u00E3 \u0111\u01B0\u1EE3c d\u00F9ng
-title=Ti\u00EAu \u0111\u1EC1
-this_indicator_and_periods=Ch\u1EC9 s\u1ED1 v\u00E0 th\u1EDDi \u0111i\u1EC3m n\u00E0y
-this_indicator_and_orgunits=Ch\u1EC9 s\u1ED1 v\u00E0 \u0111\u01A1n v\u1ECB n\u00E0y
-tally_sheet_step2=B\u01B0\u1EDBc 2\: 
-tally_sheet_step1=B\u01B0\u1EDBc 1\: Ch\u1ECDn m\u1ED9t \u0111\u01A1n v\u1ECB
-tally_sheet_report=B\u00E1o c\u00E1o b\u1EA3ng ki\u1EC3m \u0111\u1EBFm
-tally_sheet_name=T\u00EAn b\u1EA3ng ki\u1EC3m \u0111\u1EBFm
-tally_sheet_generator=B\u1ED9 t\u1EA1o b\u1EA3ng ki\u1EC3m \u0111\u1EBFm
-tally_sheet=B\u1EA3ng ki\u1EC3m \u0111\u1EBFm
-tally_rows=Ki\u1EC3m \u0111\u1EBFm h\u00E0ng
-tall=Ki\u1EC3m \u0111\u1EBFm
-table_name=T\u00EAn b\u1EA3ng
-submit=N\u1ED9p
-static_report=B\u00E1o c\u00E1o t\u0129nh
-start_date=Ng\u00E0y b\u1EAFt \u0111\u1EA7u
-standard_report=B\u00E1o c\u00E1o c\u01A1 b\u1EA3n
-specify_url=H\u00E3y \u0111\u1EB7t m\u1ED9t \u0111\u01B0\u1EDDng d\u1EABn
-specify_title=H\u00E3y \u0111\u1EB7t m\u1ED9t ti\u00EAu \u0111\u1EC1
-specify_name=H\u00E3y \u0111\u1EB7t m\u1ED9t t\u00EAn
-so_far_this_year=T\u00EDnh t\u1EEB \u0111\u1EA7u n\u0103m cho \u0111\u1EBFn nay
-so_far_this_financial_year=T\u00EDnh t\u1EEB \u0111\u1EA7u n\u0103m t\u00E0i ch\u00EDnh \u0111\u1EBFn nay
-skip_data_mart=B\u1ECF qua d\u1EEF li\u1EC7u t\u1ED5ng h\u1EE3p
-six_monthly=M\u1ED7i 6 th\u00E1ng
-show_details=Th\u00F4ng tin chi ti\u1EBFt 
-set_configuration=H\u00E3y \u0111\u1EB7t c\u1EA5u h\u00ECnh \u0111\u1EC3 ch\u1EE9c n\u0103ng b\u00E1o c\u00E1o ho\u1EA1t \u0111\u1ED9ng \u0111\u00FAng
-selected_unit_only=ch\u1EC9 ch\u1ECDn \u0111\u01A1n v\u1ECB
-selected_report_tables=C\u00E1c b\u1EA3ng b\u00E1o c\u00E1o \u0111\u01B0\u1EE3c ch\u1ECDn
-selected_periods=C\u00E1c th\u1EDDi \u0111i\u1EC3m \u0111\u01B0\u1EE3c ch\u1ECDn
-selected_organisationunits=C\u00E1c \u0111\u01A1n v\u1ECB \u0111ang \u0111\u01B0\u1EE3c ch\u1ECDn
-selected_indicators=Ch\u1ECDn ch\u1EC9 s\u1ED1
-selected_datasets=C\u00E1c t\u1EADp h\u1EE3p d\u1EEF li\u1EC7u \u0111ang ch\u1ECDn
-selected_dataelements=C\u00E1c ph\u1EA7n t\u1EED d\u1EEF li\u1EC7u \u0111ang \u0111\u01B0\u1EE3c ch\u1ECDn
-select_table=Ch\u1ECDn b\u1EA3ng
+total=T\u1ed5ng
+title_in_use=Ti\u00eau \u0111\u1ec1 n\u00e0y \u0111\u00e3 \u0111\u01b0\u1ee3c d\u00f9ng
+title=Ti\u00eau \u0111\u1ec1
+this_indicator_and_periods=Ch\u1ec9 s\u1ed1 v\u00e0 th\u1eddi \u0111i\u1ec3m n\u00e0y
+this_indicator_and_orgunits=Ch\u1ec9 s\u1ed1 v\u00e0 \u0111\u01a1n v\u1ecb n\u00e0y
+tally_sheet_step2=B\u01b0\u1edbc 2\: 
+tally_sheet_step1=B\u01b0\u1edbc 1\: Ch\u1ecdn m\u1ed9t \u0111\u01a1n v\u1ecb
+tally_sheet_report=B\u00e1o c\u00e1o b\u1ea3ng ki\u1ec3m \u0111\u1ebfm
+tally_sheet_name=T\u00ean b\u1ea3ng ki\u1ec3m \u0111\u1ebfm
+tally_sheet_generator=B\u1ed9 t\u1ea1o b\u1ea3ng ki\u1ec3m \u0111\u1ebfm
+tally_sheet=B\u1ea3ng ki\u1ec3m \u0111\u1ebfm
+tally_rows=Ki\u1ec3m \u0111\u1ebfm h\u00e0ng
+tall=Ki\u1ec3m \u0111\u1ebfm
+table_name=T\u00ean b\u1ea3ng
+submit=N\u1ed9p
+static_report=B\u00e1o c\u00e1o t\u0129nh
+start_date=Ng\u00e0y b\u1eaft \u0111\u1ea7u
+standard_report=B\u00e1o c\u00e1o c\u01a1 b\u1ea3n
+specify_url=H\u00e3y \u0111\u1eb7t m\u1ed9t \u0111\u01b0\u1eddng d\u1eabn
+specify_title=H\u00e3y \u0111\u1eb7t m\u1ed9t ti\u00eau \u0111\u1ec1
+specify_name=H\u00e3y \u0111\u1eb7t m\u1ed9t t\u00ean
+so_far_this_year=T\u00ednh t\u1eeb \u0111\u1ea7u n\u0103m cho \u0111\u1ebfn nay
+so_far_this_financial_year=T\u00ednh t\u1eeb \u0111\u1ea7u n\u0103m t\u00e0i ch\u00ednh \u0111\u1ebfn nay
+skip_data_mart=B\u1ecf qua d\u1eef li\u1ec7u t\u1ed5ng h\u1ee3p
+six_monthly=M\u1ed7i 6 th\u00e1ng
+show_details=Th\u00f4ng tin chi ti\u1ebft 
+set_configuration=H\u00e3y \u0111\u1eb7t c\u1ea5u h\u00ecnh \u0111\u1ec3 ch\u1ee9c n\u0103ng b\u00e1o c\u00e1o ho\u1ea1t \u0111\u1ed9ng \u0111\u00fang
+selected_unit_only=ch\u1ec9 ch\u1ecdn \u0111\u01a1n v\u1ecb
+selected_report_tables=C\u00e1c b\u1ea3ng b\u00e1o c\u00e1o \u0111\u01b0\u1ee3c ch\u1ecdn
+selected_periods=C\u00e1c th\u1eddi \u0111i\u1ec3m \u0111\u01b0\u1ee3c ch\u1ecdn
+selected_organisationunits=C\u00e1c \u0111\u01a1n v\u1ecb \u0111ang \u0111\u01b0\u1ee3c ch\u1ecdn
+selected_indicators=Ch\u1ecdn ch\u1ec9 s\u1ed1
+selected_datasets=C\u00e1c t\u1eadp h\u1ee3p d\u1eef li\u1ec7u \u0111ang ch\u1ecdn
+selected_dataelements=C\u00e1c ph\u1ea7n t\u1eed d\u1eef li\u1ec7u \u0111ang \u0111\u01b0\u1ee3c ch\u1ecdn
+select_table=Ch\u1ecdn b\u1ea3ng
 select_report_table_none=Select report table / none
-select_report_table_none=Ch\u1ECDn b\u1EA3ng b\u00E1o c\u00E1o / Kh\u00F4ng ch\u1ECDn g\u00EC c\u1EA3
+select_report_table_none=Ch\u1ecdn b\u1ea3ng b\u00e1o c\u00e1o / Kh\u00f4ng ch\u1ecdn g\u00ec c\u1ea3
 select_report_table_none					= Select report table / none
-select_report_table=Ch\u1ECDn b\u1EA3ng b\u00E1o c\u00E1o
-select_period_type_all=Ch\u1ECDn lo\u1EA1i th\u1EDDi \u0111i\u1EC3m / Xem t\u1EA5t c\u1EA3
-select_period_type=Ch\u1ECDn lo\u1EA1i th\u1EDDi \u0111i\u1EC3m
-select_period=H\u00E3y ch\u1ECDn th\u1EDDi \u0111i\u1EC3m
-select_organisationunit_level_all=Ch\u1ECDn \u0111\u01A1n v\u1ECB c\u00F3 c\u1EA5p / Hi\u1EC3n th\u1ECB t\u1EA5t c\u1EA3
-select_organisation_unit_level=H\u00E3y ch\u1ECDn m\u1ED9t c\u1EA5p \u0111\u01A1n v\u1ECB
-select_organisation_unit=H\u00E3y ch\u1ECDn m\u1ED9t \u0111\u01A1n v\u1ECB
-select_none=X\u00F3a t\u1EA5t c\u1EA3
-select_level=Ch\u1ECDn c\u1EA5p
-select_indicatorgroup_all=Ch\u1ECDn nh\u00F3m ch\u1EC9 s\u1ED1 / Hi\u1EC3n th\u1ECB t\u1EA5t c\u00E1
-select_group_set=Ch\u1ECDn nh\u00F3m
-select_file=Ch\u1ECDn t\u1EADp tin
-select_dimension=Ch\u1ECDn m\u1ED9t chi\u1EC1u d\u1EEF li\u1EC7u
-select_dataset_all=Ch\u1ECDn t\u1EADp h\u1EE3p d\u1EEF li\u1EC7u
-select_dataset=Ch\u1ECDn m\u1ED9t t\u1EADp h\u1EE3p d\u1EEF li\u1EC7u
-select_dataelementgroup_all=Ch\u1ECDn nh\u00F3m ph\u1EA7n t\u1EED d\u1EEF li\u1EC7u / Ch\u1ECDn t\u1EA5t c\u1EA3
+select_report_table=Ch\u1ecdn b\u1ea3ng b\u00e1o c\u00e1o
+select_period_type_all=Ch\u1ecdn lo\u1ea1i th\u1eddi \u0111i\u1ec3m / Xem t\u1ea5t c\u1ea3
+select_period_type=Ch\u1ecdn lo\u1ea1i th\u1eddi \u0111i\u1ec3m
+select_period=H\u00e3y ch\u1ecdn th\u1eddi \u0111i\u1ec3m
+select_organisationunit_level_all=Ch\u1ecdn \u0111\u01a1n v\u1ecb c\u00f3 c\u1ea5p / Hi\u1ec3n th\u1ecb t\u1ea5t c\u1ea3
+select_organisation_unit_level=H\u00e3y ch\u1ecdn m\u1ed9t c\u1ea5p \u0111\u01a1n v\u1ecb
+select_organisation_unit=H\u00e3y ch\u1ecdn m\u1ed9t \u0111\u01a1n v\u1ecb
+select_none=X\u00f3a t\u1ea5t c\u1ea3
+select_level=Ch\u1ecdn c\u1ea5p
+select_indicatorgroup_all=Ch\u1ecdn nh\u00f3m ch\u1ec9 s\u1ed1 / Hi\u1ec3n th\u1ecb t\u1ea5t c\u00e1
+select_group_set=Ch\u1ecdn nh\u00f3m
+select_file=Ch\u1ecdn t\u1eadp tin
+select_dimension=Ch\u1ecdn m\u1ed9t chi\u1ec1u d\u1eef li\u1ec7u
+select_dataset_all=Ch\u1ecdn t\u1eadp h\u1ee3p d\u1eef li\u1ec7u
+select_dataset=Ch\u1ecdn m\u1ed9t t\u1eadp h\u1ee3p d\u1eef li\u1ec7u
+select_dataelementgroup_all=Ch\u1ecdn nh\u00f3m ph\u1ea7n t\u1eed d\u1eef li\u1ec7u / Ch\u1ecdn t\u1ea5t c\u1ea3
 select_dataelementgroup_all					= Ch\u1ecdn nh\u00f3m ph\u1ea7n t\u1eed d\u1eef li\u1ec7u / Ch\u1ecdn t\u1ea5t c\u1ea3
-select_data_set=H\u00E3y ch\u1ECDn m\u1ED9t t\u1EADp d\u1EEF li\u1EC7u
-select_category_combo=Ch\u1ECDn nh\u00F3m ph\u00E2n lo\u1EA1i
-select=Ch\u1ECDn
-save=L\u01B0u
-reporting_unit=\u0110\u01A1n v\u1ECB b\u00E1o c\u00E1o
-reporting_period=Th\u1EDDi \u0111i\u1EC3m b\u00E1o c\u00E1o
-reporting_organisation_unit=\u0110\u01A1n v\u1ECB b\u00E1o c\u00E1o
-reporting_month=B\u00E1o c\u00E1o h\u00E0ng th\u00E1ng
-reporting_deadline=K\u1EF3 h\u1EA1n b\u00E1o c\u00E1o
-report_table_process_started=Ti\u1EBFn tr\u00ECnh t\u1EA1o b\u1EA3ng b\u00E1o c\u00E1o \u0111\u00E3 b\u1EAFt \u0111\u1EA7u
-report_table_process_failed=L\u1ED7i khi th\u1EF1c hi\u1EC7n t\u1EA1o c\u00E1c b\u1EA3ng b\u00E1o c\u00E1o - Xem chi ti\u1EBFt \u1EDF nh\u1EADt k\u00FD
-report_table_process_done=Ho\u00E0n t\u1EA5t ti\u1EBFn tr\u00ECnh c\u1EE7a b\u1EA3ng b\u00E1o c\u00E1o
-report_table_parameters=Tham s\u1ED1 b\u1EA3ng b\u00E1o c\u00E1o
-report_table_management=Qu\u1EA3n l\u00FD b\u1EA3ng b\u00E1o c\u00E1o
+select_data_set=H\u00e3y ch\u1ecdn m\u1ed9t t\u1eadp d\u1eef li\u1ec7u
+select_category_combo=Ch\u1ecdn nh\u00f3m ph\u00e2n lo\u1ea1i
+select=Ch\u1ecdn
+save=L\u01b0u
+reporting_unit=\u0110\u01a1n v\u1ecb b\u00e1o c\u00e1o
+reporting_period=Th\u1eddi \u0111i\u1ec3m b\u00e1o c\u00e1o
+reporting_organisation_unit=\u0110\u01a1n v\u1ecb b\u00e1o c\u00e1o
+reporting_month=B\u00e1o c\u00e1o h\u00e0ng th\u00e1ng
+reporting_deadline=K\u1ef3 h\u1ea1n b\u00e1o c\u00e1o
+report_table_process_started=Ti\u1ebfn tr\u00ecnh t\u1ea1o b\u1ea3ng b\u00e1o c\u00e1o \u0111\u00e3 b\u1eaft \u0111\u1ea7u
+report_table_process_failed=L\u1ed7i khi th\u1ef1c hi\u1ec7n t\u1ea1o c\u00e1c b\u1ea3ng b\u00e1o c\u00e1o - Xem chi ti\u1ebft \u1edf nh\u1eadt k\u00fd
+report_table_process_done=Ho\u00e0n t\u1ea5t ti\u1ebfn tr\u00ecnh c\u1ee7a b\u1ea3ng b\u00e1o c\u00e1o
+report_table_parameters=Tham s\u1ed1 b\u1ea3ng b\u00e1o c\u00e1o
+report_table_management=Qu\u1ea3n l\u00fd b\u1ea3ng b\u00e1o c\u00e1o
 report_table=Report table
-report_table=B\u1EA3ng b\u00E1o c\u00E1o
-report_parameters=Tham s\u1ED1 b\u00E1o c\u00E1o
-report_management=Qu\u1EA3n l\u00FD b\u00E1o c\u00E1o
-report_configuration=C\u1EA5u h\u00ECnh b\u00E1o c\u00E1o
-report=B\u00E1o c\u00E1o
-remove_selected=B\u1ECF m\u1EE5c \u0111ang ch\u1ECDn
-remove_report=X\u00F3a b\u00E1o c\u00E1o
-remove_all=B\u1ECF t\u1EA5t c\u1EA3
-remove=X\u00F3a
-relative_periods=C\u00E1c th\u1EDDi \u0111i\u1EC3m c\u00F3 li\u00EAn h\u1EC7
-refresh_datamart=C\u1EADp nh\u1EADt d\u1EEF li\u1EC7u t\u1ED5ng h\u1EE3p
-quarterly=H\u00E0ng qu\u00FD
-processing=\u0110ang x\u1EED l\u00FD
-process_started=Ti\u1EBFn tr\u00ECnh \u0111\u00E3 b\u1EAFt \u0111\u1EA7u
-process_failed=Ti\u1EBFn tr\u00ECnh b\u1ECB l\u1ED7i - Xem chi ti\u1EBFt \u1EDF nh\u1EADt k\u00FD
-process_done=Ho\u00E0n t\u1EA5t
-process_completed=Ti\u1EBFn tr\u00ECnh ho\u00E0n t\u1EA5t
+report_table=B\u1ea3ng b\u00e1o c\u00e1o
+report_parameters=Tham s\u1ed1 b\u00e1o c\u00e1o
+report_management=Qu\u1ea3n l\u00fd b\u00e1o c\u00e1o
+report_configuration=C\u1ea5u h\u00ecnh b\u00e1o c\u00e1o
+report=B\u00e1o c\u00e1o
+remove_selected=B\u1ecf m\u1ee5c \u0111ang ch\u1ecdn
+remove_report=X\u00f3a b\u00e1o c\u00e1o
+remove_all=B\u1ecf t\u1ea5t c\u1ea3
+remove=X\u00f3a
+relative_periods=C\u00e1c th\u1eddi \u0111i\u1ec3m c\u00f3 li\u00ean h\u1ec7
+refresh_datamart=C\u1eadp nh\u1eadt d\u1eef li\u1ec7u t\u1ed5ng h\u1ee3p
+quarterly=H\u00e0ng qu\u00fd
+processing=\u0110ang x\u1eed l\u00fd
+process_started=Ti\u1ebfn tr\u00ecnh \u0111\u00e3 b\u1eaft \u0111\u1ea7u
+process_failed=Ti\u1ebfn tr\u00ecnh b\u1ecb l\u1ed7i - Xem chi ti\u1ebft \u1edf nh\u1eadt k\u00fd
+process_done=Ho\u00e0n t\u1ea5t
+process_completed=Ti\u1ebfn tr\u00ecnh ho\u00e0n t\u1ea5t
 print=In ra
-preview=Xem tr\u01B0\u1EDBc
+preview=Xem tr\u01b0\u1edbc
 preview=Preview
-prev=Quay l\u1EA1i
-please_wait=Vui l\u00F2ng ch\u1EDD
-please_select_period=H\u00E3y ch\u1ECDn m\u1ED9t th\u1EDDi \u0111i\u1EC3m
-please_select_an_orgUnit=H\u00E3y ch\u1ECDn m\u1ED9t \u0111\u01A1n v\u1ECB
-please_select_a_dataset=H\u00E3y ch\u1ECDn m\u1ED9t t\u1EADp d\u1EEF li\u1EC7u
-pivot_table=B\u1EA3ng xoay
-pivot=B\u1EA3ng xoay
-periods=Th\u1EDDi \u0111i\u1EC3m
-period_type=Lo\u1EA1i th\u1EDDi \u0111i\u1EC3m
-parent_organisationunit=\u0110\u01A1n v\u1ECB cha
-parent_organisation_unit=\u0110\u01A1n v\u1ECB cha
-orgunit_distribution_report=\u0110\u01A1n v\u1ECB b\u00E1o c\u00E1o ph\u00E2n t\u00E1n
-orgunit_distribution=\u0110\u01A1n v\u1ECB b\u00E1o c\u00E1o ph\u00E2n t\u00E1n
-organisation_units=\u0110\u01A1n v\u1ECB
-organisation_unit_level=C\u1EA5p \u0111\u01A1n v\u1ECB
-organisation_unit=\u0110\u01A1n v\u1ECB
-org_units=C\u00E1c \u0111\u01A1n v\u1ECB
-operations=Thao t\u00E1c
+prev=Quay l\u1ea1i
+please_wait=Vui l\u00f2ng ch\u1edd
+please_select_period=H\u00e3y ch\u1ecdn m\u1ed9t th\u1eddi \u0111i\u1ec3m
+please_select_an_orgUnit=H\u00e3y ch\u1ecdn m\u1ed9t \u0111\u01a1n v\u1ecb
+please_select_a_dataset=H\u00e3y ch\u1ecdn m\u1ed9t t\u1eadp d\u1eef li\u1ec7u
+pivot_table=B\u1ea3ng xoay
+pivot=B\u1ea3ng xoay
+periods=Th\u1eddi \u0111i\u1ec3m
+period_type=Lo\u1ea1i th\u1eddi \u0111i\u1ec3m
+parent_organisationunit=\u0110\u01a1n v\u1ecb cha
+parent_organisation_unit=\u0110\u01a1n v\u1ecb cha
+orgunit_distribution_report=\u0110\u01a1n v\u1ecb b\u00e1o c\u00e1o ph\u00e2n t\u00e1n
+orgunit_distribution=\u0110\u01a1n v\u1ecb b\u00e1o c\u00e1o ph\u00e2n t\u00e1n
+organisation_units=\u0110\u01a1n v\u1ecb
+organisation_unit_level=C\u1ea5p \u0111\u01a1n v\u1ecb
+organisation_unit=\u0110\u01a1n v\u1ecb
+org_units=C\u00e1c \u0111\u01a1n v\u1ecb
+operations=Thao t\u00e1c
 omit_report_table_explanation=If selecting no report table, the user is responsible for providing the data source table
 ok=OK
 offset_days=Offset days
 nr_of_days=Number of days
-normal=B\u00ECnh th\u01B0\u1EDDng
-no_process_running=Kh\u00F4ng ti\u1EBFn tr\u00ECnh n\u00E0o \u0111ang ch\u1EA1y
-next=K\u1EBF ti\u1EBFp
-name_in_use=T\u00EAn n\u00E0y \u0111ang \u0111\u01B0\u1EE3c d\u00F9ng
-must_select_at_least_one_unit=Ph\u1EA3i ch\u1ECDn \u00EDt nh\u1EA5t m\u1ED9t \u0111\u01A1n v\u1ECB
-must_select_at_least_one_period=Ph\u1EA3i ch\u1ECDn \u00EDt nh\u1EA5t m\u1ED9t th\u1EDDi \u0111i\u1EC3m
-must_select_at_least_one_indicator=Ph\u1EA3i ch\u1ECDn \u00EDt nh\u1EA5t m\u1ED9t ch\u1EC9 s\u1ED1
-must_select_at_least_one_dataelement=Ph\u1EA3i ch\u1ECDn \u00EDt nh\u1EA5t m\u1ED9t ph\u1EA7n t\u1EED d\u1EEF li\u1EC7u
-must_enter_name=Ch\u01B0a nh\u1EADp t\u00EAn
-monthly=H\u00E0ng th\u00E1ng
-month=Th\u00E1ng
-method=C\u00E1ch th\u1EE9c
-manage_report_table=Qu\u1EA3n l\u00FD report table
-line_chart=Bi\u1EC3u \u0111\u1ED3 d\u1EA1ng \u0111\u01B0\u1EDDng
-level=C\u1EA5p
+normal=B\u00ecnh th\u01b0\u1eddng
+no_process_running=Kh\u00f4ng ti\u1ebfn tr\u00ecnh n\u00e0o \u0111ang ch\u1ea1y
+next=K\u1ebf ti\u1ebfp
+name_in_use=T\u00ean n\u00e0y \u0111ang \u0111\u01b0\u1ee3c d\u00f9ng
+must_select_at_least_one_unit=Ph\u1ea3i ch\u1ecdn \u00edt nh\u1ea5t m\u1ed9t \u0111\u01a1n v\u1ecb
+must_select_at_least_one_period=Ph\u1ea3i ch\u1ecdn \u00edt nh\u1ea5t m\u1ed9t th\u1eddi \u0111i\u1ec3m
+must_select_at_least_one_indicator=Ph\u1ea3i ch\u1ecdn \u00edt nh\u1ea5t m\u1ed9t ch\u1ec9 s\u1ed1
+must_select_at_least_one_dataelement=Ph\u1ea3i ch\u1ecdn \u00edt nh\u1ea5t m\u1ed9t ph\u1ea7n t\u1eed d\u1eef li\u1ec7u
+must_enter_name=Ch\u01b0a nh\u1eadp t\u00ean
+monthly=H\u00e0ng th\u00e1ng
+month=Th\u00e1ng
+method=C\u00e1ch th\u1ee9c
+manage_report_table=Qu\u1ea3n l\u00fd report table
+line_chart=Bi\u1ec3u \u0111\u1ed3 d\u1ea1ng \u0111\u01b0\u1eddng
+level=C\u1ea5p
 last_9_to_12_months=Last 9 to 12 months
 last_9_months=Last 9 months
 last_6_to_9_months=Last 6 to 9 months
@@ -159,173 +159,195 @@
 last_3_months=Last 3 months
 last_12_months=Last 12 months
 last_12_individual_months=Last 12 individual months
-intro_tally_sheet_generator=T\u1EA1o ra c\u00E1c b\u1EA3ng \u0111\u1EBFm \u0111\u1EC3 in v\u00E0 c\u00F3 th\u1EC3 s\u1EED d\u1EE5ng cho thu th\u1EADp d\u1EEF li\u1EC7u.
-intro_static_report=Xem v\u00E0 th\u00EAm c\u00E1c b\u00E1o c\u00E1o t\u0129nh. C\u00E1c b\u00E1o c\u00E1o n\u00E0y c\u00F3 th\u1EC3 \u0111\u01B0\u1EE3c n\u1EA1p l\u00EAn d\u1EA1ng\: t\u00E0i li\u1EC7u hay l\u00E0 \u0111\u01B0\u1EDDng d\u1EABn tr\u00EAn web.
-intro_standard_report=Xem v\u00E0 th\u00EAm c\u00E1c b\u00E1o c\u00E1o c\u01A1 b\u1EA3n. C\u00E1c b\u00E1o c\u00E1o n\u00E0y d\u00F9ng d\u1EEF li\u1EC7u l\u00E0 c\u00E1c b\u1EA3ng b\u00E1o c\u00E1o \u0111\u00E3 \u0111\u01B0\u1EE3c thi\u1EBFt k\u1EBF v\u1EDBi tr\u00ECnh thi\u1EBFt k\u1EBF BIRT hay l\u00E0 JasperReport
-intro_report_table=Th\u00EAm v\u00E0 t\u1EA1o ra c\u00E1c b\u1EA3ng b\u00E1o c\u00E1o. C\u00E1c b\u1EA3ng b\u00E1o c\u00E1o l\u00E0 c\u00E1c b\u1EA3ng c\u01A1 s\u1EDF d\u1EEF li\u1EC7u \u0111\u01B0\u1EE3c \u0111i\u1EC1u ch\u1EC9nh t\u00F9y ch\u1ECDn \u0111\u1EC3 c\u00F3 th\u1EC3 \u0111\u01B0\u1EE3c d\u00F9ng nh\u01B0 l\u00E0 d\u1EEF li\u1EC7u c\u01A1 b\u1EA3n cho c\u00E1c b\u00E1o c\u00E1o.
-intro_pivot_table=Xem c\u00E1c b\u1EA3ng xoay, m\u00E0 \u0111\u01B0\u1EE3c t\u1EA1o ra t\u1EEB c\u00E1c chi\u1EC1u d\u1EEF li\u1EC7u c\u1EE7a ch\u1EC9 s\u1ED1, \u0111\u01A1n v\u1ECB v\u00E0 th\u1EDDi \u0111i\u1EC3m.
-intro_orgunit_distribution_report=Duy\u1EC7t xem c\u00E1c b\u00E1o c\u00E1o m\u1EDF r\u1ED9ng theo \u0111\u01A1n v\u1ECB
-intro_dataset_report=Xem b\u00E1o c\u00E1o theo t\u1EADp d\u1EEF li\u1EC7u. C\u00E1c b\u00E1o c\u00E1o n\u00E0y d\u1EF1a v\u00E0o c\u00E1c m\u1EABu nh\u1EADp d\u1EEF li\u1EC7u v\u00E0 s\u1EBD t\u1EA1o ra m\u1ED9t b\u00E1o c\u00E1o v\u1EDBi d\u1EEF li\u1EC7u t\u1ED5ng h\u1EE3p.
-intro_data_completeness=Xem t\u1EF7 l\u1EC7 \u0111\u0103ng nh\u1EADp c\u1EE7a c\u00E1c t\u1EADp d\u1EEF li\u1EC7u. Vi\u1EC7c n\u00E0y c\u00F3 d\u1EF1a theo \u0111\u01A1n v\u1ECB v\u00E0 th\u1EDDi \u0111i\u1EC3m, v\u00E0 r\u1ED3i s\u1EBD b\u00E1o c\u00E1o ra PDF v\u00E0 Excel.
-intro_chart=Xem v\u00E0 th\u00EAm bi\u1EC3u \u0111\u1ED3. C\u00E1c bi\u1EC3u \u0111\u1ED3 d\u1EF1a v\u00E0o c\u00E1c ch\u1EC9 s\u1ED1 v\u00E0 \u0111\u01A1n v\u1ECB ho\u1EB7c th\u1EDDi \u0111i\u1EC3m.
-individual_quarters_this_year=T\u1EEBng qu\u00FD c\u1EE7a n\u0103m nay
-individual_months_this_year=T\u1EEBng th\u00E1ng c\u1EE7a n\u0103m nay
-indicators=Ch\u1EC9 s\u1ED1
-indicators=C\u00E1c ch\u1EC9 s\u1ED1
-indicator_group=Nh\u00F3m ch\u1EC9 s\u1ED1
-include_regression_line=Bao g\u1ED3m \u0111\u01B0\u1EDDng bi\u1EC3u di\u1EC5n quy h\u1ED3i
-include_regression=Bao g\u1ED3m c\u00E1c h\u1ED3i quy
-importing_report_tables=Dua v\u00E0o c\u00E1c b\u1EA3ng b\u00E1o c\u00E1o
-horizontal_plot_orientation=H\u01B0\u1EDBng chi\u1EC1u ngang
-home_explanation=Ch\u1EE9a \u0111\u01B0\u1EDDng d\u1EABn \u0111\u1EBFn tr\u00ECnh xem c\u00E1c thi\u1EBFt k\u1EBF b\u00E1o c\u00E1o v\u1EDBi BIRT \u1EDF m\u00E1y ch\u1EE7
-home=\u0110\u01B0\u1EDDng d\u1EABn t\u1EDBi th\u01B0 m\u1EE5c ch\u1EE9a thi\u1EBFt k\u1EBF BIRT (.rptdesign) \u1EDF m\u00E1y ch\u1EE7
-hide_legend=\u1EA8n m\u1EE5c
-hide_details=\u1EA8n th\u00F4ng tin chi ti\u1EBFt
-get_updated_data=L\u1EA5y d\u1EEF li\u1EC7u \u0111\u00E3 \u0111\u01B0\u1EE3c c\u1EADp nh\u1EADt v\u00E0 t\u1ED5ng h\u1EE3p
-get_report=L\u1EA5y b\u00E1o c\u00E1o
-get_data=L\u1EA5y d\u1EEF li\u1EC7u
-get_current_design=L\u1EA5y thi\u1EBFt k\u1EBF \u0111ang d\u00F9ng
-generating_report=\u0110ang t\u1EA1o ra b\u00E1o c\u00E1o
-generate_workbook=Xu\u1EA5t ra excel
-generate_pdf=Xu\u1EA5t ra PDF
-generate_datasource_and_view_report=T\u1EA1o ra b\u1EA3ng d\u1EEF li\u1EC7u v\u00E0 b\u00E1o c\u00E1o
-generate_before_export=H\u00E3y t\u1EA1o ra c\u00E1c b\u1EA3ng tr\u01B0\u1EDBc khi xu\u1EA5t ra d\u1EEF li\u1EC7u
+intro_tally_sheet_generator=T\u1ea1o ra c\u00e1c b\u1ea3ng \u0111\u1ebfm \u0111\u1ec3 in v\u00e0 c\u00f3 th\u1ec3 s\u1eed d\u1ee5ng cho thu th\u1eadp d\u1eef li\u1ec7u.
+intro_static_report=Xem v\u00e0 th\u00eam c\u00e1c b\u00e1o c\u00e1o t\u0129nh. C\u00e1c b\u00e1o c\u00e1o n\u00e0y c\u00f3 th\u1ec3 \u0111\u01b0\u1ee3c n\u1ea1p l\u00ean d\u1ea1ng\: t\u00e0i li\u1ec7u hay l\u00e0 \u0111\u01b0\u1eddng d\u1eabn tr\u00ean web.
+intro_standard_report=Xem v\u00e0 th\u00eam c\u00e1c b\u00e1o c\u00e1o c\u01a1 b\u1ea3n. C\u00e1c b\u00e1o c\u00e1o n\u00e0y d\u00f9ng d\u1eef li\u1ec7u l\u00e0 c\u00e1c b\u1ea3ng b\u00e1o c\u00e1o \u0111\u00e3 \u0111\u01b0\u1ee3c thi\u1ebft k\u1ebf v\u1edbi tr\u00ecnh thi\u1ebft k\u1ebf BIRT hay l\u00e0 JasperReport
+intro_report_table=Th\u00eam v\u00e0 t\u1ea1o ra c\u00e1c b\u1ea3ng b\u00e1o c\u00e1o. C\u00e1c b\u1ea3ng b\u00e1o c\u00e1o l\u00e0 c\u00e1c b\u1ea3ng c\u01a1 s\u1edf d\u1eef li\u1ec7u \u0111\u01b0\u1ee3c \u0111i\u1ec1u ch\u1ec9nh t\u00f9y ch\u1ecdn \u0111\u1ec3 c\u00f3 th\u1ec3 \u0111\u01b0\u1ee3c d\u00f9ng nh\u01b0 l\u00e0 d\u1eef li\u1ec7u c\u01a1 b\u1ea3n cho c\u00e1c b\u00e1o c\u00e1o.
+intro_pivot_table=Xem c\u00e1c b\u1ea3ng xoay, m\u00e0 \u0111\u01b0\u1ee3c t\u1ea1o ra t\u1eeb c\u00e1c chi\u1ec1u d\u1eef li\u1ec7u c\u1ee7a ch\u1ec9 s\u1ed1, \u0111\u01a1n v\u1ecb v\u00e0 th\u1eddi \u0111i\u1ec3m.
+intro_orgunit_distribution_report=Duy\u1ec7t xem c\u00e1c b\u00e1o c\u00e1o m\u1edf r\u1ed9ng theo \u0111\u01a1n v\u1ecb
+intro_dataset_report=Xem b\u00e1o c\u00e1o theo t\u1eadp d\u1eef li\u1ec7u. C\u00e1c b\u00e1o c\u00e1o n\u00e0y d\u1ef1a v\u00e0o c\u00e1c m\u1eabu nh\u1eadp d\u1eef li\u1ec7u v\u00e0 s\u1ebd t\u1ea1o ra m\u1ed9t b\u00e1o c\u00e1o v\u1edbi d\u1eef li\u1ec7u t\u1ed5ng h\u1ee3p.
+intro_data_completeness=Xem t\u1ef7 l\u1ec7 \u0111\u0103ng nh\u1eadp c\u1ee7a c\u00e1c t\u1eadp d\u1eef li\u1ec7u. Vi\u1ec7c n\u00e0y c\u00f3 d\u1ef1a theo \u0111\u01a1n v\u1ecb v\u00e0 th\u1eddi \u0111i\u1ec3m, v\u00e0 r\u1ed3i s\u1ebd b\u00e1o c\u00e1o ra PDF v\u00e0 Excel.
+intro_chart=Xem v\u00e0 th\u00eam bi\u1ec3u \u0111\u1ed3. C\u00e1c bi\u1ec3u \u0111\u1ed3 d\u1ef1a v\u00e0o c\u00e1c ch\u1ec9 s\u1ed1 v\u00e0 \u0111\u01a1n v\u1ecb ho\u1eb7c th\u1eddi \u0111i\u1ec3m.
+individual_quarters_this_year=T\u1eebng qu\u00fd c\u1ee7a n\u0103m nay
+individual_months_this_year=T\u1eebng th\u00e1ng c\u1ee7a n\u0103m nay
+indicators=Ch\u1ec9 s\u1ed1
+indicators=C\u00e1c ch\u1ec9 s\u1ed1
+indicator_group=Nh\u00f3m ch\u1ec9 s\u1ed1
+include_regression_line=Bao g\u1ed3m \u0111\u01b0\u1eddng bi\u1ec3u di\u1ec5n quy h\u1ed3i
+include_regression=Bao g\u1ed3m c\u00e1c h\u1ed3i quy
+importing_report_tables=Dua v\u00e0o c\u00e1c b\u1ea3ng b\u00e1o c\u00e1o
+horizontal_plot_orientation=H\u01b0\u1edbng chi\u1ec1u ngang
+home_explanation=Ch\u1ee9a \u0111\u01b0\u1eddng d\u1eabn \u0111\u1ebfn tr\u00ecnh xem c\u00e1c thi\u1ebft k\u1ebf b\u00e1o c\u00e1o v\u1edbi BIRT \u1edf m\u00e1y ch\u1ee7
+home=\u0110\u01b0\u1eddng d\u1eabn t\u1edbi th\u01b0 m\u1ee5c ch\u1ee9a thi\u1ebft k\u1ebf BIRT (.rptdesign) \u1edf m\u00e1y ch\u1ee7
+hide_legend=\u1ea8n m\u1ee5c
+hide_details=\u1ea8n th\u00f4ng tin chi ti\u1ebft
+get_updated_data=L\u1ea5y d\u1eef li\u1ec7u \u0111\u00e3 \u0111\u01b0\u1ee3c c\u1eadp nh\u1eadt v\u00e0 t\u1ed5ng h\u1ee3p
+get_report=L\u1ea5y b\u00e1o c\u00e1o
+get_data=L\u1ea5y d\u1eef li\u1ec7u
+get_current_design=L\u1ea5y thi\u1ebft k\u1ebf \u0111ang d\u00f9ng
+generating_report=\u0110ang t\u1ea1o ra b\u00e1o c\u00e1o
+generate_workbook=Xu\u1ea5t ra excel
+generate_pdf=Xu\u1ea5t ra PDF
+generate_datasource_and_view_report=T\u1ea1o ra b\u1ea3ng d\u1eef li\u1ec7u v\u00e0 b\u00e1o c\u00e1o
+generate_before_export=H\u00e3y t\u1ea1o ra c\u00e1c b\u1ea3ng tr\u01b0\u1edbc khi xu\u1ea5t ra d\u1eef li\u1ec7u
 generate_before_export=
-generate=T\u1EA1o ra
+generate=T\u1ea1o ra
 generate=Generate
-filter_available_periods=L\u1ECDc - C\u00E1c th\u1EDDi \u0111i\u1EC3m c\u00F3 s\u1EB5n
-filter_available_organisationunits=L\u1ECDc - C\u00E1c \u0111\u01A1n v\u1ECB c\u00F3 s\u1EB5n
-file_upload_failed=T\u1EA3i t\u1EADp tin l\u00EAn kh\u00F4ng th\u00E0nh c\u00F4ng
-file=T\u1EADp tin
-facility=Tr\u1EA1m Y t\u1EBF
-external_url=\u0110\u01B0\u1EDDng d\u1EABn b\u00EAn ngo\u00E0i
-exporting_data_for_indicators=\u0110ang xu\u1EA5t ra c\u00E1c ch\u1EC9 s\u1ED1
-exporting_data_for_data_elements=\u0110ang xu\u1EA5t ra d\u1EEF li\u1EC7u
-exporting_data_for_calculated_data_elements=\u0110ang xu\u1EA5t d\u1EEF li\u1EC7u ki\u1EC3u t\u1ED5ng h\u1EE3p
-export_to_html=Xu\u1EA5t ra t\u1EADp tin Html
-export_to_excel=Xu\u1EA5t ra t\u1EADp tin Excel
-export_to_csv=Xu\u1EA5t ra t\u1EADp tin CSV
-export_process_failed=L\u1ED7i do xu\u1EA5t ra d\u1EEF li\u1EC7u - Xem chi ti\u1EBFt nh\u1EADt k\u00FD ch\u01B0\u01A1ng tr\u00ECnh.
-export_process_done=Ho\u00E0n t\u1EA5t xu\u1EA5t d\u1EEF li\u1EC7u
+filter_available_periods=L\u1ecdc - C\u00e1c th\u1eddi \u0111i\u1ec3m c\u00f3 s\u1eb5n
+filter_available_organisationunits=L\u1ecdc - C\u00e1c \u0111\u01a1n v\u1ecb c\u00f3 s\u1eb5n
+file_upload_failed=T\u1ea3i t\u1eadp tin l\u00ean kh\u00f4ng th\u00e0nh c\u00f4ng
+file=T\u1eadp tin
+facility=Tr\u1ea1m Y t\u1ebf
+external_url=\u0110\u01b0\u1eddng d\u1eabn b\u00ean ngo\u00e0i
+exporting_data_for_indicators=\u0110ang xu\u1ea5t ra c\u00e1c ch\u1ec9 s\u1ed1
+exporting_data_for_data_elements=\u0110ang xu\u1ea5t ra d\u1eef li\u1ec7u
+exporting_data_for_calculated_data_elements=\u0110ang xu\u1ea5t d\u1eef li\u1ec7u ki\u1ec3u t\u1ed5ng h\u1ee3p
+export_to_html=Xu\u1ea5t ra t\u1eadp tin Html
+export_to_excel=Xu\u1ea5t ra t\u1eadp tin Excel
+export_to_csv=Xu\u1ea5t ra t\u1eadp tin CSV
+export_process_failed=L\u1ed7i do xu\u1ea5t ra d\u1eef li\u1ec7u - Xem chi ti\u1ebft nh\u1eadt k\u00fd ch\u01b0\u01a1ng tr\u00ecnh.
+export_process_done=Ho\u00e0n t\u1ea5t xu\u1ea5t d\u1eef li\u1ec7u
 export_dataset_completeness=Export dataset completeness
 export_dataset_completeness					= Export dataset completeness
-error_startDate=Ng\u00E0y b\u1EAFt \u0111\u1EA7u kh\u00F4ng h\u1EE3p l\u1EC7\! 
+error_startDate=Ng\u00e0y b\u1eaft \u0111\u1ea7u kh\u00f4ng h\u1ee3p l\u1ec7\! 
 error_startDate 							= Ng\u00e0y b\u1eaft \u0111\u1ea7u kh\u00f4ng h\u1ee3p l\u1ec7! 
-error_organisationUnitId=Ch\u01B0a ch\u1ECDn \u0111\u01A1n v\u1ECB\!
-error_in_input_parameters=C\u00E1c tham s\u1ED1 b\u1EAFt bu\u1ED9c ch\u01B0a \u0111\u01B0\u1EE3c ch\u1ECDn\!
-error_endDate=Ng\u00E0y k\u1EBFt th\u00FAc kh\u00F4ng h\u1EE3p l\u1EC7\!
-error_dataSetId=Ch\u01B0a ch\u1ECDn t\u1EADp h\u1EE3p d\u1EEF li\u1EC7u
+error_organisationUnitId=Ch\u01b0a ch\u1ecdn \u0111\u01a1n v\u1ecb\!
+error_in_input_parameters=C\u00e1c tham s\u1ed1 b\u1eaft bu\u1ed9c ch\u01b0a \u0111\u01b0\u1ee3c ch\u1ecdn\!
+error_endDate=Ng\u00e0y k\u1ebft th\u00fac kh\u00f4ng h\u1ee3p l\u1ec7\!
+error_dataSetId=Ch\u01b0a ch\u1ecdn t\u1eadp h\u1ee3p d\u1eef li\u1ec7u
 error_dataSetId								= Ch\u01b0a ch\u1ecdn t\u1eadp h\u1ee3p d\u1eef li\u1ec7u
-error_after=Ng\u00E0y k\u1EBFt th\u00FAc ph\u1EA3i sau ng\u00E0y b\u1EAFt \u0111\u1EA7u\!
-end_date=Ng\u00E0y k\u1EBFt th\u00FAc
-edit_tally_rows=(T\u00F9y ch\u1ECDn) Ch\u1EC9nh th\u1EE7 c\u00F4ng c\u00E1c s\u1ED1 \u0111\u1EBFm
+error_after=Ng\u00e0y k\u1ebft th\u00fac ph\u1ea3i sau ng\u00e0y b\u1eaft \u0111\u1ea7u\!
+end_date=Ng\u00e0y k\u1ebft th\u00fac
+edit_tally_rows=(T\u00f9y ch\u1ecdn) Ch\u1ec9nh th\u1ee7 c\u00f4ng c\u00e1c s\u1ed1 \u0111\u1ebfm
 edit_report=Edit report
-edit=Thay \u0111\u1ED5i
-done=Ho\u00E0n t\u1EA5t
+edit=Thay \u0111\u1ed5i
+done=Ho\u00e0n t\u1ea5t
 district_health_information_software=District Health Information Software
-distribution_report=B\u00E1o c\u00E1o ph\u00E2n t\u00E1n
-display_report_table=B\u1EA3ng b\u00E1o c\u00E1o hi\u1EC3n th\u1ECB
-display_name=T\u00EAn hi\u1EC3n th\u1ECB
-display_facility_name=T\u00EAn c\u1EE7a \u0111\u01A1n v\u1ECB
-display=Hi\u1EC3n th\u1ECB
-directory_explanation=Th\u01B0 m\u1EE5c li\u00EAn quan \u0111\u1EBFn m\u1ED9t \u0111\u01B0\u1EDDng d\u1EABn URL xu\u1EA5t hi\u1EC7n sau khi m\u00E1y ch\u1EE7 tham chi\u1EBFu \u0111\u1EBFn tr\u00ECnh xem \u1EE9ng d\u1EE5ng BIRT
-directory=Th\u01B0 m\u1EE5c
-dimension=Chi\u1EC1u k\u00EDch
-design=T\u1EADp tin  b\u00E1o c\u00E1o thi\u1EBFt k\u1EBF t\u1EEB iReport
-deleting_existing_aggregated_data=\u0110ang x\u00F3a d\u1EEF li\u1EC7u t\u1ED5ng h\u1EE3p
-datasets=T\u1EADp h\u1EE3p d\u1EEF li\u1EC7u
-dataset_report=B\u00E1o c\u00E1o theo t\u1EADp h\u1EE3p d\u1EEF li\u1EC7u c\u00F3 s\u1EB5n
-dataset=T\u1EADp d\u1EEF li\u1EC7u
-dataelements=C\u00E1c ph\u1EA7n t\u1EED d\u1EEF li\u1EC7u
-data_element=Ph\u1EA7n t\u1EED d\u1EEF li\u1EC7u
-data_completeness_report=Ba\u0301o ca\u0301o ti\u0300nh hi\u0300nh hoa\u0300n thi\u00EA\u0323n d\u01B0\u0303 li\u00EA\u0323u
-data_completeness_process_started=Ti\u1EBFn tr\u00ECnh ki\u1EC3m tra ho\u00E0n ch\u1EC9nh d\u1EEF li\u1EC7u \u0111\u00E3 b\u1EAFt \u0111\u1EA7u
-data_completeness_process_failed=L\u1ED7i ti\u1EBFn tr\u00ECnh ho\u00E0n t\u1EA5t d\u1EEF li\u1EC7u - Xem chi ti\u1EBFt \u1EDF b\u1EA3ng nh\u1EADt k\u00FD
-data_completeness_process_done=Ho\u00E0n t\u1EA5t ti\u1EBFn tr\u00ECnh ho\u00E0n ch\u1EC9nh d\u1EEF li\u1EC7u
-data_completeness_configuration=C\u1EA5u h\u00ECnh v\u1EC1 ho\u00E0n t\u1EA5t d\u1EEF li\u1EC7u
-data_completeness=S\u1EF1 ho\u00E0n t\u1EA5t d\u1EEF li\u1EC7u
-data=D\u1EEF li\u1EC7u
-crosstabulating_data=\u0110ang t\u1EA1o c\u00E1c thanh d\u1EEF li\u1EC7u
-crosstab_periods=C\u00E1c thanh d\u1EEF li\u1EC7u
-crosstab_organisation_units=C\u00E1c thanh \u0111\u01A1n v\u1ECB
-crosstab_indicators=C\u00E1c thanh ch\u1EC9 s\u1ED1
-crosstab_dimensions=C\u00E1c thanh chi\u1EC1u d\u1EEF li\u1EC7u
-criteria=Ti\u00EAu chu\u1EA9n
-creating_table=\u0110ang t\u1EA1o b\u1EA3ng ...
-creating_report_datasource=\u0110ang t\u1EA1o d\u1EEF li\u1EC7u cho b\u00E1o c\u00E1o...
-create_report_table=T\u1EA1o b\u1EA3ng b\u00E1o c\u00E1o
-create_report=T\u1EA1o b\u00E1o c\u00E1o
-create_period_by_indicator_chart=T\u1EA1o m\u1EDBi v\u1EDBi bi\u1EC3u \u0111\u1ED3 ch\u1EC9 s\u1ED1
-create_new_static_report=T\u1EA1o m\u1EDBi b\u00E1o c\u00E1o t\u0129nh
-create_new_report=T\u1EA1o b\u00E1o c\u00E1o m\u1EDBi
-create_indicator_report_table=T\u1EA1o b\u1EA3ng b\u00E1o c\u00E1o t\u1EEB c\u00E1c ch\u1EC9 s\u1ED1
-create_indicator_by_period_chart=T\u1EA1o ch\u1EC9 s\u1ED1 v\u1EDBi bi\u1EC3u \u0111\u1ED3 th\u1EDDi gian
-create_indicator_by_organisation_unit_chart=T\u1EA1o ch\u1EC9 s\u1ED1 v\u1EDBi bi\u1EC3u \u0111\u1ED3 \u0111\u01A1n v\u1ECB
-create_dataelement_report_table=T\u1EA1o b\u1EA3ng b\u00E1o c\u00E1o t\u1EEB c\u00E1c ph\u1EA7n t\u1EED d\u1EEF li\u1EC7u
-create_chart=T\u1EA1o bi\u1EC3u \u0111\u1ED3
-create_and_save=T\u1EA1o m\u1EDBi v\u00E0 L\u01B0u
-create=T\u1EA1o m\u1EDBi
-continue=Ti\u1EBFp t\u1EE5c
-confirm_remove_report=C\u00F3 ch\u1EAFc l\u00E0 b\u1EA1n mu\u1ED1n x\u00F3a b\u00E1o c\u00E1o n\u00E0y?
-confirm_delete_table=B\u1EA1n c\u00F3 ch\u1EAFc mu\u1ED1n x\u00F3a b\u1EA3ng b\u00E1o c\u00E1o n\u00E0y?
-confirm_delete_chart=B\u1EA1n c\u00F3 ch\u1EAFc ch\u1EAFn mu\u1ED1n x\u00F3a bi\u1EC3u \u0111\u1ED3?
-confirm_add_to_dashboard=B\u1EA1n c\u00F3 ch\u1EAFc ch\u1EAFn mu\u1ED1n th\u00EAm b\u00E1o c\u00E1o n\u00E0y v\u00E0o b\u1EA3ng \u0111i\u1EC1u khi\u1EC3n?
-confirm_add_report_table_to_dashboard=B\u1EA1n c\u00F3 ch\u1EAFc ch\u1EAFn mu\u1ED1n th\u00EAm b\u1EA3ng b\u00E1o c\u00E1o n\u00E0y v\u00E0o b\u1EA3ng \u0111i\u1EC1u khi\u1EC3n?
+distribution_report=B\u00e1o c\u00e1o ph\u00e2n t\u00e1n
+display_report_table=B\u1ea3ng b\u00e1o c\u00e1o hi\u1ec3n th\u1ecb
+display_name=T\u00ean hi\u1ec3n th\u1ecb
+display_facility_name=T\u00ean c\u1ee7a \u0111\u01a1n v\u1ecb
+display=Hi\u1ec3n th\u1ecb
+directory_explanation=Th\u01b0 m\u1ee5c li\u00ean quan \u0111\u1ebfn m\u1ed9t \u0111\u01b0\u1eddng d\u1eabn URL xu\u1ea5t hi\u1ec7n sau khi m\u00e1y ch\u1ee7 tham chi\u1ebfu \u0111\u1ebfn tr\u00ecnh xem \u1ee9ng d\u1ee5ng BIRT
+directory=Th\u01b0 m\u1ee5c
+dimension=Chi\u1ec1u k\u00edch
+design=T\u1eadp tin  b\u00e1o c\u00e1o thi\u1ebft k\u1ebf t\u1eeb iReport
+deleting_existing_aggregated_data=\u0110ang x\u00f3a d\u1eef li\u1ec7u t\u1ed5ng h\u1ee3p
+datasets=T\u1eadp h\u1ee3p d\u1eef li\u1ec7u
+dataset_report=B\u00e1o c\u00e1o theo t\u1eadp h\u1ee3p d\u1eef li\u1ec7u c\u00f3 s\u1eb5n
+dataset=T\u1eadp d\u1eef li\u1ec7u
+dataelements=C\u00e1c ph\u1ea7n t\u1eed d\u1eef li\u1ec7u
+data_element=Ph\u1ea7n t\u1eed d\u1eef li\u1ec7u
+data_completeness_report=Ba\u0301o ca\u0301o ti\u0300nh hi\u0300nh hoa\u0300n thi\u00ea\u0323n d\u01b0\u0303 li\u00ea\u0323u
+data_completeness_process_started=Ti\u1ebfn tr\u00ecnh ki\u1ec3m tra ho\u00e0n ch\u1ec9nh d\u1eef li\u1ec7u \u0111\u00e3 b\u1eaft \u0111\u1ea7u
+data_completeness_process_failed=L\u1ed7i ti\u1ebfn tr\u00ecnh ho\u00e0n t\u1ea5t d\u1eef li\u1ec7u - Xem chi ti\u1ebft \u1edf b\u1ea3ng nh\u1eadt k\u00fd
+data_completeness_process_done=Ho\u00e0n t\u1ea5t ti\u1ebfn tr\u00ecnh ho\u00e0n ch\u1ec9nh d\u1eef li\u1ec7u
+data_completeness_configuration=C\u1ea5u h\u00ecnh v\u1ec1 ho\u00e0n t\u1ea5t d\u1eef li\u1ec7u
+data_completeness=S\u1ef1 ho\u00e0n t\u1ea5t d\u1eef li\u1ec7u
+data=D\u1eef li\u1ec7u
+crosstabulating_data=\u0110ang t\u1ea1o c\u00e1c thanh d\u1eef li\u1ec7u
+crosstab_periods=C\u00e1c thanh d\u1eef li\u1ec7u
+crosstab_organisation_units=C\u00e1c thanh \u0111\u01a1n v\u1ecb
+crosstab_indicators=C\u00e1c thanh ch\u1ec9 s\u1ed1
+crosstab_dimensions=C\u00e1c thanh chi\u1ec1u d\u1eef li\u1ec7u
+criteria=Ti\u00eau chu\u1ea9n
+creating_table=\u0110ang t\u1ea1o b\u1ea3ng ...
+creating_report_datasource=\u0110ang t\u1ea1o d\u1eef li\u1ec7u cho b\u00e1o c\u00e1o...
+create_report_table=T\u1ea1o b\u1ea3ng b\u00e1o c\u00e1o
+create_report=T\u1ea1o b\u00e1o c\u00e1o
+create_period_by_indicator_chart=T\u1ea1o m\u1edbi v\u1edbi bi\u1ec3u \u0111\u1ed3 ch\u1ec9 s\u1ed1
+create_new_static_report=T\u1ea1o m\u1edbi b\u00e1o c\u00e1o t\u0129nh
+create_new_report=T\u1ea1o b\u00e1o c\u00e1o m\u1edbi
+create_indicator_report_table=T\u1ea1o b\u1ea3ng b\u00e1o c\u00e1o t\u1eeb c\u00e1c ch\u1ec9 s\u1ed1
+create_indicator_by_period_chart=T\u1ea1o ch\u1ec9 s\u1ed1 v\u1edbi bi\u1ec3u \u0111\u1ed3 th\u1eddi gian
+create_indicator_by_organisation_unit_chart=T\u1ea1o ch\u1ec9 s\u1ed1 v\u1edbi bi\u1ec3u \u0111\u1ed3 \u0111\u01a1n v\u1ecb
+create_dataelement_report_table=T\u1ea1o b\u1ea3ng b\u00e1o c\u00e1o t\u1eeb c\u00e1c ph\u1ea7n t\u1eed d\u1eef li\u1ec7u
+create_chart=T\u1ea1o bi\u1ec3u \u0111\u1ed3
+create_and_save=T\u1ea1o m\u1edbi v\u00e0 L\u01b0u
+create=T\u1ea1o m\u1edbi
+continue=Ti\u1ebfp t\u1ee5c
+confirm_remove_report=C\u00f3 ch\u1eafc l\u00e0 b\u1ea1n mu\u1ed1n x\u00f3a b\u00e1o c\u00e1o n\u00e0y?
+confirm_delete_table=B\u1ea1n c\u00f3 ch\u1eafc mu\u1ed1n x\u00f3a b\u1ea3ng b\u00e1o c\u00e1o n\u00e0y?
+confirm_delete_chart=B\u1ea1n c\u00f3 ch\u1eafc ch\u1eafn mu\u1ed1n x\u00f3a bi\u1ec3u \u0111\u1ed3?
+confirm_add_to_dashboard=B\u1ea1n c\u00f3 ch\u1eafc ch\u1eafn mu\u1ed1n th\u00eam b\u00e1o c\u00e1o n\u00e0y v\u00e0o b\u1ea3ng \u0111i\u1ec1u khi\u1ec3n?
+confirm_add_report_table_to_dashboard=B\u1ea1n c\u00f3 ch\u1eafc ch\u1eafn mu\u1ed1n th\u00eam b\u1ea3ng b\u00e1o c\u00e1o n\u00e0y v\u00e0o b\u1ea3ng \u0111i\u1ec1u khi\u1ec3n?
 configure_report=Configure report
 configure_data_completeness=Configure data completeness
-configuration=C\u1EA5u h\u00ECnh
+configuration=C\u1ea5u h\u00ecnh
 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
-completed=Ho\u00E0n t\u1EA5t
-column_name=T\u00EAn c\u1ED9t
-column=C\u1ED9t
-click_and_drag=K\u00E9o v\u00E0 th\u1EA3
-chart_type=Lo\u1EA1i bi\u1EC3u \u0111\u1ED3
-chart_size=K\u00EDch th\u01B0\u1EDBc bi\u1EC3u \u0111\u1ED3
-chart_dimension=Chi\u1EC1u c\u1EE7a bi\u1EC3u \u0111\u1ED3
-chart=Bi\u1EC3u \u0111\u1ED3
-category_y_selected_periods=Gi\u00E1 tr\u1ECB (Y) - C\u00E1c th\u1EDDi \u0111i\u1EC3m \u0111\u01B0\u1EE3c ch\u1ECDn
-category_y_available_periods=Ph\u00E2n lo\u1EA1i (X) - C\u00E1c th\u1EDDi \u0111i\u1EC3m c\u00F3 s\u1EB5n
-category_x_selected_periods=Ph\u00E2n lo\u1EA1i (X) - C\u00E1c th\u1EDDi \u0111i\u1EC3m \u0111\u01B0\u1EE3c ch\u1ECDn
+completed=Ho\u00e0n t\u1ea5t
+column_name=T\u00ean c\u1ed9t
+column=C\u1ed9t
+click_and_drag=K\u00e9o v\u00e0 th\u1ea3
+chart_type=Lo\u1ea1i bi\u1ec3u \u0111\u1ed3
+chart_size=K\u00edch th\u01b0\u1edbc bi\u1ec3u \u0111\u1ed3
+chart_dimension=Chi\u1ec1u c\u1ee7a bi\u1ec3u \u0111\u1ed3
+chart=Bi\u1ec3u \u0111\u1ed3
+category_y_selected_periods=Gi\u00e1 tr\u1ecb (Y) - C\u00e1c th\u1eddi \u0111i\u1ec3m \u0111\u01b0\u1ee3c ch\u1ecdn
+category_y_available_periods=Ph\u00e2n lo\u1ea1i (X) - C\u00e1c th\u1eddi \u0111i\u1ec3m c\u00f3 s\u1eb5n
+category_x_selected_periods=Ph\u00e2n lo\u1ea1i (X) - C\u00e1c th\u1eddi \u0111i\u1ec3m \u0111\u01b0\u1ee3c ch\u1ecdn
 category_x_selected_periods=
-category_x_selected_organisationunits=Ph\u00E2n lo\u1EA1i (X) - C\u00E1c \u0111\u01A1n v\u1ECB \u0111\u01B0\u1EE3c ch\u1ECDn
-category_x_available_periods=Ph\u00E2n lo\u1EA1i (X) - C\u00E1c th\u1EDDi \u0111i\u1EC3m c\u00F3 s\u1EB5n
-category_x_available_organisationunits=Ph\u00E2n lo\u1EA1i (X) - C\u00E1c \u0111\u01A1n v\u1ECB c\u00F3 s\u1EB5n
-category_option_combos=S\u1EF1 k\u1EBFt h\u1EE3p t\u00F9y ch\u1ECDn c\u1EE7a ph\u00E2n lo\u1EA1i
-cannot_select_orgunit_and_parent_orgunit_param=Kh\u00F4ng th\u1EC3 ch\u1ECD v\u1EEBa tham s\u1ED1 \u0111\u01A1n v\u1ECB hi\u1EC7n t\u1EA1i v\u00E0 \u0111\u01A1n v\u1ECB c\u1EA5p cha
-cannot_include_more_organisation_unit_regression=Kh\u00F4ng th\u1EC3 th\u1EF1c hi\u1EC7n h\u1ED3i quy cho nhi\u1EC1u h\u01A1n m\u1ED9t \u0111\u01A1n v\u1ECB
-cannot_crosstab_no_dimensions=Ph\u1EA3i ch\u1ECDn \u00EDt nh\u1EA5t m\u1ED9t chi\u1EC1u d\u1EEF li\u1EC7u
-cannot_crosstab_all_dimensions=Kh\u00F4ng th\u1EC3 t\u1EA1o ra b\u1EA3ng \u0111a chi\u1EC1u
-cannot_create_display_columns_dynamic_columns=B\u1EA1n kh\u00F4ng th\u1EC3 t\u1EA1o c\u00E1c c\u1ED9t hi\u1EC3n th\u1ECB n\u00E0y v\u00EC b\u1EA3ng b\u00E1o c\u00E1o d\u00F9ng c\u00E1c tham s\u1ED1 cho m\u1ED9t c\u1ED9t k\u00EDch th\u01B0\u1EDBc. \u0110i\u1EC1u n\u00E0y c\u00F3 ngh\u0129a l\u00E0 c\u00E1c c\u1ED9t n\u00E0y l\u00E0 linh \u0111\u1ED9ng v\u00E0 kh\u00F4ng th\u1EC3 c\u1ED1 \u0111\u1ECBnh v\u1EDBi c\u00E1c t\u00EAn c\u1EE5 th\u1EC3.
-cancel=H\u1EE7y
-calculate_tally_rows=T\u00EDnh to\u00E1n c\u00E1c h\u00E0ng t\u1ED5ng h\u1EE3p
-based_on_registration=T\u00F9y thu\u1ED9c v\u00E0o s\u1EF1 ho\u00E0n t\u1EA5t c\u00E1c t\u1EADp d\u1EEF li\u1EC7u \u0111\u0103ng k\u00FD
-based_on_ratio=T\u00F9y thu\u1ED9c v\u00E0o s\u1ED1 l\u01B0\u1EE3ng d\u1EEF li\u1EC7u \u0111\u0103ng k\u00FD
-based_on_compulsory=T\u00F9y thu\u1ED9c v\u00E0o c\u00E1c d\u1EEF li\u1EC7u b\u1EAFt bu\u1ED9c
-bar_chart=Bi\u1EC3u \u0111\u1ED3 c\u1ED9t
-back=Quay l\u1EA1i
-available_report_tables=C\u00E1c report table hi\u1EC7n c\u00F3
-available_periods=C\u00E1c th\u1EDDi \u0111i\u1EC3m hi\u1EC7n c\u00F3
-available_organisationunits=C\u00E1c \u0111\u01A1n v\u1ECB hi\u1EC7n c\u00F3
-available_indicators=C\u00E1c ch\u1EC9 s\u1ED1 hi\u1EC7n c\u00F3
+category_x_selected_organisationunits=Ph\u00e2n lo\u1ea1i (X) - C\u00e1c \u0111\u01a1n v\u1ecb \u0111\u01b0\u1ee3c ch\u1ecdn
+category_x_available_periods=Ph\u00e2n lo\u1ea1i (X) - C\u00e1c th\u1eddi \u0111i\u1ec3m c\u00f3 s\u1eb5n
+category_x_available_organisationunits=Ph\u00e2n lo\u1ea1i (X) - C\u00e1c \u0111\u01a1n v\u1ecb c\u00f3 s\u1eb5n
+category_option_combos=S\u1ef1 k\u1ebft h\u1ee3p t\u00f9y ch\u1ecdn c\u1ee7a ph\u00e2n lo\u1ea1i
+cannot_select_orgunit_and_parent_orgunit_param=Kh\u00f4ng th\u1ec3 ch\u1ecd v\u1eeba tham s\u1ed1 \u0111\u01a1n v\u1ecb hi\u1ec7n t\u1ea1i v\u00e0 \u0111\u01a1n v\u1ecb c\u1ea5p cha
+cannot_include_more_organisation_unit_regression=Kh\u00f4ng th\u1ec3 th\u1ef1c hi\u1ec7n h\u1ed3i quy cho nhi\u1ec1u h\u01a1n m\u1ed9t \u0111\u01a1n v\u1ecb
+cannot_crosstab_no_dimensions=Ph\u1ea3i ch\u1ecdn \u00edt nh\u1ea5t m\u1ed9t chi\u1ec1u d\u1eef li\u1ec7u
+cannot_crosstab_all_dimensions=Kh\u00f4ng th\u1ec3 t\u1ea1o ra b\u1ea3ng \u0111a chi\u1ec1u
+cannot_create_display_columns_dynamic_columns=B\u1ea1n kh\u00f4ng th\u1ec3 t\u1ea1o c\u00e1c c\u1ed9t hi\u1ec3n th\u1ecb n\u00e0y v\u00ec b\u1ea3ng b\u00e1o c\u00e1o d\u00f9ng c\u00e1c tham s\u1ed1 cho m\u1ed9t c\u1ed9t k\u00edch th\u01b0\u1edbc. \u0110i\u1ec1u n\u00e0y c\u00f3 ngh\u0129a l\u00e0 c\u00e1c c\u1ed9t n\u00e0y l\u00e0 linh \u0111\u1ed9ng v\u00e0 kh\u00f4ng th\u1ec3 c\u1ed1 \u0111\u1ecbnh v\u1edbi c\u00e1c t\u00ean c\u1ee5 th\u1ec3.
+cancel=H\u1ee7y
+calculate_tally_rows=T\u00ednh to\u00e1n c\u00e1c h\u00e0ng t\u1ed5ng h\u1ee3p
+based_on_registration=T\u00f9y thu\u1ed9c v\u00e0o s\u1ef1 ho\u00e0n t\u1ea5t c\u00e1c t\u1eadp d\u1eef li\u1ec7u \u0111\u0103ng k\u00fd
+based_on_ratio=T\u00f9y thu\u1ed9c v\u00e0o s\u1ed1 l\u01b0\u1ee3ng d\u1eef li\u1ec7u \u0111\u0103ng k\u00fd
+based_on_compulsory=T\u00f9y thu\u1ed9c v\u00e0o c\u00e1c d\u1eef li\u1ec7u b\u1eaft bu\u1ed9c
+bar_chart=Bi\u1ec3u \u0111\u1ed3 c\u1ed9t
+back=Quay l\u1ea1i
+available_report_tables=C\u00e1c report table hi\u1ec7n c\u00f3
+available_periods=C\u00e1c th\u1eddi \u0111i\u1ec3m hi\u1ec7n c\u00f3
+available_organisationunits=C\u00e1c \u0111\u01a1n v\u1ecb hi\u1ec7n c\u00f3
+available_indicators=C\u00e1c ch\u1ec9 s\u1ed1 hi\u1ec7n c\u00f3
 available_datasets=Available data sets
-available_dataelements=C\u00E1c ph\u1EA7n t\u1EED d\u1EEF li\u1EC7u hi\u1EC7n c\u00F3
-all_indicator_and_periods=T\u1EA5t c\u1EA3 c\u00E1c ch\u1EC9 s\u1ED1 v\u00E0 th\u1EDDi \u0111i\u1EC3m
-all_indicator_and_orgunits=T\u1EA5t c\u1EA3 c\u00E1c ch\u1EC9 s\u1ED1 v\u00E0 \u0111\u01A1n v\u1ECB
-aggregation_mode=Ch\u1EBF \u0111\u1ED9 t\u1ED5ng h\u1EE3p
-aggregating_data=\u0110ang t\u00EDnh to\u00E1n s\u1ED1 li\u1EC7u...
-add_to_dashboard=Th\u00EAm v\u00E0o b\u1EA3ng \u0111i\u1EC1u khi\u1EC3n
-add_selected=Th\u00EAm m\u1EE5c \u0111ang ch\u1ECDn
-add_period_chart=Th\u00EAm bi\u1EC3u \u0111\u1ED3 th\u1EDDi \u0111i\u1EC3m
-add_organisation_unit_chart=Th\u00EAm bi\u1EC3u \u0111\u1ED3 \u0111\u01A1n v\u1ECB
-add_new=Th\u00EAm m\u1EDBi
-add_indicator_table=Th\u00EAm b\u1EA3ng ch\u1EC9 s\u1ED1
+available_dataelements=C\u00e1c ph\u1ea7n t\u1eed d\u1eef li\u1ec7u hi\u1ec7n c\u00f3
+all_indicator_and_periods=T\u1ea5t c\u1ea3 c\u00e1c ch\u1ec9 s\u1ed1 v\u00e0 th\u1eddi \u0111i\u1ec3m
+all_indicator_and_orgunits=T\u1ea5t c\u1ea3 c\u00e1c ch\u1ec9 s\u1ed1 v\u00e0 \u0111\u01a1n v\u1ecb
+aggregation_mode=Ch\u1ebf \u0111\u1ed9 t\u1ed5ng h\u1ee3p
+aggregating_data=\u0110ang t\u00ednh to\u00e1n s\u1ed1 li\u1ec7u...
+add_to_dashboard=Th\u00eam v\u00e0o b\u1ea3ng \u0111i\u1ec1u khi\u1ec3n
+add_selected=Th\u00eam m\u1ee5c \u0111ang ch\u1ecdn
+add_period_chart=Th\u00eam bi\u1ec3u \u0111\u1ed3 th\u1eddi \u0111i\u1ec3m
+add_organisation_unit_chart=Th\u00eam bi\u1ec3u \u0111\u1ed3 \u0111\u01a1n v\u1ecb
+add_new=Th\u00eam m\u1edbi
+add_indicator_table=Th\u00eam b\u1ea3ng ch\u1ec9 s\u1ed1
 add_indicator_reporttable=Add Indicator Report Table
-add_indicator_chart=Th\u00EAm bi\u1EC3u \u0111\u1ED3 ch\u1EC9 s\u1ED1
-add_dataset_table=Th\u00EAm b\u1EA3ng t\u1EADp d\u1EEF li\u1EC7u
+add_indicator_chart=Th\u00eam bi\u1ec3u \u0111\u1ed3 ch\u1ec9 s\u1ed1
+add_dataset_table=Th\u00eam b\u1ea3ng t\u1eadp d\u1eef li\u1ec7u
 add_dataset_reporttable=Add Dataset Report Table
-add_dataelement_table=Th\u00EAm b\u1EA3ng d\u1EEF li\u1EC7u
+add_dataelement_table=Th\u00eam b\u1ea3ng d\u1eef li\u1ec7u
 add_dataelement_reporttable=Add Dataelement Report Table
-add_dataelement_dimension_table=Th\u00EAm b\u1EA3ng d\u1EEF li\u1EC7u \u0111a chi\u1EC1u
-add_children=Th\u00EAm c\u00E1c \u0111\u01A1n v\u1ECB con
-add_all=Th\u00EAm t\u1EA5t c\u1EA3
-add=Th\u00EAm
\ No newline at end of file
+add_dataelement_dimension_table=Th\u00eam b\u1ea3ng d\u1eef li\u1ec7u \u0111a chi\u1ec1u
+add_children=Th\u00eam c\u00e1c \u0111\u01a1n v\u1ecb con
+add_all=Th\u00eam t\u1ea5t c\u1ea3
+add=Th\u00eam
+group = Nh\u00f3m
+groups = C\u00e1c nh\u00f3m
+available_charts = C\u00e1c bi\u1ec3u \u0111\u1ed3 hi\u1ec7n c\u00f3
+available_reports = C\u00e1c b\u00e1o c\u00e1o hi\u1ec7n c\u00f3
+group_members = Nh\u00f3m th\u00e0nh vi\u00ean
+number_of_members = S\u1ed1 th\u00e0nh vi\u00ean trong nh\u00f3m
+chart_groups = C\u00e1c nh\u00f3m bi\u1ec3u \u0111\u1ed3
+report_groups = C\u00e1c nh\u00f3m b\u00e1o c\u00e1o
+report_table_groups = C\u00e1c nh\u00f3m b\u1ea3ng b\u00e1o c\u00e1o
+chart_group_management = Qu\u1ea3n l\u00fd nh\u00f3m bi\u1ec3u \u0111\u1ed3
+report_group_management = Qu\u1ea3n l\u00fd nh\u00f3m b\u00e1o c\u00e1o
+report_table_group_management = Qu\u1ea3n l\u00fd nh\u00f3m b\u1ea3ng b\u00e1o c\u00e1o
+create_new_chart_group = T\u1ea1o m\u1edbi nh\u00f3m bi\u1ec3u \u0111\u1ed3
+create_new_report_group = T\u1ea1o m\u1edbi nh\u00f3m b\u00e1o c\u00e1o
+create_new_report_table_group = T\u1ea1o m\u1edbi nh\u00f3m b\u1ea3ng b\u00e1o c\u00e1o
+edit_chart_group = Ch\u1ec9nh s\u1eeda nh\u00f3m bi\u1ec3u \u0111\u1ed3
+edit_report_group = Ch\u1ec9nh s\u1eeda nh\u00f3m b\u00e1o c\u00e1o
+edit_report_table_group = Ch\u1ec9nh s\u1eeda nh\u00f3m b\u1ea3ng b\u00e1o c\u00e1o
+intro_chart_groups = Cho ph\u00e9p t\u1ea1o, ch\u1ec9nh s\u1eeda, xem v\u00e0 x\u00f3a c\u00e1c nh\u00f3m bi\u1ec3u \u0111\u1ed3. Nh\u00f3m n\u00e0y \u0111\u01b0\u1ee3c d\u00f9ng \u0111\u1ec3 n\u00e2ng cao vi\u1ec7c ph\u00e2n t\u00edch d\u1eef li\u1ec7u
+intro_report_groups = Cho ph\u00e9p t\u1ea1o, ch\u1ec9nh s\u1eeda, xem v\u00e0 x\u00f3a c\u00e1c nh\u00f3m b\u00e1o c\u00e1o. Nh\u00f3m n\u00e0y \u0111\u01b0\u1ee3c d\u00f9ng \u0111\u1ec3 n\u00e2ng cao vi\u1ec7c ph\u00e2n t\u00edch d\u1eef li\u1ec7u
+intro_report_table_groups = Cho ph\u00e9p t\u1ea1o, ch\u1ec9nh s\u1eeda, xem v\u00e0 x\u00f3a c\u00e1c nh\u00f3m b\u1ea3ng b\u00e1o c\u00e1o. Nh\u00f3m n\u00e0y \u0111\u01b0\u1ee3c d\u00f9ng \u0111\u1ec3 n\u00e2ng cao vi\u1ec7c ph\u00e2n t\u00edch d\u1eef li\u1ec7u
+confirm_delete = B\u1ea1n c\u00f3 ch\u1eafc mu\u1ed1n x\u00f3a \u0111\u1ed1i t\u01b0\u1ee3ng n\u00e0y kh\u00f4ng ?
\ No newline at end of file

=== modified file 'dhis-2/dhis-web/dhis-web-reporting/src/main/resources/struts.xml'
--- dhis-2/dhis-web/dhis-web-reporting/src/main/resources/struts.xml	2011-07-21 09:09:42 +0000
+++ dhis-2/dhis-web/dhis-web-reporting/src/main/resources/struts.xml	2011-07-22 07:14:57 +0000
@@ -13,6 +13,12 @@
       <param name="page">/dhis-web-reporting/index.vm</param>
       <param name="menu">/dhis-web-reporting/menu.vm</param>
     </action>
+	
+    <action name="viewGroups" class="org.hisp.dhis.reporting.action.NoAction">
+      <result name="success" type="velocity">/main.vm</result>
+      <param name="page">/dhis-web-reporting/viewGroups.vm</param>
+      <param name="menu">/dhis-web-reporting/menu.vm</param>
+    </action>
     
     <!-- Document -->
 
@@ -237,7 +243,7 @@
       <param name="requiredAuthorities">F_INDICATORGROUP_DELETE</param>
     </action>
 
-    <action name="showAddReportGroupForm" class="org.hisp.dhis.reporting.report.action.GetAllReportsAction">
+    <action name="showAddReportGroupForm" class="org.hisp.dhis.reporting.reportviewer.action.GetAllReportsAction">
       <result name="success" type="velocity">/main.vm</result>
       <param name="page">/dhis-web-reporting/addReportGroupForm.vm</param>
       <param name="javascripts">javascript/reportGroup.js</param>
@@ -377,7 +383,7 @@
       <param name="requiredAuthorities">F_INDICATORGROUP_DELETE</param>
     </action>
 
-    <action name="showAddReportTableGroupForm" class="org.hisp.dhis.reporting.reporttable.action.GetAllReportTablesAction">
+    <action name="showAddReportTableGroupForm" class="org.hisp.dhis.reporting.tablecreator.action.GetAllTablesAction">
       <result name="success" type="velocity">/main.vm</result>
       <param name="page">/dhis-web-reporting/addReportTableGroupForm.vm</param>
       <param name="javascripts">javascript/reportTableGroup.js</param>
@@ -599,6 +605,6 @@
         <param name="bufferSize">10240</param>
       </result>
     </action>
-
+	
   </package>
 </struts>

=== modified file 'dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/addReportTableGroupForm.vm'
--- dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/addReportTableGroupForm.vm	2011-07-21 09:09:42 +0000
+++ dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/addReportTableGroupForm.vm	2011-07-22 07:14:57 +0000
@@ -16,7 +16,7 @@
 	});
 </script>
 
-<h3>$i18n.getString( "create_new_reporttable_group" )</h3>
+<h3>$i18n.getString( "create_new_report_table_group" )</h3>
 
 <form id="addReportTableGroupForm" action="addReportTableGroup.action" method="post" >
 
@@ -39,7 +39,7 @@
     <col style="width: 450px"/>
 
 	<tr>
-		<th>$i18n.getString( "available_reporttables" )</th>
+		<th>$i18n.getString( "available_report_tables" )</th>
 		<th></th>
 		<th>$i18n.getString( "group_members" )
 			<select id="memberValidator" class="{validate:{required:true}}" style="display:none"/>

=== modified file 'dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/index.vm'
--- dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/index.vm	2011-05-31 12:24:47 +0000
+++ dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/index.vm	2011-07-22 07:14:57 +0000
@@ -17,4 +17,5 @@
     #introListImgItem( "displayManageTableForm.action" "report_table" "reporttable" )
     #introListImgItem( "displayViewChartForm.action" "chart" "chart" )
     #introListImgItem( "displayPivotTableForm.action" "pivot_table" "pivottable" )
+    #introListImgItem( "viewGroups.action" "groups" "groups" )
 </ul>

=== modified file 'dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/javascript/updateChartGroupForm.js'
--- dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/javascript/updateChartGroupForm.js	2011-07-21 06:51:02 +0000
+++ dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/javascript/updateChartGroupForm.js	2011-07-22 07:14:57 +0000
@@ -9,8 +9,7 @@
             listValidator( 'memberValidator', 'groupMembers' );
         },
         'rules' : getValidationRules( "chartGroup" )
-    } );
-	
-	checkValueIsExist( "name", "validateChartGroup.action", {id: $chartGroup.id});
-	
-} );
+    });
+	
+	checkValueIsExist( "name", "validateChartGroup.action", {id: getFieldValue( "id" )});
+});

=== modified file 'dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/javascript/updateReportGroupForm.js'
--- dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/javascript/updateReportGroupForm.js	2011-07-21 09:09:42 +0000
+++ dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/javascript/updateReportGroupForm.js	2011-07-22 07:14:57 +0000
@@ -9,8 +9,7 @@
             listValidator( 'memberValidator', 'groupMembers' );
         },
         'rules' : getValidationRules( "reportGroup" )
-    } );
-	
-	checkValueIsExist( "name", "validateReportGroup.action", {id: $reportGroup.id});
-	
-} );
+    });
+	
+	checkValueIsExist( "name", "validateReportGroup.action", {id: getFieldValue( "id" )});
+});

=== modified file 'dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/javascript/updateReportTableGroupForm.js'
--- dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/javascript/updateReportTableGroupForm.js	2011-07-21 09:09:42 +0000
+++ dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/javascript/updateReportTableGroupForm.js	2011-07-22 07:14:57 +0000
@@ -11,6 +11,6 @@
         'rules' : getValidationRules( "reportTableGroup" )
     } );
 	
-	checkValueIsExist( "name", "validateReportTableGroup.action", {id: $reportTableGroup.id});
+	checkValueIsExist( "name", "validateReportTableGroup.action", {id: getFieldValue( "id" )});
 	
 } );

=== modified file 'dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/menu.vm'
--- dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/menu.vm	2011-03-18 14:45:12 +0000
+++ dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/menu.vm	2011-07-22 07:14:57 +0000
@@ -24,3 +24,8 @@
 <ul>
 	<li><a href="viewScheduledTasks.action">$i18n.getString( "scheduling" )</a></li>
 </ul>
+
+<h2>$i18n.getString( "groups" )&nbsp;</h2>
+<ul>
+	<li><a href="viewGroups.action">$i18n.getString( "groups" )</a></li>
+</ul>

=== modified file 'dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/reportTableGroup.vm'
--- dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/reportTableGroup.vm	2011-07-21 09:09:42 +0000
+++ dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/reportTableGroup.vm	2011-07-22 07:14:57 +0000
@@ -6,7 +6,7 @@
 	});
 </script>
 
-<h3>$i18n.getString( "reporttable_group_management" ) #openHelp( "reporttable_group" )</h3>
+<h3>$i18n.getString( "report_table_group_management" ) #openHelp( "report_table_group" )</h3>
 
 <table class="mainPageTable">
 	<tr>
@@ -15,7 +15,7 @@
 				<tr>
 					<td>#filterDiv( "reportTableGroup" )</td>
 					<td colspan="9" style="text-align:right">
-						<input type="button" value="$i18n.getString( 'add_new' )" onclick="window.location.href='showAddReportGroupForm.action'" style="width:80px"/></a>
+						<input type="button" value="$i18n.getString( 'add_new' )" onclick="window.location.href='showAddReportTableGroupForm.action'" style="width:80px"/></a>
 					</td>
 				</tr>
 			</table>
@@ -31,11 +31,11 @@
 				<tbody id="list">
 					#foreach( $reportTableGroup in $reportTableGroups )
 					<tr id="tr${reportTableGroup.id}">
-						<td onclick="showReportGroupDetails( $reportTableGroup.id )">$encoder.htmlEncode( $reportTableGroup.name )</td>
+						<td onclick="showReportTableGroupDetails( $reportTableGroup.id )">$encoder.htmlEncode( $reportTableGroup.name )</td>
 						<td style="text-align:center">
-							<a href="showUpdateReportGroupForm.action?id=$reportTableGroup.id" title="$i18n.getString( 'edit' )"><img src="../images/edit.png" alt="$i18n.getString( 'edit' )"/></a>               
-							<a href="javascript:removeReportGroup( '$reportTableGroup.id', '$encoder.jsEncode( $reportTableGroup.name )' )" title="$i18n.getString( 'remove' )"><img src="../images/delete.png" alt="$i18n.getString( 'remove' )"/></a>               
-							<a href="javascript:showReportGroupDetails( $reportTableGroup.id )" title="$i18n.getString( 'show_details' )"><img src="../images/information.png" alt="$i18n.getString( 'show_details' )"/></a>
+							<a href="showUpdateReportTableGroupForm.action?id=$reportTableGroup.id" title="$i18n.getString( 'edit' )"><img src="../images/edit.png" alt="$i18n.getString( 'edit' )"/></a>               
+							<a href="javascript:removeReportTableGroup( '$reportTableGroup.id', '$encoder.jsEncode( $reportTableGroup.name )' )" title="$i18n.getString( 'remove' )"><img src="../images/delete.png" alt="$i18n.getString( 'remove' )"/></a>               
+							<a href="javascript:showReportTableGroupDetails( $reportTableGroup.id )" title="$i18n.getString( 'show_details' )"><img src="../images/information.png" alt="$i18n.getString( 'show_details' )"/></a>
 						</td>
 					</tr>
 				#end

=== modified file 'dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/updateReportTableGroupForm.vm'
--- dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/updateReportTableGroupForm.vm	2011-07-21 09:09:42 +0000
+++ dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/updateReportTableGroupForm.vm	2011-07-22 07:14:57 +0000
@@ -16,7 +16,7 @@
 	});
 </script>
 
-<h3>$i18n.getString( "edit_reporttable_group" )</h3>
+<h3>$i18n.getString( "edit_report_table_group" )</h3>
 
 <form id="updateReportTableGroupForm" action="updateReportTableGroup.action" method="post" >
 
@@ -43,7 +43,7 @@
     <col style="width: 450px"/>
 
 	<tr>
-		<th>$i18n.getString( "available_reporttables" )</th>
+		<th>$i18n.getString( "available_report_tables" )</th>
 		<th></th>
 		<th>$i18n.getString( "group_members" )
 			<select id="memberValidator" class="{validate:{required:true}}" style="display:none"/>

=== added file 'dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/viewGroups.vm'
--- dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/viewGroups.vm	1970-01-01 00:00:00 +0000
+++ dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/viewGroups.vm	2011-07-22 07:14:57 +0000
@@ -0,0 +1,7 @@
+<h3>$i18n.getString( "groups" )</h3>
+
+<ul id="introList">
+    #introListImgItem( "chartGroup.action" "chart_groups" "groups")
+    #introListImgItem( "reportGroup.action" "report_groups" "groups")
+	#introListImgItem( "reportTableGroup.action" "report_table_groups" "groups" )
+</ul>