[izpack-changes] r1722 - in izpack-src/trunk: . bin/langpacks/installer src src/dist-files src/lib/com/izforge/izpack/installer

noreply at berlios.de noreply at berlios.de
Sun Jan 28 18:50:51 CET 2007


Author: jponge
Date: 2007-01-28 18:49:04 +0100 (Sun, 28 Jan 2007)
New Revision: 1722

Modified:
   izpack-src/trunk/Versions.txt
   izpack-src/trunk/bin/langpacks/installer/eng.xml
   izpack-src/trunk/bin/langpacks/installer/fin.xml
   izpack-src/trunk/bin/langpacks/installer/fra.xml
   izpack-src/trunk/src/build.xml
   izpack-src/trunk/src/dist-files/IzPack-install.xml
   izpack-src/trunk/src/dist-files/splash-3.10.png
   izpack-src/trunk/src/lib/com/izforge/izpack/installer/IzPanel.java
Log:
Merged r1712:1721 from the 3.10 branch

Modified: izpack-src/trunk/Versions.txt
===================================================================
--- izpack-src/trunk/Versions.txt	2007-01-28 17:29:41 UTC (rev 1721)
+++ izpack-src/trunk/Versions.txt	2007-01-28 17:49:04 UTC (rev 1722)
@@ -1,9 +1,10 @@
 [ The list of the different public versions of IzPack ]
-  > ???
 
+  > Next release
+
 - Added ignore as possible value for failure argument in executables (Dennis Reil)
 
-  > Next release
+  > 3.10.0 (build 2007.01.29)
 
 - Added docu: executeForPack, executeclass,logfiledir  for ProcessPanel (Fabrice Mirabile)
 - Added docu: createForUnselectedPack for UserInputPanel (Fabrice Mirabile)
@@ -54,7 +55,8 @@
   - support for the new "installGroup"-attribute for the "programGroup" element of the shortcutSpec.xml
   - late creation of shortcuts, for example in case ShortcutPanel is displayed before InstallPanel
   - fixed a bug where each Shortcut-Subgroup influenced the remaining Shortcut creation
-- Added icon resource extension, to dynamically change installer icon (Dennis Reil) 
+- Added icon resource extension, to dynamically change installer icon (Dennis Reil)
+- New splash-screen (Romain Guy)
 
   > 3.9.0 (build 2006.09.25)
 - Fix NullPointerException in CompilerConfig, if you specify a 

Modified: izpack-src/trunk/bin/langpacks/installer/eng.xml
===================================================================
--- izpack-src/trunk/bin/langpacks/installer/eng.xml	2007-01-28 17:29:41 UTC (rev 1721)
+++ izpack-src/trunk/bin/langpacks/installer/eng.xml	2007-01-28 17:49:04 UTC (rev 1722)
@@ -42,6 +42,7 @@
     <str id="installer.help" txt="Help"/>
     <str id="installer.step" txt="Step"/>
     <str id="installer.of" txt="of"/>
+    <str id="installer.Message" txt="Message"/> 
     
     <!-- Uninstaller specific strings -->
     <str id="uninstaller.warning" txt="This will remove the installed application(s)!"/>

Modified: izpack-src/trunk/bin/langpacks/installer/fin.xml
===================================================================
--- izpack-src/trunk/bin/langpacks/installer/fin.xml	2007-01-28 17:29:41 UTC (rev 1721)
+++ izpack-src/trunk/bin/langpacks/installer/fin.xml	2007-01-28 17:49:04 UTC (rev 1722)
@@ -42,6 +42,7 @@
     <str id="installer.help" txt="Apua"/>
     <str id="installer.step" txt="Vaihe"/>
     <str id="installer.of" txt="/"/>
+    <str id="installer.Message" txt="Viesti"/>
 
     <!-- Uninstaller specific strings -->
     <str id="uninstaller.warning" txt="Tämä poistaa asennetun sovelluksen/asennetut sovellukset!"/>
@@ -97,7 +98,9 @@
     <str id="PacksPanel.description" txt="Kuvaus"/>
     <str id="PacksPanel.dependencyList"
          txt="Valittu paketti tarvitsee seuraavia paketteja asennettavaksi"/>
-    <str id="ImgPacksPanel.dependencyList" txt="Riippuvuudet"/>
+    <str id="PacksPanel.dependencies" txt="Riippuvuudet: "/>
+    <str id="PacksPanel.excludes" txt="Poisjätetyt: "/>
+    <str id="ImgPacksPanel.dependencyList" txt="Riippuvuudet ja/tai poisjätetyt"/>
     <str id="PacksPanel.notEnoughSpace"
          txt="Asennus vaatii enemmän tilaa kuin mitä levyasemassa on."/>
     <str id="PacksPanel.notAscertainable" txt="ei todettu"/>
@@ -160,7 +163,7 @@
 
     <!-- more descriptive error message would be cool, like specifying what file we looked for -->
     <str id="UserInputPanel.search.autodetect.failed.message"    txt="Automaattinen tunnistus epäonnistui."/>
-    <str id="UserInputPanel.search.autodetect.failed.caption"    txt="Automaattinen tunnistus epäonnistui."/>
+    <str id="UserInputPanel.search.autodetect.failed.caption"    txt="Automaattinen tunnistus"/>
     <str id="UserInputPanel.search.autodetect.tooltip"           txt="Tarkista ylläolevissa poluissa oleva hakemisto tai tiedosto."/>
     <str id="UserInputPanel.search.location"           txt="Anna sijainti: {0}."/>
     <str id="UserInputPanel.search.location.checkedfile" txt="Tiedoston {0} olemassaolo on tarkistettu."/>
