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

8333827: JDK 23 RDP1 L10n resource files update #19609

Closed
wants to merge 5 commits into from

Conversation

DamonGuy
Copy link
Contributor

@DamonGuy DamonGuy commented Jun 7, 2024

This issue is responsible for updating the translations of all the localize(able) resources in the JDK. Primarily, the changes between JDK 22 RDP 1 and the integration of the JDK 23 RDP 1 L10n drop will be translated.

The translation tool adjusted some definitions, which causes some changes in localized files where the source file had no changes. This causes some words being reverted from localized languages to English, and some had its definitions changed.

Alternatively, the diffs are viewable here and was generated using Jonathan Gibbons' diff tool for l10n:
https://cr.openjdk.org/~dnguyen/output2/


Progress

  • Change must be properly reviewed (1 review required, with at least 1 Reviewer)
  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue

Issue

  • JDK-8333827: JDK 23 RDP1 L10n resource files update (Bug - P3)

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.org/jdk.git pull/19609/head:pull/19609
$ git checkout pull/19609

Update a local copy of the PR:
$ git checkout pull/19609
$ git pull https://git.openjdk.org/jdk.git pull/19609/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 19609

View PR using the GUI difftool:
$ git pr show -t 19609

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jdk/pull/19609.diff

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Jun 7, 2024

👋 Welcome back dnguyen! 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
Copy link

openjdk bot commented Jun 7, 2024

@DamonGuy 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:

8333827: JDK 23 RDP1 L10n resource files update

Reviewed-by: achung, jlu, naoto, joehw, prappo, cjplummer, asemenyuk, prr

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 125 new commits pushed to the master branch:

  • 74468bc: 8209092: Remove outdated wording from RC5ParameterSpec
  • b697b48: 8315655: [macos] Right click and dragging over a component with a popup menu will open the popup
  • 2c1da6c: 8332139: SymbolTableHash::Node allocations allocates twice the required memory
  • ba67ad6: 8319457: Update jpackage to support WiX v4 and v5 on Windows
  • 2c9185e: 8321308: AArch64: Fix matching predication for cbz/cbnz
  • 5a8a9fd: 8333382: [s390x] Enhance popcnt Instruction to use Z15 facilities
  • 81083a0: 8299487: Test java/net/httpclient/whitebox/SSLTubeTestDriver.java timed out
  • 81ca0ec: 8334028: HttpClient: NPE thrown from assert statement
  • bd750b6: 8319933: Disable tests for JDK-8280481 on Graal
  • c80e2eb: 8333886: Explicitly specify that asSlice and reinterpret return a memory segment backed by the same region of memory.
  • ... and 115 more: https://git.openjdk.org/jdk/compare/dce97031555dcf689fecda16e444e7e8e9d5b270...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
Copy link

openjdk bot commented Jun 7, 2024

@DamonGuy The following labels will be automatically applied to this pull request:

  • client
  • compiler
  • core-libs
  • javadoc
  • kulla
  • serviceability

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.

@openjdk openjdk bot added javadoc javadoc-dev@openjdk.org serviceability serviceability-dev@openjdk.org client client-libs-dev@openjdk.org core-libs core-libs-dev@openjdk.org compiler compiler-dev@openjdk.org kulla kulla-dev@openjdk.org labels Jun 7, 2024
@alisenchung
Copy link
Contributor

The translation tool adjusted some definitions, which causes some changes in localized files where the source file had no changes. This causes some words being reverted from localized languages to English, and some had its definitions changed.

Any particular reason you know that the tool had the definitions adjusted? I see some of the changes look like like command line options not being translated, but it's a bit hard to tell. Do you know if the reverted words should be translated (and possibly will be re-translated in future drops?) or should they be left untranslated?

Copy link
Contributor

@alisenchung alisenchung left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just a question about the reverted translations, otherwise LGTM

@@ -179,7 +180,7 @@ jshell.console.empty = \nLeerer Eintrag. Ein einzelner gültiger Ausdruck oder e

jshell.fix.wrong.shortcut =Unerwartetes Zeichen nach Umschalt+Tab.\nVerwenden Sie "I" für automatischen Import, "V" zur Variablenerstellung oder "M" zur Methodenerstellung.\nWeitere Informationen finden Sie unter:\n/help shortcuts

