-
Notifications
You must be signed in to change notification settings - Fork 6.1k
8359761: JDK 25 RDP1 L10n resource files update #25839
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
base: master
Are you sure you want to change the base?
Conversation
👋 Welcome back achung! A progress list of the required criteria for merging this PR into |
❗ This change is not yet ready to be integrated. |
@alisenchung 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. |
@alisenchung Please do not rebase or force-push to an active PR as it invalidates existing review comments. Note for future reference, the bots always squash all changes into a single commit automatically as part of the integration. See OpenJDK Developers’ Guide for more information. |
@alisenchung Please do not rebase or force-push to an active PR as it invalidates existing review comments. Note for future reference, the bots always squash all changes into a single commit automatically as part of the integration. See OpenJDK Developers’ Guide for more information. |
Webrevs
|
whitespace changes are fixed, PR is ready for review |
@@ -23,7 +23,7 @@ | |||
# questions. | |||
# | |||
|
|||
main.usage=Verwendung: jdeprscan [Optionen] '{dir|jar|class}' ...\n\nOptionen:\n --class-path PATH\n --for-removal\n --full-version\n -? -h --help\n -l --list\n --release {0}\n -v --verbose\n --version | |||
main.usage=Verwendung: jdeprscan [Optionen] ''{dir|jar|class}'' ...\n\nOptionen:\n --class-path PATH\n --for-removal\n --full-version\n -? -h --help\n -l --list\n --release {0}\n -v --verbose\n --version |
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.
Extra quotes, applies to other localized versions as well. (Usual change we revert)
@@ -1,5 +1,5 @@ | |||
/* | |||
* Copyright (c) 2001, 2024, Oracle and/or its affiliates. All rights reserved. | |||
* Copyright (c) 2001, 2023, Oracle and/or its affiliates. All rights reserved. |
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.
Looks wrong but is correct. File had its copyright year updated in https://bugs.openjdk.org/browse/JDK-8345800, but the original is still 2023. Translation team is re-syncing it to match the original year.
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.
Is there any way to prevent this or do we just change it back when we do a drop and explain why each time?
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.
If this is committed, then the years will be synced and we won't have to change it back. This would be consistent with the way we receive l10n translations which sync the copyright years of localized files to the original.
If we want to deviate from this then we could file a request asking them to not update copyright years and we could update them ourselves.
@@ -1,5 +1,5 @@ | |||
# | |||
# Copyright (c) 2012, 2024, Oracle and/or its affiliates. All rights reserved. | |||
# Copyright (c) 2012, 2021, Oracle and/or its affiliates. All rights reserved. |
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.
Same as my comment in src/jdk.jdi/share/classes/com/sun/tools/example/debug/tty/TTYResources_de.java
@@ -27,7 +27,7 @@ NEWLINE=\n | |||
STAR=******************************************* | |||
STARNN=*******************************************\n\n | |||
# keytool: Help part | |||
.OPTION.=\u0020[OPTION]... | |||
.OPTION.=\ [OPTION]... |
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.
We spoke about this offline. This is fine, property file values need to either start with a \
or \u0020
to denote intentional leading white space. In this case, since we convert to UTF-8 native characters from escape sequences this gets included as well. Functionally, they are equivalent and the new form works well with the translation 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.
jdk.jpackage changes looks good.
@@ -0,0 +1,68 @@ | |||
# |
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.
Just wondering why this resource file has not been translated into de/ja/zh_CN till now. Looks correct though.
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 am wondering the same thing. Perhaps because it is not intended for general public, it's not in the JDK tools specifications.
If that was intentionally left out, I don't see new reason to add them.
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.
This file wasn't originally in the tbom file when we first restarted translations and was picked up by our getChanges tool because of a recent update to the file some time after the previous drop, so it hasn't been translated until this drop. Maybe the previous team just forgot to translate this file?
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.
Thanks. I guess this was simply an overlook in the first place, as the process was manual back 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.
I'm unable to confirm the accuracy of the translations, since I don't speak the target languages. I've only reviewed the jdk.javadoc
sources.
All keys in the English property files match one-to-one with those in the non-English files: there are no missing or extra entries. The only changes are to the .properties
files, exactly as the PR title suggests.
From the jdk.javadoc
perspective, this looks good, so I'm happy to approve this PR.
Should the other localizations for the launcher help text (in Edit: I see that the other localizations haven't been updated for the last few releases, so maybe this is intentional. Still interested to know why we have the other localizations if they aren't updated. |
SliderDemo.majorticks=Grobteilungen | ||
SliderDemo.majorticksdescription=Ein Schieberegler mit Grobteilungsmarkierungen | ||
SliderDemo.majorticksdescription=Ein Schieberegler mit Hauptteilstrichen |
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.
Should the translation of SliderDemo.majorticks
also be updated?
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 agree. I'd expect consistency here.
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.
What would be the correct translation of majorticks here?
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.
If "major tick" is translated to "Hauptteilstrich", then the plural would be [SliderDemo.majorticks=]Hauptteilstriche
(which is a rather artificial word so the translation team might want to come up with a better translation for "major tick").
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.
Microsoft uses Hauptteilstrich, see MajorTickMark Klasse, so Hauptteilstrich (singular Nominative) seems correct.
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.
Ja, "Hauptteilstrich" and "Hauptteilstriche" (pl) are correct.
SliderDemo.ticks=Feinteilungen, Teilungen zum Einrasten und Labels | ||
SliderDemo.minorticks=Feinteilungen |
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.
The following description uses different words now:
Feinteilungen -> Teilstrichen
Teilungen -> Teilstrichen
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.
Just to clarify, does this mean
SliderDemo.ticks=Teilstrichen, Teilstrichen zum Einrasten und Labels
SliderDemo.minorticks=Teilstrichen
is correct?
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.
Hm… I don't know. You should clarify with the translation team. They've changed the translation for the major ticks from Grobteilungen to Hauptteilstriche. Yet minor ticks remain Feinteilungen, which doesn't look right because the main word is different. (Teilung doesn't seem to be the right word, at least dictionaries translate it as “division”.)
Teilstrich means scale line, the marks on a ruler, so it fits.
Microsoft documentation for MinorTickMark Klasse uses Kleinere Teilstriche, yet I don't understand why there's ‘-e’ ending (plural?).
SliderDemo.ticks=Teilstrichen, Teilstrichen zum Einrasten und Labels
This one looks particularly incorrect; “einrasten“ is a verb with a separable prefix that means “to lock”, and I can't find a usage as if it's a noun.
The English phrase is “Minor Ticks, Snap-to-ticks and Labels”, and I don't know how to correctly translate it to German.
Subject.=Subjekt:\n | ||
Subject.=Subject:\n |
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.
Is it correct? German usually uses k
.
Generating.full.keyAlgName.key.pair.and.a.certificate.sigAlgName.issued.by.signerAlias.with.a.validity.of.days.for=Schlüsselpaar {0} und Zertifikat ({1}) werden generiert, das von <{2}> mit einer Gültigkeit von {3} Tagen ausgestellt wurde\n\tfür: {4} | ||
size.bit.alg=%1$d-Bit-%2$s | ||
Generating.full.keyAlgName.key.pair.and.self.signed.certificate.sigAlgName.with.a.validity.of.days.for=Generieren von {0}-Schlüsselpaar und selbstsigniertem Zertifikat ({1}) mit einer Gültigkeit von {2} Tagen\n\tfür: {3} | ||
Generating.full.keyAlgName.key.pair.and.a.certificate.sigAlgName.issued.by.signerAlias.with.a.validity.of.days.for=Generieren von {0}-Schlüsselpaar und einem von <{2}> ausgestellten Zertifikat ({1}) mit einer Gültigkeit von {3} Tagen\n\tfür: {4} |
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.
It feels as if there's something missing after ‘einem’.
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.
seems ok to me, einem von X ausgestellten Zertifikat ~ einem Zertifikat, das von X ausgestellt wurde
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.
Thanks!
LoginModuleControlFlag.=LoginModuleControlFlag:\u0020 | ||
LoginModuleControlFlag.=LoginModuleControlFlag:\u0020 |
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.
Is it intended to have two spaces instead of one? Or am I missing anything? The colon on the modified line looks slightly differently.
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.
There is still only one space, the new one is a full width colon (U+FF1A). Localization rules have been observed to make the switch from regular colons (U+003A) into the full width version depending on the language.
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.
Thank you for the clarification.
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.
However, there is no space required between two Chinese sentences. In English, we usually write "I am here, and you are there." But in Chinese, with the full-width punctuation, it's always "我在这里,你在那里。".
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.
Some people like to insert a space between a Chinese character and a Latin letter. I’m not a fan of this style, but I don’t feel strongly about it. However, adding a space between two Chinese characters or between a Chinese character and a full-width punctuation mark is unusual.
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.
As discussed offline, since there are many instances of this, we will file an issue with the translation team and see if they will agree to the suggested changes.
src/jdk.jartool/share/classes/sun/security/tools/jarsigner/resources/jarsigner_de.properties
Show resolved
Hide resolved
...k.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/resources/doclets_de.properties
Outdated
Show resolved
Hide resolved
Those languages (de/ja/zh-CN) are the ones we (Oracle) support. Other entities would be welcome to provide l10n for other languages (not a sporadic l10n, but commit to update/maintain).
Usuallly l10n resource updates are additions, so those old l10ns still have values for those languages. New additions will simply fall back to English. |
src/jdk.compiler/share/classes/com/sun/tools/javac/resources/javac_de.properties
Outdated
Show resolved
Hide resolved
src/jdk.compiler/share/classes/com/sun/tools/javac/resources/launcher_de.properties
Outdated
Show resolved
Hide resolved
Subject.=主体: \n | ||
.Principal.=\t主用户:\u0020 | ||
Subject.=主体:\n | ||
.Principal.=\t主用户:\u0020 | ||
.Public.Credential.=\t公共身份证明:\u0020 | ||
.Private.Credential.=\t专用身份证明:\u0020 |
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.
Why aren't the 2 lines above updated like in lines 46 and 47?
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 checked the ASCII codes here and on the source file. The updated colons are localized to full-width colons as @justin-curtis-lu mentioned in another thread here.
I agree. I also believe lines 48 & 49 need to be updated to the same type of colon. I don't see a good reason for why this was not updated as well. We may need to file a bug with the translators to resolve this inconsistency for next time. We should update these lines here now unless anyone else sees a reason not to.
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.
If the context for these 2 values makes sense to use the full-width colon then let's update them here and we can file an issue with the translation team to get them synced.
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.
There's more full width colons spread around in different properties files and I think the translation team just revisits lines and decides to change the colon, so these changes look a bit random to us. I've updated these specific colons to full width for now but I think it might be better to just let the translation team update them for each drop.
Co-authored-by: Christian Stein <[email protected]>
…avac_de.properties Co-authored-by: Christian Stein <[email protected]>
…auncher_de.properties Co-authored-by: Christian Stein <[email protected]>
|
Currently running tests and everything looks green so far, @aivanov-jdk @sormuras do the German localizations look fine? |
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.
Overall looks correct to me, and it seems you addressed all of the suggestions left by other reviewers. I skimmed most of the files for any glaring issues and also spot checked a few to make sure their associated English file had the correct corresponding change.
Left some small comments which should be addressed.
@@ -33,7 +33,7 @@ MSG_Help_win_install=\ --win-dir-chooser\n Fügt ein Dialogfeld hinzu, | |||
MSG_Help_win_install_dir=Relativer Unterpfad unter dem Standardinstallationsverzeichnis\n | |||
MSG_Help_mac_install=\ --mac-dmg-content <Pfad zu zusätzlichem Inhalt>[,<Pfad zu zusätzlichem Inhalt>...]\n Nimmt den gesamten referenzierten Inhalt in die DMG-Datei auf.\n Diese Option kann mehrmals verwendet werden. \n | |||
MSG_Help_mac_launcher=\ --mac-package-identifier <ID-Zeichenfolge>\n Eine ID, die die Anwendung für macOS eindeutig identifiziert\n Standardwert ist der Hauptklassenname.\n Es dürfen nur alphanumerische Zeichen (A-Z, a-z, 0-9), Bindestriche (-)\n und Punkte (.) verwendet werden.\n --mac-package-name <Namenszeichenfolge>\n Name der Anwendung, wie in der Menüleiste angezeigt\n Dieser kann vom Anwendungsnamen abweichen.\n Er darf maximal 15 Zeichen enthalten und muss für die Anzeige\n in der Menüleiste und im Infofenster der Anwendung geeignet sein.\n Standardwert: Anwendungsname.\n --mac-package-signing-prefix <Präfixzeichenfolge>\n Beim Signieren des Anwendungspackages wird dieser Wert\n allen zu signierenden Komponenten ohne vorhandene\n Package-ID als Präfix vorangestellt.\n --mac-sign\n Anforderung zum Signieren des Packages oder des vordefinierten\nAnwendungsimages\n --mac-signing-keychain <Schlüsselbundname>\n Name des Schlüsselbundes für die Suche nach der Signaturidentität\n Bei fehlender Angabe werden die Standardschlüsselbunde verwendet.\n --mac-signing-key-user-name <Teamname>\n Team- oder Benutzernamensteil der Apple-Signaturidentitäten. Um direkt zu steuern,\n welche Signaturidentität zum Signieren eines Anwendungsimages oder\n Installationsprogramms verwendet wird, verwenden Sie --mac-app-image-sign-identity und/oder\n --mac-installer-sign-identity. Diese Option kann nicht mit\n --mac-app-image-sign-identity oder --mac-installer-sign-identity kombiniert werden.\n --mac-app-image-sign-identity <identity>\n Zum Signieren des Anwendungsimages verwendete Identität. Dieser Wert wird\n direkt an die Option --sign des Tools "codesign" übergeben. Diese Option kann nicht\n mit --mac-signing-key-user-name kombiniert werden.\n --mac-installer-sign-identity <identity>\n Zum Signieren des Installationsprogramms "pkg" verwendete Identität. Dieser Wert wird\n direkt an die Option --sign des Tools "productbuild" übergeben. Diese Option\n kann nicht mit --mac-signing-key-user-name kombiniert werden.\n --mac-app-store\n Gibt an, dass die jpackage-Ausgabe für den\n Mac App Store bestimmt ist.\n --mac-entitlements <Dateipfad>\n Pfad zu einer Datei mit Berechtigungen, die beim Signieren\n von ausführbaren Dateien und Librarys im Bundle verwendet werden sollen.\n --mac-app-category <Kategoriezeichenfolge>\n Zeichenfolge für das Erstellen von LSApplicationCategoryType in\n Anwendungs-plist. Standardwert: "utilities".\n | |||
MSG_Help_linux_install=\ --linux-package-name <Packagename>\n Name für das Linux-Package, Standardwert: Anwendungsname\n --linux-deb-maintainer <E-Mail-Adresse>\n Maintainer für .deb-Package\n --linux-menu-group <Menügruppenname>\n Menügruppe, in der diese Anwendung abgelegt wird\n --linux-package-deps <package-dep-string>\n Erforderliche Packages oder Funktionen für die Anwendung\n --linux-rpm-license-type <Typzeichenfolge>\n Typ der Lizenz ("License: <Wert>" der RPM-SPEC-Datei)\n --linux-app-release <Releasewert>\n Releasewert der RPM-SPEC-Datei <Name> oder \n Debian-Revisionswert der DEB-Kontrolldatei\n --linux-app-category <Kategoriewert>\n Gruppenwert der RPM-SPEC-Datei <Name> oder \n Abschnittswert der DEB-Kontrolldatei\n --linux-shortcut\n Erstellt eine Verknüpfung für die Anwendung.\n |
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.
"package-dep-string" is within "<>" and should not be translated. ja and zh_CN locales remain un-translated as well. I'd like this particular one to be reverted back and we can file an issue with the translation team.
@@ -1,20 +1,20 @@ | |||
<?xml version="1.0" encoding="utf-8"?> |
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.
This change can be reverted, the English file should not be touched anyways during l10n.
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.
German _de
translations look good to me.
This issue is responsible for updating the translations of all the localize(able) resources in the JDK since the previous L10n drop.
Progress
Issue
Reviewers
Reviewing
Using
git
Checkout this PR locally:
$ git fetch https://git.openjdk.org/jdk.git pull/25839/head:pull/25839
$ git checkout pull/25839
Update a local copy of the PR:
$ git checkout pull/25839
$ git pull https://git.openjdk.org/jdk.git pull/25839/head
Using Skara CLI tools
Checkout this PR locally:
$ git pr checkout 25839
View PR using the GUI difftool:
$ git pr show -t 25839
Using diff file
Download this PR as a diff file:
https://git.openjdk.org/jdk/pull/25839.diff
Using Webrev
Link to Webrev Comment