← Back to team overview

dhis2-devs team mailing list archive

[Branch ~dhis2-devs-core/dhis2/trunk] Rev 2350: Data Section Form - Fixed bug when saving comment in the historical viewer (pop-up) and minor cha...

 

------------------------------------------------------------
revno: 2350
committer: Hieu <hieu.hispvietnam@xxxxxxxxx>
branch nick: trunk
timestamp: Tue 2010-10-12 17:00:17 +0700
message:
  Data Section Form - Fixed bug when saving comment in the historical viewer (pop-up) and minor changes.
modified:
  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_vi_VN.properties
  dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/history.vm
  dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/javascript/history.js


--
lp:dhis2
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk

Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription
=== modified file 'dhis-2/dhis-web/dhis-web-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	2010-10-07 11:14:36 +0000
+++ dhis-2/dhis-web/dhis-web-dataentry/src/main/resources/org/hisp/dhis/de/i18n_module.properties	2010-10-12 10:00:17 +0000
@@ -133,3 +133,4 @@
 datavalue_history =	Data value history
 data_element_order = Data Element Order
 generate_min_max_success 			= Generate Min/Max successfully.
+enter_digits                        = Enter digit only.
\ No newline at end of file

=== modified file 'dhis-2/dhis-web/dhis-web-dataentry/src/main/resources/org/hisp/dhis/de/i18n_module_vi_VN.properties'
--- dhis-2/dhis-web/dhis-web-dataentry/src/main/resources/org/hisp/dhis/de/i18n_module_vi_VN.properties	2010-04-02 02:43:38 +0000
+++ dhis-2/dhis-web/dhis-web-dataentry/src/main/resources/org/hisp/dhis/de/i18n_module_vi_VN.properties	2010-10-12 10:00:17 +0000
@@ -90,265 +90,266 @@
 change_order			= \u0110\u1ed5i t\u1ee9 t\u1ef1
 #Resource generated by I18n Resource Editor
 #Fri Mar 26 15:52:46 ICT 2010
-validate=Ki\u1EC3m tra t\u00EDnh h\u1EE3p l\u1EC7
-import_from_excel=Nh\u1EADp t\u1EEB file Excel (M\u1EABu \u0111\u00E3 \u0111\u01B0\u1EE3c xu\u1EA5t ra)
-saving_comment_failed_status_code=L\u01B0u ch\u00FA th\u00EDch kh\u00F4ng th\u00E0nh c\u00F4ng v\u1EDBi m\u00E3 tr\u1EA1ng th\u00E1i
-description=M\u00F4 t\u1EA3
-use_short_names=S\u1EED d\u1EE5ng t\u00EAn vi\u1EBFt t\u1EAFt
-saving_value_failed_error_code=L\u01B0u gi\u00E1 tr\u1ECB kh\u00F4ng th\u00E0nh c\u00F4ng v\u1EDBi m\u00E3 l\u1ED7i
-entry=Gi\u00E1 tr\u1ECB
-data_set=T\u1EADp h\u1EE3p d\u1EEF li\u1EC7u
-dataelement_comment=Ch\u00FA th\u00EDch
-confirm_undo=B\u1EA1n c\u00F3 ch\u1EAFc ch\u1EAFn b\u1EA1n s\u1EBD x\u00F3a b\u1ECF vi\u1EC7c \u0111\u0103ng k\u00ED n\u00E0y?
-successful_validation=Gi\u00E1 tr\u1ECB h\u1EE3p l\u1EC7
-data_entry=Nh\u1EADp d\u1EEF li\u1EC7u
-stored_by=Ng\u01B0\u1EDDi nh\u1EADp li\u1EC7u
-order_by_entry=Th\u1EE9 t\u1EF1 theo \u0111\u0103ng k\u00FD
-saving_value_failed_status_code=L\u01B0u gi\u00E1 tr\u1ECB kh\u00F4ng th\u00E0nh c\u00F4ng v\u1EDBi m\u00E3 tr\u1EA1ng th\u00E1i
-max_limit=Gi\u1EDBi h\u1EA1n cao nh\u1EA5t
-dv_deleted=\u0110\u00E3 x\u00F3a
-delete_min_max_values=X\u00F3a gi\u00E1 tr\u1ECB nh\u1ECF nh\u1EA5t / l\u1EDBn nh\u1EA5t
-saving_comment_failed_error_code=L\u01B0u ch\u00FA th\u00EDch kh\u00F4ng th\u00E0nh c\u00F4ng v\u1EDBi m\u00E3 l\u1ED7i
-organisation_unit=\u0110\u01A1n v\u1ECB
-value_of_data_element_greater=Gi\u00E1 tr\u1ECB c\u1EE7a th\u00E0nh ph\u1EA7n d\u1EEF li\u1EC7u sau l\u1EDBn h\u01A1n gi\u00E1 tr\u1ECB l\u1EDBn nh\u1EA5t cho ph\u00E9p
-yes=C\u00F3
-max=L\u1EDBn nh\u1EA5t
-generate_min_max=T\u1EA1o gi\u1EDBi b\u1EA1n min/max
-date=Ng\u00E0y
-audit_operation=Lo\u1EA1i thao t\u00E1c
-validation_result=K\u1EBFt qu\u1EA3 ki\u1EC3m tra t\u00EDnh h\u1EE3p l\u1EC7
-down=Xu\u1ED1ng
-dv_updated=\u0110\u00E3 c\u1EADp nh\u1EADt
-value_of_data_element_less=Gi\u00E1 tr\u1ECB c\u1EE7a th\u00E0nh ph\u1EA7n d\u1EEF li\u1EC7u th\u1EA5p h\u01A1n gi\u00E1 tr\u1ECB nh\u1ECF nh\u1EA5t cho ph\u00E9p
-save=L\u01B0u
-saving_minmax_failed_error_code=L\u01B0u gi\u00E1 tr\u1ECB l\u1EDBn nh\u1EA5t/nh\u1ECF nh\u1EA5t kh\u00F4ng th\u00E0nh c\u00F4ng v\u1EDBi m\u00E3 l\u1ED7i
-min_max_limits=Gi\u1EDBi h\u1EA1n l\u1EDBn nh\u1EA5t - nh\u1ECF nh\u1EA5t
-left_description=M\u00F4 t\u1EA3 v\u1EBF tr\u00E1i
-comment=Ch\u00FA th\u00EDch
-dataelement_history=L\u1ECBch s\u1EED ph\u1EA7n t\u1EED d\u1EEF li\u1EC7u
-minimum_must_less_than_maximum=Gi\u00E1 tr\u1ECB nh\u1ECF nh\u1EA5t ph\u1EA3i nh\u1ECF h\u01A1n gi\u00E1 tr\u1ECB l\u1EDBn nh\u1EA5t
-unsuccessful_validation=Gi\u00E1 tr\u1ECB kh\u00F4ng h\u1EE3p l\u1EC7. C\u1EE5 th\u1EC3 nh\u01B0 sau\:
-specify_minimum_value=Vui l\u00F2ng ch\u1EC9 \u0111\u1ECBnh gi\u00E1 tr\u1ECB nh\u1ECF nh\u1EA5t
+validate=Ki\u1ec3m tra t\u00ednh h\u1ee3p l\u1ec7
+import_from_excel=Nh\u1eadp t\u1eeb file Excel (M\u1eabu \u0111\u00e3 \u0111\u01b0\u1ee3c xu\u1ea5t ra)
+saving_comment_failed_status_code=L\u01b0u ch\u00fa th\u00edch kh\u00f4ng th\u00e0nh c\u00f4ng v\u1edbi m\u00e3 tr\u1ea1ng th\u00e1i
+description=M\u00f4 t\u1ea3
+use_short_names=S\u1eed d\u1ee5ng t\u00ean vi\u1ebft t\u1eaft
+saving_value_failed_error_code=L\u01b0u gi\u00e1 tr\u1ecb kh\u00f4ng th\u00e0nh c\u00f4ng v\u1edbi m\u00e3 l\u1ed7i
+entry=Gi\u00e1 tr\u1ecb
+data_set=T\u1eadp h\u1ee3p d\u1eef li\u1ec7u
+dataelement_comment=Ch\u00fa th\u00edch
+confirm_undo=B\u1ea1n c\u00f3 ch\u1eafc ch\u1eafn b\u1ea1n s\u1ebd x\u00f3a b\u1ecf vi\u1ec7c \u0111\u0103ng k\u00ed n\u00e0y?
+successful_validation=Gi\u00e1 tr\u1ecb h\u1ee3p l\u1ec7
+data_entry=Nh\u1eadp d\u1eef li\u1ec7u
+stored_by=Ng\u01b0\u1eddi nh\u1eadp li\u1ec7u
+order_by_entry=Th\u1ee9 t\u1ef1 theo \u0111\u0103ng k\u00fd
+saving_value_failed_status_code=L\u01b0u gi\u00e1 tr\u1ecb kh\u00f4ng th\u00e0nh c\u00f4ng v\u1edbi m\u00e3 tr\u1ea1ng th\u00e1i
+max_limit=Gi\u1edbi h\u1ea1n cao nh\u1ea5t
+dv_deleted=\u0110\u00e3 x\u00f3a
+delete_min_max_values=X\u00f3a gi\u00e1 tr\u1ecb nh\u1ecf nh\u1ea5t / l\u1edbn nh\u1ea5t
+saving_comment_failed_error_code=L\u01b0u ch\u00fa th\u00edch kh\u00f4ng th\u00e0nh c\u00f4ng v\u1edbi m\u00e3 l\u1ed7i
+organisation_unit=\u0110\u01a1n v\u1ecb
+value_of_data_element_greater=Gi\u00e1 tr\u1ecb c\u1ee7a th\u00e0nh ph\u1ea7n d\u1eef li\u1ec7u sau l\u1edbn h\u01a1n gi\u00e1 tr\u1ecb l\u1edbn nh\u1ea5t cho ph\u00e9p
+yes=C\u00f3
+max=L\u1edbn nh\u1ea5t
+generate_min_max=T\u1ea1o gi\u1edbi b\u1ea1n min/max
+date=Ng\u00e0y
+audit_operation=Lo\u1ea1i thao t\u00e1c
+validation_result=K\u1ebft qu\u1ea3 ki\u1ec3m tra t\u00ednh h\u1ee3p l\u1ec7
+down=Xu\u1ed1ng
+dv_updated=\u0110\u00e3 c\u1eadp nh\u1eadt
+value_of_data_element_less=Gi\u00e1 tr\u1ecb c\u1ee7a th\u00e0nh ph\u1ea7n d\u1eef li\u1ec7u th\u1ea5p h\u01a1n gi\u00e1 tr\u1ecb nh\u1ecf nh\u1ea5t cho ph\u00e9p
+save=L\u01b0u
+saving_minmax_failed_error_code=L\u01b0u gi\u00e1 tr\u1ecb l\u1edbn nh\u1ea5t/nh\u1ecf nh\u1ea5t kh\u00f4ng th\u00e0nh c\u00f4ng v\u1edbi m\u00e3 l\u1ed7i
+min_max_limits=Gi\u1edbi h\u1ea1n l\u1edbn nh\u1ea5t - nh\u1ecf nh\u1ea5t
+left_description=M\u00f4 t\u1ea3 v\u1ebf tr\u00e1i
+comment=Ch\u00fa th\u00edch
+dataelement_history=L\u1ecbch s\u1eed ph\u1ea7n t\u1eed d\u1eef li\u1ec7u
+minimum_must_less_than_maximum=Gi\u00e1 tr\u1ecb nh\u1ecf nh\u1ea5t ph\u1ea3i nh\u1ecf h\u01a1n gi\u00e1 tr\u1ecb l\u1edbn nh\u1ea5t
+unsuccessful_validation=Gi\u00e1 tr\u1ecb kh\u00f4ng h\u1ee3p l\u1ec7. C\u1ee5 th\u1ec3 nh\u01b0 sau\:
+specify_minimum_value=Vui l\u00f2ng ch\u1ec9 \u0111\u1ecbnh gi\u00e1 tr\u1ecb nh\u1ecf nh\u1ea5t
 equal_to=
