dhis2-devs team mailing list archive

Thread
Date

[Branch ~dhis2-devs-core/dhis2/trunk] Rev 3135: Fixed bug <740684> missing-data-lock-strings-add-user.

To: DHIS 2 developers <dhis2-devs@xxxxxxxxxxxxxxxxxxx>
From: noreply@xxxxxxxxxxxxx
Date: Wed, 23 Mar 2011 04:59:16 -0000
Reply-to: noreply@xxxxxxxxxxxxx
Sender: bounces@xxxxxxxxxxxxx

------------------------------------------------------------
revno: 3135
committer: Hieu <hieu.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Wed 2011-03-23 11:56:49 +0700
message:
  Fixed bug <740684> missing-data-lock-strings-add-user.
modified:
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module.properties
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module_vi_VN.properties


--
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-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module.properties'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module.properties	2011-02-22 04:50:58 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module.properties	2011-03-23 04:56:49 +0000
@@ -32,6 +32,8 @@
 F_CONCEPT_DELETE = Delete Concept
 F_CONCEPT_MANAGEMENT = Concept Management
 F_CONCEPT_UPDATE = Update Concept
+F_DATAADMIN_LOCK = Data Admin Locking
+F_DATAADMIN_UNLOCK = Data Admin UnLocking
 F_DATAELEMENT_ADD = Add Data Element
 F_DATAELEMENT_DELETE = Delete Data Element
 F_DATAELEMENT_UPDATE = Update Data Element

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module_vi_VN.properties'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module_vi_VN.properties	2011-02-22 08:41:34 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module_vi_VN.properties	2011-03-23 04:56:49 +0000
@@ -1,126 +1,126 @@
-username_in_use=T\u00EAn t\u00E0i kho\u1EA3n n\u00E0y \u0111\u00E3 \u0111\u01B0\u1EE3c d\u00F9ng. Xin vui l\u00F2ng ch\u1ECDn m\u1ED9t t\u00EAn t\u00E0i kho\u1EA3n kh\u00E1c
-username=T\u00EAn t\u00E0i kho\u1EA3n
-user_use_group=C\u00F3 c\u00E1c ng\u01B0\u1EDDi d\u00F9ng s\u1EED d\u1EE5ng ph\u00E2n quy\u1EC1n n\u00E0y
-user_role_management=Qu\u1EA3n l\u00FD ph\u00E2n quy\u1EC1n ng\u01B0\u1EDDi d\u00F9ng
-user_role=Ph\u00E2n quy\u1EC1n
-user_management=Qu\u1EA3n l\u00FD t\u1EA3i kho\u1EA3n
-user_by_orgunit=Ng\u01B0\u1EDDi d\u00F9ng theo \u0111\u01A1n v\u1ECB
-user=T\u00EAn ng\u01B0\u1EDDi d\u00F9ng
-unit=\u0110\u01A1n v\u1ECB
-specify_username=Xin vui l\u00F2ng ch\u1EC9 \u0111\u1ECBnh t\u00EAn t\u00E0i kho\u1EA3n
-specify_surname=Xin vui l\u00F2ng ch\u1EC9 \u0111\u1ECBnh h\u1ECD
-specify_retype_password=Vui l\u00F2ng nh\u1EADp l\u1EA1i m\u1EADt kh\u1EA9u
-specify_raw_password=Vui l\u00F2ng nh\u1EADp m\u1EADt kh\u1EA9u
-specify_organisationunit_name=Vui l\u00F2ng ch\u1ECDn \u0111\u01A1n v\u1ECB
-specify_organisationunit=Vui l\u00F2ng ch\u1ECDn \u0111\u01A1n v\u1ECB
-specify_name=H\u00E3y x\u00E1c \u0111\u1ECBnh m\u1ED9t t\u00EAn
-specify_first_name=H\u00E3y x\u00E1c \u0111\u1ECBnh t\u00EAn
-specify_description=H\u00E3y x\u00E1c \u0111\u1ECBnh m\u00F4 t\u1EA3
-show_users_by_orgUnit=Hi\u1EC3n th\u1ECB ng\u01B0\u1EDDi d\u00F9ng theo \u0111\u01A1n v\u1ECB
-show_details=Xem chi ti\u1EBFt
-show_all_users=Hi\u1EC3n th\u1ECB t\u1EA5t c\u1EA3 ng\u01B0\u1EDDi d\u00F9ng
-show_all_roles=Hi\u1EC3n th\u1ECB t\u1EA5t c\u1EA3 c\u00E1c quy\u1EC1n
-selected_roles=C\u00E1c ph\u00E2n quy\u1EC1n \u0111\u01B0\u1EE3c ch\u1ECDn
-select_role=Ch\u1ECDn ph\u00E2n quy\u1EC1n
-select_all_in_group=Ch\u1ECDn t\u1EA5t c\u1EA3 trong nh\u00F3m
-saving_user_failed=L\u1ED7i do l\u01B0u ng\u01B0\u1EDDi d\u00F9ng
-saving_role_failed=L\u1ED7i do l\u01B0u ph\u00E2n quy\u1EC1n
-roles=C\u00E1c ph\u00E2n quy\u1EC1n
-rolename=T\u00EAn quy\u1EC1n
-role_management=Qu\u1EA3n l\u00FD c\u00E1c quy\u1EC1n
-role=Ph\u00E2n quy\u1EC1n
-retype_password=Nh\u1EADp l\u1EA1i m\u1EADt kh\u1EA9u
-reports=C\u00E1c b\u00E1o c\u00E1o
-remove_all_in_group=X\u00F3a t\u1EA5t c\u1EA3 trong nh\u00F3m
-remove=X\u00F3a
-password_un_matched=M\u1EADt kh\u1EA9u v\u00E0 Nh\u1EADp l\u1EA1i m\u1EADt kh\u1EA9u kh\u00F4ng tr\u00F9ng nhau
-password_is_not_valid=M\u1EADt kh\u1EA9u kh\u00F4ng h\u1EE3p l\u1EC7
-password=M\u1EADt kh\u1EA9u
-organisation_units=C\u00E1c \u0111\u01A1n v\u1ECB
-organisation_unit=\u0110\u01A1n v\u1ECB
-operations=Thao t\u00E1c
-okies=\u0110\u1ED3ng \u00FD
-number_of_orgunit=S\u1ED1 l\u01B0\u1EE3ng c\u00E1c \u0111\u01A1n v\u1ECB
-name_in_use=T\u00EAn n\u00E0y \u0111\u00E3 \u0111\u01B0\u1EE3c d\u00F9ng, h\u00E3y x\u00E1c \u0111\u1ECBnh m\u1ED9t t\u00EAn kh\u00E1c
-members_of_the_group=Nh\u00F3m \u0111\u01A1n v\u1ECB
-members=C\u00E1c th\u00E0nh vi\u00EAn
-intro_user_role=T\u1EA1o, ch\u1EC9nh s\u1EEDa, xem v\u00E0 x\u00F3a c\u00E1c ph\u00E2n quy\u1EC1n ng\u01B0\u1EDDi d\u00F9ng. M\u1ED9t ph\u00E2n quy\u1EC1n c\u00F3 m\u1ED9t t\u1EADp c\u00E1c th\u1EA9m quy\u1EC1n nh\u1EA5t \u0111\u1ECBnh.
-intro_user_by_orgunit=T\u1EA1o, ch\u1EC9nh s\u1EEDa, xem v\u00E0 x\u00F3a c\u00E1c ng\u01B0\u1EDDi d\u00F9ng c\u1EE7a m\u1ED9t \u0111\u01A1n v\u1ECB.
-intro_user=T\u1EA1o, ch\u1EC9nh s\u1EEDa, xem v\u00E0 x\u00F3a c\u00E1c ng\u01B0\u1EDDi d\u00F9ng. M\u1ED9t ng\u01B0\u1EDDi d\u00F9ng \u0111\u01B0\u1EE3c li\u00EAn k\u1EBFt v\u1EDBi c\u00E1c ph\u00E2n quy\u1EC1n v\u00E0 m\u1ED9t \u0111\u01A1n v\u1ECB.
-intro_change_password=\u0110\u1ED5i m\u1EADt kh\u1EA9u cho c\u00E1 ng\u01B0\u1EDDi d\u00F9ng
+username_in_use=T\u00ean t\u00e0i kho\u1ea3n n\u00e0y \u0111\u00e3 \u0111\u01b0\u1ee3c d\u00f9ng. Xin vui l\u00f2ng ch\u1ecdn m\u1ed9t t\u00ean t\u00e0i kho\u1ea3n kh\u00e1c
+username=T\u00ean t\u00e0i kho\u1ea3n
+user_use_group=C\u00f3 c\u00e1c ng\u01b0\u1eddi d\u00f9ng s\u1eed d\u1ee5ng ph\u00e2n quy\u1ec1n n\u00e0y
+user_role_management=Qu\u1ea3n l\u00fd ph\u00e2n quy\u1ec1n ng\u01b0\u1eddi d\u00f9ng
+user_role=Ph\u00e2n quy\u1ec1n
+user_management=Qu\u1ea3n l\u00fd t\u1ea3i kho\u1ea3n
+user_by_orgunit=Ng\u01b0\u1eddi d\u00f9ng theo \u0111\u01a1n v\u1ecb
+user=T\u00ean ng\u01b0\u1eddi d\u00f9ng
+unit=\u0110\u01a1n v\u1ecb
+specify_username=Xin vui l\u00f2ng ch\u1ec9 \u0111\u1ecbnh t\u00ean t\u00e0i kho\u1ea3n
+specify_surname=Xin vui l\u00f2ng ch\u1ec9 \u0111\u1ecbnh h\u1ecd
+specify_retype_password=Vui l\u00f2ng nh\u1eadp l\u1ea1i m\u1eadt kh\u1ea9u
+specify_raw_password=Vui l\u00f2ng nh\u1eadp m\u1eadt kh\u1ea9u
+specify_organisationunit_name=Vui l\u00f2ng ch\u1ecdn \u0111\u01a1n v\u1ecb
+specify_organisationunit=Vui l\u00f2ng ch\u1ecdn \u0111\u01a1n v\u1ecb
+specify_name=H\u00e3y x\u00e1c \u0111\u1ecbnh m\u1ed9t t\u00ean
+specify_first_name=H\u00e3y x\u00e1c \u0111\u1ecbnh t\u00ean
+specify_description=H\u00e3y x\u00e1c \u0111\u1ecbnh m\u00f4 t\u1ea3
+show_users_by_orgUnit=Hi\u1ec3n th\u1ecb ng\u01b0\u1eddi d\u00f9ng theo \u0111\u01a1n v\u1ecb
+show_details=Xem chi ti\u1ebft
+show_all_users=Hi\u1ec3n th\u1ecb t\u1ea5t c\u1ea3 ng\u01b0\u1eddi d\u00f9ng
+show_all_roles=Hi\u1ec3n th\u1ecb t\u1ea5t c\u1ea3 c\u00e1c quy\u1ec1n
+selected_roles=C\u00e1c ph\u00e2n quy\u1ec1n \u0111\u01b0\u1ee3c ch\u1ecdn
+select_role=Ch\u1ecdn ph\u00e2n quy\u1ec1n
+select_all_in_group=Ch\u1ecdn t\u1ea5t c\u1ea3 trong nh\u00f3m
+saving_user_failed=L\u1ed7i do l\u01b0u ng\u01b0\u1eddi d\u00f9ng
+saving_role_failed=L\u1ed7i do l\u01b0u ph\u00e2n quy\u1ec1n
+roles=C\u00e1c ph\u00e2n quy\u1ec1n
+rolename=T\u00ean quy\u1ec1n
+role_management=Qu\u1ea3n l\u00fd c\u00e1c quy\u1ec1n
+role=Ph\u00e2n quy\u1ec1n
+retype_password=Nh\u1eadp l\u1ea1i m\u1eadt kh\u1ea9u
+reports=C\u00e1c b\u00e1o c\u00e1o
+remove_all_in_group=X\u00f3a t\u1ea5t c\u1ea3 trong nh\u00f3m
+remove=X\u00f3a
+password_un_matched=M\u1eadt kh\u1ea9u v\u00e0 Nh\u1eadp l\u1ea1i m\u1eadt kh\u1ea9u kh\u00f4ng tr\u00f9ng nhau
+password_is_not_valid=M\u1eadt kh\u1ea9u kh\u00f4ng h\u1ee3p l\u1ec7
+password=M\u1eadt kh\u1ea9u
+organisation_units=C\u00e1c \u0111\u01a1n v\u1ecb
+organisation_unit=\u0110\u01a1n v\u1ecb
+operations=Thao t\u00e1c
+okies=\u0110\u1ed3ng \u00fd
+number_of_orgunit=S\u1ed1 l\u01b0\u1ee3ng c\u00e1c \u0111\u01a1n v\u1ecb
+name_in_use=T\u00ean n\u00e0y \u0111\u00e3 \u0111\u01b0\u1ee3c d\u00f9ng, h\u00e3y x\u00e1c \u0111\u1ecbnh m\u1ed9t t\u00ean kh\u00e1c
+members_of_the_group=Nh\u00f3m \u0111\u01a1n v\u1ecb
+members=C\u00e1c th\u00e0nh vi\u00ean
+intro_user_role=T\u1ea1o, ch\u1ec9nh s\u1eeda, xem v\u00e0 x\u00f3a c\u00e1c ph\u00e2n quy\u1ec1n ng\u01b0\u1eddi d\u00f9ng. M\u1ed9t ph\u00e2n quy\u1ec1n c\u00f3 m\u1ed9t t\u1eadp c\u00e1c th\u1ea9m quy\u1ec1n nh\u1ea5t \u0111\u1ecbnh.
+intro_user_by_orgunit=T\u1ea1o, ch\u1ec9nh s\u1eeda, xem v\u00e0 x\u00f3a c\u00e1c ng\u01b0\u1eddi d\u00f9ng c\u1ee7a m\u1ed9t \u0111\u01a1n v\u1ecb.
+intro_user=T\u1ea1o, ch\u1ec9nh s\u1eeda, xem v\u00e0 x\u00f3a c\u00e1c ng\u01b0\u1eddi d\u00f9ng. M\u1ed9t ng\u01b0\u1eddi d\u00f9ng \u0111\u01b0\u1ee3c li\u00ean k\u1ebft v\u1edbi c\u00e1c ph\u00e2n quy\u1ec1n v\u00e0 m\u1ed9t \u0111\u01a1n v\u1ecb.
+intro_change_password=\u0110\u1ed5i m\u1eadt kh\u1ea9u cho c\u00e1 ng\u01b0\u1eddi d\u00f9ng
 generated=by I18n Resource Editor
