dhis2-devs team mailing list archive

Thread
Date

[Branch ~dhis2-devs-core/dhis2/trunk] Rev 6971: local vn - Fixed GUI entry params.

To: DHIS 2 developers <dhis2-devs@xxxxxxxxxxxxxxxxxxx>
From: noreply@xxxxxxxxxxxxx
Date: Thu, 17 May 2012 09:05:15 -0000
Reply-to: noreply@xxxxxxxxxxxxx
Sender: bounces@xxxxxxxxxxxxx

------------------------------------------------------------
revno: 6971
committer: Hieu <hieu.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Thu 2012-05-17 16:03:46 +0700
message:
  local vn - Fixed GUI entry params.
modified:
  local/vn/dhis-web-dataentry-hospital/src/main/resources/org/hisp/dhis/de/i18n_module.properties
  local/vn/dhis-web-dataentry-hospital/src/main/resources/org/hisp/dhis/de/i18n_module_vi_VN.properties
  local/vn/dhis-web-dataentry-hospital/src/main/webapp/dhis-web-dataentry-hospital/javascript/form.js
  local/vn/dhis-web-dataentry-hospital/src/main/webapp/dhis-web-dataentry-hospital/select.vm
  local/vn/dhis-web-spreadsheet-reporting/src/main/webapp/dhis-web-spreadsheet-reporting/generateReportForm.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 'local/vn/dhis-web-dataentry-hospital/src/main/resources/org/hisp/dhis/de/i18n_module.properties'
--- local/vn/dhis-web-dataentry-hospital/src/main/resources/org/hisp/dhis/de/i18n_module.properties	2012-05-10 16:18:43 +0000
+++ local/vn/dhis-web-dataentry-hospital/src/main/resources/org/hisp/dhis/de/i18n_module.properties	2012-05-17 09:03:46 +0000
@@ -101,4 +101,7 @@
 show_all_items = Show all items
 value = Value
 show_data = Show data
+department = Khoa (Ph\u00f2ng)
 please_select_department = Please select department
+show_export_params = Show export params
+hide_export_params = Hide export params
\ No newline at end of file

=== modified file 'local/vn/dhis-web-dataentry-hospital/src/main/resources/org/hisp/dhis/de/i18n_module_vi_VN.properties'
--- local/vn/dhis-web-dataentry-hospital/src/main/resources/org/hisp/dhis/de/i18n_module_vi_VN.properties	2012-05-11 22:53:14 +0000
+++ local/vn/dhis-web-dataentry-hospital/src/main/resources/org/hisp/dhis/de/i18n_module_vi_VN.properties	2012-05-17 09:03:46 +0000
@@ -1,111 +1,113 @@
 #Resource generated by I18n Resource Editor
 #Fri May 11 23:22:27 ICT 2012
