← Back to team overview

dhis2-devs team mailing list archive

[Branch ~dhis2-devs-core/dhis2/trunk] Rev 2319: Centralized translations - Please REBUILD "dhis-web-commons" BEFORE keep working on your other st...

 

------------------------------------------------------------
revno: 2319
committer: Hieu <hieu.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Thu 2010-12-09 13:15:40 +0700
message:
  Centralized translations - Please REBUILD "dhis-web-commons" BEFORE keep working on your other stuffs
modified:
  dhis-2/dhis-web/dhis-web-commons/src/main/resources/i18n_global.properties
  dhis-2/dhis-web/dhis-web-commons/src/main/resources/i18n_global_vi_VN.properties
  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-datamart/src/main/resources/org/hisp/dhis/datamart/i18n_module.properties
  dhis-2/dhis-web/dhis-web-datamart/src/main/resources/org/hisp/dhis/datamart/i18n_module_vi_VN.properties
  dhis-2/dhis-web/dhis-web-excel-reporting/src/main/resources/org/hisp/dhis/reportexcel/i18n_module.properties
  dhis-2/dhis-web/dhis-web-excel-reporting/src/main/resources/org/hisp/dhis/reportexcel/i18n_module_en_GB.properties
  dhis-2/dhis-web/dhis-web-excel-reporting/src/main/resources/org/hisp/dhis/reportexcel/i18n_module_vi_VN.properties
  dhis-2/dhis-web/dhis-web-importexport/src/main/resources/org/hisp/dhis/importexport/i18n_module.properties
  dhis-2/dhis-web/dhis-web-importexport/src/main/resources/org/hisp/dhis/importexport/i18n_module_vi_VN.properties
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/resources/org/hisp/dhis/dataadmin/i18n_module.properties
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/resources/org/hisp/dhis/dataadmin/i18n_module_vi_VN.properties
  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_vi_VN.properties
  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_vi_VN.properties
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/resources/org/hisp/dhis/oum/i18n_module.properties
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/resources/org/hisp/dhis/oum/i18n_module_vi_VN.properties
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/resources/org/hisp/dhis/patient/i18n_module.properties
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/resources/org/hisp/dhis/patient/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.properties
  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-validationrule/src/main/resources/org/hisp/dhis/validationrule/i18n_module.properties
  dhis-2/dhis-web/dhis-web-validationrule/src/main/resources/org/hisp/dhis/validationrule/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-commons/src/main/resources/i18n_global.properties'
--- dhis-2/dhis-web/dhis-web-commons/src/main/resources/i18n_global.properties	2010-12-08 07:24:10 +0000
+++ dhis-2/dhis-web/dhis-web-commons/src/main/resources/i18n_global.properties	2010-12-09 06:15:40 +0000
@@ -77,6 +77,7 @@
 
 #-- Common --------------------------------------------------------------------#
 
+details                 = Details
 show_details            = Show details
 hide_details            = Hide details
 change_password 		= Change password
@@ -286,7 +287,6 @@
 #-- User account  ----------------------------------------------------------------------#
 
 update_user         = Update user
-details             = Details
 user_account        = User Account
 user_name           = User name
 old_password        = Old password
@@ -384,19 +384,20 @@
 
 #-- Paging messages  ----------------------------------------------------------------------#
 
-no_of_pages 	= No. of pages
-size_of_page 	= Size of page
-jump_to_page 	= Jump to page
-go				= Go
-filter_by_name	= Filter by name
-filter			= Filter
-clear			= Clear
-find			= Find
-delete_success = Object deleted
-process = Processing...
+no_of_pages 	    = No. of pages
+size_of_page 	    = Size of page
+jump_to_page 	    = Jump to page
+go				    = Go
+filter_by_name	    = Filter by name
+filter			    = Filter
+clear			    = Clear
+find			    = Find
+delete_success      = Object deleted
+process             = Processing...
 
 #-- Export PDF messages  ----------------------------------------------------------------------#
 
+get_pdf                             = Get PDF
 name                                = Name
 short_name                          = Short name
 alternative_name                    = Alternative name
@@ -419,25 +420,50 @@
 data_element_concepts               = Data element concepts
 organisation_units                  = Organisation units
 organisation_unit_hierarchy         = Organisation unit hierarchy
+validation_rules                    = Validation rules
+period_type                         = Period Type
 
 #-- Indicator  ----------------------------------------------------------------------#
 
-expression = Expression
-left_expression = Left Expression
-right_expression = Right Expression
-indicator_type = Indicator Type
-annualized = Annualized
-aggregation_operator = Aggregation operator
-numerator = Numerator
-numerator_formula = Numerator formula
-numerator_description = Numerator description
-numerator_aggregation_operator = Numerator aggregation operator
-denominator = Denominator
-denominator_formula = Denominator formula
-denominator_description = Denominator description
-denominator_aggregation_operator = Denominator aggregation operator
-expression_is_empty = Expression is empty
+expression                          = Expression
+left_expression                     = Left Expression
+right_expression                    = Right Expression
+indicator_type                      = Indicator Type
+annualized                          = Annualized
+aggregation_operator                = Aggregation operator
+numerator                           = Numerator
+numerator_formula                   = Numerator formula
+numerator_description               = Numerator description
+numerator_aggregation_operator      = Numerator aggregation operator
+denominator                         = Denominator
+denominator_formula                 = Denominator formula
+denominator_description             = Denominator description
+denominator_aggregation_operator    = Denominator aggregation operator
+expression_is_empty                 = Expression is empty
 category_option_combo_does_not_exist = Category option combo does not exist
-data_element_does_not_exist = Data element does not exist
-id_not_numeric = Identifier is not numeric
-expression_not_well_formed = Expression is not well-formed
+data_element_does_not_exist         = Data element does not exist
+id_not_numeric                      = Identifier is not numeric
+expression_not_well_formed          = Expression is not well-formed
+
+#-- Validation Rule  ----------------------------------------------------------------------#
+
+absolute                            = Absolute
+statistical                         = Statistical
+left_side_description               = Left side description
+right_side_description              = Right side description
+left_side_of_expression             = Left side of Expression
+right_side_of_expression            = Right side of Expression
+operator                            = Operator
+equal_to_symbol                     = ==
+not_equal_to_symbol                 = !=
+greater_than_symbol                 = >
+greater_than_or_equal_to_symbol     = >=
+less_than_symbol                    = <
+less_than_or_equal_to_symbol        = <=
+equal_to                            = ==
+not_equal_to                        = !=
+greater_than                        = >
+greater_than_or_equal_to            = >=
+less_than                           = <
+less_than_or_equal_to               = <=
+

=== modified file 'dhis-2/dhis-web/dhis-web-commons/src/main/resources/i18n_global_vi_VN.properties'
--- dhis-2/dhis-web/dhis-web-commons/src/main/resources/i18n_global_vi_VN.properties	2010-11-05 07:31:24 +0000
+++ dhis-2/dhis-web/dhis-web-commons/src/main/resources/i18n_global_vi_VN.properties	2010-12-09 06:15:40 +0000
@@ -345,8 +345,22 @@
 move_to_top         = Di chuy\u1ec3n l\u00ean \u0111\u1ea7u
 move_to_bottom      = Di chuy\u1ec3n xu\u1ed1ng cu\u1ed1i
 
+#-- Paging messages  ----------------------------------------------------------------------#
+
+no_of_pages         = S\u1ed1 trang
+size_of_page        = K\u00edch th\u01b0\u1edbc trang
+jump_to_page        = Nh\u1ea3y t\u1edbi trang
+go                  = Nh\u1ea3y
+filter_by_name      = L\u1ecdc theo t\u00ean
+filter              = B\u1ed9 l\u1ecdc
+clear               = X\u00f3a
+find                = T\u00ecm ki\u1ebfm
+delete_success      = \u0110\u1ed1i t\u01b0\u1ee3ng \u0111\u00e3 x\u00f3a
+process             = \u0110ang x\u1eed l\u00fd
+
 #-- Export PDF messages  ------------------------------------------------------#
 
+get_pdf                             = Xu\u1ea5t t\u1eadp tin PDF
 name                                = T\u00ean
 short_name                          = T\u00ean vi\u1ebft t\u1eaft
 alternative_name                    = T\u00ean thay th\u1ebf
@@ -369,6 +383,8 @@
 data_element_concepts               = C\u00e1c kh\u00e1i ni\u1ec7m c\u1ee7a ph\u1ea7n t\u1eed d\u1eef li\u1ec7u
 organisation_units                  = C\u00e1c \u0111\u01a1n v\u1ecb
 organisation_unit_hierarchy         = C\u00e2y ph\u00e2n c\u1ea5p \u0111\u01a1n v\u1ecb
+validation_rules                    = C\u00e1c \u0111i\u1ec1u ki\u1ec7n ki\u1ec3m tra
+period_type                         = Ki\u1ec3u th\u1eddi gian
 
 #-- Indicator  ----------------------------------------------------------------#
 
@@ -386,3 +402,25 @@
 denominator_formula                 = C\u00f4ng th\u1ee9c m\u1eabu s\u1ed1
 numerator_aggregation_operator      = Ki\u1ec3u s\u1ed1 li\u1ec7u t\u1ed5ng h\u1ee3p cho t\u1eed s\u1ed1
 denominator_aggregation_operator    = Ki\u1ec3u s\u1ed1 li\u1ec7u t\u1ed5ng h\u1ee3p cho m\u1eabu s\u1ed1
