=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/resources/org/hisp/dhis/dd/i18n_module.properties'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/resources/org/hisp/dhis/dd/i18n_module.properties 2010-09-08 10:40:26 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/resources/org/hisp/dhis/dd/i18n_module.properties 2010-09-28 04:02:31 +0000
@@ -406,4 +406,5 @@
concept_management = Concept management
concept = Concept
selected_name = Selected name
-update_category_option = Update Category Option
\ No newline at end of file
+update_category_option = Update Category Option
+move_selected = Move selected
\ No newline at end of file
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/resources/struts.xml'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/resources/struts.xml 2010-09-24 04:42:54 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/resources/struts.xml 2010-09-28 04:02:31 +0000
@@ -973,7 +973,7 @@
class="org.hisp.dhis.dd.action.categorycombo.GetDataElementCategoryListAction">
/main.vm
/dhis-web-maintenance-datadictionary/multidimensional/addDataElementCategoryComboForm.vm
- javascript/dataElementCategoryList.js,javascript/categoryCombo.js
+ javascript/categoryCombo.js
style/dhis-web-maintenance-datadictionary.css
F_DATAELEMENT_ADD
@@ -1021,7 +1021,7 @@
class="org.hisp.dhis.dd.action.categorycombo.GetDataElementCategoryComboAction">
/main.vm
/dhis-web-maintenance-datadictionary/multidimensional/updateDataElementCategoryComboForm.vm
- javascript/dataElementCategoryList.js,javascript/categoryCombo.js
+ javascript/categoryCombo.js
F_DATAELEMENT_UPDATE
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/multidimensional/addDataElementCategoryComboForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/multidimensional/addDataElementCategoryComboForm.vm 2010-09-27 12:39:54 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/multidimensional/addDataElementCategoryComboForm.vm 2010-09-28 04:02:31 +0000
@@ -20,7 +20,7 @@
- |
+ |
|
@@ -41,20 +41,20 @@
- |
-
-
-
-
+
+
+
+
|
-
+
|
@@ -62,7 +62,7 @@
|
|
-
+
|
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/multidimensional/updateDataElementCategoryComboForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/multidimensional/updateDataElementCategoryComboForm.vm 2010-09-27 12:39:54 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/multidimensional/updateDataElementCategoryComboForm.vm 2010-09-28 04:02:31 +0000
@@ -48,7 +48,7 @@
-
+
#foreach ( $availableDataElementCategory in $allDataElementCategories )
#end
@@ -56,13 +56,13 @@
|
-
-
-
-
+
+
+
+
|
-
+
#foreach ( $dataElementCategory in $dataElementCategories )
#end
@@ -73,7 +73,7 @@
|
|
-
+
|
|
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/resources/org/hisp/dhis/dataset/i18n_module.properties'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/resources/org/hisp/dhis/dataset/i18n_module.properties 2010-09-07 05:24:21 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/resources/org/hisp/dhis/dataset/i18n_module.properties 2010-09-28 04:02:31 +0000
@@ -131,9 +131,9 @@
new = Add new
rename = Rename
choose_dataset = Select dataset first
-add_success = Add success
-delete_success = Delete success
-rename_success = Rename success
+add_success = Add successfully
+delete_success = Delete successfully
+rename_success = Rename successfully
rename_failed = Rename failed
select = [Select]
save_success = Save successfully