-code=M\u00E3 ph\u1EA7n t\u1EED d\u1EEF li\u1EC7u
-use_section_form=Nh\u1EADp theo t\u1EEB ph\u1EA7n
-change_order=\u0110\u1ED5i th\u1EE9 t\u1EF1
-specify_valid_input_date=Vui l\u00F2ng ch\u1EC9 \u0111\u1ECBnh m\u1ED9t ng\u00E0y nh\u1EADp h\u1EE3p l\u1EC7
+code=M\u00e3 ph\u1ea7n t\u1eed d\u1eef li\u1ec7u
+use_section_form=Nh\u1eadp theo t\u1eeb ph\u1ea7n
+change_order=\u0110\u1ed5i th\u1ee9 t\u1ef1
+specify_valid_input_date=Vui l\u00f2ng ch\u1ec9 \u0111\u1ecbnh m\u1ed9t ng\u00e0y nh\u1eadp h\u1ee3p l\u1ec7
 not_equal_to=
-audit_stored_by=Th\u1EF1c hi\u1EC7n b\u1EDFi
-value=Gi\u00E1 tr\u1ECB
-specify_maximum_value=Vui l\u00F2ng ch\u1EC9 \u0111\u1ECBnh gi\u00E1 tr\u1ECB l\u1EDBn nh\u1EA5t
-operator=To\u00E1n t\u1EED
-no_dataelement_selected=Kh\u00F4ng th\u00E0nh ph\u1EA7n d\u1EEF li\u1EC7u n\u00E0o \u0111\u01B0\u1EE3c ch\u1ECDn
-min_max_values=Gi\u00E1 tr\u1ECB l\u1EDBn nh\u1EA5t/nh\u1ECF nh\u1EA5t
-data_element=Ph\u1EA7n t\u1EED d\u1EEF li\u1EC7u
-please_design_a_custom_form=Vui l\u00F2ng thi\u1EBFt k\u1EBF m\u1ED9t giao di\u1EC7n cho t\u1EADp h\u1EE3p d\u1EEF li\u1EC7u n\u00E0y\!
-data_element_order=Th\u1EE9 t\u1EF1 th\u00E0nh ph\u1EA7n d\u1EEF li\u1EC7u
-up=L\u00EAn
-minimum_value_must_integer=Gi\u00E1 tr\u1ECB nh\u1ECF nh\u1EA5t ph\u1EA3i l\u00E0 m\u1ED9t s\u1ED1 nguy\u00EAn
-yes_no=Kh\u00F4ng/c\u00F3
-close=\u0110\u00F3ng
-save_calculated=L\u01B0u c\u00E1c gi\u00E1 tr\u1ECB \u0111\u00E3 \u0111\u01B0\u1EE3c t\u00EDnh to\u00E1n
-value_date=Gi\u00E1 tr\u1ECB ng\u00E0y th\u00E1ng
-generate_values=Ph\u00E1t sinh gi\u00E1 tr\u1ECB
-type=Ki\u1EC3u d\u1EEF li\u1EC7u
-interpolation=Ph\u00E9p n\u1ED9i suy
-no_organisationunit_selected=Kh\u00F4ng \u0111\u01A1n v\u1ECB n\u00E0o \u0111\u01B0\u1EE3c ch\u1ECDn
-nr=S\u1ED1
-audit_value=Ki\u1EC3m tra gi\u00E1 tr\u1ECB
-use_default_form=D\u00F9ng giao di\u1EC7n m\u1EB7c \u0111\u1ECBnh
-no=Kh\u00F4ng
-edit_min_max_for=Ch\u1EC9nh s\u1EEDa gi\u00E1 tr\u1ECB nh\u1ECF nh\u1EA5t / l\u1EDBn nh\u1EA5t cho
-min_limit=Gi\u1EDBi h\u1EA1n th\u1EA5p nh\u1EA5t
-later_periods=Th\u1EDDi k\u1EF3 sau
-custom_comment=Ch\u00FA th\u00EDch ng\u1EABu nhi\u00EAn
-period=Th\u1EDDi \u0111i\u1EC3m
-no_outlier_values_found=Kh\u00F4ng t\u00ECm th\u1EA5y gi\u00E1 tr\u1ECB b\u00EAn ngo\u00E0i n\u00E0o.
-calculated_data_elements=C\u00E1c th\u00E0nh ph\u1EA7n d\u1EEF li\u1EC7u \u0111\u00E3 \u0111\u01B0\u1EE3c t\u00EDnh to\u00E1n
-name=T\u00EAn
-complete=Ho\u00E0n Ch\u1EC9nh
-order_by_code=Th\u1EE9 t\u1EF1 theo m\u00E3
-timestamp=Th\u1EDDi \u0111i\u1EC3m
-generate_missing_values=Ph\u00E1t sinh nh\u1EEFng gi\u00E1 tr\u1ECB ch\u01B0a c\u00F3
-change=Thay \u0111\u1ED5i
-use_standard_form=Nh\u1EADp theo m\u1EABu chu\u1EA9n
+audit_stored_by=Th\u1ef1c hi\u1ec7n b\u1edfi
+value=Gi\u00e1 tr\u1ecb
+specify_maximum_value=Vui l\u00f2ng ch\u1ec9 \u0111\u1ecbnh gi\u00e1 tr\u1ecb l\u1edbn nh\u1ea5t
+operator=To\u00e1n t\u1eed
+no_dataelement_selected=Kh\u00f4ng th\u00e0nh ph\u1ea7n d\u1eef li\u1ec7u n\u00e0o \u0111\u01b0\u1ee3c ch\u1ecdn
+min_max_values=Gi\u00e1 tr\u1ecb l\u1edbn nh\u1ea5t/nh\u1ecf nh\u1ea5t
+data_element=Ph\u1ea7n t\u1eed d\u1eef li\u1ec7u
+please_design_a_custom_form=Vui l\u00f2ng thi\u1ebft k\u1ebf m\u1ed9t giao di\u1ec7n cho t\u1eadp h\u1ee3p d\u1eef li\u1ec7u n\u00e0y\!
+data_element_order=Th\u1ee9 t\u1ef1 th\u00e0nh ph\u1ea7n d\u1eef li\u1ec7u
+up=L\u00ean
+minimum_value_must_integer=Gi\u00e1 tr\u1ecb nh\u1ecf nh\u1ea5t ph\u1ea3i l\u00e0 m\u1ed9t s\u1ed1 nguy\u00ean
+yes_no=Kh\u00f4ng/c\u00f3
+close=\u0110\u00f3ng
+save_calculated=L\u01b0u c\u00e1c gi\u00e1 tr\u1ecb \u0111\u00e3 \u0111\u01b0\u1ee3c t\u00ednh to\u00e1n
+value_date=Gi\u00e1 tr\u1ecb ng\u00e0y th\u00e1ng
+generate_values=Ph\u00e1t sinh gi\u00e1 tr\u1ecb
+type=Ki\u1ec3u d\u1eef li\u1ec7u
+interpolation=Ph\u00e9p n\u1ed9i suy
+no_organisationunit_selected=Kh\u00f4ng \u0111\u01a1n v\u1ecb n\u00e0o \u0111\u01b0\u1ee3c ch\u1ecdn
+nr=S\u1ed1
+audit_value=Ki\u1ec3m tra gi\u00e1 tr\u1ecb
+use_default_form=D\u00f9ng giao di\u1ec7n m\u1eb7c \u0111\u1ecbnh
+no=Kh\u00f4ng
+edit_min_max_for=Ch\u1ec9nh s\u1eeda gi\u00e1 tr\u1ecb nh\u1ecf nh\u1ea5t / l\u1edbn nh\u1ea5t cho
+min_limit=Gi\u1edbi h\u1ea1n th\u1ea5p nh\u1ea5t
+later_periods=Th\u1eddi k\u1ef3 sau
+custom_comment=Ch\u00fa th\u00edch ng\u1eabu nhi\u00ean
+period=Th\u1eddi \u0111i\u1ec3m
+no_outlier_values_found=Kh\u00f4ng t\u00ecm th\u1ea5y gi\u00e1 tr\u1ecb b\u00ean ngo\u00e0i n\u00e0o.
+calculated_data_elements=C\u00e1c th\u00e0nh ph\u1ea7n d\u1eef li\u1ec7u \u0111\u00e3 \u0111\u01b0\u1ee3c t\u00ednh to\u00e1n
+name=T\u00ean
+complete=Ho\u00e0n Ch\u1ec9nh
+order_by_code=Th\u1ee9 t\u1ef1 theo m\u00e3
+timestamp=Th\u1eddi \u0111i\u1ec3m
+generate_missing_values=Ph\u00e1t sinh nh\u1eefng gi\u00e1 tr\u1ecb ch\u01b0a c\u00f3
+change=Thay \u0111\u1ed5i
+use_standard_form=Nh\u1eadp theo m\u1eabu chu\u1ea9n
 less_than=