-generate_new=T\u1EA1o m\u1EDBi
-firstName=T\u00EAn
-filter_by_username=L\u1ECDc theo t\u00EAn t\u00E0i kho\u1EA3n
-filter_by_user_name=L\u1ECDc theo t\u00EAn \u0111\u0103ng nh\u1EADp
-filter_by_rolename=L\u1ECDc theo t\u00EAn vai tr\u00F2
-excel_reporting=B\u00E1o c\u00E1o Excels
-excel_importing=\u0110\u01B0a v\u00E0o d\u1EEF li\u1EC7u (t\u1EEB file Excel)
-everything_is_ok=M\u1ECDi th\u1EE9 \u0111\u1EC1u \u1ED5n
-email_is_not_valid=\u0110\u1ECBa ch\u1EC9 th\u01B0 \u0111i\u1EC7n t\u1EED kh\u00F4ng h\u1EE3p l\u1EC7
-edit_user_role=C\u1EADp nh\u1EADt ph\u00E2n quy\u1EC1n ng\u01B0\u1EDDi d\u00F9ng
-edit_user=C\u1EADp nh\u1EADt t\u00E0i kho\u1EA3n
-edit_role=C\u1EADp nh\u1EADt quy\u1EC1n ng\u01B0\u1EDDi d\u00F9ng
-details=Chi ti\u1EBFt
-deselect_role=H\u1EE7y ch\u1ECDn ph\u00E2n quy\u1EC1n
-delete_current_user=X\u00F3a ng\u01B0\u1EDDi d\u00F9ng hi\u1EC7n t\u1EA1i
-data_sets=C\u00E1c t\u1EADp d\u1EEF li\u1EC7u
-dataSets=C\u00E1c t\u1EADp h\u1EE3p d\u1EEF li\u1EC7u
-create_new_user_role=T\u1EA1o m\u1ED9t ph\u00E2n quy\u1EC1n m\u1EDBi
-create_new_user=T\u1EA1o t\u00E0i kho\u1EA3n m\u1EDBi
-create_new_role=T\u1EA1o vai tr\u00F2 m\u1EDBi
-confirm_delete_user=B\u1EA1n c\u00F3 mu\u1ED1n x\u00F3a t\u00E0i kho\u1EA3n n\u00E0y?
-confirm_delete_role=B\u1EA1n c\u00F3 mu\u1ED1n x\u00F3a vai tr\u00F2 n\u00E0y?
-check_password=M\u1EADt kh\u1EA9u kh\u00F4ng tr\u00F9ng nhau. Vui l\u00F2ng nh\u1EADp l\u1EA1i\!
-changepassword=Thay \u0111\u1ED5i m\u1EADt kh\u1EA9u
-change_password=\u0110\u1ED5i m\u1EADt kh\u1EA9u
-change=Thay \u0111\u1ED5i
-can_not_remove_last_super_user_role=Kh\u00F4ng th\u1EC3 x\u00F3a ng\u01B0\u1EDDi d\u00F9ng cao c\u1EA5p l\u1EA7n tr\u01B0\u1EDBc.
-can_not_remove_last_super_user=Kh\u00F4ng th\u1EC3 x\u00F3a ng\u01B0\u1EDDi d\u00F9ng cao c\u1EA5p l\u1EA7n tr\u01B0\u1EDBc.
-available_roles=C\u00E1c ph\u00E2n quy\u1EC1n c\u00F3 s\u1EB5n
-authorities=Quy\u1EC1n
-adding_user_failed=L\u1ED7i do th\u00EAm ng\u01B0\u1EDDi d\u00F9ng
-adding_role_failed=L\u1ED7i do th\u00EAm ph\u00E2n quy\u1EC1n
-add_new=Th\u00EAm m\u1EDBi
-M_dhis-web-validationrule=Xem module lu\u1EADt ki\u1EC3m tra t\u00EDnh h\u1EE3p l\u1EC7
-M_dhis-web-validationrule-local-in=Xem ch\u1EE9c n\u0103ng ph\u00E2n t\u00EDch s\u1ED1 li\u1EC7u
-M_dhis-web-reporttool=Xem module xu\u1EA5t b\u00E1o c\u00E1o
-M_dhis-web-reports=Xem ch\u1EE9c n\u0103ng b\u00E1o c\u00E1o NRHM
-M_dhis-web-reporting=Xem module B\u00E1o c\u00E1o
+generate_new=T\u1ea1o m\u1edbi
+firstName=T\u00ean
+filter_by_username=L\u1ecdc theo t\u00ean t\u00e0i kho\u1ea3n
+filter_by_user_name=L\u1ecdc theo t\u00ean \u0111\u0103ng nh\u1eadp
+filter_by_rolename=L\u1ecdc theo t\u00ean vai tr\u00f2
+excel_reporting=B\u00e1o c\u00e1o Excels
+excel_importing=\u0110\u01b0a v\u00e0o d\u1eef li\u1ec7u (t\u1eeb file Excel)
+everything_is_ok=M\u1ecdi th\u1ee9 \u0111\u1ec1u \u1ed5n
+email_is_not_valid=\u0110\u1ecba ch\u1ec9 th\u01b0 \u0111i\u1ec7n t\u1eed kh\u00f4ng h\u1ee3p l\u1ec7
+edit_user_role=C\u1eadp nh\u1eadt ph\u00e2n quy\u1ec1n ng\u01b0\u1eddi d\u00f9ng
+edit_user=C\u1eadp nh\u1eadt t\u00e0i kho\u1ea3n
+edit_role=C\u1eadp nh\u1eadt quy\u1ec1n ng\u01b0\u1eddi d\u00f9ng
+details=Chi ti\u1ebft
+deselect_role=H\u1ee7y ch\u1ecdn ph\u00e2n quy\u1ec1n
+delete_current_user=X\u00f3a ng\u01b0\u1eddi d\u00f9ng hi\u1ec7n t\u1ea1i
+data_sets=C\u00e1c t\u1eadp d\u1eef li\u1ec7u
+dataSets=C\u00e1c t\u1eadp h\u1ee3p d\u1eef li\u1ec7u
+create_new_user_role=T\u1ea1o m\u1ed9t ph\u00e2n quy\u1ec1n m\u1edbi
+create_new_user=T\u1ea1o t\u00e0i kho\u1ea3n m\u1edbi
+create_new_role=T\u1ea1o vai tr\u00f2 m\u1edbi
+confirm_delete_user=B\u1ea1n c\u00f3 mu\u1ed1n x\u00f3a t\u00e0i kho\u1ea3n n\u00e0y?
+confirm_delete_role=B\u1ea1n c\u00f3 mu\u1ed1n x\u00f3a vai tr\u00f2 n\u00e0y?
+check_password=M\u1eadt kh\u1ea9u kh\u00f4ng tr\u00f9ng nhau. Vui l\u00f2ng nh\u1eadp l\u1ea1i\!
+changepassword=Thay \u0111\u1ed5i m\u1eadt kh\u1ea9u
+change_password=\u0110\u1ed5i m\u1eadt kh\u1ea9u
+change=Thay \u0111\u1ed5i
+can_not_remove_last_super_user_role=Kh\u00f4ng th\u1ec3 x\u00f3a ng\u01b0\u1eddi d\u00f9ng cao c\u1ea5p l\u1ea7n tr\u01b0\u1edbc.
+can_not_remove_last_super_user=Kh\u00f4ng th\u1ec3 x\u00f3a ng\u01b0\u1eddi d\u00f9ng cao c\u1ea5p l\u1ea7n tr\u01b0\u1edbc.
+available_roles=C\u00e1c ph\u00e2n quy\u1ec1n c\u00f3 s\u1eb5n
+authorities=Quy\u1ec1n
+adding_user_failed=L\u1ed7i do th\u00eam ng\u01b0\u1eddi d\u00f9ng
+adding_role_failed=L\u1ed7i do th\u00eam ph\u00e2n quy\u1ec1n
+add_new=Th\u00eam m\u1edbi
+M_dhis-web-validationrule=Xem module lu\u1eadt ki\u1ec3m tra t\u00ednh h\u1ee3p l\u1ec7
+M_dhis-web-validationrule-local-in=Xem ch\u1ee9c n\u0103ng ph\u00e2n t\u00edch s\u1ed1 li\u1ec7u
+M_dhis-web-reporttool=Xem module xu\u1ea5t b\u00e1o c\u00e1o
+M_dhis-web-reports=Xem ch\u1ee9c n\u0103ng b\u00e1o c\u00e1o NRHM
+M_dhis-web-reporting=Xem module B\u00e1o c\u00e1o
 M_dhis-web-openhealth-integration=Xem module Open Health
