-
Bug
-
Resolution: Fixed
-
P3
-
5.0
-
b42
-
generic
-
generic
Need to reflect changes made to fix 4855840, 4866613 and 4953487.
In summary, it fixes duplicate mnemonic codes and adds additional media strings.
Regression tests used:
test/java/awt/print/Dialog/PrintDlgApp.java
test/java/awt/PrintJob/PageDimension/Printing.java
Here is the diff of changes:
*** 13,28 ****
border.margins=Margins
#
button.cancel=Cancel
- button.cancel.mnemonic=C
button.ok=OK
- button.ok.mnemonic=O
button.print=Print
- button.print.mnemonic=P
button.properties=Properties...
button.properties.mnemonic=R
#
checkbox.collate=Collate
! checkbox.collate.mnemonic=L
checkbox.jobsheets=Banner Page
checkbox.jobsheets.mnemonic=B
checkbox.printtofile=Print To File
--- 13,25 ----
border.margins=Margins
#
button.cancel=Cancel
button.ok=OK
button.print=Print
button.properties=Properties...
button.properties.mnemonic=R
#
checkbox.collate=Collate
! checkbox.collate.mnemonic=C
checkbox.jobsheets=Banner Page
checkbox.jobsheets.mnemonic=B
checkbox.printtofile=Print To File
***************
*** 65,73 ****
label.rightmargin.mnemonic=R
#
radiobutton.color=Color
! radiobutton.color.mnemonic=L
radiobutton.draftq=Draft
! radiobutton.draftq.mnemonic=D
radiobutton.duplex=Duplex
radiobutton.duplex.mnemonic=D
radiobutton.highq=High
--- 62,70 ----
label.rightmargin.mnemonic=R
#
radiobutton.color=Color
! radiobutton.color.mnemonic=C
radiobutton.draftq=Draft
! radiobutton.draftq.mnemonic=F
radiobutton.duplex=Duplex
radiobutton.duplex.mnemonic=D
radiobutton.highq=High
***************
*** 79,91 ****
radiobutton.normalq=Normal
radiobutton.normalq.mnemonic=N
radiobutton.oneside=One Side
! radiobutton.oneside.mnemonic=S
radiobutton.portrait=Portrait
! radiobutton.portrait.mnemonic=R
radiobutton.rangeall=All
! radiobutton.rangeall.mnemonic=A
radiobutton.rangepages=Pages
! radiobutton.rangepages.mnemonic=G
radiobutton.revlandscape=Reverse Landscape
radiobutton.revlandscape.mnemonic=N
radiobutton.revportrait=Reverse Portrait
--- 76,88 ----
radiobutton.normalq=Normal
radiobutton.normalq.mnemonic=N
radiobutton.oneside=One Side
! radiobutton.oneside.mnemonic=O
radiobutton.portrait=Portrait
! radiobutton.portrait.mnemonic=P
radiobutton.rangeall=All
! radiobutton.rangeall.mnemonic=L
radiobutton.rangepages=Pages
! radiobutton.rangepages.mnemonic=E
radiobutton.revlandscape=Reverse Landscape
radiobutton.revlandscape.mnemonic=N
radiobutton.revportrait=Reverse Portrait
***************
*** 108,113 ****
--- 105,112 ----
# (in some cases the space character is replaced by '-' and the pound
# character is replaced with 'n')
#
+ iso-4a0=4A0 (ISO/DIN & JIS)
+ iso-2a0=2A0 (ISO/DIN & JIS)
iso-a0=A0 (ISO/DIN & JIS)
iso-a1=A1 (ISO/DIN & JIS)
iso-a2=A2 (ISO/DIN & JIS)
***************
*** 148,153 ****
--- 147,156 ----
iso-c4=C4 (ISO/DIN)
iso-c5=C5 (ISO/DIN)
iso-c6=C6 (ISO/DIN)
+ iso-c7=C7 (ISO/DIN)
+ iso-c8=C8 (ISO/DIN)
+ iso-c9=C9 (ISO/DIN)
+ iso-c10=C10 (ISO/DIN)
na-letter=Letter
na-legal=Legal
executive=Executive
***************
*** 165,170 ****
--- 168,175 ----
e=Engineering E
iso-designated-long=ISO Designated Long
italian-envelope=Italy Envelope
+ italy-envelope=Italy Envelope
+ invite-envelope=Invitation Envelope
monarch-envelope=Monarch Envelope
personal-envelope=Personal Envelope
na-number-9-envelope=No. 9 Envelope
=========================================================
In summary, it fixes duplicate mnemonic codes and adds additional media strings.
Regression tests used:
test/java/awt/print/Dialog/PrintDlgApp.java
test/java/awt/PrintJob/PageDimension/Printing.java
Here is the diff of changes:
*** 13,28 ****
border.margins=Margins
#
button.cancel=Cancel
- button.cancel.mnemonic=C
button.ok=OK
- button.ok.mnemonic=O
button.print=Print
- button.print.mnemonic=P
button.properties=Properties...
button.properties.mnemonic=R
#
checkbox.collate=Collate
! checkbox.collate.mnemonic=L
checkbox.jobsheets=Banner Page
checkbox.jobsheets.mnemonic=B
checkbox.printtofile=Print To File
--- 13,25 ----
border.margins=Margins
#
button.cancel=Cancel
button.ok=OK
button.print=Print
button.properties=Properties...
button.properties.mnemonic=R
#
checkbox.collate=Collate
! checkbox.collate.mnemonic=C
checkbox.jobsheets=Banner Page
checkbox.jobsheets.mnemonic=B
checkbox.printtofile=Print To File
***************
*** 65,73 ****
label.rightmargin.mnemonic=R
#
radiobutton.color=Color
! radiobutton.color.mnemonic=L
radiobutton.draftq=Draft
! radiobutton.draftq.mnemonic=D
radiobutton.duplex=Duplex
radiobutton.duplex.mnemonic=D
radiobutton.highq=High
--- 62,70 ----
label.rightmargin.mnemonic=R
#
radiobutton.color=Color
! radiobutton.color.mnemonic=C
radiobutton.draftq=Draft
! radiobutton.draftq.mnemonic=F
radiobutton.duplex=Duplex
radiobutton.duplex.mnemonic=D
radiobutton.highq=High
***************
*** 79,91 ****
radiobutton.normalq=Normal
radiobutton.normalq.mnemonic=N
radiobutton.oneside=One Side
! radiobutton.oneside.mnemonic=S
radiobutton.portrait=Portrait
! radiobutton.portrait.mnemonic=R
radiobutton.rangeall=All
! radiobutton.rangeall.mnemonic=A
radiobutton.rangepages=Pages
! radiobutton.rangepages.mnemonic=G
radiobutton.revlandscape=Reverse Landscape
radiobutton.revlandscape.mnemonic=N
radiobutton.revportrait=Reverse Portrait
--- 76,88 ----
radiobutton.normalq=Normal
radiobutton.normalq.mnemonic=N
radiobutton.oneside=One Side
! radiobutton.oneside.mnemonic=O
radiobutton.portrait=Portrait
! radiobutton.portrait.mnemonic=P
radiobutton.rangeall=All
! radiobutton.rangeall.mnemonic=L
radiobutton.rangepages=Pages
! radiobutton.rangepages.mnemonic=E
radiobutton.revlandscape=Reverse Landscape
radiobutton.revlandscape.mnemonic=N
radiobutton.revportrait=Reverse Portrait
***************
*** 108,113 ****
--- 105,112 ----
# (in some cases the space character is replaced by '-' and the pound
# character is replaced with 'n')
#
+ iso-4a0=4A0 (ISO/DIN & JIS)
+ iso-2a0=2A0 (ISO/DIN & JIS)
iso-a0=A0 (ISO/DIN & JIS)
iso-a1=A1 (ISO/DIN & JIS)
iso-a2=A2 (ISO/DIN & JIS)
***************
*** 148,153 ****
--- 147,156 ----
iso-c4=C4 (ISO/DIN)
iso-c5=C5 (ISO/DIN)
iso-c6=C6 (ISO/DIN)
+ iso-c7=C7 (ISO/DIN)
+ iso-c8=C8 (ISO/DIN)
+ iso-c9=C9 (ISO/DIN)
+ iso-c10=C10 (ISO/DIN)
na-letter=Letter
na-legal=Legal
executive=Executive
***************
*** 165,170 ****
--- 168,175 ----
e=Engineering E
iso-designated-long=ISO Designated Long
italian-envelope=Italy Envelope
+ italy-envelope=Italy Envelope
+ invite-envelope=Invitation Envelope
monarch-envelope=Monarch Envelope
personal-envelope=Personal Envelope
na-number-9-envelope=No. 9 Envelope
=========================================================