--- a/src/jdk.packager/linux/classes/jdk/packager/internal/resources/linux/LinuxAppBundler_ja.properties Wed Oct 17 15:43:29 2018 -0400
+++ b/src/jdk.packager/linux/classes/jdk/packager/internal/resources/linux/LinuxAppBundler_ja.properties Thu Oct 18 17:57:26 2018 -0400
@@ -30,6 +30,12 @@
param.icon-png.name=.png\u30A2\u30A4\u30B3\u30F3
param.icon-png.description=PNG\u5F62\u5F0F\u3067\u306E\u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u306E\u30A2\u30A4\u30B3\u30F3\u3002
+param.linux-install-dir.name=Linux Installation Directory
+param.linux-install-dir.description=Installation directory of the application on Linux.
+
+param.linux-package-dependencies.name=Linux Package Dependencies
+param.linux-package-dependencies.description=Required packages or capabilities for the application.
+
error.parameters-null=\u30D1\u30E9\u30E1\u30FC\u30BF\u30FB\u30DE\u30C3\u30D7\u304Cnull\u3067\u3059\u3002
error.parameters-null.advice=\u975Enull\u30D1\u30E9\u30E1\u30FC\u30BF\u30FB\u30DE\u30C3\u30D7\u3067\u6E21\u3057\u3066\u304F\u3060\u3055\u3044\u3002
error.no-linux-resources=Java\u30D1\u30C3\u30B1\u30FC\u30B8\u30E3\u306FLinux\u3092\u30B5\u30DD\u30FC\u30C8\u3057\u3066\u3044\u307E\u305B\u3093\u3002
--- a/src/jdk.packager/linux/classes/jdk/packager/internal/resources/linux/LinuxAppBundler_zh_CN.properties Wed Oct 17 15:43:29 2018 -0400
+++ b/src/jdk.packager/linux/classes/jdk/packager/internal/resources/linux/LinuxAppBundler_zh_CN.properties Thu Oct 18 17:57:26 2018 -0400
@@ -30,6 +30,12 @@
param.icon-png.name=.png \u56FE\u6807
param.icon-png.description=\u5E94\u7528\u7A0B\u5E8F\u7684\u56FE\u6807, \u91C7\u7528 PNG \u683C\u5F0F\u3002
+param.linux-install-dir.name=Linux Installation Directory
+param.linux-install-dir.description=Installation directory of the application on Linux.
+
+param.linux-package-dependencies.name=Linux Package Dependencies
+param.linux-package-dependencies.description=Required packages or capabilities for the application.
+
error.parameters-null=\u53C2\u6570\u6620\u5C04\u4E3A\u7A7A\u503C\u3002
error.parameters-null.advice=\u8BF7\u4F20\u5165\u975E\u7A7A\u53C2\u6570\u6620\u5C04\u3002
error.no-linux-resources=Java \u6253\u5305\u7A0B\u5E8F\u4E0D\u652F\u6301 Linux\u3002
--- a/src/jdk.packager/linux/classes/jdk/packager/internal/resources/linux/LinuxDebBundler.properties Wed Oct 17 15:43:29 2018 -0400
+++ b/src/jdk.packager/linux/classes/jdk/packager/internal/resources/linux/LinuxDebBundler.properties Thu Oct 18 17:57:26 2018 -0400
@@ -27,38 +27,38 @@
bundler.name=DEB Installer
bundler.description=Linux Debian Bundle.
-param.app-bundler.name=
-param.app-bundler.description=
+param.app-bundler.name=DEB Bundler Name
+param.app-bundler.description=DEB Bundler Name
-param.bundle-name.name=
-param.bundle-name.description=
+param.bundle-name.name=DEB Bundle Name
+param.bundle-name.description=DEB Bundle Name
-param.full-package-name.name=
-param.full-package-name.description=
+param.full-package-name.name=Deb Package Name
+param.full-package-name.description=Deb Package Name
-param.image-dir.name=
-param.image-dir.description=
+param.image-dir.name=Image Dir
+param.image-dir.description=Image Dir
-param.config-root.name=
-param.config-root.description=
+param.config-root.name=Config Root Dir
+param.config-root.description=Config Root Dir
-param.app-image-root.name=
-param.app-image-root.description=
+param.app-image-root.name=Image Root Dir
+param.app-image-root.description=Image Root Dir
-param.config-dir.name=
-param.config-dir.description=
+param.config-dir.name=Config Dir
+param.config-dir.description=Config Dir
-param.maintainer-email.name=
-param.maintainer-email.description=
+param.maintainer-email.name=DEB Maintainer Email
+param.maintainer-email.description=DEB Maintainer Email
-param.maintainer-name.name=
-param.maintainer-name.description=
+param.maintainer-name.name=DEB Maintainer Name
+param.maintainer-name.description=DEB Maintainer Name
-param.license-type.name=
-param.license-type.description=
+param.license-type.name=License Type
+param.license-type.description=License Type
-param.license-text.name=
-param.license-text.description=
+param.license-text.name=License Content
+param.license-text.description=License Content
param.xdg-prefix.name=Prefix for XDG files (mime, desktop)
param.xdg-prefix.description=Prefix for XDG MimeInfo and Desktop Files. Defaults to <vendor>-<appName>, with spaces dropped.
--- a/src/jdk.packager/linux/classes/jdk/packager/internal/resources/linux/LinuxDebBundler_ja.properties Wed Oct 17 15:43:29 2018 -0400
+++ b/src/jdk.packager/linux/classes/jdk/packager/internal/resources/linux/LinuxDebBundler_ja.properties Thu Oct 18 17:57:26 2018 -0400
@@ -27,38 +27,38 @@
bundler.name=DEB\u30A4\u30F3\u30B9\u30C8\u30FC\u30E9
bundler.description=Linux Debian\u30D0\u30F3\u30C9\u30EB\u3002
-param.app-bundler.name=
-param.app-bundler.description=
+param.app-bundler.name=DEB Bundler Name
+param.app-bundler.description=DEB Bundler Name
-param.bundle-name.name=
-param.bundle-name.description=
+param.bundle-name.name=DEB Bundle Name
+param.bundle-name.description=DEB Bundle Name
-param.full-package-name.name=
-param.full-package-name.description=
+param.full-package-name.name=Deb Package Name
+param.full-package-name.description=Deb Package Name
-param.image-dir.name=
-param.image-dir.description=
+param.image-dir.name=Image Dir
+param.image-dir.description=Image Dir
-param.config-root.name=
-param.config-root.description=
+param.config-root.name=Config Root Dir
+param.config-root.description=Config Root Dir
-param.app-image-root.name=
-param.app-image-root.description=
+param.app-image-root.name=Image Root Dir
+param.app-image-root.description=Image Root Dir
-param.config-dir.name=
-param.config-dir.description=
+param.config-dir.name=Config Dir
+param.config-dir.description=Config Dir
-param.maintainer-email.name=
-param.maintainer-email.description=
+param.maintainer-email.name=DEB Maintainer Email
+param.maintainer-email.description=DEB Maintainer Email
-param.maintainer-name.name=
-param.maintainer-name.description=
+param.maintainer-name.name=DEB Maintainer Name
+param.maintainer-name.description=DEB Maintainer Name
-param.license-type.name=
-param.license-type.description=
+param.license-type.name=License Type
+param.license-type.description=License Type
-param.license-text.name=
-param.license-text.description=
+param.license-text.name=License Content
+param.license-text.description=License Content
param.xdg-prefix.name=XDG\u30D5\u30A1\u30A4\u30EB\u306E\u63A5\u982D\u8F9E(mime\u3001\u30C7\u30B9\u30AF\u30C8\u30C3\u30D7)
param.xdg-prefix.description=XDG MimeInfo\u304A\u3088\u3073\u30C7\u30B9\u30AF\u30C8\u30C3\u30D7\u30FB\u30D5\u30A1\u30A4\u30EB\u306E\u63A5\u982D\u8F9E\u3002\u30C7\u30D5\u30A9\u30EB\u30C8\u306F<vendor>-<appName>\u3067\u3042\u308A\u3001\u30B9\u30DA\u30FC\u30B9\u306F\u524A\u9664\u3055\u308C\u307E\u3059\u3002
--- a/src/jdk.packager/linux/classes/jdk/packager/internal/resources/linux/LinuxDebBundler_zh_CN.properties Wed Oct 17 15:43:29 2018 -0400
+++ b/src/jdk.packager/linux/classes/jdk/packager/internal/resources/linux/LinuxDebBundler_zh_CN.properties Thu Oct 18 17:57:26 2018 -0400
@@ -27,38 +27,38 @@
bundler.name=DEB \u5B89\u88C5\u7A0B\u5E8F
bundler.description=Linux Debian \u5305\u3002
-param.app-bundler.name=
-param.app-bundler.description=
+param.app-bundler.name=DEB Bundler Name
+param.app-bundler.description=DEB Bundler Name
-param.bundle-name.name=
-param.bundle-name.description=
+param.bundle-name.name=DEB Bundle Name
+param.bundle-name.description=DEB Bundle Name
-param.full-package-name.name=
-param.full-package-name.description=
+param.full-package-name.name=Deb Package Name
+param.full-package-name.description=Deb Package Name
-param.image-dir.name=
-param.image-dir.description=
+param.image-dir.name=Image Dir
+param.image-dir.description=Image Dir
-param.config-root.name=
-param.config-root.description=
+param.config-root.name=Config Root Dir
+param.config-root.description=Config Root Dir
-param.app-image-root.name=
-param.app-image-root.description=
+param.app-image-root.name=Image Root Dir
+param.app-image-root.description=Image Root Dir
-param.config-dir.name=
-param.config-dir.description=
+param.config-dir.name=Config Dir
+param.config-dir.description=Config Dir
-param.maintainer-email.name=
-param.maintainer-email.description=
+param.maintainer-email.name=DEB Maintainer Email
+param.maintainer-email.description=DEB Maintainer Email
-param.maintainer-name.name=
-param.maintainer-name.description=
+param.maintainer-name.name=DEB Maintainer Name
+param.maintainer-name.description=DEB Maintainer Name
-param.license-type.name=
-param.license-type.description=
+param.license-type.name=License Type
+param.license-type.description=License Type
-param.license-text.name=
-param.license-text.description=
+param.license-text.name=License Content
+param.license-text.description=License Content
param.xdg-prefix.name=XDG \u6587\u4EF6 (mime, desktop) \u7684\u524D\u7F00
param.xdg-prefix.description=XDG MimeInfo \u548C Desktop \u6587\u4EF6\u7684\u524D\u7F00\u3002\u9ED8\u8BA4\u4E3A <vendor>-<appName>, \u4E0D\u542B\u7A7A\u683C\u3002
--- a/src/jdk.packager/linux/classes/jdk/packager/internal/resources/linux/LinuxRpmBundler.properties Wed Oct 17 15:43:29 2018 -0400
+++ b/src/jdk.packager/linux/classes/jdk/packager/internal/resources/linux/LinuxRpmBundler.properties Thu Oct 18 17:57:26 2018 -0400
@@ -27,17 +27,17 @@
bundler.name=RPM Bundle
bundler.description=Redhat Package Manager (RPM) bundler.
-param.app-bundler.name=
-param.app-bundler.description=
+param.app-bundler.name=RPM Bundler
+param.app-bundler.description=RPM Bundler
-param.image-dir.name=
-param.image-dir.description=
+param.image-dir.name=Image Dir
+param.image-dir.description=Image Dir
-param.bundle-name.name=
-param.bundle-name.description=
+param.bundle-name.name=RPM Bundle
+param.bundle-name.description=RPM Bundle
-param.config-root.name=
-param.config-root.description=
+param.config-root.name=Config Root Dir
+param.config-root.description=Config Root Dir
param.xdg-prefix.name=Prefix for XDG files (mime, desktop)
param.xdg-prefix.description=Prefix for XDG MimeInfo and Desktop Files. Defaults to <vendor>-<appName>, with spaces dropped.
--- a/src/jdk.packager/linux/classes/jdk/packager/internal/resources/linux/LinuxRpmBundler_ja.properties Wed Oct 17 15:43:29 2018 -0400
+++ b/src/jdk.packager/linux/classes/jdk/packager/internal/resources/linux/LinuxRpmBundler_ja.properties Thu Oct 18 17:57:26 2018 -0400
@@ -27,17 +27,17 @@
bundler.name=RPM\u30D0\u30F3\u30C9\u30EB
bundler.description=RedHat Package Manager (RPM)\u306E\u30D0\u30F3\u30C9\u30E9\u3002
-param.app-bundler.name=
-param.app-bundler.description=
+param.app-bundler.name=RPM Bundler
+param.app-bundler.description=RPM Bundler
-param.image-dir.name=
-param.image-dir.description=
+param.image-dir.name=Image Dir
+param.image-dir.description=Image Dir
-param.bundle-name.name=
-param.bundle-name.description=
+param.bundle-name.name=RPM Bundle
+param.bundle-name.description=RPM Bundle
-param.config-root.name=
-param.config-root.description=
+param.config-root.name=Config Root Dir
+param.config-root.description=Config Root Dir
param.xdg-prefix.name=XDG\u30D5\u30A1\u30A4\u30EB\u306E\u63A5\u982D\u8F9E(mime\u3001\u30C7\u30B9\u30AF\u30C8\u30C3\u30D7)
param.xdg-prefix.description=XDG MimeInfo\u304A\u3088\u3073\u30C7\u30B9\u30AF\u30C8\u30C3\u30D7\u30FB\u30D5\u30A1\u30A4\u30EB\u306E\u63A5\u982D\u8F9E\u3002\u30C7\u30D5\u30A9\u30EB\u30C8\u306F<vendor>-<appName>\u3067\u3042\u308A\u3001\u30B9\u30DA\u30FC\u30B9\u306F\u524A\u9664\u3055\u308C\u307E\u3059\u3002
--- a/src/jdk.packager/linux/classes/jdk/packager/internal/resources/linux/LinuxRpmBundler_zh_CN.properties Wed Oct 17 15:43:29 2018 -0400
+++ b/src/jdk.packager/linux/classes/jdk/packager/internal/resources/linux/LinuxRpmBundler_zh_CN.properties Thu Oct 18 17:57:26 2018 -0400
@@ -27,17 +27,17 @@
bundler.name=RPM \u5305
bundler.description=Redhat Package Manager (RPM) \u6253\u5305\u7A0B\u5E8F\u3002
-param.app-bundler.name=
-param.app-bundler.description=
+param.app-bundler.name=RPM Bundler
+param.app-bundler.description=RPM Bundler
-param.image-dir.name=
-param.image-dir.description=
+param.image-dir.name=Image Dir
+param.image-dir.description=Image Dir
-param.bundle-name.name=
-param.bundle-name.description=
+param.bundle-name.name=RPM Bundle
+param.bundle-name.description=RPM Bundle
-param.config-root.name=
-param.config-root.description=
+param.config-root.name=Config Root Dir
+param.config-root.description=Config Root Dir
param.xdg-prefix.name=XDG \u6587\u4EF6 (mime, desktop) \u7684\u524D\u7F00
param.xdg-prefix.description=XDG MimeInfo \u548C Desktop \u6587\u4EF6\u7684\u524D\u7F00\u3002\u9ED8\u8BA4\u4E3A <vendor>-<appName>, \u4E0D\u542B\u7A7A\u683C\u3002
--- a/src/jdk.packager/macosx/classes/jdk/packager/internal/resources/builders/mac/MacAppImageBuilder.properties Wed Oct 17 15:43:29 2018 -0400
+++ b/src/jdk.packager/macosx/classes/jdk/packager/internal/resources/builders/mac/MacAppImageBuilder.properties Thu Oct 18 17:57:26 2018 -0400
@@ -27,14 +27,11 @@
bundler.name=Mac Application Image
bundler.description=A Directory based image of a mac Application with an optionally co-bundled JRE. Used as a base for the Installer bundlers
-param.signing-key-developer-id-app.name=Apple Developer ID Application Signing Key
-param.signing-key-developer-id-app.description=The full name of the Apple Developer ID Application signing key.
-
param.icon-icns.name=.icns Icon
param.icon-icns.description= Icon for the application, in ICNS format.
-param.config-root.name=
-param.config-root.description=
+param.config-root.name=Configuration Root Name
+param.config-root.description=The root directory of COnfiguration files.
param.configure-launcher-in-plist=Configure Launcher in Info.plist
param.configure-launcher-in-plist.description=Should the legacy method of configuring hte launcher in the Info.plist be used.
@@ -54,35 +51,17 @@
param.bundle-id-signing-prefix.name=Bundle Signing Prefix
param.bundle-id-signing-prefix.description=When signing the application bundle this value is prefixed to all components that need to be signed that don't have an existing CFBundleIdentifier.
-param.raw-executable-url.name=Launcher URL
-param.raw-executable-url.description=Override the packager default launcher with a custom launcher.
-
param.default-icon-icns=Default Icon
param.default-icon-icns.description=The Default Icon for when a user does not specify an icns file.
param.sign-bundle.name=Sign Bundle
param.sign-bundle.description=Request that the bundle be signed.
-param.images-root.name=
-param.images-root.description=
-
-error.cannot-create-output-dir=Output directory {0} cannot be created.
-error.cannot-write-to-output-dir=Output directory {0} is not writable.
-error.invalid-cfbundle-version=Invalid CFBundleVersion - ''{0}''
-error.invalid-cfbundle-version.advice=Set a compatible 'appVersion' or set a 'mac.CFBundleVersion'. Valid versions are one to three integers separated by dots.
-error.explicit-sign-no-cert=Signature explicitly requested but no signing certificate specified.
-error.explicit-sign-no-cert.advice=Either specify a valid cert in 'mac.signing-key-developer-id-app' or unset 'signBundle' or set 'signBundle' to false.
-error.non-existent-runtime=The file for the Runtime/JRE directory does not exist.
-error.non-existent-runtime.advice=Point the runtime parameter to a directory that containes the JRE.
-error.cannot-detect-runtime-in-directory=Cannot determine which JRE/JDK exists in the specified runtime directory.
-error.cannot-detect-runtime-in-directory.advice=Point the runtime directory to one of the JDK/JRE root, the Contents/Home directory of that root, or the Contents/Home/jre directory of the JDK.
resource.app-info-plist=Application Info.plist
resource.runtime-info-plist=Java Runtime Info.plist
message.config-save-location=Config files are saved to {0}. Use them to customize package.
message.bundle-name-too-long-warning={0} is set to ''{1}'', which is longer than 16 characters. For a better Mac experience consider shortening it.
-message.no-mac-jre-support=Currently Macs require a JDK to package
-message.creating-app-bundle=Creating app bundle\: {0}
message.null-classpath=Null app resources?
message.preparing-info-plist=Preparing Info.plist\: {0}
message.icon-not-icns= The specified icon "{0}" is not an ICNS file and will not be used. The default icon will be used in it's place.
@@ -92,9 +71,5 @@
message.version-string-numbers-only=Version strings can consist of only numbers and up to two dots.
message.creating-association-with-null-extension=Creating association with null extension.
-message.using-default-resource=Using default package resource {0} (add {1} to the class path to customize)
-message.using-custom-resource-from-file=Using custom package resource {0} (loaded from file {1})
-message.using-custom-resource-from-classpath=Using custom package resource {0} (loaded from {1})
-message.using-default-resource-from-classpath=Using default package resource {0} (add {1} to the class path to customize)
message.ignoring.symlink=Warning: codesign is skipping the symlink {0}
message.keychain.error=Error: unable to get keychain list.
--- a/src/jdk.packager/macosx/classes/jdk/packager/internal/resources/builders/mac/MacAppImageBuilder_ja.properties Wed Oct 17 15:43:29 2018 -0400
+++ b/src/jdk.packager/macosx/classes/jdk/packager/internal/resources/builders/mac/MacAppImageBuilder_ja.properties Thu Oct 18 17:57:26 2018 -0400
@@ -27,14 +27,11 @@
bundler.name=Mac\u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u30FB\u30A4\u30E1\u30FC\u30B8
bundler.description=\u30AA\u30D7\u30B7\u30E7\u30F3\u3067JRE\u304C\u30D0\u30F3\u30C9\u30EB\u3055\u308C\u3066\u3044\u308BMac\u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u306E\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u30FB\u30D9\u30FC\u30B9\u306E\u30A4\u30E1\u30FC\u30B8\u3002\u30A4\u30F3\u30B9\u30C8\u30FC\u30E9\u30FB\u30D0\u30F3\u30C9\u30EB\u306E\u30D9\u30FC\u30B9\u3068\u3057\u3066\u4F7F\u7528\u3055\u308C\u307E\u3059\u3002
-param.signing-key-developer-id-app.name=Apple Developer ID\u306E\u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u7F72\u540D\u30AD\u30FC
-param.signing-key-developer-id-app.description=Apple Developer ID\u306E\u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u7F72\u540D\u30AD\u30FC\u306E\u30D5\u30EB\u30FB\u30CD\u30FC\u30E0\u3002
-
param.icon-icns.name=.icns\u30A2\u30A4\u30B3\u30F3
param.icon-icns.description= ICNS\u5F62\u5F0F\u3067\u306E\u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u306E\u30A2\u30A4\u30B3\u30F3\u3002
-param.config-root.name=
-param.config-root.description=
+param.config-root.name=Configuration Root Name
+param.config-root.description=The root directory of COnfiguration files.
param.configure-launcher-in-plist=Info.plist\u3067\u306E\u30E9\u30F3\u30C1\u30E3\u306E\u69CB\u6210
param.configure-launcher-in-plist.description=Info.plist\u3067\u306E\u30E9\u30F3\u30C1\u30E3\u306E\u69CB\u6210\u306B\u306F\u30EC\u30AC\u30B7\u30FC\u30FB\u30E1\u30BD\u30C3\u30C9\u3092\u4F7F\u7528\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
@@ -54,32 +51,14 @@
param.bundle-id-signing-prefix.name=\u30D0\u30F3\u30C9\u30EB\u7F72\u540D\u63A5\u982D\u8F9E
param.bundle-id-signing-prefix.description=\u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u30FB\u30D0\u30F3\u30C9\u30EB\u306B\u7F72\u540D\u3059\u308B\u969B\u3001\u7F72\u540D\u3059\u308B\u5FC5\u8981\u306E\u3042\u308B\u3001\u65E2\u5B58\u306ECFBundleIdentifier\u3092\u6301\u305F\u306A\u3044\u3059\u3079\u3066\u306E\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8\u306B\u3053\u306E\u5024\u304C\u63A5\u982D\u8F9E\u3068\u3057\u3066\u4ED8\u3051\u3089\u308C\u307E\u3059\u3002
-param.raw-executable-url.name=\u30E9\u30F3\u30C1\u30E3URL
-param.raw-executable-url.description=\u30D1\u30C3\u30B1\u30FC\u30B8\u30E3\u306E\u30C7\u30D5\u30A9\u30EB\u30C8\u30FB\u30E9\u30F3\u30C1\u30E3\u3092\u30AB\u30B9\u30BF\u30E0\u30FB\u30E9\u30F3\u30C1\u30E3\u3067\u30AA\u30FC\u30D0\u30FC\u30E9\u30A4\u30C9\u3057\u307E\u3059\u3002
-
param.default-icon-icns=\u30C7\u30D5\u30A9\u30EB\u30C8\u30FB\u30A2\u30A4\u30B3\u30F3
param.default-icon-icns.description=\u30E6\u30FC\u30B6\u30FC\u304C\u30A2\u30A4\u30B3\u30F3\u30FB\u30D5\u30A1\u30A4\u30EB\u3092\u6307\u5B9A\u3057\u306A\u3044\u5834\u5408\u306E\u30C7\u30D5\u30A9\u30EB\u30C8\u30FB\u30A2\u30A4\u30B3\u30F3\u3002
-param.images-root.name=
-param.images-root.description=
-
-error.cannot-create-output-dir=\u51FA\u529B\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA{0}\u3092\u4F5C\u6210\u3067\u304D\u307E\u305B\u3093\u3002
-error.cannot-write-to-output-dir=\u51FA\u529B\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA{0}\u306F\u66F8\u8FBC\u307F\u4E0D\u53EF\u3067\u3059\u3002
-error.invalid-cfbundle-version=CFBundleVersion - ''{0}''\u304C\u7121\u52B9\u3067\u3059
-error.invalid-cfbundle-version.advice=\u4E92\u63DB\u6027\u306E\u3042\u308B'appVersion'\u3092\u8A2D\u5B9A\u3059\u308B\u304B\u3001'mac.CFBundleVersion'\u3092\u8A2D\u5B9A\u3057\u307E\u3059\u3002\u6709\u52B9\u306A\u30D0\u30FC\u30B8\u30E7\u30F3\u306F\u3001\u30C9\u30C3\u30C8\u3067\u533A\u5207\u3089\u308C\u305F1\u304B\u30893\u3064\u306E\u6574\u6570\u3067\u3059\u3002
-error.explicit-sign-no-cert=\u7F72\u540D\u304C\u660E\u793A\u7684\u306B\u8981\u6C42\u3055\u308C\u307E\u3057\u305F\u304C\u3001\u7F72\u540D\u8A3C\u660E\u66F8\u304C\u6307\u5B9A\u3055\u308C\u3066\u3044\u307E\u305B\u3093\u3002
-error.explicit-sign-no-cert.advice=\u6709\u52B9\u306A\u8A3C\u660E\u66F8\u3092'mac.signing-key-developer-id-app'\u3067\u6307\u5B9A\u3059\u308B\u304B\u3001'signBundle'\u3092\u8A2D\u5B9A\u89E3\u9664\u3059\u308B\u304B\u3001\u307E\u305F\u306F'signBundle'\u3092false\u306B\u8A2D\u5B9A\u3057\u307E\u3059\u3002
-error.non-existent-runtime=\u30E9\u30F3\u30BF\u30A4\u30E0/JRE\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u306B\u30D5\u30A1\u30A4\u30EB\u304C\u5B58\u5728\u3057\u307E\u305B\u3093\u3002
-error.non-existent-runtime.advice=\u30E9\u30F3\u30BF\u30A4\u30E0\u30FB\u30D1\u30E9\u30E1\u30FC\u30BF\u306B\u3001JRE\u3092\u542B\u3080\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u3092\u6307\u5B9A\u3057\u307E\u3059\u3002
-error.cannot-detect-runtime-in-directory=\u6307\u5B9A\u3057\u305F\u30E9\u30F3\u30BF\u30A4\u30E0\u30FB\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u306B\u3069\u306EJRE/JDK\u304C\u5B58\u5728\u3059\u308B\u306E\u304B\u3092\u7279\u5B9A\u3067\u304D\u307E\u305B\u3093\u3002
-error.cannot-detect-runtime-in-directory.advice=\u30E9\u30A4\u30BF\u30A4\u30E0\u30FB\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u306B\u3001JDK/JRE\u30EB\u30FC\u30C8\u3001\u305D\u306E\u30EB\u30FC\u30C8\u306E\u30B3\u30F3\u30C6\u30F3\u30C4/\u30DB\u30FC\u30E0\u30FB\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u3001\u307E\u305F\u306FJDK\u306E\u30B3\u30F3\u30C6\u30F3\u30C4/\u30DB\u30FC\u30E0/jre\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u306E\u3044\u305A\u308C\u304B\u3092\u6307\u5B9A\u3057\u307E\u3059\u3002
resource.app-info-plist=\u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u306EInfo.plist
resource.runtime-info-plist=Java\u30E9\u30F3\u30BF\u30A4\u30E0\u306EInfo.plist
message.config-save-location=\u69CB\u6210\u30D5\u30A1\u30A4\u30EB\u304C{0}\u306B\u4FDD\u5B58\u3055\u308C\u3066\u3044\u307E\u3059\u3002\u30D1\u30C3\u30B1\u30FC\u30B8\u3092\u30AB\u30B9\u30BF\u30DE\u30A4\u30BA\u3059\u308B\u306B\u306F\u3053\u308C\u3092\u4F7F\u7528\u3057\u307E\u3059\u3002
message.bundle-name-too-long-warning={0}\u304C16\u6587\u5B57\u3092\u8D85\u3048\u308B''{1}''\u306B\u8A2D\u5B9A\u3055\u308C\u3066\u3044\u307E\u3059\u3002Mac\u3067\u306E\u64CD\u4F5C\u6027\u3092\u3088\u308A\u826F\u304F\u3059\u308B\u305F\u3081\u306B\u77ED\u304F\u3059\u308B\u3053\u3068\u3092\u691C\u8A0E\u3057\u3066\u304F\u3060\u3055\u3044\u3002
-message.no-mac-jre-support=\u73FE\u5728\u3001Mac\u3067\u306FJDK\u3092\u30D1\u30C3\u30B1\u30FC\u30B8\u5316\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059
-message.creating-app-bundle=\u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u30FB\u30D0\u30F3\u30C9\u30EB\u3092\u4F5C\u6210\u3057\u3066\u3044\u307E\u3059: {0}
message.null-classpath=Null\u306E\u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u30FB\u30EA\u30BD\u30FC\u30B9\u3067\u3059\u304B\u3002
message.preparing-info-plist=Info.plist\u3092\u6E96\u5099\u3057\u3066\u3044\u307E\u3059: {0}
message.icon-not-icns= \u6307\u5B9A\u3057\u305F\u30A2\u30A4\u30B3\u30F3"{0}"\u306FICNS\u30D5\u30A1\u30A4\u30EB\u3067\u306F\u306A\u304F\u3001\u4F7F\u7528\u3055\u308C\u307E\u305B\u3093\u3002\u30C7\u30D5\u30A9\u30EB\u30C8\u30FB\u30A2\u30A4\u30B3\u30F3\u304C\u305D\u306E\u4F4D\u7F6E\u306B\u4F7F\u7528\u3055\u308C\u307E\u3059\u3002
@@ -89,8 +68,5 @@
message.version-string-numbers-only=\u30D0\u30FC\u30B8\u30E7\u30F3\u6587\u5B57\u5217\u306F\u3001\u6570\u5B57\u30682\u3064\u307E\u3067\u306E\u30C9\u30C3\u30C8\u3067\u306E\u307F\u69CB\u6210\u3067\u304D\u307E\u3059\u3002
message.creating-association-with-null-extension=null\u62E1\u5F35\u5B50\u3068\u306E\u95A2\u9023\u4ED8\u3051\u3092\u4F5C\u6210\u3057\u3066\u3044\u307E\u3059\u3002
-message.using-default-resource=\u30C7\u30D5\u30A9\u30EB\u30C8\u306E\u30D1\u30C3\u30B1\u30FC\u30B8\u30FB\u30EA\u30BD\u30FC\u30B9{0}\u306E\u4F7F\u7528({1}\u3092\u30AF\u30E9\u30B9\u30FB\u30D1\u30B9\u306B\u8FFD\u52A0\u3057\u3066\u30AB\u30B9\u30BF\u30DE\u30A4\u30BA)
-message.using-custom-resource-from-file=\u30AB\u30B9\u30BF\u30E0\u30FB\u30D1\u30C3\u30B1\u30FC\u30B8\u30FB\u30EA\u30BD\u30FC\u30B9{0}\u306E\u4F7F\u7528(\u30D5\u30A1\u30A4\u30EB{1}\u304B\u3089\u30ED\u30FC\u30C9\u6E08)
-message.using-custom-resource-from-classpath=\u30AB\u30B9\u30BF\u30E0\u30FB\u30D1\u30C3\u30B1\u30FC\u30B8\u30FB\u30EA\u30BD\u30FC\u30B9{0}\u306E\u4F7F\u7528({1}\u304B\u3089\u30ED\u30FC\u30C9\u6E08)
-message.using-default-resource-from-classpath=\u30C7\u30D5\u30A9\u30EB\u30C8\u306E\u30D1\u30C3\u30B1\u30FC\u30B8\u30FB\u30EA\u30BD\u30FC\u30B9{0}\u306E\u4F7F\u7528({1}\u3092\u30AF\u30E9\u30B9\u30FB\u30D1\u30B9\u306B\u8FFD\u52A0\u3057\u3066\u30AB\u30B9\u30BF\u30DE\u30A4\u30BA)
message.ignoring.symlink=\u8B66\u544A: codesign\u304Csymlink {0}\u3092\u30B9\u30AD\u30C3\u30D7\u3057\u3066\u3044\u307E\u3059
+message.keychain.error=Error: unable to get keychain list.
--- a/src/jdk.packager/macosx/classes/jdk/packager/internal/resources/builders/mac/MacAppImageBuilder_zh_CN.properties Wed Oct 17 15:43:29 2018 -0400
+++ b/src/jdk.packager/macosx/classes/jdk/packager/internal/resources/builders/mac/MacAppImageBuilder_zh_CN.properties Thu Oct 18 17:57:26 2018 -0400
@@ -27,14 +27,11 @@
bundler.name=Mac \u5E94\u7528\u7A0B\u5E8F\u6620\u50CF
bundler.description=\u4E00\u4E2A\u57FA\u4E8E\u76EE\u5F55\u7684 mac \u5E94\u7528\u7A0B\u5E8F\u6620\u50CF, \u53EF\u4EE5\u9009\u62E9\u6027\u5730\u5E26\u6709\u5171\u540C\u6253\u5305\u7684 JRE\u3002\u7528\u4F5C\u5B89\u88C5\u7A0B\u5E8F\u6253\u5305\u7A0B\u5E8F\u7684\u57FA\u7840
-param.signing-key-developer-id-app.name=Apple \u5F00\u53D1\u8005 ID \u5E94\u7528\u7A0B\u5E8F\u7B7E\u540D\u5BC6\u94A5
-param.signing-key-developer-id-app.description=Apple \u5F00\u53D1\u8005 ID \u5E94\u7528\u7A0B\u5E8F\u7B7E\u540D\u5BC6\u94A5\u7684\u5168\u540D\u3002
-
param.icon-icns.name=.icns \u56FE\u6807
param.icon-icns.description= \u5E94\u7528\u7A0B\u5E8F\u7684\u56FE\u6807, \u91C7\u7528 ICNS \u683C\u5F0F\u3002
-param.config-root.name=
-param.config-root.description=
+param.config-root.name=Configuration Root Name
+param.config-root.description=The root directory of Configuration files.
param.configure-launcher-in-plist=\u5728 Info.plist \u4E2D\u914D\u7F6E\u542F\u52A8\u7A0B\u5E8F
param.configure-launcher-in-plist.description=\u662F\u5426\u5E94\u4F7F\u7528\u5728 Info.plist \u4E2D\u914D\u7F6E\u542F\u52A8\u7A0B\u5E8F\u7684\u65E7\u65B9\u6CD5\u3002
@@ -54,32 +51,14 @@
param.bundle-id-signing-prefix.name=\u5305\u7B7E\u540D\u524D\u7F00
param.bundle-id-signing-prefix.description=\u5BF9\u5E94\u7528\u7A0B\u5E8F\u5305\u8FDB\u884C\u7B7E\u540D\u65F6, \u6B64\u503C\u5C06\u4F5C\u4E3A\u524D\u7F00\u6DFB\u52A0\u5230\u9700\u8981\u7B7E\u540D\u4F46\u4E0D\u5177\u6709\u73B0\u6709 CFBundleIdentifier \u7684\u6240\u6709\u7EC4\u4EF6\u4E2D\u3002
-param.raw-executable-url.name=\u542F\u52A8\u7A0B\u5E8F URL
-param.raw-executable-url.description=\u4F7F\u7528\u5B9A\u5236\u542F\u52A8\u7A0B\u5E8F\u8986\u76D6\u6253\u5305\u7A0B\u5E8F\u9ED8\u8BA4\u542F\u52A8\u7A0B\u5E8F\u3002
-
param.default-icon-icns=\u9ED8\u8BA4\u56FE\u6807
param.default-icon-icns.description=\u7528\u6237\u672A\u6307\u5B9A icns \u6587\u4EF6\u65F6\u4F7F\u7528\u7684\u9ED8\u8BA4\u56FE\u6807\u3002
-param.images-root.name=
-param.images-root.description=
-
-error.cannot-create-output-dir=\u65E0\u6CD5\u521B\u5EFA\u8F93\u51FA\u76EE\u5F55 {0}\u3002
-error.cannot-write-to-output-dir=\u8F93\u51FA\u76EE\u5F55 {0} \u4E0D\u53EF\u5199\u3002
-error.invalid-cfbundle-version=\u65E0\u6548\u7684 CFBundleVersion - ''{0}''
-error.invalid-cfbundle-version.advice=\u8BBE\u7F6E\u517C\u5BB9\u7684 'appVersion' \u6216\u8005\u8BBE\u7F6E 'mac.CFBundleVersion'\u3002\u6709\u6548\u7248\u672C\u5305\u542B\u4E00\u5230\u4E09\u4E2A\u7528\u70B9\u5206\u9694\u7684\u6574\u6570\u3002
-error.explicit-sign-no-cert=\u5DF2\u660E\u786E\u8BF7\u6C42\u7B7E\u540D, \u4F46\u672A\u6307\u5B9A\u7B7E\u540D\u8BC1\u4E66\u3002
-error.explicit-sign-no-cert.advice=\u5728 'mac.signing-key-developer-id-app' \u4E2D\u6307\u5B9A\u6709\u6548\u7684\u8BC1\u4E66, \u6216\u8005\u53D6\u6D88\u8BBE\u7F6E 'signBundle', \u6216\u8005\u5C06 'signBundle' \u8BBE\u7F6E\u4E3A\u201C\u5047\u201D\u3002
-error.non-existent-runtime=\u8FD0\u884C\u65F6/JRE \u76EE\u5F55\u7684\u6587\u4EF6\u4E0D\u5B58\u5728\u3002
-error.non-existent-runtime.advice=\u5C06\u8FD0\u884C\u65F6\u53C2\u6570\u6307\u5411\u5305\u542B JRE \u7684\u76EE\u5F55\u3002
-error.cannot-detect-runtime-in-directory=\u65E0\u6CD5\u786E\u5B9A\u6307\u5B9A\u7684\u8FD0\u884C\u65F6\u76EE\u5F55\u4E2D\u5B58\u5728\u54EA\u4E2A\u7248\u672C\u7684 JRE/JDK\u3002
-error.cannot-detect-runtime-in-directory.advice=\u5C06\u8FD0\u884C\u65F6\u76EE\u5F55\u6307\u5411\u4EE5\u4E0B\u76EE\u5F55\u4E4B\u4E00: JDK/JRE \u6839\u76EE\u5F55, \u8BE5\u6839\u76EE\u5F55\u7684 Contents/Home \u76EE\u5F55\u6216 JDK \u7684 Contents/Home/jre \u76EE\u5F55\u3002
resource.app-info-plist=\u5E94\u7528\u7A0B\u5E8F Info.plist
resource.runtime-info-plist=Java \u8FD0\u884C\u65F6 Info.plist
message.config-save-location=\u914D\u7F6E\u6587\u4EF6\u5DF2\u4FDD\u5B58\u5230 {0}\u3002\u4F7F\u7528\u8FD9\u4E9B\u914D\u7F6E\u6587\u4EF6\u53EF\u5B9A\u5236\u7A0B\u5E8F\u5305\u3002
message.bundle-name-too-long-warning={0}\u5DF2\u8BBE\u7F6E\u4E3A ''{1}'', \u5176\u957F\u5EA6\u8D85\u8FC7\u4E86 16 \u4E2A\u5B57\u7B26\u3002\u4E3A\u4E86\u83B7\u5F97\u66F4\u597D\u7684 Mac \u4F53\u9A8C, \u8BF7\u8003\u8651\u5C06\u5176\u7F29\u77ED\u3002
-message.no-mac-jre-support=Mac \u5F53\u524D\u9700\u8981 JDK \u4EE5\u4FBF\u6253\u5305
-message.creating-app-bundle=\u6B63\u5728\u521B\u5EFA\u5E94\u7528\u7A0B\u5E8F\u5305: {0}
message.null-classpath=\u662F\u5426\u4E3A\u7A7A\u5E94\u7528\u7A0B\u5E8F\u8D44\u6E90?
message.preparing-info-plist=\u6B63\u5728\u51C6\u5907 Info.plist: {0}
message.icon-not-icns= \u6307\u5B9A\u7684\u56FE\u6807 "{0}" \u4E0D\u662F ICNS \u6587\u4EF6, \u4E0D\u4F1A\u4F7F\u7528\u3002\u5C06\u4F7F\u7528\u9ED8\u8BA4\u56FE\u6807\u4EE3\u66FF\u3002
@@ -89,8 +68,6 @@
message.version-string-numbers-only=\u7248\u672C\u5B57\u7B26\u4E32\u53EA\u80FD\u5305\u542B\u6570\u5B57\u548C\u6700\u591A\u4E24\u4E2A\u70B9\u3002
message.creating-association-with-null-extension=\u6B63\u5728\u4F7F\u7528\u7A7A\u6269\u5C55\u540D\u521B\u5EFA\u5173\u8054\u3002
-message.using-default-resource=\u4F7F\u7528\u9ED8\u8BA4\u7A0B\u5E8F\u5305\u8D44\u6E90 {0} (\u5C06 {1} \u6DFB\u52A0\u5230\u7C7B\u8DEF\u5F84\u4EE5\u5B9A\u5236)
-message.using-custom-resource-from-file=\u4F7F\u7528\u5B9A\u5236\u7A0B\u5E8F\u5305\u8D44\u6E90 {0} (\u4ECE\u6587\u4EF6 {1} \u52A0\u8F7D)
-message.using-custom-resource-from-classpath=\u4F7F\u7528\u5B9A\u5236\u7A0B\u5E8F\u5305\u8D44\u6E90 {0} (\u4ECE {1} \u52A0\u8F7D)
-message.using-default-resource-from-classpath=\u4F7F\u7528\u9ED8\u8BA4\u7A0B\u5E8F\u5305\u8D44\u6E90 {0} (\u5C06 {1} \u6DFB\u52A0\u5230\u7C7B\u8DEF\u5F84\u4EE5\u5B9A\u5236)
message.ignoring.symlink=\u8B66\u544A: codesign \u6B63\u5728\u8DF3\u8FC7\u7B26\u53F7\u94FE\u63A5 {0}
+message.keychain.error=Error: unable to get keychain list.
+
--- a/src/jdk.packager/macosx/classes/jdk/packager/internal/resources/mac/MacAppBundler.properties Wed Oct 17 15:43:29 2018 -0400
+++ b/src/jdk.packager/macosx/classes/jdk/packager/internal/resources/mac/MacAppBundler.properties Thu Oct 18 17:57:26 2018 -0400
@@ -33,8 +33,8 @@
param.icon-icns.name=.icns Icon
param.icon-icns.description=Icon for the application, in ICNS format.
-param.config-root.name=
-param.config-root.description=
+param.config-root.name=Config Root Dir
+param.config-root.description=Configuration directory.
param.configure-launcher-in-plist=Configure Launcher in Info.plist
param.configure-launcher-in-plist.description=Should the legacy method of configuring hte launcher in the Info.plist be used.
--- a/src/jdk.packager/macosx/classes/jdk/packager/internal/resources/mac/MacAppBundler_ja.properties Wed Oct 17 15:43:29 2018 -0400
+++ b/src/jdk.packager/macosx/classes/jdk/packager/internal/resources/mac/MacAppBundler_ja.properties Thu Oct 18 17:57:26 2018 -0400
@@ -7,8 +7,8 @@
param.icon-icns.name=.icns\u30A2\u30A4\u30B3\u30F3
param.icon-icns.description=ICNS\u5F62\u5F0F\u3067\u306E\u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u306E\u30A2\u30A4\u30B3\u30F3\u3002
-param.config-root.name=
-param.config-root.description=
+param.config-root.name=Config Root Dir
+param.config-root.description=Configuration directory.
param.configure-launcher-in-plist=Info.plist\u3067\u306E\u30E9\u30F3\u30C1\u30E3\u306E\u69CB\u6210
param.configure-launcher-in-plist.description=Info.plist\u3067\u306E\u30E9\u30F3\u30C1\u30E3\u306E\u69CB\u6210\u306B\u306F\u30EC\u30AC\u30B7\u30FC\u30FB\u30E1\u30BD\u30C3\u30C9\u3092\u4F7F\u7528\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
--- a/src/jdk.packager/macosx/classes/jdk/packager/internal/resources/mac/MacAppBundler_zh_CN.properties Wed Oct 17 15:43:29 2018 -0400
+++ b/src/jdk.packager/macosx/classes/jdk/packager/internal/resources/mac/MacAppBundler_zh_CN.properties Thu Oct 18 17:57:26 2018 -0400
@@ -33,8 +33,8 @@
param.icon-icns.name=.icns \u56FE\u6807
param.icon-icns.description=\u5E94\u7528\u7A0B\u5E8F\u7684\u56FE\u6807, \u91C7\u7528 ICNS \u683C\u5F0F\u3002
-param.config-root.name=
-param.config-root.description=
+param.config-root.name=Config Root Dir
+param.config-root.description=Configuration directory.
param.configure-launcher-in-plist=\u5728 Info.plist \u4E2D\u914D\u7F6E\u542F\u52A8\u7A0B\u5E8F
param.configure-launcher-in-plist.description=\u662F\u5426\u5E94\u4F7F\u7528\u5728 Info.plist \u4E2D\u914D\u7F6E\u542F\u52A8\u7A0B\u5E8F\u7684\u65E7\u65B9\u6CD5\u3002
--- a/src/jdk.packager/macosx/classes/jdk/packager/internal/resources/mac/MacBaseInstallerBundler.properties Wed Oct 17 15:43:29 2018 -0400
+++ b/src/jdk.packager/macosx/classes/jdk/packager/internal/resources/mac/MacBaseInstallerBundler.properties Thu Oct 18 17:57:26 2018 -0400
@@ -30,7 +30,7 @@
param.app-bundler.name=Mac App Bundler
param.app-bundle.description=Creates a .app bundle for the Mac
-param.app-image-build-root.name=
+param.app-image-build-root.name=Build Root Dir
param.app-image-build-root.description=This is temporary location built by the packager that is the root of the image application
param.signing-keychain.name=Signing Keychain
@@ -39,17 +39,11 @@
param.signing-key-name.name=Signing Key User Name
param.signing-key-name.description=The user name portion of the typical "Mac Developer ID Application: <user name>" signing key.
-param.daemon-bundler.name=Mac Daemon Bundler
-param.daemon-bundler.description=Creates daemon image for the Mac
-
-param.daemon-image-build-root.name=
-param.daemon-image-build-root.description=This is temporary location built by the packager that is the root of the daemon image
-
param.installer-name.name=Installer Name
param.installer-name.description=The filename of the generated installer without the file type extension. Default is <App Name>-<Version>.
-param.config-root.name=
-param.config-root.description=
+param.config-root.name=Config Root Dir
+param.config-root.description=Configuration directory.
error.parameters-null=Parameters map is null.
error.parameters-null.advice=Pass in a non-null parameters map.
--- a/src/jdk.packager/macosx/classes/jdk/packager/internal/resources/mac/MacBaseInstallerBundler_ja.properties Wed Oct 17 15:43:29 2018 -0400
+++ b/src/jdk.packager/macosx/classes/jdk/packager/internal/resources/mac/MacBaseInstallerBundler_ja.properties Thu Oct 18 17:57:26 2018 -0400
@@ -30,7 +30,7 @@
param.app-bundler.name=Mac\u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3\u30fb\u30d0\u30f3\u30c9\u30e9
param.app-bundle.description=Mac\u7528\u306e.app\u30d0\u30f3\u30c9\u30eb\u3092\u4f5c\u6210\u3057\u307e\u3059
-param.app-image-build-root.name=
+param.app-image-build-root.name=Build Root Dir
param.app-image-build-root.description=\u3053\u308c\u306f\u30a4\u30e1\u30fc\u30b8\u30fb\u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3\u306e\u30eb\u30fc\u30c8\u3067\u3042\u308b\u30d1\u30c3\u30b1\u30fc\u30b8\u30e3\u306b\u3088\u3063\u3066\u4f5c\u6210\u3055\u308c\u308b\u4e00\u6642\u7684\u306a\u5834\u6240\u3067\u3059
param.signing-keychain.name=\u7f72\u540d\u30ad\u30fc\u30c1\u30a7\u30fc\u30f3
@@ -39,17 +39,11 @@
param.signing-key-name.name=\u7f72\u540d\u30ad\u30fc\u306e\u30e6\u30fc\u30b6\u30fc\u540d
param.signing-key-name.description=\u4e00\u822c\u7684\u306a"Mac Developer ID\u306e\u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3: <user name>"\u7f72\u540d\u30ad\u30fc\u306e\u30e6\u30fc\u30b6\u30fc\u540d\u90e8\u5206\u3002
-param.daemon-bundler.name=Mac\u30c7\u30fc\u30e2\u30f3\u30fb\u30d0\u30f3\u30c9\u30e9
-param.daemon-bundler.description=Mac\u7528\u306e\u30c7\u30fc\u30e2\u30f3\u30fb\u30a4\u30e1\u30fc\u30b8\u3092\u4f5c\u6210\u3057\u307e\u3059
-
-param.daemon-image-build-root.name=
-param.daemon-image-build-root.description=\u3053\u308c\u306f\u30c7\u30fc\u30e2\u30f3\u30fb\u30a4\u30e1\u30fc\u30b8\u306e\u30eb\u30fc\u30c8\u3067\u3042\u308b\u30d1\u30c3\u30b1\u30fc\u30b8\u30e3\u306b\u3088\u3063\u3066\u4f5c\u6210\u3055\u308c\u308b\u4e00\u6642\u7684\u306a\u5834\u6240\u3067\u3059
-
param.installer-name.name=\u30a4\u30f3\u30b9\u30c8\u30fc\u30e9\u540d
param.installer-name.description=\u30d5\u30a1\u30a4\u30eb\u30fb\u30bf\u30a4\u30d7\u62e1\u5f35\u5b50\u306a\u3057\u306e\u751f\u6210\u3055\u308c\u305f\u30a4\u30f3\u30b9\u30c8\uff0d\u30e9\u306e\u30d5\u30a1\u30a4\u30eb\u540d\u3002\u30c7\u30d5\u30a9\u30eb\u30c8\u306f<App Name>-<Version>\u3067\u3059\u3002
-param.config-root.name=
-param.config-root.description=
+param.config-root.name=Config Root Dir
+param.config-root.description=Configuration directory.
error.parameters-null=\u30d1\u30e9\u30e1\u30fc\u30bf\u30fb\u30de\u30c3\u30d7\u304cnull\u3067\u3059\u3002
error.parameters-null.advice=\u975enull\u30d1\u30e9\u30e1\u30fc\u30bf\u30fb\u30de\u30c3\u30d7\u3067\u6e21\u3057\u3066\u304f\u3060\u3055\u3044\u3002
--- a/src/jdk.packager/macosx/classes/jdk/packager/internal/resources/mac/MacBaseInstallerBundler_zh_CN.properties Wed Oct 17 15:43:29 2018 -0400
+++ b/src/jdk.packager/macosx/classes/jdk/packager/internal/resources/mac/MacBaseInstallerBundler_zh_CN.properties Thu Oct 18 17:57:26 2018 -0400
@@ -30,7 +30,7 @@
param.app-bundler.name=Mac \u5e94\u7528\u7a0b\u5e8f\u6253\u5305\u7a0b\u5e8f
param.app-bundle.description=\u521b\u5efa\u7528\u4e8e Mac \u7684 .app \u5305
-param.app-image-build-root.name=
+param.app-image-build-root.name=Build Root Dir
param.app-image-build-root.description=\u8fd9\u662f\u7531\u6253\u5305\u7a0b\u5e8f\u6784\u5efa\u7684\u4e34\u65f6\u4f4d\u7f6e, \u662f\u6620\u50cf\u5e94\u7528\u7a0b\u5e8f\u7684\u6839\u76ee\u5f55
param.signing-keychain.name=\u7b7e\u540d\u5bc6\u94a5\u94fe
@@ -39,17 +39,11 @@
param.signing-key-name.name=\u7b7e\u540d\u5bc6\u94a5\u7528\u6237\u540d
param.signing-key-name.description=\u5178\u578b "Mac \u5f00\u53d1\u8005 ID \u5e94\u7528\u7a0b\u5e8f: <\u7528\u6237\u540d>" \u7b7e\u540d\u5bc6\u94a5\u7684\u7528\u6237\u540d\u90e8\u5206\u3002
-param.daemon-bundler.name=Mac \u5b88\u62a4\u7a0b\u5e8f\u6253\u5305\u7a0b\u5e8f
-param.daemon-bundler.description=\u521b\u5efa\u7528\u4e8e Mac \u7684\u5b88\u62a4\u7a0b\u5e8f\u6620\u50cf
-
-param.daemon-image-build-root.name=
-param.daemon-image-build-root.description=\u8fd9\u662f\u7531\u6253\u5305\u7a0b\u5e8f\u6784\u5efa\u7684\u4e34\u65f6\u4f4d\u7f6e, \u662f\u5b88\u62a4\u7a0b\u5e8f\u6620\u50cf\u7684\u6839\u76ee\u5f55
-
param.installer-name.name=\u5b89\u88c5\u7a0b\u5e8f\u540d\u79f0
param.installer-name.description=\u6240\u751f\u6210\u5b89\u88c5\u7a0b\u5e8f\u4e0d\u5e26\u6587\u4ef6\u7c7b\u578b\u6269\u5c55\u540d\u7684\u6587\u4ef6\u540d\u3002\u9ed8\u8ba4\u503c\u4e3a <\u5e94\u7528\u7a0b\u5e8f\u540d\u79f0>-<\u7248\u672c>\u3002
-param.config-root.name=
-param.config-root.description=
+param.config-root.name=Config Root Dir
+param.config-root.description=Configuration directory.
error.parameters-null=\u53c2\u6570\u6620\u5c04\u4e3a\u7a7a\u503c\u3002
error.parameters-null.advice=\u8bf7\u4f20\u5165\u975e\u7a7a\u53c2\u6570\u6620\u5c04\u3002
--- a/src/jdk.packager/macosx/classes/jdk/packager/internal/resources/mac/MacPkgBundler.properties Wed Oct 17 15:43:29 2018 -0400
+++ b/src/jdk.packager/macosx/classes/jdk/packager/internal/resources/mac/MacPkgBundler.properties Thu Oct 18 17:57:26 2018 -0400
@@ -30,7 +30,7 @@
param.signing-key-developer-id-installer.name=Apple Developer ID Installer Signing Key
param.signing-key-developer-id-installer.description=The full name of the Apple Developer ID Installer signing key.
-param.packages-root.name=
+param.packages-root.name=PKG Root Dir
param.packages-root.description=This is temporary location for component packages (application and daemon). The packages are incorporated into final product package.
param.installer-suffix.name=Installer Suffix
--- a/src/jdk.packager/macosx/classes/jdk/packager/internal/resources/mac/MacPkgBundler_ja.properties Wed Oct 17 15:43:29 2018 -0400
+++ b/src/jdk.packager/macosx/classes/jdk/packager/internal/resources/mac/MacPkgBundler_ja.properties Thu Oct 18 17:57:26 2018 -0400
@@ -30,7 +30,7 @@
param.signing-key-developer-id-installer.name=Apple Developer ID\u306E\u30A4\u30F3\u30B9\u30C8\u30FC\u30E9\u7F72\u540D\u30AD\u30FC
param.signing-key-developer-id-installer.description=Apple Developer ID\u306E\u30A4\u30F3\u30B9\u30C8\u30FC\u30E9\u7F72\u540D\u30AD\u30FC\u306E\u30D5\u30EB\u30FB\u30CD\u30FC\u30E0\u3002
-param.packages-root.name=
+param.packages-root.name=PKG Root Dir
param.packages-root.description=\u3053\u308C\u306F\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8\u30FB\u30D1\u30C3\u30B1\u30FC\u30B8(\u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u304A\u3088\u3073\u30C7\u30FC\u30E2\u30F3)\u306E\u4E00\u6642\u7684\u306A\u5834\u6240\u3067\u3059\u3002\u30D1\u30C3\u30B1\u30FC\u30B8\u306F\u6700\u7D42\u88FD\u54C1\u30D1\u30C3\u30B1\u30FC\u30B8\u306B\u7D44\u307F\u8FBC\u307E\u308C\u307E\u3059\u3002
param.installer-suffix.name=\u30A4\u30F3\u30B9\u30C8\u30FC\u30E9\u63A5\u5C3E\u8F9E
--- a/src/jdk.packager/macosx/classes/jdk/packager/internal/resources/mac/MacPkgBundler_zh_CN.properties Wed Oct 17 15:43:29 2018 -0400
+++ b/src/jdk.packager/macosx/classes/jdk/packager/internal/resources/mac/MacPkgBundler_zh_CN.properties Thu Oct 18 17:57:26 2018 -0400
@@ -30,7 +30,7 @@
param.signing-key-developer-id-installer.name=Apple \u5F00\u53D1\u8005 ID \u5B89\u88C5\u7A0B\u5E8F\u7B7E\u540D\u5BC6\u94A5
param.signing-key-developer-id-installer.description=Apple \u5F00\u53D1\u8005 ID \u5B89\u88C5\u7A0B\u5E8F\u7B7E\u540D\u5BC6\u94A5\u7684\u5168\u540D\u3002
-param.packages-root.name=
+param.packages-root.name=PKG Root Dir
param.packages-root.description=\u8FD9\u662F\u7EC4\u4EF6\u7A0B\u5E8F\u5305 (\u5E94\u7528\u7A0B\u5E8F\u548C\u5B88\u62A4\u7A0B\u5E8F) \u7684\u4E34\u65F6\u4F4D\u7F6E\u3002\u7A0B\u5E8F\u5305\u96C6\u6210\u5230\u6700\u7EC8\u4EA7\u54C1\u7A0B\u5E8F\u5305\u4E2D\u3002
param.installer-suffix.name=\u5B89\u88C5\u7A0B\u5E8F\u540E\u7F00
--- a/src/jdk.packager/share/classes/jdk/packager/internal/resources/AbstractBundler.properties Wed Oct 17 15:43:29 2018 -0400
+++ b/src/jdk.packager/share/classes/jdk/packager/internal/resources/AbstractBundler.properties Thu Oct 18 17:57:26 2018 -0400
@@ -24,8 +24,8 @@
#
#
-param.images-root.name=
-param.images-root.description=
+param.images-root.name=Image Root
+param.images-root.description=Image Root
message.using-default-resource=Using default package resource {0} (add {1} to the class path to customize)
message.using-custom-resource-from-file=Using custom package resource {0} (loaded from file {1})
--- a/src/jdk.packager/share/classes/jdk/packager/internal/resources/AbstractBundler_ja.properties Wed Oct 17 15:43:29 2018 -0400
+++ b/src/jdk.packager/share/classes/jdk/packager/internal/resources/AbstractBundler_ja.properties Thu Oct 18 17:57:26 2018 -0400
@@ -24,8 +24,8 @@
#
#
-param.images-root.name=
-param.images-root.description=
+param.images-root.name=Image Root
+param.images-root.description=Image Root
message.using-default-resource=\u30C7\u30D5\u30A9\u30EB\u30C8\u306E\u30D1\u30C3\u30B1\u30FC\u30B8\u30FB\u30EA\u30BD\u30FC\u30B9{0}\u306E\u4F7F\u7528({1}\u3092\u30AF\u30E9\u30B9\u30FB\u30D1\u30B9\u306B\u8FFD\u52A0\u3057\u3066\u30AB\u30B9\u30BF\u30DE\u30A4\u30BA)
message.using-custom-resource-from-file=\u30AB\u30B9\u30BF\u30E0\u30FB\u30D1\u30C3\u30B1\u30FC\u30B8\u30FB\u30EA\u30BD\u30FC\u30B9{0}\u306E\u4F7F\u7528(\u30D5\u30A1\u30A4\u30EB{1}\u304B\u3089\u30ED\u30FC\u30C9\u6E08)
--- a/src/jdk.packager/share/classes/jdk/packager/internal/resources/AbstractBundler_zh_CN.properties Wed Oct 17 15:43:29 2018 -0400
+++ b/src/jdk.packager/share/classes/jdk/packager/internal/resources/AbstractBundler_zh_CN.properties Thu Oct 18 17:57:26 2018 -0400
@@ -24,8 +24,8 @@
#
#
-param.images-root.name=
-param.images-root.description=
+param.images-root.name=Image Root
+param.images-root.description=Image Root
message.using-default-resource=\u4F7F\u7528\u9ED8\u8BA4\u7A0B\u5E8F\u5305\u8D44\u6E90 {0} (\u5C06 {1} \u6DFB\u52A0\u5230\u7C7B\u8DEF\u5F84\u4EE5\u5B9A\u5236)
message.using-custom-resource-from-file=\u4F7F\u7528\u5B9A\u5236\u7A0B\u5E8F\u5305\u8D44\u6E90 {0} (\u4ECE\u6587\u4EF6 {1} \u52A0\u8F7D)
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/jdk.packager/share/classes/jdk/packager/internal/resources/Arguments_ja.properties Thu Oct 18 17:57:26 2018 -0400
@@ -0,0 +1,41 @@
+#
+# Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation. Oracle designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Oracle in the LICENSE file that accompanied this code.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#
+#
+
+param.create-image.name=Create Image
+param.create-image.description=Creates platform-specific application image.
+
+param.create-installer.name=Create Installer
+param.create-installer.description=Creates platform-specific installer for the application.
+
+param.create-jre-installer.name=Create JRE Installer
+param.create-jre-installer.description=Creates platform-specific JRE installer.
+
+MSG_BundlerFailed=Error: Bundler "{1}" ({0}) failed to produce a bundle.
+MSG_BundlerPlatformException=Bundler {0} skipped because the bundler does not support bundling on this platform.
+MSG_BundlerConfigException=Bundler {0} skipped because of a configuration problem\: {1} \n\
+Advice to fix\: {2}
+MSG_BundlerConfigExceptionNoAdvice=Bundler {0} skipped because of a configuration problem\: {1}
+MSG_BundlerRuntimeException=Bundler {0} failed because of {1}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/jdk.packager/share/classes/jdk/packager/internal/resources/Arguments_zh_CN.properties Thu Oct 18 17:57:26 2018 -0400
@@ -0,0 +1,41 @@
+#
+# Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation. Oracle designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Oracle in the LICENSE file that accompanied this code.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#
+#
+
+param.create-image.name=Create Image
+param.create-image.description=Creates platform-specific application image.
+
+param.create-installer.name=Create Installer
+param.create-installer.description=Creates platform-specific installer for the application.
+
+param.create-jre-installer.name=Create JRE Installer
+param.create-jre-installer.description=Creates platform-specific JRE installer.
+
+MSG_BundlerFailed=Error: Bundler "{1}" ({0}) failed to produce a bundle.
+MSG_BundlerPlatformException=Bundler {0} skipped because the bundler does not support bundling on this platform.
+MSG_BundlerConfigException=Bundler {0} skipped because of a configuration problem\: {1} \n\
+Advice to fix\: {2}
+MSG_BundlerConfigExceptionNoAdvice=Bundler {0} skipped because of a configuration problem\: {1}
+MSG_BundlerRuntimeException=Bundler {0} failed because of {1}
--- a/src/jdk.packager/share/classes/jdk/packager/internal/resources/Bundle.properties Wed Oct 17 15:43:29 2018 -0400
+++ b/src/jdk.packager/share/classes/jdk/packager/internal/resources/Bundle.properties Thu Oct 18 17:57:26 2018 -0400
@@ -25,6 +25,7 @@
#
MSG_Version=jpackager version
+
ERR_MissingArgument=Error: Missing argument: {0}
ERR_MissingAppResources=Error: No application jars found
ERR_AppImageNotExist=Error: App image directory "{0}" does not exist
--- a/src/jdk.packager/share/classes/jdk/packager/internal/resources/Bundle_ja.properties Wed Oct 17 15:43:29 2018 -0400
+++ b/src/jdk.packager/share/classes/jdk/packager/internal/resources/Bundle_ja.properties Thu Oct 18 17:57:26 2018 -0400
@@ -25,8 +25,16 @@
#
MSG_Version=Java\u30D1\u30C3\u30B1\u30FC\u30B8\u30E3\u30FB\u30D0\u30FC\u30B8\u30E7\u30F3
+
ERR_MissingArgument=\u30A8\u30E9\u30FC: \u5F15\u6570\u304C\u3042\u308A\u307E\u305B\u3093: {0}
ERR_MissingAppResources=\u30A8\u30E9\u30FC: \u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3jar\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093\u3067\u3057\u305F
+ERR_AppImageNotExist=Error: App image directory "{0}" does not exist
+ERR_AppImageInvalid=Error: App image directory "{0}" is invalid and does not contain "app" and/or "runtime" sub-directories
+ERR_NoSecondaryLauncherName=Secondary Launchers require a name parameter.
+ERR_NoUniqueName=Secondary Launchers require a unique name parameter.
+ERR_NoJreInstallerName=Jre Installers require a name parameter.
+ERR_InvalidCharacterInArgument=Error: Invalid character found in {0} argument
+
MSG_BundlerFailed=\u30A8\u30E9\u30FC: \u30D0\u30F3\u30C9\u30E9"{1}" ({0})\u304C\u30D0\u30F3\u30C9\u30EB\u306E\u751F\u6210\u306B\u5931\u6557\u3057\u307E\u3057\u305F\u3002
MSG_BundlerPlatformException=\u30D0\u30F3\u30C9\u30E9{0}\u306F\u3053\u306E\u30D7\u30E9\u30C3\u30C8\u30D5\u30A9\u30FC\u30E0\u3067\u306E\u30D0\u30F3\u30C9\u30EB\u3092\u30B5\u30DD\u30FC\u30C8\u3057\u3066\u3044\u306A\u3044\u305F\u3081\u3001\u30D0\u30F3\u30C9\u30E9\u304C\u30B9\u30AD\u30C3\u30D7\u3055\u308C\u307E\u3057\u305F\u3002
--- a/src/jdk.packager/share/classes/jdk/packager/internal/resources/Bundle_zh_CN.properties Wed Oct 17 15:43:29 2018 -0400
+++ b/src/jdk.packager/share/classes/jdk/packager/internal/resources/Bundle_zh_CN.properties Thu Oct 18 17:57:26 2018 -0400
@@ -25,8 +25,15 @@
#
MSG_Version=Java \u6253\u5305\u7A0B\u5E8F\u7248\u672C
+
ERR_MissingArgument=\u9519\u8BEF: \u7F3A\u5C11\u53C2\u6570: {0}
-ERR_MissingAppResources=\u9519\u8BEF: \u627E\u4E0D\u5230\u5E94\u7528\u7A0B\u5E8F jar
+ERR_MissingAppResources=Error: No application jars found
+ERR_AppImageNotExist=Error: App image directory "{0}" does not exist
+ERR_AppImageInvalid=Error: App image directory "{0}" is invalid and does not contain "app" and/or "runtime" sub-directories
+ERR_NoSecondaryLauncherName=Secondary Launchers require a name parameter.
+ERR_NoUniqueName=Secondary Launchers require a unique name parameter.
+ERR_NoJreInstallerName=Jre Installers require a name parameter.
+ERR_InvalidCharacterInArgument=Error: Invalid character found in {0} argument
MSG_BundlerFailed=\u9519\u8BEF: \u6253\u5305\u7A0B\u5E8F "{1}" ({0}) \u65E0\u6CD5\u751F\u6210\u5305\u3002
MSG_BundlerPlatformException=\u7531\u4E8E\u6253\u5305\u7A0B\u5E8F{0}\u4E0D\u652F\u6301\u5728\u6B64\u5E73\u53F0\u4E0A\u6253\u5305, \u56E0\u6B64\u5C06\u5176\u8DF3\u8FC7\u3002
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/jdk.packager/share/classes/jdk/packager/internal/resources/CLIHelpi_ja.properties Thu Oct 18 17:57:26 2018 -0400
@@ -0,0 +1,193 @@
+#
+# Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation. Oracle designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Oracle in the LICENSE file that accompanied this code.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#
+#
+
+MSG_Help_common=Usage: jpackager <mode> <options>\n\
+\n\
+where mode is one of: \n\
+\ create-image\n\
+\ Generates a platform-specific application image.\n\
+\ create-installer <type>\n\
+\ Generates a platform-specific installer for the application.\n\
+\ Valid values for "type" are "msi", "exe", "rpm", "deb", "dmg",\n\
+\ "pkg", and "pkg-app-store".\n\
+\ If "type" is omitted, all supported types of installable packages\n\
+\ for current platform will be generated.\n\
+\ create-jre-installer <type>\n\
+\ Generates a platform-specific installer for Server JRE.\n\
+\ Valid values for "type" are "msi", "exe", "rpm", "deb", "dmg", \n\
+\ and "pkg".\n\
+\ If "type" is omitted, all supported types of installable packages\n\
+\ for current platform will be generated.\n\
+\ \n\
+Sample usages:\n\
+--------------\n\
+jpackager create-image --input inputdir --output outputdir --name AppName --class package.ClassName\n\
+or\n\
+jpackager create-image -i inputdir -o outputdir -n AppName -c package.ClassName\n\
+Generates an application image.\n\
+\n\
+jpackager create-installer -i inputdir -o outputdir -n "App Name" -c package.ClassName\n\
+Generates an application installer.\n\
+\n\
+jpackager create-jre-installer -n <jre_name> -o outputdir\n\
+Generates a Server JRE installer.\n\
+\n\
+The following options are valid for all platforms:\n\
+\ --help -h \n\
+\ Shows the usage text, followed by a list and description of each valid option for the current platform and the given mode.\n\
+\ If no mode is given, shows the usage text, followed by a list and description of each valid option for the current platform.\n\
+\ When this option is used, all other options are ignored.\n\
+\ --output -o <output dir>\n\
+\ Name of the directory where generated output file is placed.\n\
+\ --input -i <input dir>\n\
+\ Name of the base directory that contains the files to package.\n\
+\ --files -f <input files>\n\
+\ List of files in the base directory. If omitted, all files from "input"\n\
+\ directory (which is a mandatory argument in this case) will be packaged.\n\
+\ --name -n <application name>\n\
+\ Name of the application.\n\
+\ --main-jar -j <main jar name>\n\
+\ The main JAR of the application. This JAR should have the main-class,\n\
+\ and is relative to the assembled application directory.\n\
+\ --class -c <class name>\n\
+\ Qualified name of the application class to execute.\n\
+\ --version -v <version string>\n\
+\ Version of the application.\n\
+\ --arguments -a <main class arguments>\n\
+\ Command line arguments to pass to the main class if no arguments\n\
+\ are specified by the launcher.\n\
+\ --icon <icon file name>\n\
+\ Icon of the application bundle.\n\
+\ --singleton\n\
+\ Prevents multiple instances of the application from launching\n\
+\ (see SingleInstanceService API for more details).\n\
+\ --identifier <id string>\n\
+\ Machine readable identifier of the application. The format\n\
+\ must be a DNS name in reverse order, such as com.example.myapplication.\n\
+\ The identifier is used for composing Single Instance unique id.\n\
+\ --verbose\n\
+\ Enables verbose output.\n\
+\ --strip-native-commands\n\
+\ Removes native executables from the custom run-time images.\n\
+\ --jvm-args <java vm arguments>\n\
+\ JVM flags and options to pass to the application.\n\
+\ --file-associations <file path>\n\
+\ Properties file that contains list of key=value parameters that\n\
+\ describe a file association. "extension", "mime-type", "icon",\n\
+\ "description" can be used as keys for the association.\n\
+\ --secondary-launcher <file path>\n\
+\ Properties file that contains a collection of options for a secondary launcher.\n\
+\ --build-root <file path>\n\
+\ Directory in which to use and place temporary files.\n\
+\ --runtime-image <file path>\n\
+\ Location of the predefined runtime image that is used to build\n\
+\ an application image and installable package.\n\
+\ --app-image <file path>\n\
+\ Location of the predefined application image that is used to build\n\
+\ an installable package.\n\
+\ --install-dir <file path>\n\
+\ Installation directory of the application. Ignored on Windows, use\n\
+\ --win-dir-chooser to provide an ability to choose an installation directory.\n\
+\ --echo-mode\n\
+\ Outputs (without executing) native packaging commands so that users\n\
+\ can use this as a starting point for addressing more complex needs.\n\
+\ --license-file <file name>\n\
+\ The license file, relative to the base directory.\n\
+\ --copyright <copyright string>\n\
+\ Copyright for the application.\n\
+\ --description <description string>\n\
+\ Description of the application.\n\
+\ --category <category string>\n\
+\ Category or group of the application.\n\
+\ --vendor <vendor string>\n\
+\ Vendor of the application.\n\
+\n\
+Modular options:\n\
+\ --module -m <module name>\n\
+\ Main module of the application. This module must have the main-class,\n\
+\ and be on the module path.\n\
+\ --module-path -p <module path>\n\
+\ When packaging the Java Runtime, this is the path JLink looks in for modules.\n\
+\ --add-modules <module list>\n\
+\ List of modules to add to JImage creation, including possible services.\n\
+\ --limit-modules <module list>\n\
+\ Modules to limit JImage creation to.\n\
+
+MSG_Help_mac=\nThe following options are valid for Mac OS X platforms:\n\
+\ --mac-sign\n\
+\ Request that the bundle be signed.\n\
+\ --mac-bundle-name <name string>\n\
+\ Name of the application as it appears in the Menu Bar. This can be\n\
+\ different from the application name. This name must be less than 16\n\
+\ characters long and be suitable for displaying in the menu bar and\n\
+\ the application Info window. Defaults to the application name.\n\
+\ --mac-bundle-identifier <ID string>\n\
+\ An identifier that uniquely identifies the application for MacOSX\n\
+\ (and on the Mac App Store). May only use alphanumeric (A-Z,a-z,0-9),\n\
+\ hyphen (-), and period (.) characters.\n\
+\ --mac-app-store-category <category string>\n\
+\ Mac App Store Categories. Note that the key is the string shown to\n\
+\ the user and the value is the ID of the category.\n\
+\ --mac-app-store-entitlements <file path>\n\
+\ File location of a custom mac app store entitlements file.\n\
+\ --mac-bundle-signing-prefix <prefix string>\n\
+\ When signing the application bundle, this value is prefixed to all\n\
+\ components that need to be signed that don't have an existing bundle identifier.\n\
+\ --mac-signing-key-user-name <user name>\n\
+\ User name portion of the typical "Mac Developer ID Application: <user name>" signing key.\n\
+\ --mac-signing-keychain <file path>\n\
+\ Location of the keychain to use. If not specified, the standard keychains are used.\n\
+
+MSG_Help_linux=\nThe following options are valid for Linux platforms:\n\
+\ --linux-bundle-name <bundle name>\n\
+\ Name for Linux bundle. Defaults to the application name.\n\
+\ --linux-package-deps\n\
+\ Required packages or capabilities for the application.\n\
+\ --linux-rpm-license-type <type string>\n\
+\ Type of the license ("License: <value>" of the RPM .spec).\n\
+\ --linux-deb-maintainer <email address>\n\
+\ Maintainer for .deb bundle.\n\
+
+MSG_Help_win=\nThe following options are valid for Windows platforms:\n\
+\ --win-menu\n\
+\ Adds the application to the system menu.\n\
+\ --win-menu-group <menu group name>\n\
+\ Start Menu group this application is placed in.\n\
+\ --win-per-user-install\n\
+\ Request to perform an install on a per-user basis.\n\
+\ --win-dir-chooser\n\
+\ Adds a dialog to enable the user to choose a directory in which\n\
+\ the product is installed.\n\
+\ --win-registry-name <registry name>\n\
+\ Name of the application for registry references. Default is\n\
+\ the Application Name with only alphanumerics, dots, and dashes (no whitespace).\n\
+\ --win-upgrade-uuid <id string>\n\
+\ UUID associated with upgrades for this package.\n\
+\ --win-shortcut\n\
+\ Creates a desktop shortcut for the application.\n\
+\ --win-console\n\
+\ Creates a console launcher for the application. Should be specified for\n\
+\ application which requires console interactions.\n\
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/jdk.packager/share/classes/jdk/packager/internal/resources/CLIHelpi_zh_CN.properties Thu Oct 18 17:57:26 2018 -0400
@@ -0,0 +1,193 @@
+#
+# Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation. Oracle designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Oracle in the LICENSE file that accompanied this code.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#
+#
+
+MSG_Help_common=Usage: jpackager <mode> <options>\n\
+\n\
+where mode is one of: \n\
+\ create-image\n\
+\ Generates a platform-specific application image.\n\
+\ create-installer <type>\n\
+\ Generates a platform-specific installer for the application.\n\
+\ Valid values for "type" are "msi", "exe", "rpm", "deb", "dmg",\n\
+\ "pkg", and "pkg-app-store".\n\
+\ If "type" is omitted, all supported types of installable packages\n\
+\ for current platform will be generated.\n\
+\ create-jre-installer <type>\n\
+\ Generates a platform-specific installer for Server JRE.\n\
+\ Valid values for "type" are "msi", "exe", "rpm", "deb", "dmg", \n\
+\ and "pkg".\n\
+\ If "type" is omitted, all supported types of installable packages\n\
+\ for current platform will be generated.\n\
+\ \n\
+Sample usages:\n\
+--------------\n\
+jpackager create-image --input inputdir --output outputdir --name AppName --class package.ClassName\n\
+or\n\
+jpackager create-image -i inputdir -o outputdir -n AppName -c package.ClassName\n\
+Generates an application image.\n\
+\n\
+jpackager create-installer -i inputdir -o outputdir -n "App Name" -c package.ClassName\n\
+Generates an application installer.\n\
+\n\
+jpackager create-jre-installer -n <jre_name> -o outputdir\n\
+Generates a Server JRE installer.\n\
+\n\
+The following options are valid for all platforms:\n\
+\ --help -h \n\
+\ Shows the usage text, followed by a list and description of each valid option for the current platform and the given mode.\n\
+\ If no mode is given, shows the usage text, followed by a list and description of each valid option for the current platform.\n\
+\ When this option is used, all other options are ignored.\n\
+\ --output -o <output dir>\n\
+\ Name of the directory where generated output file is placed.\n\
+\ --input -i <input dir>\n\
+\ Name of the base directory that contains the files to package.\n\
+\ --files -f <input files>\n\
+\ List of files in the base directory. If omitted, all files from "input"\n\
+\ directory (which is a mandatory argument in this case) will be packaged.\n\
+\ --name -n <application name>\n\
+\ Name of the application.\n\
+\ --main-jar -j <main jar name>\n\
+\ The main JAR of the application. This JAR should have the main-class,\n\
+\ and is relative to the assembled application directory.\n\
+\ --class -c <class name>\n\
+\ Qualified name of the application class to execute.\n\
+\ --version -v <version string>\n\
+\ Version of the application.\n\
+\ --arguments -a <main class arguments>\n\
+\ Command line arguments to pass to the main class if no arguments\n\
+\ are specified by the launcher.\n\
+\ --icon <icon file name>\n\
+\ Icon of the application bundle.\n\
+\ --singleton\n\
+\ Prevents multiple instances of the application from launching\n\
+\ (see SingleInstanceService API for more details).\n\
+\ --identifier <id string>\n\
+\ Machine readable identifier of the application. The format\n\
+\ must be a DNS name in reverse order, such as com.example.myapplication.\n\
+\ The identifier is used for composing Single Instance unique id.\n\
+\ --verbose\n\
+\ Enables verbose output.\n\
+\ --strip-native-commands\n\
+\ Removes native executables from the custom run-time images.\n\
+\ --jvm-args <java vm arguments>\n\
+\ JVM flags and options to pass to the application.\n\
+\ --file-associations <file path>\n\
+\ Properties file that contains list of key=value parameters that\n\
+\ describe a file association. "extension", "mime-type", "icon",\n\
+\ "description" can be used as keys for the association.\n\
+\ --secondary-launcher <file path>\n\
+\ Properties file that contains a collection of options for a secondary launcher.\n\
+\ --build-root <file path>\n\
+\ Directory in which to use and place temporary files.\n\
+\ --runtime-image <file path>\n\
+\ Location of the predefined runtime image that is used to build\n\
+\ an application image and installable package.\n\
+\ --app-image <file path>\n\
+\ Location of the predefined application image that is used to build\n\
+\ an installable package.\n\
+\ --install-dir <file path>\n\
+\ Installation directory of the application. Ignored on Windows, use\n\
+\ --win-dir-chooser to provide an ability to choose an installation directory.\n\
+\ --echo-mode\n\
+\ Outputs (without executing) native packaging commands so that users\n\
+\ can use this as a starting point for addressing more complex needs.\n\
+\ --license-file <file name>\n\
+\ The license file, relative to the base directory.\n\
+\ --copyright <copyright string>\n\
+\ Copyright for the application.\n\
+\ --description <description string>\n\
+\ Description of the application.\n\
+\ --category <category string>\n\
+\ Category or group of the application.\n\
+\ --vendor <vendor string>\n\
+\ Vendor of the application.\n\
+\n\
+Modular options:\n\
+\ --module -m <module name>\n\
+\ Main module of the application. This module must have the main-class,\n\
+\ and be on the module path.\n\
+\ --module-path -p <module path>\n\
+\ When packaging the Java Runtime, this is the path JLink looks in for modules.\n\
+\ --add-modules <module list>\n\
+\ List of modules to add to JImage creation, including possible services.\n\
+\ --limit-modules <module list>\n\
+\ Modules to limit JImage creation to.\n\
+
+MSG_Help_mac=\nThe following options are valid for Mac OS X platforms:\n\
+\ --mac-sign\n\
+\ Request that the bundle be signed.\n\
+\ --mac-bundle-name <name string>\n\
+\ Name of the application as it appears in the Menu Bar. This can be\n\
+\ different from the application name. This name must be less than 16\n\
+\ characters long and be suitable for displaying in the menu bar and\n\
+\ the application Info window. Defaults to the application name.\n\
+\ --mac-bundle-identifier <ID string>\n\
+\ An identifier that uniquely identifies the application for MacOSX\n\
+\ (and on the Mac App Store). May only use alphanumeric (A-Z,a-z,0-9),\n\
+\ hyphen (-), and period (.) characters.\n\
+\ --mac-app-store-category <category string>\n\
+\ Mac App Store Categories. Note that the key is the string shown to\n\
+\ the user and the value is the ID of the category.\n\
+\ --mac-app-store-entitlements <file path>\n\
+\ File location of a custom mac app store entitlements file.\n\
+\ --mac-bundle-signing-prefix <prefix string>\n\
+\ When signing the application bundle, this value is prefixed to all\n\
+\ components that need to be signed that don't have an existing bundle identifier.\n\
+\ --mac-signing-key-user-name <user name>\n\
+\ User name portion of the typical "Mac Developer ID Application: <user name>" signing key.\n\
+\ --mac-signing-keychain <file path>\n\
+\ Location of the keychain to use. If not specified, the standard keychains are used.\n\
+
+MSG_Help_linux=\nThe following options are valid for Linux platforms:\n\
+\ --linux-bundle-name <bundle name>\n\
+\ Name for Linux bundle. Defaults to the application name.\n\
+\ --linux-package-deps\n\
+\ Required packages or capabilities for the application.\n\
+\ --linux-rpm-license-type <type string>\n\
+\ Type of the license ("License: <value>" of the RPM .spec).\n\
+\ --linux-deb-maintainer <email address>\n\
+\ Maintainer for .deb bundle.\n\
+
+MSG_Help_win=\nThe following options are valid for Windows platforms:\n\
+\ --win-menu\n\
+\ Adds the application to the system menu.\n\
+\ --win-menu-group <menu group name>\n\
+\ Start Menu group this application is placed in.\n\
+\ --win-per-user-install\n\
+\ Request to perform an install on a per-user basis.\n\
+\ --win-dir-chooser\n\
+\ Adds a dialog to enable the user to choose a directory in which\n\
+\ the product is installed.\n\
+\ --win-registry-name <registry name>\n\
+\ Name of the application for registry references. Default is\n\
+\ the Application Name with only alphanumerics, dots, and dashes (no whitespace).\n\
+\ --win-upgrade-uuid <id string>\n\
+\ UUID associated with upgrades for this package.\n\
+\ --win-shortcut\n\
+\ Creates a desktop shortcut for the application.\n\
+\ --win-console\n\
+\ Creates a console launcher for the application. Should be specified for\n\
+\ application which requires console interactions.\n\
--- a/src/jdk.packager/share/classes/jdk/packager/internal/resources/StandardBundlerParam.properties Wed Oct 17 15:43:29 2018 -0400
+++ b/src/jdk.packager/share/classes/jdk/packager/internal/resources/StandardBundlerParam.properties Thu Oct 18 17:57:26 2018 -0400
@@ -84,30 +84,12 @@
param.main-jar.name=Main Jar
param.main-jar.description=The main jar of the application. This jar should have the main-class, and is relative to the assembled application dir.
-param.service-hint.name=Service Hint
-param.service-hint.description=The bundler should register the application as service/daemon
-
-param.start-on-install.name=Start On Install
-param.start-on-install.description=Controls whether the service/daemon should be started on install
-
-param.stop-on-uninstall.name=Stop On Uninstall
-param.stop-on-uninstall.description=Controls whether the service/daemon should be stopped on uninstall
-
-param.run-at-startup.name=Run At Startup
-param.run-at-startup.description=Controls whether the service/daemon should be started during system startup
-
param.name.name=Name
param.name.description=The name of the application.
-param.preferences-id.name=Preferences ID
-param.preferences-id.description=The preferences node to search for User JVM Options. The format be a slash delimited version of the main package name, such as "com/example/myapplication".
-
param.title.name=Title
param.title.description=A title for the application.
-param.use-javafx-packaging.name=FX Packaging
-param.use-javafx-packaging.description=Should we use the JavaFX packaging conventions?
-
param.vendor.name=Vendor
param.vendor.description=The vendor of the application.
param.vendor.default=Unknown
--- a/src/jdk.packager/share/classes/jdk/packager/internal/resources/StandardBundlerParam_ja.properties Wed Oct 17 15:43:29 2018 -0400
+++ b/src/jdk.packager/share/classes/jdk/packager/internal/resources/StandardBundlerParam_ja.properties Thu Oct 18 17:57:26 2018 -0400
@@ -88,18 +88,6 @@
param.main-jar.name=\u30E1\u30A4\u30F3Jar
param.main-jar.description=\u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u306E\u30E1\u30A4\u30F3jar\u3002\u3053\u306Ejar\u306Fmain-class\u3092\u6301\u3064\u5FC5\u8981\u304C\u3042\u308A\u3001\u30A2\u30BB\u30F3\u30D6\u30EB\u3055\u308C\u305F\u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u30FB\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u306B\u5BFE\u3057\u3066\u76F8\u5BFE\u7684\u3067\u3059\u3002
-param.service-hint.name=\u30B5\u30FC\u30D3\u30B9\u306E\u30D2\u30F3\u30C8
-param.service-hint.description=\u30D0\u30F3\u30C9\u30E9\u306F\u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u3092\u30B5\u30FC\u30D3\u30B9/\u30C7\u30FC\u30E2\u30F3\u3068\u3057\u3066\u767B\u9332\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059
-
-param.start-on-install.name=\u30A4\u30F3\u30B9\u30C8\u30FC\u30EB\u6642\u306B\u8D77\u52D5
-param.start-on-install.description=\u30A4\u30F3\u30B9\u30C8\u30FC\u30EB\u6642\u306B\u30B5\u30FC\u30D3\u30B9/\u30C7\u30FC\u30E2\u30F3\u3092\u8D77\u52D5\u3059\u308B\u5FC5\u8981\u304C\u3042\u308B\u304B\u3069\u3046\u304B\u3092\u5236\u5FA1\u3057\u307E\u3059
-
-param.stop-on-uninstall.name=\u30A2\u30F3\u30A4\u30F3\u30B9\u30C8\u30FC\u30EB\u6642\u306B\u505C\u6B62
-param.stop-on-uninstall.description=\u30A2\u30F3\u30A4\u30F3\u30B9\u30C8\u30FC\u30EB\u6642\u306B\u30B5\u30FC\u30D3\u30B9/\u30C7\u30FC\u30E2\u30F3\u3092\u505C\u6B62\u3059\u308B\u5FC5\u8981\u304C\u3042\u308B\u304B\u3069\u3046\u304B\u3092\u5236\u5FA1\u3057\u307E\u3059
-
-param.run-at-startup.name=\u8D77\u52D5\u6642\u306B\u5B9F\u884C
-param.run-at-startup.description=\u30B7\u30B9\u30C6\u30E0\u8D77\u52D5\u6642\u306B\u30B5\u30FC\u30D3\u30B9/\u30C7\u30FC\u30E2\u30F3\u3092\u8D77\u52D5\u3059\u308B\u5FC5\u8981\u304C\u3042\u308B\u304B\u3069\u3046\u304B\u3092\u5236\u5FA1\u3057\u307E\u3059
-
param.sign-bundle.name=\u7F72\u540D\u30D0\u30F3\u30C9\u30EB
param.sign-bundle.description=\u30D0\u30F3\u30C9\u30E9\u304C\u7F72\u540D\u3092\u30B5\u30DD\u30FC\u30C8\u3057\u3066\u3044\u308B\u5834\u5408\u3001\u30D0\u30F3\u30C9\u30EB\u304C\u7F72\u540D\u3055\u308C\u3066\u3044\u308B\u3053\u3068\u3092\u8981\u6C42\u3057\u307E\u3059\u3002\u30C7\u30D5\u30A9\u30EB\u30C8\u5024\u306F\u30D0\u30F3\u30C9\u30E9\u306B\u3088\u3063\u3066\u7570\u306A\u308A\u307E\u3059\u3002\u7F72\u540D\u3092\u30B5\u30DD\u30FC\u30C8\u3057\u3066\u3044\u306A\u3044\u30D0\u30F3\u30C9\u30E9\u3067\u306F\u3001\u3053\u306E\u8A2D\u5B9A\u306F\u8B66\u544A\u306A\u3057\u3067\u7121\u8996\u3055\u308C\u307E\u3059\u3002
@@ -109,18 +97,12 @@
param.name.name=\u540D\u524D
param.name.description=\u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u306E\u540D\u524D\u3002
-param.preferences-id.name=\u30D7\u30EA\u30D5\u30A1\u30EC\u30F3\u30B9ID
-param.preferences-id.description=\u30E6\u30FC\u30B6\u30FC\u306EJVM\u30AA\u30D7\u30B7\u30E7\u30F3\u3092\u691C\u7D22\u3059\u308B\u30D7\u30EA\u30D5\u30A1\u30EC\u30F3\u30B9\u30FB\u30CE\u30FC\u30C9\u3002\u5F62\u5F0F\u306F\u3001"com/example/myapplication"\u306A\u3069\u3001\u30E1\u30A4\u30F3\u30FB\u30D1\u30C3\u30B1\u30FC\u30B8\u540D\u306E\u30B9\u30E9\u30C3\u30B7\u30E5\u533A\u5207\u308A\u30D0\u30FC\u30B8\u30E7\u30F3\u3067\u3059\u3002
-
param.system-wide.name=\u30B7\u30B9\u30C6\u30E0\u5168\u4F53
param.system-wide.description=\u3053\u306E\u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u306F\u3001\u305D\u308C\u81EA\u4F53\u3092\u30B7\u30B9\u30C6\u30E0\u5168\u4F53\u306B\u30A4\u30F3\u30B9\u30C8\u30FC\u30EB\u3057\u307E\u3059\u304B\u3001\u307E\u305F\u306F\u5404\u30E6\u30FC\u30B6\u30FC\u306B\u5BFE\u3057\u3066\u306E\u307F\u30A4\u30F3\u30B9\u30C8\u30FC\u30EB\u3057\u307E\u3059\u304B\u3002Null\u306F\u30B7\u30B9\u30C6\u30E0\u30FB\u30C7\u30D5\u30A9\u30EB\u30C8\u3092\u4F7F\u7528\u3059\u308B\u3053\u3068\u3092\u610F\u5473\u3057\u307E\u3059\u3002
param.title.name=\u30BF\u30A4\u30C8\u30EB
param.title.description=\u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u306E\u30BF\u30A4\u30C8\u30EB\u3002
-param.use-javafx-packaging.name=FX\u30D1\u30C3\u30B1\u30FC\u30B8\u30F3\u30B0
-param.use-javafx-packaging.description=JavaFX\u30D1\u30C3\u30B1\u30FC\u30B8\u30F3\u30B0\u898F\u5247\u3092\u4F7F\u7528\u3057\u307E\u3059\u304B\u3002
-
param.vendor.name=\u30D9\u30F3\u30C0\u30FC
param.vendor.description=\u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u306E\u30D9\u30F3\u30C0\u30FC\u3002
param.vendor.default=\u4E0D\u660E
--- a/src/jdk.packager/share/classes/jdk/packager/internal/resources/StandardBundlerParam_zh_CN.properties Wed Oct 17 15:43:29 2018 -0400
+++ b/src/jdk.packager/share/classes/jdk/packager/internal/resources/StandardBundlerParam_zh_CN.properties Thu Oct 18 17:57:26 2018 -0400
@@ -88,18 +88,6 @@
param.main-jar.name=\u4E3B Jar
param.main-jar.description=\u5E94\u7528\u7A0B\u5E8F\u7684\u4E3B jar\u3002\u6B64 jar \u5E94\u5177\u6709\u4E3B\u7C7B, \u5E76\u4E14\u76F8\u5BF9\u4E8E\u7EC4\u5408\u7684\u5E94\u7528\u7A0B\u5E8F\u76EE\u5F55\u3002
-param.service-hint.name=\u670D\u52A1\u63D0\u793A
-param.service-hint.description=\u6253\u5305\u7A0B\u5E8F\u5E94\u5C06\u5E94\u7528\u7A0B\u5E8F\u6CE8\u518C\u4E3A\u670D\u52A1/\u5B88\u62A4\u7A0B\u5E8F
-
-param.start-on-install.name=\u5728\u5B89\u88C5\u65F6\u542F\u52A8
-param.start-on-install.description=\u63A7\u5236\u662F\u5426\u5E94\u5728\u5B89\u88C5\u65F6\u542F\u52A8\u670D\u52A1/\u5B88\u62A4\u7A0B\u5E8F
-
-param.stop-on-uninstall.name=\u5728\u5378\u8F7D\u65F6\u505C\u6B62
-param.stop-on-uninstall.description=\u63A7\u5236\u662F\u5426\u5E94\u5728\u5378\u8F7D\u65F6\u505C\u6B62\u670D\u52A1/\u5B88\u62A4\u7A0B\u5E8F
-
-param.run-at-startup.name=\u5728\u542F\u52A8\u65F6\u8FD0\u884C
-param.run-at-startup.description=\u63A7\u5236\u662F\u5426\u5E94\u5728\u7CFB\u7EDF\u542F\u52A8\u671F\u95F4\u542F\u52A8\u670D\u52A1/\u5B88\u62A4\u7A0B\u5E8F
-
param.sign-bundle.name=\u5BF9\u5305\u7B7E\u540D
param.sign-bundle.description=\u5982\u679C\u6253\u5305\u7A0B\u5E8F\u652F\u6301\u7B7E\u540D, \u5219\u8BF7\u6C42\u5BF9\u5305\u7B7E\u540D\u3002\u9ED8\u8BA4\u503C\u56E0\u6253\u5305\u7A0B\u5E8F\u800C\u5F02\u3002\u4E0D\u652F\u6301\u7B7E\u540D\u7684\u6253\u5305\u7A0B\u5E8F\u5C06\u65E0\u63D0\u793A\u5FFD\u7565\u6B64\u8BBE\u7F6E\u3002
@@ -109,18 +97,12 @@
param.name.name=\u540D\u79F0
param.name.description=\u5E94\u7528\u7A0B\u5E8F\u7684\u540D\u79F0\u3002
-param.preferences-id.name=\u9996\u9009 ID
-param.preferences-id.description=\u5728\u5176\u4E2D\u641C\u7D22\u7528\u6237 JVM \u9009\u9879\u7684\u9996\u9009\u8282\u70B9\u3002\u5176\u683C\u5F0F\u5E94\u4E3A\u4E3B\u7A0B\u5E8F\u5305\u540D\u79F0\u4EE5\u659C\u6760\u5206\u9694\u7684\u7248\u672C, \u4F8B\u5982 "com/example/myapplication"\u3002
-
param.system-wide.name=\u7CFB\u7EDF\u8303\u56F4
param.system-wide.description=\u6B64\u5E94\u7528\u7A0B\u5E8F\u662F\u5E94\u5C1D\u8BD5\u5728\u7CFB\u7EDF\u8303\u56F4\u5185\u5B89\u88C5, \u8FD8\u662F\u4EC5\u4E3A\u6BCF\u4E2A\u7528\u6237\u5B89\u88C5? \u7A7A\u503C\u8868\u793A\u4F7F\u7528\u7CFB\u7EDF\u9ED8\u8BA4\u503C\u3002
param.title.name=\u6807\u9898
param.title.description=\u5E94\u7528\u7A0B\u5E8F\u7684\u6807\u9898\u3002
-param.use-javafx-packaging.name=FX \u6253\u5305
-param.use-javafx-packaging.description=\u662F\u5426\u5E94\u4F7F\u7528 JavaFX \u6253\u5305\u60EF\u4F8B?
-
param.vendor.name=\u4F9B\u5E94\u5546
param.vendor.description=\u5E94\u7528\u7A0B\u5E8F\u7684\u4F9B\u5E94\u5546\u3002
param.vendor.default=\u672A\u77E5
--- a/src/jdk.packager/windows/classes/jdk/packager/internal/resources/builders/windows/WindowsAppImageBuilder.properties Wed Oct 17 15:43:29 2018 -0400
+++ b/src/jdk.packager/windows/classes/jdk/packager/internal/resources/builders/windows/WindowsAppImageBuilder.properties Thu Oct 18 17:57:26 2018 -0400
@@ -33,8 +33,8 @@
param.console-hint.name=Console Hint
param.console-hint.description=Indicates if the bundler should use console launcher
-param.config-root.name=
-param.config-root.description=
+param.config-root.name=Config Root Dir
+param.config-root.description=Config Root Dir
error.cannot-create-output-dir=Output directory {0} cannot be created.
error.cannot-write-to-output-dir=Output directory {0} is not writable.
--- a/src/jdk.packager/windows/classes/jdk/packager/internal/resources/builders/windows/WindowsAppImageBuilder_ja.properties Wed Oct 17 15:43:29 2018 -0400
+++ b/src/jdk.packager/windows/classes/jdk/packager/internal/resources/builders/windows/WindowsAppImageBuilder_ja.properties Thu Oct 18 17:57:26 2018 -0400
@@ -30,8 +30,11 @@
param.icon-ico.name=.ico\u30A2\u30A4\u30B3\u30F3
param.icon-ico.description=ICO\u5F62\u5F0F\u3067\u306E\u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u306E\u30A2\u30A4\u30B3\u30F3\u3002
-param.config-root.name=
-param.config-root.description=
+param.console-hint.name=Console Hint
+param.console-hint.description=Indicates if the bundler should use console launcher
+
+param.config-root.name=Config Root Dir
+param.config-root.description=Config Root Dir
error.cannot-create-output-dir=\u51FA\u529B\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA{0}\u3092\u4F5C\u6210\u3067\u304D\u307E\u305B\u3093\u3002
error.cannot-write-to-output-dir=\u51FA\u529B\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA{0}\u306F\u66F8\u8FBC\u307F\u4E0D\u53EF\u3067\u3059\u3002
--- a/src/jdk.packager/windows/classes/jdk/packager/internal/resources/builders/windows/WindowsAppImageBuilder_zh_CN.properties Wed Oct 17 15:43:29 2018 -0400
+++ b/src/jdk.packager/windows/classes/jdk/packager/internal/resources/builders/windows/WindowsAppImageBuilder_zh_CN.properties Thu Oct 18 17:57:26 2018 -0400
@@ -30,8 +30,11 @@
param.icon-ico.name=.ico \u56FE\u6807
param.icon-ico.description=\u5E94\u7528\u7A0B\u5E8F\u7684\u56FE\u6807, \u91C7\u7528 ICO \u683C\u5F0F\u3002
-param.config-root.name=
-param.config-root.description=
+param.console-hint.name=Console Hint
+param.console-hint.description=Indicates if the bundler should use console launcher
+
+param.config-root.name=Config Root Dir
+param.config-root.description=Config Root Dir
error.cannot-create-output-dir=\u65E0\u6CD5\u521B\u5EFA\u8F93\u51FA\u76EE\u5F55 {0}\u3002
error.cannot-write-to-output-dir=\u8F93\u51FA\u76EE\u5F55 {0} \u4E0D\u53EF\u5199\u3002
--- a/src/jdk.packager/windows/classes/jdk/packager/internal/resources/windows/WinAppBundler.properties Wed Oct 17 15:43:29 2018 -0400
+++ b/src/jdk.packager/windows/classes/jdk/packager/internal/resources/windows/WinAppBundler.properties Thu Oct 18 17:57:26 2018 -0400
@@ -27,8 +27,8 @@
bundler.name=Windows Application Image
bundler.description=A Directory based image of a windows Application with an optionally co-bundled JRE. Used as a base for the Installer bundlers
-param.config-root.name=
-param.config-root.description=
+param.config-root.name=Config Root Dir
+param.config-root.description=Config Root Dir
param.raw-executable-url.name=Launcher URL
param.raw-executable-url.description=Override the packager default launcher with a custom launcher.
--- a/src/jdk.packager/windows/classes/jdk/packager/internal/resources/windows/WinAppBundler_ja.properties Wed Oct 17 15:43:29 2018 -0400
+++ b/src/jdk.packager/windows/classes/jdk/packager/internal/resources/windows/WinAppBundler_ja.properties Thu Oct 18 17:57:26 2018 -0400
@@ -27,8 +27,8 @@
bundler.name=Windows\u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u30FB\u30A4\u30E1\u30FC\u30B8
bundler.description=\u30AA\u30D7\u30B7\u30E7\u30F3\u3067JRE\u304C\u30D0\u30F3\u30C9\u30EB\u3055\u308C\u3066\u3044\u308BWindows\u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u306E\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u30FB\u30D9\u30FC\u30B9\u306E\u30A4\u30E1\u30FC\u30B8\u3002\u30A4\u30F3\u30B9\u30C8\u30FC\u30E9\u30FB\u30D0\u30F3\u30C9\u30E9\u306E\u30D9\u30FC\u30B9\u3068\u3057\u3066\u4F7F\u7528\u3055\u308C\u307E\u3059
-param.config-root.name=
-param.config-root.description=
+param.config-root.name=Config Root Dir
+param.config-root.description=Config Root Dir
param.raw-executable-url.name=\u30E9\u30F3\u30C1\u30E3URL
param.raw-executable-url.description=\u30D1\u30C3\u30B1\u30FC\u30B8\u30E3\u306E\u30C7\u30D5\u30A9\u30EB\u30C8\u30FB\u30E9\u30F3\u30C1\u30E3\u3092\u30AB\u30B9\u30BF\u30E0\u30FB\u30E9\u30F3\u30C1\u30E3\u3067\u30AA\u30FC\u30D0\u30FC\u30E9\u30A4\u30C9\u3057\u307E\u3059\u3002
@@ -49,6 +49,7 @@
error.bit-architecture-mismatch.advice=\u6B63\u3057\u3044\u30D3\u30C3\u30C8\u30FB\u30A2\u30FC\u30AD\u30C6\u30AF\u30C1\u30E3\u3092\u6301\u3064JRE\u30E9\u30F3\u30BF\u30A4\u30E0\u3092\u4F7F\u7528\u3057\u3066\u304F\u3060\u3055\u3044\u3002
error.cannot-create-output-dir=\u51FA\u529B\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA{0}\u3092\u4F5C\u6210\u3067\u304D\u307E\u305B\u3093\u3002
error.cannot-write-to-output-dir=\u51FA\u529B\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA{0}\u306F\u66F8\u8FBC\u307F\u4E0D\u53EF\u3067\u3059\u3002
+error.cannot-find-launcher=Cannot find cfg file in predefined app image directory {0}.
message.creating-app-bundle=\u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u30FB\u30D0\u30F3\u30C9\u30EB\u3092\u4F5C\u6210\u3057\u3066\u3044\u307E\u3059: {1}\u5185\u306E{0}
message.result-dir=\u7D50\u679C\u306E\u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u30FB\u30D0\u30F3\u30C9\u30EB: {0}
--- a/src/jdk.packager/windows/classes/jdk/packager/internal/resources/windows/WinAppBundler_zh_CN.properties Wed Oct 17 15:43:29 2018 -0400
+++ b/src/jdk.packager/windows/classes/jdk/packager/internal/resources/windows/WinAppBundler_zh_CN.properties Thu Oct 18 17:57:26 2018 -0400
@@ -27,8 +27,8 @@
bundler.name=Windows \u5E94\u7528\u7A0B\u5E8F\u6620\u50CF
bundler.description=\u4E00\u4E2A\u57FA\u4E8E\u76EE\u5F55\u7684 Windows \u5E94\u7528\u7A0B\u5E8F\u6620\u50CF, \u53EF\u4EE5\u9009\u62E9\u6027\u5730\u5E26\u6709\u5171\u540C\u6253\u5305\u7684 JRE\u3002\u7528\u4F5C\u5B89\u88C5\u7A0B\u5E8F\u6253\u5305\u7A0B\u5E8F\u7684\u57FA\u7840
-param.config-root.name=
-param.config-root.description=
+param.config-root.name=Config Root Dir
+param.config-root.description=Config Root Dir
param.raw-executable-url.name=\u542F\u52A8\u7A0B\u5E8F URL
param.raw-executable-url.description=\u4F7F\u7528\u5B9A\u5236\u542F\u52A8\u7A0B\u5E8F\u8986\u76D6\u6253\u5305\u7A0B\u5E8F\u9ED8\u8BA4\u542F\u52A8\u7A0B\u5E8F\u3002
@@ -49,6 +49,7 @@
error.bit-architecture-mismatch.advice=\u8BF7\u786E\u4FDD\u4F7F\u7528\u5E26\u6709\u6B63\u786E\u4F4D\u4F53\u7CFB\u7ED3\u6784\u7684 JRE \u8FD0\u884C\u65F6\u3002
error.cannot-create-output-dir=\u65E0\u6CD5\u521B\u5EFA\u8F93\u51FA\u76EE\u5F55 {0}\u3002
error.cannot-write-to-output-dir=\u8F93\u51FA\u76EE\u5F55 {0} \u4E0D\u53EF\u5199\u3002
+error.cannot-find-launcher=Cannot find cfg file in predefined app image directory {0}.
message.creating-app-bundle=\u6B63\u5728 {1} \u4E2D\u521B\u5EFA\u5E94\u7528\u7A0B\u5E8F\u5305 {0}
message.result-dir=\u751F\u6210\u7684\u5E94\u7528\u7A0B\u5E8F\u5305: {0}
--- a/src/jdk.packager/windows/classes/jdk/packager/internal/resources/windows/WinExeBundler.properties Wed Oct 17 15:43:29 2018 -0400
+++ b/src/jdk.packager/windows/classes/jdk/packager/internal/resources/windows/WinExeBundler.properties Thu Oct 18 17:57:26 2018 -0400
@@ -30,26 +30,17 @@
param.system-wide.name=System Wide
param.system-wide.description=Should this application attempt to install itself system wide, or only for each user? Null means use the system default.
-param.app-bundler.name=
-param.app-bundler.description=
+param.app-bundler.name=Exe Installer Bundler
+param.app-bundler.description=Exe Installer Bundler
-param.service-bundler.name=
-param.service-bundler.description=
-
-param.can-use-wix36.name=
-param.can-use-wix36.description=
+param.config-root.name=Config Root
+param.config-root.description=Config Root
-param.out-dir.name=
-param.out-dir.description=
-
-param.config-root.name=
-param.config-root.description=
+param.image-dir.name=Image Dir
+param.image-dir.description=Image Dir
-param.image-dir.name=
-param.image-dir.description=
-
-param.app-dir.name=
-param.app-dir.description=
+param.app-dir.name=App Dir
+param.app-dir.description=App Dir
param.menu-shortcut-hint.name=Menu Hint
param.menu-shortcut-hint.description=If the bundler can add the application to the system menu, should it?
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/jdk.packager/windows/classes/jdk/packager/internal/resources/windows/WinExeBundler_ja.properties Thu Oct 18 17:57:26 2018 -0400
@@ -0,0 +1,105 @@
+#
+# Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation. Oracle designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Oracle in the LICENSE file that accompanied this code.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#
+#
+
+bundler.name=EXE Installer
+bundler.description=Microsoft Windows EXE Installer, via InnoIDE.
+
+param.system-wide.name=System Wide
+param.system-wide.description=Should this application attempt to install itself system wide, or only for each user? Null means use the system default.
+
+param.app-bundler.name=Exe Installer Bundler
+param.app-bundler.description=Exe Installer Bundler
+
+param.config-root.name=Config Root
+param.config-root.description=Config Root
+
+param.image-dir.name=Image Dir
+param.image-dir.description=Image Dir
+
+param.app-dir.name=App Dir
+param.app-dir.description=App Dir
+
+param.menu-shortcut-hint.name=Menu Hint
+param.menu-shortcut-hint.description=If the bundler can add the application to the system menu, should it?
+
+param.desktop-shortcut-hint.name=Shortcut Hint
+param.desktop-shortcut-hint.description=If the bundler can create desktop shortcuts, should it make one?
+
+param.upgrade-uuid.name=Upgrade UUID
+param.upgrade-uuid.description=The UUID associated with upgrades for this package.
+
+param.product-version.name=Product Version
+param.product-version.description=The version of the application as seen by Windows and MSI, of the form "1.2.3"
+
+param.iscc-path.name=InnoSetup iscc.exe location
+param.iscc-path.description=File path to iscc.exe from the InnoSetup tool.
+
+resource.inno-setup-project-file=Inno Setup project file
+resource.setup-icon=setup dialog icon
+resource.post-install-script=script to run after application image is populated
+
+error.parameters-null=Parameters map is null.
+error.parameters-null.advice=Pass in a non-null parameters map.
+
+error.iscc-not-found=Can not find Inno Setup Compiler (iscc.exe).
+error.iscc-not-found.advice=Download Inno Setup 5 or later from http\://www.jrsoftware.org and add it to the PATH.
+
+error.license-missing=Specified license file is missing.
+error.license-missing.advice=Make sure that "{0}" references a file in the app resources, and that it is relative file reference.
+
+error.copyright-is-too-long=The copyright string is too long for InnoSetup.
+error.copyright-is-too-long.advice=Provide a copyright string shorter than 100 characters.
+
+error.too-many-content-types-for-file-association=More than one MIME types was specified for File Association number {0}.
+error.too-many-content-types-for-file-association.advice=Specify one and only one MIME type for each file association.
+
+error.cannot-create-output-dir=Output directory {0} cannot be created.
+error.cannot-write-to-output-dir=Output directory {0} is not writable.
+
+message.tool-wrong-version=Detected [{0}] version {1} but version {2} is required.
+message.debug-working-directory=Kept working directory for debug\: {0}
+message.config-save-location=\ Config files are saved to {0}. Use them to customize package.
+message.outputting-to-location=Generating EXE for installer to\: {0}
+message.output-location=Installer (.exe) saved to\: {0}
+message.tool-version=\ Detected [{0}] version [{1}]
+message.one-shortcut-required=At least one type of shortcut is required. Enabling menu shortcut.
+message.running-wsh-script=Running WSH script on application image [{0}]
+message.iscc-file-string=\ InnoSetup compiler set to {0}
+message.creating-association-with-null-extension=Creating association with null extension.
+message.potential.windows.defender.issue=Warning: Windows Defender may prevent the Java Packager from functioning. If there is an issue, it can be addressed by either disabling realtime monitoring, or adding an exclusion for the directory "{0}".
+
+
+
+message.tool-version=Detected [{0}] version [{1}]
+message.running-wsh-script=Running WSH script on application image [{0}]
+message.wrong-tool-version=Detected [{0}] version {1} but version {2} is required.
+message.use-wix36-features=WiX 3.6 detected. Enabling advanced cleanup action.
+message.version-string-too-many-components=Version sting may have up to 3 components - major.minor.build .
+message.debug-working-directory=Kept working directory for debug\: {0}
+message.config-save-location=Config files are saved to {0}. Use them to customize package.
+message.one-shortcut-required=At least one type of shortcut is required. Enabling menu shortcut.
+message.creating-association-with-null-extension=Creating association with null extension.
+message.truncating.id=Truncating Application ID to 126 chars for Inno Setup.
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/jdk.packager/windows/classes/jdk/packager/internal/resources/windows/WinExeBundler_zh_CN.properties Thu Oct 18 17:57:26 2018 -0400
@@ -0,0 +1,105 @@
+#
+# Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation. Oracle designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Oracle in the LICENSE file that accompanied this code.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#
+#
+
+bundler.name=EXE Installer
+bundler.description=Microsoft Windows EXE Installer, via InnoIDE.
+
+param.system-wide.name=System Wide
+param.system-wide.description=Should this application attempt to install itself system wide, or only for each user? Null means use the system default.
+
+param.app-bundler.name=Exe Installer Bundler
+param.app-bundler.description=Exe Installer Bundler
+
+param.config-root.name=Config Root
+param.config-root.description=Config Root
+
+param.image-dir.name=Image Dir
+param.image-dir.description=Image Dir
+
+param.app-dir.name=App Dir
+param.app-dir.description=App Dir
+
+param.menu-shortcut-hint.name=Menu Hint
+param.menu-shortcut-hint.description=If the bundler can add the application to the system menu, should it?
+
+param.desktop-shortcut-hint.name=Shortcut Hint
+param.desktop-shortcut-hint.description=If the bundler can create desktop shortcuts, should it make one?
+
+param.upgrade-uuid.name=Upgrade UUID
+param.upgrade-uuid.description=The UUID associated with upgrades for this package.
+
+param.product-version.name=Product Version
+param.product-version.description=The version of the application as seen by Windows and MSI, of the form "1.2.3"
+
+param.iscc-path.name=InnoSetup iscc.exe location
+param.iscc-path.description=File path to iscc.exe from the InnoSetup tool.
+
+resource.inno-setup-project-file=Inno Setup project file
+resource.setup-icon=setup dialog icon
+resource.post-install-script=script to run after application image is populated
+
+error.parameters-null=Parameters map is null.
+error.parameters-null.advice=Pass in a non-null parameters map.
+
+error.iscc-not-found=Can not find Inno Setup Compiler (iscc.exe).
+error.iscc-not-found.advice=Download Inno Setup 5 or later from http\://www.jrsoftware.org and add it to the PATH.
+
+error.license-missing=Specified license file is missing.
+error.license-missing.advice=Make sure that "{0}" references a file in the app resources, and that it is relative file reference.
+
+error.copyright-is-too-long=The copyright string is too long for InnoSetup.
+error.copyright-is-too-long.advice=Provide a copyright string shorter than 100 characters.
+
+error.too-many-content-types-for-file-association=More than one MIME types was specified for File Association number {0}.
+error.too-many-content-types-for-file-association.advice=Specify one and only one MIME type for each file association.
+
+error.cannot-create-output-dir=Output directory {0} cannot be created.
+error.cannot-write-to-output-dir=Output directory {0} is not writable.
+
+message.tool-wrong-version=Detected [{0}] version {1} but version {2} is required.
+message.debug-working-directory=Kept working directory for debug\: {0}
+message.config-save-location=\ Config files are saved to {0}. Use them to customize package.
+message.outputting-to-location=Generating EXE for installer to\: {0}
+message.output-location=Installer (.exe) saved to\: {0}
+message.tool-version=\ Detected [{0}] version [{1}]
+message.one-shortcut-required=At least one type of shortcut is required. Enabling menu shortcut.
+message.running-wsh-script=Running WSH script on application image [{0}]
+message.iscc-file-string=\ InnoSetup compiler set to {0}
+message.creating-association-with-null-extension=Creating association with null extension.
+message.potential.windows.defender.issue=Warning: Windows Defender may prevent the Java Packager from functioning. If there is an issue, it can be addressed by either disabling realtime monitoring, or adding an exclusion for the directory "{0}".
+
+
+
+message.tool-version=Detected [{0}] version [{1}]
+message.running-wsh-script=Running WSH script on application image [{0}]
+message.wrong-tool-version=Detected [{0}] version {1} but version {2} is required.
+message.use-wix36-features=WiX 3.6 detected. Enabling advanced cleanup action.
+message.version-string-too-many-components=Version sting may have up to 3 components - major.minor.build .
+message.debug-working-directory=Kept working directory for debug\: {0}
+message.config-save-location=Config files are saved to {0}. Use them to customize package.
+message.one-shortcut-required=At least one type of shortcut is required. Enabling menu shortcut.
+message.creating-association-with-null-extension=Creating association with null extension.
+message.truncating.id=Truncating Application ID to 126 chars for Inno Setup.
--- a/src/jdk.packager/windows/classes/jdk/packager/internal/resources/windows/WinMsiBundler.properties Wed Oct 17 15:43:29 2018 -0400
+++ b/src/jdk.packager/windows/classes/jdk/packager/internal/resources/windows/WinMsiBundler.properties Thu Oct 18 17:57:26 2018 -0400
@@ -30,26 +30,20 @@
param.system-wide.name=System Wide
param.system-wide.description=Should this application attempt to install itself system wide, or only for each user? Null means use the system default.
-param.app-bundler.name=
-param.app-bundler.description=
+param.app-bundler.name=MSI App Bundler
+param.app-bundler.description=MSI App Bundler
-param.service-bundler.name=
-param.service-bundler.description=
-
-param.can-use-wix36.name=
-param.can-use-wix36.description=
+param.can-use-wix36.name=Can Use Wix
+param.can-use-wix36.description=Can Use Wix
-param.out-dir.name=
-param.out-dir.description=
-
-param.config-root.name=
-param.config-root.description=
+param.config-root.name=Config Root Dir
+param.config-root.description=Config Root Dir
-param.image-dir.name=
-param.image-dir.description=
+param.image-dir.name=Image Dir
+param.image-dir.description=Image Dir
-param.app-dir.name=
-param.app-dir.description=
+param.app-dir.name=App Dir
+param.app-dir.description=App Dir
param.menu-shortcut-hint.name=Menu Hint
param.menu-shortcut-hint.description=If the bundler can add the application to the system menu, should it?
--- a/src/jdk.packager/windows/classes/jdk/packager/internal/resources/windows/WinMsiBundler_ja.properties Wed Oct 17 15:43:29 2018 -0400
+++ b/src/jdk.packager/windows/classes/jdk/packager/internal/resources/windows/WinMsiBundler_ja.properties Thu Oct 18 17:57:26 2018 -0400
@@ -30,26 +30,20 @@
param.system-wide.name=\u30B7\u30B9\u30C6\u30E0\u5168\u4F53
param.system-wide.description=\u3053\u306E\u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u306F\u3001\u305D\u308C\u81EA\u4F53\u3092\u30B7\u30B9\u30C6\u30E0\u5168\u4F53\u306B\u30A4\u30F3\u30B9\u30C8\u30FC\u30EB\u3057\u307E\u3059\u304B\u3001\u307E\u305F\u306F\u5404\u30E6\u30FC\u30B6\u30FC\u306B\u5BFE\u3057\u3066\u306E\u307F\u30A4\u30F3\u30B9\u30C8\u30FC\u30EB\u3057\u307E\u3059\u304B\u3002Null\u306F\u30B7\u30B9\u30C6\u30E0\u30FB\u30C7\u30D5\u30A9\u30EB\u30C8\u3092\u4F7F\u7528\u3059\u308B\u3053\u3068\u3092\u610F\u5473\u3057\u307E\u3059\u3002
-param.app-bundler.name=
-param.app-bundler.description=
+param.app-bundler.name=MSI App Bundler
+param.app-bundler.description=MSI App Bundler
-param.service-bundler.name=
-param.service-bundler.description=
-
-param.can-use-wix36.name=
-param.can-use-wix36.description=
+param.can-use-wix36.name=Can Use Wix
+param.can-use-wix36.description=Can Use Wix
-param.out-dir.name=
-param.out-dir.description=
-
-param.config-root.name=
-param.config-root.description=
+param.config-root.name=Config Root Dir
+param.config-root.description=Config Root Dir
-param.image-dir.name=
-param.image-dir.description=
+param.image-dir.name=Image Dir
+param.image-dir.description=Image Dir
-param.app-dir.name=
-param.app-dir.description=
+param.app-dir.name=App Dir
+param.app-dir.description=App Dir
param.upgrade-uuid.name=\u30A2\u30C3\u30D7\u30B0\u30EC\u30FC\u30C9UUID
param.upgrade-uuid.description=\u3053\u306E\u30D1\u30C3\u30B1\u30FC\u30B8\u306E\u30A2\u30C3\u30D7\u30B0\u30EC\u30FC\u30C9\u306B\u95A2\u9023\u4ED8\u3051\u3089\u308C\u3066\u3044\u308BUUID\u3002
--- a/src/jdk.packager/windows/classes/jdk/packager/internal/resources/windows/WinMsiBundler_zh_CN.properties Wed Oct 17 15:43:29 2018 -0400
+++ b/src/jdk.packager/windows/classes/jdk/packager/internal/resources/windows/WinMsiBundler_zh_CN.properties Thu Oct 18 17:57:26 2018 -0400
@@ -30,26 +30,20 @@
param.system-wide.name=\u7CFB\u7EDF\u8303\u56F4
param.system-wide.description=\u6B64\u5E94\u7528\u7A0B\u5E8F\u662F\u5E94\u5C1D\u8BD5\u5728\u7CFB\u7EDF\u8303\u56F4\u5185\u5B89\u88C5, \u8FD8\u662F\u4EC5\u4E3A\u6BCF\u4E2A\u7528\u6237\u5B89\u88C5? \u7A7A\u503C\u8868\u793A\u4F7F\u7528\u7CFB\u7EDF\u9ED8\u8BA4\u503C\u3002
-param.app-bundler.name=
-param.app-bundler.description=
+param.app-bundler.name=MSI App Bundler
+param.app-bundler.description=MSI App Bundler
-param.service-bundler.name=
-param.service-bundler.description=
-
-param.can-use-wix36.name=
-param.can-use-wix36.description=
+param.can-use-wix36.name=Can Use Wix
+param.can-use-wix36.description=Can Use Wix
-param.out-dir.name=
-param.out-dir.description=
-
-param.config-root.name=
-param.config-root.description=
+param.config-root.name=Config Root Dir
+param.config-root.description=Config Root Dir
-param.image-dir.name=
-param.image-dir.description=
+param.image-dir.name=Image Dir
+param.image-dir.description=Image Dir
-param.app-dir.name=
-param.app-dir.description=
+param.app-dir.name=App Dir
+param.app-dir.description=App Dir
param.upgrade-uuid.name=\u5347\u7EA7 UUID
param.upgrade-uuid.description=\u4E0E\u6B64\u7A0B\u5E8F\u5305\u7684\u5347\u7EA7\u5173\u8054\u7684 UUID\u3002
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/jdk/tools/jpackager/jdk/packager/internal/DeployParamsTest.java Thu Oct 18 17:57:26 2018 -0400
@@ -0,0 +1,124 @@
+/*
+ * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import jdk.packager.internal.Arguments;
+import jdk.packager.internal.DeployParams;
+import jdk.packager.internal.PackagerException;
+import java.io.File;
+
+/*
+ * @test
+ * @bug 8211285
+ * @summary DeployParamsTest
+ * @modules jdk.packager
+ * @modules jdk.packager/jdk.packager.internal
+ * @run main/othervm -Xmx512m DeployParamsTest
+ */
+public class DeployParamsTest {
+
+ private static File testRoot = null;
+
+ private static void setUp() {
+ testRoot = new File("deployParamsTest");
+ System.out.println("DeployParamsTest: " + testRoot.getAbsolutePath());
+ testRoot.mkdir();
+ }
+
+ private static void tearDown() {
+ if (testRoot != null) {
+ testRoot.delete();
+ }
+ }
+
+ private static void testValidateAppName1() throws Exception {
+ DeployParams params = getParamsAppName();
+
+ setAppName(params, "Test");
+ params.validate();
+
+ setAppName(params, "Test Name");
+ params.validate();
+
+ setAppName(params, "Test - Name !!!");
+ params.validate();
+ }
+
+ private static void testValidateAppName2() throws Exception {
+ DeployParams params = getParamsAppName();
+
+ setAppName(params, "Test\nName");
+ appName2TestHelper(params);
+
+ setAppName(params, "Test\rName");
+ appName2TestHelper(params);
+
+ setAppName(params, "TestName\\");
+ appName2TestHelper(params);
+
+ setAppName(params, "Test \" Name");
+ appName2TestHelper(params);
+ }
+
+ private static void appName2TestHelper(DeployParams params) throws Exception {
+ try {
+ params.validate();
+ } catch (PackagerException pe) {
+ if (!pe.getMessage().equals("Error: Invalid character found in --name argument")) {
+ throw new Exception("Unexpected PackagerException received: " + pe);
+ }
+
+ return; // Done
+ }
+
+ throw new Exception("Expecting PackagerException");
+ }
+
+ // Returns deploy params initialized to pass all validation, except for
+ // app name
+ private static DeployParams getParamsAppName() {
+ DeployParams params = new DeployParams();
+
+ params.setOutdir(testRoot);
+ params.addResource(testRoot, new File(testRoot, "test.jar"));
+ params.addBundleArgument(Arguments.CLIOptions.APPCLASS.getId(), "TestClass");
+ params.addBundleArgument(Arguments.CLIOptions.MAIN_JAR.getId(), "test.jar");
+
+ return params;
+ }
+
+ private static void setAppName(DeployParams params, String appName) {
+ params.addBundleArgument(Arguments.CLIOptions.NAME.getId(), appName);
+ }
+
+ public static void main(String[] args) throws Exception {
+ setUp();
+
+ try {
+ testValidateAppName1();
+ testValidateAppName2();
+ } finally {
+ tearDown();
+ }
+ }
+
+}