-sync_now=T\u1EA3i l\u00EAn
-username=T\u00EAn ng\u01B0\u1EDDi d\u00F9ng
-validate=Ki\u1EC3m tra t\u00EDnh h\u1EE3p l\u1EC7
-register_complete_dataset_failed=\u0110\u0103ng k\u00FD m\u1EABu d\u1EEF li\u1EC7u th\u1EA5t b\u1EA1i
-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
-entry=Gi\u00E1 tr\u1ECB
-datavalue_history=L\u1ECBch s\u1EED gi\u00E1 tr\u1ECB d\u1EEF li\u1EC7u
-data_set=Ch\u1ECDn m\u1EABu nh\u1EADp li\u1EC7u
-dataelement_comment=G\u00F3p \u00FD
-uploading_data_notification=\u0110ang t\u1EA3i d\u1EEF li\u1EC7u c\u1EE5c b\u1ED9 \u0111\u1EBFn m\u00E1y ch\u1EE7
-confirm_undo=B\u1EA1n c\u00F3 ch\u1EAFc ch\u1EAFn s\u1EEDa \u0111\u1ED5i d\u1EEF li\u1EC7u nh\u1EADp?
-successful_validation=M\u00E0n h\u00ECnh nh\u1EADp li\u1EC7u th\u00E0nh c\u00F4ng ki\u1EC3m tra d\u1EEF li\u1EC7u
-data_entry=Nh\u1EADp d\u1EEF li\u1EC7u
-stored_by=Ng\u01B0\u1EDDi nh\u1EADp li\u1EC7u
-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
-the_following_values_violate_rules=C\u00E1c gi\u00E1 tr\u1ECB sau vi ph\u1EA1m \u0111i\u1EC1u ki\u1EC7n
+sync_now=T\u1ea3i l\u00ean
+username=T\u00ean ng\u01b0\u1eddi d\u00f9ng
+validate=Ki\u1ec3m tra t\u00ednh h\u1ee3p l\u1ec7
+register_complete_dataset_failed=\u0110\u0103ng k\u00fd m\u1eabu d\u1eef li\u1ec7u th\u1ea5t b\u1ea1i
+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
+entry=Gi\u00e1 tr\u1ecb
+datavalue_history=L\u1ecbch s\u1eed gi\u00e1 tr\u1ecb d\u1eef li\u1ec7u
+data_set=Ch\u1ecdn m\u1eabu nh\u1eadp li\u1ec7u
+dataelement_comment=G\u00f3p \u00fd
+uploading_data_notification=\u0110ang t\u1ea3i d\u1eef li\u1ec7u c\u1ee5c b\u1ed9 \u0111\u1ebfn m\u00e1y ch\u1ee7
+confirm_undo=B\u1ea1n c\u00f3 ch\u1eafc ch\u1eafn s\u1eeda \u0111\u1ed5i d\u1eef li\u1ec7u nh\u1eadp?
+successful_validation=M\u00e0n h\u00ecnh nh\u1eadp li\u1ec7u th\u00e0nh c\u00f4ng ki\u1ec3m tra d\u1eef li\u1ec7u
+data_entry=Nh\u1eadp d\u1eef li\u1ec7u
+stored_by=Ng\u01b0\u1eddi nh\u1eadp li\u1ec7u
+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
+the_following_values_violate_rules=C\u00e1c gi\u00e1 tr\u1ecb sau vi ph\u1ea1m \u0111i\u1ec1u ki\u1ec7n
 next_year=N\u0103m sau
