=== modified file 'dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/zip/ExcelExtension.java'
--- dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/zip/ExcelExtension.java	2010-06-04 17:44:41 +0000
+++ dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/zip/ExcelExtension.java	2010-06-19 15:32:24 +0000
@@ -1,6 +1,5 @@
 package org.hisp.dhis.importexport.zip;
 
-
 import java.util.Calendar;
 import java.util.GregorianCalendar;
 
@@ -30,14 +29,13 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+
 /**
- *
+ * 
  * @author bobj
- * @version created 04-May-2010
  */
 public class ExcelExtension
 {
-
     public static String date( String xltimestr )
     {
         try
@@ -48,10 +46,11 @@
             // the beginning of excel time is 1/1/1900
             Calendar cal = new GregorianCalendar();
             cal.set( 1900, 0, 1 );
-            //cal.add( Calendar.DAY_OF_MONTH, 20 );
+            // cal.add( Calendar.DAY_OF_MONTH, 20 );
             cal.add( Calendar.DAY_OF_MONTH, xldays.intValue() - 2 );
             return cal.getTime().toString();
-        } catch ( Exception ex )
+        }
+        catch ( Exception ex )
         {
             return "";
         }

=== modified file 'dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/zip/ExcelXImporter.java'
--- dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/zip/ExcelXImporter.java	2010-06-09 08:01:43 +0000
+++ dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/zip/ExcelXImporter.java	2010-06-19 15:32:24 +0000
@@ -1,6 +1,5 @@
 package org.hisp.dhis.importexport.zip;
 
-
 /*
  * Copyright (c) 2004-2005, University of Oslo
  * All rights reserved.
@@ -44,11 +43,10 @@
 /**
  *
  * @author bobj
- * @version created 22-Apr-2010
  */
 @Component("excelXImporter")
