=== removed directory 'dhis-2/dhis-web/dhis-web-datamart'
=== removed file 'dhis-2/dhis-web/dhis-web-datamart/pom.xml'
--- dhis-2/dhis-web/dhis-web-datamart/pom.xml	2012-01-24 15:16:55 +0000
+++ dhis-2/dhis-web/dhis-web-datamart/pom.xml	1970-01-01 00:00:00 +0000
@@ -1,66 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  
-  <parent>
-    <groupId>org.hisp.dhis</groupId>
-    <artifactId>dhis-web</artifactId>
-    <version>2.7-SNAPSHOT</version>
-  </parent>
-  
-  <artifactId>dhis-web-datamart</artifactId>
-  <packaging>war</packaging>
-  <name>DHIS Data Mart</name>
-  
-  <build>
-    <finalName>dhis-web-datamart</finalName>
-  </build>
-  
-  <dependencies>
-    
-    <dependency>
-      <groupId>javax.servlet</groupId>
-      <artifactId>servlet-api</artifactId>
-	</dependency>
-	
-    <!-- DHIS -->
-    
-    <dependency>
-      <groupId>org.hisp.dhis</groupId>
-      <artifactId>dhis-web-commons</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.hisp.dhis</groupId>
-      <artifactId>dhis-web-commons-resources</artifactId>
-      <type>war</type>
-    </dependency>
-    <dependency>
-      <groupId>org.hisp.dhis</groupId>
-      <artifactId>dhis-web-api</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.hisp.dhis</groupId>
-      <artifactId>dhis-service-datamart-default</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.hisp.dhis</groupId>
-      <artifactId>dhis-service-reporting</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.hisp.dhis</groupId>
-      <artifactId>dhis-service-core</artifactId>
-    </dependency>
-    
-    <!-- Other -->
-    
-    <dependency>
-      <groupId>org.amplecode</groupId>
-      <artifactId>cave-process</artifactId>
-    </dependency>
-    
-  </dependencies>
-  <properties>
-    <rootDir>../../</rootDir>
-  </properties>
-</project>

=== removed directory 'dhis-2/dhis-web/dhis-web-datamart/src'
=== removed directory 'dhis-2/dhis-web/dhis-web-datamart/src/main'
=== removed directory 'dhis-2/dhis-web/dhis-web-datamart/src/main/java'
=== removed directory 'dhis-2/dhis-web/dhis-web-datamart/src/main/java/org'
=== removed directory 'dhis-2/dhis-web/dhis-web-datamart/src/main/java/org/hisp'
=== removed directory 'dhis-2/dhis-web/dhis-web-datamart/src/main/java/org/hisp/dhis'
=== removed directory 'dhis-2/dhis-web/dhis-web-datamart/src/main/java/org/hisp/dhis/datamart'
=== removed directory 'dhis-2/dhis-web/dhis-web-datamart/src/main/java/org/hisp/dhis/datamart/action'
=== removed file 'dhis-2/dhis-web/dhis-web-datamart/src/main/java/org/hisp/dhis/datamart/action/CancelExportAction.java'
--- dhis-2/dhis-web/dhis-web-datamart/src/main/java/org/hisp/dhis/datamart/action/CancelExportAction.java	2011-12-26 10:07:59 +0000
+++ dhis-2/dhis-web/dhis-web-datamart/src/main/java/org/hisp/dhis/datamart/action/CancelExportAction.java	1970-01-01 00:00:00 +0000
@@ -1,72 +0,0 @@
-package org.hisp.dhis.datamart.action;
-
-/*
- * Copyright (c) 2004-2012, University of Oslo
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * * Redistributions of source code must retain the above copyright notice, this
- *   list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above copyright notice,
- *   this list of conditions and the following disclaimer in the documentation
- *   and/or other materials provided with the distribution.
- * * Neither the name of the HISP project nor the names of its contributors may
- *   be used to endorse or promote products derived from this software without
- *   specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-import static org.hisp.dhis.util.InternalProcessUtil.PROCESS_KEY_DATAMART;
-import static org.hisp.dhis.util.InternalProcessUtil.getCurrentRunningProcess;
-import static org.hisp.dhis.util.InternalProcessUtil.processIsRunning;
-
-import org.amplecode.cave.process.ProcessCoordinator;
-
-import com.opensymphony.xwork2.Action;
-
-/**
- * @author Lars Helge Overland
- * @version $Id$
- */
-public class CancelExportAction
-    implements Action
-{
-    // -------------------------------------------------------------------------
-    // Dependencies
-    // -------------------------------------------------------------------------
-
-    private ProcessCoordinator processCoordinator;
-
-    public void setProcessCoordinator( ProcessCoordinator processCoordinator )
-    {
-        this.processCoordinator = processCoordinator;
-    }
-    
-    // -------------------------------------------------------------------------
-    // Action implementation
-    // -------------------------------------------------------------------------
-
-    public String execute() 
-        throws Exception
-    {
-        if ( processIsRunning( PROCESS_KEY_DATAMART ) )
-        {
-            String id = getCurrentRunningProcess( PROCESS_KEY_DATAMART );
-            
-            processCoordinator.cancelOrInterruptProcess( id );
-        }
-        
-        return SUCCESS;
-    }
-}

=== removed file 'dhis-2/dhis-web/dhis-web-datamart/src/main/java/org/hisp/dhis/datamart/action/ExportDataMartExportAction.java'
--- dhis-2/dhis-web/dhis-web-datamart/src/main/java/org/hisp/dhis/datamart/action/ExportDataMartExportAction.java	2011-12-26 10:07:59 +0000
+++ dhis-2/dhis-web/dhis-web-datamart/src/main/java/org/hisp/dhis/datamart/action/ExportDataMartExportAction.java	1970-01-01 00:00:00 +0000
@@ -1,97 +0,0 @@
-package org.hisp.dhis.datamart.action;
-
-/*
- * Copyright (c) 2004-2012, University of Oslo
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * * Redistributions of source code must retain the above copyright notice, this
- *   list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above copyright notice,
- *   this list of conditions and the following disclaimer in the documentation
- *   and/or other materials provided with the distribution.
- * * Neither the name of the HISP project nor the names of its contributors may
- *   be used to endorse or promote products derived from this software without
- *   specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-import static org.hisp.dhis.datamart.DataMartInternalProcess.PROCESS_TYPE;
-import static org.hisp.dhis.util.InternalProcessUtil.PROCESS_KEY_DATAMART;
-import static org.hisp.dhis.util.InternalProcessUtil.setCurrentRunningProcess;
-
-import org.amplecode.cave.process.ProcessCoordinator;
-import org.amplecode.cave.process.ProcessExecutor;
-import org.hisp.dhis.datamart.DataMartInternalProcess;
-import org.hisp.dhis.user.CurrentUserService;
-
-import com.opensymphony.xwork2.Action;
-
-/**
- * @author Lars Helge Overland
- * @version $Id$
- */
-public class ExportDataMartExportAction
-    implements Action
-{
-    // -------------------------------------------------------------------------
-    // Dependencies
-    // -------------------------------------------------------------------------
-
-    private ProcessCoordinator processCoordinator;
-
-    public void setProcessCoordinator( ProcessCoordinator processCoordinator )
-    {
-        this.processCoordinator = processCoordinator;
-    }
-    
-    private CurrentUserService currentUserService;
-
-    public void setCurrentUserService( CurrentUserService currentUserService )
-    {
-        this.currentUserService = currentUserService;
-    }
-
-    // -------------------------------------------------------------------------
-    // Input
-    // -------------------------------------------------------------------------
-
-    private Integer id;
-
-    public void setId( Integer id )
-    {
-        this.id = id;
-    }
-
-    // -------------------------------------------------------------------------
-    // Action implementation
-    // -------------------------------------------------------------------------
-
-    public String execute()
-    {
-        String owner = currentUserService.getCurrentUsername();
-
-        ProcessExecutor executor = processCoordinator.newProcess( PROCESS_TYPE, owner );
-
-        DataMartInternalProcess process = (DataMartInternalProcess) executor.getProcess();
-                
-        process.setId( id );
-
-        processCoordinator.requestProcessExecution( executor );        
-
-        setCurrentRunningProcess( PROCESS_KEY_DATAMART, executor.getId() );
-        
-        return SUCCESS;
-    }
-}

=== removed file 'dhis-2/dhis-web/dhis-web-datamart/src/main/java/org/hisp/dhis/datamart/action/GetAllDataMartExportsAction.java'
--- dhis-2/dhis-web/dhis-web-datamart/src/main/java/org/hisp/dhis/datamart/action/GetAllDataMartExportsAction.java	2011-12-26 10:07:59 +0000
+++ dhis-2/dhis-web/dhis-web-datamart/src/main/java/org/hisp/dhis/datamart/action/GetAllDataMartExportsAction.java	1970-01-01 00:00:00 +0000
@@ -1,105 +0,0 @@
-package org.hisp.dhis.datamart.action;
-
-/*
- * Copyright (c) 2004-2012, University of Oslo
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * * Redistributions of source code must retain the above copyright notice, this
- *   list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above copyright notice,
- *   this list of conditions and the following disclaimer in the documentation
- *   and/or other materials provided with the distribution.
- * * Neither the name of the HISP project nor the names of its contributors may
- *   be used to endorse or promote products derived from this software without
- *   specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-import static org.apache.commons.lang.StringUtils.isNotBlank;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-import org.hisp.dhis.datamart.DataMartExport;
-import org.hisp.dhis.datamart.DataMartService;
-import org.hisp.dhis.datamart.comparator.DataMartExportComparator;
-import org.hisp.dhis.paging.ActionPagingSupport;
-
-/**
- * @author Lars Helge Overland
- * @version $Id$
- */
-public class GetAllDataMartExportsAction
-    extends ActionPagingSupport<DataMartExport>
-{
-    // -------------------------------------------------------------------------
-    // Dependencies
-    // -------------------------------------------------------------------------
-
-    private DataMartService dataMartService;
-
-    public void setDataMartService( DataMartService dataMartService )
-    {
-        this.dataMartService = dataMartService;
-    }
-
-    // -------------------------------------------------------------------------
-    // Input & Output
-    // -------------------------------------------------------------------------
-
-    private List<DataMartExport> exports;
-
-    public List<DataMartExport> getExports()
-    {
-        return exports;
-    }
-
-    private String key;
-    
-    public String getKey()
-    {
-        return key;
-    }
-
-    public void setKey( String key )
-    {
-        this.key = key;
-    }
-    
-    // -------------------------------------------------------------------------
-    // Action implementation
-    // -------------------------------------------------------------------------
-
-    public String execute()
-    {
-        if ( isNotBlank( key ) )
-        {
-            this.paging = createPaging( dataMartService.getDataMartExportCountByName( key ) );
-            
-            exports = new ArrayList<DataMartExport>( dataMartService.getDataMartExportsBetweenByName( key, paging.getStartPos(), paging.getPageSize() ) );
-        }
-        else
-        {
-            this.paging = createPaging( dataMartService.getDataMartExportCount() );
-
-            exports = new ArrayList<DataMartExport>( dataMartService.getDataMartExportsBetween( paging.getStartPos(), paging.getPageSize() ) );
-        }
-
-        Collections.sort( exports, new DataMartExportComparator() );
-        
-        return SUCCESS;
-    }
-}

=== removed file 'dhis-2/dhis-web/dhis-web-datamart/src/main/java/org/hisp/dhis/datamart/action/GetDataMartExportAction.java'
--- dhis-2/dhis-web/dhis-web-datamart/src/main/java/org/hisp/dhis/datamart/action/GetDataMartExportAction.java	2011-12-26 10:07:59 +0000
+++ dhis-2/dhis-web/dhis-web-datamart/src/main/java/org/hisp/dhis/datamart/action/GetDataMartExportAction.java	1970-01-01 00:00:00 +0000
@@ -1,85 +0,0 @@
-package org.hisp.dhis.datamart.action;
-
-/*
- * Copyright (c) 2004-2012, University of Oslo
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * * Redistributions of source code must retain the above copyright notice, this
- *   list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above copyright notice,
- *   this list of conditions and the following disclaimer in the documentation
- *   and/or other materials provided with the distribution.
- * * Neither the name of the HISP project nor the names of its contributors may
- *   be used to endorse or promote products derived from this software without
- *   specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-import org.hisp.dhis.datamart.DataMartExport;
-import org.hisp.dhis.datamart.DataMartService;
-
-import com.opensymphony.xwork2.Action;
-
-/**
- * @author Lars Helge Overland
- * @version $Id$
- */
-public class GetDataMartExportAction
-    implements Action
-{
-    // -------------------------------------------------------------------------
-    // Dependencies
-    // -------------------------------------------------------------------------
-
-    private DataMartService dataMartService;
-
-    public void setDataMartService( DataMartService dataMartService )
-    {
-        this.dataMartService = dataMartService;
-    }
-
-    // -------------------------------------------------------------------------
-    // Input
-    // -------------------------------------------------------------------------
-
-    private Integer id;
-
-    public void setId( Integer id )
-    {
-        this.id = id;
-    }
-
-    // -------------------------------------------------------------------------
-    // Output
-    // -------------------------------------------------------------------------
-
-    private DataMartExport dataMartExport;
-
-    public DataMartExport getDataMartExport()
-    {
-        return dataMartExport;
-    }
-
-    // -------------------------------------------------------------------------
-    // Action implementation
-    // -------------------------------------------------------------------------
-
-    public String execute()
-    {
-        dataMartExport = dataMartService.getDataMartExport( id );
-        
-        return SUCCESS;
-    }
-}

=== removed file 'dhis-2/dhis-web/dhis-web-datamart/src/main/java/org/hisp/dhis/datamart/action/GetExportStatusAction.java'
--- dhis-2/dhis-web/dhis-web-datamart/src/main/java/org/hisp/dhis/datamart/action/GetExportStatusAction.java	2011-12-26 10:07:59 +0000
+++ dhis-2/dhis-web/dhis-web-datamart/src/main/java/org/hisp/dhis/datamart/action/GetExportStatusAction.java	1970-01-01 00:00:00 +0000
@@ -1,123 +0,0 @@
-package org.hisp.dhis.datamart.action;
-
-/*
- * Copyright (c) 2004-2012, University of Oslo
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * * Redistributions of source code must retain the above copyright notice, this
- *   list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above copyright notice,
- *   this list of conditions and the following disclaimer in the documentation
- *   and/or other materials provided with the distribution.
- * * Neither the name of the HISP project nor the names of its contributors may
- *   be used to endorse or promote products derived from this software without
- *   specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-import static org.hisp.dhis.util.InternalProcessUtil.PROCESS_KEY_DATAMART;
-import static org.hisp.dhis.util.InternalProcessUtil.getCurrentRunningProcess;
-import static org.hisp.dhis.util.InternalProcessUtil.processIsRunning;
-import static org.hisp.dhis.util.InternalProcessUtil.removeCurrentRunningProcess;
-
-import org.amplecode.cave.process.ProcessCoordinator;
-import org.amplecode.cave.process.ProcessExecutor;
-import org.amplecode.cave.process.state.MessageState;
-import org.hisp.dhis.i18n.I18n;
-
-import com.opensymphony.xwork2.Action;
-
-/**
- * @author Lars Helge Overland
- * @version $Id$
- */
-public class GetExportStatusAction
-    implements Action
-{
-    // -------------------------------------------------------------------------
-    // Dependencies
-    // -------------------------------------------------------------------------
-
-    private ProcessCoordinator processCoordinator;
-
-    public void setProcessCoordinator( ProcessCoordinator processCoordinator )
-    {
-        this.processCoordinator = processCoordinator;
-    }
-    
-    private I18n i18n;
-
-    public void setI18n( I18n i18n )
-    {
-        this.i18n = i18n;
-    }
-
-    // -------------------------------------------------------------------------
-    // Output
-    // -------------------------------------------------------------------------
-
-    private String message = "";
-
-    public String getMessage()
-    {
-        return message;
-    }
-    
-    private boolean running = false;
-
-    public boolean isRunning()
-    {
-        return running;
-    }
-
-    // -------------------------------------------------------------------------
-    // Action implementation
-    // -------------------------------------------------------------------------
-
-    public String execute() 
-        throws Exception
-    {    	
-        if ( processIsRunning( PROCESS_KEY_DATAMART ) )
-        {
-            String id = getCurrentRunningProcess( PROCESS_KEY_DATAMART );
-            
-            ProcessExecutor executor = processCoordinator.getProcess( id );  
-            
-            if ( executor != null && executor.getProcess() != null && executor.getState() != null && executor.getState() instanceof MessageState )
-            {
-                MessageState state = (MessageState) executor.getState();         
-                             
-                message = i18n.getString( state.getMessage() );              
-                
-                if ( state.isEnded() || state.isCancelled() )
-                {
-                    processCoordinator.removeCancelledOrEndedProcess( id );
-                    
-                    removeCurrentRunningProcess( PROCESS_KEY_DATAMART );
-                }
-                else
-                {
-                    running = true;
-                }
-            }
-        }
-        else
-        {
-            message =  i18n.getString( "no_export_process_running" );
-        }
-        
-        return SUCCESS;        
-    }
-}

=== removed file 'dhis-2/dhis-web/dhis-web-datamart/src/main/java/org/hisp/dhis/datamart/action/GetOptionsAction.java'
--- dhis-2/dhis-web/dhis-web-datamart/src/main/java/org/hisp/dhis/datamart/action/GetOptionsAction.java	2012-01-20 10:38:11 +0000
+++ dhis-2/dhis-web/dhis-web-datamart/src/main/java/org/hisp/dhis/datamart/action/GetOptionsAction.java	1970-01-01 00:00:00 +0000
@@ -1,277 +0,0 @@
-package org.hisp.dhis.datamart.action;
-
-/*
- * Copyright (c) 2004-2012, University of Oslo
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * * Redistributions of source code must retain the above copyright notice, this
- *   list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above copyright notice,
- *   this list of conditions and the following disclaimer in the documentation
- *   and/or other materials provided with the distribution.
- * * Neither the name of the HISP project nor the names of its contributors may
- *   be used to endorse or promote products derived from this software without
- *   specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.Date;
-import java.util.List;
-
-import org.hisp.dhis.dataelement.DataElement;
-import org.hisp.dhis.datamart.DataMartExport;
-import org.hisp.dhis.datamart.DataMartService;
-import org.hisp.dhis.indicator.Indicator;
-import org.hisp.dhis.organisationunit.OrganisationUnit;
-import org.hisp.dhis.organisationunit.OrganisationUnitLevel;
-import org.hisp.dhis.organisationunit.OrganisationUnitService;
-import org.hisp.dhis.period.MonthlyPeriodType;
-import org.hisp.dhis.period.Period;
-import org.hisp.dhis.period.PeriodService;
-import org.hisp.dhis.period.PeriodType;
-import org.hisp.dhis.period.comparator.PeriodComparator;
-import org.hisp.dhis.system.filter.PastAndCurrentPeriodFilter;
-import org.hisp.dhis.system.util.FilterUtils;
-
-import com.opensymphony.xwork2.Action;
-
-/**
- * @author Lars Helge Overland
- * @version $Id: GetOptionsAction.java 6256 2008-11-10 17:10:30Z larshelg $
- */
-public class GetOptionsAction
-    implements Action
-{
-    // -------------------------------------------------------------------------
-    // Dependencies
-    // -------------------------------------------------------------------------
-
-    private PeriodService periodService;
-
-    public void setPeriodService( PeriodService periodService )
-    {
-        this.periodService = periodService;
-    }
-
-    private OrganisationUnitService organisationUnitService;
-
-    public void setOrganisationUnitService( OrganisationUnitService organisationUnitService )
-    {
-        this.organisationUnitService = organisationUnitService;
-    }
-
-    private DataMartService dataMartService;
-
-    public void setDataMartService( DataMartService dataMartService )
-    {
-        this.dataMartService = dataMartService;
-    }
-    
-    // -------------------------------------------------------------------------
-    // Constants
-    // -------------------------------------------------------------------------
-
-    private final static int ALL = 0;
-
-    public int getALL()
-    {
-        return ALL;
-    }
-
-    private final static int DATAVALUE = 1;
-
-    public int getDATAVALUE()
-    {
-        return DATAVALUE;
-    }
-
-    private final static int INDICATORVALUE = 2;
-
-    public int getINDICATORVALUE()
-    {
-        return INDICATORVALUE;
-    }
-
-    // -------------------------------------------------------------------------
-    // Input
-    // -------------------------------------------------------------------------
-
-    private Integer id;
-
-    public Integer getId()
-    {
-        return id;
-    }
-    
-    public void setId( Integer id )
-    {
-        this.id = id;
-    }
-    
-    // -------------------------------------------------------------------------
-    // Output
-    // -------------------------------------------------------------------------
-
-    private List<OrganisationUnitLevel> levels;
-
-    public List<OrganisationUnitLevel> getLevels()
-    {
-        return levels;
-    }
-    
-    private List<Period> periods = new ArrayList<Period>();
-
-    public List<Period> getPeriods()
-    {
-        return periods;
-    }
-
-    private Collection<PeriodType> periodTypes;
-
-    public Collection<PeriodType> getPeriodTypes()
-    {
-        return periodTypes;
-    }
-    
-    private List<DataElement> selectedDataElements;
-
-    public List<DataElement> getSelectedDataElements()
-    {
-        return selectedDataElements;
-    }
-
-    private List<Indicator> selectedIndicators;
-
-    public List<Indicator> getSelectedIndicators()
-    {
-        return selectedIndicators;
-    }
-
-    private List<OrganisationUnit> selectedOrganisationUnits;
-
-    public List<OrganisationUnit> getSelectedOrganisationUnits()
-    {
-        return selectedOrganisationUnits;
-    }
-
-    private List<Period> selectedPeriods;
-
-    public List<Period> getSelectedPeriods()
-    {
-        return selectedPeriods;
-    }
-    
-    private DataMartExport export;
-
-    public DataMartExport getExport()
-    {
-        return export;
-    }
-
-    // -------------------------------------------------------------------------
-    // Comparator
-    // -------------------------------------------------------------------------
-
-    private Comparator<DataElement> dataElementComparator;
-
-    public void setDataElementComparator( Comparator<DataElement> dataElementComparator )
-    {
-        this.dataElementComparator = dataElementComparator;
-    }
-
-    private Comparator<Indicator> indicatorComparator;
-
-    public void setIndicatorComparator( Comparator<Indicator> indicatorComparator )
-    {
-        this.indicatorComparator = indicatorComparator;
-    }
-    
-    private Comparator<OrganisationUnit> organisationUnitComparator;
-
-    public void setOrganisationUnitComparator( Comparator<OrganisationUnit> organisationUnitComparator )
-    {
-        this.organisationUnitComparator = organisationUnitComparator;
-    }
-
-    // -------------------------------------------------------------------------
-    // Action implementation
-    // -------------------------------------------------------------------------
-
-    public String execute()
-        throws Exception
-    {
-        
-        // ---------------------------------------------------------------------
-        // Level
-        // ---------------------------------------------------------------------
-
-        levels = organisationUnitService.getOrganisationUnitLevels();
-        
-        // ---------------------------------------------------------------------
-        // Period type
-        // ---------------------------------------------------------------------
-
-        periodTypes = periodService.getAllPeriodTypes();
-
-        // ---------------------------------------------------------------------
-        // Period
-        // ---------------------------------------------------------------------
-
-        periods = new MonthlyPeriodType().generatePeriods( new Date() );
-
-        Collections.reverse( periods );
-        FilterUtils.filter( periods, new PastAndCurrentPeriodFilter() );
-        
-        if ( id != null )
-        {
-            export = dataMartService.getDataMartExport( id );
-            
-            // -----------------------------------------------------------------
-            // Data element
-            // -----------------------------------------------------------------
-
-            selectedDataElements = new ArrayList<DataElement>( export.getDataElements() );
-            Collections.sort( selectedDataElements, dataElementComparator );
-            
-            // ---------------------------------------------------------------------
-            // Indicator
-            // ---------------------------------------------------------------------
-
-            selectedIndicators = new ArrayList<Indicator>( export.getIndicators() );
-            Collections.sort( selectedIndicators, indicatorComparator );
-            
-            // ---------------------------------------------------------------------
-            // Organisation unit
-            // ---------------------------------------------------------------------
-
-            selectedOrganisationUnits = new ArrayList<OrganisationUnit>( export.getOrganisationUnits() );
-            Collections.sort( selectedOrganisationUnits, organisationUnitComparator );
-            
-            // ---------------------------------------------------------------------
-            // Period
-            // ---------------------------------------------------------------------
-
-            selectedPeriods = new ArrayList<Period>( export.getPeriods() );
-            Collections.sort( selectedPeriods, new PeriodComparator() );
-            periods.removeAll( selectedPeriods );
-        }
-        
-        return SUCCESS;
-    }
-}

=== removed file 'dhis-2/dhis-web/dhis-web-datamart/src/main/java/org/hisp/dhis/datamart/action/NoAction.java'
--- dhis-2/dhis-web/dhis-web-datamart/src/main/java/org/hisp/dhis/datamart/action/NoAction.java	2011-12-26 10:07:59 +0000
+++ dhis-2/dhis-web/dhis-web-datamart/src/main/java/org/hisp/dhis/datamart/action/NoAction.java	1970-01-01 00:00:00 +0000
@@ -1,43 +0,0 @@
-package org.hisp.dhis.datamart.action;
-
-/*
- * Copyright (c) 2004-2012, University of Oslo
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * * Redistributions of source code must retain the above copyright notice, this
- *   list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above copyright notice,
- *   this list of conditions and the following disclaimer in the documentation
- *   and/or other materials provided with the distribution.
- * * Neither the name of the HISP project nor the names of its contributors may
- *   be used to endorse or promote products derived from this software without
- *   specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-import com.opensymphony.xwork2.Action;
-
-/**
- * @author Lars Helge Overland
- * @version $Id: NoAction.java 2869 2007-02-20 14:26:09Z andegje $
- */
-public class NoAction
-    implements Action
-{
-    public String execute()
-    {
-        return SUCCESS;
-    }
-}

=== removed file 'dhis-2/dhis-web/dhis-web-datamart/src/main/java/org/hisp/dhis/datamart/action/RemoveDataMartExportAction.java'
--- dhis-2/dhis-web/dhis-web-datamart/src/main/java/org/hisp/dhis/datamart/action/RemoveDataMartExportAction.java	2011-12-26 10:07:59 +0000
+++ dhis-2/dhis-web/dhis-web-datamart/src/main/java/org/hisp/dhis/datamart/action/RemoveDataMartExportAction.java	1970-01-01 00:00:00 +0000
@@ -1,70 +0,0 @@
-package org.hisp.dhis.datamart.action;
-
-/*
- * Copyright (c) 2004-2012, University of Oslo
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * * Redistributions of source code must retain the above copyright notice, this
- *   list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above copyright notice,
- *   this list of conditions and the following disclaimer in the documentation
- *   and/or other materials provided with the distribution.
- * * Neither the name of the HISP project nor the names of its contributors may
- *   be used to endorse or promote products derived from this software without
- *   specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-import org.hisp.dhis.datamart.DataMartExport;
-import org.hisp.dhis.datamart.DataMartService;
-
-import com.opensymphony.xwork2.Action;
-
-/**
- * @author Lars Helge Overland
- * @version $Id$
- */
-public class RemoveDataMartExportAction
-    implements Action
-{
-    private DataMartService dataMartService;
-
-    public void setDataMartService( DataMartService dataMartService )
-    {
-        this.dataMartService = dataMartService;
-    }
-
-    private Integer id;
-
-    public void setId( Integer id )
-    {
-        this.id = id;
-    }
-
-    public String execute()
-    {
-        if ( id != null )
-        {
-            DataMartExport export = dataMartService.getDataMartExport( id );
-            
-            if ( export != null )
-            {
-                dataMartService.deleteDataMartExport( export );
-            }
-        }
-        
-        return SUCCESS;
-    }
-}

=== removed file 'dhis-2/dhis-web/dhis-web-datamart/src/main/java/org/hisp/dhis/datamart/action/SaveDataMartExportAction.java'
--- dhis-2/dhis-web/dhis-web-datamart/src/main/java/org/hisp/dhis/datamart/action/SaveDataMartExportAction.java	2011-12-26 10:07:59 +0000
+++ dhis-2/dhis-web/dhis-web-datamart/src/main/java/org/hisp/dhis/datamart/action/SaveDataMartExportAction.java	1970-01-01 00:00:00 +0000
@@ -1,224 +0,0 @@
-package org.hisp.dhis.datamart.action;
-
-/*
- * Copyright (c) 2004-2012, University of Oslo
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * * Redistributions of source code must retain the above copyright notice, this
- *   list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above copyright notice,
- *   this list of conditions and the following disclaimer in the documentation
- *   and/or other materials provided with the distribution.
- * * Neither the name of the HISP project nor the names of its contributors may
- *   be used to endorse or promote products derived from this software without
- *   specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-import static org.hisp.dhis.system.util.ConversionUtils.getIntegerCollection;
-import static org.hisp.dhis.system.util.ConversionUtils.getSet;
-
-import java.util.ArrayList;
-import java.util.Collection;
-
-import org.hisp.dhis.dataelement.DataElementService;
-import org.hisp.dhis.datamart.DataMartExport;
-import org.hisp.dhis.datamart.DataMartService;
-import org.hisp.dhis.indicator.IndicatorService;
-import org.hisp.dhis.organisationunit.OrganisationUnitService;
-import org.hisp.dhis.period.PeriodService;
-import org.hisp.dhis.period.RelativePeriods;
-
-import com.opensymphony.xwork2.Action;
-
-/**
- * @author Lars Helge Overland
- * @version $Id$
- */
-public class SaveDataMartExportAction
-    implements Action
-{
-    // -------------------------------------------------------------------------
-    // Dependencies
-    // -------------------------------------------------------------------------
-
-    private DataMartService dataMartService;
-
-    public void setDataMartService( DataMartService dataMartService )
-    {
-        this.dataMartService = dataMartService;
-    }
-
-    private DataElementService dataElementService;
-
-    public void setDataElementService( DataElementService dataElementService )
-    {
-        this.dataElementService = dataElementService;
-    }
-
-    private IndicatorService indicatorService;
-
-    public void setIndicatorService( IndicatorService indicatorService )
-    {
-        this.indicatorService = indicatorService;
-    }
-
-    private PeriodService periodService;
-
-    public void setPeriodService( PeriodService periodService )
-    {
-        this.periodService = periodService;
-    }
-
-    private OrganisationUnitService organisationUnitService;
-
-    public void setOrganisationUnitService( OrganisationUnitService organisationUnitService )
-    {
-        this.organisationUnitService = organisationUnitService;
-    }
-
-    // -------------------------------------------------------------------------
-    // Input
-    // -------------------------------------------------------------------------
-    
-    private Integer id;
-
-    public void setId( Integer id )
-    {
-        this.id = id;
-    }
-    
-    private String name;
-
-    public void setName( String name )
-    {
-        this.name = name;
-    }
-    
-    private Collection<String> selectedDataElements = new ArrayList<String>();
-    
-    public void setSelectedDataElements( Collection<String> selectedDataElements )
-    {
-        this.selectedDataElements = selectedDataElements;
-    }
-
-    private Collection<String> selectedIndicators = new ArrayList<String>();
-
-    public void setSelectedIndicators( Collection<String> selectedIndicators )
-    {
-        this.selectedIndicators = selectedIndicators;
-    }
-
-    private Collection<String> selectedPeriods = new ArrayList<String>(); 
-    
-    public void setSelectedPeriods( Collection<String> selectedPeriods )
-    {
-        this.selectedPeriods = selectedPeriods;
-    }
-
-    private Collection<String> selectedOrganisationUnits = new ArrayList<String>();
-    
-    public void setSelectedOrganisationUnits( Collection<String> selectedOrganisationUnits )
-    {
-        this.selectedOrganisationUnits = selectedOrganisationUnits;
-    }
-
-    private boolean reportingMonth;
-
-    public void setReportingMonth( boolean reportingMonth )
-    {
-        this.reportingMonth = reportingMonth;
-    }
-
-    private boolean reportingBimonth;
-    
-    public void setReportingBimonth( boolean reportingBimonth )
-    {
-        this.reportingBimonth = reportingBimonth;
-    }
-    
-    private boolean reportingQuarter;
-
-    public void setReportingQuarter( boolean reportingQuarter )
-    {
-        this.reportingQuarter = reportingQuarter;
-    }
-
-    private boolean monthsThisYear;
-
-    public void setMonthsThisYear( boolean monthsThisYear )
-    {
-        this.monthsThisYear = monthsThisYear;
-    }
-
-    private boolean quartersThisYear;
-
-    public void setQuartersThisYear( boolean quartersThisYear )
-    {
-        this.quartersThisYear = quartersThisYear;
-    }
-
-    private boolean thisYear;
-
-    public void setThisYear( boolean thisYear )
-    {
-        this.thisYear = thisYear;
-    }
-
-    private boolean monthsLastYear;
-
-    public void setMonthsLastYear( boolean monthsLastYear )
-    {
-        this.monthsLastYear = monthsLastYear;
-    }
-
-    private boolean quartersLastYear;
-
-    public void setQuartersLastYear( boolean quartersLastYear )
-    {
-        this.quartersLastYear = quartersLastYear;
-    }
-
-    private boolean lastYear;
-    
-    public void setLastYear( boolean lastYear )
-    {
-        this.lastYear = lastYear;
-    }
-
-    // -------------------------------------------------------------------------
-    // Action implementation
-    // -------------------------------------------------------------------------
-    
-    public String execute()
-    {
-        DataMartExport export = id == null ? new DataMartExport() : dataMartService.getDataMartExport( id );
-
-        RelativePeriods relatives = new RelativePeriods( reportingMonth, reportingBimonth, reportingQuarter, false,
-            monthsThisYear, quartersThisYear, thisYear, 
-            monthsLastYear, quartersLastYear, lastYear, false, false, false, false, false );
-          
-        export.setName( name );            
-        export.setDataElements( getSet( dataElementService.getDataElements( getIntegerCollection( selectedDataElements ) ) ) );
-        export.setIndicators( getSet( indicatorService.getIndicators( getIntegerCollection( selectedIndicators ) ) ) );
-        export.setOrganisationUnits( getSet( organisationUnitService.getOrganisationUnits( getIntegerCollection( selectedOrganisationUnits ) ) ) );
-        export.setPeriods( getSet( periodService.getPeriodsByExternalIds( selectedPeriods ) ) );
-        export.setRelatives( relatives );
-        
-        dataMartService.saveDataMartExport( export );
-        
-        return SUCCESS;
-    }
-}

