=== 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-10-28 09:17:13 +0000 +++ dhis-2/dhis-web/dhis-web-commons/src/main/resources/i18n_global.properties 2010-11-05 07:31:24 +0000 @@ -350,7 +350,6 @@ available = Available selected = Selected -description = Description error = Error warning = Warning success = Success @@ -405,14 +404,14 @@ target = Target percent = Percent on_time = On time -data_dictionary = T\u1eeb \u0111i\u1ec3n d\u1eef li\u1ec7u -data_elements = C\u00e1c ph\u1ea7n t\u1eed d\u1eef li\u1ec7u -indicators = C\u00e1c ch\u1ec9 s\u1ed1 -indicator_groups = C\u00e1c nh\u00f3m ch\u1ec9 s\u1ed1 -data_element_groups = C\u00e1c nh\u00f3m ph\u1ea7n t\u1eed d\u1eef li\u1ec7u -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 +data_dictionary = Data Dictionary +data_elements = Data elements +indicators = Indicators +indicator_groups = Indicator groups +data_element_groups = Data element groups +data_element_concepts = Data element concepts +organisation_units = Organisation units +organisation_unit_hierarchy = Organisation unit hierarchy #-- Indicator ----------------------------------------------------------------------# === 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-10-28 09:17:13 +0000 +++ dhis-2/dhis-web/dhis-web-commons/src/main/resources/i18n_global_vi_VN.properties 2010-11-05 07:31:24 +0000 @@ -39,7 +39,7 @@ cannot_clear_selected_orgunits = Kh\u00f4ng th\u1ec3 x\u00f3a c\u00e1c \u0111\u01a1n v\u1ecb \u0111\u01b0\u1ee3c ch\u1ecdn tr\u01b0\u1edbc \u0111\u00f3 error_occurred = L\u1ed7i trong qu\u00e1 tr\u00ecnh duy\u1ec7t d\u1eef li\u1ec7u. select_organisationunit = Vui l\u00f2ng ch\u1ecdn m\u1ed9t \u0111\u01a1n v\u1ecb trong c\u00e2y \u0111\u01a1n v\u1ecb. -geo_code = Geo Code +geo_code = M\u00e3 \u0111\u1ecba l\u00fd #-- Modules -------------------------------------------------------------------# dhis-web-maintenance-datadictionary = Ph\u1ea7n t\u1eed d\u1eef li\u1ec7u & Ch\u1ec9 s\u1ed1 @@ -218,7 +218,7 @@ dhis2_online = DHIS 2 Tr\u1ef1c tuy\u1ebfn hisp_homepage = Trang ch\u1ee7 HISP dhis2_wiki = DHIS 2 Wiki -dhis2_issue_tracking = DHIS 2 Issue Tracking +dhis2_issue_tracking = Theo d\u00f5i c\u00e1c v\u1ea5n \u0111\u1ec1 trong DHIS2 message_to_the_dhis2_development_team = G\u1eedi th\u1eafc m\u1eafc t\u1edbi nh\u00f3m ph\u00e1t tri\u1ec3n error_message_stack_trace = Th\u00f4ng b\u00e1o l\u1ed7i / Stack trace enter_message = Nh\u1eadp th\u00f4ng b\u00e1o @@ -318,7 +318,6 @@ available = Hi\u1ec7n c\u00f3 selected = \u0110\u01b0\u1ee3c ch\u1ecdn -description = M\u00f4 t\u1ea3 error = Th\u00f4ng b\u00e1o l\u1ed7i warning = C\u1ea3nh b\u00e1o success = Th\u00e0nh c\u00f4ng @@ -351,6 +350,8 @@ name = T\u00ean short_name = T\u00ean vi\u1ebft t\u1eaft alternative_name = T\u00ean thay th\u1ebf +code = M\u00e3 +description = M\u00f4 t\u1ea3 opening_date = Ng\u00e0y m\u1edf closed_date = Ng\u00e0y \u0111\u00f3ng active = C\u00f3 hi\u1ec7u l\u1ef1c @@ -360,14 +361,14 @@ target = M\u1ee5c ti\u00eau percent = Ph\u1ea7n tr\u0103m on_time = \u0110\u00fang gi\u1edd -data_dictionary = Data Dictionary -data_elements = Data elements -indicators = Indicators -indicator_groups = Indicator groups -data_element_groups = Data element groups -data_element_concepts = Data element concepts -organisation_units = Organisation units -organisation_unit_hierarchy = Organisation unit hierarchy +data_dictionary = T\u1eeb \u0111i\u1ec3n d\u1eef li\u1ec7u +data_elements = C\u00e1c ph\u1ea7n t\u1eed d\u1eef li\u1ec7u +indicators = C\u00e1c ch\u1ec9 s\u1ed1 +indicator_groups = C\u00e1c nh\u00f3m ch\u1ec9 s\u1ed1 +data_element_groups = C\u00e1c nh\u00f3m ph\u1ea7n t\u1eed d\u1eef li\u1ec7u +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 #-- Indicator ----------------------------------------------------------------# === 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-10-14 08:54:26 +0000 +++ dhis-2/dhis-web/dhis-web-importexport/src/main/resources/org/hisp/dhis/importexport/i18n_module.properties 2010-11-05 07:31:24 +0000 @@ -166,6 +166,7 @@ remove_selected = Remove selected remove_all = Remove all pdf_metadata_export = PDF Metadata Export +xls_metadata_export = XLS Metadata Export identifying_and_definitional_attributes = Identifying and Definitional attributes mnemonic = Mnemonic version = Version @@ -327,6 +328,7 @@ DHIS14FILE = DHIS 1.4 File DXF = DXF PDF = PDF +XLS = XLS olap_urls = OLAP URLs url = Url olap_url = OLAP URL @@ -386,4 +388,5 @@ intro_DHIS14_metadata_export = Do an export of meta-data or dimensional data describing the facts. DHIS 1.4 is the predecessor of DHIS 2. intro_DHIS14_detailed_metadata_export = Do an export of an detailed selection of meta-data. DHIS 1.4 is the predecessor of DHIS 2. intro_DHIS14_data_export = Do an export of data values or facts. DHIS 1.4 is the predecessor of DHIS 2. -intro_pdf_metadata_export = Portable Document Format (PDF) is a file format for document exchange. \ No newline at end of file +intro_pdf_metadata_export = Portable Document Format (PDF) is a file format for document exchange. +intro_xls_metadata_export = Excel Spreadsheet (XLS) is a file format with a paper spreadsheet. \ No newline at end of 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-10-28 09:17:13 +0000 +++ 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 @@ -275,4 +275,6 @@ preview_matching_elements=Xem nh\u1eefng th\u00e0nh ph\u1ea7n th\u00edch h\u1ee3p data_elements=C\u00e1c ph\u1ea7n t\u1eed d\u1eef li\u1ec7u to_date=\u0110\u1ebfn ng\u00e0y -view_older_changes=Xem c\u00e1c thay \u0111\u1ed5i c\u0169 h\u01a1n \ No newline at end of file +view_older_changes=Xem c\u00e1c thay \u0111\u1ed5i c\u0169 h\u01a1n +xls_metadata_export = Xu\u1ea5t si\u00eau d\u1eef li\u1ec7u ra Excel file. +intro_xls_metadata_export = B\u1ea3ng t\u00ednh Excel (XLS) l\u00e0 m\u1ed9t t\u1eadp tin \u0111\u1ecbnh d\u1ea1ng v\u1edbi m\u1ed9t trang b\u1ea3ng t\u00ednh. \ 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-10-28 09:17:13 +0000 +++ 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 @@ -63,7 +63,6 @@ select_from_data_elements = Select from data elements select_from_calculated_data_elements = Select from calculated data elements indicator = Indicator -indicator_type = Indicator Type indicator_group = Indicator Group create_new_data_element = Create new data element details = Details @@ -353,7 +352,7 @@ selected_name = Selected name update_category_option = Update Category Option move_selected = Move selected -number_value_type = Number type +number_value_type = Number type int = Integer positiveNumber = Positive Number negativeNumber = Negative Number \ No newline at end of file