-M_dhis-web-mapping=Xem ch\u1EE9c n\u0103ng b\u1EA3n \u0111\u1ED3 s\u1ED1 h\u00F3a
-M_dhis-web-maintenance-user=Xem module qu\u1EA3n l\u00FD ng\u01B0\u1EDDi d\u00F9ng
-M_dhis-web-maintenance-settings=Xem module qu\u1EA3n l\u00FD c\u00E0i \u0111\u1EB7t
-M_dhis-web-maintenance-patient=Xem ch\u1EE9c n\u0103ng qu\u1EA3n l\u00FD c\u00E1 th\u1EC3
-M_dhis-web-maintenance-organisationunit=Xem module qu\u1EA3n l\u00FD \u0111\u01A1n v\u1ECB
-M_dhis-web-maintenance-dataset=Xem module qu\u1EA3n l\u00FD t\u1EADp h\u1EE3p d\u1EEF li\u1EC7u
-M_dhis-web-maintenance-datadictionary=Xem module qu\u1EA3n l\u00FD t\u1EEB \u0111i\u1EC3n d\u1EEF li\u1EC7u
-M_dhis-web-maintenance-dataadmin=Xem ch\u1EE9c n\u0103ng qu\u1EA3n tr\u1ECB d\u1EEF li\u1EC7u
-M_dhis-web-importexport=Xem module xu\u1EA5t nh\u1EADp d\u1EEF li\u1EC7u
-M_dhis-web-gis=Xem ch\u1EE9c n\u0103ng b\u1EA3n \u0111\u1ED3 s\u1ED1 h\u00F3a
-M_dhis-web-excel-reporting=Xem module B\u00E1o c\u00E1o Excel
+M_dhis-web-mapping=Xem ch\u1ee9c n\u0103ng b\u1ea3n \u0111\u1ed3 s\u1ed1 h\u00f3a
+M_dhis-web-maintenance-user=Xem module qu\u1ea3n l\u00fd ng\u01b0\u1eddi d\u00f9ng
+M_dhis-web-maintenance-settings=Xem module qu\u1ea3n l\u00fd c\u00e0i \u0111\u1eb7t
+M_dhis-web-maintenance-patient=Xem ch\u1ee9c n\u0103ng qu\u1ea3n l\u00fd c\u00e1 th\u1ec3
+M_dhis-web-maintenance-organisationunit=Xem module qu\u1ea3n l\u00fd \u0111\u01a1n v\u1ecb
+M_dhis-web-maintenance-dataset=Xem module qu\u1ea3n l\u00fd t\u1eadp h\u1ee3p d\u1eef li\u1ec7u
+M_dhis-web-maintenance-datadictionary=Xem module qu\u1ea3n l\u00fd t\u1eeb \u0111i\u1ec3n d\u1eef li\u1ec7u
+M_dhis-web-maintenance-dataadmin=Xem ch\u1ee9c n\u0103ng qu\u1ea3n tr\u1ecb d\u1eef li\u1ec7u
+M_dhis-web-importexport=Xem module xu\u1ea5t nh\u1eadp d\u1eef li\u1ec7u
+M_dhis-web-gis=Xem ch\u1ee9c n\u0103ng b\u1ea3n \u0111\u1ed3 s\u1ed1 h\u00f3a
+M_dhis-web-excel-reporting=Xem module B\u00e1o c\u00e1o Excel
 M_dhis-web-datamart=Xem module Data Mart