+
+#-- Validation Rule  ----------------------------------------------------------------------#
+
+absolute                            = Tuy\u1ec7t \u0111\u1ed1i
+statistical                         = Th\u1ed1ng k\u00ea
+left_side_description               = M\u00f4 t\u1ea3 b\u00ean tr\u00e1i
+right_side_description              = M\u00f4 t\u1ea3 b\u00ean ph\u1ea3i
+left_side_of_expression             = Left side of Expression
+right_side_of_expression            = Right side of Expression
+operator                            = To\u00e1n t\u1eed
+equal_to_symbol                     = ==
+not_equal_to_symbol                 = !=
+greater_than_symbol                 = >
+greater_than_or_equal_to_symbol     = >=
+less_than_symbol                    = <
+less_than_or_equal_to_symbol        = <=
+equal_to                            = ==
+not_equal_to                        = !=
+greater_than                        = >
+greater_than_or_equal_to            = >=
+less_than                           = <
+less_than_or_equal_to               = <=
\ No newline at end of file

=== 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-11-24 20:34:35 +0000
+++ dhis-2/dhis-web/dhis-web-dataentry/src/main/resources/org/hisp/dhis/de/i18n_module.properties	2010-12-09 06:15:40 +0000
@@ -31,7 +31,6 @@
 delete_min_max_values				= Delete min/max values
 move_up								= Move up
 move_down							= Move down
-close								= Close
 organisation_unit					= Organisation Unit
 data_set							= Data Set
 select								= Select
@@ -77,7 +76,6 @@
 operator							= Operator
 right_description					= Right Description
 left_description					= Left Description
-description							= Description
 save_calculated						= Save Calculated Data
 no_organisationunit_selected		= No Organisation Unit Selected
 no_period_selected					= No Period Selected
@@ -88,12 +86,6 @@
 undo								= Undo
 confirm_complete					= Are you sure this dataset is complete?
 confirm_undo						= Are you sure you will undo the registration?
-equal_to							= ==
-not_equal_to						= !=
-greater_than						= >
-greater_than_or_equal_to			= >=
-less_than							= <
-less_than_or_equal_to				= <=
 data_entry                          = Data Entry
 audit								= Audit of Data Value
 audit_value							= Audit Value
@@ -113,10 +105,10 @@
 specify_input_date					= Please specify an input date
 specify_valid_input_date			= Please enter a valid input date
 save_calculated_data_element_success = Saved calculated data elements
-register_complete_dataset_success = Registered complete dataset
-register_complete_dataset_failed = Register complete dataset failed
+register_complete_dataset_success   = Registered complete dataset
+register_complete_dataset_failed    = Register complete dataset failed
 undo_register_complete_dataset_success = Undo register complete dataset success
-datavalue_history 					=	Data value history
+datavalue_history 					= Data value history
 data_element_order 					= Data Element Order
 generate_min_max_success 			= Generated min/max values
 enter_digits                        = Enter digit only.
@@ -124,5 +116,4 @@
 value_must_positive_number			= Value must be an positive number
 value_must_negative_number			= Value must be an negative number
 datavalue_history                   = Data value history
-max_must_be_greater_than_min		= Max must be greater than min
-remove								= Remove
\ No newline at end of file
+max_must_be_greater_than_min		= Max must be greater than min
\ 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-10-14 08:54:26 +0000
+++ dhis-2/dhis-web/dhis-web-dataentry/src/main/resources/org/hisp/dhis/de/i18n_module_vi_VN.properties	2010-12-09 06:15:40 +0000
@@ -28,14 +28,13 @@
 code=M\u00e3 ph\u1ea7n t\u1eed d\u1eef li\u1ec7u
 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
 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
-close=\u0110\u00f3ng
 save_calculated=L\u01b0u c\u00e1c gi\u00e1 tr\u1ecb \u0111\u00e3 \u0111\u01b0\u1ee3c t\u00ednh to\u00e1n
 generate_values=Ph\u00e1t sinh gi\u00e1 tr\u1ecb
 type=Ki\u1ec3u d\u1eef li\u1ec7u
@@ -78,40 +77,40 @@
 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
-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
-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
-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
-dataelement_history=L\u1ecbch s\u1eed ph\u1ea7n t\u1eed d\u1eef li\u1ec7u
+
+
 equal_to=B\u1eb1ng v\u1edbi
-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
@@ -151,39 +150,39 @@
 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
-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
-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
-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
-dataelement_history=L\u1ecbch s\u1eed ph\u1ea7n t\u1eed d\u1eef li\u1ec7u
+
+
 on=V\u00e0o l\u00fac
 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\!
 audit_value=Ki\u1ec3m tra gi\u00e1 tr\u1ecb

=== modified file 'dhis-2/dhis-web/dhis-web-datamart/src/main/resources/org/hisp/dhis/datamart/i18n_module.properties'
--- dhis-2/dhis-web/dhis-web-datamart/src/main/resources/org/hisp/dhis/datamart/i18n_module.properties	2010-10-14 08:54:26 +0000
+++ dhis-2/dhis-web/dhis-web-datamart/src/main/resources/org/hisp/dhis/datamart/i18n_module.properties	2010-12-09 06:15:40 +0000
@@ -28,7 +28,6 @@
 available_datatypes= Available data types
 selected_datatypes= Selected data types
 dataelements= Dataelements
-indicators= Indicators
 select_options= No options selected
 nr_of_comb= Number of combinations
 values= values
@@ -39,7 +38,7 @@
 exporting_data_for_calculated_data_elements = Exporting data for calculated data elements
 exporting_data_for_indicators= Exporting data for indicators
 export_process_done= Export process done
-completed= completed
+completed= Completed
 process_completed= Export process completed
 process_started = Export process started
 process_failed = Export process failed - See log for details

=== modified file 'dhis-2/dhis-web/dhis-web-datamart/src/main/resources/org/hisp/dhis/datamart/i18n_module_vi_VN.properties'
--- dhis-2/dhis-web/dhis-web-datamart/src/main/resources/org/hisp/dhis/datamart/i18n_module_vi_VN.properties	2010-10-14 08:54:26 +0000
+++ dhis-2/dhis-web/dhis-web-datamart/src/main/resources/org/hisp/dhis/datamart/i18n_module_vi_VN.properties	2010-12-09 06:15:40 +0000
@@ -4,19 +4,19 @@
 available_periods=C\u00e1c th\u1eddi \u0111i\u1ec3m c\u00f3 s\u1eb5n
 simple_datamart_export=Xu\u1ea5t Data Mart \u0111\u01a1n gi\u1ea3n
 available_dataelements=C\u00e1c ph\u1ea7n t\u1eed d\u1eef li\u1ec7u c\u00f3 s\u1eb5n
-maintenance_performed=Ti\u1ebfn h\u00e0nh s\u1ef1 b\u1ea3o d\u01b0\u1ee1ng
+maintenance_performed=Ti\u1ebfn h\u00e0nh vi\u1ec7c b\u1ea3o d\u01b0\u1ee1ng
 clear_aggregated_indicatorvalues=X\u00f3a c\u00e1c gi\u00e1 tr\u1ecb ch\u1ec9 s\u1ed1
-maintenance=D\u1ef1 b\u1ea3o d\u01b0\u1ee1ng
+maintenance=S\u1ef1 b\u1ea3o d\u01b0\u1ee1ng
 hours=Gi\u1edd
 level=C\u1ea5p
 simple_export=Xu\u1ea5t \u0111\u01a1n gi\u1ea3n
 available_levels=C\u00e1c c\u1ea5p c\u00f3 s\u1eb5n
 performing_maintenance=\u0110ang ti\u1ebfn h\u00e0nh b\u1ea3o d\u01b0\u1ee1ng...
-clearing_datamart=\u0110ang x\u00f3a datamart...
+
 selected_datatypes=Ki\u1ec3u d\u1eef li\u1ec7u \u0111\u00e3 ch\u1ecdn
 selected_dataelements=Ph\u1ea7n t\u1eed d\u1eef li\u1ec7u \u0111\u00e3 ch\u1ecdn
 clear_hierarchy_history=X\u00f3a nh\u1eefng c\u1ea5p b\u1eadc tr\u01b0\u1edbc \u0111\u00f3
-clear_aggregated_datavalues=X\u00f3a c\u00e1c gi\u00e1 tr\u1ecb
+
 seconds=gi\u00e2y
 estimated_time=Th\u1eddi gian \u01b0\u1edbc l\u01b0\u1ee3ng
 structures_generated=C\u1ea5u tr\u00fac \u0111\u00e3 ph\u00e1t sinh
@@ -34,7 +34,6 @@
 datamart_cleared=Datamart \u0111\u00e3 \u0111\u01b0\u1ee3c x\u00f3a
 confirm_clear_message=B\u1ea1n c\u00f3 mu\u1ed1n x\u00f3a data mart?
 generate_structures=Ph\u00e1t sinh c\u1ea5u tr\u00fac
-indicators=Ch\u1ec9 s\u1ed1
 export_to_datamart=Xu\u1ea5t ra datamart
 select_min_level=Ch\u1ecdn \u00edt nh\u1ea5t 1 c\u1ea5p
 select_period_type_all=Ch\u1ecdn ki\u1ec3u th\u1eddi gian/ T\u1ea5t c\u1ea3
@@ -63,96 +62,42 @@
 remove_selected=X\u00f3a nh\u1eefng ph\u1ea7n t\u1eed \u0111\u01b0\u1ee3c ch\u1ecdn
 no_export_process_running=Kh\u00f4ng c\u00f3 qu\u00e1 tr\u00ecnh xu\u1ea5t d\u1eef li\u1ec7u n\u00e0o \u0111ang ch\u1ea1y
 data_mart_management=Qu\u1ea3n l\u00fd d\u1eef li\u1ec7u t\u1ed5ng h\u1ee3p
-nr_of_comb=S\u1ed1 l\u01b0\u1ee3ng k\u1ebft h\u1ee3p
-selected_dataelements=Ph\u1ea7n t\u1eed d\u1eef li\u1ec7u \u0111\u00e3 ch\u1ecdn
-datamart_cleared=Datamart \u0111\u00e3 \u0111\u01b0\u1ee3c x\u00f3a
+selected_ \u0111\u00e3 ch\u1ecdn
 number_of_indicators=S\u1ed1 l\u01b0\u1ee3ng ch\u1ec9 s\u1ed1
 deleting_existing_aggregated_data=X\u00f3a d\u1eef li\u1ec7u t\u1ed5ng h\u1ee3p \u0111\u00e3 t\u1ed3n t\u1ea1i
 process_failed=Qu\u00e1 tr\u00ecnh xu\u1ea5t d\u1eef li\u1ec7u kh\u00f4ng th\u00e0nh c\u00f4ng - Vui l\u00f2ng xem chi ti\u1ebft trong nh\u1eadt k\u00fd h\u1ec7 th\u1ed1ng