-max_limit=Gi\u1EDBi h\u1EA1n cao 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
-save_comment=L\u01B0u \u00FD ki\u1EBFn
-organisation_unit=\u0110\u01A1n v\u1ECB
-field_unallowed_save_zero=Ph\u1EA7n t\u1EED n\u00E0y kh\u00F4ng l\u01B0u gi\u00E1 tr\u1ECB 0. Gi\u00E1 tr\u1ECB c\u0169 kh\u00F4ng b\u1ECB \u1EA3nh h\u01B0\u1EDFng.
-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
-completed_by=\u0110\u01B0\u1EE3c ho\u00E0n th\u00E0nh b\u1EDFi
-max=L\u1EDBn nh\u1EA5t
-date=Ng\u00E0y
-online_notification=B\u1EA1n \u0111ang online
-sync_failed=T\u1EA3i l\u00EAn m\u00E1y ch\u1EE7 th\u1EA5t b\u1EA1i, h\u00E3y th\u1EED l\u1EA1i
-validation_result=K\u1EBFt qu\u1EA3 ki\u1EC3m tra t\u00EDnh h\u1EE3p l\u1EC7
-down=Xu\u1ED1ng
-value_must_number=Gi\u00E1 tr\u1ECB ph\u1EA3i l\u00E0 m\u1ED9t s\u1ED1 th\u1EF1c v\u00E0 \u0111\u1ED9 \u0111\u00E0i d\u01B0\u1EDBi 255 k\u00FD t\u1EF1.
-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
-dataset_is_locked=Bi\u1EC3u nh\u1EADp \u0111\u00E3 b\u1ECB kh\u00F3a
-offline_notification=B\u1EA1n \u0111ang offline, d\u1EEF li\u1EC7u s\u1EBD \u0111\u01B0\u1EE3c l\u01B0u tr\u1EEF c\u1EE5c b\u1ED9
-save=L\u01B0u
-saving_value_failed_dataset_is_locked=Bi\u1EC3u nh\u1EADp li\u1EC7u \u0111\u00E3 b\u1ECB kh\u00F3a, h\u00E3y li\u00EAn h\u1EC7 ng\u01B0\u1EDDi qu\u1EA3n tr\u1ECB h\u1EC7 th\u1ED1ng
-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
-department=Ch\u1ECDn Khoa Ph\u00F2ng
-enter_digits=Ch\u1EC9 nh\u1EADp k\u00FD t\u1EF1 s\u1ED1
-register_complete_dataset_success=M\u1EABu d\u1EEF li\u1EC7u \u0111\u00E3 \u0111\u0103ng k\u00FD
-dataelement_history=L\u1ECBch s\u1EED d\u1EEF li\u1EC7u
-undo_register_complete_dataset_success=H\u1EE7y \u0111\u0103ng k\u00FD bi\u1EC3u nh\u1EADp th\u00E0nh c\u00F4ng
-unsuccessful_validation=Gi\u00E1 tr\u1ECB kh\u00F4ng h\u1EE3p l\u1EC7. C\u1EE5 th\u1EC3 nh\u01B0 sau\:
-prev=Tr\u01B0\u1EDBc
-code=M\u00E3 ph\u1EA7n t\u1EED d\u1EEF li\u1EC7u
-mark_value_for_followup=Ch\u1ECDn gi\u00E1 tr\u1ECB \u0111\u1EC3 theo d\u00F5i
-attribute=Thu\u1ED9c t\u00EDnh
-value=Gi\u00E1 tr\u1ECB
-operator=To\u00E1n t\u1EED
-sync_success=Th\u00E0nh c\u00F4ng t\u1EA3i l\u00EAn m\u00E1y ch\u1EE7
-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
-data_element=D\u1EEF li\u1EC7u
-up=L\u00EAn
-max_must_be_greater_than_min=Gi\u00E1 tr\u1ECB l\u1EDBn nh\u1EA5t ph\u1EA3i h\u01A1n gi\u00E1 tr\u1ECB nh\u1ECF nh\u1EA5t
-show_data=M\u1EDF b\u1EA3ng ch\u1ECDn
-user_roles=Vai tr\u00F2 ng\u01B0\u1EDDi d\u00F9ng
-history_not_valid=L\u1ECBch s\u1EED d\u1EEF li\u1EC7u kh\u00F4ng \u0111\u01B0\u1EE3c \u00E1p d\u1EE5ng cho ph\u1EA7n t\u1EED d\u1EEF li\u1EC7u n\u00E0y\!
-type=Ki\u1EC3u d\u1EEF li\u1EC7u
-no_organisationunit_selected=Kh\u00F4ng \u0111\u01A1n v\u1ECB n\u00E0o \u0111\u01B0\u1EE3c ch\u1ECDn
-nr=S\u1ED1
-unregister_complete_failed_dataset_is_locked=Bi\u1EC3u nh\u1EADp b\u1ECB kh\u00F3a, vi\u1EC7c h\u1EE7y \u0111\u0103ng k\u00FD kh\u00F4ng th\u00E0nh c\u00F4ng. H\u00E3y li\u00EAn h\u1EC7 v\u1EDBi ng\u01B0\u1EDDi qu\u1EA3n tr\u1ECB
-show_all_items=Hi\u1EC3n th\u1ECB t\u1EA5t c\u1EA3
-min_limit=Gi\u1EDBi h\u1EA1n th\u1EA5p nh\u1EA5t
-later_periods=Th\u1EDDi k\u1EF3 sau
-period=Ch\u1ECDn th\u1EDDi \u0111i\u1EC3m
-to=th\u00E0nh
-ajax_login_failed=\u0110\u0103ng nh\u1EADp kh\u00F4ng th\u00E0nh c\u00F4ng. Ki\u1EC3m tra l\u1EA1i t\u00EAn t\u00E0i kho\u1EA3n v\u00E0 m\u1EADt kh\u1EA9u m\u1ED9t l\u1EA7n n\u1EEFa
-complete=Ho\u00E0n ch\u1EC9nh
-value_must_negative_integer=Gi\u00E1 tr\u1ECB ph\u1EA3i l\u00E0 m\u1ED9t s\u1ED1 nguy\u00EAn \u00E2m v\u00E0 \u0111\u1ED9 \u0111\u00E0i d\u01B0\u1EDBi 255 k\u00FD t\u1EF1.
+max_limit=Gi\u1edbi h\u1ea1n cao 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
+save_comment=L\u01b0u \u00fd ki\u1ebfn
+organisation_unit=\u0110\u01a1n v\u1ecb
+field_unallowed_save_zero=Ph\u1ea7n t\u1eed n\u00e0y kh\u00f4ng l\u01b0u gi\u00e1 tr\u1ecb 0. Gi\u00e1 tr\u1ecb c\u0169 kh\u00f4ng b\u1ecb \u1ea3nh h\u01b0\u1edfng.
+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
+completed_by=\u0110\u01b0\u1ee3c ho\u00e0n th\u00e0nh b\u1edfi
+max=L\u1edbn nh\u1ea5t
+date=Ng\u00e0y
+online_notification=B\u1ea1n \u0111ang online
+sync_failed=T\u1ea3i l\u00ean m\u00e1y ch\u1ee7 th\u1ea5t b\u1ea1i, h\u00e3y th\u1eed l\u1ea1i
+validation_result=K\u1ebft qu\u1ea3 ki\u1ec3m tra t\u00ednh h\u1ee3p l\u1ec7
+down=Xu\u1ed1ng
+value_must_number=Gi\u00e1 tr\u1ecb ph\u1ea3i l\u00e0 m\u1ed9t s\u1ed1 th\u1ef1c v\u00e0 \u0111\u1ed9 \u0111\u00e0i d\u01b0\u1edbi 255 k\u00fd t\u1ef1.
+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
+dataset_is_locked=Bi\u1ec3u nh\u1eadp \u0111\u00e3 b\u1ecb kh\u00f3a
+offline_notification=B\u1ea1n \u0111ang offline, d\u1eef li\u1ec7u s\u1ebd \u0111\u01b0\u1ee3c l\u01b0u tr\u1eef c\u1ee5c b\u1ed9
+save=L\u01b0u
+saving_value_failed_dataset_is_locked=Bi\u1ec3u nh\u1eadp li\u1ec7u \u0111\u00e3 b\u1ecb kh\u00f3a, h\u00e3y li\u00ean h\u1ec7 ng\u01b0\u1eddi qu\u1ea3n tr\u1ecb h\u1ec7 th\u1ed1ng
+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
+department=Ch\u1ecdn Khoa Ph\u00f2ng
+enter_digits=Ch\u1ec9 nh\u1eadp k\u00fd t\u1ef1 s\u1ed1
+register_complete_dataset_success=M\u1eabu d\u1eef li\u1ec7u \u0111\u00e3 \u0111\u0103ng k\u00fd
+dataelement_history=L\u1ecbch s\u1eed d\u1eef li\u1ec7u
+undo_register_complete_dataset_success=H\u1ee7y \u0111\u0103ng k\u00fd bi\u1ec3u nh\u1eadp th\u00e0nh c\u00f4ng
+unsuccessful_validation=Gi\u00e1 tr\u1ecb kh\u00f4ng h\u1ee3p l\u1ec7. C\u1ee5 th\u1ec3 nh\u01b0 sau\:
+prev=Tr\u01b0\u1edbc
+code=M\u00e3 ph\u1ea7n t\u1eed d\u1eef li\u1ec7u
+mark_value_for_followup=Ch\u1ecdn gi\u00e1 tr\u1ecb \u0111\u1ec3 theo d\u00f5i
+attribute=Thu\u1ed9c t\u00ednh
+value=Gi\u00e1 tr\u1ecb
+operator=To\u00e1n t\u1eed
+sync_success=Th\u00e0nh c\u00f4ng t\u1ea3i l\u00ean m\u00e1y ch\u1ee7
+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
+data_element=D\u1eef li\u1ec7u
+up=L\u00ean
+max_must_be_greater_than_min=Gi\u00e1 tr\u1ecb l\u1edbn nh\u1ea5t ph\u1ea3i h\u01a1n gi\u00e1 tr\u1ecb nh\u1ecf nh\u1ea5t
+show_data=M\u1edf b\u1ea3ng ch\u1ecdn
+user_roles=Vai tr\u00f2 ng\u01b0\u1eddi d\u00f9ng
+history_not_valid=L\u1ecbch s\u1eed d\u1eef li\u1ec7u kh\u00f4ng \u0111\u01b0\u1ee3c \u00e1p d\u1ee5ng cho ph\u1ea7n t\u1eed d\u1eef li\u1ec7u n\u00e0y\!
+type=Ki\u1ec3u d\u1eef li\u1ec7u
+no_organisationunit_selected=Kh\u00f4ng \u0111\u01a1n v\u1ecb n\u00e0o \u0111\u01b0\u1ee3c ch\u1ecdn
+nr=S\u1ed1
+unregister_complete_failed_dataset_is_locked=Bi\u1ec3u nh\u1eadp b\u1ecb kh\u00f3a, vi\u1ec7c h\u1ee7y \u0111\u0103ng k\u00fd kh\u00f4ng th\u00e0nh c\u00f4ng. H\u00e3y li\u00ean h\u1ec7 v\u1edbi ng\u01b0\u1eddi qu\u1ea3n tr\u1ecb
+show_all_items=Hi\u1ec3n th\u1ecb t\u1ea5t c\u1ea3
+min_limit=Gi\u1edbi h\u1ea1n th\u1ea5p nh\u1ea5t
+later_periods=Th\u1eddi k\u1ef3 sau
+period=Ch\u1ecdn th\u1eddi \u0111i\u1ec3m
+to=th\u00e0nh
+ajax_login_failed=\u0110\u0103ng nh\u1eadp kh\u00f4ng th\u00e0nh c\u00f4ng. Ki\u1ec3m tra l\u1ea1i t\u00ean t\u00e0i kho\u1ea3n v\u00e0 m\u1eadt kh\u1ea9u m\u1ed9t l\u1ea7n n\u1eefa
+complete=Ho\u00e0n ch\u1ec9nh
+value_must_negative_integer=Gi\u00e1 tr\u1ecb ph\u1ea3i l\u00e0 m\u1ed9t s\u1ed1 nguy\u00ean \u00e2m v\u00e0 \u0111\u1ed9 \u0111\u00e0i d\u01b0\u1edbi 255 k\u00fd t\u1ef1.
 next=Sau