-M_dhis-web-dataentry=Xem module nh\u1EADp d\u1EEF li\u1EC7u
-M_dhis-web-dataentry-national=Xem ch\u1EE9c n\u0103ng nh\u1EADp d\u1EEF li\u1EC7u theo li\u1EC7t k\u00EA
-_dhis-web-dashboard=Xem ch\u1EE9c n\u0103ng b\u1EA3ng \u0111i\u1EC1u khi\u1EC3n
-M_dhis-web-dashboard-integration=Xem ch\u1EE9c n\u0103ng t\u1ED5ng h\u1EE3p b\u1EA3ng \u0111i\u1EC1u khi\u1EC3n
-M_dhis-web-caseentry=Xem ch\u1EE9c n\u0103ng nh\u1EADp d\u1EEF li\u1EC7u theo
-F_VALIDATIONRULE_UPDATE=C\u1EADp nh\u1EADt lu\u1EADt ki\u1EC3m tra t\u00EDnh h\u1EE3p l\u1EC7
-F_VALIDATIONRULE_DELETE=X\u00F3a quy t\u1EAFc
-F_VALIDATIONRULE_ADD=Th\u00EAm lu\u1EADt ki\u1EC3m tra t\u00EDnh h\u1EE3p l\u1EC7
-F_VALIDATIONRULEGROUP_UPDATE=C\u1EADp nh\u1EADt nh\u00F3m quy t\u1EAFc
-F_VALIDATIONRULEGROUP_DELETE=X\u00F3a nh\u00F3m quy t\u1EAFc
-F_VALIDATIONRULEGROUP_ADD=Th\u00EAm nh\u00F3m quy t\u1EAFc
+M_dhis-web-dataentry=Xem module nh\u1eadp d\u1eef li\u1ec7u
+M_dhis-web-dataentry-national=Xem ch\u1ee9c n\u0103ng nh\u1eadp d\u1eef li\u1ec7u theo li\u1ec7t k\u00ea
+_dhis-web-dashboard=Xem ch\u1ee9c n\u0103ng b\u1ea3ng \u0111i\u1ec1u khi\u1ec3n
+M_dhis-web-dashboard-integration=Xem ch\u1ee9c n\u0103ng t\u1ed5ng h\u1ee3p b\u1ea3ng \u0111i\u1ec1u khi\u1ec3n
+M_dhis-web-caseentry=Xem ch\u1ee9c n\u0103ng nh\u1eadp d\u1eef li\u1ec7u theo
+F_VALIDATIONRULE_UPDATE=C\u1eadp nh\u1eadt lu\u1eadt ki\u1ec3m tra t\u00ednh h\u1ee3p l\u1ec7
+F_VALIDATIONRULE_DELETE=X\u00f3a quy t\u1eafc
+F_VALIDATIONRULE_ADD=Th\u00eam lu\u1eadt ki\u1ec3m tra t\u00ednh h\u1ee3p l\u1ec7
+F_VALIDATIONRULEGROUP_UPDATE=C\u1eadp nh\u1eadt nh\u00f3m quy t\u1eafc
+F_VALIDATIONRULEGROUP_DELETE=X\u00f3a nh\u00f3m quy t\u1eafc
+F_VALIDATIONRULEGROUP_ADD=Th\u00eam nh\u00f3m quy t\u1eafc
 F_VALIDATIONCRITERIA_UPDATE         = C\u1eadp nh\u1eadt Ti\u00eau chu\u1ea9n ki\u1ec3m tra>>>>>>> MERGE-SOURCE
 F_VALIDATIONCRITERIA_DELETE         = X\u00f3a Ti\u00eau chu\u1ea9n ki\u1ec3m tra
 F_VALIDATIONCRITERIA_ADD            = Th\u00eam Ti\u00eau chu\u1ea9n ki\u1ec3m tra