-move=Chuy\u1EC3n
-data_entry_is_not_possible=Kh\u00F4ng th\u1EC3 nh\u1EADp d\u1EEF li\u1EC7u v\u00EC t\u1EADp h\u1EE3p d\u1EEF li\u1EC7u ch\u01B0a c\u00F3 ph\u1EA7n t\u1EED.
-dv_added=\u0110\u00E3 th\u00EAm
-no_option_selected=Kh\u00F4ng t\u00F9y ch\u1ECDn n\u00E0o \u0111\u01B0\u1EE3c ch\u1ECDn
-right_description=M\u00F4 t\u1EA3 v\u1EBF ph\u1EA3i
-move_up=Di chuy\u1EC3n l\u00EAn tr\u00EAn
-reset_order_inherit=Thi\u1EBFt l\u1EADp th\u1EE9 t\u1EF1/th\u1EEBa k\u1EBF t\u1EEB cha
-generate_missing_value=Ph\u00E1t sinh gi\u00E1 tr\u1ECB ch\u01B0a c\u00F3
-no_value=Kh\u00F4ng c\u00F3 gi\u00E1 tr\u1ECB
-not_set=Ch\u01B0a thi\u1EBFt l\u1EADp
-expression=Bi\u1EC3u th\u1EE9c
-specify_input_date=Vui l\u00F2ng ch\u1EC9 \u0111\u1ECBnh ng\u00E0y nh\u1EADp
-average=Trung b\u00ECnh
-earlier_periods=Th\u1EDDi k\u1EF3 tr\u01B0\u1EDBc
-validation_rule=Quy lu\u1EADt ki\u1EC3m tra t\u00EDnh h\u1EE3p l\u1EC7
-text=Chu\u1ED7i
-saving_zero_values_unnecessary=L\u01B0u tr\u1EEF gi\u00E1 tr\u1ECB 0 th\u00EC kh\u00F4ng c\u1EA7n thi\u1EBFt theo nh\u01B0 h\u1EC7 th\u1ED1ng c\u1EE7a b\u1EA1n \u0111\u00E3 c\u00E0i \u0111\u1EB7t\!
-edit_min_max=Ch\u1EC9nh s\u1EEDa gi\u00E1 tr\u1ECB nh\u1ECF nh\u1EA5t / l\u1EDBn nh\u1EA5t
-maximum_value_must_integer=Gi\u00E1 tr\u1ECB l\u1EDBn nh\u1EA5t ph\u1EA3i l\u00E0 m\u1ED9t s\u1ED1 nguy\u00EAn
-audit_from=T\u1EEB
-confirm_complete=B\u1EA1n c\u00F3 ch\u1EAFc ch\u1EAFn t\u1EADp h\u1EE3p d\u1EEF li\u1EC7u n\u00E0y \u0111\u00E3 ho\u00E0n ch\u1EC9nh?
-undo=S\u1EEDa l\u1EA1i b\u00E1o c\u00E1o
-no_comment=Kh\u00F4ng c\u00F3 ch\u00FA th\u00EDch
-audit_time=Th\u1EDDi gian ki\u1EC3m tra
-maximum=L\u1EDBn nh\u1EA5t
-value_type=Lo\u1EA1i gi\u00E1 tr\u1ECB
-followup=Ti\u1EBFp theo
-audit_to=\u0110\u1EBFn
-the_following_values_are_outliers=C\u00E1c gi\u00E1 tr\u1ECB sau \u0111\u00E2y \u0111\u01B0\u1EE3c xem nh\u01B0 kh\u00F4ng c\u00F3 trong h\u1EC7 th\u1ED1ng.
-value_must_integer=Gi\u00E1 tr\u1ECB ph\u1EA3i l\u00E0 m\u1ED9t s\u1ED1 nguy\u00EAn
-order_by_name=Th\u1EE9 t\u1EF1 theo t\u00EAn
-select=Ch\u1ECDn
-number=S\u1ED1
-move_down=Di chuy\u1EC3n xu\u1ED1ng d\u01B0\u1EDBi
-export_entry_template=Xu\u1EA5t m\u00E0n h\u00ECnh nh\u1EADp li\u1EC7u ra file Excel
+move=Chuy\u1ec3n
+data_entry_is_not_possible=Kh\u00f4ng th\u1ec3 nh\u1eadp d\u1eef li\u1ec7u v\u00ec t\u1eadp h\u1ee3p d\u1eef li\u1ec7u ch\u01b0a c\u00f3 ph\u1ea7n t\u1eed.
+dv_added=\u0110\u00e3 th\u00eam
+no_option_selected=Kh\u00f4ng t\u00f9y ch\u1ecdn n\u00e0o \u0111\u01b0\u1ee3c ch\u1ecdn
+right_description=M\u00f4 t\u1ea3 v\u1ebf ph\u1ea3i
+move_up=Di chuy\u1ec3n l\u00ean tr\u00ean
+reset_order_inherit=Thi\u1ebft l\u1eadp th\u1ee9 t\u1ef1/th\u1eeba k\u1ebf t\u1eeb cha
+generate_missing_value=Ph\u00e1t sinh gi\u00e1 tr\u1ecb ch\u01b0a c\u00f3
+no_value=Kh\u00f4ng c\u00f3 gi\u00e1 tr\u1ecb
+not_set=Ch\u01b0a thi\u1ebft l\u1eadp
+expression=Bi\u1ec3u th\u1ee9c
+specify_input_date=Vui l\u00f2ng ch\u1ec9 \u0111\u1ecbnh ng\u00e0y nh\u1eadp
+average=Trung b\u00ecnh
+earlier_periods=Th\u1eddi k\u1ef3 tr\u01b0\u1edbc
+validation_rule=Quy lu\u1eadt ki\u1ec3m tra t\u00ednh h\u1ee3p l\u1ec7
+text=Chu\u1ed7i
+saving_zero_values_unnecessary=L\u01b0u tr\u1eef gi\u00e1 tr\u1ecb 0 th\u00ec kh\u00f4ng c\u1ea7n thi\u1ebft theo nh\u01b0 h\u1ec7 th\u1ed1ng c\u1ee7a b\u1ea1n \u0111\u00e3 c\u00e0i \u0111\u1eb7t\!
+edit_min_max=Ch\u1ec9nh s\u1eeda gi\u00e1 tr\u1ecb nh\u1ecf nh\u1ea5t / l\u1edbn nh\u1ea5t
+maximum_value_must_integer=Gi\u00e1 tr\u1ecb l\u1edbn nh\u1ea5t ph\u1ea3i l\u00e0 m\u1ed9t s\u1ed1 nguy\u00ean
+audit_from=T\u1eeb
+confirm_complete=B\u1ea1n c\u00f3 ch\u1eafc ch\u1eafn t\u1eadp h\u1ee3p d\u1eef li\u1ec7u n\u00e0y \u0111\u00e3 ho\u00e0n ch\u1ec9nh?
+undo=S\u1eeda l\u1ea1i b\u00e1o c\u00e1o
+no_comment=Kh\u00f4ng c\u00f3 ch\u00fa th\u00edch
+audit_time=Th\u1eddi gian ki\u1ec3m tra
+maximum=L\u1edbn nh\u1ea5t
+value_type=Lo\u1ea1i gi\u00e1 tr\u1ecb
+followup=Ti\u1ebfp theo
+audit_to=\u0110\u1ebfn
+the_following_values_are_outliers=C\u00e1c gi\u00e1 tr\u1ecb sau \u0111\u00e2y \u0111\u01b0\u1ee3c xem nh\u01b0 kh\u00f4ng c\u00f3 trong h\u1ec7 th\u1ed1ng.
+value_must_integer=Gi\u00e1 tr\u1ecb ph\u1ea3i l\u00e0 m\u1ed9t s\u1ed1 nguy\u00ean
+order_by_name=Th\u1ee9 t\u1ef1 theo t\u00ean
+select=Ch\u1ecdn
+number=S\u1ed1
+move_down=Di chuy\u1ec3n xu\u1ed1ng d\u01b0\u1edbi
+export_entry_template=Xu\u1ea5t m\u00e0n h\u00ecnh nh\u1eadp li\u1ec7u ra file Excel
 greater_than=