-structures_generated=C\u1ea5u tr\u00fac \u0111\u00e3 ph\u00e1t sinh
-performing_maintenance=\u0110ang ti\u1ebfn h\u00e0nh b\u1ea3o d\u01b0\u1ee1ng...
 crosstabulating_data=D\u1eef li\u1ec7u crosstabulating
-exporting_values=\u0110ang xu\u1ea5t gi\u00e1 tr\u1ecb...
 selected_datatypes=Ki\u1ec3u d\u1eef li\u1ec7u \u0111\u00e3 ch\u1ecdn
-generate_structures=Ph\u00e1t sinh c\u1ea5u tr\u00fac
-available_indicators=C\u00e1c ch\u1ec9 s\u1ed1 c\u00f3 s\u1eb5n
-export_to_datamart=Xu\u1ea5t ra datamart
-_values_were_exported=D\u1eef li\u1ec7u \u0111\u00e3 \u0111\u01b0\u1ee3c xu\u1ea5t ra
-select_period_type_all=Ch\u1ecdn ki\u1ec3u th\u1eddi gian/ T\u1ea5t c\u1ea3
-select_indicatorgroup_all=Ch\u1ecdn nh\u00f3m ch\u1ec9 s\u1ed1 / T\u1ea5t c\u1ea3
 name_in_use=T\u00ean \u0111\u00e3 \u0111\u01b0\u1ee3c s\u1eed d\u1ee5ng
-advanced_export=Xu\u1ea5t n\u00e2ng cao
 datamart_intro=Vui l\u00f2ng ch\u1ecdn m\u1ed9t m\u1ee5c trong thanh tr\u00ecnh \u0111\u01a1n.
-available_periods=C\u00e1c th\u1eddi \u0111i\u1ec3m c\u00f3 s\u1eb5n
-available_datatypes=C\u00e1c ki\u1ec3u d\u1eef li\u1ec7u c\u00f3 s\u1eb5n
-seconds=gi\u00e2y
-simple_datamart_export=Xu\u1ea5t Data Mart \u0111\u01a1n gi\u1ea3n
-simple_export=Xu\u1ea5t \u0111\u01a1n gi\u1ea3n
-values=c\u00e1c gi\u00e1 tr\u1ecb
-estimated_time=Th\u1eddi gian \u01b0\u1edbc l\u01b0\u1ee3ng
 process_started=Qu\u00e1 tr\u00ecnh xu\u1ea5t d\u1eef li\u1ec7u \u0111\u00e3 kh\u1edfi \u0111\u1ed9ng
-select_organisationunit_level_all=Ch\u1ecdn m\u1ee9c d\u01a1n v\u1ecb / T\u1ea5t c\u1ea3
-select_min_datatype=Ch\u1ecdn \u00edt nh\u1ea5t m\u1ed9t ki\u1ec3u d\u1eef li\u1ec7u
-clear_hierarchy_history=X\u00f3a nh\u1eefng c\u1ea5p b\u1eadc tr\u01b0\u1edbc \u0111\u00f3
 exporting_data_for_indicators=Xu\u1ea5t d\u1eef li\u1ec7u cho c\u00e1c ch\u1ec9 s\u1ed1
 generate_data_mart=Ph\u00e1t sinh d\u1eef li\u1ec7u t\u1ed5ng h\u1ee3p
-clear_periods_without_datavalues=X\u00f3a c\u00e1c th\u1eddi \u0111i\u1ec3m kh\u00f4ng c\u00f3 s\u1ed1 li\u1ec7u
-clear_aggregated_indicatorvalues=X\u00f3a c\u00e1c gi\u00e1 tr\u1ecb ch\u1ec9 s\u1ed1
 number_of_organisation_units=S\u1ed1 l\u01b0\u1ee3ng \u0111\u01a1n v\u1ecb
 export_saved=Vi\u1ec7c xu\u1ea5t d\u1eef li\u1ec7u \u0111\u00e3 \u0111\u01b0\u1ee3c l\u01b0u
 data_mart=T\u1ed5ng h\u1ee3p d\u1eef li\u1ec7u 
 remove_all=X\u00f3a t\u1ea5t c\u1ea3
 must_select_at_least_one_organisation_unit=Vui l\u00f2ng ch\u1ecdn \u00edt nh\u1ea5t m\u1ed9t \u0111\u01a1n v\u1ecb
 datamart_export=Xu\u1ea5t d\u1eef li\u1ec7u t\u1ed5ng h\u1ee3p
-available_dataelements=C\u00e1c ph\u1ea7n t\u1eed d\u1eef li\u1ec7u c\u00f3 s\u1eb5n
-export=Xu\u1ea5t ra
 clear_aggregated_datavalues=X\u00f3a c\u00e1c gi\u00e1 tr\u1ecb
-select_min_period=Ch\u1ecdn \u00edt nh\u1ea5t m\u1ed9t th\u1eddi \u0111i\u1ec3m
-selected_organisationunits=\u0110\u01a1n v\u1ecb \u0111\u00e3 ch\u1ecdn
 confirm_delete_data_mart_export=B\u1ea1n c\u00f3 ch\u1eafc mu\u1ed1n x\u00f3a vi\u1ec7c xu\u1ea5t d\u1eef li\u1ec7u t\u1ed5ng h\u1ee3p n\u00e0y?
-show_details=Xem chi ti\u1ebft
-hours=Gi\u1edd
-available_organisationunits=C\u00e1c \u0111\u01a1n v\u1ecb c\u00f3 s\u1eb5n
-structures=C\u1ea5u tr\u00fac
-advanced_datamart_export=Xu\u1ea5t Data Mart n\u00e2ng cao
-confirm_clear_message=B\u1ea1n c\u00f3 mu\u1ed1n x\u00f3a data mart?
 add_to_dashboard=Th\u00eam v\u00e0o b\u1ea3ng t\u00f9y bi\u1ebfn c\u00e1 nh\u00e2n
 export_process_done=Qu\u00e1 tr\u00ecnh xu\u1ea5t d\u1eef li\u1ec7u \u0111\u00e3 ho\u00e0n t\u1ea5t
 clearing_datamart=\u0110ang x\u00f3a datamart...
 process_completed=Qu\u00e1 tr\u00ecnh xu\u1ea5t d\u1eef li\u1ec7u \u0111\u00e3 ho\u00e0n t\u1ea5t
-minutes=Ph\u00fat
-level=C\u1ea5p
 move_selected=Di chuy\u1ec3n c\u00e1c ph\u1ea7n t\u1eed \u0111\u01b0\u1ee3c ch\u1ecdn
-second=gi\u00e2y
 export_process_failed=Qu\u00e1 tr\u00ecnh xu\u1ea5t d\u1eef li\u1ec7u kh\u00f4ng th\u00e0nh c\u00f4ng - Vui l\u00f2ng xem chi ti\u1ebft trong nh\u1eadt k\u00fd h\u1ec7 th\u1ed1ng
-generating_structures=\u0110ang ph\u00e1t sinh c\u1ea5u tr\u00fac ...
-maintenance=D\u1ef1 b\u1ea3o d\u01b0\u1ee1ng
-indicators=Ch\u1ec9 s\u1ed1
-organisation_unit_structure=C\u1ea5u tr\u00fac \u0111\u01a1n v\u1ecb
 export_process_not_initialized=Qu\u00e1 tr\u00ecnh xu\u1ea5t d\u1eef li\u1ec7u kh\u00f4ng \u0111\u01b0\u1ee3c kh\u1edfi t\u1ea1o
 exporting_data_for_calculated_data_elements=Xu\u1ea5t d\u1eef li\u1ec7u cho c\u00e1c ph\u1ea7n t\u1eed d\u1eef li\u1ec7u t\u00ednh to\u00e1n \u0111\u01b0\u1ee3c
-structures_and_maintenance=C\u00e1i tr\u00fac v\u00e0 s\u1ef1 b\u1ea3o d\u01b0\u1ee1ng
 exporting_data_for_data_elements=Xu\u1ea5t d\u1eef li\u1ec7u cho c\u00e1c ph\u1ea7n t\u1eed d\u1eef li\u1ec7u
 must_select_at_least_one_period=Vui l\u00f2ng ch\u1ecdn \u00edt nh\u1ea5t m\u1ed9t th\u1eddi \u0111i\u1ec3m
 number_of_periods=S\u1ed1 l\u01b0\u1ee3ng th\u1eddi \u0111i\u1ec3m
-perform_maintenance=Ti\u1ebfn h\u00e0nh b\u1ea3o d\u01b0\u1ee1ng
-select_min_level=Ch\u1ecdn \u00edt nh\u1ea5t 1 c\u1ea5p
-available_levels=C\u00e1c c\u1ea5p c\u00f3 s\u1eb5n
-group_set_structure=C\u1ea5u tr\u00fac t\u1eadp h\u1ee3p \u0111\u01a1n v\u1ecb lo\u1ea1i tr\u1eeb
-selected_levels=C\u1ea5p \u0111\u00e3 ch\u1ecdn
 could_not_export_too_many_data_elements=Kh\u00f4ng th\u1ec3 xu\u1ea5t d\u1eef li\u1ec7u \u0111\u01b0\u1ee3c v\u00ec c\u00f3 qu\u00e1 nhi\u1ec1u ph\u1ea7n t\u1eed d\u1eef li\u1ec7u \u0111\u01b0\u1ee3c ch\u1ecdn
