Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

8255619: Localized WinResources.properties have MsiInstallerStrings_en.wxl resource #1638

Closed
wants to merge 1 commit into from

Conversation

sashamatveev
Copy link
Member

@sashamatveev sashamatveev commented Dec 5, 2020

Fixed by using correct localized resources.


Progress

  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue
  • Change must be properly reviewed

Issue

  • JDK-8255619: Localized WinResources.properties have MsiInstallerStrings_en.wxl resource

Reviewers

Download

$ git fetch https://git.openjdk.java.net/jdk pull/1638/head:pull/1638
$ git checkout pull/1638

@bridgekeeper
Copy link

bridgekeeper bot commented Dec 5, 2020

👋 Welcome back almatvee! A progress list of the required criteria for merging this PR into master will be added to the body of your pull request. There are additional pull request commands available for use with this pull request.

@openjdk openjdk bot added the rfr Pull request is ready for review label Dec 5, 2020
@openjdk
Copy link

openjdk bot commented Dec 5, 2020

@sashamatveev To determine the appropriate audience for reviewing this pull request, one or more labels corresponding to different subsystems will normally be applied automatically. However, no automatic labelling rule matches the changes in this pull request. In order to have an "RFR" email sent to the correct mailing list, you will need to add one or more applicable labels manually using the /label pull request command.

Applicable Labels
  • 2d
  • awt
  • beans
  • build
  • compiler
  • core-libs
  • hotspot
  • hotspot-compiler
  • hotspot-gc
  • hotspot-jfr
  • hotspot-runtime
  • i18n
  • javadoc
  • jdk
  • jmx
  • kulla
  • net
  • nio
  • security
  • serviceability
  • shenandoah
  • sound
  • swing

@sashamatveev
Copy link
Member Author

sashamatveev commented Dec 5, 2020

/label core-libs

@openjdk openjdk bot added the core-libs core-libs-dev@openjdk.org label Dec 5, 2020
@openjdk
Copy link

openjdk bot commented Dec 5, 2020

@sashamatveev
The core-libs label was successfully added.

@mlbridge
Copy link

mlbridge bot commented Dec 5, 2020

Webrevs

@openjdk
Copy link

openjdk bot commented Dec 5, 2020

@sashamatveev This change now passes all automated pre-integration checks.

ℹ️ This project also has non-automated pre-integration requirements. Please see the file CONTRIBUTING.md for details.

After integration, the commit message for the final commit will be:

8255619: Localized WinResources.properties have MsiInstallerStrings_en.wxl resource

Reviewed-by: herrick, naoto, asemenyuk

You can use pull request commands such as /summary, /contributor and /issue to adjust it as needed.

At the time when this comment was updated there had been 24 new commits pushed to the master branch:

  • bbc44f5: 8257186: Size of heap segments is not computed correctlyFix overflow in size computation for heap segments
  • b4b9828: 8254784: javac should reject records with @SafeVarargs applied to varargs record component
  • dcf63f8: 8257788: Class fields could be local in the SunJSSE provider
  • d29c78d: 8257679: Improved unix compatibility layer in Windows build (winenv)
  • 74be819: 8257517: LogCompilation: Add -z to the help messages
  • 2c04fc0: 8257037: No javac warning when calling deprecated constructor with diamond
  • 46b35ac: 8257798: [PPC64] undefined reference to Klass::vtable_start_offset()
  • ecd7e47: 8257793: Shenandoah: SATB barrier should only filter out already strongly marked oops
  • e08b9ed: 8257820: Remove gc/ergonomics/TestMinHeapSize.java as it is too brittle
  • 637b0c6: 8246778: Compiler implementation for Sealed Classes (Second Preview)
  • ... and 14 more: https://git.openjdk.java.net/jdk/compare/d3ac1bf16c2e6ffc1f5b1759631750cb7eac2e17...master

As there are no conflicts, your changes will automatically be rebased on top of these commits when integrating. If you prefer to avoid this automatic rebasing, please check the documentation for the /integrate command for further details.

➡️ To integrate this PR with the above commit message to the master branch, type /integrate in a new comment.

@openjdk openjdk bot added the ready Pull request is ready to be integrated label Dec 5, 2020
naotoj
naotoj approved these changes Dec 5, 2020
@sashamatveev
Copy link
Member Author

sashamatveev commented Dec 7, 2020

/integrate

@openjdk openjdk bot closed this Dec 7, 2020
@openjdk openjdk bot added integrated Pull request has been integrated and removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels Dec 7, 2020
@openjdk
Copy link

openjdk bot commented Dec 7, 2020

@sashamatveev Since your change was applied there have been 25 commits pushed to the master branch:

  • e3793e5: 8257514: Fix the issues in jdk.jpackage identified by SpotBugs
  • bbc44f5: 8257186: Size of heap segments is not computed correctlyFix overflow in size computation for heap segments
  • b4b9828: 8254784: javac should reject records with @SafeVarargs applied to varargs record component
  • dcf63f8: 8257788: Class fields could be local in the SunJSSE provider
  • d29c78d: 8257679: Improved unix compatibility layer in Windows build (winenv)
  • 74be819: 8257517: LogCompilation: Add -z to the help messages
  • 2c04fc0: 8257037: No javac warning when calling deprecated constructor with diamond
  • 46b35ac: 8257798: [PPC64] undefined reference to Klass::vtable_start_offset()
  • ecd7e47: 8257793: Shenandoah: SATB barrier should only filter out already strongly marked oops
  • e08b9ed: 8257820: Remove gc/ergonomics/TestMinHeapSize.java as it is too brittle
  • ... and 15 more: https://git.openjdk.java.net/jdk/compare/d3ac1bf16c2e6ffc1f5b1759631750cb7eac2e17...master

Your commit was automatically rebased without conflicts.

Pushed as commit a265c20.

💡 You may see a message that your pull request was closed with unmerged commits. This can be safely ignored.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
core-libs core-libs-dev@openjdk.org integrated Pull request has been integrated
4 participants