-min=Nh\u1ECF nh\u1EA5t
-minimum=Nh\u1ECF nh\u1EA5t
-cancel=H\u1EE7y b\u1ECF
-the_following_values_violates_rules=C\u00E1c gi\u00E1 tr\u1ECB sau \u0111\u00E2y kh\u00F4ng h\u1EE3p l\u1EC7
-no_period_selected=Kh\u00F4ng th\u1EDDi \u0111i\u1EC3m n\u00E0o \u0111\u01B0\u1EE3c ch\u1ECDn
-audit=Ki\u1EC3m tra gi\u00E1 tr\u1ECB d\u1EEF li\u1EC7u
-multidimensional_data_entry=Nh\u1EADp d\u1EEF li\u1EC7u \u0111a chi\u1EC1u
-run_validation=Ki\u1EC3m tra d\u1EEF li\u1EC7u
+min=Nh\u1ecf nh\u1ea5t
+minimum=Nh\u1ecf nh\u1ea5t
+cancel=H\u1ee7y b\u1ecf
+the_following_values_violates_rules=C\u00e1c gi\u00e1 tr\u1ecb sau \u0111\u00e2y kh\u00f4ng h\u1ee3p l\u1ec7
+no_period_selected=Kh\u00f4ng th\u1eddi \u0111i\u1ec3m n\u00e0o \u0111\u01b0\u1ee3c ch\u1ecdn
+audit=Ki\u1ec3m tra gi\u00e1 tr\u1ecb d\u1eef li\u1ec7u
+multidimensional_data_entry=Nh\u1eadp d\u1eef li\u1ec7u \u0111a chi\u1ec1u
+run_validation=Ki\u1ec3m tra d\u1eef li\u1ec7u
 #Resource generated by I18n Resource Editor
 #Fri Apr 02 09:38:23 ICT 2010