-see_details=Xem th\u00EAm
-at=t\u1EA1i
-value_must_positive_integer=Gi\u00E1 tr\u1ECB ph\u1EA3i l\u00E0 m\u1ED9t s\u1ED1 nguy\u00EAn d\u01B0\u01A1ng v\u00E0 \u0111\u1ED9 \u0111\u00E0i d\u01B0\u1EDBi 255 k\u00FD t\u1EF1.
-timestamp=Th\u1EDDi \u0111i\u1EC3m
-select_from_tree=Ch\u1ECDn \u0111\u01A1n v\u1ECB nh\u1EADp \u1EDF ph\u00EDa tay tr\u00E1i
-change=Thay \u0111\u1ED5i
-incomplete=S\u1EEDa \u0111\u1ED5i d\u1EEF li\u1EC7u nh\u1EADp
-move=Chuy\u1EC3n
-no_response_from_server=Kh\u00F4ng c\u00F3 ph\u1EA3n h\u1ED3i t\u1EEB m\u00E1y ch\u1EE7, h\u00E3y ki\u1EC3m tra k\u1EBFt n\u1ED1i m\u1EA1ng v\u00E0 th\u1EED l\u1EA1i
-select_data_set=Ch\u1ECDn bi\u1EC3u nh\u1EADp
-no_value=Kh\u00F4ng c\u00F3 gi\u00E1 tr\u1ECB
-expression=Bi\u1EC3u th\u1EE9c
-earlier_periods=Th\u1EDDi k\u1EF3 tr\u01B0\u1EDBc
-need_to_sync_notification=D\u1EEF li\u1EC7u \u0111\u01B0\u1EE3c l\u01B0u tr\u1EEF c\u1EE5c b\u1ED9, h\u00E3y t\u1EA3i l\u00EAn m\u00E1y ch\u1EE7
-validation_rule=Quy t\u1EAFc ki\u1EC3m tra t\u00EDnh h\u1EE3p l\u1EC7
-confirm_complete=B\u1EA1n c\u00F3 ch\u1EAFc ch\u1EAFn d\u1EEF li\u1EC7u nh\u1EADp n\u00E0y \u0111\u00E3 ho\u00E0n ch\u1EC9nh?
-undo=S\u1EEDa l\u1EA1i b\u00E1o c\u00E1o
-maximum=L\u1EDBn nh\u1EA5t
-please_select_department=Ch\u1ECDn Khoa Ph\u00F2ng
-change_from=thay \u0111\u1ED5i t\u1EEB
-prev_year=N\u0103m tr\u01B0\u1EDBc
-followup=Ti\u1EBFp theo
-load_entry_form=Hi\u1EC3n th\u1ECB bi\u1EC3u nh\u1EADp
+see_details=Xem th\u00eam
+at=t\u1ea1i
+value_must_positive_integer=Gi\u00e1 tr\u1ecb ph\u1ea3i l\u00e0 m\u1ed9t s\u1ed1 nguy\u00ean d\u01b0\u01a1ng v\u00e0 \u0111\u1ed9 \u0111\u00e0i d\u01b0\u1edbi 255 k\u00fd t\u1ef1.
+timestamp=Th\u1eddi \u0111i\u1ec3m
+select_from_tree=Ch\u1ecdn \u0111\u01a1n v\u1ecb nh\u1eadp \u1edf ph\u00eda tay tr\u00e1i
+change=Thay \u0111\u1ed5i
+incomplete=S\u1eeda \u0111\u1ed5i d\u1eef li\u1ec7u nh\u1eadp
+move=Chuy\u1ec3n
+no_response_from_server=Kh\u00f4ng c\u00f3 ph\u1ea3n h\u1ed3i t\u1eeb m\u00e1y ch\u1ee7, h\u00e3y ki\u1ec3m tra k\u1ebft n\u1ed1i m\u1ea1ng v\u00e0 th\u1eed l\u1ea1i
+select_data_set=Ch\u1ecdn bi\u1ec3u nh\u1eadp
+no_value=Kh\u00f4ng c\u00f3 gi\u00e1 tr\u1ecb
+expression=Bi\u1ec3u th\u1ee9c
+earlier_periods=Th\u1eddi k\u1ef3 tr\u01b0\u1edbc
+need_to_sync_notification=D\u1eef li\u1ec7u \u0111\u01b0\u1ee3c l\u01b0u tr\u1eef c\u1ee5c b\u1ed9, h\u00e3y t\u1ea3i l\u00ean m\u00e1y ch\u1ee7
+validation_rule=Quy t\u1eafc ki\u1ec3m tra t\u00ednh h\u1ee3p l\u1ec7
+confirm_complete=B\u1ea1n c\u00f3 ch\u1eafc ch\u1eafn d\u1eef li\u1ec7u nh\u1eadp n\u00e0y \u0111\u00e3 ho\u00e0n ch\u1ec9nh?
+undo=S\u1eeda l\u1ea1i b\u00e1o c\u00e1o
+maximum=L\u1edbn nh\u1ea5t
+please_select_department=Ch\u1ecdn Khoa Ph\u00f2ng
+change_from=thay \u0111\u1ed5i t\u1eeb
+prev_year=N\u0103m tr\u01b0\u1edbc
+followup=Ti\u1ebfp theo
+load_entry_form=Hi\u1ec3n th\u1ecb bi\u1ec3u nh\u1eadp
 the_following_values_are_outliers=The following values are considered as outliers (min-max or std dev).