-_values_were_exported_in=c\u00e1c gi\u00e1 tr\u1ecb \u0111\u01b0\u1ee3c xu\u1ea5t ra \u1edf
 number_of_data_elements=S\u1ed1 l\u01b0\u1ee3ng ph\u1ea7n t\u1eed d\u1eef li\u1ec7u
 move_all=Di chuy\u1ec3n t\u1ea5t c\u1ea3
-select_options=Kh\u00f4ng c\u00f3 l\u1ef1a ch\u1ecdn n\u00e0o \u0111\u01b0\u1ee3c ch\u1ecdn
-select_dataelementgroup_all=Ch\u1ecdn nh\u00f3m ph\u1ea7n t\u1eed d\u1eef li\u1ec7u / T\u1ea5t c\u1ea3
-dataelements=Ph\u1ea7n t\u1eed d\u1eef li\u1ec7u
 must_select_at_least_one_dataelement_or_indicator=Vui l\u00f2ng ch\u1ecdn \u00edt nh\u1ea5t m\u1ed9t ph\u1ea7n t\u1eed d\u1eef li\u1ec7u ho\u1eb7c ch\u1ec9 s\u1ed1
 datamart=T\u1ed5ng h\u1ee3p d\u1eef li\u1ec7u 
-selected_indicators=Ch\u1ec9 s\u1ed1 \u0111\u00e3 ch\u1ecdn
 move_children=Di chuy\u1ec3n c\u1ea5p d\u01b0\u1edbi c\u1ee7a \u0111\u01a1n v\u1ecb \u0111\u01b0\u1ee3c ch\u1ecdn
-completed=ho\u00e0n t\u1ea5t
-selected_periods=Th\u1eddi \u0111i\u1ec3m \u0111\u00e3 ch\u1ecdn
+completed=Ho\u00e0n t\u1ea5t
 specify_name=Vui l\u00f2ng ch\u1ecdn t\u00ean
 confirm_add_to_dashboard=B\u1ea1n c\u00f3 ch\u1eafc mu\u1ed1n th\u00eam vi\u1ec7c xu\u1ea5t d\u1eef li\u1ec7u t\u1ed5ng h\u1ee3p n\u00e0y v\u00e0o b\u1ea3ng t\u00f9y bi\u1ebfn c\u00e1 nh\u00e2n?
-maintenance_performed=Ti\u1ebfn h\u00e0nh s\u1ef1 b\u1ea3o d\u01b0\u1ee1ng
\ No newline at end of file

=== modified file 'dhis-2/dhis-web/dhis-web-excel-reporting/src/main/resources/org/hisp/dhis/reportexcel/i18n_module.properties'
--- dhis-2/dhis-web/dhis-web-excel-reporting/src/main/resources/org/hisp/dhis/reportexcel/i18n_module.properties	2010-10-14 08:54:26 +0000
+++ dhis-2/dhis-web/dhis-web-excel-reporting/src/main/resources/org/hisp/dhis/reportexcel/i18n_module.properties	2010-12-09 06:15:40 +0000
@@ -22,7 +22,6 @@
 item_type					= Item Type
 period_type					= Period Type
 update						= Update
-remove						= Remove
 report_design				= Report Design
 report						= Report
 report_item					= Report Item
@@ -87,7 +86,6 @@
 quaterly					= Quarterly
 6_month						= Six monthly
 yealy						= Yearly
-clean						= Clean
 report_roles				= Report and User Roles
 formulaexcel				= Excel Formula
 icd_code					= ICD codes
@@ -108,7 +106,6 @@
 dataelement_code			= Data Element Code		
 available_dataelementgroups	= Available Data Element Groups
 selected_dataelementgroups	= Selected Data Element Groups
-success                     = success
 view_by						= View by
 preview						= Preview
 update_order				= Update Order Sorted
@@ -122,7 +119,6 @@
 individual_report           = Individual reports 
 available_data_elements     = Available dataelement
 selected_data_elements      = Selected dataelement
-filter                      = Filter
 category_option_combo       = Category option combo list
 available_periods           = Available periods
 selected_periods            = Selected periods
@@ -149,7 +145,6 @@
 startdate_null				= Please enter start date
 enddate_null				= Please enter end date
 select_report               = [Select report]
-error						= Error
 not_null					= not null
 choose_orgUnit				= Not choose organisation yet
 choose_period				= Not choose period yet

=== modified file 'dhis-2/dhis-web/dhis-web-excel-reporting/src/main/resources/org/hisp/dhis/reportexcel/i18n_module_en_GB.properties'
--- dhis-2/dhis-web/dhis-web-excel-reporting/src/main/resources/org/hisp/dhis/reportexcel/i18n_module_en_GB.properties	2010-03-26 08:24:01 +0000
+++ dhis-2/dhis-web/dhis-web-excel-reporting/src/main/resources/org/hisp/dhis/reportexcel/i18n_module_en_GB.properties	2010-12-09 06:15:40 +0000
@@ -1,6 +1,5 @@
 #Resource generated by I18n Resource Editor
 #Fri Mar 26 15:15:27 ICT 2010
-expression=Expression
 import_data=Import data
 selected_periods=Selected periods
 generate_advanced_report=Generate advanced report
@@ -9,7 +8,6 @@
 report_ready_exist=Report ready exist
 preview=Preview
 cannot_write_file_being_used=Unable to write to this file as being used by another program
-success=success
 dataset=Dataset
 template_excel_file=Template excel file
 available_user_roles=Available user roles
@@ -40,7 +38,6 @@
 sort_order_help=Use mouse drap emlement that you want set order and click on Update Order Sorted
 dataelement_name=Data Element Name
 enddate_null=Please enter end date
-edit=Edit
 bookmark=Bookmark
 CATEGORY=Category
 period_is_null=Please select period \!
@@ -49,14 +46,12 @@
 name_is_null=Please enter name \!
 org_unit_group_management=Organisation unit group management
 choose_orgUnit=Not choose organisation yet
-remove=Remove
 grouplisting=Group Organization
 excelitem_group=Excel item group
 translation_translate=Translate
 reports=List of report
 template_status=Template status
 type=Type
-update=Update
 cleanup_success=Clean up successful
 formula=Formula
 available_dataelementgroups=Available Data Element Groups
@@ -66,8 +61,6 @@
 startdate_null=Please enter start date
 excel_template=Excel Template
 organisation_position_column=Organisation Position Column
-add=Add
-rename=Rename
 template_using=File is using
 generate=Generate report
 serial=Serial
@@ -90,7 +83,6 @@
 left_brackets=Left Brackets
 value_rounded=This value maybe have been rounded
 define_associations=Report Associations
-name=Name
 intro_data_status=This function is used to view the status input of data (Data is entered or not done or any missing one, etc. ..).
 selected_user_roles=Selected user roles
 please_enter_sheet_no=Please enter 'Sheet No'
@@ -155,20 +147,17 @@
 selected_month=Selected Month
 clean_up=Clean temporary directory
 confirm_delete=Are you sure you want to delete this?
-save=Save
 selected_dataelements=Selected Data Elements
 cell_exist=Exist one cell same sheet, row and column with this.
 copy_selected_item_to=Copy selected items to 
 associations=Associations
 generate_report_by_orgunit_group=Generate report by orgunit group
 name_ready_exist=Name Ready Exist \!
-ok=OK
 update_sort_dataelement_success=Update Sorted Data Element Success
 dataelements=Data Elements
 dhis-web-chr-form=Child Health Records
 update_order=Update Order Sorted
 override_successful=Overriding is success \!
-no=No
 choose_orgunit_group=Organisation group
 import_excel_file_manager=Import excel files
 configuration=Configuration
@@ -189,7 +178,6 @@
 warning_upload_is_null=Please choose your excel file to upload \!
 sheet_of_excel_file=Sheet of Excel file
 association_roles=Association roles
-error=Error
 please_enter_group_name=Please enter group name
 NORMAL=Normal
 divide=Divide
@@ -198,7 +186,6 @@
 filter_by_name=Filter by name
 rename_failed=Rename failed
 available_groups=Available groups
-yes=Yes
 icd_code=ICD codes
 clean=Clean
 column=Column

=== modified file 'dhis-2/dhis-web/dhis-web-excel-reporting/src/main/resources/org/hisp/dhis/reportexcel/i18n_module_vi_VN.properties'
--- dhis-2/dhis-web/dhis-web-excel-reporting/src/main/resources/org/hisp/dhis/reportexcel/i18n_module_vi_VN.properties	2010-10-14 08:54:26 +0000
+++ dhis-2/dhis-web/dhis-web-excel-reporting/src/main/resources/org/hisp/dhis/reportexcel/i18n_module_vi_VN.properties	2010-12-09 06:15:40 +0000
@@ -78,7 +78,6 @@
 yealy						= D\u1eef li\u1ec7u c\u1ee7a n\u0103m \u0111\u01b0\u1ee3c ch\u1ecdn
 formulaexcel				= C\u00f4ng th\u1ee9c excel
 dataelement_use_for_categoryreport	=	Ph\u1ea7n t\u1eed d\u1eef li\u1ec7u s\u1eed d\u1ee5ng cho B\u00e1o c\u00e1o \u0111a chi\u1ec1u
-details						= Chi ti\u1ebft
 filter_by_group				= L\u1ecdc theo Nh\u00f3m ph\u1ea7n t\u1eed d\u1eef li\u1ec7u
 select_categorycombo		= Ch\u1ecdn Lo\u1ea1i t\u1eadp h\u1ee3p k\u1ebft h\u1ee3p
 category_list				= Danh s\u00e1ch c\u00e1c Lo\u1ea1i t\u1eadp h\u1ee3p
@@ -125,7 +124,6 @@
 dataelement_code			= M\u00e3 ph\u1ea7n t\u1eed d\u1eef li\u1ec7u
 available_dataelementgroups	= Nh\u00f3m ph\u1ea7n t\u1eed d\u1eef li\u1ec7u c\u00f3 s\u1eb5n
 selected_dataelementgroups	= Nh\u00f3m ph\u1ea7n t\u1eed d\u1eef li\u1ec7u \u0111\u01b0\u1ee3c ch\u1ecdn