=== removed file 'dhis-2/dhis-web/dhis-web-datamart/src/main/java/org/hisp/dhis/datamart/action/ValidateDataMartExportAction.java'
--- dhis-2/dhis-web/dhis-web-datamart/src/main/java/org/hisp/dhis/datamart/action/ValidateDataMartExportAction.java	2011-12-26 10:07:59 +0000
+++ dhis-2/dhis-web/dhis-web-datamart/src/main/java/org/hisp/dhis/datamart/action/ValidateDataMartExportAction.java	1970-01-01 00:00:00 +0000
@@ -1,127 +0,0 @@
-package org.hisp.dhis.datamart.action;
-
-/*
- * Copyright (c) 2004-2012, University of Oslo
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * * Redistributions of source code must retain the above copyright notice, this
- *   list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above copyright notice,
- *   this list of conditions and the following disclaimer in the documentation
- *   and/or other materials provided with the distribution.
- * * Neither the name of the HISP project nor the names of its contributors may
- *   be used to endorse or promote products derived from this software without
- *   specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-import org.hisp.dhis.datamart.DataMartExport;
-import org.hisp.dhis.datamart.DataMartService;
-import org.hisp.dhis.i18n.I18n;
-
-import com.opensymphony.xwork2.Action;
-
-/**
- * @author Lars Helge Overland
- * @version $Id$
- */
-public class ValidateDataMartExportAction
-    implements Action
-{
-    // -------------------------------------------------------------------------
-    // Dependencies
-    // -------------------------------------------------------------------------
-
-    private DataMartService dataMartService;
-
-    public void setDataMartService( DataMartService dataMartService )
-    {
-        this.dataMartService = dataMartService;
-    }
-
-    private I18n i18n;
-
-    public void setI18n( I18n i18n )
-    {
-        this.i18n = i18n;
-    }
-
-    // -------------------------------------------------------------------------
-    // Input
-    // -------------------------------------------------------------------------
-
-    private Integer id;
-
-    public void setId( Integer id )
-    {
-        this.id = id;
-    }
-
-    private String name;
-
-    public void setName( String name )
-    {
-        this.name = name;
-    }
-    
-    // -------------------------------------------------------------------------
-    // Output
-    // -------------------------------------------------------------------------
-
-    private String message;
-
-    public String getMessage()
-    {
-        return message;
-    }
-
-    // -------------------------------------------------------------------------
-    // Action implementation
-    // -------------------------------------------------------------------------
-
-    public String execute()
-    {
-        if ( name == null )
-        {
-            message = i18n.getString( "specify_name" );
-
-            return INPUT;
-        }
-        else
-        {
-            name = name.trim();
-
-            if ( name.length() == 0 )
-            {
-                message = i18n.getString( "specify_name" );
-
-                return INPUT;
-            }
-
-            DataMartExport match = dataMartService.getDataMartExportByName( name );
-
-            if ( match != null && ( id == null || match.getId() != id ) )
-            {
-                message = i18n.getString( "name_in_use" );
-
-                return INPUT;
-            }
-        }
-        
-        
-        
-        return SUCCESS;
-    }
-}

=== removed directory 'dhis-2/dhis-web/dhis-web-datamart/src/main/resources'
=== removed directory 'dhis-2/dhis-web/dhis-web-datamart/src/main/resources/META-INF'
=== removed directory 'dhis-2/dhis-web/dhis-web-datamart/src/main/resources/META-INF/dhis'
=== removed file 'dhis-2/dhis-web/dhis-web-datamart/src/main/resources/META-INF/dhis/beans.xml'
--- dhis-2/dhis-web/dhis-web-datamart/src/main/resources/META-INF/dhis/beans.xml	2012-01-05 20:39:23 +0000
+++ dhis-2/dhis-web/dhis-web-datamart/src/main/resources/META-INF/dhis/beans.xml	1970-01-01 00:00:00 +0000
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="
-http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd">
-	
-  <!-- DataMart -->
-
-  <bean id="org.hisp.dhis.datamart.action.ExportDataMartExportAction" class="org.hisp.dhis.datamart.action.ExportDataMartExportAction"
-    scope="prototype">
-    <property name="processCoordinator" ref="processCoordinator" />
-    <property name="currentUserService" ref="org.hisp.dhis.user.CurrentUserService" />
-  </bean>
-
-  <bean id="org.hisp.dhis.datamart.action.GetExportStatusAction" class="org.hisp.dhis.datamart.action.GetExportStatusAction"
-    scope="prototype">
-    <property name="processCoordinator" ref="processCoordinator" />
-  </bean>
-
-  <bean id="org.hisp.dhis.datamart.action.CancelExportAction" class="org.hisp.dhis.datamart.action.CancelExportAction"
-    scope="prototype">
-    <property name="processCoordinator" ref="processCoordinator" />
-  </bean>
-
-  <bean id="org.hisp.dhis.datamart.action.GetOptionsAction" class="org.hisp.dhis.datamart.action.GetOptionsAction"
-    scope="prototype">
-    <property name="organisationUnitService" ref="org.hisp.dhis.organisationunit.OrganisationUnitService" />
-    <property name="periodService" ref="org.hisp.dhis.period.PeriodService" />
-    <property name="dataMartService" ref="org.hisp.dhis.datamart.DataMartService" />
-  </bean>
-  
-  <!-- DataMartExport -->
-
-  <bean id="org.hisp.dhis.datamart.action.SaveDataMartExportAction" class="org.hisp.dhis.datamart.action.SaveDataMartExportAction"
-    scope="prototype">
-    <property name="dataMartService" ref="org.hisp.dhis.datamart.DataMartService" />
-    <property name="dataElementService" ref="org.hisp.dhis.dataelement.DataElementService" />
-    <property name="indicatorService" ref="org.hisp.dhis.indicator.IndicatorService" />
-    <property name="periodService" ref="org.hisp.dhis.period.PeriodService" />
-    <property name="organisationUnitService" ref="org.hisp.dhis.organisationunit.OrganisationUnitService" />
-  </bean>
-
-  <bean id="org.hisp.dhis.datamart.action.GetAllDataMartExportsAction" class="org.hisp.dhis.datamart.action.GetAllDataMartExportsAction"
-    scope="prototype">
-    <property name="dataMartService" ref="org.hisp.dhis.datamart.DataMartService" />
-  </bean>
-
-  <bean id="org.hisp.dhis.datamart.action.RemoveDataMartExportAction" class="org.hisp.dhis.datamart.action.RemoveDataMartExportAction"
-    scope="prototype">
-    <property name="dataMartService" ref="org.hisp.dhis.datamart.DataMartService" />
-  </bean>
-
-  <bean id="org.hisp.dhis.datamart.action.GetDataMartExportAction" class="org.hisp.dhis.datamart.action.GetDataMartExportAction"
-    scope="prototype">
-    <property name="dataMartService" ref="org.hisp.dhis.datamart.DataMartService" />
-  </bean>
-
-  <bean id="org.hisp.dhis.datamart.action.ValidateDataMartExportAction" class="org.hisp.dhis.datamart.action.ValidateDataMartExportAction"
-    scope="prototype">
-    <property name="dataMartService" ref="org.hisp.dhis.datamart.DataMartService" />
-  </bean>
-
-</beans>

=== removed directory 'dhis-2/dhis-web/dhis-web-datamart/src/main/resources/org'
=== removed directory 'dhis-2/dhis-web/dhis-web-datamart/src/main/resources/org/hisp'
=== removed directory 'dhis-2/dhis-web/dhis-web-datamart/src/main/resources/org/hisp/dhis'
=== removed directory 'dhis-2/dhis-web/dhis-web-datamart/src/main/resources/org/hisp/dhis/datamart'
=== removed file 'dhis-2/dhis-web/dhis-web-datamart/src/main/resources/org/hisp/dhis/datamart/i18n_module.properties'
--- dhis-2/dhis-web/dhis-web-datamart/src/main/resources/org/hisp/dhis/datamart/i18n_module.properties	2011-12-14 08:10:22 +0000
+++ dhis-2/dhis-web/dhis-web-datamart/src/main/resources/org/hisp/dhis/datamart/i18n_module.properties	1970-01-01 00:00:00 +0000
@@ -1,82 +0,0 @@
-move_selected= Move selected
-move_all= Move all
-move_children= Move children of the selected unit
-remove_selected= Remove selected
-remove_all= Remove all
-available_dataelements= Available data elements
-selected_dataelements= Selected data elements
-select_dataelementgroup_all= Select data element group / All
-available_indicators= Available indicators
-selected_indicators= Selected indicators
-select_indicatorgroup_all= Select indicator group / All
-available_organisationunits= Available organisation units
-selected_organisationunits= Selected organisation units
-select_organisationunit_level_all= Select organisation unit level / All
-level= Level
-available_periods= Available periods
-selected_periods= Selected periods
-select_period_type_all= Select period type / All
-export= Export
-select_min_datatype= Select at least one data type
-select_min_level= Select at least one level
-select_min_period= Select at least one period
-_values_were_exported_in= values were exported in
-available_levels= Available levels
-selected_levels= Selected levels
-datamart= Data Mart
-datamart_export= Data mart export
-available_datatypes= Available data types
-selected_datatypes= Selected data types
-dataelements= Dataelements
-select_options= No options selected
-nr_of_comb= Number of combinations
-values= values
-second= second
-deleting_existing_aggregated_data= Deleting existing aggregated data
-crosstabulating_data= Crosstabulating data
-exporting_data_for_data_elements= Exporting data for data elements
-exporting_data_for_calculated_data_elements=Exporting data for calculated data elements
-exporting_data_for_indicators= Exporting data for indicators
-export_process_done= Export process done
-completed= Completed
-process_completed= Export process completed
-process_started=Export process started
-process_failed=Export process failed - See log for details
-no_export_process_running= No export process running
-export_process_not_initialized= Export process not initalized
-datamart_intro= Please select an item from the menu.
-export_saved= Export saved
-data_mart_export_management=Data mart export management
-confirm_delete_data_mart_export= Are you sure you want to delete datamart export?
-number_of_data_elements= Number of data elements
-number_of_indicators= Number of indicators
-number_of_organisation_units= Number of organisation units
-number_of_periods= Number of periods
-must_select_at_least_one_dataelement_or_indicator= Please select at least one dataelement or indicator
-must_select_at_least_one_organisation_unit= Please select at least one organisation unit
-must_select_at_least_one_period= Please select at least one period
-specify_name= Please specify a name
-name_in_use= The name is already in use
-data_mart= Data Mart
-generate_data_mart= Generate data mart
-add_to_dashboard=Add to dashboard
-confirm_add_to_dashboard=Are you sure you want to add this data mart export to the dashboard?
-export_to_datamart=Export to data mart
-could_not_export_too_many_data_elements=Could not export because too many data elements were selected
-export_process_failed=Export process failed - See log for details
-relative_periods= Relative periods
-reporting_month= Reporting month
-months_this_year=Months this year
-quarters_this_year=Quarters this year
-this_year=This year
-months_last_year=Months last year
-quarters_last_year=Quarters last year
-last_year=Last year
-prev=Prev
-next=Next
-start=Start
-stop=Stop
-refresh=Refresh
-intro_data_mart_export=Create data mart exports. Data mart exports contains data elements, indicators, organisation units and periods.
-intro_data_mart_scheduling=Set up and manage scheduled data mart exports, which will run at 2 AM every night for periods of this year.
-data_mart_export=Data Mart Export
\ No newline at end of file

=== removed file 'dhis-2/dhis-web/dhis-web-datamart/src/main/resources/org/hisp/dhis/datamart/i18n_module_am_ET.properties'
--- dhis-2/dhis-web/dhis-web-datamart/src/main/resources/org/hisp/dhis/datamart/i18n_module_am_ET.properties	2011-12-14 08:10:22 +0000
+++ dhis-2/dhis-web/dhis-web-datamart/src/main/resources/org/hisp/dhis/datamart/i18n_module_am_ET.properties	1970-01-01 00:00:00 +0000
@@ -1,47 +0,0 @@
-#Resource generated by I18n Resource Editor
-#Fri Mar 23 00:49:26 CET 2007
-available_organisationunits=\u12EB\u1209 \u12E8\u1324\u1293 \u12F5\u122D\u1305\u1276\u127D
-available_periods=\u12EB\u1209 \u12C8\u1245\u1276\u127D
-simple_datamart_export=\u1240\u120B\u120D \u12E8\u12F3\u1273\u121B\u122D\u1275 \u12A4\u12AD\u1235\u1356\u122D\u1275
-available_dataelements=\u12EB\u1209 \u12E8\u1324\u1293 \u12A0\u1308\u120D\u130D\u120E\u1275
-hours=\u1230\u12D3\u1275
-level=\u12A5\u122D\u12A8\u1295
-simple_export=\u1240\u120B\u120D \u12A4\u12AD\u1235\u1356\u122D\u1275
-available_levels=\u12EB\u1209 \u12D5\u122D\u12A8\u1296\u127D
-clearing_datamart=\u12F3\u1273 \u121B\u122D\u1275 \u121B\u1345\u12F3\u1275\u2026..
-selected_datatypes=\u12E8\u1270\u1218\u1228\u1321 \u12E8\u12F3\u1273 \u12D3\u12ED\u1290\u1276\u127D
-selected_dataelements=\u1201\u1295\u1209\u121D \u12E8\u1324\u1293 \u12A0\u1308\u120D\u130D\u120E\u1275 \u12D8\u122D\u134E\u127D \u12D3\u12ED\u1290\u1276\u127D \u121D\u1228\u1325
-seconds=\u1230\u12A8\u1295\u12F6\u127D
-estimated_time=\u12E8\u1270\u1270\u1218\u1290\u12CD \u130D\u12DC
-structures_generated=\u12A5\u1235\u1275\u122B\u12AD\u1278\u122D \u1270\u1348\u1325\u122F\u120D
-generating_structures=\u1235\u1275\u122B\u12AD\u1278\u122D \u12A5\u12E8\u1270\u1348\u1320\u1228 \u1290\u12CD
-_values_were_exported=\u12A4\u12AD\u1235\u1353\u122D\u1275\u12F5
-available_indicators=\u12EB\u1209 \u1320\u124B\u121A\u12CE\u127D
-selected_periods=\u12E8\u1270\u1218\u1228\u1321 \u12C8\u1245\u1276\u127D
-datamart=\u12F3\u1273 \u121B\u122D\u1275
-advanced_datamart_export=\u1228\u1242\u1245 \u12F3\u1273\u121B\u122D\u1275 \u12A4\u12AD\u1235\u1356\u122D\u1275
-select_min_period=\u1262\u12EB\u1295\u1235 \u12A0\u1290\u12F5 \u12C8\u1245\u1275 \u121D\u1228\u1325
-datamart_cleared=\u12F3\u1273 \u121B\u122D\u1275 \u1340\u12F5\u1277\u120D
-confirm_clear_message=\u12F3\u1273 \u121B\u122D\u1275 \u121B\u1345\u12F3\u1275 \u1235\u1208\u1218\u1348\u1208\u130D\u1205 \u12A5\u122D\u130D\u1320\u129B \u1290\u1205
-generate_structures=\u1235\u1275\u122B\u12AD\u1278\u122D \u134D\u1320\u122D
-export_to_datamart=\u12A4\u12AD\u1235\u1356\u122D\u1275 \u12C8\u12F0 \u12F3\u1273 \u121B\u122D\u1275
-indicators=\u1322\u124B\u121A\u12CE\u127D
-select_min_level=\u1262\u12EB\u1295\u1235 \u12A0\u1290\u12F5 \u12D5\u122D\u12A8\u1295 \u121D\u1228\u1325
-clear=\u12A0\u1345\u12F3
-select_period_type_all=\u1201\u1295\u1209\u121D \u12E8\u12C8\u1245\u1275 \u12D3\u12ED\u1290\u1276\u127D \u121D\u1228\u1325
-selected_indicators=\u12E8\u1270\u1218\u1228\u1321 \u1322\u124B\u121A\u12CE\u127D
-dataelements=\u12E8\u1324\u1293 \u12A0\u1308\u120D\u130D\u120E\u1275 \u12D8\u122D\u134E\u127D
-minutes=\u12F0\u1242\u1243\u12CE\u127D
-organisation_unit_structure=\u12E8\u1324\u1293 \u12F5\u122D\u1305\u1276\u127D \u12A0\u12F0\u1228\u1303\u1300\u1275
-select_indicatorgroup_all=\u12E8\u1324\u1293 \u1322\u124B\u121A\u12CE\u127D \u1261\u12F5\u1295/\u1201\u1295\u1209\u121D \u121D\u1228\u1325
-select_min_datatype=\u1262\u12EB\u1295\u1235 \u12A0\u1290\u12F5 \u12E8\u12F3\u1273 \u12D3\u12ED\u1290\u1275 \u121D\u1228\u1325
-select_options=\u121D\u1295\u121D \u12A0\u120D\u1270\u1218\u1228\u1320\u121D
-available_datatypes=\u12EB\u1209 \u12E8\u12F3\u1273 \u12A0\u12ED\u1290\u1276\u127D
-advanced_export=\u1228\u1242\u1245 \u12A4\u12AD\u1235\u1356\u122D\u1275
-selected_levels=\u12E8\u1270\u1218\u1228\u1321 \u12A5\u122D\u12A8\u1296\u127D
-selected_organisationunits=\u12E8\u1270\u1218\u1228\u1321 \u12E8\u1324\u1293 \u12F5\u122D\u1305\u1276\u127D
-group_set_structure=\n\u12E8\u1324\u1293 \u12F5\u122D\u1305\u1275 \u1261\u12F5\u1295\n
-exporting_values=\u12A4\u12AD\u1235\u1356\u122D\u1275 \u12A5\u12E8\u1270\u12F0\u1228\u1308 \u1290\u12CD
-select_organisationunit_level_all=\u1201\u1295\u1209\u121D \u12E8\u1324\u1293 \u12F5\u122D\u1305\u1276\u127D \u121D\u1228\u1325
-select_dataelementgroup_all=\u12E8\u1324\u1293 \u12A0\u1308\u120D\u130D\u120E\u1275 \u12D8\u122D\u134E\u127D \u1261\u12F5\u1295/\u1201\u1295\u1209\u121D \u121D\u1228\u1325
-export=\u12A4\u12AD\u1235\u1356\u122D\u1275