@@ -191,7 +194,7 @@
     <str id="ProcessPanel.heading" txt="Käsittely menossa..." />
 
     <!-- Strings for the summary of panels - START -->
-    <str id="SummaryPanel.info" txt="Valmis asennukseen. Tärkeät tiedot on listattu alla. Paina &quot;Seuraava&quot; aloittaaksesi asennuksen, "/>
+    <str id="SummaryPanel.info" txt="Valmis asennukseen. Tärkeät tiedot on listattu alla. Paina &quot;Seuraava&quot; aloittaaksesi asennuksen."/>
     <str id="TargetPanel.summaryCaption" txt="Asennuspolku"/>
     <str id="JDKPathPanel.summaryCaption" txt="JDK polku"/>
     <str id="PacksPanel.summaryCaption" txt="Valitut asennuspaketit"/>
@@ -205,4 +208,12 @@
          langpack with the same syntax referred as resoure CustomLangpack.xml_[ISO3]"
     -->
 
+    <str id="nextmedia.title" txt="Seuraava asennusmedia" />
+  	<str id="nextmedia.msg" txt="Valitse seuraava asennusmedia." />
+	  <str id="nextmedia.browsebtn" txt="Selaa" />
+  	<str id="nextmedia.okbtn" txt="Hyväksy" />
+	  <str id="nextmedia.cancelbtn" txt="Peruuta" />
+    <str id="nextmedia.choosertitle" txt="Valitse asennusmedia" />
+    <str id="nextmedia.filedesc" rdid="asennuspaketit (.pak*)" />
 </langpack>
+

Modified: izpack-src/trunk/bin/langpacks/installer/fra.xml
===================================================================
--- izpack-src/trunk/bin/langpacks/installer/fra.xml	2007-01-28 17:29:41 UTC (rev 1721)
+++ izpack-src/trunk/bin/langpacks/installer/fra.xml	2007-01-28 17:49:04 UTC (rev 1722)
@@ -20,6 +20,7 @@
     <str id="installer.help" txt="Aide"/>
     <str id="installer.step" txt="Etape"/>
     <str id="installer.of" txt="sur"/>
+    <str id="installer.Message" txt="Message"/>
     
     <!-- Uninstaller specific strings -->
     <str id="uninstaller.warning" txt="Ceci va enlever l'(es) application(s) installée(s) !"/>

Modified: izpack-src/trunk/src/build.xml
===================================================================
--- izpack-src/trunk/src/build.xml	2007-01-28 17:29:41 UTC (rev 1721)
+++ izpack-src/trunk/src/build.xml	2007-01-28 17:49:04 UTC (rev 1722)
@@ -198,7 +198,7 @@
 
     <property file="src/ant.properties" />
     <property name="ver" value="3.10" />
-    <property name="rel" value="0-RC1" />
+    <property name="rel" value="0" />
     <property name="build.number" value="${ver}.${rel}" />
 
     <property name="src.dir" value="${basedir}/src/lib" />

Modified: izpack-src/trunk/src/dist-files/IzPack-install.xml
===================================================================
--- izpack-src/trunk/src/dist-files/IzPack-install.xml	2007-01-28 17:29:41 UTC (rev 1721)
+++ izpack-src/trunk/src/dist-files/IzPack-install.xml	2007-01-28 17:49:04 UTC (rev 1722)
@@ -23,7 +23,7 @@
     <!-- The info section -->
     <info>
         <appname>IzPack</appname>
-        <appversion>3.10.0-RC1</appversion>
+        <appversion>3.10.0</appversion>
         <authors>
             <author email="" name="Julien Ponge (maintainer and original developer)"/>
 
@@ -38,6 +38,7 @@
             <author email="" name="Hal Vaughan (contributor)" />
             <author email="" name="Ari Voutilainen (contributor)" />
             <author email="" name="Stefan Wachter (contributor)" />
+            <author email="" name="Romain Guy (contributor)" />
 
             <author email=""
                     name="... the (many) other developers and contributors to the previous releases!"/>

Modified: izpack-src/trunk/src/dist-files/splash-3.10.png
===================================================================
(Binary files differ)

Modified: izpack-src/trunk/src/lib/com/izforge/izpack/installer/IzPanel.java
===================================================================
--- izpack-src/trunk/src/lib/com/izforge/izpack/installer/IzPanel.java	2007-01-28 17:29:41 UTC (rev 1721)
+++ izpack-src/trunk/src/lib/com/izforge/izpack/installer/IzPanel.java	2007-01-28 17:49:04 UTC (rev 1722)
@@ -414,7 +414,7 @@
 
 	public boolean emitNotificationFeedback(String message)
     {
-       return (JOptionPane.showConfirmDialog(this, message, "Message", JOptionPane.WARNING_MESSAGE,
+       return (JOptionPane.showConfirmDialog(this, message, idata.langpack.getString("installer.Message"), JOptionPane.WARNING_MESSAGE,
              JOptionPane.OK_CANCEL_OPTION) == JOptionPane.OK_OPTION);
     }
 




More information about the izpack-changes mailing list