-success                     = th\u00e0nh c\u00f4ng
 preview						= Xem tr\u01b0\u1edbc gi\u00e1 tr\u1ecb
 update_order				= C\u1eadp nh\u1eadt th\u1ee9 t\u1ef1
 sort_order_help				= D\u00f9ng chu\u1ed9t k\u00e9o m\u1ee5c mu\u1ed1n s\u1eafp x\u1ebfp t\u1edbi v\u1ecb tr\u00ed c\u1ea7n thi\u1ebft, sau \u0111\u00f3 ch\u1ecdn C\u1eadp nh\u1eadt th\u1ee9 t\u1ef1
@@ -136,7 +134,6 @@
 individual_report           = B\u00e1o c\u00e1o t\u00f9y ch\u1ecdn 
 available_data_elements     = Ph\u1ea7n t\u1eed d\u1eef li\u1ec7u hi\u1ec7n c\u00f3
 selected_data_elements      = Ph\u1ea7n t\u1eed d\u1eef li\u1ec7u \u0111\u01b0\u1ee3c ch\u1ecdn
-filter                      = L\u1ecdc
 category_option_combo       = Category option combo list
 available_periods           = Th\u1eddi \u0111i\u1ec3m hi\u1ec7n c\u00f3
 selected_periods            = Th\u1eddi \u0111i\u1ec3m \u0111\u01b0\u1ee3c ch\u1ecdn
@@ -150,7 +147,6 @@
 please_enter_group_name		= Vui l\u00f2ng nh\u1eadp t\u00ean nh\u00f3m
 copy_items_duplicated       = Item b\u1ecb tr\u00f9ng l\u1eb7p, kh\u00f4ng th\u1ec3 sao ch\u00e9p !
 copy_successful             = Sao ch\u00e9p th\u00e0nh c\u00f4ng !
-filter_by_name				= T\u00ecm theo t\u00ean
 copy_selected_item_to_excel_item = Sao ch\u00e9p report item cho excel item
 excelitem_group				= Nh\u00f3m excel item
 copy_items					= Sao ch\u00e9p item

=== modified file 'dhis-2/dhis-web/dhis-web-importexport/src/main/resources/org/hisp/dhis/importexport/i18n_module.properties'
--- dhis-2/dhis-web/dhis-web-importexport/src/main/resources/org/hisp/dhis/importexport/i18n_module.properties	2010-11-05 07:31:24 +0000
+++ dhis-2/dhis-web/dhis-web-importexport/src/main/resources/org/hisp/dhis/importexport/i18n_module.properties	2010-12-09 06:15:40 +0000
@@ -1,7 +1,6 @@
 datavalue = Data Value
 orgunit = Organisation Unit
 import = Import
-close = Close
 select = Select
 period_type = Period Type
 export = Export
@@ -32,8 +31,6 @@
 input_datasets = Input
 available_datasets = Available Datasets
 selected_datasets = Selected Datasets
-error = Error
-warning = Warning
 information = Information
 available_dataelements = Available Data Elements
 selected_dataelements = Selected Data Elements
@@ -146,7 +143,6 @@
 match_to_existing = Match to existing
 compare_to_existing = Compare to existing
 property = Property
-details = Details
 existing_objects = Existing objects
 discard = Discard
 new_object = New object
@@ -157,7 +153,6 @@
 match = Match
 leave_as_update = Leave as update
 leave_as_new = Leave as new
-filter = Filter
 discard_update = Discard update
 show_advanced_options = Show advanced options
 hide_advanced_options = Hide advanced options
@@ -322,7 +317,6 @@
 import_process_started = Import process started
 imported_meta_data = Imported meta data
 saved = Saved
-expression = Expression
 calculated_data_element = Calculated data element
 DHIS14XML = DHIS 1.4 XML
 DHIS14FILE = DHIS 1.4 File

=== modified file 'dhis-2/dhis-web/dhis-web-importexport/src/main/resources/org/hisp/dhis/importexport/i18n_module_vi_VN.properties'
--- dhis-2/dhis-web/dhis-web-importexport/src/main/resources/org/hisp/dhis/importexport/i18n_module_vi_VN.properties	2010-11-05 07:31:24 +0000
+++ dhis-2/dhis-web/dhis-web-importexport/src/main/resources/org/hisp/dhis/importexport/i18n_module_vi_VN.properties	2010-12-09 06:15:40 +0000
@@ -38,7 +38,6 @@
 ixf_import=Nh\u1eadp IXF
 specify_file=Vui l\u00f2ng ch\u1ec9 \u0111\u1ecbnh m\u1ed9t t\u1eadp tin
 objects=C\u00e1c \u0111\u1ed1i t\u01b0\u1ee3ng
-details=Chi ti\u1ebft
 level_names=T\u00ean c\u1ea5p
 organisationunit_group=Nh\u00f3m \u0111\u01a1n v\u1ecb
 status=Tr\u1ea1ng th\u00e1i
@@ -132,7 +131,6 @@
 dataset=T\u1eadp h\u1ee3p d\u1eef li\u1ec7u
 from_date=T\u1eeb ng\u00e0y
 please_wait_while_we_process_your_request=Xin vui l\u00f2ng \u0111\u1ee3i...
-close=\u0110\u00f3ng
 del=X\u00f3a
 select_period_span=Ch\u1ecdn kho\u1ea3ng th\u1eddi gian
 select_min_period=Ch\u1ecdn \u00edt nh\u1ea5t m\u1ed9t th\u1eddi \u0111i\u1ec3m
@@ -209,7 +207,6 @@
 from=T\u1eeb
 discard=B\u1ecf qua
 classifier_cannot_classify_this_object=B\u1ed9 ph\u00e2n lo\u1ea1i nh\u1eadp kh\u00f4ng th\u1ec3 ph\u00e2n lo\u1ea1i \u0111\u1ed1i t\u01b0\u1ee3ng n\u00e0y
-cancel=H\u1ee7y b\u1ecf
 failed_to_get_children_organisation_units=Kh\u00f4ng th\u1ec3 l\u1ea5y \u0111\u01b0\u1ee3c \u0111\u01a1n v\u1ecb con
 select_min_indicator=Ch\u1ecdn \u00edt nh\u1ea5t m\u1ed9t ch\u1ec9 s\u1ed1
 input_datasets=\u0110\u1ea7u v\u00e0o

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/resources/org/hisp/dhis/dataadmin/i18n_module.properties'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/resources/org/hisp/dhis/dataadmin/i18n_module.properties	2010-11-29 17:16:41 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/resources/org/hisp/dhis/dataadmin/i18n_module.properties	2010-12-09 06:15:40 +0000
@@ -55,15 +55,9 @@
 exec_row_count														= Exec row count
 clear_cache															= Clear cache
 data_statistics														= Data Statistics
-data_elements														= Data elements
-data_element_groups													= Data element groups
 indicator_types														= Indicator types
-indicators															= Indicators
-indicator_groups													= Indicator groups
 data_sets															= Data sets
 data_dictionaries													= Data dictionaries
-organisation_units													= Organisation Units
-validation_rules													= Validation rules
 periods																= Periods
 data_values															= Data values
 number_of_objects													= Number of objects
@@ -196,8 +190,8 @@
 drilldown_orgunit_group                                             = Organisation Unit Group
 browse_data_at_this_level                                           = Browser data at this level only
 browse_data_at_descendant_levels                                    = Browser data at descendant levels
-view_data_at_descendant_levels                                      = View data
-view_data_at_this_level                                             = View data at this level only
+view_data_at_descendant_levels                                      = View the summary
+view_data_at_this_level                                             = View the actual data at this level only
 click_on_this_orgunit                                               = Click on this organisation unit
 counts_of_aggregated_values											= The count of data entered
 export_results_for                                                  = Export results for
@@ -221,7 +215,6 @@
 generate															= Generate
 sql_view_management                                                 = Sql View Management
 sql_view                                                            = Sql View
-filter_by_name                                                      = Filter by Name
 sql_statement                                                       = SQL Statement
 run                                                                 = Execute query
 hide_warning                                                        = Hide warning
@@ -280,7 +273,6 @@
 information_successfully_unlocked									= Data Successfully Unlocked
 organisation_unit_not_selected										= Please select an organisation unit
 header_field                                                        = Field No.
-close                                                               = Close
 append                                                              = Append
 resourcetable_at_position                                           = Resource table at the position
 unselected_yet                                                      = unselected yet
@@ -299,7 +291,6 @@
 unlock_all_in_group                                                 = Unlock all in group
 process_started                                                     = Checking...
 sqlview_process_canceled_interrupted                                = WARNING:  This query could retrieve a large amount of data from database.\n\nDo you want to save it...? =======
-generate_values_success                                             = Generate values successfully
 organisation_not_selected                                           = WARNING:  There is no organisation unit selected
 selected_periods                                                    = Selected Periods
 selected_datasets                                                   = Selected Datasets
@@ -317,6 +308,7 @@
 orgunit_group_list                                                  = Organisation Unit Group list
 patient_data_archive												= Beneficiary Data Archive
 intro__patient_data_archive											= Archive beneficiary data which is not currently relevant to your system in order to improve performance. Data can also be unarchived.