-F_USER_UPDATE=C\u1EADp nh\u1EADt ng\u01B0\u1EDDi d\u00F9ng
-F_USER_DELETE=X\u00F3a ng\u01B0\u1EDDi d\u00F9ng
-F_USER_ADD=Th\u00EAm ng\u01B0\u1EDDi d\u00F9ng
-F_USERROLE_UPDATE=C\u1EADp nh\u1EADt quy\u1EC1n ng\u01B0\u1EDDi d\u00F9ng
-F_USERROLE_DELETE=X\u00F3a quy\u1EC1n ng\u01B0\u1EDDi d\u00F9ng
-F_USERROLE_ADD=Th\u00EAm quy\u1EC1n ng\u01B0\u1EDDi d\u00F9ng
-F_SYSTEM_SETTING=Thay \u0111\u1ED5i c\u00E0i \u0111\u1EB7t h\u1EC7 th\u1ED1ng
+F_USER_UPDATE=C\u1eadp nh\u1eadt ng\u01b0\u1eddi d\u00f9ng
+F_USER_DELETE=X\u00f3a ng\u01b0\u1eddi d\u00f9ng
+F_USER_ADD=Th\u00eam ng\u01b0\u1eddi d\u00f9ng
+F_USERROLE_UPDATE=C\u1eadp nh\u1eadt quy\u1ec1n ng\u01b0\u1eddi d\u00f9ng
+F_USERROLE_DELETE=X\u00f3a quy\u1ec1n ng\u01b0\u1eddi d\u00f9ng
+F_USERROLE_ADD=Th\u00eam quy\u1ec1n ng\u01b0\u1eddi d\u00f9ng
+F_SYSTEM_SETTING=Thay \u0111\u1ed5i c\u00e0i \u0111\u1eb7t h\u1ec7 th\u1ed1ng
 F_SYSTEM_SETTING	                = Thay \u0111\u1ed5i c\u00e0i \u0111\u1eb7t h\u1ec7 th\u1ed1ng
 F_SQLVIEW_UPDATE                    = C\u1eadp nh\u1eadt Sql View
 F_SQLVIEW_MANAGEMENT                = Qu\u1ea3n l\u00fd Sql View
@@ -128,97 +128,99 @@
 F_SQLVIEW_DELETE                    = X\u00f3a Sql View
 F_SQLVIEW_ADD                       = Th\u00eam Sql View
 F_SCHEDULING_ADMIN                  = L\u1eadp k\u1ebf ho\u1ea1ch qu\u1ea3n l\u00fd
-F_REPORT_VIEW=Xem/In b\u00E1o c\u00E1o
-F_REPORT_UPDATE=C\u1EADp nh\u1EADt b\u00E1o c\u00E1o
-F_REPORT_DELETE=X\u00F3a b\u00E1o c\u00E1o
-F_REPORT_ADD=Th\u00EAm b\u00E1o c\u00E1o
-F_REPORTTABLE_DELETE=X\u00F3a report table
-F_REPORTTABLE_ADD=Th\u00EAm report table
-F_RELATIONSHIP_DELETE=X\u00F3a m\u1ED1i quan h\u1EC7
-F_RELATIONSHIP_ADD=Th\u00EAm m\u1ED1i quan h\u1EC7
-F_RELATIONSHIPTYPE_UPDATE=C\u1EADp nh\u1EADt lo\u1EA1i quan h\u1EC7
-F_RELATIONSHIPTYPE_DELETE=X\u00F3a lo\u1EA1i quan h\u1EC7
-F_RELATIONSHIPTYPE_ADD=Th\u00EAm lo\u1EA1i quan h\u1EC7
-F_PROGRAM_UPDATE=C\u1EADp nh\u1EADt ch\u01B0\u01A1ng tr\u00ECnh
-F_PROGRAM_DELETE=X\u00F3a ch\u01B0\u01A1ng tr\u00ECnh
+F_REPORT_VIEW=Xem/In b\u00e1o c\u00e1o
+F_REPORT_UPDATE=C\u1eadp nh\u1eadt b\u00e1o c\u00e1o
+F_REPORT_DELETE=X\u00f3a b\u00e1o c\u00e1o
+F_REPORT_ADD=Th\u00eam b\u00e1o c\u00e1o
+F_REPORTTABLE_DELETE=X\u00f3a report table
+F_REPORTTABLE_ADD=Th\u00eam report table
+F_RELATIONSHIP_DELETE=X\u00f3a m\u1ed1i quan h\u1ec7
+F_RELATIONSHIP_ADD=Th\u00eam m\u1ed1i quan h\u1ec7
+F_RELATIONSHIPTYPE_UPDATE=C\u1eadp nh\u1eadt lo\u1ea1i quan h\u1ec7
+F_RELATIONSHIPTYPE_DELETE=X\u00f3a lo\u1ea1i quan h\u1ec7
+F_RELATIONSHIPTYPE_ADD=Th\u00eam lo\u1ea1i quan h\u1ec7
+F_PROGRAM_UPDATE=C\u1eadp nh\u1eadt ch\u01b0\u01a1ng tr\u00ecnh
+F_PROGRAM_DELETE=X\u00f3a ch\u01b0\u01a1ng tr\u00ecnh
 F_PROGRAM_ATTRIBUTE_UPDATE          = C\u1eadp nh\u1eadt Thu\u1ed9c t\u00ednh ch\u01b0\u01a1ng tr\u00ecnh
 F_PROGRAM_ATTRIBUTE_DELETE          = X\u00f3a Thu\u1ed9c t\u00ednh ch\u01b0\u01a1ng tr\u00ecnh
 F_PROGRAM_ATTRIBUTE_ADD             = Th\u00eam Thu\u1ed9c t\u00ednh ch\u01b0\u01a1ng tr\u00ecnh
