dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 7938
committer: Hieu <hieu.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Mon 2012-08-20 17:06:25 +0700
message:
  local vn - Updated i18n value
modified:
  local/vn/dhis-web-spreadsheet-reporting/src/main/resources/org/hisp/dhis/reportsheet/i18n_module.properties
  local/vn/dhis-web-spreadsheet-reporting/src/main/resources/org/hisp/dhis/reportsheet/i18n_module_vi_VN.properties
  local/vn/dhis-web-spreadsheet-reporting/src/main/webapp/dhis-web-spreadsheet-reporting/viewAdministrator.vm


--
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 'local/vn/dhis-web-spreadsheet-reporting/src/main/resources/org/hisp/dhis/reportsheet/i18n_module.properties'
--- local/vn/dhis-web-spreadsheet-reporting/src/main/resources/org/hisp/dhis/reportsheet/i18n_module.properties	2012-07-09 09:16:24 +0000
+++ local/vn/dhis-web-spreadsheet-reporting/src/main/resources/org/hisp/dhis/reportsheet/i18n_module.properties	2012-08-20 10:06:25 +0000
@@ -347,4 +347,13 @@
 hide_export_params			= Hide export params
 update_attribute_value_group_order_report = Update attribute value group order report
 available_attribute_value_group_orders = Available attribute value group orders
-group_members				= Group members
\ No newline at end of file
+group_members				= Group members
+attribute_group_order		= Attribute Group Order
+organisation_unit_prototype = Organisation Unit Prototype
+organisation_unit_prototype = \u0110\u01a1n v\u1ecb ki\u1ec3u m\u1eabu
+organisation_unit_prototype_group = Nh\u00f3m c\u00e1c \u0111\u01a1n v\u1ecb ki\u1ec3u m\u1eabu
+intro_design_export_reports = Create new, update, view and delete Export reports. A spread-sheet report contains one or many export items. There are many types of report. A report can be assigned to one or many organisation unit and other features...
+intro_design_import_reports = Create new, update, view and delete Import reports. This report has the import items to integrate with the spread-sheet file and other features...
+intro_attribute_group_order = Create new, update, view, sort and delete the group of attribute value. This group can be used in entry hospital, ie. Group of ICD Diseases
+intro_organisation_unit_prototype = Create new, update, view and delete an Organisation Unit Prototype. This one is the name of unit which can be apperanced in other upper units. 
+intro_organisation_unit_prototype_group = Create new, update, view and delete an Organisation Unit Prototype Group. This group contain the list of Organisation Unit Prototypes.
\ No newline at end of file

=== modified file 'local/vn/dhis-web-spreadsheet-reporting/src/main/resources/org/hisp/dhis/reportsheet/i18n_module_vi_VN.properties'
--- local/vn/dhis-web-spreadsheet-reporting/src/main/resources/org/hisp/dhis/reportsheet/i18n_module_vi_VN.properties	2012-07-09 09:16:24 +0000
+++ local/vn/dhis-web-spreadsheet-reporting/src/main/resources/org/hisp/dhis/reportsheet/i18n_module_vi_VN.properties	2012-08-20 10:06:25 +0000
@@ -72,9 +72,7 @@
 missing_template=C\u1ea3nh b\u00e1o! T\u1eadp tin b\u1ea3ng b\u1ecb thi\u1ebfu.
 no_group_order_created_for_category=Kh\u00f4ng c\u00f3 nh\u00f3m ph\u1ea7n t\u1eed th\u1ee9 t\u1ef1 \u0111\u01b0\u1ee3c t\u1ea1o cho lo\u1ea1i b\u00e1o c\u00e1o n\u00e0y
 dataelements=Ph\u1ea7n t\u1eed d\u1eef li\u1ec7u
-
 basic=C\u01a1 b\u1ea3n
-
 confirm_rename=B\u1ea1n c\u00f3 mu\u1ed1n \u0111\u1ed5i t\u00ean n\u00f3 kh\u00f4ng?
 line_=\u0111\u01b0\u1eddng
 specify_template_directory=H\u00e3y x\u00e1c \u0111\u1ecbnh th\u01b0 m\u1ee5c m\u1eabu