-pruning_interrupted                                                 = You must choose the organisation unit parent to prune
-sqlquery_is_not_allowed                                             = Not allowed to query in this table
-sections_with_invalid_category_combinations                         = Sections with invalid category combinations
\ No newline at end of file
+pruning_interrupted                                                 = You must choose the organisation unit has parent to prune. Please try again!
+sqlquery_is_not_allowed                                             = Not allowance to query in the special tables !
+drill_down_real_values                                              = Data entered
+sections_with_invalid_category_combinations                         = Sections with invalid category combinations

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/resources/org/hisp/dhis/dataadmin/i18n_module_vi_VN.properties'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/resources/org/hisp/dhis/dataadmin/i18n_module_vi_VN.properties	2010-11-08 09:21:24 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/resources/org/hisp/dhis/dataadmin/i18n_module_vi_VN.properties	2010-12-09 06:15:40 +0000
@@ -154,7 +154,6 @@
 intro_duplicate_data_elimination									= Lo\u1ea1i b\u1ecf d\u1eef li\u1ec7u \u0111\u01b0\u1ee3c \u0111\u0103ng k\u00fd cho c\u00e1c ph\u1ea7n t\u1eed d\u1eef li\u1ec7u tr\u00f9ng l\u1eb7p
 select_different_org_units											= H\u00e3y ch\u1ecdn 2 \u0111\u01a1n v\u1ecb kh\u00e1c nhau
 select_different_data_elements										= H\u00e3y ch\u1ecdn 2 ph\u1ea7n t\u1eed d\u1eef li\u1ec7u kh\u00e1c nhau
-filter																= B\u1ed9 l\u1ecdc
 data_archive														= L\u01b0u tr\u1eef d\u1eef li\u1ec7u
 there_are															= C\u00f3
 overlapping_values													= C\u00e1c d\u1eef li\u1ec7u ch\u1ed3ng ch\u00e9o trong b\u1ea3n l\u01b0u tr\u1eef.
@@ -208,8 +207,8 @@
 view_data_at_descendant_levels                                      = Xem d\u1eef li\u1ec7u chi\u1ec1u s\u00e2u c\u1ee7a c\u00e1c \u0111\u01a1n v\u1ecb con
 counts_of_aggregated_values											= \u0110\u1ebfm c\u00e1c d\u1eef li\u1ec7u nh\u1eadp
 export_results_for                                                  = K\u1ebft xu\u1ea5t cho
-earliest                                                            = s\u1edbm nh\u1ea5t
-latest                                                              = m\u1edbi nh\u1ea5t
+earliest                                                            = S\u1edbm nh\u1ea5t
+latest                                                              = M\u1edbi nh\u1ea5t
 DataSet                                                             = T\u1eadp d\u1eef li\u1ec7u
 DataElementGroup                                                    = Nh\u00f3m ph\u1ea7n t\u1eed d\u1eef li\u1ec7u
 OrganisationUnit                                                    = \u0110\u01a1n v\u1ecb
@@ -288,4 +287,5 @@
 portrait                                                            = Portrait
 data_browser                                                        = Tr\u00ecnh duy\u1ec7t d\u1eef li\u1ec7u
 organisation_unit_pruning                                           = T\u1ec9a x\u00e9n C\u00e2y \u0111\u01a1n v\u1ecb
-pruning_interrupted                                                 = B\u1ea1n ph\u1ea3i ch\u1ecdn \u0111\u01a1n v\u1ecb c\u00f3 cha \u0111\u1ec3 ti\u1ebfn h\u00e0nh c\u1eaft x\u00e9n. H\u00e3y th\u1eed l\u1ea1i!
\ No newline at end of file
+pruning_interrupted                                                 = B\u1ea1n ph\u1ea3i ch\u1ecdn \u0111\u01a1n v\u1ecb c\u00f3 cha \u0111\u1ec3 ti\u1ebfn h\u00e0nh c\u1eaft x\u00e9n. H\u00e3y th\u1eed l\u1ea1i!
+drill_down_real_values                                              = D\u1eef li\u1ec7u \u0111\u01b0\u1ee3c nh\u1eadp
\ No newline at end of file

=== 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-11-05 07:31:24 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/resources/org/hisp/dhis/dd/i18n_module.properties	2010-12-09 06:15:40 +0000
@@ -65,9 +65,6 @@
 indicator										= Indicator
 indicator_group									= Indicator Group
 create_new_data_element							= Create new data element
-details											= Details
-update											= Update
-close											= Close
 domain_type										= Domain Type
 value_type										= Value Type
 date											= Date
@@ -81,8 +78,6 @@
 create_new_indicator_type						= Create new indicator type
 factor											= Factor
 data_element_management							= Data element management
-filter_by_name									= Filter by name
-operations										= Operations
 data_element_group_management					= Data element group management
 number_of_members								= Number of members
 export											= Export
@@ -227,7 +222,6 @@
 edit_formula									= Edit formula
 formula_description								= Formula description
 textual_description								= Textual description
-all												= All
 data_element_indicator_group					= Data Element and Indicator Group
 selected_data_elements							= Selected data elements
 selected_indicators								= Selected indicators
@@ -237,7 +231,6 @@
 this_item_cannot_be_deleted						= This item can not be deleted.
 unable_to_delete_value_is_registered_for_this_item = unable to delete as DataValue is registered for this Item
 value											= Value
-period_type										= Period type
 period											= Period
 indicator_name									= Indicator name
 current_indicator_value							= Current indicator value
@@ -276,7 +269,6 @@
 move_to_bottom									= Move to bottom
 indicator_sort_order							= Indicator sort order
 data_element_sort_order							= Data element sort order
-get_pdf											= Get PDF
 district_health_information_software_2 			= District Health Information Software 2
 identifying_and_definitional_attributes			= Identifying and definitional attributes
 forum											= Forum

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/resources/org/hisp/dhis/dd/i18n_module_vi_VN.properties'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/resources/org/hisp/dhis/dd/i18n_module_vi_VN.properties	2010-10-14 08:54:26 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/resources/org/hisp/dhis/dd/i18n_module_vi_VN.properties	2010-12-09 06:15:40 +0000
@@ -1,6 +1,5 @@
 #Resource generated by I18n Resource Editor
 #Sun Jul 15 15:02:40 GMT+07:00 2007
-operations=Thao t\u00e1c
 alternative_name=T\u00ean thay th\u1ebf
 multiply=Nh\u00e2n
 indicator_management=Qu\u1ea3n l\u00fd ch\u1ec9 s\u1ed1
@@ -24,7 +23,6 @@
 data_element_group_management=Qu\u1ea3n l\u00fd nh\u00f3m ph\u1ea7n t\u1eed d\u1eef li\u1ec7u
 short_name_in_use=T\u00ean vi\u1ebft t\u1eaft n\u00e0y \u0111\u00e3 \u0111\u01b0\u1ee3c s\u1eed d\u1ee5ng.Vui l\u00f2ng ch\u1ecdn t\u00ean kh\u00e1c
 edit_data_element_group=Ch\u1ec9nh s\u1eeda nh\u00f3m ph\u1ea7n t\u1eed d\u1eef li\u1ec7u
-filter_by_name=L\u1ecdc theo t\u00ean
 saved=\u0110\u00e3 l\u01b0u
 list_of_data_elements=Danh s\u00e1ch ph\u1ea7n t\u1eed d\u1eef li\u1ec7u
 create_new_data_element=T\u1ea1o ph\u1ea7n t\u1eed d\u1eef li\u1ec7u m\u1edbi
@@ -45,7 +43,6 @@
 available_dataelements=Ph\u1ea7n t\u1eed d\u1eef li\u1ec7u c\u00f3 th\u1ec3 s\u1eed d\u1ee5ng
 export=Xu\u1ea5t
 saving_data_element_failed=L\u01b0u ph\u1ea7n t\u1eed d\u1eef li\u1ec7u kh\u00f4ng th\u00e0nh c\u00f4ng v\u1edbi th\u00f4ng b\u00e1o l\u1ed7i
-close=\u0110\u00f3ng
 create_new_data_element_group=T\u1ea1o m\u1edbi nh\u00f3m ph\u1ea7n t\u1eed d\u1eef li\u1ec7u
 edit_indicator_group=Ch\u1ec9nh s\u1eeda nh\u00f3m ch\u1ec9 s\u1ed1
 all_dataelementgroups=T\u1ea5t c\u1ea3 c\u00e1c nh\u00f3m ph\u1ea7n t\u1eed d\u1eef li\u1ec7u

=== 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-11-29 16:43:07 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/resources/org/hisp/dhis/dataset/i18n_module.properties	2010-12-09 06:15:40 +0000
@@ -21,7 +21,6 @@
 selected_data_elements 										= Selected data elements
 available_data_elements 									= Available data elements
 group_filter 												= Group filter
-operations 													= Operations
 define_associations 										= Assign dataset to organisation units
 id 															= Id
 number_of_data_elements 									= Number of data elements
@@ -64,8 +63,6 @@
 add_dataset_section 										= Add dataset section
 update_dataset_section 										= Update dataset section
 edit_section												= Edit section
-filter														= Filter
-filter_by_name												= Filter by name
 loading														= Loading, please wait...
 sort														= Sort
 data_set_sort_order											= Data set sort order

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/resources/org/hisp/dhis/dataset/i18n_module_vi_VN.properties'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/resources/org/hisp/dhis/dataset/i18n_module_vi_VN.properties	2010-10-14 08:54:26 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/resources/org/hisp/dhis/dataset/i18n_module_vi_VN.properties	2010-12-09 06:15:40 +0000
@@ -10,7 +10,6 @@
 no_orgunit_is_selected          = Kh\u00f4ng c\u00f3 \u0111\u01a1n v\u1ecb n\u00e0o \u0111\u01b0\u1ee3c ch\u1ecdn
 selected_data_elements          = Nh\u1eefng ph\u1ea7n t\u1eed d\u1eef li\u1ec7u \u0111\u01b0\u1ee3c ch\u1ecdn
 dataset_details                 = Chi ti\u1ebft t\u1eadp h\u1ee3p d\u1eef li\u1ec7u
-operations                      = Thao t\u00e1c
 failed_to_delete                = Kh\u00f4ng th\u1ec3 x\u00f3a.Kh\u00f4ng cho ph\u00e9p x\u00f3a dataset \u0111\u01b0\u1ee3c tham chi\u1ebfu b\u1edfi dataset kh\u00e1c
 update_dataset                  = C\u1eadp nh\u1eadt t\u1eadp d\u1eef li\u1ec7u
 add_new_dataset                 = Th\u00eam m\u1edbi t\u1eadp h\u1ee3p d\u1eef li\u1ec7u
