dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 1824
committer: Lars <larshelg@larshelg-laptop>
branch nick: trunk
timestamp: Thu 2010-05-06 16:59:11 +0200
message:
  Updated to H2 version 1.2.134
modified:
  dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/about/help.vm
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/resources/org/hisp/dhis/dataadmin/i18n_module.properties
  dhis-2/pom.xml


--
lp:dhis2
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk

Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription

=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/about/help.vm'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/about/help.vm	2010-05-05 09:17:27 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/about/help.vm	2010-05-06 14:59:11 +0000
@@ -4,10 +4,6 @@
 <table>
 <tr>
 <td valign="top"><div id="helpMenu"></div></td>
-<td valign="top"><div id="helpContent">$i18n.getString( "help_intro" )</div><br/>
-	<div id="helpBack" align="right">
-		<input type="button" value="$i18n.getString( 'back' )" onclick="window.location.href='$!backUrl'" style="width:140px"/>
-	</div>
-</td>
+<td valign="top"><div id="helpContent">$i18n.getString( "help_intro" )</div></td>
 </tr>
 </table>
\ No newline at end of file

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/resources/org/hisp/dhis/dataadmin/i18n_module.properties'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/resources/org/hisp/dhis/dataadmin/i18n_module.properties	2010-04-29 04:33:47 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/resources/org/hisp/dhis/dataadmin/i18n_module.properties	2010-05-06 14:59:11 +0000
@@ -114,7 +114,7 @@
 values																= values
 data_element														= Data element
 validation_rules_without_groups										= Validation rules without groups
-aggregated_data_values												= Aggrorganisation_unit_mergeegated data values
+aggregated_data_values												= Aggregated data values
 aggregated_indicator_values											= Aggregated indicator values
 intro_data_locking													= Deny data to be entered or imported for data sets.
 intro_data_browser													= Browse the database and get an overview of which data sets, organisation units and periods it exist data for.

=== modified file 'dhis-2/pom.xml'
--- dhis-2/pom.xml	2010-05-04 12:10:42 +0000
+++ dhis-2/pom.xml	2010-05-06 14:59:11 +0000
@@ -423,7 +423,7 @@
       <dependency>
         <groupId>com.h2database</groupId>
         <artifactId>h2</artifactId>
-        <version>1.1.119</version>
+        <version>1.2.134</version>
       </dependency>
       <dependency>
         <groupId>com.ibatis</groupId>