-value_must_integer=Gi\u00E1 tr\u1ECB ph\u1EA3i l\u00E0 m\u1ED9t s\u1ED1 nguy\u00EAn v\u00E0 \u0111\u1ED9 \u0111\u00E0i d\u01B0\u1EDBi 255 k\u00FD t\u1EF1.
-stored_date=Ng\u00E0y l\u01B0u tr\u1EEF
-please_select_attribute=H\u00E3y ch\u1ECDn thu\u1ED9c t\u00EDnh
-value_is_too_long=Gi\u00E1 tr\u1ECB qu\u00E1 d\u00E0i
-operation_not_available_offline=Ph\u00E9p t\u00EDnh kh\u00F4ng th\u1EF1c hi\u1EC7n \u0111\u01B0\u1EE3c \u1EDF ch\u1EBF \u0111\u1ED9 offline
-select=Ch\u1ECDn
-unmark_value_for_followup=H\u1EE7y ch\u1ECDn gi\u00E1 tr\u1ECB theo d\u00F5i
-register_complete_failed_dataset_is_locked=Bi\u1EC3u nh\u1EADp b\u1ECB kh\u00F3a, vi\u1EC7c \u0111\u0103ng k\u00FD kh\u00F4ng th\u00E0nh c\u00F4ng. H\u00E3y li\u00EAn h\u1EC7 v\u1EDBi ng\u01B0\u1EDDi qu\u1EA3n tr\u1ECB
-select_period=Ch\u1ECDn th\u1EDDi \u0111i\u1EC3m
-greater_than=L\u1EDBn h\u01A1n
-min=Nh\u1ECF nh\u1EA5t
-no_period_selected=Kh\u00F4ng th\u1EDDi \u0111i\u1EC3m n\u00E0o \u0111\u01B0\u1EE3c ch\u1ECDn
-run_validation=Ki\u1EC3m tra d\u1EEF li\u1EC7u
+value_must_integer=Gi\u00e1 tr\u1ecb ph\u1ea3i l\u00e0 m\u1ed9t s\u1ed1 nguy\u00ean v\u00e0 \u0111\u1ed9 \u0111\u00e0i d\u01b0\u1edbi 255 k\u00fd t\u1ef1.
+stored_date=Ng\u00e0y l\u01b0u tr\u1eef
+please_select_attribute=H\u00e3y ch\u1ecdn thu\u1ed9c t\u00ednh
+value_is_too_long=Gi\u00e1 tr\u1ecb qu\u00e1 d\u00e0i
+operation_not_available_offline=Ph\u00e9p t\u00ednh kh\u00f4ng th\u1ef1c hi\u1ec7n \u0111\u01b0\u1ee3c \u1edf ch\u1ebf \u0111\u1ed9 offline
+select=Ch\u1ecdn
+unmark_value_for_followup=H\u1ee7y ch\u1ecdn gi\u00e1 tr\u1ecb theo d\u00f5i
+register_complete_failed_dataset_is_locked=Bi\u1ec3u nh\u1eadp b\u1ecb kh\u00f3a, vi\u1ec7c \u0111\u0103ng k\u00fd kh\u00f4ng th\u00e0nh c\u00f4ng. H\u00e3y li\u00ean h\u1ec7 v\u1edbi ng\u01b0\u1eddi qu\u1ea3n tr\u1ecb
+select_period=Ch\u1ecdn th\u1eddi \u0111i\u1ec3m
+greater_than=L\u1edbn h\u01a1n
+min=Nh\u1ecf nh\u1ea5t
+no_period_selected=Kh\u00f4ng th\u1eddi \u0111i\u1ec3m n\u00e0o \u0111\u01b0\u1ee3c ch\u1ecdn
+run_validation=Ki\u1ec3m tra d\u1eef li\u1ec7u
+show_export_params = Hi\u1ec3n th\u1ecb khung ch\u1ecdn
+hide_export_params = \u1ea8n khung ch\u1ecdn
\ No newline at end of file