-F_PROGRAM_ADD=Th\u00EAm ch\u01B0\u01A1ng tr\u00ECnh
-F_PROGRAMSTAGE_UPDATE=C\u1EADp nh\u1EADt giai \u0111o\u1EA1n ch\u01B0\u01A1ng tr\u00ECnh
-F_PROGRAMSTAGE_DELETE=X\u00F3a giai \u0111o\u1EA1n ch\u01B0\u01A1ng tr\u00ECnh
-F_PROGRAMSTAGE_ADD=Th\u00EAm giai \u0111o\u1EA1n ch\u01B0\u01A1ng tr\u00ECnh
-F_PATIENT_UPDATE=C\u1EADp nh\u1EADt c\u00E1 th\u1EC3
-F_PATIENT_DELETE=X\u00F3a c\u00E1 th\u1EC3
-F_PATIENT_ADD=Th\u00EAm c\u00E1 th\u1EC3
+F_PROGRAM_ADD=Th\u00eam ch\u01b0\u01a1ng tr\u00ecnh
+F_PROGRAMSTAGE_UPDATE=C\u1eadp nh\u1eadt giai \u0111o\u1ea1n ch\u01b0\u01a1ng tr\u00ecnh
+F_PROGRAMSTAGE_DELETE=X\u00f3a giai \u0111o\u1ea1n ch\u01b0\u01a1ng tr\u00ecnh
+F_PROGRAMSTAGE_ADD=Th\u00eam giai \u0111o\u1ea1n ch\u01b0\u01a1ng tr\u00ecnh
+F_PATIENT_UPDATE=C\u1eadp nh\u1eadt c\u00e1 th\u1ec3
+F_PATIENT_DELETE=X\u00f3a c\u00e1 th\u1ec3
+F_PATIENT_ADD=Th\u00eam c\u00e1 th\u1ec3
 F_PATIENTIDENTIFIERTYPE_UPDATE      = C\u1eadp nh\u1eadt Lo\u1ea1i \u0111\u1ecbnh danh c\u00e1 th\u1ec3
 F_PATIENTIDENTIFIERTYPE_DELETE      = X\u00f3a Lo\u1ea1i \u0111\u1ecbnh danh c\u00e1 th\u1ec3
 F_PATIENTIDENTIFIERTYPE_ADD         = Th\u00eam Lo\u1ea1i \u0111\u1ecbnh danh c\u00e1 th\u1ec3
-F_PATIENTATTRIBUTE_UPDATE=C\u1EADp nh\u1EADt thu\u1ED9c t\u00EDnh c\u00E1 th\u1EC3
-F_PATIENTATTRIBUTE_DELETE=X\u00F3a thu\u1ED9c t\u00EDnh c\u00E1 th\u1EC3
-F_PATIENTATTRIBUTE_ADD=Th\u00EAm thu\u1ED9c t\u00EDnh c\u00E1 th\u1EC3
-F_PATIENTATTRIBUTEVALUE_UPDATE=C\u1EADp nh\u1EADt gi\u00E1 tr\u1ECB thu\u1ED9c t\u00EDnh c\u00E1 th\u1EC3
-F_PATIENTATTRIBUTEVALUE_DELETE=X\u00F3a gi\u00E1 tr\u1ECB thu\u1ED9c t\u00EDnh c\u00E1 th\u1EC3
-F_PATIENTATTRIBUTEVALUE_ADD=Th\u00EAm gi\u00E1 tr\u1ECB thu\u1ED9c t\u00EDnh c\u00E1 th\u1EC3
-F_ORGUNITGROUP_UPDATE=C\u1EADp nh\u1EADt nh\u00F3m \u0111\u01A1n v\u1ECB
-F_ORGUNITGROUP_DELETE=X\u00F3a nh\u00F3m \u0111\u01A1n v\u1ECB
-F_ORGUNITGROUP_ADD=Th\u00EAm nh\u00F3m \u0111\u01A1n v\u1ECB
-F_ORGUNITGROUPSET_UPDATE=C\u1EADp nh\u1EADt t\u1EADp h\u1EE3p nh\u00F3m \u0111\u01A1n v\u1ECB
-F_ORGUNITGROUPSET_DELETE=X\u00F3a t\u1EADp h\u1EE3p nh\u00F3m \u0111\u01A1n v\u1ECB
-F_ORGUNITGROUPSET_ADD=Th\u00EAm t\u1EADp h\u1EE3p nh\u00F3m \u0111\u01A1n v\u1ECB
+F_PATIENTATTRIBUTE_UPDATE=C\u1eadp nh\u1eadt thu\u1ed9c t\u00ednh c\u00e1 th\u1ec3
+F_PATIENTATTRIBUTE_DELETE=X\u00f3a thu\u1ed9c t\u00ednh c\u00e1 th\u1ec3
+F_PATIENTATTRIBUTE_ADD=Th\u00eam thu\u1ed9c t\u00ednh c\u00e1 th\u1ec3
+F_PATIENTATTRIBUTEVALUE_UPDATE=C\u1eadp nh\u1eadt gi\u00e1 tr\u1ecb thu\u1ed9c t\u00ednh c\u00e1 th\u1ec3
+F_PATIENTATTRIBUTEVALUE_DELETE=X\u00f3a gi\u00e1 tr\u1ecb thu\u1ed9c t\u00ednh c\u00e1 th\u1ec3
+F_PATIENTATTRIBUTEVALUE_ADD=Th\u00eam gi\u00e1 tr\u1ecb thu\u1ed9c t\u00ednh c\u00e1 th\u1ec3
+F_ORGUNITGROUP_UPDATE=C\u1eadp nh\u1eadt nh\u00f3m \u0111\u01a1n v\u1ecb
+F_ORGUNITGROUP_DELETE=X\u00f3a nh\u00f3m \u0111\u01a1n v\u1ecb
+F_ORGUNITGROUP_ADD=Th\u00eam nh\u00f3m \u0111\u01a1n v\u1ecb
+F_ORGUNITGROUPSET_UPDATE=C\u1eadp nh\u1eadt t\u1eadp h\u1ee3p nh\u00f3m \u0111\u01a1n v\u1ecb
+F_ORGUNITGROUPSET_DELETE=X\u00f3a t\u1eadp h\u1ee3p nh\u00f3m \u0111\u01a1n v\u1ecb
+F_ORGUNITGROUPSET_ADD=Th\u00eam t\u1eadp h\u1ee3p nh\u00f3m \u0111\u01a1n v\u1ecb
 F_ORGANISATION_REGISTRATION         = \u0110\u0103ng k\u00fd \u0111\u01a1n v\u1ecb s\u1eed d\u1ee5ng \u0111\u1ed1i t\u01b0\u1ee3ng