-public class ExcelXImporter extends TransformablePackage {
-
+public class ExcelXImporter extends TransformablePackage 
+{
     private final static Log log = LogFactory.getLog( ExcelXImporter.class );
 
     public static final String WORKBOOK = "xl/workbook.xml";
@@ -59,12 +57,10 @@
 
     @Autowired
     protected XMLPreConverter preConverter;
-
-
+    
     @Autowired
     protected DXFConverter converter;
 
-
     /**
      * Identify the spreadsheet and lookup the associated stylesheet identifier
      * Our current working assumption is there will be a version tag on cell B3
@@ -83,16 +79,17 @@
         // look up the excel shared string code in cell B3
         String codedIdentifier = XPathFilter.findText( titleSheet, "//c[@r='B3']/v" );
 
-        if (codedIdentifier==null)
+        if ( codedIdentifier == null )
         {
             log.info( "Couldn't identify spreadsheet version info");
-            throw (new Exception("Couldn't identify spreadsheet version info"));
+            throw new RuntimeException( "Couldn't identify spreadsheet version info" );
         }
 
         Integer id = Integer.parseInt( codedIdentifier) + 1;
 
         log.info("Shared string: "+id);
-        // look up it's string value
+        
+        // look up its string value
         String identifier = XPathFilter.findText( sharedStrings, "/sst/si["+id+"]/t");
 
         log.info("Excel spreadsheet identified: " + identifier);
@@ -127,5 +124,4 @@
     {
         return converter;
     }
-
 }

=== modified file 'dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/zip/OdfImporter.java'
--- dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/zip/OdfImporter.java	2010-06-04 17:44:41 +0000
+++ dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/zip/OdfImporter.java	2010-06-19 15:32:24 +0000
@@ -1,6 +1,5 @@
 package org.hisp.dhis.importexport.zip;
 
-
 import java.io.InputStream;
 import java.util.Map;
 import java.util.zip.ZipFile;
@@ -38,7 +37,6 @@
 /**
  *
  * @author bobj
- * @version created 02-Jun-2010
  */
 @Component("odfImporter")
 public class OdfImporter extends TransformablePackage {
@@ -72,5 +70,4 @@
     {
         throw new UnsupportedOperationException( "Not supported yet." );
     }
-
 }

=== modified file 'dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/zip/SdmxImporter.java'
--- dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/zip/SdmxImporter.java	2010-06-09 08:01:43 +0000
+++ dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/zip/SdmxImporter.java	2010-06-19 15:32:24 +0000
@@ -1,6 +1,5 @@
 package org.hisp.dhis.importexport.zip;
 
-
 import java.io.InputStream;
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
@@ -42,13 +41,11 @@
  */
 
 /**
- *
  * @author bobj
- * @version created 22-Apr-2010
  */
 @Component("sdmxImporter")
-public class SdmxImporter extends TransformablePackage {
-
+public class SdmxImporter extends TransformablePackage 
+{
     @Autowired
     protected XMLPreConverter preConverter;
 
@@ -104,6 +101,4 @@
     {
         return converter;
     }
-
-
 }

=== modified file 'dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/zip/SingleStreamImporter.java'
--- dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/zip/SingleStreamImporter.java	2010-06-04 17:44:41 +0000
+++ dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/zip/SingleStreamImporter.java	2010-06-19 15:32:24 +0000
@@ -40,23 +40,19 @@
 import org.springframework.stereotype.Component;
 
 /**
- * SingleStreamImporter is the simplest Importer
+ * SingleStreamImporter is the simplest Importer.
  *
  * @author bobj
- * @version created 21-Apr-2010
  */
 @Component("singleStreamImporter")
-public class SingleStreamImporter implements ZipImporter {
-
+public class SingleStreamImporter implements ZipImporter 
+{
     @Autowired
     protected XMLPreConverter preConverter;
 
-
     @Autowired
     protected DXFConverter converter;
 
-    // -------------------------------------------------------------------------
-
     public InputStream getXMLStream(ZipFile zipFile) throws IOException
     {
         ZipEntry entry = zipFile.entries().nextElement();
@@ -70,6 +66,4 @@
         XMLReader dxfReader = preConverter.transform( getXMLStream(zipFile), params, state);
         converter.read( dxfReader, params, state );
     }
-
-
 }

=== modified file 'dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/zip/TransformablePackage.java'
--- dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/zip/TransformablePackage.java	2010-06-05 18:05:40 +0000
+++ dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/zip/TransformablePackage.java	2010-06-19 15:32:24 +0000
@@ -1,6 +1,5 @@
 package org.hisp.dhis.importexport.zip;
 
-
 import java.io.InputStream;
 import java.util.Map;
 import java.util.zip.ZipFile;
@@ -50,7 +49,6 @@
  */
 public abstract class TransformablePackage implements ZipImporter
 {
-
     private static final String URL_PARAM = "zip_url";
 
     /**
@@ -89,5 +87,4 @@
     protected abstract XMLPreConverter getXMLPreConverter();
 
     protected abstract DXFConverter getDXFConverter();
-
 }

=== modified file 'dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/zip/ZipAnalyzer.java'
--- dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/zip/ZipAnalyzer.java	2010-06-18 15:21:28 +0000
+++ dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/zip/ZipAnalyzer.java	2010-06-19 15:32:24 +0000
@@ -38,9 +38,7 @@
 import org.springframework.stereotype.Component;
 
 /**
- *
  * @author bobj
- * @version created 21-Apr-2010
  */
 @Component("zipAnalyzer")
 public class ZipAnalyzer

=== modified file 'dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/zip/ZipImporter.java'
--- dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/zip/ZipImporter.java	2010-06-08 08:14:55 +0000
+++ dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/zip/ZipImporter.java	2010-06-19 15:32:24 +0000
@@ -1,6 +1,5 @@
 package org.hisp.dhis.importexport.zip;
 
-
 import java.util.zip.ZipFile;
 import org.hisp.dhis.common.ProcessState;
 import org.hisp.dhis.importexport.ImportParams;
@@ -31,6 +30,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+
 /**
  * A ZipImporter can import zip packages such as
  * dxf, excel (xlsx), sdmx-hd, odf
@@ -41,7 +41,6 @@
 public interface ZipImporter
 {
     public void importData(ImportParams params, ProcessState state, ZipFile zipFile) throws Exception;
-
 }
 
 

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/org/hisp/dhis/caseentry/i18n_module.properties'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/org/hisp/dhis/caseentry/i18n_module.properties	2010-06-09 19:41:18 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/org/hisp/dhis/caseentry/i18n_module.properties	2010-06-19 15:32:24 +0000
@@ -461,7 +461,4 @@
 sixth_visit                                                     = Sixth Visit
 discharge_date_from_institution                                 = Discharge Date From Institution
 urine_test_Infection                                            = Urine Test Infection 
-discharge_date_from_institution                                 = Discharge Date From Institution
-
-
-
+discharge_date_from_institution                                 = Discharge Date From Institution
\ No newline at end of file

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/index.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/index.vm	2009-11-20 12:19:58 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/index.vm	2010-06-19 15:32:24 +0000
@@ -2,7 +2,7 @@
 <h3>$i18n.getString( "dhis-web-caseentry" )</h3>
 
 <ul class="introList">
-    #introListItem( "dataEntrySelect.action" "data_entry" )
-    #introListItem( "reportSelect.action" "summary_report" )
-    #introListItem( "visitPlanSelect.action" "visit_plan" )
+    #introListImgItem( "dataEntrySelect.action" "data_entry" "dataentry" )
+    #introListImgItem( "reportSelect.action" "summary_report" "summaryreport" )
+    #introListImgItem( "visitPlanSelect.action" "visit_plan" "visitplan" )
 </ul>
\ No newline at end of file

=== added file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/icons/caseaggregationmapping.png'
Binary files dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/icons/caseaggregationmapping.png	1970-01-01 00:00:00 +0000 and dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/icons/caseaggregationmapping.png	2010-06-19 15:32:24 +0000 differ
=== added file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/icons/chart.png'
Binary files dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/icons/chart.png	1970-01-01 00:00:00 +0000 and dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/icons/chart.png	2010-06-19 15:32:24 +0000 differ
=== added file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/icons/datacompletenessreport.png'
Binary files dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/icons/datacompletenessreport.png	1970-01-01 00:00:00 +0000 and dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/icons/datacompletenessreport.png	2010-06-19 15:32:24 +0000 differ
=== added file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/icons/datadictionary.png'
Binary files dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/icons/datadictionary.png	1970-01-01 00:00:00 +0000 and dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/icons/datadictionary.png	2010-06-19 15:32:24 +0000 differ
=== added file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/icons/dataelement.png'
Binary files dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/icons/dataelement.png	1970-01-01 00:00:00 +0000 and dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/icons/dataelement.png	2010-06-19 15:32:24 +0000 differ
=== added file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/icons/dataentry.png'
Binary files dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/icons/dataentry.png	1970-01-01 00:00:00 +0000 and dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/icons/dataentry.png	2010-06-19 15:32:24 +0000 differ
=== added file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/icons/dataset.png'
Binary files dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/icons/dataset.png	1970-01-01 00:00:00 +0000 and dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/icons/dataset.png	2010-06-19 15:32:24 +0000 differ
=== added file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/icons/datasetreport.png'
Binary files dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/icons/datasetreport.png	1970-01-01 00:00:00 +0000 and dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/icons/datasetreport.png	2010-06-19 15:32:24 +0000 differ
=== added file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/icons/dhis14.png'
Binary files dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/icons/dhis14.png	1970-01-01 00:00:00 +0000 and dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/icons/dhis14.png	2010-06-19 15:32:24 +0000 differ
=== added file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/icons/indicator.png'
Binary files dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/icons/indicator.png	1970-01-01 00:00:00 +0000 and dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/icons/indicator.png	2010-06-19 15:32:24 +0000 differ
=== added file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/icons/organisationunit.png'
Binary files dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/icons/organisationunit.png	1970-01-01 00:00:00 +0000 and dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/icons/organisationunit.png	2010-06-19 15:32:24 +0000 differ
=== added file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/icons/patient.png'
Binary files dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/icons/patient.png	1970-01-01 00:00:00 +0000 and dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/icons/patient.png	2010-06-19 15:32:24 +0000 differ
=== added file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/icons/pdf.png'
Binary files dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/icons/pdf.png	1970-01-01 00:00:00 +0000 and dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/icons/pdf.png	2010-06-19 15:32:24 +0000 differ
=== added file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/icons/pivottable.png'
Binary files dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/icons/pivottable.png	1970-01-01 00:00:00 +0000 and dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/icons/pivottable.png	2010-06-19 15:32:24 +0000 differ
=== added file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/icons/program.png'
Binary files dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/icons/program.png	1970-01-01 00:00:00 +0000 and dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/icons/program.png	2010-06-19 15:32:24 +0000 differ
=== added file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/icons/reporttable.png'
Binary files dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/icons/reporttable.png	1970-01-01 00:00:00 +0000 and dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/icons/reporttable.png	2010-06-19 15:32:24 +0000 differ
=== added file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/icons/standardreport.png'
Binary files dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/icons/standardreport.png	1970-01-01 00:00:00 +0000 and dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/icons/standardreport.png	2010-06-19 15:32:24 +0000 differ
=== added file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/icons/staticreport.png'
Binary files dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/icons/staticreport.png	1970-01-01 00:00:00 +0000 and dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/icons/staticreport.png	2010-06-19 15:32:24 +0000 differ
=== added file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/icons/summaryreport.png'
Binary files dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/icons/summaryreport.png	1970-01-01 00:00:00 +0000 and dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/icons/summaryreport.png	2010-06-19 15:32:24 +0000 differ
=== added file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/icons/systemsettings.png'
Binary files dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/icons/systemsettings.png	1970-01-01 00:00:00 +0000 and dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/icons/systemsettings.png	2010-06-19 15:32:24 +0000 differ
=== added file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/icons/tallysheetgenerator.png'
Binary files dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/icons/tallysheetgenerator.png	1970-01-01 00:00:00 +0000 and dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/icons/tallysheetgenerator.png	2010-06-19 15:32:24 +0000 differ
=== added file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/icons/user.png'
Binary files dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/icons/user.png	1970-01-01 00:00:00 +0000 and dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/icons/user.png	2010-06-19 15:32:24 +0000 differ
=== added file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/icons/usersettings.png'
Binary files dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/icons/usersettings.png	1970-01-01 00:00:00 +0000 and dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/icons/usersettings.png	2010-06-19 15:32:24 +0000 differ
=== added file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/icons/validationanalysis.png'
Binary files dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/icons/validationanalysis.png	1970-01-01 00:00:00 +0000 and dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/icons/validationanalysis.png	2010-06-19 15:32:24 +0000 differ
=== added file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/icons/validationcriteria.png'
Binary files dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/icons/validationcriteria.png	1970-01-01 00:00:00 +0000 and dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/icons/validationcriteria.png	2010-06-19 15:32:24 +0000 differ
=== added file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/icons/validationrule.png'
Binary files dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/icons/validationrule.png	1970-01-01 00:00:00 +0000 and dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/icons/validationrule.png	2010-06-19 15:32:24 +0000 differ
=== added file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/icons/visitplan.png'
Binary files dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/icons/visitplan.png	1970-01-01 00:00:00 +0000 and dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/icons/visitplan.png	2010-06-19 15:32:24 +0000 differ
=== 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-06-08 08:14:55 +0000
+++ dhis-2/dhis-web/dhis-web-importexport/src/main/resources/org/hisp/dhis/importexport/i18n_module.properties	2010-06-19 15:32:24 +0000
@@ -58,7 +58,7 @@
 select_min_orgunit = Select at least one organisation unit
 select_min_period = Select at least one period
 select_period_span = Select period span
-dhis14_import = DHIS 1.4 Import
+dhis14_import = DHIS 1.4 import
 data_elements_and_indicators = Data elements and Indicators
 organisation_units = Organisation units
 periods = Periods

=== modified file 'dhis-2/dhis-web/dhis-web-importexport/src/main/webapp/dhis-web-importexport/externalExportMenu.vm'
--- dhis-2/dhis-web/dhis-web-importexport/src/main/webapp/dhis-web-importexport/externalExportMenu.vm	2010-06-01 11:04:02 +0000
+++ dhis-2/dhis-web/dhis-web-importexport/src/main/webapp/dhis-web-importexport/externalExportMenu.vm	2010-06-19 15:32:24 +0000
@@ -2,7 +2,7 @@
 <h3>$i18n.getString( "export_to_other_systems" )</h3>
 
 <ul class="introList">
-    #introListItem( "displayMetaDataExportForm.action?exportFormat=DHIS14XML" "DHIS14_metadata_export" )
-    #introListItem( "displayDetailedMetaDataExportForm.action?exportFormat=DHIS14XML" "DHIS14_detailed_metadata_export" )
-    #introListItem( "displayDataValueExportForm.action?exportFormat=DHIS14XML" "DHIS14_data_export" )
-    #introListItem( "displayMetaDataExportForm.action?exportFormat=PDF" "pdf_metadata_export" )
\ No newline at end of file
+    #introListImgItem( "displayMetaDataExportForm.action?exportFormat=DHIS14XML" "DHIS14_metadata_export" "dhis14" )
+    #introListImgItem( "displayDetailedMetaDataExportForm.action?exportFormat=DHIS14XML" "DHIS14_detailed_metadata_export" "dhis14" )
+    #introListImgItem( "displayDataValueExportForm.action?exportFormat=DHIS14XML" "DHIS14_data_export" "dhis14" )
+    #introListImgItem( "displayMetaDataExportForm.action?exportFormat=PDF" "pdf_metadata_export" "pdf" )
\ No newline at end of file

=== modified file 'dhis-2/dhis-web/dhis-web-importexport/src/main/webapp/dhis-web-importexport/externalImportMenu.vm'
--- dhis-2/dhis-web/dhis-web-importexport/src/main/webapp/dhis-web-importexport/externalImportMenu.vm	2010-06-01 11:04:02 +0000
+++ dhis-2/dhis-web/dhis-web-importexport/src/main/webapp/dhis-web-importexport/externalImportMenu.vm	2010-06-19 15:32:24 +0000
@@ -1,7 +1,7 @@
 
-<h3>$i18n.getString( "import_from_other_systems" )</h3>
+<h3>$i18n.getString( "dhis14_import" )</h3>
 
 <ul class="introList">
-    #introListItem( "setImportFormat.action?importFormat=DHIS14XML" "DHIS14_xml_import" )
-    #introListItem( "setImportFormat.action?importFormat=DHIS14FILE" "DHIS14_file_import" )
+    #introListImgItem( "setImportFormat.action?importFormat=DHIS14XML" "DHIS14_xml_import" "dhis14" )
+    #introListImgItem( "setImportFormat.action?importFormat=DHIS14FILE" "DHIS14_file_import" "dhis14" )
 </ul>
\ No newline at end of file

=== 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	2010-06-08 08:14:55 +0000
+++ dhis-2/dhis-web/dhis-web-importexport/src/main/webapp/dhis-web-importexport/mainMenu.vm	2010-06-19 15:32:24 +0000
@@ -3,7 +3,7 @@
 
 <ul>
   <li><a href="setImportFormat.action?importFormat=DXF">$i18n.getString( "import" )&nbsp;</a></li>
-  <li><a href="displayExternalImportMenu.action">$i18n.getString( "DHIS14_import" )&nbsp;</a></li>
+  <li><a href="displayExternalImportMenu.action">$i18n.getString( "dhis14_import" )&nbsp;</a></li>
 </ul>
 
 <h2>$i18n.getString( "export" )&nbsp;</h2>

=== 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-06-09 19:41:18 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/resources/org/hisp/dhis/dd/i18n_module.properties	2010-06-19 15:32:24 +0000
@@ -366,18 +366,18 @@
 data_element_does_not_exist						= Identifier does not reference a data element
 category_option_combo_does_not_exist 			= Identifier does not reference a category option combo
 expression_not_well_formed 						= Expression is not well formed
-intro_data_element								= Create, modify, view and delete data elements.
-intro_data_element_group						= Create, modify, view and delete data element groups.
-intro_data_element_group_editor					= Easily add or remove data elements to and from data element groups.
-intro_data_element_group_set					= Create, modify, view and delete data element group sets. 
-intro_data_element_category						= Create, modify, view and delete data element categories.
+intro_data_element								= Create, modify, view and delete data elements. Data elements are phenomena for which will be captured and analysed.
+intro_data_element_group						= Create, modify, view and delete data element groups. Groups are used for improved analysis.
+intro_data_element_group_editor					= Easily add or remove data elements to and from data element groups, as well as deleted data elements.
+intro_data_element_group_set					= Create, modify, view and delete data element group sets. Group sets are used for improved analysis.
+intro_data_element_category						= Create, modify, view and delete data element categories. Categories are fine-grained break-downs of data elements.
 intro_data_element_category_combo				= Create, modify, view and delete data element category combinations.
-intro_indicator									= Create, modify, view and delete indicators.
-intro_indicator_type							= Create, modify, view and delete indicator types.
-intro_indicator_group							= Create, modify, view and delete indicator groups.
-intro_indicator_group_editor					= Easily add or remove indicators to and from indicator groups.
-intro_indicator_group_set						= Create, modify, view and delete indicator group sets.
-intro_data_dictionary							= Create, modify, view and delete data dictionaries.
+intro_indicator									= Create, modify, view and delete indicators. An indicator is a formula consisting of data elements and numbers.
+intro_indicator_type							= Create, modify, view and delete indicator types. An indicator type is a factor for an indicator, like percentage.
+intro_indicator_group							= Create, modify, view and delete indicator groups. Groups are used for improved analysis.
+intro_indicator_group_editor					= Easily add or remove indicators to and from indicator groups, as well as delete indicators.
+intro_indicator_group_set						= Create, modify, view and delete indicator group sets. Group sets are used for improved analysis.
+intro_data_dictionary							= Create, modify, view and delete data dictionaries. A data dictionary is a set of meta-data.
 data_element_group_sets							= Data element group sets
 available_data_element_group_sets				= Available data element group sets
 selected_data_element_group_sets				= Selected data element group sets

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/index.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/index.vm	2009-11-02 21:31:07 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/index.vm	2010-06-19 15:32:24 +0000
@@ -2,16 +2,16 @@
 <h3>$i18n.getString( "dhis-web-maintenance-datadictionary" )</h3>
 
 <ul class="introList">
-	#introListItem( "dataElement.action" "data_element" )
-	#introListItem( "dataElementGroup.action" "data_element_group" )
-    #introListItem( "dataElementGroupEditor.action" "data_element_group_editor" )
-    #introListItem( "dataElementGroupSet.action" "data_element_group_set" )
-    #introListItem( "category.action" "data_element_category" )
-    #introListItem( "categoryCombo.action" "data_element_category_combo" )
-    #introListItem( "indicator.action" "indicator" )
-    #introListItem( "indicatorType.action" "indicator_type" )
-    #introListItem( "indicatorGroup.action" "indicator_group" )
-    #introListItem( "indicatorGroupEditor.action" "indicator_group_editor" )
-    #introListItem( "indicatorGroupSet.action" "indicator_group_set" )
-    #introListItem( "dataDictionary.action" "data_dictionary" )
+	#introListImgItem( "dataElement.action" "data_element" "dataelement" )
+	#introListImgItem( "dataElementGroup.action" "data_element_group" "dataelement" )
+    #introListImgItem( "dataElementGroupEditor.action" "data_element_group_editor" "dataelement" )
+    #introListImgItem( "dataElementGroupSet.action" "data_element_group_set" "dataelement" )
+    #introListImgItem( "category.action" "data_element_category" "dataelement" )
+    #introListImgItem( "categoryCombo.action" "data_element_category_combo" "dataelement" )
+    #introListImgItem( "indicator.action" "indicator" "indicator" )
+    #introListImgItem( "indicatorType.action" "indicator_type" "indicator" )
+    #introListImgItem( "indicatorGroup.action" "indicator_group" "indicator" )
+    #introListImgItem( "indicatorGroupEditor.action" "indicator_group_editor" "indicator" )
+    #introListImgItem( "indicatorGroupSet.action" "indicator_group_set" "indicator" )
+    #introListImgItem( "dataDictionary.action" "data_dictionary" "datadictionary" )
 </ul>
\ No newline at end of file

=== 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-03-24 02:56:06 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/resources/org/hisp/dhis/dataset/i18n_module.properties	2010-06-19 15:32:24 +0000
@@ -103,14 +103,14 @@
 selectdataelement 											= Available Data Elements
 dataset_management											= Dataset management
 section_management											= Dataset Section management
-intro_dataset												= Create, update, view and delete data sets. A data set is a collection of data elements for which data is entered. This page also lets you define custom data entry screens and option lists.
+intro_dataset												= Create, update, view and delete data sets and custom forms. A data set is a collection of data elements for which data is entered.
 intro_dataset_section										= Create, update, view and delete data set sections. Sections can be inserted into data sets to make them more comprehensible.
+intro_assign_multidataset                                   = Assign data sets to organisation units. This page allow you to assign one or many data sets to one or many organisation units.
 edit_compulsory_data_elements								= Edit compulsory data elements
 assign_multidataset                                         = Multi-datasets
 assign_multidataset_manage                                  = Assign multi-datasets to orgunit Management
 available_datasets                                          = Available DataSets
 selected_datasets                                           = Selected DataSets
-intro_assign_multidataset                                   = Assign Multi-DataSets to organisation unit. Multi-DataSet is a collection of data sets. This page allow you to assign one or many data set(s) to one or many organisation unit(s).
 orgunit_tree                                                = Organisation Unit Tree
 dataset_assignment_editor									= Dataset Assignment Editor
 move_selected                                               = Move selected

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/index.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/index.vm	2010-03-04 09:44:37 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/index.vm	2010-06-19 15:32:24 +0000
@@ -2,7 +2,7 @@
 <h3>$i18n.getString( "dhis-web-maintenance-dataset" )</h3>
 
 <ul class="introList">
-    #introListItem( "dataSet.action" "dataset" )
-    #introListItem( "section.action" "dataset_section" )
-    #introListItem( "showAssignMultiDataSetForOrgunitForm.action" "assign_multidataset" )
+    #introListImgItem( "dataSet.action" "dataset" "dataset" )
+    #introListImgItem( "section.action" "dataset_section" "dataset" )
+    #introListImgItem( "showAssignMultiDataSetForOrgunitForm.action" "assign_multidataset" "dataset" )
 </ul>
\ 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.properties'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/resources/org/hisp/dhis/oum/i18n_module.properties	2010-06-09 19:41:18 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/resources/org/hisp/dhis/oum/i18n_module.properties	2010-06-19 15:32:24 +0000
@@ -55,25 +55,20 @@
 enter_a_valid_close_date							= Please enter a valid closed date
 org_unit_with_children_cannot_be_closed				= An organisation unit with children cannot be closed. Please remove the closed date
 closed_date_cannot_be_before_opening_date			= Closed date cannot be before opening date
-
 please_specify_a_name								= Please specify a name
 name_is_already_in_use								= The name is already in use. Please choose a different name
-
 this_org_unit_cannot_moved							= This organisation unit cannot be moved. Please select a new organisation unit to move
 the_org_unit_to_move_is_approved					= The organisation unit to move is approved
-
 vertication_of_the_org_unit_to_move_failed			= Verification of the organisation unit to move failed with the following message
 not_selected_moved_to_root_position 				= Not selected, moved to root position
 verification_of_the_new_parent_org_unit_failed		= Verification of the new parent organisation unit failed with the following message
 none												= None
-
 confirm_to_delete_org_unit							= Are you sure you want to delete this organisation unit?
 adding_the_org_unit_failed							= Adding the organisation unit failed with the following message
 saving_the_org_unit_failed							= Saving the organisation unit failed with the following message
 confirm_to_delete_org_unit_group					= Are you sure you want to delete this Organisation Unit Group?
 adding_the_org_unit_group_failed					= Adding the organisation unit group failed with the following message
 saving_the_org_unit_group_failed					= Saving the organisation unit group failed with the following message
-
 confirm_to_delete_org_unit_group_set				= Are you sure you want to delete this organisation unit group set?
 org_unit_group_set_management						= Organisation unit group set management
 org_unit_group_set									= Organisation Unit Group Set
@@ -119,10 +114,10 @@
 unselect_all_in_group								= Unselect All in Group
 unselect_all										= Unselect All
 last_updated										= Last updated
-intro_org_unit										= Create, modify, view and delete organisation units.
-intro_org_unit_group								= Create, modify, view and delete organisation unit groups.
-intro_org_unit_group_set							= Create, modify, view and delete organisation unit group sets.
-intro_org_unit_level								= Create, modify, view and delete organisation unit levels.
-intro_hierarchy_operations_menu						= Move organisation units in the hierarchy.
+intro_org_unit										= Create, modify, view and delete organisation units, which can be departments, offices, hospitals and clinics.
+intro_org_unit_group								= Create, modify, view and delete organisation unit groups. Groups are used for improved analysis.
+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
+loading												= Loading
\ No newline at end of file

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/index.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/index.vm	2009-11-03 11:04:45 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/index.vm	2010-06-19 15:32:24 +0000
@@ -2,9 +2,9 @@
 <h3>$i18n.getString( "dhis-web-maintenance-organisationunit" )</h3>
 
 <ul class="introList">
-    #introListItem( "organisationUnit.action" "org_unit" )
-    #introListItem( "organisationUnitGroup.action" "org_unit_group" )
-    #introListItem( "organisationUnitGroupSet.action" "org_unit_group_set" )
-    #introListItem( "organisationUnitLevel.action" "org_unit_level" )
-    #introListItem( "hierarchyOperations.action" "hierarchy_operations_menu" )
+    #introListImgItem( "organisationUnit.action" "org_unit" "organisationunit" )
+    #introListImgItem( "organisationUnitGroup.action" "org_unit_group" "organisationunit" )
+    #introListImgItem( "organisationUnitGroupSet.action" "org_unit_group_set" "organisationunit" )
+    #introListImgItem( "organisationUnitLevel.action" "org_unit_level" "organisationunit" )
+    #introListImgItem( "hierarchyOperations.action" "hierarchy_operations_menu" "organisationunit" )
 </ul>

=== 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-06-16 12:16:35 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/resources/org/hisp/dhis/patient/i18n_module.properties	2010-06-19 15:32:24 +0000
@@ -275,12 +275,6 @@
 patient_attribute = Patient Attribute
 relationship_type = Relationship Type
 program = Program
-intro_patient = Create, modify and search for patients.
-intro_patient_attribute = Create, modify and view patient attributes.
-intro_relationship_type = Create, modify and view relationship types.
-intro_program = Create, modify and view programs.
-
-
 case_aggregation_mapping = Case Aggregation Mapping
 dataelement_group_list = Dataelement Group List:
 dataelement_list = Dataelement List:
@@ -297,8 +291,6 @@
 right_expression = Right Expression
 and_or = And/Or
 select = Select
-
-#viewDataEntryForm
 dataentryform_management_for_program_stage = Data entry form management for Program stage
 select_method = Select method
 design_dataentry = Design data entry form
@@ -312,7 +304,6 @@
 mandatory  = Mandatory
 update_relationship_type = Update Relationship Type
 patient_attribute_group_management = Patient Attribute Group Management
-intro_patient_attribute_group = Create, modify and view patient attributes.
 required = Required
 move_selected = Move selected items
 remove_selected = Remove selected items
@@ -335,7 +326,6 @@
 patient_identifier_type = Patient Identifier Type
 add_new_patient_identifier_type = Add new Patient Identifier Type
 update_patient_identifier_type = Update Patient Identifier Type
-intro_patient_identifier_type = Create, modify and view Patient Identifier Type.
 check_duplicate = Check duplicate
 delete_successfull = Deleted successfully   
 patient_identifiers = Patient Identifiers
@@ -381,4 +371,18 @@
 no_of_pages = No. of pages
 size_of_page = Size of page
 jump_to_page = Jump to page
-oucode_must_be_valid = Please set valid 9 digit organisation unit code to add new patient
\ No newline at end of file
+oucode_must_be_valid = Please set valid 9 digit organisation unit code to add new patient
+validation_criteria = Validation Criteria
+update_validation_criteria = Update validation criteria
+add_validation_criteria = Add validation criteria
+filter_by_name = Filter by name
+details = Details
+define_program_associations = Define program associations
+intro_patient = Create, modify and search for patients. Any type of data can be registered for a patient by including attributes.
+intro_patient_attribute = Create, modify and view patient attributes. An attribute can be used to register extra information for a patient.
+intro_patient_attribute_group = Create, modify and view patient attribute groups. Groups makes it more convenient to add attributes to a patient.
+intro_patient_identifier_type = Create, modify and view patient identifier types. Any type and multiple identifiers can be registered.
+intro_relationship_type = Create, modify and view relationship types. A relationship is typically wife and husband or mother and child.
+intro_program = Create, modify and view programs. A program has program stages and defines which actions should be taken at each stage.
+intro_case_aggregation_mapping = Set up aggregation rules for the process of aggregating patient data to statistical data.
+intro_validation_criteria = Create, modify and view validation criteria. A critera is used for validation of patient data.
\ No newline at end of file

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/addValidationCriteria.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/addValidationCriteria.vm	2010-05-18 03:42:26 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/addValidationCriteria.vm	2010-06-19 15:32:24 +0000
@@ -24,7 +24,7 @@
 <form id="validationCriteriaForm" action="addValidationCriteria.action" method="post" >
   <table border="0">
 	<tr>
-      <th colspan="3">$i18n.getString('criteria_details')</th>
+      <th colspan="3">$i18n.getString('details')</th>
     </tr>
     <tr>
       <td><label>$i18n.getString('name')<em title="$i18n.getString( "required" )" class="required">*</em></label></td>

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/index.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/index.vm	2010-05-17 02:59:28 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/index.vm	2010-06-19 15:32:24 +0000
@@ -2,11 +2,12 @@
 <h3>$i18n.getString( "dhis-web-maintenance-patient" )</h3>
 
 <ul class="introList">
-    #introListItem( "patient.action" "patient" )
-    #introListItem( "patientAttribute.action" "patient_attribute" )
-    #introListItem( "patientAttributeGroup.action" "patient_attribute_group" )
-    #introListItem( "patientIdentifierType.action" "patient_identifier_type" )
-    #introListItem( "relationshipType.action" "relationship_type" )
-    #introListItem( "program.action" "program" )
-	#introListItem( "validationCriteria.action" "validation_criteria" )
+    #introListImgItem( "patient.action" "patient" "patient" )
+    #introListImgItem( "patientAttribute.action" "patient_attribute" "patient" )
+    #introListImgItem( "patientAttributeGroup.action" "patient_attribute_group" "patient" )
+    #introListImgItem( "patientIdentifierType.action" "patient_identifier_type" "patient" )
+    #introListImgItem( "relationshipType.action" "relationship_type" "patient" )
+    #introListImgItem( "program.action" "program" "program" )
+    #introListImgItem( "caseaggregationMapForm.action" "case_aggregation_mapping" "caseaggregationmapping" )
+	#introListImgItem( "validationCriteria.action" "validation_criteria" "validationcriteria" )
 </ul>
\ No newline at end of file

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/menu.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/menu.vm	2010-05-17 02:59:28 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/menu.vm	2010-06-19 15:32:24 +0000
@@ -1,12 +1,12 @@
 <h2>$i18n.getString( "paitents_and_programs" )</h2>
 <ul>
-	<li><a href="patient.action">$i18n.getString( "patient_management" )</a></li>		
-	<li><a href="patientAttribute.action">$i18n.getString( "patient_attribute_management" )</a></li>
-	<li><a href="patientAttributeGroup.action">$i18n.getString( "patient_attribute_group_management" )</a></li>
-	<li><a href="patientIdentifierType.action">$i18n.getString( "patient_identifier_type_management" )</a></li>
-	<li><a href="relationshipType.action">$i18n.getString( "relationship_type_management" )</a></li>
-	<li><a href="program.action">$i18n.getString( "program_management" )</a></li>
+	<li><a href="patient.action">$i18n.getString( "patient" )</a></li>		
+	<li><a href="patientAttribute.action">$i18n.getString( "patient_attribute" )</a></li>
+	<li><a href="patientAttributeGroup.action">$i18n.getString( "patient_attribute_group" )</a></li>
+	<li><a href="patientIdentifierType.action">$i18n.getString( "patient_identifier_type" )</a></li>
+	<li><a href="relationshipType.action">$i18n.getString( "relationship_type" )</a></li>
+	<li><a href="program.action">$i18n.getString( "program" )</a></li>
 	<li><a href="caseaggregationMapForm.action">$i18n.getString( "case_aggregation_mapping" )</a></li>
-	<li><a href="validationCriteria.action">$i18n.getString( "validation_criteria_management" )</a></li>
+	<li><a href="validationCriteria.action">$i18n.getString( "validation_criteria" )</a></li>
 </ul>
 

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/programsForValidationCriteriaAssociations.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/programsForValidationCriteriaAssociations.vm	2010-05-18 03:42:26 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/programsForValidationCriteriaAssociations.vm	2010-06-19 15:32:24 +0000
@@ -1,5 +1,5 @@
 
-<h3>$i18n.getString( "define_programs_associations" ) </h3>
+<h3>$i18n.getString( "define_program_associations" ) </h3>
 
 <form action='defineProgramsForValidationCriteria.action' method='post' onsubmit="selectAllById('programIds');">
 <table>

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/validationCriteria.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/validationCriteria.vm	2010-05-28 05:37:26 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/validationCriteria.vm	2010-06-19 15:32:24 +0000
@@ -28,7 +28,7 @@
 				<tr id="tr${criteria.id}">
 				  <td>$criteria.name</td>
 				  <td>
-					<a href="showProgramsForValidationCriteriaForm.action?criteriaId=$criteria.id" title="$i18n.getString( "define_associations" )"><img src="images/criteria.gif" alt="$i18n.getString( 'assign_program' )"></a>
+					<a href="showProgramsForValidationCriteriaForm.action?criteriaId=$criteria.id" title="$i18n.getString( "define_associations" )"><img src="../images/assign.png" alt="$i18n.getString( 'assign_program' )"></a>
 					<a href="showUpdateValidationCriteriaForm.action?id=$criteria.id" title="$i18n.getString( "edit" )"><img src="../images/edit.png" alt="$i18n.getString( 'edit' )"></a>
 					<a href="javascript:removeCriteria( '$criteria.id', '$encoder.jsEncode( $criteria.getName() )' )" title="$i18n.getString( "remove" )"><img src="../images/delete.png" alt="$i18n.getString( 'remove' )"></a>
 					<a href="javascript:showValidationCriteriaDetails( '$criteria.id' )" title="$i18n.getString( "show_details" )"><img src="../images/information.png" alt="$i18n.getString( 'show_details' )"></a>

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/webapp/dhis-web-maintenance-settings/index.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/webapp/dhis-web-maintenance-settings/index.vm	2009-11-03 09:05:08 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/webapp/dhis-web-maintenance-settings/index.vm	2010-06-19 15:32:24 +0000
@@ -2,7 +2,7 @@
 <h3>$i18n.getString( "dhis-web-maintenance-settings" )</h3>
 
 <ul class="introList">
-    #introListItem( "userSettings.action" "user_settings" )
-    #introListItem( "systemSettings.action" "system_settings" )
+    #introListImgItem( "userSettings.action" "user_settings" "usersettings" )
+    #introListImgItem( "systemSettings.action" "system_settings" "systemsettings" )
 </ul>
     

=== 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-06-09 19:41:18 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module.properties	2010-06-19 15:32:24 +0000
@@ -198,7 +198,7 @@
 confirm_delete_role = Are you sure you want to remove the user role?
 authorities = Authorities
 excel_reporting	= Excel Reporting
-intro_user = Create, modify, view and delete users.
+intro_user = Create, modify, view and delete users. A user is associated with user roles and an organisation unit.
 intro_user_by_orgunit = Create, modify, view and delete users for a given organisation unit.
 intro_user_role = Create, modify, view and delete user roles. A user role has a set of authorities.
 intro_change_password = Change the password for users.

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/webapp/dhis-web-maintenance-user/index.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/webapp/dhis-web-maintenance-user/index.vm	2010-03-31 03:07:10 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/webapp/dhis-web-maintenance-user/index.vm	2010-06-19 15:32:24 +0000
@@ -2,7 +2,7 @@
 <h3>$i18n.getString( "dhis-web-maintenance-user" )</h3>
 
 <ul class="introList">
-    #introListItem( "alluser.action" "user" )
-    #introListItem( "user.action" "user_by_orgunit" )
-    #introListItem( "allRole.action" "user_role" )
+    #introListImgItem( "alluser.action" "user" "user" )
+    #introListImgItem( "user.action" "user_by_orgunit" "user" )
+    #introListImgItem( "allRole.action" "user_role" "user" )
 </ul>

=== modified file 'dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/index.vm'
--- dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/index.vm	2010-02-02 13:21:02 +0000
+++ dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/index.vm	2010-06-19 15:32:24 +0000
@@ -2,12 +2,12 @@
 <h3>$i18n.getString( "dhis-web-reporting" )</h3>
 
 <ul class="introList">
-    #introListItem( "displayViewReportFormVerifyConfiguration.action" "standard_report" )
-    #introListItem( "dataSetReport.action" "dataset_report" )
-    #introListItem( "displayViewDataCompletenessForm.action" "data_completeness" )
-    #introListItem( "displayViewDocumentForm.action" "static_report" )
-    #introListItem( "tallySheetGenerator.action" "tally_sheet_generator" )
-    #introListItem( "displayManageTableForm.action" "report_table" )
-    #introListItem( "displayViewChartForm.action" "chart" )
-    #introListItem( "displayPivotTableForm.action" "pivot_table" )
+    #introListImgItem( "displayViewReportFormVerifyConfiguration.action" "standard_report" "standardreport" )
+    #introListImgItem( "dataSetReport.action" "dataset_report" "datasetreport" )
+    #introListImgItem( "displayViewDataCompletenessForm.action" "data_completeness" "datacompletenessreport" )
+    #introListImgItem( "displayViewDocumentForm.action" "static_report" "staticreport" )
+    #introListImgItem( "tallySheetGenerator.action" "tally_sheet_generator" "tallysheetgenerator" )
+    #introListImgItem( "displayManageTableForm.action" "report_table" "reporttable" )
+    #introListImgItem( "displayViewChartForm.action" "chart" "chart" )
+    #introListImgItem( "displayPivotTableForm.action" "pivot_table" "pivottable" )
 </ul>

=== 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-05-28 19:17:07 +0000
+++ dhis-2/dhis-web/dhis-web-validationrule/src/main/resources/org/hisp/dhis/validationrule/i18n_module.properties	2010-06-19 15:32:24 +0000
@@ -136,13 +136,13 @@
 outlier_analysis = Outlier Analysis
 search_result = Search result
 no_values_found = No values found
-intro_validation_rule = Add, modify, view and delete validation rules. A validation rule defines certain criterias. Anomalies can be discovered by running validation rules against the data.
+intro_validation_rule = Add, modify, view and delete validation rules. Anomalies can be discovered by running validation rules against the data.
 intro_validation_rule_group = Add, modify, view and delete validation rule groups. Provides the ability to group and run validation rules together.
 intro_validation_rule_analysis = Run validation rules in order to unveil anomalies and errors in the data in the database.
-intro_stddevoutlier_analysis = Perform analysis of potential outlier values based on standard deviations. Outlier values can be examined and checked for data capture errors or marked for further follow-up.
-intro_minmaxoutlier_analysis = Perform analysis of potential outlier values based on min and max values. Outlier values can be examined and checked for data capture errors or marked for further follow-up.
-intro_gap_analysis = Perform analysis of potential missing values, referred to as gaps. Missing values can be entered or marked for further follow-up.
-intro_followup_analysis = View or edit data values marked for further follow-up.
+intro_stddevoutlier_analysis = Analyze potential outlier values based on standard deviations. Outlier values can be examined and marked for follow-up.
+intro_minmaxoutlier_analysis = Analyze potential outlier values based on min and max values. Outlier values can be examined and marked for follow-up.
+intro_gap_analysis = Perform analysis of potential missing values, referred to as gaps. Missing values can be entered or marked for follow-up.
+intro_followup_analysis = View or edit data values marked for further follow-up during data entry or analysis.
 view_all = View all
 available_data_elements = Available data elements
 selected_data_elements = Selected data elements

=== modified file 'dhis-2/dhis-web/dhis-web-validationrule/src/main/webapp/dhis-web-validationrule/index.vm'
--- dhis-2/dhis-web/dhis-web-validationrule/src/main/webapp/dhis-web-validationrule/index.vm	2009-12-24 14:47:25 +0000
+++ dhis-2/dhis-web/dhis-web-validationrule/src/main/webapp/dhis-web-validationrule/index.vm	2010-06-19 15:32:24 +0000
@@ -2,11 +2,11 @@
 <h3>$i18n.getString( "dhis-web-validationrule" )</h3>
 
 <ul class="introList">
-    #introListItem( "showValidationRuleForm.action" "validation_rule" )
-    #introListItem( "showValidationRuleGroupForm.action" "validation_rule_group" )
-    #introListItem( "showRunValidationForm.action" "validation_rule_analysis" )
-    #introListItem( "viewAnalysisForm.action?key=stddevoutlier" "stddevoutlier_analysis" )
-    #introListItem( "viewAnalysisForm.action?key=minmaxoutlier" "minmaxoutlier_analysis" )
-    #introListItem( "viewAnalysisForm.action?key=gap" "gap_analysis" )
-    #introListItem( "getAnalysis.action?key=followup" "followup_analysis" )
+    #introListImgItem( "showValidationRuleForm.action" "validation_rule" "validationrule" )
+    #introListImgItem( "showValidationRuleGroupForm.action" "validation_rule_group" "validationrule" )
+    #introListImgItem( "showRunValidationForm.action" "validation_rule_analysis" "validationanalysis" )
+    #introListImgItem( "viewAnalysisForm.action?key=stddevoutlier" "stddevoutlier_analysis" "validationanalysis" )
+    #introListImgItem( "viewAnalysisForm.action?key=minmaxoutlier" "minmaxoutlier_analysis" "validationanalysis" )
+    #introListImgItem( "viewAnalysisForm.action?key=gap" "gap_analysis" "validationanalysis" )
+    #introListImgItem( "getAnalysis.action?key=followup" "followup_analysis" "validationanalysis" )
 </ul>
\ No newline at end of file