=== modified file 'local/vn/dhis-web-dataentry-hospital/src/main/webapp/dhis-web-dataentry-hospital/javascript/form.js'
--- local/vn/dhis-web-dataentry-hospital/src/main/webapp/dhis-web-dataentry-hospital/javascript/form.js	2012-05-16 08:45:16 +0000
+++ local/vn/dhis-web-dataentry-hospital/src/main/webapp/dhis-web-dataentry-hospital/javascript/form.js	2012-05-17 09:03:46 +0000
@@ -345,7 +345,6 @@
 
     if ( dataSetId != -1 )
     {
-        
         //addOptionById( 'selectedPeriodId', '-1', '[ ' + i18n_select_period + ' ]' );
 
         for ( i in periods )
@@ -386,6 +385,9 @@
 				{ 
 					$('#subDataSetId').append('<option value=' + json.department[i].id + '>' + json.department[i].name + '</option>');
 				}
+				
+				byId( 'inputCriteria' ).style.width = '840px';
+				showById('departmentTitleDiv');
 				showById('departmentDiv');
 				
 				jQuery("#valueInput").unbind('change');
@@ -395,6 +397,9 @@
 			else 
 			{
 				loadAttributeValues( dataSetId );
+				
+				byId( 'inputCriteria' ).style.width = '620px';
+				hideById('departmentTitleDiv');
 				hideById('departmentDiv');
 			}
 		} );