@@ -130,7 +128,6 @@
 bookmark_success=\u0110\u00e3 \u0111\u00e1nh d\u1ea5u
 export_items=Danh s\u00e1ch ph\u1ea7n t\u1eed b\u00e1o c\u00e1o
 dhis-web-chr-form=Phi\u1ebfu s\u1ee9c kh\u1ecfe tr\u1ebb em
-
 show_legend=Hi\u1ec3n th\u1ecb ch\u00fa th\u00edch
 selected_=\u0111\u01b0\u1ee3c ch\u1ecdn
 update_report_import_item=Ch\u1ec9nh s\u1eeda ph\u1ea7n t\u1eed b\u00e1o c\u00e1o
@@ -227,7 +224,6 @@
 plus=Ph\u00e9p c\u1ed9ng
 column_is_null=Vui l\u00f2ng nh\u1eadp s\u1ed1 c\u1ed9t!
 update_sorted_dataelement=C\u1eadp nh\u1eadt th\u1ee9 t\u1ef1 d\u1eef li\u1ec7u
-
 organisation_chart=Bi\u1ec3u \u0111\u1ed3 \u0111\u01a1n v\u1ecb
 intro_design_export_reports=T\u1ea1o m\u1edbi, c\u1eadp nh\u1eadt, xem v\u00e0 x\u00f3a c\u00e1c b\u00e1o c\u00e1o b\u1ea3ng. M\u1ed9t b\u00e1o c\u00e1o b\u1ea3ng ch\u1ee9a nhi\u1ec1u ph\u1ea7n t\u1eed. B\u00e1o c\u00e1o b\u1ea3ng c\u00f3 th\u1ec3 thu\u1ed9c nhi\u1ec1u lo\u1ea1i b\u00e1o c\u00e1o kh\u00e1c nhau. Cho ph\u00e9p g\u00e1n b\u00e1o c\u00e1o cho m\u1ed9t hay nhi\u1ec1u \u0111\u01a1n v\u1ecb ho\u1eb7c nh\u00f3m \u0111\u01a1n v\u1ecb v\u00e0 m\u1ed9t s\u1ed1 t\u00f9y ch\u1ecdn kh\u00e1c.
 intro_design_import_reports=T\u1ea1o m\u1edbi, c\u1eadp nh\u1eadt, x\u00f3a v\u00e0 xem c\u00e1c ph\u1ea7n t\u1eed \u0111\u1ec3 t\u00edch h\u1ee3p d\u1eef li\u1ec7u t\u1eeb c\u00e1c t\u1eadp tin b\u1ea3ng. C\u00e1c ph\u1ea7n t\u1eed n\u00e0y t\u01b0\u01a1ng \u0111\u01b0\u01a1ng v\u1edbi c\u00e1c ph\u1ea7n t\u1eed b\u00e1o c\u00e1o.
@@ -314,7 +310,6 @@
 load_period_by=Th\u1eddi \u0111i\u1ec3m theo
 grouplisting=Danh s\u00e1ch nh\u00f3m
 config_path_invalid=C\u1ea5u h\u00ecnh kh\u00f4ng h\u1ee3p l\u1ec7! Ch\u1ec9 cho ph\u00e9p nh\u1eadp ch\u1eef c\u00e1i, ch\u1eef s\u1ed1, k\u00fd t\u1ef1 g\u1ea1ch d\u01b0\u1edbi, g\u1ea1ch ngang v\u00e0 kho\u1ea3ng tr\u1eafng.
-
 confirm_override=B\u1ea1n c\u00f3 mu\u1ed1n ghi \u0111\u00e8 l\u00ean t\u1eadp tin \u0111\u00e3 c\u00f3?
 dataset_is_null=H\u00e3y ch\u1ecdn t\u1eadp d\u1eef li\u1ec7u!
 there_is_no_import_report=Kh\u00f4ng c\u00f3 ph\u1ea7n t\u1eed t\u00edch h\u1ee3p/b\u00e1o c\u00e1o n\u00e0o trong h\u1ec7 th\u1ed1ng
