Changeset 1090 for java/installer2
- Timestamp:
- Oct 30, 2017, 5:37:49 PM (7 years ago)
- Location:
- java/installer2/src/net/oni2/aeinstaller
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
java/installer2/src/net/oni2/aeinstaller/AEInstaller.properties
r1085 r1090 1 1 appname=AE Installer 2 2 appversion=. 292 appversion=.30 -
java/installer2/src/net/oni2/aeinstaller/gui/MainWin.java
r1081 r1090 825 825 installState = EInstallState.INCOMPATIBLE; 826 826 827 int conflictNum = 1; 827 828 String incompatString = ""; 828 829 for (Package m : incompatibilities.keySet()) { 829 830 if (incompatString.length() > 0) 830 831 incompatString += "\n"; 831 incompatString += m.getName() + ": "; 832 String confMods = ""; 832 833 if (incompatibilities.size() > 1) { 834 incompatString += bundle.getString("installIncompatibilities.conflict") + " " + conflictNum++ + ":\n"; 835 } 836 837 incompatString += " - " + m.getName() + "\n"; 833 838 for (Package mConf : incompatibilities.get(m)) { 834 if (confMods.length() > 0) 835 confMods += ", "; 836 confMods += mConf.getName(); 839 incompatString += " - " + mConf.getName() + "\n"; 837 840 } 838 incompatString += confMods;839 841 } 840 842 -
java/installer2/src/net/oni2/aeinstaller/localization/MainWin.properties
r1023 r1090 70 70 installIncompatibilities.title=Incompatible mods 71 71 installIncompatibilities.text=The following mods are incompatible:\n\n%s\n\nInstallation will be aborted. 72 installIncompatibilities.conflict=Conflict 72 73 installDone.title=Installation done 73 74 installDone.text=You can now play AE Oni.
Note:
See TracChangeset
for help on using the changeset viewer.