dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 4040
committer: Hieu <hieu.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Thu 2011-06-30 15:29:27 +0700
message:
  local vn - Added missing translation
modified:
  local/vn/dhis-web-excel-reporting/src/main/resources/org/hisp/dhis/reportexcel/i18n_module.properties
  local/vn/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/import/addImportReport.vm
  local/vn/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/report/addExportItemForm.vm
  local/vn/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/report/exportItems.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-excel-reporting/src/main/resources/org/hisp/dhis/reportexcel/i18n_module.properties'
--- local/vn/dhis-web-excel-reporting/src/main/resources/org/hisp/dhis/reportexcel/i18n_module.properties	2011-06-29 07:29:06 +0000
+++ local/vn/dhis-web-excel-reporting/src/main/resources/org/hisp/dhis/reportexcel/i18n_module.properties	2011-06-30 08:29:27 +0000
@@ -3,7 +3,8 @@
 row							= Row
 column						= Column
 excel_template				= Excel Template
-export_report_type			= Export Report Type
+export_report_type			= Export report type
+import_report_type			= Import report type
 PERIOD_COLUMN_LISTING		= Period Column Listing
 ORGANIZATION_GROUP_LISTING  = Organization Unit Listing
 NORMAL						= Normal
@@ -17,7 +18,6 @@
 excel_is_null				= Please enter excel template \!
 name_ready_exist			= Name Ready Exist \!
 confirm_delete 				= Are you sure you want to delete this\?
-item_type					= Item Type
 period_type					= Period Type
 update						= Update
 report_design				= Report Design
@@ -191,7 +191,7 @@
 ready_in_use				= File is ready in use. Can not delete \!
 intro_configuration         = Set the path to the directory only store excel template files on server.\nNotes\: This is a relative path.\nFor example\: \\templatefiles for Windows or /templatefiles for Linux.
 intro_export_reports        = Create, update, view and delete the excel report. A report excel containing many report items. Excel report can in a variety of different reports. Excel report for assignment to one or more units or group units and options list.
-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. ..).
+intro_data_status_management= This function is used to view the status input of data (Data is entered or not done or any missing one, etc...).
 intro_clean_up              = This feature allows users to delete the temporary files generated during the generating report or previewing report.
 intro_import_reports        = Create, update, delete and view the elements for importing data from excel files. This import items closer to export items.
 intro_excel_template_management = Upload, rename, search, download and delete the file extension .xls or .xlsx. Users can identify which files are used and unused files to. Automatically, allowing to update excel reporting system when file names which are used to be changed.

=== modified file 'local/vn/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/import/addImportReport.vm'
--- local/vn/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/import/addImportReport.vm	2011-05-24 07:48:23 +0000
+++ local/vn/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/import/addImportReport.vm	2011-06-30 08:29:27 +0000
@@ -13,7 +13,7 @@
 		<td><input type="text" id="name" name="name"  style="width:20em" class="{validate:{required:true,minlength:2,maxlength:160}}"/></td>
 	</tr>
 	<tr>
-		<td><label>$i18n.getString('import_type')<em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
+		<td><label>$i18n.getString('import_report_type')<em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
 		<td>
 			<select type="text" id="type" name="type" style="min-width:20em">
 				<option value='NORMAL'>$i18n.getString('NORMAL')</option>					
@@ -23,7 +23,7 @@
 		</td>
 	</tr>	
 	<tr>
-		<td><label>$i18n.getString('periodType')<em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
+		<td><label>$i18n.getString('period_type')<em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
 		<td>
 			<select type="text" id="periodTypeName" name="periodTypeName" style="min-width:20em">
 				#foreach ( $periodType in $periodTypes )

=== modified file 'local/vn/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/report/addExportItemForm.vm'
--- local/vn/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/report/addExportItemForm.vm	2011-05-24 07:48:23 +0000
+++ local/vn/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/report/addExportItemForm.vm	2011-06-30 08:29:27 +0000
@@ -22,7 +22,7 @@
 			<td>: $!encoder.htmlEncode($!exportReport.name)</td>
 		</tr>
 		<tr>
-			<td><label>$i18n.getString('report_type')</label></td>
+			<td><label>$i18n.getString('export_report_type')</label></td>
 			<td>: $i18n.getString( $!exportReport.getReportType() )</td>
 		</tr>
 		<tr>

=== modified file 'local/vn/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/report/exportItems.vm'
--- local/vn/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/report/exportItems.vm	2011-05-24 07:48:23 +0000
+++ local/vn/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/report/exportItems.vm	2011-06-30 08:29:27 +0000
@@ -30,8 +30,8 @@
 		<td align="right">		
 			<input type="button" onclick="window.location='addExportItemForm.action?exportReportId=$exportReport.id'" value="$i18n.getString('add')" style="width:150px"/><br>
 			<input type="button" onclick="window.location='listAllExportReport.action'" value="$i18n.getString('cancel')" style="width:150px"/><br>
-			<input type="button" onclick="copySelectedExportItemToExportReport()" value="$i18n.getString('copy_selected_item_to_exportreport')" style="width:150px"/><br>
-			<input type="button" onclick="copySelectedExportItemToImportReport()" value="$i18n.getString('copy_selected_item_to_importreport')" style="width:150px"/><br>
+			<input type="button" onclick="copySelectedExportItemToExportReport()" value="$i18n.getString('copy_export_item_to_exportreport')" style="width:150px"/><br>
+			<input type="button" onclick="copySelectedExportItemToImportReport()" value="$i18n.getString('copy_export_item_to_importreport')" style="width:150px"/><br>
 			<input type="button" onclick="deleteMultiExportItem( '$i18n.getString( 'confirm_delete' )')" value="$i18n.getString('remove')" style="width:150px"/>
 		</td>
 	</tr>