diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5cee9e1..509372c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -228,7 +228,6 @@ endif ()
# Macro Values
# These additional macros are set in Tidy's source code.
#------------------------------------------------------------------------
-add_definitions ( -DSUPPORT_UTF16_ENCODINGS=1 )
add_definitions ( -DSUPPORT_ASIAN_ENCODINGS=1 )
add_definitions ( -DSUPPORT_ACCESSIBILITY_CHECKS=1 )
add_definitions ( -DLIBTIDY_VERSION="${LIBTIDY_VERSION}" )
diff --git a/console/tidy.c b/console/tidy.c
index 4e2fdc3..846b0ac 100644
--- a/console/tidy.c
+++ b/console/tidy.c
@@ -376,11 +376,9 @@ static const CmdOptDesc cmdopt_defs[] = {
{ CmdOptCharEnc, "-mac", TC_OPT_MAC, 0, NULL },
{ CmdOptCharEnc, "-win1252", TC_OPT_WIN1252, 0, NULL },
{ CmdOptCharEnc, "-ibm858", TC_OPT_IBM858, 0, NULL },
-#if SUPPORT_UTF16_ENCODINGS
{ CmdOptCharEnc, "-utf16le", TC_OPT_UTF16LE, 0, NULL },
{ CmdOptCharEnc, "-utf16be", TC_OPT_UTF16BE, 0, NULL },
{ CmdOptCharEnc, "-utf16", TC_OPT_UTF16, 0, NULL },
-#endif
#if SUPPORT_ASIAN_ENCODINGS /* #431953 - RJ */
{ CmdOptCharEnc, "-big5", TC_OPT_BIG5, 0, NULL },
{ CmdOptCharEnc, "-shiftjis", TC_OPT_SHIFTJIS, 0, NULL },
@@ -2144,11 +2142,10 @@ int main( int argc, char** argv )
#ifndef NO_NATIVE_ISO2022_SUPPORT
strcasecmp(arg, "iso2022") == 0 ||
#endif
-#if SUPPORT_UTF16_ENCODINGS
strcasecmp(arg, "utf16le") == 0 ||
strcasecmp(arg, "utf16be") == 0 ||
strcasecmp(arg, "utf16") == 0 ||
-#endif
+
#if SUPPORT_ASIAN_ENCODINGS
strcasecmp(arg, "shiftjis") == 0 ||
strcasecmp(arg, "big5") == 0 ||
diff --git a/include/tidyenum.h b/include/tidyenum.h
index d47983f..5e50aa9 100644
--- a/include/tidyenum.h
+++ b/include/tidyenum.h
@@ -613,11 +613,7 @@ typedef enum
TidyOmitOptionalTags, /**< Suppress optional start tags and end tags */
TidyOutCharEncoding, /**< Output character encoding (if different) */
TidyOutFile, /**< File name to write markup to */
-#if SUPPORT_UTF16_ENCODINGS
TidyOutputBOM, /**< Output a Byte Order Mark (BOM) for UTF-16 encodings */
-#else
- TidyOutputBOMNotUsed, /**< This option is not compiled in */
-#endif
TidyPPrintTabs, /**< Indent using tabs istead of spaces */
TidyPreserveEntities, /**< Preserve entities */
TidyPreTags, /**< Declared pre tags */
@@ -756,12 +752,9 @@ typedef enum
TidyEncMac,
TidyEncWin1252,
TidyEncIbm858,
-
-#if SUPPORT_UTF16_ENCODINGS
TidyEncUtf16le,
TidyEncUtf16be,
TidyEncUtf16,
-#endif
#if SUPPORT_ASIAN_ENCODINGS
TidyEncBig5,
diff --git a/include/tidyplatform.h b/include/tidyplatform.h
index 3006de4..3bd6f13 100644
--- a/include/tidyplatform.h
+++ b/include/tidyplatform.h
@@ -82,11 +82,6 @@ extern "C" {
# define SUPPORT_ASIAN_ENCODINGS 1
#endif
-/* Enable/disable support for UTF-16 character encodings */
-#ifndef SUPPORT_UTF16_ENCODINGS
-# define SUPPORT_UTF16_ENCODINGS 1
-#endif
-
/* Enable/disable support for additional accessibility checks */
#ifndef SUPPORT_ACCESSIBILITY_CHECKS
# define SUPPORT_ACCESSIBILITY_CHECKS 1
diff --git a/localize/translations/language_en_gb.po b/localize/translations/language_en_gb.po
index f056517..1ec3602 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-19 14:00:03\n"
+"PO-Revision-Date: 2017-10-03 12:22:47\n"
"Last-Translator: jderry\n"
"Language-Team: \n"
@@ -257,7 +257,8 @@ msgid ""
"<!DOCTYPE html>
."
" "
"If set to auto (the default) Tidy will use an educated guess "
-"based upon the contents of the document."
+"based upon the contents of the document. Note that selecting this option "
+"will not change the current document's DOCTYPE on output. "
" "
"If set to strict , Tidy will set the DOCTYPE to the HTML4 or "
"XHTML1 strict DTD."
@@ -472,10 +473,14 @@ msgid ""
"This option specifies if Tidy should replace unexpected hyphens with "
"=
characters when it comes across adjacent hyphens. "
" "
-"The default is yes . "
+"The default is auto will which will act as no "
+"for HTML5 document types, and yes for all other document "
+"types. "
" "
-"This option is provided for users of Cold Fusion which uses the "
-"comment syntax: <!--- --->
. "
+"HTML has abandonded SGML comment syntax, and allows adjacent hypens "
+"for all versions of HTML, although XML and XHTML do not. If you plan "
+"to support older browsers that require SGML comment syntax, then "
+"consider setting this value to yes ."
msgstr ""
#. Important notes for translators:
@@ -1094,6 +1099,24 @@ msgid ""
"This option is ignored in XML mode. "
msgstr ""
+#. Important notes for translators:
+#. - Use only
, , , , and
+#. .
+#. - Entities, tags, attributes, etc., should be enclosed in
.
+#. - Option values should be enclosed in .
+#. - It's very important that be self-closing!
+#. - The strings "Tidy" and "HTML Tidy" are the program name and must not
+#. be translated.
+msgctxt "TidyPriorityAttributes"
+msgid ""
+"This option allows prioritizing the writing of attributes in tidied "
+"documents, allowing them to written before the other attributes of an "
+"element. For example, you might specify that id and "
+"name are written before every other attribute. "
+" "
+"This option takes a space or comma separated list of attribute names. "
+msgstr ""
+
#. Important notes for translators:
#. - Use only
, , , , and
#. .
@@ -1268,6 +1291,10 @@ msgid ""
"This option specifies that Tidy should sort attributes within an element "
"using the specified sort algorithm. If set to alpha , the "
"algorithm is an ascending alphabetic sort. "
+" "
+"When used while sorting with priority-attributes
, any "
+"attribute sorting will take place after the priority attributes have "
+"been output. "
msgstr ""
#. Important notes for translators:
@@ -2010,6 +2037,15 @@ msgid ""
"include an alternative layout inside a NOFRAMES element.\n"
msgstr ""
+#. This console output should be limited to 78 characters per line.
+msgctxt "FOOTNOTE_TRIM_EMPTY_ELEMENT"
+msgid ""
+"One or more empty elements were present in the source document but\n"
+"dropped on output. If these elements are necessary or you don't want\n"
+"this behavior, then consider setting the option \"drop-empty-elements\"\n"
+"to no.\n"
+msgstr ""
+
#. This console output should be limited to 78 characters per line.
#. - The URL should not be translated unless you find a matching URL in your language.
msgctxt "TEXT_ACCESS_ADVICE1"
@@ -2343,7 +2379,19 @@ msgid "%s joining values of repeated attribute \"%s\""
msgstr ""
msgctxt "MALFORMED_COMMENT"
-msgid "adjacent hyphens within comment"
+msgid "tidy replaced adjacent \"-\" with \"=\""
+msgstr ""
+
+msgctxt "MALFORMED_COMMENT_DROPPING"
+msgid "dropping a possible comment due to a missing hyphen"
+msgstr ""
+
+msgctxt "MALFORMED_COMMENT_EOS"
+msgid "the end of the document was reached before the end of the comment"
+msgstr ""
+
+msgctxt "MALFORMED_COMMENT_WARN"
+msgid "detected adjacent hyphens within the comment; consider fix-bad-comments"
msgstr ""
msgctxt "MALFORMED_DOCTYPE"
@@ -2384,6 +2432,11 @@ msgctxt "MISSING_ENDTAG_FOR"
msgid "missing %s>"
msgstr ""
+#, c-format
+msgctxt "MISSING_ENDTAG_OPTIONAL"
+msgid "missing optional end tag %s>"
+msgstr ""
+
#, c-format
msgctxt "MISSING_IMAGEMAP"
msgid "%s should use client-side image map"
@@ -2394,6 +2447,11 @@ msgctxt "MISSING_QUOTEMARK"
msgid "%s attribute with missing trailing quote mark"
msgstr ""
+#, c-format
+msgctxt "MISSING_QUOTEMARK_OPEN"
+msgid "value for attribute \"%s\" missing quote marks"
+msgstr ""
+
#, c-format
msgctxt "MISSING_SEMICOLON_NCR"
msgid "numeric character reference \"%s\" doesn't end in ';'"
@@ -2501,7 +2559,7 @@ msgid "unknown option: %s"
msgstr ""
msgctxt "SUSPECTED_MISSING_QUOTE"
-msgid "missing quote mark for attribute value"
+msgid "suspected missing quote mark for attribute value"
msgstr ""
#, c-format
@@ -3162,6 +3220,10 @@ msgctxt "TC_OPT_HELPCFG"
msgid "list all configuration options"
msgstr ""
+msgctxt "TC_OPT_HELPENV"
+msgid "show information about the environment and runtime configuration"
+msgstr ""
+
msgctxt "TC_OPT_HELPOPT"
msgid "show a description of the "
msgstr ""
@@ -3230,6 +3292,14 @@ msgctxt "TC_OPT_SHOWCFG"
msgid "list the current configuration settings"
msgstr ""
+msgctxt "TC_OPT_EXP_CFG"
+msgid "list the current configuration settings, suitable for a config file"
+msgstr ""
+
+msgctxt "TC_OPT_EXP_DEF"
+msgid "list the default configuration settings, suitable for a config file"
+msgstr ""
+
msgctxt "TC_OPT_UPPER"
msgid "force tags to upper case"
msgstr ""
@@ -3409,48 +3479,71 @@ 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.
+#. - %s represents either a blank line, or TC_TXT_HELP_3A explaining environment options.
+#, c-format
msgctxt "TC_TXT_HELP_3"
msgid ""
"\n"
"Tidy Configuration Options\n"
"==========================\n"
-"Use Tidy's configuration options as command line arguments in the form\n"
-"of \"--some-option \", for example, \"--indent-with-tabs yes\".\n"
+" Use Tidy's configuration options as command line arguments in the form\n"
+" of \"--some-option \", for example, \"--indent-with-tabs yes\".\n"
"\n"
-"For a list of all configuration options, use \"-help-config\" or refer\n"
-"to the man page (if your OS has one).\n"
+" You can also specify a file containing configuration options with the \n"
+" -options directive, or in one or more files specific to your \n"
+" environment (see next section). \n"
"\n"
-"If your environment has an $HTML_TIDY variable set point to a Tidy \n"
-"configuration file then Tidy will attempt to use it.\n"
+" For a list of all configuration options, use \"-help-config\" or refer\n"
+" to the man page (if your OS has one).\n"
"\n"
-"On some platforms Tidy will also attempt to use a configuration specified \n"
-"in /etc/tidy.conf or ~/.tidy.conf.\n"
+"Configuration Files\n"
+"===================\n"
+" If your environment has an $HTML_TIDY variable set to point to a Tidy \n"
+" configuration file, then Tidy will attempt to use it. \n"
+"%s"
+" Use \"-help-env\" for more information about how you can use the environment. \n"
+" to specify Tidy options. \n"
"\n"
"Other\n"
"=====\n"
-"Input/Output default to stdin/stdout respectively.\n"
+" Input/Output default to stdin/stdout respectively.\n"
"\n"
-"Single letter options apart from -f may be combined\n"
-"as in: tidy -f errs.txt -imu foo.html\n"
+" Single letter options apart from -f may be combined\n"
+" as in: tidy -f errs.txt -imu foo.html\n"
"\n"
"Information\n"
"===========\n"
-"For more information about HTML Tidy, see\n"
+" For more information about HTML Tidy, see\n"
" http://www.html-tidy.org/\n"
"\n"
-"For more information on HTML, see the following:\n"
+" For more information on HTML, see the following:\n"
"\n"
-" HTML: Edition for Web Authors (the latest HTML specification)\n"
-" http://dev.w3.org/html5/spec-author-view\n"
+" HTML: Edition for Web Authors (the latest HTML specification)\n"
+" http://dev.w3.org/html5/spec-author-view\n"
"\n"
-" HTML: The Markup Language (an HTML language reference)\n"
-" http://dev.w3.org/html5/markup/\n"
+" HTML: The Markup Language (an HTML language reference)\n"
+" http://dev.w3.org/html5/markup/\n"
"\n"
-"File bug reports at https://github.com/htacg/tidy-html5/issues/\n"
-"or send questions and comments to public-htacg@w3.org.\n"
+" File bug reports at https://github.com/htacg/tidy-html5/issues/\n"
+" or send questions and comments to public-htacg@w3.org.\n"
"\n"
-"Validate your HTML documents using the W3C Nu Markup Validator:\n"
-" http://validator.w3.org/nu/\n"
+" Validate your HTML documents using the W3C Nu Markup Validator:\n"
+" http://validator.w3.org/nu/\n"
+"\n"
+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.
+#. - Both parameters %s reflect file paths and names.
+#, c-format
+msgctxt "TC_TXT_HELP_3A"
+msgid ""
+"\n"
+" Additionally, Tidy will automatically attempt to use configuration specified \n"
+" in these files, if present: \n"
+"\n"
+" %s \n"
+" %s \n"
"\n"
msgstr ""
@@ -3484,6 +3577,54 @@ msgctxt "TC_TXT_HELP_CONFIG_ALLW"
msgid "Allowable values"
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.
+#. - The first %s indicates two more list items, or an empty string.
+#. - The second %s indicates a file name, or a message indicating no file name.
+#, c-format
+msgctxt "TC_TXT_HELP_ENV_1"
+msgid ""
+"\n"
+"Tidy can configure its option values from multiple sources, in the \n"
+"order below. Subsequent use of the same option overrides previous \n"
+"option settings. \n"
+"\n"
+" - Tidy's built-in default values. \n"
+"%s" /* rc files */
+" - The file specified in the $HTML_TIDY environment variable: \n"
+" %s \n"
+" - Options in a file specified on the command line. \n"
+" - Options set directly on the command line. \n"
+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.
+#, c-format
+msgctxt "TC_TXT_HELP_ENV_1A"
+msgid ""
+" - The system runtime configuration file: \n"
+" %s \n"
+" - The user runtime configuration file: \n"
+" %s \n"
+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.
+#. - This message indicates that a file name is not currently set.
+msgctxt "TC_TXT_HELP_ENV_1B"
+msgid "(not currently set)"
+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.
+#, c-format
+msgctxt "TC_TXT_HELP_ENV_1C"
+msgid ""
+"\n"
+"Note that because $HTML_TIDY is set, the user runtime configuration file \n"
+"%s will not be used. \n"
+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 "TC_TXT_HELP_LANG_1"
diff --git a/localize/translations/language_es.po b/localize/translations/language_es.po
index 9a58cc9..3e35bbe 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-19 14:00:03\n"
+"PO-Revision-Date: 2017-10-03 12:22:47\n"
"Last-Translator: jderry\n"
"Language-Team: \n"
@@ -251,7 +251,8 @@ msgid ""
"<!DOCTYPE html>
."
" "
"If set to auto (the default) Tidy will use an educated guess "
-"based upon the contents of the document."
+"based upon the contents of the document. Note that selecting this option "
+"will not change the current document's DOCTYPE on output. "
" "
"If set to strict , Tidy will set the DOCTYPE to the HTML4 or "
"XHTML1 strict DTD."
@@ -466,10 +467,14 @@ msgid ""
"This option specifies if Tidy should replace unexpected hyphens with "
"=
characters when it comes across adjacent hyphens. "
" "
-"The default is yes . "
+"The default is auto will which will act as no "
+"for HTML5 document types, and yes for all other document "
+"types. "
" "
-"This option is provided for users of Cold Fusion which uses the "
-"comment syntax: <!--- --->
. "
+"HTML has abandonded SGML comment syntax, and allows adjacent hypens "
+"for all versions of HTML, although XML and XHTML do not. If you plan "
+"to support older browsers that require SGML comment syntax, then "
+"consider setting this value to yes ."
msgstr ""
#. Important notes for translators:
@@ -1060,6 +1065,24 @@ msgid ""
"This option is ignored in XML mode. "
msgstr ""
+#. Important notes for translators:
+#. - Use only
, , , , and
+#. .
+#. - Entities, tags, attributes, etc., should be enclosed in
.
+#. - Option values should be enclosed in .
+#. - It's very important that be self-closing!
+#. - The strings "Tidy" and "HTML Tidy" are the program name and must not
+#. be translated.
+msgctxt "TidyPriorityAttributes"
+msgid ""
+"This option allows prioritizing the writing of attributes in tidied "
+"documents, allowing them to written before the other attributes of an "
+"element. For example, you might specify that id and "
+"name are written before every other attribute. "
+" "
+"This option takes a space or comma separated list of attribute names. "
+msgstr ""
+
#. Important notes for translators:
#. - Use only
, , , , and
#. .
@@ -1231,6 +1254,10 @@ msgid ""
"This option specifies that Tidy should sort attributes within an element "
"using the specified sort algorithm. If set to alpha , the "
"algorithm is an ascending alphabetic sort. "
+" "
+"When used while sorting with priority-attributes
, any "
+"attribute sorting will take place after the priority attributes have "
+"been output. "
msgstr ""
#. Important notes for translators:
@@ -1958,6 +1985,15 @@ msgid ""
"include an alternative layout inside a NOFRAMES element.\n"
msgstr ""
+#. This console output should be limited to 78 characters per line.
+msgctxt "FOOTNOTE_TRIM_EMPTY_ELEMENT"
+msgid ""
+"One or more empty elements were present in the source document but\n"
+"dropped on output. If these elements are necessary or you don't want\n"
+"this behavior, then consider setting the option \"drop-empty-elements\"\n"
+"to no.\n"
+msgstr ""
+
#. This console output should be limited to 78 characters per line.
#. - The URL should not be translated unless you find a matching URL in your language.
msgctxt "TEXT_ACCESS_ADVICE1"
@@ -2287,7 +2323,19 @@ msgid "%s joining values of repeated attribute \"%s\""
msgstr ""
msgctxt "MALFORMED_COMMENT"
-msgid "adjacent hyphens within comment"
+msgid "tidy replaced adjacent \"-\" with \"=\""
+msgstr ""
+
+msgctxt "MALFORMED_COMMENT_DROPPING"
+msgid "dropping a possible comment due to a missing hyphen"
+msgstr ""
+
+msgctxt "MALFORMED_COMMENT_EOS"
+msgid "the end of the document was reached before the end of the comment"
+msgstr ""
+
+msgctxt "MALFORMED_COMMENT_WARN"
+msgid "detected adjacent hyphens within the comment; consider fix-bad-comments"
msgstr ""
msgctxt "MALFORMED_DOCTYPE"
@@ -2328,6 +2376,11 @@ msgctxt "MISSING_ENDTAG_FOR"
msgid "missing %s>"
msgstr ""
+#, c-format
+msgctxt "MISSING_ENDTAG_OPTIONAL"
+msgid "missing optional end tag %s>"
+msgstr ""
+
#, c-format
msgctxt "MISSING_IMAGEMAP"
msgid "%s should use client-side image map"
@@ -2338,6 +2391,11 @@ msgctxt "MISSING_QUOTEMARK"
msgid "%s attribute with missing trailing quote mark"
msgstr ""
+#, c-format
+msgctxt "MISSING_QUOTEMARK_OPEN"
+msgid "value for attribute \"%s\" missing quote marks"
+msgstr ""
+
#, c-format
msgctxt "MISSING_SEMICOLON_NCR"
msgid "numeric character reference \"%s\" doesn't end in ';'"
@@ -2445,7 +2503,7 @@ msgid "unknown option: %s"
msgstr ""
msgctxt "SUSPECTED_MISSING_QUOTE"
-msgid "missing quote mark for attribute value"
+msgid "suspected missing quote mark for attribute value"
msgstr ""
#, c-format
@@ -3106,6 +3164,10 @@ msgctxt "TC_OPT_HELPCFG"
msgid "list all configuration options"
msgstr ""
+msgctxt "TC_OPT_HELPENV"
+msgid "show information about the environment and runtime configuration"
+msgstr ""
+
msgctxt "TC_OPT_HELPOPT"
msgid "show a description of the "
msgstr ""
@@ -3174,6 +3236,14 @@ msgctxt "TC_OPT_SHOWCFG"
msgid "list the current configuration settings"
msgstr ""
+msgctxt "TC_OPT_EXP_CFG"
+msgid "list the current configuration settings, suitable for a config file"
+msgstr ""
+
+msgctxt "TC_OPT_EXP_DEF"
+msgid "list the default configuration settings, suitable for a config file"
+msgstr ""
+
msgctxt "TC_OPT_UPPER"
msgid "force tags to upper case"
msgstr ""
@@ -3353,48 +3423,71 @@ 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.
+#. - %s represents either a blank line, or TC_TXT_HELP_3A explaining environment options.
+#, c-format
msgctxt "TC_TXT_HELP_3"
msgid ""
"\n"
"Tidy Configuration Options\n"
"==========================\n"
-"Use Tidy's configuration options as command line arguments in the form\n"
-"of \"--some-option \", for example, \"--indent-with-tabs yes\".\n"
+" Use Tidy's configuration options as command line arguments in the form\n"
+" of \"--some-option \", for example, \"--indent-with-tabs yes\".\n"
"\n"
-"For a list of all configuration options, use \"-help-config\" or refer\n"
-"to the man page (if your OS has one).\n"
+" You can also specify a file containing configuration options with the \n"
+" -options directive, or in one or more files specific to your \n"
+" environment (see next section). \n"
"\n"
-"If your environment has an $HTML_TIDY variable set point to a Tidy \n"
-"configuration file then Tidy will attempt to use it.\n"
+" For a list of all configuration options, use \"-help-config\" or refer\n"
+" to the man page (if your OS has one).\n"
"\n"
-"On some platforms Tidy will also attempt to use a configuration specified \n"
-"in /etc/tidy.conf or ~/.tidy.conf.\n"
+"Configuration Files\n"
+"===================\n"
+" If your environment has an $HTML_TIDY variable set to point to a Tidy \n"
+" configuration file, then Tidy will attempt to use it. \n"
+"%s"
+" Use \"-help-env\" for more information about how you can use the environment. \n"
+" to specify Tidy options. \n"
"\n"
"Other\n"
"=====\n"
-"Input/Output default to stdin/stdout respectively.\n"
+" Input/Output default to stdin/stdout respectively.\n"
"\n"
-"Single letter options apart from -f may be combined\n"
-"as in: tidy -f errs.txt -imu foo.html\n"
+" Single letter options apart from -f may be combined\n"
+" as in: tidy -f errs.txt -imu foo.html\n"
"\n"
"Information\n"
"===========\n"
-"For more information about HTML Tidy, see\n"
+" For more information about HTML Tidy, see\n"
" http://www.html-tidy.org/\n"
"\n"
-"For more information on HTML, see the following:\n"
+" For more information on HTML, see the following:\n"
"\n"
-" HTML: Edition for Web Authors (the latest HTML specification)\n"
-" http://dev.w3.org/html5/spec-author-view\n"
+" HTML: Edition for Web Authors (the latest HTML specification)\n"
+" http://dev.w3.org/html5/spec-author-view\n"
"\n"
-" HTML: The Markup Language (an HTML language reference)\n"
-" http://dev.w3.org/html5/markup/\n"
+" HTML: The Markup Language (an HTML language reference)\n"
+" http://dev.w3.org/html5/markup/\n"
"\n"
-"File bug reports at https://github.com/htacg/tidy-html5/issues/\n"
-"or send questions and comments to public-htacg@w3.org.\n"
+" File bug reports at https://github.com/htacg/tidy-html5/issues/\n"
+" or send questions and comments to public-htacg@w3.org.\n"
"\n"
-"Validate your HTML documents using the W3C Nu Markup Validator:\n"
-" http://validator.w3.org/nu/\n"
+" Validate your HTML documents using the W3C Nu Markup Validator:\n"
+" http://validator.w3.org/nu/\n"
+"\n"
+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.
+#. - Both parameters %s reflect file paths and names.
+#, c-format
+msgctxt "TC_TXT_HELP_3A"
+msgid ""
+"\n"
+" Additionally, Tidy will automatically attempt to use configuration specified \n"
+" in these files, if present: \n"
+"\n"
+" %s \n"
+" %s \n"
"\n"
msgstr ""
@@ -3428,6 +3521,54 @@ msgctxt "TC_TXT_HELP_CONFIG_ALLW"
msgid "Allowable values"
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.
+#. - The first %s indicates two more list items, or an empty string.
+#. - The second %s indicates a file name, or a message indicating no file name.
+#, c-format
+msgctxt "TC_TXT_HELP_ENV_1"
+msgid ""
+"\n"
+"Tidy can configure its option values from multiple sources, in the \n"
+"order below. Subsequent use of the same option overrides previous \n"
+"option settings. \n"
+"\n"
+" - Tidy's built-in default values. \n"
+"%s" /* rc files */
+" - The file specified in the $HTML_TIDY environment variable: \n"
+" %s \n"
+" - Options in a file specified on the command line. \n"
+" - Options set directly on the command line. \n"
+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.
+#, c-format
+msgctxt "TC_TXT_HELP_ENV_1A"
+msgid ""
+" - The system runtime configuration file: \n"
+" %s \n"
+" - The user runtime configuration file: \n"
+" %s \n"
+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.
+#. - This message indicates that a file name is not currently set.
+msgctxt "TC_TXT_HELP_ENV_1B"
+msgid "(not currently set)"
+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.
+#, c-format
+msgctxt "TC_TXT_HELP_ENV_1C"
+msgid ""
+"\n"
+"Note that because $HTML_TIDY is set, the user runtime configuration file \n"
+"%s will not be used. \n"
+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 "TC_TXT_HELP_LANG_1"
diff --git a/localize/translations/language_es_mx.po b/localize/translations/language_es_mx.po
index 17b7bb2..f5db37e 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-19 14:00:03\n"
+"PO-Revision-Date: 2017-10-03 12:22:47\n"
"Last-Translator: jderry\n"
"Language-Team: \n"
@@ -251,7 +251,8 @@ msgid ""
"<!DOCTYPE html>
."
" "
"If set to auto (the default) Tidy will use an educated guess "
-"based upon the contents of the document."
+"based upon the contents of the document. Note that selecting this option "
+"will not change the current document's DOCTYPE on output. "
" "
"If set to strict , Tidy will set the DOCTYPE to the HTML4 or "
"XHTML1 strict DTD."
@@ -466,10 +467,14 @@ msgid ""
"This option specifies if Tidy should replace unexpected hyphens with "
"=
characters when it comes across adjacent hyphens. "
" "
-"The default is yes . "
+"The default is auto will which will act as no "
+"for HTML5 document types, and yes for all other document "
+"types. "
" "
-"This option is provided for users of Cold Fusion which uses the "
-"comment syntax: <!--- --->
. "
+"HTML has abandonded SGML comment syntax, and allows adjacent hypens "
+"for all versions of HTML, although XML and XHTML do not. If you plan "
+"to support older browsers that require SGML comment syntax, then "
+"consider setting this value to yes ."
msgstr ""
#. Important notes for translators:
@@ -1055,6 +1060,24 @@ msgid ""
"This option is ignored in XML mode. "
msgstr ""
+#. Important notes for translators:
+#. - Use only
, , , , and
+#. .
+#. - Entities, tags, attributes, etc., should be enclosed in
.
+#. - Option values should be enclosed in .
+#. - It's very important that be self-closing!
+#. - The strings "Tidy" and "HTML Tidy" are the program name and must not
+#. be translated.
+msgctxt "TidyPriorityAttributes"
+msgid ""
+"This option allows prioritizing the writing of attributes in tidied "
+"documents, allowing them to written before the other attributes of an "
+"element. For example, you might specify that id and "
+"name are written before every other attribute. "
+" "
+"This option takes a space or comma separated list of attribute names. "
+msgstr ""
+
#. Important notes for translators:
#. - Use only
, , , , and
#. .
@@ -1226,6 +1249,10 @@ msgid ""
"This option specifies that Tidy should sort attributes within an element "
"using the specified sort algorithm. If set to alpha , the "
"algorithm is an ascending alphabetic sort. "
+" "
+"When used while sorting with priority-attributes
, any "
+"attribute sorting will take place after the priority attributes have "
+"been output. "
msgstr ""
#. Important notes for translators:
@@ -1953,6 +1980,15 @@ msgid ""
"include an alternative layout inside a NOFRAMES element.\n"
msgstr ""
+#. This console output should be limited to 78 characters per line.
+msgctxt "FOOTNOTE_TRIM_EMPTY_ELEMENT"
+msgid ""
+"One or more empty elements were present in the source document but\n"
+"dropped on output. If these elements are necessary or you don't want\n"
+"this behavior, then consider setting the option \"drop-empty-elements\"\n"
+"to no.\n"
+msgstr ""
+
#. This console output should be limited to 78 characters per line.
#. - The URL should not be translated unless you find a matching URL in your language.
msgctxt "TEXT_ACCESS_ADVICE1"
@@ -2282,7 +2318,19 @@ msgid "%s joining values of repeated attribute \"%s\""
msgstr ""
msgctxt "MALFORMED_COMMENT"
-msgid "adjacent hyphens within comment"
+msgid "tidy replaced adjacent \"-\" with \"=\""
+msgstr ""
+
+msgctxt "MALFORMED_COMMENT_DROPPING"
+msgid "dropping a possible comment due to a missing hyphen"
+msgstr ""
+
+msgctxt "MALFORMED_COMMENT_EOS"
+msgid "the end of the document was reached before the end of the comment"
+msgstr ""
+
+msgctxt "MALFORMED_COMMENT_WARN"
+msgid "detected adjacent hyphens within the comment; consider fix-bad-comments"
msgstr ""
msgctxt "MALFORMED_DOCTYPE"
@@ -2323,6 +2371,11 @@ msgctxt "MISSING_ENDTAG_FOR"
msgid "missing %s>"
msgstr ""
+#, c-format
+msgctxt "MISSING_ENDTAG_OPTIONAL"
+msgid "missing optional end tag %s>"
+msgstr ""
+
#, c-format
msgctxt "MISSING_IMAGEMAP"
msgid "%s should use client-side image map"
@@ -2333,6 +2386,11 @@ msgctxt "MISSING_QUOTEMARK"
msgid "%s attribute with missing trailing quote mark"
msgstr ""
+#, c-format
+msgctxt "MISSING_QUOTEMARK_OPEN"
+msgid "value for attribute \"%s\" missing quote marks"
+msgstr ""
+
#, c-format
msgctxt "MISSING_SEMICOLON_NCR"
msgid "numeric character reference \"%s\" doesn't end in ';'"
@@ -2440,7 +2498,7 @@ msgid "unknown option: %s"
msgstr ""
msgctxt "SUSPECTED_MISSING_QUOTE"
-msgid "missing quote mark for attribute value"
+msgid "suspected missing quote mark for attribute value"
msgstr ""
#, c-format
@@ -3101,6 +3159,10 @@ msgctxt "TC_OPT_HELPCFG"
msgid "list all configuration options"
msgstr ""
+msgctxt "TC_OPT_HELPENV"
+msgid "show information about the environment and runtime configuration"
+msgstr ""
+
msgctxt "TC_OPT_HELPOPT"
msgid "show a description of the "
msgstr ""
@@ -3169,6 +3231,14 @@ msgctxt "TC_OPT_SHOWCFG"
msgid "list the current configuration settings"
msgstr ""
+msgctxt "TC_OPT_EXP_CFG"
+msgid "list the current configuration settings, suitable for a config file"
+msgstr ""
+
+msgctxt "TC_OPT_EXP_DEF"
+msgid "list the default configuration settings, suitable for a config file"
+msgstr ""
+
msgctxt "TC_OPT_UPPER"
msgid "force tags to upper case"
msgstr ""
@@ -3348,48 +3418,71 @@ 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.
+#. - %s represents either a blank line, or TC_TXT_HELP_3A explaining environment options.
+#, c-format
msgctxt "TC_TXT_HELP_3"
msgid ""
"\n"
"Tidy Configuration Options\n"
"==========================\n"
-"Use Tidy's configuration options as command line arguments in the form\n"
-"of \"--some-option \", for example, \"--indent-with-tabs yes\".\n"
+" Use Tidy's configuration options as command line arguments in the form\n"
+" of \"--some-option \", for example, \"--indent-with-tabs yes\".\n"
"\n"
-"For a list of all configuration options, use \"-help-config\" or refer\n"
-"to the man page (if your OS has one).\n"
+" You can also specify a file containing configuration options with the \n"
+" -options directive, or in one or more files specific to your \n"
+" environment (see next section). \n"
"\n"
-"If your environment has an $HTML_TIDY variable set point to a Tidy \n"
-"configuration file then Tidy will attempt to use it.\n"
+" For a list of all configuration options, use \"-help-config\" or refer\n"
+" to the man page (if your OS has one).\n"
"\n"
-"On some platforms Tidy will also attempt to use a configuration specified \n"
-"in /etc/tidy.conf or ~/.tidy.conf.\n"
+"Configuration Files\n"
+"===================\n"
+" If your environment has an $HTML_TIDY variable set to point to a Tidy \n"
+" configuration file, then Tidy will attempt to use it. \n"
+"%s"
+" Use \"-help-env\" for more information about how you can use the environment. \n"
+" to specify Tidy options. \n"
"\n"
"Other\n"
"=====\n"
-"Input/Output default to stdin/stdout respectively.\n"
+" Input/Output default to stdin/stdout respectively.\n"
"\n"
-"Single letter options apart from -f may be combined\n"
-"as in: tidy -f errs.txt -imu foo.html\n"
+" Single letter options apart from -f may be combined\n"
+" as in: tidy -f errs.txt -imu foo.html\n"
"\n"
"Information\n"
"===========\n"
-"For more information about HTML Tidy, see\n"
+" For more information about HTML Tidy, see\n"
" http://www.html-tidy.org/\n"
"\n"
-"For more information on HTML, see the following:\n"
+" For more information on HTML, see the following:\n"
"\n"
-" HTML: Edition for Web Authors (the latest HTML specification)\n"
-" http://dev.w3.org/html5/spec-author-view\n"
+" HTML: Edition for Web Authors (the latest HTML specification)\n"
+" http://dev.w3.org/html5/spec-author-view\n"
"\n"
-" HTML: The Markup Language (an HTML language reference)\n"
-" http://dev.w3.org/html5/markup/\n"
+" HTML: The Markup Language (an HTML language reference)\n"
+" http://dev.w3.org/html5/markup/\n"
"\n"
-"File bug reports at https://github.com/htacg/tidy-html5/issues/\n"
-"or send questions and comments to public-htacg@w3.org.\n"
+" File bug reports at https://github.com/htacg/tidy-html5/issues/\n"
+" or send questions and comments to public-htacg@w3.org.\n"
"\n"
-"Validate your HTML documents using the W3C Nu Markup Validator:\n"
-" http://validator.w3.org/nu/\n"
+" Validate your HTML documents using the W3C Nu Markup Validator:\n"
+" http://validator.w3.org/nu/\n"
+"\n"
+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.
+#. - Both parameters %s reflect file paths and names.
+#, c-format
+msgctxt "TC_TXT_HELP_3A"
+msgid ""
+"\n"
+" Additionally, Tidy will automatically attempt to use configuration specified \n"
+" in these files, if present: \n"
+"\n"
+" %s \n"
+" %s \n"
"\n"
msgstr ""
@@ -3423,6 +3516,54 @@ msgctxt "TC_TXT_HELP_CONFIG_ALLW"
msgid "Allowable values"
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.
+#. - The first %s indicates two more list items, or an empty string.
+#. - The second %s indicates a file name, or a message indicating no file name.
+#, c-format
+msgctxt "TC_TXT_HELP_ENV_1"
+msgid ""
+"\n"
+"Tidy can configure its option values from multiple sources, in the \n"
+"order below. Subsequent use of the same option overrides previous \n"
+"option settings. \n"
+"\n"
+" - Tidy's built-in default values. \n"
+"%s" /* rc files */
+" - The file specified in the $HTML_TIDY environment variable: \n"
+" %s \n"
+" - Options in a file specified on the command line. \n"
+" - Options set directly on the command line. \n"
+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.
+#, c-format
+msgctxt "TC_TXT_HELP_ENV_1A"
+msgid ""
+" - The system runtime configuration file: \n"
+" %s \n"
+" - The user runtime configuration file: \n"
+" %s \n"
+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.
+#. - This message indicates that a file name is not currently set.
+msgctxt "TC_TXT_HELP_ENV_1B"
+msgid "(not currently set)"
+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.
+#, c-format
+msgctxt "TC_TXT_HELP_ENV_1C"
+msgid ""
+"\n"
+"Note that because $HTML_TIDY is set, the user runtime configuration file \n"
+"%s will not be used. \n"
+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 "TC_TXT_HELP_LANG_1"
diff --git a/localize/translations/language_fr.po b/localize/translations/language_fr.po
index b007a64..1c6d714 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-19 14:00:03\n"
+"PO-Revision-Date: 2017-10-03 12:22:47\n"
"Last-Translator: jderry\n"
"Language-Team: \n"
@@ -300,7 +300,8 @@ msgid ""
"<!DOCTYPE html>
."
" "
"If set to auto (the default) Tidy will use an educated guess "
-"based upon the contents of the document."
+"based upon the contents of the document. Note that selecting this option "
+"will not change the current document's DOCTYPE on output. "
" "
"If set to strict , Tidy will set the DOCTYPE to the HTML4 or "
"XHTML1 strict DTD."
@@ -557,14 +558,18 @@ msgid ""
"This option specifies if Tidy should replace unexpected hyphens with "
"=
characters when it comes across adjacent hyphens. "
" "
-"The default is yes . "
+"The default is auto will which will act as no "
+"for HTML5 document types, and yes for all other document "
+"types. "
" "
-"This option is provided for users of Cold Fusion which uses the "
-"comment syntax: <!--- --->
. "
+"HTML has abandonded SGML comment syntax, and allows adjacent hypens "
+"for all versions of HTML, although XML and XHTML do not. If you plan "
+"to support older browsers that require SGML comment syntax, then "
+"consider setting this value to yes ."
msgstr ""
"Cette option précise si Tidy doit remplacer les traits d'unions par le caractère =
"
"s'il rencontre des traits-d'unions adjacents. La valeur par défaut est yes . Cette option est fourni pour les utilisateurs de Cold Fusion qui utilisent la syntaxe de "
+">Cette option est fourni pour les utilisateurs de ColdFusion qui utilisent la syntaxe de "
"commentaire: <!--- --->
. "
#. Important notes for translators:
@@ -1263,6 +1268,24 @@ msgstr ""
"inconnues. Notez que vous ne pouvez encore ajouter de nouveaux éléments CDATA. Cette "
"option est ignorée avec le mode XML. "
+#. Important notes for translators:
+#. - Use only
, , , , and
+#. .
+#. - Entities, tags, attributes, etc., should be enclosed in
.
+#. - Option values should be enclosed in .
+#. - It's very important that be self-closing!
+#. - The strings "Tidy" and "HTML Tidy" are the program name and must not
+#. be translated.
+msgctxt "TidyPriorityAttributes"
+msgid ""
+"This option allows prioritizing the writing of attributes in tidied "
+"documents, allowing them to written before the other attributes of an "
+"element. For example, you might specify that id and "
+"name are written before every other attribute. "
+" "
+"This option takes a space or comma separated list of attribute names. "
+msgstr ""
+
#. Important notes for translators:
#. - Use only
, , , , and
#. .
@@ -1458,6 +1481,10 @@ msgid ""
"This option specifies that Tidy should sort attributes within an element "
"using the specified sort algorithm. If set to alpha , the "
"algorithm is an ascending alphabetic sort. "
+" "
+"When used while sorting with priority-attributes
, any "
+"attribute sorting will take place after the priority attributes have "
+"been output. "
msgstr ""
"Cette option précise que Tidy doit classer les attributs d'un élément en utilisant un algorithme de "
"classement. Si la valeur est alpha , l'algorithme est un classement alphabétique "
@@ -2364,6 +2391,15 @@ msgstr ""
"d'un élément NOFRAMES.\n"
"\n"
+#. This console output should be limited to 78 characters per line.
+msgctxt "FOOTNOTE_TRIM_EMPTY_ELEMENT"
+msgid ""
+"One or more empty elements were present in the source document but\n"
+"dropped on output. If these elements are necessary or you don't want\n"
+"this behavior, then consider setting the option \"drop-empty-elements\"\n"
+"to no.\n"
+msgstr ""
+
#. This console output should be limited to 78 characters per line.
#. - The URL should not be translated unless you find a matching URL in your language.
msgctxt "TEXT_ACCESS_ADVICE1"
@@ -2727,9 +2763,21 @@ msgid "%s joining values of repeated attribute \"%s\""
msgstr "%s regroupement des valeurs répétées de l'attribut « %s »"
msgctxt "MALFORMED_COMMENT"
-msgid "adjacent hyphens within comment"
+msgid "tidy replaced adjacent \"-\" with \"=\""
msgstr "tirets adjacents dans un commentaire"
+msgctxt "MALFORMED_COMMENT_DROPPING"
+msgid "dropping a possible comment due to a missing hyphen"
+msgstr ""
+
+msgctxt "MALFORMED_COMMENT_EOS"
+msgid "the end of the document was reached before the end of the comment"
+msgstr ""
+
+msgctxt "MALFORMED_COMMENT_WARN"
+msgid "detected adjacent hyphens within the comment; consider fix-bad-comments"
+msgstr ""
+
msgctxt "MALFORMED_DOCTYPE"
msgid "discarding malformed "
msgstr "inhibition de la mal formée"
@@ -2768,6 +2816,11 @@ msgctxt "MISSING_ENDTAG_FOR"
msgid "missing %s>"
msgstr "absence de %s>"
+#, c-format
+msgctxt "MISSING_ENDTAG_OPTIONAL"
+msgid "missing optional end tag %s>"
+msgstr ""
+
#, c-format
msgctxt "MISSING_IMAGEMAP"
msgid "%s should use client-side image map"
@@ -2778,6 +2831,11 @@ msgctxt "MISSING_QUOTEMARK"
msgid "%s attribute with missing trailing quote mark"
msgstr "%s attribut avec apostrophe de fin manquante"
+#, c-format
+msgctxt "MISSING_QUOTEMARK_OPEN"
+msgid "value for attribute \"%s\" missing quote marks"
+msgstr ""
+
#, c-format
msgctxt "MISSING_SEMICOLON_NCR"
msgid "numeric character reference \"%s\" doesn't end in ';'"
@@ -2885,7 +2943,7 @@ msgid "unknown option: %s"
msgstr "option inconnue: %s"
msgctxt "SUSPECTED_MISSING_QUOTE"
-msgid "missing quote mark for attribute value"
+msgid "suspected missing quote mark for attribute value"
msgstr "absence de guillemet pour la valeur d'attribut"
#, c-format
@@ -3550,6 +3608,10 @@ msgctxt "TC_OPT_HELPCFG"
msgid "list all configuration options"
msgstr "liste toutes les options de configuration"
+msgctxt "TC_OPT_HELPENV"
+msgid "show information about the environment and runtime configuration"
+msgstr ""
+
msgctxt "TC_OPT_HELPOPT"
msgid "show a description of the "
msgstr "Affiche une description de l' "
@@ -3621,6 +3683,14 @@ msgctxt "TC_OPT_SHOWCFG"
msgid "list the current configuration settings"
msgstr "liste les options de configuration"
+msgctxt "TC_OPT_EXP_CFG"
+msgid "list the current configuration settings, suitable for a config file"
+msgstr ""
+
+msgctxt "TC_OPT_EXP_DEF"
+msgid "list the default configuration settings, suitable for a config file"
+msgstr ""
+
msgctxt "TC_OPT_UPPER"
msgid "force tags to upper case"
msgstr "force les balises en lettres majuscules"
@@ -3808,48 +3878,56 @@ msgstr "Arguments en ligne de commande de HTML Tidy:"
#. 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.
+#. - %s represents either a blank line, or TC_TXT_HELP_3A explaining environment options.
+#, c-format
msgctxt "TC_TXT_HELP_3"
msgid ""
"\n"
"Tidy Configuration Options\n"
"==========================\n"
-"Use Tidy's configuration options as command line arguments in the form\n"
-"of \"--some-option \", for example, \"--indent-with-tabs yes\".\n"
+" Use Tidy's configuration options as command line arguments in the form\n"
+" of \"--some-option \", for example, \"--indent-with-tabs yes\".\n"
"\n"
-"For a list of all configuration options, use \"-help-config\" or refer\n"
-"to the man page (if your OS has one).\n"
+" You can also specify a file containing configuration options with the \n"
+" -options directive, or in one or more files specific to your \n"
+" environment (see next section). \n"
"\n"
-"If your environment has an $HTML_TIDY variable set point to a Tidy \n"
-"configuration file then Tidy will attempt to use it.\n"
+" For a list of all configuration options, use \"-help-config\" or refer\n"
+" to the man page (if your OS has one).\n"
"\n"
-"On some platforms Tidy will also attempt to use a configuration specified \n"
-"in /etc/tidy.conf or ~/.tidy.conf.\n"
+"Configuration Files\n"
+"===================\n"
+" If your environment has an $HTML_TIDY variable set to point to a Tidy \n"
+" configuration file, then Tidy will attempt to use it. \n"
+"%s"
+" Use \"-help-env\" for more information about how you can use the environment. \n"
+" to specify Tidy options. \n"
"\n"
"Other\n"
"=====\n"
-"Input/Output default to stdin/stdout respectively.\n"
+" Input/Output default to stdin/stdout respectively.\n"
"\n"
-"Single letter options apart from -f may be combined\n"
-"as in: tidy -f errs.txt -imu foo.html\n"
+" Single letter options apart from -f may be combined\n"
+" as in: tidy -f errs.txt -imu foo.html\n"
"\n"
"Information\n"
"===========\n"
-"For more information about HTML Tidy, see\n"
+" For more information about HTML Tidy, see\n"
" http://www.html-tidy.org/\n"
"\n"
-"For more information on HTML, see the following:\n"
+" For more information on HTML, see the following:\n"
"\n"
-" HTML: Edition for Web Authors (the latest HTML specification)\n"
-" http://dev.w3.org/html5/spec-author-view\n"
+" HTML: Edition for Web Authors (the latest HTML specification)\n"
+" http://dev.w3.org/html5/spec-author-view\n"
"\n"
-" HTML: The Markup Language (an HTML language reference)\n"
-" http://dev.w3.org/html5/markup/\n"
+" HTML: The Markup Language (an HTML language reference)\n"
+" http://dev.w3.org/html5/markup/\n"
"\n"
-"File bug reports at https://github.com/htacg/tidy-html5/issues/\n"
-"or send questions and comments to public-htacg@w3.org.\n"
+" File bug reports at https://github.com/htacg/tidy-html5/issues/\n"
+" or send questions and comments to public-htacg@w3.org.\n"
"\n"
-"Validate your HTML documents using the W3C Nu Markup Validator:\n"
-" http://validator.w3.org/nu/\n"
+" Validate your HTML documents using the W3C Nu Markup Validator:\n"
+" http://validator.w3.org/nu/\n"
"\n"
msgstr ""
"\n"
@@ -3887,6 +3965,21 @@ msgstr ""
" http://dev.w3.org/html5/spec-author-view\n"
"\n"
+#. 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.
+#. - Both parameters %s reflect file paths and names.
+#, c-format
+msgctxt "TC_TXT_HELP_3A"
+msgid ""
+"\n"
+" Additionally, Tidy will automatically attempt to use configuration specified \n"
+" in these files, if present: \n"
+"\n"
+" %s \n"
+" %s \n"
+"\n"
+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 "TC_TXT_HELP_CONFIG"
@@ -3929,6 +4022,54 @@ msgctxt "TC_TXT_HELP_CONFIG_ALLW"
msgid "Allowable values"
msgstr "Valeurs possibles"
+#. 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 first %s indicates two more list items, or an empty string.
+#. - The second %s indicates a file name, or a message indicating no file name.
+#, c-format
+msgctxt "TC_TXT_HELP_ENV_1"
+msgid ""
+"\n"
+"Tidy can configure its option values from multiple sources, in the \n"
+"order below. Subsequent use of the same option overrides previous \n"
+"option settings. \n"
+"\n"
+" - Tidy's built-in default values. \n"
+"%s" /* rc files */
+" - The file specified in the $HTML_TIDY environment variable: \n"
+" %s \n"
+" - Options in a file specified on the command line. \n"
+" - Options set directly on the command line. \n"
+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.
+#, c-format
+msgctxt "TC_TXT_HELP_ENV_1A"
+msgid ""
+" - The system runtime configuration file: \n"
+" %s \n"
+" - The user runtime configuration file: \n"
+" %s \n"
+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.
+#. - This message indicates that a file name is not currently set.
+msgctxt "TC_TXT_HELP_ENV_1B"
+msgid "(not currently set)"
+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.
+#, c-format
+msgctxt "TC_TXT_HELP_ENV_1C"
+msgid ""
+"\n"
+"Note that because $HTML_TIDY is set, the user runtime configuration file \n"
+"%s will not be used. \n"
+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 "TC_TXT_HELP_LANG_1"
diff --git a/localize/translations/language_pt_br.po b/localize/translations/language_pt_br.po
index c5270e0..845e919 100644
--- a/localize/translations/language_pt_br.po
+++ b/localize/translations/language_pt_br.po
@@ -1,15 +1,13 @@
-# Rafael Fontenelle , 2017.
msgid ""
msgstr ""
-"Project-Id-Version: \n"
-"PO-Revision-Date: 2017-09-21 00:07-0200\n"
-"Last-Translator: Rafael Fontenelle \n"
-"Language-Team: \n"
-"Language: pt_BR\n"
"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
+"Language: pt_br\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-"X-Generator: Virtaal 1.0.0-beta1\n"
+"X-Generator: HTML Tidy poconvert.rb\n"
+"Project-Id-Version: \n"
+"PO-Revision-Date: 2017-10-03 12:22:47\n"
+"Last-Translator: jderry\n"
+"Language-Team: \n"
#. Important notes for translators:
#. - Use only
, , , , and
@@ -312,7 +310,8 @@ msgid ""
"<!DOCTYPE html>
."
" "
"If set to auto (the default) Tidy will use an educated guess "
-"based upon the contents of the document."
+"based upon the contents of the document. Note that selecting this option "
+"will not change the current document's DOCTYPE on output. "
" "
"If set to strict , Tidy will set the DOCTYPE to the HTML4 or "
"XHTML1 strict DTD."
@@ -576,10 +575,14 @@ msgid ""
"This option specifies if Tidy should replace unexpected hyphens with "
"=
characters when it comes across adjacent hyphens. "
" "
-"The default is yes . "
+"The default is auto will which will act as no "
+"for HTML5 document types, and yes for all other document "
+"types. "
" "
-"This option is provided for users of Cold Fusion which uses the "
-"comment syntax: <!--- --->
. "
+"HTML has abandonded SGML comment syntax, and allows adjacent hypens "
+"for all versions of HTML, although XML and XHTML do not. If you plan "
+"to support older browsers that require SGML comment syntax, then "
+"consider setting this value to yes ."
msgstr ""
"Esta opção especifica se Tidy deve substituir hífenes inesperados com "
"caracteres =
quando se trata de hífenes adjacentes. O "
@@ -1315,6 +1318,24 @@ msgstr ""
"que você ainda não pode adicionar novos elementos CDATA. Esta opção é "
"ignorada no modo XML. "
+#. Important notes for translators:
+#. - Use only
, , , , and
+#. .
+#. - Entities, tags, attributes, etc., should be enclosed in
.
+#. - Option values should be enclosed in .
+#. - It's very important that be self-closing!
+#. - The strings "Tidy" and "HTML Tidy" are the program name and must not
+#. be translated.
+msgctxt "TidyPriorityAttributes"
+msgid ""
+"This option allows prioritizing the writing of attributes in tidied "
+"documents, allowing them to written before the other attributes of an "
+"element. For example, you might specify that id and "
+"name are written before every other attribute. "
+" "
+"This option takes a space or comma separated list of attribute names. "
+msgstr ""
+
#. Important notes for translators:
#. - Use only
, , , , and
#. .
@@ -1514,6 +1535,10 @@ msgid ""
"This option specifies that Tidy should sort attributes within an element "
"using the specified sort algorithm. If set to alpha , the "
"algorithm is an ascending alphabetic sort. "
+" "
+"When used while sorting with priority-attributes
, any "
+"attribute sorting will take place after the priority attributes have "
+"been output. "
msgstr ""
"Esta opção especifica que o Tidy deve ordenar atributos dentro de um "
"elemento usando o algoritmo de ordenação especificado. Se configurado para "
@@ -2102,7 +2127,7 @@ msgstr "impressão"
msgctxt "TidyInfo"
msgid "Info: "
-msgstr "Info: "
+msgstr ""
msgctxt "TidyWarning"
msgid "Warning: "
@@ -2110,7 +2135,7 @@ msgstr "Acesso: "
msgctxt "TidyConfig"
msgid "Config: "
-msgstr "Config: "
+msgstr ""
msgctxt "TidyAccess"
msgid "Access: "
@@ -2451,6 +2476,15 @@ msgstr ""
"quadros deve sempre incluir um layout alternativo dentro\n"
"de um elemento NOFRAMES.\n"
+#. This console output should be limited to 78 characters per line.
+msgctxt "FOOTNOTE_TRIM_EMPTY_ELEMENT"
+msgid ""
+"One or more empty elements were present in the source document but\n"
+"dropped on output. If these elements are necessary or you don't want\n"
+"this behavior, then consider setting the option \"drop-empty-elements\"\n"
+"to no.\n"
+msgstr ""
+
#. This console output should be limited to 78 characters per line.
#. - The URL should not be translated unless you find a matching URL in your language.
msgctxt "TEXT_ACCESS_ADVICE1"
@@ -2817,9 +2851,21 @@ msgid "%s joining values of repeated attribute \"%s\""
msgstr "%s juntando valores de atributo repetido \"%s\""
msgctxt "MALFORMED_COMMENT"
-msgid "adjacent hyphens within comment"
+msgid "tidy replaced adjacent \"-\" with \"=\""
msgstr "hífenes adjacentes dentro de comentário"
+msgctxt "MALFORMED_COMMENT_DROPPING"
+msgid "dropping a possible comment due to a missing hyphen"
+msgstr ""
+
+msgctxt "MALFORMED_COMMENT_EOS"
+msgid "the end of the document was reached before the end of the comment"
+msgstr ""
+
+msgctxt "MALFORMED_COMMENT_WARN"
+msgid "detected adjacent hyphens within the comment; consider fix-bad-comments"
+msgstr ""
+
msgctxt "MALFORMED_DOCTYPE"
msgid "discarding malformed "
msgstr "descartando malformado"
@@ -2858,6 +2904,11 @@ msgctxt "MISSING_ENDTAG_FOR"
msgid "missing %s>"
msgstr "faltando %s>"
+#, c-format
+msgctxt "MISSING_ENDTAG_OPTIONAL"
+msgid "missing optional end tag %s>"
+msgstr ""
+
#, c-format
msgctxt "MISSING_IMAGEMAP"
msgid "%s should use client-side image map"
@@ -2868,6 +2919,11 @@ msgctxt "MISSING_QUOTEMARK"
msgid "%s attribute with missing trailing quote mark"
msgstr "atributo de %s faltando aspas ao final"
+#, c-format
+msgctxt "MISSING_QUOTEMARK_OPEN"
+msgid "value for attribute \"%s\" missing quote marks"
+msgstr ""
+
#, c-format
msgctxt "MISSING_SEMICOLON_NCR"
msgid "numeric character reference \"%s\" doesn't end in ';'"
@@ -2975,7 +3031,7 @@ msgid "unknown option: %s"
msgstr "opção desconhecida: %s"
msgctxt "SUSPECTED_MISSING_QUOTE"
-msgid "missing quote mark for attribute value"
+msgid "suspected missing quote mark for attribute value"
msgstr "faltando aspas para o valor de atributo"
#, c-format
@@ -3642,6 +3698,10 @@ msgctxt "TC_OPT_HELPCFG"
msgid "list all configuration options"
msgstr "lista todas as opções de configuração"
+msgctxt "TC_OPT_HELPENV"
+msgid "show information about the environment and runtime configuration"
+msgstr ""
+
msgctxt "TC_OPT_HELPOPT"
msgid "show a description of the "
msgstr " mostra uma descrição da "
@@ -3714,6 +3774,14 @@ msgctxt "TC_OPT_SHOWCFG"
msgid "list the current configuration settings"
msgstr "lista as definições da configuração atual"
+msgctxt "TC_OPT_EXP_CFG"
+msgid "list the current configuration settings, suitable for a config file"
+msgstr ""
+
+msgctxt "TC_OPT_EXP_DEF"
+msgid "list the default configuration settings, suitable for a config file"
+msgstr ""
+
msgctxt "TC_OPT_UPPER"
msgid "force tags to upper case"
msgstr "força tags para maiúsculo"
@@ -3902,48 +3970,56 @@ msgstr "Os argumentos de linha de comando para HTML Tidy:"
#. 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.
+#. - %s represents either a blank line, or TC_TXT_HELP_3A explaining environment options.
+#, c-format
msgctxt "TC_TXT_HELP_3"
msgid ""
"\n"
"Tidy Configuration Options\n"
"==========================\n"
-"Use Tidy's configuration options as command line arguments in the form\n"
-"of \"--some-option \", for example, \"--indent-with-tabs yes\".\n"
+" Use Tidy's configuration options as command line arguments in the form\n"
+" of \"--some-option \", for example, \"--indent-with-tabs yes\".\n"
"\n"
-"For a list of all configuration options, use \"-help-config\" or refer\n"
-"to the man page (if your OS has one).\n"
+" You can also specify a file containing configuration options with the \n"
+" -options directive, or in one or more files specific to your \n"
+" environment (see next section). \n"
"\n"
-"If your environment has an $HTML_TIDY variable set point to a Tidy \n"
-"configuration file then Tidy will attempt to use it.\n"
+" For a list of all configuration options, use \"-help-config\" or refer\n"
+" to the man page (if your OS has one).\n"
"\n"
-"On some platforms Tidy will also attempt to use a configuration specified \n"
-"in /etc/tidy.conf or ~/.tidy.conf.\n"
+"Configuration Files\n"
+"===================\n"
+" If your environment has an $HTML_TIDY variable set to point to a Tidy \n"
+" configuration file, then Tidy will attempt to use it. \n"
+"%s"
+" Use \"-help-env\" for more information about how you can use the environment. \n"
+" to specify Tidy options. \n"
"\n"
"Other\n"
"=====\n"
-"Input/Output default to stdin/stdout respectively.\n"
+" Input/Output default to stdin/stdout respectively.\n"
"\n"
-"Single letter options apart from -f may be combined\n"
-"as in: tidy -f errs.txt -imu foo.html\n"
+" Single letter options apart from -f may be combined\n"
+" as in: tidy -f errs.txt -imu foo.html\n"
"\n"
"Information\n"
"===========\n"
-"For more information about HTML Tidy, see\n"
+" For more information about HTML Tidy, see\n"
" http://www.html-tidy.org/\n"
"\n"
-"For more information on HTML, see the following:\n"
+" For more information on HTML, see the following:\n"
"\n"
-" HTML: Edition for Web Authors (the latest HTML specification)\n"
-" http://dev.w3.org/html5/spec-author-view\n"
+" HTML: Edition for Web Authors (the latest HTML specification)\n"
+" http://dev.w3.org/html5/spec-author-view\n"
"\n"
-" HTML: The Markup Language (an HTML language reference)\n"
-" http://dev.w3.org/html5/markup/\n"
+" HTML: The Markup Language (an HTML language reference)\n"
+" http://dev.w3.org/html5/markup/\n"
"\n"
-"File bug reports at https://github.com/htacg/tidy-html5/issues/\n"
-"or send questions and comments to public-htacg@w3.org.\n"
+" File bug reports at https://github.com/htacg/tidy-html5/issues/\n"
+" or send questions and comments to public-htacg@w3.org.\n"
"\n"
-"Validate your HTML documents using the W3C Nu Markup Validator:\n"
-" http://validator.w3.org/nu/\n"
+" Validate your HTML documents using the W3C Nu Markup Validator:\n"
+" http://validator.w3.org/nu/\n"
"\n"
msgstr ""
"\n"
@@ -3990,6 +4066,21 @@ msgstr ""
" http://validator.w3.org/nu/\n"
"\n"
+#. 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.
+#. - Both parameters %s reflect file paths and names.
+#, c-format
+msgctxt "TC_TXT_HELP_3A"
+msgid ""
+"\n"
+" Additionally, Tidy will automatically attempt to use configuration specified \n"
+" in these files, if present: \n"
+"\n"
+" %s \n"
+" %s \n"
+"\n"
+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 "TC_TXT_HELP_CONFIG"
@@ -4032,6 +4123,54 @@ msgctxt "TC_TXT_HELP_CONFIG_ALLW"
msgid "Allowable values"
msgstr "Valores permitidos"
+#. 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 first %s indicates two more list items, or an empty string.
+#. - The second %s indicates a file name, or a message indicating no file name.
+#, c-format
+msgctxt "TC_TXT_HELP_ENV_1"
+msgid ""
+"\n"
+"Tidy can configure its option values from multiple sources, in the \n"
+"order below. Subsequent use of the same option overrides previous \n"
+"option settings. \n"
+"\n"
+" - Tidy's built-in default values. \n"
+"%s" /* rc files */
+" - The file specified in the $HTML_TIDY environment variable: \n"
+" %s \n"
+" - Options in a file specified on the command line. \n"
+" - Options set directly on the command line. \n"
+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.
+#, c-format
+msgctxt "TC_TXT_HELP_ENV_1A"
+msgid ""
+" - The system runtime configuration file: \n"
+" %s \n"
+" - The user runtime configuration file: \n"
+" %s \n"
+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.
+#. - This message indicates that a file name is not currently set.
+msgctxt "TC_TXT_HELP_ENV_1B"
+msgid "(not currently set)"
+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.
+#, c-format
+msgctxt "TC_TXT_HELP_ENV_1C"
+msgid ""
+"\n"
+"Note that because $HTML_TIDY is set, the user runtime configuration file \n"
+"%s will not be used. \n"
+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 "TC_TXT_HELP_LANG_1"
@@ -4120,3 +4259,4 @@ msgstr ""
"\n"
"Tidy está usando a localidade %s. \n"
"\n"
+
diff --git a/localize/translations/language_zh_cn.po b/localize/translations/language_zh_cn.po
index cb7b562..a68c3ef 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-19 14:00:03\n"
+"PO-Revision-Date: 2017-10-03 12:22:47\n"
"Last-Translator: jderry\n"
"Language-Team: \n"
@@ -251,7 +251,8 @@ msgid ""
"<!DOCTYPE html>
."
" "
"If set to auto (the default) Tidy will use an educated guess "
-"based upon the contents of the document."
+"based upon the contents of the document. Note that selecting this option "
+"will not change the current document's DOCTYPE on output. "
" "
"If set to strict , Tidy will set the DOCTYPE to the HTML4 or "
"XHTML1 strict DTD."
@@ -466,10 +467,14 @@ msgid ""
"This option specifies if Tidy should replace unexpected hyphens with "
"=
characters when it comes across adjacent hyphens. "
" "
-"The default is yes . "
+"The default is auto will which will act as no "
+"for HTML5 document types, and yes for all other document "
+"types. "
" "
-"This option is provided for users of Cold Fusion which uses the "
-"comment syntax: <!--- --->
. "
+"HTML has abandonded SGML comment syntax, and allows adjacent hypens "
+"for all versions of HTML, although XML and XHTML do not. If you plan "
+"to support older browsers that require SGML comment syntax, then "
+"consider setting this value to yes ."
msgstr ""
#. Important notes for translators:
@@ -1055,6 +1060,24 @@ msgid ""
"This option is ignored in XML mode. "
msgstr ""
+#. Important notes for translators:
+#. - Use only
, , , , and
+#. .
+#. - Entities, tags, attributes, etc., should be enclosed in
.
+#. - Option values should be enclosed in .
+#. - It's very important that be self-closing!
+#. - The strings "Tidy" and "HTML Tidy" are the program name and must not
+#. be translated.
+msgctxt "TidyPriorityAttributes"
+msgid ""
+"This option allows prioritizing the writing of attributes in tidied "
+"documents, allowing them to written before the other attributes of an "
+"element. For example, you might specify that id and "
+"name are written before every other attribute. "
+" "
+"This option takes a space or comma separated list of attribute names. "
+msgstr ""
+
#. Important notes for translators:
#. - Use only
, , , , and
#. .
@@ -1226,6 +1249,10 @@ msgid ""
"This option specifies that Tidy should sort attributes within an element "
"using the specified sort algorithm. If set to alpha , the "
"algorithm is an ascending alphabetic sort. "
+" "
+"When used while sorting with priority-attributes
, any "
+"attribute sorting will take place after the priority attributes have "
+"been output. "
msgstr ""
#. Important notes for translators:
@@ -1951,6 +1978,15 @@ msgid ""
"include an alternative layout inside a NOFRAMES element.\n"
msgstr ""
+#. This console output should be limited to 78 characters per line.
+msgctxt "FOOTNOTE_TRIM_EMPTY_ELEMENT"
+msgid ""
+"One or more empty elements were present in the source document but\n"
+"dropped on output. If these elements are necessary or you don't want\n"
+"this behavior, then consider setting the option \"drop-empty-elements\"\n"
+"to no.\n"
+msgstr ""
+
#. This console output should be limited to 78 characters per line.
#. - The URL should not be translated unless you find a matching URL in your language.
msgctxt "TEXT_ACCESS_ADVICE1"
@@ -2276,7 +2312,19 @@ msgid "%s joining values of repeated attribute \"%s\""
msgstr ""
msgctxt "MALFORMED_COMMENT"
-msgid "adjacent hyphens within comment"
+msgid "tidy replaced adjacent \"-\" with \"=\""
+msgstr ""
+
+msgctxt "MALFORMED_COMMENT_DROPPING"
+msgid "dropping a possible comment due to a missing hyphen"
+msgstr ""
+
+msgctxt "MALFORMED_COMMENT_EOS"
+msgid "the end of the document was reached before the end of the comment"
+msgstr ""
+
+msgctxt "MALFORMED_COMMENT_WARN"
+msgid "detected adjacent hyphens within the comment; consider fix-bad-comments"
msgstr ""
msgctxt "MALFORMED_DOCTYPE"
@@ -2317,6 +2365,11 @@ msgctxt "MISSING_ENDTAG_FOR"
msgid "missing %s>"
msgstr ""
+#, c-format
+msgctxt "MISSING_ENDTAG_OPTIONAL"
+msgid "missing optional end tag %s>"
+msgstr ""
+
#, c-format
msgctxt "MISSING_IMAGEMAP"
msgid "%s should use client-side image map"
@@ -2327,6 +2380,11 @@ msgctxt "MISSING_QUOTEMARK"
msgid "%s attribute with missing trailing quote mark"
msgstr ""
+#, c-format
+msgctxt "MISSING_QUOTEMARK_OPEN"
+msgid "value for attribute \"%s\" missing quote marks"
+msgstr ""
+
#, c-format
msgctxt "MISSING_SEMICOLON_NCR"
msgid "numeric character reference \"%s\" doesn't end in ';'"
@@ -2434,7 +2492,7 @@ msgid "unknown option: %s"
msgstr ""
msgctxt "SUSPECTED_MISSING_QUOTE"
-msgid "missing quote mark for attribute value"
+msgid "suspected missing quote mark for attribute value"
msgstr ""
#, c-format
@@ -3095,6 +3153,10 @@ msgctxt "TC_OPT_HELPCFG"
msgid "list all configuration options"
msgstr ""
+msgctxt "TC_OPT_HELPENV"
+msgid "show information about the environment and runtime configuration"
+msgstr ""
+
msgctxt "TC_OPT_HELPOPT"
msgid "show a description of the "
msgstr ""
@@ -3163,6 +3225,14 @@ msgctxt "TC_OPT_SHOWCFG"
msgid "list the current configuration settings"
msgstr ""
+msgctxt "TC_OPT_EXP_CFG"
+msgid "list the current configuration settings, suitable for a config file"
+msgstr ""
+
+msgctxt "TC_OPT_EXP_DEF"
+msgid "list the default configuration settings, suitable for a config file"
+msgstr ""
+
msgctxt "TC_OPT_UPPER"
msgid "force tags to upper case"
msgstr ""
@@ -3342,48 +3412,71 @@ 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.
+#. - %s represents either a blank line, or TC_TXT_HELP_3A explaining environment options.
+#, c-format
msgctxt "TC_TXT_HELP_3"
msgid ""
"\n"
"Tidy Configuration Options\n"
"==========================\n"
-"Use Tidy's configuration options as command line arguments in the form\n"
-"of \"--some-option \", for example, \"--indent-with-tabs yes\".\n"
+" Use Tidy's configuration options as command line arguments in the form\n"
+" of \"--some-option \", for example, \"--indent-with-tabs yes\".\n"
"\n"
-"For a list of all configuration options, use \"-help-config\" or refer\n"
-"to the man page (if your OS has one).\n"
+" You can also specify a file containing configuration options with the \n"
+" -options directive, or in one or more files specific to your \n"
+" environment (see next section). \n"
"\n"
-"If your environment has an $HTML_TIDY variable set point to a Tidy \n"
-"configuration file then Tidy will attempt to use it.\n"
+" For a list of all configuration options, use \"-help-config\" or refer\n"
+" to the man page (if your OS has one).\n"
"\n"
-"On some platforms Tidy will also attempt to use a configuration specified \n"
-"in /etc/tidy.conf or ~/.tidy.conf.\n"
+"Configuration Files\n"
+"===================\n"
+" If your environment has an $HTML_TIDY variable set to point to a Tidy \n"
+" configuration file, then Tidy will attempt to use it. \n"
+"%s"
+" Use \"-help-env\" for more information about how you can use the environment. \n"
+" to specify Tidy options. \n"
"\n"
"Other\n"
"=====\n"
-"Input/Output default to stdin/stdout respectively.\n"
+" Input/Output default to stdin/stdout respectively.\n"
"\n"
-"Single letter options apart from -f may be combined\n"
-"as in: tidy -f errs.txt -imu foo.html\n"
+" Single letter options apart from -f may be combined\n"
+" as in: tidy -f errs.txt -imu foo.html\n"
"\n"
"Information\n"
"===========\n"
-"For more information about HTML Tidy, see\n"
+" For more information about HTML Tidy, see\n"
" http://www.html-tidy.org/\n"
"\n"
-"For more information on HTML, see the following:\n"
+" For more information on HTML, see the following:\n"
"\n"
-" HTML: Edition for Web Authors (the latest HTML specification)\n"
-" http://dev.w3.org/html5/spec-author-view\n"
+" HTML: Edition for Web Authors (the latest HTML specification)\n"
+" http://dev.w3.org/html5/spec-author-view\n"
"\n"
-" HTML: The Markup Language (an HTML language reference)\n"
-" http://dev.w3.org/html5/markup/\n"
+" HTML: The Markup Language (an HTML language reference)\n"
+" http://dev.w3.org/html5/markup/\n"
"\n"
-"File bug reports at https://github.com/htacg/tidy-html5/issues/\n"
-"or send questions and comments to public-htacg@w3.org.\n"
+" File bug reports at https://github.com/htacg/tidy-html5/issues/\n"
+" or send questions and comments to public-htacg@w3.org.\n"
"\n"
-"Validate your HTML documents using the W3C Nu Markup Validator:\n"
-" http://validator.w3.org/nu/\n"
+" Validate your HTML documents using the W3C Nu Markup Validator:\n"
+" http://validator.w3.org/nu/\n"
+"\n"
+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.
+#. - Both parameters %s reflect file paths and names.
+#, c-format
+msgctxt "TC_TXT_HELP_3A"
+msgid ""
+"\n"
+" Additionally, Tidy will automatically attempt to use configuration specified \n"
+" in these files, if present: \n"
+"\n"
+" %s \n"
+" %s \n"
"\n"
msgstr ""
@@ -3417,6 +3510,54 @@ msgctxt "TC_TXT_HELP_CONFIG_ALLW"
msgid "Allowable values"
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.
+#. - The first %s indicates two more list items, or an empty string.
+#. - The second %s indicates a file name, or a message indicating no file name.
+#, c-format
+msgctxt "TC_TXT_HELP_ENV_1"
+msgid ""
+"\n"
+"Tidy can configure its option values from multiple sources, in the \n"
+"order below. Subsequent use of the same option overrides previous \n"
+"option settings. \n"
+"\n"
+" - Tidy's built-in default values. \n"
+"%s" /* rc files */
+" - The file specified in the $HTML_TIDY environment variable: \n"
+" %s \n"
+" - Options in a file specified on the command line. \n"
+" - Options set directly on the command line. \n"
+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.
+#, c-format
+msgctxt "TC_TXT_HELP_ENV_1A"
+msgid ""
+" - The system runtime configuration file: \n"
+" %s \n"
+" - The user runtime configuration file: \n"
+" %s \n"
+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.
+#. - This message indicates that a file name is not currently set.
+msgctxt "TC_TXT_HELP_ENV_1B"
+msgid "(not currently set)"
+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.
+#, c-format
+msgctxt "TC_TXT_HELP_ENV_1C"
+msgid ""
+"\n"
+"Note that because $HTML_TIDY is set, the user runtime configuration file \n"
+"%s will not be used. \n"
+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 "TC_TXT_HELP_LANG_1"
diff --git a/localize/translations/tidy.pot b/localize/translations/tidy.pot
index 68e490d..185f2f1 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-10-02 13:38:21\n"
+"POT-Creation-Date: 2017-10-03 12:22:47\n"
"Last-Translator: jderry\n"
"Language-Team: \n"
diff --git a/src/config.c b/src/config.c
index 47cc186..9b506e2 100644
--- a/src/config.c
+++ b/src/config.c
@@ -91,12 +91,9 @@ static PickListItems charEncPicks = {
{ "mac", TidyEncMac, { "mac", NULL } },
{ "win1252", TidyEncWin1252, { "win1252", NULL } },
{ "ibm858", TidyEncIbm858, { "ibm858", NULL } },
-
-#if SUPPORT_UTF16_ENCODINGS
{ "utf16le", TidyEncUtf16le, { "utf16le", NULL } },
{ "utf16be", TidyEncUtf16be, { "utf16be", NULL } },
{ "utf16", TidyEncUtf16, { "utf16", NULL } },
-#endif
#if SUPPORT_ASIAN_ENCODINGS
{ "big5", TidyEncBig5, { "big5", NULL } },
@@ -274,9 +271,7 @@ static const TidyOptionImpl option_defs[] =
{ TidyOmitOptionalTags, MU, "omit-optional-tags", BL, no, ParsePickList, &boolPicks },
{ TidyOutCharEncoding, CE, "output-encoding", IN, UTF8, ParseCharEnc, &charEncPicks },
{ TidyOutFile, MS, "output-file", ST, 0, ParseString, NULL },
-#if SUPPORT_UTF16_ENCODINGS
{ TidyOutputBOM, CE, "output-bom", IN, TidyAutoState, ParsePickList, &autoBoolPicks },
-#endif
{ TidyPPrintTabs, PP, "indent-with-tabs", BL, no, ParseTabs, &boolPicks }, /* 20150515 - Issue #108 */
{ TidyPreserveEntities, MU, "preserve-entities", BL, no, ParsePickList, &boolPicks },
{ TidyPreTags, MU, "new-pre-tags", ST, 0, ParseTagNames, NULL },
@@ -997,11 +992,10 @@ Bool TY_(AdjustCharEncoding)( TidyDocImpl* doc, int encoding )
case ISO2022:
#endif
-#if SUPPORT_UTF16_ENCODINGS
case UTF16LE:
case UTF16BE:
case UTF16:
-#endif
+
#if SUPPORT_ASIAN_ENCODINGS
case SHIFTJIS:
case BIG5:
@@ -1066,11 +1060,9 @@ void AdjustConfig( TidyDocImpl* doc )
*/
if ( cfg(doc, TidyOutCharEncoding) != ASCII &&
cfg(doc, TidyOutCharEncoding) != UTF8 &&
-#if SUPPORT_UTF16_ENCODINGS
cfg(doc, TidyOutCharEncoding) != UTF16 &&
cfg(doc, TidyOutCharEncoding) != UTF16BE &&
cfg(doc, TidyOutCharEncoding) != UTF16LE &&
-#endif
cfg(doc, TidyOutCharEncoding) != RAW &&
cfgBool(doc, TidyXmlOut) )
{
@@ -1080,12 +1072,11 @@ void AdjustConfig( TidyDocImpl* doc )
/* XML requires end tags */
if ( cfgBool(doc, TidyXmlOut) )
{
-#if SUPPORT_UTF16_ENCODINGS
/* XML requires a BOM on output if using UTF-16 encoding */
ulong enc = cfg( doc, TidyOutCharEncoding );
if ( enc == UTF16LE || enc == UTF16BE || enc == UTF16 )
TY_(SetOptionInt)( doc, TidyOutputBOM, yes );
-#endif
+
TY_(SetOptionBool)( doc, TidyQuoteAmpersand, yes );
TY_(SetOptionBool)( doc, TidyOmitOptionalTags, no );
}
diff --git a/src/language_en.h b/src/language_en.h
index 3b70831..1970126 100644
--- a/src/language_en.h
+++ b/src/language_en.h
@@ -933,7 +933,6 @@ static languageDefinition language_en = { whichPluralForm_en, {
"This option specifies the output file Tidy uses for markup. Normally "
"markup is written to stdout
. "
},
-#if SUPPORT_UTF16_ENCODINGS
{/* Important notes for translators:
- Use only
, , , , and
.
@@ -954,7 +953,6 @@ static languageDefinition language_en = { whichPluralForm_en, {
"A BOM is always written for XML/XHTML output using UTF-16 output "
"encodings. "
},
-#endif
{/* Important notes for translators:
- Use only
, , , , and
.
diff --git a/src/language_en_gb.h b/src/language_en_gb.h
index 204b26e..c4bd5ea 100644
--- a/src/language_en_gb.h
+++ b/src/language_en_gb.h
@@ -1,4 +1,4 @@
-#ifndef language_en_gb_h
+#ifndef language_en_gb_h
#define language_en_gb_h
/*
* language_en_gb.h
diff --git a/src/language_es.h b/src/language_es.h
index a467212..7e7e193 100644
--- a/src/language_es.h
+++ b/src/language_es.h
@@ -1,4 +1,4 @@
-#ifndef language_es_h
+#ifndef language_es_h
#define language_es_h
/*
* language_es.h
diff --git a/src/language_es_mx.h b/src/language_es_mx.h
index df444b6..4c12b71 100644
--- a/src/language_es_mx.h
+++ b/src/language_es_mx.h
@@ -1,4 +1,4 @@
-#ifndef language_es_mx_h
+#ifndef language_es_mx_h
#define language_es_mx_h
/*
* language_es_mx.h
diff --git a/src/language_fr.h b/src/language_fr.h
index aca77db..886b458 100644
--- a/src/language_fr.h
+++ b/src/language_fr.h
@@ -1,4 +1,4 @@
-#ifndef language_fr_h
+#ifndef language_fr_h
#define language_fr_h
/*
* language_fr.h
@@ -28,7 +28,7 @@
*
* Orginating PO file metadata:
* PO_LAST_TRANSLATOR=jderry
- * PO_REVISION_DATE=2017-09-19 14:00:03
+ * PO_REVISION_DATE=2017-10-03 12:22:47
*/
#ifdef _MSC_VER
@@ -355,8 +355,6 @@ static languageDefinition language_fr = { whichPluralForm_fr, {
"Cette option précise le fichier de sortie que Tidy utilise pour la structure de balises. En "
"principe la structure est écrite vers stdout
. "
},
-
-#if SUPPORT_UTF16_ENCODINGS
{ TidyOutputBOM, 0,
"Cette option précise si Tidy doit écrire un caractère indicateur d'ordre des octets (Unicode Byte "
"Order Mark ou BOM; connu aussi sous Zero Width No-Break Space; a la valeur de U+FEFF) au début de "
@@ -364,8 +362,6 @@ static languageDefinition language_fr = { whichPluralForm_fr, {
"auto , Tidy écrira un BOM vers la sortie seulement si un BOM était présent au début de "
"l'entrée. Un BOM est toujours écrit pour la sortie XML/XHTML des sorties encodées en UTF-16. "
},
-#endif /* SUPPORT_UTF16_ENCODINGS */
-
{ TidyPPrintTabs, 0,
"Cette option précise si tidy doit indenter avec des tabulations plutôt que des espaces, en "
"supposant que indent
vaut yes . Définir cette option à yes "
diff --git a/src/language_pt_br.h b/src/language_pt_br.h
index 824be03..0dd7828 100644
--- a/src/language_pt_br.h
+++ b/src/language_pt_br.h
@@ -403,8 +403,6 @@ static languageDefinition language_pt_br = { whichPluralForm_pt_br, {
"Essa opção especifica o arquivo de saída que o Tidy usa para marcação. "
"Normalmente, a marcação é escrita para stdout
. "
},
-
-#if SUPPORT_UTF16_ENCODINGS
{ TidyOutputBOM, 0,
"Esta opção especifica se o Tidy deve escrever um caractere Unicode de marca "
"de ordem de byte (BOM, também conhecido como Zero Width No Break Break, tem "
@@ -414,8 +412,6 @@ static languageDefinition language_pt_br = { whichPluralForm_pt_br, {
"presente no início da entrada. Um BOM está sempre escrita para saída "
"XML/XHTML usando codificações de saída UTF-16. "
},
-#endif /* SUPPORT_UTF16_ENCODINGS */
-
{ TidyPPrintTabs, 0,
"Esta opção especifica se o Tidy deve aplicar recuo com tabulações em vez de "
"espaços, presumindo que indent
seja yes . Defina-"
diff --git a/src/language_zh_cn.h b/src/language_zh_cn.h
index 7d4b129..f4726d3 100644
--- a/src/language_zh_cn.h
+++ b/src/language_zh_cn.h
@@ -28,7 +28,7 @@
*
* Orginating PO file metadata:
* PO_LAST_TRANSLATOR=jderry
- * PO_REVISION_DATE=2017-09-08 11:28:05
+ * PO_REVISION_DATE=2017-10-03 12:22:47
*/
#ifdef _MSC_VER
diff --git a/src/message.c b/src/message.c
index d94c286..c3ec995 100644
--- a/src/message.c
+++ b/src/message.c
@@ -623,12 +623,10 @@ TidyMessageImpl *formatEncodingReport(TidyDocImpl* doc, Node *element, Node *nod
doc->badChars |= BC_INVALID_UTF8;
break;
-#if SUPPORT_UTF16_ENCODINGS
case INVALID_UTF16:
TY_(tmbsnprintf)(buf, sizeof(buf), "U+%04X", c);
doc->badChars |= BC_INVALID_UTF16;
break;
-#endif
case VENDOR_SPECIFIC_CHARS:
NtoS(c, buf);
@@ -1166,10 +1164,8 @@ void TY_(ErrorSummary)( TidyDocImpl* doc )
if (doc->badChars & BC_INVALID_UTF8)
TY_(Dialogue)( doc, TEXT_INVALID_UTF8 );
-#if SUPPORT_UTF16_ENCODINGS
if (doc->badChars & BC_INVALID_UTF16)
TY_(Dialogue)( doc, TEXT_INVALID_UTF16 );
-#endif
if (doc->badChars & BC_INVALID_URI)
TY_(Dialogue)( doc, TEXT_INVALID_URI );
diff --git a/src/pprint.c b/src/pprint.c
index 87568b0..c4803c4 100644
--- a/src/pprint.c
+++ b/src/pprint.c
@@ -895,11 +895,9 @@ static void PPrintChar( TidyDocImpl* doc, uint c, uint mode )
switch ( outenc )
{
case UTF8:
-#if SUPPORT_UTF16_ENCODINGS
case UTF16:
case UTF16LE:
case UTF16BE:
-#endif
if (!(mode & PREFORMATTED) && cfg(doc, TidyPunctWrap))
{
WrapPoint wp = CharacterWrapPoint(c);
@@ -982,14 +980,12 @@ static void PPrintChar( TidyDocImpl* doc, uint c, uint mode )
return;
}
-#if SUPPORT_UTF16_ENCODINGS
/* don't map UTF-16 chars to entities */
if ( outenc == UTF16 || outenc == UTF16LE || outenc == UTF16BE )
{
AddChar( pprint, c );
return;
}
-#endif
/* use numeric entities only for XML */
if ( cfgBool(doc, TidyXmlTags) )
diff --git a/src/streamio.c b/src/streamio.c
index 2fd3ae5..eb63c71 100644
--- a/src/streamio.c
+++ b/src/streamio.c
@@ -168,9 +168,7 @@ StreamIn* TY_(UserInput)( TidyDocImpl* doc, TidyInputSource* source, int encodin
int TY_(ReadBOMEncoding)(StreamIn *in)
{
uint c, c1;
-#if SUPPORT_UTF16_ENCODINGS
uint bom;
-#endif
c = ReadByte(in);
if (c == EndOfStream)
@@ -186,7 +184,6 @@ int TY_(ReadBOMEncoding)(StreamIn *in)
/* todo: dont warn about mismatch for auto input encoding */
/* todo: let the user override the encoding found here */
-#if SUPPORT_UTF16_ENCODINGS
bom = (c << 8) + c1;
if ( bom == UNICODE_BOM_BE )
@@ -206,7 +203,6 @@ int TY_(ReadBOMEncoding)(StreamIn *in)
return UTF16LE; /* return decoded BOM */
}
else
-#endif /* SUPPORT_UTF16_ENCODINGS */
{
uint c2 = ReadByte(in);
@@ -410,7 +406,6 @@ uint TY_(ReadChar)( StreamIn *in )
break;
}
-#if SUPPORT_UTF16_ENCODINGS
/* handle surrogate pairs */
if ( in->encoding == UTF16LE ||
in->encoding == UTF16 ||
@@ -441,7 +436,6 @@ uint TY_(ReadChar)( StreamIn *in )
TY_(ReportEncodingError)( in->doc, INVALID_UTF16, c, yes );
}
}
-#endif
/* Do first: acts on range 128 - 255 */
switch ( in->encoding )
@@ -670,7 +664,6 @@ void TY_(WriteChar)( uint c, StreamOut* out )
}
#endif /* NO_NATIVE_ISO2022_SUPPORT */
-#if SUPPORT_UTF16_ENCODINGS
else if ( out->encoding == UTF16LE ||
out->encoding == UTF16BE ||
out->encoding == UTF16 )
@@ -717,7 +710,6 @@ void TY_(WriteChar)( uint c, StreamOut* out )
}
}
}
-#endif
#if SUPPORT_ASIAN_ENCODINGS
else if (out->encoding == BIG5 || out->encoding == SHIFTJIS)
@@ -1210,7 +1202,6 @@ static uint ReadCharFromStream( StreamIn* in )
}
#endif /* #ifndef NO_NATIVE_ISO2022_SUPPORT */
-#if SUPPORT_UTF16_ENCODINGS
if ( in->encoding == UTF16LE )
{
uint c1 = ReadByte( in );
@@ -1228,7 +1219,6 @@ static uint ReadCharFromStream( StreamIn* in )
n = (c << 8) + c1;
return n;
}
-#endif
if ( in->encoding == UTF8 )
{
@@ -1303,11 +1293,9 @@ static uint ReadCharFromStream( StreamIn* in )
void TY_(outBOM)( StreamOut *out )
{
if ( out->encoding == UTF8
-#if SUPPORT_UTF16_ENCODINGS
|| out->encoding == UTF16LE
|| out->encoding == UTF16BE
|| out->encoding == UTF16
-#endif
)
{
/* this will take care of encoding the BOM correctly */
@@ -1331,11 +1319,9 @@ static struct _enc2iana
{ MACROMAN, "macintosh", "mac" },
{ WIN1252, "windows-1252", "win1252" },
{ IBM858, "ibm00858", "ibm858" },
-#if SUPPORT_UTF16_ENCODINGS
{ UTF16LE, "utf-16", "utf16le" },
{ UTF16BE, "utf-16", "utf16be" },
{ UTF16, "utf-16", "utf16" },
-#endif
#if SUPPORT_ASIAN_ENCODINGS
{ BIG5, "big5", "big5" },
{ SHIFTJIS, "shift_jis", "shiftjis"},
diff --git a/src/streamio.h b/src/streamio.h
index 696cea9..280f699 100644
--- a/src/streamio.h
+++ b/src/streamio.h
@@ -154,26 +154,21 @@ int TY_(GetCharEncodingFromOptName)(ctmbstr charenc);
#define MACROMAN 6
#define WIN1252 7
#define IBM858 8
-
-#if SUPPORT_UTF16_ENCODINGS
#define UTF16LE 9
#define UTF16BE 10
#define UTF16 11
-#endif
/* Note that Big5 and SHIFTJIS are not converted to ISO 10646 codepoints
** (i.e., to Unicode) before being recoded into UTF-8. This may be
** confusing: usually UTF-8 implies ISO10646 codepoints.
*/
#if SUPPORT_ASIAN_ENCODINGS
-#if SUPPORT_UTF16_ENCODINGS
#define BIG5 12
#define SHIFTJIS 13
#else
#define BIG5 9
#define SHIFTJIS 10
#endif
-#endif
#ifdef TIDY_WIN32_MLANG_SUPPORT
/* hack: windows code page numbers start at 37 */
diff --git a/src/tidylib.c b/src/tidylib.c
index c6104eb..da1cb89 100644
--- a/src/tidylib.c
+++ b/src/tidylib.c
@@ -2173,10 +2173,8 @@ int tidyDocSaveStream( TidyDocImpl* doc, StreamOut* out )
{
Bool showMarkup = cfgBool( doc, TidyShowMarkup );
Bool forceOutput = cfgBool( doc, TidyForceOutput );
-#if SUPPORT_UTF16_ENCODINGS
Bool outputBOM = ( cfgAutoBool(doc, TidyOutputBOM) == TidyYesState );
Bool smartBOM = ( cfgAutoBool(doc, TidyOutputBOM) == TidyAutoState );
-#endif
Bool xmlOut = cfgBool( doc, TidyXmlOut );
Bool xhtmlOut = cfgBool( doc, TidyXhtmlOut );
TidyTriState bodyOnly = cfgAutoBool( doc, TidyBodyOnly );
@@ -2220,11 +2218,9 @@ int tidyDocSaveStream( TidyDocImpl* doc, StreamOut* out )
if ( showMarkup && (doc->errors == 0 || forceOutput) )
{
-#if SUPPORT_UTF16_ENCODINGS
/* Output a Byte Order Mark if required */
if ( outputBOM || (doc->inputHadBOM && smartBOM) )
TY_(outBOM)( out );
-#endif
/* No longer necessary. No DOCTYPE == HTML 3.2,
** which gives you only the basic character entities,