-
Notifications
You must be signed in to change notification settings - Fork 5.7k
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
8347498: JDK 24 RDP2 L10n resource files update #23184
8347498: JDK 24 RDP2 L10n resource files update #23184
Conversation
👋 Welcome back jlu! A progress list of the required criteria for merging this PR into |
@justin-curtis-lu 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:
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 69 new commits pushed to the
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 |
@justin-curtis-lu The following labels will be automatically applied to this pull request:
When this pull request is ready to be reviewed, an "RFR" email will be sent to the corresponding mailing lists. If you would like to change these labels, use the /label pull request command. |
Webrevs
|
err.runtime.link.not.linkable.runtime=Dieses JDK unterstützt keine Assemblierung vom aktuellen Laufzeitimage | ||
err.runtime.link.jdk.jlink.prohibited=Dieses JDK enthält keine als Pakete verpackten Module und kann nicht verwendet werden, um ein anderes Image mit dem Modul jdk.jlink zu erstellen | ||
err.runtime.link.packaged.mods=Dieses JDK enthält keine als Pakete verpackten Module. "--keep-packaged-modules" wird nicht unterstützt | ||
err.runtime.link.modified.file={0} wurde modifiziert | ||
err.runtime.link.patched.module=Datei {0} nicht im Modulimage gefunden. "--patch-module" wird beim Verknüpfen aus dem Laufzeitimage nicht unterstützt | ||
err.empty.module.path=leerer Modulpfad | ||
err.runtime.link.not.linkable.runtime=Dieses JDK unterstützt keine Verknüpfung vom aktuellen Laufzeitimage | ||
err.runtime.link.jdk.jlink.prohibited=Dieses JDK enthält keine verpackten Module und kann nicht verwendet werden, um ein anderes Image mit dem Modul jdk.jlink zu erstellen | ||
err.runtime.link.packaged.mods=Dieses JDK enthält keine verpackten Module. "--keep-packaged-modules" wird nicht unterstützt | ||
err.runtime.link.modified.file={0} wurde geändert | ||
err.runtime.link.patched.module=jlink unterstützt keine Verknüpfung vom Laufzeitimage unter einer gepatchten Laufzeit mit --patch-module | ||
err.no.module.path=--module-path-Option muss mit --add-modules ALL-MODULE-PATH angegeben werden | ||
err.empty.module.path=Kein Modul im Modulpfad "{0}" mit --add-modules ALL-MODULE-PATH gefunden | ||
err.limit.modules=--limit-modules nicht mit --add-modules ALL-MODULE-PATH zulässig |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I see German has more being changed when compared to Japanese & Chinese. Are these updated translations for German specifically? I see no related change for the other 2 languages for say err.runtime.link.not.linkable.runtime
.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yes, see the other comment.
@@ -57,7 +57,7 @@ main.opt.man-pages=Speicherort der Manpages | |||
main.opt.target-platform=Zielplattform | |||
main.opt.target-platform.arg=target-platform | |||
main.opt.module-path=Modulpfad | |||
main.opt.hash-modules=Berechnet und erfasst Hashes zur Bindung eines in ein Package integrierten Moduls an Module, die dem angegebenen <Regex-Muster> entsprechen und direkt oder indirekt davon abhängen. Die Hashes werden in der erstellten JMOD-Datei oder in einer JMOD- oder modularen JAR-Datei in dem Modulpfad erfasst, der im jmod-Hashbefehl angegeben ist. | |||
main.opt.hash-modules=Berechnet und erfasst Hashes zur Bindung eines verpackten Moduls an Module, die dem angegebenen <Regex-Muster> entsprechen und direkt oder indirekt davon abhängen. Die Hashes werden in der erstellten JMOD-Datei oder in einer JMOD- oder modularen JAR-Datei in dem Modulpfad erfasst, der im jmod-Hashbefehl angegeben ist. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I assume this is more evidence that the German differences are just updated translations for German?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yes, there were standalone German translation updates. Some were also reverts to fixes we made last time for German translations specifically, as they were rejected by the translation team. In any case, I think it is probably best not to deviate from their translations unless they are incorrect.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Makes sense. I agree then.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
File changes LGTM.
Should the copyright years be 2025, unless they were published in 2024? |
I noticed that too. Those copyrights are automatically updated by the translation team. Since the English changes were made in 2024, it seems reasonable that the corresponding l10n changes also have a copyright year of 2024. Conceptually I'm treating it like a backport, where the copyright year should reflect the year of the original change, not the current year. But these are different cases of course, please let me know if I should change it to 2025, I am not fully sure in this scenario. |
I saw the same but forgot to mention it after looking up the original files to compare to German. I'm also not sure if this should be 2024 vs 2025. I'd assume 2024 since most of the files say "edited on Dec 2024", but not sure if it's based on the original file's date or this translated file. |
IANAL, but my understanding is that it reflects the year the last change was open to the public. It does not seem to matter from copyright point if the file is a translation of English one or not. |
While that has been my understanding as well, for L10n specifically we have always reflected the original English file year in the localized copyright. For example, I believe most (if not all) of the other files included in this PR have a 2024 copyright years, not just those .java XML files. I am fine if we make this switch, but it will be a departure from how we have normally done it for the L10n process. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
While that has been my understanding as well, for L10n specifically we have always reflected the original English file year in the localized copyright
Yes. I think it is probably time to assure it really is the case. Since we are following the procedure, I approve the changes.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
java.xml changes look good.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I only looked at the jlink changes which look fine to me. Fine to keep with/without the suggestion.
err.runtime.link.packaged.mods=Dieses JDK enthält keine verpackten Module. "--keep-packaged-modules" wird nicht unterstützt | ||
err.runtime.link.modified.file={0} wurde geändert | ||
err.runtime.link.patched.module=jlink unterstützt keine Verknüpfung vom Laufzeitimage unter einer gepatchten Laufzeit mit --patch-module | ||
err.no.module.path=--module-path-Option muss mit --add-modules ALL-MODULE-PATH angegeben werden |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
err.no.module.path=--module-path-Option muss mit --add-modules ALL-MODULE-PATH angegeben werden | |
err.no.module.path=--module-path Option muss mit --add-modules ALL-MODULE-PATH angegeben werden |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Fixed it in cc8b23f. The option reads incorrect with "-Option" appended, regardless of language rules.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
jpackage changes look good.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
jdk.jlink changes still good.
Thank you all for the reviews! |
Going to push as commit dec9367.
Your commit was automatically rebased without conflicts. |
@justin-curtis-lu Pushed as commit dec9367. 💡 You may see a message that your pull request was closed with unmerged commits. This can be safely ignored. |
/backport jdk jdk24 |
@justin-curtis-lu the backport was successfully created on the branch backport-justin-curtis-lu-dec93675-jdk24 in my personal fork of openjdk/jdk. To create a pull request with this backport targeting openjdk/jdk:jdk24, just click the following link: The title of the pull request is automatically filled in correctly and below you find a suggestion for the pull request body:
If you need to update the source branch of the pull then run the following commands in a local clone of your personal fork of openjdk/jdk:
|
Please review this PR which contains the l10n translations for between RDP1 and RDP2 for the JDK24 stabilization branch.
Note that these translations are only associated with changes made to the stabilization branch. This PR will not include any translations for changes since RDP1, that were not back-ported to the stabilization branch. Also note that while most changes here are associated with an English change, there were some standalone translation improvements.
Once this pull request is integrated, it will be back-ported to the jdk24 branch.
Progress
Issue
Reviewers
Reviewing
Using
git
Checkout this PR locally:
$ git fetch https://git.openjdk.org/jdk.git pull/23184/head:pull/23184
$ git checkout pull/23184
Update a local copy of the PR:
$ git checkout pull/23184
$ git pull https://git.openjdk.org/jdk.git pull/23184/head
Using Skara CLI tools
Checkout this PR locally:
$ git pr checkout 23184
View PR using the GUI difftool:
$ git pr show -t 23184
Using diff file
Download this PR as a diff file:
https://git.openjdk.org/jdk/pull/23184.diff
Using Webrev
Link to Webrev Comment