=== removed file 'dhis-2/dhis-web/dhis-web-datamart/src/main/resources/org/hisp/dhis/datamart/i18n_module_ar_SY.properties'
--- dhis-2/dhis-web/dhis-web-datamart/src/main/resources/org/hisp/dhis/datamart/i18n_module_ar_SY.properties	2011-12-14 08:10:22 +0000
+++ dhis-2/dhis-web/dhis-web-datamart/src/main/resources/org/hisp/dhis/datamart/i18n_module_ar_SY.properties	1970-01-01 00:00:00 +0000
@@ -1,45 +0,0 @@
-available_organisationunits=\u0627\u0641\u0627\u064A\u0644\u0627\u0628\u0644\u064A \u062D\u062F\u0627\u062A \u0627\u0644\u0645\u0646\u0638\u0645\u0647
-available_periods=\u0627\u0644\u0641\u062A\u0631\u0627\u062A \u0627\u0644\u0645\u062A\u0627\u062D\u0629
-simple_datamart_export=\u0628\u064A\u0627\u0646\u0627\u062A \u0628\u0633\u064A\u0637\u0629 \u0633\u0648\u0642 \u0627\u0644\u062A\u0635\u062F\u064A\u0631
-available_dataelements=\u0639\u0646\u0627\u0635\u0631 \u0627\u0644\u0628\u064A\u0627\u0646\u0627\u062A \u0627\u0644\u0645\u062A\u0627\u062D\u0629
-hours=\u0633\u0627\u0639\u0627\u062A
-level=\u0627\u0644\u0645\u0633\u062A\u0648\u0649
-simple_export=\u0628\u0633\u064A\u0637\u0629 \u0627\u0644\u062A\u0635\u062F\u064A\u0631
-available_levels=\u0627\u0644\u0645\u0633\u062A\u0648\u064A\u0627\u062A \u0627\u0644\u0645\u062A\u0648\u0641\u0631\u0647
-clearing_datamart=...\u062A\u0637\u0647\u064A\u0631 \u062F\u0627\u062A\u0627\u0645\u0627\u0631\u062A...
-selected_datatypes=\u0627\u062E\u062A\u064A\u0627\u0631 \u0627\u0646\u0648\u0627\u0639 \u0627\u0644\u0628\u064A\u0627\u0646\u0627\u062A
-selected_dataelements=\u0627\u062E\u062A\u064A\u0627\u0631 \u0639\u0646\u0627\u0635\u0631 \u0627\u0644\u0628\u064A\u0627\u0646\u0627\u062A
-seconds=\u0627\u0644\u062B\u0648\u0627\u0646\u064A
-estimated_time=\u0627\u0644\u0648\u0642\u062A \u0627\u0644\u0645\u0642\u062F\u0631
-structures_generated=\u0627\u0644\u0647\u064A\u0627\u0643\u0644 \u0627\u0644\u0645\u062A\u0648\u0644\u062F\u0647
-generating_structures=...\u0625\u064A\u062C\u0627\u062F \u0647\u064A\u0627\u0643\u0644...
-_values_were_exported=\u0627\u0644\u0642\u064A\u0645 \u0627\u0644\u062A\u064A \u062A\u0645 \u062A\u0635\u062F\u064A\u0631\u0647\u0627
-available_indicators=\u0627\u0644\u0645\u0624\u0634\u0631\u0627\u062A \u0627\u0644\u0645\u062A\u0627\u062D\u0629
-selected_periods=\u0641\u062A\u0631\u0627\u062A \u0645\u062E\u062A\u0627\u0631\u0629
-datamart=\u0628\u064A\u0627\u0646\u0627\u062A \u0633\u0648\u0642
-advanced_datamart_export=\u062A\u0642\u062F\u0645 \u0628\u064A\u0627\u0646\u0627\u062A \u0633\u0648\u0642 \u0627\u0644\u062A\u0635\u062F\u064A\u0631
-select_min_period=\u0627\u062E\u062A\u064A\u0627\u0631 \u0641\u062A\u0631\u0629 \u0648\u0627\u062D\u062F\u0629 \u0639\u0644\u0649 \u0627\u0644\u0627\u0642\u0644
-datamart_cleared=\u062F\u0627\u062A\u0627\u0645\u0627\u0631\u062A \u0637\u0647\u0631\u062A
-confirm_clear_message=?\u0647\u0644 \u0627\u0646\u062A \u0645\u062A\u0623\u0643\u062F \u062A\u0631\u064A\u062F \u0627\u0632\u0627\u0644\u0629 \u0628\u064A\u0627\u0646\u0627\u062A \u0633\u0648\u0642\u061F
-generate_structures=\u062A\u0648\u0644\u062F \u0627\u0644\u0647\u064A\u0627\u0643\u0644
-export_to_datamart=\u0628\u064A\u0627\u0646\u0627\u062A \u0627\u0644\u062A\u0635\u062F\u064A\u0631 \u0627\u0644\u0649 \u0633\u0648\u0642
-indicators=\u0627\u0644\u0645\u0624\u0634\u0631\u0627\u062A
-select_min_level=\u0627\u062E\u062A\u064A\u0627\u0631 \u0648\u0627\u062D\u062F \u0639\u0644\u0649 \u0627\u0644\u0627\u0642\u0644 \u0645\u0633\u062A\u0648\u0649
-clear=\u0648\u0627\u0636\u062D
-select_period_type_all=/ \u0627\u062E\u062A\u064A\u0627\u0631 \u0646\u0648\u0639 \u0627\u0644\u0641\u062A\u0631\u0629 (\u062C\u0645\u064A\u0639
-selected_indicators=\u0645\u0624\u0634\u0631\u0627\u062A \u0645\u062E\u062A\u0627\u0631\u0629
-dataelements=\u062F\u0627\u062A\u0627\u064A\u0644\u064A\u0645\u064A\u0646\u062A\u0633
-minutes=\u062F\u0642\u0627\u0626\u0642
-organisation_unit_structure=\u0645\u0646\u0638\u0645\u0629 \u0627\u0644\u0648\u062D\u062F\u0629 \u0647\u064A\u0643\u0644
-select_indicatorgroup_all=/ \u0627\u062E\u062A\u064A\u0627\u0631 \u0645\u062C\u0645\u0648\u0639\u0629 \u0627\u0644\u0645\u0624\u0634\u0631\u0627\u062A (\u062C\u0645\u064A\u0639
-select_min_datatype=\u0627\u062E\u062A\u064A\u0627\u0631 \u0648\u0627\u062D\u062F \u0639\u0644\u0649 \u0627\u0644\u0627\u0642\u0644 \u0646\u0648\u0639 \u0627\u0644\u0628\u064A\u0627\u0646\u0627\u062A
-select_options=\u062E\u064A\u0627\u0631 \u0645\u062E\u062A\u0627\u0631\u0629
-available_datatypes=\u0627\u0646\u0648\u0627\u0639 \u0627\u0644\u0628\u064A\u0627\u0646\u0627\u062A \u0627\u0644\u0645\u062A\u0627\u062D\u0629
-advanced_export=\u0627\u0644\u0645\u062A\u0642\u062F\u0645\u0647 \u062A\u0635\u062F\u064A\u0631
-selected_organisationunits=\u0645\u0646\u0638\u0645\u0629 \u062D\u062F\u0627\u062A \u0645\u062E\u062A\u0627\u0631\u0629
-selected_levels=\u0645\u0633\u062A\u0648\u064A\u0627\u062A \u0645\u062E\u062A\u0627\u0631\u0629
-exporting_values=...\u062A\u0635\u062F\u064A\u0631 \u0627\u0644\u0642\u064A\u0645...
-group_set_structure=\u062D\u0635\u0631\u064A\u0627 \u0645\u0646\u0638\u0645\u0629 \u0627\u0644\u0648\u062D\u062F\u0629 \u063A\u0631\u0648\u0648\u0628\u0633\u064A\u062A \u0647\u064A\u0643\u0644
-select_organisationunit_level_all=/ \u0625\u062E\u062A\u064A\u0627\u0631 \u0645\u0633\u062A\u0648\u0649 \u0645\u0646\u0638\u0645\u0629 \u0627\u0644\u0648\u062D\u062F\u0629 (\u062C\u0645\u064A\u0639
-select_dataelementgroup_all=/ \u0627\u062E\u062A\u064A\u0627\u0631 \u0639\u0646\u0627\u0635\u0631 \u0627\u0644\u0628\u064A\u0627\u0646\u0627\u062A \u0627\u0644\u0645\u062C\u0645\u0648\u0639\u0629 (\u062C\u0645\u064A\u0639
-export=\u0627\u0644\u062A\u0635\u062F\u064A\u0631
\ No newline at end of file

=== removed file 'dhis-2/dhis-web/dhis-web-datamart/src/main/resources/org/hisp/dhis/datamart/i18n_module_en_GB.properties'
=== removed file 'dhis-2/dhis-web/dhis-web-datamart/src/main/resources/org/hisp/dhis/datamart/i18n_module_es_ES.properties'
--- dhis-2/dhis-web/dhis-web-datamart/src/main/resources/org/hisp/dhis/datamart/i18n_module_es_ES.properties	2011-12-14 08:10:22 +0000
+++ dhis-2/dhis-web/dhis-web-datamart/src/main/resources/org/hisp/dhis/datamart/i18n_module_es_ES.properties	1970-01-01 00:00:00 +0000
@@ -1,81 +0,0 @@
-data_mart_export=Exportar Data mart
-data_mart_export_management=Administraci\u00f3n de exprotaci\u00f3n de Data mart
-export_process_failed=Fall\u00f3 el proceso de exportaci\u00f3n - Consulte el log para mas detalles
-intro_data_mart_export=Crear exportaci\u00f3n de DataMart. Una exportaci\u00f3n de DataMart incluye Elementos de Datos, Indicadores, Unidades Organizativas y Periodos.
-intro_data_mart_scheduling=Configurar y administrar las exportaciones data mart programadas, que se ejecutar\u00e1n a las 2 am cada noche en los periodos de este a\u00f1o.
-last_year=\u00daltimo a\u00f1o
-months_last_year=Meses del a\u00f1o pasado
-months_this_year=Meses de este a\u00f1o
-next=Siguiente
-process_completed=Exportacion finalizada
-process_failed=La exportaci\u00f3n ha fallado - Ver log para mas detalles
-prev=Anterior
-process_started=Exportaci\u00f3n iniciada
-this_year=Este a\u00f1o
-quarters_last_year=Trimestres el a\u00f1o pasado
-quarters_this_year=Trimestres este a\u00f1o
-refresh=Actualizar
-relative_periods=Periodos relativos
-start=Comienzo
-stop=Parar
-remove_selected=Remover seleccionados
-no_export_process_running=No hay proceso de exportar corriendo
-nr_of_comb=N\u00FAmero de Combinaciones
-selected_dataelements=Elementos de Datos seleccionados
-number_of_indicators=N\u00FAmero de Indicadores
-deleting_existing_aggregated_data=Borrando datos agregados existentes
-crosstabulating_data=Datos de tabulaci\u00F3n cruzada
-selected_datatypes=Tipos de datos seleccionados
-available_indicators=Indicadores disponibles
-export_to_datamart=Exportaci\u00F3n al centro comercial de los datos
-select_period_type_all=Seleccionar el tipo del per\u00EDodo/ Todos
-select_indicatorgroup_all=Seleccionar el grupo del Indicador/ Todos
-name_in_use=El nombre ya esta en uso
-datamart_intro=Seleccionar un elemento del men\u00FA
-available_periods=Per\u00EDodos disponibles
-available_datatypes=Tipos de datos disponibles
-values=Valores
-select_organisationunit_level_all=Seleccionar el nivel de la Unidad Organizativa/ Todos
-select_min_datatype=Seleccionar al menos un tipo de datos
-exporting_data_for_indicators=Exportando datos de Indicadores
-generate_data_mart=Generar DataMart
-number_of_organisation_units=N\u00FAmero de Unidades Organizativas
-export_saved=Hecha salva de exportaci\u00F3n
-data_mart=DataMart
-remove_all=Remover todos
-must_select_at_least_one_organisation_unit=Se debe seleccionar al menos una Unidad Organizativa
-datamart_export=Exportar DataMart
-available_dataelements=Elementos de Datos disponibles
-export=Exportar
-select_min_period=Seleccionar al menos un per\u00EDodo
-selected_organisationunits=Unidades Organizativas seleccionadas
-confirm_delete_data_mart_export=Confirmar eliminacion de exportar al DataMart
-available_organisationunits=Unidades Organizativas disponibles
-add_to_dashboard=Agregar al Tablero
-export_process_done=Proceso de exportar terminado
-level=Nivel
-move_selected=Mover seleccionados
-second=Segundo
-export_process_not_initialized=Proceso de exportar no iniciado
-exporting_data_for_calculated_data_elements=Exportando datos de Elementos de Datos calculado
-must_select_at_least_one_period=Se debe seleccionar al menos un Periodo
-exporting_data_for_data_elements=Exportando datos de Elementos de Datos
-number_of_periods=N\u00FAmero de Periodos
-select_min_level=Seleccionar al menos un nivel
-available_levels=Niveles disponibles
-selected_levels=Niveles seleccionados
-_values_were_exported_in=Los valores se exportaron en
-could_not_export_too_many_data_elements=No es posible exportar debido a que han sido seleccionados demasiados Elementos de Datos
-number_of_data_elements=N\u00FAmero de Elementos de Datos
-move_all=Mover todos
-select_options=No se ha seleccionado opci\u00F3n
-select_dataelementgroup_all=Seleccionar el grupo del Elemento de Datos/ Todos
-dataelements=Elementos de Datos
-must_select_at_least_one_dataelement_or_indicator=Se debe seleccionar al menos un Elemento de Dato o Indicador
-datamart=DataMart
-selected_indicators=Indicadores seleccionados
-move_children=Mover hijos de la unidad seleccionada
-selected_periods=Per\u00EDodos seleccionados
-completed=Completado
-specify_name=Especificar un nombre
-confirm_add_to_dashboard=Confirmar agregar exportar DataMart al Tablero

=== removed file 'dhis-2/dhis-web/dhis-web-datamart/src/main/resources/org/hisp/dhis/datamart/i18n_module_fr_FR.properties'
--- dhis-2/dhis-web/dhis-web-datamart/src/main/resources/org/hisp/dhis/datamart/i18n_module_fr_FR.properties	2012-01-06 09:36:51 +0000
+++ dhis-2/dhis-web/dhis-web-datamart/src/main/resources/org/hisp/dhis/datamart/i18n_module_fr_FR.properties	1970-01-01 00:00:00 +0000
@@ -1,82 +0,0 @@
-move_selected=Deplacer celles choisies
-move_all=Deplacer tout
-move_children=Deplacer les enfants
-remove_selected=Enlever ceux (celles) choisies
-remove_all=Enlever tout
-available_dataelements=El\u00e9ments de donn\u00e9e disponibles
-selected_dataelements=El\u00e9ments de donn\u00e9e choisis
-select_dataelementgroup_all=Choisir le groupe d'\u00e9l\u00e9ments de donn\u00e9e / Tout
-available_indicators=Indicateurs disponibles
-selected_indicators=Indicateurs choisis
-select_indicatorgroup_all=Choisir le groupe de l'indicateur / Tout
-available_organisationunits=Unit\u00e9s d'organisation disponibles
-selected_organisationunits=Unit\u00e9s d'organisation choisies
-select_organisationunit_level_all=Choisir le niveau de l'unit\u00e9 d'organisation / Tout
-level=Niveau
-available_periods=P\u00e9riodes disponibles
-selected_periods=P\u00e9riodes choisies
-select_period_type_all=Choisir le type de p\u00e9riode / Tout
-export=Exportation
-select_min_datatype=Choisir au moins un type de donn\u00e9es
-select_min_level=Choisir au moins un niveau
-select_min_period=Choisir au moins une p\u00e9riode
-_values_were_exported_in=Les donn\u00e9es ont \u00e9t\u00e9 export\u00e9es dans
-available_levels=Niveaux disponibles
-selected_levels=Niveaux choisis
-datamart=Interface de donn\u00e9es
-datamart_export=Export de data mart
-available_datatypes=Types de donn\u00e9es disponibles
-selected_datatypes=Types de donn\u00e9es choisis
-dataelements=El\u00e9mentsdedonn\u00e9es
-select_options=Aucunes options choisies
-nr_of_comb=Nombre de combinaisons
-values=Valeurs
-second=Second
-deleting_existing_aggregated_data=Suppression des donn\u00e9es agr\u00e9g\u00e9es existentes
-crosstabulating_data=Cr\u00e9ation du tableau crois\u00e9 des donn\u00e9es
-exporting_data_for_data_elements=Export de donn\u00e9es pour les \u00e9l\u00e9ments de donn\u00e9es
-exporting_data_for_calculated_data_elements=Export de donn\u00e9es pour les \u00e9l\u00e9ments de donn\u00e9es calcul\u00e9s
-exporting_data_for_indicators=Export de donn\u00e9es pour les indicateurs
-export_process_done=Processus d'export effectu\u00e9
-completed=Termin\u00e9
-process_completed=Processus d'export termin\u00e9
-process_started=Le processus d'export a commenc\u00e9
-process_failed=Le processus d'export a \u00e9chou\u00e9. Voir le log pour les d\u00e9tails
-no_export_process_running=Pas de processus d'export en cours
-export_process_not_initialized=Processus d'export non initialis\u00e9
-datamart_intro=Veuillez choisir un \u00e9l\u00e9ment dans le menu.
-export_saved=Export enregistr\u00e9
-data_mart_export_management=Gestion des exportations vers Data mart
-confirm_delete_data_mart_export=Etes-vous s\u00fbr de vouloir supprimer cet export de data mart?
-number_of_data_elements=Nombre d'\u00e9l\u00e9ments de donn\u00e9e
-number_of_indicators=Nombres d'indicateurs
-number_of_organisation_units=Nombre d'unit\u00e9s d'organisation
-number_of_periods=Nombre de p\u00e9riodes
-must_select_at_least_one_dataelement_or_indicator=Veuillez choisir au moins un \u00e9l\u00e9ment de donn\u00e9e ou indicateur
-must_select_at_least_one_organisation_unit=Veuillez choisir au moins une uni\u00e9 d'organisation
-must_select_at_least_one_period=Veuillez choisir au moins une p\u00e9riode
-specify_name=Sp\u00e9cifier un nom
-name_in_use=Ce nom existe dej\u00e0
-data_mart=Interface de donn\u00e9es
-generate_data_mart=Generer le data mart
-add_to_dashboard=Ajouter au tableau de bord
-confirm_add_to_dashboard=Etes-vous s\u00fbr de vouloir ajouter cet export de data mart au tableau de bord?
-export_to_datamart=Exporter vers l'interface de donn\u00e9es
-could_not_export_too_many_data_elements=Ne peut effectuer l'export. Trop d'\u00e9l\u00e9ments de donn\u00e9es ont \u00e9t\u00e9 selectionn\u00e9s
-export_process_failed=Le processus d'export a \u00e9chou\u00e9 - Voir le log pour les d\u00e9tails
-relative_periods=P\u00e9riodes relatives
-reporting_month=Mois du rapport
-months_this_year=Mois de cette ann\u00e9e
-quarters_this_year=Trimestres de cette ann\u00e9e
-this_year=Cette ann\u00e9e
-months_last_year=Mois de l'ann\u00e9e derni\u00e8re
-quarters_last_year=Trimestres de l'ann\u00e9e derni\u00e8re
-last_year=L'ann\u00e9e derni\u00e8re
-prev=Prec
-next=Suivant
-start=D\u00e9marrer
-stop=Arr\u00eatez
-refresh=Actualiser
-intro_data_mart_export=Cr\u00e9er des exportations de Data mart. Les exportations Data mart contiennent des \u00e9l\u00e9ments de donn\u00e9es, indicateurs, unit\u00e9s d'organisation et p\u00e9riodes
-intro_data_mart_scheduling=Configurer et g\u00e9rer les exportations Data Mart programm\u00e9es qui s'ex\u00e9cuteront \u00e0 2H chaque nuit pour les p\u00e9riodes de cette ann\u00e9e
-data_mart_export=Export de data mart

=== removed file 'dhis-2/dhis-web/dhis-web-datamart/src/main/resources/org/hisp/dhis/datamart/i18n_module_gu_IN.properties'
--- dhis-2/dhis-web/dhis-web-datamart/src/main/resources/org/hisp/dhis/datamart/i18n_module_gu_IN.properties	2011-12-14 08:10:22 +0000
+++ dhis-2/dhis-web/dhis-web-datamart/src/main/resources/org/hisp/dhis/datamart/i18n_module_gu_IN.properties	1970-01-01 00:00:00 +0000
@@ -1,16 +0,0 @@
-D:\scm2\dhiscode\trunk\dhis-2\dhis-web\dhis-web-datamart\src\main\resources\org\hisp\dhis\datamart
-
-export_to_datamart=&#2734;&#2750;&#2745;&#2751;&#2724;&#2751; &#2744;&#2690;&#2711;&#2765;&#2736;&#2745; &#2728;&#2763; &#2728;&#2751;&#2709;&#2750;&#2744;
-options= &#2741;&#2751;&#2709;&#2738;&#2765;&#2730;
-level= &#2738;&#2759;&#2741;&#2738;
-select_level_export_all=&#2738;&#2759;&#2741;&#2738; &#2730;&#2744;&#2690;&#2726; &#2709;&#2736;&#2763; / &#2728;&#2751;&#2709;&#2750;&#2744; &#2744;&#2736;&#2765;&#2741;
-period_type=&#2744;&#2734;&#2735; &#2730;&#2765;&#2736;&#2709;&#2750;&#2736;
-select_period_type_export_all=&#2744;&#2734;&#2735; &#2730;&#2744;&#2690;&#2726; &#2709;&#2736;&#2763; / &#2728;&#2751;&#2709;&#2750;&#2744; &#2744;&#2736;&#2765;&#2741;
-data_type=&#2734;&#2750;&#2745;&#2751;&#2724;&#2751; &#2730;&#2765;&#2736;&#2709;&#2750;&#2736;
-select_data_type_export_all= &#2734;&#2750;&#2745;&#2751;&#2724;&#2751; &#2730;&#2765;&#2736;&#2709;&#2750;&#2736; &#2730;&#2744;&#2690;&#2726; &#2709;&#2736;&#2763; / &#2728;&#2751;&#2709;&#2750;&#2744; &#2744;&#2736;&#2765;&#2741;
-data_values=&#2734;&#2750;&#2745;&#2751;&#2724;&#2751; &#2741;&#2759;&#2738;&#2765;&#2735;&#2753;
-period=&#2744;&#2734;&#2735;
-select_period_export_all=&#2744;&#2734;&#2735; &#2730;&#2744;&#2690;&#2726; &#2709;&#2736;&#2763; / &#2728;&#2751;&#2709;&#2750;&#2744; &#2744;&#2736;&#2765;&#2741;
-indicator_values=&#2696;&#2728;&#2765;&#2721;&#2752;&#2709;&#2759;&#2719;&#2736; &#2741;&#2759;&#2738;&#2765;&#2735;&#2753;
-export= &#2728;&#2751;&#2709;&#2750;&#2744;
-clear= &#2709;&#2750;&#2722;&#2752; &#2728;&#2750;&#2710;&#2741;&#2753;
\ No newline at end of file

=== removed file 'dhis-2/dhis-web/dhis-web-datamart/src/main/resources/org/hisp/dhis/datamart/i18n_module_hi_IN.properties'
--- dhis-2/dhis-web/dhis-web-datamart/src/main/resources/org/hisp/dhis/datamart/i18n_module_hi_IN.properties	2011-12-14 08:10:22 +0000
+++ dhis-2/dhis-web/dhis-web-datamart/src/main/resources/org/hisp/dhis/datamart/i18n_module_hi_IN.properties	1970-01-01 00:00:00 +0000
@@ -1,71 +0,0 @@
-#Resource generated by I18n Resource Editor
-#Thu Mar 29 20:35:10 IST 2007
-available_organisationunits=\u0909\u092A\u094D\u0932\u092C\u094D\u0927 \u0938\u094D\u0935\u093E\u0938\u094D\u0925\u094D\u092F \u0915\u0947\u0902\u0926\u094D\u0930
-available_periods=\u0909\u092A\u094D\u0932\u092C\u094D\u0927 \u0905\u0935\u0927\u093F
-data_values=&\#2337;&\#2375;&\#2335;&\#2366; &\#2325;&\#2375; &\#2350;&\#2366;&\#2344;
-simple_datamart_export=\u0938\u0930\u0932 \u0921\u0947\u091F\u093E \u092E\u093E\u0930\u094D\u091F \u0928\u093F\u0930\u094D\u092F\u093E\u0924
-available_dataelements=\u0909\u092A\u094D\u0932\u092C\u094D\u0927 \u0921\u0947\u091F\u093E \u090F\u0932\u093F\u092E\u0947\u0902\u091F
-select_period_export_all=&\#2309;&\#2357;&\#2343;&\#2367; &\#2330;&\#2369;&\#2344;&\#2367;&\#2319;/ &\#2360;&\#2348; &\#2344;&\#2367;&\#2352;&\#2381;&\#2351;&\#2366;&\#2340; &\#2325;&\#2352;&\#2375;&\#2306;
-maintenance_performed=\u0930\u0916\u0930\u0916\u093E\u0935 \u0938\u0902\u092A\u093E\u0926\u093F\u0924
-clear_aggregated_indicatorvalues=\u0938\u0902\u091A\u093F\u0924 \u0907\u0902\u0921\u093F\u0915\u0947\u091F\u0930 \u092E\u093E\u0928 \u092E\u0941\u0915\u094D\u0924
-maintenance=\u0930\u0916\u0930\u0916\u093E\u0935
-hours=\u0918\u0902\u091F\u0947
-level=\u0938\u094D\u0924\u0930
-simple_export=\u0938\u0930\u0932 \u0928\u093F\u0930\u094D\u092F\u093E\u0924
-available_levels=\u0909\u092A\u094D\u0932\u092C\u094D\u0927 \u0938\u094D\u0924\u0930
-performing_maintenance=\u0930\u0916\u0930\u0916\u093E\u0935 \u0938\u0902\u092A\u093E\u0926\u093F\u0924 \u0939\u094B \u0930\u0939\u093E \u0939\u0948...
-select_level_export_all=&\#2360;&\#2381;&\#2340;&\#2352; &\#2330;&\#2369;&\#2344;&\#2367;&\#2319;/ &\#2360;&\#2348; &\#2344;&\#2367;&\#2352;&\#2381;&\#2351;&\#2366;&\#2340; &\#2325;&\#2352;&\#2375;&\#2306;
-clearing_datamart=\u0921\u0947\u091F\u093E\u092E\u093E\u0930\u094D\u091F \u0939\u094D\u091F\u093E\u092F\u093E \u091C\u093E \u0930\u0939\u093E \u0939\u0948...
-selected_datatypes=\u091A\u092F\u0928\u093F\u0924 \u0906\u0902\u0915\u095C\u093E \u092A\u094D\u0930\u0915\u093E\u0930(\u0921\u0947\u091F\u093E \u091F\u093E\u0907\u092A)
-selected_dataelements=\u091A\u092F\u0928\u093F\u0924 \u0906\u0902\u0915\u095C\u093E \u0924\u0924\u094D\u0935(\u0921\u0947\u091F\u093E \u090F\u0932\u093F\u092E\u0947\u0902\u091F)
-clear_hierarchy_history=\u0905\u0928\u0941\u0915\u094D\u0930\u092E \u0907\u0924\u093F\u0939\u093E\u0938 \u092E\u0941\u0915\u094D\u0924
-clear_aggregated_datavalues=\u0938\u0902\u091A\u093F\u0924 \u0921\u0947\u091F\u093E \u092E\u093E\u0928 \u092E\u0941\u0915\u094D\u0924
-D=scm2dhiscode\trunkdhis-2dhis-webdhis-web-datamartsrcmain\resourcesorghispdhisdatamart
-seconds=\u0938\u0947\u0915\u0947\u0902\u0921
-estimated_time=\u0905\u0928\u0941\u092E\u093E\u0928\u093F\u0924 \u0938\u092E\u092F
-structures_generated=\u092C\u0928\u093E\u0935\u091F \u0909\u0924\u094D\u092A\u0928\u094D\u0928 \u0939\u0941\u092F\u0947
-generating_structures=\u092C\u0928\u093E\u0935\u091F \u0909\u0924\u094D\u092A\u0928\u094D\u0928 \u0939\u094B \u0930\u0939\u0940 \u0939\u0948\u0902...
-_values_were_exported=\u092E\u093E\u0928 \u0928\u093F\u0930\u094D\u092F\u093E\u0924 \u0939\u094B \u0930\u0939\u0940 \u0939\u0948\u0902
-available_indicators=\u0909\u092A\u094D\u0932\u092C\u094D\u0927 \u0907\u0928\u094D\u0921\u093F\u0915\u0947\u091F\u0930\u0938(\u0938\u0942\u091A\u0915)
-selected_periods=\u091A\u092F\u0928\u093F\u0924 \u0905\u0935\u0927\u093F
-datamart=\u0921\u0947\u091F\u093E \u092E\u093E\u0930\u094D\u091F
-perform_maintenance=\u0930\u0916\u0930\u0916\u093E\u0935 \u0938\u0902\u092A\u093E\u0926\u093F\u0924
-options=&\#2357;&\#2367;&\#2325;&\#2354;&\#2381;&\#2346;
-period=&\#2309;&\#2357;&\#2343;&\#2367;
-structures=\u092C\u0928\u093E\u0935\u091F
-data_type=&\#2337;&\#2375;&\#2335;&\#2366; &\#2346;&\#2381;&\#2352;&\#2325;&\#2366;&\#2352;
-second=\u0938\u0947\u0915\u0947\u0902\u0921
-period_type=&\#2309;&\#2357;&\#2343;&\#2367; &\#2346;&\#2381;&\#2352;&\#2325;&\#2366;&\#2352;
-advanced_datamart_export=\u0909\u0928\u094D\u0928\u0924 \u0921\u0947\u091F\u093E \u092E\u093E\u0930\u094D\u091F \u0928\u093F\u0930\u094D\u092F\u093E\u0924
-select_min_period=\u0915\u092E \u0938\u0947 \u0915\u092E \u090F\u0915 \u0905\u0935\u0927\u093F \u091A\u0941\u0928\u0947\u0902
-datamart_cleared=\u0921\u0947\u091F\u093E \u092E\u093E\u0930\u094D\u091F \u0939\u091F\u093E\u092F\u093E
-select_data_type_export_all=&\#2337;&\#2375;&\#2335;&\#2366; &\#2346;&\#2381;&\#2352;&\#2325;&\#2366;&\#2352; &\#2330;&\#2369;&\#2344;&\#2375;&\#2306;/ &\#2360;&\#2348; &\#2344;&\#2367;&\#2352;&\#2381;&\#2351;&\#2366;&\#2340; &\#2325;&\#2352;&\#2375;&\#2306;
-generate_structures=\u092C\u0928\u093E\u0935\u091F\u0947\u0902 \u0909\u0924\u094D\u092A\u0928\u094D\u0928
-confirm_clear_message=\u0915\u094D\u092F\u093E \u0906\u092A \u0921\u0947\u091F\u093E \u092E\u093E\u0930\u094D\u091F \u0915\u094B \u0939\u091F\u093E\u0928\u0947 \u0915\u0947 \u0932\u093F\u092F\u0947 \u0926\u0943\u095D \u0939\u0948\u0902 ?
-export_to_datamart=\u0921\u0947\u091F\u093E \u092E\u093E\u0930\u094D\u091F \u0915\u0947 \u0932\u093F\u092F\u0947 \u0928\u093F\u0930\u094D\u092F\u093E\u0924
-indicators=\u0907\u0928\u094D\u0921\u093F\u0915\u0947\u091F\u0930\u0938(\u0938\u0942\u091A\u0915)
-select_min_level=\u0915\u092E \u0938\u0947 \u0915\u092E \u090F\u0915 \u0921\u093E\u091F\u093E \u092A\u094D\u0930\u0915\u093E\u0930 \u091A\u0941\u0928\u0947\u0902
-clear=\u0939\u091F\u093E\u0908\u092F\u0947
-select_period_type_all=\u0905\u0935\u0927\u093F \u0915\u093E \u092A\u094D\u0930\u0915\u093E\u0930 \u091A\u0941\u0928\u0947\u0902 / \u0938\u092D\u0940
-select_period_type_export_all=&\#2309;&\#2357;&\#2343;&\#2367; &\#2330;&\#2369;&\#2344;&\#2367;&\#2319;/ &\#2360;&\#2348; &\#2344;&\#2367;&\#2352;&\#2381;&\#2351;&\#2366;&\#2340; &\#2325;&\#2352;&\#2375;&\#2306;
-selected_indicators=\u0907\u0928\u094D\u0921\u093F\u0915\u0947\u091F\u0930\u0938(\u0938\u0942\u091A\u0915) \u091A\u0941\u0928\u0947\u0902
-dataelements=\u0921\u0947\u091F\u093E \u090F\u0932\u093F\u092E\u0947\u0902\u091F
-minutes=\u092E\u093F\u0928\u093F\u091F\u094D\u0938
-organisation_unit_structure=\u0938\u094D\u0935\u093E\u0938\u094D\u0925\u094D\u092F \u0915\u0947\u0902\u0926\u094D\u0930 \u0907\u0915\u093E\u0908 \u0915\u0940 \u092C\u0928\u093E\u0935\u091F
-select_indicatorgroup_all=\u0907\u0928\u094D\u0921\u093F\u0915\u0947\u091F\u0930\u0938(\u0938\u0942\u091A\u0915)\u0915\u093E \u0938\u092E\u0942\u0939 \u091A\u0941\u0928\u0947\u0902/ \u0938\u092D\u0940
-select_min_datatype=\u0915\u092E \u0938\u0947 \u0915\u092E \u090F\u0915 \u0921\u093E\u091F\u093E \u092A\u094D\u0930\u0915\u093E\u0930 \u091A\u0941\u0928\u0947\u0902
-select_options=\u0915\u094B\u0908 \u0935\u093F\u0915\u0932\u094D\u092A \u0928\u0939\u0940\u0902 \u091A\u0941\u0928\u093E \u0917\u092F\u093E
-available_datatypes=\u0909\u092A\u094D\u0932\u092C\u094D\u0927 \u0906\u0902\u0915\u095C\u093E \u092A\u094D\u0930\u0915\u093E\u0930(\u0921\u0947\u091F\u093E \u091F\u093E\u0907\u092A)
-advanced_export=\u0909\u0928\u094D\u0928\u0924 \u0928\u093F\u0930\u094D\u092F\u093E\u0924
-_values_were_exported_in=\u092E\u0947 \u092E\u093E\u0928 \u0928\u093F\u0930\u094D\u092F\u093E\u0924 \u0915\u093F\u090F \u0917\u090F
-indicator_values=&\#2360;&\#2306;&\#2325;&\#2375;&\#2340;&\#2325; &\#2325;&\#2375; &\#2350;&\#2366;&\#2344;
-selected_levels=\u0938\u094D\u0924\u0930 \u091A\u0941\u0928\u0947\u0902
-selected_organisationunits=\u0938\u094D\u0935\u093E\u0938\u094D\u0925\u094D\u092F \u0915\u0947\u0902\u0926\u094D\u0930 \u0907\u0915\u093E\u0908 \u091A\u0941\u0928\u0947\u0902
-group_set_structure=\u0905\u0932\u0917 \u0938\u094D\u0935\u093E\u0938\u094D\u0925\u094D\u092F \u0915\u0947\u0902\u0926\u094D\u0930 \u0907\u0915\u093E\u0908 \u0938\u092E\u0942\u0939 \u092C\u0928\u093E\u0935\u091F
-exporting_values=\u092E\u093E\u0928 \u0928\u093F\u0930\u094D\u092F\u093E\u0924 \u0939\u094B \u0930\u0939\u0947\u0902 \u0939\u0948\u0902...
-nr_of_comb=\u0938\u0902\u092F\u094B\u091C\u0928 \u0915\u0940 \u0938\u0902\u0916\u094D\u092F\u093E
-select_organisationunit_level_all=\u0938\u094D\u0935\u093E\u0938\u094D\u0925\u094D\u092F \u0915\u0947\u0902\u0926\u094D\u0930 \u0907\u0915\u093E\u0908 \u0938\u094D\u0924\u0930 \u091A\u0941\u0928\u0947\u0902 / \u0938\u092D\u0940
-values=\u092E\u093E\u0928
-export=\u0928\u093F\u0930\u094D\u092F\u093E\u0924/\u092C\u093E\u0939\u0930 \u092D\u0947\u091C\u0928\u093E
-select_dataelementgroup_all=\u0921\u0947\u091F\u093E \u090F\u0932\u093F\u092E\u0947\u0902\u091F(\u0906\u0902\u0915\u0921\u093E \u0905\u0935\u094D\u092F\u0935) \u0938\u092E\u0942\u0939 \u091A\u0941\u0928\u0947\u0902 / \u0938\u092D\u0940
-structures_and_maintenance=\u0938\u0902\u0930\u091A\u0928\u093E \u0935 \u0930\u0916\u0930\u0916\u093E\u0935

=== removed file 'dhis-2/dhis-web/dhis-web-datamart/src/main/resources/org/hisp/dhis/datamart/i18n_module_kn_IN.properties'
--- dhis-2/dhis-web/dhis-web-datamart/src/main/resources/org/hisp/dhis/datamart/i18n_module_kn_IN.properties	2011-12-14 08:10:22 +0000
+++ dhis-2/dhis-web/dhis-web-datamart/src/main/resources/org/hisp/dhis/datamart/i18n_module_kn_IN.properties	1970-01-01 00:00:00 +0000
@@ -1,49 +0,0 @@
-available_organisationunits=\u0CB2\u0CAD\u0CCD\u0CAF\u0CB5\u0CBF\u0CB0\u0CC1\u0CB5 \u0C98\u0C9F\u0C95\u0C97\u0CB3\u0CC1
-available_periods=\u0CB2\u0CAD\u0CCD\u0CAF\u0CB5\u0CBF\u0CB0\u0CC1\u0CB5 \u0C95\u0CBE\u0CB2\u0CBE\u0CB5\u0CA6\u0CBF
-simple_datamart_export=\u0CB8\u0CB0\u0CB3\u0CB5\u0CBE\u0C97\u0CBF \u0CA1\u0CBE\u0C9F\u0CBE\u0CAE\u0CBE\u0CB0\u0CCD\u0C9F \u0CB0\u0CAA\u0CCD\u0CA4\u0CC1\u0CAE\u0CBE\u0CA1\u0CC1
-available_dataelements=\u0CB2\u0CAD\u0CCD\u0CAF\u0CB5\u0CBF\u0CB0\u0CC1\u0CB5 \u0CB2\u0CAD\u0CCD\u0CAF\u0CB5\u0CBF\u0CB0\u0CC1\u0CB5 \u0CA6\u0CA4\u0CCD\u0CA4\u0CBE\u0C82\u0CB6\u0C97\u0CB3\u0CC1
-hours=\u0C98\u0C82\u0C9F\u0CC6\u0C97\u0CB3\u0CC1
-level=\u0CAE\u0C9F\u0CCD\u0C9F
-simple_export=\u0CB8\u0CB0\u0CB3\u0CB5\u0CBE\u0C97\u0CBF \u0CB0\u0CAB\u0CCD\u0CA4\u0CC1\u0CAE\u0CBE\u0CA1\u0CC1
-available_levels=\u0CB2\u0CAD\u0CCD\u0CAF\u0CB5\u0CBF\u0CB0\u0CC1\u0CB5 \u0CB2\u0CAD\u0CCD\u0CAF\u0CB5\u0CBF\u0CB0\u0CC1\u0CB5 \u0CAE\u0C9F\u0CCD\u0C9F\u0C97\u0CB3\u0CC1
-clearing_datamart=\u0CA1\u0CBE\u0C9F\u0CBE\u0CAE\u0CBE\u0CB0\u0CCD\u0C9F\u0CA8\u0CCD\u0CA8\u0CC1 \u0C92\u0CAA\u0CCD\u0CAA\u0CAE\u0CBE\u0CA1\u0CC1\u0CA4\u0CCD\u0CA4\u0CBF\u0CA6\u0CC6...
-selected_datatypes=\u0C86\u0CAF\u0CCD\u0CA6\u0CC1\u0C95\u0CCA\u0C82\u0CA1 \u0CA6\u0CA4\u0CCD\u0CA4 \u0CAE\u0CBE\u0CA6\u0CB0\u0CBF\u0C97\u0CB3\u0CC1
-selected_dataelements=\u0C86\u0CAF\u0CCD\u0CA6\u0CC1\u0C95\u0CCA\u0C82\u0CA1 \u0CA6\u0CA4\u0CCD\u0CA4\u0CBE\u0C82\u0CB6\u0CAF\u0C97\u0CB3\u0CC1
-seconds=\u0CB8\u0CC6\u0C95\u0C82\u0CA1\u0CCD\u0CB8\u0CCD
-estimated_time=\u0C85\u0C82\u0CA6\u0CBE\u0C9C\u0CC1 \u0CAE\u0CBE\u0CA1\u0CBF\u0CA6 \u0CB5\u0CC7\u0CB3\u0CC6
-structures_generated= \u0CB0\u0C9A\u0CBF\u0CB8\u0CBF\u0CA6 \u0CB8\u0CCD\u0CB5\u0CB0\u0CC2\u0CAA\u0C97\u0CB3\u0CC1
-generating_structures=\u0CB8\u0CCD\u0CB5\u0CB0\u0CC2\u0CAA\u0C97\u0CB3\u0CC1 \u0CB0\u0C9A\u0CA8\u0CC6\u0CAF\u0CB2\u0CCD\u0CB2\u0CBF\u0CA6\u0CC6...
-_values_were_exported=\u0CB5\u0CCD\u0CAF\u0CBE\u0CB2\u0CCD\u0CAF\u0CC1\u0C97\u0CB3\u0CA8\u0CCD\u0CA8\u0CC1 \u0CB0\u0CAA\u0CCD\u0CA4\u0CC1\u0CAE\u0CBE\u0CA1\u0CB2\u0CBE\u0CAF\u0CBF\u0CA4\u0CC1
-available_indicators=\u0CB2\u0CAD\u0CCD\u0CAF\u0CB5\u0CBF\u0CB0\u0CC1\u0CB5 \u0CA6\u0CBE\u0C96\u0CB2\u0CC6 \u0CB8\u0CC2\u0C9A\u0C95\u0C97\u0CB3\u0CC1
-selected_periods=\u0C86\u0CAF\u0CCD\u0CA6\u0CC1\u0C95\u0CCA\u0C82\u0CA1 \u0C95\u0CBE\u0CB2\u0CBE\u0CB5\u0CA6\u0CBF
-datamart=\u0CA1\u0CBE\u0C9F\u0CBE\u0CAE\u0CBE\u0CB0\u0CCD\u0C9F
-advanced_datamart_export=\u0CAE\u0CC1\u0C82\u0CA6\u0CC1\u0CB5\u0CB0\u0CBF\u0CA6 \u0CA1\u0CBE\u0C9F\u0CBE\u0CAE\u0CBE\u0CB0\u0CCD\u0C9F \u0CB0\u0CAA\u0CCD\u0CA4\u0CC1\u0CAE\u0CBE\u0CA1\u0CC1\u0CB5\u0CBF\u0C95\u0CC6
-select_min_period=\u0C92\u0C82\u0CA6\u0CC1 \u0C92\u0C82\u0CA6\u0CC1 \u0C95\u0CBE\u0CB2\u0CBE\u0CB5\u0CA6\u0CBF\u0CAF\u0CA8\u0CCD\u0CA8\u0CBE\u0CA6\u0CB0\u0CC2 \u0C86\u0CB0\u0CBF\u0CB8\u0CBF\u0C95\u0CCA\u0CB3\u0CCD\u0CB3\u0CBF
-datamart_cleared=\u0CA1\u0CBE\u0C9F\u0CBE\u0CAE\u0CBE\u0CB0\u0CCD\u0C9F\u0CA8\u0CCD\u0CA8\u0CC1 \u0C96\u0CBE\u0CB2\u0CBF \u0CAE\u0CBE\u0CA1\u0CB2\u0CBE\u0CAF\u0CBF\u0CA4\u0CC1
-confirm_clear_message=\u0CA1\u0CBE\u0C9F\u0CBE\u0CAE\u0CBE\u0CB0\u0CCD\u0C9F\u0CA8\u0CCD\u0CA8\u0CC1 \u0C96\u0CBE\u0CB2\u0CBF \u0CAE\u0CBE\u0CA1\u0CC1\u0CB5\u0CC1\u0CA6\u0CC1 \u0C96\u0C9A\u0CBF\u0CA4\u0CB5\u0CBE?
-generate_structures=\u0CB8\u0CCD\u0CB5\u0CB0\u0CC2\u0CAA\u0C97\u0CB3\u0CA8\u0CCD\u0CA8\u0CC1 \u0CB0\u0C9A\u0CA8\u0CC6\u0CAE\u0CBE\u0CA1\u0CBF
-export_to_datamart=\u0CA1\u0CBE\u0C9F\u0CBE \u0CAE\u0CBE\u0CB0\u0CCD\u0C9F\u0CBF\u0C97\u0CC6 \u0CB0\u0CAA\u0CCD\u0CA4\u0CC1\u0CAE\u0CBE\u0CA1\u0CBF
-indicators=\u0CA6\u0CBE\u0C96\u0CB2\u0CC6 \u0CB8\u0CC2\u0C9A\u0C95\u0C97\u0CB3\u0CC1
-select_min_level=\u0C92\u0C82\u0CA6\u0CC1 \u0C92\u0C82\u0CA6\u0CC1 \u0CAE\u0C9F\u0CCD\u0C9F\u0CB5\u0CA8\u0CCD\u0CA8\u0CBE\u0CA6\u0CB0\u0CC2 \u0C86\u0CB0\u0CBF\u0CB8\u0CBF\u0C95\u0CCA\u0CB3\u0CCD\u0CB3\u0CBF
-clear=\u0C96\u0CBE\u0CB2\u0CBF \u0CAE\u0CBE\u0CA1\u0CBF
-select_period_type_all=\u0C95\u0CBE\u0CB2\u0CBE\u0CB5\u0CA6\u0CBF \u0CAE\u0CBE\u0CA6\u0CB0\u0CBF\u0CAF\u0CA8\u0CCD\u0CA8\u0CC1 \u0C86\u0CB0\u0CBF\u0CB8\u0CBF\u0C95\u0CCA\u0CB3\u0CCD\u0CB3\u0CBF/\u0C8E\u0CB2\u0CCD\u0CB2\u0CBE
-selected_indicators=\u0CA6\u0CBE\u0C96\u0CB2\u0CC6 \u0CB8\u0CC2\u0C9A\u0C95\u0C97\u0CB3\u0CA8\u0CCD\u0CA8\u0CC1\u0CA6\u0CBE\u0C96\u0CB2\u0CC6 \u0CB8\u0CC2\u0C9A\u0C95\u0C97\u0CB3\u0CA8\u0CCD\u0CA8\u0CC1 \u0C86\u0CB0\u0CBF\u0CB8\u0CBF\u0C95\u0CCA\u0CB3\u0CCD\u0CB3\u0CBF
-dataelements=\u0CA6\u0CA4\u0CCD\u0CA4\u0CBE\u0C82\u0CB6\u0C97\u0CB3\u0CC1
-minutes=\u0CA8\u0CBF\u0CAE\u0CBF\u0CB7\u0C97\u0CB3\u0CC1
-organisation_unit_structure=\u0C98\u0C9F\u0C95 \u0CB8\u0CCD\u0CB5\u0CB0\u0CC2\u0CAA
-select_indicatorgroup_all=\u0CA6\u0CBE\u0C96\u0CB2\u0CC6 \u0CB8\u0CC2\u0C9A\u0C95\u0C97\u0CB3 \u0C97\u0CC1\u0C82\u0CAA\u0CA8\u0CCD\u0CA8\u0CC1\u0CA6\u0CBE\u0C96\u0CB2\u0CC6 \u0CB8\u0CC2\u0C9A\u0C95\u0C97\u0CB3 \u0C97\u0CC1\u0C82\u0CAA\u0CA8\u0CCD\u0CA8\u0CC1 \u0C86\u0CB0\u0CBF\u0CB8\u0CBF\u0C95\u0CCA\u0CB3\u0CCD\u0CB3\u0CBF/\u0C8E\u0CB2\u0CCD\u0CB2\u0CBE
-select_min_datatype=\u0C95\u0CA8\u0CBF\u0CB7\u0CCD\u0C9F \u0C92\u0C82\u0CA6\u0CC1 \u0C95\u0CA8\u0CBF\u0CB7\u0CCD\u0C9F \u0C92\u0C82\u0CA6\u0CC1 \u0CA6\u0CA4\u0CCD\u0CA4\u0CBE\u0C82\u0CB6 \u0CAE\u0CBE\u0CA6\u0CB0\u0CBF\u0CAF\u0CA8\u0CCD\u0CA8\u0CBE\u0CA6\u0CB0\u0CC2 \u0C86\u0CB0\u0CBF\u0CB8\u0CBF\u0C95\u0CCA\u0CB3\u0CCD\u0CB3\u0CBF
-select_options=\u0C86\u0CAF\u0CCD\u0C95\u0CC6\u0C97\u0CB3\u0CA8\u0CCD\u0CA8\u0CC1 \u0C86\u0CB0\u0CBF\u0CB8\u0CBF\u0C95\u0CCA\u0C82\u0CA1\u0CBF\u0CB2\u0CCD\u0CB2
-available_datatypes=\u0CB2\u0CAD\u0CCD\u0CAF\u0CB5\u0CBF\u0CB0\u0CC1\u0CB5 \u0CB2\u0CAD\u0CCD\u0CAF\u0CB5\u0CBF\u0CB0\u0CC1\u0CB5 \u0CA6\u0CA4\u0CCD\u0CA4\u0CBE\u0C82\u0CB6 \u0CAE\u0CBE\u0CA6\u0CB0\u0CBF\u0C97\u0CB3\u0CC1
-advanced_export=\u0CAE\u0CC1\u0C82\u0CA6\u0CC1\u0CB5\u0CB0\u0CBF\u0CA6 \u0CB0\u0CAA\u0CCD\u0CA4\u0CC1
-selected_organisationunits=\u0C86\u0CAF\u0CCD\u0CA6 \u0C98\u0C9F\u0C95\u0C97\u0CB3\u0CC1
-selected_levels=\u0C86\u0CAF\u0CCD\u0CA6 \u0CAEm\u0C97\u0CB3\u0CC1
-exporting_values=\u0CB5\u0CCD\u0CAF\u0CBE\u0CB2\u0CCD\u0CAF\u0CC1\u0C97\u0CB3\u0CA8\u0CCD\u0CA8\u0CC1 \u0CB5\u0CCD\u0CAF\u0CBE\u0CB2\u0CCD\u0CAF\u0CC1\u0C97\u0CB3\u0CA8\u0CCD\u0CA8\u0CC1 \u0CB0\u0CAA\u0CCD\u0CA4\u0CC1\u0CAE\u0CBE\u0CA1\u0CB2\u0CBE\u0C97\u0CC1\u0CA4\u0CCD\u0CA4\u0CBF\u0CA6\u0CC6
-group_set_structure=\u0C85\u0CA8\u0CA8\u0CCD\u0CAF \u0C98\u0C9F\u0C95\u0CA6 \u0C97\u0CC1\u0C82\u0CAA\u0CBF\u0CA8 \u0CB8\u0CCD\u0CB5\u0CB0\u0CC2\u0CAA
-select_organisationunit_level_all=\u0C98\u0C9F\u0C95\u0CA6 \u0CAEm\u0CB5\u0CA8\u0CCD\u0CA8\u0CC1 \u0C86\u0CB0\u0CBF\u0CB8\u0CBF\u0C95\u0CCA\u0CB3\u0CCD\u0CB3\u0CBF/\u0C8E\u0CB2\u0CCD\u0CB2
-select_dataelementgroup_all=\u0CA6\u0CA4\u0CCD\u0CA4\u0CBE\u0C82\u0CB6 \u0C97\u0CC1\u0C82\u0CAA\u0CA8\u0CCD\u0CA8\u0CC1 \u0C86\u0CB0\u0CBF\u0CB8\u0CBF\u0C95\u0CCA\u0CB3\u0CCD\u0CB3\u0CBF/\u0C8E\u0CB2\u0CCD\u0CB2
-export=\u0CB0\u0CAA\u0CCD\u0CA4\u0CC1
-move_selected =\u0C86\u0CAF\u0CCD\u0CA6\u0CC1\u0C95\u0CCA\u0C82\u0CA1\u0CA6\u0CCD\u0CA6\u0CA8\u0CCD\u0CA8\u0CC1 \u0C9C\u0CB0\u0CC1\u0C97\u0CBF\u0CB8\u0CBF
-move_all =\u0C8E\u0CB2\u0CCD\u0CB2\u0CB5\u0CC1\u0CA6\u0CA8\u0CCD\u0CA8\u0CC2 \u0C9C\u0CB0\u0CC1\u0C97\u0CBF\u0CB8\u0CBF
-remove_selected =\u0C86\u0CAF\u0CCD\u0CA6\u0CC1\u0C95\u0CCA\u0C82\u0CA1\u0CA6\u0CCD\u0CA6\u0CA8\u0CCD\u0CA8\u0CC1 \u0CB0\u0CA6\u0CCD\u0CA6\u0CC1\u0CAE\u0CBE\u0CA1\u0CBF
-remove_all =\u0C8E\u0CB2\u0CCD\u0CB2\u0CB5\u0CC1\u0CA6\u0CA8\u0CCD\u0CA8\u0CC2 \u0CB0\u0CA6\u0CCD\u0CA6\u0CC1\u0CAE\u0CBE\u0CA1\u0CBF

=== removed file 'dhis-2/dhis-web/dhis-web-datamart/src/main/resources/org/hisp/dhis/datamart/i18n_module_ml_IN.properties'
--- dhis-2/dhis-web/dhis-web-datamart/src/main/resources/org/hisp/dhis/datamart/i18n_module_ml_IN.properties	2009-03-03 16:46:36 +0000
+++ dhis-2/dhis-web/dhis-web-datamart/src/main/resources/org/hisp/dhis/datamart/i18n_module_ml_IN.properties	1970-01-01 00:00:00 +0000
@@ -1,55 +0,0 @@
-#Resource generated by I18n Resource Editor
-#Thu Mar 29 20:35:10 IST 2007
-available_organisationunits=\u0D09\u0D33\u0D4D\u0D33 \u0D38\u0D4D\u0D25\u0D3E\u0D2A\u0D28\u0D19\u0D4D\u0D19\u0D33\u0D41\u0D1F\u0D46 \u0D2A\u0D1F\u0D4D\u0D1F\u0D3F\u0D15
-available_periods=\u0D09\u0D33\u0D4D\u0D33 \u0D15\u0D3E\u0D32\u0D3E\u0D35\u0D27\u0D3F
-simple_datamart_export=\u0D38\u0D3E\u0D27\u0D30\u0D23 \u0D21\u0D3E\u0D31\u0D4D\u0D31 \u0D2E\u0D3E\u0D30\u0D4D\u200D\u0D1F\u0D4D\u0D1F\u0D4D \u0D0E\u0D15\u0D4D\u0D38\u0D4D\u0D2A\u0D4B\u0D30\u0D4D\u200D\u0D1F\u0D4D\u0D1F\u0D4D
-available_dataelements=\u0D09\u0D33\u0D4D\u0D33 \u0D21\u0D3E\u0D31\u0D4D\u0D31 \u0D0E\u0D32\u0D3F\u0D2E\u0D46\u0D28\u0D4D\u0D31\u0D4D\u0D38\u0D4D
-maintenance=
-hours=\u0D2E\u0D23\u0D3F\u0D15\u0D4D\u0D15\u0D41\u0D30\u0D4D\u200D
-level=\u0D32\u0D46\u0D35\u0D32\u0D4D\u200D
-simple_export=\u0D38\u0D3E\u0D27\u0D30\u0D23 \u0D0E\u0D15\u0D4D\u0D38\u0D4D\u0D2A\u0D4B\u0D30\u0D4D\u200D\u0D1F\u0D4D\u0D1F\u0D4D
-available_levels=\u0D09\u0D33\u0D4D\u0D33 \u0D32\u0D46\u0D35\u0D32\u0D41\u0D15\u0D33\u0D4D\u200D
-clearing_datamart=\u0D21\u0D3E\u0D31\u0D4D\u0D31 \u0D2E\u0D3E\u0D30\u0D4D\u200D\u0D1F\u0D4D\u0D1F\u0D4D \u0D15\u0D4D\u0D33\u0D3F\u0D2F\u0D31\u0D41 \u0D1A\u0D46\u0D2F\u0D4D\u0D2F\u0D41\u0D15
-selected_datatypes=\u0D21\u0D3E\u0D31\u0D4D\u0D31 \u0D30\u0D3F\u0D24\u0D3F\u0D15\u0D33\u0D4D\u200D \u0D24\u0D3F\u0D30\u0D1E\u0D4D\u0D1E\u0D46\u0D1F\u0D41\u0D15\u0D4D\u0D15\u0D41\u0D15
-selected_dataelements=\u0D21\u0D3E\u0D31\u0D4D\u0D31 \u0D0E\u0D32\u0D3F\u0D2E\u0D46\u0D28\u0D4D\u0D31\u0D4D\u0D38\u0D4D \u0D24\u0D3F\u0D30\u0D1E\u0D4D\u0D1E\u0D46\u0D1F\u0D41\u0D15\u0D4D\u0D15\u0D41\u0D15
-clear_aggregated_datavalues=
-seconds=\u0D28\u0D3F\u0D2E\u0D3F\u0D37\u0D19\u0D4D\u0D19\u0D33\u0D4D\u200D
-estimated_time=\u0D38\u0D2E\u0D2F \u0D15\u0D3E\u0D32\u0D3E\u0D35\u0D27\u0D3F
-structures_generated=\u0D30\u0D41\u0D2A\u0D30\u0D47\u0D16 \u0D24\u0D2F\u0D4D\u0D2F\u0D3E\u0D31\u0D3E\u0D2F\u0D3F
-generating_structures=\u0D30\u0D41\u0D2A\u0D30\u0D47\u0D16 \u0D24\u0D2F\u0D4D\u0D2F\u0D3E\u0D31\u0D3E\u0D15\u0D4D\u0D15\u0D41\u0D28\u0D4D\u0D28\u0D41...
-_values_were_exported=\u0D35\u0D3F\u0D32\u0D15\u0D33\u0D4D\u200D \u0D0E\u0D15\u0D4D\u0D38\u0D4D\u0D2A\u0D4B\u0D30\u0D4D\u200D\u0D1F\u0D4D\u0D1F\u0D4D \u0D06\u0D2F\u0D3F
-available_indicators=\u0D09\u0D33\u0D4D\u0D33 \u0D07\u0D28\u0D4D\u0D31\u0D3F\u0D15\u0D4D\u0D15\u0D47\u0D31\u0D4D\u0D31\u0D41\u0D15\u0D33\u0D4D\u200D
-selected_periods=\u0D2E\u0D3E\u0D38\u0D02 \u0D24\u0D3F\u0D30\u0D1E\u0D4D\u0D1E\u0D46\u0D1F\u0D41\u0D15\u0D4D\u0D15\u0D41\u0D15
-datamart=\u0D21\u0D3E\u0D31\u0D4D\u0D31 \u0D2E\u0D3E\u0D30\u0D4D\u200D\u0D1F\u0D4D\u0D1F\u0D4D
-perform_maintenance=
-structures=
-second=
-advanced_datamart_export=\u0D2E\u0D41\u0D28\u0D4D\u200D\u0D15\u0D41\u0D30\u0D4D\u200D \u0D21\u0D3E\u0D31\u0D4D\u0D31 \u0D2E\u0D3E\u0D30\u0D4D\u200D\u0D1F\u0D4D\u0D1F\u0D4D \u0D0E\u0D15\u0D4D\u0D38\u0D4D\u0D2A\u0D4B\u0D30\u0D4D\u200D\u0D1F\u0D4D\u0D1F\u0D4D \u0D1A\u0D46\u0D2F\u0D4D\u0D2F\u0D41\u0D15
-select_min_period=\u0D12\u0D30\u0D41 \u0D2E\u0D3E\u0D38\u0D2E\u0D46\u0D19\u0D4D\u0D15\u0D3F\u0D32\u0D41\u0D02 \u0D24\u0D3F\u0D30\u0D1E\u0D4D\u0D1E\u0D46\u0D1F\u0D41\u0D15\u0D4D\u0D15\u0D41\u0D15
-datamart_cleared=\u0D21\u0D3E\u0D31\u0D4D\u0D31 \u0D2E\u0D3E\u0D30\u0D4D\u200D\u0D1F\u0D4D\u0D1F\u0D4D \u0D15\u0D4D\u0D33\u0D3F\u0D2F\u0D31\u0D41 \u0D1A\u0D46\u0D2F\u0D4D\u0D2F\u0D4D\u0D24\u0D4D\u0D24\u0D41
-confirm_clear_message=\u0D24\u0D3E\u0D19\u0D4D\u0D15\u0D33\u0D41\u0D15\u0D4D\u0D15\u0D4D \u0D24\u0D3F\u0D30\u0D4D\u200D\u0D1A\u0D4D\u0D1A\u0D2F\u0D3E\u0D2F\u0D41\u0D02 \u0D21\u0D3E\u0D31\u0D4D\u0D31 \u0D2E\u0D3E\u0D30\u0D4D\u200D\u0D1F\u0D4D\u0D1F\u0D4D \u0D15\u0D4D\u0D33\u0D3F\u0D2F\u0D31\u0D41 \u0D1A\u0D46\u0D2F\u0D4D\u0D2F\u0D23\u0D2E\u0D4B ?
-generate_structures=\u0D30\u0D41\u0D2A\u0D30\u0D47\u0D16 \u0D24\u0D2F\u0D4D\u0D2F\u0D3E\u0D31\u0D15\u0D4D\u0D15\u0D41\u0D15
-export_to_datamart=\u0D21\u0D3E\u0D31\u0D4D\u0D31 \u0D2E\u0D3E\u0D30\u0D4D\u200D\u0D1F\u0D4D\u0D1F\u0D3F\u0D32\u0D46\u0D15\u0D4D\u0D15\u0D4D \u0D0E\u0D15\u0D4D\u0D38\u0D4D\u0D2A\u0D4B\u0D30\u0D4D\u200D\u0D1F\u0D4D\u0D1F\u0D4D \u0D1A\u0D46\u0D2F\u0D4D\u0D2F\u0D41\u0D15
-indicators=\u0D07\u0D28\u0D4D\u0D31\u0D3F\u0D15\u0D4D\u0D15\u0D47\u0D31\u0D4D\u0D31\u0D4D\u0D38\u0D4D
-select_min_level=\u0D12\u0D30\u0D41 \u0D32\u0D46\u0D35\u0D32\u0D46\u0D19\u0D4D\u0D15\u0D3F\u0D32\u0D41\u0D02 \u0D24\u0D3F\u0D30\u0D1E\u0D4D\u0D1E\u0D46\u0D1F\u0D41\u0D15\u0D4D\u0D15\u0D41\u0D15
-clear=\u0D15\u0D4D\u0D33\u0D3F\u0D2F\u0D31\u0D4D
-select_period_type_all=\u0D15\u0D3E\u0D32\u0D3E\u0D35\u0D27\u0D3F\u0D2F\u0D41\u0D1F\u0D46 \u0D30\u0D3F\u0D24\u0D3F \u0D24\u0D3F\u0D30\u0D1E\u0D4D\u0D1E\u0D46\u0D1F\u0D41\u0D15\u0D4D\u0D15\u0D41\u0D15 / \u0D2E\u0D41\u0D34\u0D41\u0D35\u0D28\u0D4D\u200D
-selected_indicators=\u0D07\u0D28\u0D4D\u0D31\u0D3F\u0D15\u0D4D\u0D15\u0D47\u0D31\u0D4D\u0D31\u0D41\u0D15\u0D33\u0D4D\u200D \u0D24\u0D3F\u0D30\u0D1E\u0D4D\u0D1E\u0D46\u0D1F\u0D41\u0D15\u0D4D\u0D15\u0D41\u0D15
-dataelements=\u0D21\u0D3E\u0D31\u0D4D\u0D31 \u0D0E\u0D32\u0D3F\u0D2E\u0D46\u0D28\u0D4D\u0D31\u0D4D\u0D38\u0D4D
-organisation_unit_structure=\u0D38\u0D4D\u0D25\u0D3E\u0D2A\u0D28\u0D19\u0D4D\u0D19\u0D33\u0D41\u0D1F\u0D46 \u0D2A\u0D1F\u0D4D\u0D1F\u0D3F\u0D15\u0D2F\u0D41\u0D1F\u0D46 \u0D30\u0D41\u0D2A\u0D30\u0D47\u0D16
-minutes=\u0D2E\u0D3F\u0D28\u0D3F\u0D31\u0D4D\u0D31\u0D41\u0D15\u0D33\u0D4D\u200D
-select_indicatorgroup_all=\u0D07\u0D28\u0D4D\u200D\u0D21\u0D3F\u0D15\u0D4D\u0D15\u0D47\u0D31\u0D4D\u0D31\u0D30\u0D4D\u200D \u0D17\u0D4D\u0D30\u0D42\u0D2A\u0D4D\u0D2A\u0D4D/\u0D2E\u0D41\u0D34\u0D41\u0D35\u0D28\u0D42\u0D02
-select_min_datatype=\u0D21\u0D47\u0D31\u0D4D\u0D31\u0D3E\u0D1F\u0D48\u0D2A\u0D4D\u0D2A\u0D46\u0D19\u0D4D\u0D15\u0D3F\u0D32\u0D41\u0D02 \u0D24\u0D3F\u0D30\u0D1E\u0D4D\u0D1E\u0D46\u0D1F\u0D41\u0D15\u0D4D\u0D15\u0D41\u0D15
-select_options=\u0D12\u0D30\u0D41 \u0D13\u0D2A\u0D4D\u0D37\u0D28\u0D41\u0D02 \u0D24\u0D3F\u0D30\u0D1E\u0D4D\u0D1E\u0D46\u0D1F\u0D41\u0D24\u0D4D\u0D24\u0D3F\u0D32\u0D4D\u0D32
-available_datatypes=\u0D32\u0D2D\u0D4D\u0D2F\u0D2E\u0D3E\u0D2F\u0D3F\u0D1F\u0D4D\u0D1F\u0D41\u0D33\u0D4D\u0D33 \u0D21\u0D47\u0D31\u0D4D\u0D31\u0D3E\u0D1F\u0D48\u0D2A\u0D4D\u0D2A\u0D41\u0D15\u0D33\u0D4D\u200D
-advanced_export=\u0D05\u0D21\u0D4D\u0D35\u0D3E\u0D28\u0D4D\u200D\u0D38\u0D4D\u0D21\u0D4D \u0D0E\u0D15\u0D4D\u0D38\u0D4D\u0D2A\u0D4B\u0D30\u0D4D\u200D\u0D1F\u0D4D\u0D1F\u0D4D
-_values_were_exported_in=
-selected_levels=\u0D24\u0D3F\u0D30\u0D1E\u0D4D\u0D1E\u0D46\u0D1F\u0D41\u0D24\u0D4D\u0D24 \u0D32\u0D46\u0D35\u0D32\u0D41\u0D15\u0D33\u0D4D\u200D
-selected_organisationunits=\u0D24\u0D3F\u0D30\u0D1E\u0D4D\u0D1E\u0D1F\u0D41\u0D24\u0D4D\u0D24 \u0D13\u0D30\u0D4D\u200D\u0D17\u0D48\u0D38\u0D47\u0D37\u0D28\u0D4D\u200D \u0D2F\u0D42\u0D23\u0D3F\u0D31\u0D4D\u0D31\u0D41\u0D15\u0D33\u0D4D\u200D
-group_set_structure=\u0D13\u0D30\u0D4D\u200D\u0D17\u0D28\u0D48\u0D38\u0D47\u0D37\u0D28\u0D4D\u200D \u0D2F\u0D42\u0D23\u0D3F\u0D31\u0D4D\u0D31\u0D3F\u0D28\u0D4D\u200D\u0D31\u0D4D\u0D31\u0D46 \u0D2E\u0D3E\u0D24\u0D4D\u0D30\u0D2E\u0D3E\u0D2F\u0D3F\u0D1F\u0D4D\u0D1F\u0D41\u0D33\u0D4D\u0D33 \u0D17\u0D4D\u0D30\u0D42\u0D2A\u0D4D\u0D2A\u0D4D\u0D38\u0D46\u0D31\u0D4D\u0D31\u0D4D \u0D30\u0D42\u0D2A\u0D02
-nr_of_comb=
-exporting_values=\u0D35\u0D3F\u0D32\u0D15\u0D33\u0D4D\u200D \u0D0E\u0D15\u0D4D\u0D38\u0D4D\u0D2A\u0D4B\u0D30\u0D4D\u200D\u0D1F\u0D4D\u0D1F\u0D4D \u0D1A\u0D46\u0D2F\u0D4D\u0D2F\u0D41\u0D28\u0D4D\u0D28\u0D41 ...
-select_organisationunit_level_all=\u0D13\u0D30\u0D4D\u200D\u0D17\u0D28\u0D48\u0D38\u0D47\u0D37\u0D28\u0D4D\u200D \u0D2F\u0D42\u0D23\u0D3F\u0D31\u0D4D\u0D31\u0D4D \u0D32\u0D46\u0D35\u0D32\u0D4D\u200D \u0D24\u0D3F\u0D30\u0D1E\u0D4D\u0D1E\u0D1F\u0D41\u0D15\u0D4D\u0D15\u0D41\u0D15/\u0D2E\u0D41\u0D34\u0D41\u0D35\u0D28\u0D41\u0D02
-values=
-select_dataelementgroup_all=\u0D21\u0D46\u0D31\u0D4D\u0D31\u0D3E \u0D0E\u0D32\u0D3F\u0D2E\u0D46\u0D28\u0D4D\u200D\u0D31\u0D4D\u0D31\u0D4D \u0D17\u0D4D\u0D30\u0D42\u0D2A\u0D4D\u0D2A\u0D4D \u0D24\u0D3F\u0D30\u0D1E\u0D4D\u0D1E\u0D46\u0D1F\u0D41\u0D15\u0D4D\u0D15\u0D41\u0D15/\u0D2E\u0D41\u0D34\u0D41\u0D35\u0D28\u0D41\u0D02
-export=\u0D0E\u0D15\u0D4D\u0D38\u0D4D\u0D2A\u0D4B\u0D30\u0D4D\u200D\u0D1F\u0D4D\u0D1F\u0D4D

=== removed file 'dhis-2/dhis-web/dhis-web-datamart/src/main/resources/org/hisp/dhis/datamart/i18n_module_my_MM.properties'
--- dhis-2/dhis-web/dhis-web-datamart/src/main/resources/org/hisp/dhis/datamart/i18n_module_my_MM.properties	2011-12-14 08:10:22 +0000
+++ dhis-2/dhis-web/dhis-web-datamart/src/main/resources/org/hisp/dhis/datamart/i18n_module_my_MM.properties	1970-01-01 00:00:00 +0000
@@ -1,46 +0,0 @@
-available_organisationunits=\u101B\u108E\u102D\u102F\u1004\u1039\u1010\u1032\u1037 \u1021\u1005\u102E\u1021\u1005\u1025\u1039 \u1005\u1036\u108E\u1081\u1014\u1039\u1038\u1019\u1035\u102C\u1038
-available_periods=\u101B\u108E\u102D\u102F\u1004\u1039\u1010\u1032\u1037 \u1000\u102C\u101C\u1021\u1015\u102D\u102F\u1004\u1039\u1038\u1021\u1034\u1001\u102C\u1038\u1019\u1035\u102C\u1038
-simple_datamart_export=\u109F\u102D\u102F\u1038\u101B\u1080\u1004\u1039\u1038\u1010\u1032\u1037 \u101C\u102F\u1015\u1039\u1031\u1006\u102C\u1004\u1039\u1001\u1032\u1037\u1010\u1032\u1037 \u101C\u102F\u1015\u1039\u1004\u1014\u1039\u1038\u1005\u1025\u1039 \u1021\u1001\u1035\u1000\u1039\u1021\u101C\u1000\u1039\u1000\u102D\u102F \u1021\u1034\u1015\u1004\u1039\u101E\u102D\u102F\u109A \u1011\u102F\u1010\u1039\u101A\u1030\u101B\u1014\u1039
-available_dataelements=\u101B\u108E\u102D\u102F\u1004\u1039\u1010\u1032\u1037 \u101C\u102D\u102F\u1021\u1015\u1039\u1010\u1032\u1037 \u1021\u1001\u1035\u1000\u1039\u1021\u101C\u1000\u1039\u1031\u1010\u107E
-hours=\u1014\u102C\u101B\u102E\u1019\u1035\u102C\u1038
-level=\u1021\u1006\u1004\u1039\u1037
-simple_export=\u109F\u102D\u102F\u1038\u101B\u1080\u1004\u1039\u1038\u1010\u1032\u1037 \u1021\u1034\u1015\u1004\u1039\u101E\u102D\u102F\u109A \u1011\u102F\u1010\u1039\u1019\u1081
-available_levels=\u101B\u108E\u102D\u102F\u1004\u1039\u1010\u1032\u1037 \u1021\u1006\u1004\u1039\u1037\u1019\u1035\u102C\u1038
-clearing_datamart=\u101C\u102F\u1015\u1039\u1031\u1006\u102C\u1004\u1039\u1001\u1032\u1037\u1010\u1032\u1037 \u101C\u102F\u1015\u1039\u1004\u1014\u1039\u1038\u1005\u1025\u1039 \u1021\u1001\u1035\u1000\u1039\u1021\u101C\u1000\u1039\u1031\u1010\u107E\u1000\u102D\u102F \u101B\u1080\u1004\u1039\u1038\u101C\u1004\u1039\u1038\u101B\u1014\u1039...
-selected_datatypes=\u1021\u1001\u1035\u1000\u1039\u1021\u101C\u1000\u1039 \u1021\u1019\u1035\u1082\u102D\u1038\u1021\u1005\u102C\u1038\u1031\u1010\u107E\u1000\u102D\u102F \u1031\u109F\u107F\u1038\u1001\u1035\u101A\u1039\u101B\u1014\u1039
-selected_dataelements=\u101C\u102D\u102F\u1021\u1015\u1039\u1010\u1032\u1037 \u1021\u1001\u1035\u1000\u1039\u1021\u101C\u1000\u1039\u1031\u1010\u107E\u1000\u102D\u102F \u1031\u109F\u107F\u1038\u1001\u1035\u101A\u1039\u101B\u1014\u1039
-seconds=\u1005\u1000\u1060\u1014\u1039\u109A
-estimated_time=\u1001\u1014\u1039\u109A\u1019\u1080\u1014\u1039\u1038 \u1021\u1001\u1035\u102D\u1014\u1039
-structures_generated=\u1016\u107E\u1032\u109A\u1005\u100A\u1039\u1038\u1010\u100A\u1039\u1031\u1006\u102C\u1000\u1039\u1015\u1036\u102F\u1031\u1010\u107E\u1000\u102D\u102F \u1011\u102F\u1010\u1039\u1031\u1015\u1038\u101C\u102D\u102F\u1000\u1039\u1093\u1015\u102E
-generating_structures=\u1011\u102F\u1010\u1039\u1031\u1015\u1038\u101C\u102D\u102F\u1000\u1039\u1010\u1032\u1037 \u1016\u107E\u1032\u109A\u1005\u100A\u1039\u1038\u1010\u100A\u1039\u1031\u1006\u102C\u1000\u1039\u1015\u1036\u102F\u1031\u1010\u107E ...
-_values_were_exported=\u1010\u1014\u1039\u1016\u102D\u102F\u1038\u1031\u1010\u107E\u1000\u102D\u102F \u1021\u1034\u1015\u1004\u1039\u101E\u102D\u102F\u109A \u1011\u102F\u1010\u1039\u101C\u102D\u102F\u1000\u1039\u1010\u101A\u1039
-available_indicators=\u101B\u108E\u102D\u102F\u1004\u1039\u1010\u1032\u1037 \u108C\u107F\u1014\u1039\u1038\u1006\u102D\u102F\u1019\u1081\u1031\u1010\u107E
-selected_periods=\u1000\u102C\u101C\u1021\u1015\u102D\u102F\u1004\u1039\u1038\u1021\u1034\u1001\u102C\u1038\u1000\u102D\u102F \u1031\u109F\u107E\u1038\u1001\u1035\u101A\u1039\u101B\u1014\u1039
-datamart=\u101C\u102F\u1015\u1039\u1031\u1006\u102C\u1004\u1039\u1001\u1032\u1037\u1010\u1032\u1037 \u101C\u102F\u1015\u1039\u1004\u1014\u1039\u1038\u1005\u1025\u1039 \u1021\u1001\u1035\u1000\u1039\u1021\u101C\u1000\u1039
-advanced_datamart_export=\u1021\u1006\u1004\u1039\u1037\u1034\u1019\u1004\u1039\u1037 \u101C\u102F\u1015\u1039\u1031\u1006\u102C\u1004\u1039\u1001\u1032\u1037\u1010\u1032\u1037 \u101C\u102F\u1015\u1039\u1004\u1014\u1039\u1038\u1005\u1025\u1039 \u1021\u1001\u1035\u1000\u1039\u1021\u101C\u1000\u1039\u1000\u102D\u102F \u1021\u1034\u1015\u1004\u1039\u101E\u102D\u102F\u109A \u1011\u102F\u1010\u1039\u101B\u1014\u1039
-select_min_period=\u1021\u1014\u100A\u1039\u1038\u1006\u1036\u102F\u1038 \u1000\u102C\u101C\u1021\u1015\u102D\u102F\u1004\u1039\u1038\u1021\u1034\u1001\u102C\u1038\u1010\u1001\u102F\u1000\u102D\u102F \u1031\u109F\u107E\u1038\u1015\u105D
-datamart_cleared=\u101C\u102F\u1015\u1039\u1031\u1006\u102C\u1004\u1039\u1001\u1032\u1037\u1010\u1032\u1037 \u101C\u102F\u1015\u1039\u1004\u1014\u1039\u1038\u1005\u1025\u1039 \u1021\u1001\u1035\u1000\u1039\u1021\u101C\u1000\u1039\u1000\u102D\u102F \u101B\u1080\u1004\u1039\u1038\u1011\u102F\u1010\u1039\u101C\u102D\u102F\u1000\u1039\u1093\u1015\u102E
-confirm_clear_message=\u101C\u102F\u1015\u1039\u1031\u1006\u102C\u1004\u1039\u1001\u1032\u1037\u1010\u1032\u1037 \u101C\u102F\u1015\u1039\u1004\u1014\u1039\u1038\u1005\u1025\u1039 \u1021\u1001\u1035\u1000\u1039\u1021\u101C\u1000\u1039\u1000\u102D\u102F \u101B\u1080\u1004\u1039\u1038\u1011\u102F\u1010\u1039\u1001\u1035\u1004\u1039\u1010\u102C \u101F\u102F\u1010\u1039\u1015\u105D\u101E\u101C\u102C\u1038
-generate_structures=\u1016\u107E\u1032\u109A\u1005\u100A\u1039\u1038\u1010\u100A\u1039\u1031\u1006\u102C\u1000\u1039\u1015\u1036\u102F\u1031\u1010\u107E\u1000\u102D\u102F \u1011\u102F\u1010\u1039\u1031\u1015\u1038\u101B\u1014\u1039
-export_to_datamart=\u101C\u102F\u1015\u1039\u1031\u1006\u102C\u1004\u1039\u1001\u1032\u1037\u1010\u1032\u1037 \u101C\u102F\u1015\u1039\u1004\u1014\u1039\u1038\u1005\u1025\u1039 \u1021\u1001\u1035\u1000\u1039\u1021\u101C\u1000\u1039\u101E\u102D\u102F\u109A \u1010\u1004\u1039\u1015\u102D\u102F\u109A\u101B\u1014\u1039
-indicators=\u108C\u107F\u1014\u1039\u1038\u1006\u102F\u102D\u1019\u1081\u1031\u1010\u107E
-select_min_level=\u1021\u1014\u100A\u1039\u1038\u1006\u1036\u102F\u1038 \u1021\u1006\u1004\u1039\u1037\u1010\u1001\u102F\u1000\u102D\u102F \u1031\u109F\u107E\u1038\u1001\u1035\u101A\u1039\u1015\u105D
-clear=\u101B\u1080\u1004\u1039\u1038\u1011\u102F\u1010\u1039\u101B\u1014\u1039
-select_period_type_all= \u1000\u102C\u101C\u1021\u1015\u102D\u102F\u1004\u1039\u1038\u1021\u1034\u1001\u102C\u1038 \u1021\u1019\u1035\u1082\u102D\u1038\u1000\u102D\u102F \u1031\u109F\u107F\u1038\u1001\u1035\u101A\u1039\u1015\u105D / \u1021\u102C\u1038\u101C\u1036\u102F\u1038
-selected_indicators=\u108C\u107F\u1014\u1039\u1038\u1006\u102F\u102D\u1019\u1081\u1031\u1010\u107E\u1000\u102D\u102F \u1031\u109F\u107E\u1038\u1001\u1035\u101A\u1039\u101C\u102D\u102F\u1000\u1039\u1093\u1015\u102E
-dataelements=\u101C\u102D\u102F\u1021\u1015\u1039\u1010\u1032\u1037 \u1021\u1001\u1035\u1000\u1039\u1021\u101C\u1000\u1039\u1031\u1010\u107E
-minutes=\u1019\u102D\u1014\u1005\u1039\u1031\u1010\u107E
-organisation_unit_structure=\u1021\u1005\u102E\u1021\u1005\u1025\u1039 \u1005\u1036\u108E\u1081\u1014\u1039\u1038 \u1010\u100A\u1039\u1031\u1006\u102C\u1000\u1039\u1015\u1036\u102F
-select_indicatorgroup_all=\u108C\u107F\u1014\u1039\u1038\u1006\u102F\u102D\u1011\u102C\u1038\u1010\u1032\u1037 \u1021\u102F\u1015\u1039\u1005\u102F\u1000\u102D\u102F \u1031\u109F\u107E\u1038\u1001\u1035\u101A\u1039\u101B\u1014\u1039 / \u1021\u102C\u1038\u101C\u1036\u102F\u1038
-select_min_datatype=\u1021\u1014\u100A\u1039\u1038\u1006\u1036\u102F\u1038 \u1021\u1001\u1035\u1000\u1039\u1021\u101C\u1000\u1039 \u1021\u1019\u1035\u1082\u102D\u1038\u1021\u1005\u102C\u1038\u1010\u1001\u102F\u1000\u102D\u102F \u1031\u109F\u107E\u1038\u1001\u1035\u101A\u1039\u1015\u105D
-select_options=\u1031\u109F\u107E\u1038\u1001\u1035\u101A\u1039\u108E\u102D\u102F\u1004\u1039\u1010\u1032\u1037 \u1015\u1036\u102F\u1019\u1080\u1014\u1039\u101E\u1010\u1039\u1019\u1080\u1010\u1039\u1011\u102C\u1038\u1010\u1032\u1037\u1005\u1036\u1031\u1010\u107E \u1019\u101B\u1080\u102D\u1015\u105D
-available_datatypes=\u101B\u108E\u102D\u102F\u1004\u1039\u1010\u1032\u1037 \u1021\u1001\u1035\u1000\u1039\u1021\u101C\u1000\u1039 \u1021\u1019\u1035\u1082\u102D\u1038\u1021\u1005\u102C\u1038\u1031\u1010\u107E
-advanced_export=\u1021\u1006\u1004\u1039\u1037\u1034\u1019\u1004\u1039\u1037\u1010\u1032\u1037 \u1021\u1034\u1015\u1004\u1039\u101E\u102D\u102F\u109A\u1011\u102F\u1010\u1039\u101B\u1014\u1039
-selected_organisationunits=\u1031\u109F\u107E\u1038\u1001\u1035\u101A\u1039\u1011\u102C\u1038\u1010\u1032\u1037 \u1021\u1005\u102E\u1021\u1005\u1025\u1039 \u1005\u1036\u108E\u1081\u1014\u1039\u1038\u1031\u1010\u107E
-selected_levels=\u1031\u109F\u107E\u1038\u1001\u1035\u101A\u1039\u1011\u102C\u1038\u1010\u1032\u1037 \u1021\u1006\u1004\u1039\u1037\u1031\u1010\u107E
-exporting_values=\u1021\u1034\u1015\u1004\u1039\u101E\u102D\u102F\u109A \u1011\u102F\u1010\u1039\u101C\u102D\u102F\u1000\u1039\u1010\u1032\u1037 \u1010\u1014\u1039\u1016\u102D\u102F\u1038\u1031\u1010\u107E ...
-group_set_structure=\u1021\u102F\u1015\u1039\u1005\u102F\u101C\u102D\u102F\u1000\u1039 \u1021\u1011\u1030\u1038\u101E\u102E\u1038\u101E\u1014\u1039\u109A \u1021\u1005\u102E\u1021\u1005\u1025\u1039 \u1005\u1036\u108E\u1081\u1014\u1039\u1038 \u1010\u100A\u1039\u1031\u1006\u102C\u1000\u1039\u1015\u1036\u102F
-select_organisationunit_level_all=\u1021\u1005\u102E\u1021\u1005\u1025\u1039 \u1005\u1036\u108E\u1081\u1014\u1039\u1038 \u1021\u1006\u1004\u1039\u1037\u1000\u102D\u102F \u1031\u109F\u107E\u1038\u1001\u1035\u101A\u1039\u101B\u1014\u1039 / \u1021\u102C\u1038\u101C\u1036\u102F\u1038
-select_dataelementgroup_all=\u101C\u102D\u102F\u1021\u1015\u1039\u1010\u1032\u1037 \u1021\u1001\u1035\u1000\u1039\u1021\u101C\u1000\u1039 \u1021\u102F\u1015\u1039\u1005\u102F\u1000\u102D\u102F \u1031\u109F\u107E\u1038\u1001\u1035\u101A\u1039\u101B\u1014\u1039 / \u1021\u102C\u1038\u101C\u1036\u102F\u1038
-export=\u1021\u1034\u1015\u1004\u1039\u101E\u102D\u102F\u109A\u1011\u102F\u1010\u1039\u101B\u1014\u1039
-

=== removed file 'dhis-2/dhis-web/dhis-web-datamart/src/main/resources/org/hisp/dhis/datamart/i18n_module_no_NO.properties'
--- dhis-2/dhis-web/dhis-web-datamart/src/main/resources/org/hisp/dhis/datamart/i18n_module_no_NO.properties	2009-03-03 16:46:36 +0000
+++ dhis-2/dhis-web/dhis-web-datamart/src/main/resources/org/hisp/dhis/datamart/i18n_module_no_NO.properties	1970-01-01 00:00:00 +0000
@@ -1,75 +0,0 @@
-#Resource generated by I18n Resource Editor
-#Sat Feb 02 03:11:15 IST 2008
-remove_selected=Fjern valgte
-no_export_process_running=Ingen eksport kj\u00F8rer
-nr_of_comb=Antall kombinasjoner
-export_process_started=Eksporten er p\u00E5begynt
-selected_dataelements=Valgte dataelementer
-datamart_cleared=Innholdet i datamarten ble slettet
-deleting_existing_aggregated_data=Sletter eksisterende aggregert data
-structures_generated=Generert struktur
-performing_maintenance=Foretar vedlikehold
-crosstabulating_data=Krysstabuleringsdata
-exporting_values=Eksporterer dataverdier...
-selected_datatypes=Valgte data typer
-generate_structures=Generer strukturer
-available_indicators=Tilgjengelige indikatorer
-export_to_datamart=Eksporter til Data Mart
-_values_were_exported=verdier ble eksportert
-select_period_type_all=Velg periodetype / Alle
-select_indicatorgroup_all=Velg indikatorgruppe / Alle
-advanced_export=Avansert Data Mart-eksport
-available_periods=Tilgjengelig perioder
-available_datatypes=Tilgjengelige datatyper
-seconds=sekunder
-simple_datamart_export=Enkel Data Mart-eksport
-export_process_cancelled=Eksporten ble avbrutt
-simple_export=Enkel eksport
-values=verdier
-estimated_time=Ansl\u00E5tt tid
-select_organisationunit_level_all=Velg organisasjonsenhetsniv\u00E5 / Alle
-select_min_datatype=Velg minst \u00E9n datatype
-clear_hierarchy_history=Slett hierarki-historikk
-exporting_data_for_indicators=Eksporterer data for indikatorer
-clear_periods_without_datavalues=Slett perioder uten registrerte dataverdier
-clear_aggregated_indicatorvalues=Slett aggregerte indikatorverdier
-remove_all=Fjern alle
-available_dataelements=Tilgjengelige dataelementer
-export=Eksporter
-clear_aggregated_datavalues=Slett aggregerte dataverdier
-select_min_period=Velg minst \u00E9n periode
-selected_organisationunits=Valgte organisasjonsenheter
-hours=timer
-available_organisationunits=Tilgjengelig organisasjonsenheter
-structures=Strukturer
-advanced_datamart_export=Avansert Data Mart-eksport
-confirm_clear_message=Er du sikker p\u00E5 at du vil slette innholdet i datamarten?
-export_process_done=Eksporten er ferdig
-clearing_datamart=Sletter innholdet i Data Marten...
-minutes=minutter
-level=Niv\u00E5
-move_selected=Flytt valgte
-second=sekund
-generating_structures=Genererer strukturer...
-clear=Slett
-indicators=Indikatorer
-maintenance=Vedlikehold
-organisation_unit_structure=Organisasjonsenhetsstruktur
-structures_and_maintenance=Strukturer og vedlikehold
-exporting_data_for_data_elements=Eksporterer data for dataelementer
-perform_maintenance=Foreta vedlikehold
-select_min_level=Velg minst ett niv\u00E5
-available_levels=Tilgjengelige niv\u00E5er
-group_set_structure=Ekskluderende gruppesett-struktur for organisasjonsenheter
-selected_levels=Valgte niv\u00E5er
-_values_were_exported_in=verdier ble eksportert i
-move_all=Flytt alle
-select_options=Ingen alternativer valgt
-select_dataelementgroup_all=Velg dataelementgruppe / Alle
-dataelements=Dataelementer
-datamart=Data Mart
-selected_indicators=Valgte indikatorer
-selected_periods=Valgte perioder
-completed=fullf\u00F8rt
-cancel=Avbryt
-maintenance_performed=Vedlikehold er utf\u00F8rt

=== removed file 'dhis-2/dhis-web/dhis-web-datamart/src/main/resources/org/hisp/dhis/datamart/i18n_module_pt_PT.properties'
--- dhis-2/dhis-web/dhis-web-datamart/src/main/resources/org/hisp/dhis/datamart/i18n_module_pt_PT.properties	2011-12-29 07:23:40 +0000
+++ dhis-2/dhis-web/dhis-web-datamart/src/main/resources/org/hisp/dhis/datamart/i18n_module_pt_PT.properties	1970-01-01 00:00:00 +0000
@@ -1,82 +0,0 @@
-move_selected=Mover seleccionado
-move_all=Mover todos
-move_children=Mover a unidade filha da unidade seleccionada
-remove_selected=Remover seleccione
-remove_all=Remover todos trancados
-available_dataelements=Elementos de dados dispon\u00edveis
-selected_dataelements=Elementos de dados selecionados
-select_dataelementgroup_all=Selecione o grupo de elemento de dados / Todos
-available_indicators=Indicadores disponivel
-selected_indicators=Indicadores selecionados
-select_indicatorgroup_all=Selecione o grupo de indicador / Ver todos
-available_organisationunits=Unidades Organizacionais disponiveis
-selected_organisationunits=Unidades organizacionais seleccionado
-select_organisationunit_level_all=Selecione N\u00edvel Unidade de Organiza\u00e7\u00e3o / Todos
-level=Nivel
-available_periods=Per\u00edodos disponiveis
-selected_periods=Per\u00edodos selecionados
-select_period_type_all=Tipos de per\u00eddos seleccionados / todos
-export=Exportar
-select_min_datatype=Seleccione pelo menos um tipo de dado
-select_min_level=Selecione pelo menos um n\u00edvel
-select_min_period=Seleccione pelo menos um per\u00edodo
-_values_were_exported_in=valores foram exportados em
-available_levels=N\u00edveis dispon\u00edveis
-selected_levels=N\u00edveis selecionados
-datamart=Data Mart
-datamart_export=Exporta\u00e7\u00e3o do data mart
-available_datatypes=Tipos de dados dispon\u00edveis
-selected_datatypes=Tipos de dados seleccionados
-dataelements=Elementos de dados
-select_options=Nenhuma opc\u00e7\u00e3o seleccionada
-nr_of_comb=N\u00famero de combina\u00e7\u00f5es
-values=Valores
-second=segundo
-deleting_existing_aggregated_data=Exclus\u00e3o de dados agregados existentes
-crosstabulating_data=Dados Tabela cruzada
-exporting_data_for_data_elements=Exportando dadp para elementos de dado
-exporting_data_for_calculated_data_elements=Expotar dados para elementos de dados calculados
-exporting_data_for_indicators=Exportando dados para indicadores
-export_process_done=Processo de exporta\u00e7\u00e3o realizado
-completed=completo
-process_completed=Processo de exporta\u00e7\u00e3o completo
-process_started=Verificando...
-process_failed=Processo falhou - Ver log para obter detalhes
-no_export_process_running=Nenhum process de exporta\u00e7\u00e3o esta a decorrer
-export_process_not_initialized=Processo de exporta\u00e7\u00e3o n\u00e3o iniciado
-datamart_intro=Por favor, seleccione um item do menu.
-export_saved=Exporta\u00e7\u00e3o gravada
-data_mart_export_management=Gest\u00e3o de exporta\u00e7\u00e3o de Data Mart
-confirm_delete_data_mart_export=Tem a certeza que deseja apagar a exporta\u00e7\u00e3o do datamart
-number_of_data_elements=N\u00famero de elementos de dados
-number_of_indicators=N\u00famero de indicadores
-number_of_organisation_units=N\u00famero de unidades organizacionais
-number_of_periods=N\u00famero de per\u00edodos
-must_select_at_least_one_dataelement_or_indicator=Por favor, seleccione pelo menos um elemento de dado ou indicador
-must_select_at_least_one_organisation_unit=Por favor, seleccione pelo menos uma unidade organizacional
-must_select_at_least_one_period=Por favor, seleccione pelo menos um per\u00edodo
-specify_name=Por favor, especifique um nome
-name_in_use=O nome j\u00e1 est\u00e1 em uso. Por favor, escolha um nome diferente
-data_mart=Data Mart
-generate_data_mart=Gerando o Data Mart
-add_to_dashboard=Adicionar para painel de instrumentos
-confirm_add_to_dashboard=Tem certeza que pretende adicionar esta exporta\u00e7\u00e3o de data mart ao painel?
-export_to_datamart=Exportar para Data Mart
-could_not_export_too_many_data_elements=N\u00e3o foi poss\u00edvel exportar porque muitos elementos de dados foram selecionados
-export_process_failed=Processo de exporta\u00e7\u00e3o falhou - Ver log para obter detalhes
-relative_periods=Per\u00edodos relativos
-reporting_month=Meses relat\u00f3rios
-months_this_year=Meses de este ano
-quarters_this_year=Trimestres deste ano
-this_year=Este ano
-months_last_year=Meses do ano passado
-quarters_last_year=Trimestres do ano passado
-last_year=Ano passado
-prev=Prev
-next=Pr\u00f3ximo
-start=Inicio
-stop=Parar
-refresh=Refresh
-intro_data_mart_export=Criar exporta\u00e7\u00f5es data mart. Exporta\u00e7\u00f5es de data mart cont\u00e9m elementos de dados, indicadores, unidades organizacionais e per\u00edodos.
-intro_data_mart_scheduling=Configurar e gerenciar as exporta\u00e7\u00f5es programadas data mart, que ser\u00e1 executado todas as noites as 2 AM durante os per\u00edodos deste ano.
-data_mart_export=Exportar para Data Mart

=== removed file 'dhis-2/dhis-web/dhis-web-datamart/src/main/resources/org/hisp/dhis/datamart/i18n_module_ru_RU.properties'
--- dhis-2/dhis-web/dhis-web-datamart/src/main/resources/org/hisp/dhis/datamart/i18n_module_ru_RU.properties	2009-03-03 16:46:36 +0000
+++ dhis-2/dhis-web/dhis-web-datamart/src/main/resources/org/hisp/dhis/datamart/i18n_module_ru_RU.properties	1970-01-01 00:00:00 +0000
@@ -1,60 +0,0 @@
-#Resource generated by I18n Resource Editor
-#Wed May 28 15:51:33 CEST 2008
-available_organisationunits=\u0414\u043E\u0441\u0442\u0443\u043F\u043D\u044B\u0435 \u043F\u043E\u0434\u0440\u0430\u0437\u0434\u0435\u043B\u0435\u043D\u0438\u044F
-available_periods=\u0414\u043E\u0441\u0442\u0443\u043F\u043D\u044B\u0435 \u043F\u0435\u0440\u0438\u043E\u0434\u044B
-simple_datamart_export=\u041F\u0440\u043E\u0441\u0442\u043E\u0439 \u044D\u043A\u0441\u043F\u043E\u0440\u0442 \u0431\u0430\u0437\u044B \u0434\u0430\u043D\u043D\u044B\u0445
-available_dataelements=\u0414\u043E\u0441\u0442\u0443\u043F\u043D\u044B\u0435 \u044D\u043B\u0435\u043C\u0435\u043D\u0442\u044B \u0434\u0430\u043D\u043D\u044B\u0445
-format.date=yyyy-MM-dd
-remove_selected=\u0423\u0434\u0430\u043B\u0438\u0442\u044C \u0432\u044B\u0434\u0435\u043B\u0435\u043D\u043D\u043E\u0435
-maintenance_performed=\u041E\u043A\u0430\u0437\u0430\u043D\u043D\u0430\u044F \u043F\u043E\u0434\u0434\u0435\u0440\u0436\u043A\u0430
-clear_aggregated_indicatorvalues=\u041E\u0447\u0438\u0441\u0442\u0438\u0442\u044C \u043D\u0430\u043A\u043E\u043F\u043B\u0435\u043D\u044B\u0435 \u0437\u043D\u0430\u0447\u0435\u043D\u0438\u044F \u0438\u043D\u0434\u0438\u043A\u0430\u0442\u043E\u0440\u043E\u0432
-maintenance=\u041E\u0431\u0435\u0441\u043F\u0435\u0447\u0435\u043D\u0438\u0435
-hours=\u0412\u0440\u0435\u043C\u044F
-level=\u0423\u0440\u043E\u0432\u0435\u043D\u044C
-remove_all=\u0423\u0434\u0430\u043B\u0438\u0442\u044C \u0432\u0441\u0435
-simple_export=\u041F\u0440\u043E\u0441\u0442\u043E\u0439 \u044D\u043A\u0441\u043F\u043E\u0440\u0442
-available_levels=\u0414\u043E\u0441\u0442\u0443\u043F\u043D\u044B\u0435 \u0443\u0440\u043E\u0432\u043D\u0438
-performing_maintenance=\u0412\u044B\u043F\u043E\u043B\u043D\u0435\u043D\u0438\u0435 \u043F\u043E\u0434\u0434\u0435\u0440\u0436\u043A\u0438
-selected_datatypes=\u0412\u044B\u0431\u0440\u0430\u0442\u044C \u0442\u0438\u043F\u044B \u0434\u0430\u043D\u043D\u044B\u0445
-selected_dataelements=\u0412\u044B\u0431\u0440\u0430\u0442\u044C \u044D\u043B\u0435\u043C\u0435\u043D\u0442\u044B \u0434\u0430\u043D\u043D\u044B\u0445
-clear_hierarchy_history=\u041E\u0447\u0438\u0441\u0442\u0438\u0442\u044C \u0438\u0441\u0442\u043E\u0440\u0438\u044E \u0438\u0435\u0440\u0430\u0440\u0445\u0438\u0438
-clear_aggregated_datavalues=\u041E\u0447\u0438\u0441\u0442\u0438\u0442\u044C \u043D\u0430\u043A\u043E\u043F\u043B\u0435\u043D\u044B\u0435 \u0437\u043D\u0430\u0447\u0435\u043D\u0438\u044F \u0434\u0430\u043D\u043D\u044B\u0445
-seconds=\u0432\u0442\u043E\u0440\u044B\u0435
-estimated_time=\u0420\u0430\u0441\u0447\u0435\u0442\u043D\u043E\u0435 \u0432\u0440\u0435\u043C\u044F
-structures_generated=\u0421\u0433\u0435\u043D\u0435\u0440\u0438\u0440\u043E\u0432\u0430\u043D\u043D\u044B\u0435 \u0441\u0442\u0440\u0443\u043A\u0442\u0443\u0440\u044B
-generating_structures=\u0413\u0435\u043D\u0435\u0440\u0430\u0446\u0438\u044F \u0441\u0442\u0440\u0443\u043A\u0442\u0443\u0440 ...
-available_indicators=\u0414\u043E\u0441\u0442\u0443\u043F\u043D\u044B\u0435 \u0438\u043D\u0434\u0438\u043A\u0430\u0442\u043E\u0440\u044B
-move_all=\u041F\u0435\u0440\u0435\u0434\u0432\u0438\u043D\u0443\u0442\u044C \u0432\u0441\u0435
-selected_periods=\u0412\u044B\u0431\u0440\u0430\u043D\u043D\u044B\u0435 \u043F\u0435\u0440\u0438\u043E\u0434\u044B
-datamart=\u0411\u0430\u0437\u0430 \u0434\u0430\u043D\u043D\u044B\u0445
-clear_periods_without_datavalues=\u041E\u0447\u0438\u0441\u0442\u0438\u0442\u044C \u043F\u0435\u0440\u0438\u043E\u0434\u044B \u0431\u0435\u0437 \u0440\u0435\u0433\u0438\u0441\u0442\u0440\u0438\u0440\u043E\u0432\u0430\u043D\u043D\u044B\u0445 \u0432\u0435\u043B\u0438\u0447\u0438\u043D \u0434\u0430\u043D\u043D\u044B\u0445
-perform_maintenance=\u0412\u044B\u043F\u043E\u043B\u043D\u0438\u0442\u044C \u043F\u043E\u0434\u0434\u0435\u0440\u0436\u043A\u0443
-structures=\u0421\u0442\u0440\u0443\u043A\u0442\u0443\u0440\u044B
-second=\u0432\u0442\u043E\u0440\u043E\u0439
-advanced_datamart_export=\u042D\u043A\u0441\u043F\u043E\u0440\u0442 \u043F\u0440\u043E\u0434\u0432\u0438\u043D\u0443\u0442\u044B\u0445 \u0431\u0430\u0437 \u0434\u0430\u043D\u043D\u044B\u0445
-select_min_period=\u0412\u044B\u0434\u0435\u043B\u0438\u0442\u044C \u0445\u043E\u0442\u044F\u0431\u044B \u043E\u0434\u0438\u043D \u043F\u0435\u0440\u0438\u043E\u0434
-export_to_datamart=\u042D\u043A\u0441\u043F\u043E\u0440\u0442 \u0432 \u0431\u0430\u0437\u0443 \u0434\u0430\u043D\u043D\u044B\u0445
-indicators=\u0418\u043D\u0434\u0438\u043A\u0430\u0442\u043E\u0440\u044B
-select_min_level=\u0412\u044B\u0434\u0435\u043B\u0438\u0442\u044C \u0445\u043E\u0442\u044F\u0431\u044B \u043E\u0434\u0438\u043D \u0443\u0440\u043E\u0432\u0435\u043D\u044C
-select_period_type_all=\u0412\u044B\u0431\u0440\u0430\u0442\u044C \u0442\u0438\u043F \u043F\u0435\u0440\u0438\u043E\u0434\u0430 / \u0412\u0441\u0435
-move_selected=\u041F\u0435\u0440\u0435\u0434\u0432\u0438\u043D\u0443\u0442\u044C \u0432\u044B\u0434\u0435\u043B\u0435\u043D\u043D\u043E\u0435
-selected_indicators=\u0412\u044B\u0431\u0440\u0430\u0442\u044C \u0438\u043D\u0434\u0438\u043A\u0430\u0442\u043E\u0440\u044B
-dataelements=\u042D\u043B\u0435\u043C\u0435\u043D\u0442\u044B \u0434\u0430\u043D\u043D\u044B\u0445
-minutes=\u043C\u0438\u043D\u0443\u0442\u044B
-organisation_unit_structure=\u0421\u0442\u0440\u0443\u043A\u0442\u0443\u0440\u0430 \u043F\u043E\u0434\u0440\u0430\u0437\u0434\u0435\u043B\u0435\u043D\u0438\u044F \u043E\u0440\u0433\u0430\u043D\u0438\u0437\u0430\u0446\u0438\u0438
-select_indicatorgroup_all=\u0412\u044B\u0434\u0435\u043B\u0438\u0442\u044C \u0433\u0440\u0443\u043F\u043F\u0443 \u0438\u043D\u0434\u0438\u043A\u0430\u0442\u043E\u0440\u0430 / \u0412\u0441\u0435
-select_min_datatype=\u0412\u044B\u0434\u0435\u043B\u0438\u0442\u044C \u0445\u043E\u0442\u044F\u0431\u044B \u043E\u0434\u0438\u043D \u0442\u0438\u043F \u0434\u0430\u043D\u043D\u044B\u0445
-select_options=\u041E\u043F\u0446\u0438\u0438 \u043D\u0435 \u0432\u044B\u0431\u0440\u0430\u043D\u044B
-available_datatypes=\u0414\u043E\u0441\u0442\u0443\u043F\u043D\u044B\u0435 \u0442\u0438\u043F\u044B \u0434\u0430\u043D\u043D\u044B\u0445
-advanced_export=\u041F\u0440\u043E\u0434\u0432\u0438\u043D\u0443\u0442\u044B\u0439 \u044D\u043A\u0441\u043F\u043E\u0440\u0442
-_values_were_exported_in=\u0414\u0430\u043D\u043D\u044B\u0435 \u0431\u044B\u043B\u0438 \u044D\u043A\u0441\u043F\u043E\u0440\u0442\u0438\u0440\u043E\u0432\u0430\u043D\u043D\u044B \u0432
-selected_organisationunits=\u0412\u044B\u0431\u0440\u0430\u043D\u043D\u044B\u0435 \u043F\u043E\u0434\u0440\u0430\u0437\u0434\u0435\u043B\u0435\u043D\u0438\u044F
-selected_levels=\u0412\u044B\u0431\u0440\u0430\u0442\u044C \u0443\u0440\u043E\u0432\u043D\u0438
-exporting_values=\u042D\u043A\u0441\u043F\u043E\u0440\u0442 \u0437\u043D\u0430\u0447\u0435\u043D\u0438\u0439 ...
-nr_of_comb=\u2116_\u043A\u043E\u043C\u0431\u0438\u043D\u0430\u0446\u0438\u0439
-group_set_structure=\u0421\u0442\u0440\u0443\u043A\u0442\u0443\u0440\u0430 \u0438\u0441\u043A\u043B\u044E\u0447\u0438\u0442\u0435\u043B\u044C\u043D\u043E\u0433\u043E \u043F\u043E\u0434\u0440\u0430\u0437\u0434\u0435\u043B\u0435\u043D\u0438\u044F \u0433\u0440\u0443\u043F\u043F\u044B
-values=\u0437\u043D\u0430\u0447\u0435\u043D\u0438\u0435
-select_organisationunit_level_all=\u0412\u044B\u0434\u0435\u043B\u0438\u0442\u044C \u0443\u0440\u043E\u0432\u0435\u043D\u044C \u043F\u043E\u0434\u0440\u0430\u0437\u0434\u0435\u043B\u0435\u043D\u0438\u044F / \u0412\u0441\u0435
-select_dataelementgroup_all=\u0412\u044B\u0434\u0435\u043B\u0438\u0442\u044C \u0433\u0440\u0443\u043F\u043F\u0443 \u044D\u043B\u0435\u043C\u0435\u043D\u0442 \u0434\u0430\u043D\u043D\u044B\u0445 / \u0412\u0441\u0435
-export=\u042D\u043A\u0441\u043F\u043E\u0440\u0442
-structures_and_maintenance=\u0421\u0442\u0440\u0443\u043A\u0442\u0443\u0440\u044B \u0438 \u0441\u043E\u043F\u0440\u043E\u0432\u043E\u0436\u0434\u0435\u043D\u0438\u0435

=== removed file 'dhis-2/dhis-web/dhis-web-datamart/src/main/resources/org/hisp/dhis/datamart/i18n_module_te_IN.properties'
--- dhis-2/dhis-web/dhis-web-datamart/src/main/resources/org/hisp/dhis/datamart/i18n_module_te_IN.properties	2009-03-03 16:46:36 +0000
+++ dhis-2/dhis-web/dhis-web-datamart/src/main/resources/org/hisp/dhis/datamart/i18n_module_te_IN.properties	1970-01-01 00:00:00 +0000
@@ -1,60 +0,0 @@
-#Resource generated by I18n Resource Editor
-#Fri Mar 30 18:46:32 IST 2007
-available_organisationunits=\u0C15\u0C32\u0C4D\u0C17\u0C3F\u0C2F\u0C41\u0C28\u0C4D\u0C28 \u0C06\u0C30\u0C4B\u0C17\u0C4D\u0C2F\u0C15\u0C47\u0C02\u0C26\u0C4D\u0C30\u0C2E\u0C41\u0C32\u0C41
-available_periods=\u0C15\u0C32\u0C4D\u0C17\u0C3F\u0C2F\u0C41\u0C28\u0C4D\u0C28 \u0C15\u0C3E\u0C32\u0C2E\u0C41\u0C32\u0C41
-simple_datamart_export=\u0C38\u0C3E\u0C27\u0C3E\u0C30\u0C23\u0C2E\u0C48\u0C28 \u0C21\u0C3E\u0C1F \u0C2E\u0C3E\u0C30\u0C4D\u0C1F\u0C4D \u0C0E\u0C17\u0C41\u0C2E\u0C24\u0C3F
-available_dataelements=\u0C15\u0C32\u0C4D\u0C17\u0C3F\u0C2F\u0C41\u0C28\u0C4D\u0C28 \u0C21\u0C3E\u0C1F \u0C0E\u0C32\u0C3F\u0C2E\u0C46\u0C02\u0C1F\u0C4D\u0C38\u0C4D
-maintenance_performed=\u0C28\u0C3F\u0C30\u0C4D\u0C35\u0C39\u0C23 \u0C1C\u0C30\u0C41\u0C2A\u0C2C\u0C21\u0C3F\u0C28\u0C26\u0C3F
-clear_aggregated_indicatorvalues=\u0C05\u0C17\u0C4D\u0C30\u0C3F\u0C17\u0C47\u0C1F\u0C4D \u0C1A\u0C47\u0C2F\u0C2C\u0C21\u0C3F\u0C28 \u0C07\u0C02\u0C21\u0C40\u0C15\u0C47\u0C1F\u0C30\u0C4D \u0C35\u0C3F\u0C32\u0C41\u0C35\u0C32\u0C28\u0C41 \u0C36\u0C41\u0C2C\u0C4D\u0C30\u0C2A\u0C30\u0C41\u0C1A\u0C41\u0C2E\u0C41
-maintenance=\u0C28\u0C3F\u0C30\u0C4D\u0C35\u0C39\u0C23
-hours=\u0C17\u0C02\u0C1F\u0C32\u0C41
-level=\u0C38\u0C4D\u0C25\u0C3E\u0C2F\u0C3F
-simple_export=\u0C38\u0C3E\u0C27\u0C3E\u0C30\u0C23\u0C2E\u0C48\u0C28 \u0C0E\u0C17\u0C41\u0C2E\u0C24\u0C3F
-available_levels=\u0C15\u0C32\u0C4D\u0C17\u0C3F\u0C2F\u0C41\u0C28\u0C4D\u0C28 \u0C38\u0C4D\u0C25\u0C3E\u0C2F\u0C3F\u0C32\u0C41
-performing_maintenance=\u0C28\u0C3F\u0C30\u0C4D\u0C35\u0C39\u0C23 \u0C1C\u0C30\u0C41\u0C2A\u0C2C\u0C21\u0C41\u0C1A\u0C42\u0C09\u0C28\u0C4D\u0C28\u0C26\u0C3F
-clearing_datamart=\u0C21\u0C3E\u0C1F \u0C2E\u0C3E\u0C30\u0C4D\u0C1F\u0C4D \u0C28\u0C41 \u0C36\u0C41\u0C2D\u0C4D\u0C30\u0C2A\u0C30\u0C41\u0C1A\u0C41\u0C2E\u0C41...
-selected_datatypes=\u0C0E\u0C02\u0C1A\u0C41\u0C15\u0C4A\u0C28\u0C2C\u0C21\u0C3F\u0C28 \u0C21\u0C3E\u0C1F \u0C30\u0C15\u0C2E\u0C41\u0C32\u0C41
-selected_dataelements=\u0C0E\u0C02\u0C1A\u0C41\u0C15\u0C4A\u0C28\u0C2C\u0C21\u0C3F\u0C28 \u0C21\u0C3E\u0C1F \u0C0E\u0C32\u0C3F\u0C2E\u0C46\u0C02\u0C1F\u0C4D\u0C38\u0C4D
-clear_hierarchy_history=\u0C38\u0C4B\u0C2A\u0C3E\u0C28 \u0C1A\u0C30\u0C3F\u0C24\u0C4D\u0C30\u0C28\u0C41 \u0C36\u0C41\u0C2C\u0C4D\u0C30\u0C2A\u0C30\u0C41\u0C1A\u0C41\u0C2E\u0C41
-clear_aggregated_datavalues=\u0C05\u0C17\u0C4D\u0C30\u0C3F\u0C17\u0C47\u0C1F\u0C4D \u0C1A\u0C47\u0C2F\u0C2C\u0C21\u0C3F\u0C28 \u0C21\u0C3E\u0C1F \u0C35\u0C3F\u0C32\u0C41\u0C35\u0C32\u0C28\u0C41 \u0C36\u0C41\u0C2C\u0C4D\u0C30\u0C2A\u0C30\u0C41\u0C1A\u0C41\u0C2E\u0C41
-seconds=\u0C38\u0C46\u0C15\u0C28\u0C41\u0C32\u0C41
-estimated_time=\u0C05\u0C02\u0C1A\u0C28\u0C3E \u0C35\u0C47\u0C38\u0C3F\u0C28\u0C1F\u0C41\u0C35\u0C02\u0C1F\u0C3F \u0C15\u0C3E\u0C32\u0C2E\u0C41
-structures_generated=\u0C09\u0C24\u0C4D\u0C2A\u0C3E\u0C26\u0C3F\u0C02\u0C2A\u0C2C\u0C21\u0C3F\u0C28 \u0C30\u0C42\u0C2A\u0C2E\u0C41\u0C32\u0C41
-generating_structures=\u0C30\u0C42\u0C2A\u0C2E\u0C41\u0C32\u0C41 \u0C09\u0C24\u0C4D\u0C2A\u0C3E\u0C26\u0C3F\u0C02\u0C2A\u0C2C\u0C21\u0C41\u0C1A\u0C41\u0C28\u0C4D\u0C28\u0C35\u0C3F..
-_values_were_exported=\u0C35\u0C3F\u0C32\u0C41\u0C35\u0C32\u0C41 \u0C0E\u0C17\u0C41\u0C2E\u0C24\u0C3F \u0C05\u0C2F\u0C3F\u0C28\u0C35\u0C3F
-available_indicators=\u0C15\u0C32\u0C4D\u0C17\u0C3F\u0C2F\u0C41\u0C28\u0C4D\u0C28 \u0C07\u0C02\u0C21\u0C3F\u0C15\u0C47\u0C1F\u0C30\u0C4D\u0C32\u0C41
-selected_periods=\u0C0E\u0C02\u0C1A\u0C41\u0C15\u0C4A\u0C28\u0C2C\u0C21\u0C3F\u0C28 \u0C15\u0C3E\u0C32\u0C2E\u0C41\u0C32\u0C41
-datamart=\u0C21\u0C3E\u0C1F \u0C2E\u0C3E\u0C30\u0C4D\u0C1F\u0C4D
-perform_maintenance=\u0C28\u0C3F\u0C30\u0C4D\u0C35\u0C39\u0C23 \u0C1C\u0C30\u0C41\u0C2A\u0C41\u0C2E\u0C41
-structures=\u0C30\u0C42\u0C2A\u0C2E\u0C41\u0C32\u0C41
-second=\u0C38\u0C46\u0C15\u0C28\u0C41
-advanced_datamart_export=\u0C2A\u0C4D\u0C30\u0C24\u0C4D\u0C2F\u0C47\u0C15\u0C2E\u0C48\u0C28 \u0C21\u0C3E\u0C1F \u0C2E\u0C3E\u0C30\u0C4D\u0C1F\u0C4D \u0C0E\u0C17\u0C41\u0C2E\u0C24\u0C3F
-select_min_period=\u0C15\u0C28\u0C40\u0C38\u0C2E\u0C41 \u0C12\u0C15 \u0C15\u0C3E\u0C32\u0C2E\u0C41\u0C28\u0C41 \u0C05\u0C2F\u0C3F\u0C28\u0C28\u0C41 \u0C0E\u0C02\u0C1A\u0C41\u0C15\u0C4A\u0C28\u0C35\u0C32\u0C46\u0C28\u0C41
-datamart_cleared=\u0C21\u0C3E\u0C1F \u0C2E\u0C3E\u0C30\u0C4D\u0C1F\u0C4D \u0C36\u0C41\u0C2D\u0C4D\u0C30\u0C2A\u0C30\u0C1A\u0C2C\u0C21\u0C3F\u0C28\u0C26\u0C3F
-confirm_clear_message=\u0C2E\u0C40\u0C30\u0C41 \u0C21\u0C3E\u0C1F \u0C2E\u0C3E\u0C30\u0C4D\u0C1F\u0C4D \u0C28\u0C41 \u0C15\u0C1A\u0C4D\u0C1A\u0C3F\u0C24\u0C02\u0C17\u0C3E \u0C38\u0C41\u0C2D\u0C4D\u0C30\u0C2A\u0C30\u0C1A\u0C35\u0C32\u0C46\u0C28\u0C28\u0C3F \u0C05\u0C28\u0C41\u0C15\u0C4A\u0C02\u0C1F\u0C41\u0C28\u0C4D\u0C28\u0C3E\u0C30\u0C3E?
-generate_structures=\u0C30\u0C42\u0C2A\u0C2E\u0C41\u0C32\u0C41 \u0C09\u0C24\u0C4D\u0C2A\u0C3E\u0C26\u0C3F\u0C02\u0C2A\u0C41\u0C2E\u0C41
-export_to_datamart=\u0C21\u0C3E\u0C1F \u0C2E\u0C3E\u0C30\u0C4D\u0C1F\u0C4D \u0C15\u0C41 \u0C0E\u0C17\u0C41\u0C2E\u0C24\u0C3F \u0C1A\u0C47\u0C2F\u0C41\u0C2E\u0C41
-indicators=\u0C07\u0C02\u0C21\u0C3F\u0C15\u0C47\u0C1F\u0C30\u0C4D\u0C32\u0C41
-select_min_level=\u0C15\u0C28\u0C40\u0C38\u0C2E\u0C41 \u0C12\u0C15 \u0C38\u0C4D\u0C25\u0C3E\u0C2F\u0C3F\u0C28\u0C3F \u0C05\u0C2F\u0C3F\u0C28\u0C28\u0C41 \u0C0E\u0C02\u0C1A\u0C41\u0C15\u0C4A\u0C28\u0C35\u0C32\u0C46\u0C28\u0C41
-clear=\u0C36\u0C41\u0C2D\u0C4D\u0C30\u0C2E\u0C41
-select_period_type_all=\u0C15\u0C3E\u0C32\u0C2E\u0C41 \u0C30\u0C15\u0C2E\u0C41\u0C32\u0C41/\u0C05\u0C28\u0C4D\u0C28\u0C3F\u0C2F\u0C41\u0C28\u0C41 \u0C0E\u0C02\u0C1A\u0C41\u0C15\u0C4A\u0C28\u0C41\u0C2E\u0C41
-selected_indicators=\u0C0E\u0C02\u0C1A\u0C41\u0C15\u0C4A\u0C28\u0C2C\u0C21\u0C3F\u0C28 \u0C07\u0C02\u0C21\u0C3F\u0C15\u0C47\u0C1F\u0C30\u0C4D\u0C32\u0C41
-dataelements=\u0C21\u0C3E\u0C1F \u0C0E\u0C32\u0C3F\u0C2E\u0C46\u0C02\u0C1F\u0C4D\u0C38\u0C4D
-organisation_unit_structure=\u0C06\u0C30\u0C4B\u0C17\u0C4D\u0C2F\u0C15\u0C47\u0C02\u0C26\u0C4D\u0C30\u0C2E\u0C41 \u0C30\u0C42\u0C2A\u0C2E\u0C41
-minutes=\u0C28\u0C3F\u0C2E\u0C3F\u0C37\u0C2E\u0C41\u0C32\u0C41
-select_indicatorgroup_all=\u0C07\u0C02\u0C21\u0C3F\u0C15\u0C47\u0C1F\u0C30\u0C4D \u0C38\u0C2E\u0C42\u0C39\u0C2E\u0C41/\u0C05\u0C28\u0C4D\u0C28\u0C3F\u0C2F\u0C41\u0C28\u0C41 \u0C0E\u0C02\u0C1A\u0C41\u0C15\u0C4A\u0C28\u0C41\u0C2E\u0C41
-select_min_datatype=\u0C15\u0C28\u0C40\u0C38\u0C2E\u0C41 \u0C12\u0C15 \u0C21\u0C3E\u0C1F \u0C30\u0C15\u0C2E\u0C41\u0C28\u0C41 \u0C05\u0C2F\u0C3F\u0C28\u0C28\u0C41 \u0C0E\u0C02\u0C1A\u0C41\u0C15\u0C4A\u0C28\u0C35\u0C32\u0C46\u0C28\u0C41
-select_options=\u0C0E\u0C2E\u0C3F\u0C2F\u0C41 \u0C0E\u0C02\u0C1A\u0C41\u0C15\u0C4A\u0C28\u0C32\u0C47\u0C26\u0C41
-available_datatypes=\u0C15\u0C32\u0C4D\u0C17\u0C3F\u0C2F\u0C41\u0C28\u0C4D\u0C28 \u0C21\u0C3E\u0C1F \u0C30\u0C15\u0C2E\u0C41\u0C32\u0C41
-advanced_export=\u0C2A\u0C4D\u0C30\u0C24\u0C4D\u0C2F\u0C47\u0C15\u0C2E\u0C48\u0C28 \u0C0E\u0C17\u0C41\u0C2E\u0C24\u0C3F
-_values_were_exported_in=\u0C35\u0C3F\u0C32\u0C41\u0C35\u0C32\u0C41 \u0C0E\u0C17\u0C41\u0C2E\u0C24\u0C3F \u0C1A\u0C47\u0C2F\u0C2C\u0C21\u0C3F\u0C28\u0C35\u0C3F
-selected_levels=\u0C0E\u0C02\u0C1A\u0C41\u0C15\u0C4A\u0C28\u0C4D\u0C28 \u0C38\u0C4D\u0C25\u0C3E\u0C2F\u0C3F\u0C32\u0C41
-selected_organisationunits=\u0C0E\u0C02\u0C1A\u0C41\u0C15\u0C4A\u0C28\u0C2C\u0C21\u0C3F\u0C28 \u0C06\u0C30\u0C4B\u0C17\u0C4D\u0C2F\u0C15\u0C47\u0C02\u0C26\u0C4D\u0C30\u0C2E\u0C41\u0C32\u0C41
-group_set_structure=\u0C2A\u0C4D\u0C30\u0C24\u0C47\u0C15\u0C2E\u0C48\u0C28 \u0C06\u0C30\u0C4B\u0C17\u0C4D\u0C2F\u0C15\u0C47\u0C02\u0C26\u0C4D\u0C30\u0C2E\u0C41 \u0C38\u0C2E\u0C42\u0C39\u0C2E\u0C41 \u0C30\u0C42\u0C2A\u0C2E\u0C41
-nr_of_comb=\u0C1C\u0C24\u0C32 \u0C38\u0C02\u0C16\u0C4D\u0C2F
-exporting_values=\u0C35\u0C3F\u0C32\u0C41\u0C35\u0C32\u0C41 \u0C0E\u0C17\u0C41\u0C2E\u0C24\u0C3F \u0C1A\u0C47\u0C2F\u0C2C\u0C21\u0C41\u0C1A\u0C41\u0C28\u0C4D\u0C28\u0C35\u0C3F..
-select_organisationunit_level_all=\u0C06\u0C30\u0C4B\u0C17\u0C4D\u0C2F\u0C15\u0C47\u0C02\u0C26\u0C4D\u0C30\u0C2E\u0C41 \u0C38\u0C4D\u0C25\u0C3E\u0C2F\u0C3F\u0C28\u0C3F/\u0C05\u0C28\u0C4D\u0C28\u0C3F\u0C2F\u0C41\u0C28\u0C41 \u0C0E\u0C02\u0C1A\u0C41\u0C15\u0C4A\u0C28\u0C41\u0C2E\u0C41
-values=\u0C35\u0C3F\u0C32\u0C41\u0C35\u0C32\u0C41
-select_dataelementgroup_all=\u0C21\u0C3E\u0C1F \u0C0E\u0C32\u0C3F\u0C2E\u0C46\u0C02\u0C1F\u0C4D \u0C38\u0C2E\u0C42\u0C39\u0C2E\u0C41/\u0C05\u0C28\u0C4D\u0C28\u0C3F\u0C2F\u0C41\u0C28\u0C41 \u0C0E\u0C02\u0C1A\u0C41\u0C15\u0C4A\u0C28\u0C41\u0C2E\u0C41
-export=\u0C0E\u0C17\u0C41\u0C2E\u0C24\u0C3F
-structures_and_maintenance=\u0C28\u0C3F\u0C30\u0C4D\u0C35\u0C39\u0C23 \u0C2E\u0C30\u0C3F\u0C2F\u0C41 \u0C30\u0C42\u0C2A\u0C2E\u0C41\u0C32\u0C41

=== removed file 'dhis-2/dhis-web/dhis-web-datamart/src/main/resources/org/hisp/dhis/datamart/i18n_module_tg_TJ.properties'
--- dhis-2/dhis-web/dhis-web-datamart/src/main/resources/org/hisp/dhis/datamart/i18n_module_tg_TJ.properties	2009-03-03 16:46:36 +0000
+++ dhis-2/dhis-web/dhis-web-datamart/src/main/resources/org/hisp/dhis/datamart/i18n_module_tg_TJ.properties	1970-01-01 00:00:00 +0000
@@ -1,60 +0,0 @@
-#Resource generated by I18n Resource Editor
-#Wed May 28 15:51:33 CEST 2008
-available_organisationunits=\u0412\u043E\u04B3\u0438\u0434\u04B3\u043E\u0438 \u043C\u0430\u0432\u04B7\u0443\u0434\u0431\u0443\u0434\u0430\u0438 \u0441\u043E\u0445\u0442\u043E\u0440
-available_periods=\u0414\u0430\u0432\u0440\u0430\u04B3\u043E\u0438 \u043C\u0430\u0432\u04B7\u0443\u0434\u0431\u0443\u0434\u0430
-simple_datamart_export=\u0421\u043E\u0434\u0438\u0440\u043E\u0442\u0438 \u041E\u0434\u0434\u0438\u0438 \u0411\u0430\u0437\u0430\u0438 \u0414\u043E\u0434\u0430\u04B3\u043E
-available_dataelements=\u04B6\u0443\u0437\u044A\u0438 \u0434\u043E\u0434\u0430\u04B3\u043E\u0438 \u043C\u0430\u0432\u04B7\u0443\u0434\u0431\u0443\u0434\u0430
-format.date=yyyy-MM-dd
-remove_selected=\u0422\u043E\u0437\u0430 \u043A\u0430\u0440\u0434\u0430\u043D\u0438 \u0438\u043D\u0442\u0438\u0445\u043E\u0431\u0448\u0443\u0434\u0430
-maintenance_performed=\u041F\u0443\u0448\u0442\u0438\u0431\u043E\u043D\u0438\u0438 \u0438\u04B7\u0440\u043E\u0433\u0430\u0440\u0434\u0438\u0434\u0430
-clear_aggregated_indicatorvalues=\u0422\u043E\u0437\u0430 \u043D\u0430\u043C\u0443\u0434\u0430\u043D\u0438 \u049B\u0438\u043C\u0430\u0442\u04B3\u043E\u0438 \u043D\u0438\u0448\u043E\u043D\u0434\u0438\u04B3\u0430\u043D\u0434\u0438 \u04B7\u0430\u043C\u044A\u043A\u0430\u0440\u0434\u0430\u0448\u0443\u0434\u0430
-maintenance=\u041F\u0443\u0448\u0442\u0438\u0431\u043E\u043D\u04E3
-hours=\u0441\u043E\u0430\u0442\u04B3\u043E
-level=\u0417\u0438\u043D\u0430
-remove_all=\u0422\u043E\u0437\u0430 \u043A\u0430\u0440\u0434\u0430\u043D\u0438 \u04B3\u0430\u043C\u0430
-simple_export=\u0421\u043E\u0434\u0438\u0440\u043E\u0442\u0438 \u043E\u0434\u0434\u04E3
-available_levels=\u0417\u0438\u043D\u0430\u04B3\u043E\u0438 \u043C\u0430\u0432\u04B7\u0443\u0434\u0431\u0443\u0434\u0430
-performing_maintenance=\u0418\u04B7\u0440\u043E\u0448\u0430\u0432\u0438\u0438 \u043F\u0443\u0448\u0442\u0438\u0431\u043E\u043D\u04E3...
-selected_datatypes=\u041D\u0430\u0432\u044A\u0438 \u0434\u043E\u0434\u0430\u04B3\u043E\u0438 \u0438\u043D\u0442\u0438\u0445\u043E\u0431\u0448\u0443\u0434\u0430
-selected_dataelements=\u04B6\u0443\u0437\u044A\u0438\u0451\u0442\u0438 \u0434\u043E\u0434\u0430\u04B3\u043E\u0438 \u0438\u043D\u0442\u0438\u0445\u043E\u0431\u0448\u0443\u0434\u0430
-clear_hierarchy_history=\u0422\u043E\u0437\u0430 \u043D\u0430\u043C\u0443\u0434\u0430\u043D\u0438 \u0442\u0430\u044A\u0440\u0438\u0445\u0438 \u0437\u0438\u043D\u0430\u043D\u0438\u0437\u043E\u043C
-clear_aggregated_datavalues=\u0422\u043E\u0437\u0430 \u043D\u0430\u043C\u0443\u0434\u0430\u043D\u0438 \u049B\u0438\u043C\u043C\u0430\u0442\u04B3\u043E\u0438 \u04B7\u0430\u043C\u044A\u043A\u0430\u0440\u0434\u0430\u0448\u0443\u0434\u0430\u0438 \u0434\u043E\u0434\u0430\u04B3\u043E
-seconds=\u0441\u043E\u043D\u0438\u044F\u04B3\u043E
-estimated_time=\u0412\u0430\u049B\u0442\u0438 \u043F\u0435\u0448\u0431\u0438\u043D\u0438\u0448\u0443\u0434\u0430
-structures_generated=\u0421\u0442\u0440\u0443\u043A\u0442\u0443\u0440\u0430\u04B3\u043E\u0438 \u044D\u04B7\u043E\u0434\u0433\u0430\u0440\u0434\u0438\u0434\u0430
-generating_structures=\u0421\u043E\u0445\u0442\u0430\u043D\u0438 \u0441\u0442\u0440\u0443\u043A\u0442\u0443\u0440\u0430\u04B3\u043E...
-available_indicators=\u041D\u0438\u0448\u043E\u043D\u0434\u0438\u04B3\u0430\u043D\u0434\u0430\u04B3\u043E\u0438 \u043C\u0430\u0432\u04B7\u0443\u0434\u0431\u0443\u0434\u0430
-move_all=\u041A\u04EF\u0447\u043E\u043D\u0438\u0434\u0430\u043D\u0438 \u04B2\u0430\u043C\u0430
-selected_periods=\u0414\u0430\u0432\u0440\u0430\u04B3\u043E\u0438 \u0438\u043D\u0442\u0438\u0445\u043E\u0431\u0448\u0443\u0434\u0430
-datamart=\u0411\u0430\u0437\u0430\u0438 \u0414\u043E\u0434\u0430\u04B3\u043E
-clear_periods_without_datavalues=\u0422\u043E\u0437\u0430 \u043D\u0430\u043C\u0443\u0434\u0430\u043D\u0438 \u0434\u0430\u0432\u0440\u0430\u04B3\u043E\u0435, \u043A\u0438 \u049B\u0438\u043C\u0430\u0442\u0434\u043E\u0434\u0430\u04B3\u043E\u044F\u0448\u043E\u043D \u0431\u0430 \u049B\u0430\u0439\u0434 \u0433\u0438\u0440\u0438\u0444\u0442\u0430 \u043D\u0430\u0448\u0443\u0434\u0430\u0430\u043D\u0434
-perform_maintenance=\u0418\u04B7\u0440\u043E\u0438 \u043F\u0443\u0448\u0442\u0438\u0431\u043E\u043D\u04E3
-structures=\u0421\u0442\u0440\u0443\u043A\u0442\u0443\u0440\u0430\u04B3\u043E
-second=\u0441\u043E\u043D\u0438\u044F
-advanced_datamart_export=\u0421\u043E\u0434\u0438\u0440\u043E\u0442\u0438 \u0411\u0430\u0437\u0430\u0438 \u0414\u043E\u0434\u0430\u04B3\u043E\u0438 \u041C\u0443\u0444\u0430\u0441\u0441\u0430\u043B
-select_min_period=\u0418\u043D\u0442\u0438\u0445\u043E\u0431\u0438 \u0430\u049B\u049B\u0430\u043B\u0430\u043D \u044F\u043A \u0434\u0430\u0432\u0440\u0430
-export_to_datamart=\u0421\u043E\u0434\u0438\u0440\u043E\u0442 \u0431\u0430 \u0411\u0430\u0437\u0430\u0438 \u0414\u043E\u0434\u0430\u04B3\u043E
-indicators=\u041D\u0438\u0448\u043E\u043D\u0434\u0438\u04B3\u0430\u043D\u0434\u0430\u04B3\u043E
-select_min_level=\u0418\u043D\u0442\u0438\u0445\u043E\u0431\u0438 \u0430\u049B\u049B\u0430\u043B\u0430\u043D \u044F\u043A \u0437\u0438\u043D\u0430
-select_period_type_all=\u0418\u043D\u0442\u0438\u0445\u043E\u0431\u0438 \u043D\u0430\u0432\u044A\u0438 \u0434\u0430\u0432\u0440\u0430 / \u04B2\u0430\u043C\u0430
-move_selected=\u041A\u04EF\u0447\u043E\u043D\u0438\u0434\u0430\u043D\u0438 \u0438\u043D\u0442\u0438\u0445\u043E\u0431\u0448\u0443\u0434\u0430\u0433\u043E\u043D
-selected_indicators=\u041D\u0438\u0448\u043E\u043D\u0434\u0438\u04B3\u0430\u043D\u0434\u0430\u04B3\u043E\u0438 \u0438\u043D\u0442\u0438\u0445\u043E\u0431\u0448\u0443\u0434\u0430
-dataelements=\u04B6\u0443\u0437\u044A\u0434\u043E\u0434\u0430\u04B3\u043E
-organisation_unit_structure=\u0421\u0442\u0440\u0443\u043A\u0442\u0443\u0440\u0430\u0438 \u0432\u043E\u04B3\u0438\u0434\u0438 \u0441\u043E\u0445\u0442\u043E\u0440
-minutes=\u0434\u0430\u049B\u0438\u049B\u0430\u04B3\u043E
-select_indicatorgroup_all=\u0418\u043D\u0442\u0438\u0445\u043E\u0431\u0438 \u0433\u0443\u0440\u04EF\u04B3\u0438 \u043D\u0438\u0448\u043E\u043D\u0434\u0438\u04B3\u0430\u043D\u0434\u0430 /\u04B2\u0430\u043C\u0430
-select_min_datatype=\u0418\u043D\u0442\u0438\u0445\u043E\u0431\u0438 \u0430\u049B\u049B\u0430\u043B\u0430\u043D \u044F\u043A \u043D\u0430\u0432\u044A\u0438 \u0434\u043E\u0434\u0430\u04B3\u043E
-select_options=\u042F\u0433\u043E\u043D \u0432\u0430\u0440\u0438\u0430\u043D\u0442 \u0438\u043D\u0442\u0438\u0445\u043E\u0431 \u043D\u0430\u0448\u0443\u0434
-available_datatypes=\u041D\u0430\u0432\u044A\u0438 \u0434\u043E\u0434\u0430\u04B3\u043E\u0438 \u043C\u0430\u0432\u04B7\u0443\u0434\u0431\u0443\u0434\u0430
-advanced_export=\u0421\u043E\u0434\u0438\u0440\u043E\u0442\u0438 \u043C\u0443\u0444\u0430\u0441\u0441\u0430\u043B
-_values_were_exported_in=\u049A\u0438\u043C\u0430\u0442\u04B3\u043E \u0441\u043E\u0434\u0438\u0440 \u0448\u0443\u0434\u0430\u043D\u0434 \u0431\u0430
-selected_levels=\u0417\u0438\u043D\u0430\u04B3\u043E\u0438 \u0438\u043D\u0442\u0438\u0445\u043E\u0431\u0448\u0443\u0434\u0430
-selected_organisationunits=\u0412\u043E\u04B3\u0438\u0434\u04B3\u043E\u0438 \u0438\u043D\u0442\u0438\u0445\u043E\u0431\u0448\u0443\u0434\u0430\u0438 \u0441\u043E\u0445\u0442\u043E\u0440
-group_set_structure=\u0421\u0442\u0440\u0443\u043A\u0442\u0443\u0440\u0430\u0438 \u043C\u0430\u04B7\u043C\u04EF\u0430\u0433\u0443\u0440\u04EF\u04B3\u0438 \u0432\u043E\u04B3\u0438\u0434\u0438 \u0445\u043E\u0441\u0430\u0438 \u0441\u043E\u0445\u0442\u043E\u0440
-exporting_values=\u0421\u043E\u0434\u0438\u0440\u043E\u0442\u0438 \u049B\u0438\u043C\u0430\u0442\u04B3\u043E...
-nr_of_comb=\u041C\u0438\u049B\u0434\u043E\u0440\u0438 \u043E\u043C\u0435\u0437\u0438\u0448\u04B3\u043E
-select_organisationunit_level_all=\u0418\u043D\u0442\u0438\u0445\u043E\u0431\u0438 \u0437\u0438\u043D\u0430\u0438 \u0432\u043E\u04B3\u0438\u0434\u0438 \u0441\u043E\u0445\u0442\u043E\u0440 / \u04B2\u0430\u043C\u0430
-values=\u049B\u0438\u043C\u0430\u0442\u04B3\u043E
-select_dataelementgroup_all=\u0418\u043D\u0442\u0438\u0445\u043E\u0431\u0438 \u0433\u0443\u0440\u04EF\u04B3\u0438 \u04B7\u0443\u0437\u044A\u0438 \u0434\u043E\u0434\u0430\u04B3\u043E /\u04B2\u0430\u043C\u0430
-export=\u0421\u043E\u0434\u0438\u0440\u043E\u0442
-structures_and_maintenance=\u0421\u0442\u0440\u0443\u043A\u0442\u0443\u0440\u0430\u04B3\u043E \u0432\u0430 \u041F\u0443\u0448\u0442\u0438\u0431\u043E\u043D\u04E3

=== removed file 'dhis-2/dhis-web/dhis-web-datamart/src/main/resources/org/hisp/dhis/datamart/i18n_module_vi_VN.properties'
--- dhis-2/dhis-web/dhis-web-datamart/src/main/resources/org/hisp/dhis/datamart/i18n_module_vi_VN.properties	2011-12-14 08:10:22 +0000
+++ dhis-2/dhis-web/dhis-web-datamart/src/main/resources/org/hisp/dhis/datamart/i18n_module_vi_VN.properties	1970-01-01 00:00:00 +0000
@@ -1,126 +0,0 @@
-#Resource generated by I18n Resource Editor
-#Fri Oct 28 14:19:29 ICT 2011
-remove_selected=X\u00F3a nh\u1EEFng ph\u1EA7n t\u1EED \u0111\u01B0\u1EE3c ch\u1ECDn
-no_export_process_running=Kh\u00F4ng c\u00F3 qu\u00E1 tr\u00ECnh xu\u1EA5t d\u1EEF li\u1EC7u n\u00E0o \u0111ang ch\u1EA1y
-data_mart_management=Qu\u1EA3n l\u00FD d\u1EEF li\u1EC7u t\u1ED5ng h\u1EE3p
-nr_of_comb=S\u1ED1 l\u01B0\u1EE3ng k\u1EBFt h\u1EE3p
-selected_dataelements=Ph\u1EA7n t\u1EED d\u1EEF li\u1EC7u \u0111\u00E3 ch\u1ECDn
-datamart_cleared=Datamart \u0111\u00E3 \u0111\u01B0\u1EE3c x\u00F3a
-number_of_indicators=S\u1ED1 l\u01B0\u1EE3ng ch\u1EC9 s\u1ED1
-aintenance_performed=Ti\u1EBFn h\u00E0nh s\u1EF1 b\u1EA3o d\u01B0\u1EE1ng
-deleting_existing_aggregated_data=X\u00F3a d\u1EEF li\u1EC7u t\u1ED5ng h\u1EE3p \u0111\u00E3 t\u1ED3n t\u1EA1i
-reporting_month=Th\u00E1ng b\u00E1o c\u00E1o
-process_failed=Qu\u00E1 tr\u00ECnh xu\u1EA5t d\u1EEF li\u1EC7u kh\u00F4ng th\u00E0nh c\u00F4ng - Vui l\u00F2ng xem chi ti\u1EBFt trong nh\u1EADt k\u00FD h\u1EC7 th\u1ED1ng
-quarters_this_year=Qu\u00FD n\u0103m nay
-structures_generated=C\u1EA5u tr\u00FAc \u0111\u00E3 ph\u00E1t sinh
-performing_maintenance=\u0110ang ti\u1EBFn h\u00E0nh b\u1EA3o d\u01B0\u1EE1ng...
-crosstabulating_data=D\u1EEF li\u1EC7u crosstabulating
-exporting_values=\u0110ang xu\u1EA5t gi\u00E1 tr\u1ECB...
-selected_datatypes=Ki\u1EC3u d\u1EEF li\u1EC7u \u0111\u00E3 ch\u1ECDn
-generate_structures=Ph\u00E1t sinh c\u1EA5u tr\u00FAc
-available_indicators=C\u00E1c ch\u1EC9 s\u1ED1 c\u00F3 s\u1EB5n
-individual_months_this_year=C\u00E1c th\u00E1ng ri\u00EAng l\u1EBB c\u1EE7a n\u0103m
-export_to_datamart=Xu\u1EA5t ra datamart
-_values_were_exported=D\u1EEF li\u1EC7u \u0111\u00E3 \u0111\u01B0\u1EE3c xu\u1EA5t ra
-select_period_type_all=Ch\u1ECDn ki\u1EC3u th\u1EDDi gian/ T\u1EA5t c\u1EA3
-select_indicatorgroup_all=Ch\u1ECDn nh\u00F3m ch\u1EC9 s\u1ED1 / T\u1EA5t c\u1EA3
-start=B\u1EAFt \u0111\u1EA7u
-name_in_use=T\u00EAn \u0111\u00E3 \u0111\u01B0\u1EE3c s\u1EED d\u1EE5ng
-advanced_export=Xu\u1EA5t n\u00E2ng cao
-datamart_intro=Vui l\u00F2ng ch\u1ECDn m\u1ED9t m\u1EE5c trong thanh tr\u00ECnh \u0111\u01A1n.
-available_periods=C\u00E1c th\u1EDDi \u0111i\u1EC3m c\u00F3 s\u1EB5n
-available_datatypes=C\u00E1c ki\u1EC3u d\u1EEF li\u1EC7u c\u00F3 s\u1EB5n
-seconds=gi\u00E2y
-last_year=N\u0103m tr\u01B0\u1EDBc
-simple_datamart_export=Xu\u1EA5t Data Mart \u0111\u01A1n gi\u1EA3n
-last_6_to_9_months=t\u1EEB 6 \u0111\u1EBFn 9 th\u00E1ng g\u1EA7n nh\u1EA5t
-so_far_this_year=T\u1EEB \u0111\u1EA7u n\u0103m cho \u0111\u1EBFn nay
-simple_export=Xu\u1EA5t \u0111\u01A1n gi\u1EA3n
-intro_data_mart_scheduling=Thi\u1EBFt l\u1EADp v\u00E0 qu\u1EA3n tr\u1ECB c\u00E1c tr\u00EDch xu\u1EA5t \u0111\u1ECBnh k\u1EF3, th\u1EF1c hi\u1EC7n v\u00E0o l\u00FAc 2 gi\u1EDD s\u00E1ng m\u1ED7i th\u1EDDi \u0111i\u1EC3m c\u1EE7a n\u0103m.
-last_6_months=6 th\u00E1ng g\u1EA7n nh\u1EA5t
-values=c\u00E1c gi\u00E1 tr\u1ECB
-estimated_time=Th\u1EDDi gian \u01B0\u1EDBc l\u01B0\u1EE3ng
-process_started=Qu\u00E1 tr\u00ECnh xu\u1EA5t d\u1EEF li\u1EC7u \u0111\u00E3 kh\u1EDFi \u0111\u1ED9ng
-select_organisationunit_level_all=Ch\u1ECDn m\u1EE9c d\u01A1n v\u1ECB / T\u1EA5t c\u1EA3
-select_min_datatype=Ch\u1ECDn \u00EDt nh\u1EA5t m\u1ED9t ki\u1EC3u d\u1EEF li\u1EC7u
-clear_hierarchy_history=X\u00F3a nh\u1EEFng c\u1EA5p b\u1EADc tr\u01B0\u1EDBc \u0111\u00F3
-last_9_to_12_months=t\u1EEB 9 \u0111\u1EBFn 12 th\u00E1ng g\u1EA7n nh\u1EA5t
-prev=L\u00F9i l\u1EA1i
-exporting_data_for_indicators=Xu\u1EA5t d\u1EEF li\u1EC7u cho c\u00E1c ch\u1EC9 s\u1ED1
-generate_data_mart=Ph\u00E1t sinh d\u1EEF li\u1EC7u t\u1ED5ng h\u1EE3p
-clear_periods_without_datavalues=X\u00F3a c\u00E1c th\u1EDDi \u0111i\u1EC3m kh\u00F4ng c\u00F3 s\u1ED1 li\u1EC7u
-clear_aggregated_indicatorvalues=X\u00F3a c\u00E1c gi\u00E1 tr\u1ECB ch\u1EC9 s\u1ED1
-number_of_organisation_units=S\u1ED1 l\u01B0\u1EE3ng \u0111\u01A1n v\u1ECB
-export_saved=Vi\u1EC7c xu\u1EA5t d\u1EEF li\u1EC7u \u0111\u00E3 \u0111\u01B0\u1EE3c l\u01B0u
-data_mart=T\u1ED5ng h\u1EE3p d\u1EEF li\u1EC7u
-remove_all=X\u00F3a t\u1EA5t c\u1EA3
-months_this_year=Th\u00E1ng n\u0103m nay
-must_select_at_least_one_organisation_unit=Vui l\u00F2ng ch\u1ECDn \u00EDt nh\u1EA5t m\u1ED9t \u0111\u01A1n v\u1ECB
-datamart_export=Xu\u1EA5t d\u1EEF li\u1EC7u t\u1ED5ng h\u1EE3p
-available_dataelements=C\u00E1c ph\u1EA7n t\u1EED d\u1EEF li\u1EC7u c\u00F3 s\u1EB5n
-export=Xu\u1EA5t ra
-individual_quarters_this_year=C\u00E1c qu\u00FD ri\u00EAng l\u1EBB c\u1EE7a n\u0103m
-clear_aggregated_datavalues=X\u00F3a c\u00E1c gi\u00E1 tr\u1ECB
-select_min_period=Ch\u1ECDn \u00EDt nh\u1EA5t m\u1ED9t th\u1EDDi \u0111i\u1EC3m
-quarters_last_year=Qu\u00FD n\u0103m tr\u01B0\u1EDBc
-selected_organisationunits=\u0110\u01A1n v\u1ECB \u0111\u00E3 ch\u1ECDn
-confirm_delete_data_mart_export=B\u1EA1n c\u00F3 ch\u1EAFc mu\u1ED1n x\u00F3a vi\u1EC7c xu\u1EA5t d\u1EEF li\u1EC7u t\u1ED5ng h\u1EE3p n\u00E0y?
-show_details=Xem chi ti\u1EBFt
-hours=Gi\u1EDD
-available_organisationunits=C\u00E1c \u0111\u01A1n v\u1ECB c\u00F3 s\u1EB5n
-structures=C\u1EA5u tr\u00FAc
-advanced_datamart_export=Xu\u1EA5t Data Mart n\u00E2ng cao
-add_to_dashboard=Th\u00EAm v\u00E0o b\u1EA3ng t\u00F9y bi\u1EBFn c\u00E1 nh\u00E2n
-confirm_clear_message=B\u1EA1n c\u00F3 mu\u1ED1n x\u00F3a data mart?
-export_process_done=Qu\u00E1 tr\u00ECnh xu\u1EA5t d\u1EEF li\u1EC7u \u0111\u00E3 ho\u00E0n t\u1EA5t
-clearing_datamart=\u0110ang x\u00F3a datamart...
-relative_periods=C\u00E1c th\u1EDDi \u0111i\u1EC3m quan h\u1EC7
-process_completed=Qu\u00E1 tr\u00ECnh xu\u1EA5t d\u1EEF li\u1EC7u \u0111\u00E3 ho\u00E0n t\u1EA5t
-data_mart_export=Xu\u1EA5t tr\u00EDch d\u1EEF li\u1EC7u
-minutes=Ph\u00FAt
-last_3_to_6_months=t\u1EEB 3 \u0111\u1EBFn 6 th\u00E1ng g\u1EA7n nh\u1EA5t
-level=C\u1EA5p
-next=Ti\u1EBFp t\u1EE5c
-move_selected=Di chuy\u1EC3n c\u00E1c ph\u1EA7n t\u1EED \u0111\u01B0\u1EE3c ch\u1ECDn
-second=gi\u00E2y
-export_process_failed=Qu\u00E1 tr\u00ECnh xu\u1EA5t d\u1EEF li\u1EC7u kh\u00F4ng th\u00E0nh c\u00F4ng - Vui l\u00F2ng xem chi ti\u1EBFt trong nh\u1EADt k\u00FD h\u1EC7 th\u1ED1ng
-generating_structures=\u0110ang ph\u00E1t sinh c\u1EA5u tr\u00FAc ...
-indicators=Ch\u1EC9 s\u1ED1
-maintenance=D\u1EF1 b\u1EA3o d\u01B0\u1EE1ng
-data_mart_export_management=Qu\u1EA3n l\u00FD xu\u1EA5t tr\u00EDch d\u1EEF li\u1EC7u
-export_process_not_initialized=Qu\u00E1 tr\u00ECnh xu\u1EA5t d\u1EEF li\u1EC7u kh\u00F4ng \u0111\u01B0\u1EE3c kh\u1EDFi t\u1EA1o
-organisation_unit_structure=C\u1EA5u tr\u00FAc \u0111\u01A1n v\u1ECB
-exporting_data_for_calculated_data_elements=Xu\u1EA5t d\u1EEF li\u1EC7u cho c\u00E1c ph\u1EA7n t\u1EED d\u1EEF li\u1EC7u t\u00EDnh to\u00E1n \u0111\u01B0\u1EE3c
-exporting_data_for_data_elements=Xu\u1EA5t d\u1EEF li\u1EC7u cho c\u00E1c ph\u1EA7n t\u1EED d\u1EEF li\u1EC7u
-must_select_at_least_one_period=Vui l\u00F2ng ch\u1ECDn \u00EDt nh\u1EA5t m\u1ED9t th\u1EDDi \u0111i\u1EC3m
-last_12_months=12 th\u00E1ng g\u1EA7n nh\u1EA5t
-intro_data_mart_export=T\u1EA1o c\u00E1c tr\u00EDch xu\u1EA5t d\u1EEF li\u1EC7u. D\u1EEF li\u1EC7u g\u1ED3m c\u00F3\: ch\u1EC9 ti\u00EAu, ch\u1EC9 s\u1ED1, \u0111\u01A1n v\u1ECB v\u00E0 th\u1EDDi \u0111i\u1EC3m
-number_of_periods=S\u1ED1 l\u01B0\u1EE3ng th\u1EDDi \u0111i\u1EC3m
-perform_maintenance=Ti\u1EBFn h\u00E0nh b\u1EA3o d\u01B0\u1EE1ng
-stop=K\u1EBFt th\u00FAc
-select_min_level=Ch\u1ECDn \u00EDt nh\u1EA5t 1 c\u1EA5p
-available_levels=C\u00E1c c\u1EA5p c\u00F3 s\u1EB5n
-group_set_structure=C\u1EA5u tr\u00FAc t\u1EADp h\u1EE3p \u0111\u01A1n v\u1ECB lo\u1EA1i tr\u1EEB
-selected_levels=C\u1EA5p \u0111\u00E3 ch\u1ECDn
-refresh=C\u1EADp nh\u1EADt
-months_last_year=Th\u00E1ng n\u0103m tr\u01B0\u1EDBc
-_values_were_exported_in=c\u00E1c gi\u00E1 tr\u1ECB \u0111\u01B0\u1EE3c xu\u1EA5t ra \u1EDF
-could_not_export_too_many_data_elements=Kh\u00F4ng th\u1EC3 xu\u1EA5t d\u1EEF li\u1EC7u \u0111\u01B0\u1EE3c v\u00EC c\u00F3 qu\u00E1 nhi\u1EC1u ph\u1EA7n t\u1EED d\u1EEF li\u1EC7u \u0111\u01B0\u1EE3c ch\u1ECDn
-number_of_data_elements=S\u1ED1 l\u01B0\u1EE3ng ph\u1EA7n t\u1EED d\u1EEF li\u1EC7u
-last_3_months=3 th\u00E1ng g\u1EA7n nh\u1EA5t
-move_all=Di chuy\u1EC3n t\u1EA5t c\u1EA3
-select_options=Kh\u00F4ng c\u00F3 l\u1EF1a ch\u1ECDn n\u00E0o \u0111\u01B0\u1EE3c ch\u1ECDn
-select_dataelementgroup_all=Ch\u1ECDn nh\u00F3m ph\u1EA7n t\u1EED d\u1EEF li\u1EC7u / T\u1EA5t c\u1EA3
-dataelements=Ph\u1EA7n t\u1EED d\u1EEF li\u1EC7u
-must_select_at_least_one_dataelement_or_indicator=Vui l\u00F2ng ch\u1ECDn \u00EDt nh\u1EA5t m\u1ED9t ph\u1EA7n t\u1EED d\u1EEF li\u1EC7u ho\u1EB7c ch\u1EC9 s\u1ED1
-this_year=N\u0103m nay
-datamart=Data Mart
-selected_indicators=Ch\u1EC9 s\u1ED1 \u0111\u00E3 ch\u1ECDn
-move_children=Di chuy\u1EC3n c\u1EA5p d\u01B0\u1EDBi c\u1EE7a \u0111\u01A1n v\u1ECB \u0111\u01B0\u1EE3c ch\u1ECDn
-completed=Ho\u00E0n t\u1EA5t
-selected_periods=Th\u1EDDi \u0111i\u1EC3m \u0111\u00E3 ch\u1ECDn
-last_12_individual_months=C\u00E1c th\u00E1ng ri\u00EAng l\u1EBB c\u1EE7a 12 th\u00E1ng g\u1EA7n nh\u1EA5t
-specify_name=Vui l\u00F2ng ch\u1ECDn t\u00EAn
-selected_=\u0111\u00E3 ch\u1ECDn
-confirm_add_to_dashboard=B\u1EA1n c\u00F3 ch\u1EAFc mu\u1ED1n th\u00EAm vi\u1EC7c xu\u1EA5t d\u1EEF li\u1EC7u t\u1ED5ng h\u1EE3p n\u00E0y v\u00E0o b\u1EA3ng t\u00F9y bi\u1EBFn c\u00E1 nh\u00E2n?
-maintenance_performed=Ti\u1EBFn h\u00E0nh s\u1EF1 b\u1EA3o d\u01B0\u1EE1ng

=== removed file 'dhis-2/dhis-web/dhis-web-datamart/src/main/resources/org/hisp/dhis/datamart/i18n_module_zh_CN.properties'
--- dhis-2/dhis-web/dhis-web-datamart/src/main/resources/org/hisp/dhis/datamart/i18n_module_zh_CN.properties	2011-12-14 08:10:22 +0000
+++ dhis-2/dhis-web/dhis-web-datamart/src/main/resources/org/hisp/dhis/datamart/i18n_module_zh_CN.properties	1970-01-01 00:00:00 +0000
@@ -1,45 +0,0 @@
-available_organisationunits= \u73B0\u6709\u7684\u7EC4\u7EC7\u5355\u4F4D
-available_periods= \u53EF\u671F
-simple_datamart_export= \u7B80\u5355\u7684\u6570\u636E\u96C6\u5E02\u51FA\u53E3
-available_dataelements= \u6570\u636E\u5143\u7D20
-hours=\u5C0F\u65F6
-level=\u4E00\u7EA7
-simple_export= \u7B80\u5355\u51FA\u53E3
-available_levels= \u73B0\u6709\u6C34\u5E73
-clearing_datamart= ...\u7ED3\u7B97...
-selected_datatypes= \u9009\u5B9A\u7684\u6570\u636E\u7C7B\u578B
-selected_dataelements= \u9009\u5B9A\u6570\u636E\u5143\u7D20
-seconds=\u79D2
-estimated_time= \u9884\u8BA1\u65F6\u95F4
-structures_generated= \u7ED3\u6784\u4EA7\u751F
-generating_structures= ...\u53D1\u7535\u7ED3\u6784...
-_values_were_exported= \u503C\u8F93\u51FA
-available_indicators= \u73B0\u6709\u6307\u6807
-selected_periods= \u9009\u5B9A\u65F6\u6BB5
-datamart= \u6570\u636E\u96C6\u5E02
-advanced_datamart_export= \u5148\u8FDB\u7684\u6570\u636E\u51FA\u53E3\u4EA4\u6613\u4F1A
-select_min_period= \u81F3\u5C11\u9009\u62E9\u4E00\u671F
-datamart_cleared= \u88AB\u6E05\u62C6
-confirm_clear_message= ?\u4F60\u662F\u60F3\u6E05\u695A\u4E86\u7684\u6570\u636E\u96C6\u5E02?
-generate_structures= \u7ED3\u6784\u4EA7\u751F
-export_to_datamart= \u51FA\u53E3\u6570\u636E\u96C6\u5E02
-indicators=\u6307\u6807
-select_min_level= \u81F3\u5C11\u9009\u62E9\u4E00\u4E2A\u7EA7\u522B
-select_min_level=
-select_period_type_all= / \u9009\u62E9\u671F\u9650\u79CD\u7C7B/\u6240\u6709
-selected_indicators= \u9009\u5B9A\u6307\u6807
-dataelements=
-minutes=\u5206\u949F
-organisation_unit_structure= \u7EC4\u7EC7\u5355\u4F4D\u7ED3\u6784
-select_indicatorgroup_all= / \u9009\u62E9\u6307\u6807\u5C0F\u7EC4/\u6240\u6709
-select_min_datatype= \u81F3\u5C11\u9009\u62E9\u4E00\u4E2A\u6570\u636E\u7C7B\u578B
-select_options= \u6CA1\u6709\u9009\u62E9\u7684
-available_datatypes= \u6570\u636E\u7C7B\u578B
-advanced_export= \u5148\u8FDB\u51FA\u53E3
-selected_organisationunits= \u9009\u5B9A\u7684\u7EC4\u7EC7\u5355\u4F4D
-selected_levels= \u9009\u5B9A\u6C34\u5E73
-exporting_values= ...\u51FA\u53E3\u503C...
-group_set_structure= \u72EC\u5BB6\u7EC4\u7EC7\u5355\u4F4D\u7ED3\u6784
-select_organisationunit_level_all= / \u8D23\u7EC4\u7EC7\u5355\u4F4D\u7EA7\u522B/\u6240\u6709
-select_dataelementgroup_all= / \u9009\u62E977\u5143/\u6240\u6709
-export=\u51FA\u53E3
\ No newline at end of file

=== removed file 'dhis-2/dhis-web/dhis-web-datamart/src/main/resources/struts.xml'
--- dhis-2/dhis-web/dhis-web-datamart/src/main/resources/struts.xml	2011-11-23 12:38:30 +0000
+++ dhis-2/dhis-web/dhis-web-datamart/src/main/resources/struts.xml	1970-01-01 00:00:00 +0000
@@ -1,86 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE struts PUBLIC
-"-//Apache Software Foundation//DTD Struts Configuration 2.0//EN"
-"http://struts.apache.org/dtds/struts-2.0.dtd">
-<struts>
-
-  <include file="dhis-web-commons.xml" />
-
-  <package name="dhis-web-datamart" extends="dhis-web-commons" namespace="/dhis-web-datamart">
-	
-    <!-- DataMart -->
-
-    <action name="index" class="org.hisp.dhis.datamart.action.NoAction">
-      <result name="success" type="velocity">/main.vm</result>
-      <param name="page">/dhis-web-datamart/index.vm</param>
-      <param name="menu">/dhis-web-datamart/menu.vm</param>
-    </action>
-
-    <action name="getOptions" class="org.hisp.dhis.datamart.action.GetOptionsAction">
-      <result name="success" type="velocity">/main.vm</result>
-      <param name="page">/dhis-web-datamart/exportForm.vm</param>
-      <param name="menu">/dhis-web-datamart/menu.vm</param>
-      <param name="javascripts">javascript/addUpdateDatamart.js</param>
-      <param name="requiredAuthorities">F_DATAMART_ADMIN</param>
-    </action>
-	
-	<!-- Ajax requests -->
-
-    <action name="exportDataMartExport" class="org.hisp.dhis.datamart.action.ExportDataMartExportAction">
-      <result name="success" type="velocity">/main.vm</result>
-      <param name="page">/dhis-web-datamart/exportStatus.vm</param>
-      <param name="javascripts">javascript/datamart.js</param>
-      <param name="requiredAuthorities">F_DATAMART_ADMIN</param>
-    </action>
-
-    <action name="getExportStatus" class="org.hisp.dhis.datamart.action.GetExportStatusAction">
-      <result name="success" type="velocity-json">/dhis-web-datamart/jsonExportStatus.vm</result>
-      <param name="onExceptionReturn">plainTextError</param>
-      <param name="requiredAuthorities">F_DATAMART_ADMIN</param>
-    </action>
-
-    <action name="cancelExport" class="org.hisp.dhis.datamart.action.CancelExportAction">
-      <result name="success" type="velocity-xml">../dhis-web-commons/ajax/xmlResponseSuccess.vm</result>
-      <param name="onExceptionReturn">plainTextError</param>
-      <param name="requiredAuthorities">F_DATAMART_ADMIN</param>
-    </action>
-		
-    <!-- DataMartExports -->
-
-    <action name="removeDataMartExport" class="org.hisp.dhis.datamart.action.RemoveDataMartExportAction">
-      <result name="success" type="velocity-json">
-		../dhis-web-commons/ajax/jsonResponseSuccess.vm</result>
-      <param name="onExceptionReturn">plainTextError</param>
-      <param name="requiredAuthorities">F_DATAMART_ADMIN</param>
-    </action>
-
-    <action name="getDataMartExports" class="org.hisp.dhis.datamart.action.GetAllDataMartExportsAction">
-      <result name="success" type="velocity">/main.vm</result>
-      <param name="page">/dhis-web-datamart/viewExportForm.vm</param>
-      <param name="menu">/dhis-web-datamart/menu.vm</param>
-      <param name="javascripts">javascript/datamart.js</param>
-      <param name="stylesheets">../dhis-web-commons/paging/paging.css</param>
-      <param name="requiredAuthorities">F_DATAMART_ADMIN</param>
-    </action>
-
-    <action name="saveDataMartExport" class="org.hisp.dhis.datamart.action.SaveDataMartExportAction">
-      <result name="success" type="redirect">getDataMartExports.action</result>
-      <param name="requiredAuthorities">F_DATAMART_ADMIN</param>
-    </action>
-    
-    <!-- Ajax requests -->
-
-    <action name="getDataMartExport" class="org.hisp.dhis.datamart.action.GetDataMartExportAction">
-      <result name="success" type="velocity-json">
-		/dhis-web-datamart/jsonDataMartExport.vm</result>
-	  <param name="onExceptionReturn">plainTextError</param>
-    </action>
-
-    <action name="validateDataMartExport" class="org.hisp.dhis.datamart.action.ValidateDataMartExportAction">
-      <result name="success" type="velocity-json">../dhis-web-commons/ajax/jsonResponseSuccess.vm</result>
-      <result name="input" type="velocity-json">../dhis-web-commons/ajax/jsonResponseInput.vm</result>
-	  <param name="onExceptionReturn">plainTextError</param>
-    </action>
-
-  </package>
-</struts>

=== removed directory 'dhis-2/dhis-web/dhis-web-datamart/src/main/webapp'
=== removed directory 'dhis-2/dhis-web/dhis-web-datamart/src/main/webapp/WEB-INF'
=== removed directory 'dhis-2/dhis-web/dhis-web-datamart/src/main/webapp/WEB-INF/classes'
=== removed file 'dhis-2/dhis-web/dhis-web-datamart/src/main/webapp/WEB-INF/classes/velocity.properties'
--- dhis-2/dhis-web/dhis-web-datamart/src/main/webapp/WEB-INF/classes/velocity.properties	2012-01-24 20:35:47 +0000
+++ dhis-2/dhis-web/dhis-web-datamart/src/main/webapp/WEB-INF/classes/velocity.properties	1970-01-01 00:00:00 +0000
@@ -1,3 +0,0 @@
-resource.loader = dev
-dev.resource.loader.class = org.apache.velocity.runtime.resource.loader.FileResourceLoader
-dev.resource.loader.path = src/main/webapp,../dhis-web-commons-resources/src/main/webapp
\ No newline at end of file

=== removed file 'dhis-2/dhis-web/dhis-web-datamart/src/main/webapp/WEB-INF/web.xml'
--- dhis-2/dhis-web/dhis-web-datamart/src/main/webapp/WEB-INF/web.xml	2012-01-24 15:16:55 +0000
+++ dhis-2/dhis-web/dhis-web-datamart/src/main/webapp/WEB-INF/web.xml	1970-01-01 00:00:00 +0000
@@ -1,82 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
-  "http://java.sun.com/dtd/web-app_2_3.dtd">
-<web-app>
-  <display-name>DHIS Data Mart</display-name>
-
-  <context-param>
-    <param-name>contextConfigLocation</param-name>
-    <param-value>classpath*:/META-INF/dhis/beans.xml</param-value>
-  </context-param>
-  <context-param>
-    <param-name>automaticAccessType</param-name>
-    <param-value>ghostAdmin</param-value>
-  </context-param>
-
-  <filter>
-    <filter-name>RedirectFilter</filter-name>
-    <filter-class>org.hisp.dhis.servlet.filter.HttpRedirectFilter</filter-class>
-    <init-param>
-      <param-name>redirectPath</param-name>
-      <param-value>dhis-web-datamart/index.action</param-value>
-    </init-param>
-  </filter>
-  <filter>
-    <filter-name>OpenSessionInViewFilter</filter-name>
-    <filter-class>org.springframework.orm.hibernate3.support.OpenSessionInViewFilter</filter-class>
-  </filter>
-  <filter>
-    <filter-name>springSecurityFilterChain</filter-name>
-    <filter-class>org.springframework.web.filter.DelegatingFilterProxy</filter-class>
-  </filter>
-  <filter>
-    <filter-name>Struts</filter-name>
-    <filter-class>org.apache.struts2.dispatcher.FilterDispatcher</filter-class>
-  </filter>
-
-  <filter-mapping>
-    <filter-name>RedirectFilter</filter-name>
-    <url-pattern>/</url-pattern>
-  </filter-mapping>
-  <filter-mapping>
-    <filter-name>OpenSessionInViewFilter</filter-name>
-    <url-pattern>*.action</url-pattern>
-  </filter-mapping>
-  <filter-mapping>
-    <filter-name>springSecurityFilterChain</filter-name>
-    <url-pattern>/*</url-pattern>
-  </filter-mapping>
-  <filter-mapping>
-    <filter-name>Struts</filter-name>
-    <url-pattern>*.action</url-pattern>
-  </filter-mapping>
-
-  <listener>
-    <listener-class>org.springframework.web.context.ContextLoaderListener</listener-class>
-  </listener>
-  <listener>
-    <listener-class>org.hisp.dhis.system.startup.StartupListener</listener-class>
-  </listener>
-  
-  <!-- Web API -->
-  
-  <servlet>
-    <servlet-name>webapiServlet</servlet-name>
-    <servlet-class>org.springframework.web.servlet.DispatcherServlet</servlet-class>
-    <init-param>
-      <param-name>contextConfigLocation</param-name>
-      <param-value>classpath*:/META-INF/dhis/servlet.xml</param-value>
-    </init-param>
-    <load-on-startup>1</load-on-startup>
-  </servlet>
-
-  <servlet-mapping>
-    <servlet-name>webapiServlet</servlet-name>
-    <url-pattern>/api</url-pattern>
-  </servlet-mapping>
-  <servlet-mapping>
-    <servlet-name>webapiServlet</servlet-name>
-    <url-pattern>/api/*</url-pattern>
-  </servlet-mapping>
-  
-</web-app>

=== removed directory 'dhis-2/dhis-web/dhis-web-datamart/src/main/webapp/dhis-web-datamart'
=== removed file 'dhis-2/dhis-web/dhis-web-datamart/src/main/webapp/dhis-web-datamart/exportForm.vm'
--- dhis-2/dhis-web/dhis-web-datamart/src/main/webapp/dhis-web-datamart/exportForm.vm	2011-12-30 08:29:42 +0000
+++ dhis-2/dhis-web/dhis-web-datamart/src/main/webapp/dhis-web-datamart/exportForm.vm	1970-01-01 00:00:00 +0000
@@ -1,230 +0,0 @@
-<script type="text/javascript">	
-    var i18n_select_min_datatype = '$encoder.jsEscape( $i18n.getString( "select_min_datatype" ), "'" )';
-    var i18n_select_min_level = '$encoder.jsEscape( $i18n.getString( "select_min_level" ), "'" )';
-    var i18n_select_min_period = '$encoder.jsEscape( $i18n.getString( "select_min_period" ), "'" )';
-    var i18n_nr_of_comb = '$encoder.jsEscape( $i18n.getString( "nr_of_comb" ), "'" )';
-    var i18n_completed = '$encoder.jsEscape( $i18n.getString( "completed" ), "'" )';	
-    var i18n_export_process_started = '$encoder.jsEscape( $i18n.getString( "export_process_started" ), "'" )';
-    var i18n_export_saved = '$encoder.jsEscape( $i18n.getString( "export_saved" ), "'" )';
-    var i18n_must_select_at_least_one_dataelement_or_indicator = '$encoder.jsEscape( $i18n.getString( "must_select_at_least_one_dataelement_or_indicator" ), "'" )';
-    var i18n_must_select_at_least_one_organisation_unit = '$encoder.jsEscape( $i18n.getString( "must_select_at_least_one_organisation_unit" ), "'" )';
-    var i18n_must_select_at_least_one_period = '$encoder.jsEscape( $i18n.getString( "must_select_at_least_one_period" ), "'" )';
-</script>
-
-<h3>$i18n.getString( "generate_data_mart" ) #openHelp( "datamarthowto" )</h3>
-
-<form id="exportForm" name="exportForm" method="post" action="saveDataMartExport.action">
-
-<input type="hidden" id="id" name="id" value="$!id"/>
-
-<table width="730">
-	
-	<colgroup>
-  		<col style="width:325px"/>
-  		<col style="width:80px"/>
- 		<col style="width:325px"/>
-  	</colgroup>
-
-    <!-- Name -->
-    
-    <tr>
-        <th>$i18n.getString( "name" )</th>
-        <td colspan="2"></td>
-    </tr>
-    <tr>
-    	<td><input type="text" id="name" name="name" style="min-width:325px" value="$!export.name"/></td>
-    	<td colspan="2"></td>
-    </tr>
-	<tr>
-		<td colspan="3" height="5px"></td>
-	</tr>
-    
-	<!-- DataElements -->
-	
-	<tr>
-		<th>$i18n.getString( "available_dataelements" )</th>
-		<td></td>
-		<th>$i18n.getString( "selected_dataelements" )
-			<select id="dataelementsValidator" class="required_select_group {validate:{required_select_group:true}}" style="display:none"/>
-		</th>
-	</tr>	
-	<tr>
-		<td>
-			<select multiple size="6" id="availableDataElements" name="availableDataElements" style="min-width:325px"></select>
-		</td>
-		<td align="center">
-            <input type="button" value="&gt;" title="$i18n.getString('move_selected')" style="width:40px" onclick="dhisAjaxSelect_moveAllSelected( 'availableDataElements', 'selectedDataElements' )"/><br/>
-            <input type="button" value="&lt;" title="$i18n.getString('remove_selected')" style="width:40px" onclick="dhisAjaxSelect_moveAllSelected( 'selectedDataElements', 'availableDataElements' )"/><br/>
-            <input type="button" value="&gt;&gt;" title="$i18n.getString('move_all')" style="width:40px" onclick="dhisAjaxSelect_moveAll( 'availableDataElements', 'selectedDataElements' )"/><br/>
-            <input type="button" value="&lt;&lt;" title="$i18n.getString('remove_all')" style="width:40px" onclick="dhisAjaxSelect_moveAll( 'selectedDataElements', 'availableDataElements' )"/>
-		</td>
-		<td>
-		    <select multiple id="selectedDataElements" name="selectedDataElements" style="min-width:325px;height:115px;margin-top:27px" ondblclick="moveSelectedById( 'selectedDataElements', 'availableDataElements' )">
-			    #foreach( $element in $selectedDataElements )
-				    <option value="$element.id">$element.name</option>
-			    #end
-			</select>
-		</td>
-	</tr>
-	<tr>
-		<td colspan="3" height="5px"></td>
-	</tr>
-	
-	<!-- Indicators -->
-	
-	<tr>
-		<th>$i18n.getString( "available_indicators" )</th>
-		<td></td>
-		<th>$i18n.getString( "selected_indicators" )
-			<select id="indicatorsValidator" class="required_select_group {validate:{required_select_group:true}}" style="display:none"/>
-		</th>
-	</tr>
-	<tr>
-		<td>			
-			<select multiple size="6" id="availableIndicators" name="availableIndicators" style="min-width:325px"></select>
-		</td>
-		<td align="center">
-			<input type="button" value="&gt;" title="$i18n.getString('move_selected')" style="width:40px" onclick="dhisAjaxSelect_moveAllSelected( 'availableIndicators', 'selectedIndicators' )"/><br/>
-			<input type="button" value="&lt;" title="$i18n.getString('remove_selected')" style="width:40px" onclick="dhisAjaxSelect_moveAllSelected( 'selectedIndicators', 'availableIndicators' )"/><br/>
-			<input type="button" value="&gt;&gt;" title="$i18n.getString('move_all')" style="width:40px" onclick="dhisAjaxSelect_moveAll( 'availableIndicators', 'selectedIndicators' )"/><br/>
-			<input type="button" value="&lt;&lt;" title="$i18n.getString('remove_all')" style="width:40px" onclick="dhisAjaxSelect_moveAll( 'selectedIndicators', 'availableIndicators' )"/>
-		</td>
-		<td>
-			<select multiple id="selectedIndicators" name="selectedIndicators" style="min-width:325px;height:115px;margin-top:27px" ondblclick="moveSelectedById( 'selectedIndicators', 'availableIndicators' )">
-			    #foreach ( $indicator in $selectedIndicators )
-                    <option value="$indicator.id">$indicator.name</option>
-                #end
-			</select>
-		</td>
-	</tr>
-    <tr>
-        <td colspan="3" height="5px"></td>
-    </tr>
-	
-	<!-- OrganisationUnits -->
-	
-	<tr>
-		<th>$i18n.getString( "available_organisationunits" )</th>
-		<td></td>
-		<th>$i18n.getString( "selected_organisationunits" )
-			<select id="organisationunitsValidator" class="{validate:{required:true}}" style="display:none"/>
-		</th>
-	</tr>
-	<tr>
-		<td>
-			<select id="organisationUnitLevel" name="organisationUnitLevel" style="min-width:325px" onchange="getOrganisationUnitsAtLevel()">
-				<option value="$ALL">[ $i18n.getString( "select_organisationunit_level_all" ) ]</option>
-				#foreach ( $level in $levels )
-					<option value="$level.level">$level.name</option>
-				#end
-			</select><br/>
-			<select multiple size="6" id="availableOrganisationUnits" name="availableOrganisationUnits" style="min-width:325px"></select>
-		</td>
-		<td align="center">
-			<input type="button" value="&gt;" title="$i18n.getString('move_selected')" style="width:40px" onclick="dhisAjaxSelect_moveAllSelected( 'availableOrganisationUnits', 'selectedOrganisationUnits' )"/><br/>
-			<input type="button" value="&lt;" title="$i18n.getString('remove_selected')" style="width:40px" onclick="dhisAjaxSelect_moveAllSelected( 'selectedOrganisationUnits', 'availableOrganisationUnits' )"/><br/>
-			<input type="button" value="&gt;&gt;" title="$i18n.getString('move_all')" style="width:40px" onclick="dhisAjaxSelect_moveAll( 'availableOrganisationUnits', 'selectedOrganisationUnits' )"/><br/>
-			<input type="button" value="&lt;&lt;" title="$i18n.getString('remove_all')" style="width:40px" onclick="dhisAjaxSelect_moveAll( 'selectedOrganisationUnits', 'availableOrganisationUnits' )"/><br/>
-			<input type="button" value="&gt;&gt;&gt;" title="$i18n.getString('move_children')" style="width:40px" onclick="getOrganisationUnitChildren()"/>
-		</td>
-		<td>
-			<select multiple id="selectedOrganisationUnits" name="selectedOrganisationUnits" style="min-width:325px;height:125px;margin-top:9px" ondblclick="moveSelectedById( 'selectedOrganisationUnits', 'availableOrganisationUnits' )">				
-			    #foreach ( $unit in $selectedOrganisationUnits )
-                    <option value="$unit.id">$unit.name</option>
-                #end
-			</select>
-		</td>
-	</tr>
-    <tr>
-        <td colspan="3" height="5px"></td>
-    </tr>
-	
-	<!-- Periods -->
-	<tr>
-		<td colspan='3' class='listAlternateRow'>
-			<select id="periodsValidator" class="{validate:{required:true}}" style="display:none"/>
-		</td>
-	</tr>
-	<tr>
-		<th>$i18n.getString( "available_periods" )</th>
-		<td></td>
-		<th>$i18n.getString( "selected_periods" )</th>
-	</tr>	
-	<tr>
-		<td>
-			<select id="periodType" name="periodType" style="min-width:224px" onchange="getAvailablePeriods( 'periodType', 'availablePeriods', 'selectedPeriods', '0' )">
-				<option value="">[ $i18n.getString( "select_period_type_all" ) ]</option>
-				#foreach ( $type in $periodTypes )
-					<option value="$type.name">$i18n.getString( $type.name )</option>
-				#end
-			</select>
-			<input type="button" style="width:50px" value="$i18n.getString( 'prev' )" onclick="getAvailablePeriods( 'periodType', 'availablePeriods', 'selectedPeriods', '-1' )"/><input
-				   type="button" style="width:50px" value="$i18n.getString( 'next' )" onclick="getAvailablePeriods( 'periodType', 'availablePeriods', 'selectedPeriods', '1' )"/><br/>
-			<select multiple size="6" id="availablePeriods" name="availablePeriods" style="min-width:325px;height:120px" ondblclick="moveSelectedById( 'availablePeriods', 'selectedPeriods' )">
-				#foreach ( $period in $periods )
-					<option value="$period.externalId">$format.formatPeriod( $period )</option>
-				#end
-			</select>
-		</td>
-		<td align="center">
-			<input type="button" value="&gt;" title="$i18n.getString('move_selected')" style="width:40px" onclick="dhisAjaxSelect_moveAllSelected( 'availablePeriods', 'selectedPeriods' )"/><br/>
-			<input type="button" value="&lt;" title="$i18n.getString('remove_selected')" style="width:40px" onclick="dhisAjaxSelect_moveAllSelected( 'selectedPeriods', 'availablePeriods' )"/><br/>
-			<input type="button" value="&gt;&gt;" title="$i18n.getString('move_all')" style="width:40px" onclick="dhisAjaxSelect_moveAll( 'availablePeriods', 'selectedPeriods' )"/><br/>
-			<input type="button" value="&lt;&lt;" title="$i18n.getString('remove_all')" style="width:40px" onclick="dhisAjaxSelect_moveAll( 'selectedPeriods', 'availablePeriods' )"/>
-		</td>
-		<td>
-			<select multiple id="selectedPeriods" name="selectedPeriods" style="min-width:325px;height:115px;margin-top:27px" ondblclick="moveSelectedById( 'selectedPeriods', 'availablePeriods' )">				
-			    #foreach ( $period in $selectedPeriods )
-                    <option value="$period.externalId">$format.formatPeriod( $period )</option>
-                #end
-			</select>
-		</td>
-	</tr>
-    <tr>
-        <td colspan="3" style="height:5px"></td>
-    </tr>
-    
-    <!-- Relative periods -->
-    
-	<tr>
-		<th colspan="3">$i18n.getString( "relative_periods" )
-			<select id="relativesPeriodsValidator" style="display:none"/>
-		</th>
-	</tr>
-	<tr>
-		<td colspan="3" id='relativesPeriodsTD'>
-		    <label for="reportingMonth">$i18n.getString( "reporting_month" )</label>
-			<input type="checkbox" id="reportingMonth" name="reportingMonth" value="true"#if( $!export.relatives.isReportingMonth() ) checked#end/>&nbsp;
-			<label for="monthsThisYear">$i18n.getString( "months_this_year" )</label>
-			<input type="checkbox" id="monthsThisYear" name="monthsThisYear" value="true"#if( $!export.relatives.isMonthsThisYear() ) checked#end/>&nbsp;
-			<label for="quartersThisYear">$i18n.getString( "quarters_this_year" )</label>
-			<input type="checkbox" id="quartersThisYear" name="quartersThisYear" value="true"#if( $!export.relatives.isQuartersThisYear() ) checked#end/>&nbsp;
-			<label for="thisYear">$i18n.getString( "this_year" )</label>
-			<input type="checkbox" id="thisYear" name="thisYear" value="true"#if( $!export.relatives.isThisYear() ) checked#end/><br/><br/>
-			
-			<label for="monthsLastYear">$i18n.getString( "months_last_year" )</label>
-			<input type="checkbox" id="monthsLastYear" name="monthsLastYear" value="true"#if( $!export.relatives.isMonthsLastYear() ) checked#end/>&nbsp;
-			<label for="quartersLastYear">$i18n.getString( "quarters_last_year" )</label>
-			<input type="checkbox" id="quartersLastYear" name="quartersLastYear" value="true"#if( $!export.relatives.isQuartersLastYear() ) checked#end/>&nbsp;
-			<label for="lastYear">$i18n.getString( "last_year" )</label>
-			<input type="checkbox" id="lastYear" name="lastYear" value="true"#if( $!export.relatives.isLastYear() ) checked#end/>
-        </td>
-    </tr>
-    <tr>
-        <td colspan="3" style="height:5px"></td>
-    </tr>
-    
-    <!-- Submit -->
-    
-	<tr>		
-		<td><input type="submit" value='$i18n.getString( "save" )' style="width:120px"/><input
-			type="button" value='$i18n.getString( "back" )' onclick="javascript:window.location.href='getDataMartExports.action'" style="width:120px"/></td>
-		<td></td>
-		<td></td>
-	</tr>
-	
-</table>
-
-</form>
-
-<span id="message"></span>

=== removed file 'dhis-2/dhis-web/dhis-web-datamart/src/main/webapp/dhis-web-datamart/exportStatus.vm'
--- dhis-2/dhis-web/dhis-web-datamart/src/main/webapp/dhis-web-datamart/exportStatus.vm	2011-03-28 14:32:25 +0000
+++ dhis-2/dhis-web/dhis-web-datamart/src/main/webapp/dhis-web-datamart/exportStatus.vm	1970-01-01 00:00:00 +0000
@@ -1,14 +0,0 @@
-<script type="text/javascript">
-	jQuery(document).ready(function() {
-    	getExportStatus();
-	});
-</script>
-
-<h3>$i18n.getString( "export_to_datamart" )</h3>
-
-<p>
-	<input type="button" value='$i18n.getString( "cancel" )' onclick="cancelExport()" style="width:100px"/>
-	<input type="button" value='$i18n.getString( "back" )' onclick="javascript:window.location.href='getDataMartExports.action'" style="width:100px"/>
-</p>
-
-<span id="message"/>

=== removed file 'dhis-2/dhis-web/dhis-web-datamart/src/main/webapp/dhis-web-datamart/index.vm'
--- dhis-2/dhis-web/dhis-web-datamart/src/main/webapp/dhis-web-datamart/index.vm	2011-05-31 12:24:47 +0000
+++ dhis-2/dhis-web/dhis-web-datamart/src/main/webapp/dhis-web-datamart/index.vm	1970-01-01 00:00:00 +0000
@@ -1,12 +0,0 @@
-<script type="text/javascript">
-jQuery(function() {
-	/* make sure that the leftBar is always visible when entering page. */
-	leftBar.showAnimated()
-});
-</script>
-
-<h3>$i18n.getString( "dhis-web-datamart" )</h3>
-
-<ul id="introList">
-	#introListImgItem( "getDataMartExports.action" "data_mart_export" "data_mart_export" )
-</ul>
\ No newline at end of file

=== removed directory 'dhis-2/dhis-web/dhis-web-datamart/src/main/webapp/dhis-web-datamart/javascript'
=== removed file 'dhis-2/dhis-web/dhis-web-datamart/src/main/webapp/dhis-web-datamart/javascript/addUpdateDatamart.js'
--- dhis-2/dhis-web/dhis-web-datamart/src/main/webapp/dhis-web-datamart/javascript/addUpdateDatamart.js	2011-12-30 08:29:42 +0000
+++ dhis-2/dhis-web/dhis-web-datamart/src/main/webapp/dhis-web-datamart/javascript/addUpdateDatamart.js	1970-01-01 00:00:00 +0000
@@ -1,169 +0,0 @@
-// -----------------------------------------------------------------------------
-// After the page loaded completely
-// -----------------------------------------------------------------------------
-
-jQuery( document ).ready( function() {
-
-	/* Validates the required fields */
-	validation2( 'exportForm', function ( form )
-	{
-		form.submit();
-	}, {
-		'beforeValidateHandler': function()
-		{
-			listValidator( 'dataelementsValidator', 'selectedDataElements' );
-			listValidator( 'indicatorsValidator', 'selectedIndicators' );
-			listValidator( 'organisationunitsValidator', 'selectedOrganisationUnits' );
-			listValidator( 'periodsValidator', 'selectedPeriods' );
-			
-			if( byId('selectedPeriods').options.length == 0 )
-			{
-				if( $("input:checked").length > 0 )
-				{
-					$("#periodsValidator").rules("add",{required:false});
-				}
-				else
-				{
-					$("#periodsValidator").rules("add",{required:true});
-				}
-			}
-		},
-		'rules': getValidationRules( 'dataMart' )
-	} );
-	
-	checkValueIsExist( "name", "validateDataMartExport.action", {
-		id: getFieldValue( "id" )
-	} );
-
-	/* Loads the available data elements */
-	jQuery("#availableDataElements").dhisAjaxSelect({
-		source: "../dhis-web-commons-ajax-json/getDataElements.action",
-		iterator: "dataElements",
-		connectedTo: "selectedDataElements",
-		handler: function(item) {
-			var option = jQuery("<option data-id='" + item.groups + "'/>");
-			option.text( item.name );
-			option.attr( "value", item.id );
-			
-			return option;
-		},
-		filter: {
-			source: "../dhis-web-commons-ajax-json/getDataElementGroups.action",
-			label: 'dataelement group',
-			iterator: "dataElementGroups",
-			handler: function(item) {
-				return "<option data-key='id' data-value='" + item.id + "'>" + item.name + "</option>";
-			}
-		}
-	});
-	
-	/* Loads the available indicators */
-	jQuery("#availableIndicators").dhisAjaxSelect({
-		source: "../dhis-web-commons-ajax-json/getIndicators.action",
-		iterator: "indicators",
-		connectedTo: "selectedIndicators",
-		handler: function(item) {
-			var option = jQuery("<option data-id='" + item.groups + "'/>");
-			option.text( item.name );
-			option.attr( "value", item.id );
-			
-			return option;
-		},
-		filter: {
-			source: "../dhis-web-commons-ajax-json/getIndicatorGroups.action",
-			label: 'indicator group',
-			iterator: 'indicatorGroups',
-			handler: function(item) {
-				return "<option data-key='id' data-value='"+ item.id +"'>" + item.name + "</option>";
-			}
-		}
-	});
-	
-	/* Loads the available organisation units */
-	jQuery("#availableOrganisationUnits").dhisAjaxSelect({
-		source: "../dhis-web-commons-ajax-json/getOrganisationUnits.action?level=1",
-		iterator: "organisationUnits",
-		connectedTo: "selectedOrganisationUnits",
-		handler: function(item) {
-			var option = jQuery("<option/>");
-			option.text( item.name );
-			option.attr( "value", item.id );
-			
-			return option;
-		}
-	});
-});
-
-// -----------------------------------------------------------------------------
-// Data retrieval methods
-// -----------------------------------------------------------------------------
-
-function getOrganisationUnitsAtLevel()
-{
-	var organisationUnitLevel = getFieldValue( 'organisationUnitLevel' );
-	var filterInput = jQuery( "#availableOrganisationUnits_filter_input" );
-	
-	if ( organisationUnitLevel != null )
-	{
-		if ( organisationUnitLevel != 0 ) {
-			filterInput.attr( 'disabled', 'disabled' );
-		} else {
-			filterInput.removeAttr( 'disabled' );
-		}
-		
-		jQuery.postJSON( '../dhis-web-commons-ajax-json/getOrganisationUnits.action',
-		{ level: organisationUnitLevel }, function ( json ) {
-		
-			var availableOrganisationUnits = byId( "availableOrganisationUnits" );
-			var selectedOrganisationUnits = byId( "selectedOrganisationUnits" );
-			
-			clearList( availableOrganisationUnits );
-			
-			var units = json.organisationUnits;
-			
-			for ( var i = 0; i < units.length; i++ )
-			{
-				var id = units[ i ].id;
-				var name = units[ i ].name;
-				
-				if ( listContains( selectedOrganisationUnits, id ) == false )
-				{						
-					var option = document.createElement( "option" );
-					option.value = id;
-					option.text = name;
-					availableOrganisationUnits.add( option, null );
-				}
-			}
-		});
-	}
-}
-
-function getOrganisationUnitChildren()
-{
-	var organisationUnitId = getFieldValue( 'availableOrganisationUnits' );
-	
-	if ( organisationUnitId != null )
-	{
-		jQuery.postJSON( '../dhis-web-commons-ajax-json/getOrganisationUnitChildren.action',
-		{ id: organisationUnitId }, function ( json ) {
-		
-			var selectedOrganisationUnits = byId( "selectedOrganisationUnits" );
-			var units = json.organisationUnits;
-			
-			for ( var i = 0; i < units.length; i++ )
-			{
-				var id = units[ i ].id;
-				var name = units[ i ].name;
-				
-				if ( listContains( selectedOrganisationUnits, id ) == false )
-				{
-					var option = document.createElement( "option" );
-					option.value = id;
-					option.text = name;
-					selectedOrganisationUnits.add( option, null );
-				}
-			}
-		});
-	}
-}
-

=== removed file 'dhis-2/dhis-web/dhis-web-datamart/src/main/webapp/dhis-web-datamart/javascript/datamart.js'
--- dhis-2/dhis-web/dhis-web-datamart/src/main/webapp/dhis-web-datamart/javascript/datamart.js	2011-10-01 09:05:47 +0000
+++ dhis-2/dhis-web/dhis-web-datamart/src/main/webapp/dhis-web-datamart/javascript/datamart.js	1970-01-01 00:00:00 +0000
@@ -1,53 +0,0 @@
-// -----------------------------------------------------------------------------
-// DataMartExport details
-// -----------------------------------------------------------------------------
-
-function showDataMartExportDetails( id )
-{
-    jQuery.post( 'getDataMartExport.action', { id: id }, function ( json ) {
-		setInnerHTML( "nameField", json.dataMartExport.name );
-		setInnerHTML( "dataElementField", json.dataMartExport.dataElements );
-		setInnerHTML( "indicatorField", json.dataMartExport.indicators );
-		setInnerHTML( "organisationUnitField", json.dataMartExport.organisationUnits );
-		setInnerHTML( "periodField", json.dataMartExport.periods );
-		
-		showDetails();
-	});
-}
-
-// -----------------------------------------------------------------------------
-// Export
-// -----------------------------------------------------------------------------
-
-function getExportStatus()
-{
-    jQuery.get( 'getExportStatus.action', {}, function ( json ) {
-	
-		var message = json.status.message;
-		
-		if ( json.status.running == "true" )
-		{
-			setWaitMessage( message );
-			waitAndGetExportStatus( 2000 );
-		}
-		else setMessage( message );
-	});
-}
-
-function waitAndGetExportStatus( millis )
-{
-	setTimeout( "getExportStatus();", millis );
-}
-
-function cancelExport()
-{
-	var url = "cancelExport.action";
-		
-	var request = new Request();  
-    request.send( url );
-}
-
-function removeDatamartExport( exportId, exportName )
-{
-	removeItem( exportId, exportName, i18n_confirm_delete, 'removeDataMartExport.action' );
-}
\ No newline at end of file

=== removed file 'dhis-2/dhis-web/dhis-web-datamart/src/main/webapp/dhis-web-datamart/jsonDataMartExport.vm'
--- dhis-2/dhis-web/dhis-web-datamart/src/main/webapp/dhis-web-datamart/jsonDataMartExport.vm	2011-09-30 02:51:38 +0000
+++ dhis-2/dhis-web/dhis-web-datamart/src/main/webapp/dhis-web-datamart/jsonDataMartExport.vm	1970-01-01 00:00:00 +0000
@@ -1,9 +0,0 @@
-{ "dataMartExport":
-  {
-    "name": "$!encoder.jsonEncode( ${dataMartExport.name} )",
-    "dataElements": "$!{dataMartExport.dataElements.size()}",
-    "indicators": "$!{dataMartExport.indicators.size()}",
-    "organisationUnits": "$!{dataMartExport.organisationUnits.size()}",
-    "periods": "$!{dataMartExport.periods.size()}"
-  }
-}
\ No newline at end of file

=== removed file 'dhis-2/dhis-web/dhis-web-datamart/src/main/webapp/dhis-web-datamart/jsonExportStatus.vm'
--- dhis-2/dhis-web/dhis-web-datamart/src/main/webapp/dhis-web-datamart/jsonExportStatus.vm	2011-10-01 09:05:47 +0000
+++ dhis-2/dhis-web/dhis-web-datamart/src/main/webapp/dhis-web-datamart/jsonExportStatus.vm	1970-01-01 00:00:00 +0000
@@ -1,6 +0,0 @@
-{ "status":
-  {
-	"message": "$!{encoder.htmlEncode( ${message} )}",
-	"running": "$!{running}"
-  }
-}

=== removed file 'dhis-2/dhis-web/dhis-web-datamart/src/main/webapp/dhis-web-datamart/menu.vm'
--- dhis-2/dhis-web/dhis-web-datamart/src/main/webapp/dhis-web-datamart/menu.vm	2011-03-18 12:48:40 +0000
+++ dhis-2/dhis-web/dhis-web-datamart/src/main/webapp/dhis-web-datamart/menu.vm	1970-01-01 00:00:00 +0000
@@ -1,5 +0,0 @@
-
-<h2>$i18n.getString( "datamart" ) </h2>
-<ul>
-	<li><a href="getDataMartExports.action">$i18n.getString( "data_mart_export" )&nbsp;</a></li>	
-</ul>

=== removed file 'dhis-2/dhis-web/dhis-web-datamart/src/main/webapp/dhis-web-datamart/viewExportForm.vm'
--- dhis-2/dhis-web/dhis-web-datamart/src/main/webapp/dhis-web-datamart/viewExportForm.vm	2011-10-01 09:05:47 +0000
+++ dhis-2/dhis-web/dhis-web-datamart/src/main/webapp/dhis-web-datamart/viewExportForm.vm	1970-01-01 00:00:00 +0000
@@ -1,64 +0,0 @@
-<script type="text/javascript">
-	jQuery(document).ready(function(){	
-		tableSorter( 'listTable' );	
-	});
-
-    var i18n_confirm_delete = '$encoder.jsEscape( $i18n.getString( "confirm_delete_data_mart_export" ) , "'")';
-    var i18n_confirm_add_to_dashboard = '$encoder.jsEscape( $i18n.getString( "confirm_add_to_dashboard" ) , "'")';
-</script>
-
-<h3>$i18n.getString( "data_mart_export_management" ) #openHelp( "datamart" ) </h3>
-
-<table class="mainPageTable">
-    <tr>
-        <td style="vertical-align:top">
-			<table width="100%">
-				<tr>
-					<td>#filterDiv( "getDataMartExports" )</td>
-                    <td colspan="5" style="text-align:right"><input type="button" value="$i18n.getString( 'add_new' )" onclick="window.location.href='getOptions.action'"/></td>
-                </tr>
-			</table>
-            <table class="listTable" id="listTable">
-                <col/>
-                <col width="120"/>               
-                <thead>                          
-					<tr>
-						<th>$i18n.getString( "name" )</th>
-						<th class="{sorter: false}">$i18n.getString( "operations" )</th>
-					</tr>
-                </thead>
-                <tbody id="list">
-                #foreach( $export in $exports )
-                <tr id="tr${export.id}">
-                    <td onclick="showDataMartExportDetails( $export.id )">$encoder.htmlEncode( $export.name )</td>
-                    <td style="text-align:center">
-						<a href="exportDataMartExport.action?id=$export.id" title="$i18n.getString( 'export' )"><img src="../images/start_process.png" alt="$i18n.getString( 'export' )"/></a>
-						<a href="getOptions.action?id=$export.id" title="$i18n.getString( 'edit' )"><img src="../images/edit.png" alt="$i18n.getString( 'edit' )"></a>
-						#if( $auth.hasAccess( "dhis-web-datamart", "removeDataMartExport" ) )
-						<a href="javascript:removeDatamartExport( $export.id, '$encoder.jsEncode( $export.name )' )" title="$i18n.getString( 'remove' )"><img src="../images/delete.png" alt="$i18n.getString( 'remove' )"/></a>
-						#else <img src="../images/delete-denied.png"> #end
-						<a href="javascript:showDataMartExportDetails( $export.id )" title="$i18n.getString( 'show_details' )"><img src="../images/information.png" alt="$i18n.getString( 'show_details' )"/></a>
-					</td>
-                </tr>
-                #end
-                </tbody>
-            </table>
-			<p></p>
-	  		#parse( "/dhis-web-commons/paging/paging.vm" )
-        </td>        
-        <td style="width:20em; padding-left:2em; vertical-align:top">
-
-            <div id="detailsArea" style="display:none">
-                <div style="float:right">
-                    <a href="javascript:hideDetails()" title="$i18n.getString( 'hide_details' )"><img src="../images/close.png" alt="$i18n.getString( 'hide_details' )"/></a>
-                </div>
-                <p><label>$i18n.getString( "name" ):</label><br><span id="nameField"></span></p>
-                <p><label>$i18n.getString( "number_of_data_elements" ):</label><br><span id="dataElementField"></span></p>
-                <p><label>$i18n.getString( "number_of_indicators" ):</label><br><span id="indicatorField"></span></p>
-                <p><label>$i18n.getString( "number_of_organisation_units" ):</label><br><span id="organisationUnitField"></span></p>
-                <p><label>$i18n.getString( "number_of_periods" ):</label><br><span id="periodField"></span></p>
-            </div>
-
-        </td>
-    </tr>
-</table>

=== modified file 'dhis-2/dhis-web/dhis-web-portal/india-pom.xml'
--- dhis-2/dhis-web/dhis-web-portal/india-pom.xml	2012-01-24 15:16:55 +0000
+++ dhis-2/dhis-web/dhis-web-portal/india-pom.xml	2012-02-12 19:25:09 +0000
@@ -98,12 +98,6 @@
       <artifactId>dhis-web-importexport</artifactId>
       <version>${project.version}</version>
       <type>war</type>
-    </dependency>    
-    <dependency>
-      <groupId>org.hisp.dhis</groupId>
-      <artifactId>dhis-web-datamart</artifactId>
-      <version>${project.version}</version>
-      <type>war</type>
     </dependency>
     <dependency>
       <groupId>org.hisp.dhis</groupId>

=== modified file 'dhis-2/dhis-web/dhis-web-portal/pom.xml'
--- dhis-2/dhis-web/dhis-web-portal/pom.xml	2012-01-24 14:43:36 +0000
+++ dhis-2/dhis-web/dhis-web-portal/pom.xml	2012-02-12 19:25:09 +0000
@@ -96,12 +96,6 @@
       <artifactId>dhis-web-importexport</artifactId>
       <version>${project.version}</version>
       <type>war</type>
-    </dependency>    
-    <dependency>
-      <groupId>org.hisp.dhis</groupId>
-      <artifactId>dhis-web-datamart</artifactId>
-      <version>${project.version}</version>
-      <type>war</type>
     </dependency>
     <dependency>
       <groupId>org.hisp.dhis</groupId>

=== modified file 'dhis-2/dhis-web/pom.xml'
--- dhis-2/dhis-web/pom.xml	2012-01-24 20:35:47 +0000
+++ dhis-2/dhis-web/pom.xml	2012-02-12 19:25:09 +0000
@@ -17,7 +17,6 @@
     <module>dhis-web-maintenance</module>
     <module>dhis-web-dataentry</module>
     <module>dhis-web-importexport</module>
-    <module>dhis-web-datamart</module>
     <module>dhis-web-validationrule</module>
     <module>dhis-web-reporting</module>
     <module>dhis-web-mapping</module>