Mercurial > hg > openjdk > jdk8u > jdk
changeset 13015:2a041b1f858d jdk8u172-b11
Merge
author | asaha |
---|---|
date | Wed, 28 Mar 2018 08:43:13 -0700 |
parents | 27d24b7fddc6 (current diff) 07e8e63a872c (diff) |
children | 5ccc572f4ffe |
files | .hgtags |
diffstat | 6 files changed, 12 insertions(+), 11 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgtags Mon Mar 19 12:13:39 2018 -0700 +++ b/.hgtags Wed Mar 28 08:43:13 2018 -0700 @@ -868,6 +868,7 @@ 9a59252d179a2a488e094cd28b58d86edbf454a0 jdk8u171-b08 4617f1da787289f41d2a7e50d6859d85c005c857 jdk8u171-b09 2212d32912153d4a963cc8d782163ea30d34d1f6 jdk8u171-b10 +5ccb2d5ec23d188394fdd87bda27b6e53eeb8f0d jdk8u171-b11 64df143be721d3ef031d765d86277c1e114d627a jdk8u172-b00 25f7b0cd25cf13106783050fc8e6f4a78487a7bd jdk8u172-b01 db8272cb8c99eea536a66c4c368c4bf2bf013a81 jdk8u172-b02
--- a/src/share/classes/com/sun/rowset/RowSetResourceBundle_sv.properties Mon Mar 19 12:13:39 2018 -0700 +++ b/src/share/classes/com/sun/rowset/RowSetResourceBundle_sv.properties Wed Mar 28 08:43:13 2018 -0700 @@ -1,5 +1,5 @@ # -# Copyright (c) 2005, 2017, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2005, 2018, Oracle and/or its affiliates. All rights reserved. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # # This code is free software; you can redistribute it and/or modify it @@ -122,7 +122,7 @@ crsreader.caldetected = En kalender har identifierats #CachedRowSetWriter exceptions -crswriter.connect = Kan inte uppr\u00E4tta n\u00E5gon anslutning +crswriter.connect = Kan inte uppr\u00E4tta anslutning crswriter.tname = writeData kan inte fastst\u00E4lla tabellnamnet crswriter.params1 = Parameterv\u00E4rde1: {0} crswriter.params2 = Parameterv\u00E4rde2: {0}
--- a/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_sv.properties Mon Mar 19 12:13:39 2018 -0700 +++ b/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_sv.properties Wed Mar 28 08:43:13 2018 -0700 @@ -66,7 +66,7 @@ FileChooser.cancelButtonToolTip.textAndMnemonic=Avbryt dialogrutan f\u00F6r filval FileChooser.saveButtonToolTip.textAndMnemonic=Spara vald fil FileChooser.openButtonToolTip.textAndMnemonic=\u00D6ppna vald fil -FileChooser.updateButtonToolTip.textAndMnemonic=Uppdatera kataloglistan +FileChooser.updateButtonToolTip.textAndMnemonic=Uppdatera kataloglista FileChooser.helpButtonToolTip.textAndMnemonic=Hj\u00E4lp f\u00F6r val av fil FileChooser.directoryOpenButtonToolTip.textAndMnemonic=\u00D6ppna vald katalog
--- a/src/share/classes/sun/security/tools/keytool/Resources_de.java Mon Mar 19 12:13:39 2018 -0700 +++ b/src/share/classes/sun/security/tools/keytool/Resources_de.java Wed Mar 28 08:43:13 2018 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000, 2017, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -425,11 +425,11 @@ // 8171319: keytool should print out warnings when reading or // generating cert/cert req using weak algorithms - {"the.certificate.request", "Die Zertifikatsanforderung"}, + {"the.certificate.request", "Die Zertifikatanforderung"}, {"the.issuer", "Der Aussteller"}, {"the.generated.certificate", "Das generierte Zertifikat"}, {"the.generated.crl", "Die generierte CRL"}, - {"the.generated.certificate.request", "Die generierte Zertifikatsanforderung"}, + {"the.generated.certificate.request", "Die generierte Zertifikatanforderung"}, {"the.certificate", "Das Zertifikat"}, {"the.crl", "Die CRL"}, {"the.tsa.certificate", "Das TSA-Zertifikat"}, @@ -444,7 +444,7 @@ {".PATTERN.printX509Cert.with.weak", "Eigent\u00FCmer: {0}\nAussteller: {1}\nSeriennummer: {2}\nG\u00FCltig von: {3} bis: {4}\nZertifikatfingerprints:\n\t MD5: {5}\n\t SHA1: {6}\n\t SHA256: {7}\nSignaturalgorithmusname: {8}\nAlgorithmus des Public Key von Betreff: {9}\nVersion: {10}"}, {"PKCS.10.with.weak", - "PKCS #10-Zertifikatsanforderung (Version 1.0)\nSubject: %1$s\nFormat: %2$s\nPublic Key: %3$s\nSignaturalgorithmus: %4$s\n"}, + "PKCS #10-Zertifikatanforderung (Version 1.0)\nSubject: %1$s\nFormat: %2$s\nPublic Key: %3$s\nSignaturalgorithmus: %4$s\n"}, {"verified.by.s.in.s.weak", "Von %1$s in %2$s mit %3$s verifiziert"}, {"whose.sigalg.risk", "%1$s verwendet den Signaturalgorithmus %2$s. Dies gilt als Sicherheitsrisiko."}, {"whose.key.risk", "%1$s verwendet %2$s. Dies gilt als Sicherheitsrisiko."},
--- a/src/share/classes/sun/security/tools/policytool/Resources_sv.java Mon Mar 19 12:13:39 2018 -0700 +++ b/src/share/classes/sun/security/tools/policytool/Resources_sv.java Wed Mar 28 08:43:13 2018 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000, 2017, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -111,7 +111,7 @@ "Kan inte specificera identitetshavare utan namn"}, {"Permission.and.Target.Name.must.have.a.value", "Beh\u00F6righet och m\u00E5lnamn m\u00E5ste ha ett v\u00E4rde"}, - {"Remove.this.Policy.Entry.", "Vill du ta bort den h\u00E4r policyposten?"}, + {"Remove.this.Policy.Entry.", "Vill du ta bort policyposten?"}, {"Overwrite.File", "Skriv \u00F6ver fil"}, {"Policy.successfully.written.to.filename", "Policy har skrivits till {0}"},
--- a/src/share/classes/sun/security/util/Resources_sv.java Mon Mar 19 12:13:39 2018 -0700 +++ b/src/share/classes/sun/security/util/Resources_sv.java Wed Mar 28 08:43:13 2018 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000, 2017, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -36,7 +36,7 @@ // javax.security.auth.PrivateCredentialPermission {"invalid.null.input.s.", "ogiltiga null-indata"}, - {"actions.can.only.be.read.", "funktioner kan endast 'l\u00E4sas'"}, + {"actions.can.only.be.read.", "\u00E5tg\u00E4rder kan endast 'l\u00E4sas'"}, {"permission.name.name.syntax.invalid.", "syntaxen f\u00F6r beh\u00F6righetsnamnet [{0}] \u00E4r ogiltig: "}, {"Credential.Class.not.followed.by.a.Principal.Class.and.Name",