-validate=Ki\u1EC3m tra t\u00EDnh h\u1EE3p l\u1EC7
-import_from_excel=Nh\u1EADp t\u1EEB file Excel (M\u1EABu \u0111\u00E3 \u0111\u01B0\u1EE3c xu\u1EA5t ra)
-saving_comment_failed_status_code=L\u01B0u ch\u00FA th\u00EDch kh\u00F4ng th\u00E0nh c\u00F4ng v\u1EDBi m\u00E3 tr\u1EA1ng th\u00E1i
-description=M\u00F4 t\u1EA3
-use_short_names=S\u1EED d\u1EE5ng t\u00EAn vi\u1EBFt t\u1EAFt
-saving_value_failed_error_code=L\u01B0u gi\u00E1 tr\u1ECB kh\u00F4ng th\u00E0nh c\u00F4ng v\u1EDBi m\u00E3 l\u1ED7i
-entry=Gi\u00E1 tr\u1ECB
-datavalue_history=L\u1ECBch s\u1EED gi\u00E1 tr\u1ECB d\u1EEF li\u1EC7u
-data_set=T\u1EADp h\u1EE3p d\u1EEF li\u1EC7u
-dataelement_comment=Ch\u00FA th\u00EDch
-confirm_undo=B\u1EA1n c\u00F3 ch\u1EAFc ch\u1EAFn b\u1EA1n s\u1EBD x\u00F3a b\u1ECF vi\u1EC7c \u0111\u0103ng k\u00ED n\u00E0y?
-successful_validation=Gi\u00E1 tr\u1ECB h\u1EE3p l\u1EC7
-data_entry=Nh\u1EADp d\u1EEF li\u1EC7u
-stored_by=Ng\u01B0\u1EDDi nh\u1EADp li\u1EC7u
-order_by_entry=Th\u1EE9 t\u1EF1 theo \u0111\u0103ng k\u00FD
-saving_value_failed_status_code=L\u01B0u gi\u00E1 tr\u1ECB kh\u00F4ng th\u00E0nh c\u00F4ng v\u1EDBi m\u00E3 tr\u1EA1ng th\u00E1i
-max_limit=Gi\u1EDBi h\u1EA1n cao nh\u1EA5t
-dv_deleted=\u0110\u00E3 x\u00F3a
-delete_min_max_values=X\u00F3a gi\u00E1 tr\u1ECB nh\u1ECF nh\u1EA5t / l\u1EDBn nh\u1EA5t
-saving_comment_failed_error_code=L\u01B0u ch\u00FA th\u00EDch kh\u00F4ng th\u00E0nh c\u00F4ng v\u1EDBi m\u00E3 l\u1ED7i
-organisation_unit=\u0110\u01A1n v\u1ECB
-value_of_data_element_greater=Gi\u00E1 tr\u1ECB c\u1EE7a th\u00E0nh ph\u1EA7n d\u1EEF li\u1EC7u sau l\u1EDBn h\u01A1n gi\u00E1 tr\u1ECB l\u1EDBn nh\u1EA5t cho ph\u00E9p
-yes=C\u00F3
-max=L\u1EDBn nh\u1EA5t
-generate_min_max=T\u1EA1o gi\u1EDBi b\u1EA1n min/max
-date=Ng\u00E0y
-audit_operation=Lo\u1EA1i thao t\u00E1c
-validation_result=K\u1EBFt qu\u1EA3 ki\u1EC3m tra t\u00EDnh h\u1EE3p l\u1EC7
-down=Xu\u1ED1ng
-dv_updated=\u0110\u00E3 c\u1EADp nh\u1EADt
-value_of_data_element_less=Gi\u00E1 tr\u1ECB c\u1EE7a th\u00E0nh ph\u1EA7n d\u1EEF li\u1EC7u th\u1EA5p h\u01A1n gi\u00E1 tr\u1ECB nh\u1ECF nh\u1EA5t cho ph\u00E9p
-save=L\u01B0u
-saving_minmax_failed_error_code=L\u01B0u gi\u00E1 tr\u1ECB l\u1EDBn nh\u1EA5t/nh\u1ECF nh\u1EA5t kh\u00F4ng th\u00E0nh c\u00F4ng v\u1EDBi m\u00E3 l\u1ED7i
-min_max_limits=Gi\u1EDBi h\u1EA1n l\u1EDBn nh\u1EA5t - nh\u1ECF nh\u1EA5t
-left_description=M\u00F4 t\u1EA3 v\u1EBF tr\u00E1i
-comment=Ch\u00FA th\u00EDch
-dataelement_history=L\u1ECBch s\u1EED ph\u1EA7n t\u1EED d\u1EEF li\u1EC7u
-minimum_must_less_than_maximum=Gi\u00E1 tr\u1ECB nh\u1ECF nh\u1EA5t ph\u1EA3i nh\u1ECF h\u01A1n gi\u00E1 tr\u1ECB l\u1EDBn nh\u1EA5t
-unsuccessful_validation=Gi\u00E1 tr\u1ECB kh\u00F4ng h\u1EE3p l\u1EC7. C\u1EE5 th\u1EC3 nh\u01B0 sau\:
-specify_minimum_value=Vui l\u00F2ng ch\u1EC9 \u0111\u1ECBnh gi\u00E1 tr\u1ECB nh\u1ECF nh\u1EA5t
+validate=Ki\u1ec3m tra t\u00ednh h\u1ee3p l\u1ec7
+import_from_excel=Nh\u1eadp t\u1eeb file Excel (M\u1eabu \u0111\u00e3 \u0111\u01b0\u1ee3c xu\u1ea5t ra)
+saving_comment_failed_status_code=L\u01b0u ch\u00fa th\u00edch kh\u00f4ng th\u00e0nh c\u00f4ng v\u1edbi m\u00e3 tr\u1ea1ng th\u00e1i
+description=M\u00f4 t\u1ea3
+use_short_names=S\u1eed d\u1ee5ng t\u00ean vi\u1ebft t\u1eaft
+saving_value_failed_error_code=L\u01b0u gi\u00e1 tr\u1ecb kh\u00f4ng th\u00e0nh c\u00f4ng v\u1edbi m\u00e3 l\u1ed7i
+entry=Gi\u00e1 tr\u1ecb
+datavalue_history=L\u1ecbch s\u1eed gi\u00e1 tr\u1ecb d\u1eef li\u1ec7u
+data_set=T\u1eadp h\u1ee3p d\u1eef li\u1ec7u
+dataelement_comment=Ch\u00fa th\u00edch
+confirm_undo=B\u1ea1n c\u00f3 ch\u1eafc ch\u1eafn b\u1ea1n s\u1ebd x\u00f3a b\u1ecf vi\u1ec7c \u0111\u0103ng k\u00ed n\u00e0y?
+successful_validation=Gi\u00e1 tr\u1ecb h\u1ee3p l\u1ec7
+data_entry=Nh\u1eadp d\u1eef li\u1ec7u
+stored_by=Ng\u01b0\u1eddi nh\u1eadp li\u1ec7u
+order_by_entry=Th\u1ee9 t\u1ef1 theo \u0111\u0103ng k\u00fd
+saving_value_failed_status_code=L\u01b0u gi\u00e1 tr\u1ecb kh\u00f4ng th\u00e0nh c\u00f4ng v\u1edbi m\u00e3 tr\u1ea1ng th\u00e1i
+max_limit=Gi\u1edbi h\u1ea1n cao nh\u1ea5t
+dv_deleted=\u0110\u00e3 x\u00f3a
+delete_min_max_values=X\u00f3a gi\u00e1 tr\u1ecb nh\u1ecf nh\u1ea5t / l\u1edbn nh\u1ea5t
+saving_comment_failed_error_code=L\u01b0u ch\u00fa th\u00edch kh\u00f4ng th\u00e0nh c\u00f4ng v\u1edbi m\u00e3 l\u1ed7i
+organisation_unit=\u0110\u01a1n v\u1ecb
+value_of_data_element_greater=Gi\u00e1 tr\u1ecb c\u1ee7a th\u00e0nh ph\u1ea7n d\u1eef li\u1ec7u sau l\u1edbn h\u01a1n gi\u00e1 tr\u1ecb l\u1edbn nh\u1ea5t cho ph\u00e9p
+yes=C\u00f3
+max=L\u1edbn nh\u1ea5t
+generate_min_max=T\u1ea1o gi\u1edbi b\u1ea1n min/max
+date=Ng\u00e0y
+audit_operation=Lo\u1ea1i thao t\u00e1c
+validation_result=K\u1ebft qu\u1ea3 ki\u1ec3m tra t\u00ednh h\u1ee3p l\u1ec7
+down=Xu\u1ed1ng
+dv_updated=\u0110\u00e3 c\u1eadp nh\u1eadt
+value_of_data_element_less=Gi\u00e1 tr\u1ecb c\u1ee7a th\u00e0nh ph\u1ea7n d\u1eef li\u1ec7u th\u1ea5p h\u01a1n gi\u00e1 tr\u1ecb nh\u1ecf nh\u1ea5t cho ph\u00e9p
+save=L\u01b0u
+saving_minmax_failed_error_code=L\u01b0u gi\u00e1 tr\u1ecb l\u1edbn nh\u1ea5t/nh\u1ecf nh\u1ea5t kh\u00f4ng th\u00e0nh c\u00f4ng v\u1edbi m\u00e3 l\u1ed7i
+min_max_limits=Gi\u1edbi h\u1ea1n l\u1edbn nh\u1ea5t - nh\u1ecf nh\u1ea5t
+left_description=M\u00f4 t\u1ea3 v\u1ebf tr\u00e1i
+comment=Ch\u00fa th\u00edch
+dataelement_history=L\u1ecbch s\u1eed ph\u1ea7n t\u1eed d\u1eef li\u1ec7u
+minimum_must_less_than_maximum=Gi\u00e1 tr\u1ecb nh\u1ecf nh\u1ea5t ph\u1ea3i nh\u1ecf h\u01a1n gi\u00e1 tr\u1ecb l\u1edbn nh\u1ea5t
+unsuccessful_validation=Gi\u00e1 tr\u1ecb kh\u00f4ng h\u1ee3p l\u1ec7. C\u1ee5 th\u1ec3 nh\u01b0 sau\:
+specify_minimum_value=Vui l\u00f2ng ch\u1ec9 \u0111\u1ecbnh gi\u00e1 tr\u1ecb nh\u1ecf nh\u1ea5t
 equal_to=
-code=M\u00E3 ph\u1EA7n t\u1EED d\u1EEF li\u1EC7u
-use_section_form=Nh\u1EADp theo t\u1EEB ph\u1EA7n
-change_order=\u0110\u1ED5i th\u1EE9 t\u1EF1
-specify_valid_input_date=Vui l\u00F2ng ch\u1EC9 \u0111\u1ECBnh m\u1ED9t ng\u00E0y nh\u1EADp h\u1EE3p l\u1EC7
+code=M\u00e3 ph\u1ea7n t\u1eed d\u1eef li\u1ec7u
+use_section_form=Nh\u1eadp theo t\u1eeb ph\u1ea7n
+change_order=\u0110\u1ed5i th\u1ee9 t\u1ef1
+specify_valid_input_date=Vui l\u00f2ng ch\u1ec9 \u0111\u1ecbnh m\u1ed9t ng\u00e0y nh\u1eadp h\u1ee3p l\u1ec7
 not_equal_to=
