aboutsummaryrefslogtreecommitdiff
path: root/libcpp
diff options
context:
space:
mode:
Diffstat (limited to 'libcpp')
-rw-r--r--libcpp/ChangeLog271
-rw-r--r--libcpp/Makefile.in2
-rw-r--r--libcpp/charset.c157
-rwxr-xr-xlibcpp/configure29
-rw-r--r--libcpp/directives.c77
-rw-r--r--libcpp/errors.c2
-rw-r--r--libcpp/expr.c36
-rw-r--r--libcpp/files.c127
-rw-r--r--libcpp/identifiers.c2
-rw-r--r--libcpp/include/cpplib.h43
-rw-r--r--libcpp/include/line-map.h23
-rw-r--r--libcpp/include/mkdeps.h2
-rw-r--r--libcpp/include/symtab.h2
-rw-r--r--libcpp/init.c81
-rw-r--r--libcpp/internal.h4
-rw-r--r--libcpp/lex.c51
-rw-r--r--libcpp/line-map.c83
-rw-r--r--libcpp/macro.c147
-rw-r--r--libcpp/makeucnid.c93
-rw-r--r--libcpp/mkdeps.c3
-rw-r--r--libcpp/pch.c2
-rw-r--r--libcpp/po/ChangeLog30
-rw-r--r--libcpp/po/be.po408
-rw-r--r--libcpp/po/ca.po414
-rw-r--r--libcpp/po/cpplib.pot477
-rw-r--r--libcpp/po/da.po426
-rw-r--r--libcpp/po/de.po429
-rw-r--r--libcpp/po/el.po413
-rw-r--r--libcpp/po/eo.po427
-rw-r--r--libcpp/po/es.po515
-rw-r--r--libcpp/po/fi.po426
-rw-r--r--libcpp/po/fr.po421
-rw-r--r--libcpp/po/id.po417
-rw-r--r--libcpp/po/ja.po415
-rw-r--r--libcpp/po/nl.po418
-rw-r--r--libcpp/po/pt_BR.po430
-rw-r--r--libcpp/po/ru.po423
-rw-r--r--libcpp/po/sr.po422
-rw-r--r--libcpp/po/sv.po422
-rw-r--r--libcpp/po/tr.po417
-rw-r--r--libcpp/po/uk.po423
-rw-r--r--libcpp/po/vi.po495
-rw-r--r--libcpp/po/zh_CN.po417
-rw-r--r--libcpp/po/zh_TW.po426
-rw-r--r--libcpp/symtab.c2
-rw-r--r--libcpp/system.h2
-rw-r--r--libcpp/traditional.c2
-rw-r--r--libcpp/ucnid.h4569
-rw-r--r--libcpp/ucnid.tab2
49 files changed, 8873 insertions, 6452 deletions
diff --git a/libcpp/ChangeLog b/libcpp/ChangeLog
index c071469..35f952d 100644
--- a/libcpp/ChangeLog
+++ b/libcpp/ChangeLog
@@ -1,3 +1,272 @@
+2021-09-01 Jakub Jelinek <jakub@redhat.com>
+
+ PR c++/100977
+ * include/cpplib.h (struct cpp_options): Add cxx23_identifiers.
+ * charset.c (CXX23, NXX23): New enumerators.
+ (CID, NFC, NKC, CTX): Renumber.
+ (ucn_valid_in_identifier): Implement P1949R7 - use CXX23 and
+ NXX23 flags for cxx23_identifiers. For start character in
+ non-pedantic mode, allow characters that are allowed as start
+ characters in any of the supported language modes, rather than
+ disallowing characters allowed only as non-start characters in
+ current mode but for characters from other language modes allowing
+ them even if they are never allowed at start.
+ * init.c (struct lang_flags): Add cxx23_identifiers.
+ (lang_defaults): Add cxx23_identifiers column.
+ (cpp_set_lang): Initialize CPP_OPTION (pfile, cxx23_identifiers).
+ * lex.c (warn_about_normalization): If cxx23_identifiers, use
+ cpp_pedwarning_with_line instead of cpp_warning_with_line for
+ "is not in NFC" diagnostics.
+ * makeucnid.c: Adjust usage comment.
+ (CXX23, NXX23): New enumerators.
+ (all_languages): Add CXX23.
+ (not_NFC, not_NFKC, maybe_not_NFC): Renumber.
+ (read_derivedcore): New function.
+ (write_table): Print also CXX23 and NXX23 columns.
+ (main): Require 5 arguments instead of 4, call read_derivedcore.
+ * ucnid.h: Regenerated using Unicode 13.0.0 files.
+
+2021-09-01 Jason Merrill <jason@redhat.com>
+
+ * macro.c (replace_args): When __VA_OPT__ is on the LHS of ##,
+ remove trailing avoid_paste tokens.
+
+2021-09-01 Jakub Jelinek <jakub@redhat.com>
+
+ PR preprocessor/101488
+ * macro.c (replace_args): Fix up handling of CPP_PADDING tokens at the
+ start or end of __VA_OPT__ arguments when preceeded or followed by ##.
+
+2021-08-31 Martin Sebor <msebor@redhat.com>
+
+ * include/line-map.h (class rich_location): Disable copying and
+ assignment.
+
+2021-08-25 Lewis Hyatt <lhyatt@gmail.com>
+
+ PR other/93067
+ * charset.c (init_iconv_desc): Adapt to permit PFILE argument to
+ be NULL.
+ (_cpp_convert_input): Likewise. Also move UTF-8 BOM logic to...
+ (cpp_check_utf8_bom): ...here. New function.
+ (cpp_input_conversion_is_trivial): New function.
+ * files.c (read_file_guts): Allow PFILE argument to be NULL. Add
+ INPUT_CHARSET argument as an alternate source of this information.
+ (read_file): Pass the new argument to read_file_guts.
+ (cpp_get_converted_source): New function.
+ * include/cpplib.h (struct cpp_converted_source): Declare.
+ (cpp_get_converted_source): Declare.
+ (cpp_input_conversion_is_trivial): Declare.
+ (cpp_check_utf8_bom): Declare.
+
+2021-08-17 Jakub Jelinek <jakub@redhat.com>
+
+ * macro.c (vaopt_state): Add m_stringify member.
+ (vaopt_state::vaopt_state): Initialize it.
+ (vaopt_state::update): Overwrite it.
+ (vaopt_state::stringify): New method.
+ (stringify_arg): Replace arg argument with first, count arguments
+ and add va_opt argument. Use first instead of arg->first and
+ count instead of arg->count, for va_opt add paste_tokens handling.
+ (paste_tokens): Fix up len calculation. Don't spell rhs twice,
+ instead use %.*s to supply lhs and rhs spelling lengths. Don't call
+ _cpp_backup_tokens here.
+ (paste_all_tokens): Call it here instead.
+ (replace_args): Adjust stringify_arg caller. For vaopt_state::END
+ if stringify is true handle __VA_OPT__ stringification.
+ (create_iso_definition): Handle # __VA_OPT__ similarly to # macro_arg.
+
+2021-08-12 Jakub Jelinek <jakub@redhat.com>
+
+ PR preprocessor/101638
+ * macro.c (cpp_sys_macro_p): Return true instead of
+ crashing on builtin macros.
+
+2021-08-05 Jakub Jelinek <jakub@redhat.com>
+
+ PR c++/100977
+ * ucnid.h: Regenerated using Unicode 13.0.0 files.
+
+2021-08-05 Jakub Jelinek <jakub@redhat.com>
+
+ PR c++/100977
+ * makeucnid.c (write_table): Fix computation of last_combine.
+ * ucnid.h: Regenerated using Unicode 6.3.0 files.
+
+2021-06-16 Jason Merrill <jason@redhat.com>
+
+ PR c++/100796
+ PR preprocessor/96391
+ * line-map.c (linemap_compare_locations): Only use comparison with
+ LINE_MAP_MAX_LOCATION_WITH_COLS to avoid abort.
+
+2021-05-20 Christophe Lyon <christophe.lyon@linaro.org>
+ Torbjörn Svensson <torbjorn.svensson@st.com>
+
+ PR c/42579
+ * include/cpplib.h (cpp_builtin_type): Add BT_FILE_NAME entry.
+ * init.c (builtin_array): Likewise.
+ * macro.c (_cpp_builtin_macro_text): Add support for BT_FILE_NAME.
+
+2021-05-20 Jakub Jelinek <jakub@redhat.com>
+
+ PR preprocessor/100646
+ * lex.c (cpp_directive_only_process): Treat end of file as termination
+ for !is_block comments.
+
+2021-05-12 Jakub Jelinek <jakub@redhat.com>
+
+ PR preprocessor/100392
+ * lex.c (cpp_directive_only_process): If buffer doesn't end with '\n',
+ add buffer->rlimit[0] character to the printed range and
+ CPP_INCREMENT_LINE and increment line_count.
+
+2021-05-11 Joseph Myers <joseph@codesourcery.com>
+
+ * include/cpplib.h (struct cpp_options): Add elifdef.
+ * init.c (struct lang_flags): Add elifdef.
+ (lang_defaults): Update to include elifdef initializers.
+ (cpp_set_lang): Set elifdef for pfile based on language.
+ * directives.c (STDC2X, ELIFDEF): New macros.
+ (EXTENSION): Increase value to 3.
+ (DIRECTIVE_TABLE): Add #elifdef and #elifndef.
+ (_cpp_handle_directive): Do not treat ELIFDEF directives as
+ directives for language versions without the #elifdef feature.
+ (do_elif): Handle #elifdef and #elifndef.
+ (do_elifdef, do_elifndef): New functions.
+
+2021-05-11 Joseph Myers <joseph@codesourcery.com>
+
+ * lex.c (cpp_avoid_paste): Do not allow pasting CPP_NUMBER with
+ CPP_CHAR.
+
+2021-05-11 Joseph Myers <joseph@codesourcery.com>
+
+ * init.c (lang_defaults): Enable digit separators for GNUC2X and
+ STDC2X.
+
+2021-05-07 Jakub Jelinek <jakub@redhat.com>
+
+ PR c/100450
+ * lex.c (cpp_avoid_paste): Handle token1 CPP_PRAGMA like CPP_NAME.
+
+2021-05-06 Joseph Myers <joseph@codesourcery.com>
+
+ PR c++/83873
+ PR preprocessor/97604
+ * lex.c (lex_number): Reject adjacent digit separators here. Do
+ not allow digit separators before '.' or an exponent with sign.
+ * expr.c (cpp_classify_number): Do not check for adjacent digit
+ separators here.
+
+2021-05-03 H.J. Lu <hjl.tools@gmail.com>
+
+ PR bootstrap/99703
+ * configure: Regenerated.
+
+2021-04-29 Joseph Myers <joseph@codesourcery.com>
+
+ PR preprocessor/82359
+ * directives.c (strtolinenum): Handle digit separators.
+
+2021-04-19 Richard Biener <rguenther@suse.de>
+
+ PR preprocessor/100142
+ * line-map.c (linemap_position_for_loc_and_offset): Revert
+ unintended s/column_offset/column/ change.
+
+2021-04-13 Nathan Sidwell <nathan@acm.org>
+
+ PR preprocessor/99446
+ * line-map.c (line-map.c): Do not advance to linemaps for
+ different files.
+
+2021-04-13 Eric Botcazou <ebotcazou@adacore.com>
+
+ * include/line-map.h (IS_MACRO_LOC): Delete.
+ * line-map.c (linemap_location_from_macro_expansion_p): Test
+ LINEMAPS_MACRO_LOWEST_LOCATION of the linemap.
+
+2021-03-02 David Malcolm <dmalcolm@redhat.com>
+
+ PR c/99323
+ * line-map.c (rich_location::maybe_add_fixit): Reject fix-it hints
+ at column 0.
+
+2021-02-24 Nathan Sidwell <nathan@acm.org>
+
+ PR c++/98718
+ * include/line-map.h
+ * line-map.c
+
+2021-02-24 Nathan Sidwell <nathan@acm.org>
+
+ PR c++/99072
+ * init.c (read_original_filename): Expunge all evidence of the
+ original filename.
+
+2021-02-18 Nathan Sidwell <nathan@acm.org>
+
+ PR c++/99023
+ * include/cpplib.h (cpp_find_header_unit): Rename to ...
+ (cpp_probe_header_unit): ... this.
+ * internal.h (_cp_find_header_unit): Declare.
+ * files.c (cpp_find_header_unit): Break apart to ..
+ (test_header_unit): ... this, and ...
+ (_cpp_find_header_unit): ... and, or and ...
+ (cpp_probe_header_unit): ... this.
+ * macro.c (cpp_get_token_1): Call _cpp_find_header_unit.
+
+2021-02-16 Nathan Sidwell <nathan@acm.org>
+
+ * files.c (_cpp_stack_file): Make buffers end in unread \n.
+
+2021-02-10 David Malcolm <dmalcolm@redhat.com>
+
+ PR preprocessor/96391
+ * line-map.c (linemap_compare_locations): Require that
+ the location be <= LINE_MAP_MAX_LOCATION_WITH_COLS when
+ treating locations as coming from the same macro expansion.
+
+2021-02-04 Jakub Jelinek <jakub@redhat.com>
+
+ * expr.c (cpp_classify_number): Use make_signed_t<size_t> instead of
+ make_signed<size_t>::type in the diagnostics.
+
+2021-02-03 Jakub Jelinek <jakub@redhat.com>
+
+ PR preprocessor/98882
+ * lex.c (cpp_directive_only_process): Don't assert that rlimit[-1]
+ is a newline, instead assert that rlimit[0] is either newline or
+ carriage return. When seeing '\\' followed by '\r', check limit
+ before accessing pos[1].
+
+2021-02-03 Ed Smith-Rowland <3dw4rd@verizon.net>
+
+ * expr.c (interpret_int_suffix): Detect 'z' integer suffix.
+ (cpp_classify_number): Compat warning for use of 'z' suffix.
+ * include/cpplib.h (struct cpp_options): New flag.
+ (enum cpp_warning_reason): New flag.
+ (CPP_N_USERDEF): Comment C++0x -> C++11.
+ (CPP_N_SIZE_T): New flag for cpp_classify_number.
+ * init.c (cpp_set_lang): Initialize new flag.
+
+2021-01-27 liuhongt <hongtao.liu@intel.com>
+
+ PR target/98833
+ * lex.c (search_line_sse2): Replace builtins with == operator.
+
+2021-01-26 Paul Fee <paul.f.fee@gmail.com>
+
+ * include/cpplib.h (c_lang): Add CXX23 and GNUCXX23.
+ * init.c (lang_defaults): Add rows for CXX23 and GNUCXX23.
+ (cpp_init_builtins): Set __cplusplus to 202100L for C++23.
+
+2021-01-15 Nathan Sidwell <nathan@acm.org>
+
+ PR preprocessor/95253
+ * mkdeps.c (munge): Do not escape ':'.
+
2020-12-14 Nathan Sidwell <nathan@acm.org>
* include/cpplib.h (struct cpp_macro): Add imported_p field.
@@ -6574,7 +6843,7 @@
* include/symtab.h: Moved from gcc/hashtable.h. Change header
guard name.
-Copyright (C) 2004-2020 Free Software Foundation, Inc.
+Copyright (C) 2004-2021 Free Software Foundation, Inc.
Copying and distribution of this file, with or without modification,
are permitted in any medium without royalty provided the copyright
diff --git a/libcpp/Makefile.in b/libcpp/Makefile.in
index 5fbba9b..6c403a8 100644
--- a/libcpp/Makefile.in
+++ b/libcpp/Makefile.in
@@ -1,7 +1,7 @@
# @configure_input@
# Makefile for libcpp. Run 'configure' to generate Makefile from Makefile.in
-# Copyright (C) 2004-2020 Free Software Foundation, Inc.
+# Copyright (C) 2004-2021 Free Software Foundation, Inc.
#This file is part of libcpp.
diff --git a/libcpp/charset.c b/libcpp/charset.c
index 3e5578b..b84a974 100644
--- a/libcpp/charset.c
+++ b/libcpp/charset.c
@@ -1,5 +1,5 @@
/* CPP Library - charsets
- Copyright (C) 1998-2020 Free Software Foundation, Inc.
+ Copyright (C) 1998-2021 Free Software Foundation, Inc.
Broken out of c-lex.c Apr 2003, adding valid C99 UCN ranges.
@@ -630,7 +630,11 @@ static const struct cpp_conversion conversion_tab[] = {
cset_converter structure for conversion from FROM to TO. If
iconv_open() fails, issue an error and return an identity
converter. Silently return an identity converter if FROM and TO
- are identical. */
+ are identical.
+
+ PFILE is only used for generating diagnostics; setting it to NULL
+ suppresses diagnostics. */
+
static struct cset_converter
init_iconv_desc (cpp_reader *pfile, const char *to, const char *from)
{
@@ -672,25 +676,31 @@ init_iconv_desc (cpp_reader *pfile, const char *to, const char *from)
if (ret.cd == (iconv_t) -1)
{
- if (errno == EINVAL)
- cpp_error (pfile, CPP_DL_ERROR, /* FIXME should be DL_SORRY */
- "conversion from %s to %s not supported by iconv",
- from, to);
- else
- cpp_errno (pfile, CPP_DL_ERROR, "iconv_open");
-
+ if (pfile)
+ {
+ if (errno == EINVAL)
+ cpp_error (pfile, CPP_DL_ERROR, /* FIXME should be DL_SORRY */
+ "conversion from %s to %s not supported by iconv",
+ from, to);
+ else
+ cpp_errno (pfile, CPP_DL_ERROR, "iconv_open");
+ }
ret.func = convert_no_conversion;
}
}
else
{
- cpp_error (pfile, CPP_DL_ERROR, /* FIXME: should be DL_SORRY */
- "no iconv implementation, cannot convert from %s to %s",
- from, to);
+ if (pfile)
+ {
+ cpp_error (pfile, CPP_DL_ERROR, /* FIXME: should be DL_SORRY */
+ "no iconv implementation, cannot convert from %s to %s",
+ from, to);
+ }
ret.func = convert_no_conversion;
ret.cd = (iconv_t) -1;
ret.width = -1;
}
+
return ret;
}
@@ -884,14 +894,18 @@ enum {
C11 = 8,
/* Valid in a C11/C++11 identifier, but not as the first character? */
N11 = 16,
+ /* Valid in a C++23 identifier? */
+ CXX23 = 32,
+ /* Valid in a C++23 identifier, but not as the first character? */
+ NXX23 = 64,
/* NFC representation is not valid in an identifier? */
- CID = 32,
+ CID = 128,
/* Might be valid NFC form? */
- NFC = 64,
+ NFC = 256,
/* Might be valid NFKC form? */
- NKC = 128,
+ NKC = 512,
/* Certain preceding characters might make it not valid NFC/NKFC form? */
- CTX = 256
+ CTX = 1024
};
struct ucnrange {
@@ -938,10 +952,12 @@ ucn_valid_in_identifier (cpp_reader *pfile, cppchar_t c,
/* When -pedantic, we require the character to have been listed by
the standard for the current language. Otherwise, we accept the
union of the acceptable sets for all supported language versions. */
- valid_flags = C99 | CXX | C11;
+ valid_flags = C99 | CXX | C11 | CXX23;
if (CPP_PEDANTIC (pfile))
{
- if (CPP_OPTION (pfile, c11_identifiers))
+ if (CPP_OPTION (pfile, cxx23_identifiers))
+ valid_flags = CXX23;
+ else if (CPP_OPTION (pfile, c11_identifiers))
valid_flags = C11;
else if (CPP_OPTION (pfile, c99))
valid_flags = C99;
@@ -950,12 +966,6 @@ ucn_valid_in_identifier (cpp_reader *pfile, cppchar_t c,
}
if (! (ucnranges[mn].flags & valid_flags))
return 0;
- if (CPP_OPTION (pfile, c11_identifiers))
- invalid_start_flags = N11;
- else if (CPP_OPTION (pfile, c99))
- invalid_start_flags = N99;
- else
- invalid_start_flags = 0;
/* Update NST. */
if (ucnranges[mn].combine != 0 && ucnranges[mn].combine < nst->prev_class)
@@ -998,6 +1008,28 @@ ucn_valid_in_identifier (cpp_reader *pfile, cppchar_t c,
nst->previous = c;
nst->prev_class = ucnranges[mn].combine;
+ if (!CPP_PEDANTIC (pfile))
+ {
+ /* If not -pedantic, accept as character that may
+ begin an identifier a union of characters allowed
+ at that position in each of the character sets. */
+ if ((ucnranges[mn].flags & (C99 | N99)) == C99
+ || (ucnranges[mn].flags & CXX) != 0
+ || (ucnranges[mn].flags & (C11 | N11)) == C11
+ || (ucnranges[mn].flags & (CXX23 | NXX23)) == CXX23)
+ return 1;
+ return 2;
+ }
+
+ if (CPP_OPTION (pfile, cxx23_identifiers))
+ invalid_start_flags = NXX23;
+ else if (CPP_OPTION (pfile, c11_identifiers))
+ invalid_start_flags = N11;
+ else if (CPP_OPTION (pfile, c99))
+ invalid_start_flags = N99;
+ else
+ invalid_start_flags = 0;
+
/* In C99, UCN digits may not begin identifiers. In C11 and C++11,
UCN combining characters may not begin identifiers. */
if (ucnranges[mn].flags & invalid_start_flags)
@@ -2122,6 +2154,25 @@ _cpp_interpret_identifier (cpp_reader *pfile, const uchar *id, size_t len)
buf, bufp - buf, HT_ALLOC));
}
+
+/* Utility to strip a UTF-8 byte order marking from the beginning
+ of a buffer. Returns the number of bytes to skip, which currently
+ will be either 0 or 3. */
+int
+cpp_check_utf8_bom (const char *data, size_t data_length)
+{
+
+#if HOST_CHARSET == HOST_CHARSET_ASCII
+ const unsigned char *udata = (const unsigned char *) data;
+ if (data_length >= 3 && udata[0] == 0xef && udata[1] == 0xbb
+ && udata[2] == 0xbf)
+ return 3;
+#endif
+
+ return 0;
+}
+
+
/* Convert an input buffer (containing the complete contents of one
source file) from INPUT_CHARSET to the source character set. INPUT
points to the input buffer, SIZE is its allocated size, and LEN is
@@ -2135,7 +2186,11 @@ _cpp_interpret_identifier (cpp_reader *pfile, const uchar *id, size_t len)
INPUT is expected to have been allocated with xmalloc. This
function will either set *BUFFER_START to INPUT, or free it and set
*BUFFER_START to a pointer to another xmalloc-allocated block of
- memory. */
+ memory.
+
+ PFILE is only used to generate diagnostics; setting it to NULL suppresses
+ diagnostics, and causes a return of NULL if there was any error instead. */
+
uchar *
_cpp_convert_input (cpp_reader *pfile, const char *input_charset,
uchar *input, size_t size, size_t len,
@@ -2158,17 +2213,27 @@ _cpp_convert_input (cpp_reader *pfile, const char *input_charset,
to.text = XNEWVEC (uchar, to.asize);
to.len = 0;
- if (!APPLY_CONVERSION (input_cset, input, len, &to))
- cpp_error (pfile, CPP_DL_ERROR,
- "failure to convert %s to %s",
- CPP_OPTION (pfile, input_charset), SOURCE_CHARSET);
-
+ const bool ok = APPLY_CONVERSION (input_cset, input, len, &to);
free (input);
- }
- /* Clean up the mess. */
- if (input_cset.func == convert_using_iconv)
- iconv_close (input_cset.cd);
+ /* Clean up the mess. */
+ if (input_cset.func == convert_using_iconv)
+ iconv_close (input_cset.cd);
+
+ /* Handle conversion failure. */
+ if (!ok)
+ {
+ if (!pfile)
+ {
+ XDELETEVEC (to.text);
+ *buffer_start = NULL;
+ *st_size = 0;
+ return NULL;
+ }
+ cpp_error (pfile, CPP_DL_ERROR, "failure to convert %s to %s",
+ input_charset, SOURCE_CHARSET);
+ }
+ }
/* Resize buffer if we allocated substantially too much, or if we
haven't enough space for the \n-terminator or following
@@ -2192,19 +2257,14 @@ _cpp_convert_input (cpp_reader *pfile, const char *input_charset,
buffer = to.text;
*st_size = to.len;
-#if HOST_CHARSET == HOST_CHARSET_ASCII
- /* The HOST_CHARSET test just above ensures that the source charset
- is UTF-8. So, ignore a UTF-8 BOM if we see one. Note that
- glib'c UTF-8 iconv() provider (as of glibc 2.7) does not ignore a
+
+ /* Ignore a UTF-8 BOM if we see one and the source charset is UTF-8. Note
+ that glib'c UTF-8 iconv() provider (as of glibc 2.7) does not ignore a
BOM -- however, even if it did, we would still need this code due
to the 'convert_no_conversion' case. */
- if (to.len >= 3 && to.text[0] == 0xef && to.text[1] == 0xbb
- && to.text[2] == 0xbf)
- {
- *st_size -= 3;
- buffer += 3;
- }
-#endif
+ const int bom_len = cpp_check_utf8_bom ((const char *) to.text, to.len);
+ *st_size -= bom_len;
+ buffer += bom_len;
*buffer_start = to.text;
return buffer;
@@ -2244,6 +2304,13 @@ _cpp_default_encoding (void)
return current_encoding;
}
+/* Check if the configured input charset requires no conversion, other than
+ possibly stripping a UTF-8 BOM. */
+bool cpp_input_conversion_is_trivial (const char *input_charset)
+{
+ return !strcasecmp (input_charset, SOURCE_CHARSET);
+}
+
/* Implementation of class cpp_string_location_reader. */
/* Constructor for cpp_string_location_reader. */
diff --git a/libcpp/configure b/libcpp/configure
index 7e28606..9674cd9 100755
--- a/libcpp/configure
+++ b/libcpp/configure
@@ -7668,6 +7668,34 @@ else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
+int
+main ()
+{
+ asm ("endbr32");
+ return 0;
+}
+
+_ACEOF
+if ac_fn_c_try_run "$LINENO"; then :
+ have_multi_byte_nop=yes
+else
+ have_multi_byte_nop=no
+fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+ conftest.$ac_objext conftest.beam conftest.$ac_ext
+fi
+
+ have_cet=no
+ if test x$have_multi_byte_nop = xyes; then
+ if test "$cross_compiling" = yes; then :
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "cannot run test program while cross compiling
+See \`config.log' for more details" "$LINENO" 5; }
+else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
static void
foo (void)
{
@@ -7704,6 +7732,7 @@ rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
conftest.$ac_objext conftest.beam conftest.$ac_ext
fi
+ fi
if test x$enable_cet = xno -a x$have_cet = xyes; then
as_fn_error $? "Intel CET must be enabled on Intel CET enabled host" "$LINENO" 5
fi
diff --git a/libcpp/directives.c b/libcpp/directives.c
index 0d09da7..261a584 100644
--- a/libcpp/directives.c
+++ b/libcpp/directives.c
@@ -1,5 +1,5 @@
/* CPP Library. (Directive handling.)
- Copyright (C) 1986-2020 Free Software Foundation, Inc.
+ Copyright (C) 1986-2021 Free Software Foundation, Inc.
Contributed by Per Bothner, 1994-95.
Based on CCCP program by Paul Rubin, June 1986
Adapted to ANSI C, Richard Stallman, Jan 1987
@@ -56,10 +56,12 @@ struct pragma_entry
/* Values for the origin field of struct directive. KANDR directives
come from traditional (K&R) C. STDC89 directives come from the
- 1989 C standard. EXTENSION directives are extensions. */
+ 1989 C standard. STDC2X directives come from the C2X standard. EXTENSION
+ directives are extensions. */
#define KANDR 0
#define STDC89 1
-#define EXTENSION 2
+#define STDC2X 2
+#define EXTENSION 3
/* Values for the flags field of struct directive. COND indicates a
conditional; IF_COND an opening conditional. INCL means to treat
@@ -67,13 +69,17 @@ struct pragma_entry
means this directive should be handled even if -fpreprocessed is in
effect (these are the directives with callback hooks).
- EXPAND is set on directives that are always macro-expanded. */
+ EXPAND is set on directives that are always macro-expanded.
+
+ ELIFDEF is set on directives that are only handled for standards with the
+ #elifdef / #elifndef feature. */
#define COND (1 << 0)
#define IF_COND (1 << 1)
#define INCL (1 << 2)
#define IN_I (1 << 3)
#define EXPAND (1 << 4)
#define DEPRECATED (1 << 5)
+#define ELIFDEF (1 << 6)
/* Defines one #-directive, including how to handle it. */
typedef void (*directive_handler) (cpp_reader *);
@@ -148,6 +154,8 @@ static void cpp_pop_definition (cpp_reader *, struct def_pragma_macro *);
D(undef, T_UNDEF, KANDR, IN_I) \
D(line, T_LINE, KANDR, EXPAND) \
D(elif, T_ELIF, STDC89, COND | EXPAND) \
+ D(elifdef, T_ELIFDEF, STDC2X, COND | ELIFDEF) \
+ D(elifndef, T_ELIFNDEF, STDC2X, COND | ELIFDEF) \
D(error, T_ERROR, STDC89, 0) \
D(pragma, T_PRAGMA, STDC89, IN_I) \
D(warning, T_WARNING, EXTENSION, 0) \
@@ -437,7 +445,11 @@ _cpp_handle_directive (cpp_reader *pfile, bool indented)
if (dname->type == CPP_NAME)
{
if (dname->val.node.node->is_directive)
- dir = &dtable[dname->val.node.node->directive_index];
+ {
+ dir = &dtable[dname->val.node.node->directive_index];
+ if ((dir->flags & ELIFDEF) && !CPP_OPTION (pfile, elifdef))
+ dir = 0;
+ }
}
/* We do not recognize the # followed by a number extension in
assembler code. */
@@ -922,12 +934,19 @@ strtolinenum (const uchar *str, size_t len, linenum_type *nump, bool *wrapped)
linenum_type reg = 0;
uchar c;
+ bool seen_digit_sep = false;
*wrapped = false;
while (len--)
{
c = *str++;
+ if (!seen_digit_sep && c == '\'' && len)
+ {
+ seen_digit_sep = true;
+ continue;
+ }
if (!ISDIGIT (c))
return true;
+ seen_digit_sep = false;
if (reg > ((linenum_type) -1) / 10)
*wrapped = true;
reg *= 10;
@@ -2072,8 +2091,8 @@ do_else (cpp_reader *pfile)
}
}
-/* Handle a #elif directive by not changing if_stack either. See the
- comment above do_else. */
+/* Handle a #elif, #elifdef or #elifndef directive by not changing if_stack
+ either. See the comment above do_else. */
static void
do_elif (cpp_reader *pfile)
{
@@ -2081,12 +2100,13 @@ do_elif (cpp_reader *pfile)
struct if_stack *ifs = buffer->if_stack;
if (ifs == NULL)
- cpp_error (pfile, CPP_DL_ERROR, "#elif without #if");
+ cpp_error (pfile, CPP_DL_ERROR, "#%s without #if", pfile->directive->name);
else
{
if (ifs->type == T_ELSE)
{
- cpp_error (pfile, CPP_DL_ERROR, "#elif after #else");
+ cpp_error (pfile, CPP_DL_ERROR, "#%s after #else",
+ pfile->directive->name);
cpp_error_with_line (pfile, CPP_DL_ERROR, ifs->line, 0,
"the conditional began here");
}
@@ -2100,8 +2120,29 @@ do_elif (cpp_reader *pfile)
pfile->state.skipping = 1;
else
{
- pfile->state.skipping = ! _cpp_parse_expr (pfile, false);
- ifs->skip_elses = ! pfile->state.skipping;
+ if (pfile->directive == &dtable[T_ELIF])
+ pfile->state.skipping = !_cpp_parse_expr (pfile, false);
+ else
+ {
+ cpp_hashnode *node = lex_macro_node (pfile, false);
+
+ if (node)
+ {
+ bool macro_defined = _cpp_defined_macro_p (node);
+ if (!_cpp_maybe_notify_macro_use (pfile, node,
+ pfile->directive_line))
+ /* It wasn't a macro after all. */
+ macro_defined = false;
+ bool skip = (pfile->directive == &dtable[T_ELIFDEF]
+ ? !macro_defined
+ : macro_defined);
+ if (pfile->cb.used)
+ pfile->cb.used (pfile, pfile->directive_line, node);
+ check_eol (pfile, false);
+ pfile->state.skipping = skip;
+ }
+ }
+ ifs->skip_elses = !pfile->state.skipping;
}
/* Invalidate any controlling macro. */
@@ -2109,6 +2150,20 @@ do_elif (cpp_reader *pfile)
}
}
+/* Handle a #elifdef directive. */
+static void
+do_elifdef (cpp_reader *pfile)
+{
+ do_elif (pfile);
+}
+
+/* Handle a #elifndef directive. */
+static void
+do_elifndef (cpp_reader *pfile)
+{
+ do_elif (pfile);
+}
+
/* #endif pops the if stack and resets pfile->state.skipping. */
static void
do_endif (cpp_reader *pfile)
diff --git a/libcpp/errors.c b/libcpp/errors.c
index 275e4af..5e1bf33 100644
--- a/libcpp/errors.c
+++ b/libcpp/errors.c
@@ -1,5 +1,5 @@
/* Default error handlers for CPP Library.
- Copyright (C) 1986-2020 Free Software Foundation, Inc.
+ Copyright (C) 1986-2021 Free Software Foundation, Inc.
Written by Per Bothner, 1994.
Based on CCCP program by Paul Rubin, June 1986
Adapted to ANSI C, Richard Stallman, Jan 1987
diff --git a/libcpp/expr.c b/libcpp/expr.c
index 2ba7726..ab4a260 100644
--- a/libcpp/expr.c
+++ b/libcpp/expr.c
@@ -1,5 +1,5 @@
/* Parse C expressions for cpplib.
- Copyright (C) 1987-2020 Free Software Foundation, Inc.
+ Copyright (C) 1987-2021 Free Software Foundation, Inc.
Contributed by Per Bothner, 1994.
This program is free software; you can redistribute it and/or modify it
@@ -313,13 +313,14 @@ static unsigned int
interpret_int_suffix (cpp_reader *pfile, const uchar *s, size_t len)
{
size_t orig_len = len;
- size_t u, l, i;
+ size_t u, l, i, z;
- u = l = i = 0;
+ u = l = i = z = 0;
while (len--)
switch (s[len])
{
+ case 'z': case 'Z': z++; break;
case 'u': case 'U': u++; break;
case 'i': case 'I':
case 'j': case 'J': i++; break;
@@ -332,9 +333,17 @@ interpret_int_suffix (cpp_reader *pfile, const uchar *s, size_t len)
return 0;
}
- if (l > 2 || u > 1 || i > 1)
+ if (l > 2 || u > 1 || i > 1 || z > 1)
return 0;
+ if (z)
+ {
+ if (l > 0 || i > 0)
+ return 0;
+ if (!CPP_OPTION (pfile, cplusplus))
+ return 0;
+ }
+
if (i)
{
if (!CPP_OPTION (pfile, ext_numeric_literals))
@@ -352,7 +361,8 @@ interpret_int_suffix (cpp_reader *pfile, const uchar *s, size_t len)
return ((i ? CPP_N_IMAGINARY : 0)
| (u ? CPP_N_UNSIGNED : 0)
| ((l == 0) ? CPP_N_SMALL
- : (l == 1) ? CPP_N_MEDIUM : CPP_N_LARGE));
+ : (l == 1) ? CPP_N_MEDIUM : CPP_N_LARGE)
+ | (z ? CPP_N_SIZE_T : 0));
}
/* Return the classification flags for an int suffix. */
@@ -572,11 +582,7 @@ cpp_classify_number (cpp_reader *pfile, const cpp_token *token,
max_digit = c;
}
else if (DIGIT_SEP (c))
- {
- if (seen_digit_sep)
- SYNTAX_ERROR_AT (virtual_location, "adjacent digit separators");
- seen_digit_sep = true;
- }
+ seen_digit_sep = true;
else if (c == '.')
{
if (seen_digit_sep || DIGIT_SEP (*str))
@@ -805,6 +811,16 @@ cpp_classify_number (cpp_reader *pfile, const cpp_token *token,
virtual_location, 0, message);
}
+ if ((result & CPP_N_SIZE_T) == CPP_N_SIZE_T
+ && !CPP_OPTION (pfile, size_t_literals))
+ {
+ const char *message = (result & CPP_N_UNSIGNED) == CPP_N_UNSIGNED
+ ? N_("use of C++23 %<size_t%> integer constant")
+ : N_("use of C++23 %<make_signed_t<size_t>%> integer constant");
+ cpp_warning_with_line (pfile, CPP_W_SIZE_T_LITERALS,
+ virtual_location, 0, message);
+ }
+
result |= CPP_N_INTEGER;
}
diff --git a/libcpp/files.c b/libcpp/files.c
index 301b237..c93a03c 100644
--- a/libcpp/files.c
+++ b/libcpp/files.c
@@ -1,5 +1,5 @@
/* Part of CPP library. File handling.
- Copyright (C) 1986-2020 Free Software Foundation, Inc.
+ Copyright (C) 1986-2021 Free Software Foundation, Inc.
Written by Per Bothner, 1994.
Based on CCCP program by Paul Rubin, June 1986
Adapted to ANSI C, Richard Stallman, Jan 1987
@@ -173,7 +173,7 @@ static bool pch_open_file (cpp_reader *pfile, _cpp_file *file,
static bool find_file_in_dir (cpp_reader *pfile, _cpp_file *file,
bool *invalid_pch, location_t loc);
static bool read_file_guts (cpp_reader *pfile, _cpp_file *file,
- location_t loc);
+ location_t loc, const char *input_charset);
static bool read_file (cpp_reader *pfile, _cpp_file *file,
location_t loc);
static struct cpp_dir *search_path_head (cpp_reader *, const char *fname,
@@ -671,9 +671,12 @@ _cpp_find_file (cpp_reader *pfile, const char *fname, cpp_dir *start_dir,
Use LOC for any diagnostics.
+ PFILE may be NULL. In this case, no diagnostics are issued.
+
FIXME: Flush file cache and try again if we run out of memory. */
static bool
-read_file_guts (cpp_reader *pfile, _cpp_file *file, location_t loc)
+read_file_guts (cpp_reader *pfile, _cpp_file *file, location_t loc,
+ const char *input_charset)
{
ssize_t size, total, count;
uchar *buf;
@@ -681,8 +684,9 @@ read_file_guts (cpp_reader *pfile, _cpp_file *file, location_t loc)
if (S_ISBLK (file->st.st_mode))
{
- cpp_error_at (pfile, CPP_DL_ERROR, loc,
- "%s is a block device", file->path);
+ if (pfile)
+ cpp_error_at (pfile, CPP_DL_ERROR, loc,
+ "%s is a block device", file->path);
return false;
}
@@ -699,8 +703,9 @@ read_file_guts (cpp_reader *pfile, _cpp_file *file, location_t loc)
does not bite us. */
if (file->st.st_size > INTTYPE_MAXIMUM (ssize_t))
{
- cpp_error_at (pfile, CPP_DL_ERROR, loc,
- "%s is too large", file->path);
+ if (pfile)
+ cpp_error_at (pfile, CPP_DL_ERROR, loc,
+ "%s is too large", file->path);
return false;
}
@@ -733,29 +738,29 @@ read_file_guts (cpp_reader *pfile, _cpp_file *file, location_t loc)
if (count < 0)
{
- cpp_errno_filename (pfile, CPP_DL_ERROR, file->path, loc);
+ if (pfile)
+ cpp_errno_filename (pfile, CPP_DL_ERROR, file->path, loc);
free (buf);
return false;
}
- if (regular && total != size && STAT_SIZE_RELIABLE (file->st))
+ if (pfile && regular && total != size && STAT_SIZE_RELIABLE (file->st))
cpp_error_at (pfile, CPP_DL_WARNING, loc,
"%s is shorter than expected", file->path);
file->buffer = _cpp_convert_input (pfile,
- CPP_OPTION (pfile, input_charset),
+ input_charset,
buf, size + 16, total,
&file->buffer_start,
&file->st.st_size);
- file->buffer_valid = true;
-
- return true;
+ file->buffer_valid = file->buffer;
+ return file->buffer_valid;
}
/* Convenience wrapper around read_file_guts that opens the file if
necessary and closes the file descriptor after reading. FILE must
have been passed through find_file() at some stage. Use LOC for
- any diagnostics. */
+ any diagnostics. Unlike read_file_guts(), PFILE may not be NULL. */
static bool
read_file (cpp_reader *pfile, _cpp_file *file, location_t loc)
{
@@ -773,7 +778,8 @@ read_file (cpp_reader *pfile, _cpp_file *file, location_t loc)
return false;
}
- file->dont_read = !read_file_guts (pfile, file, loc);
+ file->dont_read = !read_file_guts (pfile, file, loc,
+ CPP_OPTION (pfile, input_charset));
close (file->fd);
file->fd = -1;
@@ -918,13 +924,17 @@ _cpp_stack_file (cpp_reader *pfile, _cpp_file *file, include_type type,
because we don't usually need that location (we're popping an
include file). However in this case we do want to do the
increment. So push a writable buffer of two newlines to acheive
- that. */
- static uchar newlines[] = "\n\n";
+ that. (We also need an extra newline, so this looks like a regular
+ file, which we do that to to make sure we don't fall off the end in the
+ middle of a line. */
+ static uchar newlines[] = "\n\n\n";
cpp_push_buffer (pfile, newlines, 2, true);
+ size_t len = strlen (buf);
+ buf[len] = '\n'; /* See above */
cpp_buffer *buffer
= cpp_push_buffer (pfile, reinterpret_cast<unsigned char *> (buf),
- strlen (buf), true);
+ len, true);
buffer->to_free = buffer->buf;
file->header_unit = +1;
@@ -1104,31 +1114,54 @@ _cpp_stack_include (cpp_reader *pfile, const char *fname, int angle_brackets,
return _cpp_stack_file (pfile, file, type, loc);
}
-/* NAME is a header file name, find the path we'll use to open it. */
+/* NAME is a header file name, find the _cpp_file, if any. */
-const char *
-cpp_find_header_unit (cpp_reader *pfile, const char *name, bool angle,
- location_t loc)
+static _cpp_file *
+test_header_unit (cpp_reader *pfile, const char *name, bool angle,
+ location_t loc)
{
- cpp_dir *dir = search_path_head (pfile, name, angle, IT_INCLUDE);
- if (!dir)
- return NULL;
+ if (cpp_dir *dir = search_path_head (pfile, name, angle, IT_INCLUDE))
+ return _cpp_find_file (pfile, name, dir, angle, _cpp_FFK_NORMAL, loc);
- _cpp_file *file = _cpp_find_file (pfile, name, dir, angle,
- _cpp_FFK_NORMAL, loc);
- if (!file)
- return NULL;
+ return nullptr;
+}
+
+/* NAME is a header file name, find the path we'll use to open it and infer that
+ it is a header-unit. */
- if (file->fd > 0)
+const char *
+_cpp_find_header_unit (cpp_reader *pfile, const char *name, bool angle,
+ location_t loc)
+{
+ if (_cpp_file *file = test_header_unit (pfile, name, angle, loc))
{
- /* Don't leave it open. */
- close (file->fd);
- file->fd = 0;
+ if (file->fd > 0)
+ {
+ /* Don't leave it open. */
+ close (file->fd);
+ file->fd = 0;
+ }
+
+ file->header_unit = +1;
+ _cpp_mark_file_once_only (pfile, file);
+
+ return file->path;
}
- file->header_unit = +1;
- _cpp_mark_file_once_only (pfile, file);
- return file->path;
+ return nullptr;
+}
+
+/* NAME is a header file name, find the path we'll use to open it. But do not
+ infer it is a header unit. */
+
+const char *
+cpp_probe_header_unit (cpp_reader *pfile, const char *name, bool angle,
+ location_t loc)
+{
+ if (_cpp_file *file = test_header_unit (pfile, name, angle, loc))
+ return file->path;
+
+ return nullptr;
}
/* Retrofit the just-entered main file asif it was an include. This
@@ -2118,3 +2151,25 @@ _cpp_has_header (cpp_reader *pfile, const char *fname, int angle_brackets,
return file->err_no != ENOENT;
}
+/* Read a file and convert to input charset, the same as if it were being read
+ by a cpp_reader. */
+
+cpp_converted_source
+cpp_get_converted_source (const char *fname, const char *input_charset)
+{
+ cpp_converted_source res = {};
+ _cpp_file file = {};
+ file.fd = -1;
+ file.name = lbasename (fname);
+ file.path = fname;
+ if (!open_file (&file))
+ return res;
+ const bool ok = read_file_guts (NULL, &file, 0, input_charset);
+ close (file.fd);
+ if (!ok)
+ return res;
+ res.to_free = (char *) file.buffer_start;
+ res.data = (char *) file.buffer;
+ res.len = file.st.st_size;
+ return res;
+}
diff --git a/libcpp/identifiers.c b/libcpp/identifiers.c
index 9627e1b..dc0df11 100644
--- a/libcpp/identifiers.c
+++ b/libcpp/identifiers.c
@@ -1,5 +1,5 @@
/* Hash tables for the CPP library.
- Copyright (C) 1986-2020 Free Software Foundation, Inc.
+ Copyright (C) 1986-2021 Free Software Foundation, Inc.
Written by Per Bothner, 1994.
Based on CCCP program by Paul Rubin, June 1986
Adapted to ANSI C, Richard Stallman, Jan 1987
diff --git a/libcpp/include/cpplib.h b/libcpp/include/cpplib.h
index 50d28dc..6e2fcb6 100644
--- a/libcpp/include/cpplib.h
+++ b/libcpp/include/cpplib.h
@@ -1,5 +1,5 @@
/* Definitions for CPP library.
- Copyright (C) 1995-2020 Free Software Foundation, Inc.
+ Copyright (C) 1995-2021 Free Software Foundation, Inc.
Written by Per Bothner, 1994-95.
This program is free software; you can redistribute it and/or modify it
@@ -173,7 +173,8 @@ enum c_lang {CLK_GNUC89 = 0, CLK_GNUC99, CLK_GNUC11, CLK_GNUC17, CLK_GNUC2X,
CLK_STDC2X,
CLK_GNUCXX, CLK_CXX98, CLK_GNUCXX11, CLK_CXX11,
CLK_GNUCXX14, CLK_CXX14, CLK_GNUCXX17, CLK_CXX17,
- CLK_GNUCXX20, CLK_CXX20, CLK_ASM};
+ CLK_GNUCXX20, CLK_CXX20, CLK_GNUCXX23, CLK_CXX23,
+ CLK_ASM};
/* Payload of a NUMBER, STRING, CHAR or COMMENT token. */
struct GTY(()) cpp_string {
@@ -481,6 +482,10 @@ struct cpp_options
in C11 and C++11. */
unsigned char c11_identifiers;
+ /* Nonzero means extended identifiers allow the characters specified
+ in C++23. */
+ unsigned char cxx23_identifiers;
+
/* Nonzero for C++ 2014 Standard binary constants. */
unsigned char binary_constants;
@@ -496,9 +501,15 @@ struct cpp_options
/* Nonzero for the '::' token. */
unsigned char scope;
+ /* Nonzero for the '#elifdef' and '#elifndef' directives. */
+ unsigned char elifdef;
+
/* Nonzero means tokenize C++20 module directives. */
unsigned char module_directives;
+ /* Nonzero for C++23 size_t literals. */
+ unsigned char size_t_literals;
+
/* Holds the name of the target (execution) character set. */
const char *narrow_charset;
@@ -625,6 +636,7 @@ enum cpp_warning_reason {
CPP_W_INVALID_PCH,
CPP_W_WARNING_DIRECTIVE,
CPP_W_LITERAL_SUFFIX,
+ CPP_W_SIZE_T_LITERALS,
CPP_W_DATE_TIME,
CPP_W_PEDANTIC,
CPP_W_C90_C99_COMPAT,
@@ -878,6 +890,7 @@ enum cpp_builtin_type
BT_SPECLINE = 0, /* `__LINE__' */
BT_DATE, /* `__DATE__' */
BT_FILE, /* `__FILE__' */
+ BT_FILE_NAME, /* `__FILE_NAME__' */
BT_BASE_FILE, /* `__BASE_FILE__' */
BT_INCLUDE_LEVEL, /* `__INCLUDE_LEVEL__' */
BT_TIME, /* `__TIME__' */
@@ -1007,8 +1020,8 @@ extern cpp_callbacks *cpp_get_callbacks (cpp_reader *) ATTRIBUTE_PURE;
extern void cpp_set_callbacks (cpp_reader *, cpp_callbacks *);
extern class mkdeps *cpp_get_deps (cpp_reader *) ATTRIBUTE_PURE;
-extern const char *cpp_find_header_unit (cpp_reader *, const char *file,
- bool angle_p, location_t);
+extern const char *cpp_probe_header_unit (cpp_reader *, const char *file,
+ bool angle_p, location_t);
/* Call these to get name data about the various compile-time
charsets. */
@@ -1210,7 +1223,9 @@ struct cpp_num
#define CPP_N_FLOATN 0x400000 /* _FloatN types. */
#define CPP_N_FLOATNX 0x800000 /* _FloatNx types. */
-#define CPP_N_USERDEF 0x1000000 /* C++0x user-defined literal. */
+#define CPP_N_USERDEF 0x1000000 /* C++11 user-defined literal. */
+
+#define CPP_N_SIZE_T 0x2000000 /* C++23 size_t literal. */
#define CPP_N_WIDTH_FLOATN_NX 0xF0000000 /* _FloatN / _FloatNx value
of N, divided by 16. */
@@ -1368,6 +1383,20 @@ extern struct _cpp_file *cpp_get_file (cpp_buffer *);
extern cpp_buffer *cpp_get_prev (cpp_buffer *);
extern void cpp_clear_file_cache (cpp_reader *);
+/* cpp_get_converted_source returns the contents of the given file, as it exists
+ after cpplib has read it and converted it from the input charset to the
+ source charset. Return struct will be zero-filled if the data could not be
+ read for any reason. The data starts at the DATA pointer, but the TO_FREE
+ pointer is what should be passed to free(), as there may be an offset. */
+struct cpp_converted_source
+{
+ char *to_free;
+ char *data;
+ size_t len;
+};
+cpp_converted_source cpp_get_converted_source (const char *fname,
+ const char *input_charset);
+
/* In pch.c */
struct save_macro_data;
extern int cpp_save_state (cpp_reader *, FILE *);
@@ -1438,6 +1467,7 @@ class cpp_display_width_computation {
/* Convenience functions that are simple use cases for class
cpp_display_width_computation. Tab characters will be expanded to spaces
as determined by TABSTOP. */
+
int cpp_byte_column_to_display_column (const char *data, int data_length,
int column, int tabstop);
inline int cpp_display_width (const char *data, int data_length,
@@ -1450,4 +1480,7 @@ int cpp_display_column_to_byte_column (const char *data, int data_length,
int display_col, int tabstop);
int cpp_wcwidth (cppchar_t c);
+bool cpp_input_conversion_is_trivial (const char *input_charset);
+int cpp_check_utf8_bom (const char *data, size_t data_length);
+
#endif /* ! LIBCPP_CPPLIB_H */
diff --git a/libcpp/include/line-map.h b/libcpp/include/line-map.h
index 50b2e4f..464494b 100644
--- a/libcpp/include/line-map.h
+++ b/libcpp/include/line-map.h
@@ -1,5 +1,5 @@
/* Map (unsigned int) keys to (source file, line, column) triples.
- Copyright (C) 2001-2020 Free Software Foundation, Inc.
+ Copyright (C) 2001-2021 Free Software Foundation, Inc.
This program is free software; you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
@@ -563,7 +563,7 @@ struct GTY((tag ("2"))) line_map_macro : public line_map {
#define linemap_assert_fails(EXPR) (! (EXPR))
#endif
-/* Get whether location LOC is an ad-hoc, ordinary or macro location. */
+/* Get whether location LOC is an ordinary location. */
inline bool
IS_ORDINARY_LOC (location_t loc)
@@ -571,18 +571,14 @@ IS_ORDINARY_LOC (location_t loc)
return loc < LINE_MAP_MAX_LOCATION;
}
+/* Get whether location LOC is an ad-hoc location. */
+
inline bool
IS_ADHOC_LOC (location_t loc)
{
return loc > MAX_LOCATION_T;
}
-inline bool
-IS_MACRO_LOC (location_t loc)
-{
- return !IS_ORDINARY_LOC (loc) && !IS_ADHOC_LOC (loc);
-}
-
/* Categorize line map kinds. */
inline bool
@@ -1136,8 +1132,9 @@ extern location_t linemap_module_loc
extern void linemap_module_reparent
(line_maps *, location_t loc, location_t new_parent);
-/* Restore the linemap state such that the map at LWM-1 continues. */
-extern void linemap_module_restore
+/* Restore the linemap state such that the map at LWM-1 continues.
+ Return start location of the new map. */
+extern unsigned linemap_module_restore
(line_maps *, unsigned lwm);
/* Given a logical source location, returns the map which the
@@ -1673,6 +1670,12 @@ class rich_location
/* Destructor. */
~rich_location ();
+ /* The class manages the memory pointed to by the elements of
+ the M_FIXIT_HINTS vector and is not meant to be copied or
+ assigned. */
+ rich_location (const rich_location &) = delete;
+ void operator= (const rich_location &) = delete;
+
/* Accessors. */
location_t get_loc () const { return get_loc (0); }
location_t get_loc (unsigned int idx) const;
diff --git a/libcpp/include/mkdeps.h b/libcpp/include/mkdeps.h
index 9f10327..007f74e 100644
--- a/libcpp/include/mkdeps.h
+++ b/libcpp/include/mkdeps.h
@@ -1,5 +1,5 @@
/* Dependency generator for Makefile fragments.
- Copyright (C) 2000-2020 Free Software Foundation, Inc.
+ Copyright (C) 2000-2021 Free Software Foundation, Inc.
Contributed by Zack Weinberg, Mar 2000
This program is free software; you can redistribute it and/or modify it
diff --git a/libcpp/include/symtab.h b/libcpp/include/symtab.h
index 2fd542e..6905753 100644
--- a/libcpp/include/symtab.h
+++ b/libcpp/include/symtab.h
@@ -1,5 +1,5 @@
/* Hash tables.
- Copyright (C) 2000-2020 Free Software Foundation, Inc.
+ Copyright (C) 2000-2021 Free Software Foundation, Inc.
This program is free software; you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
diff --git a/libcpp/init.c b/libcpp/init.c
index 7987798..eda17a6a 100644
--- a/libcpp/init.c
+++ b/libcpp/init.c
@@ -1,5 +1,5 @@
/* CPP Library.
- Copyright (C) 1986-2020 Free Software Foundation, Inc.
+ Copyright (C) 1986-2021 Free Software Foundation, Inc.
Contributed by Per Bothner, 1994-95.
Based on CCCP program by Paul Rubin, June 1986
Adapted to ANSI C, Richard Stallman, Jan 1987
@@ -82,6 +82,7 @@ struct lang_flags
char extended_numbers;
char extended_identifiers;
char c11_identifiers;
+ char cxx23_identifiers;
char std;
char digraphs;
char uliterals;
@@ -94,32 +95,36 @@ struct lang_flags
char va_opt;
char scope;
char dfp_constants;
+ char size_t_literals;
+ char elifdef;
};
static const struct lang_flags lang_defaults[] =
-{ /* c99 c++ xnum xid c11 std digr ulit rlit udlit bincst digsep trig u8chlit vaopt scope dfp */
- /* GNUC89 */ { 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0 },
- /* GNUC99 */ { 1, 0, 1, 1, 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 1, 1, 0 },
- /* GNUC11 */ { 1, 0, 1, 1, 1, 0, 1, 1, 1, 0, 0, 0, 0, 0, 1, 1, 0 },
- /* GNUC17 */ { 1, 0, 1, 1, 1, 0, 1, 1, 1, 0, 0, 0, 0, 0, 1, 1, 0 },
- /* GNUC2X */ { 1, 0, 1, 1, 1, 0, 1, 1, 1, 0, 1, 0, 0, 1, 1, 1, 1 },
- /* STDC89 */ { 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0 },
- /* STDC94 */ { 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0 },
- /* STDC99 */ { 1, 0, 1, 1, 0, 1, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0 },
- /* STDC11 */ { 1, 0, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0 },
- /* STDC17 */ { 1, 0, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0 },
- /* STDC2X */ { 1, 0, 1, 1, 1, 1, 1, 1, 0, 0, 1, 0, 1, 1, 0, 1, 1 },
- /* GNUCXX */ { 0, 1, 1, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0 },
- /* CXX98 */ { 0, 1, 0, 1, 0, 1, 1, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0 },
- /* GNUCXX11 */ { 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 0, 0, 0, 0, 1, 1, 0 },
- /* CXX11 */ { 1, 1, 0, 1, 1, 1, 1, 1, 1, 1, 0, 0, 1, 0, 0, 1, 0 },
- /* GNUCXX14 */ { 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 0, 0, 1, 1, 0 },
- /* CXX14 */ { 1, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 1, 0 },
- /* GNUCXX17 */ { 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 0 },
- /* CXX17 */ { 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 0, 1, 0 },
- /* GNUCXX20 */ { 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 0 },
- /* CXX20 */ { 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 0 },
- /* ASM */ { 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }
+{ /* c99 c++ xnum xid c11 c++23 std digr ulit rlit udlit bincst digsep trig u8chlit vaopt scope dfp szlit elifdef */
+ /* GNUC89 */ { 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0 },
+ /* GNUC99 */ { 1, 0, 1, 1, 0, 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0 },
+ /* GNUC11 */ { 1, 0, 1, 1, 1, 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0 },
+ /* GNUC17 */ { 1, 0, 1, 1, 1, 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0 },
+ /* GNUC2X */ { 1, 0, 1, 1, 1, 0, 0, 1, 1, 1, 0, 1, 1, 0, 1, 1, 1, 1, 0, 1 },
+ /* STDC89 */ { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0 },
+ /* STDC94 */ { 0, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0 },
+ /* STDC99 */ { 1, 0, 1, 1, 0, 0, 1, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0 },
+ /* STDC11 */ { 1, 0, 1, 1, 1, 0, 1, 1, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0 },
+ /* STDC17 */ { 1, 0, 1, 1, 1, 0, 1, 1, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0 },
+ /* STDC2X */ { 1, 0, 1, 1, 1, 0, 1, 1, 1, 0, 0, 1, 1, 1, 1, 0, 1, 1, 0, 1 },
+ /* GNUCXX */ { 0, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0 },
+ /* CXX98 */ { 0, 1, 0, 1, 0, 0, 1, 1, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 0, 0 },
+ /* GNUCXX11 */ { 1, 1, 1, 1, 1, 0, 0, 1, 1, 1, 1, 0, 0, 0, 0, 1, 1, 0, 0, 0 },
+ /* CXX11 */ { 1, 1, 0, 1, 1, 0, 1, 1, 1, 1, 1, 0, 0, 1, 0, 0, 1, 0, 0, 0 },
+ /* GNUCXX14 */ { 1, 1, 1, 1, 1, 0, 0, 1, 1, 1, 1, 1, 1, 0, 0, 1, 1, 0, 0, 0 },
+ /* CXX14 */ { 1, 1, 0, 1, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 1, 0, 0, 0 },
+ /* GNUCXX17 */ { 1, 1, 1, 1, 1, 0, 0, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 0, 0, 0 },
+ /* CXX17 */ { 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 1, 0, 1, 0, 1, 0, 0, 0 },
+ /* GNUCXX20 */ { 1, 1, 1, 1, 1, 0, 0, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 0, 0, 0 },
+ /* CXX20 */ { 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 0, 0, 0 },
+ /* GNUCXX23 */ { 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 0, 1, 0 },
+ /* CXX23 */ { 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 0, 1, 0 },
+ /* ASM */ { 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }
};
/* Sets internal flags correctly for a given language. */
@@ -135,6 +140,7 @@ cpp_set_lang (cpp_reader *pfile, enum c_lang lang)
CPP_OPTION (pfile, extended_numbers) = l->extended_numbers;
CPP_OPTION (pfile, extended_identifiers) = l->extended_identifiers;
CPP_OPTION (pfile, c11_identifiers) = l->c11_identifiers;
+ CPP_OPTION (pfile, cxx23_identifiers) = l->cxx23_identifiers;
CPP_OPTION (pfile, std) = l->std;
CPP_OPTION (pfile, digraphs) = l->digraphs;
CPP_OPTION (pfile, uliterals) = l->uliterals;
@@ -147,6 +153,8 @@ cpp_set_lang (cpp_reader *pfile, enum c_lang lang)
CPP_OPTION (pfile, va_opt) = l->va_opt;
CPP_OPTION (pfile, scope) = l->scope;
CPP_OPTION (pfile, dfp_constants) = l->dfp_constants;
+ CPP_OPTION (pfile, size_t_literals) = l->size_t_literals;
+ CPP_OPTION (pfile, elifdef) = l->elifdef;
}
/* Initialize library global state. */
@@ -399,6 +407,7 @@ static const struct builtin_macro builtin_array[] =
B("__TIME__", BT_TIME, false),
B("__DATE__", BT_DATE, false),
B("__FILE__", BT_FILE, false),
+ B("__FILE_NAME__", BT_FILE_NAME, false),
B("__BASE_FILE__", BT_BASE_FILE, false),
B("__LINE__", BT_SPECLINE, true),
B("__INCLUDE_LEVEL__", BT_INCLUDE_LEVEL, true),
@@ -540,7 +549,12 @@ cpp_init_builtins (cpp_reader *pfile, int hosted)
if (CPP_OPTION (pfile, cplusplus))
{
- if (CPP_OPTION (pfile, lang) == CLK_CXX20
+ /* C++23 is not yet a standard. For now, use an invalid
+ * year/month, 202100L, which is larger than 202002L. */
+ if (CPP_OPTION (pfile, lang) == CLK_CXX23
+ || CPP_OPTION (pfile, lang) == CLK_GNUCXX23)
+ _cpp_define_builtin (pfile, "__cplusplus 202100L");
+ else if (CPP_OPTION (pfile, lang) == CLK_CXX20
|| CPP_OPTION (pfile, lang) == CLK_GNUCXX20)
_cpp_define_builtin (pfile, "__cplusplus 202002L");
else if (CPP_OPTION (pfile, lang) == CLK_CXX17
@@ -743,6 +757,23 @@ read_original_filename (cpp_reader *pfile)
if (_cpp_handle_directive (pfile, token->flags & PREV_WHITE))
{
read_original_directory (pfile);
+
+ auto *penult = &linemap_check_ordinary
+ (LINEMAPS_LAST_MAP (pfile->line_table, false))[-1];
+ if (penult[1].reason == LC_RENAME_VERBATIM)
+ {
+ /* Expunge any evidence of the original linemap. */
+ pfile->line_table->highest_location
+ = pfile->line_table->highest_line
+ = penult[0].start_location;
+
+ penult[1].start_location = penult[0].start_location;
+ penult[1].reason = penult[0].reason;
+ penult[0] = penult[1];
+ pfile->line_table->info_ordinary.used--;
+ pfile->line_table->info_ordinary.cache = 0;
+ }
+
return true;
}
}
diff --git a/libcpp/internal.h b/libcpp/internal.h
index 4010af8..fd44de6 100644
--- a/libcpp/internal.h
+++ b/libcpp/internal.h
@@ -1,5 +1,5 @@
/* Part of CPP library.
- Copyright (C) 1997-2020 Free Software Foundation, Inc.
+ Copyright (C) 1997-2021 Free Software Foundation, Inc.
This program is free software; you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
@@ -703,6 +703,8 @@ extern _cpp_file *_cpp_find_file (cpp_reader *, const char *, cpp_dir *,
int angle, _cpp_find_file_kind, location_t);
extern bool _cpp_find_failed (_cpp_file *);
extern void _cpp_mark_file_once_only (cpp_reader *, struct _cpp_file *);
+extern const char *_cpp_find_header_unit (cpp_reader *, const char *file,
+ bool angle_p, location_t);
extern void _cpp_fake_include (cpp_reader *, const char *);
extern bool _cpp_stack_file (cpp_reader *, _cpp_file*, include_type, location_t);
extern bool _cpp_stack_include (cpp_reader *, const char *, int,
diff --git a/libcpp/lex.c b/libcpp/lex.c
index 07d5a4f..8e3ef09 100644
--- a/libcpp/lex.c
+++ b/libcpp/lex.c
@@ -1,5 +1,5 @@
/* CPP Library - lexical analysis.
- Copyright (C) 2000-2020 Free Software Foundation, Inc.
+ Copyright (C) 2000-2021 Free Software Foundation, Inc.
Contributed by Per Bothner, 1994-95.
Based on CCCP program by Paul Rubin, June 1986
Adapted to ANSI C, Richard Stallman, Jan 1987
@@ -391,10 +391,10 @@ search_line_sse2 (const uchar *s, const uchar *end ATTRIBUTE_UNUSED)
mask = -1;
start:
- t = __builtin_ia32_pcmpeqb128(data, repl_nl);
- t |= __builtin_ia32_pcmpeqb128(data, repl_cr);
- t |= __builtin_ia32_pcmpeqb128(data, repl_bs);
- t |= __builtin_ia32_pcmpeqb128(data, repl_qm);
+ t = data == repl_nl;
+ t |= data == repl_cr;
+ t |= data == repl_bs;
+ t |= data == repl_qm;
found = __builtin_ia32_pmovmskb128 (t);
found &= mask;
}
@@ -1306,6 +1306,9 @@ warn_about_normalization (cpp_reader *pfile,
if (NORMALIZE_STATE_RESULT (s) == normalized_C)
cpp_warning_with_line (pfile, CPP_W_NORMALIZE, token->src_loc, 0,
"`%.*s' is not in NFKC", (int) sz, buf);
+ else if (CPP_OPTION (pfile, cxx23_identifiers))
+ cpp_pedwarning_with_line (pfile, CPP_W_NORMALIZE, token->src_loc, 0,
+ "`%.*s' is not in NFC", (int) sz, buf);
else
cpp_warning_with_line (pfile, CPP_W_NORMALIZE, token->src_loc, 0,
"`%.*s' is not in NFC", (int) sz, buf);
@@ -1548,18 +1551,28 @@ lex_number (cpp_reader *pfile, cpp_string *number,
base = pfile->buffer->cur - 1;
do
{
+ const uchar *adj_digit_sep = NULL;
cur = pfile->buffer->cur;
/* N.B. ISIDNUM does not include $. */
- while (ISIDNUM (*cur) || *cur == '.' || DIGIT_SEP (*cur)
- || VALID_SIGN (*cur, cur[-1]))
+ while (ISIDNUM (*cur)
+ || (*cur == '.' && !DIGIT_SEP (cur[-1]))
+ || DIGIT_SEP (*cur)
+ || (VALID_SIGN (*cur, cur[-1]) && !DIGIT_SEP (cur[-2])))
{
NORMALIZE_STATE_UPDATE_IDNUM (nst, *cur);
+ /* Adjacent digit separators do not form part of the pp-number syntax.
+ However, they can safely be diagnosed here as an error, since '' is
+ not a valid preprocessing token. */
+ if (DIGIT_SEP (*cur) && DIGIT_SEP (cur[-1]) && !adj_digit_sep)
+ adj_digit_sep = cur;
cur++;
}
/* A number can't end with a digit separator. */
while (cur > pfile->buffer->cur && DIGIT_SEP (cur[-1]))
--cur;
+ if (adj_digit_sep && adj_digit_sep < cur)
+ cpp_error (pfile, CPP_DL_ERROR, "adjacent digit separators");
pfile->buffer->cur = cur;
}
@@ -3709,11 +3722,13 @@ cpp_avoid_paste (cpp_reader *pfile, const cpp_token *token1,
case CPP_DEREF: return c == '*';
case CPP_DOT: return c == '.' || c == '%' || b == CPP_NUMBER;
case CPP_HASH: return c == '#' || c == '%'; /* Digraph form. */
+ case CPP_PRAGMA:
case CPP_NAME: return ((b == CPP_NUMBER
&& name_p (pfile, &token2->val.str))
|| b == CPP_NAME
|| b == CPP_CHAR || b == CPP_STRING); /* L */
case CPP_NUMBER: return (b == CPP_NUMBER || b == CPP_NAME
+ || b == CPP_CHAR
|| c == '.' || c == '+' || c == '-');
/* UCNs */
case CPP_OTHER: return ((token1->val.str.text[0] == '\\'
@@ -4318,9 +4333,9 @@ cpp_directive_only_process (cpp_reader *pfile,
buffer->cur_note = buffer->notes_used = 0;
buffer->cur = buffer->line_base = buffer->next_line;
buffer->need_line = false;
- /* Files always end in a newline. We rely on this for
+ /* Files always end in a newline or carriage return. We rely on this for
character peeking safety. */
- gcc_assert (buffer->rlimit[-1] == '\n');
+ gcc_assert (buffer->rlimit[0] == '\n' || buffer->rlimit[0] == '\r');
const unsigned char *base = buffer->cur;
unsigned line_count = 0;
@@ -4468,8 +4483,9 @@ cpp_directive_only_process (cpp_reader *pfile,
break;
}
}
- cpp_error_with_line (pfile, CPP_DL_ERROR, sloc, 0,
- "unterminated comment");
+ if (pos < limit || is_block)
+ cpp_error_with_line (pfile, CPP_DL_ERROR, sloc, 0,
+ "unterminated comment");
done_comment:
lwm = pos;
break;
@@ -4756,7 +4772,18 @@ cpp_directive_only_process (cpp_reader *pfile,
}
if (buffer->rlimit > base && !pfile->state.skipping)
- cb (pfile, CPP_DO_print, data, line_count, base, buffer->rlimit - base);
+ {
+ const unsigned char *limit = buffer->rlimit;
+ /* If the file was not newline terminated, add rlimit, which is
+ guaranteed to point to a newline, to the end of our range. */
+ if (limit[-1] != '\n')
+ {
+ limit++;
+ CPP_INCREMENT_LINE (pfile, 0);
+ line_count++;
+ }
+ cb (pfile, CPP_DO_print, data, line_count, base, limit - base);
+ }
_cpp_pop_buffer (pfile);
}
diff --git a/libcpp/line-map.c b/libcpp/line-map.c
index bbb6963..1a6902a 100644
--- a/libcpp/line-map.c
+++ b/libcpp/line-map.c
@@ -1,5 +1,5 @@
/* Map (unsigned int) keys to (source file, line, column) triples.
- Copyright (C) 2001-2020 Free Software Foundation, Inc.
+ Copyright (C) 2001-2021 Free Software Foundation, Inc.
This program is free software; you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
@@ -621,27 +621,32 @@ linemap_module_reparent (line_maps *set, location_t loc, location_t adoptor)
}
/* A linemap at LWM-1 was interrupted to insert module locations & imports.
- Append a new map, continuing the interrupted one. */
+ Append a new map, continuing the interrupted one. Return the start location
+ of the new map, or 0 if failed (because we ran out of locations. */
-void
+unsigned
linemap_module_restore (line_maps *set, unsigned lwm)
{
- if (lwm && lwm != LINEMAPS_USED (set, false))
+ linemap_assert (lwm);
+
+ const line_map_ordinary *pre_map
+ = linemap_check_ordinary (LINEMAPS_MAP_AT (set, false, lwm - 1));
+ unsigned src_line = SOURCE_LINE (pre_map, LAST_SOURCE_LINE_LOCATION (pre_map));
+ location_t inc_at = pre_map->included_from;
+ if (const line_map_ordinary *post_map
+ = (linemap_check_ordinary
+ (linemap_add (set, LC_RENAME_VERBATIM,
+ ORDINARY_MAP_IN_SYSTEM_HEADER_P (pre_map),
+ ORDINARY_MAP_FILE_NAME (pre_map), src_line))))
{
- const line_map_ordinary *pre_map
- = linemap_check_ordinary (LINEMAPS_MAP_AT (set, false, lwm - 1));
- unsigned src_line = SOURCE_LINE (pre_map,
- LAST_SOURCE_LINE_LOCATION (pre_map));
- location_t inc_at = pre_map->included_from;
- if (const line_map_ordinary *post_map
- = (linemap_check_ordinary
- (linemap_add (set, LC_RENAME_VERBATIM,
- ORDINARY_MAP_IN_SYSTEM_HEADER_P (pre_map),
- ORDINARY_MAP_FILE_NAME (pre_map), src_line))))
- /* linemap_add will think we were included from the same as
- the preceeding map. */
- const_cast <line_map_ordinary *> (post_map)->included_from = inc_at;
+ /* linemap_add will think we were included from the same as the preceeding
+ map. */
+ const_cast <line_map_ordinary *> (post_map)->included_from = inc_at;
+
+ return post_map->start_location;
}
+
+ return 0;
}
/* Returns TRUE if the line table set tracks token locations across
@@ -976,16 +981,15 @@ linemap_position_for_loc_and_offset (line_maps *set,
(loc + offset) should be less than the first location encoded by
the next line map of the set. Otherwise, we try to encode the
location in the next map. */
- while (map != LINEMAPS_LAST_ORDINARY_MAP (set)
+ for (; map != LINEMAPS_LAST_ORDINARY_MAP (set)
&& (loc + (column_offset << map->m_range_bits)
- >= MAP_START_LOCATION (&map[1])))
- {
- map = &map[1];
- /* If the next map starts in a higher line, we cannot encode the
- location there. */
- if (line < ORDINARY_MAP_STARTING_LINE_NUMBER (map))
- return loc;
- }
+ >= MAP_START_LOCATION (map + 1)); map++)
+ /* If the next map is a different file, or starts in a higher line, we
+ cannot encode the location there. */
+ if ((map + 1)->reason != LC_RENAME
+ || line < ORDINARY_MAP_STARTING_LINE_NUMBER (map + 1)
+ || 0 != strcmp (LINEMAP_FILE (map + 1), LINEMAP_FILE (map)))
+ return loc;
column += column_offset;
@@ -1316,7 +1320,7 @@ linemap_location_from_macro_expansion_p (const class line_maps *set,
if (IS_ADHOC_LOC (location))
location = get_location_from_adhoc_loc (set, location);
- return IS_MACRO_LOC (location);
+ return location >= LINEMAPS_MACRO_LOWEST_LOCATION (set);
}
/* Given two virtual locations *LOC0 and *LOC1, return the first
@@ -1422,17 +1426,20 @@ linemap_compare_locations (line_maps *set,
/* So pre and post represent two tokens that are present in a
same macro expansion. Let's see if the token for pre was
before the token for post in that expansion. */
- unsigned i0, i1;
const struct line_map *map =
first_map_in_common (set, pre, post, &l0, &l1);
if (map == NULL)
- /* This should not be possible. */
- abort ();
-
- i0 = l0 - MAP_START_LOCATION (map);
- i1 = l1 - MAP_START_LOCATION (map);
- return i1 - i0;
+ /* This should not be possible while we have column information, but if
+ we don't, the tokens could be from separate macro expansions on the
+ same line. */
+ gcc_assert (l0 > LINE_MAP_MAX_LOCATION_WITH_COLS);
+ else
+ {
+ unsigned i0 = l0 - MAP_START_LOCATION (map);
+ unsigned i1 = l1 - MAP_START_LOCATION (map);
+ return i1 - i0;
+ }
}
if (IS_ADHOC_LOC (l0))
@@ -2425,6 +2432,14 @@ rich_location::maybe_add_fixit (location_t start,
stop_supporting_fixits ();
return;
}
+ /* If we have very long lines, tokens will eventually fall back to
+ having column == 0.
+ We can't handle fix-it hints that use such locations. */
+ if (exploc_start.column == 0 || exploc_next_loc.column == 0)
+ {
+ stop_supporting_fixits ();
+ return;
+ }
const char *newline = strchr (new_content, '\n');
if (newline)
diff --git a/libcpp/macro.c b/libcpp/macro.c
index cdb1821..f214548 100644
--- a/libcpp/macro.c
+++ b/libcpp/macro.c
@@ -1,5 +1,5 @@
/* Part of CPP library. (Macro and #define handling.)
- Copyright (C) 1986-2020 Free Software Foundation, Inc.
+ Copyright (C) 1986-2021 Free Software Foundation, Inc.
Written by Per Bothner, 1994.
Based on CCCP program by Paul Rubin, June 1986
Adapted to ANSI C, Richard Stallman, Jan 1987
@@ -118,6 +118,7 @@ class vaopt_state {
m_arg (arg),
m_variadic (is_variadic),
m_last_was_paste (false),
+ m_stringify (false),
m_state (0),
m_paste_location (0),
m_location (0),
@@ -145,6 +146,7 @@ class vaopt_state {
}
++m_state;
m_location = token->src_loc;
+ m_stringify = (token->flags & STRINGIFY_ARG) != 0;
return BEGIN;
}
else if (m_state == 1)
@@ -234,6 +236,12 @@ class vaopt_state {
return m_state == 0;
}
+ /* Return true for # __VA_OPT__. */
+ bool stringify () const
+ {
+ return m_stringify;
+ }
+
private:
/* The cpp_reader. */
@@ -247,6 +255,8 @@ class vaopt_state {
/* If true, the previous token was ##. This is used to detect when
a paste occurs at the end of the sequence. */
bool m_last_was_paste;
+ /* True for #__VA_OPT__. */
+ bool m_stringify;
/* The state variable:
0 means not parsing
@@ -284,7 +294,8 @@ static _cpp_buff *collect_args (cpp_reader *, const cpp_hashnode *,
static cpp_context *next_context (cpp_reader *);
static const cpp_token *padding_token (cpp_reader *, const cpp_token *);
static const cpp_token *new_string_token (cpp_reader *, uchar *, unsigned int);
-static const cpp_token *stringify_arg (cpp_reader *, macro_arg *);
+static const cpp_token *stringify_arg (cpp_reader *, const cpp_token **,
+ unsigned int, bool);
static void paste_all_tokens (cpp_reader *, const cpp_token *);
static bool paste_tokens (cpp_reader *, location_t,
const cpp_token **, const cpp_token *);
@@ -531,15 +542,21 @@ _cpp_builtin_macro_text (cpp_reader *pfile, cpp_hashnode *node,
}
break;
case BT_FILE:
+ case BT_FILE_NAME:
case BT_BASE_FILE:
{
unsigned int len;
const char *name;
uchar *buf;
-
- if (node->value.builtin == BT_FILE)
- name = linemap_get_expansion_filename (pfile->line_table,
- pfile->line_table->highest_line);
+
+ if (node->value.builtin == BT_FILE
+ || node->value.builtin == BT_FILE_NAME)
+ {
+ name = linemap_get_expansion_filename (pfile->line_table,
+ pfile->line_table->highest_line);
+ if ((node->value.builtin == BT_FILE_NAME) && name)
+ name = lbasename (name);
+ }
else
{
name = _cpp_get_file_name (pfile->main_file);
@@ -812,10 +829,11 @@ cpp_quote_string (uchar *dest, const uchar *src, unsigned int len)
return dest;
}
-/* Convert a token sequence ARG to a single string token according to
- the rules of the ISO C #-operator. */
+/* Convert a token sequence FIRST to FIRST+COUNT-1 to a single string token
+ according to the rules of the ISO C #-operator. */
static const cpp_token *
-stringify_arg (cpp_reader *pfile, macro_arg *arg)
+stringify_arg (cpp_reader *pfile, const cpp_token **first, unsigned int count,
+ bool va_opt)
{
unsigned char *dest;
unsigned int i, escape_it, backslash_count = 0;
@@ -828,9 +846,27 @@ stringify_arg (cpp_reader *pfile, macro_arg *arg)
*dest++ = '"';
/* Loop, reading in the argument's tokens. */
- for (i = 0; i < arg->count; i++)
+ for (i = 0; i < count; i++)
{
- const cpp_token *token = arg->first[i];
+ const cpp_token *token = first[i];
+
+ if (va_opt && (token->flags & PASTE_LEFT))
+ {
+ location_t virt_loc = pfile->invocation_location;
+ const cpp_token *rhs;
+ do
+ {
+ if (i == count)
+ abort ();
+ rhs = first[++i];
+ if (!paste_tokens (pfile, virt_loc, &token, rhs))
+ {
+ --i;
+ break;
+ }
+ }
+ while (rhs->flags & PASTE_LEFT);
+ }
if (token->type == CPP_PADDING)
{
@@ -917,7 +953,7 @@ paste_tokens (cpp_reader *pfile, location_t location,
cpp_token *lhs;
unsigned int len;
- len = cpp_token_len (*plhs) + cpp_token_len (rhs) + 1;
+ len = cpp_token_len (*plhs) + cpp_token_len (rhs) + 2;
buf = (unsigned char *) alloca (len);
end = lhsend = cpp_spell_token (pfile, *plhs, buf, true);
@@ -943,8 +979,10 @@ paste_tokens (cpp_reader *pfile, location_t location,
location_t saved_loc = lhs->src_loc;
_cpp_pop_buffer (pfile);
- _cpp_backup_tokens (pfile, 1);
- *lhsend = '\0';
+
+ unsigned char *rhsstart = lhsend;
+ if ((*plhs)->type == CPP_DIV && rhs->type != CPP_EQ)
+ rhsstart++;
/* We have to remove the PASTE_LEFT flag from the old lhs, but
we want to keep the new location. */
@@ -956,8 +994,10 @@ paste_tokens (cpp_reader *pfile, location_t location,
/* Mandatory error for all apart from assembler. */
if (CPP_OPTION (pfile, lang) != CLK_ASM)
cpp_error_with_line (pfile, CPP_DL_ERROR, location, 0,
- "pasting \"%s\" and \"%s\" does not give a valid preprocessing token",
- buf, cpp_token_as_text (pfile, rhs));
+ "pasting \"%.*s\" and \"%.*s\" does not give "
+ "a valid preprocessing token",
+ (int) (lhsend - buf), buf,
+ (int) (end - rhsstart), rhsstart);
return false;
}
@@ -1033,7 +1073,10 @@ paste_all_tokens (cpp_reader *pfile, const cpp_token *lhs)
abort ();
}
if (!paste_tokens (pfile, virt_loc, &lhs, rhs))
- break;
+ {
+ _cpp_backup_tokens (pfile, 1);
+ break;
+ }
}
while (rhs->flags & PASTE_LEFT);
@@ -1900,7 +1943,8 @@ replace_args (cpp_reader *pfile, cpp_hashnode *node, cpp_macro *macro,
if (src->flags & STRINGIFY_ARG)
{
if (!arg->stringified)
- arg->stringified = stringify_arg (pfile, arg);
+ arg->stringified = stringify_arg (pfile, arg->first, arg->count,
+ false);
}
else if ((src->flags & PASTE_LEFT)
|| (src != macro->exp.tokens && (src[-1].flags & PASTE_LEFT)))
@@ -1991,7 +2035,7 @@ replace_args (cpp_reader *pfile, cpp_hashnode *node, cpp_macro *macro,
/* __VA_OPT__ handling. */
vaopt_state::update_type vostate = vaopt_tracker.update (src);
- if (vostate != vaopt_state::INCLUDE)
+ if (__builtin_expect (vostate != vaopt_state::INCLUDE, false))
{
if (vostate == vaopt_state::BEGIN)
{
@@ -2014,17 +2058,35 @@ replace_args (cpp_reader *pfile, cpp_hashnode *node, cpp_macro *macro,
const cpp_token **start = vaopt_start;
vaopt_start = NULL;
- /* Remove any tail padding from inside the __VA_OPT__. */
paste_flag = tokens_buff_last_token_ptr (buff);
- while (paste_flag && paste_flag != start
- && (*paste_flag)->type == CPP_PADDING)
+
+ if (vaopt_tracker.stringify ())
{
- tokens_buff_remove_last_token (buff);
- paste_flag = tokens_buff_last_token_ptr (buff);
+ unsigned int count
+ = start ? paste_flag - start : tokens_buff_count (buff);
+ const cpp_token *t
+ = stringify_arg (pfile,
+ start ? start + 1
+ : (const cpp_token **) (buff->base),
+ count, true);
+ while (count--)
+ tokens_buff_remove_last_token (buff);
+ if (src->flags & PASTE_LEFT)
+ copy_paste_flag (pfile, &t, src);
+ tokens_buff_add_token (buff, virt_locs,
+ t, t->src_loc, t->src_loc,
+ NULL, 0);
}
-
- if (src->flags & PASTE_LEFT)
+ else if (src->flags & PASTE_LEFT)
{
+ /* Don't avoid paste after all. */
+ while (paste_flag && paste_flag != start
+ && *paste_flag == &pfile->avoid_paste)
+ {
+ tokens_buff_remove_last_token (buff);
+ paste_flag = tokens_buff_last_token_ptr (buff);
+ }
+
/* With a non-empty __VA_OPT__ on the LHS of ##, the last
token should be flagged PASTE_LEFT. */
if (paste_flag && (*paste_flag)->type != CPP_PADDING)
@@ -2120,11 +2182,8 @@ replace_args (cpp_reader *pfile, cpp_hashnode *node, cpp_macro *macro,
else
paste_flag = tmp_token_ptr;
}
- /* Remove the paste flag if the RHS is a placemarker, unless the
- previous emitted token is at the beginning of __VA_OPT__;
- placemarkers within __VA_OPT__ are ignored in that case. */
- else if (arg_tokens_count == 0
- && tmp_token_ptr != vaopt_start)
+ /* Remove the paste flag if the RHS is a placemarker. */
+ else if (arg_tokens_count == 0)
paste_flag = tmp_token_ptr;
}
}
@@ -2154,7 +2213,8 @@ replace_args (cpp_reader *pfile, cpp_hashnode *node, cpp_macro *macro,
/* Padding on the left of an argument (unless RHS of ##). */
if ((!pfile->state.in_directive || pfile->state.directive_wants_padding)
- && src != macro->exp.tokens && !(src[-1].flags & PASTE_LEFT)
+ && src != macro->exp.tokens
+ && !(src[-1].flags & PASTE_LEFT)
&& !last_token_is (buff, vaopt_start))
{
const cpp_token *t = padding_token (pfile, src);
@@ -2199,8 +2259,8 @@ replace_args (cpp_reader *pfile, cpp_hashnode *node, cpp_macro *macro,
token_index += j;
index = expanded_token_index (pfile, macro, src, token_index);
- tokens_buff_add_token (buff, virt_locs,
- macro_arg_token_iter_get_token (&from),
+ const cpp_token *tok = macro_arg_token_iter_get_token (&from);
+ tokens_buff_add_token (buff, virt_locs, tok,
macro_arg_token_iter_get_location (&from),
src->src_loc, map, index);
macro_arg_token_iter_forward (&from);
@@ -2240,8 +2300,7 @@ replace_args (cpp_reader *pfile, cpp_hashnode *node, cpp_macro *macro,
NODE_NAME (node), src->val.macro_arg.arg_no);
/* Avoid paste on RHS (even case count == 0). */
- if (!pfile->state.in_directive && !(src->flags & PASTE_LEFT)
- && !last_token_is (buff, vaopt_start))
+ if (!pfile->state.in_directive && !(src->flags & PASTE_LEFT))
{
const cpp_token *t = &pfile->avoid_paste;
tokens_buff_add_token (buff, virt_locs,
@@ -3010,7 +3069,7 @@ cpp_get_token_1 (cpp_reader *pfile, location_t *location)
if (need_search)
{
- found = cpp_find_header_unit (pfile, fname, angle, tmp->src_loc);
+ found = _cpp_find_header_unit (pfile, fname, angle, tmp->src_loc);
if (!found)
found = "";
len = strlen (found);
@@ -3110,7 +3169,8 @@ cpp_get_token_with_location (cpp_reader *pfile, location_t *loc)
/* Returns true if we're expanding an object-like macro that was
defined in a system header. Just checks the macro at the top of
- the stack. Used for diagnostic suppression. */
+ the stack. Used for diagnostic suppression.
+ Also return true for builtin macros. */
int
cpp_sys_macro_p (cpp_reader *pfile)
{
@@ -3121,7 +3181,11 @@ cpp_sys_macro_p (cpp_reader *pfile)
else
node = pfile->context->c.macro;
- return node && node->value.macro && node->value.macro->syshdr;
+ if (!node)
+ return false;
+ if (cpp_builtin_macro_p (node))
+ return true;
+ return node->value.macro && node->value.macro->syshdr;
}
/* Read each token in, until end of the current file. Directives are
@@ -3574,7 +3638,10 @@ create_iso_definition (cpp_reader *pfile)
function-like macros when lexing the subsequent token. */
if (macro->count > 1 && token[-1].type == CPP_HASH && macro->fun_like)
{
- if (token->type == CPP_MACRO_ARG)
+ if (token->type == CPP_MACRO_ARG
+ || (macro->variadic
+ && token->type == CPP_NAME
+ && token->val.node.node == pfile->spec_nodes.n__VA_OPT__))
{
if (token->flags & PREV_WHITE)
token->flags |= SP_PREV_WHITE;
diff --git a/libcpp/makeucnid.c b/libcpp/makeucnid.c
index cb529b9..b3a0aab 100644
--- a/libcpp/makeucnid.c
+++ b/libcpp/makeucnid.c
@@ -1,5 +1,5 @@
/* Make ucnid.h from various sources.
- Copyright (C) 2005-2020 Free Software Foundation, Inc.
+ Copyright (C) 2005-2021 Free Software Foundation, Inc.
This program is free software; you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
@@ -17,7 +17,7 @@ along with this program; see the file COPYING3. If not see
/* Run this program as
./makeucnid ucnid.tab UnicodeData.txt DerivedNormalizationProps.txt \
- > ucnid.h
+ DerivedCoreProperties.txt > ucnid.h
*/
#include <stdio.h>
@@ -32,10 +32,12 @@ enum {
N99 = 4,
C11 = 8,
N11 = 16,
- all_languages = C99 | CXX | C11,
- not_NFC = 32,
- not_NFKC = 64,
- maybe_not_NFC = 128
+ CXX23 = 32,
+ NXX23 = 64,
+ all_languages = C99 | CXX | C11 | CXX23 | NXX23,
+ not_NFC = 128,
+ not_NFKC = 256,
+ maybe_not_NFC = 512
};
#define NUM_CODE_POINTS 0x110000
@@ -241,6 +243,74 @@ read_derived (const char *fname)
fclose (f);
}
+/* Read DerivedCoreProperties.txt and fill in languages version in
+ flags from the XID_Start and XID_Continue properties. */
+
+static void
+read_derivedcore (char *fname)
+{
+ FILE * f = fopen (fname, "r");
+
+ if (!f)
+ fail ("opening DerivedCoreProperties.txt");
+ for (;;)
+ {
+ char line[256];
+ unsigned long codepoint_start, codepoint_end;
+ char *l;
+ int i, j;
+
+ if (!fgets (line, sizeof (line), f))
+ break;
+ if (line[0] == '#' || line[0] == '\n' || line[0] == '\r')
+ continue;
+ codepoint_start = strtoul (line, &l, 16);
+ if (l == line)
+ fail ("parsing DerivedCoreProperties.txt, reading code point");
+ if (codepoint_start > MAX_CODE_POINT)
+ fail ("parsing DerivedCoreProperties.txt, code point too large");
+
+ if (*l == '.' && l[1] == '.')
+ {
+ char *l2 = l + 2;
+ codepoint_end = strtoul (l + 2, &l, 16);
+ if (l == l2 || codepoint_end < codepoint_start)
+ fail ("parsing DerivedCoreProperties.txt, reading code point");
+ if (codepoint_end > MAX_CODE_POINT)
+ fail ("parsing DerivedCoreProperties.txt, code point too large");
+ }
+ else
+ codepoint_end = codepoint_start;
+
+ while (*l == ' ')
+ l++;
+ if (*l++ != ';')
+ fail ("parsing DerivedCoreProperties.txt, reading code point");
+
+ while (*l == ' ')
+ l++;
+
+ if (codepoint_end < 0x80)
+ continue;
+
+ if (strncmp (l, "XID_Start ", 10) == 0)
+ {
+ for (; codepoint_start <= codepoint_end; codepoint_start++)
+ flags[codepoint_start]
+ = (flags[codepoint_start] | CXX23) & ~NXX23;
+ }
+ else if (strncmp (l, "XID_Continue ", 13) == 0)
+ {
+ for (; codepoint_start <= codepoint_end; codepoint_start++)
+ if ((flags[codepoint_start] & CXX23) == 0)
+ flags[codepoint_start] |= CXX23 | NXX23;
+ }
+ }
+ if (ferror (f))
+ fail ("reading DerivedCoreProperties.txt");
+ fclose (f);
+}
+
/* Write out the table.
The table consists of two words per entry. The first word is the flags
for the unicode code points up to and including the second word. */
@@ -261,12 +331,14 @@ write_table (void)
|| really_safe != (decomp[i][0] == 0)
|| combining_value[i] != last_combine)
{
- printf ("{ %s|%s|%s|%s|%s|%s|%s|%s|%s, %3d, %#06x },\n",
+ printf ("{ %s|%s|%s|%s|%s|%s|%s|%s|%s|%s|%s, %3d, %#06x },\n",
last_flag & C99 ? "C99" : " 0",
last_flag & N99 ? "N99" : " 0",
last_flag & CXX ? "CXX" : " 0",
last_flag & C11 ? "C11" : " 0",
last_flag & N11 ? "N11" : " 0",
+ last_flag & CXX23 ? "CXX23" : " 0",
+ last_flag & NXX23 ? "NXX23" : " 0",
really_safe ? "CID" : " 0",
last_flag & not_NFC ? " 0" : "NFC",
last_flag & not_NFKC ? " 0" : "NKC",
@@ -274,7 +346,7 @@ write_table (void)
combining_value[i - 1],
i - 1);
last_flag = flags[i];
- last_combine = combining_value[0];
+ last_combine = combining_value[i];
really_safe = decomp[i][0] == 0;
}
@@ -378,7 +450,7 @@ write_copyright (void)
{
static const char copyright[] = "\
/* Unicode characters and various properties.\n\
- Copyright (C) 2003-2020 Free Software Foundation, Inc.\n\
+ Copyright (C) 2003-2021 Free Software Foundation, Inc.\n\
\n\
This program is free software; you can redistribute it and/or modify it\n\
under the terms of the GNU General Public License as published by the\n\
@@ -439,11 +511,12 @@ write_copyright (void)
int
main(int argc, char ** argv)
{
- if (argc != 4)
+ if (argc != 5)
fail ("too few arguments to makeucn");
read_ucnid (argv[1]);
read_table (argv[2]);
read_derived (argv[3]);
+ read_derivedcore (argv[4]);
write_copyright ();
write_table ();
diff --git a/libcpp/mkdeps.c b/libcpp/mkdeps.c
index 4a8e101..1867e00 100644
--- a/libcpp/mkdeps.c
+++ b/libcpp/mkdeps.c
@@ -1,5 +1,5 @@
/* Dependency generator for Makefile fragments.
- Copyright (C) 2000-2020 Free Software Foundation, Inc.
+ Copyright (C) 2000-2021 Free Software Foundation, Inc.
Contributed by Zack Weinberg, Mar 2000
This program is free software; you can redistribute it and/or modify it
@@ -162,7 +162,6 @@ munge (const char *str, const char *trail = nullptr)
/* FALLTHROUGH */
case '#':
- case ':':
buf[dst++] = '\\';
/* FALLTHROUGH */
diff --git a/libcpp/pch.c b/libcpp/pch.c
index fcdf387..bb80964 100644
--- a/libcpp/pch.c
+++ b/libcpp/pch.c
@@ -1,5 +1,5 @@
/* Part of CPP library. (Precompiled header reading/writing.)
- Copyright (C) 2000-2020 Free Software Foundation, Inc.
+ Copyright (C) 2000-2021 Free Software Foundation, Inc.
This program is free software; you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
diff --git a/libcpp/po/ChangeLog b/libcpp/po/ChangeLog
index ef050aa..843a84b 100644
--- a/libcpp/po/ChangeLog
+++ b/libcpp/po/ChangeLog
@@ -1,3 +1,33 @@
+2021-08-16 Joseph Myers <joseph@codesourcery.com>
+
+ * de.po: Update.
+
+2021-07-26 Joseph Myers <joseph@codesourcery.com>
+
+ * cpplib.pot: Regenerate.
+
+2021-03-29 Joseph Myers <joseph@codesourcery.com>
+
+ * sr.po: Update.
+
+2021-03-08 Joseph Myers <joseph@codesourcery.com>
+
+ * eo.po: Update.
+
+2021-02-19 Joseph Myers <joseph@codesourcery.com>
+
+ * be.po, ca.po, da.po, de.po, el.po, eo.po, es.po, fi.po, fr.po,
+ id.po, ja.po, nl.po, pt_BR.po, ru.po, sr.po, sv.po, tr.po, uk.po,
+ vi.po, zh_CN.po, zh_TW.po: Update.
+
+2021-02-05 Joseph Myers <joseph@codesourcery.com>
+
+ * cpplib.pot: Regenerate.
+
+2021-01-07 Joseph Myers <joseph@codesourcery.com>
+
+ * es.po: Update.
+
2020-07-20 Joseph Myers <joseph@codesourcery.com>
* cpplib.pot: Regenerate.
diff --git a/libcpp/po/be.po b/libcpp/po/be.po
index 2438b93..8e3f87f 100644
--- a/libcpp/po/be.po
+++ b/libcpp/po/be.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: gcc 3.1\n"
"Report-Msgid-Bugs-To: https://gcc.gnu.org/bugs/\n"
-"POT-Creation-Date: 2020-02-07 22:33+0000\n"
+"POT-Creation-Date: 2021-02-05 21:38+0000\n"
"PO-Revision-Date: 2002-05-17 15:54+0200\n"
"Last-Translator: Ales Nyakhaychyk <nyakhaychyk@i18n.linux.by>\n"
"Language-Team: Belarusian <i18n@tut.by>\n"
@@ -16,160 +16,160 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"X-Bugs: Report translation errors to the Language-Team address.\n"
-#: charset.c:674
+#: charset.c:677
#, c-format
msgid "conversion from %s to %s not supported by iconv"
msgstr ""
-#: charset.c:677
+#: charset.c:680
msgid "iconv_open"
msgstr ""
-#: charset.c:685
+#: charset.c:688
#, c-format
msgid "no iconv implementation, cannot convert from %s to %s"
msgstr ""
-#: charset.c:781
+#: charset.c:784
#, c-format
msgid "character 0x%lx is not in the basic source character set\n"
msgstr ""
-#: charset.c:798 charset.c:1768
+#: charset.c:801 charset.c:1771
msgid "converting to execution character set"
msgstr ""
-#: charset.c:804
+#: charset.c:807
#, c-format
msgid "character 0x%lx is not unibyte in execution character set"
msgstr ""
-#: charset.c:1054
+#: charset.c:1057
msgid "universal character names are only valid in C++ and C99"
msgstr ""
-#: charset.c:1058
+#: charset.c:1061
msgid "C99's universal character names are incompatible with C90"
msgstr ""
-#: charset.c:1061
+#: charset.c:1064
#, c-format
msgid "the meaning of '\\%c' is different in traditional C"
msgstr ""
-#: charset.c:1070
+#: charset.c:1073
msgid "In _cpp_valid_ucn but not a UCN"
msgstr ""
-#: charset.c:1103
+#: charset.c:1106
#, c-format
msgid "incomplete universal character name %.*s"
msgstr ""
-#: charset.c:1118
+#: charset.c:1121
#, fuzzy, c-format
msgid "%.*s is not a valid universal character"
msgstr "\"%s\" - гэта не пачатак дэкларацыі"
-#: charset.c:1128 lex.c:1335
+#: charset.c:1131 lex.c:1335
msgid "'$' in identifier or number"
msgstr ""
-#: charset.c:1138
+#: charset.c:1141
#, c-format
msgid "universal character %.*s is not valid in an identifier"
msgstr ""
-#: charset.c:1142
+#: charset.c:1145
#, c-format
msgid "universal character %.*s is not valid at the start of an identifier"
msgstr ""
-#: charset.c:1149
+#: charset.c:1152
#, c-format
msgid "%.*s is outside the UCS codespace"
msgstr ""
-#: charset.c:1194 charset.c:2113
+#: charset.c:1197 charset.c:2116
msgid "converting UCN to source character set"
msgstr ""
-#: charset.c:1201
+#: charset.c:1204
msgid "converting UCN to execution character set"
msgstr ""
-#: charset.c:1265
+#: charset.c:1268
#, c-format
msgid "extended character %.*s is not valid in an identifier"
msgstr ""
-#: charset.c:1282
+#: charset.c:1285
#, c-format
msgid "extended character %.*s is not valid at the start of an identifier"
msgstr ""
-#: charset.c:1368
+#: charset.c:1371
msgid "the meaning of '\\x' is different in traditional C"
msgstr ""
-#: charset.c:1393
+#: charset.c:1396
msgid "\\x used with no following hex digits"
msgstr ""
-#: charset.c:1400
+#: charset.c:1403
msgid "hex escape sequence out of range"
msgstr ""
-#: charset.c:1452
+#: charset.c:1455
msgid "octal escape sequence out of range"
msgstr ""
-#: charset.c:1534
+#: charset.c:1537
msgid "the meaning of '\\a' is different in traditional C"
msgstr ""
-#: charset.c:1541
+#: charset.c:1544
#, c-format
msgid "non-ISO-standard escape sequence, '\\%c'"
msgstr ""
-#: charset.c:1549
+#: charset.c:1552
#, fuzzy, c-format
#| msgid "unknown escape sequence '\\%c'"
msgid "unknown escape sequence: '\\%c'"
msgstr "невядомая ESC-паслядоўнасць '\\%c'"
-#: charset.c:1557
+#: charset.c:1560
#, fuzzy, c-format
#| msgid "unknown escape sequence '\\%c'"
msgid "unknown escape sequence: '\\%s'"
msgstr "невядомая ESC-паслядоўнасць '\\%c'"
-#: charset.c:1565
+#: charset.c:1568
msgid "converting escape sequence to execution character set"
msgstr ""
-#: charset.c:1705
+#: charset.c:1708
#, fuzzy
#| msgid "Missing identifier"
msgid "missing open quote"
msgstr "Прапушчан ідэнтыфікатар"
-#: charset.c:1923 charset.c:2002
+#: charset.c:1926 charset.c:2005
#, fuzzy
#| msgid "character constant too long"
msgid "character constant too long for its type"
msgstr "сімвальная канстанта вельмі доўгая"
-#: charset.c:1926
+#: charset.c:1929
msgid "multi-character character constant"
msgstr "мнагасімвальная сімвальная канстанта"
-#: charset.c:2042
+#: charset.c:2045
msgid "empty character constant"
msgstr "пустая сімвальная канстанта"
-#: charset.c:2160
+#: charset.c:2163
#, c-format
msgid "failure to convert %s to %s"
msgstr ""
@@ -240,206 +240,202 @@ msgstr ""
msgid "undefining \"%s\""
msgstr ""
-#: directives.c:724
+#: directives.c:725
msgid "missing terminating > character"
msgstr ""
-#: directives.c:783
+#: directives.c:784
#, c-format
msgid "#%s expects \"FILENAME\" or <FILENAME>"
msgstr ""
-#: directives.c:829
+#: directives.c:830
#, c-format
msgid "empty filename in #%s"
msgstr ""
-#: directives.c:838
+#: directives.c:839
#, c-format
msgid "#include nested depth %u exceeds maximum of %u (use -fmax-include-depth=DEPTH to increase the maximum)"
msgstr ""
-#: directives.c:883
+#: directives.c:884
msgid "#include_next in primary source file"
msgstr ""
-#: directives.c:909
+#: directives.c:910
#, c-format
msgid "invalid flag \"%s\" in line directive"
msgstr ""
-#: directives.c:969
+#: directives.c:970
msgid "unexpected end of file after #line"
msgstr ""
-#: directives.c:972
+#: directives.c:973
#, c-format
msgid "\"%s\" after #line is not a positive integer"
msgstr ""
-#: directives.c:978 directives.c:980
+#: directives.c:979 directives.c:981
msgid "line number out of range"
msgstr ""
-#: directives.c:993 directives.c:1074
+#: directives.c:994 directives.c:1075
#, c-format
msgid "\"%s\" is not a valid filename"
msgstr ""
-#: directives.c:1034
+#: directives.c:1035
#, c-format
msgid "\"%s\" after # is not a positive integer"
msgstr ""
-#: directives.c:1101
+#: directives.c:1102
#, c-format
msgid "file \"%s\" linemarker ignored due to incorrect nesting"
msgstr ""
-#: directives.c:1162 directives.c:1164 directives.c:1166 directives.c:1754
+#: directives.c:1180 directives.c:1182 directives.c:1184 directives.c:1772
#, c-format
msgid "%s"
msgstr ""
-#: directives.c:1190
+#: directives.c:1208
#, fuzzy, c-format
msgid "invalid #%s directive"
msgstr "нерэчаісны ініцыялізатар"
-#: directives.c:1253
+#: directives.c:1271
#, c-format
msgid "registering pragmas in namespace \"%s\" with mismatched name expansion"
msgstr ""
-#: directives.c:1262
+#: directives.c:1280
#, c-format
msgid "registering pragma \"%s\" with name expansion and no namespace"
msgstr ""
-#: directives.c:1280
+#: directives.c:1298
#, c-format
msgid "registering \"%s\" as both a pragma and a pragma namespace"
msgstr ""
-#: directives.c:1283
+#: directives.c:1301
#, fuzzy, c-format
msgid "#pragma %s %s is already registered"
msgstr "Клас \"%s\" ужо існуе"
-#: directives.c:1286
+#: directives.c:1304
#, c-format
msgid "#pragma %s is already registered"
msgstr ""
-#: directives.c:1316
+#: directives.c:1334
msgid "registering pragma with NULL handler"
msgstr ""
-#: directives.c:1533
+#: directives.c:1551
msgid "#pragma once in main file"
msgstr ""
-#: directives.c:1556
+#: directives.c:1574
#, fuzzy
msgid "invalid #pragma push_macro directive"
msgstr "нерэчаісны ініцыялізатар"
-#: directives.c:1613
+#: directives.c:1631
#, fuzzy
msgid "invalid #pragma pop_macro directive"
msgstr "нерэчаісны ініцыялізатар"
-#: directives.c:1668
+#: directives.c:1686
msgid "invalid #pragma GCC poison directive"
msgstr ""
-#: directives.c:1677
+#: directives.c:1695
#, c-format
msgid "poisoning existing macro \"%s\""
msgstr ""
-#: directives.c:1696
+#: directives.c:1714
msgid "#pragma system_header ignored outside include file"
msgstr ""
-#: directives.c:1721
+#: directives.c:1739
#, fuzzy, c-format
#| msgid "cannot find source %s"
msgid "cannot find source file %s"
msgstr "не магу знайсці крыніцу %s"
-#: directives.c:1725
+#: directives.c:1743
#, c-format
msgid "current file is older than %s"
msgstr ""
-#: directives.c:1749
+#: directives.c:1767
#, fuzzy, c-format
msgid "invalid \"#pragma GCC %s\" directive"
msgstr "нерэчаісны ініцыялізатар"
-#: directives.c:1950
+#: directives.c:1968
msgid "_Pragma takes a parenthesized string literal"
msgstr ""
-#: directives.c:2033
+#: directives.c:2051
msgid "#else without #if"
msgstr ""
-#: directives.c:2038
+#: directives.c:2056
msgid "#else after #else"
msgstr ""
-#: directives.c:2040 directives.c:2073
+#: directives.c:2058 directives.c:2091
msgid "the conditional began here"
msgstr ""
-#: directives.c:2066
+#: directives.c:2084
msgid "#elif without #if"
msgstr ""
-#: directives.c:2071
+#: directives.c:2089
msgid "#elif after #else"
msgstr ""
-#: directives.c:2102
+#: directives.c:2120
msgid "#endif without #if"
msgstr ""
-#: directives.c:2178
+#: directives.c:2196
msgid "missing '(' after predicate"
msgstr ""
-#: directives.c:2196
+#: directives.c:2214
msgid "missing ')' to complete answer"
msgstr ""
-#: directives.c:2208
+#: directives.c:2226
msgid "predicate's answer is empty"
msgstr ""
-#: directives.c:2238
+#: directives.c:2256
msgid "assertion without predicate"
msgstr ""
-#: directives.c:2241
+#: directives.c:2259
msgid "predicate must be an identifier"
msgstr ""
-#: directives.c:2323
+#: directives.c:2341
#, c-format
msgid "\"%s\" re-asserted"
msgstr ""
-#: directives.c:2604
+#: directives.c:2659
#, c-format
msgid "unterminated #%s"
msgstr ""
-#: directives-only.c:221 lex.c:2879 traditional.c:174
-msgid "unterminated comment"
-msgstr "незавершаныя каментарыі"
-
#: errors.c:291
#, c-format
msgid "%s: %s"
@@ -449,221 +445,233 @@ msgstr ""
msgid "stdout"
msgstr ""
-#: expr.c:626 expr.c:743
+#: expr.c:636 expr.c:753
msgid "fixed-point constants are a GCC extension"
msgstr ""
-#: expr.c:651
+#: expr.c:661
#, fuzzy
#| msgid "invalid string constant `%E'"
msgid "invalid prefix \"0b\" for floating constant"
msgstr "`%E' - нерэчаісная нязьменная тыпу string"
-#: expr.c:664
+#: expr.c:674
msgid "use of C++17 hexadecimal floating constant"
msgstr ""
-#: expr.c:667
+#: expr.c:677
msgid "use of C99 hexadecimal floating constant"
msgstr ""
-#: expr.c:711
+#: expr.c:721
#, fuzzy, c-format
#| msgid "invalid string constant `%E'"
msgid "invalid suffix \"%.*s\" on floating constant"
msgstr "`%E' - нерэчаісная нязьменная тыпу string"
-#: expr.c:722 expr.c:789
+#: expr.c:732 expr.c:799
#, c-format
msgid "traditional C rejects the \"%.*s\" suffix"
msgstr ""
-#: expr.c:730
+#: expr.c:740
msgid "suffix for double constant is a GCC extension"
msgstr ""
-#: expr.c:736
+#: expr.c:746
#, c-format
msgid "invalid suffix \"%.*s\" with hexadecimal floating constant"
msgstr ""
-#: expr.c:749 expr.c:753
+#: expr.c:759 expr.c:763
msgid "decimal float constants are a C2X feature"
msgstr ""
-#: expr.c:772
+#: expr.c:782
#, fuzzy, c-format
#| msgid "invalid string constant `%E'"
msgid "invalid suffix \"%.*s\" on integer constant"
msgstr "`%E' - нерэчаісная нязьменная тыпу string"
-#: expr.c:797
+#: expr.c:807
msgid "use of C++11 long long integer constant"
msgstr ""
-#: expr.c:798
+#: expr.c:808
msgid "use of C99 long long integer constant"
msgstr ""
-#: expr.c:814
+#: expr.c:822
+msgid "use of C++23 %<size_t%> integer constant"
+msgstr ""
+
+#: expr.c:823
+msgid "use of C++23 %<make_signed_t<size_t>%> integer constant"
+msgstr ""
+
+#: expr.c:834
msgid "imaginary constants are a GCC extension"
msgstr ""
-#: expr.c:820
+#: expr.c:841
msgid "binary constants are a C++14 feature or GCC extension"
msgstr ""
-#: expr.c:822
-msgid "binary constants are a GCC extension"
+#: expr.c:843
+msgid "binary constants are a C2X feature or GCC extension"
msgstr ""
-#: expr.c:917
+#: expr.c:848
+msgid "binary constants are a C2X feature"
+msgstr ""
+
+#: expr.c:944
msgid "integer constant is too large for its type"
msgstr ""
-#: expr.c:948
+#: expr.c:975
msgid "integer constant is so large that it is unsigned"
msgstr ""
-#: expr.c:1043
+#: expr.c:1070
msgid "missing ')' after \"defined\""
msgstr ""
-#: expr.c:1050
+#: expr.c:1077
msgid "operator \"defined\" requires an identifier"
msgstr ""
-#: expr.c:1058
+#: expr.c:1085
#, c-format
msgid "(\"%s\" is an alternative token for \"%s\" in C++)"
msgstr ""
-#: expr.c:1070
+#: expr.c:1098
msgid "this use of \"defined\" may not be portable"
msgstr ""
-#: expr.c:1113
+#: expr.c:1143
msgid "user-defined literal in preprocessor expression"
msgstr ""
-#: expr.c:1118
+#: expr.c:1148
msgid "floating constant in preprocessor expression"
msgstr ""
-#: expr.c:1124
+#: expr.c:1154
msgid "imaginary number in preprocessor expression"
msgstr ""
-#: expr.c:1173
+#: expr.c:1203
#, c-format
msgid "\"%s\" is not defined, evaluates to 0"
msgstr ""
-#: expr.c:1186
+#: expr.c:1216
msgid "assertions are a GCC extension"
msgstr ""
-#: expr.c:1189
+#: expr.c:1219
msgid "assertions are a deprecated extension"
msgstr ""
-#: expr.c:1435
+#: expr.c:1465
#, fuzzy, c-format
#| msgid "unbalanced #endif"
msgid "unbalanced stack in %s"
msgstr "незбалансаваны #endif"
-#: expr.c:1455
+#: expr.c:1485
#, fuzzy, c-format
#| msgid "impossible operator '%s'"
msgid "impossible operator '%u'"
msgstr "немагчымы апэратар '%s'"
-#: expr.c:1556
+#: expr.c:1586
msgid "missing ')' in expression"
msgstr ""
-#: expr.c:1585
+#: expr.c:1615
msgid "'?' without following ':'"
msgstr ""
-#: expr.c:1595
+#: expr.c:1625
msgid "integer overflow in preprocessor expression"
msgstr ""
-#: expr.c:1600
+#: expr.c:1630
msgid "missing '(' in expression"
msgstr ""
-#: expr.c:1632
+#: expr.c:1662
#, c-format
msgid "the left operand of \"%s\" changes sign when promoted"
msgstr ""
-#: expr.c:1637
+#: expr.c:1667
#, c-format
msgid "the right operand of \"%s\" changes sign when promoted"
msgstr ""
-#: expr.c:1896
+#: expr.c:1926
msgid "traditional C rejects the unary plus operator"
msgstr ""
-#: expr.c:1994
+#: expr.c:2024
msgid "comma operator in operand of #if"
msgstr ""
-#: expr.c:2130
+#: expr.c:2160
msgid "division by zero in #if"
msgstr ""
-#: files.c:576
+#: files.c:571
msgid "one or more PCH files were found, but they were invalid"
msgstr ""
-#: files.c:580
+#: files.c:575
msgid "use -Winvalid-pch for more information"
msgstr ""
-#: files.c:1004
+#: files.c:1051
#, c-format
msgid "no include path in which to search for %s"
msgstr ""
-#: files.c:1439
+#: files.c:1546
msgid "Multiple include guards may be useful for:\n"
msgstr ""
-#: init.c:598
+#: init.c:614
msgid "cppchar_t must be an unsigned type"
msgstr ""
-#: init.c:602
+#: init.c:618
#, c-format
msgid "preprocessor arithmetic has maximum precision of %lu bits; target requires %lu bits"
msgstr ""
-#: init.c:609
+#: init.c:625
msgid "CPP arithmetic must be at least as precise as a target int"
msgstr ""
-#: init.c:612
+#: init.c:628
msgid "target char is less than 8 bits wide"
msgstr ""
-#: init.c:616
+#: init.c:632
msgid "target wchar_t is narrower than target char"
msgstr ""
-#: init.c:620
+#: init.c:636
msgid "target int is narrower than target char"
msgstr ""
-#: init.c:625
+#: init.c:641
msgid "CPP half-integer narrower than CPP character"
msgstr ""
-#: init.c:629
+#: init.c:645
#, c-format
msgid "CPP on this host cannot handle wide character constants over %lu bits, but the target requires %lu bits"
msgstr ""
@@ -711,11 +719,11 @@ msgid "`%.*s' is not in NFC"
msgstr "`%D' - гэта ня функцыя,"
#: lex.c:1375
-msgid "__VA_OPT__ is not available until C++2a"
+msgid "__VA_OPT__ is not available until C++20"
msgstr ""
#: lex.c:1382
-msgid "__VA_OPT__ can only appear in the expansion of a C++2a variadic macro"
+msgid "__VA_OPT__ can only appear in the expansion of a C++20 variadic macro"
msgstr ""
#: lex.c:1413 lex.c:1506
@@ -736,241 +744,265 @@ msgstr ""
msgid "identifier \"%s\" is a special operator name in C++"
msgstr ""
-#: lex.c:1837
+#: lex.c:1879
msgid "raw string delimiter longer than 16 characters"
msgstr ""
-#: lex.c:1841
+#: lex.c:1883
msgid "invalid new-line in raw string delimiter"
msgstr ""
-#: lex.c:1845
+#: lex.c:1887 lex.c:4639
#, fuzzy, c-format
msgid "invalid character '%c' in raw string delimiter"
msgstr "сімвальная канстанта вельмі доўгая"
-#: lex.c:1894 lex.c:1916
+#: lex.c:1926 lex.c:1949
#, fuzzy
#| msgid "unterminated comment"
msgid "unterminated raw string"
msgstr "незавершаныя каментарыі"
-#: lex.c:1936 lex.c:2065
+#: lex.c:1971 lex.c:2100
msgid "invalid suffix on literal; C++11 requires a space between literal and string macro"
msgstr ""
-#: lex.c:2048
+#: lex.c:2083
msgid "null character(s) preserved in literal"
msgstr ""
-#: lex.c:2051
+#: lex.c:2086
#, c-format
msgid "missing terminating %c character"
msgstr "прапушчан завяршаючы сімвал %c"
-#: lex.c:2083
+#: lex.c:2118
msgid "C++11 requires a space between string literal and macro"
msgstr ""
-#: lex.c:2893 lex.c:2927
+#: lex.c:2711
+msgid "module control-line cannot be in included file"
+msgstr ""
+
+#: lex.c:2725
+#, c-format
+msgid "module control-line \"%s\" cannot be an object-like macro"
+msgstr ""
+
+#: lex.c:3099 lex.c:4472 traditional.c:174
+msgid "unterminated comment"
+msgstr "незавершаныя каментарыі"
+
+#: lex.c:3113 lex.c:3147
msgid "C++ style comments are not allowed in ISO C90"
msgstr ""
-#: lex.c:2895 lex.c:2906 lex.c:2930
+#: lex.c:3115 lex.c:3126 lex.c:3150
msgid "(this will be reported only once per input file)"
msgstr ""
-#: lex.c:2904
+#: lex.c:3124
msgid "C++ style comments are incompatible with C90"
msgstr ""
-#: lex.c:2936
+#: lex.c:3156
msgid "multi-line comment"
msgstr ""
-#: lex.c:3330
+#: lex.c:3550
#, fuzzy, c-format
msgid "unspellable token %s"
msgstr "немагу адчыніць файл \"%s\""
+#: lex.c:4627
+#, c-format
+msgid "raw string delimiter longer than %d characters"
+msgstr ""
+
+#: lex.c:4697
+#, fuzzy
+#| msgid "unterminated comment"
+msgid "unterminated literal"
+msgstr "незавершаныя каментарыі"
+
#: macro.c:94
msgid "'##' cannot appear at either end of __VA_OPT__"
msgstr ""
-#: macro.c:364
+#: macro.c:386
#, c-format
msgid "\"%s\" used outside of preprocessing directive"
msgstr ""
-#: macro.c:374
+#: macro.c:396
#, c-format
msgid "missing '(' before \"%s\" operand"
msgstr ""
-#: macro.c:389
+#: macro.c:411
#, c-format
msgid "operator \"%s\" requires a header-name"
msgstr ""
-#: macro.c:406
+#: macro.c:428
#, fuzzy, c-format
msgid "missing ')' after \"%s\" operand"
msgstr "прапушчан ініцыялізатар"
-#: macro.c:426
+#: macro.c:448
#, c-format
msgid "macro \"%s\" is not used"
msgstr ""
-#: macro.c:465 macro.c:723
+#: macro.c:487 macro.c:778
#, c-format
msgid "invalid built-in macro \"%s\""
msgstr ""
-#: macro.c:472 macro.c:574
+#: macro.c:494 macro.c:596
#, c-format
msgid "macro \"%s\" might prevent reproducible builds"
msgstr ""
-#: macro.c:503
+#: macro.c:525
#, fuzzy
msgid "could not determine file timestamp"
msgstr "не магу знайсці крыніцу %s\n"
-#: macro.c:620
+#: macro.c:610
#, fuzzy
#| msgid "Could not open data file %s.\n"
msgid "could not determine date and time"
msgstr "Немагчыма адчыніць файл з дадзенымі %s.\n"
-#: macro.c:636
+#: macro.c:642
msgid "__COUNTER__ expanded inside directive with -fdirectives-only"
msgstr ""
-#: macro.c:842
+#: macro.c:897
msgid "invalid string literal, ignoring final '\\'"
msgstr ""
-#: macro.c:904
+#: macro.c:959
#, c-format
msgid "pasting \"%s\" and \"%s\" does not give a valid preprocessing token"
msgstr ""
-#: macro.c:1030
+#: macro.c:1085
msgid "ISO C++11 requires at least one argument for the \"...\" in a variadic macro"
msgstr ""
-#: macro.c:1034
+#: macro.c:1089
msgid "ISO C99 requires at least one argument for the \"...\" in a variadic macro"
msgstr ""
-#: macro.c:1041
+#: macro.c:1096
#, c-format
msgid "macro \"%s\" requires %u arguments, but only %u given"
msgstr ""
-#: macro.c:1046
+#: macro.c:1101
#, c-format
msgid "macro \"%s\" passed %u arguments, but takes just %u"
msgstr ""
-#: macro.c:1244 traditional.c:815
+#: macro.c:1299 traditional.c:822
#, c-format
msgid "unterminated argument list invoking macro \"%s\""
msgstr ""
-#: macro.c:1386
+#: macro.c:1442
#, c-format
msgid "function-like macro \"%s\" must be used with arguments in traditional C"
msgstr ""
-#: macro.c:2165
+#: macro.c:2220
#, c-format
msgid "invoking macro %s argument %d: empty macro arguments are undefined in ISO C++98"
msgstr ""
-#: macro.c:2173 macro.c:2182
+#: macro.c:2228 macro.c:2237
#, c-format
msgid "invoking macro %s argument %d: empty macro arguments are undefined in ISO C90"
msgstr ""
-#: macro.c:3141
+#: macro.c:3279
#, c-format
msgid "duplicate macro parameter \"%s\""
msgstr ""
-#: macro.c:3223
+#: macro.c:3361
#, fuzzy, c-format
msgid "expected parameter name, found \"%s\""
msgstr "віртуальныя функцыі не могуць быць сяброўскімі"
-#: macro.c:3224
+#: macro.c:3362
#, c-format
msgid "expected ',' or ')', found \"%s\""
msgstr ""
-#: macro.c:3225
+#: macro.c:3363
#, fuzzy
msgid "expected parameter name before end of line"
msgstr "віртуальныя функцыі не могуць быць сяброўскімі"
-#: macro.c:3226
+#: macro.c:3364
msgid "expected ')' before end of line"
msgstr ""
-#: macro.c:3227
+#: macro.c:3365
msgid "expected ')' after \"...\""
msgstr ""
-#: macro.c:3284
+#: macro.c:3422
msgid "anonymous variadic macros were introduced in C++11"
msgstr ""
-#: macro.c:3285 macro.c:3289
+#: macro.c:3423 macro.c:3427
msgid "anonymous variadic macros were introduced in C99"
msgstr ""
-#: macro.c:3295
+#: macro.c:3433
#, fuzzy
msgid "ISO C++ does not permit named variadic macros"
msgstr "ISO C89 не падтрымлівае \"long long\""
-#: macro.c:3296
+#: macro.c:3434
msgid "ISO C does not permit named variadic macros"
msgstr ""
-#: macro.c:3342
+#: macro.c:3480
msgid "'##' cannot appear at either end of a macro expansion"
msgstr ""
-#: macro.c:3380
+#: macro.c:3518
msgid "ISO C++11 requires whitespace after the macro name"
msgstr ""
-#: macro.c:3381
+#: macro.c:3519
msgid "ISO C99 requires whitespace after the macro name"
msgstr ""
-#: macro.c:3405
+#: macro.c:3543
#, fuzzy
#| msgid "missing white space after number '%.*s'"
msgid "missing whitespace after the macro name"
msgstr "прапушчан прабел пасля нумара \"%.*s\""
-#: macro.c:3455
+#: macro.c:3593
msgid "'#' is not followed by a macro parameter"
msgstr ""
-#: macro.c:3606
+#: macro.c:3749
#, c-format
msgid "\"%s\" redefined"
msgstr ""
-#: macro.c:3611
+#: macro.c:3754
msgid "this is the location of the previous definition"
msgstr ""
-#: macro.c:3715
+#: macro.c:3891
#, c-format
msgid "macro argument \"%s\" would be stringified in traditional C"
msgstr ""
@@ -1009,12 +1041,12 @@ msgstr ""
msgid "while reading precompiled header"
msgstr ""
-#: traditional.c:884
+#: traditional.c:891
#, c-format
msgid "detected recursion whilst expanding macro \"%s\""
msgstr ""
-#: traditional.c:1107
+#: traditional.c:1114
msgid "syntax error in macro parameter list"
msgstr ""
diff --git a/libcpp/po/ca.po b/libcpp/po/ca.po
index 04e223c..9a98fbd 100644
--- a/libcpp/po/ca.po
+++ b/libcpp/po/ca.po
@@ -11,7 +11,7 @@ msgid ""
msgstr ""
"Project-Id-Version: cpplib-4.0.1\n"
"Report-Msgid-Bugs-To: https://gcc.gnu.org/bugs/\n"
-"POT-Creation-Date: 2020-02-07 22:33+0000\n"
+"POT-Creation-Date: 2021-02-05 21:38+0000\n"
"PO-Revision-Date: 2005-11-25 22:56+0100\n"
"Last-Translator: Mateu Gilles <gilles@mateu.org>\n"
"Language-Team: Catalan <ca@dodds.net>\n"
@@ -21,160 +21,160 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"X-Bugs: Report translation errors to the Language-Team address.\n"
-#: charset.c:674
+#: charset.c:677
#, c-format
msgid "conversion from %s to %s not supported by iconv"
msgstr "iconv no dona suport a la conversi de %s a %s"
-#: charset.c:677
+#: charset.c:680
msgid "iconv_open"
msgstr "iconv_open"
-#: charset.c:685
+#: charset.c:688
#, c-format
msgid "no iconv implementation, cannot convert from %s to %s"
msgstr "cap implementaci de iconv, no es pot convertir de %s a %s"
-#: charset.c:781
+#: charset.c:784
#, c-format
msgid "character 0x%lx is not in the basic source character set\n"
msgstr "el carcter 0x%lx no s en el joc de carcters de base\n"
-#: charset.c:798 charset.c:1768
+#: charset.c:801 charset.c:1771
msgid "converting to execution character set"
msgstr "convertint al joc de carcters d'execuci"
-#: charset.c:804
+#: charset.c:807
#, c-format
msgid "character 0x%lx is not unibyte in execution character set"
msgstr "el carcter 0x%lx no s mono octet en el joc de carcters d'execuci"
-#: charset.c:1054
+#: charset.c:1057
msgid "universal character names are only valid in C++ and C99"
msgstr "els noms de carcter universals noms sn vlids en C++ i C99"
-#: charset.c:1058
+#: charset.c:1061
#, fuzzy
#| msgid "universal character names are only valid in C++ and C99"
msgid "C99's universal character names are incompatible with C90"
msgstr "els noms de carcter universals noms sn vlids en C++ i C99"
-#: charset.c:1061
+#: charset.c:1064
#, c-format
msgid "the meaning of '\\%c' is different in traditional C"
msgstr "el significat de \"\\%c\" s diferent en C tradicional"
-#: charset.c:1070
+#: charset.c:1073
msgid "In _cpp_valid_ucn but not a UCN"
msgstr ""
-#: charset.c:1103
+#: charset.c:1106
#, c-format
msgid "incomplete universal character name %.*s"
msgstr "el nom de carcter universal %.*s s incomplet"
-#: charset.c:1118
+#: charset.c:1121
#, c-format
msgid "%.*s is not a valid universal character"
msgstr "%.*s no s un carcter universal vlid"
-#: charset.c:1128 lex.c:1335
+#: charset.c:1131 lex.c:1335
msgid "'$' in identifier or number"
msgstr "\"$\" en un identificador o un nombre"
-#: charset.c:1138
+#: charset.c:1141
#, c-format
msgid "universal character %.*s is not valid in an identifier"
msgstr "el nom de carcter universal %.*s no s vlid en un identificador"
-#: charset.c:1142
+#: charset.c:1145
#, c-format
msgid "universal character %.*s is not valid at the start of an identifier"
msgstr "el nom de carcter universal %.*s no s vlid a l'inici d'un identificador"
-#: charset.c:1149
+#: charset.c:1152
#, c-format
msgid "%.*s is outside the UCS codespace"
msgstr ""
-#: charset.c:1194 charset.c:2113
+#: charset.c:1197 charset.c:2116
msgid "converting UCN to source character set"
msgstr "convertint UCN al joc font de carcters"
-#: charset.c:1201
+#: charset.c:1204
msgid "converting UCN to execution character set"
msgstr "convertint UCN al joc de carcters d'execuci"
-#: charset.c:1265
+#: charset.c:1268
#, fuzzy, c-format
#| msgid "universal character %.*s is not valid in an identifier"
msgid "extended character %.*s is not valid in an identifier"
msgstr "el nom de carcter universal %.*s no s vlid en un identificador"
-#: charset.c:1282
+#: charset.c:1285
#, fuzzy, c-format
#| msgid "universal character %.*s is not valid at the start of an identifier"
msgid "extended character %.*s is not valid at the start of an identifier"
msgstr "el nom de carcter universal %.*s no s vlid a l'inici d'un identificador"
-#: charset.c:1368
+#: charset.c:1371
msgid "the meaning of '\\x' is different in traditional C"
msgstr "el significat de \"\\x\" s diferent en C tradicional"
-#: charset.c:1393
+#: charset.c:1396
msgid "\\x used with no following hex digits"
msgstr "es va usar \\x sense dgits hexadecimales a continuaci"
-#: charset.c:1400
+#: charset.c:1403
msgid "hex escape sequence out of range"
msgstr "seqncia d'escapa hexadecimal fora de rang"
-#: charset.c:1452
+#: charset.c:1455
msgid "octal escape sequence out of range"
msgstr "seqncia d'escapa octal fora de rang"
-#: charset.c:1534
+#: charset.c:1537
msgid "the meaning of '\\a' is different in traditional C"
msgstr "el significat de \"\\a\" s diferent en C tradicional"
-#: charset.c:1541
+#: charset.c:1544
#, c-format
msgid "non-ISO-standard escape sequence, '\\%c'"
msgstr "seqncia d'escapa que no s estndard ISO, \"\\%c\""
-#: charset.c:1549
+#: charset.c:1552
#, fuzzy, c-format
#| msgid "unknown escape sequence '\\%c'"
msgid "unknown escape sequence: '\\%c'"
msgstr "seqncia d'escapa \"\\%c\" desconeguda"
-#: charset.c:1557
+#: charset.c:1560
#, fuzzy, c-format
#| msgid "unknown escape sequence '\\%c'"
msgid "unknown escape sequence: '\\%s'"
msgstr "seqncia d'escapa \"\\%c\" desconeguda"
-#: charset.c:1565
+#: charset.c:1568
msgid "converting escape sequence to execution character set"
msgstr "convertint una seqncia d'escapa al joc de carcters d'execuci"
-#: charset.c:1705
+#: charset.c:1708
msgid "missing open quote"
msgstr ""
-#: charset.c:1923 charset.c:2002
+#: charset.c:1926 charset.c:2005
msgid "character constant too long for its type"
msgstr "constant de carcter massa gran pel seu tipus"
-#: charset.c:1926
+#: charset.c:1929
msgid "multi-character character constant"
msgstr "constant de carcter amb mltiples carcters"
-#: charset.c:2042
+#: charset.c:2045
msgid "empty character constant"
msgstr "constant de carter buida"
-#: charset.c:2160
+#: charset.c:2163
#, c-format
msgid "failure to convert %s to %s"
msgstr "fallada convertint %s a %s"
@@ -247,210 +247,206 @@ msgstr "els noms de macro han de ser identificadors"
msgid "undefining \"%s\""
msgstr "esborrant la definici de \"%s\""
-#: directives.c:724
+#: directives.c:725
msgid "missing terminating > character"
msgstr "falta el carcter de terminaci >"
-#: directives.c:783
+#: directives.c:784
#, c-format
msgid "#%s expects \"FILENAME\" or <FILENAME>"
msgstr "#%s espera \"NOM_DE_FITXER\" o <NOM_DE_FITXER>"
-#: directives.c:829
+#: directives.c:830
#, c-format
msgid "empty filename in #%s"
msgstr "nom de fitxer buit en #%s"
-#: directives.c:838
+#: directives.c:839
#, c-format
msgid "#include nested depth %u exceeds maximum of %u (use -fmax-include-depth=DEPTH to increase the maximum)"
msgstr ""
-#: directives.c:883
+#: directives.c:884
msgid "#include_next in primary source file"
msgstr "#include_next en el fitxer font primari"
-#: directives.c:909
+#: directives.c:910
#, c-format
msgid "invalid flag \"%s\" in line directive"
msgstr "indicador \"%s\" invlid en la directiva de lnia"
-#: directives.c:969
+#: directives.c:970
msgid "unexpected end of file after #line"
msgstr ""
-#: directives.c:972
+#: directives.c:973
#, c-format
msgid "\"%s\" after #line is not a positive integer"
msgstr "\"%s\" desprs de #line no s un enter positiu"
-#: directives.c:978 directives.c:980
+#: directives.c:979 directives.c:981
msgid "line number out of range"
msgstr "nombre de lnia fora de rang"
-#: directives.c:993 directives.c:1074
+#: directives.c:994 directives.c:1075
#, c-format
msgid "\"%s\" is not a valid filename"
msgstr "\"%s\" no s un nom de fitxer vlid"
-#: directives.c:1034
+#: directives.c:1035
#, c-format
msgid "\"%s\" after # is not a positive integer"
msgstr "\"%s\" desprs de # no s un enter positiu"
-#: directives.c:1101
+#: directives.c:1102
#, c-format
msgid "file \"%s\" linemarker ignored due to incorrect nesting"
msgstr ""
-#: directives.c:1162 directives.c:1164 directives.c:1166 directives.c:1754
+#: directives.c:1180 directives.c:1182 directives.c:1184 directives.c:1772
#, c-format
msgid "%s"
msgstr ""
-#: directives.c:1190
+#: directives.c:1208
#, fuzzy, c-format
#| msgid "invalid #ident directive"
msgid "invalid #%s directive"
msgstr "directiva #ident invlida"
-#: directives.c:1253
+#: directives.c:1271
#, c-format
msgid "registering pragmas in namespace \"%s\" with mismatched name expansion"
msgstr ""
-#: directives.c:1262
+#: directives.c:1280
#, fuzzy, c-format
#| msgid "registering \"%s\" as both a pragma and a pragma namespace"
msgid "registering pragma \"%s\" with name expansion and no namespace"
msgstr "desant \"%s\" com a pragma i espai de noms de pragma"
-#: directives.c:1280
+#: directives.c:1298
#, c-format
msgid "registering \"%s\" as both a pragma and a pragma namespace"
msgstr "desant \"%s\" com a pragma i espai de noms de pragma"
-#: directives.c:1283
+#: directives.c:1301
#, c-format
msgid "#pragma %s %s is already registered"
msgstr "ja s'ha desat #pragma %s %s"
-#: directives.c:1286
+#: directives.c:1304
#, c-format
msgid "#pragma %s is already registered"
msgstr "ja s'ha desat #pragma %s"
-#: directives.c:1316
+#: directives.c:1334
msgid "registering pragma with NULL handler"
msgstr ""
-#: directives.c:1533
+#: directives.c:1551
msgid "#pragma once in main file"
msgstr "#pragma una vegada en el fitxer principal"
-#: directives.c:1556
+#: directives.c:1574
#, fuzzy
#| msgid "invalid #pragma GCC poison directive"
msgid "invalid #pragma push_macro directive"
msgstr "directiva #pragma de GCC enverinada invlida"
-#: directives.c:1613
+#: directives.c:1631
#, fuzzy
#| msgid "invalid #pragma GCC poison directive"
msgid "invalid #pragma pop_macro directive"
msgstr "directiva #pragma de GCC enverinada invlida"
-#: directives.c:1668
+#: directives.c:1686
msgid "invalid #pragma GCC poison directive"
msgstr "directiva #pragma de GCC enverinada invlida"
-#: directives.c:1677
+#: directives.c:1695
#, c-format
msgid "poisoning existing macro \"%s\""
msgstr "enverinant la macro existent \"%s\""
-#: directives.c:1696
+#: directives.c:1714
msgid "#pragma system_header ignored outside include file"
msgstr "#pragma system_header ignorat fora del fitxer d'inclusi"
-#: directives.c:1721
+#: directives.c:1739
#, c-format
msgid "cannot find source file %s"
msgstr "no es pot trobar la font %s"
-#: directives.c:1725
+#: directives.c:1743
#, c-format
msgid "current file is older than %s"
msgstr "el fitxer actual s ms vell que %s"
-#: directives.c:1749
+#: directives.c:1767
#, fuzzy, c-format
#| msgid "invalid #pragma GCC poison directive"
msgid "invalid \"#pragma GCC %s\" directive"
msgstr "directiva #pragma de GCC enverinada invlida"
-#: directives.c:1950
+#: directives.c:1968
msgid "_Pragma takes a parenthesized string literal"
msgstr "_Pragma pren una cadena literal entre parntesis"
-#: directives.c:2033
+#: directives.c:2051
msgid "#else without #if"
msgstr "#else sense #if"
-#: directives.c:2038
+#: directives.c:2056
msgid "#else after #else"
msgstr "#else desprs de #else"
-#: directives.c:2040 directives.c:2073
+#: directives.c:2058 directives.c:2091
msgid "the conditional began here"
msgstr "el condicional va comenar aqu"
-#: directives.c:2066
+#: directives.c:2084
msgid "#elif without #if"
msgstr "#elif sense #if"
-#: directives.c:2071
+#: directives.c:2089
msgid "#elif after #else"
msgstr "#elif desprs de #else"
-#: directives.c:2102
+#: directives.c:2120
msgid "#endif without #if"
msgstr "#endif sense #if"
-#: directives.c:2178
+#: directives.c:2196
msgid "missing '(' after predicate"
msgstr "falta \"(\" abans del predicat"
-#: directives.c:2196
+#: directives.c:2214
msgid "missing ')' to complete answer"
msgstr "falta \")\" per a completar la resposta"
-#: directives.c:2208
+#: directives.c:2226
msgid "predicate's answer is empty"
msgstr "el predicat de la resposta est buit"
-#: directives.c:2238
+#: directives.c:2256
msgid "assertion without predicate"
msgstr "afirmaci sense predicat"
-#: directives.c:2241
+#: directives.c:2259
msgid "predicate must be an identifier"
msgstr "el predicat ha de ser un identificador"
-#: directives.c:2323
+#: directives.c:2341
#, c-format
msgid "\"%s\" re-asserted"
msgstr "\"%s\" reafirmat"
-#: directives.c:2604
+#: directives.c:2659
#, c-format
msgid "unterminated #%s"
msgstr "#%s sense acabar"
-#: directives-only.c:221 lex.c:2879 traditional.c:174
-msgid "unterminated comment"
-msgstr "comentari sense acabar"
-
#: errors.c:291
#, c-format
msgid "%s: %s"
@@ -460,238 +456,256 @@ msgstr "%s: %s"
msgid "stdout"
msgstr "stdout"
-#: expr.c:626 expr.c:743
+#: expr.c:636 expr.c:753
#, fuzzy
#| msgid "imaginary constants are a GCC extension"
msgid "fixed-point constants are a GCC extension"
msgstr "les constants imaginries sn una extensi d'el GCC"
-#: expr.c:651
+#: expr.c:661
#, fuzzy
#| msgid "invalid suffix \"%.*s\" on floating constant"
msgid "invalid prefix \"0b\" for floating constant"
msgstr "sufix \"%.*s\" invlid en la constant de coma flotant"
-#: expr.c:664
+#: expr.c:674
#, fuzzy
#| msgid "use of C99 hexadecimal floating constant"
msgid "use of C++17 hexadecimal floating constant"
msgstr "s d'una constant de coma flotant hexadecimal C99"
-#: expr.c:667
+#: expr.c:677
msgid "use of C99 hexadecimal floating constant"
msgstr "s d'una constant de coma flotant hexadecimal C99"
-#: expr.c:711
+#: expr.c:721
#, c-format
msgid "invalid suffix \"%.*s\" on floating constant"
msgstr "sufix \"%.*s\" invlid en la constant de coma flotant"
-#: expr.c:722 expr.c:789
+#: expr.c:732 expr.c:799
#, c-format
msgid "traditional C rejects the \"%.*s\" suffix"
msgstr "el C tradicional rebutja el sufix \"%.*s\""
-#: expr.c:730
+#: expr.c:740
#, fuzzy
#| msgid "imaginary constants are a GCC extension"
msgid "suffix for double constant is a GCC extension"
msgstr "les constants imaginries sn una extensi d'el GCC"
-#: expr.c:736
+#: expr.c:746
#, fuzzy, c-format
#| msgid "invalid suffix \"%.*s\" on floating constant"
msgid "invalid suffix \"%.*s\" with hexadecimal floating constant"
msgstr "sufix \"%.*s\" invlid en la constant de coma flotant"
-#: expr.c:749 expr.c:753
+#: expr.c:759 expr.c:763
#, fuzzy
#| msgid "hexadecimal floating constants require an exponent"
msgid "decimal float constants are a C2X feature"
msgstr "la constant de coma flotant hexadecimal requereix un exponent"
-#: expr.c:772
+#: expr.c:782
#, c-format
msgid "invalid suffix \"%.*s\" on integer constant"
msgstr "sufix \"%.*s\" invlid en constant entera"
-#: expr.c:797
+#: expr.c:807
#, fuzzy
#| msgid "use of C99 long long integer constant"
msgid "use of C++11 long long integer constant"
msgstr "s d'una constant entera long long C99"
-#: expr.c:798
+#: expr.c:808
msgid "use of C99 long long integer constant"
msgstr "s d'una constant entera long long C99"
-#: expr.c:814
+#: expr.c:822
+#, fuzzy
+#| msgid "use of C99 long long integer constant"
+msgid "use of C++23 %<size_t%> integer constant"
+msgstr "s d'una constant entera long long C99"
+
+#: expr.c:823
+#, fuzzy
+#| msgid "use of C99 long long integer constant"
+msgid "use of C++23 %<make_signed_t<size_t>%> integer constant"
+msgstr "s d'una constant entera long long C99"
+
+#: expr.c:834
msgid "imaginary constants are a GCC extension"
msgstr "les constants imaginries sn una extensi d'el GCC"
-#: expr.c:820
+#: expr.c:841
#, fuzzy
#| msgid "imaginary constants are a GCC extension"
msgid "binary constants are a C++14 feature or GCC extension"
msgstr "les constants imaginries sn una extensi d'el GCC"
-#: expr.c:822
+#: expr.c:843
+#, fuzzy
+#| msgid "imaginary constants are a GCC extension"
+msgid "binary constants are a C2X feature or GCC extension"
+msgstr "les constants imaginries sn una extensi d'el GCC"
+
+#: expr.c:848
#, fuzzy
#| msgid "imaginary constants are a GCC extension"
-msgid "binary constants are a GCC extension"
+msgid "binary constants are a C2X feature"
msgstr "les constants imaginries sn una extensi d'el GCC"
-#: expr.c:917
+#: expr.c:944
msgid "integer constant is too large for its type"
msgstr "la constant entera s massa gran pel seu tipus"
-#: expr.c:948
+#: expr.c:975
msgid "integer constant is so large that it is unsigned"
msgstr "la constant entera s tan gran que s unsigned"
-#: expr.c:1043
+#: expr.c:1070
msgid "missing ')' after \"defined\""
msgstr "\")\" faltant desprs de \"defined\""
-#: expr.c:1050
+#: expr.c:1077
msgid "operator \"defined\" requires an identifier"
msgstr "l'operador \"defined\" requereix un identificador"
-#: expr.c:1058
+#: expr.c:1085
#, c-format
msgid "(\"%s\" is an alternative token for \"%s\" in C++)"
msgstr "(\"%s\" s un element alternatiu per a \"%s\" en C++)"
-#: expr.c:1070
+#: expr.c:1098
msgid "this use of \"defined\" may not be portable"
msgstr "aquest s de \"defined\" podria no ser portable"
-#: expr.c:1113
+#: expr.c:1143
#, fuzzy
#| msgid "integer overflow in preprocessor expression"
msgid "user-defined literal in preprocessor expression"
msgstr "desbordament d'enter en l'expressi del preprocessador"
-#: expr.c:1118
+#: expr.c:1148
msgid "floating constant in preprocessor expression"
msgstr "constant de coma flotant en l'expressi del preprocessador"
-#: expr.c:1124
+#: expr.c:1154
msgid "imaginary number in preprocessor expression"
msgstr "nombre imaginari en l'expressi del preprocessador"
-#: expr.c:1173
+#: expr.c:1203
#, fuzzy, c-format
#| msgid "\"%s\" is not defined"
msgid "\"%s\" is not defined, evaluates to 0"
msgstr "\"%s\" no s definit"
-#: expr.c:1186
+#: expr.c:1216
#, fuzzy
#| msgid "#%s is a GCC extension"
msgid "assertions are a GCC extension"
msgstr "#%s s una extenci del GCC"
-#: expr.c:1189
+#: expr.c:1219
msgid "assertions are a deprecated extension"
msgstr ""
-#: expr.c:1435
+#: expr.c:1465
#, fuzzy, c-format
#| msgid "unbalanced stack in #if"
msgid "unbalanced stack in %s"
msgstr "pila desequilibrada en #if"
-#: expr.c:1455
+#: expr.c:1485
#, c-format
msgid "impossible operator '%u'"
msgstr "operador \"%u\" impossible"
-#: expr.c:1556
+#: expr.c:1586
msgid "missing ')' in expression"
msgstr "\")\" faltant en l'expressi"
-#: expr.c:1585
+#: expr.c:1615
msgid "'?' without following ':'"
msgstr " \"?\" sense el \":\" segent"
-#: expr.c:1595
+#: expr.c:1625
msgid "integer overflow in preprocessor expression"
msgstr "desbordament d'enter en l'expressi del preprocessador"
-#: expr.c:1600
+#: expr.c:1630
msgid "missing '(' in expression"
msgstr "\"(\" faltant en l'expressi"
-#: expr.c:1632
+#: expr.c:1662
#, c-format
msgid "the left operand of \"%s\" changes sign when promoted"
msgstr "l'operant esquera de \"%s\" canvia el signe quan s promogut"
-#: expr.c:1637
+#: expr.c:1667
#, c-format
msgid "the right operand of \"%s\" changes sign when promoted"
msgstr "l'operant dreta de \"%s\" canvia el signe quan s promogut"
-#: expr.c:1896
+#: expr.c:1926
msgid "traditional C rejects the unary plus operator"
msgstr "C tradicional rebutja l'operador unari ms"
-#: expr.c:1994
+#: expr.c:2024
msgid "comma operator in operand of #if"
msgstr "operador coma en operant de #if"
-#: expr.c:2130
+#: expr.c:2160
msgid "division by zero in #if"
msgstr "divisi per zero en #if"
-#: files.c:576
+#: files.c:571
msgid "one or more PCH files were found, but they were invalid"
msgstr "un o ms fitxers PCH varen ser trobats, per varen ser invlids"
-#: files.c:580
+#: files.c:575
msgid "use -Winvalid-pch for more information"
msgstr "usi -Winvalid-pch per a ms informaci"
-#: files.c:1004
+#: files.c:1051
#, c-format
msgid "no include path in which to search for %s"
msgstr "no hi ha ruta d'inclusi en la qual cercar %s"
-#: files.c:1439
+#: files.c:1546
msgid "Multiple include guards may be useful for:\n"
msgstr "Mltiples gurdies d'inclusi poden ser tils per a:\n"
-#: init.c:598
+#: init.c:614
msgid "cppchar_t must be an unsigned type"
msgstr "cppchar_t ha de ser d'un tipus unsigned"
-#: init.c:602
+#: init.c:618
#, c-format
msgid "preprocessor arithmetic has maximum precision of %lu bits; target requires %lu bits"
msgstr "l'aritmtica del preprocesador t una precisi mxima de %lu bits; l'objectiu requereix %lu bits"
-#: init.c:609
+#: init.c:625
msgid "CPP arithmetic must be at least as precise as a target int"
msgstr "l'aritmtica de CPP ha de ser almenys tan precisa com un int de l'objectiu"
-#: init.c:612
+#: init.c:628
msgid "target char is less than 8 bits wide"
msgstr "el char de l'objectiu t menys de 8 bits d'ampliaria"
-#: init.c:616
+#: init.c:632
msgid "target wchar_t is narrower than target char"
msgstr "el wchar_t de l'objectiu s ms estret qu'el char de l'objectiu"
-#: init.c:620
+#: init.c:636
msgid "target int is narrower than target char"
msgstr "el int de l'objectiu s ms estret qu'el char de l'objectiu"
-#: init.c:625
+#: init.c:641
msgid "CPP half-integer narrower than CPP character"
msgstr "el half-integer de CPP s ms estret que el carcter de CPP"
-#: init.c:629
+#: init.c:645
#, c-format
msgid "CPP on this host cannot handle wide character constants over %lu bits, but the target requires %lu bits"
msgstr "CPP no pot manejar constants de carcter amples ms enll de %lu bits en aquest ordinador, per l'objectiu requereix %lu bits"
@@ -740,13 +754,13 @@ msgid "`%.*s' is not in NFC"
msgstr "\"%s\" no s definit"
#: lex.c:1375
-msgid "__VA_OPT__ is not available until C++2a"
+msgid "__VA_OPT__ is not available until C++20"
msgstr ""
#: lex.c:1382
#, fuzzy
#| msgid "__VA_ARGS__ can only appear in the expansion of a C99 variadic macro"
-msgid "__VA_OPT__ can only appear in the expansion of a C++2a variadic macro"
+msgid "__VA_OPT__ can only appear in the expansion of a C++20 variadic macro"
msgstr "__VA_ARGS__ solament pot aparixer en l'expansi d'una macro variadic C99"
#: lex.c:1413 lex.c:1506
@@ -769,254 +783,278 @@ msgstr "__VA_ARGS__ solament pot aparixer en l'expansi d'una macro variadic C9
msgid "identifier \"%s\" is a special operator name in C++"
msgstr ""
-#: lex.c:1837
+#: lex.c:1879
msgid "raw string delimiter longer than 16 characters"
msgstr ""
-#: lex.c:1841
+#: lex.c:1883
msgid "invalid new-line in raw string delimiter"
msgstr ""
-#: lex.c:1845
+#: lex.c:1887 lex.c:4639
#, fuzzy, c-format
#| msgid "universal character %.*s is not valid in an identifier"
msgid "invalid character '%c' in raw string delimiter"
msgstr "el nom de carcter universal %.*s no s vlid en un identificador"
-#: lex.c:1894 lex.c:1916
+#: lex.c:1926 lex.c:1949
#, fuzzy
#| msgid "unterminated #%s"
msgid "unterminated raw string"
msgstr "#%s sense acabar"
-#: lex.c:1936 lex.c:2065
+#: lex.c:1971 lex.c:2100
msgid "invalid suffix on literal; C++11 requires a space between literal and string macro"
msgstr ""
-#: lex.c:2048
+#: lex.c:2083
msgid "null character(s) preserved in literal"
msgstr "carcter(es) nul(s) preservats en la literal"
-#: lex.c:2051
+#: lex.c:2086
#, fuzzy, c-format
#| msgid "missing terminating > character"
msgid "missing terminating %c character"
msgstr "falta el carcter de terminaci >"
-#: lex.c:2083
+#: lex.c:2118
msgid "C++11 requires a space between string literal and macro"
msgstr ""
-#: lex.c:2893 lex.c:2927
+#: lex.c:2711
+msgid "module control-line cannot be in included file"
+msgstr ""
+
+#: lex.c:2725
+#, c-format
+msgid "module control-line \"%s\" cannot be an object-like macro"
+msgstr ""
+
+#: lex.c:3099 lex.c:4472 traditional.c:174
+msgid "unterminated comment"
+msgstr "comentari sense acabar"
+
+#: lex.c:3113 lex.c:3147
msgid "C++ style comments are not allowed in ISO C90"
msgstr "els comentaris d'estil C++ no sn permesos en ISO C90"
-#: lex.c:2895 lex.c:2906 lex.c:2930
+#: lex.c:3115 lex.c:3126 lex.c:3150
msgid "(this will be reported only once per input file)"
msgstr "(aix es reportar solament una vegada per cada fitxer d'entrada)"
-#: lex.c:2904
+#: lex.c:3124
#, fuzzy
#| msgid "C++ style comments are not allowed in ISO C90"
msgid "C++ style comments are incompatible with C90"
msgstr "els comentaris d'estil C++ no sn permesos en ISO C90"
-#: lex.c:2936
+#: lex.c:3156
msgid "multi-line comment"
msgstr "comentari en mltiples lnies"
-#: lex.c:3330
+#: lex.c:3550
#, c-format
msgid "unspellable token %s"
msgstr "Element %s impronunciable"
+#: lex.c:4627
+#, c-format
+msgid "raw string delimiter longer than %d characters"
+msgstr ""
+
+#: lex.c:4697
+#, fuzzy
+#| msgid "unterminated #%s"
+msgid "unterminated literal"
+msgstr "#%s sense acabar"
+
#: macro.c:94
#, fuzzy
#| msgid "'##' cannot appear at either end of a macro expansion"
msgid "'##' cannot appear at either end of __VA_OPT__"
msgstr "\"##\" no pot apareixer en o al final d'una expansi de macro"
-#: macro.c:364
+#: macro.c:386
#, fuzzy, c-format
#| msgid "%s in preprocessing directive"
msgid "\"%s\" used outside of preprocessing directive"
msgstr "%s en una directiva de preprocessament"
-#: macro.c:374
+#: macro.c:396
#, fuzzy, c-format
#| msgid "missing '(' in expression"
msgid "missing '(' before \"%s\" operand"
msgstr "\"(\" faltant en l'expressi"
-#: macro.c:389
+#: macro.c:411
#, fuzzy, c-format
#| msgid "operator \"defined\" requires an identifier"
msgid "operator \"%s\" requires a header-name"
msgstr "l'operador \"defined\" requereix un identificador"
-#: macro.c:406
+#: macro.c:428
#, fuzzy, c-format
#| msgid "missing ')' after \"defined\""
msgid "missing ')' after \"%s\" operand"
msgstr "\")\" faltant desprs de \"defined\""
-#: macro.c:426
+#: macro.c:448
#, c-format
msgid "macro \"%s\" is not used"
msgstr "no s'usa la macro \"%s\""
-#: macro.c:465 macro.c:723
+#: macro.c:487 macro.c:778
#, c-format
msgid "invalid built-in macro \"%s\""
msgstr "macro interna \"%s\" invlida"
-#: macro.c:472 macro.c:574
+#: macro.c:494 macro.c:596
#, c-format
msgid "macro \"%s\" might prevent reproducible builds"
msgstr ""
-#: macro.c:503
+#: macro.c:525
#, fuzzy
#| msgid "could not determine date and time"
msgid "could not determine file timestamp"
msgstr "no es pot determinar la data i l'hora"
-#: macro.c:620
+#: macro.c:610
msgid "could not determine date and time"
msgstr "no es pot determinar la data i l'hora"
-#: macro.c:636
+#: macro.c:642
msgid "__COUNTER__ expanded inside directive with -fdirectives-only"
msgstr ""
-#: macro.c:842
+#: macro.c:897
msgid "invalid string literal, ignoring final '\\'"
msgstr "cadena literal invlida, s'ignora el \"\\\" final"
-#: macro.c:904
+#: macro.c:959
#, c-format
msgid "pasting \"%s\" and \"%s\" does not give a valid preprocessing token"
msgstr "enganxar \"%s\" i \"%s\" no dna un element de preprocessament vlid"
-#: macro.c:1030
+#: macro.c:1085
msgid "ISO C++11 requires at least one argument for the \"...\" in a variadic macro"
msgstr ""
-#: macro.c:1034
+#: macro.c:1089
#, fuzzy
#| msgid "ISO C99 requires rest arguments to be used"
msgid "ISO C99 requires at least one argument for the \"...\" in a variadic macro"
msgstr "ISO C99 requereix que la resta dels arguments sigui usat"
-#: macro.c:1041
+#: macro.c:1096
#, c-format
msgid "macro \"%s\" requires %u arguments, but only %u given"
msgstr "la macro \"%s\" requereix %u arguments, per noms %u passats"
-#: macro.c:1046
+#: macro.c:1101
#, c-format
msgid "macro \"%s\" passed %u arguments, but takes just %u"
msgstr "la macro \"%s\" va rebre %u arguments, per en va prendre solament %u"
-#: macro.c:1244 traditional.c:815
+#: macro.c:1299 traditional.c:822
#, c-format
msgid "unterminated argument list invoking macro \"%s\""
msgstr "llista d'arguments sense acabar a l'invocar la macro \"%s\""
-#: macro.c:1386
+#: macro.c:1442
#, c-format
msgid "function-like macro \"%s\" must be used with arguments in traditional C"
msgstr "la funci de macro \"%s\" s'ha d'usar amb arguments en C tradicional"
-#: macro.c:2165
+#: macro.c:2220
#, c-format
msgid "invoking macro %s argument %d: empty macro arguments are undefined in ISO C++98"
msgstr ""
-#: macro.c:2173 macro.c:2182
+#: macro.c:2228 macro.c:2237
#, c-format
msgid "invoking macro %s argument %d: empty macro arguments are undefined in ISO C90"
msgstr ""
-#: macro.c:3141
+#: macro.c:3279
#, c-format
msgid "duplicate macro parameter \"%s\""
msgstr "parmetre de macro \"%s\" duplicat"
-#: macro.c:3223
+#: macro.c:3361
#, c-format
msgid "expected parameter name, found \"%s\""
msgstr ""
-#: macro.c:3224
+#: macro.c:3362
#, c-format
msgid "expected ',' or ')', found \"%s\""
msgstr ""
-#: macro.c:3225
+#: macro.c:3363
msgid "expected parameter name before end of line"
msgstr ""
-#: macro.c:3226
+#: macro.c:3364
msgid "expected ')' before end of line"
msgstr ""
-#: macro.c:3227
+#: macro.c:3365
msgid "expected ')' after \"...\""
msgstr ""
-#: macro.c:3284
+#: macro.c:3422
#, fuzzy
#| msgid "anonymous variadic macros were introduced in C99"
msgid "anonymous variadic macros were introduced in C++11"
msgstr "els macros variadic annims es van introduir en C99"
-#: macro.c:3285 macro.c:3289
+#: macro.c:3423 macro.c:3427
msgid "anonymous variadic macros were introduced in C99"
msgstr "els macros variadic annims es van introduir en C99"
-#: macro.c:3295
+#: macro.c:3433
#, fuzzy
#| msgid "ISO C does not permit named variadic macros"
msgid "ISO C++ does not permit named variadic macros"
msgstr "ISO C no permet macros variadic nomenats"
-#: macro.c:3296
+#: macro.c:3434
msgid "ISO C does not permit named variadic macros"
msgstr "ISO C no permet macros variadic nomenats"
-#: macro.c:3342
+#: macro.c:3480
msgid "'##' cannot appear at either end of a macro expansion"
msgstr "\"##\" no pot apareixer en o al final d'una expansi de macro"
-#: macro.c:3380
+#: macro.c:3518
#, fuzzy
#| msgid "ISO C99 requires whitespace after the macro name"
msgid "ISO C++11 requires whitespace after the macro name"
msgstr "ISO C99 requereix espais en blanc desprs del nom de macro"
-#: macro.c:3381
+#: macro.c:3519
msgid "ISO C99 requires whitespace after the macro name"
msgstr "ISO C99 requereix espais en blanc desprs del nom de macro"
-#: macro.c:3405
+#: macro.c:3543
msgid "missing whitespace after the macro name"
msgstr "espais en blanc faltant desprs del nom de macro"
-#: macro.c:3455
+#: macro.c:3593
msgid "'#' is not followed by a macro parameter"
msgstr "\"#\" no s seguit per un parmetre de macro"
-#: macro.c:3606
+#: macro.c:3749
#, c-format
msgid "\"%s\" redefined"
msgstr "\"%s\" re-definit"
-#: macro.c:3611
+#: macro.c:3754
msgid "this is the location of the previous definition"
msgstr "aquesta s la ubicaci de la definici prvia"
-#: macro.c:3715
+#: macro.c:3891
#, c-format
msgid "macro argument \"%s\" would be stringified in traditional C"
msgstr "l'argument de macro \"%s\" hauria de ser convertit en cadena en C traditional"
@@ -1056,12 +1094,12 @@ msgstr "%s: no utilitzat perqu \"%s\" s definit"
msgid "while reading precompiled header"
msgstr "mentre llegint capalera precompilada"
-#: traditional.c:884
+#: traditional.c:891
#, c-format
msgid "detected recursion whilst expanding macro \"%s\""
msgstr "whilst recursiu detectat en expandint la macro \"%s\""
-#: traditional.c:1107
+#: traditional.c:1114
msgid "syntax error in macro parameter list"
msgstr "error sintctic en la llista de parmetre de macro"
diff --git a/libcpp/po/cpplib.pot b/libcpp/po/cpplib.pot
index 81aa102a..8894fb8 100644
--- a/libcpp/po/cpplib.pot
+++ b/libcpp/po/cpplib.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: https://gcc.gnu.org/bugs/\n"
-"POT-Creation-Date: 2020-07-20 18:03+0000\n"
+"POT-Creation-Date: 2021-07-26 15:25+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,427 +17,429 @@ msgstr ""
"Content-Type: text/plain; charset=CHARSET\n"
"Content-Transfer-Encoding: 8bit\n"
-#: charset.c:674
+#: charset.c:677
#, c-format
msgid "conversion from %s to %s not supported by iconv"
msgstr ""
-#: charset.c:677
+#: charset.c:680
msgid "iconv_open"
msgstr ""
-#: charset.c:685
+#: charset.c:688
#, c-format
msgid "no iconv implementation, cannot convert from %s to %s"
msgstr ""
-#: charset.c:781
+#: charset.c:784
#, c-format
msgid "character 0x%lx is not in the basic source character set\n"
msgstr ""
-#: charset.c:798
-#: charset.c:1768
+#: charset.c:801
+#: charset.c:1771
msgid "converting to execution character set"
msgstr ""
-#: charset.c:804
+#: charset.c:807
#, c-format
msgid "character 0x%lx is not unibyte in execution character set"
msgstr ""
-#: charset.c:1054
+#: charset.c:1057
msgid "universal character names are only valid in C++ and C99"
msgstr ""
-#: charset.c:1058
+#: charset.c:1061
msgid "C99's universal character names are incompatible with C90"
msgstr ""
-#: charset.c:1061
+#: charset.c:1064
#, c-format
msgid "the meaning of '\\%c' is different in traditional C"
msgstr ""
-#: charset.c:1070
+#: charset.c:1073
msgid "In _cpp_valid_ucn but not a UCN"
msgstr ""
-#: charset.c:1103
+#: charset.c:1106
#, c-format
msgid "incomplete universal character name %.*s"
msgstr ""
-#: charset.c:1118
+#: charset.c:1121
#, c-format
msgid "%.*s is not a valid universal character"
msgstr ""
-#: charset.c:1128
+#: charset.c:1131
#: lex.c:1335
msgid "'$' in identifier or number"
msgstr ""
-#: charset.c:1138
+#: charset.c:1141
#, c-format
msgid "universal character %.*s is not valid in an identifier"
msgstr ""
-#: charset.c:1142
+#: charset.c:1145
#, c-format
msgid "universal character %.*s is not valid at the start of an identifier"
msgstr ""
-#: charset.c:1149
+#: charset.c:1152
#, c-format
msgid "%.*s is outside the UCS codespace"
msgstr ""
-#: charset.c:1194
-#: charset.c:2113
+#: charset.c:1197
+#: charset.c:2116
msgid "converting UCN to source character set"
msgstr ""
-#: charset.c:1201
+#: charset.c:1204
msgid "converting UCN to execution character set"
msgstr ""
-#: charset.c:1265
+#: charset.c:1268
#, c-format
msgid "extended character %.*s is not valid in an identifier"
msgstr ""
-#: charset.c:1282
+#: charset.c:1285
#, c-format
msgid "extended character %.*s is not valid at the start of an identifier"
msgstr ""
-#: charset.c:1368
+#: charset.c:1371
msgid "the meaning of '\\x' is different in traditional C"
msgstr ""
-#: charset.c:1393
+#: charset.c:1396
msgid "\\x used with no following hex digits"
msgstr ""
-#: charset.c:1400
+#: charset.c:1403
msgid "hex escape sequence out of range"
msgstr ""
-#: charset.c:1452
+#: charset.c:1455
msgid "octal escape sequence out of range"
msgstr ""
-#: charset.c:1534
+#: charset.c:1537
msgid "the meaning of '\\a' is different in traditional C"
msgstr ""
-#: charset.c:1541
+#: charset.c:1544
#, c-format
msgid "non-ISO-standard escape sequence, '\\%c'"
msgstr ""
-#: charset.c:1549
+#: charset.c:1552
#, c-format
msgid "unknown escape sequence: '\\%c'"
msgstr ""
-#: charset.c:1557
+#: charset.c:1560
#, c-format
msgid "unknown escape sequence: '\\%s'"
msgstr ""
-#: charset.c:1565
+#: charset.c:1568
msgid "converting escape sequence to execution character set"
msgstr ""
-#: charset.c:1705
+#: charset.c:1708
msgid "missing open quote"
msgstr ""
-#: charset.c:1923
-#: charset.c:2002
+#: charset.c:1926
+#: charset.c:2005
msgid "character constant too long for its type"
msgstr ""
-#: charset.c:1926
+#: charset.c:1929
msgid "multi-character character constant"
msgstr ""
-#: charset.c:2042
+#: charset.c:2045
msgid "empty character constant"
msgstr ""
-#: charset.c:2160
+#: charset.c:2163
#, c-format
msgid "failure to convert %s to %s"
msgstr ""
-#: directives.c:229
-#: directives.c:272
+#: directives.c:237
+#: directives.c:280
#, c-format
msgid "extra tokens at end of #%s directive"
msgstr ""
-#: directives.c:379
+#: directives.c:387
#, c-format
msgid "#%s is a GCC extension"
msgstr ""
-#: directives.c:384
+#: directives.c:392
#, c-format
msgid "#%s is a deprecated GCC extension"
msgstr ""
-#: directives.c:397
+#: directives.c:405
msgid "suggest not using #elif in traditional C"
msgstr ""
-#: directives.c:400
+#: directives.c:408
#, c-format
msgid "traditional C ignores #%s with the # indented"
msgstr ""
-#: directives.c:404
+#: directives.c:412
#, c-format
msgid "suggest hiding #%s from traditional C with an indented #"
msgstr ""
-#: directives.c:430
+#: directives.c:438
msgid "embedding a directive within macro arguments is not portable"
msgstr ""
-#: directives.c:450
+#: directives.c:462
msgid "style of line directive is a GCC extension"
msgstr ""
-#: directives.c:531
+#: directives.c:543
#, c-format
msgid "invalid preprocessing directive #%s"
msgstr ""
-#: directives.c:601
+#: directives.c:613
#, c-format
msgid "\"%s\" cannot be used as a macro name"
msgstr ""
-#: directives.c:608
+#: directives.c:620
#, c-format
msgid "\"%s\" cannot be used as a macro name as it is an operator in C++"
msgstr ""
-#: directives.c:611
+#: directives.c:623
#, c-format
msgid "no macro name given in #%s directive"
msgstr ""
-#: directives.c:614
+#: directives.c:626
msgid "macro names must be identifiers"
msgstr ""
-#: directives.c:663
-#: directives.c:668
+#: directives.c:675
+#: directives.c:680
#, c-format
msgid "undefining \"%s\""
msgstr ""
-#: directives.c:724
+#: directives.c:737
msgid "missing terminating > character"
msgstr ""
-#: directives.c:783
+#: directives.c:796
#, c-format
msgid "#%s expects \"FILENAME\" or <FILENAME>"
msgstr ""
-#: directives.c:829
+#: directives.c:842
#, c-format
msgid "empty filename in #%s"
msgstr ""
-#: directives.c:838
+#: directives.c:851
#, c-format
msgid ""
"#include nested depth %u exceeds maximum of %u (use -fmax-include-"
"depth=DEPTH to increase the maximum)"
msgstr ""
-#: directives.c:883
+#: directives.c:896
msgid "#include_next in primary source file"
msgstr ""
-#: directives.c:909
+#: directives.c:922
#, c-format
msgid "invalid flag \"%s\" in line directive"
msgstr ""
-#: directives.c:969
+#: directives.c:989
msgid "unexpected end of file after #line"
msgstr ""
-#: directives.c:972
+#: directives.c:992
#, c-format
msgid "\"%s\" after #line is not a positive integer"
msgstr ""
-#: directives.c:978
-#: directives.c:980
+#: directives.c:998
+#: directives.c:1000
msgid "line number out of range"
msgstr ""
-#: directives.c:993
-#: directives.c:1074
+#: directives.c:1013
+#: directives.c:1094
#, c-format
msgid "\"%s\" is not a valid filename"
msgstr ""
-#: directives.c:1034
+#: directives.c:1054
#, c-format
msgid "\"%s\" after # is not a positive integer"
msgstr ""
-#: directives.c:1101
+#: directives.c:1121
#, c-format
msgid "file \"%s\" linemarker ignored due to incorrect nesting"
msgstr ""
-#: directives.c:1178
-#: directives.c:1180
-#: directives.c:1182
-#: directives.c:1770
+#: directives.c:1199
+#: directives.c:1201
+#: directives.c:1203
+#: directives.c:1791
#, c-format
msgid "%s"
msgstr ""
-#: directives.c:1206
+#: directives.c:1227
#, c-format
msgid "invalid #%s directive"
msgstr ""
-#: directives.c:1269
+#: directives.c:1290
#, c-format
msgid "registering pragmas in namespace \"%s\" with mismatched name expansion"
msgstr ""
-#: directives.c:1278
+#: directives.c:1299
#, c-format
msgid "registering pragma \"%s\" with name expansion and no namespace"
msgstr ""
-#: directives.c:1296
+#: directives.c:1317
#, c-format
msgid "registering \"%s\" as both a pragma and a pragma namespace"
msgstr ""
-#: directives.c:1299
+#: directives.c:1320
#, c-format
msgid "#pragma %s %s is already registered"
msgstr ""
-#: directives.c:1302
+#: directives.c:1323
#, c-format
msgid "#pragma %s is already registered"
msgstr ""
-#: directives.c:1332
+#: directives.c:1353
msgid "registering pragma with NULL handler"
msgstr ""
-#: directives.c:1549
+#: directives.c:1570
msgid "#pragma once in main file"
msgstr ""
-#: directives.c:1572
+#: directives.c:1593
msgid "invalid #pragma push_macro directive"
msgstr ""
-#: directives.c:1629
+#: directives.c:1650
msgid "invalid #pragma pop_macro directive"
msgstr ""
-#: directives.c:1684
+#: directives.c:1705
msgid "invalid #pragma GCC poison directive"
msgstr ""
-#: directives.c:1693
+#: directives.c:1714
#, c-format
msgid "poisoning existing macro \"%s\""
msgstr ""
-#: directives.c:1712
+#: directives.c:1733
msgid "#pragma system_header ignored outside include file"
msgstr ""
-#: directives.c:1737
+#: directives.c:1758
#, c-format
msgid "cannot find source file %s"
msgstr ""
-#: directives.c:1741
+#: directives.c:1762
#, c-format
msgid "current file is older than %s"
msgstr ""
-#: directives.c:1765
+#: directives.c:1786
#, c-format
msgid "invalid \"#pragma GCC %s\" directive"
msgstr ""
-#: directives.c:1966
+#: directives.c:1987
msgid "_Pragma takes a parenthesized string literal"
msgstr ""
-#: directives.c:2049
+#: directives.c:2070
msgid "#else without #if"
msgstr ""
-#: directives.c:2054
+#: directives.c:2075
msgid "#else after #else"
msgstr ""
-#: directives.c:2056
-#: directives.c:2089
+#: directives.c:2077
+#: directives.c:2111
msgid "the conditional began here"
msgstr ""
-#: directives.c:2082
-msgid "#elif without #if"
+#: directives.c:2103
+#, c-format
+msgid "#%s without #if"
msgstr ""
-#: directives.c:2087
-msgid "#elif after #else"
+#: directives.c:2108
+#, c-format
+msgid "#%s after #else"
msgstr ""
-#: directives.c:2118
+#: directives.c:2175
msgid "#endif without #if"
msgstr ""
-#: directives.c:2194
+#: directives.c:2251
msgid "missing '(' after predicate"
msgstr ""
-#: directives.c:2212
+#: directives.c:2269
msgid "missing ')' to complete answer"
msgstr ""
-#: directives.c:2224
+#: directives.c:2281
msgid "predicate's answer is empty"
msgstr ""
-#: directives.c:2254
+#: directives.c:2311
msgid "assertion without predicate"
msgstr ""
-#: directives.c:2257
+#: directives.c:2314
msgid "predicate must be an identifier"
msgstr ""
-#: directives.c:2339
+#: directives.c:2396
#, c-format
msgid "\"%s\" re-asserted"
msgstr ""
-#: directives.c:2620
+#: directives.c:2714
#, c-format
msgid "unterminated #%s"
msgstr ""
@@ -451,168 +453,180 @@ msgstr ""
msgid "stdout"
msgstr ""
-#: expr.c:626
-#: expr.c:743
+#: expr.c:632
+#: expr.c:749
msgid "fixed-point constants are a GCC extension"
msgstr ""
-#: expr.c:651
+#: expr.c:657
msgid "invalid prefix \"0b\" for floating constant"
msgstr ""
-#: expr.c:664
+#: expr.c:670
msgid "use of C++17 hexadecimal floating constant"
msgstr ""
-#: expr.c:667
+#: expr.c:673
msgid "use of C99 hexadecimal floating constant"
msgstr ""
-#: expr.c:711
+#: expr.c:717
#, c-format
msgid "invalid suffix \"%.*s\" on floating constant"
msgstr ""
-#: expr.c:722
-#: expr.c:789
+#: expr.c:728
+#: expr.c:795
#, c-format
msgid "traditional C rejects the \"%.*s\" suffix"
msgstr ""
-#: expr.c:730
+#: expr.c:736
msgid "suffix for double constant is a GCC extension"
msgstr ""
-#: expr.c:736
+#: expr.c:742
#, c-format
msgid "invalid suffix \"%.*s\" with hexadecimal floating constant"
msgstr ""
-#: expr.c:749
-#: expr.c:753
+#: expr.c:755
+#: expr.c:759
msgid "decimal float constants are a C2X feature"
msgstr ""
-#: expr.c:772
+#: expr.c:778
#, c-format
msgid "invalid suffix \"%.*s\" on integer constant"
msgstr ""
-#: expr.c:797
+#: expr.c:803
msgid "use of C++11 long long integer constant"
msgstr ""
-#: expr.c:798
+#: expr.c:804
msgid "use of C99 long long integer constant"
msgstr ""
-#: expr.c:814
+#: expr.c:818
+msgid "use of C++23 %<size_t%> integer constant"
+msgstr ""
+
+#: expr.c:819
+msgid "use of C++23 %<make_signed_t<size_t>%> integer constant"
+msgstr ""
+
+#: expr.c:830
msgid "imaginary constants are a GCC extension"
msgstr ""
-#: expr.c:820
+#: expr.c:837
msgid "binary constants are a C++14 feature or GCC extension"
msgstr ""
-#: expr.c:822
-msgid "binary constants are a GCC extension"
+#: expr.c:839
+msgid "binary constants are a C2X feature or GCC extension"
+msgstr ""
+
+#: expr.c:844
+msgid "binary constants are a C2X feature"
msgstr ""
-#: expr.c:917
+#: expr.c:940
msgid "integer constant is too large for its type"
msgstr ""
-#: expr.c:948
+#: expr.c:971
msgid "integer constant is so large that it is unsigned"
msgstr ""
-#: expr.c:1043
+#: expr.c:1066
msgid "missing ')' after \"defined\""
msgstr ""
-#: expr.c:1050
+#: expr.c:1073
msgid "operator \"defined\" requires an identifier"
msgstr ""
-#: expr.c:1058
+#: expr.c:1081
#, c-format
msgid "(\"%s\" is an alternative token for \"%s\" in C++)"
msgstr ""
-#: expr.c:1070
+#: expr.c:1094
msgid "this use of \"defined\" may not be portable"
msgstr ""
-#: expr.c:1113
+#: expr.c:1139
msgid "user-defined literal in preprocessor expression"
msgstr ""
-#: expr.c:1118
+#: expr.c:1144
msgid "floating constant in preprocessor expression"
msgstr ""
-#: expr.c:1124
+#: expr.c:1150
msgid "imaginary number in preprocessor expression"
msgstr ""
-#: expr.c:1173
+#: expr.c:1199
#, c-format
msgid "\"%s\" is not defined, evaluates to 0"
msgstr ""
-#: expr.c:1186
+#: expr.c:1212
msgid "assertions are a GCC extension"
msgstr ""
-#: expr.c:1189
+#: expr.c:1215
msgid "assertions are a deprecated extension"
msgstr ""
-#: expr.c:1435
+#: expr.c:1461
#, c-format
msgid "unbalanced stack in %s"
msgstr ""
-#: expr.c:1455
+#: expr.c:1481
#, c-format
msgid "impossible operator '%u'"
msgstr ""
-#: expr.c:1556
+#: expr.c:1582
msgid "missing ')' in expression"
msgstr ""
-#: expr.c:1585
+#: expr.c:1611
msgid "'?' without following ':'"
msgstr ""
-#: expr.c:1595
+#: expr.c:1621
msgid "integer overflow in preprocessor expression"
msgstr ""
-#: expr.c:1600
+#: expr.c:1626
msgid "missing '(' in expression"
msgstr ""
-#: expr.c:1632
+#: expr.c:1658
#, c-format
msgid "the left operand of \"%s\" changes sign when promoted"
msgstr ""
-#: expr.c:1637
+#: expr.c:1663
#, c-format
msgid "the right operand of \"%s\" changes sign when promoted"
msgstr ""
-#: expr.c:1896
+#: expr.c:1922
msgid "traditional C rejects the unary plus operator"
msgstr ""
-#: expr.c:1994
+#: expr.c:2020
msgid "comma operator in operand of #if"
msgstr ""
-#: expr.c:2130
+#: expr.c:2156
msgid "division by zero in #if"
msgstr ""
@@ -624,47 +638,47 @@ msgstr ""
msgid "use -Winvalid-pch for more information"
msgstr ""
-#: files.c:1003
+#: files.c:1055
#, c-format
msgid "no include path in which to search for %s"
msgstr ""
-#: files.c:1439
+#: files.c:1573
msgid "Multiple include guards may be useful for:\n"
msgstr ""
-#: init.c:597
+#: init.c:617
msgid "cppchar_t must be an unsigned type"
msgstr ""
-#: init.c:601
+#: init.c:621
#, c-format
msgid ""
"preprocessor arithmetic has maximum precision of %lu bits; target requires "
"%lu bits"
msgstr ""
-#: init.c:608
+#: init.c:628
msgid "CPP arithmetic must be at least as precise as a target int"
msgstr ""
-#: init.c:611
+#: init.c:631
msgid "target char is less than 8 bits wide"
msgstr ""
-#: init.c:615
+#: init.c:635
msgid "target wchar_t is narrower than target char"
msgstr ""
-#: init.c:619
+#: init.c:639
msgid "target int is narrower than target char"
msgstr ""
-#: init.c:624
+#: init.c:644
msgid "CPP half-integer narrower than CPP character"
msgstr ""
-#: init.c:628
+#: init.c:648
#, c-format
msgid ""
"CPP on this host cannot handle wide character constants over %lu bits, but "
@@ -742,81 +756,94 @@ msgstr ""
msgid "identifier \"%s\" is a special operator name in C++"
msgstr ""
-#: lex.c:1872
+#: lex.c:1572
+msgid "adjacent digit separators"
+msgstr ""
+
+#: lex.c:1889
msgid "raw string delimiter longer than 16 characters"
msgstr ""
-#: lex.c:1876
+#: lex.c:1893
msgid "invalid new-line in raw string delimiter"
msgstr ""
-#: lex.c:1880
-#: lex.c:4265
+#: lex.c:1897
+#: lex.c:4652
#, c-format
msgid "invalid character '%c' in raw string delimiter"
msgstr ""
-#: lex.c:1918
-#: lex.c:1941
+#: lex.c:1936
+#: lex.c:1959
msgid "unterminated raw string"
msgstr ""
-#: lex.c:1963
-#: lex.c:2092
+#: lex.c:1981
+#: lex.c:2110
msgid ""
"invalid suffix on literal; C++11 requires a space between literal and string "
"macro"
msgstr ""
-#: lex.c:2075
+#: lex.c:2093
msgid "null character(s) preserved in literal"
msgstr ""
-#: lex.c:2078
+#: lex.c:2096
#, c-format
msgid "missing terminating %c character"
msgstr ""
-#: lex.c:2110
+#: lex.c:2128
msgid "C++11 requires a space between string literal and macro"
msgstr ""
-#: lex.c:2913
-#: lex.c:4098
+#: lex.c:2721
+msgid "module control-line cannot be in included file"
+msgstr ""
+
+#: lex.c:2735
+#, c-format
+msgid "module control-line \"%s\" cannot be an object-like macro"
+msgstr ""
+
+#: lex.c:3109
+#: lex.c:4485
#: traditional.c:174
msgid "unterminated comment"
msgstr ""
-#: lex.c:2927
-#: lex.c:2961
+#: lex.c:3123
+#: lex.c:3157
msgid "C++ style comments are not allowed in ISO C90"
msgstr ""
-#: lex.c:2929
-#: lex.c:2940
-#: lex.c:2964
+#: lex.c:3125
+#: lex.c:3136
+#: lex.c:3160
msgid "(this will be reported only once per input file)"
msgstr ""
-#: lex.c:2938
+#: lex.c:3134
msgid "C++ style comments are incompatible with C90"
msgstr ""
-#: lex.c:2970
+#: lex.c:3166
msgid "multi-line comment"
msgstr ""
-#: lex.c:3364
+#: lex.c:3560
#, c-format
msgid "unspellable token %s"
msgstr ""
-#: lex.c:4253
+#: lex.c:4640
#, c-format
msgid "raw string delimiter longer than %d characters"
msgstr ""
-#: lex.c:4323
+#: lex.c:4710
msgid "unterminated literal"
msgstr ""
@@ -824,183 +851,183 @@ msgstr ""
msgid "'##' cannot appear at either end of __VA_OPT__"
msgstr ""
-#: macro.c:388
+#: macro.c:386
#, c-format
msgid "\"%s\" used outside of preprocessing directive"
msgstr ""
-#: macro.c:398
+#: macro.c:396
#, c-format
msgid "missing '(' before \"%s\" operand"
msgstr ""
-#: macro.c:413
+#: macro.c:411
#, c-format
msgid "operator \"%s\" requires a header-name"
msgstr ""
-#: macro.c:430
+#: macro.c:428
#, c-format
msgid "missing ')' after \"%s\" operand"
msgstr ""
-#: macro.c:450
+#: macro.c:448
#, c-format
msgid "macro \"%s\" is not used"
msgstr ""
-#: macro.c:489
-#: macro.c:747
+#: macro.c:487
+#: macro.c:784
#, c-format
msgid "invalid built-in macro \"%s\""
msgstr ""
-#: macro.c:496
-#: macro.c:598
+#: macro.c:494
+#: macro.c:602
#, c-format
msgid "macro \"%s\" might prevent reproducible builds"
msgstr ""
-#: macro.c:527
+#: macro.c:525
msgid "could not determine file timestamp"
msgstr ""
-#: macro.c:644
+#: macro.c:616
msgid "could not determine date and time"
msgstr ""
-#: macro.c:660
+#: macro.c:648
msgid "__COUNTER__ expanded inside directive with -fdirectives-only"
msgstr ""
-#: macro.c:866
+#: macro.c:903
msgid "invalid string literal, ignoring final '\\'"
msgstr ""
-#: macro.c:928
+#: macro.c:965
#, c-format
msgid "pasting \"%s\" and \"%s\" does not give a valid preprocessing token"
msgstr ""
-#: macro.c:1054
+#: macro.c:1091
msgid ""
"ISO C++11 requires at least one argument for the \"...\" in a variadic macro"
msgstr ""
-#: macro.c:1058
+#: macro.c:1095
msgid ""
"ISO C99 requires at least one argument for the \"...\" in a variadic macro"
msgstr ""
-#: macro.c:1065
+#: macro.c:1102
#, c-format
msgid "macro \"%s\" requires %u arguments, but only %u given"
msgstr ""
-#: macro.c:1070
+#: macro.c:1107
#, c-format
msgid "macro \"%s\" passed %u arguments, but takes just %u"
msgstr ""
-#: macro.c:1270
-#: traditional.c:819
+#: macro.c:1305
+#: traditional.c:822
#, c-format
msgid "unterminated argument list invoking macro \"%s\""
msgstr ""
-#: macro.c:1412
+#: macro.c:1448
#, c-format
msgid "function-like macro \"%s\" must be used with arguments in traditional C"
msgstr ""
-#: macro.c:2190
+#: macro.c:2226
#, c-format
msgid ""
"invoking macro %s argument %d: empty macro arguments are undefined in ISO C+"
"+98"
msgstr ""
-#: macro.c:2198
-#: macro.c:2207
+#: macro.c:2234
+#: macro.c:2243
#, c-format
msgid ""
"invoking macro %s argument %d: empty macro arguments are undefined in ISO C90"
msgstr ""
-#: macro.c:3164
+#: macro.c:3285
#, c-format
msgid "duplicate macro parameter \"%s\""
msgstr ""
-#: macro.c:3246
+#: macro.c:3367
#, c-format
msgid "expected parameter name, found \"%s\""
msgstr ""
-#: macro.c:3247
+#: macro.c:3368
#, c-format
msgid "expected ',' or ')', found \"%s\""
msgstr ""
-#: macro.c:3248
+#: macro.c:3369
msgid "expected parameter name before end of line"
msgstr ""
-#: macro.c:3249
+#: macro.c:3370
msgid "expected ')' before end of line"
msgstr ""
-#: macro.c:3250
+#: macro.c:3371
msgid "expected ')' after \"...\""
msgstr ""
-#: macro.c:3307
+#: macro.c:3428
msgid "anonymous variadic macros were introduced in C++11"
msgstr ""
-#: macro.c:3308
-#: macro.c:3312
+#: macro.c:3429
+#: macro.c:3433
msgid "anonymous variadic macros were introduced in C99"
msgstr ""
-#: macro.c:3318
+#: macro.c:3439
msgid "ISO C++ does not permit named variadic macros"
msgstr ""
-#: macro.c:3319
+#: macro.c:3440
msgid "ISO C does not permit named variadic macros"
msgstr ""
-#: macro.c:3365
+#: macro.c:3486
msgid "'##' cannot appear at either end of a macro expansion"
msgstr ""
-#: macro.c:3403
+#: macro.c:3524
msgid "ISO C++11 requires whitespace after the macro name"
msgstr ""
-#: macro.c:3404
+#: macro.c:3525
msgid "ISO C99 requires whitespace after the macro name"
msgstr ""
-#: macro.c:3428
+#: macro.c:3549
msgid "missing whitespace after the macro name"
msgstr ""
-#: macro.c:3478
+#: macro.c:3599
msgid "'#' is not followed by a macro parameter"
msgstr ""
-#: macro.c:3629
+#: macro.c:3755
#, c-format
msgid "\"%s\" redefined"
msgstr ""
-#: macro.c:3634
+#: macro.c:3760
msgid "this is the location of the previous definition"
msgstr ""
-#: macro.c:3738
+#: macro.c:3897
#, c-format
msgid "macro argument \"%s\" would be stringified in traditional C"
msgstr ""
@@ -1045,11 +1072,11 @@ msgstr ""
msgid "while reading precompiled header"
msgstr ""
-#: traditional.c:888
+#: traditional.c:891
#, c-format
msgid "detected recursion whilst expanding macro \"%s\""
msgstr ""
-#: traditional.c:1111
+#: traditional.c:1114
msgid "syntax error in macro parameter list"
msgstr ""
diff --git a/libcpp/po/da.po b/libcpp/po/da.po
index 24035d7..e05765a 100644
--- a/libcpp/po/da.po
+++ b/libcpp/po/da.po
@@ -130,7 +130,7 @@ msgid ""
msgstr ""
"Project-Id-Version: cpplib 10.1-b20200209\n"
"Report-Msgid-Bugs-To: https://gcc.gnu.org/bugs/\n"
-"POT-Creation-Date: 2020-02-07 22:33+0000\n"
+"POT-Creation-Date: 2021-02-05 21:38+0000\n"
"PO-Revision-Date: 2020-03-08 18:00+0200\n"
"Last-Translator: Joe Hansen <joedalton2@yahoo.dk>\n"
"Language-Team: Danish <dansk@dansk-gruppen.dk>\n"
@@ -140,154 +140,154 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"X-Bugs: Report translation errors to the Language-Team address.\n"
-#: charset.c:674
+#: charset.c:677
#, c-format
msgid "conversion from %s to %s not supported by iconv"
msgstr "konvertering fra %s til %s er ikke understøttet af iconv"
-#: charset.c:677
+#: charset.c:680
msgid "iconv_open"
msgstr "iconv_open"
-#: charset.c:685
+#: charset.c:688
#, c-format
msgid "no iconv implementation, cannot convert from %s to %s"
msgstr "ingen iconv-implementering, kan ikke konvertere fra %s til %s"
-#: charset.c:781
+#: charset.c:784
#, c-format
msgid "character 0x%lx is not in the basic source character set\n"
msgstr "tegnet 0x%lx er ikke det grundlæggende kildetegnsæt\n"
-#: charset.c:798 charset.c:1768
+#: charset.c:801 charset.c:1771
msgid "converting to execution character set"
msgstr "konverterer til kørseltegnsæt"
-#: charset.c:804
+#: charset.c:807
#, c-format
msgid "character 0x%lx is not unibyte in execution character set"
msgstr "tegn 0x%lx er ikke unibyte i kørseltegnsæt"
-#: charset.c:1054
+#: charset.c:1057
msgid "universal character names are only valid in C++ and C99"
msgstr "universelle tegnnavne er kun gyldige i C++ og C99"
-#: charset.c:1058
+#: charset.c:1061
msgid "C99's universal character names are incompatible with C90"
msgstr "C99's universelle tegnnavne er ikke kompatible med C90"
-#: charset.c:1061
+#: charset.c:1064
#, c-format
msgid "the meaning of '\\%c' is different in traditional C"
msgstr "betydningen af »\\%c« er anderledes i traditionel C"
-#: charset.c:1070
+#: charset.c:1073
msgid "In _cpp_valid_ucn but not a UCN"
msgstr "I _cpp_valid_ucn men ikke en UCN"
-#: charset.c:1103
+#: charset.c:1106
#, c-format
msgid "incomplete universal character name %.*s"
msgstr "ufuldstændigt universelt tegnnavn %.*s"
-#: charset.c:1118
+#: charset.c:1121
#, c-format
msgid "%.*s is not a valid universal character"
msgstr "%.*s er ikke et gyldigt universelt tegn"
-#: charset.c:1128 lex.c:1335
+#: charset.c:1131 lex.c:1335
msgid "'$' in identifier or number"
msgstr "»$« i kaldenavn eller tal"
-#: charset.c:1138
+#: charset.c:1141
#, c-format
msgid "universal character %.*s is not valid in an identifier"
msgstr "universelt tegn %.*s er ikke gyldigt i et kaldenavn"
-#: charset.c:1142
+#: charset.c:1145
#, c-format
msgid "universal character %.*s is not valid at the start of an identifier"
msgstr "universelt tegn %.*s er ikke gyldigt i starten af et kaldenavn"
-#: charset.c:1149
+#: charset.c:1152
#, c-format
msgid "%.*s is outside the UCS codespace"
msgstr "%.*s er udenfor UCS-koderummet"
-#: charset.c:1194 charset.c:2113
+#: charset.c:1197 charset.c:2116
msgid "converting UCN to source character set"
msgstr "konverterer UCN til et kildetegnsæt"
-#: charset.c:1201
+#: charset.c:1204
msgid "converting UCN to execution character set"
msgstr "konverterer UCN til et kørselstegnsæt"
-#: charset.c:1265
+#: charset.c:1268
#, c-format
msgid "extended character %.*s is not valid in an identifier"
msgstr "udvidet tegn %.*s er ikke gyldigt i et kaldenavn"
-#: charset.c:1282
+#: charset.c:1285
#, c-format
msgid "extended character %.*s is not valid at the start of an identifier"
msgstr "udvidet tegn %.*s er ikke gyldigt i starten af et kaldenavn"
-#: charset.c:1368
+#: charset.c:1371
msgid "the meaning of '\\x' is different in traditional C"
msgstr "betydningen af »\\x« er anderledes i traditionel C"
-#: charset.c:1393
+#: charset.c:1396
msgid "\\x used with no following hex digits"
msgstr "\\x angivet uden efterfølgende hexadecimale cifre"
-#: charset.c:1400
+#: charset.c:1403
msgid "hex escape sequence out of range"
msgstr "den hexadecimale undvigesekvens er uden for det gyldige interval"
-#: charset.c:1452
+#: charset.c:1455
msgid "octal escape sequence out of range"
msgstr "den oktale undvigesekvens er uden for det gyldige interval"
-#: charset.c:1534
+#: charset.c:1537
msgid "the meaning of '\\a' is different in traditional C"
msgstr "betydningen af »\\a« er anderledes i traditionel C"
-#: charset.c:1541
+#: charset.c:1544
#, c-format
msgid "non-ISO-standard escape sequence, '\\%c'"
msgstr "undvigesekvensen »\\%c« er ikke ISO-standard"
-#: charset.c:1549
+#: charset.c:1552
#, c-format
msgid "unknown escape sequence: '\\%c'"
msgstr "ukendt undvigesekvens: »\\%c«"
-#: charset.c:1557
+#: charset.c:1560
#, c-format
msgid "unknown escape sequence: '\\%s'"
msgstr "ukendt undvigesekvens: »\\%s«"
-#: charset.c:1565
+#: charset.c:1568
msgid "converting escape sequence to execution character set"
msgstr "konverterer undvigesekvens til kørselstegnsæt"
-#: charset.c:1705
+#: charset.c:1708
msgid "missing open quote"
msgstr "manglende indledende citationstegn"
-#: charset.c:1923 charset.c:2002
+#: charset.c:1926 charset.c:2005
msgid "character constant too long for its type"
msgstr "tegnkonstanten er for lang for dens type"
-#: charset.c:1926
+#: charset.c:1929
msgid "multi-character character constant"
msgstr "flerbyte-tegnkonstant"
-#: charset.c:2042
+#: charset.c:2045
msgid "empty character constant"
msgstr "tom tegnkonstant"
-#: charset.c:2160
+#: charset.c:2163
#, c-format
msgid "failure to convert %s to %s"
msgstr "kunne ikke konvertere %s til %s"
@@ -358,203 +358,199 @@ msgstr "makronavne skal være kaldenavne"
msgid "undefining \"%s\""
msgstr "fjerner definitionen af »%s«"
-#: directives.c:724
+#: directives.c:725
msgid "missing terminating > character"
msgstr "manglende afsluttende >-tegn"
-#: directives.c:783
+#: directives.c:784
#, c-format
msgid "#%s expects \"FILENAME\" or <FILENAME>"
msgstr "#%s forventer »FILNAVN« eller <FILNAVN>"
-#: directives.c:829
+#: directives.c:830
#, c-format
msgid "empty filename in #%s"
msgstr "tomt filnavn i #%s"
-#: directives.c:838
+#: directives.c:839
#, c-format
msgid "#include nested depth %u exceeds maximum of %u (use -fmax-include-depth=DEPTH to increase the maximum)"
msgstr "#include indlejret dybde %u er større end maksimum på %u (brug -fmax-include-depth=DEPTH for at øge maksimum)"
-#: directives.c:883
+#: directives.c:884
msgid "#include_next in primary source file"
msgstr "#include_next i den primære kildekodefil"
-#: directives.c:909
+#: directives.c:910
#, c-format
msgid "invalid flag \"%s\" in line directive"
msgstr "ugyldigt flag »%s« i linjedirektiv"
-#: directives.c:969
+#: directives.c:970
msgid "unexpected end of file after #line"
msgstr "uventet filafslutning efter #line"
-#: directives.c:972
+#: directives.c:973
#, c-format
msgid "\"%s\" after #line is not a positive integer"
msgstr "»%s« efter #line er ikke et positivt heltal"
-#: directives.c:978 directives.c:980
+#: directives.c:979 directives.c:981
msgid "line number out of range"
msgstr "linjenummer er uden for det gyldige interval"
-#: directives.c:993 directives.c:1074
+#: directives.c:994 directives.c:1075
#, c-format
msgid "\"%s\" is not a valid filename"
msgstr "»%s« er ikke et gyldigt filnavn"
-#: directives.c:1034
+#: directives.c:1035
#, c-format
msgid "\"%s\" after # is not a positive integer"
msgstr "»%s« efter # er ikke et positivt heltal"
-#: directives.c:1101
+#: directives.c:1102
#, c-format
msgid "file \"%s\" linemarker ignored due to incorrect nesting"
msgstr "filen »%s« linjemarkør ignoreret på grund af ukorrekt indlejring"
-#: directives.c:1162 directives.c:1164 directives.c:1166 directives.c:1754
+#: directives.c:1180 directives.c:1182 directives.c:1184 directives.c:1772
#, c-format
msgid "%s"
msgstr "%s"
-#: directives.c:1190
+#: directives.c:1208
#, c-format
msgid "invalid #%s directive"
msgstr "ugyldig #%s-direktiv"
-#: directives.c:1253
+#: directives.c:1271
#, c-format
msgid "registering pragmas in namespace \"%s\" with mismatched name expansion"
msgstr "registrerer pragmaer i navnerum »%s« med fejlmatchede navneudvidelse"
-#: directives.c:1262
+#: directives.c:1280
#, c-format
msgid "registering pragma \"%s\" with name expansion and no namespace"
msgstr "registrerer pragma »%s« med navneudvidelse og intet navnerum"
-#: directives.c:1280
+#: directives.c:1298
#, c-format
msgid "registering \"%s\" as both a pragma and a pragma namespace"
msgstr "registrerer »%s« som både et pragma og et pragmanavnerum"
-#: directives.c:1283
+#: directives.c:1301
#, c-format
msgid "#pragma %s %s is already registered"
msgstr "#pragma %s %s er allerede registreret"
-#: directives.c:1286
+#: directives.c:1304
#, c-format
msgid "#pragma %s is already registered"
msgstr "#pragma %s er allerede registreret"
-#: directives.c:1316
+#: directives.c:1334
msgid "registering pragma with NULL handler"
msgstr "registrerer pragma med NULL-håndtering"
-#: directives.c:1533
+#: directives.c:1551
msgid "#pragma once in main file"
msgstr "#pragma once i hovedfil"
-#: directives.c:1556
+#: directives.c:1574
msgid "invalid #pragma push_macro directive"
msgstr "ugyldigt #pragma push_macro-direktiv"
-#: directives.c:1613
+#: directives.c:1631
msgid "invalid #pragma pop_macro directive"
msgstr "ugyldigt #pragma pop_macro-direktiv"
-#: directives.c:1668
+#: directives.c:1686
msgid "invalid #pragma GCC poison directive"
msgstr "ugyldigt #pragma GCC poison-direktiv"
-#: directives.c:1677
+#: directives.c:1695
#, c-format
msgid "poisoning existing macro \"%s\""
msgstr "forgifter eksisterende makro »%s«"
-#: directives.c:1696
+#: directives.c:1714
msgid "#pragma system_header ignored outside include file"
msgstr "#pragma system_header ignoreret uden for inkluderingsfil"
-#: directives.c:1721
+#: directives.c:1739
#, c-format
msgid "cannot find source file %s"
msgstr "kan ikke finde kildefilen %s"
-#: directives.c:1725
+#: directives.c:1743
#, c-format
msgid "current file is older than %s"
msgstr "aktuel fil er ældre end %s"
-#: directives.c:1749
+#: directives.c:1767
#, c-format
msgid "invalid \"#pragma GCC %s\" directive"
msgstr "ugyldigt »#pragma GCC %s«-direktiv"
-#: directives.c:1950
+#: directives.c:1968
msgid "_Pragma takes a parenthesized string literal"
msgstr "_Pragma tager en strengkonstant med paranteser omkring"
-#: directives.c:2033
+#: directives.c:2051
msgid "#else without #if"
msgstr "#else uden #if"
-#: directives.c:2038
+#: directives.c:2056
msgid "#else after #else"
msgstr "#else efter #else"
-#: directives.c:2040 directives.c:2073
+#: directives.c:2058 directives.c:2091
msgid "the conditional began here"
msgstr "betingelsen begyndte her"
-#: directives.c:2066
+#: directives.c:2084
msgid "#elif without #if"
msgstr "#elif uden #if"
-#: directives.c:2071
+#: directives.c:2089
msgid "#elif after #else"
msgstr "#elif efter #else"
-#: directives.c:2102
+#: directives.c:2120
msgid "#endif without #if"
msgstr "#endif uden #if"
-#: directives.c:2178
+#: directives.c:2196
msgid "missing '(' after predicate"
msgstr "manglende »(« efter udsagn"
-#: directives.c:2196
+#: directives.c:2214
msgid "missing ')' to complete answer"
msgstr "manglende »)« til at fuldføre svar"
-#: directives.c:2208
+#: directives.c:2226
msgid "predicate's answer is empty"
msgstr "udsagnets svar er tomt"
-#: directives.c:2238
+#: directives.c:2256
msgid "assertion without predicate"
msgstr "postulat uden udsagn"
-#: directives.c:2241
+#: directives.c:2259
msgid "predicate must be an identifier"
msgstr "udsagn skal være et kaldenavn"
-#: directives.c:2323
+#: directives.c:2341
#, c-format
msgid "\"%s\" re-asserted"
msgstr "»%s« genpostuleret"
-#: directives.c:2604
+#: directives.c:2659
#, c-format
msgid "unterminated #%s"
msgstr "uafsluttet #%s"
-#: directives-only.c:221 lex.c:2879 traditional.c:174
-msgid "unterminated comment"
-msgstr "uafsluttet kommentar"
-
#: errors.c:291
#, c-format
msgid "%s: %s"
@@ -564,215 +560,235 @@ msgstr "%s: %s"
msgid "stdout"
msgstr "standardud"
-#: expr.c:626 expr.c:743
+#: expr.c:636 expr.c:753
msgid "fixed-point constants are a GCC extension"
msgstr "fast punkt-konstanter er en GCC-udvidelse"
-#: expr.c:651
+#: expr.c:661
msgid "invalid prefix \"0b\" for floating constant"
msgstr "ugyldigt præfiks »0b« i kommatalskonstant"
-#: expr.c:664
+#: expr.c:674
msgid "use of C++17 hexadecimal floating constant"
msgstr "brug af C++17 hexadecimal kommatalskonstant"
-#: expr.c:667
+#: expr.c:677
msgid "use of C99 hexadecimal floating constant"
msgstr "brug af C99 hexadecimal kommatalskonstant"
-#: expr.c:711
+#: expr.c:721
#, c-format
msgid "invalid suffix \"%.*s\" on floating constant"
msgstr "ugyldig endelse »%.*s« i kommatalskonstant"
-#: expr.c:722 expr.c:789
+#: expr.c:732 expr.c:799
#, c-format
msgid "traditional C rejects the \"%.*s\" suffix"
msgstr "traditionel C tillader ikke endelsen »%.*s«"
-#: expr.c:730
+#: expr.c:740
msgid "suffix for double constant is a GCC extension"
msgstr "endelse for dobbelt konstant er en GCC-udvidelse"
-#: expr.c:736
+#: expr.c:746
#, c-format
msgid "invalid suffix \"%.*s\" with hexadecimal floating constant"
msgstr "ugyldig endelse »%.*s« med hexadecimal kommatalskonstant"
-#: expr.c:749 expr.c:753
+#: expr.c:759 expr.c:763
msgid "decimal float constants are a C2X feature"
msgstr "decimal kommatalskonstanter er en C2X-funktion"
-#: expr.c:772
+#: expr.c:782
#, c-format
msgid "invalid suffix \"%.*s\" on integer constant"
msgstr "ugyldig endelse »%.*s« i heltalskonstant"
-#: expr.c:797
+#: expr.c:807
msgid "use of C++11 long long integer constant"
msgstr "brug af C++11 long long-heltalskonstant"
-#: expr.c:798
+#: expr.c:808
msgid "use of C99 long long integer constant"
msgstr "brug af C99 long long-heltalskonstant"
-#: expr.c:814
+#: expr.c:822
+#, fuzzy
+#| msgid "use of C++11 long long integer constant"
+msgid "use of C++23 %<size_t%> integer constant"
+msgstr "brug af C++11 long long-heltalskonstant"
+
+#: expr.c:823
+#, fuzzy
+#| msgid "use of C++11 long long integer constant"
+msgid "use of C++23 %<make_signed_t<size_t>%> integer constant"
+msgstr "brug af C++11 long long-heltalskonstant"
+
+#: expr.c:834
msgid "imaginary constants are a GCC extension"
msgstr "imaginære konstanter er en GCC-udvidelse"
-#: expr.c:820
+#: expr.c:841
msgid "binary constants are a C++14 feature or GCC extension"
msgstr "binære konstanter er en C++14-funktion eller GCC-udvidelse"
-#: expr.c:822
-msgid "binary constants are a GCC extension"
-msgstr "binære konstanter er en GCC-udvidelse"
+#: expr.c:843
+#, fuzzy
+#| msgid "binary constants are a C++14 feature or GCC extension"
+msgid "binary constants are a C2X feature or GCC extension"
+msgstr "binære konstanter er en C++14-funktion eller GCC-udvidelse"
+
+#: expr.c:848
+#, fuzzy
+#| msgid "decimal float constants are a C2X feature"
+msgid "binary constants are a C2X feature"
+msgstr "decimal kommatalskonstanter er en C2X-funktion"
-#: expr.c:917
+#: expr.c:944
msgid "integer constant is too large for its type"
msgstr "heltalskonstanten er for stor for dens type"
-#: expr.c:948
+#: expr.c:975
msgid "integer constant is so large that it is unsigned"
msgstr "heltalskonstanten er så stor at den er usigneret"
-#: expr.c:1043
+#: expr.c:1070
msgid "missing ')' after \"defined\""
msgstr "manglende »)« efter »defined«"
-#: expr.c:1050
+#: expr.c:1077
msgid "operator \"defined\" requires an identifier"
msgstr "operatoren »defined« kræver et kaldenavn"
-#: expr.c:1058
+#: expr.c:1085
#, c-format
msgid "(\"%s\" is an alternative token for \"%s\" in C++)"
msgstr "(»%s« er et alternativt symbol for »%s« i C++)"
-#: expr.c:1070
+#: expr.c:1098
msgid "this use of \"defined\" may not be portable"
msgstr "denne brug af »defined« er muligvis ikke portabel"
-#: expr.c:1113
+#: expr.c:1143
msgid "user-defined literal in preprocessor expression"
msgstr "brugerdefineret ordret i præprocessorudtrykket"
-#: expr.c:1118
+#: expr.c:1148
msgid "floating constant in preprocessor expression"
msgstr "kommatalskonstant i præprocessorudtryk"
-#: expr.c:1124
+#: expr.c:1154
msgid "imaginary number in preprocessor expression"
msgstr "imaginært tal i præprocessorudtryk"
-#: expr.c:1173
+#: expr.c:1203
#, c-format
msgid "\"%s\" is not defined, evaluates to 0"
msgstr "»%s« er ikke defineret, evaluerer til 0"
-#: expr.c:1186
+#: expr.c:1216
msgid "assertions are a GCC extension"
msgstr "påstande er en GCC-udvidelse"
-#: expr.c:1189
+#: expr.c:1219
msgid "assertions are a deprecated extension"
msgstr "påstande er en forældet udvidelse"
-#: expr.c:1435
+#: expr.c:1465
#, c-format
msgid "unbalanced stack in %s"
msgstr "ubalanceret stak i %s"
-#: expr.c:1455
+#: expr.c:1485
#, c-format
msgid "impossible operator '%u'"
msgstr "umulig operator »%u«"
-#: expr.c:1556
+#: expr.c:1586
msgid "missing ')' in expression"
msgstr "manglende »)« i udtryk"
-#: expr.c:1585
+#: expr.c:1615
msgid "'?' without following ':'"
msgstr "»?« uden efterfølgende »:«"
-#: expr.c:1595
+#: expr.c:1625
msgid "integer overflow in preprocessor expression"
msgstr "heltallet løber over i præprocessorudtrykket"
-#: expr.c:1600
+#: expr.c:1630
msgid "missing '(' in expression"
msgstr "manglende »(« i udtryk"
-#: expr.c:1632
+#: expr.c:1662
#, c-format
msgid "the left operand of \"%s\" changes sign when promoted"
msgstr "den venstre operand til »%s« ændrer fortegn ved forfremmelse"
-#: expr.c:1637
+#: expr.c:1667
#, c-format
msgid "the right operand of \"%s\" changes sign when promoted"
msgstr "den højre operand til »%s« ændrer fortegn ved forfremmelse"
-#: expr.c:1896
+#: expr.c:1926
msgid "traditional C rejects the unary plus operator"
msgstr "traditionel C tillader ikke operatoren unær plus"
-#: expr.c:1994
+#: expr.c:2024
msgid "comma operator in operand of #if"
msgstr "kommaoperator i en operand til #if"
-#: expr.c:2130
+#: expr.c:2160
msgid "division by zero in #if"
msgstr "division med nul i #if"
-#: files.c:576
+#: files.c:571
msgid "one or more PCH files were found, but they were invalid"
msgstr "en eller flere PCH-filer blev fundet, men de var ugyldige"
-#: files.c:580
+#: files.c:575
msgid "use -Winvalid-pch for more information"
msgstr "brug -Winvalid-pch for yderligere information"
-#: files.c:1004
+#: files.c:1051
#, c-format
msgid "no include path in which to search for %s"
msgstr "der er ingen inkluderingssti at søge efter %s i"
-#: files.c:1439
+#: files.c:1546
msgid "Multiple include guards may be useful for:\n"
msgstr "Flere inkluderingsvagter kan være nyttige til:\n"
-#: init.c:598
+#: init.c:614
msgid "cppchar_t must be an unsigned type"
msgstr "cppchar_t skal være en usigneret type"
-#: init.c:602
+#: init.c:618
#, c-format
msgid "preprocessor arithmetic has maximum precision of %lu bits; target requires %lu bits"
msgstr "præprocessorberegning har en maksimal præcision på %lu bit; målarkitektur kræver %lu bit"
-#: init.c:609
+#: init.c:625
msgid "CPP arithmetic must be at least as precise as a target int"
msgstr "CPP-beregning skal være mindst lige så præcis som en målarkitekturs int"
-#: init.c:612
+#: init.c:628
msgid "target char is less than 8 bits wide"
msgstr "målarkitekturs char er mindre end 8 bit bred"
-#: init.c:616
+#: init.c:632
msgid "target wchar_t is narrower than target char"
msgstr "målarkitekturs wchar_t er mindre end målarkitekturs char"
-#: init.c:620
+#: init.c:636
msgid "target int is narrower than target char"
msgstr "målarkitekturs int er mindre end målarkitekturs char"
-#: init.c:625
+#: init.c:641
msgid "CPP half-integer narrower than CPP character"
msgstr "CPP-halvheltal er mindre end CPP-tegn"
-#: init.c:629
+#: init.c:645
#, c-format
msgid "CPP on this host cannot handle wide character constants over %lu bits, but the target requires %lu bits"
msgstr "CPP på denne vært kan ikke håndtere bredtegnkonstanter over %lu bit, men målarkitekturen kræver %lu bit"
@@ -819,11 +835,15 @@ msgid "`%.*s' is not in NFC"
msgstr "»%.*s« er ikke i NFC"
#: lex.c:1375
-msgid "__VA_OPT__ is not available until C++2a"
+#, fuzzy
+#| msgid "__VA_OPT__ is not available until C++2a"
+msgid "__VA_OPT__ is not available until C++20"
msgstr "__VA_OPT__ er ikke tilgængelig før C++2a"
#: lex.c:1382
-msgid "__VA_OPT__ can only appear in the expansion of a C++2a variadic macro"
+#, fuzzy
+#| msgid "__VA_OPT__ can only appear in the expansion of a C++2a variadic macro"
+msgid "__VA_OPT__ can only appear in the expansion of a C++20 variadic macro"
msgstr "__VA_OPT__ kan kun optræde i udfoldelsen af en C++2a-makro med vilkårligt antal parametre"
#: lex.c:1413 lex.c:1506
@@ -844,232 +864,257 @@ msgstr "__VA_ARGS__ kan kun optræde i udfoldelsen af en C99-makro med vilkårli
msgid "identifier \"%s\" is a special operator name in C++"
msgstr "kaldenavn »%s« er et specielt operatornavn i C++"
-#: lex.c:1837
+#: lex.c:1879
msgid "raw string delimiter longer than 16 characters"
msgstr "rå strengafgrænser længere end 16 tegn"
-#: lex.c:1841
+#: lex.c:1883
msgid "invalid new-line in raw string delimiter"
msgstr "ugyldig nylinje i rå strengafgrænser"
-#: lex.c:1845
+#: lex.c:1887 lex.c:4639
#, c-format
msgid "invalid character '%c' in raw string delimiter"
msgstr "ugyldigt tegn »%c« i rå strengafgrænser"
-#: lex.c:1894 lex.c:1916
+#: lex.c:1926 lex.c:1949
msgid "unterminated raw string"
msgstr "uafsluttet rå streng"
-#: lex.c:1936 lex.c:2065
+#: lex.c:1971 lex.c:2100
msgid "invalid suffix on literal; C++11 requires a space between literal and string macro"
msgstr "ugyldig suffiks på ordret; C++11 kræver et mellemrum mellem ordret og strengmakro"
-#: lex.c:2048
+#: lex.c:2083
msgid "null character(s) preserved in literal"
msgstr "nultegn bevaret i strengkonstant"
-#: lex.c:2051
+#: lex.c:2086
#, c-format
msgid "missing terminating %c character"
msgstr "manglende afsluttende %c-tegn"
-#: lex.c:2083
+#: lex.c:2118
msgid "C++11 requires a space between string literal and macro"
msgstr "C++11 kræver et mellemrum mellem ordret og strengmakro"
-#: lex.c:2893 lex.c:2927
+#: lex.c:2711
+msgid "module control-line cannot be in included file"
+msgstr ""
+
+#: lex.c:2725
+#, c-format
+msgid "module control-line \"%s\" cannot be an object-like macro"
+msgstr ""
+
+#: lex.c:3099 lex.c:4472 traditional.c:174
+msgid "unterminated comment"
+msgstr "uafsluttet kommentar"
+
+#: lex.c:3113 lex.c:3147
msgid "C++ style comments are not allowed in ISO C90"
msgstr "kommentarer i C++-stil er ikke tilladt i ISO C90"
-#: lex.c:2895 lex.c:2906 lex.c:2930
+#: lex.c:3115 lex.c:3126 lex.c:3150
msgid "(this will be reported only once per input file)"
msgstr "(dette rapporteres kun en enkelt gang per inddatafil)"
-#: lex.c:2904
+#: lex.c:3124
msgid "C++ style comments are incompatible with C90"
msgstr "kommentarer i C++-stil er ikke kompatible med C90"
-#: lex.c:2936
+#: lex.c:3156
msgid "multi-line comment"
msgstr "flerlinjekommentar"
-#: lex.c:3330
+#: lex.c:3550
#, c-format
msgid "unspellable token %s"
msgstr "symbol %s kan ikke staves"
+#: lex.c:4627
+#, fuzzy, c-format
+#| msgid "raw string delimiter longer than 16 characters"
+msgid "raw string delimiter longer than %d characters"
+msgstr "rå strengafgrænser længere end 16 tegn"
+
+#: lex.c:4697
+#, fuzzy
+#| msgid "unterminated #%s"
+msgid "unterminated literal"
+msgstr "uafsluttet #%s"
+
#: macro.c:94
msgid "'##' cannot appear at either end of __VA_OPT__"
msgstr "»##« må ikke optræde ved nogen af enderne i __VA_OPT__"
-#: macro.c:364
+#: macro.c:386
#, c-format
msgid "\"%s\" used outside of preprocessing directive"
msgstr "»%s« brugt uden for præprocessordirektiv"
-#: macro.c:374
+#: macro.c:396
#, c-format
msgid "missing '(' before \"%s\" operand"
msgstr "manglende »(« før »%s«-operand"
-#: macro.c:389
+#: macro.c:411
#, c-format
msgid "operator \"%s\" requires a header-name"
msgstr "operatoren »%s« kræver et teksthovednavn"
-#: macro.c:406
+#: macro.c:428
#, c-format
msgid "missing ')' after \"%s\" operand"
msgstr "manglende »)« efter »%s«-operand"
-#: macro.c:426
+#: macro.c:448
#, c-format
msgid "macro \"%s\" is not used"
msgstr "makroen »%s« bliver ikke brugt"
-#: macro.c:465 macro.c:723
+#: macro.c:487 macro.c:778
#, c-format
msgid "invalid built-in macro \"%s\""
msgstr "ugyldig indbygget makro »%s«"
-#: macro.c:472 macro.c:574
+#: macro.c:494 macro.c:596
#, c-format
msgid "macro \"%s\" might prevent reproducible builds"
msgstr "makroen »%s« kan forhindre reproducerbare bygninger"
-#: macro.c:503
+#: macro.c:525
msgid "could not determine file timestamp"
msgstr "kunne ikke bestemme filtidsstempel"
-#: macro.c:620
+#: macro.c:610
msgid "could not determine date and time"
msgstr "kunne ikke bestemme dato og tid"
-#: macro.c:636
+#: macro.c:642
msgid "__COUNTER__ expanded inside directive with -fdirectives-only"
msgstr "__COUNTER__ udvidet inden i direktiv med -fdirectives-only"
-#: macro.c:842
+#: macro.c:897
msgid "invalid string literal, ignoring final '\\'"
msgstr "ugyldig strengkonstant, ignorerer afsluttende »\\«"
-#: macro.c:904
+#: macro.c:959
#, c-format
msgid "pasting \"%s\" and \"%s\" does not give a valid preprocessing token"
msgstr "indsættelse af »%s« og »%s« giver ikke et gyldigt præprocessorsymbol"
-#: macro.c:1030
+#: macro.c:1085
msgid "ISO C++11 requires at least one argument for the \"...\" in a variadic macro"
msgstr "ISO C++11 kræver mindst en parameter for »...« i en makro med vilkårligt antal parametre"
-#: macro.c:1034
+#: macro.c:1089
msgid "ISO C99 requires at least one argument for the \"...\" in a variadic macro"
msgstr "ISO C99 kræver mindst en parameter for »...« i en makro med vilkårligt antal parametre"
-#: macro.c:1041
+#: macro.c:1096
#, c-format
msgid "macro \"%s\" requires %u arguments, but only %u given"
msgstr "makroen »%s« kræver %u parametre, men modtager kun %u"
-#: macro.c:1046
+#: macro.c:1101
#, c-format
msgid "macro \"%s\" passed %u arguments, but takes just %u"
msgstr "makroen »%s« viderebragte %u parametre, men tager kun mod %u"
-#: macro.c:1244 traditional.c:815
+#: macro.c:1299 traditional.c:822
#, c-format
msgid "unterminated argument list invoking macro \"%s\""
msgstr "uafsluttet parameterliste ved kald af makroen »%s«"
-#: macro.c:1386
+#: macro.c:1442
#, c-format
msgid "function-like macro \"%s\" must be used with arguments in traditional C"
msgstr "funktionsagtig makro »%s« skal bruges med parametre i traditionel C"
-#: macro.c:2165
+#: macro.c:2220
#, c-format
msgid "invoking macro %s argument %d: empty macro arguments are undefined in ISO C++98"
msgstr "starter makroen %s parameter %d: tomme makroparametre er ikke defineret i ISO C+98"
-#: macro.c:2173 macro.c:2182
+#: macro.c:2228 macro.c:2237
#, c-format
msgid "invoking macro %s argument %d: empty macro arguments are undefined in ISO C90"
msgstr "starter makroen %s parameter %d: tomme makroparametre er ikke defineret i ISO C90"
-#: macro.c:3141
+#: macro.c:3279
#, c-format
msgid "duplicate macro parameter \"%s\""
msgstr "makroparameternavnet »%s« optræder mere end en gang"
-#: macro.c:3223
+#: macro.c:3361
#, c-format
msgid "expected parameter name, found \"%s\""
msgstr "forventede parameternavn, fandt »%s«"
-#: macro.c:3224
+#: macro.c:3362
#, c-format
msgid "expected ',' or ')', found \"%s\""
msgstr "forventede »,« eller »)«, fandt »%s«"
-#: macro.c:3225
+#: macro.c:3363
msgid "expected parameter name before end of line"
msgstr "forventede parameternavn før linjeafslutning"
-#: macro.c:3226
+#: macro.c:3364
msgid "expected ')' before end of line"
msgstr "forventede »)« før linjeafslutning"
-#: macro.c:3227
+#: macro.c:3365
msgid "expected ')' after \"...\""
msgstr "forventede »)« efter »...«"
-#: macro.c:3284
+#: macro.c:3422
msgid "anonymous variadic macros were introduced in C++11"
msgstr "anonyme makroer med vilkårligt antal parametre blev introduceret i C++11"
-#: macro.c:3285 macro.c:3289
+#: macro.c:3423 macro.c:3427
msgid "anonymous variadic macros were introduced in C99"
msgstr "anonyme makroer med vilkårligt antal parametre blev introduceret i C99"
-#: macro.c:3295
+#: macro.c:3433
msgid "ISO C++ does not permit named variadic macros"
msgstr "ISO C++ tillader ikke navngivne makroer med vilkårligt antal parametre"
-#: macro.c:3296
+#: macro.c:3434
msgid "ISO C does not permit named variadic macros"
msgstr "ISO C tillader ikke navngivne makroer med vilkårligt antal parametre"
-#: macro.c:3342
+#: macro.c:3480
msgid "'##' cannot appear at either end of a macro expansion"
msgstr "»##« må ikke optræde ved nogen af enderne i en makrokrop"
-#: macro.c:3380
+#: macro.c:3518
msgid "ISO C++11 requires whitespace after the macro name"
msgstr "ISO C++11 kræver mellemrum efter makronavnet"
-#: macro.c:3381
+#: macro.c:3519
msgid "ISO C99 requires whitespace after the macro name"
msgstr "ISO C99 kræver mellemrum efter makronavnet"
-#: macro.c:3405
+#: macro.c:3543
msgid "missing whitespace after the macro name"
msgstr "manglende mellemrum efter makronavnet"
-#: macro.c:3455
+#: macro.c:3593
msgid "'#' is not followed by a macro parameter"
msgstr "»#« efterfølges ikke af en makroparameter"
-#: macro.c:3606
+#: macro.c:3749
#, c-format
msgid "\"%s\" redefined"
msgstr "»%s« omdefineret"
-#: macro.c:3611
+#: macro.c:3754
msgid "this is the location of the previous definition"
msgstr "den foregående definition er her"
-#: macro.c:3715
+#: macro.c:3891
#, c-format
msgid "macro argument \"%s\" would be stringified in traditional C"
msgstr "makroparameteren »%s« ville blive gjort til en streng i traditionel C"
@@ -1107,15 +1152,18 @@ msgstr "%s: ikke brugt da »__COUNTER__« er ugyldig"
msgid "while reading precompiled header"
msgstr "under læsning af prækompileret teksthoved"
-#: traditional.c:884
+#: traditional.c:891
#, c-format
msgid "detected recursion whilst expanding macro \"%s\""
msgstr "opdagede rekursion ved udfoldelse af makroen »%s«"
-#: traditional.c:1107
+#: traditional.c:1114
msgid "syntax error in macro parameter list"
msgstr "syntaksfejl i makroparameterliste"
+#~ msgid "binary constants are a GCC extension"
+#~ msgstr "binære konstanter er en GCC-udvidelse"
+
#~ msgid "\"__has_include__\" cannot be used as a macro name"
#~ msgstr "»__has_include__« kan ikke bruges som et makronavn"
diff --git a/libcpp/po/de.po b/libcpp/po/de.po
index c4bf796..4906783 100644
--- a/libcpp/po/de.po
+++ b/libcpp/po/de.po
@@ -5,14 +5,14 @@
# Roland Stigge <stigge@antcom.de>, 2003-2008, 2010, 2012-2013.
# Mario Blättermann <mario.blaettermann@gmail.com>, 2014-2016.
# Philipp Thomas <pth@suse.de>, 2016.
-# Roland Illig <roland.illig@gmx.de>, 2017-2020.
+# Roland Illig <roland.illig@gmx.de>, 2017-2021.
#
msgid ""
msgstr ""
-"Project-Id-Version: cpplib 10.1-b20200209\n"
+"Project-Id-Version: cpplib 11.1-b20210207\n"
"Report-Msgid-Bugs-To: https://gcc.gnu.org/bugs/\n"
-"POT-Creation-Date: 2020-02-07 22:33+0000\n"
-"PO-Revision-Date: 2020-02-10 20:08+0100\n"
+"POT-Creation-Date: 2021-02-05 21:38+0000\n"
+"PO-Revision-Date: 2021-08-15 06:13+0200\n"
"Last-Translator: Roland Illig <roland.illig@gmx.de>\n"
"Language-Team: German <translation-team-de@lists.sourceforge.net>\n"
"Language: de\n"
@@ -20,158 +20,158 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Bugs: Report translation errors to the Language-Team address.\n"
-"X-Generator: Poedit 2.3\n"
+"X-Generator: Poedit 3.0\n"
-#: charset.c:674
+#: charset.c:677
#, c-format
msgid "conversion from %s to %s not supported by iconv"
msgstr "Konvertierung von %s nach %s wird von iconv nicht unterstützt"
-#: charset.c:677
+#: charset.c:680
msgid "iconv_open"
msgstr "iconv_open"
-#: charset.c:685
+#: charset.c:688
#, c-format
msgid "no iconv implementation, cannot convert from %s to %s"
msgstr "keine Implementation für iconv, es kann nicht von %s nach %s konvertiert werden"
-#: charset.c:781
+#: charset.c:784
#, c-format
msgid "character 0x%lx is not in the basic source character set\n"
msgstr "Zeichen 0x%lx ist nicht im regulären Quellzeichensatz\n"
-#: charset.c:798 charset.c:1768
+#: charset.c:801 charset.c:1771
msgid "converting to execution character set"
msgstr "Konvertierung in Zeichensatz der Ausführung"
-#: charset.c:804
+#: charset.c:807
#, c-format
msgid "character 0x%lx is not unibyte in execution character set"
msgstr "Zeichen 0x%lx ist kein Unibyte im Ausführungs-Zeichensatz"
-#: charset.c:1054
+#: charset.c:1057
msgid "universal character names are only valid in C++ and C99"
msgstr "universelle Zeichennamen sind nur in C++ und C99 gültig"
-#: charset.c:1058
+#: charset.c:1061
msgid "C99's universal character names are incompatible with C90"
-msgstr "universelle Zeichennamen in C99 sind zu C90 inkompatibel"
+msgstr "Die universellen Zeichennamen von C99 sind mit C90 nicht kompatibel"
-#: charset.c:1061
+#: charset.c:1064
#, c-format
msgid "the meaning of '\\%c' is different in traditional C"
msgstr "die Bedeutung von »\\%c« ist in traditionellem C anders"
-#: charset.c:1070
+#: charset.c:1073
msgid "In _cpp_valid_ucn but not a UCN"
msgstr "In _cpp_valid_ucn, aber kein UCN"
-#: charset.c:1103
+#: charset.c:1106
#, c-format
msgid "incomplete universal character name %.*s"
msgstr "unvollständiger Universal-Zeichenname %.*s"
-#: charset.c:1118
+#: charset.c:1121
#, c-format
msgid "%.*s is not a valid universal character"
msgstr "»%.*s« ist kein gültiges universelles Zeichen"
-#: charset.c:1128 lex.c:1335
+#: charset.c:1131 lex.c:1335
msgid "'$' in identifier or number"
msgstr "»$« in Bezeichner oder Zahl"
-#: charset.c:1138
+#: charset.c:1141
#, c-format
msgid "universal character %.*s is not valid in an identifier"
msgstr "universelles Zeichen %.*s ist nicht gültig in Bezeichner"
-#: charset.c:1142
+#: charset.c:1145
#, c-format
msgid "universal character %.*s is not valid at the start of an identifier"
msgstr "universelles Zeichen %.*s ist nicht gültig am Anfang eines Bezeichners"
-#: charset.c:1149
+#: charset.c:1152
#, c-format
msgid "%.*s is outside the UCS codespace"
msgstr "%.*s liegt außerhalb des UCS-Zeichenraums"
-#: charset.c:1194 charset.c:2113
+#: charset.c:1197 charset.c:2116
msgid "converting UCN to source character set"
msgstr "UCN wird in Quellzeichensatz konvertiert"
-#: charset.c:1201
+#: charset.c:1204
msgid "converting UCN to execution character set"
msgstr "UCN wird in Ausführungszeichensatz konvertiert"
-#: charset.c:1265
+#: charset.c:1268
#, c-format
msgid "extended character %.*s is not valid in an identifier"
msgstr "erweitertes Zeichen %.*s ist in Bezeichnern nicht erlaubt"
-#: charset.c:1282
+#: charset.c:1285
#, c-format
msgid "extended character %.*s is not valid at the start of an identifier"
msgstr "erweitertes Zeichen %.*s ist am Anfang eines Bezeichners nicht erlaubt"
-#: charset.c:1368
+#: charset.c:1371
msgid "the meaning of '\\x' is different in traditional C"
msgstr "die Bedeutung von »\\x« ist in traditionellem C anders"
-#: charset.c:1393
+#: charset.c:1396
msgid "\\x used with no following hex digits"
msgstr "\\x ohne folgende Hex-Ziffern verwendet"
# http://de.wikipedia.org/wiki/Escape-Sequenz
-#: charset.c:1400
+#: charset.c:1403
msgid "hex escape sequence out of range"
msgstr "Hex-Escape-Sequenz außerhalb des Wertebereiches"
# http://de.wikipedia.org/wiki/Escape-Sequenz
-#: charset.c:1452
+#: charset.c:1455
msgid "octal escape sequence out of range"
msgstr "Oktal-Escape-Sequenz außerhalb des Wertebereiches"
-#: charset.c:1534
+#: charset.c:1537
msgid "the meaning of '\\a' is different in traditional C"
msgstr "die Bedeutung von »\\a« ist in traditionellem C anders"
-#: charset.c:1541
+#: charset.c:1544
#, c-format
msgid "non-ISO-standard escape sequence, '\\%c'"
msgstr "nicht-ISO-standardkonforme Escape-Sequenz »\\%c«"
-#: charset.c:1549
+#: charset.c:1552
#, c-format
msgid "unknown escape sequence: '\\%c'"
msgstr "unbekannte Escape-Sequenz: »\\%c«"
-#: charset.c:1557
+#: charset.c:1560
#, c-format
msgid "unknown escape sequence: '\\%s'"
msgstr "unbekannte Escape-Sequenz: »\\%s«"
-#: charset.c:1565
+#: charset.c:1568
msgid "converting escape sequence to execution character set"
msgstr "Escape-Sequenz wird in Zeichensatz der Ausführung konvertiert"
-#: charset.c:1705
+#: charset.c:1708
msgid "missing open quote"
msgstr "Fehlendes öffnendes Anführungszeichen"
-#: charset.c:1923 charset.c:2002
+#: charset.c:1926 charset.c:2005
msgid "character constant too long for its type"
msgstr "Zeichenkonstante zu lang für ihren Typ"
-#: charset.c:1926
+#: charset.c:1929
msgid "multi-character character constant"
msgstr "Zeichenkonstante mit mehreren Zeichen"
-#: charset.c:2042
+#: charset.c:2045
msgid "empty character constant"
msgstr "Leere Zeichenkonstante"
-#: charset.c:2160
+#: charset.c:2163
#, c-format
msgid "failure to convert %s to %s"
msgstr "Fehler beim Konvertieren von %s nach %s"
@@ -242,203 +242,199 @@ msgstr "Makronamen müssen Bezeichner sein"
msgid "undefining \"%s\""
msgstr "»%s« wird un-definiert"
-#: directives.c:724
+#: directives.c:725
msgid "missing terminating > character"
msgstr "fehlendes abschließendes »>«-Zeichen"
-#: directives.c:783
+#: directives.c:784
#, c-format
msgid "#%s expects \"FILENAME\" or <FILENAME>"
msgstr "#%s erwartet \"DATEINAME\" oder <DATEINAME>"
-#: directives.c:829
+#: directives.c:830
#, c-format
msgid "empty filename in #%s"
msgstr "leerer Dateiname in #%s"
-#: directives.c:838
+#: directives.c:839
#, c-format
msgid "#include nested depth %u exceeds maximum of %u (use -fmax-include-depth=DEPTH to increase the maximum)"
msgstr "Verschachtelungstiefe von %u #includes überschreitet das Maximum %u (verwenden Sie »-fmax-include-depth=Tiefe«, um das Maximum zu erhöhen)"
-#: directives.c:883
+#: directives.c:884
msgid "#include_next in primary source file"
msgstr "#include_next in erster Quelldatei"
-#: directives.c:909
+#: directives.c:910
#, c-format
msgid "invalid flag \"%s\" in line directive"
msgstr "ungültiges Kennzeichen »%s« in line-Direktive"
-#: directives.c:969
+#: directives.c:970
msgid "unexpected end of file after #line"
msgstr "unerwartetes Dateiende nach #line"
-#: directives.c:972
+#: directives.c:973
#, c-format
msgid "\"%s\" after #line is not a positive integer"
msgstr "»%s« hinter #line ist keine positive Ganzzahl"
-#: directives.c:978 directives.c:980
+#: directives.c:979 directives.c:981
msgid "line number out of range"
msgstr "Zeilennummer ist außerhalb des Wertebereiches"
-#: directives.c:993 directives.c:1074
+#: directives.c:994 directives.c:1075
#, c-format
msgid "\"%s\" is not a valid filename"
msgstr "»%s« ist kein gültiger Dateiname"
-#: directives.c:1034
+#: directives.c:1035
#, c-format
msgid "\"%s\" after # is not a positive integer"
msgstr "»%s« hinter # ist keine positive Ganzzahl"
-#: directives.c:1101
+#: directives.c:1102
#, c-format
msgid "file \"%s\" linemarker ignored due to incorrect nesting"
msgstr "der Zeilenmarker in der Datei »%s« wird aufgrung falscher Schachtelung ignoriert"
-#: directives.c:1162 directives.c:1164 directives.c:1166 directives.c:1754
+#: directives.c:1180 directives.c:1182 directives.c:1184 directives.c:1772
#, c-format
msgid "%s"
msgstr "%s"
-#: directives.c:1190
+#: directives.c:1208
#, c-format
msgid "invalid #%s directive"
msgstr "ungültige #%s-Direktive"
-#: directives.c:1253
+#: directives.c:1271
#, c-format
msgid "registering pragmas in namespace \"%s\" with mismatched name expansion"
msgstr "Pragmas im Namensraum »%s« werden ohne passende Namensauflösung registriert"
-#: directives.c:1262
+#: directives.c:1280
#, c-format
msgid "registering pragma \"%s\" with name expansion and no namespace"
msgstr "Pragma »%s« wird mit Namensauflösung und ohne Namensraum registriert"
-#: directives.c:1280
+#: directives.c:1298
#, c-format
msgid "registering \"%s\" as both a pragma and a pragma namespace"
msgstr "»%s« wird sowohl als Pragma als auch als Pragma-Namensraum registriert"
-#: directives.c:1283
+#: directives.c:1301
#, c-format
msgid "#pragma %s %s is already registered"
msgstr "#pragma %s %s ist bereits registriert"
-#: directives.c:1286
+#: directives.c:1304
#, c-format
msgid "#pragma %s is already registered"
msgstr "#pragma %s ist bereits registriert"
-#: directives.c:1316
+#: directives.c:1334
msgid "registering pragma with NULL handler"
msgstr "Pragma mit NULL-Handler wird registriert"
-#: directives.c:1533
+#: directives.c:1551
msgid "#pragma once in main file"
msgstr "#pragma once in Hauptdatei"
-#: directives.c:1556
+#: directives.c:1574
msgid "invalid #pragma push_macro directive"
msgstr "ungültige #pragma push_macro Direktive"
-#: directives.c:1613
+#: directives.c:1631
msgid "invalid #pragma pop_macro directive"
msgstr "ungültige #pragma pop_macro Direktive"
-#: directives.c:1668
+#: directives.c:1686
msgid "invalid #pragma GCC poison directive"
msgstr "ungültige #pragma GCC Poison Direktive"
-#: directives.c:1677
+#: directives.c:1695
#, c-format
msgid "poisoning existing macro \"%s\""
msgstr "schlechtes existierendes Makro »%s«"
-#: directives.c:1696
+#: directives.c:1714
msgid "#pragma system_header ignored outside include file"
msgstr "#pragma system_header außerhalb include-Datei ignoriert"
-#: directives.c:1721
+#: directives.c:1739
#, c-format
msgid "cannot find source file %s"
msgstr "Quelldatei %s kann nicht gefunden werden"
-#: directives.c:1725
+#: directives.c:1743
#, c-format
msgid "current file is older than %s"
msgstr "aktuelle Datei ist älter als %s"
-#: directives.c:1749
+#: directives.c:1767
#, c-format
msgid "invalid \"#pragma GCC %s\" directive"
msgstr "ungültige »#pragma GCC %s« Direktive"
-#: directives.c:1950
+#: directives.c:1968
msgid "_Pragma takes a parenthesized string literal"
msgstr "_Pragma nimmt ein geklammertes Zeichenkettenliteral"
-#: directives.c:2033
+#: directives.c:2051
msgid "#else without #if"
msgstr "#else ohne #if"
-#: directives.c:2038
+#: directives.c:2056
msgid "#else after #else"
msgstr "#else hinter #else"
-#: directives.c:2040 directives.c:2073
+#: directives.c:2058 directives.c:2091
msgid "the conditional began here"
msgstr "die Bedingung begann hier"
-#: directives.c:2066
+#: directives.c:2084
msgid "#elif without #if"
msgstr "#elif ohne #if"
-#: directives.c:2071
+#: directives.c:2089
msgid "#elif after #else"
msgstr "#elif hinter #else"
-#: directives.c:2102
+#: directives.c:2120
msgid "#endif without #if"
msgstr "#endif ohne #if"
-#: directives.c:2178
+#: directives.c:2196
msgid "missing '(' after predicate"
msgstr "fehlende »(« hinter Prädikat"
-#: directives.c:2196
+#: directives.c:2214
msgid "missing ')' to complete answer"
msgstr "fehlende »)«, um Antwort abzuschließen"
-#: directives.c:2208
+#: directives.c:2226
msgid "predicate's answer is empty"
msgstr "Prädikatantwort ist leer"
-#: directives.c:2238
+#: directives.c:2256
msgid "assertion without predicate"
msgstr "Behauptung ohne Prädikat"
-#: directives.c:2241
+#: directives.c:2259
msgid "predicate must be an identifier"
msgstr "Prädikat muss ein Bezeichner sein"
-#: directives.c:2323
+#: directives.c:2341
#, c-format
msgid "\"%s\" re-asserted"
msgstr "»%s« wieder behauptet"
-#: directives.c:2604
+#: directives.c:2659
#, c-format
msgid "unterminated #%s"
msgstr "unbeendetes #%s"
-#: directives-only.c:221 lex.c:2879 traditional.c:174
-msgid "unterminated comment"
-msgstr "nicht beendeter Kommentar"
-
#: errors.c:291
#, c-format
msgid "%s: %s"
@@ -448,215 +444,227 @@ msgstr "%s: %s"
msgid "stdout"
msgstr "Standardausgabe"
-#: expr.c:626 expr.c:743
+#: expr.c:636 expr.c:753
msgid "fixed-point constants are a GCC extension"
msgstr "Festkommakonstanten sind eine GCC-Erweiterung"
-#: expr.c:651
+#: expr.c:661
msgid "invalid prefix \"0b\" for floating constant"
msgstr "ungültiges Präfix »0b« für Gleitkommakonstante"
-#: expr.c:664
+#: expr.c:674
msgid "use of C++17 hexadecimal floating constant"
msgstr "Verwendung von hexadezimaler C++17-Gleitkommakonstante"
-#: expr.c:667
+#: expr.c:677
msgid "use of C99 hexadecimal floating constant"
msgstr "Verwendung von hexadezimaler C99-Gleitkommakonstante"
-#: expr.c:711
+#: expr.c:721
#, c-format
msgid "invalid suffix \"%.*s\" on floating constant"
msgstr "ungültiges Suffix »%.*s« an Gleitkommakonstante"
-#: expr.c:722 expr.c:789
+#: expr.c:732 expr.c:799
#, c-format
msgid "traditional C rejects the \"%.*s\" suffix"
msgstr "traditionelles C lehnt das Suffix »%.*s« ab"
-#: expr.c:730
+#: expr.c:740
msgid "suffix for double constant is a GCC extension"
msgstr "Suffix an Gleitkommakonstante ist eine GCC-Erweiterung"
-#: expr.c:736
+#: expr.c:746
#, c-format
msgid "invalid suffix \"%.*s\" with hexadecimal floating constant"
msgstr "ungültiges Suffix »%.*s« mit hexadezimaler Gleitkommakonstante"
-#: expr.c:749 expr.c:753
+#: expr.c:759 expr.c:763
msgid "decimal float constants are a C2X feature"
msgstr "dezimale Gleitkommakonstanten sind ein C2X-Feature"
-#: expr.c:772
+#: expr.c:782
#, c-format
msgid "invalid suffix \"%.*s\" on integer constant"
msgstr "ungültiges Suffix »%.*s« an Ganzzahlkonstante"
-#: expr.c:797
+#: expr.c:807
msgid "use of C++11 long long integer constant"
-msgstr "C++11 long long Ganzzahlkonstante verwendet"
+msgstr "Verwendung einer long-long-Ganzzahlkonstante aus C++11"
-#: expr.c:798
+#: expr.c:808
msgid "use of C99 long long integer constant"
-msgstr "C99 long long Ganzzahlkonstante verwendet"
+msgstr "Verwendung einer long-long-Ganzzahlkonstante aus C99"
+
+#: expr.c:822
+msgid "use of C++23 %<size_t%> integer constant"
+msgstr "Verwendung von %<size_t%>-Ganzzahlkonstante aus C++23"
+
+#: expr.c:823
+msgid "use of C++23 %<make_signed_t<size_t>%> integer constant"
+msgstr "Verwendung von %<make_signed_t<size_t>%>-Ganzzahlkonstante aus C++23"
-#: expr.c:814
+#: expr.c:834
msgid "imaginary constants are a GCC extension"
msgstr "imaginäre Konstanten sind eine GCC-Erweiterung"
-#: expr.c:820
+#: expr.c:841
msgid "binary constants are a C++14 feature or GCC extension"
msgstr "binäre Konstanten sind ein C++14-Funktionsmerkmal oder eine GCC-Erweiterung"
-#: expr.c:822
-msgid "binary constants are a GCC extension"
-msgstr "binäre Konstanten sind eine GCC-Erweiterung"
+#: expr.c:843
+msgid "binary constants are a C2X feature or GCC extension"
+msgstr "binäre Konstanten sind ein C2X-Funktionsmerkmal oder eine GCC-Erweiterung"
+
+#: expr.c:848
+msgid "binary constants are a C2X feature"
+msgstr "binäre Konstanten sind ein C2X-Funktionsmerkmal"
-#: expr.c:917
+#: expr.c:944
msgid "integer constant is too large for its type"
msgstr "Ganzzahlkonstante ist zu groß für ihren Typ"
-#: expr.c:948
+#: expr.c:975
msgid "integer constant is so large that it is unsigned"
msgstr "Ganzzahlkonstante ist so groß, dass sie vorzeichenlos ist"
-#: expr.c:1043
+#: expr.c:1070
msgid "missing ')' after \"defined\""
msgstr "fehlende »)« hinter »defined«"
-#: expr.c:1050
+#: expr.c:1077
msgid "operator \"defined\" requires an identifier"
msgstr "Operator »defined« erfordert einen Bezeichner"
-#: expr.c:1058
+#: expr.c:1085
#, c-format
msgid "(\"%s\" is an alternative token for \"%s\" in C++)"
msgstr "(»%s« ist ein alternatives Token for »%s« in C++)"
-#: expr.c:1070
+#: expr.c:1098
msgid "this use of \"defined\" may not be portable"
msgstr "diese Verwendung von »defined« könnte nicht portierbar sein"
-#: expr.c:1113
+#: expr.c:1143
msgid "user-defined literal in preprocessor expression"
msgstr "benutzerdefiniertes Symbol in Präprozessorausdruck"
-#: expr.c:1118
+#: expr.c:1148
msgid "floating constant in preprocessor expression"
msgstr "Gleitkommakonstante in Präprozessorausdruck"
-#: expr.c:1124
+#: expr.c:1154
msgid "imaginary number in preprocessor expression"
msgstr "imaginäre Zahl in Präprozessorausdruck"
-#: expr.c:1173
+#: expr.c:1203
#, c-format
msgid "\"%s\" is not defined, evaluates to 0"
msgstr "»%s« ist nicht definiert, wird zu 0 ausgewertet"
-#: expr.c:1186
+#: expr.c:1216
msgid "assertions are a GCC extension"
msgstr "Assertions sind eine GCC-Erweiterung"
-#: expr.c:1189
+#: expr.c:1219
msgid "assertions are a deprecated extension"
msgstr "Assertions sind eine veraltete Erweiterung"
-#: expr.c:1435
+#: expr.c:1465
#, c-format
msgid "unbalanced stack in %s"
msgstr "unausgeglichener Keller in %s"
-#: expr.c:1455
+#: expr.c:1485
#, c-format
msgid "impossible operator '%u'"
msgstr "unmöglicher Operator »%u«"
-#: expr.c:1556
+#: expr.c:1586
msgid "missing ')' in expression"
msgstr "fehlende »)« in Ausdruck"
-#: expr.c:1585
+#: expr.c:1615
msgid "'?' without following ':'"
msgstr "»?« ohne folgenden »:«"
-#: expr.c:1595
+#: expr.c:1625
msgid "integer overflow in preprocessor expression"
msgstr "Ganzzahlüberlauf in Präprozessorausdruck"
-#: expr.c:1600
+#: expr.c:1630
msgid "missing '(' in expression"
msgstr "fehlende »(« in Ausdruck"
-#: expr.c:1632
+#: expr.c:1662
#, c-format
msgid "the left operand of \"%s\" changes sign when promoted"
msgstr "der linke Operand von »%s« ändert bei der Weitergabe das Vorzeichen"
-#: expr.c:1637
+#: expr.c:1667
#, c-format
msgid "the right operand of \"%s\" changes sign when promoted"
msgstr "der rechte Operand von »%s« ändert bei der Weitergabe das Vorzeichen"
-#: expr.c:1896
+#: expr.c:1926
msgid "traditional C rejects the unary plus operator"
msgstr "traditionelles C weist den unären Plus-Operator zurück"
-#: expr.c:1994
+#: expr.c:2024
msgid "comma operator in operand of #if"
msgstr "Kommaoperator in Operand von #if"
-#: expr.c:2130
+#: expr.c:2160
msgid "division by zero in #if"
msgstr "Division durch Null in #if"
-#: files.c:576
+#: files.c:571
msgid "one or more PCH files were found, but they were invalid"
msgstr "eine oder mehrere PCH-Dateien wurden gefunden, aber sie sind ungültig"
-#: files.c:580
+#: files.c:575
msgid "use -Winvalid-pch for more information"
msgstr "-Winvalid-pch für mehr Informationen verwenden"
-#: files.c:1004
+#: files.c:1051
#, c-format
msgid "no include path in which to search for %s"
msgstr "kein Include-Pfad, um %s zu finden"
-#: files.c:1439
+#: files.c:1546
msgid "Multiple include guards may be useful for:\n"
msgstr "Mehrere Include-Wächter könnten nützlich sein für:\n"
-#: init.c:598
+#: init.c:614
msgid "cppchar_t must be an unsigned type"
msgstr "cppchar_t muss ein vorzeichenloser Typ sein"
-#: init.c:602
+#: init.c:618
#, c-format
msgid "preprocessor arithmetic has maximum precision of %lu bits; target requires %lu bits"
msgstr "Präprozessorarithmetik hat maximale Präzision von %lu Bits; Ziel erfordert %lu Bits"
-#: init.c:609
+#: init.c:625
msgid "CPP arithmetic must be at least as precise as a target int"
msgstr "CPP-Arithmetik muss mindestens so genau sein wie das Ziel int"
-#: init.c:612
+#: init.c:628
msgid "target char is less than 8 bits wide"
msgstr "Ziel-char ist weniger als 8 Bits breit"
-#: init.c:616
+#: init.c:632
msgid "target wchar_t is narrower than target char"
msgstr "Ziel-wchar_t ist schmaler als Ziel-char"
-#: init.c:620
+#: init.c:636
msgid "target int is narrower than target char"
msgstr "Ziel-int ist schmaler als Ziel-char"
-#: init.c:625
+#: init.c:641
msgid "CPP half-integer narrower than CPP character"
msgstr "CPP Halb-Ganzzahl ist schmaler als CPP-Zeichen"
-#: init.c:629
+#: init.c:645
#, c-format
msgid "CPP on this host cannot handle wide character constants over %lu bits, but the target requires %lu bits"
msgstr "CPP kann auf diesem Computer keine Wide-Zeichenkonstanten über %lu Bits Breite behandeln, das Ziel benötigt %lu Bits"
@@ -703,12 +711,12 @@ msgid "`%.*s' is not in NFC"
msgstr "»%.*s« ist nicht in NFC"
#: lex.c:1375
-msgid "__VA_OPT__ is not available until C++2a"
-msgstr "__VA_OPT__ ist erst mit C++2a verfügbar"
+msgid "__VA_OPT__ is not available until C++20"
+msgstr "__VA_OPT__ ist erst mit C++20 verfügbar"
#: lex.c:1382
-msgid "__VA_OPT__ can only appear in the expansion of a C++2a variadic macro"
-msgstr "__VA_OPT__ kann nur in der Expansion eines variadischen C++2a-Makros auftreten"
+msgid "__VA_OPT__ can only appear in the expansion of a C++20 variadic macro"
+msgstr "__VA_OPT__ kann nur in der Expansion eines variadischen C++20-Makros auftreten"
#: lex.c:1413 lex.c:1506
#, c-format
@@ -728,232 +736,254 @@ msgstr "__VA_ARGS__ kann nur in Erweiterung eines variadischen C99-Makros auftre
msgid "identifier \"%s\" is a special operator name in C++"
msgstr "Bezeichner »%s« ist ein besonderer Operatorname in C++"
-#: lex.c:1837
+#: lex.c:1879
msgid "raw string delimiter longer than 16 characters"
msgstr "Roh-Zeichenketten-Trennsymbol länger als 16 Zeichen"
-#: lex.c:1841
+#: lex.c:1883
msgid "invalid new-line in raw string delimiter"
msgstr "ungültiger Zeilenumbruch (neue Zeile) in Roh-Zeichenketten-Trennsymbol"
-#: lex.c:1845
+#: lex.c:1887 lex.c:4639
#, c-format
msgid "invalid character '%c' in raw string delimiter"
msgstr "ungültiges Zeichen »%c« in Roh-Zeichenketten-Trennsymbol"
-#: lex.c:1894 lex.c:1916
+#: lex.c:1926 lex.c:1949
msgid "unterminated raw string"
msgstr "unbeendete Roh-Zeichenkette"
-#: lex.c:1936 lex.c:2065
+#: lex.c:1971 lex.c:2100
msgid "invalid suffix on literal; C++11 requires a space between literal and string macro"
msgstr "ungültiges Suffix an Literal; C++11 erfordert Leerzeichen zwischen Literal und Zeichenketten-Makro"
-#: lex.c:2048
+#: lex.c:2083
msgid "null character(s) preserved in literal"
msgstr "Null-Zeichen im Literal erhalten"
-#: lex.c:2051
+#: lex.c:2086
#, c-format
msgid "missing terminating %c character"
msgstr "fehlendes abschließendes Zeichen %c"
-#: lex.c:2083
+#: lex.c:2118
msgid "C++11 requires a space between string literal and macro"
msgstr "C++11 erfordert Leerzeichen zwischen Zeichenketten-Literal und Makro"
-#: lex.c:2893 lex.c:2927
+#: lex.c:2711
+msgid "module control-line cannot be in included file"
+msgstr "Modul-Steuerzeile darf nicht in eingebundener Datei vorkommen"
+
+#: lex.c:2725
+#, c-format
+msgid "module control-line \"%s\" cannot be an object-like macro"
+msgstr "Modul-Steuerzeile \"%s\" darf nicht in einem objektartigen Makro vorkommen"
+
+#: lex.c:3099 lex.c:4472 traditional.c:174
+msgid "unterminated comment"
+msgstr "nicht beendeter Kommentar"
+
+#: lex.c:3113 lex.c:3147
msgid "C++ style comments are not allowed in ISO C90"
msgstr "C++-Stil-Kommentare sind in ISO-C90 nicht erlaubt"
-#: lex.c:2895 lex.c:2906 lex.c:2930
+#: lex.c:3115 lex.c:3126 lex.c:3150
msgid "(this will be reported only once per input file)"
msgstr "(dies wird nur einmal pro Eingabedatei gemeldet)"
-#: lex.c:2904
+#: lex.c:3124
msgid "C++ style comments are incompatible with C90"
msgstr "C++-Stil-Kommentare sind zu C90 inkompatibel"
-#: lex.c:2936
+#: lex.c:3156
msgid "multi-line comment"
msgstr "mehrzeiliger Kommentar"
-#: lex.c:3330
+#: lex.c:3550
#, c-format
msgid "unspellable token %s"
msgstr "nicht buchstabierbares Token %s"
+#: lex.c:4627
+#, c-format
+msgid "raw string delimiter longer than %d characters"
+msgstr "Roh-Zeichenketten-Trennsymbol länger als %d Zeichen"
+
+#: lex.c:4697
+msgid "unterminated literal"
+msgstr "unbeendetes Literal"
+
#: macro.c:94
msgid "'##' cannot appear at either end of __VA_OPT__"
msgstr "»##« kann an einem beliebigen Enden von __VA_OPT__ auftreten"
-#: macro.c:364
+#: macro.c:386
#, c-format
msgid "\"%s\" used outside of preprocessing directive"
msgstr "»%s« außerhalb einer Präprozessordirektive verwendet"
-#: macro.c:374
+#: macro.c:396
#, c-format
msgid "missing '(' before \"%s\" operand"
msgstr "fehlende »(« vor »%s«-Operand"
-#: macro.c:389
+#: macro.c:411
#, c-format
msgid "operator \"%s\" requires a header-name"
msgstr "Operator »%s« erfordert einen Headernamen"
-#: macro.c:406
+#: macro.c:428
#, c-format
msgid "missing ')' after \"%s\" operand"
msgstr "fehlende »)« hinter »%s«-Operand"
-#: macro.c:426
+#: macro.c:448
#, c-format
msgid "macro \"%s\" is not used"
msgstr "Makro »%s« wird nicht benutzt"
-#: macro.c:465 macro.c:723
+#: macro.c:487 macro.c:778
#, c-format
msgid "invalid built-in macro \"%s\""
msgstr "ungültiges eingebautes Makro »%s«"
-#: macro.c:472 macro.c:574
+#: macro.c:494 macro.c:596
#, c-format
msgid "macro \"%s\" might prevent reproducible builds"
msgstr "Das Makro »%s« könnte reproduzierbare Builds verhindern"
-#: macro.c:503
+#: macro.c:525
msgid "could not determine file timestamp"
msgstr "Zeitstempel der Datei konnte nicht ermittelt werden"
-#: macro.c:620
+#: macro.c:610
msgid "could not determine date and time"
msgstr "Datum und Zeit konnten nicht bestimmt werden"
-#: macro.c:636
+#: macro.c:642
msgid "__COUNTER__ expanded inside directive with -fdirectives-only"
msgstr "__COUNTER__ innerhalb von Anweisung mit -fdirectives-only expandiert"
-#: macro.c:842
+#: macro.c:897
msgid "invalid string literal, ignoring final '\\'"
msgstr "ungültiges Zeichenkettenliteral, abschließendes »\\« wird ignoriert"
-#: macro.c:904
+#: macro.c:959
#, c-format
msgid "pasting \"%s\" and \"%s\" does not give a valid preprocessing token"
msgstr "das Einfügen von »%s« und »%s« ergibt kein gültiges Präprozessor-Token"
-#: macro.c:1030
+#: macro.c:1085
msgid "ISO C++11 requires at least one argument for the \"...\" in a variadic macro"
msgstr "ISO-C++11 erfordert mindestens ein Argument für »...« in einem variadischen Makro"
-#: macro.c:1034
+#: macro.c:1089
msgid "ISO C99 requires at least one argument for the \"...\" in a variadic macro"
msgstr "ISO-C99 erfordert mindestens ein Argument für »...« in einem variadischen Makro"
-#: macro.c:1041
+#: macro.c:1096
#, c-format
msgid "macro \"%s\" requires %u arguments, but only %u given"
msgstr "Makro »%s« erfordert %u Argumente, aber nur %u wurden angegeben"
-#: macro.c:1046
+#: macro.c:1101
#, c-format
msgid "macro \"%s\" passed %u arguments, but takes just %u"
msgstr "dem Makro »%s« wurden %u Argumente übergeben, aber es akzeptiert nur %u"
-#: macro.c:1244 traditional.c:815
+#: macro.c:1299 traditional.c:822
#, c-format
msgid "unterminated argument list invoking macro \"%s\""
msgstr "unvollendete Argumentliste beim Makroaufruf »%s«"
-#: macro.c:1386
+#: macro.c:1442
#, c-format
msgid "function-like macro \"%s\" must be used with arguments in traditional C"
msgstr "funktionsähnliches Makro »%s« muss mit Argumenten in traditionellem C verwendet werden"
-#: macro.c:2165
+#: macro.c:2220
#, c-format
msgid "invoking macro %s argument %d: empty macro arguments are undefined in ISO C++98"
msgstr "Beim Ausführen des Arguments %2$d des Makros %1$s: Leere Makroargumente sind nach ISO-C++98 unbestimmt"
-#: macro.c:2173 macro.c:2182
+#: macro.c:2228 macro.c:2237
#, c-format
msgid "invoking macro %s argument %d: empty macro arguments are undefined in ISO C90"
msgstr "Beim Ausführen des Arguments %2$d des Makros %1$s: Leere Makroargumente sind nach ISO-C90 unbestimmt"
-#: macro.c:3141
+#: macro.c:3279
#, c-format
msgid "duplicate macro parameter \"%s\""
msgstr "doppelter Makroparameter »%s«"
-#: macro.c:3223
+#: macro.c:3361
#, c-format
msgid "expected parameter name, found \"%s\""
msgstr "Parametername erwartet, aber »%s« gefunden"
-#: macro.c:3224
+#: macro.c:3362
#, c-format
msgid "expected ',' or ')', found \"%s\""
msgstr "»,« oder »)« erwartet, aber »%s« gefunden"
-#: macro.c:3225
+#: macro.c:3363
msgid "expected parameter name before end of line"
msgstr "Parametername vor dem Zeilenende erwartet"
-#: macro.c:3226
+#: macro.c:3364
msgid "expected ')' before end of line"
msgstr "»)« vor dem Zeilenende erwartet"
-#: macro.c:3227
+#: macro.c:3365
msgid "expected ')' after \"...\""
msgstr "»)« nach »...« erwartet"
-#: macro.c:3284
+#: macro.c:3422
msgid "anonymous variadic macros were introduced in C++11"
msgstr "anonyme variadische Makros wurden in C++11 eingeführt"
-#: macro.c:3285 macro.c:3289
+#: macro.c:3423 macro.c:3427
msgid "anonymous variadic macros were introduced in C99"
msgstr "anonyme variadische Makros wurden in C99 eingeführt"
-#: macro.c:3295
+#: macro.c:3433
msgid "ISO C++ does not permit named variadic macros"
msgstr "ISO-C++ erlaubt keine benannten variadischen Makros"
-#: macro.c:3296
+#: macro.c:3434
msgid "ISO C does not permit named variadic macros"
msgstr "ISO-C erlaubt keine benannten variadischen Makros"
-#: macro.c:3342
+#: macro.c:3480
msgid "'##' cannot appear at either end of a macro expansion"
msgstr "»##« kann nicht an den Enden einer Makroexpansion auftreten"
-#: macro.c:3380
+#: macro.c:3518
msgid "ISO C++11 requires whitespace after the macro name"
msgstr "ISO-C++11 erfordert Leerzeichen hinter Makroname"
-#: macro.c:3381
+#: macro.c:3519
msgid "ISO C99 requires whitespace after the macro name"
msgstr "ISO-C99 erfordert Leerzeichen hinter Makroname"
-#: macro.c:3405
+#: macro.c:3543
msgid "missing whitespace after the macro name"
msgstr "Leerzeichen hinter Makroname fehlt"
-#: macro.c:3455
+#: macro.c:3593
msgid "'#' is not followed by a macro parameter"
msgstr "»#« wird nicht von einem Makroparameter gefolgt"
-#: macro.c:3606
+#: macro.c:3749
#, c-format
msgid "\"%s\" redefined"
msgstr "»%s« redefiniert"
-#: macro.c:3611
+#: macro.c:3754
msgid "this is the location of the previous definition"
msgstr "dies ist die Stelle der vorherigen Definition"
-#: macro.c:3715
+#: macro.c:3891
#, c-format
msgid "macro argument \"%s\" would be stringified in traditional C"
msgstr "Makroargument »%s« würde in traditionellem C zur Zeichenkette umgewandelt werden"
@@ -991,15 +1021,18 @@ msgstr "%s: nicht verwendet, da »__COUNTER__« ungültig ist"
msgid "while reading precompiled header"
msgstr "beim Lesen des vorkompilierten Headers"
-#: traditional.c:884
+#: traditional.c:891
#, c-format
msgid "detected recursion whilst expanding macro \"%s\""
msgstr "Rekursion bei Expansion des Makros »%s« entdeckt"
-#: traditional.c:1107
+#: traditional.c:1114
msgid "syntax error in macro parameter list"
msgstr "Syntaxfehler in Makroparameterliste"
+#~ msgid "binary constants are a GCC extension"
+#~ msgstr "binäre Konstanten sind eine GCC-Erweiterung"
+
#~ msgid "\"__has_include__\" cannot be used as a macro name"
#~ msgstr "»__has_include__« kann nicht als Makroname verwendet werden"
diff --git a/libcpp/po/el.po b/libcpp/po/el.po
index ebc8d27..1f90947 100644
--- a/libcpp/po/el.po
+++ b/libcpp/po/el.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: gcc 3.2\n"
"Report-Msgid-Bugs-To: https://gcc.gnu.org/bugs/\n"
-"POT-Creation-Date: 2020-02-07 22:33+0000\n"
+"POT-Creation-Date: 2021-02-05 21:38+0000\n"
"PO-Revision-Date: 2002-08-18 15:46+0100\n"
"Last-Translator: Simos Xenitellis <simos@hellug.gr>\n"
"Language-Team: Greek <nls@tux.hellug.gr>\n"
@@ -16,164 +16,164 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"X-Bugs: Report translation errors to the Language-Team address.\n"
-#: charset.c:674
+#: charset.c:677
#, fuzzy, c-format
msgid "conversion from %s to %s not supported by iconv"
msgstr " `%s' `%s' "
-#: charset.c:677
+#: charset.c:680
msgid "iconv_open"
msgstr ""
-#: charset.c:685
+#: charset.c:688
#, c-format
msgid "no iconv implementation, cannot convert from %s to %s"
msgstr ""
-#: charset.c:781
+#: charset.c:784
#, c-format
msgid "character 0x%lx is not in the basic source character set\n"
msgstr ""
-#: charset.c:798 charset.c:1768
+#: charset.c:801 charset.c:1771
msgid "converting to execution character set"
msgstr ""
-#: charset.c:804
+#: charset.c:807
#, c-format
msgid "character 0x%lx is not unibyte in execution character set"
msgstr ""
-#: charset.c:1054
+#: charset.c:1057
#, fuzzy
msgid "universal character names are only valid in C++ and C99"
msgstr "U+%04X: "
-#: charset.c:1058
+#: charset.c:1061
msgid "C99's universal character names are incompatible with C90"
msgstr ""
-#: charset.c:1061
+#: charset.c:1064
#, c-format
msgid "the meaning of '\\%c' is different in traditional C"
msgstr ""
-#: charset.c:1070
+#: charset.c:1073
msgid "In _cpp_valid_ucn but not a UCN"
msgstr ""
-#: charset.c:1103
+#: charset.c:1106
#, c-format
msgid "incomplete universal character name %.*s"
msgstr ""
-#: charset.c:1118
+#: charset.c:1121
#, fuzzy, c-format
msgid "%.*s is not a valid universal character"
msgstr " `%s' ."
-#: charset.c:1128 lex.c:1335
+#: charset.c:1131 lex.c:1335
msgid "'$' in identifier or number"
msgstr ""
-#: charset.c:1138
+#: charset.c:1141
#, c-format
msgid "universal character %.*s is not valid in an identifier"
msgstr ""
-#: charset.c:1142
+#: charset.c:1145
#, c-format
msgid "universal character %.*s is not valid at the start of an identifier"
msgstr ""
-#: charset.c:1149
+#: charset.c:1152
#, c-format
msgid "%.*s is outside the UCS codespace"
msgstr ""
-#: charset.c:1194 charset.c:2113
+#: charset.c:1197 charset.c:2116
msgid "converting UCN to source character set"
msgstr ""
-#: charset.c:1201
+#: charset.c:1204
msgid "converting UCN to execution character set"
msgstr ""
-#: charset.c:1265
+#: charset.c:1268
#, fuzzy, c-format
msgid "extended character %.*s is not valid in an identifier"
msgstr " "
-#: charset.c:1282
+#: charset.c:1285
#, c-format
msgid "extended character %.*s is not valid at the start of an identifier"
msgstr ""
-#: charset.c:1368
+#: charset.c:1371
msgid "the meaning of '\\x' is different in traditional C"
msgstr ""
-#: charset.c:1393
+#: charset.c:1396
msgid "\\x used with no following hex digits"
msgstr ""
-#: charset.c:1400
+#: charset.c:1403
#, fuzzy
msgid "hex escape sequence out of range"
msgstr " "
-#: charset.c:1452
+#: charset.c:1455
#, fuzzy
msgid "octal escape sequence out of range"
msgstr " "
-#: charset.c:1534
+#: charset.c:1537
msgid "the meaning of '\\a' is different in traditional C"
msgstr ""
-#: charset.c:1541
+#: charset.c:1544
#, c-format
msgid "non-ISO-standard escape sequence, '\\%c'"
msgstr ""
# src/main.c:663
-#: charset.c:1549
+#: charset.c:1552
#, fuzzy, c-format
msgid "unknown escape sequence: '\\%c'"
msgstr " `%s'"
# src/main.c:663
-#: charset.c:1557
+#: charset.c:1560
#, fuzzy, c-format
msgid "unknown escape sequence: '\\%s'"
msgstr " `%s'"
-#: charset.c:1565
+#: charset.c:1568
#, fuzzy
msgid "converting escape sequence to execution character set"
msgstr " "
-#: charset.c:1705
+#: charset.c:1708
#, fuzzy
msgid "missing open quote"
msgstr " "
-#: charset.c:1923 charset.c:2002
+#: charset.c:1926 charset.c:2005
#, fuzzy
msgid "character constant too long for its type"
msgstr " "
-#: charset.c:1926
+#: charset.c:1929
#, fuzzy
msgid "multi-character character constant"
msgstr " `%s'"
-#: charset.c:2042
+#: charset.c:2045
#, fuzzy
msgid "empty character constant"
msgstr " "
-#: charset.c:2160
+#: charset.c:2163
#, fuzzy, c-format
msgid "failure to convert %s to %s"
msgstr " %s `%s' `%s'"
@@ -245,210 +245,205 @@ msgstr " "
msgid "undefining \"%s\""
msgstr " %s"
-#: directives.c:724
+#: directives.c:725
#, fuzzy
msgid "missing terminating > character"
msgstr " "
-#: directives.c:783
+#: directives.c:784
#, c-format
msgid "#%s expects \"FILENAME\" or <FILENAME>"
msgstr ""
-#: directives.c:829
+#: directives.c:830
#, fuzzy, c-format
msgid "empty filename in #%s"
msgstr " %s"
-#: directives.c:838
+#: directives.c:839
#, c-format
msgid "#include nested depth %u exceeds maximum of %u (use -fmax-include-depth=DEPTH to increase the maximum)"
msgstr ""
-#: directives.c:883
+#: directives.c:884
msgid "#include_next in primary source file"
msgstr ""
-#: directives.c:909
+#: directives.c:910
#, c-format
msgid "invalid flag \"%s\" in line directive"
msgstr ""
-#: directives.c:969
+#: directives.c:970
msgid "unexpected end of file after #line"
msgstr ""
-#: directives.c:972
+#: directives.c:973
#, fuzzy, c-format
msgid "\"%s\" after #line is not a positive integer"
msgstr "%s' ."
-#: directives.c:978 directives.c:980
+#: directives.c:979 directives.c:981
#, fuzzy
msgid "line number out of range"
msgstr "%s: "
-#: directives.c:993 directives.c:1074
+#: directives.c:994 directives.c:1075
#, fuzzy, c-format
msgid "\"%s\" is not a valid filename"
msgstr "%s' ."
-#: directives.c:1034
+#: directives.c:1035
#, fuzzy, c-format
msgid "\"%s\" after # is not a positive integer"
msgstr "%s' ."
-#: directives.c:1101
+#: directives.c:1102
#, c-format
msgid "file \"%s\" linemarker ignored due to incorrect nesting"
msgstr ""
-#: directives.c:1162 directives.c:1164 directives.c:1166 directives.c:1754
+#: directives.c:1180 directives.c:1182 directives.c:1184 directives.c:1772
#, c-format
msgid "%s"
msgstr "%s"
-#: directives.c:1190
+#: directives.c:1208
#, fuzzy, c-format
msgid "invalid #%s directive"
msgstr "%%%c: ."
-#: directives.c:1253
+#: directives.c:1271
#, c-format
msgid "registering pragmas in namespace \"%s\" with mismatched name expansion"
msgstr ""
-#: directives.c:1262
+#: directives.c:1280
#, c-format
msgid "registering pragma \"%s\" with name expansion and no namespace"
msgstr ""
-#: directives.c:1280
+#: directives.c:1298
#, c-format
msgid "registering \"%s\" as both a pragma and a pragma namespace"
msgstr ""
-#: directives.c:1283
+#: directives.c:1301
#, c-format
msgid "#pragma %s %s is already registered"
msgstr ""
-#: directives.c:1286
+#: directives.c:1304
#, fuzzy, c-format
msgid "#pragma %s is already registered"
msgstr " `%s' "
-#: directives.c:1316
+#: directives.c:1334
msgid "registering pragma with NULL handler"
msgstr ""
-#: directives.c:1533
+#: directives.c:1551
msgid "#pragma once in main file"
msgstr ""
-#: directives.c:1556
+#: directives.c:1574
#, fuzzy
msgid "invalid #pragma push_macro directive"
msgstr "%%%c: ."
-#: directives.c:1613
+#: directives.c:1631
#, fuzzy
msgid "invalid #pragma pop_macro directive"
msgstr "%%%c: ."
-#: directives.c:1668
+#: directives.c:1686
msgid "invalid #pragma GCC poison directive"
msgstr ""
-#: directives.c:1677
+#: directives.c:1695
#, c-format
msgid "poisoning existing macro \"%s\""
msgstr ""
-#: directives.c:1696
+#: directives.c:1714
msgid "#pragma system_header ignored outside include file"
msgstr ""
-#: directives.c:1721
+#: directives.c:1739
#, fuzzy, c-format
msgid "cannot find source file %s"
msgstr " : %s"
-#: directives.c:1725
+#: directives.c:1743
#, c-format
msgid "current file is older than %s"
msgstr ""
-#: directives.c:1749
+#: directives.c:1767
#, fuzzy, c-format
msgid "invalid \"#pragma GCC %s\" directive"
msgstr " `%s' ."
-#: directives.c:1950
+#: directives.c:1968
msgid "_Pragma takes a parenthesized string literal"
msgstr ""
-#: directives.c:2033
+#: directives.c:2051
msgid "#else without #if"
msgstr ""
-#: directives.c:2038
+#: directives.c:2056
msgid "#else after #else"
msgstr "#else #else"
-#: directives.c:2040 directives.c:2073
+#: directives.c:2058 directives.c:2091
msgid "the conditional began here"
msgstr ""
-#: directives.c:2066
+#: directives.c:2084
msgid "#elif without #if"
msgstr ""
-#: directives.c:2071
+#: directives.c:2089
msgid "#elif after #else"
msgstr "#elif #else"
-#: directives.c:2102
+#: directives.c:2120
msgid "#endif without #if"
msgstr ""
-#: directives.c:2178
+#: directives.c:2196
msgid "missing '(' after predicate"
msgstr ""
-#: directives.c:2196
+#: directives.c:2214
msgid "missing ')' to complete answer"
msgstr ""
-#: directives.c:2208
+#: directives.c:2226
msgid "predicate's answer is empty"
msgstr ""
-#: directives.c:2238
+#: directives.c:2256
#, fuzzy
msgid "assertion without predicate"
msgstr " "
-#: directives.c:2241
+#: directives.c:2259
#, fuzzy
msgid "predicate must be an identifier"
msgstr " "
-#: directives.c:2323
+#: directives.c:2341
#, c-format
msgid "\"%s\" re-asserted"
msgstr ""
-#: directives.c:2604
+#: directives.c:2659
#, fuzzy, c-format
msgid "unterminated #%s"
msgstr " o "
-#: directives-only.c:221 lex.c:2879 traditional.c:174
-#, fuzzy
-msgid "unterminated comment"
-msgstr " `s'"
-
# src/request.c:37
#: errors.c:291
#, c-format
@@ -459,126 +454,138 @@ msgstr "%s: %s"
msgid "stdout"
msgstr ""
-#: expr.c:626 expr.c:743
+#: expr.c:636 expr.c:753
msgid "fixed-point constants are a GCC extension"
msgstr ""
-#: expr.c:651
+#: expr.c:661
#, fuzzy
msgid "invalid prefix \"0b\" for floating constant"
msgstr " : %s"
-#: expr.c:664
+#: expr.c:674
msgid "use of C++17 hexadecimal floating constant"
msgstr ""
-#: expr.c:667
+#: expr.c:677
msgid "use of C99 hexadecimal floating constant"
msgstr ""
-#: expr.c:711
+#: expr.c:721
#, fuzzy, c-format
msgid "invalid suffix \"%.*s\" on floating constant"
msgstr " : %s"
-#: expr.c:722 expr.c:789
+#: expr.c:732 expr.c:799
#, c-format
msgid "traditional C rejects the \"%.*s\" suffix"
msgstr ""
-#: expr.c:730
+#: expr.c:740
msgid "suffix for double constant is a GCC extension"
msgstr ""
-#: expr.c:736
+#: expr.c:746
#, fuzzy, c-format
msgid "invalid suffix \"%.*s\" with hexadecimal floating constant"
msgstr " : %s"
-#: expr.c:749 expr.c:753
+#: expr.c:759 expr.c:763
#, fuzzy
msgid "decimal float constants are a C2X feature"
msgstr "%s: %s "
-#: expr.c:772
+#: expr.c:782
#, fuzzy, c-format
msgid "invalid suffix \"%.*s\" on integer constant"
msgstr " `%s'"
-#: expr.c:797
+#: expr.c:807
#, fuzzy
msgid "use of C++11 long long integer constant"
msgstr " `%s'"
-#: expr.c:798
+#: expr.c:808
#, fuzzy
msgid "use of C99 long long integer constant"
msgstr " `%s'"
-#: expr.c:814
+#: expr.c:822
+msgid "use of C++23 %<size_t%> integer constant"
+msgstr ""
+
+#: expr.c:823
+msgid "use of C++23 %<make_signed_t<size_t>%> integer constant"
+msgstr ""
+
+#: expr.c:834
msgid "imaginary constants are a GCC extension"
msgstr ""
-#: expr.c:820
+#: expr.c:841
msgid "binary constants are a C++14 feature or GCC extension"
msgstr ""
-#: expr.c:822
-msgid "binary constants are a GCC extension"
+#: expr.c:843
+msgid "binary constants are a C2X feature or GCC extension"
+msgstr ""
+
+#: expr.c:848
+msgid "binary constants are a C2X feature"
msgstr ""
-#: expr.c:917
+#: expr.c:944
#, fuzzy
msgid "integer constant is too large for its type"
msgstr "%s: %s "
-#: expr.c:948
+#: expr.c:975
#, fuzzy
msgid "integer constant is so large that it is unsigned"
msgstr "%s: %s "
-#: expr.c:1043
+#: expr.c:1070
#, fuzzy
msgid "missing ')' after \"defined\""
msgstr " "
-#: expr.c:1050
+#: expr.c:1077
msgid "operator \"defined\" requires an identifier"
msgstr ""
-#: expr.c:1058
+#: expr.c:1085
#, c-format
msgid "(\"%s\" is an alternative token for \"%s\" in C++)"
msgstr ""
-#: expr.c:1070
+#: expr.c:1098
msgid "this use of \"defined\" may not be portable"
msgstr ""
-#: expr.c:1113
+#: expr.c:1143
msgid "user-defined literal in preprocessor expression"
msgstr ""
-#: expr.c:1118
+#: expr.c:1148
#, fuzzy
msgid "floating constant in preprocessor expression"
msgstr " "
-#: expr.c:1124
+#: expr.c:1154
#, fuzzy
msgid "imaginary number in preprocessor expression"
msgstr " "
-#: expr.c:1173
+#: expr.c:1203
#, fuzzy, c-format
msgid "\"%s\" is not defined, evaluates to 0"
msgstr " `%s' "
-#: expr.c:1186
+#: expr.c:1216
msgid "assertions are a GCC extension"
msgstr ""
-#: expr.c:1189
+#: expr.c:1219
msgid "assertions are a deprecated extension"
msgstr ""
@@ -586,106 +593,106 @@ msgstr ""
# src/dfa.c:690 src/dfa.c:703 src/dfa.c:704
# src/dfa.c:660 src/dfa.c:663 src/dfa.c:690 src/dfa.c:694 src/dfa.c:695
# src/dfa.c:698 src/dfa.c:711 src/dfa.c:712
-#: expr.c:1435
+#: expr.c:1465
#, fuzzy, c-format
msgid "unbalanced stack in %s"
msgstr " ["
-#: expr.c:1455
+#: expr.c:1485
#, fuzzy, c-format
msgid "impossible operator '%u'"
msgstr "RPC: RPC"
-#: expr.c:1556
+#: expr.c:1586
#, fuzzy
msgid "missing ')' in expression"
msgstr " "
-#: expr.c:1585
+#: expr.c:1615
#, fuzzy
msgid "'?' without following ':'"
msgstr " : %s"
-#: expr.c:1595
+#: expr.c:1625
msgid "integer overflow in preprocessor expression"
msgstr ""
-#: expr.c:1600
+#: expr.c:1630
#, fuzzy
msgid "missing '(' in expression"
msgstr " "
-#: expr.c:1632
+#: expr.c:1662
#, c-format
msgid "the left operand of \"%s\" changes sign when promoted"
msgstr ""
-#: expr.c:1637
+#: expr.c:1667
#, c-format
msgid "the right operand of \"%s\" changes sign when promoted"
msgstr ""
-#: expr.c:1896
+#: expr.c:1926
msgid "traditional C rejects the unary plus operator"
msgstr ""
-#: expr.c:1994
+#: expr.c:2024
msgid "comma operator in operand of #if"
msgstr ""
-#: expr.c:2130
+#: expr.c:2160
#, fuzzy
msgid "division by zero in #if"
msgstr " : %s"
-#: files.c:576
+#: files.c:571
msgid "one or more PCH files were found, but they were invalid"
msgstr ""
-#: files.c:580
+#: files.c:575
msgid "use -Winvalid-pch for more information"
msgstr ""
-#: files.c:1004
+#: files.c:1051
#, c-format
msgid "no include path in which to search for %s"
msgstr ""
-#: files.c:1439
+#: files.c:1546
msgid "Multiple include guards may be useful for:\n"
msgstr ""
-#: init.c:598
+#: init.c:614
#, fuzzy
msgid "cppchar_t must be an unsigned type"
msgstr " "
-#: init.c:602
+#: init.c:618
#, c-format
msgid "preprocessor arithmetic has maximum precision of %lu bits; target requires %lu bits"
msgstr ""
-#: init.c:609
+#: init.c:625
msgid "CPP arithmetic must be at least as precise as a target int"
msgstr ""
-#: init.c:612
+#: init.c:628
msgid "target char is less than 8 bits wide"
msgstr ""
-#: init.c:616
+#: init.c:632
msgid "target wchar_t is narrower than target char"
msgstr ""
-#: init.c:620
+#: init.c:636
msgid "target int is narrower than target char"
msgstr ""
-#: init.c:625
+#: init.c:641
msgid "CPP half-integer narrower than CPP character"
msgstr ""
-#: init.c:629
+#: init.c:645
#, c-format
msgid "CPP on this host cannot handle wide character constants over %lu bits, but the target requires %lu bits"
msgstr ""
@@ -734,11 +741,11 @@ msgid "`%.*s' is not in NFC"
msgstr " `%s' "
#: lex.c:1375
-msgid "__VA_OPT__ is not available until C++2a"
+msgid "__VA_OPT__ is not available until C++20"
msgstr ""
#: lex.c:1382
-msgid "__VA_OPT__ can only appear in the expansion of a C++2a variadic macro"
+msgid "__VA_OPT__ can only appear in the expansion of a C++20 variadic macro"
msgstr ""
#: lex.c:1413 lex.c:1506
@@ -759,240 +766,264 @@ msgstr ""
msgid "identifier \"%s\" is a special operator name in C++"
msgstr ""
-#: lex.c:1837
+#: lex.c:1879
msgid "raw string delimiter longer than 16 characters"
msgstr ""
-#: lex.c:1841
+#: lex.c:1883
msgid "invalid new-line in raw string delimiter"
msgstr ""
-#: lex.c:1845
+#: lex.c:1887 lex.c:4639
#, fuzzy, c-format
msgid "invalid character '%c' in raw string delimiter"
msgstr " `%c' `%s'"
-#: lex.c:1894 lex.c:1916
+#: lex.c:1926 lex.c:1949
#, fuzzy
msgid "unterminated raw string"
msgstr " o "
-#: lex.c:1936 lex.c:2065
+#: lex.c:1971 lex.c:2100
msgid "invalid suffix on literal; C++11 requires a space between literal and string macro"
msgstr ""
-#: lex.c:2048
+#: lex.c:2083
msgid "null character(s) preserved in literal"
msgstr ""
-#: lex.c:2051
+#: lex.c:2086
#, c-format
msgid "missing terminating %c character"
msgstr " %c"
-#: lex.c:2083
+#: lex.c:2118
msgid "C++11 requires a space between string literal and macro"
msgstr ""
-#: lex.c:2893 lex.c:2927
+#: lex.c:2711
+msgid "module control-line cannot be in included file"
+msgstr ""
+
+#: lex.c:2725
+#, c-format
+msgid "module control-line \"%s\" cannot be an object-like macro"
+msgstr ""
+
+#: lex.c:3099 lex.c:4472 traditional.c:174
+#, fuzzy
+msgid "unterminated comment"
+msgstr " `s'"
+
+#: lex.c:3113 lex.c:3147
msgid "C++ style comments are not allowed in ISO C90"
msgstr ""
-#: lex.c:2895 lex.c:2906 lex.c:2930
+#: lex.c:3115 lex.c:3126 lex.c:3150
msgid "(this will be reported only once per input file)"
msgstr ""
-#: lex.c:2904
+#: lex.c:3124
msgid "C++ style comments are incompatible with C90"
msgstr ""
-#: lex.c:2936
+#: lex.c:3156
msgid "multi-line comment"
msgstr ""
-#: lex.c:3330
+#: lex.c:3550
#, fuzzy, c-format
msgid "unspellable token %s"
msgstr "%s: %s: %m\n"
+#: lex.c:4627
+#, c-format
+msgid "raw string delimiter longer than %d characters"
+msgstr ""
+
+#: lex.c:4697
+#, fuzzy
+msgid "unterminated literal"
+msgstr " o "
+
#: macro.c:94
msgid "'##' cannot appear at either end of __VA_OPT__"
msgstr ""
-#: macro.c:364
+#: macro.c:386
#, c-format
msgid "\"%s\" used outside of preprocessing directive"
msgstr ""
-#: macro.c:374
+#: macro.c:396
#, fuzzy, c-format
msgid "missing '(' before \"%s\" operand"
msgstr " "
-#: macro.c:389
+#: macro.c:411
#, c-format
msgid "operator \"%s\" requires a header-name"
msgstr ""
-#: macro.c:406
+#: macro.c:428
#, fuzzy, c-format
msgid "missing ')' after \"%s\" operand"
msgstr " "
-#: macro.c:426
+#: macro.c:448
#, fuzzy, c-format
msgid "macro \"%s\" is not used"
msgstr " `%s' "
-#: macro.c:465 macro.c:723
+#: macro.c:487 macro.c:778
#, fuzzy, c-format
msgid "invalid built-in macro \"%s\""
msgstr " : %s"
-#: macro.c:472 macro.c:574
+#: macro.c:494 macro.c:596
#, c-format
msgid "macro \"%s\" might prevent reproducible builds"
msgstr ""
-#: macro.c:503
+#: macro.c:525
#, fuzzy
msgid "could not determine file timestamp"
msgstr " %s"
-#: macro.c:620
+#: macro.c:610
#, fuzzy
msgid "could not determine date and time"
msgstr " %s"
-#: macro.c:636
+#: macro.c:642
msgid "__COUNTER__ expanded inside directive with -fdirectives-only"
msgstr ""
-#: macro.c:842
+#: macro.c:897
#, fuzzy
msgid "invalid string literal, ignoring final '\\'"
msgstr " : `%s'"
-#: macro.c:904
+#: macro.c:959
#, c-format
msgid "pasting \"%s\" and \"%s\" does not give a valid preprocessing token"
msgstr ""
-#: macro.c:1030
+#: macro.c:1085
msgid "ISO C++11 requires at least one argument for the \"...\" in a variadic macro"
msgstr ""
-#: macro.c:1034
+#: macro.c:1089
#, fuzzy
msgid "ISO C99 requires at least one argument for the \"...\" in a variadic macro"
msgstr " "
-#: macro.c:1041
+#: macro.c:1096
#, c-format
msgid "macro \"%s\" requires %u arguments, but only %u given"
msgstr ""
-#: macro.c:1046
+#: macro.c:1101
#, c-format
msgid "macro \"%s\" passed %u arguments, but takes just %u"
msgstr ""
-#: macro.c:1244 traditional.c:815
+#: macro.c:1299 traditional.c:822
#, c-format
msgid "unterminated argument list invoking macro \"%s\""
msgstr ""
-#: macro.c:1386
+#: macro.c:1442
#, c-format
msgid "function-like macro \"%s\" must be used with arguments in traditional C"
msgstr ""
-#: macro.c:2165
+#: macro.c:2220
#, c-format
msgid "invoking macro %s argument %d: empty macro arguments are undefined in ISO C++98"
msgstr ""
-#: macro.c:2173 macro.c:2182
+#: macro.c:2228 macro.c:2237
#, c-format
msgid "invoking macro %s argument %d: empty macro arguments are undefined in ISO C90"
msgstr ""
-#: macro.c:3141
+#: macro.c:3279
#, fuzzy, c-format
msgid "duplicate macro parameter \"%s\""
msgstr " `%s'"
-#: macro.c:3223
+#: macro.c:3361
#, fuzzy, c-format
msgid "expected parameter name, found \"%s\""
msgstr " `%s'"
-#: macro.c:3224
+#: macro.c:3362
#, c-format
msgid "expected ',' or ')', found \"%s\""
msgstr ""
-#: macro.c:3225
+#: macro.c:3363
#, fuzzy
msgid "expected parameter name before end of line"
msgstr "%s: ."
-#: macro.c:3226
+#: macro.c:3364
msgid "expected ')' before end of line"
msgstr ""
-#: macro.c:3227
+#: macro.c:3365
msgid "expected ')' after \"...\""
msgstr ""
-#: macro.c:3284
+#: macro.c:3422
msgid "anonymous variadic macros were introduced in C++11"
msgstr ""
-#: macro.c:3285 macro.c:3289
+#: macro.c:3423 macro.c:3427
msgid "anonymous variadic macros were introduced in C99"
msgstr ""
-#: macro.c:3295
+#: macro.c:3433
msgid "ISO C++ does not permit named variadic macros"
msgstr ""
-#: macro.c:3296
+#: macro.c:3434
msgid "ISO C does not permit named variadic macros"
msgstr ""
-#: macro.c:3342
+#: macro.c:3480
msgid "'##' cannot appear at either end of a macro expansion"
msgstr ""
-#: macro.c:3380
+#: macro.c:3518
msgid "ISO C++11 requires whitespace after the macro name"
msgstr ""
-#: macro.c:3381
+#: macro.c:3519
#, fuzzy
msgid "ISO C99 requires whitespace after the macro name"
msgstr " "
-#: macro.c:3405
+#: macro.c:3543
msgid "missing whitespace after the macro name"
msgstr ""
-#: macro.c:3455
+#: macro.c:3593
msgid "'#' is not followed by a macro parameter"
msgstr ""
-#: macro.c:3606
+#: macro.c:3749
#, fuzzy, c-format
msgid "\"%s\" redefined"
msgstr ""
-#: macro.c:3611
+#: macro.c:3754
#, fuzzy
msgid "this is the location of the previous definition"
msgstr " "
-#: macro.c:3715
+#: macro.c:3891
#, c-format
msgid "macro argument \"%s\" would be stringified in traditional C"
msgstr ""
@@ -1030,12 +1061,12 @@ msgstr ""
msgid "while reading precompiled header"
msgstr ""
-#: traditional.c:884
+#: traditional.c:891
#, c-format
msgid "detected recursion whilst expanding macro \"%s\""
msgstr ""
-#: traditional.c:1107
+#: traditional.c:1114
#, fuzzy
msgid "syntax error in macro parameter list"
msgstr " "
@@ -5169,10 +5200,6 @@ msgstr " "
#~ msgstr " "
#, fuzzy
-#~ msgid "unterminated string literal"
-#~ msgstr " o "
-
-#, fuzzy
#~ msgid "invalid number format `%s'"
#~ msgstr " : `%s'"
diff --git a/libcpp/po/eo.po b/libcpp/po/eo.po
index e813559..457de71 100644
--- a/libcpp/po/eo.po
+++ b/libcpp/po/eo.po
@@ -1,14 +1,14 @@
# Translation of cpplib to Esperanto
-# Copyright (C) 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020 Free Software Foundation, Inc.
+# Copyright (C) 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021 Free Software Foundation, Inc.
# This file is distributed under the same license as the gcc package.
-# Felipe Castro <fefcas@gmail.com>, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020.
+# Felipe Castro <fefcas@gmail.com>, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021.
#
msgid ""
msgstr ""
-"Project-Id-Version: cpplib 10.1-b20200209\n"
+"Project-Id-Version: cpplib 11.1-b20210207\n"
"Report-Msgid-Bugs-To: https://gcc.gnu.org/bugs/\n"
-"POT-Creation-Date: 2020-02-07 22:33+0000\n"
-"PO-Revision-Date: 2020-04-04 10:33-0300\n"
+"POT-Creation-Date: 2021-02-05 21:38+0000\n"
+"PO-Revision-Date: 2021-03-07 10:29-0300\n"
"Last-Translator: Felipe Castro <fefcas@gmail.com>\n"
"Language-Team: Esperanto <translation-team-eo@lists.sourceforge.net>\n"
"Language: eo\n"
@@ -16,156 +16,156 @@ msgstr ""
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Bugs: Report translation errors to the Language-Team address.\n"
-"X-Generator: Poedit 2.2.1\n"
+"X-Generator: Poedit 2.4.2\n"
-#: charset.c:674
+#: charset.c:677
#, c-format
msgid "conversion from %s to %s not supported by iconv"
msgstr "konverto de %s al %s ne estas subtenata de iconv"
-#: charset.c:677
+#: charset.c:680
msgid "iconv_open"
msgstr "iconv_open"
-#: charset.c:685
+#: charset.c:688
#, c-format
msgid "no iconv implementation, cannot convert from %s to %s"
msgstr "neniu realigo de iconv, ne eblas konverti de %s al %s"
-#: charset.c:781
+#: charset.c:784
#, c-format
msgid "character 0x%lx is not in the basic source character set\n"
msgstr "la signo 0x%lx ne estas en la baza fonta signaro\n"
-#: charset.c:798 charset.c:1768
+#: charset.c:801 charset.c:1771
msgid "converting to execution character set"
msgstr "konverto al plenumiga signaro"
-#: charset.c:804
+#: charset.c:807
#, c-format
msgid "character 0x%lx is not unibyte in execution character set"
msgstr "la signo 0x%lx ne estas unubajta en plenumiga signaro"
-#: charset.c:1054
+#: charset.c:1057
msgid "universal character names are only valid in C++ and C99"
msgstr "universalaj signo-nomoj nur validas en C++ kaj C99"
-#: charset.c:1058
+#: charset.c:1061
msgid "C99's universal character names are incompatible with C90"
msgstr "Universalaj signo-nomoj de C99 ne interakordas kun C90"
-#: charset.c:1061
+#: charset.c:1064
#, c-format
msgid "the meaning of '\\%c' is different in traditional C"
msgstr "la signifo de '\\%c' estas malsama en tradicia C"
-#: charset.c:1070
+#: charset.c:1073
msgid "In _cpp_valid_ucn but not a UCN"
msgstr "En _cpp_valid_ucn sed ne estas UCN"
-#: charset.c:1103
+#: charset.c:1106
#, c-format
msgid "incomplete universal character name %.*s"
msgstr "nekompleta universala signo-nomo %.*s"
-#: charset.c:1118
+#: charset.c:1121
#, c-format
msgid "%.*s is not a valid universal character"
msgstr "%.*s ne estas valida universala signo"
-#: charset.c:1128 lex.c:1335
+#: charset.c:1131 lex.c:1335
msgid "'$' in identifier or number"
msgstr "'$' en identiganto aŭ numero"
-#: charset.c:1138
+#: charset.c:1141
#, c-format
msgid "universal character %.*s is not valid in an identifier"
msgstr "la universala signo %.*s ne estas valida en identiganto"
-#: charset.c:1142
+#: charset.c:1145
#, c-format
msgid "universal character %.*s is not valid at the start of an identifier"
msgstr "la universala signo %.*s ne estas valida en komenco de identiganto"
-#: charset.c:1149
+#: charset.c:1152
#, c-format
msgid "%.*s is outside the UCS codespace"
msgstr "%.*s estas for de kodspaco UCS"
-#: charset.c:1194 charset.c:2113
+#: charset.c:1197 charset.c:2116
msgid "converting UCN to source character set"
msgstr "konverto de UCN al la fonta signaro"
-#: charset.c:1201
+#: charset.c:1204
msgid "converting UCN to execution character set"
msgstr "konverto de UCN al la plenumiga signaro"
-#: charset.c:1265
+#: charset.c:1268
#, c-format
msgid "extended character %.*s is not valid in an identifier"
msgstr "etendita signo %.*s ne estas valida en identiganto"
-#: charset.c:1282
+#: charset.c:1285
#, c-format
msgid "extended character %.*s is not valid at the start of an identifier"
msgstr "etendita signo %.*s ne estas valida en komenco de identiganto"
-#: charset.c:1368
+#: charset.c:1371
msgid "the meaning of '\\x' is different in traditional C"
msgstr "la signifo de '\\x' estas malsama en tradicia C"
-#: charset.c:1393
+#: charset.c:1396
msgid "\\x used with no following hex digits"
msgstr "\\x estis uzata kun la jenaj deksesumaj ciferoj"
-#: charset.c:1400
+#: charset.c:1403
msgid "hex escape sequence out of range"
msgstr "deksesuma eskapa sekvo estas for de intervalo"
-#: charset.c:1452
+#: charset.c:1455
msgid "octal escape sequence out of range"
msgstr "okuma eskapa sekvo estas for de intervalo"
-#: charset.c:1534
+#: charset.c:1537
msgid "the meaning of '\\a' is different in traditional C"
msgstr "la signifo de '\\a' estas malsama en tradicia C"
-#: charset.c:1541
+#: charset.c:1544
#, c-format
msgid "non-ISO-standard escape sequence, '\\%c'"
msgstr "ne-ISO-norma eskapa sekvo, '\\%c'"
-#: charset.c:1549
+#: charset.c:1552
#, c-format
msgid "unknown escape sequence: '\\%c'"
msgstr "nekonata eskapa sekvo: '\\%c'"
-#: charset.c:1557
+#: charset.c:1560
#, c-format
msgid "unknown escape sequence: '\\%s'"
msgstr "nekonata eskapa sekvo: '\\%s'"
-#: charset.c:1565
+#: charset.c:1568
msgid "converting escape sequence to execution character set"
msgstr "konverto de eskapa sekvo al plenumiga signaro"
-#: charset.c:1705
+#: charset.c:1708
msgid "missing open quote"
msgstr "mankas komenca citilo"
-#: charset.c:1923 charset.c:2002
+#: charset.c:1926 charset.c:2005
msgid "character constant too long for its type"
msgstr "signa konstanto tro longas por ties tipo"
-#: charset.c:1926
+#: charset.c:1929
msgid "multi-character character constant"
msgstr "plursigna signa konstanto"
-#: charset.c:2042
+#: charset.c:2045
msgid "empty character constant"
msgstr "malplena signa konstanto"
-#: charset.c:2160
+#: charset.c:2163
#, c-format
msgid "failure to convert %s to %s"
msgstr "problemo por konverti %s al %s"
@@ -236,203 +236,199 @@ msgstr "makroaj nomoj devas esti identigantoj"
msgid "undefining \"%s\""
msgstr "ni maldifinas \"%s\""
-#: directives.c:724
+#: directives.c:725
msgid "missing terminating > character"
msgstr "mankas finiganta signo >"
-#: directives.c:783
+#: directives.c:784
#, c-format
msgid "#%s expects \"FILENAME\" or <FILENAME>"
msgstr "#%s atendas \"DOSIERNOMO\" aŭ <DOSIERNOMO>"
-#: directives.c:829
+#: directives.c:830
#, c-format
msgid "empty filename in #%s"
msgstr "malplena dosiernomo en #%s"
-#: directives.c:838
+#: directives.c:839
#, c-format
msgid "#include nested depth %u exceeds maximum of %u (use -fmax-include-depth=DEPTH to increase the maximum)"
msgstr "nestita profundo %u de #include superas maksimumon %u (uzu -fmax-include-depth=PROFUNDO por pligrandigi la maksimumon)"
-#: directives.c:883
+#: directives.c:884
msgid "#include_next in primary source file"
msgstr "#include_next en ĉefa fonta dosiero"
-#: directives.c:909
+#: directives.c:910
#, c-format
msgid "invalid flag \"%s\" in line directive"
msgstr "malvalida flago \"%s\" en lini-direktivo"
-#: directives.c:969
+#: directives.c:970
msgid "unexpected end of file after #line"
msgstr "neatendita dosierfino post #line"
-#: directives.c:972
+#: directives.c:973
#, c-format
msgid "\"%s\" after #line is not a positive integer"
msgstr "\"%s\" post #line ne estas pozitiva entjero"
-#: directives.c:978 directives.c:980
+#: directives.c:979 directives.c:981
msgid "line number out of range"
msgstr "lininumero estas for de intervalo"
-#: directives.c:993 directives.c:1074
+#: directives.c:994 directives.c:1075
#, c-format
msgid "\"%s\" is not a valid filename"
msgstr "\"%s\" ne estas valida dosiernomo"
-#: directives.c:1034
+#: directives.c:1035
#, c-format
msgid "\"%s\" after # is not a positive integer"
msgstr "\"%s\" post # ne estas pozitiva entjero"
-#: directives.c:1101
+#: directives.c:1102
#, c-format
msgid "file \"%s\" linemarker ignored due to incorrect nesting"
msgstr "linimarkilo de dosiero \"%s\" estis preteratentata pro malkorekta nesto"
-#: directives.c:1162 directives.c:1164 directives.c:1166 directives.c:1754
+#: directives.c:1180 directives.c:1182 directives.c:1184 directives.c:1772
#, c-format
msgid "%s"
msgstr "%s"
-#: directives.c:1190
+#: directives.c:1208
#, c-format
msgid "invalid #%s directive"
msgstr "malvalida direktivo #%s"
-#: directives.c:1253
+#: directives.c:1271
#, c-format
msgid "registering pragmas in namespace \"%s\" with mismatched name expansion"
msgstr "registro de pragma en nomspaco \"%s\" kun nekongrua nom-disvolviĝo"
-#: directives.c:1262
+#: directives.c:1280
#, c-format
msgid "registering pragma \"%s\" with name expansion and no namespace"
msgstr "registro de pragma \"%s\" kun nom-disvolviĝo kaj sen nomspaco"
-#: directives.c:1280
+#: directives.c:1298
#, c-format
msgid "registering \"%s\" as both a pragma and a pragma namespace"
msgstr "registro de \"%s\" kaj kiel pragma kaj kiel pragma-nomspaco"
-#: directives.c:1283
+#: directives.c:1301
#, c-format
msgid "#pragma %s %s is already registered"
msgstr "#pragma %s %s jam estas registrita"
-#: directives.c:1286
+#: directives.c:1304
#, c-format
msgid "#pragma %s is already registered"
msgstr "#pragma %s jam estas registrita"
-#: directives.c:1316
+#: directives.c:1334
msgid "registering pragma with NULL handler"
msgstr "registro de pragma kun traktilo de NULL"
-#: directives.c:1533
+#: directives.c:1551
msgid "#pragma once in main file"
msgstr "#pragma unufoje en ĉefdosiero"
-#: directives.c:1556
+#: directives.c:1574
msgid "invalid #pragma push_macro directive"
msgstr "malvalida direktivo #pragma push_macro"
-#: directives.c:1613
+#: directives.c:1631
msgid "invalid #pragma pop_macro directive"
msgstr "malvalida direktivo #pragma pop_macro"
-#: directives.c:1668
+#: directives.c:1686
msgid "invalid #pragma GCC poison directive"
msgstr "malvalida direktivo #pragma GCC poison"
-#: directives.c:1677
+#: directives.c:1695
#, c-format
msgid "poisoning existing macro \"%s\""
msgstr "venenigo de ekzistanta makroo \"%s\""
-#: directives.c:1696
+#: directives.c:1714
msgid "#pragma system_header ignored outside include file"
msgstr "#pragma system_header estis preteratentata for de inkluziv-dosiero"
-#: directives.c:1721
+#: directives.c:1739
#, c-format
msgid "cannot find source file %s"
msgstr "ne eblas trovi la fontan dosieron %s"
-#: directives.c:1725
+#: directives.c:1743
#, c-format
msgid "current file is older than %s"
msgstr "nuna dosiero estas pli malnova ol %s"
-#: directives.c:1749
+#: directives.c:1767
#, c-format
msgid "invalid \"#pragma GCC %s\" directive"
msgstr "malvalida direktivo \"#pragma GCC %s\""
-#: directives.c:1950
+#: directives.c:1968
msgid "_Pragma takes a parenthesized string literal"
msgstr "_Pragma prenas kurbkrampitan ĉenan literaĵon"
-#: directives.c:2033
+#: directives.c:2051
msgid "#else without #if"
msgstr "#else sen #if"
-#: directives.c:2038
+#: directives.c:2056
msgid "#else after #else"
msgstr "#else post #else"
-#: directives.c:2040 directives.c:2073
+#: directives.c:2058 directives.c:2091
msgid "the conditional began here"
msgstr "la kondiĉo komencis ĉi tie"
-#: directives.c:2066
+#: directives.c:2084
msgid "#elif without #if"
msgstr "#elif sen #if"
-#: directives.c:2071
+#: directives.c:2089
msgid "#elif after #else"
msgstr "#elif post #else"
-#: directives.c:2102
+#: directives.c:2120
msgid "#endif without #if"
msgstr "#endif sen #if"
-#: directives.c:2178
+#: directives.c:2196
msgid "missing '(' after predicate"
msgstr "mankas '(' post predikato"
-#: directives.c:2196
+#: directives.c:2214
msgid "missing ')' to complete answer"
msgstr "mankas ')' por kompletigi respondon"
-#: directives.c:2208
+#: directives.c:2226
msgid "predicate's answer is empty"
msgstr "respondo de predikato estas malplena"
-#: directives.c:2238
+#: directives.c:2256
msgid "assertion without predicate"
msgstr "aserto sen predikato"
-#: directives.c:2241
+#: directives.c:2259
msgid "predicate must be an identifier"
msgstr "predikato devas esti identiganto"
-#: directives.c:2323
+#: directives.c:2341
#, c-format
msgid "\"%s\" re-asserted"
msgstr "\"%s\" estas re-asertita"
-#: directives.c:2604
+#: directives.c:2659
#, c-format
msgid "unterminated #%s"
msgstr "nefinigita #%s"
-#: directives-only.c:221 lex.c:2879 traditional.c:174
-msgid "unterminated comment"
-msgstr "nefinigita komento"
-
#: errors.c:291
#, c-format
msgid "%s: %s"
@@ -442,215 +438,227 @@ msgstr "%s: %s"
msgid "stdout"
msgstr "ĉefeligujo"
-#: expr.c:626 expr.c:743
+#: expr.c:636 expr.c:753
msgid "fixed-point constants are a GCC extension"
msgstr "fisk-komaj konstantoj estas aldono de GCC"
-#: expr.c:651
+#: expr.c:661
msgid "invalid prefix \"0b\" for floating constant"
msgstr "malvalida prefikso \"0b\" por glitkoma konstanto"
-#: expr.c:664
+#: expr.c:674
msgid "use of C++17 hexadecimal floating constant"
msgstr "uzo de deksesuma glitkoma konstanto de C++17"
-#: expr.c:667
+#: expr.c:677
msgid "use of C99 hexadecimal floating constant"
msgstr "uzo de deksesuma glitkoma konstanto de C99"
-#: expr.c:711
+#: expr.c:721
#, c-format
msgid "invalid suffix \"%.*s\" on floating constant"
msgstr "malvalida sufikso \"%.*s\" en glitkoma konstanto"
-#: expr.c:722 expr.c:789
+#: expr.c:732 expr.c:799
#, c-format
msgid "traditional C rejects the \"%.*s\" suffix"
msgstr "tradicia C rifuzas la sufikson \"%.*s\""
-#: expr.c:730
+#: expr.c:740
msgid "suffix for double constant is a GCC extension"
msgstr "sufikso por duobla konstanto estas aldono de GCC"
-#: expr.c:736
+#: expr.c:746
#, c-format
msgid "invalid suffix \"%.*s\" with hexadecimal floating constant"
msgstr "malvalida sufikso \"%.*s\" kun deksesuma glitkoma konstanto"
-#: expr.c:749 expr.c:753
+#: expr.c:759 expr.c:763
msgid "decimal float constants are a C2X feature"
-msgstr "dekumaj glitkomaj konstantoj estas trajto de C2X"
+msgstr "dekumaj glitkomaj konstantoj estas apartaĵo de C2X"
-#: expr.c:772
+#: expr.c:782
#, c-format
msgid "invalid suffix \"%.*s\" on integer constant"
msgstr "malvalida sufikso \"%.*s\" en entjera konstanto"
-#: expr.c:797
+#: expr.c:807
msgid "use of C++11 long long integer constant"
msgstr "uzo de konstanto C++11 long long integer"
-#: expr.c:798
+#: expr.c:808
msgid "use of C99 long long integer constant"
msgstr "uzo de konstanto de C99 long long integer"
-#: expr.c:814
+#: expr.c:822
+msgid "use of C++23 %<size_t%> integer constant"
+msgstr "uzo de konstanto C++23 %<size_t%> integer"
+
+#: expr.c:823
+msgid "use of C++23 %<make_signed_t<size_t>%> integer constant"
+msgstr "uzo de konstanto C++23 %<make_signed_t<size_t>%> integer"
+
+#: expr.c:834
msgid "imaginary constants are a GCC extension"
msgstr "imaginaraj konstantoj estas aldono de GCC"
-#: expr.c:820
+#: expr.c:841
msgid "binary constants are a C++14 feature or GCC extension"
msgstr "duumaj konstantoj estas apartaĵo de C++14 aŭ aldono de GCC"
-#: expr.c:822
-msgid "binary constants are a GCC extension"
-msgstr "duumaj konstantoj estas aldono de GCC"
+#: expr.c:843
+msgid "binary constants are a C2X feature or GCC extension"
+msgstr "duumaj konstantoj estas apartaĵo de C2X aŭ aldono de GCC"
+
+#: expr.c:848
+msgid "binary constants are a C2X feature"
+msgstr "duumaj konstantoj estas apartaĵo de C2X"
-#: expr.c:917
+#: expr.c:944
msgid "integer constant is too large for its type"
msgstr "entjera konstanto tro larĝas pro ties tipo"
-#: expr.c:948
+#: expr.c:975
msgid "integer constant is so large that it is unsigned"
msgstr "entjera konstanto estas tiom larĝa ke ĝi estas sen-signuma"
-#: expr.c:1043
+#: expr.c:1070
msgid "missing ')' after \"defined\""
msgstr "mankas ')' post \"defined\""
-#: expr.c:1050
+#: expr.c:1077
msgid "operator \"defined\" requires an identifier"
msgstr "la operatoro \"defined\" postulas identiganton"
-#: expr.c:1058
+#: expr.c:1085
#, c-format
msgid "(\"%s\" is an alternative token for \"%s\" in C++)"
msgstr "(\"%s\" estas alternativa ĵetono por \"%s\" en C++)"
-#: expr.c:1070
+#: expr.c:1098
msgid "this use of \"defined\" may not be portable"
msgstr "tiu ĉi uzo de \"defined\" eble ne estas portebla"
-#: expr.c:1113
+#: expr.c:1143
msgid "user-defined literal in preprocessor expression"
msgstr "uzant-difinita literaĵo en antaŭproceza esprimo"
-#: expr.c:1118
+#: expr.c:1148
msgid "floating constant in preprocessor expression"
msgstr "glitkoma konstanto en antaŭproceza esprimo"
-#: expr.c:1124
+#: expr.c:1154
msgid "imaginary number in preprocessor expression"
msgstr "imaginara numero en antaŭproceza esprimo"
-#: expr.c:1173
+#: expr.c:1203
#, c-format
msgid "\"%s\" is not defined, evaluates to 0"
msgstr "\"%s\" ne estas difinita, rezultas al 0"
-#: expr.c:1186
+#: expr.c:1216
msgid "assertions are a GCC extension"
msgstr "asertoj estas aldono de GCC"
-#: expr.c:1189
+#: expr.c:1219
msgid "assertions are a deprecated extension"
msgstr "asertoj estas evitinda aldono"
-#: expr.c:1435
+#: expr.c:1465
#, c-format
msgid "unbalanced stack in %s"
msgstr "neekvilibrita stako en %s"
-#: expr.c:1455
+#: expr.c:1485
#, c-format
msgid "impossible operator '%u'"
msgstr "neebla operatoro '%u'"
-#: expr.c:1556
+#: expr.c:1586
msgid "missing ')' in expression"
msgstr "mankas ')' en esprimo"
-#: expr.c:1585
+#: expr.c:1615
msgid "'?' without following ':'"
msgstr "'?' sen sekvanta ':'"
-#: expr.c:1595
+#: expr.c:1625
msgid "integer overflow in preprocessor expression"
msgstr "entjera troigo en antaŭproceza esprimo"
-#: expr.c:1600
+#: expr.c:1630
msgid "missing '(' in expression"
msgstr "mankas '(' en esprimo"
-#: expr.c:1632
+#: expr.c:1662
#, c-format
msgid "the left operand of \"%s\" changes sign when promoted"
msgstr "la maldekstra operaciato de \"%s\" ŝanĝas signumon kiam promociita"
-#: expr.c:1637
+#: expr.c:1667
#, c-format
msgid "the right operand of \"%s\" changes sign when promoted"
msgstr "la dekstra operaciato de \"%s\" ŝanĝas signumon kiam promociita"
-#: expr.c:1896
+#: expr.c:1926
msgid "traditional C rejects the unary plus operator"
msgstr "tradicia C rifuzas la unuloka plusan operatoron"
-#: expr.c:1994
+#: expr.c:2024
msgid "comma operator in operand of #if"
msgstr "koma operatoro en operaciado de #if"
-#: expr.c:2130
+#: expr.c:2160
msgid "division by zero in #if"
msgstr "divido per nulo en #if"
-#: files.c:576
+#: files.c:571
msgid "one or more PCH files were found, but they were invalid"
msgstr "unu aŭ pli dosieroj PCH estis trovataj, sed ili estas malvalidaj"
-#: files.c:580
+#: files.c:575
msgid "use -Winvalid-pch for more information"
msgstr "uzu -Winvalid-pch por pli da informo"
-#: files.c:1004
+#: files.c:1051
#, c-format
msgid "no include path in which to search for %s"
msgstr "estas neniu inkluziva vojo por serĉi %s"
-#: files.c:1439
+#: files.c:1546
msgid "Multiple include guards may be useful for:\n"
msgstr "Multoblaj inkluzivaj gardnodoj povas esti utilaj por:\n"
-#: init.c:598
+#: init.c:614
msgid "cppchar_t must be an unsigned type"
msgstr "cppchar_t devas esti sensignuma tipo"
-#: init.c:602
+#: init.c:618
#, c-format
msgid "preprocessor arithmetic has maximum precision of %lu bits; target requires %lu bits"
msgstr "antaŭproceza aritmetiko havas maksimuman precizecon de %lu bitoj; la celo postulas %lu bitojn"
-#: init.c:609
+#: init.c:625
msgid "CPP arithmetic must be at least as precise as a target int"
msgstr "Aritmetiko de CPP devas esti minimue tiel preciza kiel la celata int"
-#: init.c:612
+#: init.c:628
msgid "target char is less than 8 bits wide"
msgstr "la celata char estas pli eta ol 8 bitoj"
-#: init.c:616
+#: init.c:632
msgid "target wchar_t is narrower than target char"
msgstr "la celata wchar_t estas pli mallarĝa ol la celata char"
-#: init.c:620
+#: init.c:636
msgid "target int is narrower than target char"
msgstr "la celata int estas pli mallarĝa ol la celata char"
-#: init.c:625
+#: init.c:641
msgid "CPP half-integer narrower than CPP character"
msgstr "Duon-entjero de CPP estas pli mallarĝa ol la signo de CPP"
-#: init.c:629
+#: init.c:645
#, c-format
msgid "CPP on this host cannot handle wide character constants over %lu bits, but the target requires %lu bits"
msgstr "CPP en tiu ĉi komputilo ne povas trakti larĝ-signajn konstantoj plilarĝaj ol %lu bitoj, sed la celato postulas %lu bitojn"
@@ -697,12 +705,12 @@ msgid "`%.*s' is not in NFC"
msgstr "'%.*s' ne estas en NFC"
#: lex.c:1375
-msgid "__VA_OPT__ is not available until C++2a"
-msgstr "__VA_OPT__ ne disponeblas ĝis C++2a"
+msgid "__VA_OPT__ is not available until C++20"
+msgstr "__VA_OPT__ ne disponeblas ĝis C++20"
#: lex.c:1382
-msgid "__VA_OPT__ can only appear in the expansion of a C++2a variadic macro"
-msgstr "__VA_OPT__ nur povas aperi en la disvolviĝo de variebl-argumenta makroo de C++2a"
+msgid "__VA_OPT__ can only appear in the expansion of a C++20 variadic macro"
+msgstr "__VA_OPT__ nur povas aperi en la disvolviĝo de variebl-argumenta makroo de C++20"
#: lex.c:1413 lex.c:1506
#, c-format
@@ -722,232 +730,254 @@ msgstr "__VA_ARGS__ nur povas aperi en la disvolviĝo de variebl-argumenta makro
msgid "identifier \"%s\" is a special operator name in C++"
msgstr "la identiganto \"%s\" estas speciala operator-nomo en C++"
-#: lex.c:1837
+#: lex.c:1879
msgid "raw string delimiter longer than 16 characters"
msgstr "kruda ĉen-apartigilo pli longas ol 16 signoj"
-#: lex.c:1841
+#: lex.c:1883
msgid "invalid new-line in raw string delimiter"
msgstr "malvalida nov-linio en kruda ĉen-apartigilo"
-#: lex.c:1845
+#: lex.c:1887 lex.c:4639
#, c-format
msgid "invalid character '%c' in raw string delimiter"
msgstr "malvalida signo '%c' en kruda ĉen-apartigilo"
-#: lex.c:1894 lex.c:1916
+#: lex.c:1926 lex.c:1949
msgid "unterminated raw string"
msgstr "nefinigita kruda ĉeno"
-#: lex.c:1936 lex.c:2065
+#: lex.c:1971 lex.c:2100
msgid "invalid suffix on literal; C++11 requires a space between literal and string macro"
msgstr "malvalida sufikso en literaĵo; C++11 postulas spacon inter literaĵo kaj ĉena makroo"
-#: lex.c:2048
+#: lex.c:2083
msgid "null character(s) preserved in literal"
msgstr "nul-signo(j) tenitaj en literaĵo"
-#: lex.c:2051
+#: lex.c:2086
#, c-format
msgid "missing terminating %c character"
msgstr "mankas finigantan signon %c"
-#: lex.c:2083
+#: lex.c:2118
msgid "C++11 requires a space between string literal and macro"
msgstr "C++11 postulas spacon inter ĉena literaĵo kaj makroo"
-#: lex.c:2893 lex.c:2927
+#: lex.c:2711
+msgid "module control-line cannot be in included file"
+msgstr "modula kontrol-linio ne povas aperi en inkludita dosiero"
+
+#: lex.c:2725
+#, c-format
+msgid "module control-line \"%s\" cannot be an object-like macro"
+msgstr "la modula kontrol-linio %s ne povas esti objekteca makroo"
+
+#: lex.c:3099 lex.c:4472 traditional.c:174
+msgid "unterminated comment"
+msgstr "nefinigita komento"
+
+#: lex.c:3113 lex.c:3147
msgid "C++ style comments are not allowed in ISO C90"
msgstr "Komentoj laŭ estilo de C++ ne estas permesataj en ISO C90"
-#: lex.c:2895 lex.c:2906 lex.c:2930
+#: lex.c:3115 lex.c:3126 lex.c:3150
msgid "(this will be reported only once per input file)"
msgstr "(tio ĉi estos raportata nur po unu foje por ĉiu enigdosiero)"
-#: lex.c:2904
+#: lex.c:3124
msgid "C++ style comments are incompatible with C90"
msgstr "Komentoj laŭ estilo de C++ ne interakordas kun C90"
-#: lex.c:2936
+#: lex.c:3156
msgid "multi-line comment"
msgstr "plurlinia komento"
-#: lex.c:3330
+#: lex.c:3550
#, c-format
msgid "unspellable token %s"
msgstr "neliterumebla ĵetono %s"
+#: lex.c:4627
+#, c-format
+msgid "raw string delimiter longer than %d characters"
+msgstr "kruda ĉen-apartigilo pli longas ol %d signoj"
+
+#: lex.c:4697
+msgid "unterminated literal"
+msgstr "nefinigita literaĵo"
+
#: macro.c:94
msgid "'##' cannot appear at either end of __VA_OPT__"
msgstr "'##' ne povas aperi ĉe iu ajn flanko de __VA_OPT__"
-#: macro.c:364
+#: macro.c:386
#, c-format
msgid "\"%s\" used outside of preprocessing directive"
msgstr "\"%s\" uzata for de antaŭproceza direktivo"
-#: macro.c:374
+#: macro.c:396
#, c-format
msgid "missing '(' before \"%s\" operand"
msgstr "mankas '(' antaŭ operaciato \"%s\""
-#: macro.c:389
+#: macro.c:411
#, c-format
msgid "operator \"%s\" requires a header-name"
msgstr "la operatoro \"%s\" postulas kap-nomon"
-#: macro.c:406
+#: macro.c:428
#, c-format
msgid "missing ')' after \"%s\" operand"
msgstr "mankas ')' post operaciato \"%s\""
-#: macro.c:426
+#: macro.c:448
#, c-format
msgid "macro \"%s\" is not used"
msgstr "makroo \"%s\" ne estas uzata"
-#: macro.c:465 macro.c:723
+#: macro.c:487 macro.c:778
#, c-format
msgid "invalid built-in macro \"%s\""
msgstr "malvalida enkonstruita makroo \"%s\""
-#: macro.c:472 macro.c:574
+#: macro.c:494 macro.c:596
#, c-format
msgid "macro \"%s\" might prevent reproducible builds"
msgstr "la makroo \"%s\" povos malebligi reprodukteblajn konstruojn"
-#: macro.c:503
+#: macro.c:525
msgid "could not determine file timestamp"
msgstr "ne eblis determini la dosieran tempomarkon"
-#: macro.c:620
+#: macro.c:610
msgid "could not determine date and time"
msgstr "ne eblis determini la daton kaj horon"
-#: macro.c:636
+#: macro.c:642
msgid "__COUNTER__ expanded inside directive with -fdirectives-only"
msgstr "__COUNTER__ estas etendigata interne de direktivo per -fdirectives-only"
-#: macro.c:842
+#: macro.c:897
msgid "invalid string literal, ignoring final '\\'"
msgstr "malvalida ĉena literaĵo, ni preterpasas finan '\\'"
-#: macro.c:904
+#: macro.c:959
#, c-format
msgid "pasting \"%s\" and \"%s\" does not give a valid preprocessing token"
msgstr "algluo de \"%s\" kaj \"%s\" ne rezultas en valida antaŭproceza ĵetono"
-#: macro.c:1030
+#: macro.c:1085
msgid "ISO C++11 requires at least one argument for the \"...\" in a variadic macro"
msgstr "ISO C++11 postulas minimume unu argumenton por la \"...\" en variebl-argumenta makroo"
-#: macro.c:1034
+#: macro.c:1089
msgid "ISO C99 requires at least one argument for the \"...\" in a variadic macro"
msgstr "ISO C99 postulas minimume unu argumenton por la \"...\" en variebl-argumenta makroo"
-#: macro.c:1041
+#: macro.c:1096
#, c-format
msgid "macro \"%s\" requires %u arguments, but only %u given"
msgstr "la makroo \"%s\" postulas %u argumentojn, sed nur %u estis indikataj"
-#: macro.c:1046
+#: macro.c:1101
#, c-format
msgid "macro \"%s\" passed %u arguments, but takes just %u"
msgstr "la makroo \"%s\" pasis %u argumentojn, sed ĝi prenas nur %u"
-#: macro.c:1244 traditional.c:815
+#: macro.c:1299 traditional.c:822
#, c-format
msgid "unterminated argument list invoking macro \"%s\""
msgstr "nefinigita argumentlisto alvokanta la makroon \"%s\""
-#: macro.c:1386
+#: macro.c:1442
#, c-format
msgid "function-like macro \"%s\" must be used with arguments in traditional C"
msgstr "funkci-simila makroo \"%s\" devas esti uzata kun argumentoj laŭ tradicia C"
-#: macro.c:2165
+#: macro.c:2220
#, c-format
msgid "invoking macro %s argument %d: empty macro arguments are undefined in ISO C++98"
msgstr "alvoko de makroo %s, argumento %d: malplenaj makro-argumentoj estas nedifinitaj en ISO C++98"
-#: macro.c:2173 macro.c:2182
+#: macro.c:2228 macro.c:2237
#, c-format
msgid "invoking macro %s argument %d: empty macro arguments are undefined in ISO C90"
msgstr "alvoko de makroo %s, argumento %d: malplenaj makro-argumentoj estas nedifinitaj en ISO C90"
-#: macro.c:3141
+#: macro.c:3279
#, c-format
msgid "duplicate macro parameter \"%s\""
msgstr "duobligata makro-parametro \"%s\""
-#: macro.c:3223
+#: macro.c:3361
#, c-format
msgid "expected parameter name, found \"%s\""
msgstr "atendinte parametran nomon, ni trovis \"%s\""
-#: macro.c:3224
+#: macro.c:3362
#, c-format
msgid "expected ',' or ')', found \"%s\""
msgstr "atendinte ',' aŭ ')', ni trovis \"%s\""
-#: macro.c:3225
+#: macro.c:3363
msgid "expected parameter name before end of line"
msgstr "ni atendis parametran nomon antaŭ lini-fino"
-#: macro.c:3226
+#: macro.c:3364
msgid "expected ')' before end of line"
msgstr "ni atendis ')' antaŭ lini-fino"
-#: macro.c:3227
+#: macro.c:3365
msgid "expected ')' after \"...\""
msgstr "ni atendis ')' post \"...\""
-#: macro.c:3284
+#: macro.c:3422
msgid "anonymous variadic macros were introduced in C++11"
msgstr "sennomaj variebl-argumentaj makrooj estis enkondukataj en C++11"
-#: macro.c:3285 macro.c:3289
+#: macro.c:3423 macro.c:3427
msgid "anonymous variadic macros were introduced in C99"
msgstr "sennomaj variebl-argumentaj makrooj estis enkondukataj en C99"
-#: macro.c:3295
+#: macro.c:3433
msgid "ISO C++ does not permit named variadic macros"
msgstr "ISO C++ ne permesas nomitajn variebl-argumentajn makroojn"
-#: macro.c:3296
+#: macro.c:3434
msgid "ISO C does not permit named variadic macros"
msgstr "ISO C ne permesas nomitajn variebl-argumentajn makroojn"
-#: macro.c:3342
+#: macro.c:3480
msgid "'##' cannot appear at either end of a macro expansion"
msgstr "'##' ne povas aperi ĉe iu ajn flanko de makroa disvolviĝo"
-#: macro.c:3380
+#: macro.c:3518
msgid "ISO C++11 requires whitespace after the macro name"
msgstr "ISO C++11 postulas blankspacon post la makroa nomo"
-#: macro.c:3381
+#: macro.c:3519
msgid "ISO C99 requires whitespace after the macro name"
msgstr "ISO C99 postulas blankspacon post la makroa nomo"
-#: macro.c:3405
+#: macro.c:3543
msgid "missing whitespace after the macro name"
msgstr "mankas blankspacon post la makroa nomo"
-#: macro.c:3455
+#: macro.c:3593
msgid "'#' is not followed by a macro parameter"
msgstr "'#' ne estas sekvata de makroa parametro"
-#: macro.c:3606
+#: macro.c:3749
#, c-format
msgid "\"%s\" redefined"
msgstr "\"%s\" estas redifinita"
-#: macro.c:3611
+#: macro.c:3754
msgid "this is the location of the previous definition"
msgstr "tiu ĉi estas la loko de la antaŭa difino"
-#: macro.c:3715
+#: macro.c:3891
#, c-format
msgid "macro argument \"%s\" would be stringified in traditional C"
msgstr "makroa argumento \"%s\" devus esti ĉenigita laŭ tradicia C"
@@ -985,15 +1015,18 @@ msgstr "%s: ne uzata ĉar '__COUNTER__' estas malvalida"
msgid "while reading precompiled header"
msgstr "dum lego de antaŭkompilita kapo"
-#: traditional.c:884
+#: traditional.c:891
#, c-format
msgid "detected recursion whilst expanding macro \"%s\""
msgstr "estis detektata rekursigo dum etendigo de la makroo \"%s\""
-#: traditional.c:1107
+#: traditional.c:1114
msgid "syntax error in macro parameter list"
msgstr "sintaksa eraro en makroa parametro-listo"
+#~ msgid "binary constants are a GCC extension"
+#~ msgstr "duumaj konstantoj estas aldono de GCC"
+
#~ msgid "\"__has_include__\" cannot be used as a macro name"
#~ msgstr "\"__has_include__\" ne povas estis uzata kiel makroa nomo"
diff --git a/libcpp/po/es.po b/libcpp/po/es.po
index f74e627..fde067a 100644
--- a/libcpp/po/es.po
+++ b/libcpp/po/es.po
@@ -1,173 +1,171 @@
-# Spanish localization for cpplib-8.1-b20180128.
-# Copyright (C) 2001 - 2018 Free Software Foundation, Inc.
+# Spanish localization for cppli
+# Copyright (C) 2001 - 2021 Free Software Foundation, Inc.
# This file is distributed under the same license as the gcc package.
# Cristian Othón Martínez Vera <cfuga@cfuga.mx>, 2001 - 2012.
# Francisco Javier Serrador <fserrador@gmail.com>, 2018.
+# Antonio Ceballos Roa <aceballos@gmail.com>, 2021.
msgid ""
msgstr ""
-"Project-Id-Version: cpplib 8.1-b20180128\n"
+"Project-Id-Version: cpplib 10.1-b20200209\n"
"Report-Msgid-Bugs-To: https://gcc.gnu.org/bugs/\n"
-"POT-Creation-Date: 2020-02-07 22:33+0000\n"
-"PO-Revision-Date: 2018-03-23 19:16+0100\n"
-"Last-Translator: Francisco Javier Serrador <fserrador@gmail.com>\n"
+"POT-Creation-Date: 2021-02-05 21:38+0000\n"
+"PO-Revision-Date: 2021-01-07 11:33+0100\n"
+"Last-Translator: Antonio Ceballos Roa <aceballos@gmail.com>\n"
"Language-Team: Spanish <es@tp.org.es>\n"
"Language: es\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Bugs: Report translation errors to the Language-Team address.\n"
-"X-Generator: Poedit 2.0.4\n"
-#: charset.c:674
+#: charset.c:677
#, c-format
msgid "conversion from %s to %s not supported by iconv"
msgstr "iconv no admite la conversión de %s a %s"
-#: charset.c:677
+#: charset.c:680
msgid "iconv_open"
msgstr "iconv_open"
-#: charset.c:685
+#: charset.c:688
#, c-format
msgid "no iconv implementation, cannot convert from %s to %s"
msgstr "no hay una implementación de iconv, no se puede convertir de %s a %s"
-#: charset.c:781
+#: charset.c:784
#, c-format
msgid "character 0x%lx is not in the basic source character set\n"
msgstr "el carácter 0x%lx no está en el conjunto básico de caracteres fuente\n"
-#: charset.c:798 charset.c:1768
+#: charset.c:801 charset.c:1771
msgid "converting to execution character set"
msgstr "convirtiendo al conjunto de caracteres de ejecución"
-#: charset.c:804
+#: charset.c:807
#, c-format
msgid "character 0x%lx is not unibyte in execution character set"
msgstr "el carácter 0x%lx no es unibyte en el conjunto de caracteres de ejecución"
-#: charset.c:1054
+#: charset.c:1057
msgid "universal character names are only valid in C++ and C99"
msgstr "los nombres universales de carácter sólo son válidos en C++ y C99"
-#: charset.c:1058
+#: charset.c:1061
msgid "C99's universal character names are incompatible with C90"
msgstr "los nombres universales de carácter de C99 son incompatibles con C90"
-#: charset.c:1061
+#: charset.c:1064
#, c-format
msgid "the meaning of '\\%c' is different in traditional C"
msgstr "el significado de '\\%c' es diferente en C tradicional"
-#: charset.c:1070
+#: charset.c:1073
msgid "In _cpp_valid_ucn but not a UCN"
msgstr "En _cpp_valid_unc pero no es un NUC"
-#: charset.c:1103
+#: charset.c:1106
#, c-format
msgid "incomplete universal character name %.*s"
msgstr "nombre universal de carácter %.*s incompleto"
-#: charset.c:1118
+#: charset.c:1121
#, c-format
msgid "%.*s is not a valid universal character"
msgstr "%.*s no es un carácter universal válido"
-#: charset.c:1128 lex.c:1335
+#: charset.c:1131 lex.c:1335
msgid "'$' in identifier or number"
msgstr "'$' en el identificador o número"
-#: charset.c:1138
+#: charset.c:1141
#, c-format
msgid "universal character %.*s is not valid in an identifier"
msgstr "el carácter universal %.*s no es válido en un identificador"
-#: charset.c:1142
+#: charset.c:1145
#, c-format
msgid "universal character %.*s is not valid at the start of an identifier"
msgstr "el carácter universal %.*s no es válido al inicio de un identificador"
-#: charset.c:1149
+#: charset.c:1152
#, c-format
msgid "%.*s is outside the UCS codespace"
-msgstr ""
+msgstr "%.*s está fuera del espacio de código UCS"
-#: charset.c:1194 charset.c:2113
+#: charset.c:1197 charset.c:2116
msgid "converting UCN to source character set"
msgstr "convirtiendo un NUC al conjunto de caracteres fuente"
-#: charset.c:1201
+#: charset.c:1204
msgid "converting UCN to execution character set"
msgstr "convirtiendo un NUC al conjunto de caracteres de ejecución"
-#: charset.c:1265
-#, fuzzy, c-format
-#| msgid "universal character %.*s is not valid in an identifier"
+#: charset.c:1268
+#, c-format
msgid "extended character %.*s is not valid in an identifier"
-msgstr "el carácter universal %.*s no es válido en un identificador"
+msgstr "el carácter extendido %.*s no es válido en un identificador"
-#: charset.c:1282
-#, fuzzy, c-format
-#| msgid "universal character %.*s is not valid at the start of an identifier"
+#: charset.c:1285
+#, c-format
msgid "extended character %.*s is not valid at the start of an identifier"
-msgstr "el carácter universal %.*s no es válido al inicio de un identificador"
+msgstr "el carácter extendido %.*s no es válido al inicio de un identificador"
-#: charset.c:1368
+#: charset.c:1371
msgid "the meaning of '\\x' is different in traditional C"
msgstr "el significado de '\\x' es diferente en C tradicional"
-#: charset.c:1393
+#: charset.c:1396
msgid "\\x used with no following hex digits"
msgstr "se usó \\x sin dígitos hexadecimales a continuación"
-#: charset.c:1400
+#: charset.c:1403
msgid "hex escape sequence out of range"
msgstr "secuencia de escape hexadecimal fuera de rango"
-#: charset.c:1452
+#: charset.c:1455
msgid "octal escape sequence out of range"
msgstr "secuencia de escape octal fuera de rango"
-#: charset.c:1534
+#: charset.c:1537
msgid "the meaning of '\\a' is different in traditional C"
msgstr "el significado de '\\a' es diferente en C tradicional"
-#: charset.c:1541
+#: charset.c:1544
#, c-format
msgid "non-ISO-standard escape sequence, '\\%c'"
msgstr "secuencia de escape que no es estándard ISO, '\\%c'"
-#: charset.c:1549
+#: charset.c:1552
#, c-format
msgid "unknown escape sequence: '\\%c'"
msgstr "secuencia de escape desconocida: '\\%c'"
-#: charset.c:1557
+#: charset.c:1560
#, c-format
msgid "unknown escape sequence: '\\%s'"
msgstr "secuencia de escape desconocida: '\\%s'"
-#: charset.c:1565
+#: charset.c:1568
msgid "converting escape sequence to execution character set"
msgstr "convirtiendo una secuencia de escape al conjunto de caracteres de ejecución"
-#: charset.c:1705
+#: charset.c:1708
msgid "missing open quote"
msgstr "falta comilla abierta"
-#: charset.c:1923 charset.c:2002
+#: charset.c:1926 charset.c:2005
msgid "character constant too long for its type"
msgstr "constante de carácter demasiado grande para su tipo"
-#: charset.c:1926
+#: charset.c:1929
msgid "multi-character character constant"
msgstr "constante de carácter con múltiples caracteres"
-#: charset.c:2042
+#: charset.c:2045
msgid "empty character constant"
msgstr "constante de carácter vacía"
-#: charset.c:2160
+#: charset.c:2163
#, c-format
msgid "failure to convert %s to %s"
msgstr "no se puede convertir %s a %s"
@@ -215,10 +213,9 @@ msgid "invalid preprocessing directive #%s"
msgstr "directiva de preprocesamiento #%s inválida"
#: directives.c:601
-#, fuzzy, c-format
-#| msgid "\"defined\" cannot be used as a macro name"
+#, c-format
msgid "\"%s\" cannot be used as a macro name"
-msgstr "«defined» no se puede utilizarse como un nombre de macro"
+msgstr "«%s» no puede utilizarse como nombre de macro"
#: directives.c:608
#, c-format
@@ -239,203 +236,199 @@ msgstr "los nombres de macro deben ser identificadores"
msgid "undefining \"%s\""
msgstr "borrando la definición de «%s»"
-#: directives.c:724
+#: directives.c:725
msgid "missing terminating > character"
msgstr "falta el carácter de terminación >"
-#: directives.c:783
+#: directives.c:784
#, c-format
msgid "#%s expects \"FILENAME\" or <FILENAME>"
msgstr "#%s espera «NOMBREFICHERO» o <NOMBREFICHERO>"
-#: directives.c:829
+#: directives.c:830
#, c-format
msgid "empty filename in #%s"
msgstr "nombre de fichero vacío en #%s"
-#: directives.c:838
+#: directives.c:839
#, c-format
msgid "#include nested depth %u exceeds maximum of %u (use -fmax-include-depth=DEPTH to increase the maximum)"
-msgstr ""
+msgstr "la profundidad anidada %u de #include excede el máximo %u (utilice -fmax-include-depth=PROFUNDIDAD para aumentar el máximo)"
-#: directives.c:883
+#: directives.c:884
msgid "#include_next in primary source file"
msgstr "#include_next en fichero primario de código fuente"
-#: directives.c:909
+#: directives.c:910
#, c-format
msgid "invalid flag \"%s\" in line directive"
msgstr "indicador «%s» inválido en la línea de la directiva"
-#: directives.c:969
+#: directives.c:970
msgid "unexpected end of file after #line"
msgstr "fin de fichero inesperado después de #line"
-#: directives.c:972
+#: directives.c:973
#, c-format
msgid "\"%s\" after #line is not a positive integer"
msgstr "«%s» después de #line no es un entero positivo"
-#: directives.c:978 directives.c:980
+#: directives.c:979 directives.c:981
msgid "line number out of range"
msgstr "número de línea fuera de rango"
-#: directives.c:993 directives.c:1074
+#: directives.c:994 directives.c:1075
#, c-format
msgid "\"%s\" is not a valid filename"
msgstr "«%s» no es un nombre de fichero válido"
-#: directives.c:1034
+#: directives.c:1035
#, c-format
msgid "\"%s\" after # is not a positive integer"
msgstr "«%s» después de # no es un entero positivo"
-#: directives.c:1101
+#: directives.c:1102
#, c-format
msgid "file \"%s\" linemarker ignored due to incorrect nesting"
msgstr "marca lineal de fichero «%s» ignorada debido a anidación incorrecta"
-#: directives.c:1162 directives.c:1164 directives.c:1166 directives.c:1754
+#: directives.c:1180 directives.c:1182 directives.c:1184 directives.c:1772
#, c-format
msgid "%s"
msgstr "%s"
-#: directives.c:1190
+#: directives.c:1208
#, c-format
msgid "invalid #%s directive"
msgstr "directiva #%s inválida"
-#: directives.c:1253
+#: directives.c:1271
#, c-format
msgid "registering pragmas in namespace \"%s\" with mismatched name expansion"
msgstr "se registran pragmas en el espacio de nombres «%s» con una expansión de nombre que no coincide"
-#: directives.c:1262
+#: directives.c:1280
#, c-format
msgid "registering pragma \"%s\" with name expansion and no namespace"
msgstr "se registra el pragma «%s» con expansión de nombre y sin un espacio de nombres"
-#: directives.c:1280
+#: directives.c:1298
#, c-format
msgid "registering \"%s\" as both a pragma and a pragma namespace"
msgstr "se registra «%s» como un pragma y como un espacio de nombres de pragma"
-#: directives.c:1283
+#: directives.c:1301
#, c-format
msgid "#pragma %s %s is already registered"
msgstr "#pragma %s %s ya está registrado"
-#: directives.c:1286
+#: directives.c:1304
#, c-format
msgid "#pragma %s is already registered"
msgstr "#pragma %s ya está registrado"
-#: directives.c:1316
+#: directives.c:1334
msgid "registering pragma with NULL handler"
msgstr "se registra un pragma con manejador NULL"
-#: directives.c:1533
+#: directives.c:1551
msgid "#pragma once in main file"
msgstr "#pragma una vez en el fichero principal"
-#: directives.c:1556
+#: directives.c:1574
msgid "invalid #pragma push_macro directive"
msgstr "directiva #pragma push_macro inválida"
-#: directives.c:1613
+#: directives.c:1631
msgid "invalid #pragma pop_macro directive"
msgstr "directiva #pragma pop_macro inválida"
-#: directives.c:1668
+#: directives.c:1686
msgid "invalid #pragma GCC poison directive"
msgstr "directiva #pragma de GCC envenenada inválida"
-#: directives.c:1677
+#: directives.c:1695
#, c-format
msgid "poisoning existing macro \"%s\""
msgstr "se envenena la macro existente «%s»"
-#: directives.c:1696
+#: directives.c:1714
msgid "#pragma system_header ignored outside include file"
msgstr "#pragma system_header ignorado fuera del fichero a incluir"
-#: directives.c:1721
+#: directives.c:1739
#, c-format
msgid "cannot find source file %s"
msgstr "no se puede encontrar el fichero fuente %s"
-#: directives.c:1725
+#: directives.c:1743
#, c-format
msgid "current file is older than %s"
msgstr "el fichero actual es más antiguo que %s"
-#: directives.c:1749
+#: directives.c:1767
#, c-format
msgid "invalid \"#pragma GCC %s\" directive"
-msgstr "directiva \"#pragma GCC %s\" inválida"
+msgstr "directiva «#pragma GCC %s» inválida"
-#: directives.c:1950
+#: directives.c:1968
msgid "_Pragma takes a parenthesized string literal"
msgstr "_Pragma lleva una cadena literal entre paréntesis"
-#: directives.c:2033
+#: directives.c:2051
msgid "#else without #if"
msgstr "#else sin #if"
-#: directives.c:2038
+#: directives.c:2056
msgid "#else after #else"
msgstr "#else tras #else"
-#: directives.c:2040 directives.c:2073
+#: directives.c:2058 directives.c:2091
msgid "the conditional began here"
msgstr "el condicional empezó aquí"
-#: directives.c:2066
+#: directives.c:2084
msgid "#elif without #if"
msgstr "#elif sin #if"
-#: directives.c:2071
+#: directives.c:2089
msgid "#elif after #else"
msgstr "#elif después de #else"
-#: directives.c:2102
+#: directives.c:2120
msgid "#endif without #if"
msgstr "#endif sin #if"
-#: directives.c:2178
+#: directives.c:2196
msgid "missing '(' after predicate"
msgstr "falta '(' antes del predicado"
-#: directives.c:2196
+#: directives.c:2214
msgid "missing ')' to complete answer"
msgstr "falta ')' para completar la respuesta"
-#: directives.c:2208
+#: directives.c:2226
msgid "predicate's answer is empty"
msgstr "la respuesta del predicado está vacía"
-#: directives.c:2238
+#: directives.c:2256
msgid "assertion without predicate"
msgstr "afirmación sin predicado"
-#: directives.c:2241
+#: directives.c:2259
msgid "predicate must be an identifier"
msgstr "el predicado debe ser un identificador"
-#: directives.c:2323
+#: directives.c:2341
#, c-format
msgid "\"%s\" re-asserted"
msgstr "«%s» reafirmado"
-#: directives.c:2604
+#: directives.c:2659
#, c-format
msgid "unterminated #%s"
msgstr "#%s sin terminar"
-#: directives-only.c:221 lex.c:2879 traditional.c:174
-msgid "unterminated comment"
-msgstr "comentario sin terminar"
-
#: errors.c:291
#, c-format
msgid "%s: %s"
@@ -445,217 +438,235 @@ msgstr "%s: %s"
msgid "stdout"
msgstr "salida estándard"
-#: expr.c:626 expr.c:743
+#: expr.c:636 expr.c:753
msgid "fixed-point constants are a GCC extension"
msgstr "las constantes de coma fija son una extensión GCC"
-#: expr.c:651
+#: expr.c:661
msgid "invalid prefix \"0b\" for floating constant"
-msgstr "prefijo \"0b\" inválido en la constante de coma flotante"
+msgstr "prefijo «0b» inválido en la constante de coma flotante"
-#: expr.c:664
+#: expr.c:674
msgid "use of C++17 hexadecimal floating constant"
msgstr "uso de una constante de coma flotante hexadecimal C++17"
-#: expr.c:667
+#: expr.c:677
msgid "use of C99 hexadecimal floating constant"
msgstr "uso de una constante de coma flotante hexadecimal C99"
-#: expr.c:711
+#: expr.c:721
#, c-format
msgid "invalid suffix \"%.*s\" on floating constant"
-msgstr "sufijo \"%.*s\" inválido en la constante de coma flotante"
+msgstr "sufijo «%.*s» inválido en la constante de coma flotante"
-#: expr.c:722 expr.c:789
+#: expr.c:732 expr.c:799
#, c-format
msgid "traditional C rejects the \"%.*s\" suffix"
msgstr "C tradicional rechaza «%.*s» como sufijo"
-#: expr.c:730
+#: expr.c:740
msgid "suffix for double constant is a GCC extension"
msgstr "el sufijo para una constante doble es una extensión GCC"
-#: expr.c:736
+#: expr.c:746
#, c-format
msgid "invalid suffix \"%.*s\" with hexadecimal floating constant"
-msgstr "sufijo \"%.*s\" inválido en la constante de coma flotante hexadecimal"
+msgstr "sufijo «%.*s» inválido en la constante de coma flotante hexadecimal"
-#: expr.c:749 expr.c:753
-#, fuzzy
-#| msgid "decimal float constants are a GCC extension"
+#: expr.c:759 expr.c:763
msgid "decimal float constants are a C2X feature"
-msgstr "las constantes de coma flotante decimal son una extensión GCC"
+msgstr "las constantes de coma flotante decimal son una característica de C2X"
-#: expr.c:772
+#: expr.c:782
#, c-format
msgid "invalid suffix \"%.*s\" on integer constant"
-msgstr "sufijo \"%.*s\" inválido en la constante entera"
+msgstr "sufijo «%.*s» inválido en la constante entera"
-#: expr.c:797
+#: expr.c:807
msgid "use of C++11 long long integer constant"
msgstr "uso de una constante entera long long C++11"
-#: expr.c:798
+#: expr.c:808
msgid "use of C99 long long integer constant"
msgstr "uso de una constante entera long long C99"
-#: expr.c:814
+#: expr.c:822
+#, fuzzy
+#| msgid "use of C++11 long long integer constant"
+msgid "use of C++23 %<size_t%> integer constant"
+msgstr "uso de una constante entera long long C++11"
+
+#: expr.c:823
+#, fuzzy
+#| msgid "use of C++11 long long integer constant"
+msgid "use of C++23 %<make_signed_t<size_t>%> integer constant"
+msgstr "uso de una constante entera long long C++11"
+
+#: expr.c:834
msgid "imaginary constants are a GCC extension"
msgstr "las constantes imaginarias son una extensión GCC"
-#: expr.c:820
+#: expr.c:841
msgid "binary constants are a C++14 feature or GCC extension"
msgstr "las constantes binarias son una característica C++14 o extensión GCC"
-#: expr.c:822
-msgid "binary constants are a GCC extension"
-msgstr "las constantes binarias son una extensión GCC"
+#: expr.c:843
+#, fuzzy
+#| msgid "binary constants are a C++14 feature or GCC extension"
+msgid "binary constants are a C2X feature or GCC extension"
+msgstr "las constantes binarias son una característica C++14 o extensión GCC"
-#: expr.c:917
+#: expr.c:848
+#, fuzzy
+#| msgid "decimal float constants are a C2X feature"
+msgid "binary constants are a C2X feature"
+msgstr "las constantes de coma flotante decimal son una característica de C2X"
+
+#: expr.c:944
msgid "integer constant is too large for its type"
msgstr "la constante entera es demasiado grande para su tipo"
-#: expr.c:948
+#: expr.c:975
msgid "integer constant is so large that it is unsigned"
msgstr "la constante entera es tan grande que es unsigned"
-#: expr.c:1043
+#: expr.c:1070
msgid "missing ')' after \"defined\""
-msgstr "falta ')' después de \"defined\""
+msgstr "falta ')' después de «defined»"
-#: expr.c:1050
+#: expr.c:1077
msgid "operator \"defined\" requires an identifier"
-msgstr "el operador \"defined\" requiere un identificador"
+msgstr "el operador «defined» requiere un identificador"
-#: expr.c:1058
+#: expr.c:1085
#, c-format
msgid "(\"%s\" is an alternative token for \"%s\" in C++)"
msgstr "(«%s» es una marca alternativa para «%s» en C++)"
-#: expr.c:1070
+#: expr.c:1098
msgid "this use of \"defined\" may not be portable"
-msgstr "este uso de \"defined\" puede no ser transportable"
+msgstr "este uso de «defined» puede no ser transportable"
-#: expr.c:1113
+#: expr.c:1143
msgid "user-defined literal in preprocessor expression"
msgstr "literal definida por el usuario en una expresión del preprocesador"
-#: expr.c:1118
+#: expr.c:1148
msgid "floating constant in preprocessor expression"
msgstr "constante de coma flotante en una expresión del preprocesador"
-#: expr.c:1124
+#: expr.c:1154
msgid "imaginary number in preprocessor expression"
msgstr "número imaginario en una expresión del preprocesador"
-#: expr.c:1173
+#: expr.c:1203
#, c-format
msgid "\"%s\" is not defined, evaluates to 0"
msgstr "«%s» no está definido, evalúa a 0"
-#: expr.c:1186
+#: expr.c:1216
msgid "assertions are a GCC extension"
msgstr "las aserciones son una extensión GCC"
-#: expr.c:1189
+#: expr.c:1219
msgid "assertions are a deprecated extension"
msgstr "las aserciones son una extensión obsoleta"
-#: expr.c:1435
+#: expr.c:1465
#, c-format
msgid "unbalanced stack in %s"
msgstr "pila desbalanceada en %s"
-#: expr.c:1455
+#: expr.c:1485
#, c-format
msgid "impossible operator '%u'"
msgstr "operador '%u' imposible"
-#: expr.c:1556
+#: expr.c:1586
msgid "missing ')' in expression"
msgstr "falta ')' en la expresión"
-#: expr.c:1585
+#: expr.c:1615
msgid "'?' without following ':'"
msgstr "'?' sin ':' a continuación"
-#: expr.c:1595
+#: expr.c:1625
msgid "integer overflow in preprocessor expression"
msgstr "desbordamiento entero en expresión del preprocesador"
-#: expr.c:1600
+#: expr.c:1630
msgid "missing '(' in expression"
msgstr "falta '(' en la expresión"
-#: expr.c:1632
+#: expr.c:1662
#, c-format
msgid "the left operand of \"%s\" changes sign when promoted"
msgstr "el operando izquierdo de «%s» cambia de signo cuando es promovido"
-#: expr.c:1637
+#: expr.c:1667
#, c-format
msgid "the right operand of \"%s\" changes sign when promoted"
msgstr "el operando derecho de «%s» cambia de signo cuando es promovido"
-#: expr.c:1896
+#: expr.c:1926
msgid "traditional C rejects the unary plus operator"
msgstr "C tradicional rechaza el operador unario mas"
-#: expr.c:1994
+#: expr.c:2024
msgid "comma operator in operand of #if"
msgstr "operador coma en operando de #if"
-#: expr.c:2130
+#: expr.c:2160
msgid "division by zero in #if"
msgstr "división por cero en #if"
-#: files.c:576
+#: files.c:571
msgid "one or more PCH files were found, but they were invalid"
msgstr "se encontró uno o más ficheros PCH, pero eran inválidos"
-#: files.c:580
+#: files.c:575
msgid "use -Winvalid-pch for more information"
msgstr "use -Winvalid-pch para más información"
-#: files.c:1004
+#: files.c:1051
#, c-format
msgid "no include path in which to search for %s"
msgstr "no hay ruta de inclusión en la cual se pueda buscar %s"
-#: files.c:1439
+#: files.c:1546
msgid "Multiple include guards may be useful for:\n"
msgstr "Guardias múltiples de include pueden ser útiles para:\n"
-#: init.c:598
+#: init.c:614
msgid "cppchar_t must be an unsigned type"
msgstr "cppchar_t debe ser de un tipo unsigned"
-#: init.c:602
+#: init.c:618
#, c-format
msgid "preprocessor arithmetic has maximum precision of %lu bits; target requires %lu bits"
msgstr "la aritmética del preprocesador tiene una precisión máxima de %lu bits; el objetivo requiere de %lu bits"
-#: init.c:609
+#: init.c:625
msgid "CPP arithmetic must be at least as precise as a target int"
msgstr "la aritmética de CPP debe se al menos tan precisa como un int del objetivo"
-#: init.c:612
+#: init.c:628
msgid "target char is less than 8 bits wide"
msgstr "el char del objetivo tiene menos de 8 bits de ancho"
-#: init.c:616
+#: init.c:632
msgid "target wchar_t is narrower than target char"
msgstr "el wchar_t del objetivo es más estrecho que el char del objetivo"
-#: init.c:620
+#: init.c:636
msgid "target int is narrower than target char"
msgstr "el int del objetivo es más estrecho que el char del objetivo"
-#: init.c:625
+#: init.c:641
msgid "CPP half-integer narrower than CPP character"
msgstr "el medio-entero de CPP es más estrecho que el carácter de CPP"
-#: init.c:629
+#: init.c:645
#, c-format
msgid "CPP on this host cannot handle wide character constants over %lu bits, but the target requires %lu bits"
msgstr "CPP no puede manejar constantes de carácter anchas más allá de %lu bits en este objetivo, pero el objetivo requiere %lu bits"
@@ -680,7 +691,7 @@ msgstr "se ignora el trigrafo ??%c, use -trigraphs para reconocerlo"
#: lex.c:1204
msgid "\"/*\" within comment"
-msgstr "\"/*\" dentro de un comentario"
+msgstr "«/*» dentro de un comentario"
#: lex.c:1262
#, c-format
@@ -702,11 +713,15 @@ msgid "`%.*s' is not in NFC"
msgstr "`%.*s' no está en NFC"
#: lex.c:1375
-msgid "__VA_OPT__ is not available until C++2a"
+#, fuzzy
+#| msgid "__VA_OPT__ is not available until C++2a"
+msgid "__VA_OPT__ is not available until C++20"
msgstr "__VA_OPT__ no está disponible bajo C++2a"
#: lex.c:1382
-msgid "__VA_OPT__ can only appear in the expansion of a C++2a variadic macro"
+#, fuzzy
+#| msgid "__VA_OPT__ can only appear in the expansion of a C++2a variadic macro"
+msgid "__VA_OPT__ can only appear in the expansion of a C++20 variadic macro"
msgstr "__VA_OPT__ solamente puede aparecer en la expansión de una macro variadic C++2a"
#: lex.c:1413 lex.c:1506
@@ -727,238 +742,257 @@ msgstr "__VA_ARGS__ solamente puede aparecer en la expansión de una macro varia
msgid "identifier \"%s\" is a special operator name in C++"
msgstr "el identificador «%s» es un nombre de operador especial en C++"
-#: lex.c:1837
+#: lex.c:1879
msgid "raw string delimiter longer than 16 characters"
msgstr "el delimitador de cadena cruda es más largo que 16 caracteres"
-#: lex.c:1841
+#: lex.c:1883
msgid "invalid new-line in raw string delimiter"
msgstr "carácter inválido nueva línea en un delimitador de cadena cruda"
-#: lex.c:1845
+#: lex.c:1887 lex.c:4639
#, c-format
msgid "invalid character '%c' in raw string delimiter"
msgstr "carácter inválido '%c' en un delimitador de cadena cruda"
-#: lex.c:1894 lex.c:1916
+#: lex.c:1926 lex.c:1949
msgid "unterminated raw string"
msgstr "cadena cruda sin terminar"
-#: lex.c:1936 lex.c:2065
+#: lex.c:1971 lex.c:2100
msgid "invalid suffix on literal; C++11 requires a space between literal and string macro"
msgstr "sufijo inválido en literal; C++11 requiere un espacio entre literal y cadena macro"
-#: lex.c:2048
+#: lex.c:2083
msgid "null character(s) preserved in literal"
msgstr "caracter(es) nulo(s) preservados en la literal"
-#: lex.c:2051
+#: lex.c:2086
#, c-format
msgid "missing terminating %c character"
msgstr "falta el carácter de terminación %c"
-#: lex.c:2083
+#: lex.c:2118
msgid "C++11 requires a space between string literal and macro"
msgstr "C++11 requiere un espacio entre cadena literal y macro"
-#: lex.c:2893 lex.c:2927
+#: lex.c:2711
+msgid "module control-line cannot be in included file"
+msgstr ""
+
+#: lex.c:2725
+#, c-format
+msgid "module control-line \"%s\" cannot be an object-like macro"
+msgstr ""
+
+#: lex.c:3099 lex.c:4472 traditional.c:174
+msgid "unterminated comment"
+msgstr "comentario sin terminar"
+
+#: lex.c:3113 lex.c:3147
msgid "C++ style comments are not allowed in ISO C90"
msgstr "los comentarios de estilo C++ no se permiten en ISO C90"
-#: lex.c:2895 lex.c:2906 lex.c:2930
+#: lex.c:3115 lex.c:3126 lex.c:3150
msgid "(this will be reported only once per input file)"
msgstr "(esto se reportará solamente una vez por cada fichero de entrada)"
-#: lex.c:2904
+#: lex.c:3124
msgid "C++ style comments are incompatible with C90"
msgstr "los comentarios de estilo C++ son incompatibles con C90"
-#: lex.c:2936
+#: lex.c:3156
msgid "multi-line comment"
msgstr "comentario en múltiples líneas"
-#: lex.c:3330
+#: lex.c:3550
#, c-format
msgid "unspellable token %s"
msgstr "elemento %s impronunciable"
+#: lex.c:4627
+#, fuzzy, c-format
+#| msgid "raw string delimiter longer than 16 characters"
+msgid "raw string delimiter longer than %d characters"
+msgstr "el delimitador de cadena cruda es más largo que 16 caracteres"
+
+#: lex.c:4697
+#, fuzzy
+#| msgid "unterminated #%s"
+msgid "unterminated literal"
+msgstr "#%s sin terminar"
+
#: macro.c:94
msgid "'##' cannot appear at either end of __VA_OPT__"
msgstr "'##' no puede aparecer o en el final de una __VA_OPT__"
-#: macro.c:364
-#, fuzzy, c-format
-#| msgid "%s in preprocessing directive"
+#: macro.c:386
+#, c-format
msgid "\"%s\" used outside of preprocessing directive"
-msgstr "%s en la directiva de preprocesamiento"
+msgstr "se ha utilizado «%s» fuera de directiva de preprocesamiento"
-#: macro.c:374
-#, fuzzy, c-format
-#| msgid "missing '(' in expression"
+#: macro.c:396
+#, c-format
msgid "missing '(' before \"%s\" operand"
-msgstr "falta '(' en la expresión"
+msgstr "falta '(' antes del operando «%s»"
-#: macro.c:389
-#, fuzzy, c-format
-#| msgid "operator \"__has_include__\" requires a header string"
+#: macro.c:411
+#, c-format
msgid "operator \"%s\" requires a header-name"
-msgstr "el operador \"__has_include__\" requiere una cadena cabecera"
+msgstr "el operador «%s» requiere un nombre cabecera"
-#: macro.c:406
-#, fuzzy, c-format
-#| msgid "missing ')' after \"defined\""
+#: macro.c:428
+#, c-format
msgid "missing ')' after \"%s\" operand"
-msgstr "falta ')' después de \"defined\""
+msgstr "falta ')' después del operando «%s»"
-#: macro.c:426
+#: macro.c:448
#, c-format
msgid "macro \"%s\" is not used"
msgstr "la macro «%s» no se utiliza"
-#: macro.c:465 macro.c:723
+#: macro.c:487 macro.c:778
#, c-format
msgid "invalid built-in macro \"%s\""
msgstr "macro interna «%s» inválida"
-#: macro.c:472 macro.c:574
+#: macro.c:494 macro.c:596
#, c-format
msgid "macro \"%s\" might prevent reproducible builds"
msgstr "macro «%s» quizá previene compilaciones reproducibles"
-#: macro.c:503
+#: macro.c:525
msgid "could not determine file timestamp"
msgstr "no se puede determinar la marca de fecha del fichero"
-#: macro.c:620
+#: macro.c:610
msgid "could not determine date and time"
msgstr "no se puede determinar la fecha y la hora"
-#: macro.c:636
+#: macro.c:642
msgid "__COUNTER__ expanded inside directive with -fdirectives-only"
msgstr "se expande __COUNTER__ dentro de una directiva con -fdirectives-only"
-#: macro.c:842
+#: macro.c:897
msgid "invalid string literal, ignoring final '\\'"
msgstr "cadena literal inválida, se ignora el '\\' final"
-#: macro.c:904
+#: macro.c:959
#, c-format
msgid "pasting \"%s\" and \"%s\" does not give a valid preprocessing token"
msgstr "pegar «%s» y «%s» no da un elemento válido de preprocesamiento"
-#: macro.c:1030
+#: macro.c:1085
msgid "ISO C++11 requires at least one argument for the \"...\" in a variadic macro"
-msgstr "ISO C++ requiere al menos un argumento: para la \"...\" en una macro variadic"
+msgstr "ISO C++ requiere al menos un argumento: para la «...» en una macro variadic"
-#: macro.c:1034
+#: macro.c:1089
msgid "ISO C99 requires at least one argument for the \"...\" in a variadic macro"
-msgstr "ISO C99 requiere al menos un argumento para la \"...\" en una macro variadic"
+msgstr "ISO C99 requiere al menos un argumento para la «...» en una macro variadic"
-#: macro.c:1041
+#: macro.c:1096
#, c-format
msgid "macro \"%s\" requires %u arguments, but only %u given"
msgstr "la macro «%s» requiere %u argumentos, pero solo se proporcionan %u"
-#: macro.c:1046
+#: macro.c:1101
#, c-format
msgid "macro \"%s\" passed %u arguments, but takes just %u"
msgstr "la macro «%s» pasó %u argumentos, pero solamente toma %u"
-#: macro.c:1244 traditional.c:815
+#: macro.c:1299 traditional.c:822
#, c-format
msgid "unterminated argument list invoking macro \"%s\""
msgstr "lista de argumentos sin terminar al invocar la macro «%s»"
-#: macro.c:1386
+#: macro.c:1442
#, c-format
msgid "function-like macro \"%s\" must be used with arguments in traditional C"
msgstr "la función de macro «%s» se debe usar con argumentos en C tradicional"
-#: macro.c:2165
+#: macro.c:2220
#, c-format
msgid "invoking macro %s argument %d: empty macro arguments are undefined in ISO C++98"
msgstr "al invocar el macro %s argumento %d: los argumentos de macro vacíos están indefinidos en ISO C++98"
-#: macro.c:2173 macro.c:2182
+#: macro.c:2228 macro.c:2237
#, c-format
msgid "invoking macro %s argument %d: empty macro arguments are undefined in ISO C90"
msgstr "al invocar el macro %s argumento %d: los argumentos de macro vacíos están indefinidos en ISO C90"
-#: macro.c:3141
+#: macro.c:3279
#, c-format
msgid "duplicate macro parameter \"%s\""
msgstr "parámetro de macro «%s» duplicado"
-#: macro.c:3223
+#: macro.c:3361
#, c-format
msgid "expected parameter name, found \"%s\""
-msgstr ""
+msgstr "se esperaba un nombre de parámetro; se ha encontrado «%s»"
-#: macro.c:3224
+#: macro.c:3362
#, c-format
msgid "expected ',' or ')', found \"%s\""
-msgstr ""
+msgstr "se esperaba ',' o ')'; se ha encontrado «%s»"
-#: macro.c:3225
+#: macro.c:3363
msgid "expected parameter name before end of line"
-msgstr ""
+msgstr "se esperaba un nombre de parámetro antes del fin de línea"
-#: macro.c:3226
-#, fuzzy
-#| msgid "unexpected end of file after #line"
+#: macro.c:3364
msgid "expected ')' before end of line"
-msgstr "fin de fichero inesperado después de #line"
+msgstr "se esperaba ')' antes del fin de línea"
-#: macro.c:3227
+#: macro.c:3365
msgid "expected ')' after \"...\""
-msgstr ""
+msgstr "se esperaba ')' después de «...»"
-#: macro.c:3284
+#: macro.c:3422
msgid "anonymous variadic macros were introduced in C++11"
msgstr "las macros variadic anónimas se introdujeron en C++11"
-#: macro.c:3285 macro.c:3289
+#: macro.c:3423 macro.c:3427
msgid "anonymous variadic macros were introduced in C99"
msgstr "los macros variadic anónimos se introdujeron en C99"
-#: macro.c:3295
+#: macro.c:3433
msgid "ISO C++ does not permit named variadic macros"
msgstr "ISO C++ no permite macros variadic nombrados"
-#: macro.c:3296
+#: macro.c:3434
msgid "ISO C does not permit named variadic macros"
msgstr "ISO C no permite macros variadic nombrados"
-#: macro.c:3342
+#: macro.c:3480
msgid "'##' cannot appear at either end of a macro expansion"
msgstr "'##' no puede aparece en o al final de una expansión de macro"
-#: macro.c:3380
+#: macro.c:3518
msgid "ISO C++11 requires whitespace after the macro name"
msgstr "ISO C++11 requiere espacios en blanco tras del nombre de macro"
-#: macro.c:3381
+#: macro.c:3519
msgid "ISO C99 requires whitespace after the macro name"
msgstr "ISO C99 requiere espacios en blanco después del nombre de macro"
-#: macro.c:3405
+#: macro.c:3543
msgid "missing whitespace after the macro name"
msgstr "faltan espacios en blanco después del nombre de macro"
-#: macro.c:3455
+#: macro.c:3593
msgid "'#' is not followed by a macro parameter"
msgstr "'#' no es seguido por un parámetro de macro"
-#: macro.c:3606
+#: macro.c:3749
#, c-format
msgid "\"%s\" redefined"
msgstr "«%s» redefinido"
-#: macro.c:3611
+#: macro.c:3754
msgid "this is the location of the previous definition"
msgstr "esta es la ubicación de la definición previa"
-#: macro.c:3715
+#: macro.c:3891
#, c-format
msgid "macro argument \"%s\" would be stringified in traditional C"
msgstr "el argumento de macro «%s» debería ser convertido a cadena en C tradicional"
@@ -996,15 +1030,18 @@ msgstr "%s: no se usa porque `__COUNTER__' es inválido"
msgid "while reading precompiled header"
msgstr "al leer el encabezado precompilado"
-#: traditional.c:884
+#: traditional.c:891
#, c-format
msgid "detected recursion whilst expanding macro \"%s\""
msgstr "se detectó recursión al expandir la macro «%s»"
-#: traditional.c:1107
+#: traditional.c:1114
msgid "syntax error in macro parameter list"
msgstr "error de sintaxis en la lista de parámetros de macro"
+#~ msgid "binary constants are a GCC extension"
+#~ msgstr "las constantes binarias son una extensión GCC"
+
#~ msgid "\"__has_include__\" cannot be used as a macro name"
#~ msgstr "\"__has_include__\" no puede ser usado como un nombre de macro"
diff --git a/libcpp/po/fi.po b/libcpp/po/fi.po
index 1fbdb95..fc9d1fd 100644
--- a/libcpp/po/fi.po
+++ b/libcpp/po/fi.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: cpplib 10.1-b20200209\n"
"Report-Msgid-Bugs-To: https://gcc.gnu.org/bugs/\n"
-"POT-Creation-Date: 2020-02-07 22:33+0000\n"
+"POT-Creation-Date: 2021-02-05 21:38+0000\n"
"PO-Revision-Date: 2020-02-11 17:27+0200\n"
"Last-Translator: Lauri Nurmi <lanurmi@iki.fi>\n"
"Language-Team: Finnish <translation-team-fi@lists.sourceforge.net>\n"
@@ -20,155 +20,155 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"X-Generator: Poedit 2.3\n"
-#: charset.c:674
+#: charset.c:677
#, c-format
msgid "conversion from %s to %s not supported by iconv"
msgstr "iconv ei tue muunnosta %s -> %s"
-#: charset.c:677
+#: charset.c:680
msgid "iconv_open"
msgstr "iconv_open"
-#: charset.c:685
+#: charset.c:688
#, c-format
msgid "no iconv implementation, cannot convert from %s to %s"
msgstr "ei iconv-toteutusta, muunnosta %s -> %s ei voida suorittaa"
-#: charset.c:781
+#: charset.c:784
#, c-format
msgid "character 0x%lx is not in the basic source character set\n"
msgstr "merkki 0x%lx ei ole peruslähdemerkistössä\n"
-#: charset.c:798 charset.c:1768
+#: charset.c:801 charset.c:1771
msgid "converting to execution character set"
msgstr "muunnetaan suoritusmerkistöön"
-#: charset.c:804
+#: charset.c:807
#, c-format
msgid "character 0x%lx is not unibyte in execution character set"
msgstr "merkki 0x%lx ei ole yksitavuinen suoritusmerkistössä"
-#: charset.c:1054
+#: charset.c:1057
msgid "universal character names are only valid in C++ and C99"
msgstr "universaalit merkkinimet ovat kelvollisia vai C++:ssa ja C99:ssä"
-#: charset.c:1058
+#: charset.c:1061
msgid "C99's universal character names are incompatible with C90"
msgstr "C99:n universaalit merkkinimet ovat epäyhteensopivia C90:n kanssa"
-#: charset.c:1061
+#: charset.c:1064
#, c-format
msgid "the meaning of '\\%c' is different in traditional C"
msgstr "’\\%c’:lla on eri merkitys perinteisessä C:ssä"
# UCN tarkoittaa Universal Character Names ja se sallii minkä tahansa kirjaimen käyttämisen C-lähdekielessä, ei vain englanninkielen kirjainten käytön. Merkki voidaan ilmaista joko kenoviivalla, sitä seuraavalla pienellä u-kirjaimella ja nelinumeroisella heksadesimaaliluvulla tai kenoviivaa seuraavalla suurella U-kirjaimella ja kahdeksannumeroisella heksadesimaaliluvulla.
-#: charset.c:1070
+#: charset.c:1073
msgid "In _cpp_valid_ucn but not a UCN"
msgstr "Funktiossa _cpp_valid_ucn mutta ei ole UCN"
-#: charset.c:1103
+#: charset.c:1106
#, c-format
msgid "incomplete universal character name %.*s"
msgstr "vaillinainen universaali merkkinimi %.*s"
-#: charset.c:1118
+#: charset.c:1121
#, c-format
msgid "%.*s is not a valid universal character"
msgstr "%.*s ei ole kelvollinen universaali merkki"
-#: charset.c:1128 lex.c:1335
+#: charset.c:1131 lex.c:1335
msgid "'$' in identifier or number"
msgstr "’$’ tunnisteessa tai lukuarvossa"
-#: charset.c:1138
+#: charset.c:1141
#, c-format
msgid "universal character %.*s is not valid in an identifier"
msgstr "universaali merkki %.*s ei ole kelvollinen tunniste"
-#: charset.c:1142
+#: charset.c:1145
#, c-format
msgid "universal character %.*s is not valid at the start of an identifier"
msgstr "universaali merkki %.*s ei ole kelvollinen tunnisteen alussa"
-#: charset.c:1149
+#: charset.c:1152
#, c-format
msgid "%.*s is outside the UCS codespace"
msgstr "%.*s on UCS-koodiston ulkopuolella"
-#: charset.c:1194 charset.c:2113
+#: charset.c:1197 charset.c:2116
msgid "converting UCN to source character set"
msgstr "muunnetaan UCN lähdemerkistöön"
-#: charset.c:1201
+#: charset.c:1204
msgid "converting UCN to execution character set"
msgstr "muunnetaan UCN suoritusmerkistöön"
-#: charset.c:1265
+#: charset.c:1268
#, c-format
msgid "extended character %.*s is not valid in an identifier"
msgstr "laajennettu merkki %.*s ei ole kelvollinen tunniste"
-#: charset.c:1282
+#: charset.c:1285
#, c-format
msgid "extended character %.*s is not valid at the start of an identifier"
msgstr "laajennettu merkki %.*s ei ole kelvollinen tunnisteen alussa"
-#: charset.c:1368
+#: charset.c:1371
msgid "the meaning of '\\x' is different in traditional C"
msgstr "’\\%x’:lla on eri merkitys perinteisessä C:ssä"
-#: charset.c:1393
+#: charset.c:1396
msgid "\\x used with no following hex digits"
msgstr "\\x:ää käytetty ilman seuraavia heksanumeroita"
-#: charset.c:1400
+#: charset.c:1403
msgid "hex escape sequence out of range"
msgstr "heksadesimaalinen ohjaussarja sallitun välin ulkopuolella"
-#: charset.c:1452
+#: charset.c:1455
msgid "octal escape sequence out of range"
msgstr "oktaalinen ohjaussarja sallitun välin ulkopuolella"
-#: charset.c:1534
+#: charset.c:1537
msgid "the meaning of '\\a' is different in traditional C"
msgstr "’\\a’:lla on eri merkitys perinteisessä C:ssä"
-#: charset.c:1541
+#: charset.c:1544
#, c-format
msgid "non-ISO-standard escape sequence, '\\%c'"
msgstr "ISO-standardiin kuulumaton ohjaussarja ’\\%c’"
-#: charset.c:1549
+#: charset.c:1552
#, c-format
msgid "unknown escape sequence: '\\%c'"
msgstr "tuntematon ohjaussarja ’\\%c’"
-#: charset.c:1557
+#: charset.c:1560
#, c-format
msgid "unknown escape sequence: '\\%s'"
msgstr "tuntematon ohjaussarja ’\\%s’"
-#: charset.c:1565
+#: charset.c:1568
msgid "converting escape sequence to execution character set"
msgstr "muunnetaan ohjaussarja suoritusmerkistöön"
-#: charset.c:1705
+#: charset.c:1708
msgid "missing open quote"
msgstr "avautuva sulje puuttuu"
-#: charset.c:1923 charset.c:2002
+#: charset.c:1926 charset.c:2005
msgid "character constant too long for its type"
msgstr "merkkivakio on liian pitkä tyypilleen"
-#: charset.c:1926
+#: charset.c:1929
msgid "multi-character character constant"
msgstr "monimerkkinen merkkivakio"
-#: charset.c:2042
+#: charset.c:2045
msgid "empty character constant"
msgstr "tyhjä merkkivakio"
-#: charset.c:2160
+#: charset.c:2163
#, c-format
msgid "failure to convert %s to %s"
msgstr "muunnos %s -> %s epäonnistui"
@@ -239,204 +239,200 @@ msgstr "makrojen nimien on oltava tunnisteita"
msgid "undefining \"%s\""
msgstr "kumotaan määrittely ”%s”"
-#: directives.c:724
+#: directives.c:725
msgid "missing terminating > character"
msgstr "päättävä >-merkki puuttuu"
-#: directives.c:783
+#: directives.c:784
#, c-format
msgid "#%s expects \"FILENAME\" or <FILENAME>"
msgstr "#%s odottaa argumenttia \"TIEDOSTONIMI\" tai <TIEDOSTONIMI>"
-#: directives.c:829
+#: directives.c:830
#, c-format
msgid "empty filename in #%s"
msgstr "tyhjä tiedostonimi direktiivissä #%s"
-#: directives.c:838
+#: directives.c:839
#, c-format
msgid "#include nested depth %u exceeds maximum of %u (use -fmax-include-depth=DEPTH to increase the maximum)"
msgstr "#include-sisäkkäisyyssyvyys %u ylittää maksimin %u (valitsin -fmax-include-depth=SYVYYS suurentaa maksimia)"
-#: directives.c:883
+#: directives.c:884
msgid "#include_next in primary source file"
msgstr "#include_next ensisijaisessa lähdetiedostossa"
-#: directives.c:909
+#: directives.c:910
#, c-format
msgid "invalid flag \"%s\" in line directive"
msgstr "virheellinen lippu ”%s” rividirektiivissä"
-#: directives.c:969
+#: directives.c:970
msgid "unexpected end of file after #line"
msgstr "odottamaton tiedoston loppu #line-direktiivin jälkeen"
-#: directives.c:972
+#: directives.c:973
#, c-format
msgid "\"%s\" after #line is not a positive integer"
msgstr "#line:n jälkeinen ”%s” ei ole positiivinen kokonaisluku"
-#: directives.c:978 directives.c:980
+#: directives.c:979 directives.c:981
msgid "line number out of range"
msgstr "rivinumero sallitun välin ulkopuolella"
-#: directives.c:993 directives.c:1074
+#: directives.c:994 directives.c:1075
#, c-format
msgid "\"%s\" is not a valid filename"
msgstr "”%s” ei ole kelvollinen tiedostonimi"
-#: directives.c:1034
+#: directives.c:1035
#, c-format
msgid "\"%s\" after # is not a positive integer"
msgstr "#:n jälkeinen ”%s” ei ole positiivinen kokonaisluku"
-#: directives.c:1101
+#: directives.c:1102
#, c-format
msgid "file \"%s\" linemarker ignored due to incorrect nesting"
msgstr "tiedoston ”%s” rivinmerkitsin jätetään huomiotta virheellisen sisäkkäisyyden vuoksi"
-#: directives.c:1162 directives.c:1164 directives.c:1166 directives.c:1754
+#: directives.c:1180 directives.c:1182 directives.c:1184 directives.c:1772
#, c-format
msgid "%s"
msgstr "%s"
-#: directives.c:1190
+#: directives.c:1208
#, c-format
msgid "invalid #%s directive"
msgstr "virheellinen #%s-direktiivi"
-#: directives.c:1253
+#: directives.c:1271
#, c-format
msgid "registering pragmas in namespace \"%s\" with mismatched name expansion"
msgstr "rekisteröidään pragmat nimiavaruudessa ”%s” epäsopivalla nimenlavennuksella"
-#: directives.c:1262
+#: directives.c:1280
#, c-format
msgid "registering pragma \"%s\" with name expansion and no namespace"
msgstr "rekisteröidään pragma ”%s” nimenlavennuksella ja ilman nimiavaruutta"
-#: directives.c:1280
+#: directives.c:1298
#, c-format
msgid "registering \"%s\" as both a pragma and a pragma namespace"
msgstr "rekisteröidään ”%s” sekä pragmana että pragma-nimiavaruutena"
-#: directives.c:1283
+#: directives.c:1301
#, c-format
msgid "#pragma %s %s is already registered"
msgstr "#pragma %s %s on jo rekisteröity"
-#: directives.c:1286
+#: directives.c:1304
#, c-format
msgid "#pragma %s is already registered"
msgstr "#pragma %s on jo rekisteröity"
-#: directives.c:1316
+#: directives.c:1334
msgid "registering pragma with NULL handler"
msgstr "rekisteröidään pragma NULL-käsittelijällä"
-#: directives.c:1533
+#: directives.c:1551
msgid "#pragma once in main file"
msgstr "#pragma once päätiedostossa"
-#: directives.c:1556
+#: directives.c:1574
msgid "invalid #pragma push_macro directive"
msgstr "virheellinen #pragma push_macro -direktiivi"
-#: directives.c:1613
+#: directives.c:1631
msgid "invalid #pragma pop_macro directive"
msgstr "virheellinen #pragma pop_macro -direktiivi"
# poison tarkoittaa, että makroa tai direktiiviä ei koskaan määritellä tai käytetä
-#: directives.c:1668
+#: directives.c:1686
msgid "invalid #pragma GCC poison directive"
msgstr "virheellinen #pragma GCC poison -direktiivi"
-#: directives.c:1677
+#: directives.c:1695
#, c-format
msgid "poisoning existing macro \"%s\""
msgstr "myrkytetään olemassa oleva makro ”%s”"
-#: directives.c:1696
+#: directives.c:1714
msgid "#pragma system_header ignored outside include file"
msgstr "#pragma system_header ohitetaan otsaketiedoston ulkopuolella"
-#: directives.c:1721
+#: directives.c:1739
#, c-format
msgid "cannot find source file %s"
msgstr "lähdetiedostoa %s ei löydy"
-#: directives.c:1725
+#: directives.c:1743
#, c-format
msgid "current file is older than %s"
msgstr "nykyinen tiedosto on vanhempi kuin %s"
-#: directives.c:1749
+#: directives.c:1767
#, c-format
msgid "invalid \"#pragma GCC %s\" directive"
msgstr "virheellinen ”#pragma GCC %s” -direktiivi"
-#: directives.c:1950
+#: directives.c:1968
msgid "_Pragma takes a parenthesized string literal"
msgstr "_Pragma ottaa sulkeilla ympäröidyn merkkijonoliteraalin"
-#: directives.c:2033
+#: directives.c:2051
msgid "#else without #if"
msgstr "#else ilman #if:iä"
-#: directives.c:2038
+#: directives.c:2056
msgid "#else after #else"
msgstr "#else #else:n jälkeen"
-#: directives.c:2040 directives.c:2073
+#: directives.c:2058 directives.c:2091
msgid "the conditional began here"
msgstr "ehtolause alkoi tästä"
-#: directives.c:2066
+#: directives.c:2084
msgid "#elif without #if"
msgstr "#elif ilman #if:iä"
-#: directives.c:2071
+#: directives.c:2089
msgid "#elif after #else"
msgstr "#elif #else:n jälkeen"
-#: directives.c:2102
+#: directives.c:2120
msgid "#endif without #if"
msgstr "#endif ilman #if:iä"
-#: directives.c:2178
+#: directives.c:2196
msgid "missing '(' after predicate"
msgstr "’(’ puuttuu predikaatin jäljestä"
-#: directives.c:2196
+#: directives.c:2214
msgid "missing ')' to complete answer"
msgstr "’)’ puuttuu vastauksen täydentämisestä"
-#: directives.c:2208
+#: directives.c:2226
msgid "predicate's answer is empty"
msgstr "predikaatin vastaus on tyhjä"
-#: directives.c:2238
+#: directives.c:2256
msgid "assertion without predicate"
msgstr "väite ilman predikaattia"
-#: directives.c:2241
+#: directives.c:2259
msgid "predicate must be an identifier"
msgstr "predikaatin on oltava tunniste"
-#: directives.c:2323
+#: directives.c:2341
#, c-format
msgid "\"%s\" re-asserted"
msgstr "”%s” väitetty uudelleen"
-#: directives.c:2604
+#: directives.c:2659
#, c-format
msgid "unterminated #%s"
msgstr "päättämätön #%s"
-#: directives-only.c:221 lex.c:2879 traditional.c:174
-msgid "unterminated comment"
-msgstr "päättämätön kommentti"
-
#: errors.c:291
#, c-format
msgid "%s: %s"
@@ -446,216 +442,236 @@ msgstr "%s: %s"
msgid "stdout"
msgstr "vakiotuloste"
-#: expr.c:626 expr.c:743
+#: expr.c:636 expr.c:753
msgid "fixed-point constants are a GCC extension"
msgstr "kiintopistevakiot ovat GCC-laajennos"
-#: expr.c:651
+#: expr.c:661
msgid "invalid prefix \"0b\" for floating constant"
msgstr "virheellinen etuliite ”0b” liukulukuvakiolle"
-#: expr.c:664
+#: expr.c:674
msgid "use of C++17 hexadecimal floating constant"
msgstr "C++17:n heksadesimaaliliukulukuvakion käyttö"
-#: expr.c:667
+#: expr.c:677
msgid "use of C99 hexadecimal floating constant"
msgstr "C99:n heksadesimaaliliukulukuvakion käyttö"
-#: expr.c:711
+#: expr.c:721
#, c-format
msgid "invalid suffix \"%.*s\" on floating constant"
msgstr "virheellinen loppuliite ”%.*s” liukulukuvakiolla"
-#: expr.c:722 expr.c:789
+#: expr.c:732 expr.c:799
#, c-format
msgid "traditional C rejects the \"%.*s\" suffix"
msgstr "perinteinen C ei salli ”%.*s”-loppuliitettä"
-#: expr.c:730
+#: expr.c:740
msgid "suffix for double constant is a GCC extension"
msgstr "loppuliite double-vakiolle on GCC-laajennos"
-#: expr.c:736
+#: expr.c:746
#, c-format
msgid "invalid suffix \"%.*s\" with hexadecimal floating constant"
msgstr "virheellinen loppuliite ”%.*s” heksadesimaalisella liukulukuvakiolla"
-#: expr.c:749 expr.c:753
+#: expr.c:759 expr.c:763
msgid "decimal float constants are a C2X feature"
msgstr "desimaali-float-vakiot ovat C2X-ominaisuus"
-#: expr.c:772
+#: expr.c:782
#, c-format
msgid "invalid suffix \"%.*s\" on integer constant"
msgstr "virheellinen loppuliite ”%.*s” kokonaislukuvakiolla"
-#: expr.c:797
+#: expr.c:807
msgid "use of C++11 long long integer constant"
msgstr "C++11:n long long -kokonaislukuvakion käyttö"
-#: expr.c:798
+#: expr.c:808
msgid "use of C99 long long integer constant"
msgstr "C99:n long long -kokonaislukuvakion käyttö"
-#: expr.c:814
+#: expr.c:822
+#, fuzzy
+#| msgid "use of C++11 long long integer constant"
+msgid "use of C++23 %<size_t%> integer constant"
+msgstr "C++11:n long long -kokonaislukuvakion käyttö"
+
+#: expr.c:823
+#, fuzzy
+#| msgid "use of C++11 long long integer constant"
+msgid "use of C++23 %<make_signed_t<size_t>%> integer constant"
+msgstr "C++11:n long long -kokonaislukuvakion käyttö"
+
+#: expr.c:834
msgid "imaginary constants are a GCC extension"
msgstr "imaginäärivakiot ovat GCC-laajennos"
-#: expr.c:820
+#: expr.c:841
msgid "binary constants are a C++14 feature or GCC extension"
msgstr "binäärivakiot ovat C++14:n ominaisuus tai GCC-laajennos"
-#: expr.c:822
-msgid "binary constants are a GCC extension"
-msgstr "binäärivakiot ovat GCC-laajennos"
+#: expr.c:843
+#, fuzzy
+#| msgid "binary constants are a C++14 feature or GCC extension"
+msgid "binary constants are a C2X feature or GCC extension"
+msgstr "binäärivakiot ovat C++14:n ominaisuus tai GCC-laajennos"
+
+#: expr.c:848
+#, fuzzy
+#| msgid "decimal float constants are a C2X feature"
+msgid "binary constants are a C2X feature"
+msgstr "desimaali-float-vakiot ovat C2X-ominaisuus"
-#: expr.c:917
+#: expr.c:944
msgid "integer constant is too large for its type"
msgstr "kokonaislukuvakio on liian suuri tyypilleen"
-#: expr.c:948
+#: expr.c:975
msgid "integer constant is so large that it is unsigned"
msgstr "kokonaislukuvakio on niin suuri, että se on etumerkitön"
-#: expr.c:1043
+#: expr.c:1070
msgid "missing ')' after \"defined\""
msgstr "’)’ puuttuu ”defined”-sanan jäljestä"
-#: expr.c:1050
+#: expr.c:1077
msgid "operator \"defined\" requires an identifier"
msgstr "operaattori ”defined” vaatii tunnisteen"
-#: expr.c:1058
+#: expr.c:1085
#, c-format
msgid "(\"%s\" is an alternative token for \"%s\" in C++)"
msgstr "(”%s” on vaihtoehtoinen symboli ”%s”:lle C++:ssa)"
-#: expr.c:1070
+#: expr.c:1098
msgid "this use of \"defined\" may not be portable"
msgstr "tämä ”defined”-sanan käyttö ei ehkä ole siirrettävää"
-#: expr.c:1113
+#: expr.c:1143
msgid "user-defined literal in preprocessor expression"
msgstr "käyttäjän määrittelemä literaali esikääntäjän lausekkeessa"
-#: expr.c:1118
+#: expr.c:1148
msgid "floating constant in preprocessor expression"
msgstr "liukulukuvakio esikääntäjän lausekkeessa"
-#: expr.c:1124
+#: expr.c:1154
msgid "imaginary number in preprocessor expression"
msgstr "imaginääriluku esikääntäjän lausekkeessa"
-#: expr.c:1173
+#: expr.c:1203
#, c-format
msgid "\"%s\" is not defined, evaluates to 0"
msgstr "”%s” on määrittelemättä, evaluoituu 0:ksi"
-#: expr.c:1186
+#: expr.c:1216
msgid "assertions are a GCC extension"
msgstr "väitteet ovat GCC-laajennos"
-#: expr.c:1189
+#: expr.c:1219
msgid "assertions are a deprecated extension"
msgstr "väitteet ovat vanhentunut laajennos"
# %s on #if tai #elif
-#: expr.c:1435
+#: expr.c:1465
#, c-format
msgid "unbalanced stack in %s"
msgstr "tasapainoton pino %s:ssä"
-#: expr.c:1455
+#: expr.c:1485
#, c-format
msgid "impossible operator '%u'"
msgstr "mahdoton operaattori ’%u’"
-#: expr.c:1556
+#: expr.c:1586
msgid "missing ')' in expression"
msgstr "’)’ puuttuu lausekkeesta"
-#: expr.c:1585
+#: expr.c:1615
msgid "'?' without following ':'"
msgstr "’?’ ilman sitä seuraavaa ’:’-merkkiä"
-#: expr.c:1595
+#: expr.c:1625
msgid "integer overflow in preprocessor expression"
msgstr "kokonaislukuylivuoto esikääntäjän lausekkeessa"
-#: expr.c:1600
+#: expr.c:1630
msgid "missing '(' in expression"
msgstr "’(’ puuttuu lausekkeesta"
-#: expr.c:1632
+#: expr.c:1662
#, c-format
msgid "the left operand of \"%s\" changes sign when promoted"
msgstr "”%s”:n vasen operandi vaihtaa ylennettäessä etumerkkiään"
-#: expr.c:1637
+#: expr.c:1667
#, c-format
msgid "the right operand of \"%s\" changes sign when promoted"
msgstr "”%s”:n oikea operandi vaihtaa ylennettäessä etumerkkiään"
-#: expr.c:1896
+#: expr.c:1926
msgid "traditional C rejects the unary plus operator"
msgstr "perinteinen C ei salli unaarista plus-operaattoria"
-#: expr.c:1994
+#: expr.c:2024
msgid "comma operator in operand of #if"
msgstr "pilkkuoperaattori #if:in operandissa"
-#: expr.c:2130
+#: expr.c:2160
msgid "division by zero in #if"
msgstr "jako nollalla #if-ehdossa"
-#: files.c:576
+#: files.c:571
msgid "one or more PCH files were found, but they were invalid"
msgstr "yksi tai useampia PCH-tiedostoja löytyi, mutta ne olivat virheellisiä"
-#: files.c:580
+#: files.c:575
msgid "use -Winvalid-pch for more information"
msgstr "käytä valitsinta -Winvalid-pch lisätietojen saamiseksi"
-#: files.c:1004
+#: files.c:1051
#, c-format
msgid "no include path in which to search for %s"
msgstr "ei include-polkua, josta etsiä tiedostoa %s"
-#: files.c:1439
+#: files.c:1546
msgid "Multiple include guards may be useful for:\n"
msgstr "Monen includen estimet voivat olla hyödyllisiä tiedostoille:\n"
-#: init.c:598
+#: init.c:614
msgid "cppchar_t must be an unsigned type"
msgstr "cppchar_t:n on oltava etumerkitön tyyppi"
-#: init.c:602
+#: init.c:618
#, c-format
msgid "preprocessor arithmetic has maximum precision of %lu bits; target requires %lu bits"
msgstr "esikääntäjäaritmetiikan enimmäistarkkuus on %lu bittiä; kohde vaatii %lu bittiä"
-#: init.c:609
+#: init.c:625
msgid "CPP arithmetic must be at least as precise as a target int"
msgstr "CPP-aritmetiikan on oltava vähintään yhtä tarkka kuin kohteen int-tyypin"
-#: init.c:612
+#: init.c:628
msgid "target char is less than 8 bits wide"
msgstr "kohteen char-tyyppi on alle 8 bittiä leveä"
-#: init.c:616
+#: init.c:632
msgid "target wchar_t is narrower than target char"
msgstr "kohteen wchar_t-tyyppi on kapeampi kuin kohteen char-tyyppi"
-#: init.c:620
+#: init.c:636
msgid "target int is narrower than target char"
msgstr "kohteen int-tyyppi on kapeampi kuin kohteen char-tyyppi"
-#: init.c:625
+#: init.c:641
msgid "CPP half-integer narrower than CPP character"
msgstr "CPP-puolikokonaisluku on kapeampi kuin CPP-merkki"
-#: init.c:629
+#: init.c:645
#, c-format
msgid "CPP on this host cannot handle wide character constants over %lu bits, but the target requires %lu bits"
msgstr "tämän koneen CPP ei pysty käsittelemään yli %lu-bittisiä leveämerkkivakioita, mutta kohde vaatii %lu bittiä"
@@ -705,12 +721,16 @@ msgid "`%.*s' is not in NFC"
msgstr "”%.*s” ei ole NFC-muodossa"
#: lex.c:1375
-msgid "__VA_OPT__ is not available until C++2a"
+#, fuzzy
+#| msgid "__VA_OPT__ is not available until C++2a"
+msgid "__VA_OPT__ is not available until C++20"
msgstr "__VA_OPT__ ei ole saatavilla ennen C++2a:ta"
# Variadic-makro on sellainen makro, jonka argumenttien lukumäärä voi vaihdella.
#: lex.c:1382
-msgid "__VA_OPT__ can only appear in the expansion of a C++2a variadic macro"
+#, fuzzy
+#| msgid "__VA_OPT__ can only appear in the expansion of a C++2a variadic macro"
+msgid "__VA_OPT__ can only appear in the expansion of a C++20 variadic macro"
msgstr "__VA_OPT__ voi esiintyä vain C++2a:n variadisen makron lavennoksessa"
# poison tarkoittaa, että makroa tai direktiiviä ei koskaan määritellä tai käytetä
@@ -734,235 +754,260 @@ msgstr "__VA_ARGS__ voi esiintyä vain C99:n variadisen makron lavennoksessa"
msgid "identifier \"%s\" is a special operator name in C++"
msgstr "tunniste ”%s” on operaattorin nimi C++:ssa"
-#: lex.c:1837
+#: lex.c:1879
msgid "raw string delimiter longer than 16 characters"
msgstr "raa’an merkkijonon erotin pitempi kuin 16 merkkiä"
-#: lex.c:1841
+#: lex.c:1883
msgid "invalid new-line in raw string delimiter"
msgstr "virheellinen rivinvaihto raa’an merkkijonon erottimessa"
-#: lex.c:1845
+#: lex.c:1887 lex.c:4639
#, c-format
msgid "invalid character '%c' in raw string delimiter"
msgstr "virheellinen merkki ’%c’ raa’an merkkijonon erottimessa"
-#: lex.c:1894 lex.c:1916
+#: lex.c:1926 lex.c:1949
msgid "unterminated raw string"
msgstr "päättämätön raaka merkkijono"
-#: lex.c:1936 lex.c:2065
+#: lex.c:1971 lex.c:2100
msgid "invalid suffix on literal; C++11 requires a space between literal and string macro"
msgstr "literaalissa virheellinen jälkiliite; C++11 vaatii välilyönnin literaalin ja merkkijonomakron väliin"
-#: lex.c:2048
+#: lex.c:2083
msgid "null character(s) preserved in literal"
msgstr "null-merkit säilytetään literaalissa"
-#: lex.c:2051
+#: lex.c:2086
#, c-format
msgid "missing terminating %c character"
msgstr "päättävä merkki %c puuttuu"
-#: lex.c:2083
+#: lex.c:2118
msgid "C++11 requires a space between string literal and macro"
msgstr "C++11 vaatii välilyönnin literaalin ja merkkijonomakron väliin"
-#: lex.c:2893 lex.c:2927
+#: lex.c:2711
+msgid "module control-line cannot be in included file"
+msgstr ""
+
+#: lex.c:2725
+#, c-format
+msgid "module control-line \"%s\" cannot be an object-like macro"
+msgstr ""
+
+#: lex.c:3099 lex.c:4472 traditional.c:174
+msgid "unterminated comment"
+msgstr "päättämätön kommentti"
+
+#: lex.c:3113 lex.c:3147
msgid "C++ style comments are not allowed in ISO C90"
msgstr "C++-tyyliset kommentit eivät ole sallittuja ISO C90:ssä"
-#: lex.c:2895 lex.c:2906 lex.c:2930
+#: lex.c:3115 lex.c:3126 lex.c:3150
msgid "(this will be reported only once per input file)"
msgstr "(tästä ilmoitetaan vain kerran syötetiedostoa kohden)"
-#: lex.c:2904
+#: lex.c:3124
msgid "C++ style comments are incompatible with C90"
msgstr "C++-tyyliset kommentit ovat epäyhteensopivia C90:n kanssa"
-#: lex.c:2936
+#: lex.c:3156
msgid "multi-line comment"
msgstr "monirivinen kommentti"
-#: lex.c:3330
+#: lex.c:3550
#, c-format
msgid "unspellable token %s"
msgstr "kirjoitusasuton symboli %s"
+#: lex.c:4627
+#, fuzzy, c-format
+#| msgid "raw string delimiter longer than 16 characters"
+msgid "raw string delimiter longer than %d characters"
+msgstr "raa’an merkkijonon erotin pitempi kuin 16 merkkiä"
+
+#: lex.c:4697
+#, fuzzy
+#| msgid "unterminated #%s"
+msgid "unterminated literal"
+msgstr "päättämätön #%s"
+
#: macro.c:94
msgid "'##' cannot appear at either end of __VA_OPT__"
msgstr "”##” ei voi esiintyä __VA_OPT__-makron kummassakaan päässä"
# Mahdolliset arvot: "form feed", "vertical tab", eivät käännettäviä.
-#: macro.c:364
+#: macro.c:386
#, c-format
msgid "\"%s\" used outside of preprocessing directive"
msgstr "”%s” käytössä esikääntäjän direktiivin ulkopuolella"
-#: macro.c:374
+#: macro.c:396
#, c-format
msgid "missing '(' before \"%s\" operand"
msgstr "’(’ puuttuu ”%s”-operandin edeltä"
-#: macro.c:389
+#: macro.c:411
#, c-format
msgid "operator \"%s\" requires a header-name"
msgstr "operaattori ”%s” vaatii otsakemerkkijonon"
-#: macro.c:406
+#: macro.c:428
#, c-format
msgid "missing ')' after \"%s\" operand"
msgstr "’)’ puuttuu ”%s”-operandin jäljestä"
-#: macro.c:426
+#: macro.c:448
#, c-format
msgid "macro \"%s\" is not used"
msgstr "makroa ”%s” ei käytetä"
-#: macro.c:465 macro.c:723
+#: macro.c:487 macro.c:778
#, c-format
msgid "invalid built-in macro \"%s\""
msgstr "virheellinen sisäinen makro ”%s”"
-#: macro.c:472 macro.c:574
+#: macro.c:494 macro.c:596
#, c-format
msgid "macro \"%s\" might prevent reproducible builds"
msgstr "makro ”%s” saattaa estää toistettavat käännökset"
-#: macro.c:503
+#: macro.c:525
msgid "could not determine file timestamp"
msgstr "ei voitu selvittää tiedoston aikaleimaa"
-#: macro.c:620
+#: macro.c:610
msgid "could not determine date and time"
msgstr "ei voitu selvittää päivämäärää ja aikaa"
-#: macro.c:636
+#: macro.c:642
msgid "__COUNTER__ expanded inside directive with -fdirectives-only"
msgstr "__COUNTER__ lavennettu direktiivin sisällä valitsimella -fdirectives-only"
-#: macro.c:842
+#: macro.c:897
msgid "invalid string literal, ignoring final '\\'"
msgstr "virheellinen merkijonoliteraali, ohitetaan viimeinen ’\\’"
-#: macro.c:904
+#: macro.c:959
#, c-format
msgid "pasting \"%s\" and \"%s\" does not give a valid preprocessing token"
msgstr "liittämällä ”%s” ja ”%s” ei saada kelvollista esikääntäjän symbolia"
# Variadic-makro on sellainen makro, jonka argumenttien lukumäärä voi vaihdella.
-#: macro.c:1030
+#: macro.c:1085
msgid "ISO C++11 requires at least one argument for the \"...\" in a variadic macro"
msgstr "ISO C++11 vaatii vähintään yhden argumentin variadisen makron ”...”:lle"
# Variadic-makro on sellainen makro, jonka argumenttien lukumäärä voi vaihdella.
-#: macro.c:1034
+#: macro.c:1089
msgid "ISO C99 requires at least one argument for the \"...\" in a variadic macro"
msgstr "ISO C99 vaatii vähintään yhden argumentin variadisen makron ”...”:lle"
-#: macro.c:1041
+#: macro.c:1096
#, c-format
msgid "macro \"%s\" requires %u arguments, but only %u given"
msgstr "makro ”%s” vaatii %u argumenttia, mutta vain %u on annettu"
-#: macro.c:1046
+#: macro.c:1101
#, c-format
msgid "macro \"%s\" passed %u arguments, but takes just %u"
msgstr "makrolle ”%s” annettu %u argumenttia, mutta se ottaa vain %u"
-#: macro.c:1244 traditional.c:815
+#: macro.c:1299 traditional.c:822
#, c-format
msgid "unterminated argument list invoking macro \"%s\""
msgstr "päättämätön argumenttiluettelo ”%s”-makron kutsussa"
-#: macro.c:1386
+#: macro.c:1442
#, c-format
msgid "function-like macro \"%s\" must be used with arguments in traditional C"
msgstr "funktion kaltaista makroa ”%s” on käytettävä argumenttien kanssa perinteisessä C:ssä"
-#: macro.c:2165
+#: macro.c:2220
#, c-format
msgid "invoking macro %s argument %d: empty macro arguments are undefined in ISO C++98"
msgstr "%s-makron argumentin %d kutsu: tyhjät makroargumentit ovat määrittelemättömiä ISO C++98:ssa"
-#: macro.c:2173 macro.c:2182
+#: macro.c:2228 macro.c:2237
#, c-format
msgid "invoking macro %s argument %d: empty macro arguments are undefined in ISO C90"
msgstr "%s-makron argumentin %d kutsu: tyhjät makroargumentit ovat määrittelemättömiä ISO C90:ssä"
-#: macro.c:3141
+#: macro.c:3279
#, c-format
msgid "duplicate macro parameter \"%s\""
msgstr "kahdenkertainen makroparametri ”%s”"
-#: macro.c:3223
+#: macro.c:3361
#, c-format
msgid "expected parameter name, found \"%s\""
msgstr "odotettiin parametrin nimeä, löytyi ”%s”"
-#: macro.c:3224
+#: macro.c:3362
#, c-format
msgid "expected ',' or ')', found \"%s\""
msgstr "odotettiin ”,” tai ”)”, löytyi ”%s”"
-#: macro.c:3225
+#: macro.c:3363
msgid "expected parameter name before end of line"
msgstr "odotettiin parametrin nimeä ennen rivin loppua"
-#: macro.c:3226
+#: macro.c:3364
msgid "expected ')' before end of line"
msgstr "odotettiin tulevan ”)” ennen rivin loppua"
-#: macro.c:3227
+#: macro.c:3365
msgid "expected ')' after \"...\""
msgstr "odotettiin ”...”:n jälkeen tulevan ”)”"
-#: macro.c:3284
+#: macro.c:3422
msgid "anonymous variadic macros were introduced in C++11"
msgstr "anonyymit variadiset makrot esiteltiin C++11:ssä"
-#: macro.c:3285 macro.c:3289
+#: macro.c:3423 macro.c:3427
msgid "anonymous variadic macros were introduced in C99"
msgstr "anonyymit variadiset makrot esiteltiin C99:ssä"
-#: macro.c:3295
+#: macro.c:3433
msgid "ISO C++ does not permit named variadic macros"
msgstr "ISO C++ ei salli nimettyjä variadisia makroja"
-#: macro.c:3296
+#: macro.c:3434
msgid "ISO C does not permit named variadic macros"
msgstr "ISO C ei salli nimettyjä variadisia makroja"
-#: macro.c:3342
+#: macro.c:3480
msgid "'##' cannot appear at either end of a macro expansion"
msgstr "”##” ei voi esiintyä makrolavennuksen kummassakaan päässä"
-#: macro.c:3380
+#: macro.c:3518
msgid "ISO C++11 requires whitespace after the macro name"
msgstr "ISO C++11 vaatii tyhjemerkin makron nimen jälkeen"
-#: macro.c:3381
+#: macro.c:3519
msgid "ISO C99 requires whitespace after the macro name"
msgstr "ISO C99 vaatii tyhjemerkin makron nimen jälkeen"
-#: macro.c:3405
+#: macro.c:3543
msgid "missing whitespace after the macro name"
msgstr "tyhjemerkki puuttuu makron nimen jäljestä"
-#: macro.c:3455
+#: macro.c:3593
msgid "'#' is not followed by a macro parameter"
msgstr "”#” ilman sitä seuraavaa makroparametria"
-#: macro.c:3606
+#: macro.c:3749
#, c-format
msgid "\"%s\" redefined"
msgstr "”%s” määritelty uudelleen"
-#: macro.c:3611
+#: macro.c:3754
msgid "this is the location of the previous definition"
msgstr "tämä on edellisen määrittelyn sijainti"
-#: macro.c:3715
+#: macro.c:3891
#, c-format
msgid "macro argument \"%s\" would be stringified in traditional C"
msgstr "makron argumentti ”%s” merkkijonostettaisiin perinteisessä C:ssä"
@@ -1000,15 +1045,18 @@ msgstr "%s: ei käytetä, koska ”__COUNTER__” on virheellinen"
msgid "while reading precompiled header"
msgstr "luettaessa esikäännettyä otsaketta"
-#: traditional.c:884
+#: traditional.c:891
#, c-format
msgid "detected recursion whilst expanding macro \"%s\""
msgstr "havaittiin rekursio lavennettaessa makroa ”%s”"
-#: traditional.c:1107
+#: traditional.c:1114
msgid "syntax error in macro parameter list"
msgstr "syntaksivirhe makron parameteriluettelossa"
+#~ msgid "binary constants are a GCC extension"
+#~ msgstr "binäärivakiot ovat GCC-laajennos"
+
#~ msgid "\"__has_include__\" cannot be used as a macro name"
#~ msgstr "”__has_include__” ei ole kelvollinen makron nimi"
diff --git a/libcpp/po/fr.po b/libcpp/po/fr.po
index 800fac9..01704af 100644
--- a/libcpp/po/fr.po
+++ b/libcpp/po/fr.po
@@ -4,7 +4,7 @@
# Michel Robitaille <robitail@IRO.UMontreal.CA>, traducteur depuis/since 1996.
# François-Xavier Coudert <fxcoudert@gcc.gnu.org>, 2008.
# Stéphane Aulery <lkppo@free.fr>, 2015, 2016, 2017.
-# Frédéric Marchal <fmarchal@perso.be>, 2020.
+# Frédéric Marchal <fmarchal@perso.be>, 2021.
#
# Vocabulaire utilisé
# lvalue = membre gauche
@@ -120,10 +120,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: GNU cpplib-10.1-b20200209\n"
+"Project-Id-Version: GNU cpplib-11.1-b20210207\n"
"Report-Msgid-Bugs-To: https://gcc.gnu.org/bugs/\n"
-"POT-Creation-Date: 2020-02-07 22:33+0000\n"
-"PO-Revision-Date: 2020-02-12 17:53+0100\n"
+"POT-Creation-Date: 2021-02-05 21:38+0000\n"
+"PO-Revision-Date: 2021-02-11 08:39+0100\n"
"Last-Translator: Frédéric Marchal <fmarchal@perso.be>\n"
"Language-Team: French <traduc@traduc.org>\n"
"Language: fr\n"
@@ -133,155 +133,155 @@ msgstr ""
"X-Bugs: Report translation errors to the Language-Team address.\n"
"Plural-Forms: nplurals=2; plural=(n >= 2);\n"
-#: charset.c:674
+#: charset.c:677
#, c-format
msgid "conversion from %s to %s not supported by iconv"
msgstr "la conversion de %s vers %s n’est pas prise en charge par iconv"
-#: charset.c:677
+#: charset.c:680
msgid "iconv_open"
msgstr "iconv_open"
-#: charset.c:685
+#: charset.c:688
#, c-format
msgid "no iconv implementation, cannot convert from %s to %s"
msgstr "pas d’implémentation iconv, impossible de convertir %s vers %s"
-#: charset.c:781
+#: charset.c:784
#, c-format
msgid "character 0x%lx is not in the basic source character set\n"
msgstr "le caractère 0x%lx n’est pas dans le jeu de caractères source de base\n"
-#: charset.c:798 charset.c:1768
+#: charset.c:801 charset.c:1771
msgid "converting to execution character set"
msgstr "conversion vers un jeu de caractères d’exécution"
-#: charset.c:804
+#: charset.c:807
#, c-format
msgid "character 0x%lx is not unibyte in execution character set"
msgstr "le caractère 0x%lx n’est pas un octet unique dans le jeu de caractères d’exécution"
-#: charset.c:1054
+#: charset.c:1057
msgid "universal character names are only valid in C++ and C99"
msgstr "les noms de caractères universels sont seulement valides en C++ et C99"
-#: charset.c:1058
+#: charset.c:1061
msgid "C99's universal character names are incompatible with C90"
msgstr "les noms de caractères universels du C99 sont incompatibles avec ceux du C90"
-#: charset.c:1061
+#: charset.c:1064
#, c-format
msgid "the meaning of '\\%c' is different in traditional C"
msgstr "la signification de « \\%c » est différente en C traditionnel"
-#: charset.c:1070
+#: charset.c:1073
msgid "In _cpp_valid_ucn but not a UCN"
msgstr "Est dans _cpp_valid_ucn mais n'est pas un UCN"
# FIXME
-#: charset.c:1103
+#: charset.c:1106
#, c-format
msgid "incomplete universal character name %.*s"
msgstr "nom de caractère universel incomplet %.*s"
-#: charset.c:1118
+#: charset.c:1121
#, c-format
msgid "%.*s is not a valid universal character"
msgstr "%.*s n’est pas un caractère universel valide"
-#: charset.c:1128 lex.c:1335
+#: charset.c:1131 lex.c:1335
msgid "'$' in identifier or number"
msgstr "« $ » dans un identificateur ou un nombre"
-#: charset.c:1138
+#: charset.c:1141
#, c-format
msgid "universal character %.*s is not valid in an identifier"
msgstr "le caractère universel %.*s n’est pas valide dans un identificateur"
-#: charset.c:1142
+#: charset.c:1145
#, c-format
msgid "universal character %.*s is not valid at the start of an identifier"
msgstr "le caractère universel %.*s n’est pas valide au début d’un identificateur"
-#: charset.c:1149
+#: charset.c:1152
#, c-format
msgid "%.*s is outside the UCS codespace"
msgstr "%.*s est en dehors de l'espace de code UCS"
-#: charset.c:1194 charset.c:2113
+#: charset.c:1197 charset.c:2116
msgid "converting UCN to source character set"
msgstr "conversion d'un UCN vers le jeu de caractères source"
-#: charset.c:1201
+#: charset.c:1204
msgid "converting UCN to execution character set"
msgstr "conversion d'un UCN vers le jeu de caractères d’exécution"
-#: charset.c:1265
+#: charset.c:1268
#, c-format
msgid "extended character %.*s is not valid in an identifier"
msgstr "le caractère étendu %.*s n’est pas valide dans un identificateur"
-#: charset.c:1282
+#: charset.c:1285
#, c-format
msgid "extended character %.*s is not valid at the start of an identifier"
msgstr "le caractère étendu %.*s n’est pas valide au début d’un identificateur"
-#: charset.c:1368
+#: charset.c:1371
msgid "the meaning of '\\x' is different in traditional C"
msgstr "la signification de « \\x » est différente en C traditionnel"
-#: charset.c:1393
+#: charset.c:1396
msgid "\\x used with no following hex digits"
msgstr "\\x utilisé sans être suivi de chiffres hexadécimaux"
-#: charset.c:1400
+#: charset.c:1403
msgid "hex escape sequence out of range"
msgstr "séquence d’échappement hexadécimale hors intervalle"
-#: charset.c:1452
+#: charset.c:1455
msgid "octal escape sequence out of range"
msgstr "séquence d’échappement octale hors intervalle"
-#: charset.c:1534
+#: charset.c:1537
msgid "the meaning of '\\a' is different in traditional C"
msgstr "la signification de « \\a » est différente en C traditionnel"
-#: charset.c:1541
+#: charset.c:1544
#, c-format
msgid "non-ISO-standard escape sequence, '\\%c'"
msgstr "séquence d’échappement « \\%c » non conforme au standard ISO"
-#: charset.c:1549
+#: charset.c:1552
#, c-format
msgid "unknown escape sequence: '\\%c'"
msgstr "séquence d'échappement inconnue : « \\%c »"
-#: charset.c:1557
+#: charset.c:1560
#, c-format
msgid "unknown escape sequence: '\\%s'"
msgstr "séquence d’échappement « \\%s » inconnue"
-#: charset.c:1565
+#: charset.c:1568
msgid "converting escape sequence to execution character set"
msgstr "conversion d’une séquence d’échappement vers le jeu de caractères d’exécution"
-#: charset.c:1705
+#: charset.c:1708
msgid "missing open quote"
msgstr "guillemet ouvrant de chaîne de caractères manquant"
-#: charset.c:1923 charset.c:2002
+#: charset.c:1926 charset.c:2005
msgid "character constant too long for its type"
msgstr "constante caractère trop longue pour son type"
-#: charset.c:1926
+#: charset.c:1929
msgid "multi-character character constant"
msgstr "constante caractère multi-caractères"
-#: charset.c:2042
+#: charset.c:2045
msgid "empty character constant"
msgstr "constante caractère vide"
-#: charset.c:2160
+#: charset.c:2163
#, c-format
msgid "failure to convert %s to %s"
msgstr "échec de conversion de %s vers %s"
@@ -352,203 +352,199 @@ msgstr "les noms de macro doivent être des identificateurs"
msgid "undefining \"%s\""
msgstr "suppression de la définition de « %s »"
-#: directives.c:724
+#: directives.c:725
msgid "missing terminating > character"
msgstr "caractère > de terminaison manquant"
-#: directives.c:783
+#: directives.c:784
#, c-format
msgid "#%s expects \"FILENAME\" or <FILENAME>"
msgstr "#%s attend \"NOM_DE_FICHIER\" ou <NOM_DE_FICHIER>"
-#: directives.c:829
+#: directives.c:830
#, c-format
msgid "empty filename in #%s"
msgstr "nom de fichier vide dans #%s"
-#: directives.c:838
+#: directives.c:839
#, c-format
msgid "#include nested depth %u exceeds maximum of %u (use -fmax-include-depth=DEPTH to increase the maximum)"
msgstr "la profondeur d'imbrication %u des #include dépasse le maximum %u (utilisez -fmax-include-depth=PROFONDEUR pour augmenter le maximum)"
-#: directives.c:883
+#: directives.c:884
msgid "#include_next in primary source file"
msgstr "#include_next dans un fichier source primaire"
-#: directives.c:909
+#: directives.c:910
#, c-format
msgid "invalid flag \"%s\" in line directive"
msgstr "drapeau « %s » invalide dans la ligne de directive"
-#: directives.c:969
+#: directives.c:970
msgid "unexpected end of file after #line"
msgstr "fin de fichier inattendue après #line"
-#: directives.c:972
+#: directives.c:973
#, c-format
msgid "\"%s\" after #line is not a positive integer"
msgstr "« %s » après #line n’est pas un nombre entier positif"
-#: directives.c:978 directives.c:980
+#: directives.c:979 directives.c:981
msgid "line number out of range"
msgstr "numéro de ligne hors intervalle"
-#: directives.c:993 directives.c:1074
+#: directives.c:994 directives.c:1075
#, c-format
msgid "\"%s\" is not a valid filename"
msgstr "« %s » n’est pas un nom de fichier valide"
-#: directives.c:1034
+#: directives.c:1035
#, c-format
msgid "\"%s\" after # is not a positive integer"
msgstr "« %s » après # n’est pas un nombre entier positif"
-#: directives.c:1101
+#: directives.c:1102
#, c-format
msgid "file \"%s\" linemarker ignored due to incorrect nesting"
msgstr "le marqueur de ligne du fichier « %s » est ignoré à cause d’une imbrication incorrecte"
-#: directives.c:1162 directives.c:1164 directives.c:1166 directives.c:1754
+#: directives.c:1180 directives.c:1182 directives.c:1184 directives.c:1772
#, c-format
msgid "%s"
msgstr "%s"
-#: directives.c:1190
+#: directives.c:1208
#, c-format
msgid "invalid #%s directive"
msgstr "directive #%s invalide"
-#: directives.c:1253
+#: directives.c:1271
#, c-format
msgid "registering pragmas in namespace \"%s\" with mismatched name expansion"
msgstr "enregistrement des pragmas dans l'espace de nom « %s » avec une expansion de nom ne correspondant pas"
-#: directives.c:1262
+#: directives.c:1280
#, c-format
msgid "registering pragma \"%s\" with name expansion and no namespace"
msgstr "enregistrement du pragma « %s » avec une expansion de nom mais pas d’espace de nom"
-#: directives.c:1280
+#: directives.c:1298
#, c-format
msgid "registering \"%s\" as both a pragma and a pragma namespace"
msgstr "enregistrement de « %s » à la fois comme un pragma et un espace de nom de pragma"
-#: directives.c:1283
+#: directives.c:1301
#, c-format
msgid "#pragma %s %s is already registered"
msgstr "le #pragma %s %s est déjà enregistré"
-#: directives.c:1286
+#: directives.c:1304
#, c-format
msgid "#pragma %s is already registered"
msgstr "le #pragma %s est déjà enregistré"
-#: directives.c:1316
+#: directives.c:1334
msgid "registering pragma with NULL handler"
msgstr "enregistrement d’un pragma avec un handler NULL"
-#: directives.c:1533
+#: directives.c:1551
msgid "#pragma once in main file"
msgstr "#pragma once utilisé une seule fois dans le fichier principal"
-#: directives.c:1556
+#: directives.c:1574
msgid "invalid #pragma push_macro directive"
msgstr "directive #pragma push_macro invalide"
-#: directives.c:1613
+#: directives.c:1631
msgid "invalid #pragma pop_macro directive"
msgstr "directive #pragma pop_macro invalide"
-#: directives.c:1668
+#: directives.c:1686
msgid "invalid #pragma GCC poison directive"
msgstr "directive #pragma GCC poison invalide"
-#: directives.c:1677
+#: directives.c:1695
#, c-format
msgid "poisoning existing macro \"%s\""
msgstr "empoisonnement de la macro existante « %s »"
-#: directives.c:1696
+#: directives.c:1714
msgid "#pragma system_header ignored outside include file"
msgstr "#pragma system_header ignoré en dehors du fichier d'inclusion"
-#: directives.c:1721
+#: directives.c:1739
#, c-format
msgid "cannot find source file %s"
msgstr "impossible de trouver le fichier source %s"
-#: directives.c:1725
+#: directives.c:1743
#, c-format
msgid "current file is older than %s"
msgstr "le fichier courant est plus vieux que %s"
-#: directives.c:1749
+#: directives.c:1767
#, c-format
msgid "invalid \"#pragma GCC %s\" directive"
msgstr "directive « #pragma GCC %s » invalide"
-#: directives.c:1950
+#: directives.c:1968
msgid "_Pragma takes a parenthesized string literal"
msgstr "_Pragma attend une chaîne entourée de parenthèses"
-#: directives.c:2033
+#: directives.c:2051
msgid "#else without #if"
msgstr "#else sans #if"
-#: directives.c:2038
+#: directives.c:2056
msgid "#else after #else"
msgstr "#else après #else"
-#: directives.c:2040 directives.c:2073
+#: directives.c:2058 directives.c:2091
msgid "the conditional began here"
msgstr "la condition débute ici"
-#: directives.c:2066
+#: directives.c:2084
msgid "#elif without #if"
msgstr "#elif sans #if"
-#: directives.c:2071
+#: directives.c:2089
msgid "#elif after #else"
msgstr "#elif après #else"
-#: directives.c:2102
+#: directives.c:2120
msgid "#endif without #if"
msgstr "#endif sans #if"
-#: directives.c:2178
+#: directives.c:2196
msgid "missing '(' after predicate"
msgstr "« ( » manquante après le prédicat"
-#: directives.c:2196
+#: directives.c:2214
msgid "missing ')' to complete answer"
msgstr "« ) » manquante pour compléter la réponse"
-#: directives.c:2208
+#: directives.c:2226
msgid "predicate's answer is empty"
msgstr "la réponse du prédicat est vide"
-#: directives.c:2238
+#: directives.c:2256
msgid "assertion without predicate"
msgstr "assertion sans prédicat"
-#: directives.c:2241
+#: directives.c:2259
msgid "predicate must be an identifier"
msgstr "le prédicat doit être un identificateur"
-#: directives.c:2323
+#: directives.c:2341
#, c-format
msgid "\"%s\" re-asserted"
msgstr "assertion « %s » redondante"
-#: directives.c:2604
+#: directives.c:2659
#, c-format
msgid "unterminated #%s"
msgstr "#%s non terminé"
-#: directives-only.c:221 lex.c:2879 traditional.c:174
-msgid "unterminated comment"
-msgstr "commentaire non terminé"
-
#: errors.c:291
#, c-format
msgid "%s: %s"
@@ -558,215 +554,227 @@ msgstr "%s : %s"
msgid "stdout"
msgstr "sortie standard"
-#: expr.c:626 expr.c:743
+#: expr.c:636 expr.c:753
msgid "fixed-point constants are a GCC extension"
msgstr "les constantes à virgule fixe sont une extension GCC"
-#: expr.c:651
+#: expr.c:661
msgid "invalid prefix \"0b\" for floating constant"
msgstr "préfixe « 0b » invalide pour une constante flottante"
-#: expr.c:664
+#: expr.c:674
msgid "use of C++17 hexadecimal floating constant"
msgstr "utilisation d’une constante flottante hexadécimale C++17"
-#: expr.c:667
+#: expr.c:677
msgid "use of C99 hexadecimal floating constant"
msgstr "utilisation d’une constante flottante hexadécimale C99"
-#: expr.c:711
+#: expr.c:721
#, c-format
msgid "invalid suffix \"%.*s\" on floating constant"
msgstr "suffixe « %.*s » invalide pour une constante flottante"
-#: expr.c:722 expr.c:789
+#: expr.c:732 expr.c:799
#, c-format
msgid "traditional C rejects the \"%.*s\" suffix"
msgstr "le C traditionnel interdit le suffixe « %.*s »"
-#: expr.c:730
+#: expr.c:740
msgid "suffix for double constant is a GCC extension"
msgstr "le suffixe pour les constantes double est une extension GCC"
-#: expr.c:736
+#: expr.c:746
#, c-format
msgid "invalid suffix \"%.*s\" with hexadecimal floating constant"
msgstr "suffixe « %.*s » invalide pour une constante flottante hexadécimale"
-#: expr.c:749 expr.c:753
+#: expr.c:759 expr.c:763
msgid "decimal float constants are a C2X feature"
msgstr "les constantes flottantes décimales sont une fonctionnalité de C2X"
-#: expr.c:772
+#: expr.c:782
#, c-format
msgid "invalid suffix \"%.*s\" on integer constant"
msgstr "suffixe « %.*s » invalide pour une constante entière"
-#: expr.c:797
+#: expr.c:807
msgid "use of C++11 long long integer constant"
msgstr "utilisation d’une constante entière « long long » C++11"
-#: expr.c:798
+#: expr.c:808
msgid "use of C99 long long integer constant"
msgstr "utilisation d’une constante entière « long long » C99"
-#: expr.c:814
+#: expr.c:822
+msgid "use of C++23 %<size_t%> integer constant"
+msgstr "utilisation d’une constante entière %<size_t%> C++23"
+
+#: expr.c:823
+msgid "use of C++23 %<make_signed_t<size_t>%> integer constant"
+msgstr "utilisation d’une constante entière %<make_signed_t<size_t>%> C++23"
+
+#: expr.c:834
msgid "imaginary constants are a GCC extension"
msgstr "les constantes imaginaires sont une extension GCC"
-#: expr.c:820
+#: expr.c:841
msgid "binary constants are a C++14 feature or GCC extension"
msgstr "les constantes binaires sont une fonctionnalité de C++14 ou une extension GCC"
-#: expr.c:822
-msgid "binary constants are a GCC extension"
-msgstr "les constantes binaires sont une extension GCC"
+#: expr.c:843
+msgid "binary constants are a C2X feature or GCC extension"
+msgstr "les constantes binaires sont une fonctionnalité de C2X ou une extension GCC"
+
+#: expr.c:848
+msgid "binary constants are a C2X feature"
+msgstr "les constantes binaires sont une fonctionnalité de C2X"
-#: expr.c:917
+#: expr.c:944
msgid "integer constant is too large for its type"
msgstr "constante entière trop grande pour tenir dans son type"
-#: expr.c:948
+#: expr.c:975
msgid "integer constant is so large that it is unsigned"
msgstr "cette constante entière est si grande qu'elle est non signée"
-#: expr.c:1043
+#: expr.c:1070
msgid "missing ')' after \"defined\""
msgstr "« ) » manquante après « defined »"
-#: expr.c:1050
+#: expr.c:1077
msgid "operator \"defined\" requires an identifier"
msgstr "l'opérateur « defined » requiert un identificateur"
-#: expr.c:1058
+#: expr.c:1085
#, c-format
msgid "(\"%s\" is an alternative token for \"%s\" in C++)"
msgstr "(« %s » est un élément lexical alternatif pour « %s » en C++)"
-#: expr.c:1070
+#: expr.c:1098
msgid "this use of \"defined\" may not be portable"
msgstr "cette utilisation de « defined » peut ne pas être portable"
-#: expr.c:1113
+#: expr.c:1143
msgid "user-defined literal in preprocessor expression"
msgstr "chaîne définie par l'utilisateur dans une expression pour le préprocesseur"
-#: expr.c:1118
+#: expr.c:1148
msgid "floating constant in preprocessor expression"
msgstr "constante flottante dans une expression pour le préprocesseur"
-#: expr.c:1124
+#: expr.c:1154
msgid "imaginary number in preprocessor expression"
msgstr "constante complexe dans une expression pour le préprocesseur"
-#: expr.c:1173
+#: expr.c:1203
#, c-format
msgid "\"%s\" is not defined, evaluates to 0"
msgstr "« %s » n’est pas défini, évalué à 0"
-#: expr.c:1186
+#: expr.c:1216
msgid "assertions are a GCC extension"
msgstr "les assertions sont une extension GCC"
-#: expr.c:1189
+#: expr.c:1219
msgid "assertions are a deprecated extension"
msgstr "les assertions sont une extension obsolète"
-#: expr.c:1435
+#: expr.c:1465
#, c-format
msgid "unbalanced stack in %s"
msgstr "pile non balancée dans %s"
-#: expr.c:1455
+#: expr.c:1485
#, c-format
msgid "impossible operator '%u'"
msgstr "opérateur « %u » impossible"
-#: expr.c:1556
+#: expr.c:1586
msgid "missing ')' in expression"
msgstr "« ) » manquante dans l'expression"
-#: expr.c:1585
+#: expr.c:1615
msgid "'?' without following ':'"
msgstr "« ? » n’est pas suivi de « : »"
-#: expr.c:1595
+#: expr.c:1625
msgid "integer overflow in preprocessor expression"
msgstr "débordement d’entier dans l'expression pour le préprocesseur"
-#: expr.c:1600
+#: expr.c:1630
msgid "missing '(' in expression"
msgstr "« ( » manquante dans l'expression"
-#: expr.c:1632
+#: expr.c:1662
#, c-format
msgid "the left operand of \"%s\" changes sign when promoted"
msgstr "L'opérande de gauche de « %s » change de signe lors de sa promotion"
-#: expr.c:1637
+#: expr.c:1667
#, c-format
msgid "the right operand of \"%s\" changes sign when promoted"
msgstr "L'opérande de droite de « %s » change de signe lors de sa promotion"
-#: expr.c:1896
+#: expr.c:1926
msgid "traditional C rejects the unary plus operator"
msgstr "le C traditionnel rejette l'opérateur d'addition unaire"
-#: expr.c:1994
+#: expr.c:2024
msgid "comma operator in operand of #if"
msgstr "opérateur virgule dans l'opérande de #if"
-#: expr.c:2130
+#: expr.c:2160
msgid "division by zero in #if"
msgstr "division par zéro dans #if"
-#: files.c:576
+#: files.c:571
msgid "one or more PCH files were found, but they were invalid"
msgstr "un ou plusieurs fichiers PCH ont été trouvés, mais ils étaient invalides"
-#: files.c:580
+#: files.c:575
msgid "use -Winvalid-pch for more information"
msgstr "utilisez -Winvalid-pch pour plus d’informations"
-#: files.c:1004
+#: files.c:1051
#, c-format
msgid "no include path in which to search for %s"
msgstr "aucun chemin d’inclusion dans lequel on pourrait rechercher %s"
-#: files.c:1439
+#: files.c:1546
msgid "Multiple include guards may be useful for:\n"
msgstr "Des garde-fous contre les inclusions multiples peuvent être utiles pour :\n"
-#: init.c:598
+#: init.c:614
msgid "cppchar_t must be an unsigned type"
msgstr "cppchar_t doit être d’un type non signé"
-#: init.c:602
+#: init.c:618
#, c-format
msgid "preprocessor arithmetic has maximum precision of %lu bits; target requires %lu bits"
msgstr "l'arithmétique du préprocesseur a une précision maximale de %lu bits ; la cible requière %lu bits"
-#: init.c:609
+#: init.c:625
msgid "CPP arithmetic must be at least as precise as a target int"
msgstr "l'arithmétique du CPP doit être au moins aussi précise que le type int de la cible"
-#: init.c:612
+#: init.c:628
msgid "target char is less than 8 bits wide"
msgstr "sur la cible, char fait moins de 8 bits"
-#: init.c:616
+#: init.c:632
msgid "target wchar_t is narrower than target char"
msgstr "sur la cible, wchar_t est plus petit que char"
-#: init.c:620
+#: init.c:636
msgid "target int is narrower than target char"
msgstr "sur la cible, int est plus petit que char"
-#: init.c:625
+#: init.c:641
msgid "CPP half-integer narrower than CPP character"
msgstr "les demi-entiers de CPP sont plus petits que les caractères de CPP"
-#: init.c:629
+#: init.c:645
#, c-format
msgid "CPP on this host cannot handle wide character constants over %lu bits, but the target requires %lu bits"
msgstr "CPP sur cette machine ne peut gérer les constantes de caractères larges de plus de %lu bits, mais la cible requière %lu bits"
@@ -814,12 +822,12 @@ msgid "`%.*s' is not in NFC"
msgstr "« %.*s » n'est pas normalisée NFC"
#: lex.c:1375
-msgid "__VA_OPT__ is not available until C++2a"
-msgstr "__VA_OPT__ n'est pas disponible avant C++2a"
+msgid "__VA_OPT__ is not available until C++20"
+msgstr "__VA_OPT__ n'est pas disponible avant C++20"
#: lex.c:1382
-msgid "__VA_OPT__ can only appear in the expansion of a C++2a variadic macro"
-msgstr "« __VA_OPT__ » peut seulement apparaître dans l'expansion de macros C++2a à nombre variable d’arguments"
+msgid "__VA_OPT__ can only appear in the expansion of a C++20 variadic macro"
+msgstr "« __VA_OPT__ » peut seulement apparaître dans l'expansion de macros C++20 à nombre variable d’arguments"
#: lex.c:1413 lex.c:1506
#, c-format
@@ -839,232 +847,254 @@ msgstr "« __VA_ARGS__ » peut seulement apparaître dans l'expansion des macr
msgid "identifier \"%s\" is a special operator name in C++"
msgstr "l'identifiant « %s » est un nom d’opérateur spécial en C++"
-#: lex.c:1837
+#: lex.c:1879
msgid "raw string delimiter longer than 16 characters"
msgstr "délimiteur de chaîne brute plus long que 16 caractères"
-#: lex.c:1841
+#: lex.c:1883
msgid "invalid new-line in raw string delimiter"
msgstr "caractère de nouvelle ligne invalide dans un délimiteur de chaîne brute"
-#: lex.c:1845
+#: lex.c:1887 lex.c:4639
#, c-format
msgid "invalid character '%c' in raw string delimiter"
msgstr "caractère « %c » invalide dans un délimiteur de chaîne brute"
-#: lex.c:1894 lex.c:1916
+#: lex.c:1926 lex.c:1949
msgid "unterminated raw string"
msgstr "chaîne brute non terminée"
-#: lex.c:1936 lex.c:2065
+#: lex.c:1971 lex.c:2100
msgid "invalid suffix on literal; C++11 requires a space between literal and string macro"
msgstr "suffixe de chaîne invalide ; C++11 requière un espace entre une chaîne et une macro de chaîne"
-#: lex.c:2048
+#: lex.c:2083
msgid "null character(s) preserved in literal"
msgstr "caractère(s) nul préservé(s) dans la chaîne"
-#: lex.c:2051
+#: lex.c:2086
#, c-format
msgid "missing terminating %c character"
msgstr "caractère %c de terminaison manquant"
-#: lex.c:2083
+#: lex.c:2118
msgid "C++11 requires a space between string literal and macro"
msgstr "C++11 requière un espace entre une chaîne et une macro"
-#: lex.c:2893 lex.c:2927
+#: lex.c:2711
+msgid "module control-line cannot be in included file"
+msgstr "la ligne de contrôle du module ne peut pas être dans un fichier inclus"
+
+#: lex.c:2725
+#, c-format
+msgid "module control-line \"%s\" cannot be an object-like macro"
+msgstr "la ligne de contrôle du module « %s » ne peut pas être un objet similaire à une macro"
+
+#: lex.c:3099 lex.c:4472 traditional.c:174
+msgid "unterminated comment"
+msgstr "commentaire non terminé"
+
+#: lex.c:3113 lex.c:3147
msgid "C++ style comments are not allowed in ISO C90"
msgstr "La syntaxe des commentaires du C++ n’est pas permise en C90 ISO"
-#: lex.c:2895 lex.c:2906 lex.c:2930
+#: lex.c:3115 lex.c:3126 lex.c:3150
msgid "(this will be reported only once per input file)"
msgstr "(ceci sera rapporté une seule fois seulement par fichier d'entrée)"
-#: lex.c:2904
+#: lex.c:3124
msgid "C++ style comments are incompatible with C90"
msgstr "La syntaxe des commentaires du C++ n’est pas permise en C90"
-#: lex.c:2936
+#: lex.c:3156
msgid "multi-line comment"
msgstr "commentaire multi-lignes"
-#: lex.c:3330
+#: lex.c:3550
#, c-format
msgid "unspellable token %s"
msgstr "l'élément lexical %s ne peut être épelé"
+#: lex.c:4627
+#, c-format
+msgid "raw string delimiter longer than %d characters"
+msgstr "délimiteur de chaîne brute plus long que %d caractères"
+
+#: lex.c:4697
+msgid "unterminated literal"
+msgstr "littéral non terminé"
+
#: macro.c:94
msgid "'##' cannot appear at either end of __VA_OPT__"
msgstr "« ## » ne peut apparaître à aucune extrémité de __VA_OPT__"
-#: macro.c:364
+#: macro.c:386
#, c-format
msgid "\"%s\" used outside of preprocessing directive"
msgstr "« %s » utilisé en dehors d'une directive du préprocesseur"
-#: macro.c:374
+#: macro.c:396
#, c-format
msgid "missing '(' before \"%s\" operand"
msgstr "« ( » manquante avant l'opérande « %s »"
-#: macro.c:389
+#: macro.c:411
#, c-format
msgid "operator \"%s\" requires a header-name"
msgstr "l'opérateur « %s » requiert un nom d'entête"
-#: macro.c:406
+#: macro.c:428
#, c-format
msgid "missing ')' after \"%s\" operand"
msgstr "« ) » manquante après l'opérande « %s »"
-#: macro.c:426
+#: macro.c:448
#, c-format
msgid "macro \"%s\" is not used"
msgstr "la macro « %s » n’est pas utilisée"
-#: macro.c:465 macro.c:723
+#: macro.c:487 macro.c:778
#, c-format
msgid "invalid built-in macro \"%s\""
msgstr "macro interne « %s » invalide"
-#: macro.c:472 macro.c:574
+#: macro.c:494 macro.c:596
#, c-format
msgid "macro \"%s\" might prevent reproducible builds"
msgstr "la macro « %s » pourrait empêcher les compilations reproductibles"
-#: macro.c:503
+#: macro.c:525
msgid "could not determine file timestamp"
msgstr "date de modification du fichier indéterminable"
-#: macro.c:620
+#: macro.c:610
msgid "could not determine date and time"
msgstr "date et heure indéterminable"
-#: macro.c:636
+#: macro.c:642
msgid "__COUNTER__ expanded inside directive with -fdirectives-only"
msgstr "Expansion de __COUNTER__ à l'intérieur d’une directive avec -fdirectives-only"
-#: macro.c:842
+#: macro.c:897
msgid "invalid string literal, ignoring final '\\'"
msgstr "chaîne invalide, le « \\ » final est ignoré"
-#: macro.c:904
+#: macro.c:959
#, c-format
msgid "pasting \"%s\" and \"%s\" does not give a valid preprocessing token"
msgstr "le collage de « %s » et de « %s » ne donne pas un élément lexical de pré-traitement valide"
-#: macro.c:1030
+#: macro.c:1085
msgid "ISO C++11 requires at least one argument for the \"...\" in a variadic macro"
msgstr "ISO C++11 requiert au moins un argument pour « ... » dans une macro à nombre variable d’arguments"
-#: macro.c:1034
+#: macro.c:1089
msgid "ISO C99 requires at least one argument for the \"...\" in a variadic macro"
msgstr "ISO C99 requiert au moins un argument pour « ... » dans une macro à nombre variable d’arguments"
-#: macro.c:1041
+#: macro.c:1096
#, c-format
msgid "macro \"%s\" requires %u arguments, but only %u given"
msgstr "la macro « %s » requiert %u arguments, mais seulement %u ont été passés"
-#: macro.c:1046
+#: macro.c:1101
#, c-format
msgid "macro \"%s\" passed %u arguments, but takes just %u"
msgstr "la macro « %s » a reçu %u arguments, mais elle n’en prend que %u"
-#: macro.c:1244 traditional.c:815
+#: macro.c:1299 traditional.c:822
#, c-format
msgid "unterminated argument list invoking macro \"%s\""
msgstr "liste d'arguments non terminée en invoquant la macro « %s »"
-#: macro.c:1386
+#: macro.c:1442
#, c-format
msgid "function-like macro \"%s\" must be used with arguments in traditional C"
msgstr "la macro « %s » ressemblant à une fonction doit être utilisée avec des arguments en C traditionnel"
-#: macro.c:2165
+#: macro.c:2220
#, c-format
msgid "invoking macro %s argument %d: empty macro arguments are undefined in ISO C++98"
msgstr "appel de la macro %s avec l'argument %d : les arguments de macro vides sont indéfinis en ISO C++98"
-#: macro.c:2173 macro.c:2182
+#: macro.c:2228 macro.c:2237
#, c-format
msgid "invoking macro %s argument %d: empty macro arguments are undefined in ISO C90"
msgstr "appel de la macro %s avec l'argument %d : les arguments de macro vides sont indéfinis en ISO C++90"
-#: macro.c:3141
+#: macro.c:3279
#, c-format
msgid "duplicate macro parameter \"%s\""
msgstr "paramètre de macro « %s » dupliqués"
-#: macro.c:3223
+#: macro.c:3361
#, c-format
msgid "expected parameter name, found \"%s\""
msgstr "nom de paramètre attendu, « %s » rencontré"
-#: macro.c:3224
+#: macro.c:3362
#, c-format
msgid "expected ',' or ')', found \"%s\""
msgstr "« , » ou « ) » attendue, « %s » rencontré"
-#: macro.c:3225
+#: macro.c:3363
msgid "expected parameter name before end of line"
msgstr "nom de paramètre attendu avant la fin de la ligne"
-#: macro.c:3226
+#: macro.c:3364
msgid "expected ')' before end of line"
msgstr "« ) » attendue avant la fin de la ligne"
-#: macro.c:3227
+#: macro.c:3365
msgid "expected ')' after \"...\""
msgstr "« ) » attendue après « ... »"
-#: macro.c:3284
+#: macro.c:3422
msgid "anonymous variadic macros were introduced in C++11"
msgstr "les macros anonymes à nombre variable d’arguments ont été introduites avec le C++11"
-#: macro.c:3285 macro.c:3289
+#: macro.c:3423 macro.c:3427
msgid "anonymous variadic macros were introduced in C99"
msgstr "les macros anonymes à nombre variable d’arguments ont été introduites avec le C99"
-#: macro.c:3295
+#: macro.c:3433
msgid "ISO C++ does not permit named variadic macros"
msgstr "ISO C++ ne permet pas les macros nommées à nombre variable d’arguments"
-#: macro.c:3296
+#: macro.c:3434
msgid "ISO C does not permit named variadic macros"
msgstr "ISO C ne permet pas les macros nommées à nombre variable d’arguments"
-#: macro.c:3342
+#: macro.c:3480
msgid "'##' cannot appear at either end of a macro expansion"
msgstr "« ## » ne peut apparaître à aucune des extrémités d’une expansion de macro"
-#: macro.c:3380
+#: macro.c:3518
msgid "ISO C++11 requires whitespace after the macro name"
msgstr "ISO C++11 requiert un blanc après le nom de la macro"
-#: macro.c:3381
+#: macro.c:3519
msgid "ISO C99 requires whitespace after the macro name"
msgstr "ISO C99 requiert un blanc après le nom de la macro"
-#: macro.c:3405
+#: macro.c:3543
msgid "missing whitespace after the macro name"
msgstr "espacement manquant après le nom de la macro"
-#: macro.c:3455
+#: macro.c:3593
msgid "'#' is not followed by a macro parameter"
msgstr "« # » n'est pas suivi d’un paramètre de macro"
-#: macro.c:3606
+#: macro.c:3749
#, c-format
msgid "\"%s\" redefined"
msgstr "« %s » redéfini"
-#: macro.c:3611
+#: macro.c:3754
msgid "this is the location of the previous definition"
msgstr "ceci est l'emplacement d’une précédente définition"
-#: macro.c:3715
+#: macro.c:3891
#, c-format
msgid "macro argument \"%s\" would be stringified in traditional C"
msgstr "l'argument de macro « %s » serait changé en chaine dans le C traditionnel"
@@ -1102,15 +1132,18 @@ msgstr "%s: non utilisé parce que « __COUNTER__ » est invalide"
msgid "while reading precompiled header"
msgstr "lors de la lecture d’un entête pré-compilée"
-#: traditional.c:884
+#: traditional.c:891
#, c-format
msgid "detected recursion whilst expanding macro \"%s\""
msgstr "récursion détectée lors de l'expansion de la macro « %s »"
-#: traditional.c:1107
+#: traditional.c:1114
msgid "syntax error in macro parameter list"
msgstr "erreur de syntaxe dans la liste des paramètres de macro"
+#~ msgid "binary constants are a GCC extension"
+#~ msgstr "les constantes binaires sont une extension GCC"
+
#~ msgid "\"__has_include__\" cannot be used as a macro name"
#~ msgstr "« __has_include__ » ne peut être utilisé comme nom de macro"
diff --git a/libcpp/po/id.po b/libcpp/po/id.po
index ebfda73..d1249c5 100644
--- a/libcpp/po/id.po
+++ b/libcpp/po/id.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: cpplib 4.5-b20100204\n"
"Report-Msgid-Bugs-To: https://gcc.gnu.org/bugs/\n"
-"POT-Creation-Date: 2020-02-07 22:33+0000\n"
+"POT-Creation-Date: 2021-02-05 21:38+0000\n"
"PO-Revision-Date: 2010-02-05 19:00+0700\n"
"Last-Translator: Arif E. Nugroho <arif_endro@yahoo.com>\n"
"Language-Team: Indonesian <translation-team-id@lists.sourceforge.net>\n"
@@ -17,158 +17,158 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"X-Bugs: Report translation errors to the Language-Team address.\n"
-#: charset.c:674
+#: charset.c:677
#, c-format
msgid "conversion from %s to %s not supported by iconv"
msgstr "konversi dari %s ke %s tidak didukung oleh iconv"
-#: charset.c:677
+#: charset.c:680
msgid "iconv_open"
msgstr "buka_iconv"
-#: charset.c:685
+#: charset.c:688
#, c-format
msgid "no iconv implementation, cannot convert from %s to %s"
msgstr "tidak ada implementasi iconv, tidak dapat mengubah dari %s ke %s"
-#: charset.c:781
+#: charset.c:784
#, c-format
msgid "character 0x%lx is not in the basic source character set\n"
msgstr "karakter 0x%lx tidak dalam sumber dasar set karaketer\n"
-#: charset.c:798 charset.c:1768
+#: charset.c:801 charset.c:1771
msgid "converting to execution character set"
msgstr "mengubah ke eksekusi set karakter"
-#: charset.c:804
+#: charset.c:807
#, c-format
msgid "character 0x%lx is not unibyte in execution character set"
msgstr "karakter 0x%lx bukan unibyte dalam eksekusi set karakter"
-#: charset.c:1054
+#: charset.c:1057
msgid "universal character names are only valid in C++ and C99"
msgstr "nama karakter universal hanya valid dalam C++ dan C99"
-#: charset.c:1058
+#: charset.c:1061
#, fuzzy
#| msgid "universal character names are only valid in C++ and C99"
msgid "C99's universal character names are incompatible with C90"
msgstr "nama karakter universal hanya valid dalam C++ dan C99"
-#: charset.c:1061
+#: charset.c:1064
#, c-format
msgid "the meaning of '\\%c' is different in traditional C"
msgstr "arti dari '\\%c' berbeda dalam tradisional C"
-#: charset.c:1070
+#: charset.c:1073
msgid "In _cpp_valid_ucn but not a UCN"
msgstr "Dalam _cpp_valid_ucn tetapi bukan sebuah UCN"
-#: charset.c:1103
+#: charset.c:1106
#, c-format
msgid "incomplete universal character name %.*s"
msgstr "nama karakter universal %.*s tidak lengkap"
-#: charset.c:1118
+#: charset.c:1121
#, c-format
msgid "%.*s is not a valid universal character"
msgstr "%.*s bukan sebuah karakter universal yang valid"
-#: charset.c:1128 lex.c:1335
+#: charset.c:1131 lex.c:1335
msgid "'$' in identifier or number"
msgstr "'$' dalam identifier atau angka"
-#: charset.c:1138
+#: charset.c:1141
#, c-format
msgid "universal character %.*s is not valid in an identifier"
msgstr "karakter universal %.*s tidak valid dalam sebuah pengidentifikasi"
-#: charset.c:1142
+#: charset.c:1145
#, c-format
msgid "universal character %.*s is not valid at the start of an identifier"
msgstr "karakter universal %.*s tidak valid di awal dari sebuah pengidentifikasi"
-#: charset.c:1149
+#: charset.c:1152
#, c-format
msgid "%.*s is outside the UCS codespace"
msgstr ""
-#: charset.c:1194 charset.c:2113
+#: charset.c:1197 charset.c:2116
msgid "converting UCN to source character set"
msgstr "mengubah UCN ke set karakter asal"
-#: charset.c:1201
+#: charset.c:1204
msgid "converting UCN to execution character set"
msgstr "mengubah UCN ke set karakter eksekusi"
-#: charset.c:1265
+#: charset.c:1268
#, fuzzy, c-format
#| msgid "universal character %.*s is not valid in an identifier"
msgid "extended character %.*s is not valid in an identifier"
msgstr "karakter universal %.*s tidak valid dalam sebuah pengidentifikasi"
-#: charset.c:1282
+#: charset.c:1285
#, fuzzy, c-format
#| msgid "universal character %.*s is not valid at the start of an identifier"
msgid "extended character %.*s is not valid at the start of an identifier"
msgstr "karakter universal %.*s tidak valid di awal dari sebuah pengidentifikasi"
-#: charset.c:1368
+#: charset.c:1371
msgid "the meaning of '\\x' is different in traditional C"
msgstr "arti dari '\\x' berbeda dalam tradisional C"
-#: charset.c:1393
+#: charset.c:1396
msgid "\\x used with no following hex digits"
msgstr "\\x digunakan dengan tidak mengikuti hex digits"
-#: charset.c:1400
+#: charset.c:1403
msgid "hex escape sequence out of range"
msgstr "hex escape sequence diluar dari jangkauan"
-#: charset.c:1452
+#: charset.c:1455
msgid "octal escape sequence out of range"
msgstr "oktal escape sequence diluar dari jangkauan"
-#: charset.c:1534
+#: charset.c:1537
msgid "the meaning of '\\a' is different in traditional C"
msgstr "arti dari '\\a' berbeda dalam tradisional C"
-#: charset.c:1541
+#: charset.c:1544
#, c-format
msgid "non-ISO-standard escape sequence, '\\%c'"
msgstr "bukan ISO standar escape sequence, '\\%c'"
-#: charset.c:1549
+#: charset.c:1552
#, c-format
msgid "unknown escape sequence: '\\%c'"
msgstr "escape sequence: '\\%c' tidak diketahui"
-#: charset.c:1557
+#: charset.c:1560
#, c-format
msgid "unknown escape sequence: '\\%s'"
msgstr "escape sequence: '\\%s' tidak diketahui"
-#: charset.c:1565
+#: charset.c:1568
msgid "converting escape sequence to execution character set"
msgstr "mengubah escape sequence ke set karakter eksekusi"
-#: charset.c:1705
+#: charset.c:1708
msgid "missing open quote"
msgstr ""
-#: charset.c:1923 charset.c:2002
+#: charset.c:1926 charset.c:2005
msgid "character constant too long for its type"
msgstr "konstanta karakter terlalu panjang untuk tipenya"
-#: charset.c:1926
+#: charset.c:1929
msgid "multi-character character constant"
msgstr "konstanta karakter multi-karakter"
-#: charset.c:2042
+#: charset.c:2045
msgid "empty character constant"
msgstr "konstanta karakter kosong"
-#: charset.c:2160
+#: charset.c:2163
#, c-format
msgid "failure to convert %s to %s"
msgstr "gagal untuk mengubah %s ke %s"
@@ -240,204 +240,200 @@ msgstr "nama makro harus berupa pengidentifikasi"
msgid "undefining \"%s\""
msgstr "tidak terdefinisi \"%s\""
-#: directives.c:724
+#: directives.c:725
msgid "missing terminating > character"
msgstr "hilang karakter pengakhir >"
-#: directives.c:783
+#: directives.c:784
#, c-format
msgid "#%s expects \"FILENAME\" or <FILENAME>"
msgstr "#%s diduga \"NAMA BERKAS\" atau <NAMA BERKAS>"
-#: directives.c:829
+#: directives.c:830
#, c-format
msgid "empty filename in #%s"
msgstr "nama berkas kosong dalam #%s"
-#: directives.c:838
+#: directives.c:839
#, c-format
msgid "#include nested depth %u exceeds maximum of %u (use -fmax-include-depth=DEPTH to increase the maximum)"
msgstr ""
-#: directives.c:883
+#: directives.c:884
msgid "#include_next in primary source file"
msgstr "#include_next dalam berkas kode program utama"
-#: directives.c:909
+#: directives.c:910
#, c-format
msgid "invalid flag \"%s\" in line directive"
msgstr "tanda \"%s\" tidak valid dalam baris direktif"
-#: directives.c:969
+#: directives.c:970
msgid "unexpected end of file after #line"
msgstr "tidak terduga akhir dari berkas setelah #line"
-#: directives.c:972
+#: directives.c:973
#, c-format
msgid "\"%s\" after #line is not a positive integer"
msgstr "\"%s\" setelah #line bukan sebuah integer positif"
-#: directives.c:978 directives.c:980
+#: directives.c:979 directives.c:981
msgid "line number out of range"
msgstr "nomor baris diluar dari jangkauan"
-#: directives.c:993 directives.c:1074
+#: directives.c:994 directives.c:1075
#, c-format
msgid "\"%s\" is not a valid filename"
msgstr "\"%s\" bukan sebuah nama berkas yang valid"
-#: directives.c:1034
+#: directives.c:1035
#, c-format
msgid "\"%s\" after # is not a positive integer"
msgstr "\"%s\" setelah # bukan sebuah integer positif"
-#: directives.c:1101
+#: directives.c:1102
#, c-format
msgid "file \"%s\" linemarker ignored due to incorrect nesting"
msgstr ""
-#: directives.c:1162 directives.c:1164 directives.c:1166 directives.c:1754
+#: directives.c:1180 directives.c:1182 directives.c:1184 directives.c:1772
#, c-format
msgid "%s"
msgstr "%s"
-#: directives.c:1190
+#: directives.c:1208
#, c-format
msgid "invalid #%s directive"
msgstr "direktif #%s tidak valid"
-#: directives.c:1253
+#: directives.c:1271
#, c-format
msgid "registering pragmas in namespace \"%s\" with mismatched name expansion"
msgstr "mendaftarkan pragma dalam ruang-nama \"%s\" dengan ekspansi nama yang tidak cocok"
-#: directives.c:1262
+#: directives.c:1280
#, c-format
msgid "registering pragma \"%s\" with name expansion and no namespace"
msgstr "mendaftarkan pragma \"%s\" dengan ekspansi nama dan tidak ada ruang-nama"
-#: directives.c:1280
+#: directives.c:1298
#, c-format
msgid "registering \"%s\" as both a pragma and a pragma namespace"
msgstr "mendaftarkan \"%s\" sebagai baik sebuah pragma dan sebuah ruang-nama"
-#: directives.c:1283
+#: directives.c:1301
#, c-format
msgid "#pragma %s %s is already registered"
msgstr "#pragma %s %s telah terdaftar"
-#: directives.c:1286
+#: directives.c:1304
#, c-format
msgid "#pragma %s is already registered"
msgstr "#pragma %s telah terdaftar"
-#: directives.c:1316
+#: directives.c:1334
msgid "registering pragma with NULL handler"
msgstr "mendaftarkan pragma dengan penanganan KOSONG"
-#: directives.c:1533
+#: directives.c:1551
msgid "#pragma once in main file"
msgstr "#pragma sekali dalam berkas utama"
-#: directives.c:1556
+#: directives.c:1574
msgid "invalid #pragma push_macro directive"
msgstr "#pragma push_macro direktif tidak valid"
-#: directives.c:1613
+#: directives.c:1631
msgid "invalid #pragma pop_macro directive"
msgstr "#pragma pop_macro direktif tidak valid"
-#: directives.c:1668
+#: directives.c:1686
msgid "invalid #pragma GCC poison directive"
msgstr "#pragma GCC tidak valid merusak direktif"
-#: directives.c:1677
+#: directives.c:1695
#, c-format
msgid "poisoning existing macro \"%s\""
msgstr "merusak makro \"%s\" yang sudah ada"
-#: directives.c:1696
+#: directives.c:1714
msgid "#pragma system_header ignored outside include file"
msgstr "#pragma system_header diabaikan diluar berkas include"
-#: directives.c:1721
+#: directives.c:1739
#, c-format
msgid "cannot find source file %s"
msgstr "tidak dapat menemukan berkas sumber %s"
-#: directives.c:1725
+#: directives.c:1743
#, c-format
msgid "current file is older than %s"
msgstr "berkas ini lebih lama daripada %s"
-#: directives.c:1749
+#: directives.c:1767
#, fuzzy, c-format
#| msgid "invalid #pragma GCC poison directive"
msgid "invalid \"#pragma GCC %s\" directive"
msgstr "#pragma GCC tidak valid merusak direktif"
-#: directives.c:1950
+#: directives.c:1968
msgid "_Pragma takes a parenthesized string literal"
msgstr "_Pragma mengambil sebuah string literal tanda kurung"
-#: directives.c:2033
+#: directives.c:2051
msgid "#else without #if"
msgstr "#else tanpa #if"
-#: directives.c:2038
+#: directives.c:2056
msgid "#else after #else"
msgstr "#else setelah #else"
-#: directives.c:2040 directives.c:2073
+#: directives.c:2058 directives.c:2091
msgid "the conditional began here"
msgstr "kondisional berawal disini"
-#: directives.c:2066
+#: directives.c:2084
msgid "#elif without #if"
msgstr "#elif tanpa #if"
-#: directives.c:2071
+#: directives.c:2089
msgid "#elif after #else"
msgstr "#elif setelah #else"
-#: directives.c:2102
+#: directives.c:2120
msgid "#endif without #if"
msgstr "#endif tanpa #if"
-#: directives.c:2178
+#: directives.c:2196
msgid "missing '(' after predicate"
msgstr "hilang '(' setelah predikat"
-#: directives.c:2196
+#: directives.c:2214
msgid "missing ')' to complete answer"
msgstr "hilang ')' untuk melengkapi jawaban"
-#: directives.c:2208
+#: directives.c:2226
msgid "predicate's answer is empty"
msgstr "jawaban predikat kosong"
-#: directives.c:2238
+#: directives.c:2256
msgid "assertion without predicate"
msgstr "assertion tanpa predikat"
-#: directives.c:2241
+#: directives.c:2259
msgid "predicate must be an identifier"
msgstr "predikat harus berupa sebuah pengidentifikasi"
-#: directives.c:2323
+#: directives.c:2341
#, c-format
msgid "\"%s\" re-asserted"
msgstr "\"%s\" re-asserted"
-#: directives.c:2604
+#: directives.c:2659
#, c-format
msgid "unterminated #%s"
msgstr "tidak terakhiri #%s"
-#: directives-only.c:221 lex.c:2879 traditional.c:174
-msgid "unterminated comment"
-msgstr "komentar tidak terakhiri"
-
#: errors.c:291
#, c-format
msgid "%s: %s"
@@ -447,228 +443,248 @@ msgstr "%s: %s"
msgid "stdout"
msgstr "stdout"
-#: expr.c:626 expr.c:743
+#: expr.c:636 expr.c:753
msgid "fixed-point constants are a GCC extension"
msgstr "konstanta titik-tetap adalah sebuah ekstensi GCC"
-#: expr.c:651
+#: expr.c:661
msgid "invalid prefix \"0b\" for floating constant"
msgstr "awalan \"0b\" tidak valid untuk konstanta pecahan"
-#: expr.c:664
+#: expr.c:674
#, fuzzy
#| msgid "use of C99 hexadecimal floating constant"
msgid "use of C++17 hexadecimal floating constant"
msgstr "penggunaan dari konstanta pecahan heksa desimal C99"
-#: expr.c:667
+#: expr.c:677
msgid "use of C99 hexadecimal floating constant"
msgstr "penggunaan dari konstanta pecahan heksa desimal C99"
-#: expr.c:711
+#: expr.c:721
#, c-format
msgid "invalid suffix \"%.*s\" on floating constant"
msgstr "akhiran \"%.*s\" tidak valid dalam konstanta pecahan"
-#: expr.c:722 expr.c:789
+#: expr.c:732 expr.c:799
#, c-format
msgid "traditional C rejects the \"%.*s\" suffix"
msgstr "dalam tradisi C menolak akhiran \"%.*s\""
-#: expr.c:730
+#: expr.c:740
msgid "suffix for double constant is a GCC extension"
msgstr "akhiran untuk konstanta ganda adalah sebuah ekstensi GCC"
-#: expr.c:736
+#: expr.c:746
#, c-format
msgid "invalid suffix \"%.*s\" with hexadecimal floating constant"
msgstr "akhiran \"%.*s\" tidak valid dengan konstanta pecahan heksa desimal"
-#: expr.c:749 expr.c:753
+#: expr.c:759 expr.c:763
#, fuzzy
#| msgid "decimal float constants are a GCC extension"
msgid "decimal float constants are a C2X feature"
msgstr "konstanta pecahan desimal adalah sebuah ekstensi GCC"
-#: expr.c:772
+#: expr.c:782
#, c-format
msgid "invalid suffix \"%.*s\" on integer constant"
msgstr "akhiran \"%.*s\" tidak valid dalam konstanta integer"
-#: expr.c:797
+#: expr.c:807
#, fuzzy
#| msgid "use of C++0x long long integer constant"
msgid "use of C++11 long long integer constant"
msgstr "penggunaan dari konstanta integer long long C++0x"
-#: expr.c:798
+#: expr.c:808
#, fuzzy
#| msgid "use of C++0x long long integer constant"
msgid "use of C99 long long integer constant"
msgstr "penggunaan dari konstanta integer long long C++0x"
-#: expr.c:814
+#: expr.c:822
+#, fuzzy
+#| msgid "use of C++0x long long integer constant"
+msgid "use of C++23 %<size_t%> integer constant"
+msgstr "penggunaan dari konstanta integer long long C++0x"
+
+#: expr.c:823
+#, fuzzy
+#| msgid "use of C++0x long long integer constant"
+msgid "use of C++23 %<make_signed_t<size_t>%> integer constant"
+msgstr "penggunaan dari konstanta integer long long C++0x"
+
+#: expr.c:834
msgid "imaginary constants are a GCC extension"
msgstr "konstanta imaginari adalah sebuah ekstensi GCC"
-#: expr.c:820
+#: expr.c:841
#, fuzzy
#| msgid "binary constants are a GCC extension"
msgid "binary constants are a C++14 feature or GCC extension"
msgstr "konstanta binari adalah sebuah ekstensi GCC"
-#: expr.c:822
-msgid "binary constants are a GCC extension"
+#: expr.c:843
+#, fuzzy
+#| msgid "binary constants are a GCC extension"
+msgid "binary constants are a C2X feature or GCC extension"
msgstr "konstanta binari adalah sebuah ekstensi GCC"
-#: expr.c:917
+#: expr.c:848
+#, fuzzy
+#| msgid "binary constants are a GCC extension"
+msgid "binary constants are a C2X feature"
+msgstr "konstanta binari adalah sebuah ekstensi GCC"
+
+#: expr.c:944
msgid "integer constant is too large for its type"
msgstr "konstanta integer terlalu besar untuk tipenya"
-#: expr.c:948
+#: expr.c:975
msgid "integer constant is so large that it is unsigned"
msgstr "konstanta integer terlalu besar yang itu unsigned"
-#: expr.c:1043
+#: expr.c:1070
msgid "missing ')' after \"defined\""
msgstr "hilang ')' setelah \"defined\""
-#: expr.c:1050
+#: expr.c:1077
msgid "operator \"defined\" requires an identifier"
msgstr "operator \"defined\" membutuhkan sebuah pengidentifikasi"
-#: expr.c:1058
+#: expr.c:1085
#, c-format
msgid "(\"%s\" is an alternative token for \"%s\" in C++)"
msgstr "(\"%s\" adalah sebuah tanda alternatif untuk \"%s\" dalam C++)"
-#: expr.c:1070
+#: expr.c:1098
msgid "this use of \"defined\" may not be portable"
msgstr "penggunaan ini dari \"defined\" mungkin tidak portabel"
-#: expr.c:1113
+#: expr.c:1143
#, fuzzy
#| msgid "integer overflow in preprocessor expression"
msgid "user-defined literal in preprocessor expression"
msgstr "integer overflow dalam ekspresi preprosesor"
-#: expr.c:1118
+#: expr.c:1148
msgid "floating constant in preprocessor expression"
msgstr "konstanta pecahan dalam ekspresi preprosesor"
-#: expr.c:1124
+#: expr.c:1154
msgid "imaginary number in preprocessor expression"
msgstr "angka imaginari dalam ekspresi preprosesor"
-#: expr.c:1173
+#: expr.c:1203
#, fuzzy, c-format
#| msgid "\"%s\" is not defined"
msgid "\"%s\" is not defined, evaluates to 0"
msgstr "\"%s\" tidak didefinisikan"
-#: expr.c:1186
+#: expr.c:1216
msgid "assertions are a GCC extension"
msgstr "assertions adalah sebuah ekstensi GCC"
-#: expr.c:1189
+#: expr.c:1219
msgid "assertions are a deprecated extension"
msgstr "assertions adalah sebuah ekstensi yang sudah ditinggalkan"
-#: expr.c:1435
+#: expr.c:1465
#, c-format
msgid "unbalanced stack in %s"
msgstr "stack dalam %s tidak seimbang"
-#: expr.c:1455
+#: expr.c:1485
#, c-format
msgid "impossible operator '%u'"
msgstr "operator '%u' tidak mungkin"
-#: expr.c:1556
+#: expr.c:1586
msgid "missing ')' in expression"
msgstr "hilang ')' dalam ekspresi"
-#: expr.c:1585
+#: expr.c:1615
msgid "'?' without following ':'"
msgstr "'?' tanpa diikuti ':'"
-#: expr.c:1595
+#: expr.c:1625
msgid "integer overflow in preprocessor expression"
msgstr "integer overflow dalam ekspresi preprosesor"
-#: expr.c:1600
+#: expr.c:1630
msgid "missing '(' in expression"
msgstr "hilang '(' dalam ekspresi"
-#: expr.c:1632
+#: expr.c:1662
#, c-format
msgid "the left operand of \"%s\" changes sign when promoted"
msgstr "operan kiri dari \"%s\" berubah tanda ketika dipromosikan"
-#: expr.c:1637
+#: expr.c:1667
#, c-format
msgid "the right operand of \"%s\" changes sign when promoted"
msgstr "operan kanan dari \"%s\" berubah tanda ketika dipromosikan"
-#: expr.c:1896
+#: expr.c:1926
msgid "traditional C rejects the unary plus operator"
msgstr "tradisional C menolak operator unary plus"
-#: expr.c:1994
+#: expr.c:2024
msgid "comma operator in operand of #if"
msgstr "operator koma dalam operator dari #if"
-#: expr.c:2130
+#: expr.c:2160
msgid "division by zero in #if"
msgstr "pembagian oleh nol dalam #if"
-#: files.c:576
+#: files.c:571
msgid "one or more PCH files were found, but they were invalid"
msgstr "satu atau lebih berkas PCH telah ditemukan, tetapi mereka tidak valid"
-#: files.c:580
+#: files.c:575
msgid "use -Winvalid-pch for more information"
msgstr "gunakan -Winvalid-pch untuk informasi lebih lanjut"
-#: files.c:1004
+#: files.c:1051
#, c-format
msgid "no include path in which to search for %s"
msgstr "tidak ada jalur include yang biasa digunakan untuk pencarian untuk %s"
-#: files.c:1439
+#: files.c:1546
msgid "Multiple include guards may be useful for:\n"
msgstr "Multiple include guards mungkin berguna untuk:\n"
-#: init.c:598
+#: init.c:614
msgid "cppchar_t must be an unsigned type"
msgstr "cppchar_t harus berupa sebuah tipe unsigned"
-#: init.c:602
+#: init.c:618
#, c-format
msgid "preprocessor arithmetic has maximum precision of %lu bits; target requires %lu bits"
msgstr "aritmetik preprosesor memiliki presisi maksimal dari %lu bits; target membutuhkan%lu bits"
-#: init.c:609
+#: init.c:625
msgid "CPP arithmetic must be at least as precise as a target int"
msgstr "aritmetik CPP harus paling tidak sama tepatnya dengan sebuah target int"
-#: init.c:612
+#: init.c:628
msgid "target char is less than 8 bits wide"
msgstr "target char lebih kecil dari 8 bits wide"
-#: init.c:616
+#: init.c:632
msgid "target wchar_t is narrower than target char"
msgstr "target wchar_t lebih kecil dari target char"
-#: init.c:620
+#: init.c:636
msgid "target int is narrower than target char"
msgstr "target int lebih kecil dari target char"
-#: init.c:625
+#: init.c:641
msgid "CPP half-integer narrower than CPP character"
msgstr "CPP integer-setengah lebih kecil dari karakter CPP"
-#: init.c:629
+#: init.c:645
#, c-format
msgid "CPP on this host cannot handle wide character constants over %lu bits, but the target requires %lu bits"
msgstr "CPP di host ini tidak dapat menangani konstanta karakter lebar diatas %lu bits, tetapi target membutuhkan %lu bits"
@@ -715,13 +731,13 @@ msgid "`%.*s' is not in NFC"
msgstr "`%.*s' tidak dalam NFC"
#: lex.c:1375
-msgid "__VA_OPT__ is not available until C++2a"
+msgid "__VA_OPT__ is not available until C++20"
msgstr ""
#: lex.c:1382
#, fuzzy
#| msgid "__VA_ARGS__ can only appear in the expansion of a C99 variadic macro"
-msgid "__VA_OPT__ can only appear in the expansion of a C++2a variadic macro"
+msgid "__VA_OPT__ can only appear in the expansion of a C++20 variadic macro"
msgstr "__VA_ARGS__ hanya dapat muncul dalam ekspansi dari sebuah variadik makro C99"
#: lex.c:1413 lex.c:1506
@@ -744,254 +760,279 @@ msgstr "__VA_ARGS__ hanya dapat muncul dalam ekspansi dari sebuah variadik makro
msgid "identifier \"%s\" is a special operator name in C++"
msgstr "pengidentifikasi \"%s\" adalah nama operator spesial dalam C++"
-#: lex.c:1837
+#: lex.c:1879
msgid "raw string delimiter longer than 16 characters"
msgstr "pembatas mentah string lebih panjang dari 16 karakter"
-#: lex.c:1841
+#: lex.c:1883
#, fuzzy
#| msgid "invalid character '%c' in raw string delimiter"
msgid "invalid new-line in raw string delimiter"
msgstr "karakter '%c' tidak valid dalam pembatas mentah string"
-#: lex.c:1845
+#: lex.c:1887 lex.c:4639
#, c-format
msgid "invalid character '%c' in raw string delimiter"
msgstr "karakter '%c' tidak valid dalam pembatas mentah string"
-#: lex.c:1894 lex.c:1916
+#: lex.c:1926 lex.c:1949
msgid "unterminated raw string"
msgstr "tidak terselesaikan raw string"
-#: lex.c:1936 lex.c:2065
+#: lex.c:1971 lex.c:2100
msgid "invalid suffix on literal; C++11 requires a space between literal and string macro"
msgstr ""
-#: lex.c:2048
+#: lex.c:2083
msgid "null character(s) preserved in literal"
msgstr "karakter kosong dijaga dalam literal"
-#: lex.c:2051
+#: lex.c:2086
#, c-format
msgid "missing terminating %c character"
msgstr "hilang karakter pengakhir %c"
-#: lex.c:2083
+#: lex.c:2118
msgid "C++11 requires a space between string literal and macro"
msgstr ""
-#: lex.c:2893 lex.c:2927
+#: lex.c:2711
+msgid "module control-line cannot be in included file"
+msgstr ""
+
+#: lex.c:2725
+#, c-format
+msgid "module control-line \"%s\" cannot be an object-like macro"
+msgstr ""
+
+#: lex.c:3099 lex.c:4472 traditional.c:174
+msgid "unterminated comment"
+msgstr "komentar tidak terakhiri"
+
+#: lex.c:3113 lex.c:3147
msgid "C++ style comments are not allowed in ISO C90"
msgstr "komentar gaya C++ tidak diijinkan dalam ISO C90"
-#: lex.c:2895 lex.c:2906 lex.c:2930
+#: lex.c:3115 lex.c:3126 lex.c:3150
msgid "(this will be reported only once per input file)"
msgstr "(ini hanya akan dilaporkan sekali setiap berkas masukan)"
-#: lex.c:2904
+#: lex.c:3124
#, fuzzy
#| msgid "C++ style comments are not allowed in ISO C90"
msgid "C++ style comments are incompatible with C90"
msgstr "komentar gaya C++ tidak diijinkan dalam ISO C90"
-#: lex.c:2936
+#: lex.c:3156
msgid "multi-line comment"
msgstr "komentar multi baris"
-#: lex.c:3330
+#: lex.c:3550
#, c-format
msgid "unspellable token %s"
msgstr "tanda %s tidak dapat disebutkan"
+#: lex.c:4627
+#, fuzzy, c-format
+#| msgid "raw string delimiter longer than 16 characters"
+msgid "raw string delimiter longer than %d characters"
+msgstr "pembatas mentah string lebih panjang dari 16 karakter"
+
+#: lex.c:4697
+#, fuzzy
+#| msgid "unterminated #%s"
+msgid "unterminated literal"
+msgstr "tidak terakhiri #%s"
+
#: macro.c:94
#, fuzzy
#| msgid "'##' cannot appear at either end of a macro expansion"
msgid "'##' cannot appear at either end of __VA_OPT__"
msgstr "'##' tidak dapat muncul baik diakhir dari sebuah ekspansi makro"
-#: macro.c:364
+#: macro.c:386
#, fuzzy, c-format
#| msgid "%s in preprocessing directive"
msgid "\"%s\" used outside of preprocessing directive"
msgstr "%s dalam direktif preprosesing"
-#: macro.c:374
+#: macro.c:396
#, fuzzy, c-format
#| msgid "missing '(' in expression"
msgid "missing '(' before \"%s\" operand"
msgstr "hilang '(' dalam ekspresi"
-#: macro.c:389
+#: macro.c:411
#, fuzzy, c-format
#| msgid "operator \"defined\" requires an identifier"
msgid "operator \"%s\" requires a header-name"
msgstr "operator \"defined\" membutuhkan sebuah pengidentifikasi"
-#: macro.c:406
+#: macro.c:428
#, fuzzy, c-format
#| msgid "missing ')' after \"defined\""
msgid "missing ')' after \"%s\" operand"
msgstr "hilang ')' setelah \"defined\""
-#: macro.c:426
+#: macro.c:448
#, c-format
msgid "macro \"%s\" is not used"
msgstr "makro \"%s\" tidak digunakan"
-#: macro.c:465 macro.c:723
+#: macro.c:487 macro.c:778
#, c-format
msgid "invalid built-in macro \"%s\""
msgstr "makro bawaan \"%s\" tidak valid"
-#: macro.c:472 macro.c:574
+#: macro.c:494 macro.c:596
#, c-format
msgid "macro \"%s\" might prevent reproducible builds"
msgstr ""
-#: macro.c:503
+#: macro.c:525
msgid "could not determine file timestamp"
msgstr "tidak dapat menentukan berkas timestamp"
-#: macro.c:620
+#: macro.c:610
msgid "could not determine date and time"
msgstr "tidak dapat menentukan tanggal dan waktu"
-#: macro.c:636
+#: macro.c:642
msgid "__COUNTER__ expanded inside directive with -fdirectives-only"
msgstr "__COUNTER__ diekspans didalam direktif dengan -fdirectives-only"
-#: macro.c:842
+#: macro.c:897
msgid "invalid string literal, ignoring final '\\'"
msgstr "string literal tidak valid, mengabaikan final '\\'"
-#: macro.c:904
+#: macro.c:959
#, c-format
msgid "pasting \"%s\" and \"%s\" does not give a valid preprocessing token"
msgstr "pasting \"%s\" dan \"%s\" tidak memberikan sebuah tanda preprosesing valid"
-#: macro.c:1030
+#: macro.c:1085
msgid "ISO C++11 requires at least one argument for the \"...\" in a variadic macro"
msgstr ""
-#: macro.c:1034
+#: macro.c:1089
#, fuzzy
#| msgid "ISO C99 requires rest arguments to be used"
msgid "ISO C99 requires at least one argument for the \"...\" in a variadic macro"
msgstr "ISO C99 membutuhkan argumen rest untuk digunakan"
-#: macro.c:1041
+#: macro.c:1096
#, c-format
msgid "macro \"%s\" requires %u arguments, but only %u given"
msgstr "makro \"%s\" membutuhkan %u argumen, tetapi hanya %u diberikan"
-#: macro.c:1046
+#: macro.c:1101
#, c-format
msgid "macro \"%s\" passed %u arguments, but takes just %u"
msgstr "makro \"%s\" melewatkan %u argumen, tetapi hanya mengambil %u"
-#: macro.c:1244 traditional.c:815
+#: macro.c:1299 traditional.c:822
#, c-format
msgid "unterminated argument list invoking macro \"%s\""
msgstr "daftar argumen tidak terselesaikan memanggil makro \"%s\""
-#: macro.c:1386
+#: macro.c:1442
#, c-format
msgid "function-like macro \"%s\" must be used with arguments in traditional C"
msgstr "makro \"%s\" seperti fungsi harus digunakan dengan argumen dalam tradisional C"
-#: macro.c:2165
+#: macro.c:2220
#, fuzzy, c-format
#| msgid "invoking macro %s argument %d: empty macro arguments are undefined in ISO C90 and ISO C++98"
msgid "invoking macro %s argument %d: empty macro arguments are undefined in ISO C++98"
msgstr "memanggil makro %s argumen %d: argumen makro kosong tidak didefinisikan dalam ISO C90 dan ISO C++98"
-#: macro.c:2173 macro.c:2182
+#: macro.c:2228 macro.c:2237
#, fuzzy, c-format
#| msgid "invoking macro %s argument %d: empty macro arguments are undefined in ISO C90 and ISO C++98"
msgid "invoking macro %s argument %d: empty macro arguments are undefined in ISO C90"
msgstr "memanggil makro %s argumen %d: argumen makro kosong tidak didefinisikan dalam ISO C90 dan ISO C++98"
-#: macro.c:3141
+#: macro.c:3279
#, c-format
msgid "duplicate macro parameter \"%s\""
msgstr "duplikasi parameter makro \"%s\""
-#: macro.c:3223
+#: macro.c:3361
#, c-format
msgid "expected parameter name, found \"%s\""
msgstr ""
-#: macro.c:3224
+#: macro.c:3362
#, c-format
msgid "expected ',' or ')', found \"%s\""
msgstr ""
-#: macro.c:3225
+#: macro.c:3363
msgid "expected parameter name before end of line"
msgstr ""
-#: macro.c:3226
+#: macro.c:3364
#, fuzzy
#| msgid "unexpected end of file after #line"
msgid "expected ')' before end of line"
msgstr "tidak terduga akhir dari berkas setelah #line"
-#: macro.c:3227
+#: macro.c:3365
msgid "expected ')' after \"...\""
msgstr ""
-#: macro.c:3284
+#: macro.c:3422
#, fuzzy
#| msgid "anonymous variadic macros were introduced in C99"
msgid "anonymous variadic macros were introduced in C++11"
msgstr "anonymous variadik makro diperkenalkan dalam C99"
-#: macro.c:3285 macro.c:3289
+#: macro.c:3423 macro.c:3427
msgid "anonymous variadic macros were introduced in C99"
msgstr "anonymous variadik makro diperkenalkan dalam C99"
-#: macro.c:3295
+#: macro.c:3433
#, fuzzy
#| msgid "ISO C does not permit named variadic macros"
msgid "ISO C++ does not permit named variadic macros"
msgstr "ISO C tidak mengijinkan makro variadik bernama"
-#: macro.c:3296
+#: macro.c:3434
msgid "ISO C does not permit named variadic macros"
msgstr "ISO C tidak mengijinkan makro variadik bernama"
-#: macro.c:3342
+#: macro.c:3480
msgid "'##' cannot appear at either end of a macro expansion"
msgstr "'##' tidak dapat muncul baik diakhir dari sebuah ekspansi makro"
-#: macro.c:3380
+#: macro.c:3518
#, fuzzy
#| msgid "ISO C99 requires whitespace after the macro name"
msgid "ISO C++11 requires whitespace after the macro name"
msgstr "ISO C99 membutuhkan whitespace setelah nama makro"
-#: macro.c:3381
+#: macro.c:3519
msgid "ISO C99 requires whitespace after the macro name"
msgstr "ISO C99 membutuhkan whitespace setelah nama makro"
-#: macro.c:3405
+#: macro.c:3543
msgid "missing whitespace after the macro name"
msgstr "kurang spasi setelah nama makro"
-#: macro.c:3455
+#: macro.c:3593
msgid "'#' is not followed by a macro parameter"
msgstr "'#' tidak diikuti dengan sebuah parameter makro"
-#: macro.c:3606
+#: macro.c:3749
#, c-format
msgid "\"%s\" redefined"
msgstr "\"%s\" redefinisi"
-#: macro.c:3611
+#: macro.c:3754
msgid "this is the location of the previous definition"
msgstr "ini adalah lokasi dari definisi sebelumnya"
-#: macro.c:3715
+#: macro.c:3891
#, c-format
msgid "macro argument \"%s\" would be stringified in traditional C"
msgstr "argumen makro \"%s\" akan stringified dalam tradisional C"
@@ -1029,12 +1070,12 @@ msgstr "%s: tidak digunakan karena `__COUNTER__' tidak valid"
msgid "while reading precompiled header"
msgstr "ketika membaca precompiled header"
-#: traditional.c:884
+#: traditional.c:891
#, c-format
msgid "detected recursion whilst expanding macro \"%s\""
msgstr "terdeteksi rekursi ketika mengekspan makro \"%s\""
-#: traditional.c:1107
+#: traditional.c:1114
msgid "syntax error in macro parameter list"
msgstr "sintaks erro dalam daftar parameter makro"
diff --git a/libcpp/po/ja.po b/libcpp/po/ja.po
index 5b2f617..63b81c9 100644
--- a/libcpp/po/ja.po
+++ b/libcpp/po/ja.po
@@ -10,7 +10,7 @@ msgid ""
msgstr ""
"Project-Id-Version: cpplib 4.9-b20140202\n"
"Report-Msgid-Bugs-To: https://gcc.gnu.org/bugs/\n"
-"POT-Creation-Date: 2020-02-07 22:33+0000\n"
+"POT-Creation-Date: 2021-02-05 21:38+0000\n"
"PO-Revision-Date: 2014-11-07 08:19+0000\n"
"Last-Translator: Yasuaki Taniguchi <yasuakit@gmail.com>\n"
"Language-Team: Japanese <translation-team-ja@lists.sourceforge.net>\n"
@@ -21,158 +21,158 @@ msgstr ""
"X-Bugs: Report translation errors to the Language-Team address.\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: charset.c:674
+#: charset.c:677
#, c-format
msgid "conversion from %s to %s not supported by iconv"
msgstr "%s から %s への変換は iconv によってサポートされていません"
-#: charset.c:677
+#: charset.c:680
msgid "iconv_open"
msgstr "iconv_open"
-#: charset.c:685
+#: charset.c:688
#, c-format
msgid "no iconv implementation, cannot convert from %s to %s"
msgstr "iconv 実装がありません。 %s から %s へ変換できません"
-#: charset.c:781
+#: charset.c:784
#, c-format
msgid "character 0x%lx is not in the basic source character set\n"
msgstr "文字 0x%lx は基本ソース文字集合内にありません\n"
-#: charset.c:798 charset.c:1768
+#: charset.c:801 charset.c:1771
msgid "converting to execution character set"
msgstr "実行時文字集合を変換しています"
-#: charset.c:804
+#: charset.c:807
#, c-format
msgid "character 0x%lx is not unibyte in execution character set"
msgstr "文字 0x%lx は実行時文字集合では単一バイトではありません"
-#: charset.c:1054
+#: charset.c:1057
msgid "universal character names are only valid in C++ and C99"
msgstr "ユニバーサル文字名は C++ および C99 内でのみ有効です"
-#: charset.c:1058
+#: charset.c:1061
#, fuzzy
#| msgid "universal character names are only valid in C++ and C99"
msgid "C99's universal character names are incompatible with C90"
msgstr "ユニバーサル文字名は C++ および C99 内でのみ有効です"
-#: charset.c:1061
+#: charset.c:1064
#, c-format
msgid "the meaning of '\\%c' is different in traditional C"
msgstr "'\\%c' の意味は古い (traditional) C では異なります"
-#: charset.c:1070
+#: charset.c:1073
msgid "In _cpp_valid_ucn but not a UCN"
msgstr "_cpp_valid_ucn の中ですが UCN ではありません"
-#: charset.c:1103
+#: charset.c:1106
#, c-format
msgid "incomplete universal character name %.*s"
msgstr "互換性のないユニバーサル文字名 %.*s です"
-#: charset.c:1118
+#: charset.c:1121
#, c-format
msgid "%.*s is not a valid universal character"
msgstr "%.*s は有効なユニバーサル文字ではありません"
-#: charset.c:1128 lex.c:1335
+#: charset.c:1131 lex.c:1335
msgid "'$' in identifier or number"
msgstr "識別子または数字の中に '$' があります"
-#: charset.c:1138
+#: charset.c:1141
#, c-format
msgid "universal character %.*s is not valid in an identifier"
msgstr "ユニバーサル文字 %.*s は識別の中では有効ではありません"
-#: charset.c:1142
+#: charset.c:1145
#, c-format
msgid "universal character %.*s is not valid at the start of an identifier"
msgstr "ユニバーサル文字 %.*s は識別子の最初の文字として有効ではありません"
-#: charset.c:1149
+#: charset.c:1152
#, c-format
msgid "%.*s is outside the UCS codespace"
msgstr ""
-#: charset.c:1194 charset.c:2113
+#: charset.c:1197 charset.c:2116
msgid "converting UCN to source character set"
msgstr "UCN をソースの文字集合に変換しています"
-#: charset.c:1201
+#: charset.c:1204
msgid "converting UCN to execution character set"
msgstr "UCN を実行時文字集合に変換しています"
-#: charset.c:1265
+#: charset.c:1268
#, fuzzy, c-format
#| msgid "universal character %.*s is not valid in an identifier"
msgid "extended character %.*s is not valid in an identifier"
msgstr "ユニバーサル文字 %.*s は識別の中では有効ではありません"
-#: charset.c:1282
+#: charset.c:1285
#, fuzzy, c-format
#| msgid "universal character %.*s is not valid at the start of an identifier"
msgid "extended character %.*s is not valid at the start of an identifier"
msgstr "ユニバーサル文字 %.*s は識別子の最初の文字として有効ではありません"
-#: charset.c:1368
+#: charset.c:1371
msgid "the meaning of '\\x' is different in traditional C"
msgstr "'\\x' の意味は古い (traditional) C では異なります"
-#: charset.c:1393
+#: charset.c:1396
msgid "\\x used with no following hex digits"
msgstr "\\x が使用されましたが、それに続く十六進数がありません"
-#: charset.c:1400
+#: charset.c:1403
msgid "hex escape sequence out of range"
msgstr "十六進エスケープシーケンスが範囲外です"
-#: charset.c:1452
+#: charset.c:1455
msgid "octal escape sequence out of range"
msgstr "八進エスケープシーケンスが範囲外です"
-#: charset.c:1534
+#: charset.c:1537
msgid "the meaning of '\\a' is different in traditional C"
msgstr "'\\a' の意味は古い (traditional) C では異なります"
-#: charset.c:1541
+#: charset.c:1544
#, c-format
msgid "non-ISO-standard escape sequence, '\\%c'"
msgstr "非 ISO 標準のエスケープシーケンス, '\\%c'"
-#: charset.c:1549
+#: charset.c:1552
#, c-format
msgid "unknown escape sequence: '\\%c'"
msgstr "不明なエスケープシーケンス: '\\%c'"
-#: charset.c:1557
+#: charset.c:1560
#, c-format
msgid "unknown escape sequence: '\\%s'"
msgstr "不明なエスケープシーケンス: '\\%s'"
-#: charset.c:1565
+#: charset.c:1568
msgid "converting escape sequence to execution character set"
msgstr "エスケープシーケンスを実行時文字集合に変換しています"
-#: charset.c:1705
+#: charset.c:1708
msgid "missing open quote"
msgstr ""
-#: charset.c:1923 charset.c:2002
+#: charset.c:1926 charset.c:2005
msgid "character constant too long for its type"
msgstr "文字定数が型に対して長すぎます"
-#: charset.c:1926
+#: charset.c:1929
msgid "multi-character character constant"
msgstr "複数文字からなる文字定数"
-#: charset.c:2042
+#: charset.c:2045
msgid "empty character constant"
msgstr "空の文字定数"
-#: charset.c:2160
+#: charset.c:2163
#, c-format
msgid "failure to convert %s to %s"
msgstr "%s から %s への変換に失敗しました"
@@ -244,203 +244,199 @@ msgstr "マクロ名は識別子でなくてはいけません"
msgid "undefining \"%s\""
msgstr "\"%s\" を未定義状態にしています"
-#: directives.c:724
+#: directives.c:725
msgid "missing terminating > character"
msgstr "終端する > 文字がありません"
-#: directives.c:783
+#: directives.c:784
#, c-format
msgid "#%s expects \"FILENAME\" or <FILENAME>"
msgstr "#%s は \"FILENAME\" または <FILENAME> が必要です"
-#: directives.c:829
+#: directives.c:830
#, c-format
msgid "empty filename in #%s"
msgstr "#%s 内のファイル名が空です"
-#: directives.c:838
+#: directives.c:839
#, c-format
msgid "#include nested depth %u exceeds maximum of %u (use -fmax-include-depth=DEPTH to increase the maximum)"
msgstr ""
-#: directives.c:883
+#: directives.c:884
msgid "#include_next in primary source file"
msgstr "#include_next が主のソースファイルにあります"
-#: directives.c:909
+#: directives.c:910
#, c-format
msgid "invalid flag \"%s\" in line directive"
msgstr "\"%s\" は line 指示では無効なフラグです"
-#: directives.c:969
+#: directives.c:970
msgid "unexpected end of file after #line"
msgstr "#line 後に予期しないファイル終端 (EOF) です"
-#: directives.c:972
+#: directives.c:973
#, c-format
msgid "\"%s\" after #line is not a positive integer"
msgstr "#line の後にある \"%s\" が正の整数ではありません"
-#: directives.c:978 directives.c:980
+#: directives.c:979 directives.c:981
msgid "line number out of range"
msgstr "行番号が範囲外です"
-#: directives.c:993 directives.c:1074
+#: directives.c:994 directives.c:1075
#, c-format
msgid "\"%s\" is not a valid filename"
msgstr "\"%s\" は有効なファイル名ではありません"
-#: directives.c:1034
+#: directives.c:1035
#, c-format
msgid "\"%s\" after # is not a positive integer"
msgstr "# の後にある \"%s\" が正の整数ではありません"
-#: directives.c:1101
+#: directives.c:1102
#, c-format
msgid "file \"%s\" linemarker ignored due to incorrect nesting"
msgstr ""
-#: directives.c:1162 directives.c:1164 directives.c:1166 directives.c:1754
+#: directives.c:1180 directives.c:1182 directives.c:1184 directives.c:1772
#, c-format
msgid "%s"
msgstr "%s"
-#: directives.c:1190
+#: directives.c:1208
#, c-format
msgid "invalid #%s directive"
msgstr "無効な #%s 指示です"
-#: directives.c:1253
+#: directives.c:1271
#, c-format
msgid "registering pragmas in namespace \"%s\" with mismatched name expansion"
msgstr "名前空間 \"%s\" 内に pragma を一致しない名前展開で登録しています"
-#: directives.c:1262
+#: directives.c:1280
#, c-format
msgid "registering pragma \"%s\" with name expansion and no namespace"
msgstr "pragma \"%s\" を名前展開有りおよび名前空間無しで登録しています"
-#: directives.c:1280
+#: directives.c:1298
#, c-format
msgid "registering \"%s\" as both a pragma and a pragma namespace"
msgstr "\"%s\" を pragma および pragma 名前空間の両方として登録しています"
-#: directives.c:1283
+#: directives.c:1301
#, c-format
msgid "#pragma %s %s is already registered"
msgstr "#pragma %s %s は既に登録されています"
-#: directives.c:1286
+#: directives.c:1304
#, c-format
msgid "#pragma %s is already registered"
msgstr "#pragma %s は既に登録されています"
-#: directives.c:1316
+#: directives.c:1334
msgid "registering pragma with NULL handler"
msgstr "NULL ハンドラで pragma を登録しています"
-#: directives.c:1533
+#: directives.c:1551
msgid "#pragma once in main file"
msgstr "#pragma once がメインファイルにあります"
-#: directives.c:1556
+#: directives.c:1574
msgid "invalid #pragma push_macro directive"
msgstr "無効な #pragma push_macro 指示です"
-#: directives.c:1613
+#: directives.c:1631
msgid "invalid #pragma pop_macro directive"
msgstr "無効な #pragma pop_macro 指示です"
-#: directives.c:1668
+#: directives.c:1686
msgid "invalid #pragma GCC poison directive"
msgstr "#pragma GCC 汚染ディレクティヴが無効です"
-#: directives.c:1677
+#: directives.c:1695
#, c-format
msgid "poisoning existing macro \"%s\""
msgstr "既存のマクロ \"%s' を汚染します"
-#: directives.c:1696
+#: directives.c:1714
msgid "#pragma system_header ignored outside include file"
msgstr "include ファイル外の #pragma system_header は無視されました"
-#: directives.c:1721
+#: directives.c:1739
#, c-format
msgid "cannot find source file %s"
msgstr "ソースファイル %s が見つかりません"
-#: directives.c:1725
+#: directives.c:1743
#, c-format
msgid "current file is older than %s"
msgstr "現在のファイルは %s より古いです"
-#: directives.c:1749
+#: directives.c:1767
#, c-format
msgid "invalid \"#pragma GCC %s\" directive"
msgstr "#pragma GCC %s ディレクティヴが無効です"
-#: directives.c:1950
+#: directives.c:1968
msgid "_Pragma takes a parenthesized string literal"
msgstr "_Pramga が括弧で囲まれた文字列リテラルを受け取りました"
-#: directives.c:2033
+#: directives.c:2051
msgid "#else without #if"
msgstr "#else に #if がありません"
-#: directives.c:2038
+#: directives.c:2056
msgid "#else after #else"
msgstr "#else が #else の後ろにあります"
-#: directives.c:2040 directives.c:2073
+#: directives.c:2058 directives.c:2091
msgid "the conditional began here"
msgstr "その条件はここから始まります"
-#: directives.c:2066
+#: directives.c:2084
msgid "#elif without #if"
msgstr "#elif に #if がありません"
-#: directives.c:2071
+#: directives.c:2089
msgid "#elif after #else"
msgstr "#elif が #else の後ろにあります"
-#: directives.c:2102
+#: directives.c:2120
msgid "#endif without #if"
msgstr "#endif に #if がありません"
-#: directives.c:2178
+#: directives.c:2196
msgid "missing '(' after predicate"
msgstr "述語の後ろの '(' を欠いています"
-#: directives.c:2196
+#: directives.c:2214
msgid "missing ')' to complete answer"
msgstr "解を補完する ')' を欠いています"
-#: directives.c:2208
+#: directives.c:2226
msgid "predicate's answer is empty"
msgstr "述語の解が空です"
-#: directives.c:2238
+#: directives.c:2256
msgid "assertion without predicate"
msgstr "述語のないアサーションです"
-#: directives.c:2241
+#: directives.c:2259
msgid "predicate must be an identifier"
msgstr "述語は識別子でなければなりません"
-#: directives.c:2323
+#: directives.c:2341
#, c-format
msgid "\"%s\" re-asserted"
msgstr "\"%s\" が再アサートされました"
-#: directives.c:2604
+#: directives.c:2659
#, c-format
msgid "unterminated #%s"
msgstr "終端のない #%s"
-#: directives-only.c:221 lex.c:2879 traditional.c:174
-msgid "unterminated comment"
-msgstr "終端されていないコメント"
-
#: errors.c:291
#, c-format
msgid "%s: %s"
@@ -450,224 +446,242 @@ msgstr "%s: %s"
msgid "stdout"
msgstr "標準出力"
-#: expr.c:626 expr.c:743
+#: expr.c:636 expr.c:753
msgid "fixed-point constants are a GCC extension"
msgstr "固定小数点定数は GCC 拡張です"
-#: expr.c:651
+#: expr.c:661
msgid "invalid prefix \"0b\" for floating constant"
msgstr "浮動小数定数に対する無効な接頭辞 \"0b\" です"
-#: expr.c:664
+#: expr.c:674
#, fuzzy
#| msgid "use of C99 hexadecimal floating constant"
msgid "use of C++17 hexadecimal floating constant"
msgstr "C99 十六進浮動小数定数を使用しています"
-#: expr.c:667
+#: expr.c:677
msgid "use of C99 hexadecimal floating constant"
msgstr "C99 十六進浮動小数定数を使用しています"
-#: expr.c:711
+#: expr.c:721
#, c-format
msgid "invalid suffix \"%.*s\" on floating constant"
msgstr "浮動小数定数に無効な接尾辞 \"%.*s\" があります"
-#: expr.c:722 expr.c:789
+#: expr.c:732 expr.c:799
#, c-format
msgid "traditional C rejects the \"%.*s\" suffix"
msgstr "古い (traditional) C では \"%.*s\" 接尾辞は拒否されます"
-#: expr.c:730
+#: expr.c:740
msgid "suffix for double constant is a GCC extension"
msgstr "倍精度定数の接尾辞は GCC 拡張です"
-#: expr.c:736
+#: expr.c:746
#, c-format
msgid "invalid suffix \"%.*s\" with hexadecimal floating constant"
msgstr "十六進浮動小数定数に無効な接尾辞 \"%.*s\" があります"
-#: expr.c:749 expr.c:753
+#: expr.c:759 expr.c:763
#, fuzzy
#| msgid "decimal float constants are a GCC extension"
msgid "decimal float constants are a C2X feature"
msgstr "十進浮動小数定数は GCC 拡張です"
-#: expr.c:772
+#: expr.c:782
#, c-format
msgid "invalid suffix \"%.*s\" on integer constant"
msgstr "整数定数に無効な接尾辞 \"%.*s\" があります"
-#: expr.c:797
+#: expr.c:807
msgid "use of C++11 long long integer constant"
msgstr "C++11 の long long 整数定数を使用しています"
-#: expr.c:798
+#: expr.c:808
msgid "use of C99 long long integer constant"
msgstr "C99 の long long 整数定数を使用しています"
-#: expr.c:814
+#: expr.c:822
+#, fuzzy
+#| msgid "use of C++11 long long integer constant"
+msgid "use of C++23 %<size_t%> integer constant"
+msgstr "C++11 の long long 整数定数を使用しています"
+
+#: expr.c:823
+#, fuzzy
+#| msgid "use of C++11 long long integer constant"
+msgid "use of C++23 %<make_signed_t<size_t>%> integer constant"
+msgstr "C++11 の long long 整数定数を使用しています"
+
+#: expr.c:834
msgid "imaginary constants are a GCC extension"
msgstr "虚数定数は GCC 拡張です"
-#: expr.c:820
+#: expr.c:841
#, fuzzy
#| msgid "binary constants are a C++1y feature or GCC extension"
msgid "binary constants are a C++14 feature or GCC extension"
msgstr "二進定数は C++1y の機能または GCC 拡張です"
-#: expr.c:822
+#: expr.c:843
+#, fuzzy
+#| msgid "binary constants are a C++1y feature or GCC extension"
+msgid "binary constants are a C2X feature or GCC extension"
+msgstr "二進定数は C++1y の機能または GCC 拡張です"
+
+#: expr.c:848
#, fuzzy
#| msgid "imaginary constants are a GCC extension"
-msgid "binary constants are a GCC extension"
+msgid "binary constants are a C2X feature"
msgstr "虚数定数は GCC 拡張です"
-#: expr.c:917
+#: expr.c:944
msgid "integer constant is too large for its type"
msgstr "整数定数が型に対して大きすぎます"
-#: expr.c:948
+#: expr.c:975
msgid "integer constant is so large that it is unsigned"
msgstr "整数定数が大きすぎるので unsigned になりました"
-#: expr.c:1043
+#: expr.c:1070
msgid "missing ')' after \"defined\""
msgstr "\"defined\" の後ろの ')' がありません"
-#: expr.c:1050
+#: expr.c:1077
msgid "operator \"defined\" requires an identifier"
msgstr "\"defined\" 演算子は識別子を要求します"
-#: expr.c:1058
+#: expr.c:1085
#, c-format
msgid "(\"%s\" is an alternative token for \"%s\" in C++)"
msgstr "(C++ では \"%s\" が \"%s\" の代替トークンです)"
-#: expr.c:1070
+#: expr.c:1098
msgid "this use of \"defined\" may not be portable"
msgstr "この \"defined\" の使用法は移植性がありません"
-#: expr.c:1113
+#: expr.c:1143
msgid "user-defined literal in preprocessor expression"
msgstr "前処理式内のユーザ定義リテラル"
-#: expr.c:1118
+#: expr.c:1148
msgid "floating constant in preprocessor expression"
msgstr "前処理式の中に浮動小数定数があります"
-#: expr.c:1124
+#: expr.c:1154
msgid "imaginary number in preprocessor expression"
msgstr "前処理式の中に虚数があります"
-#: expr.c:1173
+#: expr.c:1203
#, fuzzy, c-format
#| msgid "\"%s\" is not defined"
msgid "\"%s\" is not defined, evaluates to 0"
msgstr "\"%s\" は定義されていません"
-#: expr.c:1186
+#: expr.c:1216
msgid "assertions are a GCC extension"
msgstr "アサーションは GCC 拡張です"
-#: expr.c:1189
+#: expr.c:1219
msgid "assertions are a deprecated extension"
msgstr "アサーションは廃止された拡張です"
-#: expr.c:1435
+#: expr.c:1465
#, c-format
msgid "unbalanced stack in %s"
msgstr "%s 内に釣り合いがとれていないスタックがあります"
-#: expr.c:1455
+#: expr.c:1485
#, c-format
msgid "impossible operator '%u'"
msgstr "不可能な演算子 '%u' です"
-#: expr.c:1556
+#: expr.c:1586
msgid "missing ')' in expression"
msgstr "式の中に ')' がありません"
-#: expr.c:1585
+#: expr.c:1615
msgid "'?' without following ':'"
msgstr "後に ':' が続いていない '?' です"
-#: expr.c:1595
+#: expr.c:1625
msgid "integer overflow in preprocessor expression"
msgstr "整数が前処理式内で溢れました"
-#: expr.c:1600
+#: expr.c:1630
msgid "missing '(' in expression"
msgstr "式内に '(' がありません"
-#: expr.c:1632
+#: expr.c:1662
#, c-format
msgid "the left operand of \"%s\" changes sign when promoted"
msgstr "\"%s\" の左側の被演算子は実行時に符号を変更します"
-#: expr.c:1637
+#: expr.c:1667
#, c-format
msgid "the right operand of \"%s\" changes sign when promoted"
msgstr "\"%s\" の右側の演算子は実行時に符号を変更します"
-#: expr.c:1896
+#: expr.c:1926
msgid "traditional C rejects the unary plus operator"
msgstr "古い (traditional) C では単項プラス演算子は拒否されます"
-#: expr.c:1994
+#: expr.c:2024
msgid "comma operator in operand of #if"
msgstr "カンマ演算子が #if の被演算子内にあります"
-#: expr.c:2130
+#: expr.c:2160
msgid "division by zero in #if"
msgstr "#if 内でゼロによる除算が行われました"
-#: files.c:576
+#: files.c:571
msgid "one or more PCH files were found, but they were invalid"
msgstr "一個以上の PCH ファイルが見つかりましたが、それらは無効です"
-#: files.c:580
+#: files.c:575
msgid "use -Winvalid-pch for more information"
msgstr "詳細な情報に関しては -Winvalid-pch を使用してください"
-#: files.c:1004
+#: files.c:1051
#, c-format
msgid "no include path in which to search for %s"
msgstr "%s を探索するためのインクルードパスがありません"
-#: files.c:1439
+#: files.c:1546
msgid "Multiple include guards may be useful for:\n"
msgstr "多重 include からの保護が有益となるでしょう:\n"
-#: init.c:598
+#: init.c:614
msgid "cppchar_t must be an unsigned type"
msgstr "cppchar_t は符号無し型でなければいけません"
-#: init.c:602
+#: init.c:618
#, c-format
msgid "preprocessor arithmetic has maximum precision of %lu bits; target requires %lu bits"
msgstr "前処理の数値演算の最大精度は %lu ビットですが、ターゲットは %lu ビットを要求しています"
-#: init.c:609
+#: init.c:625
msgid "CPP arithmetic must be at least as precise as a target int"
msgstr "CPP 数値演算はターゲットの int 以上の精度がなければいけません"
-#: init.c:612
+#: init.c:628
msgid "target char is less than 8 bits wide"
msgstr "ターゲットの char が 8 ビットより小さいです"
-#: init.c:616
+#: init.c:632
msgid "target wchar_t is narrower than target char"
msgstr "ターゲットの wchar_t がターゲットの char より小さいです"
-#: init.c:620
+#: init.c:636
msgid "target int is narrower than target char"
msgstr "ターゲットの int がターゲットの char より小さいです"
-#: init.c:625
+#: init.c:641
msgid "CPP half-integer narrower than CPP character"
msgstr "CPP ハーフ整数は CPP character より小さいです"
-#: init.c:629
+#: init.c:645
#, c-format
msgid "CPP on this host cannot handle wide character constants over %lu bits, but the target requires %lu bits"
msgstr "このホストでの CPP は %lu ビット以上のワイド文字定数を扱えませんが、ターゲットは %lu ビットを要求しています"
@@ -714,13 +728,13 @@ msgid "`%.*s' is not in NFC"
msgstr "`%.*s' は NFC ではありません"
#: lex.c:1375
-msgid "__VA_OPT__ is not available until C++2a"
+msgid "__VA_OPT__ is not available until C++20"
msgstr ""
#: lex.c:1382
#, fuzzy
#| msgid "__VA_ARGS__ can only appear in the expansion of a C99 variadic macro"
-msgid "__VA_OPT__ can only appear in the expansion of a C++2a variadic macro"
+msgid "__VA_OPT__ can only appear in the expansion of a C++20 variadic macro"
msgstr "__VA_ARGS__ は C99 可変引数マクロ拡張でのみ出現できます"
#: lex.c:1413 lex.c:1506
@@ -743,254 +757,279 @@ msgstr "__VA_ARGS__ は C99 可変引数マクロ拡張でのみ出現できま
msgid "identifier \"%s\" is a special operator name in C++"
msgstr "識別子 \"%s\" は C++ の特別な演算子名です"
-#: lex.c:1837
+#: lex.c:1879
msgid "raw string delimiter longer than 16 characters"
msgstr "生の文字列区切りが 16 文字より大きいです"
-#: lex.c:1841
+#: lex.c:1883
msgid "invalid new-line in raw string delimiter"
msgstr "生の文字列区切り内に無効な改行があります"
-#: lex.c:1845
+#: lex.c:1887 lex.c:4639
#, c-format
msgid "invalid character '%c' in raw string delimiter"
msgstr "生の文字列区切り内に無効な文字 '%c' があります"
-#: lex.c:1894 lex.c:1916
+#: lex.c:1926 lex.c:1949
msgid "unterminated raw string"
msgstr "終端されていない生の文字列です"
-#: lex.c:1936 lex.c:2065
+#: lex.c:1971 lex.c:2100
msgid "invalid suffix on literal; C++11 requires a space between literal and string macro"
msgstr "リテラルの接尾辞が無効です。C++11 では、リテラルと文字列マクロの間にスペースを入れる必要があります。"
-#: lex.c:2048
+#: lex.c:2083
msgid "null character(s) preserved in literal"
msgstr "リテラル中で null 文字が確保されました"
-#: lex.c:2051
+#: lex.c:2086
#, c-format
msgid "missing terminating %c character"
msgstr "%c 文字での終端を欠いています"
-#: lex.c:2083
+#: lex.c:2118
#, fuzzy
#| msgid "invalid suffix on literal; C++11 requires a space between literal and string macro"
msgid "C++11 requires a space between string literal and macro"
msgstr "リテラルの接尾辞が無効です。C++11 では、リテラルと文字列マクロの間にスペースを入れる必要があります。"
-#: lex.c:2893 lex.c:2927
+#: lex.c:2711
+msgid "module control-line cannot be in included file"
+msgstr ""
+
+#: lex.c:2725
+#, c-format
+msgid "module control-line \"%s\" cannot be an object-like macro"
+msgstr ""
+
+#: lex.c:3099 lex.c:4472 traditional.c:174
+msgid "unterminated comment"
+msgstr "終端されていないコメント"
+
+#: lex.c:3113 lex.c:3147
msgid "C++ style comments are not allowed in ISO C90"
msgstr "C++ スタイルのコメントは ISO C90 では許可されていません"
-#: lex.c:2895 lex.c:2906 lex.c:2930
+#: lex.c:3115 lex.c:3126 lex.c:3150
msgid "(this will be reported only once per input file)"
msgstr "(これは入力ファイルにつき一回だけ報告されます)"
-#: lex.c:2904
+#: lex.c:3124
#, fuzzy
#| msgid "C++ style comments are not allowed in ISO C90"
msgid "C++ style comments are incompatible with C90"
msgstr "C++ スタイルのコメントは ISO C90 では許可されていません"
-#: lex.c:2936
+#: lex.c:3156
msgid "multi-line comment"
msgstr "複数行のコメント"
-#: lex.c:3330
+#: lex.c:3550
#, c-format
msgid "unspellable token %s"
msgstr "綴ることができないトークン %s です"
+#: lex.c:4627
+#, fuzzy, c-format
+#| msgid "raw string delimiter longer than 16 characters"
+msgid "raw string delimiter longer than %d characters"
+msgstr "生の文字列区切りが 16 文字より大きいです"
+
+#: lex.c:4697
+#, fuzzy
+#| msgid "unterminated #%s"
+msgid "unterminated literal"
+msgstr "終端のない #%s"
+
#: macro.c:94
#, fuzzy
#| msgid "'##' cannot appear at either end of a macro expansion"
msgid "'##' cannot appear at either end of __VA_OPT__"
msgstr "'##' はマクロ展開の両端には出現できません"
-#: macro.c:364
+#: macro.c:386
#, fuzzy, c-format
#| msgid "%s in preprocessing directive"
msgid "\"%s\" used outside of preprocessing directive"
msgstr "前処理指示中に %s があります"
-#: macro.c:374
+#: macro.c:396
#, fuzzy, c-format
#| msgid "missing '(' in expression"
msgid "missing '(' before \"%s\" operand"
msgstr "式内に '(' がありません"
-#: macro.c:389
+#: macro.c:411
#, fuzzy, c-format
#| msgid "operator \"defined\" requires an identifier"
msgid "operator \"%s\" requires a header-name"
msgstr "\"defined\" 演算子は識別子を要求します"
-#: macro.c:406
+#: macro.c:428
#, fuzzy, c-format
#| msgid "missing ')' after \"defined\""
msgid "missing ')' after \"%s\" operand"
msgstr "\"defined\" の後ろの ')' がありません"
-#: macro.c:426
+#: macro.c:448
#, c-format
msgid "macro \"%s\" is not used"
msgstr "マクロ \"%s\" は使用されません"
-#: macro.c:465 macro.c:723
+#: macro.c:487 macro.c:778
#, c-format
msgid "invalid built-in macro \"%s\""
msgstr "無効な組み込みマクロ \"%s\" です"
-#: macro.c:472 macro.c:574
+#: macro.c:494 macro.c:596
#, c-format
msgid "macro \"%s\" might prevent reproducible builds"
msgstr "マクロ \"%s\" は再生性可能なビルドを阻害するかもしれません"
-#: macro.c:503
+#: macro.c:525
msgid "could not determine file timestamp"
msgstr "ファイルのタイムスタンプを決定できません"
-#: macro.c:620
+#: macro.c:610
msgid "could not determine date and time"
msgstr "日付と時間を決定できません"
-#: macro.c:636
+#: macro.c:642
msgid "__COUNTER__ expanded inside directive with -fdirectives-only"
msgstr "__COUNTER__ が -fdirectives-only がある指示内で展開されました"
-#: macro.c:842
+#: macro.c:897
msgid "invalid string literal, ignoring final '\\'"
msgstr "文字列リテラルが無効です、最後の '\\' を無視します"
-#: macro.c:904
+#: macro.c:959
#, c-format
msgid "pasting \"%s\" and \"%s\" does not give a valid preprocessing token"
msgstr "\"%s\" と \"%s\" を貼付けましたが正常な前処理トークンとなりません"
-#: macro.c:1030
+#: macro.c:1085
msgid "ISO C++11 requires at least one argument for the \"...\" in a variadic macro"
msgstr ""
-#: macro.c:1034
+#: macro.c:1089
#, fuzzy
#| msgid "ISO C99 requires rest arguments to be used"
msgid "ISO C99 requires at least one argument for the \"...\" in a variadic macro"
msgstr "ISO C99 は使用されるべき残りのの引数を要求します"
-#: macro.c:1041
+#: macro.c:1096
#, c-format
msgid "macro \"%s\" requires %u arguments, but only %u given"
msgstr "マクロ \"%s\" は引数を %u 要求しますが、%u 個しか与えられていません"
-#: macro.c:1046
+#: macro.c:1101
#, c-format
msgid "macro \"%s\" passed %u arguments, but takes just %u"
msgstr "マクロ \"%s\" に引数が %u 渡されましたが、%u しか受け取りません"
-#: macro.c:1244 traditional.c:815
+#: macro.c:1299 traditional.c:822
#, c-format
msgid "unterminated argument list invoking macro \"%s\""
msgstr "終端されていない引数リストがマクロ \"%s\" を起動しようとしました"
-#: macro.c:1386
+#: macro.c:1442
#, c-format
msgid "function-like macro \"%s\" must be used with arguments in traditional C"
msgstr "古い C では、関数型マクロ \"%s\" に引数が与えられねばなりません"
-#: macro.c:2165
+#: macro.c:2220
#, fuzzy, c-format
#| msgid "invoking macro %s argument %d: empty macro arguments are undefined in ISO C90 and ISO C++98"
msgid "invoking macro %s argument %d: empty macro arguments are undefined in ISO C++98"
msgstr "マクロ %s を引数 %d で起動しました。空のマクロ引数は ISO C90 および ISO C++98 内では定義されていません"
-#: macro.c:2173 macro.c:2182
+#: macro.c:2228 macro.c:2237
#, fuzzy, c-format
#| msgid "invoking macro %s argument %d: empty macro arguments are undefined in ISO C90 and ISO C++98"
msgid "invoking macro %s argument %d: empty macro arguments are undefined in ISO C90"
msgstr "マクロ %s を引数 %d で起動しました。空のマクロ引数は ISO C90 および ISO C++98 内では定義されていません"
-#: macro.c:3141
+#: macro.c:3279
#, c-format
msgid "duplicate macro parameter \"%s\""
msgstr "マクロ仮引数 \"%s\" が重複しています"
-#: macro.c:3223
+#: macro.c:3361
#, c-format
msgid "expected parameter name, found \"%s\""
msgstr ""
-#: macro.c:3224
+#: macro.c:3362
#, c-format
msgid "expected ',' or ')', found \"%s\""
msgstr ""
-#: macro.c:3225
+#: macro.c:3363
msgid "expected parameter name before end of line"
msgstr ""
-#: macro.c:3226
+#: macro.c:3364
#, fuzzy
#| msgid "unexpected end of file after #line"
msgid "expected ')' before end of line"
msgstr "#line 後に予期しないファイル終端 (EOF) です"
-#: macro.c:3227
+#: macro.c:3365
msgid "expected ')' after \"...\""
msgstr ""
-#: macro.c:3284
+#: macro.c:3422
#, fuzzy
#| msgid "anonymous variadic macros were introduced in C99"
msgid "anonymous variadic macros were introduced in C++11"
msgstr "無名可変引数マクロは C99 で導入されました"
-#: macro.c:3285 macro.c:3289
+#: macro.c:3423 macro.c:3427
msgid "anonymous variadic macros were introduced in C99"
msgstr "無名可変引数マクロは C99 で導入されました"
-#: macro.c:3295
+#: macro.c:3433
#, fuzzy
#| msgid "ISO C does not permit named variadic macros"
msgid "ISO C++ does not permit named variadic macros"
msgstr "ISO C では名前つき可変引数マクロを許しません"
-#: macro.c:3296
+#: macro.c:3434
msgid "ISO C does not permit named variadic macros"
msgstr "ISO C では名前つき可変引数マクロを許しません"
-#: macro.c:3342
+#: macro.c:3480
msgid "'##' cannot appear at either end of a macro expansion"
msgstr "'##' はマクロ展開の両端には出現できません"
-#: macro.c:3380
+#: macro.c:3518
#, fuzzy
#| msgid "ISO C99 requires whitespace after the macro name"
msgid "ISO C++11 requires whitespace after the macro name"
msgstr "ISO C99 ではマクロ名の後に空白が必要です"
-#: macro.c:3381
+#: macro.c:3519
msgid "ISO C99 requires whitespace after the macro name"
msgstr "ISO C99 ではマクロ名の後に空白が必要です"
-#: macro.c:3405
+#: macro.c:3543
msgid "missing whitespace after the macro name"
msgstr "マクロ名の後に空白がありません"
-#: macro.c:3455
+#: macro.c:3593
msgid "'#' is not followed by a macro parameter"
msgstr "'#' にマクロ仮引数名が続いていません"
-#: macro.c:3606
+#: macro.c:3749
#, c-format
msgid "\"%s\" redefined"
msgstr "\"%s\" が再定義されました"
-#: macro.c:3611
+#: macro.c:3754
msgid "this is the location of the previous definition"
msgstr "ここが以前の宣言がある位置です"
-#: macro.c:3715
+#: macro.c:3891
#, c-format
msgid "macro argument \"%s\" would be stringified in traditional C"
msgstr "マクロ引数 \"%s\" は古い (traditional) C では文字列化されます"
@@ -1028,12 +1067,12 @@ msgstr "%s: `__COUNTER__' が無効なため使用できません"
msgid "while reading precompiled header"
msgstr "プリコンパイルヘッダを読み込み中"
-#: traditional.c:884
+#: traditional.c:891
#, c-format
msgid "detected recursion whilst expanding macro \"%s\""
msgstr "マクロ \"%s\" を展開中に再帰が検出されました"
-#: traditional.c:1107
+#: traditional.c:1114
msgid "syntax error in macro parameter list"
msgstr "マクロ仮引数リストに構文エラーがあります"
diff --git a/libcpp/po/nl.po b/libcpp/po/nl.po
index 2b2ce64..9fdc2f2 100644
--- a/libcpp/po/nl.po
+++ b/libcpp/po/nl.po
@@ -10,7 +10,7 @@ msgid ""
msgstr ""
"Project-Id-Version: cpplib 6.1.0\n"
"Report-Msgid-Bugs-To: https://gcc.gnu.org/bugs/\n"
-"POT-Creation-Date: 2020-02-07 22:33+0000\n"
+"POT-Creation-Date: 2021-02-05 21:38+0000\n"
"PO-Revision-Date: 2016-05-03 12:27+0200\n"
"Last-Translator: Benno Schulenberg <benno@vertaalt.nl>\n"
"Language-Team: Dutch <vertaling@vrijschrift.org>\n"
@@ -22,158 +22,158 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"X-Generator: Lokalize 1.0\n"
-#: charset.c:674
+#: charset.c:677
#, c-format
msgid "conversion from %s to %s not supported by iconv"
msgstr "iconv ondersteunt geen omzetting van %s naar %s"
-#: charset.c:677
+#: charset.c:680
msgid "iconv_open"
msgstr "iconv_open"
-#: charset.c:685
+#: charset.c:688
#, c-format
msgid "no iconv implementation, cannot convert from %s to %s"
msgstr "geen implementatie van iconv beschikbaar; kan niet omzetten van %s naar %s"
-#: charset.c:781
+#: charset.c:784
#, c-format
msgid "character 0x%lx is not in the basic source character set\n"
msgstr "teken 0x%lx zit niet in de basis brontekenset\n"
-#: charset.c:798 charset.c:1768
+#: charset.c:801 charset.c:1771
msgid "converting to execution character set"
msgstr "omzetting naar uitvoeringstekenset"
-#: charset.c:804
+#: charset.c:807
#, c-format
msgid "character 0x%lx is not unibyte in execution character set"
msgstr "teken 0x%lx is niet enkelbyte in de uitvoeringstekenset"
-#: charset.c:1054
+#: charset.c:1057
msgid "universal character names are only valid in C++ and C99"
msgstr "universele tekennamen zijn alleen geldig in C++ en C99"
-#: charset.c:1058
+#: charset.c:1061
msgid "C99's universal character names are incompatible with C90"
msgstr "universele tekennamen van C99 zijn zijn incompatibel met C90"
-#: charset.c:1061
+#: charset.c:1064
#, c-format
msgid "the meaning of '\\%c' is different in traditional C"
msgstr "de betekenis van '\\%c' is anders in traditioneel C"
-#: charset.c:1070
+#: charset.c:1073
msgid "In _cpp_valid_ucn but not a UCN"
msgstr "In '_cpp_valid_ucn' maar het is geen UCN"
-#: charset.c:1103
+#: charset.c:1106
#, c-format
msgid "incomplete universal character name %.*s"
msgstr "onvolledige universele tekennaam %.*s"
-#: charset.c:1118
+#: charset.c:1121
#, c-format
msgid "%.*s is not a valid universal character"
msgstr "%.*s is geen geldige universele tekennaam"
-#: charset.c:1128 lex.c:1335
+#: charset.c:1131 lex.c:1335
msgid "'$' in identifier or number"
msgstr "'$' in naam of getal"
# "identifier" is een verdomd rottig woord om te vertalen...
-#: charset.c:1138
+#: charset.c:1141
#, c-format
msgid "universal character %.*s is not valid in an identifier"
msgstr "universeel teken %.*s is niet geldig in een naam"
-#: charset.c:1142
+#: charset.c:1145
#, c-format
msgid "universal character %.*s is not valid at the start of an identifier"
msgstr "universeel teken %.*s is niet geldig aan het begin van een naam"
-#: charset.c:1149
+#: charset.c:1152
#, c-format
msgid "%.*s is outside the UCS codespace"
msgstr ""
-#: charset.c:1194 charset.c:2113
+#: charset.c:1197 charset.c:2116
msgid "converting UCN to source character set"
msgstr "omzetting van UCN naar brontekenset"
-#: charset.c:1201
+#: charset.c:1204
msgid "converting UCN to execution character set"
msgstr "omzetting van UCN naar uitvoeringstekenset"
# "identifier" is een verdomd rottig woord om te vertalen...
-#: charset.c:1265
+#: charset.c:1268
#, fuzzy, c-format
#| msgid "universal character %.*s is not valid in an identifier"
msgid "extended character %.*s is not valid in an identifier"
msgstr "universeel teken %.*s is niet geldig in een naam"
-#: charset.c:1282
+#: charset.c:1285
#, fuzzy, c-format
#| msgid "universal character %.*s is not valid at the start of an identifier"
msgid "extended character %.*s is not valid at the start of an identifier"
msgstr "universeel teken %.*s is niet geldig aan het begin van een naam"
-#: charset.c:1368
+#: charset.c:1371
msgid "the meaning of '\\x' is different in traditional C"
msgstr "de betekenis van '\\x' is anders in traditioneel C"
-#: charset.c:1393
+#: charset.c:1396
msgid "\\x used with no following hex digits"
msgstr "\\x gebruikt zonder daaropvolgende hexadecimale cijfers"
-#: charset.c:1400
+#: charset.c:1403
msgid "hex escape sequence out of range"
msgstr "hexadecimale escape sequence buiten bereik"
-#: charset.c:1452
+#: charset.c:1455
msgid "octal escape sequence out of range"
msgstr "octale escape sequence buiten bereik"
-#: charset.c:1534
+#: charset.c:1537
msgid "the meaning of '\\a' is different in traditional C"
msgstr "de betekenis van '\\a' is anders in traditioneel C"
-#: charset.c:1541
+#: charset.c:1544
#, c-format
msgid "non-ISO-standard escape sequence, '\\%c'"
msgstr "escape sequence '\\%c' is niet ISO-standaard"
-#: charset.c:1549
+#: charset.c:1552
#, c-format
msgid "unknown escape sequence: '\\%c'"
msgstr "onbekende escape sequence: '\\%c'"
-#: charset.c:1557
+#: charset.c:1560
#, c-format
msgid "unknown escape sequence: '\\%s'"
msgstr "onbekende escape sequence: '\\%s'"
-#: charset.c:1565
+#: charset.c:1568
msgid "converting escape sequence to execution character set"
msgstr "omzetting van escape sequence naar uitvoeringstekenset"
-#: charset.c:1705
+#: charset.c:1708
msgid "missing open quote"
msgstr ""
-#: charset.c:1923 charset.c:2002
+#: charset.c:1926 charset.c:2005
msgid "character constant too long for its type"
msgstr "tekenconstante is te lang voor zijn type"
-#: charset.c:1926
+#: charset.c:1929
msgid "multi-character character constant"
msgstr "tekenconstante bevat meerdere tekens"
-#: charset.c:2042
+#: charset.c:2045
msgid "empty character constant"
msgstr "lege tekenconstante"
-#: charset.c:2160
+#: charset.c:2163
#, c-format
msgid "failure to convert %s to %s"
msgstr "fout bij omzetten van %s naar %s"
@@ -248,212 +248,208 @@ msgstr "macronamen moeten voldoen aan de regels voor namen in C/C++"
msgid "undefining \"%s\""
msgstr "definitie van \"%s\" wordt ongedaan gemaakt"
-#: directives.c:724
+#: directives.c:725
msgid "missing terminating > character"
msgstr "afsluitend '>'-teken ontbreekt"
-#: directives.c:783
+#: directives.c:784
#, c-format
msgid "#%s expects \"FILENAME\" or <FILENAME>"
msgstr "#%s verwacht \"BESTAND\" of <BESTAND>"
-#: directives.c:829
+#: directives.c:830
#, c-format
msgid "empty filename in #%s"
msgstr "lege bestandsnaam in #%s"
-#: directives.c:838
+#: directives.c:839
#, c-format
msgid "#include nested depth %u exceeds maximum of %u (use -fmax-include-depth=DEPTH to increase the maximum)"
msgstr ""
-#: directives.c:883
+#: directives.c:884
msgid "#include_next in primary source file"
msgstr "#include_next in primair bronbestand"
-#: directives.c:909
+#: directives.c:910
#, c-format
msgid "invalid flag \"%s\" in line directive"
msgstr "ongeldige vlag \"%s\" in #line commando"
-#: directives.c:969
+#: directives.c:970
msgid "unexpected end of file after #line"
msgstr "onverwacht einde van bestand na #line"
-#: directives.c:972
+#: directives.c:973
#, c-format
msgid "\"%s\" after #line is not a positive integer"
msgstr "\"%s\" (na #line) is geen positieve integer"
-#: directives.c:978 directives.c:980
+#: directives.c:979 directives.c:981
msgid "line number out of range"
msgstr "regelnummer buiten bereik"
-#: directives.c:993 directives.c:1074
+#: directives.c:994 directives.c:1075
#, c-format
msgid "\"%s\" is not a valid filename"
msgstr "\"%s\" is geen geldige bestandsnaam"
-#: directives.c:1034
+#: directives.c:1035
#, c-format
msgid "\"%s\" after # is not a positive integer"
msgstr "\"%s\" (na #) is geen positieve integer"
-#: directives.c:1101
+#: directives.c:1102
#, c-format
msgid "file \"%s\" linemarker ignored due to incorrect nesting"
msgstr "regelmarkering voor bestand \"%s\" is genegeerd wegens incorrecte nesting"
# FIXME: most likely shouldn't have been marked as translatable
-#: directives.c:1162 directives.c:1164 directives.c:1166 directives.c:1754
+#: directives.c:1180 directives.c:1182 directives.c:1184 directives.c:1772
#, c-format
msgid "%s"
msgstr "%s"
-#: directives.c:1190
+#: directives.c:1208
#, c-format
msgid "invalid #%s directive"
msgstr "ongeldig #%s commando"
# goede vertaling voor 'mismatched'?
-#: directives.c:1253
+#: directives.c:1271
#, c-format
msgid "registering pragmas in namespace \"%s\" with mismatched name expansion"
msgstr "registratie van pragma's in naamsruimte \"%s\" met niet-overeenkomstige naamsexpansie"
# moet namespace hier ook vertaald worden?
-#: directives.c:1262
+#: directives.c:1280
#, c-format
msgid "registering pragma \"%s\" with name expansion and no namespace"
msgstr "registratie van pragma \"%s\" met naamsexpansie maar geen naamsruimte"
# moet namespace hier ook vertaald worden?
-#: directives.c:1280
+#: directives.c:1298
#, c-format
msgid "registering \"%s\" as both a pragma and a pragma namespace"
msgstr "registratie van \"%s\" zowel als pragma en als pragma-naamsruimte"
-#: directives.c:1283
+#: directives.c:1301
#, c-format
msgid "#pragma %s %s is already registered"
msgstr "#pragma %s %s is reeds geregistreerd"
-#: directives.c:1286
+#: directives.c:1304
#, c-format
msgid "#pragma %s is already registered"
msgstr "#pragma %s is reeds geregistreerd"
# betere vertaling voor 'handler'?
-#: directives.c:1316
+#: directives.c:1334
msgid "registering pragma with NULL handler"
msgstr "registratie van pragma met NULL als afhandelingsroutine"
-#: directives.c:1533
+#: directives.c:1551
msgid "#pragma once in main file"
msgstr "#pragma once in hoofdbestand"
-#: directives.c:1556
+#: directives.c:1574
msgid "invalid #pragma push_macro directive"
msgstr "ongeldig #pragma push_macro commando"
-#: directives.c:1613
+#: directives.c:1631
msgid "invalid #pragma pop_macro directive"
msgstr "ongeldig #pragma pop_macro commando"
-#: directives.c:1668
+#: directives.c:1686
msgid "invalid #pragma GCC poison directive"
msgstr "ongeldig #pragma GCC poison commando"
-#: directives.c:1677
+#: directives.c:1695
#, c-format
msgid "poisoning existing macro \"%s\""
msgstr "bestaande macro \"%s\" wordt 'vergiftigd'"
-#: directives.c:1696
+#: directives.c:1714
msgid "#pragma system_header ignored outside include file"
msgstr "#pragma system_header wordt genegeerd buiten een invoegbestand"
-#: directives.c:1721
+#: directives.c:1739
#, c-format
msgid "cannot find source file %s"
msgstr "kan bronbestand %s niet vinden"
-#: directives.c:1725
+#: directives.c:1743
#, c-format
msgid "current file is older than %s"
msgstr "huidig bestand is ouder dan %s"
-#: directives.c:1749
+#: directives.c:1767
#, c-format
msgid "invalid \"#pragma GCC %s\" directive"
msgstr "ongeldig \"#pragma GCC %s\"-commando"
-#: directives.c:1950
+#: directives.c:1968
msgid "_Pragma takes a parenthesized string literal"
msgstr "_Pragma verwacht als argument een stringconstante tussen haakjes"
-#: directives.c:2033
+#: directives.c:2051
msgid "#else without #if"
msgstr "#else zonder #if"
-#: directives.c:2038
+#: directives.c:2056
msgid "#else after #else"
msgstr "#else na #else"
# of gewoon "de conditie"?
-#: directives.c:2040 directives.c:2073
+#: directives.c:2058 directives.c:2091
msgid "the conditional began here"
msgstr "het conditionele blok begon hier"
-#: directives.c:2066
+#: directives.c:2084
msgid "#elif without #if"
msgstr "#elif zonder #if"
-#: directives.c:2071
+#: directives.c:2089
msgid "#elif after #else"
msgstr "#elif na #else"
-#: directives.c:2102
+#: directives.c:2120
msgid "#endif without #if"
msgstr "#endif zonder #if"
-#: directives.c:2178
+#: directives.c:2196
msgid "missing '(' after predicate"
msgstr "'(' ontbreekt na predicaat"
-#: directives.c:2196
+#: directives.c:2214
msgid "missing ')' to complete answer"
msgstr "')' ontbreekt als afronding van het antwoord"
-#: directives.c:2208
+#: directives.c:2226
msgid "predicate's answer is empty"
msgstr "antwoord van het predicaat is leeg"
# dit moet beter kunnen...
-#: directives.c:2238
+#: directives.c:2256
msgid "assertion without predicate"
msgstr "assertie zonder predicaat"
# ... dit klinkt echt niet - maar wat is hier een beter vertaling voor identifier?
-#: directives.c:2241
+#: directives.c:2259
msgid "predicate must be an identifier"
msgstr "predicaat moet een naam zijn"
# is "asserteren" wel een echt woord?
-#: directives.c:2323
+#: directives.c:2341
#, c-format
msgid "\"%s\" re-asserted"
msgstr "\"%s\" opnieuw geasserteerd"
-#: directives.c:2604
+#: directives.c:2659
#, c-format
msgid "unterminated #%s"
msgstr "niet-beëindigde #%s"
-#: directives-only.c:221 lex.c:2879 traditional.c:174
-msgid "unterminated comment"
-msgstr "niet-beëindigd commentaar"
-
# FIXME: hoort niet echt een vertaalbare string te zijn :-)
#: errors.c:291
#, c-format
@@ -464,221 +460,241 @@ msgstr "%s: %s"
msgid "stdout"
msgstr "standaarduitvoer"
-#: expr.c:626 expr.c:743
+#: expr.c:636 expr.c:753
msgid "fixed-point constants are a GCC extension"
msgstr "fixed-point constantes zijn een uitbreiding van GCC"
-#: expr.c:651
+#: expr.c:661
msgid "invalid prefix \"0b\" for floating constant"
msgstr "ongeldige prefix \"0b\" voor floating-point constante"
-#: expr.c:664
+#: expr.c:674
#, fuzzy
#| msgid "use of C++1z hexadecimal floating constant"
msgid "use of C++17 hexadecimal floating constant"
msgstr "gebruik van een C++1z hexadecimale floating-point constante"
-#: expr.c:667
+#: expr.c:677
msgid "use of C99 hexadecimal floating constant"
msgstr "gebruik van een C99 hexadecimale floating-point constante"
-#: expr.c:711
+#: expr.c:721
#, c-format
msgid "invalid suffix \"%.*s\" on floating constant"
msgstr "ongeldige suffix \"%.*s\" aan floating-point constante"
-#: expr.c:722 expr.c:789
+#: expr.c:732 expr.c:799
#, c-format
msgid "traditional C rejects the \"%.*s\" suffix"
msgstr "traditioneel C aanvaardt de \"%.*s\" suffix niet"
-#: expr.c:730
+#: expr.c:740
msgid "suffix for double constant is a GCC extension"
msgstr "het gebruik van een suffix voor double constantes is een uitbreiding van GCC"
-#: expr.c:736
+#: expr.c:746
#, c-format
msgid "invalid suffix \"%.*s\" with hexadecimal floating constant"
msgstr "ongeldige suffix \"%.*s\" bij hexadecimale floating-point constante"
-#: expr.c:749 expr.c:753
+#: expr.c:759 expr.c:763
#, fuzzy
#| msgid "decimal float constants are a GCC extension"
msgid "decimal float constants are a C2X feature"
msgstr "decimale floating-point constantes zijn een uitbreiding van GCC"
-#: expr.c:772
+#: expr.c:782
#, c-format
msgid "invalid suffix \"%.*s\" on integer constant"
msgstr "ongeldige suffix \"%.*s\" aan integerconstante"
-#: expr.c:797
+#: expr.c:807
msgid "use of C++11 long long integer constant"
msgstr "gebruik van een C++11 long long integerconstante"
-#: expr.c:798
+#: expr.c:808
msgid "use of C99 long long integer constant"
msgstr "gebruik van een C99 long long integerconstante"
-#: expr.c:814
+#: expr.c:822
+#, fuzzy
+#| msgid "use of C++11 long long integer constant"
+msgid "use of C++23 %<size_t%> integer constant"
+msgstr "gebruik van een C++11 long long integerconstante"
+
+#: expr.c:823
+#, fuzzy
+#| msgid "use of C++11 long long integer constant"
+msgid "use of C++23 %<make_signed_t<size_t>%> integer constant"
+msgstr "gebruik van een C++11 long long integerconstante"
+
+#: expr.c:834
msgid "imaginary constants are a GCC extension"
msgstr "imaginaire constantes zijn een uitbreiding van GCC"
-#: expr.c:820
+#: expr.c:841
msgid "binary constants are a C++14 feature or GCC extension"
msgstr "binaire constantes zijn een C++14-functie of een uitbreiding van GCC"
-#: expr.c:822
-msgid "binary constants are a GCC extension"
+#: expr.c:843
+#, fuzzy
+#| msgid "binary constants are a C++14 feature or GCC extension"
+msgid "binary constants are a C2X feature or GCC extension"
+msgstr "binaire constantes zijn een C++14-functie of een uitbreiding van GCC"
+
+#: expr.c:848
+#, fuzzy
+#| msgid "binary constants are a GCC extension"
+msgid "binary constants are a C2X feature"
msgstr "binaire constantes zijn een uitbreiding van GCC"
-#: expr.c:917
+#: expr.c:944
msgid "integer constant is too large for its type"
msgstr "integerconstante is te groot voor zijn type"
-#: expr.c:948
+#: expr.c:975
msgid "integer constant is so large that it is unsigned"
msgstr "integerconstante is zo groot dat hij tekenloos is"
-#: expr.c:1043
+#: expr.c:1070
msgid "missing ')' after \"defined\""
msgstr "')' ontbreekt na \"defined\""
-#: expr.c:1050
+#: expr.c:1077
msgid "operator \"defined\" requires an identifier"
msgstr "de \"defined\" operator vereist een naam als argument"
-#: expr.c:1058
+#: expr.c:1085
#, c-format
msgid "(\"%s\" is an alternative token for \"%s\" in C++)"
msgstr "(\"%s\" is een alternatieve schrijfwijze voor \"%s\" in C++)"
-#: expr.c:1070
+#: expr.c:1098
msgid "this use of \"defined\" may not be portable"
msgstr "dit gebruik van \"define\" is mogelijk niet overdraagbaar"
-#: expr.c:1113
+#: expr.c:1143
msgid "user-defined literal in preprocessor expression"
msgstr "gebruikergedefinieerde constante in preprocessor-expressie"
-#: expr.c:1118
+#: expr.c:1148
msgid "floating constant in preprocessor expression"
msgstr "floating-point constante in preprocessor-expressie"
-#: expr.c:1124
+#: expr.c:1154
msgid "imaginary number in preprocessor expression"
msgstr "imaginair getal in preprocessor-expressie"
-#: expr.c:1173
+#: expr.c:1203
#, fuzzy, c-format
#| msgid "\"%s\" is not defined"
msgid "\"%s\" is not defined, evaluates to 0"
msgstr "\"%s\" is niet gedefinieerd"
-#: expr.c:1186
+#: expr.c:1216
msgid "assertions are a GCC extension"
msgstr "assertions zijn een uitbreiding van GCC"
-#: expr.c:1189
+#: expr.c:1219
msgid "assertions are a deprecated extension"
msgstr "assertions zijn een afgekeurde uitbreiding"
-#: expr.c:1435
+#: expr.c:1465
#, c-format
msgid "unbalanced stack in %s"
msgstr "niet-gebalanceerde stack in %s"
-#: expr.c:1455
+#: expr.c:1485
#, c-format
msgid "impossible operator '%u'"
msgstr "operator '%u' is onmogelijk"
-#: expr.c:1556
+#: expr.c:1586
msgid "missing ')' in expression"
msgstr "')' ontbreekt in expressie"
-#: expr.c:1585
+#: expr.c:1615
msgid "'?' without following ':'"
msgstr "'?' zonder daaropvolgende ':'"
-#: expr.c:1595
+#: expr.c:1625
msgid "integer overflow in preprocessor expression"
msgstr "integer-overflow in preprocessor-expressie"
-#: expr.c:1600
+#: expr.c:1630
msgid "missing '(' in expression"
msgstr "'(' ontbreekt in expressie"
-#: expr.c:1632
+#: expr.c:1662
#, c-format
msgid "the left operand of \"%s\" changes sign when promoted"
msgstr "de linker operand van \"%s\" verandert van teken indien hij gepromoveerd wordt"
-#: expr.c:1637
+#: expr.c:1667
#, c-format
msgid "the right operand of \"%s\" changes sign when promoted"
msgstr "de rechter operand van \"%s\" verandert van teken indien hij gepromoveerd wordt"
-#: expr.c:1896
+#: expr.c:1926
msgid "traditional C rejects the unary plus operator"
msgstr "traditioneel C verwerpt de unaire plus-operator"
-#: expr.c:1994
+#: expr.c:2024
msgid "comma operator in operand of #if"
msgstr "komma-operator in operand van '#if'"
-#: expr.c:2130
+#: expr.c:2160
msgid "division by zero in #if"
msgstr "deling door nul in '#if'"
-#: files.c:576
+#: files.c:571
msgid "one or more PCH files were found, but they were invalid"
msgstr "een of meer PCH-bestanden werden gevonden, maar ze waren ongeldig"
-#: files.c:580
+#: files.c:575
msgid "use -Winvalid-pch for more information"
msgstr "gebruik -Winvalid-pch voor meer informatie"
-#: files.c:1004
+#: files.c:1051
#, c-format
msgid "no include path in which to search for %s"
msgstr "geen invoegpad waarin naar %s gezocht kan worden"
# goede vertaling voor "include guard"?
-#: files.c:1439
+#: files.c:1546
msgid "Multiple include guards may be useful for:\n"
msgstr "Meerdere invoegbeschermingen zouden nuttig kunnen zijn voor:\n"
-#: init.c:598
+#: init.c:614
msgid "cppchar_t must be an unsigned type"
msgstr "'cppchar_t' moet een tekenloos type zijn"
-#: init.c:602
+#: init.c:618
#, c-format
msgid "preprocessor arithmetic has maximum precision of %lu bits; target requires %lu bits"
msgstr "preprocessor-rekensommen hebben een maximale precisie van %lu bits; de doelomgeving vereist %lu bits"
-#: init.c:609
+#: init.c:625
msgid "CPP arithmetic must be at least as precise as a target int"
msgstr "CPP-rekensommen moet minstens even precies zijn als een int in de doelomgeving"
-#: init.c:612
+#: init.c:628
msgid "target char is less than 8 bits wide"
msgstr "char is minder dan 8 bits breed in de doelomgeving"
-#: init.c:616
+#: init.c:632
msgid "target wchar_t is narrower than target char"
msgstr "'wchar_t' is smaller dan char in de doelomgeving"
-#: init.c:620
+#: init.c:636
msgid "target int is narrower than target char"
msgstr "int is smaller dan char in de doelomgeving"
-#: init.c:625
+#: init.c:641
msgid "CPP half-integer narrower than CPP character"
msgstr "CPP half-integer is smaller dan een CPP char"
-#: init.c:629
+#: init.c:645
#, c-format
msgid "CPP on this host cannot handle wide character constants over %lu bits, but the target requires %lu bits"
msgstr "CPP kan op deze host geen brede tekenconstantes aan van meer dan %lu bits, maar de doelomgeving vereist %lu bits"
@@ -725,13 +741,13 @@ msgid "`%.*s' is not in NFC"
msgstr "'%.*s' zit niet in NFC"
#: lex.c:1375
-msgid "__VA_OPT__ is not available until C++2a"
+msgid "__VA_OPT__ is not available until C++20"
msgstr ""
#: lex.c:1382
#, fuzzy
#| msgid "__VA_ARGS__ can only appear in the expansion of a C++11 variadic macro"
-msgid "__VA_OPT__ can only appear in the expansion of a C++2a variadic macro"
+msgid "__VA_OPT__ can only appear in the expansion of a C++20 variadic macro"
msgstr "__VA_ARGS__ mag enkel voorkomen in de expansie van een C++11 variadische macro"
#: lex.c:1413 lex.c:1506
@@ -754,243 +770,269 @@ msgid "identifier \"%s\" is a special operator name in C++"
msgstr "de aanduiding \"%s\" is een speciale operatornaam in C++"
# betere vertaling voor "raw string delimiter"?
-#: lex.c:1837
+#: lex.c:1879
msgid "raw string delimiter longer than 16 characters"
msgstr "rauwe stringscheiding is langer dan 16 tekens"
-#: lex.c:1841
+#: lex.c:1883
msgid "invalid new-line in raw string delimiter"
msgstr "ongeldige newline in rauwe stringscheiding"
-#: lex.c:1845
+#: lex.c:1887 lex.c:4639
#, c-format
msgid "invalid character '%c' in raw string delimiter"
msgstr "ongeldig teken '%c' in rauwe stringscheiding"
-#: lex.c:1894 lex.c:1916
+#: lex.c:1926 lex.c:1949
msgid "unterminated raw string"
msgstr "niet-beëindigde rauwe string"
-#: lex.c:1936 lex.c:2065
+#: lex.c:1971 lex.c:2100
msgid "invalid suffix on literal; C++11 requires a space between literal and string macro"
msgstr "ongeldige suffix aan constante; C++11 vereist een spatie tussen constante en stringmacro"
-#: lex.c:2048
+#: lex.c:2083
msgid "null character(s) preserved in literal"
msgstr "nulteken(s) in een constante worden behouden"
-#: lex.c:2051
+#: lex.c:2086
#, c-format
msgid "missing terminating %c character"
msgstr "afsluitend %c-teken ontbreekt"
-#: lex.c:2083
+#: lex.c:2118
msgid "C++11 requires a space between string literal and macro"
msgstr "C++11 vereist een spatie tussen stringconstante en macro"
-#: lex.c:2893 lex.c:2927
+#: lex.c:2711
+msgid "module control-line cannot be in included file"
+msgstr ""
+
+#: lex.c:2725
+#, c-format
+msgid "module control-line \"%s\" cannot be an object-like macro"
+msgstr ""
+
+#: lex.c:3099 lex.c:4472 traditional.c:174
+msgid "unterminated comment"
+msgstr "niet-beëindigd commentaar"
+
+#: lex.c:3113 lex.c:3147
msgid "C++ style comments are not allowed in ISO C90"
msgstr "commentaar in C++-stijl is niet toegestaan in ISO C90"
-#: lex.c:2895 lex.c:2906 lex.c:2930
+#: lex.c:3115 lex.c:3126 lex.c:3150
msgid "(this will be reported only once per input file)"
msgstr "(dit wordt per invoerbestand maar één keer gemeld)"
-#: lex.c:2904
+#: lex.c:3124
msgid "C++ style comments are incompatible with C90"
msgstr "commentaar in C++-stijl is incompatibel met C90"
-#: lex.c:2936
+#: lex.c:3156
msgid "multi-line comment"
msgstr "commentaar gespreid over meerdere regels"
# lijkt een vreemde boodschap...
-#: lex.c:3330
+#: lex.c:3550
#, c-format
msgid "unspellable token %s"
msgstr "kan token %s niet spellen"
+# betere vertaling voor "raw string delimiter"?
+#: lex.c:4627
+#, fuzzy, c-format
+#| msgid "raw string delimiter longer than 16 characters"
+msgid "raw string delimiter longer than %d characters"
+msgstr "rauwe stringscheiding is langer dan 16 tekens"
+
+#: lex.c:4697
+#, fuzzy
+#| msgid "unterminated #%s"
+msgid "unterminated literal"
+msgstr "niet-beëindigde #%s"
+
#: macro.c:94
#, fuzzy
#| msgid "'##' cannot appear at either end of a macro expansion"
msgid "'##' cannot appear at either end of __VA_OPT__"
msgstr "'##' mag niet voorkomen aan het begin of einde van een macro-expansie"
-#: macro.c:364
+#: macro.c:386
#, fuzzy, c-format
#| msgid "%s in preprocessing directive"
msgid "\"%s\" used outside of preprocessing directive"
msgstr "%s binnen preprocessor-commando"
-#: macro.c:374
+#: macro.c:396
#, fuzzy, c-format
#| msgid "missing '(' in expression"
msgid "missing '(' before \"%s\" operand"
msgstr "'(' ontbreekt in expressie"
-#: macro.c:389
+#: macro.c:411
#, fuzzy, c-format
#| msgid "operator \"__has_include__\" requires a header string"
msgid "operator \"%s\" requires a header-name"
msgstr "de \"__has_include__\" operator vereist een headerstring"
-#: macro.c:406
+#: macro.c:428
#, fuzzy, c-format
#| msgid "missing ')' after \"defined\""
msgid "missing ')' after \"%s\" operand"
msgstr "')' ontbreekt na \"defined\""
-#: macro.c:426
+#: macro.c:448
#, c-format
msgid "macro \"%s\" is not used"
msgstr "macro \"%s\" wordt nergens gebruikt"
-#: macro.c:465 macro.c:723
+#: macro.c:487 macro.c:778
#, c-format
msgid "invalid built-in macro \"%s\""
msgstr "ongeldige ingebouwde macro \"%s\""
-#: macro.c:472 macro.c:574
+#: macro.c:494 macro.c:596
#, c-format
msgid "macro \"%s\" might prevent reproducible builds"
msgstr "macro \"%s\" kan reproduceerbare compilaties verhinderen"
-#: macro.c:503
+#: macro.c:525
msgid "could not determine file timestamp"
msgstr "kan tijdsstempel van bestand niet achterhalen"
-#: macro.c:620
+#: macro.c:610
msgid "could not determine date and time"
msgstr "kan datum en tijd niet achterhalen"
-#: macro.c:636
+#: macro.c:642
msgid "__COUNTER__ expanded inside directive with -fdirectives-only"
msgstr "expansie van __COUNTER__ binnenin commando terwijl -fdirectives-only opgegeven is"
-#: macro.c:842
+#: macro.c:897
msgid "invalid string literal, ignoring final '\\'"
msgstr "ongeldige stringconstante; laatste '\\' wordt genegeerd"
-#: macro.c:904
+#: macro.c:959
#, c-format
msgid "pasting \"%s\" and \"%s\" does not give a valid preprocessing token"
msgstr "het plakken van \"%s\" en \"%s\" levert geen geldig preprocessing token op"
-#: macro.c:1030
+#: macro.c:1085
msgid "ISO C++11 requires at least one argument for the \"...\" in a variadic macro"
msgstr "ISO C++11 vereist minstens één argument voor de \"...\" in een variadische macro"
-#: macro.c:1034
+#: macro.c:1089
msgid "ISO C99 requires at least one argument for the \"...\" in a variadic macro"
msgstr "ISO C99 vereist minstens één argument voor de \"...\" in een variadische macro"
-#: macro.c:1041
+#: macro.c:1096
#, c-format
msgid "macro \"%s\" requires %u arguments, but only %u given"
msgstr "macro \"%s\" vereist %u argumenten, maar er werden er slechts %u opgegeven"
-#: macro.c:1046
+#: macro.c:1101
#, c-format
msgid "macro \"%s\" passed %u arguments, but takes just %u"
msgstr "macro \"%s\" kreeg %u argumenten, maar heeft er slechts %u nodig"
-#: macro.c:1244 traditional.c:815
+#: macro.c:1299 traditional.c:822
#, c-format
msgid "unterminated argument list invoking macro \"%s\""
msgstr "niet-beëindigde argumentenlijst bij aanroep van macro \"%s\""
-#: macro.c:1386
+#: macro.c:1442
#, c-format
msgid "function-like macro \"%s\" must be used with arguments in traditional C"
msgstr "functie-achtige macro \"%s\" moet in traditioneel C altijd met argumenten gebruikt worden"
-#: macro.c:2165
+#: macro.c:2220
#, c-format
msgid "invoking macro %s argument %d: empty macro arguments are undefined in ISO C++98"
msgstr "aanroep van macro %s argument %d: lege macro-argumenten zijn ongedefinieerd in ISO C++98"
-#: macro.c:2173 macro.c:2182
+#: macro.c:2228 macro.c:2237
#, c-format
msgid "invoking macro %s argument %d: empty macro arguments are undefined in ISO C90"
msgstr "aanroep van macro %s argument %d: lege macro-argumenten zijn ongedefinieerd in ISO C90"
-#: macro.c:3141
+#: macro.c:3279
#, c-format
msgid "duplicate macro parameter \"%s\""
msgstr "herhaalde macro-parameter \"%s\""
-#: macro.c:3223
+#: macro.c:3361
#, c-format
msgid "expected parameter name, found \"%s\""
msgstr ""
-#: macro.c:3224
+#: macro.c:3362
#, c-format
msgid "expected ',' or ')', found \"%s\""
msgstr ""
-#: macro.c:3225
+#: macro.c:3363
msgid "expected parameter name before end of line"
msgstr ""
-#: macro.c:3226
+#: macro.c:3364
#, fuzzy
#| msgid "unexpected end of file after #line"
msgid "expected ')' before end of line"
msgstr "onverwacht einde van bestand na #line"
-#: macro.c:3227
+#: macro.c:3365
msgid "expected ')' after \"...\""
msgstr ""
-#: macro.c:3284
+#: macro.c:3422
msgid "anonymous variadic macros were introduced in C++11"
msgstr "anonieme variadische macro's werden geïntroduceerd in C++11"
-#: macro.c:3285 macro.c:3289
+#: macro.c:3423 macro.c:3427
msgid "anonymous variadic macros were introduced in C99"
msgstr "anonieme variadische macro's werden geïntroduceerd in C99"
# variadic? " met variabele argumentenlijst" is nogal lang...
-#: macro.c:3295
+#: macro.c:3433
msgid "ISO C++ does not permit named variadic macros"
msgstr "ISO C++ staat geen benoemde variadische macro's toe"
# variadic? " met variabele argumentenlijst" is nogal lang...
-#: macro.c:3296
+#: macro.c:3434
msgid "ISO C does not permit named variadic macros"
msgstr "ISO C staat geen benoemde variadische macro's toe"
-#: macro.c:3342
+#: macro.c:3480
msgid "'##' cannot appear at either end of a macro expansion"
msgstr "'##' mag niet voorkomen aan het begin of einde van een macro-expansie"
-#: macro.c:3380
+#: macro.c:3518
msgid "ISO C++11 requires whitespace after the macro name"
msgstr "ISO C++11 vereist witruimte na de macronaam"
-#: macro.c:3381
+#: macro.c:3519
msgid "ISO C99 requires whitespace after the macro name"
msgstr "ISO C99 vereist witruimte na de macronaam"
-#: macro.c:3405
+#: macro.c:3543
msgid "missing whitespace after the macro name"
msgstr "witruimte ontbreekt na de macronaam"
-#: macro.c:3455
+#: macro.c:3593
msgid "'#' is not followed by a macro parameter"
msgstr "'#' wordt niet gevolgd door de naam van een macro-parameter"
-#: macro.c:3606
+#: macro.c:3749
#, c-format
msgid "\"%s\" redefined"
msgstr "\"%s\" opnieuw gedefinieerd"
-#: macro.c:3611
+#: macro.c:3754
msgid "this is the location of the previous definition"
msgstr "dit is de plaats van de eerdere definitie"
-#: macro.c:3715
+#: macro.c:3891
#, c-format
msgid "macro argument \"%s\" would be stringified in traditional C"
msgstr "macro-argument \"%s\" zou string gemaakt worden in traditioneel C"
@@ -1028,12 +1070,12 @@ msgstr "%s: niet gebruikt omdat \"__COUNTER__\" ongeldig is"
msgid "while reading precompiled header"
msgstr "bij het lezen van een voorgecompileerde header"
-#: traditional.c:884
+#: traditional.c:891
#, c-format
msgid "detected recursion whilst expanding macro \"%s\""
msgstr "recursie gedetecteerd bij uitwerken van macro \"%s\""
-#: traditional.c:1107
+#: traditional.c:1114
msgid "syntax error in macro parameter list"
msgstr "syntaxfout in lijst van macro-parameters"
diff --git a/libcpp/po/pt_BR.po b/libcpp/po/pt_BR.po
index ab05793..d52e660 100644
--- a/libcpp/po/pt_BR.po
+++ b/libcpp/po/pt_BR.po
@@ -1,171 +1,172 @@
# Brazilian Portuguese translation for cpplib
-# Copyright (C) 2020 Free Software Foundation, Inc.
+# Copyright (C) 2021 Free Software Foundation, Inc.
# This file is distributed under the same license as the gcc package.
-# Rafael Fontenelle <rafaelff@gnome.org>, 2013-2020.
+# Rafael Fontenelle <rafaelff@gnome.org>, 2013-2021.
+#
msgid ""
msgstr ""
-"Project-Id-Version: cpplib 10.1-b20200209\n"
+"Project-Id-Version: cpplib 11.1-b20210207\n"
"Report-Msgid-Bugs-To: https://gcc.gnu.org/bugs/\n"
-"POT-Creation-Date: 2020-02-07 22:33+0000\n"
-"PO-Revision-Date: 2020-02-10 19:58-0300\n"
+"POT-Creation-Date: 2021-02-05 21:38+0000\n"
+"PO-Revision-Date: 2021-02-09 12:28-0300\n"
"Last-Translator: Rafael Fontenelle <rafaelff@gnome.org>\n"
"Language-Team: Brazilian Portuguese <ldpbr-translation@lists.sourceforge.net>\n"
"Language: pt_BR\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-"X-Generator: Virtaal 1.0.0-beta1\n"
+"Plural-Forms: nplurals=2; plural=(n > 1)\n"
+"X-Generator: Gtranslator 3.38.0\n"
"X-Bugs: Report translation errors to the Language-Team address.\n"
-#: charset.c:674
+#: charset.c:677
#, c-format
msgid "conversion from %s to %s not supported by iconv"
msgstr "sem suporte a conversão de %s para %s por iconv"
-#: charset.c:677
+#: charset.c:680
msgid "iconv_open"
msgstr "iconv_open"
-#: charset.c:685
+#: charset.c:688
#, c-format
msgid "no iconv implementation, cannot convert from %s to %s"
msgstr "nenhuma implementação iconv, não foi possível converter de %s para %s"
-#: charset.c:781
+#: charset.c:784
#, c-format
msgid "character 0x%lx is not in the basic source character set\n"
msgstr "caractere 0x%lx não está no conjunto de caracteres fonte básico\n"
-#: charset.c:798 charset.c:1768
+#: charset.c:801 charset.c:1771
msgid "converting to execution character set"
msgstr "convertendo para conjunto de caracteres da execução"
-#: charset.c:804
+#: charset.c:807
#, c-format
msgid "character 0x%lx is not unibyte in execution character set"
msgstr "caractere 0x%lx não é unibyte no conjunto de caracteres de execução"
-#: charset.c:1054
+#: charset.c:1057
msgid "universal character names are only valid in C++ and C99"
msgstr "nomes de caractere universais são válidos apenas em C++ e C99"
-#: charset.c:1058
+#: charset.c:1061
msgid "C99's universal character names are incompatible with C90"
msgstr "nomes de caractere universais do C99 são incompatíveis com C90"
-#: charset.c:1061
+#: charset.c:1064
#, c-format
msgid "the meaning of '\\%c' is different in traditional C"
msgstr "o significado de \"\\%c\" é diferente em C tradicional"
-#: charset.c:1070
+#: charset.c:1073
msgid "In _cpp_valid_ucn but not a UCN"
msgstr "Em _cpp_valid_ucn, mas não é um UCN"
-#: charset.c:1103
+#: charset.c:1106
#, c-format
msgid "incomplete universal character name %.*s"
msgstr "nome de caractere universal incompleto %.*s"
-#: charset.c:1118
+#: charset.c:1121
#, c-format
msgid "%.*s is not a valid universal character"
msgstr "%.*s não é um caractere universal válido"
-#: charset.c:1128 lex.c:1335
+#: charset.c:1131 lex.c:1335
msgid "'$' in identifier or number"
msgstr "\"$\" em identificador ou número"
-#: charset.c:1138
+#: charset.c:1141
#, c-format
msgid "universal character %.*s is not valid in an identifier"
msgstr "caractere universal %.*s não é válido em um identificador"
-#: charset.c:1142
+#: charset.c:1145
#, c-format
msgid "universal character %.*s is not valid at the start of an identifier"
msgstr "caractere universal %.*s não é válido no começo de um identificador"
-#: charset.c:1149
+#: charset.c:1152
#, c-format
msgid "%.*s is outside the UCS codespace"
msgstr "%.*s está fora do espaço de código UCS"
-#: charset.c:1194 charset.c:2113
+#: charset.c:1197 charset.c:2116
msgid "converting UCN to source character set"
msgstr "convertendo UCN para conjunto de caracteres fonte"
-#: charset.c:1201
+#: charset.c:1204
msgid "converting UCN to execution character set"
msgstr "convertendo UCN para conjunto de caracteres de execução"
-#: charset.c:1265
+#: charset.c:1268
#, c-format
msgid "extended character %.*s is not valid in an identifier"
msgstr "caractere estendido %.*s não é válido em um identificador"
-#: charset.c:1282
+#: charset.c:1285
#, c-format
msgid "extended character %.*s is not valid at the start of an identifier"
msgstr "caractere estendido %.*s não é válido no começo de um identificador"
-#: charset.c:1368
+#: charset.c:1371
msgid "the meaning of '\\x' is different in traditional C"
msgstr "o significado de \"\\x\" é diferente em C tradicional"
-#: charset.c:1393
+#: charset.c:1396
msgid "\\x used with no following hex digits"
msgstr "\\x usado com nenhum dígito hexa"
-#: charset.c:1400
+#: charset.c:1403
msgid "hex escape sequence out of range"
msgstr "sequência de escape hexa fora de alcance"
-#: charset.c:1452
+#: charset.c:1455
msgid "octal escape sequence out of range"
msgstr "sequência de escape octal fora de alcance"
-#: charset.c:1534
+#: charset.c:1537
msgid "the meaning of '\\a' is different in traditional C"
msgstr "o significado de \"\\a\" é diferente em C tradicional"
-#: charset.c:1541
+#: charset.c:1544
#, c-format
msgid "non-ISO-standard escape sequence, '\\%c'"
msgstr "sequência de escape não padrão ISO, \"\\%c\""
-#: charset.c:1549
+#: charset.c:1552
#, c-format
msgid "unknown escape sequence: '\\%c'"
msgstr "sequência de escape desconhecida: \"\\%c\""
-#: charset.c:1557
+#: charset.c:1560
#, c-format
msgid "unknown escape sequence: '\\%s'"
msgstr "sequência de escape desconhecida: \"\\%s\""
-#: charset.c:1565
+#: charset.c:1568
msgid "converting escape sequence to execution character set"
msgstr "convertendo sequência de escape para conjunto de caracteres de execução"
-#: charset.c:1705
+#: charset.c:1708
msgid "missing open quote"
msgstr "faltando abrir aspas"
-#: charset.c:1923 charset.c:2002
+#: charset.c:1926 charset.c:2005
msgid "character constant too long for its type"
msgstr "constante caractere muito longa para seu tipo"
-#: charset.c:1926
+#: charset.c:1929
msgid "multi-character character constant"
msgstr "constante de caractere multi-caractere"
-#: charset.c:2042
+#: charset.c:2045
msgid "empty character constant"
msgstr "constante caractere vazia"
-#: charset.c:2160
+#: charset.c:2163
#, c-format
msgid "failure to convert %s to %s"
msgstr "falha ao converter %s para %s"
@@ -236,203 +237,199 @@ msgstr "nomes de macro devem ser identificadores"
msgid "undefining \"%s\""
msgstr "removendo definição de \"%s\""
-#: directives.c:724
+#: directives.c:725
msgid "missing terminating > character"
msgstr "faltando caractere terminador >"
-#: directives.c:783
+#: directives.c:784
#, c-format
msgid "#%s expects \"FILENAME\" or <FILENAME>"
msgstr "#%s espera \"NOME DE ARQUIVO\" OU <NOME DE ARQUIVO>"
-#: directives.c:829
+#: directives.c:830
#, c-format
msgid "empty filename in #%s"
msgstr "nome de arquivo vazio em #%s"
-#: directives.c:838
+#: directives.c:839
#, c-format
msgid "#include nested depth %u exceeds maximum of %u (use -fmax-include-depth=DEPTH to increase the maximum)"
msgstr "#include aninhado em profundidade %u excede o máximo de %u (use -fmax-include-depth=PROFUNDIDADE para aumentar o máximo)"
-#: directives.c:883
+#: directives.c:884
msgid "#include_next in primary source file"
msgstr "#include_next no arquivo fonte primário"
-#: directives.c:909
+#: directives.c:910
#, c-format
msgid "invalid flag \"%s\" in line directive"
msgstr "opção inválida \"%s\" na diretiva de linha"
-#: directives.c:969
+#: directives.c:970
msgid "unexpected end of file after #line"
msgstr "fim de arquivo inesperado após #line"
-#: directives.c:972
+#: directives.c:973
#, c-format
msgid "\"%s\" after #line is not a positive integer"
msgstr "\"%s\" após #line não é um inteiro positivo"
-#: directives.c:978 directives.c:980
+#: directives.c:979 directives.c:981
msgid "line number out of range"
msgstr "número da linha fora de alcance"
-#: directives.c:993 directives.c:1074
+#: directives.c:994 directives.c:1075
#, c-format
msgid "\"%s\" is not a valid filename"
msgstr "\"%s\" não é um nome de arquivo válido"
-#: directives.c:1034
+#: directives.c:1035
#, c-format
msgid "\"%s\" after # is not a positive integer"
msgstr "\"%s\" após # não é um inteiro positivo"
-#: directives.c:1101
+#: directives.c:1102
#, c-format
msgid "file \"%s\" linemarker ignored due to incorrect nesting"
msgstr "marcador de linha do arquivo \"%s\" ignorado em razão de aninhamento incorreto"
-#: directives.c:1162 directives.c:1164 directives.c:1166 directives.c:1754
+#: directives.c:1180 directives.c:1182 directives.c:1184 directives.c:1772
#, c-format
msgid "%s"
msgstr "%s"
-#: directives.c:1190
+#: directives.c:1208
#, c-format
msgid "invalid #%s directive"
msgstr "diretiva inválida #%s"
-#: directives.c:1253
+#: directives.c:1271
#, c-format
msgid "registering pragmas in namespace \"%s\" with mismatched name expansion"
msgstr "registrando pragmas em espaço de nomes \"%s\" com expansão de nome incompatível"
-#: directives.c:1262
+#: directives.c:1280
#, c-format
msgid "registering pragma \"%s\" with name expansion and no namespace"
msgstr "registrando pragma \"%s\" com expansão de nome e nenhum espaço de nomes"
-#: directives.c:1280
+#: directives.c:1298
#, c-format
msgid "registering \"%s\" as both a pragma and a pragma namespace"
msgstr "registrando \"%s\" como tanto um pragma e um espaço de nomes de pragma"
-#: directives.c:1283
+#: directives.c:1301
#, c-format
msgid "#pragma %s %s is already registered"
msgstr "#pragma %s %s já está registrado"
-#: directives.c:1286
+#: directives.c:1304
#, c-format
msgid "#pragma %s is already registered"
msgstr "#pragma %s já está registrado"
-#: directives.c:1316
+#: directives.c:1334
msgid "registering pragma with NULL handler"
msgstr "registrando pragma com manipulador NULO"
-#: directives.c:1533
+#: directives.c:1551
msgid "#pragma once in main file"
msgstr "#pragma ocorre uma vez no arquivo principal"
-#: directives.c:1556
+#: directives.c:1574
msgid "invalid #pragma push_macro directive"
msgstr "diretiva inválida #pragma push_macro"
-#: directives.c:1613
+#: directives.c:1631
msgid "invalid #pragma pop_macro directive"
msgstr "diretiva inválida #pragma pop_macro"
-#: directives.c:1668
+#: directives.c:1686
msgid "invalid #pragma GCC poison directive"
msgstr "diretiva inválida #pragma GCC poison"
-#: directives.c:1677
+#: directives.c:1695
#, c-format
msgid "poisoning existing macro \"%s\""
msgstr "envenenando macro existente \"%s\""
-#: directives.c:1696
+#: directives.c:1714
msgid "#pragma system_header ignored outside include file"
msgstr "#pragma system_header ignorado fora do arquivo include"
-#: directives.c:1721
+#: directives.c:1739
#, c-format
msgid "cannot find source file %s"
msgstr "não foi possível localizar o arquivo fonte %s"
-#: directives.c:1725
+#: directives.c:1743
#, c-format
msgid "current file is older than %s"
msgstr "arquivo atual é mais velho do que %s"
-#: directives.c:1749
+#: directives.c:1767
#, c-format
msgid "invalid \"#pragma GCC %s\" directive"
msgstr "diretiva inválida \"#pragma GCC %s\""
-#: directives.c:1950
+#: directives.c:1968
msgid "_Pragma takes a parenthesized string literal"
msgstr "_Pragma leva uma literal de string entre parenteses"
-#: directives.c:2033
+#: directives.c:2051
msgid "#else without #if"
msgstr "#else sem #if"
-#: directives.c:2038
+#: directives.c:2056
msgid "#else after #else"
msgstr "#else após #else"
-#: directives.c:2040 directives.c:2073
+#: directives.c:2058 directives.c:2091
msgid "the conditional began here"
msgstr "a condicional começou aqui"
-#: directives.c:2066
+#: directives.c:2084
msgid "#elif without #if"
msgstr "#elif sem #if"
-#: directives.c:2071
+#: directives.c:2089
msgid "#elif after #else"
msgstr "#elif após #else"
-#: directives.c:2102
+#: directives.c:2120
msgid "#endif without #if"
msgstr "#endif sem #if"
-#: directives.c:2178
+#: directives.c:2196
msgid "missing '(' after predicate"
msgstr "faltando \"(\" após predicado"
-#: directives.c:2196
+#: directives.c:2214
msgid "missing ')' to complete answer"
msgstr "faltando \")\" para uma resposta completa"
-#: directives.c:2208
+#: directives.c:2226
msgid "predicate's answer is empty"
msgstr "resposta do predicado está vazia"
-#: directives.c:2238
+#: directives.c:2256
msgid "assertion without predicate"
msgstr "asserção sem predicado"
-#: directives.c:2241
+#: directives.c:2259
msgid "predicate must be an identifier"
msgstr "predicado deve ser um identificador"
-#: directives.c:2323
+#: directives.c:2341
#, c-format
msgid "\"%s\" re-asserted"
msgstr "\"%s\" re-assertado"
-#: directives.c:2604
+#: directives.c:2659
#, c-format
msgid "unterminated #%s"
msgstr "#%s não terminado"
-#: directives-only.c:221 lex.c:2879 traditional.c:174
-msgid "unterminated comment"
-msgstr "comentário não terminado"
-
#: errors.c:291
#, c-format
msgid "%s: %s"
@@ -442,215 +439,227 @@ msgstr "%s: %s"
msgid "stdout"
msgstr "saída padrão"
-#: expr.c:626 expr.c:743
+#: expr.c:636 expr.c:753
msgid "fixed-point constants are a GCC extension"
msgstr "constantes de ponto fixo (fixed-point constants) são uma extensão GCC"
-#: expr.c:651
+#: expr.c:661
msgid "invalid prefix \"0b\" for floating constant"
msgstr "prefixo inválido \"0b\" para constante flutuante"
-#: expr.c:664
+#: expr.c:674
msgid "use of C++17 hexadecimal floating constant"
msgstr "uso de constante flutuante hexadecimal de C++17"
-#: expr.c:667
+#: expr.c:677
msgid "use of C99 hexadecimal floating constant"
msgstr "uso de constante flutuante hexadecimal de C99"
-#: expr.c:711
+#: expr.c:721
#, c-format
msgid "invalid suffix \"%.*s\" on floating constant"
msgstr "sufixo inválido \"%.*s\" na constante flutuante"
-#: expr.c:722 expr.c:789
+#: expr.c:732 expr.c:799
#, c-format
msgid "traditional C rejects the \"%.*s\" suffix"
msgstr "C tradicional rejeita o sufixo \"%.*s\""
-#: expr.c:730
+#: expr.c:740
msgid "suffix for double constant is a GCC extension"
msgstr "sufixo para constante dupla (suffix for double constant) é uma extensão GCC"
-#: expr.c:736
+#: expr.c:746
#, c-format
msgid "invalid suffix \"%.*s\" with hexadecimal floating constant"
msgstr "sufixo inválido \"%.*s\" com constante flutuante hexadecimal"
-#: expr.c:749 expr.c:753
+#: expr.c:759 expr.c:763
msgid "decimal float constants are a C2X feature"
msgstr "constantes flutuante decimais são um recurso de C2X"
-#: expr.c:772
+#: expr.c:782
#, c-format
msgid "invalid suffix \"%.*s\" on integer constant"
msgstr "sufixo inválido \"%.*s\" em constante inteiro"
-#: expr.c:797
+#: expr.c:807
msgid "use of C++11 long long integer constant"
msgstr "uso de constante longo longo inteiro de C++11"
-#: expr.c:798
+#: expr.c:808
msgid "use of C99 long long integer constant"
msgstr "uso de constante longo longo inteiro de C99"
-#: expr.c:814
+#: expr.c:822
+msgid "use of C++23 %<size_t%> integer constant"
+msgstr "uso de constante %<size_t%> inteiro de C++23"
+
+#: expr.c:823
+msgid "use of C++23 %<make_signed_t<size_t>%> integer constant"
+msgstr "uso de constante %<make_signed_t<size_t>%> inteiro de C++23"
+
+#: expr.c:834
msgid "imaginary constants are a GCC extension"
msgstr "constantes imaginárias (imaginary constants) são uma extensão GCC"
-#: expr.c:820
+#: expr.c:841
msgid "binary constants are a C++14 feature or GCC extension"
-msgstr "constantes binárias (binary constants) são um recurso de C++14 ou uma extensão GCC"
+msgstr "constantes binárias são um recurso de C++14 ou uma extensão GCC"
-#: expr.c:822
-msgid "binary constants are a GCC extension"
-msgstr "constantes binárias (binary constants) são uma extensão GCC"
+#: expr.c:843
+msgid "binary constants are a C2X feature or GCC extension"
+msgstr "constantes binárias são um recurso de C2X ou uma extensão GCC"
+
+#: expr.c:848
+msgid "binary constants are a C2X feature"
+msgstr "constantes binárias são um recurso de C2X"
-#: expr.c:917
+#: expr.c:944
msgid "integer constant is too large for its type"
msgstr "constante inteira é muito grande para seu tipo"
-#: expr.c:948
+#: expr.c:975
msgid "integer constant is so large that it is unsigned"
msgstr "constante inteira é tão grande que não está assinada"
-#: expr.c:1043
+#: expr.c:1070
msgid "missing ')' after \"defined\""
msgstr "faltando \")\" após \"defined\""
-#: expr.c:1050
+#: expr.c:1077
msgid "operator \"defined\" requires an identifier"
msgstr "operador \"defined\" requer um identificador"
-#: expr.c:1058
+#: expr.c:1085
#, c-format
msgid "(\"%s\" is an alternative token for \"%s\" in C++)"
msgstr "(\"%s\" é um token alternativo para \"%s\" em C++)"
-#: expr.c:1070
+#: expr.c:1098
msgid "this use of \"defined\" may not be portable"
msgstr "esse uso de \"defined\" pode não ser portátil"
-#: expr.c:1113
+#: expr.c:1143
msgid "user-defined literal in preprocessor expression"
msgstr "literal definida pelo usuário em expressão do preprocessador"
-#: expr.c:1118
+#: expr.c:1148
msgid "floating constant in preprocessor expression"
msgstr "constante flutuante em expressão do preprocessador"
-#: expr.c:1124
+#: expr.c:1154
msgid "imaginary number in preprocessor expression"
msgstr "número imaginário em expressão do preprocessador"
-#: expr.c:1173
+#: expr.c:1203
#, c-format
msgid "\"%s\" is not defined, evaluates to 0"
msgstr "\"%s\" não está definido, avalia para 0"
-#: expr.c:1186
+#: expr.c:1216
msgid "assertions are a GCC extension"
msgstr "asserções (assertions) são uma extensão GCC"
-#: expr.c:1189
+#: expr.c:1219
msgid "assertions are a deprecated extension"
msgstr "asserções (assertions) são uma extensão obsoleta"
-#: expr.c:1435
+#: expr.c:1465
#, c-format
msgid "unbalanced stack in %s"
msgstr "pilha não balanceada em %s"
-#: expr.c:1455
+#: expr.c:1485
#, c-format
msgid "impossible operator '%u'"
msgstr "operador impossível \"%u\""
-#: expr.c:1556
+#: expr.c:1586
msgid "missing ')' in expression"
msgstr "faltando \")\" na expressão"
-#: expr.c:1585
+#: expr.c:1615
msgid "'?' without following ':'"
msgstr "\"?\" sem estar seguido por \":\""
-#: expr.c:1595
+#: expr.c:1625
msgid "integer overflow in preprocessor expression"
msgstr "estouro de inteiro em expressão do preprocessador"
-#: expr.c:1600
+#: expr.c:1630
msgid "missing '(' in expression"
msgstr "faltando \"(\" na expressão"
-#: expr.c:1632
+#: expr.c:1662
#, c-format
msgid "the left operand of \"%s\" changes sign when promoted"
msgstr "o operador à esquerda de \"%s\" altera o sinal quando promovido"
-#: expr.c:1637
+#: expr.c:1667
#, c-format
msgid "the right operand of \"%s\" changes sign when promoted"
msgstr "o operador à direita de \"%s\" altera o sinal quando promovido"
-#: expr.c:1896
+#: expr.c:1926
msgid "traditional C rejects the unary plus operator"
msgstr "C tradicional rejeita o operador unário mais"
-#: expr.c:1994
+#: expr.c:2024
msgid "comma operator in operand of #if"
msgstr "operador vírgula em operando de #if"
-#: expr.c:2130
+#: expr.c:2160
msgid "division by zero in #if"
msgstr "divisão por zero em #if"
-#: files.c:576
+#: files.c:571
msgid "one or more PCH files were found, but they were invalid"
msgstr "um ou mais arquivos PCH foram encontrados, mas são inválidos"
-#: files.c:580
+#: files.c:575
msgid "use -Winvalid-pch for more information"
msgstr "use -Winvalid-pch para mais informações"
-#: files.c:1004
+#: files.c:1051
#, c-format
msgid "no include path in which to search for %s"
msgstr "não foi incluído nenhum caminho no qual se possa procurar por %s"
-#: files.c:1439
+#: files.c:1546
msgid "Multiple include guards may be useful for:\n"
msgstr "Múltiplos include guards podem ser úteis para:\n"
-#: init.c:598
+#: init.c:614
msgid "cppchar_t must be an unsigned type"
msgstr "cppchar_t deve ser um tipo não assinado"
-#: init.c:602
+#: init.c:618
#, c-format
msgid "preprocessor arithmetic has maximum precision of %lu bits; target requires %lu bits"
msgstr "aritmética do preprocessador possui uma precisão máxima de %lu bits; o alvo requer %lu bits"
-#: init.c:609
+#: init.c:625
msgid "CPP arithmetic must be at least as precise as a target int"
msgstr "aritmética do CPP deve ser pelo menos tão precisa quanto um int alvo"
-#: init.c:612
+#: init.c:628
msgid "target char is less than 8 bits wide"
msgstr "char alvo é menor do que 8 bits"
-#: init.c:616
+#: init.c:632
msgid "target wchar_t is narrower than target char"
msgstr "wchar_t alvo é mais estreito do que o char alvo"
-#: init.c:620
+#: init.c:636
msgid "target int is narrower than target char"
msgstr "int alvo é mais estreito do que o char alvo"
-#: init.c:625
+#: init.c:641
msgid "CPP half-integer narrower than CPP character"
msgstr "meio-inteiro do CPP é mais estreito do que o caractere do CPP"
-#: init.c:629
+#: init.c:645
#, c-format
msgid "CPP on this host cannot handle wide character constants over %lu bits, but the target requires %lu bits"
msgstr "CPP nesta máquina não consegue manipular constantes de wide character acima de %lu bits, mas o alvo requer %lu bits"
@@ -697,12 +706,12 @@ msgid "`%.*s' is not in NFC"
msgstr "\"%.*s\" não está em NFC"
#: lex.c:1375
-msgid "__VA_OPT__ is not available until C++2a"
-msgstr "__VA_OPT__ não está disponível até C++2a"
+msgid "__VA_OPT__ is not available until C++20"
+msgstr "__VA_OPT__ não está disponível até C++20"
#: lex.c:1382
-msgid "__VA_OPT__ can only appear in the expansion of a C++2a variadic macro"
-msgstr "__VA_OPT__ pode aparecer apenas na expansão de uma macro variádica C++2a"
+msgid "__VA_OPT__ can only appear in the expansion of a C++20 variadic macro"
+msgstr "__VA_OPT__ pode aparecer apenas na expansão de uma macro variádica C++20"
#: lex.c:1413 lex.c:1506
#, c-format
@@ -722,234 +731,256 @@ msgstr "__VA_ARGS__ pode aparecer apenas na expansão de uma macro variádica C9
msgid "identifier \"%s\" is a special operator name in C++"
msgstr "identificador \"%s\" é o nome de um operador especial em C++"
-#: lex.c:1837
+#: lex.c:1879
msgid "raw string delimiter longer than 16 characters"
msgstr "delimitador de string não tratada (raw) maior do que 16 caracteres"
-#: lex.c:1841
+#: lex.c:1883
msgid "invalid new-line in raw string delimiter"
msgstr "nova linha inválida em delimitador de string não tratada (raw)"
-#: lex.c:1845
+#: lex.c:1887 lex.c:4639
#, c-format
msgid "invalid character '%c' in raw string delimiter"
msgstr "caractere inválido \"%c\" em delimitador de string não tratada (raw)"
-#: lex.c:1894 lex.c:1916
+#: lex.c:1926 lex.c:1949
msgid "unterminated raw string"
msgstr "string não tratada (raw) não terminada"
-#: lex.c:1936 lex.c:2065
+#: lex.c:1971 lex.c:2100
msgid "invalid suffix on literal; C++11 requires a space between literal and string macro"
msgstr "sufixo inválido em literal; C++11 requer um espaço entre literal e macro de string"
-#: lex.c:2048
+#: lex.c:2083
msgid "null character(s) preserved in literal"
msgstr "um ou mais caracteres nulos preservados em literal"
-#: lex.c:2051
+#: lex.c:2086
#, c-format
msgid "missing terminating %c character"
msgstr "faltando o caractere de terminação %c"
-#: lex.c:2083
+#: lex.c:2118
msgid "C++11 requires a space between string literal and macro"
msgstr "C++11 requer um espaço entre literal e macro de string"
-#: lex.c:2893 lex.c:2927
+#: lex.c:2711
+msgid "module control-line cannot be in included file"
+msgstr "a linha de controle de módulo não pode estar no arquivo incluído"
+
+#: lex.c:2725
+#, c-format
+msgid "module control-line \"%s\" cannot be an object-like macro"
+msgstr "a linha de controle de módulo \"%s\" não pode ser uma macro do tipo objeto"
+
+#: lex.c:3099 lex.c:4472 traditional.c:174
+msgid "unterminated comment"
+msgstr "comentário não terminado"
+
+#: lex.c:3113 lex.c:3147
msgid "C++ style comments are not allowed in ISO C90"
msgstr "comentários no estilo C++ não são permitidos em ISO C90"
-#: lex.c:2895 lex.c:2906 lex.c:2930
+#: lex.c:3115 lex.c:3126 lex.c:3150
msgid "(this will be reported only once per input file)"
msgstr "(isso será relatado apenas uma vez por arquivo de entrada)"
-#: lex.c:2904
+#: lex.c:3124
msgid "C++ style comments are incompatible with C90"
msgstr "comentários no estilo C++ são incompatíveis com C90"
-#: lex.c:2936
+#: lex.c:3156
msgid "multi-line comment"
msgstr "comentário multilinha"
-#: lex.c:3330
+#: lex.c:3550
#, c-format
msgid "unspellable token %s"
msgstr "token %s impronunciável"
+#: lex.c:4627
+#, c-format
+msgid "raw string delimiter longer than %d characters"
+msgstr "delimitador de string não tratada (raw) maior do que %d caracteres"
+
+#: lex.c:4697
+msgid "unterminated literal"
+msgstr "literal não terminada"
+
#: macro.c:94
msgid "'##' cannot appear at either end of __VA_OPT__"
msgstr "\"##\" não pode aparecer no final de __VA_OPT__"
-#: macro.c:364
+#: macro.c:386
#, c-format
msgid "\"%s\" used outside of preprocessing directive"
msgstr "\"%s\" usado fora de uma diretiva de preprocessamento"
-#: macro.c:374
+#: macro.c:396
#, c-format
msgid "missing '(' before \"%s\" operand"
msgstr "faltando \"(\" antes do operando \"%s\""
-#: macro.c:389
+#: macro.c:411
#, c-format
msgid "operator \"%s\" requires a header-name"
msgstr "operador \"%s\" requer um header-name"
-#: macro.c:406
+#: macro.c:428
#, c-format
msgid "missing ')' after \"%s\" operand"
msgstr "faltando \")\" após o operando \"%s\""
-#: macro.c:426
+#: macro.c:448
#, c-format
msgid "macro \"%s\" is not used"
msgstr "macro \"%s\" não é usada"
-#: macro.c:465 macro.c:723
+#: macro.c:487 macro.c:778
#, c-format
msgid "invalid built-in macro \"%s\""
msgstr "macro interna inválida \"%s\""
-#: macro.c:472 macro.c:574
+#: macro.c:494 macro.c:596
#, c-format
msgid "macro \"%s\" might prevent reproducible builds"
msgstr "macro \"%s\" pode evitar compilações reproduzíveis"
-#: macro.c:503
+#: macro.c:525
msgid "could not determine file timestamp"
msgstr "não foi possível determinar o arquivo de marca de tempo"
-#: macro.c:620
+#: macro.c:610
msgid "could not determine date and time"
msgstr "não foi possível determinar a data e a hora"
-#: macro.c:636
+#: macro.c:642
msgid "__COUNTER__ expanded inside directive with -fdirectives-only"
msgstr "__COUNTER__ expandido dentro diretiva com -fdirectives-only"
-#: macro.c:842
+#: macro.c:897
msgid "invalid string literal, ignoring final '\\'"
msgstr "literal de string inválida, ignorando final \"\\\""
-#: macro.c:904
+#: macro.c:959
#, c-format
msgid "pasting \"%s\" and \"%s\" does not give a valid preprocessing token"
msgstr "colar \"%s\" em \"%s\" não resulta em nenhum token de preprocessamento válido"
-#: macro.c:1030
+#: macro.c:1085
msgid "ISO C++11 requires at least one argument for the \"...\" in a variadic macro"
msgstr "ISO C++11 requer pelo menos um argumento para o \"...\" em uma macro variádica"
-#: macro.c:1034
+#: macro.c:1089
msgid "ISO C99 requires at least one argument for the \"...\" in a variadic macro"
msgstr "ISO C99 requer pelo menos um argumento para o \"...\" em uma macro variádica"
-#: macro.c:1041
+#: macro.c:1096
#, c-format
msgid "macro \"%s\" requires %u arguments, but only %u given"
msgstr "macro \"%s\" requer %u argumentos, mas apenas %u foram fornecidos"
-#: macro.c:1046
+#: macro.c:1101
#, c-format
msgid "macro \"%s\" passed %u arguments, but takes just %u"
msgstr "macro \"%s\" passou %u argumentos, mas usa apenas %u"
-#: macro.c:1244 traditional.c:815
+#: macro.c:1299 traditional.c:822
#, c-format
msgid "unterminated argument list invoking macro \"%s\""
msgstr "lista de argumentos interminável chamando macro \"%s\""
-#: macro.c:1386
+#: macro.c:1442
#, c-format
msgid "function-like macro \"%s\" must be used with arguments in traditional C"
msgstr "macro \"%s\" do tipo função deve ser usada com argumento em C tradicional"
# http://gcc.gnu.org/bugzilla/show_bug.cgi?id=33305
-#: macro.c:2165
+#: macro.c:2220
#, c-format
msgid "invoking macro %s argument %d: empty macro arguments are undefined in ISO C++98"
msgstr "chamando macro %s argumento %d: argumentos de macro vazios estão indefinidos em ISO C++98"
# http://gcc.gnu.org/bugzilla/show_bug.cgi?id=33305
-#: macro.c:2173 macro.c:2182
+#: macro.c:2228 macro.c:2237
#, c-format
msgid "invoking macro %s argument %d: empty macro arguments are undefined in ISO C90"
msgstr "chamando macro %s argumento %d: argumentos de macro vazios estão indefinidos em ISO C90"
-#: macro.c:3141
+#: macro.c:3279
#, c-format
msgid "duplicate macro parameter \"%s\""
msgstr "parâmetro de macro \"%s\" duplicado"
-#: macro.c:3223
+#: macro.c:3361
#, c-format
msgid "expected parameter name, found \"%s\""
msgstr "esperava nome de parâmetro, encontrou \"%s\""
-#: macro.c:3224
+#: macro.c:3362
#, c-format
msgid "expected ',' or ')', found \"%s\""
msgstr "esperava \",\" ou \")\", encontrou \"%s\""
-#: macro.c:3225
+#: macro.c:3363
msgid "expected parameter name before end of line"
msgstr "esperava nome de parâmetro antes do fim de linha"
-#: macro.c:3226
+#: macro.c:3364
msgid "expected ')' before end of line"
msgstr "esperava \")\" antes do fim de linha"
-#: macro.c:3227
+#: macro.c:3365
msgid "expected ')' after \"...\""
msgstr "esperava \")\" após \"...\""
-#: macro.c:3284
+#: macro.c:3422
msgid "anonymous variadic macros were introduced in C++11"
msgstr "macros variádicas anônimas foram introduzidas em C++11"
-#: macro.c:3285 macro.c:3289
+#: macro.c:3423 macro.c:3427
msgid "anonymous variadic macros were introduced in C99"
msgstr "macros variádicas anônimas foram introduzidas em C99"
-#: macro.c:3295
+#: macro.c:3433
msgid "ISO C++ does not permit named variadic macros"
msgstr "ISO C++ não permite macros variádicas nomeadas"
-#: macro.c:3296
+#: macro.c:3434
msgid "ISO C does not permit named variadic macros"
msgstr "ISO C não permite macros variádicas nomeadas"
-#: macro.c:3342
+#: macro.c:3480
msgid "'##' cannot appear at either end of a macro expansion"
msgstr "\"##\" não pode aparecer no final da expansão de macro"
-#: macro.c:3380
+#: macro.c:3518
msgid "ISO C++11 requires whitespace after the macro name"
msgstr "ISO C++11 requer espaço em branco após o nome de macro"
-#: macro.c:3381
+#: macro.c:3519
msgid "ISO C99 requires whitespace after the macro name"
msgstr "ISO C99 requer espaço em branco após o nome de macro"
-#: macro.c:3405
+#: macro.c:3543
msgid "missing whitespace after the macro name"
msgstr "faltando espaço em branco após o nome de macro"
-#: macro.c:3455
+#: macro.c:3593
msgid "'#' is not followed by a macro parameter"
msgstr "\"#\" não está seguido por um parâmetro de macro"
-#: macro.c:3606
+#: macro.c:3749
#, c-format
msgid "\"%s\" redefined"
msgstr "\"%s\" re-definido"
-#: macro.c:3611
+#: macro.c:3754
msgid "this is the location of the previous definition"
msgstr "essa é a localização da definição anterior"
-#: macro.c:3715
+#: macro.c:3891
#, c-format
msgid "macro argument \"%s\" would be stringified in traditional C"
msgstr "argumento de macro \"%s\" estaria em uma string no C tradicional"
@@ -987,15 +1018,18 @@ msgstr "%s: não usado porque \"__COUNTER__\" é inválido"
msgid "while reading precompiled header"
msgstr "enquanto realizava leitura de cabeçalho pré-compilado"
-#: traditional.c:884
+#: traditional.c:891
#, c-format
msgid "detected recursion whilst expanding macro \"%s\""
msgstr "detectada recursão enquanto expandia macro \"%s\""
-#: traditional.c:1107
+#: traditional.c:1114
msgid "syntax error in macro parameter list"
msgstr "erro de sintaxe na lista de parâmetros de macro"
+#~ msgid "binary constants are a GCC extension"
+#~ msgstr "constantes binárias (binary constants) são uma extensão GCC"
+
#~ msgid "\"__has_include__\" cannot be used as a macro name"
#~ msgstr "\"__has_include__\" não pode ser usado como um nome de macro"
diff --git a/libcpp/po/ru.po b/libcpp/po/ru.po
index 3f1366e..ef72a54 100644
--- a/libcpp/po/ru.po
+++ b/libcpp/po/ru.po
@@ -2,13 +2,13 @@
# Copyright (C) 2011 Free Software Foundation, Inc.
# This file is distributed under the same license as the gcc package.
#
-# Yuri Kozlov <yuray@komyakino.ru>, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020.
+# Yuri Kozlov <yuray@komyakino.ru>, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021.
msgid ""
msgstr ""
-"Project-Id-Version: cpplib 10.1-b20200209\n"
+"Project-Id-Version: cpplib 11.1-b20210207\n"
"Report-Msgid-Bugs-To: https://gcc.gnu.org/bugs/\n"
-"POT-Creation-Date: 2020-02-07 22:33+0000\n"
-"PO-Revision-Date: 2020-02-29 09:20+0300\n"
+"POT-Creation-Date: 2021-02-05 21:38+0000\n"
+"PO-Revision-Date: 2021-02-17 12:48+0300\n"
"Last-Translator: Yuri Kozlov <yuray@komyakino.ru>\n"
"Language-Team: Russian <gnu@d07.ru>\n"
"Language: ru\n"
@@ -16,157 +16,157 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Bugs: Report translation errors to the Language-Team address.\n"
-"X-Generator: Lokalize 2.0\n"
+"X-Generator: Lokalize 20.12.0\n"
"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-#: charset.c:674
+#: charset.c:677
#, c-format
msgid "conversion from %s to %s not supported by iconv"
msgstr "преобразование из %s в %s не поддерживается iconv"
-#: charset.c:677
+#: charset.c:680
msgid "iconv_open"
msgstr "iconv_open"
-#: charset.c:685
+#: charset.c:688
#, c-format
msgid "no iconv implementation, cannot convert from %s to %s"
msgstr "нет реализации в iconv, невозможно преобразовать из %s в %s"
-#: charset.c:781
+#: charset.c:784
#, c-format
msgid "character 0x%lx is not in the basic source character set\n"
msgstr "символ 0x%lx отсутствует в простом наборе символов исходного кода\n"
-#: charset.c:798 charset.c:1768
+#: charset.c:801 charset.c:1771
msgid "converting to execution character set"
msgstr "преобразование в набор символов среды выполнения"
-#: charset.c:804
+#: charset.c:807
#, c-format
msgid "character 0x%lx is not unibyte in execution character set"
msgstr "символ 0x%lx не является юнибайтом (unibyte) в наборе символов среды выполнения"
-#: charset.c:1054
+#: charset.c:1057
msgid "universal character names are only valid in C++ and C99"
msgstr "универсальные имена символов допустимы только в C++ и C99"
-#: charset.c:1058
+#: charset.c:1061
msgid "C99's universal character names are incompatible with C90"
msgstr "универсальные имена символов C99 несовместимы с C90"
-#: charset.c:1061
+#: charset.c:1064
#, c-format
msgid "the meaning of '\\%c' is different in traditional C"
msgstr "назначение «\\%c» отличается в традиционном C"
-#: charset.c:1070
+#: charset.c:1073
msgid "In _cpp_valid_ucn but not a UCN"
msgstr "В _cpp_valid_ucn, но не UCN"
-#: charset.c:1103
+#: charset.c:1106
#, c-format
msgid "incomplete universal character name %.*s"
msgstr "неполное универсальное имя символа %.*s"
-#: charset.c:1118
+#: charset.c:1121
#, c-format
msgid "%.*s is not a valid universal character"
msgstr "%.*s не является допустимым универсальным именем символа"
-#: charset.c:1128 lex.c:1335
+#: charset.c:1131 lex.c:1335
msgid "'$' in identifier or number"
msgstr "«$» в идентификаторе или числе"
-#: charset.c:1138
+#: charset.c:1141
#, c-format
msgid "universal character %.*s is not valid in an identifier"
msgstr "универсальный символ %.*s недопустим в идентификаторе"
-#: charset.c:1142
+#: charset.c:1145
#, c-format
msgid "universal character %.*s is not valid at the start of an identifier"
msgstr "универсальный символ %.*s недопустим в начале идентификатора"
-#: charset.c:1149
+#: charset.c:1152
#, c-format
msgid "%.*s is outside the UCS codespace"
msgstr "%.*s находится вне пространства кодов UCS"
-#: charset.c:1194 charset.c:2113
+#: charset.c:1197 charset.c:2116
msgid "converting UCN to source character set"
msgstr "преобразование UCN в простой набор символов исходного кода"
-#: charset.c:1201
+#: charset.c:1204
msgid "converting UCN to execution character set"
msgstr "преобразование UCN в набор символов среды выполнения"
-#: charset.c:1265
+#: charset.c:1268
#, c-format
msgid "extended character %.*s is not valid in an identifier"
msgstr "расширенный символ %.*s недопустим в идентификаторе"
-#: charset.c:1282
+#: charset.c:1285
#, c-format
msgid "extended character %.*s is not valid at the start of an identifier"
msgstr "универсальный символ %.*s недопустим в начале идентификатора"
-#: charset.c:1368
+#: charset.c:1371
msgid "the meaning of '\\x' is different in traditional C"
msgstr "назначение «\\x» отличается в традиционном C"
-#: charset.c:1393
+#: charset.c:1396
msgid "\\x used with no following hex digits"
msgstr "после \\x нет шестнадцатеричных цифр"
-#: charset.c:1400
+#: charset.c:1403
msgid "hex escape sequence out of range"
msgstr "шестнадцатеричная экранирующая последовательность за пределами диапазона"
-#: charset.c:1452
+#: charset.c:1455
msgid "octal escape sequence out of range"
msgstr "восьмеричная экранированная последовательность за пределами диапазона"
-#: charset.c:1534
+#: charset.c:1537
msgid "the meaning of '\\a' is different in traditional C"
msgstr "назначение «\\a» отличается в традиционном C"
-#: charset.c:1541
+#: charset.c:1544
#, c-format
msgid "non-ISO-standard escape sequence, '\\%c'"
msgstr "не соответствующая стандарту ISO экранированная последовательность, «\\%c»"
-#: charset.c:1549
+#: charset.c:1552
#, c-format
msgid "unknown escape sequence: '\\%c'"
msgstr "неизвестная экранированная последовательность «\\%c»"
-#: charset.c:1557
+#: charset.c:1560
#, c-format
msgid "unknown escape sequence: '\\%s'"
msgstr "неизвестная экранированная последовательность «\\%s»"
-#: charset.c:1565
+#: charset.c:1568
msgid "converting escape sequence to execution character set"
msgstr "преобразование экранированной последовательности в набор символов среды выполнения"
-#: charset.c:1705
+#: charset.c:1708
msgid "missing open quote"
msgstr "отсутствует открывающая кавычка"
-#: charset.c:1923 charset.c:2002
+#: charset.c:1926 charset.c:2005
msgid "character constant too long for its type"
msgstr "символьная константа слишком длинна для своего типа"
-#: charset.c:1926
+#: charset.c:1929
msgid "multi-character character constant"
msgstr "многознаковая символьная константа"
-#: charset.c:2042
+#: charset.c:2045
msgid "empty character constant"
msgstr "пустая символьная константа"
-#: charset.c:2160
+#: charset.c:2163
#, c-format
msgid "failure to convert %s to %s"
msgstr "ошибка при преобразовании %s в %s"
@@ -237,203 +237,199 @@ msgstr "имена макросов должны быть идентификат
msgid "undefining \"%s\""
msgstr "неопределённая «%s»"
-#: directives.c:724
+#: directives.c:725
msgid "missing terminating > character"
msgstr "отсутствует завершающий символ >"
-#: directives.c:783
+#: directives.c:784
#, c-format
msgid "#%s expects \"FILENAME\" or <FILENAME>"
msgstr "для #%s ожидается \"ИМЯ_ФАЙЛА\" или <ИМЯ_ФАЙЛА>"
-#: directives.c:829
+#: directives.c:830
#, c-format
msgid "empty filename in #%s"
msgstr "пустое имя файла в #%s"
-#: directives.c:838
+#: directives.c:839
#, c-format
msgid "#include nested depth %u exceeds maximum of %u (use -fmax-include-depth=DEPTH to increase the maximum)"
msgstr "глубина вложенности #include, равная %u, превышает максимальное значение %u (чтобы увеличить максимум, укажите -fmax-include-depth=ГЛУБИНА)"
-#: directives.c:883
+#: directives.c:884
msgid "#include_next in primary source file"
msgstr "#include_next в первичном исходном файле"
-#: directives.c:909
+#: directives.c:910
#, c-format
msgid "invalid flag \"%s\" in line directive"
msgstr "неверный флаг «%s» в строковой директиве"
-#: directives.c:969
+#: directives.c:970
msgid "unexpected end of file after #line"
msgstr "неожиданный конец файла после #line"
-#: directives.c:972
+#: directives.c:973
#, c-format
msgid "\"%s\" after #line is not a positive integer"
msgstr "«%s» после #line не является положительным целым числом"
-#: directives.c:978 directives.c:980
+#: directives.c:979 directives.c:981
msgid "line number out of range"
msgstr "номер строки вне допустимых пределов"
-#: directives.c:993 directives.c:1074
+#: directives.c:994 directives.c:1075
#, c-format
msgid "\"%s\" is not a valid filename"
msgstr "«%s» не является допустимым именем файла"
-#: directives.c:1034
+#: directives.c:1035
#, c-format
msgid "\"%s\" after # is not a positive integer"
msgstr "«%s» после # не является положительным целым числом"
-#: directives.c:1101
+#: directives.c:1102
#, c-format
msgid "file \"%s\" linemarker ignored due to incorrect nesting"
msgstr "маркер строки файла «%s» игнорируется из-за некорректной вложенности"
-#: directives.c:1162 directives.c:1164 directives.c:1166 directives.c:1754
+#: directives.c:1180 directives.c:1182 directives.c:1184 directives.c:1772
#, c-format
msgid "%s"
msgstr "%s"
-#: directives.c:1190
+#: directives.c:1208
#, c-format
msgid "invalid #%s directive"
msgstr "неправильная директива #%s"
-#: directives.c:1253
+#: directives.c:1271
#, c-format
msgid "registering pragmas in namespace \"%s\" with mismatched name expansion"
msgstr "регистрируется прагма в пространстве имён «%s» с несовпадающим именным расширением"
-#: directives.c:1262
+#: directives.c:1280
#, c-format
msgid "registering pragma \"%s\" with name expansion and no namespace"
msgstr "регистрируется прагма «%s» с именным расширением, но без пространства имён"
-#: directives.c:1280
+#: directives.c:1298
#, c-format
msgid "registering \"%s\" as both a pragma and a pragma namespace"
msgstr "регистрируется «%s» как прагма и как пространство имён для прагм"
-#: directives.c:1283
+#: directives.c:1301
#, c-format
msgid "#pragma %s %s is already registered"
msgstr "#pragma %s %s уже зарегистрирована"
-#: directives.c:1286
+#: directives.c:1304
#, c-format
msgid "#pragma %s is already registered"
msgstr "#pragma %s уже зарегистрирована"
-#: directives.c:1316
+#: directives.c:1334
msgid "registering pragma with NULL handler"
msgstr "регистрируется прагма со значением обработчика равным NULL"
-#: directives.c:1533
+#: directives.c:1551
msgid "#pragma once in main file"
msgstr "#pragma once в главном файле"
-#: directives.c:1556
+#: directives.c:1574
msgid "invalid #pragma push_macro directive"
msgstr "неверная директива #pragma push_macro"
-#: directives.c:1613
+#: directives.c:1631
msgid "invalid #pragma pop_macro directive"
msgstr "неверная директива #pragma pop_macro"
-#: directives.c:1668
+#: directives.c:1686
msgid "invalid #pragma GCC poison directive"
msgstr "неверная директива #pragma GCC poison"
-#: directives.c:1677
+#: directives.c:1695
#, c-format
msgid "poisoning existing macro \"%s\""
msgstr "отравление существующего макроса «%s»"
-#: directives.c:1696
+#: directives.c:1714
msgid "#pragma system_header ignored outside include file"
msgstr "#pragma system_header игнорируется вне включаемого файла"
-#: directives.c:1721
+#: directives.c:1739
#, c-format
msgid "cannot find source file %s"
msgstr "не удалось найти исходный файл %s"
-#: directives.c:1725
+#: directives.c:1743
#, c-format
msgid "current file is older than %s"
msgstr "текущий файл старее чем %s"
-#: directives.c:1749
+#: directives.c:1767
#, c-format
msgid "invalid \"#pragma GCC %s\" directive"
msgstr "неверная директива #pragma GCC %s"
-#: directives.c:1950
+#: directives.c:1968
msgid "_Pragma takes a parenthesized string literal"
msgstr "для _Pragma требуется указать строковый литерал в скобках"
-#: directives.c:2033
+#: directives.c:2051
msgid "#else without #if"
msgstr "#else без #if"
-#: directives.c:2038
+#: directives.c:2056
msgid "#else after #else"
msgstr "#else после #else"
-#: directives.c:2040 directives.c:2073
+#: directives.c:2058 directives.c:2091
msgid "the conditional began here"
msgstr "условие начинается здесь"
-#: directives.c:2066
+#: directives.c:2084
msgid "#elif without #if"
msgstr "#elif без #if"
-#: directives.c:2071
+#: directives.c:2089
msgid "#elif after #else"
msgstr "#elif после #else"
-#: directives.c:2102
+#: directives.c:2120
msgid "#endif without #if"
msgstr "#endif без #if"
-#: directives.c:2178
+#: directives.c:2196
msgid "missing '(' after predicate"
msgstr "отсутствует «(» после предиката"
-#: directives.c:2196
+#: directives.c:2214
msgid "missing ')' to complete answer"
msgstr "отсутствует «)» для завершения ответа"
-#: directives.c:2208
+#: directives.c:2226
msgid "predicate's answer is empty"
msgstr "ответ предиката пуст"
-#: directives.c:2238
+#: directives.c:2256
msgid "assertion without predicate"
msgstr "утверждение без предиката"
-#: directives.c:2241
+#: directives.c:2259
msgid "predicate must be an identifier"
msgstr "предикат должен быть идентификатором"
-#: directives.c:2323
+#: directives.c:2341
#, c-format
msgid "\"%s\" re-asserted"
msgstr "повторное утверждение «%s»"
-#: directives.c:2604
+#: directives.c:2659
#, c-format
msgid "unterminated #%s"
msgstr "незавершённая #%s"
-#: directives-only.c:221 lex.c:2879 traditional.c:174
-msgid "unterminated comment"
-msgstr "незавершённый комментарий"
-
#: errors.c:291
#, c-format
msgid "%s: %s"
@@ -443,215 +439,227 @@ msgstr "%s: %s"
msgid "stdout"
msgstr "stdout"
-#: expr.c:626 expr.c:743
+#: expr.c:636 expr.c:753
msgid "fixed-point constants are a GCC extension"
msgstr "константы с фиксированный точкой являются расширением GCC"
-#: expr.c:651
+#: expr.c:661
msgid "invalid prefix \"0b\" for floating constant"
msgstr "неверный префикс «0b» в плавающей константе"
-#: expr.c:664
+#: expr.c:674
msgid "use of C++17 hexadecimal floating constant"
msgstr "использование шестнадцатеричной константы с плавающей точкой согласно C++17"
-#: expr.c:667
+#: expr.c:677
msgid "use of C99 hexadecimal floating constant"
msgstr "использование шестнадцатеричной константы с плавающей точкой согласно C99"
-#: expr.c:711
+#: expr.c:721
#, c-format
msgid "invalid suffix \"%.*s\" on floating constant"
msgstr "неверный суффикс «%.*s» в константе с плавающей точкой"
-#: expr.c:722 expr.c:789
+#: expr.c:732 expr.c:799
#, c-format
msgid "traditional C rejects the \"%.*s\" suffix"
msgstr "в традиционном C отвергается суффикс «%.*s»"
-#: expr.c:730
+#: expr.c:740
msgid "suffix for double constant is a GCC extension"
msgstr "суффикс для констант типа double является расширением GCC"
-#: expr.c:736
+#: expr.c:746
#, c-format
msgid "invalid suffix \"%.*s\" with hexadecimal floating constant"
msgstr "неверный суффикс «%.*s» в шестнадцатеричной плавающей константе"
-#: expr.c:749 expr.c:753
+#: expr.c:759 expr.c:763
msgid "decimal float constants are a C2X feature"
msgstr "десятичные плавающие константы являются расширением C2X"
-#: expr.c:772
+#: expr.c:782
#, c-format
msgid "invalid suffix \"%.*s\" on integer constant"
msgstr "неверный суффикс «%.*s» в целочисленной константе"
-#: expr.c:797
+#: expr.c:807
msgid "use of C++11 long long integer constant"
msgstr "использование целочисленной long long константы C++11"
-#: expr.c:798
+#: expr.c:808
msgid "use of C99 long long integer constant"
msgstr "использование целочисленной long long константы C99"
-#: expr.c:814
+#: expr.c:822
+msgid "use of C++23 %<size_t%> integer constant"
+msgstr "использование целочисленной %<size_t%> константы C++23"
+
+#: expr.c:823
+msgid "use of C++23 %<make_signed_t<size_t>%> integer constant"
+msgstr "использование целочисленной %<make_signed_t<size_t>%> константы C++23"
+
+#: expr.c:834
msgid "imaginary constants are a GCC extension"
msgstr "мнимые константы являются расширением GCC"
-#: expr.c:820
+#: expr.c:841
msgid "binary constants are a C++14 feature or GCC extension"
msgstr "двоичные константы являются свойством C++14 или расширением GCC"
-#: expr.c:822
-msgid "binary constants are a GCC extension"
-msgstr "двоичные константы являются расширением GCC"
+#: expr.c:843
+msgid "binary constants are a C2X feature or GCC extension"
+msgstr "двоичные константы являются свойством C2X или расширением GCC"
+
+#: expr.c:848
+msgid "binary constants are a C2X feature"
+msgstr "двоичные константы являются свойством C2X"
-#: expr.c:917
+#: expr.c:944
msgid "integer constant is too large for its type"
msgstr "значение целочисленной константы слишком велико для своего типа"
-#: expr.c:948
+#: expr.c:975
msgid "integer constant is so large that it is unsigned"
msgstr "значение целочисленной константы так велико что стало беззнаковым"
-#: expr.c:1043
+#: expr.c:1070
msgid "missing ')' after \"defined\""
msgstr "отсутствует «)» после «defined»"
-#: expr.c:1050
+#: expr.c:1077
msgid "operator \"defined\" requires an identifier"
msgstr "для оператора «defined» требуется идентификатор"
-#: expr.c:1058
+#: expr.c:1085
#, c-format
msgid "(\"%s\" is an alternative token for \"%s\" in C++)"
msgstr "(«%s» является альтернативой токену «%s» в C++)"
-#: expr.c:1070
+#: expr.c:1098
msgid "this use of \"defined\" may not be portable"
msgstr "такое использование «defined» может оказаться непереносимым"
-#: expr.c:1113
+#: expr.c:1143
msgid "user-defined literal in preprocessor expression"
msgstr "определённый пользователем литерал в препроцессорном выражении"
-#: expr.c:1118
+#: expr.c:1148
msgid "floating constant in preprocessor expression"
msgstr "плавающая константа в препроцессорном выражении"
-#: expr.c:1124
+#: expr.c:1154
msgid "imaginary number in preprocessor expression"
msgstr "мнимое число в препроцессорном выражении"
-#: expr.c:1173
+#: expr.c:1203
#, c-format
msgid "\"%s\" is not defined, evaluates to 0"
msgstr "«%s» не определена, оценивается как 0"
-#: expr.c:1186
+#: expr.c:1216
msgid "assertions are a GCC extension"
msgstr "утверждения являются расширением GCC"
-#: expr.c:1189
+#: expr.c:1219
msgid "assertions are a deprecated extension"
msgstr "утверждения являются устаревшим расширением"
-#: expr.c:1435
+#: expr.c:1465
#, c-format
msgid "unbalanced stack in %s"
msgstr "несбалансированный стек в %s"
-#: expr.c:1455
+#: expr.c:1485
#, c-format
msgid "impossible operator '%u'"
msgstr "невозможный оператор «%u»"
-#: expr.c:1556
+#: expr.c:1586
msgid "missing ')' in expression"
msgstr "отсутствующая «)» в выражении"
-#: expr.c:1585
+#: expr.c:1615
msgid "'?' without following ':'"
msgstr "«?» без последующего «:»"
-#: expr.c:1595
+#: expr.c:1625
msgid "integer overflow in preprocessor expression"
msgstr "целочисленное переполнение в препроцессорном выражении"
-#: expr.c:1600
+#: expr.c:1630
msgid "missing '(' in expression"
msgstr "отсутствующая «(» в выражении"
-#: expr.c:1632
+#: expr.c:1662
#, c-format
msgid "the left operand of \"%s\" changes sign when promoted"
msgstr "левый операнд «%s» изменяет знак при появлении"
-#: expr.c:1637
+#: expr.c:1667
#, c-format
msgid "the right operand of \"%s\" changes sign when promoted"
msgstr "операнд операнд «%s» изменяет знак при появлении"
-#: expr.c:1896
+#: expr.c:1926
msgid "traditional C rejects the unary plus operator"
msgstr "в традиционном C отвергается оператор унарного сложения"
-#: expr.c:1994
+#: expr.c:2024
msgid "comma operator in operand of #if"
msgstr "оператор запятая в операнде #if"
-#: expr.c:2130
+#: expr.c:2160
msgid "division by zero in #if"
msgstr "деление на ноль в #if"
-#: files.c:576
+#: files.c:571
msgid "one or more PCH files were found, but they were invalid"
msgstr "найден один или более файлов PCH, но все они некорректные"
-#: files.c:580
+#: files.c:575
msgid "use -Winvalid-pch for more information"
msgstr "используйте -Winvalid-pch для более подробной диагностики"
-#: files.c:1004
+#: files.c:1051
#, c-format
msgid "no include path in which to search for %s"
msgstr "отсутствует путь для включаемых файлов, в котором ищется %s"
-#: files.c:1439
+#: files.c:1546
msgid "Multiple include guards may be useful for:\n"
msgstr "Несколько защит подключения может быть полезно для:\n"
-#: init.c:598
+#: init.c:614
msgid "cppchar_t must be an unsigned type"
msgstr "cppchar_t должна быть беззнакового типа"
-#: init.c:602
+#: init.c:618
#, c-format
msgid "preprocessor arithmetic has maximum precision of %lu bits; target requires %lu bits"
msgstr "препроцессорная арифметика имеет максимальную точность равную %lu бит; для цели требуется %lu бит"
-#: init.c:609
+#: init.c:625
msgid "CPP arithmetic must be at least as precise as a target int"
msgstr "точность арифметики CPP должна быть не менее значения int цели"
-#: init.c:612
+#: init.c:628
msgid "target char is less than 8 bits wide"
msgstr "ширина char у цели менее 8 бит"
-#: init.c:616
+#: init.c:632
msgid "target wchar_t is narrower than target char"
msgstr "wchar_t цели уже чем char цели"
-#: init.c:620
+#: init.c:636
msgid "target int is narrower than target char"
msgstr "int цели уже чем char цели"
-#: init.c:625
+#: init.c:641
msgid "CPP half-integer narrower than CPP character"
msgstr "ширина половины integer CPP уже чем символ CPP"
-#: init.c:629
+#: init.c:645
#, c-format
msgid "CPP on this host cannot handle wide character constants over %lu bits, but the target requires %lu bits"
msgstr "CPP на данной машине не может работать с широкими символьными константами более %lu бит, но для цели требуется %lu бит"
@@ -698,12 +706,12 @@ msgid "`%.*s' is not in NFC"
msgstr "«%.*s» не является NFC"
#: lex.c:1375
-msgid "__VA_OPT__ is not available until C++2a"
-msgstr "__VA_OPT__ недоступна до C++2a"
+msgid "__VA_OPT__ is not available until C++20"
+msgstr "__VA_OPT__ недоступна до C++20"
#: lex.c:1382
-msgid "__VA_OPT__ can only appear in the expansion of a C++2a variadic macro"
-msgstr "__VA_OPT__ может появляться только в расширении вариативного макроса C++2a"
+msgid "__VA_OPT__ can only appear in the expansion of a C++20 variadic macro"
+msgstr "__VA_OPT__ может появляться только в расширении вариативного макроса C++20"
#: lex.c:1413 lex.c:1506
#, c-format
@@ -723,232 +731,254 @@ msgstr "__VA_ARGS__ может появляться только в расшир
msgid "identifier \"%s\" is a special operator name in C++"
msgstr "идентификатор «%s» является именем специального оператора в C++"
-#: lex.c:1837
+#: lex.c:1879
msgid "raw string delimiter longer than 16 characters"
msgstr "разделитель сырой строки больше 16 символов"
-#: lex.c:1841
+#: lex.c:1883
msgid "invalid new-line in raw string delimiter"
msgstr "неверный символ новой строки в разделителе сырой строки"
-#: lex.c:1845
+#: lex.c:1887 lex.c:4639
#, c-format
msgid "invalid character '%c' in raw string delimiter"
msgstr "неверный символ «%c» в разделителе сырой строки"
-#: lex.c:1894 lex.c:1916
+#: lex.c:1926 lex.c:1949
msgid "unterminated raw string"
msgstr "незавершённая сырая строка"
-#: lex.c:1936 lex.c:2065
+#: lex.c:1971 lex.c:2100
msgid "invalid suffix on literal; C++11 requires a space between literal and string macro"
msgstr "неверный суффикс в литерале; в C++11 требуется пробел между литералом и строкой макроса"
-#: lex.c:2048
+#: lex.c:2083
msgid "null character(s) preserved in literal"
msgstr "символ(ы) null сохраняются в литерале"
-#: lex.c:2051
+#: lex.c:2086
#, c-format
msgid "missing terminating %c character"
msgstr "отсутствует завершающий символ %c"
-#: lex.c:2083
+#: lex.c:2118
msgid "C++11 requires a space between string literal and macro"
msgstr "в C++11 требуется пробел между строковым литералом и макросом"
-#: lex.c:2893 lex.c:2927
+#: lex.c:2711
+msgid "module control-line cannot be in included file"
+msgstr "модуль control-line не может быть во включаемом файле"
+
+#: lex.c:2725
+#, c-format
+msgid "module control-line \"%s\" cannot be an object-like macro"
+msgstr "модуль control-line \"%s\" не может быть объекто-подобным макросом"
+
+#: lex.c:3099 lex.c:4472 traditional.c:174
+msgid "unterminated comment"
+msgstr "незавершённый комментарий"
+
+#: lex.c:3113 lex.c:3147
msgid "C++ style comments are not allowed in ISO C90"
msgstr "комментарии в стиле C++ не разрешены в ISO C90"
-#: lex.c:2895 lex.c:2906 lex.c:2930
+#: lex.c:3115 lex.c:3126 lex.c:3150
msgid "(this will be reported only once per input file)"
msgstr "(об этом будет сообщено только один раз для каждого файла)"
-#: lex.c:2904
+#: lex.c:3124
msgid "C++ style comments are incompatible with C90"
msgstr "комментарии в стиле C++ не совместимы с C90"
-#: lex.c:2936
+#: lex.c:3156
msgid "multi-line comment"
msgstr "многострочный комментарий"
-#: lex.c:3330
+#: lex.c:3550
#, c-format
msgid "unspellable token %s"
msgstr "неразбираемый токен %s"
+#: lex.c:4627
+#, c-format
+msgid "raw string delimiter longer than %d characters"
+msgstr "разделитель сырой строки больше %d символов"
+
+#: lex.c:4697
+msgid "unterminated literal"
+msgstr "незавершённый литерал"
+
#: macro.c:94
msgid "'##' cannot appear at either end of __VA_OPT__"
msgstr "«##» не может указываться в конце __VA_OPT__"
-#: macro.c:364
+#: macro.c:386
#, c-format
msgid "\"%s\" used outside of preprocessing directive"
msgstr "«%s» используется вне препроцессорной директивы"
-#: macro.c:374
+#: macro.c:396
#, c-format
msgid "missing '(' before \"%s\" operand"
msgstr "отсутствующая «(» перед операндом «%s»"
-#: macro.c:389
+#: macro.c:411
#, c-format
msgid "operator \"%s\" requires a header-name"
msgstr "для оператора «%s» требуется строка заголовка"
-#: macro.c:406
+#: macro.c:428
#, c-format
msgid "missing ')' after \"%s\" operand"
msgstr "отсутствует «)» после операнда «%s»"
-#: macro.c:426
+#: macro.c:448
#, c-format
msgid "macro \"%s\" is not used"
msgstr "макрос «%s» не используется"
-#: macro.c:465 macro.c:723
+#: macro.c:487 macro.c:778
#, c-format
msgid "invalid built-in macro \"%s\""
msgstr "неверный встроенный макрос «%s»"
-#: macro.c:472 macro.c:574
+#: macro.c:494 macro.c:596
#, c-format
msgid "macro \"%s\" might prevent reproducible builds"
msgstr "макрос «%s» может помешать повторным сборкам"
-#: macro.c:503
+#: macro.c:525
msgid "could not determine file timestamp"
msgstr "не удалось определить временную метку файла"
-#: macro.c:620
+#: macro.c:610
msgid "could not determine date and time"
msgstr "не удалось определить дату и время"
-#: macro.c:636
+#: macro.c:642
msgid "__COUNTER__ expanded inside directive with -fdirectives-only"
msgstr "__COUNTER__ раскрывается внутри директивы при указании параметра -fdirectives-only"
-#: macro.c:842
+#: macro.c:897
msgid "invalid string literal, ignoring final '\\'"
msgstr "неверный строковый литерал, игнорируется завершающий «\\»"
-#: macro.c:904
+#: macro.c:959
#, c-format
msgid "pasting \"%s\" and \"%s\" does not give a valid preprocessing token"
msgstr "вставка «%s» и «%s» не даёт правильного препроцессорного токена"
-#: macro.c:1030
+#: macro.c:1085
msgid "ISO C++11 requires at least one argument for the \"...\" in a variadic macro"
msgstr "В ISO C++11 требуется не менее одного аргумента для «…» в вариативном макросе"
-#: macro.c:1034
+#: macro.c:1089
msgid "ISO C99 requires at least one argument for the \"...\" in a variadic macro"
msgstr "В ISO C99 требуется не менее одного аргумента для «…» в вариативном макросе"
-#: macro.c:1041
+#: macro.c:1096
#, c-format
msgid "macro \"%s\" requires %u arguments, but only %u given"
msgstr "для макроса «%s» требуется %u аргументов, но указано только %u"
-#: macro.c:1046
+#: macro.c:1101
#, c-format
msgid "macro \"%s\" passed %u arguments, but takes just %u"
msgstr "в макрос «%s» передано %u аргументов, но используется только %u"
-#: macro.c:1244 traditional.c:815
+#: macro.c:1299 traditional.c:822
#, c-format
msgid "unterminated argument list invoking macro \"%s\""
msgstr "незавершённый список аргументов вызывает макрос «%s»"
-#: macro.c:1386
+#: macro.c:1442
#, c-format
msgid "function-like macro \"%s\" must be used with arguments in traditional C"
msgstr "макрос «%s», похожий на функцию, должен использоваться с аргументами в традиционном C"
-#: macro.c:2165
+#: macro.c:2220
#, c-format
msgid "invoking macro %s argument %d: empty macro arguments are undefined in ISO C++98"
msgstr "вызывается макрос %s (количество аргументов %d): пустые аргументы макрос не определены в ISO C++98"
-#: macro.c:2173 macro.c:2182
+#: macro.c:2228 macro.c:2237
#, c-format
msgid "invoking macro %s argument %d: empty macro arguments are undefined in ISO C90"
msgstr "вызывается макрос %s (количество аргументов %d): пустые аргументы макрос не определены в ISO C90"
-#: macro.c:3141
+#: macro.c:3279
#, c-format
msgid "duplicate macro parameter \"%s\""
msgstr "повторяющийся параметр макроса «%s»"
-#: macro.c:3223
+#: macro.c:3361
#, c-format
msgid "expected parameter name, found \"%s\""
msgstr "ожидалось имя параметра, обнаружено «%s»"
-#: macro.c:3224
+#: macro.c:3362
#, c-format
msgid "expected ',' or ')', found \"%s\""
msgstr "ожидалась «,» или «)», обнаружено «%s»"
-#: macro.c:3225
+#: macro.c:3363
msgid "expected parameter name before end of line"
msgstr "ожидалось имя параметра до конца строки"
-#: macro.c:3226
+#: macro.c:3364
msgid "expected ')' before end of line"
msgstr "ожидалась «)» до конца строки"
-#: macro.c:3227
+#: macro.c:3365
msgid "expected ')' after \"...\""
msgstr "ожидалась «)» после «…»"
-#: macro.c:3284
+#: macro.c:3422
msgid "anonymous variadic macros were introduced in C++11"
msgstr "анонимные вариативные макросы появились в C++11"
-#: macro.c:3285 macro.c:3289
+#: macro.c:3423 macro.c:3427
msgid "anonymous variadic macros were introduced in C99"
msgstr "анонимные вариативные макросы появились в C99"
-#: macro.c:3295
+#: macro.c:3433
msgid "ISO C++ does not permit named variadic macros"
msgstr "В ISO C++ не разрешены вариативные именованные макросы"
-#: macro.c:3296
+#: macro.c:3434
msgid "ISO C does not permit named variadic macros"
msgstr "В ISO C не разрешены вариативные именованные макросы"
-#: macro.c:3342
+#: macro.c:3480
msgid "'##' cannot appear at either end of a macro expansion"
msgstr "«##» не может указываться в конце макрорасширения"
-#: macro.c:3380
+#: macro.c:3518
msgid "ISO C++11 requires whitespace after the macro name"
msgstr "В ISO C++11 требуется пробельный символ после имени макроса"
-#: macro.c:3381
+#: macro.c:3519
msgid "ISO C99 requires whitespace after the macro name"
msgstr "в ISO C99 требуется пробельный символ после имени макроса"
-#: macro.c:3405
+#: macro.c:3543
msgid "missing whitespace after the macro name"
msgstr "отсутствует пробельный символ после имени макроса"
-#: macro.c:3455
+#: macro.c:3593
msgid "'#' is not followed by a macro parameter"
msgstr "после «#» нет параметра макроса"
-#: macro.c:3606
+#: macro.c:3749
#, c-format
msgid "\"%s\" redefined"
msgstr "«%s» переопределён"
-#: macro.c:3611
+#: macro.c:3754
msgid "this is the location of the previous definition"
msgstr "это расположение предыдущего определения"
-#: macro.c:3715
+#: macro.c:3891
#, c-format
msgid "macro argument \"%s\" would be stringified in traditional C"
msgstr "аргумент макроса «%s» был бы строкой, оформленной в традиционном стиле С"
@@ -986,15 +1016,18 @@ msgstr "%s: не используется, так как значение «__CO
msgid "while reading precompiled header"
msgstr "при чтении прекомпилированного заголовка"
-#: traditional.c:884
+#: traditional.c:891
#, c-format
msgid "detected recursion whilst expanding macro \"%s\""
msgstr "обнаружена рекурсия во время раскрытия макроса «%s»"
-#: traditional.c:1107
+#: traditional.c:1114
msgid "syntax error in macro parameter list"
msgstr "синтаксическая ошибка в списке параметров макроса"
+#~ msgid "binary constants are a GCC extension"
+#~ msgstr "двоичные константы являются расширением GCC"
+
#~ msgid "\"__has_include__\" cannot be used as a macro name"
#~ msgstr "«__has_include__» не может использоваться как имя макроса"
diff --git a/libcpp/po/sr.po b/libcpp/po/sr.po
index 8595a21..0bf9720 100644
--- a/libcpp/po/sr.po
+++ b/libcpp/po/sr.po
@@ -1,13 +1,13 @@
# Serbian translation of cpplib.
# Copyright © 2020 Free Software Foundation, Inc.
# This file is distributed under the same license as the gcc package.
-# Мирослав Николић <miroslavnikolic@rocketmail.com>, 2012—2020.
+# Мирослав Николић <miroslavnikolic@rocketmail.com>, 2012—2021.
msgid ""
msgstr ""
-"Project-Id-Version: cpplib-10.1-b20200209\n"
+"Project-Id-Version: cpplib-11.1-b20210207\n"
"Report-Msgid-Bugs-To: https://gcc.gnu.org/bugs/\n"
-"POT-Creation-Date: 2020-02-07 22:33+0000\n"
-"PO-Revision-Date: 2020-03-31 16:26+0200\n"
+"POT-Creation-Date: 2021-02-05 21:38+0000\n"
+"PO-Revision-Date: 2021-03-28 09:28+0200\n"
"Last-Translator: Мирослав Николић <miroslavnikolic@rocketmail.com>\n"
"Language-Team: Serbian <(nothing)>\n"
"Language: sr\n"
@@ -15,157 +15,156 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-"X-Generator: Virtaal 0.7.1\n"
"X-Bugs: Report translation errors to the Language-Team address.\n"
-#: charset.c:674
+#: charset.c:677
#, c-format
msgid "conversion from %s to %s not supported by iconv"
msgstr "иконв не подржава претварање из %s у %s"
-#: charset.c:677
+#: charset.c:680
msgid "iconv_open"
msgstr "иконв_отвори"
-#: charset.c:685
+#: charset.c:688
#, c-format
msgid "no iconv implementation, cannot convert from %s to %s"
msgstr "нема иконв примене, не могу да претворим из %s у %s"
-#: charset.c:781
+#: charset.c:784
#, c-format
msgid "character 0x%lx is not in the basic source character set\n"
msgstr "знак 0x%lx није у знаковном скупу основног извора\n"
-#: charset.c:798 charset.c:1768
+#: charset.c:801 charset.c:1771
msgid "converting to execution character set"
msgstr "претварам у знаковни скуп извршавања"
-#: charset.c:804
+#: charset.c:807
#, c-format
msgid "character 0x%lx is not unibyte in execution character set"
msgstr "знак 0x%lx није једног бајта у знаковном скупу извршавања"
-#: charset.c:1054
+#: charset.c:1057
msgid "universal character names are only valid in C++ and C99"
msgstr "називи свеопштег знака су једино исправни у Ц++ и Ц99"
-#: charset.c:1058
+#: charset.c:1061
msgid "C99's universal character names are incompatible with C90"
msgstr "називи свеопштег знака Ц99 нису сагласни са Ц90"
-#: charset.c:1061
+#: charset.c:1064
#, c-format
msgid "the meaning of '\\%c' is different in traditional C"
msgstr "значење „\\%c“ је другачије у уобичајеном Ц-у"
-#: charset.c:1070
+#: charset.c:1073
msgid "In _cpp_valid_ucn but not a UCN"
msgstr "У _цпп_исправан_нсз али није НСЗ"
-#: charset.c:1103
+#: charset.c:1106
#, c-format
msgid "incomplete universal character name %.*s"
msgstr "непотпун назив свеопштег знака %.*s"
-#: charset.c:1118
+#: charset.c:1121
#, c-format
msgid "%.*s is not a valid universal character"
msgstr "%.*s није исправан свеопшти знак"
-#: charset.c:1128 lex.c:1335
+#: charset.c:1131 lex.c:1335
msgid "'$' in identifier or number"
msgstr "„$“ у одреднику или број"
-#: charset.c:1138
+#: charset.c:1141
#, c-format
msgid "universal character %.*s is not valid in an identifier"
msgstr "свеопшти знак %.*s није исправан у одреднику"
-#: charset.c:1142
+#: charset.c:1145
#, c-format
msgid "universal character %.*s is not valid at the start of an identifier"
msgstr "свеопшти знак %.*s није исправан на почетку одредника"
-#: charset.c:1149
+#: charset.c:1152
#, c-format
msgid "%.*s is outside the UCS codespace"
msgstr "„%.*s“ је ван УЦС кодног простора"
-#: charset.c:1194 charset.c:2113
+#: charset.c:1197 charset.c:2116
msgid "converting UCN to source character set"
msgstr "претварам НСЗ у изворни знаковни скуп"
-#: charset.c:1201
+#: charset.c:1204
msgid "converting UCN to execution character set"
msgstr "претварам НСЗ у извршни знаковни скуп"
-#: charset.c:1265
+#: charset.c:1268
#, c-format
msgid "extended character %.*s is not valid in an identifier"
msgstr "проширени знак „%.*s“ није исправан у одреднику"
-#: charset.c:1282
+#: charset.c:1285
#, c-format
msgid "extended character %.*s is not valid at the start of an identifier"
msgstr "проширени знак „%.*s“ није исправан на почетку одредника"
-#: charset.c:1368
+#: charset.c:1371
msgid "the meaning of '\\x' is different in traditional C"
msgstr "значење „\\x“ је другачије у уобичајеном Ц-у"
-#: charset.c:1393
+#: charset.c:1396
msgid "\\x used with no following hex digits"
msgstr "„\\x“ је коришћено са не пратећим хекса цифрама"
-#: charset.c:1400
+#: charset.c:1403
msgid "hex escape sequence out of range"
msgstr "хекс низ промене је изван опсега"
-#: charset.c:1452
+#: charset.c:1455
msgid "octal escape sequence out of range"
msgstr "октални низ промене је изван опсега"
-#: charset.c:1534
+#: charset.c:1537
msgid "the meaning of '\\a' is different in traditional C"
msgstr "значење „\\a“ је другачије у уобичајеном Ц-у"
-#: charset.c:1541
+#: charset.c:1544
#, c-format
msgid "non-ISO-standard escape sequence, '\\%c'"
msgstr "низ промене не-ИСО-стандарда, „\\%c“"
-#: charset.c:1549
+#: charset.c:1552
#, c-format
msgid "unknown escape sequence: '\\%c'"
msgstr "непознат низ промене: „\\%c“"
-#: charset.c:1557
+#: charset.c:1560
#, c-format
msgid "unknown escape sequence: '\\%s'"
msgstr "непознат низ промене: „\\%s“"
-#: charset.c:1565
+#: charset.c:1568
msgid "converting escape sequence to execution character set"
msgstr "претварам низ промене у знаковни скуп извршавања"
-#: charset.c:1705
+#: charset.c:1708
msgid "missing open quote"
msgstr "недостаје отворена заграда"
-#: charset.c:1923 charset.c:2002
+#: charset.c:1926 charset.c:2005
msgid "character constant too long for its type"
msgstr "константа знака је предуга за своју врсту"
-#: charset.c:1926
+#: charset.c:1929
msgid "multi-character character constant"
msgstr "више-знаковна константа знака"
-#: charset.c:2042
+#: charset.c:2045
msgid "empty character constant"
msgstr "празна константа знака"
-#: charset.c:2160
+#: charset.c:2163
#, c-format
msgid "failure to convert %s to %s"
msgstr "неуспех у претварању %s у %s"
@@ -236,203 +235,199 @@ msgstr "називи макроа морају бити одредници"
msgid "undefining \"%s\""
msgstr "неодређујем „%s“"
-#: directives.c:724
+#: directives.c:725
msgid "missing terminating > character"
msgstr "недостаје завршни знак >"
-#: directives.c:783
+#: directives.c:784
#, c-format
msgid "#%s expects \"FILENAME\" or <FILENAME>"
msgstr "#%s очекује „НАЗИВДАТОТЕКЕ“ или <НАЗИВДАТОТЕКЕ>"
-#: directives.c:829
+#: directives.c:830
#, c-format
msgid "empty filename in #%s"
msgstr "празан назив датотеке у #%s"
-#: directives.c:838
+#: directives.c:839
#, c-format
msgid "#include nested depth %u exceeds maximum of %u (use -fmax-include-depth=DEPTH to increase the maximum)"
msgstr "„#include“ дубоко угнеждено %u превазилази максимум од %u (користите „-fmax-include-depth=ДУБИНА“ да повећате максимум)"
-#: directives.c:883
+#: directives.c:884
msgid "#include_next in primary source file"
msgstr "#include_next у примарној изворној датотеци"
-#: directives.c:909
+#: directives.c:910
#, c-format
msgid "invalid flag \"%s\" in line directive"
msgstr "неисправна опција „%s“ у директиви реда"
-#: directives.c:969
+#: directives.c:970
msgid "unexpected end of file after #line"
msgstr "неочекивани крај датотеке након „#line“"
-#: directives.c:972
+#: directives.c:973
#, c-format
msgid "\"%s\" after #line is not a positive integer"
msgstr "„%s“ након „#line“ није позитиван цео број"
-#: directives.c:978 directives.c:980
+#: directives.c:979 directives.c:981
msgid "line number out of range"
msgstr "број реда је ван опсега"
-#: directives.c:993 directives.c:1074
+#: directives.c:994 directives.c:1075
#, c-format
msgid "\"%s\" is not a valid filename"
msgstr "„%s“ није исправан назив датотеке"
-#: directives.c:1034
+#: directives.c:1035
#, c-format
msgid "\"%s\" after # is not a positive integer"
msgstr "„%s“ након „#“ није позитиван цео број"
-#: directives.c:1101
+#: directives.c:1102
#, c-format
msgid "file \"%s\" linemarker ignored due to incorrect nesting"
msgstr "датотека „%s“ означавач реда занемаренa због нетачног угњежђавања"
-#: directives.c:1162 directives.c:1164 directives.c:1166 directives.c:1754
+#: directives.c:1180 directives.c:1182 directives.c:1184 directives.c:1772
#, c-format
msgid "%s"
msgstr "%s"
-#: directives.c:1190
+#: directives.c:1208
#, c-format
msgid "invalid #%s directive"
msgstr "неисправна #%s директива"
-#: directives.c:1253
+#: directives.c:1271
#, c-format
msgid "registering pragmas in namespace \"%s\" with mismatched name expansion"
msgstr "бележим прагме у простору назива „%s“ са неодговарајућим ширењем назива"
-#: directives.c:1262
+#: directives.c:1280
#, c-format
msgid "registering pragma \"%s\" with name expansion and no namespace"
msgstr "бележим прагму „%s“ са ширењем назива и без простора назива"
-#: directives.c:1280
+#: directives.c:1298
#, c-format
msgid "registering \"%s\" as both a pragma and a pragma namespace"
msgstr "бележим „%s“ и као прагму и као простор назива прагме"
-#: directives.c:1283
+#: directives.c:1301
#, c-format
msgid "#pragma %s %s is already registered"
msgstr "#pragma %s %s је већ забележено"
-#: directives.c:1286
+#: directives.c:1304
#, c-format
msgid "#pragma %s is already registered"
msgstr "#pragma %s је већ забележено"
-#: directives.c:1316
+#: directives.c:1334
msgid "registering pragma with NULL handler"
msgstr "бележим прагму са НИШТАВНИМ руковаоцем"
-#: directives.c:1533
+#: directives.c:1551
msgid "#pragma once in main file"
msgstr "#pragma једном у главној датотеци"
-#: directives.c:1556
+#: directives.c:1574
msgid "invalid #pragma push_macro directive"
msgstr "неисправна „#pragma push_macro“ директива"
-#: directives.c:1613
+#: directives.c:1631
msgid "invalid #pragma pop_macro directive"
msgstr "неисправна „#pragma pop_macro“ директива"
-#: directives.c:1668
+#: directives.c:1686
msgid "invalid #pragma GCC poison directive"
msgstr "неисправна „#pragma GCC poison“ директива"
-#: directives.c:1677
+#: directives.c:1695
#, c-format
msgid "poisoning existing macro \"%s\""
msgstr "трујем постојећи макро „%s“"
-#: directives.c:1696
+#: directives.c:1714
msgid "#pragma system_header ignored outside include file"
msgstr "„#pragma system_header“ је занемарено изван датотеке укључивања"
-#: directives.c:1721
+#: directives.c:1739
#, c-format
msgid "cannot find source file %s"
msgstr "не могу да пронађем изворну датотеку „%s“"
-#: directives.c:1725
+#: directives.c:1743
#, c-format
msgid "current file is older than %s"
msgstr "текућа датотека је старија од %s"
-#: directives.c:1749
+#: directives.c:1767
#, c-format
msgid "invalid \"#pragma GCC %s\" directive"
msgstr "неисправна директива „#pragma GCC %s“"
-#: directives.c:1950
+#: directives.c:1968
msgid "_Pragma takes a parenthesized string literal"
msgstr "_Прагма узима словност ниске затворене заградом"
-#: directives.c:2033
+#: directives.c:2051
msgid "#else without #if"
msgstr "„#else“ без „#if“"
-#: directives.c:2038
+#: directives.c:2056
msgid "#else after #else"
msgstr "„#else“ након „#else“"
-#: directives.c:2040 directives.c:2073
+#: directives.c:2058 directives.c:2091
msgid "the conditional began here"
msgstr "условљеност почиње овде"
-#: directives.c:2066
+#: directives.c:2084
msgid "#elif without #if"
msgstr "„#elif“ без „#if“"
-#: directives.c:2071
+#: directives.c:2089
msgid "#elif after #else"
msgstr "„#elif“ након „#else“"
-#: directives.c:2102
+#: directives.c:2120
msgid "#endif without #if"
msgstr "„#endif“ без „#if“"
-#: directives.c:2178
+#: directives.c:2196
msgid "missing '(' after predicate"
msgstr "недостаје ( након предиката"
-#: directives.c:2196
+#: directives.c:2214
msgid "missing ')' to complete answer"
msgstr "недостаје ) да доврши одговор"
-#: directives.c:2208
+#: directives.c:2226
msgid "predicate's answer is empty"
msgstr "одговор предиката је празан"
-#: directives.c:2238
+#: directives.c:2256
msgid "assertion without predicate"
msgstr "тврдња без предиката"
-#: directives.c:2241
+#: directives.c:2259
msgid "predicate must be an identifier"
msgstr "предикат мора бити одредник"
-#: directives.c:2323
+#: directives.c:2341
#, c-format
msgid "\"%s\" re-asserted"
msgstr "„%s“ је поново утврђен"
-#: directives.c:2604
+#: directives.c:2659
#, c-format
msgid "unterminated #%s"
msgstr "неокончано #%s"
-#: directives-only.c:221 lex.c:2879 traditional.c:174
-msgid "unterminated comment"
-msgstr "неокончана напомена"
-
#: errors.c:291
#, c-format
msgid "%s: %s"
@@ -442,215 +437,227 @@ msgstr "%s: %s"
msgid "stdout"
msgstr "стдизлаз"
-#: expr.c:626 expr.c:743
+#: expr.c:636 expr.c:753
msgid "fixed-point constants are a GCC extension"
msgstr "константе сталне тачке су ГЦЦ проширења"
-#: expr.c:651
+#: expr.c:661
msgid "invalid prefix \"0b\" for floating constant"
msgstr "неисправан префикс „0b“ за покретну константу"
-#: expr.c:664
+#: expr.c:674
msgid "use of C++17 hexadecimal floating constant"
msgstr "употреба Ц++17 хексадецималне покретне константе"
-#: expr.c:667
+#: expr.c:677
msgid "use of C99 hexadecimal floating constant"
msgstr "употреба Ц99 хексадецималне покретне константе"
-#: expr.c:711
+#: expr.c:721
#, c-format
msgid "invalid suffix \"%.*s\" on floating constant"
msgstr "неисправан суфикс „%.*s“ на покретној константи"
-#: expr.c:722 expr.c:789
+#: expr.c:732 expr.c:799
#, c-format
msgid "traditional C rejects the \"%.*s\" suffix"
msgstr "уобичајени Ц одбацује „%.*s“ суфикс"
-#: expr.c:730
+#: expr.c:740
msgid "suffix for double constant is a GCC extension"
msgstr "суфикс за двоструку константу је ГЦЦ проширење"
-#: expr.c:736
+#: expr.c:746
#, c-format
msgid "invalid suffix \"%.*s\" with hexadecimal floating constant"
msgstr "неисправан суфикс „%.*s“ са хексадецималном покретном константом"
-#: expr.c:749 expr.c:753
+#: expr.c:759 expr.c:763
msgid "decimal float constants are a C2X feature"
msgstr "децималне покретне константе су „C2X“ функције"
-#: expr.c:772
+#: expr.c:782
#, c-format
msgid "invalid suffix \"%.*s\" on integer constant"
msgstr "неисправан суфикс „%.*s“ на константи целог броја"
-#: expr.c:797
+#: expr.c:807
msgid "use of C++11 long long integer constant"
msgstr "употреба Ц++11 дуге дуге константе целог броја"
-#: expr.c:798
+#: expr.c:808
msgid "use of C99 long long integer constant"
msgstr "употреба Ц99 дуге дуге константе целог броја"
-#: expr.c:814
+#: expr.c:822
+msgid "use of C++23 %<size_t%> integer constant"
+msgstr "употреба Ц++23 %<size_t%> константе целог броја"
+
+#: expr.c:823
+msgid "use of C++23 %<make_signed_t<size_t>%> integer constant"
+msgstr "употреба Ц++23 %<make_signed_t<size_t>%> константе целог броја"
+
+#: expr.c:834
msgid "imaginary constants are a GCC extension"
msgstr "имагинарне константе су ГЦЦ проширења"
-#: expr.c:820
+#: expr.c:841
msgid "binary constants are a C++14 feature or GCC extension"
msgstr "бинарне константе су Ц++14 функције или ГЦЦ проширења"
-#: expr.c:822
-msgid "binary constants are a GCC extension"
-msgstr "бинарне константе су ГЦЦ проширења"
+#: expr.c:843
+msgid "binary constants are a C2X feature or GCC extension"
+msgstr "бинарне константе су „C2X“ функције или ГЦЦ проширења"
+
+#: expr.c:848
+msgid "binary constants are a C2X feature"
+msgstr "binarne константе су „C2X“ функције"
-#: expr.c:917
+#: expr.c:944
msgid "integer constant is too large for its type"
msgstr "константа целог броја је предуга за њену врсту"
-#: expr.c:948
+#: expr.c:975
msgid "integer constant is so large that it is unsigned"
msgstr "константа целог броја је толико велика тако да је неозначена"
-#: expr.c:1043
+#: expr.c:1070
msgid "missing ')' after \"defined\""
msgstr "недостаје ( након „defined“"
-#: expr.c:1050
+#: expr.c:1077
msgid "operator \"defined\" requires an identifier"
msgstr "оператор „defined“ захтева одредника"
-#: expr.c:1058
+#: expr.c:1085
#, c-format
msgid "(\"%s\" is an alternative token for \"%s\" in C++)"
msgstr "(„%s“ је резервни симбол за „%s“ у Ц++-у)"
-#: expr.c:1070
+#: expr.c:1098
msgid "this use of \"defined\" may not be portable"
msgstr "ова употреба „defined“ не може бити преносива"
-#: expr.c:1113
+#: expr.c:1143
msgid "user-defined literal in preprocessor expression"
msgstr "словност коју је одредио корисник у изразу претпроцесора"
-#: expr.c:1118
+#: expr.c:1148
msgid "floating constant in preprocessor expression"
msgstr "покретна константа у изразу претптоцесора"
-#: expr.c:1124
+#: expr.c:1154
msgid "imaginary number in preprocessor expression"
msgstr "имагинаран број у изразу претптоцесора"
-#: expr.c:1173
+#: expr.c:1203
#, c-format
msgid "\"%s\" is not defined, evaluates to 0"
msgstr "„%s“ није одређено, процењује се на 0"
-#: expr.c:1186
+#: expr.c:1216
msgid "assertions are a GCC extension"
msgstr "тврдње су ГЦЦ проширења"
-#: expr.c:1189
+#: expr.c:1219
msgid "assertions are a deprecated extension"
msgstr "тврдње су застарела проширења"
-#: expr.c:1435
+#: expr.c:1465
#, c-format
msgid "unbalanced stack in %s"
msgstr "неуравнотежен стек у %s"
-#: expr.c:1455
+#: expr.c:1485
#, c-format
msgid "impossible operator '%u'"
msgstr "немогућ оператор у „%u“"
-#: expr.c:1556
+#: expr.c:1586
msgid "missing ')' in expression"
msgstr "недостаје ) у изразу"
-#: expr.c:1585
+#: expr.c:1615
msgid "'?' without following ':'"
msgstr "„?“ без пратећег „:“"
-#: expr.c:1595
+#: expr.c:1625
msgid "integer overflow in preprocessor expression"
msgstr "прекорачење целог броја у изразу претпроцесора"
-#: expr.c:1600
+#: expr.c:1630
msgid "missing '(' in expression"
msgstr "недостаје ( у изразу"
-#: expr.c:1632
+#: expr.c:1662
#, c-format
msgid "the left operand of \"%s\" changes sign when promoted"
msgstr "леви операнд за „%s“ мења знак када је претворен"
-#: expr.c:1637
+#: expr.c:1667
#, c-format
msgid "the right operand of \"%s\" changes sign when promoted"
msgstr "десни операнд за „%s“ мења знак када је претворен"
-#: expr.c:1896
+#: expr.c:1926
msgid "traditional C rejects the unary plus operator"
msgstr "уобичајени Ц одбацује унарни плус оператор"
-#: expr.c:1994
+#: expr.c:2024
msgid "comma operator in operand of #if"
msgstr "оператор зареза у операнду „#if“"
-#: expr.c:2130
+#: expr.c:2160
msgid "division by zero in #if"
msgstr "дељење нулом у „#if“"
-#: files.c:576
+#: files.c:571
msgid "one or more PCH files were found, but they were invalid"
msgstr "једна или више ПЦХ датотека је пронађено, али су неисправне"
-#: files.c:580
+#: files.c:575
msgid "use -Winvalid-pch for more information"
msgstr "користите „-Winvalid-pch“ за више података"
-#: files.c:1004
+#: files.c:1051
#, c-format
msgid "no include path in which to search for %s"
msgstr "нема путање укључивања у којој потражити „%s“"
-#: files.c:1439
+#: files.c:1546
msgid "Multiple include guards may be useful for:\n"
msgstr "Више чувара укључивања може бити корисно за:\n"
-#: init.c:598
+#: init.c:614
msgid "cppchar_t must be an unsigned type"
msgstr "„cppchar_t“ мора бити неозначена врста"
-#: init.c:602
+#: init.c:618
#, c-format
msgid "preprocessor arithmetic has maximum precision of %lu bits; target requires %lu bits"
msgstr "аритметика претпроцесора има највећу тачност од %lu бита; мета затева %lu бита"
-#: init.c:609
+#: init.c:625
msgid "CPP arithmetic must be at least as precise as a target int"
msgstr "ЦПП аритметика мора бити тачна барем колико и циљни цео број"
-#: init.c:612
+#: init.c:628
msgid "target char is less than 8 bits wide"
msgstr "циљни знак је дужи мање од 8 бита"
-#: init.c:616
+#: init.c:632
msgid "target wchar_t is narrower than target char"
msgstr "циљни широки знак (wchar_t) је ужи од циљног знака"
-#: init.c:620
+#: init.c:636
msgid "target int is narrower than target char"
msgstr "циљни цео број је ужи од циљног знака"
-#: init.c:625
+#: init.c:641
msgid "CPP half-integer narrower than CPP character"
msgstr "ЦПП полуцео број је ужи од ЦПП знака"
-#: init.c:629
+#: init.c:645
#, c-format
msgid "CPP on this host cannot handle wide character constants over %lu bits, but the target requires %lu bits"
msgstr "ЦПП на овом рачунару не може да рукује дуге константе знака преко %lu бита, али мета захтева %lu бита"
@@ -697,12 +704,12 @@ msgid "`%.*s' is not in NFC"
msgstr "„%.*s“ није у НФЦ-у"
#: lex.c:1375
-msgid "__VA_OPT__ is not available until C++2a"
-msgstr "„__VA_OPT__“ није доступно све до „Ц++2a“"
+msgid "__VA_OPT__ is not available until C++20"
+msgstr "„__VA_OPT__“ није доступно све до „Ц++20“"
#: lex.c:1382
-msgid "__VA_OPT__ can only appear in the expansion of a C++2a variadic macro"
-msgstr "„__VA_OPT__“ може само да се појави у ширењу вариадик макроа „Ц++2a“"
+msgid "__VA_OPT__ can only appear in the expansion of a C++20 variadic macro"
+msgstr "„__VA_OPT__“ може само да се појави у ширењу вариадик макроа „Ц++20“"
#: lex.c:1413 lex.c:1506
#, c-format
@@ -722,232 +729,254 @@ msgstr "„__VA_ARGS__“ може само да се појави у ширењ
msgid "identifier \"%s\" is a special operator name in C++"
msgstr "одредник „%s“ је назив посебног оператора у Ц++-у"
-#: lex.c:1837
+#: lex.c:1879
msgid "raw string delimiter longer than 16 characters"
msgstr "граничник сирове ниске је дужи од 16 знака"
-#: lex.c:1841
+#: lex.c:1883
msgid "invalid new-line in raw string delimiter"
msgstr "неисправан нови ред у граничнику сирове ниске"
-#: lex.c:1845
+#: lex.c:1887 lex.c:4639
#, c-format
msgid "invalid character '%c' in raw string delimiter"
msgstr "неисправан знак „%c“ у граничнику сирове ниске"
-#: lex.c:1894 lex.c:1916
+#: lex.c:1926 lex.c:1949
msgid "unterminated raw string"
msgstr "неокончана сирова ниска"
-#: lex.c:1936 lex.c:2065
+#: lex.c:1971 lex.c:2100
msgid "invalid suffix on literal; C++11 requires a space between literal and string macro"
msgstr "неисправан суфикс у словности; Ц++11 захтева размак између словности и макроа ниске"
-#: lex.c:2048
+#: lex.c:2083
msgid "null character(s) preserved in literal"
msgstr "ништаван знак је причуван у словности"
-#: lex.c:2051
+#: lex.c:2086
#, c-format
msgid "missing terminating %c character"
msgstr "недостаје завршни знак %c"
-#: lex.c:2083
+#: lex.c:2118
msgid "C++11 requires a space between string literal and macro"
msgstr "Ц++11 захтева размак између словности и макроа ниске"
-#: lex.c:2893 lex.c:2927
+#: lex.c:2711
+msgid "module control-line cannot be in included file"
+msgstr "контролни ред модула не може бити у укљученој датотеци"
+
+#: lex.c:2725
+#, c-format
+msgid "module control-line \"%s\" cannot be an object-like macro"
+msgstr "контролни ред модула „%s“ не може бити макро налик објекту"
+
+#: lex.c:3099 lex.c:4472 traditional.c:174
+msgid "unterminated comment"
+msgstr "неокончана напомена"
+
+#: lex.c:3113 lex.c:3147
msgid "C++ style comments are not allowed in ISO C90"
msgstr "Напомене Ц++ стила нису допуштене у ИСО Ц90"
-#: lex.c:2895 lex.c:2906 lex.c:2930
+#: lex.c:3115 lex.c:3126 lex.c:3150
msgid "(this will be reported only once per input file)"
msgstr "(ово ће бити извештено само једном по улазној датотеци)"
-#: lex.c:2904
+#: lex.c:3124
msgid "C++ style comments are incompatible with C90"
msgstr "Напомене Ц++ стила нису сагласне са Ц90"
-#: lex.c:2936
+#: lex.c:3156
msgid "multi-line comment"
msgstr "напомена више редова"
-#: lex.c:3330
+#: lex.c:3550
#, c-format
msgid "unspellable token %s"
msgstr "неизговорљив симбол %s"
+#: lex.c:4627
+#, c-format
+msgid "raw string delimiter longer than %d characters"
+msgstr "граничник сирове ниске је дужи од %d знака"
+
+#: lex.c:4697
+msgid "unterminated literal"
+msgstr "незавршени литерал"
+
#: macro.c:94
msgid "'##' cannot appear at either end of __VA_OPT__"
msgstr "„##“ не може да се појави у или на крају „__VA_OPT__“"
-#: macro.c:364
+#: macro.c:386
#, c-format
msgid "\"%s\" used outside of preprocessing directive"
msgstr "„%s“ се користи ван директиве претпроцесора"
-#: macro.c:374
+#: macro.c:396
#, c-format
msgid "missing '(' before \"%s\" operand"
msgstr "недостаје ( пре операнда „%s“"
-#: macro.c:389
+#: macro.c:411
#, c-format
msgid "operator \"%s\" requires a header-name"
msgstr "оператор „%s“ захтева назив заглавља"
-#: macro.c:406
+#: macro.c:428
#, c-format
msgid "missing ')' after \"%s\" operand"
msgstr "недостаје ) након операнда „%s“"
-#: macro.c:426
+#: macro.c:448
#, c-format
msgid "macro \"%s\" is not used"
msgstr "макро „%s“ није коришћен"
-#: macro.c:465 macro.c:723
+#: macro.c:487 macro.c:778
#, c-format
msgid "invalid built-in macro \"%s\""
msgstr "неисправан макро уградње „%s“"
-#: macro.c:472 macro.c:574
+#: macro.c:494 macro.c:596
#, c-format
msgid "macro \"%s\" might prevent reproducible builds"
msgstr "макро „%s“ може да спречи поновљиве изградње"
-#: macro.c:503
+#: macro.c:525
msgid "could not determine file timestamp"
msgstr "не могу да одредим временску ознаку датотеке"
-#: macro.c:620
+#: macro.c:610
msgid "could not determine date and time"
msgstr "не могу да одредим датум и време"
-#: macro.c:636
+#: macro.c:642
msgid "__COUNTER__ expanded inside directive with -fdirectives-only"
msgstr "„__COUNTER__“ је проширен у директиви са „-fdirectives-only“"
-#: macro.c:842
+#: macro.c:897
msgid "invalid string literal, ignoring final '\\'"
msgstr "неисправна словност ниске, занемарујем завршну \\"
-#: macro.c:904
+#: macro.c:959
#, c-format
msgid "pasting \"%s\" and \"%s\" does not give a valid preprocessing token"
msgstr "налепљивање „%s“ и „%s“ не даје исправан симбол претпроцесора"
-#: macro.c:1030
+#: macro.c:1085
msgid "ISO C++11 requires at least one argument for the \"...\" in a variadic macro"
msgstr "ИСО Ц++11 захтева барем један аргумент за „...“ у вариадик макроу"
-#: macro.c:1034
+#: macro.c:1089
msgid "ISO C99 requires at least one argument for the \"...\" in a variadic macro"
msgstr "ИСО Ц99 захтева барем један аргумент за „...“ у вариадик макроу"
-#: macro.c:1041
+#: macro.c:1096
#, c-format
msgid "macro \"%s\" requires %u arguments, but only %u given"
msgstr "макро „%s“ захтева %u аргумента, али само %u су дата"
-#: macro.c:1046
+#: macro.c:1101
#, c-format
msgid "macro \"%s\" passed %u arguments, but takes just %u"
msgstr "макро „%s“ је проследио %u аргумента, али узима само %u"
-#: macro.c:1244 traditional.c:815
+#: macro.c:1299 traditional.c:822
#, c-format
msgid "unterminated argument list invoking macro \"%s\""
msgstr "бесконачан списак аргумената призивајући макро „%s“"
-#: macro.c:1386
+#: macro.c:1442
#, c-format
msgid "function-like macro \"%s\" must be used with arguments in traditional C"
msgstr "макро налик функцији „%s“ мора бити коришћен са аргументима у уобичајеном Ц-у"
-#: macro.c:2165
+#: macro.c:2220
#, c-format
msgid "invoking macro %s argument %d: empty macro arguments are undefined in ISO C++98"
msgstr "призивајући макро %s аргумент %d: празни аргументи макроа нису одређени у ИСО Ц++98"
-#: macro.c:2173 macro.c:2182
+#: macro.c:2228 macro.c:2237
#, c-format
msgid "invoking macro %s argument %d: empty macro arguments are undefined in ISO C90"
msgstr "призивајући макро %s аргумент %d: празни аргументи макроа нису одређени у ИСО Ц90"
-#: macro.c:3141
+#: macro.c:3279
#, c-format
msgid "duplicate macro parameter \"%s\""
msgstr "параметар двоструког макроа „%s“"
-#: macro.c:3223
+#: macro.c:3361
#, c-format
msgid "expected parameter name, found \"%s\""
msgstr "очекивах назив параметра, нађох „%s“"
-#: macro.c:3224
+#: macro.c:3362
#, c-format
msgid "expected ',' or ')', found \"%s\""
msgstr "очекивах , или ), нађох „%s“"
-#: macro.c:3225
+#: macro.c:3363
msgid "expected parameter name before end of line"
msgstr "очекивах назив параметра пре краја реда"
-#: macro.c:3226
+#: macro.c:3364
msgid "expected ')' before end of line"
msgstr "очекивах ) пре краја реда"
-#: macro.c:3227
+#: macro.c:3365
msgid "expected ')' after \"...\""
msgstr "очекивах ) након ..."
-#: macro.c:3284
+#: macro.c:3422
msgid "anonymous variadic macros were introduced in C++11"
msgstr "безимени вариадик макрои су уведени у Ц++11"
-#: macro.c:3285 macro.c:3289
+#: macro.c:3423 macro.c:3427
msgid "anonymous variadic macros were introduced in C99"
msgstr "безимени вариадик макрои су уведени у Ц99"
-#: macro.c:3295
+#: macro.c:3433
msgid "ISO C++ does not permit named variadic macros"
msgstr "ИСО Ц++ не дозвољава именоване вариадик макрое"
-#: macro.c:3296
+#: macro.c:3434
msgid "ISO C does not permit named variadic macros"
msgstr "ИСО Ц не дозвољава именоване вариадик макрое"
-#: macro.c:3342
+#: macro.c:3480
msgid "'##' cannot appear at either end of a macro expansion"
msgstr "„##“ не може да се појави у или на крају макро ширења"
-#: macro.c:3380
+#: macro.c:3518
msgid "ISO C++11 requires whitespace after the macro name"
msgstr "ИСО Ц++11 захтева празнине након назива макроа"
-#: macro.c:3381
+#: macro.c:3519
msgid "ISO C99 requires whitespace after the macro name"
msgstr "ИСО Ц99 захтева празнине након назива макроа"
-#: macro.c:3405
+#: macro.c:3543
msgid "missing whitespace after the macro name"
msgstr "недостаје празнина након назива макроа"
-#: macro.c:3455
+#: macro.c:3593
msgid "'#' is not followed by a macro parameter"
msgstr "за „#“ не следи параметар макроа"
-#: macro.c:3606
+#: macro.c:3749
#, c-format
msgid "\"%s\" redefined"
msgstr "„%s“ је поново одређено"
-#: macro.c:3611
+#: macro.c:3754
msgid "this is the location of the previous definition"
msgstr "ово је место претходне одреднице"
-#: macro.c:3715
+#: macro.c:3891
#, c-format
msgid "macro argument \"%s\" would be stringified in traditional C"
msgstr "макро аргумент „%s“ ће бити нискован у уобичајеном Ц-у"
@@ -985,15 +1014,18 @@ msgstr "%s: није употребљено зато што „__COUNTER__“ н
msgid "while reading precompiled header"
msgstr "за време читања претходно преведеног заглавља"
-#: traditional.c:884
+#: traditional.c:891
#, c-format
msgid "detected recursion whilst expanding macro \"%s\""
msgstr "откривено је дубачење за време ширења макроа „%s“"
-#: traditional.c:1107
+#: traditional.c:1114
msgid "syntax error in macro parameter list"
msgstr "садржајна грешка у списку параметара макроа"
+#~ msgid "binary constants are a GCC extension"
+#~ msgstr "бинарне константе су ГЦЦ проширења"
+
#~ msgid "\"__has_include__\" cannot be used as a macro name"
#~ msgstr "„__has_include__“ не може бити коришћено као назив макроа"
diff --git a/libcpp/po/sv.po b/libcpp/po/sv.po
index b55e11e..6229fe1 100644
--- a/libcpp/po/sv.po
+++ b/libcpp/po/sv.po
@@ -1,173 +1,173 @@
# Swedish messages for cpplib.
-# Copyright © 2000, 2005, 2006, 2007, 2008, 2009, 2010, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020 Free Software Foundation, Inc.
+# Copyright © 2000, 2005, 2006, 2007, 2008, 2009, 2010, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021 Free Software Foundation, Inc.
# This file is distributed under the same license as the gcc package.
# Dennis Björklund <db@zigo.dhs.org>, 2000, 2001, 2002.
-# Göran Uddeborg <goeran@uddeborg.se>, 2005, 2006, 2007, 2008, 2009, 2010, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020.
+# Göran Uddeborg <goeran@uddeborg.se>, 2005, 2006, 2007, 2008, 2009, 2010, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021.
#
# Remember: GCC team does not want RCS keywords in the header!
#
msgid ""
msgstr ""
-"Project-Id-Version: cpplib 10.1-b20200209\n"
+"Project-Id-Version: cpplib 11.1-b20210207\n"
"Report-Msgid-Bugs-To: https://gcc.gnu.org/bugs/\n"
-"POT-Creation-Date: 2020-02-07 22:33+0000\n"
-"PO-Revision-Date: 2020-05-15 15:50+0200\n"
+"POT-Creation-Date: 2021-02-05 21:38+0000\n"
+"PO-Revision-Date: 2021-02-11 21:39+0100\n"
"Last-Translator: Göran Uddeborg <goeran@uddeborg.se>\n"
-"Language-Team: Swedish <tp-sv-list@lists.sourceforge.net>\n"
+"Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
"Language: sv\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8-bit\n"
"X-Bugs: Report translation errors to the Language-Team address.\n"
-#: charset.c:674
+#: charset.c:677
#, c-format
msgid "conversion from %s to %s not supported by iconv"
msgstr "konvertering från %s till %s stödjs inte av iconv"
-#: charset.c:677
+#: charset.c:680
msgid "iconv_open"
msgstr "iconv_open"
-#: charset.c:685
+#: charset.c:688
#, c-format
msgid "no iconv implementation, cannot convert from %s to %s"
msgstr "ingen iconv-implementation, kan inte konvertera från %s till %s"
-#: charset.c:781
+#: charset.c:784
#, c-format
msgid "character 0x%lx is not in the basic source character set\n"
msgstr "tecken 0x%lx finns inte i källkodens grundteckenuppsättning\n"
-#: charset.c:798 charset.c:1768
+#: charset.c:801 charset.c:1771
msgid "converting to execution character set"
msgstr "konverterar till teckenuppsättning för körning"
-#: charset.c:804
+#: charset.c:807
#, c-format
msgid "character 0x%lx is not unibyte in execution character set"
msgstr "tecken 0x%lx är inte en byte i teckenuppsättning för körning"
-#: charset.c:1054
+#: charset.c:1057
msgid "universal character names are only valid in C++ and C99"
msgstr "universella teckennamn är endast giltiga i C++ och C99"
-#: charset.c:1058
+#: charset.c:1061
msgid "C99's universal character names are incompatible with C90"
msgstr "C99:s universella teckennamn är inkompatibla med C90"
-#: charset.c:1061
+#: charset.c:1064
#, c-format
msgid "the meaning of '\\%c' is different in traditional C"
msgstr "betydelsen av ”\\%c” är annorlunda i traditionell C"
-#: charset.c:1070
+#: charset.c:1073
msgid "In _cpp_valid_ucn but not a UCN"
msgstr "I _cpp_valid_ucn men inte en UCN"
-#: charset.c:1103
+#: charset.c:1106
#, c-format
msgid "incomplete universal character name %.*s"
msgstr "ofullständigt universellt teckennamn %.*s"
-#: charset.c:1118
+#: charset.c:1121
#, c-format
msgid "%.*s is not a valid universal character"
msgstr "%.*s är inte ett giltigt universellt tecken"
-#: charset.c:1128 lex.c:1335
+#: charset.c:1131 lex.c:1335
msgid "'$' in identifier or number"
msgstr "”$” i identifierare eller tal"
-#: charset.c:1138
+#: charset.c:1141
#, c-format
msgid "universal character %.*s is not valid in an identifier"
msgstr "universellt tecken %.*s är inte giltigt i en identifierare"
-#: charset.c:1142
+#: charset.c:1145
#, c-format
msgid "universal character %.*s is not valid at the start of an identifier"
msgstr "universellt tecken %.*s är inte giltigt vid början av en identifierare"
-#: charset.c:1149
+#: charset.c:1152
#, c-format
msgid "%.*s is outside the UCS codespace"
msgstr "%.*s är utanför UCS-kodrymden"
-#: charset.c:1194 charset.c:2113
+#: charset.c:1197 charset.c:2116
msgid "converting UCN to source character set"
msgstr "vid konvertering av UCN källteckenuppsättning"
-#: charset.c:1201
+#: charset.c:1204
msgid "converting UCN to execution character set"
msgstr "vid konvertering av UCN till teckenuppsättning för körning"
-#: charset.c:1265
+#: charset.c:1268
#, c-format
msgid "extended character %.*s is not valid in an identifier"
msgstr "utökat tecken %.*s är inte giltigt i en identifierare"
-#: charset.c:1282
+#: charset.c:1285
#, c-format
msgid "extended character %.*s is not valid at the start of an identifier"
msgstr "utökat tecken %.*s är inte giltigt vid början av en identifierare"
-#: charset.c:1368
+#: charset.c:1371
msgid "the meaning of '\\x' is different in traditional C"
msgstr "betydelsen av ”\\x” är annorlunda i traditionell C"
-#: charset.c:1393
+#: charset.c:1396
msgid "\\x used with no following hex digits"
msgstr "\\x använt utan några följande hexadecimala siffror"
-#: charset.c:1400
+#: charset.c:1403
msgid "hex escape sequence out of range"
msgstr "hexadecimal specialsekvens utanför intervallet"
-#: charset.c:1452
+#: charset.c:1455
msgid "octal escape sequence out of range"
msgstr "oktal specialsekvens utanför intervallet"
-#: charset.c:1534
+#: charset.c:1537
msgid "the meaning of '\\a' is different in traditional C"
msgstr "betydelsen av ”\\a” är annorlunda i traditionell C"
-#: charset.c:1541
+#: charset.c:1544
#, c-format
msgid "non-ISO-standard escape sequence, '\\%c'"
msgstr "icke-ISO-standardspecialsekvens, ”\\%c”"
-#: charset.c:1549
+#: charset.c:1552
#, c-format
msgid "unknown escape sequence: '\\%c'"
msgstr "okänd specialsekvens: ”\\%c”"
-#: charset.c:1557
+#: charset.c:1560
#, c-format
msgid "unknown escape sequence: '\\%s'"
msgstr "okänd specialsekvens: ”\\%s”"
-#: charset.c:1565
+#: charset.c:1568
msgid "converting escape sequence to execution character set"
msgstr "vid konvertering av specialsekvens till teckenuppsättning för körning"
-#: charset.c:1705
+#: charset.c:1708
msgid "missing open quote"
msgstr "inledande citationstecken saknas"
-#: charset.c:1923 charset.c:2002
+#: charset.c:1926 charset.c:2005
msgid "character constant too long for its type"
msgstr "teckenkonstant för lång för sin typ"
-#: charset.c:1926
+#: charset.c:1929
msgid "multi-character character constant"
msgstr "flerteckens teckenkonstant"
-#: charset.c:2042
+#: charset.c:2045
msgid "empty character constant"
msgstr "tom teckenkonstant"
-#: charset.c:2160
+#: charset.c:2163
#, c-format
msgid "failure to convert %s to %s"
msgstr "misslyckades att konvertera %s till %s"
@@ -238,203 +238,199 @@ msgstr "makronamn måste vara identifierare"
msgid "undefining \"%s\""
msgstr "avdefinierar ”%s”"
-#: directives.c:724
+#: directives.c:725
msgid "missing terminating > character"
msgstr "saknar avslutande tecken >"
-#: directives.c:783
+#: directives.c:784
#, c-format
msgid "#%s expects \"FILENAME\" or <FILENAME>"
msgstr "#%s förväntar ”FILNAMN” eller <FILNAMN>"
-#: directives.c:829
+#: directives.c:830
#, c-format
msgid "empty filename in #%s"
msgstr "tomt filnamn i #%s"
-#: directives.c:838
+#: directives.c:839
#, c-format
msgid "#include nested depth %u exceeds maximum of %u (use -fmax-include-depth=DEPTH to increase the maximum)"
msgstr "nästningsdjup %u av #include överskrider maximum på %u (använd -fmax-include-depth=DJUP för att öka maximumet)"
-#: directives.c:883
+#: directives.c:884
msgid "#include_next in primary source file"
msgstr "#include_next i primär källkodsfil"
-#: directives.c:909
+#: directives.c:910
#, c-format
msgid "invalid flag \"%s\" in line directive"
msgstr "ogiltig flagga ”%s” i line-direktiv"
-#: directives.c:969
+#: directives.c:970
msgid "unexpected end of file after #line"
msgstr "oväntat filslut efter #line"
-#: directives.c:972
+#: directives.c:973
#, c-format
msgid "\"%s\" after #line is not a positive integer"
msgstr "”%s” efter #line är inte ett positivt heltal"
-#: directives.c:978 directives.c:980
+#: directives.c:979 directives.c:981
msgid "line number out of range"
msgstr "radnummer utanför möjligt intervall"
-#: directives.c:993 directives.c:1074
+#: directives.c:994 directives.c:1075
#, c-format
msgid "\"%s\" is not a valid filename"
msgstr "”%s” är inte ett giltigt filnamn"
-#: directives.c:1034
+#: directives.c:1035
#, c-format
msgid "\"%s\" after # is not a positive integer"
msgstr "”%s” efter # är inte ett positivt heltal"
-#: directives.c:1101
+#: directives.c:1102
#, c-format
msgid "file \"%s\" linemarker ignored due to incorrect nesting"
msgstr "filen ”%s” linjemarkör ignoreras på grund av felaktig nästning"
-#: directives.c:1162 directives.c:1164 directives.c:1166 directives.c:1754
+#: directives.c:1180 directives.c:1182 directives.c:1184 directives.c:1772
#, c-format
msgid "%s"
msgstr "%s"
-#: directives.c:1190
+#: directives.c:1208
#, c-format
msgid "invalid #%s directive"
msgstr "ogiltigt #%s-direktiv"
-#: directives.c:1253
+#: directives.c:1271
#, c-format
msgid "registering pragmas in namespace \"%s\" with mismatched name expansion"
msgstr "registrerar pragman i namnrymden ”%s” med namnexpansion som inte passar ihop"
-#: directives.c:1262
+#: directives.c:1280
#, c-format
msgid "registering pragma \"%s\" with name expansion and no namespace"
msgstr "registrerar pragma ”%s” med namnexpansion och utan namnrymd"
-#: directives.c:1280
+#: directives.c:1298
#, c-format
msgid "registering \"%s\" as both a pragma and a pragma namespace"
msgstr "registrerar ”%s” både som ett pragma och ett pragma namespace"
-#: directives.c:1283
+#: directives.c:1301
#, c-format
msgid "#pragma %s %s is already registered"
msgstr "#pragma %s %s är redan registrerat"
-#: directives.c:1286
+#: directives.c:1304
#, c-format
msgid "#pragma %s is already registered"
msgstr "#pragma %s är redan registrerat"
-#: directives.c:1316
+#: directives.c:1334
msgid "registering pragma with NULL handler"
msgstr "registrerar pragma med NULL-hanterare"
-#: directives.c:1533
+#: directives.c:1551
msgid "#pragma once in main file"
msgstr "#pragma once i huvudfil"
-#: directives.c:1556
+#: directives.c:1574
msgid "invalid #pragma push_macro directive"
msgstr "ogiltigt direktiv #pragma push_macro"
-#: directives.c:1613
+#: directives.c:1631
msgid "invalid #pragma pop_macro directive"
msgstr "ogiltigt direktiv #pragma pop_macro"
-#: directives.c:1668
+#: directives.c:1686
msgid "invalid #pragma GCC poison directive"
msgstr "ogiltigt direktiv #pragma GCC poison"
-#: directives.c:1677
+#: directives.c:1695
#, c-format
msgid "poisoning existing macro \"%s\""
msgstr "förgiftar existerande makro ”%s”"
-#: directives.c:1696
+#: directives.c:1714
msgid "#pragma system_header ignored outside include file"
msgstr "#pragma system_header ignorerat utanför huvudfil"
-#: directives.c:1721
+#: directives.c:1739
#, c-format
msgid "cannot find source file %s"
msgstr "kan inte hitta källfil %s"
-#: directives.c:1725
+#: directives.c:1743
#, c-format
msgid "current file is older than %s"
msgstr "aktuell fil är äldre än %s"
-#: directives.c:1749
+#: directives.c:1767
#, c-format
msgid "invalid \"#pragma GCC %s\" directive"
msgstr "ogiltigt direktiv ”#pragma GCC %s”"
-#: directives.c:1950
+#: directives.c:1968
msgid "_Pragma takes a parenthesized string literal"
msgstr "_Pragma tar en strängkonstant inom parenteser"
-#: directives.c:2033
+#: directives.c:2051
msgid "#else without #if"
msgstr "#else utan #if"
-#: directives.c:2038
+#: directives.c:2056
msgid "#else after #else"
msgstr "#else efter #else"
-#: directives.c:2040 directives.c:2073
+#: directives.c:2058 directives.c:2091
msgid "the conditional began here"
msgstr "villkorssatsen började här"
-#: directives.c:2066
+#: directives.c:2084
msgid "#elif without #if"
msgstr "#elif utan #if"
-#: directives.c:2071
+#: directives.c:2089
msgid "#elif after #else"
msgstr "#elif efter #else"
-#: directives.c:2102
+#: directives.c:2120
msgid "#endif without #if"
msgstr "#endif utan #if"
-#: directives.c:2178
+#: directives.c:2196
msgid "missing '(' after predicate"
msgstr "saknas '(' efter predikat"
-#: directives.c:2196
+#: directives.c:2214
msgid "missing ')' to complete answer"
msgstr "saknas ')' för att avsluta svaret"
-#: directives.c:2208
+#: directives.c:2226
msgid "predicate's answer is empty"
msgstr "predikatets svar är tomt"
-#: directives.c:2238
+#: directives.c:2256
msgid "assertion without predicate"
msgstr "försäkran utan predikat"
-#: directives.c:2241
+#: directives.c:2259
msgid "predicate must be an identifier"
msgstr "predikat måste vara en identifierare"
-#: directives.c:2323
+#: directives.c:2341
#, c-format
msgid "\"%s\" re-asserted"
msgstr "”%s” omförsäkrat"
-#: directives.c:2604
+#: directives.c:2659
#, c-format
msgid "unterminated #%s"
msgstr "oavslutad #%s"
-#: directives-only.c:221 lex.c:2879 traditional.c:174
-msgid "unterminated comment"
-msgstr "ej avslutad kommentar"
-
#: errors.c:291
#, c-format
msgid "%s: %s"
@@ -444,215 +440,227 @@ msgstr "%s: %s"
msgid "stdout"
msgstr "standard ut"
-#: expr.c:626 expr.c:743
+#: expr.c:636 expr.c:753
msgid "fixed-point constants are a GCC extension"
msgstr "fastdecimalskonstanter är en GCC-utvidgning"
-#: expr.c:651
+#: expr.c:661
msgid "invalid prefix \"0b\" for floating constant"
msgstr "ogiltigt prefix ”0b” på flyttalskonstant"
-#: expr.c:664
+#: expr.c:674
msgid "use of C++17 hexadecimal floating constant"
msgstr "användning av hexadecimal flyttalskonstant enligt C++17"
-#: expr.c:667
+#: expr.c:677
msgid "use of C99 hexadecimal floating constant"
msgstr "användning av hexadecimal flyttalskonstant enligt C99"
-#: expr.c:711
+#: expr.c:721
#, c-format
msgid "invalid suffix \"%.*s\" on floating constant"
msgstr "ogiltigt suffix ”%.*s” på flyttalskonstant"
-#: expr.c:722 expr.c:789
+#: expr.c:732 expr.c:799
#, c-format
msgid "traditional C rejects the \"%.*s\" suffix"
msgstr "traditionell C tillåter inte suffixet ”%.*s”"
-#: expr.c:730
+#: expr.c:740
msgid "suffix for double constant is a GCC extension"
msgstr "suffix för double-konstanter är en GCC-utvidgning"
-#: expr.c:736
+#: expr.c:746
#, c-format
msgid "invalid suffix \"%.*s\" with hexadecimal floating constant"
msgstr "ogiltigt suffix ”%.*s” på hexadecimal flyttalskonstant"
-#: expr.c:749 expr.c:753
+#: expr.c:759 expr.c:763
msgid "decimal float constants are a C2X feature"
msgstr "decimala flyttalskonstanter är en C2X-funktion"
-#: expr.c:772
+#: expr.c:782
#, c-format
msgid "invalid suffix \"%.*s\" on integer constant"
msgstr "ogiltig ändelse ”%.*s” på heltalskonstant"
-#: expr.c:797
+#: expr.c:807
msgid "use of C++11 long long integer constant"
msgstr "användning av long long heltalskonstant enligt C++11"
-#: expr.c:798
+#: expr.c:808
msgid "use of C99 long long integer constant"
msgstr "användning av long long heltalskonstant enligt C99"
-#: expr.c:814
+#: expr.c:822
+msgid "use of C++23 %<size_t%> integer constant"
+msgstr "användning av %<size_t%> heltalskonstant enligt C++23"
+
+#: expr.c:823
+msgid "use of C++23 %<make_signed_t<size_t>%> integer constant"
+msgstr "användning av %<make_signed_t<size_t>%> heltalskonstant enligt C++23"
+
+#: expr.c:834
msgid "imaginary constants are a GCC extension"
msgstr "imaginära konstanter är en GCC-utvidgning"
-#: expr.c:820
+#: expr.c:841
msgid "binary constants are a C++14 feature or GCC extension"
msgstr "binära konstanter är C++14-funktion eller GCC-utvidgning"
-#: expr.c:822
-msgid "binary constants are a GCC extension"
-msgstr "binära konstanter är en GCC-utvidgning"
+#: expr.c:843
+msgid "binary constants are a C2X feature or GCC extension"
+msgstr "binära konstanter är C2X-funktion eller GCC-utvidgning"
+
+#: expr.c:848
+msgid "binary constants are a C2X feature"
+msgstr "binära konstanter är en C2X-funktion"
-#: expr.c:917
+#: expr.c:944
msgid "integer constant is too large for its type"
msgstr "heltalskonstant är för stor för sin typ"
-#: expr.c:948
+#: expr.c:975
msgid "integer constant is so large that it is unsigned"
msgstr "heltalskonstant är så stor att den är teckenlös"
-#: expr.c:1043
+#: expr.c:1070
msgid "missing ')' after \"defined\""
msgstr "saknar ')' efter ”defined”"
-#: expr.c:1050
+#: expr.c:1077
msgid "operator \"defined\" requires an identifier"
msgstr "operatorn ”defined” måste ha en identifierare"
-#: expr.c:1058
+#: expr.c:1085
#, c-format
msgid "(\"%s\" is an alternative token for \"%s\" in C++)"
msgstr "(”%s” är en alternativ symbol för ”%s” i C++)"
-#: expr.c:1070
+#: expr.c:1098
msgid "this use of \"defined\" may not be portable"
msgstr "denna användning av ”defined” är kanske inte portabel"
-#: expr.c:1113
+#: expr.c:1143
msgid "user-defined literal in preprocessor expression"
msgstr "användardefinierad konstant i preprocessoruttryck"
-#: expr.c:1118
+#: expr.c:1148
msgid "floating constant in preprocessor expression"
msgstr "flyttalskonstant i preprocessoruttryck"
-#: expr.c:1124
+#: expr.c:1154
msgid "imaginary number in preprocessor expression"
msgstr "imaginärt tal i preprocessoruttryck"
-#: expr.c:1173
+#: expr.c:1203
#, c-format
msgid "\"%s\" is not defined, evaluates to 0"
msgstr "”%s” är inte definierad, beräknas till 0"
-#: expr.c:1186
+#: expr.c:1216
msgid "assertions are a GCC extension"
msgstr "försäkringar är en GCC-utvidgning"
-#: expr.c:1189
+#: expr.c:1219
msgid "assertions are a deprecated extension"
msgstr "försäkringar är en utvidgning som avrådes ifrån"
-#: expr.c:1435
+#: expr.c:1465
#, c-format
msgid "unbalanced stack in %s"
msgstr "obalanserad stack i %s"
-#: expr.c:1455
+#: expr.c:1485
#, c-format
msgid "impossible operator '%u'"
msgstr "omöjlig operator ”%u”"
-#: expr.c:1556
+#: expr.c:1586
msgid "missing ')' in expression"
msgstr "saknad ”)” i uttryck"
-#: expr.c:1585
+#: expr.c:1615
msgid "'?' without following ':'"
msgstr "”?” utan följande ”:”"
-#: expr.c:1595
+#: expr.c:1625
msgid "integer overflow in preprocessor expression"
msgstr "heltalsspill i preprocessoruttryck"
-#: expr.c:1600
+#: expr.c:1630
msgid "missing '(' in expression"
msgstr "saknad ”(” i uttryck"
-#: expr.c:1632
+#: expr.c:1662
#, c-format
msgid "the left operand of \"%s\" changes sign when promoted"
msgstr "vänsteroperanden till ”%s” byter tecken vid befordran"
-#: expr.c:1637
+#: expr.c:1667
#, c-format
msgid "the right operand of \"%s\" changes sign when promoted"
msgstr "högeroperanden till ”%s” byter tecken vid befordran"
-#: expr.c:1896
+#: expr.c:1926
msgid "traditional C rejects the unary plus operator"
msgstr "traditionell C hanterar inte operatorn unärt plus"
-#: expr.c:1994
+#: expr.c:2024
msgid "comma operator in operand of #if"
msgstr "kommaoperator i operand till #if"
-#: expr.c:2130
+#: expr.c:2160
msgid "division by zero in #if"
msgstr "division med noll i #if"
-#: files.c:576
+#: files.c:571
msgid "one or more PCH files were found, but they were invalid"
msgstr "en eller flera PCH-filer hittades, men de var inte korrekta"
-#: files.c:580
+#: files.c:575
msgid "use -Winvalid-pch for more information"
msgstr "använd -Winvalid-pch för mer information"
-#: files.c:1004
+#: files.c:1051
#, c-format
msgid "no include path in which to search for %s"
msgstr "ingen huvudfilssökväg att leta efter %s i"
-#: files.c:1439
+#: files.c:1546
msgid "Multiple include guards may be useful for:\n"
msgstr "Multipla inkluderingsvakter kan vara användbart för:\n"
-#: init.c:598
+#: init.c:614
msgid "cppchar_t must be an unsigned type"
msgstr "cppchar_t måste vare en teckenlös typ"
-#: init.c:602
+#: init.c:618
#, c-format
msgid "preprocessor arithmetic has maximum precision of %lu bits; target requires %lu bits"
msgstr "preprocessoraritmetik har en högsta precision på %lu bitar; målet kräver %lu bitar"
-#: init.c:609
+#: init.c:625
msgid "CPP arithmetic must be at least as precise as a target int"
msgstr "CPP-aritmetik måste vara åtminstone så precis som målets int"
-#: init.c:612
+#: init.c:628
msgid "target char is less than 8 bits wide"
msgstr "målets char är mindre än 8 bitar bred"
-#: init.c:616
+#: init.c:632
msgid "target wchar_t is narrower than target char"
msgstr "målets wchar_t är smalare än målets char"
-#: init.c:620
+#: init.c:636
msgid "target int is narrower than target char"
msgstr "målets int är smalare än målets char"
-#: init.c:625
+#: init.c:641
msgid "CPP half-integer narrower than CPP character"
msgstr "CPP:s halva heltal är smalare än CPP:s tecken"
-#: init.c:629
+#: init.c:645
#, c-format
msgid "CPP on this host cannot handle wide character constants over %lu bits, but the target requires %lu bits"
msgstr "CPP på denna värd kan inte hantera breda teckenkonstanter över %lu bitar, men målet kräver %lu bitar"
@@ -699,12 +707,12 @@ msgid "`%.*s' is not in NFC"
msgstr "”%.*s” är inte i NFC"
#: lex.c:1375
-msgid "__VA_OPT__ is not available until C++2a"
-msgstr "__VA_OPT__ är inte tillgängligt förrän C++2a"
+msgid "__VA_OPT__ is not available until C++20"
+msgstr "__VA_OPT__ är inte tillgängligt förrän C++20"
#: lex.c:1382
-msgid "__VA_OPT__ can only appear in the expansion of a C++2a variadic macro"
-msgstr "__VA_OPT__ kan endast dyka upp i expansionen av ett C++2a-makro med variabelt argumentantal"
+msgid "__VA_OPT__ can only appear in the expansion of a C++20 variadic macro"
+msgstr "__VA_OPT__ kan endast dyka upp i expansionen av ett C++20-makro med variabelt argumentantal"
#: lex.c:1413 lex.c:1506
#, c-format
@@ -724,232 +732,254 @@ msgstr "__VA_ARGS__ kan endast dyka upp i expansionen av ett C99-makro med varia
msgid "identifier \"%s\" is a special operator name in C++"
msgstr "identifieraren ”%s” är ett speciellt operatornamn i C++"
-#: lex.c:1837
+#: lex.c:1879
msgid "raw string delimiter longer than 16 characters"
msgstr "avgränsare för rå sträng längre än 16 tecken"
-#: lex.c:1841
+#: lex.c:1883
msgid "invalid new-line in raw string delimiter"
msgstr "felaktig nyrad i rå sträng-avgränsare"
-#: lex.c:1845
+#: lex.c:1887 lex.c:4639
#, c-format
msgid "invalid character '%c' in raw string delimiter"
msgstr "ogiltigt tecken ”%c” i avgränsare för rå sträng"
-#: lex.c:1894 lex.c:1916
+#: lex.c:1926 lex.c:1949
msgid "unterminated raw string"
msgstr "oavslutad rå sträng"
-#: lex.c:1936 lex.c:2065
+#: lex.c:1971 lex.c:2100
msgid "invalid suffix on literal; C++11 requires a space between literal and string macro"
msgstr "ogiltigt suffix på konstant; C++11 kräver ett mellanrum mellan konstant och strängmakro"
-#: lex.c:2048
+#: lex.c:2083
msgid "null character(s) preserved in literal"
msgstr "nolltecken bevarade i konstant"
-#: lex.c:2051
+#: lex.c:2086
#, c-format
msgid "missing terminating %c character"
msgstr "avslutande %c-tecken saknas"
-#: lex.c:2083
+#: lex.c:2118
msgid "C++11 requires a space between string literal and macro"
msgstr "C++11 kräver ett mellanrum mellan en strängkonstant och ett makro"
-#: lex.c:2893 lex.c:2927
+#: lex.c:2711
+msgid "module control-line cannot be in included file"
+msgstr "modulstyrraden kan inte finnas i en inkluderad fil"
+
+#: lex.c:2725
+#, c-format
+msgid "module control-line \"%s\" cannot be an object-like macro"
+msgstr "modulstyrraden ”%s” får inte vara ett objektlikt makro"
+
+#: lex.c:3099 lex.c:4472 traditional.c:174
+msgid "unterminated comment"
+msgstr "ej avslutad kommentar"
+
+#: lex.c:3113 lex.c:3147
msgid "C++ style comments are not allowed in ISO C90"
msgstr "C++ kommentarer tillåts inte i ISO C90"
-#: lex.c:2895 lex.c:2906 lex.c:2930
+#: lex.c:3115 lex.c:3126 lex.c:3150
msgid "(this will be reported only once per input file)"
msgstr "(detta rapporteras bara en gång per infil)"
-#: lex.c:2904
+#: lex.c:3124
msgid "C++ style comments are incompatible with C90"
msgstr "kommentarer i C++-stil är inkompatibla med C90"
-#: lex.c:2936
+#: lex.c:3156
msgid "multi-line comment"
msgstr "flerradskommentar"
-#: lex.c:3330
+#: lex.c:3550
#, c-format
msgid "unspellable token %s"
msgstr "ostavbar symbol %s"
+#: lex.c:4627
+#, c-format
+msgid "raw string delimiter longer than %d characters"
+msgstr "avgränsare för rå sträng längre än %d tecken"
+
+#: lex.c:4697
+msgid "unterminated literal"
+msgstr "oavslutad konstant"
+
#: macro.c:94
msgid "'##' cannot appear at either end of __VA_OPT__"
msgstr "”##” kan inte förekomma vid någon av ändarna av __VA_OPT__"
-#: macro.c:364
+#: macro.c:386
#, c-format
msgid "\"%s\" used outside of preprocessing directive"
msgstr "”%s” använt utanför något preprocessordirektiv"
-#: macro.c:374
+#: macro.c:396
#, c-format
msgid "missing '(' before \"%s\" operand"
msgstr "”(” saknas före operanden till ”%s”"
-#: macro.c:389
+#: macro.c:411
#, c-format
msgid "operator \"%s\" requires a header-name"
msgstr "operatorn ”%s” måste ha ett huvudnamn"
-#: macro.c:406
+#: macro.c:428
#, c-format
msgid "missing ')' after \"%s\" operand"
msgstr "”)” saknas efter operanden till ”%s”"
-#: macro.c:426
+#: macro.c:448
#, c-format
msgid "macro \"%s\" is not used"
msgstr "makrot ”%s” är inte använt"
-#: macro.c:465 macro.c:723
+#: macro.c:487 macro.c:778
#, c-format
msgid "invalid built-in macro \"%s\""
msgstr "ogiltigt inbyggt makro ”%s”"
-#: macro.c:472 macro.c:574
+#: macro.c:494 macro.c:596
#, c-format
msgid "macro \"%s\" might prevent reproducible builds"
msgstr "makrot ”%s” kan förhindra reproducerbara byggen"
-#: macro.c:503
+#: macro.c:525
msgid "could not determine file timestamp"
msgstr "det gick inte att avgöra fils tidsstämpel"
-#: macro.c:620
+#: macro.c:610
msgid "could not determine date and time"
msgstr "det gick inte att avgöra datum och tid"
-#: macro.c:636
+#: macro.c:642
msgid "__COUNTER__ expanded inside directive with -fdirectives-only"
msgstr "__COUNTER__ expanderad inuti direktiv med -fdirectives-only"
-#: macro.c:842
+#: macro.c:897
msgid "invalid string literal, ignoring final '\\'"
msgstr "ogiltig strängkonstant, ignorerar avslutande ”\\”"
-#: macro.c:904
+#: macro.c:959
#, c-format
msgid "pasting \"%s\" and \"%s\" does not give a valid preprocessing token"
msgstr "att sätta ihop ”%s” och ”%s” ger inte en giltig preprocessorsymbol"
-#: macro.c:1030
+#: macro.c:1085
msgid "ISO C++11 requires at least one argument for the \"...\" in a variadic macro"
msgstr "ISO C++11 kräver åtminstone ett argument för ”...” i ett makro med variabelt antal argument"
-#: macro.c:1034
+#: macro.c:1089
msgid "ISO C99 requires at least one argument for the \"...\" in a variadic macro"
msgstr "ISO C99 kräver åtminstone ett argument för ”...” i ett makro med variabelt antal argument"
-#: macro.c:1041
+#: macro.c:1096
#, c-format
msgid "macro \"%s\" requires %u arguments, but only %u given"
msgstr "makrot ”%s” kräver %u argument, men endast %u anges"
-#: macro.c:1046
+#: macro.c:1101
#, c-format
msgid "macro \"%s\" passed %u arguments, but takes just %u"
msgstr "makro ”%s” skickade %u argument, men det tar bara %u"
-#: macro.c:1244 traditional.c:815
+#: macro.c:1299 traditional.c:822
#, c-format
msgid "unterminated argument list invoking macro \"%s\""
msgstr "oavslutad argumentlista vid anrop av makrot ”%s”"
-#: macro.c:1386
+#: macro.c:1442
#, c-format
msgid "function-like macro \"%s\" must be used with arguments in traditional C"
msgstr "funktionsliknande makrot ”%s” måste användas med ett argument i traditionell C"
-#: macro.c:2165
+#: macro.c:2220
#, c-format
msgid "invoking macro %s argument %d: empty macro arguments are undefined in ISO C++98"
msgstr "vid anrop av makro %s argument %d: tomma makroargument är odefinierade i ISO C++98"
-#: macro.c:2173 macro.c:2182
+#: macro.c:2228 macro.c:2237
#, c-format
msgid "invoking macro %s argument %d: empty macro arguments are undefined in ISO C90"
msgstr "vid anrop av makro %s argument %d: tomma makroargument är odefinierade i ISO C90"
-#: macro.c:3141
+#: macro.c:3279
#, c-format
msgid "duplicate macro parameter \"%s\""
msgstr "dubblerad makroparameter ”%s”"
-#: macro.c:3223
+#: macro.c:3361
#, c-format
msgid "expected parameter name, found \"%s\""
msgstr "parameternamn förväntades, ”%s” hittades"
-#: macro.c:3224
+#: macro.c:3362
#, c-format
msgid "expected ',' or ')', found \"%s\""
msgstr "”,” eller ”)” förväntades, ”%s” hittades"
-#: macro.c:3225
+#: macro.c:3363
msgid "expected parameter name before end of line"
msgstr "parameternamn förväntades före slutet på raden"
-#: macro.c:3226
+#: macro.c:3364
msgid "expected ')' before end of line"
msgstr "”)” förväntades före slutet på raden"
-#: macro.c:3227
+#: macro.c:3365
msgid "expected ')' after \"...\""
msgstr "”)” förväntades efter ”...”"
-#: macro.c:3284
+#: macro.c:3422
msgid "anonymous variadic macros were introduced in C++11"
msgstr "anonyma variabla makron introducerades i C++11"
-#: macro.c:3285 macro.c:3289
+#: macro.c:3423 macro.c:3427
msgid "anonymous variadic macros were introduced in C99"
msgstr "anonyma variabla makron introducerades i C99"
-#: macro.c:3295
+#: macro.c:3433
msgid "ISO C++ does not permit named variadic macros"
msgstr "ISO C++ tillåter inte namngivna variabla makron"
-#: macro.c:3296
+#: macro.c:3434
msgid "ISO C does not permit named variadic macros"
msgstr "ISO C tillåter inte namngivna variabla makron"
-#: macro.c:3342
+#: macro.c:3480
msgid "'##' cannot appear at either end of a macro expansion"
msgstr "”##” kan inte förekomma vid någon av ändarna av makroexpansionen"
-#: macro.c:3380
+#: macro.c:3518
msgid "ISO C++11 requires whitespace after the macro name"
msgstr "ISO C++11 kräver mellanrum efter makronamnet"
-#: macro.c:3381
+#: macro.c:3519
msgid "ISO C99 requires whitespace after the macro name"
msgstr "ISO C99 kräver mellanrum efter makronamnet"
-#: macro.c:3405
+#: macro.c:3543
msgid "missing whitespace after the macro name"
msgstr "mellanrum saknas efter makronamn"
-#: macro.c:3455
+#: macro.c:3593
msgid "'#' is not followed by a macro parameter"
msgstr "”#” följs inte av en makroparameter"
-#: macro.c:3606
+#: macro.c:3749
#, c-format
msgid "\"%s\" redefined"
msgstr "”%s” omdefinierad"
-#: macro.c:3611
+#: macro.c:3754
msgid "this is the location of the previous definition"
msgstr "detta är platsen för den tidigare definitionen"
-#: macro.c:3715
+#: macro.c:3891
#, c-format
msgid "macro argument \"%s\" would be stringified in traditional C"
msgstr "makroargumentet ”%s” skulle bli gjort till sträng i traditionell C"
@@ -987,11 +1017,11 @@ msgstr "%s: inte använd för att ”__COUNTER__” är ogiltig"
msgid "while reading precompiled header"
msgstr "vid läsning av förkompilerat huvud"
-#: traditional.c:884
+#: traditional.c:891
#, c-format
msgid "detected recursion whilst expanding macro \"%s\""
msgstr "upptäckte rekursion vid under expansion av makrot ”%s”"
-#: traditional.c:1107
+#: traditional.c:1114
msgid "syntax error in macro parameter list"
msgstr "syntaxfel i makroparameterlista"
diff --git a/libcpp/po/tr.po b/libcpp/po/tr.po
index 023ef66..2265054 100644
--- a/libcpp/po/tr.po
+++ b/libcpp/po/tr.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: cpplib 4.8.0\n"
"Report-Msgid-Bugs-To: https://gcc.gnu.org/bugs/\n"
-"POT-Creation-Date: 2020-02-07 22:33+0000\n"
+"POT-Creation-Date: 2021-02-05 21:38+0000\n"
"PO-Revision-Date: 2013-11-01 22:29+0100\n"
"Last-Translator: Volkan Gezer <vlkngzr@gmail.com>\n"
"Language-Team: Turkish <gnu-tr-u12a@lists.sourceforge.net>\n"
@@ -20,158 +20,158 @@ msgstr ""
"X-Generator: Lokalize 1.5\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: charset.c:674
+#: charset.c:677
#, c-format
msgid "conversion from %s to %s not supported by iconv"
msgstr "%s ile %s arasında dönüşüm iconv tarafından desteklenmiyor"
-#: charset.c:677
+#: charset.c:680
msgid "iconv_open"
msgstr "iconv_open"
-#: charset.c:685
+#: charset.c:688
#, c-format
msgid "no iconv implementation, cannot convert from %s to %s"
msgstr "iconv bulunamadığından %s ile %s karakter kümeleri arasında dönüşüm yapılamıyor"
-#: charset.c:781
+#: charset.c:784
#, c-format
msgid "character 0x%lx is not in the basic source character set\n"
msgstr "0x%lx karakteri temel kaynak karakter kümesinde değil\n"
-#: charset.c:798 charset.c:1768
+#: charset.c:801 charset.c:1771
msgid "converting to execution character set"
msgstr "çalışma karakter kümesine dönüştürülüyor"
-#: charset.c:804
+#: charset.c:807
#, c-format
msgid "character 0x%lx is not unibyte in execution character set"
msgstr "0x%lx karakteri icra karakter kümesindeki tek baytlık karakterlerden değil"
-#: charset.c:1054
+#: charset.c:1057
msgid "universal character names are only valid in C++ and C99"
msgstr "evrensel karakter isimleri sadece C++ ve C99 için geçerlidir"
-#: charset.c:1058
+#: charset.c:1061
#, fuzzy
#| msgid "universal character names are only valid in C++ and C99"
msgid "C99's universal character names are incompatible with C90"
msgstr "evrensel karakter isimleri sadece C++ ve C99 için geçerlidir"
-#: charset.c:1061
+#: charset.c:1064
#, c-format
msgid "the meaning of '\\%c' is different in traditional C"
msgstr "`\\%c'nin anlamı geleneksel C'de farklıdır"
-#: charset.c:1070
+#: charset.c:1073
msgid "In _cpp_valid_ucn but not a UCN"
msgstr "Bir UCN içinde değil, _cpp_valid_ucn içinde"
-#: charset.c:1103
+#: charset.c:1106
#, c-format
msgid "incomplete universal character name %.*s"
msgstr "evrensel karakter ismi %.*s tamamlanmamış"
-#: charset.c:1118
+#: charset.c:1121
#, c-format
msgid "%.*s is not a valid universal character"
msgstr "%.*s geçerli bir evrensel karakter değil"
-#: charset.c:1128 lex.c:1335
+#: charset.c:1131 lex.c:1335
msgid "'$' in identifier or number"
msgstr "belirteç ya da sayı içinde '$'"
-#: charset.c:1138
+#: charset.c:1141
#, c-format
msgid "universal character %.*s is not valid in an identifier"
msgstr "evrensel karakter %.*s bir belirteç içinde geçerli değil"
-#: charset.c:1142
+#: charset.c:1145
#, c-format
msgid "universal character %.*s is not valid at the start of an identifier"
msgstr "evrensel karakter %.*s bir belirtecin başında geçerli değil"
-#: charset.c:1149
+#: charset.c:1152
#, c-format
msgid "%.*s is outside the UCS codespace"
msgstr ""
-#: charset.c:1194 charset.c:2113
+#: charset.c:1197 charset.c:2116
msgid "converting UCN to source character set"
msgstr "UCN'den kaynak karakter kümesine dönüşüm"
-#: charset.c:1201
+#: charset.c:1204
msgid "converting UCN to execution character set"
msgstr "UCN'den icra karakter kümesine dönüşüm"
-#: charset.c:1265
+#: charset.c:1268
#, fuzzy, c-format
#| msgid "universal character %.*s is not valid in an identifier"
msgid "extended character %.*s is not valid in an identifier"
msgstr "evrensel karakter %.*s bir belirteç içinde geçerli değil"
-#: charset.c:1282
+#: charset.c:1285
#, fuzzy, c-format
#| msgid "universal character %.*s is not valid at the start of an identifier"
msgid "extended character %.*s is not valid at the start of an identifier"
msgstr "evrensel karakter %.*s bir belirtecin başında geçerli değil"
-#: charset.c:1368
+#: charset.c:1371
msgid "the meaning of '\\x' is different in traditional C"
msgstr "'\\x'in anlamı geleneksel C'de farklıdır"
-#: charset.c:1393
+#: charset.c:1396
msgid "\\x used with no following hex digits"
msgstr "\\x izleyen onaltılık rakamlar olmaksızın kullanılmış"
-#: charset.c:1400
+#: charset.c:1403
msgid "hex escape sequence out of range"
msgstr "onaltılık önceleme dizgesi kapsamdışı"
-#: charset.c:1452
+#: charset.c:1455
msgid "octal escape sequence out of range"
msgstr "sekizlik önceleme dizgesi kapsamdışı"
-#: charset.c:1534
+#: charset.c:1537
msgid "the meaning of '\\a' is different in traditional C"
msgstr "`\\a'nın anlamı geleneksel C'de farklıdır"
-#: charset.c:1541
+#: charset.c:1544
#, c-format
msgid "non-ISO-standard escape sequence, '\\%c'"
msgstr "ISO standardı olmayan önceleme dizgesi, '\\%c'"
-#: charset.c:1549
+#: charset.c:1552
#, c-format
msgid "unknown escape sequence: '\\%c'"
msgstr "bilinmeyen kaçış dizgesi: '\\%c'"
-#: charset.c:1557
+#: charset.c:1560
#, c-format
msgid "unknown escape sequence: '\\%s'"
msgstr "bilinmeyen önceleme dizgesi '\\%s'"
-#: charset.c:1565
+#: charset.c:1568
msgid "converting escape sequence to execution character set"
msgstr "önceleme diziliminden icra karakter kümesine dönüşüm"
-#: charset.c:1705
+#: charset.c:1708
msgid "missing open quote"
msgstr ""
-#: charset.c:1923 charset.c:2002
+#: charset.c:1926 charset.c:2005
msgid "character constant too long for its type"
msgstr "karakter sabiti, türü için çok uzun"
-#: charset.c:1926
+#: charset.c:1929
msgid "multi-character character constant"
msgstr "çoklu-karakter karakter sabiti"
-#: charset.c:2042
+#: charset.c:2045
msgid "empty character constant"
msgstr "karakter sabit boş"
-#: charset.c:2160
+#: charset.c:2163
#, c-format
msgid "failure to convert %s to %s"
msgstr "`%s' ile `%s' arasında dönüşüm başarısız"
@@ -243,203 +243,199 @@ msgstr "makro isimleri tanımlayıcılar olmalı"
msgid "undefining \"%s\""
msgstr "tanımsız yapılan \"%s\""
-#: directives.c:724
+#: directives.c:725
msgid "missing terminating > character"
msgstr "sonlandıran > karakteri eksik"
-#: directives.c:783
+#: directives.c:784
#, c-format
msgid "#%s expects \"FILENAME\" or <FILENAME>"
msgstr "#%s \"DOSYA\" ya da <DOSYA> gerektirir"
-#: directives.c:829
+#: directives.c:830
#, c-format
msgid "empty filename in #%s"
msgstr "#%s ile belirtilen dosya boş"
-#: directives.c:838
+#: directives.c:839
#, c-format
msgid "#include nested depth %u exceeds maximum of %u (use -fmax-include-depth=DEPTH to increase the maximum)"
msgstr ""
-#: directives.c:883
+#: directives.c:884
msgid "#include_next in primary source file"
msgstr "birncil kaynak dosyasında #include_next"
-#: directives.c:909
+#: directives.c:910
#, c-format
msgid "invalid flag \"%s\" in line directive"
msgstr "satır yönergesinde geçersiz \"%s\" seçeneği"
-#: directives.c:969
+#: directives.c:970
msgid "unexpected end of file after #line"
msgstr "#line satırından sonra beklenmeyen dosya sonu"
-#: directives.c:972
+#: directives.c:973
#, c-format
msgid "\"%s\" after #line is not a positive integer"
msgstr "#line'dan sonraki \"%s\" bir pozitif tamsayı değil"
-#: directives.c:978 directives.c:980
+#: directives.c:979 directives.c:981
msgid "line number out of range"
msgstr "satır numarası kapsam dışı"
-#: directives.c:993 directives.c:1074
+#: directives.c:994 directives.c:1075
#, c-format
msgid "\"%s\" is not a valid filename"
msgstr "\"%s\" geçerli bir dosya ismi değil"
-#: directives.c:1034
+#: directives.c:1035
#, c-format
msgid "\"%s\" after # is not a positive integer"
msgstr "#'dan sonraki \"%s\" bir pozitif tamsayı değil"
-#: directives.c:1101
+#: directives.c:1102
#, c-format
msgid "file \"%s\" linemarker ignored due to incorrect nesting"
msgstr ""
-#: directives.c:1162 directives.c:1164 directives.c:1166 directives.c:1754
+#: directives.c:1180 directives.c:1182 directives.c:1184 directives.c:1772
#, c-format
msgid "%s"
msgstr "%s"
-#: directives.c:1190
+#: directives.c:1208
#, c-format
msgid "invalid #%s directive"
msgstr "#%s yönergesi geçersiz"
-#: directives.c:1253
+#: directives.c:1271
#, c-format
msgid "registering pragmas in namespace \"%s\" with mismatched name expansion"
msgstr "\"%s\" isim-alanındaki pragmalar uyumsuz isim yorumlaması ile kaydediliyor"
-#: directives.c:1262
+#: directives.c:1280
#, c-format
msgid "registering pragma \"%s\" with name expansion and no namespace"
msgstr "pragma \"%s\" isim alansız olarak isim yorumlamasıyla kaydediliyor"
-#: directives.c:1280
+#: directives.c:1298
#, c-format
msgid "registering \"%s\" as both a pragma and a pragma namespace"
msgstr "\"%s\" hem pragma hem de pragma isim alanı olarak kaydediliyor"
-#: directives.c:1283
+#: directives.c:1301
#, c-format
msgid "#pragma %s %s is already registered"
msgstr "#pragma %s %s zaten kayıtlı"
-#: directives.c:1286
+#: directives.c:1304
#, c-format
msgid "#pragma %s is already registered"
msgstr "#pragma %s zaten kayıtlı"
-#: directives.c:1316
+#: directives.c:1334
msgid "registering pragma with NULL handler"
msgstr "pragma NULL eylemci ile kaydediliyor"
-#: directives.c:1533
+#: directives.c:1551
msgid "#pragma once in main file"
msgstr "main dosyasında '#pragma once'"
-#: directives.c:1556
+#: directives.c:1574
msgid "invalid #pragma push_macro directive"
msgstr "geçersiz #pragma güdümlü_makro yönergesi"
-#: directives.c:1613
+#: directives.c:1631
msgid "invalid #pragma pop_macro directive"
msgstr "geçersiz #pragma güdümlü_makro yönergesi"
-#: directives.c:1668
+#: directives.c:1686
msgid "invalid #pragma GCC poison directive"
msgstr "geçersiz #pragma GCC poison yönergesi"
-#: directives.c:1677
+#: directives.c:1695
#, c-format
msgid "poisoning existing macro \"%s\""
msgstr "zehirlenen mevcut makro \"%s\""
-#: directives.c:1696
+#: directives.c:1714
msgid "#pragma system_header ignored outside include file"
msgstr "başlık dosyasının dışındaki '#pragma system_header' yoksayıldı"
-#: directives.c:1721
+#: directives.c:1739
#, c-format
msgid "cannot find source file %s"
msgstr "%s kaynak dosyası bulunamıyor"
-#: directives.c:1725
+#: directives.c:1743
#, c-format
msgid "current file is older than %s"
msgstr "mevcut dosya %s den daha eski"
-#: directives.c:1749
+#: directives.c:1767
#, c-format
msgid "invalid \"#pragma GCC %s\" directive"
msgstr "geçersiz \"#pragma GCC %s\" yönergesi"
-#: directives.c:1950
+#: directives.c:1968
msgid "_Pragma takes a parenthesized string literal"
msgstr "_Pragma bir parantezli dizge sabiti alır"
-#: directives.c:2033
+#: directives.c:2051
msgid "#else without #if"
msgstr "#if siz #else"
-#: directives.c:2038
+#: directives.c:2056
msgid "#else after #else"
msgstr "#else den sonra #else"
-#: directives.c:2040 directives.c:2073
+#: directives.c:2058 directives.c:2091
msgid "the conditional began here"
msgstr "koşul başlangıcı burası"
-#: directives.c:2066
+#: directives.c:2084
msgid "#elif without #if"
msgstr "#if siz #elif "
-#: directives.c:2071
+#: directives.c:2089
msgid "#elif after #else"
msgstr "#else den sonra #elif"
-#: directives.c:2102
+#: directives.c:2120
msgid "#endif without #if"
msgstr "#if siz #endif"
-#: directives.c:2178
+#: directives.c:2196
msgid "missing '(' after predicate"
msgstr "dayanaktan sonra '(' eksik"
-#: directives.c:2196
+#: directives.c:2214
msgid "missing ')' to complete answer"
msgstr "yanıtı tamamlayacak ')' eksik"
-#: directives.c:2208
+#: directives.c:2226
msgid "predicate's answer is empty"
msgstr "dayanakların cevabı boş"
-#: directives.c:2238
+#: directives.c:2256
msgid "assertion without predicate"
msgstr "dayanaksız olumlama"
-#: directives.c:2241
+#: directives.c:2259
msgid "predicate must be an identifier"
msgstr "dayanak bir tanımlayıcı olmalı"
-#: directives.c:2323
+#: directives.c:2341
#, c-format
msgid "\"%s\" re-asserted"
msgstr "\"%s\" tekrar olumlanmış"
-#: directives.c:2604
+#: directives.c:2659
#, c-format
msgid "unterminated #%s"
msgstr "sonlandırılmamış #%s"
-#: directives-only.c:221 lex.c:2879 traditional.c:174
-msgid "unterminated comment"
-msgstr "sonlandırılmamış açıklama"
-
#: errors.c:291
#, c-format
msgid "%s: %s"
@@ -449,224 +445,244 @@ msgstr "%s: %s"
msgid "stdout"
msgstr "stdÇ"
-#: expr.c:626 expr.c:743
+#: expr.c:636 expr.c:753
msgid "fixed-point constants are a GCC extension"
msgstr "sabit noktalı sabitler bir GCC uzantısıdır"
-#: expr.c:651
+#: expr.c:661
msgid "invalid prefix \"0b\" for floating constant"
msgstr "kayan nokta için geçerisz \"0b\" öntakısı"
-#: expr.c:664
+#: expr.c:674
#, fuzzy
#| msgid "use of C99 hexadecimal floating constant"
msgid "use of C++17 hexadecimal floating constant"
msgstr "C99 onaltılık gerçel sayı sabit kullanımı"
-#: expr.c:667
+#: expr.c:677
msgid "use of C99 hexadecimal floating constant"
msgstr "C99 onaltılık gerçel sayı sabit kullanımı"
-#: expr.c:711
+#: expr.c:721
#, c-format
msgid "invalid suffix \"%.*s\" on floating constant"
msgstr "gerçel sabitin \"%.*s\" soneki geçersiz"
-#: expr.c:722 expr.c:789
+#: expr.c:732 expr.c:799
#, c-format
msgid "traditional C rejects the \"%.*s\" suffix"
msgstr "geleneksel C \"%.*s\" sonekini kullanmaz"
-#: expr.c:730
+#: expr.c:740
msgid "suffix for double constant is a GCC extension"
msgstr "çift sabit için öntakı bir GCC uzantısıdır"
-#: expr.c:736
+#: expr.c:746
#, c-format
msgid "invalid suffix \"%.*s\" with hexadecimal floating constant"
msgstr "onaltılık kayan sabitli \"%.*s\" soneki geçersiz"
-#: expr.c:749 expr.c:753
+#: expr.c:759 expr.c:763
#, fuzzy
#| msgid "decimal float constants are a GCC extension"
msgid "decimal float constants are a C2X feature"
msgstr "onluk kayan sabitler bir GCC uzantısıdır"
-#: expr.c:772
+#: expr.c:782
#, c-format
msgid "invalid suffix \"%.*s\" on integer constant"
msgstr "tamsayı sabitte sonek \"%.*s\" soneki geçersiz"
-#: expr.c:797
+#: expr.c:807
#, fuzzy
#| msgid "use of C++0x long long integer constant"
msgid "use of C++11 long long integer constant"
msgstr "ISO C++0x long long tamsayı sabitlerinin kullanımı"
-#: expr.c:798
+#: expr.c:808
msgid "use of C99 long long integer constant"
msgstr "ISO C99 long long tamsayı sabitleri yasaklar"
-#: expr.c:814
+#: expr.c:822
+#, fuzzy
+#| msgid "use of C++0x long long integer constant"
+msgid "use of C++23 %<size_t%> integer constant"
+msgstr "ISO C++0x long long tamsayı sabitlerinin kullanımı"
+
+#: expr.c:823
+#, fuzzy
+#| msgid "use of C++0x long long integer constant"
+msgid "use of C++23 %<make_signed_t<size_t>%> integer constant"
+msgstr "ISO C++0x long long tamsayı sabitlerinin kullanımı"
+
+#: expr.c:834
msgid "imaginary constants are a GCC extension"
msgstr "sanal sabitler bir GCC genişletmesidir"
-#: expr.c:820
+#: expr.c:841
#, fuzzy
#| msgid "binary constants are a GCC extension"
msgid "binary constants are a C++14 feature or GCC extension"
msgstr "ikili sabitler bir GCC uzantısıdır"
-#: expr.c:822
-msgid "binary constants are a GCC extension"
+#: expr.c:843
+#, fuzzy
+#| msgid "binary constants are a GCC extension"
+msgid "binary constants are a C2X feature or GCC extension"
msgstr "ikili sabitler bir GCC uzantısıdır"
-#: expr.c:917
+#: expr.c:848
+#, fuzzy
+#| msgid "binary constants are a GCC extension"
+msgid "binary constants are a C2X feature"
+msgstr "ikili sabitler bir GCC uzantısıdır"
+
+#: expr.c:944
msgid "integer constant is too large for its type"
msgstr "tamsayı sabit, türü için oldukça büyük"
-#: expr.c:948
+#: expr.c:975
msgid "integer constant is so large that it is unsigned"
msgstr "tamsayı sabit unsigned olarak oldukça büyük"
-#: expr.c:1043
+#: expr.c:1070
msgid "missing ')' after \"defined\""
msgstr "\"defined\" dan sonra ')' eksik"
-#: expr.c:1050
+#: expr.c:1077
msgid "operator \"defined\" requires an identifier"
msgstr "\"defined\" işleci bir tanımlayıcı gerektirir"
-#: expr.c:1058
+#: expr.c:1085
#, c-format
msgid "(\"%s\" is an alternative token for \"%s\" in C++)"
msgstr "(C++'da \"%s\" \"%s\" için bir alternatif dizgeciktir)"
-#: expr.c:1070
+#: expr.c:1098
msgid "this use of \"defined\" may not be portable"
msgstr "\"defined\" bu kullanımıyla uyarlanabilir olmayabilir"
-#: expr.c:1113
+#: expr.c:1143
msgid "user-defined literal in preprocessor expression"
msgstr "önişleyici ifadesinde kullanıcı tanımlı bağımlı"
-#: expr.c:1118
+#: expr.c:1148
msgid "floating constant in preprocessor expression"
msgstr "önişlemci ifadesinde gerçel sayı taşması"
-#: expr.c:1124
+#: expr.c:1154
msgid "imaginary number in preprocessor expression"
msgstr "önişlemci ifadesinde sanal sayı"
-#: expr.c:1173
+#: expr.c:1203
#, fuzzy, c-format
#| msgid "\"%s\" is not defined"
msgid "\"%s\" is not defined, evaluates to 0"
msgstr "\"%s\" tanımlı değil"
-#: expr.c:1186
+#: expr.c:1216
msgid "assertions are a GCC extension"
msgstr "belirteçler bir GCC uzantısıdır"
-#: expr.c:1189
+#: expr.c:1219
msgid "assertions are a deprecated extension"
msgstr "belirteçler artık kullanılmayan bir ifadedir"
-#: expr.c:1435
+#: expr.c:1465
#, c-format
msgid "unbalanced stack in %s"
msgstr "%s içinde dengelenmemiş yığın"
-#: expr.c:1455
+#: expr.c:1485
#, c-format
msgid "impossible operator '%u'"
msgstr "işleç '%u' imkansız"
-#: expr.c:1556
+#: expr.c:1586
msgid "missing ')' in expression"
msgstr "ifadede ')' eksik"
-#: expr.c:1585
+#: expr.c:1615
msgid "'?' without following ':'"
msgstr "'?' dan sonra ':' yok"
-#: expr.c:1595
+#: expr.c:1625
msgid "integer overflow in preprocessor expression"
msgstr "önişlemci ifadesinde tamsayı taşması"
-#: expr.c:1600
+#: expr.c:1630
msgid "missing '(' in expression"
msgstr "ifadede '(' eksik"
-#: expr.c:1632
+#: expr.c:1662
#, c-format
msgid "the left operand of \"%s\" changes sign when promoted"
msgstr "\"%s\"in soldaki terimi yükseltgenirken işaret değiştiriyor"
-#: expr.c:1637
+#: expr.c:1667
#, c-format
msgid "the right operand of \"%s\" changes sign when promoted"
msgstr "\"%s\"in sağdaki terimi yükseltgenirken işaret değiştiriyor"
-#: expr.c:1896
+#: expr.c:1926
msgid "traditional C rejects the unary plus operator"
msgstr "geleneksel C tekil artı işlecini dışlar"
-#: expr.c:1994
+#: expr.c:2024
msgid "comma operator in operand of #if"
msgstr "#if'in teriminde virgül"
-#: expr.c:2130
+#: expr.c:2160
msgid "division by zero in #if"
msgstr "#if içinde sıfırla bölme"
-#: files.c:576
+#: files.c:571
msgid "one or more PCH files were found, but they were invalid"
msgstr "bir veya daha fazla PCH dosyası bulundu ama bunlar geçersiz"
-#: files.c:580
+#: files.c:575
msgid "use -Winvalid-pch for more information"
msgstr "daha fazla bilgi almak için -Winvalid-pch kullanın"
-#: files.c:1004
+#: files.c:1051
#, c-format
msgid "no include path in which to search for %s"
msgstr "%s için aranacaklar içinde başlık dosyaları yolu yok"
-#: files.c:1439
+#: files.c:1546
msgid "Multiple include guards may be useful for:\n"
msgstr "Çoklu include önlemleri aşağıdakiler için kullanışlı olabilir:\n"
-#: init.c:598
+#: init.c:614
msgid "cppchar_t must be an unsigned type"
msgstr "cppchar_t bir usigned tür olmalı"
-#: init.c:602
+#: init.c:618
#, c-format
msgid "preprocessor arithmetic has maximum precision of %lu bits; target requires %lu bits"
msgstr "önişlemci aritmetiği %lu bitlik maksimum genişliğe sahip; hedef için %lu bit gerekiyor"
-#: init.c:609
+#: init.c:625
msgid "CPP arithmetic must be at least as precise as a target int"
msgstr "CPP aritmetiği en azından bir hedef int kadar genişlikte olmalı "
-#: init.c:612
+#: init.c:628
msgid "target char is less than 8 bits wide"
msgstr "hedef char 8bitlik genişlikten küçük"
-#: init.c:616
+#: init.c:632
msgid "target wchar_t is narrower than target char"
msgstr "hedef wchar_t hedef char'dan daha dar"
-#: init.c:620
+#: init.c:636
msgid "target int is narrower than target char"
msgstr "hedef int hedef char'dan daha dar"
-#: init.c:625
+#: init.c:641
msgid "CPP half-integer narrower than CPP character"
msgstr "CPP half-integer'ı CPP character'dan daha dar"
-#: init.c:629
+#: init.c:645
#, c-format
msgid "CPP on this host cannot handle wide character constants over %lu bits, but the target requires %lu bits"
msgstr "Bu konaktaki CPP %lu bitten büyük karakter sabitleriyle çalışamaz, hedef ise %lu bit gerektiriyor"
@@ -713,13 +729,13 @@ msgid "`%.*s' is not in NFC"
msgstr "`%.*s' NFC'de yok"
#: lex.c:1375
-msgid "__VA_OPT__ is not available until C++2a"
+msgid "__VA_OPT__ is not available until C++20"
msgstr ""
#: lex.c:1382
#, fuzzy
#| msgid "__VA_ARGS__ can only appear in the expansion of a C99 variadic macro"
-msgid "__VA_OPT__ can only appear in the expansion of a C++2a variadic macro"
+msgid "__VA_OPT__ can only appear in the expansion of a C++20 variadic macro"
msgstr "__VA_ARGS__ sadece argümanlarının sayısı değişebilen bir C99 makrosunun genişleme alanında görünebilir"
#: lex.c:1413 lex.c:1506
@@ -742,258 +758,283 @@ msgstr "__VA_ARGS__ sadece argümanlarının sayısı değişebilen bir C99 mak
msgid "identifier \"%s\" is a special operator name in C++"
msgstr "\"%s\" belirteci, C++'da özel bir işleç adıdır"
-#: lex.c:1837
+#: lex.c:1879
msgid "raw string delimiter longer than 16 characters"
msgstr "ham dizge ayracı 16 karakterden uzun"
-#: lex.c:1841
+#: lex.c:1883
#, fuzzy
#| msgid "invalid character '%c' in raw string delimiter"
msgid "invalid new-line in raw string delimiter"
msgstr "ham dizge ayracında geçersiz karakter '%c'"
-#: lex.c:1845
+#: lex.c:1887 lex.c:4639
#, c-format
msgid "invalid character '%c' in raw string delimiter"
msgstr "ham dizge ayracında geçersiz karakter '%c'"
-#: lex.c:1894 lex.c:1916
+#: lex.c:1926 lex.c:1949
msgid "unterminated raw string"
msgstr "bitirilmemiş ham dizge"
-#: lex.c:1936 lex.c:2065
+#: lex.c:1971 lex.c:2100
#, fuzzy
#| msgid "invalid suffix on literal; C++11 requires a space between literal and identifier"
msgid "invalid suffix on literal; C++11 requires a space between literal and string macro"
msgstr "geçersiz ifade soneki; C++11 ifade ve tanımlayıcı arasında bir boşluk gerektirir"
-#: lex.c:2048
+#: lex.c:2083
msgid "null character(s) preserved in literal"
msgstr "null karakter(ler) sabit içinde saklanmış"
-#: lex.c:2051
+#: lex.c:2086
#, c-format
msgid "missing terminating %c character"
msgstr "sonlandıran %c karakteri eksik"
-#: lex.c:2083
+#: lex.c:2118
#, fuzzy
#| msgid "invalid suffix on literal; C++11 requires a space between literal and identifier"
msgid "C++11 requires a space between string literal and macro"
msgstr "geçersiz ifade soneki; C++11 ifade ve tanımlayıcı arasında bir boşluk gerektirir"
-#: lex.c:2893 lex.c:2927
+#: lex.c:2711
+msgid "module control-line cannot be in included file"
+msgstr ""
+
+#: lex.c:2725
+#, c-format
+msgid "module control-line \"%s\" cannot be an object-like macro"
+msgstr ""
+
+#: lex.c:3099 lex.c:4472 traditional.c:174
+msgid "unterminated comment"
+msgstr "sonlandırılmamış açıklama"
+
+#: lex.c:3113 lex.c:3147
msgid "C++ style comments are not allowed in ISO C90"
msgstr "C++ tarzı açıklamalara ISO C90'da izin verilmez"
-#: lex.c:2895 lex.c:2906 lex.c:2930
+#: lex.c:3115 lex.c:3126 lex.c:3150
msgid "(this will be reported only once per input file)"
msgstr "(her girdi dosyasında sadece bir kere raporlanacaktır)"
-#: lex.c:2904
+#: lex.c:3124
#, fuzzy
#| msgid "C++ style comments are not allowed in ISO C90"
msgid "C++ style comments are incompatible with C90"
msgstr "C++ tarzı açıklamalara ISO C90'da izin verilmez"
-#: lex.c:2936
+#: lex.c:3156
msgid "multi-line comment"
msgstr "çok satırlı açıklama"
-#: lex.c:3330
+#: lex.c:3550
#, c-format
msgid "unspellable token %s"
msgstr "dizgecik %s okunabilir değil"
+#: lex.c:4627
+#, fuzzy, c-format
+#| msgid "raw string delimiter longer than 16 characters"
+msgid "raw string delimiter longer than %d characters"
+msgstr "ham dizge ayracı 16 karakterden uzun"
+
+#: lex.c:4697
+#, fuzzy
+#| msgid "unterminated #%s"
+msgid "unterminated literal"
+msgstr "sonlandırılmamış #%s"
+
#: macro.c:94
#, fuzzy
#| msgid "'##' cannot appear at either end of a macro expansion"
msgid "'##' cannot appear at either end of __VA_OPT__"
msgstr "'##' bir makronun her iki ucunda da görünemez"
-#: macro.c:364
+#: macro.c:386
#, fuzzy, c-format
#| msgid "%s in preprocessing directive"
msgid "\"%s\" used outside of preprocessing directive"
msgstr "önişlem yönergesi içinde %s"
-#: macro.c:374
+#: macro.c:396
#, fuzzy, c-format
#| msgid "missing '(' in expression"
msgid "missing '(' before \"%s\" operand"
msgstr "ifadede '(' eksik"
-#: macro.c:389
+#: macro.c:411
#, fuzzy, c-format
#| msgid "operator \"defined\" requires an identifier"
msgid "operator \"%s\" requires a header-name"
msgstr "\"defined\" işleci bir tanımlayıcı gerektirir"
-#: macro.c:406
+#: macro.c:428
#, fuzzy, c-format
#| msgid "missing ')' after \"defined\""
msgid "missing ')' after \"%s\" operand"
msgstr "\"defined\" dan sonra ')' eksik"
-#: macro.c:426
+#: macro.c:448
#, c-format
msgid "macro \"%s\" is not used"
msgstr "\"%s\" makrosu kullanılmadı"
-#: macro.c:465 macro.c:723
+#: macro.c:487 macro.c:778
#, c-format
msgid "invalid built-in macro \"%s\""
msgstr "geçersiz yerleşik makro \"%s\""
-#: macro.c:472 macro.c:574
+#: macro.c:494 macro.c:596
#, c-format
msgid "macro \"%s\" might prevent reproducible builds"
msgstr ""
-#: macro.c:503
+#: macro.c:525
msgid "could not determine file timestamp"
msgstr "dosya tarih damgası saptanamadı"
-#: macro.c:620
+#: macro.c:610
msgid "could not determine date and time"
msgstr "tarih ve saat saptanamadı"
-#: macro.c:636
+#: macro.c:642
msgid "__COUNTER__ expanded inside directive with -fdirectives-only"
msgstr "__COUNTER__ -fdirectives-only ile talimat içerisinde genişletildi"
-#: macro.c:842
+#: macro.c:897
msgid "invalid string literal, ignoring final '\\'"
msgstr "geçersiz dizge sabit, son '\\' yoksayılıyor"
-#: macro.c:904
+#: macro.c:959
#, c-format
msgid "pasting \"%s\" and \"%s\" does not give a valid preprocessing token"
msgstr "\"%s\" ve \"%s\" geçişi geçerli bir önişlem dizgeciği vermez"
-#: macro.c:1030
+#: macro.c:1085
msgid "ISO C++11 requires at least one argument for the \"...\" in a variadic macro"
msgstr ""
-#: macro.c:1034
+#: macro.c:1089
#, fuzzy
#| msgid "ISO C99 requires rest arguments to be used"
msgid "ISO C99 requires at least one argument for the \"...\" in a variadic macro"
msgstr "ISO C kalan argümanların kullanılmış olmasını gerektirir"
-#: macro.c:1041
+#: macro.c:1096
#, c-format
msgid "macro \"%s\" requires %u arguments, but only %u given"
msgstr "makro \"%s\" %u argüman gerektiriyor ama sadece %u argüman verilmiş"
-#: macro.c:1046
+#: macro.c:1101
#, c-format
msgid "macro \"%s\" passed %u arguments, but takes just %u"
msgstr "makro \"%s\" için %u argüman verilmiş ama tam %u argüman alıyor"
-#: macro.c:1244 traditional.c:815
+#: macro.c:1299 traditional.c:822
#, c-format
msgid "unterminated argument list invoking macro \"%s\""
msgstr "sonlandırılmamış argüman listesi çağıran makro \"%s\""
-#: macro.c:1386
+#: macro.c:1442
#, c-format
msgid "function-like macro \"%s\" must be used with arguments in traditional C"
msgstr "işlev benzeri makro \"%s\" geleneksel C'de argümanlarla kullanılmalıdır"
-#: macro.c:2165
+#: macro.c:2220
#, fuzzy, c-format
#| msgid "invoking macro %s argument %d: empty macro arguments are undefined in ISO C90 and ISO C++98"
msgid "invoking macro %s argument %d: empty macro arguments are undefined in ISO C++98"
msgstr "%s makrosu %d argümanı uygulanıyor: ISO C90 ve ISO C++98 içerisinde boş makro argümanları tanımsızdır"
-#: macro.c:2173 macro.c:2182
+#: macro.c:2228 macro.c:2237
#, fuzzy, c-format
#| msgid "invoking macro %s argument %d: empty macro arguments are undefined in ISO C90 and ISO C++98"
msgid "invoking macro %s argument %d: empty macro arguments are undefined in ISO C90"
msgstr "%s makrosu %d argümanı uygulanıyor: ISO C90 ve ISO C++98 içerisinde boş makro argümanları tanımsızdır"
-#: macro.c:3141
+#: macro.c:3279
#, c-format
msgid "duplicate macro parameter \"%s\""
msgstr "yinelenmiş makro parametresi \"%s\""
-#: macro.c:3223
+#: macro.c:3361
#, c-format
msgid "expected parameter name, found \"%s\""
msgstr ""
-#: macro.c:3224
+#: macro.c:3362
#, c-format
msgid "expected ',' or ')', found \"%s\""
msgstr ""
-#: macro.c:3225
+#: macro.c:3363
msgid "expected parameter name before end of line"
msgstr ""
-#: macro.c:3226
+#: macro.c:3364
#, fuzzy
#| msgid "unexpected end of file after #line"
msgid "expected ')' before end of line"
msgstr "#line satırından sonra beklenmeyen dosya sonu"
-#: macro.c:3227
+#: macro.c:3365
msgid "expected ')' after \"...\""
msgstr ""
-#: macro.c:3284
+#: macro.c:3422
#, fuzzy
#| msgid "anonymous variadic macros were introduced in C99"
msgid "anonymous variadic macros were introduced in C++11"
msgstr "argümanlarının sayısı değişebilen anonim makrolar C99 da tanıtıldı"
-#: macro.c:3285 macro.c:3289
+#: macro.c:3423 macro.c:3427
msgid "anonymous variadic macros were introduced in C99"
msgstr "argümanlarının sayısı değişebilen anonim makrolar C99 da tanıtıldı"
-#: macro.c:3295
+#: macro.c:3433
#, fuzzy
#| msgid "ISO C does not permit named variadic macros"
msgid "ISO C++ does not permit named variadic macros"
msgstr "ISO C argümanlarının sayısı değişebilen isimli makrolara izin vermez"
-#: macro.c:3296
+#: macro.c:3434
msgid "ISO C does not permit named variadic macros"
msgstr "ISO C argümanlarının sayısı değişebilen isimli makrolara izin vermez"
-#: macro.c:3342
+#: macro.c:3480
msgid "'##' cannot appear at either end of a macro expansion"
msgstr "'##' bir makronun her iki ucunda da görünemez"
-#: macro.c:3380
+#: macro.c:3518
#, fuzzy
#| msgid "ISO C99 requires whitespace after the macro name"
msgid "ISO C++11 requires whitespace after the macro name"
msgstr "ISO C99 makro isminden sonra boşluk gerektirir"
-#: macro.c:3381
+#: macro.c:3519
msgid "ISO C99 requires whitespace after the macro name"
msgstr "ISO C99 makro isminden sonra boşluk gerektirir"
-#: macro.c:3405
+#: macro.c:3543
msgid "missing whitespace after the macro name"
msgstr "makro isminden sonra boşluk gerekir"
-#: macro.c:3455
+#: macro.c:3593
msgid "'#' is not followed by a macro parameter"
msgstr "'#' işaretinden sonra bir makro parametresi yok"
-#: macro.c:3606
+#: macro.c:3749
#, c-format
msgid "\"%s\" redefined"
msgstr "\"%s\" yeniden tanımlanmış"
-#: macro.c:3611
+#: macro.c:3754
msgid "this is the location of the previous definition"
msgstr "burası evvelki tanımın yapıldığı yer"
-#: macro.c:3715
+#: macro.c:3891
#, c-format
msgid "macro argument \"%s\" would be stringified in traditional C"
msgstr "makro argümanı \"%s\" geleneksel C'de dizgelenmiş olmalıydı"
@@ -1031,12 +1072,12 @@ msgstr "%s: `__COUNTER__' geçersiz olduğundan kullanılmadı"
msgid "while reading precompiled header"
msgstr "önderlemeli başlık okunurken"
-#: traditional.c:884
+#: traditional.c:891
#, c-format
msgid "detected recursion whilst expanding macro \"%s\""
msgstr "makro \"%s\" genişletilirken iç içelik saptandı"
-#: traditional.c:1107
+#: traditional.c:1114
msgid "syntax error in macro parameter list"
msgstr "makro parametre listesinde sözdizimi hatası"
diff --git a/libcpp/po/uk.po b/libcpp/po/uk.po
index d7f419c..2169483 100644
--- a/libcpp/po/uk.po
+++ b/libcpp/po/uk.po
@@ -3,13 +3,13 @@
# This file is distributed under the same license as the gcc package.
#
# Maxim V. Dziumanenko <dziumanenko@gmail.com>, 2007.
-# Yuri Chornoivan <yurchor@ukr.net>, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020.
+# Yuri Chornoivan <yurchor@ukr.net>, 2012-2021.
msgid ""
msgstr ""
-"Project-Id-Version: cpplib 10.1-b20200209\n"
+"Project-Id-Version: cpplib 11.1-b20210207\n"
"Report-Msgid-Bugs-To: https://gcc.gnu.org/bugs/\n"
-"POT-Creation-Date: 2020-02-07 22:33+0000\n"
-"PO-Revision-Date: 2020-02-10 21:13+0200\n"
+"POT-Creation-Date: 2021-02-05 21:38+0000\n"
+"PO-Revision-Date: 2021-02-09 13:06+0200\n"
"Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
"Language-Team: Ukrainian <trans-uk@lists.fedoraproject.org>\n"
"Language: uk\n"
@@ -18,156 +18,156 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"X-Bugs: Report translation errors to the Language-Team address.\n"
"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-"X-Generator: Lokalize 20.03.70\n"
+"X-Generator: Lokalize 20.11.70\n"
-#: charset.c:674
+#: charset.c:677
#, c-format
msgid "conversion from %s to %s not supported by iconv"
msgstr "перетворення з %s у %s не підтримується iconv"
-#: charset.c:677
+#: charset.c:680
msgid "iconv_open"
msgstr "iconv_open"
-#: charset.c:685
+#: charset.c:688
#, c-format
msgid "no iconv implementation, cannot convert from %s to %s"
msgstr "не реалізовано у iconv, не вдається перетворити з %s на %s"
-#: charset.c:781
+#: charset.c:784
#, c-format
msgid "character 0x%lx is not in the basic source character set\n"
msgstr "символ 0x%lx відсутній у базовому первинному наборі символів\n"
-#: charset.c:798 charset.c:1768
+#: charset.c:801 charset.c:1771
msgid "converting to execution character set"
msgstr "перетворення на виконуваний набір символів"
-#: charset.c:804
+#: charset.c:807
#, c-format
msgid "character 0x%lx is not unibyte in execution character set"
msgstr "символ 0x%lx не однобайтовий у виконуваному наборі символів"
-#: charset.c:1054
+#: charset.c:1057
msgid "universal character names are only valid in C++ and C99"
msgstr "універсальні назви символів допустимі лише у C++ та C99"
-#: charset.c:1058
+#: charset.c:1061
msgid "C99's universal character names are incompatible with C90"
msgstr "універсальні назви символів C99 є несумісними із C90"
-#: charset.c:1061
+#: charset.c:1064
#, c-format
msgid "the meaning of '\\%c' is different in traditional C"
msgstr "сенс '\\%c' відрізняється від традиційної мови C"
-#: charset.c:1070
+#: charset.c:1073
msgid "In _cpp_valid_ucn but not a UCN"
msgstr "У _cpp_valid_ucn але не UCN"
-#: charset.c:1103
+#: charset.c:1106
#, c-format
msgid "incomplete universal character name %.*s"
msgstr "неповна універсальна назва символу %.*s"
-#: charset.c:1118
+#: charset.c:1121
#, c-format
msgid "%.*s is not a valid universal character"
msgstr "%.*s не є допустимим універсальним символом"
-#: charset.c:1128 lex.c:1335
+#: charset.c:1131 lex.c:1335
msgid "'$' in identifier or number"
msgstr "'$' у ідентифікаторі чи числі"
-#: charset.c:1138
+#: charset.c:1141
#, c-format
msgid "universal character %.*s is not valid in an identifier"
msgstr "універсальний символ %.*s не є допустимим у ідентифікаторі"
-#: charset.c:1142
+#: charset.c:1145
#, c-format
msgid "universal character %.*s is not valid at the start of an identifier"
msgstr "універсальний символ %.*s не є допустимим на початку ідентифікатора"
-#: charset.c:1149
+#: charset.c:1152
#, c-format
msgid "%.*s is outside the UCS codespace"
msgstr "%.*s поза простором кодування UCS"
-#: charset.c:1194 charset.c:2113
+#: charset.c:1197 charset.c:2116
msgid "converting UCN to source character set"
msgstr "перетворення UCN на первинний набір символів"
-#: charset.c:1201
+#: charset.c:1204
msgid "converting UCN to execution character set"
msgstr "перетворення UCN на виконуваний набір символів"
-#: charset.c:1265
+#: charset.c:1268
#, c-format
msgid "extended character %.*s is not valid in an identifier"
msgstr "розширений символ %.*s не є допустимим у ідентифікаторі"
-#: charset.c:1282
+#: charset.c:1285
#, c-format
msgid "extended character %.*s is not valid at the start of an identifier"
msgstr "розширений символ %.*s не є допустимим на початку ідентифікатора"
-#: charset.c:1368
+#: charset.c:1371
msgid "the meaning of '\\x' is different in traditional C"
msgstr "сенс '\\x' відрізняється від традиційної мови C"
-#: charset.c:1393
+#: charset.c:1396
msgid "\\x used with no following hex digits"
msgstr "\\x використовується з наступними шістнадцятковими цифрами"
-#: charset.c:1400
+#: charset.c:1403
msgid "hex escape sequence out of range"
msgstr "шістнадцяткова escape-послідовність поза межами діапазону"
-#: charset.c:1452
+#: charset.c:1455
msgid "octal escape sequence out of range"
msgstr "вісімкова escape-послідовність поза межами діапазону"
-#: charset.c:1534
+#: charset.c:1537
msgid "the meaning of '\\a' is different in traditional C"
msgstr "сенс '\\a' відрізняється від традиційної мови C"
-#: charset.c:1541
+#: charset.c:1544
#, c-format
msgid "non-ISO-standard escape sequence, '\\%c'"
msgstr "escape-послідовність не за стандартом ISO, '\\%c'"
-#: charset.c:1549
+#: charset.c:1552
#, c-format
msgid "unknown escape sequence: '\\%c'"
msgstr "невідома керівна послідовність: '\\%c'"
-#: charset.c:1557
+#: charset.c:1560
#, c-format
msgid "unknown escape sequence: '\\%s'"
msgstr "Невідома escape-послідовність: '\\%s'"
-#: charset.c:1565
+#: charset.c:1568
msgid "converting escape sequence to execution character set"
msgstr "escape-послідовність перетворюється на виконуваний набір символів"
-#: charset.c:1705
+#: charset.c:1708
msgid "missing open quote"
msgstr "пропущено початкові лапки"
-#: charset.c:1923 charset.c:2002
+#: charset.c:1926 charset.c:2005
msgid "character constant too long for its type"
msgstr "символьна константа надто довга для вказаного типу"
-#: charset.c:1926
+#: charset.c:1929
msgid "multi-character character constant"
msgstr "багатосимвольна символьна константа"
-#: charset.c:2042
+#: charset.c:2045
msgid "empty character constant"
msgstr "порожня символьна константа"
-#: charset.c:2160
+#: charset.c:2163
#, c-format
msgid "failure to convert %s to %s"
msgstr "помилка при перетворені %s на %s"
@@ -238,203 +238,199 @@ msgstr "назви макросів повинні бути ідентифіка
msgid "undefining \"%s\""
msgstr "скасовується визначення \"%s\""
-#: directives.c:724
+#: directives.c:725
msgid "missing terminating > character"
msgstr "відсутній завершальний символ >"
-#: directives.c:783
+#: directives.c:784
#, c-format
msgid "#%s expects \"FILENAME\" or <FILENAME>"
msgstr "#%s очікує \"FILENAME\" або <FILENAME>"
-#: directives.c:829
+#: directives.c:830
#, c-format
msgid "empty filename in #%s"
msgstr "порожня назва файлу у #%s"
-#: directives.c:838
+#: directives.c:839
#, c-format
msgid "#include nested depth %u exceeds maximum of %u (use -fmax-include-depth=DEPTH to increase the maximum)"
msgstr "глибина вкладеності #include, %u, перевищує максимальну дозволену — %u (скористайтеся -fmax-include-depth=ГЛИБИНА, щоб збільшити максимум)"
-#: directives.c:883
+#: directives.c:884
msgid "#include_next in primary source file"
msgstr "#include_next у первинному файлі тексту програми"
-#: directives.c:909
+#: directives.c:910
#, c-format
msgid "invalid flag \"%s\" in line directive"
msgstr "некоректна ознака \"%s\" у директиві line"
-#: directives.c:969
+#: directives.c:970
msgid "unexpected end of file after #line"
msgstr "неочікуване завершення файла після #line"
-#: directives.c:972
+#: directives.c:973
#, c-format
msgid "\"%s\" after #line is not a positive integer"
msgstr "\"%s\" після #line не є додатнім цілим числом"
-#: directives.c:978 directives.c:980
+#: directives.c:979 directives.c:981
msgid "line number out of range"
msgstr "номер рядка за межами діапазону"
-#: directives.c:993 directives.c:1074
+#: directives.c:994 directives.c:1075
#, c-format
msgid "\"%s\" is not a valid filename"
msgstr "\"%s\" не є коректною назвою файлу"
-#: directives.c:1034
+#: directives.c:1035
#, c-format
msgid "\"%s\" after # is not a positive integer"
msgstr "\"%s\" після # не є додатнім цілим числом"
-#: directives.c:1101
+#: directives.c:1102
#, c-format
msgid "file \"%s\" linemarker ignored due to incorrect nesting"
msgstr "засіб позначення рядків файла «%s» проігноровано через некоректну вкладеність"
-#: directives.c:1162 directives.c:1164 directives.c:1166 directives.c:1754
+#: directives.c:1180 directives.c:1182 directives.c:1184 directives.c:1772
#, c-format
msgid "%s"
msgstr "%s"
-#: directives.c:1190
+#: directives.c:1208
#, c-format
msgid "invalid #%s directive"
msgstr "некоректна директива #%s"
-#: directives.c:1253
+#: directives.c:1271
#, c-format
msgid "registering pragmas in namespace \"%s\" with mismatched name expansion"
msgstr "прагми реєструються у просторі назв \"%s\" за відсутності розширення назв"
-#: directives.c:1262
+#: directives.c:1280
#, c-format
msgid "registering pragma \"%s\" with name expansion and no namespace"
msgstr "прагма \"%s\" реєструється з розширенням назви але без простору назви"
-#: directives.c:1280
+#: directives.c:1298
#, c-format
msgid "registering \"%s\" as both a pragma and a pragma namespace"
msgstr "\"%s\" реєструється як прагма та як простір назв прагм"
-#: directives.c:1283
+#: directives.c:1301
#, c-format
msgid "#pragma %s %s is already registered"
msgstr "#pragma %s %s вже зареєстровано"
-#: directives.c:1286
+#: directives.c:1304
#, c-format
msgid "#pragma %s is already registered"
msgstr "#pragma %s вже зареєстровано"
-#: directives.c:1316
+#: directives.c:1334
msgid "registering pragma with NULL handler"
msgstr "реєструється pragma з NULL-обробником"
-#: directives.c:1533
+#: directives.c:1551
msgid "#pragma once in main file"
msgstr "#pragma один раз у головному файлі"
-#: directives.c:1556
+#: directives.c:1574
msgid "invalid #pragma push_macro directive"
msgstr "некоректна директива #pragma push_macro"
-#: directives.c:1613
+#: directives.c:1631
msgid "invalid #pragma pop_macro directive"
msgstr "некоректна директива #pragma pop_macro"
-#: directives.c:1668
+#: directives.c:1686
msgid "invalid #pragma GCC poison directive"
msgstr "некоректна директива #pragma GCC poison"
-#: directives.c:1677
+#: directives.c:1695
#, c-format
msgid "poisoning existing macro \"%s\""
msgstr "використання отруєння (poisoning) вже створеного макроса \"%s\""
-#: directives.c:1696
+#: directives.c:1714
msgid "#pragma system_header ignored outside include file"
msgstr "#pragma system_header проігноровано за межами включеного файлу"
-#: directives.c:1721
+#: directives.c:1739
#, c-format
msgid "cannot find source file %s"
msgstr "не вдається знайти первинний файл %s"
-#: directives.c:1725
+#: directives.c:1743
#, c-format
msgid "current file is older than %s"
msgstr "поточний файл старіший ніж %s"
-#: directives.c:1749
+#: directives.c:1767
#, c-format
msgid "invalid \"#pragma GCC %s\" directive"
msgstr "некоректна директива «#pragma GCC %s»"
-#: directives.c:1950
+#: directives.c:1968
msgid "_Pragma takes a parenthesized string literal"
msgstr "_Pragma охоплює дужками символьний літерал"
-#: directives.c:2033
+#: directives.c:2051
msgid "#else without #if"
msgstr "#else без #if"
-#: directives.c:2038
+#: directives.c:2056
msgid "#else after #else"
msgstr "#else після #else"
-#: directives.c:2040 directives.c:2073
+#: directives.c:2058 directives.c:2091
msgid "the conditional began here"
msgstr "умова починається тут"
-#: directives.c:2066
+#: directives.c:2084
msgid "#elif without #if"
msgstr "#elif без #if"
-#: directives.c:2071
+#: directives.c:2089
msgid "#elif after #else"
msgstr "#elif після #else"
-#: directives.c:2102
+#: directives.c:2120
msgid "#endif without #if"
msgstr "#endif без #if"
-#: directives.c:2178
+#: directives.c:2196
msgid "missing '(' after predicate"
msgstr "відсутня '(' після предикату"
-#: directives.c:2196
+#: directives.c:2214
msgid "missing ')' to complete answer"
msgstr "відсутня ')' для завершення відповіді"
-#: directives.c:2208
+#: directives.c:2226
msgid "predicate's answer is empty"
msgstr "відповідь предиката порожня"
-#: directives.c:2238
+#: directives.c:2256
msgid "assertion without predicate"
msgstr "твердження без предиката"
-#: directives.c:2241
+#: directives.c:2259
msgid "predicate must be an identifier"
msgstr "предикат має бути ідентифікатором"
-#: directives.c:2323
+#: directives.c:2341
#, c-format
msgid "\"%s\" re-asserted"
msgstr "\"%s\" повторне ствердження"
-#: directives.c:2604
+#: directives.c:2659
#, c-format
msgid "unterminated #%s"
msgstr "незавершене #%s"
-#: directives-only.c:221 lex.c:2879 traditional.c:174
-msgid "unterminated comment"
-msgstr "незавершений коментар"
-
#: errors.c:291
#, c-format
msgid "%s: %s"
@@ -444,215 +440,227 @@ msgstr "%s: %s"
msgid "stdout"
msgstr "stdout"
-#: expr.c:626 expr.c:743
+#: expr.c:636 expr.c:753
msgid "fixed-point constants are a GCC extension"
msgstr "константи з фіксованим розташуванням крапки є розширенням GCC"
-#: expr.c:651
+#: expr.c:661
msgid "invalid prefix \"0b\" for floating constant"
msgstr "некоректний префікс \"0b\" для константи з рухомою крапкою"
-#: expr.c:664
+#: expr.c:674
msgid "use of C++17 hexadecimal floating constant"
msgstr "використовуйте десятково-шістнадцяткову константу із рухомою крапкою стандарту C++17"
-#: expr.c:667
+#: expr.c:677
msgid "use of C99 hexadecimal floating constant"
msgstr "використовуйте десятково-шістнадцяткову константу з рухомою крапкою мови C99"
-#: expr.c:711
+#: expr.c:721
#, c-format
msgid "invalid suffix \"%.*s\" on floating constant"
msgstr "некоректний суфікс \"%.*s\" у константі з плаваючою комою"
-#: expr.c:722 expr.c:789
+#: expr.c:732 expr.c:799
#, c-format
msgid "traditional C rejects the \"%.*s\" suffix"
msgstr "традиційною мовою C не сприймається суфікс \"%.*s\""
-#: expr.c:730
+#: expr.c:740
msgid "suffix for double constant is a GCC extension"
msgstr "суфікс для констант double є розширенням GCC"
-#: expr.c:736
+#: expr.c:746
#, c-format
msgid "invalid suffix \"%.*s\" with hexadecimal floating constant"
msgstr "некоректний суфікс \"%.*s\" з десятково-шістнадцятковою константою з плаваючою комою"
-#: expr.c:749 expr.c:753
+#: expr.c:759 expr.c:763
msgid "decimal float constants are a C2X feature"
msgstr "десяткові константи з рухомою крапкою є можливістю C2X"
-#: expr.c:772
+#: expr.c:782
#, c-format
msgid "invalid suffix \"%.*s\" on integer constant"
msgstr "некоректний суфікс \"%.*s\" у цілій константі"
-#: expr.c:797
+#: expr.c:807
msgid "use of C++11 long long integer constant"
msgstr "використання цілої константи long long C++11"
-#: expr.c:798
+#: expr.c:808
msgid "use of C99 long long integer constant"
msgstr "використання цілої константи long long з C99"
-#: expr.c:814
+#: expr.c:822
+msgid "use of C++23 %<size_t%> integer constant"
+msgstr "використання цілої сталої C++23 %<size_t%>"
+
+#: expr.c:823
+msgid "use of C++23 %<make_signed_t<size_t>%> integer constant"
+msgstr "використання цілої сталої C++23 %<make_signed_t<size_t>%>"
+
+#: expr.c:834
msgid "imaginary constants are a GCC extension"
msgstr "уявні константи є розширенням GCC"
-#: expr.c:820
+#: expr.c:841
msgid "binary constants are a C++14 feature or GCC extension"
msgstr "бінарні константи є можливістю C++14 або розширенням GCC"
-#: expr.c:822
-msgid "binary constants are a GCC extension"
-msgstr "бінарні константи є розширенням GCC"
+#: expr.c:843
+msgid "binary constants are a C2X feature or GCC extension"
+msgstr "бінарні константи є можливістю C2X або розширенням GCC"
+
+#: expr.c:848
+msgid "binary constants are a C2X feature"
+msgstr "двійкові константи є можливістю C2X"
-#: expr.c:917
+#: expr.c:944
msgid "integer constant is too large for its type"
msgstr "ціла константа надто велика для вказаного типу"
-#: expr.c:948
+#: expr.c:975
msgid "integer constant is so large that it is unsigned"
msgstr "ціла константа така велика, що вона не матиме знаку"
-#: expr.c:1043
+#: expr.c:1070
msgid "missing ')' after \"defined\""
msgstr "відсутня ')' після \"defined\""
-#: expr.c:1050
+#: expr.c:1077
msgid "operator \"defined\" requires an identifier"
msgstr "для оператора \"defined\" потрібен ідентифікатор"
-#: expr.c:1058
+#: expr.c:1085
#, c-format
msgid "(\"%s\" is an alternative token for \"%s\" in C++)"
msgstr "(\"%s\" - альтернативна лексема для \"%s\" у C++)"
-#: expr.c:1070
+#: expr.c:1098
msgid "this use of \"defined\" may not be portable"
msgstr "використання \"defined\" може бути непереносимим"
-#: expr.c:1113
+#: expr.c:1143
msgid "user-defined literal in preprocessor expression"
msgstr "буквальне визначення користувача у виразі для препроцесора"
-#: expr.c:1118
+#: expr.c:1148
msgid "floating constant in preprocessor expression"
msgstr "константа з плаваючою комою у виразі препроцесора"
-#: expr.c:1124
+#: expr.c:1154
msgid "imaginary number in preprocessor expression"
msgstr "уявне число у виразі препроцесора"
-#: expr.c:1173
+#: expr.c:1203
#, c-format
msgid "\"%s\" is not defined, evaluates to 0"
msgstr "\"%s\" не визначено, приймаємо значення 0"
-#: expr.c:1186
+#: expr.c:1216
msgid "assertions are a GCC extension"
msgstr "assertions є розширенням GCC"
-#: expr.c:1189
+#: expr.c:1219
msgid "assertions are a deprecated extension"
msgstr "розширення assertions вважається застарілим"
-#: expr.c:1435
+#: expr.c:1465
#, c-format
msgid "unbalanced stack in %s"
msgstr "незбалансований стек у %s"
-#: expr.c:1455
+#: expr.c:1485
#, c-format
msgid "impossible operator '%u'"
msgstr "неможливий оператор '%u'"
-#: expr.c:1556
+#: expr.c:1586
msgid "missing ')' in expression"
msgstr "відсутня ')' у виразі"
-#: expr.c:1585
+#: expr.c:1615
msgid "'?' without following ':'"
msgstr "'?' без наступного ':'"
-#: expr.c:1595
+#: expr.c:1625
msgid "integer overflow in preprocessor expression"
msgstr "переповнення цілого числа у виразі препроцесора"
-#: expr.c:1600
+#: expr.c:1630
msgid "missing '(' in expression"
msgstr "відсутня '(' у виразі"
-#: expr.c:1632
+#: expr.c:1662
#, c-format
msgid "the left operand of \"%s\" changes sign when promoted"
msgstr "лівий операнд \"%s\" змінює знак при підвищенні"
-#: expr.c:1637
+#: expr.c:1667
#, c-format
msgid "the right operand of \"%s\" changes sign when promoted"
msgstr "правий оператор \"%s\" змінює знак при підвищенні"
-#: expr.c:1896
+#: expr.c:1926
msgid "traditional C rejects the unary plus operator"
msgstr "у традиційній мові C не допускається унарний оператор плюс"
-#: expr.c:1994
+#: expr.c:2024
msgid "comma operator in operand of #if"
msgstr "оператор кома у операнді #if"
-#: expr.c:2130
+#: expr.c:2160
msgid "division by zero in #if"
msgstr "ділення на нуль у #if"
-#: files.c:576
+#: files.c:571
msgid "one or more PCH files were found, but they were invalid"
msgstr "знайдено один або більше файлів PCH, але вони некоректні"
-#: files.c:580
+#: files.c:575
msgid "use -Winvalid-pch for more information"
msgstr "докладніша інформація виводиться, якщо вказати -Winvalid-pch"
-#: files.c:1004
+#: files.c:1051
#, c-format
msgid "no include path in which to search for %s"
msgstr "відсутні шлях включення у якому ведеться пошук для %s"
-#: files.c:1439
+#: files.c:1546
msgid "Multiple include guards may be useful for:\n"
msgstr "Декілька include guards можуть бути корисні для:\n"
-#: init.c:598
+#: init.c:614
msgid "cppchar_t must be an unsigned type"
msgstr "cppchar_t має бути беззнакового типу"
-#: init.c:602
+#: init.c:618
#, c-format
msgid "preprocessor arithmetic has maximum precision of %lu bits; target requires %lu bits"
msgstr "арифметика препроцесора має максимальну точність %lu біт; ціль вимагає %lu біт"
-#: init.c:609
+#: init.c:625
msgid "CPP arithmetic must be at least as precise as a target int"
msgstr "арифметика CPP повинна мати принаймні таку ж точність я у цільового цілого числа"
-#: init.c:612
+#: init.c:628
msgid "target char is less than 8 bits wide"
msgstr "ширина цільового типу char менша за 8 біт"
-#: init.c:616
+#: init.c:632
msgid "target wchar_t is narrower than target char"
msgstr "цільовий wchar_t є вужчим за цільовий char"
-#: init.c:620
+#: init.c:636
msgid "target int is narrower than target char"
msgstr "цільовий тип int є вужчим ніж цільовий char"
-#: init.c:625
+#: init.c:641
msgid "CPP half-integer narrower than CPP character"
msgstr "CPP half-integer є вужчим за CPP character"
-#: init.c:629
+#: init.c:645
#, c-format
msgid "CPP on this host cannot handle wide character constants over %lu bits, but the target requires %lu bits"
msgstr "CPP на цьому вузлі не може обробляти константи з символів шириною понад %lu біт, але для цілі вимагається %lu біт"
@@ -699,12 +707,12 @@ msgid "`%.*s' is not in NFC"
msgstr "`%.*s' не у NFC"
#: lex.c:1375
-msgid "__VA_OPT__ is not available until C++2a"
-msgstr "__VA_OPT__ є недоступним до C++2a"
+msgid "__VA_OPT__ is not available until C++20"
+msgstr "__VA_OPT__ є недоступним до C++20"
#: lex.c:1382
-msgid "__VA_OPT__ can only appear in the expansion of a C++2a variadic macro"
-msgstr "__VA_OPT__ може з'являтися лише у розширенні варіативних макросів зі стандарту C++2a"
+msgid "__VA_OPT__ can only appear in the expansion of a C++20 variadic macro"
+msgstr "__VA_OPT__ може з'являтися лише у розширенні варіативних макросів зі стандарту C++20"
#: lex.c:1413 lex.c:1506
#, c-format
@@ -724,232 +732,254 @@ msgstr "__VA_ARGS__ може з'являтися лише у розширенн
msgid "identifier \"%s\" is a special operator name in C++"
msgstr "ідентифікатор \"%s\" є особливою назвою оператора у C++"
-#: lex.c:1837
+#: lex.c:1879
msgid "raw string delimiter longer than 16 characters"
msgstr "роздільник необроблених рядків довжиною, що перевищує 16 символів"
-#: lex.c:1841
+#: lex.c:1883
msgid "invalid new-line in raw string delimiter"
msgstr "некоректний символ нового рядка у роздільнику простого рядка"
-#: lex.c:1845
+#: lex.c:1887 lex.c:4639
#, c-format
msgid "invalid character '%c' in raw string delimiter"
msgstr "некоректний символ, «%c», у роздільнику простого рядка"
-#: lex.c:1894 lex.c:1916
+#: lex.c:1926 lex.c:1949
msgid "unterminated raw string"
msgstr "незавершений простий рядок"
-#: lex.c:1936 lex.c:2065
+#: lex.c:1971 lex.c:2100
msgid "invalid suffix on literal; C++11 requires a space between literal and string macro"
msgstr "некоректний суфікс у літералі; стандарт C++11 вимагає використання пробілу між літералом та рядком макроса"
-#: lex.c:2048
+#: lex.c:2083
msgid "null character(s) preserved in literal"
msgstr "null-символи збережені буквально"
-#: lex.c:2051
+#: lex.c:2086
#, c-format
msgid "missing terminating %c character"
msgstr "відсутній завершальний символ %c"
-#: lex.c:2083
+#: lex.c:2118
msgid "C++11 requires a space between string literal and macro"
msgstr "стандарт C++11 вимагає використання пробілу між літералом та рядком макроса"
-#: lex.c:2893 lex.c:2927
+#: lex.c:2711
+msgid "module control-line cannot be in included file"
+msgstr "рядок керування модулем не може зберігатися у включеному файлі"
+
+#: lex.c:2725
+#, c-format
+msgid "module control-line \"%s\" cannot be an object-like macro"
+msgstr "рядок керування модулем «%s» не може бути об'єктоподібним макросом"
+
+#: lex.c:3099 lex.c:4472 traditional.c:174
+msgid "unterminated comment"
+msgstr "незавершений коментар"
+
+#: lex.c:3113 lex.c:3147
msgid "C++ style comments are not allowed in ISO C90"
msgstr "Коментарі у стилі C++ неприпустимі згідно ISO C90"
-#: lex.c:2895 lex.c:2906 lex.c:2930
+#: lex.c:3115 lex.c:3126 lex.c:3150
msgid "(this will be reported only once per input file)"
msgstr "(повідомлення про це з'явиться лише один для вхідного файлу)"
-#: lex.c:2904
+#: lex.c:3124
msgid "C++ style comments are incompatible with C90"
msgstr "Коментарі у стилі C++ неприпустимі у C90"
-#: lex.c:2936
+#: lex.c:3156
msgid "multi-line comment"
msgstr "багаторядковий коментар"
-#: lex.c:3330
+#: lex.c:3550
#, c-format
msgid "unspellable token %s"
msgstr "неможливо розібрати лексему %s"
+#: lex.c:4627
+#, c-format
+msgid "raw string delimiter longer than %d characters"
+msgstr "роздільник необроблених рядків довжиною, що перевищує %d символів"
+
+#: lex.c:4697
+msgid "unterminated literal"
+msgstr "незавершений літерал"
+
#: macro.c:94
msgid "'##' cannot appear at either end of __VA_OPT__"
msgstr "'##' не може з'являтися з обох кінців __VA_OPT__"
-#: macro.c:364
+#: macro.c:386
#, c-format
msgid "\"%s\" used outside of preprocessing directive"
msgstr "«%s» використано поза директивою попередньої обробки"
-#: macro.c:374
+#: macro.c:396
#, c-format
msgid "missing '(' before \"%s\" operand"
msgstr "пропущено «(» перед операндом «%s»"
-#: macro.c:389
+#: macro.c:411
#, c-format
msgid "operator \"%s\" requires a header-name"
msgstr "оператор «%s» потребує назви заголовка"
-#: macro.c:406
+#: macro.c:428
#, c-format
msgid "missing ')' after \"%s\" operand"
msgstr "пропущено «)» після операнда «%s»"
-#: macro.c:426
+#: macro.c:448
#, c-format
msgid "macro \"%s\" is not used"
msgstr "макрос \"%s\" не використовується"
-#: macro.c:465 macro.c:723
+#: macro.c:487 macro.c:778
#, c-format
msgid "invalid built-in macro \"%s\""
msgstr "некоректний вбудований макрос \"%s\""
-#: macro.c:472 macro.c:574
+#: macro.c:494 macro.c:596
#, c-format
msgid "macro \"%s\" might prevent reproducible builds"
msgstr "макрос \"%s\" може завадити відтворюваному збиранню"
-#: macro.c:503
+#: macro.c:525
msgid "could not determine file timestamp"
msgstr "не вдається визначити часову мітку файлу"
-#: macro.c:620
+#: macro.c:610
msgid "could not determine date and time"
msgstr "не вдається визначити дату та час"
-#: macro.c:636
+#: macro.c:642
msgid "__COUNTER__ expanded inside directive with -fdirectives-only"
msgstr "__COUNTER__ розгорнуто всередині директиви з -fdirectives-only"
-#: macro.c:842
+#: macro.c:897
msgid "invalid string literal, ignoring final '\\'"
msgstr "некоректний символьний літерал, ігнорується завершальний символ '\\'"
-#: macro.c:904
+#: macro.c:959
#, c-format
msgid "pasting \"%s\" and \"%s\" does not give a valid preprocessing token"
msgstr "вставка \"%s\" та \"%s\" не призводить до коректної лексеми препроцесора"
-#: macro.c:1030
+#: macro.c:1085
msgid "ISO C++11 requires at least one argument for the \"...\" in a variadic macro"
msgstr "ISO C++11 потребує принаймні одного аргументу для використання \"...\" у варіативному макросі"
-#: macro.c:1034
+#: macro.c:1089
msgid "ISO C99 requires at least one argument for the \"...\" in a variadic macro"
msgstr "ISO C99 потребує принаймні одного аргументу для використання \"...\" у варіативному макросі"
-#: macro.c:1041
+#: macro.c:1096
#, c-format
msgid "macro \"%s\" requires %u arguments, but only %u given"
msgstr "для макроса \"%s\" потрібно вказати %u аргументів, але вказано лише %u"
-#: macro.c:1046
+#: macro.c:1101
#, c-format
msgid "macro \"%s\" passed %u arguments, but takes just %u"
msgstr "макроса \"%s\" передано %u аргументів, але з них використано лише %u"
-#: macro.c:1244 traditional.c:815
+#: macro.c:1299 traditional.c:822
#, c-format
msgid "unterminated argument list invoking macro \"%s\""
msgstr "незавершений список аргументів у виклику макроса \"%s\""
-#: macro.c:1386
+#: macro.c:1442
#, c-format
msgid "function-like macro \"%s\" must be used with arguments in traditional C"
msgstr "подібний до функції макрос \"%s\" має використовуватися з аргументами у традиційній мові C"
-#: macro.c:2165
+#: macro.c:2220
#, c-format
msgid "invoking macro %s argument %d: empty macro arguments are undefined in ISO C++98"
msgstr "виклик макроса %s, аргумент %d: порожні аргументи макросів вважаються невизначеними у ISO C++98"
-#: macro.c:2173 macro.c:2182
+#: macro.c:2228 macro.c:2237
#, c-format
msgid "invoking macro %s argument %d: empty macro arguments are undefined in ISO C90"
msgstr "виклик макроса %s, аргумент %d: порожні аргументи макросів вважаються невизначеними у ISO C90"
-#: macro.c:3141
+#: macro.c:3279
#, c-format
msgid "duplicate macro parameter \"%s\""
msgstr "дублікат параметра макроса \"%s\""
-#: macro.c:3223
+#: macro.c:3361
#, c-format
msgid "expected parameter name, found \"%s\""
msgstr "мала бути назва параметра, а маємо «%s»"
-#: macro.c:3224
+#: macro.c:3362
#, c-format
msgid "expected ',' or ')', found \"%s\""
msgstr "мало бути «,» або «)», втім, виявлено «%s»"
-#: macro.c:3225
+#: macro.c:3363
msgid "expected parameter name before end of line"
msgstr "мала бути назва параметра до кінця рядка"
-#: macro.c:3226
+#: macro.c:3364
msgid "expected ')' before end of line"
msgstr "мала бути «)» до кінця рядка"
-#: macro.c:3227
+#: macro.c:3365
msgid "expected ')' after \"...\""
msgstr "мала бути «)» після «...»"
-#: macro.c:3284
+#: macro.c:3422
msgid "anonymous variadic macros were introduced in C++11"
msgstr "анонімні варіативні макроси започатковані у C++11"
-#: macro.c:3285 macro.c:3289
+#: macro.c:3423 macro.c:3427
msgid "anonymous variadic macros were introduced in C99"
msgstr "анонімні варіативні макроси впроваджено з версії C99"
-#: macro.c:3295
+#: macro.c:3433
msgid "ISO C++ does not permit named variadic macros"
msgstr "ISO C++ не припускає іменовані варіативні макроси"
-#: macro.c:3296
+#: macro.c:3434
msgid "ISO C does not permit named variadic macros"
msgstr "ISO C не припускає іменовані варіативні макроси"
-#: macro.c:3342
+#: macro.c:3480
msgid "'##' cannot appear at either end of a macro expansion"
msgstr "'##' не може з'являтися з обох кінців макророзширення"
-#: macro.c:3380
+#: macro.c:3518
msgid "ISO C++11 requires whitespace after the macro name"
msgstr "у ISO C++11 після назви макроса має бути пробіл"
-#: macro.c:3381
+#: macro.c:3519
msgid "ISO C99 requires whitespace after the macro name"
msgstr "у ISO C99 має бути пробіл після назви макроса"
-#: macro.c:3405
+#: macro.c:3543
msgid "missing whitespace after the macro name"
msgstr "відсутні пробіл після назви макроса"
-#: macro.c:3455
+#: macro.c:3593
msgid "'#' is not followed by a macro parameter"
msgstr "'#' не супроводжується параметром макроса"
-#: macro.c:3606
+#: macro.c:3749
#, c-format
msgid "\"%s\" redefined"
msgstr "повторне визначення \"%s\""
-#: macro.c:3611
+#: macro.c:3754
msgid "this is the location of the previous definition"
msgstr "...це місце першого визначення"
-#: macro.c:3715
+#: macro.c:3891
#, c-format
msgid "macro argument \"%s\" would be stringified in traditional C"
msgstr "аргумент макроса \"%s\" був би перетворений на рядок у традиційній мові C"
@@ -987,15 +1017,18 @@ msgstr "%s: не використовується через некоректн
msgid "while reading precompiled header"
msgstr "при читанні попередньо скомпільованого заголовка"
-#: traditional.c:884
+#: traditional.c:891
#, c-format
msgid "detected recursion whilst expanding macro \"%s\""
msgstr "при розширенні макроса \"%s\" виявлено рекурсію"
-#: traditional.c:1107
+#: traditional.c:1114
msgid "syntax error in macro parameter list"
msgstr "синтаксична помилка у списку параметрів макроса"
+#~ msgid "binary constants are a GCC extension"
+#~ msgstr "бінарні константи є розширенням GCC"
+
#~ msgid "\"__has_include__\" cannot be used as a macro name"
#~ msgstr "\"__has_include__\" не можна використовувати як назву макроса"
diff --git a/libcpp/po/vi.po b/libcpp/po/vi.po
index a62dfe6..9cbd56e 100644
--- a/libcpp/po/vi.po
+++ b/libcpp/po/vi.po
@@ -3,14 +3,14 @@
# Copyright © 2016 Free Software Foundation, Inc.
# This file is distributed under the same license as the gcc package.
# Clytie Siddall <clytie@riverland.net.au>, 2005-2010.
-# Trần Ngọc Quân <vnwildman@gmail.com>, 2012-2014, 2015, 2016, 2017, 2018.
+# Trần Ngọc Quân <vnwildman@gmail.com>, 2012-2014, 2015, 2016, 2017, 2018, 2021.
#
msgid ""
msgstr ""
-"Project-Id-Version: cpplib 8.1-b20180128\n"
+"Project-Id-Version: cpplib 11.1-b20210207\n"
"Report-Msgid-Bugs-To: https://gcc.gnu.org/bugs/\n"
-"POT-Creation-Date: 2020-02-07 22:33+0000\n"
-"PO-Revision-Date: 2018-01-30 15:12+0700\n"
+"POT-Creation-Date: 2021-02-05 21:38+0000\n"
+"PO-Revision-Date: 2021-02-10 15:30+0700\n"
"Last-Translator: Trần Ngọc Quân <vnwildman@gmail.com>\n"
"Language-Team: Vietnamese <translation-team-vi@lists.sourceforge.net>\n"
"Language: vi\n"
@@ -20,159 +20,157 @@ msgstr ""
"X-Bugs: Report translation errors to the Language-Team address.\n"
"Language-Team-Website: <http://translationproject.org/team/vi.html>\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Gtranslator 2.91.7\n"
+"X-Generator: Poedit 2.4.2\n"
"X-Poedit-SourceCharset: UTF-8\n"
-#: charset.c:674
+#: charset.c:677
#, c-format
msgid "conversion from %s to %s not supported by iconv"
msgstr "iconv không hỗ trợ khả năng chuyển đổi từ %s sang %s"
-#: charset.c:677
+#: charset.c:680
msgid "iconv_open"
msgstr "iconv_open"
-#: charset.c:685
+#: charset.c:688
#, c-format
msgid "no iconv implementation, cannot convert from %s to %s"
msgstr "iconv chưa thực hiện nên không thể chuyển đổi từ %s sang %s"
-#: charset.c:781
+#: charset.c:784
#, c-format
msgid "character 0x%lx is not in the basic source character set\n"
msgstr "ký tự 0x%lx không phải nằm trong bộ ký tự nguồn cơ bản\n"
-#: charset.c:798 charset.c:1768
+#: charset.c:801 charset.c:1771
msgid "converting to execution character set"
msgstr "đang chuyển đổi sang bộ ký tự thi hành"
-#: charset.c:804
+#: charset.c:807
#, c-format
msgid "character 0x%lx is not unibyte in execution character set"
msgstr "ký tự 0x%lx không có dạng byte đơn trong bộ ký tự thi hành"
-#: charset.c:1054
+#: charset.c:1057
msgid "universal character names are only valid in C++ and C99"
msgstr "tên ký tự chung chỉ hợp lệ trong ngôn ngữ C++ và C99"
-#: charset.c:1058
+#: charset.c:1061
msgid "C99's universal character names are incompatible with C90"
-msgstr "tên ký tự chung C99 là không tương thích với C99"
+msgstr "Tên ký tự chung C99 là không tương thích với C99"
-#: charset.c:1061
+#: charset.c:1064
#, c-format
msgid "the meaning of '\\%c' is different in traditional C"
msgstr "“\\%c” có nghĩa khác trong ngôn ngữ C truyền thống"
-#: charset.c:1070
+#: charset.c:1073
msgid "In _cpp_valid_ucn but not a UCN"
msgstr "Trong “_cpp_valid_ucn” nhưng mà không phải là một UCN"
-#: charset.c:1103
+#: charset.c:1106
#, c-format
msgid "incomplete universal character name %.*s"
msgstr "tên ký tự chung %.*s chưa hoàn thành"
-#: charset.c:1118
+#: charset.c:1121
#, c-format
msgid "%.*s is not a valid universal character"
msgstr "%.*s không phải là ký tự chung hợp lệ"
-#: charset.c:1128 lex.c:1335
+#: charset.c:1131 lex.c:1335
msgid "'$' in identifier or number"
msgstr "gặp “$” trong định danh hay con số"
-#: charset.c:1138
+#: charset.c:1141
#, c-format
msgid "universal character %.*s is not valid in an identifier"
msgstr "ký tự toàn cầu %.*s không hợp lệ trong một định danh"
-#: charset.c:1142
+#: charset.c:1145
#, c-format
msgid "universal character %.*s is not valid at the start of an identifier"
msgstr "ký tự toàn cầu %.*s không hợp lệ tại đầu của một định danh"
-#: charset.c:1149
+#: charset.c:1152
#, c-format
msgid "%.*s is outside the UCS codespace"
-msgstr ""
+msgstr "%.*s nằm ngoài không gian mã UCS"
-#: charset.c:1194 charset.c:2113
+#: charset.c:1197 charset.c:2116
msgid "converting UCN to source character set"
msgstr "đang chuyển đổi UCN sang bộ ký tự nguồn"
-#: charset.c:1201
+#: charset.c:1204
msgid "converting UCN to execution character set"
msgstr "đang chuyển đổi UCN sang bộ ký tự thi hành"
-#: charset.c:1265
-#, fuzzy, c-format
-#| msgid "universal character %.*s is not valid in an identifier"
+#: charset.c:1268
+#, c-format
msgid "extended character %.*s is not valid in an identifier"
-msgstr "ký tự toàn cầu %.*s không hợp lệ trong một định danh"
+msgstr "ký tự mở rộng %.*s không hợp lệ trong một định danh"
-#: charset.c:1282
-#, fuzzy, c-format
-#| msgid "universal character %.*s is not valid at the start of an identifier"
+#: charset.c:1285
+#, c-format
msgid "extended character %.*s is not valid at the start of an identifier"
-msgstr "ký tự toàn cầu %.*s không hợp lệ tại đầu của một định danh"
+msgstr "ký tự mở rộng %.*s không hợp lệ khi ở đầu của một định danh"
-#: charset.c:1368
+#: charset.c:1371
msgid "the meaning of '\\x' is different in traditional C"
msgstr "“\\x” có nghĩa khác trong ngôn ngữ C truyền thống"
-#: charset.c:1393
+#: charset.c:1396
msgid "\\x used with no following hex digits"
msgstr "\\x được dùng mà không có chữ số thập lục theo sau"
-#: charset.c:1400
+#: charset.c:1403
msgid "hex escape sequence out of range"
msgstr "dãy thoát dạng thập lục phân ở ngoài phạm vi"
-#: charset.c:1452
+#: charset.c:1455
msgid "octal escape sequence out of range"
msgstr "dãy thoát dạng bát phân ở ngoài phạm vi"
-#: charset.c:1534
+#: charset.c:1537
msgid "the meaning of '\\a' is different in traditional C"
msgstr "“\\a” có nghĩa khác trong ngôn ngữ C truyền thống"
-#: charset.c:1541
+#: charset.c:1544
#, c-format
msgid "non-ISO-standard escape sequence, '\\%c'"
msgstr "dãy thoát khác chuẩn ISO: “\\%c”"
-#: charset.c:1549
+#: charset.c:1552
#, c-format
msgid "unknown escape sequence: '\\%c'"
msgstr "không hiểu dãy thoát: “\\%c”"
-#: charset.c:1557
+#: charset.c:1560
#, c-format
msgid "unknown escape sequence: '\\%s'"
msgstr "không hiểu dãy thoát: “\\%s”"
-#: charset.c:1565
+#: charset.c:1568
msgid "converting escape sequence to execution character set"
msgstr "đang chuyển đổi dãy thoát sang bộ ký tự thi hành"
-#: charset.c:1705
+#: charset.c:1708
msgid "missing open quote"
msgstr "thiếu dấu trích dẫn mở"
-#: charset.c:1923 charset.c:2002
+#: charset.c:1926 charset.c:2005
msgid "character constant too long for its type"
msgstr "hằng ký tự quá dài cho kiểu nó"
-#: charset.c:1926
+#: charset.c:1929
msgid "multi-character character constant"
msgstr "hằng ký tự đa ký tự"
-#: charset.c:2042
+#: charset.c:2045
msgid "empty character constant"
msgstr "hằng ký tự trống"
-#: charset.c:2160
+#: charset.c:2163
#, c-format
msgid "failure to convert %s to %s"
msgstr "gặp lỗi nghiêm trong khi chuyển đổi %s sang %s"
@@ -204,7 +202,7 @@ msgstr "ngôn ngữ C truyền thống bỏ qua #%s với # được thụt lề
#: directives.c:404
#, c-format
msgid "suggest hiding #%s from traditional C with an indented #"
-msgstr "khuyên bạn ẩn #%s ra ngôn ngữ C truyền thống bằng # được thụt lề"
+msgstr "khuyên bạn ẩn #%s khỏi ngôn ngữ C truyền thống bằng # được thụt lề"
#: directives.c:430
msgid "embedding a directive within macro arguments is not portable"
@@ -220,10 +218,9 @@ msgid "invalid preprocessing directive #%s"
msgstr "chỉ thị tiền xử lý không hợp lệ #%s"
#: directives.c:601
-#, fuzzy, c-format
-#| msgid "\"defined\" cannot be used as a macro name"
+#, c-format
msgid "\"%s\" cannot be used as a macro name"
-msgstr "không thể dùng “defined” (đã định nghĩa) như là tên vĩ lệnh"
+msgstr "không thể dùng “%s” như là tên vĩ lệnh"
#: directives.c:608
#, c-format
@@ -244,203 +241,199 @@ msgstr "mọi tên vĩ lệnh phải là một định danh"
msgid "undefining \"%s\""
msgstr "đang hủy định nghĩa “%s”"
-#: directives.c:724
+#: directives.c:725
msgid "missing terminating > character"
msgstr "thiếu ký tự “>” chấm dứt"
-#: directives.c:783
+#: directives.c:784
#, c-format
msgid "#%s expects \"FILENAME\" or <FILENAME>"
msgstr "#%s cần \"TÊN_TẬP_TIN\" hoặc <TÊN_TẬP_TIN>"
-#: directives.c:829
+#: directives.c:830
#, c-format
msgid "empty filename in #%s"
msgstr "#%s chứa tên tập tin trống"
-#: directives.c:838
+#: directives.c:839
#, c-format
msgid "#include nested depth %u exceeds maximum of %u (use -fmax-include-depth=DEPTH to increase the maximum)"
-msgstr ""
+msgstr "độ sâu lồng #include %u vượt quá tối đa %u (sử dụng -fmax-include-depth=DEPTH để tăng tối đa)"
-#: directives.c:883
+#: directives.c:884
msgid "#include_next in primary source file"
msgstr "gặp “#include_next” (bao gồm kế tiếp) nằm trong tập tin nguồn chính"
-#: directives.c:909
+#: directives.c:910
#, c-format
msgid "invalid flag \"%s\" in line directive"
msgstr "gặp cờ không hợp lệ “%s” nằm trong chỉ thị dòng"
-#: directives.c:969
+#: directives.c:970
msgid "unexpected end of file after #line"
msgstr "gặp kết thúc tập tin bất thường đằng sau #line"
-#: directives.c:972
+#: directives.c:973
#, c-format
msgid "\"%s\" after #line is not a positive integer"
msgstr "“%s” nằm sau “#line” (dòng) không phải là số nguyên dương"
-#: directives.c:978 directives.c:980
+#: directives.c:979 directives.c:981
msgid "line number out of range"
msgstr "số dòng nằm ngoài phạm vi"
-#: directives.c:993 directives.c:1074
+#: directives.c:994 directives.c:1075
#, c-format
msgid "\"%s\" is not a valid filename"
msgstr "“%s” không phải là tên tập tin hợp lệ"
-#: directives.c:1034
+#: directives.c:1035
#, c-format
msgid "\"%s\" after # is not a positive integer"
msgstr "“%s” nằm sau “#” không phải là số nguyên dương"
-#: directives.c:1101
+#: directives.c:1102
#, c-format
msgid "file \"%s\" linemarker ignored due to incorrect nesting"
msgstr "tập tin linemarker \"%s\" bị bỏ qua bởi vì lồng nhau không đúng"
-#: directives.c:1162 directives.c:1164 directives.c:1166 directives.c:1754
+#: directives.c:1180 directives.c:1182 directives.c:1184 directives.c:1772
#, c-format
msgid "%s"
msgstr "%s"
-#: directives.c:1190
+#: directives.c:1208
#, c-format
msgid "invalid #%s directive"
msgstr "chỉ thị #%s không hợp lệ"
-#: directives.c:1253
+#: directives.c:1271
#, c-format
msgid "registering pragmas in namespace \"%s\" with mismatched name expansion"
-msgstr "việc đăng ký các lệnh mã nguồn điều khiển trình biên dịch (pragma) trong miền tên “%s” sai mở rộng tên "
+msgstr "việc đăng ký các lệnh mã nguồn điều khiển trình biên dịch (pragma) trong miền tên “%s” không khớp mở rộng tên"
-#: directives.c:1262
+#: directives.c:1280
#, c-format
msgid "registering pragma \"%s\" with name expansion and no namespace"
msgstr "việc đăng ký lệnh mã nguồn điều khiển trình biên dịch (pragma) “%s” có mở rộng tên nhưng không có miền tên"
-#: directives.c:1280
+#: directives.c:1298
#, c-format
msgid "registering \"%s\" as both a pragma and a pragma namespace"
-msgstr "đang đăng ký “%s” là cả lệnh nguồn điều khiển trình biện dịch (pragma), lẫn miền tên của lệnh nguồn điều khiển trình biên dịch."
+msgstr "đang đăng ký “%s” là cả lệnh nguồn điều khiển trình biên dịch (pragma), lẫn miền tên của lệnh nguồn điều khiển trình biên dịch"
-#: directives.c:1283
+#: directives.c:1301
#, c-format
msgid "#pragma %s %s is already registered"
msgstr "“#pragma %s %s” đã được đăng ký"
-#: directives.c:1286
+#: directives.c:1304
#, c-format
msgid "#pragma %s is already registered"
msgstr "“#pragma %s” đã được đăng ký"
-#: directives.c:1316
+#: directives.c:1334
msgid "registering pragma with NULL handler"
msgstr "việc đăng ký lệnh mã nguồn điều khiển trình biên dịch (pragma) có bộ quản lý vô giá trị (NULL)"
-#: directives.c:1533
+#: directives.c:1551
msgid "#pragma once in main file"
msgstr "Có “#pragma” một lần trong tập tin chính"
-#: directives.c:1556
+#: directives.c:1574
msgid "invalid #pragma push_macro directive"
msgstr "gặp chỉ thị #pragma push_macro sai"
-#: directives.c:1613
+#: directives.c:1631
msgid "invalid #pragma pop_macro directive"
msgstr "gặp chỉ thị #pragma pop_macro sai"
-#: directives.c:1668
+#: directives.c:1686
msgid "invalid #pragma GCC poison directive"
msgstr "gặp chỉ thị vô hiệu hóa (poison) GCC “#pragma” không hợp lệ"
-#: directives.c:1677
+#: directives.c:1695
#, c-format
msgid "poisoning existing macro \"%s\""
msgstr "đang vô hiệu hóa vĩ lệnh tồn tại “%s”"
-#: directives.c:1696
+#: directives.c:1714
msgid "#pragma system_header ignored outside include file"
msgstr "“#pragma system_header” (đầu trang hệ thống) bị bỏ qua ở ngoài tập tin bao gồm"
-#: directives.c:1721
+#: directives.c:1739
#, c-format
msgid "cannot find source file %s"
msgstr "không tìm thấy tập tin nguồn %s"
-#: directives.c:1725
+#: directives.c:1743
#, c-format
msgid "current file is older than %s"
msgstr "tập tin hiện thời là cũ hơn %s"
-#: directives.c:1749
+#: directives.c:1767
#, c-format
msgid "invalid \"#pragma GCC %s\" directive"
msgstr "gặp chỉ thị \"#pragma GCC %s\" không hợp lệ"
-#: directives.c:1950
+#: directives.c:1968
msgid "_Pragma takes a parenthesized string literal"
msgstr "“_Pragma” nhận một hằng chuỗi được đặt trong ngoặc đơn"
-#: directives.c:2033
+#: directives.c:2051
msgid "#else without #if"
msgstr "#else (nếu không) mà không có #if (nếu)"
-#: directives.c:2038
+#: directives.c:2056
msgid "#else after #else"
msgstr "#else (nếu không) nằm sau #else"
-#: directives.c:2040 directives.c:2073
+#: directives.c:2058 directives.c:2091
msgid "the conditional began here"
msgstr "điều kiện đã bắt đầu ở đây"
-#: directives.c:2066
+#: directives.c:2084
msgid "#elif without #if"
msgstr "#elif (nếu không thì nếu) không có #if (nếu)"
-#: directives.c:2071
+#: directives.c:2089
msgid "#elif after #else"
msgstr "#elif (nếu không thì nếu) nằm sau #else (nếu không)"
-#: directives.c:2102
+#: directives.c:2120
msgid "#endif without #if"
msgstr "#endif (nếu không đúng) không có #if (nếu)"
-#: directives.c:2178
+#: directives.c:2196
msgid "missing '(' after predicate"
msgstr "thiếu “(” nằm sau vị ngữ"
-#: directives.c:2196
+#: directives.c:2214
msgid "missing ')' to complete answer"
msgstr "thiếu “)” để hoàn tất câu trả lời"
-#: directives.c:2208
+#: directives.c:2226
msgid "predicate's answer is empty"
msgstr "vị ngữ chứa trả lời trống"
-#: directives.c:2238
+#: directives.c:2256
msgid "assertion without predicate"
msgstr "sự khẳng định không có vị ngữ"
-#: directives.c:2241
+#: directives.c:2259
msgid "predicate must be an identifier"
msgstr "vị ngữ phải là định danh"
-#: directives.c:2323
+#: directives.c:2341
#, c-format
msgid "\"%s\" re-asserted"
msgstr "“%s” được khẳng định lại"
-#: directives.c:2604
+#: directives.c:2659
#, c-format
msgid "unterminated #%s"
msgstr "#%s chưa chấm dứt"
-#: directives-only.c:221 lex.c:2879 traditional.c:174
-msgid "unterminated comment"
-msgstr "gặp chú thích chưa được chấm dứt"
-
#: errors.c:291
#, c-format
msgid "%s: %s"
@@ -450,217 +443,227 @@ msgstr "%s: %s"
msgid "stdout"
msgstr "thiết bị xuất chuẩn"
-#: expr.c:626 expr.c:743
+#: expr.c:636 expr.c:753
msgid "fixed-point constants are a GCC extension"
msgstr "hằng số thực dấu chấm tĩnh là phần mở rộng GCC"
-#: expr.c:651
+#: expr.c:661
msgid "invalid prefix \"0b\" for floating constant"
msgstr "gặp tiền tố không hợp lệ “0b” cho hằng dấu chấm động"
-#: expr.c:664
+#: expr.c:674
msgid "use of C++17 hexadecimal floating constant"
msgstr "dùng hằng dấu chấm động thập lục C++17"
-#: expr.c:667
+#: expr.c:677
msgid "use of C99 hexadecimal floating constant"
msgstr "dùng hằng dấu chấm động thập lục C99"
-#: expr.c:711
+#: expr.c:721
#, c-format
msgid "invalid suffix \"%.*s\" on floating constant"
msgstr "gặp hậu tố không hợp lệ “%.*s” nằm trên hằng dấu chấm động"
-#: expr.c:722 expr.c:789
+#: expr.c:732 expr.c:799
#, c-format
msgid "traditional C rejects the \"%.*s\" suffix"
msgstr "ngôn ngữ C truyền thống từ chối hậu tố “%.*s”"
-#: expr.c:730
+#: expr.c:740
msgid "suffix for double constant is a GCC extension"
msgstr "hậu tố cho hằng số đôi là một phần mở rộng GCC"
-#: expr.c:736
+#: expr.c:746
#, c-format
msgid "invalid suffix \"%.*s\" with hexadecimal floating constant"
msgstr "gặp hậu tố không hợp lệ “%.*s” có hằng dấu chấm động thập lục"
-#: expr.c:749 expr.c:753
-#, fuzzy
-#| msgid "decimal float constants are a GCC extension"
+#: expr.c:759 expr.c:763
msgid "decimal float constants are a C2X feature"
-msgstr "hằng dấu chấm động thập lục là phần mở rộng GCC"
+msgstr "hằng dấu chấm động thập phân là một tính năng C2X"
-#: expr.c:772
+#: expr.c:782
#, c-format
msgid "invalid suffix \"%.*s\" on integer constant"
msgstr "gặp hậu tố không hợp lệ “%.*s” nằm trên hằng số nguyên"
-#: expr.c:797
+#: expr.c:807
msgid "use of C++11 long long integer constant"
msgstr "dùng hằng số nguyên dài dài C++11"
-#: expr.c:798
+#: expr.c:808
msgid "use of C99 long long integer constant"
msgstr "dùng hằng số nguyên dài dài C99"
-#: expr.c:814
+#: expr.c:822
+msgid "use of C++23 %<size_t%> integer constant"
+msgstr "dùng hằng số nguyên C++23 %<size_t%>"
+
+#: expr.c:823
+msgid "use of C++23 %<make_signed_t<size_t>%> integer constant"
+msgstr "dùng hằng số nguyên C++23 %<make_signed_t<size_t>%>"
+
+#: expr.c:834
msgid "imaginary constants are a GCC extension"
msgstr "hằng ảo là phần mở rộng GCC"
-#: expr.c:820
+#: expr.c:841
msgid "binary constants are a C++14 feature or GCC extension"
msgstr "hằng nhị phân là đặc tính C++14 hoặc phần mở rộng GCC"
-#: expr.c:822
-msgid "binary constants are a GCC extension"
-msgstr "hằng nhị phân là phần mở rộng GCC"
+#: expr.c:843
+msgid "binary constants are a C2X feature or GCC extension"
+msgstr "hằng nhị phân là đặc tính C2X hoặc phần mở rộng GCC"
-#: expr.c:917
+#: expr.c:848
+msgid "binary constants are a C2X feature"
+msgstr "hằng nhị phân là một tính năng C2X"
+
+#: expr.c:944
msgid "integer constant is too large for its type"
msgstr "hằng số nguyên quá lớn cho kiểu nó"
-#: expr.c:948
+#: expr.c:975
msgid "integer constant is so large that it is unsigned"
msgstr "hằng số nguyên quá lớn thì không có dấu"
-#: expr.c:1043
+#: expr.c:1070
msgid "missing ')' after \"defined\""
msgstr "thiếu “)” nằm sau “defined” (đã định nghĩa)"
-#: expr.c:1050
+#: expr.c:1077
msgid "operator \"defined\" requires an identifier"
msgstr "toán tử “defined” (đã định nghĩa) cần đến định danh"
-#: expr.c:1058
+#: expr.c:1085
#, c-format
msgid "(\"%s\" is an alternative token for \"%s\" in C++)"
msgstr "(“%s” là một thẻ bài thay thế cho “%s” trong ngôn ngữ C++)"
-#: expr.c:1070
+#: expr.c:1098
msgid "this use of \"defined\" may not be portable"
msgstr "khả năng dùng “defined” (đã định nghĩa) có lẽ không khả chuyển"
-#: expr.c:1113
+#: expr.c:1143
msgid "user-defined literal in preprocessor expression"
msgstr "kiểu do người dùng định nghĩa trong biểu thức tiền xử lý"
-#: expr.c:1118
+#: expr.c:1148
msgid "floating constant in preprocessor expression"
msgstr "gặp hằng dấu chấm động nằm trong biểu thức tiền xử lý"
-#: expr.c:1124
+#: expr.c:1154
msgid "imaginary number in preprocessor expression"
msgstr "gặp số ảo nằm trong biểu thức tiền xử lý"
-#: expr.c:1173
+#: expr.c:1203
#, c-format
msgid "\"%s\" is not defined, evaluates to 0"
msgstr "chưa định nghĩa “%s”, định giá thành 0"
-#: expr.c:1186
+#: expr.c:1216
msgid "assertions are a GCC extension"
msgstr "khẳng định là một phần mở rộng GCC"
-#: expr.c:1189
+#: expr.c:1219
msgid "assertions are a deprecated extension"
msgstr "khẳng định là một phần mở rộng GCC bị phản đối"
-#: expr.c:1435
+#: expr.c:1465
#, c-format
msgid "unbalanced stack in %s"
msgstr "có ngăn xếp không cân bằng trong %s"
-#: expr.c:1455
+#: expr.c:1485
#, c-format
msgid "impossible operator '%u'"
msgstr "toán tử không thể “%u”"
-#: expr.c:1556
+#: expr.c:1586
msgid "missing ')' in expression"
msgstr "thiếu “)” trong biểu thức"
-#: expr.c:1585
+#: expr.c:1615
msgid "'?' without following ':'"
msgstr "dấu hỏi “?” mà không có dấu hai chấm “:” đi sau"
-#: expr.c:1595
+#: expr.c:1625
msgid "integer overflow in preprocessor expression"
msgstr "tràn số nguyên trong biểu thức tiền xử lý"
-#: expr.c:1600
+#: expr.c:1630
msgid "missing '(' in expression"
msgstr "thiếu “(” trong biểu thức"
-#: expr.c:1632
+#: expr.c:1662
#, c-format
msgid "the left operand of \"%s\" changes sign when promoted"
msgstr "toán hạng bên trái của “%s” thay đổi dấu (dương/âm) khi được tăng cấp"
-#: expr.c:1637
+#: expr.c:1667
#, c-format
msgid "the right operand of \"%s\" changes sign when promoted"
msgstr "toán hạng bên phải của “%s” thay đổi dấu (dương/âm) khi đươc tăng cấp"
-#: expr.c:1896
+#: expr.c:1926
msgid "traditional C rejects the unary plus operator"
msgstr "ngôn ngữ C truyền thống từ chối toán tử cộng chỉ có một toán hạng"
-#: expr.c:1994
+#: expr.c:2024
msgid "comma operator in operand of #if"
msgstr "toán tử dấu phẩy nằm trong toán hạng của #if (nếu)"
-#: expr.c:2130
+#: expr.c:2160
msgid "division by zero in #if"
msgstr "chia cho số không trong #if (nếu)"
-#: files.c:576
+#: files.c:571
msgid "one or more PCH files were found, but they were invalid"
msgstr "tìm thấy một hay nhiều tập tin PCH, nhưng chúng không hợp lệ"
-#: files.c:580
+#: files.c:575
msgid "use -Winvalid-pch for more information"
msgstr "dùng “-Winvalid-pch” để biết thêm thông tin cần thiết"
-#: files.c:1004
+#: files.c:1051
#, c-format
msgid "no include path in which to search for %s"
msgstr "không có đường dẫn bao gồm trong đó có thể tìm kiếm %s"
-#: files.c:1439
+#: files.c:1546
msgid "Multiple include guards may be useful for:\n"
msgstr "Nhiều bộ bảo vệ bao gồm có lẽ hữu ích cho :\n"
-#: init.c:598
+#: init.c:614
msgid "cppchar_t must be an unsigned type"
msgstr "“cppchar_t” phải là kiểu không dấu"
-#: init.c:602
+#: init.c:618
#, c-format
msgid "preprocessor arithmetic has maximum precision of %lu bits; target requires %lu bits"
msgstr "thuật toán của trình tiền xử lý có độ chính xác tối đa là %lu bit còn đích cần đến %lu bit"
-#: init.c:609
+#: init.c:625
msgid "CPP arithmetic must be at least as precise as a target int"
-msgstr "thuật toán CPP phải là ít nhất cùng chính xác với “int” đích"
+msgstr "Số học CPP phải là ít nhất cùng độ chính xác với “int” đích"
-#: init.c:612
+#: init.c:628
msgid "target char is less than 8 bits wide"
msgstr "“char” đích có độ rộng ít hơn 8 bit"
-#: init.c:616
+#: init.c:632
msgid "target wchar_t is narrower than target char"
msgstr "“wchar_t” đích có độ rộng ít hơn “char” đích"
-#: init.c:620
+#: init.c:636
msgid "target int is narrower than target char"
msgstr "“int” đích có độ rộng ít hơn “char” đích"
-#: init.c:625
+#: init.c:641
msgid "CPP half-integer narrower than CPP character"
-msgstr "nửa-số-nguyên CPP có độ rộng ít hơn ký tự CPP"
+msgstr "Nửa-số-nguyên CPP có độ rộng hẹp hơn ký tự CPP"
-#: init.c:629
+#: init.c:645
#, c-format
msgid "CPP on this host cannot handle wide character constants over %lu bits, but the target requires %lu bits"
msgstr "Trên máy này, CPP không thể xử lý hằng ký tự rộng hơn %lu bit, còn đích lại yêu cầu %lu bit"
@@ -707,12 +710,12 @@ msgid "`%.*s' is not in NFC"
msgstr "“%.*s” không nằm trong NFC"
#: lex.c:1375
-msgid "__VA_OPT__ is not available until C++2a"
-msgstr "__VA_OPT__ không sẵn có cho đến tận C++2a"
+msgid "__VA_OPT__ is not available until C++20"
+msgstr "__VA_OPT__ không sẵn có cho đến tận C++20"
#: lex.c:1382
-msgid "__VA_OPT__ can only appear in the expansion of a C++2a variadic macro"
-msgstr "__VA_OPT__ chỉ có thể xuất hiện trong phần mở rộng của vĩ lệnh biến thiên C++2a"
+msgid "__VA_OPT__ can only appear in the expansion of a C++20 variadic macro"
+msgstr "__VA_OPT__ chỉ có thể xuất hiện trong phần mở rộng của vĩ lệnh biến thiên C++20"
#: lex.c:1413 lex.c:1506
#, c-format
@@ -732,238 +735,254 @@ msgstr "“__VA_ARGS__” chỉ có thể xuất hiện trong sự mở rộng c
msgid "identifier \"%s\" is a special operator name in C++"
msgstr "định danh “%s” là một tên toán tử đặc biệt trong C++"
-#: lex.c:1837
+#: lex.c:1879
msgid "raw string delimiter longer than 16 characters"
msgstr "gặp dấu giới hạn chuỗi thô dài hơn 16 ký tự"
-#: lex.c:1841
+#: lex.c:1883
msgid "invalid new-line in raw string delimiter"
msgstr "ký tự dòng-mới không hợp lệ trong dấu giới hạn chuỗi thô"
-#: lex.c:1845
+#: lex.c:1887 lex.c:4639
#, c-format
msgid "invalid character '%c' in raw string delimiter"
msgstr "gặp ký tự sai “%c” trong dấu giới hạn chuỗi thô"
-#: lex.c:1894 lex.c:1916
+#: lex.c:1926 lex.c:1949
msgid "unterminated raw string"
msgstr "chuỗi thô chưa được chấm dứt"
-#: lex.c:1936 lex.c:2065
+#: lex.c:1971 lex.c:2100
msgid "invalid suffix on literal; C++11 requires a space between literal and string macro"
msgstr "hậu tố ở chuỗi văn bản không hợp lệ; C++11 yêu cầu cần có khoảng trắng giữ chuỗi văn bản và chuỗi vĩ lệnh"
-#: lex.c:2048
+#: lex.c:2083
msgid "null character(s) preserved in literal"
msgstr "(các) ký tự rỗng được giữ lại trong chuỗi văn học"
-#: lex.c:2051
+#: lex.c:2086
#, c-format
msgid "missing terminating %c character"
msgstr "thiếu ký tự “%c” chấm dứt"
-#: lex.c:2083
+#: lex.c:2118
msgid "C++11 requires a space between string literal and macro"
msgstr "C++11 yêu cầu cần có khoảng trắng giữ chuỗi văn bản và vĩ lệnh"
-#: lex.c:2893 lex.c:2927
+#: lex.c:2711
+msgid "module control-line cannot be in included file"
+msgstr "mô-đun control-line không thể có trong tập tin bao gồm"
+
+#: lex.c:2725
+#, c-format
+msgid "module control-line \"%s\" cannot be an object-like macro"
+msgstr "mô-đun control-line \"%s\" không thể là một macro giống như đối tượng"
+
+#: lex.c:3099 lex.c:4472 traditional.c:174
+msgid "unterminated comment"
+msgstr "gặp chú thích chưa được chấm dứt"
+
+#: lex.c:3113 lex.c:3147
msgid "C++ style comments are not allowed in ISO C90"
-msgstr "không cho phép chú thích kiểu C++ nằm trong ISO C90"
+msgstr "Chú thích kiểu C++ là không được phép trong ISO C90"
-#: lex.c:2895 lex.c:2906 lex.c:2930
+#: lex.c:3115 lex.c:3126 lex.c:3150
msgid "(this will be reported only once per input file)"
msgstr "(điều này sẽ được thông báo chỉ một lần cho mỗi tập tin đầu vào)"
-#: lex.c:2904
+#: lex.c:3124
msgid "C++ style comments are incompatible with C90"
-msgstr "không cho phép chú thích kiểu C++ nằm trong C90"
+msgstr "Chú thích kiểu C++ là không tương thích với C90"
-#: lex.c:2936
+#: lex.c:3156
msgid "multi-line comment"
msgstr "gặp chú thích đa dòng"
-#: lex.c:3330
+#: lex.c:3550
#, c-format
msgid "unspellable token %s"
msgstr "gặp thẻ bài không thể chính tả %s"
+#: lex.c:4627
+#, c-format
+msgid "raw string delimiter longer than %d characters"
+msgstr "gặp dấu giới hạn chuỗi thô dài hơn %d ký tự"
+
+#: lex.c:4697
+msgid "unterminated literal"
+msgstr "chuỗi văn chưa chấm dứt"
+
#: macro.c:94
msgid "'##' cannot appear at either end of __VA_OPT__"
msgstr "không cho phép “##” nằm hoặc trước __VA_OPT__"
-#: macro.c:364
-#, fuzzy, c-format
-#| msgid "%s in preprocessing directive"
+#: macro.c:386
+#, c-format
msgid "\"%s\" used outside of preprocessing directive"
-msgstr "gặp %s nằm trong chỉ thị tiền xử lý"
+msgstr "gặp \"%s\" ngoài chỉ thị tiền xử lý"
-#: macro.c:374
-#, fuzzy, c-format
-#| msgid "missing '(' in expression"
+#: macro.c:396
+#, c-format
msgid "missing '(' before \"%s\" operand"
-msgstr "thiếu “(” trong biểu thức"
+msgstr "thiếu “(” trước toán hạng \"%s\""
-#: macro.c:389
-#, fuzzy, c-format
-#| msgid "operator \"__has_include__\" requires a header string"
+#: macro.c:411
+#, c-format
msgid "operator \"%s\" requires a header-name"
-msgstr "toán tử “__has_include__” (đã bao gồm) cần một chuỗi đầu"
+msgstr "toán tử “%s” cần một tên-đầu"
-#: macro.c:406
-#, fuzzy, c-format
-#| msgid "missing ')' after \"defined\""
+#: macro.c:428
+#, c-format
msgid "missing ')' after \"%s\" operand"
-msgstr "thiếu “)” nằm sau “defined” (đã định nghĩa)"
+msgstr "thiếu “)” sau toán hạng \"%s\""
-#: macro.c:426
+#: macro.c:448
#, c-format
msgid "macro \"%s\" is not used"
msgstr "vĩ lệnh “%s” không được dùng"
-#: macro.c:465 macro.c:723
+#: macro.c:487 macro.c:778
#, c-format
msgid "invalid built-in macro \"%s\""
msgstr "vĩ lệnh dựng-sẵn không hợp lệ “%s”"
-#: macro.c:472 macro.c:574
+#: macro.c:494 macro.c:596
#, c-format
msgid "macro \"%s\" might prevent reproducible builds"
msgstr "vĩ lệnh \"%s\" có thể ngăn cản việc dịch tái sinh"
-#: macro.c:503
+#: macro.c:525
msgid "could not determine file timestamp"
msgstr "không thể xác định nhãn giờ của tập tin"
-#: macro.c:620
+#: macro.c:610
msgid "could not determine date and time"
msgstr "không thể phân giải ngày và giờ"
-#: macro.c:636
+#: macro.c:642
msgid "__COUNTER__ expanded inside directive with -fdirectives-only"
msgstr "__COUNTER__ đã mở rộng bên trong chỉ thị với “-fdirectives-only”"
-#: macro.c:842
+#: macro.c:897
msgid "invalid string literal, ignoring final '\\'"
msgstr "chuỗi văn học không hợp lệ nên bỏ qua “\\” cuối cùng"
-#: macro.c:904
+#: macro.c:959
#, c-format
msgid "pasting \"%s\" and \"%s\" does not give a valid preprocessing token"
msgstr "việc dán “%s” và “%s” không đưa ra thẻ bài tiền xử lý hợp lệ"
-#: macro.c:1030
+#: macro.c:1085
msgid "ISO C++11 requires at least one argument for the \"...\" in a variadic macro"
msgstr "ISO C++11 cần ít nhất một đối số cho \"…\" còn lại trong vĩ lệnh biến thiên"
-#: macro.c:1034
+#: macro.c:1089
msgid "ISO C99 requires at least one argument for the \"...\" in a variadic macro"
msgstr "ISO C99 cần ít nhất một đối số cho \"…\" còn lại trong vĩ lệnh biến thiên"
-#: macro.c:1041
+#: macro.c:1096
#, c-format
msgid "macro \"%s\" requires %u arguments, but only %u given"
msgstr "vĩ lệnh “%s” cần đến %u đối số, nhưng chỉ đưa ra %u thôi"
-#: macro.c:1046
+#: macro.c:1101
#, c-format
msgid "macro \"%s\" passed %u arguments, but takes just %u"
msgstr "vĩ lệnh “%s” đã chuyển %u đối số, nhưng chỉ nhận được %u thôi"
-#: macro.c:1244 traditional.c:815
+#: macro.c:1299 traditional.c:822
#, c-format
msgid "unterminated argument list invoking macro \"%s\""
msgstr "danh sách đối số không được chấm dứt có gọi vĩ lệnh “%s”"
-#: macro.c:1386
+#: macro.c:1442
#, c-format
msgid "function-like macro \"%s\" must be used with arguments in traditional C"
msgstr "vĩ lệnh giống hàm số “%s” phải được dùng với đối số trong ngôn ngữ C truyền thống"
-#: macro.c:2165
+#: macro.c:2220
#, c-format
msgid "invoking macro %s argument %d: empty macro arguments are undefined in ISO C++98"
-msgstr "đang gọi vĩ lệnh %s đối số %d: đối số vĩ lệnh trống rỗng là không hợp lệ trong ISO C++98 "
+msgstr "đang gọi vĩ lệnh %s đối số %d: đối số vĩ lệnh trống rỗng là không hợp lệ trong ISO C++98"
-#: macro.c:2173 macro.c:2182
+#: macro.c:2228 macro.c:2237
#, c-format
msgid "invoking macro %s argument %d: empty macro arguments are undefined in ISO C90"
msgstr "đang gọi vĩ lệnh %s đối số %d: đối số vĩ lệnh trống rỗng là không hợp lệ trong ISO C90"
-#: macro.c:3141
+#: macro.c:3279
#, c-format
msgid "duplicate macro parameter \"%s\""
msgstr "tham số vĩ lệnh trùng lặp “%s”"
-#: macro.c:3223
+#: macro.c:3361
#, c-format
msgid "expected parameter name, found \"%s\""
-msgstr ""
+msgstr "cần tên tham số, nhưng lại gặp \"%s\""
-#: macro.c:3224
+#: macro.c:3362
#, c-format
msgid "expected ',' or ')', found \"%s\""
-msgstr ""
+msgstr "cần “,” hoặc “)” nhưng lại nhận được “%s”"
-#: macro.c:3225
+#: macro.c:3363
msgid "expected parameter name before end of line"
-msgstr ""
+msgstr "cần tên tham số trước khi kết thúc dòng"
-#: macro.c:3226
-#, fuzzy
-#| msgid "unexpected end of file after #line"
+#: macro.c:3364
msgid "expected ')' before end of line"
-msgstr "gặp kết thúc tập tin bất thường đằng sau #line"
+msgstr "cần ')' trước cuối dòng"
-#: macro.c:3227
+#: macro.c:3365
msgid "expected ')' after \"...\""
-msgstr ""
+msgstr "cần ')' sau \"...\""
-#: macro.c:3284
+#: macro.c:3422
msgid "anonymous variadic macros were introduced in C++11"
msgstr "vĩ lệnh biến thiên vô danh đã được giới thiệu trong C++11"
-#: macro.c:3285 macro.c:3289
+#: macro.c:3423 macro.c:3427
msgid "anonymous variadic macros were introduced in C99"
msgstr "vĩ lệnh biến thiên vô danh đã được giới thiệu trong C99"
-#: macro.c:3295
+#: macro.c:3433
msgid "ISO C++ does not permit named variadic macros"
msgstr "ISO C++ không cho phép vĩ lệnh biến thiên có tên"
-#: macro.c:3296
+#: macro.c:3434
msgid "ISO C does not permit named variadic macros"
msgstr "ISO C không cho phép vĩ lệnh biến thiên có tên"
-#: macro.c:3342
+#: macro.c:3480
msgid "'##' cannot appear at either end of a macro expansion"
msgstr "không cho phép “##” nằm hoặc trước hoặc sau sự mở rộng vĩ lệnh"
-#: macro.c:3380
+#: macro.c:3518
msgid "ISO C++11 requires whitespace after the macro name"
msgstr "ISO C++11 cần đến khoảng trắng nằm sau tên vĩ lệnh"
-#: macro.c:3381
+#: macro.c:3519
msgid "ISO C99 requires whitespace after the macro name"
msgstr "ISO C99 cần đến khoảng trắng nằm sau tên vĩ lệnh"
-#: macro.c:3405
+#: macro.c:3543
msgid "missing whitespace after the macro name"
msgstr "thiếu khoảng trắng nằm sau tên vĩ lệnh"
-#: macro.c:3455
+#: macro.c:3593
msgid "'#' is not followed by a macro parameter"
msgstr "“#” không cho phép đi theo sau một tham số vĩ lệnh"
-#: macro.c:3606
+#: macro.c:3749
#, c-format
msgid "\"%s\" redefined"
msgstr "“%s” bị định nghĩa lại"
-#: macro.c:3611
+#: macro.c:3754
msgid "this is the location of the previous definition"
msgstr "đây là vị trí của lời định nghĩa trước"
-#: macro.c:3715
+#: macro.c:3891
#, c-format
msgid "macro argument \"%s\" would be stringified in traditional C"
msgstr "đối số vĩ lệnh “%s” nên được chuyển đổi thành chuỗi trong ngôn ngữ C truyền thống"
@@ -999,14 +1018,14 @@ msgstr "%s: không được dùng vì “__COUNTER__” không hợp lệ"
#: pch.c:720 pch.c:876
msgid "while reading precompiled header"
-msgstr "trong khi đọc đầu trang biên dịch sẵn"
+msgstr "trong khi đọc đầu trang được biên dịch sẵn"
-#: traditional.c:884
+#: traditional.c:891
#, c-format
msgid "detected recursion whilst expanding macro \"%s\""
msgstr "đã phát hiện sự đệ qui trong khi mở rộng vĩ lệnh “%s”"
-#: traditional.c:1107
+#: traditional.c:1114
msgid "syntax error in macro parameter list"
msgstr "gặp lỗi cú pháp trong danh sách tham số vĩ lệnh"
diff --git a/libcpp/po/zh_CN.po b/libcpp/po/zh_CN.po
index ee21061..c5afb81 100644
--- a/libcpp/po/zh_CN.po
+++ b/libcpp/po/zh_CN.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: cpplib 4.6.0\n"
"Report-Msgid-Bugs-To: https://gcc.gnu.org/bugs/\n"
-"POT-Creation-Date: 2020-02-07 22:33+0000\n"
+"POT-Creation-Date: 2021-02-05 21:38+0000\n"
"PO-Revision-Date: 2011-05-12 17:23+0800\n"
"Last-Translator: Meng Jie <zuxy.meng@gmail.com>\n"
"Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n"
@@ -19,158 +19,158 @@ msgstr ""
"X-Poedit-Language: Chinese\n"
"X-Poedit-Country: CHINA\n"
-#: charset.c:674
+#: charset.c:677
#, c-format
msgid "conversion from %s to %s not supported by iconv"
msgstr "iconv 不支持从 %s 到 %s 的转换"
-#: charset.c:677
+#: charset.c:680
msgid "iconv_open"
msgstr "iconv_open"
-#: charset.c:685
+#: charset.c:688
#, c-format
msgid "no iconv implementation, cannot convert from %s to %s"
msgstr "没有 iconv 的实现,无法从 %s 转换到 %s"
-#: charset.c:781
+#: charset.c:784
#, c-format
msgid "character 0x%lx is not in the basic source character set\n"
msgstr "字符 0x%lx 不在基本源字符集中\n"
-#: charset.c:798 charset.c:1768
+#: charset.c:801 charset.c:1771
msgid "converting to execution character set"
msgstr "转换到可执行文件的字符集"
-#: charset.c:804
+#: charset.c:807
#, c-format
msgid "character 0x%lx is not unibyte in execution character set"
msgstr "字符 0x%lx 在执行字符集中不是单字节的"
-#: charset.c:1054
+#: charset.c:1057
msgid "universal character names are only valid in C++ and C99"
msgstr "Unicode 字符名只在 C++ 和 C99 中有效"
-#: charset.c:1058
+#: charset.c:1061
#, fuzzy
#| msgid "universal character names are only valid in C++ and C99"
msgid "C99's universal character names are incompatible with C90"
msgstr "Unicode 字符名只在 C++ 和 C99 中有效"
-#: charset.c:1061
+#: charset.c:1064
#, c-format
msgid "the meaning of '\\%c' is different in traditional C"
msgstr "‘\\%c’的意义与在传统 C 中不同"
-#: charset.c:1070
+#: charset.c:1073
msgid "In _cpp_valid_ucn but not a UCN"
msgstr "在 _cpp_valid_ucn 中但不是一个 UCN"
-#: charset.c:1103
+#: charset.c:1106
#, c-format
msgid "incomplete universal character name %.*s"
msgstr "不完全的 Unicode 字符名 %.*s"
-#: charset.c:1118
+#: charset.c:1121
#, c-format
msgid "%.*s is not a valid universal character"
msgstr "%.*s 不是一个有效的 Unicode 字符"
-#: charset.c:1128 lex.c:1335
+#: charset.c:1131 lex.c:1335
msgid "'$' in identifier or number"
msgstr "‘$’出现在标识符或数字中"
-#: charset.c:1138
+#: charset.c:1141
#, c-format
msgid "universal character %.*s is not valid in an identifier"
msgstr "Unicode 字符 %.*s 在标识符中无效"
-#: charset.c:1142
+#: charset.c:1145
#, c-format
msgid "universal character %.*s is not valid at the start of an identifier"
msgstr "Unicode 字符 %.*s 在标识符开头无效"
-#: charset.c:1149
+#: charset.c:1152
#, c-format
msgid "%.*s is outside the UCS codespace"
msgstr ""
-#: charset.c:1194 charset.c:2113
+#: charset.c:1197 charset.c:2116
msgid "converting UCN to source character set"
msgstr "将 UCN 转换到源字符集"
-#: charset.c:1201
+#: charset.c:1204
msgid "converting UCN to execution character set"
msgstr "将 UCN 转换到执行字符集"
-#: charset.c:1265
+#: charset.c:1268
#, fuzzy, c-format
#| msgid "universal character %.*s is not valid in an identifier"
msgid "extended character %.*s is not valid in an identifier"
msgstr "Unicode 字符 %.*s 在标识符中无效"
-#: charset.c:1282
+#: charset.c:1285
#, fuzzy, c-format
#| msgid "universal character %.*s is not valid at the start of an identifier"
msgid "extended character %.*s is not valid at the start of an identifier"
msgstr "Unicode 字符 %.*s 在标识符开头无效"
-#: charset.c:1368
+#: charset.c:1371
msgid "the meaning of '\\x' is different in traditional C"
msgstr "‘\\x’的意义与在传统 C 中不同"
-#: charset.c:1393
+#: charset.c:1396
msgid "\\x used with no following hex digits"
msgstr "\\x 后没有 16 进制数字"
-#: charset.c:1400
+#: charset.c:1403
msgid "hex escape sequence out of range"
msgstr "16 进制转义序列越界"
-#: charset.c:1452
+#: charset.c:1455
msgid "octal escape sequence out of range"
msgstr "8 进制转义序列越界"
-#: charset.c:1534
+#: charset.c:1537
msgid "the meaning of '\\a' is different in traditional C"
msgstr "‘\\a’的意义与在传统 C 中不同"
-#: charset.c:1541
+#: charset.c:1544
#, c-format
msgid "non-ISO-standard escape sequence, '\\%c'"
msgstr "非 ISO 标准的转义序列,‘\\%c’"
-#: charset.c:1549
+#: charset.c:1552
#, c-format
msgid "unknown escape sequence: '\\%c'"
msgstr "未知的转义序列:‘\\%c’"
-#: charset.c:1557
+#: charset.c:1560
#, c-format
msgid "unknown escape sequence: '\\%s'"
msgstr "未知的转义序列:‘\\%s’"
-#: charset.c:1565
+#: charset.c:1568
msgid "converting escape sequence to execution character set"
msgstr "将转义序列转换到执行字符集"
-#: charset.c:1705
+#: charset.c:1708
msgid "missing open quote"
msgstr ""
-#: charset.c:1923 charset.c:2002
+#: charset.c:1926 charset.c:2005
msgid "character constant too long for its type"
msgstr "字符常量大小超出其类型"
-#: charset.c:1926
+#: charset.c:1929
msgid "multi-character character constant"
msgstr "多字节字符常量"
-#: charset.c:2042
+#: charset.c:2045
msgid "empty character constant"
msgstr "空的字符常量"
-#: charset.c:2160
+#: charset.c:2163
#, c-format
msgid "failure to convert %s to %s"
msgstr "无法从 %s 转换到 %s"
@@ -242,204 +242,200 @@ msgstr "宏名必须是标识符"
msgid "undefining \"%s\""
msgstr "取消对“%s”的定义"
-#: directives.c:724
+#: directives.c:725
msgid "missing terminating > character"
msgstr "缺少结尾的 > 字符"
-#: directives.c:783
+#: directives.c:784
#, c-format
msgid "#%s expects \"FILENAME\" or <FILENAME>"
msgstr "#%s 需要 \"FILENAME\" 或 <FILENAME>"
-#: directives.c:829
+#: directives.c:830
#, c-format
msgid "empty filename in #%s"
msgstr "#%s 中文件名为空"
-#: directives.c:838
+#: directives.c:839
#, c-format
msgid "#include nested depth %u exceeds maximum of %u (use -fmax-include-depth=DEPTH to increase the maximum)"
msgstr ""
-#: directives.c:883
+#: directives.c:884
msgid "#include_next in primary source file"
msgstr "#include_next 出现在主源文件中"
-#: directives.c:909
+#: directives.c:910
#, c-format
msgid "invalid flag \"%s\" in line directive"
msgstr "line 指示中有无效的标记“%s”"
-#: directives.c:969
+#: directives.c:970
msgid "unexpected end of file after #line"
msgstr "#line 后未预期的文件结束"
-#: directives.c:972
+#: directives.c:973
#, c-format
msgid "\"%s\" after #line is not a positive integer"
msgstr "#line 后的“%s”不是一个正整数"
-#: directives.c:978 directives.c:980
+#: directives.c:979 directives.c:981
msgid "line number out of range"
msgstr "行号超出范围"
-#: directives.c:993 directives.c:1074
+#: directives.c:994 directives.c:1075
#, c-format
msgid "\"%s\" is not a valid filename"
msgstr "“%s”不是一个有效的文件名"
-#: directives.c:1034
+#: directives.c:1035
#, c-format
msgid "\"%s\" after # is not a positive integer"
msgstr "# 后的“%s”不是一个正整数"
-#: directives.c:1101
+#: directives.c:1102
#, c-format
msgid "file \"%s\" linemarker ignored due to incorrect nesting"
msgstr ""
-#: directives.c:1162 directives.c:1164 directives.c:1166 directives.c:1754
+#: directives.c:1180 directives.c:1182 directives.c:1184 directives.c:1772
#, c-format
msgid "%s"
msgstr "%s"
-#: directives.c:1190
+#: directives.c:1208
#, c-format
msgid "invalid #%s directive"
msgstr "无效的 #%s 指示"
-#: directives.c:1253
+#: directives.c:1271
#, c-format
msgid "registering pragmas in namespace \"%s\" with mismatched name expansion"
msgstr "在命名空间“%s”中注册 pragma 时名称扩展不匹配"
-#: directives.c:1262
+#: directives.c:1280
#, c-format
msgid "registering pragma \"%s\" with name expansion and no namespace"
msgstr "pragma “%s”被注册为一个命名扩展,而没有命名空间"
-#: directives.c:1280
+#: directives.c:1298
#, c-format
msgid "registering \"%s\" as both a pragma and a pragma namespace"
msgstr "“%s”既被注册为一个pragma 又被注册为一个 pragma 命名空间"
-#: directives.c:1283
+#: directives.c:1301
#, c-format
msgid "#pragma %s %s is already registered"
msgstr "#pragma %s %s 已经被注册"
-#: directives.c:1286
+#: directives.c:1304
#, c-format
msgid "#pragma %s is already registered"
msgstr "#pragma %s 已经被注册"
-#: directives.c:1316
+#: directives.c:1334
msgid "registering pragma with NULL handler"
msgstr "pragma 注册为被 NULL 处理"
-#: directives.c:1533
+#: directives.c:1551
msgid "#pragma once in main file"
msgstr "#pragma once 出现在主文件中"
-#: directives.c:1556
+#: directives.c:1574
msgid "invalid #pragma push_macro directive"
msgstr "无效的 #pragma push_macro 指示"
-#: directives.c:1613
+#: directives.c:1631
msgid "invalid #pragma pop_macro directive"
msgstr "无效的 #pragma pop_macro 指示"
-#: directives.c:1668
+#: directives.c:1686
msgid "invalid #pragma GCC poison directive"
msgstr "无效的 #pragma GCC poison 指示"
-#: directives.c:1677
+#: directives.c:1695
#, c-format
msgid "poisoning existing macro \"%s\""
msgstr "对已存在的宏“%s”投毒"
-#: directives.c:1696
+#: directives.c:1714
msgid "#pragma system_header ignored outside include file"
msgstr "#pragma system_heade 在包含文件外被忽略"
-#: directives.c:1721
+#: directives.c:1739
#, c-format
msgid "cannot find source file %s"
msgstr "找不到源文件 %s"
-#: directives.c:1725
+#: directives.c:1743
#, c-format
msgid "current file is older than %s"
msgstr "当前文件早于 %s"
-#: directives.c:1749
+#: directives.c:1767
#, fuzzy, c-format
#| msgid "invalid #pragma GCC poison directive"
msgid "invalid \"#pragma GCC %s\" directive"
msgstr "无效的 #pragma GCC poison 指示"
-#: directives.c:1950
+#: directives.c:1968
msgid "_Pragma takes a parenthesized string literal"
msgstr "_Pragma 需要一个括起的字符串字面常量"
-#: directives.c:2033
+#: directives.c:2051
msgid "#else without #if"
msgstr "#else 没有匹配的 #if"
-#: directives.c:2038
+#: directives.c:2056
msgid "#else after #else"
msgstr "#else 出现在 #else 后"
-#: directives.c:2040 directives.c:2073
+#: directives.c:2058 directives.c:2091
msgid "the conditional began here"
msgstr "条件自此开始"
-#: directives.c:2066
+#: directives.c:2084
msgid "#elif without #if"
msgstr "#elif 没有匹配的 #if"
-#: directives.c:2071
+#: directives.c:2089
msgid "#elif after #else"
msgstr "#elif 出现在 #else 后"
-#: directives.c:2102
+#: directives.c:2120
msgid "#endif without #if"
msgstr "#endif 没有匹配的 #if"
-#: directives.c:2178
+#: directives.c:2196
msgid "missing '(' after predicate"
msgstr "谓词后缺少‘(’"
-#: directives.c:2196
+#: directives.c:2214
msgid "missing ')' to complete answer"
msgstr "完整的答案缺少‘)’"
-#: directives.c:2208
+#: directives.c:2226
msgid "predicate's answer is empty"
msgstr "谓词的答案为空"
-#: directives.c:2238
+#: directives.c:2256
msgid "assertion without predicate"
msgstr "断言后没有谓词"
-#: directives.c:2241
+#: directives.c:2259
msgid "predicate must be an identifier"
msgstr "谓词必须是一个标识符"
-#: directives.c:2323
+#: directives.c:2341
#, c-format
msgid "\"%s\" re-asserted"
msgstr "重断言“%s”"
-#: directives.c:2604
+#: directives.c:2659
#, c-format
msgid "unterminated #%s"
msgstr "未终止的 #%s"
-#: directives-only.c:221 lex.c:2879 traditional.c:174
-msgid "unterminated comment"
-msgstr "未结束的注释"
-
#: errors.c:291
#, c-format
msgid "%s: %s"
@@ -449,226 +445,246 @@ msgstr "%s:%s"
msgid "stdout"
msgstr "stdout"
-#: expr.c:626 expr.c:743
+#: expr.c:636 expr.c:753
msgid "fixed-point constants are a GCC extension"
msgstr "定点常量是一个 GCC 扩展"
-#: expr.c:651
+#: expr.c:661
msgid "invalid prefix \"0b\" for floating constant"
msgstr "浮点常量的“0b”前缀无效"
-#: expr.c:664
+#: expr.c:674
#, fuzzy
#| msgid "use of C99 hexadecimal floating constant"
msgid "use of C++17 hexadecimal floating constant"
msgstr "使用 C99 式的 16 进制浮点常量"
-#: expr.c:667
+#: expr.c:677
msgid "use of C99 hexadecimal floating constant"
msgstr "使用 C99 式的 16 进制浮点常量"
-#: expr.c:711
+#: expr.c:721
#, c-format
msgid "invalid suffix \"%.*s\" on floating constant"
msgstr "浮点常量的“%.*s”后缀无效"
-#: expr.c:722 expr.c:789
+#: expr.c:732 expr.c:799
#, c-format
msgid "traditional C rejects the \"%.*s\" suffix"
msgstr "传统 C 不接受“%.*s”后缀"
-#: expr.c:730
+#: expr.c:740
msgid "suffix for double constant is a GCC extension"
msgstr "双精度常量后缀是一个 GCC 扩展"
-#: expr.c:736
+#: expr.c:746
#, c-format
msgid "invalid suffix \"%.*s\" with hexadecimal floating constant"
msgstr "十六进制浮点常量的“%.*s”后缀无效"
-#: expr.c:749 expr.c:753
+#: expr.c:759 expr.c:763
#, fuzzy
#| msgid "decimal float constants are a GCC extension"
msgid "decimal float constants are a C2X feature"
msgstr "十进制浮点常量是一个 GCC 扩展"
-#: expr.c:772
+#: expr.c:782
#, c-format
msgid "invalid suffix \"%.*s\" on integer constant"
msgstr "整数常量的“%.*s”后缀无效"
-#: expr.c:797
+#: expr.c:807
#, fuzzy
#| msgid "use of C++0x long long integer constant"
msgid "use of C++11 long long integer constant"
msgstr "使用 C++0x long long 整数常量"
-#: expr.c:798
+#: expr.c:808
msgid "use of C99 long long integer constant"
msgstr "使用 C99 long long 整数常量"
-#: expr.c:814
+#: expr.c:822
+#, fuzzy
+#| msgid "use of C++0x long long integer constant"
+msgid "use of C++23 %<size_t%> integer constant"
+msgstr "使用 C++0x long long 整数常量"
+
+#: expr.c:823
+#, fuzzy
+#| msgid "use of C++0x long long integer constant"
+msgid "use of C++23 %<make_signed_t<size_t>%> integer constant"
+msgstr "使用 C++0x long long 整数常量"
+
+#: expr.c:834
msgid "imaginary constants are a GCC extension"
msgstr "虚数常量是一个 GCC 扩展"
-#: expr.c:820
+#: expr.c:841
#, fuzzy
#| msgid "binary constants are a GCC extension"
msgid "binary constants are a C++14 feature or GCC extension"
msgstr "二进制常量是一个 GCC 扩展"
-#: expr.c:822
-msgid "binary constants are a GCC extension"
+#: expr.c:843
+#, fuzzy
+#| msgid "binary constants are a GCC extension"
+msgid "binary constants are a C2X feature or GCC extension"
msgstr "二进制常量是一个 GCC 扩展"
-#: expr.c:917
+#: expr.c:848
+#, fuzzy
+#| msgid "binary constants are a GCC extension"
+msgid "binary constants are a C2X feature"
+msgstr "二进制常量是一个 GCC 扩展"
+
+#: expr.c:944
msgid "integer constant is too large for its type"
msgstr "整数常量值超出其类型"
-#: expr.c:948
+#: expr.c:975
msgid "integer constant is so large that it is unsigned"
msgstr "整数常量太大,认定为 unsigned"
-#: expr.c:1043
+#: expr.c:1070
msgid "missing ')' after \"defined\""
msgstr "“defined” 后出现‘)’"
-#: expr.c:1050
+#: expr.c:1077
msgid "operator \"defined\" requires an identifier"
msgstr "操作符“defined”需要一个标识符"
-#: expr.c:1058
+#: expr.c:1085
#, c-format
msgid "(\"%s\" is an alternative token for \"%s\" in C++)"
msgstr "(在 C++ 中“%s”会是“%s”的替代标识符)"
-#: expr.c:1070
+#: expr.c:1098
msgid "this use of \"defined\" may not be portable"
msgstr "使用“defined”可能不利于移植"
-#: expr.c:1113
+#: expr.c:1143
#, fuzzy
#| msgid "integer overflow in preprocessor expression"
msgid "user-defined literal in preprocessor expression"
msgstr "预处理表达式中整数溢出"
-#: expr.c:1118
+#: expr.c:1148
msgid "floating constant in preprocessor expression"
msgstr "浮点常量出现在预处理表达式中"
-#: expr.c:1124
+#: expr.c:1154
msgid "imaginary number in preprocessor expression"
msgstr "预处理表达式中出现虚数"
-#: expr.c:1173
+#: expr.c:1203
#, fuzzy, c-format
#| msgid "\"%s\" is not defined"
msgid "\"%s\" is not defined, evaluates to 0"
msgstr "“%s”未定义"
-#: expr.c:1186
+#: expr.c:1216
msgid "assertions are a GCC extension"
msgstr "断言是一个 GCC 扩展"
-#: expr.c:1189
+#: expr.c:1219
msgid "assertions are a deprecated extension"
msgstr "断言是一个已过时的 GCC 扩展"
-#: expr.c:1435
+#: expr.c:1465
#, c-format
msgid "unbalanced stack in %s"
msgstr "%s 中堆栈不平衡"
-#: expr.c:1455
+#: expr.c:1485
#, c-format
msgid "impossible operator '%u'"
msgstr "不可能的操作‘%u’"
-#: expr.c:1556
+#: expr.c:1586
msgid "missing ')' in expression"
msgstr "表达式中缺少‘)’"
-#: expr.c:1585
+#: expr.c:1615
msgid "'?' without following ':'"
msgstr "‘?’后没有‘:’"
-#: expr.c:1595
+#: expr.c:1625
msgid "integer overflow in preprocessor expression"
msgstr "预处理表达式中整数溢出"
-#: expr.c:1600
+#: expr.c:1630
msgid "missing '(' in expression"
msgstr "表达式中缺少‘(’"
-#: expr.c:1632
+#: expr.c:1662
#, c-format
msgid "the left operand of \"%s\" changes sign when promoted"
msgstr "“%s”的左操作数在提升时变换了符号"
-#: expr.c:1637
+#: expr.c:1667
#, c-format
msgid "the right operand of \"%s\" changes sign when promoted"
msgstr "“%s”的右操作数在提升时变换了符号"
-#: expr.c:1896
+#: expr.c:1926
msgid "traditional C rejects the unary plus operator"
msgstr "传统 C 不接受单目 + 运算符"
-#: expr.c:1994
+#: expr.c:2024
msgid "comma operator in operand of #if"
msgstr "#if 操作数中出现逗号"
-#: expr.c:2130
+#: expr.c:2160
msgid "division by zero in #if"
msgstr "#if 中用零做除数"
-#: files.c:576
+#: files.c:571
msgid "one or more PCH files were found, but they were invalid"
msgstr "找到一个或多个 PCH 文件,但它们是无效的"
-#: files.c:580
+#: files.c:575
msgid "use -Winvalid-pch for more information"
msgstr "使用 -Winvalid-pch 以获得更多信息"
-#: files.c:1004
+#: files.c:1051
#, c-format
msgid "no include path in which to search for %s"
msgstr "没有包含路径可供搜索 %s"
-#: files.c:1439
+#: files.c:1546
msgid "Multiple include guards may be useful for:\n"
msgstr "多个防止重包含可能对其有用:\n"
-#: init.c:598
+#: init.c:614
msgid "cppchar_t must be an unsigned type"
msgstr "cppchar_t 必须是无符号型"
-#: init.c:602
+#: init.c:618
#, c-format
msgid "preprocessor arithmetic has maximum precision of %lu bits; target requires %lu bits"
msgstr "预处理算术的最高精度为 %lu 位;目标需要 %lu 位"
-#: init.c:609
+#: init.c:625
msgid "CPP arithmetic must be at least as precise as a target int"
msgstr "CPP 算术必须至少具有目标 int 的精度"
-#: init.c:612
+#: init.c:628
msgid "target char is less than 8 bits wide"
msgstr "目标 char 短于 8 位"
-#: init.c:616
+#: init.c:632
msgid "target wchar_t is narrower than target char"
msgstr "目录 wchar_t 短于目标 char"
-#: init.c:620
+#: init.c:636
msgid "target int is narrower than target char"
msgstr "目标 int 短于目标 char"
-#: init.c:625
+#: init.c:641
msgid "CPP half-integer narrower than CPP character"
msgstr "CPP 半整数短于 CPP 字符"
-#: init.c:629
+#: init.c:645
#, c-format
msgid "CPP on this host cannot handle wide character constants over %lu bits, but the target requires %lu bits"
msgstr "在此宿主机上,CPP 不能处理长于 %lu 位的宽字符常量,但目标需要 %lu 位"
@@ -715,13 +731,13 @@ msgid "`%.*s' is not in NFC"
msgstr "‘%.*s’不在 NFC 中"
#: lex.c:1375
-msgid "__VA_OPT__ is not available until C++2a"
+msgid "__VA_OPT__ is not available until C++20"
msgstr ""
#: lex.c:1382
#, fuzzy
#| msgid "__VA_ARGS__ can only appear in the expansion of a C99 variadic macro"
-msgid "__VA_OPT__ can only appear in the expansion of a C++2a variadic macro"
+msgid "__VA_OPT__ can only appear in the expansion of a C++20 variadic macro"
msgstr "__VA_ARGS__ 只能出现在 C99 可变参数宏的展开中"
#: lex.c:1413 lex.c:1506
@@ -744,254 +760,279 @@ msgstr "__VA_ARGS__ 只能出现在 C99 可变参数宏的展开中"
msgid "identifier \"%s\" is a special operator name in C++"
msgstr "标识符“%s”是 C++ 中的一个特殊操作符"
-#: lex.c:1837
+#: lex.c:1879
msgid "raw string delimiter longer than 16 characters"
msgstr "原始字符串分隔符长过 16 个字符"
-#: lex.c:1841
+#: lex.c:1883
#, fuzzy
#| msgid "invalid character '%c' in raw string delimiter"
msgid "invalid new-line in raw string delimiter"
msgstr "原始字符串分隔符中有无效字符‘%c’"
-#: lex.c:1845
+#: lex.c:1887 lex.c:4639
#, c-format
msgid "invalid character '%c' in raw string delimiter"
msgstr "原始字符串分隔符中有无效字符‘%c’"
-#: lex.c:1894 lex.c:1916
+#: lex.c:1926 lex.c:1949
msgid "unterminated raw string"
msgstr "未终止的原始字符串"
-#: lex.c:1936 lex.c:2065
+#: lex.c:1971 lex.c:2100
msgid "invalid suffix on literal; C++11 requires a space between literal and string macro"
msgstr ""
-#: lex.c:2048
+#: lex.c:2083
msgid "null character(s) preserved in literal"
msgstr "空字符将保留在字面字符串中"
-#: lex.c:2051
+#: lex.c:2086
#, c-format
msgid "missing terminating %c character"
msgstr "缺少结尾的 %c 字符"
-#: lex.c:2083
+#: lex.c:2118
msgid "C++11 requires a space between string literal and macro"
msgstr ""
-#: lex.c:2893 lex.c:2927
+#: lex.c:2711
+msgid "module control-line cannot be in included file"
+msgstr ""
+
+#: lex.c:2725
+#, c-format
+msgid "module control-line \"%s\" cannot be an object-like macro"
+msgstr ""
+
+#: lex.c:3099 lex.c:4472 traditional.c:174
+msgid "unterminated comment"
+msgstr "未结束的注释"
+
+#: lex.c:3113 lex.c:3147
msgid "C++ style comments are not allowed in ISO C90"
msgstr "C++ 风格的注释在 ISO C90 中不被允许"
-#: lex.c:2895 lex.c:2906 lex.c:2930
+#: lex.c:3115 lex.c:3126 lex.c:3150
msgid "(this will be reported only once per input file)"
msgstr "(此警告为每个输入文件只报告一次)"
-#: lex.c:2904
+#: lex.c:3124
#, fuzzy
#| msgid "C++ style comments are not allowed in ISO C90"
msgid "C++ style comments are incompatible with C90"
msgstr "C++ 风格的注释在 ISO C90 中不被允许"
-#: lex.c:2936
+#: lex.c:3156
msgid "multi-line comment"
msgstr "多行注释"
-#: lex.c:3330
+#: lex.c:3550
#, c-format
msgid "unspellable token %s"
msgstr "无法拼出的标识符 %s"
+#: lex.c:4627
+#, fuzzy, c-format
+#| msgid "raw string delimiter longer than 16 characters"
+msgid "raw string delimiter longer than %d characters"
+msgstr "原始字符串分隔符长过 16 个字符"
+
+#: lex.c:4697
+#, fuzzy
+#| msgid "unterminated #%s"
+msgid "unterminated literal"
+msgstr "未终止的 #%s"
+
#: macro.c:94
#, fuzzy
#| msgid "'##' cannot appear at either end of a macro expansion"
msgid "'##' cannot appear at either end of __VA_OPT__"
msgstr "‘##’不能出现在宏展开的两端"
-#: macro.c:364
+#: macro.c:386
#, fuzzy, c-format
#| msgid "%s in preprocessing directive"
msgid "\"%s\" used outside of preprocessing directive"
msgstr "预处理指示中出现 %s"
-#: macro.c:374
+#: macro.c:396
#, fuzzy, c-format
#| msgid "missing '(' in expression"
msgid "missing '(' before \"%s\" operand"
msgstr "表达式中缺少‘(’"
-#: macro.c:389
+#: macro.c:411
#, fuzzy, c-format
#| msgid "operator \"defined\" requires an identifier"
msgid "operator \"%s\" requires a header-name"
msgstr "操作符“defined”需要一个标识符"
-#: macro.c:406
+#: macro.c:428
#, fuzzy, c-format
#| msgid "missing ')' after \"defined\""
msgid "missing ')' after \"%s\" operand"
msgstr "“defined” 后出现‘)’"
-#: macro.c:426
+#: macro.c:448
#, c-format
msgid "macro \"%s\" is not used"
msgstr "宏“%s”未被使用"
-#: macro.c:465 macro.c:723
+#: macro.c:487 macro.c:778
#, c-format
msgid "invalid built-in macro \"%s\""
msgstr "无效的内建宏“%s”"
-#: macro.c:472 macro.c:574
+#: macro.c:494 macro.c:596
#, c-format
msgid "macro \"%s\" might prevent reproducible builds"
msgstr ""
-#: macro.c:503
+#: macro.c:525
msgid "could not determine file timestamp"
msgstr "无法决定文件的时间戳"
-#: macro.c:620
+#: macro.c:610
msgid "could not determine date and time"
msgstr "无法决定日期与时间"
-#: macro.c:636
+#: macro.c:642
msgid "__COUNTER__ expanded inside directive with -fdirectives-only"
msgstr "带 -fdirectives-only 时 __COUNTER__ 在指示中扩展"
-#: macro.c:842
+#: macro.c:897
msgid "invalid string literal, ignoring final '\\'"
msgstr "无效的字面字符串,忽略最后的‘\\’"
-#: macro.c:904
+#: macro.c:959
#, c-format
msgid "pasting \"%s\" and \"%s\" does not give a valid preprocessing token"
msgstr "毗连“%s”和“%s”不能给出一个有效的预处理标识符"
-#: macro.c:1030
+#: macro.c:1085
msgid "ISO C++11 requires at least one argument for the \"...\" in a variadic macro"
msgstr ""
-#: macro.c:1034
+#: macro.c:1089
#, fuzzy
#| msgid "ISO C99 requires rest arguments to be used"
msgid "ISO C99 requires at least one argument for the \"...\" in a variadic macro"
msgstr "ISO C99 需要使用剩余的参数"
-#: macro.c:1041
+#: macro.c:1096
#, c-format
msgid "macro \"%s\" requires %u arguments, but only %u given"
msgstr "宏“%s”需要 %u 个参数,但只给出了 %u 个"
-#: macro.c:1046
+#: macro.c:1101
#, c-format
msgid "macro \"%s\" passed %u arguments, but takes just %u"
msgstr "宏“%s”传递了 %u 个参数,但只需要 %u 个"
-#: macro.c:1244 traditional.c:815
+#: macro.c:1299 traditional.c:822
#, c-format
msgid "unterminated argument list invoking macro \"%s\""
msgstr "调用宏“%s”时参数列表未终止"
-#: macro.c:1386
+#: macro.c:1442
#, c-format
msgid "function-like macro \"%s\" must be used with arguments in traditional C"
msgstr "类似函数的宏“%s”在传统 C 中必须与参数一起使用"
-#: macro.c:2165
+#: macro.c:2220
#, fuzzy, c-format
#| msgid "invoking macro %s argument %d: empty macro arguments are undefined in ISO C90 and ISO C++98"
msgid "invoking macro %s argument %d: empty macro arguments are undefined in ISO C++98"
msgstr "调用宏 %s 的参数 %d:空的宏参数未被 ISO C90 和 ISO C++98 定义"
-#: macro.c:2173 macro.c:2182
+#: macro.c:2228 macro.c:2237
#, fuzzy, c-format
#| msgid "invoking macro %s argument %d: empty macro arguments are undefined in ISO C90 and ISO C++98"
msgid "invoking macro %s argument %d: empty macro arguments are undefined in ISO C90"
msgstr "调用宏 %s 的参数 %d:空的宏参数未被 ISO C90 和 ISO C++98 定义"
-#: macro.c:3141
+#: macro.c:3279
#, c-format
msgid "duplicate macro parameter \"%s\""
msgstr "重复的宏参数“%s”"
-#: macro.c:3223
+#: macro.c:3361
#, c-format
msgid "expected parameter name, found \"%s\""
msgstr ""
-#: macro.c:3224
+#: macro.c:3362
#, c-format
msgid "expected ',' or ')', found \"%s\""
msgstr ""
-#: macro.c:3225
+#: macro.c:3363
msgid "expected parameter name before end of line"
msgstr ""
-#: macro.c:3226
+#: macro.c:3364
#, fuzzy
#| msgid "unexpected end of file after #line"
msgid "expected ')' before end of line"
msgstr "#line 后未预期的文件结束"
-#: macro.c:3227
+#: macro.c:3365
msgid "expected ')' after \"...\""
msgstr ""
-#: macro.c:3284
+#: macro.c:3422
#, fuzzy
#| msgid "anonymous variadic macros were introduced in C99"
msgid "anonymous variadic macros were introduced in C++11"
msgstr "匿名可变参数宏在 C99 中被引入"
-#: macro.c:3285 macro.c:3289
+#: macro.c:3423 macro.c:3427
msgid "anonymous variadic macros were introduced in C99"
msgstr "匿名可变参数宏在 C99 中被引入"
-#: macro.c:3295
+#: macro.c:3433
#, fuzzy
#| msgid "ISO C does not permit named variadic macros"
msgid "ISO C++ does not permit named variadic macros"
msgstr "ISO C 不允许有名的可变参数宏"
-#: macro.c:3296
+#: macro.c:3434
msgid "ISO C does not permit named variadic macros"
msgstr "ISO C 不允许有名的可变参数宏"
-#: macro.c:3342
+#: macro.c:3480
msgid "'##' cannot appear at either end of a macro expansion"
msgstr "‘##’不能出现在宏展开的两端"
-#: macro.c:3380
+#: macro.c:3518
#, fuzzy
#| msgid "ISO C99 requires whitespace after the macro name"
msgid "ISO C++11 requires whitespace after the macro name"
msgstr "ISO C99 要求宏名后必须有空白"
-#: macro.c:3381
+#: macro.c:3519
msgid "ISO C99 requires whitespace after the macro name"
msgstr "ISO C99 要求宏名后必须有空白"
-#: macro.c:3405
+#: macro.c:3543
msgid "missing whitespace after the macro name"
msgstr "宏名后缺少空白"
-#: macro.c:3455
+#: macro.c:3593
msgid "'#' is not followed by a macro parameter"
msgstr "‘#’后没有宏参数"
-#: macro.c:3606
+#: macro.c:3749
#, c-format
msgid "\"%s\" redefined"
msgstr "“%s”重定义"
-#: macro.c:3611
+#: macro.c:3754
msgid "this is the location of the previous definition"
msgstr "这是先前定义的位置"
-#: macro.c:3715
+#: macro.c:3891
#, c-format
msgid "macro argument \"%s\" would be stringified in traditional C"
msgstr "宏参数“%s”将在传统 C 中被字符串化"
@@ -1029,12 +1070,12 @@ msgstr "%s:未使用因为‘__COUNTER__’无效"
msgid "while reading precompiled header"
msgstr "在读取预编译头时"
-#: traditional.c:884
+#: traditional.c:891
#, c-format
msgid "detected recursion whilst expanding macro \"%s\""
msgstr "展开宏“%s”时检测到递归"
-#: traditional.c:1107
+#: traditional.c:1114
msgid "syntax error in macro parameter list"
msgstr "宏参数列表语法错误"
diff --git a/libcpp/po/zh_TW.po b/libcpp/po/zh_TW.po
index 574a7f1..1800e9d 100644
--- a/libcpp/po/zh_TW.po
+++ b/libcpp/po/zh_TW.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: cpplib 10.1-b20200209\n"
"Report-Msgid-Bugs-To: https://gcc.gnu.org/bugs/\n"
-"POT-Creation-Date: 2020-02-07 22:33+0000\n"
+"POT-Creation-Date: 2021-02-05 21:38+0000\n"
"PO-Revision-Date: 2020-02-11 15:07+0800\n"
"Last-Translator: Yi-Jyun Pan <pan93412@gmail.com>\n"
"Language-Team: Chinese (traditional) <zh-l10n@lists.linux.org.tw>\n"
@@ -21,154 +21,154 @@ msgstr ""
"Plural-Forms: nplurals=1; plural=0;\n"
"X-Generator: Poedit 2.3\n"
-#: charset.c:674
+#: charset.c:677
#, c-format
msgid "conversion from %s to %s not supported by iconv"
msgstr "iconv 不支援從 %s 到 %s 的轉換"
-#: charset.c:677
+#: charset.c:680
msgid "iconv_open"
msgstr "iconv_open"
-#: charset.c:685
+#: charset.c:688
#, c-format
msgid "no iconv implementation, cannot convert from %s to %s"
msgstr "沒有實作 iconv,無法從 %s 轉換到 %s"
-#: charset.c:781
+#: charset.c:784
#, c-format
msgid "character 0x%lx is not in the basic source character set\n"
msgstr "字元 0x%lx 不在基本來源字元集中\n"
-#: charset.c:798 charset.c:1768
+#: charset.c:801 charset.c:1771
msgid "converting to execution character set"
msgstr "轉換到可執行檔案的字元集"
-#: charset.c:804
+#: charset.c:807
#, c-format
msgid "character 0x%lx is not unibyte in execution character set"
msgstr "字元 0x%lx 在執行字元集中不是單位元組的"
-#: charset.c:1054
+#: charset.c:1057
msgid "universal character names are only valid in C++ and C99"
msgstr "萬國碼字元名稱只在 C++ 和 C99 中有效"
-#: charset.c:1058
+#: charset.c:1061
msgid "C99's universal character names are incompatible with C90"
msgstr "C99 的萬國碼字元名稱與 C90 不相容"
-#: charset.c:1061
+#: charset.c:1064
#, c-format
msgid "the meaning of '\\%c' is different in traditional C"
msgstr "「\\%c」的意義與在傳統 C 中不同"
-#: charset.c:1070
+#: charset.c:1073
msgid "In _cpp_valid_ucn but not a UCN"
msgstr "在 _cpp_valid_ucn 中並不是一個 UCN"
-#: charset.c:1103
+#: charset.c:1106
#, c-format
msgid "incomplete universal character name %.*s"
msgstr "不完整的萬國碼字元名稱 %.*s"
-#: charset.c:1118
+#: charset.c:1121
#, c-format
msgid "%.*s is not a valid universal character"
msgstr "%.*s 不是一個有效的萬國碼字元"
-#: charset.c:1128 lex.c:1335
+#: charset.c:1131 lex.c:1335
msgid "'$' in identifier or number"
msgstr "「$」出現在識別字或數字中"
-#: charset.c:1138
+#: charset.c:1141
#, c-format
msgid "universal character %.*s is not valid in an identifier"
msgstr "萬國碼字元 %.*s 在識別字中無效"
-#: charset.c:1142
+#: charset.c:1145
#, c-format
msgid "universal character %.*s is not valid at the start of an identifier"
msgstr "萬國碼字元 %.*s 在識別字開頭無效"
-#: charset.c:1149
+#: charset.c:1152
#, c-format
msgid "%.*s is outside the UCS codespace"
msgstr "%.*s 在 UCS 代碼空間外"
-#: charset.c:1194 charset.c:2113
+#: charset.c:1197 charset.c:2116
msgid "converting UCN to source character set"
msgstr "將 UCN 轉換到來源字元集"
-#: charset.c:1201
+#: charset.c:1204
msgid "converting UCN to execution character set"
msgstr "將 UCN 轉換到執行字元集"
-#: charset.c:1265
+#: charset.c:1268
#, c-format
msgid "extended character %.*s is not valid in an identifier"
msgstr "延伸字元 %.*s 在識別字中無效"
-#: charset.c:1282
+#: charset.c:1285
#, c-format
msgid "extended character %.*s is not valid at the start of an identifier"
msgstr "延伸字元 %.*s 在識別字開頭無效"
-#: charset.c:1368
+#: charset.c:1371
msgid "the meaning of '\\x' is different in traditional C"
msgstr "「\\x」的意義與在傳統 C 中不同"
-#: charset.c:1393
+#: charset.c:1396
msgid "\\x used with no following hex digits"
msgstr "\\x 後沒有十六進位數字"
-#: charset.c:1400
+#: charset.c:1403
msgid "hex escape sequence out of range"
msgstr "十六進位逸出序列越界"
-#: charset.c:1452
+#: charset.c:1455
msgid "octal escape sequence out of range"
msgstr "八進位逸出序列越界"
-#: charset.c:1534
+#: charset.c:1537
msgid "the meaning of '\\a' is different in traditional C"
msgstr "「\\a」的意義與在傳統 C 中不同"
-#: charset.c:1541
+#: charset.c:1544
#, c-format
msgid "non-ISO-standard escape sequence, '\\%c'"
msgstr "非 ISO 標準的逸出序列,「\\%c」"
-#: charset.c:1549
+#: charset.c:1552
#, c-format
msgid "unknown escape sequence: '\\%c'"
msgstr "不明的逸出序列:『\\%c』"
-#: charset.c:1557
+#: charset.c:1560
#, c-format
msgid "unknown escape sequence: '\\%s'"
msgstr "不明的逸出序列:「\\%s」"
-#: charset.c:1565
+#: charset.c:1568
msgid "converting escape sequence to execution character set"
msgstr "將逸出序列轉換到執行字元集"
-#: charset.c:1705
+#: charset.c:1708
msgid "missing open quote"
msgstr "遺失左引號"
-#: charset.c:1923 charset.c:2002
+#: charset.c:1926 charset.c:2005
msgid "character constant too long for its type"
msgstr "字元常數大小超出其類型"
-#: charset.c:1926
+#: charset.c:1929
msgid "multi-character character constant"
msgstr "多位元組字元常數"
-#: charset.c:2042
+#: charset.c:2045
msgid "empty character constant"
msgstr "空的字元常數"
-#: charset.c:2160
+#: charset.c:2163
#, c-format
msgid "failure to convert %s to %s"
msgstr "無法從 %s 轉換到 %s"
@@ -239,203 +239,199 @@ msgstr "巨集名必須是識別字"
msgid "undefining \"%s\""
msgstr "取消對「%s」的定義"
-#: directives.c:724
+#: directives.c:725
msgid "missing terminating > character"
msgstr "缺少結尾的 > 字元"
-#: directives.c:783
+#: directives.c:784
#, c-format
msgid "#%s expects \"FILENAME\" or <FILENAME>"
msgstr "#%s 需要 \"FILENAME\" 或 <FILENAME>"
-#: directives.c:829
+#: directives.c:830
#, c-format
msgid "empty filename in #%s"
msgstr "#%s 中檔案名稱為空"
-#: directives.c:838
+#: directives.c:839
#, c-format
msgid "#include nested depth %u exceeds maximum of %u (use -fmax-include-depth=DEPTH to increase the maximum)"
msgstr "#include 巢狀深度 %u 超過最大值 %u (使用 -fmax-include-depth=深度 增加最大值)"
-#: directives.c:883
+#: directives.c:884
msgid "#include_next in primary source file"
msgstr "#include_next 出現在主來源檔案中"
-#: directives.c:909
+#: directives.c:910
#, c-format
msgid "invalid flag \"%s\" in line directive"
msgstr "line 指令中有無效的標記「%s」"
-#: directives.c:969
+#: directives.c:970
msgid "unexpected end of file after #line"
msgstr "#line 之後未預期的檔案結束"
-#: directives.c:972
+#: directives.c:973
#, c-format
msgid "\"%s\" after #line is not a positive integer"
msgstr "#line 後的「%s」不是一個正整數"
-#: directives.c:978 directives.c:980
+#: directives.c:979 directives.c:981
msgid "line number out of range"
msgstr "列號超出範圍"
-#: directives.c:993 directives.c:1074
+#: directives.c:994 directives.c:1075
#, c-format
msgid "\"%s\" is not a valid filename"
msgstr "「%s」不是一個有效的檔案名稱"
-#: directives.c:1034
+#: directives.c:1035
#, c-format
msgid "\"%s\" after # is not a positive integer"
msgstr "# 後的「%s」不是一個正整數"
-#: directives.c:1101
+#: directives.c:1102
#, c-format
msgid "file \"%s\" linemarker ignored due to incorrect nesting"
msgstr "因為巢狀項目不正確,因此忽略了「%s」檔案的行標記 (linemarker)"
-#: directives.c:1162 directives.c:1164 directives.c:1166 directives.c:1754
+#: directives.c:1180 directives.c:1182 directives.c:1184 directives.c:1772
#, c-format
msgid "%s"
msgstr "%s"
-#: directives.c:1190
+#: directives.c:1208
#, c-format
msgid "invalid #%s directive"
msgstr "無效的 #%s 指令"
-#: directives.c:1253
+#: directives.c:1271
#, c-format
msgid "registering pragmas in namespace \"%s\" with mismatched name expansion"
msgstr "以不匹配的名稱擴展去註冊命名空間「%s」中的編譯指示"
-#: directives.c:1262
+#: directives.c:1280
#, c-format
msgid "registering pragma \"%s\" with name expansion and no namespace"
msgstr "以名稱擴展以及無命名空間去註冊編譯指示「%s」"
-#: directives.c:1280
+#: directives.c:1298
#, c-format
msgid "registering \"%s\" as both a pragma and a pragma namespace"
msgstr "「%s」既被註冊為一個編譯指示又被註冊為一個編譯指示命名空間"
-#: directives.c:1283
+#: directives.c:1301
#, c-format
msgid "#pragma %s %s is already registered"
msgstr "#pragma %s %s 已經被註冊"
-#: directives.c:1286
+#: directives.c:1304
#, c-format
msgid "#pragma %s is already registered"
msgstr "#pragma %s 已經被註冊"
-#: directives.c:1316
+#: directives.c:1334
msgid "registering pragma with NULL handler"
msgstr "以空值處理常式去註冊編譯指示"
-#: directives.c:1533
+#: directives.c:1551
msgid "#pragma once in main file"
msgstr "#pragma 出現在主檔案中一次"
-#: directives.c:1556
+#: directives.c:1574
msgid "invalid #pragma push_macro directive"
msgstr "無效的 #pragma push_macro 指令"
-#: directives.c:1613
+#: directives.c:1631
msgid "invalid #pragma pop_macro directive"
msgstr "無效的 #pragma pop_macro 指令"
-#: directives.c:1668
+#: directives.c:1686
msgid "invalid #pragma GCC poison directive"
msgstr "無效的 #pragma GCC poison 指令"
-#: directives.c:1677
+#: directives.c:1695
#, c-format
msgid "poisoning existing macro \"%s\""
msgstr "對已存在的巨集「%s」加料"
-#: directives.c:1696
+#: directives.c:1714
msgid "#pragma system_header ignored outside include file"
msgstr "#pragma system_header 在包含檔案外被忽略"
-#: directives.c:1721
+#: directives.c:1739
#, c-format
msgid "cannot find source file %s"
msgstr "找不到來源檔案 %s"
-#: directives.c:1725
+#: directives.c:1743
#, c-format
msgid "current file is older than %s"
msgstr "目前檔案早於 %s"
-#: directives.c:1749
+#: directives.c:1767
#, c-format
msgid "invalid \"#pragma GCC %s\" directive"
msgstr "無效的 #pragma GCC %s 指令"
-#: directives.c:1950
+#: directives.c:1968
msgid "_Pragma takes a parenthesized string literal"
msgstr "_Pragma 需要一個括起的字串原文"
-#: directives.c:2033
+#: directives.c:2051
msgid "#else without #if"
msgstr "#else 沒有匹配的 #if"
-#: directives.c:2038
+#: directives.c:2056
msgid "#else after #else"
msgstr "#else 出現在 #else 後"
-#: directives.c:2040 directives.c:2073
+#: directives.c:2058 directives.c:2091
msgid "the conditional began here"
msgstr "條件自此開始"
-#: directives.c:2066
+#: directives.c:2084
msgid "#elif without #if"
msgstr "#elif 沒有匹配的 #if"
-#: directives.c:2071
+#: directives.c:2089
msgid "#elif after #else"
msgstr "#elif 出現在 #else 後"
-#: directives.c:2102
+#: directives.c:2120
msgid "#endif without #if"
msgstr "#endif 沒有匹配的 #if"
-#: directives.c:2178
+#: directives.c:2196
msgid "missing '(' after predicate"
msgstr "述語後缺少「(」"
-#: directives.c:2196
+#: directives.c:2214
msgid "missing ')' to complete answer"
msgstr "完整的答案缺少「)」"
-#: directives.c:2208
+#: directives.c:2226
msgid "predicate's answer is empty"
msgstr "述語的答案為空"
-#: directives.c:2238
+#: directives.c:2256
msgid "assertion without predicate"
msgstr "判定語後沒有述語"
-#: directives.c:2241
+#: directives.c:2259
msgid "predicate must be an identifier"
msgstr "述語必須是一個識別字"
-#: directives.c:2323
+#: directives.c:2341
#, c-format
msgid "\"%s\" re-asserted"
msgstr "已再判定「%s」"
-#: directives.c:2604
+#: directives.c:2659
#, c-format
msgid "unterminated #%s"
msgstr "未終止的 #%s"
-#: directives-only.c:221 lex.c:2879 traditional.c:174
-msgid "unterminated comment"
-msgstr "未終結的註釋"
-
#: errors.c:291
#, c-format
msgid "%s: %s"
@@ -445,215 +441,235 @@ msgstr "%s:%s"
msgid "stdout"
msgstr "stdout"
-#: expr.c:626 expr.c:743
+#: expr.c:636 expr.c:753
msgid "fixed-point constants are a GCC extension"
msgstr "定點常數是一個 GCC 擴充功能"
-#: expr.c:651
+#: expr.c:661
msgid "invalid prefix \"0b\" for floating constant"
msgstr "無效的浮點常數前綴「0b」"
-#: expr.c:664
+#: expr.c:674
msgid "use of C++17 hexadecimal floating constant"
msgstr "使用 C++17 式的十六進位浮點常數"
-#: expr.c:667
+#: expr.c:677
msgid "use of C99 hexadecimal floating constant"
msgstr "使用 C99 式的十六進位浮點常數"
-#: expr.c:711
+#: expr.c:721
#, c-format
msgid "invalid suffix \"%.*s\" on floating constant"
msgstr "浮點常數的「%.*s」字尾無效"
-#: expr.c:722 expr.c:789
+#: expr.c:732 expr.c:799
#, c-format
msgid "traditional C rejects the \"%.*s\" suffix"
msgstr "傳統 C 不接受「%.*s」字尾"
-#: expr.c:730
+#: expr.c:740
msgid "suffix for double constant is a GCC extension"
msgstr "雙倍精度常數字尾是 GCC 的擴充功能"
-#: expr.c:736
+#: expr.c:746
#, c-format
msgid "invalid suffix \"%.*s\" with hexadecimal floating constant"
msgstr "無效的十六進位浮點常數字尾「%.*s」"
-#: expr.c:749 expr.c:753
+#: expr.c:759 expr.c:763
msgid "decimal float constants are a C2X feature"
msgstr "十進位浮點數常數是 C2X 的擴充功能"
-#: expr.c:772
+#: expr.c:782
#, c-format
msgid "invalid suffix \"%.*s\" on integer constant"
msgstr "整數常數的「%.*s」字尾無效"
-#: expr.c:797
+#: expr.c:807
msgid "use of C++11 long long integer constant"
msgstr "使用 C++11 long long 整數常數"
-#: expr.c:798
+#: expr.c:808
msgid "use of C99 long long integer constant"
msgstr "使用 C99 long long 整數常數"
-#: expr.c:814
+#: expr.c:822
+#, fuzzy
+#| msgid "use of C++11 long long integer constant"
+msgid "use of C++23 %<size_t%> integer constant"
+msgstr "使用 C++11 long long 整數常數"
+
+#: expr.c:823
+#, fuzzy
+#| msgid "use of C++11 long long integer constant"
+msgid "use of C++23 %<make_signed_t<size_t>%> integer constant"
+msgstr "使用 C++11 long long 整數常數"
+
+#: expr.c:834
msgid "imaginary constants are a GCC extension"
msgstr "虛數常數是 GCC 的擴充功能"
-#: expr.c:820
+#: expr.c:841
msgid "binary constants are a C++14 feature or GCC extension"
msgstr "二進位常數是 C++14 特色或 GCC 的擴充功能"
-#: expr.c:822
-msgid "binary constants are a GCC extension"
-msgstr "二進位常數是 GCC 的擴充功能"
+#: expr.c:843
+#, fuzzy
+#| msgid "binary constants are a C++14 feature or GCC extension"
+msgid "binary constants are a C2X feature or GCC extension"
+msgstr "二進位常數是 C++14 特色或 GCC 的擴充功能"
+
+#: expr.c:848
+#, fuzzy
+#| msgid "decimal float constants are a C2X feature"
+msgid "binary constants are a C2X feature"
+msgstr "十進位浮點數常數是 C2X 的擴充功能"
-#: expr.c:917
+#: expr.c:944
msgid "integer constant is too large for its type"
msgstr "整數常數值超出其類型"
-#: expr.c:948
+#: expr.c:975
msgid "integer constant is so large that it is unsigned"
msgstr "整數常數太大,認定為 unsigned"
-#: expr.c:1043
+#: expr.c:1070
msgid "missing ')' after \"defined\""
msgstr "「defined」 後缺少「)」"
-#: expr.c:1050
+#: expr.c:1077
msgid "operator \"defined\" requires an identifier"
msgstr "運算子「defined」需要一個識別字"
-#: expr.c:1058
+#: expr.c:1085
#, c-format
msgid "(\"%s\" is an alternative token for \"%s\" in C++)"
msgstr "(在 C++ 中「%s」會是「%s」的替代識別字)"
-#: expr.c:1070
+#: expr.c:1098
msgid "this use of \"defined\" may not be portable"
msgstr "使用「defined」可能不利於移植"
-#: expr.c:1113
+#: expr.c:1143
msgid "user-defined literal in preprocessor expression"
msgstr "在前置處理器運算式中有使用者定義的實字"
-#: expr.c:1118
+#: expr.c:1148
msgid "floating constant in preprocessor expression"
msgstr "浮點常數出現在預先處理運算式中"
-#: expr.c:1124
+#: expr.c:1154
msgid "imaginary number in preprocessor expression"
msgstr "預先處理運算式中出現虛數"
-#: expr.c:1173
+#: expr.c:1203
#, c-format
msgid "\"%s\" is not defined, evaluates to 0"
msgstr "「%s」未定義,判斷值為 0"
-#: expr.c:1186
+#: expr.c:1216
msgid "assertions are a GCC extension"
msgstr "assertions 是 GCC 的擴充功能"
-#: expr.c:1189
+#: expr.c:1219
msgid "assertions are a deprecated extension"
msgstr "assertions 是不宜再用的擴充功能"
-#: expr.c:1435
+#: expr.c:1465
#, c-format
msgid "unbalanced stack in %s"
msgstr "%s 中的堆疊不平衡"
-#: expr.c:1455
+#: expr.c:1485
#, c-format
msgid "impossible operator '%u'"
msgstr "不可能的運算子「%u」"
-#: expr.c:1556
+#: expr.c:1586
msgid "missing ')' in expression"
msgstr "運算式中缺少「)」"
-#: expr.c:1585
+#: expr.c:1615
msgid "'?' without following ':'"
msgstr "「?」後沒有「:」"
-#: expr.c:1595
+#: expr.c:1625
msgid "integer overflow in preprocessor expression"
msgstr "預先處理運算式中整數溢出"
-#: expr.c:1600
+#: expr.c:1630
msgid "missing '(' in expression"
msgstr "運算式中缺少「(」"
-#: expr.c:1632
+#: expr.c:1662
#, c-format
msgid "the left operand of \"%s\" changes sign when promoted"
msgstr "「%s」的左運算元在提升時變換了符號"
-#: expr.c:1637
+#: expr.c:1667
#, c-format
msgid "the right operand of \"%s\" changes sign when promoted"
msgstr "「%s」的右運算元在提升時變換了符號"
-#: expr.c:1896
+#: expr.c:1926
msgid "traditional C rejects the unary plus operator"
msgstr "傳統 C 不接受單元 + 運算子"
-#: expr.c:1994
+#: expr.c:2024
msgid "comma operator in operand of #if"
msgstr "#if 運算元中出現逗號"
-#: expr.c:2130
+#: expr.c:2160
msgid "division by zero in #if"
msgstr "#if 中用零做除數"
-#: files.c:576
+#: files.c:571
msgid "one or more PCH files were found, but they were invalid"
msgstr "找到一個或多個 PCH 檔案,但它們是無效的"
-#: files.c:580
+#: files.c:575
msgid "use -Winvalid-pch for more information"
msgstr "使用 -Winvalid-pch 以獲得更多資訊"
-#: files.c:1004
+#: files.c:1051
#, c-format
msgid "no include path in which to search for %s"
msgstr "沒有包含路徑可供搜尋 %s"
-#: files.c:1439
+#: files.c:1546
msgid "Multiple include guards may be useful for:\n"
msgstr "多個防止重包含可能對其有用:\n"
-#: init.c:598
+#: init.c:614
msgid "cppchar_t must be an unsigned type"
msgstr "cppchar_t 必須是無號類型"
-#: init.c:602
+#: init.c:618
#, c-format
msgid "preprocessor arithmetic has maximum precision of %lu bits; target requires %lu bits"
msgstr "預先處理算術的最高精度為 %lu 位;目標需要 %lu 位"
-#: init.c:609
+#: init.c:625
msgid "CPP arithmetic must be at least as precise as a target int"
msgstr "CPP 算術必須至少具有目標 int 的精度"
-#: init.c:612
+#: init.c:628
msgid "target char is less than 8 bits wide"
msgstr "目標 char 短於 8 位"
-#: init.c:616
+#: init.c:632
msgid "target wchar_t is narrower than target char"
msgstr "目標 wchar_t 短於目標 char"
-#: init.c:620
+#: init.c:636
msgid "target int is narrower than target char"
msgstr "目標 int 短於目標 char"
-#: init.c:625
+#: init.c:641
msgid "CPP half-integer narrower than CPP character"
msgstr "CPP 半整數短於 CPP 字元"
-#: init.c:629
+#: init.c:645
#, c-format
msgid "CPP on this host cannot handle wide character constants over %lu bits, but the target requires %lu bits"
msgstr "在此宿主機上,CPP 不能處理長於 %lu 位的寬字元常數,但目標需要 %lu 位"
@@ -700,11 +716,15 @@ msgid "`%.*s' is not in NFC"
msgstr "「%.*s」不在 NFC 中"
#: lex.c:1375
-msgid "__VA_OPT__ is not available until C++2a"
+#, fuzzy
+#| msgid "__VA_OPT__ is not available until C++2a"
+msgid "__VA_OPT__ is not available until C++20"
msgstr "__VA_OPT__ 在 C++2a 之前皆不支援"
#: lex.c:1382
-msgid "__VA_OPT__ can only appear in the expansion of a C++2a variadic macro"
+#, fuzzy
+#| msgid "__VA_OPT__ can only appear in the expansion of a C++2a variadic macro"
+msgid "__VA_OPT__ can only appear in the expansion of a C++20 variadic macro"
msgstr "__VA_OPT__ 只能出現在 C++2a 可變參數巨集的展開中"
#: lex.c:1413 lex.c:1506
@@ -725,232 +745,257 @@ msgstr "__VA_ARGS__ 只能出現在 C99 可變參數巨集的展開中"
msgid "identifier \"%s\" is a special operator name in C++"
msgstr "識別碼「%s」在 C++ 中是特殊運算子名稱"
-#: lex.c:1837
+#: lex.c:1879
msgid "raw string delimiter longer than 16 characters"
msgstr "原始字串分隔符號長度超過 16 字元"
-#: lex.c:1841
+#: lex.c:1883
msgid "invalid new-line in raw string delimiter"
msgstr "無效的新列字元出現於原始字串分隔符號"
-#: lex.c:1845
+#: lex.c:1887 lex.c:4639
#, c-format
msgid "invalid character '%c' in raw string delimiter"
msgstr "無效字元「%c」出現於原始字串分隔符號"
-#: lex.c:1894 lex.c:1916
+#: lex.c:1926 lex.c:1949
msgid "unterminated raw string"
msgstr "未終結的原始字串"
-#: lex.c:1936 lex.c:2065
+#: lex.c:1971 lex.c:2100
msgid "invalid suffix on literal; C++11 requires a space between literal and string macro"
msgstr "無效的實字後綴;C++11 要求一個空白位於實字和字串巨集之間"
-#: lex.c:2048
+#: lex.c:2083
msgid "null character(s) preserved in literal"
msgstr "空字元將保留在原文中"
-#: lex.c:2051
+#: lex.c:2086
#, c-format
msgid "missing terminating %c character"
msgstr "缺少終止 %c 字元"
-#: lex.c:2083
+#: lex.c:2118
msgid "C++11 requires a space between string literal and macro"
msgstr "C++11 在字串常數和巨集中間需要一個空白"
-#: lex.c:2893 lex.c:2927
+#: lex.c:2711
+msgid "module control-line cannot be in included file"
+msgstr ""
+
+#: lex.c:2725
+#, c-format
+msgid "module control-line \"%s\" cannot be an object-like macro"
+msgstr ""
+
+#: lex.c:3099 lex.c:4472 traditional.c:174
+msgid "unterminated comment"
+msgstr "未終結的註釋"
+
+#: lex.c:3113 lex.c:3147
msgid "C++ style comments are not allowed in ISO C90"
msgstr "C++ 風格的註釋在 ISO C90 中不被允許"
-#: lex.c:2895 lex.c:2906 lex.c:2930
+#: lex.c:3115 lex.c:3126 lex.c:3150
msgid "(this will be reported only once per input file)"
msgstr "(此警告為每個輸入檔案只報告一次)"
-#: lex.c:2904
+#: lex.c:3124
msgid "C++ style comments are incompatible with C90"
msgstr "C++ 風格的註釋與 C90 不相容"
-#: lex.c:2936
+#: lex.c:3156
msgid "multi-line comment"
msgstr "多列註釋"
-#: lex.c:3330
+#: lex.c:3550
#, c-format
msgid "unspellable token %s"
msgstr "無法拼出的識別字 %s"
+#: lex.c:4627
+#, fuzzy, c-format
+#| msgid "raw string delimiter longer than 16 characters"
+msgid "raw string delimiter longer than %d characters"
+msgstr "原始字串分隔符號長度超過 16 字元"
+
+#: lex.c:4697
+#, fuzzy
+#| msgid "unterminated #%s"
+msgid "unterminated literal"
+msgstr "未終止的 #%s"
+
#: macro.c:94
msgid "'##' cannot appear at either end of __VA_OPT__"
msgstr "「##」不能出現在 __VA_OPT__ 的尾端"
-#: macro.c:364
+#: macro.c:386
#, c-format
msgid "\"%s\" used outside of preprocessing directive"
msgstr "「%s」用在預先處理指令外"
-#: macro.c:374
+#: macro.c:396
#, c-format
msgid "missing '(' before \"%s\" operand"
msgstr "「%s」運算元前缺少「(」"
-#: macro.c:389
+#: macro.c:411
#, c-format
msgid "operator \"%s\" requires a header-name"
msgstr "運算子「%s」需要標頭名稱"
-#: macro.c:406
+#: macro.c:428
#, c-format
msgid "missing ')' after \"%s\" operand"
msgstr "「%s」運算元後缺少「)」"
-#: macro.c:426
+#: macro.c:448
#, c-format
msgid "macro \"%s\" is not used"
msgstr "巨集「%s」未被使用"
-#: macro.c:465 macro.c:723
+#: macro.c:487 macro.c:778
#, c-format
msgid "invalid built-in macro \"%s\""
msgstr "無效的內建巨集「%s」"
-#: macro.c:472 macro.c:574
+#: macro.c:494 macro.c:596
#, c-format
msgid "macro \"%s\" might prevent reproducible builds"
msgstr "巨集「%s」也許會阻止可重製的組建"
-#: macro.c:503
+#: macro.c:525
msgid "could not determine file timestamp"
msgstr "無法決定檔案時間戳記"
-#: macro.c:620
+#: macro.c:610
msgid "could not determine date and time"
msgstr "無法決定日期與時間"
-#: macro.c:636
+#: macro.c:642
msgid "__COUNTER__ expanded inside directive with -fdirectives-only"
msgstr "__COUNTER__ 以 -fdirectives-only 在指令內部展開"
-#: macro.c:842
+#: macro.c:897
msgid "invalid string literal, ignoring final '\\'"
msgstr "無效的原文字串,忽略最後的「\\」"
-#: macro.c:904
+#: macro.c:959
#, c-format
msgid "pasting \"%s\" and \"%s\" does not give a valid preprocessing token"
msgstr "粘貼「%s」和「%s」不能給出一個有效的預先處理識別字"
-#: macro.c:1030
+#: macro.c:1085
msgid "ISO C++11 requires at least one argument for the \"...\" in a variadic macro"
msgstr "ISO C++11 需要至少一個引數做為可變巨集中的「...」"
-#: macro.c:1034
+#: macro.c:1089
msgid "ISO C99 requires at least one argument for the \"...\" in a variadic macro"
msgstr "ISO C99 需要至少一個引數做為可變巨集中的「...」"
-#: macro.c:1041
+#: macro.c:1096
#, c-format
msgid "macro \"%s\" requires %u arguments, but only %u given"
msgstr "巨集「%s」需要 %u 個引數,但只給出了 %u 個"
-#: macro.c:1046
+#: macro.c:1101
#, c-format
msgid "macro \"%s\" passed %u arguments, but takes just %u"
msgstr "巨集「%s」傳遞了 %u 個引數,但只需要 %u 個"
-#: macro.c:1244 traditional.c:815
+#: macro.c:1299 traditional.c:822
#, c-format
msgid "unterminated argument list invoking macro \"%s\""
msgstr "呼叫巨集「%s」時引數清單未終止"
-#: macro.c:1386
+#: macro.c:1442
#, c-format
msgid "function-like macro \"%s\" must be used with arguments in traditional C"
msgstr "類似函式的巨集「%s」在傳統 C 中必須與引數一起使用"
-#: macro.c:2165
+#: macro.c:2220
#, c-format
msgid "invoking macro %s argument %d: empty macro arguments are undefined in ISO C++98"
msgstr "調用巨集 %s 引數 %d:空的巨集引數在 ISO C++98 中未定義"
-#: macro.c:2173 macro.c:2182
+#: macro.c:2228 macro.c:2237
#, c-format
msgid "invoking macro %s argument %d: empty macro arguments are undefined in ISO C90"
msgstr "調用巨集 %s 引數 %d:空的巨集引數在 ISO C90 中未定義"
-#: macro.c:3141
+#: macro.c:3279
#, c-format
msgid "duplicate macro parameter \"%s\""
msgstr "重複的巨集參數「%s」"
-#: macro.c:3223
+#: macro.c:3361
#, c-format
msgid "expected parameter name, found \"%s\""
msgstr "原先期望參數名稱,卻找到「%s」"
-#: macro.c:3224
+#: macro.c:3362
#, c-format
msgid "expected ',' or ')', found \"%s\""
msgstr "原先期望「,」或「)」,卻找到「%s」"
-#: macro.c:3225
+#: macro.c:3363
msgid "expected parameter name before end of line"
msgstr "原先期望在行尾前有參數名稱"
-#: macro.c:3226
+#: macro.c:3364
msgid "expected ')' before end of line"
msgstr "原先期望在行尾前有「)」"
-#: macro.c:3227
+#: macro.c:3365
msgid "expected ')' after \"...\""
msgstr "原先期望「...」後有「)」"
-#: macro.c:3284
+#: macro.c:3422
msgid "anonymous variadic macros were introduced in C++11"
msgstr "匿名可變參數巨集在 C++11 中被引入"
-#: macro.c:3285 macro.c:3289
+#: macro.c:3423 macro.c:3427
msgid "anonymous variadic macros were introduced in C99"
msgstr "匿名可變參數巨集在 C99 中被引入"
-#: macro.c:3295
+#: macro.c:3433
msgid "ISO C++ does not permit named variadic macros"
msgstr "ISO C++ 不允許具名的可變參數巨集"
-#: macro.c:3296
+#: macro.c:3434
msgid "ISO C does not permit named variadic macros"
msgstr "ISO C 不允許具名的可變參數巨集"
-#: macro.c:3342
+#: macro.c:3480
msgid "'##' cannot appear at either end of a macro expansion"
msgstr "「##」不能出現在巨集展開的兩端"
-#: macro.c:3380
+#: macro.c:3518
msgid "ISO C++11 requires whitespace after the macro name"
msgstr "ISO C++11 要求巨集名後必須有空白"
-#: macro.c:3381
+#: macro.c:3519
msgid "ISO C99 requires whitespace after the macro name"
msgstr "ISO C99 要求巨集名後必須有空白"
-#: macro.c:3405
+#: macro.c:3543
msgid "missing whitespace after the macro name"
msgstr "巨集名後缺少空白"
-#: macro.c:3455
+#: macro.c:3593
msgid "'#' is not followed by a macro parameter"
msgstr "「#」後沒有巨集參數"
-#: macro.c:3606
+#: macro.c:3749
#, c-format
msgid "\"%s\" redefined"
msgstr "「%s」重定義"
-#: macro.c:3611
+#: macro.c:3754
msgid "this is the location of the previous definition"
msgstr "這是先前定義的位置"
-#: macro.c:3715
+#: macro.c:3891
#, c-format
msgid "macro argument \"%s\" would be stringified in traditional C"
msgstr "巨集引數「%s」將在傳統 C 中被字串化"
@@ -988,15 +1033,18 @@ msgstr "%s:未使用因為『__COUNTER__』無效"
msgid "while reading precompiled header"
msgstr "在讀取預先編譯標頭時"
-#: traditional.c:884
+#: traditional.c:891
#, c-format
msgid "detected recursion whilst expanding macro \"%s\""
msgstr "展開巨集「%s」時偵測到遞迴"
-#: traditional.c:1107
+#: traditional.c:1114
msgid "syntax error in macro parameter list"
msgstr "巨集參數清單語法錯誤"
+#~ msgid "binary constants are a GCC extension"
+#~ msgstr "二進位常數是 GCC 的擴充功能"
+
#~ msgid "\"__has_include__\" cannot be used as a macro name"
#~ msgstr "「__has_include__」不能做為巨集名"
diff --git a/libcpp/symtab.c b/libcpp/symtab.c
index b2f1833..9a2fae0 100644
--- a/libcpp/symtab.c
+++ b/libcpp/symtab.c
@@ -1,5 +1,5 @@
/* Hash tables.
- Copyright (C) 2000-2020 Free Software Foundation, Inc.
+ Copyright (C) 2000-2021 Free Software Foundation, Inc.
This program is free software; you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
diff --git a/libcpp/system.h b/libcpp/system.h
index 0a0629d..ee5fbe2 100644
--- a/libcpp/system.h
+++ b/libcpp/system.h
@@ -1,6 +1,6 @@
/* Get common system includes and various definitions and declarations based
on autoconf macros.
- Copyright (C) 1998-2020 Free Software Foundation, Inc.
+ Copyright (C) 1998-2021 Free Software Foundation, Inc.
This file is part of GCC.
diff --git a/libcpp/traditional.c b/libcpp/traditional.c
index 225e3c2..92d0dd1 100644
--- a/libcpp/traditional.c
+++ b/libcpp/traditional.c
@@ -1,5 +1,5 @@
/* CPP Library - traditional lexical analysis and macro expansion.
- Copyright (C) 2002-2020 Free Software Foundation, Inc.
+ Copyright (C) 2002-2021 Free Software Foundation, Inc.
Contributed by Neil Booth, May 2002
This program is free software; you can redistribute it and/or modify it
diff --git a/libcpp/ucnid.h b/libcpp/ucnid.h
index 153b3d7..e7b0ac2 100644
--- a/libcpp/ucnid.h
+++ b/libcpp/ucnid.h
@@ -1,5 +1,5 @@
/* Unicode characters and various properties.
- Copyright (C) 2003-2020 Free Software Foundation, Inc.
+ Copyright (C) 2003-2021 Free Software Foundation, Inc.
This program is free software; you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
@@ -53,1859 +53,2656 @@
written authorization of the copyright holder. */
static const struct ucnrange ucnranges[] = {
-{ 0| 0| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x00a7 },
-{ 0| 0| 0|C11| 0|CID|NFC| 0| 0, 0, 0x00a8 },
-{ 0| 0| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x00a9 },
-{ C99| 0| 0|C11| 0|CID|NFC| 0| 0, 0, 0x00aa },
-{ 0| 0| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x00ac },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x00ad },
-{ 0| 0| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x00ae },
-{ 0| 0| 0|C11| 0|CID|NFC| 0| 0, 0, 0x00af },
-{ 0| 0| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x00b1 },
-{ 0| 0| 0|C11| 0|CID|NFC| 0| 0, 0, 0x00b4 },
-{ C99| 0| 0|C11| 0|CID|NFC| 0| 0, 0, 0x00b5 },
-{ 0| 0| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x00b6 },
-{ C99| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x00b7 },
-{ 0| 0| 0|C11| 0|CID|NFC| 0| 0, 0, 0x00b9 },
-{ C99| 0| 0|C11| 0|CID|NFC| 0| 0, 0, 0x00ba },
-{ 0| 0| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x00bb },
-{ 0| 0| 0|C11| 0|CID|NFC| 0| 0, 0, 0x00be },
-{ 0| 0| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x00bf },
-{ C99| 0|CXX|C11| 0|CID|NFC|NKC| 0, 0, 0x00d6 },
-{ 0| 0| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x00d7 },
-{ C99| 0|CXX|C11| 0|CID|NFC|NKC| 0, 0, 0x00f6 },
-{ 0| 0| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x00f7 },
-{ C99| 0|CXX|C11| 0|CID|NFC|NKC| 0, 0, 0x0131 },
-{ C99| 0|CXX|C11| 0|CID|NFC| 0| 0, 0, 0x0133 },
-{ C99| 0|CXX|C11| 0|CID|NFC|NKC| 0, 0, 0x013e },
-{ C99| 0|CXX|C11| 0|CID|NFC| 0| 0, 0, 0x0140 },
-{ C99| 0|CXX|C11| 0|CID|NFC|NKC| 0, 0, 0x0148 },
-{ C99| 0|CXX|C11| 0|CID|NFC| 0| 0, 0, 0x0149 },
-{ C99| 0|CXX|C11| 0|CID|NFC|NKC| 0, 0, 0x017e },
-{ C99| 0|CXX|C11| 0|CID|NFC| 0| 0, 0, 0x017f },
-{ C99| 0|CXX|C11| 0|CID|NFC|NKC| 0, 0, 0x01c3 },
-{ C99| 0|CXX|C11| 0|CID|NFC| 0| 0, 0, 0x01cc },
-{ C99| 0|CXX|C11| 0|CID|NFC|NKC| 0, 0, 0x01d4 },
-{ C99| 0|CXX|C11| 0| 0|NFC|NKC| 0, 0, 0x01dc },
-{ C99| 0|CXX|C11| 0|CID|NFC|NKC| 0, 0, 0x01dd },
-{ C99| 0|CXX|C11| 0| 0|NFC|NKC| 0, 0, 0x01e3 },
-{ C99| 0|CXX|C11| 0|CID|NFC|NKC| 0, 0, 0x01eb },
-{ C99| 0|CXX|C11| 0| 0|NFC|NKC| 0, 0, 0x01ef },
-{ C99| 0|CXX|C11| 0|CID|NFC|NKC| 0, 0, 0x01f0 },
-{ C99| 0|CXX|C11| 0|CID|NFC| 0| 0, 0, 0x01f3 },
-{ C99| 0|CXX|C11| 0|CID|NFC|NKC| 0, 0, 0x01f5 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x01f9 },
-{ C99| 0|CXX|C11| 0| 0|NFC|NKC| 0, 0, 0x01ff },
-{ C99| 0|CXX|C11| 0|CID|NFC|NKC| 0, 0, 0x0217 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x0229 },
-{ 0| 0| 0|C11| 0| 0|NFC|NKC| 0, 0, 0x022d },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x022f },
-{ 0| 0| 0|C11| 0| 0|NFC|NKC| 0, 0, 0x0231 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x024f },
-{ C99| 0|CXX|C11| 0|CID|NFC|NKC| 0, 0, 0x02a8 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x02af },
-{ C99| 0| 0|C11| 0|CID|NFC| 0| 0, 0, 0x02b8 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x02ba },
-{ C99| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x02bb },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x02bc },
-{ C99| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x02c1 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x02cf },
-{ C99| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x02d1 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x02d7 },
-{ 0| 0| 0|C11| 0|CID|NFC| 0| 0, 0, 0x02dd },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x02df },
-{ C99| 0| 0|C11| 0|CID|NFC| 0| 0, 0, 0x02e4 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x02ff },
-{ 0| 0| 0|C11|N11|CID|NFC|NKC|CTX, 230, 0x0300 },
-{ 0| 0| 0|C11|N11|CID|NFC|NKC|CTX, 230, 0x0301 },
-{ 0| 0| 0|C11|N11|CID|NFC|NKC|CTX, 230, 0x0302 },
-{ 0| 0| 0|C11|N11|CID|NFC|NKC|CTX, 230, 0x0303 },
-{ 0| 0| 0|C11|N11|CID|NFC|NKC|CTX, 230, 0x0304 },
-{ 0| 0| 0|C11|N11|CID|NFC|NKC| 0, 230, 0x0305 },
-{ 0| 0| 0|C11|N11|CID|NFC|NKC|CTX, 230, 0x0306 },
-{ 0| 0| 0|C11|N11|CID|NFC|NKC|CTX, 230, 0x0307 },
-{ 0| 0| 0|C11|N11|CID|NFC|NKC|CTX, 230, 0x0308 },
-{ 0| 0| 0|C11|N11|CID|NFC|NKC|CTX, 230, 0x0309 },
-{ 0| 0| 0|C11|N11|CID|NFC|NKC|CTX, 230, 0x030a },
-{ 0| 0| 0|C11|N11|CID|NFC|NKC|CTX, 230, 0x030b },
-{ 0| 0| 0|C11|N11|CID|NFC|NKC|CTX, 230, 0x030c },
-{ 0| 0| 0|C11|N11|CID|NFC|NKC| 0, 230, 0x030d },
-{ 0| 0| 0|C11|N11|CID|NFC|NKC| 0, 230, 0x030e },
-{ 0| 0| 0|C11|N11|CID|NFC|NKC|CTX, 230, 0x030f },
-{ 0| 0| 0|C11|N11|CID|NFC|NKC| 0, 230, 0x0310 },
-{ 0| 0| 0|C11|N11|CID|NFC|NKC|CTX, 230, 0x0311 },
-{ 0| 0| 0|C11|N11|CID|NFC|NKC| 0, 230, 0x0312 },
-{ 0| 0| 0|C11|N11|CID|NFC|NKC|CTX, 230, 0x0313 },
-{ 0| 0| 0|C11|N11|CID|NFC|NKC|CTX, 230, 0x0314 },
-{ 0| 0| 0|C11|N11|CID|NFC|NKC| 0, 232, 0x0315 },
-{ 0| 0| 0|C11|N11|CID|NFC|NKC| 0, 220, 0x0316 },
-{ 0| 0| 0|C11|N11|CID|NFC|NKC| 0, 220, 0x0317 },
-{ 0| 0| 0|C11|N11|CID|NFC|NKC| 0, 220, 0x0318 },
-{ 0| 0| 0|C11|N11|CID|NFC|NKC| 0, 220, 0x0319 },
-{ 0| 0| 0|C11|N11|CID|NFC|NKC| 0, 232, 0x031a },
-{ 0| 0| 0|C11|N11|CID|NFC|NKC|CTX, 216, 0x031b },
-{ 0| 0| 0|C11|N11|CID|NFC|NKC| 0, 220, 0x031c },
-{ 0| 0| 0|C11|N11|CID|NFC|NKC| 0, 220, 0x031d },
-{ 0| 0| 0|C11|N11|CID|NFC|NKC| 0, 220, 0x031e },
-{ 0| 0| 0|C11|N11|CID|NFC|NKC| 0, 220, 0x031f },
-{ 0| 0| 0|C11|N11|CID|NFC|NKC| 0, 220, 0x0320 },
-{ 0| 0| 0|C11|N11|CID|NFC|NKC| 0, 202, 0x0321 },
-{ 0| 0| 0|C11|N11|CID|NFC|NKC| 0, 202, 0x0322 },
-{ 0| 0| 0|C11|N11|CID|NFC|NKC|CTX, 220, 0x0323 },
-{ 0| 0| 0|C11|N11|CID|NFC|NKC|CTX, 220, 0x0324 },
-{ 0| 0| 0|C11|N11|CID|NFC|NKC|CTX, 220, 0x0325 },
-{ 0| 0| 0|C11|N11|CID|NFC|NKC|CTX, 220, 0x0326 },
-{ 0| 0| 0|C11|N11|CID|NFC|NKC|CTX, 202, 0x0327 },
-{ 0| 0| 0|C11|N11|CID|NFC|NKC|CTX, 202, 0x0328 },
-{ 0| 0| 0|C11|N11|CID|NFC|NKC| 0, 220, 0x0329 },
-{ 0| 0| 0|C11|N11|CID|NFC|NKC| 0, 220, 0x032a },
-{ 0| 0| 0|C11|N11|CID|NFC|NKC| 0, 220, 0x032b },
-{ 0| 0| 0|C11|N11|CID|NFC|NKC| 0, 220, 0x032c },
-{ 0| 0| 0|C11|N11|CID|NFC|NKC|CTX, 220, 0x032d },
-{ 0| 0| 0|C11|N11|CID|NFC|NKC|CTX, 220, 0x032e },
-{ 0| 0| 0|C11|N11|CID|NFC|NKC| 0, 220, 0x032f },
-{ 0| 0| 0|C11|N11|CID|NFC|NKC|CTX, 220, 0x0330 },
-{ 0| 0| 0|C11|N11|CID|NFC|NKC|CTX, 220, 0x0331 },
-{ 0| 0| 0|C11|N11|CID|NFC|NKC| 0, 220, 0x0332 },
-{ 0| 0| 0|C11|N11|CID|NFC|NKC| 0, 220, 0x0333 },
-{ 0| 0| 0|C11|N11|CID|NFC|NKC| 0, 1, 0x0334 },
-{ 0| 0| 0|C11|N11|CID|NFC|NKC| 0, 1, 0x0335 },
-{ 0| 0| 0|C11|N11|CID|NFC|NKC| 0, 1, 0x0336 },
-{ 0| 0| 0|C11|N11|CID|NFC|NKC| 0, 1, 0x0337 },
-{ 0| 0| 0|C11|N11|CID|NFC|NKC|CTX, 1, 0x0338 },
-{ 0| 0| 0|C11|N11|CID|NFC|NKC| 0, 220, 0x0339 },
-{ 0| 0| 0|C11|N11|CID|NFC|NKC| 0, 220, 0x033a },
-{ 0| 0| 0|C11|N11|CID|NFC|NKC| 0, 220, 0x033b },
-{ 0| 0| 0|C11|N11|CID|NFC|NKC| 0, 220, 0x033c },
-{ 0| 0| 0|C11|N11|CID|NFC|NKC| 0, 230, 0x033d },
-{ 0| 0| 0|C11|N11|CID|NFC|NKC| 0, 230, 0x033e },
-{ 0| 0| 0|C11|N11|CID|NFC|NKC| 0, 230, 0x033f },
-{ 0| 0| 0|C11|N11| 0| 0| 0| 0, 230, 0x0340 },
-{ 0| 0| 0|C11|N11| 0| 0| 0| 0, 230, 0x0341 },
-{ 0| 0| 0|C11|N11|CID|NFC|NKC|CTX, 230, 0x0342 },
-{ 0| 0| 0|C11|N11| 0| 0| 0| 0, 230, 0x0343 },
-{ 0| 0| 0|C11|N11| 0| 0| 0| 0, 230, 0x0344 },
-{ 0| 0| 0|C11|N11|CID|NFC|NKC|CTX, 240, 0x0345 },
-{ 0| 0| 0|C11|N11|CID|NFC|NKC| 0, 230, 0x0346 },
-{ 0| 0| 0|C11|N11|CID|NFC|NKC| 0, 220, 0x0347 },
-{ 0| 0| 0|C11|N11|CID|NFC|NKC| 0, 220, 0x0348 },
-{ 0| 0| 0|C11|N11|CID|NFC|NKC| 0, 220, 0x0349 },
-{ 0| 0| 0|C11|N11|CID|NFC|NKC| 0, 230, 0x034a },
-{ 0| 0| 0|C11|N11|CID|NFC|NKC| 0, 230, 0x034b },
-{ 0| 0| 0|C11|N11|CID|NFC|NKC| 0, 230, 0x034c },
-{ 0| 0| 0|C11|N11|CID|NFC|NKC| 0, 220, 0x034d },
-{ 0| 0| 0|C11|N11|CID|NFC|NKC| 0, 0, 0x034f },
-{ 0| 0| 0|C11|N11|CID|NFC|NKC| 0, 230, 0x0350 },
-{ 0| 0| 0|C11|N11|CID|NFC|NKC| 0, 230, 0x0351 },
-{ 0| 0| 0|C11|N11|CID|NFC|NKC| 0, 230, 0x0352 },
-{ 0| 0| 0|C11|N11|CID|NFC|NKC| 0, 220, 0x0353 },
-{ 0| 0| 0|C11|N11|CID|NFC|NKC| 0, 220, 0x0354 },
-{ 0| 0| 0|C11|N11|CID|NFC|NKC| 0, 220, 0x0355 },
-{ 0| 0| 0|C11|N11|CID|NFC|NKC| 0, 220, 0x0356 },
-{ 0| 0| 0|C11|N11|CID|NFC|NKC| 0, 230, 0x0357 },
-{ 0| 0| 0|C11|N11|CID|NFC|NKC| 0, 232, 0x0358 },
-{ 0| 0| 0|C11|N11|CID|NFC|NKC| 0, 220, 0x0359 },
-{ 0| 0| 0|C11|N11|CID|NFC|NKC| 0, 220, 0x035a },
-{ 0| 0| 0|C11|N11|CID|NFC|NKC| 0, 230, 0x035b },
-{ 0| 0| 0|C11|N11|CID|NFC|NKC| 0, 233, 0x035c },
-{ 0| 0| 0|C11|N11|CID|NFC|NKC| 0, 234, 0x035d },
-{ 0| 0| 0|C11|N11|CID|NFC|NKC| 0, 234, 0x035e },
-{ 0| 0| 0|C11|N11|CID|NFC|NKC| 0, 233, 0x035f },
-{ 0| 0| 0|C11|N11|CID|NFC|NKC| 0, 234, 0x0360 },
-{ 0| 0| 0|C11|N11|CID|NFC|NKC| 0, 234, 0x0361 },
-{ 0| 0| 0|C11|N11|CID|NFC|NKC| 0, 233, 0x0362 },
-{ 0| 0| 0|C11|N11|CID|NFC|NKC| 0, 230, 0x0363 },
-{ 0| 0| 0|C11|N11|CID|NFC|NKC| 0, 230, 0x0364 },
-{ 0| 0| 0|C11|N11|CID|NFC|NKC| 0, 230, 0x0365 },
-{ 0| 0| 0|C11|N11|CID|NFC|NKC| 0, 230, 0x0366 },
-{ 0| 0| 0|C11|N11|CID|NFC|NKC| 0, 230, 0x0367 },
-{ 0| 0| 0|C11|N11|CID|NFC|NKC| 0, 230, 0x0368 },
-{ 0| 0| 0|C11|N11|CID|NFC|NKC| 0, 230, 0x0369 },
-{ 0| 0| 0|C11|N11|CID|NFC|NKC| 0, 230, 0x036a },
-{ 0| 0| 0|C11|N11|CID|NFC|NKC| 0, 230, 0x036b },
-{ 0| 0| 0|C11|N11|CID|NFC|NKC| 0, 230, 0x036c },
-{ 0| 0| 0|C11|N11|CID|NFC|NKC| 0, 230, 0x036d },
-{ 0| 0| 0|C11|N11|CID|NFC|NKC| 0, 230, 0x036e },
-{ 0| 0| 0|C11|N11|CID|NFC|NKC| 0, 230, 0x036f },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x0373 },
-{ 0| 0| 0|C11| 0| 0| 0| 0| 0, 0, 0x0374 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x0379 },
-{ C99| 0| 0|C11| 0|CID|NFC| 0| 0, 0, 0x037a },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x037d },
-{ 0| 0| 0|C11| 0|CID| 0| 0| 0, 0, 0x037e },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x0383 },
-{ 0| 0|CXX|C11| 0|CID|NFC| 0| 0, 0, 0x0384 },
-{ 0| 0| 0|C11| 0| 0|NFC| 0| 0, 0, 0x0385 },
-{ C99| 0| 0|C11| 0| 0|NFC|NKC| 0, 0, 0x0386 },
-{ 0| 0| 0|C11| 0| 0| 0| 0| 0, 0, 0x0387 },
-{ C99| 0|CXX|C11| 0| 0|NFC|NKC| 0, 0, 0x038a },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x038b },
-{ C99| 0|CXX|C11| 0| 0|NFC|NKC| 0, 0, 0x038c },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x038d },
-{ C99| 0|CXX|C11| 0| 0|NFC|NKC| 0, 0, 0x0390 },
-{ C99| 0|CXX|C11| 0|CID|NFC|NKC| 0, 0, 0x03a1 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x03a2 },
-{ C99| 0|CXX|C11| 0|CID|NFC|NKC| 0, 0, 0x03a9 },
-{ C99| 0|CXX|C11| 0| 0|NFC|NKC| 0, 0, 0x03b0 },
-{ C99| 0|CXX|C11| 0|CID|NFC|NKC| 0, 0, 0x03c9 },
-{ C99| 0|CXX|C11| 0| 0|NFC|NKC| 0, 0, 0x03ce },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x03cf },
-{ C99| 0|CXX|C11| 0|CID|NFC| 0| 0, 0, 0x03d2 },
-{ C99| 0|CXX|C11| 0| 0|NFC| 0| 0, 0, 0x03d4 },
-{ C99| 0|CXX|C11| 0|CID|NFC| 0| 0, 0, 0x03d6 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x03d9 },
-{ C99| 0|CXX|C11| 0|CID|NFC|NKC| 0, 0, 0x03da },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x03db },
-{ C99| 0|CXX|C11| 0|CID|NFC|NKC| 0, 0, 0x03dc },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x03dd },
-{ C99| 0|CXX|C11| 0|CID|NFC|NKC| 0, 0, 0x03de },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x03df },
-{ C99| 0|CXX|C11| 0|CID|NFC|NKC| 0, 0, 0x03e0 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x03e1 },
-{ C99| 0|CXX|C11| 0|CID|NFC|NKC| 0, 0, 0x03ef },
-{ C99| 0|CXX|C11| 0|CID|NFC| 0| 0, 0, 0x03f2 },
-{ C99| 0|CXX|C11| 0|CID|NFC|NKC| 0, 0, 0x03f3 },
-{ 0| 0| 0|C11| 0|CID|NFC| 0| 0, 0, 0x03f5 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x03f8 },
-{ 0| 0| 0|C11| 0|CID|NFC| 0| 0, 0, 0x03f9 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x03ff },
-{ 0| 0| 0|C11| 0| 0|NFC|NKC| 0, 0, 0x0400 },
-{ C99| 0|CXX|C11| 0| 0|NFC|NKC| 0, 0, 0x0401 },
-{ C99| 0|CXX|C11| 0|CID|NFC|NKC| 0, 0, 0x0402 },
-{ C99| 0|CXX|C11| 0| 0|NFC|NKC| 0, 0, 0x0403 },
-{ C99| 0|CXX|C11| 0|CID|NFC|NKC| 0, 0, 0x0406 },
-{ C99| 0|CXX|C11| 0| 0|NFC|NKC| 0, 0, 0x0407 },
-{ C99| 0|CXX|C11| 0|CID|NFC|NKC| 0, 0, 0x040b },
-{ C99| 0|CXX|C11| 0| 0|NFC|NKC| 0, 0, 0x040c },
-{ 0| 0|CXX|C11| 0| 0|NFC|NKC| 0, 0, 0x040d },
-{ C99| 0| 0|C11| 0| 0|NFC|NKC| 0, 0, 0x040e },
-{ C99| 0|CXX|C11| 0|CID|NFC|NKC| 0, 0, 0x0418 },
-{ C99| 0|CXX|C11| 0| 0|NFC|NKC| 0, 0, 0x0419 },
-{ C99| 0|CXX|C11| 0|CID|NFC|NKC| 0, 0, 0x0438 },
-{ C99| 0|CXX|C11| 0| 0|NFC|NKC| 0, 0, 0x0439 },
-{ C99| 0|CXX|C11| 0|CID|NFC|NKC| 0, 0, 0x044f },
-{ 0| 0| 0|C11| 0| 0|NFC|NKC| 0, 0, 0x0450 },
-{ C99| 0|CXX|C11| 0| 0|NFC|NKC| 0, 0, 0x0451 },
-{ C99| 0|CXX|C11| 0|CID|NFC|NKC| 0, 0, 0x0452 },
-{ C99| 0|CXX|C11| 0| 0|NFC|NKC| 0, 0, 0x0453 },
-{ C99| 0|CXX|C11| 0|CID|NFC|NKC| 0, 0, 0x0456 },
-{ C99| 0|CXX|C11| 0| 0|NFC|NKC| 0, 0, 0x0457 },
-{ C99| 0|CXX|C11| 0|CID|NFC|NKC| 0, 0, 0x045b },
-{ C99| 0|CXX|C11| 0| 0|NFC|NKC| 0, 0, 0x045c },
-{ 0| 0| 0|C11| 0| 0|NFC|NKC| 0, 0, 0x045d },
-{ C99| 0|CXX|C11| 0| 0|NFC|NKC| 0, 0, 0x045e },
-{ C99| 0|CXX|C11| 0|CID|NFC|NKC| 0, 0, 0x0475 },
-{ C99| 0|CXX|C11| 0| 0|NFC|NKC| 0, 0, 0x0477 },
-{ C99| 0|CXX|C11| 0|CID|NFC|NKC| 0, 0, 0x0481 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x0482 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 230, 0x0483 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 230, 0x0484 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 230, 0x0485 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 230, 0x0486 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x048f },
-{ C99| 0|CXX|C11| 0|CID|NFC|NKC| 0, 0, 0x04c0 },
-{ C99| 0|CXX|C11| 0| 0|NFC|NKC| 0, 0, 0x04c2 },
-{ C99| 0|CXX|C11| 0|CID|NFC|NKC| 0, 0, 0x04c4 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x04c6 },
-{ C99| 0|CXX|C11| 0|CID|NFC|NKC| 0, 0, 0x04c8 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x04ca },
-{ C99| 0|CXX|C11| 0|CID|NFC|NKC| 0, 0, 0x04cc },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x04cf },
-{ C99| 0|CXX|C11| 0| 0|NFC|NKC| 0, 0, 0x04d3 },
-{ C99| 0|CXX|C11| 0|CID|NFC|NKC| 0, 0, 0x04d5 },
-{ C99| 0|CXX|C11| 0| 0|NFC|NKC| 0, 0, 0x04d7 },
-{ C99| 0|CXX|C11| 0|CID|NFC|NKC| 0, 0, 0x04d9 },
-{ C99| 0|CXX|C11| 0| 0|NFC|NKC| 0, 0, 0x04df },
-{ C99| 0|CXX|C11| 0|CID|NFC|NKC| 0, 0, 0x04e1 },
-{ C99| 0|CXX|C11| 0| 0|NFC|NKC| 0, 0, 0x04e7 },
-{ C99| 0|CXX|C11| 0|CID|NFC|NKC| 0, 0, 0x04e9 },
-{ C99| 0|CXX|C11| 0| 0|NFC|NKC| 0, 0, 0x04eb },
-{ 0| 0| 0|C11| 0| 0|NFC|NKC| 0, 0, 0x04ed },
-{ C99| 0|CXX|C11| 0| 0|NFC|NKC| 0, 0, 0x04f5 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x04f7 },
-{ C99| 0|CXX|C11| 0| 0|NFC|NKC| 0, 0, 0x04f9 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x0530 },
-{ C99| 0|CXX|C11| 0|CID|NFC|NKC| 0, 0, 0x0556 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x0558 },
-{ C99| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x0559 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x0560 },
-{ C99| 0|CXX|C11| 0|CID|NFC|NKC| 0, 0, 0x0586 },
-{ C99| 0|CXX|C11| 0|CID|NFC| 0| 0, 0, 0x0587 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x0590 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 220, 0x0591 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 230, 0x0592 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 230, 0x0593 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 230, 0x0594 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 230, 0x0595 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 220, 0x0596 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 230, 0x0597 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 230, 0x0598 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 230, 0x0599 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 222, 0x059a },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 220, 0x059b },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 230, 0x059c },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 230, 0x059d },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 230, 0x059e },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 230, 0x059f },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 230, 0x05a0 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 230, 0x05a1 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 220, 0x05a2 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 220, 0x05a3 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 220, 0x05a4 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 220, 0x05a5 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 220, 0x05a6 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 220, 0x05a7 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 230, 0x05a8 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 230, 0x05a9 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 220, 0x05aa },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 230, 0x05ab },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 230, 0x05ac },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 222, 0x05ad },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 228, 0x05ae },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 230, 0x05af },
-{ C99| 0| 0|C11| 0|CID|NFC|NKC| 0, 10, 0x05b0 },
-{ C99| 0| 0|C11| 0|CID|NFC|NKC| 0, 11, 0x05b1 },
-{ C99| 0| 0|C11| 0|CID|NFC|NKC| 0, 12, 0x05b2 },
-{ C99| 0| 0|C11| 0|CID|NFC|NKC| 0, 13, 0x05b3 },
-{ C99| 0| 0|C11| 0|CID|NFC|NKC| 0, 14, 0x05b4 },
-{ C99| 0| 0|C11| 0|CID|NFC|NKC| 0, 15, 0x05b5 },
-{ C99| 0| 0|C11| 0|CID|NFC|NKC| 0, 16, 0x05b6 },
-{ C99| 0| 0|C11| 0|CID|NFC|NKC| 0, 17, 0x05b7 },
-{ C99| 0| 0|C11| 0|CID|NFC|NKC| 0, 18, 0x05b8 },
-{ C99| 0| 0|C11| 0|CID|NFC|NKC| 0, 19, 0x05b9 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 19, 0x05ba },
-{ C99| 0| 0|C11| 0|CID|NFC|NKC| 0, 20, 0x05bb },
-{ C99| 0| 0|C11| 0|CID|NFC|NKC| 0, 21, 0x05bc },
-{ C99| 0| 0|C11| 0|CID|NFC|NKC| 0, 22, 0x05bd },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x05be },
-{ C99| 0| 0|C11| 0|CID|NFC|NKC| 0, 23, 0x05bf },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x05c0 },
-{ C99| 0| 0|C11| 0|CID|NFC|NKC| 0, 24, 0x05c1 },
-{ C99| 0| 0|C11| 0|CID|NFC|NKC| 0, 25, 0x05c2 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x05c3 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 230, 0x05c4 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x05c6 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x05cf },
-{ C99| 0|CXX|C11| 0|CID|NFC|NKC| 0, 0, 0x05ea },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x05ef },
-{ C99| 0|CXX|C11| 0|CID|NFC|NKC| 0, 0, 0x05f2 },
-{ 0| 0|CXX|C11| 0|CID|NFC|NKC| 0, 0, 0x05f4 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x060f },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 230, 0x0610 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 230, 0x0611 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 230, 0x0612 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 230, 0x0613 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 230, 0x0614 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 230, 0x0615 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 230, 0x0616 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 230, 0x0617 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 30, 0x0618 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 31, 0x0619 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x0620 },
-{ C99| 0|CXX|C11| 0|CID|NFC|NKC| 0, 0, 0x0621 },
-{ C99| 0|CXX|C11| 0| 0|NFC|NKC| 0, 0, 0x0626 },
-{ C99| 0|CXX|C11| 0|CID|NFC|NKC| 0, 0, 0x063a },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x063f },
-{ C99| 0|CXX|C11| 0|CID|NFC|NKC| 0, 0, 0x064a },
-{ C99| 0|CXX|C11| 0|CID|NFC|NKC| 0, 27, 0x064b },
-{ C99| 0|CXX|C11| 0|CID|NFC|NKC| 0, 28, 0x064c },
-{ C99| 0|CXX|C11| 0|CID|NFC|NKC| 0, 29, 0x064d },
-{ C99| 0|CXX|C11| 0|CID|NFC|NKC| 0, 30, 0x064e },
-{ C99| 0|CXX|C11| 0|CID|NFC|NKC| 0, 31, 0x064f },
-{ C99| 0|CXX|C11| 0|CID|NFC|NKC| 0, 32, 0x0650 },
-{ C99| 0|CXX|C11| 0|CID|NFC|NKC| 0, 33, 0x0651 },
-{ C99| 0|CXX|C11| 0|CID|NFC|NKC| 0, 34, 0x0652 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC|CTX, 230, 0x0653 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC|CTX, 230, 0x0654 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC|CTX, 220, 0x0655 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 220, 0x0656 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 230, 0x0657 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 230, 0x0658 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 230, 0x0659 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 230, 0x065a },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 230, 0x065b },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 220, 0x065c },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 230, 0x065d },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 230, 0x065e },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 220, 0x065f },
-{ C99|N99| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x0669 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x066f },
-{ C99| 0|CXX|C11| 0|CID|NFC|NKC| 0, 0, 0x0674 },
-{ C99| 0|CXX|C11| 0|CID|NFC| 0| 0, 0, 0x0678 },
-{ C99| 0|CXX|C11| 0|CID|NFC|NKC| 0, 0, 0x06b7 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x06b9 },
-{ C99| 0|CXX|C11| 0|CID|NFC|NKC| 0, 0, 0x06be },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x06bf },
-{ C99| 0|CXX|C11| 0| 0|NFC|NKC| 0, 0, 0x06c0 },
-{ C99| 0|CXX|C11| 0|CID|NFC|NKC| 0, 0, 0x06c1 },
-{ C99| 0|CXX|C11| 0| 0|NFC|NKC| 0, 0, 0x06c2 },
-{ C99| 0|CXX|C11| 0|CID|NFC|NKC| 0, 0, 0x06ce },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x06cf },
-{ C99| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x06d2 },
-{ C99| 0| 0|C11| 0| 0|NFC|NKC| 0, 0, 0x06d3 },
-{ C99| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x06d5 },
-{ C99| 0| 0|C11| 0|CID|NFC|NKC| 0, 230, 0x06d6 },
-{ C99| 0| 0|C11| 0|CID|NFC|NKC| 0, 230, 0x06d7 },
-{ C99| 0| 0|C11| 0|CID|NFC|NKC| 0, 230, 0x06d8 },
-{ C99| 0| 0|C11| 0|CID|NFC|NKC| 0, 230, 0x06d9 },
-{ C99| 0| 0|C11| 0|CID|NFC|NKC| 0, 230, 0x06da },
-{ C99| 0| 0|C11| 0|CID|NFC|NKC| 0, 230, 0x06db },
-{ C99| 0| 0|C11| 0|CID|NFC|NKC| 0, 230, 0x06dc },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x06de },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 230, 0x06df },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 230, 0x06e0 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 230, 0x06e1 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 230, 0x06e2 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 220, 0x06e3 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 230, 0x06e4 },
-{ C99| 0|CXX|C11| 0|CID|NFC|NKC| 0, 0, 0x06e6 },
-{ C99| 0|CXX|C11| 0|CID|NFC|NKC| 0, 230, 0x06e7 },
-{ C99| 0| 0|C11| 0|CID|NFC|NKC| 0, 230, 0x06e8 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x06e9 },
-{ C99| 0| 0|C11| 0|CID|NFC|NKC| 0, 220, 0x06ea },
-{ C99| 0| 0|C11| 0|CID|NFC|NKC| 0, 230, 0x06eb },
-{ C99| 0| 0|C11| 0|CID|NFC|NKC| 0, 230, 0x06ec },
-{ C99| 0| 0|C11| 0|CID|NFC|NKC| 0, 220, 0x06ed },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x06ef },
-{ C99|N99| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x06f9 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x0710 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x072f },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 230, 0x0730 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 220, 0x0731 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 230, 0x0732 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 230, 0x0733 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 220, 0x0734 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 230, 0x0735 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 230, 0x0736 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 220, 0x0737 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 220, 0x0738 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 220, 0x0739 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 230, 0x073a },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 220, 0x073b },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 220, 0x073c },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 230, 0x073d },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 220, 0x073e },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 230, 0x073f },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 230, 0x0740 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 230, 0x0741 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 220, 0x0742 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 230, 0x0743 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 220, 0x0744 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 230, 0x0745 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 220, 0x0746 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 230, 0x0747 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 220, 0x0748 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 230, 0x0749 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x07ea },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 230, 0x07eb },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 230, 0x07ec },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 230, 0x07ed },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 230, 0x07ee },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 230, 0x07ef },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 230, 0x07f0 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 230, 0x07f1 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 220, 0x07f2 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x0815 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 230, 0x0816 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 230, 0x0817 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 230, 0x0818 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x081a },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 230, 0x081b },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 230, 0x081c },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 230, 0x081d },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 230, 0x081e },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 230, 0x081f },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 230, 0x0820 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 230, 0x0821 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 230, 0x0822 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x0824 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 230, 0x0825 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 230, 0x0826 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x0828 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 230, 0x0829 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 230, 0x082a },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 230, 0x082b },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 230, 0x082c },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x0858 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 220, 0x0859 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 220, 0x085a },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x08e3 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 230, 0x08e4 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 230, 0x08e5 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 220, 0x08e6 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 230, 0x08e7 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 230, 0x08e8 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 220, 0x08e9 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 230, 0x08ea },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 230, 0x08eb },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 230, 0x08ec },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 220, 0x08ed },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 220, 0x08ee },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 220, 0x08ef },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 27, 0x08f0 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 28, 0x08f1 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 29, 0x08f2 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 230, 0x08f3 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 230, 0x08f4 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 230, 0x08f5 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 220, 0x08f6 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 230, 0x08f7 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 230, 0x08f8 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 220, 0x08f9 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 220, 0x08fa },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 230, 0x08fb },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 230, 0x08fc },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 230, 0x08fd },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x0900 },
-{ C99| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x0903 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x0904 },
-{ C99| 0|CXX|C11| 0|CID|NFC|NKC| 0, 0, 0x0928 },
-{ C99| 0|CXX|C11| 0| 0|NFC|NKC| 0, 0, 0x0929 },
-{ C99| 0|CXX|C11| 0|CID|NFC|NKC| 0, 0, 0x0930 },
-{ C99| 0|CXX|C11| 0| 0|NFC|NKC| 0, 0, 0x0931 },
-{ C99| 0|CXX|C11| 0|CID|NFC|NKC| 0, 0, 0x0933 },
-{ C99| 0|CXX|C11| 0| 0|NFC|NKC| 0, 0, 0x0934 },
-{ C99| 0|CXX|C11| 0|CID|NFC|NKC| 0, 0, 0x0939 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x093b },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC|CTX, 7, 0x093c },
-{ C99| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x094c },
-{ C99| 0| 0|C11| 0|CID|NFC|NKC| 0, 9, 0x094d },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x094f },
-{ C99| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x0950 },
-{ C99| 0| 0|C11| 0|CID|NFC|NKC| 0, 230, 0x0951 },
-{ C99| 0| 0|C11| 0|CID|NFC|NKC| 0, 220, 0x0952 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 230, 0x0953 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x0957 },
-{ C99| 0|CXX|C11| 0| 0| 0| 0| 0, 0, 0x095f },
-{ C99| 0|CXX|C11| 0|CID|NFC|NKC| 0, 0, 0x0962 },
-{ C99| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x0963 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x0965 },
-{ C99|N99| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x096f },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x0980 },
-{ C99| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x0983 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x0984 },
-{ C99| 0|CXX|C11| 0|CID|NFC|NKC| 0, 0, 0x098c },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x098e },
-{ C99| 0|CXX|C11| 0|CID|NFC|NKC| 0, 0, 0x0990 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x0992 },
-{ C99| 0|CXX|C11| 0|CID|NFC|NKC| 0, 0, 0x09a8 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x09a9 },
-{ C99| 0|CXX|C11| 0|CID|NFC|NKC| 0, 0, 0x09b0 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x09b1 },
-{ C99| 0|CXX|C11| 0|CID|NFC|NKC| 0, 0, 0x09b2 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x09b5 },
-{ C99| 0|CXX|C11| 0|CID|NFC|NKC| 0, 0, 0x09b9 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x09bb },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x09bd },
-{ C99| 0| 0|C11| 0|CID|NFC|NKC|CTX, 0, 0x09be },
-{ C99| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x09c4 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x09c6 },
-{ C99| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x09c8 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x09ca },
-{ C99| 0| 0|C11| 0| 0|NFC|NKC| 0, 0, 0x09cc },
-{ C99| 0| 0|C11| 0|CID|NFC|NKC| 0, 9, 0x09cd },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x09d6 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC|CTX, 0, 0x09d7 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x09db },
-{ C99| 0|CXX|C11| 0| 0| 0| 0| 0, 0, 0x09dd },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x09de },
-{ C99| 0|CXX|C11| 0| 0| 0| 0| 0, 0, 0x09df },
-{ C99| 0|CXX|C11| 0|CID|NFC|NKC| 0, 0, 0x09e1 },
-{ C99| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x09e3 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x09e5 },
-{ C99|N99| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x09ef },
-{ C99| 0|CXX|C11| 0|CID|NFC|NKC| 0, 0, 0x09f1 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x0a01 },
-{ C99| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x0a02 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x0a04 },
-{ C99| 0|CXX|C11| 0|CID|NFC|NKC| 0, 0, 0x0a0a },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x0a0e },
-{ C99| 0|CXX|C11| 0|CID|NFC|NKC| 0, 0, 0x0a10 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x0a12 },
-{ C99| 0|CXX|C11| 0|CID|NFC|NKC| 0, 0, 0x0a28 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x0a29 },
-{ C99| 0|CXX|C11| 0|CID|NFC|NKC| 0, 0, 0x0a30 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x0a31 },
-{ C99| 0|CXX|C11| 0|CID|NFC|NKC| 0, 0, 0x0a32 },
-{ C99| 0|CXX|C11| 0| 0| 0| 0| 0, 0, 0x0a33 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x0a34 },
-{ C99| 0|CXX|C11| 0|CID|NFC|NKC| 0, 0, 0x0a35 },
-{ C99| 0|CXX|C11| 0| 0| 0| 0| 0, 0, 0x0a36 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x0a37 },
-{ C99| 0|CXX|C11| 0|CID|NFC|NKC| 0, 0, 0x0a39 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x0a3b },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x0a3d },
-{ C99| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x0a42 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x0a46 },
-{ C99| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x0a48 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x0a4a },
-{ C99| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x0a4c },
-{ C99| 0| 0|C11| 0|CID|NFC|NKC| 0, 9, 0x0a4d },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x0a58 },
-{ C99| 0|CXX|C11| 0| 0| 0| 0| 0, 0, 0x0a5b },
-{ C99| 0|CXX|C11| 0|CID|NFC|NKC| 0, 0, 0x0a5c },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x0a5d },
-{ C99| 0|CXX|C11| 0| 0| 0| 0| 0, 0, 0x0a5e },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x0a65 },
-{ C99|N99| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x0a6f },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x0a73 },
-{ C99| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x0a74 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x0a80 },
-{ C99| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x0a83 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x0a84 },
-{ C99| 0|CXX|C11| 0|CID|NFC|NKC| 0, 0, 0x0a8b },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x0a8c },
-{ C99| 0|CXX|C11| 0|CID|NFC|NKC| 0, 0, 0x0a8d },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x0a8e },
-{ C99| 0|CXX|C11| 0|CID|NFC|NKC| 0, 0, 0x0a91 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x0a92 },
-{ C99| 0|CXX|C11| 0|CID|NFC|NKC| 0, 0, 0x0aa8 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x0aa9 },
-{ C99| 0|CXX|C11| 0|CID|NFC|NKC| 0, 0, 0x0ab0 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x0ab1 },
-{ C99| 0|CXX|C11| 0|CID|NFC|NKC| 0, 0, 0x0ab3 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x0ab4 },
-{ C99| 0|CXX|C11| 0|CID|NFC|NKC| 0, 0, 0x0ab9 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x0abb },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 7, 0x0abc },
-{ C99| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x0ac5 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x0ac6 },
-{ C99| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x0ac9 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x0aca },
-{ C99| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x0acc },
-{ C99| 0| 0|C11| 0|CID|NFC|NKC| 0, 9, 0x0acd },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x0acf },
-{ C99| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x0ad0 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x0adf },
-{ C99| 0|CXX|C11| 0|CID|NFC|NKC| 0, 0, 0x0ae0 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x0ae5 },
-{ C99|N99| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x0aef },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x0b00 },
-{ C99| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x0b03 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x0b04 },
-{ C99| 0|CXX|C11| 0|CID|NFC|NKC| 0, 0, 0x0b0c },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x0b0e },
-{ C99| 0|CXX|C11| 0|CID|NFC|NKC| 0, 0, 0x0b10 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x0b12 },
-{ C99| 0|CXX|C11| 0|CID|NFC|NKC| 0, 0, 0x0b28 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x0b29 },
-{ C99| 0|CXX|C11| 0|CID|NFC|NKC| 0, 0, 0x0b30 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x0b31 },
-{ C99| 0|CXX|C11| 0|CID|NFC|NKC| 0, 0, 0x0b33 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x0b35 },
-{ C99| 0|CXX|C11| 0|CID|NFC|NKC| 0, 0, 0x0b39 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x0b3b },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 7, 0x0b3c },
-{ C99| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x0b3d },
-{ C99| 0| 0|C11| 0|CID|NFC|NKC|CTX, 0, 0x0b3e },
-{ C99| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x0b43 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x0b46 },
-{ C99| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x0b47 },
-{ C99| 0| 0|C11| 0| 0|NFC|NKC| 0, 0, 0x0b48 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x0b4a },
-{ C99| 0| 0|C11| 0| 0|NFC|NKC| 0, 0, 0x0b4c },
-{ C99| 0| 0|C11| 0|CID|NFC|NKC| 0, 9, 0x0b4d },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x0b55 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC|CTX, 0, 0x0b57 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x0b5b },
-{ C99| 0|CXX|C11| 0| 0| 0| 0| 0, 0, 0x0b5d },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x0b5e },
-{ C99| 0|CXX|C11| 0|CID|NFC|NKC| 0, 0, 0x0b61 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x0b65 },
-{ C99|N99| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x0b6f },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x0b81 },
-{ C99| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x0b83 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x0b84 },
-{ C99| 0|CXX|C11| 0|CID|NFC|NKC| 0, 0, 0x0b8a },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x0b8d },
-{ C99| 0|CXX|C11| 0|CID|NFC|NKC| 0, 0, 0x0b90 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x0b91 },
-{ C99| 0|CXX|C11| 0|CID|NFC|NKC| 0, 0, 0x0b93 },
-{ C99| 0|CXX|C11| 0| 0|NFC|NKC| 0, 0, 0x0b94 },
-{ C99| 0|CXX|C11| 0|CID|NFC|NKC| 0, 0, 0x0b95 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x0b98 },
-{ C99| 0|CXX|C11| 0|CID|NFC|NKC| 0, 0, 0x0b9a },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x0b9b },
-{ C99| 0|CXX|C11| 0|CID|NFC|NKC| 0, 0, 0x0b9c },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x0b9d },
-{ C99| 0|CXX|C11| 0|CID|NFC|NKC| 0, 0, 0x0b9f },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x0ba2 },
-{ C99| 0|CXX|C11| 0|CID|NFC|NKC| 0, 0, 0x0ba4 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x0ba7 },
-{ C99| 0|CXX|C11| 0|CID|NFC|NKC| 0, 0, 0x0baa },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x0bad },
-{ C99| 0|CXX|C11| 0|CID|NFC|NKC| 0, 0, 0x0bb5 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x0bb6 },
-{ C99| 0|CXX|C11| 0|CID|NFC|NKC| 0, 0, 0x0bb9 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x0bbd },
-{ C99| 0| 0|C11| 0|CID|NFC|NKC|CTX, 0, 0x0bbe },
-{ C99| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x0bc2 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x0bc5 },
-{ C99| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x0bc8 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x0bc9 },
-{ C99| 0| 0|C11| 0| 0|NFC|NKC| 0, 0, 0x0bcc },
-{ C99| 0| 0|C11| 0|CID|NFC|NKC| 0, 9, 0x0bcd },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x0bd6 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC|CTX, 0, 0x0bd7 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x0be6 },
-{ C99|N99| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x0bef },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x0c00 },
-{ C99| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x0c03 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x0c04 },
-{ C99| 0|CXX|C11| 0|CID|NFC|NKC| 0, 0, 0x0c0c },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x0c0d },
-{ C99| 0|CXX|C11| 0|CID|NFC|NKC| 0, 0, 0x0c10 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x0c11 },
-{ C99| 0|CXX|C11| 0|CID|NFC|NKC| 0, 0, 0x0c28 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x0c29 },
-{ C99| 0|CXX|C11| 0|CID|NFC|NKC| 0, 0, 0x0c33 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x0c34 },
-{ C99| 0|CXX|C11| 0|CID|NFC|NKC| 0, 0, 0x0c39 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x0c3d },
-{ C99| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x0c44 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x0c45 },
-{ C99| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x0c47 },
-{ C99| 0| 0|C11| 0| 0|NFC|NKC| 0, 0, 0x0c48 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x0c49 },
-{ C99| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x0c4c },
-{ C99| 0| 0|C11| 0|CID|NFC|NKC| 0, 9, 0x0c4d },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x0c54 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 84, 0x0c55 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC|CTX, 91, 0x0c56 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x0c5f },
-{ C99| 0|CXX|C11| 0|CID|NFC|NKC| 0, 0, 0x0c61 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x0c65 },
-{ C99|N99| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x0c6f },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x0c81 },
-{ C99| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x0c83 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x0c84 },
-{ C99| 0|CXX|C11| 0|CID|NFC|NKC| 0, 0, 0x0c8c },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x0c8d },
-{ C99| 0|CXX|C11| 0|CID|NFC|NKC| 0, 0, 0x0c90 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x0c91 },
-{ C99| 0|CXX|C11| 0|CID|NFC|NKC| 0, 0, 0x0ca8 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x0ca9 },
-{ C99| 0|CXX|C11| 0|CID|NFC|NKC| 0, 0, 0x0cb3 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x0cb4 },
-{ C99| 0|CXX|C11| 0|CID|NFC|NKC| 0, 0, 0x0cb9 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x0cbb },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x0cbd },
-{ C99| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x0cbf },
-{ C99| 0| 0|C11| 0| 0|NFC|NKC| 0, 0, 0x0cc0 },
-{ C99| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x0cc1 },
-{ C99| 0| 0|C11| 0|CID|NFC|NKC|CTX, 0, 0x0cc2 },
-{ C99| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x0cc4 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x0cc5 },
-{ C99| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x0cc6 },
-{ C99| 0| 0|C11| 0| 0|NFC|NKC| 0, 0, 0x0cc8 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x0cc9 },
-{ C99| 0| 0|C11| 0| 0|NFC|NKC| 0, 0, 0x0ccb },
-{ C99| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x0ccc },
-{ C99| 0| 0|C11| 0|CID|NFC|NKC| 0, 9, 0x0ccd },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x0cd4 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC|CTX, 0, 0x0cd6 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x0cdd },
-{ C99| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x0cde },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x0cdf },
-{ C99| 0|CXX|C11| 0|CID|NFC|NKC| 0, 0, 0x0ce1 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x0ce5 },
-{ C99|N99| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x0cef },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x0d01 },
-{ C99| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x0d03 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x0d04 },
-{ C99| 0|CXX|C11| 0|CID|NFC|NKC| 0, 0, 0x0d0c },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x0d0d },
-{ C99| 0|CXX|C11| 0|CID|NFC|NKC| 0, 0, 0x0d10 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x0d11 },
-{ C99| 0|CXX|C11| 0|CID|NFC|NKC| 0, 0, 0x0d28 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x0d29 },
-{ C99| 0|CXX|C11| 0|CID|NFC|NKC| 0, 0, 0x0d39 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x0d3d },
-{ C99| 0| 0|C11| 0|CID|NFC|NKC|CTX, 0, 0x0d3e },
-{ C99| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x0d43 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x0d45 },
-{ C99| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x0d48 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x0d49 },
-{ C99| 0| 0|C11| 0| 0|NFC|NKC| 0, 0, 0x0d4c },
-{ C99| 0| 0|C11| 0|CID|NFC|NKC| 0, 9, 0x0d4d },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x0d56 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC|CTX, 0, 0x0d57 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x0d5f },
-{ C99| 0|CXX|C11| 0|CID|NFC|NKC| 0, 0, 0x0d61 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x0d65 },
-{ C99|N99| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x0d6f },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x0dc9 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC|CTX, 9, 0x0dca },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x0dce },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC|CTX, 0, 0x0dcf },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x0dd9 },
-{ 0| 0| 0|C11| 0| 0|NFC|NKC| 0, 0, 0x0dda },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x0ddb },
-{ 0| 0| 0|C11| 0| 0|NFC|NKC| 0, 0, 0x0dde },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC|CTX, 0, 0x0ddf },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x0e00 },
-{ C99| 0|CXX|C11| 0|CID|NFC|NKC| 0, 0, 0x0e30 },
-{ C99| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x0e31 },
-{ C99| 0|CXX|C11| 0|CID|NFC|NKC| 0, 0, 0x0e32 },
-{ C99| 0|CXX|C11| 0|CID|NFC| 0| 0, 0, 0x0e33 },
-{ C99| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x0e37 },
-{ C99| 0| 0|C11| 0|CID|NFC|NKC| 0, 103, 0x0e38 },
-{ C99| 0| 0|C11| 0|CID|NFC|NKC| 0, 103, 0x0e39 },
-{ C99| 0| 0|C11| 0|CID|NFC|NKC| 0, 9, 0x0e3a },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x0e3f },
-{ C99| 0|CXX|C11| 0|CID|NFC|NKC| 0, 0, 0x0e46 },
-{ C99| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x0e47 },
-{ C99| 0| 0|C11| 0|CID|NFC|NKC| 0, 107, 0x0e48 },
-{ C99| 0| 0|C11| 0|CID|NFC|NKC| 0, 107, 0x0e49 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 107, 0x0e4a },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x0e4e },
-{ 0| 0|CXX|C11| 0|CID|NFC|NKC| 0, 0, 0x0e4f },
-{ C99|N99|CXX|C11| 0|CID|NFC|NKC| 0, 0, 0x0e59 },
-{ C99| 0|CXX|C11| 0|CID|NFC|NKC| 0, 0, 0x0e5b },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x0e80 },
-{ C99| 0|CXX|C11| 0|CID|NFC|NKC| 0, 0, 0x0e82 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x0e83 },
-{ C99| 0|CXX|C11| 0|CID|NFC|NKC| 0, 0, 0x0e84 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x0e86 },
-{ C99| 0|CXX|C11| 0|CID|NFC|NKC| 0, 0, 0x0e88 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x0e89 },
-{ C99| 0|CXX|C11| 0|CID|NFC|NKC| 0, 0, 0x0e8a },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x0e8c },
-{ C99| 0|CXX|C11| 0|CID|NFC|NKC| 0, 0, 0x0e8d },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x0e93 },
-{ C99| 0|CXX|C11| 0|CID|NFC|NKC| 0, 0, 0x0e97 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x0e98 },
-{ C99| 0|CXX|C11| 0|CID|NFC|NKC| 0, 0, 0x0e9f },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x0ea0 },
-{ C99| 0|CXX|C11| 0|CID|NFC|NKC| 0, 0, 0x0ea3 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x0ea4 },
-{ C99| 0|CXX|C11| 0|CID|NFC|NKC| 0, 0, 0x0ea5 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x0ea6 },
-{ C99| 0|CXX|C11| 0|CID|NFC|NKC| 0, 0, 0x0ea7 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x0ea9 },
-{ C99| 0|CXX|C11| 0|CID|NFC|NKC| 0, 0, 0x0eab },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x0eac },
-{ C99| 0|CXX|C11| 0|CID|NFC|NKC| 0, 0, 0x0eae },
-{ 0| 0|CXX|C11| 0|CID|NFC|NKC| 0, 0, 0x0eaf },
-{ C99| 0|CXX|C11| 0|CID|NFC|NKC| 0, 0, 0x0eb0 },
-{ C99| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x0eb1 },
-{ C99| 0|CXX|C11| 0|CID|NFC|NKC| 0, 0, 0x0eb2 },
-{ C99| 0|CXX|C11| 0|CID|NFC| 0| 0, 0, 0x0eb3 },
-{ C99| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x0eb7 },
-{ C99| 0| 0|C11| 0|CID|NFC|NKC| 0, 118, 0x0eb8 },
-{ C99| 0| 0|C11| 0|CID|NFC|NKC| 0, 118, 0x0eb9 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x0eba },
-{ C99| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x0ebc },
-{ C99| 0|CXX|C11| 0|CID|NFC|NKC| 0, 0, 0x0ebd },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x0ebf },
-{ C99| 0|CXX|C11| 0|CID|NFC|NKC| 0, 0, 0x0ec4 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x0ec5 },
-{ C99| 0|CXX|C11| 0|CID|NFC|NKC| 0, 0, 0x0ec6 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x0ec7 },
-{ C99| 0| 0|C11| 0|CID|NFC|NKC| 0, 122, 0x0ec8 },
-{ C99| 0| 0|C11| 0|CID|NFC|NKC| 0, 122, 0x0ec9 },
-{ C99| 0| 0|C11| 0|CID|NFC|NKC| 0, 122, 0x0eca },
-{ C99| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x0ecd },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x0ecf },
-{ C99|N99| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x0ed9 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x0edb },
-{ C99| 0| 0|C11| 0|CID|NFC| 0| 0, 0, 0x0edd },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x0eff },
-{ C99| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x0f00 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x0f0b },
-{ 0| 0| 0|C11| 0|CID|NFC| 0| 0, 0, 0x0f0c },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x0f17 },
-{ C99| 0| 0|C11| 0|CID|NFC|NKC| 0, 220, 0x0f18 },
-{ C99| 0| 0|C11| 0|CID|NFC|NKC| 0, 220, 0x0f19 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x0f1f },
-{ C99|N99| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x0f33 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x0f34 },
-{ C99| 0| 0|C11| 0|CID|NFC|NKC| 0, 220, 0x0f35 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x0f36 },
-{ C99| 0| 0|C11| 0|CID|NFC|NKC| 0, 220, 0x0f37 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x0f38 },
-{ C99| 0| 0|C11| 0|CID|NFC|NKC| 0, 216, 0x0f39 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x0f3d },
-{ C99| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x0f42 },
-{ C99| 0| 0|C11| 0| 0| 0| 0| 0, 0, 0x0f43 },
-{ C99| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x0f47 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x0f48 },
-{ C99| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x0f4c },
-{ C99| 0| 0|C11| 0| 0| 0| 0| 0, 0, 0x0f4d },
-{ C99| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x0f51 },
-{ C99| 0| 0|C11| 0| 0| 0| 0| 0, 0, 0x0f52 },
-{ C99| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x0f56 },
-{ C99| 0| 0|C11| 0| 0| 0| 0| 0, 0, 0x0f57 },
-{ C99| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x0f5b },
-{ C99| 0| 0|C11| 0| 0| 0| 0| 0, 0, 0x0f5c },
-{ C99| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x0f68 },
-{ C99| 0| 0|C11| 0| 0| 0| 0| 0, 0, 0x0f69 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x0f70 },
-{ C99| 0| 0|C11| 0|CID|NFC|NKC| 0, 129, 0x0f71 },
-{ C99| 0| 0|C11| 0|CID|NFC|NKC| 0, 130, 0x0f72 },
-{ C99| 0| 0|C11| 0| 0| 0| 0| 0, 0, 0x0f73 },
-{ C99| 0| 0|C11| 0|CID|NFC|NKC| 0, 132, 0x0f74 },
-{ C99| 0| 0|C11| 0| 0| 0| 0| 0, 0, 0x0f76 },
-{ C99| 0| 0|C11| 0|CID|NFC| 0| 0, 0, 0x0f77 },
-{ C99| 0| 0|C11| 0| 0| 0| 0| 0, 0, 0x0f78 },
-{ C99| 0| 0|C11| 0|CID|NFC| 0| 0, 0, 0x0f79 },
-{ C99| 0| 0|C11| 0|CID|NFC|NKC| 0, 130, 0x0f7a },
-{ C99| 0| 0|C11| 0|CID|NFC|NKC| 0, 130, 0x0f7b },
-{ C99| 0| 0|C11| 0|CID|NFC|NKC| 0, 130, 0x0f7c },
-{ C99| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x0f7f },
-{ C99| 0| 0|C11| 0|CID|NFC|NKC| 0, 130, 0x0f80 },
-{ C99| 0| 0|C11| 0| 0| 0| 0| 0, 0, 0x0f81 },
-{ C99| 0| 0|C11| 0|CID|NFC|NKC| 0, 230, 0x0f82 },
-{ C99| 0| 0|C11| 0|CID|NFC|NKC| 0, 230, 0x0f83 },
-{ C99| 0| 0|C11| 0|CID|NFC|NKC| 0, 9, 0x0f84 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x0f85 },
-{ C99| 0| 0|C11| 0|CID|NFC|NKC| 0, 230, 0x0f86 },
-{ C99| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x0f8b },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x0f8f },
-{ C99| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x0f92 },
-{ C99| 0| 0|C11| 0| 0| 0| 0| 0, 0, 0x0f93 },
-{ C99| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x0f95 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x0f96 },
-{ C99| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x0f97 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x0f98 },
-{ C99| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x0f9c },
-{ C99| 0| 0|C11| 0| 0| 0| 0| 0, 0, 0x0f9d },
-{ C99| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x0fa1 },
-{ C99| 0| 0|C11| 0| 0| 0| 0| 0, 0, 0x0fa2 },
-{ C99| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x0fa6 },
-{ C99| 0| 0|C11| 0| 0| 0| 0| 0, 0, 0x0fa7 },
-{ C99| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x0fab },
-{ C99| 0| 0|C11| 0| 0| 0| 0| 0, 0, 0x0fac },
-{ C99| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x0fad },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x0fb0 },
-{ C99| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x0fb7 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x0fb8 },
-{ C99| 0| 0|C11| 0| 0| 0| 0| 0, 0, 0x0fb9 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x0fc5 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x1025 },
-{ 0| 0| 0|C11| 0| 0|NFC|NKC| 0, 0, 0x1026 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x102d },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC|CTX, 0, 0x102e },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x1036 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x1038 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 9, 0x1039 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x108c },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x109f },
-{ C99| 0|CXX|C11| 0|CID|NFC|NKC| 0, 0, 0x10c5 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x10cf },
-{ C99| 0|CXX|C11| 0|CID|NFC|NKC| 0, 0, 0x10f6 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x10fb },
-{ 0| 0| 0|C11| 0|CID|NFC| 0| 0, 0, 0x10fc },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x10ff },
-{ 0| 0|CXX|C11| 0|CID|NFC|NKC| 0, 0, 0x1159 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x1160 },
-{ 0| 0|CXX|C11| 0|CID|NFC|NKC|CTX, 0, 0x1175 },
-{ 0| 0|CXX|C11| 0|CID|NFC|NKC| 0, 0, 0x11a2 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x11a7 },
-{ 0| 0|CXX|C11| 0|CID|NFC|NKC|CTX, 0, 0x11c2 },
-{ 0| 0|CXX|C11| 0|CID|NFC|NKC| 0, 0, 0x11f9 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x135c },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 230, 0x135d },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 230, 0x135e },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x167f },
-{ 0| 0| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x1680 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x1713 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x1733 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x17d1 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x17dc },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x180d },
-{ 0| 0| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x180e },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x18a8 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x1938 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 222, 0x1939 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 230, 0x193a },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x1a16 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 230, 0x1a17 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x1a5f },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x1a74 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 230, 0x1a75 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 230, 0x1a76 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 230, 0x1a77 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 230, 0x1a78 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 230, 0x1a79 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 230, 0x1a7a },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 230, 0x1a7b },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x1a7e },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x1b05 },
-{ 0| 0| 0|C11| 0| 0|NFC|NKC| 0, 0, 0x1b06 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x1b07 },
-{ 0| 0| 0|C11| 0| 0|NFC|NKC| 0, 0, 0x1b08 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x1b09 },
-{ 0| 0| 0|C11| 0| 0|NFC|NKC| 0, 0, 0x1b0a },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x1b0b },
-{ 0| 0| 0|C11| 0| 0|NFC|NKC| 0, 0, 0x1b0c },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x1b0d },
-{ 0| 0| 0|C11| 0| 0|NFC|NKC| 0, 0, 0x1b0e },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x1b11 },
-{ 0| 0| 0|C11| 0| 0|NFC|NKC| 0, 0, 0x1b12 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x1b33 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 7, 0x1b34 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC|CTX, 0, 0x1b35 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x1b3a },
-{ 0| 0| 0|C11| 0| 0|NFC|NKC| 0, 0, 0x1b3b },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x1b3c },
-{ 0| 0| 0|C11| 0| 0|NFC|NKC| 0, 0, 0x1b3d },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x1b3f },
-{ 0| 0| 0|C11| 0| 0|NFC|NKC| 0, 0, 0x1b41 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x1b42 },
-{ 0| 0| 0|C11| 0| 0|NFC|NKC| 0, 0, 0x1b43 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x1b6a },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 230, 0x1b6b },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 220, 0x1b6c },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 230, 0x1b6d },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 230, 0x1b6e },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 230, 0x1b6f },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 230, 0x1b70 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 230, 0x1b71 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 230, 0x1b72 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x1ba9 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 9, 0x1baa },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x1be5 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x1bf1 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 9, 0x1bf2 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x1c36 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x1ccf },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 230, 0x1cd0 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 230, 0x1cd1 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x1cd3 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 1, 0x1cd4 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 220, 0x1cd5 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 220, 0x1cd6 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 220, 0x1cd7 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 220, 0x1cd8 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 220, 0x1cd9 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 230, 0x1cda },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 230, 0x1cdb },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 220, 0x1cdc },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 220, 0x1cdd },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 220, 0x1cde },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 220, 0x1cdf },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x1ce1 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 1, 0x1ce2 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 1, 0x1ce3 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 1, 0x1ce4 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 1, 0x1ce5 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 1, 0x1ce6 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 1, 0x1ce7 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x1cec },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x1cf3 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x1d2b },
-{ 0| 0| 0|C11| 0|CID|NFC| 0| 0, 0, 0x1d2e },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x1d2f },
-{ 0| 0| 0|C11| 0|CID|NFC| 0| 0, 0, 0x1d3a },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x1d3b },
-{ 0| 0| 0|C11| 0|CID|NFC| 0| 0, 0, 0x1d4d },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x1d4e },
-{ 0| 0| 0|C11| 0|CID|NFC| 0| 0, 0, 0x1d6a },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x1d77 },
-{ 0| 0| 0|C11| 0|CID|NFC| 0| 0, 0, 0x1d78 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x1d9a },
-{ 0| 0| 0|C11| 0|CID|NFC| 0| 0, 0, 0x1dbf },
-{ 0| 0| 0|C11|N11|CID|NFC|NKC| 0, 230, 0x1dc0 },
-{ 0| 0| 0|C11|N11|CID|NFC|NKC| 0, 230, 0x1dc1 },
-{ 0| 0| 0|C11|N11|CID|NFC|NKC| 0, 220, 0x1dc2 },
-{ 0| 0| 0|C11|N11|CID|NFC|NKC| 0, 230, 0x1dc3 },
-{ 0| 0| 0|C11|N11|CID|NFC|NKC| 0, 230, 0x1dc4 },
-{ 0| 0| 0|C11|N11|CID|NFC|NKC| 0, 230, 0x1dc5 },
-{ 0| 0| 0|C11|N11|CID|NFC|NKC| 0, 230, 0x1dc6 },
-{ 0| 0| 0|C11|N11|CID|NFC|NKC| 0, 230, 0x1dc7 },
-{ 0| 0| 0|C11|N11|CID|NFC|NKC| 0, 230, 0x1dc8 },
-{ 0| 0| 0|C11|N11|CID|NFC|NKC| 0, 230, 0x1dc9 },
-{ 0| 0| 0|C11|N11|CID|NFC|NKC| 0, 220, 0x1dca },
-{ 0| 0| 0|C11|N11|CID|NFC|NKC| 0, 230, 0x1dcb },
-{ 0| 0| 0|C11|N11|CID|NFC|NKC| 0, 230, 0x1dcc },
-{ 0| 0| 0|C11|N11|CID|NFC|NKC| 0, 234, 0x1dcd },
-{ 0| 0| 0|C11|N11|CID|NFC|NKC| 0, 214, 0x1dce },
-{ 0| 0| 0|C11|N11|CID|NFC|NKC| 0, 220, 0x1dcf },
-{ 0| 0| 0|C11|N11|CID|NFC|NKC| 0, 202, 0x1dd0 },
-{ 0| 0| 0|C11|N11|CID|NFC|NKC| 0, 230, 0x1dd1 },
-{ 0| 0| 0|C11|N11|CID|NFC|NKC| 0, 230, 0x1dd2 },
-{ 0| 0| 0|C11|N11|CID|NFC|NKC| 0, 230, 0x1dd3 },
-{ 0| 0| 0|C11|N11|CID|NFC|NKC| 0, 230, 0x1dd4 },
-{ 0| 0| 0|C11|N11|CID|NFC|NKC| 0, 230, 0x1dd5 },
-{ 0| 0| 0|C11|N11|CID|NFC|NKC| 0, 230, 0x1dd6 },
-{ 0| 0| 0|C11|N11|CID|NFC|NKC| 0, 230, 0x1dd7 },
-{ 0| 0| 0|C11|N11|CID|NFC|NKC| 0, 230, 0x1dd8 },
-{ 0| 0| 0|C11|N11|CID|NFC|NKC| 0, 230, 0x1dd9 },
-{ 0| 0| 0|C11|N11|CID|NFC|NKC| 0, 230, 0x1dda },
-{ 0| 0| 0|C11|N11|CID|NFC|NKC| 0, 230, 0x1ddb },
-{ 0| 0| 0|C11|N11|CID|NFC|NKC| 0, 230, 0x1ddc },
-{ 0| 0| 0|C11|N11|CID|NFC|NKC| 0, 230, 0x1ddd },
-{ 0| 0| 0|C11|N11|CID|NFC|NKC| 0, 230, 0x1dde },
-{ 0| 0| 0|C11|N11|CID|NFC|NKC| 0, 230, 0x1ddf },
-{ 0| 0| 0|C11|N11|CID|NFC|NKC| 0, 230, 0x1de0 },
-{ 0| 0| 0|C11|N11|CID|NFC|NKC| 0, 230, 0x1de1 },
-{ 0| 0| 0|C11|N11|CID|NFC|NKC| 0, 230, 0x1de2 },
-{ 0| 0| 0|C11|N11|CID|NFC|NKC| 0, 230, 0x1de3 },
-{ 0| 0| 0|C11|N11|CID|NFC|NKC| 0, 230, 0x1de4 },
-{ 0| 0| 0|C11|N11|CID|NFC|NKC| 0, 230, 0x1de5 },
-{ 0| 0| 0|C11|N11|CID|NFC|NKC| 0, 0, 0x1dfb },
-{ 0| 0| 0|C11|N11|CID|NFC|NKC| 0, 233, 0x1dfc },
-{ 0| 0| 0|C11|N11|CID|NFC|NKC| 0, 220, 0x1dfd },
-{ 0| 0| 0|C11|N11|CID|NFC|NKC| 0, 230, 0x1dfe },
-{ 0| 0| 0|C11|N11|CID|NFC|NKC| 0, 220, 0x1dff },
-{ C99| 0|CXX|C11| 0|CID|NFC|NKC| 0, 0, 0x1e07 },
-{ C99| 0|CXX|C11| 0| 0|NFC|NKC| 0, 0, 0x1e09 },
-{ C99| 0|CXX|C11| 0|CID|NFC|NKC| 0, 0, 0x1e13 },
-{ C99| 0|CXX|C11| 0| 0|NFC|NKC| 0, 0, 0x1e17 },
-{ C99| 0|CXX|C11| 0|CID|NFC|NKC| 0, 0, 0x1e1b },
-{ C99| 0|CXX|C11| 0| 0|NFC|NKC| 0, 0, 0x1e1d },
-{ C99| 0|CXX|C11| 0|CID|NFC|NKC| 0, 0, 0x1e2d },
-{ C99| 0|CXX|C11| 0| 0|NFC|NKC| 0, 0, 0x1e2f },
-{ C99| 0|CXX|C11| 0|CID|NFC|NKC| 0, 0, 0x1e37 },
-{ C99| 0|CXX|C11| 0| 0|NFC|NKC| 0, 0, 0x1e39 },
-{ C99| 0|CXX|C11| 0|CID|NFC|NKC| 0, 0, 0x1e4b },
-{ C99| 0|CXX|C11| 0| 0|NFC|NKC| 0, 0, 0x1e53 },
-{ C99| 0|CXX|C11| 0|CID|NFC|NKC| 0, 0, 0x1e5b },
-{ C99| 0|CXX|C11| 0| 0|NFC|NKC| 0, 0, 0x1e5d },
-{ C99| 0|CXX|C11| 0|CID|NFC|NKC| 0, 0, 0x1e63 },
-{ C99| 0|CXX|C11| 0| 0|NFC|NKC| 0, 0, 0x1e69 },
-{ C99| 0|CXX|C11| 0|CID|NFC|NKC| 0, 0, 0x1e77 },
-{ C99| 0|CXX|C11| 0| 0|NFC|NKC| 0, 0, 0x1e7b },
-{ C99| 0|CXX|C11| 0|CID|NFC|NKC| 0, 0, 0x1e99 },
-{ C99| 0|CXX|C11| 0|CID|NFC| 0| 0, 0, 0x1e9a },
-{ C99| 0| 0|C11| 0| 0|NFC| 0| 0, 0, 0x1e9b },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x1e9f },
-{ C99| 0|CXX|C11| 0|CID|NFC|NKC| 0, 0, 0x1ea3 },
-{ C99| 0|CXX|C11| 0| 0|NFC|NKC| 0, 0, 0x1eb7 },
-{ C99| 0|CXX|C11| 0|CID|NFC|NKC| 0, 0, 0x1ebd },
-{ C99| 0|CXX|C11| 0| 0|NFC|NKC| 0, 0, 0x1ec7 },
-{ C99| 0|CXX|C11| 0|CID|NFC|NKC| 0, 0, 0x1ecf },
-{ C99| 0|CXX|C11| 0| 0|NFC|NKC| 0, 0, 0x1ee3 },
-{ C99| 0|CXX|C11| 0|CID|NFC|NKC| 0, 0, 0x1ee7 },
-{ C99| 0|CXX|C11| 0| 0|NFC|NKC| 0, 0, 0x1ef1 },
-{ C99| 0|CXX|C11| 0|CID|NFC|NKC| 0, 0, 0x1ef9 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x1eff },
-{ C99| 0|CXX|C11| 0| 0|NFC|NKC| 0, 0, 0x1f15 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x1f17 },
-{ C99| 0|CXX|C11| 0| 0|NFC|NKC| 0, 0, 0x1f1d },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x1f1f },
-{ C99| 0|CXX|C11| 0| 0|NFC|NKC| 0, 0, 0x1f45 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x1f47 },
-{ C99| 0|CXX|C11| 0| 0|NFC|NKC| 0, 0, 0x1f4d },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x1f4f },
-{ C99| 0|CXX|C11| 0| 0|NFC|NKC| 0, 0, 0x1f57 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x1f58 },
-{ C99| 0|CXX|C11| 0| 0|NFC|NKC| 0, 0, 0x1f59 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x1f5a },
-{ C99| 0|CXX|C11| 0| 0|NFC|NKC| 0, 0, 0x1f5b },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x1f5c },
-{ C99| 0|CXX|C11| 0| 0|NFC|NKC| 0, 0, 0x1f5d },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x1f5e },
-{ C99| 0|CXX|C11| 0| 0|NFC|NKC| 0, 0, 0x1f70 },
-{ C99| 0|CXX|C11| 0| 0| 0| 0| 0, 0, 0x1f71 },
-{ C99| 0|CXX|C11| 0| 0|NFC|NKC| 0, 0, 0x1f72 },
-{ C99| 0|CXX|C11| 0| 0| 0| 0| 0, 0, 0x1f73 },
-{ C99| 0|CXX|C11| 0| 0|NFC|NKC| 0, 0, 0x1f74 },
-{ C99| 0|CXX|C11| 0| 0| 0| 0| 0, 0, 0x1f75 },
-{ C99| 0|CXX|C11| 0| 0|NFC|NKC| 0, 0, 0x1f76 },
-{ C99| 0|CXX|C11| 0| 0| 0| 0| 0, 0, 0x1f77 },
-{ C99| 0|CXX|C11| 0| 0|NFC|NKC| 0, 0, 0x1f78 },
-{ C99| 0|CXX|C11| 0| 0| 0| 0| 0, 0, 0x1f79 },
-{ C99| 0|CXX|C11| 0| 0|NFC|NKC| 0, 0, 0x1f7a },
-{ C99| 0|CXX|C11| 0| 0| 0| 0| 0, 0, 0x1f7b },
-{ C99| 0|CXX|C11| 0| 0|NFC|NKC| 0, 0, 0x1f7c },
-{ C99| 0|CXX|C11| 0| 0| 0| 0| 0, 0, 0x1f7d },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x1f7f },
-{ C99| 0|CXX|C11| 0| 0|NFC|NKC| 0, 0, 0x1fb4 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x1fb5 },
-{ C99| 0|CXX|C11| 0| 0|NFC|NKC| 0, 0, 0x1fba },
-{ C99| 0|CXX|C11| 0| 0| 0| 0| 0, 0, 0x1fbb },
-{ C99| 0|CXX|C11| 0| 0|NFC|NKC| 0, 0, 0x1fbc },
-{ 0| 0| 0|C11| 0|CID|NFC| 0| 0, 0, 0x1fbd },
-{ C99| 0| 0|C11| 0| 0| 0| 0| 0, 0, 0x1fbe },
-{ 0| 0| 0|C11| 0|CID|NFC| 0| 0, 0, 0x1fc0 },
-{ 0| 0| 0|C11| 0| 0|NFC| 0| 0, 0, 0x1fc1 },
-{ C99| 0|CXX|C11| 0| 0|NFC|NKC| 0, 0, 0x1fc4 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x1fc5 },
-{ C99| 0|CXX|C11| 0| 0|NFC|NKC| 0, 0, 0x1fc8 },
-{ C99| 0|CXX|C11| 0| 0| 0| 0| 0, 0, 0x1fc9 },
-{ C99| 0|CXX|C11| 0| 0|NFC|NKC| 0, 0, 0x1fca },
-{ C99| 0|CXX|C11| 0| 0| 0| 0| 0, 0, 0x1fcb },
-{ C99| 0|CXX|C11| 0| 0|NFC|NKC| 0, 0, 0x1fcc },
-{ 0| 0| 0|C11| 0| 0|NFC| 0| 0, 0, 0x1fcf },
-{ C99| 0|CXX|C11| 0| 0|NFC|NKC| 0, 0, 0x1fd2 },
-{ C99| 0|CXX|C11| 0| 0| 0| 0| 0, 0, 0x1fd3 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x1fd5 },
-{ C99| 0|CXX|C11| 0| 0|NFC|NKC| 0, 0, 0x1fda },
-{ C99| 0|CXX|C11| 0| 0| 0| 0| 0, 0, 0x1fdb },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x1fdc },
-{ 0| 0| 0|C11| 0| 0|NFC| 0| 0, 0, 0x1fdf },
-{ C99| 0|CXX|C11| 0| 0|NFC|NKC| 0, 0, 0x1fe2 },
-{ C99| 0|CXX|C11| 0| 0| 0| 0| 0, 0, 0x1fe3 },
-{ C99| 0|CXX|C11| 0| 0|NFC|NKC| 0, 0, 0x1fea },
-{ C99| 0|CXX|C11| 0| 0| 0| 0| 0, 0, 0x1feb },
-{ C99| 0|CXX|C11| 0| 0|NFC|NKC| 0, 0, 0x1fec },
-{ 0| 0| 0|C11| 0| 0|NFC| 0| 0, 0, 0x1fed },
-{ 0| 0| 0|C11| 0| 0| 0| 0| 0, 0, 0x1fee },
-{ 0| 0| 0|C11| 0|CID| 0| 0| 0, 0, 0x1fef },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x1ff1 },
-{ C99| 0|CXX|C11| 0| 0|NFC|NKC| 0, 0, 0x1ff4 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x1ff5 },
-{ C99| 0|CXX|C11| 0| 0|NFC|NKC| 0, 0, 0x1ff8 },
-{ C99| 0|CXX|C11| 0| 0| 0| 0| 0, 0, 0x1ff9 },
-{ C99| 0|CXX|C11| 0| 0|NFC|NKC| 0, 0, 0x1ffa },
-{ C99| 0|CXX|C11| 0| 0| 0| 0| 0, 0, 0x1ffb },
-{ C99| 0|CXX|C11| 0| 0|NFC|NKC| 0, 0, 0x1ffc },
-{ 0| 0| 0|C11| 0| 0| 0| 0| 0, 0, 0x1ffd },
-{ 0| 0| 0|C11| 0|CID|NFC| 0| 0, 0, 0x1ffe },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x1fff },
-{ 0| 0| 0| 0| 0|CID| 0| 0| 0, 0, 0x200a },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x200d },
-{ 0| 0| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x2029 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x202e },
-{ 0| 0| 0| 0| 0|CID|NFC| 0| 0, 0, 0x203e },
-{ C99| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x2040 },
-{ 0| 0| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x2053 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x2054 },
-{ 0| 0| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x205f },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x206f },
-{ 0| 0| 0|C11| 0|CID|NFC| 0| 0, 0, 0x2071 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x2073 },
-{ 0| 0| 0|C11| 0|CID|NFC| 0| 0, 0, 0x207e },
-{ C99| 0| 0|C11| 0|CID|NFC| 0| 0, 0, 0x207f },
-{ 0| 0| 0|C11| 0|CID|NFC| 0| 0, 0, 0x208e },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x208f },
-{ 0| 0| 0|C11| 0|CID|NFC| 0| 0, 0, 0x209c },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x20a7 },
-{ 0| 0| 0|C11| 0|CID|NFC| 0| 0, 0, 0x20a8 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x20cf },
-{ 0| 0| 0|C11|N11|CID|NFC|NKC| 0, 230, 0x20d0 },
-{ 0| 0| 0|C11|N11|CID|NFC|NKC| 0, 230, 0x20d1 },
-{ 0| 0| 0|C11|N11|CID|NFC|NKC| 0, 1, 0x20d2 },
-{ 0| 0| 0|C11|N11|CID|NFC|NKC| 0, 1, 0x20d3 },
-{ 0| 0| 0|C11|N11|CID|NFC|NKC| 0, 230, 0x20d4 },
-{ 0| 0| 0|C11|N11|CID|NFC|NKC| 0, 230, 0x20d5 },
-{ 0| 0| 0|C11|N11|CID|NFC|NKC| 0, 230, 0x20d6 },
-{ 0| 0| 0|C11|N11|CID|NFC|NKC| 0, 230, 0x20d7 },
-{ 0| 0| 0|C11|N11|CID|NFC|NKC| 0, 1, 0x20d8 },
-{ 0| 0| 0|C11|N11|CID|NFC|NKC| 0, 1, 0x20d9 },
-{ 0| 0| 0|C11|N11|CID|NFC|NKC| 0, 1, 0x20da },
-{ 0| 0| 0|C11|N11|CID|NFC|NKC| 0, 230, 0x20db },
-{ 0| 0| 0|C11|N11|CID|NFC|NKC| 0, 0, 0x20e0 },
-{ 0| 0| 0|C11|N11|CID|NFC|NKC| 0, 0, 0x20e4 },
-{ 0| 0| 0|C11|N11|CID|NFC|NKC| 0, 1, 0x20e5 },
-{ 0| 0| 0|C11|N11|CID|NFC|NKC| 0, 1, 0x20e6 },
-{ 0| 0| 0|C11|N11|CID|NFC|NKC| 0, 230, 0x20e7 },
-{ 0| 0| 0|C11|N11|CID|NFC|NKC| 0, 220, 0x20e8 },
-{ 0| 0| 0|C11|N11|CID|NFC|NKC| 0, 230, 0x20e9 },
-{ 0| 0| 0|C11|N11|CID|NFC|NKC| 0, 1, 0x20ea },
-{ 0| 0| 0|C11|N11|CID|NFC|NKC| 0, 1, 0x20eb },
-{ 0| 0| 0|C11|N11|CID|NFC|NKC| 0, 220, 0x20ec },
-{ 0| 0| 0|C11|N11|CID|NFC|NKC| 0, 220, 0x20ed },
-{ 0| 0| 0|C11|N11|CID|NFC|NKC| 0, 220, 0x20ee },
-{ 0| 0| 0|C11|N11|CID|NFC|NKC| 0, 220, 0x20ef },
-{ 0| 0| 0|C11|N11|CID|NFC|NKC| 0, 0, 0x20ff },
-{ 0| 0| 0|C11| 0|CID|NFC| 0| 0, 0, 0x2101 },
-{ C99| 0| 0|C11| 0|CID|NFC| 0| 0, 0, 0x2102 },
-{ 0| 0| 0|C11| 0|CID|NFC| 0| 0, 0, 0x2103 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x2104 },
-{ 0| 0| 0|C11| 0|CID|NFC| 0| 0, 0, 0x2106 },
-{ C99| 0| 0|C11| 0|CID|NFC| 0| 0, 0, 0x2107 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x2108 },
-{ 0| 0| 0|C11| 0|CID|NFC| 0| 0, 0, 0x2109 },
-{ C99| 0| 0|C11| 0|CID|NFC| 0| 0, 0, 0x2113 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x2114 },
-{ C99| 0| 0|C11| 0|CID|NFC| 0| 0, 0, 0x2115 },
-{ 0| 0| 0|C11| 0|CID|NFC| 0| 0, 0, 0x2116 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x2117 },
-{ C99| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x2118 },
-{ C99| 0| 0|C11| 0|CID|NFC| 0| 0, 0, 0x211d },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x211f },
-{ 0| 0| 0|C11| 0|CID|NFC| 0| 0, 0, 0x2122 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x2123 },
-{ C99| 0| 0|C11| 0|CID|NFC| 0| 0, 0, 0x2124 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x2125 },
-{ C99| 0| 0|C11| 0| 0| 0| 0| 0, 0, 0x2126 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x2127 },
-{ C99| 0| 0|C11| 0|CID|NFC| 0| 0, 0, 0x2128 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x2129 },
-{ C99| 0| 0|C11| 0|CID| 0| 0| 0, 0, 0x212a },
-{ C99| 0| 0|C11| 0| 0| 0| 0| 0, 0, 0x212b },
-{ C99| 0| 0|C11| 0|CID|NFC| 0| 0, 0, 0x212d },
-{ C99| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x212e },
-{ C99| 0| 0|C11| 0|CID|NFC| 0| 0, 0, 0x2131 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x2132 },
-{ C99| 0| 0|C11| 0|CID|NFC| 0| 0, 0, 0x2138 },
-{ 0| 0| 0|C11| 0|CID|NFC| 0| 0, 0, 0x2139 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x213a },
-{ 0| 0| 0|C11| 0|CID|NFC| 0| 0, 0, 0x2140 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x2144 },
-{ 0| 0| 0|C11| 0|CID|NFC| 0| 0, 0, 0x2149 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x214f },
-{ 0| 0| 0|C11| 0|CID|NFC| 0| 0, 0, 0x215f },
-{ C99| 0| 0|C11| 0|CID|NFC| 0| 0, 0, 0x217f },
-{ C99| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x2182 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x2188 },
-{ 0| 0| 0|C11| 0|CID|NFC| 0| 0, 0, 0x2189 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x218f },
-{ 0| 0| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x245f },
-{ 0| 0| 0|C11| 0|CID|NFC| 0| 0, 0, 0x24ea },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x24ff },
-{ 0| 0| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x2775 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x2793 },
-{ 0| 0| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x2bff },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x2c7b },
-{ 0| 0| 0|C11| 0|CID|NFC| 0| 0, 0, 0x2c7d },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x2cee },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 230, 0x2cef },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 230, 0x2cf0 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x2d6e },
-{ 0| 0| 0|C11| 0|CID|NFC| 0| 0, 0, 0x2d6f },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x2d7e },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x2ddf },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 230, 0x2de0 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 230, 0x2de1 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 230, 0x2de2 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 230, 0x2de3 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 230, 0x2de4 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 230, 0x2de5 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 230, 0x2de6 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 230, 0x2de7 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 230, 0x2de8 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 230, 0x2de9 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 230, 0x2dea },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 230, 0x2deb },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 230, 0x2dec },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 230, 0x2ded },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 230, 0x2dee },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 230, 0x2def },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 230, 0x2df0 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 230, 0x2df1 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 230, 0x2df2 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 230, 0x2df3 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 230, 0x2df4 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 230, 0x2df5 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 230, 0x2df6 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 230, 0x2df7 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 230, 0x2df8 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 230, 0x2df9 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 230, 0x2dfa },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 230, 0x2dfb },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 230, 0x2dfc },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 230, 0x2dfd },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 230, 0x2dfe },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 230, 0x2dff },
-{ 0| 0| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x2e7f },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x2e9e },
-{ 0| 0| 0|C11| 0|CID|NFC| 0| 0, 0, 0x2e9f },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x2ef2 },
-{ 0| 0| 0|C11| 0|CID|NFC| 0| 0, 0, 0x2ef3 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x2eff },
-{ 0| 0| 0|C11| 0|CID|NFC| 0| 0, 0, 0x2fd5 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x2fff },
-{ 0| 0| 0| 0| 0|CID|NFC| 0| 0, 0, 0x3003 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x3004 },
-{ C99| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x3007 },
-{ 0| 0| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x3020 },
-{ C99| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x3029 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 218, 0x302a },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 228, 0x302b },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 232, 0x302c },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 222, 0x302d },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 224, 0x302e },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 224, 0x302f },
-{ 0| 0| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x3030 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x3035 },
-{ 0| 0| 0|C11| 0|CID|NFC| 0| 0, 0, 0x3036 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x3037 },
-{ 0| 0| 0|C11| 0|CID|NFC| 0| 0, 0, 0x303a },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x3040 },
-{ C99| 0|CXX|C11| 0|CID|NFC|NKC| 0, 0, 0x304b },
-{ C99| 0|CXX|C11| 0| 0|NFC|NKC| 0, 0, 0x304c },
-{ C99| 0|CXX|C11| 0|CID|NFC|NKC| 0, 0, 0x304d },
-{ C99| 0|CXX|C11| 0| 0|NFC|NKC| 0, 0, 0x304e },
-{ C99| 0|CXX|C11| 0|CID|NFC|NKC| 0, 0, 0x304f },
-{ C99| 0|CXX|C11| 0| 0|NFC|NKC| 0, 0, 0x3050 },
-{ C99| 0|CXX|C11| 0|CID|NFC|NKC| 0, 0, 0x3051 },
-{ C99| 0|CXX|C11| 0| 0|NFC|NKC| 0, 0, 0x3052 },
-{ C99| 0|CXX|C11| 0|CID|NFC|NKC| 0, 0, 0x3053 },
-{ C99| 0|CXX|C11| 0| 0|NFC|NKC| 0, 0, 0x3054 },
-{ C99| 0|CXX|C11| 0|CID|NFC|NKC| 0, 0, 0x3055 },
-{ C99| 0|CXX|C11| 0| 0|NFC|NKC| 0, 0, 0x3056 },
-{ C99| 0|CXX|C11| 0|CID|NFC|NKC| 0, 0, 0x3057 },
-{ C99| 0|CXX|C11| 0| 0|NFC|NKC| 0, 0, 0x3058 },
-{ C99| 0|CXX|C11| 0|CID|NFC|NKC| 0, 0, 0x3059 },
-{ C99| 0|CXX|C11| 0| 0|NFC|NKC| 0, 0, 0x305a },
-{ C99| 0|CXX|C11| 0|CID|NFC|NKC| 0, 0, 0x305b },
-{ C99| 0|CXX|C11| 0| 0|NFC|NKC| 0, 0, 0x305c },
-{ C99| 0|CXX|C11| 0|CID|NFC|NKC| 0, 0, 0x305d },
-{ C99| 0|CXX|C11| 0| 0|NFC|NKC| 0, 0, 0x305e },
-{ C99| 0|CXX|C11| 0|CID|NFC|NKC| 0, 0, 0x305f },
-{ C99| 0|CXX|C11| 0| 0|NFC|NKC| 0, 0, 0x3060 },
-{ C99| 0|CXX|C11| 0|CID|NFC|NKC| 0, 0, 0x3061 },
-{ C99| 0|CXX|C11| 0| 0|NFC|NKC| 0, 0, 0x3062 },
-{ C99| 0|CXX|C11| 0|CID|NFC|NKC| 0, 0, 0x3064 },
-{ C99| 0|CXX|C11| 0| 0|NFC|NKC| 0, 0, 0x3065 },
-{ C99| 0|CXX|C11| 0|CID|NFC|NKC| 0, 0, 0x3066 },
-{ C99| 0|CXX|C11| 0| 0|NFC|NKC| 0, 0, 0x3067 },
-{ C99| 0|CXX|C11| 0|CID|NFC|NKC| 0, 0, 0x3068 },
-{ C99| 0|CXX|C11| 0| 0|NFC|NKC| 0, 0, 0x3069 },
-{ C99| 0|CXX|C11| 0|CID|NFC|NKC| 0, 0, 0x306f },
-{ C99| 0|CXX|C11| 0| 0|NFC|NKC| 0, 0, 0x3071 },
-{ C99| 0|CXX|C11| 0|CID|NFC|NKC| 0, 0, 0x3072 },
-{ C99| 0|CXX|C11| 0| 0|NFC|NKC| 0, 0, 0x3074 },
-{ C99| 0|CXX|C11| 0|CID|NFC|NKC| 0, 0, 0x3075 },
-{ C99| 0|CXX|C11| 0| 0|NFC|NKC| 0, 0, 0x3077 },
-{ C99| 0|CXX|C11| 0|CID|NFC|NKC| 0, 0, 0x3078 },
-{ C99| 0|CXX|C11| 0| 0|NFC|NKC| 0, 0, 0x307a },
-{ C99| 0|CXX|C11| 0|CID|NFC|NKC| 0, 0, 0x307b },
-{ C99| 0|CXX|C11| 0| 0|NFC|NKC| 0, 0, 0x307d },
-{ C99| 0|CXX|C11| 0|CID|NFC|NKC| 0, 0, 0x3093 },
-{ 0| 0|CXX|C11| 0| 0|NFC|NKC| 0, 0, 0x3094 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x3098 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC|CTX, 8, 0x3099 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC|CTX, 8, 0x309a },
-{ C99| 0|CXX|C11| 0|CID|NFC| 0| 0, 0, 0x309c },
-{ 0| 0|CXX|C11| 0|CID|NFC|NKC| 0, 0, 0x309d },
-{ 0| 0|CXX|C11| 0| 0|NFC|NKC| 0, 0, 0x309e },
-{ 0| 0| 0|C11| 0|CID|NFC| 0| 0, 0, 0x309f },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x30a0 },
-{ C99| 0|CXX|C11| 0|CID|NFC|NKC| 0, 0, 0x30ab },
-{ C99| 0|CXX|C11| 0| 0|NFC|NKC| 0, 0, 0x30ac },
-{ C99| 0|CXX|C11| 0|CID|NFC|NKC| 0, 0, 0x30ad },
-{ C99| 0|CXX|C11| 0| 0|NFC|NKC| 0, 0, 0x30ae },
-{ C99| 0|CXX|C11| 0|CID|NFC|NKC| 0, 0, 0x30af },
-{ C99| 0|CXX|C11| 0| 0|NFC|NKC| 0, 0, 0x30b0 },
-{ C99| 0|CXX|C11| 0|CID|NFC|NKC| 0, 0, 0x30b1 },
-{ C99| 0|CXX|C11| 0| 0|NFC|NKC| 0, 0, 0x30b2 },
-{ C99| 0|CXX|C11| 0|CID|NFC|NKC| 0, 0, 0x30b3 },
-{ C99| 0|CXX|C11| 0| 0|NFC|NKC| 0, 0, 0x30b4 },
-{ C99| 0|CXX|C11| 0|CID|NFC|NKC| 0, 0, 0x30b5 },
-{ C99| 0|CXX|C11| 0| 0|NFC|NKC| 0, 0, 0x30b6 },
-{ C99| 0|CXX|C11| 0|CID|NFC|NKC| 0, 0, 0x30b7 },
-{ C99| 0|CXX|C11| 0| 0|NFC|NKC| 0, 0, 0x30b8 },
-{ C99| 0|CXX|C11| 0|CID|NFC|NKC| 0, 0, 0x30b9 },
-{ C99| 0|CXX|C11| 0| 0|NFC|NKC| 0, 0, 0x30ba },
-{ C99| 0|CXX|C11| 0|CID|NFC|NKC| 0, 0, 0x30bb },
-{ C99| 0|CXX|C11| 0| 0|NFC|NKC| 0, 0, 0x30bc },
-{ C99| 0|CXX|C11| 0|CID|NFC|NKC| 0, 0, 0x30bd },
-{ C99| 0|CXX|C11| 0| 0|NFC|NKC| 0, 0, 0x30be },
-{ C99| 0|CXX|C11| 0|CID|NFC|NKC| 0, 0, 0x30bf },
-{ C99| 0|CXX|C11| 0| 0|NFC|NKC| 0, 0, 0x30c0 },
-{ C99| 0|CXX|C11| 0|CID|NFC|NKC| 0, 0, 0x30c1 },
-{ C99| 0|CXX|C11| 0| 0|NFC|NKC| 0, 0, 0x30c2 },
-{ C99| 0|CXX|C11| 0|CID|NFC|NKC| 0, 0, 0x30c4 },
-{ C99| 0|CXX|C11| 0| 0|NFC|NKC| 0, 0, 0x30c5 },
-{ C99| 0|CXX|C11| 0|CID|NFC|NKC| 0, 0, 0x30c6 },
-{ C99| 0|CXX|C11| 0| 0|NFC|NKC| 0, 0, 0x30c7 },
-{ C99| 0|CXX|C11| 0|CID|NFC|NKC| 0, 0, 0x30c8 },
-{ C99| 0|CXX|C11| 0| 0|NFC|NKC| 0, 0, 0x30c9 },
-{ C99| 0|CXX|C11| 0|CID|NFC|NKC| 0, 0, 0x30cf },
-{ C99| 0|CXX|C11| 0| 0|NFC|NKC| 0, 0, 0x30d1 },
-{ C99| 0|CXX|C11| 0|CID|NFC|NKC| 0, 0, 0x30d2 },
-{ C99| 0|CXX|C11| 0| 0|NFC|NKC| 0, 0, 0x30d4 },
-{ C99| 0|CXX|C11| 0|CID|NFC|NKC| 0, 0, 0x30d5 },
-{ C99| 0|CXX|C11| 0| 0|NFC|NKC| 0, 0, 0x30d7 },
-{ C99| 0|CXX|C11| 0|CID|NFC|NKC| 0, 0, 0x30d8 },
-{ C99| 0|CXX|C11| 0| 0|NFC|NKC| 0, 0, 0x30da },
-{ C99| 0|CXX|C11| 0|CID|NFC|NKC| 0, 0, 0x30db },
-{ C99| 0|CXX|C11| 0| 0|NFC|NKC| 0, 0, 0x30dd },
-{ C99| 0|CXX|C11| 0|CID|NFC|NKC| 0, 0, 0x30f3 },
-{ C99| 0|CXX|C11| 0| 0|NFC|NKC| 0, 0, 0x30f4 },
-{ C99| 0|CXX|C11| 0|CID|NFC|NKC| 0, 0, 0x30f6 },
-{ 0| 0|CXX|C11| 0| 0|NFC|NKC| 0, 0, 0x30fa },
-{ C99| 0|CXX|C11| 0|CID|NFC|NKC| 0, 0, 0x30fc },
-{ 0| 0|CXX|C11| 0|CID|NFC|NKC| 0, 0, 0x30fd },
-{ 0| 0|CXX|C11| 0| 0|NFC|NKC| 0, 0, 0x30fe },
-{ 0| 0| 0|C11| 0|CID|NFC| 0| 0, 0, 0x30ff },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x3104 },
-{ C99| 0|CXX|C11| 0|CID|NFC|NKC| 0, 0, 0x312c },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x3130 },
-{ 0| 0| 0|C11| 0|CID|NFC| 0| 0, 0, 0x318e },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x3191 },
-{ 0| 0| 0|C11| 0|CID|NFC| 0| 0, 0, 0x319f },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x31ff },
-{ 0| 0| 0|C11| 0|CID|NFC| 0| 0, 0, 0x321e },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x321f },
-{ 0| 0| 0|C11| 0|CID|NFC| 0| 0, 0, 0x3247 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x324f },
-{ 0| 0| 0|C11| 0|CID|NFC| 0| 0, 0, 0x327e },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x327f },
-{ 0| 0| 0|C11| 0|CID|NFC| 0| 0, 0, 0x32fe },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x32ff },
-{ 0| 0| 0|C11| 0|CID|NFC| 0| 0, 0, 0x33ff },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x4dff },
-{ C99| 0|CXX|C11| 0|CID|NFC|NKC| 0, 0, 0x9fa5 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0xa66e },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0xa673 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 230, 0xa674 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 230, 0xa675 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 230, 0xa676 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 230, 0xa677 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 230, 0xa678 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 230, 0xa679 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 230, 0xa67a },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 230, 0xa67b },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 230, 0xa67c },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0xa69e },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0xa6ef },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 230, 0xa6f0 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0xa76f },
-{ 0| 0| 0|C11| 0|CID|NFC| 0| 0, 0, 0xa770 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0xa7f7 },
-{ 0| 0| 0|C11| 0|CID|NFC| 0| 0, 0, 0xa7f9 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0xa805 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0xa8c3 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0xa8df },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 230, 0xa8e0 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 230, 0xa8e1 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 230, 0xa8e2 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 230, 0xa8e3 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 230, 0xa8e4 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 230, 0xa8e5 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 230, 0xa8e6 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 230, 0xa8e7 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 230, 0xa8e8 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 230, 0xa8e9 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 230, 0xa8ea },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 230, 0xa8eb },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 230, 0xa8ec },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 230, 0xa8ed },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 230, 0xa8ee },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 230, 0xa8ef },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 230, 0xa8f0 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0xa92a },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 220, 0xa92b },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 220, 0xa92c },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0xa952 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0xa9b2 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0xa9bf },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0xaaaf },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0xaab1 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 230, 0xaab2 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 230, 0xaab3 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0xaab6 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 230, 0xaab7 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0xaabd },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 230, 0xaabe },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0xaac0 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0xaaf5 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0xabec },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0xabff },
-{ C99| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0xd7a3 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0xd7ff },
-{ 0| 0| 0| 0| 0|CID|NFC|NKC| 0, 0, 0xf8ff },
-{ 0| 0|CXX|C11| 0| 0| 0| 0| 0, 0, 0xfa0d },
-{ 0| 0|CXX|C11| 0|CID|NFC|NKC| 0, 0, 0xfa0f },
-{ 0| 0|CXX|C11| 0| 0| 0| 0| 0, 0, 0xfa10 },
-{ 0| 0|CXX|C11| 0|CID|NFC|NKC| 0, 0, 0xfa11 },
-{ 0| 0|CXX|C11| 0| 0| 0| 0| 0, 0, 0xfa12 },
-{ 0| 0|CXX|C11| 0|CID|NFC|NKC| 0, 0, 0xfa14 },
-{ 0| 0|CXX|C11| 0| 0| 0| 0| 0, 0, 0xfa1e },
-{ 0| 0|CXX|C11| 0|CID|NFC|NKC| 0, 0, 0xfa1f },
-{ 0| 0|CXX|C11| 0| 0| 0| 0| 0, 0, 0xfa20 },
-{ 0| 0|CXX|C11| 0|CID|NFC|NKC| 0, 0, 0xfa21 },
-{ 0| 0|CXX|C11| 0| 0| 0| 0| 0, 0, 0xfa22 },
-{ 0| 0|CXX|C11| 0|CID|NFC|NKC| 0, 0, 0xfa24 },
-{ 0| 0|CXX|C11| 0| 0| 0| 0| 0, 0, 0xfa26 },
-{ 0| 0|CXX|C11| 0|CID|NFC|NKC| 0, 0, 0xfa29 },
-{ 0| 0|CXX|C11| 0| 0| 0| 0| 0, 0, 0xfa2d },
-{ 0| 0| 0|C11| 0| 0| 0| 0| 0, 0, 0xfa6d },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0xfa6f },
-{ 0| 0| 0|C11| 0| 0| 0| 0| 0, 0, 0xfad9 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0xfaff },
-{ 0| 0| 0|C11| 0|CID|NFC| 0| 0, 0, 0xfb06 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0xfb12 },
-{ 0| 0| 0|C11| 0|CID|NFC| 0| 0, 0, 0xfb17 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0xfb1c },
-{ 0| 0| 0|C11| 0| 0| 0| 0| 0, 0, 0xfb1d },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 26, 0xfb1e },
-{ 0| 0|CXX|C11| 0| 0| 0| 0| 0, 0, 0xfb1f },
-{ 0| 0|CXX|C11| 0|CID|NFC| 0| 0, 0, 0xfb29 },
-{ 0| 0|CXX|C11| 0| 0| 0| 0| 0, 0, 0xfb36 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0xfb37 },
-{ 0| 0|CXX|C11| 0| 0| 0| 0| 0, 0, 0xfb3c },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0xfb3d },
-{ 0| 0|CXX|C11| 0| 0| 0| 0| 0, 0, 0xfb3e },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0xfb3f },
-{ 0| 0|CXX|C11| 0| 0| 0| 0| 0, 0, 0xfb41 },
-{ 0| 0|CXX|C11| 0|CID|NFC|NKC| 0, 0, 0xfb42 },
-{ 0| 0|CXX|C11| 0| 0| 0| 0| 0, 0, 0xfb44 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0xfb45 },
-{ 0| 0|CXX|C11| 0| 0| 0| 0| 0, 0, 0xfb4e },
-{ 0| 0|CXX|C11| 0|CID|NFC| 0| 0, 0, 0xfbb1 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0xfbd2 },
-{ 0| 0|CXX|C11| 0|CID|NFC| 0| 0, 0, 0xfd3d },
-{ 0| 0|CXX| 0| 0|CID|NFC|NKC| 0, 0, 0xfd3f },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0xfd4f },
-{ 0| 0|CXX|C11| 0|CID|NFC| 0| 0, 0, 0xfd8f },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0xfd91 },
-{ 0| 0|CXX|C11| 0|CID|NFC| 0| 0, 0, 0xfdc7 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0xfdcf },
-{ 0| 0| 0| 0| 0|CID|NFC|NKC| 0, 0, 0xfdef },
-{ 0| 0|CXX|C11| 0|CID|NFC| 0| 0, 0, 0xfdfb },
-{ 0| 0| 0|C11| 0|CID|NFC| 0| 0, 0, 0xfdfc },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0xfe0f },
-{ 0| 0| 0|C11| 0|CID|NFC| 0| 0, 0, 0xfe19 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0xfe1f },
-{ 0| 0| 0|C11|N11|CID|NFC|NKC| 0, 230, 0xfe20 },
-{ 0| 0| 0|C11|N11|CID|NFC|NKC| 0, 230, 0xfe21 },
-{ 0| 0| 0|C11|N11|CID|NFC|NKC| 0, 230, 0xfe22 },
-{ 0| 0| 0|C11|N11|CID|NFC|NKC| 0, 230, 0xfe23 },
-{ 0| 0| 0|C11|N11|CID|NFC|NKC| 0, 230, 0xfe24 },
-{ 0| 0| 0|C11|N11|CID|NFC|NKC| 0, 230, 0xfe25 },
-{ 0| 0| 0|C11|N11|CID|NFC|NKC| 0, 0, 0xfe2f },
-{ 0| 0| 0|C11| 0|CID|NFC| 0| 0, 0, 0xfe44 },
-{ 0| 0| 0| 0| 0|CID|NFC|NKC| 0, 0, 0xfe46 },
-{ 0| 0| 0|C11| 0|CID|NFC| 0| 0, 0, 0xfe52 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0xfe53 },
-{ 0| 0| 0|C11| 0|CID|NFC| 0| 0, 0, 0xfe66 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0xfe67 },
-{ 0| 0| 0|C11| 0|CID|NFC| 0| 0, 0, 0xfe6b },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0xfe6f },
-{ 0| 0|CXX|C11| 0|CID|NFC| 0| 0, 0, 0xfe72 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0xfe73 },
-{ 0| 0|CXX|C11| 0|CID|NFC| 0| 0, 0, 0xfe74 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0xfe75 },
-{ 0| 0|CXX|C11| 0|CID|NFC| 0| 0, 0, 0xfefc },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0xff00 },
-{ 0| 0| 0|C11| 0|CID|NFC| 0| 0, 0, 0xff20 },
-{ 0| 0|CXX|C11| 0|CID|NFC| 0| 0, 0, 0xff3a },
-{ 0| 0| 0|C11| 0|CID|NFC| 0| 0, 0, 0xff40 },
-{ 0| 0|CXX|C11| 0|CID|NFC| 0| 0, 0, 0xff5a },
-{ 0| 0| 0|C11| 0|CID|NFC| 0| 0, 0, 0xff65 },
-{ 0| 0|CXX|C11| 0|CID|NFC| 0| 0, 0, 0xffbe },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0xffc1 },
-{ 0| 0|CXX|C11| 0|CID|NFC| 0| 0, 0, 0xffc7 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0xffc9 },
-{ 0| 0|CXX|C11| 0|CID|NFC| 0| 0, 0, 0xffcf },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0xffd1 },
-{ 0| 0|CXX|C11| 0|CID|NFC| 0| 0, 0, 0xffd7 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0xffd9 },
-{ 0| 0|CXX|C11| 0|CID|NFC| 0| 0, 0, 0xffdc },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0xffdf },
-{ 0| 0| 0|C11| 0|CID|NFC| 0| 0, 0, 0xffe6 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0xffe7 },
-{ 0| 0| 0|C11| 0|CID|NFC| 0| 0, 0, 0xffee },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0xfffd },
-{ 0| 0| 0| 0| 0|CID|NFC|NKC| 0, 0, 0xffff },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x101fc },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x10a0c },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x10a0e },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x10a37 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 230, 0x10a38 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 1, 0x10a39 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x10a3e },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x11045 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x11099 },
-{ 0| 0| 0|C11| 0| 0|NFC|NKC| 0, 0, 0x1109a },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x1109b },
-{ 0| 0| 0|C11| 0| 0|NFC|NKC| 0, 0, 0x1109c },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x110aa },
-{ 0| 0| 0|C11| 0| 0|NFC|NKC| 0, 0, 0x110ab },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x110b8 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 9, 0x110b9 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC|CTX, 7, 0x110ba },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x110ff },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 230, 0x11100 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 230, 0x11101 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x11126 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC|CTX, 0, 0x11127 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x1112d },
-{ 0| 0| 0|C11| 0| 0|NFC|NKC| 0, 0, 0x1112f },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x11132 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 9, 0x11133 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x111bf },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x116b5 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 9, 0x116b6 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x1d15d },
-{ 0| 0| 0|C11| 0| 0| 0| 0| 0, 0, 0x1d164 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 216, 0x1d165 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 216, 0x1d166 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 1, 0x1d167 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 1, 0x1d168 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x1d16c },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 226, 0x1d16d },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 216, 0x1d16e },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 216, 0x1d16f },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 216, 0x1d170 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 216, 0x1d171 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x1d17a },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 220, 0x1d17b },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 220, 0x1d17c },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 220, 0x1d17d },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 220, 0x1d17e },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 220, 0x1d17f },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 220, 0x1d180 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 220, 0x1d181 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x1d184 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 230, 0x1d185 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 230, 0x1d186 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 230, 0x1d187 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 230, 0x1d188 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 230, 0x1d189 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 220, 0x1d18a },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x1d1a9 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 230, 0x1d1aa },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 230, 0x1d1ab },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 230, 0x1d1ac },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x1d1ba },
-{ 0| 0| 0|C11| 0| 0| 0| 0| 0, 0, 0x1d1c0 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x1d241 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 230, 0x1d242 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 230, 0x1d243 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x1d3ff },
-{ 0| 0| 0|C11| 0|CID|NFC| 0| 0, 0, 0x1d454 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x1d455 },
-{ 0| 0| 0|C11| 0|CID|NFC| 0| 0, 0, 0x1d49c },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x1d49d },
-{ 0| 0| 0|C11| 0|CID|NFC| 0| 0, 0, 0x1d49f },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x1d4a1 },
-{ 0| 0| 0|C11| 0|CID|NFC| 0| 0, 0, 0x1d4a2 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x1d4a4 },
-{ 0| 0| 0|C11| 0|CID|NFC| 0| 0, 0, 0x1d4a6 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x1d4a8 },
-{ 0| 0| 0|C11| 0|CID|NFC| 0| 0, 0, 0x1d4ac },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x1d4ad },
-{ 0| 0| 0|C11| 0|CID|NFC| 0| 0, 0, 0x1d4b9 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x1d4ba },
-{ 0| 0| 0|C11| 0|CID|NFC| 0| 0, 0, 0x1d4bb },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x1d4bc },
-{ 0| 0| 0|C11| 0|CID|NFC| 0| 0, 0, 0x1d4c3 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x1d4c4 },
-{ 0| 0| 0|C11| 0|CID|NFC| 0| 0, 0, 0x1d505 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x1d506 },
-{ 0| 0| 0|C11| 0|CID|NFC| 0| 0, 0, 0x1d50a },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x1d50c },
-{ 0| 0| 0|C11| 0|CID|NFC| 0| 0, 0, 0x1d514 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x1d515 },
-{ 0| 0| 0|C11| 0|CID|NFC| 0| 0, 0, 0x1d51c },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x1d51d },
-{ 0| 0| 0|C11| 0|CID|NFC| 0| 0, 0, 0x1d539 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x1d53a },
-{ 0| 0| 0|C11| 0|CID|NFC| 0| 0, 0, 0x1d53e },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x1d53f },
-{ 0| 0| 0|C11| 0|CID|NFC| 0| 0, 0, 0x1d544 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x1d545 },
-{ 0| 0| 0|C11| 0|CID|NFC| 0| 0, 0, 0x1d546 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x1d549 },
-{ 0| 0| 0|C11| 0|CID|NFC| 0| 0, 0, 0x1d550 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x1d551 },
-{ 0| 0| 0|C11| 0|CID|NFC| 0| 0, 0, 0x1d6a5 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x1d6a7 },
-{ 0| 0| 0|C11| 0|CID|NFC| 0| 0, 0, 0x1d7cb },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x1d7cd },
-{ 0| 0| 0|C11| 0|CID|NFC| 0| 0, 0, 0x1d7ff },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x1edff },
-{ 0| 0| 0|C11| 0|CID|NFC| 0| 0, 0, 0x1ee03 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x1ee04 },
-{ 0| 0| 0|C11| 0|CID|NFC| 0| 0, 0, 0x1ee1f },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x1ee20 },
-{ 0| 0| 0|C11| 0|CID|NFC| 0| 0, 0, 0x1ee22 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x1ee23 },
-{ 0| 0| 0|C11| 0|CID|NFC| 0| 0, 0, 0x1ee24 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x1ee26 },
-{ 0| 0| 0|C11| 0|CID|NFC| 0| 0, 0, 0x1ee27 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x1ee28 },
-{ 0| 0| 0|C11| 0|CID|NFC| 0| 0, 0, 0x1ee32 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x1ee33 },
-{ 0| 0| 0|C11| 0|CID|NFC| 0| 0, 0, 0x1ee37 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x1ee38 },
-{ 0| 0| 0|C11| 0|CID|NFC| 0| 0, 0, 0x1ee39 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x1ee3a },
-{ 0| 0| 0|C11| 0|CID|NFC| 0| 0, 0, 0x1ee3b },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x1ee41 },
-{ 0| 0| 0|C11| 0|CID|NFC| 0| 0, 0, 0x1ee42 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x1ee46 },
-{ 0| 0| 0|C11| 0|CID|NFC| 0| 0, 0, 0x1ee47 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x1ee48 },
-{ 0| 0| 0|C11| 0|CID|NFC| 0| 0, 0, 0x1ee49 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x1ee4a },
-{ 0| 0| 0|C11| 0|CID|NFC| 0| 0, 0, 0x1ee4b },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x1ee4c },
-{ 0| 0| 0|C11| 0|CID|NFC| 0| 0, 0, 0x1ee4f },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x1ee50 },
-{ 0| 0| 0|C11| 0|CID|NFC| 0| 0, 0, 0x1ee52 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x1ee53 },
-{ 0| 0| 0|C11| 0|CID|NFC| 0| 0, 0, 0x1ee54 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x1ee56 },
-{ 0| 0| 0|C11| 0|CID|NFC| 0| 0, 0, 0x1ee57 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x1ee58 },
-{ 0| 0| 0|C11| 0|CID|NFC| 0| 0, 0, 0x1ee59 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x1ee5a },
-{ 0| 0| 0|C11| 0|CID|NFC| 0| 0, 0, 0x1ee5b },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x1ee5c },
-{ 0| 0| 0|C11| 0|CID|NFC| 0| 0, 0, 0x1ee5d },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x1ee5e },
-{ 0| 0| 0|C11| 0|CID|NFC| 0| 0, 0, 0x1ee5f },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x1ee60 },
-{ 0| 0| 0|C11| 0|CID|NFC| 0| 0, 0, 0x1ee62 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x1ee63 },
-{ 0| 0| 0|C11| 0|CID|NFC| 0| 0, 0, 0x1ee64 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x1ee66 },
-{ 0| 0| 0|C11| 0|CID|NFC| 0| 0, 0, 0x1ee6a },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x1ee6b },
-{ 0| 0| 0|C11| 0|CID|NFC| 0| 0, 0, 0x1ee72 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x1ee73 },
-{ 0| 0| 0|C11| 0|CID|NFC| 0| 0, 0, 0x1ee77 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x1ee78 },
-{ 0| 0| 0|C11| 0|CID|NFC| 0| 0, 0, 0x1ee7c },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x1ee7d },
-{ 0| 0| 0|C11| 0|CID|NFC| 0| 0, 0, 0x1ee7e },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x1ee7f },
-{ 0| 0| 0|C11| 0|CID|NFC| 0| 0, 0, 0x1ee89 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x1ee8a },
-{ 0| 0| 0|C11| 0|CID|NFC| 0| 0, 0, 0x1ee9b },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x1eea0 },
-{ 0| 0| 0|C11| 0|CID|NFC| 0| 0, 0, 0x1eea3 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x1eea4 },
-{ 0| 0| 0|C11| 0|CID|NFC| 0| 0, 0, 0x1eea9 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x1eeaa },
-{ 0| 0| 0|C11| 0|CID|NFC| 0| 0, 0, 0x1eebb },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x1f0ff },
-{ 0| 0| 0|C11| 0|CID|NFC| 0| 0, 0, 0x1f10a },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x1f10f },
-{ 0| 0| 0|C11| 0|CID|NFC| 0| 0, 0, 0x1f12e },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x1f12f },
-{ 0| 0| 0|C11| 0|CID|NFC| 0| 0, 0, 0x1f14f },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x1f169 },
-{ 0| 0| 0|C11| 0|CID|NFC| 0| 0, 0, 0x1f16b },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x1f18f },
-{ 0| 0| 0|C11| 0|CID|NFC| 0| 0, 0, 0x1f190 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x1f1ff },
-{ 0| 0| 0|C11| 0|CID|NFC| 0| 0, 0, 0x1f202 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x1f20f },
-{ 0| 0| 0|C11| 0|CID|NFC| 0| 0, 0, 0x1f23a },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x1f23f },
-{ 0| 0| 0|C11| 0|CID|NFC| 0| 0, 0, 0x1f248 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x1f24f },
-{ 0| 0| 0|C11| 0|CID|NFC| 0| 0, 0, 0x1f251 },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x1fffd },
-{ 0| 0| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x1ffff },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x2f7ff },
-{ 0| 0| 0|C11| 0| 0| 0| 0| 0, 0, 0x2fa1d },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x2fffd },
-{ 0| 0| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x2ffff },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x3fffd },
-{ 0| 0| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x3ffff },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x4fffd },
-{ 0| 0| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x4ffff },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x5fffd },
-{ 0| 0| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x5ffff },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x6fffd },
-{ 0| 0| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x6ffff },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x7fffd },
-{ 0| 0| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x7ffff },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x8fffd },
-{ 0| 0| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x8ffff },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0x9fffd },
-{ 0| 0| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x9ffff },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0xafffd },
-{ 0| 0| 0| 0| 0|CID|NFC|NKC| 0, 0, 0xaffff },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0xbfffd },
-{ 0| 0| 0| 0| 0|CID|NFC|NKC| 0, 0, 0xbffff },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0xcfffd },
-{ 0| 0| 0| 0| 0|CID|NFC|NKC| 0, 0, 0xcffff },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0xdfffd },
-{ 0| 0| 0| 0| 0|CID|NFC|NKC| 0, 0, 0xdffff },
-{ 0| 0| 0|C11| 0|CID|NFC|NKC| 0, 0, 0xefffd },
-{ 0| 0| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x10ffff },
+{ 0| 0| 0| 0| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x00a7 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC| 0| 0, 0, 0x00a8 },
+{ 0| 0| 0| 0| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x00a9 },
+{ C99| 0| 0|C11| 0|CXX23| 0|CID|NFC| 0| 0, 0, 0x00aa },
+{ 0| 0| 0| 0| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x00ac },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x00ad },
+{ 0| 0| 0| 0| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x00ae },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC| 0| 0, 0, 0x00af },
+{ 0| 0| 0| 0| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x00b1 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC| 0| 0, 0, 0x00b4 },
+{ C99| 0| 0|C11| 0|CXX23| 0|CID|NFC| 0| 0, 0, 0x00b5 },
+{ 0| 0| 0| 0| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x00b6 },
+{ C99| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 0, 0x00b7 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC| 0| 0, 0, 0x00b9 },
+{ C99| 0| 0|C11| 0|CXX23| 0|CID|NFC| 0| 0, 0, 0x00ba },
+{ 0| 0| 0| 0| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x00bb },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC| 0| 0, 0, 0x00be },
+{ 0| 0| 0| 0| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x00bf },
+{ C99| 0|CXX|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x00d6 },
+{ 0| 0| 0| 0| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x00d7 },
+{ C99| 0|CXX|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x00f6 },
+{ 0| 0| 0| 0| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x00f7 },
+{ C99| 0|CXX|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x0131 },
+{ C99| 0|CXX|C11| 0|CXX23| 0|CID|NFC| 0| 0, 0, 0x0133 },
+{ C99| 0|CXX|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x013e },
+{ C99| 0|CXX|C11| 0|CXX23| 0|CID|NFC| 0| 0, 0, 0x0140 },
+{ C99| 0|CXX|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x0148 },
+{ C99| 0|CXX|C11| 0|CXX23| 0|CID|NFC| 0| 0, 0, 0x0149 },
+{ C99| 0|CXX|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x017e },
+{ C99| 0|CXX|C11| 0|CXX23| 0|CID|NFC| 0| 0, 0, 0x017f },
+{ C99| 0|CXX|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x01c3 },
+{ C99| 0|CXX|C11| 0|CXX23| 0|CID|NFC| 0| 0, 0, 0x01cc },
+{ C99| 0|CXX|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x01d4 },
+{ C99| 0|CXX|C11| 0|CXX23| 0| 0|NFC|NKC| 0, 0, 0x01dc },
+{ C99| 0|CXX|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x01dd },
+{ C99| 0|CXX|C11| 0|CXX23| 0| 0|NFC|NKC| 0, 0, 0x01e3 },
+{ C99| 0|CXX|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x01eb },
+{ C99| 0|CXX|C11| 0|CXX23| 0| 0|NFC|NKC| 0, 0, 0x01ef },
+{ C99| 0|CXX|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x01f0 },
+{ C99| 0|CXX|C11| 0|CXX23| 0|CID|NFC| 0| 0, 0, 0x01f3 },
+{ C99| 0|CXX|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x01f5 },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x01f9 },
+{ C99| 0|CXX|C11| 0|CXX23| 0| 0|NFC|NKC| 0, 0, 0x01ff },
+{ C99| 0|CXX|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x0217 },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x0229 },
+{ 0| 0| 0|C11| 0|CXX23| 0| 0|NFC|NKC| 0, 0, 0x022d },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x022f },
+{ 0| 0| 0|C11| 0|CXX23| 0| 0|NFC|NKC| 0, 0, 0x0231 },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x024f },
+{ C99| 0|CXX|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x02a8 },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x02af },
+{ C99| 0| 0|C11| 0|CXX23| 0|CID|NFC| 0| 0, 0, 0x02b8 },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x02ba },
+{ C99| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x02bb },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x02bc },
+{ C99| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x02c1 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x02c5 },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x02cf },
+{ C99| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x02d1 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x02d7 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC| 0| 0, 0, 0x02dd },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x02df },
+{ C99| 0| 0|C11| 0|CXX23| 0|CID|NFC| 0| 0, 0, 0x02e4 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x02eb },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x02ec },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x02ed },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x02ee },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x02ff },
+{ 0| 0| 0|C11|N11|CXX23|NXX23|CID|NFC|NKC|CTX, 230, 0x0304 },
+{ 0| 0| 0|C11|N11|CXX23|NXX23|CID|NFC|NKC| 0, 230, 0x0305 },
+{ 0| 0| 0|C11|N11|CXX23|NXX23|CID|NFC|NKC|CTX, 230, 0x030c },
+{ 0| 0| 0|C11|N11|CXX23|NXX23|CID|NFC|NKC| 0, 230, 0x030e },
+{ 0| 0| 0|C11|N11|CXX23|NXX23|CID|NFC|NKC|CTX, 230, 0x030f },
+{ 0| 0| 0|C11|N11|CXX23|NXX23|CID|NFC|NKC| 0, 230, 0x0310 },
+{ 0| 0| 0|C11|N11|CXX23|NXX23|CID|NFC|NKC|CTX, 230, 0x0311 },
+{ 0| 0| 0|C11|N11|CXX23|NXX23|CID|NFC|NKC| 0, 230, 0x0312 },
+{ 0| 0| 0|C11|N11|CXX23|NXX23|CID|NFC|NKC|CTX, 230, 0x0314 },
+{ 0| 0| 0|C11|N11|CXX23|NXX23|CID|NFC|NKC| 0, 232, 0x0315 },
+{ 0| 0| 0|C11|N11|CXX23|NXX23|CID|NFC|NKC| 0, 220, 0x0319 },
+{ 0| 0| 0|C11|N11|CXX23|NXX23|CID|NFC|NKC| 0, 232, 0x031a },
+{ 0| 0| 0|C11|N11|CXX23|NXX23|CID|NFC|NKC|CTX, 216, 0x031b },
+{ 0| 0| 0|C11|N11|CXX23|NXX23|CID|NFC|NKC| 0, 220, 0x0320 },
+{ 0| 0| 0|C11|N11|CXX23|NXX23|CID|NFC|NKC| 0, 202, 0x0322 },
+{ 0| 0| 0|C11|N11|CXX23|NXX23|CID|NFC|NKC|CTX, 220, 0x0326 },
+{ 0| 0| 0|C11|N11|CXX23|NXX23|CID|NFC|NKC|CTX, 202, 0x0328 },
+{ 0| 0| 0|C11|N11|CXX23|NXX23|CID|NFC|NKC| 0, 220, 0x032c },
+{ 0| 0| 0|C11|N11|CXX23|NXX23|CID|NFC|NKC|CTX, 220, 0x032e },
+{ 0| 0| 0|C11|N11|CXX23|NXX23|CID|NFC|NKC| 0, 220, 0x032f },
+{ 0| 0| 0|C11|N11|CXX23|NXX23|CID|NFC|NKC|CTX, 220, 0x0331 },
+{ 0| 0| 0|C11|N11|CXX23|NXX23|CID|NFC|NKC| 0, 220, 0x0333 },
+{ 0| 0| 0|C11|N11|CXX23|NXX23|CID|NFC|NKC| 0, 1, 0x0337 },
+{ 0| 0| 0|C11|N11|CXX23|NXX23|CID|NFC|NKC|CTX, 1, 0x0338 },
+{ 0| 0| 0|C11|N11|CXX23|NXX23|CID|NFC|NKC| 0, 220, 0x033c },
+{ 0| 0| 0|C11|N11|CXX23|NXX23|CID|NFC|NKC| 0, 230, 0x033f },
+{ 0| 0| 0|C11|N11|CXX23|NXX23| 0| 0| 0| 0, 230, 0x0341 },
+{ 0| 0| 0|C11|N11|CXX23|NXX23|CID|NFC|NKC|CTX, 230, 0x0342 },
+{ 0| 0| 0|C11|N11|CXX23|NXX23| 0| 0| 0| 0, 230, 0x0344 },
+{ 0| 0| 0|C11|N11|CXX23|NXX23|CID|NFC|NKC|CTX, 240, 0x0345 },
+{ 0| 0| 0|C11|N11|CXX23|NXX23|CID|NFC|NKC| 0, 230, 0x0346 },
+{ 0| 0| 0|C11|N11|CXX23|NXX23|CID|NFC|NKC| 0, 220, 0x0349 },
+{ 0| 0| 0|C11|N11|CXX23|NXX23|CID|NFC|NKC| 0, 230, 0x034c },
+{ 0| 0| 0|C11|N11|CXX23|NXX23|CID|NFC|NKC| 0, 220, 0x034e },
+{ 0| 0| 0|C11|N11|CXX23|NXX23|CID|NFC|NKC| 0, 0, 0x034f },
+{ 0| 0| 0|C11|N11|CXX23|NXX23|CID|NFC|NKC| 0, 230, 0x0352 },
+{ 0| 0| 0|C11|N11|CXX23|NXX23|CID|NFC|NKC| 0, 220, 0x0356 },
+{ 0| 0| 0|C11|N11|CXX23|NXX23|CID|NFC|NKC| 0, 230, 0x0357 },
+{ 0| 0| 0|C11|N11|CXX23|NXX23|CID|NFC|NKC| 0, 232, 0x0358 },
+{ 0| 0| 0|C11|N11|CXX23|NXX23|CID|NFC|NKC| 0, 220, 0x035a },
+{ 0| 0| 0|C11|N11|CXX23|NXX23|CID|NFC|NKC| 0, 230, 0x035b },
+{ 0| 0| 0|C11|N11|CXX23|NXX23|CID|NFC|NKC| 0, 233, 0x035c },
+{ 0| 0| 0|C11|N11|CXX23|NXX23|CID|NFC|NKC| 0, 234, 0x035e },
+{ 0| 0| 0|C11|N11|CXX23|NXX23|CID|NFC|NKC| 0, 233, 0x035f },
+{ 0| 0| 0|C11|N11|CXX23|NXX23|CID|NFC|NKC| 0, 234, 0x0361 },
+{ 0| 0| 0|C11|N11|CXX23|NXX23|CID|NFC|NKC| 0, 233, 0x0362 },
+{ 0| 0| 0|C11|N11|CXX23|NXX23|CID|NFC|NKC| 0, 230, 0x036f },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x0373 },
+{ 0| 0| 0|C11| 0|CXX23| 0| 0| 0| 0| 0, 0, 0x0374 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x0375 },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x0377 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x0379 },
+{ C99| 0| 0|C11| 0| 0| 0|CID|NFC| 0| 0, 0, 0x037a },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x037d },
+{ 0| 0| 0|C11| 0| 0| 0|CID| 0| 0| 0, 0, 0x037e },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x037f },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x0383 },
+{ 0| 0|CXX|C11| 0| 0| 0|CID|NFC| 0| 0, 0, 0x0384 },
+{ 0| 0| 0|C11| 0| 0| 0| 0|NFC| 0| 0, 0, 0x0385 },
+{ C99| 0| 0|C11| 0|CXX23| 0| 0|NFC|NKC| 0, 0, 0x0386 },
+{ 0| 0| 0|C11| 0|CXX23|NXX23| 0| 0| 0| 0, 0, 0x0387 },
+{ C99| 0|CXX|C11| 0|CXX23| 0| 0|NFC|NKC| 0, 0, 0x038a },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x038b },
+{ C99| 0|CXX|C11| 0|CXX23| 0| 0|NFC|NKC| 0, 0, 0x038c },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x038d },
+{ C99| 0|CXX|C11| 0|CXX23| 0| 0|NFC|NKC| 0, 0, 0x0390 },
+{ C99| 0|CXX|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x03a1 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x03a2 },
+{ C99| 0|CXX|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x03a9 },
+{ C99| 0|CXX|C11| 0|CXX23| 0| 0|NFC|NKC| 0, 0, 0x03b0 },
+{ C99| 0|CXX|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x03c9 },
+{ C99| 0|CXX|C11| 0|CXX23| 0| 0|NFC|NKC| 0, 0, 0x03ce },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x03cf },
+{ C99| 0|CXX|C11| 0|CXX23| 0|CID|NFC| 0| 0, 0, 0x03d2 },
+{ C99| 0|CXX|C11| 0|CXX23| 0| 0|NFC| 0| 0, 0, 0x03d4 },
+{ C99| 0|CXX|C11| 0|CXX23| 0|CID|NFC| 0| 0, 0, 0x03d6 },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x03d9 },
+{ C99| 0|CXX|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x03da },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x03db },
+{ C99| 0|CXX|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x03dc },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x03dd },
+{ C99| 0|CXX|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x03de },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x03df },
+{ C99| 0|CXX|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x03e0 },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x03e1 },
+{ C99| 0|CXX|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x03ef },
+{ C99| 0|CXX|C11| 0|CXX23| 0|CID|NFC| 0| 0, 0, 0x03f2 },
+{ C99| 0|CXX|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x03f3 },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC| 0| 0, 0, 0x03f5 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x03f6 },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x03f8 },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC| 0| 0, 0, 0x03f9 },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x03ff },
+{ 0| 0| 0|C11| 0|CXX23| 0| 0|NFC|NKC| 0, 0, 0x0400 },
+{ C99| 0|CXX|C11| 0|CXX23| 0| 0|NFC|NKC| 0, 0, 0x0401 },
+{ C99| 0|CXX|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x0402 },
+{ C99| 0|CXX|C11| 0|CXX23| 0| 0|NFC|NKC| 0, 0, 0x0403 },
+{ C99| 0|CXX|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x0406 },
+{ C99| 0|CXX|C11| 0|CXX23| 0| 0|NFC|NKC| 0, 0, 0x0407 },
+{ C99| 0|CXX|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x040b },
+{ C99| 0|CXX|C11| 0|CXX23| 0| 0|NFC|NKC| 0, 0, 0x040c },
+{ 0| 0|CXX|C11| 0|CXX23| 0| 0|NFC|NKC| 0, 0, 0x040d },
+{ C99| 0| 0|C11| 0|CXX23| 0| 0|NFC|NKC| 0, 0, 0x040e },
+{ C99| 0|CXX|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x0418 },
+{ C99| 0|CXX|C11| 0|CXX23| 0| 0|NFC|NKC| 0, 0, 0x0419 },
+{ C99| 0|CXX|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x0438 },
+{ C99| 0|CXX|C11| 0|CXX23| 0| 0|NFC|NKC| 0, 0, 0x0439 },
+{ C99| 0|CXX|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x044f },
+{ 0| 0| 0|C11| 0|CXX23| 0| 0|NFC|NKC| 0, 0, 0x0450 },
+{ C99| 0|CXX|C11| 0|CXX23| 0| 0|NFC|NKC| 0, 0, 0x0451 },
+{ C99| 0|CXX|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x0452 },
+{ C99| 0|CXX|C11| 0|CXX23| 0| 0|NFC|NKC| 0, 0, 0x0453 },
+{ C99| 0|CXX|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x0456 },
+{ C99| 0|CXX|C11| 0|CXX23| 0| 0|NFC|NKC| 0, 0, 0x0457 },
+{ C99| 0|CXX|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x045b },
+{ C99| 0|CXX|C11| 0|CXX23| 0| 0|NFC|NKC| 0, 0, 0x045c },
+{ 0| 0| 0|C11| 0|CXX23| 0| 0|NFC|NKC| 0, 0, 0x045d },
+{ C99| 0|CXX|C11| 0|CXX23| 0| 0|NFC|NKC| 0, 0, 0x045e },
+{ C99| 0|CXX|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x0475 },
+{ C99| 0|CXX|C11| 0|CXX23| 0| 0|NFC|NKC| 0, 0, 0x0477 },
+{ C99| 0|CXX|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x0481 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x0482 },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 230, 0x0487 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x0489 },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x048f },
+{ C99| 0|CXX|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x04c0 },
+{ C99| 0|CXX|C11| 0|CXX23| 0| 0|NFC|NKC| 0, 0, 0x04c2 },
+{ C99| 0|CXX|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x04c4 },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x04c6 },
+{ C99| 0|CXX|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x04c8 },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x04ca },
+{ C99| 0|CXX|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x04cc },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x04cf },
+{ C99| 0|CXX|C11| 0|CXX23| 0| 0|NFC|NKC| 0, 0, 0x04d3 },
+{ C99| 0|CXX|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x04d5 },
+{ C99| 0|CXX|C11| 0|CXX23| 0| 0|NFC|NKC| 0, 0, 0x04d7 },
+{ C99| 0|CXX|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x04d9 },
+{ C99| 0|CXX|C11| 0|CXX23| 0| 0|NFC|NKC| 0, 0, 0x04df },
+{ C99| 0|CXX|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x04e1 },
+{ C99| 0|CXX|C11| 0|CXX23| 0| 0|NFC|NKC| 0, 0, 0x04e7 },
+{ C99| 0|CXX|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x04e9 },
+{ C99| 0|CXX|C11| 0|CXX23| 0| 0|NFC|NKC| 0, 0, 0x04eb },
+{ 0| 0| 0|C11| 0|CXX23| 0| 0|NFC|NKC| 0, 0, 0x04ed },
+{ C99| 0|CXX|C11| 0|CXX23| 0| 0|NFC|NKC| 0, 0, 0x04f5 },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x04f7 },
+{ C99| 0|CXX|C11| 0|CXX23| 0| 0|NFC|NKC| 0, 0, 0x04f9 },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x052f },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x0530 },
+{ C99| 0|CXX|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x0556 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x0558 },
+{ C99| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x0559 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x055f },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x0560 },
+{ C99| 0|CXX|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x0586 },
+{ C99| 0|CXX|C11| 0|CXX23| 0|CID|NFC| 0| 0, 0, 0x0587 },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x0588 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x0590 },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 220, 0x0591 },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 230, 0x0595 },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 220, 0x0596 },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 230, 0x0599 },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 222, 0x059a },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 220, 0x059b },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 230, 0x05a1 },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 220, 0x05a7 },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 230, 0x05a9 },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 220, 0x05aa },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 230, 0x05ac },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 222, 0x05ad },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 228, 0x05ae },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 230, 0x05af },
+{ C99| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 10, 0x05b0 },
+{ C99| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 11, 0x05b1 },
+{ C99| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 12, 0x05b2 },
+{ C99| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 13, 0x05b3 },
+{ C99| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 14, 0x05b4 },
+{ C99| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 15, 0x05b5 },
+{ C99| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 16, 0x05b6 },
+{ C99| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 17, 0x05b7 },
+{ C99| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 18, 0x05b8 },
+{ C99| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 19, 0x05b9 },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 19, 0x05ba },
+{ C99| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 20, 0x05bb },
+{ C99| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 21, 0x05bc },
+{ C99| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 22, 0x05bd },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x05be },
+{ C99| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 23, 0x05bf },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x05c0 },
+{ C99| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 24, 0x05c1 },
+{ C99| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 25, 0x05c2 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x05c3 },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 230, 0x05c4 },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 220, 0x05c5 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x05c6 },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 18, 0x05c7 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x05cf },
+{ C99| 0|CXX|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x05ea },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x05ee },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x05ef },
+{ C99| 0|CXX|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x05f2 },
+{ 0| 0|CXX|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x05f4 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x060f },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 230, 0x0617 },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 30, 0x0618 },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 31, 0x0619 },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 32, 0x061a },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x061f },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x0620 },
+{ C99| 0|CXX|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x0621 },
+{ C99| 0|CXX|C11| 0|CXX23| 0| 0|NFC|NKC| 0, 0, 0x0626 },
+{ C99| 0|CXX|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x063a },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x063f },
+{ C99| 0|CXX|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x064a },
+{ C99| 0|CXX|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 27, 0x064b },
+{ C99| 0|CXX|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 28, 0x064c },
+{ C99| 0|CXX|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 29, 0x064d },
+{ C99| 0|CXX|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 30, 0x064e },
+{ C99| 0|CXX|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 31, 0x064f },
+{ C99| 0|CXX|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 32, 0x0650 },
+{ C99| 0|CXX|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 33, 0x0651 },
+{ C99| 0|CXX|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 34, 0x0652 },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC|CTX, 230, 0x0654 },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC|CTX, 220, 0x0655 },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 220, 0x0656 },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 230, 0x065b },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 220, 0x065c },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 230, 0x065e },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 220, 0x065f },
+{ C99|N99| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 0, 0x0669 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x066d },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x066f },
+{ C99| 0|CXX|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 35, 0x0670 },
+{ C99| 0|CXX|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x0674 },
+{ C99| 0|CXX|C11| 0|CXX23| 0|CID|NFC| 0| 0, 0, 0x0678 },
+{ C99| 0|CXX|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x06b7 },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x06b9 },
+{ C99| 0|CXX|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x06be },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x06bf },
+{ C99| 0|CXX|C11| 0|CXX23| 0| 0|NFC|NKC| 0, 0, 0x06c0 },
+{ C99| 0|CXX|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x06c1 },
+{ C99| 0|CXX|C11| 0|CXX23| 0| 0|NFC|NKC| 0, 0, 0x06c2 },
+{ C99| 0|CXX|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x06ce },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x06cf },
+{ C99| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x06d2 },
+{ C99| 0| 0|C11| 0|CXX23| 0| 0|NFC|NKC| 0, 0, 0x06d3 },
+{ C99| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x06d4 },
+{ C99| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x06d5 },
+{ C99| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 230, 0x06dc },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x06de },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 230, 0x06e2 },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 220, 0x06e3 },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 230, 0x06e4 },
+{ C99| 0|CXX|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x06e6 },
+{ C99| 0|CXX|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 230, 0x06e7 },
+{ C99| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 230, 0x06e8 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x06e9 },
+{ C99| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 220, 0x06ea },
+{ C99| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 230, 0x06ec },
+{ C99| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 220, 0x06ed },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x06ef },
+{ C99|N99| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 0, 0x06f9 },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x06fc },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x06fe },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x06ff },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x070f },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x0710 },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 36, 0x0711 },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x072f },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 230, 0x0730 },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 220, 0x0731 },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 230, 0x0733 },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 220, 0x0734 },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 230, 0x0736 },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 220, 0x0739 },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 230, 0x073a },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 220, 0x073c },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 230, 0x073d },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 220, 0x073e },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 230, 0x0741 },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 220, 0x0742 },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 230, 0x0743 },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 220, 0x0744 },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 230, 0x0745 },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 220, 0x0746 },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 230, 0x0747 },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 220, 0x0748 },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 230, 0x074a },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x074c },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x07a5 },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 0, 0x07b0 },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x07b1 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x07bf },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 0, 0x07c9 },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x07ea },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 230, 0x07f1 },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 220, 0x07f2 },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 230, 0x07f3 },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x07f5 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x07f9 },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x07fa },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x07fc },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 220, 0x07fd },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x07ff },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x0815 },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 230, 0x0819 },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x081a },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 230, 0x0823 },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x0824 },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 230, 0x0827 },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x0828 },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 230, 0x082d },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x083f },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x0858 },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 220, 0x085b },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x085f },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x086a },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x089f },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x08b4 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x08b5 },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x08c7 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x08d2 },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 220, 0x08d3 },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 230, 0x08e1 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x08e2 },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 220, 0x08e3 },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 230, 0x08e5 },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 220, 0x08e6 },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 230, 0x08e8 },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 220, 0x08e9 },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 230, 0x08ec },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 220, 0x08ef },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 27, 0x08f0 },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 28, 0x08f1 },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 29, 0x08f2 },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 230, 0x08f5 },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 220, 0x08f6 },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 230, 0x08f8 },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 220, 0x08fa },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 230, 0x08ff },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 0, 0x0900 },
+{ C99| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 0, 0x0903 },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x0904 },
+{ C99| 0|CXX|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x0928 },
+{ C99| 0|CXX|C11| 0|CXX23| 0| 0|NFC|NKC| 0, 0, 0x0929 },
+{ C99| 0|CXX|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x0930 },
+{ C99| 0|CXX|C11| 0|CXX23| 0| 0|NFC|NKC| 0, 0, 0x0931 },
+{ C99| 0|CXX|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x0933 },
+{ C99| 0|CXX|C11| 0|CXX23| 0| 0|NFC|NKC| 0, 0, 0x0934 },
+{ C99| 0|CXX|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x0939 },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 0, 0x093b },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC|CTX, 7, 0x093c },
+{ C99| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x093d },
+{ C99| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 0, 0x094c },
+{ C99| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 9, 0x094d },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 0, 0x094f },
+{ C99| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x0950 },
+{ C99| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 230, 0x0951 },
+{ C99| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 220, 0x0952 },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 230, 0x0954 },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 0, 0x0957 },
+{ C99| 0|CXX|C11| 0|CXX23| 0| 0| 0| 0| 0, 0, 0x095f },
+{ C99| 0|CXX|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x0961 },
+{ C99| 0|CXX|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 0, 0x0962 },
+{ C99| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 0, 0x0963 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x0965 },
+{ C99|N99| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 0, 0x096f },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x0970 },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x0980 },
+{ C99| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 0, 0x0983 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x0984 },
+{ C99| 0|CXX|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x098c },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x098e },
+{ C99| 0|CXX|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x0990 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x0992 },
+{ C99| 0|CXX|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x09a8 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x09a9 },
+{ C99| 0|CXX|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x09b0 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x09b1 },
+{ C99| 0|CXX|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x09b2 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x09b5 },
+{ C99| 0|CXX|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x09b9 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x09bb },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 7, 0x09bc },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x09bd },
+{ C99| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC|CTX, 0, 0x09be },
+{ C99| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 0, 0x09c4 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x09c6 },
+{ C99| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 0, 0x09c8 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x09ca },
+{ C99| 0| 0|C11| 0|CXX23|NXX23| 0|NFC|NKC| 0, 0, 0x09cc },
+{ C99| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 9, 0x09cd },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x09ce },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x09d6 },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC|CTX, 0, 0x09d7 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x09db },
+{ C99| 0|CXX|C11| 0|CXX23| 0| 0| 0| 0| 0, 0, 0x09dd },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x09de },
+{ C99| 0|CXX|C11| 0|CXX23| 0| 0| 0| 0| 0, 0, 0x09df },
+{ C99| 0|CXX|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x09e1 },
+{ C99| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 0, 0x09e3 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x09e5 },
+{ C99|N99| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 0, 0x09ef },
+{ C99| 0|CXX|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x09f1 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x09fb },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x09fc },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x09fd },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 230, 0x09fe },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x0a00 },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 0, 0x0a01 },
+{ C99| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 0, 0x0a02 },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 0, 0x0a03 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x0a04 },
+{ C99| 0|CXX|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x0a0a },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x0a0e },
+{ C99| 0|CXX|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x0a10 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x0a12 },
+{ C99| 0|CXX|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x0a28 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x0a29 },
+{ C99| 0|CXX|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x0a30 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x0a31 },
+{ C99| 0|CXX|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x0a32 },
+{ C99| 0|CXX|C11| 0|CXX23| 0| 0| 0| 0| 0, 0, 0x0a33 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x0a34 },
+{ C99| 0|CXX|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x0a35 },
+{ C99| 0|CXX|C11| 0|CXX23| 0| 0| 0| 0| 0, 0, 0x0a36 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x0a37 },
+{ C99| 0|CXX|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x0a39 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x0a3b },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 7, 0x0a3c },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x0a3d },
+{ C99| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 0, 0x0a42 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x0a46 },
+{ C99| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 0, 0x0a48 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x0a4a },
+{ C99| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 0, 0x0a4c },
+{ C99| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 9, 0x0a4d },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x0a50 },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 0, 0x0a51 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x0a58 },
+{ C99| 0|CXX|C11| 0|CXX23| 0| 0| 0| 0| 0, 0, 0x0a5b },
+{ C99| 0|CXX|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x0a5c },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x0a5d },
+{ C99| 0|CXX|C11| 0|CXX23| 0| 0| 0| 0| 0, 0, 0x0a5e },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x0a65 },
+{ C99|N99| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 0, 0x0a6f },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 0, 0x0a71 },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x0a73 },
+{ C99| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x0a74 },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 0, 0x0a75 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x0a80 },
+{ C99| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 0, 0x0a83 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x0a84 },
+{ C99| 0|CXX|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x0a8b },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x0a8c },
+{ C99| 0|CXX|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x0a8d },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x0a8e },
+{ C99| 0|CXX|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x0a91 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x0a92 },
+{ C99| 0|CXX|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x0aa8 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x0aa9 },
+{ C99| 0|CXX|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x0ab0 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x0ab1 },
+{ C99| 0|CXX|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x0ab3 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x0ab4 },
+{ C99| 0|CXX|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x0ab9 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x0abb },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 7, 0x0abc },
+{ C99| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x0abd },
+{ C99| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 0, 0x0ac5 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x0ac6 },
+{ C99| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 0, 0x0ac9 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x0aca },
+{ C99| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 0, 0x0acc },
+{ C99| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 9, 0x0acd },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x0acf },
+{ C99| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x0ad0 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x0adf },
+{ C99| 0|CXX|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x0ae0 },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x0ae1 },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 0, 0x0ae3 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x0ae5 },
+{ C99|N99| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 0, 0x0aef },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x0af8 },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x0af9 },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 0, 0x0aff },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x0b00 },
+{ C99| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 0, 0x0b03 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x0b04 },
+{ C99| 0|CXX|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x0b0c },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x0b0e },
+{ C99| 0|CXX|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x0b10 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x0b12 },
+{ C99| 0|CXX|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x0b28 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x0b29 },
+{ C99| 0|CXX|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x0b30 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x0b31 },
+{ C99| 0|CXX|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x0b33 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x0b34 },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x0b35 },
+{ C99| 0|CXX|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x0b39 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x0b3b },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 7, 0x0b3c },
+{ C99| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x0b3d },
+{ C99| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC|CTX, 0, 0x0b3e },
+{ C99| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 0, 0x0b43 },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 0, 0x0b44 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x0b46 },
+{ C99| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 0, 0x0b47 },
+{ C99| 0| 0|C11| 0|CXX23|NXX23| 0|NFC|NKC| 0, 0, 0x0b48 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x0b4a },
+{ C99| 0| 0|C11| 0|CXX23|NXX23| 0|NFC|NKC| 0, 0, 0x0b4c },
+{ C99| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 9, 0x0b4d },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x0b54 },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 0, 0x0b55 },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC|CTX, 0, 0x0b57 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x0b5b },
+{ C99| 0|CXX|C11| 0|CXX23| 0| 0| 0| 0| 0, 0, 0x0b5d },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x0b5e },
+{ C99| 0|CXX|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x0b61 },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 0, 0x0b63 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x0b65 },
+{ C99|N99| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 0, 0x0b6f },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x0b70 },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x0b71 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x0b81 },
+{ C99| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 0, 0x0b82 },
+{ C99| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x0b83 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x0b84 },
+{ C99| 0|CXX|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x0b8a },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x0b8d },
+{ C99| 0|CXX|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x0b90 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x0b91 },
+{ C99| 0|CXX|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x0b93 },
+{ C99| 0|CXX|C11| 0|CXX23| 0| 0|NFC|NKC| 0, 0, 0x0b94 },
+{ C99| 0|CXX|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x0b95 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x0b98 },
+{ C99| 0|CXX|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x0b9a },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x0b9b },
+{ C99| 0|CXX|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x0b9c },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x0b9d },
+{ C99| 0|CXX|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x0b9f },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x0ba2 },
+{ C99| 0|CXX|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x0ba4 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x0ba7 },
+{ C99| 0|CXX|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x0baa },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x0bad },
+{ C99| 0|CXX|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x0bb5 },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x0bb6 },
+{ C99| 0|CXX|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x0bb9 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x0bbd },
+{ C99| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC|CTX, 0, 0x0bbe },
+{ C99| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 0, 0x0bc2 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x0bc5 },
+{ C99| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 0, 0x0bc8 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x0bc9 },
+{ C99| 0| 0|C11| 0|CXX23|NXX23| 0|NFC|NKC| 0, 0, 0x0bcc },
+{ C99| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 9, 0x0bcd },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x0bcf },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x0bd0 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x0bd6 },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC|CTX, 0, 0x0bd7 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x0be5 },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 0, 0x0be6 },
+{ C99|N99| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 0, 0x0bef },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x0bff },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 0, 0x0c00 },
+{ C99| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 0, 0x0c03 },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 0, 0x0c04 },
+{ C99| 0|CXX|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x0c0c },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x0c0d },
+{ C99| 0|CXX|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x0c10 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x0c11 },
+{ C99| 0|CXX|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x0c28 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x0c29 },
+{ C99| 0|CXX|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x0c33 },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x0c34 },
+{ C99| 0|CXX|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x0c39 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x0c3c },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x0c3d },
+{ C99| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 0, 0x0c44 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x0c45 },
+{ C99| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 0, 0x0c47 },
+{ C99| 0| 0|C11| 0|CXX23|NXX23| 0|NFC|NKC| 0, 0, 0x0c48 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x0c49 },
+{ C99| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 0, 0x0c4c },
+{ C99| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 9, 0x0c4d },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x0c54 },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 84, 0x0c55 },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC|CTX, 91, 0x0c56 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x0c57 },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x0c5a },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x0c5f },
+{ C99| 0|CXX|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x0c61 },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 0, 0x0c63 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x0c65 },
+{ C99|N99| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 0, 0x0c6f },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x0c7f },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x0c80 },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 0, 0x0c81 },
+{ C99| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 0, 0x0c83 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x0c84 },
+{ C99| 0|CXX|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x0c8c },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x0c8d },
+{ C99| 0|CXX|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x0c90 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x0c91 },
+{ C99| 0|CXX|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x0ca8 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x0ca9 },
+{ C99| 0|CXX|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x0cb3 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x0cb4 },
+{ C99| 0|CXX|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x0cb9 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x0cbb },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 7, 0x0cbc },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x0cbd },
+{ C99| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 0, 0x0cbf },
+{ C99| 0| 0|C11| 0|CXX23|NXX23| 0|NFC|NKC| 0, 0, 0x0cc0 },
+{ C99| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 0, 0x0cc1 },
+{ C99| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC|CTX, 0, 0x0cc2 },
+{ C99| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 0, 0x0cc4 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x0cc5 },
+{ C99| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 0, 0x0cc6 },
+{ C99| 0| 0|C11| 0|CXX23|NXX23| 0|NFC|NKC| 0, 0, 0x0cc8 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x0cc9 },
+{ C99| 0| 0|C11| 0|CXX23|NXX23| 0|NFC|NKC| 0, 0, 0x0ccb },
+{ C99| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 0, 0x0ccc },
+{ C99| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 9, 0x0ccd },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x0cd4 },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC|CTX, 0, 0x0cd6 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x0cdd },
+{ C99| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x0cde },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x0cdf },
+{ C99| 0|CXX|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x0ce1 },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 0, 0x0ce3 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x0ce5 },
+{ C99|N99| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 0, 0x0cef },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x0cf0 },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x0cf2 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x0cff },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 0, 0x0d01 },
+{ C99| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 0, 0x0d03 },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x0d04 },
+{ C99| 0|CXX|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x0d0c },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x0d0d },
+{ C99| 0|CXX|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x0d10 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x0d11 },
+{ C99| 0|CXX|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x0d28 },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x0d29 },
+{ C99| 0|CXX|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x0d39 },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x0d3a },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 9, 0x0d3c },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x0d3d },
+{ C99| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC|CTX, 0, 0x0d3e },
+{ C99| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 0, 0x0d43 },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 0, 0x0d44 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x0d45 },
+{ C99| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 0, 0x0d48 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x0d49 },
+{ C99| 0| 0|C11| 0|CXX23|NXX23| 0|NFC|NKC| 0, 0, 0x0d4c },
+{ C99| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 9, 0x0d4d },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x0d4e },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x0d53 },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x0d56 },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC|CTX, 0, 0x0d57 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x0d5e },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x0d5f },
+{ C99| 0|CXX|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x0d61 },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 0, 0x0d63 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x0d65 },
+{ C99|N99| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 0, 0x0d6f },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x0d79 },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x0d7f },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x0d80 },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 0, 0x0d83 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x0d84 },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x0d96 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x0d99 },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x0db1 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x0db2 },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x0dbb },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x0dbc },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x0dbd },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x0dbf },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x0dc6 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x0dc9 },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC|CTX, 9, 0x0dca },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x0dce },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC|CTX, 0, 0x0dcf },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 0, 0x0dd4 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x0dd5 },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 0, 0x0dd6 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x0dd7 },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 0, 0x0dd9 },
+{ 0| 0| 0|C11| 0|CXX23|NXX23| 0|NFC|NKC| 0, 0, 0x0dda },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 0, 0x0ddb },
+{ 0| 0| 0|C11| 0|CXX23|NXX23| 0|NFC|NKC| 0, 0, 0x0dde },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC|CTX, 0, 0x0ddf },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x0de5 },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 0, 0x0def },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x0df1 },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 0, 0x0df3 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x0e00 },
+{ C99| 0|CXX|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x0e30 },
+{ C99| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 0, 0x0e31 },
+{ C99| 0|CXX|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x0e32 },
+{ C99| 0|CXX|C11| 0|CXX23|NXX23|CID|NFC| 0| 0, 0, 0x0e33 },
+{ C99| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 0, 0x0e37 },
+{ C99| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 103, 0x0e39 },
+{ C99| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 9, 0x0e3a },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x0e3f },
+{ C99| 0|CXX|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x0e46 },
+{ C99| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 0, 0x0e47 },
+{ C99| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 107, 0x0e49 },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 107, 0x0e4b },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 0, 0x0e4e },
+{ 0| 0|CXX|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x0e4f },
+{ C99|N99|CXX|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 0, 0x0e59 },
+{ C99| 0|CXX|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x0e5b },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x0e80 },
+{ C99| 0|CXX|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x0e82 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x0e83 },
+{ C99| 0|CXX|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x0e84 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x0e85 },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x0e86 },
+{ C99| 0|CXX|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x0e88 },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x0e89 },
+{ C99| 0|CXX|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x0e8a },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x0e8b },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x0e8c },
+{ C99| 0|CXX|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x0e8d },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x0e93 },
+{ C99| 0|CXX|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x0e97 },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x0e98 },
+{ C99| 0|CXX|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x0e9f },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x0ea0 },
+{ C99| 0|CXX|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x0ea3 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x0ea4 },
+{ C99| 0|CXX|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x0ea5 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x0ea6 },
+{ C99| 0|CXX|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x0ea7 },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x0ea9 },
+{ C99| 0|CXX|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x0eab },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x0eac },
+{ C99| 0|CXX|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x0eae },
+{ 0| 0|CXX|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x0eaf },
+{ C99| 0|CXX|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x0eb0 },
+{ C99| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 0, 0x0eb1 },
+{ C99| 0|CXX|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x0eb2 },
+{ C99| 0|CXX|C11| 0|CXX23|NXX23|CID|NFC| 0| 0, 0, 0x0eb3 },
+{ C99| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 0, 0x0eb7 },
+{ C99| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 118, 0x0eb9 },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 9, 0x0eba },
+{ C99| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 0, 0x0ebc },
+{ C99| 0|CXX|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x0ebd },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x0ebf },
+{ C99| 0|CXX|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x0ec4 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x0ec5 },
+{ C99| 0|CXX|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x0ec6 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x0ec7 },
+{ C99| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 122, 0x0ecb },
+{ C99| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 0, 0x0ecd },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x0ecf },
+{ C99|N99| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 0, 0x0ed9 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x0edb },
+{ C99| 0| 0|C11| 0|CXX23| 0|CID|NFC| 0| 0, 0, 0x0edd },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x0edf },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x0eff },
+{ C99| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x0f00 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x0f0b },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC| 0| 0, 0, 0x0f0c },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x0f17 },
+{ C99| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 220, 0x0f19 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x0f1f },
+{ C99|N99| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 0, 0x0f29 },
+{ C99|N99| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x0f33 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x0f34 },
+{ C99| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 220, 0x0f35 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x0f36 },
+{ C99| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 220, 0x0f37 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x0f38 },
+{ C99| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 216, 0x0f39 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x0f3d },
+{ C99| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 0, 0x0f3f },
+{ C99| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x0f42 },
+{ C99| 0| 0|C11| 0|CXX23| 0| 0| 0| 0| 0, 0, 0x0f43 },
+{ C99| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x0f47 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x0f48 },
+{ C99| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x0f4c },
+{ C99| 0| 0|C11| 0|CXX23| 0| 0| 0| 0| 0, 0, 0x0f4d },
+{ C99| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x0f51 },
+{ C99| 0| 0|C11| 0|CXX23| 0| 0| 0| 0| 0, 0, 0x0f52 },
+{ C99| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x0f56 },
+{ C99| 0| 0|C11| 0|CXX23| 0| 0| 0| 0| 0, 0, 0x0f57 },
+{ C99| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x0f5b },
+{ C99| 0| 0|C11| 0|CXX23| 0| 0| 0| 0| 0, 0, 0x0f5c },
+{ C99| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x0f68 },
+{ C99| 0| 0|C11| 0|CXX23| 0| 0| 0| 0| 0, 0, 0x0f69 },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x0f6c },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x0f70 },
+{ C99| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 129, 0x0f71 },
+{ C99| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 130, 0x0f72 },
+{ C99| 0| 0|C11| 0|CXX23|NXX23| 0| 0| 0| 0, 0, 0x0f73 },
+{ C99| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 132, 0x0f74 },
+{ C99| 0| 0|C11| 0|CXX23|NXX23| 0| 0| 0| 0, 0, 0x0f76 },
+{ C99| 0| 0|C11| 0|CXX23|NXX23|CID|NFC| 0| 0, 0, 0x0f77 },
+{ C99| 0| 0|C11| 0|CXX23|NXX23| 0| 0| 0| 0, 0, 0x0f78 },
+{ C99| 0| 0|C11| 0|CXX23|NXX23|CID|NFC| 0| 0, 0, 0x0f79 },
+{ C99| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 130, 0x0f7d },
+{ C99| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 0, 0x0f7f },
+{ C99| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 130, 0x0f80 },
+{ C99| 0| 0|C11| 0|CXX23|NXX23| 0| 0| 0| 0, 0, 0x0f81 },
+{ C99| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 230, 0x0f83 },
+{ C99| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 9, 0x0f84 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x0f85 },
+{ C99| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 230, 0x0f87 },
+{ C99| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x0f8b },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x0f8c },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 0, 0x0f8f },
+{ C99| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 0, 0x0f92 },
+{ C99| 0| 0|C11| 0|CXX23|NXX23| 0| 0| 0| 0, 0, 0x0f93 },
+{ C99| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 0, 0x0f95 },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 0, 0x0f96 },
+{ C99| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 0, 0x0f97 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x0f98 },
+{ C99| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 0, 0x0f9c },
+{ C99| 0| 0|C11| 0|CXX23|NXX23| 0| 0| 0| 0, 0, 0x0f9d },
+{ C99| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 0, 0x0fa1 },
+{ C99| 0| 0|C11| 0|CXX23|NXX23| 0| 0| 0| 0, 0, 0x0fa2 },
+{ C99| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 0, 0x0fa6 },
+{ C99| 0| 0|C11| 0|CXX23|NXX23| 0| 0| 0| 0, 0, 0x0fa7 },
+{ C99| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 0, 0x0fab },
+{ C99| 0| 0|C11| 0|CXX23|NXX23| 0| 0| 0| 0, 0, 0x0fac },
+{ C99| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 0, 0x0fad },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 0, 0x0fb0 },
+{ C99| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 0, 0x0fb7 },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 0, 0x0fb8 },
+{ C99| 0| 0|C11| 0|CXX23|NXX23| 0| 0| 0| 0, 0, 0x0fb9 },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 0, 0x0fbc },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x0fc5 },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 220, 0x0fc6 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x0fff },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x1025 },
+{ 0| 0| 0|C11| 0|CXX23| 0| 0|NFC|NKC| 0, 0, 0x1026 },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x102a },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 0, 0x102d },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC|CTX, 0, 0x102e },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 0, 0x1036 },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 7, 0x1037 },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 0, 0x1038 },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 9, 0x103a },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 0, 0x103e },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x103f },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 0, 0x1049 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x104f },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x1055 },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 0, 0x1059 },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x105d },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 0, 0x1060 },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x1061 },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 0, 0x1064 },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x1066 },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 0, 0x106d },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x1070 },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 0, 0x1074 },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x1081 },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 0, 0x108c },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 220, 0x108d },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x108e },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 0, 0x109d },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x109f },
+{ C99| 0|CXX|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x10c5 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x10c6 },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x10c7 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x10cc },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x10cd },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x10cf },
+{ C99| 0|CXX|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x10f6 },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x10fa },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x10fb },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC| 0| 0, 0, 0x10fc },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x10ff },
+{ 0| 0|CXX|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x1159 },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x1160 },
+{ 0| 0|CXX|C11| 0|CXX23| 0|CID|NFC|NKC|CTX, 0, 0x1175 },
+{ 0| 0|CXX|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x11a2 },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x11a7 },
+{ 0| 0|CXX|C11| 0|CXX23| 0|CID|NFC|NKC|CTX, 0, 0x11c2 },
+{ 0| 0|CXX|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x11f9 },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x1248 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x1249 },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x124d },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x124f },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x1256 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x1257 },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x1258 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x1259 },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x125d },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x125f },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x1288 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x1289 },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x128d },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x128f },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x12b0 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x12b1 },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x12b5 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x12b7 },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x12be },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x12bf },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x12c0 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x12c1 },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x12c5 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x12c7 },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x12d6 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x12d7 },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x1310 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x1311 },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x1315 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x1317 },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x135a },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x135c },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 230, 0x135f },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x1368 },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 0, 0x1371 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x137f },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x138f },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x139f },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x13f5 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x13f7 },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x13fd },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x1400 },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x166c },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x166e },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x167f },
+{ 0| 0| 0| 0| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x1680 },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x169a },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x169f },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x16ea },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x16ed },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x16f8 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x16ff },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x170c },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x170d },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x1711 },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 0, 0x1713 },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 9, 0x1714 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x171f },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x1731 },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 0, 0x1733 },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 9, 0x1734 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x173f },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x1751 },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 0, 0x1753 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x175f },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x176c },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x176d },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x1770 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x1771 },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 0, 0x1773 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x177f },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x17b3 },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 0, 0x17d1 },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 9, 0x17d2 },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 0, 0x17d3 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x17d6 },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x17d7 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x17db },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x17dc },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 230, 0x17dd },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x17df },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 0, 0x17e9 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x180a },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 0, 0x180d },
+{ 0| 0| 0| 0| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x180e },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x180f },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 0, 0x1819 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x181f },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x1878 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x187f },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x18a8 },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 228, 0x18a9 },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x18aa },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x18af },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x18f5 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x18ff },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x191e },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x191f },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 0, 0x192b },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x192f },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 0, 0x1938 },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 222, 0x1939 },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 230, 0x193a },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 220, 0x193b },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x1945 },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 0, 0x194f },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x196d },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x196f },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x1974 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x197f },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x19ab },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x19af },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x19c9 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x19cf },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 0, 0x19da },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x19ff },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x1a16 },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 230, 0x1a17 },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 220, 0x1a18 },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 0, 0x1a1b },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x1a1f },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x1a54 },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 0, 0x1a5e },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x1a5f },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 9, 0x1a60 },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 0, 0x1a74 },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 230, 0x1a7c },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x1a7e },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 220, 0x1a7f },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 0, 0x1a89 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x1a8f },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 0, 0x1a99 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x1aa6 },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x1aa7 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x1aaf },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 230, 0x1ab4 },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 220, 0x1aba },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 230, 0x1abc },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 220, 0x1abd },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x1abe },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 220, 0x1ac0 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x1aff },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 0, 0x1b04 },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x1b05 },
+{ 0| 0| 0|C11| 0|CXX23| 0| 0|NFC|NKC| 0, 0, 0x1b06 },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x1b07 },
+{ 0| 0| 0|C11| 0|CXX23| 0| 0|NFC|NKC| 0, 0, 0x1b08 },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x1b09 },
+{ 0| 0| 0|C11| 0|CXX23| 0| 0|NFC|NKC| 0, 0, 0x1b0a },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x1b0b },
+{ 0| 0| 0|C11| 0|CXX23| 0| 0|NFC|NKC| 0, 0, 0x1b0c },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x1b0d },
+{ 0| 0| 0|C11| 0|CXX23| 0| 0|NFC|NKC| 0, 0, 0x1b0e },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x1b11 },
+{ 0| 0| 0|C11| 0|CXX23| 0| 0|NFC|NKC| 0, 0, 0x1b12 },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x1b33 },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 7, 0x1b34 },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC|CTX, 0, 0x1b35 },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 0, 0x1b3a },
+{ 0| 0| 0|C11| 0|CXX23|NXX23| 0|NFC|NKC| 0, 0, 0x1b3b },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 0, 0x1b3c },
+{ 0| 0| 0|C11| 0|CXX23|NXX23| 0|NFC|NKC| 0, 0, 0x1b3d },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 0, 0x1b3f },
+{ 0| 0| 0|C11| 0|CXX23|NXX23| 0|NFC|NKC| 0, 0, 0x1b41 },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 0, 0x1b42 },
+{ 0| 0| 0|C11| 0|CXX23|NXX23| 0|NFC|NKC| 0, 0, 0x1b43 },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 9, 0x1b44 },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x1b4b },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x1b4f },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 0, 0x1b59 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x1b6a },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 230, 0x1b6b },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 220, 0x1b6c },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 230, 0x1b73 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x1b7f },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 0, 0x1b82 },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x1ba0 },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 0, 0x1ba9 },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 9, 0x1bab },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 0, 0x1bad },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x1baf },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 0, 0x1bb9 },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x1be5 },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 7, 0x1be6 },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 0, 0x1bf1 },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 9, 0x1bf3 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x1bff },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x1c23 },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 0, 0x1c36 },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 7, 0x1c37 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x1c3f },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 0, 0x1c49 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x1c4c },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x1c4f },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 0, 0x1c59 },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x1c7d },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x1c7f },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x1c88 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x1c8f },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x1cba },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x1cbc },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x1cbf },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x1ccf },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 230, 0x1cd2 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x1cd3 },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 1, 0x1cd4 },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 220, 0x1cd9 },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 230, 0x1cdb },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 220, 0x1cdf },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 230, 0x1ce0 },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 0, 0x1ce1 },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 1, 0x1ce8 },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x1cec },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 220, 0x1ced },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x1cf3 },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 230, 0x1cf4 },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x1cf6 },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 0, 0x1cf7 },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 230, 0x1cf9 },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x1cfa },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x1cff },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x1d2b },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC| 0| 0, 0, 0x1d2e },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x1d2f },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC| 0| 0, 0, 0x1d3a },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x1d3b },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC| 0| 0, 0, 0x1d4d },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x1d4e },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC| 0| 0, 0, 0x1d6a },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x1d77 },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC| 0| 0, 0, 0x1d78 },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x1d9a },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC| 0| 0, 0, 0x1dbf },
+{ 0| 0| 0|C11|N11|CXX23|NXX23|CID|NFC|NKC| 0, 230, 0x1dc1 },
+{ 0| 0| 0|C11|N11|CXX23|NXX23|CID|NFC|NKC| 0, 220, 0x1dc2 },
+{ 0| 0| 0|C11|N11|CXX23|NXX23|CID|NFC|NKC| 0, 230, 0x1dc9 },
+{ 0| 0| 0|C11|N11|CXX23|NXX23|CID|NFC|NKC| 0, 220, 0x1dca },
+{ 0| 0| 0|C11|N11|CXX23|NXX23|CID|NFC|NKC| 0, 230, 0x1dcc },
+{ 0| 0| 0|C11|N11|CXX23|NXX23|CID|NFC|NKC| 0, 234, 0x1dcd },
+{ 0| 0| 0|C11|N11|CXX23|NXX23|CID|NFC|NKC| 0, 214, 0x1dce },
+{ 0| 0| 0|C11|N11|CXX23|NXX23|CID|NFC|NKC| 0, 220, 0x1dcf },
+{ 0| 0| 0|C11|N11|CXX23|NXX23|CID|NFC|NKC| 0, 202, 0x1dd0 },
+{ 0| 0| 0|C11|N11|CXX23|NXX23|CID|NFC|NKC| 0, 230, 0x1df5 },
+{ 0| 0| 0|C11|N11|CXX23|NXX23|CID|NFC|NKC| 0, 232, 0x1df6 },
+{ 0| 0| 0|C11|N11|CXX23|NXX23|CID|NFC|NKC| 0, 228, 0x1df8 },
+{ 0| 0| 0|C11|N11|CXX23|NXX23|CID|NFC|NKC| 0, 220, 0x1df9 },
+{ 0| 0| 0|C11|N11| 0| 0|CID|NFC|NKC| 0, 0, 0x1dfa },
+{ 0| 0| 0|C11|N11|CXX23|NXX23|CID|NFC|NKC| 0, 230, 0x1dfb },
+{ 0| 0| 0|C11|N11|CXX23|NXX23|CID|NFC|NKC| 0, 233, 0x1dfc },
+{ 0| 0| 0|C11|N11|CXX23|NXX23|CID|NFC|NKC| 0, 220, 0x1dfd },
+{ 0| 0| 0|C11|N11|CXX23|NXX23|CID|NFC|NKC| 0, 230, 0x1dfe },
+{ 0| 0| 0|C11|N11|CXX23|NXX23|CID|NFC|NKC| 0, 220, 0x1dff },
+{ C99| 0|CXX|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x1e07 },
+{ C99| 0|CXX|C11| 0|CXX23| 0| 0|NFC|NKC| 0, 0, 0x1e09 },
+{ C99| 0|CXX|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x1e13 },
+{ C99| 0|CXX|C11| 0|CXX23| 0| 0|NFC|NKC| 0, 0, 0x1e17 },
+{ C99| 0|CXX|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x1e1b },
+{ C99| 0|CXX|C11| 0|CXX23| 0| 0|NFC|NKC| 0, 0, 0x1e1d },
+{ C99| 0|CXX|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x1e2d },
+{ C99| 0|CXX|C11| 0|CXX23| 0| 0|NFC|NKC| 0, 0, 0x1e2f },
+{ C99| 0|CXX|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x1e37 },
+{ C99| 0|CXX|C11| 0|CXX23| 0| 0|NFC|NKC| 0, 0, 0x1e39 },
+{ C99| 0|CXX|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x1e4b },
+{ C99| 0|CXX|C11| 0|CXX23| 0| 0|NFC|NKC| 0, 0, 0x1e53 },
+{ C99| 0|CXX|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x1e5b },
+{ C99| 0|CXX|C11| 0|CXX23| 0| 0|NFC|NKC| 0, 0, 0x1e5d },
+{ C99| 0|CXX|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x1e63 },
+{ C99| 0|CXX|C11| 0|CXX23| 0| 0|NFC|NKC| 0, 0, 0x1e69 },
+{ C99| 0|CXX|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x1e77 },
+{ C99| 0|CXX|C11| 0|CXX23| 0| 0|NFC|NKC| 0, 0, 0x1e7b },
+{ C99| 0|CXX|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x1e99 },
+{ C99| 0|CXX|C11| 0|CXX23| 0|CID|NFC| 0| 0, 0, 0x1e9a },
+{ C99| 0| 0|C11| 0|CXX23| 0| 0|NFC| 0| 0, 0, 0x1e9b },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x1e9f },
+{ C99| 0|CXX|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x1ea3 },
+{ C99| 0|CXX|C11| 0|CXX23| 0| 0|NFC|NKC| 0, 0, 0x1eb7 },
+{ C99| 0|CXX|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x1ebd },
+{ C99| 0|CXX|C11| 0|CXX23| 0| 0|NFC|NKC| 0, 0, 0x1ec7 },
+{ C99| 0|CXX|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x1ecf },
+{ C99| 0|CXX|C11| 0|CXX23| 0| 0|NFC|NKC| 0, 0, 0x1ee3 },
+{ C99| 0|CXX|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x1ee7 },
+{ C99| 0|CXX|C11| 0|CXX23| 0| 0|NFC|NKC| 0, 0, 0x1ef1 },
+{ C99| 0|CXX|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x1ef9 },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x1eff },
+{ C99| 0|CXX|C11| 0|CXX23| 0| 0|NFC|NKC| 0, 0, 0x1f15 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x1f17 },
+{ C99| 0|CXX|C11| 0|CXX23| 0| 0|NFC|NKC| 0, 0, 0x1f1d },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x1f1f },
+{ C99| 0|CXX|C11| 0|CXX23| 0| 0|NFC|NKC| 0, 0, 0x1f45 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x1f47 },
+{ C99| 0|CXX|C11| 0|CXX23| 0| 0|NFC|NKC| 0, 0, 0x1f4d },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x1f4f },
+{ C99| 0|CXX|C11| 0|CXX23| 0| 0|NFC|NKC| 0, 0, 0x1f57 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x1f58 },
+{ C99| 0|CXX|C11| 0|CXX23| 0| 0|NFC|NKC| 0, 0, 0x1f59 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x1f5a },
+{ C99| 0|CXX|C11| 0|CXX23| 0| 0|NFC|NKC| 0, 0, 0x1f5b },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x1f5c },
+{ C99| 0|CXX|C11| 0|CXX23| 0| 0|NFC|NKC| 0, 0, 0x1f5d },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x1f5e },
+{ C99| 0|CXX|C11| 0|CXX23| 0| 0|NFC|NKC| 0, 0, 0x1f70 },
+{ C99| 0|CXX|C11| 0|CXX23| 0| 0| 0| 0| 0, 0, 0x1f71 },
+{ C99| 0|CXX|C11| 0|CXX23| 0| 0|NFC|NKC| 0, 0, 0x1f72 },
+{ C99| 0|CXX|C11| 0|CXX23| 0| 0| 0| 0| 0, 0, 0x1f73 },
+{ C99| 0|CXX|C11| 0|CXX23| 0| 0|NFC|NKC| 0, 0, 0x1f74 },
+{ C99| 0|CXX|C11| 0|CXX23| 0| 0| 0| 0| 0, 0, 0x1f75 },
+{ C99| 0|CXX|C11| 0|CXX23| 0| 0|NFC|NKC| 0, 0, 0x1f76 },
+{ C99| 0|CXX|C11| 0|CXX23| 0| 0| 0| 0| 0, 0, 0x1f77 },
+{ C99| 0|CXX|C11| 0|CXX23| 0| 0|NFC|NKC| 0, 0, 0x1f78 },
+{ C99| 0|CXX|C11| 0|CXX23| 0| 0| 0| 0| 0, 0, 0x1f79 },
+{ C99| 0|CXX|C11| 0|CXX23| 0| 0|NFC|NKC| 0, 0, 0x1f7a },
+{ C99| 0|CXX|C11| 0|CXX23| 0| 0| 0| 0| 0, 0, 0x1f7b },
+{ C99| 0|CXX|C11| 0|CXX23| 0| 0|NFC|NKC| 0, 0, 0x1f7c },
+{ C99| 0|CXX|C11| 0|CXX23| 0| 0| 0| 0| 0, 0, 0x1f7d },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x1f7f },
+{ C99| 0|CXX|C11| 0|CXX23| 0| 0|NFC|NKC| 0, 0, 0x1fb4 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x1fb5 },
+{ C99| 0|CXX|C11| 0|CXX23| 0| 0|NFC|NKC| 0, 0, 0x1fba },
+{ C99| 0|CXX|C11| 0|CXX23| 0| 0| 0| 0| 0, 0, 0x1fbb },
+{ C99| 0|CXX|C11| 0|CXX23| 0| 0|NFC|NKC| 0, 0, 0x1fbc },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC| 0| 0, 0, 0x1fbd },
+{ C99| 0| 0|C11| 0|CXX23| 0| 0| 0| 0| 0, 0, 0x1fbe },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC| 0| 0, 0, 0x1fc0 },
+{ 0| 0| 0|C11| 0| 0| 0| 0|NFC| 0| 0, 0, 0x1fc1 },
+{ C99| 0|CXX|C11| 0|CXX23| 0| 0|NFC|NKC| 0, 0, 0x1fc4 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x1fc5 },
+{ C99| 0|CXX|C11| 0|CXX23| 0| 0|NFC|NKC| 0, 0, 0x1fc8 },
+{ C99| 0|CXX|C11| 0|CXX23| 0| 0| 0| 0| 0, 0, 0x1fc9 },
+{ C99| 0|CXX|C11| 0|CXX23| 0| 0|NFC|NKC| 0, 0, 0x1fca },
+{ C99| 0|CXX|C11| 0|CXX23| 0| 0| 0| 0| 0, 0, 0x1fcb },
+{ C99| 0|CXX|C11| 0|CXX23| 0| 0|NFC|NKC| 0, 0, 0x1fcc },
+{ 0| 0| 0|C11| 0| 0| 0| 0|NFC| 0| 0, 0, 0x1fcf },
+{ C99| 0|CXX|C11| 0|CXX23| 0| 0|NFC|NKC| 0, 0, 0x1fd2 },
+{ C99| 0|CXX|C11| 0|CXX23| 0| 0| 0| 0| 0, 0, 0x1fd3 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x1fd5 },
+{ C99| 0|CXX|C11| 0|CXX23| 0| 0|NFC|NKC| 0, 0, 0x1fda },
+{ C99| 0|CXX|C11| 0|CXX23| 0| 0| 0| 0| 0, 0, 0x1fdb },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x1fdc },
+{ 0| 0| 0|C11| 0| 0| 0| 0|NFC| 0| 0, 0, 0x1fdf },
+{ C99| 0|CXX|C11| 0|CXX23| 0| 0|NFC|NKC| 0, 0, 0x1fe2 },
+{ C99| 0|CXX|C11| 0|CXX23| 0| 0| 0| 0| 0, 0, 0x1fe3 },
+{ C99| 0|CXX|C11| 0|CXX23| 0| 0|NFC|NKC| 0, 0, 0x1fea },
+{ C99| 0|CXX|C11| 0|CXX23| 0| 0| 0| 0| 0, 0, 0x1feb },
+{ C99| 0|CXX|C11| 0|CXX23| 0| 0|NFC|NKC| 0, 0, 0x1fec },
+{ 0| 0| 0|C11| 0| 0| 0| 0|NFC| 0| 0, 0, 0x1fed },
+{ 0| 0| 0|C11| 0| 0| 0| 0| 0| 0| 0, 0, 0x1fee },
+{ 0| 0| 0|C11| 0| 0| 0|CID| 0| 0| 0, 0, 0x1fef },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x1ff1 },
+{ C99| 0|CXX|C11| 0|CXX23| 0| 0|NFC|NKC| 0, 0, 0x1ff4 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x1ff5 },
+{ C99| 0|CXX|C11| 0|CXX23| 0| 0|NFC|NKC| 0, 0, 0x1ff8 },
+{ C99| 0|CXX|C11| 0|CXX23| 0| 0| 0| 0| 0, 0, 0x1ff9 },
+{ C99| 0|CXX|C11| 0|CXX23| 0| 0|NFC|NKC| 0, 0, 0x1ffa },
+{ C99| 0|CXX|C11| 0|CXX23| 0| 0| 0| 0| 0, 0, 0x1ffb },
+{ C99| 0|CXX|C11| 0|CXX23| 0| 0|NFC|NKC| 0, 0, 0x1ffc },
+{ 0| 0| 0|C11| 0| 0| 0| 0| 0| 0| 0, 0, 0x1ffd },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC| 0| 0, 0, 0x1ffe },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x1fff },
+{ 0| 0| 0| 0| 0| 0| 0|CID| 0| 0| 0, 0, 0x200a },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x200d },
+{ 0| 0| 0| 0| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x2029 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x202e },
+{ 0| 0| 0| 0| 0| 0| 0|CID|NFC| 0| 0, 0, 0x203e },
+{ C99| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 0, 0x2040 },
+{ 0| 0| 0| 0| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x2053 },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 0, 0x2054 },
+{ 0| 0| 0| 0| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x205f },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x206f },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC| 0| 0, 0, 0x2070 },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC| 0| 0, 0, 0x2071 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x2073 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC| 0| 0, 0, 0x207e },
+{ C99| 0| 0|C11| 0|CXX23| 0|CID|NFC| 0| 0, 0, 0x207f },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC| 0| 0, 0, 0x208e },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x208f },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC| 0| 0, 0, 0x209c },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x20a7 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC| 0| 0, 0, 0x20a8 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x20cf },
+{ 0| 0| 0|C11|N11|CXX23|NXX23|CID|NFC|NKC| 0, 230, 0x20d1 },
+{ 0| 0| 0|C11|N11|CXX23|NXX23|CID|NFC|NKC| 0, 1, 0x20d3 },
+{ 0| 0| 0|C11|N11|CXX23|NXX23|CID|NFC|NKC| 0, 230, 0x20d7 },
+{ 0| 0| 0|C11|N11|CXX23|NXX23|CID|NFC|NKC| 0, 1, 0x20da },
+{ 0| 0| 0|C11|N11|CXX23|NXX23|CID|NFC|NKC| 0, 230, 0x20dc },
+{ 0| 0| 0|C11|N11| 0| 0|CID|NFC|NKC| 0, 0, 0x20e0 },
+{ 0| 0| 0|C11|N11|CXX23|NXX23|CID|NFC|NKC| 0, 230, 0x20e1 },
+{ 0| 0| 0|C11|N11| 0| 0|CID|NFC|NKC| 0, 0, 0x20e4 },
+{ 0| 0| 0|C11|N11|CXX23|NXX23|CID|NFC|NKC| 0, 1, 0x20e6 },
+{ 0| 0| 0|C11|N11|CXX23|NXX23|CID|NFC|NKC| 0, 230, 0x20e7 },
+{ 0| 0| 0|C11|N11|CXX23|NXX23|CID|NFC|NKC| 0, 220, 0x20e8 },
+{ 0| 0| 0|C11|N11|CXX23|NXX23|CID|NFC|NKC| 0, 230, 0x20e9 },
+{ 0| 0| 0|C11|N11|CXX23|NXX23|CID|NFC|NKC| 0, 1, 0x20eb },
+{ 0| 0| 0|C11|N11|CXX23|NXX23|CID|NFC|NKC| 0, 220, 0x20ef },
+{ 0| 0| 0|C11|N11|CXX23|NXX23|CID|NFC|NKC| 0, 230, 0x20f0 },
+{ 0| 0| 0|C11|N11| 0| 0|CID|NFC|NKC| 0, 0, 0x20ff },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC| 0| 0, 0, 0x2101 },
+{ C99| 0| 0|C11| 0|CXX23| 0|CID|NFC| 0| 0, 0, 0x2102 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC| 0| 0, 0, 0x2103 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x2104 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC| 0| 0, 0, 0x2106 },
+{ C99| 0| 0|C11| 0|CXX23| 0|CID|NFC| 0| 0, 0, 0x2107 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x2108 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC| 0| 0, 0, 0x2109 },
+{ C99| 0| 0|C11| 0|CXX23| 0|CID|NFC| 0| 0, 0, 0x2113 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x2114 },
+{ C99| 0| 0|C11| 0|CXX23| 0|CID|NFC| 0| 0, 0, 0x2115 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC| 0| 0, 0, 0x2116 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x2117 },
+{ C99| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x2118 },
+{ C99| 0| 0|C11| 0|CXX23| 0|CID|NFC| 0| 0, 0, 0x211d },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x211f },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC| 0| 0, 0, 0x2122 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x2123 },
+{ C99| 0| 0|C11| 0|CXX23| 0|CID|NFC| 0| 0, 0, 0x2124 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x2125 },
+{ C99| 0| 0|C11| 0|CXX23| 0| 0| 0| 0| 0, 0, 0x2126 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x2127 },
+{ C99| 0| 0|C11| 0|CXX23| 0|CID|NFC| 0| 0, 0, 0x2128 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x2129 },
+{ C99| 0| 0|C11| 0|CXX23| 0|CID| 0| 0| 0, 0, 0x212a },
+{ C99| 0| 0|C11| 0|CXX23| 0| 0| 0| 0| 0, 0, 0x212b },
+{ C99| 0| 0|C11| 0|CXX23| 0|CID|NFC| 0| 0, 0, 0x212d },
+{ C99| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x212e },
+{ C99| 0| 0|C11| 0|CXX23| 0|CID|NFC| 0| 0, 0, 0x2131 },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x2132 },
+{ C99| 0| 0|C11| 0|CXX23| 0|CID|NFC| 0| 0, 0, 0x2138 },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC| 0| 0, 0, 0x2139 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x213a },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC| 0| 0, 0, 0x213b },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC| 0| 0, 0, 0x213f },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC| 0| 0, 0, 0x2140 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x2144 },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC| 0| 0, 0, 0x2149 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x214d },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x214e },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x214f },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC| 0| 0, 0, 0x215f },
+{ C99| 0| 0|C11| 0|CXX23| 0|CID|NFC| 0| 0, 0, 0x217f },
+{ C99| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x2182 },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x2188 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC| 0| 0, 0, 0x2189 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x218f },
+{ 0| 0| 0| 0| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x245f },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC| 0| 0, 0, 0x24ea },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x24ff },
+{ 0| 0| 0| 0| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x2775 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x2793 },
+{ 0| 0| 0| 0| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x2bff },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x2c2e },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x2c2f },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x2c5e },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x2c5f },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x2c7b },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC| 0| 0, 0, 0x2c7d },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x2ce4 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x2cea },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x2cee },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 230, 0x2cf1 },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x2cf3 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x2cff },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x2d25 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x2d26 },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x2d27 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x2d2c },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x2d2d },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x2d2f },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x2d67 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x2d6e },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC| 0| 0, 0, 0x2d6f },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x2d7e },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 9, 0x2d7f },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x2d96 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x2d9f },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x2da6 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x2da7 },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x2dae },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x2daf },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x2db6 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x2db7 },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x2dbe },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x2dbf },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x2dc6 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x2dc7 },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x2dce },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x2dcf },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x2dd6 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x2dd7 },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x2dde },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x2ddf },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 230, 0x2dff },
+{ 0| 0| 0| 0| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x2e7f },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x2e9e },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC| 0| 0, 0, 0x2e9f },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x2ef2 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC| 0| 0, 0, 0x2ef3 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x2eff },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC| 0| 0, 0, 0x2fd5 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x2fff },
+{ 0| 0| 0| 0| 0| 0| 0|CID|NFC| 0| 0, 0, 0x3003 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x3004 },
+{ C99| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x3007 },
+{ 0| 0| 0| 0| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x3020 },
+{ C99| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x3029 },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 218, 0x302a },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 228, 0x302b },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 232, 0x302c },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 222, 0x302d },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 224, 0x302f },
+{ 0| 0| 0| 0| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x3030 },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x3035 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC| 0| 0, 0, 0x3036 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x3037 },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC| 0| 0, 0, 0x303a },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x303c },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x3040 },
+{ C99| 0|CXX|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x304b },
+{ C99| 0|CXX|C11| 0|CXX23| 0| 0|NFC|NKC| 0, 0, 0x304c },
+{ C99| 0|CXX|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x304d },
+{ C99| 0|CXX|C11| 0|CXX23| 0| 0|NFC|NKC| 0, 0, 0x304e },
+{ C99| 0|CXX|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x304f },
+{ C99| 0|CXX|C11| 0|CXX23| 0| 0|NFC|NKC| 0, 0, 0x3050 },
+{ C99| 0|CXX|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x3051 },
+{ C99| 0|CXX|C11| 0|CXX23| 0| 0|NFC|NKC| 0, 0, 0x3052 },
+{ C99| 0|CXX|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x3053 },
+{ C99| 0|CXX|C11| 0|CXX23| 0| 0|NFC|NKC| 0, 0, 0x3054 },
+{ C99| 0|CXX|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x3055 },
+{ C99| 0|CXX|C11| 0|CXX23| 0| 0|NFC|NKC| 0, 0, 0x3056 },
+{ C99| 0|CXX|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x3057 },
+{ C99| 0|CXX|C11| 0|CXX23| 0| 0|NFC|NKC| 0, 0, 0x3058 },
+{ C99| 0|CXX|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x3059 },
+{ C99| 0|CXX|C11| 0|CXX23| 0| 0|NFC|NKC| 0, 0, 0x305a },
+{ C99| 0|CXX|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x305b },
+{ C99| 0|CXX|C11| 0|CXX23| 0| 0|NFC|NKC| 0, 0, 0x305c },
+{ C99| 0|CXX|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x305d },
+{ C99| 0|CXX|C11| 0|CXX23| 0| 0|NFC|NKC| 0, 0, 0x305e },
+{ C99| 0|CXX|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x305f },
+{ C99| 0|CXX|C11| 0|CXX23| 0| 0|NFC|NKC| 0, 0, 0x3060 },
+{ C99| 0|CXX|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x3061 },
+{ C99| 0|CXX|C11| 0|CXX23| 0| 0|NFC|NKC| 0, 0, 0x3062 },
+{ C99| 0|CXX|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x3064 },
+{ C99| 0|CXX|C11| 0|CXX23| 0| 0|NFC|NKC| 0, 0, 0x3065 },
+{ C99| 0|CXX|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x3066 },
+{ C99| 0|CXX|C11| 0|CXX23| 0| 0|NFC|NKC| 0, 0, 0x3067 },
+{ C99| 0|CXX|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x3068 },
+{ C99| 0|CXX|C11| 0|CXX23| 0| 0|NFC|NKC| 0, 0, 0x3069 },
+{ C99| 0|CXX|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x306f },
+{ C99| 0|CXX|C11| 0|CXX23| 0| 0|NFC|NKC| 0, 0, 0x3071 },
+{ C99| 0|CXX|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x3072 },
+{ C99| 0|CXX|C11| 0|CXX23| 0| 0|NFC|NKC| 0, 0, 0x3074 },
+{ C99| 0|CXX|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x3075 },
+{ C99| 0|CXX|C11| 0|CXX23| 0| 0|NFC|NKC| 0, 0, 0x3077 },
+{ C99| 0|CXX|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x3078 },
+{ C99| 0|CXX|C11| 0|CXX23| 0| 0|NFC|NKC| 0, 0, 0x307a },
+{ C99| 0|CXX|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x307b },
+{ C99| 0|CXX|C11| 0|CXX23| 0| 0|NFC|NKC| 0, 0, 0x307d },
+{ C99| 0|CXX|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x3093 },
+{ 0| 0|CXX|C11| 0|CXX23| 0| 0|NFC|NKC| 0, 0, 0x3094 },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x3096 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x3098 },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC|CTX, 8, 0x309a },
+{ C99| 0|CXX|C11| 0| 0| 0|CID|NFC| 0| 0, 0, 0x309c },
+{ 0| 0|CXX|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x309d },
+{ 0| 0|CXX|C11| 0|CXX23| 0| 0|NFC|NKC| 0, 0, 0x309e },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC| 0| 0, 0, 0x309f },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x30a0 },
+{ C99| 0|CXX|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x30ab },
+{ C99| 0|CXX|C11| 0|CXX23| 0| 0|NFC|NKC| 0, 0, 0x30ac },
+{ C99| 0|CXX|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x30ad },
+{ C99| 0|CXX|C11| 0|CXX23| 0| 0|NFC|NKC| 0, 0, 0x30ae },
+{ C99| 0|CXX|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x30af },
+{ C99| 0|CXX|C11| 0|CXX23| 0| 0|NFC|NKC| 0, 0, 0x30b0 },
+{ C99| 0|CXX|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x30b1 },
+{ C99| 0|CXX|C11| 0|CXX23| 0| 0|NFC|NKC| 0, 0, 0x30b2 },
+{ C99| 0|CXX|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x30b3 },
+{ C99| 0|CXX|C11| 0|CXX23| 0| 0|NFC|NKC| 0, 0, 0x30b4 },
+{ C99| 0|CXX|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x30b5 },
+{ C99| 0|CXX|C11| 0|CXX23| 0| 0|NFC|NKC| 0, 0, 0x30b6 },
+{ C99| 0|CXX|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x30b7 },
+{ C99| 0|CXX|C11| 0|CXX23| 0| 0|NFC|NKC| 0, 0, 0x30b8 },
+{ C99| 0|CXX|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x30b9 },
+{ C99| 0|CXX|C11| 0|CXX23| 0| 0|NFC|NKC| 0, 0, 0x30ba },
+{ C99| 0|CXX|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x30bb },
+{ C99| 0|CXX|C11| 0|CXX23| 0| 0|NFC|NKC| 0, 0, 0x30bc },
+{ C99| 0|CXX|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x30bd },
+{ C99| 0|CXX|C11| 0|CXX23| 0| 0|NFC|NKC| 0, 0, 0x30be },
+{ C99| 0|CXX|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x30bf },
+{ C99| 0|CXX|C11| 0|CXX23| 0| 0|NFC|NKC| 0, 0, 0x30c0 },
+{ C99| 0|CXX|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x30c1 },
+{ C99| 0|CXX|C11| 0|CXX23| 0| 0|NFC|NKC| 0, 0, 0x30c2 },
+{ C99| 0|CXX|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x30c4 },
+{ C99| 0|CXX|C11| 0|CXX23| 0| 0|NFC|NKC| 0, 0, 0x30c5 },
+{ C99| 0|CXX|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x30c6 },
+{ C99| 0|CXX|C11| 0|CXX23| 0| 0|NFC|NKC| 0, 0, 0x30c7 },
+{ C99| 0|CXX|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x30c8 },
+{ C99| 0|CXX|C11| 0|CXX23| 0| 0|NFC|NKC| 0, 0, 0x30c9 },
+{ C99| 0|CXX|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x30cf },
+{ C99| 0|CXX|C11| 0|CXX23| 0| 0|NFC|NKC| 0, 0, 0x30d1 },
+{ C99| 0|CXX|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x30d2 },
+{ C99| 0|CXX|C11| 0|CXX23| 0| 0|NFC|NKC| 0, 0, 0x30d4 },
+{ C99| 0|CXX|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x30d5 },
+{ C99| 0|CXX|C11| 0|CXX23| 0| 0|NFC|NKC| 0, 0, 0x30d7 },
+{ C99| 0|CXX|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x30d8 },
+{ C99| 0|CXX|C11| 0|CXX23| 0| 0|NFC|NKC| 0, 0, 0x30da },
+{ C99| 0|CXX|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x30db },
+{ C99| 0|CXX|C11| 0|CXX23| 0| 0|NFC|NKC| 0, 0, 0x30dd },
+{ C99| 0|CXX|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x30f3 },
+{ C99| 0|CXX|C11| 0|CXX23| 0| 0|NFC|NKC| 0, 0, 0x30f4 },
+{ C99| 0|CXX|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x30f6 },
+{ 0| 0|CXX|C11| 0|CXX23| 0| 0|NFC|NKC| 0, 0, 0x30fa },
+{ C99| 0|CXX|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x30fb },
+{ C99| 0|CXX|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x30fc },
+{ 0| 0|CXX|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x30fd },
+{ 0| 0|CXX|C11| 0|CXX23| 0| 0|NFC|NKC| 0, 0, 0x30fe },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC| 0| 0, 0, 0x30ff },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x3104 },
+{ C99| 0|CXX|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x312c },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x312f },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x3130 },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC| 0| 0, 0, 0x318e },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x3191 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC| 0| 0, 0, 0x319f },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x31bf },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x31ef },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x31ff },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC| 0| 0, 0, 0x321e },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x321f },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC| 0| 0, 0, 0x3247 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x324f },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC| 0| 0, 0, 0x327e },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x327f },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC| 0| 0, 0, 0x33ff },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x4dbf },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x4dff },
+{ C99| 0|CXX|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x9fa5 },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x9ffc },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x9fff },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0xa48c },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0xa4cf },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0xa4fd },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0xa4ff },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0xa60c },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0xa60f },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0xa61f },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 0, 0xa629 },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0xa62b },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0xa63f },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0xa66e },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 230, 0xa66f },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0xa673 },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 230, 0xa67d },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0xa67e },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0xa69b },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC| 0| 0, 0, 0xa69d },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 230, 0xa69f },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0xa6ef },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 230, 0xa6f1 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0xa716 },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0xa71f },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0xa721 },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0xa76f },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC| 0| 0, 0, 0xa770 },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0xa788 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0xa78a },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0xa7bf },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0xa7c1 },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0xa7ca },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0xa7f4 },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0xa7f7 },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC| 0| 0, 0, 0xa7f9 },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0xa801 },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 0, 0xa802 },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0xa805 },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 9, 0xa806 },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0xa80a },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 0, 0xa80b },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0xa822 },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 0, 0xa827 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0xa82b },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 9, 0xa82c },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0xa83f },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0xa873 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0xa87f },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 0, 0xa881 },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0xa8b3 },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 0, 0xa8c3 },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 9, 0xa8c4 },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 0, 0xa8c5 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0xa8cf },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 0, 0xa8d9 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0xa8df },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 230, 0xa8f1 },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0xa8f7 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0xa8fa },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0xa8fb },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0xa8fc },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0xa8fe },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 0, 0xa909 },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0xa925 },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 0, 0xa92a },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 220, 0xa92d },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0xa92f },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0xa946 },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 0, 0xa952 },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 9, 0xa953 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0xa95f },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0xa97c },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0xa97f },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 0, 0xa983 },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0xa9b2 },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 7, 0xa9b3 },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 0, 0xa9bf },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 9, 0xa9c0 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0xa9ce },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0xa9cf },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 0, 0xa9d9 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0xa9df },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0xa9e4 },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 0, 0xa9e5 },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0xa9ef },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 0, 0xa9f9 },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0xa9fe },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0xa9ff },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0xaa28 },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 0, 0xaa36 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0xaa3f },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0xaa42 },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 0, 0xaa43 },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0xaa4b },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 0, 0xaa4d },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0xaa4f },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 0, 0xaa59 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0xaa5f },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0xaa76 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0xaa79 },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0xaa7a },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 0, 0xaa7d },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0xaaaf },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 230, 0xaab0 },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0xaab1 },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 230, 0xaab3 },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 220, 0xaab4 },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0xaab6 },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 230, 0xaab8 },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0xaabd },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 230, 0xaabf },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0xaac0 },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 230, 0xaac1 },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0xaac2 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0xaada },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0xaadd },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0xaadf },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0xaaea },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 0, 0xaaef },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0xaaf1 },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0xaaf4 },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 0, 0xaaf5 },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 9, 0xaaf6 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0xab00 },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0xab06 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0xab08 },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0xab0e },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0xab10 },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0xab16 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0xab1f },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0xab26 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0xab27 },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0xab2e },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0xab2f },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0xab5a },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0xab5b },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC| 0| 0, 0, 0xab5f },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0xab68 },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC| 0| 0, 0, 0xab69 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0xab6f },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0xabe2 },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 0, 0xabea },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0xabeb },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 0, 0xabec },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 9, 0xabed },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0xabef },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 0, 0xabf9 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0xabff },
+{ C99| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0xd7a3 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0xd7af },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0xd7c6 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0xd7ca },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0xd7fb },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0xd7ff },
+{ 0| 0| 0| 0| 0| 0| 0|CID|NFC|NKC| 0, 0, 0xf8ff },
+{ 0| 0|CXX|C11| 0|CXX23| 0| 0| 0| 0| 0, 0, 0xfa0d },
+{ 0| 0|CXX|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0xfa0f },
+{ 0| 0|CXX|C11| 0|CXX23| 0| 0| 0| 0| 0, 0, 0xfa10 },
+{ 0| 0|CXX|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0xfa11 },
+{ 0| 0|CXX|C11| 0|CXX23| 0| 0| 0| 0| 0, 0, 0xfa12 },
+{ 0| 0|CXX|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0xfa14 },
+{ 0| 0|CXX|C11| 0|CXX23| 0| 0| 0| 0| 0, 0, 0xfa1e },
+{ 0| 0|CXX|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0xfa1f },
+{ 0| 0|CXX|C11| 0|CXX23| 0| 0| 0| 0| 0, 0, 0xfa20 },
+{ 0| 0|CXX|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0xfa21 },
+{ 0| 0|CXX|C11| 0|CXX23| 0| 0| 0| 0| 0, 0, 0xfa22 },
+{ 0| 0|CXX|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0xfa24 },
+{ 0| 0|CXX|C11| 0|CXX23| 0| 0| 0| 0| 0, 0, 0xfa26 },
+{ 0| 0|CXX|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0xfa29 },
+{ 0| 0|CXX|C11| 0|CXX23| 0| 0| 0| 0| 0, 0, 0xfa2d },
+{ 0| 0| 0|C11| 0|CXX23| 0| 0| 0| 0| 0, 0, 0xfa6d },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0xfa6f },
+{ 0| 0| 0|C11| 0|CXX23| 0| 0| 0| 0| 0, 0, 0xfad9 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0xfaff },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC| 0| 0, 0, 0xfb06 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0xfb12 },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC| 0| 0, 0, 0xfb17 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0xfb1c },
+{ 0| 0| 0|C11| 0|CXX23| 0| 0| 0| 0| 0, 0, 0xfb1d },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 26, 0xfb1e },
+{ 0| 0|CXX|C11| 0|CXX23| 0| 0| 0| 0| 0, 0, 0xfb1f },
+{ 0| 0|CXX|C11| 0|CXX23| 0|CID|NFC| 0| 0, 0, 0xfb28 },
+{ 0| 0|CXX|C11| 0| 0| 0|CID|NFC| 0| 0, 0, 0xfb29 },
+{ 0| 0|CXX|C11| 0|CXX23| 0| 0| 0| 0| 0, 0, 0xfb36 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0xfb37 },
+{ 0| 0|CXX|C11| 0|CXX23| 0| 0| 0| 0| 0, 0, 0xfb3c },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0xfb3d },
+{ 0| 0|CXX|C11| 0|CXX23| 0| 0| 0| 0| 0, 0, 0xfb3e },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0xfb3f },
+{ 0| 0|CXX|C11| 0|CXX23| 0| 0| 0| 0| 0, 0, 0xfb41 },
+{ 0| 0|CXX|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0xfb42 },
+{ 0| 0|CXX|C11| 0|CXX23| 0| 0| 0| 0| 0, 0, 0xfb44 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0xfb45 },
+{ 0| 0|CXX|C11| 0|CXX23| 0| 0| 0| 0| 0, 0, 0xfb4e },
+{ 0| 0|CXX|C11| 0|CXX23| 0|CID|NFC| 0| 0, 0, 0xfbb1 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0xfbd2 },
+{ 0| 0|CXX|C11| 0|CXX23| 0|CID|NFC| 0| 0, 0, 0xfc5d },
+{ 0| 0|CXX|C11| 0| 0| 0|CID|NFC| 0| 0, 0, 0xfc63 },
+{ 0| 0|CXX|C11| 0|CXX23| 0|CID|NFC| 0| 0, 0, 0xfd3d },
+{ 0| 0|CXX| 0| 0| 0| 0|CID|NFC|NKC| 0, 0, 0xfd3f },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0xfd4f },
+{ 0| 0|CXX|C11| 0|CXX23| 0|CID|NFC| 0| 0, 0, 0xfd8f },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0xfd91 },
+{ 0| 0|CXX|C11| 0|CXX23| 0|CID|NFC| 0| 0, 0, 0xfdc7 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0xfdcf },
+{ 0| 0| 0| 0| 0| 0| 0|CID|NFC|NKC| 0, 0, 0xfdef },
+{ 0| 0|CXX|C11| 0|CXX23| 0|CID|NFC| 0| 0, 0, 0xfdf9 },
+{ 0| 0|CXX|C11| 0| 0| 0|CID|NFC| 0| 0, 0, 0xfdfb },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC| 0| 0, 0, 0xfdfc },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0xfdff },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 0, 0xfe0f },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC| 0| 0, 0, 0xfe19 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0xfe1f },
+{ 0| 0| 0|C11|N11|CXX23|NXX23|CID|NFC|NKC| 0, 230, 0xfe26 },
+{ 0| 0| 0|C11|N11|CXX23|NXX23|CID|NFC|NKC| 0, 220, 0xfe2d },
+{ 0| 0| 0|C11|N11|CXX23|NXX23|CID|NFC|NKC| 0, 230, 0xfe2f },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC| 0| 0, 0, 0xfe32 },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC| 0| 0, 0, 0xfe34 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC| 0| 0, 0, 0xfe44 },
+{ 0| 0| 0| 0| 0| 0| 0|CID|NFC|NKC| 0, 0, 0xfe46 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC| 0| 0, 0, 0xfe4c },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC| 0| 0, 0, 0xfe4f },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC| 0| 0, 0, 0xfe52 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0xfe53 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC| 0| 0, 0, 0xfe66 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0xfe67 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC| 0| 0, 0, 0xfe6b },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0xfe6f },
+{ 0| 0|CXX|C11| 0| 0| 0|CID|NFC| 0| 0, 0, 0xfe70 },
+{ 0| 0|CXX|C11| 0|CXX23| 0|CID|NFC| 0| 0, 0, 0xfe71 },
+{ 0| 0|CXX|C11| 0| 0| 0|CID|NFC| 0| 0, 0, 0xfe72 },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0xfe73 },
+{ 0| 0|CXX|C11| 0| 0| 0|CID|NFC| 0| 0, 0, 0xfe74 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0xfe75 },
+{ 0| 0|CXX|C11| 0| 0| 0|CID|NFC| 0| 0, 0, 0xfe76 },
+{ 0| 0|CXX|C11| 0|CXX23| 0|CID|NFC| 0| 0, 0, 0xfe77 },
+{ 0| 0|CXX|C11| 0| 0| 0|CID|NFC| 0| 0, 0, 0xfe78 },
+{ 0| 0|CXX|C11| 0|CXX23| 0|CID|NFC| 0| 0, 0, 0xfe79 },
+{ 0| 0|CXX|C11| 0| 0| 0|CID|NFC| 0| 0, 0, 0xfe7a },
+{ 0| 0|CXX|C11| 0|CXX23| 0|CID|NFC| 0| 0, 0, 0xfe7b },
+{ 0| 0|CXX|C11| 0| 0| 0|CID|NFC| 0| 0, 0, 0xfe7c },
+{ 0| 0|CXX|C11| 0|CXX23| 0|CID|NFC| 0| 0, 0, 0xfe7d },
+{ 0| 0|CXX|C11| 0| 0| 0|CID|NFC| 0| 0, 0, 0xfe7e },
+{ 0| 0|CXX|C11| 0|CXX23| 0|CID|NFC| 0| 0, 0, 0xfefc },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0xff00 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC| 0| 0, 0, 0xff0f },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC| 0| 0, 0, 0xff19 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC| 0| 0, 0, 0xff20 },
+{ 0| 0|CXX|C11| 0|CXX23| 0|CID|NFC| 0| 0, 0, 0xff3a },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC| 0| 0, 0, 0xff3e },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC| 0| 0, 0, 0xff3f },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC| 0| 0, 0, 0xff40 },
+{ 0| 0|CXX|C11| 0|CXX23| 0|CID|NFC| 0| 0, 0, 0xff5a },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC| 0| 0, 0, 0xff65 },
+{ 0| 0|CXX|C11| 0|CXX23| 0|CID|NFC| 0| 0, 0, 0xff9d },
+{ 0| 0|CXX|C11| 0|CXX23|NXX23|CID|NFC| 0| 0, 0, 0xff9f },
+{ 0| 0|CXX|C11| 0|CXX23| 0|CID|NFC| 0| 0, 0, 0xffbe },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0xffc1 },
+{ 0| 0|CXX|C11| 0|CXX23| 0|CID|NFC| 0| 0, 0, 0xffc7 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0xffc9 },
+{ 0| 0|CXX|C11| 0|CXX23| 0|CID|NFC| 0| 0, 0, 0xffcf },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0xffd1 },
+{ 0| 0|CXX|C11| 0|CXX23| 0|CID|NFC| 0| 0, 0, 0xffd7 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0xffd9 },
+{ 0| 0|CXX|C11| 0|CXX23| 0|CID|NFC| 0| 0, 0, 0xffdc },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0xffdf },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC| 0| 0, 0, 0xffe6 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0xffe7 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC| 0| 0, 0, 0xffee },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0xfffd },
+{ 0| 0| 0| 0| 0| 0| 0|CID|NFC|NKC| 0, 0, 0xffff },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x1000b },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x1000c },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x10026 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x10027 },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x1003a },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x1003b },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x1003d },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x1003e },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x1004d },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x1004f },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x1005d },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x1007f },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x100fa },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x1013f },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x10174 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x101fc },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 220, 0x101fd },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x1027f },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x1029c },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x1029f },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x102d0 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x102df },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 220, 0x102e0 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x102ff },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x1031f },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x1032c },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x1034a },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x1034f },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x10375 },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 230, 0x1037a },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x1037f },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x1039d },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x1039f },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x103c3 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x103c7 },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x103cf },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x103d0 },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x103d5 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x103ff },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x1049d },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x1049f },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 0, 0x104a9 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x104af },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x104d3 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x104d7 },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x104fb },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x104ff },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x10527 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x1052f },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x10563 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x105ff },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x10736 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x1073f },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x10755 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x1075f },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x10767 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x107ff },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x10805 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x10807 },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x10808 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x10809 },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x10835 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x10836 },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x10838 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x1083b },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x1083c },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x1083e },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x10855 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x1085f },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x10876 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x1087f },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x1089e },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x108df },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x108f2 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x108f3 },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x108f5 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x108ff },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x10915 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x1091f },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x10939 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x1097f },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x109b7 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x109bd },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x109bf },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x109ff },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x10a00 },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 0, 0x10a03 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x10a04 },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 0, 0x10a06 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x10a0b },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 0, 0x10a0c },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 220, 0x10a0d },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 0, 0x10a0e },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 230, 0x10a0f },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x10a13 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x10a14 },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x10a17 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x10a18 },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x10a35 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x10a37 },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 230, 0x10a38 },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 1, 0x10a39 },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 220, 0x10a3a },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x10a3e },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 9, 0x10a3f },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x10a5f },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x10a7c },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x10a7f },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x10a9c },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x10abf },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x10ac7 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x10ac8 },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x10ae4 },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 230, 0x10ae5 },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 220, 0x10ae6 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x10aff },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x10b35 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x10b3f },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x10b55 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x10b5f },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x10b72 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x10b7f },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x10b91 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x10bff },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x10c48 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x10c7f },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x10cb2 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x10cbf },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x10cf2 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x10cff },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x10d23 },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 230, 0x10d27 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x10d2f },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 0, 0x10d39 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x10e7f },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x10ea9 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x10eaa },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 230, 0x10eac },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x10eaf },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x10eb1 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x10eff },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x10f1c },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x10f26 },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x10f27 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x10f2f },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x10f45 },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 220, 0x10f47 },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 230, 0x10f4a },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 220, 0x10f4b },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 230, 0x10f4c },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 220, 0x10f50 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x10faf },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x10fc4 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x10fdf },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x10ff6 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x10fff },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 0, 0x11002 },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x11037 },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 0, 0x11045 },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 9, 0x11046 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x11065 },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 0, 0x1106f },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x1107e },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 9, 0x1107f },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 0, 0x11082 },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x11099 },
+{ 0| 0| 0|C11| 0|CXX23| 0| 0|NFC|NKC| 0, 0, 0x1109a },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x1109b },
+{ 0| 0| 0|C11| 0|CXX23| 0| 0|NFC|NKC| 0, 0, 0x1109c },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x110aa },
+{ 0| 0| 0|C11| 0|CXX23| 0| 0|NFC|NKC| 0, 0, 0x110ab },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x110af },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 0, 0x110b8 },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 9, 0x110b9 },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC|CTX, 7, 0x110ba },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x110cf },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x110e8 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x110ef },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 0, 0x110f9 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x110ff },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 230, 0x11102 },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x11126 },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC|CTX, 0, 0x11127 },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 0, 0x1112d },
+{ 0| 0| 0|C11| 0|CXX23|NXX23| 0|NFC|NKC| 0, 0, 0x1112f },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 0, 0x11132 },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 9, 0x11134 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x11135 },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 0, 0x1113f },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x11143 },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x11144 },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 0, 0x11146 },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x11147 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x1114f },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x11172 },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 7, 0x11173 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x11175 },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x11176 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x1117f },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 0, 0x11182 },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x111b2 },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 0, 0x111bf },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 9, 0x111c0 },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x111c4 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x111c8 },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 0, 0x111c9 },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 7, 0x111ca },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 0, 0x111cc },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x111cd },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 0, 0x111d9 },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x111da },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x111db },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x111dc },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x111ff },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x11211 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x11212 },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x1122b },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 0, 0x11234 },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 9, 0x11235 },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 7, 0x11236 },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 0, 0x11237 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x1123d },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 0, 0x1123e },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x1127f },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x11286 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x11287 },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x11288 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x11289 },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x1128d },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x1128e },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x1129d },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x1129e },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x112a8 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x112af },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x112de },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 0, 0x112e8 },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 7, 0x112e9 },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 9, 0x112ea },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x112ef },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 0, 0x112f9 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x112ff },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 0, 0x11303 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x11304 },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x1130c },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x1130e },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x11310 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x11312 },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x11328 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x11329 },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x11330 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x11331 },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x11333 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x11334 },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x11339 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x1133a },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 7, 0x1133c },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x1133d },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC|CTX, 0, 0x1133e },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 0, 0x11344 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x11346 },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 0, 0x11348 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x1134a },
+{ 0| 0| 0|C11| 0|CXX23|NXX23| 0|NFC|NKC| 0, 0, 0x1134c },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 9, 0x1134d },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x1134f },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x11350 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x11356 },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC|CTX, 0, 0x11357 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x1135c },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x11361 },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 0, 0x11363 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x11365 },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 230, 0x1136c },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x1136f },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 230, 0x11374 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x113ff },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x11434 },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 0, 0x11441 },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 9, 0x11442 },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 0, 0x11445 },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 7, 0x11446 },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x1144a },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x1144f },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 0, 0x11459 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x1145d },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 230, 0x1145e },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x11461 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x1147f },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x114af },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC|CTX, 0, 0x114b0 },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 0, 0x114b9 },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC|CTX, 0, 0x114ba },
+{ 0| 0| 0|C11| 0|CXX23|NXX23| 0|NFC|NKC| 0, 0, 0x114bc },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC|CTX, 0, 0x114bd },
+{ 0| 0| 0|C11| 0|CXX23|NXX23| 0|NFC|NKC| 0, 0, 0x114be },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 0, 0x114c1 },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 9, 0x114c2 },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 7, 0x114c3 },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x114c5 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x114c6 },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x114c7 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x114cf },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 0, 0x114d9 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x1157f },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x115ae },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC|CTX, 0, 0x115af },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 0, 0x115b5 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x115b7 },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 0, 0x115b9 },
+{ 0| 0| 0|C11| 0|CXX23|NXX23| 0|NFC|NKC| 0, 0, 0x115bb },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 0, 0x115be },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 9, 0x115bf },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 7, 0x115c0 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x115d7 },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x115db },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 0, 0x115dd },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x115ff },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x1162f },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 0, 0x1163e },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 9, 0x1163f },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 0, 0x11640 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x11643 },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x11644 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x1164f },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 0, 0x11659 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x1167f },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x116aa },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 0, 0x116b5 },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 9, 0x116b6 },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 7, 0x116b7 },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x116b8 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x116bf },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 0, 0x116c9 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x116ff },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x1171a },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x1171c },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 0, 0x1172a },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 9, 0x1172b },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x1172f },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 0, 0x11739 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x117ff },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x1182b },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 0, 0x11838 },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 9, 0x11839 },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 7, 0x1183a },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x1189f },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x118df },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 0, 0x118e9 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x118fe },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x11906 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x11908 },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x11909 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x1190b },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x11913 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x11914 },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x11916 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x11917 },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x1192f },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC|CTX, 0, 0x11930 },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 0, 0x11935 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x11936 },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 0, 0x11937 },
+{ 0| 0| 0|C11| 0|CXX23|NXX23| 0|NFC|NKC| 0, 0, 0x11938 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x1193a },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 0, 0x1193c },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 9, 0x1193e },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x1193f },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 0, 0x11940 },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x11941 },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 0, 0x11942 },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 7, 0x11943 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x1194f },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 0, 0x11959 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x1199f },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x119a7 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x119a9 },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x119d0 },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 0, 0x119d7 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x119d9 },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 0, 0x119df },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 9, 0x119e0 },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x119e1 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x119e2 },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x119e3 },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 0, 0x119e4 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x119ff },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x11a00 },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 0, 0x11a0a },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x11a32 },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 0, 0x11a33 },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 9, 0x11a34 },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 0, 0x11a39 },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x11a3a },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 0, 0x11a3e },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x11a46 },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 9, 0x11a47 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x11a4f },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x11a50 },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 0, 0x11a5b },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x11a89 },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 0, 0x11a98 },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 9, 0x11a99 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x11a9c },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x11a9d },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x11abf },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x11af8 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x11bff },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x11c08 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x11c09 },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x11c2e },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 0, 0x11c36 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x11c37 },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 0, 0x11c3e },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 9, 0x11c3f },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x11c40 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x11c4f },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 0, 0x11c59 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x11c71 },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x11c8f },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x11c91 },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 0, 0x11ca7 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x11ca8 },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 0, 0x11cb6 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x11cff },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x11d06 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x11d07 },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x11d09 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x11d0a },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x11d30 },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 0, 0x11d36 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x11d39 },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 0, 0x11d3a },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x11d3b },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 0, 0x11d3d },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x11d3e },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 0, 0x11d41 },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 7, 0x11d42 },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 0, 0x11d43 },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 9, 0x11d45 },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x11d46 },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 0, 0x11d47 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x11d4f },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 0, 0x11d59 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x11d5f },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x11d65 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x11d66 },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x11d68 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x11d69 },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x11d89 },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 0, 0x11d8e },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x11d8f },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 0, 0x11d91 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x11d92 },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 0, 0x11d96 },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 9, 0x11d97 },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x11d98 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x11d9f },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 0, 0x11da9 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x11edf },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x11ef2 },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 0, 0x11ef6 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x11faf },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x11fb0 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x11fff },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x12399 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x123ff },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x1246e },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x1247f },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x12543 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x12fff },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x1342e },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x143ff },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x14646 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x167ff },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x16a38 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x16a3f },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x16a5e },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x16a5f },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 0, 0x16a69 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x16acf },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x16aed },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x16aef },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 1, 0x16af4 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x16aff },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x16b2f },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 230, 0x16b36 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x16b3f },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x16b43 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x16b4f },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 0, 0x16b59 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x16b62 },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x16b77 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x16b7c },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x16b8f },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x16e3f },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x16e7f },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x16eff },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x16f4a },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x16f4e },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 0, 0x16f4f },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x16f50 },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 0, 0x16f87 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x16f8e },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 0, 0x16f92 },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x16f9f },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x16fdf },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x16fe1 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x16fe2 },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x16fe3 },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 0, 0x16fe4 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x16fef },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 6, 0x16ff1 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x16fff },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x187f7 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x187ff },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x18cd5 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x18cff },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x18d08 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x1afff },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x1b11e },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x1b14f },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x1b152 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x1b163 },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x1b167 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x1b16f },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x1b2fb },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x1bbff },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x1bc6a },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x1bc6f },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x1bc7c },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x1bc7f },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x1bc88 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x1bc8f },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x1bc99 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x1bc9c },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 0, 0x1bc9d },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 1, 0x1bc9e },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x1d15d },
+{ 0| 0| 0|C11| 0| 0| 0| 0| 0| 0| 0, 0, 0x1d164 },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 216, 0x1d166 },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 1, 0x1d169 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x1d16c },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 226, 0x1d16d },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 216, 0x1d172 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x1d17a },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 220, 0x1d182 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x1d184 },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 230, 0x1d189 },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 220, 0x1d18b },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x1d1a9 },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 230, 0x1d1ad },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x1d1ba },
+{ 0| 0| 0|C11| 0| 0| 0| 0| 0| 0| 0, 0, 0x1d1c0 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x1d241 },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 230, 0x1d244 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x1d3ff },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC| 0| 0, 0, 0x1d454 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x1d455 },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC| 0| 0, 0, 0x1d49c },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x1d49d },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC| 0| 0, 0, 0x1d49f },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x1d4a1 },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC| 0| 0, 0, 0x1d4a2 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x1d4a4 },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC| 0| 0, 0, 0x1d4a6 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x1d4a8 },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC| 0| 0, 0, 0x1d4ac },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x1d4ad },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC| 0| 0, 0, 0x1d4b9 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x1d4ba },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC| 0| 0, 0, 0x1d4bb },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x1d4bc },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC| 0| 0, 0, 0x1d4c3 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x1d4c4 },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC| 0| 0, 0, 0x1d505 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x1d506 },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC| 0| 0, 0, 0x1d50a },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x1d50c },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC| 0| 0, 0, 0x1d514 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x1d515 },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC| 0| 0, 0, 0x1d51c },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x1d51d },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC| 0| 0, 0, 0x1d539 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x1d53a },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC| 0| 0, 0, 0x1d53e },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x1d53f },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC| 0| 0, 0, 0x1d544 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x1d545 },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC| 0| 0, 0, 0x1d546 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x1d549 },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC| 0| 0, 0, 0x1d550 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x1d551 },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC| 0| 0, 0, 0x1d6a5 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x1d6a7 },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC| 0| 0, 0, 0x1d6c0 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC| 0| 0, 0, 0x1d6c1 },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC| 0| 0, 0, 0x1d6da },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC| 0| 0, 0, 0x1d6db },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC| 0| 0, 0, 0x1d6fa },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC| 0| 0, 0, 0x1d6fb },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC| 0| 0, 0, 0x1d714 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC| 0| 0, 0, 0x1d715 },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC| 0| 0, 0, 0x1d734 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC| 0| 0, 0, 0x1d735 },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC| 0| 0, 0, 0x1d74e },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC| 0| 0, 0, 0x1d74f },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC| 0| 0, 0, 0x1d76e },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC| 0| 0, 0, 0x1d76f },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC| 0| 0, 0, 0x1d788 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC| 0| 0, 0, 0x1d789 },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC| 0| 0, 0, 0x1d7a8 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC| 0| 0, 0, 0x1d7a9 },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC| 0| 0, 0, 0x1d7c2 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC| 0| 0, 0, 0x1d7c3 },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC| 0| 0, 0, 0x1d7cb },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x1d7cd },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC| 0| 0, 0, 0x1d7ff },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x1d9ff },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 0, 0x1da36 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x1da3a },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 0, 0x1da6c },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x1da74 },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 0, 0x1da75 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x1da83 },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 0, 0x1da84 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x1da9a },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 0, 0x1da9f },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x1daa0 },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 0, 0x1daaf },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x1dfff },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 230, 0x1e006 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x1e007 },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 230, 0x1e018 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x1e01a },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 230, 0x1e021 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x1e022 },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 230, 0x1e024 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x1e025 },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 230, 0x1e02a },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x1e0ff },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x1e12c },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x1e12f },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 230, 0x1e136 },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x1e13d },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x1e13f },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 0, 0x1e149 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x1e14d },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x1e14e },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x1e2bf },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x1e2eb },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 230, 0x1e2ef },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 0, 0x1e2f9 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x1e7ff },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x1e8c4 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x1e8cf },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 220, 0x1e8d6 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x1e8ff },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x1e943 },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 230, 0x1e949 },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 7, 0x1e94a },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x1e94b },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x1e94f },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 0, 0x1e959 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x1edff },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC| 0| 0, 0, 0x1ee03 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x1ee04 },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC| 0| 0, 0, 0x1ee1f },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x1ee20 },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC| 0| 0, 0, 0x1ee22 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x1ee23 },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC| 0| 0, 0, 0x1ee24 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x1ee26 },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC| 0| 0, 0, 0x1ee27 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x1ee28 },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC| 0| 0, 0, 0x1ee32 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x1ee33 },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC| 0| 0, 0, 0x1ee37 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x1ee38 },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC| 0| 0, 0, 0x1ee39 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x1ee3a },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC| 0| 0, 0, 0x1ee3b },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x1ee41 },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC| 0| 0, 0, 0x1ee42 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x1ee46 },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC| 0| 0, 0, 0x1ee47 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x1ee48 },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC| 0| 0, 0, 0x1ee49 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x1ee4a },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC| 0| 0, 0, 0x1ee4b },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x1ee4c },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC| 0| 0, 0, 0x1ee4f },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x1ee50 },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC| 0| 0, 0, 0x1ee52 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x1ee53 },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC| 0| 0, 0, 0x1ee54 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x1ee56 },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC| 0| 0, 0, 0x1ee57 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x1ee58 },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC| 0| 0, 0, 0x1ee59 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x1ee5a },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC| 0| 0, 0, 0x1ee5b },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x1ee5c },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC| 0| 0, 0, 0x1ee5d },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x1ee5e },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC| 0| 0, 0, 0x1ee5f },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x1ee60 },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC| 0| 0, 0, 0x1ee62 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x1ee63 },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC| 0| 0, 0, 0x1ee64 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x1ee66 },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC| 0| 0, 0, 0x1ee6a },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x1ee6b },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC| 0| 0, 0, 0x1ee72 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x1ee73 },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC| 0| 0, 0, 0x1ee77 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x1ee78 },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC| 0| 0, 0, 0x1ee7c },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x1ee7d },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC| 0| 0, 0, 0x1ee7e },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x1ee7f },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC| 0| 0, 0, 0x1ee89 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x1ee8a },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC| 0| 0, 0, 0x1ee9b },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x1eea0 },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC| 0| 0, 0, 0x1eea3 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x1eea4 },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC| 0| 0, 0, 0x1eea9 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x1eeaa },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC| 0| 0, 0, 0x1eebb },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x1f0ff },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC| 0| 0, 0, 0x1f10a },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x1f10f },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC| 0| 0, 0, 0x1f12e },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x1f12f },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC| 0| 0, 0, 0x1f14f },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x1f169 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC| 0| 0, 0, 0x1f16c },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x1f18f },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC| 0| 0, 0, 0x1f190 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x1f1ff },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC| 0| 0, 0, 0x1f202 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x1f20f },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC| 0| 0, 0, 0x1f23b },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x1f23f },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC| 0| 0, 0, 0x1f248 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x1f24f },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC| 0| 0, 0, 0x1f251 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x1fbef },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC| 0| 0, 0, 0x1fbf9 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x1fffd },
+{ 0| 0| 0| 0| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x1ffff },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x2a6dd },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x2a6ff },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x2b734 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x2b73f },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x2b81d },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x2b81f },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x2cea1 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x2ceaf },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x2ebe0 },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x2f7ff },
+{ 0| 0| 0|C11| 0|CXX23| 0| 0| 0| 0| 0, 0, 0x2fa1d },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x2fffd },
+{ 0| 0| 0| 0| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x2ffff },
+{ 0| 0| 0|C11| 0|CXX23| 0|CID|NFC|NKC| 0, 0, 0x3134a },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x3fffd },
+{ 0| 0| 0| 0| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x3ffff },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x4fffd },
+{ 0| 0| 0| 0| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x4ffff },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x5fffd },
+{ 0| 0| 0| 0| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x5ffff },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x6fffd },
+{ 0| 0| 0| 0| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x6ffff },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x7fffd },
+{ 0| 0| 0| 0| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x7ffff },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x8fffd },
+{ 0| 0| 0| 0| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x8ffff },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x9fffd },
+{ 0| 0| 0| 0| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x9ffff },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0xafffd },
+{ 0| 0| 0| 0| 0| 0| 0|CID|NFC|NKC| 0, 0, 0xaffff },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0xbfffd },
+{ 0| 0| 0| 0| 0| 0| 0|CID|NFC|NKC| 0, 0, 0xbffff },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0xcfffd },
+{ 0| 0| 0| 0| 0| 0| 0|CID|NFC|NKC| 0, 0, 0xcffff },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0xdfffd },
+{ 0| 0| 0| 0| 0| 0| 0|CID|NFC|NKC| 0, 0, 0xdffff },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0xe00ff },
+{ 0| 0| 0|C11| 0|CXX23|NXX23|CID|NFC|NKC| 0, 0, 0xe01ef },
+{ 0| 0| 0|C11| 0| 0| 0|CID|NFC|NKC| 0, 0, 0xefffd },
+{ 0| 0| 0| 0| 0| 0| 0|CID|NFC|NKC| 0, 0, 0x10ffff },
};
static bool
check_nfc (cpp_reader *pfile, cppchar_t c, cppchar_t p)
@@ -4517,6 +5314,70 @@ check_nfc (cpp_reader *pfile, cppchar_t c, cppchar_t p)
return true;
}
+ case 0x1133e:
+ switch (p)
+ {
+ case 0x11347:
+ return false;
+ default:
+ return true;
+ }
+
+ case 0x11357:
+ switch (p)
+ {
+ case 0x11347:
+ return false;
+ default:
+ return true;
+ }
+
+ case 0x114b0:
+ switch (p)
+ {
+ case 0x114b9:
+ return false;
+ default:
+ return true;
+ }
+
+ case 0x114ba:
+ switch (p)
+ {
+ case 0x114b9:
+ return false;
+ default:
+ return true;
+ }
+
+ case 0x114bd:
+ switch (p)
+ {
+ case 0x114b9:
+ return false;
+ default:
+ return true;
+ }
+
+ case 0x115af:
+ switch (p)
+ {
+ case 0x115b8:
+ case 0x115b9:
+ return false;
+ default:
+ return true;
+ }
+
+ case 0x11930:
+ switch (p)
+ {
+ case 0x11935:
+ return false;
+ default:
+ return true;
+ }
+
default:
cpp_error (pfile, CPP_DL_ICE, "Character %x might not be NFKC", c);
return true;
diff --git a/libcpp/ucnid.tab b/libcpp/ucnid.tab
index 1499661..6542d11 100644
--- a/libcpp/ucnid.tab
+++ b/libcpp/ucnid.tab
@@ -1,5 +1,5 @@
; Table of UCNs which are valid in identifiers.
-; Copyright (C) 2003-2020 Free Software Foundation, Inc.
+; Copyright (C) 2003-2021 Free Software Foundation, Inc.
;
; This program is free software; you can redistribute it and/or modify it
; under the terms of the GNU General Public License as published by the