dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #28722
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 14373: added public/private authorities for orgUnitgroupSet
------------------------------------------------------------
revno: 14373
committer: Morten Olav Hansen <mortenoh@xxxxxxxxx>
branch nick: dhis2
timestamp: Mon 2014-03-24 20:06:54 +0100
message:
added public/private authorities for orgUnitgroupSet
modified:
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/startup/TableAlteror.java
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/resources/struts.xml
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_es.properties
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module_fr.properties
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module_id.properties
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module_lo.properties
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module_my.properties
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module_pt.properties
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module_pt_BR.properties
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module_ru.properties
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module_tg.properties
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module_vi.properties
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module_zh.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-services/dhis-service-core/src/main/java/org/hisp/dhis/startup/TableAlteror.java'
--- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/startup/TableAlteror.java 2014-03-24 19:03:18 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/startup/TableAlteror.java 2014-03-24 19:06:54 +0000
@@ -553,6 +553,7 @@
executeSql( "UPDATE userroleauthorities SET authority='F_DATAELEMENTGROUPSET_PUBLIC_ADD' WHERE authority='F_DATAELEMENTGROUPSET_ADD'" );
executeSql( "UPDATE userroleauthorities SET authority='F_ORGUNITGROUP_PUBLIC_ADD' WHERE authority='F_ORGUNITGROUP_ADD'" );
+ executeSql( "UPDATE userroleauthorities SET authority='F_ORGUNITGROUPSET_PUBLIC_ADD' WHERE authority='F_ORGUNITGROUPSET_ADD'" );
executeSql( "UPDATE userroleauthorities SET authority='F_INDICATOR_PUBLIC_ADD' WHERE authority='F_INDICATOR_ADD'" );
executeSql( "UPDATE userroleauthorities SET authority='F_INDICATORGROUP_PUBLIC_ADD' WHERE authority='F_INDICATORGROUP_ADD'" );
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/resources/struts.xml'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/resources/struts.xml 2014-01-19 06:27:35 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/resources/struts.xml 2014-03-24 19:06:54 +0000
@@ -143,7 +143,7 @@
<action name="addOrganisationUnitGroupSet" class="org.hisp.dhis.oum.action.organisationunitgroupset.AddGroupSetAction">
<result name="success" type="redirect">organisationUnitGroupSet.action</result>
- <param name="requiredAuthorities">F_ORGUNITGROUPSET_ADD</param>
+ <param name="anyAuthorities">F_ORGUNITGROUPSET_PUBLIC_ADD, F_ORGUNITGROUPSET_PRIVATE_ADD</param>
</action>
<action name="validateOrganisationUnitGroupSet" class="org.hisp.dhis.oum.action.organisationunitgroupset.ValidateGroupSetAction">
@@ -156,14 +156,14 @@
<result name="success" type="velocity">/main.vm</result>
<param name="page">/dhis-web-maintenance-organisationunit/addOrganisationUnitGroupSetForm.vm</param>
<param name="javascripts">javascript/organisationUnitGroupSet.js</param>
- <param name="requiredAuthorities">F_ORGUNITGROUPSET_ADD</param>
+ <param name="anyAuthorities">F_ORGUNITGROUPSET_PUBLIC_ADD, F_ORGUNITGROUPSET_PRIVATE_ADD</param>
</action>
<action name="showUpdateOrganisationUnitGroupSetForm" class="org.hisp.dhis.oum.action.organisationunitgroupset.ShowUpdateGroupSetFormAction">
<result name="success" type="velocity">/main.vm</result>
<param name="page">/dhis-web-maintenance-organisationunit/updateOrganisationUnitGroupSetForm.vm</param>
<param name="javascripts">javascript/organisationUnitGroupSet.js</param>
- <param name="requiredAuthorities">F_ORGUNITGROUPSET_ADD</param>
+ <param name="anyAuthorities">F_ORGUNITGROUPSET_PUBLIC_ADD, F_ORGUNITGROUPSET_PRIVATE_ADD</param>
</action>
<action name="removeOrganisationUnitGroupSet" class="org.hisp.dhis.oum.action.organisationunitgroupset.RemoveGroupSetAction">
@@ -175,7 +175,7 @@
<action name="updateOrganisationUnitGroupSet" class="org.hisp.dhis.oum.action.organisationunitgroupset.UpdateGroupSetAction">
<result name="success" type="redirect">organisationUnitGroupSet.action?currentPage=${keyCurrentPage}</result>
- <param name="requiredAuthorities">F_ORGUNITGROUPSET_ADD</param>
+ <param name="anyAuthorities">F_ORGUNITGROUPSET_PUBLIC_ADD, F_ORGUNITGROUPSET_PRIVATE_ADD</param>
</action>
<!-- Hierarchy -->
=== 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 2014-03-24 19:03:18 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module.properties 2014-03-24 19:06:54 +0000
@@ -99,7 +99,8 @@
F_ORGUNITGROUP_PUBLIC_ADD=Add/Update Public Organisation Unit Group
F_ORGUNITGROUP_PRIVATE_ADD=Add/Update Private Organisation Unit Group
F_ORGUNITGROUP_DELETE=Delete Organisation Unit Group
-F_ORGUNITGROUPSET_ADD=Add/Update Organisation Unit Group Set
+F_ORGUNITGROUPSET_PUBLIC_ADD=Add/Update Public Organisation Unit Group Set
+F_ORGUNITGROUPSET_PRIVATE_ADD=Add/Update Private Organisation Unit Group Set
F_ORGUNITGROUPSET_DELETE=Delete Organisation Unit Group Set
F_ORGANISATIONUNITLEVEL_UPDATE=Update Organisation Unit Level
F_USERROLE_ADD=Add/Update User Role
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module_es.properties'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module_es.properties 2014-03-24 19:03:18 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module_es.properties 2014-03-24 19:06:54 +0000
@@ -51,7 +51,7 @@
F_DOCUMENT_PUBLIC_ADD=A\u00f1adir Documento
confirm_delete_user=\u00bfConfirmar suprimir a este usuario?
M_dhis-web-maintenance-dataset=Ver m\u00f3dulo de mantenimiento de Conjunto de Datos
-F_ORGUNITGROUPSET_ADD=A\u00f1adir Conjunto de Grupos de Unidad Organizativa
+F_ORGUNITGROUPSET_PUBLIC_ADD=A\u00f1adir Conjunto de Grupos de Unidad Organizativa
F_VALIDATIONRULE_ADD=A\u00f1adir Regla de Validaci\u00f3n
name=Nombre
F_DATAELEMENT_PUBLIC_ADD=A\u00f1adir Elemento de Dato
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module_fr.properties'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module_fr.properties 2014-03-24 19:03:18 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module_fr.properties 2014-03-24 19:06:54 +0000
@@ -285,7 +285,7 @@
F_GENERATE_STATISTICAL_PROGRAM_REPORT=G\u00E9n\u00E9rer Rapport de Statistiques de Programme
F_ARCHIVE_DATA=Archive les donn\u00E9es
specify_retype_password=Veuillez resaisir le mot de passe
-F_ORGUNITGROUPSET_ADD=Ajouter ensemble de groupes d'unit\u00E9s d'organisation
+F_ORGUNITGROUPSET_PUBLIC_ADD=Ajouter ensemble de groupes d'unit\u00E9s d'organisation
name_in_use=Le nom est d\u00E9j\u00E0 utilis\u00E9, veuillez sp\u00E9cifier un nom diff\u00E9rent
F_FRED_CREATE=Ajouter Etablissement
F_MERGE_ORGANISATION_UNITS=Fusionner les unit\u00E9s d'organisation
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module_id.properties'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module_id.properties 2014-03-24 19:03:18 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module_id.properties 2014-03-24 19:06:54 +0000
@@ -79,7 +79,7 @@
F_ORGANISATIONUNIT_MOVE=Pindah Unit Organisasi
F_ORGUNITGROUP_PUBLIC_ADD=Tambah Kelompok Unit Organisasi
F_ORGUNITGROUP_DELETE=Hapus Kelompok Unit Organisasi
-F_ORGUNITGROUPSET_ADD=Tambah Set Kelompok Unit Organisasi
+F_ORGUNITGROUPSET_PUBLIC_ADD=Tambah Set Kelompok Unit Organisasi
F_ORGUNITGROUPSET_DELETE=Hapus Set Kelompok Unit Organisasi
F_ORGANISATIONUNITLEVEL_UPDATE=Perbaharui Tingkatan Unit Organisasi
F_USERROLE_ADD=Tambah Peran Pengguna
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module_lo.properties'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module_lo.properties 2014-03-24 19:03:18 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module_lo.properties 2014-03-24 19:06:54 +0000
@@ -81,7 +81,7 @@
F_ORGUNITGROUP_PUBLIC_ADD=Add/Update Public Organisation Unit Group
F_ORGUNITGROUP_PRIVATE_ADD=Add/Update Private Organisation Unit Group
F_ORGUNITGROUP_DELETE=Delete Organisation Unit Group
-F_ORGUNITGROUPSET_ADD=Add/Update Organisation Unit Group Set
+F_ORGUNITGROUPSET_PUBLIC_ADD=Add/Update Organisation Unit Group Set
F_ORGUNITGROUPSET_DELETE=Delete Organisation Unit Group Set
F_ORGANISATIONUNITLEVEL_UPDATE=Update Organisation Unit Level
F_USERROLE_ADD=Add/Update User Role
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module_my.properties'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module_my.properties 2014-03-24 19:03:18 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module_my.properties 2014-03-24 19:06:54 +0000
@@ -67,7 +67,7 @@
F_ORGANISATIONUNIT_MOVE=\u1021\u1016\u103d\u1032\u1037\u1021\u1005\u100a\u103a\u1038\u101a\u1030\u1014\u1005\u103a \u101b\u103d\u1031\u1037\u101e\u100a\u103a\u104b
F_ORGUNITGROUP_PUBLIC_ADD=\u1021\u1016\u103d\u1032\u1037\u1021\u1005\u100a\u103a\u1038\u101a\u1030\u1014\u1005\u103a\u1021\u102f\u1015\u103a\u1005\u102f\u1000\u102d\u102f \u1015\u1031\u102b\u1004\u103a\u1038\u1011\u100a\u1037\u103a\u101e\u100a\u103a\u104b
F_ORGUNITGROUP_DELETE=\u1021\u1016\u103d\u1032\u1037\u1021\u1005\u100a\u103a\u1038\u101a\u1030\u1014\u1005\u103a\u1021\u102f\u1015\u103a\u1005\u102f\u1000\u102d\u102f \u1016\u103b\u1000\u103a\u101e\u100a\u103a\u104b
-F_ORGUNITGROUPSET_ADD=\u1021\u1016\u103d\u1032\u1037\u1021\u1005\u100a\u103a\u1038\u101a\u1030\u1014\u1005\u103a\u1021\u102f\u1015\u103a\u1005\u102f\u104f \u1021\u1005\u102f\u1000\u102d\u102f\u1015\u1031\u102b\u1004\u103a\u1038\u1011\u100a\u1037\u103a\u101e\u100a\u103a\u104b
+F_ORGUNITGROUPSET_PUBLIC_ADD=\u1021\u1016\u103d\u1032\u1037\u1021\u1005\u100a\u103a\u1038\u101a\u1030\u1014\u1005\u103a\u1021\u102f\u1015\u103a\u1005\u102f\u104f \u1021\u1005\u102f\u1000\u102d\u102f\u1015\u1031\u102b\u1004\u103a\u1038\u1011\u100a\u1037\u103a\u101e\u100a\u103a\u104b
F_ORGUNITGROUPSET_DELETE=\u1021\u1016\u103d\u1032\u1037\u1021\u1005\u100a\u103a\u1038\u101a\u1030\u1014\u1005\u103a\u1021\u102f\u1015\u103a\u1005\u102f\u104f \u1021\u1005\u102f\u1000\u102d\u102f \u1016\u103b\u1000\u103a\u101e\u100a\u103a\u104b
F_ORGANISATIONUNITLEVEL_UPDATE=\u1021\u1016\u103d\u1032\u1037\u1021\u1005\u100a\u103a\u1038\u101a\u1030\u1014\u1005\u103a\u1021\u102f\u1015\u103a\u1005\u102f \u1021\u1006\u1004\u1037\u103a \u1015\u103c\u1004\u103a\u1006\u1004\u103a\u1019\u103d\u1019\u103a\u1038\u1019\u1036\u101e\u100a\u103a\u104b
F_REPORT_DELETE=Delete Report
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module_pt.properties'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module_pt.properties 2014-03-24 19:03:18 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module_pt.properties 2014-03-24 19:06:54 +0000
@@ -298,7 +298,7 @@
F_ADD_PATIENT_REGISTRATION_FORM=Adicionar Formul\u00E1rio de Inscri\u00E7\u00E3o da Pessoa
specify_retype_password=Por favor, confirme a password
F_ARCHIVE_DATA=Arquivo de dados
-F_ORGUNITGROUPSET_ADD=Adicionar Set Grupo Unidade Organizacional
+F_ORGUNITGROUPSET_PUBLIC_ADD=Adicionar Set Grupo Unidade Organizacional
name_in_use=O nome j\u00E1 est\u00E1 em uso, especifique um nome diferente
F_FRED_CREATE=Adicionar facilidade
F_MERGE_ORGANISATION_UNITS=Fundir Unidades Organizacionais
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module_pt_BR.properties'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module_pt_BR.properties 2014-03-24 19:03:18 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module_pt_BR.properties 2014-03-24 19:06:54 +0000
@@ -280,7 +280,7 @@
F_ADD_PATIENT_REGISTRATION_FORM=Adicionar Formul\u00E1rio de Inscri\u00E7\u00E3o da Pessoa
F_ARCHIVE_DATA=Arquivo de dados
specify_retype_password=Por favor, confirme a password
-F_ORGUNITGROUPSET_ADD=Adicionar Set Grupo Unidade Organizacional
+F_ORGUNITGROUPSET_PUBLIC_ADD=Adicionar Set Grupo Unidade Organizacional
name_in_use=O nome j\u00E1 est\u00E1 em uso, especifique um nome diferente
F_FRED_CREATE=Adicionar facilidade
F_MERGE_ORGANISATION_UNITS=Fundir Unidades Organizacionais
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module_ru.properties'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module_ru.properties 2014-03-24 19:03:18 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module_ru.properties 2014-03-24 19:06:54 +0000
@@ -82,7 +82,7 @@
F_ORGANISATIONUNIT_MOVE = \u041F\u0435\u0440\u0435\u043C\u0435\u0441\u0442\u0438\u0442\u044C \u043E\u0440\u0433\u0430\u043D\u0438\u0437\u0430\u0446\u0438\u044E
F_ORGUNITGROUP_PUBLIC_ADD = \u0414\u043E\u0431\u0430\u0432\u0438\u0442\u044C \u0433\u0440\u0443\u043F\u043F\u0443 \u043E\u0440\u0433\u0430\u043D\u0438\u0437\u0430\u0446\u0438\u0439
F_ORGUNITGROUP_DELETE = \u0423\u0434\u0430\u043B\u0438\u0442\u044C \u0433\u0440\u0443\u043F\u043F\u0443 \u043E\u0440\u0433\u0430\u043D\u0438\u0437\u0430\u0446\u0438\u0439
-F_ORGUNITGROUPSET_ADD = \u0414\u043E\u0431\u0430\u0432\u0438\u0442\u044C \u043D\u0430\u0431\u043E\u0440 \u0433\u0440\u0443\u043F\u043F \u043E\u0440\u0433\u0430\u043D\u0438\u0437\u0430\u0446\u0438\u0439
+F_ORGUNITGROUPSET_PUBLIC_ADD = \u0414\u043E\u0431\u0430\u0432\u0438\u0442\u044C \u043D\u0430\u0431\u043E\u0440 \u0433\u0440\u0443\u043F\u043F \u043E\u0440\u0433\u0430\u043D\u0438\u0437\u0430\u0446\u0438\u0439
F_ORGUNITGROUPSET_DELETE = \u0423\u0434\u0430\u043B\u0438\u0442\u044C \u043D\u0430\u0431\u043E\u0440 \u0433\u0440\u0443\u043F\u043F \u043E\u0440\u0433\u0430\u043D\u0438\u0437\u0430\u0446\u0438\u0439
F_ORGANISATIONUNITLEVEL_UPDATE = \u041E\u0431\u043D\u043E\u0432\u0438\u0442\u044C \u0443\u0440\u043E\u0432\u0435\u043D\u044C \u043E\u0440\u0433\u0430\u043D\u0438\u0437\u0430\u0446\u0438\u0438
F_USERROLE_ADD = \u0414\u043E\u0431\u0430\u0432\u0438\u0442\u044C \u0443\u0440\u043E\u0432\u0435\u043D\u044C \u0434\u043E\u0441\u0442\u0443\u043F\u0430
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module_tg.properties'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module_tg.properties 2014-03-24 19:03:18 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module_tg.properties 2014-03-24 19:06:54 +0000
@@ -82,7 +82,7 @@
F_ORGANISATIONUNIT_MOVE = \u0418\u043D\u0442\u0438\u049B\u043E\u043B\u0438 \u0412\u043E\u04B3\u0438\u0434\u0438 \u0441\u043E\u0445\u0442\u043E\u0440\u04E3
F_ORGUNITGROUP_PUBLIC_ADD = \u0418\u043B\u043E\u0432\u0430\u0438 \u0413\u0443\u0440\u04EF\u04B3\u0438 \u0432\u043E\u04B3\u0438\u0434\u04B3\u043E\u0438 \u0441\u043E\u0445\u0442\u043E\u0440\u04E3
F_ORGUNITGROUP_DELETE = \u041D\u0435\u0441\u0442 \u043A\u0430\u0440\u0434\u0430\u043D\u0438 \u0413\u0443\u0440\u04EF\u04B3\u0438 \u0432\u043E\u04B3\u0438\u0434\u04B3\u043E\u0438 \u0441\u043E\u0445\u0442\u043E\u0440\u04E3
-F_ORGUNITGROUPSET_ADD = \u0418\u043B\u043E\u0432\u0430\u0438 \u041C\u0430\u04B7\u043C\u04EF\u0438 \u0433\u0443\u0440\u04EF\u04B3\u0438 \u0432\u043E\u04B3\u0438\u0434\u04B3\u043E\u0438 \u0441\u043E\u0445\u0442\u043E\u0440\u04E3
+F_ORGUNITGROUPSET_PUBLIC_ADD = \u0418\u043B\u043E\u0432\u0430\u0438 \u041C\u0430\u04B7\u043C\u04EF\u0438 \u0433\u0443\u0440\u04EF\u04B3\u0438 \u0432\u043E\u04B3\u0438\u0434\u04B3\u043E\u0438 \u0441\u043E\u0445\u0442\u043E\u0440\u04E3
F_ORGUNITGROUPSET_DELETE = \u041D\u0435\u0441\u0442 \u043A\u0430\u0440\u0434\u0430\u043D\u0438 \u041C\u0430\u04B7\u043C\u04EF\u0438 \u0433\u0443\u0440\u04EF\u04B3\u0438 \u0432\u043E\u04B3\u0438\u0434\u04B3\u043E\u0438 \u0441\u043E\u0445\u0442\u043E\u0440\u04E3
F_ORGANISATIONUNITLEVEL_UPDATE = \u041D\u0430\u0432\u0441\u043E\u0437\u0438\u0438 \u0441\u0430\u0442\u04B3\u0438 \u0412\u043E\u04B3\u0438\u0434\u04B3\u043E\u0438 \u0441\u043E\u0445\u0442\u043E\u0440\u04E3
F_USERROLE_ADD = \u0418\u043B\u043E\u0432\u0430\u0438 \u0412\u0430\u0437\u0438\u0444\u0430\u0438 \u043A\u043E\u0440\u0431\u0430\u0440
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module_vi.properties'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module_vi.properties 2014-03-24 19:03:18 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module_vi.properties 2014-03-24 19:06:54 +0000
@@ -78,7 +78,7 @@
F_SQLVIEW_EXECUTE=Th\u1ef1c thi Sql View
M_dhis-web-maintenance-dataset=Xem ch\u1ee9c n\u0103ng Qu\u1ea3n L\u00fd Bi\u1ec3u Nh\u1eadp
show_all_roles=Hi\u1ec3n th\u1ecb t\u1ea5t c\u1ea3 c\u00e1c quy\u1ec1n
-F_ORGUNITGROUPSET_ADD=Th\u00eam t\u1eadp h\u1ee3p nh\u00f3m \u0111\u01a1n v\u1ecb
+F_ORGUNITGROUPSET_PUBLIC_ADD=Th\u00eam t\u1eadp h\u1ee3p nh\u00f3m \u0111\u01a1n v\u1ecb
create_new_role=T\u1ea1o vai tr\u00f2 m\u1edbi
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.
F_VALIDATIONRULE_ADD=Th\u00eam lu\u1eadt ki\u1ec3m tra t\u00ednh h\u1ee3p l\u1ec7
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module_zh.properties'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module_zh.properties 2014-03-24 19:03:18 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module_zh.properties 2014-03-24 19:06:54 +0000
@@ -227,7 +227,7 @@
object_not_deleted_associated_by_objects=\u5BF9\u8C61\u5173\u8054\u5230\u5BF9\u8C61\u7C7B\u578B\u4E0D\u80FD\u5220\u9664
F_ARCHIVE_DATA=\u5F52\u6863\u6570\u636E
specify_retype_password=\u8BF7\u786E\u8BA4\u5BC6\u7801
-F_ORGUNITGROUPSET_ADD=\u6DFB\u52A0\u7EC4\u7EC7\u673A\u6784\u7EC4\u96C6
+F_ORGUNITGROUPSET_PUBLIC_ADD=\u6DFB\u52A0\u7EC4\u7EC7\u673A\u6784\u7EC4\u96C6
name_in_use=\u540D\u79F0\u6B63\u5728\u4F7F\u7528\u4E2D
F_MERGE_ORGANISATION_UNITS=\u5408\u5E76\u7EC4\u7EC7\u673A\u6784
F_CONSTANT_MANAGEMENT=\u5E38\u6570\u7BA1\u7406
