=== 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	2009-12-21 12:03:44 +0000
+++ dhis-2/dhis-web/dhis-web-importexport/src/main/resources/org/hisp/dhis/importexport/i18n_module.properties	2010-01-27 21:45:11 +0000
@@ -433,4 +433,13 @@
 indicator_group_set = Indicator group set
 routine_data_contains_values_out_of_range = Routine data values out of range (2^31) exist
 semi_permanent_data_contains_values_out_of_range = Semi-permanent data value out of range (2^31) exist
-preview_process_started = Preview process started
\ No newline at end of file
+preview_process_started = Preview process started
+configuration = Configuration
+intro_DHIS14_xml_import = Do an import from an XML based format. DHIS 1.4 is the predecessor of DHIS 2.
+intro_DHIS14_file_import = Do an import from an Access data file. DHIS 1.4 is the predecessor of DHIS 2.
+intro_IXF_import = Indicator Transmission Format (IXF) is a standard developed by the WHO.
+intro_ixf_data_export = Do an export of data values or facts. Indicator Transmission Format (IXF) is a standard developed by the WHO.
+intro_ixf_metadata_export = Do an export of meta-data or dimensional data describing the facts. Indicator Transmission Format (IXF) is a standard developed by the WHO.
+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_pdf_metadata_export = Portable Document Format (PDF) is a file format for document exchange.

=== modified file 'dhis-2/dhis-web/dhis-web-importexport/src/main/resources/struts.xml'
--- dhis-2/dhis-web/dhis-web-importexport/src/main/resources/struts.xml	2009-08-20 08:30:11 +0000
+++ dhis-2/dhis-web/dhis-web-importexport/src/main/resources/struts.xml	2010-01-27 21:45:11 +0000
@@ -13,6 +13,22 @@
     </action>
 		
     <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
+    <!-- Menu                                                          -->
+    <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
+		
+	<action name="displayExternalImportMenu" class="org.hisp.dhis.importexport.action.NoAction">
+	  <result name="success" type="velocity">/main.vm</result>
+      <param name="page">/dhis-web-importexport/externalImportMenu.vm</param>
+      <param name="menu">/dhis-web-importexport/mainMenu.vm</param>
+    </action>
+		
+    <action name="displayExternalExportMenu" class="org.hisp.dhis.importexport.action.NoAction">
+      <result name="success" type="velocity">/main.vm</result>
+      <param name="page">/dhis-web-importexport/externalExportMenu.vm</param>
+      <param name="menu">/dhis-web-importexport/mainMenu.vm</param>
+    </action>
+	
+    <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
     <!-- Import                                                        -->
     <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
 

=== modified file 'dhis-2/dhis-web/dhis-web-importexport/src/main/webapp/dhis-web-importexport/mainMenu.vm'
--- dhis-2/dhis-web/dhis-web-importexport/src/main/webapp/dhis-web-importexport/mainMenu.vm	2009-03-03 16:46:36 +0000
+++ dhis-2/dhis-web/dhis-web-importexport/src/main/webapp/dhis-web-importexport/mainMenu.vm	2010-01-27 21:45:11 +0000
@@ -3,14 +3,7 @@
 
 <ul>
   <li><a href="setImportFormat.action?importFormat=DXF">$i18n.getString( "import" )&nbsp;</a></li>
-</ul>
-
-<h2>$i18n.getString( "import_from_other_systems" )&nbsp;</h2>
-
-<ul>
-	<li><a href="setImportFormat.action?importFormat=DHIS14XML">$i18n.getString( "DHIS14_xml_import" )&nbsp;</a></li>
-	<li><a href="setImportFormat.action?importFormat=DHIS14FILE">$i18n.getString( "DHIS14_file_import" )&nbsp;</a></li>
-	<li><a href="setImportFormat.action?importFormat=IXF">$i18n.getString( "IXF_import" )&nbsp;</a></li>
+  <li><a href="displayExternalImportMenu.action">$i18n.getString( "import_from_other_systems" )&nbsp;</a></li>
 </ul>
 
 <h2>$i18n.getString( "export" )&nbsp;</h2>
@@ -19,17 +12,11 @@
   <li><a href="displayDataValueExportForm.action?exportFormat=DXF">$i18n.getString( "data_export" )&nbsp;</a></li>
   <li><a href="displayMetaDataExportForm.action?exportFormat=DXF">$i18n.getString( "metadata_export" )&nbsp;</a></li>
   <li><a href="displayDetailedMetaDataExportForm.action?exportFormat=DXF">$i18n.getString( "detailed_metadata_export" )&nbsp;</a></li> 
-</ul>
-
-<h2>$i18n.getString( "export_to_other_systems" )&nbsp;</h2>
-
-<ul>  
-  <li><a href="displayDataValueExportForm.action?exportFormat=IXF">$i18n.getString( "ixf_data_export" )&nbsp;</a></li>
-  <li><a href="displayMetaDataExportForm.action?exportFormat=IXF">$i18n.getString( "ixf_metadata_export" )&nbsp;</a></li>
-  <li><a href="displayMetaDataExportForm.action?exportFormat=DHIS14XML">$i18n.getString( "DHIS14_metadata_export" )&nbsp;</a></li>
-  <li><a href="displayDetailedMetaDataExportForm.action?exportFormat=DHIS14XML">$i18n.getString( "DHIS14_detailed_metadata_export" )&nbsp;</a></li>
-  <li><a href="displayMetaDataExportForm.action?exportFormat=PDF">$i18n.getString( "pdf_metadata_export" )&nbsp;</a></li>
-</ul>
+  <li><a href="displayExternalExportMenu.action">$i18n.getString( "export_to_other_systems" )&nbsp;</a></li> 
+</ul>
+
+<h2>$i18n.getString( "configuration" )&nbsp;</h2>
+
 <ul>
   <li><a href="displayConfigIXFForm.action">$i18n.getString( "ixf_configuration" )&nbsp;</a></li>
   <li><a href="displayConfigDhis14Form.action">$i18n.getString( "dhis14_file_configuration" )&nbsp;</a></li>