-audit_stored_by=Th\u1EF1c hi\u1EC7n b\u1EDFi
-value=Gi\u00E1 tr\u1ECB
-specify_maximum_value=Vui l\u00F2ng ch\u1EC9 \u0111\u1ECBnh gi\u00E1 tr\u1ECB l\u1EDBn nh\u1EA5t
-operator=To\u00E1n t\u1EED
-on=V\u00E0o l\u00FAc
-no_dataelement_selected=Kh\u00F4ng th\u00E0nh ph\u1EA7n d\u1EEF li\u1EC7u n\u00E0o \u0111\u01B0\u1EE3c ch\u1ECDn
-min_max_values=Gi\u00E1 tr\u1ECB l\u1EDBn nh\u1EA5t/nh\u1ECF nh\u1EA5t
-data_element=Ph\u1EA7n t\u1EED d\u1EEF li\u1EC7u
-please_design_a_custom_form=Vui l\u00F2ng thi\u1EBFt k\u1EBF m\u1ED9t giao di\u1EC7n cho t\u1EADp h\u1EE3p d\u1EEF li\u1EC7u n\u00E0y\!
-data_element_order=Th\u1EE9 t\u1EF1 th\u00E0nh ph\u1EA7n d\u1EEF li\u1EC7u
-up=L\u00EAn
-minimum_value_must_integer=Gi\u00E1 tr\u1ECB nh\u1ECF nh\u1EA5t ph\u1EA3i l\u00E0 m\u1ED9t s\u1ED1 nguy\u00EAn
-yes_no=Kh\u00F4ng/c\u00F3
-close=\u0110\u00F3ng
-history_not_valid=L\u1ECBch s\u1EEF d\u1EEF li\u1EC7u kh\u00F4ng \u0111\u01B0\u1EE3c \u00E1p d\u1EE5ng cho ph\u1EA7n t\u1EED d\u1EEF li\u1EC7u n\u00E0y\!
-save_calculated=L\u01B0u c\u00E1c gi\u00E1 tr\u1ECB \u0111\u00E3 \u0111\u01B0\u1EE3c t\u00EDnh to\u00E1n
-value_date=Gi\u00E1 tr\u1ECB ng\u00E0y th\u00E1ng
-generate_values=Ph\u00E1t sinh gi\u00E1 tr\u1ECB
-type=Ki\u1EC3u d\u1EEF li\u1EC7u
-interpolation=Ph\u00E9p n\u1ED9i suy
-no_organisationunit_selected=Kh\u00F4ng \u0111\u01A1n v\u1ECB n\u00E0o \u0111\u01B0\u1EE3c ch\u1ECDn
-nr=S\u1ED1
-audit_value=Ki\u1EC3m tra gi\u00E1 tr\u1ECB
-use_default_form=D\u00F9ng giao di\u1EC7n m\u1EB7c \u0111\u1ECBnh
-no=Kh\u00F4ng
-edit_min_max_for=Ch\u1EC9nh s\u1EEDa gi\u00E1 tr\u1ECB nh\u1ECF nh\u1EA5t / l\u1EDBn nh\u1EA5t cho
-later_periods=Th\u1EDDi k\u1EF3 sau
-min_limit=Gi\u1EDBi h\u1EA1n th\u1EA5p nh\u1EA5t
-custom_comment=Ch\u00FA th\u00EDch ng\u1EABu nhi\u00EAn
-period=Th\u1EDDi \u0111i\u1EC3m
-to=th\u00E0nh
-no_outlier_values_found=Kh\u00F4ng t\u00ECm th\u1EA5y gi\u00E1 tr\u1ECB b\u00EAn ngo\u00E0i n\u00E0o.
-calculated_data_elements=C\u00E1c th\u00E0nh ph\u1EA7n d\u1EEF li\u1EC7u \u0111\u00E3 \u0111\u01B0\u1EE3c t\u00EDnh to\u00E1n
-complete=Ho\u00E0n Ch\u1EC9nh
-order_by_code=Th\u1EE9 t\u1EF1 theo m\u00E3
-name=T\u00EAn
-generate_missing_values=Ph\u00E1t sinh nh\u1EEFng gi\u00E1 tr\u1ECB ch\u01B0a c\u00F3
-timestamp=Th\u1EDDi \u0111i\u1EC3m
-use_standard_form=Nh\u1EADp theo m\u1EABu chu\u1EA9n
-change=Thay \u0111\u1ED5i
+audit_stored_by=Th\u1ef1c hi\u1ec7n b\u1edfi
+value=Gi\u00e1 tr\u1ecb
+specify_maximum_value=Vui l\u00f2ng ch\u1ec9 \u0111\u1ecbnh gi\u00e1 tr\u1ecb l\u1edbn nh\u1ea5t
+operator=To\u00e1n t\u1eed
+on=V\u00e0o l\u00fac
+no_dataelement_selected=Kh\u00f4ng th\u00e0nh ph\u1ea7n d\u1eef li\u1ec7u n\u00e0o \u0111\u01b0\u1ee3c ch\u1ecdn
+min_max_values=Gi\u00e1 tr\u1ecb l\u1edbn nh\u1ea5t/nh\u1ecf nh\u1ea5t
+data_element=Ph\u1ea7n t\u1eed d\u1eef li\u1ec7u
+please_design_a_custom_form=Vui l\u00f2ng thi\u1ebft k\u1ebf m\u1ed9t giao di\u1ec7n cho t\u1eadp h\u1ee3p d\u1eef li\u1ec7u n\u00e0y\!
+data_element_order=Th\u1ee9 t\u1ef1 th\u00e0nh ph\u1ea7n d\u1eef li\u1ec7u
+up=L\u00ean
+minimum_value_must_integer=Gi\u00e1 tr\u1ecb nh\u1ecf nh\u1ea5t ph\u1ea3i l\u00e0 m\u1ed9t s\u1ed1 nguy\u00ean
+yes_no=Kh\u00f4ng/c\u00f3
+close=\u0110\u00f3ng
+history_not_valid=L\u1ecbch s\u1eef d\u1eef li\u1ec7u kh\u00f4ng \u0111\u01b0\u1ee3c \u00e1p d\u1ee5ng cho ph\u1ea7n t\u1eed d\u1eef li\u1ec7u n\u00e0y\!
+save_calculated=L\u01b0u c\u00e1c gi\u00e1 tr\u1ecb \u0111\u00e3 \u0111\u01b0\u1ee3c t\u00ednh to\u00e1n
+value_date=Gi\u00e1 tr\u1ecb ng\u00e0y th\u00e1ng
+generate_values=Ph\u00e1t sinh gi\u00e1 tr\u1ecb
+type=Ki\u1ec3u d\u1eef li\u1ec7u
+interpolation=Ph\u00e9p n\u1ed9i suy
+no_organisationunit_selected=Kh\u00f4ng \u0111\u01a1n v\u1ecb n\u00e0o \u0111\u01b0\u1ee3c ch\u1ecdn
+nr=S\u1ed1
+audit_value=Ki\u1ec3m tra gi\u00e1 tr\u1ecb
+use_default_form=D\u00f9ng giao di\u1ec7n m\u1eb7c \u0111\u1ecbnh
+no=Kh\u00f4ng
+edit_min_max_for=Ch\u1ec9nh s\u1eeda gi\u00e1 tr\u1ecb nh\u1ecf nh\u1ea5t / l\u1edbn nh\u1ea5t cho
+later_periods=Th\u1eddi k\u1ef3 sau
+min_limit=Gi\u1edbi h\u1ea1n th\u1ea5p nh\u1ea5t
+custom_comment=Ch\u00fa th\u00edch ng\u1eabu nhi\u00ean
+period=Th\u1eddi \u0111i\u1ec3m
+to=th\u00e0nh
+no_outlier_values_found=Kh\u00f4ng t\u00ecm th\u1ea5y gi\u00e1 tr\u1ecb b\u00ean ngo\u00e0i n\u00e0o.
+calculated_data_elements=C\u00e1c th\u00e0nh ph\u1ea7n d\u1eef li\u1ec7u \u0111\u00e3 \u0111\u01b0\u1ee3c t\u00ednh to\u00e1n
+complete=Ho\u00e0n Ch\u1ec9nh
+order_by_code=Th\u1ee9 t\u1ef1 theo m\u00e3
+name=T\u00ean
+generate_missing_values=Ph\u00e1t sinh nh\u1eefng gi\u00e1 tr\u1ecb ch\u01b0a c\u00f3
+timestamp=Th\u1eddi \u0111i\u1ec3m
+use_standard_form=Nh\u1eadp theo m\u1eabu chu\u1ea9n
+change=Thay \u0111\u1ed5i
 less_than=