@@ -55,7 +54,6 @@
 assign_multidataset_manage      = Qu\u1ea3n l\u00fd g\u00e1n \u0111a t\u1eadp h\u1ee3p d\u1eef li\u1ec7u cho c\u00e1c \u0111\u01a1n v\u1ecb
 available_datasets              = T\u1eadp h\u1ee3p d\u1eef li\u1ec7u hi\u1ec7n c\u00f3
 selected_datasets               = T\u1eadp h\u1ee3p d\u1eef li\u1ec7u \u0111\u01b0\u1ee3c ch\u1ecdn
-filter                          = B\u1ed9 l\u1ecdc
 intro_assign_multidataset       = G\u00e1n \u0111a t\u1eadp h\u1ee3p d\u1eef li\u1ec7u cho c\u00e1c \u0111\u01a1n v\u1ecb. \u0110a t\u1eadp h\u1ee3p d\u1eef li\u1ec7u l\u00e0 g\u1ed3m nhi\u1ec1u t\u1eadp h\u1ee3p d\u1eef li\u1ec7u. Ch\u1ee9c n\u0103ng n\u00e0y cho ph\u00e9p g\u00e1n m\u1ed9t hay nhi\u1ec1u t\u1eadp h\u1ee3p d\u1eef li\u1ec7u cho m\u1ed9t hay nhi\u1ec1u \u0111\u01a1n v\u1ecb.   
 orgunit_tree                    = C\u00e2y \u0111\u01a1n v\u1ecb
 move_all                        = Chuy\u1ec3n to\u00e0n b\u1ed9

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/resources/org/hisp/dhis/oum/i18n_module.properties'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/resources/org/hisp/dhis/oum/i18n_module.properties	2010-10-14 08:54:26 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/resources/org/hisp/dhis/oum/i18n_module.properties	2010-12-09 06:15:40 +0000
@@ -1,5 +1,4 @@
 create_new_org_unit									= Create new organisation unit
-details 											= Details
 org_unit_code										= Organisation unit code
 registers_date 										= Registers data
 crease_new_org_unit_group							= Create new organisation unit group
@@ -16,7 +15,6 @@
 hierarchy_operations_menu 							= Hierarchy Operations
 org_unit_level										= Organisation Unit Level
 org_unit_management 								= Organisation unit management
-operations  										= Operations
 this_org_unit_has_no_children 						= This organisation unit has no children
 org_unit_group_management 							= Organisation unit group management
 there_are_no_org_unit_groups 						= There are no organisation unit groups
@@ -96,6 +94,5 @@
 intro_org_unit_group_set							= Create, modify, view and delete organisation unit group sets. Group sets are used for improved analysis.
 intro_org_unit_level								= Create, modify, view and delete descriptive names for the organisation unit levels in the system.
 intro_hierarchy_operations_menu						= Move organisation units in the organisation unit tree. All children will be moved along with the unit.
-filter_by_name										= Filter by name
 loading												= Loading
 coordinates											= Coordinates
\ No newline at end of file

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/resources/org/hisp/dhis/oum/i18n_module_vi_VN.properties'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/resources/org/hisp/dhis/oum/i18n_module_vi_VN.properties	2010-10-14 08:54:26 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/resources/org/hisp/dhis/oum/i18n_module_vi_VN.properties	2010-12-09 06:15:40 +0000
@@ -1,7 +1,6 @@
 #DHIS2 resource - generated by I18n Resource Editor for locale "Vietnamese (Vietnam)"
 #Mon Oct 30 13:14:17 ICT 2006
 specify_a_short_name=Vui l\u00f2ng ch\u1ec9 \u0111\u1ecbnh t\u00ean vi\u1ebft t\u1eaft
-operations=Thao t\u00e1c
 is_a_member_of_more_than_one_selected_group=L\u00e0 th\u00e0nh vi\u00ean c\u1ee7a h\u01a1n m\u1ed9t nh\u00f3m \u0111\u01b0\u1ee3c ch\u1ecdn
 number_of_members=S\u1ed1 l\u01b0\u1ee3ng th\u00e0nh vi\u00ean
 org_unit_code=M\u00e3 \u0111\u01a1n v\u1ecb
@@ -12,7 +11,6 @@
 enter_a_valid_opening_date=Vui l\u00f2ng ch\u1ec9 \u0111\u1ecbnh ng\u00e0y m\u1edf h\u1ee3p l\u1ec7
 adding_the_org_unit_failed=Th\u00eam m\u1edbi \u0111\u01a1n v\u1ecb kh\u00f4ng th\u00e0nh c\u00f4ng v\u1edbi l\u1ed7i sau
 org_unit_management=Qu\u1ea3n l\u00ed c\u00e1c \u0111\u01a1n v\u1ecb
-details=Chi ti\u1ebft
 org_unit_group_set=Lo\u1ea1i nh\u00f3m \u0111\u01a1n v\u1ecb
 available_groups=Nh\u00f3m c\u00f3 s\u1eb5n
 confirm=X\u00e1c nh\u1eadn

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/resources/org/hisp/dhis/patient/i18n_module.properties'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/resources/org/hisp/dhis/patient/i18n_module.properties	2010-12-08 07:17:37 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/resources/org/hisp/dhis/patient/i18n_module.properties	2010-12-09 06:15:40 +0000
@@ -2,8 +2,6 @@
 selected_patient_attributes = Selected Patient Attributes
 patient_mobile_setting = Patient Mobile Setting
 patientMobileSetting = Mobile Settings
-yes = Yes
-no = No
 groupBy = Group By
 filters = Filters
 any = Any
@@ -21,7 +19,6 @@
 mapping_area = Mapping Area
 please_select_a_group_from_above = Please select a group from above
 group = Group
-filter = Filter
 selected_aggregate_data_element = Selected Aggregate Data Element
 aggregate_data_elements = Aggregate Data Elements
 patient_data_elements = Beneficiary Data Elements
@@ -287,7 +284,6 @@
 availableAttribute = Available attributes
 selectedAttribute = Selected attributes
 attribute_group_deltails = Attribute group details
-filter = Filter
 patient_attribute_group = Beneficiary Attribute Group
 please_specify_attributes = Please specify attributes for group
 patient_attribute_group_association = Beneficiary Attribute Group Association
@@ -351,7 +347,6 @@
 validation_criteria = Validation Criteria
 update_validation_criteria = Update validation criteria
 add_validation_criteria = Add validation criteria
-filter_by_name = Filter by name
 define_program_associations = Define program associations
 intro_patient = Create, modify and search for Benificiaries. Any type of data can be registered for a Beneficiary by including attributes.
 intro_patient_attribute = Create, modify and view Beneficiary attributes. An attribute can be used to register extra information for a Beneficiary.

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/resources/org/hisp/dhis/patient/i18n_module_vi_VN.properties'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/resources/org/hisp/dhis/patient/i18n_module_vi_VN.properties	2010-11-22 10:23:44 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/resources/org/hisp/dhis/patient/i18n_module_vi_VN.properties	2010-12-09 06:15:40 +0000
@@ -1,7 +1,5 @@
-patientMobileSetting = Thiet lap mobile
-yes = Co
-no = Khong
-groupBy = Chi muc nhom
+patientMobileSetting = Thi\u1ebft l\u1eadp mobile
+groupBy = Ch\u1ec9 m\u1ee5c nh\u00f3m
 invalid_date = Ng\u00e0y kh\u00f4ng h\u1ee3p l\u1ec7
 duplicate_names = T\u00ean b\u1ecb tr\u00f9ng l\u1eb7p
 removing_relationship_failed = L\u1ed7i trong khi g\u1ee1 b\u1ecf M\u1ed1i quan h\u1ec7

=== 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	2010-10-14 08:54:26 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module.properties	2010-12-09 06:15:40 +0000
@@ -130,8 +130,6 @@
 user_by_orgunit = User by Organisation Unit
 user_role = User Role
 data_sets = Data sets
-operations = Operations
-add_new = Add new
 change = Change
 specify_username = Please specify a username
 username_in_use = The username is already used, please specify a different username

=== 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	2010-10-14 08:54:26 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module_vi_VN.properties	2010-12-09 06:15:40 +0000
@@ -4,21 +4,17 @@
 #-- User module ---------------------------------------------------------------#
 
 username							= T\u00ean t\u00e0i kho\u1ea3n
-operations							= Thao t\u00e1c
 generate_new                        = Ph\u00e1t sinh m\u1edbi
 specify_username                    = Xin vui l\u00f2ng ch\u1ec9 \u0111\u1ecbnh t\u00ean t\u00e0i kho\u1ea3n
 specify_organisationunit_name       = Vui l\u00f2ng ch\u1ecdn \u0111\u01a1n v\u1ecb
 everything_is_ok                    = M\u1ecdi th\u1ee9 \u0111\u1ec1u \u1ed5n
-details                             = Chi ti\u1ebft
 organisation_unit                   = \u0110\u01a1n v\u1ecb
 retype_password                     = Nh\u1eadp l\u1ea1i m\u1eadt kh\u1ea9u
 specify_raw_password                = Vui l\u00f2ng nh\u1eadp m\u1eadt kh\u1ea9u
 firstName                           = T\u00ean
 role_management                     = Qu\u1ea3n l\u00fd c\u00e1c quy\u1ec1n
 user_management                     = Qu\u1ea3n l\u00fd t\u1ea3i kho\u1ea3n
-remove                              = X\u00f3a
 create_new_role                     = T\u1ea1o vai tr\u00f2 m\u1edbi
-add_new                             = Th\u00eam m\u1edbi
 create_new_user                     = T\u1ea1o t\u00e0i kho\u1ea3n m\u1edbi
 show_all_users                      = Hi\u1ec3n th\u1ecb t\u1ea5t c\u1ea3 ng\u01b0\u1eddi d\u00f9ng
 password_un_matched                 = M\u1eadt kh\u1ea9u v\u00e0 Nh\u1eadp l\u1ea1i m\u1eadt kh\u1ea9u kh\u00f4ng tr\u00f9ng nhau
