From 51e2e0f3bd4f28ca39cc33cbb5a5e0babe7dad23 Mon Sep 17 00:00:00 2001 From: Jim Derry Date: Thu, 7 Sep 2017 21:06:44 -0400 Subject: [PATCH] Following the example of the recent changes in the "reports" aspect of Tidy's output, classify and organize all of the dialogue type of messages. This paves the way towards formalizing (and expanding!) the footnotes system with much greater explanatory text, as well as providing much better fine-grained control over which types of output that Tidy will produce. Moved STRING_DOCTYPE_GIVEN, STRING_CONTENT_LOOKS, and STRING_NO_SYSID to the Report paradigm from the Dialogue paradigm, as these are items that are traditionally TidyInfo and included in the Report table, rather than any type of dialogue. At this point, we are exactly passing all tests. --- include/tidy.h | 4 +- include/tidyenum.h | 59 ++-- localize/translations/language_en_gb.po | 130 ++++----- localize/translations/language_es.po | 130 ++++----- localize/translations/language_es_mx.po | 130 ++++----- localize/translations/language_fr.po | 134 +++++----- localize/translations/language_zh_cn.po | 130 ++++----- localize/translations/tidy.pot | 130 ++++----- src/access.c | 6 +- src/language_en.h | 59 ++-- src/language_fr.h | 32 +-- src/language_zh_cn.h | 4 +- src/message.c | 342 ++++++++++++++---------- src/message.h | 2 +- src/tidylib.c | 6 +- version.txt | 2 +- 16 files changed, 686 insertions(+), 614 deletions(-) diff --git a/include/tidy.h b/include/tidy.h index bc83b79..29ccc09 100644 --- a/include/tidy.h +++ b/include/tidy.h @@ -1506,8 +1506,8 @@ TIDY_EXPORT int TIDY_CALL tidyParseSource(TidyDoc tdoc, /**< T */ TIDY_EXPORT int TIDY_CALL tidyCleanAndRepair( TidyDoc tdoc ); -/** Run configured diagnostics on parsed and repaired markup. You must call - ** tidyCleanAndRepair() before using this function. +/** Reports the document type and diagnostic statistics on parsed and repaired + ** markup. You must call tidyCleanAndRepair() before using this function. ** @param tdoc The tidy document to use. ** @result An integer representing the status. */ diff --git a/include/tidyenum.h b/include/tidyenum.h index bd65ce9..4bbae26 100644 --- a/include/tidyenum.h +++ b/include/tidyenum.h @@ -100,27 +100,15 @@ extern "C" { ** application specific messages. */ #define FOREACH_MSG_MISC(FN) \ -/** File can't be opened */ FN(FILE_CANT_OPEN) \ -/** File can't be opened */ FN(FILE_CANT_OPEN_CFG) \ -/** Not a file */ FN(FILE_NOT_FILE) \ /** line %d column %d */ FN(LINE_COLUMN_STRING) \ -/** Document content looks like %s */ FN(STRING_CONTENT_LOOKS) \ /** discarding */ FN(STRING_DISCARDING) \ -/** Doctype given is %s */ FN(STRING_DOCTYPE_GIVEN) \ -/** %u %s, %u %s were found! */ FN(STRING_ERROR_COUNT) \ /** error and errors */ FN(STRING_ERROR_COUNT_ERROR) \ /** warning and warnings */ FN(STRING_ERROR_COUNT_WARNING) \ /** Accessibility hello message */ FN(STRING_HELLO_ACCESS) \ /** HTML Proprietary */ FN(STRING_HTML_PROPRIETARY) \ -/** missing or malformed argument for option: */ FN(STRING_MISSING_MALFORMED) \ -/** Errors must be fixed */ FN(STRING_NEEDS_INTERVENTION) \ -/** No warnings or errors were found */ FN(STRING_NO_ERRORS) \ -/** No system identifier in emitted doctype */ FN(STRING_NO_SYSID) \ -/** Not all warnings/errors were shown */ FN(STRING_NOT_ALL_SHOWN) \ /** plain text */ FN(STRING_PLAIN_TEXT) \ /** replacing */ FN(STRING_REPLACING) \ /** specified */ FN(STRING_SPECIFIED) \ -/** unknown option: %s */ FN(STRING_UNKNOWN_OPTION) \ /** XML declaration */ FN(STRING_XML_DECLARATION) \ /** no */ FN(TIDYCUSTOMNO_STRING) \ /** block level */ FN(TIDYCUSTOMBLOCKLEVEL_STRING) \ @@ -133,13 +121,11 @@ extern "C" { ** Tidy when certain conditions exist, and provide more verbose explanations ** than the short report. */ -#define FOREACH_DIALOG_MSG(FN) \ +#define FOREACH_FOOTNOTE_MSG(FN) \ /** Explanatory text. */ FN(TEXT_ACCESS_ADVICE1) \ /** Explanatory text. */ FN(TEXT_ACCESS_ADVICE2) \ /** Explanatory text. */ FN(TEXT_BAD_FORM) \ /** Explanatory text. */ FN(TEXT_BAD_MAIN) \ -/** Explanatory text. */ FN(TEXT_GENERAL_INFO_PLEA) \ -/** Explanatory text. */ FN(TEXT_GENERAL_INFO) \ /** Explanatory text. */ FN(TEXT_HTML_T_ALGORITHM) \ /** Explanatory text. */ FN(TEXT_INVALID_URI) \ /** Explanatory text. */ FN(TEXT_INVALID_UTF16) \ @@ -159,6 +145,22 @@ extern "C" { /** Explanatory text. */ FN(TEXT_WINDOWS_CHARS) +/** These messages are used to generate additional dialogue style output from + ** Tidy when certain conditions exist, and provide more verbose explanations + ** than the short report. + */ +#define FOREACH_DIALOG_MSG(FN) \ + FN(STRING_CONTENT_LOOKS) \ + FN(STRING_DOCTYPE_GIVEN) \ + FN(STRING_ERROR_COUNT) \ + FN(STRING_NEEDS_INTERVENTION) \ + FN(STRING_NO_ERRORS) \ + FN(STRING_NO_SYSID) \ + FN(STRING_NOT_ALL_SHOWN) \ + FN(TEXT_GENERAL_INFO_PLEA) \ + FN(TEXT_GENERAL_INFO) + + /** These are report messages, i.e., messages that appear in Tidy's table ** of errors and warnings. */ @@ -189,6 +191,9 @@ extern "C" { FN(ELEMENT_VERS_MISMATCH_WARN) \ FN(ENCODING_MISMATCH) \ FN(ESCAPED_ILLEGAL_URI) \ + FN(FILE_CANT_OPEN) \ + FN(FILE_CANT_OPEN_CFG) \ + FN(FILE_NOT_FILE) \ FN(FIXED_BACKSLASH) \ FN(FOUND_STYLE_IN_BODY) \ FN(ID_NAME_MISMATCH) \ @@ -235,6 +240,8 @@ extern "C" { FN(REPLACING_ELEMENT) \ FN(REPLACING_UNEX_ELEMENT) \ FN(SPACE_PRECEDING_XMLDECL) \ + FN(STRING_MISSING_MALFORMED) \ + FN(STRING_UNKNOWN_OPTION) \ FN(SUSPECTED_MISSING_QUOTE) \ FN(TAG_NOT_ALLOWED_IN) \ FN(TOO_MANY_ELEMENTS_IN) \ @@ -1342,16 +1349,17 @@ typedef enum */ typedef enum { - TidyInfo = 350, /**< Report: Information about markup usage */ - TidyWarning, /**< Report: Warning message */ - TidyConfig, /**< Report: Configuration error */ - TidyAccess, /**< Report: Accessibility message */ - TidyError, /**< Report: Error message - output suppressed */ - TidyBadDocument, /**< Report: I/O or file system error */ - TidyFatal, /**< Report: Crash! */ - TidyDialogueInfo, /**< Dialogue: Non-document related information */ - TidyDialogueSummary, /**< Dialogue: Summary-related information */ - TidyDialogueDoc, /**< Dialogue: Document-related information */ + TidyInfo = 350, /**< Report: Information about markup usage */ + TidyWarning, /**< Report: Warning message */ + TidyConfig, /**< Report: Configuration error */ + TidyAccess, /**< Report: Accessibility message */ + TidyError, /**< Report: Error message - output suppressed */ + TidyBadDocument, /**< Report: I/O or file system error */ + TidyFatal, /**< Report: Crash! */ + TidyDialogueSummary, /**< Dialogue: Summary-related information */ + TidyDialogueInfo, /**< Dialogue: Non-document related information */ + TidyDialogueFootnote, /**< Dialogue: Footnote */ + TidyDialogueDoc = TidyDialogueFootnote, /**< Dialogue: Deprecated (renamed) */ } TidyReportLevel; @@ -1397,6 +1405,7 @@ typedef enum TIDYSTRINGS_FIRST = 500, FOREACH_MSG_MISC(MAKE_ENUM) + FOREACH_FOOTNOTE_MSG(MAKE_ENUM) FOREACH_DIALOG_MSG(MAKE_ENUM) FOREACH_REPORT_MSG(MAKE_ENUM) diff --git a/localize/translations/language_en_gb.po b/localize/translations/language_en_gb.po index 9743259..c9eee89 100644 --- a/localize/translations/language_en_gb.po +++ b/localize/translations/language_en_gb.po @@ -5,7 +5,7 @@ msgstr "" "Plural-Forms: nplurals=2; plural=n != 1;\n" "X-Generator: HTML Tidy poconvert.rb\n" "Project-Id-Version: \n" -"PO-Revision-Date: 2017-09-06 20:53:40\n" +"PO-Revision-Date: 2017-09-08 11:50:57\n" "Last-Translator: jderry\n" "Language-Team: \n" @@ -1792,23 +1792,8 @@ msgctxt "TidyDialogueSummary" msgid "Summary: " msgstr "" -msgctxt "TidyDialogueDoc" -msgid "Document: " -msgstr "" - -#, c-format -msgctxt "FILE_CANT_OPEN" -msgid "Can't open \"%s\"\n" -msgstr "" - -#, c-format -msgctxt "FILE_CANT_OPEN_CFG" -msgid "Can't open configuration file \"%s\"\n" -msgstr "" - -#, c-format -msgctxt "FILE_NOT_FILE" -msgid "\"%s\" is not a file!\n" +msgctxt "TidyDialogueFootnote" +msgid "Footnote: " msgstr "" #, c-format @@ -1816,27 +1801,11 @@ msgctxt "LINE_COLUMN_STRING" msgid "line %d column %d - " msgstr "" -#, c-format -msgctxt "STRING_CONTENT_LOOKS" -msgid "Document content looks like %s" -msgstr "" - #. For example, "discarding invalid UTF-16 surrogate pair" msgctxt "STRING_DISCARDING" msgid "discarding" msgstr "" -#, c-format -msgctxt "STRING_DOCTYPE_GIVEN" -msgid "Doctype given is \"%s\"" -msgstr "" - -#. The strings "Tidy" and "HTML Tidy" are the program name and must not be translated. -#, c-format -msgctxt "STRING_ERROR_COUNT" -msgid "Tidy found %u %s and %u %s!" -msgstr "" - msgctxt "STRING_ERROR_COUNT_ERROR" msgid "error" msgid_plural "errors" @@ -1858,36 +1827,10 @@ msgctxt "STRING_HTML_PROPRIETARY" msgid "HTML Proprietary" msgstr "" -#, c-format -msgctxt "STRING_MISSING_MALFORMED" -msgid "missing or malformed argument for option: %s" -msgstr "" - msgctxt "STRING_XML_DECLARATION" msgid "XML declaration" msgstr "" -#. This console output should be limited to 78 characters per line. -#. - The strings "Tidy" and "HTML Tidy" are the program name and must not be translated. -msgctxt "STRING_NEEDS_INTERVENTION" -msgid "" -"This document has errors that must be fixed before\n" -"using HTML Tidy to generate a tidied up version.\n" -msgstr "" - -msgctxt "STRING_NO_ERRORS" -msgid "No warnings or errors were found." -msgstr "" - -msgctxt "STRING_NO_SYSID" -msgid "No system identifier in emitted doctype" -msgstr "" - -#, c-format -msgctxt "STRING_NOT_ALL_SHOWN" -msgid "Tidy found %u %s and %u %s! Not all warnings/errors were shown." -msgstr "" - msgctxt "STRING_PLAIN_TEXT" msgid "plain text" msgstr "" @@ -1902,11 +1845,6 @@ msgctxt "STRING_SPECIFIED" msgid "specified" msgstr "" -#, c-format -msgctxt "STRING_UNKNOWN_OPTION" -msgid "unknown option: %s" -msgstr "" - msgctxt "TIDYCUSTOMNO_STRING" msgid "no" msgstr "" @@ -2130,6 +2068,43 @@ msgctxt "TEXT_USING_BODY" msgid "You are recommended to use CSS to specify page and link colors" msgstr "You are recommended to use CSS to specify page and link colours\n" +#, c-format +msgctxt "STRING_CONTENT_LOOKS" +msgid "Document content looks like %s" +msgstr "" + +#, c-format +msgctxt "STRING_DOCTYPE_GIVEN" +msgid "Doctype given is \"%s\"" +msgstr "" + +#. The strings "Tidy" and "HTML Tidy" are the program name and must not be translated. +#, c-format +msgctxt "STRING_ERROR_COUNT" +msgid "Tidy found %u %s and %u %s!" +msgstr "" + +#. This console output should be limited to 78 characters per line. +#. - The strings "Tidy" and "HTML Tidy" are the program name and must not be translated. +msgctxt "STRING_NEEDS_INTERVENTION" +msgid "" +"This document has errors that must be fixed before\n" +"using HTML Tidy to generate a tidied up version.\n" +msgstr "" + +msgctxt "STRING_NO_ERRORS" +msgid "No warnings or errors were found." +msgstr "" + +msgctxt "STRING_NO_SYSID" +msgid "No system identifier in emitted doctype" +msgstr "" + +#, c-format +msgctxt "STRING_NOT_ALL_SHOWN" +msgid "Tidy found %u %s and %u %s! Not all warnings/errors were shown." +msgstr "" + #. This console output should be limited to 78 characters per line. #. - The strings "Tidy" and "HTML Tidy" are the program name and must not be translated. msgctxt "TEXT_GENERAL_INFO" @@ -2278,6 +2253,21 @@ msgctxt "ESCAPED_ILLEGAL_URI" msgid "%s escaping malformed URI reference" msgstr "" +#, c-format +msgctxt "FILE_CANT_OPEN" +msgid "Can't open \"%s\"\n" +msgstr "" + +#, c-format +msgctxt "FILE_CANT_OPEN_CFG" +msgid "Can't open configuration file \"%s\"\n" +msgstr "" + +#, c-format +msgctxt "FILE_NOT_FILE" +msgid "\"%s\" is not a file!\n" +msgstr "" + #, c-format msgctxt "FIXED_BACKSLASH" msgid "%s converting backslash in URI to slash" @@ -2500,6 +2490,16 @@ msgctxt "SPACE_PRECEDING_XMLDECL" msgid "removing whitespace preceding XML Declaration" msgstr "" +#, c-format +msgctxt "STRING_MISSING_MALFORMED" +msgid "missing or malformed argument for option: %s" +msgstr "" + +#, c-format +msgctxt "STRING_UNKNOWN_OPTION" +msgid "unknown option: %s" +msgstr "" + msgctxt "SUSPECTED_MISSING_QUOTE" msgid "missing quote mark for attribute value" msgstr "" diff --git a/localize/translations/language_es.po b/localize/translations/language_es.po index ace5e17..db79687 100644 --- a/localize/translations/language_es.po +++ b/localize/translations/language_es.po @@ -5,7 +5,7 @@ msgstr "" "Plural-Forms: nplurals=2; plural=n != 1;\n" "X-Generator: HTML Tidy poconvert.rb\n" "Project-Id-Version: \n" -"PO-Revision-Date: 2017-09-06 20:53:40\n" +"PO-Revision-Date: 2017-09-08 11:50:57\n" "Last-Translator: jderry\n" "Language-Team: \n" @@ -1740,23 +1740,8 @@ msgctxt "TidyDialogueSummary" msgid "Summary: " msgstr "" -msgctxt "TidyDialogueDoc" -msgid "Document: " -msgstr "" - -#, c-format -msgctxt "FILE_CANT_OPEN" -msgid "Can't open \"%s\"\n" -msgstr "" - -#, c-format -msgctxt "FILE_CANT_OPEN_CFG" -msgid "Can't open configuration file \"%s\"\n" -msgstr "" - -#, c-format -msgctxt "FILE_NOT_FILE" -msgid "\"%s\" is not a file!\n" +msgctxt "TidyDialogueFootnote" +msgid "Footnote: " msgstr "" #, c-format @@ -1764,27 +1749,11 @@ msgctxt "LINE_COLUMN_STRING" msgid "line %d column %d - " msgstr "" -#, c-format -msgctxt "STRING_CONTENT_LOOKS" -msgid "Document content looks like %s" -msgstr "" - #. For example, "discarding invalid UTF-16 surrogate pair" msgctxt "STRING_DISCARDING" msgid "discarding" msgstr "" -#, c-format -msgctxt "STRING_DOCTYPE_GIVEN" -msgid "Doctype given is \"%s\"" -msgstr "" - -#. The strings "Tidy" and "HTML Tidy" are the program name and must not be translated. -#, c-format -msgctxt "STRING_ERROR_COUNT" -msgid "Tidy found %u %s and %u %s!" -msgstr "" - msgctxt "STRING_ERROR_COUNT_ERROR" msgid "error" msgid_plural "errors" @@ -1806,36 +1775,10 @@ msgctxt "STRING_HTML_PROPRIETARY" msgid "HTML Proprietary" msgstr "" -#, c-format -msgctxt "STRING_MISSING_MALFORMED" -msgid "missing or malformed argument for option: %s" -msgstr "" - msgctxt "STRING_XML_DECLARATION" msgid "XML declaration" msgstr "" -#. This console output should be limited to 78 characters per line. -#. - The strings "Tidy" and "HTML Tidy" are the program name and must not be translated. -msgctxt "STRING_NEEDS_INTERVENTION" -msgid "" -"This document has errors that must be fixed before\n" -"using HTML Tidy to generate a tidied up version.\n" -msgstr "" - -msgctxt "STRING_NO_ERRORS" -msgid "No warnings or errors were found." -msgstr "" - -msgctxt "STRING_NO_SYSID" -msgid "No system identifier in emitted doctype" -msgstr "" - -#, c-format -msgctxt "STRING_NOT_ALL_SHOWN" -msgid "Tidy found %u %s and %u %s! Not all warnings/errors were shown." -msgstr "" - msgctxt "STRING_PLAIN_TEXT" msgid "plain text" msgstr "" @@ -1850,11 +1793,6 @@ msgctxt "STRING_SPECIFIED" msgid "specified" msgstr "" -#, c-format -msgctxt "STRING_UNKNOWN_OPTION" -msgid "unknown option: %s" -msgstr "" - msgctxt "TIDYCUSTOMNO_STRING" msgid "no" msgstr "" @@ -2074,6 +2012,43 @@ msgctxt "TEXT_USING_BODY" msgid "You are recommended to use CSS to specify page and link colors" msgstr "" +#, c-format +msgctxt "STRING_CONTENT_LOOKS" +msgid "Document content looks like %s" +msgstr "" + +#, c-format +msgctxt "STRING_DOCTYPE_GIVEN" +msgid "Doctype given is \"%s\"" +msgstr "" + +#. The strings "Tidy" and "HTML Tidy" are the program name and must not be translated. +#, c-format +msgctxt "STRING_ERROR_COUNT" +msgid "Tidy found %u %s and %u %s!" +msgstr "" + +#. This console output should be limited to 78 characters per line. +#. - The strings "Tidy" and "HTML Tidy" are the program name and must not be translated. +msgctxt "STRING_NEEDS_INTERVENTION" +msgid "" +"This document has errors that must be fixed before\n" +"using HTML Tidy to generate a tidied up version.\n" +msgstr "" + +msgctxt "STRING_NO_ERRORS" +msgid "No warnings or errors were found." +msgstr "" + +msgctxt "STRING_NO_SYSID" +msgid "No system identifier in emitted doctype" +msgstr "" + +#, c-format +msgctxt "STRING_NOT_ALL_SHOWN" +msgid "Tidy found %u %s and %u %s! Not all warnings/errors were shown." +msgstr "" + #. This console output should be limited to 78 characters per line. #. - The strings "Tidy" and "HTML Tidy" are the program name and must not be translated. msgctxt "TEXT_GENERAL_INFO" @@ -2222,6 +2197,21 @@ msgctxt "ESCAPED_ILLEGAL_URI" msgid "%s escaping malformed URI reference" msgstr "" +#, c-format +msgctxt "FILE_CANT_OPEN" +msgid "Can't open \"%s\"\n" +msgstr "" + +#, c-format +msgctxt "FILE_CANT_OPEN_CFG" +msgid "Can't open configuration file \"%s\"\n" +msgstr "" + +#, c-format +msgctxt "FILE_NOT_FILE" +msgid "\"%s\" is not a file!\n" +msgstr "" + #, c-format msgctxt "FIXED_BACKSLASH" msgid "%s converting backslash in URI to slash" @@ -2444,6 +2434,16 @@ msgctxt "SPACE_PRECEDING_XMLDECL" msgid "removing whitespace preceding XML Declaration" msgstr "" +#, c-format +msgctxt "STRING_MISSING_MALFORMED" +msgid "missing or malformed argument for option: %s" +msgstr "" + +#, c-format +msgctxt "STRING_UNKNOWN_OPTION" +msgid "unknown option: %s" +msgstr "" + msgctxt "SUSPECTED_MISSING_QUOTE" msgid "missing quote mark for attribute value" msgstr "" diff --git a/localize/translations/language_es_mx.po b/localize/translations/language_es_mx.po index a80800b..57288f7 100644 --- a/localize/translations/language_es_mx.po +++ b/localize/translations/language_es_mx.po @@ -5,7 +5,7 @@ msgstr "" "Plural-Forms: nplurals=2; plural=n != 1;\n" "X-Generator: HTML Tidy poconvert.rb\n" "Project-Id-Version: \n" -"PO-Revision-Date: 2017-09-06 20:53:40\n" +"PO-Revision-Date: 2017-09-08 11:50:57\n" "Last-Translator: jderry\n" "Language-Team: \n" @@ -1735,23 +1735,8 @@ msgctxt "TidyDialogueSummary" msgid "Summary: " msgstr "" -msgctxt "TidyDialogueDoc" -msgid "Document: " -msgstr "" - -#, c-format -msgctxt "FILE_CANT_OPEN" -msgid "Can't open \"%s\"\n" -msgstr "" - -#, c-format -msgctxt "FILE_CANT_OPEN_CFG" -msgid "Can't open configuration file \"%s\"\n" -msgstr "" - -#, c-format -msgctxt "FILE_NOT_FILE" -msgid "\"%s\" is not a file!\n" +msgctxt "TidyDialogueFootnote" +msgid "Footnote: " msgstr "" #, c-format @@ -1759,27 +1744,11 @@ msgctxt "LINE_COLUMN_STRING" msgid "line %d column %d - " msgstr "" -#, c-format -msgctxt "STRING_CONTENT_LOOKS" -msgid "Document content looks like %s" -msgstr "" - #. For example, "discarding invalid UTF-16 surrogate pair" msgctxt "STRING_DISCARDING" msgid "discarding" msgstr "" -#, c-format -msgctxt "STRING_DOCTYPE_GIVEN" -msgid "Doctype given is \"%s\"" -msgstr "" - -#. The strings "Tidy" and "HTML Tidy" are the program name and must not be translated. -#, c-format -msgctxt "STRING_ERROR_COUNT" -msgid "Tidy found %u %s and %u %s!" -msgstr "" - msgctxt "STRING_ERROR_COUNT_ERROR" msgid "error" msgid_plural "errors" @@ -1801,36 +1770,10 @@ msgctxt "STRING_HTML_PROPRIETARY" msgid "HTML Proprietary" msgstr "" -#, c-format -msgctxt "STRING_MISSING_MALFORMED" -msgid "missing or malformed argument for option: %s" -msgstr "" - msgctxt "STRING_XML_DECLARATION" msgid "XML declaration" msgstr "" -#. This console output should be limited to 78 characters per line. -#. - The strings "Tidy" and "HTML Tidy" are the program name and must not be translated. -msgctxt "STRING_NEEDS_INTERVENTION" -msgid "" -"This document has errors that must be fixed before\n" -"using HTML Tidy to generate a tidied up version.\n" -msgstr "" - -msgctxt "STRING_NO_ERRORS" -msgid "No warnings or errors were found." -msgstr "" - -msgctxt "STRING_NO_SYSID" -msgid "No system identifier in emitted doctype" -msgstr "" - -#, c-format -msgctxt "STRING_NOT_ALL_SHOWN" -msgid "Tidy found %u %s and %u %s! Not all warnings/errors were shown." -msgstr "" - msgctxt "STRING_PLAIN_TEXT" msgid "plain text" msgstr "" @@ -1845,11 +1788,6 @@ msgctxt "STRING_SPECIFIED" msgid "specified" msgstr "" -#, c-format -msgctxt "STRING_UNKNOWN_OPTION" -msgid "unknown option: %s" -msgstr "" - msgctxt "TIDYCUSTOMNO_STRING" msgid "no" msgstr "" @@ -2069,6 +2007,43 @@ msgctxt "TEXT_USING_BODY" msgid "You are recommended to use CSS to specify page and link colors" msgstr "" +#, c-format +msgctxt "STRING_CONTENT_LOOKS" +msgid "Document content looks like %s" +msgstr "" + +#, c-format +msgctxt "STRING_DOCTYPE_GIVEN" +msgid "Doctype given is \"%s\"" +msgstr "" + +#. The strings "Tidy" and "HTML Tidy" are the program name and must not be translated. +#, c-format +msgctxt "STRING_ERROR_COUNT" +msgid "Tidy found %u %s and %u %s!" +msgstr "" + +#. This console output should be limited to 78 characters per line. +#. - The strings "Tidy" and "HTML Tidy" are the program name and must not be translated. +msgctxt "STRING_NEEDS_INTERVENTION" +msgid "" +"This document has errors that must be fixed before\n" +"using HTML Tidy to generate a tidied up version.\n" +msgstr "" + +msgctxt "STRING_NO_ERRORS" +msgid "No warnings or errors were found." +msgstr "" + +msgctxt "STRING_NO_SYSID" +msgid "No system identifier in emitted doctype" +msgstr "" + +#, c-format +msgctxt "STRING_NOT_ALL_SHOWN" +msgid "Tidy found %u %s and %u %s! Not all warnings/errors were shown." +msgstr "" + #. This console output should be limited to 78 characters per line. #. - The strings "Tidy" and "HTML Tidy" are the program name and must not be translated. msgctxt "TEXT_GENERAL_INFO" @@ -2217,6 +2192,21 @@ msgctxt "ESCAPED_ILLEGAL_URI" msgid "%s escaping malformed URI reference" msgstr "" +#, c-format +msgctxt "FILE_CANT_OPEN" +msgid "Can't open \"%s\"\n" +msgstr "" + +#, c-format +msgctxt "FILE_CANT_OPEN_CFG" +msgid "Can't open configuration file \"%s\"\n" +msgstr "" + +#, c-format +msgctxt "FILE_NOT_FILE" +msgid "\"%s\" is not a file!\n" +msgstr "" + #, c-format msgctxt "FIXED_BACKSLASH" msgid "%s converting backslash in URI to slash" @@ -2439,6 +2429,16 @@ msgctxt "SPACE_PRECEDING_XMLDECL" msgid "removing whitespace preceding XML Declaration" msgstr "" +#, c-format +msgctxt "STRING_MISSING_MALFORMED" +msgid "missing or malformed argument for option: %s" +msgstr "" + +#, c-format +msgctxt "STRING_UNKNOWN_OPTION" +msgid "unknown option: %s" +msgstr "" + msgctxt "SUSPECTED_MISSING_QUOTE" msgid "missing quote mark for attribute value" msgstr "" diff --git a/localize/translations/language_fr.po b/localize/translations/language_fr.po index 56e5d81..1ac57d5 100644 --- a/localize/translations/language_fr.po +++ b/localize/translations/language_fr.po @@ -5,7 +5,7 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n > 1);\n" "X-Generator: HTML Tidy poconvert.rb\n" "Project-Id-Version: \n" -"PO-Revision-Date: 2017-09-06 20:53:40\n" +"PO-Revision-Date: 2017-09-08 11:50:57\n" "Last-Translator: jderry\n" "Language-Team: \n" @@ -2054,51 +2054,20 @@ msgctxt "TidyDialogueSummary" msgid "Summary: " msgstr "Résumé:" -msgctxt "TidyDialogueDoc" -msgid "Document: " -msgstr "Document:" - -#, c-format -msgctxt "FILE_CANT_OPEN" -msgid "Can't open \"%s\"\n" -msgstr "Impossible d'ouvrir « %s »\n" - -#, c-format -msgctxt "FILE_CANT_OPEN_CFG" -msgid "Can't open configuration file \"%s\"\n" +msgctxt "TidyDialogueFootnote" +msgid "Footnote: " msgstr "" -#, c-format -msgctxt "FILE_NOT_FILE" -msgid "\"%s\" is not a file!\n" -msgstr "\"%s\" n'est pas un fichier!\n" - #, c-format msgctxt "LINE_COLUMN_STRING" msgid "line %d column %d - " msgstr "Ligne: %d Col: %d - " -#, c-format -msgctxt "STRING_CONTENT_LOOKS" -msgid "Document content looks like %s" -msgstr "Le contenu du document ressemble à %s" - #. For example, "discarding invalid UTF-16 surrogate pair" msgctxt "STRING_DISCARDING" msgid "discarding" msgstr "rejet" -#, c-format -msgctxt "STRING_DOCTYPE_GIVEN" -msgid "Doctype given is \"%s\"" -msgstr "DOCTYPE donnée est «%s»" - -#. The strings "Tidy" and "HTML Tidy" are the program name and must not be translated. -#, c-format -msgctxt "STRING_ERROR_COUNT" -msgid "Tidy found %u %s and %u %s!" -msgstr "Tidy a trouvé %u %s et %u %s!" - msgctxt "STRING_ERROR_COUNT_ERROR" msgid "error" msgid_plural "errors" @@ -2122,38 +2091,10 @@ msgctxt "STRING_HTML_PROPRIETARY" msgid "HTML Proprietary" msgstr "HTML Propriétaire" -#, c-format -msgctxt "STRING_MISSING_MALFORMED" -msgid "missing or malformed argument for option: %s" -msgstr "argument manquant ou incorrect pour l'option: %s" - msgctxt "STRING_XML_DECLARATION" msgid "XML declaration" msgstr "déclaration XML" -#. This console output should be limited to 78 characters per line. -#. - The strings "Tidy" and "HTML Tidy" are the program name and must not be translated. -msgctxt "STRING_NEEDS_INTERVENTION" -msgid "" -"This document has errors that must be fixed before\n" -"using HTML Tidy to generate a tidied up version.\n" -msgstr "" -"Ce document contient des erreurs qui doivent d'abord être résolues\n" -"en utilisant HTML Tidy pour produire une version nettoyée.\n" - -msgctxt "STRING_NO_ERRORS" -msgid "No warnings or errors were found." -msgstr "Aucun avertissement ou erreur trouvée." - -msgctxt "STRING_NO_SYSID" -msgid "No system identifier in emitted doctype" -msgstr "Aucun identifiant système dans le doctype soumis" - -#, c-format -msgctxt "STRING_NOT_ALL_SHOWN" -msgid "Tidy found %u %s and %u %s! Not all warnings/errors were shown." -msgstr "Tidy a trouvé %u %s et %u %s! Tous les avertissements et erreurs n'ont pas été affichés." - msgctxt "STRING_PLAIN_TEXT" msgid "plain text" msgstr "texte brut" @@ -2168,11 +2109,6 @@ msgctxt "STRING_SPECIFIED" msgid "specified" msgstr "précisé" -#, c-format -msgctxt "STRING_UNKNOWN_OPTION" -msgid "unknown option: %s" -msgstr "option inconnue: %s" - msgctxt "TIDYCUSTOMNO_STRING" msgid "no" msgstr "aucune" @@ -2504,6 +2440,45 @@ msgstr "" "Il est recommandé d'utiliser les CSS pour préciser les couleurs \n" "de la page et des liens" +#, c-format +msgctxt "STRING_CONTENT_LOOKS" +msgid "Document content looks like %s" +msgstr "Le contenu du document ressemble à %s" + +#, c-format +msgctxt "STRING_DOCTYPE_GIVEN" +msgid "Doctype given is \"%s\"" +msgstr "DOCTYPE donnée est «%s»" + +#. The strings "Tidy" and "HTML Tidy" are the program name and must not be translated. +#, c-format +msgctxt "STRING_ERROR_COUNT" +msgid "Tidy found %u %s and %u %s!" +msgstr "Tidy a trouvé %u %s et %u %s!" + +#. This console output should be limited to 78 characters per line. +#. - The strings "Tidy" and "HTML Tidy" are the program name and must not be translated. +msgctxt "STRING_NEEDS_INTERVENTION" +msgid "" +"This document has errors that must be fixed before\n" +"using HTML Tidy to generate a tidied up version.\n" +msgstr "" +"Ce document contient des erreurs qui doivent d'abord être résolues\n" +"en utilisant HTML Tidy pour produire une version nettoyée.\n" + +msgctxt "STRING_NO_ERRORS" +msgid "No warnings or errors were found." +msgstr "Aucun avertissement ou erreur trouvée." + +msgctxt "STRING_NO_SYSID" +msgid "No system identifier in emitted doctype" +msgstr "Aucun identifiant système dans le doctype soumis" + +#, c-format +msgctxt "STRING_NOT_ALL_SHOWN" +msgid "Tidy found %u %s and %u %s! Not all warnings/errors were shown." +msgstr "Tidy a trouvé %u %s et %u %s! Tous les avertissements et erreurs n'ont pas été affichés." + #. This console output should be limited to 78 characters per line. #. - The strings "Tidy" and "HTML Tidy" are the program name and must not be translated. msgctxt "TEXT_GENERAL_INFO" @@ -2662,6 +2637,21 @@ msgctxt "ESCAPED_ILLEGAL_URI" msgid "%s escaping malformed URI reference" msgstr "%s échappement de la référence d''URI mal formée" +#, c-format +msgctxt "FILE_CANT_OPEN" +msgid "Can't open \"%s\"\n" +msgstr "Impossible d'ouvrir « %s »\n" + +#, c-format +msgctxt "FILE_CANT_OPEN_CFG" +msgid "Can't open configuration file \"%s\"\n" +msgstr "" + +#, c-format +msgctxt "FILE_NOT_FILE" +msgid "\"%s\" is not a file!\n" +msgstr "\"%s\" n'est pas un fichier!\n" + #, c-format msgctxt "FIXED_BACKSLASH" msgid "%s converting backslash in URI to slash" @@ -2884,6 +2874,16 @@ msgctxt "SPACE_PRECEDING_XMLDECL" msgid "removing whitespace preceding XML Declaration" msgstr "suppression de l'espace précédant la déclaration XML" +#, c-format +msgctxt "STRING_MISSING_MALFORMED" +msgid "missing or malformed argument for option: %s" +msgstr "argument manquant ou incorrect pour l'option: %s" + +#, c-format +msgctxt "STRING_UNKNOWN_OPTION" +msgid "unknown option: %s" +msgstr "option inconnue: %s" + msgctxt "SUSPECTED_MISSING_QUOTE" msgid "missing quote mark for attribute value" msgstr "absence de guillemet pour la valeur d'attribut" diff --git a/localize/translations/language_zh_cn.po b/localize/translations/language_zh_cn.po index a3c93ec..33b2d60 100644 --- a/localize/translations/language_zh_cn.po +++ b/localize/translations/language_zh_cn.po @@ -5,7 +5,7 @@ msgstr "" "Plural-Forms: nplurals=1; plural=0;\n" "X-Generator: HTML Tidy poconvert.rb\n" "Project-Id-Version: \n" -"PO-Revision-Date: 2017-09-06 20:53:40\n" +"PO-Revision-Date: 2017-09-08 11:50:57\n" "Last-Translator: jderry\n" "Language-Team: \n" @@ -1735,23 +1735,8 @@ msgctxt "TidyDialogueSummary" msgid "Summary: " msgstr "" -msgctxt "TidyDialogueDoc" -msgid "Document: " -msgstr "" - -#, c-format -msgctxt "FILE_CANT_OPEN" -msgid "Can't open \"%s\"\n" -msgstr "无法打开”%s”\n" - -#, c-format -msgctxt "FILE_CANT_OPEN_CFG" -msgid "Can't open configuration file \"%s\"\n" -msgstr "" - -#, c-format -msgctxt "FILE_NOT_FILE" -msgid "\"%s\" is not a file!\n" +msgctxt "TidyDialogueFootnote" +msgid "Footnote: " msgstr "" #, c-format @@ -1759,27 +1744,11 @@ msgctxt "LINE_COLUMN_STRING" msgid "line %d column %d - " msgstr "行 %d 列 %d - " -#, c-format -msgctxt "STRING_CONTENT_LOOKS" -msgid "Document content looks like %s" -msgstr "文档内容看起来像 %s" - #. For example, "discarding invalid UTF-16 surrogate pair" msgctxt "STRING_DISCARDING" msgid "discarding" msgstr "" -#, c-format -msgctxt "STRING_DOCTYPE_GIVEN" -msgid "Doctype given is \"%s\"" -msgstr "" - -#. The strings "Tidy" and "HTML Tidy" are the program name and must not be translated. -#, c-format -msgctxt "STRING_ERROR_COUNT" -msgid "Tidy found %u %s and %u %s!" -msgstr "" - msgctxt "STRING_ERROR_COUNT_ERROR" msgid "error" msgid_plural "errors" @@ -1799,36 +1768,10 @@ msgctxt "STRING_HTML_PROPRIETARY" msgid "HTML Proprietary" msgstr "" -#, c-format -msgctxt "STRING_MISSING_MALFORMED" -msgid "missing or malformed argument for option: %s" -msgstr "" - msgctxt "STRING_XML_DECLARATION" msgid "XML declaration" msgstr "" -#. This console output should be limited to 78 characters per line. -#. - The strings "Tidy" and "HTML Tidy" are the program name and must not be translated. -msgctxt "STRING_NEEDS_INTERVENTION" -msgid "" -"This document has errors that must be fixed before\n" -"using HTML Tidy to generate a tidied up version.\n" -msgstr "" - -msgctxt "STRING_NO_ERRORS" -msgid "No warnings or errors were found." -msgstr "" - -msgctxt "STRING_NO_SYSID" -msgid "No system identifier in emitted doctype" -msgstr "" - -#, c-format -msgctxt "STRING_NOT_ALL_SHOWN" -msgid "Tidy found %u %s and %u %s! Not all warnings/errors were shown." -msgstr "" - msgctxt "STRING_PLAIN_TEXT" msgid "plain text" msgstr "" @@ -1843,11 +1786,6 @@ msgctxt "STRING_SPECIFIED" msgid "specified" msgstr "" -#, c-format -msgctxt "STRING_UNKNOWN_OPTION" -msgid "unknown option: %s" -msgstr "" - msgctxt "TIDYCUSTOMNO_STRING" msgid "no" msgstr "" @@ -2067,6 +2005,43 @@ msgctxt "TEXT_USING_BODY" msgid "You are recommended to use CSS to specify page and link colors" msgstr "" +#, c-format +msgctxt "STRING_CONTENT_LOOKS" +msgid "Document content looks like %s" +msgstr "文档内容看起来像 %s" + +#, c-format +msgctxt "STRING_DOCTYPE_GIVEN" +msgid "Doctype given is \"%s\"" +msgstr "" + +#. The strings "Tidy" and "HTML Tidy" are the program name and must not be translated. +#, c-format +msgctxt "STRING_ERROR_COUNT" +msgid "Tidy found %u %s and %u %s!" +msgstr "" + +#. This console output should be limited to 78 characters per line. +#. - The strings "Tidy" and "HTML Tidy" are the program name and must not be translated. +msgctxt "STRING_NEEDS_INTERVENTION" +msgid "" +"This document has errors that must be fixed before\n" +"using HTML Tidy to generate a tidied up version.\n" +msgstr "" + +msgctxt "STRING_NO_ERRORS" +msgid "No warnings or errors were found." +msgstr "" + +msgctxt "STRING_NO_SYSID" +msgid "No system identifier in emitted doctype" +msgstr "" + +#, c-format +msgctxt "STRING_NOT_ALL_SHOWN" +msgid "Tidy found %u %s and %u %s! Not all warnings/errors were shown." +msgstr "" + #. This console output should be limited to 78 characters per line. #. - The strings "Tidy" and "HTML Tidy" are the program name and must not be translated. msgctxt "TEXT_GENERAL_INFO" @@ -2211,6 +2186,21 @@ msgctxt "ESCAPED_ILLEGAL_URI" msgid "%s escaping malformed URI reference" msgstr "" +#, c-format +msgctxt "FILE_CANT_OPEN" +msgid "Can't open \"%s\"\n" +msgstr "无法打开”%s”\n" + +#, c-format +msgctxt "FILE_CANT_OPEN_CFG" +msgid "Can't open configuration file \"%s\"\n" +msgstr "" + +#, c-format +msgctxt "FILE_NOT_FILE" +msgid "\"%s\" is not a file!\n" +msgstr "" + #, c-format msgctxt "FIXED_BACKSLASH" msgid "%s converting backslash in URI to slash" @@ -2433,6 +2423,16 @@ msgctxt "SPACE_PRECEDING_XMLDECL" msgid "removing whitespace preceding XML Declaration" msgstr "" +#, c-format +msgctxt "STRING_MISSING_MALFORMED" +msgid "missing or malformed argument for option: %s" +msgstr "" + +#, c-format +msgctxt "STRING_UNKNOWN_OPTION" +msgid "unknown option: %s" +msgstr "" + msgctxt "SUSPECTED_MISSING_QUOTE" msgid "missing quote mark for attribute value" msgstr "" diff --git a/localize/translations/tidy.pot b/localize/translations/tidy.pot index 548f0b3..65dddd2 100644 --- a/localize/translations/tidy.pot +++ b/localize/translations/tidy.pot @@ -5,7 +5,7 @@ msgstr "" "Plural-Forms: nplurals=2; plural=n != 1;\n" "X-Generator: HTML Tidy poconvert.rb\n" "Project-Id-Version: \n" -"POT-Creation-Date: 2017-09-06 20:53:40\n" +"POT-Creation-Date: 2017-09-08 11:50:57\n" "Last-Translator: jderry\n" "Language-Team: \n" @@ -1735,23 +1735,8 @@ msgctxt "TidyDialogueSummary" msgid "Summary: " msgstr "" -msgctxt "TidyDialogueDoc" -msgid "Document: " -msgstr "" - -#, c-format -msgctxt "FILE_CANT_OPEN" -msgid "Can't open \"%s\"\n" -msgstr "" - -#, c-format -msgctxt "FILE_CANT_OPEN_CFG" -msgid "Can't open configuration file \"%s\"\n" -msgstr "" - -#, c-format -msgctxt "FILE_NOT_FILE" -msgid "\"%s\" is not a file!\n" +msgctxt "TidyDialogueFootnote" +msgid "Footnote: " msgstr "" #, c-format @@ -1759,27 +1744,11 @@ msgctxt "LINE_COLUMN_STRING" msgid "line %d column %d - " msgstr "" -#, c-format -msgctxt "STRING_CONTENT_LOOKS" -msgid "Document content looks like %s" -msgstr "" - #. For example, "discarding invalid UTF-16 surrogate pair" msgctxt "STRING_DISCARDING" msgid "discarding" msgstr "" -#, c-format -msgctxt "STRING_DOCTYPE_GIVEN" -msgid "Doctype given is \"%s\"" -msgstr "" - -#. The strings "Tidy" and "HTML Tidy" are the program name and must not be translated. -#, c-format -msgctxt "STRING_ERROR_COUNT" -msgid "Tidy found %u %s and %u %s!" -msgstr "" - msgctxt "STRING_ERROR_COUNT_ERROR" msgid "error" msgid_plural "errors" @@ -1801,36 +1770,10 @@ msgctxt "STRING_HTML_PROPRIETARY" msgid "HTML Proprietary" msgstr "" -#, c-format -msgctxt "STRING_MISSING_MALFORMED" -msgid "missing or malformed argument for option: %s" -msgstr "" - msgctxt "STRING_XML_DECLARATION" msgid "XML declaration" msgstr "" -#. This console output should be limited to 78 characters per line. -#. - The strings "Tidy" and "HTML Tidy" are the program name and must not be translated. -msgctxt "STRING_NEEDS_INTERVENTION" -msgid "" -"This document has errors that must be fixed before\n" -"using HTML Tidy to generate a tidied up version.\n" -msgstr "" - -msgctxt "STRING_NO_ERRORS" -msgid "No warnings or errors were found." -msgstr "" - -msgctxt "STRING_NO_SYSID" -msgid "No system identifier in emitted doctype" -msgstr "" - -#, c-format -msgctxt "STRING_NOT_ALL_SHOWN" -msgid "Tidy found %u %s and %u %s! Not all warnings/errors were shown." -msgstr "" - msgctxt "STRING_PLAIN_TEXT" msgid "plain text" msgstr "" @@ -1845,11 +1788,6 @@ msgctxt "STRING_SPECIFIED" msgid "specified" msgstr "" -#, c-format -msgctxt "STRING_UNKNOWN_OPTION" -msgid "unknown option: %s" -msgstr "" - msgctxt "TIDYCUSTOMNO_STRING" msgid "no" msgstr "" @@ -2069,6 +2007,43 @@ msgctxt "TEXT_USING_BODY" msgid "You are recommended to use CSS to specify page and link colors" msgstr "" +#, c-format +msgctxt "STRING_CONTENT_LOOKS" +msgid "Document content looks like %s" +msgstr "" + +#, c-format +msgctxt "STRING_DOCTYPE_GIVEN" +msgid "Doctype given is \"%s\"" +msgstr "" + +#. The strings "Tidy" and "HTML Tidy" are the program name and must not be translated. +#, c-format +msgctxt "STRING_ERROR_COUNT" +msgid "Tidy found %u %s and %u %s!" +msgstr "" + +#. This console output should be limited to 78 characters per line. +#. - The strings "Tidy" and "HTML Tidy" are the program name and must not be translated. +msgctxt "STRING_NEEDS_INTERVENTION" +msgid "" +"This document has errors that must be fixed before\n" +"using HTML Tidy to generate a tidied up version.\n" +msgstr "" + +msgctxt "STRING_NO_ERRORS" +msgid "No warnings or errors were found." +msgstr "" + +msgctxt "STRING_NO_SYSID" +msgid "No system identifier in emitted doctype" +msgstr "" + +#, c-format +msgctxt "STRING_NOT_ALL_SHOWN" +msgid "Tidy found %u %s and %u %s! Not all warnings/errors were shown." +msgstr "" + #. This console output should be limited to 78 characters per line. #. - The strings "Tidy" and "HTML Tidy" are the program name and must not be translated. msgctxt "TEXT_GENERAL_INFO" @@ -2213,6 +2188,21 @@ msgctxt "ESCAPED_ILLEGAL_URI" msgid "%s escaping malformed URI reference" msgstr "" +#, c-format +msgctxt "FILE_CANT_OPEN" +msgid "Can't open \"%s\"\n" +msgstr "" + +#, c-format +msgctxt "FILE_CANT_OPEN_CFG" +msgid "Can't open configuration file \"%s\"\n" +msgstr "" + +#, c-format +msgctxt "FILE_NOT_FILE" +msgid "\"%s\" is not a file!\n" +msgstr "" + #, c-format msgctxt "FIXED_BACKSLASH" msgid "%s converting backslash in URI to slash" @@ -2435,6 +2425,16 @@ msgctxt "SPACE_PRECEDING_XMLDECL" msgid "removing whitespace preceding XML Declaration" msgstr "" +#, c-format +msgctxt "STRING_MISSING_MALFORMED" +msgid "missing or malformed argument for option: %s" +msgstr "" + +#, c-format +msgctxt "STRING_UNKNOWN_OPTION" +msgid "unknown option: %s" +msgstr "" + msgctxt "SUSPECTED_MISSING_QUOTE" msgid "missing quote mark for attribute value" msgstr "" diff --git a/src/access.c b/src/access.c index b55eaa8..f519481 100644 --- a/src/access.c +++ b/src/access.c @@ -1645,13 +1645,13 @@ static void CheckMultiHeaders( TidyDocImpl* doc, Node* node ) if (validColSpanRows == no) { TY_(ReportAccessError)( doc, node, DATA_TABLE_REQUIRE_MARKUP_ROW_HEADERS ); - TY_(DialogueMessage)( doc, TEXT_HTML_T_ALGORITHM, TidyDialogueDoc ); + TY_(Dialogue)( doc, TEXT_HTML_T_ALGORITHM ); } if (validColSpanColumns == no) { TY_(ReportAccessError)( doc, node, DATA_TABLE_REQUIRE_MARKUP_COLUMN_HEADERS ); - TY_(DialogueMessage)( doc, TEXT_HTML_T_ALGORITHM, TidyDialogueDoc ); + TY_(Dialogue)( doc, TEXT_HTML_T_ALGORITHM ); } } } @@ -3290,7 +3290,7 @@ void TY_(AccessibilityChecks)( TidyDocImpl* doc ) InitAccessibilityChecks( doc, cfg(doc, TidyAccessibilityCheckLevel) ); /* Hello there, ladies and gentlemen... */ - TY_(DialogueMessage)( doc, STRING_HELLO_ACCESS, TidyDialogueDoc ); + TY_(Dialogue)( doc, STRING_HELLO_ACCESS ); /* Checks all elements for script accessibility */ CheckScriptKeyboardAccessible( doc, &doc->root ); diff --git a/src/language_en.h b/src/language_en.h index 8be33aa..addf8d1 100644 --- a/src/language_en.h +++ b/src/language_en.h @@ -1577,29 +1577,20 @@ static languageDefinition language_en = { whichPluralForm_en, { { TidyError, 0, "Error: " }, { TidyBadDocument, 0, "Document: " }, { TidyFatal, 0, "Panic: " }, - { TidyDialogueInfo, 0, "Information: " }, { TidyDialogueSummary, 0, "Summary: " }, - { TidyDialogueDoc, 0, "Document: " }, + { TidyDialogueInfo, 0, "Information: " }, + { TidyDialogueFootnote, 0, "Footnote: " }, /******************************************** ** Miscellaneous Strings ** @remark enum source TidyStrings - ** @rename enum generator FOREACH_MSG_MISC + ** @remark enum generator FOREACH_MSG_MISC ********************************************/ - { FILE_CANT_OPEN, 0, "Can't open \"%s\"\n" }, - { FILE_CANT_OPEN_CFG, 0, "Can't open configuration file \"%s\"\n" }, - { FILE_NOT_FILE, 0, "\"%s\" is not a file!\n" }, { LINE_COLUMN_STRING, 0, "line %d column %d - " }, - { STRING_CONTENT_LOOKS, 0, "Document content looks like %s" }, {/* For example, "discarding invalid UTF-16 surrogate pair" */ STRING_DISCARDING, 0, "discarding" }, - { STRING_DOCTYPE_GIVEN, 0, "Doctype given is \"%s\"" }, - - {/* The strings "Tidy" and "HTML Tidy" are the program name and must not be translated. */ - STRING_ERROR_COUNT, 0, "Tidy found %u %s and %u %s!" - }, { STRING_ERROR_COUNT_ERROR, 0, "error" }, { STRING_ERROR_COUNT_ERROR, 1, "errors" }, { STRING_ERROR_COUNT_WARNING, 0, "warning" }, @@ -1608,17 +1599,7 @@ static languageDefinition language_en = { whichPluralForm_en, { {/* This is not a formal name and can be translated. */ STRING_HTML_PROPRIETARY, 0, "HTML Proprietary" }, - { STRING_MISSING_MALFORMED, 0, "missing or malformed argument for option: %s" }, { STRING_XML_DECLARATION, 0, "XML declaration" }, - {/* This console output should be limited to 78 characters per line. - - The strings "Tidy" and "HTML Tidy" are the program name and must not be translated. */ - STRING_NEEDS_INTERVENTION, 0, - "This document has errors that must be fixed before\n" - "using HTML Tidy to generate a tidied up version.\n" - }, - { STRING_NO_ERRORS, 0, "No warnings or errors were found." }, - { STRING_NO_SYSID, 0, "No system identifier in emitted doctype" }, - { STRING_NOT_ALL_SHOWN, 0, "Tidy found %u %s and %u %s! Not all warnings/errors were shown." }, { STRING_PLAIN_TEXT, 0, "plain text" }, {/* For example, "replacing invalid UTF-8 bytes" */ STRING_REPLACING, 0, "replacing" @@ -1626,7 +1607,6 @@ static languageDefinition language_en = { whichPluralForm_en, { {/* For example, "you should avoid using the specified encoding." */ STRING_SPECIFIED, 0, "specified" }, - { STRING_UNKNOWN_OPTION, 0, "unknown option: %s" }, { TIDYCUSTOMNO_STRING, 0, "no" }, { TIDYCUSTOMBLOCKLEVEL_STRING, 0, "block level" }, { TIDYCUSTOMEMPTY_STRING, 0, "empty" }, @@ -1635,9 +1615,9 @@ static languageDefinition language_en = { whichPluralForm_en, { /******************************************** - ** Miscellaneous Strings + ** Footnote Strings ** @remark enum source TidyStrings - ** @rename enum generator FOREACH_DIALOG_MSG + ** @rename enum generator FOREACH_FOOTNOTE_MSG ********************************************/ {/* This console output should be limited to 78 characters per line. */ TEXT_HTML_T_ALGORITHM, 0, @@ -1797,8 +1777,28 @@ static languageDefinition language_en = { whichPluralForm_en, { TEXT_USING_BODY, 0, "You are recommended to use CSS to specify page and link colors" }, + + /******************************************** + ** Miscellaneous Dialogue Strings + ** @remark enum source TidyStrings + ** @rename enum generator FOREACH_DIALOG_MSG + ********************************************/ + { STRING_CONTENT_LOOKS, 0, "Document content looks like %s" }, + { STRING_DOCTYPE_GIVEN, 0, "Doctype given is \"%s\"" }, + {/* The strings "Tidy" and "HTML Tidy" are the program name and must not be translated. */ + STRING_ERROR_COUNT, 0, "Tidy found %u %s and %u %s!" + }, {/* This console output should be limited to 78 characters per line. - - The strings "Tidy" and "HTML Tidy" are the program name and must not be translated. */ + - The strings "Tidy" and "HTML Tidy" are the program name and must not be translated. */ + STRING_NEEDS_INTERVENTION, 0, + "This document has errors that must be fixed before\n" + "using HTML Tidy to generate a tidied up version.\n" + }, + { STRING_NO_ERRORS, 0, "No warnings or errors were found." }, + { STRING_NO_SYSID, 0, "No system identifier in emitted doctype" }, + { STRING_NOT_ALL_SHOWN, 0, "Tidy found %u %s and %u %s! Not all warnings/errors were shown." }, + {/* This console output should be limited to 78 characters per line. + - The strings "Tidy" and "HTML Tidy" are the program name and must not be translated. */ TEXT_GENERAL_INFO, 0, "About HTML Tidy: https://github.com/htacg/tidy-html5\n" "Bug reports and comments: https://github.com/htacg/tidy-html5/issues\n" @@ -1820,7 +1820,7 @@ static languageDefinition language_en = { whichPluralForm_en, { /******************************************** ** Report Output ** @remark enum source TidyStrings - ** @rename enum generator FOREACH_DIALOG_MSG + ** @rename enum generator FOREACH_REPORT_MSG ********************************************/ { ADDED_MISSING_CHARSET, 0, "Added appropriate missing to %s" }, { ANCHOR_NOT_UNIQUE, 0, "%s anchor \"%s\" already defined" }, @@ -1848,6 +1848,9 @@ static languageDefinition language_en = { whichPluralForm_en, { { ELEMENT_VERS_MISMATCH_WARN, 0, "%s element not available in %s" }, { ENCODING_MISMATCH, 0, "specified input encoding (%s) does not match actual input encoding (%s)" }, { ESCAPED_ILLEGAL_URI, 0, "%s escaping malformed URI reference" }, + { FILE_CANT_OPEN, 0, "Can't open \"%s\"\n" }, + { FILE_CANT_OPEN_CFG, 0, "Can't open configuration file \"%s\"\n" }, + { FILE_NOT_FILE, 0, "\"%s\" is not a file!\n" }, { FIXED_BACKSLASH, 0, "%s converting backslash in URI to slash" }, { FOUND_STYLE_IN_BODY, 0, "found