diff options
| author | Casper van Donderen <casper.vandonderen@nokia.com> | 2011-09-29 09:56:31 (GMT) |
|---|---|---|
| committer | Casper van Donderen <casper.vandonderen@nokia.com> | 2011-09-29 09:56:31 (GMT) |
| commit | 0455cf2f9c4d82d1badcc568a6c6f4401111c62b (patch) | |
| tree | 290dbe37bb6806ae65dde9dda64532ab8fc1128d /src/xmlpatterns | |
| parent | d783756ab2ac83238b2bd202517be10a475b0b66 (diff) | |
| download | Qt-0455cf2f9c4d82d1badcc568a6c6f4401111c62b.zip Qt-0455cf2f9c4d82d1badcc568a6c6f4401111c62b.tar.gz Qt-0455cf2f9c4d82d1badcc568a6c6f4401111c62b.tar.bz2 | |
Update translation sources.
Reviewed-By: Geir Vattekar
Diffstat (limited to 'src/xmlpatterns')
| -rw-r--r-- | src/xmlpatterns/parser/qquerytransformparser.cpp | 2 | ||||
| -rw-r--r-- | src/xmlpatterns/schema/qxsdschemaresolver.cpp | 2 | ||||
| -rw-r--r-- | src/xmlpatterns/schema/qxsdvalidatinginstancereader.cpp | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/xmlpatterns/parser/qquerytransformparser.cpp b/src/xmlpatterns/parser/qquerytransformparser.cpp index c9801c8..2528746 100644 --- a/src/xmlpatterns/parser/qquerytransformparser.cpp +++ b/src/xmlpatterns/parser/qquerytransformparser.cpp @@ -4561,7 +4561,7 @@ yyreduce: { parseInfo->staticContext->error(QtXmlPatterns::tr("The namespace for a user defined function " "cannot be empty (try the predefined " - "prefix %1 which exists for cases " + "prefix %1, which exists for cases " "like this)") .arg(formatKeyword("local")), ReportContext::XQST0060, fromYYLTYPE((yyloc), parseInfo)); diff --git a/src/xmlpatterns/schema/qxsdschemaresolver.cpp b/src/xmlpatterns/schema/qxsdschemaresolver.cpp index 29c9f5a..2549f5f 100644 --- a/src/xmlpatterns/schema/qxsdschemaresolver.cpp +++ b/src/xmlpatterns/schema/qxsdschemaresolver.cpp @@ -854,7 +854,7 @@ void XsdSchemaResolver::resolveComplexContentComplexTypes(const XsdComplexType:: group->setCompositor(XsdModelGroup::SequenceCompositor); if (effectiveContent && effectiveContent->term()->isModelGroup() && XsdModelGroup::Ptr(effectiveContent->term())->compositor() == XsdModelGroup::AllCompositor) { - m_context->error(QtXmlPatterns::tr("Content model of complex type %1 contains %2 element so it cannot be derived by extension from a non-empty type.") + m_context->error(QtXmlPatterns::tr("Content model of complex type %1 contains %2 element, so it cannot be derived by extension from a non-empty type.") .arg(formatType(m_namePool, complexType)).arg(formatKeyword("all")), XsdSchemaContext::XSDError, sourceLocation(complexType)); return; } diff --git a/src/xmlpatterns/schema/qxsdvalidatinginstancereader.cpp b/src/xmlpatterns/schema/qxsdvalidatinginstancereader.cpp index 80c95c1..22d5d22 100644 --- a/src/xmlpatterns/schema/qxsdvalidatinginstancereader.cpp +++ b/src/xmlpatterns/schema/qxsdvalidatinginstancereader.cpp @@ -699,7 +699,7 @@ bool XsdValidatingInstanceReader::validateElementComplexType(const XsdElement::P if (complexType->contentType()->variety() == XsdComplexType::ContentType::Mixed) { if (declaration->valueConstraint() && declaration->valueConstraint()->variety() == XsdElement::ValueConstraint::Fixed) { if (hasChildElement()) { - error(QtXmlPatterns::tr("Element %1 cannot contain other elements, as it has a fixed content.").arg(formatKeyword(declaration->displayName(m_namePool)))); + error(QtXmlPatterns::tr("Element %1 cannot contain other elements, as it has fixed content.").arg(formatKeyword(declaration->displayName(m_namePool)))); return false; } |