-dv_added=\u0110\u00E3 th\u00EAm
-data_entry_is_not_possible=Kh\u00F4ng th\u1EC3 nh\u1EADp d\u1EEF li\u1EC7u v\u00EC t\u1EADp h\u1EE3p d\u1EEF li\u1EC7u ch\u01B0a c\u00F3 ph\u1EA7n t\u1EED.
-move=Chuy\u1EC3n
-no_option_selected=Kh\u00F4ng t\u00F9y ch\u1ECDn n\u00E0o \u0111\u01B0\u1EE3c ch\u1ECDn
-right_description=M\u00F4 t\u1EA3 v\u1EBF ph\u1EA3i
-move_up=Di chuy\u1EC3n l\u00EAn tr\u00EAn
-reset_order_inherit=Thi\u1EBFt l\u1EADp th\u1EE9 t\u1EF1/th\u1EEBa k\u1EBF t\u1EEB cha
-generate_missing_value=Ph\u00E1t sinh gi\u00E1 tr\u1ECB ch\u01B0a c\u00F3
-no_value=Kh\u00F4ng c\u00F3 gi\u00E1 tr\u1ECB
-expression=Bi\u1EC3u th\u1EE9c
-not_set=Ch\u01B0a thi\u1EBFt l\u1EADp
-specify_input_date=Vui l\u00F2ng ch\u1EC9 \u0111\u1ECBnh ng\u00E0y nh\u1EADp
-earlier_periods=Th\u1EDDi k\u1EF3 tr\u01B0\u1EDBc
-average=Trung b\u00ECnh
-saving_zero_values_unnecessary=L\u01B0u tr\u1EEF gi\u00E1 tr\u1ECB 0 th\u00EC kh\u00F4ng c\u1EA7n thi\u1EBFt theo nh\u01B0 h\u1EC7 th\u1ED1ng c\u1EE7a b\u1EA1n \u0111\u00E3 c\u00E0i \u0111\u1EB7t\!
-validation_rule=Quy lu\u1EADt ki\u1EC3m tra t\u00EDnh h\u1EE3p l\u1EC7
-text=Chu\u1ED7i
-edit_min_max=Ch\u1EC9nh s\u1EEDa gi\u00E1 tr\u1ECB nh\u1ECF nh\u1EA5t / l\u1EDBn nh\u1EA5t
-confirm_complete=B\u1EA1n c\u00F3 ch\u1EAFc ch\u1EAFn t\u1EADp h\u1EE3p d\u1EEF li\u1EC7u n\u00E0y \u0111\u00E3 ho\u00E0n ch\u1EC9nh?
-audit_from=T\u1EEB
-maximum_value_must_integer=Gi\u00E1 tr\u1ECB l\u1EDBn nh\u1EA5t ph\u1EA3i l\u00E0 m\u1ED9t s\u1ED1 nguy\u00EAn
-undo=S\u1EEDa l\u1EA1i b\u00E1o c\u00E1o
-audit_time=Th\u1EDDi gian ki\u1EC3m tra
-no_comment=Kh\u00F4ng c\u00F3 ch\u00FA th\u00EDch
-maximum=L\u1EDBn nh\u1EA5t
-value_type=Lo\u1EA1i gi\u00E1 tr\u1ECB
-change_from=thay \u0111\u1ED5i
-followup=Ti\u1EBFp theo
-the_following_values_are_outliers=C\u00E1c gi\u00E1 tr\u1ECB sau \u0111\u00E2y \u0111\u01B0\u1EE3c xem nh\u01B0 kh\u00F4ng c\u00F3 trong h\u1EC7 th\u1ED1ng.
-audit_to=\u0110\u1EBFn
-value_must_integer=Gi\u00E1 tr\u1ECB ph\u1EA3i l\u00E0 m\u1ED9t s\u1ED1 nguy\u00EAn
-order_by_name=Th\u1EE9 t\u1EF1 theo t\u00EAn
-select=Ch\u1ECDn
-number=S\u1ED1
+dv_added=\u0110\u00e3 th\u00eam
+data_entry_is_not_possible=Kh\u00f4ng th\u1ec3 nh\u1eadp d\u1eef li\u1ec7u v\u00ec t\u1eadp h\u1ee3p d\u1eef li\u1ec7u ch\u01b0a c\u00f3 ph\u1ea7n t\u1eed.
+move=Chuy\u1ec3n
+no_option_selected=Kh\u00f4ng t\u00f9y ch\u1ecdn n\u00e0o \u0111\u01b0\u1ee3c ch\u1ecdn
+right_description=M\u00f4 t\u1ea3 v\u1ebf ph\u1ea3i
+move_up=Di chuy\u1ec3n l\u00ean tr\u00ean
+reset_order_inherit=Thi\u1ebft l\u1eadp th\u1ee9 t\u1ef1/th\u1eeba k\u1ebf t\u1eeb cha
+generate_missing_value=Ph\u00e1t sinh gi\u00e1 tr\u1ecb ch\u01b0a c\u00f3
+no_value=Kh\u00f4ng c\u00f3 gi\u00e1 tr\u1ecb
+expression=Bi\u1ec3u th\u1ee9c
+not_set=Ch\u01b0a thi\u1ebft l\u1eadp
+specify_input_date=Vui l\u00f2ng ch\u1ec9 \u0111\u1ecbnh ng\u00e0y nh\u1eadp
+earlier_periods=Th\u1eddi k\u1ef3 tr\u01b0\u1edbc
+average=Trung b\u00ecnh
+saving_zero_values_unnecessary=L\u01b0u tr\u1eef gi\u00e1 tr\u1ecb 0 th\u00ec kh\u00f4ng c\u1ea7n thi\u1ebft theo nh\u01b0 h\u1ec7 th\u1ed1ng c\u1ee7a b\u1ea1n \u0111\u00e3 c\u00e0i \u0111\u1eb7t\!
+validation_rule=Quy lu\u1eadt ki\u1ec3m tra t\u00ednh h\u1ee3p l\u1ec7
+text=Chu\u1ed7i
+edit_min_max=Ch\u1ec9nh s\u1eeda gi\u00e1 tr\u1ecb nh\u1ecf nh\u1ea5t / l\u1edbn nh\u1ea5t
+confirm_complete=B\u1ea1n c\u00f3 ch\u1eafc ch\u1eafn t\u1eadp h\u1ee3p d\u1eef li\u1ec7u n\u00e0y \u0111\u00e3 ho\u00e0n ch\u1ec9nh?
+audit_from=T\u1eeb
+maximum_value_must_integer=Gi\u00e1 tr\u1ecb l\u1edbn nh\u1ea5t ph\u1ea3i l\u00e0 m\u1ed9t s\u1ed1 nguy\u00ean
+undo=S\u1eeda l\u1ea1i b\u00e1o c\u00e1o
+audit_time=Th\u1eddi gian ki\u1ec3m tra
+no_comment=Kh\u00f4ng c\u00f3 ch\u00fa th\u00edch
+maximum=L\u1edbn nh\u1ea5t
+value_type=Lo\u1ea1i gi\u00e1 tr\u1ecb
+change_from=thay \u0111\u1ed5i
+followup=Ti\u1ebfp theo
+the_following_values_are_outliers=C\u00e1c gi\u00e1 tr\u1ecb sau \u0111\u00e2y \u0111\u01b0\u1ee3c xem nh\u01b0 kh\u00f4ng c\u00f3 trong h\u1ec7 th\u1ed1ng.
+audit_to=\u0110\u1ebfn
+value_must_integer=Gi\u00e1 tr\u1ecb ph\u1ea3i l\u00e0 m\u1ed9t s\u1ed1 nguy\u00ean
+order_by_name=Th\u1ee9 t\u1ef1 theo t\u00ean
+select=Ch\u1ecdn
+number=S\u1ed1
 greater_than_or_equal_to=
-move_down=Di chuy\u1EC3n xu\u1ED1ng d\u01B0\u1EDBi
-export_entry_template=Xu\u1EA5t m\u00E0n h\u00ECnh nh\u1EADp li\u1EC7u ra file Excel
+move_down=Di chuy\u1ec3n xu\u1ed1ng d\u01b0\u1edbi
+export_entry_template=Xu\u1ea5t m\u00e0n h\u00ecnh nh\u1eadp li\u1ec7u ra file Excel
 greater_than=
-min=Nh\u1ECF nh\u1EA5t
-minimum=Nh\u1ECF nh\u1EA5t
-the_following_values_violates_rules=C\u00E1c gi\u00E1 tr\u1ECB sau \u0111\u00E2y kh\u00F4ng h\u1EE3p l\u1EC7
-cancel=H\u1EE7y b\u1ECF
-no_period_selected=Kh\u00F4ng th\u1EDDi \u0111i\u1EC3m n\u00E0o \u0111\u01B0\u1EE3c ch\u1ECDn
-audit=Ki\u1EC3m tra gi\u00E1 tr\u1ECB d\u1EEF li\u1EC7u
-multidimensional_data_entry=Nh\u1EADp d\u1EEF li\u1EC7u \u0111a chi\u1EC1u
-run_validation=Ki\u1EC3m tra d\u1EEF li\u1EC7u
+min=Nh\u1ecf nh\u1ea5t
+minimum=Nh\u1ecf nh\u1ea5t
+the_following_values_violates_rules=C\u00e1c gi\u00e1 tr\u1ecb sau \u0111\u00e2y kh\u00f4ng h\u1ee3p l\u1ec7
+cancel=H\u1ee7y b\u1ecf
+no_period_selected=Kh\u00f4ng th\u1eddi \u0111i\u1ec3m n\u00e0o \u0111\u01b0\u1ee3c ch\u1ecdn
+audit=Ki\u1ec3m tra gi\u00e1 tr\u1ecb d\u1eef li\u1ec7u
+multidimensional_data_entry=Nh\u1eadp d\u1eef li\u1ec7u \u0111a chi\u1ec1u
+run_validation=Ki\u1ec3m tra d\u1eef li\u1ec7u
+enter_digits=Ch\u1ec9 nh\u1eadp k\u00fd t\u1ef1 s\u1ed1
\ No newline at end of file

=== modified file 'dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/history.vm'
--- dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/history.vm	2010-10-08 11:12:29 +0000
+++ dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/history.vm	2010-10-12 10:00:17 +0000
@@ -19,6 +19,8 @@
     $encoder.htmlEncode( $dataElementHistory.optionCombo.name )
 </h3>
 
+<input type="hidden" id="organisationUnitId" value="$dataElementHistory.organisationUnit.id"/>
+
 <table>
 	<tr>		
 		<!-- Column 1 - Comment and Followup -->
@@ -34,18 +36,18 @@
 			        #end
 			    </select>
 			    <input id="value[$dataElementHistory.dataElement.id:$dataElementHistory.optionCombo.id].comment" type="text" value="$!encoder.htmlEncode( $dataValue.comment )" #if( $auth.hasAccess( "dhis-web-dataentry", "saveComment" ))