help.usage = Verwendung: jshell <Option>... <Ladedatei>...\nMögliche Optionen:\n --class-path <Pfad> Gibt an, wo die Benutzerklassendateien gespeichert sind\n --module-path <Pfad> Gibt an, wo die Anwendungsmodule gespeichert sind\n --add-modules <Modul>(,<Modul>)*\n Gibt aufzulösende Module oder alle Module im\n Modulpfad an, wenn <Modul> ALL-MODULE-PATHs lautet\n --enable-native-access\n Ermöglicht Ausführung eingeschränkter nativer Methoden durch Code\n --enable-preview Code kann Vorschaufeatures in diesem Release nutzen\n --startup <Datei> Ersetzung der Startdefinitionen mit einer Ausführung\n --no-startup Startdefinitionen werden nicht ausgeführt\n --feedback <Modus> Gibt den anfänglichen Feedbackmodus an. Der Modus kann\n vordefiniert (Silent, Concise, Normal oder Verbose) oder\n vorab benutzerdefiniert sein\n -q Stilles Feedback. Identisch mit: --feedback concise\n -s Äußerst stilles Feedback. Identisch mit: --feedback silent\n -v Verbose-Feedback. Identisch mit: --feedback verbose\n -J<Kennzeichen> Übergibt <Kennzeichen> direkt an das Laufzeitsystem.\n Verwenden Sie ein -J pro Laufzeitkennzeichen oder Kennzeichenargument\n -R<Kennzeichen> Übergibt <Kennzeichen> an das Remotelaufzeitsystem.\n Verwenden Sie ein -R pro Remotekennzeichen oder Kennzeichenargument\n -C<Kennzeichen> Übergibt <Kennzeichen> an den Compiler.\n Verwenden Sie ein -C pro Compiler-Kennzeichen oder Kennzeichenargument\n --version Gibt Versionsinformationen aus und beendet den Vorgang\n --show-version Gibt Versionsinformationen aus und setzt den Vorgang fort\n --help, -?, -h Gibt diese Zusammenfassung der Standardoptionen aus und beendet den Vorgang\n --help-extra, -X Gibt Hilfetext zu Nicht-Standardoptionen aus und beendet den Vorgang\n\nEin Dateiargument kann ein Dateiname oder einer der vordefinierten Dateinamen sein: DEFAULT,\nPRINTING, TOOLING oder JAVASE.\nEine Ladedatei kann auch "-" zur Angabe einer Standardeingabe ohne interaktiven I/O sein.\n\nWeitere Informationen zu den Auswertungskontextoptionen (--class-path,\n--module-path und --add-modules) finden Sie unter:\n\t/help context\n\nEin Pfad listet die zu durchsuchenden Verzeichnisse und Archive auf. Verwenden Sie unter Windows ein\nSemikolon (;), um Elemente im Pfad zu trennen. Verwenden Sie auf anderen Plattformen einen\nDoppelpunkt (:), um Elemente zu trennen.\n
help.usage = Verwendung: jshell <option>... <load-file>...\nMögliche Optionen:\n --class-path <path> Gibt an, wo die Benutzerklassendateien gespeichert sind\n --module-path <path> Gibt an, wo die Anwendungsmodule gespeichert sind\n --add-modules <module>(,<module>)*\n Gibt aufzulösende Module oder alle Module im\n Modulpfad an, wenn <module> ALL-MODULE-PATHs lautet\n --enable-native-access\n Ermöglicht Ausführung eingeschränkter nativer Methoden durch Code\n --enable-preview Code kann Vorschaufeatures in diesem Release nutzen\n --startup <Datei> Ersetzung der Startdefinitionen mit einer Ausführung\n --no-startup Startdefinitionen werden nicht ausgeführt\n --feedback <Modus> Gibt den anfänglichen Feedbackmodus an. Der Modus kann\n vordefiniert (Silent, Concise, Normal oder Verbose) oder\n vorab benutzerdefiniert sein\n -q Stilles Feedback. Identisch mit: --feedback concise\n -s Äußerst stilles Feedback. Identisch mit: --feedback silent\n -v Verbose-Feedback. Identisch mit: --feedback verbose\n -J<flag> Übergibt <flag> an das Laufzeitsystem, hat aber keine Auswirkungen\n auf die Ausführung von Code-Snippets. Um Kennzeichen anzugeben,\n die die Ausführung von Code-Snippets beeinflussen, verwenden Sie\n -R<flag>. Verwenden Sie alternativ dazu -J<flag> mit\n --execution local.\n -R<flag> Übergibt <flag> nur dann an das Laufzeitsystem, wenn\n Code-Snippets ausgeführt werden. Beispiel: -R-Dfoo=bar\n bedeutet, dass die Ausführung des Snippets\n System.getProperty("foo") "bar" zurückgibt.\n -C<flag> Übergibt <flag> an den Java-Compiler in JShell.\n Beispiel: -C-Xlint aktiviert alle empfohlenen\n LINT-Warnungen, und -C--release=<N> kompiliert für\n Java SE N, wie wenn --release N angegeben wird.\n Verwenden Sie ein -C pro Compiler-Kennzeichen oder Kennzeichenargument\n --version Gibt Versionsinformationen aus und beendet den Vorgang\n --show-version Gibt Versionsinformationen aus und setzt den Vorgang fort\n --help, -?, -h Gibt diese Zusammenfassung der Standardoptionen aus und beendet den Vorgang\n --help-extra, -X Gibt Hilfetext zu Nicht-Standardoptionen aus und beendet den Vorgang\n\nEin Dateiargument kann ein Dateiname oder einer der vordefinierten Dateinamen sein: DEFAULT,\nPRINTING, TOOLING oder JAVASE.\nEine Ladedatei kann auch "-" zur Angabe einer Standardeingabe ohne interaktiven I/O sein.\n\nWeitere Informationen zu den Auswertungskontextoptionen (--class-path,\n--module-path und --add-modules) finden Sie unter:\n\t/help context\n\nEin Pfad listet die zu durchsuchenden Verzeichnisse und Archive auf. Verwenden Sie unter Windows ein\nSemikolon (;), um Elemente im Pfad zu trennen. Verwenden Sie auf anderen Plattformen einen\nDoppelpunkt (:), um Elemente zu trennen.\n
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Any particular reason you know that the tool had the definitions adjusted? I see some of the changes look like like command line options not being translated, but it's a bit hard to tell. Do you know if the reverted words should be translated (and possibly will be re-translated in future drops?) or should they be left untranslated?

