/hg/release/icedtea7-forest-2.5/jaxp: 5 new changesets
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Mon Jul 20 15:45:46 UTC 2015
changeset d3748097ab5b in /hg/release/icedtea7-forest-2.5/jaxp
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/jaxp?cmd=changeset;node=d3748097ab5b
author: aefimov
date: Thu Apr 09 16:23:43 2015 +0300
8073385: Bad error message on parsing illegal character in XML attribute
Reviewed-by: joehw
changeset 13337054d401 in /hg/release/icedtea7-forest-2.5/jaxp
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/jaxp?cmd=changeset;node=13337054d401
author: aefimov
date: Tue Jan 27 15:04:56 2015 +0300
8062923: XSL: Run-time internal error in 'substring()'
8062924: XSL: wrong answer from substring() function
Reviewed-by: joehw
changeset 4f64b6dc1260 in /hg/release/icedtea7-forest-2.5/jaxp
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/jaxp?cmd=changeset;node=4f64b6dc1260
author: aefimov
date: Fri Apr 10 01:10:10 2015 +0300
8074297: substring in XSLT returns wrong character if string contains supplementary chars
8076290: JCK test api/xsl/conf/string/string17 starts failing after JDK-8074297
Reviewed-by: joehw
changeset 3d9457280537 in /hg/release/icedtea7-forest-2.5/jaxp
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/jaxp?cmd=changeset;node=3d9457280537
author: mfang
date: Mon May 18 10:05:09 2015 -0700
8080318: jdk8u51 l10n resource file translation update
Reviewed-by: joehw, yhuang
changeset 7f353c5a7400 in /hg/release/icedtea7-forest-2.5/jaxp
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/jaxp?cmd=changeset;node=7f353c5a7400
author: andrew
date: Mon Jul 20 16:43:55 2015 +0100
Added tag icedtea-2.5.6 for changeset 3d9457280537
diffstat:
.hgtags | 1 +
src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_sv.java | 8 +-
src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_de.java | 3 +
src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_es.java | 3 +
src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_fr.java | 3 +
src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_it.java | 3 +
src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_ja.java | 3 +
src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_ko.java | 3 +
src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_pt_BR.java | 3 +
src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_sv.java | 3 +
src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_zh_CN.java | 3 +
src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_zh_TW.java | 3 +
src/com/sun/org/apache/xalan/internal/xsltc/runtime/BasisLibrary.java | 28 ++++++---
src/com/sun/org/apache/xerces/internal/impl/XMLDTDScannerImpl.java | 2 +-
src/com/sun/org/apache/xerces/internal/impl/XMLDocumentFragmentScannerImpl.java | 2 +-
src/com/sun/org/apache/xerces/internal/impl/XMLNSDocumentScannerImpl.java | 2 +-
src/com/sun/org/apache/xerces/internal/impl/XMLScanner.java | 11 ++-
src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_sv.properties | 2 +-
src/com/sun/org/apache/xml/internal/res/XMLErrorResources_sv.java | 4 +-
src/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_sv.java | 8 +-
20 files changed, 69 insertions(+), 29 deletions(-)
diffs (378 lines):
diff -r 615cc3030a2a -r 7f353c5a7400 .hgtags
--- a/.hgtags Sat Jul 18 00:45:25 2015 +0100
+++ b/.hgtags Mon Jul 20 16:43:55 2015 +0100
@@ -577,3 +577,4 @@
80b5a93b1406e1799e65086a6e2ad289fdab71d4 icedtea-2.5.5
9f1c230ad1c0aebbe6b95dcb5a4aae0b34ca6200 icedtea-2.5.6pre01
1ec4219703e91d3cb075f9ef7f0f1b78343a9750 icedtea-2.5.6pre02
+3d9457280537c4d4edc243960cfc8660dd2980fc icedtea-2.5.6
diff -r 615cc3030a2a -r 7f353c5a7400 src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_sv.java
--- a/src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_sv.java Sat Jul 18 00:45:25 2015 +0100
+++ b/src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_sv.java Mon Jul 20 16:43:55 2015 +0100
@@ -1226,10 +1226,10 @@
"Gammal syntax: Namnet p\u00E5 'expr'-attributet har \u00E4ndrats till 'select'."},
{ WG_NO_LOCALE_IN_FORMATNUMBER,
- "Xalan hanterar \u00E4nnu inte spr\u00E5knamnet i funktionen format-number."},
+ "Xalan hanterar \u00E4nnu inte spr\u00E5kkonventionen i funktionen format-number."},
{ WG_LOCALE_NOT_FOUND,
- "Varning: Hittade inte spr\u00E5kinst\u00E4llning f\u00F6r xml:lang={0}"},
+ "Varning: Hittade inte spr\u00E5kkonvention f\u00F6r xml:lang={0}"},
{ WG_CANNOT_MAKE_URL_FROM,
"Kan inte skapa URL fr\u00E5n: {0}"},
@@ -1329,8 +1329,8 @@
{ "version", ">>>>>>> Xalan version "},
{ "version2", "<<<<<<<"},
{ "yes", "ja"},
- { "line", "Rad #"},
- { "column","Kolumn #"},
+ { "line", "Rad nr"},
+ { "column","Kolumn nr"},
{ "xsldone", "XSLProcessor: utf\u00F6rd"},
diff -r 615cc3030a2a -r 7f353c5a7400 src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_de.java
--- a/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_de.java Sat Jul 18 00:45:25 2015 +0100
+++ b/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_de.java Mon Jul 20 16:43:55 2015 +0100
@@ -600,6 +600,9 @@
{ErrorMsg.JAXP_INVALID_ATTR_ERR,
"TransformerFactory erkennt Attribut \"{0}\" nicht."},
+ {ErrorMsg.JAXP_INVALID_ATTR_VALUE_ERR,
+ "Falscher Wert f\u00FCr Attribut ''{0}'' angegeben."},
+
/*
* Note to translators: "setResult()" and "startDocument()" are Java
* method names that should not be translated.
diff -r 615cc3030a2a -r 7f353c5a7400 src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_es.java
--- a/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_es.java Sat Jul 18 00:45:25 2015 +0100
+++ b/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_es.java Mon Jul 20 16:43:55 2015 +0100
@@ -600,6 +600,9 @@
{ErrorMsg.JAXP_INVALID_ATTR_ERR,
"TransformerFactory no reconoce el atributo ''{0}''."},
+ {ErrorMsg.JAXP_INVALID_ATTR_VALUE_ERR,
+ "Valor no v\u00E1lido especificado para el atributo ''{0}''."},
+
/*
* Note to translators: "setResult()" and "startDocument()" are Java
* method names that should not be translated.
diff -r 615cc3030a2a -r 7f353c5a7400 src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_fr.java
--- a/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_fr.java Sat Jul 18 00:45:25 2015 +0100
+++ b/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_fr.java Mon Jul 20 16:43:55 2015 +0100
@@ -600,6 +600,9 @@
{ErrorMsg.JAXP_INVALID_ATTR_ERR,
"TransformerFactory ne reconna\u00EEt pas l''attribut ''{0}''."},
+ {ErrorMsg.JAXP_INVALID_ATTR_VALUE_ERR,
+ "La valeur indiqu\u00E9e pour l''attribut ''{0}'' est incorrecte."},
+
/*
* Note to translators: "setResult()" and "startDocument()" are Java
* method names that should not be translated.
diff -r 615cc3030a2a -r 7f353c5a7400 src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_it.java
--- a/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_it.java Sat Jul 18 00:45:25 2015 +0100
+++ b/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_it.java Mon Jul 20 16:43:55 2015 +0100
@@ -600,6 +600,9 @@
{ErrorMsg.JAXP_INVALID_ATTR_ERR,
"TransformerFactory non riconosce l''attributo ''{0}''."},
+ {ErrorMsg.JAXP_INVALID_ATTR_VALUE_ERR,
+ "Valore errato specificato per l''attributo ''{0}''."},
+
/*
* Note to translators: "setResult()" and "startDocument()" are Java
* method names that should not be translated.
diff -r 615cc3030a2a -r 7f353c5a7400 src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_ja.java
--- a/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_ja.java Sat Jul 18 00:45:25 2015 +0100
+++ b/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_ja.java Mon Jul 20 16:43:55 2015 +0100
@@ -600,6 +600,9 @@
{ErrorMsg.JAXP_INVALID_ATTR_ERR,
"TransformerFactory\u306F\u5C5E\u6027''{0}''\u3092\u8A8D\u8B58\u3057\u307E\u305B\u3093\u3002"},
+ {ErrorMsg.JAXP_INVALID_ATTR_VALUE_ERR,
+ "''{0}''\u5C5E\u6027\u306B\u6307\u5B9A\u3055\u308C\u305F\u5024\u304C\u6B63\u3057\u304F\u3042\u308A\u307E\u305B\u3093\u3002"},
+
/*
* Note to translators: "setResult()" and "startDocument()" are Java
* method names that should not be translated.
diff -r 615cc3030a2a -r 7f353c5a7400 src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_ko.java
--- a/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_ko.java Sat Jul 18 00:45:25 2015 +0100
+++ b/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_ko.java Mon Jul 20 16:43:55 2015 +0100
@@ -600,6 +600,9 @@
{ErrorMsg.JAXP_INVALID_ATTR_ERR,
"TransformerFactory\uC5D0\uC11C ''{0}'' \uC18D\uC131\uC744 \uC778\uC2DD\uD558\uC9C0 \uBABB\uD588\uC2B5\uB2C8\uB2E4."},
+ {ErrorMsg.JAXP_INVALID_ATTR_VALUE_ERR,
+ "''{0}'' \uC18D\uC131\uC5D0 \uB300\uD574 \uC62C\uBC14\uB974\uC9C0 \uC54A\uC740 \uAC12\uC774 \uC9C0\uC815\uB418\uC5C8\uC2B5\uB2C8\uB2E4."},
+
/*
* Note to translators: "setResult()" and "startDocument()" are Java
* method names that should not be translated.
diff -r 615cc3030a2a -r 7f353c5a7400 src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_pt_BR.java
--- a/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_pt_BR.java Sat Jul 18 00:45:25 2015 +0100
+++ b/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_pt_BR.java Mon Jul 20 16:43:55 2015 +0100
@@ -600,6 +600,9 @@
{ErrorMsg.JAXP_INVALID_ATTR_ERR,
"TransformerFactory n\u00E3o reconhece o atributo ''{0}''."},
+ {ErrorMsg.JAXP_INVALID_ATTR_VALUE_ERR,
+ "Valor incorreto especificado para o atributo ''{0}''."},
+
/*
* Note to translators: "setResult()" and "startDocument()" are Java
* method names that should not be translated.
diff -r 615cc3030a2a -r 7f353c5a7400 src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_sv.java
--- a/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_sv.java Sat Jul 18 00:45:25 2015 +0100
+++ b/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_sv.java Mon Jul 20 16:43:55 2015 +0100
@@ -600,6 +600,9 @@
{ErrorMsg.JAXP_INVALID_ATTR_ERR,
"TransformerFactory k\u00E4nner inte igen attributet ''{0}''."},
+ {ErrorMsg.JAXP_INVALID_ATTR_VALUE_ERR,
+ "Fel v\u00E4rde har angetts f\u00F6r attributet ''{0}''."},
+
/*
* Note to translators: "setResult()" and "startDocument()" are Java
* method names that should not be translated.
diff -r 615cc3030a2a -r 7f353c5a7400 src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_zh_CN.java
--- a/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_zh_CN.java Sat Jul 18 00:45:25 2015 +0100
+++ b/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_zh_CN.java Mon Jul 20 16:43:55 2015 +0100
@@ -600,6 +600,9 @@
{ErrorMsg.JAXP_INVALID_ATTR_ERR,
"TransformerFactory \u65E0\u6CD5\u8BC6\u522B\u5C5E\u6027 ''{0}''\u3002"},
+ {ErrorMsg.JAXP_INVALID_ATTR_VALUE_ERR,
+ "\u4E3A ''{0}'' \u5C5E\u6027\u6307\u5B9A\u7684\u503C\u4E0D\u6B63\u786E\u3002"},
+
/*
* Note to translators: "setResult()" and "startDocument()" are Java
* method names that should not be translated.
diff -r 615cc3030a2a -r 7f353c5a7400 src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_zh_TW.java
--- a/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_zh_TW.java Sat Jul 18 00:45:25 2015 +0100
+++ b/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_zh_TW.java Mon Jul 20 16:43:55 2015 +0100
@@ -600,6 +600,9 @@
{ErrorMsg.JAXP_INVALID_ATTR_ERR,
"TransformerFactory \u7121\u6CD5\u8FA8\u8B58\u5C6C\u6027 ''{0}''\u3002"},
+ {ErrorMsg.JAXP_INVALID_ATTR_VALUE_ERR,
+ "\u70BA ''{0}'' \u5C6C\u6027\u6307\u5B9A\u7684\u503C\u4E0D\u6B63\u78BA\u3002"},
+
/*
* Note to translators: "setResult()" and "startDocument()" are Java
* method names that should not be translated.
diff -r 615cc3030a2a -r 7f353c5a7400 src/com/sun/org/apache/xalan/internal/xsltc/runtime/BasisLibrary.java
--- a/src/com/sun/org/apache/xalan/internal/xsltc/runtime/BasisLibrary.java Sat Jul 18 00:45:25 2015 +0100
+++ b/src/com/sun/org/apache/xalan/internal/xsltc/runtime/BasisLibrary.java Mon Jul 20 16:43:55 2015 +0100
@@ -270,14 +270,15 @@
if (Double.isNaN(start))
return(EMPTYSTRING);
- final int strlen = value.length();
- int istart = (int)Math.round(start) - 1;
+ final int strlen = getStringLength(value);
+ int istart = (int)Math.round(start) - 1;
if (istart > strlen)
return(EMPTYSTRING);
if (istart < 1)
istart = 0;
try {
+ istart = value.offsetByCodePoints(0, istart);
return value.substring(istart);
} catch (IndexOutOfBoundsException e) {
runTimeError(RUN_TIME_INTERNAL_ERR, "substring()");
@@ -292,28 +293,35 @@
public static String substringF(String value, double start, double length) {
if (Double.isInfinite(start) ||
Double.isNaN(start) ||
- Double.isNaN(length))
+ Double.isNaN(length) ||
+ length < 0)
return(EMPTYSTRING);
- int istart = (int)Math.round(start) - 1;
+ int istart = (int)Math.round(start) - 1;
+ int ilength = (int)Math.round(length);
final int isum;
if (Double.isInfinite(length))
isum = Integer.MAX_VALUE;
else
- isum = istart + (int)Math.round(length);
+ isum = istart + ilength;
- final int strlen = value.length();
+ final int strlen = getStringLength(value);
if (isum < 0 || istart > strlen)
return(EMPTYSTRING);
- if (istart < 0)
+ if (istart < 0) {
+ ilength += istart;
istart = 0;
+ }
try {
- if (isum > strlen)
+ istart = value.offsetByCodePoints(0, istart);
+ if (isum > strlen) {
return value.substring(istart);
- else
- return value.substring(istart, isum);
+ } else {
+ int offset = value.offsetByCodePoints(istart, ilength);
+ return value.substring(istart, offset);
+ }
} catch (IndexOutOfBoundsException e) {
runTimeError(RUN_TIME_INTERNAL_ERR, "substring()");
return null;
diff -r 615cc3030a2a -r 7f353c5a7400 src/com/sun/org/apache/xerces/internal/impl/XMLDTDScannerImpl.java
--- a/src/com/sun/org/apache/xerces/internal/impl/XMLDTDScannerImpl.java Sat Jul 18 00:45:25 2015 +0100
+++ b/src/com/sun/org/apache/xerces/internal/impl/XMLDTDScannerImpl.java Mon Jul 20 16:43:55 2015 +0100
@@ -1418,7 +1418,7 @@
// AttValue
boolean isVC = !fStandalone && (fSeenExternalDTD || fSeenExternalPE) ;
scanAttributeValue(defaultVal, nonNormalizedDefaultVal, atName,
- fAttributes, 0, isVC);
+ fAttributes, 0, isVC, elName);
}
return defaultType;
diff -r 615cc3030a2a -r 7f353c5a7400 src/com/sun/org/apache/xerces/internal/impl/XMLDocumentFragmentScannerImpl.java
--- a/src/com/sun/org/apache/xerces/internal/impl/XMLDocumentFragmentScannerImpl.java Sat Jul 18 00:45:25 2015 +0100
+++ b/src/com/sun/org/apache/xerces/internal/impl/XMLDocumentFragmentScannerImpl.java Mon Jul 20 16:43:55 2015 +0100
@@ -1546,7 +1546,7 @@
scanAttributeValue(tmpStr, fTempString2,
fAttributeQName.rawname, attributes,
- attIndex, isVC);
+ attIndex, isVC, fCurrentElement.rawname);
// content
int oldLen = attributes.getLength();
diff -r 615cc3030a2a -r 7f353c5a7400 src/com/sun/org/apache/xerces/internal/impl/XMLNSDocumentScannerImpl.java
--- a/src/com/sun/org/apache/xerces/internal/impl/XMLNSDocumentScannerImpl.java Sat Jul 18 00:45:25 2015 +0100
+++ b/src/com/sun/org/apache/xerces/internal/impl/XMLNSDocumentScannerImpl.java Mon Jul 20 16:43:55 2015 +0100
@@ -438,7 +438,7 @@
XMLString tmpStr = getString();
scanAttributeValue(tmpStr, fTempString2,
fAttributeQName.rawname, attributes,
- attrIndex, isVC);
+ attrIndex, isVC, fCurrentElement.rawname);
String value = null;
//fTempString.toString();
diff -r 615cc3030a2a -r 7f353c5a7400 src/com/sun/org/apache/xerces/internal/impl/XMLScanner.java
--- a/src/com/sun/org/apache/xerces/internal/impl/XMLScanner.java Sat Jul 18 00:45:25 2015 +0100
+++ b/src/com/sun/org/apache/xerces/internal/impl/XMLScanner.java Mon Jul 20 16:43:55 2015 +0100
@@ -812,6 +812,7 @@
* @param attrIndex The index of the attribute to use from the list.
* @param checkEntities true if undeclared entities should be reported as VC violation,
* false if undeclared entities should be reported as WFC violation.
+ * @param eleName The name of element to which this attribute belongs.
*
* <strong>Note:</strong> This method uses fStringBuffer2, anything in it
* at the time of calling is lost.
@@ -820,13 +821,13 @@
XMLString nonNormalizedValue,
String atName,
XMLAttributes attributes, int attrIndex,
- boolean checkEntities)
+ boolean checkEntities, String eleName)
throws IOException, XNIException {
XMLStringBuffer stringBuffer = null;
// quote
int quote = fEntityScanner.peekChar();
if (quote != '\'' && quote != '"') {
- reportFatalError("OpenQuoteExpected", new Object[]{atName});
+ reportFatalError("OpenQuoteExpected", new Object[]{eleName, atName});
}
fEntityScanner.scanChar();
@@ -952,7 +953,7 @@
}
} else if (c == '<') {
reportFatalError("LessthanInAttValue",
- new Object[] { null, atName });
+ new Object[] { eleName, atName });
fEntityScanner.scanChar();
if (entityDepth == fEntityDepth && fNeedNonNormalizedValue) {
fStringBuffer2.append((char)c);
@@ -987,7 +988,7 @@
}
} else if (c != -1 && isInvalidLiteral(c)) {
reportFatalError("InvalidCharInAttValue",
- new Object[] {Integer.toString(c, 16)});
+ new Object[] {eleName, atName, Integer.toString(c, 16)});
fEntityScanner.scanChar();
if (entityDepth == fEntityDepth && fNeedNonNormalizedValue) {
fStringBuffer2.append((char)c);
@@ -1016,7 +1017,7 @@
// quote
int cquote = fEntityScanner.scanChar();
if (cquote != quote) {
- reportFatalError("CloseQuoteExpected", new Object[]{atName});
+ reportFatalError("CloseQuoteExpected", new Object[]{eleName, atName});
}
} // scanAttributeValue()
diff -r 615cc3030a2a -r 7f353c5a7400 src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_sv.properties
--- a/src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_sv.properties Sat Jul 18 00:45:25 2015 +0100
+++ b/src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_sv.properties Mon Jul 20 16:43:55 2015 +0100
@@ -121,7 +121,7 @@
InvalidByte = Ogiltig byte {0} i UTF-8-sekvensen f\u00F6r {1}-byte.
ExpectedByte = F\u00F6rv\u00E4ntad byte {0} i UTF-8-sekvensen f\u00F6r {1}-byte.
InvalidHighSurrogate = H\u00F6ga surrogatbitar i UTF-8-sekvens f\u00E5r inte \u00F6verskrida 0x10, men 0x{0} hittades.
- OperationNotSupported = Operation "{0}" st\u00F6ds inte i l\u00E4saren {1}.
+ OperationNotSupported = \u00C5tg\u00E4rden "{0}" st\u00F6ds inte i l\u00E4saren {1}.
InvalidASCII = Byte "{0}" ing\u00E5r inte i ASCII-teckenupps\u00E4ttningen (7 bitar).
CharConversionFailure = En enhet som fastst\u00E4lls anv\u00E4nda ett visst kodformat f\u00E5r inte inneh\u00E5lla sekvenser som \u00E4r otill\u00E5tna i kodningen.
diff -r 615cc3030a2a -r 7f353c5a7400 src/com/sun/org/apache/xml/internal/res/XMLErrorResources_sv.java
--- a/src/com/sun/org/apache/xml/internal/res/XMLErrorResources_sv.java Sat Jul 18 00:45:25 2015 +0100
+++ b/src/com/sun/org/apache/xml/internal/res/XMLErrorResources_sv.java Mon Jul 20 16:43:55 2015 +0100
@@ -378,8 +378,8 @@
{ "BAD_CODE", "Parameter f\u00F6r createMessage ligger utanf\u00F6r gr\u00E4nsv\u00E4rdet"},
{ "FORMAT_FAILED", "Undantag utl\u00F6st vid messageFormat-anrop"},
- { "line", "Rad #"},
- { "column","Kolumn #"},
+ { "line", "Rad nr"},
+ { "column","Kolumn nr"},
{ER_SERIALIZER_NOT_CONTENTHANDLER,
"Serializerklassen ''{0}'' implementerar inte org.xml.sax.ContentHandler."},
diff -r 615cc3030a2a -r 7f353c5a7400 src/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_sv.java
--- a/src/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_sv.java Sat Jul 18 00:45:25 2015 +0100
+++ b/src/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_sv.java Mon Jul 20 16:43:55 2015 +0100
@@ -483,7 +483,7 @@
"FEL! Hittade inte ENDOP efter OP_LOCATIONPATH"},
{ ER_ERROR_OCCURED,
- "Fel intr\u00E4ffade!"},
+ "Ett fel har intr\u00E4ffat!"},
{ ER_ILLEGAL_VARIABLE_REFERENCE,
"VariableReference angiven f\u00F6r variabel som \u00E4r utanf\u00F6r kontext eller som saknar definition! Namn = {0}"},
@@ -828,7 +828,7 @@
// Warnings...
{ WG_LOCALE_NAME_NOT_HANDLED,
- "spr\u00E5knamnet i funktionen format-number har \u00E4nnu inte hanterats!"},
+ "spr\u00E5kkonventionsnamnet i funktionen format-number har \u00E4nnu inte hanterats!"},
{ WG_PROPERTY_NOT_SUPPORTED,
"XSL-egenskapen st\u00F6ds inte: {0}"},
@@ -874,8 +874,8 @@
{ "version", ">>>>>>> Xalan version "},
{ "version2", "<<<<<<<"},
{ "yes", "ja"},
- { "line", "Rad #"},
- { "column", "Kolumn #"},
+ { "line", "Rad nr"},
+ { "column", "Kolumn nr"},
{ "xsldone", "XSLProcessor: utf\u00F6rd"},
{ "xpath_option", "xpath-alternativ: "},
{ "optionIN", " [-in inputXMLURL]"},
More information about the distro-pkg-dev
mailing list