Skip to content

Commit 4138921

Browse files
authored
Merge 432a534 into 4cf729c
2 parents 4cf729c + 432a534 commit 4138921

File tree

90 files changed

+9616
-9616
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

90 files changed

+9616
-9616
lines changed

src/demo/share/jfc/Stylepad/HelloWorld.java

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -187,22 +187,22 @@ static class Run {
187187
new Run("none", "Hello from Cupertino")
188188
}),
189189
new Paragraph("title", new Run[] {
190-
new Run("none", "\u53F0\u5317\u554F\u5019\u60A8\u0021")
190+
new Run("none", "台北問候您!")
191191
}),
192192
new Paragraph("title", new Run[] {
193-
new Run("none", "\u0391\u03B8\u03B7\u03BD\u03B1\u03B9\u0020" // Greek
194-
+ "\u03B1\u03C3\u03C0\u03B1\u03B6\u03BF\u03BD"
195-
+ "\u03C4\u03B1\u03B9\u0020\u03C5\u03BC\u03B1"
196-
+ "\u03C2\u0021")
193+
new Run("none", "Αθηναι " // Greek
194+
+ "ασπαζον"
195+
+ "ται υμα"
196+
+ "ς!")
197197
}),
198198
new Paragraph("title", new Run[] {
199-
new Run("none", "\u6771\u4eac\u304b\u3089\u4eca\u65e5\u306f")
199+
new Run("none", "東京から今日は")
200200
}),
201201
new Paragraph("title", new Run[] {
202-
new Run("none", "\u05e9\u05dc\u05d5\u05dd \u05de\u05d9\u05e8\u05d5"
203-
+ "\u05e9\u05dc\u05d9\u05dd")
202+
new Run("none", "שלום מירו"
203+
+ "שלים")
204204
}),
205205
new Paragraph("title", new Run[] {
206-
new Run("none", "\u0633\u0644\u0627\u0645")
206+
new Run("none", "سلام")
207207
}), };
208208
}

src/java.base/share/classes/sun/text/resources/JavaTimeSupplementary.java

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -232,25 +232,25 @@ protected final Object[][] getContents() {
232232
"Sha.",
233233
"Ram.",
234234
"Shaw.",
235-
"Dhu\u02bbl-Q.",
236-
"Dhu\u02bbl-H.",
235+
"Dhuʻl-Q.",
236+
"Dhuʻl-H.",
237237
"",
238238
}
239239
},
240240
{ "islamic.MonthNames",
241241
new String[] {
242242
"Muharram",
243243
"Safar",
244-
"Rabi\u02bb I",
245-
"Rabi\u02bb II",
244+
"Rabiʻ I",
245+
"Rabiʻ II",
246246
"Jumada I",
247247
"Jumada II",
248248
"Rajab",
249-
"Sha\u02bbban",
249+
"Shaʻban",
250250
"Ramadan",
251251
"Shawwal",
252-
"Dhu\u02bbl-Qi\u02bbdah",
253-
"Dhu\u02bbl-Hijjah",
252+
"Dhuʻl-Qiʻdah",
253+
"Dhuʻl-Hijjah",
254254
"",
255255
}
256256
},

0 commit comments

Comments
 (0)