@@ -47,7 +43,7 @@
 user                                = T\u00ean ng\u01b0\u1eddi d\u00f9ng
 user_by_orgunit                     = Ng\u01b0\u1eddi d\u00f9ng theo \u0111\u01a1n v\u1ecb
 user_role                           = Ph\u00e2n quy\u1ec1n
-excel_reporting                     =  B\u00e1o c\u00e1o Excels
+excel_reporting                     = B\u00e1o c\u00e1o Excels
 
 #-- User action privilegies ---------------------------------------------------#
 

=== modified file 'dhis-2/dhis-web/dhis-web-validationrule/src/main/resources/org/hisp/dhis/validationrule/i18n_module.properties'
--- dhis-2/dhis-web/dhis-web-validationrule/src/main/resources/org/hisp/dhis/validationrule/i18n_module.properties	2010-10-14 08:54:26 +0000
+++ dhis-2/dhis-web/dhis-web-validationrule/src/main/resources/org/hisp/dhis/validationrule/i18n_module.properties	2010-12-09 06:15:40 +0000
@@ -1,24 +1,14 @@
-edit= Edit
-remove= Remove
-show_details= Show details
 group_members= Group Members
 filters	= Filters
 filter_by_dataset_view_all	= Filter by dataset/view all
-filter_by_name= Filter by name
 available_data_elements	= Available data elements
 saving_validation_rule_failed= Saving Validation Rule failed
 validation_name	= Validation name
-description= Description
 operator	= Operator
 adding_validation_rule_failed= Adding validation rule failed
 validation_failed	= Validation failed
 right_side	= Right side
 left_side	= Left side
-update= Update
-close= Close
-add	= Add
-cancel= Cancel
-new	= New
 overview	= Overview
 left_brackets= Left brackets
 right_brackets= Right brackets
@@ -38,31 +28,12 @@
 enter_a_valid_ending_date	= Please enter a valid end date
 end_date_cannot_be_before_start_date= End date can not be before start date
 name_in_use	= The name is in use
-dataelements_left_must_be_type_integers= The data elements on the left side must be of type numbers
+dataelements_left_must_be_type_integers     = The data elements on the left side must be of type numbers
 dataelements_right_must_be_type_integers 	= The data elements on the right side must be of type numbers
-expression	= Expression
-side_expression= side expression
-create_new_validation_rule	= Create new validation rule
-details= Details
-absolute	= Absolute
-statistical	= Statistical
-left_side_of_expression= Left side of Expression
-right_side_of_expression	= Right side of Expression
-equal_to_symbol= ==
-not_equal_to_symbol	= !=
-greater_than_symbol	= >
-greater_than_or_equal_to_symbol= >=
-less_than_symbol	= <
-less_than_or_equal_to_symbol= <=
-equal_to	= ==
-not_equal_to= !=
-greater_than= >
-greater_than_or_equal_to	= >=
-less_than	= <
-less_than_or_equal_to= <=
-validate	= Validate
+side_expression = side expression
+create_new_validation_rule = Create new validation rule
+validate = Validate
 update_validation_rule= Update Validation Rule
-validation_rules	= Validation Rules
 confirm_delete_validation_rule= Are you sure you want to delete the validation rule?
 confirm_delete_validation_rule_group= Are you sure you want to delete the validation rule group?
 edit_left_side= Edit left side
@@ -73,13 +44,10 @@
 side_expression= Side Expression
 textual_expression_description= Textual expression description
 edit_validation_rule= Edit validation rule
-save= Save
 validation_rule= Validation Rule
 run_validation= Run validation
 validation_violations= Validation violations
 validation_results	= Validation results
-left_side_description= Left side description
-right_side_description= Right side description
 value= Value
 data_element= Data element
 organisation_unit= Organisation unit
@@ -92,7 +60,6 @@
 generate_pdf = Generate PDF
 generate_workbook = Generate Workbook
 validation	= Validation
-show_details= Show details
 data_quality_report	= Data quality report
 validation_result_details = Validation result details
 validation_rule_ = Validation rule
@@ -158,7 +125,6 @@
 result = result
 start = Start
 specify_period_type = Please specify a period type
-period_type = Period Type
 clear_expression = Clear expression
 periodtype = Periodtype
 available_data_sets = Available data sets

=== modified file 'dhis-2/dhis-web/dhis-web-validationrule/src/main/resources/org/hisp/dhis/validationrule/i18n_module_vi_VN.properties'
--- dhis-2/dhis-web/dhis-web-validationrule/src/main/resources/org/hisp/dhis/validationrule/i18n_module_vi_VN.properties	2010-10-14 08:54:26 +0000
+++ dhis-2/dhis-web/dhis-web-validationrule/src/main/resources/org/hisp/dhis/validationrule/i18n_module_vi_VN.properties	2010-12-09 06:15:40 +0000
@@ -2,11 +2,8 @@
 #Tue Mar 20 21:06:08 ICT 2007
 must_be_greater_than_or_equal_to=Ph\u1ea3i l\u1edbn h\u01a1n ho\u1eb7c b\u1eb1ng
 add_remove_left_side=Th\u00eam/ X\u00f3a v\u1ebf tr\u00e1i
-new=Th\u00eam m\u1edbi
 plus=C\u1ed9ng
-add=Th\u00eam
 create_new_validation_rule=T\u1ea1o m\u1edbi qui lu\u1eadt ki\u1ec3m tra t\u00ednh h\u1ee3p l\u1ec7
-cancel=H\u1ee7y b\u1ecf
 minus=Tr\u1eeb
 right_side_of_expression=B\u00ean ph\u1ea3i c\u1ee7a bi\u1ec3u th\u1ee9c
 filter_by_group_view_all=L\u1ecdc theo nh\u00f3m/t\u1ea5t c\u1ea3
@@ -22,9 +19,6 @@
 data_element=Ph\u1ea7n t\u1eed d\u1eef li\u1ec7u
 left_side=B\u00ean tr\u00e1i
 validate=Ki\u1ec3m tra t\u00ednh h\u1ee3p l\u1ec7
-edit=S\u1eeda
-show_details=Xem chi ti\u1ebft
-filters=B\u1ed9 l\u1ecdc
 side_expression=v\u1ebf bi\u1ec3u th\u1ee9c
 update_validation_rule=C\u1eadp nh\u1eadt qui lu\u1eadt ki\u1ec3m tra t\u00ednh h\u1ee3p l\u1ec7
 statistical=Th\u1ed1ng k\u00ea
@@ -32,24 +26,16 @@
 divide=Chia
 left_side_of_expression=Bi\u1ec3u th\u1ee9c tr\u00e1i
 saving_validation_rule_failed=L\u01b0u qui lu\u1eadt ki\u1ec3m tra t\u00ednh h\u1ee3p l\u1ec7 kh\u00f4ng th\u00e0nh c\u00f4ng
-expression=Bi\u1ec3u th\u1ee9c
 validation_failed=Ki\u1ec3m tra t\u00ednh h\u1ee3p l\u1ec7 kh\u00f4ng th\u00e0nh c\u00f4ng
-remove=X\u00f3a
 must_be_different_from=Ph\u1ea3i kh\u00e1c v\u1edbi
 adding_validation_rule_failed=Th\u00eam qui lu\u1eadt ki\u1ec3m tra t\u00ednh h\u1ee3p l\u1ec7 kh\u00f4ng th\u00e0nh c\u00f4ng
-update=C\u1eadp nh\u1eadt
 specify_operator=Ch\u1ecdn to\u00e1n t\u1eed
-absolute=Tuy\u1ec7t \u0111\u1ed1i
 dataelements_leftside_must_be_type_integers=C\u00e1c ph\u1ea7n t\u1eed d\u1eef li\u1ec7u ph\u00eda b\u00ean tr\u00e1i ph\u1ea3i l\u00e0 ki\u1ec3u s\u1ed1
 add_remove_right_side=Th\u00eam/ X\u00f3a v\u1ebf ph\u1ea3i
 name_in_use=T\u00ean \u0111\u00e3 \u0111\u01b0\u1ee3c s\u1eed d\u1ee5ng
 available_data_elements=C\u00e1c ph\u1ea7n t\u1eed d\u1eef li\u1ec7u c\u00f3 s\u1eb5n
 specify_left_side=Ch\u1ecdn v\u1ebf tr\u00e1i
-close=\u0110\u00f3ng
-filter_by_name=L\u1ecdc theo t\u00ean
-details=Chi ti\u1ebft
 end_date_cannot_be_before_start_date=Ng\u00e0y k\u1ebft th\u00fac kh\u00f4ng \u0111\u01b0\u1ee3c tr\u01b0\u1edbc ng\u00e0y b\u1eaft \u0111\u1ea7u
-operator=To\u00e1n t\u1eed
 must_be_less_than=Ph\u1ea3i nh\u1ecf h\u01a1n
 specify_an_ending_date=Ch\u1ecdn ng\u00e0y k\u1ebft th\u00fac
 enter_a_valid_ending_date=Vui l\u00f2ng nh\u1eadp ng\u00e0y k\u1ebft th\u00fac h\u1ee3p l\u1ec7
@@ -62,7 +48,5 @@
 overview=T\u1ed5ng quan
 source= \u0110\u01a1n v\u1ecb
 period= Th\u1eddi \u0111i\u1ec3m
-left_side_description= M\u00f4 t\u1ea3 b\u00ean tr\u00e1i
-right_side_description= M\u00f4 t\u1ea3 b\u00ean ph\u1ea3i
 value= Gi\u00e1 tr\u1ecb
 data_quality_report = B\u00e1o c\u00e1o ch\u1ea5t l\u01b0\u1ee3ng d\u1eef li\u1ec7u
\ No newline at end of file


Follow ups