=== modified file 'local/vn/dhis-web-dataentry-hospital/src/main/webapp/dhis-web-dataentry-hospital/select.vm'
--- local/vn/dhis-web-dataentry-hospital/src/main/webapp/dhis-web-dataentry-hospital/select.vm	2012-05-16 08:45:16 +0000
+++ local/vn/dhis-web-dataentry-hospital/src/main/webapp/dhis-web-dataentry-hospital/select.vm	2012-05-17 09:03:46 +0000
@@ -55,8 +55,7 @@
 </div>
 
 <div id="showButtonDiv" style="display:none">
-	<a title="$i18n.getString( 'hide_params' )" href="javascript:showExportDiv();">
-	<img width="16" height="16" title="$i18n.getString( 'show_export_params' )" src="images/arrow_down.png"/></a>
+	<input type="button" onclick="showExportDiv();" value="$i18n.getString( 'show_export_params' )"/>
 </div>
 
 <div class="inputCriteria" id='inputCriteria' style="width:620px;height:270px;">
@@ -65,21 +64,29 @@
 	<tr>
 		<td><label class='bold' for="selectedOrganisationUnit">$i18n.getString( "organisation_unit" )</label>
 	</tr>
+	
 	<tr>
 		<td>
 			<span id="selectedOrganisationUnit">[ $i18n.getString( 'select_from_tree' ) ]</span></td>
 		</td>
 	</tr>