@@ -327,7 +322,6 @@
 indicator_groups=Nh\u00f3m ch\u1ec9 s\u1ed1
 import_successfully=T\u00edch h\u1ee3p th\u00e0nh c\u00f4ng
 excel_is_null=Vui l\u00f2ng nh\u1eadp \u0111\u01b0\u1eddng d\u1eabn m\u1eabu b\u00e1o c\u00e1o!
-intro_import_report=T\u1ea1o m\u1edbi, c\u1eadp nh\u1eadt, xem v\u00e0o x\u00f3a c\u00e1c ph\u1ea7n t\u1eed excel cho qu\u00e1 tr\u00ecnh import d\u1eef li\u1ec7u t\u1eeb t\u1eadp tin excel. Ph\u1ea7n t\u1eed import excel n\u00e0y c\u00f3 ch\u1ee9c n\u0103ng g\u1ea7n gi\u1ed1ng v\u1edbi ph\u1ea7n t\u1eed export excel.
 horizontal=H\u00e0ng ngang
 item_type=Ki\u1ec3u ph\u1ea7n t\u1eed
 draw_chart=V\u1ebd bi\u1ec3u \u0111\u1ed3
@@ -361,8 +355,6 @@
 selected_attributevalues=Gi\u00e1 tr\u1ecb thu\u1ed9c t\u00ednh \u0111\u00e3 ch\u1ecdn
 sort_attributevalue=S\u1eafp x\u1ebfp th\u1ee9 t\u1ef1 c\u00e1c gi\u00e1 tr\u1ecb thu\u1ed9c t\u00ednh
 selected_list_should_not_empty=Danh s\u00e1ch n\u00e0y kh\u00f4ng n\u00ean r\u1ed7ng
-intro_export_reports=T\u1ea1o m\u1edbi, c\u1eadp nh\u1eadt, xem v\u00e0 x\u00f3a c\u00e1c b\u00e1o c\u00e1o b\u1ea3ngl. M\u1ed9t b\u00e1o c\u00e1o b\u1ea3ngl ch\u1ee9a nhi\u1ec1u ph\u1ea7n t\u1eed. B\u00e1o c\u00e1o b\u1ea3ng c\u00f3 th\u1ec3 thu\u1ed9c nhi\u1ec1u lo\u1ea1i b\u00e1o c\u00e1o kh\u00e1c nhau. Cho ph\u00e9p g\u00e1n b\u00e1o c\u00e1o cho m\u1ed9t hay nhi\u1ec1u \u0111\u01a1n v\u1ecb ho\u1eb7c nh\u00f3m \u0111\u01a1n v\u1ecb v\u00e0 m\u1ed9t s\u1ed1 t\u00f9y ch\u1ecdn kh\u00e1c.
-intro_import_reports=T\u1ea1o m\u1edbi, c\u1eadp nh\u1eadt, x\u00f3a v\u00e0 xem c\u00e1c ph\u1ea7n t\u1eed \u0111\u1ec3 t\u00edch h\u1ee3p d\u1eef li\u1ec7u t\u1eeb c\u00e1c t\u1eadp tin b\u1ea3ng. C\u00e1c ph\u1ea7n t\u1eed n\u00e0y t\u01b0\u01a1ng \u0111\u01b0\u01a1ng v\u1edbi c\u00e1c ph\u1ea7n t\u1eed b\u00e1o c\u00e1o.
 no_attribute_selected = Kh\u00f4ng c\u00f3 Thu\u1ed9c t\u00ednh n\u00e0o \u0111\u01b0\u1ee3c ch\u1ecdn trong khi thi\u1ebft k\u1ebf b\u00e1o c\u00e1o
 attribute_with_id = Thu\u1ed9c t\u00ednh c\u00f3 m\u00e3
 select_category	= Ch\u1ecdn ph\u00e2n lo\u1ea1i
@@ -386,4 +378,10 @@
 hide_export_params = \u1ea8n khung ch\u1ecdn
 update_attribute_value_group_order_report = C\u1eadp nh\u1eadt nh\u00f3m cho b\u00e1o c\u00e1o
 available_attribute_value_group_orders = Nh\u00f3m hi\u1ec7n c\u00f3