-			        onblur="commentLeft( $dataElementHistory.dataElement.id, $dataElementHistory.optionCombo.id )" #else disabled="disabled" #end style="width:100% #if( !$dataValue.comment || $standardComments.contains( $dataValue.comment )) ;display:none #end">
+			        onblur="commentLeft( $dataElementHistory.dataElement.id, $dataElementHistory.optionCombo.id )" #else disabled="disabled" #end style="width:100% #if( !$dataValue.comment || $standardComments.contains( $dataValue.comment )) ;display:none #end"/>
 			#end
 			
-			<br><br>
+			<br/><br/>
 			<h4>$i18n.getString( "followup" )</h4>
 			
 		    #if ( $dataValue && $dataValue.isFollowup() )
-                <img id="followup" src="../images/marked_large.png" alt="$i18n.getString( 'mark_value_for_followup' )" onclick="markValueForFollowup( '$dataValue.dataElement.id', '$dataValue.period.id', '$dataValue.source.id', '$dataValue.optionCombo.id' )" style="cursor:pointer">
+                <img id="followup" src="../images/marked_large.png" alt="$i18n.getString( 'mark_value_for_followup' )" onclick="markValueForFollowup( '$dataValue.dataElement.id', '$dataValue.period.id', '$dataValue.source.id', '$dataValue.optionCombo.id' )" style="cursor:pointer"/>
 			#elseif ( $dataValue )
-                <img id="followup" src="../images/unmarked_large.png" alt="$i18n.getString( 'unmark_value_for_followup' )" onclick="markValueForFollowup( '$dataValue.dataElement.id', '$dataValue.period.id', '$dataValue.source.id', '$dataValue.optionCombo.id' )" style="cursor:pointer">
+                <img id="followup" src="../images/unmarked_large.png" alt="$i18n.getString( 'unmark_value_for_followup' )" onclick="markValueForFollowup( '$dataValue.dataElement.id', '$dataValue.period.id', '$dataValue.source.id', '$dataValue.optionCombo.id' )" style="cursor:pointer"/>
 			#else
-			    <img id="followup" src="../images/unmarked_large.png">
+			    <img id="followup" src="../images/unmarked_large.png"/>
 			#end
 		</td>
 		<!-- Column 2 - Min-max -->
@@ -58,7 +60,7 @@
                     <td><input type="text" id="maxLimit" style="width:10em" value="$maxLimit" class="{validate:{digits:true}}"
                         #if( $auth.hasAccess( "dhis-web-dataentry", "saveMinMaxLimits" ) && $auth.hasAccess( "dhis-web-dataentry", "removeMinMaxLimits" ))
                             onchange="saveMaxLimit( $dataElementHistory.organisationUnit.id, $dataElementHistory.dataElement.id,  $dataElementHistory.optionCombo.id )"
-                        #else disabled="disabled" #end onfocus="this.select()">
+                        #else disabled="disabled" #end onfocus="this.select()"/>
 						<span id='maxSpan' style="color:red;"></span>
 						</td>
                 </tr>
@@ -68,7 +70,7 @@
                     <td><input type="text" id="minLimit" style="width:10em" value="$minLimit"
                         #if( $auth.hasAccess( "dhis-web-dataentry", "saveMinMaxLimits" ) && $auth.hasAccess( "dhis-web-dataentry", "removeMinMaxLimits" ))
                            onchange="saveMinLimit( $dataElementHistory.organisationUnit.id, $dataElementHistory.dataElement.id, $dataElementHistory.optionCombo.id )"
-                        #else disabled="disabled" #end onfocus="this.select()">
+                        #else disabled="disabled" #end onfocus="this.select()"/>
 						<span id='minSpan' style="color:red;"></span>
 					</td>
                 </tr>
@@ -94,7 +96,7 @@
 			#end    
 			
 			<img src="getHistoryChart.action?dataElementId=${dataElementHistory.dataElement.id}&
-			    categoryOptionComboId=${dataElementHistory.optionCombo.id}">			
+			    categoryOptionComboId=${dataElementHistory.optionCombo.id}"/>			
         </td>
     </tr>
 	<tr>
@@ -113,10 +115,11 @@
 
 </table>
 
-<p><input type="button" value="$encoder.htmlEncode( $i18n.getString( "close" ) )" onclick="window.opener.location.reload();window.close()"></p>
+<p><input type="button" value="$encoder.htmlEncode( $i18n.getString( 'close' ) )" onclick="window.opener.location.reload();window.close()"/></p>
 
 <script type="text/javascript">
 
+var i18n_enter_digits = '$encoder.jsEscape( $i18n.getString( "enter_digits" ) , "'")';
 var i18n_mark_value_for_followup = '$encoder.jsEscape( $i18n.getString( "mark_value_for_followup" ) , "'")';
 var i18n_unmark_value_for_followup = '$encoder.jsEscape( $i18n.getString( "unmark_value_for_followup" ) , "'")';
 

=== modified file 'dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/javascript/history.js'
--- dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/javascript/history.js	2010-10-08 11:12:29 +0000
+++ dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/javascript/history.js	2010-10-12 10:00:17 +0000
@@ -48,21 +48,23 @@
 {
     var field = document.getElementById( 'value[' + dataElementId + ':' + optionComboId + '].comment' );                
     var select = document.getElementById( 'value[' + dataElementId + ':' + optionComboId + '].comments' );
-    
+    var organisationUnitId = getFieldValue( 'organisationUnitId' );
+
     field.style.backgroundColor = '#ffffcc';
     select.style.backgroundColor = '#ffffcc';
     
-    var commentSaver = new CommentSaver( dataElementId, optionComboId, commentValue );
+    var commentSaver = new CommentSaver( dataElementId, optionComboId, organisationUnitId, commentValue );
     commentSaver.save();
 }
 
-function CommentSaver( dataElementId_, optionComboId_, value_ )
+function CommentSaver( dataElementId_, optionComboId_, organisationUnitId_, value_ )
 {
     var SUCCESS = '#ccffcc';
     var ERROR = '#ccccff';
 
     var dataElementId = dataElementId_;
-    var optionComboId = optionComboId_
+    var optionComboId = optionComboId_;
+    var organisationUnitId = organisationUnitId_;
     var value = value_;
     
     this.save = function()
@@ -71,7 +73,7 @@
         request.setCallbackSuccess( handleResponse );
         request.setCallbackError( handleHttpError );
         request.setResponseTypeXML( 'status' );
-        request.send( 'saveComment.action?dataElementId=' +
+        request.send( 'saveComment.action?organisationUnitId=' + organisationUnitId + '&dataElementId=' +
                 dataElementId + '&optionComboId=' + optionComboId + '&comment=' + value );
     };
     
@@ -107,8 +109,9 @@
     }
 }
 
-function isInt(value){
-	if(((value) == parseInt(value)) && !isNaN(parseInt(value))){
+function isInt(value)
+{
+	if( ((value) == parseInt(value)) && !isNaN(parseInt(value)) ) {
 		return true;
 	} else {
 		  return false;
@@ -118,18 +121,20 @@
 function saveMinLimit( organisationUnitId, dataElementId, optionComboId )
 {
     var minLimitField = document.getElementById( "minLimit" );
-	if(!isInt(minLimitField.value)){
+	
+	if( !isInt(minLimitField.value) ) {
 		setInnerHTML('minSpan', i18n_enter_digits);
 		return;
-	}else{
+	}else {
 		setInnerHTML('minSpan', "");
 	}
 	
 	var maxLimitField = document.getElementById( "maxLimit" );
-	if(!isInt(maxLimitField.value)){
+	
+	if( !isInt(maxLimitField.value) ) {
 		setInnerHTML('maxSpan', i18n_enter_digits);
 		return;
-	}else{
+	}else {
 		setInnerHTML('maxSpan', "");
 	}
     
@@ -170,18 +175,20 @@
 function saveMaxLimit( organisationUnitId, dataElementId, optionComboId )
 {	 
 	var maxLimitField = document.getElementById( "maxLimit" );
-	if(!isInt(maxLimitField.value)){
+	
+	if( !isInt(maxLimitField.value) ) {
 		setInnerHTML('maxSpan', i18n_enter_digits);
 		return;
-	}else{
+	}else {
 		setInnerHTML('maxSpan', "");
 	}
     
 	var minLimitField = document.getElementById( "minLimit" );
-	if(!isInt(minLimitField.value)){
+	
+	if( !isInt(minLimitField.value) ) {
 		setInnerHTML('minSpan', i18n_enter_digits);
 		return;
-	}else{
+	}else {
 		setInnerHTML('minSpan', "");
 	}
 	
@@ -192,9 +199,7 @@
 
     if ( maxLimitField.value == '' )
     {
-       
     	request.send( 'removeMinMaxLimits.action?organisationUnitId=' + organisationUnitId + '&dataElementId=' + dataElementId + '&optionComboId=' + optionComboId );
-   
     }
     else
     {
@@ -258,6 +263,4 @@
         image.src = "../images/unmarked_large.png";
         image.alt = i18n_mark_value_for_followup;  	
     }
-}
-
-
+}
\ No newline at end of file