Index: AE/installer2/src/net/oni2/aeinstaller/AEInstaller.properties =================================================================== --- AE/installer2/src/net/oni2/aeinstaller/AEInstaller.properties (revision 628) +++ AE/installer2/src/net/oni2/aeinstaller/AEInstaller.properties (revision 629) @@ -1,11 +1,2 @@ appname=AE Installer 2 -appversion=0.87 - -invalidPath.title=Wrong directory -invalidPath.text=This program has to be placed in the subfolder Edition/AEInstaller inside a vanilla Oni folder.\nThe full path of the .jar-file has to be:\nOniFolder/Edition/AEInstaller/AEInstaller2.jar - -dotNetMissing.title=.NET is not installed -dotNetMissing.text=.NET, which is required to use this tool, is not installed on this machine.
Please download and install it:
%1 - -offlineMode.title=Offline mode -offlineMode.text=Connection to the ModDepot could not be established.\nAEI will run in offline mode.\nUpdates or installation of mods not already downloaded will not be possible. +appversion=0.88 Index: AE/installer2/src/net/oni2/aeinstaller/AEInstaller2.java =================================================================== --- AE/installer2/src/net/oni2/aeinstaller/AEInstaller2.java (revision 628) +++ AE/installer2/src/net/oni2/aeinstaller/AEInstaller2.java (revision 629) @@ -37,8 +37,9 @@ private static ResourceBundle imagesBundle = ResourceBundle - .getBundle(AEInstaller2.class.getPackage().getName() + ".Images"); + .getBundle("net.oni2.aeinstaller.Images"); private static ResourceBundle basicBundle = ResourceBundle - .getBundle(AEInstaller2.class.getPackage().getName() - + ".AEInstaller"); + .getBundle("net.oni2.aeinstaller.AEInstaller"); + private static ResourceBundle startupBundle = ResourceBundle + .getBundle("net.oni2.aeinstaller.localization.Startup"); private static Application app = null; @@ -92,4 +93,5 @@ SwingJavaBuilder.getConfig().addResourceBundle(imagesBundle); SwingJavaBuilder.getConfig().addResourceBundle(basicBundle); + SwingJavaBuilder.getConfig().addResourceBundle(startupBundle); SwingJavaBuilder.getConfig().setMarkInvalidResourceBundleKeys(true); SwingJavaBuilder.getConfig().addType("JToolBarSeparator", @@ -160,8 +162,8 @@ dlUrl = "http://www.go-mono.com/mono-downloads/download.html"; } - hll.setText(basicBundle.getString("dotNetMissing.text").replaceAll( + hll.setText(startupBundle.getString("dotNetMissing.text").replaceAll( "%1", String.format("%s", dlUrl, dlUrl))); JOptionPane.showMessageDialog(null, hll, - basicBundle.getString("dotNetMissing.title"), + startupBundle.getString("dotNetMissing.title"), JOptionPane.ERROR_MESSAGE); return; @@ -170,6 +172,6 @@ if (!Installer.verifyRunningDirectory()) { JOptionPane.showMessageDialog(null, - basicBundle.getString("invalidPath.text"), - basicBundle.getString("invalidPath.title"), + startupBundle.getString("invalidPath.text"), + startupBundle.getString("invalidPath.title"), JOptionPane.ERROR_MESSAGE); if (!Settings.isDebug()) { @@ -181,6 +183,6 @@ if (offline) { JOptionPane.showMessageDialog(null, - basicBundle.getString("offlineMode.text"), - basicBundle.getString("offlineMode.title"), + startupBundle.getString("offlineMode.text"), + startupBundle.getString("offlineMode.title"), JOptionPane.INFORMATION_MESSAGE); } Index: AE/installer2/src/net/oni2/aeinstaller/gui/MainWin.java =================================================================== --- AE/installer2/src/net/oni2/aeinstaller/gui/MainWin.java (revision 628) +++ AE/installer2/src/net/oni2/aeinstaller/gui/MainWin.java (revision 629) @@ -86,6 +86,7 @@ private static final long serialVersionUID = -4027395051382659650L; - private ResourceBundle bundle = ResourceBundle.getBundle(getClass() - .getName()); + private ResourceBundle bundle = ResourceBundle + .getBundle("net.oni2.aeinstaller.localization." + + getClass().getSimpleName()); @SuppressWarnings("unused") private BuildResult result = SwingJavaBuilder.build(this, bundle); Index: AE/installer2/src/net/oni2/aeinstaller/gui/MainWin.properties =================================================================== --- AE/installer2/src/net/oni2/aeinstaller/gui/MainWin.properties (revision 628) +++ (revision ) @@ -1,72 +1,0 @@ -# Main Frame -buttonExit.title=Exit - -menu.main=&Main -menu.settings=&Settings -menu.settingsTooltip=Settings -menu.about=&About -menu.aboutTooltip=About -menu.exit=&Exit\tCtrl+Q -menu.exitTooltip=Exit - -menu.file=&File -menu.runOniFull=Run &Oni (fullscreen) -menu.runOniFullTooltip=Run Oni in fullscreen mode -menu.runOniWin=Run Oni (&window) -menu.runOniWinTooltip=Run Oni in windowed mode -menu.openEditionFolder=Open Edition folder -menu.openEditionFolderTooltip=Open the Edition folder in the file explorer -menu.loadConfig=&Load mod selection... -menu.loadConfigTooltip=Load mod selection from a file -menu.saveConfig=&Save current mod selection... -menu.saveConfigTooltip=Save current mod selection to a file - -menu.reglobalize=&Rebuild Core Data -menu.reglobalizeTooltip=Rebuild Core Data -menu.update=&Check for updates -menu.updateTooltip=Check for updates to already downloaded packages on the Depot - -menu.tools=&Tools -menu.manageTools=&Manage Tools -menu.manageToolsTooltip=Install/Remove Tools - -btnRevertSelection.text=Revert selection -btnRevertSelection.tooltip=Select mods which are currently installed -btnInstall.text=&Install -btnInstall.tooltip=Install selected mods -lblModTypes.text=Mod type: -lblDownloadSize.text=Size of files to download: - -openModFolder.text=Open mod folder - -lblSubmitter.text=Submitter: -lblCreator.text=Creator: -lblTypes.text=Types: -lblPlatform.text=Platform: -lblPackageNumber.text=Package number: -lblFiles.text=Number of files: -lblDescription.text=Description: - -updateDepot.title=Updating Mod Depot cache - -installDone.title=Installation done -installDone.text=You can now play AE Oni. - -offlineMode.title=Offline mode -offlineMode.text=AEI is running in offline mode.\nNo updates or downloads of new mods are possible.\nPlease restart AEI when you have internet connection to update or download new packages. -updatesAvailable.title=Updates available -updatesAvailable.text=The following mods and tools have newer versions on the Depot.
Mods:
%s
Tools:
%s

Size of files to download is %s.
Update now? -checkOnStartup.text=Check for updates at startup - -noOniSplit.title=OniSplit not available -noOniSplit.text=The Edition is not yet initialized and OniSplit is missing (offline mode?).\nCan not resume from here, exiting! -askInitialize.title=Initialize Edition -askInitialize.text=The Edition is not yet initialized.\nIf you do not initialize now the installer will exit.\nInitialize Edition core now? - -initializingEdition.title=Initializing Edition core -installing.title=Installing mods -mandatoryFiles.title=Checking for mandatory files -mandatoryToolsInstall.title=Installing mandatory tools - -doUpdate.title=Updating packages - Index: AE/installer2/src/net/oni2/aeinstaller/gui/downloadwindow/Downloader.java =================================================================== --- AE/installer2/src/net/oni2/aeinstaller/gui/downloadwindow/Downloader.java (revision 628) +++ AE/installer2/src/net/oni2/aeinstaller/gui/downloadwindow/Downloader.java (revision 629) @@ -24,6 +24,7 @@ private static final long serialVersionUID = 9097967828001263776L; - private ResourceBundle bundle = ResourceBundle.getBundle(getClass() - .getName()); + private ResourceBundle bundle = ResourceBundle + .getBundle("net.oni2.aeinstaller.localization." + + getClass().getSimpleName()); @SuppressWarnings("unused") private BuildResult result = SwingJavaBuilder.build(this, bundle); Index: AE/installer2/src/net/oni2/aeinstaller/gui/downloadwindow/Downloader.properties =================================================================== --- AE/installer2/src/net/oni2/aeinstaller/gui/downloadwindow/Downloader.properties (revision 628) +++ (revision ) @@ -1,11 +1,0 @@ -frame.title=AE Installer: Downloading mods - -btnAbort.title=Abort -lblElapsed.title=Elpased: -lblRemaining.title=Remaining: -lblDownloaded.title=Downloaded: -lblTotal.title=Total: -lblRate.title=Rate: - -abort.text=If you abort the download now the installation of mods will also be aborted.\nDo you want to abort now? -abort.title=Really abort? Index: AE/installer2/src/net/oni2/aeinstaller/gui/modtable/ModTableModel.java =================================================================== --- AE/installer2/src/net/oni2/aeinstaller/gui/modtable/ModTableModel.java (revision 628) +++ AE/installer2/src/net/oni2/aeinstaller/gui/modtable/ModTableModel.java (revision 629) @@ -20,6 +20,7 @@ private static final long serialVersionUID = -8278155705802697354L; - private ResourceBundle bundle = ResourceBundle.getBundle(getClass() - .getName()); + private ResourceBundle bundle = ResourceBundle + .getBundle("net.oni2.aeinstaller.localization." + + getClass().getSimpleName()); private Vector items = new Vector(); Index: AE/installer2/src/net/oni2/aeinstaller/gui/modtable/ModTableModel.properties =================================================================== --- AE/installer2/src/net/oni2/aeinstaller/gui/modtable/ModTableModel.properties (revision 628) +++ (revision ) @@ -1,3 +1,0 @@ -mod.name=Name -mod.package_number=Pkg# -mod.install=Install Index: AE/installer2/src/net/oni2/aeinstaller/gui/settings/SettingsDialog.java =================================================================== --- AE/installer2/src/net/oni2/aeinstaller/gui/settings/SettingsDialog.java (revision 628) +++ AE/installer2/src/net/oni2/aeinstaller/gui/settings/SettingsDialog.java (revision 629) @@ -25,6 +25,7 @@ private static final long serialVersionUID = -5719515325671846620L; - private ResourceBundle bundle = ResourceBundle.getBundle(getClass() - .getName()); + private ResourceBundle bundle = ResourceBundle + .getBundle("net.oni2.aeinstaller.localization." + + getClass().getSimpleName()); @SuppressWarnings("unused") private BuildResult result = SwingJavaBuilder.build(this, bundle); Index: AE/installer2/src/net/oni2/aeinstaller/gui/settings/SettingsDialog.properties =================================================================== --- AE/installer2/src/net/oni2/aeinstaller/gui/settings/SettingsDialog.properties (revision 628) +++ (revision ) @@ -1,14 +1,0 @@ -frame.title=AE Installer: Settings -btnOk=Save -btnCancel=Cancel - -panUI=Look and feel -lblLaF=GUI theme: - -panCommon=Common settings -lblNotifyOnStart=Notify about updates on startup: -lblCopyIntro=Enable starting video on installation: -lblCopyOutro=Enable ending video on installation: - -newLaF.text=A new GUI theme was selected.\nPlease restart the application in order to apply the changes. -newLaF.title=Restart to apply theme Index: AE/installer2/src/net/oni2/aeinstaller/gui/toolmanager/ToolManager.java =================================================================== --- AE/installer2/src/net/oni2/aeinstaller/gui/toolmanager/ToolManager.java (revision 628) +++ AE/installer2/src/net/oni2/aeinstaller/gui/toolmanager/ToolManager.java (revision 629) @@ -35,6 +35,7 @@ private static final long serialVersionUID = 343221630538866384L; - private ResourceBundle bundle = ResourceBundle.getBundle(getClass() - .getName()); + private ResourceBundle bundle = ResourceBundle + .getBundle("net.oni2.aeinstaller.localization." + + getClass().getSimpleName()); @SuppressWarnings("unused") private BuildResult result = SwingJavaBuilder.build(this, bundle); Index: AE/installer2/src/net/oni2/aeinstaller/gui/toolmanager/ToolManager.properties =================================================================== --- AE/installer2/src/net/oni2/aeinstaller/gui/toolmanager/ToolManager.properties (revision 628) +++ (revision ) @@ -1,13 +1,0 @@ -frame.title=AE Installer: Tool Manager - -btnInstall.text=&Install -btnInstall.tooltip=Install this tool -btnInstall.un.text=&Uninstall -btnInstall.un.tooltip=Uninstall this tool - -lblSubmitter.text=Submitter: -lblCreator.text=Creator: -lblPlatform.text=Platform: -lblPackageNumber.text=Package number: -lblDescription.text=Description: -lblDownloadSize.text=Downloadsize of this package: Index: AE/installer2/src/net/oni2/aeinstaller/localization/Downloader.properties =================================================================== --- AE/installer2/src/net/oni2/aeinstaller/localization/Downloader.properties (revision 629) +++ AE/installer2/src/net/oni2/aeinstaller/localization/Downloader.properties (revision 629) @@ -0,0 +1,11 @@ +frame.title=AE Installer: Downloading mods + +btnAbort.title=Abort +lblElapsed.title=Elpased: +lblRemaining.title=Remaining: +lblDownloaded.title=Downloaded: +lblTotal.title=Total: +lblRate.title=Rate: + +abort.text=If you abort the download now the installation of mods will also be aborted.\nDo you want to abort now? +abort.title=Really abort? Index: AE/installer2/src/net/oni2/aeinstaller/localization/MainWin.properties =================================================================== --- AE/installer2/src/net/oni2/aeinstaller/localization/MainWin.properties (revision 629) +++ AE/installer2/src/net/oni2/aeinstaller/localization/MainWin.properties (revision 629) @@ -0,0 +1,72 @@ +# Main Frame +buttonExit.title=Exit + +menu.main=&Main +menu.settings=&Settings +menu.settingsTooltip=Settings +menu.about=&About +menu.aboutTooltip=About +menu.exit=&Exit\tCtrl+Q +menu.exitTooltip=Exit + +menu.file=&File +menu.runOniFull=Run &Oni (fullscreen) +menu.runOniFullTooltip=Run Oni in fullscreen mode +menu.runOniWin=Run Oni (&window) +menu.runOniWinTooltip=Run Oni in windowed mode +menu.openEditionFolder=Open Edition folder +menu.openEditionFolderTooltip=Open the Edition folder in the file explorer +menu.loadConfig=&Load mod selection... +menu.loadConfigTooltip=Load mod selection from a file +menu.saveConfig=&Save current mod selection... +menu.saveConfigTooltip=Save current mod selection to a file + +menu.reglobalize=&Rebuild Core Data +menu.reglobalizeTooltip=Rebuild Core Data +menu.update=&Check for updates +menu.updateTooltip=Check for updates to already downloaded packages on the Depot + +menu.tools=&Tools +menu.manageTools=&Manage Tools +menu.manageToolsTooltip=Install/Remove Tools + +btnRevertSelection.text=Revert selection +btnRevertSelection.tooltip=Select mods which are currently installed +btnInstall.text=&Install +btnInstall.tooltip=Install selected mods +lblModTypes.text=Mod type: +lblDownloadSize.text=Size of files to download: + +openModFolder.text=Open mod folder + +lblSubmitter.text=Submitter: +lblCreator.text=Creator: +lblTypes.text=Types: +lblPlatform.text=Platform: +lblPackageNumber.text=Package number: +lblFiles.text=Number of files: +lblDescription.text=Description: + +updateDepot.title=Updating Mod Depot cache + +installDone.title=Installation done +installDone.text=You can now play AE Oni. + +offlineMode.title=Offline mode +offlineMode.text=AEI is running in offline mode.\nNo updates or downloads of new mods are possible.\nPlease restart AEI when you have internet connection to update or download new packages. +updatesAvailable.title=Updates available +updatesAvailable.text=The following mods and tools have newer versions on the Depot.
Mods:
%s
Tools:
%s

Size of files to download is %s.
Update now? +checkOnStartup.text=Check for updates at startup + +noOniSplit.title=OniSplit not available +noOniSplit.text=The Edition is not yet initialized and OniSplit is missing (offline mode?).\nCan not resume from here, exiting! +askInitialize.title=Initialize Edition +askInitialize.text=The Edition is not yet initialized.\nIf you do not initialize now the installer will exit.\nInitialize Edition core now? + +initializingEdition.title=Initializing Edition core +installing.title=Installing mods +mandatoryFiles.title=Checking for mandatory files +mandatoryToolsInstall.title=Installing mandatory tools + +doUpdate.title=Updating packages + Index: AE/installer2/src/net/oni2/aeinstaller/localization/ModTableModel.properties =================================================================== --- AE/installer2/src/net/oni2/aeinstaller/localization/ModTableModel.properties (revision 629) +++ AE/installer2/src/net/oni2/aeinstaller/localization/ModTableModel.properties (revision 629) @@ -0,0 +1,3 @@ +mod.name=Name +mod.package_number=Pkg# +mod.install=Install Index: AE/installer2/src/net/oni2/aeinstaller/localization/SettingsDialog.properties =================================================================== --- AE/installer2/src/net/oni2/aeinstaller/localization/SettingsDialog.properties (revision 629) +++ AE/installer2/src/net/oni2/aeinstaller/localization/SettingsDialog.properties (revision 629) @@ -0,0 +1,14 @@ +frame.title=AE Installer: Settings +btnOk=Save +btnCancel=Cancel + +panUI=Look and feel +lblLaF=GUI theme: + +panCommon=Common settings +lblNotifyOnStart=Notify about updates on startup: +lblCopyIntro=Enable starting video on installation: +lblCopyOutro=Enable ending video on installation: + +newLaF.text=A new GUI theme was selected.\nPlease restart the application in order to apply the changes. +newLaF.title=Restart to apply theme Index: AE/installer2/src/net/oni2/aeinstaller/localization/Startup.properties =================================================================== --- AE/installer2/src/net/oni2/aeinstaller/localization/Startup.properties (revision 629) +++ AE/installer2/src/net/oni2/aeinstaller/localization/Startup.properties (revision 629) @@ -0,0 +1,8 @@ +invalidPath.title=Wrong directory +invalidPath.text=This program has to be placed in the subfolder Edition/AEInstaller inside a vanilla Oni folder.\nThe full path of the .jar-file has to be:\nOniFolder/Edition/AEInstaller/AEInstaller2.jar + +dotNetMissing.title=.NET is not installed +dotNetMissing.text=.NET, which is required to use this tool, is not installed on this machine.
Please download and install it:
%1 + +offlineMode.title=Offline mode +offlineMode.text=Connection to the ModDepot could not be established.\nAEI will run in offline mode.\nUpdates or installation of mods not already downloaded will not be possible. Index: AE/installer2/src/net/oni2/aeinstaller/localization/ToolManager.properties =================================================================== --- AE/installer2/src/net/oni2/aeinstaller/localization/ToolManager.properties (revision 629) +++ AE/installer2/src/net/oni2/aeinstaller/localization/ToolManager.properties (revision 629) @@ -0,0 +1,13 @@ +frame.title=AE Installer: Tool Manager + +btnInstall.text=&Install +btnInstall.tooltip=Install this tool +btnInstall.un.text=&Uninstall +btnInstall.un.tooltip=Uninstall this tool + +lblSubmitter.text=Submitter: +lblCreator.text=Creator: +lblPlatform.text=Platform: +lblPackageNumber.text=Package number: +lblDescription.text=Description: +lblDownloadSize.text=Downloadsize of this package: