diff --git a/console/tidy.c b/console/tidy.c index cb6a0ed..d8e5d7e 100644 --- a/console/tidy.c +++ b/console/tidy.c @@ -13,9 +13,6 @@ #include "locale.h" #if defined(_WIN32) #include /* Force console to UTF8. */ -//#define nest_(x) TY_(x) -//#define printf nest_(win_printf) -//#define fprint nest_(win_fprintf) #endif #if !defined(NDEBUG) && defined(_MSC_VER) #include "sprtf.h" @@ -28,6 +25,10 @@ static FILE* errout = NULL; /* set to stderr */ /* static FILE* txtout = NULL; */ /* set to stdout */ +#if defined(_WIN32) +static uint win_cp; /* original Windows code page */ +#endif + /** ** Indicates whether or not two filenames are the same. */ @@ -41,6 +42,17 @@ static Bool samefile( ctmbstr filename1, ctmbstr filename2 ) } +/** + ** Handles exit cleanup. + */ +static void tidy_cleanup() +{ +#if defined(_WIN32) + /* Restore original Windows code page. */ + SetConsoleOutputCP(win_cp); +#endif +} + /** ** Exits with an error in the event of an out of memory condition. */ @@ -1466,14 +1478,6 @@ static void unknownOption( uint c ) fprintf( errout, "\n"); } -/** - ** Handles pretty-printing callbacks. - */ -void progressTester( TidyDoc tdoc, uint srcLine, uint srcCol, uint dstLine) -{ - fprintf(stderr, "srcLine = %u, srcCol = %u, dstLine = %u\n", srcLine, srcCol, dstLine); -} - /** ** MAIN -- let's do something here. @@ -1492,12 +1496,25 @@ int main( int argc, char** argv ) errout = stderr; /* initialize to stderr */ + /* Set an atexit handler. */ + atexit( tidy_cleanup ); + /* Set the locale for tidy's output. */ locale = tidySystemLocale(locale); tidySetLanguage(locale); if ( locale ) free( locale ); +#if defined(_WIN32) + /* Force Windows console to use UTF, otherwise many characters will + * be garbage. Note that East Asian languages *are* supported, but + * only when Windows OS locale (not console only!) is set to an + * East Asian language. + */ + win_cp = GetConsoleOutputCP(); + SetConsoleOutputCP(CP_UTF8); +#endif + #if !defined(NDEBUG) && defined(_MSC_VER) set_log_file((char *)"temptidy.txt", 0); // add_append_log(1); @@ -1639,15 +1656,6 @@ int main( int argc, char** argv ) printf(tidyLocalizedString(TC_STRING_LANG_NOT_FOUND), argv[2], tidyGetLanguage()); printf("\n"); - } else { -#if defined(_WIN32) - /* If we set a language then force Windows console to use UTF, - * otherwise many characters will be garbage. @todo: aggregate - * all of this application's exits and returns so that we can - * reset the original code page upon termination. - */ - SetConsoleOutputCP(65001); -#endif } --argc; ++argv; diff --git a/include/tidyenum.h b/include/tidyenum.h index c4212eb..1b6809b 100644 --- a/include/tidyenum.h +++ b/include/tidyenum.h @@ -820,7 +820,7 @@ typedef enum TidyAttr_ARIA_VALUETEXT, /* SVG attributes (SVG 1.1) */ - TidyAttr_X, /**< X= */ + TidyAttr_X, /**< X= */ TidyAttr_Y, /**< Y= */ TidyAttr_VIEWBOX, /**< VIEWBOX= */ TidyAttr_PRESERVEASPECTRATIO, /**< PRESERVEASPECTRATIO= */ diff --git a/localize/README.md b/localize/README.md index 1862214..b11d51c 100644 --- a/localize/README.md +++ b/localize/README.md @@ -24,9 +24,11 @@ the event that you want to build Tidy with your new language. - [Language Inheritance](#language-inheritance) - [String Inheritance](#string-inheritance) - [Base Language First and Regional Variants](#base-language-first-and-regional-variants) + - [Positional Parameters](#positional-parameters) - [Testing](#testing) - [Command line option](#command-line-option) - [Changing your locale](#changing-your-locale) + - [East Asian Languages](#east-asian-languages) - [gettext](#gettext) - [poconvert.rb](#poconvertrb) - [Create a new POT file](#create-a-new-pot-file) @@ -43,9 +45,9 @@ the event that you want to build Tidy with your new language. ## Introduction ### PO and POT files -HTML Tidy uses PO and POT files for language translations. The file `tidy.pot` -is the correct template to use as a basis for translations. In a typical -`gettext` workflow a translator will use the `tidy.pot` file to create a +HTML Tidy provides PO and POT files for language translations. The file +`tidy.pot` is the correct template to use as a basis for new translations. In a +typical `gettext` workflow a translator will use the `tidy.pot` file to create a language translation PO file that contains original English strings and the translated strings. @@ -56,6 +58,10 @@ PO files may already exist. These files are named `language_ll.po` or Tidy does not use MO files that `gettext` tools generate from PO files. +Please note that these PO and POT files are provided for translator convenience +only. Tidy's [header files](#h-files) constitute the true, controlled source +code for Tidy. + ### H files @@ -68,7 +74,7 @@ step, but we provide a tool to perform this function if desired. ### Differences for translators Experienced users and translators of PO files may note that we use the PO file's -`msgctxt` field a bit uniquely. Rather than point to a line in the source code +`msgctxt` field a bit uniquely. Rather than point to a line in the source code, it contains a reference to the string's identifier. Because the PO format does not allow for arbitrary metadata this is a requirement for generating our header files. @@ -90,7 +96,7 @@ Please don't use `gettext`' tools with our PO and POT files (unless you are using our strings for a different project). Instead all workflows can be accomplished with our `poconvert.rb` tool. -More information about this tool can be found below. +[More information about this tool](#h-files) can be found below. ## How to Contribute @@ -99,11 +105,22 @@ More information about this tool can be found below. If you've not already cloned the HTML Tidy source code repository that will be your first step. -In the `localize\translations` directory you can find existing languages, e.g., +In the `localize\translations\` directory you can find existing languages, e.g., - `tidy.pot` (Tidy's POT template for translations). - `language_en_gb.po` (British English variants for the built in language) - …and perhaps more. + +In the `src\` directory you can find the master files for existing languages, +e.g., + + - `language_en.h` (Tidy's native, built-in language, mostly U.S. English) + - `language_en_gb.po` (British English variants for the built in language) + - …and perhaps more. + +Although the header files are the master files for HTML Tidy, we understand that +not all potential translators want to edit C files directly. Therefore as an +option, the following workflow to use POT and PO files is offered. If the language that you want to work on is already present: @@ -138,9 +155,11 @@ If the language that you want to work on is _not_ already present: Once your translation is complete commit your entire HTML Tidy repository to GitHub and issue a pull request (PR) against the `master` branch. If accepted a -friendly developer will convert your PO into a format useful to Tidy. +friendly developer will convert your PO into a format useful to Tidy if your +PR is a PO, or will simply merge your changed header file if you changed it +directly. -You are also welcome to perform the conversion yourself, add the language to +You are also welcome to perform any conversions yourself, add new languages to Tidy, and issue a PR for the whole change. @@ -157,9 +176,9 @@ Tidy, and issue a PR for the whole change. ### Repository Notes -Please **only** commit PO files with _English_ `msgid` fields. The `gettext` -convention specifies only English `msgid`, and other translators may not -understand the original strings. +If you are working with PO files then please **only** commit PO files with +_English_ `msgid` fields. The `gettext` convention specifies only English +`msgid`, and other translators may not understand the original strings. Our `poconvert.rb` script can generate PO files using another language as `msgid`. This can be very useful if it's easier for you to translate from @@ -178,7 +197,7 @@ Although we don't require you to follow these steps to contribute a language to Tidy, you may want to add the language to Tidy yourself to test the translation, or to save one of the developer team a few extra steps. - - Generate the header files: + - Generate the header files if necessary: - Convert your PO file to a Tidy header file by executing `poconvert.rb msgfmt `. Note that on Windows you will likely have to preface this line with `ruby`. @@ -227,6 +246,14 @@ If you are working on a regional variation (such as “us_CA”) please only localize strings that are actually _different_ from the base language! +### Positional Parameters + +Please note that HTML Tidy does not current support positional parameters. Due +to the nature of most of Tidy's output, it's not expected that they will be +required. In any case, please translate strings so that substitution values are +in the same order as the original string. + + ## Testing We hope to develop a comprehensive test suite in the future, but in the meantime @@ -248,6 +275,14 @@ temporarily with: …substituting, of course the language of your choice. +### East Asian Languages + +East Asian languages are completely supported and have been tested on Linux, +Mac OS X, and Windows, although Windows requires you to set your operating +system (not the console locale!) to an East Asian locale to enable this in +Windows Console and PowerShell. Note that PowerShell ISE always supports East +Asian languages without requiring you to change your operating system locale. + ## gettext diff --git a/localize/language_ll_cc.h.erb b/localize/language_ll_cc.h.erb index 397599d..40bb283 100644 --- a/localize/language_ll_cc.h.erb +++ b/localize/language_ll_cc.h.erb @@ -4,14 +4,22 @@ * language_<%= po_content.language %>.h * Localization support for HTML Tidy. * - * THIS FILE IS MACHINE GENERATED. It is a localization file for the - * language (and maybe region) "<%= po_content.language %>" and it should not be - * edited manually. The source of these strings is a gettext PO file, - * probably called "language_<%= po_content.language %>.po" in Tidy's source. * - * Tidy's source distribution also includes a script to convert PO files - * into this file. Because PO files are friendly to translators and a - * standard industry tool, please translate ONLY the PO files. + * This file is a localization file for HTML Tidy. It will have been machine + * generated or created and/or edited by hand. Both are valid options, but + * please help keep our localization efforts simple to maintain by maintaining + * the structure of this file, and changing the check box below if you make + * changes (so others know the file origin): + * + * [X] THIS FILE IS MACHINE GENERATED. It is a localization file for the + * language (and maybe region) "<%= po_content.language %>". The source of + * these strings is a gettext PO file in Tidy's source, probably called + * "language_<%= po_content.language %>.po". + * + * [ ] THIS FILE WAS HAND MODIFIED. Translators, please feel to edit this file + * directly (and check this box). If you prefer to edit PO files then use + * `poconvert.rb msgunfmt language_<%= po_content.language %>.h` (our own + * conversion tool) to generate a fresh PO from this file first! * * (c) 2015 HTACG * See tidy.h and access.h for the copyright notice. @@ -38,8 +46,8 @@ * definition. */ static uint whichPluralForm_<%= po_content.language %>(uint n) { - /* <%= po_content.plural_forms %> */ - return <%= po_content.plural_formula %> + /* <%= po_content.plural_forms %> */ + return <%= po_content.plural_formula %> } @@ -50,10 +58,10 @@ static uint whichPluralForm_<%= po_content.language %>(uint n) { * the build system. */ static languageDefinition language_<%= po_content.language %> = { whichPluralForm_<%= po_content.language %>, { - /*************************************** - ** This MUST be present and first. - ** Specify the code for this language. - ***************************************/ + /*************************************** + ** This MUST be present and first. + ** Specify the code for this language. + ***************************************/ <%= report_body %> <%= report_body_last %> }}; diff --git a/localize/poconvert.rb b/localize/poconvert.rb index da44765..882f742 100755 --- a/localize/poconvert.rb +++ b/localize/poconvert.rb @@ -29,7 +29,7 @@ module PoConvertModule ########################################################### @@default_en = File.expand_path(File.join('..', 'src', 'language_en.h' )) @@header_template = File.expand_path(File.join('.', 'language_ll_cc.h.erb')) - @@header_digest = 'b6b869b67a80a86d216c7080ac3d1a62aa3de82bbea37599b30160f22aa78d6c' + @@header_digest = 'b597e5948de1611ab6cde11934df6fc792c7ec4d21f3cd2030fb2e9bcfb94991' ########################################################### @@ -1079,10 +1079,10 @@ Complete Help: :type => :string, :desc => 'Specifies a base language from which to exclude translated strings.', :aliases => '-b' - option :plaintext, + option :hex, :type => :boolean, - :desc => 'Specifies that the generated file contain plain text instead of hex escaped characters.', - :aliases => '-p' + :desc => 'Specifies that the generated file contain hex escaped characters.', + :aliases => '-h' desc 'msgfmt ', 'Creates a Tidy header H file from the given PO file.' long_desc <<-LONG_DESC Creates a Tidy header H file from the specified PO file, @@ -1103,7 +1103,7 @@ Complete Help: args.each do |input_file| converter = PoConverter.new - converter.plaintext = options[:plaintext] + converter.plaintext = !options[:hex] set_options error_count = converter.convert_to_h( input_file, options[:baselang] ) ? error_count : error_count + 1 end diff --git a/localize/translations/language_en_gb.po b/localize/translations/language_en_gb.po index ced5ee0..bcc861d 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: 2016-01-23 16:04:27\n" +"PO-Revision-Date: 2016-01-29 10:54:42\n" "Last-Translator: jderry\n" "Language-Team: \n" @@ -19,19 +19,16 @@ msgctxt "ATRC_ACCESS_URL" msgid "http://www.html-tidy.org/accessibility/" msgstr "" -#, c-format msgctxt "FILE_CANT_OPEN" -msgid "Can't open \"%1$s\"\n" +msgid "Can't open \"%s\"\n" msgstr "" -#, c-format msgctxt "LINE_COLUMN_STRING" -msgid "line %1$d column %2$d - " +msgid "line %d column %d - " msgstr "" -#, c-format msgctxt "STRING_CONTENT_LOOKS" -msgid "Document content looks like %1$s" +msgid "Document content looks like %s" msgstr "" #. For example, "discarding invalid UTF-16 surrogate pair" @@ -39,15 +36,13 @@ msgctxt "STRING_DISCARDING" msgid "discarding" msgstr "" -#, c-format msgctxt "STRING_DOCTYPE_GIVEN" -msgid "Doctype given is \"%1$s\"" +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 %1$u %2$s and %3$u %4$s!" +msgid "Tidy found %u %s and %u %s!" msgstr "" msgctxt "STRING_ERROR_COUNT_ERROR" @@ -71,9 +66,8 @@ msgctxt "STRING_HTML_PROPRIETARY" msgid "HTML Proprietary" msgstr "" -#, c-format msgctxt "STRING_MISSING_MALFORMED" -msgid "missing or malformed argument for option: %1$s" +msgid "missing or malformed argument for option: %s" msgstr "" msgctxt "STRING_NO_ERRORS" @@ -102,18 +96,16 @@ msgctxt "STRING_SPECIFIED" msgid "specified" msgstr "" -#, c-format msgctxt "STRING_UNKNOWN_FILE" -msgid "%1$s: can't open file \"%2$s\"\n" +msgid "%s: can't open file \"%s\"\n" msgstr "" -#, c-format msgctxt "STRING_UNKNOWN_OPTION" -msgid "unknown option: %1$s" +msgid "unknown option: %s" msgstr "" msgctxt "STRING_UNRECZD_OPTION" -msgid "unrecognized option -%1$c use -help to list options\n" +msgid "unrecognized option -%c use -help to list options\n" msgstr "" msgctxt "STRING_XML_DECLARATION" @@ -151,26 +143,25 @@ msgid "" msgstr "" #. This console output should be limited to 78 characters per line. -#, c-format +#. - %s represents a string-encoding name which may be localized in your language. msgctxt "TEXT_VENDOR_CHARS" msgid "" "It is unlikely that vendor-specific, system-dependent encodings\n" "work widely enough on the World Wide Web; you should avoid using the \n" -"%1$s character encoding, instead you are recommended to\n" +"%s character encoding, instead you are recommended to\n" "use named entities, e.g. ™.\n" "\n" msgstr "" #. This console output should be limited to 78 characters per line. -#. - %1$s represents a string-encoding name which may be localized in your language. +#. - %s represents a string-encoding name which may be localized in your language. #. - The strings "Tidy" and "HTML Tidy" are the program name and must not be translated. -#, c-format msgctxt "TEXT_SGML_CHARS" msgid "" "Character codes 128 to 159 (U+0080 to U+009F) are not allowed in HTML;\n" "even if they were, they would likely be unprintable control characters.\n" "Tidy assumed you wanted to refer to a character with the same byte value in the \n" -"%1$s encoding and replaced that reference with the Unicode \n" +"%s encoding and replaced that reference with the Unicode \n" "equivalent.\n" "\n" msgstr "" @@ -408,360 +399,292 @@ msgctxt "TidyFatalString" msgid "Panic: " msgstr "" -#, c-format msgctxt "ENCODING_MISMATCH" -msgid "specified input encoding (%1$s) does not match actual input encoding (%2$s)" +msgid "specified input encoding (%s) does not match actual input encoding (%s)" msgstr "" -#, c-format msgctxt "VENDOR_SPECIFIC_CHARS" -msgid "%1$s invalid character code %2$s" +msgid "%s invalid character code %s" msgstr "" -#, c-format msgctxt "INVALID_SGML_CHARS" -msgid "%1$s invalid character code %2$s" +msgid "%s invalid character code %s" msgstr "" -#, c-format msgctxt "INVALID_UTF8" -msgid "%1$s invalid UTF-8 bytes (char. code %2$s)" +msgid "%s invalid UTF-8 bytes (char. code %s)" msgstr "" -#, c-format msgctxt "INVALID_UTF16" -msgid "%1$s invalid UTF-16 surrogate pair (char. code %2$s)" +msgid "%s invalid UTF-16 surrogate pair (char. code %s)" msgstr "" -#, c-format msgctxt "INVALID_NCR" -msgid "%1$s invalid numeric character reference %2$s" +msgid "%s invalid numeric character reference %s" msgstr "" -#, c-format msgctxt "MISSING_SEMICOLON" -msgid "entity \"%1$s\" doesn't end in ';'" +msgid "entity \"%s\" doesn't end in ';'" msgstr "" -#, c-format msgctxt "MISSING_SEMICOLON_NCR" -msgid "numeric character reference \"%1$s\" doesn't end in ';'" +msgid "numeric character reference \"%s\" doesn't end in ';'" msgstr "" msgctxt "UNESCAPED_AMPERSAND" msgid "unescaped & which should be written as &" msgstr "" -#, c-format msgctxt "UNKNOWN_ENTITY" -msgid "unescaped & or unknown entity \"%1$s\"" +msgid "unescaped & or unknown entity \"%s\ msgstr "" msgctxt "APOS_UNDEFINED" msgid "named entity ' only defined in XML/XHTML" msgstr "" -#, c-format msgctxt "INSERTING_ATTRIBUTE" -msgid "%1$s inserting \"%2$s\" attribute" +msgid "%s inserting \"%s\" attribute" msgstr "" -#, c-format msgctxt "INSERTING_AUTO_ATTRIBUTE" -msgid "%1$s inserting \"%2$s\" attribute using value \"%3$s\"" +msgid "%s inserting \"%s\" attribute using value \"%s\ msgstr "" -#, c-format msgctxt "MISSING_ATTR_VALUE" -msgid "%1$s attribute \"%2$s\" lacks value" +msgid "%s attribute \"%s\" lacks value" msgstr "" -#, c-format msgctxt "UNKNOWN_ATTRIBUTE" -msgid "%1$s unknown attribute \"%2$s\"" +msgid "%s unknown attribute \"%s\ msgstr "" -#, c-format msgctxt "PROPRIETARY_ATTRIBUTE" -msgid "%1$s proprietary attribute \"%2$s\"" +msgid "%s proprietary attribute \"%s\ msgstr "" -#, c-format msgctxt "JOINING_ATTRIBUTE" -msgid "%1$s joining values of repeated attribute \"%2$s\"" +msgid "%s joining values of repeated attribute \"%s\ msgstr "" -#, c-format msgctxt "XML_ATTRIBUTE_VALUE" -msgid "%1$s has XML attribute \"%2$s\"" +msgid "%s has XML attribute \"%s\ msgstr "" -#, c-format msgctxt "XML_ID_SYNTAX" -msgid "%1$s ID \"%2$s\" uses XML ID syntax" +msgid "%s ID \"%s\" uses XML ID syntax" msgstr "" -#, c-format msgctxt "ATTR_VALUE_NOT_LCASE" -msgid "%1$s attribute value \"%2$s\" must be lower case for XHTML" +msgid "%s attribute value \"%s\" must be lower case for XHTML" msgstr "" -#, c-format msgctxt "PROPRIETARY_ATTR_VALUE" -msgid "%1$s proprietary attribute value \"%2$s\"" +msgid "%s proprietary attribute value \"%s\ msgstr "" -#, c-format msgctxt "ANCHOR_NOT_UNIQUE" -msgid "%1$s anchor \"%2$s\" already defined" +msgid "%s anchor \"%s\" already defined" msgstr "" -#, c-format msgctxt "BAD_ATTRIBUTE_VALUE" -msgid "%1$s attribute \"%2$s\" has invalid value \"%3$s\"" +msgid "%s attribute \"%s\" has invalid value \"%s\ msgstr "" -#, c-format msgctxt "BAD_ATTRIBUTE_VALUE_REPLACED" -msgid "%1$s attribute \"%2$s\" had invalid value \"%3$s\" and has been replaced" +msgid "%s attribute \"%s\" had invalid value \"%s\" and has been replaced" msgstr "" -#, c-format msgctxt "INVALID_ATTRIBUTE" -msgid "%1$s attribute name \"%2$s\" (value=\"%3$s\") is invalid" +msgid "%s attribute name \"%s\" (value=\"%s\") is invalid" msgstr "" -#, c-format msgctxt "REPEATED_ATTRIBUTE" -msgid "%1$s dropping value \"%2$s\" for repeated attribute \"%3$s\"" +msgid "%s dropping value \"%s\" for repeated attribute \"%s\ msgstr "" -#, c-format msgctxt "INVALID_XML_ID" -msgid "%1$s cannot copy name attribute to id" +msgid "%s cannot copy name attribute to id" msgstr "" -#, c-format msgctxt "UNEXPECTED_GT" -msgid "%1$s missing '>' for end of tag" +msgid "%s missing '>' for end of tag" msgstr "" -#, c-format msgctxt "UNEXPECTED_QUOTEMARK" -msgid "%1$s unexpected or duplicate quote mark" +msgid "%s unexpected or duplicate quote mark" msgstr "" -#, c-format msgctxt "MISSING_QUOTEMARK" -msgid "%1$s attribute with missing trailing quote mark" +msgid "%s attribute with missing trailing quote mark" msgstr "" -#, c-format msgctxt "UNEXPECTED_END_OF_FILE_ATTR" -msgid "%1$s end of file while parsing attributes" +msgid "%s end of file while parsing attributes" msgstr "" -#, c-format msgctxt "ID_NAME_MISMATCH" -msgid "%1$s id and name attribute value mismatch" +msgid "%s id and name attribute value mismatch" msgstr "" -#, c-format msgctxt "BACKSLASH_IN_URI" -msgid "%1$s URI reference contains backslash. Typo?" +msgid "%s URI reference contains backslash. Typo?" msgstr "" -#, c-format msgctxt "FIXED_BACKSLASH" -msgid "%1$s converting backslash in URI to slash" +msgid "%s converting backslash in URI to slash" msgstr "" -#, c-format msgctxt "ILLEGAL_URI_REFERENCE" -msgid "%1$s improperly escaped URI reference" +msgid "%s improperly escaped URI reference" msgstr "" -#, c-format msgctxt "ESCAPED_ILLEGAL_URI" -msgid "%1$s escaping malformed URI reference" +msgid "%s escaping malformed URI reference" msgstr "" -#, c-format msgctxt "NEWLINE_IN_URI" -msgid "%1$s discarding newline in URI reference" +msgid "%s discarding newline in URI reference" msgstr "" -#, c-format msgctxt "WHITE_IN_URI" -msgid "%1$s discarding whitespace in URI reference" +msgid "%s discarding whitespace in URI reference" msgstr "" -#, c-format msgctxt "UNEXPECTED_EQUALSIGN" -msgid "%1$s unexpected '=', expected attribute name" +msgid "%s unexpected '=', expected attribute name" msgstr "" -#, c-format msgctxt "MISSING_IMAGEMAP" -msgid "%1$s should use client-side image map" +msgid "%s should use client-side image map" msgstr "" -#, c-format msgctxt "MISSING_ATTRIBUTE" -msgid "%1$s lacks \"%2$s\" attribute" +msgid "%s lacks \"%s\" attribute" msgstr "" -#, c-format msgctxt "NESTED_EMPHASIS" -msgid "nested emphasis %1$s" +msgid "nested emphasis %s" msgstr "" msgctxt "NESTED_QUOTATION" msgid "nested q elements, possible typo." msgstr "" -#, c-format msgctxt "OBSOLETE_ELEMENT" -msgid "replacing obsolete element %1$s with %2$s" +msgid "replacing obsolete element %s with %s" msgstr "" -#, c-format msgctxt "COERCE_TO_ENDTAG_WARN" -msgid "<%1$s> is probably intended as " +msgid "<%s> is probably intended as " msgstr "" -#, c-format msgctxt "REMOVED_HTML5" -msgid "%1$s element removed from HTML5" +msgid "%s element removed from HTML5" msgstr "" msgctxt "BAD_BODY_HTML5" msgid "Found attribute on body that is obsolete in HTML5. Use CSS" msgstr "" -#, c-format msgctxt "BAD_ALIGN_HTML5" -msgid "The align attribute on the %1$s element is obsolete. Use CSS" +msgid "The align attribute on the %s element is obsolete. Use CSS" msgstr "" -#, c-format msgctxt "BAD_SUMMARY_HTML5" -msgid "The summary attribute on the %1$s element is obsolete in HTML5" +msgid "The summary attribute on the %s element is obsolete in HTML5" msgstr "" -#, c-format msgctxt "TRIM_EMPTY_ELEMENT" -msgid "trimming empty %1$s" +msgid "trimming empty %s" msgstr "" -#, c-format msgctxt "REPLACING_ELEMENT" -msgid "replacing %1$s with %2$s" +msgid "replacing %s with %s" msgstr "" -#, c-format msgctxt "COERCE_TO_ENDTAG" -msgid "<%1$s> is probably intended as " +msgid "<%s> is probably intended as " msgstr "" -#, c-format msgctxt "REPLACING_UNEX_ELEMENT" -msgid "replacing unexpected %1$s with %2$s" +msgid "replacing unexpected %s with %s" msgstr "" -#, c-format msgctxt "MISSING_ENDTAG_FOR" -msgid "missing " +msgid "missing " msgstr "" -#, c-format msgctxt "MISSING_ENDTAG_BEFORE" -msgid "missing before %2$s" +msgid "missing before %s" msgstr "" -#, c-format msgctxt "DISCARDING_UNEXPECTED" -msgid "discarding unexpected %1$s" +msgid "discarding unexpected %s" msgstr "" -#, c-format msgctxt "NON_MATCHING_ENDTAG" -msgid "replacing unexpected %1$s with " +msgid "replacing unexpected %s with " msgstr "" -#, c-format msgctxt "TAG_NOT_ALLOWED_IN" -msgid "%1$s isn't allowed in <%2$s> elements" +msgid "%s isn't allowed in <%s> elements" msgstr "" -#, c-format msgctxt "MISSING_STARTTAG" -msgid "missing <%1$s>" +msgid "missing <%s>" msgstr "" -#, c-format msgctxt "UNEXPECTED_ENDTAG" -msgid "unexpected " +msgid "unexpected " msgstr "" -#, c-format msgctxt "TOO_MANY_ELEMENTS" -msgid "too many %1$s elements" +msgid "too many %s elements" msgstr "" -#, c-format msgctxt "USING_BR_INPLACE_OF" -msgid "using
in place of %1$s" +msgid "using
in place of %s" msgstr "" -#, c-format msgctxt "INSERTING_TAG" -msgid "inserting implicit <%1$s>" +msgid "inserting implicit <%s>" msgstr "" -#, c-format msgctxt "CANT_BE_NESTED" -msgid "%1$s can't be nested" +msgid "%s can't be nested" msgstr "" -#, c-format msgctxt "PROPRIETARY_ELEMENT" -msgid "%1$s is not approved by W3C" +msgid "%s is not approved by W3C" msgstr "" -#, c-format msgctxt "ILLEGAL_NESTING" -msgid "%1$s shouldn't be nested" +msgid "%s shouldn't be nested" msgstr "" -#, c-format msgctxt "NOFRAMES_CONTENT" -msgid "%1$s not inside 'noframes' element" +msgid "%s not inside 'noframes' element" msgstr "" -#, c-format msgctxt "UNEXPECTED_END_OF_FILE" -msgid "unexpected end of file %1$s" +msgid "unexpected end of file %s" msgstr "" -#, c-format msgctxt "ELEMENT_NOT_EMPTY" -msgid "%1$s element not empty or not closed" +msgid "%s element not empty or not closed" msgstr "" -#, c-format msgctxt "UNEXPECTED_ENDTAG_IN" -msgid "unexpected in <%2$s>" +msgid "unexpected in <%s>" msgstr "" -#, c-format msgctxt "TOO_MANY_ELEMENTS_IN" -msgid "too many %1$s elements in <%2$s>" +msgid "too many %s elements in <%s>" msgstr "" -#, c-format msgctxt "UNESCAPED_ELEMENT" -msgid "unescaped %1$s in pre content" +msgid "unescaped %s in pre content" msgstr "" msgctxt "DOCTYPE_AFTER_TAGS" @@ -828,14 +751,12 @@ msgctxt "DUPLICATE_FRAMESET" msgid "repeated FRAMESET element" msgstr "" -#, c-format msgctxt "UNKNOWN_ELEMENT" -msgid "%1$s is not recognized!" +msgid "%s is not recognized!" msgstr "" -#, c-format msgctxt "PREVIOUS_LOCATION" -msgid "<%1$s> previously mentioned" +msgid "<%s> previously mentioned" msgstr "" msgctxt "IMG_MISSING_ALT" @@ -2545,9 +2466,8 @@ msgctxt "TC_LABEL_OPT" msgid "option" msgstr "" -#, c-format msgctxt "TC_MAIN_ERROR_LOAD_CONFIG" -msgid "Loading config file \"%1$s\" failed, err = %2$d" +msgid "Loading config file \"%s\" failed, err = %d" msgstr "" msgctxt "TC_OPT_ACCESS" @@ -2753,18 +2673,16 @@ msgctxt "TC_STRING_CONF_NOTE" msgid "Values marked with an *asterisk are calculated internally by HTML Tidy" msgstr "" -#, c-format msgctxt "TC_STRING_OPT_NOT_DOCUMENTED" -msgid "Warning: option `%1$s' is not documented." +msgid "Warning: option `%s' is not documented." msgstr "" msgctxt "TC_STRING_OUT_OF_MEMORY" msgid "Out of memory. Bailing out." msgstr "" -#, c-format msgctxt "TC_STRING_FATAL_ERROR" -msgid "Fatal error: impossible value for id='%1$d'." +msgid "Fatal error: impossible value for id='%d'." msgstr "" msgctxt "TC_STRING_FILE_MANIP" @@ -2784,9 +2702,8 @@ msgid "A POSIX or Windows locale must be specified." msgstr "" #. The strings "Tidy" and "HTML Tidy" are the program name and must not be translated. -#, c-format msgctxt "TC_STRING_LANG_NOT_FOUND" -msgid "Tidy doesn't have language '%1$s,' will use '%2$s' instead." +msgid "Tidy doesn't have language '%s,' will use '%s' instead." msgstr "" msgctxt "TC_STRING_MISC" @@ -2803,7 +2720,7 @@ msgstr "" #. The strings "Tidy" and "HTML Tidy" are the program name and must not be translated. msgctxt "TC_STRING_UNKNOWN_OPTION" -msgid "HTML Tidy: unknown option: %1$c" +msgid "HTML Tidy: unknown option: %c" msgstr "" #. The strings "Tidy" and "HTML Tidy" are the program name and must not be translated. @@ -2812,37 +2729,33 @@ msgid "HTML Tidy: unknown option." msgstr "" #. The strings "Tidy" and "HTML Tidy" are the program name and must not be translated. -#, c-format msgctxt "TC_STRING_VERS_A" -msgid "HTML Tidy for %1$s version %2$s" +msgid "HTML Tidy for %s version %s" msgstr "" #. The strings "Tidy" and "HTML Tidy" are the program name and must not be translated. -#, c-format msgctxt "TC_STRING_VERS_B" -msgid "HTML Tidy version %1$s" +msgid "HTML Tidy version %s" msgstr "" #. This console output should be limited to 78 characters per line. -#. - %1$n represents the name of the executable from the file system, and is mostly like going to be "tidy". -#. - %2$2 represents a version number, typically x.x.xx. +#. - %n represents the name of the executable from the file system, and is mostly like going to be "tidy". +#. - %2 represents a version number, typically x.x.xx. #. - The strings "Tidy" and "HTML Tidy" are the program name and must not be translated. -#, c-format msgctxt "TC_TXT_HELP_1" msgid "" "\n" -"%1$s [options...] [file...] [options...] [file...]\n" +"%s [options...] [file...] [options...] [file...]\n" "Utility to clean up and pretty print HTML/XHTML/XML.\n" "\n" -"This is modern HTML Tidy version %2$s.\n" +"This is modern HTML Tidy version %s.\n" "\n" msgstr "" #. The strings "Tidy" and "HTML Tidy" are the program name and must not be translated. -#. - %1$s represents the platform, for example, "Mac OS X" or "Windows". -#, c-format +#. - %s represents the platform, for example, "Mac OS X" or "Windows". msgctxt "TC_TXT_HELP_2A" -msgid "Command Line Arguments for HTML Tidy for %1$s:" +msgid "Command Line Arguments for HTML Tidy for %s:" msgstr "" #. The strings "Tidy" and "HTML Tidy" are the program name and must not be translated. diff --git a/localize/translations/language_es.po b/localize/translations/language_es.po index 6f218e3..75d14ac 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: 2016-01-23 16:04:55\n" +"PO-Revision-Date: 2016-01-29 10:54:42\n" "Last-Translator: jderry\n" "Language-Team: \n" @@ -19,19 +19,16 @@ msgctxt "ATRC_ACCESS_URL" msgid "http://www.html-tidy.org/accessibility/" msgstr "" -#, c-format msgctxt "FILE_CANT_OPEN" -msgid "Can't open \"%1$s\"\n" -msgstr "No se puede abrir \"%1$s\"\n" - -#, c-format -msgctxt "LINE_COLUMN_STRING" -msgid "line %1$d column %2$d - " +msgid "Can't open \"%s\"\n" +msgstr "" + +msgctxt "LINE_COLUMN_STRING" +msgid "line %d column %d - " msgstr "" -#, c-format msgctxt "STRING_CONTENT_LOOKS" -msgid "Document content looks like %1$s" +msgid "Document content looks like %s" msgstr "" #. For example, "discarding invalid UTF-16 surrogate pair" @@ -39,15 +36,13 @@ msgctxt "STRING_DISCARDING" msgid "discarding" msgstr "" -#, c-format msgctxt "STRING_DOCTYPE_GIVEN" -msgid "Doctype given is \"%1$s\"" +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 %1$u %2$s and %3$u %4$s!" +msgid "Tidy found %u %s and %u %s!" msgstr "" msgctxt "STRING_ERROR_COUNT_ERROR" @@ -71,9 +66,8 @@ msgctxt "STRING_HTML_PROPRIETARY" msgid "HTML Proprietary" msgstr "" -#, c-format msgctxt "STRING_MISSING_MALFORMED" -msgid "missing or malformed argument for option: %1$s" +msgid "missing or malformed argument for option: %s" msgstr "" msgctxt "STRING_NO_ERRORS" @@ -102,18 +96,16 @@ msgctxt "STRING_SPECIFIED" msgid "specified" msgstr "" -#, c-format msgctxt "STRING_UNKNOWN_FILE" -msgid "%1$s: can't open file \"%2$s\"\n" +msgid "%s: can't open file \"%s\"\n" msgstr "" -#, c-format msgctxt "STRING_UNKNOWN_OPTION" -msgid "unknown option: %1$s" +msgid "unknown option: %s" msgstr "" msgctxt "STRING_UNRECZD_OPTION" -msgid "unrecognized option -%1$c use -help to list options\n" +msgid "unrecognized option -%c use -help to list options\n" msgstr "" msgctxt "STRING_XML_DECLARATION" @@ -151,26 +143,25 @@ msgid "" msgstr "" #. This console output should be limited to 78 characters per line. -#, c-format +#. - %s represents a string-encoding name which may be localized in your language. msgctxt "TEXT_VENDOR_CHARS" msgid "" "It is unlikely that vendor-specific, system-dependent encodings\n" "work widely enough on the World Wide Web; you should avoid using the \n" -"%1$s character encoding, instead you are recommended to\n" +"%s character encoding, instead you are recommended to\n" "use named entities, e.g. ™.\n" "\n" msgstr "" #. This console output should be limited to 78 characters per line. -#. - %1$s represents a string-encoding name which may be localized in your language. +#. - %s represents a string-encoding name which may be localized in your language. #. - The strings "Tidy" and "HTML Tidy" are the program name and must not be translated. -#, c-format msgctxt "TEXT_SGML_CHARS" msgid "" "Character codes 128 to 159 (U+0080 to U+009F) are not allowed in HTML;\n" "even if they were, they would likely be unprintable control characters.\n" "Tidy assumed you wanted to refer to a character with the same byte value in the \n" -"%1$s encoding and replaced that reference with the Unicode \n" +"%s encoding and replaced that reference with the Unicode \n" "equivalent.\n" "\n" msgstr "" @@ -404,360 +395,292 @@ msgctxt "TidyFatalString" msgid "Panic: " msgstr "" -#, c-format msgctxt "ENCODING_MISMATCH" -msgid "specified input encoding (%1$s) does not match actual input encoding (%2$s)" +msgid "specified input encoding (%s) does not match actual input encoding (%s)" msgstr "" -#, c-format msgctxt "VENDOR_SPECIFIC_CHARS" -msgid "%1$s invalid character code %2$s" +msgid "%s invalid character code %s" msgstr "" -#, c-format msgctxt "INVALID_SGML_CHARS" -msgid "%1$s invalid character code %2$s" +msgid "%s invalid character code %s" msgstr "" -#, c-format msgctxt "INVALID_UTF8" -msgid "%1$s invalid UTF-8 bytes (char. code %2$s)" +msgid "%s invalid UTF-8 bytes (char. code %s)" msgstr "" -#, c-format msgctxt "INVALID_UTF16" -msgid "%1$s invalid UTF-16 surrogate pair (char. code %2$s)" +msgid "%s invalid UTF-16 surrogate pair (char. code %s)" msgstr "" -#, c-format msgctxt "INVALID_NCR" -msgid "%1$s invalid numeric character reference %2$s" +msgid "%s invalid numeric character reference %s" msgstr "" -#, c-format msgctxt "MISSING_SEMICOLON" -msgid "entity \"%1$s\" doesn't end in ';'" +msgid "entity \"%s\" doesn't end in ';'" msgstr "" -#, c-format msgctxt "MISSING_SEMICOLON_NCR" -msgid "numeric character reference \"%1$s\" doesn't end in ';'" +msgid "numeric character reference \"%s\" doesn't end in ';'" msgstr "" msgctxt "UNESCAPED_AMPERSAND" msgid "unescaped & which should be written as &" msgstr "" -#, c-format msgctxt "UNKNOWN_ENTITY" -msgid "unescaped & or unknown entity \"%1$s\"" +msgid "unescaped & or unknown entity \"%s\ msgstr "" msgctxt "APOS_UNDEFINED" msgid "named entity ' only defined in XML/XHTML" msgstr "" -#, c-format msgctxt "INSERTING_ATTRIBUTE" -msgid "%1$s inserting \"%2$s\" attribute" +msgid "%s inserting \"%s\" attribute" msgstr "" -#, c-format msgctxt "INSERTING_AUTO_ATTRIBUTE" -msgid "%1$s inserting \"%2$s\" attribute using value \"%3$s\"" +msgid "%s inserting \"%s\" attribute using value \"%s\ msgstr "" -#, c-format msgctxt "MISSING_ATTR_VALUE" -msgid "%1$s attribute \"%2$s\" lacks value" +msgid "%s attribute \"%s\" lacks value" msgstr "" -#, c-format msgctxt "UNKNOWN_ATTRIBUTE" -msgid "%1$s unknown attribute \"%2$s\"" +msgid "%s unknown attribute \"%s\ msgstr "" -#, c-format msgctxt "PROPRIETARY_ATTRIBUTE" -msgid "%1$s proprietary attribute \"%2$s\"" +msgid "%s proprietary attribute \"%s\ msgstr "" -#, c-format msgctxt "JOINING_ATTRIBUTE" -msgid "%1$s joining values of repeated attribute \"%2$s\"" +msgid "%s joining values of repeated attribute \"%s\ msgstr "" -#, c-format msgctxt "XML_ATTRIBUTE_VALUE" -msgid "%1$s has XML attribute \"%2$s\"" +msgid "%s has XML attribute \"%s\ msgstr "" -#, c-format msgctxt "XML_ID_SYNTAX" -msgid "%1$s ID \"%2$s\" uses XML ID syntax" +msgid "%s ID \"%s\" uses XML ID syntax" msgstr "" -#, c-format msgctxt "ATTR_VALUE_NOT_LCASE" -msgid "%1$s attribute value \"%2$s\" must be lower case for XHTML" +msgid "%s attribute value \"%s\" must be lower case for XHTML" msgstr "" -#, c-format msgctxt "PROPRIETARY_ATTR_VALUE" -msgid "%1$s proprietary attribute value \"%2$s\"" +msgid "%s proprietary attribute value \"%s\ msgstr "" -#, c-format msgctxt "ANCHOR_NOT_UNIQUE" -msgid "%1$s anchor \"%2$s\" already defined" +msgid "%s anchor \"%s\" already defined" msgstr "" -#, c-format msgctxt "BAD_ATTRIBUTE_VALUE" -msgid "%1$s attribute \"%2$s\" has invalid value \"%3$s\"" +msgid "%s attribute \"%s\" has invalid value \"%s\ msgstr "" -#, c-format msgctxt "BAD_ATTRIBUTE_VALUE_REPLACED" -msgid "%1$s attribute \"%2$s\" had invalid value \"%3$s\" and has been replaced" +msgid "%s attribute \"%s\" had invalid value \"%s\" and has been replaced" msgstr "" -#, c-format msgctxt "INVALID_ATTRIBUTE" -msgid "%1$s attribute name \"%2$s\" (value=\"%3$s\") is invalid" +msgid "%s attribute name \"%s\" (value=\"%s\") is invalid" msgstr "" -#, c-format msgctxt "REPEATED_ATTRIBUTE" -msgid "%1$s dropping value \"%2$s\" for repeated attribute \"%3$s\"" +msgid "%s dropping value \"%s\" for repeated attribute \"%s\ msgstr "" -#, c-format msgctxt "INVALID_XML_ID" -msgid "%1$s cannot copy name attribute to id" +msgid "%s cannot copy name attribute to id" msgstr "" -#, c-format msgctxt "UNEXPECTED_GT" -msgid "%1$s missing '>' for end of tag" +msgid "%s missing '>' for end of tag" msgstr "" -#, c-format msgctxt "UNEXPECTED_QUOTEMARK" -msgid "%1$s unexpected or duplicate quote mark" +msgid "%s unexpected or duplicate quote mark" msgstr "" -#, c-format msgctxt "MISSING_QUOTEMARK" -msgid "%1$s attribute with missing trailing quote mark" +msgid "%s attribute with missing trailing quote mark" msgstr "" -#, c-format msgctxt "UNEXPECTED_END_OF_FILE_ATTR" -msgid "%1$s end of file while parsing attributes" +msgid "%s end of file while parsing attributes" msgstr "" -#, c-format msgctxt "ID_NAME_MISMATCH" -msgid "%1$s id and name attribute value mismatch" +msgid "%s id and name attribute value mismatch" msgstr "" -#, c-format msgctxt "BACKSLASH_IN_URI" -msgid "%1$s URI reference contains backslash. Typo?" +msgid "%s URI reference contains backslash. Typo?" msgstr "" -#, c-format msgctxt "FIXED_BACKSLASH" -msgid "%1$s converting backslash in URI to slash" +msgid "%s converting backslash in URI to slash" msgstr "" -#, c-format msgctxt "ILLEGAL_URI_REFERENCE" -msgid "%1$s improperly escaped URI reference" +msgid "%s improperly escaped URI reference" msgstr "" -#, c-format msgctxt "ESCAPED_ILLEGAL_URI" -msgid "%1$s escaping malformed URI reference" +msgid "%s escaping malformed URI reference" msgstr "" -#, c-format msgctxt "NEWLINE_IN_URI" -msgid "%1$s discarding newline in URI reference" +msgid "%s discarding newline in URI reference" msgstr "" -#, c-format msgctxt "WHITE_IN_URI" -msgid "%1$s discarding whitespace in URI reference" +msgid "%s discarding whitespace in URI reference" msgstr "" -#, c-format msgctxt "UNEXPECTED_EQUALSIGN" -msgid "%1$s unexpected '=', expected attribute name" +msgid "%s unexpected '=', expected attribute name" msgstr "" -#, c-format msgctxt "MISSING_IMAGEMAP" -msgid "%1$s should use client-side image map" +msgid "%s should use client-side image map" msgstr "" -#, c-format msgctxt "MISSING_ATTRIBUTE" -msgid "%1$s lacks \"%2$s\" attribute" +msgid "%s lacks \"%s\" attribute" msgstr "" -#, c-format msgctxt "NESTED_EMPHASIS" -msgid "nested emphasis %1$s" +msgid "nested emphasis %s" msgstr "" msgctxt "NESTED_QUOTATION" msgid "nested q elements, possible typo." msgstr "" -#, c-format msgctxt "OBSOLETE_ELEMENT" -msgid "replacing obsolete element %1$s with %2$s" +msgid "replacing obsolete element %s with %s" msgstr "" -#, c-format msgctxt "COERCE_TO_ENDTAG_WARN" -msgid "<%1$s> is probably intended as " +msgid "<%s> is probably intended as " msgstr "" -#, c-format msgctxt "REMOVED_HTML5" -msgid "%1$s element removed from HTML5" +msgid "%s element removed from HTML5" msgstr "" msgctxt "BAD_BODY_HTML5" msgid "Found attribute on body that is obsolete in HTML5. Use CSS" msgstr "" -#, c-format msgctxt "BAD_ALIGN_HTML5" -msgid "The align attribute on the %1$s element is obsolete. Use CSS" +msgid "The align attribute on the %s element is obsolete. Use CSS" msgstr "" -#, c-format msgctxt "BAD_SUMMARY_HTML5" -msgid "The summary attribute on the %1$s element is obsolete in HTML5" +msgid "The summary attribute on the %s element is obsolete in HTML5" msgstr "" -#, c-format msgctxt "TRIM_EMPTY_ELEMENT" -msgid "trimming empty %1$s" +msgid "trimming empty %s" msgstr "" -#, c-format msgctxt "REPLACING_ELEMENT" -msgid "replacing %1$s with %2$s" +msgid "replacing %s with %s" msgstr "" -#, c-format msgctxt "COERCE_TO_ENDTAG" -msgid "<%1$s> is probably intended as " +msgid "<%s> is probably intended as " msgstr "" -#, c-format msgctxt "REPLACING_UNEX_ELEMENT" -msgid "replacing unexpected %1$s with %2$s" +msgid "replacing unexpected %s with %s" msgstr "" -#, c-format msgctxt "MISSING_ENDTAG_FOR" -msgid "missing " +msgid "missing " msgstr "" -#, c-format msgctxt "MISSING_ENDTAG_BEFORE" -msgid "missing before %2$s" +msgid "missing before %s" msgstr "" -#, c-format msgctxt "DISCARDING_UNEXPECTED" -msgid "discarding unexpected %1$s" +msgid "discarding unexpected %s" msgstr "" -#, c-format msgctxt "NON_MATCHING_ENDTAG" -msgid "replacing unexpected %1$s with " +msgid "replacing unexpected %s with " msgstr "" -#, c-format msgctxt "TAG_NOT_ALLOWED_IN" -msgid "%1$s isn't allowed in <%2$s> elements" +msgid "%s isn't allowed in <%s> elements" msgstr "" -#, c-format msgctxt "MISSING_STARTTAG" -msgid "missing <%1$s>" +msgid "missing <%s>" msgstr "" -#, c-format msgctxt "UNEXPECTED_ENDTAG" -msgid "unexpected " +msgid "unexpected " msgstr "" -#, c-format msgctxt "TOO_MANY_ELEMENTS" -msgid "too many %1$s elements" +msgid "too many %s elements" msgstr "" -#, c-format msgctxt "USING_BR_INPLACE_OF" -msgid "using
in place of %1$s" +msgid "using
in place of %s" msgstr "" -#, c-format msgctxt "INSERTING_TAG" -msgid "inserting implicit <%1$s>" +msgid "inserting implicit <%s>" msgstr "" -#, c-format msgctxt "CANT_BE_NESTED" -msgid "%1$s can't be nested" +msgid "%s can't be nested" msgstr "" -#, c-format msgctxt "PROPRIETARY_ELEMENT" -msgid "%1$s is not approved by W3C" +msgid "%s is not approved by W3C" msgstr "" -#, c-format msgctxt "ILLEGAL_NESTING" -msgid "%1$s shouldn't be nested" +msgid "%s shouldn't be nested" msgstr "" -#, c-format msgctxt "NOFRAMES_CONTENT" -msgid "%1$s not inside 'noframes' element" +msgid "%s not inside 'noframes' element" msgstr "" -#, c-format msgctxt "UNEXPECTED_END_OF_FILE" -msgid "unexpected end of file %1$s" +msgid "unexpected end of file %s" msgstr "" -#, c-format msgctxt "ELEMENT_NOT_EMPTY" -msgid "%1$s element not empty or not closed" +msgid "%s element not empty or not closed" msgstr "" -#, c-format msgctxt "UNEXPECTED_ENDTAG_IN" -msgid "unexpected in <%2$s>" +msgid "unexpected in <%s>" msgstr "" -#, c-format msgctxt "TOO_MANY_ELEMENTS_IN" -msgid "too many %1$s elements in <%2$s>" +msgid "too many %s elements in <%s>" msgstr "" -#, c-format msgctxt "UNESCAPED_ELEMENT" -msgid "unescaped %1$s in pre content" +msgid "unescaped %s in pre content" msgstr "" msgctxt "DOCTYPE_AFTER_TAGS" @@ -824,14 +747,12 @@ msgctxt "DUPLICATE_FRAMESET" msgid "repeated FRAMESET element" msgstr "" -#, c-format msgctxt "UNKNOWN_ELEMENT" -msgid "%1$s is not recognized!" +msgid "%s is not recognized!" msgstr "" -#, c-format msgctxt "PREVIOUS_LOCATION" -msgid "<%1$s> previously mentioned" +msgid "<%s> previously mentioned" msgstr "" msgctxt "IMG_MISSING_ALT" @@ -2522,9 +2443,8 @@ msgctxt "TC_LABEL_OPT" msgid "option" msgstr "" -#, c-format msgctxt "TC_MAIN_ERROR_LOAD_CONFIG" -msgid "Loading config file \"%1$s\" failed, err = %2$d" +msgid "Loading config file \"%s\" failed, err = %d" msgstr "" msgctxt "TC_OPT_ACCESS" @@ -2730,18 +2650,16 @@ msgctxt "TC_STRING_CONF_NOTE" msgid "Values marked with an *asterisk are calculated internally by HTML Tidy" msgstr "" -#, c-format msgctxt "TC_STRING_OPT_NOT_DOCUMENTED" -msgid "Warning: option `%1$s' is not documented." +msgid "Warning: option `%s' is not documented." msgstr "" msgctxt "TC_STRING_OUT_OF_MEMORY" msgid "Out of memory. Bailing out." msgstr "" -#, c-format msgctxt "TC_STRING_FATAL_ERROR" -msgid "Fatal error: impossible value for id='%1$d'." +msgid "Fatal error: impossible value for id='%d'." msgstr "" msgctxt "TC_STRING_FILE_MANIP" @@ -2761,9 +2679,8 @@ msgid "A POSIX or Windows locale must be specified." msgstr "" #. The strings "Tidy" and "HTML Tidy" are the program name and must not be translated. -#, c-format msgctxt "TC_STRING_LANG_NOT_FOUND" -msgid "Tidy doesn't have language '%1$s,' will use '%2$s' instead." +msgid "Tidy doesn't have language '%s,' will use '%s' instead." msgstr "" msgctxt "TC_STRING_MISC" @@ -2780,7 +2697,7 @@ msgstr "" #. The strings "Tidy" and "HTML Tidy" are the program name and must not be translated. msgctxt "TC_STRING_UNKNOWN_OPTION" -msgid "HTML Tidy: unknown option: %1$c" +msgid "HTML Tidy: unknown option: %c" msgstr "" #. The strings "Tidy" and "HTML Tidy" are the program name and must not be translated. @@ -2789,37 +2706,33 @@ msgid "HTML Tidy: unknown option." msgstr "" #. The strings "Tidy" and "HTML Tidy" are the program name and must not be translated. -#, c-format msgctxt "TC_STRING_VERS_A" -msgid "HTML Tidy for %1$s version %2$s" +msgid "HTML Tidy for %s version %s" msgstr "" #. The strings "Tidy" and "HTML Tidy" are the program name and must not be translated. -#, c-format msgctxt "TC_STRING_VERS_B" -msgid "HTML Tidy version %1$s" +msgid "HTML Tidy version %s" msgstr "" #. This console output should be limited to 78 characters per line. -#. - %1$n represents the name of the executable from the file system, and is mostly like going to be "tidy". -#. - %2$2 represents a version number, typically x.x.xx. +#. - %n represents the name of the executable from the file system, and is mostly like going to be "tidy". +#. - %2 represents a version number, typically x.x.xx. #. - The strings "Tidy" and "HTML Tidy" are the program name and must not be translated. -#, c-format msgctxt "TC_TXT_HELP_1" msgid "" "\n" -"%1$s [options...] [file...] [options...] [file...]\n" +"%s [options...] [file...] [options...] [file...]\n" "Utility to clean up and pretty print HTML/XHTML/XML.\n" "\n" -"This is modern HTML Tidy version %2$s.\n" +"This is modern HTML Tidy version %s.\n" "\n" msgstr "" #. The strings "Tidy" and "HTML Tidy" are the program name and must not be translated. -#. - %1$s represents the platform, for example, "Mac OS X" or "Windows". -#, c-format +#. - %s represents the platform, for example, "Mac OS X" or "Windows". msgctxt "TC_TXT_HELP_2A" -msgid "Command Line Arguments for HTML Tidy for %1$s:" +msgid "Command Line Arguments for HTML Tidy for %s:" msgstr "" #. The strings "Tidy" and "HTML Tidy" are the program name and must not be translated. diff --git a/localize/translations/language_es_mx.po b/localize/translations/language_es_mx.po index f046660..703fff2 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: 2016-01-23 16:04:41\n" +"PO-Revision-Date: 2016-01-29 10:54:42\n" "Last-Translator: jderry\n" "Language-Team: \n" @@ -19,19 +19,16 @@ msgctxt "ATRC_ACCESS_URL" msgid "http://www.html-tidy.org/accessibility/" msgstr "" -#, c-format msgctxt "FILE_CANT_OPEN" -msgid "Can't open \"%1$s\"\n" +msgid "Can't open \"%s\"\n" msgstr "" -#, c-format msgctxt "LINE_COLUMN_STRING" -msgid "line %1$d column %2$d - " +msgid "line %d column %d - " msgstr "" -#, c-format msgctxt "STRING_CONTENT_LOOKS" -msgid "Document content looks like %1$s" +msgid "Document content looks like %s" msgstr "" #. For example, "discarding invalid UTF-16 surrogate pair" @@ -39,15 +36,13 @@ msgctxt "STRING_DISCARDING" msgid "discarding" msgstr "" -#, c-format msgctxt "STRING_DOCTYPE_GIVEN" -msgid "Doctype given is \"%1$s\"" +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 %1$u %2$s and %3$u %4$s!" +msgid "Tidy found %u %s and %u %s!" msgstr "" msgctxt "STRING_ERROR_COUNT_ERROR" @@ -71,9 +66,8 @@ msgctxt "STRING_HTML_PROPRIETARY" msgid "HTML Proprietary" msgstr "" -#, c-format msgctxt "STRING_MISSING_MALFORMED" -msgid "missing or malformed argument for option: %1$s" +msgid "missing or malformed argument for option: %s" msgstr "" msgctxt "STRING_NO_ERRORS" @@ -102,18 +96,16 @@ msgctxt "STRING_SPECIFIED" msgid "specified" msgstr "" -#, c-format msgctxt "STRING_UNKNOWN_FILE" -msgid "%1$s: can't open file \"%2$s\"\n" +msgid "%s: can't open file \"%s\"\n" msgstr "" -#, c-format msgctxt "STRING_UNKNOWN_OPTION" -msgid "unknown option: %1$s" +msgid "unknown option: %s" msgstr "" msgctxt "STRING_UNRECZD_OPTION" -msgid "unrecognized option -%1$c use -help to list options\n" +msgid "unrecognized option -%c use -help to list options\n" msgstr "" msgctxt "STRING_XML_DECLARATION" @@ -151,26 +143,25 @@ msgid "" msgstr "" #. This console output should be limited to 78 characters per line. -#, c-format +#. - %s represents a string-encoding name which may be localized in your language. msgctxt "TEXT_VENDOR_CHARS" msgid "" "It is unlikely that vendor-specific, system-dependent encodings\n" "work widely enough on the World Wide Web; you should avoid using the \n" -"%1$s character encoding, instead you are recommended to\n" +"%s character encoding, instead you are recommended to\n" "use named entities, e.g. ™.\n" "\n" msgstr "" #. This console output should be limited to 78 characters per line. -#. - %1$s represents a string-encoding name which may be localized in your language. +#. - %s represents a string-encoding name which may be localized in your language. #. - The strings "Tidy" and "HTML Tidy" are the program name and must not be translated. -#, c-format msgctxt "TEXT_SGML_CHARS" msgid "" "Character codes 128 to 159 (U+0080 to U+009F) are not allowed in HTML;\n" "even if they were, they would likely be unprintable control characters.\n" "Tidy assumed you wanted to refer to a character with the same byte value in the \n" -"%1$s encoding and replaced that reference with the Unicode \n" +"%s encoding and replaced that reference with the Unicode \n" "equivalent.\n" "\n" msgstr "" @@ -404,360 +395,292 @@ msgctxt "TidyFatalString" msgid "Panic: " msgstr "" -#, c-format msgctxt "ENCODING_MISMATCH" -msgid "specified input encoding (%1$s) does not match actual input encoding (%2$s)" +msgid "specified input encoding (%s) does not match actual input encoding (%s)" msgstr "" -#, c-format msgctxt "VENDOR_SPECIFIC_CHARS" -msgid "%1$s invalid character code %2$s" +msgid "%s invalid character code %s" msgstr "" -#, c-format msgctxt "INVALID_SGML_CHARS" -msgid "%1$s invalid character code %2$s" +msgid "%s invalid character code %s" msgstr "" -#, c-format msgctxt "INVALID_UTF8" -msgid "%1$s invalid UTF-8 bytes (char. code %2$s)" +msgid "%s invalid UTF-8 bytes (char. code %s)" msgstr "" -#, c-format msgctxt "INVALID_UTF16" -msgid "%1$s invalid UTF-16 surrogate pair (char. code %2$s)" +msgid "%s invalid UTF-16 surrogate pair (char. code %s)" msgstr "" -#, c-format msgctxt "INVALID_NCR" -msgid "%1$s invalid numeric character reference %2$s" +msgid "%s invalid numeric character reference %s" msgstr "" -#, c-format msgctxt "MISSING_SEMICOLON" -msgid "entity \"%1$s\" doesn't end in ';'" +msgid "entity \"%s\" doesn't end in ';'" msgstr "" -#, c-format msgctxt "MISSING_SEMICOLON_NCR" -msgid "numeric character reference \"%1$s\" doesn't end in ';'" +msgid "numeric character reference \"%s\" doesn't end in ';'" msgstr "" msgctxt "UNESCAPED_AMPERSAND" msgid "unescaped & which should be written as &" msgstr "" -#, c-format msgctxt "UNKNOWN_ENTITY" -msgid "unescaped & or unknown entity \"%1$s\"" +msgid "unescaped & or unknown entity \"%s\ msgstr "" msgctxt "APOS_UNDEFINED" msgid "named entity ' only defined in XML/XHTML" msgstr "" -#, c-format msgctxt "INSERTING_ATTRIBUTE" -msgid "%1$s inserting \"%2$s\" attribute" +msgid "%s inserting \"%s\" attribute" msgstr "" -#, c-format msgctxt "INSERTING_AUTO_ATTRIBUTE" -msgid "%1$s inserting \"%2$s\" attribute using value \"%3$s\"" +msgid "%s inserting \"%s\" attribute using value \"%s\ msgstr "" -#, c-format msgctxt "MISSING_ATTR_VALUE" -msgid "%1$s attribute \"%2$s\" lacks value" +msgid "%s attribute \"%s\" lacks value" msgstr "" -#, c-format msgctxt "UNKNOWN_ATTRIBUTE" -msgid "%1$s unknown attribute \"%2$s\"" +msgid "%s unknown attribute \"%s\ msgstr "" -#, c-format msgctxt "PROPRIETARY_ATTRIBUTE" -msgid "%1$s proprietary attribute \"%2$s\"" +msgid "%s proprietary attribute \"%s\ msgstr "" -#, c-format msgctxt "JOINING_ATTRIBUTE" -msgid "%1$s joining values of repeated attribute \"%2$s\"" +msgid "%s joining values of repeated attribute \"%s\ msgstr "" -#, c-format msgctxt "XML_ATTRIBUTE_VALUE" -msgid "%1$s has XML attribute \"%2$s\"" +msgid "%s has XML attribute \"%s\ msgstr "" -#, c-format msgctxt "XML_ID_SYNTAX" -msgid "%1$s ID \"%2$s\" uses XML ID syntax" +msgid "%s ID \"%s\" uses XML ID syntax" msgstr "" -#, c-format msgctxt "ATTR_VALUE_NOT_LCASE" -msgid "%1$s attribute value \"%2$s\" must be lower case for XHTML" +msgid "%s attribute value \"%s\" must be lower case for XHTML" msgstr "" -#, c-format msgctxt "PROPRIETARY_ATTR_VALUE" -msgid "%1$s proprietary attribute value \"%2$s\"" +msgid "%s proprietary attribute value \"%s\ msgstr "" -#, c-format msgctxt "ANCHOR_NOT_UNIQUE" -msgid "%1$s anchor \"%2$s\" already defined" +msgid "%s anchor \"%s\" already defined" msgstr "" -#, c-format msgctxt "BAD_ATTRIBUTE_VALUE" -msgid "%1$s attribute \"%2$s\" has invalid value \"%3$s\"" +msgid "%s attribute \"%s\" has invalid value \"%s\ msgstr "" -#, c-format msgctxt "BAD_ATTRIBUTE_VALUE_REPLACED" -msgid "%1$s attribute \"%2$s\" had invalid value \"%3$s\" and has been replaced" +msgid "%s attribute \"%s\" had invalid value \"%s\" and has been replaced" msgstr "" -#, c-format msgctxt "INVALID_ATTRIBUTE" -msgid "%1$s attribute name \"%2$s\" (value=\"%3$s\") is invalid" +msgid "%s attribute name \"%s\" (value=\"%s\") is invalid" msgstr "" -#, c-format msgctxt "REPEATED_ATTRIBUTE" -msgid "%1$s dropping value \"%2$s\" for repeated attribute \"%3$s\"" +msgid "%s dropping value \"%s\" for repeated attribute \"%s\ msgstr "" -#, c-format msgctxt "INVALID_XML_ID" -msgid "%1$s cannot copy name attribute to id" +msgid "%s cannot copy name attribute to id" msgstr "" -#, c-format msgctxt "UNEXPECTED_GT" -msgid "%1$s missing '>' for end of tag" +msgid "%s missing '>' for end of tag" msgstr "" -#, c-format msgctxt "UNEXPECTED_QUOTEMARK" -msgid "%1$s unexpected or duplicate quote mark" +msgid "%s unexpected or duplicate quote mark" msgstr "" -#, c-format msgctxt "MISSING_QUOTEMARK" -msgid "%1$s attribute with missing trailing quote mark" +msgid "%s attribute with missing trailing quote mark" msgstr "" -#, c-format msgctxt "UNEXPECTED_END_OF_FILE_ATTR" -msgid "%1$s end of file while parsing attributes" +msgid "%s end of file while parsing attributes" msgstr "" -#, c-format msgctxt "ID_NAME_MISMATCH" -msgid "%1$s id and name attribute value mismatch" +msgid "%s id and name attribute value mismatch" msgstr "" -#, c-format msgctxt "BACKSLASH_IN_URI" -msgid "%1$s URI reference contains backslash. Typo?" +msgid "%s URI reference contains backslash. Typo?" msgstr "" -#, c-format msgctxt "FIXED_BACKSLASH" -msgid "%1$s converting backslash in URI to slash" +msgid "%s converting backslash in URI to slash" msgstr "" -#, c-format msgctxt "ILLEGAL_URI_REFERENCE" -msgid "%1$s improperly escaped URI reference" +msgid "%s improperly escaped URI reference" msgstr "" -#, c-format msgctxt "ESCAPED_ILLEGAL_URI" -msgid "%1$s escaping malformed URI reference" +msgid "%s escaping malformed URI reference" msgstr "" -#, c-format msgctxt "NEWLINE_IN_URI" -msgid "%1$s discarding newline in URI reference" +msgid "%s discarding newline in URI reference" msgstr "" -#, c-format msgctxt "WHITE_IN_URI" -msgid "%1$s discarding whitespace in URI reference" +msgid "%s discarding whitespace in URI reference" msgstr "" -#, c-format msgctxt "UNEXPECTED_EQUALSIGN" -msgid "%1$s unexpected '=', expected attribute name" +msgid "%s unexpected '=', expected attribute name" msgstr "" -#, c-format msgctxt "MISSING_IMAGEMAP" -msgid "%1$s should use client-side image map" +msgid "%s should use client-side image map" msgstr "" -#, c-format msgctxt "MISSING_ATTRIBUTE" -msgid "%1$s lacks \"%2$s\" attribute" +msgid "%s lacks \"%s\" attribute" msgstr "" -#, c-format msgctxt "NESTED_EMPHASIS" -msgid "nested emphasis %1$s" +msgid "nested emphasis %s" msgstr "" msgctxt "NESTED_QUOTATION" msgid "nested q elements, possible typo." msgstr "" -#, c-format msgctxt "OBSOLETE_ELEMENT" -msgid "replacing obsolete element %1$s with %2$s" +msgid "replacing obsolete element %s with %s" msgstr "" -#, c-format msgctxt "COERCE_TO_ENDTAG_WARN" -msgid "<%1$s> is probably intended as " +msgid "<%s> is probably intended as " msgstr "" -#, c-format msgctxt "REMOVED_HTML5" -msgid "%1$s element removed from HTML5" +msgid "%s element removed from HTML5" msgstr "" msgctxt "BAD_BODY_HTML5" msgid "Found attribute on body that is obsolete in HTML5. Use CSS" msgstr "" -#, c-format msgctxt "BAD_ALIGN_HTML5" -msgid "The align attribute on the %1$s element is obsolete. Use CSS" +msgid "The align attribute on the %s element is obsolete. Use CSS" msgstr "" -#, c-format msgctxt "BAD_SUMMARY_HTML5" -msgid "The summary attribute on the %1$s element is obsolete in HTML5" +msgid "The summary attribute on the %s element is obsolete in HTML5" msgstr "" -#, c-format msgctxt "TRIM_EMPTY_ELEMENT" -msgid "trimming empty %1$s" +msgid "trimming empty %s" msgstr "" -#, c-format msgctxt "REPLACING_ELEMENT" -msgid "replacing %1$s with %2$s" +msgid "replacing %s with %s" msgstr "" -#, c-format msgctxt "COERCE_TO_ENDTAG" -msgid "<%1$s> is probably intended as " +msgid "<%s> is probably intended as " msgstr "" -#, c-format msgctxt "REPLACING_UNEX_ELEMENT" -msgid "replacing unexpected %1$s with %2$s" +msgid "replacing unexpected %s with %s" msgstr "" -#, c-format msgctxt "MISSING_ENDTAG_FOR" -msgid "missing " +msgid "missing " msgstr "" -#, c-format msgctxt "MISSING_ENDTAG_BEFORE" -msgid "missing before %2$s" +msgid "missing before %s" msgstr "" -#, c-format msgctxt "DISCARDING_UNEXPECTED" -msgid "discarding unexpected %1$s" +msgid "discarding unexpected %s" msgstr "" -#, c-format msgctxt "NON_MATCHING_ENDTAG" -msgid "replacing unexpected %1$s with " +msgid "replacing unexpected %s with " msgstr "" -#, c-format msgctxt "TAG_NOT_ALLOWED_IN" -msgid "%1$s isn't allowed in <%2$s> elements" +msgid "%s isn't allowed in <%s> elements" msgstr "" -#, c-format msgctxt "MISSING_STARTTAG" -msgid "missing <%1$s>" +msgid "missing <%s>" msgstr "" -#, c-format msgctxt "UNEXPECTED_ENDTAG" -msgid "unexpected " +msgid "unexpected " msgstr "" -#, c-format msgctxt "TOO_MANY_ELEMENTS" -msgid "too many %1$s elements" +msgid "too many %s elements" msgstr "" -#, c-format msgctxt "USING_BR_INPLACE_OF" -msgid "using
in place of %1$s" +msgid "using
in place of %s" msgstr "" -#, c-format msgctxt "INSERTING_TAG" -msgid "inserting implicit <%1$s>" +msgid "inserting implicit <%s>" msgstr "" -#, c-format msgctxt "CANT_BE_NESTED" -msgid "%1$s can't be nested" +msgid "%s can't be nested" msgstr "" -#, c-format msgctxt "PROPRIETARY_ELEMENT" -msgid "%1$s is not approved by W3C" +msgid "%s is not approved by W3C" msgstr "" -#, c-format msgctxt "ILLEGAL_NESTING" -msgid "%1$s shouldn't be nested" +msgid "%s shouldn't be nested" msgstr "" -#, c-format msgctxt "NOFRAMES_CONTENT" -msgid "%1$s not inside 'noframes' element" +msgid "%s not inside 'noframes' element" msgstr "" -#, c-format msgctxt "UNEXPECTED_END_OF_FILE" -msgid "unexpected end of file %1$s" +msgid "unexpected end of file %s" msgstr "" -#, c-format msgctxt "ELEMENT_NOT_EMPTY" -msgid "%1$s element not empty or not closed" +msgid "%s element not empty or not closed" msgstr "" -#, c-format msgctxt "UNEXPECTED_ENDTAG_IN" -msgid "unexpected in <%2$s>" +msgid "unexpected in <%s>" msgstr "" -#, c-format msgctxt "TOO_MANY_ELEMENTS_IN" -msgid "too many %1$s elements in <%2$s>" +msgid "too many %s elements in <%s>" msgstr "" -#, c-format msgctxt "UNESCAPED_ELEMENT" -msgid "unescaped %1$s in pre content" +msgid "unescaped %s in pre content" msgstr "" msgctxt "DOCTYPE_AFTER_TAGS" @@ -824,14 +747,12 @@ msgctxt "DUPLICATE_FRAMESET" msgid "repeated FRAMESET element" msgstr "" -#, c-format msgctxt "UNKNOWN_ELEMENT" -msgid "%1$s is not recognized!" +msgid "%s is not recognized!" msgstr "" -#, c-format msgctxt "PREVIOUS_LOCATION" -msgid "<%1$s> previously mentioned" +msgid "<%s> previously mentioned" msgstr "" msgctxt "IMG_MISSING_ALT" @@ -2517,9 +2438,8 @@ msgctxt "TC_LABEL_OPT" msgid "option" msgstr "" -#, c-format msgctxt "TC_MAIN_ERROR_LOAD_CONFIG" -msgid "Loading config file \"%1$s\" failed, err = %2$d" +msgid "Loading config file \"%s\" failed, err = %d" msgstr "" msgctxt "TC_OPT_ACCESS" @@ -2725,18 +2645,16 @@ msgctxt "TC_STRING_CONF_NOTE" msgid "Values marked with an *asterisk are calculated internally by HTML Tidy" msgstr "" -#, c-format msgctxt "TC_STRING_OPT_NOT_DOCUMENTED" -msgid "Warning: option `%1$s' is not documented." +msgid "Warning: option `%s' is not documented." msgstr "" msgctxt "TC_STRING_OUT_OF_MEMORY" msgid "Out of memory. Bailing out." msgstr "" -#, c-format msgctxt "TC_STRING_FATAL_ERROR" -msgid "Fatal error: impossible value for id='%1$d'." +msgid "Fatal error: impossible value for id='%d'." msgstr "" msgctxt "TC_STRING_FILE_MANIP" @@ -2756,9 +2674,8 @@ msgid "A POSIX or Windows locale must be specified." msgstr "" #. The strings "Tidy" and "HTML Tidy" are the program name and must not be translated. -#, c-format msgctxt "TC_STRING_LANG_NOT_FOUND" -msgid "Tidy doesn't have language '%1$s,' will use '%2$s' instead." +msgid "Tidy doesn't have language '%s,' will use '%s' instead." msgstr "" msgctxt "TC_STRING_MISC" @@ -2775,7 +2692,7 @@ msgstr "" #. The strings "Tidy" and "HTML Tidy" are the program name and must not be translated. msgctxt "TC_STRING_UNKNOWN_OPTION" -msgid "HTML Tidy: unknown option: %1$c" +msgid "HTML Tidy: unknown option: %c" msgstr "" #. The strings "Tidy" and "HTML Tidy" are the program name and must not be translated. @@ -2784,37 +2701,33 @@ msgid "HTML Tidy: unknown option." msgstr "" #. The strings "Tidy" and "HTML Tidy" are the program name and must not be translated. -#, c-format msgctxt "TC_STRING_VERS_A" -msgid "HTML Tidy for %1$s version %2$s" +msgid "HTML Tidy for %s version %s" msgstr "" #. The strings "Tidy" and "HTML Tidy" are the program name and must not be translated. -#, c-format msgctxt "TC_STRING_VERS_B" -msgid "HTML Tidy version %1$s" +msgid "HTML Tidy version %s" msgstr "" #. This console output should be limited to 78 characters per line. -#. - %1$n represents the name of the executable from the file system, and is mostly like going to be "tidy". -#. - %2$2 represents a version number, typically x.x.xx. +#. - %n represents the name of the executable from the file system, and is mostly like going to be "tidy". +#. - %2 represents a version number, typically x.x.xx. #. - The strings "Tidy" and "HTML Tidy" are the program name and must not be translated. -#, c-format msgctxt "TC_TXT_HELP_1" msgid "" "\n" -"%1$s [options...] [file...] [options...] [file...]\n" +"%s [options...] [file...] [options...] [file...]\n" "Utility to clean up and pretty print HTML/XHTML/XML.\n" "\n" -"This is modern HTML Tidy version %2$s.\n" +"This is modern HTML Tidy version %s.\n" "\n" msgstr "" #. The strings "Tidy" and "HTML Tidy" are the program name and must not be translated. -#. - %1$s represents the platform, for example, "Mac OS X" or "Windows". -#, c-format +#. - %s represents the platform, for example, "Mac OS X" or "Windows". msgctxt "TC_TXT_HELP_2A" -msgid "Command Line Arguments for HTML Tidy for %1$s:" +msgid "Command Line Arguments for HTML Tidy for %s:" msgstr "" #. The strings "Tidy" and "HTML Tidy" are the program name and must not be translated. diff --git a/localize/translations/language_zh_cn.po b/localize/translations/language_zh_cn.po index bf88af0..8f87035 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: 2016-01-23 16:05:15\n" +"PO-Revision-Date: 2016-01-29 10:54:42\n" "Last-Translator: jderry\n" "Language-Team: \n" @@ -19,46 +19,41 @@ msgctxt "ATRC_ACCESS_URL" msgid "http://www.html-tidy.org/accessibility/" msgstr "" -#, c-format msgctxt "FILE_CANT_OPEN" -msgid "Can't open \"%1$s\"\n" -msgstr "无法打开”%1$s”\n" +msgid "Can't open \"%s\"\n" +msgstr "无法打开”%s”\n" -#, c-format msgctxt "LINE_COLUMN_STRING" -msgid "line %1$d column %2$d - " -msgstr "行 %1$d 列 %2$d - " +msgid "line %d column %d - " +msgstr "行 %d 列 %d - " -#, c-format msgctxt "STRING_CONTENT_LOOKS" -msgid "Document content looks like %1$s" -msgstr "文档内容看起来像 %1$s" +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 \"%1$s\"" +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 %1$u %2$s and %3$u %4$s!" +msgid "Tidy found %u %s and %u %s!" msgstr "" msgctxt "STRING_ERROR_COUNT_ERROR" msgid "error" msgid_plural "errors" -msgstr "" +msgstr[0] "" msgctxt "STRING_ERROR_COUNT_WARNING" msgid "warning" msgid_plural "warnings" -msgstr "" +msgstr[0] "" msgctxt "STRING_HELLO_ACCESS" msgid "Accessibility Checks:" @@ -69,9 +64,8 @@ msgctxt "STRING_HTML_PROPRIETARY" msgid "HTML Proprietary" msgstr "" -#, c-format msgctxt "STRING_MISSING_MALFORMED" -msgid "missing or malformed argument for option: %1$s" +msgid "missing or malformed argument for option: %s" msgstr "" msgctxt "STRING_NO_ERRORS" @@ -100,18 +94,16 @@ msgctxt "STRING_SPECIFIED" msgid "specified" msgstr "" -#, c-format msgctxt "STRING_UNKNOWN_FILE" -msgid "%1$s: can't open file \"%2$s\"\n" +msgid "%s: can't open file \"%s\"\n" msgstr "" -#, c-format msgctxt "STRING_UNKNOWN_OPTION" -msgid "unknown option: %1$s" +msgid "unknown option: %s" msgstr "" msgctxt "STRING_UNRECZD_OPTION" -msgid "unrecognized option -%1$c use -help to list options\n" +msgid "unrecognized option -%c use -help to list options\n" msgstr "" msgctxt "STRING_XML_DECLARATION" @@ -149,26 +141,25 @@ msgid "" msgstr "" #. This console output should be limited to 78 characters per line. -#, c-format +#. - %s represents a string-encoding name which may be localized in your language. msgctxt "TEXT_VENDOR_CHARS" msgid "" "It is unlikely that vendor-specific, system-dependent encodings\n" "work widely enough on the World Wide Web; you should avoid using the \n" -"%1$s character encoding, instead you are recommended to\n" +"%s character encoding, instead you are recommended to\n" "use named entities, e.g. ™.\n" "\n" msgstr "" #. This console output should be limited to 78 characters per line. -#. - %1$s represents a string-encoding name which may be localized in your language. +#. - %s represents a string-encoding name which may be localized in your language. #. - The strings "Tidy" and "HTML Tidy" are the program name and must not be translated. -#, c-format msgctxt "TEXT_SGML_CHARS" msgid "" "Character codes 128 to 159 (U+0080 to U+009F) are not allowed in HTML;\n" "even if they were, they would likely be unprintable control characters.\n" "Tidy assumed you wanted to refer to a character with the same byte value in the \n" -"%1$s encoding and replaced that reference with the Unicode \n" +"%s encoding and replaced that reference with the Unicode \n" "equivalent.\n" "\n" msgstr "" @@ -398,360 +389,292 @@ msgctxt "TidyFatalString" msgid "Panic: " msgstr "" -#, c-format msgctxt "ENCODING_MISMATCH" -msgid "specified input encoding (%1$s) does not match actual input encoding (%2$s)" +msgid "specified input encoding (%s) does not match actual input encoding (%s)" msgstr "" -#, c-format msgctxt "VENDOR_SPECIFIC_CHARS" -msgid "%1$s invalid character code %2$s" +msgid "%s invalid character code %s" msgstr "" -#, c-format msgctxt "INVALID_SGML_CHARS" -msgid "%1$s invalid character code %2$s" +msgid "%s invalid character code %s" msgstr "" -#, c-format msgctxt "INVALID_UTF8" -msgid "%1$s invalid UTF-8 bytes (char. code %2$s)" +msgid "%s invalid UTF-8 bytes (char. code %s)" msgstr "" -#, c-format msgctxt "INVALID_UTF16" -msgid "%1$s invalid UTF-16 surrogate pair (char. code %2$s)" +msgid "%s invalid UTF-16 surrogate pair (char. code %s)" msgstr "" -#, c-format msgctxt "INVALID_NCR" -msgid "%1$s invalid numeric character reference %2$s" +msgid "%s invalid numeric character reference %s" msgstr "" -#, c-format msgctxt "MISSING_SEMICOLON" -msgid "entity \"%1$s\" doesn't end in ';'" +msgid "entity \"%s\" doesn't end in ';'" msgstr "" -#, c-format msgctxt "MISSING_SEMICOLON_NCR" -msgid "numeric character reference \"%1$s\" doesn't end in ';'" +msgid "numeric character reference \"%s\" doesn't end in ';'" msgstr "" msgctxt "UNESCAPED_AMPERSAND" msgid "unescaped & which should be written as &" msgstr "" -#, c-format msgctxt "UNKNOWN_ENTITY" -msgid "unescaped & or unknown entity \"%1$s\"" +msgid "unescaped & or unknown entity \"%s\ msgstr "" msgctxt "APOS_UNDEFINED" msgid "named entity ' only defined in XML/XHTML" msgstr "" -#, c-format msgctxt "INSERTING_ATTRIBUTE" -msgid "%1$s inserting \"%2$s\" attribute" +msgid "%s inserting \"%s\" attribute" msgstr "" -#, c-format msgctxt "INSERTING_AUTO_ATTRIBUTE" -msgid "%1$s inserting \"%2$s\" attribute using value \"%3$s\"" +msgid "%s inserting \"%s\" attribute using value \"%s\ msgstr "" -#, c-format msgctxt "MISSING_ATTR_VALUE" -msgid "%1$s attribute \"%2$s\" lacks value" +msgid "%s attribute \"%s\" lacks value" msgstr "" -#, c-format msgctxt "UNKNOWN_ATTRIBUTE" -msgid "%1$s unknown attribute \"%2$s\"" +msgid "%s unknown attribute \"%s\ msgstr "" -#, c-format msgctxt "PROPRIETARY_ATTRIBUTE" -msgid "%1$s proprietary attribute \"%2$s\"" +msgid "%s proprietary attribute \"%s\ msgstr "" -#, c-format msgctxt "JOINING_ATTRIBUTE" -msgid "%1$s joining values of repeated attribute \"%2$s\"" +msgid "%s joining values of repeated attribute \"%s\ msgstr "" -#, c-format msgctxt "XML_ATTRIBUTE_VALUE" -msgid "%1$s has XML attribute \"%2$s\"" +msgid "%s has XML attribute \"%s\ msgstr "" -#, c-format msgctxt "XML_ID_SYNTAX" -msgid "%1$s ID \"%2$s\" uses XML ID syntax" +msgid "%s ID \"%s\" uses XML ID syntax" msgstr "" -#, c-format msgctxt "ATTR_VALUE_NOT_LCASE" -msgid "%1$s attribute value \"%2$s\" must be lower case for XHTML" +msgid "%s attribute value \"%s\" must be lower case for XHTML" msgstr "" -#, c-format msgctxt "PROPRIETARY_ATTR_VALUE" -msgid "%1$s proprietary attribute value \"%2$s\"" +msgid "%s proprietary attribute value \"%s\ msgstr "" -#, c-format msgctxt "ANCHOR_NOT_UNIQUE" -msgid "%1$s anchor \"%2$s\" already defined" +msgid "%s anchor \"%s\" already defined" msgstr "" -#, c-format msgctxt "BAD_ATTRIBUTE_VALUE" -msgid "%1$s attribute \"%2$s\" has invalid value \"%3$s\"" +msgid "%s attribute \"%s\" has invalid value \"%s\ msgstr "" -#, c-format msgctxt "BAD_ATTRIBUTE_VALUE_REPLACED" -msgid "%1$s attribute \"%2$s\" had invalid value \"%3$s\" and has been replaced" +msgid "%s attribute \"%s\" had invalid value \"%s\" and has been replaced" msgstr "" -#, c-format msgctxt "INVALID_ATTRIBUTE" -msgid "%1$s attribute name \"%2$s\" (value=\"%3$s\") is invalid" +msgid "%s attribute name \"%s\" (value=\"%s\") is invalid" msgstr "" -#, c-format msgctxt "REPEATED_ATTRIBUTE" -msgid "%1$s dropping value \"%2$s\" for repeated attribute \"%3$s\"" +msgid "%s dropping value \"%s\" for repeated attribute \"%s\ msgstr "" -#, c-format msgctxt "INVALID_XML_ID" -msgid "%1$s cannot copy name attribute to id" +msgid "%s cannot copy name attribute to id" msgstr "" -#, c-format msgctxt "UNEXPECTED_GT" -msgid "%1$s missing '>' for end of tag" +msgid "%s missing '>' for end of tag" msgstr "" -#, c-format msgctxt "UNEXPECTED_QUOTEMARK" -msgid "%1$s unexpected or duplicate quote mark" +msgid "%s unexpected or duplicate quote mark" msgstr "" -#, c-format msgctxt "MISSING_QUOTEMARK" -msgid "%1$s attribute with missing trailing quote mark" +msgid "%s attribute with missing trailing quote mark" msgstr "" -#, c-format msgctxt "UNEXPECTED_END_OF_FILE_ATTR" -msgid "%1$s end of file while parsing attributes" +msgid "%s end of file while parsing attributes" msgstr "" -#, c-format msgctxt "ID_NAME_MISMATCH" -msgid "%1$s id and name attribute value mismatch" +msgid "%s id and name attribute value mismatch" msgstr "" -#, c-format msgctxt "BACKSLASH_IN_URI" -msgid "%1$s URI reference contains backslash. Typo?" +msgid "%s URI reference contains backslash. Typo?" msgstr "" -#, c-format msgctxt "FIXED_BACKSLASH" -msgid "%1$s converting backslash in URI to slash" +msgid "%s converting backslash in URI to slash" msgstr "" -#, c-format msgctxt "ILLEGAL_URI_REFERENCE" -msgid "%1$s improperly escaped URI reference" +msgid "%s improperly escaped URI reference" msgstr "" -#, c-format msgctxt "ESCAPED_ILLEGAL_URI" -msgid "%1$s escaping malformed URI reference" +msgid "%s escaping malformed URI reference" msgstr "" -#, c-format msgctxt "NEWLINE_IN_URI" -msgid "%1$s discarding newline in URI reference" +msgid "%s discarding newline in URI reference" msgstr "" -#, c-format msgctxt "WHITE_IN_URI" -msgid "%1$s discarding whitespace in URI reference" +msgid "%s discarding whitespace in URI reference" msgstr "" -#, c-format msgctxt "UNEXPECTED_EQUALSIGN" -msgid "%1$s unexpected '=', expected attribute name" +msgid "%s unexpected '=', expected attribute name" msgstr "" -#, c-format msgctxt "MISSING_IMAGEMAP" -msgid "%1$s should use client-side image map" +msgid "%s should use client-side image map" msgstr "" -#, c-format msgctxt "MISSING_ATTRIBUTE" -msgid "%1$s lacks \"%2$s\" attribute" +msgid "%s lacks \"%s\" attribute" msgstr "" -#, c-format msgctxt "NESTED_EMPHASIS" -msgid "nested emphasis %1$s" +msgid "nested emphasis %s" msgstr "" msgctxt "NESTED_QUOTATION" msgid "nested q elements, possible typo." msgstr "" -#, c-format msgctxt "OBSOLETE_ELEMENT" -msgid "replacing obsolete element %1$s with %2$s" +msgid "replacing obsolete element %s with %s" msgstr "" -#, c-format msgctxt "COERCE_TO_ENDTAG_WARN" -msgid "<%1$s> is probably intended as " +msgid "<%s> is probably intended as " msgstr "" -#, c-format msgctxt "REMOVED_HTML5" -msgid "%1$s element removed from HTML5" +msgid "%s element removed from HTML5" msgstr "" msgctxt "BAD_BODY_HTML5" msgid "Found attribute on body that is obsolete in HTML5. Use CSS" msgstr "" -#, c-format msgctxt "BAD_ALIGN_HTML5" -msgid "The align attribute on the %1$s element is obsolete. Use CSS" +msgid "The align attribute on the %s element is obsolete. Use CSS" msgstr "" -#, c-format msgctxt "BAD_SUMMARY_HTML5" -msgid "The summary attribute on the %1$s element is obsolete in HTML5" +msgid "The summary attribute on the %s element is obsolete in HTML5" msgstr "" -#, c-format msgctxt "TRIM_EMPTY_ELEMENT" -msgid "trimming empty %1$s" +msgid "trimming empty %s" msgstr "" -#, c-format msgctxt "REPLACING_ELEMENT" -msgid "replacing %1$s with %2$s" +msgid "replacing %s with %s" msgstr "" -#, c-format msgctxt "COERCE_TO_ENDTAG" -msgid "<%1$s> is probably intended as " +msgid "<%s> is probably intended as " msgstr "" -#, c-format msgctxt "REPLACING_UNEX_ELEMENT" -msgid "replacing unexpected %1$s with %2$s" +msgid "replacing unexpected %s with %s" msgstr "" -#, c-format msgctxt "MISSING_ENDTAG_FOR" -msgid "missing " +msgid "missing " msgstr "" -#, c-format msgctxt "MISSING_ENDTAG_BEFORE" -msgid "missing before %2$s" +msgid "missing before %s" msgstr "" -#, c-format msgctxt "DISCARDING_UNEXPECTED" -msgid "discarding unexpected %1$s" +msgid "discarding unexpected %s" msgstr "" -#, c-format msgctxt "NON_MATCHING_ENDTAG" -msgid "replacing unexpected %1$s with " +msgid "replacing unexpected %s with " msgstr "" -#, c-format msgctxt "TAG_NOT_ALLOWED_IN" -msgid "%1$s isn't allowed in <%2$s> elements" +msgid "%s isn't allowed in <%s> elements" msgstr "" -#, c-format msgctxt "MISSING_STARTTAG" -msgid "missing <%1$s>" +msgid "missing <%s>" msgstr "" -#, c-format msgctxt "UNEXPECTED_ENDTAG" -msgid "unexpected " +msgid "unexpected " msgstr "" -#, c-format msgctxt "TOO_MANY_ELEMENTS" -msgid "too many %1$s elements" +msgid "too many %s elements" msgstr "" -#, c-format msgctxt "USING_BR_INPLACE_OF" -msgid "using
in place of %1$s" +msgid "using
in place of %s" msgstr "" -#, c-format msgctxt "INSERTING_TAG" -msgid "inserting implicit <%1$s>" +msgid "inserting implicit <%s>" msgstr "" -#, c-format msgctxt "CANT_BE_NESTED" -msgid "%1$s can't be nested" +msgid "%s can't be nested" msgstr "" -#, c-format msgctxt "PROPRIETARY_ELEMENT" -msgid "%1$s is not approved by W3C" +msgid "%s is not approved by W3C" msgstr "" -#, c-format msgctxt "ILLEGAL_NESTING" -msgid "%1$s shouldn't be nested" +msgid "%s shouldn't be nested" msgstr "" -#, c-format msgctxt "NOFRAMES_CONTENT" -msgid "%1$s not inside 'noframes' element" +msgid "%s not inside 'noframes' element" msgstr "" -#, c-format msgctxt "UNEXPECTED_END_OF_FILE" -msgid "unexpected end of file %1$s" +msgid "unexpected end of file %s" msgstr "" -#, c-format msgctxt "ELEMENT_NOT_EMPTY" -msgid "%1$s element not empty or not closed" +msgid "%s element not empty or not closed" msgstr "" -#, c-format msgctxt "UNEXPECTED_ENDTAG_IN" -msgid "unexpected in <%2$s>" +msgid "unexpected in <%s>" msgstr "" -#, c-format msgctxt "TOO_MANY_ELEMENTS_IN" -msgid "too many %1$s elements in <%2$s>" +msgid "too many %s elements in <%s>" msgstr "" -#, c-format msgctxt "UNESCAPED_ELEMENT" -msgid "unescaped %1$s in pre content" +msgid "unescaped %s in pre content" msgstr "" msgctxt "DOCTYPE_AFTER_TAGS" @@ -818,14 +741,12 @@ msgctxt "DUPLICATE_FRAMESET" msgid "repeated FRAMESET element" msgstr "" -#, c-format msgctxt "UNKNOWN_ELEMENT" -msgid "%1$s is not recognized!" +msgid "%s is not recognized!" msgstr "" -#, c-format msgctxt "PREVIOUS_LOCATION" -msgid "<%1$s> previously mentioned" +msgid "<%s> previously mentioned" msgstr "" msgctxt "IMG_MISSING_ALT" @@ -2511,9 +2432,8 @@ msgctxt "TC_LABEL_OPT" msgid "option" msgstr "" -#, c-format msgctxt "TC_MAIN_ERROR_LOAD_CONFIG" -msgid "Loading config file \"%1$s\" failed, err = %2$d" +msgid "Loading config file \"%s\" failed, err = %d" msgstr "" msgctxt "TC_OPT_ACCESS" @@ -2719,18 +2639,16 @@ msgctxt "TC_STRING_CONF_NOTE" msgid "Values marked with an *asterisk are calculated internally by HTML Tidy" msgstr "" -#, c-format msgctxt "TC_STRING_OPT_NOT_DOCUMENTED" -msgid "Warning: option `%1$s' is not documented." +msgid "Warning: option `%s' is not documented." msgstr "" msgctxt "TC_STRING_OUT_OF_MEMORY" msgid "Out of memory. Bailing out." msgstr "" -#, c-format msgctxt "TC_STRING_FATAL_ERROR" -msgid "Fatal error: impossible value for id='%1$d'." +msgid "Fatal error: impossible value for id='%d'." msgstr "" msgctxt "TC_STRING_FILE_MANIP" @@ -2750,9 +2668,8 @@ msgid "A POSIX or Windows locale must be specified." msgstr "" #. The strings "Tidy" and "HTML Tidy" are the program name and must not be translated. -#, c-format msgctxt "TC_STRING_LANG_NOT_FOUND" -msgid "Tidy doesn't have language '%1$s,' will use '%2$s' instead." +msgid "Tidy doesn't have language '%s,' will use '%s' instead." msgstr "" msgctxt "TC_STRING_MISC" @@ -2769,7 +2686,7 @@ msgstr "" #. The strings "Tidy" and "HTML Tidy" are the program name and must not be translated. msgctxt "TC_STRING_UNKNOWN_OPTION" -msgid "HTML Tidy: unknown option: %1$c" +msgid "HTML Tidy: unknown option: %c" msgstr "" #. The strings "Tidy" and "HTML Tidy" are the program name and must not be translated. @@ -2778,37 +2695,33 @@ msgid "HTML Tidy: unknown option." msgstr "" #. The strings "Tidy" and "HTML Tidy" are the program name and must not be translated. -#, c-format msgctxt "TC_STRING_VERS_A" -msgid "HTML Tidy for %1$s version %2$s" -msgstr "HTML Tidy 版本 %2$s 用于 %1$s" +msgid "HTML Tidy for %s version %s" +msgstr "HTML Tidy 用于 %s 版本 %s" #. The strings "Tidy" and "HTML Tidy" are the program name and must not be translated. -#, c-format msgctxt "TC_STRING_VERS_B" -msgid "HTML Tidy version %1$s" -msgstr "HTML Tidy 版本 %1$s" +msgid "HTML Tidy version %s" +msgstr "HTML Tidy 版本 %s" #. This console output should be limited to 78 characters per line. -#. - %1$n represents the name of the executable from the file system, and is mostly like going to be "tidy". -#. - %2$2 represents a version number, typically x.x.xx. +#. - %n represents the name of the executable from the file system, and is mostly like going to be "tidy". +#. - %2 represents a version number, typically x.x.xx. #. - The strings "Tidy" and "HTML Tidy" are the program name and must not be translated. -#, c-format msgctxt "TC_TXT_HELP_1" msgid "" "\n" -"%1$s [options...] [file...] [options...] [file...]\n" +"%s [options...] [file...] [options...] [file...]\n" "Utility to clean up and pretty print HTML/XHTML/XML.\n" "\n" -"This is modern HTML Tidy version %2$s.\n" +"This is modern HTML Tidy version %s.\n" "\n" msgstr "" #. The strings "Tidy" and "HTML Tidy" are the program name and must not be translated. -#. - %1$s represents the platform, for example, "Mac OS X" or "Windows". -#, c-format +#. - %s represents the platform, for example, "Mac OS X" or "Windows". msgctxt "TC_TXT_HELP_2A" -msgid "Command Line Arguments for HTML Tidy for %1$s:" +msgid "Command Line Arguments for HTML Tidy for %s:" msgstr "" #. The strings "Tidy" and "HTML Tidy" are the program name and must not be translated. diff --git a/localize/translations/tidy.pot b/localize/translations/tidy.pot index 9cb8639..4bc256e 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: 2016-01-23 16:02:36\n" +"POT-Creation-Date: 2016-01-29 10:53:58\n" "Last-Translator: jderry\n" "Language-Team: \n" @@ -19,19 +19,16 @@ msgctxt "ATRC_ACCESS_URL" msgid "http://www.html-tidy.org/accessibility/" msgstr "" -#, c-format msgctxt "FILE_CANT_OPEN" -msgid "Can't open \"%1$s\"\n" +msgid "Can't open \"%s\"\n" msgstr "" -#, c-format msgctxt "LINE_COLUMN_STRING" -msgid "line %1$d column %2$d - " +msgid "line %d column %d - " msgstr "" -#, c-format msgctxt "STRING_CONTENT_LOOKS" -msgid "Document content looks like %1$s" +msgid "Document content looks like %s" msgstr "" #. For example, "discarding invalid UTF-16 surrogate pair" @@ -39,15 +36,13 @@ msgctxt "STRING_DISCARDING" msgid "discarding" msgstr "" -#, c-format msgctxt "STRING_DOCTYPE_GIVEN" -msgid "Doctype given is \"%1$s\"" +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 %1$u %2$s and %3$u %4$s!" +msgid "Tidy found %u %s and %u %s!" msgstr "" msgctxt "STRING_ERROR_COUNT_ERROR" @@ -71,9 +66,8 @@ msgctxt "STRING_HTML_PROPRIETARY" msgid "HTML Proprietary" msgstr "" -#, c-format msgctxt "STRING_MISSING_MALFORMED" -msgid "missing or malformed argument for option: %1$s" +msgid "missing or malformed argument for option: %s" msgstr "" msgctxt "STRING_NO_ERRORS" @@ -102,18 +96,16 @@ msgctxt "STRING_SPECIFIED" msgid "specified" msgstr "" -#, c-format msgctxt "STRING_UNKNOWN_FILE" -msgid "%1$s: can't open file \"%2$s\"\n" +msgid "%s: can't open file \"%s\"\n" msgstr "" -#, c-format msgctxt "STRING_UNKNOWN_OPTION" -msgid "unknown option: %1$s" +msgid "unknown option: %s" msgstr "" msgctxt "STRING_UNRECZD_OPTION" -msgid "unrecognized option -%1$c use -help to list options\n" +msgid "unrecognized option -%c use -help to list options\n" msgstr "" msgctxt "STRING_XML_DECLARATION" @@ -151,26 +143,25 @@ msgid "" msgstr "" #. This console output should be limited to 78 characters per line. -#, c-format +#. - %s represents a string-encoding name which may be localized in your language. msgctxt "TEXT_VENDOR_CHARS" msgid "" "It is unlikely that vendor-specific, system-dependent encodings\n" "work widely enough on the World Wide Web; you should avoid using the \n" -"%1$s character encoding, instead you are recommended to\n" +"%s character encoding, instead you are recommended to\n" "use named entities, e.g. ™.\n" "\n" msgstr "" #. This console output should be limited to 78 characters per line. -#. - %1$s represents a string-encoding name which may be localized in your language. +#. - %s represents a string-encoding name which may be localized in your language. #. - The strings "Tidy" and "HTML Tidy" are the program name and must not be translated. -#, c-format msgctxt "TEXT_SGML_CHARS" msgid "" "Character codes 128 to 159 (U+0080 to U+009F) are not allowed in HTML;\n" "even if they were, they would likely be unprintable control characters.\n" "Tidy assumed you wanted to refer to a character with the same byte value in the \n" -"%1$s encoding and replaced that reference with the Unicode \n" +"%s encoding and replaced that reference with the Unicode \n" "equivalent.\n" "\n" msgstr "" @@ -400,360 +391,292 @@ msgctxt "TidyFatalString" msgid "Panic: " msgstr "" -#, c-format msgctxt "ENCODING_MISMATCH" -msgid "specified input encoding (%1$s) does not match actual input encoding (%2$s)" +msgid "specified input encoding (%s) does not match actual input encoding (%s)" msgstr "" -#, c-format msgctxt "VENDOR_SPECIFIC_CHARS" -msgid "%1$s invalid character code %2$s" +msgid "%s invalid character code %s" msgstr "" -#, c-format msgctxt "INVALID_SGML_CHARS" -msgid "%1$s invalid character code %2$s" +msgid "%s invalid character code %s" msgstr "" -#, c-format msgctxt "INVALID_UTF8" -msgid "%1$s invalid UTF-8 bytes (char. code %2$s)" +msgid "%s invalid UTF-8 bytes (char. code %s)" msgstr "" -#, c-format msgctxt "INVALID_UTF16" -msgid "%1$s invalid UTF-16 surrogate pair (char. code %2$s)" +msgid "%s invalid UTF-16 surrogate pair (char. code %s)" msgstr "" -#, c-format msgctxt "INVALID_NCR" -msgid "%1$s invalid numeric character reference %2$s" +msgid "%s invalid numeric character reference %s" msgstr "" -#, c-format msgctxt "MISSING_SEMICOLON" -msgid "entity \"%1$s\" doesn't end in ';'" +msgid "entity \"%s\" doesn't end in ';'" msgstr "" -#, c-format msgctxt "MISSING_SEMICOLON_NCR" -msgid "numeric character reference \"%1$s\" doesn't end in ';'" +msgid "numeric character reference \"%s\" doesn't end in ';'" msgstr "" msgctxt "UNESCAPED_AMPERSAND" msgid "unescaped & which should be written as &" msgstr "" -#, c-format msgctxt "UNKNOWN_ENTITY" -msgid "unescaped & or unknown entity \"%1$s\"" +msgid "unescaped & or unknown entity \"%s\ msgstr "" msgctxt "APOS_UNDEFINED" msgid "named entity ' only defined in XML/XHTML" msgstr "" -#, c-format msgctxt "INSERTING_ATTRIBUTE" -msgid "%1$s inserting \"%2$s\" attribute" +msgid "%s inserting \"%s\" attribute" msgstr "" -#, c-format msgctxt "INSERTING_AUTO_ATTRIBUTE" -msgid "%1$s inserting \"%2$s\" attribute using value \"%3$s\"" +msgid "%s inserting \"%s\" attribute using value \"%s\ msgstr "" -#, c-format msgctxt "MISSING_ATTR_VALUE" -msgid "%1$s attribute \"%2$s\" lacks value" +msgid "%s attribute \"%s\" lacks value" msgstr "" -#, c-format msgctxt "UNKNOWN_ATTRIBUTE" -msgid "%1$s unknown attribute \"%2$s\"" +msgid "%s unknown attribute \"%s\ msgstr "" -#, c-format msgctxt "PROPRIETARY_ATTRIBUTE" -msgid "%1$s proprietary attribute \"%2$s\"" +msgid "%s proprietary attribute \"%s\ msgstr "" -#, c-format msgctxt "JOINING_ATTRIBUTE" -msgid "%1$s joining values of repeated attribute \"%2$s\"" +msgid "%s joining values of repeated attribute \"%s\ msgstr "" -#, c-format msgctxt "XML_ATTRIBUTE_VALUE" -msgid "%1$s has XML attribute \"%2$s\"" +msgid "%s has XML attribute \"%s\ msgstr "" -#, c-format msgctxt "XML_ID_SYNTAX" -msgid "%1$s ID \"%2$s\" uses XML ID syntax" +msgid "%s ID \"%s\" uses XML ID syntax" msgstr "" -#, c-format msgctxt "ATTR_VALUE_NOT_LCASE" -msgid "%1$s attribute value \"%2$s\" must be lower case for XHTML" +msgid "%s attribute value \"%s\" must be lower case for XHTML" msgstr "" -#, c-format msgctxt "PROPRIETARY_ATTR_VALUE" -msgid "%1$s proprietary attribute value \"%2$s\"" +msgid "%s proprietary attribute value \"%s\ msgstr "" -#, c-format msgctxt "ANCHOR_NOT_UNIQUE" -msgid "%1$s anchor \"%2$s\" already defined" +msgid "%s anchor \"%s\" already defined" msgstr "" -#, c-format msgctxt "BAD_ATTRIBUTE_VALUE" -msgid "%1$s attribute \"%2$s\" has invalid value \"%3$s\"" +msgid "%s attribute \"%s\" has invalid value \"%s\ msgstr "" -#, c-format msgctxt "BAD_ATTRIBUTE_VALUE_REPLACED" -msgid "%1$s attribute \"%2$s\" had invalid value \"%3$s\" and has been replaced" +msgid "%s attribute \"%s\" had invalid value \"%s\" and has been replaced" msgstr "" -#, c-format msgctxt "INVALID_ATTRIBUTE" -msgid "%1$s attribute name \"%2$s\" (value=\"%3$s\") is invalid" +msgid "%s attribute name \"%s\" (value=\"%s\") is invalid" msgstr "" -#, c-format msgctxt "REPEATED_ATTRIBUTE" -msgid "%1$s dropping value \"%2$s\" for repeated attribute \"%3$s\"" +msgid "%s dropping value \"%s\" for repeated attribute \"%s\ msgstr "" -#, c-format msgctxt "INVALID_XML_ID" -msgid "%1$s cannot copy name attribute to id" +msgid "%s cannot copy name attribute to id" msgstr "" -#, c-format msgctxt "UNEXPECTED_GT" -msgid "%1$s missing '>' for end of tag" +msgid "%s missing '>' for end of tag" msgstr "" -#, c-format msgctxt "UNEXPECTED_QUOTEMARK" -msgid "%1$s unexpected or duplicate quote mark" +msgid "%s unexpected or duplicate quote mark" msgstr "" -#, c-format msgctxt "MISSING_QUOTEMARK" -msgid "%1$s attribute with missing trailing quote mark" +msgid "%s attribute with missing trailing quote mark" msgstr "" -#, c-format msgctxt "UNEXPECTED_END_OF_FILE_ATTR" -msgid "%1$s end of file while parsing attributes" +msgid "%s end of file while parsing attributes" msgstr "" -#, c-format msgctxt "ID_NAME_MISMATCH" -msgid "%1$s id and name attribute value mismatch" +msgid "%s id and name attribute value mismatch" msgstr "" -#, c-format msgctxt "BACKSLASH_IN_URI" -msgid "%1$s URI reference contains backslash. Typo?" +msgid "%s URI reference contains backslash. Typo?" msgstr "" -#, c-format msgctxt "FIXED_BACKSLASH" -msgid "%1$s converting backslash in URI to slash" +msgid "%s converting backslash in URI to slash" msgstr "" -#, c-format msgctxt "ILLEGAL_URI_REFERENCE" -msgid "%1$s improperly escaped URI reference" +msgid "%s improperly escaped URI reference" msgstr "" -#, c-format msgctxt "ESCAPED_ILLEGAL_URI" -msgid "%1$s escaping malformed URI reference" +msgid "%s escaping malformed URI reference" msgstr "" -#, c-format msgctxt "NEWLINE_IN_URI" -msgid "%1$s discarding newline in URI reference" +msgid "%s discarding newline in URI reference" msgstr "" -#, c-format msgctxt "WHITE_IN_URI" -msgid "%1$s discarding whitespace in URI reference" +msgid "%s discarding whitespace in URI reference" msgstr "" -#, c-format msgctxt "UNEXPECTED_EQUALSIGN" -msgid "%1$s unexpected '=', expected attribute name" +msgid "%s unexpected '=', expected attribute name" msgstr "" -#, c-format msgctxt "MISSING_IMAGEMAP" -msgid "%1$s should use client-side image map" +msgid "%s should use client-side image map" msgstr "" -#, c-format msgctxt "MISSING_ATTRIBUTE" -msgid "%1$s lacks \"%2$s\" attribute" +msgid "%s lacks \"%s\" attribute" msgstr "" -#, c-format msgctxt "NESTED_EMPHASIS" -msgid "nested emphasis %1$s" +msgid "nested emphasis %s" msgstr "" msgctxt "NESTED_QUOTATION" msgid "nested q elements, possible typo." msgstr "" -#, c-format msgctxt "OBSOLETE_ELEMENT" -msgid "replacing obsolete element %1$s with %2$s" +msgid "replacing obsolete element %s with %s" msgstr "" -#, c-format msgctxt "COERCE_TO_ENDTAG_WARN" -msgid "<%1$s> is probably intended as " +msgid "<%s> is probably intended as " msgstr "" -#, c-format msgctxt "REMOVED_HTML5" -msgid "%1$s element removed from HTML5" +msgid "%s element removed from HTML5" msgstr "" msgctxt "BAD_BODY_HTML5" msgid "Found attribute on body that is obsolete in HTML5. Use CSS" msgstr "" -#, c-format msgctxt "BAD_ALIGN_HTML5" -msgid "The align attribute on the %1$s element is obsolete. Use CSS" +msgid "The align attribute on the %s element is obsolete. Use CSS" msgstr "" -#, c-format msgctxt "BAD_SUMMARY_HTML5" -msgid "The summary attribute on the %1$s element is obsolete in HTML5" +msgid "The summary attribute on the %s element is obsolete in HTML5" msgstr "" -#, c-format msgctxt "TRIM_EMPTY_ELEMENT" -msgid "trimming empty %1$s" +msgid "trimming empty %s" msgstr "" -#, c-format msgctxt "REPLACING_ELEMENT" -msgid "replacing %1$s with %2$s" +msgid "replacing %s with %s" msgstr "" -#, c-format msgctxt "COERCE_TO_ENDTAG" -msgid "<%1$s> is probably intended as " +msgid "<%s> is probably intended as " msgstr "" -#, c-format msgctxt "REPLACING_UNEX_ELEMENT" -msgid "replacing unexpected %1$s with %2$s" +msgid "replacing unexpected %s with %s" msgstr "" -#, c-format msgctxt "MISSING_ENDTAG_FOR" -msgid "missing " +msgid "missing " msgstr "" -#, c-format msgctxt "MISSING_ENDTAG_BEFORE" -msgid "missing before %2$s" +msgid "missing before %s" msgstr "" -#, c-format msgctxt "DISCARDING_UNEXPECTED" -msgid "discarding unexpected %1$s" +msgid "discarding unexpected %s" msgstr "" -#, c-format msgctxt "NON_MATCHING_ENDTAG" -msgid "replacing unexpected %1$s with " +msgid "replacing unexpected %s with " msgstr "" -#, c-format msgctxt "TAG_NOT_ALLOWED_IN" -msgid "%1$s isn't allowed in <%2$s> elements" +msgid "%s isn't allowed in <%s> elements" msgstr "" -#, c-format msgctxt "MISSING_STARTTAG" -msgid "missing <%1$s>" +msgid "missing <%s>" msgstr "" -#, c-format msgctxt "UNEXPECTED_ENDTAG" -msgid "unexpected " +msgid "unexpected " msgstr "" -#, c-format msgctxt "TOO_MANY_ELEMENTS" -msgid "too many %1$s elements" +msgid "too many %s elements" msgstr "" -#, c-format msgctxt "USING_BR_INPLACE_OF" -msgid "using
in place of %1$s" +msgid "using
in place of %s" msgstr "" -#, c-format msgctxt "INSERTING_TAG" -msgid "inserting implicit <%1$s>" +msgid "inserting implicit <%s>" msgstr "" -#, c-format msgctxt "CANT_BE_NESTED" -msgid "%1$s can't be nested" +msgid "%s can't be nested" msgstr "" -#, c-format msgctxt "PROPRIETARY_ELEMENT" -msgid "%1$s is not approved by W3C" +msgid "%s is not approved by W3C" msgstr "" -#, c-format msgctxt "ILLEGAL_NESTING" -msgid "%1$s shouldn't be nested" +msgid "%s shouldn't be nested" msgstr "" -#, c-format msgctxt "NOFRAMES_CONTENT" -msgid "%1$s not inside 'noframes' element" +msgid "%s not inside 'noframes' element" msgstr "" -#, c-format msgctxt "UNEXPECTED_END_OF_FILE" -msgid "unexpected end of file %1$s" +msgid "unexpected end of file %s" msgstr "" -#, c-format msgctxt "ELEMENT_NOT_EMPTY" -msgid "%1$s element not empty or not closed" +msgid "%s element not empty or not closed" msgstr "" -#, c-format msgctxt "UNEXPECTED_ENDTAG_IN" -msgid "unexpected in <%2$s>" +msgid "unexpected in <%s>" msgstr "" -#, c-format msgctxt "TOO_MANY_ELEMENTS_IN" -msgid "too many %1$s elements in <%2$s>" +msgid "too many %s elements in <%s>" msgstr "" -#, c-format msgctxt "UNESCAPED_ELEMENT" -msgid "unescaped %1$s in pre content" +msgid "unescaped %s in pre content" msgstr "" msgctxt "DOCTYPE_AFTER_TAGS" @@ -820,14 +743,12 @@ msgctxt "DUPLICATE_FRAMESET" msgid "repeated FRAMESET element" msgstr "" -#, c-format msgctxt "UNKNOWN_ELEMENT" -msgid "%1$s is not recognized!" +msgid "%s is not recognized!" msgstr "" -#, c-format msgctxt "PREVIOUS_LOCATION" -msgid "<%1$s> previously mentioned" +msgid "<%s> previously mentioned" msgstr "" msgctxt "IMG_MISSING_ALT" @@ -2513,9 +2434,8 @@ msgctxt "TC_LABEL_OPT" msgid "option" msgstr "" -#, c-format msgctxt "TC_MAIN_ERROR_LOAD_CONFIG" -msgid "Loading config file \"%1$s\" failed, err = %2$d" +msgid "Loading config file \"%s\" failed, err = %d" msgstr "" msgctxt "TC_OPT_ACCESS" @@ -2721,18 +2641,16 @@ msgctxt "TC_STRING_CONF_NOTE" msgid "Values marked with an *asterisk are calculated internally by HTML Tidy" msgstr "" -#, c-format msgctxt "TC_STRING_OPT_NOT_DOCUMENTED" -msgid "Warning: option `%1$s' is not documented." +msgid "Warning: option `%s' is not documented." msgstr "" msgctxt "TC_STRING_OUT_OF_MEMORY" msgid "Out of memory. Bailing out." msgstr "" -#, c-format msgctxt "TC_STRING_FATAL_ERROR" -msgid "Fatal error: impossible value for id='%1$d'." +msgid "Fatal error: impossible value for id='%d'." msgstr "" msgctxt "TC_STRING_FILE_MANIP" @@ -2752,9 +2670,8 @@ msgid "A POSIX or Windows locale must be specified." msgstr "" #. The strings "Tidy" and "HTML Tidy" are the program name and must not be translated. -#, c-format msgctxt "TC_STRING_LANG_NOT_FOUND" -msgid "Tidy doesn't have language '%1$s,' will use '%2$s' instead." +msgid "Tidy doesn't have language '%s,' will use '%s' instead." msgstr "" msgctxt "TC_STRING_MISC" @@ -2771,7 +2688,7 @@ msgstr "" #. The strings "Tidy" and "HTML Tidy" are the program name and must not be translated. msgctxt "TC_STRING_UNKNOWN_OPTION" -msgid "HTML Tidy: unknown option: %1$c" +msgid "HTML Tidy: unknown option: %c" msgstr "" #. The strings "Tidy" and "HTML Tidy" are the program name and must not be translated. @@ -2780,37 +2697,33 @@ msgid "HTML Tidy: unknown option." msgstr "" #. The strings "Tidy" and "HTML Tidy" are the program name and must not be translated. -#, c-format msgctxt "TC_STRING_VERS_A" -msgid "HTML Tidy for %1$s version %2$s" +msgid "HTML Tidy for %s version %s" msgstr "" #. The strings "Tidy" and "HTML Tidy" are the program name and must not be translated. -#, c-format msgctxt "TC_STRING_VERS_B" -msgid "HTML Tidy version %1$s" +msgid "HTML Tidy version %s" msgstr "" #. This console output should be limited to 78 characters per line. -#. - %1$n represents the name of the executable from the file system, and is mostly like going to be "tidy". -#. - %2$2 represents a version number, typically x.x.xx. +#. - %n represents the name of the executable from the file system, and is mostly like going to be "tidy". +#. - %2 represents a version number, typically x.x.xx. #. - The strings "Tidy" and "HTML Tidy" are the program name and must not be translated. -#, c-format msgctxt "TC_TXT_HELP_1" msgid "" "\n" -"%1$s [options...] [file...] [options...] [file...]\n" +"%s [options...] [file...] [options...] [file...]\n" "Utility to clean up and pretty print HTML/XHTML/XML.\n" "\n" -"This is modern HTML Tidy version %2$s.\n" +"This is modern HTML Tidy version %s.\n" "\n" msgstr "" #. The strings "Tidy" and "HTML Tidy" are the program name and must not be translated. -#. - %1$s represents the platform, for example, "Mac OS X" or "Windows". -#, c-format +#. - %s represents the platform, for example, "Mac OS X" or "Windows". msgctxt "TC_TXT_HELP_2A" -msgid "Command Line Arguments for HTML Tidy for %1$s:" +msgid "Command Line Arguments for HTML Tidy for %s:" msgstr "" #. The strings "Tidy" and "HTML Tidy" are the program name and must not be translated. diff --git a/src/language.h b/src/language.h index 4430971..6212033 100644 --- a/src/language.h +++ b/src/language.h @@ -29,9 +29,9 @@ * https://www.gnu.org/software/gettext/manual/html_node/Plural-forms.html */ typedef struct languageDictionaryEntry { - uint key; - uint pluralForm; - ctmbstr value; + uint key; + uint pluralForm; + ctmbstr value; } languageDictionaryEntry; @@ -50,8 +50,8 @@ typedef languageDictionaryEntry const languageDictionary[600]; * each language header and is language dependent. */ typedef struct languageDefinition { - uint (*whichPluralForm)(uint n); - languageDictionary messages; + uint (*whichPluralForm)(uint n); + languageDictionary messages; } languageDefinition; @@ -61,8 +61,8 @@ typedef struct languageDefinition { * locale names are mapped to POSIX language codes. */ typedef struct tidyLocaleMapItem { - ctmbstr winName; - ctmbstr POSIXName; + ctmbstr winName; + ctmbstr POSIXName; } tidyLocaleMapItem; @@ -85,104 +85,104 @@ typedef struct tidyLocaleMapItem { */ typedef enum { - /* This MUST be present and first. */ - TIDY_MESSAGE_TYPE_FIRST = 4096, - - /* Specify the code for this language. */ - TIDY_LANGUAGE, - - /* Localization test strings. */ - TEST_PRESENT_IN_BASE, - TEST_PRESENT_IN_REGION, - - /* Strings for the console application. */ - TC_CAT_DIAGNOSTICS, - TC_CAT_ENCODING, - TC_CAT_MARKUP, - TC_CAT_MISC, - TC_CAT_PRETTYPRINT, - TC_LABEL_COL, - TC_LABEL_FILE, - TC_LABEL_LANG, - TC_LABEL_LEVL, - TC_LABEL_OPT, - TC_MAIN_ERROR_LOAD_CONFIG, - TC_OPT_ACCESS, - TC_OPT_ASCII, - TC_OPT_ASHTML, - TC_OPT_ASXML, - TC_OPT_BARE, - TC_OPT_BIG5, - TC_OPT_CLEAN, - TC_OPT_CONFIG, - TC_OPT_ERRORS, - TC_OPT_FILE, - TC_OPT_GDOC, - TC_OPT_HELP, - TC_OPT_HELPCFG, - TC_OPT_HELPOPT, - TC_OPT_IBM858, - TC_OPT_INDENT, - TC_OPT_ISO2022, - TC_OPT_LANGUAGE, - TC_OPT_LATIN0, - TC_OPT_LATIN1, - TC_OPT_MAC, - TC_OPT_MODIFY, - TC_OPT_NUMERIC, - TC_OPT_OMIT, - TC_OPT_OUTPUT, - TC_OPT_QUIET, - TC_OPT_RAW, - TC_OPT_SHIFTJIS, - TC_OPT_SHOWCFG, - TC_OPT_UPPER, - TC_OPT_UTF16, - TC_OPT_UTF16BE, - TC_OPT_UTF16LE, - TC_OPT_UTF8, - TC_OPT_VERSION, - TC_OPT_WIN1252, - TC_OPT_WRAP, - TC_OPT_XML, - TC_OPT_XMLCFG, - TC_OPT_XMLSTRG, - TC_OPT_XMLOPTS, - TC_OPT_XMLHELP, - TC_STRING_CONF_HEADER, - TC_STRING_CONF_NAME, - TC_STRING_CONF_TYPE, - TC_STRING_CONF_VALUE, - TC_STRING_CONF_NOTE, - TC_STRING_OPT_NOT_DOCUMENTED, - TC_STRING_OUT_OF_MEMORY, - TC_STRING_FATAL_ERROR, - TC_STRING_FILE_MANIP, - TC_STRING_LANG_MUST_SPECIFY, - TC_STRING_LANG_NOT_FOUND, - TC_STRING_MUST_SPECIFY, - TC_STRING_PROCESS_DIRECTIVES, - TC_STRING_CHAR_ENCODING, - TC_STRING_MISC, - TC_STRING_XML, - TC_STRING_UNKNOWN_OPTION, - TC_STRING_UNKNOWN_OPTION_B, - TC_STRING_VERS_A, - TC_STRING_VERS_B, - TC_TXT_HELP_1, - TC_TXT_HELP_2A, - TC_TXT_HELP_2B, - TC_TXT_HELP_3, - TC_TXT_HELP_CONFIG, - TC_TXT_HELP_CONFIG_NAME, - TC_TXT_HELP_CONFIG_TYPE, - TC_TXT_HELP_CONFIG_ALLW, - TC_TXT_HELP_LANG_1, - TC_TXT_HELP_LANG_2, - TC_TXT_HELP_LANG_3, - - /* This MUST be present and last. */ - TIDY_MESSAGE_TYPE_LAST + /* This MUST be present and first. */ + TIDY_MESSAGE_TYPE_FIRST = 4096, + + /* Specify the code for this language. */ + TIDY_LANGUAGE, + + /* Localization test strings. */ + TEST_PRESENT_IN_BASE, + TEST_PRESENT_IN_REGION, + + /* Strings for the console application. */ + TC_CAT_DIAGNOSTICS, + TC_CAT_ENCODING, + TC_CAT_MARKUP, + TC_CAT_MISC, + TC_CAT_PRETTYPRINT, + TC_LABEL_COL, + TC_LABEL_FILE, + TC_LABEL_LANG, + TC_LABEL_LEVL, + TC_LABEL_OPT, + TC_MAIN_ERROR_LOAD_CONFIG, + TC_OPT_ACCESS, + TC_OPT_ASCII, + TC_OPT_ASHTML, + TC_OPT_ASXML, + TC_OPT_BARE, + TC_OPT_BIG5, + TC_OPT_CLEAN, + TC_OPT_CONFIG, + TC_OPT_ERRORS, + TC_OPT_FILE, + TC_OPT_GDOC, + TC_OPT_HELP, + TC_OPT_HELPCFG, + TC_OPT_HELPOPT, + TC_OPT_IBM858, + TC_OPT_INDENT, + TC_OPT_ISO2022, + TC_OPT_LANGUAGE, + TC_OPT_LATIN0, + TC_OPT_LATIN1, + TC_OPT_MAC, + TC_OPT_MODIFY, + TC_OPT_NUMERIC, + TC_OPT_OMIT, + TC_OPT_OUTPUT, + TC_OPT_QUIET, + TC_OPT_RAW, + TC_OPT_SHIFTJIS, + TC_OPT_SHOWCFG, + TC_OPT_UPPER, + TC_OPT_UTF16, + TC_OPT_UTF16BE, + TC_OPT_UTF16LE, + TC_OPT_UTF8, + TC_OPT_VERSION, + TC_OPT_WIN1252, + TC_OPT_WRAP, + TC_OPT_XML, + TC_OPT_XMLCFG, + TC_OPT_XMLSTRG, + TC_OPT_XMLOPTS, + TC_OPT_XMLHELP, + TC_STRING_CONF_HEADER, + TC_STRING_CONF_NAME, + TC_STRING_CONF_TYPE, + TC_STRING_CONF_VALUE, + TC_STRING_CONF_NOTE, + TC_STRING_OPT_NOT_DOCUMENTED, + TC_STRING_OUT_OF_MEMORY, + TC_STRING_FATAL_ERROR, + TC_STRING_FILE_MANIP, + TC_STRING_LANG_MUST_SPECIFY, + TC_STRING_LANG_NOT_FOUND, + TC_STRING_MUST_SPECIFY, + TC_STRING_PROCESS_DIRECTIVES, + TC_STRING_CHAR_ENCODING, + TC_STRING_MISC, + TC_STRING_XML, + TC_STRING_UNKNOWN_OPTION, + TC_STRING_UNKNOWN_OPTION_B, + TC_STRING_VERS_A, + TC_STRING_VERS_B, + TC_TXT_HELP_1, + TC_TXT_HELP_2A, + TC_TXT_HELP_2B, + TC_TXT_HELP_3, + TC_TXT_HELP_CONFIG, + TC_TXT_HELP_CONFIG_NAME, + TC_TXT_HELP_CONFIG_TYPE, + TC_TXT_HELP_CONFIG_ALLW, + TC_TXT_HELP_LANG_1, + TC_TXT_HELP_LANG_2, + TC_TXT_HELP_LANG_3, + + /* This MUST be present and last. */ + TIDY_MESSAGE_TYPE_LAST } tidyMessageTypes; diff --git a/src/language_en.h b/src/language_en.h index 1b774a7..fbfb1a8 100644 --- a/src/language_en.h +++ b/src/language_en.h @@ -78,8 +78,8 @@ static languageDefinition language_en = { whichPluralForm_en, { { 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, 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" }, @@ -87,7 +87,7 @@ static languageDefinition language_en = { whichPluralForm_en, { { STRING_HELLO_ACCESS, 0, "Accessibility Checks:" }, {/* 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_NO_ERRORS, 0, "No warnings or errors were found." }, { STRING_NO_SYSID, 0, "No system identifier in emitted doctype" }, @@ -95,7 +95,7 @@ static languageDefinition language_en = { whichPluralForm_en, { { STRING_PLAIN_TEXT, 0, "plain text" }, {/* For example, "replacing invalid UTF-8 bytes" */ STRING_REPLACING, 0, "replacing" - }, + }, {/* For example, "you should avoid using the specified encoding." */ STRING_SPECIFIED, 0, "specified" }, @@ -131,7 +131,7 @@ static languageDefinition language_en = { whichPluralForm_en, { "as of February 1998 few browsers support the new entities.\n\n" }, {/* This console output should be limited to 78 characters per line. - - %s represents a string-encoding name which may be localized in your language. */ + - %s represents a string-encoding name which may be localized in your language. */ TEXT_VENDOR_CHARS, 0, "It is unlikely that vendor-specific, system-dependent encodings\n" "work widely enough on the World Wide Web; you should avoid using the \n" @@ -140,8 +140,8 @@ static languageDefinition language_en = { whichPluralForm_en, { "\n" }, {/* This console output should be limited to 78 characters per line. - - %s represents a string-encoding name which may be localized in your language. - - The strings "Tidy" and "HTML Tidy" are the program name and must not be translated. */ + - %s represents a string-encoding name which may be localized in your language. + - The strings "Tidy" and "HTML Tidy" are the program name and must not be translated. */ TEXT_SGML_CHARS, 0, "Character codes 128 to 159 (U+0080 to U+009F) are not allowed in HTML;\n" "even if they were, they would likely be unprintable control characters.\n" @@ -172,7 +172,7 @@ static languageDefinition language_en = { whichPluralForm_en, { "\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. */ + - The strings "Tidy" and "HTML Tidy" are the program name and must not be translated. */ TEXT_INVALID_URI, 0, "URIs must be properly escaped, they must not contain unescaped\n" "characters below U+0021 including the space character and not\n" @@ -247,7 +247,7 @@ static languageDefinition language_en = { whichPluralForm_en, { "see http://www.w3.org/WAI/GL" }, {/* 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. */ + - The URL should not be translated unless you find a matching URL in your language. */ TEXT_ACCESS_ADVICE2, 0, " and http://www.html-tidy.org/accessibility/" }, @@ -592,9 +592,9 @@ static languageDefinition language_en = { whichPluralForm_en, { ** Note that the xslt processor requires
to be self closing! *********************************************************************/ {/* Please use _only_ , , , and
. - It's very important that
be self-closing in this manner! + It's very important that
be self-closing in this manner! - The strings "Tidy" and "HTML Tidy" are the program name and must not be translated. */ - TidyXmlDecl, 0, + TidyXmlDecl, 0, "This option specifies if Tidy should add the XML declaration when " "outputting XML or XHTML. " "
" @@ -606,9 +606,9 @@ static languageDefinition language_en = { whichPluralForm_en, { "as required by the XML standard. " }, {/* Please use _only_ , , , and
. - It's very important that
be self-closing in this manner! + It's very important that
be self-closing in this manner! - The strings "Tidy" and "HTML Tidy" are the program name and must not be translated.*/ - TidyXmlSpace, 0, + TidyXmlSpace, 0, "This option specifies if Tidy should add " "xml:space=\"preserve\" to elements such as " "<pre>, <style> and " @@ -618,9 +618,9 @@ static languageDefinition language_en = { whichPluralForm_en, { "be parsed appropriately without having access to the DTD. " }, {/* Please use _only_ , , , and
. - It's very important that
be self-closing in this manner! + It's very important that
be self-closing in this manner! - The strings "Tidy" and "HTML Tidy" are the program name and must not be translated. */ - TidyAltText, 0, + TidyAltText, 0, "This option specifies the default alt= text Tidy uses for " "<img> attributes when the alt= attribute " "is missing. " @@ -629,9 +629,9 @@ static languageDefinition language_en = { whichPluralForm_en, { "to people who cannot see the images. " }, {/* Please use _only_ , , , and
. - It's very important that
be self-closing in this manner! + It's very important that
be self-closing in this manner! - The strings "Tidy" and "HTML Tidy" are the program name and must not be translated. */ - TidyXmlPIs, 0, + TidyXmlPIs, 0, "This option specifies if Tidy should change the parsing of processing " "instructions to require ?> as the terminator rather than " ">. " @@ -639,25 +639,25 @@ static languageDefinition language_en = { whichPluralForm_en, { "This option is automatically set if the input is in XML. " }, {/* Please use _only_ , , , and
. - It's very important that
be self-closing in this manner! + It's very important that
be self-closing in this manner! - The strings "Tidy" and "HTML Tidy" are the program name and must not be translated. */ - TidyMakeBare, 0, + TidyMakeBare, 0, "This option specifies if Tidy should strip Microsoft specific HTML " "from Word 2000 documents, and output spaces rather than non-breaking " "spaces where they exist in the input. " }, {/* Please use _only_ , , , and
. - It's very important that
be self-closing in this manner! + It's very important that
be self-closing in this manner! - The strings "Tidy" and "HTML Tidy" are the program name and must not be translated. */ - TidyCSSPrefix, 0, + TidyCSSPrefix, 0, "This option specifies the prefix that Tidy uses for styles rules. " "
" "By default, c will be used. " }, {/* Please use _only_ , , , and
. - It's very important that
be self-closing in this manner! + It's very important that
be self-closing in this manner! - The strings "Tidy" and "HTML Tidy" are the program name and must not be translated. */ - TidyMakeClean, 0, + TidyMakeClean, 0, "This option specifies if Tidy should perform cleaning of some legacy " "presentational tags (currently <i>, " "<b>, <center> when enclosed within " @@ -666,16 +666,16 @@ static languageDefinition language_en = { whichPluralForm_en, { "<style> tags and structural markup as appropriate. " }, {/* Please use _only_ , , , and
. - It's very important that
be self-closing in this manner! + It's very important that
be self-closing in this manner! - The strings "Tidy" and "HTML Tidy" are the program name and must not be translated. */ - TidyGDocClean, 0, + TidyGDocClean, 0, "This option specifies if Tidy should enable specific behavior for " "cleaning up HTML exported from Google Docs. " }, {/* Please use _only_ , , , and
. - It's very important that
be self-closing in this manner! + It's very important that
be self-closing in this manner! - The strings "Tidy" and "HTML Tidy" are the program name and must not be translated. */ - TidyDoctype, 0, + TidyDoctype, 0, "This option specifies the DOCTYPE declaration generated by Tidy. " "
" "If set to omit the output won't contain a DOCTYPE " @@ -710,21 +710,21 @@ static languageDefinition language_en = { whichPluralForm_en, { "This option does not offer a validation of document conformance. " }, {/* Please use _only_ , , , and
. - It's very important that
be self-closing in this manner! + It's very important that
be self-closing in this manner! - The strings "Tidy" and "HTML Tidy" are the program name and must not be translated. */ - TidyDropEmptyElems, 0, + TidyDropEmptyElems, 0, "This option specifies if Tidy should discard empty elements. " }, {/* Please use _only_ , , , and
. - It's very important that
be self-closing in this manner! + It's very important that
be self-closing in this manner! - The strings "Tidy" and "HTML Tidy" are the program name and must not be translated. */ - TidyDropEmptyParas, 0, + TidyDropEmptyParas, 0, "This option specifies if Tidy should discard empty paragraphs. " }, {/* Please use _only_ , , , and
. - It's very important that
be self-closing in this manner! + It's very important that
be self-closing in this manner! - The strings "Tidy" and "HTML Tidy" are the program name and must not be translated. */ - TidyDropFontTags, 0, + TidyDropFontTags, 0, "Deprecated; do not use. This option is destructive to " "<font> tags, and it will be removed from future " "versions of Tidy. Use the clean option instead. " @@ -741,24 +741,24 @@ static languageDefinition language_en = { whichPluralForm_en, { "See clean for more information. " }, {/* Please use _only_ , , , and
. - It's very important that
be self-closing in this manner! + It's very important that
be self-closing in this manner! - The strings "Tidy" and "HTML Tidy" are the program name and must not be translated. */ - TidyDropPropAttrs, 0, + TidyDropPropAttrs, 0, "This option specifies if Tidy should strip out proprietary attributes, " "such as Microsoft data binding attributes. " }, {/* Please use _only_ , , , and
. - It's very important that
be self-closing in this manner! + It's very important that
be self-closing in this manner! - The strings "Tidy" and "HTML Tidy" are the program name and must not be translated. */ - TidyEncloseBlockText, 0, + TidyEncloseBlockText, 0, "This option specifies if Tidy should insert a <p> " "element to enclose any text it finds in any element that allows mixed " "content for HTML transitional but not HTML strict. " }, {/* Please use _only_ , , , and
. - It's very important that
be self-closing in this manner! + It's very important that
be self-closing in this manner! - The strings "Tidy" and "HTML Tidy" are the program name and must not be translated. */ - TidyEncloseBodyText, 0, + TidyEncloseBodyText, 0, "This option specifies if Tidy should enclose any text it finds in the " "body element within a <p> element." "
" @@ -766,16 +766,16 @@ static languageDefinition language_en = { whichPluralForm_en, { "style sheet. " }, {/* Please use _only_ , , , and
. - It's very important that
be self-closing in this manner! + It's very important that
be self-closing in this manner! - The strings "Tidy" and "HTML Tidy" are the program name and must not be translated. */ - TidyEscapeCdata, 0, + TidyEscapeCdata, 0, "This option specifies if Tidy should convert " "<![CDATA[]]> sections to normal text. " }, {/* Please use _only_ , , , and
. - It's very important that
be self-closing in this manner! + It's very important that
be self-closing in this manner! - The strings "Tidy" and "HTML Tidy" are the program name and must not be translated. */ - TidyFixComments, 0, + TidyFixComments, 0, "This option specifies if Tidy should replace unexpected hyphens with " "= characters when it comes across adjacent hyphens. " "
" @@ -785,23 +785,23 @@ static languageDefinition language_en = { whichPluralForm_en, { "comment syntax: <!--- --->. " }, {/* Please use _only_ , , , and
. - It's very important that
be self-closing in this manner! + It's very important that
be self-closing in this manner! - The strings "Tidy" and "HTML Tidy" are the program name and must not be translated. */ - TidyFixUri, 0, + TidyFixUri, 0, "This option specifies if Tidy should check attribute values that carry " "URIs for illegal characters and if such are found, escape them as HTML4 " "recommends. " }, {/* Please use _only_ , , , and
. - It's very important that
be self-closing in this manner! + It's very important that
be self-closing in this manner! - The strings "Tidy" and "HTML Tidy" are the program name and must not be translated. */ - TidyHideComments, 0, + TidyHideComments, 0, "This option specifies if Tidy should print out comments. " }, {/* Please use _only_ , , , and
. - It's very important that
be self-closing in this manner! + It's very important that
be self-closing in this manner! - The strings "Tidy" and "HTML Tidy" are the program name and must not be translated. */ - TidyCoerceEndTags, 0, + TidyCoerceEndTags, 0, "This option specifies if Tidy should coerce a start tag into an end tag " "in cases where it looks like an end tag was probably intended; " "for example, given " @@ -813,9 +813,9 @@ static languageDefinition language_en = { whichPluralForm_en, { "<span>foo <b>bar</b> baz</span> " }, {/* Please use _only_ , , , and
. - It's very important that
be self-closing in this manner! + It's very important that
be self-closing in this manner! - The strings "Tidy" and "HTML Tidy" are the program name and must not be translated. */ - TidyOmitOptionalTags, 0, + TidyOmitOptionalTags, 0, "This option specifies if Tidy should omit optional start tags and end tags " "when generating output. " "
" @@ -830,44 +830,44 @@ static languageDefinition language_en = { whichPluralForm_en, { "This option is ignored for XML output. " }, {/* Please use _only_ , , , and
. - It's very important that
be self-closing in this manner! + It's very important that
be self-closing in this manner! - The strings "Tidy" and "HTML Tidy" are the program name and must not be translated. */ - TidyHideEndTags, 0, + TidyHideEndTags, 0, "This option is an alias for omit-optional-tags. " }, {/* Please use _only_ , , , and
. - It's very important that
be self-closing in this manner! + It's very important that
be self-closing in this manner! - The strings "Tidy" and "HTML Tidy" are the program name and must not be translated. */ - TidyIndentCdata, 0, + TidyIndentCdata, 0, "This option specifies if Tidy should indent " "<![CDATA[]]> sections. " }, {/* Please use _only_ , , , and
. - It's very important that
be self-closing in this manner! + It's very important that
be self-closing in this manner! - The strings "Tidy" and "HTML Tidy" are the program name and must not be translated. */ - TidyXmlTags, 0, + TidyXmlTags, 0, "This option specifies if Tidy should use the XML parser rather than the " "error correcting HTML parser. " }, {/* Please use _only_ , , , and
. - It's very important that
be self-closing in this manner! + It's very important that
be self-closing in this manner! - The strings "Tidy" and "HTML Tidy" are the program name and must not be translated. */ - TidyJoinClasses, 0, + TidyJoinClasses, 0, "This option specifies if Tidy should combine class names to generate " "a single, new class name if multiple class assignments are detected on " "an element. " }, {/* Please use _only_ , , , and
. - It's very important that
be self-closing in this manner! + It's very important that
be self-closing in this manner! - The strings "Tidy" and "HTML Tidy" are the program name and must not be translated. */ - TidyJoinStyles, 0, + TidyJoinStyles, 0, "This option specifies if Tidy should combine styles to generate a single, " "new style if multiple style values are detected on an element. " }, {/* Please use _only_ , , , and
. - It's very important that
be self-closing in this manner! + It's very important that
be self-closing in this manner! - The strings "Tidy" and "HTML Tidy" are the program name and must not be translated. */ - TidyLogicalEmphasis, 0, + TidyLogicalEmphasis, 0, "This option specifies if Tidy should replace any occurrence of " "<i> with <em> and any occurrence of " "<b> with <strong>. Any attributes " @@ -876,18 +876,18 @@ static languageDefinition language_en = { whichPluralForm_en, { "This option can be set independently of the clean option. " }, {/* Please use _only_ , , , and
. - It's very important that
be self-closing in this manner! + It's very important that
be self-closing in this manner! - The strings "Tidy" and "HTML Tidy" are the program name and must not be translated. */ - TidyLowerLiterals, 0, + TidyLowerLiterals, 0, "This option specifies if Tidy should convert the value of an attribute " "that takes a list of predefined values to lower case. " "
" "This is required for XHTML documents. " }, {/* Please use _only_ , , , and
. - It's very important that
be self-closing in this manner! + It's very important that
be self-closing in this manner! - The strings "Tidy" and "HTML Tidy" are the program name and must not be translated. */ - TidyMergeEmphasis, 0, + TidyMergeEmphasis, 0, "This option specifies if Tidy should merge nested <b> " "and <i> elements; for example, for the case " "
" @@ -896,9 +896,9 @@ static languageDefinition language_en = { whichPluralForm_en, { "Tidy will output <b class=\"rtop-2\">foo bar baz</b>. " }, {/* Please use _only_ , , , and
. - It's very important that
be self-closing in this manner! + It's very important that
be self-closing in this manner! - The strings "Tidy" and "HTML Tidy" are the program name and must not be translated. */ - TidyMergeDivs, 0, + TidyMergeDivs, 0, "This option can be used to modify the behavior of clean when " "set to yes." "
" @@ -915,9 +915,9 @@ static languageDefinition language_en = { whichPluralForm_en, { "class and style. " }, {/* Please use _only_ , , , and
. - It's very important that
be self-closing in this manner! + It's very important that
be self-closing in this manner! - The strings "Tidy" and "HTML Tidy" are the program name and must not be translated. */ - TidyMergeSpans, 0, + TidyMergeSpans, 0, "This option can be used to modify the behavior of clean when " "set to yes." "
" @@ -928,16 +928,16 @@ static languageDefinition language_en = { whichPluralForm_en, { }, #if SUPPORT_ASIAN_ENCODINGS {/* Please use _only_ , , , and
. - It's very important that
be self-closing in this manner! + It's very important that
be self-closing in this manner! - The strings "Tidy" and "HTML Tidy" are the program name and must not be translated. */ - TidyNCR, 0, + TidyNCR, 0, "This option specifies if Tidy should allow numeric character references. " }, #endif {/* Please use _only_ , , , and
. - It's very important that
be self-closing in this manner! + It's very important that
be self-closing in this manner! - The strings "Tidy" and "HTML Tidy" are the program name and must not be translated. */ - TidyBlockTags, 0, + TidyBlockTags, 0, "This option specifies new block-level tags. This option takes a space or " "comma separated list of tag names. " "
" @@ -951,9 +951,9 @@ static languageDefinition language_en = { whichPluralForm_en, { "This option is ignored in XML mode. " }, {/* Please use _only_ , , , and
. - It's very important that
be self-closing in this manner! + It's very important that
be self-closing in this manner! - The strings "Tidy" and "HTML Tidy" are the program name and must not be translated. */ - TidyEmptyTags, 0, + TidyEmptyTags, 0, "This option specifies new empty inline tags. This option takes a space " "or comma separated list of tag names. " "
" @@ -965,9 +965,9 @@ static languageDefinition language_en = { whichPluralForm_en, { "This option is ignored in XML mode. " }, {/* Please use _only_ , , , and
. - It's very important that
be self-closing in this manner! + It's very important that
be self-closing in this manner! - The strings "Tidy" and "HTML Tidy" are the program name and must not be translated. */ - TidyInlineTags, 0, + TidyInlineTags, 0, "This option specifies new non-empty inline tags. This option takes a " "space or comma separated list of tag names. " "
" @@ -977,9 +977,9 @@ static languageDefinition language_en = { whichPluralForm_en, { "This option is ignored in XML mode. " }, {/* Please use _only_ , , , and
. - It's very important that
be self-closing in this manner! + It's very important that
be self-closing in this manner! - The strings "Tidy" and "HTML Tidy" are the program name and must not be translated. */ - TidyPreTags, 0, + TidyPreTags, 0, "This option specifies new tags that are to be processed in exactly the " "same way as HTML's <pre> element. This option takes a " "space or comma separated list of tag names. " @@ -992,9 +992,9 @@ static languageDefinition language_en = { whichPluralForm_en, { "This option is ignored in XML mode. " }, {/* Please use _only_ , , , and
. - It's very important that
be self-closing in this manner! + It's very important that
be self-closing in this manner! - The strings "Tidy" and "HTML Tidy" are the program name and must not be translated. */ - TidyNumEntities, 0, + TidyNumEntities, 0, "This option specifies if Tidy should output entities other than the " "built-in HTML entities (&amp;, &lt;, " "&gt;, and &quot;) in the numeric rather " @@ -1006,16 +1006,16 @@ static languageDefinition language_en = { whichPluralForm_en, { "correspondingly. " }, {/* Please use _only_ , , , and
. - It's very important that
be self-closing in this manner! + It's very important that
be self-closing in this manner! - The strings "Tidy" and "HTML Tidy" are the program name and must not be translated. */ - TidyHtmlOut, 0, + TidyHtmlOut, 0, "This option specifies if Tidy should generate pretty printed output, " "writing it as HTML. " }, {/* Please use _only_ , , , and
. - It's very important that
be self-closing in this manner! + It's very important that
be self-closing in this manner! - The strings "Tidy" and "HTML Tidy" are the program name and must not be translated. */ - TidyXhtmlOut, 0, + TidyXhtmlOut, 0, "This option specifies if Tidy should generate pretty printed output, " "writing it as extensible HTML. " "
" @@ -1030,9 +1030,9 @@ static languageDefinition language_en = { whichPluralForm_en, { "other options. " }, {/* Please use _only_ , , , and
. - It's very important that
be self-closing in this manner! + It's very important that
be self-closing in this manner! - The strings "Tidy" and "HTML Tidy" are the program name and must not be translated. */ - TidyXmlOut, 0, + TidyXmlOut, 0, "This option specifies if Tidy should pretty print output, writing it as " "well-formed XML. " "
" @@ -1043,16 +1043,16 @@ static languageDefinition language_en = { whichPluralForm_en, { "other options. " }, {/* Please use _only_ , , , and
. - It's very important that
be self-closing in this manner! + It's very important that
be self-closing in this manner! - The strings "Tidy" and "HTML Tidy" are the program name and must not be translated. */ - TidyQuoteAmpersand, 0, + TidyQuoteAmpersand, 0, "This option specifies if Tidy should output unadorned & " "characters as &amp;. " }, {/* Please use _only_ , , , and
. - It's very important that
be self-closing in this manner! + It's very important that
be self-closing in this manner! - The strings "Tidy" and "HTML Tidy" are the program name and must not be translated. */ - TidyQuoteMarks, 0, + TidyQuoteMarks, 0, "This option specifies if Tidy should output " characters " "as &quot; as is preferred by some editing environments. " "
" @@ -1061,39 +1061,39 @@ static languageDefinition language_en = { whichPluralForm_en, { "&apos;. " }, {/* Please use _only_ , , , and
. - It's very important that
be self-closing in this manner! + It's very important that
be self-closing in this manner! - The strings "Tidy" and "HTML Tidy" are the program name and must not be translated. */ - TidyQuoteNbsp, 0, + TidyQuoteNbsp, 0, "This option specifies if Tidy should output non-breaking space characters " "as entities, rather than as the Unicode character value 160 (decimal). " }, {/* Please use _only_ , , , and
. - It's very important that
be self-closing in this manner! + It's very important that
be self-closing in this manner! - The strings "Tidy" and "HTML Tidy" are the program name and must not be translated. */ - TidyDuplicateAttrs, 0, + TidyDuplicateAttrs, 0, "This option specifies if Tidy should keep the first or last attribute, if " "an attribute is repeated, e.g. has two align attributes. " }, {/* Please use _only_ , , , and
. - It's very important that
be self-closing in this manner! + It's very important that
be self-closing in this manner! - The strings "Tidy" and "HTML Tidy" are the program name and must not be translated. */ - TidySortAttributes, 0, + TidySortAttributes, 0, "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. " }, {/* Please use _only_ , , , and
. - It's very important that
be self-closing in this manner! + It's very important that
be self-closing in this manner! - The strings "Tidy" and "HTML Tidy" are the program name and must not be translated. */ - TidyReplaceColor, 0, + TidyReplaceColor, 0, "This option specifies if Tidy should replace numeric values in color " "attributes with HTML/XHTML color names where defined, e.g. replace " "#ffffff with white. " }, {/* Please use _only_ , , , and
. - It's very important that
be self-closing in this manner! + It's very important that
be self-closing in this manner! - The strings "Tidy" and "HTML Tidy" are the program name and must not be translated. */ - TidyBodyOnly, 0, + TidyBodyOnly, 0, "This option specifies if Tidy should print only the contents of the " "body tag as an HTML fragment. " "
" @@ -1106,9 +1106,9 @@ static languageDefinition language_en = { whichPluralForm_en, { "This option has no effect if XML output is requested. " }, {/* Please use _only_ , , , and
. - It's very important that
be self-closing in this manner! + It's very important that
be self-closing in this manner! - The strings "Tidy" and "HTML Tidy" are the program name and must not be translated. */ - TidyUpperCaseAttrs, 0, + TidyUpperCaseAttrs, 0, "This option specifies if Tidy should output attribute names in upper " "case. " "
" @@ -1116,18 +1116,18 @@ static languageDefinition language_en = { whichPluralForm_en, { "names, except for XML input, where the original case is preserved. " }, {/* Please use _only_ , , , and
. - It's very important that
be self-closing in this manner! + It's very important that
be self-closing in this manner! - The strings "Tidy" and "HTML Tidy" are the program name and must not be translated. */ - TidyUpperCaseTags, 0, + TidyUpperCaseTags, 0, "This option specifies if Tidy should output tag names in upper case. " "
" "The default is no which results in lower case tag names, " "except for XML input where the original case is preserved. " }, {/* Please use _only_ , , , and
. - It's very important that
be self-closing in this manner! + It's very important that
be self-closing in this manner! - The strings "Tidy" and "HTML Tidy" are the program name and must not be translated. */ - TidyWord2000, 0, + TidyWord2000, 0, "This option specifies if Tidy should go to great pains to strip out all " "the surplus stuff Microsoft Word 2000 inserts when you save Word " "documents as \"Web pages\". It doesn't handle embedded images or VML. " @@ -1135,9 +1135,9 @@ static languageDefinition language_en = { whichPluralForm_en, { "You should consider using Word's \"Save As: Web Page, Filtered\". " }, {/* Please use _only_ , , , and
. - It's very important that
be self-closing in this manner! + It's very important that
be self-closing in this manner! - The strings "Tidy" and "HTML Tidy" are the program name and must not be translated. */ - TidyAccessibilityCheckLevel, 0, + TidyAccessibilityCheckLevel, 0, "This option specifies what level of accessibility checking, if any, " "that Tidy should perform. " "
" @@ -1148,36 +1148,36 @@ static languageDefinition language_en = { whichPluralForm_en, { " Tidy's Accessibility Page. " }, {/* Please use _only_ , , , and
. - It's very important that
be self-closing in this manner! + It's very important that
be self-closing in this manner! - The strings "Tidy" and "HTML Tidy" are the program name and must not be translated. */ - TidyShowErrors, 0, + TidyShowErrors, 0, "This option specifies the number Tidy uses to determine if further errors " "should be shown. If set to 0, then no errors are shown. " }, {/* Please use _only_ , , , and
. - It's very important that
be self-closing in this manner! + It's very important that
be self-closing in this manner! - The strings "Tidy" and "HTML Tidy" are the program name and must not be translated. */ - TidyShowInfo, 0, + TidyShowInfo, 0, "This option specifies if Tidy should display info-level messages. " }, {/* Please use _only_ , , , and
. - It's very important that
be self-closing in this manner! + It's very important that
be self-closing in this manner! - The strings "Tidy" and "HTML Tidy" are the program name and must not be translated. */ - TidyShowWarnings, 0, + TidyShowWarnings, 0, "This option specifies if Tidy should suppress warnings. This can be " "useful when a few errors are hidden in a flurry of warnings. " }, {/* Please use _only_ , , , and
. - It's very important that
be self-closing in this manner! + It's very important that
be self-closing in this manner! - The strings "Tidy" and "HTML Tidy" are the program name and must not be translated. */ - TidyBreakBeforeBR, 0, + TidyBreakBeforeBR, 0, "This option specifies if Tidy should output a line break before each " "<br> element. " }, {/* Please use _only_ , , , and
. - It's very important that
be self-closing in this manner! + It's very important that
be self-closing in this manner! - The strings "Tidy" and "HTML Tidy" are the program name and must not be translated. */ - TidyIndentContent, 0, + TidyIndentContent, 0, "This option specifies if Tidy should indent block-level tags. " "
" "If set to auto Tidy will decide whether or not to indent the " @@ -1194,15 +1194,15 @@ static languageDefinition language_en = { whichPluralForm_en, { "specify whether spaces or tabs are used. " }, {/* Please use _only_ , , , and
. - It's very important that
be self-closing in this manner! + It's very important that
be self-closing in this manner! - The strings "Tidy" and "HTML Tidy" are the program name and must not be translated. */ - TidyIndentAttributes, 0, + TidyIndentAttributes, 0, "This option specifies if Tidy should begin each attribute on a new line. " }, {/* Please use _only_ , , , and
. - It's very important that
be self-closing in this manner! + It's very important that
be self-closing in this manner! - The strings "Tidy" and "HTML Tidy" are the program name and must not be translated. */ - TidyIndentSpaces, 0, + TidyIndentSpaces, 0, "This option specifies the number of spaces or tabs that Tidy uses to " "indent content when indent is enabled. " "
" @@ -1210,9 +1210,9 @@ static languageDefinition language_en = { whichPluralForm_en, { "indent-with-tabs (see also). " }, {/* Please use _only_ , , , and
. - It's very important that
be self-closing in this manner! + It's very important that
be self-closing in this manner! - The strings "Tidy" and "HTML Tidy" are the program name and must not be translated. */ - TidyLiteralAttribs, 0, + TidyLiteralAttribs, 0, "This option specifies how Tidy deals with whitespace characters within " "attribute values. " "
" @@ -1225,40 +1225,40 @@ static languageDefinition language_en = { whichPluralForm_en, { "through unchanged, set this option to yes. " }, {/* Please use _only_ , , , and
. - It's very important that
be self-closing in this manner! + It's very important that
be self-closing in this manner! - The strings "Tidy" and "HTML Tidy" are the program name and must not be translated. */ - TidyShowMarkup, 0, + TidyShowMarkup, 0, "This option specifies if Tidy should generate a pretty printed version " "of the markup. Note that Tidy won't generate a pretty printed version if " "it finds significant errors (see force-output). " }, #if SUPPORT_ASIAN_ENCODINGS {/* Please use _only_ , , , and
. - It's very important that
be self-closing in this manner! + It's very important that
be self-closing in this manner! - The strings "Tidy" and "HTML Tidy" are the program name and must not be translated. */ - TidyPunctWrap, 0, + TidyPunctWrap, 0, "This option specifies if Tidy should line wrap after some Unicode or " "Chinese punctuation characters. " }, #endif {/* Please use _only_ , , , and
. - It's very important that
be self-closing in this manner! + It's very important that
be self-closing in this manner! - The strings "Tidy" and "HTML Tidy" are the program name and must not be translated. */ - TidyBurstSlides, 0, + TidyBurstSlides, 0, "This option has no function and is deprecated. " }, {/* Please use _only_ , , , and
. - It's very important that
be self-closing in this manner! + It's very important that
be self-closing in this manner! - The strings "Tidy" and "HTML Tidy" are the program name and must not be translated. */ - TidyTabSize, 0, + TidyTabSize, 0, "This option specifies the number of columns that Tidy uses between " "successive tab stops. It is used to map tabs to spaces when reading the " "input. " }, {/* Please use _only_ , , , and
. - It's very important that
be self-closing in this manner! + It's very important that
be self-closing in this manner! - The strings "Tidy" and "HTML Tidy" are the program name and must not be translated. */ - TidyVertSpace, 0, + TidyVertSpace, 0, "This option specifies if Tidy should add some extra empty lines for " "readability. " "
" @@ -1268,9 +1268,9 @@ static languageDefinition language_en = { whichPluralForm_en, { "characters." }, {/* Please use _only_ , , , and
. - It's very important that
be self-closing in this manner! + It's very important that
be self-closing in this manner! - The strings "Tidy" and "HTML Tidy" are the program name and must not be translated. */ - TidyWrapLen, 0, + TidyWrapLen, 0, "This option specifies the right margin Tidy uses for line wrapping. " "
" "Tidy tries to wrap lines so that they do not exceed this length. " @@ -1279,16 +1279,16 @@ static languageDefinition language_en = { whichPluralForm_en, { "wrapping. " }, {/* Please use _only_ , , , and
. - It's very important that
be self-closing in this manner! + It's very important that
be self-closing in this manner! - The strings "Tidy" and "HTML Tidy" are the program name and must not be translated. */ - TidyWrapAsp, 0, + TidyWrapAsp, 0, "This option specifies if Tidy should line wrap text contained within ASP " "pseudo elements, which look like: <% ... %>. " }, {/* Please use _only_ , , , and
. - It's very important that
be self-closing in this manner! + It's very important that
be self-closing in this manner! - The strings "Tidy" and "HTML Tidy" are the program name and must not be translated. */ - TidyWrapAttVals, 0, + TidyWrapAttVals, 0, "This option specifies if Tidy should line-wrap attribute values, meaning " "that if the value of an attribute causes a line to exceed the width " "specified by wrap, Tidy will add one or more line breaks to " @@ -1305,23 +1305,23 @@ static languageDefinition language_en = { whichPluralForm_en, { "yes. " }, {/* Please use _only_ , , , and
. - It's very important that
be self-closing in this manner! + It's very important that
be self-closing in this manner! - The strings "Tidy" and "HTML Tidy" are the program name and must not be translated. */ - TidyWrapJste, 0, + TidyWrapJste, 0, "This option specifies if Tidy should line wrap text contained within " "JSTE pseudo elements, which look like: <# ... #>. " }, {/* Please use _only_ , , , and
. - It's very important that
be self-closing in this manner! + It's very important that
be self-closing in this manner! - The strings "Tidy" and "HTML Tidy" are the program name and must not be translated. */ - TidyWrapPhp, 0, + TidyWrapPhp, 0, "This option specifies if Tidy should line wrap text contained within PHP " "pseudo elements, which look like: <?php ... ?>. " }, {/* Please use _only_ , , , and
. - It's very important that
be self-closing in this manner! + It's very important that
be self-closing in this manner! - The strings "Tidy" and "HTML Tidy" are the program name and must not be translated. */ - TidyWrapScriptlets, 0, + TidyWrapScriptlets, 0, "This option specifies if Tidy should line wrap string literals that " "appear in script attributes. " "
" @@ -1329,16 +1329,16 @@ static languageDefinition language_en = { whichPluralForm_en, { "before the line break. " }, {/* Please use _only_ , , , and
. - It's very important that
be self-closing in this manner! + It's very important that
be self-closing in this manner! - The strings "Tidy" and "HTML Tidy" are the program name and must not be translated. */ - TidyWrapSection, 0, + TidyWrapSection, 0, "This option specifies if Tidy should line wrap text contained within " "<![ ... ]> section tags. " }, {/* Please use _only_ , , , and
. - It's very important that
be self-closing in this manner! + It's very important that
be self-closing in this manner! - The strings "Tidy" and "HTML Tidy" are the program name and must not be translated. */ - TidyAsciiChars, 0, + TidyAsciiChars, 0, "Can be used to modify behavior of the clean option when set " "to yes. " "
" @@ -1347,9 +1347,9 @@ static languageDefinition language_en = { whichPluralForm_en, { "character entities are downgraded to their closest ASCII equivalents. " }, {/* Please use _only_ , , , and
. - It's very important that
be self-closing in this manner! + It's very important that
be self-closing in this manner! - The strings "Tidy" and "HTML Tidy" are the program name and must not be translated. */ - TidyCharEncoding, 0, + TidyCharEncoding, 0, "This option specifies the character encoding Tidy uses for both the input " "and output. " "
" @@ -1375,26 +1375,26 @@ static languageDefinition language_en = { whichPluralForm_en, { "UTF-8. " }, {/* Please use _only_ , , , and
. - It's very important that
be self-closing in this manner! + It's very important that
be self-closing in this manner! - The strings "Tidy" and "HTML Tidy" are the program name and must not be translated. */ - TidyInCharEncoding, 0, + TidyInCharEncoding, 0, "This option specifies the character encoding Tidy uses for the input. See " "char-encoding for more info. " }, #if SUPPORT_ASIAN_ENCODINGS {/* Please use _only_ , , , and
. - It's very important that
be self-closing in this manner! + It's very important that
be self-closing in this manner! - The strings "Tidy" and "HTML Tidy" are the program name and must not be translated. */ - TidyLanguage, 0, + TidyLanguage, 0, "Currently not used, but this option specifies the language Tidy would use " "if it were properly localized. For example: en. " }, #endif #if SUPPORT_UTF16_ENCODINGS {/* Please use _only_ , , , and
. - It's very important that
be self-closing in this manner! + It's very important that
be self-closing in this manner! - The strings "Tidy" and "HTML Tidy" are the program name and must not be translated. */ - TidyOutputBOM, 0, + TidyOutputBOM, 0, "This option specifies if Tidy should write a Unicode Byte Order Mark " "character (BOM; also known as Zero Width No-Break Space; has value of " "U+FEFF) to the beginning of the output, and only applies to UTF-8 and " @@ -1408,9 +1408,9 @@ static languageDefinition language_en = { whichPluralForm_en, { }, #endif {/* Please use _only_ , , , and
. - It's very important that
be self-closing in this manner! + It's very important that
be self-closing in this manner! - The strings "Tidy" and "HTML Tidy" are the program name and must not be translated. */ - TidyOutCharEncoding, 0, + TidyOutCharEncoding, 0, "This option specifies the character encoding Tidy uses for the output. " "
" "Note that this may only be different from input-encoding for " @@ -1421,32 +1421,32 @@ static languageDefinition language_en = { whichPluralForm_en, { "See char-encoding for more information" }, {/* Please use _only_ , , , and
. - It's very important that
be self-closing in this manner! + It's very important that
be self-closing in this manner! - The strings "Tidy" and "HTML Tidy" are the program name and must not be translated. */ - TidyNewline, 0, + TidyNewline, 0, "The default is appropriate to the current platform. " "
" "Genrally CRLF on PC-DOS, Windows and OS/2; CR on Classic Mac OS; and LF " "everywhere else (Linux, Mac OS X, and Unix). " }, {/* Please use _only_ , , , and
. - It's very important that
be self-closing in this manner! + It's very important that
be self-closing in this manner! - The strings "Tidy" and "HTML Tidy" are the program name and must not be translated. */ - TidyErrFile, 0, + TidyErrFile, 0, "This option specifies the error file Tidy uses for errors and warnings. " "Normally errors and warnings are output to stderr. " }, {/* Please use _only_ , , , and
. - It's very important that
be self-closing in this manner! + It's very important that
be self-closing in this manner! - The strings "Tidy" and "HTML Tidy" are the program name and must not be translated. */ - TidyFixBackslash, 0, + TidyFixBackslash, 0, "This option specifies if Tidy should replace backslash characters " "\\ in URLs with forward slashes /. " }, {/* Please use _only_ , , , and
. - It's very important that
be self-closing in this manner! + It's very important that
be self-closing in this manner! - The strings "Tidy" and "HTML Tidy" are the program name and must not be translated. */ - TidyForceOutput, 0, + TidyForceOutput, 0, "This option specifies if Tidy should produce output even if errors are " "encountered. " "
" @@ -1455,22 +1455,22 @@ static languageDefinition language_en = { whichPluralForm_en, { "resulting output may not reflect your intention. " }, {/* Please use _only_ , , , and
. - It's very important that
be self-closing in this manner! + It's very important that
be self-closing in this manner! - The strings "Tidy" and "HTML Tidy" are the program name and must not be translated. */ - TidyEmacs, 0, + TidyEmacs, 0, "This option specifies if Tidy should change the format for reporting " "errors and warnings to a format that is more easily parsed by GNU Emacs. " }, {/* Please use _only_ , , , and
. - It's very important that
be self-closing in this manner! + It's very important that
be self-closing in this manner! - The strings "Tidy" and "HTML Tidy" are the program name and must not be translated. */ - TidyEmacsFile, 0, + TidyEmacsFile, 0, "Used internally. " }, {/* Please use _only_ , , , and
. - It's very important that
be self-closing in this manner! + It's very important that
be self-closing in this manner! - The strings "Tidy" and "HTML Tidy" are the program name and must not be translated. */ - TidyKeepFileTimes, 0, + TidyKeepFileTimes, 0, "This option specifies if Tidy should keep the original modification time " "of files that Tidy modifies in place. " "
" @@ -1482,38 +1482,38 @@ static languageDefinition language_en = { whichPluralForm_en, { "Note this feature is not supported on some platforms. " }, {/* Please use _only_ , , , and
. - It's very important that
be self-closing in this manner! + It's very important that
be self-closing in this manner! - The strings "Tidy" and "HTML Tidy" are the program name and must not be translated. */ - TidyOutFile, 0, + TidyOutFile, 0, "This option specifies the output file Tidy uses for markup. Normally " "markup is written to stdout. " }, {/* Please use _only_ , , , and
. - It's very important that
be self-closing in this manner! + It's very important that
be self-closing in this manner! - The strings "Tidy" and "HTML Tidy" are the program name and must not be translated. */ - TidyQuiet, 0, + TidyQuiet, 0, "This option specifies if Tidy should output the summary of the numbers " "of errors and warnings, or the welcome or informational messages. " }, {/* Please use _only_ , , , and
. - It's very important that
be self-closing in this manner! + It's very important that
be self-closing in this manner! - The strings "Tidy" and "HTML Tidy" are the program name and must not be translated. */ - TidySlideStyle, 0, + TidySlideStyle, 0, "This option has no function and is deprecated. " }, {/* Please use _only_ , , , and
. - It's very important that
be self-closing in this manner! + It's very important that
be self-closing in this manner! - The strings "Tidy" and "HTML Tidy" are the program name and must not be translated. */ - TidyMark, 0, + TidyMark, 0, "This option specifies if Tidy should add a meta element to " "the document head to indicate that the document has been tidied. " "
" "Tidy won't add a meta element if one is already present. " }, {/* Please use _only_ , , , and
. - It's very important that
be self-closing in this manner! + It's very important that
be self-closing in this manner! - The strings "Tidy" and "HTML Tidy" are the program name and must not be translated. */ - TidyWriteBack, 0, + TidyWriteBack, 0, "This option specifies if Tidy should write back the tidied markup to the " "same file it read from. " "
" @@ -1521,24 +1521,24 @@ static languageDefinition language_en = { whichPluralForm_en, { "on rare occasions the result may not be what you expect. " }, {/* Please use _only_ , , , and
. - It's very important that
be self-closing in this manner! + It's very important that
be self-closing in this manner! - The strings "Tidy" and "HTML Tidy" are the program name and must not be translated. */ - TidyDecorateInferredUL, 0, + TidyDecorateInferredUL, 0, "This option specifies if Tidy should decorate inferred " "<ul> elements with some CSS markup to avoid indentation " "to the right. " }, {/* Please use _only_ , , , and
. - It's very important that
be self-closing in this manner! + It's very important that
be self-closing in this manner! - The strings "Tidy" and "HTML Tidy" are the program name and must not be translated. */ - TidyPreserveEntities, 0, + TidyPreserveEntities, 0, "This option specifies if Tidy should preserve well-formed entities " "as found in the input. " }, {/* Please use _only_ , , , and
. - It's very important that
be self-closing in this manner! + It's very important that
be self-closing in this manner! - The strings "Tidy" and "HTML Tidy" are the program name and must not be translated. */ - TidyAnchorAsName, 0, + TidyAnchorAsName, 0, "This option controls the deletion or addition of the name " "attribute in elements where it can serve as anchor. " "
" @@ -1550,9 +1550,9 @@ static languageDefinition language_en = { whichPluralForm_en, { "id attribute exists or has been added. " }, {/* Please use _only_ , , , and
. - It's very important that
be self-closing in this manner! + It's very important that
be self-closing in this manner! - The strings "Tidy" and "HTML Tidy" are the program name and must not be translated. */ - TidyPPrintTabs, 0, + TidyPPrintTabs, 0, "This option specifies if Tidy should indent with tabs instead of spaces, " "assuming indent is yes. " "
" @@ -1568,9 +1568,9 @@ static languageDefinition language_en = { whichPluralForm_en, { "it to zero to retain input tabs. " }, {/* Please use _only_ , , , and
. - It's very important that
be self-closing in this manner! + It's very important that
be self-closing in this manner! - The strings "Tidy" and "HTML Tidy" are the program name and must not be translated. */ - TidySkipNested, 0, + TidySkipNested, 0, "This option specifies that Tidy should skip nested tags when parsing " "script and style data. " }, @@ -1703,7 +1703,7 @@ static languageDefinition language_en = { whichPluralForm_en, { }, {/* This console output should be limited to 78 characters per line. - - %n represents the name of the executable from the file system, and is mostly like going to be "tidy". + - %n represents the name of the executable from the file system, and is mostly like going to be "tidy". - %2 represents a version number, typically x.x.xx. - The strings "Tidy" and "HTML Tidy" are the program name and must not be translated. */ TC_TXT_HELP_1, 0, diff --git a/src/language_en_gb.h b/src/language_en_gb.h index 7592104..ce3cee4 100644 --- a/src/language_en_gb.h +++ b/src/language_en_gb.h @@ -4,14 +4,22 @@ * language_en_gb.h * Localization support for HTML Tidy. * - * THIS FILE IS MACHINE GENERATED. It is a localization file for the - * language (and maybe region) "en_gb" and it should not be - * edited manually. The source of these strings is a gettext PO file, - * probably called "language_en_gb.po" in Tidy's source. * - * Tidy's source distribution also includes a script to convert PO files - * into this file. Because PO files are friendly to translators and a - * standard industry tool, please translate ONLY the PO files. + * This file is a localization file for HTML Tidy. It will have been machine + * generated or created and/or edited by hand. Both are valid options, but + * please help keep our localization efforts simple to maintain by maintaining + * the structure of this file, and changing the check box below if you make + * changes (so others know the file origin): + * + * [X] THIS FILE IS MACHINE GENERATED. It is a localization file for the + * language (and maybe region) "en_gb". The source of + * these strings is a gettext PO file in Tidy's source, probably called + * "language_en_gb.po". + * + * [ ] THIS FILE WAS HAND MODIFIED. Translators, please feel to edit this file + * directly (and check this box). If you prefer to edit PO files then use + * `poconvert.rb msgunfmt language_en_gb.h` (our own + * conversion tool) to generate a fresh PO from this file first! * * (c) 2015 HTACG * See tidy.h and access.h for the copyright notice. @@ -20,7 +28,7 @@ * * Orginating PO file metadata: * PO_LAST_TRANSLATOR=jderry - * PO_REVISION_DATE=2016-01-26 14:38:30 + * PO_REVISION_DATE=2016-01-29 10:54:42 */ #ifdef _MSC_VER @@ -38,8 +46,8 @@ * definition. */ static uint whichPluralForm_en_gb(uint n) { - /* Plural-Forms: nplurals=2; */ - return n != 1; + /* Plural-Forms: nplurals=2; */ + return n != 1; } @@ -50,10 +58,10 @@ static uint whichPluralForm_en_gb(uint n) { * the build system. */ static languageDefinition language_en_gb = { whichPluralForm_en_gb, { - /*************************************** - ** This MUST be present and first. - ** Specify the code for this language. - ***************************************/ + /*************************************** + ** This MUST be present and first. + ** Specify the code for this language. + ***************************************/ {/* Specify the ll or ll_cc language code here. */ TIDY_LANGUAGE, 0, "en_gb" }, @@ -89,7 +97,7 @@ static languageDefinition language_en_gb = { whichPluralForm_en_gb, { #endif /* SUPPORT_ACCESSIBILITY_CHECKS */ {/* Please use _only_ , , , and
. - It's very important that
be self-closing in this manner! + It's very important that
be self-closing in this manner! - The strings "Tidy" and "HTML Tidy" are the program name and must not be translated. */ TidyMergeDivs, 0, "This option can be used to modify the behaviour of clean when " @@ -108,7 +116,7 @@ static languageDefinition language_en_gb = { whichPluralForm_en_gb, { "class and style. " }, {/* Please use _only_ , , , and
. - It's very important that
be self-closing in this manner! + It's very important that
be self-closing in this manner! - The strings "Tidy" and "HTML Tidy" are the program name and must not be translated. */ TidyMergeSpans, 0, "This option can be used to modify the behaviour of clean when " @@ -120,7 +128,7 @@ static languageDefinition language_en_gb = { whichPluralForm_en_gb, { "The algorithm is identical to the one used by merge-divs. " }, {/* Please use _only_ , , , and
. - It's very important that
be self-closing in this manner! + It's very important that
be self-closing in this manner! - The strings "Tidy" and "HTML Tidy" are the program name and must not be translated. */ TidyReplaceColor, 0, "This option specifies if Tidy should replace numeric values in colour " diff --git a/src/language_es.h b/src/language_es.h index 44d9f0e..b58faf5 100644 --- a/src/language_es.h +++ b/src/language_es.h @@ -4,14 +4,22 @@ * language_es.h * Localization support for HTML Tidy. * - * THIS FILE IS MACHINE GENERATED. It is a localization file for the - * language (and maybe region) "es" and it should not be - * edited manually. The source of these strings is a gettext PO file, - * probably called "language_es.po" in Tidy's source. * - * Tidy's source distribution also includes a script to convert PO files - * into this file. Because PO files are friendly to translators and a - * standard industry tool, please translate ONLY the PO files. + * This file is a localization file for HTML Tidy. It will have been machine + * generated or created and/or edited by hand. Both are valid options, but + * please help keep our localization efforts simple to maintain by maintaining + * the structure of this file, and changing the check box below if you make + * changes (so others know the file origin): + * + * [X] THIS FILE IS MACHINE GENERATED. It is a localization file for the + * language (and maybe region) "es". The source of + * these strings is a gettext PO file in Tidy's source, probably called + * "language_es.po". + * + * [ ] THIS FILE WAS HAND MODIFIED. Translators, please feel to edit this file + * directly (and check this box). If you prefer to edit PO files then use + * `poconvert.rb msgunfmt language_es.h` (our own + * conversion tool) to generate a fresh PO from this file first! * * (c) 2015 HTACG * See tidy.h and access.h for the copyright notice. @@ -20,7 +28,7 @@ * * Orginating PO file metadata: * PO_LAST_TRANSLATOR=jderry - * PO_REVISION_DATE=2016-01-26 14:38:30 + * PO_REVISION_DATE=2016-01-29 10:54:42 */ #ifdef _MSC_VER @@ -38,8 +46,8 @@ * definition. */ static uint whichPluralForm_es(uint n) { - /* Plural-Forms: nplurals=2; */ - return n != 1; + /* Plural-Forms: nplurals=2; */ + return n != 1; } @@ -50,10 +58,10 @@ static uint whichPluralForm_es(uint n) { * the build system. */ static languageDefinition language_es = { whichPluralForm_es, { - /*************************************** - ** This MUST be present and first. - ** Specify the code for this language. - ***************************************/ + /*************************************** + ** This MUST be present and first. + ** Specify the code for this language. + ***************************************/ {/* Specify the ll or ll_cc language code here. */ TIDY_LANGUAGE, 0, "es" }, @@ -66,7 +74,7 @@ static languageDefinition language_es = { whichPluralForm_es, { "https://github.com/htacg/tidy-html5/blob/master/README/LOCALIZE.md \n" }, {/* Please use _only_ , , , and
. - It's very important that
be self-closing in this manner! + It's very important that
be self-closing in this manner! - The strings "Tidy" and "HTML Tidy" are the program name and must not be translated. */ TidyMakeClean, 0, "Esta opción especifica si Tidy debe realizar la limpieza de algún legado etiquetas de " @@ -78,7 +86,7 @@ static languageDefinition language_es = { whichPluralForm_es, { #if SUPPORT_ASIAN_ENCODINGS {/* Please use _only_ , , , and
. - It's very important that
be self-closing in this manner! + It's very important that
be self-closing in this manner! - The strings "Tidy" and "HTML Tidy" are the program name and must not be translated. */ TidyNCR, 0, "Esta opción especifica si Tidy debe permitir referencias de caracteres numéricos. " }, diff --git a/src/language_es_mx.h b/src/language_es_mx.h index 1ef8b39..d383ac5 100644 --- a/src/language_es_mx.h +++ b/src/language_es_mx.h @@ -4,14 +4,22 @@ * language_es_mx.h * Localization support for HTML Tidy. * - * THIS FILE IS MACHINE GENERATED. It is a localization file for the - * language (and maybe region) "es_mx" and it should not be - * edited manually. The source of these strings is a gettext PO file, - * probably called "language_es_mx.po" in Tidy's source. * - * Tidy's source distribution also includes a script to convert PO files - * into this file. Because PO files are friendly to translators and a - * standard industry tool, please translate ONLY the PO files. + * This file is a localization file for HTML Tidy. It will have been machine + * generated or created and/or edited by hand. Both are valid options, but + * please help keep our localization efforts simple to maintain by maintaining + * the structure of this file, and changing the check box below if you make + * changes (so others know the file origin): + * + * [X] THIS FILE IS MACHINE GENERATED. It is a localization file for the + * language (and maybe region) "es_mx". The source of + * these strings is a gettext PO file in Tidy's source, probably called + * "language_es_mx.po". + * + * [ ] THIS FILE WAS HAND MODIFIED. Translators, please feel to edit this file + * directly (and check this box). If you prefer to edit PO files then use + * `poconvert.rb msgunfmt language_es_mx.h` (our own + * conversion tool) to generate a fresh PO from this file first! * * (c) 2015 HTACG * See tidy.h and access.h for the copyright notice. @@ -20,7 +28,7 @@ * * Orginating PO file metadata: * PO_LAST_TRANSLATOR=jderry - * PO_REVISION_DATE=2016-01-26 14:38:30 + * PO_REVISION_DATE=2016-01-29 10:54:42 */ #ifdef _MSC_VER @@ -38,8 +46,8 @@ * definition. */ static uint whichPluralForm_es_mx(uint n) { - /* Plural-Forms: nplurals=2; */ - return n != 1; + /* Plural-Forms: nplurals=2; */ + return n != 1; } @@ -50,10 +58,10 @@ static uint whichPluralForm_es_mx(uint n) { * the build system. */ static languageDefinition language_es_mx = { whichPluralForm_es_mx, { - /*************************************** - ** This MUST be present and first. - ** Specify the code for this language. - ***************************************/ + /*************************************** + ** This MUST be present and first. + ** Specify the code for this language. + ***************************************/ {/* Specify the ll or ll_cc language code here. */ TIDY_LANGUAGE, 0, "es_mx" }, diff --git a/src/language_zh_cn.h b/src/language_zh_cn.h index 2a3bb62..7a9d200 100644 --- a/src/language_zh_cn.h +++ b/src/language_zh_cn.h @@ -4,14 +4,22 @@ * language_zh_cn.h * Localization support for HTML Tidy. * - * THIS FILE IS MACHINE GENERATED. It is a localization file for the - * language (and maybe region) "zh_cn" and it should not be - * edited manually. The source of these strings is a gettext PO file, - * probably called "language_zh_cn.po" in Tidy's source. * - * Tidy's source distribution also includes a script to convert PO files - * into this file. Because PO files are friendly to translators and a - * standard industry tool, please translate ONLY the PO files. + * This file is a localization file for HTML Tidy. It will have been machine + * generated or created and/or edited by hand. Both are valid options, but + * please help keep our localization efforts simple to maintain by maintaining + * the structure of this file, and changing the check box below if you make + * changes (so others know the file origin): + * + * [X] THIS FILE IS MACHINE GENERATED. It is a localization file for the + * language (and maybe region) "zh_cn". The source of + * these strings is a gettext PO file in Tidy's source, probably called + * "language_zh_cn.po". + * + * [ ] THIS FILE WAS HAND MODIFIED. Translators, please feel to edit this file + * directly (and check this box). If you prefer to edit PO files then use + * `poconvert.rb msgunfmt language_zh_cn.h` (our own + * conversion tool) to generate a fresh PO from this file first! * * (c) 2015 HTACG * See tidy.h and access.h for the copyright notice. @@ -20,7 +28,7 @@ * * Orginating PO file metadata: * PO_LAST_TRANSLATOR=jderry - * PO_REVISION_DATE=2016-01-26 14:38:30 + * PO_REVISION_DATE=2016-01-29 10:54:42 */ #ifdef _MSC_VER @@ -38,8 +46,8 @@ * definition. */ static uint whichPluralForm_zh_cn(uint n) { - /* Plural-Forms: nplurals=1; */ - return 0; + /* Plural-Forms: nplurals=1; */ + return 0; } @@ -50,10 +58,10 @@ static uint whichPluralForm_zh_cn(uint n) { * the build system. */ static languageDefinition language_zh_cn = { whichPluralForm_zh_cn, { - /*************************************** - ** This MUST be present and first. - ** Specify the code for this language. - ***************************************/ + /*************************************** + ** This MUST be present and first. + ** Specify the code for this language. + ***************************************/ {/* Specify the ll or ll_cc language code here. */ TIDY_LANGUAGE, 0, "zh_cn" }, diff --git a/src/lexer.c b/src/lexer.c index ace9452..5135016 100644 --- a/src/lexer.c +++ b/src/lexer.c @@ -1038,7 +1038,7 @@ static void ParseEntity( TidyDocImpl* doc, GetTokenMode mode ) int replaceMode = DISCARDED_CHAR; /* Always assume Win1252 in this circumstance. */ - c1 = TY_(DecodeWin1252)( ch ); + c1 = TY_(DecodeWin1252)( ch ); if ( c1 ) replaceMode = REPLACED_CHAR; diff --git a/src/message.c b/src/message.c index af43e96..be82246 100755 --- a/src/message.c +++ b/src/message.c @@ -239,19 +239,19 @@ static void messagePos( TidyDocImpl* doc, TidyReportLevel level, uint code, } if ( doc->mssgFilt2 ) { - /* mssgFilt2 is intended to allow LibTidy users to localize - messages via their own means by providing a key string and - the parameters to fill it. For the key string to remain - consistent, we have to ensure that we only ever return the - built-in English version of this string. */ + /* mssgFilt2 is intended to allow LibTidy users to localize + messages via their own means by providing a key string and + the parameters to fill it. For the key string to remain + consistent, we have to ensure that we only ever return the + built-in English version of this string. */ TidyDoc tdoc = tidyImplToDoc( doc ); go = go | doc->mssgFilt2( tdoc, level, line, col, tidyDefaultString(code), args_copy ); } if ( doc->mssgFilt3 ) { - /* mssgFilt3 is intended to allow LibTidy users to localize - messages via their own means by providing a key string and - the parameters to fill it. */ + /* mssgFilt3 is intended to allow LibTidy users to localize + messages via their own means by providing a key string and + the parameters to fill it. */ TidyDoc tdoc = tidyImplToDoc( doc ); go = go | doc->mssgFilt3( tdoc, level, line, col, tidyErrorCodeAsString(code), args_copy ); } @@ -292,7 +292,7 @@ static void messagePos( TidyDocImpl* doc, TidyReportLevel level, uint code, /* Reports error at current Lexer line/column. */ static void message( TidyDocImpl* doc, TidyReportLevel level, uint code, - ctmbstr msg, ... ) + ctmbstr msg, ... ) #ifdef __GNUC__ __attribute__((format(printf, 4, 5))) #endif @@ -326,7 +326,7 @@ __attribute__((format(printf, 2, 3))) void message( TidyDocImpl* doc, TidyReportLevel level, uint code, - ctmbstr msg, ... ) + ctmbstr msg, ... ) { va_list args; if (level == TidyInfo && !cfgBool(doc, TidyShowInfo)) return; @@ -337,7 +337,7 @@ void message( TidyDocImpl* doc, TidyReportLevel level, uint code, void messageLexer( TidyDocImpl* doc, TidyReportLevel level, uint code, - ctmbstr msg, ... ) + ctmbstr msg, ... ) { int line = ( doc->lexer ? doc->lexer->lines : 0 ); int col = ( doc->lexer ? doc->lexer->columns : 0 ); @@ -349,7 +349,7 @@ void messageLexer( TidyDocImpl* doc, TidyReportLevel level, uint code, } void messageNode( TidyDocImpl* doc, TidyReportLevel level, uint code, - Node* node, ctmbstr msg, ... ) + Node* node, ctmbstr msg, ... ) { int line = ( node ? node->line : ( doc->lexer ? doc->lexer->lines : 0 ) ); @@ -984,7 +984,7 @@ void TY_(GeneralInfo)( TidyDocImpl* doc ) { if (!cfgBool(doc, TidyShowInfo)) return; tidy_out(doc, "%s", tidyLocalizedString(TEXT_GENERAL_INFO)); - tidy_out(doc, "%s", tidyLocalizedString(TEXT_GENERAL_INFO_PLEA)); + tidy_out(doc, "%s", tidyLocalizedString(TEXT_GENERAL_INFO_PLEA)); } #if SUPPORT_ACCESSIBILITY_CHECKS @@ -1032,7 +1032,7 @@ void TY_(ReportNumWarnings)( TidyDocImpl* doc ) { tidy_out( doc, tidyLocalizedString(STRING_ERROR_COUNT), doc->warnings, tidyLocalizedStringN( STRING_ERROR_COUNT_WARNING, doc->warnings ), - doc->errors, tidyLocalizedStringN( STRING_ERROR_COUNT_ERROR, doc->errors ) ); + doc->errors, tidyLocalizedStringN( STRING_ERROR_COUNT_ERROR, doc->errors ) ); if ( doc->errors > cfg(doc, TidyShowErrors) || !cfgBool(doc, TidyShowWarnings) ) diff --git a/src/message.h b/src/message.h index 55f1b01..a519766 100644 --- a/src/message.h +++ b/src/message.h @@ -201,7 +201,7 @@ typedef enum { STRING_DISCARDING, /* For `discarding`. */ STRING_DOCTYPE_GIVEN, /* `Doctype given is \"%s\". */ STRING_ERROR_COUNT, /* `%u %s, %u %s were found!`. */ - STRING_ERROR_COUNT_ERROR, /* `error` and `errors`. */ + STRING_ERROR_COUNT_ERROR, /* `error` and `errors`. */ STRING_ERROR_COUNT_WARNING, /* `warning` and `warnings`. */ STRING_HELLO_ACCESS, /* Accessibility hello message. */ STRING_HTML_PROPRIETARY, /* `HTML Proprietary`/ */ @@ -221,7 +221,7 @@ typedef enum { TEXT_BAD_FORM, /* Explanatory text. */ TEXT_BAD_MAIN, /* Explanatory text. */ TEXT_GENERAL_INFO, /* Explanatory text. */ - TEXT_GENERAL_INFO_PLEA, /* Explanatory text. */ + TEXT_GENERAL_INFO_PLEA, /* Explanatory text. */ TEXT_HTML_T_ALGORITHM, /* Paragraph for describing the HTML table algorithm. */ TEXT_INVALID_URI, /* Explanatory text. */ TEXT_INVALID_UTF16, /* Explanatory text. */ diff --git a/src/parser.c b/src/parser.c index 6924828..04ed999 100644 --- a/src/parser.c +++ b/src/parser.c @@ -748,8 +748,8 @@ static void ParseTag( TidyDocImpl* doc, Node *node, GetTokenMode mode ) { Lexer* lexer = doc->lexer; - if (node->tag == NULL) /* [i_a]2 prevent crash for active content (php, asp) docs */ - return; + if (node->tag == NULL) /* [i_a]2 prevent crash for active content (php, asp) docs */ + return; /* Fix by GLP 2000-12-21. Need to reset insertspace if this @@ -770,7 +770,7 @@ static void ParseTag( TidyDocImpl* doc, Node *node, GetTokenMode mode ) if (node->type == StartEndTag) return; - lexer->parent = node; /* [i_a]2 added this - not sure why - CHECKME: */ + lexer->parent = node; /* [i_a]2 added this - not sure why - CHECKME: */ (*node->tag->parser)( doc, node, mode ); } @@ -1439,37 +1439,37 @@ void TY_(ParseBlock)( TidyDocImpl* doc, Node *element, GetTokenMode mode) struct MatchingDescendantData { - Node *found_node; - Bool *passed_marker_node; + Node *found_node; + Bool *passed_marker_node; - /* input: */ - TidyTagId matching_tagId; - Node *node_to_find; - Node *marker_node; + /* input: */ + TidyTagId matching_tagId; + Node *node_to_find; + Node *marker_node; }; static NodeTraversalSignal FindDescendant_cb(TidyDocImpl* ARG_UNUSED(doc), Node* node, void *propagate) { - struct MatchingDescendantData *cb_data = (struct MatchingDescendantData *)propagate; + struct MatchingDescendantData *cb_data = (struct MatchingDescendantData *)propagate; - if (TagId(node) == cb_data->matching_tagId) - { - /* make sure we match up 'unknown' tags exactly! */ - if (cb_data->matching_tagId != TidyTag_UNKNOWN || - (node->element != NULL && - cb_data->node_to_find != NULL && - cb_data->node_to_find->element != NULL && - 0 == TY_(tmbstrcmp)(cb_data->node_to_find->element, node->element))) - { - cb_data->found_node = node; - return ExitTraversal; - } - } + if (TagId(node) == cb_data->matching_tagId) + { + /* make sure we match up 'unknown' tags exactly! */ + if (cb_data->matching_tagId != TidyTag_UNKNOWN || + (node->element != NULL && + cb_data->node_to_find != NULL && + cb_data->node_to_find->element != NULL && + 0 == TY_(tmbstrcmp)(cb_data->node_to_find->element, node->element))) + { + cb_data->found_node = node; + return ExitTraversal; + } + } - if (cb_data->passed_marker_node && node == cb_data->marker_node) - *cb_data->passed_marker_node = yes; + if (cb_data->passed_marker_node && node == cb_data->marker_node) + *cb_data->passed_marker_node = yes; - return VisitParent; + return VisitParent; } /* @@ -1484,18 +1484,18 @@ parent chain), this will be flagged by setting the boolean referenced by */ static Node *FindMatchingDescendant( Node *parent, Node *node, Node *marker_node, Bool *is_parent_of_marker ) { - struct MatchingDescendantData cb_data = { 0 }; - cb_data.matching_tagId = TagId(node); - cb_data.node_to_find = node; - cb_data.marker_node = marker_node; + struct MatchingDescendantData cb_data = { 0 }; + cb_data.matching_tagId = TagId(node); + cb_data.node_to_find = node; + cb_data.marker_node = marker_node; - assert(node); + assert(node); - if (is_parent_of_marker) - *is_parent_of_marker = no; + if (is_parent_of_marker) + *is_parent_of_marker = no; - TY_(TraverseNodeTree)(NULL, parent, FindDescendant_cb, &cb_data); - return cb_data.found_node; + TY_(TraverseNodeTree)(NULL, parent, FindDescendant_cb, &cb_data); + return cb_data.found_node; } /* @@ -1505,120 +1505,120 @@ static Node *FindMatchingDescendant( Node *parent, Node *node, Node *marker_node void TY_(ParseNamespace)(TidyDocImpl* doc, Node *basenode, GetTokenMode mode) { Lexer* lexer = doc->lexer; - Node *node; - Node *parent = basenode; - uint istackbase; + Node *node; + Node *parent = basenode; + uint istackbase; AttVal* av; /* #130 MathML attr and entity fix! */ - /* a la : defer popping elements off the inline stack */ - TY_(DeferDup)( doc ); - istackbase = lexer->istackbase; - lexer->istackbase = lexer->istacksize; + /* a la
: defer popping elements off the inline stack */ + TY_(DeferDup)( doc ); + istackbase = lexer->istackbase; + lexer->istackbase = lexer->istacksize; - mode = OtherNamespace; /* Preformatted; IgnoreWhitespace; */ + mode = OtherNamespace; /* Preformatted; IgnoreWhitespace; */ - while ((node = TY_(GetToken)(doc, mode)) != NULL) - { - /* - fix check to skip action in InsertMisc for regular/empty - nodes, which we don't want here... + while ((node = TY_(GetToken)(doc, mode)) != NULL) + { + /* + fix check to skip action in InsertMisc for regular/empty + nodes, which we don't want here... - The way we do it here is by checking and processing everything - and only what remains goes into InsertMisc() - */ + The way we do it here is by checking and processing everything + and only what remains goes into InsertMisc() + */ - /* is this a close tag? And does it match the current parent node? */ - if (node->type == EndTag) - { - /* - to prevent end tags flowing from one 'alternate namespace' we - check this in two phases: first we check if the tag is a - descendant of the current node, and when it is, we check whether - it is the end tag for a node /within/ or /outside/ the basenode. - */ - Bool outside; - Node *mp = FindMatchingDescendant(parent, node, basenode, &outside); + /* is this a close tag? And does it match the current parent node? */ + if (node->type == EndTag) + { + /* + to prevent end tags flowing from one 'alternate namespace' we + check this in two phases: first we check if the tag is a + descendant of the current node, and when it is, we check whether + it is the end tag for a node /within/ or /outside/ the basenode. + */ + Bool outside; + Node *mp = FindMatchingDescendant(parent, node, basenode, &outside); - if (mp != NULL) - { - /* - when mp != parent as we might expect, - infer end tags until we 'hit' the matched - parent or the basenode - */ - Node *n; + if (mp != NULL) + { + /* + when mp != parent as we might expect, + infer end tags until we 'hit' the matched + parent or the basenode + */ + Node *n; - for (n = parent; - n != NULL && n != basenode->parent && n != mp; - n = n->parent) - { - /* n->implicit = yes; */ - n->closed = yes; - TY_(ReportError)(doc, n->parent, n, MISSING_ENDTAG_BEFORE); - } - assert(outside == no ? n == mp : 1); - assert(outside == yes ? n == basenode->parent : 1); + for (n = parent; + n != NULL && n != basenode->parent && n != mp; + n = n->parent) + { + /* n->implicit = yes; */ + n->closed = yes; + TY_(ReportError)(doc, n->parent, n, MISSING_ENDTAG_BEFORE); + } + assert(outside == no ? n == mp : 1); + assert(outside == yes ? n == basenode->parent : 1); - if (outside == no) - { - /* EndTag for a node within the basenode subtree. Roll on... */ - n->closed = yes; - TY_(FreeNode)(doc, node); + if (outside == no) + { + /* EndTag for a node within the basenode subtree. Roll on... */ + n->closed = yes; + TY_(FreeNode)(doc, node); - node = n; - parent = node->parent; - } - else - { - /* EndTag for a node outside the basenode subtree: let the caller handle that. */ - TY_(UngetToken)( doc ); - node = basenode; - parent = node->parent; - } + node = n; + parent = node->parent; + } + else + { + /* EndTag for a node outside the basenode subtree: let the caller handle that. */ + TY_(UngetToken)( doc ); + node = basenode; + parent = node->parent; + } - /* when we've arrived at the end-node for the base node, it's quitting time */ - if (node == basenode) - { - lexer->istackbase = istackbase; - assert(basenode->closed == yes); - return; - } - } - else - { - /* unmatched close tag: report an error and discard */ - /* TY_(ReportError)(doc, parent, node, NON_MATCHING_ENDTAG); Issue #308 - Seems wrong warning! */ - TY_(ReportError)(doc, parent, node, DISCARDING_UNEXPECTED); - assert(parent); - /* assert(parent->tag != node->tag); Issue #308 - Seems would always be true! */ + /* when we've arrived at the end-node for the base node, it's quitting time */ + if (node == basenode) + { + lexer->istackbase = istackbase; + assert(basenode->closed == yes); + return; + } + } + else + { + /* unmatched close tag: report an error and discard */ + /* TY_(ReportError)(doc, parent, node, NON_MATCHING_ENDTAG); Issue #308 - Seems wrong warning! */ + TY_(ReportError)(doc, parent, node, DISCARDING_UNEXPECTED); + assert(parent); + /* assert(parent->tag != node->tag); Issue #308 - Seems would always be true! */ TY_(FreeNode)( doc, node); /* Issue #308 - Discard unexpected end tag memory */ - } - } - else if (node->type == StartTag) - { + } + } + else if (node->type == StartTag) + { /* #130 MathML attr and entity fix! care if it has attributes, and 'accidently' any of those attributes match known */ for ( av = node->attributes; av; av = av->next ) { av->dict = 0; /* does something need to be freed? */ } - /* add another child to the current parent */ - TY_(InsertNodeAtEnd)(parent, node); - parent = node; - } - else - { + /* add another child to the current parent */ + TY_(InsertNodeAtEnd)(parent, node); + parent = node; + } + else + { /* #130 MathML attr and entity fix! care if it has attributes, and 'accidently' any of those attributes match known */ for ( av = node->attributes; av; av = av->next ) { av->dict = 0; /* does something need to be freed? */ } - TY_(InsertNodeAtEnd)(parent, node); - } - } + TY_(InsertNodeAtEnd)(parent, node); + } + } - TY_(ReportError)(doc, basenode->parent, basenode, MISSING_ENDTAG_FOR); + TY_(ReportError)(doc, basenode->parent, basenode, MISSING_ENDTAG_FOR); } diff --git a/src/sprtf.c b/src/sprtf.c index 6ead761..4d7e248 100644 --- a/src/sprtf.c +++ b/src/sprtf.c @@ -324,55 +324,55 @@ static void oi( char * psin ) #ifdef _MSC_VER // service to ensure line endings in windows only -static void prt( char * ps ) +static void prt( char * ps ) { static char _s_buf[1024]; - char * pb = _s_buf; - size_t i, j, k; - char c, d; + char * pb = _s_buf; + size_t i, j, k; + char c, d; i = strlen(ps); - k = 0; - d = 0; - if(i) { - k = 0; - d = 0; - for( j = 0; j < i; j++ ) { - c = ps[j]; - if( c == 0x0d ) { - if( (j+1) < i ) { - if( ps[j+1] != 0x0a ) { - pb[k++] = c; - c = 0x0a; - } + k = 0; + d = 0; + if(i) { + k = 0; + d = 0; + for( j = 0; j < i; j++ ) { + c = ps[j]; + if( c == 0x0d ) { + if( (j+1) < i ) { + if( ps[j+1] != 0x0a ) { + pb[k++] = c; + c = 0x0a; + } } else { - pb[k++] = c; - c = 0x0a; - } - } else if( c == 0x0a ) { - if( d != 0x0d ) { - pb[k++] = 0x0d; - } - } - pb[k++] = c; - d = c; - if( k >= MXIO ) { - pb[k] = 0; - oi(pb); - k = 0; - } - } // for length of string - if( k ) { - //if( ( gbCheckCrLf ) && - // ( d != 0x0a ) ) { - // add Cr/Lf pair - //pb[k++] = 0x0d; - //pb[k++] = 0x0a; - //pb[k] = 0; - //} - pb[k] = 0; - oi( pb ); - } - } + pb[k++] = c; + c = 0x0a; + } + } else if( c == 0x0a ) { + if( d != 0x0d ) { + pb[k++] = 0x0d; + } + } + pb[k++] = c; + d = c; + if( k >= MXIO ) { + pb[k] = 0; + oi(pb); + k = 0; + } + } // for length of string + if( k ) { + //if( ( gbCheckCrLf ) && + // ( d != 0x0a ) ) { + // add Cr/Lf pair + //pb[k++] = 0x0d; + //pb[k++] = 0x0a; + //pb[k] = 0; + //} + pb[k] = 0; + oi( pb ); + } + } } #endif // #ifdef _MSC_VER diff --git a/src/streamio.c b/src/streamio.c index 9742fe2..866d9d6 100644 --- a/src/streamio.c +++ b/src/streamio.c @@ -474,9 +474,9 @@ uint TY_(ReadChar)( StreamIn *in ) } if ( isMacChar ) - c1 = TY_(DecodeMacRoman)( c ); + c1 = TY_(DecodeMacRoman)( c ); else - c1 = TY_(DecodeWin1252)( c ); + c1 = TY_(DecodeWin1252)( c ); if ( c1 ) replMode = REPLACED_CHAR; diff --git a/src/tidy-int.h b/src/tidy-int.h index b2f6661..bf1ccd3 100755 --- a/src/tidy-int.h +++ b/src/tidy-int.h @@ -142,12 +142,12 @@ int TY_(DocParseStream)( TidyDocImpl* impl, StreamIn* in ); */ typedef enum { - ContinueTraversal, /* visit siblings and children */ - SkipChildren, /* visit siblings of this node; ignore its children */ - SkipSiblings, /* ignore subsequent siblings of this node; ignore their children; traverse */ - SkipChildrenAndSiblings, /* visit siblings of this node; ignore its children */ - VisitParent, /* REVERSE traversal: visit the parent of the current node */ - ExitTraversal /* terminate traversal on the spot */ + ContinueTraversal, /* visit siblings and children */ + SkipChildren, /* visit siblings of this node; ignore its children */ + SkipSiblings, /* ignore subsequent siblings of this node; ignore their children; traverse */ + SkipChildrenAndSiblings, /* visit siblings of this node; ignore its children */ + VisitParent, /* REVERSE traversal: visit the parent of the current node */ + ExitTraversal /* terminate traversal on the spot */ } NodeTraversalSignal; typedef NodeTraversalSignal NodeTraversalCallBack(TidyDocImpl* doc, Node* node, void *propagate); diff --git a/src/tidylib.c b/src/tidylib.c index 64bf678..7e1e4bf 100755 --- a/src/tidylib.c +++ b/src/tidylib.c @@ -1448,7 +1448,7 @@ void TY_(CheckHTML5)( TidyDocImpl* doc, Node* node ) } else if ( nodeIsBIG(node) ) { /*\ - * big: CSS equivalent 'font-size:larger' + * big: CSS equivalent 'font-size:larger' * so could replace the ... with * ... * then replace with @@ -1472,7 +1472,7 @@ void TY_(CheckHTML5)( TidyDocImpl* doc, Node* node ) } else if ( nodeIsCENTER(node) ) { /*\ - * center: CSS equivalent 'text-align:center' + * center: CSS equivalent 'text-align:center' * and 'margin-left:auto; margin-right:auto' on descendant blocks * Tidy already handles this if 'clean' by SILENTLY generating the