From bf0c14ecd41bdde43f3913feda27fd1fe12437de Mon Sep 17 00:00:00 2001 From: Roger Sheen Date: Fri, 29 Sep 2023 17:48:11 +0200 Subject: [PATCH 01/52] Fix spurious trailing bracket in code comment Signed-off-by: Roger Sheen --- src/main/config/messages_template.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/config/messages_template.xml b/src/main/config/messages_template.xml index d6ae36e6e6..3489fd935c 100644 --- a/src/main/config/messages_template.xml +++ b/src/main/config/messages_template.xml @@ -60,7 +60,7 @@ See the accompanying LICENSE file for applicable license. > + toolkit development team. --> Failed to create new instance for '%1'. Please ensure that '%1' exists and that you have permission to access it. From b5a358cdf8d53546db6772a9862169bc76e8c0cb Mon Sep 17 00:00:00 2001 From: Roger Sheen Date: Fri, 29 Sep 2023 22:31:38 +0200 Subject: [PATCH 02/52] Add blank lines between messages for readability Signed-off-by: Roger Sheen --- src/main/config/messages_template.xml | 15 ++++++---- .../org.dita.htmlhelp/resource/messages.xml | 2 ++ .../org.dita.pdf2/resource/messages.xml | 28 +++++++++++++++++-- .../org.dita.xhtml/resource/messages.xml | 8 ++++++ 4 files changed, 45 insertions(+), 8 deletions(-) diff --git a/src/main/config/messages_template.xml b/src/main/config/messages_template.xml index 3489fd935c..54e3d34349 100644 --- a/src/main/config/messages_template.xml +++ b/src/main/config/messages_template.xml @@ -7,8 +7,9 @@ Copyright 2005, 2006 IBM Corporation See the accompanying LICENSE file for applicable license. --> - + + "%1" is not a recognized transformation type. Supported transformation types are . @@ -38,18 +39,22 @@ See the accompanying LICENSE file for applicable license. Argument "%1" is deprecated. This argument is no longer supported in the toolkit. + Argument "%1" is deprecated. Please use the argument "%2" instead. + Cannot find the specified DITAVAL '%1'. + Attribute @%1 is deprecated. Use attribute @%2 instead. + Internal property %1 may not be set directly. Use property %2 instead. @@ -448,8 +453,9 @@ See the accompanying LICENSE file for applicable license. - - + + + No string named '%1' was found for language '%2'. Using the default language '%3'. Add a mapping between default language and desired language for the string '%1'. @@ -838,9 +844,8 @@ See the accompanying LICENSE file for applicable license. Rewriting resolved version to '%2'. + - - diff --git a/src/main/plugins/org.dita.htmlhelp/resource/messages.xml b/src/main/plugins/org.dita.htmlhelp/resource/messages.xml index c180b00ca8..cb1a264148 100644 --- a/src/main/plugins/org.dita.htmlhelp/resource/messages.xml +++ b/src/main/plugins/org.dita.htmlhelp/resource/messages.xml @@ -7,8 +7,10 @@ Copyright 2014 Jarno Elovirta See the accompanying LICENSE file for applicable license. --> + In order to include peer or external topic '%1' in your help file, you may need to recompile the CHM file after making the file available. + diff --git a/src/main/plugins/org.dita.pdf2/resource/messages.xml b/src/main/plugins/org.dita.pdf2/resource/messages.xml index 012c12caf2..1c422df974 100644 --- a/src/main/plugins/org.dita.pdf2/resource/messages.xml +++ b/src/main/plugins/org.dita.pdf2/resource/messages.xml @@ -7,82 +7,104 @@ Copyright 2011 Jarno Elovirta See the accompanying LICENSE file for applicable license. --> - + + + Cannot find the user specified XSLT stylesheet '%1'. - + + + The PDF indexing process could not find the proper sort location for '%1', so the term has been dropped from the index. + The build failed due to problems encountered when sorting the PDF index. Please address any messages located earlier in the log. + Index entry '%1' will be sorted under the "Special characters" heading. + Ignoring index-see '%1' inside parent index entry '%2' because the parent indexterm contains indexterm children. + Ignoring index-see-also '%1' inside parent index entry '%2' because the parent indexterm contains indexterm children. - + + + There is an index term specified with start="%1", but there is no matching end for this term. Add an index term in a valid location with end="%1". + There are multiple index terms specified with start="%1", but there is only one term to end this range, or the ranges for this term overlap. Ensure that each term with this start value has a matching end value, and that the specified ranges for this value do not overlap + There are multiple index entries found to close the index range for "%1". Ensure that any index term with start="%1" has only one matching end term with end="%1". + A topic reference was found with href="". Please specify a target or remove the href attribute. + The topic reference href="%1" could not be found. Please correct the reference, or set the scope or format attribute if the target is not a local DITA topic. + + Found an index term with end="%1", but no starting term was found for this entry. + Font definition not found for the logical name or alias '%1'. + Attribute set reflection cannot handle XSLT element %1. + The index term '%2' uses both an index-see element and %1 element. Convert the index-see element to index-see-also. + Found a table row with more entries than allowed. + The PDF file '%1' could not be generated. + diff --git a/src/main/plugins/org.dita.xhtml/resource/messages.xml b/src/main/plugins/org.dita.xhtml/resource/messages.xml index 1475adb4f2..9a0346a6b2 100644 --- a/src/main/plugins/org.dita.xhtml/resource/messages.xml +++ b/src/main/plugins/org.dita.xhtml/resource/messages.xml @@ -7,24 +7,32 @@ Copyright 2014 Jarno Elovirta See the accompanying LICENSE file for applicable license. --> + + + Absolute paths on the local file system are not supported for the CSSPATH parameter. Please use a relative path or full URI instead. + Cannot find the running-footer file "%1". Please double check the value to ensure it is specified correctly. + Cannot find the running-header file "%1". Please double check the value to ensure it is specified correctly. + Cannot find the specified heading file "%1". Please double check the value to ensure it is specified correctly. + Target "%1" is deprecated. Remove references to this target from your custom XSLT or plug-ins. + From 3cdb9769c6bf4a578f6b7d57bb3ba400ccecbc8c Mon Sep 17 00:00:00 2001 From: Roger Sheen Date: Wed, 4 Oct 2023 22:07:38 +0200 Subject: [PATCH 03/52] Normalize whitespace Signed-off-by: Roger Sheen --- src/main/config/messages_template.xml | 256 +++++++++--------- .../org.dita.htmlhelp/resource/messages.xml | 2 +- .../org.dita.pdf2/resource/messages.xml | 2 +- .../org.dita.xhtml/resource/messages.xml | 2 +- 4 files changed, 131 insertions(+), 131 deletions(-) diff --git a/src/main/config/messages_template.xml b/src/main/config/messages_template.xml index 54e3d34349..dbe1656753 100644 --- a/src/main/config/messages_template.xml +++ b/src/main/config/messages_template.xml @@ -1,4 +1,4 @@ - + - + Cannot overwrite file '%1' with file '%2'. The modified result may not be consumed by the following steps in the transform pipeline. Check to see whether the file is locked by some other application during the transformation process. - + Failed to parse the input file '%1'. - + Failed to parse the referenced file '%1'. - + Found an indexterm element with no content. Setting the term to ***. - + Log file '%1' was generated successfully in directory '%2'. Any messages from the transformation process are available in the log file; additional details about each message are available in the DITA-OT documentation. - + At least one plug-in in '%1' is required by plug-in '%2'. Plug-in '%2' cannot be loaded. Check and see whether all prerequisite plug-ins are installed in toolkit. - + File '%1' will not generate output since it is invalid or all of its content has been filtered out by the ditaval file. Please check the file '%1' and the ditaval file to see if this is the intended result. - + File '%1' will not generate output because because all content has been filtered out by DITAVAL "exclude" conditions, or because the file is not valid DITA. - + Failed to parse the input file '%1' because all of its content has been filtered out. This will happen if the input file has filter conditions on the root element, and a ditaval excludes all content based on those conditions. @@ -137,12 +137,12 @@ See the accompanying LICENSE file for applicable license. Failed to get the specified image file '%1', so it will not be included with your output. - + The input to the "topic merge" transform process could not be found. Correct any earlier transform errors and try the build again, or see the DITA-OT documentation for additional causes. - + The "topic merge" did not generate any output. Correct any earlier transform errors and try the build again, or see the DITA-OT documentation for additional causes. @@ -157,114 +157,114 @@ See the accompanying LICENSE file for applicable license. No 'domains' attribute was found for element '<%1>'. This generally indicates that your DTD or Schema was not developed properly according to the DITA specification. - - + + No 'class' attribute for was found for element '<%1>'. The element will be processed as an unknown or non-DITA element. - - + + No specified rule for '%1' was found in the ditaval file. This value will use the default action, or a parent prop action if specified. To remove this message, you can specify a rule for '%1' in the ditaval file. - - + + No valid content is found in topicref '%1' during chunk processing. Please specify an existing and valid topic for the topicref. - - + + Failed to parse the input file '%1' (the content of the file is not valid). If the input file '%1' does not have a DOCTYPE declaration, please make sure that all class attributes are present in the file. - + The file "%1" is outside the scope of the input dita/map directory. If you want to lower the severity level, please use the Ant parameter 'outer.control', and set the value to "warn" or "quiet". Otherwise, move the referenced file "%1" into the input dita/map directory. - + The file "%1" is outside the scope of the input dita/map directory. - + The XML schema and DTD validation function of the parser is turned off. Please make sure the input is normalized DITA with class attributes included, otherwise it will not be processed correctly. - + The tag "%1" is specialized from unrecognized metadata. Please make sure that tag "%1" is specialized from an existing metadata tag in the core DITA vocabulary. - + There is no target specified for conref push action "pushafter". Please add <elementname conref="pushtarget" conaction="mark"> before current element. - + An element uses the attribute conaction="replace", but a conref attribute is not found in the expected location. - + The attribute conref="%1" uses invalid syntax. The value should contain '#' followed by a topic or map ID, optionally followed by '/elemID' for a sub-topic element. - + Two elements both use conref push to replace the target "%1". Please delete one of the duplicate "replace" actions. - + The conref push function is trying to replace an element that does not exist (element "%1" in file "%2"). - + There is a redundant conref action "pushbefore". Please make sure that "mark" and "pushbefore" occur in pairs. - + The key "%1" is defined more than once in the same map file. - + Conkeyref="%1" can not be resolved because it does not contain a key or the key is not defined. The build will use the conref attribute for fallback, if one exists. - + Unable to find key definition for key reference "%1" in root scope. The href attribute may be used as fallback if it exists - + Unable to find key definition for key reference "%1" in scope "%2". The href attribute may be used as fallback if it exists - + The attribute value %1="%3" on element "%2" does not comply with the specified subject scheme. According to the subject scheme map, the following values are valid for the %1 attribute: %4 - + Found an <index-see> or <index-see-also> reference to the term '%1', but that term is not defined in the index. - + Unable to load target for coderef "%1". @@ -281,37 +281,37 @@ See the accompanying LICENSE file for applicable license. Input file '%1' is not valid DITA file name. Please check '%1' to see if it is correct. The extensions ".dita" or ".xml" are supported for DITA topics. - + Unable to parse invalid %1 attribute value "%2" - + Invalid key name "%1". - + Invalid xml:lang "%1". - + The id attribute value "%1" is not unique within the topic that contains it. - + Both %1 and %2 attributes defined. A single element may not contain both generalized and specialized values for the same attribute. - + Invalid key scope name "%1". - + Key "%1" was used in conkeyref but is not bound to a DITA topic or map. Cannot resolve conkeyref value "%2" as a valid conref reference. @@ -321,7 +321,7 @@ See the accompanying LICENSE file for applicable license. Topic reference target is a DITA map but format attribute has not been set. Set format attribute value to "ditamap". - + Invalid %1 attribute value "%2". @@ -341,12 +341,12 @@ See the accompanying LICENSE file for applicable license. Branch filter generated topic %1 used more than once. Renaming %1 to %2. - + No id attribute on topic type element %1. Using generated id %2. - + No id attribute on topic type element %1. @@ -396,17 +396,17 @@ See the accompanying LICENSE file for applicable license. Absolute link '%1' without correct 'scope' attribute. - + Invalid action attribute '%1' on DITAVAL property. - + Input file '%1' could not be loaded. Ensure that grammar files for this document type are referenced and installed properly. - + File '%1' could not be loaded. Ensure that grammar files for this document type are referenced and installed properly. @@ -460,37 +460,37 @@ See the accompanying LICENSE file for applicable license. No string named '%1' was found for language '%2'. Using the default language '%3'. Add a mapping between default language and desired language for the string '%1'. - + The title element or attribute in the ditamap is required for Eclipse output. - + The anchorref attribute should either reference another dita map or an Eclipse XML TOC file. The value '%1' does not appear to reference either. - + Found a navref element that does not reference anything. The navref element should either reference another dita map or an Eclipse XML file. - + Unable to find navigation title for reference to '%1'. The build will use '%1' as the title in the Eclipse Table of Contents. - + Unknown file extension in href="%1". References to non-DITA resources should set the format attribute to match the resource (for example, 'txt', 'pdf', or 'html'). - + Only DITA topics, HTML files, and images may be included in your compiled CHM file. The reference to "%1" will be ignored. To remove this message, you can set the toc="no" or processing-role="resource-only" attribute on your topicref. - + File '%1' cannot be loaded, and no navigation title is specified for the table of contents. @@ -508,302 +508,302 @@ See the accompanying LICENSE file for applicable license. Could not retrieve a title from '%1'. Using '%2' instead. - + Unable to find target for conref="%1". - + There is more than one possible target for the reference conref="%1". Only the first will be used. Remove the duplicate id in the referenced file. - + When you conref another topic or an item in another topic, the domains attribute of the target topic must be equal to or a subset of the current topic's domains attribute. Put your target under an appropriate domain. You can see the messages guide for more help. - + A element with attribute conref="%1" indirectly includes itself, which results in an infinite loop. - + The attribute conref="%1" uses invalid syntax. Conref references to a map element should contain '#' followed by an ID, such as mymap.ditamap#mytopicrefid. - + The attribute conref="%1" uses invalid syntax. The value should contain '#' followed by a topic or map ID, optionally followed by '/elemID' for a sub-topic element. - + A reference to "%2" appears to reference a DITA document, but the format attribute has inherited a value of "%1". The document will not be processed as DITA. - + Found a link or cross reference with an empty href attribute (href=""). Remove the empty href attribute or provide a value. - + The type attribute on a topicref was set to '%1', but the topicref references a more specific '%2' topic. Note that the type attribute cascades in maps, so the value '%1' may come from an ancestor topicref. - + The type attribute on a topicref was set to '%1', but the topicref references a '%2' topic. This may cause your links to sort incorrectly in the output. Note that the type attribute cascades in maps, so the value '%1' may come from an ancestor topicref. - + Missing navtitle attribute or element for peer topic "%1". References must provide a local navigation title when the target is not a local DITA resource. - + Missing navtitle attribute or element for non-DITA resource "%1". References must provide a local navigation title when the target is not a local DITA resource. - + Unable to retrieve navtitle from target: '%1'. Using linktext (specified in topicmeta) as the navigation title. - + Unable to retrieve navtitle from target: '%1'. - + Missing linktext and navtitle for peer topic "%1". References must provide a local navigation title when the target is not a local DITA resource. - + Missing linktext and navtitle for non-DITA resource "%1". References must provide a local navigation title when the target is not a local DITA resource. - + Unable to retrieve linktext from target: '%1'. Using navigation title as fallback. - + Unable to retrieve linktext from target: '%1'. - + Link or cross reference must contain a valid href or keyref attribute; no link target is specified. - + The type attribute on a %1 element was set to %3, but the reference is to a more specific %4 %2. This may cause your links to sort incorrectly in the output. - + The type attribute on a %1 element was set to %3, but the reference is to a %4 %2. This may cause your links to sort incorrectly in the output. - + The file %1 is not available to resolve link information. - + Unable to retrieve link text from target: '%1'. If the target is not accessible at build time, or does not have a title, provide the link text inside the reference. - + Unable to generate link text for a cross reference to a list item: '%1' - + Unable to generate link text for a cross reference to an unordered list item: '%1' - + Unable to generate the correct number for a cross reference to a footnote: '%1' - + Unable to generate link text for a cross reference to a dlentry (the dlentry or term could not be found): '%1' - + No title found for this document; using "***" as HTML page title. - + The longdescref attribute on tag '%1' will be ignored. Accessibility for object elements needs to be handled another way. - + Required cleanup area found. To remove this message and hide the content, build your content without using the DRAFT parameter. - + Draft comment area found. To remove this message and hide the comments, build your content without using the DRAFT parameter. - + Found more than one title element in a %1 element. Using the first one for the %1's title. - + DITAVAL based flagging is not currently supported for inline phrases in XHTML; ignoring flag value on '%1' attribute. - + The link to '%1' may appear more than once in '%2'. - + The area element in an image map does not specify a link target. Please add an xref element with a link target to the area element. - + The area element in an image map should specify link text for greater accessibility. Link text should be specified directly when the target is not a local DITA resource. - + Area shape should be: default, rect, circle, poly, or blank (no value). The value '%1' is not recognized. - + Area coordinates are blank. Coordinate points for the shape need to be specified. - + References to non-dita files will be ignored by the PDF, ODT, and RTF output transforms. - + Default id "org.sample.help.doc" is used for Eclipse plug-in. If you want to use your own plug-in id, please specify it using the id attribute on your map. - + No string named '%1' was found when creating generated text; using the value '%1' in your output file. - + A element that references another map indirectly includes itself, which results in an infinite loop. The original map reference is to '%1'. - + Conflict text style is applied on the current element based on DITAVAL flagging rules. Please check ditaval and dita source to make sure there is no style conflict on the element which needs to be flagged. - + Customized stylesheet uses deprecated template "flagit". Conditional processing is no longer supported using this template. Please update your stylesheet to use template "start-flagit" instead of deprecated template "flagit". - + The file '%1' is not available to resolve link information. - + The link or cross reference target '%1' cannot be found, which may cause errors creating links or cross references in your output file. - + No glossary entry was found associated with key '%1' on %2 element. The build will try to determine the best display text and hover text for terms and abbreviations. - + Key '%1' was used in an abbreviated-form element, but the key is not associated with a glossary entry. Abbreviated-form should ONLY be used to reference to a glossary entry. - + ID '%1' was used in topicref tag but did not reference a topic element. The href attribute on a topicref element should only reference topic level elements. - + It appears that this document uses constraints, but the conref processor cannot validate that the target of a conref is valid. To enable constraint checking, please upgrade to an XSLT 2.0 processor. - + The dita document '%1' is linked to from your content, but is not referenced by a topicref tag in the ditamap file. Include the topic in your map to avoid a broken link. - + The copy-to attribute [copy-to="%1"] uses the name of a file that already exists, so this attribute is ignored. - + Two unique source files each specify copy-to="%2", which results in a collision. The value associated with href="%1" is ignored. - + Template "%1" is deprecated. Remove references to this template from your custom XSLT or plug-ins. - + No string named '%1' was found for language '%2'. Add a mapping for the string '%1'. - + A topicref element that references a map contains child topicref elements. Child topicref elements are ignored. - + Template mode "%1" is deprecated. Remove references to this template mode from your custom XSLT or plug-ins. - + Target "%1" is deprecated. Remove references to this target from your custom Ant files. - + Parameter "%1" on template "%2" is deprecated. Use parameter "%3" instead. @@ -813,7 +813,7 @@ See the accompanying LICENSE file for applicable license. Conref range: Unable to find conref range end element with ID "%1". - + Ignoring navtitle within topicgroup. @@ -823,7 +823,7 @@ See the accompanying LICENSE file for applicable license. Removing broken link to "%1". - + No formatting defined for unknown class attribute value "%1". @@ -833,12 +833,12 @@ See the accompanying LICENSE file for applicable license. A content reference in a constrained document type is pulling content from an unconstrained document type. The reference will resolve, but may result in content that violates one of the document constraints in "%1". - + A content reference in a constrained document type cannot be resolved because it would violate one of the document constraints "%1". The current constrained document may only reuse content from documents with equivalent constraints. - + Resolving content references results in duplicate ID '%1'. Rewriting resolved version to '%2'. diff --git a/src/main/plugins/org.dita.htmlhelp/resource/messages.xml b/src/main/plugins/org.dita.htmlhelp/resource/messages.xml index cb1a264148..d730bf11e3 100644 --- a/src/main/plugins/org.dita.htmlhelp/resource/messages.xml +++ b/src/main/plugins/org.dita.htmlhelp/resource/messages.xml @@ -1,4 +1,4 @@ - + File '%1' will not generate output since it is invalid or all of its content has been filtered out by the ditaval file. Please check the file '%1' and the ditaval file to see if this is the intended result. - - File '%1' will not generate output because because all content has been filtered out by DITAVAL "exclude" conditions, or because the file is not valid DITA. - - - Failed to parse the input file '%1' because all of its content has been filtered out. This will happen if the input file has filter conditions on the root element, and a ditaval excludes all content based on those conditions. @@ -491,19 +491,19 @@ See the accompanying LICENSE file for applicable license. To remove this message, you can set the toc="no" or processing-role="resource-only" attribute on your topicref. - - - File '%1' cannot be loaded, and no navigation title is specified for the table of contents. - - - File '%1' does not exist or cannot be loaded. - + + + File '%1' cannot be loaded, and no navigation title is specified for the table of contents. + + + + Could not retrieve a title from '%1'. Using '%2' instead. @@ -804,16 +804,16 @@ See the accompanying LICENSE file for applicable license. Remove references to this target from your custom Ant files. - - Parameter "%1" on template "%2" is deprecated. - Use parameter "%3" instead. - - Conref range: Unable to find conref range end element with ID "%1". + + Parameter "%1" on template "%2" is deprecated. + Use parameter "%3" instead. + + Ignoring navtitle within topicgroup. diff --git a/src/main/plugins/org.dita.pdf2/resource/messages.xml b/src/main/plugins/org.dita.pdf2/resource/messages.xml index ff5b4d7b95..6d47636ca8 100644 --- a/src/main/plugins/org.dita.pdf2/resource/messages.xml +++ b/src/main/plugins/org.dita.pdf2/resource/messages.xml @@ -15,6 +15,18 @@ See the accompanying LICENSE file for applicable license. + + + Ignoring index-see '%1' inside parent index entry '%2' because the parent indexterm contains indexterm children. + + + + + Ignoring index-see-also '%1' inside parent index entry '%2' because the parent indexterm contains indexterm children. + + + @@ -32,18 +44,6 @@ See the accompanying LICENSE file for applicable license. - - - Ignoring index-see '%1' inside parent index entry '%2' because the parent indexterm contains indexterm children. - - - - - Ignoring index-see-also '%1' inside parent index entry '%2' because the parent indexterm contains indexterm children. - - - From 9736df0f02a94f2d79132fbf7c10fdd88de0660a Mon Sep 17 00:00:00 2001 From: Roger Sheen Date: Thu, 5 Oct 2023 00:25:41 +0200 Subject: [PATCH 06/52] Use single quotes for '%' placeholders - The single-quote form is used more often than the double-quote form, so this commit applies that form consistently - Skip placeholders in pseudo-XML attribute="value" references, as those will be replaced in a later step - Add quotes to unquoted placeholders Signed-off-by: Roger Sheen --- src/main/config/messages_template.xml | 120 +++++++++--------- .../org.dita.pdf2/resource/messages.xml | 4 +- .../org.dita.xhtml/resource/messages.xml | 8 +- 3 files changed, 66 insertions(+), 66 deletions(-) diff --git a/src/main/config/messages_template.xml b/src/main/config/messages_template.xml index 1d23ce7570..da6fa02ebf 100644 --- a/src/main/config/messages_template.xml +++ b/src/main/config/messages_template.xml @@ -11,7 +11,7 @@ See the accompanying LICENSE file for applicable license. - "%1" is not a recognized transformation type. + '%1' is not a recognized transformation type. Supported transformation types are . @@ -31,13 +31,13 @@ See the accompanying LICENSE file for applicable license. - Argument "%1" is deprecated. + Argument '%1' is deprecated. This argument is no longer supported in the toolkit. - Argument "%1" is deprecated. - Please use the argument "%2" instead. + Argument '%1' is deprecated. + Please use the argument '%2' instead. @@ -51,8 +51,8 @@ See the accompanying LICENSE file for applicable license. - Internal property %1 may not be set directly. - Use property %2 instead. + Internal property '%1' may not be set directly. + Use property'%2'instead. @@ -183,12 +183,12 @@ See the accompanying LICENSE file for applicable license. - The file "%1" is outside the scope of the input dita/map directory. - If you want to lower the severity level, please use the Ant parameter 'outer.control', and set the value to "warn" or "quiet". Otherwise, move the referenced file "%1" into the input dita/map directory. + The file '%1' is outside the scope of the input dita/map directory. + If you want to lower the severity level, please use the Ant parameter 'outer.control', and set the value to "warn" or "quiet". Otherwise, move the referenced file '%1' into the input dita/map directory. - The file "%1" is outside the scope of the input dita/map directory. + The file '%1' is outside the scope of the input dita/map directory. @@ -199,8 +199,8 @@ See the accompanying LICENSE file for applicable license. - The tag "%1" is specialized from unrecognized metadata. - Please make sure that tag "%1" is specialized from an existing metadata tag in the core DITA vocabulary. + The tag '%1' is specialized from unrecognized metadata. + Please make sure that tag '%1' is specialized from an existing metadata tag in the core DITA vocabulary. @@ -220,12 +220,12 @@ See the accompanying LICENSE file for applicable license. - Two elements both use conref push to replace the target "%1". + Two elements both use conref push to replace the target '%1'. Please delete one of the duplicate "replace" actions. - The conref push function is trying to replace an element that does not exist (element "%1" in file "%2"). + The conref push function is trying to replace an element that does not exist (element '%1' in file '%2'). @@ -236,7 +236,7 @@ See the accompanying LICENSE file for applicable license. - The key "%1" is defined more than once in the same map file. + The key '%1' is defined more than once in the same map file. @@ -246,18 +246,18 @@ See the accompanying LICENSE file for applicable license. - Unable to find key definition for key reference "%1" in root scope. + Unable to find key definition for key reference '%1' in root scope. The href attribute may be used as fallback if it exists - Unable to find key definition for key reference "%1" in scope "%2". + Unable to find key definition for key reference '%1' in scope '%2'. The href attribute may be used as fallback if it exists - The attribute value %1="%3" on element "%2" does not comply with the specified subject scheme. - According to the subject scheme map, the following values are valid for the %1 attribute: %4 + The attribute value %1="%3" on element '%2' does not comply with the specified subject scheme. + According to the subject scheme map, the following values are valid for the '%1' attribute: '%4' @@ -267,12 +267,12 @@ See the accompanying LICENSE file for applicable license. - Unable to load target for coderef "%1". + Unable to load target for coderef '%1'. - Code reference charset "%1" not supported. + Code reference charset '%1' not supported. See the DITA-OT documentation for supported charset values on the format attribute. @@ -283,38 +283,38 @@ See the accompanying LICENSE file for applicable license. - Unable to parse invalid %1 attribute value "%2". + Unable to parse invalid '%1' attribute value '%2'. - Invalid key name "%1". + Invalid key name '%1'. - Invalid xml:lang "%1". + Invalid xml:lang '%1'. - The id attribute value "%1" is not unique within the topic that contains it. + The id attribute value '%1' is not unique within the topic that contains it. - Both %1 and %2 attributes defined. + Both '%1' and '%2' attributes defined. A single element may not contain both generalized and specialized values for the same attribute. - Invalid key scope name "%1". + Invalid key scope name '%1'. - Key "%1" was used in conkeyref but is not bound to a DITA topic or map. - Cannot resolve conkeyref value "%2" as a valid conref reference. + Key '%1' was used in conkeyref but is not bound to a DITA topic or map. + Cannot resolve conkeyref value '%2' as a valid conref reference. @@ -323,12 +323,12 @@ See the accompanying LICENSE file for applicable license. - Invalid %1 attribute value "%2". + Invalid '%1' attribute value '%2'. - The cols attribute is "%1" but number of colspec elements was %2. + The cols attribute is '%1' but number of colspec elements was '%2'. @@ -338,17 +338,17 @@ See the accompanying LICENSE file for applicable license. - Branch filter generated topic %1 used more than once. - Renaming %1 to %2. + Branch filter generated topic '%1' used more than once. + Renaming '%1' to '%2'. - No id attribute on topic type element %1. - Using generated id %2. + No id attribute on topic type element '%1'. + Using generated id '%2'. - No id attribute on topic type element %1. + No id attribute on topic type element '%1'. @@ -358,7 +358,7 @@ See the accompanying LICENSE file for applicable license. - Circular key definition %1. + Circular key definition '%1'. @@ -428,13 +428,13 @@ See the accompanying LICENSE file for applicable license. - The resource referenced as %1 is capitalized differently on disk. + The resource referenced as '%1' is capitalized differently on disk. - Couldn’t read '%1' with the %2 character set. - Save the file with %2 encoding. + Couldn’t read '%1' with the '%2' character set. + Save the file with '%2' encoding. @@ -482,12 +482,12 @@ See the accompanying LICENSE file for applicable license. - Unknown file extension in href="%1". + Unknown file extension in href='%1'. References to non-DITA resources should set the format attribute to match the resource (for example, 'txt', 'pdf', or 'html'). - Only DITA topics, HTML files, and images may be included in your compiled CHM file. The reference to "%1" will be ignored. + Only DITA topics, HTML files, and images may be included in your compiled CHM file. The reference to '%1' will be ignored. To remove this message, you can set the toc="no" or processing-role="resource-only" attribute on your topicref. @@ -542,7 +542,7 @@ See the accompanying LICENSE file for applicable license. - A reference to "%2" appears to reference a DITA document, but the format attribute has inherited a value of "%1". The document will not be processed as DITA. + A reference to '%2' appears to reference a DITA document, but the format attribute has inherited a value of '%1'. The document will not be processed as DITA. @@ -565,12 +565,12 @@ See the accompanying LICENSE file for applicable license. - Missing navtitle attribute or element for peer topic "%1". + Missing navtitle attribute or element for peer topic '%1'. References must provide a local navigation title when the target is not a local DITA resource. - Missing navtitle attribute or element for non-DITA resource "%1". + Missing navtitle attribute or element for non-DITA resource '%1'. References must provide a local navigation title when the target is not a local DITA resource. @@ -585,12 +585,12 @@ See the accompanying LICENSE file for applicable license. - Missing linktext and navtitle for peer topic "%1". + Missing linktext and navtitle for peer topic '%1'. References must provide a local navigation title when the target is not a local DITA resource. - Missing linktext and navtitle for non-DITA resource "%1". + Missing linktext and navtitle for non-DITA resource '%1'. References must provide a local navigation title when the target is not a local DITA resource. @@ -610,17 +610,17 @@ See the accompanying LICENSE file for applicable license. - The type attribute on a %1 element was set to %3, but the reference is to a more specific %4 %2. This may cause your links to sort incorrectly in the output. + The type attribute on a '%1' element was set to '%3', but the reference is to a more specific '%4' '%2'. This may cause your links to sort incorrectly in the output. - The type attribute on a %1 element was set to %3, but the reference is to a %4 %2. This may cause your links to sort incorrectly in the output. + The type attribute on a '%1' element was set to '%3', but the reference is to a '%4' '%2'. This may cause your links to sort incorrectly in the output. - The file %1 is not available to resolve link information. + The file '%1' is not available to resolve link information. @@ -670,7 +670,7 @@ See the accompanying LICENSE file for applicable license. - Found more than one title element in a %1 element. Using the first one for the %1's title. + Found more than one title element in a '%1' element. Using the first one for the %1's title. @@ -745,7 +745,7 @@ See the accompanying LICENSE file for applicable license. - No glossary entry was found associated with key '%1' on %2 element. The build will try to determine the best display text and hover text for terms and abbreviations. + No glossary entry was found associated with key '%1' on '%2' element. The build will try to determine the best display text and hover text for terms and abbreviations. @@ -780,7 +780,7 @@ See the accompanying LICENSE file for applicable license. - Template "%1" is deprecated. + Template '%1' is deprecated. Remove references to this template from your custom XSLT or plug-ins. @@ -795,22 +795,22 @@ See the accompanying LICENSE file for applicable license. - Template mode "%1" is deprecated. + Template mode '%1' is deprecated. Remove references to this template mode from your custom XSLT or plug-ins. - Target "%1" is deprecated. + Target '%1' is deprecated. Remove references to this target from your custom Ant files. - Conref range: Unable to find conref range end element with ID "%1". + Conref range: Unable to find conref range end element with ID '%1'. - Parameter "%1" on template "%2" is deprecated. + Parameter '%1' on template '%2' is deprecated. Use parameter "%3" instead. @@ -820,22 +820,22 @@ See the accompanying LICENSE file for applicable license. - Removing broken link to "%1". + Removing broken link to '%1'. - No formatting defined for unknown class attribute value "%1". + No formatting defined for unknown class attribute value '%1'. - A content reference in a constrained document type is pulling content from an unconstrained document type. The reference will resolve, but may result in content that violates one of the document constraints in "%1". + A content reference in a constrained document type is pulling content from an unconstrained document type. The reference will resolve, but may result in content that violates one of the document constraints in '%1'. - A content reference in a constrained document type cannot be resolved because it would violate one of the document constraints "%1". + A content reference in a constrained document type cannot be resolved because it would violate one of the document constraints '%1'. The current constrained document may only reuse content from documents with equivalent constraints. diff --git a/src/main/plugins/org.dita.pdf2/resource/messages.xml b/src/main/plugins/org.dita.pdf2/resource/messages.xml index 6d47636ca8..ecb61d0b02 100644 --- a/src/main/plugins/org.dita.pdf2/resource/messages.xml +++ b/src/main/plugins/org.dita.pdf2/resource/messages.xml @@ -88,12 +88,12 @@ See the accompanying LICENSE file for applicable license. - Attribute set reflection cannot handle XSLT element %1. + Attribute set reflection cannot handle XSLT element '%1'. - The index term '%2' uses both an index-see element and %1 element. + The index term '%2' uses both an index-see element and '%1' element. Convert the index-see element to index-see-also. diff --git a/src/main/plugins/org.dita.xhtml/resource/messages.xml b/src/main/plugins/org.dita.xhtml/resource/messages.xml index 5334671ef7..da9bdd8fe2 100644 --- a/src/main/plugins/org.dita.xhtml/resource/messages.xml +++ b/src/main/plugins/org.dita.xhtml/resource/messages.xml @@ -16,22 +16,22 @@ See the accompanying LICENSE file for applicable license. - Cannot find the running-footer file "%1". + Cannot find the running-footer file '%1'. Please double check the value to ensure it is specified correctly. - Cannot find the running-header file "%1". + Cannot find the running-header file '%1'. Please double check the value to ensure it is specified correctly. - Cannot find the specified heading file "%1". + Cannot find the specified heading file '%1'. Please double check the value to ensure it is specified correctly. - Target "%1" is deprecated. + Target '%1' is deprecated. Remove references to this target from your custom XSLT or plug-ins. From 70e35aefb3921aeb4cd09b9756a9e9e751ed6892 Mon Sep 17 00:00:00 2001 From: Roger Sheen Date: Thu, 5 Oct 2023 00:26:46 +0200 Subject: [PATCH 07/52] Mark unused message duplicates as deprecated Per https://github.com/dita-ot/dita-ot/pull/4287#discussion_r1346524737 Signed-off-by: Roger Sheen --- src/main/config/messages_template.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/main/config/messages_template.xml b/src/main/config/messages_template.xml index da6fa02ebf..425d549d30 100644 --- a/src/main/config/messages_template.xml +++ b/src/main/config/messages_template.xml @@ -71,6 +71,7 @@ See the accompanying LICENSE file for applicable license. Please ensure that '%1' exists and that you have permission to access it. + Duplicate condition in filter file for rule '%1'. The first encountered condition will be used. @@ -81,6 +82,7 @@ See the accompanying LICENSE file for applicable license. The first encountered condition will be used. + Duplicate condition in filter file for rule '%1'. The first encountered condition will be used. From 08e3c57b30c1397b4ef61720dc165f6b4c2fae46 Mon Sep 17 00:00:00 2001 From: Roger Sheen Date: Thu, 5 Oct 2023 12:45:28 +0200 Subject: [PATCH 08/52] Use XML-domain notation for attribute references Signed-off-by: Roger Sheen --- src/main/config/messages_template.xml | 86 +++++++++---------- .../org.dita.pdf2/resource/messages.xml | 4 +- 2 files changed, 45 insertions(+), 45 deletions(-) diff --git a/src/main/config/messages_template.xml b/src/main/config/messages_template.xml index 425d549d30..582cc4e1cd 100644 --- a/src/main/config/messages_template.xml +++ b/src/main/config/messages_template.xml @@ -151,8 +151,8 @@ See the accompanying LICENSE file for applicable license. - No format attribute was found on a reference to file '%1', which does not appear to be a DITA file. - If this is not a DITA file, set the format attribute to an appropriate value, otherwise set the format attribute to "dita". + No @format attribute was found on a reference to file '%1', which does not appear to be a DITA file. + If this is not a DITA file, set the @format attribute to an appropriate value, otherwise set the @format attribute to "dita". @@ -180,7 +180,7 @@ See the accompanying LICENSE file for applicable license. Failed to parse the input file '%1' (the content of the file is not valid). - If the input file '%1' does not have a DOCTYPE declaration, please make sure that all class attributes are present in the file. + If the input file '%1' does not have a DOCTYPE declaration, please make sure that all @class attributes are present in the file. @@ -197,7 +197,7 @@ See the accompanying LICENSE file for applicable license. The XML schema and DTD validation function of the parser is turned off. - Please make sure the input is normalized DITA with class attributes included, otherwise it will not be processed correctly. + Please make sure the input is normalized DITA with @class attributes included, otherwise it will not be processed correctly. @@ -211,7 +211,7 @@ See the accompanying LICENSE file for applicable license. - An element uses the attribute conaction="replace", but a conref attribute is not found in the expected location. + An element uses conaction="replace", but a @conref attribute is not found in the expected location. @@ -244,17 +244,17 @@ See the accompanying LICENSE file for applicable license. Conkeyref="%1" can not be resolved because it does not contain a key or the key is not defined. - The build will use the conref attribute for fallback, if one exists. + The build will use the @conref attribute for fallback, if one exists. Unable to find key definition for key reference '%1' in root scope. - The href attribute may be used as fallback if it exists + The @href attribute may be used as fallback if it exists. Unable to find key definition for key reference '%1' in scope '%2'. - The href attribute may be used as fallback if it exists + The @href attribute may be used as fallback if it exists. @@ -275,7 +275,7 @@ See the accompanying LICENSE file for applicable license. Code reference charset '%1' not supported. - See the DITA-OT documentation for supported charset values on the format attribute. + See the DITA-OT documentation for supported charset values on the @format attribute. @@ -300,7 +300,7 @@ See the accompanying LICENSE file for applicable license. - The id attribute value '%1' is not unique within the topic that contains it. + The @id attribute value '%1' is not unique within the topic that contains it. @@ -320,17 +320,17 @@ See the accompanying LICENSE file for applicable license. - Topic reference target is a DITA map but format attribute has not been set. - Set format attribute value to "ditamap". + Topic reference target is a DITA map but the @format attribute has not been set. + Set the @format attribute value to "ditamap". - Invalid '%1' attribute value '%2'. + Invalid @%1 attribute value '%2'. - The cols attribute is '%1' but number of colspec elements was '%2'. + The @cols attribute is set to '%1' but the number of colspec elements was '%2'. @@ -345,12 +345,12 @@ See the accompanying LICENSE file for applicable license. - No id attribute on topic type element '%1'. + No @id attribute on topic type element '%1'. Using generated id '%2'. - No id attribute on topic type element '%1'. + No @id attribute on topic type element '%1'. @@ -400,7 +400,7 @@ See the accompanying LICENSE file for applicable license. - Invalid action attribute '%1' on DITAVAL property. + Invalid @action attribute '%1' on DITAVAL property. @@ -420,7 +420,7 @@ See the accompanying LICENSE file for applicable license. - Ignoring empty conref attribute conref="". + Ignoring empty @conref attribute: conref="". @@ -445,12 +445,12 @@ See the accompanying LICENSE file for applicable license. - Split chunk attribute found on '<%1>' element that does not reference a topic. + Split @chunk attribute found on '<%1>' element that does not reference a topic. Ignoring chunk operation. - Found chunk attribute with value '%1' inside combine chunk. + Found @chunk attribute with value '%1' inside combine chunk. Ignoring chunk operation. @@ -464,13 +464,13 @@ See the accompanying LICENSE file for applicable license. - The title element or attribute in the ditamap is required for Eclipse output. + The @title attribute or element in the ditamap is required for Eclipse output. - The anchorref attribute should either reference another dita map or an Eclipse XML TOC file. The value '%1' does not appear to reference either. - + The @anchorref attribute should either reference another DITA map or an Eclipse XML TOC file. + The value '%1' does not appear to reference either. @@ -485,7 +485,7 @@ See the accompanying LICENSE file for applicable license. Unknown file extension in href='%1'. - References to non-DITA resources should set the format attribute to match the resource (for example, 'txt', 'pdf', or 'html'). + References to non-DITA resources should set the @format attribute to match the resource (for example, 'txt', 'pdf', or 'html'). @@ -524,17 +524,17 @@ See the accompanying LICENSE file for applicable license. - When you conref another topic or an item in another topic, the domains attribute of the target topic must be equal to or a subset of the current topic's domains attribute. + When you conref another topic or an item in another topic, the @domains attribute of the target topic must be equal to or a subset of the current topic's @domains attribute. Put your target under an appropriate domain. You can see the messages guide for more help. - A element with attribute conref="%1" indirectly includes itself, which results in an infinite loop. + A element with the @conref attribute set to '%1' indirectly includes itself, which results in an infinite loop. - The attribute conref="%1" uses invalid syntax. + The conref="%1" attribute setting uses invalid syntax. Conref references to a map element should contain '#' followed by an ID, such as mymap.ditamap#mytopicrefid. @@ -544,35 +544,35 @@ See the accompanying LICENSE file for applicable license. - A reference to '%2' appears to reference a DITA document, but the format attribute has inherited a value of '%1'. The document will not be processed as DITA. + A reference to '%2' appears to reference a DITA document, but the @format attribute has inherited a value of '%1'. The document will not be processed as DITA. - Found a link or cross reference with an empty href attribute (href=""). - Remove the empty href attribute or provide a value. + Found a link or cross reference with an empty @href attribute: href="". + Remove the empty @href attribute or provide a value. - The type attribute on a topicref was set to '%1', but the topicref references a more specific '%2' topic. Note that the type attribute cascades in maps, so the value '%1' may come from an ancestor topicref. + The @type attribute on a topicref was set to '%1', but the topicref references a more specific '%2' topic. Note that the @type attribute cascades in maps, so the value '%1' may come from an ancestor topicref. - The type attribute on a topicref was set to '%1', but the topicref references a '%2' topic. This may cause your links to sort incorrectly in the output. Note that the type attribute cascades in maps, so the value '%1' may come from an ancestor topicref. + The @type attribute on a topicref was set to '%1', but the topicref references a '%2' topic. This may cause your links to sort incorrectly in the output. Note that the @type attribute cascades in maps, so the value '%1' may come from an ancestor topicref. - Missing navtitle attribute or element for peer topic '%1'. + Missing @navtitle attribute or element for peer topic '%1'. References must provide a local navigation title when the target is not a local DITA resource. - Missing navtitle attribute or element for non-DITA resource '%1'. + Missing @navtitle attribute or element for non-DITA resource '%1'. References must provide a local navigation title when the target is not a local DITA resource. @@ -607,17 +607,17 @@ See the accompanying LICENSE file for applicable license. - Link or cross reference must contain a valid href or keyref attribute; no link target is specified. + Link or cross reference must contain a valid @href or @keyref attribute; no link target is specified. - The type attribute on a '%1' element was set to '%3', but the reference is to a more specific '%4' '%2'. This may cause your links to sort incorrectly in the output. + The @type attribute on a '%1' element was set to '%3', but the reference is to a more specific '%4' '%2'. This may cause your links to sort incorrectly in the output. - The type attribute on a '%1' element was set to '%3', but the reference is to a '%4' '%2'. This may cause your links to sort incorrectly in the output. + The @type attribute on a '%1' element was set to '%3', but the reference is to a '%4' '%2'. This may cause your links to sort incorrectly in the output. @@ -657,7 +657,7 @@ See the accompanying LICENSE file for applicable license. - The longdescref attribute on tag '%1' will be ignored. Accessibility for object elements needs to be handled another way. + The @longdescref attribute on tag '%1' will be ignored. Accessibility for object elements needs to be handled another way. @@ -712,8 +712,8 @@ See the accompanying LICENSE file for applicable license. - Default id "org.sample.help.doc" is used for Eclipse plug-in. - If you want to use your own plug-in id, please specify it using the id attribute on your map. + Default ID "org.sample.help.doc" is used for Eclipse plug-in. + If you want to use your own plug-in ID, please specify it using the @id attribute on your map. @@ -757,7 +757,7 @@ See the accompanying LICENSE file for applicable license. - ID '%1' was used in topicref tag but did not reference a topic element. The href attribute on a topicref element should only reference topic level elements. + ID '%1' was used in topicref tag but did not reference a topic element. The @href attribute on a topicref element should only reference topic level elements. @@ -772,7 +772,7 @@ See the accompanying LICENSE file for applicable license. - The copy-to attribute [copy-to="%1"] uses the name of a file that already exists, so this attribute is ignored. + The @copy-to attribute [copy-to="%1"] uses the name of a file that already exists, so this attribute is ignored. @@ -827,7 +827,7 @@ See the accompanying LICENSE file for applicable license. - No formatting defined for unknown class attribute value '%1'. + No formatting defined for unknown @class attribute value '%1'. diff --git a/src/main/plugins/org.dita.pdf2/resource/messages.xml b/src/main/plugins/org.dita.pdf2/resource/messages.xml index ecb61d0b02..29d27e17c1 100644 --- a/src/main/plugins/org.dita.pdf2/resource/messages.xml +++ b/src/main/plugins/org.dita.pdf2/resource/messages.xml @@ -63,12 +63,12 @@ See the accompanying LICENSE file for applicable license. A topic reference was found with href="". - Please specify a target or remove the href attribute. + Please specify a target or remove the @href attribute. The topic reference href="%1" could not be found. - Please correct the reference, or set the scope or format attribute if the target is not a local DITA topic. + Please correct the reference, or set the @scope or @format attribute if the target is not a local DITA topic. - No 'domains' attribute was found for element '<%1>'. + No @domains attribute was found for element '<%1>'. This generally indicates that your DTD or Schema was not developed properly according to the DITA specification. - No 'class' attribute for was found for element '<%1>'. + No @class attribute for was found for element '<%1>'. The element will be processed as an unknown or non-DITA element. @@ -335,8 +335,8 @@ See the accompanying LICENSE file for applicable license. - Chunk attribute uses both "to-content" and "by-topic" that conflict with each other. - Ignoring "by-topic" token. + The @chunk attribute uses both "to-content" and "by-topic" that conflict with each other. + Ignoring the "by-topic" token. @@ -375,27 +375,27 @@ See the accompanying LICENSE file for applicable license. - Email link without correct 'format' attribute. - Using 'format' attribute value 'email'. + Email link without correct @format attribute. + Using @format attribute value 'email'. - Email link without correct 'scope' attribute. - Using 'scope' attribute value 'external'. + Email link without correct @scope attribute. + Using @scope attribute value 'external'. - Rev attribute cannot be used with prop filter. + The @rev attribute cannot be used with prop filter. - Absolute link '%1' without correct 'scope' attribute. - Using 'scope' attribute value 'external'. + Absolute link '%1' without correct @scope attribute. + Using @scope attribute value 'external'. - Absolute link '%1' without correct 'scope' attribute. + Absolute link '%1' without correct @scope attribute. From a2fbf06f46837630e0764146ac3356045d805f41 Mon Sep 17 00:00:00 2001 From: Roger Sheen Date: Thu, 5 Oct 2023 13:45:18 +0200 Subject: [PATCH 10/52] Rephrase XML excerpts as attribute references Signed-off-by: Roger Sheen --- src/main/config/messages_template.xml | 29 ++++++++++++++------------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/src/main/config/messages_template.xml b/src/main/config/messages_template.xml index 64b303246d..2f8ee2c54b 100644 --- a/src/main/config/messages_template.xml +++ b/src/main/config/messages_template.xml @@ -211,13 +211,13 @@ See the accompanying LICENSE file for applicable license. - An element uses conaction="replace", but a @conref attribute is not found in the expected location. + An element uses @conaction="replace", but a @conref attribute is not found in the expected location. - The attribute conref="%1" uses invalid syntax. + The @conref attribute value '%1' uses invalid syntax. The value should contain '#' followed by a topic or map ID, optionally followed by '/elemID' for a sub-topic element. @@ -243,7 +243,7 @@ See the accompanying LICENSE file for applicable license. - Conkeyref="%1" can not be resolved because it does not contain a key or the key is not defined. + The @conkeyref attribute value '%1' cannot be resolved because it does not contain a key or the key is not defined. The build will use the @conref attribute for fallback, if one exists. @@ -258,8 +258,8 @@ See the accompanying LICENSE file for applicable license. - The attribute value %1="%3" on element '%2' does not comply with the specified subject scheme. - According to the subject scheme map, the following values are valid for the '%1' attribute: '%4' + The @%1 attribute value '%3' on element '%2' does not comply with the specified subject scheme. + According to the subject scheme map, the following values are valid for the @%1 attribute: '%4' @@ -285,7 +285,7 @@ See the accompanying LICENSE file for applicable license. - Unable to parse invalid '%1' attribute value '%2'. + Unable to parse invalid @%1 attribute value '%2'. @@ -490,7 +490,7 @@ See the accompanying LICENSE file for applicable license. Only DITA topics, HTML files, and images may be included in your compiled CHM file. The reference to '%1' will be ignored. - To remove this message, you can set the toc="no" or processing-role="resource-only" attribute on your topicref. + To remove this message, you can set @toc="no" or @processing-role="resource-only" on the topicref. @@ -512,13 +512,13 @@ See the accompanying LICENSE file for applicable license. - Unable to find target for conref="%1". + Unable to find target for @conref="%1". - There is more than one possible target for the reference conref="%1". Only the first will be used. - Remove the duplicate id in the referenced file. + There is more than one possible target for the @conref="%1" reference. Only the first will be used. + Remove the duplicate ID in the referenced file. - No @domains attribute was found for element '<%1>'. - This generally indicates that your DTD or Schema was not developed properly according to the DITA specification. + No @domains attribute was found for the <%1> element. + This generally indicates that your DTD or schema was not developed properly according to the DITA specification. - No @class attribute for was found for element '<%1>'. + No @class attribute was found for the <%1> element. The element will be processed as an unknown or non-DITA element. @@ -258,7 +258,7 @@ See the accompanying LICENSE file for applicable license. - The @%1 attribute value '%3' on element '%2' does not comply with the specified subject scheme. + The @%1 attribute value '%3' on the <%2> element does not comply with the specified subject scheme. According to the subject scheme map, the following values are valid for the @%1 attribute: '%4' @@ -330,7 +330,7 @@ See the accompanying LICENSE file for applicable license. - The @cols attribute is set to '%1' but the number of colspec elements was '%2'. + The @cols attribute is set to '%1' but the number of <colspec> elements was '%2'. @@ -365,7 +365,7 @@ See the accompanying LICENSE file for applicable license. - Invalid 'class' attribute '%1' for was found for element '<%2>'. + An invalid @class attribute '%1' for was found for the <%2> element. The element will be processed as an unknown or non-DITA element. @@ -445,7 +445,7 @@ See the accompanying LICENSE file for applicable license. - Split @chunk attribute found on '<%1>' element that does not reference a topic. + Split @chunk attribute found on <%1> element that does not reference a topic. Ignoring chunk operation. @@ -474,8 +474,8 @@ See the accompanying LICENSE file for applicable license. - Found a navref element that does not reference anything. - The navref element should either reference another dita map or an Eclipse XML file. + Found a <navref> element that does not reference anything. + The <navref> element should either reference another DITA map or an Eclipse XML file. @@ -529,7 +529,7 @@ See the accompanying LICENSE file for applicable license. - A element with the @conref attribute set to '%1' indirectly includes itself, which results in an infinite loop. + An element with the @conref attribute set to '%1' indirectly includes itself, which results in an infinite loop. @@ -612,12 +612,12 @@ See the accompanying LICENSE file for applicable license. - The @type attribute on a '%1' element was set to '%3', but the reference is to a more specific '%4' '%2'. This may cause your links to sort incorrectly in the output. + The @type attribute on a <%1> element was set to '%3', but the reference is to a more specific '%4' '%2'. This may cause your links to sort incorrectly in the output. - The @type attribute on a '%1' element was set to '%3', but the reference is to a '%4' '%2'. This may cause your links to sort incorrectly in the output. + The @type attribute on a <%1> element was set to '%3', but the reference is to a '%4' '%2'. This may cause your links to sort incorrectly in the output. @@ -657,8 +657,8 @@ See the accompanying LICENSE file for applicable license. - The @longdescref attribute on tag '%1' will be ignored. Accessibility for object elements needs to be handled another way. - + The @longdescref attribute on the <%1> element will be ignored. + Accessibility for object elements needs to be handled another way. @@ -672,7 +672,7 @@ See the accompanying LICENSE file for applicable license. - Found more than one title element in a '%1' element. Using the first one for the %1's title. + Found more than one <title> element in a <%1> element. Using the first one as the element title. @@ -687,12 +687,12 @@ See the accompanying LICENSE file for applicable license. - The area element in an image map does not specify a link target. - Please add an xref element with a link target to the area element. + The <area> element in an image map does not specify a link target. + Please add an <xref> element with a link target to the <area> element. - The area element in an image map should specify link text for greater accessibility. + The <area> element in an image map should specify link text for better accessibility. Link text should be specified directly when the target is not a local DITA resource. @@ -752,12 +752,12 @@ See the accompanying LICENSE file for applicable license. - Key '%1' was used in an abbreviated-form element, but the key is not associated with a glossary entry. + The '%1' key was used in an <abbreviated-form> element, but the key is not associated with a glossary entry. Abbreviated-form should ONLY be used to reference to a glossary entry. - ID '%1' was used in topicref tag but did not reference a topic element. The @href attribute on a topicref element should only reference topic level elements. + The @id attribute value '%1' was used on a <topicref> element, but it did not reference a topic element. The @href attribute on a <topicref> element should only reference topic-level elements. @@ -793,8 +793,8 @@ See the accompanying LICENSE file for applicable license. - A topicref element that references a map contains child topicref elements. - Child topicref elements are ignored. + A <topicref> element that references a map contains child <topicref> elements. + Child <topicref> elements are ignored. diff --git a/src/main/plugins/org.dita.pdf2/resource/messages.xml b/src/main/plugins/org.dita.pdf2/resource/messages.xml index 29d27e17c1..713835aade 100644 --- a/src/main/plugins/org.dita.pdf2/resource/messages.xml +++ b/src/main/plugins/org.dita.pdf2/resource/messages.xml @@ -88,13 +88,13 @@ See the accompanying LICENSE file for applicable license. - Attribute set reflection cannot handle XSLT element '%1'. + Attribute set reflection cannot handle the XSLT element <%1>. - The index term '%2' uses both an index-see element and '%1' element. - Convert the index-see element to index-see-also. + The index term '%2' uses both an <index-see> element and an <%1> element. + Convert the <index-see> element to <index-see-also>. From 973470184771160a5a85a29179db76c828a78c09 Mon Sep 17 00:00:00 2001 From: Roger Sheen Date: Thu, 5 Oct 2023 15:00:08 +0200 Subject: [PATCH 13/52] Align references to DITA and DITAVAL files Signed-off-by: Roger Sheen --- src/main/config/messages_template.xml | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/src/main/config/messages_template.xml b/src/main/config/messages_template.xml index dea7701c8f..0a29003a3b 100644 --- a/src/main/config/messages_template.xml +++ b/src/main/config/messages_template.xml @@ -126,13 +126,13 @@ See the accompanying LICENSE file for applicable license. - File '%1' will not generate output since it is invalid or all of its content has been filtered out by the ditaval file. - Please check the file '%1' and the ditaval file to see if this is the intended result. + File '%1' will not generate output since it is invalid or all of its content has been filtered out by the DITAVAL file. + Please check the '%1' file and the DITAVAL file to see if this is the intended result. Failed to parse the input file '%1' because all of its content has been filtered out. - This will happen if the input file has filter conditions on the root element, and a ditaval excludes all content based on those conditions. + This will happen if the input file has filter conditions on the root element, and a DITAVAL file excludes all content based on those conditions. @@ -167,8 +167,8 @@ See the accompanying LICENSE file for applicable license. - No specified rule for '%1' was found in the ditaval file. This value will use the default action, or a parent prop action if specified. - To remove this message, you can specify a rule for '%1' in the ditaval file. + No specified rule for '%1' was found in the DITAVAL file. This value will use the default action, or a parent prop action if specified. + To remove this message, you can specify a rule for '%1' in the DITAVAL file. @@ -185,12 +185,12 @@ See the accompanying LICENSE file for applicable license. - The file '%1' is outside the scope of the input dita/map directory. - If you want to lower the severity level, please use the Ant parameter 'outer.control', and set the value to "warn" or "quiet". Otherwise, move the referenced file '%1' into the input dita/map directory. + The file '%1' is outside the scope of the input resource directory. + To lower the severity level, use the Ant parameter 'outer.control', and set the value to "warn" or "quiet". Otherwise, move the referenced file '%1' into the directory where the input map or topic is stored. - The file '%1' is outside the scope of the input dita/map directory. + The file '%1' is outside the scope of the input resource directory. @@ -464,7 +464,7 @@ See the accompanying LICENSE file for applicable license. - The @title attribute or element in the ditamap is required for Eclipse output. + The @title attribute or element in the DITA map is required for Eclipse output. @@ -707,7 +707,7 @@ See the accompanying LICENSE file for applicable license. - References to non-dita files will be ignored by the PDF, ODT, and RTF output transforms. + References to non-DITA files will be ignored by the PDF, ODT, and RTF output transforms. @@ -728,7 +728,7 @@ See the accompanying LICENSE file for applicable license. Conflict text style is applied on the current element based on DITAVAL flagging rules. - Please check ditaval and dita source to make sure there is no style conflict on the element which needs to be flagged. + Please check the DITAVAL and DITA source files to make sure there is no style conflict on the element that needs to be flagged. @@ -767,8 +767,8 @@ See the accompanying LICENSE file for applicable license. - The dita document '%1' is linked to from your content, but is not referenced by a topicref tag in the ditamap file. - Include the topic in your map to avoid a broken link. + The DITA document '%1' is linked to from your content, but not referenced by a <topicref> element in the map. + Include the topic in your map file to avoid a broken link. From e15ff30cd5eeb60dc290396cd43fd28ca01b7ab6 Mon Sep 17 00:00:00 2001 From: Roger Sheen Date: Thu, 5 Oct 2023 15:10:44 +0200 Subject: [PATCH 14/52] Replace "tag" references with "element" Signed-off-by: Roger Sheen --- src/main/config/messages_template.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/config/messages_template.xml b/src/main/config/messages_template.xml index 0a29003a3b..a634ff7446 100644 --- a/src/main/config/messages_template.xml +++ b/src/main/config/messages_template.xml @@ -201,8 +201,8 @@ See the accompanying LICENSE file for applicable license. - The tag '%1' is specialized from unrecognized metadata. - Please make sure that tag '%1' is specialized from an existing metadata tag in the core DITA vocabulary. + The <%1> element is specialized from unrecognized metadata. + Please make sure that the <%1> element is specialized from an existing metadata element in the core DITA vocabulary. From 90f5e1d87cda305e26752b1b2e67629bd67cdd3e Mon Sep 17 00:00:00 2001 From: Roger Sheen Date: Sun, 29 Oct 2023 14:24:44 +0100 Subject: [PATCH 15/52] Replace pseudo-code with attribute references Signed-off-by: Roger Sheen --- src/main/config/messages_template.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/config/messages_template.xml b/src/main/config/messages_template.xml index a634ff7446..a3714d4b01 100644 --- a/src/main/config/messages_template.xml +++ b/src/main/config/messages_template.xml @@ -206,8 +206,8 @@ See the accompanying LICENSE file for applicable license. - There is no target specified for conref push action "pushafter". - Please add <elementname conref="pushtarget" conaction="mark"> before current element. + There is no target specified for the conref push action "pushafter". + Please specify @conref="pushtarget" and @conaction="mark" on the element that precedes the current element. From b07b15679dcdf9b76aa94b8cf3adea31640df5da Mon Sep 17 00:00:00 2001 From: Roger Sheen Date: Sun, 29 Oct 2023 14:45:21 +0100 Subject: [PATCH 16/52] =?UTF-8?q?Remove=20redundant=20=E2=80=9Ctoolkit?= =?UTF-8?q?=E2=80=9D=C2=A0reference?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Roger Sheen --- src/main/config/messages_template.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/config/messages_template.xml b/src/main/config/messages_template.xml index a3714d4b01..fc6843db7c 100644 --- a/src/main/config/messages_template.xml +++ b/src/main/config/messages_template.xml @@ -116,7 +116,7 @@ See the accompanying LICENSE file for applicable license. At least one plug-in in '%1' is required by plug-in '%2'. Plug-in '%2' cannot be loaded. - Check and see whether all prerequisite plug-ins are installed in toolkit. + Check and see whether all prerequisite plug-ins are installed. From 6531a8f96388448f3fd33492997a0598d2dc7496 Mon Sep 17 00:00:00 2001 From: Roger Sheen Date: Sun, 29 Oct 2023 15:35:54 +0100 Subject: [PATCH 17/52] =?UTF-8?q?Update=20=E2=80=9Cfile=E2=80=9D=20referen?= =?UTF-8?q?ces=20to=20=E2=80=9Cresource=E2=80=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Per https://github.com/dita-ot/dita-ot/issues/3973: > the DITA specification uses "resource" and it is more accurate in many cases - Not all resources are files - Leave “file” references to DITAVAL files, file encoding, image files, and log files Signed-off-by: Roger Sheen --- src/main/config/messages_template.xml | 85 +++++++++++++-------------- 1 file changed, 42 insertions(+), 43 deletions(-) diff --git a/src/main/config/messages_template.xml b/src/main/config/messages_template.xml index fc6843db7c..cf6b845147 100644 --- a/src/main/config/messages_template.xml +++ b/src/main/config/messages_template.xml @@ -16,7 +16,7 @@ See the accompanying LICENSE file for applicable license. - Input file is not specified, or is specified using the wrong parameter. + Input not specified, or specified using the wrong parameter. @@ -56,8 +56,8 @@ See the accompanying LICENSE file for applicable license. - Input file '%1' cannot be located or read. - Ensure that file was specified properly and that you have permission to access it. + The input resource '%1' cannot be located or read. + Please ensure that '%1' exists and that you have permission to access it. @@ -90,17 +90,17 @@ See the accompanying LICENSE file for applicable license. - Cannot overwrite file '%1' with file '%2'. The modified result may not be consumed by the following steps in the transform pipeline. - Check to see whether the file is locked by some other application during the transformation process. + Cannot overwrite the '%1' resource with '%2'. The modified result may not be available to the following steps in the transformation. + Check if the resource is locked by some other application during the transformation process. - Failed to parse the input file '%1'. + Failed to parse the input resource '%1'. - Failed to parse the referenced file '%1'. + Failed to parse the referenced resource '%1'. @@ -120,24 +120,24 @@ See the accompanying LICENSE file for applicable license. - File '%1' will not generate output because because all content has been filtered out by DITAVAL "exclude" conditions, or because the file is not valid DITA. - + The '%1' resource will not generate output because all content has been filtered out by DITAVAL "exclude" conditions, or the resource is not valid DITA. + Please check the '%1' resource and the DITAVAL file to see if this is the intended result. - File '%1' will not generate output since it is invalid or all of its content has been filtered out by the DITAVAL file. - Please check the '%1' file and the DITAVAL file to see if this is the intended result. + The '%1' resource will not generate output because all content has been filtered out by DITAVAL "exclude" conditions, or the resource is not valid DITA. + Please check the '%1' resource and the DITAVAL file to see if this is the intended result. - Failed to parse the input file '%1' because all of its content has been filtered out. - This will happen if the input file has filter conditions on the root element, and a DITAVAL file excludes all content based on those conditions. + Failed to parse the input resource '%1' because all of its content has been filtered out. + This will happen if the resource has filter conditions on the root element, and a DITAVAL file excludes all content based on those conditions. - Failed to get the specified image file '%1', so it will not be included with your output. - + The specified image file '%1' is not available. It will not be included in the output. + Please ensure that '%1' exists and that you have permission to access it. @@ -151,8 +151,8 @@ See the accompanying LICENSE file for applicable license. - No @format attribute was found on a reference to file '%1', which does not appear to be a DITA file. - If this is not a DITA file, set the @format attribute to an appropriate value, otherwise set the @format attribute to "dita". + No @format attribute was found on a reference to the '%1' resource, which does not appear to be DITA. + If this is not a DITA resource, set the @format attribute to an appropriate value; otherwise set the @format attribute to "dita". @@ -179,18 +179,17 @@ See the accompanying LICENSE file for applicable license. - Failed to parse the input file '%1' (the content of the file is not valid). - If the input file '%1' does not have a DOCTYPE declaration, please make sure that all @class attributes are present in the file. + Failed to parse the input resource '%1' (the content is not valid). + If '%1' does not have a DOCTYPE declaration, please make sure that all @class attributes are present. - - The file '%1' is outside the scope of the input resource directory. - To lower the severity level, use the Ant parameter 'outer.control', and set the value to "warn" or "quiet". Otherwise, move the referenced file '%1' into the directory where the input map or topic is stored. + The '%1' resource is outside the scope of the input directory. + To lower the severity level, use the Ant parameter 'outer.control', and set the value to "warn" or "quiet". Otherwise, move the '%1' resource to the directory where the input map or topic is stored. - The file '%1' is outside the scope of the input resource directory. + The '%1' resource is outside the scope of the input directory. @@ -227,7 +226,7 @@ See the accompanying LICENSE file for applicable license. - The conref push function is trying to replace an element that does not exist (element '%1' in file '%2'). + The conref push function is trying to replace an element that does not exist ('%1' element in the '%2' resource). @@ -238,7 +237,7 @@ See the accompanying LICENSE file for applicable license. - The key '%1' is defined more than once in the same map file. + The key '%1' is defined more than once in the same map. @@ -270,17 +269,17 @@ See the accompanying LICENSE file for applicable license. Unable to load target for coderef '%1'. - + Please ensure that '%1' exists and that you have permission to access it. Code reference charset '%1' not supported. - See the DITA-OT documentation for supported charset values on the @format attribute. + See the DITA-OT documentation for supported character set values on the @format attribute. - Input file '%1' is not valid DITA file name. + The input resource '%1' is not a valid DITA filename. Please check '%1' to see if it is correct. The extensions ".dita" or ".xml" are supported for DITA topics. @@ -405,12 +404,12 @@ See the accompanying LICENSE file for applicable license. - Input file '%1' could not be loaded. + The input resource '%1' could not be loaded. Ensure that grammar files for this document type are referenced and installed properly. - File '%1' could not be loaded. + The '%1' resource could not be loaded. Ensure that grammar files for this document type are referenced and installed properly. @@ -475,7 +474,7 @@ See the accompanying LICENSE file for applicable license. Found a <navref> element that does not reference anything. - The <navref> element should either reference another DITA map or an Eclipse XML file. + The <navref> element should either reference another DITA map or an Eclipse XML TOC file. @@ -484,7 +483,7 @@ See the accompanying LICENSE file for applicable license. - Unknown file extension in href='%1'. + Unknown file name extension in @href attribute value '%1'. References to non-DITA resources should set the @format attribute to match the resource (for example, 'txt', 'pdf', or 'html'). @@ -495,13 +494,13 @@ See the accompanying LICENSE file for applicable license. - File '%1' does not exist or cannot be loaded. - + The resource '%1' cannot be loaded. + Please ensure that '%1' exists and that you have permission to access it. - File '%1' cannot be loaded, and no navigation title is specified for the table of contents. + The resource '%1' cannot be loaded, and no navigation title is specified for the table of contents. @@ -517,8 +516,8 @@ See the accompanying LICENSE file for applicable license. - There is more than one possible target for the @conref="%1" reference. Only the first will be used. - Remove the duplicate ID in the referenced file. + There is more than one possible target for the @conref attribute value "%1". Only the first will be used. + Remove the duplicate ID in the referenced resource. From 5914166f42883d9f6ac442a9878d28b7fbe96b45 Mon Sep 17 00:00:00 2001 From: Roger Sheen Date: Sun, 29 Oct 2023 15:41:07 +0100 Subject: [PATCH 19/52] =?UTF-8?q?Align=20=E2=80=9Ccouldn=E2=80=99t?= =?UTF-8?q?=E2=80=9D=20&=20=E2=80=9Ccould=20not=E2=80=9D=20=E2=86=92=20?= =?UTF-8?q?=E2=80=9Ccannot=E2=80=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Roger Sheen --- src/main/config/messages_template.xml | 12 ++++++------ src/main/plugins/org.dita.pdf2/resource/messages.xml | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/main/config/messages_template.xml b/src/main/config/messages_template.xml index 25b106602e..b5ef1bf3ef 100644 --- a/src/main/config/messages_template.xml +++ b/src/main/config/messages_template.xml @@ -141,7 +141,7 @@ See the accompanying LICENSE file for applicable license. - The input to the "topic merge" transform process could not be found. + The input to the "topic merge" transform process cannot be found. Correct any earlier transform errors and try the build again, or see the DITA-OT documentation for additional causes. @@ -404,12 +404,12 @@ See the accompanying LICENSE file for applicable license. - The input resource '%1' could not be loaded. + The input resource '%1' cannot be loaded. Ensure that grammar files for this document type are referenced and installed properly. - The '%1' resource could not be loaded. + The '%1' resource cannot be loaded. Ensure that grammar files for this document type are referenced and installed properly. @@ -434,7 +434,7 @@ See the accompanying LICENSE file for applicable license. - Couldn’t read '%1' with the '%2' character set. + Cannot read '%1' with the '%2' character set. Save the file with '%2' encoding. @@ -506,7 +506,7 @@ See the accompanying LICENSE file for applicable license. - Could not retrieve a title from '%1'. Using '%2' instead. + Cannot retrieve a title from '%1'. Using '%2' instead. @@ -646,7 +646,7 @@ See the accompanying LICENSE file for applicable license. - Unable to generate link text for a cross reference to a dlentry (the dlentry or term could not be found): '%1'. + Unable to generate link text for a cross reference to a dlentry (the dlentry or term cannot be found): '%1'. diff --git a/src/main/plugins/org.dita.pdf2/resource/messages.xml b/src/main/plugins/org.dita.pdf2/resource/messages.xml index 713835aade..80bf9b15dd 100644 --- a/src/main/plugins/org.dita.pdf2/resource/messages.xml +++ b/src/main/plugins/org.dita.pdf2/resource/messages.xml @@ -30,7 +30,7 @@ See the accompanying LICENSE file for applicable license. - The PDF indexing process could not find the proper sort location for '%1', so the term has been dropped from the index. + The PDF indexing process cannot find the proper sort location for '%1', so the term has been dropped from the index. @@ -67,7 +67,7 @@ See the accompanying LICENSE file for applicable license. - The topic reference href="%1" could not be found. + The topic reference href="%1" cannot be found. Please correct the reference, or set the @scope or @format attribute if the target is not a local DITA topic. @@ -103,7 +103,7 @@ See the accompanying LICENSE file for applicable license. - The PDF file '%1' could not be generated. + The PDF file '%1' cannot be generated. From 994d783e454f3d0ad8f36d325eb8012d4ad351f5 Mon Sep 17 00:00:00 2001 From: Roger Sheen Date: Sun, 29 Oct 2023 16:20:16 +0100 Subject: [PATCH 20/52] Copyedit messages Signed-off-by: Roger Sheen --- src/main/config/messages_template.xml | 34 +++++++++++++-------------- 1 file changed, 16 insertions(+), 18 deletions(-) diff --git a/src/main/config/messages_template.xml b/src/main/config/messages_template.xml index b5ef1bf3ef..f8082134f2 100644 --- a/src/main/config/messages_template.xml +++ b/src/main/config/messages_template.xml @@ -21,7 +21,7 @@ See the accompanying LICENSE file for applicable license. - Cannot find the user specified XSLT stylesheet '%1'. + Cannot find the user-specified XSLT stylesheet '%1'. @@ -41,7 +41,7 @@ See the accompanying LICENSE file for applicable license. - Cannot find the specified DITAVAL '%1'. + Cannot find the specified DITAVAL file '%1'. @@ -88,9 +88,8 @@ See the accompanying LICENSE file for applicable license. The first encountered condition will be used. - - Cannot overwrite the '%1' resource with '%2'. The modified result may not be available to the following steps in the transformation. + Cannot overwrite the '%1' resource with '%2'. The modified result may not be available to the following transformation steps. Check if the resource is locked by some other application during the transformation process. @@ -111,7 +110,7 @@ See the accompanying LICENSE file for applicable license. Log file '%1' was generated successfully in directory '%2'. - Any messages from the transformation process are available in the log file; additional details about each message are available in the DITA-OT documentation. + Any messages from the transformation process are available in the log file; additional details about each message are available in the documentation. @@ -141,13 +140,13 @@ See the accompanying LICENSE file for applicable license. - The input to the "topic merge" transform process cannot be found. - Correct any earlier transform errors and try the build again, or see the DITA-OT documentation for additional causes. + The input to the "topic merge" process cannot be found. + Correct any earlier errors and try the build again, or see the documentation for additional causes. - The "topic merge" did not generate any output. - Correct any earlier transform errors and try the build again, or see the DITA-OT documentation for additional causes. + The "topic merge" process did not generate any output. + Correct any earlier errors and try the build again, or see the documentation for additional causes. @@ -167,14 +166,13 @@ See the accompanying LICENSE file for applicable license. - No specified rule for '%1' was found in the DITAVAL file. This value will use the default action, or a parent prop action if specified. - To remove this message, you can specify a rule for '%1' in the DITAVAL file. + No rule for '%1' was found in the DITAVAL file. This value will use the default action, or a parent prop action if specified. + To remove this message, specify a rule for '%1' in the DITAVAL file. - - No valid content is found in topicref '%1' during chunk processing. - Please specify an existing and valid topic for the topicref. + No valid content found in topicref '%1' during chunk processing. + Please specify an existing and valid topic for the topic reference. @@ -274,7 +272,7 @@ See the accompanying LICENSE file for applicable license. Code reference charset '%1' not supported. - See the DITA-OT documentation for supported character set values on the @format attribute. + See the documentation for supported character set values on the @format attribute. @@ -315,7 +313,7 @@ See the accompanying LICENSE file for applicable license. Key '%1' was used in conkeyref but is not bound to a DITA topic or map. - Cannot resolve conkeyref value '%2' as a valid conref reference. + Cannot resolve conkeyref value '%2' as a valid content reference. @@ -330,7 +328,7 @@ See the accompanying LICENSE file for applicable license. The @cols attribute is set to '%1' but the number of <colspec> elements was '%2'. - + Please verify the number of columns in the table. @@ -345,7 +343,7 @@ See the accompanying LICENSE file for applicable license. No @id attribute on topic type element '%1'. - Using generated id '%2'. + Using generated ID '%2'. From ceff989c96f77d08a9b2c42703813dd174b2abe7 Mon Sep 17 00:00:00 2001 From: Roger Sheen Date: Sun, 29 Oct 2023 16:20:51 +0100 Subject: [PATCH 21/52] Use double quotes for explicit attribute value references Signed-off-by: Roger Sheen --- src/main/config/messages_template.xml | 32 +++++++++++++-------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/src/main/config/messages_template.xml b/src/main/config/messages_template.xml index f8082134f2..f3963074b6 100644 --- a/src/main/config/messages_template.xml +++ b/src/main/config/messages_template.xml @@ -214,7 +214,7 @@ See the accompanying LICENSE file for applicable license. - The @conref attribute value '%1' uses invalid syntax. + The @conref attribute value "%1" uses invalid syntax. The value should contain '#' followed by a topic or map ID, optionally followed by '/elemID' for a sub-topic element. @@ -240,7 +240,7 @@ See the accompanying LICENSE file for applicable license. - The @conkeyref attribute value '%1' cannot be resolved because it does not contain a key or the key is not defined. + The @conkeyref attribute value "%1" cannot be resolved because it does not contain a key or the key is not defined. The build will use the @conref attribute for fallback, if one exists. @@ -297,7 +297,7 @@ See the accompanying LICENSE file for applicable license. - The @id attribute value '%1' is not unique within the topic that contains it. + The @id attribute value "%1" is not unique within the topic that contains it. @@ -373,12 +373,12 @@ See the accompanying LICENSE file for applicable license. Email link without correct @format attribute. - Using @format attribute value 'email'. + Using @format attribute value "email". Email link without correct @scope attribute. - Using @scope attribute value 'external'. + Using @scope attribute value "external". @@ -388,7 +388,7 @@ See the accompanying LICENSE file for applicable license. Absolute link '%1' without correct @scope attribute. - Using @scope attribute value 'external'. + Using @scope attribute value "external". @@ -447,7 +447,7 @@ See the accompanying LICENSE file for applicable license. - Found @chunk attribute with value '%1' inside combine chunk. + Found @chunk attribute with value "%1" inside combine chunk. Ignoring chunk operation. @@ -467,7 +467,7 @@ See the accompanying LICENSE file for applicable license. The @anchorref attribute should either reference another DITA map or an Eclipse XML TOC file. - The value '%1' does not appear to reference either. + The value "%1" does not appear to reference either. @@ -481,7 +481,7 @@ See the accompanying LICENSE file for applicable license. - Unknown file name extension in @href attribute value '%1'. + Unknown file name extension in @href attribute value "%1". References to non-DITA resources should set the @format attribute to match the resource (for example, 'txt', 'pdf', or 'html'). @@ -531,12 +531,12 @@ See the accompanying LICENSE file for applicable license. - The @conref attribute value '%1' uses invalid syntax. + The @conref attribute value "%1" uses invalid syntax. Conref references to a map element should contain '#' followed by an ID, such as mymap.ditamap#mytopicrefid. - The @conref attribute value '%1' uses invalid syntax. + The @conref attribute value "%1" uses invalid syntax. The value should contain '#' followed by a topic or map ID, optionally followed by '/elemID' for a sub-topic element. @@ -554,12 +554,12 @@ See the accompanying LICENSE file for applicable license. - The @type attribute on a topicref was set to '%1', but the topicref references a more specific '%2' topic. Note that the @type attribute cascades in maps, so the value '%1' may come from an ancestor topicref. + The @type attribute on a topicref was set to "%1", but the topicref references a more specific '%2' topic. Note that the @type attribute cascades in maps, so the value "%1" may come from an ancestor topicref. - The @type attribute on a topicref was set to '%1', but the topicref references a '%2' topic. This may cause your links to sort incorrectly in the output. Note that the @type attribute cascades in maps, so the value '%1' may come from an ancestor topicref. + The @type attribute on a topicref was set to "%1", but the topicref references a '%2' topic. This may cause your links to sort incorrectly in the output. Note that the @type attribute cascades in maps, so the value "%1" may come from an ancestor topicref. @@ -754,7 +754,7 @@ See the accompanying LICENSE file for applicable license. - The @id attribute value '%1' was used on a <topicref> element, but it did not reference a topic element. The @href attribute on a <topicref> element should only reference topic-level elements. + The @id attribute value "%1" was used on a <topicref> element, but it did not reference a topic element. The @href attribute on a <topicref> element should only reference topic-level elements. @@ -769,7 +769,7 @@ See the accompanying LICENSE file for applicable license. - The @copy-to attribute value '%1' uses the name of a resource that already exists, so this attribute is ignored. + The @copy-to attribute value "%1" uses the name of a resource that already exists, so this attribute is ignored. @@ -825,7 +825,7 @@ See the accompanying LICENSE file for applicable license. - No formatting defined for unknown @class attribute value '%1'. + No formatting defined for unknown @class attribute value "%1". From 6dcbefdff9c29c6d01efe752aa22a13c25760c56 Mon Sep 17 00:00:00 2001 From: Roger Sheen Date: Sun, 29 Oct 2023 16:50:53 +0100 Subject: [PATCH 22/52] =?UTF-8?q?Reduce=20=E2=80=9Cyour=E2=80=9D=20?= =?UTF-8?q?=E2=80=94=20users=20often=20process=20others=E2=80=99=20files?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Roger Sheen --- src/main/config/messages_template.xml | 30 +++++++++++++-------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/src/main/config/messages_template.xml b/src/main/config/messages_template.xml index f3963074b6..80a88bef4f 100644 --- a/src/main/config/messages_template.xml +++ b/src/main/config/messages_template.xml @@ -157,7 +157,7 @@ See the accompanying LICENSE file for applicable license. No @domains attribute was found for the <%1> element. - This generally indicates that your DTD or schema was not developed properly according to the DITA specification. + This generally indicates that the DTD or schema was not developed properly according to the DITA specification. @@ -486,7 +486,7 @@ See the accompanying LICENSE file for applicable license. - Only DITA topics, HTML files, and images may be included in your compiled CHM file. The reference to '%1' will be ignored. + Only DITA topics, HTML files, and images may be included in the compiled CHM file. The reference to '%1' will be ignored. To remove this message, set the @toc attribute to "no" or the @processing-role attribute to "resource-only" on the topic reference. @@ -522,7 +522,7 @@ See the accompanying LICENSE file for applicable license. Support for mismatched domains was added in release 1.5 or earlier. --> When you conref another topic or an item in another topic, the @domains attribute of the target topic must be equal to or a subset of the current topic's @domains attribute. - Put your target under an appropriate domain. You can see the messages guide for more help. + Put the target under an appropriate domain. You can see the messages guide for more help. @@ -559,7 +559,7 @@ See the accompanying LICENSE file for applicable license. - The @type attribute on a topicref was set to "%1", but the topicref references a '%2' topic. This may cause your links to sort incorrectly in the output. Note that the @type attribute cascades in maps, so the value "%1" may come from an ancestor topicref. + The @type attribute on a topicref was set to "%1", but the topicref references a '%2' topic. This may cause links to sort incorrectly in the output. Note that the @type attribute cascades in maps, so the value "%1" may come from an ancestor topicref. @@ -609,12 +609,12 @@ See the accompanying LICENSE file for applicable license. - The @type attribute on a <%1> element was set to '%3', but the reference is to a more specific '%4' '%2'. This may cause your links to sort incorrectly in the output. + The @type attribute on a <%1> element was set to '%3', but the reference is to a more specific '%4' '%2'. This may cause links to sort incorrectly in the output. - The @type attribute on a <%1> element was set to '%3', but the reference is to a '%4' '%2'. This may cause your links to sort incorrectly in the output. + The @type attribute on a <%1> element was set to '%3', but the reference is to a '%4' '%2'. This may cause links to sort incorrectly in the output. @@ -660,12 +660,12 @@ See the accompanying LICENSE file for applicable license. Required cleanup area found. - To remove this message and hide the content, build your content without using the DRAFT parameter. + To remove this message and hide the content, build without the DRAFT parameter. Draft comment area found. - To remove this message and hide the comments, build your content without using the DRAFT parameter. + To remove this message and hide the comments, build without the DRAFT parameter. @@ -709,8 +709,8 @@ See the accompanying LICENSE file for applicable license. - Default ID "org.sample.help.doc" is used for Eclipse plug-in. - If you want to use your own plug-in ID, please specify it using the @id attribute on your map. + The default ID "org.sample.help.doc" is used for the Eclipse plug-in. + To use your own plug-in ID, specify it using the @id attribute on the map. @@ -764,8 +764,8 @@ See the accompanying LICENSE file for applicable license. - The DITA document '%1' is linked to from your content, but not referenced by a <topicref> element in the map. - Include the topic in your map to avoid a broken link. + The DITA document '%1' is linked to from the content, but not referenced by a <topicref> element in the map. + Include the topic in the map to avoid a broken link. @@ -781,7 +781,7 @@ See the accompanying LICENSE file for applicable license. Template '%1' is deprecated. - Remove references to this template from your custom XSLT or plug-ins. + Remove references to this template from the custom XSLT or plug-ins. @@ -796,12 +796,12 @@ See the accompanying LICENSE file for applicable license. Template mode '%1' is deprecated. - Remove references to this template mode from your custom XSLT or plug-ins. + Remove references to this template mode from the custom XSLT or plug-ins. Target '%1' is deprecated. - Remove references to this target from your custom Ant files. + Remove references to this target from the custom Ant files. From 9d239cc47c0e5b1899a3c8096270cbf15a90099b Mon Sep 17 00:00:00 2001 From: Roger Sheen Date: Sun, 29 Oct 2023 16:51:29 +0100 Subject: [PATCH 23/52] Copyedit additional messages Signed-off-by: Roger Sheen --- src/main/config/messages_template.xml | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/src/main/config/messages_template.xml b/src/main/config/messages_template.xml index 80a88bef4f..75befdf50d 100644 --- a/src/main/config/messages_template.xml +++ b/src/main/config/messages_template.xml @@ -367,7 +367,7 @@ See the accompanying LICENSE file for applicable license. - Cannot find the specified DITAVAL '%1'. + Cannot find the specified DITAVAL file '%1'. @@ -382,7 +382,7 @@ See the accompanying LICENSE file for applicable license. - The @rev attribute cannot be used with prop filter. + The @rev attribute cannot be used with the <prop> filter. @@ -413,7 +413,7 @@ See the accompanying LICENSE file for applicable license. Integrator configuration '%1' has been deprecated. - Use plugin configuration '%1' instead. + Use plug-in configuration '%1' instead. @@ -532,7 +532,7 @@ See the accompanying LICENSE file for applicable license. The @conref attribute value "%1" uses invalid syntax. - Conref references to a map element should contain '#' followed by an ID, such as mymap.ditamap#mytopicrefid. + Conref references to a map element should contain '#' followed by an ID, such as 'mymap.ditamap#mytopicrefid'. @@ -674,7 +674,7 @@ See the accompanying LICENSE file for applicable license. - DITAVAL based flagging is not currently supported for inline phrases in XHTML; ignoring flag value on '%1' attribute. + DITAVAL-based flagging is not currently supported for inline phrases in XHTML; ignoring flag value on '%1' attribute. @@ -694,7 +694,7 @@ See the accompanying LICENSE file for applicable license. - Area shape should be: default, rect, circle, poly, or blank (no value). The value '%1' is not recognized. + Area shape should be one of: default, rect, circle, poly, or blank (no value). The value '%1' is not recognized. @@ -729,8 +729,8 @@ See the accompanying LICENSE file for applicable license. - Customized stylesheet uses deprecated template "flagit". Conditional processing is no longer supported using this template. - Please update your stylesheet to use template "start-flagit" instead of deprecated template "flagit". + A customized stylesheet uses the deprecated "flagit" template. Conditional processing is no longer supported using this template. + Please update the stylesheet to use the "start-flagit" template instead of the "flagit" template. @@ -754,8 +754,8 @@ See the accompanying LICENSE file for applicable license. - The @id attribute value "%1" was used on a <topicref> element, but it did not reference a topic element. The @href attribute on a <topicref> element should only reference topic-level elements. - + The @id attribute value "%1" was used on a <topicref> element, but it did not reference a topic element. + The @href attribute on a <topicref> element should only reference topic-level elements. @@ -774,8 +774,8 @@ See the accompanying LICENSE file for applicable license. - Two unique source files each specify @copy-to="%2", which results in a collision. The value associated with - @href="%1" is ignored. + Two unique source files each specify a @copy-to attribute value "%2", which results in a collision. The value associated with + @href value "%1" will be ignored. From 5bfb9f6b2d2cdc794f1b03ee9e11249190f1ddc9 Mon Sep 17 00:00:00 2001 From: Roger Sheen Date: Sun, 29 Oct 2023 17:14:52 +0100 Subject: [PATCH 24/52] Fix hyphenation Signed-off-by: Roger Sheen --- src/main/config/messages_template.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/config/messages_template.xml b/src/main/config/messages_template.xml index 75befdf50d..9cb79d8e1b 100644 --- a/src/main/config/messages_template.xml +++ b/src/main/config/messages_template.xml @@ -739,7 +739,7 @@ See the accompanying LICENSE file for applicable license. - The link or cross-reference target '%1' cannot be found, which may cause errors in the output. + The link or cross reference target '%1' cannot be found, which may cause errors in the output. From eaa32fa6226f51581005d7869287b59b1a84c52b Mon Sep 17 00:00:00 2001 From: Roger Sheen Date: Sun, 29 Oct 2023 21:50:37 +0100 Subject: [PATCH 25/52] Expand empty response elements Per https://github.com/dita-ot/dita-ot/pull/4287#issuecomment-1747525066 Most are expanded, so this aligns those that were collapsed. Signed-off-by: Roger Sheen --- src/main/config/messages_template.xml | 8 ++++---- .../plugins/org.dita.pdf2/resource/messages.xml | 16 ++++++++-------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/main/config/messages_template.xml b/src/main/config/messages_template.xml index 9cb79d8e1b..8b3e90af82 100644 --- a/src/main/config/messages_template.xml +++ b/src/main/config/messages_template.xml @@ -806,7 +806,7 @@ See the accompanying LICENSE file for applicable license. Conref range: Unable to find conref range end element with ID '%1'. - + @@ -816,17 +816,17 @@ See the accompanying LICENSE file for applicable license. Ignoring navtitle within topicgroup. - + Removing broken link to '%1'. - + No formatting defined for unknown @class attribute value "%1". - + diff --git a/src/main/plugins/org.dita.pdf2/resource/messages.xml b/src/main/plugins/org.dita.pdf2/resource/messages.xml index 80bf9b15dd..5fa62648d2 100644 --- a/src/main/plugins/org.dita.pdf2/resource/messages.xml +++ b/src/main/plugins/org.dita.pdf2/resource/messages.xml @@ -31,7 +31,7 @@ See the accompanying LICENSE file for applicable license. The PDF indexing process cannot find the proper sort location for '%1', so the term has been dropped from the index. - + @@ -41,7 +41,7 @@ See the accompanying LICENSE file for applicable license. Index entry '%1' will be sorted under the "Special characters" heading. - + @@ -74,22 +74,22 @@ See the accompanying LICENSE file for applicable license. Found an index term with end="%1", but no starting term was found for this entry. - + Font definition not found for the logical name or alias '%1'. - + Attribute set reflection cannot handle the XSLT element <%1>. - + @@ -99,12 +99,12 @@ See the accompanying LICENSE file for applicable license. Found a table row with more entries than allowed. - + The PDF file '%1' cannot be generated. - + From a667273876a2f4cdf51ef33507487245adbf038b Mon Sep 17 00:00:00 2001 From: Roger Sheen Date: Tue, 19 Dec 2023 16:10:10 +0100 Subject: [PATCH 26/52] =?UTF-8?q?Simplify=20language:=20ensure=20=E2=86=92?= =?UTF-8?q?=20check?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Roger Sheen --- src/main/config/messages_template.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/config/messages_template.xml b/src/main/config/messages_template.xml index 8b3e90af82..b054873f50 100644 --- a/src/main/config/messages_template.xml +++ b/src/main/config/messages_template.xml @@ -115,7 +115,7 @@ See the accompanying LICENSE file for applicable license. At least one plug-in in '%1' is required by plug-in '%2'. Plug-in '%2' cannot be loaded. - Check and see whether all prerequisite plug-ins are installed. + Check if all prerequisite plug-ins are properly installed. @@ -403,12 +403,12 @@ See the accompanying LICENSE file for applicable license. The input resource '%1' cannot be loaded. - Ensure that grammar files for this document type are referenced and installed properly. + Check if grammar files for this document type are properly referenced and installed. The '%1' resource cannot be loaded. - Ensure that grammar files for this document type are referenced and installed properly. + Check if grammar files for this document type are properly referenced and installed. From e5d92ab388dfede1c62db28cced6d5cc6d74abf7 Mon Sep 17 00:00:00 2001 From: Roger Sheen Date: Tue, 19 Dec 2023 16:11:42 +0100 Subject: [PATCH 27/52] =?UTF-8?q?Align=20=E2=80=9Ccheck=E2=80=9D=20referen?= =?UTF-8?q?ces=20in=20responses?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Roger Sheen --- src/main/config/messages_template.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/config/messages_template.xml b/src/main/config/messages_template.xml index b054873f50..f350904612 100644 --- a/src/main/config/messages_template.xml +++ b/src/main/config/messages_template.xml @@ -120,13 +120,13 @@ See the accompanying LICENSE file for applicable license. The '%1' resource will not generate output because all content has been filtered out by DITAVAL "exclude" conditions, or the resource is not valid DITA. - Please check the '%1' resource and the DITAVAL file to see if this is the intended result. + Check the '%1' resource and the DITAVAL file to see if this is the intended result. The '%1' resource will not generate output because all content has been filtered out by DITAVAL "exclude" conditions, or the resource is not valid DITA. - Please check the '%1' resource and the DITAVAL file to see if this is the intended result. + Check the '%1' resource and the DITAVAL file to see if this is the intended result. @@ -278,7 +278,7 @@ See the accompanying LICENSE file for applicable license. The input resource '%1' is not a valid DITA filename. - Please check '%1' to see if it is correct. The extensions ".dita" or ".xml" are supported for DITA topics. + Check '%1' to see if it is correct. The extensions ".dita" or ".xml" are supported for DITA topics. @@ -725,7 +725,7 @@ See the accompanying LICENSE file for applicable license. Conflict text style is applied on the current element based on DITAVAL flagging rules. - Please check the DITAVAL and DITA source files to make sure there is no style conflict on the element that needs to be flagged. + Check the DITAVAL and DITA source files to make sure there is no style conflict on the element that needs to be flagged. From 5862b1be4c018bee4e4ab33526a1c632d86cda61 Mon Sep 17 00:00:00 2001 From: Roger Sheen Date: Fri, 29 Dec 2023 16:00:00 +0100 Subject: [PATCH 28/52] Implement review feedback Per https://github.com/dita-ot/dita-ot/pull/4287#issuecomment-1846668956 Signed-off-by: Roger Sheen --- src/main/config/messages_template.xml | 95 +++++++++++++-------------- 1 file changed, 47 insertions(+), 48 deletions(-) diff --git a/src/main/config/messages_template.xml b/src/main/config/messages_template.xml index f350904612..93c1c0916a 100644 --- a/src/main/config/messages_template.xml +++ b/src/main/config/messages_template.xml @@ -119,13 +119,13 @@ See the accompanying LICENSE file for applicable license. - The '%1' resource will not generate output because all content has been filtered out by DITAVAL "exclude" conditions, or the resource is not valid DITA. + The '%1' resource will not generate output because all content has been filtered out by DITAVAL 'exclude' conditions, or the resource is not valid DITA. Check the '%1' resource and the DITAVAL file to see if this is the intended result. - The '%1' resource will not generate output because all content has been filtered out by DITAVAL "exclude" conditions, or the resource is not valid DITA. + The '%1' resource will not generate output because all content has been filtered out by DITAVAL 'exclude' conditions, or the resource is not valid DITA. Check the '%1' resource and the DITAVAL file to see if this is the intended result. @@ -140,18 +140,18 @@ See the accompanying LICENSE file for applicable license. - The input to the "topic merge" process cannot be found. + The input to the 'topic merge' process cannot be found. Correct any earlier errors and try the build again, or see the documentation for additional causes. - The "topic merge" process did not generate any output. + The 'topic merge' process did not generate any output. Correct any earlier errors and try the build again, or see the documentation for additional causes. No @format attribute was found on a reference to the '%1' resource, which does not appear to be DITA. - If this is not a DITA resource, set the @format attribute to an appropriate value; otherwise set the @format attribute to "dita". + If this is not a DITA resource, set the @format attribute to an appropriate value; otherwise set the @format attribute to 'dita'. @@ -183,7 +183,7 @@ See the accompanying LICENSE file for applicable license. The '%1' resource is outside the scope of the input directory. - To lower the severity level, use the Ant parameter 'outer.control', and set the value to "warn" or "quiet". Otherwise, move the '%1' resource to the directory where the input map or topic is stored. + To lower the severity level, use the Ant parameter 'outer.control', and set the value to 'warn' or 'quiet'. Otherwise, move the '%1' resource to the directory where the input map or topic is stored. @@ -203,24 +203,24 @@ See the accompanying LICENSE file for applicable license. - There is no target specified for the conref push action "pushafter". + There is no target specified for the conref push action 'pushafter'. Please specify @conref="pushtarget" and @conaction="mark" on the element that precedes the current element. - An element uses @conaction="replace", but a @conref attribute is not found in the expected location. + An element uses the conref action 'pushreplace', but no @conref attribute is found in the expected location. - The @conref attribute value "%1" uses invalid syntax. - The value should contain '#' followed by a topic or map ID, optionally followed by '/elemID' for a sub-topic element. + The @conref attribute value '%1' uses invalid syntax. + The value must contain '#' followed by a topic or map ID, optionally followed by '/elemID' for a sub-topic element. Two elements both use conref push to replace the target '%1'. - Please delete one of the duplicate "replace" actions. + Please delete one of the duplicate 'replace' actions. @@ -228,10 +228,9 @@ See the accompanying LICENSE file for applicable license. - - There is a redundant conref action "pushbefore". - Please make sure that "mark" and "pushbefore" occur in pairs. + There is a redundant conref action 'pushbefore'. + Please make sure that 'mark' and 'pushbefore' occur in pairs. @@ -240,7 +239,7 @@ See the accompanying LICENSE file for applicable license. - The @conkeyref attribute value "%1" cannot be resolved because it does not contain a key or the key is not defined. + The @conkeyref attribute value '%1' cannot be resolved because it does not contain a key or the key is not defined. The build will use the @conref attribute for fallback, if one exists. @@ -278,7 +277,7 @@ See the accompanying LICENSE file for applicable license. The input resource '%1' is not a valid DITA filename. - Check '%1' to see if it is correct. The extensions ".dita" or ".xml" are supported for DITA topics. + Check '%1' to see if it is correct. The '.dita' and '.xml' extensions are supported for DITA topics. @@ -297,7 +296,7 @@ See the accompanying LICENSE file for applicable license. - The @id attribute value "%1" is not unique within the topic that contains it. + The @id attribute value '%1' is not unique within the topic that contains it. @@ -318,7 +317,7 @@ See the accompanying LICENSE file for applicable license. Topic reference target is a DITA map but the @format attribute has not been set. - Set the @format attribute value to "ditamap". + Set the @format attribute value to 'ditamap'. @@ -332,8 +331,8 @@ See the accompanying LICENSE file for applicable license. - The @chunk attribute uses both "to-content" and "by-topic" that conflict with each other. - Ignoring the "by-topic" token. + The @chunk attribute uses both 'to-content' and 'by-topic' that conflict with each other. + Ignoring the 'by-topic' token. @@ -352,7 +351,7 @@ See the accompanying LICENSE file for applicable license. - Conref action "mark" without conref target. + Conref action 'mark' without conref target. @@ -373,12 +372,12 @@ See the accompanying LICENSE file for applicable license. Email link without correct @format attribute. - Using @format attribute value "email". + Using @format attribute value 'email'. Email link without correct @scope attribute. - Using @scope attribute value "external". + Using @scope attribute value 'external'. @@ -388,7 +387,7 @@ See the accompanying LICENSE file for applicable license. Absolute link '%1' without correct @scope attribute. - Using @scope attribute value "external". + Using @scope attribute value 'external'. @@ -417,7 +416,7 @@ See the accompanying LICENSE file for applicable license. - Ignoring empty @conref attribute: conref="". + Ignoring empty @conref attribute. @@ -447,7 +446,7 @@ See the accompanying LICENSE file for applicable license. - Found @chunk attribute with value "%1" inside combine chunk. + Found @chunk attribute with value '%1' inside combine chunk. Ignoring chunk operation. @@ -467,7 +466,7 @@ See the accompanying LICENSE file for applicable license. The @anchorref attribute should either reference another DITA map or an Eclipse XML TOC file. - The value "%1" does not appear to reference either. + The value '%1' does not appear to reference either. @@ -481,13 +480,13 @@ See the accompanying LICENSE file for applicable license. - Unknown file name extension in @href attribute value "%1". + Unknown file name extension in @href attribute value '%1'. References to non-DITA resources should set the @format attribute to match the resource (for example, 'txt', 'pdf', or 'html'). Only DITA topics, HTML files, and images may be included in the compiled CHM file. The reference to '%1' will be ignored. - To remove this message, set the @toc attribute to "no" or the @processing-role attribute to "resource-only" on the topic reference. + To remove this message, set the @toc attribute to 'no' or the @processing-role attribute to 'resource-only' on the topic reference. @@ -509,12 +508,12 @@ See the accompanying LICENSE file for applicable license. - Unable to find target for @conref="%1". - + Unable to find the @conref attribute value '%1'. + Check '%1' to see if the target exists. - There is more than one possible target for the @conref attribute value "%1". Only the first will be used. + There is more than one possible target for the @conref attribute value '%1'. Only the first will be used. Remove the duplicate ID in the referenced resource. @@ -531,13 +530,13 @@ See the accompanying LICENSE file for applicable license. - The @conref attribute value "%1" uses invalid syntax. + The @conref attribute value '%1' uses invalid syntax. Conref references to a map element should contain '#' followed by an ID, such as 'mymap.ditamap#mytopicrefid'. - The @conref attribute value "%1" uses invalid syntax. - The value should contain '#' followed by a topic or map ID, optionally followed by '/elemID' for a sub-topic element. + The @conref attribute value '%1' uses invalid syntax. + The value must contain '#' followed by a topic or map ID, optionally followed by '/elemID' for a sub-topic element. @@ -548,18 +547,18 @@ See the accompanying LICENSE file for applicable license. - Found a link or cross reference with an empty @href attribute: href="". + Found a link or cross reference with an empty @href attribute. Remove the empty @href attribute or provide a value. - The @type attribute on a topicref was set to "%1", but the topicref references a more specific '%2' topic. Note that the @type attribute cascades in maps, so the value "%1" may come from an ancestor topicref. + The @type attribute on a topicref was set to '%1', but the topicref references a more specific '%2' topic. Note that the @type attribute cascades in maps, so the value '%1' may come from an ancestor topicref. - The @type attribute on a topicref was set to "%1", but the topicref references a '%2' topic. This may cause links to sort incorrectly in the output. Note that the @type attribute cascades in maps, so the value "%1" may come from an ancestor topicref. + The @type attribute on a topicref was set to '%1', but the topicref references a '%2' topic. This may cause links to sort incorrectly in the output. Note that the @type attribute cascades in maps, so the value '%1' may come from an ancestor topicref. @@ -649,7 +648,7 @@ See the accompanying LICENSE file for applicable license. - No title found for this document; using "***" as HTML page title. + No title found for this document; using '***' as HTML page title. @@ -709,7 +708,7 @@ See the accompanying LICENSE file for applicable license. - The default ID "org.sample.help.doc" is used for the Eclipse plug-in. + The default ID 'org.sample.help.doc' is used for the Eclipse plug-in. To use your own plug-in ID, specify it using the @id attribute on the map. @@ -729,8 +728,8 @@ See the accompanying LICENSE file for applicable license. - A customized stylesheet uses the deprecated "flagit" template. Conditional processing is no longer supported using this template. - Please update the stylesheet to use the "start-flagit" template instead of the "flagit" template. + A customized stylesheet uses the deprecated 'flagit' template. Conditional processing is no longer supported using this template. + Please update the stylesheet to use the 'start-flagit' template instead of the 'flagit' template. @@ -754,7 +753,7 @@ See the accompanying LICENSE file for applicable license. - The @id attribute value "%1" was used on a <topicref> element, but it did not reference a topic element. + The @id attribute value '%1' was used on a <topicref> element, but it did not reference a topic element. The @href attribute on a <topicref> element should only reference topic-level elements. @@ -769,13 +768,13 @@ See the accompanying LICENSE file for applicable license. - The @copy-to attribute value "%1" uses the name of a resource that already exists, so this attribute is ignored. + The @copy-to attribute value '%1' uses the name of a resource that already exists, so this attribute is ignored. - Two unique source files each specify a @copy-to attribute value "%2", which results in a collision. The value associated with - @href value "%1" will be ignored. + Two unique source files each specify a @copy-to attribute value '%2', which results in a collision. The value associated with + @href value '%1' will be ignored. @@ -811,7 +810,7 @@ See the accompanying LICENSE file for applicable license. Parameter '%1' on template '%2' is deprecated. - Use parameter "%3" instead. + Use parameter '%3' instead. @@ -825,7 +824,7 @@ See the accompanying LICENSE file for applicable license. - No formatting defined for unknown @class attribute value "%1". + No formatting defined for unknown @class attribute value '%1'. From 1df8b3fbedf14687595be72848aacbdbdae2feb7 Mon Sep 17 00:00:00 2001 From: Roger Sheen Date: Fri, 29 Dec 2023 17:31:51 +0100 Subject: [PATCH 29/52] Align conref push terms with spec Signed-off-by: Roger Sheen --- src/main/config/messages_template.xml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/main/config/messages_template.xml b/src/main/config/messages_template.xml index 93c1c0916a..bb8ec28dc5 100644 --- a/src/main/config/messages_template.xml +++ b/src/main/config/messages_template.xml @@ -204,12 +204,12 @@ See the accompanying LICENSE file for applicable license. There is no target specified for the conref push action 'pushafter'. - Please specify @conref="pushtarget" and @conaction="mark" on the element that precedes the current element. + Please specify a @conref target and set the 'mark' @conaction on the element that precedes the current element. - An element uses the conref action 'pushreplace', but no @conref attribute is found in the expected location. - + An element uses the conref push action 'pushreplace', but no @conref attribute is defined. + Please specify a @conref target with the ID of the content you want to replace. @@ -229,7 +229,7 @@ See the accompanying LICENSE file for applicable license. - There is a redundant conref action 'pushbefore'. + There is a redundant conref push action 'pushbefore'. Please make sure that 'mark' and 'pushbefore' occur in pairs. @@ -531,7 +531,7 @@ See the accompanying LICENSE file for applicable license. The @conref attribute value '%1' uses invalid syntax. - Conref references to a map element should contain '#' followed by an ID, such as 'mymap.ditamap#mytopicrefid'. + Content references to a map element should contain '#' followed by an ID, such as 'mymap.ditamap#mytopicrefid'. From 8621225b071f846b1e9e9eeead26aec7fb403f61 Mon Sep 17 00:00:00 2001 From: Roger Sheen Date: Fri, 29 Dec 2023 17:35:13 +0100 Subject: [PATCH 30/52] Drop pleasantries for brevity Signed-off-by: Roger Sheen --- src/main/config/messages_template.xml | 38 +++++++++++++-------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/src/main/config/messages_template.xml b/src/main/config/messages_template.xml index bb8ec28dc5..27ff734de1 100644 --- a/src/main/config/messages_template.xml +++ b/src/main/config/messages_template.xml @@ -37,7 +37,7 @@ See the accompanying LICENSE file for applicable license. The '%1' argument is deprecated. - Please use the argument '%2' instead. + Use the argument '%2' instead. @@ -57,7 +57,7 @@ See the accompanying LICENSE file for applicable license. The input resource '%1' cannot be located or read. - Please ensure that '%1' exists and that you have permission to access it. + Ensure that '%1' exists and that you have permission to access it. @@ -68,7 +68,7 @@ See the accompanying LICENSE file for applicable license. toolkit development team. --> Failed to create new instance for '%1'. - Please ensure that '%1' exists and that you have permission to access it. + Ensure that '%1' exists and that you have permission to access it. @@ -136,7 +136,7 @@ See the accompanying LICENSE file for applicable license. The specified image file '%1' is not available. It will not be included in the output. - Please ensure that '%1' exists and that you have permission to access it. + Ensure that '%1' exists and that you have permission to access it. @@ -172,13 +172,13 @@ See the accompanying LICENSE file for applicable license. No valid content found in topicref '%1' during chunk processing. - Please specify an existing and valid topic for the topic reference. + Specify an existing and valid topic for the topic reference. Failed to parse the input resource '%1' (the content is not valid). - If '%1' does not have a DOCTYPE declaration, please make sure that all @class attributes are present. + If '%1' does not have a DOCTYPE declaration, make sure that all @class attributes are present. @@ -194,22 +194,22 @@ See the accompanying LICENSE file for applicable license. The XML schema and DTD validation function of the parser is turned off. - Please make sure the input is normalized DITA with @class attributes included, otherwise it will not be processed correctly. + Make sure the input is normalized DITA with @class attributes included, otherwise it will not be processed correctly. The <%1> element is specialized from unrecognized metadata. - Please make sure that the <%1> element is specialized from an existing metadata element in the core DITA vocabulary. + Make sure that the <%1> element is specialized from an existing metadata element in the core DITA vocabulary. There is no target specified for the conref push action 'pushafter'. - Please specify a @conref target and set the 'mark' @conaction on the element that precedes the current element. + Specify a @conref target and set the 'mark' @conaction on the element that precedes the current element. An element uses the conref push action 'pushreplace', but no @conref attribute is defined. - Please specify a @conref target with the ID of the content you want to replace. + Specify a @conref target with the ID of the content you want to replace. @@ -220,7 +220,7 @@ See the accompanying LICENSE file for applicable license. Two elements both use conref push to replace the target '%1'. - Please delete one of the duplicate 'replace' actions. + Delete one of the duplicate 'replace' actions. @@ -230,7 +230,7 @@ See the accompanying LICENSE file for applicable license. There is a redundant conref push action 'pushbefore'. - Please make sure that 'mark' and 'pushbefore' occur in pairs. + Make sure that 'mark' and 'pushbefore' occur in pairs. @@ -266,7 +266,7 @@ See the accompanying LICENSE file for applicable license. Unable to load target for coderef '%1'. - Please ensure that '%1' exists and that you have permission to access it. + Ensure that '%1' exists and that you have permission to access it. @@ -327,7 +327,7 @@ See the accompanying LICENSE file for applicable license. The @cols attribute is set to '%1' but the number of <colspec> elements was '%2'. - Please verify the number of columns in the table. + Verify the number of columns in the table. @@ -492,7 +492,7 @@ See the accompanying LICENSE file for applicable license. The resource '%1' cannot be loaded. - Please ensure that '%1' exists and that you have permission to access it. + Ensure that '%1' exists and that you have permission to access it. @@ -540,7 +540,7 @@ See the accompanying LICENSE file for applicable license. - A reference to '%2' appears to reference a DITA document, but the @format attribute has inherited a value of '%1'. The document will not be processed as DITA. + '%2' appears to reference a DITA document, but the @format attribute has inherited a value of '%1'. The document will not be processed as DITA. @@ -684,7 +684,7 @@ See the accompanying LICENSE file for applicable license. The <area> element in an image map does not specify a link target. - Please add an <xref> element with a link target to the <area> element. + Add an <xref> element with a link target to the <area> element. @@ -729,7 +729,7 @@ See the accompanying LICENSE file for applicable license. A customized stylesheet uses the deprecated 'flagit' template. Conditional processing is no longer supported using this template. - Please update the stylesheet to use the 'start-flagit' template instead of the 'flagit' template. + Update the stylesheet to use the 'start-flagit' template instead of the 'flagit' template. @@ -759,7 +759,7 @@ See the accompanying LICENSE file for applicable license. It appears that this document uses constraints, but the conref processor cannot validate that the target of a conref is valid. - To enable constraint checking, please upgrade to an XSLT 2.0 processor. + To enable constraint checking, upgrade to an XSLT 2.0 processor. From 15a19b3ebd1a66c1ff9882521df1a489b89a0311 Mon Sep 17 00:00:00 2001 From: Roger Sheen Date: Fri, 29 Dec 2023 18:10:28 +0100 Subject: [PATCH 31/52] Rephrase to avoid future tense Per https://github.com/dita-ot/dita-ot/pull/4287#issuecomment-1846668956 Signed-off-by: Roger Sheen --- src/main/config/messages_template.xml | 56 +++++++++++++-------------- 1 file changed, 27 insertions(+), 29 deletions(-) diff --git a/src/main/config/messages_template.xml b/src/main/config/messages_template.xml index 27ff734de1..09cb1e3636 100644 --- a/src/main/config/messages_template.xml +++ b/src/main/config/messages_template.xml @@ -74,18 +74,18 @@ See the accompanying LICENSE file for applicable license. Duplicate condition in filter file for rule '%1'. - The first encountered condition will be used. + Using the first condition found. Duplicate condition in filter file for rule '%1'. - The first encountered condition will be used. + Using the first condition found. Duplicate condition in filter file for rule '%1'. - The first encountered condition will be used. + Using the first condition found. @@ -119,23 +119,23 @@ See the accompanying LICENSE file for applicable license. - The '%1' resource will not generate output because all content has been filtered out by DITAVAL 'exclude' conditions, or the resource is not valid DITA. + No output generated for '%1' because all content has been filtered out by DITAVAL 'exclude' conditions, or the resource is not valid DITA. Check the '%1' resource and the DITAVAL file to see if this is the intended result. - The '%1' resource will not generate output because all content has been filtered out by DITAVAL 'exclude' conditions, or the resource is not valid DITA. + No output generated for '%1' because all content has been filtered out by DITAVAL 'exclude' conditions, or the resource is not valid DITA. Check the '%1' resource and the DITAVAL file to see if this is the intended result. Failed to parse the input resource '%1' because all of its content has been filtered out. - This will happen if the resource has filter conditions on the root element, and a DITAVAL file excludes all content based on those conditions. + This can happen if the resource has filter conditions on the root element, and a DITAVAL file excludes all content based on those conditions. - The specified image file '%1' is not available. It will not be included in the output. + The specified image file '%1' is not available. It is not included in the output. Ensure that '%1' exists and that you have permission to access it. @@ -162,11 +162,11 @@ See the accompanying LICENSE file for applicable license. No @class attribute was found for the <%1> element. - The element will be processed as an unknown or non-DITA element. + Processing as an unknown or non-DITA element. - No rule for '%1' was found in the DITAVAL file. This value will use the default action, or a parent prop action if specified. + No rule for '%1' was found in the DITAVAL file. Using the default action, or a parent prop action if specified. To remove this message, specify a rule for '%1' in the DITAVAL file. @@ -191,10 +191,9 @@ See the accompanying LICENSE file for applicable license. - The XML schema and DTD validation function of the parser is turned off. - Make sure the input is normalized DITA with @class attributes included, otherwise it will not be processed correctly. + For correct processing, make sure the input is normalized DITA with @class attributes included. @@ -240,17 +239,17 @@ See the accompanying LICENSE file for applicable license. The @conkeyref attribute value '%1' cannot be resolved because it does not contain a key or the key is not defined. - The build will use the @conref attribute for fallback, if one exists. + Using the @conref attribute as fallback if it exists. Unable to find key definition for key reference '%1' in root scope. - The @href attribute may be used as fallback if it exists. + Using the @href attribute as fallback if it exists. Unable to find key definition for key reference '%1' in scope '%2'. - The @href attribute may be used as fallback if it exists. + Using the @href attribute as fallback if it exists. @@ -362,7 +361,7 @@ See the accompanying LICENSE file for applicable license. An invalid @class attribute '%1' for was found for the <%2> element. - The element will be processed as an unknown or non-DITA element. + Processing as an unknown or non-DITA element. @@ -476,7 +475,7 @@ See the accompanying LICENSE file for applicable license. Unable to find navigation title for reference to '%1'. - The build will use '%1' as the title in the Eclipse Table of Contents. + Using '%1' as the title in the Eclipse Table of Contents. @@ -485,7 +484,7 @@ See the accompanying LICENSE file for applicable license. - Only DITA topics, HTML files, and images may be included in the compiled CHM file. The reference to '%1' will be ignored. + Only DITA topics, HTML files, and images may be included in the compiled CHM file. Ignoring reference to '%1'. To remove this message, set the @toc attribute to 'no' or the @processing-role attribute to 'resource-only' on the topic reference. @@ -513,7 +512,7 @@ See the accompanying LICENSE file for applicable license. - There is more than one possible target for the @conref attribute value '%1'. Only the first will be used. + There is more than one possible target for the @conref attribute value '%1'. Using the first value found. Remove the duplicate ID in the referenced resource. @@ -540,8 +539,8 @@ See the accompanying LICENSE file for applicable license. - '%2' appears to reference a DITA document, but the @format attribute has inherited a value of '%1'. The document will not be processed as DITA. - + '%2' appears to reference a DITA document, but the @format attribute has inherited a value of '%1'. + Processing as a non-DITA element. To process as DITA, set the @format attribute to 'dita'. The input resource '%1' is not a valid DITA filename. - Check '%1' to see if it is correct. The '.dita' and '.xml' extensions are supported for DITA topics. + Check '%1' to see if it is correct. The '.dita' and '.xml' file name extensions are supported for DITA topics. @@ -286,12 +286,12 @@ See the accompanying LICENSE file for applicable license. Invalid key name '%1'. - + Check the reference to see if the target exists. - Invalid xml:lang '%1'. - + Invalid @xml:lang attribute value '%1'. + Check the correct value for the target language. @@ -326,7 +326,7 @@ See the accompanying LICENSE file for applicable license. The @cols attribute is set to '%1' but the number of <colspec> elements was '%2'. - Verify the number of columns in the table. + Check the number of columns in the table. @@ -743,7 +743,7 @@ See the accompanying LICENSE file for applicable license. No glossary entry found for the '%1' key on the '%2' element. - Verify display text and hover text for terms and abbreviations. + Check display text and hover text for terms and abbreviations. From 2169eb96e7b8a061eeaccefd2b062e7e390f89f1 Mon Sep 17 00:00:00 2001 From: Roger Sheen Date: Fri, 29 Dec 2023 19:22:43 +0100 Subject: [PATCH 33/52] Align XHTML messages Signed-off-by: Roger Sheen --- src/main/plugins/org.dita.xhtml/resource/messages.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/plugins/org.dita.xhtml/resource/messages.xml b/src/main/plugins/org.dita.xhtml/resource/messages.xml index da9bdd8fe2..a230e4e5b8 100644 --- a/src/main/plugins/org.dita.xhtml/resource/messages.xml +++ b/src/main/plugins/org.dita.xhtml/resource/messages.xml @@ -12,22 +12,22 @@ See the accompanying LICENSE file for applicable license. Absolute paths on the local file system are not supported for the CSSPATH parameter. - Please use a relative path or full URI instead. + Use a relative path or full URI instead. Cannot find the running-footer file '%1'. - Please double check the value to ensure it is specified correctly. + Check the value to ensure it is specified correctly. Cannot find the running-header file '%1'. - Please double check the value to ensure it is specified correctly. + Check the value to ensure it is specified correctly. Cannot find the specified heading file '%1'. - Please double check the value to ensure it is specified correctly. + Check the value to ensure it is specified correctly. From 6384d183a400caea9ebb5af45e69f71cd23fb98b Mon Sep 17 00:00:00 2001 From: Roger Sheen Date: Fri, 29 Dec 2023 19:31:28 +0100 Subject: [PATCH 34/52] =?UTF-8?q?Replace=20=E2=80=9Censure=E2=80=9D=20refe?= =?UTF-8?q?rences?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Roger Sheen --- src/main/config/messages_template.xml | 10 +++++----- src/main/plugins/org.dita.pdf2/resource/messages.xml | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/main/config/messages_template.xml b/src/main/config/messages_template.xml index e15303efaf..4753fe4fed 100644 --- a/src/main/config/messages_template.xml +++ b/src/main/config/messages_template.xml @@ -57,7 +57,7 @@ See the accompanying LICENSE file for applicable license. The input resource '%1' cannot be located or read. - Ensure that '%1' exists and that you have permission to access it. + Make sure '%1' exists and that you have permission to access it. @@ -68,7 +68,7 @@ See the accompanying LICENSE file for applicable license. toolkit development team. --> Failed to create new instance for '%1'. - Ensure that '%1' exists and that you have permission to access it. + Make sure '%1' exists and that you have permission to access it. @@ -136,7 +136,7 @@ See the accompanying LICENSE file for applicable license. The specified image file '%1' is not available. It is not included in the output. - Ensure that '%1' exists and that you have permission to access it. + Make sure '%1' exists and that you have permission to access it. @@ -265,7 +265,7 @@ See the accompanying LICENSE file for applicable license. Unable to load target for coderef '%1'. - Ensure that '%1' exists and that you have permission to access it. + Make sure '%1' exists and that you have permission to access it. @@ -491,7 +491,7 @@ See the accompanying LICENSE file for applicable license. The resource '%1' cannot be loaded. - Ensure that '%1' exists and that you have permission to access it. + Make sure '%1' exists and that you have permission to access it. diff --git a/src/main/plugins/org.dita.pdf2/resource/messages.xml b/src/main/plugins/org.dita.pdf2/resource/messages.xml index 5fa62648d2..00560a32f3 100644 --- a/src/main/plugins/org.dita.pdf2/resource/messages.xml +++ b/src/main/plugins/org.dita.pdf2/resource/messages.xml @@ -11,7 +11,7 @@ See the accompanying LICENSE file for applicable license. - Cannot find the user specified XSLT stylesheet '%1'. + Cannot find the user-specified XSLT stylesheet '%1'. From a99cb942af2ff7fa27a9f9ccdb56707f2fb8e22e Mon Sep 17 00:00:00 2001 From: Roger Sheen Date: Fri, 29 Dec 2023 21:18:43 +0100 Subject: [PATCH 35/52] Replace pseudo-code in PDF messages Signed-off-by: Roger Sheen --- .../plugins/org.dita.pdf2/resource/messages.xml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/main/plugins/org.dita.pdf2/resource/messages.xml b/src/main/plugins/org.dita.pdf2/resource/messages.xml index 00560a32f3..335572f56a 100644 --- a/src/main/plugins/org.dita.pdf2/resource/messages.xml +++ b/src/main/plugins/org.dita.pdf2/resource/messages.xml @@ -18,12 +18,12 @@ See the accompanying LICENSE file for applicable license. - Ignoring index-see '%1' inside parent index entry '%2' because the parent indexterm contains indexterm children. + Ignoring <index-see> '%1' inside parent index entry '%2' because the parent term contains term children. - Ignoring index-see-also '%1' inside parent index entry '%2' because the parent indexterm contains indexterm children. + Ignoring <index-see-also> '%1' inside parent index entry '%2' because the parent term contains term children. @@ -47,18 +47,18 @@ See the accompanying LICENSE file for applicable license. - There is an index term specified with start="%1", but there is no matching end for this term. - Add an index term in a valid location with end="%1". + An index term range is specified with a @start attribute value of '%1', but there is no matching @end attribute. + To end the range, add an index term in a valid location with the @end attribute set to '%1'. - There are multiple index terms specified with start="%1", but there is only one term to end this range, or the ranges for this term overlap. - Ensure that each term with this start value has a matching end value, and that the specified ranges for this value do not overlap + There are multiple index terms specified with a @start attribute value of '%1', but there is only one term to end this range, or the ranges for this term overlap. + Make sure that each term with this start value has a matching end value, and that the specified ranges for this value do not overlap. - There are multiple index entries found to close the index range for "%1". - Ensure that any index term with start="%1" has only one matching end term with end="%1". + Multiple index entries close the index range '%1'. + Make sure that each index term with with a @start attribute value of '%1' has only one matching term with an @end attribute value of '%1'. From 9bb9566ed77cf892f247b60f5c91828ac938e8e2 Mon Sep 17 00:00:00 2001 From: Roger Sheen Date: Fri, 29 Dec 2023 21:38:15 +0100 Subject: [PATCH 36/52] Align additional messages for consistency Signed-off-by: Roger Sheen --- src/main/config/messages_template.xml | 62 +++++++++---------- .../org.dita.htmlhelp/resource/messages.xml | 2 +- .../org.dita.pdf2/resource/messages.xml | 14 ++--- 3 files changed, 39 insertions(+), 39 deletions(-) diff --git a/src/main/config/messages_template.xml b/src/main/config/messages_template.xml index 4753fe4fed..14f3a768b1 100644 --- a/src/main/config/messages_template.xml +++ b/src/main/config/messages_template.xml @@ -105,17 +105,17 @@ See the accompanying LICENSE file for applicable license. Found an <indexterm> element with no content. - Setting the term to ***. + Setting the term to '***'. - Log file '%1' was generated successfully in directory '%2'. - Any messages from the transformation process are available in the log file; additional details about each message are available in the documentation. + The '%1' log file was written to the '%2' directory. + Any messages from the transformation process are available in the log; additional details about each message may be available in the documentation. - At least one plug-in in '%1' is required by plug-in '%2'. Plug-in '%2' cannot be loaded. - Check if all prerequisite plug-ins are properly installed. + The '%2' plug-in cannot be loaded because it requires at least one plug-in in '%1'. + Make sure all prerequisite plug-ins are properly installed. @@ -219,7 +219,7 @@ See the accompanying LICENSE file for applicable license. Two elements both use conref push to replace the target '%1'. - Delete one of the duplicate 'replace' actions. + Delete one of the duplicate 'pushreplace' actions. @@ -254,7 +254,7 @@ See the accompanying LICENSE file for applicable license. The @%1 attribute value '%3' on the <%2> element does not comply with the specified subject scheme. - According to the subject scheme map, the following values are valid for the @%1 attribute: '%4' + According to the subject scheme map, the following values are valid for the @%1 attribute: '%4'. @@ -300,7 +300,7 @@ See the accompanying LICENSE file for applicable license. - Both '%1' and '%2' attributes defined. + Both the @%1 and @%2 attributes are defined. A single element may not contain both generalized and specialized values for the same attribute. @@ -310,8 +310,8 @@ See the accompanying LICENSE file for applicable license. - Key '%1' was used in conkeyref but is not bound to a DITA topic or map. - Cannot resolve conkeyref value '%2' as a valid content reference. + The '%1' key is used in a @conkeyref attribute but it is not bound to a DITA topic or map. + Cannot resolve '%2' as a valid content key reference. @@ -360,7 +360,7 @@ See the accompanying LICENSE file for applicable license. - An invalid @class attribute '%1' for was found for the <%2> element. + An invalid @class attribute '%1' was found for the <%2> element. Processing as an unknown or non-DITA element. @@ -401,12 +401,12 @@ See the accompanying LICENSE file for applicable license. The input resource '%1' cannot be loaded. - Check if grammar files for this document type are properly referenced and installed. + Make sure the grammar files for this document type are properly referenced and installed. The '%1' resource cannot be loaded. - Check if grammar files for this document type are properly referenced and installed. + Make sure the grammar files for this document type are properly referenced and installed. @@ -520,7 +520,7 @@ See the accompanying LICENSE file for applicable license. Support for mismatched domains was added in release 1.5 or earlier. --> When you conref another topic or an item in another topic, the @domains attribute of the target topic must be equal to or a subset of the current topic's @domains attribute. - Put the target under an appropriate domain. You can see the messages guide for more help. + Put the target under an appropriate domain. @@ -563,16 +563,16 @@ See the accompanying LICENSE file for applicable license. Missing @navtitle attribute or element for peer topic '%1'. - References must provide a local navigation title when the target is not a local DITA resource. + References must provide a navigation title when the target is not a local DITA resource. Missing @navtitle attribute or element for non-DITA resource '%1'. - References must provide a local navigation title when the target is not a local DITA resource. + References must provide a navigation title when the target is not a local DITA resource. - Unable to retrieve navtitle from target: '%1'. Using linktext (specified in topicmeta) as the navigation title. + Unable to retrieve navtitle from target: '%1'. Using topicmeta linktext as the navigation title. @@ -583,12 +583,12 @@ See the accompanying LICENSE file for applicable license. Missing linktext and navtitle for peer topic '%1'. - References must provide a local navigation title when the target is not a local DITA resource. + References must provide a navigation title when the target is not a local DITA resource. Missing linktext and navtitle for non-DITA resource '%1'. - References must provide a local navigation title when the target is not a local DITA resource. + References must provide a navigation title when the target is not a local DITA resource. @@ -747,12 +747,12 @@ See the accompanying LICENSE file for applicable license. - The '%1' key was used in an <abbreviated-form> element, but the key is not associated with a glossary entry. - Abbreviated-form should ONLY be used to reference to a glossary entry. + The '%1' key is used in an <abbreviated-form> element, but the key is not associated with a glossary entry. + Abbreviated-form should ONLY be used to reference a glossary entry. - The @id attribute value '%1' was used on a <topicref> element, but it did not reference a topic element. + The @id attribute value '%1' is defined on a <topicref> element, but it does not reference a topic element. The @href attribute on a <topicref> element should only reference topic-level elements. @@ -777,7 +777,7 @@ See the accompanying LICENSE file for applicable license. - Template '%1' is deprecated. + The '%1' template is deprecated. Remove references to this template from the custom XSLT or plug-ins. @@ -788,27 +788,27 @@ See the accompanying LICENSE file for applicable license. A <topicref> element that references a map contains child <topicref> elements. - Child <topicref> elements are ignored. + Ignoring child topic references. - Template mode '%1' is deprecated. - Remove references to this template mode from the custom XSLT or plug-ins. + The '%1' template mode is deprecated. + Remove references to this template mode from custom XSLT or plug-ins. - Target '%1' is deprecated. - Remove references to this target from the custom Ant files. + The '%1' target is deprecated. + Remove references to this target from custom Ant files. - Conref range: Unable to find conref range end element with ID '%1'. + Unable to find conref range end element with ID '%1'. - Parameter '%1' on template '%2' is deprecated. - Use parameter '%3' instead. + The '%1' parameter on the '%2' template is deprecated. + Use the '%3' parameter instead. diff --git a/src/main/plugins/org.dita.htmlhelp/resource/messages.xml b/src/main/plugins/org.dita.htmlhelp/resource/messages.xml index d730bf11e3..67266f1d15 100644 --- a/src/main/plugins/org.dita.htmlhelp/resource/messages.xml +++ b/src/main/plugins/org.dita.htmlhelp/resource/messages.xml @@ -9,7 +9,7 @@ See the accompanying LICENSE file for applicable license. - In order to include peer or external topic '%1' in your help file, you may need to recompile the CHM file after making the file available. + To include the peer or external topic '%1' in your help file, you may need to recompile the CHM file after making the resource available. diff --git a/src/main/plugins/org.dita.pdf2/resource/messages.xml b/src/main/plugins/org.dita.pdf2/resource/messages.xml index 335572f56a..366e2be157 100644 --- a/src/main/plugins/org.dita.pdf2/resource/messages.xml +++ b/src/main/plugins/org.dita.pdf2/resource/messages.xml @@ -36,11 +36,11 @@ See the accompanying LICENSE file for applicable license. The build failed due to problems encountered when sorting the PDF index. - Please address any messages located earlier in the log. + Address any messages located earlier in the log. - Index entry '%1' will be sorted under the "Special characters" heading. + Index entry '%1' will be sorted under the 'Special characters' heading. @@ -58,17 +58,17 @@ See the accompanying LICENSE file for applicable license. Multiple index entries close the index range '%1'. - Make sure that each index term with with a @start attribute value of '%1' has only one matching term with an @end attribute value of '%1'. + Make sure that each index term with a @start attribute value of '%1' has only one matching term with a corresponding @end attribute value. - A topic reference was found with href="". + Found a topic reference with an empty @href attribute value. Please specify a target or remove the @href attribute. - The topic reference href="%1" cannot be found. - Please correct the reference, or set the @scope or @format attribute if the target is not a local DITA topic. + The '%1' topic reference cannot be found. + Please correct the @href attribute value, or set the @scope or @format attribute if the target is not a local DITA topic. - Found an index term with end="%1", but no starting term was found for this entry. + Found an index term with @end attribute value '%1', but no start term was found for this entry. From 739eefc1e58b68537b6112a2fd8ddb2a20ad7d85 Mon Sep 17 00:00:00 2001 From: Roger Sheen Date: Sat, 30 Dec 2023 17:34:47 +0100 Subject: [PATCH 37/52] Move extra info from to Signed-off-by: Roger Sheen --- src/main/config/messages_template.xml | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/src/main/config/messages_template.xml b/src/main/config/messages_template.xml index 14f3a768b1..330cad1149 100644 --- a/src/main/config/messages_template.xml +++ b/src/main/config/messages_template.xml @@ -552,13 +552,13 @@ See the accompanying LICENSE file for applicable license. - The @type attribute on a topicref was set to '%1', but the topicref references a more specific '%2' topic. Note that the @type attribute cascades in maps, so the value '%1' may come from an ancestor topicref. - + The @type attribute on a topicref was set to '%1', but the topicref references a more specific '%2' topic. + Note that the @type attribute cascades in maps, so the value '%1' may come from an ancestor topicref. - The @type attribute on a topicref was set to '%1', but the topicref references a '%2' topic. This may cause links to sort incorrectly in the output. Note that the @type attribute cascades in maps, so the value '%1' may come from an ancestor topicref. - + The @type attribute on a topicref was set to '%1', but the topicref references a '%2' topic. + This may cause links to sort incorrectly in the output. Note that the @type attribute cascades in maps, so the value '%1' may come from an ancestor topicref. @@ -607,13 +607,13 @@ See the accompanying LICENSE file for applicable license. - The @type attribute on a <%1> element was set to '%3', but the reference is to a more specific '%4' '%2'. This may cause links to sort incorrectly in the output. - + The @type attribute on a <%1> element was set to '%3', but the reference is to a more specific '%4' '%2'. + This may cause links to sort incorrectly in the output. - The @type attribute on a <%1> element was set to '%3', but the reference is to a '%4' '%2'. This may cause links to sort incorrectly in the output. - + The @type attribute on a <%1> element was set to '%3', but the reference is to a '%4' '%2'. + This may cause links to sort incorrectly in the output. @@ -717,8 +717,8 @@ See the accompanying LICENSE file for applicable license. - A element that references another map indirectly includes itself, which results in an infinite loop. The original map reference is to '%1'. - + A element that references another map indirectly includes itself, which results in an infinite loop. + The original map reference is to '%1'. From 169cfa5c1c8510ba83e6b0076544e1ab6c358f4b Mon Sep 17 00:00:00 2001 From: Roger Sheen Date: Sat, 30 Dec 2023 17:36:13 +0100 Subject: [PATCH 38/52] Re-use DOTJ063E Signed-off-by: Roger Sheen --- src/main/plugins/org.dita.pdf2/resource/messages.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/plugins/org.dita.pdf2/resource/messages.xml b/src/main/plugins/org.dita.pdf2/resource/messages.xml index 366e2be157..a7dd5ae19f 100644 --- a/src/main/plugins/org.dita.pdf2/resource/messages.xml +++ b/src/main/plugins/org.dita.pdf2/resource/messages.xml @@ -99,7 +99,7 @@ See the accompanying LICENSE file for applicable license. Found a table row with more entries than allowed. - + Check the number of columns in the table. From c81717c9f416c6b699b4651a7f6815337b48ccf7 Mon Sep 17 00:00:00 2001 From: Roger Sheen Date: Sat, 6 Jan 2024 01:28:09 +0100 Subject: [PATCH 39/52] Implement review feedback on DOTJ033E Per https://github.com/dita-ot/dita-ot/pull/4287#discussion_r1442337986 Signed-off-by: Roger Sheen --- src/main/config/messages_template.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/config/messages_template.xml b/src/main/config/messages_template.xml index 330cad1149..c20a340aad 100644 --- a/src/main/config/messages_template.xml +++ b/src/main/config/messages_template.xml @@ -171,7 +171,7 @@ See the accompanying LICENSE file for applicable license. - No valid content found in topicref '%1' during chunk processing. + No valid content found in the referenced resource '%1' during chunk processing. Specify an existing and valid topic for the topic reference. From 0cbb2a1c5676a1b7d4e4e2b1cea74daba6ed3d69 Mon Sep 17 00:00:00 2001 From: Roger Sheen Date: Sat, 6 Jan 2024 01:52:26 +0100 Subject: [PATCH 40/52] Clarify additional details for DOTJ025E & DOTJ026E Per https://github.com/dita-ot/dita-ot/pull/4287#discussion_r1442338433 Signed-off-by: Roger Sheen --- src/main/config/messages_template.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/config/messages_template.xml b/src/main/config/messages_template.xml index c20a340aad..27e70a9a3c 100644 --- a/src/main/config/messages_template.xml +++ b/src/main/config/messages_template.xml @@ -141,12 +141,12 @@ See the accompanying LICENSE file for applicable license. The input to the 'topic merge' process cannot be found. - Correct any earlier errors and try the build again, or see the documentation for additional causes. + Correct any earlier errors and try the build again, or see the documentation for additional details. The 'topic merge' process did not generate any output. - Correct any earlier errors and try the build again, or see the documentation for additional causes. + Correct any earlier errors and try the build again, or see the documentation for additional details. From e526b0ae43cefc01b4cbd6f3de46f99adc656fef Mon Sep 17 00:00:00 2001 From: Roger Sheen Date: Sat, 6 Jan 2024 01:56:14 +0100 Subject: [PATCH 41/52] Implement review feedback on DOTJ043W Per https://github.com/dita-ot/dita-ot/pull/4287#discussion_r1442341304 Signed-off-by: Roger Sheen --- src/main/config/messages_template.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/config/messages_template.xml b/src/main/config/messages_template.xml index 27e70a9a3c..394d6dc92a 100644 --- a/src/main/config/messages_template.xml +++ b/src/main/config/messages_template.xml @@ -224,7 +224,7 @@ See the accompanying LICENSE file for applicable license. The conref push function is trying to replace an element <%1> that does not exist in the '%2' resource. - Update the reference to point to a valid target. + Update the reference to refer to a valid target. From 51919f03c1a4958b959f19e68ba442f08813dd0a Mon Sep 17 00:00:00 2001 From: Roger Sheen Date: Sat, 6 Jan 2024 02:15:25 +0100 Subject: [PATCH 42/52] Implement review feedback on DOTJ055E Per https://github.com/dita-ot/dita-ot/pull/4287#discussion_r1442349875 Signed-off-by: Roger Sheen --- src/main/config/messages_template.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/config/messages_template.xml b/src/main/config/messages_template.xml index 394d6dc92a..bdffc6add5 100644 --- a/src/main/config/messages_template.xml +++ b/src/main/config/messages_template.xml @@ -286,7 +286,7 @@ See the accompanying LICENSE file for applicable license. Invalid key name '%1'. - Check the reference to see if the target exists. + Key names consist of URI characters and may not contain '{', '}', '[', ']', '/', '#', '?' or whitespace. From 20979938ad9921a2afde71fe7b1d16e431065d99 Mon Sep 17 00:00:00 2001 From: Roger Sheen Date: Sat, 6 Jan 2024 02:17:02 +0100 Subject: [PATCH 43/52] Implement review feedback on DOTJ065I Per https://github.com/dita-ot/dita-ot/pull/4287#discussion_r1442358542 Signed-off-by: Roger Sheen --- src/main/config/messages_template.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/config/messages_template.xml b/src/main/config/messages_template.xml index bdffc6add5..ced501142c 100644 --- a/src/main/config/messages_template.xml +++ b/src/main/config/messages_template.xml @@ -335,7 +335,7 @@ See the accompanying LICENSE file for applicable license. - Branch filter generated topic '%1' used more than once. + Branch filter generated topic '%1' is used more than once. Renaming '%1' to '%2'. From 29b45c5a03382dba50db9a4deca937b1b6c08c0e Mon Sep 17 00:00:00 2001 From: Roger Sheen Date: Sat, 6 Jan 2024 02:24:06 +0100 Subject: [PATCH 44/52] Align grammar file references Per https://github.com/dita-ot/dita-ot/pull/4287#discussion_r1442360127 Signed-off-by: Roger Sheen --- src/main/config/messages_template.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/config/messages_template.xml b/src/main/config/messages_template.xml index ced501142c..b306918383 100644 --- a/src/main/config/messages_template.xml +++ b/src/main/config/messages_template.xml @@ -157,7 +157,7 @@ See the accompanying LICENSE file for applicable license. No @domains attribute was found for the <%1> element. - This generally indicates that the DTD or schema was not developed properly according to the DITA specification. + This generally indicates that the grammar files (such as DTDs or schemas) were not developed properly according to the DITA specification. @@ -401,12 +401,12 @@ See the accompanying LICENSE file for applicable license. The input resource '%1' cannot be loaded. - Make sure the grammar files for this document type are properly referenced and installed. + Make sure the grammar files (such as DTDs or schemas) for this document type are properly referenced and installed. The '%1' resource cannot be loaded. - Make sure the grammar files for this document type are properly referenced and installed. + Make sure the grammar files (such as DTDs or schemas) for this document type are properly referenced and installed. From 3ea9e584651cc222169907b4081780082d76e617 Mon Sep 17 00:00:00 2001 From: Roger Sheen Date: Sat, 6 Jan 2024 02:26:42 +0100 Subject: [PATCH 45/52] Implement review feedback on DOTX010E Per https://github.com/dita-ot/dita-ot/pull/4287#discussion_r1442363105 Signed-off-by: Roger Sheen --- src/main/config/messages_template.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/config/messages_template.xml b/src/main/config/messages_template.xml index b306918383..98faf3d765 100644 --- a/src/main/config/messages_template.xml +++ b/src/main/config/messages_template.xml @@ -507,8 +507,8 @@ See the accompanying LICENSE file for applicable license. - Unable to find the @conref attribute value '%1'. - Check '%1' to see if the target exists. + Unable to find the @conref target '%1'. + Check '%1' to see if the target resource exists. From 49aab4754274bb4f9076728bfba92c8bf46ee50b Mon Sep 17 00:00:00 2001 From: Roger Sheen Date: Sat, 6 Jan 2024 02:28:13 +0100 Subject: [PATCH 46/52] Implement review feedback on DOTX016W Per https://github.com/dita-ot/dita-ot/pull/4287#discussion_r1442365696 Signed-off-by: Roger Sheen --- src/main/config/messages_template.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/config/messages_template.xml b/src/main/config/messages_template.xml index 98faf3d765..4dd9c188c6 100644 --- a/src/main/config/messages_template.xml +++ b/src/main/config/messages_template.xml @@ -540,7 +540,7 @@ See the accompanying LICENSE file for applicable license. '%2' appears to reference a DITA document, but the @format attribute has inherited a value of '%1'. - Processing as a non-DITA element. To process as DITA, set the @format attribute to 'dita'. + Processing as a non-DITA resource. To process as DITA, set the @format attribute to 'dita'. DITAVAL-based flagging is not currently supported for inline phrases in XHTML; ignoring flag value on '%1' attribute. @@ -726,6 +727,7 @@ See the accompanying LICENSE file for applicable license. Check the DITAVAL and DITA source files to make sure there is no style conflict on the element that needs to be flagged. + A customized stylesheet uses the deprecated 'flagit' template. Conditional processing is no longer supported using this template. Update the stylesheet to use the 'start-flagit' template instead of the 'flagit' template. From 7e171932c7f08ac91e05b09de1cd18c97d49e1be Mon Sep 17 00:00:00 2001 From: Roger Sheen Date: Sat, 6 Jan 2024 02:36:10 +0100 Subject: [PATCH 49/52] Implement review feedback on DOTX058W Per https://github.com/dita-ot/dita-ot/pull/4287#discussion_r1442384274 Signed-off-by: Roger Sheen --- src/main/config/messages_template.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/config/messages_template.xml b/src/main/config/messages_template.xml index 6c5116da4b..ae9e3e3cb2 100644 --- a/src/main/config/messages_template.xml +++ b/src/main/config/messages_template.xml @@ -744,7 +744,7 @@ See the accompanying LICENSE file for applicable license. - No glossary entry found for the '%1' key on the '%2' element. + No glossary entry found for the '%1' key on the <%2> element. Check display text and hover text for terms and abbreviations. From 5e00d3dd6723c4a36153e3993ec711025ae14c6e Mon Sep 17 00:00:00 2001 From: Roger Sheen Date: Sat, 6 Jan 2024 02:40:55 +0100 Subject: [PATCH 50/52] Implement review feedback on DOTX061W Per https://github.com/dita-ot/dita-ot/pull/4287#discussion_r1442385027 Signed-off-by: Roger Sheen --- src/main/config/messages_template.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/config/messages_template.xml b/src/main/config/messages_template.xml index ae9e3e3cb2..a5a8c80234 100644 --- a/src/main/config/messages_template.xml +++ b/src/main/config/messages_template.xml @@ -754,7 +754,7 @@ See the accompanying LICENSE file for applicable license. - The @id attribute value '%1' is defined on a <topicref> element, but it does not reference a topic element. + The @href attribute value '%1' contains a fragment identifier, but it does not reference a topic element. The @href attribute on a <topicref> element should only reference topic-level elements. From 8623f891b069816e9227e14026b19dac17fad842 Mon Sep 17 00:00:00 2001 From: Roger Sheen Date: Sat, 6 Jan 2024 02:43:13 +0100 Subject: [PATCH 51/52] Implement review feedback on DOTX071W Per https://github.com/dita-ot/dita-ot/pull/4287#discussion_r1442392196 Signed-off-by: Roger Sheen --- src/main/config/messages_template.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/config/messages_template.xml b/src/main/config/messages_template.xml index a5a8c80234..5aeb2b362d 100644 --- a/src/main/config/messages_template.xml +++ b/src/main/config/messages_template.xml @@ -808,6 +808,7 @@ See the accompanying LICENSE file for applicable license. + The '%1' parameter on the '%2' template is deprecated. Use the '%3' parameter instead. From 89a6446fe8fffb34521c291870b3e753e583ab55 Mon Sep 17 00:00:00 2001 From: Roger Sheen Date: Sat, 6 Jan 2024 11:33:51 +0100 Subject: [PATCH 52/52] Implement review feedback on DOTJ038E Per https://github.com/dita-ot/dita-ot/pull/4287#discussion_r1442340001 Signed-off-by: Roger Sheen --- src/main/config/messages_template.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/config/messages_template.xml b/src/main/config/messages_template.xml index 5aeb2b362d..893b00ef50 100644 --- a/src/main/config/messages_template.xml +++ b/src/main/config/messages_template.xml @@ -196,6 +196,7 @@ See the accompanying LICENSE file for applicable license. For correct processing, make sure the input is normalized DITA with @class attributes included. + The <%1> element is specialized from unrecognized metadata. Make sure that the <%1> element is specialized from an existing metadata element in the core DITA vocabulary.