-group_members = Nh\u00f3m \u0111\u00e3 ch\u1ecdn
\ No newline at end of file
+group_members = Nh\u00f3m \u0111\u00e3 ch\u1ecdn
+attribute_group_order = Nh\u00f3m c\u00e1c Thu\u1ed9c t\u00ednh c\u00f3 th\u1ee9 t\u1ef1
+organisation_unit_prototype = \u0110\u01a1n v\u1ecb ki\u1ec3u m\u1eabu
+organisation_unit_prototype_group = Nh\u00f3m c\u00e1c \u0111\u01a1n v\u1ecb ki\u1ec3u m\u1eabu
+intro_attribute_group_order = Cho ph\u00e9p th\u00eam, x\u00f3a, s\u1eafp th\u1ee9 t\u1ef1, s\u1eeda c\u00e1c nh\u00f3m. Trong \u0111\u00f3 m\u1ed7i nh\u00f3m c\u00f3 th\u1ec3 ch\u1ee9 m\u1ed9t ho\u1eb7c nhi\u1ec1u gi\u00e1 tr\u1ecb Thu\u1ed9c t\u00ednh. V\u00ed d\u1ee5 s\u1eed d\u1ee5ng cho nh\u1eadp d\u1eef li\u1ec7u b\u1ec7nh vi\u1ec7n m\u1eabu ICD.
+intro_organisation_unit_prototype = T\u1ea1o m\u1edbi, c\u1eadp nh\u1eadt, xem v\u00e0 x\u00f3a c\u00e1c \u0110\u01a1n v\u1ecb ki\u1ec3u m\u1eabu. M\u1ed9t \u0111\u01a1n v\u1ecb ki\u1ec3u m\u1eabu c\u00f3 c\u00e1c th\u00f4ng tin nh\u01b0 T\u00ean v\u00e0 T\u00ean vi\u1ebft t\u1eaft.
+intro_organisation_unit_prototype_group = T\u1ea1o m\u1edbi, c\u1eadp nh\u1eadt, xem v\u00e0 x\u00f3a c\u00e1c Nh\u00f3m \u0110\u01a1n v\u1ecb ki\u1ec3u m\u1eabu. M\u1ed9t Nh\u00f3m \u0111\u01a1n v\u1ecb ki\u1ec3u m\u1eabu c\u00f3 c\u00e1c th\u00f4ng tin nh\u01b0 T\u00ean v\u00e0 danh s\u00e1ch c\u00e1c \u0111\u01a1n v\u1ecb ki\u1ec3u m\u1eabu.
\ No newline at end of file

=== modified file 'local/vn/dhis-web-spreadsheet-reporting/src/main/webapp/dhis-web-spreadsheet-reporting/viewAdministrator.vm'
--- local/vn/dhis-web-spreadsheet-reporting/src/main/webapp/dhis-web-spreadsheet-reporting/viewAdministrator.vm	2012-08-20 07:13:48 +0000
+++ local/vn/dhis-web-spreadsheet-reporting/src/main/webapp/dhis-web-spreadsheet-reporting/viewAdministrator.vm	2012-08-20 10:06:25 +0000
@@ -14,12 +14,12 @@
 		</ul>
 	</td>
 
-	<td>
+	<td valign="top">
 		<ul class="introList" style="width:340px; margin-top:0px;">
-			#introListImgItem( "attributeValueGroupOrders.action" "attribute_group_order" "attribute_group_order" )
+			#introListImgItem( "attributeValueGroupOrders.action" "attribute_group_order" "attribute" )
 			#introListImgItem( "openOptionComboAssociations.action" "define_categoryoptioncombo_associations" "dhis-web-maintenance-datadictionary" )
-			#introListImgItem( "orgUnitPrototype.action" "organisation_unit_prototype" "organisationUnit" )
-			#introListImgItem( "orgUnitPrototypeGroup.action" "organisation_unit_prototype_group" "organisationUnit" )
+			#introListImgItem( "orgUnitPrototype.action" "organisation_unit_prototype" "organisationunit" )
+			#introListImgItem( "orgUnitPrototypeGroup.action" "organisation_unit_prototype_group" "organisationunit" )
 		</ul>
 	</td>
 </tr>