+	
 	<tr>
 		<td><label class='bold' for="selectedDataSetId">$i18n.getString( "data_set" )</label></td>
 		<td><label class='bold' for="selectedPeriodId">$i18n.getString( "period" )</label></td>
+		<td id='departmentTitleDiv' style='display:none;'><label class='bold' for="selectedPeriodId">$i18n.getString( "department" )</label></td>
 	</tr>
+	
 	<tr>
-		<td><select id="selectedDataSetId" name="selectedDataSetId" multiple size='10' style="width:371px" onchange="dataSetSelected()" disabled="disabled"></select>
-			<span id="loaderSpan" style="display:none"><img src='../images/ajax-loader-bar.gif'></span></td>
-		<td><select id="selectedPeriodId" name="selectedPeriodId"  multiple size='9'  style="width:215px" disabled="disabled" ></select>
-			<input type="button" id="prevButton" style="width:75px" value="$i18n.getString( 'prev_year' )" title="$i18n.getString('earlier_periods')" onclick="previousPeriodsSelected()" disabled="disabled">
-			<input type="button" id="nextButton" style="width:75px" value="$i18n.getString( 'next_year' )" title="$i18n.getString('later_periods')" onclick="nextPeriodsSelected()" disabled="disabled">
+		<td><select id="selectedDataSetId" name="selectedDataSetId" size='10' style="width:371px" onchange="dataSetSelected()" disabled="disabled"></select>
+			<span id="loaderSpan" style="display:none"><img src='../images/ajax-loader-bar.gif'/></span>
+		</td>
+		<td><select id="selectedPeriodId" name="selectedPeriodId" size='9' style="width:230px" disabled="disabled"></select>
+			<input type="button" id="prevButton" style="width:75px" value="$i18n.getString( 'prev_year' )" title="$i18n.getString('earlier_periods')" onclick="previousPeriodsSelected()" disabled="disabled"/>
+			<input type="button" id="nextButton" style="width:75px" value="$i18n.getString( 'next_year' )" title="$i18n.getString('later_periods')" onclick="nextPeriodsSelected()" disabled="disabled"/>
+		</td>
+		<td id='departmentDiv' style='display:none;'>
+			<select id='subDataSetId' name='subDataSetId' size="10" onchange='javascript:loadDepartmentFormSelected();'/></select>
 		</td>
 	</tr>	
 	
@@ -92,15 +99,8 @@
 		</td>
 	</tr>
 
-	<tr id='departmentDiv' style='display:none;'>
-		<td>
-			<label class='bold' for="attributeId">$i18n.getString( "department" )</label><br>
-			<select id='subDataSetId' name='subDataSetId' onchange='javascript:loadDepartmentFormSelected();' /></select>
-		</td>
-	</tr>
-
 	<tr>
-		<td colspan="2" align="right">
+		<td colspan="3" align="right">
 			<a title="$i18n.getString( 'hide_params' )" href="javascript:hideExportDiv();">
 			<img width="16" height="16" title="$i18n.getString( 'hide_export_params' )" src="../images/up_left.png"/></a>
 		</td>

=== modified file 'local/vn/dhis-web-spreadsheet-reporting/src/main/webapp/dhis-web-spreadsheet-reporting/generateReportForm.vm'
--- local/vn/dhis-web-spreadsheet-reporting/src/main/webapp/dhis-web-spreadsheet-reporting/generateReportForm.vm	2012-05-12 18:17:43 +0000
+++ local/vn/dhis-web-spreadsheet-reporting/src/main/webapp/dhis-web-spreadsheet-reporting/generateReportForm.vm	2012-05-17 09:03:46 +0000
@@ -13,8 +13,7 @@
 <h3>$i18n.getString( "generate_export_report" ) #openHelp( "excelReportingExportReport" )</h3>
 
 <div id="showButtonDiv" style="display:none">
-	<a title="$i18n.getString( 'hide_params' )" href="javascript:showExportDiv();">
-	<img width="16" height="16" title="$i18n.getString( 'show_export_params' )" src="images/arrow_down.png"/></a>
+	<input type="button" onclick="showExportDiv();" value="$i18n.getString( 'show_export_params' )"/>
 </div>
 
 <div id="exportReportDiv" class="inputCriteria" style="width:680px;height:350px;">