Index: java/installer2/locales/net/oni2/aeinstaller/localization/MainWin_de.properties =================================================================== --- java/installer2/locales/net/oni2/aeinstaller/localization/MainWin_de.properties (revision 734) +++ java/installer2/locales/net/oni2/aeinstaller/localization/MainWin_de.properties (revision 735) @@ -2,5 +2,5 @@ buttonExit.title=Beenden -menu.main=&Programm +menu.main=&Installer menu.settings=&Einstellungen menu.settingsTooltip=Einstellungen @@ -10,5 +10,5 @@ menu.exitTooltip=Beenden -menu.file=&Datei +menu.file=&Mods menu.runOniFull=&Oni starten (Vollbild) menu.runOniFullTooltip=Starte Oni im Vollbildmodus @@ -24,5 +24,5 @@ menu.corePackages=&Zeige Kernpakete menu.corePackagesTooltip=Zeige welche Kernpakete genutzt werden -menu.reglobalize=&Baue die Kerndaten neu auf +menu.reglobalize=&Reinitialisiere Edition menu.reglobalizeTooltip=Baue die Kerndaten neu auf menu.update=Überprüfe auf Aktualisierungen Index: java/installer2/src/net/oni2/aeinstaller/AEInstaller2.java =================================================================== --- java/installer2/src/net/oni2/aeinstaller/AEInstaller2.java (revision 734) +++ java/installer2/src/net/oni2/aeinstaller/AEInstaller2.java (revision 735) @@ -73,4 +73,12 @@ if (localesDir.isDirectory()) addClassPath(localesDir); + else { + File localesSubDir = CaseInsensitiveFile.getCaseInsensitiveFile( + CaseInsensitiveFile.getCaseInsensitiveFile( + Paths.getInstallerPath(), "bin"), "locales"); + if (localesSubDir.isDirectory()) { + addClassPath(localesSubDir); + } + } imagesBundle = ResourceBundle.getBundle("net.oni2.aeinstaller.Images"); basicBundle = ResourceBundle Index: java/installer2/src/net/oni2/aeinstaller/gui/MainWin.yml =================================================================== --- java/installer2/src/net/oni2/aeinstaller/gui/MainWin.yml (revision 734) +++ java/installer2/src/net/oni2/aeinstaller/gui/MainWin.yml (revision 735) @@ -24,6 +24,6 @@ - JMenuBar: - JMenu(name=mainMenu, text=menu.main): + - JMenuItem(action=about) - JMenuItem(action=settings) - - JMenuItem(action=about) - JMenuItem(action=exitAction) - JMenu(name=fileMenu, text=menu.file): @@ -61,20 +61,40 @@ - JComboBox(name=cmbShowFilterTo, onAction=updateTableFilter) - JScrollPane(name=scrollMods, vScrollBar=always, hScrollBar=never) - - JButton(name=btnUnSelectAll, icon=img.unSelect16, text=btnUnSelectAll.text, onAction=[unSelectAll]) - - JButton(name=btnRevertSelection, icon=img.undo16, text=btnRevertSelection.text, toolTipText=btnRevertSelection.tooltip, onAction=[revertSelection]) - - JButton(name=btnInstall, icon=img.install, text=btnInstall.text, toolTipText=btnInstall.tooltip, onAction=[install,installExec,installDone]) - - JLabel(name=lblSelectedMods, text=lblSelectedMods.text) - - JLabel(name=lblSelectedModsVal) - - JLabel(name=lblDownloadSize, text=lblDownloadSize.text) - - JLabel(name=lblDownloadSizeVal) + - JPanel(name=panBottom): + - JPanel(name=panBottomLeft): + - JButton(name=btnUnSelectAll, icon=img.unSelect16, text=btnUnSelectAll.text, onAction=[unSelectAll]) + - JButton(name=btnRevertSelection, icon=img.undo16, text=btnRevertSelection.text, toolTipText=btnRevertSelection.tooltip, onAction=[revertSelection]) + - MigLayout: | + [min] + btnUnSelectAll=1 [min] + btnRevertSelection=1 [min] + - JPanel(name=panBottomCenter): + - JLabel(name=lblSelectedMods, text=lblSelectedMods.text) + - JLabel(name=lblSelectedModsVal) + - JLabel(name=lblDownloadSize, text=lblDownloadSize.text) + - JLabel(name=lblDownloadSizeVal) + - JButton(name=btnInstall, icon=img.install, text=btnInstall.text, toolTipText=btnInstall.tooltip, onAction=[install,installExec,installDone]) + - MigLayout: | + [grow] + |lblSelectedMods<,lblSelectedModsVal< [min] + |lblDownloadSize<,lblDownloadSizeVal< [min] + |btnInstall< [min] + - JPanel(name=panBottomRight): + - JButton(name=btnRunOniFull, action=runOniFull) + - JButton(name=btnRunOniWin, action=runOniWin) + - MigLayout: | + [min] + >btnRunOniFull=1 [min] + >btnRunOniWin=1 [min] + - MigLayout: | + [min] [grow] [min] + panBottomLeft panBottomCenter panBottomRight [min] - MigLayout: | - [min] [grow] [min] - >lblModTypes cmbModTypes+* [min] - >lblShowOnly radAll+*,radOnline,radLocal [min] - >lblShowFilter txtShowFilter+*>,cmbShowFilterTo< [min] - scrollMods+* [grow] - >btnUnSelectAll+*,btnRevertSelection [min] - lblSelectedMods+2,lblSelectedModsVal >btnInstall+*+* [min] - lblDownloadSize+2,lblDownloadSizeVal [min] + [min] [grow] + >lblModTypes cmbModTypes< [min] + >lblShowOnly radAll,radOnline,radLocal [min] + >lblShowFilter txtShowFilter>,cmbShowFilterTo< [min] + scrollMods+* [grow] + panBottom+* [min] - PackageInfoBox(name=pkgInfo) - MigLayout: Index: java/installer2/src/net/oni2/aeinstaller/gui/about/AboutDialog.properties =================================================================== --- java/installer2/src/net/oni2/aeinstaller/gui/about/AboutDialog.properties (revision 734) +++ java/installer2/src/net/oni2/aeinstaller/gui/about/AboutDialog.properties (revision 735) @@ -2,9 +2,9 @@ btnClose=Close -AEIBy=by Alloc, Iritscen and Gumby +AEIBy=by Alloc, Gumby and Iritscen panAE=AE Credits: -AENames=Demos_Kratos:
EdT:
Geyser:
Gumby:
Iritscen:
Loser:
Neo:
Paradox:
RossyMiles:
Script10k:
SFeLi:
SSG: -AEWork=OniSplit GUI (Win)
OniSplit GUI (Mac)
Original creator of the Edition
AE Framework
Project management
Documenting Oni's game data
OniSplit, documenting Oni, tech support
Documenting Oni's game data
Daodan DLL port to C
xmlTools
Original Daodan DLL
Documenting Oni's game data +AENames=Alloc:
Geyser:
Gumby:
Iritscen:
Loser:
Neo:
Paradox:
RossyMiles:
s10k:
Sfeli:
SSG: +AEWork=AE Installer 2 (Iritscen forced me to add this line!)
Original creator of the Edition
Modular AE framework, AE Installer 1
Project management, MacOS support
Documenting Oni's game data
OniSplit, documenting Oni
Documenting Oni's game data
Daodan DLL port to C
xmlTools
Original Daodan DLL
Documenting Oni's game data panLinks=Links: Index: java/installer2/src/net/oni2/aeinstaller/localization/MainWin.properties =================================================================== --- java/installer2/src/net/oni2/aeinstaller/localization/MainWin.properties (revision 734) +++ java/installer2/src/net/oni2/aeinstaller/localization/MainWin.properties (revision 735) @@ -2,5 +2,5 @@ buttonExit.title=Exit -menu.main=&Main +menu.main=&Installer menu.settings=&Settings menu.settingsTooltip=Settings @@ -10,8 +10,8 @@ menu.exitTooltip=Exit -menu.file=&File +menu.file=&Mods menu.runOniFull=Run &Oni (fullscreen) menu.runOniFullTooltip=Run Oni in fullscreen mode -menu.runOniWin=Run Oni (&window) +menu.runOniWin=Run Oni (&windowed) menu.runOniWinTooltip=Run Oni in windowed mode menu.openEditionFolder=Open Edition folder @@ -24,5 +24,5 @@ menu.corePackages=&Show core packages menu.corePackagesTooltip=View which core packages are used -menu.reglobalize=&Rebuild Core Data +menu.reglobalize=&Re-initialize Edition menu.reglobalizeTooltip=Rebuild Core Data menu.update=&Check for updates