-F_ORGANISATIONUNIT_UPDATE=C\u1EADp nh\u1EADt \u0111\u01A1n v\u1ECB
-F_ORGANISATIONUNIT_MOVE=Di chuy\u1EC3n \u0111\u01A1n v\u1ECB
-F_ORGANISATIONUNIT_DELETE=X\u00F3a \u0111\u01A1n v\u1ECB
-F_ORGANISATIONUNIT_ADD=Th\u00EAm \u0111\u01A1n v\u1ECB
-F_INDICATOR_UPDATE=C\u1EADp nh\u1EADt ch\u1EC9 s\u1ED1
-F_INDICATOR_DELETE=X\u00F3a ch\u1EC9 s\u1ED1
-F_INDICATOR_ADD=Th\u00EAm ch\u1EC9 s\u1ED1
-F_INDICATORTYPE_UPDATE=C\u1EADp nh\u1EADt lo\u1EA1i ch\u1EC9 s\u1ED1
-F_INDICATORTYPE_DELETE=X\u00F3a lo\u1EA1i ch\u1EC9 s\u1ED1
-F_INDICATORTYPE_ADD=Th\u00EAm lo\u1EA1i ch\u1EC9 s\u1ED1
-F_INDICATORGROUP_UPDATE=C\u1EADp nh\u1EADt nh\u00F3m ch\u1EC9 s\u1ED1
-F_INDICATORGROUP_DELETE=X\u00F3a nh\u00F3m ch\u1EC9 s\u1ED1
-F_INDICATORGROUP_ADD=Th\u00EAm nh\u00F3m ch\u1EC9 s\u1ED1
+F_ORGANISATIONUNIT_UPDATE=C\u1eadp nh\u1eadt \u0111\u01a1n v\u1ecb
+F_ORGANISATIONUNIT_MOVE=Di chuy\u1ec3n \u0111\u01a1n v\u1ecb
+F_ORGANISATIONUNIT_DELETE=X\u00f3a \u0111\u01a1n v\u1ecb
+F_ORGANISATIONUNIT_ADD=Th\u00eam \u0111\u01a1n v\u1ecb
+F_INDICATOR_UPDATE=C\u1eadp nh\u1eadt ch\u1ec9 s\u1ed1
+F_INDICATOR_DELETE=X\u00f3a ch\u1ec9 s\u1ed1
+F_INDICATOR_ADD=Th\u00eam ch\u1ec9 s\u1ed1
+F_INDICATORTYPE_UPDATE=C\u1eadp nh\u1eadt lo\u1ea1i ch\u1ec9 s\u1ed1
+F_INDICATORTYPE_DELETE=X\u00f3a lo\u1ea1i ch\u1ec9 s\u1ed1
+F_INDICATORTYPE_ADD=Th\u00eam lo\u1ea1i ch\u1ec9 s\u1ed1
+F_INDICATORGROUP_UPDATE=C\u1eadp nh\u1eadt nh\u00f3m ch\u1ec9 s\u1ed1
+F_INDICATORGROUP_DELETE=X\u00f3a nh\u00f3m ch\u1ec9 s\u1ed1
+F_INDICATORGROUP_ADD=Th\u00eam nh\u00f3m ch\u1ec9 s\u1ed1
 F_INDICATORGROUPSET_UPDATE          = C\u1eadp nh\u1eadt T\u1eadp h\u1ee3p nh\u00f3m ch\u1ec9 s\u1ed1
 F_INDICATORGROUPSET_DELETE          = X\u00f3a T\u1eadp h\u1ee3p nh\u00f3m ch\u1ec9 s\u1ed1
 F_INDICATORGROUPSET_ADD             = Th\u00eam T\u1eadp h\u1ee3p nh\u00f3m ch\u1ec9 s\u1ed1
-F_GIS_CONFIGURATION_UPDATE=Thay \u0111\u1ED5i c\u1EA5u h\u00ECnh GIS
-F_EXCEL_TEMPLATE_MANAGEMENT_RENAME=\u0110\u1ED5i t\u00EAn t\u1EADp tin excel m\u1EABu
-F_EXCEL_TEMPLATE_MANAGEMENT_LIST=Li\u1EC7t k\u00EA danh s\u00E1ch t\u1EADp tin excel m\u1EABu
-F_EXCEL_TEMPLATE_MANAGEMENT_DELETE=X\u00F3a t\u1EADp tin excel m\u1EABu
-F_EXCEL_TEMPLATE_MAMAGEMENT_UPLOAD=T\u1EA3i t\u1EADp tin excel m\u1EABu
-F_EXCEL_REPORT_ADMINISTRATION=Qu\u1EA3n tr\u1ECB module B\u00E1o c\u00E1o Excel
-F_DOCUMENT_DELETE=X\u00F3a t\u00E0i li\u1EC7u
-F_DOCUMENT_ADD=Th\u00EAm t\u00E0i li\u1EC7u
-F_DATAVALUE_UPDATE=C\u1EADp nh\u1EADt gi\u00E1 tr\u1ECB d\u1EEF li\u1EC7u\t
-F_DATAVALUE_DELETE=X\u00F3a gi\u00E1 tr\u1ECB d\u1EEF li\u1EC7u
-F_DATAVALUE_ADD=Th\u00EAm gi\u00E1 tr\u1ECB d\u1EEF li\u1EC7u
-F_DATASET_UPDATE=C\u1EADp nh\u1EADt t\u1EADp h\u1EE3p d\u1EEF li\u1EC7u
-F_DATASET_ORDER_CHANGE=Thay \u0111\u1ED5i th\u1EE9 t\u1EF1 t\u1EADp h\u1EE3p d\u1EEF li\u1EC7u
-F_DATASET_LOCK=Kh\u00F3a t\u1EADp h\u1EE3p d\u1EEF li\u1EC7u
-F_DATASET_DELETE=X\u00F3a t\u1EADp h\u1EE3p d\u1EEF li\u1EC7u
-F_DATASET_ADD=Th\u00EAm t\u1EADp h\u1EE3p d\u1EEF li\u1EC7u
-F_DATAELEMENT_UPDATE=X\u00F3a ph\u1EA7n t\u1EED d\u1EEF li\u1EC7u
-F_DATAELEMENT_MINMAX_UPDATE=C\u1EADp nh\u1EADt gi\u00E1 tr\u1ECB l\u1EDBn nh\u1EA5t/nh\u1ECF nh\u1EA5t
-F_DATAELEMENT_MINMAX_DELETE=X\u00F3a gi\u00E1 tr\u1ECB l\u1EDBn nh\u1EA5t/nh\u1ECF nh\u1EA5t
-F_DATAELEMENT_MINMAX_ADD=Th\u00EAm gi\u00E1 tr\u1ECB l\u1EDBn nh\u1EA5t/nh\u1ECF nh\u1EA5t
-F_DATAELEMENT_DELETE=X\u00F3a ph\u1EA7n t\u1EED d\u1EEF li\u1EC7u
-F_DATAELEMENT_ADD=Th\u00EAm ph\u1EA7n t\u1EED d\u1EEF li\u1EC7u
-F_DATAELEMENTGROUP_UPDATE=C\u1EADp nh\u1EADt nh\u00F3m ph\u1EA7n t\u1EED d\u1EEF li\u1EC7u
-F_DATAELEMENTGROUP_DELETE=X\u00F3a nh\u00F3m ph\u1EA7n t\u1EED d\u1EEF li\u1EC7u
-F_DATAELEMENTGROUP_ADD=Th\u00EAm m\u1EDBi nh\u00F3m ph\u1EA7n t\u1EED d\u1EEF li\u1EC7u
+F_GIS_CONFIGURATION_UPDATE=Thay \u0111\u1ed5i c\u1ea5u h\u00ecnh GIS
+F_EXCEL_TEMPLATE_MANAGEMENT_RENAME=\u0110\u1ed5i t\u00ean t\u1eadp tin excel m\u1eabu
+F_EXCEL_TEMPLATE_MANAGEMENT_LIST=Li\u1ec7t k\u00ea danh s\u00e1ch t\u1eadp tin excel m\u1eabu
+F_EXCEL_TEMPLATE_MANAGEMENT_DELETE=X\u00f3a t\u1eadp tin excel m\u1eabu
+F_EXCEL_TEMPLATE_MAMAGEMENT_UPLOAD=T\u1ea3i t\u1eadp tin excel m\u1eabu
+F_EXCEL_REPORT_ADMINISTRATION=Qu\u1ea3n tr\u1ecb module B\u00e1o c\u00e1o Excel
+F_DOCUMENT_DELETE=X\u00f3a t\u00e0i li\u1ec7u
+F_DOCUMENT_ADD=Th\u00eam t\u00e0i li\u1ec7u
+F_DATAVALUE_UPDATE=C\u1eadp nh\u1eadt gi\u00e1 tr\u1ecb d\u1eef li\u1ec7u\t
+F_DATAVALUE_DELETE=X\u00f3a gi\u00e1 tr\u1ecb d\u1eef li\u1ec7u
+F_DATAVALUE_ADD=Th\u00eam gi\u00e1 tr\u1ecb d\u1eef li\u1ec7u
+F_DATASET_UPDATE=C\u1eadp nh\u1eadt t\u1eadp h\u1ee3p d\u1eef li\u1ec7u
+F_DATASET_ORDER_CHANGE=Thay \u0111\u1ed5i th\u1ee9 t\u1ef1 t\u1eadp h\u1ee3p d\u1eef li\u1ec7u
+F_DATASET_LOCK=Kh\u00f3a t\u1eadp h\u1ee3p d\u1eef li\u1ec7u
+F_DATASET_DELETE=X\u00f3a t\u1eadp h\u1ee3p d\u1eef li\u1ec7u
+F_DATASET_ADD=Th\u00eam t\u1eadp h\u1ee3p d\u1eef li\u1ec7u
+F_DATAELEMENT_UPDATE=X\u00f3a ph\u1ea7n t\u1eed d\u1eef li\u1ec7u
+F_DATAELEMENT_MINMAX_UPDATE=C\u1eadp nh\u1eadt gi\u00e1 tr\u1ecb l\u1edbn nh\u1ea5t/nh\u1ecf nh\u1ea5t
+F_DATAELEMENT_MINMAX_DELETE=X\u00f3a gi\u00e1 tr\u1ecb l\u1edbn nh\u1ea5t/nh\u1ecf nh\u1ea5t
+F_DATAELEMENT_MINMAX_ADD=Th\u00eam gi\u00e1 tr\u1ecb l\u1edbn nh\u1ea5t/nh\u1ecf nh\u1ea5t
+F_DATAELEMENT_DELETE=X\u00f3a ph\u1ea7n t\u1eed d\u1eef li\u1ec7u
+F_DATAELEMENT_ADD=Th\u00eam ph\u1ea7n t\u1eed d\u1eef li\u1ec7u
+F_DATAELEMENTGROUP_UPDATE=C\u1eadp nh\u1eadt nh\u00f3m ph\u1ea7n t\u1eed d\u1eef li\u1ec7u
+F_DATAELEMENTGROUP_DELETE=X\u00f3a nh\u00f3m ph\u1ea7n t\u1eed d\u1eef li\u1ec7u
+F_DATAELEMENTGROUP_ADD=Th\u00eam m\u1edbi nh\u00f3m ph\u1ea7n t\u1eed d\u1eef li\u1ec7u
 F_DATAELEMENTGROUPSET_UPDATE        = C\u1eadp nh\u1eadt T\u1eadp h\u1ee3p nh\u00f3m ph\u1ea7n t\u1eed d\u1eef li\u1ec7u
 F_DATAELEMENTGROUPSET_DELETE        = X\u00f3a T\u1eadp h\u1ee3p nh\u00f3m ph\u1ea7n t\u1eed d\u1eef li\u1ec7u
 F_DATAELEMENTGROUPSET_ADD           = Th\u00eam T\u1eadp h\u1ee3p nh\u00f3m ph\u1ea7n t\u1eed d\u1eef li\u1ec7u
-F_DATADICTIONARY_UPDATE=C\u1EADp nh\u1EADt t\u1EEB \u0111i\u1EC3n d\u1EEF li\u1EC7u
-F_DATADICTIONARY_DELETE=X\u00F3a t\u1EEB \u0111i\u1EC3n d\u1EEF li\u1EC7u
-F_DATADICTIONARY_ADD=Th\u00EAm t\u1EEB \u0111i\u1EC3n d\u1EEF li\u1EC7u
-F_DASHBOARD_DOWNLOAD_BACKUP=T\u1EA1o v\u00E0 t\u1EA3i xu\u1ED1ng d\u1EEF li\u1EC7u sao l\u01B0u
-F_COPY_EXCEL_ITEM_ADMINISTRATION=Sao ch\u00E9p ph\u1EA7n t\u1EED Excel
+F_DATADICTIONARY_UPDATE=C\u1eadp nh\u1eadt t\u1eeb \u0111i\u1ec3n d\u1eef li\u1ec7u
+F_DATADICTIONARY_DELETE=X\u00f3a t\u1eeb \u0111i\u1ec3n d\u1eef li\u1ec7u
+F_DATADICTIONARY_ADD=Th\u00eam t\u1eeb \u0111i\u1ec3n d\u1eef li\u1ec7u
+F_DASHBOARD_DOWNLOAD_BACKUP=T\u1ea1o v\u00e0 t\u1ea3i xu\u1ed1ng d\u1eef li\u1ec7u sao l\u01b0u
+F_COPY_EXCEL_ITEM_ADMINISTRATION=Sao ch\u00e9p ph\u1ea7n t\u1eed Excel
 F_CONCEPT_UPDATE                    = C\u1eadp nh\u1eadt Concept
 F_CONCEPT_MANAGEMENT                = Qu\u1ea3n l\u00fd Concept
 F_CONCEPT_DELETE                    = X\u00f3a Concept
 F_CONCEPT_ADD                       = Th\u00eam Concept
-F_CHART_DELETE=X\u00F3a bi\u1EC3u \u0111\u1ED3
-F_CHART_ADD=Th\u00EAm bi\u1EC3u \u0111\u1ED3
\ No newline at end of file
+F_CHART_DELETE						= X\u00f3a bi\u1ec3u \u0111\u1ed3
+F_CHART_ADD							= Th\u00eam bi\u1ec3u \u0111\u1ed3
+F_DATAADMIN_LOCK 					= Kh\u00f3a d\u1eef li\u1ec7u
+F_DATAADMIN_UNLOCK 					= M\u1edf kh\u00f3a d\u1eef li\u1ec7u
\ No newline at end of file