@alisenchung While these command line options are untranslated, which initially may seem confusing, it appears to be the translation tool standardizing the definitions with the Japanese and Chinese localized definitions. We should leave them untranslated.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is what I've determined as well. I planned to leave these untranslated to reduce noise between drops as well.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

While we do not translate Java keywords (when used as such, e.g. "class not allowed here"), and option names (e.g. --class-path) we have typically translated other text that is not mandated by the language or tools, (e.g. the name of this class, <args>, <class-path>.

This change seems to be going backwards.

Whatever the policy we use for translating (or not translating) parts of a message, we should be consistent across all tools and documents.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The go translation team dictates which of these segments within a file actually get updated. I can manually revert the segments if preferred, but these changes will continue appearing for future drops with the current system.

I can potentially try to communicate to the other team to differentiate between keywords & option names versus some of these other words, but let me know how you'd like me to proceed with this.

Copy link
Contributor Author

@DamonGuy DamonGuy Jun 10, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@jonathan-gibbons I just realized that this change to the German file matches the file with the Japanese and Chinese localized files. By that I mean the "backwards" translations are also present for the Japanese and Chinese files.

However, the previous versions of the Japanese and Chinese files don't have these bits translated. So in summary, I can revert the German file back to German but the Japanese and Chinese files will still be English for these parts because I wouldn't know what to revert them to in their local language.

As a result, I actually think it might be better to change this German file as shown in the current version of the PR just to remain consistent with the other localized versions of this file. We can still bring this up to the go team as an issue, but I think this is the best solution now for this drop at least.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No one else except people reading this PR will spot inconsistencies between translations in different languages. So inconsistencies across languages will not be obvious to end users.

But anyone (end-user) using the tool in any one of these languages is likely to spot inconsistencies in the translations for that one language.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@jonathan-gibbons I have gone back and manually undid some of the English translations back to its former German word. Most occurrences of this are <flag> to <Kennzeichen>, but some others were changed back as well. Could you re-review this?

Copy link
Member

@justin-curtis-lu justin-curtis-lu left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Cannot speak to the translations themselves, but in general the changes LGTM pending the comments.

@DamonGuy DamonGuy marked this pull request as ready for review June 10, 2024 20:01
@openjdk openjdk bot added the rfr Pull request is ready for review label Jun 10, 2024
@mlbridge
Copy link

mlbridge bot commented Jun 10, 2024

Webrevs

Copy link
Member

@naotoj naotoj left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Did not look at each for translation accuracy (did some for Japanese), but looks good overall.
It's great to see diffs in native languages, rather than those cryptic \uXXXX notation!

@openjdk openjdk bot added the ready Pull request is ready to be integrated label Jun 10, 2024
@DamonGuy
Copy link
Contributor Author

Did not look at each for translation accuracy (did some for Japanese), but looks good overall. It's great to see diffs in native languages, rather than those cryptic \uXXXX notation!

Justin's tool is responsible for this. Made the process quicker/simpler as well once everything was setup properly and working.

Copy link
Member

@JoeWang-Java JoeWang-Java left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

One minor comment, otherwise the java.xml changes look good.

Copy link
Member

@pavelrappo pavelrappo left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I was asked to have a look at this PR elsewhere. I cannot verify correctness of translation, but I can review this PR generally for jdk.javadoc.

From what I can see, the changes are only to the property files, which is expected from the PR title. The keys from English files 1-1 match the keys from non-English files: there are no missing or extra keys.

From that point of view, the changes to jdk.javadoc look good.

Copy link
Contributor

@plummercj plummercj left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

jdk.jconsole and jdk.jdi changes look fine.

@alexeysemenyukoracle
Copy link
Member

jpackage changes look good

Copy link
Contributor

@alisenchung alisenchung left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@alisenchung
Copy link
Contributor

An interesting note after looking at Phil's comment on the serviceui.properties change is that there is no Japanese update for that file. The translations on here from the output bins update look good to me but maybe @naotoj should double check in case?

@naotoj
Copy link
Member

naotoj commented Jun 11, 2024

An interesting note after looking at Phil's comment on the serviceui.properties change is that there is no Japanese update for that file. The translations on here from the output bins update look good to me but maybe @naotoj should double check in case?

I can confirm that English "Out&put trays:" to "出力トレイ(&P):" is OK

@DamonGuy
Copy link
Contributor Author

/integrate

@openjdk
Copy link

openjdk bot commented Jun 13, 2024

Going to push as commit c4702ca.
Since your change was applied there have been 142 commits pushed to the master branch:

  • bb7ef03: 8333599: Improve description of \b matcher in j.u.r.Pattern
  • 0721dbe: 8334032: javax.print: Missing @SInCE tag in new class OutputBin
  • 6462b87: 8333685: Make update-copyright-year script more useful
  • b09a451: 8333840: C2 SuperWord: wrong result for MulAddS2I when inputs permuted
  • cff048c: 8334162: Gatherer.defaultCombiner has an erronous @see-link
  • 814cf87: 8313562: hsperfdata should export module path and "launcher" metadata
  • 9ed8629: 8333801: Typos in @code references of BufferedImage and JTableHeader
  • 0d3a377: 8333887: ubsan: unsafe.cpp:247:13: runtime error: store to null pointer of type 'volatile int'
  • 9d8439c: 8211854: [aix] java/net/ServerSocket/AcceptInheritHandle.java fails: read times out
  • f521367: 8211847: [aix] java/lang/ProcessHandle/InfoTest.java fails: "reported cputime less than expected"
  • ... and 132 more: https://git.openjdk.org/jdk/compare/dce97031555dcf689fecda16e444e7e8e9d5b270...master

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot added the integrated Pull request has been integrated label Jun 13, 2024
@openjdk openjdk bot closed this Jun 13, 2024
@openjdk openjdk bot removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels Jun 13, 2024
@openjdk
Copy link

openjdk bot commented Jun 13, 2024

@DamonGuy Pushed as commit c4702ca.

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

@DamonGuy
Copy link
Contributor Author

/backport :jdk23

@openjdk
Copy link

openjdk bot commented Jun 13, 2024

@DamonGuy the backport was successfully created on the branch backport-DamonGuy-c4702ca8-jdk23 in my personal fork of openjdk/jdk. To create a pull request with this backport targeting openjdk/jdk:jdk23, just click the following link:

➡️ Create pull request

The title of the pull request is automatically filled in correctly and below you find a suggestion for the pull request body:

Hi all,

This pull request contains a backport of commit c4702ca8 from the openjdk/jdk repository.

The commit being backported was authored by Damon Nguyen on 13 Jun 2024 and was reviewed by Alisen Chung, Justin Lu, Naoto Sato, Joe Wang, Pavel Rappo, Chris Plummer, Alexey Semenyuk and Phil Race.

Thanks!

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:

$ git fetch https://github.com/openjdk-bots/jdk.git backport-DamonGuy-c4702ca8-jdk23:backport-DamonGuy-c4702ca8-jdk23
$ git checkout backport-DamonGuy-c4702ca8-jdk23
# make changes
$ git add paths/to/changed/files
$ git commit --message 'Describe additional changes made'
$ git push https://github.com/openjdk-bots/jdk.git backport-DamonGuy-c4702ca8-jdk23

⚠️ @DamonGuy You are not yet a collaborator in my fork openjdk-bots/jdk. An invite will be sent out and you need to accept it before you can proceed.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
client client-libs-dev@openjdk.org compiler compiler-dev@openjdk.org core-libs core-libs-dev@openjdk.org integrated Pull request has been integrated javadoc javadoc-dev@openjdk.org kulla kulla-dev@openjdk.org serviceability serviceability-dev@openjdk.org
Development

Successfully merging this pull request may close these issues.